From 2719f73b6813d11d13a9650cdd2ab8ec6e69385d Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Sat, 9 Jul 2022 15:43:36 +0100
Subject: gentoo resync : 09.07.2022

---
 media-libs/libnjb/Manifest                         |  3 +-
 .../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 ++++++++++++++++++++++
 4 files changed, 68 insertions(+), 51 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/libnjb')

diff --git a/media-libs/libnjb/Manifest b/media-libs/libnjb/Manifest
index 519035de1b70..b675ac33c2ae 100644
--- a/media-libs/libnjb/Manifest
+++ b/media-libs/libnjb/Manifest
@@ -1,6 +1,7 @@
 AUX libnjb-2.2.7-exclude-samples.patch 288 BLAKE2B 8d9646562a8b7a07460577a563ae576bc1793ba7fb330a5a141a076ecc443872759dfbd51c0425fa52fd1460d3a5347fd4f0b46c4a5bef9165bb6dbedacacb73 SHA512 218ad125a74545340bb3c1295e7bde74701ae656ebf0955d96d23f554dc1119d20e8ebe530d658883c799d0552144f094e1c825f2dc6daae529ea8d37114d7f6
+AUX libnjb-2.2.7-fix-docdir.patch 462 BLAKE2B afc0ea3f8d8a776ed37f93fb2430f931cd154f1f88ed1a28fe8c5ebbd9b5501bf63de0999ed01fe79c72133f5e76c4e0cf7d4876e40fdf7f93ef1a5bac964c8c SHA512 f85f5ab0a628850cc2db04ef4beae79448bcd144002dca5552999c9487cb65ece8ca4bbcea9135b892cb813e8bfa28dd94c09e7d08ba562807f329217bef58d5
 AUX libnjb.rules 1773 BLAKE2B 3fdc3a8ceaec9b065e5ea174738642311b57f4cf41f2759375160ef0cdd6044434427f82dae8dc4cad167bfd4578b51bb019a3e4924883f8a6f9efc06a7fe6be SHA512 21d9aa5b0d0c170c3f8071a81981590714f6bbf203d5b6f973aea6a2365f69cde5008969748a2136b9791db327fc476d33fe8937cc7c7d26168ac1803738419a
 DIST libnjb-2.2.7.tar.gz 497862 BLAKE2B e6b7ba77d99f2f4e777ebdca6793d6a348073d9696b9b38b51bc7e29ddacff9a5d19116ca538416ef068496a8827700ed4f740e8ce0c0c1402751c97eb45ed58 SHA512 d217beb772024ec122739327dae9f1e991ace4c3dfe79a4960d1d7421c3d663f924304331025a1790ea7b697ac84d8926f3ab507c6d919e781e90ca82ef6fd06
-EBUILD libnjb-2.2.7-r1.ebuild 905 BLAKE2B 35222a81e34ae0cc7adf6c9b8c93b2361d75d2e83293f601eac729d8f14af5ac19585aef58190feea71d94aaae0be243430c5c05b3ef9aa4d18ae6a501895bd5 SHA512 9d11fc3b1c3dc8689098ba9fc76ecfc95a320faa7ec901facff054085c2a14850ecf7e6d6378558850c0c449ee40fe1ce95b6f9eb01cb6efe9537e1e60604b7d
+EBUILD libnjb-2.2.7-r2.ebuild 943 BLAKE2B f8e71417fe6652e74a0c35c9600e7c8dbad2cee72bcdb682c27aaf6dfedf7e26d0ba2a7d6575ea82237df4bf69cf17a6f3e89600678d9f2c0cdf3b678e4752b7 SHA512 cdcb47e9d15f08e193c3c432ee58bdf200a9544ae3c7636d9d321d3c23bc534c4f58b824ef2348d8990ef8ea9a8ebe32ea537a830481ef1372836746725d976f
 EBUILD libnjb-2.2.7.ebuild 901 BLAKE2B 6a80b5cbd83f412b2d266ced3351089b015b2b5236ced0ed8fffc159ffa55fe3c01490058f86d771fc8e486f24ceb23a246bf743ba733d2147be8cd5de3b7711 SHA512 8c9d7564228c4910c37caabb1803cff80603f7ca932f8bd0781a55a60e7eb25c47bd6e0195d18ad8445c1e79881042122bacdc00347188ec855bfce01e6392fc
 MISC metadata.xml 330 BLAKE2B 39ec86a9bd0ff38039476fcd261ba7c73f76e5fc753eef58396595adca1c3222ee7f0d84b2d13834448334b89641ad4b0d3d18d73052272e3d733138e3bfc019 SHA512 d01d952928c34e77ebc9b00e3248fce151c2d0bdef18a9e60512fbdeb76d473a57fd26ae3891bad2fe747e7d016a4cd84ce3029db6ad2918fe14f63dc7555dbb
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