gentoo resync : 18.11.2018

7 files changed, 109 insertions, 196 deletions

diff --git a/dev-libs/cyberjack/Manifest b/dev-libs/cyberjack/Manifest
index d17dc9a6bc47..21a6fafaf74a 100644
--- a/dev-libs/cyberjack/Manifest
+++ b/dev-libs/cyberjack/Manifest
@@ -1,12 +1,8 @@
-AUX cyberjack-3.99.5_p03-gcc47.patch 705 BLAKE2B 876525f892410efdcd6dc3bf4d1a805f19c4934e22ab21723917289155c81599974033834b917963e7a4ea3dfe0a15455a04622ffa1cc96f6762cb217c5fffb7 SHA512 d05d4af0178003f722c49e06a1fc5027261f36c71f4ca3c9cadef627b6dd5719fed3d65358a6917711b1a5772498b8420e5645e8a51ff5c2f0616c1de361d088
 AUX cyberjack-manpages.patch 812 BLAKE2B 07b3026d6f50aa89e7feff70bad0469e6feaed54f2316c13fd8a2a76a4ae1ce0d6efe6acc5746b230cdac062affc0ca376ad595548c6d7ae43417411edb75a1e SHA512 f92c59197e9b32f304ee18405c9d718715a3088a4d95a39e695e5733490ec941340086479f2e15caac5ce5158f6814f757abfd91f06ce904e95a9a90f6761b04
 AUX cyberjack-r1.rules 895 BLAKE2B b4a372c05db5efa74e4b433709e99a089d839a84b509c76612de220e80eb0940428bc5d461bc3a5dcc4095f08cfd66ffee2c3cc058c2aed6c0574e78c75513f9 SHA512 baeae4d96ffe6d965d123f54969595bc52f57b6f5c0418adad76b3f69ee2365c9840956ca37eb8ac8478f5a90971b4101bef95aba40711b1a4feb4be49f99a8c
 AUX cyberjack-returnvalue.patch 930 BLAKE2B 2d94676c129896f88bdcc1422ab9ac46926ceec2a36d44cf1dd61ad75aa73dc00b6d099ee432444c8b9c623d30ee34298cdf5700db8187114b35a9edbc1e579d SHA512 437e4515bf3a2809ad69ad89c00b7b4c09f54bcc983a45449127135d5202ef166f6d1962f898329860d76ef487f02b2d1a366de9759e63e89c2fc8f6e8759d2b
-AUX cyberjack.rules 321 BLAKE2B 56c5dc15041fc07a87a97fe7c34626b9bd36a4abe15710be30ee5e8dcc44d00be53134e08ba4a036a3bd6589cd06dc78c87962917d4c967d09d995b72c1f49f0 SHA512 ca7ece7d34b21055e7a38efa04914dd07dab423041142eef309352924207c4ae25bfde3b1cc171eb6aec32539589006900669e38d5d699f1f942cd344c7a0cda
-DIST pcsc-cyberjack-3.99.5final.SP10.tar.bz2 958494 BLAKE2B 8e7f812ce5aeb6b3afe1ce1a0a691fa0639618eb62db22bd2d34b030518c4ec148216b07770a03e0e1dd01158c92694879c38648d08f1973f6bf8aa0859af889 SHA512 d4094b531ab523db29856ea0cf784db925bece51a5c4b5c7fec259ff319d58a50443cabdfebc0a1f6818b678a1284500429274478bf1db780ff594612e307d56
 DIST pcsc-cyberjack-3.99.5final.SP11.tar.bz2 965662 BLAKE2B 568eb77c9b35557fb9f4c4f038cf6d7cd3700938fe905c8c3587ee6bd4254595d6665f199913bde3c4f03050d8e8c6006dee9222941ad1dfd0190fa33283f15c SHA512 4d63ef0442c7e919456e8b6ab1d571ab621eb45fc34fc9b61a7a024f1ae2115f7474b4aa538ee7fb8bf4ce016067c876d9970b52e6b4e8b531e2d736677ab794
-DIST pcsc-cyberjack_3.99.5final.SP03.tar.gz 1485952 BLAKE2B 5dc9d5330b4b25c23e4704a0c2ed648e9ef0fb929c7f221373fd7128b77fea223480119a5dc28aa81bbe19fb5355bfd421bc93f214ebed89ee44836c7d8f0b40 SHA512 a091a09b501d7a7c757f0a458007f44ac281cbeaaf5bc3c2aa89915ee7a39478e6f80b6f24fec77be753c8d77deeda2858b7a806e3c982f54c199bd797288e05
-EBUILD cyberjack-3.99.5_p03-r1.ebuild 1564 BLAKE2B 44aacda78c6d6b7bafde573263c657d2328fee5441eea6e99c4589d6e10e6066f5ade3727e85fa2ad9165270b7783a61b0a6a3d783a6b31fcfdfd9a8d9ca7451 SHA512 e0ead9d16cb78ae488b72554523c2ad82ede4b06e7fba215fbed9ed2723174fd56f904826d860f7c5e611e1a293c940f51a539d3db222377fa30207c6df881d6
-EBUILD cyberjack-3.99.5_p10.ebuild 1802 BLAKE2B 08f02559fc2d93119bc4cb04a94244b90b32d2196cc0a4af052614f26ece9f5df89374537d6afef7e01ad4078bea840066ffa1966a1a2c46207d1beffdda20be SHA512 4022da1cdf0a2772c64138d0760d40272a1fa53f1650fc40c4e9eef42cf3ef4c4bcdb8675f4499240f06a210681f34121c3921423a5b93e5b280c69785ceeb80
+DIST pcsc-cyberjack-3.99.5final.SP12.tar.bz2 957583 BLAKE2B 02499e2e366a2caaf4881ff3db99600990ef18ef2b4dc202c5d66a2e708f5107b4c76b56021349c8e4169be2e1d12de0317680ea9502a65a89c96969b8341e13 SHA512 53993471c96caa5a802c0aff32595698dfd550f89906f2141f4d89db75da0870da60f62565604485643dfd1af35a06dde7f895b4a9fa6b39634ee8d5692b50fd
 EBUILD cyberjack-3.99.5_p11.ebuild 1800 BLAKE2B f19269d69cfcb7e080213d5b06e11b9f39c839b76f0bb5dc35aa4f2411fc7af4a9f5d7e38b4a93c4aee8519cf4a4177424fa54724f7d777315ce4205f5ea7e29 SHA512 801ed1eb4d1e075ea51ff068bb9ba817eeb9bb5e0dbae0b41121b562439d9ba9b096cde776c8bffcf441a26a6e246e97b48d9499c280586870cd60b1d7139bfe
-MISC metadata.xml 282 BLAKE2B b5bcb715b56152d697265edd126e2beed5fd199f4c7935ed86952ed171ccf13e57ffbe45ef133de75cc25e529814b42ca06d2c2dcfd0cb02e8b9f3c590b75183 SHA512 a054fd64db7cd889a3fc6f1606814fc50f3ddb9e1a96ae3ec7e707c9739d263d456a8a8c431f8a04a75da40a7848779b7552935687b6713a86996a6b1efacec3
+EBUILD cyberjack-3.99.5_p12.ebuild 1911 BLAKE2B 0c1088a95e833594dd288ed9f4304cf0114a906006decfa6f672d9236cdc0b809c2d7a63f6f08a384e968fb2a46d955b4834e7a6e6800ce25f6fbfe5e5786d25 SHA512 26685c406eeba3219780172c5ed699942ac99bdd17b9e018e36785b253f26aa67e3d37320e3293dbeea5da88ab5ea8ff7060460ab5b2b319adf2f932cf26c77e
+MISC metadata.xml 741 BLAKE2B 1660cf6afa7c5988573bb7a651560b0ce38832ad7149784aabd2589407c3d6fff7a9a76a0ee3bef81c1e3efaa46c8733e7e8de724d07bff7766280ebb8dcc4be SHA512 442fce5186e7a04e0d96b2d179db3438a4d7b8f0b5b11443d494d8b0203881c63dd4e4238eae594ad5c15b7eab683c7d35d50d24e147ce896128784ffe7442bf
diff --git a/dev-libs/cyberjack/cyberjack-3.99.5_p03-r1.ebuild b/dev-libs/cyberjack/cyberjack-3.99.5_p03-r1.ebuild
deleted file mode 100644
index d4afe12cb1a6..000000000000
--- a/dev-libs/cyberjack/cyberjack-3.99.5_p03-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils linux-info toolchain-funcs udev
-
-MY_P=pcsc-${PN}_${PV/_p/final.SP}
-
-DESCRIPTION="REINER SCT cyberJack pinpad/e-com USB user space driver library"
-HOMEPAGE="http://www.reiner-sct.de/ http://www.libchipcard.de/"
-SRC_URI="http://support.reiner-sct.de/downloads/LINUX/V${PV/_p/_SP}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="fox udev xml"
-
-COMMON_DEPEND="sys-apps/pcsc-lite
-	virtual/libusb:1
-	fox? ( >=x11-libs/fox-1.6 )
-	xml? ( dev-libs/libxml2 )"
-RDEPEND="${COMMON_DEPEND}
-	udev? ( virtual/udev )"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P/_/-}
-
-DOCS="ChangeLog NEWS doc/*.txt"
-
-pkg_setup() {
-	CONFIG_CHECK="~USB_SERIAL_CYBERJACK"
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gcc47.patch
-}
-
-src_configure() {
-	econf \
-		--mandir=/usr/share/man/man8 \
-		--sysconfdir=/etc/${PN} \
-		--disable-hal \
-		--enable-pcsc \
-		$(use_enable xml xml2) \
-		$(use_enable fox) \
-		--with-usbdropdir="$($(tc-getPKG_CONFIG) libpcsclite --variable=usbdropdir)"
-}
-
-src_install() {
-	default
-
-	rm -f "${ED}"/usr/lib*/${PN}/pcscd_init.diff
-	prune_libtool_files --all
-
-	use udev && udev_newrules "${FILESDIR}"/${PN}.rules 92-${PN}.rules #388329
-}
-
-pkg_postinst() {
-	local conf="${EROOT}etc/${PN}/${PN}.conf"
-	elog
-	elog "To configure logging, key beep behaviour etc. you need to"
-	elog "copy ${conf}.default"
-	elog "to ${conf}"
-	elog "and modify the latter as needed."
-	elog
-}
diff --git a/dev-libs/cyberjack/cyberjack-3.99.5_p10.ebuild b/dev-libs/cyberjack/cyberjack-3.99.5_p10.ebuild
deleted file mode 100644
index 23447ead9e43..000000000000
--- a/dev-libs/cyberjack/cyberjack-3.99.5_p10.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools versionator eutils linux-info toolchain-funcs udev
-
-MY_PV="${PV/_p/_SP}"
-MY_PV2="${PV/_p/final.SP}"
-MY_P="pcsc-${PN}-${MY_PV2}"
-#MY_P2="${PN}-$(get_version_component_range 4 $MY_PV)"
-
-DESCRIPTION="REINER SCT cyberJack pinpad/e-com USB user space driver library"
-HOMEPAGE="http://www.reiner-sct.de/"
-SRC_URI="http://support.reiner-sct.de/downloads/LINUX/V${MY_PV}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="static-libs threads +udev +usb"
-
-# FIXME:
-# xml is actually optional but the code is still used anyway. We'll have to wait
-# until upstream fixed it.
-COMMON_DEPEND="sys-apps/pcsc-lite
-	usb? ( virtual/libusb:1 )"
-RDEPEND="${COMMON_DEPEND}
-	udev? ( virtual/udev )"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig"
-
-#S=${WORKDIR}/${MY_P2}
-S=${WORKDIR}/${MY_P}
-
-DOCS="debian/changelog doc/README.txt"
-
-pkg_setup() {
-	CONFIG_CHECK="~USB_SERIAL_CYBERJACK"
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-manpages.patch"
-	epatch "${FILESDIR}/${PN}-returnvalue.patch"
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--sysconfdir=/etc/${PN} \
-		--disable-hal \
-		--enable-pcsc \
-		$(use_enable static-libs static) \
-		$(use_enable usb nonserial) \
-		$(use_enable threads) \
-		--with-usbdropdir="$($(tc-getPKG_CONFIG) libpcsclite --variable=usbdropdir)"
-}
-
-src_install() {
-	default
-
-	prune_libtool_files --all
-
-	use udev && udev_newrules "${FILESDIR}"/${PN}-r1.rules 92-${PN}.rules #388329
-}
-
-pkg_postinst() {
-	local conf="${EROOT}etc/${PN}/${PN}.conf"
-	elog
-	elog "To configure logging, key beep behaviour etc. you need to"
-	elog "copy ${conf}.default"
-	elog "to ${conf}"
-	elog "and modify the latter as needed."
-	elog
-}
diff --git a/dev-libs/cyberjack/cyberjack-3.99.5_p12.ebuild b/dev-libs/cyberjack/cyberjack-3.99.5_p12.ebuild
new file mode 100644
index 000000000000..be9c7598650b
--- /dev/null
+++ b/dev-libs/cyberjack/cyberjack-3.99.5_p12.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2018 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 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.bz2"
+
+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"
+
+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/files/cyberjack-3.99.5_p03-gcc47.patch b/dev-libs/cyberjack/files/cyberjack-3.99.5_p03-gcc47.patch
deleted file mode 100644
index 035d414a09d9..000000000000
--- a/dev-libs/cyberjack/files/cyberjack-3.99.5_p03-gcc47.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-http://bugs.gentoo.org/423757
-
---- libcyberjack/checksuite/cm_distri.cpp
-+++ libcyberjack/checksuite/cm_distri.cpp
-@@ -15,6 +15,7 @@
- #include "cm_distri.h"
- #include "checksuite.h"
- 
-+#include <unistd.h> /* unlink */
- #include <stdlib.h>
- #include <stdio.h>
- #include <errno.h>
---- tools/fox-dialog/main.cpp
-+++ tools/fox-dialog/main.cpp
-@@ -9,6 +9,8 @@
- 
- #include <fx.h>
- 
-+#include <unistd.h> /* unlink */
-+
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <pwd.h>
---- tools/mac-ui-helper/main.m
-+++ tools/mac-ui-helper/main.m
-@@ -31,6 +31,8 @@
- #import "PinDialog.h"
- #import "Delegate.h"
- 
-+#include <unistd.h> /* unlink */
-+
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <pwd.h>
diff --git a/dev-libs/cyberjack/files/cyberjack.rules b/dev-libs/cyberjack/files/cyberjack.rules
deleted file mode 100644
index ac94b1b663f5..000000000000
--- a/dev-libs/cyberjack/files/cyberjack.rules
+++ /dev/null
@@ -1,10 +0,0 @@
-# If not adding the device, go away
-ACTION!="add", GOTO="cyberjack_rules_end"
-SUBSYSTEM!="usb", GOTO="cyberjack_rules_end"
-ENV{DEVTYPE}!="usb_device", GOTO="cyberjack_rules_end"
-
-# Tested on cyberJack RFID standard
-ATTRS{idVendor}=="0c4b", ATTRS{idProduct}=="0500", ENV{PCSCD}="1"
-
-# All done
-LABEL="cyberjack_rules_end"
diff --git a/dev-libs/cyberjack/metadata.xml b/dev-libs/cyberjack/metadata.xml
index 44e2e3c13fe3..52a3a62602d7 100644
--- a/dev-libs/cyberjack/metadata.xml
+++ b/dev-libs/cyberjack/metadata.xml
@@ -1,9 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>ck+gentoo@bl4ckb0x.de</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription>
+		REINER SCT cyberJack USB chipcard reader user space driver.
+		This package includes the IFD driver for the cyberJack
+		contactless (RFID) and contact USB chipcard reader.
+	</longdescription>
 	<use>
-		<flag name="fox">Enable installation of <pkg>x11-libs/fox</pkg> based fxcyberjack program</flag>
+		<flag name="tools">Build and install optional management tools.</flag>
+		<flag name="usb">Enable support for usb based chipcard reader.</flag>
 	</use>
 </pkgmetadata>
-