gentoo resync : 13.10.2017

20 files changed, 184 insertions, 499 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>
diff --git a/dev-libs/libiconv/Manifest b/dev-libs/libiconv/Manifest
index 885dfc3dfa0b..ad077c9bd786 100644
--- a/dev-libs/libiconv/Manifest
+++ b/dev-libs/libiconv/Manifest
@@ -1,9 +1,12 @@
 AUX libiconv-1.10-link.patch 910 SHA256 99618454073097c4946acd4df69f2af961f7bfd3b52d0e385722a6cc4b81d8d8 SHA512 348700cbc210aad66ea5ff9099b9a871210f211ca2f241be5332b90810b886965b2d5c4a462979f164bd51be033be1ad2f6e92c6efe4171afa0a12db8153bb5d WHIRLPOOL f31c3e61cf49ab99320406a8842be743f61b76be4291fb1b02839b6b0a0950f4d310fc5cc067dfb348eb30550e3634c01f08bcde94af925ef2deb0b0abd4fdee
 AUX libiconv-1.14-no-gets.patch 836 SHA256 36742e571eaf7ec63856ec5dbcf8780fa724a72be4287596d32d23b5c4532af3 SHA512 3bb04769c46964d4357aba57b16a2cbdb5c666d839d46fcc0a11be945da9e855f5e0682c2dccd2fd66baab74e3429040849c503e9bcd05e53962f7680b2c0713 WHIRLPOOL 887ffcaaf0ac7634e238055c13abe14a6d4147d34e420c8c24e7337c4e55cdb82822802693573dc884ce6401a78dbf1fcaa9a92c08757fafae713d31c25aeed7
+AUX libiconv-1.15-no-gets.patch 796 SHA256 2464a9b7cabb80ca3220cfb39ec0eeccab6fc728cd8aacb997e0dbaba923e54c SHA512 39c32470cb802d74ee6f97071e74a4cedc8374cf60b50f470ca318066fe45a71ed89c5c77dc7b3e70f0a3a33ccca7beedf6e96863a431515e957883467325bde WHIRLPOOL 16a3c8c0687d2506b6f0df5688b017e4997a65e4aa2aa9f4f20becb298a1a5403b4240a0fd31360b5a8762f602d0fcb2b80184fba0070185d85f3711a4fc1089
 DIST libiconv-1.14.tar.gz 4984397 SHA256 72b24ded17d687193c3366d0ebe7cde1e6b18f0df8c55438ac95be39e8a30613 SHA512 b96774fefc4fa1d07948fcc667027701373c34ebf9c4101000428e048addd85a5bb5e05e59f80eb783a3054a3a8a3c0da909450053275bbbf3ffde511eb3f387 WHIRLPOOL e96337209a4f86eccb112e94c3cd6b668b2a8fc4b05ed7becaa2f6fbc9279f7b32ec1fa4b086e61520bfffea5d4f7a1cad58bdb266b5f0aa7d02b89aeed9759a
+DIST libiconv-1.15.tar.gz 5264188 SHA256 ccf536620a45458d26ba83887a983b96827001e92a13847b45e4925cc8913178 SHA512 1233fe3ca09341b53354fd4bfe342a7589181145a1232c9919583a8c9979636855839049f3406f253a9d9829908816bb71fd6d34dd544ba290d6f04251376b1a WHIRLPOOL fabb05b64dc4d51c53b0e82a017c5966de0aba23baa8fd25d09ba14a4327fe8c296365d3f31bedb459bd85cb60c2623ec162b8e0c363f2c56887c4e278323747
 EBUILD libiconv-1.14-r1.ebuild 1385 SHA256 02277445e32d82e69fb04b523a49ffb285eee5a2aafbd9bca4cdb92b9b2c7cfb SHA512 73fe8e4bd0f1bc966d5bf15c0c1409078cf652397c47223cbca210127ed86759337abf7c7bf296268f9f75dda25d41808ca1af3edea50a7029344f0cbc21f744 WHIRLPOOL 9421755b0011fa8d28afb91aa9b22e167112be89104c81b1905fe481c4c66974a8792b304fae511a382468bc1d78e2a29de583d203c95aca54fb7bf28cc947a5
 EBUILD libiconv-1.14-r2.ebuild 1515 SHA256 437a70ac535520b561d85ac6212f315d492bff5fde0cf3e4a577c801a0ee9297 SHA512 b1cd99126fdb3365b228f386792ad94e6e8ddb6567e7a1d2552c89d40766f304893c30e231dfb57b23a35ed5b3101a8f7065410b3147c70d77ae4abc861f6c52 WHIRLPOOL c00acd309578533bcaa2bfeb168ed4b2079058a81ed1d6334ff672a8036fdc4d9fe793028cce81b05c844a018b25c1e9153a5f72752a6e796a6147add0a44d78
 EBUILD libiconv-1.14.ebuild 986 SHA256 e25d66564ec12edd9ce6564a932284abe5d68f5fc1374dd0b8aa1ca316c01121 SHA512 4a3bee9887d6a39f4e96684548f71e5a494d21b3fec6b0b413ba4e34b7894799bf9114f72072a449a4925856b28b4c9c001e2b9ceceb55eb75677c2327ee7bf1 WHIRLPOOL 072ef9b360aa5260b9e4b2b2eb5e46871eea7dce9317b5cdb07672849bc3037de780da6cdd6ce54bdfd6b1bf858ae07f4ffcc8b651293913733857ccf2eab854
+EBUILD libiconv-1.15.ebuild 1891 SHA256 f95658d36cfeb0668205993da51809f970540377d72b58adfb1a35f5166c9c89 SHA512 e19b29a2c8bfdd50419074c25f131cc6eb5b9184586d7d5e1b4e1e358f42cdcaed3d7c6942b20fefc81275681c2bd9c262f4675677608ab61ddd0b57ce86a677 WHIRLPOOL a07267fc7523432b8652d155c9e8ddfcea01badb09600d621f6e97fd6793b300a5f76ee730d8ece64b29fd21edf9e0bf286298bada4ff4509f32d91886fd9987
 MISC ChangeLog 3737 SHA256 67305cdc6702794c17f34b6f05ec4c6535298cfce47e5c254134bfad586706fc SHA512 615e7fa483282d33ba1be5e8ef9658ad79253dfa3a2330a62b6e8531893a9cd2f6f75c3fe144e45d81fd109e2f47445ef015841ab2ece40112b1c0294a3b5c01 WHIRLPOOL 2df98f9925b9e8ac6eda81875d8a800c70405072f6ec2cb22d545070bb042aaee579ec92dd7b2dcf71f4380166ff33d32e0abbc2c9991af99f1227543290ac5b
 MISC ChangeLog-2015 7092 SHA256 89405bfc417dfdbe0ba095a1c4690461cf77f7d5e93dd9774692786e059915cb SHA512 33c2c31a7630adab5f5223e74601389c02e18131d597ee5614f9f970ee25f8574eac5e82109461c297a0744de61b85684891b41341f73af488d33683060fa497 WHIRLPOOL cc76fd0b871d8309398678562c4bb888783438db9f6d2d2963e41d22a625c5fc86a6c72b4fc4b5f0b6060da7d88ab1bc06305e8df5dca94511b569fcb123486d
 MISC metadata.xml 564 SHA256 2cde04a8c5d739116a75feb61677ddfa46b40cc67f4808de166deb9d48abc49c SHA512 7c13a258f15e61b3e5fd3e55411466f8830d83ecc25676d491635037be07b1a35b845ec5a06d56c26ecefb8865149e486e939a72111d1a3e46efc26b87d632a6 WHIRLPOOL a3af71368638bf19dcda250c5e3645f505cc019959880b6b321c16df0ba875b3e5bc65774ae126b1a320764fdd8452e76c1653febb2d2d89e4bc850f8f54c730
diff --git a/dev-libs/libiconv/files/libiconv-1.15-no-gets.patch b/dev-libs/libiconv/files/libiconv-1.15-no-gets.patch
new file mode 100644
index 000000000000..5bc20b377493
--- /dev/null
+++ b/dev-libs/libiconv/files/libiconv-1.15-no-gets.patch
@@ -0,0 +1,22 @@
+hack until gzip pulls a newer gnulib version
+
+From 66712c23388e93e5c518ebc8515140fa0c807348 Mon Sep 17 00:00:00 2001
+From: Eric Blake <eblake@redhat.com>
+Date: Thu, 29 Mar 2012 13:30:41 -0600
+Subject: [PATCH] stdio: don't assume gets any more
+
+Gnulib intentionally does not have a gets module, and now that C11
+and glibc have dropped it, we should be more proactive about warning
+any user on a platform that still has a declaration of this dangerous
+interface.
+
+--- a/srclib/stdio.in.h
++++ b/srclib/stdio.in.h
+@@ -744,7 +744,6 @@ _GL_WARN_ON_USE (getline, "getline is un
+    removed it.  */
+ #undef gets
+ #if HAVE_RAW_DECL_GETS && !defined __cplusplus
+-_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
+ #endif
+ 
+ #if @GNULIB_OBSTACK_PRINTF@ || @GNULIB_OBSTACK_PRINTF_POSIX@
diff --git a/dev-libs/libiconv/libiconv-1.15.ebuild b/dev-libs/libiconv/libiconv-1.15.ebuild
new file mode 100644
index 000000000000..5b0db6586609
--- /dev/null
+++ b/dev-libs/libiconv/libiconv-1.15.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit libtool toolchain-funcs multilib-minimal
+
+DESCRIPTION="GNU charset conversion library for libc which doesn't implement it"
+HOMEPAGE="https://www.gnu.org/software/libiconv/"
+SRC_URI="mirror://gnu/libiconv/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE="prefix static-libs"
+
+DEPEND="!sys-libs/glibc
+	!userland_GNU? ( !sys-apps/man-pages )"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.15-no-gets.patch"
+)
+
+src_prepare() {
+	default
+	elibtoolize
+}
+
+multilib_src_configure() {
+	if use prefix ; then
+		# In Prefix we want to have the same header declaration on every
+		# platform, so make configure find that it should do
+		# "const char * *inbuf"
+		export am_cv_func_iconv=no
+	fi
+	# Disable NLS support because that creates a circular dependency
+	# between libiconv and gettext
+	ECONF_SOURCE="${S}" \
+	econf \
+		--docdir="\$(datarootdir)/doc/${PF}/html" \
+		--disable-nls \
+		--enable-shared \
+		$(use_enable static-libs static)
+}
+
+multilib_src_install_all() {
+	use static-libs || find "${ED}" -name 'lib*.la' -delete
+
+	# Install in /lib as utils installed in /lib like gnutar
+	# can depend on this
+	gen_usr_ldscript -a iconv charset
+
+	# If we have a GNU userland, we probably have sys-apps/man-pages
+	# installed, which means we want to rename our copies #503162.
+	# The use of USELAND=GNU is kind of a hack though ...
+	if use userland_GNU ; then
+		cd "${ED}"/usr/share/man || die
+		local f
+		for f in man*/*.[0-9] ; do
+			mv "${f}" "${f%/*}/${PN}-${f#*/}" || die
+		done
+	fi
+}
diff --git a/dev-libs/libzia/Manifest b/dev-libs/libzia/Manifest
new file mode 100644
index 000000000000..5c76f90eca8b
--- /dev/null
+++ b/dev-libs/libzia/Manifest
@@ -0,0 +1,3 @@
+DIST libzia-4.11.tar.gz 577185 SHA256 39153c74bdf9b542b0295263500fe9fbbf9992a932a3c31c5b879c4d1d630094 SHA512 6d616ca12e1db20c8bbbe0a18b4e1e0ce1b086b38123762c2e4c3f46390ff5772dd27eb9b97b332b20f3430905f6eae0fdce70aca48fd56d5e43043369233964 WHIRLPOOL d4d904d2afcf840bea24a82a515c5f8034b814b5904b5cc79d1c415b655f00ff9f6d9ed318ec1e93267a3ef1cefd14b72a904f20c72bc378f086b8c958d58faf
+EBUILD libzia-4.11.ebuild 709 SHA256 8c2e3c3bdfc2d542484ccb9d633730a71b0ee7657271b56ee2e2a6bcfff6146d SHA512 147435ce3b7a05fd10dd8c905904b20f082a55086095392fc0f3bd61b833ce6d44cac36156e0679d7aec9dbca808d1c02960d0be1dea63d4558c741ca84dc8d8 WHIRLPOOL ed393d2414db72b25ba9caf024bd47bfae3575c89c38fe9b3fd8b51724c770778ab19b1e62a7c89a711fddd7caf27e8021a6e0a87d7ceacf9b4fb7214609057f
+MISC metadata.xml 451 SHA256 1d39f4d8ed02aec02a54fbec50f2e3134704eeb13e14d063aa8a412a0ead13a6 SHA512 4551ac2be822a0d0bcc9952d3c62f995b705f68b15c8fa86dc263b68d93619705aa70a9518bf78c8a509a246ffdd7301f7b64f924781ae285a081c86fe0b4773 WHIRLPOOL 8fdf491fbc57f4a77294799c37094b3d11af80781497780918bc9b5482023ef4c55824c161190ad7c82082a43d4bc8326b318e8308037e84b08cf316e4e06c58
diff --git a/dev-libs/libzia/libzia-4.11.ebuild b/dev-libs/libzia/libzia-4.11.ebuild
new file mode 100644
index 000000000000..6733478ee5ca
--- /dev/null
+++ b/dev-libs/libzia/libzia-4.11.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools
+
+DESCRIPTION="platform abstraction code for tucnak package"
+HOMEPAGE="http://tucnak.nagano.cz"
+SRC_URI="http://tucnak.nagano.cz/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ftdi"
+
+RDEPEND="dev-libs/glib:2
+	x11-libs/gtk+:2
+	media-libs/libsdl
+	media-libs/libpng:0
+	ftdi? ( dev-embedded/libftdi:0 )"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	eapply_user
+	sed -i -e "s/docsdir/#docsdir/g" \
+		   -e "s/docs_/#docs_/g" Makefile.am || die
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_with ftdi) --with-sdl \
+		--with-png --without-bfd
+}
diff --git a/dev-libs/libzia/metadata.xml b/dev-libs/libzia/metadata.xml
new file mode 100644
index 000000000000..b845e64532d2
--- /dev/null
+++ b/dev-libs/libzia/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>tomjbe@gentoo.org</email>
+		<name>Thomas Beierlein</name>
+	</maintainer>
+	<use>
+		<flag name="ftdi">Enable support for FTDI USB chips</flag>
+	</use>
+	<longdescription>
+		libzia contains the platform abstraction layer for 
+		the media-radio/tucnak package
+	</longdescription>
+</pkgmetadata>
diff --git a/dev-libs/protobuf-c/Manifest b/dev-libs/protobuf-c/Manifest
index 2f2e05fa0f3e..82605329518c 100644
--- a/dev-libs/protobuf-c/Manifest
+++ b/dev-libs/protobuf-c/Manifest
@@ -9,7 +9,7 @@ DIST protobuf-c-1.3.0.tar.gz 488443 SHA256 5dc9ad7a9b889cf7c8ff6bf72215f1874a902
 EBUILD protobuf-c-1.0.2-r1.ebuild 590 SHA256 ad78642e709931e6be731df9a63a5a8226bd7bd1b13adafb50a80a83b8321362 SHA512 947afcdeb6d9c563d38cd163c01f0a37ed5a0c10643648732de09717458640bddb024d927fd290bffbb320cf50aba7633e0008decf3959a9ba39e1cbaf819e67 WHIRLPOOL 6e4d1b01e86bccebaf56e6cffeebb6e5fc833d8f48cb2573ff33ab1cd0b7077a4e68fda89203085b0fa732593c6e7003dec88b693f5d28bbfb155c8bf503432e
 EBUILD protobuf-c-1.1.1.ebuild 818 SHA256 9c3e58ce43ecb8ef63e826f08bc812f35ccd7343bb5cd7d8fc9aef40536f51ce SHA512 9d00a07f79210aba5879f9c8691f3398de1062ee403fbd289a5a642994ad1ea60de80f58da3a21437defb6ed4244965c781b07d569ddd018ae45adc5bfe9db6d WHIRLPOOL 01f440a95eb8d3ff7019df93154b158a08837b7ff1da98952125ed1d506f3c2ebae83be062f48b2fff7a360a7d270a8e37d2735e2e3a968fdd3eefafe621dd3c
 EBUILD protobuf-c-1.2.1-r1.ebuild 916 SHA256 aae2c9ebe375b5d5981ff1ea8dd790208622e32bef8f0f231c2d674e9214a8bb SHA512 e81103c60409ee2d448c1c136d8d987948107e23f8e8e568dd882d054f225ed207d815cfe3ccf1befdf8363a010e90520f76b33c5daa9830f8121749acc07620 WHIRLPOOL e149d144b697a55886122724a7f9fe00efef96fe43e0b5cc8537347481bd22d20a8d4fc4d0db0c3a49a6edde2eee7190ebc5a0d5763d323c5f80048c4203e29a
-EBUILD protobuf-c-1.3.0-r1.ebuild 995 SHA256 575f9b213f5a59eae5cbd275cdca5c09b6ebc4c70a27e9dc41378cdb603e405c SHA512 a17dead9219b51a8d7510803c61cbf56366ed7af1c269cefbb9f14e4784eeb14cbb7114e57229a0aa5aa0d770e92846049010787b5abf763f2e1264cf4cca4c0 WHIRLPOOL bfefd4bdeb72e1739494b97b84da15f72ca52bed9415027bb2fa93becacd2b2f270b9bad34de1de4939161f0c660e30df7cd397a1f6b1f27177f5f5552ffe2ad
+EBUILD protobuf-c-1.3.0-r1.ebuild 994 SHA256 0b8b98e791ccf22496e28529561e09a876b8384ea9dfedc0b65040e5eb65a10d SHA512 4f967920142737bdc1932ed2fb3f7e20758888d773c9488e9a5ceb98d3a75459927da70a6964737492a0b3a68abe35483bab72edca4079d47f8429a788d66a32 WHIRLPOOL f0e9f89343f5418193c6982834d63eed1dcc0780693e9b66ba063ef59be933abaf5b0fa48cd359af19bd4b0a05b45ca96ee6cdcda5af0dcb14b5e8ffc59b853a
 EBUILD protobuf-c-1.3.0.ebuild 922 SHA256 d8d8525050a92ae1021cdeecc96b158748992f9e0b2e7d26b6d8956002258948 SHA512 ba060b39dbce6fa37ecbc940b5540bdfd81840d4f3c4bca2fd4e5830eb3f912a29bc49dc13e76d46fbe17e05be6543c892b7957d6a7e6c15ae71da84a87d5506 WHIRLPOOL cd72735ce66e505629e6d1acbb7308e0ac0b398dff1acf346d22b5a3a504ebeabfc5ce63c8d87415853c22999f68afe1aea67b4c1b7b2d2570062dd5adaf978e
 MISC ChangeLog 4497 SHA256 ab298f2c999c1f0028644b06dd65aa9225aef6c73c57a0f34e0182cc6916f87e SHA512 8e7eb73794fb593c1d1f8dabcc79918dbe66b5f492b597fc698a342b537f2c0ed100904ed17432e42c553e7d91ce4db53ac0f78fb789fd25dd52f2bf84fdb23f WHIRLPOOL 69d84b141f24bcdf2b6ff1e443709761be2b7dc7eab1191f5691fff157d552daf68de5321af2f45c6a80c2bdabdc3d98e5ba47aa52059c61407a3485d2993aaf
 MISC ChangeLog-2015 3651 SHA256 8b60d31f7f97b271a80ac15bd38386aabf615f08ef089c1b112b595dacb9fcae SHA512 bfc72890482df31bbe9ddd1be5114d8068e95650bec4a054ec9441c952fe86b7727656e770b7520d259f58e0e6cd927ce029c92cd09fb887554dacdc4b5e42aa WHIRLPOOL bbea1a0839ae0fedaec7f1f72b996a85827ecbad4a2710b725d47a827ccac9c56a9202fad463d4a62179799e7778836b06372d6e175d54ae06012958d3ece9e7
diff --git a/dev-libs/protobuf-c/protobuf-c-1.3.0-r1.ebuild b/dev-libs/protobuf-c/protobuf-c-1.3.0-r1.ebuild
index 06429a30746b..9a8adfbe00b3 100644
--- a/dev-libs/protobuf-c/protobuf-c-1.3.0-r1.ebuild
+++ b/dev-libs/protobuf-c/protobuf-c-1.3.0-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${MY_PV}/${MY_P}.tar.
 LICENSE="BSD-2"
 # Subslot == SONAME version
 SLOT="0/1.0.0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86"
 IUSE="static-libs test"
 
 RDEPEND=">=dev-libs/protobuf-2.6.0:0=[${MULTILIB_USEDEP}]"
diff --git a/dev-libs/volume_key/Manifest b/dev-libs/volume_key/Manifest
index f2aa581a3c00..96f9552342b4 100644
--- a/dev-libs/volume_key/Manifest
+++ b/dev-libs/volume_key/Manifest
@@ -1,5 +1,5 @@
 AUX volume_key-0.3.9-config.h.diff 819 SHA256 de5f66ee91a652874dea2e09742c26ea16c41b053eef167f375876deb2b18757 SHA512 ce8fd4fd60baacda3bfd88de86f5251bd9394f4b13dbb0ece494a07c3510429c458cef051cf56d9ef04b97e7120898ab62585fd1966a93724ea0476a9d465c04 WHIRLPOOL 5a6afb754979d2132c7fd02cc7f3aa4e8fb2882456ada6b19364da72df1f620055825b78ff19f6d61c7f2df455516b94cf0e2bedd69daeb680deb16fdb67ecdf
 AUX volume_key-0.3.9-find_python.patch 1845 SHA256 18da65782c7294ea8ddc1bbd06ecf22c6c33e2a474c4614e696265cc5d65e1e5 SHA512 5b2de4c5c18bb17fbf2a7e5de8adc36d919c5e98aafc33bbd3464ab60ce520ee0b4da0447f7e55ae262c9f6243936badd20f8ce5f9f3367188d80ba28932d0d7 WHIRLPOOL dc10ade55e83b7a7183301d105f4771067051dad25d4a840d957d751d1237275ade43481173f41d3afe9707a42b3dfdfe6760682164bffdbf57d8d999b3dbc3d
 DIST volume_key-0.3.9.tar.xz 445092 SHA256 450a54fe9bf56acec6850c1e71371d3e4913c9ca1ef0cdc3a517b4b6910412a6 SHA512 bc0e690997b9fa1c9fff361d04e7eddcac4cac09779d7a1f9e161be117f5c589a7e444ac16dab25fb3e3ce201591f7dc937595ddf2745d7daa625d4ab0a255e0 WHIRLPOOL 928279511717a8fcd94a13b52c1450770f8f22aed4334a4dc87440cf3ffa706e99de6dac21ac8a7e6db990570525e4cf5f163b92351239d95dcf0b3f2b7cd8c7
-EBUILD volume_key-0.3.9.ebuild 900 SHA256 6c57a91e8ec3c45456f51c2c65aabe738e824b03355bdddddf390b838754c997 SHA512 55d1ccc55fa48d1eb9811ad098ea34ead889b5927533aa87cfa83ec704ea5b9c9be83b97a9e60ff135d0a9be39f82b49f6a7fa9b9a03d13cf860c43bd7ca435d WHIRLPOOL e5975a2fa3d12c7efcdca31c2ee3f0f63be40d803c13a0f6dc259b008527d6dd04e8e6bda5baf298b9cdc966b6d46c865421f5d29d20e6487783061fe7bb1ff7
+EBUILD volume_key-0.3.9.ebuild 875 SHA256 447bec6a54fde7b791f5bcb9b4e155b27312512df082d0916f9ad027e26af4f1 SHA512 2722a28a46e7315f1f77600bb32e3f5b1a00d1b2577d2fab9011443d10fae502d60fcebc53d4f418535034867b40a49eba362834df23235acabac2232cf5aac2 WHIRLPOOL 32281724a8d6a0cfeaa8390122e2a764159a4262518fbf543fa0e592ec508a2eec037c47205b90fc7753e68b9bf41bf17461c90707ef1220061b836f1b9897e0
 MISC metadata.xml 257 SHA256 60e4ef3049f5fa18420a7f022f935739458c852364eae6f39636410f0902c089 SHA512 ff078cacb115b8f3624b45d883d8ed72701e3d2fccae06c04c633eb60821b23681cc151e00689d1b6035c94570535e7ac0de51a55dae99f606886164883185ea WHIRLPOOL 81d95f2549c08fe57538c904c4d9d89f5c12c342e3ad031414bd4abb4e58fc8a0c37edbd62941fbdbf2b5b69ab2bec2e6798704b53b35f78806d625ae7377697
diff --git a/dev-libs/volume_key/volume_key-0.3.9.ebuild b/dev-libs/volume_key/volume_key-0.3.9.ebuild
index 7c6d96f24964..6edf1dda06a0 100644
--- a/dev-libs/volume_key/volume_key-0.3.9.ebuild
+++ b/dev-libs/volume_key/volume_key-0.3.9.ebuild
@@ -18,21 +18,19 @@ IUSE="test"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-COMMON_DEPEND="
+RDEPEND="
+	app-crypt/gpgme
 	dev-libs/glib:2
+	dev-libs/nspr
 	dev-libs/nss
 	sys-apps/util-linux
-	sys-devel/gettext
+	sys-fs/cryptsetup:=
 "
 DEPEND="
-	${COMMON_DEPEND}
-	app-crypt/gpgme
-	sys-fs/cryptsetup
+	${RDEPEND}
+	sys-devel/gettext
 	test? ( dev-libs/nss[utils] )
 	"
-RDEPEND="
-	${COMMON_DEPEND}
-"
 
 RESTRICT="test" # possible gpgme issue
 
diff --git a/dev-libs/xmlsec/Manifest b/dev-libs/xmlsec/Manifest
index ffff0f7dd534..92555638382a 100644
--- a/dev-libs/xmlsec/Manifest
+++ b/dev-libs/xmlsec/Manifest
@@ -1,8 +1,5 @@
-DIST xmlsec1-1.2.23.tar.gz 1794694 SHA256 41d463d16c9894cd3317098d027c038039c6d896b9cbb9bad9c4e29959e10e9f SHA512 20b0c0ba517c764fcd32165254ae6dcdda8fb72ca3279dbfcf42d899e91d380b78d9be3b1c3d32910eaad5544a4fc51218e32579b10e6b6639338a7bd8b1ddc5 WHIRLPOOL f4d783d01346860ed2cf1d15e692e70e65034bee120c853cf7692358799a6e3339a1bb022f4d72ee4364adddd43766aa01770070a0081d1adcc588e4f84786f9
 DIST xmlsec1-1.2.24.tar.gz 1835762 SHA256 99a8643f118bb1261a72162f83e2deba0f4f690893b4b90e1be4f708e8d481cc SHA512 a01feb9af8f85e77f2c5d2d7f596fba3ef58bc593cb9a7c3e883deb38f8292598ba5aa09fa59897fe303f10336a10b0bb0f27171f2b6e6251e694f37f0b9b7d4 WHIRLPOOL d6fbaf232c10a589a2dbe608ad1a29ebc7b80b535e1036a66b75fbdf3d7154e7297b901b035fdd31b992684b4006050a6421dcd9a9f7c1ea2e4b11d83544bf73
-EBUILD xmlsec-1.2.23.ebuild 1407 SHA256 cec13e8af13a7420a6f82d5a269c71c164dd87624a271a96b94358450b2841f2 SHA512 860633f225de63823e3d9fc60cf8cf7ad087e728c8b0200e147996922dc174e34766487cf7f80d0d452646aacbe48d19a78baccdb3f8e13c379f6af4228770b8 WHIRLPOOL 2b6c9b0122b761c3575e11d090b34890bf6a23780f83aed2986d8b2637365aa9c429e95549c380e3152898c6776f595e63d4fa4ad07d08e7d4ff87ecbe48389d
-EBUILD xmlsec-1.2.24-r1.ebuild 1478 SHA256 a550728f07ec31fcf999dcda896a63e21dfb4a8c6b02e5568b636d67df71ad05 SHA512 9be337c99c8d5691070bed576838851edad5be6bc21db3f92691c606845e5f404fa47f0d73dc78e998790c5d14f02797d15e8cb436f54bf9d0211d3cf7b297cb WHIRLPOOL 34df47bd6e47b86ba0d898b10c10760bd81783d4ab9fe093ba0cb8ad4a142ed18d906052ad79b91b7090d7e9bc0b2858789c35c8a066f01f58a06d0f9ad899bf
-EBUILD xmlsec-1.2.24.ebuild 1415 SHA256 5677049f9a14dc2c04fe21f8a3bec3421dd208736a31277b4526d3ad8d85bdd0 SHA512 4c0a57395224a7439020471c4f42d94cc217144b10eeac39067e6dfe64d58af57e19735efe9c31dab33a2a4f8eec667d07dc1f3d515320e6d719a27cff43521d WHIRLPOOL 4d0d5cdc726ba4d73020a42680cd72864222abab750e8bacdaa9753a75a4d32555932db72828dcc77931d88c4fd096aac181d938e4d919256814f5e1e7813995
+EBUILD xmlsec-1.2.24-r1.ebuild 1476 SHA256 0d367682941b5030dbae83021a78c06388d4c4b397d88a72407a8dc0a0b47f1d SHA512 97bece08eb430911b834b572ee508fe49b0c03cbc73807676c7b11eb0a6306197d0065e2f6e8aee0cdcb787a1ff2e5d70f47718e240f38939cf09ef5bbad044e WHIRLPOOL b2eb2a66ff157015ea0bc7db02f2a64ff346840c242cf0ae5ad2daf3ffbb70bb5673a88cccdf7209570323ac45dff4b10375c815e682feb520a175301acf0240
 MISC ChangeLog 2694 SHA256 e966da39ce4acf39163e6f796dd950fbdea60b8608ded2130b5329b024edc630 SHA512 55b024d84b428153669282b3716cab1a1bb1a578decd0ec65d751dd0255376e81e2cd5acb6fe04aa59c65f54f7f28a3269bbe2bffec39057a95b6647fcf32e05 WHIRLPOOL 97351713202b771028826abbb0648d07826bc60e788482c1ca09d7c7d1b0dcdb8fdc40ebb73fdd717ffbd4bb64479d4ae18762d00dbfd251f617c9dffeea1995
 MISC ChangeLog-2015 5783 SHA256 59336498970c6e049aa5ea3758ce09a294c20e6b27e302ebdd24b7d0ba46dffb SHA512 a717d9747f53a08fedafc0f477e101a4787c94224771a137e1cff2e641b35551284da088201dcd8d41e34a0407399fe934f137e05b9548caf86527e316828ee0 WHIRLPOOL 27acf01e4a53f591aa20b875edb69f5ce5c4c6b905124e2c1badfd50db4a073ea779dbfc014393e44e1e8681fb1d4ae5cedd2d8a72e980d13a6903fb6c1a5f4c
 MISC metadata.xml 487 SHA256 8f3b777b3ee6b0888d5bfcf7c8dbce698dec729901cc0a40f4dde22619aa3916 SHA512 1be5c6aa74ba9542e7b4b85adb8dd743fbeb72b4fee345996ee1b5bc662d9455d910f00ca37b16e644f53039a346ef44afc5e49abba19c5f8d4d00cbdf37d660 WHIRLPOOL ae78b5adc4d32de0504cf6e03a24e4bfdd45366784030fccbe79d4b519223d70cc877cc1597be6548743ade4a2595c904db611d03ca30a24ce5f9f0651d8f93a
diff --git a/dev-libs/xmlsec/xmlsec-1.2.23.ebuild b/dev-libs/xmlsec/xmlsec-1.2.23.ebuild
deleted file mode 100644
index c71366277d78..000000000000
--- a/dev-libs/xmlsec/xmlsec-1.2.23.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools ltprune
-
-DESCRIPTION="Command line tool for signing, verifying, encrypting and decrypting XML"
-HOMEPAGE="http://www.aleksey.com/xmlsec"
-SRC_URI="http://www.aleksey.com/xmlsec/download/${PN}1-${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 ~sparc x86"
-IUSE="doc gcrypt gnutls nss +openssl static-libs"
-REQUIRED_USE="|| ( gcrypt gnutls nss openssl )
-	gnutls? ( gcrypt )"
-
-RDEPEND=">=dev-libs/libxml2-2.7.4
-	>=dev-libs/libxslt-1.0.20
-	gcrypt? ( >=dev-libs/libgcrypt-1.4.0:0 )
-	gnutls? ( >=net-libs/gnutls-2.8.0 )
-	nss? (
-		>=dev-libs/nspr-4.4.1
-		>=dev-libs/nss-3.9
-	)
-	openssl? ( >=dev-libs/openssl-0.9.7:* )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${PN}1-${PV}
-
-src_prepare() {
-	default
-	# conditionally install extra documentation
-	if ! use doc ; then
-		sed -i '/^SUBDIRS/s/docs//' Makefile.am || die
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	econf \
-		--enable-pkgconfig \
-		--with-html-dir=/usr/share/doc/${PF}/html \
-		$(use_enable static-libs static) \
-		$(use_with gcrypt gcrypt "") \
-		$(use_with gnutls gnutls "") \
-		$(use_with nss nspr "") \
-		$(use_with nss nss "") \
-		$(use_with openssl openssl "") \
-		$(use_enable openssl aes)
-}
-
-src_test() {
-	emake TMPFOLDER="${T}" check
-}
-
-src_install() {
-	default
-	prune_libtool_files --all
-}
diff --git a/dev-libs/xmlsec/xmlsec-1.2.24-r1.ebuild b/dev-libs/xmlsec/xmlsec-1.2.24-r1.ebuild
index ed065181857f..b0f5df4a7e79 100644
--- a/dev-libs/xmlsec/xmlsec-1.2.24-r1.ebuild
+++ b/dev-libs/xmlsec/xmlsec-1.2.24-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.aleksey.com/xmlsec/download/${PN}1-${PV}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 ~sparc x86"
 IUSE="doc gcrypt gnutls libressl nss +openssl static-libs"
 REQUIRED_USE="|| ( gcrypt gnutls nss openssl )
 	gnutls? ( gcrypt )"
diff --git a/dev-libs/xmlsec/xmlsec-1.2.24.ebuild b/dev-libs/xmlsec/xmlsec-1.2.24.ebuild
deleted file mode 100644
index 2a7a4fa379a7..000000000000
--- a/dev-libs/xmlsec/xmlsec-1.2.24.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools ltprune
-
-DESCRIPTION="Command line tool for signing, verifying, encrypting and decrypting XML"
-HOMEPAGE="http://www.aleksey.com/xmlsec"
-SRC_URI="http://www.aleksey.com/xmlsec/download/${PN}1-${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc gcrypt gnutls nss +openssl static-libs"
-REQUIRED_USE="|| ( gcrypt gnutls nss openssl )
-	gnutls? ( gcrypt )"
-
-RDEPEND=">=dev-libs/libxml2-2.7.4
-	>=dev-libs/libxslt-1.0.20
-	gcrypt? ( >=dev-libs/libgcrypt-1.4.0:0 )
-	gnutls? ( >=net-libs/gnutls-2.8.0 )
-	nss? (
-		>=dev-libs/nspr-4.4.1
-		>=dev-libs/nss-3.9
-	)
-	openssl? ( >=dev-libs/openssl-1.0.0:* )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${PN}1-${PV}
-
-src_prepare() {
-	default
-	# conditionally install extra documentation
-	if ! use doc ; then
-		sed -i '/^SUBDIRS/s/docs//' Makefile.am || die
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	econf \
-		--enable-pkgconfig \
-		--with-html-dir=/usr/share/doc/${PF}/html \
-		$(use_enable static-libs static) \
-		$(use_with gcrypt gcrypt "") \
-		$(use_with gnutls gnutls "") \
-		$(use_with nss nspr "") \
-		$(use_with nss nss "") \
-		$(use_with openssl openssl "") \
-		$(use_enable openssl aes)
-}
-
-src_test() {
-	emake TMPFOLDER="${T}" check
-}
-
-src_install() {
-	default
-	prune_libtool_files --all
-}