sci-mathematics/prover9: Fix breakage due to dropping make target, #497530; Respect CC

Package-Manager: portage-2.2.8/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

3 files changed, 32 insertions, 22 deletions

diff --git a/sci-mathematics/prover9/ChangeLog b/sci-mathematics/prover9/ChangeLog
index 542d7657b99f..3f2ebd1d80dd 100644
--- a/sci-mathematics/prover9/ChangeLog
+++ b/sci-mathematics/prover9/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sci-mathematics/prover9
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/prover9/ChangeLog,v 1.5 2014/01/06 14:02:38 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/prover9/ChangeLog,v 1.6 2014/01/08 15:59:39 jlec Exp $
+
+  08 Jan 2014; Justin Lecher <jlec@gentoo.org> prover9-2009.11a.ebuild:
+  Fix breakage due to dropping make target, #497530; Respect CC
 
   06 Jan 2014; Justin Lecher <jlec@gentoo.org> prover9-2009.11a.ebuild,
   metadata.xml:
diff --git a/sci-mathematics/prover9/Manifest b/sci-mathematics/prover9/Manifest
index cee70c088334..048daa68db69 100644
--- a/sci-mathematics/prover9/Manifest
+++ b/sci-mathematics/prover9/Manifest
@@ -2,25 +2,25 @@
 Hash: SHA512
 
 AUX LADR-2009-11A-manpages.patch 13832 SHA256 d9ecfc1a476d1e06a4b83dc3a96a57c3cf78943571e910ea4be420ce5a255371 SHA512 4c9f862b33d7b6b33b5e4a82b38418c6ae41b7adae565d376cc741608eb989e3846c1e98589dea62f7cadeb0b1f0f5814afe95ee6cf0da63c6961620d8b2677c WHIRLPOOL ce25b003f4ea4262e2431437e840d188ac73bab08f2397d7869badb9adfd783e58fb09d01ddaee983fc4b9078b716cb04958125df800984bdb486f11badd39a6
-DIST LADR-2009-11A-makefile.patch.bz2 4347 SHA256 6888de46540e493adc797b574cd17fab711d47902709a839aa1a9dbd075d7e2b SHA512 836923ca48f36e3f0dcb9b84e3e1adc9eb6e3ceee2d7c29960a26b737a7c8f592777aa8b2a9fcd8dbe6c5da67b733de94c49cc6377edcaf404a4582bdc903ac0 WHIRLPOOL 0a42b11adf27bbbf01970ad7ef049fca74fd53e7de16b4872a8b826572aaef0bda60d4805f2a6a6cc92068a4905da8dd7f928e25bc1bcbc4c5f9ddc0d9a26e48
+DIST LADR-2009-11A-makefile.patch.xz 4300 SHA256 7340ec2ce439a6ed039d7077a417ca5d81ad3acce0b174e96469e8ebad274adf SHA512 c1d2e27d991036af24a29deb4401fbf9687415d2a37bebabb9cfc77d8672e0804d974f92cbd7b8e16c0a0c10b75831847f7b8ddb94244d7e632de7b1be5081f1 WHIRLPOOL 15401ed0b9edafb3841bed7c1c270d8a38544470abf87abd9b70b9eb0aa194d7296146e88b797a568aff7e557a118bfc2ee40d5a5c8ae6a426902db51e11c0ae
 DIST LADR-2009-11A.tar.gz 1795750 SHA256 c32bed5807000c0b7161c276e50d9ca0af0cb248df2c1affb2f6fc02471b51d0 SHA512 f26d3713eb2ba809fb3d55ce179e9d91555ab9166e075aa0843bafe57ce00f153cfed178b61993d4fd471655840e4f40775d75dac9fb5242a67e5d59c970dfc7 WHIRLPOOL 6e6abd1a5c7bfc988fb693eeea08bdfba77c9badea3d4a77764efcb9ee16c36b372241fbf4d4dead911cabf9a03721988f334977379da47d04b4320bae257fad
-EBUILD prover9-2009.11a.ebuild 2537 SHA256 b96c5a12d15ce7d97839d5dd16c8867bfd706b64b273acbe58f7cf08215f5ec0 SHA512 b195ce69a9be738fe847173c95ab0c83a6e8a4060c40957436ca87872d0d0bfbab03950f3c5004badd8ddd1aecb52a845a27546fc6a44c03116bad4af4513267 WHIRLPOOL 424ef602bbf3dac8b399363cf610626a5cab1e098ef2b90ee40b61ac16485d82b2f2459e7d21bcf8911a00d9f05e3dd7484818c512542b0f24b9f454e6316930
-MISC ChangeLog 956 SHA256 af439eab63e9dfd436a78eac2ab97df4707ed395cc4893d031957d49de188754 SHA512 e63e75541b480111b0ecc26ca87e2326e2007547026e2c5fa2b02669d8162e556876f3bf366da5ffdde45b3c1d2d0a635c8b1adfab07f181d8a6f59918a5415b WHIRLPOOL f77a73c39b2c743055f579efd56c2f904ea74a91704b8943484c0ad659d10aeaaa2a56bfa98eb93c5ab5faf2a91a0a8141ad7c2ef3a90dccb1c976359335dca3
+EBUILD prover9-2009.11a.ebuild 2618 SHA256 bf1fd51dd7504f9105c0c0cef6111ad0774a6d7b319e6fe2a70401758f363a66 SHA512 4c6d8f39149520477a1c401eed2613c56c193b9d1fe571ffd7a5966432b5a1d1b476af032308c557fa4910caf3734e8af50ffa20ea173db8684bdf15b4918a9e WHIRLPOOL 2b1fceca16ddedb17d1f3602c163788e28ef57039718871868f7675e4bb9700b40a8e2d7f79faca38b625682e4dc3a13e0a3807fcf2a1f319160dc6be3eb3d04
+MISC ChangeLog 1093 SHA256 accadcaa67650488616b1d397e357382252040095843ec6afbaa9d290ae3a92f SHA512 65e8adfe60b4ccb86fbb60990162ee057bf56afc88e0a10f0263325560cf6d5bb71191d76104ff7651aaef39caa8d84c975ad8cef0bafa42416019868be97b6b WHIRLPOOL 5f7bd44aaff1b05be2fa420667c5727c42f86d640eceac4112131ca9b760dd39a65614ac2215f9fb429bd71200e66c09fed67f33686defa64c3e720a84e4b91d
 MISC metadata.xml 524 SHA256 d54d686e61789877cdadf81d12b75fe7e5ba3a057196859653de450039e6735d SHA512 3fd05cee5ae2326d5bd9fe67c885d8ac6fe49817118846d24efa8ccccb3fd634108d21795271dae1c93ac8e623081746b73012e5003b5e608046c8a29274a47f WHIRLPOOL 7551f554932aed33c18b1979003fb7c7661159e776f508e7e6fd2e55c15348e45289325f42b09a092e3b3af8ef65183551345f426ceb5d0b4a969facdc799536
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJSyrd/AAoJELnU8jG9FViryIAP/1BXWlls3trEetiwiKFVnhQ3
-5CKxtIPL0e62ISLMfB+AleqvlWK6qadwysGdFW2PZv7Sktq7t3npo7hE0xX6pVCC
-P+du0QCwuX43OBI91Q5SZAK3072Q/w4dEqhzEu5naRsUxQICLtsunZxyxwyqxi4y
-OgRBgxxPN7wM28P54j+MsMeaLdWUBr3RNHtV/1xefKm5DlJPIy1E5J+wEiKAgdTm
-GDZPF/lBvBiGwptn7ZU2UTJKsXrRw5rZp92ajxzm09TWegTLQHSa4gd3bgeB/rOa
-a65I/g7Qciq+D659kpCA4tNMnDs58sLHUsc7nt7dPNFT99JiwQxBMmAQiDfRH+o8
-pKhuinvaBpvJTsye2yLd+lbH70qlG8H+lGqpZiBV2DVdlafF06D7HemZUo+UDvoh
-XR7xREANDNk98IRCFMCKMjgUw1BF4W1whesLvu0iz3a9DsDAOR9SLPjqKEdMZ5OM
-imMI8+DLTGnjV2jPTDBjZ3Ip6UBMx8nRpHx//vz9Gnw8ZEHUMf6WawsQDsdQhyE1
-Xqpk8XEBW7G++6FCcPcUzOXUHjT+vJ+tjbUL/N80DWdptVSbceltw86mC+CqZj0v
-OyBRatnsQH/AwYHwmjD2zg67kVrJ3tc765fAU8xeUg6Bq0vswLnD5hWUvpob3cJ5
-AsNoyxvR2TuKtf72MwQh
-=kN++
+iQIcBAEBCgAGBQJSzXXsAAoJELnU8jG9FVirs4wP/2hgTwz+FZZNTz/YdPR+5gsX
+TQ/qpvPM/uizmJHGlqaYmM60wiVYi950sBidDaS9HQzM2JQsk+jX7wwDUJEEDTAr
+OGO+V+DT7ORJsZ7cckLYo92yc5MGtt8thYuJNiIKEzotpnJFPsg1d35cLyaGFe5R
+yV9IYJ6oElRaoX9Amw6yexRyeHideo1duEUmBJDbvHUb3X0E+Pk14+y/F4h/rStV
+bhbEnc3qwCgozj4CZCV9uKv2pXpATE1CX+cflT6cw5wofLUZe2yn1SSgelpWSRAG
+vMk2B88KSsUMuuaOfTGweJuHzOUeXGHkrK3NuMwf0RqyTAwZ2NI4YqC+8Xv6Um6s
+3gHJF6YM+uQ5QXhHQGtAAXQ53AcmGJURcGzrLrnLlP6pMctLI/JJWLSLaVEr9UJF
+7FGsRCAa2hRyXxsIKQ0txO9jn8m0DHfVYeAW9495F/FMs8Rd4Cq2XQkP03PE0HEl
+xv9De4t11GPRfpiQL/JKkv5ogByW+2PWAI5igm4CUGMulhrToe7e32t0AeOEbtHO
+WawZNoPjEFvloRmDT5cvFXp+mjpqAbiXe+89G4EWW0zDJ1I0qsl3lXvxhytm1+pV
+u8wWmm+PSneFOUqZEABgpTOhDaR0vuYx9fP3VKVZmeICGTab7OoicW3eQBFtV+ZY
+9ryyLJJtgbAIZiSIKvZz
+=qbGZ
 -----END PGP SIGNATURE-----
diff --git a/sci-mathematics/prover9/prover9-2009.11a.ebuild b/sci-mathematics/prover9/prover9-2009.11a.ebuild
index 9ae3d778b705..8189523d67b8 100644
--- a/sci-mathematics/prover9/prover9-2009.11a.ebuild
+++ b/sci-mathematics/prover9/prover9-2009.11a.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/prover9/prover9-2009.11a.ebuild,v 1.3 2014/01/06 14:02:38 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/prover9/prover9-2009.11a.ebuild,v 1.4 2014/01/08 15:59:39 jlec Exp $
 
 EAPI=5
 
-inherit eutils versionator
+inherit eutils toolchain-funcs versionator
 
 MY_PN="LADR"
 typeset -u MY_PV
@@ -15,7 +15,7 @@ DESCRIPTION="Automated theorem prover for first-order and equational logic"
 HOMEPAGE="http://www.cs.unm.edu/~mccune/mace4/"
 SRC_URI="
 	http://www.cs.unm.edu/~mccune/mace4/download/${MY_P}.tar.gz
-	http://dev.gentoo.org/~gienah/2big4tree/sci-mathematics/prover9/${MY_PN}-2009-11A-makefile.patch.bz2"
+	http://dev.gentoo.org/~jlec/distfiles/${MY_PN}-2009-11A-makefile.patch.xz"
 
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
@@ -23,8 +23,8 @@ LICENSE="GPL-2"
 IUSE="examples"
 
 PATCHES=(
-	"${DISTDIR}/${MY_PN}-2009-11A-makefile.patch.bz2"
-	"${FILESDIR}/${MY_PN}-2009-11A-manpages.patch"
+	"${WORKDIR}"/${MY_PN}-2009-11A-makefile.patch
+	"${FILESDIR}"/${MY_PN}-2009-11A-manpages.patch
 	)
 
 S="${WORKDIR}/${MY_P}/"
@@ -32,6 +32,13 @@ S="${WORKDIR}/${MY_P}/"
 src_prepare() {
 	MAKEOPTS+=" -j1"
 	epatch ${PATCHES[@]}
+	sed \
+		-e "/^CC =/s:gcc:$(tc-getCC):g" \
+		-i */Makefile || die
+}
+
+src_compile() {
+	emake all
 }
 
 src_install () {