diff options
| author |   Doug Goldstein <cardoe@gentoo.org> | 2007-02-14 16:53:00 +0000 |
|---|---|---|
| committer | Doug Goldstein <cardoe@gentoo.org> | 2007-02-14 16:53:00 +0000 |
| commit | 7bb7132462034675064cf966a3af77e11d1adece (patch) | |
| tree | c0a20769df86fd862513cc951980b5bb032b90bf /sys-apps/hal | |
| parent | Follow the --missing request when the IUSE file is missing rather then always... (diff) | |
| download | gentoo-2-7bb7132462034675064cf966a3af77e11d1adece.tar.gz gentoo-2-7bb7132462034675064cf966a3af77e11d1adece.tar.bz2 gentoo-2-7bb7132462034675064cf966a3af77e11d1adece.zip | |
Fix issue with newer pciutils that uses gzipped pci.ids, which HAL can not handle
(Portage version: 2.1.2-r9)
Diffstat (limited to 'sys-apps/hal')
| -rw-r--r-- | sys-apps/hal/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-apps/hal/hal-0.5.7.1-r5.ebuild | 10 |
2 files changed, 13 insertions, 3 deletions
diff --git a/sys-apps/hal/ChangeLog b/sys-apps/hal/ChangeLog index c409156ff566..ba11ea8e4238 100644 --- 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/hal-0.5.7.1-r5.ebuild b/sys-apps/hal/hal-0.5.7.1-r5.ebuild index 035d09e8152e..cb0c49a2a2e2 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.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 |