4 files changed, 6 insertions, 69 deletions
diff --git a/app-crypt/ccid/Manifest b/app-crypt/ccid/Manifest
index 616609dc2efe..0d78e6828785 100644
--- a/app-crypt/ccid/Manifest
+++ b/app-crypt/ccid/Manifest
@@ -1,8 +1,6 @@
 AUX 92_pcscd_ccid-2.rules 2275 BLAKE2B a72b8d2bb8cf56f621a0762dac95500f93afa224228f403395c9590758c8fa986b3e8d0d1b12353ec7fed5a40f6af900fcd57eaaa7b339018fe42c2b509c0c5d SHA512 f327eee35ca6009069389f935ca89feea4e693e8f0c73f8f218d2639faee4ce35df85832a71e3fe98ce24aae31861aa8bd290833e59ada75c1e1a2df9ff0a477
-DIST ccid-1.4.33.tar.bz2 659673 BLAKE2B f8dd37ed4fd2bd15e6313417dc01feecd0303502d24eeae101ad13233510b5e26b08439c4de453abc734695618faa1c8031e545d045527aa841ab9056a3d729e SHA512 ccfcecbaca4c8f1ee4a4925bd313ced6d6f15ad422cbcc387627aef203a9ae0ff7775c4a2c5d25978ab33ebfd93c34de50e1f783df787b77ea7c774a45ed126b
-DIST ccid-1.4.34.tar.bz2 667477 BLAKE2B 81f8f97fdb4526fa2f0bfe0890cc447c87671989159022a51fa15ed6e85760f7fc3a9b3f673e2cbf72373a9fc67df5304c0a93a945b97f5ad483de213f5b1a45 SHA512 8a71c100e2f0adfd6de89a86dab6690629b10c91d1fddc0a810df2ebeaea978eaaa7c6a21fa964b5cd1ea277b0efe75a2885b490f9bd9ac4776b8ff1848e4122
 DIST ccid-1.4.35.tar.bz2 676789 BLAKE2B d1123c024a798a22906a5c2c2e35f5485b8d2252ddec28571af835bbf169bc5abeb26fea871ef70d67270cc1eb52f992c56f0abb74f6deed555f15e39dbf4756 SHA512 da990b5537ec35baa1b36b9c4be7f1bdccfc149cfa4ce024ddf59504f2a2044273057c1454f227fdad8f6b04fceaf48b88e70d4d0a5475384749b367529deaeb
-EBUILD ccid-1.4.33.ebuild 1540 BLAKE2B 1070f46a0e0c96ec75f364196668d7da00e0987ad41b5c60fe202539141e77a196dbb29f0de19fc4f441931932d30964840adfd84a599bc7d07baf3481be5ad8 SHA512 066b3204120871b14df9770e0c8822d1620a00ba0e3d97474ba8e7e20131f2592cab98b0b78baee9f71cab7ba02250544291c4f61d036cf1a02ca043a98e3048
-EBUILD ccid-1.4.34.ebuild 1545 BLAKE2B 836348f61b179ac74d2531f71099c6116376f46626eb1b91e41b13803a36cc2639cf284f32fe7cfbafa723fbc21c13a9d440f5e3b37fadff45e06765fe467b69 SHA512 3edb62c28a55cc39f32e4da90088d34bb1e8e33112c6fa53e6610eaf093926e681170ba7adac9d0e637ffe8cd09853ac1093001b0709dd365ebcc51e88b60e76
-EBUILD ccid-1.4.35.ebuild 1552 BLAKE2B 35bd8d03921378293fafa523e7e2f1ef04657be1df3db2422f4cf699516eba8cb17b72a8ae117e5197b7b8c94c2769b7cd26e17e3c356aa25e2a8dd2d2e2d9e8 SHA512 81c6a26157a5284b7ac94d723238b2651fcb26d22e62830b465a8f2389e3cb510b6c72f07f8dc34005f8e9fe9e1a8ba21241abaeade6858117deb70b1f1a251b
+DIST ccid-1.4.36.tar.bz2 677047 BLAKE2B b3d48f1c51b64d260b7055251fb04aeea4a22cc5d4f024bb972a9a9874b1bdf4b75b9daf8cd7c9f26000b04e7d4c1779e20a26d4927aa1e403cd274f548b71b5 SHA512 e9ca3f5364c6cec988edad325c1ef1b35886e3ecb15d6e1409c989b9f669fbda3f0688e246e3976b58eacc0ed035cde36e65675abf12562e81c3630d4ce67773
+EBUILD ccid-1.4.35.ebuild 1547 BLAKE2B f9c400087032250e51f1103a4ea19491fbc68b47f4a02ff9474a7182b7dcc7405f4e128d9f02663685e4e33bb565354e2550f27ad86a253181c2c63e31cc50ee SHA512 267e3b6d789a33ebc01d0586524c423cbf03434ff34040d39c1039be235f982546b39acad51b38d4deb779786a542d5c5f843f3464abe8d3d30712d156a35197
+EBUILD ccid-1.4.36.ebuild 1552 BLAKE2B e595eaa1744b6e57b543507a29af3529c42a21899b82e4bcc36d26fc0b6ef04fa51c8a1f5af9cd93494cf8bca133714e0e513bf5832a01f20340831ab533205d SHA512 d02bf4e6d95eaf7d07eac814dc3c6bae87a6bc4d6e3ca394ce6d51d3e3c1ae2a01e73307347fcc78783b8de2d118407cadc1a840428d3ab4f50b3a835f4c5b7f
 MISC metadata.xml 490 BLAKE2B 4a9aeacde8629b331bfef0fd1f73b4709d182f90a53e43325a26191b7e1523ded2ddc001117b93fb24ce90014f16c927c591fbf720d3ba4210661f56ca4bf130 SHA512 f10c0f7a189353eb3160ad777412c9cfd49ba287a5923cffde6d112cde6a6f8f67268d590f611870ff55a61971df7426a7d4b761a404269228fe3ef785ddaf51
diff --git a/app-crypt/ccid/ccid-1.4.34.ebuild b/app-crypt/ccid/ccid-1.4.34.ebuild
deleted file mode 100644
index 54ad487a2623..000000000000
--- a/app-crypt/ccid/ccid-1.4.34.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs udev
-
-DESCRIPTION="CCID free software driver"
-HOMEPAGE="https://ccid.apdu.fr https://github.com/LudovicRousseau/CCID"
-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}"
-BDEPEND="kernel_linux? ( virtual/pkgconfig )"
-
-DOCS=( README.md 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
-}
diff --git a/app-crypt/ccid/ccid-1.4.35.ebuild b/app-crypt/ccid/ccid-1.4.35.ebuild
index 13e71fba1d71..680c83b8ed8a 100644
--- a/app-crypt/ccid/ccid-1.4.35.ebuild
+++ b/app-crypt/ccid/ccid-1.4.35.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://ccid.apdu.fr/files/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86"
 IUSE="twinserial kobil-midentity +usb"
 
 RDEPEND=">=sys-apps/pcsc-lite-1.8.3
diff --git a/app-crypt/ccid/ccid-1.4.33.ebuild b/app-crypt/ccid/ccid-1.4.36.ebuild
index 746a54f09fad..fb17ec0a07ed 100644
--- a/app-crypt/ccid/ccid-1.4.33.ebuild
+++ b/app-crypt/ccid/ccid-1.4.36.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit toolchain-funcs udev
 
@@ -11,7 +11,7 @@ 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 ~riscv ~sparc ~x86"
 IUSE="twinserial kobil-midentity +usb"
 
 RDEPEND=">=sys-apps/pcsc-lite-1.8.3