Version bump; remove old.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xD4301342

4 files changed, 28 insertions, 74 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/Manifest b/app-crypt/ccid/Manifest
index 20d2fbb94e79..a017a0b9d253 100644
--- a/app-crypt/ccid/Manifest
+++ b/app-crypt/ccid/Manifest
@@ -2,24 +2,22 @@
 Hash: SHA256
 
 AUX 92_pcscd_ccid.rules 2167 SHA256 324e933bff4ddf474abf32102d53e883e709ae5d93d7dcf11460909e27b80ece SHA512 87a35f50c03a11c51f08b7795cc7e0c58c00f630e9263ac793e13352a83ec2bd1a8c0e4d7e4593936ba7b458fc917f4e0ebfe5ee6755265369d3be03dfbac595 WHIRLPOOL 8a72a1df97d66f8bfb1e1c678ff47090df7e37c266f9465841ed684ff0fa08cffe0a0b1c8dfd51f5d31686683fd35b76a3dbb3c9ec06c254bb94740f526b0231
-DIST ccid-1.4.10.tar.bz2 470874 SHA256 3e963ac159dc7ecbe091a1a5d40f0baa81ee07ccd747527596dbc751b76bf7a1 SHA512 ff6399307a963a89d0a7ae98b88713c1f6fbee6fde26f0f8d967ef9b4531b288ded9830c1a335293d5cc3a1caad252c735f15f1ecfb1ee868009267dc350f7d1 WHIRLPOOL 276be004582dbcf7af4a8bf4fe687e48e292fa51fbd44394b226d09d88446c1cf81fea65eb780a10db7c169ee09eda6165fb042b5bc1b04f24bcbf54d15b770e
 DIST ccid-1.4.11.tar.bz2 475901 SHA256 04ce7ebc7f591b7542e15d4dcd1c50900d0d86c0639893832f5d6144ffb3c369 SHA512 a158560be415b1b894f447389b27eac37f8753e3aa621841e68982606ebcb18d8175b067f2de8dc3b8cfc8180865c0c3feca0a2ef976b050e82137e5d9ea6923 WHIRLPOOL df0ff0233ab67090a93e3adf50e1986331701fe58b246028f174c7d4fb5f65c77f852e92b4495654c52f9d701c9f64009cad0d0f7a95a4999703b7f3e8257ad0
+DIST ccid-1.4.13.tar.bz2 482601 SHA256 59756ff279f828778cee575b227b77bbf2c72b2a69bfc79ce849df8fcbea15f0 SHA512 db27029401a88259b1a6fa40c1bcc5f69ff839561c2e84f68af5cdd4e64cf91554e78a354b427ad99efe2a7befa1a4f467796cf9ff7303fdba87becaa76fc533 WHIRLPOOL 44b3d2c3f549568a20efda3fd7b8cd4861ab6f13dd578a32942ed6f1a538c174398ddabbab7132a0477190db24745591a83eb569a8953e790fe671dfe7097bf5
 DIST ccid-1.4.8.tar.bz2 470158 SHA256 7aca09fa4b9099e423402fd5df424adbafa502888710d1fda6015b6c1ff637ef SHA512 1b5b56521e2469c23e033141236aae0791d50640f810a012d8420002a56a6929e476a1c8462653909e8939f9439b043a64b247aced7d1f511f96a7dd0071ffa0 WHIRLPOOL d0c51bf360ee63a72646af98e44b4b1940336dcf3400f249b075d8efcabdf650cfbaa6be2656d411195411646c82ac410487b8b274e88457edc8c4e4a23ac15d
-DIST ccid-1.4.9.tar.bz2 470339 SHA256 e4b3f245c6c436e41391dcc142c38b101087378f6fbd3aa0c3f0cf9d53e93d54 SHA512 f6128be6297997aa39f5c4787351a1ac3a72b27e9acd6742c498eebc6065df0e24f721b15c0e40886b4e79a9ad3a64acd40219cff4a80b6e201dce168e28f9c7 WHIRLPOOL 1eecc50290983264b0cc10ab001a82f05c8bb15350f65836343296002a2660139a0bab8dcea2eb0084248791ee8a15abf440d77168b9e8b4df6a870b26a286e8
-EBUILD ccid-1.4.10.ebuild 1223 SHA256 2b0414fd481d584c3adb0aecf991ce88ef6a61f5c3d204a4bd7f880b0a5e53b1 SHA512 0ef691dee3378c9ea8e9d10be87b02ff48af55ca8a2ae12e45db48a169f35f073b8ca4b0fdd0c834ed6d8bd2d70d859cb34bef417c4357f583022c38949866f3 WHIRLPOOL 2188bbbde3b444c9f3949acadc5a05d6fc03fa02c695df0e5a79c159633f75fac11040c3f0416172236d2764ec65c5c232f9b76b47e342e7d7f85acb5200d765
 EBUILD ccid-1.4.11.ebuild 1271 SHA256 6bf4380b6c9dc1ac790a116a73f055aa71a08b510dc433b72bf4c69af893a5c8 SHA512 e1f150f15f97fe8bb765a3e6d4302d5a686652eb67c9a041f5ed40834df21026200a98d8113465f7294d9e2b64123fd914f73172edec87baae81f51618f513d5 WHIRLPOOL acf8272f3560307ee2fe6eadcb1073ee68714dfcbb59a73abdf5d46aa1db42385ec451f0ffe090f00f19a49c665d33283300abd16a149789d80dd562e46e49e0
+EBUILD ccid-1.4.13.ebuild 1271 SHA256 5ba9b778450ed7c19c714be0031e9299cb9ce3c39b7e4a4554adf726239380e2 SHA512 45eda23bd06d7a6bb9f4b1ff062532b956bb8e30f15ec2458c66833c68eb3832c85f0f589c2868d8e45d07735c7b8e773238a6a9f9dafa859a11da885cd2b9b8 WHIRLPOOL a3bdb8aebf8e2e326411f9144e57a79b218f6a672047d1ba0990ec29bedc53f6eee55523486f578ebe057f889fb3668c4de8682e453d280e876f6ec92ceefac4
 EBUILD ccid-1.4.8.ebuild 1167 SHA256 a7a9e9268056c47271628a920ec0b45d80a9763b69f93500e38b9122c1287365 SHA512 fcc61873fd6f79031bb50ea44ad02add4e7291022ee52bac855c2d988a1c771ad60a36ae38b6b82e6539985d0c57ffbfb3a400194b1670cd86ceca235d155bc6 WHIRLPOOL 0cf79d09d555156cbbd99540c0b6bfcf04eab1e55a5b03592fa83778c659d6047b909fec35025000af88fae249399b8b2ca8614d520068dd983be7b834cd3b10
-EBUILD ccid-1.4.9.ebuild 1178 SHA256 6fec6bf3b52c71ae12a10e7084c8c4d1a8a5a3405c70e544ba036c1fe2bf9829 SHA512 59514b1c13cd57131b012890043c57645f224edb85cbe790cdfb57a07b1b90b123860ba352ffe6ba751759ccb4f02b35a62cd2bc29e37f690587f559286683da WHIRLPOOL 214cd311233bc5b409780d59d68618c221838add7c0d12e1b19137821961832f17b4411cc0dd16a894bb69fb93e169c5a3f0c076896c881919d3703dcb998f44
-MISC ChangeLog 13736 SHA256 77646a5cc7663bdaf5d45e93a24b94a61162ad7e464bc1992c93249e05dac7bc SHA512 2c1c8dc840a2122d129523d4cf83cb543496213d3b86767dc32145d1b4aa5b689699ccafa4836e53ad75d4c746f4e26c0d64469ba1372a0d711b87a89d658688 WHIRLPOOL 7990f1a757c976f96ad155e98b5ad5bd3dc0917a8abac1f137bea1c8131f1766635c0f3413250ecda03f37f55942d9769ce9f6640f8ff64c26dafb2778f717aa
+MISC ChangeLog 13913 SHA256 a006b87441688b00f3dc097988c09bee5835b39c029c3bc86e7d500cbd5bd2b5 SHA512 52e0636c642e7351558e1dd4933418fdc5c1dbdaed1d049c046e5063dbd06600d564d72ae304824b4530b8367576d8dfc1a4e913a1ba995b99bbe2a4bdf26440 WHIRLPOOL 4586cf89b5046ab121aaaddb790c73bb766700c7eae386c765e9f5efe769ef8a134774bdf571f906d3947668182a9acb1088b1b2788f523a6d69f1bc4c06782d
 MISC metadata.xml 233 SHA256 4aee9335129898172e76dfedb640e3c5f1383f6cd619d8c7f5d9fc26acbf0e69 SHA512 b06d30613086872559ca7030d9e67b8bbd5274a72876ea539ca840f910bda12d78ea5e286ff8e98c5f943f6ef7e817fa5ec1b3d55ba364ab9250291951260869 WHIRLPOOL c640cc50e1b7b2aa52217f3e6b67965337a41b5ce461793c4f42c178faeedaa7bfd617637960f6f6e7d40e7b29386d68abef27d29d1df2421bbe850e87aa9c68
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRvyowAAoJEBzRPIrUMBNCq3AH/1QNSdEOURnevQIcelyPp3an
-pGEJidv9RDJriX+RQ1TrLNdAyJ/yAqT6E/1ud2QjG1jNr1GgbHY5V1OnHducTQjA
-QN4/qaBtr55L7JrGBqrLvH13T9lGOpVKbus0OnixCEZDOsmToHA2UzxLOOcoZBVt
-8d2PWGqegxSEFWXaItdLnrOjkrBt7Zgb34hIz09Vjos3cwnKbxGv56Zih2NL0i1/
-lApKhZavvQDW+wtAIKpXUNkAfTUjTzNPImj8XFxOJPWnU/fKXpzidwXENFEOO12x
-rxsKL2VpsaQgES+bdzonz09yey6Ujhsv1EQzCb9bYoSP37EizBK6CIhzt0E4XQs=
-=Oy1g
+iQEcBAEBCAAGBQJSWa1HAAoJEBzRPIrUMBNCwzoH/2zB+OM/OxzT5n9ZYZeD1ueJ
+RWunTnnM4uBCNs2nrlN09CrgOyUpCb62yG6X6inuKTp0Dp0usH1nv5BoF7OKgisZ
+H4765VF4tsXyB9mVNEbfx8647iuzksmrXxH2pQOu6UUbnY+kBLGgZkWVjMZVmSPz
+0GaSNBrmhZuBkuS5sTQfNdt8rK9Hfe0BXvtYcTpT0//7NFoER/5tbnSshAqOCqJW
+bkl+cNnu7LyZhkJqmTO0aZDsxNBXZlCx3QjAjQ9gBMd7LOdjw0ft9yBUHOF0pIOz
+qGPllpzS8ixbBvSges5+N4s+LWSK7fuxB615JLvdDAj3uex/mwFZh04HIlETtdg=
+=b0fG
 -----END PGP SIGNATURE-----
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
-}