media-libs/libnjb: Port to EAPI 6

Package-Manager: Portage-2.3.30, Repoman-2.3.9

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 (file)
index 0000000..f241338
--- /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 e1285c049c4b6fcc2fc4f05a9c563c0e4cc9ea8f..65abd57060740772ac02d6c451d2b5be2e1fb9ee 100644 (file)
--- 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
 }