Enable multilib krb5 support.

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)

4 files changed, 23 insertions, 10 deletions

diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index 8d1f0b696d31..436205d74184 100644
--- a/net-print/cups/ChangeLog
+++ b/net-print/cups/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-print/cups
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.612 2014/05/14 17:46:09 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.613 2014/05/30 21:26:30 mgorny Exp $
+
+  30 May 2014; Michał Górny <mgorny@gentoo.org> cups-1.7.1-r2.ebuild,
+  cups-1.7.2-r1.ebuild, cups-9999.ebuild:
+  Enable multilib krb5 support.
 
   14 May 2014; Andreas K. Huettel <dilfridge@gentoo.org> -cups-1.7.1.ebuild:
   Remove old
diff --git a/net-print/cups/cups-1.7.1-r2.ebuild b/net-print/cups/cups-1.7.1-r2.ebuild
index da53843bc50d..5e0ec6fb9e14 100644
--- a/net-print/cups/cups-1.7.1-r2.ebuild
+++ b/net-print/cups/cups-1.7.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.7.1-r2.ebuild,v 1.1 2014/05/14 08:47:24 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.7.1-r2.ebuild,v 1.2 2014/05/30 21:26:30 mgorny Exp $
 
 EAPI=5
 
@@ -50,7 +50,7 @@ RDEPEND="
 	)
 	dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
 	java? ( >=virtual/jre-1.6 )
-	kerberos? ( virtual/krb5 )
+	kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
 	!lprng-compat? ( !net-print/lprng )
 	pam? ( virtual/pam )
 	python? ( ${PYTHON_DEPS} )
@@ -189,7 +189,10 @@ multilib_src_configure() {
 		)
 	fi
 
+	# need to override KRB5CONFIG for proper flags
+	# https://www.cups.org/str.php?L4423
 	econf \
+		KRB5CONFIG="${EPREFIX}"/usr/bin/${CHOST}-krb5-config \
 		--libdir="${EPREFIX}"/usr/$(get_libdir) \
 		--localstatedir="${EPREFIX}"/var \
 		--with-rundir="${EPREFIX}"/run/cups \
@@ -203,7 +206,7 @@ multilib_src_configure() {
 		$(use_enable dbus) \
 		$(use_enable debug) \
 		$(use_enable debug debug-guards) \
-		$(multilib_native_use_enable kerberos gssapi) \
+		$(use_enable kerberos gssapi) \
 		$(multilib_native_use_enable pam) \
 		$(use_enable static-libs static) \
 		$(use_enable threads) \
diff --git a/net-print/cups/cups-1.7.2-r1.ebuild b/net-print/cups/cups-1.7.2-r1.ebuild
index de34088f028b..186245c87a8f 100644
--- a/net-print/cups/cups-1.7.2-r1.ebuild
+++ b/net-print/cups/cups-1.7.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.7.2-r1.ebuild,v 1.1 2014/05/14 08:47:24 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.7.2-r1.ebuild,v 1.2 2014/05/30 21:26:30 mgorny Exp $
 
 EAPI=5
 
@@ -51,7 +51,7 @@ RDEPEND="
 	)
 	dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
 	java? ( >=virtual/jre-1.6 )
-	kerberos? ( virtual/krb5 )
+	kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
 	!lprng-compat? ( !net-print/lprng )
 	pam? ( virtual/pam )
 	python? ( ${PYTHON_DEPS} )
@@ -189,7 +189,10 @@ multilib_src_configure() {
 		)
 	fi
 
+	# need to override KRB5CONFIG for proper flags
+	# https://www.cups.org/str.php?L4423
 	econf \
+		KRB5CONFIG="${EPREFIX}"/usr/bin/${CHOST}-krb5-config \
 		--libdir="${EPREFIX}"/usr/$(get_libdir) \
 		--localstatedir="${EPREFIX}"/var \
 		--with-rundir="${EPREFIX}"/run/cups \
@@ -203,7 +206,7 @@ multilib_src_configure() {
 		$(use_enable dbus) \
 		$(use_enable debug) \
 		$(use_enable debug debug-guards) \
-		$(multilib_native_use_enable kerberos gssapi) \
+		$(use_enable kerberos gssapi) \
 		$(multilib_native_use_enable pam) \
 		$(use_enable static-libs static) \
 		$(use_enable threads) \
diff --git a/net-print/cups/cups-9999.ebuild b/net-print/cups/cups-9999.ebuild
index dde8dd317457..63abe38a7a62 100644
--- a/net-print/cups/cups-9999.ebuild
+++ b/net-print/cups/cups-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-9999.ebuild,v 1.55 2014/05/14 08:47:24 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-9999.ebuild,v 1.56 2014/05/30 21:26:30 mgorny Exp $
 
 EAPI=5
 
@@ -50,7 +50,7 @@ RDEPEND="
 	)
 	dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
 	java? ( >=virtual/jre-1.6 )
-	kerberos? ( virtual/krb5 )
+	kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] )
 	!lprng-compat? ( !net-print/lprng )
 	pam? ( virtual/pam )
 	python? ( ${PYTHON_DEPS} )
@@ -188,7 +188,10 @@ multilib_src_configure() {
 		)
 	fi
 
+	# need to override KRB5CONFIG for proper flags
+	# https://www.cups.org/str.php?L4423
 	econf \
+		KRB5CONFIG="${EPREFIX}"/usr/bin/${CHOST}-krb5-config \
 		--libdir="${EPREFIX}"/usr/$(get_libdir) \
 		--localstatedir="${EPREFIX}"/var \
 		--with-rundir="${EPREFIX}"/run/cups \
@@ -202,7 +205,7 @@ multilib_src_configure() {
 		$(use_enable dbus) \
 		$(use_enable debug) \
 		$(use_enable debug debug-guards) \
-		$(multilib_native_use_enable kerberos gssapi) \
+		$(use_enable kerberos gssapi) \
 		$(multilib_native_use_enable pam) \
 		$(use_enable static-libs static) \
 		$(use_enable threads) \