From dfe769d276aa9f6092ff70c146e2b848d9de9e9b Mon Sep 17 00:00:00 2001
From: Miroslav Šulc <fordfrog@gentoo.org>
Date: Fri, 1 Jul 2022 13:02:21 +0200
Subject: media-libs/libnjb: fixed doc installation path
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Closes: https://bugs.gentoo.org/854813
Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
---
 .../libnjb/files/libnjb-2.2.7-fix-docdir.patch     | 13 ++++++
 media-libs/libnjb/libnjb-2.2.7-r1.ebuild           | 50 --------------------
 media-libs/libnjb/libnjb-2.2.7-r2.ebuild           | 53 ++++++++++++++++++++++
 3 files changed, 66 insertions(+), 50 deletions(-)
 create mode 100644 media-libs/libnjb/files/libnjb-2.2.7-fix-docdir.patch
 delete mode 100644 media-libs/libnjb/libnjb-2.2.7-r1.ebuild
 create mode 100644 media-libs/libnjb/libnjb-2.2.7-r2.ebuild

(limited to 'media-libs')

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-r1.ebuild
deleted file mode 100644
index 2f593d538544..000000000000
--- a/media-libs/libnjb/libnjb-2.2.7-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="doc static-libs"
-
-RDEPEND="virtual/libusb:0"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-
-PATCHES=( "${FILESDIR}"/${P}-exclude-samples.patch )
-
-src_prepare() {
-	default
-	elibtoolize
-}
-
-src_configure() {
-	use doc || export ac_cv_prog_HAVE_DOXYGEN=false
-
-	econf \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	default
-
-	udev_newrules "${FILESDIR}"/${PN}.rules 80-${PN}.rules
-
-	# package provides .pc files
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	udev_reload
-}
-
-pkg_postrm() {
-	udev_reload
-}
diff --git a/media-libs/libnjb/libnjb-2.2.7-r2.ebuild b/media-libs/libnjb/libnjb-2.2.7-r2.ebuild
new file mode 100644
index 000000000000..5673ca924821
--- /dev/null
+++ b/media-libs/libnjb/libnjb-2.2.7-r2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="doc static-libs"
+
+RDEPEND="virtual/libusb:0"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-exclude-samples.patch
+	"${FILESDIR}"/${P}-fix-docdir.patch
+)
+
+src_prepare() {
+	default
+	elibtoolize
+}
+
+src_configure() {
+	use doc || export ac_cv_prog_HAVE_DOXYGEN=false
+
+	econf \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	default
+
+	udev_newrules "${FILESDIR}"/${PN}.rules 80-${PN}.rules
+
+	# package provides .pc files
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	udev_reload
+}
+
+pkg_postrm() {
+	udev_reload
+}
-- 
cgit v1.2.3-65-gdbad