public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Mike Auty" <ikelos@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/libnfc/
Date: Sun, 12 Jul 2020 20:16:40 +0000 (UTC)	[thread overview]
Message-ID: <1594584937.c61767d3aad6e3da0cfa00f77cd4bbcb0fae1b9d.ikelos@gentoo> (raw)

commit:     c61767d3aad6e3da0cfa00f77cd4bbcb0fae1b9d
Author:     Mike Auty <ikelos <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 12 20:14:21 2020 +0000
Commit:     Mike Auty <ikelos <AT> gentoo <DOT> org>
CommitDate: Sun Jul 12 20:15:37 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c61767d3

dev-libs/libnfc: Fix HTML docs (thanks to Jesper Saxtorph)

Closes: https://bugs.gentoo.org/724552
Signed-off-by: Mike Auty <ikelos <AT> gentoo.org>

 dev-libs/libnfc/Manifest            |  1 -
 dev-libs/libnfc/libnfc-1.7.1.ebuild | 43 -------------------------------------
 dev-libs/libnfc/libnfc-1.7.2.ebuild |  3 ++-
 dev-libs/libnfc/libnfc-1.8.0.ebuild |  3 ++-
 4 files changed, 4 insertions(+), 46 deletions(-)

diff --git a/dev-libs/libnfc/Manifest b/dev-libs/libnfc/Manifest
index 79395283928..cb1593b0a06 100644
--- a/dev-libs/libnfc/Manifest
+++ b/dev-libs/libnfc/Manifest
@@ -1,3 +1,2 @@
-DIST libnfc-1.7.1.tar.bz2 484309 BLAKE2B 7a86394e8902421410d54de2b2710cee7ea34a6f950f6d76ec59d24d6e46798cd10a9725f405c729df44da84b810b5853a5eef0ec5f2a10ccbcf7585d33f34ef SHA512 6a03d197c450c0ab8f2d16ae8c1f80e206fa909ece84a32dbb962acd0f7ef693a419608cdaa4c2207a1d2593599e44479520d7413eace7fca19d3230442e506c
 DIST libnfc-1.7.2.tar.bz2 534821 BLAKE2B 015634a696aeda77abdb53ab658504d0183b8d8d5899f368b122660d6527cf4d3ec988147082620d87d007ea33320acfde6cc013c9257b9c62fa4fb99528eeeb SHA512 c93ab10667998b6c6bf948082253715762ae91699d3e035f1149cebf6d3881cbc2ab570976c70cd12f886f76a18a82ac048fad0664512d1cd553c0fd1fdf7674
 DIST libnfc-1.8.0.tar.bz2 553511 BLAKE2B 060ef4f24b3387393faf43f37a3a245177cb9697d42df1a8e8e5155af8b6e7b818b4bd710ff73929bde39274eda0235d111627cfd3931bd3fe9addde10af0fad SHA512 aa8762ecb5b94167d20346f2c81491bb5b634bcedbf2aae3e2efdb301bca89ceb7c2e15148d0934fdc1cce6d77ee0225e28e84893232999fdc09d8a90ae2a7c5

diff --git a/dev-libs/libnfc/libnfc-1.7.1.ebuild b/dev-libs/libnfc/libnfc-1.7.1.ebuild
deleted file mode 100644
index 9c11a2bbcaa..00000000000
--- a/dev-libs/libnfc/libnfc-1.7.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit toolchain-funcs
-
-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}
-	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 && dohtml "${S}"/doc/html/*
-}

diff --git a/dev-libs/libnfc/libnfc-1.7.2.ebuild b/dev-libs/libnfc/libnfc-1.7.2.ebuild
index cb49692161f..102f2a1983e 100644
--- a/dev-libs/libnfc/libnfc-1.7.2.ebuild
+++ b/dev-libs/libnfc/libnfc-1.7.2.ebuild
@@ -39,5 +39,6 @@ src_compile() {
 src_install() {
 	default
 	use static-libs || find "${ED}" -name 'lib*.la' -delete
-	use doc && dohtml "${S}"/doc/html/*
+	use doc && HTML_DOCS=( "${S}"/doc/html/* )
+	einstalldocs
 }

diff --git a/dev-libs/libnfc/libnfc-1.8.0.ebuild b/dev-libs/libnfc/libnfc-1.8.0.ebuild
index cb49692161f..102f2a1983e 100644
--- a/dev-libs/libnfc/libnfc-1.8.0.ebuild
+++ b/dev-libs/libnfc/libnfc-1.8.0.ebuild
@@ -39,5 +39,6 @@ src_compile() {
 src_install() {
 	default
 	use static-libs || find "${ED}" -name 'lib*.la' -delete
-	use doc && dohtml "${S}"/doc/html/*
+	use doc && HTML_DOCS=( "${S}"/doc/html/* )
+	einstalldocs
 }


             reply	other threads:[~2020-07-12 20:16 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-07-12 20:16 Mike Auty [this message]
  -- strict thread matches above, loose matches on Subject: below --
2023-02-26 19:03 [gentoo-commits] repo/gentoo:master commit in: dev-libs/libnfc/ Arthur Zamarin
2023-02-26 17:12 Arthur Zamarin
2023-01-14 23:25 Sam James
2021-10-12  8:50 David Seifert
2021-10-12  8:50 David Seifert
2020-07-01 19:24 Rick Farina
2020-05-21 16:27 Rick Farina
2019-11-14  0:47 Aaron Bauman
2016-12-21 19:52 Mike Auty
2016-01-14 19:55 Mike Auty

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1594584937.c61767d3aad6e3da0cfa00f77cd4bbcb0fae1b9d.ikelos@gentoo \
    --to=ikelos@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox