From 62f67115b5c46134c34f88f4b1cbdacc19384c0a Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sun, 30 Sep 2018 11:19:18 +0100
Subject: gentoo resync : 30.09.2018

---
 dev-libs/botan/Manifest             |  4 ++--
 dev-libs/botan/botan-1.10.17.ebuild |  8 +++++---
 dev-libs/botan/botan-2.7.0.ebuild   | 14 ++++++++------
 3 files changed, 15 insertions(+), 11 deletions(-)

(limited to 'dev-libs/botan')

diff --git a/dev-libs/botan/Manifest b/dev-libs/botan/Manifest
index 0a3ef8254675..79ed6fe545e4 100644
--- a/dev-libs/botan/Manifest
+++ b/dev-libs/botan/Manifest
@@ -2,6 +2,6 @@ AUX botan-1.10.17-build.patch 874 BLAKE2B 94898dc7730c921ea4a545fdad5d5eeb91432e
 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.7.0.tgz 7021654 BLAKE2B 3f18b7ba660a72a409beeaba8bd1b1bd021f645c135bed56d75b6ba906b7c28d1e14eac9550862500dda9c4b3ac3135cfc9c340e073c573deb66b236e09f8054 SHA512 992138d83e18aedf80337d825f80c34dd3d2177eb30967573c57cf9fb7e7f9a9965ae3d75f23635f4c93b4efb7bb5adbb3423702663c78a5eb905dd567561858
-EBUILD botan-1.10.17.ebuild 4221 BLAKE2B 463e3e2b0893b5c9330c7d317fb089f70cc8adf2f60654711674bfb1eeb3c2b34e44e5695b230078510821cb7f45a23745016ebfd6c30cc660d6a132f4ef3223 SHA512 00065423d5f3600a08542e8722ce63dcf6147bce0b2104e466acf444c7e107f191652b588d7b7054652099cb89973b646987084c39678a8472d565249e064f6b
-EBUILD botan-2.7.0.ebuild 2339 BLAKE2B f3871202e70810f7003a16a02befc4bf69ff04baa451a80a2bfb13a96cb1cbc645a1f622941c9af27b2a6b8617fe69f81d601a1fc0738ac4f922465a8014277a SHA512 f46c844b7df21647876f933f4263427625fc2da6a6688c5333f4205fad06da0c99a68de152036778ba0a6b4890b772c8e41f95687786e6153ace2d52856be3b2
+EBUILD botan-1.10.17.ebuild 4274 BLAKE2B d88abeb1a9bfc04c121836a5a77a9b07ddb34c45244a85b0b74fe9346689736b882d489ff42a1b0726242771a90cdcacb053ba24b5a83c7d69ef8f6ea7f08ed5 SHA512 7cfd69bf005f0653793b4ece07bdba09b7b8ae8098da17b7ed028acfbd8fbef63a9568134f9ce3f7660761e5baa75f13f40f5d0c651acf7a00670907af85a534
+EBUILD botan-2.7.0.ebuild 2393 BLAKE2B 26b85ca13ac9f98c014fc58665df5331c0e6f56a4ca5823c1ad953e50c9b295c594b68740492ce6aa7e7b5433599d62bb90dce782b85bf3a972f1bcbbfd167c7 SHA512 494abf5e37c78ac82bf2e3f00efa0ef1cea54d62f54cad7883e46bf4339865223f495c0133b5ee9d0b4f2d9c33a89f363b3f3b5c37b62d3e32a1319c51b5d58e
 MISC metadata.xml 610 BLAKE2B a74ed3478dcf62ad762a113e594c660656d52352e569d4eaa54c47009505a869c4e553a8f8330b0b2ad9dae88b7b2bc6d44ede1f2dd330da9ff01240f56eed29 SHA512 9d14b7f0222b9b169f8ae60798d1a9ac551004bcbd0344451409cdb1cbefaaf70760a2f443f0c793265492387ca28f7dccd293bd30585a014a72f2a21eee1561
diff --git a/dev-libs/botan/botan-1.10.17.ebuild b/dev-libs/botan/botan-1.10.17.ebuild
index 76f17bc19eef..3288e91d07f7 100644
--- a/dev-libs/botan/botan-1.10.17.ebuild
+++ b/dev-libs/botan/botan-1.10.17.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 
 inherit multilib python-r1 toolchain-funcs
@@ -20,7 +20,9 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 S="${WORKDIR}/${MY_P}"
 
-RDEPEND="bzip2? ( >=app-arch/bzip2-1.0.5 )
+DEPEND="python? ( ${PYTHON_DEPS} )"
+RDEPEND="${DEPEND}
+	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:* )
@@ -28,7 +30,7 @@ RDEPEND="bzip2? ( >=app-arch/bzip2-1.0.5 )
 		!libressl? ( <dev-libs/openssl-1.1:0=[bindist=] )
 		libressl? ( dev-libs/libressl:0= )
 	)"
-DEPEND="${RDEPEND}
+BDEPEND="dev-lang/python:*
 	doc? ( dev-python/sphinx )"
 
 PATCHES=(
diff --git a/dev-libs/botan/botan-2.7.0.ebuild b/dev-libs/botan/botan-2.7.0.ebuild
index 9ff13b7881c5..9763cbe67a68 100644
--- a/dev-libs/botan/botan-2.7.0.ebuild
+++ b/dev-libs/botan/botan-2.7.0.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 
-inherit multilib python-r1 toolchain-funcs versionator
+inherit multilib python-r1 toolchain-funcs
 
 MY_PN="Botan"
 MY_P="${MY_PN}-${PV}"
@@ -13,13 +13,16 @@ 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/$(get_version_component_range 2)" # soname version
+SLOT="2/$(ver_cut 1-2)" # soname version
 LICENSE="BSD"
 IUSE="bindist doc boost python bzip2 libressl lzma sqlite ssl static-libs zlib"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 S="${WORKDIR}/${MY_P}"
 
-RDEPEND="bzip2? ( >=app-arch/bzip2-1.0.5 )
+DEPEND="python? ( ${PYTHON_DEPS} )"
+RDEPEND="${DEPEND}
+	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 )
@@ -28,8 +31,7 @@ RDEPEND="bzip2? ( >=app-arch/bzip2-1.0.5 )
 		!libressl? ( dev-libs/openssl:0=[bindist=] )
 		libressl? ( dev-libs/libressl:0= )
 	)"
-DEPEND="${RDEPEND}
-	dev-lang/python:*
+BDEPEND="dev-lang/python:*
 	doc? ( dev-python/sphinx )"
 
 src_configure() {
-- 
cgit v1.2.3