gentoo Easter resync : 12.04.2020

4 files changed, 3 insertions, 123 deletions

diff --git a/dev-libs/xmlsec/Manifest b/dev-libs/xmlsec/Manifest
index 65890cd2c421..9a8dec009610 100644
--- a/dev-libs/xmlsec/Manifest
+++ b/dev-libs/xmlsec/Manifest
@@ -1,6 +1,3 @@
-AUX xmlsec-1.2.28-test.patch 2418 BLAKE2B e5cf92fd7f72be16d95fe67da99c96fc8e1bc8e7dadbfdbf5970ff7c148aa95868c2a4db8a03e86a2b67dd54c6bb71f0409bc4e075ad2b7148da1f489e672dee SHA512 48e72e197a23d4a0f3c7679dad438b1d9e140f2c9a311959748d432c543e4f48d32a52a4f65bd971d0263038cf6fde4a753e0eb2616ac6d5db092279cdc08b46
-DIST xmlsec1-1.2.28.tar.gz 1995599 BLAKE2B 5d90646d9a72024856da2638adb6d0d00d5142f8d3eaa5b12a993e2e6ae78ad49aab69822ebe331191bf1fc5b98431b85e113545aec84e2bb7d5c5add9028df0 SHA512 17fa59e4ffee5e024caa4895e8ed21d1435f14e3a37d0ed781b1dd216333ae3b6099c460efd45d4a8097d0202522150b7b0ad543b47c1596d8473b6922270480
 DIST xmlsec1-1.2.29.tar.gz 1989360 BLAKE2B a0057ddf2d641745933f8d788c5358b4bb17892ed175ef11a9041a34ff1f91d0ffe6cb90316308805b5bc2157b9c2e211b37731ff8cfc7723a85f349543aa7a6 SHA512 07c3012179da4392f0a9d41a51ed51d692ca8b491310488b955d5fef0637f104d3f82374754b0ef175fadc663a8ca8c996178198c5dd77b3a8b34393d1482e4d
-EBUILD xmlsec-1.2.28.ebuild 1398 BLAKE2B 577a2435ca1e9602124663b49ee1e26fde53ab7fc663cec6d1ba7b59bd59c4fb7d5a59639305bf14bfd344a5c78ae94be807511802e43ba824a2108b5dc0b684 SHA512 11992998c302c12264340cadeb23a6d57e41a824521dcc90bf98530855cd7143f651870529357684bffce2da5aa52925756731a17ce950df39f7e185e090db84
-EBUILD xmlsec-1.2.29.ebuild 1359 BLAKE2B 004a90178fd0fbea93a3424460ebfb8af3bdb19ec7a04902a222651953f9ae73c5ceb0b210776a58013b6238ce35e6e3b4d8ef0fe069a7fcf2712b4523121df8 SHA512 d864c1e1e87056688e8a83b3da041b2195deeb6ed0fdd2f9930bbf8caeeca2b5893e3b94f3b2f1d90d99293069c80086c0c3c3f0edfdbbebb7062d6fa4cf3523
+EBUILD xmlsec-1.2.29.ebuild 1354 BLAKE2B dc08955d8dd5d37e6456651833464d70ae34a8022e5db0741e2f7c15dcc49644098c88a9b5b39e02909c64bac280ac9623e0c14cab4466a4ae753ab45a2cce60 SHA512 266655be4f1f537cd8fd9db761b9c5101e63bc6287330ce25074403fb5b7633de477255c0ff4cbf66d4b3ad5f6b891c15535a7676073fbc8c3bf4e0bb97614df
 MISC metadata.xml 414 BLAKE2B 265c7a10b540266026188b46fbe6f609d83946a5ceadae090bed44b981e9c37599b86c506ea16d06d62bde58d804f042d01eb5e9a96fd9480671ae3e423040d3 SHA512 6192225c849da5ac481f102aa6e7ca91d4222623eb84d42d5313ecd9280a4fec8ac819ed74c0b761986c60532b5ec5061d0998e20c77c5dae0abd058ecb039d7
diff --git a/dev-libs/xmlsec/files/xmlsec-1.2.28-test.patch b/dev-libs/xmlsec/files/xmlsec-1.2.28-test.patch
deleted file mode 100644
index ae80e1fa5f36..000000000000
--- a/dev-libs/xmlsec/files/xmlsec-1.2.28-test.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 3d5c9e38d9576aea252ba186dd2913c57a7a8dd8 Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev <alon.barlev@gmail.com>
-Date: Tue, 16 Apr 2019 23:07:08 +0300
-Subject: [PATCH] tests: workout test --X509-skip-strict-checks
-
-Apply --X509-skip-strict-checks parameter to verify commands.
-
-[PORT]
-
-Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
----
-diff --git a/tests/testrun.sh b/tests/testrun.sh
-index ea65802b..9950d4fb 100755
---- a/tests/testrun.sh
-+++ b/tests/testrun.sh
-@@ -59,7 +59,7 @@ if [ "z$XMLSEC_DEFAULT_CRYPTO" != "z" ] ; then
- elif [ "z$crypto" != "z" ] ; then
-     xmlsec_params="$xmlsec_params --crypto $crypto"
- fi
--xmlsec_params="$xmlsec_params --X509-skip-strict-checks --crypto-config $crypto_config"
-+xmlsec_params="$xmlsec_params --crypto-config $crypto_config"
- 
- #
- # Setup keys config
-@@ -308,8 +308,9 @@ execDSigTest() {
-     # run tests
-     if [ -n "$params1" ] ; then
-         printf "    Verify existing signature                            "
--        echo "$VALGRIND $xmlsec_app verify $xmlsec_params $params1 $full_file.xml" >> $curlogfile
--        $VALGRIND $xmlsec_app verify $xmlsec_params $params1 $full_file.xml >> $curlogfile 2>> $curlogfile
-+        params1="$(echo $params1 | sed 's/--X509-skip-strict-checks//')"
-+        echo "$VALGRIND $xmlsec_app verify --X509-skip-strict-checks $xmlsec_params $params1 $full_file.xml" >> $curlogfile
-+        $VALGRIND $xmlsec_app verify --X509-skip-strict-checks $xmlsec_params $params1 $full_file.xml >> $curlogfile 2>> $curlogfile
-         printRes $expected_res $?
-         if [ $? != 0 ]; then
-             failures=`expr $failures + 1`
-@@ -328,8 +328,9 @@ execDSigTest() {
- 
-     if [ -n "$params3" -a -z "$PERF_TEST" ] ; then
-         printf "    Verify new signature                                 "
--        echo "$VALGRIND $xmlsec_app verify $xmlsec_params $params3 $tmpfile" >> $curlogfile
--        $VALGRIND $xmlsec_app verify $xmlsec_params $params3 $tmpfile >> $curlogfile 2>> $curlogfile
-+        params3="$(echo $params3 | sed 's/--X509-skip-strict-checks//')"
-+        echo "$VALGRIND $xmlsec_app verify --X509-skip-strict-checks $xmlsec_params $params3 $tmpfile" >> $curlogfile
-+        $VALGRIND $xmlsec_app verify --X509-skip-strict-checks $xmlsec_params $params3 $tmpfile >> $curlogfile 2>> $curlogfile
-         printRes $res_success $?
-         if [ $? != 0 ]; then
-             failures=`expr $failures + 1`
--- 
-2.21.0
-
diff --git a/dev-libs/xmlsec/xmlsec-1.2.28.ebuild b/dev-libs/xmlsec/xmlsec-1.2.28.ebuild
deleted file mode 100644
index e81558aad10c..000000000000
--- a/dev-libs/xmlsec/xmlsec-1.2.28.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-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 libressl 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? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig
-	test? (
-		nss? (
-			>=dev-libs/nss-3.9[utils]
-		)
-	)"
-
-S="${WORKDIR}/${PN}1-${PV}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-test.patch"
-)
-
-src_configure() {
-	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() {
-	emake TMPFOLDER="${T}" check
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/xmlsec/xmlsec-1.2.29.ebuild b/dev-libs/xmlsec/xmlsec-1.2.29.ebuild
index 547b993cd220..5f12985e1172 100644
--- a/dev-libs/xmlsec/xmlsec-1.2.29.ebuild
+++ b/dev-libs/xmlsec/xmlsec-1.2.29.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="amd64 ~arm arm64 ppc ppc64 ~sparc x86"
 IUSE="doc gcrypt gnutls libressl nss +openssl static-libs test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="|| ( gcrypt gnutls nss openssl )