gentoo resync : 19.04.2018

4 files changed, 22 insertions, 54 deletions

diff --git a/media-libs/libnjb/Manifest b/media-libs/libnjb/Manifest
index 7cb21b126487..bffa2fa083d1 100644
--- a/media-libs/libnjb/Manifest
+++ b/media-libs/libnjb/Manifest
@@ -1,6 +1,5 @@
+AUX libnjb-2.2.7-exclude-samples.patch 288 BLAKE2B 8d9646562a8b7a07460577a563ae576bc1793ba7fb330a5a141a076ecc443872759dfbd51c0425fa52fd1460d3a5347fd4f0b46c4a5bef9165bb6dbedacacb73 SHA512 218ad125a74545340bb3c1295e7bde74701ae656ebf0955d96d23f554dc1119d20e8ebe530d658883c799d0552144f094e1c825f2dc6daae529ea8d37114d7f6
 AUX libnjb.rules 1773 BLAKE2B 3fdc3a8ceaec9b065e5ea174738642311b57f4cf41f2759375160ef0cdd6044434427f82dae8dc4cad167bfd4578b51bb019a3e4924883f8a6f9efc06a7fe6be SHA512 21d9aa5b0d0c170c3f8071a81981590714f6bbf203d5b6f973aea6a2365f69cde5008969748a2136b9791db327fc476d33fe8937cc7c7d26168ac1803738419a
-DIST libnjb-2.2.6.tar.gz 504329 BLAKE2B 6e89b13dbb84fb71f2112ae1523c8b431222d6b4af85a2a7d318653a4a62beca2c5f48efb37475499e78f1d05ecfa5d18be26673f253f343b6886eda52b6e765 SHA512 c079abcf5d2c1fd56dfd6da6a7bf08d1f35e365b6186072f526980a49d8f72cf04c79381eda4fbada5ca467ae6c9e96c6e3a13b753937040530f6e6c61b012f2
 DIST libnjb-2.2.7.tar.gz 497862 BLAKE2B e6b7ba77d99f2f4e777ebdca6793d6a348073d9696b9b38b51bc7e29ddacff9a5d19116ca538416ef068496a8827700ed4f740e8ce0c0c1402751c97eb45ed58 SHA512 d217beb772024ec122739327dae9f1e991ace4c3dfe79a4960d1d7421c3d663f924304331025a1790ea7b697ac84d8926f3ab507c6d919e781e90ca82ef6fd06
-EBUILD libnjb-2.2.6.ebuild 894 BLAKE2B 950c060237f41fae0b58485d30dc2d96ad8181cfee2bf86d1534b9ba41e04262b957acaa94b06876a1aaf4e87bd549fdb817d3ed47acb0c2cfd10e0a3873d927 SHA512 b81453e5cfecbdbb6c3a7aa3e346b7edd7d699380c5b68b4e831d8d72a4c603e60641d4fbc34b3c781175e275fe9817e0d617bdb36036a27841e29a18fa58db3
-EBUILD libnjb-2.2.7.ebuild 914 BLAKE2B 22fe141972476cdde07f70e9994ca2629e2814afac5c7e8d17f52a24bb0bcb0de442b021df66361d322210b9fbbe3db717f2368e4f6e955cd13ad4fb6f42649a SHA512 f585a40c4c3ffdc872cb15882ce1ca34fd7b27aeee958da935e1f520ff0624a3e7a66207e11a601811c05d041947c8cf62c881b54d216a86d8ad2f4478b85058
+EBUILD libnjb-2.2.7.ebuild 850 BLAKE2B 0060fb046d3fdc28fa9788ca8f44ecae213e3e34fc4b95a26fc2a04f63b9bf2cadfe66a28a306f7b5581de62f55dd8f26af169812526b6cb23d4a21423d7bc0b SHA512 408a6de816e4e09aabdec27907a1df7c39734a10e97a6eb666c778606c49479f8ef4d3d8067ee7d411a4867782f68814e3caae287fdc9907077527c0a185aaa7
 MISC metadata.xml 329 BLAKE2B 113696bd928069036fefb90161fd3e1ce0ba24f9539b16ec7a7199893fe45aa05e5f69343f51c1f0fd90407977be6f698df03d982c3163a7290e60097a9cc2ee SHA512 c431cf889d0fb22891d12ed46abf92d356c162d5bb9b897519ba90faa9effdf44db671028ec8775d0e4ec09c3bdc89a58b2f27db55ff34e83a0cdd76b9bac5d7
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 000000000000..f241338c2123
--- /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.6.ebuild b/media-libs/libnjb/libnjb-2.2.6.ebuild
deleted file mode 100644
index 132f4be4850c..000000000000
--- a/media-libs/libnjb/libnjb-2.2.6.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-inherit libtool multilib udev
-
-DESCRIPTION="a C library and API 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 ~x86-fbsd"
-IUSE="static-libs"
-
-RDEPEND="virtual/libusb:0"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	sed -i \
-		-e 's:SUBDIRS = src sample doc:SUBDIRS = src doc:' \
-		Makefile.in || die
-
-	elibtoolize
-}
-
-src_configure() {
-	econf \
-		--disable-dependency-tracking \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	dodoc AUTHORS ChangeLog* FAQ HACKING README
-
-	udev_newrules "${FILESDIR}"/${PN}.rules 80-${PN}.rules
-
-	find "${D}" -name '*.la' -exec rm -f {} +
-}
diff --git a/media-libs/libnjb/libnjb-2.2.7.ebuild b/media-libs/libnjb/libnjb-2.2.7.ebuild
index e1285c049c4b..48e23269a9ca 100644
--- a/media-libs/libnjb/libnjb-2.2.7.ebuild
+++ b/media-libs/libnjb/libnjb-2.2.7.ebuild
@@ -1,29 +1,27 @@
 # 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"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
 IUSE="doc static-libs"
 
 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
 }