1 |
commit: aeef62f2fe59cd05c3e55b4bd5d46cf313ffdf82 |
2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Oct 12 08:50:28 2021 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Oct 12 08:50:28 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aeef62f2 |
7 |
|
8 |
dev-libs/libnfc: Fix pcsc-lite support |
9 |
|
10 |
* EAPI 8 |
11 |
* missing pkg-config dep |
12 |
* simpler USE=doc handling |
13 |
* remove USE=static-libs |
14 |
|
15 |
Closes: https://bugs.gentoo.org/816891 |
16 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
17 |
|
18 |
...{libnfc-1.8.0.ebuild => libnfc-1.8.0-r1.ebuild} | 33 +++++++++++++--------- |
19 |
1 file changed, 20 insertions(+), 13 deletions(-) |
20 |
|
21 |
diff --git a/dev-libs/libnfc/libnfc-1.8.0.ebuild b/dev-libs/libnfc/libnfc-1.8.0-r1.ebuild |
22 |
similarity index 55% |
23 |
rename from dev-libs/libnfc/libnfc-1.8.0.ebuild |
24 |
rename to dev-libs/libnfc/libnfc-1.8.0-r1.ebuild |
25 |
index ae5228fdac7..fba699e4b06 100644 |
26 |
--- a/dev-libs/libnfc/libnfc-1.8.0.ebuild |
27 |
+++ b/dev-libs/libnfc/libnfc-1.8.0-r1.ebuild |
28 |
@@ -1,7 +1,7 @@ |
29 |
# Copyright 1999-2021 Gentoo Authors |
30 |
# Distributed under the terms of the GNU General Public License v2 |
31 |
|
32 |
-EAPI=7 |
33 |
+EAPI=8 |
34 |
|
35 |
DESCRIPTION="Near Field Communications (NFC) library" |
36 |
HOMEPAGE="http://www.libnfc.org/" |
37 |
@@ -10,33 +10,40 @@ SRC_URI="https://github.com/nfc-tools/${PN}/releases/download/${P}/${P}.tar.bz2" |
38 |
LICENSE="LGPL-3" |
39 |
SLOT="0" |
40 |
KEYWORDS="~amd64 ~arm ~x86" |
41 |
-IUSE="doc pcsc-lite readline static-libs usb" |
42 |
+IUSE="doc pcsc-lite readline usb" |
43 |
|
44 |
-RDEPEND="pcsc-lite? ( sys-apps/pcsc-lite ) |
45 |
- readline? ( sys-libs/readline:0 ) |
46 |
+RDEPEND=" |
47 |
+ pcsc-lite? ( sys-apps/pcsc-lite ) |
48 |
+ readline? ( sys-libs/readline:= ) |
49 |
usb? ( virtual/libusb:0 )" |
50 |
DEPEND="${RDEPEND}" |
51 |
-BDEPEND="doc? ( app-doc/doxygen )" |
52 |
+BDEPEND=" |
53 |
+ virtual/pkgconfig |
54 |
+ doc? ( app-doc/doxygen )" |
55 |
|
56 |
src_configure() { |
57 |
local drivers="arygon,pn532_uart,pn532_spi,pn532_i2c,acr122s" |
58 |
- use pcsc-lite && drivers+=",acr122_pcsc" |
59 |
- use usb && drivers+=",pn53x_usb,acr122_usb" |
60 |
+ drivers+=$(usev pcsc-lite ",acr122_pcsc,pcsc") |
61 |
+ drivers+=$(usev usb ",pn53x_usb,acr122_usb") |
62 |
econf \ |
63 |
--with-drivers="${drivers}" \ |
64 |
$(use_enable doc) \ |
65 |
- $(use_with readline) \ |
66 |
- $(use_enable static-libs static) |
67 |
+ $(use_with readline) |
68 |
} |
69 |
|
70 |
src_compile() { |
71 |
default |
72 |
- use doc && doxygen |
73 |
+ |
74 |
+ if use doc; then |
75 |
+ doxygen || die |
76 |
+ HTML_DOCS=( "${S}"/doc/html/. ) |
77 |
+ fi |
78 |
} |
79 |
|
80 |
src_install() { |
81 |
default |
82 |
- use static-libs || find "${ED}" -name 'lib*.la' -delete |
83 |
- use doc && HTML_DOCS=( "${S}"/doc/html/* ) |
84 |
- einstalldocs |
85 |
+ find "${ED}" -name '*.la' -delete || die |
86 |
+ |
87 |
+ insinto /etc/nfc |
88 |
+ newins libnfc.conf.sample libnfc.conf |
89 |
} |