Clean up ebuilds a bit and make sure compilation happens in src_compile.

Package-Manager: portage-2.2_rc86/cvs/Linux x86_64

4 files changed, 29 insertions, 53 deletions

diff --git a/sys-devel/sparse/ChangeLog b/sys-devel/sparse/ChangeLog
index 892a5675adab..8fc880ec4b0f 100644
--- a/sys-devel/sparse/ChangeLog
+++ b/sys-devel/sparse/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-devel/sparse
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/sparse/ChangeLog,v 1.30 2010/03/02 17:45:26 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/sparse/ChangeLog,v 1.31 2010/10/05 08:41:29 vapier Exp $
+
+  05 Oct 2010; Mike Frysinger <vapier@gentoo.org> sparse-0.4.2.ebuild,
+  sparse-9999.ebuild:
+  Clean up ebuilds a bit and make sure compilation happens in src_compile.
 
   02 Mar 2010; Doug Goldstein <cardoe@gentoo.org> sparse-0.4.2.ebuild,
   sparse-9999.ebuild:
diff --git a/sys-devel/sparse/Manifest b/sys-devel/sparse/Manifest
index 11781be7a884..47adb47cd859 100644
--- a/sys-devel/sparse/Manifest
+++ b/sys-devel/sparse/Manifest
@@ -1,23 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX sparse-0.3-makefile-fix.patch 673 RMD160 a65eb4202fed0cadf6cdadb802e9fb295496b37a SHA1 ff5f077bc727ffe01ade5adf278e10caeb463b27 SHA256 ef540ee89026d1ea44851c1530e5d6ef058b656f4f22f52c2889086c66dd01fa
-AUX sparse-0.4-makefile-fix.patch 444 RMD160 b16723f44129d5275b4d75655b39662803091a4e SHA1 31a4319d366e039c274368c450926be4e8f0490f SHA256 f62a54112d809767eacd864450f77397bd2c49b03162e39057c145e3d92cb91f
-DIST sparse-0.3.tar.gz 177462 RMD160 36bb7e5611f56c5b222f33a0853e8315af406704 SHA1 1d868b29234176abd5f3f5463aad1f11d5268dc2 SHA256 e976ea8618acaaa88992298f493cdfc70518da7fcd8ada1e942586a21471b7a6
 DIST sparse-0.4.1.tar.gz 199352 RMD160 f0fd342710d41b912a91c578c7d0f3bff7d4f4fe SHA1 14085c5317cd7f2c8392fb762969906fa91888ef SHA256 cb950b012e83cbfb6cf9fecff01893bb28ba3b7f1df906657be43a88277ed3a2
 DIST sparse-0.4.2.tar.bz2 164542 RMD160 260546cea13f37bb39fcb3e3e2b3014bc917e598 SHA1 e0e18c9ddddd9be290f56dc863cad2de76099759 SHA256 eb1d1494e6a7d76ae4eb71918011caad1e5f2672761c90e6de54231f2e98ae5e
-DIST sparse-0.4.tar.gz 199090 RMD160 aa654d964d293af5d06d94dd7af3cab8d8a6896f SHA1 a77a10174c8cdb5314eb5000c1e4f24458848b91 SHA256 f33732ae72e99e981a9c95f73a502b5883e853a30fcc93d3e0fbd57c560e3e2f
-EBUILD sparse-0.3-r1.ebuild 826 RMD160 aa352afcf15169a3e7339c0cfd740ffb3db2f055 SHA1 e510c81e1e3902dab43e99493c1aee80fdbc4557 SHA256 359ecfc879810a63c84973a58b3de28aa189fe73f3653d22bb61c7f0c16ee31e
 EBUILD sparse-0.4.1.ebuild 825 RMD160 80b83d8017a2895338cb7793a906d9c884d1bb6b SHA1 128c84b435fb03563c7caa4d446e5cc2eb287bfa SHA256 d7517350d11a738ef41cd5e13ef9a856f67d6fbaf8f2b931d7d0f2c12ba17a44
-EBUILD sparse-0.4.2.ebuild 1053 RMD160 c4d5241c95795192752cdb9d34df92b5b919b0f2 SHA1 cf479a5b8c5c60715e619ff96a68d8dfd26f55cd SHA256 c0f1ceb4429dd2fc6edcb56573f14933b8cefe78002e7651fdf1dc55586d83c9
-EBUILD sparse-0.4.ebuild 819 RMD160 5be7025695b145f793b012bfa871bac6ae5376d0 SHA1 570aa2b82adc3ba76844b2a6f0afbebf311e4005 SHA256 0b8d3a065dfd2509ca87e8312ead0aabee7b8412e281118b06cf7411e007fc04
-EBUILD sparse-9999.ebuild 1052 RMD160 642c9a6142a54eb4f6de50dbfe56550b06f3e180 SHA1 29aec9c8517d616d2bef9425aaf90dfb230211d0 SHA256 fe4a5cc526e607543721930b27966b40f9b32debe83148427caea75995558732
-MISC ChangeLog 3839 RMD160 2f53f7c6d3889820028cefab6ac34c69371944c6 SHA1 853ca076de4d92f75b72b3ca5d81ed833b99851b SHA256 f34f785883559afd2d03d40bb6271b89cf4ff0427daa2fb917e77260daa16f8b
+EBUILD sparse-0.4.2.ebuild 1004 RMD160 dd93da42db450ca0fde326f1df4174f21ddf4a25 SHA1 6af0f2ec4668bcb886d696b07576cf55fdcaefbf SHA256 f792d314a006ca1bf99bf5e8f1722c865e910ce6f4e51d021499e83f29b73309
+EBUILD sparse-9999.ebuild 1003 RMD160 3a42e3434772d380395aeb92fdb9444b6fddc39c SHA1 495bfbdd36190b70988a33ae254aca387815c84e SHA256 fe1897eb12d2d78cd1f0e278b8da7bd1d3df824f0aaf416a436004bd2d3d9482
+MISC ChangeLog 4008 RMD160 5e0780aeaba97e1deab3eacb9a6838c3c75f295c SHA1 d50d4d09147c02e8675894d6350a860a389b55ed SHA256 55407fffd09d7ee375fe853a9680d2e0ef7187548102f64f47866aed258f0fcf
 MISC metadata.xml 187 RMD160 6a4f3d1c3e4aaca2af8800dea988ae5dea274137 SHA1 53ea00198fe3d462045190c6bd779870762dcb81 SHA256 864c3ba42cf97b3407ecce670b15a46f2623bc66c4b78f0a25dc8d4eec54d44b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
+Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkuNTr0ACgkQoeSe8B0zEfz1WgCfVFTs7pM73GgKvq/+pCMaYfJ3
-KOYAn1KKf94e93aVDpA3q5HBG1XMNFB3
-=VZ0f
+iF4EAREIAAYFAkyq5IAACgkQTwhj9JtAlp4RbAD/boMgyv9fDdt3BdPcXio6xk+9
+j2qPnOOMwYdX3DJwHkUBALoR8AcmpGt2SsJczOJYRXecuZqtNhdGHummhD8tIcnM
+=g6Nd
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/sparse/sparse-0.4.2.ebuild b/sys-devel/sparse/sparse-0.4.2.ebuild
index 3989ac722979..7e28ced9663b 100644
--- a/sys-devel/sparse/sparse-0.4.2.ebuild
+++ b/sys-devel/sparse/sparse-0.4.2.ebuild
@@ -1,22 +1,21 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/sparse/sparse-0.4.2.ebuild,v 1.2 2010/03/02 17:45:26 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/sparse/sparse-0.4.2.ebuild,v 1.3 2010/10/05 08:41:29 vapier Exp $
 
 EAPI="2"
 
-if [[ ${PV} = *9999* ]]; then
+inherit eutils multilib flag-o-matic toolchain-funcs
+if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://git.kernel.org/pub/scm/devel/sparse/sparse.git"
-	GIT_ECLASS="git"
+	inherit git
 fi
 
-inherit eutils multilib flag-o-matic ${GIT_ECLASS}
-
 DESCRIPTION="C semantic parser"
 HOMEPAGE="http://sparse.wiki.kernel.org/index.php/Main_Page"
 
-if [[ ${PV} = *9999* ]]; then
+if [[ ${PV} == "9999" ]] ; then
 	SRC_URI=""
-	KEYWORDS=""
+	#KEYWORDS=""
 else
 	SRC_URI="mirror://kernel/software/devel/sparse/dist/${P}.tar.bz2"
 	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
@@ -26,26 +25,16 @@ LICENSE="OSL-1.1"
 SLOT="0"
 IUSE=""
 
-DEPEND=""
-RDEPEND=""
-
 src_prepare() {
 	sed -i \
 		-e '/^PREFIX=/s:=.*:=/usr:' \
 		-e "/^LIBDIR=/s:/lib:/$(get_libdir):" \
 		Makefile || die
 	append-flags -fno-strict-aliasing
-}
-
-src_configure() {
-	:
-}
-
-src_compile() {
-	:
+	export MAKEOPTS+=" V=1 CC=$(tc-getCC)"
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
+	emake DESTDIR="${D}" install || die
 	dodoc FAQ README
 }
diff --git a/sys-devel/sparse/sparse-9999.ebuild b/sys-devel/sparse/sparse-9999.ebuild
index 453d62fbbe0e..d375721bc7ba 100644
--- a/sys-devel/sparse/sparse-9999.ebuild
+++ b/sys-devel/sparse/sparse-9999.ebuild
@@ -1,22 +1,21 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/sparse/sparse-9999.ebuild,v 1.4 2010/03/02 17:45:26 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/sparse/sparse-9999.ebuild,v 1.5 2010/10/05 08:41:29 vapier Exp $
 
 EAPI="2"
 
-if [[ ${PV} = *9999* ]]; then
+inherit eutils multilib flag-o-matic toolchain-funcs
+if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="git://git.kernel.org/pub/scm/devel/sparse/sparse.git"
-	GIT_ECLASS="git"
+	inherit git
 fi
 
-inherit eutils multilib flag-o-matic ${GIT_ECLASS}
-
 DESCRIPTION="C semantic parser"
 HOMEPAGE="http://sparse.wiki.kernel.org/index.php/Main_Page"
 
-if [[ ${PV} = *9999* ]]; then
+if [[ ${PV} == "9999" ]] ; then
 	SRC_URI=""
-	KEYWORDS=""
+	#KEYWORDS=""
 else
 	SRC_URI="mirror://kernel/software/devel/sparse/dist/${P}.tar.bz2"
 	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
@@ -26,26 +25,16 @@ LICENSE="OSL-1.1"
 SLOT="0"
 IUSE=""
 
-DEPEND=""
-RDEPEND=""
-
 src_prepare() {
 	sed -i \
 		-e '/^PREFIX=/s:=.*:=/usr:' \
 		-e "/^LIBDIR=/s:/lib:/$(get_libdir):" \
 		Makefile || die
 	append-flags -fno-strict-aliasing
-}
-
-src_configure() {
-	:
-}
-
-src_compile() {
-	:
+	export MAKEOPTS+=" V=1 CC=$(tc-getCC)"
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
+	emake DESTDIR="${D}" install || die
 	dodoc FAQ README
 }