Remove 1.6.4 since 1.6.6 is going stable instead. Remove 1.5.5 even if that will make a few minor arch users unable to get a stable-only combination between ccid and pcsc-lite (their stable tree was broken already and has been for a long time, will be fixed once new pcsc-lite and ccid will go stable _together_).

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

3 files changed, 9 insertions, 145 deletions

diff --git a/sys-apps/pcsc-lite/ChangeLog b/sys-apps/pcsc-lite/ChangeLog
index 453c11d920b0..7ec6c9b0634a 100644
--- a/sys-apps/pcsc-lite/ChangeLog
+++ b/sys-apps/pcsc-lite/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-apps/pcsc-lite
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcsc-lite/ChangeLog,v 1.95 2010/12/17 11:39:42 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcsc-lite/ChangeLog,v 1.96 2010/12/26 16:15:33 flameeyes Exp $
+
+  26 Dec 2010; Diego E. Pettenò <flameeyes@gentoo.org>
+  -pcsc-lite-1.5.5.ebuild, -pcsc-lite-1.6.4.ebuild:
+  Remove 1.6.4 since 1.6.6 is going stable instead. Remove 1.5.5 even if that
+  will make a few minor arch users unable to get a stable-only combination
+  between ccid and pcsc-lite (their stable tree was broken already and has been
+  for a long time, will be fixed once new pcsc-lite and ccid will go stable
+  _together_).
 
   17 Dec 2010; Diego E. Pettenò <flameeyes@gentoo.org> pcsc-lite-1.6.6.ebuild:
   Block old ccid versions, forcing update to latest.
diff --git a/sys-apps/pcsc-lite/pcsc-lite-1.5.5.ebuild b/sys-apps/pcsc-lite/pcsc-lite-1.5.5.ebuild
deleted file mode 100644
index 4cd0c6bd1ca1..000000000000
--- a/sys-apps/pcsc-lite/pcsc-lite-1.5.5.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2010 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.5.5.ebuild,v 1.7 2010/10/24 20:43:57 c1pher Exp $
-
-EAPI="2"
-
-inherit multilib
-
-DESCRIPTION="PC/SC Architecture smartcard middleware library"
-HOMEPAGE="http://pcsclite.alioth.debian.org/"
-
-if [[ "${PV}" = "9999" ]]; then
-	inherit subversion autotools
-	ESVN_REPO_URI="svn://svn.debian.org/pcsclite/trunk"
-	S="${WORKDIR}/trunk"
-else
-	STUPID_NUM="3082"
-	MY_P="${PN}-${PV/_/-}"
-	SRC_URI="http://alioth.debian.org/download.php/${STUPID_NUM}/${MY_P}.tar.bz2"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="amd64 arm hppa ia64 m68k ppc ppc64 s390 sh sparc x86"
-IUSE="hal static usb"
-
-RDEPEND="usb? ( virtual/libusb:0 )
-	hal? ( sys-apps/hal )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-pkg_setup() {
-	if use hal && use usb; then
-		ewarn "The usb and hal USE flags cannot be enabled at the same time"
-		ewarn "Disabling the effect of USE=usb"
-	fi
-}
-
-if [[ "${PV}" == "9999" ]]; then
-	src_prepare() {
-		S="${WORKDIR}/trunk/PCSC"
-		cd "${S}"
-		AT_M4DIR="m4" eautoreconf
-	}
-fi
-
-src_configure() {
-	local myconf
-	if use hal; then
-		myconf="--enable-libhal --disable-libusb"
-	else
-		myconf="--disable-libhal $(use_enable usb libusb)"
-	fi
-
-	econf \
-		--docdir="/usr/share/doc/${PF}" \
-		--enable-usbdropdir="/usr/$(get_libdir)/readers/usb" \
-		${myconf} \
-		$(use_enable static)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	prepalldocs
-
-	dodoc AUTHORS DRIVERS HELP README SECURITY ChangeLog
-
-	newinitd "${FILESDIR}/pcscd-init" pcscd
-	newconfd "${FILESDIR}/pcscd-confd" pcscd
-}
diff --git a/sys-apps/pcsc-lite/pcsc-lite-1.6.4.ebuild b/sys-apps/pcsc-lite/pcsc-lite-1.6.4.ebuild
deleted file mode 100644
index 18bcf817315b..000000000000
--- a/sys-apps/pcsc-lite/pcsc-lite-1.6.4.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2010 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.4.ebuild,v 1.1 2010/09/28 23:37:15 flameeyes Exp $
-
-EAPI="3"
-
-inherit multilib
-
-DESCRIPTION="PC/SC Architecture smartcard middleware library"
-HOMEPAGE="http://pcsclite.alioth.debian.org/"
-
-if [[ "${PV}" = "9999" ]]; then
-	inherit autotools subversion
-	ESVN_REPO_URI="svn://svn.debian.org/pcsclite/trunk"
-	S="${WORKDIR}/trunk"
-else
-	STUPID_NUM="3337"
-	MY_P="${PN}-${PV/_/-}"
-	SRC_URI="http://alioth.debian.org/download.php/${STUPID_NUM}/${MY_P}.tar.bz2"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="hal static usb"
-
-RDEPEND="usb? ( virtual/libusb:1 )
-	hal? ( sys-apps/hal )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-pkg_setup() {
-	if use hal && use usb; then
-		ewarn "The usb and hal USE flags cannot be enabled at the same time"
-		ewarn "Disabling the effect of USE=usb"
-	fi
-}
-
-if [[ "${PV}" == "9999" ]]; then
-	src_prepare() {
-		S="${WORKDIR}/trunk/PCSC"
-		cd "${S}"
-		AT_M4DIR="m4" eautoreconf
-	}
-fi
-
-src_configure() {
-	local myconf
-	if use hal; then
-		myconf="--enable-libhal --disable-libusb"
-	else
-		myconf="--disable-libhal $(use_enable usb libusb)"
-	fi
-
-	econf \
-		--docdir="/usr/share/doc/${PF}" \
-		--enable-usbdropdir="/usr/$(get_libdir)/readers/usb" \
-		${myconf} \
-		$(use_enable static)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS DRIVERS HELP README SECURITY ChangeLog || die
-
-	newinitd "${FILESDIR}/pcscd-init.2" pcscd || die
-	newconfd "${FILESDIR}/pcscd-confd" pcscd || die
-
-	if ! use hal; then
-		sed -i -e '/need hald/d' "${D}"/etc/init.d/pcscd || die
-	fi
-}