1 |
pacho 12/05/01 20:20:22 |
2 |
|
3 |
Modified: metadata.xml ChangeLog |
4 |
Added: glib-2.32.2.ebuild |
5 |
Removed: glib-2.28.8.ebuild glib-2.30.2-r1.ebuild |
6 |
glib-2.32.0.ebuild |
7 |
Log: |
8 |
Version bump, remove old. |
9 |
|
10 |
(Portage version: 2.1.10.57/cvs/Linux x86_64) |
11 |
|
12 |
Revision Changes Path |
13 |
1.5 dev-libs/glib/metadata.xml |
14 |
|
15 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/glib/metadata.xml?rev=1.5&view=markup |
16 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/glib/metadata.xml?rev=1.5&content-type=text/plain |
17 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/glib/metadata.xml?r1=1.4&r2=1.5 |
18 |
|
19 |
Index: metadata.xml |
20 |
=================================================================== |
21 |
RCS file: /var/cvsroot/gentoo-x86/dev-libs/glib/metadata.xml,v |
22 |
retrieving revision 1.4 |
23 |
retrieving revision 1.5 |
24 |
diff -u -r1.4 -r1.5 |
25 |
--- metadata.xml 16 Oct 2011 21:37:16 -0000 1.4 |
26 |
+++ metadata.xml 1 May 2012 20:20:22 -0000 1.5 |
27 |
@@ -3,8 +3,6 @@ |
28 |
<pkgmetadata> |
29 |
<herd>gnome</herd> |
30 |
<use> |
31 |
- <flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg> |
32 |
- for introspection</flag> |
33 |
<flag name="systemtap">Build support for profiling and tracing using |
34 |
<pkg>dev-util/systemtap</pkg></flag> |
35 |
<flag name="utils">Install gtester-report utility to generate test |
36 |
|
37 |
|
38 |
|
39 |
1.521 dev-libs/glib/ChangeLog |
40 |
|
41 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/glib/ChangeLog?rev=1.521&view=markup |
42 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/glib/ChangeLog?rev=1.521&content-type=text/plain |
43 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/glib/ChangeLog?r1=1.520&r2=1.521 |
44 |
|
45 |
Index: ChangeLog |
46 |
=================================================================== |
47 |
RCS file: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v |
48 |
retrieving revision 1.520 |
49 |
retrieving revision 1.521 |
50 |
diff -u -r1.520 -r1.521 |
51 |
--- ChangeLog 30 Apr 2012 19:17:06 -0000 1.520 |
52 |
+++ ChangeLog 1 May 2012 20:20:22 -0000 1.521 |
53 |
@@ -1,6 +1,13 @@ |
54 |
# ChangeLog for dev-libs/glib |
55 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
56 |
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.520 2012/04/30 19:17:06 ssuominen Exp $ |
57 |
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.521 2012/05/01 20:20:22 pacho Exp $ |
58 |
+ |
59 |
+*glib-2.32.2 (01 May 2012) |
60 |
+ |
61 |
+ 01 May 2012; Pacho Ramos <pacho@g.o> +glib-2.32.2.ebuild, |
62 |
+ -glib-2.28.8.ebuild, -glib-2.30.2-r1.ebuild, -glib-2.32.0.ebuild, |
63 |
+ metadata.xml: |
64 |
+ Version bump, remove old. |
65 |
|
66 |
30 Apr 2012; Samuli Suominen <ssuominen@g.o> glib-2.32.1.ebuild: |
67 |
Check for CONFIG_INOTIFY_USER wrt #413403 |
68 |
|
69 |
|
70 |
|
71 |
1.1 dev-libs/glib/glib-2.32.2.ebuild |
72 |
|
73 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/glib/glib-2.32.2.ebuild?rev=1.1&view=markup |
74 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/glib/glib-2.32.2.ebuild?rev=1.1&content-type=text/plain |
75 |
|
76 |
Index: glib-2.32.2.ebuild |
77 |
=================================================================== |
78 |
# Copyright 1999-2012 Gentoo Foundation |
79 |
# Distributed under the terms of the GNU General Public License v2 |
80 |
# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.32.2.ebuild,v 1.1 2012/05/01 20:20:22 pacho Exp $ |
81 |
|
82 |
EAPI="4" |
83 |
PYTHON_DEPEND="utils? 2" |
84 |
# Avoid runtime dependency on python when USE=test |
85 |
|
86 |
inherit autotools gnome.org libtool eutils flag-o-matic gnome2-utils multilib pax-utils python virtualx linux-info |
87 |
|
88 |
DESCRIPTION="The GLib library of C routines" |
89 |
HOMEPAGE="http://www.gtk.org/" |
90 |
SRC_URI="${SRC_URI} |
91 |
http://pkgconfig.freedesktop.org/releases/pkg-config-0.26.tar.gz" # pkg.m4 for eautoreconf |
92 |
|
93 |
LICENSE="LGPL-2" |
94 |
SLOT="2" |
95 |
IUSE="debug doc fam kernel_linux selinux static-libs systemtap test utils xattr" |
96 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" |
97 |
|
98 |
RDEPEND="virtual/libiconv |
99 |
virtual/libffi |
100 |
sys-libs/zlib |
101 |
|| ( |
102 |
>=dev-libs/elfutils-0.142 |
103 |
>=dev-libs/libelf-0.8.11 ) |
104 |
xattr? ( sys-apps/attr ) |
105 |
fam? ( virtual/fam ) |
106 |
utils? ( >=dev-util/gdbus-codegen-${PV} )" |
107 |
DEPEND="${RDEPEND} |
108 |
>=sys-devel/gettext-0.11 |
109 |
>=dev-util/gtk-doc-am-1.15 |
110 |
doc? ( |
111 |
>=dev-libs/libxslt-1.0 |
112 |
>=dev-util/gdbus-codegen-${PV} |
113 |
>=dev-util/gtk-doc-1.15 |
114 |
~app-text/docbook-xml-dtd-4.1.2 ) |
115 |
systemtap? ( >=dev-util/systemtap-1.3 ) |
116 |
test? ( |
117 |
sys-devel/gdb |
118 |
=dev-lang/python-2* |
119 |
>=dev-util/gdbus-codegen-${PV} |
120 |
>=sys-apps/dbus-1.2.14 ) |
121 |
!<dev-util/gtk-doc-1.15-r2" |
122 |
PDEPEND="x11-misc/shared-mime-info |
123 |
!<gnome-base/gvfs-1.6.4-r990" |
124 |
# shared-mime-info needed for gio/xdgmime, bug #409481 |
125 |
# Earlier versions of gvfs do not work with glib |
126 |
|
127 |
pkg_setup() { |
128 |
# Needed for gio/tests/gdbus-testserver.py |
129 |
if use test ; then |
130 |
python_set_active_version 2 |
131 |
python_pkg_setup |
132 |
fi |
133 |
|
134 |
if use kernel_linux ; then |
135 |
CONFIG_CHECK="~INOTIFY_USER" |
136 |
linux-info_pkg_setup |
137 |
fi |
138 |
} |
139 |
|
140 |
src_prepare() { |
141 |
mv -vf "${WORKDIR}"/pkg-config-*/pkg.m4 "${WORKDIR}"/ || die |
142 |
|
143 |
if use ia64 ; then |
144 |
# Only apply for < 4.1 |
145 |
local major=$(gcc-major-version) |
146 |
local minor=$(gcc-minor-version) |
147 |
if (( major < 4 || ( major == 4 && minor == 0 ) )); then |
148 |
epatch "${FILESDIR}/glib-2.10.3-ia64-atomic-ops.patch" |
149 |
fi |
150 |
fi |
151 |
|
152 |
# Fix gmodule issues on fbsd; bug #184301 |
153 |
epatch "${FILESDIR}"/${PN}-2.12.12-fbsd.patch |
154 |
|
155 |
# need to build tests if USE=doc for bug #387385 |
156 |
if ! use test && ! use doc; then |
157 |
# don't waste time building tests |
158 |
sed 's/^\(.*\SUBDIRS .*\=.*\)tests\(.*\)$/\1\2/' -i $(find . -name Makefile.am -o -name Makefile.in) || die |
159 |
else |
160 |
# Do not try to remove files on live filesystem, upstream bug #619274 |
161 |
sed 's:^\(.*"/desktop-app-info/delete".*\):/*\1*/:' \ |
162 |
-i "${S}"/gio/tests/desktop-app-info.c || die "sed failed" |
163 |
|
164 |
# Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629 |
165 |
if ! has_version dev-util/desktop-file-utils ; then |
166 |
ewarn "Some tests will be skipped due dev-util/desktop-file-utils not being present on your system," |
167 |
ewarn "think on installing it to get these tests run." |
168 |
sed -i -e "/appinfo\/associations/d" gio/tests/appinfo.c || die |
169 |
sed -i -e "/desktop-app-info\/default/d" gio/tests/desktop-app-info.c || die |
170 |
sed -i -e "/desktop-app-info\/fallback/d" gio/tests/desktop-app-info.c || die |
171 |
sed -i -e "/desktop-app-info\/lastused/d" gio/tests/desktop-app-info.c || die |
172 |
fi |
173 |
|
174 |
# Disable tests requiring dbus-python and pygobject; bugs #349236, #377549, #384853 |
175 |
if ! has_version dev-python/dbus-python || ! has_version 'dev-python/pygobject:2' ; then |
176 |
ewarn "Some tests will be skipped due to dev-python/dbus-python or dev-python/pygobject:2" |
177 |
ewarn "not being present on your system, think on installing them to get these tests run." |
178 |
sed -i -e "/connection\/filter/d" gio/tests/gdbus-connection.c || die |
179 |
sed -i -e "/connection\/large_message/d" gio/tests/gdbus-connection-slow.c || die |
180 |
sed -i -e "/gdbus\/proxy/d" gio/tests/gdbus-proxy.c || die |
181 |
sed -i -e "/gdbus\/proxy-well-known-name/d" gio/tests/gdbus-proxy-well-known-name.c || die |
182 |
sed -i -e "/gdbus\/introspection-parser/d" gio/tests/gdbus-introspection.c || die |
183 |
sed -i -e "/g_test_add_func/d" gio/tests/gdbus-threading.c || die |
184 |
sed -i -e "/gdbus\/method-calls-in-thread/d" gio/tests/gdbus-threading.c || die |
185 |
# needed to prevent gdbus-threading from asserting |
186 |
ln -sfn $(type -P true) gio/tests/gdbus-testserver.py |
187 |
fi |
188 |
fi |
189 |
|
190 |
# gdbus-codegen is a separate package |
191 |
epatch "${FILESDIR}/${PN}-2.31.x-external-gdbus-codegen.patch" |
192 |
|
193 |
# https://bugzilla.gnome.org/show_bug.cgi?id=673132 |
194 |
epatch "${FILESDIR}/${PN}-2.32.1-fix-libelf-check.patch" |
195 |
|
196 |
# disable pyc compiling |
197 |
use test && python_clean_py-compile_files |
198 |
|
199 |
# Needed for the punt-python-check patch, disabling timeout test |
200 |
# Also needed to prevent croscompile failures, see bug #267603 |
201 |
# Also needed for the no-gdbus-codegen patch |
202 |
AT_M4DIR="${WORKDIR}" eautoreconf |
203 |
|
204 |
[[ ${CHOST} == *-freebsd* ]] && elibtoolize |
205 |
|
206 |
epunt_cxx |
207 |
} |
208 |
|
209 |
src_configure() { |
210 |
# Avoid circular depend with dev-util/pkgconfig |
211 |
if ! has_version dev-util/pkgconfig; then |
212 |
if has_version sys-apps/dbus; then |
213 |
export DBUS1_CFLAGS="-I/usr/include/dbus-1.0 -I/usr/$(get_libdir)/dbus-1.0/include" |
214 |
export DBUS1_LIBS="-ldbus-1" |
215 |
fi |
216 |
export LIBFFI_CFLAGS="-I$(echo /usr/$(get_libdir)/libffi-*/include)" |
217 |
export LIBFFI_LIBS="-lffi" |
218 |
fi |
219 |
|
220 |
local myconf |
221 |
|
222 |
# Building with --disable-debug highly unrecommended. It will build glib in |
223 |
# an unusable form as it disables some commonly used API. Please do not |
224 |
# convert this to the use_enable form, as it results in a broken build. |
225 |
# -- compnerd (3/27/06) |
226 |
use debug && myconf="--enable-debug" |
227 |
|
228 |
# Always use internal libpcre, bug #254659 |
229 |
econf ${myconf} \ |
230 |
$(use_enable xattr) \ |
231 |
$(use_enable doc man) \ |
232 |
$(use_enable doc gtk-doc) \ |
233 |
$(use_enable fam) \ |
234 |
$(use_enable selinux) \ |
235 |
$(use_enable static-libs static) \ |
236 |
$(use_enable systemtap dtrace) \ |
237 |
$(use_enable systemtap systemtap) \ |
238 |
--with-pcre=internal \ |
239 |
--with-threads=posix |
240 |
} |
241 |
|
242 |
src_install() { |
243 |
local f |
244 |
|
245 |
# install-exec-hook substitutes ${PYTHON} in glib/gtester-report |
246 |
emake DESTDIR="${D}" PYTHON="${EPREFIX}/usr/bin/python2" install |
247 |
|
248 |
if ! use utils; then |
249 |
rm "${ED}usr/bin/gtester-report" |
250 |
fi |
251 |
|
252 |
# Do not install charset.alias even if generated, leave it to libiconv |
253 |
rm -f "${ED}/usr/lib/charset.alias" |
254 |
|
255 |
# Don't install gdb python macros, bug 291328 |
256 |
rm -rf "${ED}/usr/share/gdb/" "${ED}/usr/share/glib-2.0/gdb/" |
257 |
|
258 |
dodoc AUTHORS ChangeLog* NEWS* README |
259 |
|
260 |
insinto /usr/share/bash-completion |
261 |
for f in gdbus gsettings; do |
262 |
newins "${ED}/etc/bash_completion.d/${f}-bash-completion.sh" ${f} |
263 |
done |
264 |
rm -rf "${ED}/etc" |
265 |
|
266 |
# Completely useless with or without USE static-libs, people need to use |
267 |
# pkg-config |
268 |
find "${D}" -name '*.la' -exec rm -f {} + |
269 |
} |
270 |
|
271 |
src_test() { |
272 |
gnome2_environment_reset |
273 |
|
274 |
unset DBUS_SESSION_BUS_ADDRESS |
275 |
export XDG_CONFIG_DIRS=/etc/xdg |
276 |
export XDG_DATA_DIRS=/usr/local/share:/usr/share |
277 |
export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp" |
278 |
unset GSETTINGS_BACKEND # bug 352451 |
279 |
export LC_TIME=C # bug #411967 |
280 |
|
281 |
# Related test is a bit nitpicking |
282 |
mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR" |
283 |
chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR" |
284 |
|
285 |
# Hardened: gdb needs this, bug #338891 |
286 |
if host-is-pax ; then |
287 |
pax-mark -mr "${S}"/tests/.libs/assert-msg-test \ |
288 |
|| die "Hardened adjustment failed" |
289 |
fi |
290 |
|
291 |
# Need X for dbus-launch session X11 initialization |
292 |
Xemake check |
293 |
} |
294 |
|
295 |
pkg_preinst() { |
296 |
# Only give the introspection message if: |
297 |
# * The user has gobject-introspection |
298 |
# * Has glib already installed |
299 |
# * Previous version was different from new version |
300 |
if has_version "dev-libs/gobject-introspection" && ! has_version "=${CATEGORY}/${PF}"; then |
301 |
ewarn "You must rebuild gobject-introspection so that the installed" |
302 |
ewarn "typelibs and girs are regenerated for the new APIs in glib" |
303 |
fi |
304 |
} |
305 |
|
306 |
pkg_postinst() { |
307 |
# Inform users about possible breakage when updating glib and not dbus-glib, bug #297483 |
308 |
if has_version dev-libs/dbus-glib; then |
309 |
ewarn "If you experience a breakage after updating dev-libs/glib try" |
310 |
ewarn "rebuilding dev-libs/dbus-glib" |
311 |
fi |
312 |
|
313 |
if has_version '<x11-libs/gtk+-3.0.12:3'; then |
314 |
# To have a clear upgrade path for gtk+-3.0.x users, have to resort to |
315 |
# a warning instead of a blocker |
316 |
ewarn |
317 |
ewarn "Using <gtk+-3.0.12:3 with ${P} results in frequent crashes." |
318 |
ewarn "You should upgrade to a newer version of gtk+:3 immediately." |
319 |
fi |
320 |
} |