commit: 05477000044d1554b9e9389d6caa459ea3a94c7b
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 14 01:09:06 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Oct 14 01:09:06 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05477000
dev-libs/botan: cleanup old
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-libs/botan/Manifest | 1 -
dev-libs/botan/botan-2.14.0-r1.ebuild | 110 ---------------------
.../files/botan-2.14.0-bindist-test-fix.patch | 91 -----------------
3 files changed, 202 deletions(-)
diff --git a/dev-libs/botan/Manifest b/dev-libs/botan/Manifest
index e546b0b57c9..b54bb404607 100644
--- a/dev-libs/botan/Manifest
+++ b/dev-libs/botan/Manifest
@@ -1,3 +1,2 @@
-DIST Botan-2.14.0.tar.xz 5958948 BLAKE2B
90e73945b22f6e4e8d6163bfb45eca153eb1495448f8bf35514b780fd12bb1b81c822314e1f598c7625277f1e9cf7a6265387cca80ffd4c2664c681b9d4807fd
SHA512
ee15928ecdb0127720b444b0207d46fd68fe3007125b0deb8bdd32f96e9befb684ad54009354da4f6a3c48b9698693b46223710a47fd644da8760dda53d40d34
DIST Botan-2.15.0.tar.xz 5920688 BLAKE2B
1bbb9cadb0f754194851bddf8b14dbcd291285c5f3fbaad35920277a11c3d9e1b1e5cc484c0d37b1c7999b3084a1c90da56631df0b07e788372b95aff5197031
SHA512
0965a0a6141df44e38bd7da038b89dd2b3808ed9a4ebaafbf089abf60718e62cba78d7b64eaf272b5df8c5a489222e4cad4fb511cde38e76cdaed87f35896c18
DIST Botan-2.16.0.tar.xz 5938644 BLAKE2B
a4b7bb48aee0dbf0f8b81a407b6a39707c3e6040a2bb93f9c34208ab87ea64879b2e56af66f090a73d66b64156e333c89e490d206e666e665a5eb4fbcd98d13e
SHA512
12550425c695119d7f448a47b7956565de373e1bc86b8fdfa0a2a5b9fed1ef93a36101b6480e7a2f78e9262c988904c353fa021b681543691d09bf5b00495bd4
diff --git a/dev-libs/botan/botan-2.14.0-r1.ebuild
b/dev-libs/botan/botan-2.14.0-r1.ebuild
deleted file mode 100644
index 36655933319..00000000000
--- a/dev-libs/botan/botan-2.14.0-r1.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-MY_P="Botan-${PV}"
-inherit python-r1 toolchain-funcs
-
-DESCRIPTION="C++ crypto library"
-HOMEPAGE="https://botan.randombit.net/";
-SRC_URI="https://botan.randombit.net/releases/${MY_P}.tar.xz";
-
-LICENSE="BSD"
-SLOT="2/$(ver_cut 1-2)" # soname version
-KEYWORDS="amd64 ~arm hppa ~ia64 ppc ppc64 ~sparc x86 ~ppc-macos"
-IUSE="bindist bzip2 boost doc libressl lzma python sqlite ssl static-libs zlib"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-S="${WORKDIR}/${MY_P}"
-
-DEPEND="python? ( ${PYTHON_DEPS} )"
-RDEPEND="${DEPEND}
- boost? ( >=dev-libs/boost-1.48:= )
- bzip2? ( >=app-arch/bzip2-1.0.5:= )
- lzma? ( app-arch/xz-utils:= )
- sqlite? ( dev-db/sqlite:3= )
- ssl? (
- !libressl? ( dev-libs/openssl:0=[bindist=] )
- libressl? ( dev-libs/libressl:0= )
- )
- zlib? ( >=sys-libs/zlib-1.2.3:= )
-"
-BDEPEND="
- dev-lang/python:*
- doc? ( dev-python/sphinx )
-"
-
-PATCHES=(
- "${FILESDIR}/${P}-bindist-test-fix.patch"
-)
-
-src_configure() {
- local disable_modules=()
- use boost || disable_modules+=( "boost" )
- use bindist && disable_modules+=( "ecdsa" )
- elog "Disabling modules: ${disable_modules[@]}"
-
- # Enable v9 instructions for sparc64
- if [[ "${PROFILE_ARCH}" = "sparc64" ]]; then
- CHOSTARCH="sparc32-v9"
- else
- CHOSTARCH="${CHOST%%-*}"
- fi
-
- local myos=
- case ${CHOST} in
- *-darwin*) myos=darwin ;;
- *) myos=linux ;;
- esac
-
- case ${CHOST} in
- hppa*) CHOSTARCH=parisc ;;
- esac
-
- local pythonvers=()
- if use python; then
- append() {
- pythonvers+=( ${EPYTHON/python/} )
- }
- python_foreach_impl append
- fi
-
- # Don't install automatically, do it manually later in right place
- # https://bugs.gentoo.org/723096
- CXX="$(tc-getCXX)" AR="$(tc-getAR)" ./configure.py \
- $(use_enable static-libs static-library) \
- $(use_with boost) \
- $(use_with bzip2) \
- $(use_with doc documentation) \
- $(use_with doc sphinx) \
- $(use_with lzma) \
- $(use_with sqlite sqlite3) \
- $(use_with ssl openssl) \
- $(use_with zlib) \
- $(usex hppa --without-stack-protector '') \
- --cc=gcc \
- --cpu=${CHOSTARCH} \
- --disable-modules=$(IFS=","; echo "${disable_modules[*]}" ) \
- --docdir=share/doc \
- --libdir=$(get_libdir) \
- --os=${myos} \
- --distribution-info="Gentoo ${PVR}" \
- --prefix="${EPREFIX}/usr" \
- --with-endian="$(tc-endian)" \
- --with-python-version=$(IFS=","; echo "${pythonvers[*]}" ) \
- --without-doxygen \
- --no-install-python-module \
- || die "configure.py failed"
-}
-
-src_test() {
- LD_LIBRARY_PATH="${S}" ./botan-test || die "Validation tests failed"
-}
-
-src_install() {
- default
- use python && python_foreach_impl python_domodule src/python/botan2.py
-}
diff --git a/dev-libs/botan/files/botan-2.14.0-bindist-test-fix.patch
b/dev-libs/botan/files/botan-2.14.0-bindist-test-fix.patch
deleted file mode 100644
index 35b17976dbd..00000000000
--- a/dev-libs/botan/files/botan-2.14.0-bindist-test-fix.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-https://github.com/randombit/botan/commit/df73ee690c5795be586cd4df3e33253113a0dcdf
-https://github.com/randombit/botan/commit/d9d6d7a593da135d2046aeb8a9e05e967d90f538
-
-diff --git a/src/tests/test_pkcs11_high_level.cpp
b/src/tests/test_pkcs11_high_level.cpp
-index 47a5bf5e56..07dc86ef21 100644
---- a/src/tests/test_pkcs11_high_level.cpp
-+++ b/src/tests/test_pkcs11_high_level.cpp
-@@ -909,6 +909,15 @@ BOTAN_REGISTER_TEST("pkcs11-rsa", PKCS11_RSA_Tests);
-
- /***************************** PKCS11 ECDSA *****************************/
-
-+#if defined(BOTAN_HAS_ECC_GROUP)
-+std::vector<uint8_t> encode_ec_point_in_octet_str(const Botan::PointGFp&
point)
-+ {
-+ std::vector<uint8_t> enc;
-+ DER_Encoder(enc).encode(point.encode(PointGFp::UNCOMPRESSED),
OCTET_STRING);
-+ return enc;
-+ }
-+#endif
-+
- #if defined(BOTAN_HAS_ECDSA)
-
- Test::Result test_ecdsa_privkey_import()
-@@ -976,13 +985,6 @@ Test::Result test_ecdsa_privkey_export()
- return result;
- }
-
--std::vector<uint8_t> encode_ec_point_in_octet_str(const Botan::PointGFp&
point)
-- {
-- std::vector<uint8_t> enc;
-- DER_Encoder(enc).encode(point.encode(PointGFp::UNCOMPRESSED),
OCTET_STRING);
-- return enc;
-- }
--
- Test::Result test_ecdsa_pubkey_import()
- {
- Test::Result result("PKCS11 import ECDSA public key");
-diff --git a/src/tests/test_pkcs11_high_level.cpp
b/src/tests/test_pkcs11_high_level.cpp
-index 07dc86ef21..c77e8ea42e 100644
---- a/src/tests/test_pkcs11_high_level.cpp
-+++ b/src/tests/test_pkcs11_high_level.cpp
-@@ -28,10 +28,14 @@
- #include <botan/der_enc.h>
- #endif
-
--#if defined (BOTAN_HAS_PUBLIC_KEY_CRYPTO)
-+#if defined(BOTAN_HAS_PUBLIC_KEY_CRYPTO)
- #include <botan/pubkey.h>
- #endif
-
-+#if defined(BOTAN_HAS_ECC_GROUP)
-+ #include <botan/ec_group.h>
-+#endif
-+
- #if defined(BOTAN_HAS_RSA) && defined(BOTAN_HAS_PKCS11)
- #include <botan/rsa.h>
- #include <botan/p11_rsa.h>
-@@ -909,7 +913,7 @@ BOTAN_REGISTER_TEST("pkcs11-rsa", PKCS11_RSA_Tests);
-
- /***************************** PKCS11 ECDSA *****************************/
-
--#if defined(BOTAN_HAS_ECC_GROUP)
-+#if defined(BOTAN_HAS_ECC_GROUP) && (defined(BOTAN_HAS_ECDSA) ||
defined(BOTAN_HAS_ECDH))
- std::vector<uint8_t> encode_ec_point_in_octet_str(const Botan::PointGFp&
point)
- {
- std::vector<uint8_t> enc;
-diff --git a/src/tests/unit_x509.cpp b/src/tests/unit_x509.cpp
-index eaae358420..d9b7858898 100644
---- a/src/tests/unit_x509.cpp
-+++ b/src/tests/unit_x509.cpp
-@@ -603,7 +603,7 @@ Test::Result test_verify_gost2012_cert()
- {
- Test::Result result("X509 GOST-2012 certificates");
-
--#if defined(BOTAN_HAS_GOST_34_10_2012) && defined(BOTAN_HAS_STREEBOG)
-+#if defined(BOTAN_HAS_GOST_34_10_2012) && defined(BOTAN_HAS_STREEBOG) &&
defined(BOTAN_HAS_EMSA1)
- try
- {
- Botan::X509_Certificate
root_cert(Test::data_file("x509/gost/gost_root.pem"));
-@@ -1600,6 +1600,11 @@ class X509_Cert_Unit_Tests final : public Test
- continue;
- #endif
-
-+#if !defined(BOTAN_HAS_EMSA1)
-+ if(algo != "RSA" && algo != "Ed25519")
-+ continue;
-+#endif
-+
- std::unique_ptr<Botan::Private_Key> key =
make_a_private_key(algo);
-
- if(key == nullptr)
