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 | b50000c4969af88218d34befd6e65462654a9072 (patch) | |
| tree | b1a6b40227811efdf48f222b778a2aa2b193e2d0 /sys-apps | |
| parent | fixed URLs as per bug #235957 (diff) | |
| download | historical-b50000c4969af88218d34befd6e65462654a9072.tar.gz historical-b50000c4969af88218d34befd6e65462654a9072.tar.bz2 historical-b50000c4969af88218d34befd6e65462654a9072.zip | |
workaround conflict of USE=hal and usb. As per bug #236209 thanks to Sander Sweers and Alon.
Package-Manager: portage-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/Manifest | 4 | ||||
| -rw-r--r-- | sys-apps/pcsc-lite/pcsc-lite-1.4.102.ebuild | 20 |
3 files changed, 25 insertions, 6 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/Manifest b/sys-apps/pcsc-lite/Manifest index c4937d03c042..423100de476d 100644 --- a/sys-apps/pcsc-lite/Manifest +++ b/sys-apps/pcsc-lite/Manifest @@ -4,9 +4,9 @@ DIST pcsc-lite-1.4.102.tar.bz2 460324 RMD160 a99730a937515885200f71d36cfdf1c2ff6 DIST pcsc-lite-1.4.2.tar.gz 624242 RMD160 9bb5bcf3d376ce9e470e0e0cf64e902100de8ad8 SHA1 9532cbd1e151289cbec9e3a3cb6f9b2cd1d25d53 SHA256 a56195b1999e5401df17b62c53944204393ec3e3759699fa00633d8f94bb6570 DIST pcsc-lite-1.4.4.tar.gz 627128 RMD160 2feb7f76e19a30984897cf614846c00203d5a063 SHA1 2f5eb95b3acc2a3e32bf73d52c0c3fe991bb24aa SHA256 9d48114ced4e32f60668f7db72231b5ce9104e460269f72f378e2fec7575291d DIST pcsc-lite-1.4.99.tar.gz 637727 RMD160 689d99ae26a13dc78856670b0deafbd5fed517ab SHA1 7f5ff7d8e187c1d46f3bc26567d393107ac0e362 SHA256 630adc2e9b62168c9735395c8f39c63284112e431ca6f550b06d97d37edfc519 -EBUILD pcsc-lite-1.4.102.ebuild 1617 RMD160 a994475e2e5c3d7f5e46a9a3e8c3b41a270dd5bc SHA1 d0201062d95abc80b20eb4b8f9331c880aef18f5 SHA256 c5bd6b7585718c13ed5a68b894efafa44871b6bc92ca6321adeb2d5620337c80 +EBUILD pcsc-lite-1.4.102.ebuild 1873 RMD160 45bfb87620122f03b28b8a033742e9bdff111053 SHA1 2a99a583690ccdae13551e59fca17e42fc5dfad2 SHA256 31007b7dc3c1352779ed7f69628377b24217d5c057548143c18e798336a0d11e EBUILD pcsc-lite-1.4.2.ebuild 1289 RMD160 4849f9a26c5e6d7c241c4af9a4d548730a0f8497 SHA1 1071eeb5b115b8ca3cbdc86a9a9e82f1b96bb041 SHA256 f4b1b33fcce8ea3d0022a3e546ef233de481e3f6b51b78f49398a77ffc11792a EBUILD pcsc-lite-1.4.4.ebuild 1302 RMD160 1234a6ad17d96818c0eb898de0fb3c5e095e3df5 SHA1 da40ff51a53b84244911f9f44319bf366371b219 SHA256 5f9828d8780332c52d4a8054982f86f458a07e6348a6abe0473922f499f752de EBUILD pcsc-lite-1.4.99.ebuild 1303 RMD160 6c01cad2d0ab1a6ea041c40dc6d106f740c36be0 SHA1 f6644c2769b1bc5567490eb9bc860c4c774611bc SHA256 472dfa8e260005928ca38c629824a6a2a96004dd9d3707d66952af59b97afe86 -MISC ChangeLog 7407 RMD160 153a3c923f4430006d22574fd276852f372d3368 SHA1 bf6e0567d29abc3e3d57d95a20ce09d570250755 SHA256 9417d2cd3a45ffd500f04a1c0272e20340686ec6ba658ca32c4fccca2401310e +MISC ChangeLog 7586 RMD160 dd1885522c20cd480fd527e4071ff0e27c740456 SHA1 d0531bcbb30a5db3285875728f81d4cfceb16a05 SHA256 fe204e648188804c95f3e5ad5dd8d79aeb25256d3614aeacfdf6e4652e122cf4 MISC metadata.xml 244 RMD160 9a9367ba3a24404b82d10ffe6493dbe43dfcb718 SHA1 b609f191e50f68af8331dfd824a8d72d48fd3ac0 SHA256 b93928eec206138ccf14d2c0dd1ebd2bbbf1cda0b8b69f540eb7f17e729cb5bf 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" |