| 1 |
dragonheart 08/08/30 22:11:13 |
| 2 |
|
| 3 |
Modified: ChangeLog pcsc-lite-1.4.102.ebuild |
| 4 |
Log: |
| 5 |
workaround conflict of USE=hal and usb. As per bug #236209 thanks to Sander Sweers and Alon. |
| 6 |
(Portage version: 2.2_rc8/cvs/Linux 2.6.22-vs2.2.0.7-gentoo x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.59 sys-apps/pcsc-lite/ChangeLog |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/pcsc-lite/ChangeLog?rev=1.59&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/pcsc-lite/ChangeLog?rev=1.59&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/pcsc-lite/ChangeLog?r1=1.58&r2=1.59 |
| 14 |
|
| 15 |
Index: ChangeLog |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/pcsc-lite/ChangeLog,v |
| 18 |
retrieving revision 1.58 |
| 19 |
retrieving revision 1.59 |
| 20 |
diff -u -r1.58 -r1.59 |
| 21 |
--- ChangeLog 30 Aug 2008 06:54:13 -0000 1.58 |
| 22 |
+++ ChangeLog 30 Aug 2008 22:11:13 -0000 1.59 |
| 23 |
@@ -1,6 +1,11 @@ |
| 24 |
# ChangeLog for sys-apps/pcsc-lite |
| 25 |
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcsc-lite/ChangeLog,v 1.58 2008/08/30 06:54:13 dragonheart Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcsc-lite/ChangeLog,v 1.59 2008/08/30 22:11:13 dragonheart Exp $ |
| 28 |
+ |
| 29 |
+ 30 Aug 2008; Daniel Black <dragonheart@g.o> |
| 30 |
+ pcsc-lite-1.4.102.ebuild: |
| 31 |
+ workaround conflict of USE=hal and usb. As per bug #236209 thanks to Sander |
| 32 |
+ Sweers and Alon. |
| 33 |
|
| 34 |
*pcsc-lite-1.4.102 (30 Aug 2008) |
| 35 |
|
| 36 |
|
| 37 |
|
| 38 |
|
| 39 |
1.2 sys-apps/pcsc-lite/pcsc-lite-1.4.102.ebuild |
| 40 |
|
| 41 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/pcsc-lite/pcsc-lite-1.4.102.ebuild?rev=1.2&view=markup |
| 42 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/pcsc-lite/pcsc-lite-1.4.102.ebuild?rev=1.2&content-type=text/plain |
| 43 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/pcsc-lite/pcsc-lite-1.4.102.ebuild?r1=1.1&r2=1.2 |
| 44 |
|
| 45 |
Index: pcsc-lite-1.4.102.ebuild |
| 46 |
=================================================================== |
| 47 |
RCS file: /var/cvsroot/gentoo-x86/sys-apps/pcsc-lite/pcsc-lite-1.4.102.ebuild,v |
| 48 |
retrieving revision 1.1 |
| 49 |
retrieving revision 1.2 |
| 50 |
diff -u -r1.1 -r1.2 |
| 51 |
--- pcsc-lite-1.4.102.ebuild 30 Aug 2008 06:54:13 -0000 1.1 |
| 52 |
+++ pcsc-lite-1.4.102.ebuild 30 Aug 2008 22:11:13 -0000 1.2 |
| 53 |
@@ -1,6 +1,6 @@ |
| 54 |
# Copyright 1999-2008 Gentoo Foundation |
| 55 |
# Distributed under the terms of the GNU General Public License v2 |
| 56 |
-# $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 $ |
| 57 |
+# $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 $ |
| 58 |
|
| 59 |
inherit multilib |
| 60 |
|
| 61 |
@@ -28,6 +28,14 @@ |
| 62 |
DEPEND="${RDEPEND} |
| 63 |
dev-util/pkgconfig" |
| 64 |
|
| 65 |
+ |
| 66 |
+pkg_setup() { |
| 67 |
+ if use hal && use usb; then |
| 68 |
+ ewarn "The usb and hal useflag can not be enabled at the same time" |
| 69 |
+ ewarn "Disabling the effect of USE=usb" |
| 70 |
+ fi |
| 71 |
+} |
| 72 |
+ |
| 73 |
src_unpack() { |
| 74 |
if [ "${PV}" != "9999" ]; then |
| 75 |
unpack ${A} |
| 76 |
@@ -41,13 +49,19 @@ |
| 77 |
} |
| 78 |
|
| 79 |
src_compile() { |
| 80 |
+ local myconf |
| 81 |
+ if use hal; then |
| 82 |
+ myconf="--enable-libhal --disable-usb" |
| 83 |
+ else |
| 84 |
+ myconf="--disable-libhal $(use_enable usb libusb)" |
| 85 |
+ fi |
| 86 |
+ |
| 87 |
econf \ |
| 88 |
--docdir="/usr/share/doc/${PF}" \ |
| 89 |
--enable-usbdropdir="/usr/$(get_libdir)/readers/usb" \ |
| 90 |
--enable-muscledropdir="/usr/share/pcsc/services" \ |
| 91 |
--enable-runpid="/var/run/pcscd.pid" \ |
| 92 |
- $(use_enable hal libhal) \ |
| 93 |
- $(use_enable usb libusb) \ |
| 94 |
+ ${myconf} \ |
| 95 |
$(use_enable debug) \ |
| 96 |
$(use_enable static) \ |
| 97 |
|| die "configure failed" |
Archives