Version bump and cleanup.

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

6 files changed, 22 insertions, 166 deletions

diff --git a/app-crypt/ccid/ChangeLog b/app-crypt/ccid/ChangeLog
index 6380f14e1b1d..15437df91f2d 100644
--- a/app-crypt/ccid/ChangeLog
+++ b/app-crypt/ccid/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-crypt/ccid
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/ccid/ChangeLog,v 1.110 2014/08/04 22:09:43 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/ccid/ChangeLog,v 1.111 2014/09/29 20:22:32 flameeyes Exp $
+
+*ccid-1.4.18 (29 Sep 2014)
+
+  29 Sep 2014; Diego E. Pettenò <flameeyes@gentoo.org> +ccid-1.4.18.ebuild,
+  -ccid-1.4.14.ebuild, -ccid-1.4.16.ebuild, -ccid-1.4.17.ebuild,
+  -ccid-1.4.8.ebuild:
+  Version bump and cleanup.
 
 *ccid-1.4.17-r1 (04 Aug 2014)
 
diff --git a/app-crypt/ccid/Manifest b/app-crypt/ccid/Manifest
index a5b25be42fea..e1926de7942f 100644
--- a/app-crypt/ccid/Manifest
+++ b/app-crypt/ccid/Manifest
@@ -3,29 +3,24 @@ Hash: SHA256
 
 AUX 92_pcscd_ccid-2.rules 2282 SHA256 d3e81896e4a6250f59a0675c819329e6ed5ad599edf6384b5fcb113c373599e8 SHA512 9ce5f2294e73b61657ee3d578c0de752ae64cd1e8cd2027c93300ae718f2c9c2dda328d366d8d30dfa96b4816c7a523f9a6db09f65a55aee20eb68c8d7f9bdf3 WHIRLPOOL f3471eb71a59d98626ac45d1a5b72fd4cdb64cf22a9c3b6939aeb75da2006f2dde68ec851ed62c872ace7e9d04f87f04462a9723f0a0af3a5c7d31958a10635d
 AUX 92_pcscd_ccid.rules 2167 SHA256 324e933bff4ddf474abf32102d53e883e709ae5d93d7dcf11460909e27b80ece SHA512 87a35f50c03a11c51f08b7795cc7e0c58c00f630e9263ac793e13352a83ec2bd1a8c0e4d7e4593936ba7b458fc917f4e0ebfe5ee6755265369d3be03dfbac595 WHIRLPOOL 8a72a1df97d66f8bfb1e1c678ff47090df7e37c266f9465841ed684ff0fa08cffe0a0b1c8dfd51f5d31686683fd35b76a3dbb3c9ec06c254bb94740f526b0231
-DIST ccid-1.4.14.tar.bz2 484659 SHA256 c50b04ac8e800a14246ea42cf37f73bd42fdb3645afb290b7af091f9e15cd146 SHA512 72e9a026689a308a1eb96ab7e31a6af987782e8c66721e1fd0f4eb7b575363309303cdf138863c35e3feda789517122fd6f15cbd4b03bf3ed870a5e7fae9b5ea WHIRLPOOL ddb427f1efa1e5b512fb114b9cf57e92b81a449bc46f6788b8054754c09b7d30491713f76da08fd9272c3803b1f12dfa38269ef501bc7817bd6bd47d3a739115
 DIST ccid-1.4.15.tar.bz2 487625 SHA256 5436182246f15b3e78b1ad6707022b02dc400e3f50c4cb5e5d340a4e716d990a SHA512 393eb65db0fb31b58d4010c10cae6c7592078b02d0e77b7741330cc3b1e5dd768fa08dbaf75db39c547e3603fa70aa1c8aaf3b536266314f2f04d2ff2b6fb29c WHIRLPOOL 0dd511454cf8e39303318b61f9e2390f2ef27b763e80e9270f55ee15966ced8378f3f3ee5440b6380481f970f03ae37bbb2221da6c3d2d658622ea4cdc3aee3f
-DIST ccid-1.4.16.tar.bz2 490965 SHA256 0a0e6aa38863c79e38673c085254fa94fd0aa040b9622304a8d6d4222b7e7ea0 SHA512 b3b1761c591ba9981f646433bda4b300e6a1a2bf80b5416c47302cd430ec4f33deac8c0753d3e0568591d0ee6aea180695f2dc8f206585a85de506d1873eb915 WHIRLPOOL 083add5ca26fd1bea18d3547c482e9f0597f65d650ba942c23718ed2cebe216afc41c03ce22d9dadf1b3b9248b9fcc17ec7026a143fc9daa93b383e887603e9d
 DIST ccid-1.4.17.tar.bz2 491972 SHA256 ccdab8a9bc1ad288242d5f9ef399405e9cb96fb09caadb43e3649cbaba84c451 SHA512 65dd0020b7b586eb6e0db5953561e8dc578daee522bf472542f05355293171a9635ea64447ecf465bc65b13a5fdeb7d223e15b53ca7045b880ba8bde859bd4eb WHIRLPOOL f3044a70112bdbf061262ed69c218547d266f3ec8ae31bf211b54456829b2956b782c473d4ea21c0f8e97edc2b262c1db5a7aa45baee287f9d48fef3260f7df3
-DIST ccid-1.4.8.tar.bz2 470158 SHA256 7aca09fa4b9099e423402fd5df424adbafa502888710d1fda6015b6c1ff637ef SHA512 1b5b56521e2469c23e033141236aae0791d50640f810a012d8420002a56a6929e476a1c8462653909e8939f9439b043a64b247aced7d1f511f96a7dd0071ffa0 WHIRLPOOL d0c51bf360ee63a72646af98e44b4b1940336dcf3400f249b075d8efcabdf650cfbaa6be2656d411195411646c82ac410487b8b274e88457edc8c4e4a23ac15d
-EBUILD ccid-1.4.14.ebuild 1271 SHA256 bf3a6b57c8dd4fd4f3b07ce89cb6402e2f7b6d94dfc315818944a17441fdaa27 SHA512 29d224e22dce4f8c47fed3f488531d34ad7bfeeb722f3018b5465f0589dc115573295c82205c1d5fbb81561ee8f88fb8159a08ef4e73760c94ba1a3832ae7435 WHIRLPOOL 17b64ce14af88e123debc7400a377dda28c70de57f5a7aa06a12171760e46ec37c07d33483f166ab2e6202a8bd34ad96d00922effc413e7b6fa31ec19f2127cb
+DIST ccid-1.4.18.tar.bz2 492113 SHA256 5fdba97a2d2eb1c652b7dd4aa0bb8cee4814bab0cf61aecb84b32b57272541aa SHA512 ff7e331431909fe9fffd4f7aae0a2395b3b755da9c898aa6a6b629f7f516c240b820669146791deb443c646dc8fc56f9100c9f987b3e7d13c24f24f81f06b1f0 WHIRLPOOL 86107ac379e5523c31aa1499e1ecd5a1f6dab5b7f748800b5a22ff2b6470e9bb590407cb8a98ad65870a832149fe8835aa42dff9a30027f0bce843640439ce1e
 EBUILD ccid-1.4.15.ebuild 1259 SHA256 646b59adb8d3a3a8a33d88f674d0ad351c052a6971a0f769d4082c37fccc5c84 SHA512 6558cd7bc2c2f1e8bcb426042c1ed30d3d32b19a0930694b90a3a9d59f912efa650acaec996888d93a390850b7a00ceed2e0ba511b5d1db37e4ee2e01c3d66dd WHIRLPOOL 112ec9db1b15257efb8853fc01a1e433e6ca54ccbce835c722bbd6cc143810208efd5cb9bd0f7ac1b7f89b56cce650d09b56a9ef9db0d075a7f12bf761610a12
-EBUILD ccid-1.4.16.ebuild 1272 SHA256 57d1a4a9ba2417f5a98af0f54af5e98c1fde99eb26012fb15036c91f9752d5a5 SHA512 04d87e3c030553a39098f34680bffb9bc161633a0e39e49b1e67f89f0f939cbc44a7e8011eb52955ca4e4cdd938400ba85209cf4b8fbae4c8907d88ad7d1845c WHIRLPOOL 463f0642b744f2341dab980a39775ee695f5a462cbc66cf4b500bf4a4d73e91c6fcc3fb52dd7293ef349fa4e491a9afa886f6ffaf98c7806d572e86ff84bc77d
 EBUILD ccid-1.4.17-r1.ebuild 1277 SHA256 8b618910a0948e5beeb0b721899811931d0c34aba5c82c17b68994c8248847fe SHA512 48b3e2a806edf1975da1ad016a5b93aa84b20cf8e9a546e449243297c6fb93363474b297b0483114831c9611f4ad7f777f99bdce7ba0e5079895a42204e9e542 WHIRLPOOL d664f72326aca053a22c1c6f9abae034c62eaaeefd71886b0dffbca1bdfbad826c6eaf409f5551745fe87f5a7b0495692f1173819a347f6c63d9d5861ceeda62
-EBUILD ccid-1.4.17.ebuild 1272 SHA256 e8e3fd003ebf84ded13e34c049a117f8a20d8b291ebb6d14cfc9156c2c7e679b SHA512 47a17407aceb696cc13914a28271e3d5e444b3de00dfb85a629511867846d4d63d76d5923ee7e1c1cd33b7e769af4de0e649a1ecd26f80553579e8f8b2175c6c WHIRLPOOL f883377d417aae4917bdb9d76bdcb9851408154961c6c635d3b49b28f4ed0d8acb40d30a07212cac4b5aab8a3a3ccfb5e663b2db2f57bce54aa998020055fb13
-EBUILD ccid-1.4.8.ebuild 1167 SHA256 a7a9e9268056c47271628a920ec0b45d80a9763b69f93500e38b9122c1287365 SHA512 fcc61873fd6f79031bb50ea44ad02add4e7291022ee52bac855c2d988a1c771ad60a36ae38b6b82e6539985d0c57ffbfb3a400194b1670cd86ceca235d155bc6 WHIRLPOOL 0cf79d09d555156cbbd99540c0b6bfcf04eab1e55a5b03592fa83778c659d6047b909fec35025000af88fae249399b8b2ca8614d520068dd983be7b834cd3b10
-MISC ChangeLog 15349 SHA256 e9a038f77f2418374bbc5b18e99b993316d1f1442158d4099744965a741c01f1 SHA512 354d1266daf8ceb83efdafe05ad0c2d269f6cd275c0be5f149bc364422e187a69d66d76a7e7088c06e5f0ba39a57a57eeb6eea84c82ae81b1d61759bf9a0aae2 WHIRLPOOL 1ce2b31bc5c802b671d0182908b8c59573c7d389da8b24646a28cfd2931790909a7e2f8dc8bdbaf16c022c32c4d7165322f11214a06d2926b82a8296d0215147
+EBUILD ccid-1.4.18.ebuild 1274 SHA256 03d358a3d19f48799875c11c8159bcd1a5593abb96987f61d0a71444ce32f2cd SHA512 0654ad51ae3665fec82e95fb504c22687ca153d2124ea928d8418d497e4a77bf72de8314a4256a29dbb7910be327c2d5905b5b0a4f0f4ae05d76d75c4dde8df9 WHIRLPOOL 38933104f75e8e8aae7526618d7d03c0467d1cb6f0e287d3a61eb4e86223eb796a5ba6abf49d5cb77a759ad07dc73d048b8f1eecaa0f99fcab9aeeabbbdecd3e
+MISC ChangeLog 15570 SHA256 d0984429d3b750c8241b3c6cb631f9e8d697eb005b4f962419645083525fd0d2 SHA512 dcec39262251bfb28eef94dcbba1dab92b5a55477a9fd82a35239410b50b1c0d63a1bbc267c600275dcfa552bfa1c5e721dafd86e77ad8020ae81658fcb9e0ee WHIRLPOOL 844a38dd9f60250e0c9928b12c7e16f2e5e9db5046ac111c128bba3e08fb2056c8dc29a4a3b6d0390f39c6f262bcd44475b8c31a73afdaca1594089b40bf732d
 MISC metadata.xml 233 SHA256 4aee9335129898172e76dfedb640e3c5f1383f6cd619d8c7f5d9fc26acbf0e69 SHA512 b06d30613086872559ca7030d9e67b8bbd5274a72876ea539ca840f910bda12d78ea5e286ff8e98c5f943f6ef7e817fa5ec1b3d55ba364ab9250291951260869 WHIRLPOOL c640cc50e1b7b2aa52217f3e6b67965337a41b5ce461793c4f42c178faeedaa7bfd617637960f6f6e7d40e7b29386d68abef27d29d1df2421bbe850e87aa9c68
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQF8BAEBCABmBQJT4AStXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQF8BAEBCABmBQJUKb+OXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1MUE3MTczOTAwRTQzNTc0RDJBOUJBMDIx
-Q0QxM0M4QUQ0MzAxMzQyAAoJEBzRPIrUMBNCAy0H/280yir0uhbtIGW0P1ieA0/R
-aXZiaGr/lxXLUkvASIND1hfgwHO/gAWd2EO4WFQnr0wELmbW1mLGBmCPa5RJKZbE
-6BL/7Ge37dAoFs+qjT+gIaBInlL5DlsWFZxpPa6OaH7VgG/gUdxnIUdFuCvBB/YZ
-uXluHP0Lr7HgXOnXi446BKALUriylsFMLp6WqHL9KgYyvdmsiZJiya54sKi3Pvi4
-fxgaWN2xtW/+YVd3O3e5kIREY39rHjI6mAqlaRBr47hu08VjKDUOCCxv/fsocP4T
-cEZQR4hBu/fcTzl7M9RxPXowAW0e14dk4OEPvEnDbjQtwneox7AmQ3j/1VA4W0Y=
-=5GQy
+Q0QxM0M4QUQ0MzAxMzQyAAoJEBzRPIrUMBNCnfoH/2RjUaE7nE9hg5nXi5uumqlT
+JPLVtaCERYt3gIxM2o5cAODlUcu2PSy1QO2GBQ1TR8R1ny0g1X4niRqe6bcGgoIC
+GAfKZtzlD1Vqk1O/D1tx472FwqytmATrK5z8omU+P/W/PGPnppWtKg9jhJMKoujx
+La55s2r5beTmgMQd+ZAvtGgnJS1swHNcOy5UFW2Kjol8qRBID1u4VLGn8zMXPvRd
+kWpzNuFK7ISoGDVVs2vDrhowEyQmFLEloU8YmKZ9nwPM14ZEcCFVy4XI5ez9BDuH
+J4DUYLrjMzbUJMha+EZ6JNPCOHvFXR9krwe2lANWfQJKdQmfgzGqSpIFxWaFEls=
+=kMlN
 -----END PGP SIGNATURE-----
diff --git a/app-crypt/ccid/ccid-1.4.14.ebuild b/app-crypt/ccid/ccid-1.4.14.ebuild
deleted file mode 100644
index 9b91d026eb11..000000000000
--- a/app-crypt/ccid/ccid-1.4.14.ebuild
+++ /dev/null
@@ -1,49 +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.14.ebuild,v 1.1 2013/12/02 21:43:32 flameeyes Exp $
-
-EAPI=5
-
-STUPID_NUM="3971"
-
-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/frs/download.php/file/${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_configure() {
-	local myeconfargs=(
-		LEX=:
-		$(use_enable twinserial)
-		$(use_enable usb libusb)
-	)
-
-	autotools-utils_src_configure
-}
-
-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
-
-		# 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.17.ebuild b/app-crypt/ccid/ccid-1.4.17.ebuild
deleted file mode 100644
index 3b85f789ab65..000000000000
--- a/app-crypt/ccid/ccid-1.4.17.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/ccid/ccid-1.4.17.ebuild,v 1.1 2014/06/26 19:57:03 flameeyes Exp $
-
-EAPI=5
-
-STUPID_NUM="4091"
-
-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/frs/download.php/file/${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_configure() {
-	local myeconfargs=(
-		LEX=:
-		$(use_enable twinserial)
-		$(use_enable usb libusb)
-	)
-
-	autotools-utils_src_configure
-}
-
-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
-
-		# ccid >=1.4.11 version changed the rules drastically in a minor
-		# release to no longer 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.16.ebuild b/app-crypt/ccid/ccid-1.4.18.ebuild
index fdb5e8ce37d3..dd566d9f550c 100644
--- a/app-crypt/ccid/ccid-1.4.16.ebuild
+++ b/app-crypt/ccid/ccid-1.4.18.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/ccid/ccid-1.4.16.ebuild,v 1.1 2014/03/23 19:56:31 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/ccid/ccid-1.4.18.ebuild,v 1.1 2014/09/29 20:22:32 flameeyes Exp $
 
 EAPI=5
 
-STUPID_NUM="4016"
+STUPID_NUM="4111"
 
 inherit eutils toolchain-funcs udev autotools-utils
 
@@ -44,6 +44,6 @@ src_install() {
 		# ccid >=1.4.11 version changed the rules drastically in a minor
 		# release to no longer use the pcscd group. Using the old ones in
 		# the mean time.
-		udev_newrules "${FILESDIR}"/92_pcscd_ccid.rules 92-pcsc-ccid.rules
+		udev_newrules "${FILESDIR}"/92_pcscd_ccid-2.rules 92-pcsc-ccid.rules
 	fi
 }
diff --git a/app-crypt/ccid/ccid-1.4.8.ebuild b/app-crypt/ccid/ccid-1.4.8.ebuild
deleted file mode 100644
index b50d836d7374..000000000000
--- a/app-crypt/ccid/ccid-1.4.8.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.8.ebuild,v 1.13 2013/01/06 09:12:49 ago Exp $
-
-EAPI="4"
-
-STUPID_NUM="3768"
-
-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
-}