mgorny 14/05/30 21:26:30
Modified: cups-1.7.2-r1.ebuild cups-1.7.1-r2.ebuild
cups-9999.ebuild ChangeLog
Log:
Enable multilib krb5 support.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key
EFB4464E!)
Revision Changes Path
1.2 net-print/cups/cups-1.7.2-r1.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-1.7.2-r1.ebuild?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-1.7.2-r1.ebuild?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-1.7.2-r1.ebuild?r1=1.1&r2=1.2
Index: cups-1.7.2-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.7.2-r1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cups-1.7.2-r1.ebuild 14 May 2014 08:47:24 -0000 1.1
+++ cups-1.7.2-r1.ebuild 30 May 2014 21:26:30 -0000 1.2
@@ -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 @@
)
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 @@
)
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 @@
$(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) \
1.2 net-print/cups/cups-1.7.1-r2.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-1.7.1-r2.ebuild?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-1.7.1-r2.ebuild?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-1.7.1-r2.ebuild?r1=1.1&r2=1.2
Index: cups-1.7.1-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.7.1-r2.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cups-1.7.1-r2.ebuild 14 May 2014 08:47:24 -0000 1.1
+++ cups-1.7.1-r2.ebuild 30 May 2014 21:26:30 -0000 1.2
@@ -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 @@
)
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 @@
)
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 @@
$(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) \
1.56 net-print/cups/cups-9999.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-9999.ebuild?rev=1.56&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-9999.ebuild?rev=1.56&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-9999.ebuild?r1=1.55&r2=1.56
Index: cups-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-print/cups/cups-9999.ebuild,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- cups-9999.ebuild 14 May 2014 08:47:24 -0000 1.55
+++ cups-9999.ebuild 30 May 2014 21:26:30 -0000 1.56
@@ -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 @@
)
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 @@
)
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 @@
$(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) \
1.613 net-print/cups/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/ChangeLog?rev=1.613&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/ChangeLog?rev=1.613&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/ChangeLog?r1=1.612&r2=1.613
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v
retrieving revision 1.612
retrieving revision 1.613
diff -u -r1.612 -r1.613
--- ChangeLog 14 May 2014 17:46:09 -0000 1.612
+++ ChangeLog 30 May 2014 21:26:30 -0000 1.613
@@ -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 <[email protected]> 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 <[email protected]> -cups-1.7.1.ebuild:
Remove old
