Modified the zlib linking to use USE=zlib and also check if sys-apps/pciutils was built with zlib support or not.

Package-Manager: portage-2.1.3_rc4

3 files changed, 33 insertions, 12 deletions

diff --git a/sys-apps/hwsetup/ChangeLog b/sys-apps/hwsetup/ChangeLog
index 61df8f97051f..fc25045d9611 100644
--- a/sys-apps/hwsetup/ChangeLog
+++ b/sys-apps/hwsetup/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/hwsetup
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwsetup/ChangeLog,v 1.47 2007/06/19 17:56:02 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwsetup/ChangeLog,v 1.48 2007/06/22 18:22:38 wolf31o2 Exp $
+
+  22 Jun 2007; Chris Gianelloni <wolf31o2@gentoo.org> hwsetup-1.2.ebuild:
+  Modified the zlib linking to use USE=zlib and also check if
+  sys-apps/pciutils was built with zlib support or not.
 
   19 Jun 2007; Chris Gianelloni <wolf31o2@gentoo.org>
   -files/hwsetup-1.1-dyn_blacklist.patch,
diff --git a/sys-apps/hwsetup/Manifest b/sys-apps/hwsetup/Manifest
index 1503be6625af..e2ceb529d830 100644
--- a/sys-apps/hwsetup/Manifest
+++ b/sys-apps/hwsetup/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX hwsetup-1.2-dyn_blacklist.patch 1972 RMD160 d72fec23a306e71fbd9402b043bf2ac88413b353 SHA1 2ccdeb5f0f15c68821434a1e2b081dce229cdf70 SHA256 8fd9a2d691fd4b820ac12535c6fa5a1ba2ccbbc3e9025871ecd054bec454744b
 MD5 5921b87f60624d577b64bbf50f0115e3 files/hwsetup-1.2-dyn_blacklist.patch 1972
 RMD160 d72fec23a306e71fbd9402b043bf2ac88413b353 files/hwsetup-1.2-dyn_blacklist.patch 1972
@@ -11,14 +14,14 @@ MD5 6086609ba91c117fd71bd208548f966a files/hwsetup-1.2-gentoo.patch 1430
 RMD160 fae21df5ef10085fe6336c483b5b2c2145f1f787 files/hwsetup-1.2-gentoo.patch 1430
 SHA256 1d1b6b3199b4a395febe7a68fc85a59c090ab99918f6a5e02739210e7c182e83 files/hwsetup-1.2-gentoo.patch 1430
 DIST hwsetup_1.2-3.tar.gz 10828 RMD160 d3ce42ac74e5b0ccb9ae73fc0092f172b83a653a SHA1 101b42ee5016e250d69dbbfec7cd65e9d499eacd SHA256 faf346f5f342c0ab26631e31440632f6009ff206feafd1667a488e2f0ba4bb37
-EBUILD hwsetup-1.2.ebuild 1396 RMD160 117ac8ecc908b64fb1f5ddda5fd2ab6d470dd412 SHA1 a22853b756e1df3c932564d73298c644b4ad40f3 SHA256 ef1f44a3e5405490f54169c176feee1c38adb9e2c3c576935d7f2db1d5b9fcb8
-MD5 06a02f095a7f3b090f7d6c3b1e4b67c1 hwsetup-1.2.ebuild 1396
-RMD160 117ac8ecc908b64fb1f5ddda5fd2ab6d470dd412 hwsetup-1.2.ebuild 1396
-SHA256 ef1f44a3e5405490f54169c176feee1c38adb9e2c3c576935d7f2db1d5b9fcb8 hwsetup-1.2.ebuild 1396
-MISC ChangeLog 7381 RMD160 64ffdacd451cb17f456008f9c598742fe46a9030 SHA1 73a2f7145e4e7e5a3ff65bddd1ed39a5c1e58621 SHA256 ba9be97bc5f86448dde3d7e89ced83d5608ac696e2e5e1a61dfe07628cc0d4f4
-MD5 08ad8d3b7bba2cea961f05a78d1ab3a4 ChangeLog 7381
-RMD160 64ffdacd451cb17f456008f9c598742fe46a9030 ChangeLog 7381
-SHA256 ba9be97bc5f86448dde3d7e89ced83d5608ac696e2e5e1a61dfe07628cc0d4f4 ChangeLog 7381
+EBUILD hwsetup-1.2.ebuild 1566 RMD160 48636fe56937ef1360d9c0bf7d5ea3e4ee19ac47 SHA1 f73051a89b7a1baa14f9786768d28eca574c597d SHA256 d04330eddeeea520e3dee184f686b7a331a60177ffdd2a2e5d10251c0bc70172
+MD5 9164a67b6486d51a670d973c94788a89 hwsetup-1.2.ebuild 1566
+RMD160 48636fe56937ef1360d9c0bf7d5ea3e4ee19ac47 hwsetup-1.2.ebuild 1566
+SHA256 d04330eddeeea520e3dee184f686b7a331a60177ffdd2a2e5d10251c0bc70172 hwsetup-1.2.ebuild 1566
+MISC ChangeLog 7574 RMD160 acfb79bb9ce8f27bcda8a26b954ad22cfc788a30 SHA1 f102822810d6a881258284adfa492b7110828660 SHA256 f77a4e595985c67f062cace274786c5ef76c7fd3be85aad5805ba0be71db10c4
+MD5 2ac6214d063280ed74ed539c27cd09bf ChangeLog 7574
+RMD160 acfb79bb9ce8f27bcda8a26b954ad22cfc788a30 ChangeLog 7574
+SHA256 f77a4e595985c67f062cace274786c5ef76c7fd3be85aad5805ba0be71db10c4 ChangeLog 7574
 MISC metadata.xml 159 RMD160 8db5ed254a6b9baf8f53368da9e71c5532a46073 SHA1 1e72098aafb1fa729eba6fc8357c7e732eb79dee SHA256 b6e17484225400d76c65d178bf5a10dc0a8da7f345993c2acc63d1093a77c90d
 MD5 d86e5b5e47260e5a965eae2afe6d6d40 metadata.xml 159
 RMD160 8db5ed254a6b9baf8f53368da9e71c5532a46073 metadata.xml 159
@@ -26,3 +29,10 @@ SHA256 b6e17484225400d76c65d178bf5a10dc0a8da7f345993c2acc63d1093a77c90d metadata
 MD5 32fe03d6753fd120a255bc34406df63d files/digest-hwsetup-1.2 238
 RMD160 eb4d62c171333cbd026cd5a639092a72a16d86f2 files/digest-hwsetup-1.2 238
 SHA256 aed4897e28932ad6a8981b961ea8490a2a068dec41d0e659f275204a0b5da30c files/digest-hwsetup-1.2 238
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.4 (GNU/Linux)
+
+iD8DBQFGfBNzkT4lNIS36YERAh80AKCV5g6U9p32HNm3Y85MfK4uZvY24ACgiYvi
+Eat2N28pzwsaiWdl1aqqQ5s=
+=iG1P
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/hwsetup/hwsetup-1.2.ebuild b/sys-apps/hwsetup/hwsetup-1.2.ebuild
index fe2ad911c2f0..2d3a770a5228 100644
--- a/sys-apps/hwsetup/hwsetup-1.2.ebuild
+++ b/sys-apps/hwsetup/hwsetup-1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwsetup/hwsetup-1.2.ebuild,v 1.2 2007/01/31 18:11:15 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwsetup/hwsetup-1.2.ebuild,v 1.3 2007/06/22 18:22:38 wolf31o2 Exp $
 
 inherit eutils toolchain-funcs flag-o-matic
 
@@ -13,9 +13,10 @@ SRC_URI="http://debian-knoppix.alioth.debian.org/sources/${PN}_${MY_PV}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 ia64 -mips ppc ppc64 sparc x86"
-IUSE=""
+IUSE="zlib"
 
 DEPEND="sys-libs/libkudzu
+	zlib? ( sys-libs/zlib )
 	sys-apps/pciutils"
 RDEPEND="${DEPEND}
 	sys-apps/hwdata-gentoo"
@@ -29,7 +30,13 @@ src_unpack() {
 }
 
 src_compile() {
-	append-ldflags -lz
+	if use zlib
+	then
+		append-ldflags -lz
+	elif built_with_use sys-apps/pciutils zlib
+	then
+		die "You need to build with USE=zlib to match sys-apps/pcituils"
+	fi
 	emake LDFLAGS="${LDFLAGS}" OPT="${CFLAGS}" CC="$(tc-getCC)" || die "emake failed"
 }