gentoo resync : 04.01.2022

6 files changed, 2 insertions, 211 deletions

diff --git a/sys-libs/libcap/Manifest b/sys-libs/libcap/Manifest
index 9f0d907d830f..209f04752858 100644
--- a/sys-libs/libcap/Manifest
+++ b/sys-libs/libcap/Manifest
@@ -2,15 +2,10 @@ AUX libcap-2.21-include.patch 218 BLAKE2B 536be33e749bc818efb29e3a7a010029025520
 AUX libcap-2.25-ignore-RAISE_SETFCAP-install-failures.patch 827 BLAKE2B 0ed207a478c50dd9f3590cd36ab4b37e6c41ddb266709b1bf012cf11dec0c2f8e3f0cbb0918f3be72831321aa8953f936a2706f1038c4ce5287c73dc83887e43 SHA512 d0302604e28ed2354214d315a812422355f98cd69d2b3089dd20cef1e243e4ac433ae47026b57a8f6db66572693ce2523af6cb2a8e4715af266442de7dd33e9b
 AUX libcap-2.38-no_perl.patch 2856 BLAKE2B f10169dab10a60973a5fbbbe55a14342a7a582dd79a40a0ca33f3cc3cbd5c695ef7cfcce28d6448df8875903f53e265b85c6738d8fe8800bfa1e596748deecbe SHA512 6b3fdebe763b7f7300c4e6c16140f95c490e8fdd9a8d7b6ddf250299a32dcbd78b3a3936cf8bbeb381cd305966b37f381a26965e3ff91944ebdac22e810ec49f
 AUX libcap-2.48-build-system-fixes.patch 5591 BLAKE2B 20fce03037ffbd59e3000f7c757d698c412d5709d2a575b5b59197b263097a445684509b2d0b8d77ea0e3e39f7660147e676a12b8e56fc1e2204f8c8a8da1fe7 SHA512 a7e22630b2690b039f9b257dc148868ee9c5b397bab2bd9d6591ab57929be7fb9c75db2a51f08815a618756743299b08537d93eb7507a984eb7bcf086e82ff10
-AUX libcap-2.61-Wformat.patch 723 BLAKE2B c337561e8505a2d6afac05aa9f4b628ac3305c0fe5963d5b8ffd4767e5f8e4e5e01490801b91c2bc6bf676f9b86f95d600def2e3e02ebcee6e9a568e17cbd126 SHA512 810cc4249c0b64f5e7aa5308dfd0d491ace50b02a55b40696b0136a71213e3c600a853a68940411c3cb64a63af4b9c65f839803533ed29e475bfded2b571d51d
-AUX libcap-2.61-ignore-RAISE_SETFCAP-install-failures.patch 813 BLAKE2B 0f2fffffab12d4c1cdd939aae5f8cb0e73073feec92af9f4bf44005a545c991d9649307370061a5dcbaa30285761276549da9253c891fc5ea0108f552c04cd8e SHA512 1ed308be3e66bb315584aa0bf7915893b168850fe9ef7c5035214abc6a2eea5371aaa7f14c2f2790e60c4024e7bb0c08eabb1b8ed63eb22113644d95f057b533
-AUX libcap-2.61-no_perl.patch 2469 BLAKE2B d059cb89175b413f5ddabc2c30e4c8f37226cbd589b936ba0cd94f9529d46abffa2679125e9c8e8f939ef3c7c0e68a1b3b16685ce5b386d82176862a05428bf6 SHA512 0706d6b5ee2d93fe58ae53c9850622b21531af682d4774ecaccb04bab11a45393c46a5c9c64ba3d2df1cf2b25152c72145f66951a9a16ac0452700b503f96d86
 AUX libcap-2.62-ignore-RAISE_SETFCAP-install-failures.patch 901 BLAKE2B 8b4795bfff00f3c42d22bfb748c60109c9fb210082bd0553d5d12c098008900d478a07455251228041be3448cf547ee4ec61217b1fa302feb86175592972bb08 SHA512 c6338a21bd66a4248ea3d35c0c39f864a9cd9c0cb0dd26860739fe3828282ff7e068888b3e39b1439f75f8f57db64cfd3a88542dfbb27ed04f65677e7f8ce632
 DIST libcap-2.49.tar.xz 139568 BLAKE2B 5746dcdf2a737e747450bd50a701ee8543277b17b7fbf1304b79f707a088ea74dc6dc79c61ff89b55b718a460a7b0814f960f44d07944a97b832b78f4e14e07f SHA512 2934a2ded1370edeb9603dbf43d8ca23a2eb5d67efc5cec5d4ba96c707a8db2702da8aa9be0cb86c5ff100d37ec96115c7777a7566ad0ab2e0b4a288bbe357d0
-DIST libcap-2.61.tar.xz 173892 BLAKE2B 50874d3510ab2476aaceb775314d98744736aacd7364a23827756caa160c101e8bc890b7c33b5e19df8b30bb6b3b1c2be323e4b6a963f97e9ee557e86b4f13a0 SHA512 40096bf511d1c45e36f5d7f24e49c709528f3f01fcadd47b6ac40a7e8d5f1705b29b4cc56356b030639f67d0641b9f4e7c19449c3c7f4f77a4070c35745b465c
 DIST libcap-2.62.tar.xz 174772 BLAKE2B e3c86a5b88b9be932802ec8612f79e5f04912bf3e66f673eae2add85362292f4737c544d21b9e5adfd1a7a33c073568301b6532cdf0ea6c8b834d895b84323f1 SHA512 61ac004920c5cd3382a5443db2eacfc2041b7a8c0814b27084c1d111125639fe3950dea4325d0f7fb6bfb0d5de114452c3a62230cc958edb05ffdb83b213f9b3
 EBUILD libcap-2.49-r1.ebuild 2127 BLAKE2B d77712422b1cb13b04b1a18e573c20151b03098a9effaee4a62b51f4035eac2f3dcc2760f6050d05220dca63edbd978df79299e6be4c885a73ec7a079d1cd558 SHA512 fb01c7f3c68d3fa55221bc0602c21ddb399121f97a0a3c9ef5788bbecb3912cc9f9924bd0339e27acc3103d3a1e110b4029f99c27a7232fd83229075383d898b
-EBUILD libcap-2.61.ebuild 2327 BLAKE2B 61e1631f43cd316cfd686955d6de0cb7d523765a852b22b9076ef526dffdf84cf5c74214b1ae41bf5ac533106372c4181f3ed3f705cfd7274d92a5c4a33e8ac0 SHA512 cbc4c7ec717ed9aed891d5a138fb860d4729664c07af33f1e5ad969818d249629a116c89d780d40eb50d336c7c895f51eb4b33b67b3d5367d6126b7d50173cba
-EBUILD libcap-2.62.ebuild 2247 BLAKE2B 49662d63bdc19e25c546951201fb3f5810c539192d26e28787792634328a2765c00d924e68856cebe0c98157f52ea7c07349e0aa0ce77673bdb8227406d25752 SHA512 054edd4c07258701adacff1bcd44bee955615eaf4a6b51b174b43adb7820040c9c29ef3331552ff5e33065a8ac6b0a3e364956001ab42f6a749896ee7a2e19b6
+EBUILD libcap-2.62.ebuild 2239 BLAKE2B 611e112d0305490791390c3db0af7f6a03b34b0518e4159fe7d2366e95242d6da779fff50cc36a6f62cdf32db9c65ec8ecbfba46ce54738e67c4790048d302c4 SHA512 41cd064b3e53b7d888cb91a74c7572f6e7dc2ee2b6eebe8683b24b836be871e0e12928bf88587b8a2cd5526bec0246eb2e100654ae6a9fc5dd6c7840eb128d2d
 EBUILD libcap-9999.ebuild 2164 BLAKE2B 6d44b9aadf000c40c8dd9c77fb88623fd24f7ea5f14c13515b3a3c06b1d1f615f8cf33876c51a17e553f3c76c553e1f1387f7caa7dc1dc333926616972e4ccfe SHA512 701d3d42487dc00e88a9101846b0f59976dc6baba977c045806c7986c08700496e5596019c1b7de084125ec1380252219dce86b3cf9461a7350c75d779762a24
 MISC metadata.xml 438 BLAKE2B b5260cc84a3fe6b992bb6218846c738af296522d7a467337c05a6240fd07fc9d6cece779bd9fcf24a11486a70874e17acae8182647d307a31cf43e1c19c3a2d3 SHA512 fa3713dcf6b7bb2ea6d4c2fdefc05e92ae345c76a6187ebcb40dab8c4ce0148650a8301f236efcb8cf53fff25730977a385578dbaa160b800159c6d6abbf37a9
diff --git a/sys-libs/libcap/files/libcap-2.61-Wformat.patch b/sys-libs/libcap/files/libcap-2.61-Wformat.patch
deleted file mode 100644
index e0046de58770..000000000000
--- a/sys-libs/libcap/files/libcap-2.61-Wformat.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 9fd3e7ac5870f84c73ac777d9a14480227ad7f00 Mon Sep 17 00:00:00 2001
-From: David Seifert <soap@gentoo.org>
-Date: Sun, 28 Nov 2021 14:14:42 +0100
-Subject: [PATCH] Fix `-Wformat` on 32-bit platforms
-
----
- libcap/cap_test.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libcap/cap_test.c b/libcap/cap_test.c
-index b7fb2c5..39df261 100644
---- a/libcap/cap_test.c
-+++ b/libcap/cap_test.c
-@@ -124,7 +124,7 @@ static int test_short_bits(void)
-     }
-     if (strlen(tmp) > __CAP_NAME_SIZE) {
- 	printf("cap_to_text buffer size reservation needs fixing (%ld > %d)\n",
--	       strlen(tmp), __CAP_NAME_SIZE);
-+	       (long int)strlen(tmp), __CAP_NAME_SIZE);
- 	result = -1;
-     }
-     free(tmp);
--- 
-2.34.1
-
diff --git a/sys-libs/libcap/files/libcap-2.61-ignore-RAISE_SETFCAP-install-failures.patch b/sys-libs/libcap/files/libcap-2.61-ignore-RAISE_SETFCAP-install-failures.patch
deleted file mode 100644
index 25f853b2a982..000000000000
--- a/sys-libs/libcap/files/libcap-2.61-ignore-RAISE_SETFCAP-install-failures.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 8dfcdcfdcb9c462a05566aa8d3c6eca871f0ddbf Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Wed, 10 Feb 2016 09:52:45 +0100
-Subject: [PATCH] ignore RAISE_SETFCAP install failures
-
-While the new RAISE_SETFCAP feature is nifty, its failure to run (often
-due to the fs not supporting it) shouldn't impair the default install.
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
-
-Forward ported from libcap-2.20 to libcap-2.25
-
-Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
---- a/progs/Makefile
-+++ b/progs/Makefile
-@@ -39,7 +39,7 @@
- 		install -m 0755 $$p $(FAKEROOT)$(SBINDIR) ; \
- 	done
- ifeq ($(RAISE_SETFCAP),yes)
--	$(FAKEROOT)$(SBINDIR)/setcap cap_setfcap=i $(FAKEROOT)$(SBINDIR)/setcap
-+	-$(FAKEROOT)$(SBINDIR)/setcap cap_setfcap=i $(FAKEROOT)$(SBINDIR)/setcap
- endif
- 
- test:
diff --git a/sys-libs/libcap/files/libcap-2.61-no_perl.patch b/sys-libs/libcap/files/libcap-2.61-no_perl.patch
deleted file mode 100644
index 3d42a4dc6135..000000000000
--- a/sys-libs/libcap/files/libcap-2.61-no_perl.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 3f76418eaf73896489129c529fac021e4f3a03c0 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Wed, 21 Nov 2018 11:00:54 +0100
-Subject: [PATCH] use awk/sed instead of perl for creating header files
-
-More systems should have awk/sed than perl.
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
-
-Forward ported from libcap-2.22 to libcap-2.26
-and incorporated the gperf-3.1 fix provided by Mike Gilbert
-<floppym@gentoo.org>
-Forward ported from libcap-2.26 to libcap-2.28
-Forward ported from libcap-2.28 to libcap-2.38
-
-Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
---- a/libcap/Makefile
-+++ b/libcap/Makefile
-@@ -20,6 +20,8 @@
- 
- # Always build libcap sources this way:
- CFLAGS += -fPIC
-+AWK = awk
-+SED = sed
- 
- # The linker magic needed to build a dynamic library as independently
- # executable
-@@ -82,8 +84,18 @@
- 	./_makenames > cap_names.h
- 
- $(GPERF_OUTPUT): cap_names.list.h
--	perl -e 'print "struct __cap_token_s { const char *name; int index; };\n%{\nconst struct __cap_token_s *__cap_lookup_name(const char *, size_t);\n%}\n%%\n"; while ($$l = <>) { $$l =~ s/[\{\"]//g; $$l =~ s/\}.*// ; print $$l; }' < $< | gperf --ignore-case --language=ANSI-C --readonly --null-strings --global-table --hash-function-name=__cap_hash_name --lookup-function-name="__cap_lookup_name" -c -t -m20 $(INDENT) > $@
--	sed -e 's/unsigned int len/size_t len/' -i $@
-+	(printf "%b" "struct __cap_token_s { const char *name; int index; };\n%%\n"; \
-+	$(SED) -e 's:["{}]::g' -e 's:,$$::' $<) | \
-+	gperf \
-+		--ignore-case \
-+		--language=ANSI-C \
-+		--includes \
-+		--readonly \
-+		--null-strings \
-+		--global-table \
-+		--hash-function-name=__cap_hash_name \
-+		--lookup-function-name="__cap_lookup_name" \
-+		-c -t -m20 $(INDENT) > $@
- 
- # Intention is that libcap keeps up with torvalds' tree, as reflected
- # by this maintained version of the kernel header. libcap dynamically
-@@ -92,7 +104,7 @@
- UAPI_HEADER := $(topdir)/libcap/include/uapi/linux/capability.h
- cap_names.list.h: Makefile $(UAPI_HEADER)
- 	@echo "=> making $@ from $(UAPI_HEADER)"
--	perl -e 'while ($$l=<>) { if ($$l =~ /^\#define[ \t](CAP[_A-Z]+)[ \t]+([0-9]+)\s+$$/) { $$tok=$$1; $$val=$$2; $$tok =~ tr/A-Z/a-z/; print "{\"$$tok\",$$val},\n"; } }' $(UAPI_HEADER) | fgrep -v 0x > $@
-+	$(AWK) '($$0 ~ /^#define[[:space:]]+CAP[_A-Z]+[[:space:]]+[0-9]+[[:space:]]*$$/) { printf "{\"%s\",%s},\n", tolower($$2), $$3 }' $(UAPI_HEADER) > $@
- 
- $(STACAPLIBNAME): $(CAPOBJS)
- 	$(AR) rcs $@ $^
diff --git a/sys-libs/libcap/libcap-2.61.ebuild b/sys-libs/libcap/libcap-2.61.ebuild
deleted file mode 100644
index ad5ca82adcb8..000000000000
--- a/sys-libs/libcap/libcap-2.61.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-minimal toolchain-funcs pam usr-ldscript
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/libcap/libcap.git"
-else
-	SRC_URI="https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/${P}.tar.xz"
-
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-DESCRIPTION="POSIX 1003.1e capabilities"
-HOMEPAGE="https://sites.google.com/site/fullycapable/"
-
-# it's available under either of the licenses
-LICENSE="|| ( GPL-2 BSD )"
-SLOT="0"
-IUSE="pam static-libs tools"
-
-# While the build system optionally uses gperf, we don't DEPEND on it because
-# the build automatically falls back when it's unavailable.  #604802
-PDEPEND="pam? ( sys-libs/pam[${MULTILIB_USEDEP}] )"
-DEPEND="${PDEPEND}
-	sys-kernel/linux-headers"
-BDEPEND="
-	sys-apps/diffutils
-	tools? ( dev-lang/go )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.61-no_perl.patch
-	"${FILESDIR}"/${PN}-2.61-ignore-RAISE_SETFCAP-install-failures.patch
-	"${FILESDIR}"/${PN}-2.61-Wformat.patch
-)
-
-QA_FLAGS_IGNORED="sbin/captree" # go binaries don't use LDFLAGS
-
-src_prepare() {
-	default
-	multilib_copy_sources
-}
-
-run_emake() {
-	local args=(
-		AR="$(tc-getAR)"
-		CC="$(tc-getCC)"
-		OBJCOPY="$(tc-getOBJCOPY)"
-		RANLIB="$(tc-getRANLIB)"
-		exec_prefix="${EPREFIX}"
-		lib_prefix="${EPREFIX}/usr"
-		lib="$(get_libdir)"
-		prefix="${EPREFIX}/usr"
-		PAM_CAP="$(usex pam yes no)"
-		DYNAMIC=yes
-		GOLANG="$(multilib_native_usex tools yes no)"
-	)
-	emake "${args[@]}" "$@"
-}
-
-src_configure() {
-	tc-export_build_env BUILD_CC
-	multilib-minimal_src_configure
-}
-
-multilib_src_compile() {
-	run_emake
-}
-
-multilib_src_test() {
-	run_emake test
-}
-
-multilib_src_install() {
-	# no configure, needs explicit install line #444724#c3
-	run_emake DESTDIR="${D}" install
-
-	gen_usr_ldscript -a cap
-	gen_usr_ldscript -a psx
-	if ! use static-libs ; then
-		rm "${ED}"/usr/$(get_libdir)/lib{cap,psx}.a || die
-	fi
-
-	# install pam plugins ourselves
-	rm -rf "${ED}"/usr/$(get_libdir)/security || die
-
-	if use pam ; then
-		dopammod pam_cap/pam_cap.so
-		dopamsecurity '' pam_cap/capability.conf
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc CHANGELOG README doc/capability.notes
-}
diff --git a/sys-libs/libcap/libcap-2.62.ebuild b/sys-libs/libcap/libcap-2.62.ebuild
index 811890277ff9..6f1eb8a076a3 100644
--- a/sys-libs/libcap/libcap-2.62.ebuild
+++ b/sys-libs/libcap/libcap-2.62.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999 ]]; then
 else
 	SRC_URI="https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/${P}.tar.xz"
 
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="POSIX 1003.1e capabilities"