Version bump; update metadata to reflect the new meaning of usb USE flag.

Package-Manager: portage-2.2.0_alpha26/cvs/Linux x86_64

4 files changed, 116 insertions, 10 deletions

diff --git a/sys-apps/pcsc-lite/ChangeLog b/sys-apps/pcsc-lite/ChangeLog
index 5711a3acfd03..c5475c2bdf09 100644
--- a/sys-apps/pcsc-lite/ChangeLog
+++ b/sys-apps/pcsc-lite/ChangeLog
@@ -1,6 +1,12 @@
 # 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.105 2011/02/23 00:19:38 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcsc-lite/ChangeLog,v 1.106 2011/03/09 14:52:56 flameeyes Exp $
+
+*pcsc-lite-1.7.0 (09 Mar 2011)
+
+  09 Mar 2011; Diego E. Pettenò <flameeyes@gentoo.org>
+  +pcsc-lite-1.7.0.ebuild, metadata.xml:
+  Version bump; update metadata to reflect the new meaning of usb USE flag.
 
 *pcsc-lite-1.6.7 (23 Feb 2011)
 
diff --git a/sys-apps/pcsc-lite/Manifest b/sys-apps/pcsc-lite/Manifest
index 7e6c9c141815..277363871656 100644
--- a/sys-apps/pcsc-lite/Manifest
+++ b/sys-apps/pcsc-lite/Manifest
@@ -5,14 +5,16 @@ AUX 99-pcscd-hotplug.rules 483 RMD160 7c15ea902e65354e1e0c65a8ab8099ca84b89591 S
 AUX pcscd-init.3 740 RMD160 48ca6cfcc0ca05d1f21237e5dd475ccb9b52f426 SHA1 a168b781aad5a887fd6d7077d58333022e97f41f SHA256 7c15616a1221c31d89317f29faeea4682a6d9284a6a9ce97f00ab8ee0a2a58d7
 DIST pcsc-lite-1.6.6.tar.bz2 480232 RMD160 e4041b846d34cf94069b6ed71e1892af34d92acd SHA1 bdd4b2f87955e2719be9b4f5da253904c721fdec SHA256 7a94c27ae687619435b29ad63e0561aca20413333187b4301c75d1a1547ceea8
 DIST pcsc-lite-1.6.7.tar.bz2 484104 RMD160 92ccbdcf1bd48d4061ce5d73681de2e540322600 SHA1 eb508678c3a3f7520eaac6bf803423336169ce5d SHA256 e1797726d1fa89beeba0f91dd727e8817ee85f6027e7e562eca1bacece3b8f62
+DIST pcsc-lite-1.7.0.tar.bz2 484223 RMD160 d58c8970ec609c00b67ac7fe2e0be821a8f34945 SHA1 b73a6d69ea9b06b6bc3b4e4f15cada06b27ca509 SHA256 f61297325daaca347454d3a8adb821f22dfeb13d33ea51a6c3ef835f3a6c2e82
 EBUILD pcsc-lite-1.6.6.ebuild 2198 RMD160 d77a94bec7387ec502cb5da4c26ed2d29113a026 SHA1 3763765ab10ca429d3b82d0218a3c83fdeae58e2 SHA256 40f9f89bd92d44843f9bf041fcfe0a31aa57db92d64b58b88345290ea1b0b937
 EBUILD pcsc-lite-1.6.7.ebuild 2243 RMD160 db256c77f2f94ba5ef5fd3d6e0f4b388f44d0ecd SHA1 456a3d106f8d025710bfcc70505c6cb855de0d5a SHA256 11da606dce6cf30f69b22f6a9d8cb7f9b1577339398db6382bd3c1d33ec4c0f0
-MISC ChangeLog 14802 RMD160 9daac85a6dfc833482cebfd004822efc33d97f7a SHA1 3e0f3fd473e5790b810e4fcb9a0bd63785654fa9 SHA256 23f2cdf6a95fc05587e923bbf31c96e5dd62ffee9689a1668678795f33520b5c
-MISC metadata.xml 244 RMD160 9a9367ba3a24404b82d10ffe6493dbe43dfcb718 SHA1 b609f191e50f68af8331dfd824a8d72d48fd3ac0 SHA256 b93928eec206138ccf14d2c0dd1ebd2bbbf1cda0b8b69f540eb7f17e729cb5bf
+EBUILD pcsc-lite-1.7.0.ebuild 2420 RMD160 d97de59e1de6bee3dd21681a640320fddca0af2d SHA1 a0354879d80b5d7d1275cee0930651b8e7bf643d SHA256 ff1c38d2018eb8d78ca4932d2efd4fd53bddd04c91dfe5790954cf40ff80edd4
+MISC ChangeLog 15008 RMD160 2080b9ea80ca59b7bf1978bca48a6857f3df83f1 SHA1 b504d11dd5a289f39aaef16cbf01b6e27d30f550 SHA256 e46653c7644147683f7344e561da5744de5e8bbd42fbde0f8aba15fc44b0930a
+MISC metadata.xml 686 RMD160 aafd6790e2f3d24905e01b6428a15107029d616b SHA1 5dad7f6a2aa0a660ed53bf3f5a23001457ae6da5 SHA256 765c5dd2f4ebccb78e15aba2a19c98c9d14436ffc103bdbd97eec6221bb3fd5d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk1kUtQACgkQAiZjviIA2XgCjQCgkrpfIRljRY4nUHdB5nUK/ato
-UPwAn3CME/scOVspAzctq3jtFaHmvtdB
-=b+ko
+iEYEARECAAYFAk13lIAACgkQAiZjviIA2Xg02wCfSGWEQf4/aRkZBCkwJ4IsZ0qb
+L7oAoME5u1uos8JGz/72xioOG09G+ho8
+=BZyD
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/pcsc-lite/metadata.xml b/sys-apps/pcsc-lite/metadata.xml
index 88daeb8178c9..479e3fb58197 100644
--- a/sys-apps/pcsc-lite/metadata.xml
+++ b/sys-apps/pcsc-lite/metadata.xml
@@ -1,8 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>crypto</herd>
-<longdescription>
-PC/SC Architecture smartcard middleware library
-</longdescription>
+  <herd>crypto</herd>
+  <longdescription>
+    PC/SC Architecture smartcard middleware library
+  </longdescription>
+
+  <use>
+    <flag name='usb' restrict="&lt;pcsc-lite-1.7.0">
+      Use <pkg>dev-libs/libusb</pkg> detection to hotplug new
+      smartcard readers.
+    </flag>
+
+    <flag name='usb' restrict="&gt;=pcsc-lite-1.7.0">
+      Use <pkg>dev-libs/libusb</pkg> detection to hotplug new
+      smartcard readers. This flag only makes sense on non-Linux
+      systems, as on Linux, <pkg>sys-fs/udev</pkg> is used instead.
+    </flag>
+  </use>
 </pkgmetadata>
diff --git a/sys-apps/pcsc-lite/pcsc-lite-1.7.0.ebuild b/sys-apps/pcsc-lite/pcsc-lite-1.7.0.ebuild
new file mode 100644
index 000000000000..0cf1510861bf
--- /dev/null
+++ b/sys-apps/pcsc-lite/pcsc-lite-1.7.0.ebuild
@@ -0,0 +1,85 @@
+# 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.0.ebuild,v 1.1 2011/03/09 14:52:56 flameeyes Exp $
+
+EAPI="3"
+
+inherit multilib eutils
+
+DESCRIPTION="PC/SC Architecture smartcard middleware library"
+HOMEPAGE="http://pcsclite.alioth.debian.org/"
+
+STUPID_NUM="3527"
+MY_P="${PN}-${PV/_/-}"
+SRC_URI="http://alioth.debian.org/download.php/${STUPID_NUM}/${MY_P}.tar.bz2"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="usb kernel_linux"
+
+RDEPEND="!kernel_linux? ( usb? ( virtual/libusb:1 ) )
+	kernel_linux? ( sys-fs/udev )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+RDEPEND="${RDEPEND}
+	!<app-crypt/ccid-1.4.1-r1"
+
+pkg_setup() {
+	enewgroup pcscd
+}
+
+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="/usr/share/doc/${PF}" \
+		--enable-usbdropdir="/usr/$(get_libdir)/readers/usb" \
+		--disable-libhal \
+		${myconf}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	find "${D}" -name '*.la' -delete
+
+	dodoc AUTHORS DRIVERS HELP README SECURITY ChangeLog || die
+
+	newinitd "${FILESDIR}/pcscd-init.3" pcscd || die
+
+	if use kernel_linux; then
+		insinto /lib/udev/rules.d
+		doins "${FILESDIR}"/99-pcscd-hotplug.rules || die
+	fi
+}
+
+pkg_postinst() {
+	elog "Starting from version 1.6.5, pcsc-lite will start as user nobody in"
+	elog "the pcscd group, to avoid running as root."
+	elog ""
+	elog "This also means you need the newest drivers available so that the"
+	elog "devices get the proper owner."
+	elog ""
+	elog "Furthermore, a conf.d file is no longer installed by default, as"
+	elog "the default configuration does not require one. If you need to"
+	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"
+		elog "/etc/rc.conf:"
+		elog ""
+		elog "    rc_hotplug=\"pcscd\""
+	fi
+}