gentoo resync : 29.06.2020

3 files changed, 2 insertions, 100 deletions

diff --git a/dev-libs/cyberjack/Manifest b/dev-libs/cyberjack/Manifest
index cd62e4bfa882..5645c9406ffd 100644
--- a/dev-libs/cyberjack/Manifest
+++ b/dev-libs/cyberjack/Manifest
@@ -1,6 +1,4 @@
 AUX cyberjack-3.99.5_p14-gcc10.patch 344 BLAKE2B c535dd6c5d034b0ad81dd6ce6364d2c8807e1adfb2391d5b801cf285260c6f55c2bdf9f56e3bf4c0fc06cc8f87128855f34f6e3519a6ebc67a7b6eba10aa8008 SHA512 7ee096fbca22ffccff1ae941c7e16578ee10ab3b7704902dee4643bdf1a3d1592ae5cd19625414245fd4c1ee6f10d8a869e273e47d71c47a3300356a0709995d
 DIST pcsc-cyberjack-3.99.5final.SP14.tar.bz2 1090014 BLAKE2B 15c9d0225f03d1fcbc636b6f8ae29f265243af35bc78c48f2e9cca27c7731ebb30069eb5bf377ce66d2c7afb31e1fb5d839001fa21e854a4bdc56237bf780327 SHA512 f39e4f13776d8c4e4bc5ea3cc64e64649d8dea334f50b9bcc9cc6f1fc9e7433ef32b8fcb00b5dad78867029dab0a099c0d7799d7e8f80d0f310b0f53dbd2a7b9
-DIST pcsc-cyberjack_3.99.5final.SP13.tar.gz 1617714 BLAKE2B 344f00217fa5dfb18e5318d2b8ccb88a3cc12b86a9c14d41a9800d701d0fc7a0a486a0b3c05188d07d1f7c51c4c514c48a55d987d8d9d2af574f427e550c8654 SHA512 74ac56a0f74a69006c87e2c22e147b65d26582d29753de03d56e4ad76413f4477a031d47f5eb074323b4ffd000b0908a1fb2b12fb7d91e9b3ee67e983e09e968
-EBUILD cyberjack-3.99.5_p13.ebuild 2053 BLAKE2B db68e22e63e6baef0a5ef2c0a1bee7a80a7230029baba274da4d4adcb48e71ad9d75c231f8e45372e047658c0f392f1f87639b29ef43e072695f91cc9f5edeba SHA512 7e6e012f1c60baf55b6565144dacef25022336f8895731363f561837330dfd60d5e54b6b4d8b2af502a4a87405ccf32eb9d323f8b92db6b75001a8b7191d38a6
-EBUILD cyberjack-3.99.5_p14.ebuild 1951 BLAKE2B f942b44b30284cbd3057c260df7aadb3de3e141c3ff5d16b8a9356e76496e6f5d5056123115245de62e442957ba1cabb2b5ef63ef4dc1aea8aad834f971c2fa6 SHA512 5643599f37a04cf0c9d501c17ea023a1df22157a91c1c3cf17067e89b2ff5a469973c1a6d10b011a85aa944bf541c32e4e12e41251c5feddc4c3c28ea143f73e
+EBUILD cyberjack-3.99.5_p14.ebuild 1950 BLAKE2B 92c1ac90af31182ede791bca864e48a1d703ca105b06b804ee8201662efe4a9ab7b3d76d3671b1dfd8b6246ac935295fb80bba5f33da065e61274b3e9a6ef93a SHA512 4a50cd74805265cda12a2a8737f57c403f1fdd204daa405e36d7173b6b0d6eff70ac087904c28737867886148ec85c5a23c7d77292ad7e1190ed92cc41a27258
 MISC metadata.xml 622 BLAKE2B 4238fe4ea370787f4542d53d161afaa0c0df5788d7a2da5ee6b99b788ae6d4456cd43d6ea8df0a174431b4582127fb49712a59ed2acdbeaf4808f57b8fa44930 SHA512 2062ac48ee73a6a58a2663e39f467e8e55f06af48b7a04b5f174e467c3f33d4b92b93b8fff3747447503b3256fc514fc40c8e07f7cbec8e1608d6389d9aed4ba
diff --git a/dev-libs/cyberjack/cyberjack-3.99.5_p13.ebuild b/dev-libs/cyberjack/cyberjack-3.99.5_p13.ebuild
deleted file mode 100644
index 97f2ad1beba3..000000000000
--- a/dev-libs/cyberjack/cyberjack-3.99.5_p13.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2020 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 flag-o-matic linux-info 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"
-
-KEYWORDS="amd64 x86"
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-IUSE="static-libs threads tools +udev +usb xml"
-
-RDEPEND="
-	sys-apps/pcsc-lite
-	usb? ( virtual/libusb:1 )
-	udev? ( virtual/udev )
-	xml? ( dev-libs/libxml2:2= )
-"
-
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P/_/-}"
-
-CONFIG_CHECK="~USB_SERIAL_CYBERJACK"
-
-pkg_setup() {
-	# Add workaround for GCC-10,
-	# by defining narrowing as warning like GCC-9 did.
-	append-cxxflags -Wno-narrowing
-}
-
-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-pcsc
-		--enable-release
-		--enable-warnings
-		--sysconfdir="/etc/cyberjack"
-		$(use_enable static-libs static)
-		$(use_enable threads)
-		$(use_enable udev)
-		$(use_enable usb nonserial)
-		$(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 debian/libifd-cyberjack6.udev 99-${PN}.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_p14.ebuild b/dev-libs/cyberjack/cyberjack-3.99.5_p14.ebuild
index bc4e83876eeb..eb2bb547afb8 100644
--- a/dev-libs/cyberjack/cyberjack-3.99.5_p14.ebuild
+++ b/dev-libs/cyberjack/cyberjack-3.99.5_p14.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="REINER SCT cyberJack USB chipcard reader user space driver"
 HOMEPAGE="https://www.reiner-sct.de/"
 SRC_URI="http://kernelport.com/reiner-sct/SP$(ver_cut 5)/${MY_P}.tar.bz2"
 
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
 IUSE="static-libs threads tools +udev +usb xml"