gentoo resync : 29.05.2018

3 files changed, 2 insertions, 96 deletions

diff --git a/dev-libs/botan/Manifest b/dev-libs/botan/Manifest
index 4db8af5cf440..5fb5ef989cb4 100644
--- a/dev-libs/botan/Manifest
+++ b/dev-libs/botan/Manifest
@@ -1,9 +1,7 @@
 AUX botan-1.10.17-build.patch 874 BLAKE2B 94898dc7730c921ea4a545fdad5d5eeb91432ee7af503dd2fc8a59185c5406b659629ee5a0c4f73c2c090dfccf64757baea196fcca4f60379a2b2f04baf81ee6 SHA512 bccb615e832ef31381afd0996a06cfb4c37f29bd8d7691435d592f2ec88f525f3e9e19adf84c78ebd6f24f60e407e29ef99bdff11103ef1344250fe5251fca0a
 AUX botan-1.10.17-libressl.patch 1344 BLAKE2B e465b852e17ce920022663a8ea25684b2340fff699eb4b89d97784ffbec9e395200ffb2b9aa2226448e199f51a176409ed086e909c4ae431ede21c66d3de334b SHA512 dee61a141a10572c4d4c111527bbca3bd77808a2642ddb9cb105785badc10babd0406b1634c62c355e5361b9281c989666851d0fb81b3e000b62570e429fd642
 DIST Botan-1.10.17.tgz 2706678 BLAKE2B bce65493c702381aaa747c2b935c545f85704b93bb6be4bf225048cc14812999291bbbe86786c2b00865489ec47d63128b12ef1020be8651be57fa1c84006a7c SHA512 a47cab3af113652247c8efc8b0f043eb62175eaa8554833d5fc3016ea94dbdd8aa722ab9b5226cc5f133afbcc088d54362111630eaa4594812c39925cc3c8649
-DIST Botan-2.5.0.tgz 6596225 BLAKE2B ffb5647e5734a8bef14b6c52ad12a211844e9c73f843427cb2972813523091cef99a21cea3d6a8bf69367f0d937ea0a422d2ed8aaf839ee1c7a2d95a1bd702a8 SHA512 51d91bcf6ba41247fbb649697e33e3a0c8ba9f35ba7865be9120c0f0efb7fa8c51fb3d922f0d5576ae1ef637188821ff4352ed45de52e0798910ee354787cdda
 DIST Botan-2.6.0.tgz 6599127 BLAKE2B c45a974f89571c1050e28108267ca6ec094171be3d7dbcb033b86b7dac3f8074703c40c42d5737074a86c19266b4b47c266d0864ce08ee26fad05116a50c48a8 SHA512 2082b4aaac0802f117a5f75c67a69e6d364b436a0ebe543032e370c3f085752bbe1ca48051462066e13bd42e47573ebc532d1d45074fe406df032f33346ee645
 EBUILD botan-1.10.17.ebuild 4217 BLAKE2B 4af0e21d562a01017e28bf55d78788fedd731d390edcb6786b1cecbd9dd637a79c525b74920b9516925795e88eade82ecd3db88ac26df888300cbfe8e525564f SHA512 5cc5ff02202de8b9cc131f0c7346206f40a26fa6ca222dafecd90dba4946980bdc85c9411008c2975a234d077d7acf5f979af5c9be5d6651305a5fa148c9ee97
-EBUILD botan-2.5.0.ebuild 2298 BLAKE2B 9f08544892b00175f01336e4057673f549a69b33b5c6537a444b508f58c05a731f2b18c5c4836148c4c4700f212c9828e2d25c4c1d509538e93a8280a5908b23 SHA512 6530a683b3ecbffce4ff08588ebe4d0860152e17d9004190df44211d45abffbd9371f74a497819c70eadddf7d1caa4d73a423f890df6c3324757eeeddc31ebd9
-EBUILD botan-2.6.0.ebuild 2340 BLAKE2B 340f5a07bae12741e3a5b7f2272017b70ba36d540fee49cb5d878e3558369929dee2d01105be2e7fe2dd27a5e2bfffebfc8f891bb9bfb6a7cde439c9f3505b63 SHA512 f5e0448f7f4abad004f3b5b1d777f53f919d77eb503d6a1f2ba5ac71b14c172a85623b7999ca8a320088792f06e9fe1c0a9f0e1f242a156d8de06376b4da5e4d
+EBUILD botan-2.6.0.ebuild 2339 BLAKE2B f3871202e70810f7003a16a02befc4bf69ff04baa451a80a2bfb13a96cb1cbc645a1f622941c9af27b2a6b8617fe69f81d601a1fc0738ac4f922465a8014277a SHA512 f46c844b7df21647876f933f4263427625fc2da6a6688c5333f4205fad06da0c99a68de152036778ba0a6b4890b772c8e41f95687786e6153ace2d52856be3b2
 MISC metadata.xml 610 BLAKE2B a74ed3478dcf62ad762a113e594c660656d52352e569d4eaa54c47009505a869c4e553a8f8330b0b2ad9dae88b7b2bc6d44ede1f2dd330da9ff01240f56eed29 SHA512 9d14b7f0222b9b169f8ae60798d1a9ac551004bcbd0344451409cdb1cbefaaf70760a2f443f0c793265492387ca28f7dccd293bd30585a014a72f2a21eee1561
diff --git a/dev-libs/botan/botan-2.5.0.ebuild b/dev-libs/botan/botan-2.5.0.ebuild
deleted file mode 100644
index 53a794a7db56..000000000000
--- a/dev-libs/botan/botan-2.5.0.ebuild
+++ /dev/null
@@ -1,92 +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="2/5" # soname version
-LICENSE="BSD"
-IUSE="bindist doc boost python bzip2 libressl lzma sqlite ssl static-libs zlib"
-
-S="${WORKDIR}/${MY_P}"
-
-RDEPEND="bzip2? ( >=app-arch/bzip2-1.0.5 )
-	zlib? ( >=sys-libs/zlib-1.2.3 )
-	boost? ( >=dev-libs/boost-1.48 )
-	lzma? ( app-arch/xz-utils )
-	sqlite? ( dev-db/sqlite:3 )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0=[bindist=] )
-		libressl? ( dev-libs/libressl:0= )
-	)"
-DEPEND="${RDEPEND}
-	dev-lang/python:*
-	doc? ( dev-python/sphinx )"
-
-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
-
-	local pythonvers=()
-	if use python; then
-		append() {
-			pythonvers+=( ${EPYTHON/python/} )
-		}
-		python_foreach_impl append
-	fi
-
-	CXX="$(tc-getCXX)" AR="$(tc-getAR)" ./configure.py \
-		--prefix="${EPREFIX}/usr" \
-		--libdir=$(get_libdir) \
-		--docdir=share/doc \
-		--cc=gcc \
-		--os=${myos} \
-		--cpu=${CHOSTARCH} \
-		--with-endian="$(tc-endian)" \
-		--without-doxygen \
-		$(use_with bzip2) \
-		$(use_with lzma) \
-		$(use_with sqlite sqlite3) \
-		$(use_with ssl openssl) \
-		$(use_with zlib) \
-		$(use_with boost) \
-		$(use_with doc sphinx) \
-		$(use_with doc documentation) \
-		$(use_enable static-libs static-library) \
-		--with-python-version=$(IFS=","; echo "${pythonvers[*]}" ) \
-		--disable-modules=$(IFS=","; echo "${disable_modules[*]}" ) \
-		|| 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_optimize
-}
diff --git a/dev-libs/botan/botan-2.6.0.ebuild b/dev-libs/botan/botan-2.6.0.ebuild
index 267b5220f719..9ff13b7881c5 100644
--- a/dev-libs/botan/botan-2.6.0.ebuild
+++ b/dev-libs/botan/botan-2.6.0.ebuild
@@ -12,7 +12,7 @@ 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"
+KEYWORDS="amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86 ~ppc-macos"
 SLOT="2/$(get_version_component_range 2)" # soname version
 LICENSE="BSD"
 IUSE="bindist doc boost python bzip2 libressl lzma sqlite ssl static-libs zlib"