Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Samuli Suominen (ssuominen)" <ssuominen@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-print/cups: ChangeLog cups-1.4.2-r1.ebuild cups-1.3.11-r2.ebuild cups-1.3.11-r1.ebuild
Date: Wed, 10 Feb 2010 19:46:12
Message-Id: E1NfIVl-0005Es-TM@stork.gentoo.org
1 ssuominen 10/02/10 19:46:09
2
3 Modified: ChangeLog cups-1.4.2-r1.ebuild
4 cups-1.3.11-r2.ebuild cups-1.3.11-r1.ebuild
5 Log:
6 Fix poppler depend.
7 (Portage version: 2.2_rc62/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.379 net-print/cups/ChangeLog
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/cups/ChangeLog?rev=1.379&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/cups/ChangeLog?rev=1.379&content-type=text/plain
14 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/cups/ChangeLog?r1=1.378&r2=1.379
15
16 Index: ChangeLog
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v
19 retrieving revision 1.378
20 retrieving revision 1.379
21 diff -u -r1.378 -r1.379
22 --- ChangeLog 24 Jan 2010 02:02:00 -0000 1.378
23 +++ ChangeLog 10 Feb 2010 19:46:08 -0000 1.379
24 @@ -1,6 +1,10 @@
25 # ChangeLog for net-print/cups
26 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
27 -# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.378 2010/01/24 02:02:00 abcd Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.379 2010/02/10 19:46:08 ssuominen Exp $
29 +
30 + 10 Feb 2010; Samuli Suominen <ssuominen@g.o> cups-1.3.11-r1.ebuild,
31 + cups-1.3.11-r2.ebuild, cups-1.4.2-r1.ebuild:
32 + Fix poppler depend.
33
34 24 Jan 2010; Jonathan Callen <abcd@g.o> cups-1.4.2-r1.ebuild:
35 Depend on virtual/poppler-utils, not app-text/poppler-utils
36
37
38
39 1.4 net-print/cups/cups-1.4.2-r1.ebuild
40
41 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/cups/cups-1.4.2-r1.ebuild?rev=1.4&view=markup
42 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/cups/cups-1.4.2-r1.ebuild?rev=1.4&content-type=text/plain
43 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/cups/cups-1.4.2-r1.ebuild?r1=1.3&r2=1.4
44
45 Index: cups-1.4.2-r1.ebuild
46 ===================================================================
47 RCS file: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.4.2-r1.ebuild,v
48 retrieving revision 1.3
49 retrieving revision 1.4
50 diff -u -r1.3 -r1.4
51 --- cups-1.4.2-r1.ebuild 24 Jan 2010 02:02:00 -0000 1.3
52 +++ cups-1.4.2-r1.ebuild 10 Feb 2010 19:46:08 -0000 1.4
53 @@ -1,6 +1,6 @@
54 # Copyright 1999-2010 Gentoo Foundation
55 # Distributed under the terms of the GNU General Public License v2
56 -# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.4.2-r1.ebuild,v 1.3 2010/01/24 02:02:00 abcd Exp $
57 +# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.4.2-r1.ebuild,v 1.4 2010/02/10 19:46:08 ssuominen Exp $
58
59 EAPI="2"
60
61 @@ -36,7 +36,7 @@
62 app-text/libpaper
63 dev-libs/libgcrypt
64 dev-libs/libusb
65 - virtual/poppler-utils
66 + >=app-text/poppler-0.12.3-r3[utils]
67 !net-print/cupsddk"
68
69 DEPEND="${COMMON_DEPEND}"
70
71
72
73 1.3 net-print/cups/cups-1.3.11-r2.ebuild
74
75 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/cups/cups-1.3.11-r2.ebuild?rev=1.3&view=markup
76 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/cups/cups-1.3.11-r2.ebuild?rev=1.3&content-type=text/plain
77 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/cups/cups-1.3.11-r2.ebuild?r1=1.2&r2=1.3
78
79 Index: cups-1.3.11-r2.ebuild
80 ===================================================================
81 RCS file: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.3.11-r2.ebuild,v
82 retrieving revision 1.2
83 retrieving revision 1.3
84 diff -u -r1.2 -r1.3
85 --- cups-1.3.11-r2.ebuild 26 Dec 2009 19:42:15 -0000 1.2
86 +++ cups-1.3.11-r2.ebuild 10 Feb 2010 19:46:08 -0000 1.3
87 @@ -1,7 +1,8 @@
88 -# Copyright 1999-2009 Gentoo Foundation
89 +# Copyright 1999-2010 Gentoo Foundation
90 # Distributed under the terms of the GNU General Public License v2
91 -# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.3.11-r2.ebuild,v 1.2 2009/12/26 19:42:15 pva Exp $
92 +# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.3.11-r2.ebuild,v 1.3 2010/02/10 19:46:08 ssuominen Exp $
93
94 +EAPI=2
95 inherit autotools eutils flag-o-matic multilib pam
96
97 MY_P=${P/_}
98 @@ -43,7 +44,7 @@
99 RDEPEND="${COMMON_DEPEND}
100 !virtual/lpr
101 X? ( x11-misc/xdg-utils )
102 - >=virtual/poppler-utils-0.4.3-r1
103 + >=app-text/poppler-0.12.3-r3[utils]
104 "
105
106 PDEPEND="
107 @@ -91,10 +92,7 @@
108 enewgroup lpadmin 106
109 }
110
111 -src_unpack() {
112 - unpack ${A}
113 - cd "${S}"
114 -
115 +src_prepare() {
116 # disable configure automagic for acl/attr, upstream bug STR #2723
117 epatch "${FILESDIR}/${PN}-1.3.0-configure.patch"
118
119 @@ -117,7 +115,7 @@
120 eautoconf
121 }
122
123 -src_compile() {
124 +src_configure() {
125 # Fails to compile on SH
126 use sh && replace-flags -O? -O0
127
128 @@ -189,8 +187,6 @@
129 sed -i -e 's:SERVERBIN.*:SERVERBIN = "$(BUILDROOT)"/usr/libexec/cups:' Makedefs
130 sed -i -e 's:#define CUPS_SERVERBIN.*:#define CUPS_SERVERBIN "/usr/libexec/cups":' config.h
131 sed -i -e 's:cups_serverbin=.*:cups_serverbin=/usr/libexec/cups:' cups-config
132 -
133 - emake || die "emake failed"
134 }
135
136 src_install() {
137
138
139
140 1.10 net-print/cups/cups-1.3.11-r1.ebuild
141
142 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/cups/cups-1.3.11-r1.ebuild?rev=1.10&view=markup
143 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/cups/cups-1.3.11-r1.ebuild?rev=1.10&content-type=text/plain
144 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/cups/cups-1.3.11-r1.ebuild?r1=1.9&r2=1.10
145
146 Index: cups-1.3.11-r1.ebuild
147 ===================================================================
148 RCS file: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.3.11-r1.ebuild,v
149 retrieving revision 1.9
150 retrieving revision 1.10
151 diff -u -r1.9 -r1.10
152 --- cups-1.3.11-r1.ebuild 26 Dec 2009 19:42:15 -0000 1.9
153 +++ cups-1.3.11-r1.ebuild 10 Feb 2010 19:46:08 -0000 1.10
154 @@ -1,7 +1,8 @@
155 -# Copyright 1999-2009 Gentoo Foundation
156 +# Copyright 1999-2010 Gentoo Foundation
157 # Distributed under the terms of the GNU General Public License v2
158 -# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.3.11-r1.ebuild,v 1.9 2009/12/26 19:42:15 pva Exp $
159 +# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.3.11-r1.ebuild,v 1.10 2010/02/10 19:46:08 ssuominen Exp $
160
161 +EAPI=2
162 inherit autotools eutils flag-o-matic multilib pam
163
164 MY_P=${P/_}
165 @@ -43,7 +44,7 @@
166 RDEPEND="${COMMON_DEPEND}
167 !virtual/lpr
168 X? ( x11-misc/xdg-utils )
169 - >=virtual/poppler-utils-0.4.3-r1
170 + >=app-text/poppler-0.12.3-r3[utils]
171 "
172
173 PDEPEND="
174 @@ -91,10 +92,7 @@
175 enewgroup lpadmin 106
176 }
177
178 -src_unpack() {
179 - unpack ${A}
180 - cd "${S}"
181 -
182 +src_prepare() {
183 # disable configure automagic for acl/attr, upstream bug STR #2723
184 epatch "${FILESDIR}/${PN}-1.3.0-configure.patch"
185
186 @@ -114,7 +112,7 @@
187 eautoconf
188 }
189
190 -src_compile() {
191 +src_configure() {
192 # Fails to compile on SH
193 use sh && replace-flags -O? -O0
194
195 @@ -186,8 +184,6 @@
196 sed -i -e 's:SERVERBIN.*:SERVERBIN = "$(BUILDROOT)"/usr/libexec/cups:' Makedefs
197 sed -i -e 's:#define CUPS_SERVERBIN.*:#define CUPS_SERVERBIN "/usr/libexec/cups":' config.h
198 sed -i -e 's:cups_serverbin=.*:cups_serverbin=/usr/libexec/cups:' cups-config
199 -
200 - emake || die "emake failed"
201 }
202
203 src_install() {
Report Message
Find on MARC Find on Google Groups