From ce8c8d4d985a8ee04f3d45cbc7ba71083f027e9b Mon Sep 17 00:00:00 2001
From: =?utf8?q?Diego=20Elio=20Petten=C3=B2?= <flameeyes@gentoo.org>
Date: Sun, 20 Nov 2011 13:52:18 +0000
Subject: [PATCH] Version bump; rename usb USE flag in libusb, add udev USE
 flag; simplify ebuild. Remove old.

Package-Manager: portage-2.2.0_alpha76/cvs/Linux x86_64
---
 sys-apps/pcsc-lite/ChangeLog                  |  9 +++-
 sys-apps/pcsc-lite/Manifest                   | 15 +++---
 sys-apps/pcsc-lite/metadata.xml               | 14 ++++++
 ...1.7.4-r1.ebuild => pcsc-lite-1.8.0.ebuild} | 48 +++++++++----------
 4 files changed, 54 insertions(+), 32 deletions(-)
 rename sys-apps/pcsc-lite/{pcsc-lite-1.7.4-r1.ebuild => pcsc-lite-1.8.0.ebuild} (67%)

diff --git a/sys-apps/pcsc-lite/ChangeLog b/sys-apps/pcsc-lite/ChangeLog
index 8630a370b15f..b35b742315a8 100644
--- a/sys-apps/pcsc-lite/ChangeLog
+++ b/sys-apps/pcsc-lite/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/pcsc-lite
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcsc-lite/ChangeLog,v 1.123 2011/10/23 17:15:09 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcsc-lite/ChangeLog,v 1.124 2011/11/20 13:52:18 flameeyes Exp $
+
+*pcsc-lite-1.8.0 (20 Nov 2011)
+
+  20 Nov 2011; Diego E. Pettenò <flameeyes@gentoo.org> +pcsc-lite-1.8.0.ebuild,
+  -pcsc-lite-1.7.4-r1.ebuild, metadata.xml:
+  Version bump; rename usb USE flag in libusb, add udev USE flag; simplify
+  ebuild. Remove old.
 
   23 Oct 2011; Raúl Porcel <armin76@gentoo.org> pcsc-lite-1.7.2-r2.ebuild:
   ia64/m68k/s390/sh/sparc stable wrt #386345
diff --git a/sys-apps/pcsc-lite/Manifest b/sys-apps/pcsc-lite/Manifest
index e19d23de93ea..3cd14a821321 100644
--- a/sys-apps/pcsc-lite/Manifest
+++ b/sys-apps/pcsc-lite/Manifest
@@ -8,16 +8,17 @@ AUX pcscd-init.5 514 RMD160 5345f61ed9bedc30f4794a992cd0a299698da44a SHA1 85ee4f
 DIST pcsc-lite-1.6.6.tar.bz2 480232 RMD160 e4041b846d34cf94069b6ed71e1892af34d92acd SHA1 bdd4b2f87955e2719be9b4f5da253904c721fdec SHA256 7a94c27ae687619435b29ad63e0561aca20413333187b4301c75d1a1547ceea8
 DIST pcsc-lite-1.7.2.tar.bz2 484630 RMD160 1566b0110a8f70633f593f4a40f92ce38f603ee4 SHA1 b66533e2f90ce289854400db8c8b578a32980c32 SHA256 41f13d552eaa2c3978fbb6f2125e81903a0767011d999052fd1a6ee03880b398
 DIST pcsc-lite-1.7.4.tar.bz2 503848 RMD160 0bec1904894e7b04cbeca8f60da35b64ac950279 SHA1 6b815a1367390921ce4935f97de5cacb6965c9a7 SHA256 d8e4a7eaae05089dccaeca0524ffd9b308d9e8f3da3fb043515e6c1d7b5583d1
+DIST pcsc-lite-1.8.0.tar.bz2 538435 RMD160 ebae17f9baf4baa0bf57bde8f0d32ff3466ab3f2 SHA1 ae182622c97ba9ed6741ce529a98f236c4a46393 SHA256 b4bdd21bb42cddddee302069fc7356d8a2092c214ba289af8c620fa02e5b05e7
 EBUILD pcsc-lite-1.6.6-r2.ebuild 2278 RMD160 be3c6a323e4a6c319de9eb70c1b8577682a2c75d SHA1 3d6d4143c820128d777823dc454e38c2211a4113 SHA256 d2defbae4f39c7ab4d61d275d9ffa2c128f6c359c65f183ad5f48b2d8203f8cf
 EBUILD pcsc-lite-1.7.2-r2.ebuild 2549 RMD160 9d52350456d1db146e43ad7698fb16455004015b SHA1 5e16723c78388594c9486b7011a28e13a0e385a3 SHA256 aea69865d4b28a6c055af3a83b01658915827a08e1a204d4f0a51dc26a4c3c4c
-EBUILD pcsc-lite-1.7.4-r1.ebuild 2560 RMD160 9a0be6a10d68481a46f0f6a6efffa270234b3bba SHA1 3100678dd4621e0414f8819f7b7cf4d10ce8b205 SHA256 13b9b6a73a8b0587f54cc8537d00ad1c7055768c543657e89f2c3483366119ec
 EBUILD pcsc-lite-1.7.4-r2.ebuild 2560 RMD160 e4096dde811717ef791f712c3399fb5c3895884c SHA1 293831f31d0095a45d34f05c7db1194d094cd655 SHA256 87d332293abf6478c5099d1ecfefc146f9c2d744249d0ff55221e360d51c4e6d
-MISC ChangeLog 17914 RMD160 5af2a94a6257568ce48f3f58011708ae6147d6d7 SHA1 01cd6e896015382091feecf96eb188c7efe2d39e SHA256 178405515ab8831b8bd25ed2e914ef8665f6025c2db5f4a15cef249b18d44543
-MISC metadata.xml 704 RMD160 0f066833324e6a52444bf2a79a70f80121a78f77 SHA1 a70095b31a37b688a81bc1a9e0a90a5a04200b35 SHA256 49cf3849ef13f6e44699fb5ebb45b2db5d9fd214054de18a937ddf69e60fee69
+EBUILD pcsc-lite-1.8.0.ebuild 2511 RMD160 0ec1abb34709f2743c496086d05b3a234eab2e1e SHA1 44b1728e5d17871fe7aae74a85e3464a8edf1f99 SHA256 c3a22163ca1048f72f69d25e5cf6163df10efd33c84a3951632de6e4818ff0e9
+MISC ChangeLog 18171 RMD160 506f77be298a165c6f9c1aea9a895ede8b811db8 SHA1 4d2f8046efa7196ee178beaae491c82597a3510f SHA256 61d94745d53c15afbd125d74ab386cc39fa3b744675f87fedf5e94bde5e29a89
+MISC metadata.xml 1271 RMD160 6883e92603c7f086963a05acb4301744228614ae SHA1 97b4719df932ec08e5fdb6bba5578566c98cddfe SHA256 81b3fbf2719be0adcbce8b6a2ed091af496773ea839eee95fcf768706c185690
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk6kS6MACgkQuQc30/atMkBQfQCgr+SWNBwuASCkYvL3gODh6Qjn
-F44An2y/x7ysOeVaRZ3UFYZfdWkQLC8C
-=ZVUZ
+iEYEARECAAYFAk7JBg8ACgkQAiZjviIA2XiOBgCgi/d+qfNLAGev2RdaAon4NJcA
+wJ0AniUnwX1Av7FpDDz3if1CgmOmUltH
+=fQEj
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/pcsc-lite/metadata.xml b/sys-apps/pcsc-lite/metadata.xml
index c603e01f9c8c..7bd7272c4079 100644
--- a/sys-apps/pcsc-lite/metadata.xml
+++ b/sys-apps/pcsc-lite/metadata.xml
@@ -17,5 +17,19 @@
       smartcard readers. This flag only makes sense on non-Linux
       systems, as on Linux, <pkg>sys-fs/udev</pkg> is used instead.
     </flag>
+
+    <flag name='libusb' restrict="&gt;=sys-apps/pcsc-lite-1.8.0">
+      Use <pkg>dev-libs/libusb</pkg> detection to hotplug new
+      smartcard readers. This flag should only be enabled if you're
+      running a non-Linux kernel or you don't want to use
+      <pkg>sys-fs/udev</pkg>.
+    </flag>
+
+    <flag name='udev'>
+      Use <pkg>sys-fs/udev</pkg> rules to handle devices' permissions
+      and hotplug support. Unless you know what you're doing do not
+      disable this flag on Linux kernels. This is provided as an
+      option for completeness.
+    </flag>
   </use>
 </pkgmetadata>
diff --git a/sys-apps/pcsc-lite/pcsc-lite-1.7.4-r1.ebuild b/sys-apps/pcsc-lite/pcsc-lite-1.8.0.ebuild
similarity index 67%
rename from sys-apps/pcsc-lite/pcsc-lite-1.7.4-r1.ebuild
rename to sys-apps/pcsc-lite/pcsc-lite-1.8.0.ebuild
index 1d3a698ea9b2..a293e1eaf99f 100644
--- a/sys-apps/pcsc-lite/pcsc-lite-1.7.4-r1.ebuild
+++ b/sys-apps/pcsc-lite/pcsc-lite-1.8.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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.7.4-r1.ebuild,v 1.1 2011/10/08 14:51:16 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcsc-lite/pcsc-lite-1.8.0.ebuild,v 1.1 2011/11/20 13:52:18 flameeyes Exp $
 
 EAPI="4"
 
@@ -9,7 +9,7 @@ inherit multilib eutils
 DESCRIPTION="PC/SC Architecture smartcard middleware library"
 HOMEPAGE="http://pcsclite.alioth.debian.org/"
 
-STUPID_NUM="3598"
+STUPID_NUM="3684"
 MY_P="${PN}-${PV/_/-}"
 SRC_URI="http://alioth.debian.org/download.php/${STUPID_NUM}/${MY_P}.tar.bz2"
 S="${WORKDIR}/${MY_P}"
@@ -17,13 +17,19 @@ S="${WORKDIR}/${MY_P}"
 LICENSE="as-is"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="usb kernel_linux"
 
-RDEPEND="!kernel_linux? ( usb? ( virtual/libusb:1 ) )
-	kernel_linux? ( sys-fs/udev )"
-DEPEND="${RDEPEND}
+# This is called libusb so that it doesn't fool people in thinking that
+# it is _required_ for USB support. Otherwise they'll disable udev and
+# that's going to be worse.
+IUSE="libusb +udev"
+
+REQUIRED_USE="^^ ( udev libusb )"
+
+CDEPEND="libusb? ( virtual/libusb:1 )
+	udev? ( sys-fs/udev )"
+DEPEND="${CDEPEND}
 	dev-util/pkgconfig"
-RDEPEND="${RDEPEND}
+RDEPEND="${CDEPEND}
 	!<app-crypt/ccid-1.4.1-r1"
 
 pkg_setup() {
@@ -33,31 +39,26 @@ pkg_setup() {
 }
 
 src_configure() {
-	local myconf=
-
-	if use kernel_linux; then
-		myconf="${myconf} --enable-libudev --disable-libusb"
-	else
-		myconf="${myconf} --disable-libudev $(use_enable usb libusb)"
-	fi
-
 	econf \
 		--disable-maintainer-mode \
 		--disable-dependency-tracking \
 		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
 		--enable-usbdropdir="${EPREFIX}/usr/$(get_libdir)/readers/usb" \
+		--without-systemdsystemunitdir \
+		$(use_enable udev libudev) \
+		$(use_enable libusb) \
 		${myconf}
 }
 
+DOCS=( AUTHORS DRIVERS HELP README SECURITY ChangeLog )
+
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
+	default
 	find "${D}" -name '*.la' -delete
 
-	dodoc AUTHORS DRIVERS HELP README SECURITY ChangeLog
-
-	newinitd "${FILESDIR}/pcscd-init.4" pcscd
+	newinitd "${FILESDIR}/pcscd-init.5" pcscd
 
-	if use kernel_linux; then
+	if use udev; then
 		insinto /lib/udev/rules.d
 		doins "${FILESDIR}"/99-pcscd-hotplug.rules
 	fi
@@ -75,10 +76,9 @@ pkg_postinst() {
 	elog "pass further options to pcscd, create a file and set the"
 	elog "EXTRA_OPTS variable."
 	elog ""
-	if use kernel_linux; then
-		elog "HAL support has been dropped by the ebuild; if you want hotplug"
-		elog "support, that's provided already by UDEV rules; you only need to"
-		elog "tell the init system to hotplug it, by setting this variable in"
+	if use udev; then
+		elog "Hotplug support is provided by udev rules; you only need to tell"
+		elog "the init system to hotplug it, by setting this variable in"
 		elog "/etc/rc.conf:"
 		elog ""
 		elog "    rc_hotplug=\"pcscd\""
-- 
2.26.2