app-crypt/ccid: version bump and remove older.

Package-Manager: portage-2.3.0

2 files changed, 25 insertions, 7 deletions

diff --git a/app-crypt/ccid/Manifest b/app-crypt/ccid/Manifest
index db483fb62e6..b31592462fc 100644
--- a/app-crypt/ccid/Manifest
+++ b/app-crypt/ccid/Manifest
@@ -1,3 +1,3 @@
-DIST ccid-1.4.15.tar.bz2 487625 SHA256 5436182246f15b3e78b1ad6707022b02dc400e3f50c4cb5e5d340a4e716d990a SHA512 393eb65db0fb31b58d4010c10cae6c7592078b02d0e77b7741330cc3b1e5dd768fa08dbaf75db39c547e3603fa70aa1c8aaf3b536266314f2f04d2ff2b6fb29c WHIRLPOOL 0dd511454cf8e39303318b61f9e2390f2ef27b763e80e9270f55ee15966ced8378f3f3ee5440b6380481f970f03ae37bbb2221da6c3d2d658622ea4cdc3aee3f
 DIST ccid-1.4.18.tar.bz2 492113 SHA256 5fdba97a2d2eb1c652b7dd4aa0bb8cee4814bab0cf61aecb84b32b57272541aa SHA512 ff7e331431909fe9fffd4f7aae0a2395b3b755da9c898aa6a6b629f7f516c240b820669146791deb443c646dc8fc56f9100c9f987b3e7d13c24f24f81f06b1f0 WHIRLPOOL 86107ac379e5523c31aa1499e1ecd5a1f6dab5b7f748800b5a22ff2b6470e9bb590407cb8a98ad65870a832149fe8835aa42dff9a30027f0bce843640439ce1e
 DIST ccid-1.4.24.tar.bz2 594507 SHA256 62cb73c6c009c9799c526f05a05e25f00f0ad86d50f82a714dedcfbf4a7e4176 SHA512 4904165fdd089cd6f28b1c27130119d3433641a9cea5d6700afd1daa2722f763e2b348a42af4a292fdd08da45c7b17b2804b32b1fbe0ff19dccf58ec3310b09f WHIRLPOOL b2f88557ae0e6fb838432eaf0d13be1f7631c7d7f4b4a0c20014b060f0368fb5acba0c15eba7fdf6d9e31dc115a9c0bec5fe1e83468943522c94b8a89e93932c
+DIST ccid-1.4.25.tar.bz2 627456 SHA256 6b062b4ce0f04d6838d58e6faa255ba05222bd8ecb57a2d1116fdbe22f253609 SHA512 97ca4009e5b4522e3db913ab147bd32bd24490c798d31be6614d3b337e0ab47e93a1ae0c1dfe1cf47a41145b3b37f5a10bbbafec980c180b407b511f18f9ac2c WHIRLPOOL bad411d2a8731a8a2e8318df8f4774d1c2c124516ecbd81cd804b3bb1f504c28bd9fa74fb5c33252e9f1c2202dfe7fe952ee7eceeae1acadbae06e0e7ce84b7a
diff --git a/app-crypt/ccid/ccid-1.4.15.ebuild b/app-crypt/ccid/ccid-1.4.25.ebuild
index f1955a27567..078a0690ef0 100644
--- a/app-crypt/ccid/ccid-1.4.15.ebuild
+++ b/app-crypt/ccid/ccid-1.4.25.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
 
-STUPID_NUM="3989"
+STUPID_NUM="4187"
 
 inherit eutils toolchain-funcs udev autotools-utils
 
@@ -14,8 +14,8 @@ SRC_URI="http://alioth.debian.org/frs/download.php/file/${STUPID_NUM}/${P}.tar.b
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86"
-IUSE="twinserial +usb"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="twinserial kobil-midentity +usb"
 
 RDEPEND=">=sys-apps/pcsc-lite-1.8.3
 	usb? ( virtual/libusb:1 )"
@@ -34,16 +34,34 @@ src_configure() {
 	autotools-utils_src_configure
 }
 
+src_compile() {
+	autotools-utils_src_compile
+	use kobil-midentity && autotools-utils_src_compile contrib/Kobil_mIDentity_switch
+}
+
 src_install() {
 	autotools-utils_src_install
 
+	if use kobil-midentity; then
+		dosbin "${BUILD_DIR}"/contrib/Kobil_mIDentity_switch/Kobil_mIDentity_switch
+		doman contrib/Kobil_mIDentity_switch/Kobil_mIDentity_switch.8
+	fi
+
 	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
+		# 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
+
+		# disable Kobil_mIDentity_switch udev rule with USE=-kobil-midentity
+		if ! use kobil-midentity; then
+			sed \
+				-e '/Kobil_mIDentity_switch/s/^/#/' \
+				-i "${D}/$(get_udevdir)"/rules.d/92-pcsc-ccid.rules || die
+		fi
+
 	fi
 }