dev-libs/botan: version bump

Package-Manager: portage-2.3.0

4 files changed, 34 insertions, 157 deletions

diff --git a/dev-libs/botan/Manifest b/dev-libs/botan/Manifest
index 57b2f4f310f5..107b4380739a 100644
--- a/dev-libs/botan/Manifest
+++ b/dev-libs/botan/Manifest
@@ -1,4 +1,3 @@
 DIST Botan-1.10.13.tgz 2710181 SHA256 23ec973d4b4a4fe04f490d409e08ac5638afe3aa09acd7f520daaff38ba19b90 SHA512 a09d2cb5dda21bf384b81675025f249abdfe232c95dc3383f0baebc2bf1603b2ed1e2aec9a81aae95df592ec2eeae8906c63474a6da42ad3701669a5d8f14656 WHIRLPOOL 4161d689205f02ed8b97bb371be47829d11dee744a024e24bb834264cfa6143c8a9fb7df969410975e4bf2b708063e3c05b6106c4dbe7f5566e3331ee5e901a9
 DIST Botan-1.10.14.tgz 2710757 SHA256 10ed0b394db165733ac9557d8656356b7e9744d38c61c2b9c44cba6d84ff4c1c SHA512 ae524653a99b02d6d8d7bb2b88a446c066fe1044d8fd2708ea2a4cd5aafbe2b0d165d2ce1730669a4df18013cf5b6540bb5944bafea512b4957e3417de512e95 WHIRLPOOL 51aa1d68757ad515f65c255c585be8050efed085800340d43fa068b48647ef8c50fc9e284ac16d0cef3d874f5fa44f143210dcc004561807e1d1b307d89cff9d
-DIST Botan-1.11.33.tgz 4329671 SHA256 d65f95399dc5710aea90d682d65e554fed4571115f1382416e9142370a47e949 SHA512 49bb4485663897dd07bb7982771befacc50bfabef5806dc802cbd4d39f5d641b08a264824b5b1b96421e810811353deea15e728c5d08ce2932cf0e4602ae099d WHIRLPOOL 86154158915e29eef7753797df037d560078bda4ecfaafffba1064a238618b1ec10e0712b85cd64537ca3dfbac5ce38bf1323456d30b2bd5a51c0dae7f81d339
-DIST Botan-1.11.34.tgz 4908624 SHA256 59ad548f8ddb967737f102b252bab30ca0b49f039f204502394cf506ae731f16 SHA512 c3dad24872f726c62fd302cf05e4a67985e8d6e00b6bdfc9852abe2204329f794b656e9ee89470b76ea16426371ef5b1729626c36d9a2b89e1939172382f192c WHIRLPOOL ba1db76068ae8e55169cba19597be159de1999555ff64ba95a7b80a38ed25d6170be9c2586ca680323340774784fad96b9ca83ff0b17a5b162ba11014e2641a4
+DIST Botan-2.0.0.tgz 4989901 SHA256 031659cca0f80869e9d97a20917edbe2164cedbc079e8c53e0e7bd9bea15371a SHA512 4cb6992b5998ead175c10a9f193b0cde208b81a99bf30412a3b8386e7c91de2ff5d8191fd49893f02643519721bcf16c58db3cbee3eccbeb566f4456d310cf8f WHIRLPOOL ba180e5be87c9212fdf2e9252eb6d477bf608f976476b75e31e393ec19d94dada876b5dda9881f4cbe6dd7fec642a8a2b2a728bc90e07c44661237a067ae09ce
diff --git a/dev-libs/botan/botan-1.11.33.ebuild b/dev-libs/botan/botan-1.11.33.ebuild
deleted file mode 100644
index 14221ea283a1..000000000000
--- a/dev-libs/botan/botan-1.11.33.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="6"
-PYTHON_COMPAT=( python{2_7,3_4} )
-
-inherit eutils multilib python-r1 toolchain-funcs
-
-MY_PN="Botan"
-MY_P="${MY_PN}-${PV}"
-DESCRIPTION="A C++ crypto library"
-HOMEPAGE="http://botan.randombit.net/"
-SRC_URI="http://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 boost python bzip2 libressl lzma sqlite ssl static-libs zlib"
-
-S="${WORKDIR}/${MY_P}"
-
-REQUIRED_USE="python? ( boost )"
-
-RDEPEND="bzip2? ( >=app-arch/bzip2-1.0.5 )
-	zlib? ( >=sys-libs/zlib-1.2.3 )
-	boost? ( ${PYTHON_DEPS} >=dev-libs/boost-1.48[python?,${PYTHON_USEDEP}] )
-	lzma? ( app-arch/xz-utils )
-	sqlite? ( dev-db/sqlite:3 )
-	ssl? (
-		!libressl? ( >=dev-libs/openssl-0.9.8g:0[bindist=] )
-		libressl? ( dev-libs/libressl )
-	)"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx )"
-
-pkg_pretend() {
-	# Botan 1.11 requires -std=c++11
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		[[ $(gcc-major-version) -lt 4 ]] || \
-		( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]] ) \
-		&& die "Sorry, but gcc 4.7 or higher is required."
-	fi
-}
-
-src_prepare() {
-	default
-	sed \
-		-e "/^install:/s/ docs//" \
-		-i src/build-data/makefile/gmake.in || die "sed failed"
-	use python && python_copy_sources
-}
-
-src_configure() {
-	local disable_modules=( proc_walk unix_procs )
-	use boost || disable_modules+=( "boost" )
-	use bindist && disable_modules+=( "ecdsa" )
-	use python || disable_modules+=( "ffi" )
-	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
-
-	./configure.py \
-		--prefix="${EPREFIX}/usr" \
-		--destdir="${D}/${EPREFIX}/usr" \
-		--libdir=$(get_libdir) \
-		--docdir=share/doc \
-		--cc=gcc \
-		--os=${myos} \
-		--cpu=${CHOSTARCH} \
-		--with-endian="$(tc-endian)" \
-		--without-sphinx \
-		$(use_with bzip2) \
-		$(use_with lzma) \
-		$(use_with sqlite sqlite3) \
-		$(use_with ssl openssl) \
-		$(use_with zlib) \
-		$(use_with boost) \
-		--with-python-version=$(IFS=","; echo "${pythonvers[*]}" ) \
-		--disable-modules=$(IFS=","; echo "${disable_modules[*]}" ) \
-		|| die "configure.py failed"
-}
-
-src_compile() {
-	emake CXX="$(tc-getCXX) -pthread" AR="$(tc-getAR) crs" LIB_OPT="-c ${CXXFLAGS}"
-	if use doc; then
-		einfo "Generation of documentation"
-		sphinx-build doc doc_output
-	fi
-}
-
-src_test() {
-	LD_LIBRARY_PATH="${S}" ./botan-test || die "Validation tests failed"
-}
-
-src_install() {
-	emake 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.11 /usr/bin/botan-config
-	dosym botan-1.11.pc /usr/$(get_libdir)/pkgconfig/botan.pc
-
-	use python && python_foreach_impl python_optimize
-
-	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/botan-1.11.34.ebuild b/dev-libs/botan/botan-2.0.0.ebuild
index 87dc9d56708a..a12093de2d13 100644
--- a/dev-libs/botan/botan-1.11.34.ebuild
+++ b/dev-libs/botan/botan-2.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -14,7 +14,7 @@ HOMEPAGE="http://botan.randombit.net/"
 SRC_URI="http://botan.randombit.net/releases/${MY_P}.tgz"
 
 KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos"
-SLOT="0"
+SLOT="0/2"
 LICENSE="BSD"
 IUSE="bindist doc boost python bzip2 libressl lzma sqlite ssl static-libs zlib"
 
@@ -35,7 +35,7 @@ DEPEND="${RDEPEND}
 	doc? ( dev-python/sphinx )"
 
 PATCHES=(
-	"${FILESDIR}/${P}-rng.patch"
+	"${FILESDIR}/${P}-build.patch"
 )
 
 pkg_pretend() {
@@ -49,9 +49,9 @@ pkg_pretend() {
 
 src_prepare() {
 	default
-	sed \
+	use doc || sed \
 		-e "/^install:/s/ docs//" \
-		-i src/build-data/makefile/gmake.in || die "sed failed"
+		-i src/build-data/makefile/gmake.in
 	use python && python_copy_sources
 }
 
@@ -93,6 +93,7 @@ src_configure() {
 		--cpu=${CHOSTARCH} \
 		--with-endian="$(tc-endian)" \
 		--without-sphinx \
+		$(use_with doc sphinx) \
 		$(use_with bzip2) \
 		$(use_with lzma) \
 		$(use_with sqlite sqlite3) \
@@ -106,10 +107,6 @@ src_configure() {
 
 src_compile() {
 	emake CXX="$(tc-getCXX) -pthread" AR="$(tc-getAR) crs" LIB_OPT="-c ${CXXFLAGS}"
-	if use doc; then
-		einfo "Generation of documentation"
-		sphinx-build doc doc_output
-	fi
 }
 
 src_test() {
@@ -124,17 +121,8 @@ src_install() {
 	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.11 /usr/bin/botan-config
-	dosym botan-1.11.pc /usr/$(get_libdir)/pkgconfig/botan.pc
+	dosym botan-2.pc /usr/$(get_libdir)/pkgconfig/botan.pc
 
 	use python && python_foreach_impl python_optimize
-
-	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-2.0.0-build.patch b/dev-libs/botan/files/botan-2.0.0-build.patch
new file mode 100644
index 000000000000..534be31661c3
--- /dev/null
+++ b/dev-libs/botan/files/botan-2.0.0-build.patch
@@ -0,0 +1,26 @@
+From 0d8cbe137261b4f841a05eec5dd5659c8f510de0 Mon Sep 17 00:00:00 2001
+From: Alon Bar-Lev <alon.barlev@gmail.com>
+Date: Mon, 9 Jan 2017 20:59:28 +0200
+Subject: [PATCH] build: pkg-config: fix include directory
+
+Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
+---
+ src/build-data/botan.pc.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/build-data/botan.pc.in b/src/build-data/botan.pc.in
+index 85943ab..753b8cd 100644
+--- a/src/build-data/botan.pc.in
++++ b/src/build-data/botan.pc.in
+@@ -1,7 +1,7 @@
+ prefix=%{prefix}
+ exec_prefix=${prefix}
+ libdir=${prefix}/%{libdir}
+-includedir=${prefix}/include/botan-%{version_major}
++includedir=${prefix}/include/botan-%{version_major}.%{version_minor}
+ 
+ Name: Botan
+ Description: Crypto and TLS for C++11
+-- 
+2.10.2
+