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).

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

5 files changed, 19 insertions, 96 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/Manifest b/app-crypt/ccid/Manifest
index 460d258496f8..4f036fd5f374 100644
--- a/app-crypt/ccid/Manifest
+++ b/app-crypt/ccid/Manifest
@@ -1,20 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST ccid-1.3.11.tar.bz2 418017 RMD160 360101c3435f6aa1f715a5b1627ca21256cbae06 SHA1 3b9b6cebe1fea7a6f73c5a44ae52c22dee1ee018 SHA256 f7bf5a82b02aff7d709a45dcc6109105508625caf92e34da4140b7c84d498906
-DIST ccid-1.3.13.tar.bz2 426333 RMD160 b12695a22baa39370d46d283c055b52bf4fde7c2 SHA1 b9f179ed7c81cf0c57eb19680696378946eeb60d SHA256 f797b08874c1f9b2b4afe4ada8ef3400ce4da6bf965a24a6cf7f29d82cbf8c53
-DIST ccid-1.4.1-o2micro-oz776.patch.bz2 2937 RMD160 91278b593e20da1193d1487fb74bfeb54415cfe8 SHA1 f9171b937aadaad1fb5d067de56850dab66492e6 SHA256 20fce1c700d34e55892f6fae1a19593b572b567cfb619fdca7cab0a5eb36aa0f
 DIST ccid-1.4.1.tar.bz2 436144 RMD160 f4c7a3c17db0b86756907c80de4d868b73a22b53 SHA1 7f559a137e6e298a49182489887e72e9cbb5ed7f SHA256 a67954a2dc7cbc049c7085b304936e55f95b6ef443497df537ac24578ae77c47
-EBUILD ccid-1.3.11.ebuild 913 RMD160 9728a53d07cf10eb25925a986118e0a4ac6788f5 SHA1 c62028d7277de6451b3336c3ab13073da4376dea SHA256 11ed56e29d09ecc561145605b0eafcb5249d388a369a3311db2ed40d08c91a78
-EBUILD ccid-1.3.13-r1.ebuild 1003 RMD160 d05538c36bc8647ae1325a96ae2f11efbf495062 SHA1 9357d0ae0ece9ce20e56c3691003b90c46b8a393 SHA256 eb11ce9f8f2aad037119100484e000d2d8c4177854f8c632780dcc21ef6fa560
+DIST ccid-1.4.2.tar.bz2 445453 RMD160 ca9173b1f10de9ecbbe9088ebc0e05ca6fef263f SHA1 ef66f6cc401110e673dcf8bd05bbdec12cacd6cc SHA256 348adcc84f328e1fa722a0326980621843de247d78ebefdc420096b4a94d2560
 EBUILD ccid-1.4.1-r1.ebuild 1010 RMD160 99354a984c249f5e05ec733d8a6b3a1f02afae66 SHA1 7772a57029d90dcf9b1c1976378aff3da0e2a8d2 SHA256 6b82e6e9669a70d263a43b9bc03fd7c656af0d1d6f2888f86354c3b9ef13b026
-EBUILD ccid-1.4.1-r2.ebuild 1138 RMD160 15b00443e7c3c2f73153e3fd3ae928a42793ba6c SHA1 dca88b660d8df1020eeb38efd861d65467c108a4 SHA256 01c61a104df0aa0f31e2be2afe578cab5e74207c966b268938286e2f82fde732
-MISC ChangeLog 9057 RMD160 56f8e1df26bcb6c7b930e5aba09e1ab375bd2b87 SHA1 5e0abd775b251ee10a7bd84a688e5ac5f7d58897 SHA256 cbcd25ec93197177ef185b93b24a98fefc167acade38c17bca2ac8efaea10d92
+EBUILD ccid-1.4.2.ebuild 1011 RMD160 992e478eaeeb9764a5bb2a92a54d6df7a9b7073d SHA1 122772b7066f5a7949c1978f91476c9e9c161411 SHA256 ab1e6fc3cde48a802b89fd920fe2e52397065705e6da7644063914f8914ce26a
+MISC ChangeLog 9418 RMD160 e61902b07a8a0af1611fafbd088c0f734136453b SHA1 54aa57d04e209ab83809685b85dc9466cdd6acda SHA256 ad26ab9121edae7167752bb7ce7c6c2cef8c2f536b94e914384a463e1f08c272
 MISC metadata.xml 233 RMD160 6dbeed8ff2c439eb4e9c3fd0ff143c6cad37c47f SHA1 6b802b81570c16c3d37b9e4545ff2e410c7f61c2 SHA256 4aee9335129898172e76dfedb640e3c5f1383f6cd619d8c7f5d9fc26acbf0e69
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk0rVHsACgkQAiZjviIA2XjCjQCgomwCHtrsDIn5CUaJJzqcI3Vx
-EYgAoOSJcWbc157vKaZSAxS7IVPTf81J
-=pDcS
+iEYEARECAAYFAk1k5XkACgkQAiZjviIA2XiBSgCgnHHkW76JLugr+HhG5jk/5V1p
+Ck8AoMxiBn0E/WBl+JfQdBqjPDSXliD5
+=RNmg
 -----END PGP SIGNATURE-----
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() {