gentoo resync : 20.03.2022

3 files changed, 2 insertions, 93 deletions

diff --git a/dev-libs/cyberjack/Manifest b/dev-libs/cyberjack/Manifest
index 9a42cbb6cb1b..3a53a3aba347 100644
--- a/dev-libs/cyberjack/Manifest
+++ b/dev-libs/cyberjack/Manifest
@@ -1,7 +1,5 @@
 AUX cyberjack-3.99.5_p14-gcc10.patch 344 BLAKE2B c535dd6c5d034b0ad81dd6ce6364d2c8807e1adfb2391d5b801cf285260c6f55c2bdf9f56e3bf4c0fc06cc8f87128855f34f6e3519a6ebc67a7b6eba10aa8008 SHA512 7ee096fbca22ffccff1ae941c7e16578ee10ab3b7704902dee4643bdf1a3d1592ae5cd19625414245fd4c1ee6f10d8a869e273e47d71c47a3300356a0709995d
 AUX libifd-cyberjack6.udev-r1 1435 BLAKE2B 3606ea979cf8bc068eb7ab447af70f5f9c409369554868ba36a43eaa7202813587b2193b0ef16b42a68bb665f4eaee5ac976774ec0f77dbaa93b447a6e6021bd SHA512 bfefad4cd2b509a41d3e8f638364a3f604e80dd5302456ca9d27d592175e30a2c348353d35fda242f2f80651efcd111c7294ecde7a8d80f1c7e1a655240483d2
-DIST pcsc-cyberjack_3.99.5final.SP14.tar.bz2 1682821 BLAKE2B 389b0da28beec42e3e2f1766b76dd77efec24bf7aea906ff14ad206c182162125431ac6c81e9242813c088b4936958b8056f5e7c71424c95de6e8e1ac2357aed SHA512 c83e142d6c071f7f20f9f15b9b76ed819873760bda4b49ec042506b2d7ef9ad8674c953abe67f08a1c4b178ce44767ba6479ea1148d8eeb38797e4775b2a9e82
 DIST pcsc-cyberjack_3.99.5final.SP15.tar.bz2 1681827 BLAKE2B e6b8325e4822f24e31b7986d5a7bc0ee2c99bd29568c19ac1fe8d308f561b0bcecfcc3e0ac2633b13986b2422bb014d28c7953e622021476ac3188de4dd0ed15 SHA512 d1a5454aea96866581f48a240b96013bd0c313965a8ef7a384ac41a929f3e805ad13590c383dab7638134c730e6f26e6cd1492d533f4910aad7c515016452258
-EBUILD cyberjack-3.99.5_p14-r2.ebuild 1910 BLAKE2B ce129e192cd8396a8a4d20c39b2f58bb8f3b38cfe16c10692490c3a8222f5b71cca1a200a7dda81f98ed0e601de6bb99e6864e9c97e19e98ca9a8954a00c2c0c SHA512 30fe40220ff67cd04e1b3b4701e83a1f3d8ffd8d20976c91e711be7777deb13cb2108021b81a7691eef24ac068047846e234c71d477fa410b67f1d40fb7b7470
-EBUILD cyberjack-3.99.5_p15.ebuild 1907 BLAKE2B cf186511e2152db3b2b21bc346b50dcfe6211fdab1f6fee99ff8528b6dae43d129c6be1d0ee6d02e35bdc67ffca310134db00e40530a9d7456e2238c6327c6a2 SHA512 8e9f89f995c6070da3020dc6a84fa8d392ca853643093a0a47bb4a808a021a1143fbc04e3fe2f367f00771b57f3d9c471ef4ae85e8325b7ef1b7ee8178361c26
+EBUILD cyberjack-3.99.5_p15.ebuild 1905 BLAKE2B 0fd1d9a12e7068c8de4d2fbd2f9a3457bae595f6351c0d1f56eccf3e135d38c9663034588ab8c34f7e55f9cb20e624d9f7a5826e38ae931fdb52c9e14bdadf8d SHA512 ca09c5320edd03cd6282f80f11f832b4f4bdc3acd132308caf69f80da804323a7232d3d07cf3a289f6ac9adf32749fe572ae8b32811bef4e6091807ad21c1512
 MISC metadata.xml 551 BLAKE2B b6c0ee4b76f7f7e58c0cf3a09d581143fe24dc863beda59337e51605463e58c93801848f115ab710937f3e17fec8c62fcdd98da27fa7b108466ca75491b28ac2 SHA512 d43d9224b8508447ca3410792bed8e88b791c1029d2412e4be251ea41be564fce12ecf0ae1172c47c6be10371278ad35f22eafc17490a5a96f4e6c081adbcd05
diff --git a/dev-libs/cyberjack/cyberjack-3.99.5_p14-r2.ebuild b/dev-libs/cyberjack/cyberjack-3.99.5_p14-r2.ebuild
deleted file mode 100644
index 6324d86c3a9e..000000000000
--- a/dev-libs/cyberjack/cyberjack-3.99.5_p14-r2.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="pcsc-${PN}"
-MY_PV="${PV/_p/final.SP}"
-MY_P="${MY_PN}_${MY_PV}"
-
-inherit autotools toolchain-funcs udev
-
-DESCRIPTION="REINER SCT cyberJack USB chipcard reader user space driver"
-HOMEPAGE="https://www.reiner-sct.de/"
-SRC_URI="https://support.reiner-sct.de/downloads/LINUX/V${PV/_p/_SP}/${MY_P}.tar.gz -> ${MY_P}.tar.bz2"
-S="${WORKDIR}/${MY_P/_/-}"
-
-KEYWORDS="amd64 x86"
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-IUSE="static-libs threads tools +udev xml"
-
-RDEPEND="
-	sys-apps/pcsc-lite
-	virtual/libusb:1=
-	udev? ( virtual/udev )
-	xml? ( dev-libs/libxml2:2= )
-"
-
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES="${FILESDIR}/${P}-gcc10.patch"
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-debug
-		--disable-error-on-warning
-		--disable-hal
-		--disable-mac-universal
-		--disable-mac-arches-i386
-		--disable-mac-arches-x86_64
-		--disable-visibility
-		--enable-nonserial
-		--enable-pcsc
-		--enable-release
-		--enable-warnings
-		--sysconfdir="/etc/cyberjack"
-		$(use_enable static-libs static)
-		$(use_enable threads)
-		$(use_enable udev)
-		$(use_enable xml xml2)
-		--with-usbdropdir="$($(tc-getPKG_CONFIG) libpcsclite --variable=usbdropdir)"
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	default
-
-	if use tools; then
-		# cjBingo can't be compiled, as it's defines stuff, which got dropped
-		cd "${S}"/tools/cjflash && emake
-		cd "${S}"/tools/cjgeldkarte && emake
-	fi
-}
-
-src_install() {
-	default
-
-	use tools && dobin tools/cjflash/cjflash tools/cjgeldkarte/cjgeldkarte
-	use udev && udev_newrules "${FILESDIR}"/libifd-cyberjack6.udev-r1 99-cyberjack.rules
-
-	dodoc debian/changelog doc/{LIESMICH,README}.{pdf,txt,xml}
-
-	docinto html
-	dodoc doc/{LIESMICH,README}.html
-
-	docinto source
-	dodoc doc/*.c*
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/cyberjack/cyberjack-3.99.5_p15.ebuild b/dev-libs/cyberjack/cyberjack-3.99.5_p15.ebuild
index 44af14f1ad60..a5075094fe49 100644
--- a/dev-libs/cyberjack/cyberjack-3.99.5_p15.ebuild
+++ b/dev-libs/cyberjack/cyberjack-3.99.5_p15.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://www.reiner-sct.de/"
 SRC_URI="https://support.reiner-sct.de/downloads/LINUX/V${PV/_p/_SP}/${MY_P}.tar.bz2"
 S="${WORKDIR}/${MY_P/_/-}"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
 IUSE="static-libs threads tools +udev xml"