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

Gentoo Archives: gentoo-commits

From: "Alexandre Rostovtsev (tetromino)" <tetromino@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in gnome-base/gconf: metadata.xml gconf-3.2.5.ebuild ChangeLog gconf-2.32.4.ebuild
Date: Thu, 27 Dec 2012 18:06:03
Message-Id: 20121227180552.D30B12171D@flycatcher.gentoo.org
1 tetromino 12/12/27 18:05:52
2
3 Modified: metadata.xml gconf-3.2.5.ebuild ChangeLog
4 gconf-2.32.4.ebuild
5 Log:
6 Make gtk dependency optional (bug #448868, thanks to wbrana). Drop useless doc USE flag. Switch to global introspection flag. Update to EAPI5, update license.
7
8 (Portage version: 2.2.0_alpha149/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)
9
10 Revision Changes Path
11 1.5 gnome-base/gconf/metadata.xml
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gconf/metadata.xml?rev=1.5&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gconf/metadata.xml?rev=1.5&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gconf/metadata.xml?r1=1.4&r2=1.5
16
17 Index: metadata.xml
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/gnome-base/gconf/metadata.xml,v
20 retrieving revision 1.4
21 retrieving revision 1.5
22 diff -u -r1.4 -r1.5
23 --- metadata.xml 7 Nov 2011 01:11:55 -0000 1.4
24 +++ metadata.xml 27 Dec 2012 18:05:52 -0000 1.5
25 @@ -3,7 +3,6 @@
26 <pkgmetadata>
27 <herd>gnome</herd>
28 <use>
29 - <flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg> for introspection</flag>
30 <flag name="ldap">Build backend which enables default mail accounts,
31 addressbooks and calendars for Evolution to be configured using each
32 user's LDAP entry."</flag>
33
34
35
36 1.5 gnome-base/gconf/gconf-3.2.5.ebuild
37
38 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gconf/gconf-3.2.5.ebuild?rev=1.5&view=markup
39 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gconf/gconf-3.2.5.ebuild?rev=1.5&content-type=text/plain
40 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gconf/gconf-3.2.5.ebuild?r1=1.4&r2=1.5
41
42 Index: gconf-3.2.5.ebuild
43 ===================================================================
44 RCS file: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-3.2.5.ebuild,v
45 retrieving revision 1.4
46 retrieving revision 1.5
47 diff -u -r1.4 -r1.5
48 --- gconf-3.2.5.ebuild 22 May 2012 08:20:39 -0000 1.4
49 +++ gconf-3.2.5.ebuild 27 Dec 2012 18:05:52 -0000 1.5
50 @@ -1,44 +1,43 @@
51 # Copyright 1999-2012 Gentoo Foundation
52 # Distributed under the terms of the GNU General Public License v2
53 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-3.2.5.ebuild,v 1.4 2012/05/22 08:20:39 jlec Exp $
54 +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-3.2.5.ebuild,v 1.5 2012/12/27 18:05:52 tetromino Exp $
55
56 -EAPI="4"
57 +EAPI="5"
58 GCONF_DEBUG="yes"
59 GNOME_ORG_MODULE="GConf"
60 GNOME2_LA_PUNT="yes"
61
62 inherit eutils gnome2
63
64 -DESCRIPTION="Gnome Configuration System and Daemon"
65 +DESCRIPTION="GNOME configuration system and daemon"
66 HOMEPAGE="http://projects.gnome.org/gconf/"
67
68 -LICENSE="LGPL-2"
69 +LICENSE="LGPL-2+"
70 SLOT="2"
71 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
72 -IUSE="debug doc +introspection ldap orbit policykit"
73 +IUSE="debug gtk +introspection ldap orbit policykit"
74
75 RDEPEND=">=dev-libs/glib-2.31:2
76 - >=x11-libs/gtk+-2.90:3
77 >=dev-libs/dbus-glib-0.74
78 >=sys-apps/dbus-1
79 >=dev-libs/libxml2-2:2
80 + gtk? ( >=x11-libs/gtk+-2.90:3 )
81 introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
82 - ldap? ( net-nds/openldap )
83 + ldap? ( net-nds/openldap:= )
84 orbit? ( >=gnome-base/orbit-2.4:2 )
85 policykit? ( sys-auth/polkit )"
86 DEPEND="${RDEPEND}
87 dev-libs/libxslt
88 + dev-util/gtk-doc-am
89 >=dev-util/intltool-0.35
90 - virtual/pkgconfig
91 - doc? ( >=dev-util/gtk-doc-1 )"
92 + virtual/pkgconfig"
93
94 -pkg_setup() {
95 - DOCS="AUTHORS ChangeLog NEWS README TODO"
96 +src_prepare() {
97 G2CONF="${G2CONF}
98 - --enable-gtk
99 --disable-static
100 --enable-gsettings-backend
101 - --with-gtk=3.0
102 + $(use_enable gtk)
103 + "$(usex gtk --with-gtk=3.0 "")"
104 $(use_enable introspection)
105 $(use_with ldap openldap)
106 $(use_enable orbit)
107 @@ -46,9 +45,7 @@
108 ORBIT_IDL=$(type -P orbit-idl-2)"
109 # Need host's IDL compiler for cross or native build, bug #262747
110 kill_gconf
111 -}
112
113 -src_prepare() {
114 gnome2_src_prepare
115
116 # Do not start gconfd when installing schemas, fix bug #238276, upstream #631983
117
118
119
120 1.271 gnome-base/gconf/ChangeLog
121
122 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gconf/ChangeLog?rev=1.271&view=markup
123 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gconf/ChangeLog?rev=1.271&content-type=text/plain
124 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gconf/ChangeLog?r1=1.270&r2=1.271
125
126 Index: ChangeLog
127 ===================================================================
128 RCS file: /var/cvsroot/gentoo-x86/gnome-base/gconf/ChangeLog,v
129 retrieving revision 1.270
130 retrieving revision 1.271
131 diff -u -r1.270 -r1.271
132 --- ChangeLog 6 Oct 2012 09:50:59 -0000 1.270
133 +++ ChangeLog 27 Dec 2012 18:05:52 -0000 1.271
134 @@ -1,6 +1,12 @@
135 # ChangeLog for gnome-base/gconf
136 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
137 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/ChangeLog,v 1.270 2012/10/06 09:50:59 pacho Exp $
138 +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/ChangeLog,v 1.271 2012/12/27 18:05:52 tetromino Exp $
139 +
140 + 27 Dec 2012; Alexandre Rostovtsev <tetromino@g.o> gconf-2.32.4.ebuild,
141 + gconf-3.2.5.ebuild, metadata.xml:
142 + Make gtk dependency optional (bug #448868, thanks to wbrana). Drop useless
143 + doc USE flag. Switch to global introspection flag. Update to EAPI5, update
144 + license.
145
146 06 Oct 2012; Pacho Ramos <pacho@g.o>
147 -files/gconf-3.2.3-shutdown-crash.patch, -gconf-3.2.3-r1.ebuild,
148
149
150
151 1.10 gnome-base/gconf/gconf-2.32.4.ebuild
152
153 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gconf/gconf-2.32.4.ebuild?rev=1.10&view=markup
154 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gconf/gconf-2.32.4.ebuild?rev=1.10&content-type=text/plain
155 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-base/gconf/gconf-2.32.4.ebuild?r1=1.9&r2=1.10
156
157 Index: gconf-2.32.4.ebuild
158 ===================================================================
159 RCS file: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-2.32.4.ebuild,v
160 retrieving revision 1.9
161 retrieving revision 1.10
162 diff -u -r1.9 -r1.10
163 --- gconf-2.32.4.ebuild 6 Oct 2012 09:50:59 -0000 1.9
164 +++ gconf-2.32.4.ebuild 27 Dec 2012 18:05:52 -0000 1.10
165 @@ -1,21 +1,21 @@
166 # Copyright 1999-2012 Gentoo Foundation
167 # Distributed under the terms of the GNU General Public License v2
168 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-2.32.4.ebuild,v 1.9 2012/10/06 09:50:59 pacho Exp $
169 +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-2.32.4.ebuild,v 1.10 2012/12/27 18:05:52 tetromino Exp $
170
171 -EAPI="4"
172 +EAPI="5"
173 GCONF_DEBUG="yes"
174 GNOME2_LA_PUNT="yes"
175 GNOME_ORG_MODULE="GConf"
176
177 inherit eutils gnome2
178
179 -DESCRIPTION="Gnome Configuration System and Daemon"
180 +DESCRIPTION="GNOME configuration system and daemon"
181 HOMEPAGE="http://projects.gnome.org/gconf/"
182
183 -LICENSE="LGPL-2"
184 +LICENSE="LGPL-2+"
185 SLOT="2"
186 KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
187 -IUSE="debug doc +introspection ldap policykit"
188 +IUSE="debug gtk +introspection ldap policykit"
189
190 RDEPEND=">=dev-libs/glib-2.25.9:2
191 >=x11-libs/gtk+-2.14:2
192 @@ -24,27 +24,25 @@
193 >=gnome-base/orbit-2.4:2
194 >=dev-libs/libxml2-2:2
195 introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
196 - ldap? ( net-nds/openldap )
197 + ldap? ( net-nds/openldap:= )
198 policykit? ( sys-auth/polkit )"
199 DEPEND="${RDEPEND}
200 + dev-util/gtk-doc-am
201 >=dev-util/intltool-0.35
202 - virtual/pkgconfig
203 - doc? ( >=dev-util/gtk-doc-1 )"
204 + virtual/pkgconfig"
205
206 -pkg_setup() {
207 - DOCS="AUTHORS ChangeLog NEWS README TODO"
208 +src_prepare() {
209 G2CONF="${G2CONF}
210 - --enable-gtk
211 --disable-static
212 --enable-gsettings-backend
213 - --with-gtk=2.0
214 + $(use_enable gtk)
215 + "$(usex gtk --with-gtk=2.0 "")"
216 $(use_enable introspection)
217 $(use_with ldap openldap)
218 - $(use_enable policykit defaults-service)"
219 + $(use_enable policykit defaults-service)
220 + ORBIT_IDL=$(type -P orbit-idl-2)"
221 kill_gconf
222 -}
223
224 -src_prepare() {
225 gnome2_src_prepare
226
227 # Do not start gconfd when installing schemas, fix bug #238276, upstream #631983
228 @@ -54,11 +52,6 @@
229 epatch "${FILESDIR}/${PN}-2.28.0-entry-set-value-sigsegv.patch"
230 }
231
232 -src_compile() {
233 - # Need host's IDL compiler for cross or native build, bug #262747
234 - emake ORBIT_IDL=/usr/bin/orbit-idl-2
235 -}
236 -
237 src_install() {
238 gnome2_src_install
239
240 @@ -67,7 +60,7 @@
241 # Make sure this directory exists, bug #268070, upstream #572027
242 keepdir /etc/gconf/gconf.xml.system
243
244 - echo 'CONFIG_PROTECT_MASK="/etc/gconf"' > 50gconf
245 + echo 'CONFIG_PROTECT_MASK="${EPREFIX}/etc/gconf"' > 50gconf
246 echo 'GSETTINGS_BACKEND="gconf"' >> 50gconf
247 doenvd 50gconf
248 dodir /root/.gconfd
Report Message
Find on MARC Find on Google Groups