From c076103471010bba53d8ee8ebce1f59fa3069fe5 Mon Sep 17 00:00:00 2001 From: Doug Goldstein Date: Wed, 14 Feb 2007 07:10:17 +0000 Subject: [PATCH] HAL does not read gzipped pci.ids data. Package-Manager: portage-2.1.2-r9 --- sys-apps/hal/ChangeLog | 5 ++++- sys-apps/hal/Manifest | 22 ++++++++++---------- sys-apps/hal/hal-0.5.7.1-r5.ebuild | 13 +++--------- sys-apps/pciutils/Manifest | 32 +++++++++++++++--------------- 4 files changed, 34 insertions(+), 38 deletions(-) diff --git a/sys-apps/hal/ChangeLog b/sys-apps/hal/ChangeLog index daf84c41a9fd..73b1eabe1dbf 100644 --- a/sys-apps/hal/ChangeLog +++ b/sys-apps/hal/ChangeLog @@ -1,6 +1,9 @@ # 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.127 2007/02/14 06:19:56 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/ChangeLog,v 1.128 2007/02/14 07:10:17 cardoe Exp $ + + 14 Feb 2007; Doug Goldstein hal-0.5.7.1-r5.ebuild: + HAL does not read gzipped pci.ids data. 14 Feb 2007; Doug Goldstein hal-0.5.7.1-r5.ebuild: Retain current dmidecode behavior diff --git a/sys-apps/hal/Manifest b/sys-apps/hal/Manifest index cb4ace7f7183..9bd99638521d 100644 --- a/sys-apps/hal/Manifest +++ b/sys-apps/hal/Manifest @@ -119,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 6401 RMD160 498c2b7a20509cb61dda5944fd72a30f0ae95bc0 SHA1 f3ed40a4f3093071d9b1f3c97bfa6ed7311755ca SHA256 ccaf45f67d31940ef1d5172c4e369e1942d78bc4a4da958bb2a5e64b35d6b5fa -MD5 b968304e54af43fa1aff37b28b2f9bcb hal-0.5.7.1-r5.ebuild 6401 -RMD160 498c2b7a20509cb61dda5944fd72a30f0ae95bc0 hal-0.5.7.1-r5.ebuild 6401 -SHA256 ccaf45f67d31940ef1d5172c4e369e1942d78bc4a4da958bb2a5e64b35d6b5fa hal-0.5.7.1-r5.ebuild 6401 -MISC ChangeLog 19566 RMD160 092f13cf380b3d8c5c373572b79e452c26d61c16 SHA1 0491165a91ed3f0ebb114c9a62f9fcf40b2c6980 SHA256 ee9d37079dffb6b656e4b3118952b03976d230316691fb9113c1634e7bfcaa97 -MD5 8c2ca01fbc027a101b9161ea29e37bf4 ChangeLog 19566 -RMD160 092f13cf380b3d8c5c373572b79e452c26d61c16 ChangeLog 19566 -SHA256 ee9d37079dffb6b656e4b3118952b03976d230316691fb9113c1634e7bfcaa97 ChangeLog 19566 +EBUILD hal-0.5.7.1-r5.ebuild 6142 RMD160 d41427c096f225a0ba20d45728ccfb5634f01412 SHA1 808f0c0449e32d4858fbc3a848b4465aeb09806d SHA256 ce595e7327a17664ae0e9d303a922abdfca8f1f91b30fa2532d1a966a31eaeae +MD5 1b58038562550601a83296e8d4be3865 hal-0.5.7.1-r5.ebuild 6142 +RMD160 d41427c096f225a0ba20d45728ccfb5634f01412 hal-0.5.7.1-r5.ebuild 6142 +SHA256 ce595e7327a17664ae0e9d303a922abdfca8f1f91b30fa2532d1a966a31eaeae hal-0.5.7.1-r5.ebuild 6142 +MISC ChangeLog 19682 RMD160 83b8285fc3ff01cd129a83eafc91119c5d680a3c SHA1 2a2291686a4e46293ef71d4215af0f59f48e1d4e SHA256 09ad472864fbaa50720adcd3789052b8542ab01289aa351e7ed2d37779d15546 +MD5 ee9be862158d2dd06bb936b76ef31b72 ChangeLog 19682 +RMD160 83b8285fc3ff01cd129a83eafc91119c5d680a3c ChangeLog 19682 +SHA256 09ad472864fbaa50720adcd3789052b8542ab01289aa351e7ed2d37779d15546 ChangeLog 19682 MISC metadata.xml 223 RMD160 ca8850c4808c8972fe9995c456578ff23cb4b3fb SHA1 28aa498172fa4c6f437adb79913ae16f4deb0c0c SHA256 49dd14861ed993df9f3509f82bb7f77e524b4b6c0e137677bb9f873d9cd8541d MD5 885e3073744523eaf2450514a311758b metadata.xml 223 RMD160 ca8850c4808c8972fe9995c456578ff23cb4b3fb metadata.xml 223 @@ -146,7 +146,7 @@ SHA256 6fede189bf70fa0a1009bcefea0a23a8941a051256e7fafc16793324db3c61c0 files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.2 (GNU/Linux) -iD8DBQFF0qoGoeSe8B0zEfwRAgq2AJ49bdhAMLUzp0e/tPdVkzxluRaxpwCfWkL1 -gXWxRO9aXDKMKTU4YPiPPVo= -=LFC5 +iD8DBQFF0rXSoeSe8B0zEfwRAphsAJ91PascuAd7p83UyF+7HAlnNTDrWQCfRidm +AYyJUPxkw2vHCqJpSSZWlQc= +=6+nW -----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 2686f3b8282f..1846240e158e 100644 --- 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.4 2007/02/14 06:19:56 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/hal/hal-0.5.7.1-r5.ebuild,v 1.5 2007/02/14 07:10:17 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 + =sys-apps/dmidecode-2.7 ) @@ -140,19 +140,12 @@ src_unpack() { } src_compile() { - if [ -r "${ROOT}/usr/share/misc/pci.ids.gz" ] ; then - hwdata="${ROOT}/usr/share/misc/pci.ids.gz" - elif [ -r "${ROOT}/usr/share/misc/pci.ids" ] ; then - hwdata="${ROOT}/usr/share/misc/pci.ids" - else - die "pci.ids file not found. please file a bug @ bugs.gentoo.org" - fi econf \ --with-doc-dir=/usr/share/doc/${PF} \ --with-os-type=gentoo \ --with-pid-file=/var/run/hald.pid \ - --with-hwdata=${hwdata} \ + --with-hwdata=/usr/share/misc \ --enable-hotplug-map \ $(use_enable debug verbose-mode) \ $(use_enable pcmcia pcmcia-support) \ diff --git a/sys-apps/pciutils/Manifest b/sys-apps/pciutils/Manifest index 4b3deae4acdb..d1554db1c6f3 100644 --- a/sys-apps/pciutils/Manifest +++ b/sys-apps/pciutils/Manifest @@ -31,18 +31,18 @@ EBUILD pciutils-2.2.3-r2.ebuild 1105 RMD160 a62ab053b2b06a6c97fd083a547a9109ec08 MD5 d523189f320d388c4efaebf6b7f96338 pciutils-2.2.3-r2.ebuild 1105 RMD160 a62ab053b2b06a6c97fd083a547a9109ec0888cb pciutils-2.2.3-r2.ebuild 1105 SHA256 8292bfde52c50795fefc8d0f14a9a6ddd3c4fd628977e94759e33614a2822efb pciutils-2.2.3-r2.ebuild 1105 -EBUILD pciutils-2.2.4-r1.ebuild 1192 RMD160 820bb152d0508602eafac5b528c3d77fd4337c19 SHA1 2ead8616fc59638edd057d59e26b458a0f64539e SHA256 2c3d5d23f33479966cd0a6f9d70497965dd450ad595792f146b82babe6b792fe -MD5 0fe7e700da28b03afeaa3c72019bb0af pciutils-2.2.4-r1.ebuild 1192 -RMD160 820bb152d0508602eafac5b528c3d77fd4337c19 pciutils-2.2.4-r1.ebuild 1192 -SHA256 2c3d5d23f33479966cd0a6f9d70497965dd450ad595792f146b82babe6b792fe pciutils-2.2.4-r1.ebuild 1192 -EBUILD pciutils-2.2.4.ebuild 1143 RMD160 3726086f5b20547df958e81784ec2b171fb20052 SHA1 5305a0541fd4fa9071ac8ae4f3eb162e6357a059 SHA256 e1cc126b1524ccc8e88cb121530ddb4b9f7ad50091be894874ec079e9b416f6b -MD5 994c9ced4f8823ea826883ced3d9c3ee pciutils-2.2.4.ebuild 1143 -RMD160 3726086f5b20547df958e81784ec2b171fb20052 pciutils-2.2.4.ebuild 1143 -SHA256 e1cc126b1524ccc8e88cb121530ddb4b9f7ad50091be894874ec079e9b416f6b pciutils-2.2.4.ebuild 1143 -MISC ChangeLog 12222 RMD160 83db8f7ea4186de13fabd6ce1403d3737c359512 SHA1 ac3624241be6e760c25ca4e5c3fdcd1adc022457 SHA256 8fb01de3df39a11eadb4c474d3a449b4c9a990b0e5384ef8f26d472c2513b96f -MD5 6b18aa3b1689d5d1d7ffbb373233b517 ChangeLog 12222 -RMD160 83db8f7ea4186de13fabd6ce1403d3737c359512 ChangeLog 12222 -SHA256 8fb01de3df39a11eadb4c474d3a449b4c9a990b0e5384ef8f26d472c2513b96f ChangeLog 12222 +EBUILD pciutils-2.2.4-r1.ebuild 1267 RMD160 d9b2cfe028e2b21d3cca84de159a997d3638b34b SHA1 415d11b8279b145b0b6eb75059b82aa0efc01ae1 SHA256 59bad16cf81f8dbccd9569b9b51c268b1fa312582618659214f02f30ecf56761 +MD5 f658769cf3e6264d159b8fb65ea24dbf pciutils-2.2.4-r1.ebuild 1267 +RMD160 d9b2cfe028e2b21d3cca84de159a997d3638b34b pciutils-2.2.4-r1.ebuild 1267 +SHA256 59bad16cf81f8dbccd9569b9b51c268b1fa312582618659214f02f30ecf56761 pciutils-2.2.4-r1.ebuild 1267 +EBUILD pciutils-2.2.4.ebuild 1216 RMD160 d6a674f1c216bc98e666dbca49bf4d4c0cf63cf0 SHA1 cf4d0c46e75ab3de5238e02dd2229d576ed6c692 SHA256 510cdb4bf7aebcabcbb5cdba13f99697d357fc83c4ef8ab4ff62a4e05ddaca0d +MD5 98495ca258c2734d0d4a6c78d8d60e4d pciutils-2.2.4.ebuild 1216 +RMD160 d6a674f1c216bc98e666dbca49bf4d4c0cf63cf0 pciutils-2.2.4.ebuild 1216 +SHA256 510cdb4bf7aebcabcbb5cdba13f99697d357fc83c4ef8ab4ff62a4e05ddaca0d pciutils-2.2.4.ebuild 1216 +MISC ChangeLog 12350 RMD160 0d052d44943e83055c4f39a8686b547ae9f3bfec SHA1 0ef27030b680b6b02abce53e591f370e3f87bf6e SHA256 df546094dd9d396fdd2ec5b31503b81ce8f35406927141d855b76f27796384dd +MD5 8aff6b0bfc06bb7e866c6d76107ad593 ChangeLog 12350 +RMD160 0d052d44943e83055c4f39a8686b547ae9f3bfec ChangeLog 12350 +SHA256 df546094dd9d396fdd2ec5b31503b81ce8f35406927141d855b76f27796384dd ChangeLog 12350 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164 @@ -57,9 +57,9 @@ MD5 8047d659733954340720ecb0b723fad1 files/digest-pciutils-2.2.4-r1 244 RMD160 8349223dbbf327febd748b605899805650b1bb85 files/digest-pciutils-2.2.4-r1 244 SHA256 ae83c0072554b83b7519828f5470144cfa69ca5605ed319117d5400896258701 files/digest-pciutils-2.2.4-r1 244 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.6-ecc01.6 (GNU/Linux) +Version: GnuPG v2.0.2 (GNU/Linux) -iD8DBQFF0dYvKRy60XGEcJIRAj5TAKCYLO2DjyIJ/q7wAizjY0lJ4H6HoACghDyd -QPRhijlURHHty1/IzrGjmcU= -=p2wp +iD8DBQFF0rbs8bi6rjpTunYRAmIrAJ4lIuHVsAFjJLOARAEUrxMB0UxGOgCggz9+ +ehRT+LTcg7yuPaAehM7vOjU= +=H1gT -----END PGP SIGNATURE----- -- 2.26.2