diff options
author | V3n3RiX <venerix@koprulu.sector> | 2021-10-20 10:22:14 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2021-10-20 10:22:14 +0100 |
commit | 46eedbedafdb0040c37884982d4c775ce277fb7b (patch) | |
tree | db33a91259730be84999e13a8d8168c799f50ac0 /dev-libs/libnfc | |
parent | e23a08d0c97a0cc415aaa165da840b056f93c997 (diff) |
gentoo resync : 20.10.2021
Diffstat (limited to 'dev-libs/libnfc')
-rw-r--r-- | dev-libs/libnfc/Manifest | 4 | ||||
-rw-r--r-- | dev-libs/libnfc/libnfc-1.8.0-r1.ebuild (renamed from dev-libs/libnfc/libnfc-1.7.2.ebuild) | 33 | ||||
-rw-r--r-- | dev-libs/libnfc/libnfc-1.8.0.ebuild | 42 |
3 files changed, 21 insertions, 58 deletions
diff --git a/dev-libs/libnfc/Manifest b/dev-libs/libnfc/Manifest index 82f430252194..461797a57b43 100644 --- a/dev-libs/libnfc/Manifest +++ b/dev-libs/libnfc/Manifest @@ -1,5 +1,3 @@ -DIST libnfc-1.7.2.tar.bz2 534821 BLAKE2B 015634a696aeda77abdb53ab658504d0183b8d8d5899f368b122660d6527cf4d3ec988147082620d87d007ea33320acfde6cc013c9257b9c62fa4fb99528eeeb SHA512 c93ab10667998b6c6bf948082253715762ae91699d3e035f1149cebf6d3881cbc2ab570976c70cd12f886f76a18a82ac048fad0664512d1cd553c0fd1fdf7674 DIST libnfc-1.8.0.tar.bz2 553511 BLAKE2B 060ef4f24b3387393faf43f37a3a245177cb9697d42df1a8e8e5155af8b6e7b818b4bd710ff73929bde39274eda0235d111627cfd3931bd3fe9addde10af0fad SHA512 aa8762ecb5b94167d20346f2c81491bb5b634bcedbf2aae3e2efdb301bca89ceb7c2e15148d0934fdc1cce6d77ee0225e28e84893232999fdc09d8a90ae2a7c5 -EBUILD libnfc-1.7.2.ebuild 1030 BLAKE2B 185e653a815d5682d4dc9f31aeabca00c4ff5612c622f9da6763bc4db30d1d304b7088052e77a47894774a2951db3c89f26a7c066e1674dcc87e8861a9a6ecfc SHA512 6dcde7d4f1af93ac238d6ebab7ecd27b85210c18c61d5fa0d99c6c6f2db75549d7d824ad7d7e723dd5e4a9532053e33147905ec53125582d273ec3047ac940aa -EBUILD libnfc-1.8.0.ebuild 1030 BLAKE2B 185e653a815d5682d4dc9f31aeabca00c4ff5612c622f9da6763bc4db30d1d304b7088052e77a47894774a2951db3c89f26a7c066e1674dcc87e8861a9a6ecfc SHA512 6dcde7d4f1af93ac238d6ebab7ecd27b85210c18c61d5fa0d99c6c6f2db75549d7d824ad7d7e723dd5e4a9532053e33147905ec53125582d273ec3047ac940aa +EBUILD libnfc-1.8.0-r1.ebuild 1050 BLAKE2B b89dbe3c9f21a5637836a755b648c0d6e5853b65b380acb99cc81c120e6c08f1e9305dabab00bd14d773ed46da7851edf97086fb204d09f947cede68f2fa344e SHA512 6a4e1fb8df883712b67eec0fee8ee97d93e1eb15aa56a5c981870074eea7dc496a6aec964d16d9829473951f0cd019f8dcd7f56b185b1d1d2d9e3852ff4c15a2 MISC metadata.xml 389 BLAKE2B 699fb3cd9d37fe58a3f4d4c80bdad576dfae94d3f45318107c08741ee2cf5dd0c66266987e4c80321bfa69e1b7c5ed8e987ffc93e058d0b709c56dbef5477c72 SHA512 abf7bbbf9ce7e0364690079bb7ace4b3db320ee0468f76e80182244432ef8781249b1d7df66c361644fbfe8e0e843fda4014704792b64677769e8b4e48a33d52 diff --git a/dev-libs/libnfc/libnfc-1.7.2.ebuild b/dev-libs/libnfc/libnfc-1.8.0-r1.ebuild index ae5228fdac73..fba699e4b06a 100644 --- a/dev-libs/libnfc/libnfc-1.7.2.ebuild +++ b/dev-libs/libnfc/libnfc-1.8.0-r1.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 DESCRIPTION="Near Field Communications (NFC) library" HOMEPAGE="http://www.libnfc.org/" @@ -10,33 +10,40 @@ SRC_URI="https://github.com/nfc-tools/${PN}/releases/download/${P}/${P}.tar.bz2" LICENSE="LGPL-3" SLOT="0" KEYWORDS="~amd64 ~arm ~x86" -IUSE="doc pcsc-lite readline static-libs usb" +IUSE="doc pcsc-lite readline usb" -RDEPEND="pcsc-lite? ( sys-apps/pcsc-lite ) - readline? ( sys-libs/readline:0 ) +RDEPEND=" + pcsc-lite? ( sys-apps/pcsc-lite ) + readline? ( sys-libs/readline:= ) usb? ( virtual/libusb:0 )" DEPEND="${RDEPEND}" -BDEPEND="doc? ( app-doc/doxygen )" +BDEPEND=" + virtual/pkgconfig + doc? ( app-doc/doxygen )" src_configure() { local drivers="arygon,pn532_uart,pn532_spi,pn532_i2c,acr122s" - use pcsc-lite && drivers+=",acr122_pcsc" - use usb && drivers+=",pn53x_usb,acr122_usb" + drivers+=$(usev pcsc-lite ",acr122_pcsc,pcsc") + drivers+=$(usev usb ",pn53x_usb,acr122_usb") econf \ --with-drivers="${drivers}" \ $(use_enable doc) \ - $(use_with readline) \ - $(use_enable static-libs static) + $(use_with readline) } src_compile() { default - use doc && doxygen + + if use doc; then + doxygen || die + HTML_DOCS=( "${S}"/doc/html/. ) + fi } src_install() { default - use static-libs || find "${ED}" -name 'lib*.la' -delete - use doc && HTML_DOCS=( "${S}"/doc/html/* ) - einstalldocs + find "${ED}" -name '*.la' -delete || die + + insinto /etc/nfc + newins libnfc.conf.sample libnfc.conf } diff --git a/dev-libs/libnfc/libnfc-1.8.0.ebuild b/dev-libs/libnfc/libnfc-1.8.0.ebuild deleted file mode 100644 index ae5228fdac73..000000000000 --- a/dev-libs/libnfc/libnfc-1.8.0.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Near Field Communications (NFC) library" -HOMEPAGE="http://www.libnfc.org/" -SRC_URI="https://github.com/nfc-tools/${PN}/releases/download/${P}/${P}.tar.bz2" - -LICENSE="LGPL-3" -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="doc pcsc-lite readline static-libs usb" - -RDEPEND="pcsc-lite? ( sys-apps/pcsc-lite ) - readline? ( sys-libs/readline:0 ) - usb? ( virtual/libusb:0 )" -DEPEND="${RDEPEND}" -BDEPEND="doc? ( app-doc/doxygen )" - -src_configure() { - local drivers="arygon,pn532_uart,pn532_spi,pn532_i2c,acr122s" - use pcsc-lite && drivers+=",acr122_pcsc" - use usb && drivers+=",pn53x_usb,acr122_usb" - econf \ - --with-drivers="${drivers}" \ - $(use_enable doc) \ - $(use_with readline) \ - $(use_enable static-libs static) -} - -src_compile() { - default - use doc && doxygen -} - -src_install() { - default - use static-libs || find "${ED}" -name 'lib*.la' -delete - use doc && HTML_DOCS=( "${S}"/doc/html/* ) - einstalldocs -} |