gentoo resync : 22.04.2018

4 files changed, 72 insertions, 13 deletions

diff --git a/app-crypt/ccid/Manifest b/app-crypt/ccid/Manifest
index 3a7f195fb934..6c7531a37ef0 100644
--- a/app-crypt/ccid/Manifest
+++ b/app-crypt/ccid/Manifest
@@ -1,6 +1,8 @@
 AUX 92_pcscd_ccid-2.rules 2275 BLAKE2B a72b8d2bb8cf56f621a0762dac95500f93afa224228f403395c9590758c8fa986b3e8d0d1b12353ec7fed5a40f6af900fcd57eaaa7b339018fe42c2b509c0c5d SHA512 f327eee35ca6009069389f935ca89feea4e693e8f0c73f8f218d2639faee4ce35df85832a71e3fe98ce24aae31861aa8bd290833e59ada75c1e1a2df9ff0a477
 DIST ccid-1.4.26.tar.bz2 628038 BLAKE2B ba0cc8aa92a7b960d12e0ebfba79910c84eff11815495bda76287bacb7638093270eb2b5bc502c67b1a789a6bef19deac338312b044d74f6f7348adebd2a621e SHA512 4a2e5e9412f2aa4870e14114e54da96fd8b3418ea6d3a236b83e19d6349adb20a94ef7f48628c108f8459f008c10b0606bbf4d797ae4be9183e1acde032c618c
 DIST ccid-1.4.27.tar.bz2 632817 BLAKE2B a18de0594c9535c4564bc27886fc69a0edc54343941d77b9558f331a932d12d2b58303ae3994337e380f16648f7bb2a8aa90c00aae4c7cffe242e000003c5dcd SHA512 14fb5d9878ed36de912d860d8537758170781f225957a99d5fed447dcfba0cba3133f78d2cc4bc7db60d3527399f70e4a7d1d1f8348fb50d1bcfc75820a23522
-EBUILD ccid-1.4.26.ebuild 1566 BLAKE2B 426f6c4d8b553c7c2540acd02e504788aa9fa0f4acd653773e1a2e74a4e0d2ba7609b6346c6b9e2c1b7d4b758a187309f61dfbe9c68ace244481d6fdd3c7dd87 SHA512 e3f1b727f9889c9f41e15fb9f7da382dd8b83039634f24a22fb09171bf4690f51e9ca004dd885d2e2031a42ba47c7b090a178fbebd7c2c08d04c17bdcf4c24d2
-EBUILD ccid-1.4.27.ebuild 1568 BLAKE2B b10d13b0158aeed921d641fd7a573b0b449de1af40750802e64674e34fb510de4aed8f8c6dd38fe2de0bfad1a666d129c4eaaf4f9a6678001062002df1578c9e SHA512 4403aead1ce8dababa7748075ecefcfd0c12d2cac63d45b8ccd360aebb33ecb81a9cf5b58d83af9d889157db279b735927a292d9d9b31db0648faf22bb2803f3
+DIST ccid-1.4.29.tar.bz2 635761 BLAKE2B ff14bc6e181a6d44b8ef463a2255d0362842f6e1e7c79e0a01caaba0a88892f7b0f2bd9d2dadae7be8b0655d2502e5471cff29e582928d62235fa070f2eb1ba8 SHA512 9ff37acad086e959f660069b245fe06ecada140623025a19dfbff55edec71e1e72bce09ac4fc506ad985dd0831dafc6b12f5a5b109b38bf9ba7583856eb19418
+EBUILD ccid-1.4.26.ebuild 1491 BLAKE2B 2cd423da96b5435911add36396df823c711505988a9203ef7e8d3be6d0e86cf9e0e59a0d37f2032e7c57b5af582603cbf4f7dac8dfdb6419add9b3ba35292833 SHA512 70c1a4cadcf082935f3591e16a4e926ac2435f4f6c26744f3b1ec4d081425e395a588636c4e7000d1131f2865d61a8f4d080004c1320fe584c3af7c8aac2d81a
+EBUILD ccid-1.4.27.ebuild 1492 BLAKE2B 23f38ec767ff61b9da25eb292439956069b64ad2d162ada3454eeb2fe4db4d2436458a85e7f1858719d268a64e0d9db4bfc4c4062a5dea853e6075876dd4c16d SHA512 37a42df7ba9eeb766ad42f3e79d1bd85b80a753f11f7a4ebb0b088a95498212ea0d6fd98d541e28da0a39698d3446c6429416cc9fabedd9bf176bb0f9ea5add3
+EBUILD ccid-1.4.29.ebuild 1497 BLAKE2B e01d89f17e0f2d4932d92aa80f23143a5bc6bfd02566dfbbdc7730f8a2fd96f39064f898d6732c0f071be65ad9bf588e52bc01e0e2f447c5fce68940ee6eb74f SHA512 946b90228ee7f78abc5a825bb89df3c1d626bbff046e7833bd89eefc6b80b17b881606984b66dbb1fdeeeadb27cc19a5535102253fd5122bfa2e4b2928ca0c3b
 MISC metadata.xml 397 BLAKE2B 0b62fc531114bb9221d17ee3524db0858f4ff373b71a1b7beda520035eaf5679a63a420381dc52e40942a519bf15f95fae97b531267df133cf68687c49dad565 SHA512 8e8643f46728232ffffe25fe9906948c6a8bb94733dbdeaf2700afd0cf4a7567a27698c1832edf858c2a433187cac9d847dc7ad709d6398133b40b639e37cb4b
diff --git a/app-crypt/ccid/ccid-1.4.26.ebuild b/app-crypt/ccid/ccid-1.4.26.ebuild
index f5d0eb72da13..965211bf2bfe 100644
--- a/app-crypt/ccid/ccid-1.4.26.ebuild
+++ b/app-crypt/ccid/ccid-1.4.26.ebuild
@@ -1,15 +1,13 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-STUPID_NUM="4205"
-
 inherit toolchain-funcs udev
 
 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"
+HOMEPAGE="https://ccid.apdu.fr/"
+SRC_URI="https://ccid.apdu.fr/files/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/app-crypt/ccid/ccid-1.4.27.ebuild b/app-crypt/ccid/ccid-1.4.27.ebuild
index 974b4b431a25..cb96feb53855 100644
--- a/app-crypt/ccid/ccid-1.4.27.ebuild
+++ b/app-crypt/ccid/ccid-1.4.27.ebuild
@@ -1,19 +1,17 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-STUPID_NUM="4218"
-
 inherit toolchain-funcs udev
 
 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"
+HOMEPAGE="https://ccid.apdu.fr/"
+SRC_URI="https://ccid.apdu.fr/files/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~sparc x86"
 IUSE="twinserial kobil-midentity +usb"
 
 RDEPEND=">=sys-apps/pcsc-lite-1.8.3
diff --git a/app-crypt/ccid/ccid-1.4.29.ebuild b/app-crypt/ccid/ccid-1.4.29.ebuild
new file mode 100644
index 000000000000..96196218e361
--- /dev/null
+++ b/app-crypt/ccid/ccid-1.4.29.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs udev
+
+DESCRIPTION="CCID free software driver"
+HOMEPAGE="https://ccid.apdu.fr/"
+SRC_URI="https://ccid.apdu.fr/files/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+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 )"
+DEPEND="${RDEPEND}
+	kernel_linux? ( virtual/pkgconfig )"
+
+DOCS=( README AUTHORS )
+
+src_configure() {
+	econf \
+		LEX=: \
+		$(use_enable twinserial) \
+		$(use_enable usb libusb)
+}
+
+src_compile() {
+	default
+	use kobil-midentity && emake -C contrib/Kobil_mIDentity_switch
+}
+
+src_install() {
+	default
+
+	if use kobil-midentity; then
+		dosbin 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 no longer use the pcscd group. Using the old ones in
+		# the mean time.
+		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
+}