Gentoo Archives: gentoo-commits

From: Conrad Kostecki <conikost@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/cyberjack/
Date: Sat, 26 Jun 2021 20:03:10
Message-Id: 1624737776.89c9533411d114066b686a1e07d354da0ce24da7.conikost@gentoo
1 commit: 89c9533411d114066b686a1e07d354da0ce24da7
2 Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jun 26 20:02:42 2021 +0000
4 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
5 CommitDate: Sat Jun 26 20:02:56 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89c95334
7
8 dev-libs/cyberjack: drop usb use flag
9
10 This package does not compile anymore without usb features.
11 According to upstream, disabling usb it not supported any more,
12 despite an option for disabling being offered.
13
14 Closes: https://bugs.gentoo.org/798321
15 Package-Manager: Portage-3.0.20, Repoman-3.0.3
16 Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
17
18 dev-libs/cyberjack/cyberjack-3.99.5_p14-r2.ebuild | 13 +++++++------
19 dev-libs/cyberjack/metadata.xml | 1 -
20 2 files changed, 7 insertions(+), 7 deletions(-)
21
22 diff --git a/dev-libs/cyberjack/cyberjack-3.99.5_p14-r2.ebuild b/dev-libs/cyberjack/cyberjack-3.99.5_p14-r2.ebuild
23 index bb855c3443d..f9851a89a0d 100644
24 --- a/dev-libs/cyberjack/cyberjack-3.99.5_p14-r2.ebuild
25 +++ b/dev-libs/cyberjack/cyberjack-3.99.5_p14-r2.ebuild
26 @@ -7,20 +7,21 @@ MY_PN="pcsc-${PN}"
27 MY_PV="${PV/_p/final.SP}"
28 MY_P="${MY_PN}_${MY_PV}"
29
30 -inherit autotools toolchain-funcs udev
31 +inherit autotools flag-o-matic toolchain-funcs udev
32
33 DESCRIPTION="REINER SCT cyberJack USB chipcard reader user space driver"
34 HOMEPAGE="https://www.reiner-sct.de/"
35 SRC_URI="https://support.reiner-sct.de/downloads/LINUX/V${PV/_p/_SP}/${MY_P}.tar.gz -> ${MY_P}.tar.bz2"
36 +S="${WORKDIR}/${MY_P/_/-}"
37
38 KEYWORDS="amd64 x86"
39 LICENSE="GPL-2+ LGPL-2.1+"
40 SLOT="0"
41 -IUSE="static-libs threads tools +udev +usb xml"
42 +IUSE="static-libs threads tools +udev xml"
43
44 RDEPEND="
45 sys-apps/pcsc-lite
46 - usb? ( virtual/libusb:1 )
47 + virtual/libusb:1=
48 udev? ( virtual/udev )
49 xml? ( dev-libs/libxml2:2= )
50 "
51 @@ -28,8 +29,6 @@ RDEPEND="
52 DEPEND="${RDEPEND}"
53 BDEPEND="virtual/pkgconfig"
54
55 -S="${WORKDIR}/${MY_P/_/-}"
56 -
57 PATCHES="${FILESDIR}/${P}-gcc10.patch"
58
59 src_prepare() {
60 @@ -39,6 +38,8 @@ src_prepare() {
61 }
62
63 src_configure() {
64 + append-cxxflags -fno-permissive
65 +
66 local myeconfargs=(
67 --disable-debug
68 --disable-error-on-warning
69 @@ -47,6 +48,7 @@ src_configure() {
70 --disable-mac-arches-i386
71 --disable-mac-arches-x86_64
72 --disable-visibility
73 + --enable-nonserial
74 --enable-pcsc
75 --enable-release
76 --enable-warnings
77 @@ -54,7 +56,6 @@ src_configure() {
78 $(use_enable static-libs static)
79 $(use_enable threads)
80 $(use_enable udev)
81 - $(use_enable usb nonserial)
82 $(use_enable xml xml2)
83 --with-usbdropdir="$($(tc-getPKG_CONFIG) libpcsclite --variable=usbdropdir)"
84 )
85
86 diff --git a/dev-libs/cyberjack/metadata.xml b/dev-libs/cyberjack/metadata.xml
87 index e57eaa0f05c..3deab072070 100644
88 --- a/dev-libs/cyberjack/metadata.xml
89 +++ b/dev-libs/cyberjack/metadata.xml
90 @@ -12,6 +12,5 @@
91 </longdescription>
92 <use>
93 <flag name="tools">Build and install optional management tools.</flag>
94 - <flag name="usb">Enable support for usb based chipcard reader.</flag>
95 </use>
96 </pkgmetadata>