gentoo resync : 16.09.2020

5 files changed, 112 insertions, 9 deletions

diff --git a/net-libs/libgsasl/Manifest b/net-libs/libgsasl/Manifest
index 77a917c57616..bc8d48005f95 100644
--- a/net-libs/libgsasl/Manifest
+++ b/net-libs/libgsasl/Manifest
@@ -1,4 +1,7 @@
-AUX libgsasl-gss-extra.patch 861 BLAKE2B 607f64758406228cc3996e25759e1644c12a0c61227f62c9b8ad8a0181aa30987aa8a93ccb09e42676544e13a6dc43d779b906c5481916f73668ae5eeb50a212 SHA512 67fdf2a74829bc5164ddf92decd3478bfc6a474171dc74f4088636e424aa78146b9b5c7c8d961753cc2a2a391f7e3b0c071f6c391dd680cf9b3ee6c8c8bb0040
+AUX libgsasl-1.8.0-gss-extra.patch 861 BLAKE2B 607f64758406228cc3996e25759e1644c12a0c61227f62c9b8ad8a0181aa30987aa8a93ccb09e42676544e13a6dc43d779b906c5481916f73668ae5eeb50a212 SHA512 67fdf2a74829bc5164ddf92decd3478bfc6a474171dc74f4088636e424aa78146b9b5c7c8d961753cc2a2a391f7e3b0c071f6c391dd680cf9b3ee6c8c8bb0040
+AUX libgsasl-1.8.1-gss-extra.patch 855 BLAKE2B 68eb983dee51393b4d871b71932a61c880bc37f6ead9047472215f8388833efea85db9ab4282bfcb700d0bda366623935bb487652dd334c4bb87dcb188b30d8f SHA512 97922b23fb967ee0110076913ac1ad89b3720be5d9883bce3762b4e41d95375ae1602470eeaf1551cb7ef7d46952d3dfffda64ef6ecc51149cd93dea681ad988
 DIST libgsasl-1.8.0.tar.gz 1208417 BLAKE2B 03eea4be45ccc28bbc5c98b5f266552e6f5da151dfc561b1f01dac107a6edf0f06a3000e868c07d5539df33334d3c965c6c276de30c75038e25165aa7e2db2e8 SHA512 7e591d12404919559bf67590f862270ffcae2030a14097cdaf92820aa79619b3048541e9f83b3fcb98a84622c44a52ecaceeebb1be55b9e9f68fb1790ade8721
-EBUILD libgsasl-1.8.0-r1.ebuild 1305 BLAKE2B 38d44088ef08bdc061239172004216cf93c032ac1614c28891c77b4842a2451158c42611ab87bdfa635b3ad6f027733943898fc0f24d3485e5898a3ece29c04e SHA512 6659399dc66eac3c109429e88683196bb87b3e343a2eb675a02cbd02f8b56e709ab70fe82f8d1caebb66c6cffef3bd7bd4d9d88e220279c765e90c9c014798c3
+DIST libgsasl-1.8.1.tar.gz 1791261 BLAKE2B bd8b954f9d950fe449fe140baca840a14f12ef6318e74a6fd070b35504b8c3a7002f13fe93142bce992e4a1df773ebaad4ec01d04c01c63a7374187a8142136b SHA512 52bda3a962a2cbb598009fd02c547a4f8b5b9a4243511aa8104df97b4737023281ab57dbbcf839db3cad73c64cbc72bbd89b49da8b0379dd635220ffb642aa22
+EBUILD libgsasl-1.8.0-r1.ebuild 1387 BLAKE2B 131b327007cfd2b3ca71d38da504b93a7fca6b9bd4a986b57edac157529d561852bc2881d927931d82b75678875a269aa70a0c2ed38eb9c2f70125f8e1896197 SHA512 634b59ac8efe01d93c0f15f1794c122e608f7b2427bd61f3b93413d301cb5b908c0162a652c8d3dc9a4745eed8630c6bc94a907a12b0f4d4da5ad35f6f92ab7d
+EBUILD libgsasl-1.8.1.ebuild 1395 BLAKE2B 69f4650c846152db363d81cd5a9700dd4fdac1808f95f12dd2bcf989cd06505a21436e3d7ffb6deddc34d1ee45392ebf37d1544a52224263ddfbdaaaf11772f5 SHA512 77f725be69b8f8841cd70c1419d02854413b90d84acd4b402d441dcdd0949b15bfecb31ef81000a025fba153428dd128c8803a526e69ff53b8e382d49765070b
 MISC metadata.xml 366 BLAKE2B d144c8ef6b53c919ee09ebf2f3d4a7e8ab6528e4c3d9e01cd1de83dd92626f09b698f84020b7fcffb3cc67db8174d182bcf1aeed294e3f9765d5c5f02c27918b SHA512 acd5a38df05489c2bc01e25f1a246d23609513bc70ec07bee2cc87e0548d355197c05da7bfc26e70a2302317dd3345fd638930ee3436ffe7b6d4cd7ff8b101b0
diff --git a/net-libs/libgsasl/files/libgsasl-gss-extra.patch b/net-libs/libgsasl/files/libgsasl-1.8.0-gss-extra.patch
index e9ec10d183c4..e9ec10d183c4 100644
--- a/net-libs/libgsasl/files/libgsasl-gss-extra.patch
+++ b/net-libs/libgsasl/files/libgsasl-1.8.0-gss-extra.patch
diff --git a/net-libs/libgsasl/files/libgsasl-1.8.1-gss-extra.patch b/net-libs/libgsasl/files/libgsasl-1.8.1-gss-extra.patch
new file mode 100644
index 000000000000..15350a87d51d
--- /dev/null
+++ b/net-libs/libgsasl/files/libgsasl-1.8.1-gss-extra.patch
@@ -0,0 +1,21 @@
+Gentoo bug #359005
+--- a/m4/gss-extra.m4
++++ b/m4/gss-extra.m4
+@@ -19,7 +19,16 @@
+     AC_CHECK_FUNCS([gss_decapsulate_token])
+     AC_CHECK_FUNCS([gss_oid_equal])
+     AC_CHECK_FUNCS([gss_inquire_mech_for_saslname])
+-    AC_CHECK_FUNCS([GSS_C_NT_HOSTBASED_SERVICE])
++    AC_MSG_CHECKING([for GSS_C_NT_HOSTBASED_SERVICE])
++    AC_EGREP_CPP(hostbased_service_gss_nt_yes, gssapi.h,
++    	[#include <gssapi.h>
++	#ifdef GSS_C_NT_HOSTBASED_SERVICE
++	   hostbased_service_gss_nt_yes
++	#endif],
++	    [AC_DEFINE(HAVE_GSS_C_NT_HOSTBASED_SERVICE,,
++	    [Define if your GSSAPI implimentation defines GSS_C_NT_HOSTBASED_SERVICE])
++	    AC_MSG_RESULT([yes])],
++	    AC_MSG_RESULT([no]))
+     if test "$gssapi_impl" != "gss"; then
+       AC_CHECK_HEADERS([gssapi.h gssapi/gssapi.h])
+       if test "$ac_cv_header_gssapi_h$ac_cv_header_gssapi_gssapi_h" = "nono"; then
diff --git a/net-libs/libgsasl/libgsasl-1.8.0-r1.ebuild b/net-libs/libgsasl/libgsasl-1.8.0-r1.ebuild
index 5b146866adc3..7550115ea3ff 100644
--- a/net-libs/libgsasl/libgsasl-1.8.0-r1.ebuild
+++ b/net-libs/libgsasl/libgsasl-1.8.0-r1.ebuild
@@ -1,20 +1,22 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit autotools eutils
+inherit autotools
 
 DESCRIPTION="The GNU SASL library"
 HOMEPAGE="https://www.gnu.org/software/gsasl/"
 SRC_URI="mirror://gnu/${PN/lib}/${P}.tar.gz"
+
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="idn gcrypt kerberos nls ntlm static-libs"
+
 DEPEND="
-	gcrypt? ( dev-libs/libgcrypt:0 )
-	idn? ( net-dns/libidn )
+	gcrypt? ( dev-libs/libgcrypt:0= )
+	idn? ( net-dns/libidn:= )
 	kerberos? ( virtual/krb5 )
 	nls? ( >=sys-devel/gettext-0.18.1 )
 	ntlm? ( net-libs/libntlm )
@@ -23,11 +25,12 @@ RDEPEND="${DEPEND}
 	!net-misc/gsasl"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-gss-extra.patch"
+	"${FILESDIR}/${PN}-1.8.0-gss-extra.patch"
 )
 
 src_prepare() {
 	default
+
 	sed -i -e 's/ -Werror//' configure.ac || die
 	eautoreconf
 }
@@ -36,8 +39,14 @@ src_configure() {
 	local krb5_impl
 	if use kerberos; then
 		krb5_impl="--with-gssapi-impl="
-		krb5_impl+=$(has_version app-crypt/mit-krb5 && echo "mit" || echo "heimdal")
+		# These are the two providers of virtual/krb5
+		if has_version app-crypt/mit-krb5; then
+			krb5_impl+="mit"
+		else
+			krb5_impl+="heimdal"
+		fi
 	fi
+
 	local myeconfargs=(
 		$(use_with gcrypt libgcrypt)
 		$(use_with idn stringprep)
@@ -47,6 +56,7 @@ src_configure() {
 		$(use_enable ntlm)
 		$(use_enable static-libs static)
 	)
+
 	econf "${myeconfargs[@]}"
 }
 
@@ -54,6 +64,6 @@ src_install() {
 	default
 
 	if ! use static-libs; then
-		rm -f "${D}"/usr/lib*/lib*.la
+		rm -f "${ED}"/usr/lib*/lib*.la || die
 	fi
 }
diff --git a/net-libs/libgsasl/libgsasl-1.8.1.ebuild b/net-libs/libgsasl/libgsasl-1.8.1.ebuild
new file mode 100644
index 000000000000..c23abb24fb4a
--- /dev/null
+++ b/net-libs/libgsasl/libgsasl-1.8.1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="The GNU SASL library"
+HOMEPAGE="https://www.gnu.org/software/gsasl/"
+SRC_URI="mirror://gnu/${PN/lib}/${P}.tar.gz"
+
+LICENSE="GPL-3 LGPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="idn gcrypt kerberos nls ntlm static-libs"
+
+DEPEND="
+	gcrypt? ( dev-libs/libgcrypt:0= )
+	idn? ( net-dns/libidn:= )
+	kerberos? ( virtual/krb5 )
+	nls? ( >=sys-devel/gettext-0.18.1 )
+	ntlm? ( net-libs/libntlm )
+"
+RDEPEND="${DEPEND}
+	!net-misc/gsasl"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.8.1-gss-extra.patch"
+)
+
+src_prepare() {
+	default
+
+	sed -i -e 's/ -Werror//' configure.ac || die
+	eautoreconf
+}
+
+src_configure() {
+	local krb5_impl
+	if use kerberos; then
+		krb5_impl="--with-gssapi-impl="
+		# These are the two providers of virtual/krb5
+		if has_version app-crypt/mit-krb5; then
+			krb5_impl+="mit"
+		else
+			krb5_impl+="heimdal"
+		fi
+	fi
+
+	local myeconfargs=(
+		$(use_with gcrypt libgcrypt)
+		$(use_with idn stringprep)
+		$(use_enable kerberos gssapi)
+		${krb5_impl}
+		$(use_enable nls)
+		$(use_enable ntlm)
+		$(use_enable static-libs static)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	if ! use static-libs; then
+		rm -f "${ED}"/usr/lib*/lib*.la || die
+	fi
+}