From 89c9533411d114066b686a1e07d354da0ce24da7 Mon Sep 17 00:00:00 2001
From: Conrad Kostecki <conikost@gentoo.org>
Date: Sat, 26 Jun 2021 22:02:42 +0200
Subject: dev-libs/cyberjack: drop usb use flag

This package does not compile anymore without usb features.
According to upstream, disabling usb it not supported any more,
despite an option for disabling being offered.

Closes: https://bugs.gentoo.org/798321
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Conrad Kostecki <conikost@gentoo.org>
---
 dev-libs/cyberjack/cyberjack-3.99.5_p14-r2.ebuild | 13 +++++++------
 dev-libs/cyberjack/metadata.xml                   |  1 -
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'dev-libs/cyberjack')

diff --git a/dev-libs/cyberjack/cyberjack-3.99.5_p14-r2.ebuild b/dev-libs/cyberjack/cyberjack-3.99.5_p14-r2.ebuild
index bb855c3443d2..f9851a89a0da 100644
--- a/dev-libs/cyberjack/cyberjack-3.99.5_p14-r2.ebuild
+++ b/dev-libs/cyberjack/cyberjack-3.99.5_p14-r2.ebuild
@@ -7,20 +7,21 @@ MY_PN="pcsc-${PN}"
 MY_PV="${PV/_p/final.SP}"
 MY_P="${MY_PN}_${MY_PV}"
 
-inherit autotools toolchain-funcs udev
+inherit autotools flag-o-matic 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 +usb xml"
+IUSE="static-libs threads tools +udev xml"
 
 RDEPEND="
 	sys-apps/pcsc-lite
-	usb? ( virtual/libusb:1 )
+	virtual/libusb:1=
 	udev? ( virtual/udev )
 	xml? ( dev-libs/libxml2:2= )
 "
@@ -28,8 +29,6 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
-S="${WORKDIR}/${MY_P/_/-}"
-
 PATCHES="${FILESDIR}/${P}-gcc10.patch"
 
 src_prepare() {
@@ -39,6 +38,8 @@ src_prepare() {
 }
 
 src_configure() {
+	append-cxxflags -fno-permissive
+
 	local myeconfargs=(
 		--disable-debug
 		--disable-error-on-warning
@@ -47,6 +48,7 @@ src_configure() {
 		--disable-mac-arches-i386
 		--disable-mac-arches-x86_64
 		--disable-visibility
+		--enable-nonserial
 		--enable-pcsc
 		--enable-release
 		--enable-warnings
@@ -54,7 +56,6 @@ src_configure() {
 		$(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)"
 	)
diff --git a/dev-libs/cyberjack/metadata.xml b/dev-libs/cyberjack/metadata.xml
index e57eaa0f05c4..3deab0720707 100644
--- a/dev-libs/cyberjack/metadata.xml
+++ b/dev-libs/cyberjack/metadata.xml
@@ -12,6 +12,5 @@
 	</longdescription>
 	<use>
 		<flag name="tools">Build and install optional management tools.</flag>
-		<flag name="usb">Enable support for usb based chipcard reader.</flag>
 	</use>
 </pkgmetadata>
-- 
cgit v1.2.3-65-gdbad