gentoo auto-resync : 29:10:2022 - 04:00:35

6 files changed, 4 insertions, 98 deletions

diff --git a/net-fs/Manifest.gz b/net-fs/Manifest.gz
index a67e1503b318..23faa3a16951 100644
--- a/net-fs/Manifest.gz
+++ b/net-fs/Manifest.gz
diff --git a/net-fs/cifs-utils/Manifest b/net-fs/cifs-utils/Manifest
index 17ffec0baf18..e56668c259d9 100644
--- a/net-fs/cifs-utils/Manifest
+++ b/net-fs/cifs-utils/Manifest
@@ -6,4 +6,4 @@ DIST cifs-utils-7.0.tar.bz2 418638 BLAKE2B 514d35f243d0ef7b866068a9a53a4b1704d28
 EBUILD cifs-utils-6.15-r1.ebuild 3605 BLAKE2B 37799ff5278632f165be826292236534749142c61ebbcabf5b9d3be69673f3ad8ed42e3117b7f85cb93d258476234c095178e707585328914c4970c402c8a58d SHA512 2aa9e36168c209410d91132d6939cabcc619f40eaf21317c58c71aaea8e085b17fe36fddc90eadd10f63d7b738817117ea03ad6758bdfd77a468b32dddbec23b
 EBUILD cifs-utils-6.15.ebuild 3485 BLAKE2B 691f8b6be41701110de819a67f9fa064e693757bcb9ad99d17b0da7dae4ee2e176455da08f16adc324c11d3eb9ea2dba5aab077049d42832db85b9532e2ba59c SHA512 5381c672478fd3bf506272f1cda66b5bf0a8bb1fec2435c1f84bb74fc56a67f909dfcbd9fba8415e166a6f73edadbfc6c6c6afdcf774238e15d26adf4348af6c
 EBUILD cifs-utils-7.0.ebuild 3610 BLAKE2B 02a15ac4708cbae6954f69f5d0740d2f00f153a5c8da3d905babf4b7c90ee8a9e59f0e49550a79698f74fc4a6a1cdfd538f09c2dfac080a2e2c1b15a097df496 SHA512 c4beb9202a5752db3a1c751144f2b731e573ef402299c32151fb0878d5605e84d72d8c88b3e93aae5f4a258325c6b343b13b796d870d0f3e4682d9034c43a764
-MISC metadata.xml 967 BLAKE2B dc6654b412c77f2e95cad9cfa2d4e4465d3292b546d55ddc04ad1b3d5b8220bbe4ef0b0d1409fb2f5da99851d45567667935057f5d5c15dad4e2cf26e3ce0e00 SHA512 c6b0fbdd9d776695032cd4a3e109717dfa7cd07b1456da8264dc0688fcfa158d1f4a73758ee24ba318f14e7a321811bd24f688ca3c39156b304028566315b650
+MISC metadata.xml 1052 BLAKE2B 58ff7162bfc8d4fa545f663a484a105fcbd52471e187b4b7f895b7906dfd5f87723927ef2cfaabd784026c5af4508b65b23921dac27e580671b318f3d16ce470 SHA512 74fd58db42397da01aedfeddd70c8a2552533c95a63e58c68a6dfbb22b04b86aa0321f23a9ecfebbf0896a3a06921ef7b583d4d246edefa65bca8a10c0ea4a89
diff --git a/net-fs/cifs-utils/metadata.xml b/net-fs/cifs-utils/metadata.xml
index 1f04d52ef8c9..8ae7effff581 100644
--- a/net-fs/cifs-utils/metadata.xml
+++ b/net-fs/cifs-utils/metadata.xml
@@ -13,6 +13,9 @@
 		part of Samba was problematic and it was deemed better to split
 		them off into their own package
 	</longdescription>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:samba:cifs-utils</remote-id>
+	</upstream>
 	<use>
 		<flag name="ads">Enable Active Directory support and create cifs.idmap binary - idmap support</flag>
 		<flag name="caps">Enable <pkg>sys-libs/libcap-ng</pkg> support</flag>
diff --git a/net-fs/libnfs/Manifest b/net-fs/libnfs/Manifest
index b72c8d7c926d..75a409bef88e 100644
--- a/net-fs/libnfs/Manifest
+++ b/net-fs/libnfs/Manifest
@@ -1,7 +1,4 @@
-AUX libnfs-5.0.1-pthread-configure.patch 1220 BLAKE2B c8a21a2bd75aa60d890336bd398171687eab914b588060c2ded2fe2102bad1eb4c29370694889941b2c1d13a46d27e804efb37974e667036f461ee39104d0bc4 SHA512 c07cc4dd5923ecd5ee79e5353c20378d1752d47f34d57939d4db0dcfe0ac57e3e93ceb5834b8581533c7bcf0989cf0cab4ca62da6b2d59e0e9aa7b039e5db713
-DIST libnfs-5.0.1.tar.gz 279550 BLAKE2B d27e97f3dce1385cabd8076b673d2bbfe339ff5a34295ca13bfea2f9c2048f4c6dd07a0b54b7cc7e44aecda58dd21520732dc6ee82260f0694a01fec59875a6a SHA512 71f2dcfa8945c1cb6402f5fca10b1f7a4720f7589807d6130eb55361f05ef4684f9cc9a177ece4e13d3847ac6606924115fac7b27749cecc2f5aca6fa9c63ebf
 DIST libnfs-5.0.2.tar.gz 281154 BLAKE2B 9de3d02e5ae4d41eacda152678e6552708b33d4e88cc6fc5f7b16c887f911fc5a5e834952505438220c961f71a8b70540be3254d5889a4336200d5633dce313e SHA512 6dcf4ea8a01b35beb53694625d20fbebd858a88725c2742671878ad6fe7877999f93d262fb58a435b00c283c3e6fb6fa7222d04bb4540bf674b7ce196e9424f5
-EBUILD libnfs-5.0.1.ebuild 1348 BLAKE2B 56e0e90b0cacca05e4b4f057c65cdc11c0ad97cface8d1abbe433d9127e5c7681a39f83204627b7680921a121c6388cd4ac66ecf6873130d7d6dc4aaab33a7d5 SHA512 9328194e0fea542124a1f300e0482eb7d0b8f8c7c2d13997732839dfb49ba4cbbb9a1d4098276e59113195ceb44cd21d4aee2bdc214f86b97f4b7e9437a5bd77
 EBUILD libnfs-5.0.2.ebuild 1284 BLAKE2B d85ad537a317890c541f0dde8d1e7fa393273767686fcfcafaaf8b154ad48f765c14d1611b2d660f3db3fd2a1807d02241628f1e541590cc36a6f21179354e90 SHA512 13d327810cac55e024c1e2c02c26c567cd3ba5add845f5fa88b9782a39df4f4bfb55b44239213e30390a50e9812a2177f1f4039a3191857ce402709d6dbbd6a1
 EBUILD libnfs-9999.ebuild 1290 BLAKE2B 8285ae200d1b3b5401c0f4e29341b76f8b6f29b37f5c92054659e1fcf1ad736f5e27e71dddd33a2fc7f881892e4b259abcdb38250c9731c88de88209a68100d2 SHA512 b4ad81545e01f3dcc333e54d0dd4d4afc76b410045bd8bc582a642cc0ce583d025d4b8b0182ab3791fe96ae42d292ed8f5caef3250cc7adc5bb8003e9ccf0d53
 MISC metadata.xml 417 BLAKE2B f9c2243fdec47c029b7e581f7e731889342332b5740973d261dd2e353db0cca2728c9b61bcf610204254ebee62bb1eb7cf51b37236d2959536807f6460343fd5 SHA512 f64ea69505b03c25f70e632645efbfcab90ae974ed3909dc90c9cb5df7aefa519a0a54b457df0b3a19b033b9d6c56155163db5b58244cae1f4e8eaa76beeecc7
diff --git a/net-fs/libnfs/files/libnfs-5.0.1-pthread-configure.patch b/net-fs/libnfs/files/libnfs-5.0.1-pthread-configure.patch
deleted file mode 100644
index 91c3781389b4..000000000000
--- a/net-fs/libnfs/files/libnfs-5.0.1-pthread-configure.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-https://github.com/sahlberg/libnfs/pull/380
-
-From af37ac6d766755185dc023b940cfe78a176170a0 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Sun, 3 Apr 2022 04:22:04 +0100
-Subject: [PATCH] autotools: fix syntax error in configure when pthreads
- disabled
-
-Avoids this warning/syntax error in configure when pthreads aren't
-enabled (default):
-```
-checking for special C compiler options needed for large files... no
-checking for _FILE_OFFSET_BITS value needed for large files... no
-./configure: 14227: test: =: unexpected operator
-checking whether SO_BINDTODEVICE is available... yes
-checking whether getpwnam() is available... yes
-```
-
-The LHS of the test will be blank, so use an 'x' to give a dummy
-value, like we do elsewhere.
-
-Signed-off-by: Sam James <sam@gentoo.org>
---- a/configure.ac
-+++ b/configure.ac
-@@ -88,7 +88,7 @@ if test x"$libnfs_cv_HAVE_PTHREAD" = x"yes"; then
-     AC_DEFINE(HAVE_MULTITHREADING,1,[Whether we have multithreading support])
- fi
- fi
--AM_CONDITIONAL([HAVE_PTHREAD], [test $libnfs_cv_HAVE_PTHREAD = yes])
-+AM_CONDITIONAL([HAVE_PTHREAD], [test x$libnfs_cv_HAVE_PTHREAD = xyes])
- 
- AC_MSG_CHECKING(whether SO_BINDTODEVICE is available)
- AC_TRY_COMPILE([#include <net/if.h>], [
-
diff --git a/net-fs/libnfs/libnfs-5.0.1.ebuild b/net-fs/libnfs/libnfs-5.0.1.ebuild
deleted file mode 100644
index 04425c5f0208..000000000000
--- a/net-fs/libnfs/libnfs-5.0.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-if [[ ${PV} == 9999 ]] ; then
-	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 ~riscv ~s390 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/14" # sub-slot matches SONAME major
-IUSE="examples static-libs utils"
-
-# net-libs/rpcsvc-proto for rpcgen called in build system
-BDEPEND="net-libs/rpcsvc-proto
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/libnfs-5.0.1-pthread-configure.patch
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-werror
-		$(use_enable static-libs static)
-		$(use_enable utils)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	if use examples; then
-		# --enable-examples configure switch just compiles them
-		# better install sources instead
-		exeinto /usr/share/doc/${PF}/examples/
-		for program in $(grep PROGRAMS examples/Makefile.am | cut -d= -f2); do
-			doexe examples/${program}.c
-		done
-	fi
-
-	find "${ED}" -name "*.la" -delete || die
-}