net-fs/libnfs: live ebuild improvements.

- EAPI-6 bump
- Add "utils" USE flag
- Bump sub-slot to 12 to reflect .so version change

Package-Manager: Portage-2.3.41, Repoman-2.3.9

diff --git a/net-fs/libnfs/files/libnfs-3.0.0-utils.patch b/net-fs/libnfs/files/libnfs-3.0.0-utils.patch
new file mode 100644 (file)
index 0000000..b267161
--- /dev/null
+++ b/net-fs/libnfs/files/libnfs-3.0.0-utils.patch
@@ -0,0 +1,20 @@
+diff --git a/configure.ac b/configure.ac
+index a1f51d0..f96879a 100755
+--- a/configure.ac
++++ b/configure.ac
+@@ -25,11 +25,13 @@ fi
+ AC_SYS_LARGEFILE
+ 
+ #option: utils
++MAYBE_UTILS="utils"
+ AC_ARG_ENABLE([utils],
+               [AC_HELP_STRING([--enable-utils],
+                               [Build util programs])],
+-            [MAYBE_UTILS=""],
+-            [MAYBE_UTILS="utils"])
++            [if test $enableval = no ; then
++                  MAYBE_UTILS=""
++             fi])
+ AC_SUBST(MAYBE_UTILS)
+ 
+ #option: examples

diff --git a/net-fs/libnfs/libnfs-9999.ebuild b/net-fs/libnfs/libnfs-9999.ebuild
index 958c36a1dd2400bb0208c06db3e531bdbe5256b1..96606a99d49ce48a902ffddd64e52a19b85023c3 100644 (file)
--- a/net-fs/libnfs/libnfs-9999.ebuild
+++ b/net-fs/libnfs/libnfs-9999.ebuild
@@ -1,42 +1,48 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=6
 
-AUTOTOOLS_AUTORECONF="1"
-
-inherit autotools autotools-utils eutils
+inherit autotools
 if [[ ${PV} == "9999" ]] ; then
-       EGIT_REPO_URI="https://github.com/sahlberg/${PN}.git"
        inherit git-r3
+       EGIT_REPO_URI="https://github.com/sahlberg/${PN}.git"
 else
        SRC_URI="https://github.com/sahlberg/${PN}/archive/${P}.tar.gz"
        KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~x86"
+       S="${WORKDIR}/${PN}-${P}"
 fi
 
 DESCRIPTION="Client library for accessing NFS shares over a network"
 HOMEPAGE="https://github.com/sahlberg/libnfs"
 
 LICENSE="LGPL-2.1 GPL-3"
-SLOT="0/11"  # sub-slot matches SONAME major
-IUSE="examples static-libs"
+SLOT="0/12"  # sub-slot matches SONAME major
+IUSE="examples static-libs utils"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
        virtual/pkgconfig"
 
-S="${WORKDIR}/${PN}-${P}"
+PATCHES=(
+       "${FILESDIR}/${PN}-3.0.0-utils.patch"
+)
 
 src_prepare() {
        default
-
-       epatch_user
-
        eautoreconf
 }
 
+src_configure() {
+       local myeconfargs=(
+               $(use_enable static-libs static)
+               $(use_enable utils)
+       )
+       econf "${myeconfargs[@]}"
+}
+
 src_install() {
-       autotools-utils_src_install
+       default
        if use examples; then
                # --enable-examples configure switch just compiles them
                # better install sources instead
@@ -45,4 +51,5 @@ src_install() {
                        doexe examples/${program}.c
                done
        fi
+       find "${ED}" -name "*.la" -delete || die
 }

diff --git a/net-fs/libnfs/metadata.xml b/net-fs/libnfs/metadata.xml
index 0a94e5f6ef13d48be1ce63cb3e0fbbe6ef71ec6f..bdbf712883c684f3eb0d6f2db5553f92983a6adc 100644 (file)
--- a/net-fs/libnfs/metadata.xml
+++ b/net-fs/libnfs/metadata.xml
@@ -5,6 +5,9 @@
                <email>base-system@gentoo.org</email>
                <name>Gentoo Base System</name>
        </maintainer>
+       <use>
+               <flag name="utils">Build/install nfs-{cat,ls,cp} utils</flag>
+       </use>
        <upstream>
                <remote-id type="github">sahlberg/libnfs</remote-id>
        </upstream>