From a50ad61e4e1adda3dca7d9e3956f7b8a33f29da8 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sun, 7 Oct 2018 11:21:48 +0100
Subject: dev-libs/botan : gentoo fixed their mess, so drop this

---
 dev-libs/botan/Manifest                           |   1 -
 dev-libs/botan/botan-1.10.17-r1.ebuild            | 158 ----------------------
 dev-libs/botan/files/botan-1.10.17-build.patch    |  25 ----
 dev-libs/botan/files/botan-1.10.17-libressl.patch |  40 ------
 4 files changed, 224 deletions(-)
 delete mode 100644 dev-libs/botan/Manifest
 delete mode 100644 dev-libs/botan/botan-1.10.17-r1.ebuild
 delete mode 100644 dev-libs/botan/files/botan-1.10.17-build.patch
 delete mode 100644 dev-libs/botan/files/botan-1.10.17-libressl.patch

(limited to 'dev-libs')

diff --git a/dev-libs/botan/Manifest b/dev-libs/botan/Manifest
deleted file mode 100644
index e72377c7..00000000
--- a/dev-libs/botan/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Botan-1.10.17.tgz 2706678 BLAKE2B bce65493c702381aaa747c2b935c545f85704b93bb6be4bf225048cc14812999291bbbe86786c2b00865489ec47d63128b12ef1020be8651be57fa1c84006a7c SHA512 a47cab3af113652247c8efc8b0f043eb62175eaa8554833d5fc3016ea94dbdd8aa722ab9b5226cc5f133afbcc088d54362111630eaa4594812c39925cc3c8649
diff --git a/dev-libs/botan/botan-1.10.17-r1.ebuild b/dev-libs/botan/botan-1.10.17-r1.ebuild
deleted file mode 100644
index 76f17bc1..00000000
--- a/dev-libs/botan/botan-1.10.17-r1.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit multilib python-r1 toolchain-funcs
-
-MY_PN="Botan"
-MY_P="${MY_PN}-${PV}"
-DESCRIPTION="A C++ crypto library"
-HOMEPAGE="https://botan.randombit.net/"
-SRC_URI="https://botan.randombit.net/releases/${MY_P}.tgz"
-
-KEYWORDS="amd64 ~arm hppa ~ia64 ppc ppc64 ~sparc x86 ~ppc-macos"
-SLOT="0"
-LICENSE="BSD"
-IUSE="bindist doc python bzip2 gmp libressl ssl static-libs threads zlib"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-S="${WORKDIR}/${MY_P}"
-
-RDEPEND="bzip2? ( >=app-arch/bzip2-1.0.5 )
-	zlib? ( >=sys-libs/zlib-1.2.3 )
-	python? ( ${PYTHON_DEPS} >=dev-libs/boost-1.48[python,${PYTHON_USEDEP}] )
-	gmp? ( >=dev-libs/gmp-4.2.2:* )
-	ssl? (
-		!libressl? ( <dev-libs/openssl-1.1:0=[bindist=] )
-		libressl? ( dev-libs/libressl:0= )
-	)"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx )"
-
-PATCHES=(
-	"${FILESDIR}/${P}-build.patch"
-	"${FILESDIR}/${P}-libressl.patch"
-)
-
-src_prepare() {
-	default
-
-	sed -e "s/-Wl,-soname,\$@ //" -i src/build-data/makefile/python.in || die "sed failed"
-	sed \
-		-e "/DOCDIR/d" \
-		-e "/^install:/s/ docs//" \
-		-i src/build-data/makefile/unix_shr.in || die "sed failed"
-
-	# Fix ImportError with Python 3.
-	sed -e "s/_botan/.&/" -i src/wrap/python/__init__.py || die "sed failed"
-
-	use python && python_copy_sources
-}
-
-src_configure() {
-	local disable_modules="proc_walk,unix_procs"
-	use threads || disable_modules+=",pthreads"
-	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
-
-	# foobared buildsystem, --prefix translates into DESTDIR, see also make
-	# install in src_install, we need the correct live-system prefix here on
-	# Darwin for a shared lib with correct install_name
-	./configure.py \
-		--prefix="${EPREFIX}/usr" \
-		--libdir=$(get_libdir) \
-		--docdir=share/doc \
-		--cc=gcc \
-		--os=${myos} \
-		--cpu=${CHOSTARCH} \
-		--with-endian="$(tc-endian)" \
-		--without-sphinx \
-		--with-tr1=system \
-		$(use_with bzip2) \
-		$(use_with gmp gnump) \
-		$(use_with python boost-python) \
-		$(use_with ssl openssl) \
-		$(use_with zlib) \
-		--disable-modules=${disable_modules} \
-		|| die "configure.py failed"
-}
-
-src_compile() {
-	emake CXX="$(tc-getCXX)" AR="$(tc-getAR) crs" LIB_OPT="${CXXFLAGS}" MACH_OPT=""
-
-	if use python; then
-		building() {
-			rm -fr build/python
-			ln -s "${BUILD_DIR}" build/python
-			cp Makefile.python build/python
-			sed -i \
-				-e "s/-lboost_python/-lboost_python-$(echo ${EPYTHON} | sed 's/python//')/" \
-				build/python/Makefile.python
-			emake -f build/python/Makefile.python \
-				CXX="$(tc-getCXX)" \
-				CFLAGS="${CXXFLAGS}" \
-				LDFLAGS="${LDFLAGS}" \
-				PYTHON_ROOT="/usr/$(get_libdir)" \
-				PYTHON_INC="-I$(python_get_includedir)"
-		}
-		python_foreach_impl building
-	fi
-
-	if use doc; then
-		einfo "Generation of documentation"
-		sphinx-build doc doc_output || die
-	fi
-}
-
-src_test() {
-	chmod -R ugo+rX "${S}"
-	emake CXX="$(tc-getCXX)" CHECK_OPT="${CXXFLAGS}" check
-	LD_LIBRARY_PATH="${S}" ./check --validate || die "Validation tests failed"
-}
-
-src_install() {
-	emake DESTDIR="${ED}usr" install
-
-	if ! use static-libs; then
-		rm "${ED}usr/$(get_libdir)/libbotan"*.a || die 'remove of static libs failed'
-	fi
-
-	# Add compatibility symlinks.
-	[[ -e "${ED}usr/bin/botan-config" ]] && die "Compatibility code no longer needed"
-	[[ -e "${ED}usr/$(get_libdir)/pkgconfig/botan.pc" ]] && die "Compatibility code no longer needed"
-	dosym botan-config-1.10 /usr/bin/botan-config
-	dosym botan-1.10.pc /usr/$(get_libdir)/pkgconfig/botan.pc
-
-	if use python; then
-		installation() {
-			rm -fr build/python
-			ln -s "${BUILD_DIR}" build/python
-			emake -f Makefile.python \
-				PYTHON_SITE_PACKAGE_DIR="${ED}$(python_get_sitedir)" \
-				install
-		}
-		python_foreach_impl installation
-	fi
-
-	if use doc; then
-		pushd doc_output > /dev/null
-		insinto /usr/share/doc/${PF}/html
-		doins -r [a-z]* _static
-		popd > /dev/null
-	fi
-}
diff --git a/dev-libs/botan/files/botan-1.10.17-build.patch b/dev-libs/botan/files/botan-1.10.17-build.patch
deleted file mode 100644
index 43877972..00000000
--- a/dev-libs/botan/files/botan-1.10.17-build.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From c7963d28d03e5f65f4021a5b764dc4bff9417eda Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev <alon.barlev@gmail.com>
-Date: Wed, 4 Oct 2017 01:50:33 +0300
-Subject: [PATCH] gost_3411: use correct type for build to pass
-
----
- src/hash/gost_3411/gost_3411.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/hash/gost_3411/gost_3411.cpp b/src/hash/gost_3411/gost_3411.cpp
-index 97aa399..7ca22dc 100644
---- a/src/hash/gost_3411/gost_3411.cpp
-+++ b/src/hash/gost_3411/gost_3411.cpp
-@@ -91,7 +91,7 @@ void GOST_34_11::compress_n(const byte input[], size_t blocks)
-          // P transformation
-          for(size_t k = 0; k != 4; ++k)
-             {
--            const uint64_t UVk = U[k] ^ V[k];
-+            const u64bit UVk = U[k] ^ V[k];
-             for(size_t l = 0; l != 8; ++l)
-                key[4*l+k] = get_byte(l, UVk);
-             }
--- 
-2.13.6
-
diff --git a/dev-libs/botan/files/botan-1.10.17-libressl.patch b/dev-libs/botan/files/botan-1.10.17-libressl.patch
deleted file mode 100644
index 5913bfd3..00000000
--- a/dev-libs/botan/files/botan-1.10.17-libressl.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From e61a5f56fb404db3655909be4ce23c3a816cbb60 Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev <alon.barlev@gmail.com>
-Date: Wed, 4 Oct 2017 22:16:31 +0300
-Subject: [PATCH] openssl: support libressl
-
-Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
----
- src/engine/openssl/ossl_bc.cpp | 2 +-
- src/engine/openssl/ossl_md.cpp | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/engine/openssl/ossl_bc.cpp b/src/engine/openssl/ossl_bc.cpp
-index 74660c7b5..cb184c202 100644
---- a/src/engine/openssl/ossl_bc.cpp
-+++ b/src/engine/openssl/ossl_bc.cpp
-@@ -8,7 +8,7 @@
- #include <botan/internal/openssl_engine.h>
- #include <openssl/evp.h>
- 
--#if OPENSSL_VERSION_NUMBER >= 0x10100000
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined(LIBRESSL_VERSION_NUMBER)
-   #error "OpenSSL 1.1 API not supported in Botan 1.10, upgrade to 2.x"
- #endif
- 
-diff --git a/src/engine/openssl/ossl_md.cpp b/src/engine/openssl/ossl_md.cpp
-index 2fcb2b0e5..9c43d616e 100644
---- a/src/engine/openssl/ossl_md.cpp
-+++ b/src/engine/openssl/ossl_md.cpp
-@@ -8,7 +8,7 @@
- #include <botan/internal/openssl_engine.h>
- #include <openssl/evp.h>
- 
--#if OPENSSL_VERSION_NUMBER >= 0x10100000
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined(LIBRESSL_VERSION_NUMBER)
-   #error "OpenSSL 1.1 API not supported in Botan 1.10, upgrade to 2.x"
- #endif
- 
--- 
-2.13.6
-
-- 
cgit v1.2.3