gentoo resync : 20.03.2022

5 files changed, 3 insertions, 160 deletions

diff --git a/dev-libs/xmlsec/Manifest b/dev-libs/xmlsec/Manifest
index 29e15636a41e..fc36215098f9 100644
--- a/dev-libs/xmlsec/Manifest
+++ b/dev-libs/xmlsec/Manifest
@@ -1,10 +1,5 @@
-AUX xmlsec-1.2.31-fix-nss-3.59.patch 980 BLAKE2B fb0d28e3a33a2d581796f03f2121f08c26cb964a727876a1bc7a1b9e63f92056a0213d315a0accc94bb582d9224fcbe10ef0c95528f70f29d6d69a34fa5e342d SHA512 a1857ad89b0d4d20d92deda23112abac814b312525a662af85edc44150c78e58fe54142d0cc92857e01a14719e698a810585df350ea4844544328eb7848b4680
-DIST xmlsec1-1.2.30.tar.gz 1989670 BLAKE2B b363d1661ba5fdf968725948598954c7d514ad92c4ad05b490aa3ac9ffb6be861ee81d660be30d37e26ae1cb327cdecd1c76d60055ec5aa900e390a4083099b3 SHA512 07152470a9fe5d077f8a358608ca1d8a79ee0d2777660f61ed5717dc640714a3adfe66843e6a4023898eb0f5ed79771d70c41132571f3a1aeda82c1894b69c98
-DIST xmlsec1-1.2.31.tar.gz 1989144 BLAKE2B ddc55e34867d5870fa434c739825ceaa68500a11fb2eabb482945901ad7fa0ba0d5fce7cd6c5f1b49c24d5bc07cee2875ff21833f09c0ec2ffeaf63875f5b001 SHA512 7a0e3d6f66746a22cf6468eb4d0691879c7468e4bef71fd8720e6a56b420f076a1d8a3094c35e721471dd029a643f5c4a553ef5788be5509f2786a419da1b7af
 DIST xmlsec1-1.2.32.tar.gz 1989258 BLAKE2B a1325f682efec42dbcdb066d3c242fb435daa721349905564b05829153e5337b772fbf6b996f4d249d669d76fa584055f8bec1630c4936c27fd330cda439522d SHA512 39a90e154fe760b9cb01090c0232aa6c88c595fea87a771bebdd7b38ab274e3be719d6314065d9f02b854c7be9c8ec3557e57e0158ff3696413de3424f14389e
 DIST xmlsec1-1.2.33.tar.gz 1991955 BLAKE2B d6bb68ad4ceb936d51165a4ef48824a8cb5d550670ca6015eb9916121555a1a32b3f47774eab1efc2bc5031346f22a0b21115a220dbeb44bba773412f2292bc5 SHA512 6354554b5cdc0a1389f6991efeac919bea912330b36d3be3d3496d61331e9edd2771786d50d2571a439f62ccfc3bd32be0a50bb5a037c4993aac076ad94b46e8
-EBUILD xmlsec-1.2.30.ebuild 1339 BLAKE2B 35fc887e954129bdeafd206a7bab29a04dce23b7d27b29b92bf0908f16a0393cf806423a932a8e0c4676d1b35c0f0d8ff3040cecbafb31aa4754dcbfdab517e2 SHA512 8f8680ef311ab24b814de101aeab5805f5b1da155bf799a0052334e516d301d22bbd2d33e51044902dee1f53a2dbdee840b6d6ac4e68315cef7a7c4fd68d0f82
-EBUILD xmlsec-1.2.31.ebuild 1390 BLAKE2B 80c4d0d4d9940651dedc1ce3f50c023b61422ffd686a14110f68470abad796d57ce0e88608cbf0f306ec6c8382ec5a7f2739503281bdfcf53388f803c04baabb SHA512 7fd7b30b8885c611a88df01a84bdb9924c60d376defc1126778ae5052947a6e58d10a118cf670836ad8eb52eeb79e22b792d151642bfc3aa48c15e309a76038c
 EBUILD xmlsec-1.2.32.ebuild 1345 BLAKE2B 0798c9743661798fb75d386fa0e11bffee38378637eddd9f5c310b1e15d44555cf437a128185cd8af8296c531ced8d26b1926e07bae5c6382816750d6a950e87 SHA512 4ed8cc44c6d57c18ed29121fd638944a1ec6a6d5bc7fbe8f70621ec18a885694eebb8f5c24f93853f79304158d9d2ade4e1eae4c0a3de3627f5f474919c397f7
-EBUILD xmlsec-1.2.33.ebuild 1440 BLAKE2B e28b75dd2403d4db30d9680e29c2ff6dd84ed73ed815bb5df32467a4b2b145040e057bf4ec8393ad9c8d93bfdc0630b14827d2f90a809a30c2be73226c3a704f SHA512 dc356ad0d12cbf660a8375bd49e67252d456864611d4be8a22e0b0d518857abb67aa8e79960a2a6d9932010828f66f0f576b431e8915760f6220ea3225b654ba
+EBUILD xmlsec-1.2.33.ebuild 1434 BLAKE2B efd38d2bacfc6cac33c5549b059bfc854d6cbced4c0c2a3c8e2471cbb7bcb79489d59cb62dbe03a4392316f7d9b0466e0d6c192e0439fa21afe9da5a0a5849d6 SHA512 321c2baac60d9f2e9ff4785a49820f1e9dc6098fe73fc61cfce43ed2f8882b9025673e91cb4c5f2b7353b1ba6149a1f0d67ee1a1240f0454a2660c918a316e4d
 MISC metadata.xml 493 BLAKE2B 3d3367384e8710f936e711a447ff8b2e29b66d597fb4ae77003d3860fa64647b1c235c65896d849d35ad0ced81c694436c22d644c2dd1bef7bb87d4aeaf567ad SHA512 ef0db238a551baaa696695d501bd740a37a16d33e3406343fcb0948346afc7c290c9a51aa11ae0b640d7040bf9aaad1868085bc899aab173cd33f22c1cae5f60
diff --git a/dev-libs/xmlsec/files/xmlsec-1.2.31-fix-nss-3.59.patch b/dev-libs/xmlsec/files/xmlsec-1.2.31-fix-nss-3.59.patch
deleted file mode 100644
index b70b8cf2d61b..000000000000
--- a/dev-libs/xmlsec/files/xmlsec-1.2.31-fix-nss-3.59.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-https://bugs.gentoo.org/764437
-https://github.com/lsh123/xmlsec/commit/f3a59c721e38a663405093e2bbb30e2bf45853a2.patch
-From f3a59c721e38a663405093e2bbb30e2bf45853a2 Mon Sep 17 00:00:00 2001
-From: lsh123 <aleksey@aleksey.com>
-Date: Fri, 18 Dec 2020 16:22:40 -0800
-Subject: [PATCH] Remove MD5 for NSS 3.59 and above; enable nss test on osx and
- mingw (issue #305) (#306)
-
----
- include/xmlsec/nss/crypto.h      | 6 ++++++
- 2 files changed, 10 insertions(+), 3 deletions(-)
-
-diff --git a/include/xmlsec/nss/crypto.h b/include/xmlsec/nss/crypto.h
-index 223c1d85..614ac931 100644
---- a/include/xmlsec/nss/crypto.h
-+++ b/include/xmlsec/nss/crypto.h
-@@ -19,6 +19,12 @@
- #include <xmlsec/transforms.h>
- #include <xmlsec/dl.h>
- 
-+
-+/* MD5 was removed from NSS */
-+#if (NSS_VMAJOR > 3) || ((NSS_VMAJOR == 3) && (NSS_VMINOR > 58))
-+#define XMLSEC_NO_MD5 1
-+#endif /* (NSS_VMAJOR > 3) || ((NSS_VMAJOR == 3) && (NSS_VMINOR > 58)) */
-+
- #ifdef __cplusplus
- extern "C" {
- #endif /* __cplusplus */
diff --git a/dev-libs/xmlsec/xmlsec-1.2.30.ebuild b/dev-libs/xmlsec/xmlsec-1.2.30.ebuild
deleted file mode 100644
index ec33de36d7a6..000000000000
--- a/dev-libs/xmlsec/xmlsec-1.2.30.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Command line tool for signing, verifying, encrypting and decrypting XML"
-HOMEPAGE="https://www.aleksey.com/xmlsec"
-SRC_URI="https://www.aleksey.com/xmlsec/download/${PN}1-${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~sparc x86"
-IUSE="doc gcrypt gnutls nss +openssl static-libs test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="|| ( gcrypt gnutls nss openssl )
-	gnutls? ( gcrypt )"
-
-RDEPEND=">=dev-libs/libxml2-2.7.4:=
-	>=dev-libs/libxslt-1.0.20:=
-	gcrypt? ( >=dev-libs/libgcrypt-1.4.0:0= )
-	gnutls? ( >=net-libs/gnutls-2.8.0:= )
-	nss? (
-		>=dev-libs/nspr-4.4.1:=
-		>=dev-libs/nss-3.9:=
-	)
-	openssl? (
-		dev-libs/openssl:0=
-	)"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig
-	test? (
-		nss? (
-			>=dev-libs/nss-3.9[utils]
-		)
-	)"
-
-S="${WORKDIR}/${PN}1-${PV}"
-
-src_configure() {
-	# Bash because of bug #721128
-	CONFIG_SHELL=${BASH} econf \
-		$(use_enable doc docs) \
-		$(use_enable static-libs static) \
-		$(use_with gcrypt) \
-		$(use_with gnutls) \
-		$(use_with nss nspr) \
-		$(use_with nss) \
-		$(use_with openssl) \
-		--enable-mans \
-		--enable-pkgconfig
-}
-
-src_test() {
-	SHELL=${BASH} emake TMPFOLDER="${T}" check
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/xmlsec/xmlsec-1.2.31.ebuild b/dev-libs/xmlsec/xmlsec-1.2.31.ebuild
deleted file mode 100644
index 625dcba4bd42..000000000000
--- a/dev-libs/xmlsec/xmlsec-1.2.31.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Command line tool for signing, verifying, encrypting and decrypting XML"
-HOMEPAGE="https://www.aleksey.com/xmlsec"
-SRC_URI="https://www.aleksey.com/xmlsec/download/${PN}1-${PV}.tar.gz"
-S="${WORKDIR}/${PN}1-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~sparc x86"
-IUSE="doc gcrypt gnutls nss +openssl static-libs test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="|| ( gcrypt gnutls nss openssl )
-	gnutls? ( gcrypt )"
-
-RDEPEND=">=dev-libs/libxml2-2.7.4:=
-	>=dev-libs/libxslt-1.0.20:=
-	gcrypt? ( >=dev-libs/libgcrypt-1.4.0:0= )
-	gnutls? ( >=net-libs/gnutls-2.8.0:= )
-	nss? (
-		>=dev-libs/nspr-4.4.1:=
-		>=dev-libs/nss-3.9:=
-	)
-	openssl? (
-		dev-libs/openssl:0=
-	)"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig
-	test? (
-		nss? (
-			>=dev-libs/nss-3.9[utils]
-		)
-	)"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-nss-3.59.patch"
-)
-
-src_configure() {
-	# Bash because of bug #721128
-	CONFIG_SHELL=${BASH} econf \
-		$(use_enable doc docs) \
-		$(use_enable static-libs static) \
-		$(use_with gcrypt) \
-		$(use_with gnutls) \
-		$(use_with nss nspr) \
-		$(use_with nss) \
-		$(use_with openssl) \
-		--enable-mans \
-		--enable-pkgconfig
-}
-
-src_test() {
-	SHELL=${BASH} emake TMPFOLDER="${T}" check
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/xmlsec/xmlsec-1.2.33.ebuild b/dev-libs/xmlsec/xmlsec-1.2.33.ebuild
index 7f1d3ad81256..c2c0fecd89b1 100644
--- a/dev-libs/xmlsec/xmlsec-1.2.33.ebuild
+++ b/dev-libs/xmlsec/xmlsec-1.2.33.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -10,7 +10,7 @@ S="${WORKDIR}/${PN}1-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86"
 IUSE="doc gcrypt gnutls nss +openssl static-libs test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="|| ( gcrypt gnutls nss openssl )