gentoo resync : 29.12.2022

3 files changed, 103 insertions, 0 deletions

diff --git a/net-fs/nfs4-acl-tools/Manifest b/net-fs/nfs4-acl-tools/Manifest
index 19d00b442333..8e1bec559bb0 100644
--- a/net-fs/nfs4-acl-tools/Manifest
+++ b/net-fs/nfs4-acl-tools/Manifest
@@ -1,4 +1,6 @@
 AUX nfs4-acl-tools-0.3.5-jobserver-unavailable.patch 641 BLAKE2B 9b4976ff85927ca221360fe9ac8f8f55d9e2f47bd179ef13a2bb01f577d34f3ab705fcce4575b6ae8b797d26465573703634f3b2ce360984c71d98f4ca159598 SHA512 5f9518d62d26f06a40ef4b2cf494f42ccf75af47a349a83949c541382a11627f61cadec8914a7c4b1ca9d0d1a1063a22bf4c2eccaf310198c45c71b4d334b9b3
+AUX nfs4-acl-tools-0.3.7-libtool.patch 2051 BLAKE2B 53eb3760da336b40173d930b893e3096e8c5ef3a440942e9708f5416e018a0cefc838891034b21a1f3e6a4d27499f72d2626b3fbfd207377f418b26319d40876 SHA512 5a8043637ea4d9d187f2bc7c214c6bb1802b9079ceea66e8bce272e8b136bf9c091c9f314d3c109dfe7c4570e4561b495facf7c24528921cf0b9b3657c8098a3
 DIST nfs4-acl-tools-0.3.7.tar.gz 99139 BLAKE2B 5125fca65ee7b9dcea16e9b633bbfc26aa5c74202412119f138a5c47ae67d8f8e72fd4eb43182aaf3119858eb83fe6f24f6b53abc0b448aca04c3de4043ad9c1 SHA512 3922bced4e74891b0c4ea10a03eec0cc2e531de355776ba364a91bd656a78d19f9cfba026face34331841ee7c8609f12084fc10081601bc65aaf0fb008ca2fc6
+EBUILD nfs4-acl-tools-0.3.7-r1.ebuild 593 BLAKE2B dcf181bb5222a3b52796ca6bb8ef33aa89bf7cafc0cd5f180ff1337274079d3d45c9e0ec0bbb48710f719dab8684ed7415435b335b8086130176052aed667332 SHA512 f9101519474617af6827505a3b1721edadd9b8668469b452d92ff2be64815093419fe68f9865d486e9c46b70e55e65fdedab99c59ff9ac575883e30316310404
 EBUILD nfs4-acl-tools-0.3.7.ebuild 552 BLAKE2B c29e1f554791deffe8739d551a3fae46403e86f0accdc6f99f58fb420c8f0b85da8087da583425d0c759534ee23da72f49f9221691893b9cc65b9e2a7e8b5cf6 SHA512 0f4145efb55e96385da56d71abfa4bda3ddadd4e2fb64133c3766cdfc22b23027025294ca8e2ccb71e438c75175435fd52692e90163559ccc1d9622122518355
 MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c
diff --git a/net-fs/nfs4-acl-tools/files/nfs4-acl-tools-0.3.7-libtool.patch b/net-fs/nfs4-acl-tools/files/nfs4-acl-tools-0.3.7-libtool.patch
new file mode 100644
index 000000000000..7eb4d67e552d
--- /dev/null
+++ b/net-fs/nfs4-acl-tools/files/nfs4-acl-tools-0.3.7-libtool.patch
@@ -0,0 +1,74 @@
+https://bugs.gentoo.org/731162
+
+From 2abd5015bf6bac1697ac4422d76fa121a49f2b24 Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Fri, 17 Jun 2022 12:36:01 -0700
+Subject: [PATCH] configure: Add missing LT_INIT
+
+Otherwise it fails to generate libtool for the build breaking the build
+when using a different toolchain than the system libtool. It also breaks
+the build with rlibtool which depends on the generated libtool to
+determine if it should build static or shared libraries.
+
+The existing make and libtool tests were removed as unnecessary and
+problematic.
+--- a/configure.ac
++++ b/configure.ac
+@@ -9,6 +9,9 @@ AC_ARG_ENABLE(shared,
+ 			     enable_shared=no)
+ AC_SUBST(enable_shared)
+ 
++LT_INIT
++
++AC_PROG_LIBTOOL
+ AC_PROG_INSTALL
+ AC_PROG_CC
+ 
+--- a/include/builddefs.in
++++ b/include/builddefs.in
+@@ -39,6 +39,8 @@ DEBUG = @debug_build@
+ OPTIMIZER = @opt_build@
+ MALLOCLIB = @malloc_lib@
+ 
++top_builddir = $(TOPDIR)
++
+ LIBNFS4ACL = $(TOPDIR)/libnfs4acl/libnfs4acl.la
+ LIBATTR = @libattr@
+ 
+@@ -68,7 +70,6 @@ AWK		= @awk@
+ SED		= @sed@
+ TAR		= @tar@
+ ZIP		= @zip@
+-MAKE		= @make@
+ ECHO		= @echo@
+ SORT		= @sort@
+ LN_S		= @LN_S@
+--- a/m4/package_utilies.m4
++++ b/m4/package_utilies.m4
+@@ -22,26 +22,6 @@ AC_DEFUN([AC_PACKAGE_UTILITIES],
+     AC_SUBST(cc)
+     AC_PACKAGE_NEED_UTILITY($1, "$cc", cc, [C compiler])
+ 
+-    if test -z "$MAKE"; then
+-        AC_PATH_PROG(MAKE, gmake,, /usr/bin:/usr/freeware/bin)
+-    fi
+-    if test -z "$MAKE"; then
+-        AC_PATH_PROG(MAKE, make,, /usr/bin)
+-    fi
+-    make=$MAKE
+-    AC_SUBST(make)
+-    AC_PACKAGE_NEED_UTILITY($1, "$make", make, [GNU make])
+-
+-    if test -z "$LIBTOOL"; then
+-	AC_PATH_PROG(LIBTOOL, glibtool,, /usr/bin)
+-    fi
+-    if test -z "$LIBTOOL"; then
+-	AC_PATH_PROG(LIBTOOL, libtool,, /usr/bin:/usr/local/bin:/usr/freeware/bin)
+-    fi
+-    libtool=$LIBTOOL
+-    AC_SUBST(libtool)
+-    AC_PACKAGE_NEED_UTILITY($1, "$libtool", libtool, [GNU libtool])
+-
+     if test -z "$TAR"; then
+         AC_PATH_PROG(TAR, tar,, /usr/freeware/bin:/bin:/usr/local/bin:/usr/bin)
+     fi
diff --git a/net-fs/nfs4-acl-tools/nfs4-acl-tools-0.3.7-r1.ebuild b/net-fs/nfs4-acl-tools/nfs4-acl-tools-0.3.7-r1.ebuild
new file mode 100644
index 000000000000..d6a9c1322069
--- /dev/null
+++ b/net-fs/nfs4-acl-tools/nfs4-acl-tools-0.3.7-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Commandline and GUI tools that deal directly with NFSv4 ACLs"
+HOMEPAGE="https://git.linux-nfs.org/?p=bfields/nfs4-acl-tools.git;a=summary"
+SRC_URI="https://linux-nfs.org/~bfields/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="sys-apps/attr"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-libtool.patch # bug #731162
+	"${FILESDIR}"/${PN}-0.3.5-jobserver-unavailable.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}