1 |
mgorny 14/05/30 21:26:30 |
2 |
|
3 |
Modified: cups-1.7.2-r1.ebuild cups-1.7.1-r2.ebuild |
4 |
cups-9999.ebuild ChangeLog |
5 |
Log: |
6 |
Enable multilib krb5 support. |
7 |
|
8 |
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!) |
9 |
|
10 |
Revision Changes Path |
11 |
1.2 net-print/cups/cups-1.7.2-r1.ebuild |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-1.7.2-r1.ebuild?rev=1.2&view=markup |
14 |
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 |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-1.7.2-r1.ebuild?r1=1.1&r2=1.2 |
16 |
|
17 |
Index: cups-1.7.2-r1.ebuild |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.7.2-r1.ebuild,v |
20 |
retrieving revision 1.1 |
21 |
retrieving revision 1.2 |
22 |
diff -u -r1.1 -r1.2 |
23 |
--- cups-1.7.2-r1.ebuild 14 May 2014 08:47:24 -0000 1.1 |
24 |
+++ cups-1.7.2-r1.ebuild 30 May 2014 21:26:30 -0000 1.2 |
25 |
@@ -1,6 +1,6 @@ |
26 |
# Copyright 1999-2014 Gentoo Foundation |
27 |
# Distributed under the terms of the GNU General Public License v2 |
28 |
-# $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 $ |
29 |
+# $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 $ |
30 |
|
31 |
EAPI=5 |
32 |
|
33 |
@@ -51,7 +51,7 @@ |
34 |
) |
35 |
dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] ) |
36 |
java? ( >=virtual/jre-1.6 ) |
37 |
- kerberos? ( virtual/krb5 ) |
38 |
+ kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] ) |
39 |
!lprng-compat? ( !net-print/lprng ) |
40 |
pam? ( virtual/pam ) |
41 |
python? ( ${PYTHON_DEPS} ) |
42 |
@@ -189,7 +189,10 @@ |
43 |
) |
44 |
fi |
45 |
|
46 |
+ # need to override KRB5CONFIG for proper flags |
47 |
+ # https://www.cups.org/str.php?L4423 |
48 |
econf \ |
49 |
+ KRB5CONFIG="${EPREFIX}"/usr/bin/${CHOST}-krb5-config \ |
50 |
--libdir="${EPREFIX}"/usr/$(get_libdir) \ |
51 |
--localstatedir="${EPREFIX}"/var \ |
52 |
--with-rundir="${EPREFIX}"/run/cups \ |
53 |
@@ -203,7 +206,7 @@ |
54 |
$(use_enable dbus) \ |
55 |
$(use_enable debug) \ |
56 |
$(use_enable debug debug-guards) \ |
57 |
- $(multilib_native_use_enable kerberos gssapi) \ |
58 |
+ $(use_enable kerberos gssapi) \ |
59 |
$(multilib_native_use_enable pam) \ |
60 |
$(use_enable static-libs static) \ |
61 |
$(use_enable threads) \ |
62 |
|
63 |
|
64 |
|
65 |
1.2 net-print/cups/cups-1.7.1-r2.ebuild |
66 |
|
67 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-1.7.1-r2.ebuild?rev=1.2&view=markup |
68 |
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 |
69 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-1.7.1-r2.ebuild?r1=1.1&r2=1.2 |
70 |
|
71 |
Index: cups-1.7.1-r2.ebuild |
72 |
=================================================================== |
73 |
RCS file: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.7.1-r2.ebuild,v |
74 |
retrieving revision 1.1 |
75 |
retrieving revision 1.2 |
76 |
diff -u -r1.1 -r1.2 |
77 |
--- cups-1.7.1-r2.ebuild 14 May 2014 08:47:24 -0000 1.1 |
78 |
+++ cups-1.7.1-r2.ebuild 30 May 2014 21:26:30 -0000 1.2 |
79 |
@@ -1,6 +1,6 @@ |
80 |
# Copyright 1999-2014 Gentoo Foundation |
81 |
# Distributed under the terms of the GNU General Public License v2 |
82 |
-# $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 $ |
83 |
+# $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 $ |
84 |
|
85 |
EAPI=5 |
86 |
|
87 |
@@ -50,7 +50,7 @@ |
88 |
) |
89 |
dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] ) |
90 |
java? ( >=virtual/jre-1.6 ) |
91 |
- kerberos? ( virtual/krb5 ) |
92 |
+ kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] ) |
93 |
!lprng-compat? ( !net-print/lprng ) |
94 |
pam? ( virtual/pam ) |
95 |
python? ( ${PYTHON_DEPS} ) |
96 |
@@ -189,7 +189,10 @@ |
97 |
) |
98 |
fi |
99 |
|
100 |
+ # need to override KRB5CONFIG for proper flags |
101 |
+ # https://www.cups.org/str.php?L4423 |
102 |
econf \ |
103 |
+ KRB5CONFIG="${EPREFIX}"/usr/bin/${CHOST}-krb5-config \ |
104 |
--libdir="${EPREFIX}"/usr/$(get_libdir) \ |
105 |
--localstatedir="${EPREFIX}"/var \ |
106 |
--with-rundir="${EPREFIX}"/run/cups \ |
107 |
@@ -203,7 +206,7 @@ |
108 |
$(use_enable dbus) \ |
109 |
$(use_enable debug) \ |
110 |
$(use_enable debug debug-guards) \ |
111 |
- $(multilib_native_use_enable kerberos gssapi) \ |
112 |
+ $(use_enable kerberos gssapi) \ |
113 |
$(multilib_native_use_enable pam) \ |
114 |
$(use_enable static-libs static) \ |
115 |
$(use_enable threads) \ |
116 |
|
117 |
|
118 |
|
119 |
1.56 net-print/cups/cups-9999.ebuild |
120 |
|
121 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-9999.ebuild?rev=1.56&view=markup |
122 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-9999.ebuild?rev=1.56&content-type=text/plain |
123 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-9999.ebuild?r1=1.55&r2=1.56 |
124 |
|
125 |
Index: cups-9999.ebuild |
126 |
=================================================================== |
127 |
RCS file: /var/cvsroot/gentoo-x86/net-print/cups/cups-9999.ebuild,v |
128 |
retrieving revision 1.55 |
129 |
retrieving revision 1.56 |
130 |
diff -u -r1.55 -r1.56 |
131 |
--- cups-9999.ebuild 14 May 2014 08:47:24 -0000 1.55 |
132 |
+++ cups-9999.ebuild 30 May 2014 21:26:30 -0000 1.56 |
133 |
@@ -1,6 +1,6 @@ |
134 |
# Copyright 1999-2014 Gentoo Foundation |
135 |
# Distributed under the terms of the GNU General Public License v2 |
136 |
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-9999.ebuild,v 1.55 2014/05/14 08:47:24 mgorny Exp $ |
137 |
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-9999.ebuild,v 1.56 2014/05/30 21:26:30 mgorny Exp $ |
138 |
|
139 |
EAPI=5 |
140 |
|
141 |
@@ -50,7 +50,7 @@ |
142 |
) |
143 |
dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] ) |
144 |
java? ( >=virtual/jre-1.6 ) |
145 |
- kerberos? ( virtual/krb5 ) |
146 |
+ kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] ) |
147 |
!lprng-compat? ( !net-print/lprng ) |
148 |
pam? ( virtual/pam ) |
149 |
python? ( ${PYTHON_DEPS} ) |
150 |
@@ -188,7 +188,10 @@ |
151 |
) |
152 |
fi |
153 |
|
154 |
+ # need to override KRB5CONFIG for proper flags |
155 |
+ # https://www.cups.org/str.php?L4423 |
156 |
econf \ |
157 |
+ KRB5CONFIG="${EPREFIX}"/usr/bin/${CHOST}-krb5-config \ |
158 |
--libdir="${EPREFIX}"/usr/$(get_libdir) \ |
159 |
--localstatedir="${EPREFIX}"/var \ |
160 |
--with-rundir="${EPREFIX}"/run/cups \ |
161 |
@@ -202,7 +205,7 @@ |
162 |
$(use_enable dbus) \ |
163 |
$(use_enable debug) \ |
164 |
$(use_enable debug debug-guards) \ |
165 |
- $(multilib_native_use_enable kerberos gssapi) \ |
166 |
+ $(use_enable kerberos gssapi) \ |
167 |
$(multilib_native_use_enable pam) \ |
168 |
$(use_enable static-libs static) \ |
169 |
$(use_enable threads) \ |
170 |
|
171 |
|
172 |
|
173 |
1.613 net-print/cups/ChangeLog |
174 |
|
175 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/ChangeLog?rev=1.613&view=markup |
176 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/ChangeLog?rev=1.613&content-type=text/plain |
177 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/ChangeLog?r1=1.612&r2=1.613 |
178 |
|
179 |
Index: ChangeLog |
180 |
=================================================================== |
181 |
RCS file: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v |
182 |
retrieving revision 1.612 |
183 |
retrieving revision 1.613 |
184 |
diff -u -r1.612 -r1.613 |
185 |
--- ChangeLog 14 May 2014 17:46:09 -0000 1.612 |
186 |
+++ ChangeLog 30 May 2014 21:26:30 -0000 1.613 |
187 |
@@ -1,6 +1,10 @@ |
188 |
# ChangeLog for net-print/cups |
189 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
190 |
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.612 2014/05/14 17:46:09 dilfridge Exp $ |
191 |
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.613 2014/05/30 21:26:30 mgorny Exp $ |
192 |
+ |
193 |
+ 30 May 2014; Michał Górny <mgorny@g.o> cups-1.7.1-r2.ebuild, |
194 |
+ cups-1.7.2-r1.ebuild, cups-9999.ebuild: |
195 |
+ Enable multilib krb5 support. |
196 |
|
197 |
14 May 2014; Andreas K. Huettel <dilfridge@g.o> -cups-1.7.1.ebuild: |
198 |
Remove old |