re-work the dependencies since pkgconfig is not a runtime dependency. This moves the dependencies for the lzma and zlib use flags out of common_depend since they are now different for RDEPEND vs DEPEND.

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

4 files changed, 36 insertions, 16 deletions

diff --git a/sys-apps/kmod/ChangeLog b/sys-apps/kmod/ChangeLog
index fd4a226eec9b..afe49ec00bd5 100644
--- a/sys-apps/kmod/ChangeLog
+++ b/sys-apps/kmod/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/kmod
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/ChangeLog,v 1.31 2012/04/02 00:28:23 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/ChangeLog,v 1.32 2012/04/02 03:56:00 williamh Exp $
+
+  02 Apr 2012; William Hubbs <williamh@gentoo.org> kmod-7.ebuild,
+  kmod-9999.ebuild:
+  re-work the dependencies since pkgconfig is not a runtime dependency. This
+  moves the dependencies for the lzma and zlib use flags out of common_depend
+  since they are now different for RDEPEND vs DEPEND.
 
   02 Apr 2012; Robin H. Johnson <robbat2@gentoo.org> kmod-7.ebuild,
   kmod-9999.ebuild:
diff --git a/sys-apps/kmod/Manifest b/sys-apps/kmod/Manifest
index 493c11af19d4..413711c717ba 100644
--- a/sys-apps/kmod/Manifest
+++ b/sys-apps/kmod/Manifest
@@ -1,5 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST kmod-7.tar.xz 981936 RMD160 62acbee83cebe1874a71e318c28203b90d6171bc SHA1 1038cdb5c4570acc5614dcf1c29688f21f3d8c2d SHA256 9806ee5eeffe7e0c41959f6284795dca2fd1b1eade975524913536c7bef07af7
-EBUILD kmod-7.ebuild 1909 RMD160 f702ecdd25a2d17afe568b13ea7a6c96546caf5f SHA1 ee88a4592bbdf6faa9f021c1c6e05dc8faa41846 SHA256 545ff0a1766f113ab889c9be4ad89045f925d6fa93ede43224d6a7ca63af9187
-EBUILD kmod-9999.ebuild 1949 RMD160 5a1b6eec9a809bccdbb592fae474da16a3a4f5f4 SHA1 7096750e1447e80e637525eff43a6cf513324a00 SHA256 4bfcb9c921d2a65892809b1e5a15175747832ef7f1a8f3438399b6a8f30dc336
-MISC ChangeLog 4308 RMD160 008f0158ca7923365ef8523a9fe9b2a0e4655634 SHA1 b011f3240faae9682d54f6155b1645cc00b369a8 SHA256 1226bca4cf8e790f512df83c08886c47d330b6f2b9e1a6427f70e22e68177718
+EBUILD kmod-7.ebuild 1964 RMD160 9eb8f7fbe51628535d36d8fefac90cec9a9643ac SHA1 55df03133fd6fad86ee7caf02e2af91b09b52fec SHA256 16168ef6278659936e143cfaf3e41c04c169ccf50519598e7f9bca00fc9edeff
+EBUILD kmod-9999.ebuild 2003 RMD160 cfbf36251ac3f0ad123d787a419f181762d07cc3 SHA1 434bc0d025e8977b4834f766dc12ba10578fcc86 SHA256 68afa92918dc576a61822dfefa2c22bacf2261892f2fe3b2331c52674399901d
+MISC ChangeLog 4605 RMD160 df0239b54e1cd4f13cfa61ba40a01b788ee30a1f SHA1 0616bb662dd4d017202c19297e43d29b5e76ff03 SHA256 cc136cf9d24cc55d05c2194990c692094f8d34c34205bd38a7dea893a389507c
 MISC metadata.xml 317 RMD160 be31ecaa465b63dc5589669b36f431e05b878afe SHA1 4837b60e64a9a06be18dffb0f31b2ba5cb6bc2aa SHA256 3e218c5ce1f8ed50d1d4bd6669da4d234af5bbb12f282ec2acf7775c20e68ad4
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk95I2AACgkQblQW9DDEZTimZwCeP5LeIjnsaLIRH/TOup8j1X5D
+BoMAn19L4MeviT4QPtBZ9m2zDyfw4nBZ
+=njep
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/kmod/kmod-7.ebuild b/sys-apps/kmod/kmod-7.ebuild
index a700a6fd13eb..db30462b4dd4 100644
--- a/sys-apps/kmod/kmod-7.ebuild
+++ b/sys-apps/kmod/kmod-7.ebuild
@@ -1,6 +1,6 @@
 # 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-7.ebuild,v 1.6 2012/04/02 00:28:23 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-7.ebuild,v 1.7 2012/04/02 03:56:00 williamh Exp $
 
 EAPI=4
 
@@ -23,13 +23,15 @@ SLOT="0"
 IUSE="debug doc lzma static-libs +tools zlib"
 
 COMMON_DEPEND="!sys-apps/module-init-tools
-	!sys-apps/modutils
-	lzma? ( app-arch/xz-utils dev-util/pkgconfig )
-	zlib? ( sys-libs/zlib dev-util/pkgconfig )"
+	!sys-apps/modutils"
 
 DEPEND="${COMMON_DEPEND}
-	doc? ( dev-util/gtk-doc )"
-RDEPEND="${COMMON_DEPEND}"
+	doc? ( dev-util/gtk-doc )
+	lzma? ( app-arch/xz-utils dev-util/pkgconfig )
+	zlib? ( sys-libs/zlib dev-util/pkgconfig )"
+RDEPEND="${COMMON_DEPEND}
+	lzma? ( app-arch/xz-utils )
+	zlib? ( sys-libs/zlib )"
 
 # Upstream does not support running the test suite with custom configure flags.
 # I was also told that the test suite is intended for kmod developers.
diff --git a/sys-apps/kmod/kmod-9999.ebuild b/sys-apps/kmod/kmod-9999.ebuild
index 2f58189ed241..da9eac78a1e0 100644
--- a/sys-apps/kmod/kmod-9999.ebuild
+++ b/sys-apps/kmod/kmod-9999.ebuild
@@ -1,6 +1,6 @@
 # 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.20 2012/04/02 00:28:23 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-9999.ebuild,v 1.21 2012/04/02 03:56:00 williamh Exp $
 
 EAPI=4
 
@@ -23,13 +23,15 @@ SLOT="0"
 IUSE="debug doc lzma static-libs +tools zlib"
 
 COMMON_DEPEND="!sys-apps/module-init-tools
-	!sys-apps/modutils
-	lzma? ( app-arch/xz-utils dev-util/pkgconfig )
-	zlib? ( sys-libs/zlib dev-util/pkgconfig )"
+	!sys-apps/modutils"
 
 DEPEND="${COMMON_DEPEND}
-	doc? ( dev-util/gtk-doc )"
-RDEPEND="${COMMON_DEPEND}"
+	doc? ( dev-util/gtk-doc )
+	lzma? ( app-arch/xz-utils dev-util/pkgconfig )
+	zlib? ( sys-libs/zlib dev-util/pkgconfig )"
+RDEPEND="${COMMON_DEPEND}
+lzma? ( app-arch/xz-utils )
+	zlib? ( sys-libs/zlib )"
 
 # Upstream does not support running the test suite with custom configure flags.
 # I was also told that the test suite is intended for kmod developers.