| 1 |
commit: ca78199a15123d5faae0fadf9dca547a887eed6a |
| 2 |
Author: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Sep 23 20:13:41 2018 +0000 |
| 4 |
Commit: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Sep 27 23:51:44 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca78199a |
| 7 |
|
| 8 |
net-libs/gnutls: eapi bump |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.49, Repoman-2.3.10 |
| 11 |
|
| 12 |
...gnutls-3.6.3.ebuild => gnutls-3.5.19-r1.ebuild} | 33 ++++++++++++---------- |
| 13 |
net-libs/gnutls/gnutls-3.6.3.ebuild | 21 +++++++------- |
| 14 |
2 files changed, 28 insertions(+), 26 deletions(-) |
| 15 |
|
| 16 |
diff --git a/net-libs/gnutls/gnutls-3.6.3.ebuild b/net-libs/gnutls/gnutls-3.5.19-r1.ebuild |
| 17 |
similarity index 78% |
| 18 |
copy from net-libs/gnutls/gnutls-3.6.3.ebuild |
| 19 |
copy to net-libs/gnutls/gnutls-3.5.19-r1.ebuild |
| 20 |
index fd1664469d0..f9231e34b26 100644 |
| 21 |
--- a/net-libs/gnutls/gnutls-3.6.3.ebuild |
| 22 |
+++ b/net-libs/gnutls/gnutls-3.5.19-r1.ebuild |
| 23 |
@@ -1,21 +1,21 @@ |
| 24 |
# Copyright 1999-2018 Gentoo Foundation |
| 25 |
# Distributed under the terms of the GNU General Public License v2 |
| 26 |
|
| 27 |
-EAPI=6 |
| 28 |
+EAPI=7 |
| 29 |
|
| 30 |
-inherit libtool ltprune multilib-minimal versionator |
| 31 |
+inherit libtool multilib-minimal |
| 32 |
|
| 33 |
DESCRIPTION="A TLS 1.2 and SSL 3.0 implementation for the GNU project" |
| 34 |
HOMEPAGE="http://www.gnutls.org/" |
| 35 |
-SRC_URI="mirror://gnupg/gnutls/v$(get_version_component_range 1-2)/${P}.tar.xz" |
| 36 |
+SRC_URI="mirror://gnupg/gnutls/v$(ver_cut 1-2)/${P}.tar.xz" |
| 37 |
|
| 38 |
LICENSE="GPL-3 LGPL-2.1" |
| 39 |
SLOT="0/30" # libgnutls.so number |
| 40 |
-KEYWORDS="" |
| 41 |
-IUSE="+cxx dane doc examples guile +idn nls +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools valgrind" |
| 42 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
| 43 |
+IUSE="+cxx dane doc examples guile +idn nls openpgp +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools valgrind zlib" |
| 44 |
|
| 45 |
REQUIRED_USE=" |
| 46 |
- test-full? ( cxx dane doc examples guile idn nls openssl pkcs11 seccomp tls-heartbeat tools )" |
| 47 |
+ test-full? ( guile pkcs11 openpgp openssl idn seccomp tools zlib )" |
| 48 |
|
| 49 |
# NOTICE: sys-devel/autogen is required at runtime as we |
| 50 |
# use system libopts |
| 51 |
@@ -25,22 +25,22 @@ RDEPEND=">=dev-libs/libtasn1-4.9:=[${MULTILIB_USEDEP}] |
| 52 |
>=dev-libs/gmp-5.1.3-r1:=[${MULTILIB_USEDEP}] |
| 53 |
tools? ( sys-devel/autogen ) |
| 54 |
dane? ( >=net-dns/unbound-1.4.20:=[${MULTILIB_USEDEP}] ) |
| 55 |
- guile? ( >=dev-scheme/guile-1.8:=[networking] ) |
| 56 |
+ guile? ( >=dev-scheme/guile-2:=[networking] ) |
| 57 |
nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] ) |
| 58 |
pkcs11? ( >=app-crypt/p11-kit-0.23.1[${MULTILIB_USEDEP}] ) |
| 59 |
+ zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] ) |
| 60 |
idn? ( >=net-dns/libidn2-0.16-r1[${MULTILIB_USEDEP}] )" |
| 61 |
DEPEND="${RDEPEND} |
| 62 |
- >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] |
| 63 |
- doc? ( dev-util/gtk-doc ) |
| 64 |
- nls? ( sys-devel/gettext ) |
| 65 |
- valgrind? ( dev-util/valgrind ) |
| 66 |
test? ( |
| 67 |
seccomp? ( sys-libs/libseccomp ) |
| 68 |
- ) |
| 69 |
+ )" |
| 70 |
+BDEPEND=">=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] |
| 71 |
+ valgrind? ( dev-util/valgrind ) |
| 72 |
+ doc? ( dev-util/gtk-doc ) |
| 73 |
+ nls? ( sys-devel/gettext ) |
| 74 |
test-full? ( |
| 75 |
- guile? ( >=dev-scheme/guile-2 ) |
| 76 |
app-crypt/dieharder |
| 77 |
- >=app-misc/datefudge-1.22 |
| 78 |
+ app-misc/datefudge |
| 79 |
dev-libs/softhsm:2[-bindist] |
| 80 |
net-dialup/ppp |
| 81 |
net-misc/socat |
| 82 |
@@ -106,13 +106,16 @@ multilib_src_configure() { |
| 83 |
$(use_enable cxx) \ |
| 84 |
$(use_enable dane libdane) \ |
| 85 |
$(use_enable nls) \ |
| 86 |
+ $(use_enable openpgp openpgp-authentication) \ |
| 87 |
$(use_enable openssl openssl-compatibility) \ |
| 88 |
$(use_enable sslv2 ssl2-support) \ |
| 89 |
$(use_enable sslv3 ssl3-support) \ |
| 90 |
$(use_enable static-libs static) \ |
| 91 |
$(use_enable tls-heartbeat heartbeat-support) \ |
| 92 |
+ $(use_with idn libidn2) \ |
| 93 |
$(use_with idn) \ |
| 94 |
$(use_with pkcs11 p11-kit) \ |
| 95 |
+ $(use_with zlib) \ |
| 96 |
--with-unbound-root-key-file="${EPREFIX}/etc/dnssec/root-anchors.txt" \ |
| 97 |
--without-included-libtasn1 \ |
| 98 |
"${libconf[@]}" |
| 99 |
@@ -120,7 +123,7 @@ multilib_src_configure() { |
| 100 |
|
| 101 |
multilib_src_install_all() { |
| 102 |
einstalldocs |
| 103 |
- prune_libtool_files --all |
| 104 |
+ find "${D}" -name '*.la' -delete || die |
| 105 |
|
| 106 |
if use examples; then |
| 107 |
docinto examples |
| 108 |
|
| 109 |
diff --git a/net-libs/gnutls/gnutls-3.6.3.ebuild b/net-libs/gnutls/gnutls-3.6.3.ebuild |
| 110 |
index fd1664469d0..f5e8e131dfa 100644 |
| 111 |
--- a/net-libs/gnutls/gnutls-3.6.3.ebuild |
| 112 |
+++ b/net-libs/gnutls/gnutls-3.6.3.ebuild |
| 113 |
@@ -1,13 +1,13 @@ |
| 114 |
# Copyright 1999-2018 Gentoo Foundation |
| 115 |
# Distributed under the terms of the GNU General Public License v2 |
| 116 |
|
| 117 |
-EAPI=6 |
| 118 |
+EAPI=7 |
| 119 |
|
| 120 |
-inherit libtool ltprune multilib-minimal versionator |
| 121 |
+inherit libtool multilib-minimal |
| 122 |
|
| 123 |
DESCRIPTION="A TLS 1.2 and SSL 3.0 implementation for the GNU project" |
| 124 |
HOMEPAGE="http://www.gnutls.org/" |
| 125 |
-SRC_URI="mirror://gnupg/gnutls/v$(get_version_component_range 1-2)/${P}.tar.xz" |
| 126 |
+SRC_URI="mirror://gnupg/gnutls/v$(ver_cut 1-2)/${P}.tar.xz" |
| 127 |
|
| 128 |
LICENSE="GPL-3 LGPL-2.1" |
| 129 |
SLOT="0/30" # libgnutls.so number |
| 130 |
@@ -25,20 +25,19 @@ RDEPEND=">=dev-libs/libtasn1-4.9:=[${MULTILIB_USEDEP}] |
| 131 |
>=dev-libs/gmp-5.1.3-r1:=[${MULTILIB_USEDEP}] |
| 132 |
tools? ( sys-devel/autogen ) |
| 133 |
dane? ( >=net-dns/unbound-1.4.20:=[${MULTILIB_USEDEP}] ) |
| 134 |
- guile? ( >=dev-scheme/guile-1.8:=[networking] ) |
| 135 |
+ guile? ( >=dev-scheme/guile-2:=[networking] ) |
| 136 |
nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] ) |
| 137 |
pkcs11? ( >=app-crypt/p11-kit-0.23.1[${MULTILIB_USEDEP}] ) |
| 138 |
idn? ( >=net-dns/libidn2-0.16-r1[${MULTILIB_USEDEP}] )" |
| 139 |
DEPEND="${RDEPEND} |
| 140 |
- >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] |
| 141 |
- doc? ( dev-util/gtk-doc ) |
| 142 |
- nls? ( sys-devel/gettext ) |
| 143 |
- valgrind? ( dev-util/valgrind ) |
| 144 |
test? ( |
| 145 |
seccomp? ( sys-libs/libseccomp ) |
| 146 |
- ) |
| 147 |
+ )" |
| 148 |
+BDEPEND=">=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] |
| 149 |
+ valgrind? ( dev-util/valgrind ) |
| 150 |
+ doc? ( dev-util/gtk-doc ) |
| 151 |
+ nls? ( sys-devel/gettext ) |
| 152 |
test-full? ( |
| 153 |
- guile? ( >=dev-scheme/guile-2 ) |
| 154 |
app-crypt/dieharder |
| 155 |
>=app-misc/datefudge-1.22 |
| 156 |
dev-libs/softhsm:2[-bindist] |
| 157 |
@@ -120,7 +119,7 @@ multilib_src_configure() { |
| 158 |
|
| 159 |
multilib_src_install_all() { |
| 160 |
einstalldocs |
| 161 |
- prune_libtool_files --all |
| 162 |
+ find "${D}" -name '*.la' -delete || die |
| 163 |
|
| 164 |
if use examples; then |
| 165 |
docinto examples |
Archives