Fix Prefix 'fix' screwup (bug #386103). This includes revbumping straight to stable since they decided to break the stable ebuild as well.

(Portage version: 2.2.0_alpha63/cvs/Linux x86_64, RepoMan options: --force)

5 files changed, 15 insertions, 84 deletions

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/pcsc-lite-1.6.6.ebuild b/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
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
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}
 }