Force recent enough sys-libs/zlib for zlib.pc pkg-config file to be present wrt #427130 by Nick Bowler

Package-Manager: portage-2.2.0_alpha116/cvs/Linux x86_64

4 files changed, 21 insertions, 24 deletions

diff --git a/sys-apps/kmod/ChangeLog b/sys-apps/kmod/ChangeLog
index d336b512af41..c2cee2f5e8f0 100644
--- a/sys-apps/kmod/ChangeLog
+++ b/sys-apps/kmod/ChangeLog
@@ -1,5 +1,10 @@
 # ChangeLog for sys-apps/kmod
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/ChangeLog,v 1.45 2012/07/17 15:48:42 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/ChangeLog,v 1.46 2012/07/20 16:36:42 ssuominen Exp $
+
+  20 Jul 2012; Samuli Suominen <ssuominen@gentoo.org> kmod-9-r3.ebuild,
+  kmod-9999.ebuild:
+  Force recent enough sys-libs/zlib for zlib.pc pkg-config file to be present
+  wrt #427130 by Nick Bowler
 
   17 Jul 2012; William Hubbs <williamh@gentoo.org> -kmod-9-r2.ebuild:
   remove broken version
diff --git a/sys-apps/kmod/Manifest b/sys-apps/kmod/Manifest
index fe949cb7a69f..273599865f2f 100644
--- a/sys-apps/kmod/Manifest
+++ b/sys-apps/kmod/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX kmod-8-gc-sections.patch 3167 SHA256 d0f9a28f01b3ab7a00f53a97f8d1596977c945f9125e884e9eaa850e1f433281 SHA512 da6f05d784028536e5861c84add81b54f4e6338672aa576c92b95555dc75d18bdd5d6d689d7cc9ba0526866c23913e9bfbbccf3888e376fbaabd9053021e6a36 WHIRLPOOL ef143dd901a8b2dd46cbd45bfd030fb44ae67b7c333ae10dd7761ec5b12e3c7e93cc4e343c9c9642b410eef67051fe2a6542bab20418c805f526e9465ee5dfcf
 DIST kmod-7.tar.xz 981936 SHA256 9806ee5eeffe7e0c41959f6284795dca2fd1b1eade975524913536c7bef07af7 SHA512 8cf1c4fdb7cc9eea43ceb8e5baecbd763d026eaf7bbc75dcbcd965b5523003f2be5e0dc7fb9c5ae7564bd28d35f1b6bdb3eda8f43aa2cbdd7cab44be21d74a62 WHIRLPOOL 7d5545182cff93504604646a934efe89a937f841e0b3d9be77f1636a5db7f1d0664dbd1dd8596e64b07290e45df46542fa44b01b9f240f1e99cb96ad022982bc
@@ -7,15 +7,19 @@ DIST kmod-8.tar.xz 986632 SHA256 35f7d1dfcf62ea3d6da1ed0ee41a7997333680033609c5e
 DIST kmod-9.tar.xz 1122668 SHA256 0607267cb62dbc9009d0719f442a56f97f64d9983e20dbcaedfff9073abdcecf SHA512 912404830d46ab27f9472a4ce0272c03b16b36291069f9cf1a51bc533429fe8f46d7a749edc399fb1631a435dea4077728d0a5b16961603fdde339d3e2b14f1f WHIRLPOOL 1f769b640b97aa248dcf8b0360f6733ce498bdac571b8710154c455d9971367c1d16204fd4acf1d898d4e0af93892c0f4c6e23ff62d50d96b75b69d5668ffb9b
 EBUILD kmod-7.ebuild 2043 SHA256 d3857975eeeb75bd43c89f930acc00493cf1ff50b4d55f784ac4d3901fc7a6e2 SHA512 c9be6f3cc835d15da7621fd463f98444e38814195c49808f5c66080fa9b3dc05aef2bebccbd2e42b2b59fe577768e5db4d6ece9e0249c52b28f3f3deaceb9759 WHIRLPOOL bebdca2513c3da37fb16bb4f5b9eca8ae8d0407142e8c864f533db4a87e854f609b36a01cf32bc8dc981480fbe683b40f409818746041ca5ca97fe5b0f3711aa
 EBUILD kmod-8.ebuild 2047 SHA256 64e6f1a538c996eafc0019e10265a40ebee231f6521dc95d4b5670c3a4558eba SHA512 b9bce18da0965e7cfb604a8ea50570ec834ec86fe388fd2eb573eeb2c82befb4539051ecb20047bba7777f94fdab14194dcb4f53bda26677cf4658b5967e45ab WHIRLPOOL 9091f6381e18fa326116c8fe1dee697cdba123abd9b359c1324a22433f36cef53f8c9136ed39829abea1fe498057652478992666b8a444b11ab19f4c4cc26222
-EBUILD kmod-9-r3.ebuild 2195 SHA256 45b259ff7eab0015e8cd7ee04bfc87d28cac29fada12b59bb42615bb0a734d5f SHA512 c74984b2047e2fa8d78c4420fabde95e9a5b9c409f879755dc385e7f6d30ea70f99fbcd4d41d3c883261892c9a901f65820e6bd396493a7c8b134393b53d807b WHIRLPOOL 6de4244401223e9647e1ef6d065e98b29b3e135263085f4a899a016fdc9a01423c3f8bce6fe5c2897e5c411276b2d1363bcd3725edf776dc782a6e4437836055
+EBUILD kmod-9-r3.ebuild 2065 SHA256 9b2c727f0c68867efa303c5e23214e5eec74bf9142ed2ea99cf66dffda534689 SHA512 4cb054c5647ad5727ba11c13dad4f1406f6ea30ab492862ba80c4cd9f24ead6fc5315fd0690142a961af045835a89c600fe4cde7f5afc86f07ea51725a1beda5 WHIRLPOOL fcda4d79949512339789b47c2aaacf1663505245bc562462ca6544d3288c200a1095997279f8f813c8597743db252976654496e305ef557bd446a9e0e82a6ba9
 EBUILD kmod-9.ebuild 2004 SHA256 106abde60c03dac6a0c850c7afa066b3586aef84ba4442760cb67825231bbd55 SHA512 7f50074e5f60201dfc8bdac6b6d570c3b55c5d221e498943e458c9a740e0ad95e18b50c424395356b50a93ca3687f1300a1280c448a35e530c3277cad0619183 WHIRLPOOL 6c16bd94577dd0e7ec1b15a4f29967cadcb56a8cf7ddeb4aebb49c627e0bafc9b7857e9d20fc80ee4e9c1f6f6516223e048ab64245c8920d2ec32e3cac23c388
-EBUILD kmod-9999.ebuild 2214 SHA256 6c47f7a51101b1b5425f2ec5ec2cf952c34807caaa82191775161478b01fa570 SHA512 55099e4572edd6eab289106fd98a0fbc4ce68836bd294997ae319445cc24c3f2cf9e3c9415e32946ba87fc0ee46f6bc81f2de12910f184fbab007cf00ac6412c WHIRLPOOL 99b9c876f7723544e7cc7e68dc42810d7a7252b979e2dbe39fe5ec3f0ea13f63d55558f234456088bc94d7d5ea919fd8c056f1d06251d393289a7becc416c5b9
-MISC ChangeLog 6445 SHA256 c7e467d84412e137b57f914a5b7f8baf93478abda64c8734d7af46197cc97346 SHA512 f4b12416d0d0dd1174489f05a39cfae7ee8639b3f0872c0e8d5075862e6e449a0f4f78225d368d6027e5c3b524519ea78d6d8a68efcc15da65135a7fec311d65 WHIRLPOOL d85b26498f7126cbcda022ad35d3a4522462c1a7c9a1384ea6b75a8ef5ae1d265b024583a189d6c0f776ce356386c091a2b5aba41e7f28115891ff27f137a928
+EBUILD kmod-9999.ebuild 2084 SHA256 a6fe6b8c00317ef3ae715e08af4b2b66ab9672e2d1d4361afd0ff3ffcbd1449e SHA512 c95e330723da11eea6bc81e6aaed75dbfb166a84cbf9403f037626d0fe323b281cfe6d6b723f98bd7ad5a85171b73a22fda27d690c21487135ec0b1610df5639 WHIRLPOOL 2165aff84d41b75c80a1bf21b429cfe402cef60a632fa5fe19cac8483093d209dd3e6242d65b57acf8edff2c874286843e9c2f045da8ded143a946bb1bf3bb86
+MISC ChangeLog 6646 SHA256 af4b8db284eccf7a442dec54cc4f7fe6ab6f5fe1957a599df73add4b73ae985f SHA512 dc6a8d0965d533049d13b9d161947f20c16870a4c18e9d0254fcbf071247ddb640b8ca5cd09af2285a45515790f445cf353430e2145f5ed8cb3744883a6d2f52 WHIRLPOOL 932b0bb760921b8564048b658b38ce423570029ccb91aed7533c632bbce69fb8515424b38468f8c27d16bbeaab5d41ae03456ca37b61310348d8a8d61586e040
 MISC metadata.xml 317 SHA256 3e218c5ce1f8ed50d1d4bd6669da4d234af5bbb12f282ec2acf7775c20e68ad4 SHA512 0bc79bc83389f92e10f16b206d78331ed202132ed5648f299443ff4f912b68f753563e040d933deafb1b96e45a9f0212af50475e091c87921e67bcb814e2b881 WHIRLPOOL 57ce9247535050840bc4bfed021fa883e31ad4f24b2f3629416bf73e069f0848a99280c66b42457566138c24ce1274b3e41ef4bb89f387ddf713a6dac79a33c7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlAFiXAACgkQblQW9DDEZTh2eACfW5nXy2quSKeHDq/oazXF2k0R
-YMQAn3GrNQ+ReheVg6b0MfmT8O1zaqnZ
-=5yZ7
+iQEcBAEBAgAGBQJQCYeDAAoJEEdUh39IaPFNb+cIAKL2AfBGdiiSBfuvUUDYLXx5
+QSDP3HP1QT9trX66HfhYo1Xku5w6tQ3LrZTTebkC57+FOf2RvzKM3g6Pl42kMYHn
+A+Pvqpa6t8KchFxjmt4wXlAaNdGrJuretEFQu1KnnoXHP9zlgsc0V/ItecsDPh+T
+3kpkewZ4F8Y2edQa/8cnEFLcjHeENJ61Bc03o9qLoe6TzWpxxEcEqh3o+8G8bSYO
+Pu0C7yJfjmF/eEUUOZjaO3viRmlSVvEYOpIYFkpGecmESxXTR02Or2wSv1sjK/HA
+wk15z02w6Sl1llIJI6Tnva0Cpty7eMkVpI5mejpIpacpMQ1UUYtLIlUkO9n9tWk=
+=toJH
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/kmod/kmod-9-r3.ebuild b/sys-apps/kmod/kmod-9-r3.ebuild
index 90a420d33f67..8032b7856470 100644
--- a/sys-apps/kmod/kmod-9-r3.ebuild
+++ b/sys-apps/kmod/kmod-9-r3.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-9-r3.ebuild,v 1.1 2012/07/17 12:30:36 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-9-r3.ebuild,v 1.2 2012/07/20 16:36:42 ssuominen Exp $
 
 EAPI=4
 
@@ -25,7 +25,7 @@ IUSE="debug doc lzma static-libs +tools zlib"
 RDEPEND="!sys-apps/module-init-tools
 	!sys-apps/modutils
 	lzma? ( app-arch/xz-utils )
-	zlib? ( sys-libs/zlib )"
+	zlib? ( >=sys-libs/zlib-1.2.6 )" #427130
 DEPEND="${RDEPEND}
 	doc? ( dev-util/gtk-doc )
 	lzma? ( virtual/pkgconfig )
@@ -53,12 +53,6 @@ src_prepare()
 
 src_configure()
 {
-	# http://bugs.gentoo.org/410865
-	if has_version '<sys-libs/zlib-1.2.6'; then
-		export zlib_CFLAGS="-I/usr/include"
-		export zlib_LIBS="-lz"
-	fi
-
 	econf \
 		$(use_enable static-libs static) \
 		$(use_enable tools) \
diff --git a/sys-apps/kmod/kmod-9999.ebuild b/sys-apps/kmod/kmod-9999.ebuild
index 8f354b303ba8..a184c7bf4ce7 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.30 2012/07/17 12:36:53 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-9999.ebuild,v 1.31 2012/07/20 16:36:42 ssuominen Exp $
 
 EAPI=4
 
@@ -25,7 +25,7 @@ IUSE="debug doc lzma static-libs +tools zlib"
 RDEPEND="!sys-apps/module-init-tools
 	!sys-apps/modutils
 	lzma? ( app-arch/xz-utils )
-	zlib? ( sys-libs/zlib )"
+	zlib? ( >=sys-libs/zlib-1.2.6 )" #427130
 DEPEND="${RDEPEND}
 	doc? ( dev-util/gtk-doc )
 	lzma? ( virtual/pkgconfig )
@@ -53,12 +53,6 @@ src_prepare()
 
 src_configure()
 {
-	# http://bugs.gentoo.org/410865
-	if has_version '<sys-libs/zlib-1.2.6'; then
-		export zlib_CFLAGS="-I/usr/include"
-		export zlib_LIBS="-lz"
-	fi
-
 	econf \
 		$(use_enable static-libs static) \
 		$(use_enable tools) \