net-libs/gnutls: revert explicit prefix added for cross-compile

multilib does not work with this configuration.

Closes: https://bugs.gentoo.org/show_bug.cgi?id=667862
Signed-off-by: Alon Bar-Lev <alonbl@gentoo.org>
Package-Manager: Portage-2.3.49, Repoman-2.3.10

diff --git a/net-libs/gnutls/gnutls-3.5.19-r1.ebuild b/net-libs/gnutls/gnutls-3.5.19-r1.ebuild
index 21b4a74b0dc188afda4bd51eeac4c154baa70d18..9fc06eac7ed640e1d970c52c84afcd902fe762fa 100644 (file)
--- a/net-libs/gnutls/gnutls-3.5.19-r1.ebuild
+++ b/net-libs/gnutls/gnutls-3.5.19-r1.ebuild
@@ -117,7 +117,7 @@ multilib_src_configure() {
                --with-unbound-root-key-file="${EPREFIX}/etc/dnssec/root-anchors.txt" \
                --without-included-libtasn1 \
                "${libconf[@]}" \
-               $("${S}/configure" --help | grep -- --with-.*-prefix | sed -e 's/prefix.*/prefix/' -e "s#\$#=${EROOT}/usr#")
+               $("${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 92679e621dc4fee60baada6dce0701f893203236..e28279bbf276602a41c81f3bbfa029a5765ed08f 100644 (file)
--- a/net-libs/gnutls/gnutls-3.6.3.ebuild
+++ b/net-libs/gnutls/gnutls-3.6.3.ebuild
@@ -113,7 +113,7 @@ multilib_src_configure() {
                --with-unbound-root-key-file="${EPREFIX}/etc/dnssec/root-anchors.txt" \
                --without-included-libtasn1 \
                "${libconf[@]}" \
-               $("${S}/configure" --help | grep -- --with-.*-prefix | sed -e 's/prefix.*/prefix/' -e "s#\$#=${EROOT}/usr#")
+               $("${S}/configure" --help | grep -- '--without-.*-prefix' | sed -e 's/^ *\([^ ]*\) .*/\1/g')
 }
 
 multilib_src_install_all() {