commit: b42bad398a6ef63a6972fb7dd1fb6748a1500952
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 23 09:43:17 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Sep 23 09:43:21 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b42bad39
dev-libs/botan: drop 3.0.0-r2
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-libs/botan/Manifest | 2 -
dev-libs/botan/botan-3.0.0-r2.ebuild | 194 ---------------------
.../files/botan-3.0.0-getentropy-includes.patch | 68 --------
3 files changed, 264 deletions(-)
diff --git a/dev-libs/botan/Manifest b/dev-libs/botan/Manifest
index 75102248b7be..3369e26cafc2 100644
--- a/dev-libs/botan/Manifest
+++ b/dev-libs/botan/Manifest
@@ -1,6 +1,4 @@
DIST Botan-2.19.3.tar.xz 6105896 BLAKE2B
6d7778d9e9a101c76f35c65b0fb0201641cd91967ba934510f3836ee4b924d54cabdc760dd460997679250aa66e1d2a99369cd03f8fb9e7b2fe672d4b355215f
SHA512
80012397e2aa7cc88a9536340ac9b770d1195fddda53b9d4cfde82318dd05f9d4f925bbdff773aba99883a701f4d30581e9d5c97e915fa80c3ca2acfa5a92110
DIST Botan-2.19.3.tar.xz.asc 488 BLAKE2B
cd86bf77306aad2956cced6ac4fb96081279af88743e87d8fe5437e72e9fa8db8aaf40d0b5cb9c5b3a85204cb7d63c3baa3054126ab4c9a2db527e6835a069d7
SHA512
9142f932c958138b4bac32f503a550e6c73b61612690a280dcb98efe8c367aa6bd3cd88b4ed4decec376bb87596a780a21bdcb01d4a3573a1c44fbeb0aa49d23
-DIST Botan-3.0.0.tar.xz 8752380 BLAKE2B
06ac29dc0cbaef43a38cc30185f431e1b1f4083469fdea19ee5d77ada6633022746b8ae2419bd00872f9b3892af9c61a455bc88f77bef84f451938dffd27bde3
SHA512
d67ac0f9d67f6869b7a35d4a7c5e96ffcc619f7e44ead36b4cd0906f3d925d12181566aace03ac719ef54d819ae1158febc0b25839beed5f92eade06d510b594
-DIST Botan-3.0.0.tar.xz.asc 488 BLAKE2B
6a34817ec4700983151f97d2e278870736860ac72f3936fcc63e241d89ba758bdf7765d3c877d88019055562a6067c278ecbac263e8d87cc310790089e47f662
SHA512
46ff64bb4d215a48b0549d90ae2461ae39ae5ecf588a7e130876759ec30561c5a2db77ee9cdc7a3dab990927b51ea732f5b56592bdc150062ca25690378ab817
DIST Botan-3.1.1.tar.xz 8800368 BLAKE2B
c31365e6bd4106f96a033e5f092c528c0185577f41d9a698d2630ece0f660f87f03e0775ebeb5c4d812819bbc6eb556b5ff15c16f243288ae73c8bf1fbb991ce
SHA512
ed6bdadb910b0775245648140212953ed364aa26107f851e39ac5cb664d7f476c519a22cdad41f0e520796c4ebe453c56ca68a2178e39f815d445e9979333795
DIST Botan-3.1.1.tar.xz.asc 488 BLAKE2B
9ac94473d90a26932e507cdb3f46d8381565deecff38a5a2f7fe043b33405071adf0baee4235dd94bb6d35fa3ffedca6192fb5f5d76030874a90a399d88f9744
SHA512
f52e8602a57f590150f6f49829e788910006e5113ab6e85c6efe73009b8db752b5f28b869c6265ef6dd3c2727c64c0182d125f02f92485485768416c618acdb9
diff --git a/dev-libs/botan/botan-3.0.0-r2.ebuild
b/dev-libs/botan/botan-3.0.0-r2.ebuild
deleted file mode 100644
index 29f6c986af69..000000000000
--- a/dev-libs/botan/botan-3.0.0-r2.ebuild
+++ /dev/null
@@ -1,194 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/botan.asc
-inherit edo multiprocessing python-r1 toolchain-funcs verify-sig
-
-MY_P="Botan-${PV}"
-DESCRIPTION="C++ crypto library"
-HOMEPAGE="https://botan.randombit.net/";
-SRC_URI="https://botan.randombit.net/releases/${MY_P}.tar.xz";
-SRC_URI+=" verify-sig? (
https://botan.randombit.net/releases/${MY_P}.tar.xz.asc )"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="BSD-2"
-# New major versions are parallel-installable
-SLOT="$(ver_cut 1)/$(ver_cut 1-2)" # soname version
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86
~ppc-macos"
-IUSE="doc boost bzip2 lzma python static-libs sqlite test tools zlib"
-RESTRICT="!test? ( test )"
-
-CPU_USE=(
- cpu_flags_arm_{aes,neon}
- cpu_flags_ppc_altivec
- cpu_flags_x86_{aes,avx2,popcnt,rdrand,sha,sse2,ssse3,sse4_1,sse4_2}
-)
-
-IUSE+=" ${CPU_USE[@]}"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# NOTE: Boost is needed at runtime too for the CLI tool.
-DEPEND="
- boost? ( dev-libs/boost:= )
- bzip2? ( >=app-arch/bzip2-1.0.5:= )
- lzma? ( app-arch/xz-utils:= )
- python? ( ${PYTHON_DEPS} )
- sqlite? ( dev-db/sqlite:3= )
- zlib? ( >=sys-libs/zlib-1.2.3:= )
-"
-RDEPEND="
- ${DEPEND}
- !<dev-libs/botan-2.19.3-r1:2[tools]
-"
-BDEPEND="
- ${PYTHON_DEPS}
- $(python_gen_any_dep '
- doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
- ')
- verify-sig? ( sec-keys/openpgp-keys-botan )
-"
-
-# NOTE: Considering patching Botan?
-# Please see upstream's guidance:
-#
https://botan.randombit.net/handbook/packaging.html#minimize-distribution-patches
-PATCHES=(
- "${FILESDIR}"/${P}-getentropy-includes.patch
-)
-
-python_check_deps() {
- use doc || return 0
- python_has_version "dev-python/sphinx[${PYTHON_USEDEP}]"
-}
-
-src_configure() {
- python_setup
-
- local disable_modules=(
- $(usev !boost 'boost')
- )
-
- if [[ -z "${DISABLE_MODULES}" ]] ; then
- elog "Disabling module(s): ${disable_modules[@]}"
- fi
-
- local chostarch="${CHOST%%-*}"
-
- # Arch specific wrangling
- local myos=
- case ${CHOST} in
- *-darwin*)
- myos=darwin
- ;;
- *)
- myos=linux
-
- if [[ ${CHOST} == *hppa* ]] ; then
- chostarch=parisc
- elif [[ ${ABI} == sparc64 ]] ; then
- chostarch="sparc64"
- elif [[ ${ABI} == sparc32 ]] ; then
- chostarch="sparc32"
- fi
- ;;
- esac
-
- local pythonvers=()
- if use python ; then
- _append() {
- pythonvers+=( ${EPYTHON/python/} )
- }
-
- python_foreach_impl _append
- fi
-
- local myargs=(
- # Intrinsics
- # TODO: x86 RDSEED (new CPU_FLAGS_X86?)
- # TODO: POWER Crypto (new CPU_FLAGS_PPC?)
- $(usev !cpu_flags_arm_aes '--disable-armv8crypto')
- $(usev !cpu_flags_arm_neon '--disable-neon')
- $(usev !cpu_flags_ppc_altivec '--disable-altivec')
- $(usev !cpu_flags_x86_aes '--disable-aes-ni')
- $(usev !cpu_flags_x86_avx2 '--disable-avx2')
- $(usev !cpu_flags_x86_popcnt '--disable-bmi2')
- $(usev !cpu_flags_x86_rdrand '--disable-rdrand')
- $(usev !cpu_flags_x86_sha '--disable-sha-ni')
- $(usev !cpu_flags_x86_sse2 '--disable-sse2')
- $(usev !cpu_flags_x86_ssse3 '--disable-ssse3')
- $(usev !cpu_flags_x86_sse4_1 '--disable-sse4.1')
- $(usev !cpu_flags_x86_sse4_2 '--disable-sse4.2')
-
- # HPPA's GCC doesn't support SSP
- $(usev hppa '--without-stack-protector')
-
- $(use_with boost)
- $(use_with bzip2)
- $(use_with doc documentation)
- $(use_with doc sphinx)
- $(use_with lzma)
- $(use_enable static-libs static-library)
- $(use_with sqlite sqlite3)
- $(use_with zlib)
-
- --cpu=${chostarch}
- --docdir=share/doc
- --disable-modules=$(IFS=","; echo "${disable_modules[*]}")
- --distribution-info="Gentoo ${PVR}"
- --libdir="$(get_libdir)"
- # Avoid collisions between slots for tools (bug #905700)
- --program-suffix=$(ver_cut 1)
-
- # Don't install Python bindings automatically
- # (do it manually later in the right place)
- # bug #723096
- --no-install-python-module
-
- --os=${myos}
- --prefix="${EPREFIX}"/usr
- --with-endian="$(tc-endian)"
- --with-python-version=$(IFS=","; echo "${pythonvers[*]}")
- )
-
- local build_targets=(
- shared
- $(usev static-libs static)
- $(usev tools cli)
- $(usev test tests)
- )
-
- myargs+=(
- --build-targets=$(IFS=","; echo "${build_targets[*]}")
- )
-
- if use elibc_glibc && use kernel_linux ; then
- myargs+=(
- --with-os-features=getrandom,getentropy
- )
- fi
-
- tc-export AR CC CXX
-
- edo ${EPYTHON} configure.py --verbose "${myargs[@]}"
-}
-
-src_test() {
- LD_LIBRARY_PATH="${S}" edo ./botan-test$(ver_cut 1)
--test-threads="$(makeopts_jobs)"
-}
-
-src_install() {
- default
-
- if [[ -d "${ED}"/usr/share/doc/${P} ]] ; then
- # --docdir in configure controls the parent directory
unfortunately
- mv "${ED}"/usr/share/doc/${P} "${ED}"/usr/share/doc/${PF} || die
- fi
-
- # Manually install the Python bindings (bug #723096)
- if use python ; then
- python_foreach_impl python_domodule src/python/botan$(ver_cut
1).py
- fi
-}
diff --git a/dev-libs/botan/files/botan-3.0.0-getentropy-includes.patch
b/dev-libs/botan/files/botan-3.0.0-getentropy-includes.patch
deleted file mode 100644
index d8b99ba0f4c5..000000000000
--- a/dev-libs/botan/files/botan-3.0.0-getentropy-includes.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-https://bugs.gentoo.org/909422
-https://github.com/randombit/botan/commit/3f87e1eef7dbfe231d833ffbf06f7a85b070b600
(cherry-picked getentropy.cpp bit)
-https://github.com/randombit/botan/commit/562ea8da8ab34985b4b3dfefc1bea57829213ace
-
---- a/src/lib/entropy/getentropy/getentropy.cpp
-+++ b/src/lib/entropy/getentropy/getentropy.cpp
-@@ -10,8 +10,8 @@
- #if defined(BOTAN_TARGET_OS_IS_OPENBSD) ||
defined(BOTAN_TARGET_OS_IS_FREEBSD) || defined(BOTAN_TARGET_OS_IS_SOLARIS)
- #include <unistd.h>
- #else
-- #include <sys/types.h> // older macOS needs this before sys/random.h
- #include <sys/random.h>
-+ #include <sys/types.h> // older macOS needs this before sys/random.h
- #endif
-
- namespace Botan {
-@@ -21,16 +21,14 @@ namespace Botan {
- * buffer size is limited to 256 bytes. On OpenBSD this does neither
- * block nor fail.
- */
--size_t Getentropy::poll(RandomNumberGenerator& rng)
-- {
-+size_t Getentropy::poll(RandomNumberGenerator& rng) {
- secure_vector<uint8_t> buf(256);
-
-- if(::getentropy(buf.data(), buf.size()) == 0)
-- {
-+ if(::getentropy(buf.data(), buf.size()) == 0) {
- rng.add_entropy(buf.data(), buf.size());
- return buf.size() * 8;
-- }
-+ }
-
- return 0;
-- }
- }
-+} // namespace Botan
-
-From 562ea8da8ab34985b4b3dfefc1bea57829213ace Mon Sep 17 00:00:00 2001
-From: Jack Lloyd <[email protected]>
-Date: Mon, 29 May 2023 10:10:54 -0400
-Subject: [PATCH] Clean up getentropy includes
-
---- a/src/lib/entropy/getentropy/getentropy.cpp
-+++ b/src/lib/entropy/getentropy/getentropy.cpp
-@@ -6,12 +6,11 @@
- */
-
- #include <botan/internal/getentropy.h>
-+#include <unistd.h>
-
--#if defined(BOTAN_TARGET_OS_IS_OPENBSD) ||
defined(BOTAN_TARGET_OS_IS_FREEBSD) || defined(BOTAN_TARGET_OS_IS_SOLARIS)
-- #include <unistd.h>
--#else
-+// macOS and Android include it in sys/random.h instead
-+#if __has_include(<sys/random.h>)
- #include <sys/random.h>
-- #include <sys/types.h> // older macOS needs this before sys/random.h
- #endif
-
- namespace Botan {
-@@ -31,4 +30,5 @@ size_t Getentropy::poll(RandomNumberGenerator& rng) {
-
- return 0;
- }
-+
- } // namespace Botan
-
