diff options
| author |   Daniel Black <dragonheart@gentoo.org> | 2008-08-30 22:11:13 +0000 |
|---|---|---|
| committer | Daniel Black <dragonheart@gentoo.org> | 2008-08-30 22:11:13 +0000 |
| commit | 209208a2219f78d9c3343f16496818aab914a092 (patch) | |
| tree | e61fd76091ac4cdf6d7baba16f67ef94636d64e8 /sys-apps | |
| parent | fixed URLs as per bug #235957 (diff) | |
| download | gentoo-2-209208a2219f78d9c3343f16496818aab914a092.tar.gz gentoo-2-209208a2219f78d9c3343f16496818aab914a092.tar.bz2 gentoo-2-209208a2219f78d9c3343f16496818aab914a092.zip | |
workaround conflict of USE=hal and usb. As per bug #236209 thanks to Sander Sweers and Alon.
(Portage version: 2.2_rc8/cvs/Linux 2.6.22-vs2.2.0.7-gentoo x86_64)
Diffstat (limited to 'sys-apps')
| -rw-r--r-- | sys-apps/pcsc-lite/ChangeLog | 7 | ||||
| -rw-r--r-- | sys-apps/pcsc-lite/pcsc-lite-1.4.102.ebuild | 20 |
2 files changed, 23 insertions, 4 deletions
diff --git a/sys-apps/pcsc-lite/ChangeLog b/sys-apps/pcsc-lite/ChangeLog index f0b76673b056..acd91813d445 100644 --- a/sys-apps/pcsc-lite/ChangeLog +++ b/sys-apps/pcsc-lite/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-apps/pcsc-lite # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcsc-lite/ChangeLog,v 1.58 2008/08/30 06:54:13 dragonheart Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcsc-lite/ChangeLog,v 1.59 2008/08/30 22:11:13 dragonheart Exp $ + + 30 Aug 2008; Daniel Black <dragonheart@gentoo.org> + pcsc-lite-1.4.102.ebuild: + workaround conflict of USE=hal and usb. As per bug #236209 thanks to Sander + Sweers and Alon. *pcsc-lite-1.4.102 (30 Aug 2008) diff --git a/sys-apps/pcsc-lite/pcsc-lite-1.4.102.ebuild b/sys-apps/pcsc-lite/pcsc-lite-1.4.102.ebuild index f7db60f0ec74..aad617469ecd 100644 --- a/sys-apps/pcsc-lite/pcsc-lite-1.4.102.ebuild +++ b/sys-apps/pcsc-lite/pcsc-lite-1.4.102.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcsc-lite/pcsc-lite-1.4.102.ebuild,v 1.1 2008/08/30 06:54:13 dragonheart Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcsc-lite/pcsc-lite-1.4.102.ebuild,v 1.2 2008/08/30 22:11:13 dragonheart Exp $ inherit multilib @@ -28,6 +28,14 @@ RDEPEND="usb? ( dev-libs/libusb ) DEPEND="${RDEPEND} dev-util/pkgconfig" + +pkg_setup() { + if use hal && use usb; then + ewarn "The usb and hal useflag can not be enabled at the same time" + ewarn "Disabling the effect of USE=usb" + fi +} + src_unpack() { if [ "${PV}" != "9999" ]; then unpack ${A} @@ -41,13 +49,19 @@ src_unpack() { } src_compile() { + local myconf + if use hal; then + myconf="--enable-libhal --disable-usb" + else + myconf="--disable-libhal $(use_enable usb libusb)" + fi + econf \ --docdir="/usr/share/doc/${PF}" \ --enable-usbdropdir="/usr/$(get_libdir)/readers/usb" \ --enable-muscledropdir="/usr/share/pcsc/services" \ --enable-runpid="/var/run/pcscd.pid" \ - $(use_enable hal libhal) \ - $(use_enable usb libusb) \ + ${myconf} \ $(use_enable debug) \ $(use_enable static) \ || die "configure failed" |