From 434927dcb9ad28a04fd7714c9b97fee82933dac1 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Diego=20Elio=20Petten=C3=B2?= <flameeyes@gentoo.org>
Date: Sat, 8 Oct 2011 14:51:16 +0000
Subject: [PATCH] Fix Prefix 'fix' screwup (bug #386103). This includes
 revbumping straight to stable since they decided to break the stable ebuild
 as well.

Package-Manager: portage-2.2.0_alpha63/cvs/Linux x86_64
RepoMan-Options: --force
---
 sys-apps/pcsc-lite/ChangeLog                  | 13 +++-
 sys-apps/pcsc-lite/Manifest                   | 18 ++---
 ...1.6.6.ebuild => pcsc-lite-1.6.6-r2.ebuild} |  3 +-
 sys-apps/pcsc-lite/pcsc-lite-1.6.7.ebuild     | 77 -------------------
 ....2-r1.ebuild => pcsc-lite-1.7.2-r2.ebuild} |  3 +-
 ...1.7.4.ebuild => pcsc-lite-1.7.4-r1.ebuild} |  3 +-
 6 files changed, 23 insertions(+), 94 deletions(-)
 rename sys-apps/pcsc-lite/{pcsc-lite-1.6.6.ebuild => pcsc-lite-1.6.6-r2.ebuild} (96%)
 delete mode 100644 sys-apps/pcsc-lite/pcsc-lite-1.6.7.ebuild
 rename sys-apps/pcsc-lite/{pcsc-lite-1.7.2-r1.ebuild => pcsc-lite-1.7.2-r2.ebuild} (96%)
 rename sys-apps/pcsc-lite/{pcsc-lite-1.7.4.ebuild => pcsc-lite-1.7.4-r1.ebuild} (96%)

diff --git a/sys-apps/pcsc-lite/ChangeLog b/sys-apps/pcsc-lite/ChangeLog
index 5bf441680aff..eff331bdc267 100644
--- a/sys-apps/pcsc-lite/ChangeLog
+++ b/sys-apps/pcsc-lite/ChangeLog
@@ -1,6 +1,17 @@
 # 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.116 2011/09/29 17:09:06 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcsc-lite/ChangeLog,v 1.117 2011/10/08 14:51:16 flameeyes Exp $
+
+*pcsc-lite-1.7.4-r1 (08 Oct 2011)
+*pcsc-lite-1.7.2-r2 (08 Oct 2011)
+*pcsc-lite-1.6.6-r2 (08 Oct 2011)
+
+  08 Oct 2011; Diego E. Pettenò <flameeyes@gentoo.org>
+  -pcsc-lite-1.6.6.ebuild, +pcsc-lite-1.6.6-r2.ebuild, -pcsc-lite-1.6.7.ebuild,
+  -pcsc-lite-1.7.2-r1.ebuild, +pcsc-lite-1.7.2-r2.ebuild,
+  -pcsc-lite-1.7.4.ebuild, +pcsc-lite-1.7.4-r1.ebuild:
+  Fix Prefix 'fix' screwup (bug #386103). This includes revbumping straight to
+  stable since they decided to break the stable ebuild as well.
 
   29 Sep 2011; Fabian Groffen <grobian@gentoo.org> pcsc-lite-1.7.2-r1.ebuild,
   pcsc-lite-1.7.4.ebuild:
diff --git a/sys-apps/pcsc-lite/Manifest b/sys-apps/pcsc-lite/Manifest
index 21903e0bb738..0c54f56d80b8 100644
--- a/sys-apps/pcsc-lite/Manifest
+++ b/sys-apps/pcsc-lite/Manifest
@@ -5,19 +5,17 @@ AUX 99-pcscd-hotplug.rules 483 RMD160 7c15ea902e65354e1e0c65a8ab8099ca84b89591 S
 AUX pcscd-init.3 740 RMD160 48ca6cfcc0ca05d1f21237e5dd475ccb9b52f426 SHA1 a168b781aad5a887fd6d7077d58333022e97f41f SHA256 7c15616a1221c31d89317f29faeea4682a6d9284a6a9ce97f00ab8ee0a2a58d7
 AUX pcscd-init.4 750 RMD160 de99ab7862d0710e045e1a0ac26018476a11bd45 SHA1 61bf37ebde96a8303d6318b55782904417b16a5d SHA256 93367896888d46a11dd0b226e7f3476ded20e328c9b653a8e38ba6b498e63639
 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.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
-EBUILD pcsc-lite-1.6.6.ebuild 2311 RMD160 51b2c16af69f79144f847aa598ce820407b7ddae SHA1 578152f0e89f5f401f672681c9d1e546797efb5c SHA256 0dc3e04ba7acae5dfc83bd8707c810973ccd12ae1c6944d4f102c019b072d121
-EBUILD pcsc-lite-1.6.7.ebuild 2243 RMD160 db256c77f2f94ba5ef5fd3d6e0f4b388f44d0ecd SHA1 456a3d106f8d025710bfcc70505c6cb855de0d5a SHA256 11da606dce6cf30f69b22f6a9d8cb7f9b1577339398db6382bd3c1d33ec4c0f0
-EBUILD pcsc-lite-1.7.2-r1.ebuild 2596 RMD160 c47b1413d49e82fe0cd8eb881a1f53d3e7d3d6b5 SHA1 45a81edf0d95333b2f31c6de2376d84b7d962de9 SHA256 462bfe68da311fea705e2be31ff6292cbe4d72093be1cf539007db0ae9dd0e7c
-EBUILD pcsc-lite-1.7.4.ebuild 2593 RMD160 74e21740b8427d76cd955712bfee8ea6f280be5a SHA1 c788ab01014d3fc8d8329315386e8388d00839fc SHA256 253cbac358bf594c933f753aa036fcac1c50810c2e016406dca478e2641631d7
-MISC ChangeLog 16550 RMD160 58931f36f0ff4d81337848edc870a21e720dce38 SHA1 f99468b18185f6fde3fb1093a150a198d882778b SHA256 24f39da7bd683414084aa97b839bab25b1ec3422fece15dabcbb7d5225cce485
+EBUILD pcsc-lite-1.6.6-r2.ebuild 2278 RMD160 be3c6a323e4a6c319de9eb70c1b8577682a2c75d SHA1 3d6d4143c820128d777823dc454e38c2211a4113 SHA256 d2defbae4f39c7ab4d61d275d9ffa2c128f6c359c65f183ad5f48b2d8203f8cf
+EBUILD pcsc-lite-1.7.2-r2.ebuild 2560 RMD160 bbca633caf5283340b9b65237135478cf134bfa1 SHA1 2cd181a495099c1ab37f6ed7d8f7cea4a2f07026 SHA256 dac8488ce53805aafc5920ae974af5e7a6ac52f2678e60880337d58d462da447
+EBUILD pcsc-lite-1.7.4-r1.ebuild 2560 RMD160 9a0be6a10d68481a46f0f6a6efffa270234b3bba SHA1 3100678dd4621e0414f8819f7b7cf4d10ce8b205 SHA256 13b9b6a73a8b0587f54cc8537d00ad1c7055768c543657e89f2c3483366119ec
+MISC ChangeLog 17048 RMD160 6ea36a8bf766772832aa9b1b957266818dab358a SHA1 2f1de55f28dec7c4b18efd234abd09d113d7337d SHA256 cec6293f1b696e3330cb07b5c36ff24fe2d79326c7600f6cf104dabe390f0c53
 MISC metadata.xml 704 RMD160 0f066833324e6a52444bf2a79a70f80121a78f77 SHA1 a70095b31a37b688a81bc1a9e0a90a5a04200b35 SHA256 49cf3849ef13f6e44699fb5ebb45b2db5d9fd214054de18a937ddf69e60fee69
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (Darwin)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk6EpjgACgkQX3X2B8XHTolfNgCfUXuRmX7kZxz26Nwd6arKkCu/
-bFIAnAsHqhjmKOwVCDUFdRM2KUq9qPd+
-=dS9X
+iEYEARECAAYFAk6QY0AACgkQAiZjviIA2XiZEwCcCclAK15SumNd+wUvP+gO5rPB
+n/8AoKX6bQdGdGUuhygoFN8bfLvXja1R
+=Z4lP
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/pcsc-lite/pcsc-lite-1.6.6.ebuild b/sys-apps/pcsc-lite/pcsc-lite-1.6.6-r2.ebuild
similarity index 96%
rename from sys-apps/pcsc-lite/pcsc-lite-1.6.6.ebuild
rename to sys-apps/pcsc-lite/pcsc-lite-1.6.6-r2.ebuild
index c7e246ba98b5..470a77e2fd48 100644
--- a/sys-apps/pcsc-lite/pcsc-lite-1.6.6.ebuild
+++ b/sys-apps/pcsc-lite/pcsc-lite-1.6.6-r2.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.6.6.ebuild,v 1.9 2011/09/27 17:36:29 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcsc-lite/pcsc-lite-1.6.6-r2.ebuild,v 1.1 2011/10/08 14:51:16 flameeyes Exp $
 
 EAPI="3"
 
@@ -36,7 +36,6 @@ src_configure() {
 		--disable-dependency-tracking \
 		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
 		--enable-usbdropdir="${EPREFIX}/usr/$(get_libdir)/readers/usb" \
-		--enable-confdir="${EPREFIX}"/etc \
 		$(use_enable usb libusb) \
 		--disable-libhal
 }
diff --git a/sys-apps/pcsc-lite/pcsc-lite-1.6.7.ebuild b/sys-apps/pcsc-lite/pcsc-lite-1.6.7.ebuild
deleted file mode 100644
index 24882d7bfbba..000000000000
--- a/sys-apps/pcsc-lite/pcsc-lite-1.6.7.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# 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.6.7.ebuild,v 1.1 2011/02/23 00:19:38 flameeyes Exp $
-
-EAPI="3"
-
-inherit multilib eutils
-
-DESCRIPTION="PC/SC Architecture smartcard middleware library"
-HOMEPAGE="http://pcsclite.alioth.debian.org/"
-
-STUPID_NUM="3516"
-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="usb? ( virtual/libusb:1 )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-RDEPEND="${RDEPEND}
-	!<app-crypt/ccid-1.4.1-r1
-	kernel_linux? ( sys-fs/udev )"
-
-pkg_setup() {
-	enewgroup pcscd
-}
-
-src_configure() {
-	econf \
-		--disable-maintainer-mode \
-		--disable-dependency-tracking \
-		--docdir="/usr/share/doc/${PF}" \
-		--enable-usbdropdir="/usr/$(get_libdir)/readers/usb" \
-		$(use_enable usb libusb) \
-		--disable-libhal
-}
-
-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
-}
diff --git a/sys-apps/pcsc-lite/pcsc-lite-1.7.2-r1.ebuild b/sys-apps/pcsc-lite/pcsc-lite-1.7.2-r2.ebuild
similarity index 96%
rename from sys-apps/pcsc-lite/pcsc-lite-1.7.2-r1.ebuild
rename to sys-apps/pcsc-lite/pcsc-lite-1.7.2-r2.ebuild
index d6dee92537ae..461748bfb959 100644
--- a/sys-apps/pcsc-lite/pcsc-lite-1.7.2-r1.ebuild
+++ b/sys-apps/pcsc-lite/pcsc-lite-1.7.2-r2.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.2-r1.ebuild,v 1.2 2011/09/29 17:09:06 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcsc-lite/pcsc-lite-1.7.2-r2.ebuild,v 1.1 2011/10/08 14:51:16 flameeyes Exp $
 
 EAPI="4"
 
@@ -46,7 +46,6 @@ src_configure() {
 		--disable-dependency-tracking \
 		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
 		--enable-usbdropdir="${EPREFIX}/usr/$(get_libdir)/readers/usb" \
-		--enable-confdir="${EPREFIX}"/etc \
 		${myconf}
 }
 
diff --git a/sys-apps/pcsc-lite/pcsc-lite-1.7.4.ebuild b/sys-apps/pcsc-lite/pcsc-lite-1.7.4-r1.ebuild
similarity index 96%
rename from sys-apps/pcsc-lite/pcsc-lite-1.7.4.ebuild
rename to sys-apps/pcsc-lite/pcsc-lite-1.7.4-r1.ebuild
index e7ea21f369c5..1d3a698ea9b2 100644
--- a/sys-apps/pcsc-lite/pcsc-lite-1.7.4.ebuild
+++ b/sys-apps/pcsc-lite/pcsc-lite-1.7.4-r1.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.ebuild,v 1.3 2011/09/29 17:09:06 grobian Exp $
+# $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 $
 
 EAPI="4"
 
@@ -46,7 +46,6 @@ src_configure() {
 		--disable-dependency-tracking \
 		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
 		--enable-usbdropdir="${EPREFIX}/usr/$(get_libdir)/readers/usb" \
-		--enable-confdir="${EPREFIX}"/etc \
 		${myconf}
 }
 
-- 
2.26.2