Version bump, remove old versions (which are not compatible with latest pcsc-lite anyway), and also drop 1.4.1-r2 in favour of the new 1.4.2 (which has the original patch applied).

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

4 files changed, 12 insertions, 85 deletions

diff --git a/app-crypt/ccid/ChangeLog b/app-crypt/ccid/ChangeLog
index d628741d9b5d..3a607c4eb695 100644
--- a/app-crypt/ccid/ChangeLog
+++ b/app-crypt/ccid/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-crypt/ccid
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/ccid/ChangeLog,v 1.61 2011/01/10 18:48:52 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/ccid/ChangeLog,v 1.62 2011/02/23 10:45:19 flameeyes Exp $
+
+*ccid-1.4.2 (23 Feb 2011)
+
+  23 Feb 2011; Diego E. Pettenò <flameeyes@gentoo.org> -ccid-1.3.11.ebuild,
+  -ccid-1.3.13-r1.ebuild, -ccid-1.4.1-r2.ebuild, +ccid-1.4.2.ebuild:
+  Version bump, remove old versions (which are not compatible with latest
+  pcsc-lite anyway), and also drop 1.4.1-r2 in favour of the new 1.4.2 (which
+  has the original patch applied).
 
   10 Jan 2011; Diego E. Pettenò <flameeyes@gentoo.org>
   -files/ccid-1.3.13-bcm5880v3.patch:
diff --git a/app-crypt/ccid/ccid-1.3.11.ebuild b/app-crypt/ccid/ccid-1.3.11.ebuild
deleted file mode 100644
index 88196ce073d4..000000000000
--- a/app-crypt/ccid/ccid-1.3.11.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/ccid/ccid-1.3.11.ebuild,v 1.6 2010/06/29 00:20:47 arfrever Exp $
-
-EAPI="2"
-
-STUPID_NUM="3080"
-
-DESCRIPTION="CCID free software driver"
-HOMEPAGE="http://pcsclite.alioth.debian.org/ccid.html"
-SRC_URI="http://alioth.debian.org/download.php/${STUPID_NUM}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 hppa ppc ppc64 x86"
-IUSE="twinserial +usb"
-
-DEPEND=">=sys-apps/pcsc-lite-1.3.3
-	usb? ( virtual/libusb:0 )"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	econf \
-		LEX=: \
-		--docdir="/usr/share/doc/${PF}" \
-		--enable-udev \
-		$(use_enable twinserial) \
-		$(use_enable usb libusb)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc README AUTHORS
-	insinto /etc/udev/rules.d
-	newins src/pcscd_ccid.rules 60-pcscd_ccid.rules
-}
diff --git a/app-crypt/ccid/ccid-1.3.13-r1.ebuild b/app-crypt/ccid/ccid-1.3.13-r1.ebuild
deleted file mode 100644
index 3f6c76c162d7..000000000000
--- a/app-crypt/ccid/ccid-1.3.13-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/ccid/ccid-1.3.13-r1.ebuild,v 1.4 2010/09/29 15:47:52 jer Exp $
-
-EAPI="3"
-
-STUPID_NUM="3300"
-
-inherit eutils
-
-DESCRIPTION="CCID free software driver"
-HOMEPAGE="http://pcsclite.alioth.debian.org/ccid.html"
-SRC_URI="http://alioth.debian.org/download.php/${STUPID_NUM}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 hppa ~ppc ~ppc64 x86"
-IUSE="twinserial +usb"
-
-DEPEND=">=sys-apps/pcsc-lite-1.6
-	usb? ( virtual/libusb:0 )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-bcm5880v3.patch
-}
-
-src_configure() {
-	econf \
-		LEX=: \
-		--docdir="/usr/share/doc/${PF}" \
-		--enable-udev \
-		$(use_enable twinserial) \
-		$(use_enable usb libusb)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc README AUTHORS || die
-	insinto /etc/udev/rules.d
-	newins src/pcscd_ccid.rules 60-pcscd_ccid.rules || die
-}
diff --git a/app-crypt/ccid/ccid-1.4.1-r2.ebuild b/app-crypt/ccid/ccid-1.4.2.ebuild
index 754eea611c29..3ba2fdf65285 100644
--- a/app-crypt/ccid/ccid-1.4.1-r2.ebuild
+++ b/app-crypt/ccid/ccid-1.4.2.ebuild
@@ -1,17 +1,16 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/ccid/ccid-1.4.1-r2.ebuild,v 1.1 2011/01/05 19:55:46 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/ccid/ccid-1.4.2.ebuild,v 1.1 2011/02/23 10:45:19 flameeyes Exp $
 
 EAPI="3"
 
-STUPID_NUM="3475"
+STUPID_NUM="3518"
 
 inherit eutils
 
 DESCRIPTION="CCID free software driver"
 HOMEPAGE="http://pcsclite.alioth.debian.org/ccid.html"
-SRC_URI="http://alioth.debian.org/download.php/${STUPID_NUM}/${P}.tar.bz2
-	http://dev.gentoo.org/~flameeyes/patches/${PN}/${P}-o2micro-oz776.patch.bz2"
+SRC_URI="http://alioth.debian.org/download.php/${STUPID_NUM}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -25,8 +24,6 @@ RDEPEND="${DEPEND}"
 src_prepare() {
 	sed -i -e 's:GROUP="pcscd":ENV{PCSCD}="1":' \
 		src/92_pcscd_ccid.rules || die
-
-	epatch "${WORKDIR}/${P}-o2micro-oz776.patch"
 }
 
 src_configure() {