Fix issue with newer pciutils that uses gzipped pci.ids, which HAL can not handle

Package-Manager: portage-2.1.2-r9

diff --git a/sys-apps/hal/ChangeLog b/sys-apps/hal/ChangeLog
index c409156ff56644e53db7aa3ec4f11f05ac898030..ba11ea8e42385adc01f4980948b91d5ec3527eb1 100644 (file)
--- a/sys-apps/hal/ChangeLog
+++ b/sys-apps/hal/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/hal
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.130 2007/02/14 08:28:15 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.131 2007/02/14 16:53:00 cardoe Exp $
+
+  14 Feb 2007; Doug Goldstein <cardoe@gentoo.org> hal-0.5.7.1-r5.ebuild:
+  Fix issue with newer pciutils that uses gzipped pci.ids, which HAL can not
+  handle
 
   14 Feb 2007; Markus Rothe <corsair@gentoo.org> hal-0.5.7.1-r5.ebuild:
   Stable on ppc64; bug #166790

diff --git a/sys-apps/hal/Manifest b/sys-apps/hal/Manifest
index 139e9cde5b22fb817f0296a1f154c8304314dd5e..78cf74513099bef086818e01c0695a077e50593e 100644 (file)
--- a/sys-apps/hal/Manifest
+++ b/sys-apps/hal/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 0.5-hald.rc 681 RMD160 f94d4a6e4ffb3beb84eeeb8e25564fa566ecc493 SHA1 fe413a84ee58cefa923cbc922a1c961fbdb17aa6 SHA256 802f83998c50a3e030d1db2f5a8364e4bb10eebecd464683445d63cf56702161
 MD5 facf81eeca7ebddff5d030acb36de31d files/0.5-hald.rc 681
 RMD160 f94d4a6e4ffb3beb84eeeb8e25564fa566ecc493 files/0.5-hald.rc 681
@@ -116,14 +119,14 @@ EBUILD hal-0.5.7.1-r4.ebuild 6214 RMD160 dbc2befe87613fde41bacd74f087ded5fea10ba
 MD5 848426833518e6fc7e093821e75f25a2 hal-0.5.7.1-r4.ebuild 6214
 RMD160 dbc2befe87613fde41bacd74f087ded5fea10bab hal-0.5.7.1-r4.ebuild 6214
 SHA256 159d5ef840125742c6b1f2880ee9ad50d77a77cb29b42a9b46a0094920835199 hal-0.5.7.1-r4.ebuild 6214
-EBUILD hal-0.5.7.1-r5.ebuild 6141 RMD160 11213d5e707205b22ceb3b339d256df9c21e252b SHA1 a873afcfafaafe745859e1ec3977795037b08556 SHA256 65c05cf2e2a89c4669121a0027dff813987627710378922fa3a918849960f954
-MD5 30bbe8244cf66a19692e5653d4cd26c1 hal-0.5.7.1-r5.ebuild 6141
-RMD160 11213d5e707205b22ceb3b339d256df9c21e252b hal-0.5.7.1-r5.ebuild 6141
-SHA256 65c05cf2e2a89c4669121a0027dff813987627710378922fa3a918849960f954 hal-0.5.7.1-r5.ebuild 6141
-MISC ChangeLog 19893 RMD160 31d01c14259c5f9ce7d64c6598ad472a704b9f28 SHA1 98a0d7464397dc95c4bf46cd6d579fb45e8f3906 SHA256 174be028152a5e23cf6a40a5783eb65e6f89c918d761abcae357e765343c1e5d
-MD5 63e42a933689548398d47e5d2c14c863 ChangeLog 19893
-RMD160 31d01c14259c5f9ce7d64c6598ad472a704b9f28 ChangeLog 19893
-SHA256 174be028152a5e23cf6a40a5783eb65e6f89c918d761abcae357e765343c1e5d ChangeLog 19893
+EBUILD hal-0.5.7.1-r5.ebuild 6324 RMD160 265635b124238c13666728cbfb7505a8946d6321 SHA1 355d57dd2c5a9f44dc1120ef52ae0cb8e93dca2a SHA256 2883f670f7c7fc4ccbd0fdbc96830082f1a7ebf821c8fd5c107dc7c3cb03c1c3
+MD5 45f616d380492da7729279ebae8ae05c hal-0.5.7.1-r5.ebuild 6324
+RMD160 265635b124238c13666728cbfb7505a8946d6321 hal-0.5.7.1-r5.ebuild 6324
+SHA256 2883f670f7c7fc4ccbd0fdbc96830082f1a7ebf821c8fd5c107dc7c3cb03c1c3 hal-0.5.7.1-r5.ebuild 6324
+MISC ChangeLog 20052 RMD160 251bb866a5361729ac3fd3433432cab0658103d0 SHA1 94482ee3a1918d6b4c592287f85af144cb24ec4a SHA256 e2e79dc64b167ff814a543248030372857113823022a07addc1361ad334f9cd7
+MD5 f1852d9d691dc086df1067a94d969c0c ChangeLog 20052
+RMD160 251bb866a5361729ac3fd3433432cab0658103d0 ChangeLog 20052
+SHA256 e2e79dc64b167ff814a543248030372857113823022a07addc1361ad334f9cd7 ChangeLog 20052
 MISC metadata.xml 223 RMD160 ca8850c4808c8972fe9995c456578ff23cb4b3fb SHA1 28aa498172fa4c6f437adb79913ae16f4deb0c0c SHA256 49dd14861ed993df9f3509f82bb7f77e524b4b6c0e137677bb9f873d9cd8541d
 MD5 885e3073744523eaf2450514a311758b metadata.xml 223
 RMD160 ca8850c4808c8972fe9995c456578ff23cb4b3fb metadata.xml 223
@@ -140,3 +143,10 @@ SHA256 6fede189bf70fa0a1009bcefea0a23a8941a051256e7fafc16793324db3c61c0 files/di
 MD5 f6986582ab2d32e615cb3dbce02614cd files/digest-hal-0.5.7.1-r5 238
 RMD160 dafbac18b72d6d7d879ccb37200ce33a870bb8a1 files/digest-hal-0.5.7.1-r5 238
 SHA256 6fede189bf70fa0a1009bcefea0a23a8941a051256e7fafc16793324db3c61c0 files/digest-hal-0.5.7.1-r5 238
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.2 (GNU/Linux)
+
+iD8DBQFF0z5soeSe8B0zEfwRAhNWAJ4+NsbZzA7iyRv1Bn0FwVCHTYCvZwCffM+b
+cESKaW9ElGDSkprGid0y9Ts=
+=SAjZ
+-----END PGP SIGNATURE-----

diff --git a/sys-apps/hal/hal-0.5.7.1-r5.ebuild b/sys-apps/hal/hal-0.5.7.1-r5.ebuild
index 035d09e8152e861fce5a9f91c0fd85f4234ad85e..cb0c49a2a2e2ea466ea8ddc3ff4273476d957ec4 100644 (file)
--- a/sys-apps/hal/hal-0.5.7.1-r5.ebuild
+++ b/sys-apps/hal/hal-0.5.7.1-r5.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/hal/hal-0.5.7.1-r5.ebuild,v 1.7 2007/02/14 08:28:15 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.7.1-r5.ebuild,v 1.8 2007/02/14 16:53:00 cardoe Exp $
 
 inherit eutils linux-info
 
@@ -19,7 +19,7 @@ RDEPEND=">=dev-libs/glib-2.6
        >=sys-apps/util-linux-2.12r
        || ( >=sys-kernel/linux-headers-2.6 >=sys-kernel/mips-headers-2.6 )
        dev-libs/expat
-       <sys-apps/pciutils-2.2.4
+       sys-apps/pciutils
        dev-libs/libusb
        virtual/eject
        dmi? ( >=sys-apps/dmidecode-2.7 )
@@ -64,6 +64,12 @@ function notify_procfs() {
 }
 
 pkg_setup() {
+       if has_version =sys-apps/pciutils-2.2.4* ; then
+               if built_with_use --missing true =sys-apps/pciutils-2.2.4* zlib ; then
+                       die "You MUST build pciutils without the zlib USE flag"
+               fi
+       fi
+
        kernel_is ge 2 6 15 || ewarn "HAL requires a kernel version 2.6.15 or newer"
 
        if kernel_is lt 2 6 16 ; then