summaryrefslogtreecommitdiff
path: root/net-libs/gnutls
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2018-10-07 11:03:14 +0100
committerV3n3RiX <venerix@redcorelinux.org>2018-10-07 11:03:14 +0100
commit957235cf19a691360c720f7913672adda4258ed0 (patch)
tree812bba7928f4293ead05a7ee9c1ac39c5ef9f12e /net-libs/gnutls
parent62f67115b5c46134c34f88f4b1cbdacc19384c0a (diff)
gentoo resync : 07.10.2018
Diffstat (limited to 'net-libs/gnutls')
-rw-r--r--net-libs/gnutls/Manifest4
-rw-r--r--net-libs/gnutls/gnutls-3.5.19-r1.ebuild14
-rw-r--r--net-libs/gnutls/gnutls-3.6.3.ebuild14
3 files changed, 14 insertions, 18 deletions
diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index 6b99c9d42e30..71d27988805a 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -1,6 +1,6 @@
DIST gnutls-3.5.19.tar.xz 7239744 BLAKE2B c12578e79d3e96e1df7a5dc5f05fe9bc4bce4150f7440a73fda8e69d3f137a9ad1ace28b56e976bc319bd7be7305bf93af9c20087229e0b8fefee85b64e8261d SHA512 a78a59505e59c62ca671b34eacaeadcf070a943b12d964b7362962ba05636136638063491c37bb1883807014b8b6cf4f83f7d5b918ed02d5fbb52155679ce52f
DIST gnutls-3.6.3.tar.xz 8010284 BLAKE2B 3cbfcfc90b5bbcdcf01ef13b4a306b05e471e6cd14bb5b0c37e1e7358f2b223605901c0495c7ac3227f48ab77db30481050bf1f38de5e18659d7b91b8907aaa9 SHA512 6238502464d229a9777e3076f4c745d16deaada83c9da756ecdcd370947576e0446bda3a7f85d5a099b745bbf8c0134ebdf6632e4b26d61daf170792fb4f5abe
-EBUILD gnutls-3.5.19-r1.ebuild 4090 BLAKE2B e3436c057d92753371e1b274dcb05a2b170befe90e89ba507bacc09c7d2d7b308e7a0c97967797355c653be492eb6c0187fcc69338cccc2e6aeee877ac11f321 SHA512 368f32b66c4e750b06a81dfd74b9e5d58c1cde20d244e326bd7471f1209bdfaae2a84ce241b01630453fff6d447e812c9d82e539adb6139dac4a63ee00d9b902
+EBUILD gnutls-3.5.19-r1.ebuild 4025 BLAKE2B e166a177a1530255660c59e775d715b03a0140729c9dcb20bfd17f91a7a7c5a8f1edab502be03e33980bd23c01cd1d9b667a5f1f468585e8db6ba646521e15c5 SHA512 ec3dfd1a35e14528fe9765360ab623bc6f2f93a2ff8e6d9421add6a100da2937344986ff909d7036e00caf8806e87923daf4ce381671e9c0cb79d0a85d6053be
EBUILD gnutls-3.5.19.ebuild 4102 BLAKE2B 8b4eec009a005860f2b138ceca61ce81e59263c640c2214d9729a3dce4c20df09da82c9a9f56b7e44c7f48d70c44c974bef1597f9d97531c03a716bf372e1a10 SHA512 09257ab61c491b99910db2b8b3a39ce4fb9d484d0d5e1a19006b0ee0073f6261b4c6f18d9a86bfe53a2472c4e285c829a256354676c380fa48cff05bcead0e6e
-EBUILD gnutls-3.6.3.ebuild 3737 BLAKE2B 8b3bec0c5ce869114ae0a148d324c149e8b41b0a5c031dc67d5558fda8510421dd8376724d7683641dc940175794c5f61f5634591ee03c77e7862abeaca482f8 SHA512 05e8bfb984fe359973b3f7c6720d9df76c7e2db00cb44bfa602dc042cd2516f43e0275ceeb04123b5bf2ba7cd89b8904464c4ff5e22674a80e2f738b6d716247
+EBUILD gnutls-3.6.3.ebuild 3672 BLAKE2B bb978d2c2b2903e10707874da1c3a896159c46bcb9505e9632a31e69e2bde8f73f3784ea723ce38c96d41b9ab2d5b034f5fafd367f56d8130f7768fc92c24675 SHA512 e1f082e5fa7f744a61a7f1936dfdd9e71e83327b59e86a57ad447a22d4935ca5453ade48e99ff8809f696dced9c108693176700251822370b01ca502e10c3264
MISC metadata.xml 1261 BLAKE2B 28e1e92d76bd15212f59e5a118b8fb891e2dd6225dc78353188b90a20f776a0da23d2ee6368a61dd034f8cff0522e4aa0dbaa7ff43919c3c36f396cb9a13bb15 SHA512 80a2e2d7a81cd6f19d361d31b3f7356a3664aa637531943fdb8d0876b13eddbc5a72aeac60506ae751105c35004de8fe5149ce149dd4b56b10c3522428885992
diff --git a/net-libs/gnutls/gnutls-3.5.19-r1.ebuild b/net-libs/gnutls/gnutls-3.5.19-r1.ebuild
index 1635d976bdf4..9fc06eac7ed6 100644
--- a/net-libs/gnutls/gnutls-3.5.19-r1.ebuild
+++ b/net-libs/gnutls/gnutls-3.5.19-r1.ebuild
@@ -34,11 +34,11 @@ DEPEND="${RDEPEND}
test? (
seccomp? ( sys-libs/libseccomp )
)"
-BDEPEND=">=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
- tools? ( sys-devel/autogen )
- valgrind? ( dev-util/valgrind )
+BDEPEND=">=virtual/pkgconfig-0-r1
doc? ( dev-util/gtk-doc )
nls? ( sys-devel/gettext )
+ tools? ( sys-devel/autogen )
+ valgrind? ( dev-util/valgrind )
test-full? (
app-crypt/dieharder
app-misc/datefudge
@@ -79,10 +79,6 @@ src_prepare() {
multilib_src_configure() {
LINGUAS="${LINGUAS//en/en@boldquot en@quot}"
- # remove magic of library detection
- # bug#438222
- local libconf=($("${S}/configure" --help | grep -- '--without-.*-prefix' | sed -e 's/^ *\([^ ]*\) .*/\1/g'))
-
# TPM needs to be tested before being enabled
libconf+=( --without-tpm )
@@ -117,9 +113,11 @@ multilib_src_configure() {
$(use_with idn) \
$(use_with pkcs11 p11-kit) \
$(use_with zlib) \
+ --disable-rpath \
--with-unbound-root-key-file="${EPREFIX}/etc/dnssec/root-anchors.txt" \
--without-included-libtasn1 \
- "${libconf[@]}"
+ "${libconf[@]}" \
+ $("${S}/configure" --help | grep -- '--without-.*-prefix' | sed -e 's/^ *\([^ ]*\) .*/\1/g')
}
multilib_src_install_all() {
diff --git a/net-libs/gnutls/gnutls-3.6.3.ebuild b/net-libs/gnutls/gnutls-3.6.3.ebuild
index fefc8766f6af..e28279bbf276 100644
--- a/net-libs/gnutls/gnutls-3.6.3.ebuild
+++ b/net-libs/gnutls/gnutls-3.6.3.ebuild
@@ -33,11 +33,11 @@ DEPEND="${RDEPEND}
test? (
seccomp? ( sys-libs/libseccomp )
)"
-BDEPEND=">=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
- tools? ( sys-devel/autogen )
- valgrind? ( dev-util/valgrind )
+BDEPEND=">=virtual/pkgconfig-0-r1
doc? ( dev-util/gtk-doc )
nls? ( sys-devel/gettext )
+ tools? ( sys-devel/autogen )
+ valgrind? ( dev-util/valgrind )
test-full? (
app-crypt/dieharder
>=app-misc/datefudge-1.22
@@ -78,10 +78,6 @@ src_prepare() {
multilib_src_configure() {
LINGUAS="${LINGUAS//en/en@boldquot en@quot}"
- # remove magic of library detection
- # bug#438222
- local libconf=($("${S}/configure" --help | grep -- '--without-.*-prefix' | sed -e 's/^ *\([^ ]*\) .*/\1/g'))
-
# TPM needs to be tested before being enabled
libconf+=( --without-tpm )
@@ -113,9 +109,11 @@ multilib_src_configure() {
$(use_enable tls-heartbeat heartbeat-support) \
$(use_with idn) \
$(use_with pkcs11 p11-kit) \
+ --disable-rpath \
--with-unbound-root-key-file="${EPREFIX}/etc/dnssec/root-anchors.txt" \
--without-included-libtasn1 \
- "${libconf[@]}"
+ "${libconf[@]}" \
+ $("${S}/configure" --help | grep -- '--without-.*-prefix' | sed -e 's/^ *\([^ ]*\) .*/\1/g')
}
multilib_src_install_all() {