| 1 |
commit: 7cb13f3214f5cb38fcd015436cf2e8f249a2db12 |
| 2 |
Author: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Sep 23 14:22:33 2018 +0000 |
| 4 |
Commit: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Sep 27 23:51:40 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7cb13f32 |
| 7 |
|
| 8 |
dev-libs/botan: eapi bump |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.49, Repoman-2.3.10 |
| 11 |
|
| 12 |
dev-libs/botan/botan-1.10.17.ebuild | 8 +++++--- |
| 13 |
dev-libs/botan/botan-2.7.0.ebuild | 14 ++++++++------ |
| 14 |
2 files changed, 13 insertions(+), 9 deletions(-) |
| 15 |
|
| 16 |
diff --git a/dev-libs/botan/botan-1.10.17.ebuild b/dev-libs/botan/botan-1.10.17.ebuild |
| 17 |
index 76f17bc19ee..3288e91d07f 100644 |
| 18 |
--- a/dev-libs/botan/botan-1.10.17.ebuild |
| 19 |
+++ b/dev-libs/botan/botan-1.10.17.ebuild |
| 20 |
@@ -1,7 +1,7 @@ |
| 21 |
# Copyright 1999-2018 Gentoo Foundation |
| 22 |
# Distributed under the terms of the GNU General Public License v2 |
| 23 |
|
| 24 |
-EAPI="6" |
| 25 |
+EAPI=7 |
| 26 |
PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) |
| 27 |
|
| 28 |
inherit multilib python-r1 toolchain-funcs |
| 29 |
@@ -20,7 +20,9 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
| 30 |
|
| 31 |
S="${WORKDIR}/${MY_P}" |
| 32 |
|
| 33 |
-RDEPEND="bzip2? ( >=app-arch/bzip2-1.0.5 ) |
| 34 |
+DEPEND="python? ( ${PYTHON_DEPS} )" |
| 35 |
+RDEPEND="${DEPEND} |
| 36 |
+ bzip2? ( >=app-arch/bzip2-1.0.5 ) |
| 37 |
zlib? ( >=sys-libs/zlib-1.2.3 ) |
| 38 |
python? ( ${PYTHON_DEPS} >=dev-libs/boost-1.48[python,${PYTHON_USEDEP}] ) |
| 39 |
gmp? ( >=dev-libs/gmp-4.2.2:* ) |
| 40 |
@@ -28,7 +30,7 @@ RDEPEND="bzip2? ( >=app-arch/bzip2-1.0.5 ) |
| 41 |
!libressl? ( <dev-libs/openssl-1.1:0=[bindist=] ) |
| 42 |
libressl? ( dev-libs/libressl:0= ) |
| 43 |
)" |
| 44 |
-DEPEND="${RDEPEND} |
| 45 |
+BDEPEND="dev-lang/python:* |
| 46 |
doc? ( dev-python/sphinx )" |
| 47 |
|
| 48 |
PATCHES=( |
| 49 |
|
| 50 |
diff --git a/dev-libs/botan/botan-2.7.0.ebuild b/dev-libs/botan/botan-2.7.0.ebuild |
| 51 |
index 9ff13b7881c..9763cbe67a6 100644 |
| 52 |
--- a/dev-libs/botan/botan-2.7.0.ebuild |
| 53 |
+++ b/dev-libs/botan/botan-2.7.0.ebuild |
| 54 |
@@ -1,10 +1,10 @@ |
| 55 |
# Copyright 1999-2018 Gentoo Foundation |
| 56 |
# Distributed under the terms of the GNU General Public License v2 |
| 57 |
|
| 58 |
-EAPI="6" |
| 59 |
+EAPI=7 |
| 60 |
PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) |
| 61 |
|
| 62 |
-inherit multilib python-r1 toolchain-funcs versionator |
| 63 |
+inherit multilib python-r1 toolchain-funcs |
| 64 |
|
| 65 |
MY_PN="Botan" |
| 66 |
MY_P="${MY_PN}-${PV}" |
| 67 |
@@ -13,13 +13,16 @@ HOMEPAGE="https://botan.randombit.net/" |
| 68 |
SRC_URI="https://botan.randombit.net/releases/${MY_P}.tgz" |
| 69 |
|
| 70 |
KEYWORDS="amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86 ~ppc-macos" |
| 71 |
-SLOT="2/$(get_version_component_range 2)" # soname version |
| 72 |
+SLOT="2/$(ver_cut 1-2)" # soname version |
| 73 |
LICENSE="BSD" |
| 74 |
IUSE="bindist doc boost python bzip2 libressl lzma sqlite ssl static-libs zlib" |
| 75 |
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
| 76 |
|
| 77 |
S="${WORKDIR}/${MY_P}" |
| 78 |
|
| 79 |
-RDEPEND="bzip2? ( >=app-arch/bzip2-1.0.5 ) |
| 80 |
+DEPEND="python? ( ${PYTHON_DEPS} )" |
| 81 |
+RDEPEND="${DEPEND} |
| 82 |
+ bzip2? ( >=app-arch/bzip2-1.0.5 ) |
| 83 |
zlib? ( >=sys-libs/zlib-1.2.3 ) |
| 84 |
boost? ( >=dev-libs/boost-1.48 ) |
| 85 |
lzma? ( app-arch/xz-utils ) |
| 86 |
@@ -28,8 +31,7 @@ RDEPEND="bzip2? ( >=app-arch/bzip2-1.0.5 ) |
| 87 |
!libressl? ( dev-libs/openssl:0=[bindist=] ) |
| 88 |
libressl? ( dev-libs/libressl:0= ) |
| 89 |
)" |
| 90 |
-DEPEND="${RDEPEND} |
| 91 |
- dev-lang/python:* |
| 92 |
+BDEPEND="dev-lang/python:* |
| 93 |
doc? ( dev-python/sphinx )" |
| 94 |
|
| 95 |
src_configure() { |
Archives