[gentoo-commits] repo/gentoo:master commit in: net-libs/libgsasl/, net-libs/libgsasl/files/

[Lars Wendler]

commit:     af515071c4813a03353ed66184b084e95aba4ba9
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Feb  7 10:06:52 2017 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Feb  7 10:41:59 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af515071

net-libs/libgsasl: Bumped to EAPI-6.

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 net-libs/libgsasl/files/libgsasl-gss-extra.patch |  4 ++--
 net-libs/libgsasl/libgsasl-1.8.0-r1.ebuild       | 26 +++++++++++++++---------
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/net-libs/libgsasl/files/libgsasl-gss-extra.patch b/net-libs/libgsasl/files/libgsasl-gss-extra.patch
index a0f134a..e9ec10d 100644
--- a/net-libs/libgsasl/files/libgsasl-gss-extra.patch
+++ b/net-libs/libgsasl/files/libgsasl-gss-extra.patch
@@ -1,6 +1,6 @@
 Gentoo bug #359005
---- gl/m4/gss-extra.m4.orig	2010-12-14 12:57:08.000000000 +0000
-+++ gl/m4/gss-extra.m4	2011-11-05 21:11:54.000000000 +0000
+--- a/gl/m4/gss-extra.m4
++++ b/gl/m4/gss-extra.m4
 @@ -19,7 +19,16 @@
      AC_CHECK_FUNCS([gss_decapsulate_token])
      AC_CHECK_FUNCS([gss_oid_equal])

diff --git a/net-libs/libgsasl/libgsasl-1.8.0-r1.ebuild b/net-libs/libgsasl/libgsasl-1.8.0-r1.ebuild
index 309befd..100caab 100644
--- a/net-libs/libgsasl/libgsasl-1.8.0-r1.ebuild
+++ b/net-libs/libgsasl/libgsasl-1.8.0-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="4"
+EAPI=6
 
 inherit autotools eutils
 
@@ -23,8 +23,12 @@ DEPEND="
 RDEPEND="${DEPEND}
 	!net-misc/gsasl"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-gss-extra.patch"
+)
+
 src_prepare() {
-	epatch "${FILESDIR}/${PN}-gss-extra.patch"
+	default
 	sed -i -e 's/ -Werror//' configure.ac || die
 	eautoreconf
 }
@@ -35,14 +39,16 @@ src_configure() {
 		krb5_impl="--with-gssapi-impl="
 		krb5_impl+=$(has_version app-crypt/mit-krb5 && echo "mit" || echo "heimdal")
 	fi
-	econf \
-		$(use_with gcrypt libgcrypt) \
-		$(use_with idn stringprep) \
-		$(use_enable kerberos gssapi) \
-		${krb5_impl} \
-		$(use_enable nls) \
-		$(use_enable ntlm) \
+	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() {