Added a check for USE=zlib and checking if sys-apps/pciutils was built with USE=zlib. This closes bug #171022.

Package-Manager: portage-2.1.3_rc4

3 files changed, 27 insertions, 16 deletions

diff --git a/app-laptop/smcinit/ChangeLog b/app-laptop/smcinit/ChangeLog
index 6364a8a86a6b..11bf097376d1 100644
--- a/app-laptop/smcinit/ChangeLog
+++ b/app-laptop/smcinit/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-laptop/smcinit
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/smcinit/ChangeLog,v 1.5 2007/04/28 17:49:10 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/smcinit/ChangeLog,v 1.6 2007/06/22 18:10:51 wolf31o2 Exp $
+
+  22 Jun 2007; Chris Gianelloni <wolf31o2@gentoo.org> smcinit-0.4.ebuild:
+  Added a check for USE=zlib and checking if sys-apps/pciutils was built with
+  USE=zlib. This closes bug #171022.
 
   28 Apr 2007; Sven Wegener <swegener@gentoo.org> smcinit-0.4.ebuild:
   Fix *initd, *confd and *envd calls (#173884, #174266)
diff --git a/app-laptop/smcinit/Manifest b/app-laptop/smcinit/Manifest
index 58b16d497163..28b45b1d121f 100644
--- a/app-laptop/smcinit/Manifest
+++ b/app-laptop/smcinit/Manifest
@@ -14,14 +14,14 @@ MD5 78b68ef7f4de4826ce614b19fa2228e5 files/smcinit.initscript 693
 RMD160 c21f3a396a7316d81117da1f4554659945548051 files/smcinit.initscript 693
 SHA256 2f24cb951736351c221c2c01005eb71950ac55c03a76a00d4f8afbd49650e249 files/smcinit.initscript 693
 DIST smcinit-0.4-1.tar.gz 32343 RMD160 184289babfbadc1bd93daefa37fb0db1654bac4e SHA1 e777844050d904db1e25081b1cf5e694f579ba60 SHA256 403b4c1e5fedf113f97f6ce0beccac43b6e17c53a8e04d159022138b33810032
-EBUILD smcinit-0.4.ebuild 1289 RMD160 bfce3153801f1aa3f23a4a57e37a90f8a5b200ee SHA1 821b5502ea70a06b7661a222b23e5e90b43d2643 SHA256 334b40e2ec1435938abe2cefaa6ecd3b8152af1b68aafa8dd7599bc99505d9f3
-MD5 07a80d31d5fba8253c9d4a966cb25f44 smcinit-0.4.ebuild 1289
-RMD160 bfce3153801f1aa3f23a4a57e37a90f8a5b200ee smcinit-0.4.ebuild 1289
-SHA256 334b40e2ec1435938abe2cefaa6ecd3b8152af1b68aafa8dd7599bc99505d9f3 smcinit-0.4.ebuild 1289
-MISC ChangeLog 852 RMD160 1d000a68472a84d0bafe2b8750002fa58ba20d5d SHA1 4a2d0bc298d7d1b58bf816c14cf151130e399bb2 SHA256 c505773d59ecc1fe11717ac587a87b0132ff00b6ef45e784e562314adf39d381
-MD5 cac0ad3d9ddb965854858d5242117b8b ChangeLog 852
-RMD160 1d000a68472a84d0bafe2b8750002fa58ba20d5d ChangeLog 852
-SHA256 c505773d59ecc1fe11717ac587a87b0132ff00b6ef45e784e562314adf39d381 ChangeLog 852
+EBUILD smcinit-0.4.ebuild 1467 RMD160 eea98eb7afe80f6c03b9abcca0df35625ef3c590 SHA1 f00b8279edb2f90cae02daaa34a2e9f644992b85 SHA256 d98db77db074e401a06c91500d97eebc615b014559c19fd7c9c00ecb4fb3c69a
+MD5 e7dd7c9f480b2d5d9dcb3332a9cfe95a smcinit-0.4.ebuild 1467
+RMD160 eea98eb7afe80f6c03b9abcca0df35625ef3c590 smcinit-0.4.ebuild 1467
+SHA256 d98db77db074e401a06c91500d97eebc615b014559c19fd7c9c00ecb4fb3c69a smcinit-0.4.ebuild 1467
+MISC ChangeLog 1042 RMD160 753b28b90f4be761a21daef29bee605f6843dbe8 SHA1 1f908dc9d63acb3d35e1e73df71a4c85bfa61115 SHA256 39a2e6bdbe88344ae15ccfd6cfe4684e1cc442976e9b432bfa87b03b9bdf25f3
+MD5 f1a3f446f52c77ace369e4c9db44a3de ChangeLog 1042
+RMD160 753b28b90f4be761a21daef29bee605f6843dbe8 ChangeLog 1042
+SHA256 39a2e6bdbe88344ae15ccfd6cfe4684e1cc442976e9b432bfa87b03b9bdf25f3 ChangeLog 1042
 MISC metadata.xml 253 RMD160 335a23cb4d2aea71dee602c0ca2c3115a75ae848 SHA1 14b9340fa03a497144331e26d79bbed3ac7b60de SHA256 6e3e64388cc45be370a002b6ac4f0d7b403b16a749388e991ca9a434883b816d
 MD5 43d8098cf6b1c18339b5f3934dcdf9c4 metadata.xml 253
 RMD160 335a23cb4d2aea71dee602c0ca2c3115a75ae848 metadata.xml 253
@@ -30,9 +30,9 @@ MD5 5a669e980f6abd3a35ddd3fc8df9480b files/digest-smcinit-0.4 238
 RMD160 7e1e46978b871261a3d3634f8f58ca2144f63736 files/digest-smcinit-0.4 238
 SHA256 48c43cc7fffdbd44b194d1d8c77d84dfd0767bc8e2bd649b59e2b697050b83e3 files/digest-smcinit-0.4 238
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
+Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGM4kqI1lqEGTUzyQRAs71AJ9uu/zIqhD33jFdQHVGy6ruoHmQCgCfdszs
-ahKBBPhbBG6nq5vzxgZCVbg=
-=3MqP
+iD8DBQFGfBCxkT4lNIS36YERAnpTAKC+HY1hk8bWvHSNqKUaSpfsUUfYugCfUZ4E
+I2LmH2Mn4Xz3RvGSyLgaY38=
+=9RxA
 -----END PGP SIGNATURE-----
diff --git a/app-laptop/smcinit/smcinit-0.4.ebuild b/app-laptop/smcinit/smcinit-0.4.ebuild
index 9773a8c8067a..0507216a44c8 100644
--- a/app-laptop/smcinit/smcinit-0.4.ebuild
+++ b/app-laptop/smcinit/smcinit-0.4.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/smcinit/smcinit-0.4.ebuild,v 1.5 2007/04/28 17:49:10 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/smcinit/smcinit-0.4.ebuild,v 1.6 2007/06/22 18:10:51 wolf31o2 Exp $
 
 inherit eutils
 
-IUSE=""
+IUSE="zlib"
 
 MY_PV="0.4-1"
 MY_P="${PN}-${MY_PV}"
@@ -32,8 +32,15 @@ src_unpack()
 
 src_compile()
 {
+	if use zlib
+	then
+		LIBS="-lpci -lz"
+	elif built_with_use sys-apps/pciutils zlib
+	then
+		die "You need to build with USE=zlib to match sys-apps/pcituils"
+	fi
 	econf || die "Configuration failed"
-	emake CFLAGS="${CFLAGS}" || die "Compilation failed"
+	emake LIBS="${LIBS}" CFLAGS="${CFLAGS}" || die "Compilation failed"
 }
 
 src_install()