gentoo resync : 13.10.2017

6 files changed, 30 insertions, 359 deletions

diff --git a/dev-libs/botan/Manifest b/dev-libs/botan/Manifest
index e260cb31f889..6db7008b944d 100644
--- a/dev-libs/botan/Manifest
+++ b/dev-libs/botan/Manifest
@@ -1,15 +1,10 @@
-AUX botan-1.10.15-c++11.patch 1265 SHA256 242e3d14d39b59a00a50a5a849f11287ca1af3c2ea96f636bdb9ed3b658a16ea SHA512 8d32ee575ad78d0c4182bfbac878fefde43af5180c9d8dc61e8d927682c6dc4d5d321517c1628abc8b2f74d04b9d5bb44756310d9074fffc6b2080ef00911779 WHIRLPOOL ca2a264cf22e3ba5422942fa516289d3d01d895729b1113b096c7dfc5dee55161b2054746d7453d6ec50d6248ca896594d0466721e41ce4eb30fbc2ecb5d4ba1
 AUX botan-1.10.17-build.patch 874 SHA256 cdd8c2d7ce8208a318efb7a7c34e6ecc742dedabe427d99a97d87c43898cfdf4 SHA512 bccb615e832ef31381afd0996a06cfb4c37f29bd8d7691435d592f2ec88f525f3e9e19adf84c78ebd6f24f60e407e29ef99bdff11103ef1344250fe5251fca0a WHIRLPOOL 4e648feefc39c7c22c526dc406dbed70d054979328f1c7926c8dc8fedecc09604797db570cb1686fa7c09808e23ca5869c0e583281e0493eae4351e38f4a4ff4
 AUX botan-1.10.17-libressl.patch 1344 SHA256 a35ae28f74476a9e13a308eedf88aeb875dbb1b19d44378739bd38ea54bf22b9 SHA512 dee61a141a10572c4d4c111527bbca3bd77808a2642ddb9cb105785badc10babd0406b1634c62c355e5361b9281c989666851d0fb81b3e000b62570e429fd642 WHIRLPOOL da49b3f304752d1e4bedd819028b4abb799ed3364dd8e0487c6a2adb181589b5b7fd337fd41bbf502ea45a12c415ac9bd0b06f19124981a00841e0a6e0240532
-AUX botan-2.3.0-build.patch 696 SHA256 e772c61aa125e49d64aa5ae16d7fe6177ce3846656329b430922e74158b30d23 SHA512 1df49a92a4b2e32265db00f09bc7113a5a928d7514f3af40a7e20aadb88188783cc1c2f79b955252bfe05fded51e36b8eaccd26b4b2ddc0caa1108d24edebaf3 WHIRLPOOL 3db9957d5f677dfbb4eb28eecdc6c3c1b5d0b6cc797de00900ccd403bf935fa54d7e15d245cf7a4abf89a6f7d6d208f396af67dcb57d65af64c180e61f4feb7a
-DIST Botan-1.10.15.tgz 2711022 SHA256 c0cc8ffd470fda4b257c3ef9faf5cf93751f4c283dfba878148acafedfab70fe SHA512 c3b93f44ad0de9758af11557833ee570aa0724c8b57c9a576b56ab439a7819e0f71a10857ad367b486716164dd4ff551cab2036ecbbbedd75db4b8dc93416bc8 WHIRLPOOL 834cad8b38787581d8d967b2fa6ffb6164e2bf8a124d993733a7d55202439ec543c18cb6cb03721c0e8eb67cbe2a486b8199b3b8784645e0033be298f36640b9
-DIST Botan-1.10.16.tgz 2711177 SHA256 6c5472401d06527e87adcb53dd270f3c9b1fb688703b04dd7a7cfb86289efe52 SHA512 967137c89484630806e828c3902fe27c28dae17e6a3aeae7c542093de356545be4fcbe4325afd9fb40093a10ac409244e4e6503364858facb59057a5dfd61c03 WHIRLPOOL 86ec99dbadcdf1ff27d1b11a133a15be8385f32cf7f456afa9ca0756e3e0c8e640fff3e5d2753d508cf1136268ae5912b3c610a75d30cf07f206896fb8b5e6a8
+AUX botan-2.3.0-build.patch 1433 SHA256 af6eb7fd14f254d1b2136bc8311c7735af99b450e2df1e1b244a1aefd3455fe6 SHA512 b62758505ec7f6b8cd62a6891c3c721fc5499e529c44f55600f1bb7572d58d2f1707b3d88bde4c8b6eb715b80fb60fdd09ae233c6586df3aeb2146934cfa07a2 WHIRLPOOL ad206e51936516f2819fc02aed5d4c5668e87c4c26ae2f4f4cfad0d204fbe28d79206a2d5c7ce0998605401f4f375e2f9e0ec7024fcce384bac04073bffb0f7b
 DIST Botan-1.10.17.tgz 2706678 SHA256 6847ffb64b8d2f939dccfecc17bd2c80385d08f7621e2c56d3a335118e823613 SHA512 a47cab3af113652247c8efc8b0f043eb62175eaa8554833d5fc3016ea94dbdd8aa722ab9b5226cc5f133afbcc088d54362111630eaa4594812c39925cc3c8649 WHIRLPOOL b2d82fb18ad7f69e26325c797cee939f65211e3b09c7058881633d410acd88e1839960c4be65637b00714b19d06a1c181704a5d184c1890cd7ee75b0e90a301b
 DIST Botan-2.3.0.tgz 5947072 SHA256 39f970fee5986a4c3e425030aef50ac284da18596c004d1a9cce7688c4e6d47c SHA512 a8575bdb2eaa01fb45d8565bea0b54ddf47a21d2fb761fc0a286373b09d51e5a00e84d5cefc51040c5720db66f5625c6bc73ab09cffa9cd42472545610f9892a WHIRLPOOL 295965db5d6d0f21511a6a49f79a80cc7adffb8c67e05c6c09081eae233e2bb5abe506147a7e84ded9ddd1e29faba3276527449da3484e0b07e8bdc03018e211
-EBUILD botan-1.10.15-r1.ebuild 4167 SHA256 8415e0ac517d9ca554cad8c79ad7943c164440e6d503e8b580bb6e11d57ee5e3 SHA512 10d45dab21e759e203167e34fb008c2cb99cc5e2ac8cadd234184c6336538e3c7f4a345edeb949b53479dfae95e151f75b683b45ae56915c39c3a597b6cc6135 WHIRLPOOL 8e1b552f0099ba2a1757487f372382bb32d34524fb4b24e35423ecaec8644db6da93941a899914d5db289c371b50f84aaedd6cc30f945a41f37f0baf442372c4
-EBUILD botan-1.10.16.ebuild 4176 SHA256 ce46692d9b44a2a5b09bfab5dea4ca530cf1fff19c13560b85b31f460d36f4e6 SHA512 0b81973ff69dc5c46a57f98091af521a5cbd3dba43ce7d7264352c3d3a3bf8df61038096c60b028486b9d0cdccc9d3b2d9cf1b724419a439e13f03cae0003389 WHIRLPOOL 23f8d3df49680fe9cd4dbc1c8bb6ecb3917a0448f4370c9ca4409f1d1e63aa4a733f609d6f435a732c9825125aef57bad3aeb784df2a0a642d1d51d112cd7030
 EBUILD botan-1.10.17.ebuild 4215 SHA256 6b8d4c879de466a3c38ed1f229efdf586dbea15c70ae96fb5480a52606701779 SHA512 a8134be2cb93db31e468c7b1dc3559cbd6e54c32d36848df4597da7a49ca8d8d027ff9695393d6902e06dbdf101eac1ef55542bef366ce8ed334f2a7fe8e4b0c WHIRLPOOL 9938c1be7e0ac2bc07aeab34d02654b273a946365e832ecaa9ff7b75d47fa92851930538c526aeb9e3e683712e246c0b22e6008e92de2187903f09ccdb1fefa4
 EBUILD botan-2.3.0.ebuild 2785 SHA256 b124c8615b58a04ea31ab6f6d09e86ee6044e3d3ae4e0e018eb5b596c3070153 SHA512 f222c6c03ea2bd0d6c3e2eb1f692379533992d217e7e2a277b0af293d72b0a4689bc784def9c02b58138ea683e97df9ac8f7ee7c63815e010ccfde1244891466 WHIRLPOOL 9f100014fc46860ee502069d5cecd5dd8779181b8d2cfc75a4154a0f7e1b51ae30f0bf7ad9c997d656c35cee518c440060384bc4119b7e41478784419cac2efc
 MISC ChangeLog 6990 SHA256 f7855ce06f452ae297417cfd5f5db8b33910da4bfd5d82615df64c73c82b07bf SHA512 55758698c3013d9a58546846d5fcb05bd0ec3552a027a7f398c35074b4ab06194f19282b59bccff11610f5fcf044a96ea5d96d32ea4bc19f4b12e4739cca61a5 WHIRLPOOL 83a724604833f2521a1eec7cfa512a952a020313e0d8492babe0a18a8108dd43b5869315433092fcb34ea3cea2fc50cd77000c689969e9d3c988086ef81f25f5
 MISC ChangeLog-2015 14001 SHA256 3965f2c6b8727a5d23738c6a204c1786dedff49d5c4ed7a0d5e310993a10dee4 SHA512 89e3c0d3264354d2b926f971a3a86df4eba9961b680e55e951d2fcb17a1c9b02dedb3d098e90502be6c1b4152e0adbd5cf55d2e56ee5904403c1d6d8b2ee1603 WHIRLPOOL 66370d148c79167a19afe2af5061ce9f7d59b36e9d490adf0ed2d6d871c24cba770a3ce077c8f3b5fe9fc8b95fae66966fce151c41f2b5db5b7df2c9361df031
-MISC metadata.xml 683 SHA256 b7e03ba1e71b686705d8e94a7245cdd5d0fb48c96d7a2a792b012ad84650bcc4 SHA512 792021073ffb70c832f90e572949a89c8c0c0b310dc564def23018024ec38c9d23ec932378e124ca5aa4331d509abce73df53e2a9f44a9eea3a2def55cf72f95 WHIRLPOOL 303d50a9a55ab25fb61326f3443a0cfb105285ee292597c8138c4d1db26d167e35115d5b70ae317a72840c426275a7bd32489bbbcf8d3feac593b403a036efba
+MISC metadata.xml 675 SHA256 c86bd29cffeb04c5d3382cb52c86cb4f916528ff8bafe05726edec1c31bb8da7 SHA512 6773167b2e46f8d2251d369bd668a2ea309ce3b874166ebd102c7758f1f23a215f47d6581999d49325e9fdda88082ab46db8dc4f98ad6a20722f50a56b474b39 WHIRLPOOL 0ff7fa4ed48c45cae28d8cffc23543aa30a874bb146f992a21a0cddf20ca6ac6e57ac1482e8d059446a58970ac6694a84a7ac1ee2f445a0a32f5e5cbbe508cdb
diff --git a/dev-libs/botan/botan-1.10.15-r1.ebuild b/dev-libs/botan/botan-1.10.15-r1.ebuild
deleted file mode 100644
index 6d62a12760ff..000000000000
--- a/dev-libs/botan/botan-1.10.15-r1.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit 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 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:0=[bindist=] )
-		libressl? ( dev-libs/libressl:0= )
-	)"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx )"
-
-PATCHES=(
-	"${FILESDIR}/${P}-c++11.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/botan-1.10.16.ebuild b/dev-libs/botan/botan-1.10.16.ebuild
deleted file mode 100644
index 5cbafc9aab1f..000000000000
--- a/dev-libs/botan/botan-1.10.16.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit 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 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:0=[bindist=] )
-		libressl? ( dev-libs/libressl:0= )
-	)"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.10.15-c++11.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.15-c++11.patch b/dev-libs/botan/files/botan-1.10.15-c++11.patch
deleted file mode 100644
index e47b56600fe1..000000000000
--- a/dev-libs/botan/files/botan-1.10.15-c++11.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From dc2834f708a6d857b1a7f9587d5a28af271103e5 Mon Sep 17 00:00:00 2001
-From: Peter-Levine <plevine457@gmail.com>
-Date: Mon, 20 Mar 2017 22:13:21 -0400
-Subject: [PATCH] Allow destructor to throw when building with >=C++11
-
-After C++11, destructors default to `noexcept(true)`.  Thus, any throw statements in destructors become calls to `std::terminate()`.  To enable the intended throw statement, the destructor must be explicitly marked `noexcept(false)`.
----
- src/alloc/alloc_mmap/mmap_mem.cpp | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/src/alloc/alloc_mmap/mmap_mem.cpp b/src/alloc/alloc_mmap/mmap_mem.cpp
-index 17c189e..2637533 100644
---- a/src/alloc/alloc_mmap/mmap_mem.cpp
-+++ b/src/alloc/alloc_mmap/mmap_mem.cpp
-@@ -21,6 +21,12 @@
-    #define MAP_FAILED -1
- #endif
- 
-+#if __cplusplus >= 201103L
-+#define NOEXCEPT noexcept(false)
-+#else
-+#define NOEXCEPT
-+#endif
-+
- namespace Botan {
- 
- namespace {
-@@ -66,7 +72,7 @@ void* MemoryMapping_Allocator::alloc_block(size_t n)
-                throw MemoryMapping_Failed("Could not unlink temporary file");
-             }
- 
--         ~TemporaryFile()
-+         ~TemporaryFile() NOEXCEPT
-             {
-             /*
-             * We can safely close here, because post-mmap the file
diff --git a/dev-libs/botan/files/botan-2.3.0-build.patch b/dev-libs/botan/files/botan-2.3.0-build.patch
index b4d4ca6e694f..06d44cd0c491 100644
--- a/dev-libs/botan/files/botan-2.3.0-build.patch
+++ b/dev-libs/botan/files/botan-2.3.0-build.patch
@@ -20,3 +20,29 @@ index 9580bc9c5..fabaccb18 100644
  
  namespace Botan {
  
+From 8526077c273c752661786e0ef5d9f7b945c83931 Mon Sep 17 00:00:00 2001
+From: Alon Bar-Lev <alon.barlev@gmail.com>
+Date: Fri, 13 Oct 2017 19:34:25 +0300
+Subject: [PATCH] Add limits.h header for INT_MAX
+
+Gentoo-Bug: https://bugs.gentoo.org/633468
+Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
+---
+ src/lib/prov/openssl/openssl_rsa.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/lib/prov/openssl/openssl_rsa.cpp b/src/lib/prov/openssl/openssl_rsa.cpp
+index fae869b..ab5ac64 100644
+--- a/src/lib/prov/openssl/openssl_rsa.cpp
++++ b/src/lib/prov/openssl/openssl_rsa.cpp
+@@ -22,6 +22,7 @@
+ #include <openssl/x509.h>
+ #include <openssl/err.h>
+ #include <openssl/rand.h>
++#include <limits.h>
+ 
+ namespace Botan {
+ 
+-- 
+2.13.6
+
diff --git a/dev-libs/botan/metadata.xml b/dev-libs/botan/metadata.xml
index 2ca55344e897..a19f7404a1a8 100644
--- a/dev-libs/botan/metadata.xml
+++ b/dev-libs/botan/metadata.xml
@@ -3,8 +3,8 @@
 <pkgmetadata>
 	<maintainer type="person">
 		<email>lloyd@randombit.net</email>
-	    	<name>Jack Lloyd </name>
-    		<description>Ebuild contributor and botan author</description>
+		<name>Jack Lloyd </name>
+		<description>Ebuild contributor and botan author</description>
 	</maintainer>
 	<maintainer type="project">
 		<email>crypto@gentoo.org</email>