commit:     14ab24951ea392b9e8c62aa3441ac050d6ecdf58
Author:     Alon Bar-Lev <alonbl <AT> gentoo <DOT> org>
AuthorDate: Thu Dec  1 19:07:58 2016 +0000
Commit:     Alon Bar-Lev <alonbl <AT> gentoo <DOT> org>
CommitDate: Thu Dec  1 19:09:18 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14ab2495

dev-libs/botan: version bump

Bug: 601344

Package-Manager: portage-2.3.0

 dev-libs/botan/Manifest                        |   1 +
 dev-libs/botan/botan-1.10.14.ebuild            | 154 +++++++++++++++++++++++++
 dev-libs/botan/files/botan-1.10.14-build.patch |  26 +++++
 3 files changed, 181 insertions(+)

diff --git a/dev-libs/botan/Manifest b/dev-libs/botan/Manifest
index de8009a..d5f8885 100644
--- a/dev-libs/botan/Manifest
+++ b/dev-libs/botan/Manifest
@@ -1,3 +1,4 @@
 DIST Botan-1.10.12.tgz 2707397 SHA256 
affc3a79919577943f896e64d3e4a4dcc4970c5bf80cc98c7f3a3144745eac27 SHA512 
074ed9c89d715ada53a3366139da3f0f2fd7ee01941d301b0a9c1a897927ed88c0ade32f66768091664e6b652b7921b3b4c513106ee6ce1942dece3a25216bf5
 WHIRLPOOL 
bfe7029e5ebf660434b14cd49e0c9f4612e9ee88ad50803edfa589754bede01dc39d71542b62eaaa0f7e85dbf623b4b11a90528bcb903c2333103685ce91401f
 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

diff --git a/dev-libs/botan/botan-1.10.14.ebuild 
b/dev-libs/botan/botan-1.10.14.ebuild
new file mode 100644
index 00000000..1150e0d
--- /dev/null
+++ b/dev-libs/botan/botan-1.10.14.ebuild
@@ -0,0 +1,154 @@
+# 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 python bzip2 gmp ssl static-libs threads zlib"
+
+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? ( >=dev-libs/openssl-0.9.8g:*[bindist=] )"
+DEPEND="${RDEPEND}
+       doc? ( dev-python/sphinx )"
+
+PATCHES=(
+       "${FILESDIR}/${P}-build.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
+       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.14-build.patch 
b/dev-libs/botan/files/botan-1.10.14-build.patch
new file mode 100644
index 00000000..73ee70b
--- /dev/null
+++ b/dev-libs/botan/files/botan-1.10.14-build.patch
@@ -0,0 +1,26 @@
+From d8cb9d52a7e7e7e20cd371349583794e17fd0778 Mon Sep 17 00:00:00 2001
+From: Alon Bar-Lev <alon.bar...@gmail.com>
+Date: Thu, 1 Dec 2016 20:50:35 +0200
+Subject: [PATCH] utils: safeint.h: use botan's to_string
+
+Signed-off-by: Alon Bar-Lev <alon.bar...@gmail.com>
+---
+ src/utils/safeint.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/utils/safeint.h b/src/utils/safeint.h
+index e0bd662..0a03e4e 100644
+--- a/src/utils/safeint.h
++++ b/src/utils/safeint.h
+@@ -17,7 +17,7 @@ class Integer_Overflow_Detected : public Exception
+    {
+    public:
+       Integer_Overflow_Detected(const std::string& file, int line) :
+-         Exception("Integer overflow detected at " + file + ":" + 
std::to_string(line))
++         Exception("Integer overflow detected at " + file + ":" + 
to_string(line))
+          {}
+    };
+ 
+-- 
+2.7.3
+

Reply via email to