gentoo resync : 28.04.2019

7 files changed, 4 insertions, 146 deletions

diff --git a/dev-libs/xml-security-c/Manifest b/dev-libs/xml-security-c/Manifest
index cc3b8d07c87d..d62ad5ed58fd 100644
--- a/dev-libs/xml-security-c/Manifest
+++ b/dev-libs/xml-security-c/Manifest
@@ -1,9 +1,4 @@
-AUX xml-security-c-1.6.1-nss-compilation-fix.patch 498 BLAKE2B f6469e552ad6cb300556e80c52c881c64123fb34dbce83fe4d77eb2c48de0f20ac4605edc4d2f2712f991b2b55ffdee9f7d91409cbc5dadf7960b2c5c978692a SHA512 cef34103931356f68a250a89f195e4ad0e67a116c6d0de2ab07407f607d70bec0c1e8d57d9eefa47c8bee7f5750668963409a4d740cead239b7ad16665515bb2
-AUX xml-security-c-1.7.3-fix-c++14.patch 1182 BLAKE2B f534183150d2015b42563bd20ba6a39afbad8469d0af6d6746cc36608911e6fa06f8340611760df7e4c3aea8e1ba8d2ef656aaa0712e5453caedca401361fcf9 SHA512 b1a0154b1a973e8ae4f4687c319694b2b6d22dc20385c2e74e27bf00a1887734075da27e10a48d3204d72d35baa55aaba1965984b75512097a0cc38b192211a1
 AUX xml-security-c-2.0.2-libressl.patch 2224 BLAKE2B 076555d874526180d9842599cbb788819e6b8508d1c11dd20a63ad681e4a2d256b8d3b0d80cfcf6d23741cb735bdc5845a72226bd56526ba24e24f5155374b5f SHA512 f248594d5fadd960d6437b5c17ad12db5455dc1ee3b30849f0c394fbf4ac8e85b3a575a833e0878ca5c6fb2a264878b86e3656a21f3038a105c1162253ce446e
-DIST xml-security-c-1.7.3.tar.gz 909320 BLAKE2B 5fa9f3ae53b93104c191b76f8ae4f9dad69c690d409ae3f13864cf011bbbca740c5378c0718abb496811c9814b5a7f237042af22e697bfa2e5044668ff3fbd2d SHA512 ea46709d6706edf345e19132d9998774e50dc7b5947a7b4a55e3627998f5ac66f976fdff0a5015ef3cee73c03c04f3c4cf993efd397082491c2000c6548b89d2
 DIST xml-security-c-2.0.2.tar.gz 904933 BLAKE2B 8e336dd7539778411755a8d45398daa530a2f602a0d57faa29301d1f0b29ab0a61c3f47ead42b740337ea75a28e03f471ae6735d5cd66d31f56d3d5fe3405b1b SHA512 bebadee2daf27181f5bcc955a909397976e8fd2e67f5e546f5adbede0ca790647cbec9181b0b609da59d525ff3baa9f899af2a3d815bc7a2f3a57bd8b30c011b
-EBUILD xml-security-c-1.7.3.ebuild 963 BLAKE2B 7a2ff075d5996cb995df3e3da595adf636ff4b1a92b73c56e2ae6794b0f1de964a2c5d80738bff05daf80f6758c5fe86e104432f7c9de441d8521ad18d63ca9c SHA512 25370e42290a4d3787af196930b106030ec66d5ffef0277bcfe1afa08b8b853ea929a17e021a1c51ca1c69df38c74c0ca1fff17eee75a0a09e0a3c4658136ba1
-EBUILD xml-security-c-2.0.2-r1.ebuild 907 BLAKE2B 932b2c45d8e9bf2438baa48b75cc148355029bbd86433fee61b507dc114215539d73349dc4fc373ebce7b4ba7b85672e32d0d5d38789775527aa73ac1b1650ec SHA512 e67202e3f24ce6c3c00b932ed08edb41188592a98cd3cd98d169f172e0541787f266deb0fa0da2688caad9b7661cdeb8dafff79cc7611ad523eee81d3d17dbb0
-EBUILD xml-security-c-2.0.2.ebuild 860 BLAKE2B f0187d21d4bd9b23938d81cc9ea64abcb73d1952938fbd11d6da030cbd346d0771a0995dd0c07e4204b788b97b708432a7fe78b5f036346bff27a0cb99271eb1 SHA512 15718df9237da73c333e533b5be5ec3e87d625b830f0ff0c037ce1152abb3b8c2e47a315d33d1a529446a6f48c75d17321f0cf0b254d1c6a3786e17bd99d1eab
-MISC metadata.xml 483 BLAKE2B 184149c1f04282005aa8172c19edca6db6ae769d0ea042261180af79734e08554e325a1bf29f01bb27506dc4a3d5161ccb03395cc6f06c929f6d3f43e171643f SHA512 307df4870d40181dfa0fb62b5791a457ae5c1c4b5f752bcfcd3d6224a3f437ebbc17dad8892b8728ef8be152f2a463814404143e0caf92489c6221c1bf216ef2
+EBUILD xml-security-c-2.0.2-r1.ebuild 908 BLAKE2B 405c8036ab3a993ca471b1ecbaf48bd7fb94344853d2e1d0a6037945323fee76943c2c1b02512025340e9b08afdc8ad17bd2c04c90b00fe3192e89044318ac8f SHA512 aacf14edef1e76d2290ec4dc62cc6bae053cb5b94d290bb83c67fb8508f8e4e4ff1a811ca1434ec058db99bacc4483bb8c20e7039c2aefd853f2939f3fc82699
+MISC metadata.xml 401 BLAKE2B e1464fa11f2fbc8193158e81a988622d0f92d70a243a817cc8be3dacfddf75550f930743cdfef5d062978811285ef7f51685f4e0dc916458ab7be326d933ec55 SHA512 07f6591298a410fa90c6b830f7ce19dba7c17b1d57e6e1d94e3c399299885da07106abee7ff57dd49854b27b6b7186c038fac6a454b4bb0f36e06fc9c4a32789
diff --git a/dev-libs/xml-security-c/files/xml-security-c-1.6.1-nss-compilation-fix.patch b/dev-libs/xml-security-c/files/xml-security-c-1.6.1-nss-compilation-fix.patch
deleted file mode 100644
index 1635d6b80339..000000000000
--- a/dev-libs/xml-security-c/files/xml-security-c-1.6.1-nss-compilation-fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/xsec/tools/xtest/xtest.cpp b/xsec/tools/xtest/xtest.cpp
-index ec40cb2..9cd389e 100644
---- a/xsec/tools/xtest/xtest.cpp
-+++ b/xsec/tools/xtest/xtest.cpp
-@@ -2566,7 +2566,7 @@ int main(int argc, char **argv) {
- 		}
- #endif
- #if defined(XSEC_HAVE_NSS)
--		else if (stricmp(argv[paramCount], "--nss") == 0 || stricmp(argv[paramCount], "-n") == 0) {
-+		else if (_stricmp(argv[paramCount], "--nss") == 0 || _stricmp(argv[paramCount], "-n") == 0) {
- 			g_useNSS = true;
- 			paramCount++;
- 		}
diff --git a/dev-libs/xml-security-c/files/xml-security-c-1.7.3-fix-c++14.patch b/dev-libs/xml-security-c/files/xml-security-c-1.7.3-fix-c++14.patch
deleted file mode 100644
index 40783bf21b29..000000000000
--- a/dev-libs/xml-security-c/files/xml-security-c-1.7.3-fix-c++14.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Fix building with C++14, which errors out due to bool -> T* conversions
-See also: https://bugs.gentoo.org/show_bug.cgi?id=594234
-
---- a/xsec/enc/OpenSSL/OpenSSLCryptoSymmetricKey.hpp
-+++ b/xsec/enc/OpenSSL/OpenSSLCryptoSymmetricKey.hpp
-@@ -151,7 +151,7 @@
- 							 SymmetricKeyMode mode = MODE_CBC,
- 							 const unsigned char * iv = NULL,
-                              const unsigned char* tag = NULL,
--                             unsigned int taglen = NULL);
-+                             unsigned int taglen = 0);
- 
- 	/**
- 	 * \brief Continue an decrypt operation using this key.
---- a/xsec/enc/XSECCryptoSymmetricKey.hpp
-+++ b/xsec/enc/XSECCryptoSymmetricKey.hpp
-@@ -185,7 +185,7 @@
- 							 SymmetricKeyMode mode = MODE_CBC,
- 							 const unsigned char* iv = NULL,
-                              const unsigned char* tag = NULL,
--                             unsigned int taglen = NULL) = 0;
-+                             unsigned int taglen = 0) = 0;
- 
- 	/**
- 	 * \brief Continue a decrypt operation using this key.
---- a/xsec/tools/checksig/InteropResolver.cpp
-+++ b/xsec/tools/checksig/InteropResolver.cpp
-@@ -645,7 +645,7 @@
- 
- 	}
- 
--	return false;
-+	return NULL;
- 
- }
- 
diff --git a/dev-libs/xml-security-c/metadata.xml b/dev-libs/xml-security-c/metadata.xml
index 507ea2f59d11..76ed43fb1227 100644
--- a/dev-libs/xml-security-c/metadata.xml
+++ b/dev-libs/xml-security-c/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>cpp@gentoo.org</email>
-		<name>Gentoo C++ Project</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="xalan">Enable support for XSLT and XPath parsing 
 			by <pkg>dev-libs/xalan-c</pkg></flag>
diff --git a/dev-libs/xml-security-c/xml-security-c-1.7.3.ebuild b/dev-libs/xml-security-c/xml-security-c-1.7.3.ebuild
deleted file mode 100644
index 19b14771f99b..000000000000
--- a/dev-libs/xml-security-c/xml-security-c-1.7.3.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Apache C++ XML security libraries"
-HOMEPAGE="http://santuario.apache.org/"
-SRC_URI="mirror://apache/santuario/c-library/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="debug examples libressl nss static-libs xalan"
-
-RDEPEND=">=dev-libs/xerces-c-3.1
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	nss? ( dev-libs/nss )
-	xalan? ( dev-libs/xalan-c )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS=( CHANGELOG.txt NOTICE.txt )
-PATCHES=(
-	"${FILESDIR}/${PN}-1.6.1-nss-compilation-fix.patch"
-	"${FILESDIR}/${PN}-1.7.3-fix-c++14.patch"
-)
-
-src_configure() {
-	econf \
-		--with-openssl \
-		$(use_enable static-libs static) \
-		$(use_enable debug) \
-		$(use_with xalan) \
-		$(use_with nss)
-}
-
-src_install() {
-	default
-	if use examples ; then
-		docinto examples
-		dodoc xsec/samples/*.cpp
-	fi
-}
diff --git a/dev-libs/xml-security-c/xml-security-c-2.0.2-r1.ebuild b/dev-libs/xml-security-c/xml-security-c-2.0.2-r1.ebuild
index afd103f43067..278e534140b8 100644
--- a/dev-libs/xml-security-c/xml-security-c-2.0.2-r1.ebuild
+++ b/dev-libs/xml-security-c/xml-security-c-2.0.2-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DESCRIPTION="Apache C++ XML security libraries"
-HOMEPAGE="http://santuario.apache.org/"
+HOMEPAGE="https://santuario.apache.org/"
 SRC_URI="mirror://apache/santuario/c-library/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/dev-libs/xml-security-c/xml-security-c-2.0.2.ebuild b/dev-libs/xml-security-c/xml-security-c-2.0.2.ebuild
deleted file mode 100644
index ea768c10d665..000000000000
--- a/dev-libs/xml-security-c/xml-security-c-2.0.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Apache C++ XML security libraries"
-HOMEPAGE="http://santuario.apache.org/"
-SRC_URI="mirror://apache/santuario/c-library/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug examples libressl nss static-libs xalan"
-
-RDEPEND=">=dev-libs/xerces-c-3.2
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-	nss? ( dev-libs/nss )
-	xalan? ( dev-libs/xalan-c )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-DOCS=( CHANGELOG.txt NOTICE.txt )
-
-src_configure() {
-	econf \
-		--with-openssl \
-		$(use_enable static-libs static) \
-		$(use_enable debug) \
-		$(use_with xalan) \
-		$(use_with nss)
-}
-
-src_install() {
-	default
-	if use examples ; then
-		docinto examples
-		dodoc xsec/samples/*.cpp
-	fi
-}