[gentoo-commits] repo/gentoo:master commit in: media-libs/libnjb/, media-libs/libnjb/files/

[gentoo-commits] repo/gentoo:master commit in: media-libs/libnjb/, media-libs/libnjb/files/

[David Seifert]

commit:     d59dbc37699553d61f692815a88bde6182910005
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 18 18:46:52 2018 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Wed Apr 18 18:49:58 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d59dbc37

media-libs/libnjb: Port to EAPI 6

Package-Manager: Portage-2.3.30, Repoman-2.3.9

 .../libnjb/files/libnjb-2.2.7-exclude-samples.patch     | 11 +++++++++++
 media-libs/libnjb/libnjb-2.2.7.ebuild                   | 17 ++++++++---------
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/media-libs/libnjb/files/libnjb-2.2.7-exclude-samples.patch b/media-libs/libnjb/files/libnjb-2.2.7-exclude-samples.patch
new file mode 100644
index 00000000000..f241338c212
--- /dev/null
+++ b/media-libs/libnjb/files/libnjb-2.2.7-exclude-samples.patch
@@ -0,0 +1,11 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -249,7 +249,7 @@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-SUBDIRS = src sample doc
++SUBDIRS = src doc
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = libnjb.pc
+ EXTRA_DIST = libnjb.pc \

diff --git a/media-libs/libnjb/libnjb-2.2.7.ebuild b/media-libs/libnjb/libnjb-2.2.7.ebuild
index e1285c049c4..65abd570607 100644
--- a/media-libs/libnjb/libnjb-2.2.7.ebuild
+++ b/media-libs/libnjb/libnjb-2.2.7.ebuild
@@ -1,10 +1,11 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
-inherit libtool multilib udev
+EAPI=6
 
-DESCRIPTION="a C library and API for communicating with the Creative Nomad JukeBox digital audio player"
+inherit libtool udev
+
+DESCRIPTION="Library for communicating with the Creative Nomad JukeBox digital audio player"
 HOMEPAGE="http://libnjb.sourceforge.net"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
@@ -17,13 +18,10 @@ RDEPEND="virtual/libusb:0"
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )"
 
-DOCS="AUTHORS ChangeLog* FAQ HACKING README"
+PATCHES=( "${FILESDIR}"/${P}-exclude-samples.patch )
 
 src_prepare() {
-	sed -i \
-		-e 's:SUBDIRS = src sample doc:SUBDIRS = src doc:' \
-		Makefile.in || die
-
+	default
 	elibtoolize
 }
 
@@ -39,5 +37,6 @@ src_install() {
 
 	udev_newrules "${FILESDIR}"/${PN}.rules 80-${PN}.rules
 
-	find "${ED}" -name '*.la' -exec rm -f {} +
+	# package provides .pc files
+	find "${D}" -name '*.la' -delete || die
 }

[gentoo-commits] repo/gentoo:master commit in: media-libs/libnjb/, media-libs/libnjb/files/

[Miroslav Šulc]

commit:     dfe769d276aa9f6092ff70c146e2b848d9de9e9b
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Fri Jul  1 11:02:21 2022 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Jul  1 11:02:21 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dfe769d2

media-libs/libnjb: fixed doc installation path

Closes: https://bugs.gentoo.org/854813
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 media-libs/libnjb/files/libnjb-2.2.7-fix-docdir.patch       | 13 +++++++++++++
 .../{libnjb-2.2.7-r1.ebuild => libnjb-2.2.7-r2.ebuild}      |  5 ++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/media-libs/libnjb/files/libnjb-2.2.7-fix-docdir.patch b/media-libs/libnjb/files/libnjb-2.2.7-fix-docdir.patch
new file mode 100644
index 000000000000..efa6825e7473
--- /dev/null
+++ b/media-libs/libnjb/files/libnjb-2.2.7-fix-docdir.patch
@@ -0,0 +1,13 @@
+diff --git a/doc/Makefile.in b/doc/Makefile.in
+index 5a9b1bb..3e25fb5 100644
+--- a/doc/Makefile.in
++++ b/doc/Makefile.in
+@@ -169,7 +169,7 @@ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ EXTRA_DIST = Doxyfile.in examples.h mainpage.h
+-@HAVE_DOXYGEN_TRUE@pkgdocdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
++@HAVE_DOXYGEN_TRUE@pkgdocdir = $(docdir)
+ @HAVE_DOXYGEN_TRUE@htmldocdir = $(pkgdocdir)/html
+ all: all-am
+ 

diff --git a/media-libs/libnjb/libnjb-2.2.7-r1.ebuild b/media-libs/libnjb/libnjb-2.2.7-r2.ebuild
similarity index 90%
rename from media-libs/libnjb/libnjb-2.2.7-r1.ebuild
rename to media-libs/libnjb/libnjb-2.2.7-r2.ebuild
index 2f593d538544..5673ca924821 100644
--- a/media-libs/libnjb/libnjb-2.2.7-r1.ebuild
+++ b/media-libs/libnjb/libnjb-2.2.7-r2.ebuild
@@ -18,7 +18,10 @@ RDEPEND="virtual/libusb:0"
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )"
 
-PATCHES=( "${FILESDIR}"/${P}-exclude-samples.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-exclude-samples.patch
+	"${FILESDIR}"/${P}-fix-docdir.patch
+)
 
 src_prepare() {
 	default