Version bump; remove old.

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key D4301342)

3 files changed, 17 insertions, 61 deletions

diff --git a/app-crypt/ccid/ChangeLog b/app-crypt/ccid/ChangeLog
index cbade983a301..68e0091e9e81 100644
--- a/app-crypt/ccid/ChangeLog
+++ b/app-crypt/ccid/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-crypt/ccid
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/ccid/ChangeLog,v 1.98 2013/06/17 15:22:59 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/ccid/ChangeLog,v 1.99 2013/10/12 20:13:11 flameeyes Exp $
+
+*ccid-1.4.13 (12 Oct 2013)
+
+  12 Oct 2013; Diego E. Pettenò <flameeyes@gentoo.org> +ccid-1.4.13.ebuild,
+  -ccid-1.4.10.ebuild, -ccid-1.4.9.ebuild:
+  Version bump; remove old.
 
 *ccid-1.4.11 (17 Jun 2013)
 
diff --git a/app-crypt/ccid/ccid-1.4.10.ebuild b/app-crypt/ccid/ccid-1.4.13.ebuild
index 8daf53a64df6..a727e9b009e9 100644
--- a/app-crypt/ccid/ccid-1.4.10.ebuild
+++ b/app-crypt/ccid/ccid-1.4.13.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/ccid/ccid-1.4.10.ebuild,v 1.1 2013/04/17 21:51:48 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/ccid/ccid-1.4.13.ebuild,v 1.1 2013/10/12 20:13:11 flameeyes Exp $
 
 EAPI=5
 
-STUPID_NUM="3897"
+STUPID_NUM="3959"
 
 inherit eutils toolchain-funcs udev autotools-utils
 
 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"
+SRC_URI="http://alioth.debian.org/frs/download.php/file/${STUPID_NUM}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -24,13 +24,6 @@ DEPEND="${RDEPEND}
 
 DOCS=( README AUTHORS )
 
-src_prepare() {
-	sed -i -e 's:GROUP="pcscd":ENV{PCSCD}="1":' \
-		src/92_pcscd_ccid.rules || die
-
-	autotools-utils_src_prepare
-}
-
 src_configure() {
 	local myeconfargs=(
 		LEX=:
@@ -45,7 +38,12 @@ src_install() {
 	autotools-utils_src_install
 
 	if use kernel_linux; then
-		# note: for eudev support, rules probably will always need to be installed to /usr
-		udev_newrules src/92_pcscd_ccid.rules 92-pcsc-ccid.rules
+		# note: for eudev support, rules probably will always need to be
+		# installed to /usr
+
+		# ccid >=1.4.11 version changed the rules drastically in a minor
+		# release to nolonger use the pcscd group. Using the old ones in
+		# the mean time.
+		udev_newrules "${FILESDIR}"/92_pcscd_ccid.rules 92-pcsc-ccid.rules
 	fi
 }
diff --git a/app-crypt/ccid/ccid-1.4.9.ebuild b/app-crypt/ccid/ccid-1.4.9.ebuild
deleted file mode 100644
index 89630cbc4d1a..000000000000
--- a/app-crypt/ccid/ccid-1.4.9.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/ccid/ccid-1.4.9.ebuild,v 1.1 2013/01/16 20:51:28 flameeyes Exp $
-
-EAPI="4"
-
-STUPID_NUM="3864"
-
-inherit eutils toolchain-funcs udev
-
-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="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="twinserial +usb"
-
-RDEPEND=">=sys-apps/pcsc-lite-1.8.3
-	usb? ( virtual/libusb:1 )"
-DEPEND="${RDEPEND}
-	kernel_linux? ( virtual/pkgconfig )"
-
-DOCS=( README AUTHORS )
-
-src_prepare() {
-	sed -i -e 's:GROUP="pcscd":ENV{PCSCD}="1":' \
-		src/92_pcscd_ccid.rules || die
-}
-
-src_configure() {
-	econf \
-		LEX=: \
-		--docdir="/usr/share/doc/${PF}" \
-		--disable-silent-rules \
-		$(use_enable twinserial) \
-		$(use_enable usb libusb)
-}
-
-src_install() {
-	default
-
-	if use kernel_linux; then
-		# note: for eudev support, rules probably will always need to be installed to /usr
-		udev_newrules src/92_pcscd_ccid.rules 92-pcsc-ccid.rules
-	fi
-}