[gentoo-commits] repo/gentoo:master commit in: dev-libs/xml-security-c/, dev-libs/xml-security-c/files/

[Michał Górny]

commit:     ce43db5a7e009685ac3fa8fe7558586a8a5ddb5b
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 18 12:56:44 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Apr 18 13:29:42 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce43db5a

dev-libs/xml-security-c: Drop old

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-libs/xml-security-c/Manifest                   |  1 -
 .../xml-security-c-1.6.1-nss-compilation-fix.patch | 13 -------
 .../files/xml-security-c-1.7.3-fix-c++14.patch     | 36 -----------------
 .../xml-security-c/xml-security-c-1.7.3.ebuild     | 45 ----------------------
 .../xml-security-c/xml-security-c-2.0.2.ebuild     | 40 -------------------
 5 files changed, 135 deletions(-)

diff --git a/dev-libs/xml-security-c/Manifest b/dev-libs/xml-security-c/Manifest
index 0d008450a47..bbb89a08ea1 100644
--- a/dev-libs/xml-security-c/Manifest
+++ b/dev-libs/xml-security-c/Manifest
@@ -1,2 +1 @@
-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

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 1635d6b8033..00000000000
--- 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 40783bf21b2..00000000000
--- 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/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 19b14771f99..00000000000
--- 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.ebuild b/dev-libs/xml-security-c/xml-security-c-2.0.2.ebuild
deleted file mode 100644
index ea768c10d66..00000000000
--- 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
-}