Version bump; rename usb USE flag in libusb, add udev USE flag; simplify ebuild. Remove old.

(Portage version: 2.2.0_alpha76/cvs/Linux x86_64)

3 files changed, 46 insertions, 25 deletions

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/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
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\""