clean up the live portion of the ebuild using multiple inherits

Package-Manager: portage-2.2.0_alpha125/cvs/Linux i686

4 files changed, 23 insertions, 25 deletions

diff --git a/sys-apps/kmod/ChangeLog b/sys-apps/kmod/ChangeLog
index 0120f4e37296..93340e0811b1 100644
--- a/sys-apps/kmod/ChangeLog
+++ b/sys-apps/kmod/ChangeLog
@@ -1,5 +1,9 @@
 # ChangeLog for sys-apps/kmod
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/ChangeLog,v 1.49 2012/09/08 17:35:44 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/ChangeLog,v 1.50 2012/09/09 17:38:10 williamh Exp $
+
+  09 Sep 2012; William Hubbs <williamh@gentoo.org> kmod-10.ebuild,
+  kmod-9999.ebuild:
+  clean up the live portion of the ebuild using multiple inherits
 
 *kmod-10 (08 Sep 2012)
 
diff --git a/sys-apps/kmod/Manifest b/sys-apps/kmod/Manifest
index db9e5a5bee0c..3580c9b04e0b 100644
--- a/sys-apps/kmod/Manifest
+++ b/sys-apps/kmod/Manifest
@@ -4,19 +4,15 @@ Hash: SHA256
 AUX kmod-8-gc-sections.patch 3167 SHA256 d0f9a28f01b3ab7a00f53a97f8d1596977c945f9125e884e9eaa850e1f433281 SHA512 da6f05d784028536e5861c84add81b54f4e6338672aa576c92b95555dc75d18bdd5d6d689d7cc9ba0526866c23913e9bfbbccf3888e376fbaabd9053021e6a36 WHIRLPOOL ef143dd901a8b2dd46cbd45bfd030fb44ae67b7c333ae10dd7761ec5b12e3c7e93cc4e343c9c9642b410eef67051fe2a6542bab20418c805f526e9465ee5dfcf
 DIST kmod-10.tar.xz 1125436 SHA256 deb80df9e6aa34f965ecf329fd07db462b57ce515b9077eae5cdfac5197a7bff SHA512 eb3a875db0ee6882a5b91f0202060a7589048eba0a6ba6627c7640dfde3e74b8bfa631f32cabf9b9c690358e3d61930300d0893ad29ea9a69a22ec609aefdb2e WHIRLPOOL d4ccd0ad341c65cdbb608e93b0bff576d049321258beaac55b285c4ee1c4b6b32dd7aaf0121920a38a0412cfefbb091b98e288fb4239692135c2cad1bf53eefc
 DIST kmod-9.tar.xz 1122668 SHA256 0607267cb62dbc9009d0719f442a56f97f64d9983e20dbcaedfff9073abdcecf SHA512 912404830d46ab27f9472a4ce0272c03b16b36291069f9cf1a51bc533429fe8f46d7a749edc399fb1631a435dea4077728d0a5b16961603fdde339d3e2b14f1f WHIRLPOOL 1f769b640b97aa248dcf8b0360f6733ce498bdac571b8710154c455d9971367c1d16204fd4acf1d898d4e0af93892c0f4c6e23ff62d50d96b75b69d5668ffb9b
-EBUILD kmod-10.ebuild 1980 SHA256 7f90c2581028737fcbbe7d7e334de1a920d4d08adb2b09bb8e9448fb4dce0482 SHA512 f2cd59ebfd65b1b85c3c516512461f9e07f60320868f44cd76fe159c56f21f417e6c3dc8393946a144e8640e7ba1744e86c1cc7ba109fdb83de526c5201bb366 WHIRLPOOL e325d1e071a866a08bcfc7b6f696274f6f7d4972d9f6d2d953ec300e318669456d9c742782348aec2d68190120fe4f02c568fa2ff5a13b72a51b000b13a67f55
+EBUILD kmod-10.ebuild 1948 SHA256 cca29e4aa15607d318a98fb19be52bff07d9ddd9ce05ed750f787a42940f8f2e SHA512 e3d9d21f3704fb33ccfe9cebb60f7da87970095f707e4653c4182b9fbe8df011e3f53c8a902cc317b50772b865f4dceeb440e192a4007fb31914829370de215e WHIRLPOOL 2d104e0ade86c355729390b33ef4d072c3ff782b3dd2b72bf21901fab4780dde6c1ef816388eae948d62ed282c897383ee906f6273bc12aac6f373d4911312cb
 EBUILD kmod-9-r3.ebuild 2081 SHA256 12c580ecd3d18f264e1529d71d00be986239f6b47fdf2c03eaaebba843c965b1 SHA512 2b3f6a95e16dbd43bab3c221157384ebecd55be2572f1eb45f2ec91c45d067c95b6d81cbb49519e68387549ec5728342ee3dee80f109a0f32a6540e18ce616d5 WHIRLPOOL e03c95cf0983b47c1353e8b10fda9f97b1a28e98429ab2172fbf7f9aa7da64fe392246b64335c89eacb21294ced38887bbf688a3d585acfd4ae5694f5155d0e4
-EBUILD kmod-9999.ebuild 1983 SHA256 d018e8485ff43453437e333efa394d1be3d6dfb0b65d8868a17e393e76ad3e3e SHA512 be0daea811e5ea1ffe6a50448150b31f7949768643603efea0d2158b080cd51110864267b07086e3a3935aa7621ab967b014bb91cc1cd8ec33292192210b2073 WHIRLPOOL 4adc18c2925376e426ca890b3879c43788dd8a8336644e84b172c14a00a8f06ad2843ee814217f5001d18d656bbdb7c9c5f1a7478df46339fbaeb3570134e4ea
-MISC ChangeLog 7067 SHA256 f7092447bd41a5a71a6113e9a9e498d8016991dc183a8743347370b96ae80c75 SHA512 5db46e3471255f05ed093a9d3525af16167445b9d074efd25fd79795722252c927f8faabd06ea38ae9a1363909da531dbb31be55321c954e7ea0eef2009d6a13 WHIRLPOOL 0f0a19d9bcacead2e85e21ec99de28a4e2e560b5804eb2b6260c9cca1d7c14fde29a106fd598cb8390dce4fcac68dc3f15bf041aa1b5be6d011bf1bbf099bfac
+EBUILD kmod-9999.ebuild 1951 SHA256 ab1cdc91a24d7fb696d69e0e4e825e496bc59a6eb1b9f107a9ee091bc797f44d SHA512 2bea27fccad38e96380b9c0aa3c3c280c1ca9ed280147d8d88f81d3919ed277d5387ac4dbf0a4216bc933833f9d587a11c07fef00e3a1fdf487d34d60e6bf770 WHIRLPOOL 0bea5ff51861dace35923005dad956cd743277fd41860e57e3c4c587aa86f770159740a1a25f4f74e645f691fe5d68a93811cf147430413d20e3454cf438c713
+MISC ChangeLog 7220 SHA256 44f1794b25229f3eb57ea0fee2d99088ac9751002be30f805a91afe5c88ba997 SHA512 2d382ceefb5243db6ce02197ed2a119f3d5dbf81d6219f39dcdd9b5b35a742f86140035ac2cc122233048269a090e03c40e9f023a67cb1745859584cc419b1a6 WHIRLPOOL 0f02469df923eca79b4c88a9ba7d1bcdbdb84394f1a059bd6cf2ea974322c90a25e576869581fd4f246cd439d03c78333792c689d90ca81f2b120f9f26f42e33
 MISC metadata.xml 317 SHA256 3e218c5ce1f8ed50d1d4bd6669da4d234af5bbb12f282ec2acf7775c20e68ad4 SHA512 0bc79bc83389f92e10f16b206d78331ed202132ed5648f299443ff4f912b68f753563e040d933deafb1b96e45a9f0212af50475e091c87921e67bcb814e2b881 WHIRLPOOL 57ce9247535050840bc4bfed021fa883e31ad4f24b2f3629416bf73e069f0848a99280c66b42457566138c24ce1274b3e41ef4bb89f387ddf713a6dac79a33c7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQS4GoAAoJEEdUh39IaPFNPEQH/1/jxyBRF6VThxVgiir9LZcv
-9kv0LjmPcNjp1zOniZnhAZTWe8yrTG5Kg0t/ZOHObEBor4yj9Ia/xbpt81oHeu4Z
-jsqcMPECCT/EozoKihoditdC8+owpyVu9CkhE0j1fDdibmgitnrTP93vweggxB0Q
-7HsopT8/80kdf2zLT9Ggjk/ztHiCjKpy6uEFwnqSgd20SjSRoj8+fyAuQLUhowJ+
-JtQdqA0KlZ7hSQSzQCutyTTDeQJfFNFCo29MI/+/dANgb/z8NbaKLpzJFoATZ0Oa
-H0h7M88SNuWf7znDtwlfbnI9M9zZAdV+Uu9wATtYl3B9P5w8JFUDgZEV3Ncd0O4=
-=R4uG
+iEYEAREIAAYFAlBM1RIACgkQblQW9DDEZTjfsgCfZ7oSetI2s+GmjLSmkSPWYqB3
+5pYAnAwVPgt+JV6WoIYH9P1Q18fZ+JEp
+=m6fH
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/kmod/kmod-10.ebuild b/sys-apps/kmod/kmod-10.ebuild
index afd9e97a364e..86c2ba8613f6 100644
--- a/sys-apps/kmod/kmod-10.ebuild
+++ b/sys-apps/kmod/kmod-10.ebuild
@@ -1,16 +1,15 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-10.ebuild,v 1.1 2012/09/08 17:35:44 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-10.ebuild,v 1.2 2012/09/09 17:38:10 williamh Exp $
 
 EAPI=4
 
-EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/kernel/${PN}/${PN}.git"
+inherit autotools eutils toolchain-funcs libtool
 
-[[ ${PV} == 9999 ]] && vcs=git-2
-inherit ${vcs} autotools eutils toolchain-funcs libtool
-unset vcs
-
-if [[ ${PV} != 9999 ]] ; then
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/kernel/${PN}/${PN}.git"
+	inherit git-2
+else
 	SRC_URI="mirror://kernel/linux/utils/kernel/kmod/${P}.tar.xz"
 	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 fi
diff --git a/sys-apps/kmod/kmod-9999.ebuild b/sys-apps/kmod/kmod-9999.ebuild
index ed1442d5613b..1f6fbdbec248 100644
--- a/sys-apps/kmod/kmod-9999.ebuild
+++ b/sys-apps/kmod/kmod-9999.ebuild
@@ -1,16 +1,15 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-9999.ebuild,v 1.32 2012/09/08 17:35:44 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-9999.ebuild,v 1.33 2012/09/09 17:38:10 williamh Exp $
 
 EAPI=4
 
-EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/kernel/${PN}/${PN}.git"
+inherit autotools eutils toolchain-funcs libtool
 
-[[ ${PV} == 9999 ]] && vcs=git-2
-inherit ${vcs} autotools eutils toolchain-funcs libtool
-unset vcs
-
-if [[ ${PV} != 9999 ]] ; then
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/kernel/${PN}/${PN}.git"
+	inherit git-2
+else
 	SRC_URI="mirror://kernel/linux/utils/kernel/kmod/${P}.tar.xz"
 	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 fi