1 |
commit: bb6944d17f7fff869982b57c67a89c45257cb2d0 |
2 |
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Aug 20 08:30:31 2018 +0000 |
4 |
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Aug 20 08:30:31 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=bb6944d1 |
7 |
|
8 |
dev-libs/glib: remove old; 2.56.2 available in main tree |
9 |
|
10 |
2.56.2 in main tree has split glib-utils - use that. |
11 |
9999 remains as an example for initial meson conversion, but it |
12 |
collides with glib-utils from main tree and needs ebuild sync |
13 |
and updates |
14 |
|
15 |
Package-Manager: Portage-2.3.47, Repoman-2.3.10 |
16 |
|
17 |
.../files/glib-2.40.0-external-gdbus-codegen.patch | 95 ------- |
18 |
...54.3-external-gdbus-codegen-for-autotools.patch | 116 -------- |
19 |
...56.1-external-gdbus-codegen-for-autotools.patch | 86 ------ |
20 |
dev-libs/glib/glib-2.54.3-r2.ebuild | 302 --------------------- |
21 |
dev-libs/glib/glib-2.54.3-r4.ebuild | 301 -------------------- |
22 |
dev-libs/glib/glib-2.56.1-r1.ebuild | 300 -------------------- |
23 |
6 files changed, 1200 deletions(-) |
24 |
|
25 |
diff --git a/dev-libs/glib/files/glib-2.40.0-external-gdbus-codegen.patch b/dev-libs/glib/files/glib-2.40.0-external-gdbus-codegen.patch |
26 |
deleted file mode 100644 |
27 |
index 50a9370e..00000000 |
28 |
--- a/dev-libs/glib/files/glib-2.40.0-external-gdbus-codegen.patch |
29 |
+++ /dev/null |
30 |
@@ -1,95 +0,0 @@ |
31 |
-diff --git a/configure.ac b/configure.ac |
32 |
-index a01e58d..59d4527 100644 |
33 |
---- a/configure.ac |
34 |
-+++ b/configure.ac |
35 |
-@@ -367,14 +367,14 @@ AC_SUBST(PERL_PATH) |
36 |
- # option to specify python interpreter to use; this just sets $PYTHON, so that |
37 |
- # we will fallback to reading $PYTHON if --with-python is not given, and |
38 |
- # python.m4 will get the expected input |
39 |
--AC_ARG_WITH(python, |
40 |
-- AS_HELP_STRING([--with-python=PATH], |
41 |
-- [Path to Python interpreter; searches $PATH if only a program name is given; if not given, searches for a few standard names such as "python3" or "python2"]), |
42 |
-- [PYTHON="$withval"], []) |
43 |
--if test x"$PYTHON" = xyes; then |
44 |
-- AC_MSG_ERROR([--with-python option requires a path or program argument]) |
45 |
--fi |
46 |
--AM_PATH_PYTHON(2.5,,PYTHON="/usr/bin/env python2.5") |
47 |
-+# AC_ARG_WITH(python, |
48 |
-+# AS_HELP_STRING([--with-python=PATH], |
49 |
-+# [Path to Python interpreter; searches $PATH if only a program name is given; if not given, searches for a few standard names such as "python3" or "python2"]), |
50 |
-+# [PYTHON="$withval"], []) |
51 |
-+# if test x"$PYTHON" = xyes; then |
52 |
-+# AC_MSG_ERROR([--with-python option requires a path or program argument]) |
53 |
-+# fi |
54 |
-+# AM_PATH_PYTHON(2.5,,PYTHON="/usr/bin/env python2.5") |
55 |
- |
56 |
- |
57 |
- dnl *********************** |
58 |
-@@ -3580,7 +3580,6 @@ gobject/glib-mkenums |
59 |
- gobject/tests/Makefile |
60 |
- gthread/Makefile |
61 |
- gio/Makefile |
62 |
--gio/gdbus-2.0/codegen/Makefile |
63 |
- gio/gdbus-2.0/codegen/config.py |
64 |
- gio/gnetworking.h |
65 |
- gio/xdgmime/Makefile |
66 |
-diff --git a/docs/reference/gio/Makefile.am b/docs/reference/gio/Makefile.am |
67 |
-index 47fdd38..c7eb136 100644 |
68 |
---- a/docs/reference/gio/Makefile.am |
69 |
-+++ b/docs/reference/gio/Makefile.am |
70 |
-@@ -157,8 +157,7 @@ man_MANS += \ |
71 |
- glib-compile-resources.1 \ |
72 |
- gsettings.1 \ |
73 |
- gresource.1 \ |
74 |
-- gdbus.1 \ |
75 |
-- gdbus-codegen.1 |
76 |
-+ gdbus.1 |
77 |
- |
78 |
- XSLTPROC_FLAGS = \ |
79 |
- --nonet \ |
80 |
-diff --git a/gio/Makefile.am b/gio/Makefile.am |
81 |
-index e993e2f..025ad94 100644 |
82 |
---- a/gio/Makefile.am |
83 |
-+++ b/gio/Makefile.am |
84 |
-@@ -1,6 +1,6 @@ |
85 |
- include $(top_srcdir)/glib.mk |
86 |
- |
87 |
--SUBDIRS = gdbus-2.0/codegen |
88 |
-+SUBDIRS = |
89 |
- |
90 |
- if OS_UNIX |
91 |
- SUBDIRS += xdgmime |
92 |
-diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am |
93 |
-index 2c54e59..3cd3c5a 100644 |
94 |
---- a/gio/tests/Makefile.am |
95 |
-+++ b/gio/tests/Makefile.am |
96 |
-@@ -437,10 +437,8 @@ gnotification_SOURCES = $(gdbus_sessionbus_sources) gnotifica |
97 |
- |
98 |
- BUILT_SOURCES += gdbus-test-codegen-generated.c gdbus-test-codegen-generated.h |
99 |
- gdbus-test-codegen.o: gdbus-test-codegen-generated.h |
100 |
--gdbus-test-codegen-generated.h: test-codegen.xml Makefile $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen |
101 |
-- $(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir) \ |
102 |
-- UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \ |
103 |
-- $(PYTHON) $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen \ |
104 |
-+gdbus-test-codegen-generated.h: test-codegen.xml Makefile |
105 |
-+ $(AM_V_GEN) gdbus-codegen \ |
106 |
- --interface-prefix org.project. \ |
107 |
- --generate-c-code gdbus-test-codegen-generated \ |
108 |
- --c-generate-object-manager \ |
109 |
-diff --git a/gio/tests/gdbus-object-manager-example/Makefile.am b/gio/tests/gdbus-object-manager-example/Makefile.am |
110 |
-index d6d1412..62ef706 100644 |
111 |
---- a/gio/tests/gdbus-object-manager-example/Makefile.am |
112 |
-+++ b/gio/tests/gdbus-object-manager-example/Makefile.am |
113 |
-@@ -11,10 +11,8 @@ GDBUS_GENERATED = \ |
114 |
- gdbus-example-objectmanager-generated-org.gtk.GDBus.Example.ObjectManager.Cat.xml \ |
115 |
- $(NULL) |
116 |
- |
117 |
--$(GDBUS_GENERATED) : gdbus-example-objectmanager.xml Makefile $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen |
118 |
-- $(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir) \ |
119 |
-- UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \ |
120 |
-- $(PYTHON) $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen \ |
121 |
-+$(GDBUS_GENERATED) : gdbus-example-objectmanager.xml Makefile |
122 |
-+ $(AM_V_GEN) gdbus-codegen \ |
123 |
- --interface-prefix org.gtk.GDBus.Example.ObjectManager. \ |
124 |
- --c-namespace Example \ |
125 |
- --c-generate-object-manager \ |
126 |
|
127 |
diff --git a/dev-libs/glib/files/glib-2.54.3-external-gdbus-codegen-for-autotools.patch b/dev-libs/glib/files/glib-2.54.3-external-gdbus-codegen-for-autotools.patch |
128 |
deleted file mode 100644 |
129 |
index 45025b65..00000000 |
130 |
--- a/dev-libs/glib/files/glib-2.54.3-external-gdbus-codegen-for-autotools.patch |
131 |
+++ /dev/null |
132 |
@@ -1,116 +0,0 @@ |
133 |
-From 2e47d49bc91d83cd0abea4c1944bfca4336040fa Mon Sep 17 00:00:00 2001 |
134 |
-From: Sobhan Mohammadpour <sobhan@g.o> |
135 |
-Date: Fri, 23 Feb 2018 15:27:33 +0330 |
136 |
-Subject: [PATCH] glib-2.54.3-external-gdbus-codegen-for-autotools |
137 |
- |
138 |
---- |
139 |
- configure.ac | 17 ++++++++--------- |
140 |
- docs/reference/gio/Makefile.am | 1 - |
141 |
- gio/Makefile.am | 2 +- |
142 |
- gio/tests/Makefile.am | 6 ++---- |
143 |
- gio/tests/gdbus-object-manager-example/Makefile.am | 8 +++----- |
144 |
- 5 files changed, 14 insertions(+), 20 deletions(-) |
145 |
- |
146 |
-diff --git a/configure.ac b/configure.ac |
147 |
-index 0457c90..07166c9 100644 |
148 |
---- a/configure.ac |
149 |
-+++ b/configure.ac |
150 |
-@@ -382,14 +382,14 @@ AC_SUBST(PERL_PATH) |
151 |
- # option to specify python interpreter to use; this just sets $PYTHON, so that |
152 |
- # we will fallback to reading $PYTHON if --with-python is not given, and |
153 |
- # python.m4 will get the expected input |
154 |
--AC_ARG_WITH(python, |
155 |
-- AS_HELP_STRING([--with-python=PATH], |
156 |
-- [Path to Python interpreter; searches $PATH if only a program name is given; if not given, searches for a few standard names such as "python3" or "python2"]), |
157 |
-- [PYTHON="$withval"], []) |
158 |
--if test x"$PYTHON" = xyes; then |
159 |
-- AC_MSG_ERROR([--with-python option requires a path or program argument]) |
160 |
--fi |
161 |
--AM_PATH_PYTHON(2.7,,PYTHON="python2.7") |
162 |
-+#AC_ARG_WITH(python, |
163 |
-+# AS_HELP_STRING([--with-python=PATH], |
164 |
-+# [Path to Python interpreter; searches $PATH if only a program name is given; if not given, searches for a few standard names such as "python3" or "python2"]), |
165 |
-+# [PYTHON="$withval"], []) |
166 |
-+#if test x"$PYTHON" = xyes; then |
167 |
-+# AC_MSG_ERROR([--with-python option requires a path or program argument]) |
168 |
-+#fi |
169 |
-+#AM_PATH_PYTHON(2.7,,PYTHON="python2.7") |
170 |
- |
171 |
- |
172 |
- dnl *********************** |
173 |
-@@ -3469,7 +3469,6 @@ gobject/glib-mkenums |
174 |
- gobject/tests/Makefile |
175 |
- gthread/Makefile |
176 |
- gio/Makefile |
177 |
--gio/gdbus-2.0/codegen/Makefile |
178 |
- gio/gdbus-2.0/codegen/config.py |
179 |
- gio/gnetworking.h |
180 |
- gio/xdgmime/Makefile |
181 |
-diff --git a/docs/reference/gio/Makefile.am b/docs/reference/gio/Makefile.am |
182 |
-index 5741a3e..d38e768 100644 |
183 |
---- a/docs/reference/gio/Makefile.am |
184 |
-+++ b/docs/reference/gio/Makefile.am |
185 |
-@@ -177,7 +177,6 @@ man_MANS += \ |
186 |
- gsettings.1 \ |
187 |
- gresource.1 \ |
188 |
- gdbus.1 \ |
189 |
-- gdbus-codegen.1 \ |
190 |
- gio.1 \ |
191 |
- $(NULL) |
192 |
- |
193 |
-diff --git a/gio/Makefile.am b/gio/Makefile.am |
194 |
-index b2db995..53d7162 100644 |
195 |
---- a/gio/Makefile.am |
196 |
-+++ b/gio/Makefile.am |
197 |
-@@ -1,6 +1,6 @@ |
198 |
- include $(top_srcdir)/glib.mk |
199 |
- |
200 |
--SUBDIRS = gdbus-2.0/codegen |
201 |
-+SUBDIRS = |
202 |
- |
203 |
- if OS_UNIX |
204 |
- if !OS_COCOA |
205 |
-diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am |
206 |
-index acc1da4..7c51eab 100644 |
207 |
---- a/gio/tests/Makefile.am |
208 |
-+++ b/gio/tests/Makefile.am |
209 |
-@@ -460,10 +460,8 @@ gnotification_SOURCES = $(gdbus_sessionbus_sources) gnotifica |
210 |
- |
211 |
- BUILT_SOURCES += gdbus-test-codegen-generated.c gdbus-test-codegen-generated.h |
212 |
- gdbus-test-codegen.o: gdbus-test-codegen-generated.h |
213 |
--gdbus-test-codegen-generated.h: test-codegen.xml Makefile $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen |
214 |
-- $(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir) \ |
215 |
-- UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \ |
216 |
-- $(PYTHON) $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen \ |
217 |
-+gdbus-test-codegen-generated.h: test-codegen.xml Makefile |
218 |
-+ $(AM_V_GEN) gdbus-codegen \ |
219 |
- --interface-prefix org.project. \ |
220 |
- --generate-c-code gdbus-test-codegen-generated \ |
221 |
- --c-generate-object-manager \ |
222 |
-diff --git a/gio/tests/gdbus-object-manager-example/Makefile.am b/gio/tests/gdbus-object-manager-example/Makefile.am |
223 |
-index 1d0464c..f390dca 100644 |
224 |
---- a/gio/tests/gdbus-object-manager-example/Makefile.am |
225 |
-+++ b/gio/tests/gdbus-object-manager-example/Makefile.am |
226 |
-@@ -11,10 +11,8 @@ GDBUS_GENERATED = \ |
227 |
- gdbus-example-objectmanager-generated-org.gtk.GDBus.Example.ObjectManager.Cat.xml \ |
228 |
- $(NULL) |
229 |
- |
230 |
--$(GDBUS_GENERATED) : gdbus-example-objectmanager.xml Makefile $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen |
231 |
-- $(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir) \ |
232 |
-- UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \ |
233 |
-- $(PYTHON) $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen \ |
234 |
-+$(GDBUS_GENERATED) : gdbus-example-objectmanager.xml Makefile |
235 |
-+ $(AM_V_GEN) gdbus-codegen \ |
236 |
- --interface-prefix org.gtk.GDBus.Example.ObjectManager. \ |
237 |
- --c-namespace Example \ |
238 |
- --c-generate-object-manager \ |
239 |
-@@ -46,4 +44,4 @@ EXTRA_DIST += gdbus-example-objectmanager.xml |
240 |
- |
241 |
- CLEANFILES += $(GDBUS_GENERATED) |
242 |
- |
243 |
--check-TESTS: |
244 |
-\ No newline at end of file |
245 |
-+check-TESTS: |
246 |
--- |
247 |
-2.16.1 |
248 |
- |
249 |
|
250 |
diff --git a/dev-libs/glib/files/glib-2.56.1-external-gdbus-codegen-for-autotools.patch b/dev-libs/glib/files/glib-2.56.1-external-gdbus-codegen-for-autotools.patch |
251 |
deleted file mode 100644 |
252 |
index a27966e0..00000000 |
253 |
--- a/dev-libs/glib/files/glib-2.56.1-external-gdbus-codegen-for-autotools.patch |
254 |
+++ /dev/null |
255 |
@@ -1,86 +0,0 @@ |
256 |
-From 2e47d49bc91d83cd0abea4c1944bfca4336040fa Mon Sep 17 00:00:00 2001 |
257 |
-From: Sobhan Mohammadpour <sobhan@g.o> |
258 |
-Date: Fri, 23 Feb 2018 15:27:33 +0330 |
259 |
-Subject: [PATCH] glib-2.54.3-external-gdbus-codegen-for-autotools |
260 |
- |
261 |
---- |
262 |
- configure.ac | 1 - |
263 |
- docs/reference/gio/Makefile.am | 1 - |
264 |
- gio/Makefile.am | 2 +- |
265 |
- gio/tests/Makefile.am | 6 ++---- |
266 |
- gio/tests/gdbus-object-manager-example/Makefile.am | 6 ++---- |
267 |
- 5 files changed, 5 insertions(+), 11 deletions(-) |
268 |
- |
269 |
-diff --git a/configure.ac b/configure.ac |
270 |
-index 0457c90..07166c9 100644 |
271 |
---- a/configure.ac |
272 |
-+++ b/configure.ac |
273 |
-@@ -3469,7 +3469,6 @@ gobject/glib-mkenums |
274 |
- gobject/tests/Makefile |
275 |
- gthread/Makefile |
276 |
- gio/Makefile |
277 |
--gio/gdbus-2.0/codegen/Makefile |
278 |
- gio/gdbus-2.0/codegen/config.py |
279 |
- gio/gnetworking.h |
280 |
- gio/xdgmime/Makefile |
281 |
-diff --git a/docs/reference/gio/Makefile.am b/docs/reference/gio/Makefile.am |
282 |
-index 5741a3e..d38e768 100644 |
283 |
---- a/docs/reference/gio/Makefile.am |
284 |
-+++ b/docs/reference/gio/Makefile.am |
285 |
-@@ -177,7 +177,6 @@ man_MANS += \ |
286 |
- gsettings.1 \ |
287 |
- gresource.1 \ |
288 |
- gdbus.1 \ |
289 |
-- gdbus-codegen.1 \ |
290 |
- gio.1 \ |
291 |
- $(NULL) |
292 |
- |
293 |
-diff --git a/gio/Makefile.am b/gio/Makefile.am |
294 |
-index b2db995..53d7162 100644 |
295 |
---- a/gio/Makefile.am |
296 |
-+++ b/gio/Makefile.am |
297 |
-@@ -1,6 +1,6 @@ |
298 |
- include $(top_srcdir)/glib.mk |
299 |
- |
300 |
--SUBDIRS = gdbus-2.0/codegen |
301 |
-+SUBDIRS = |
302 |
- |
303 |
- if OS_UNIX |
304 |
- if !OS_COCOA |
305 |
-diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am |
306 |
-index acc1da4..7c51eab 100644 |
307 |
---- a/gio/tests/Makefile.am |
308 |
-+++ b/gio/tests/Makefile.am |
309 |
-@@ -460,10 +460,8 @@ gnotification_SOURCES = $(gdbus_sessionbus_sources) gnotifica |
310 |
- |
311 |
- BUILT_SOURCES += gdbus-test-codegen-generated.c gdbus-test-codegen-generated.h |
312 |
- gdbus-test-codegen.o: gdbus-test-codegen-generated.h |
313 |
--gdbus-test-codegen-generated.h: test-codegen.xml Makefile $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen |
314 |
-- $(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir) \ |
315 |
-- UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \ |
316 |
-- $(PYTHON) $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen \ |
317 |
-+gdbus-test-codegen-generated.h: test-codegen.xml Makefile |
318 |
-+ $(AM_V_GEN) gdbus-codegen \ |
319 |
- --interface-prefix org.project. \ |
320 |
- --generate-c-code gdbus-test-codegen-generated \ |
321 |
- --c-generate-object-manager \ |
322 |
-diff --git a/gio/tests/gdbus-object-manager-example/Makefile.am b/gio/tests/gdbus-object-manager-example/Makefile.am |
323 |
-index 1d0464c..f390dca 100644 |
324 |
---- a/gio/tests/gdbus-object-manager-example/Makefile.am |
325 |
-+++ b/gio/tests/gdbus-object-manager-example/Makefile.am |
326 |
-@@ -11,10 +11,8 @@ GDBUS_GENERATED = \ |
327 |
- gdbus-example-objectmanager-generated-org.gtk.GDBus.Example.ObjectManager.Cat.xml \ |
328 |
- $(NULL) |
329 |
- |
330 |
--$(GDBUS_GENERATED) : gdbus-example-objectmanager.xml Makefile $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen |
331 |
-- $(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir) \ |
332 |
-- UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \ |
333 |
-- $(PYTHON) $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen \ |
334 |
-+$(GDBUS_GENERATED) : gdbus-example-objectmanager.xml Makefile |
335 |
-+ $(AM_V_GEN) gdbus-codegen \ |
336 |
- --interface-prefix org.gtk.GDBus.Example.ObjectManager. \ |
337 |
- --c-namespace Example \ |
338 |
- --c-generate-object-manager \ |
339 |
--- |
340 |
-2.16.1 |
341 |
- |
342 |
|
343 |
diff --git a/dev-libs/glib/glib-2.54.3-r2.ebuild b/dev-libs/glib/glib-2.54.3-r2.ebuild |
344 |
deleted file mode 100644 |
345 |
index 8f25e3c9..00000000 |
346 |
--- a/dev-libs/glib/glib-2.54.3-r2.ebuild |
347 |
+++ /dev/null |
348 |
@@ -1,302 +0,0 @@ |
349 |
-# Copyright 1999-2018 Gentoo Foundation |
350 |
-# Distributed under the terms of the GNU General Public License v2 |
351 |
- |
352 |
-# Until bug #537330 glib is a reverse dependency of pkgconfig and, then |
353 |
-# adding new dependencies end up making stage3 to grow. Every addition needs |
354 |
-# then to be think very closely. |
355 |
- |
356 |
-EAPI=6 |
357 |
-PYTHON_COMPAT=( python2_7 ) |
358 |
-# Completely useless with or without USE static-libs, people need to use pkg-config |
359 |
-GNOME2_LA_PUNT="yes" |
360 |
- |
361 |
-inherit bash-completion-r1 epunt-cxx flag-o-matic gnome-meson libtool linux-info \ |
362 |
- multilib multilib-minimal pax-utils python-r1 toolchain-funcs versionator virtualx |
363 |
- |
364 |
-DESCRIPTION="The GLib library of C routines" |
365 |
-HOMEPAGE="https://www.gtk.org/" |
366 |
-SRC_URI="${SRC_URI} |
367 |
- https://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz" # pkg.m4 for eautoreconf |
368 |
- |
369 |
- |
370 |
-LICENSE="LGPL-2.1+" |
371 |
-SLOT="2" |
372 |
-IUSE="dbus debug fam kernel_linux +mime selinux static-libs systemtap test utils xattr" |
373 |
-REQUIRED_USE=" |
374 |
- utils? ( ${PYTHON_REQUIRED_USE} ) |
375 |
- test? ( ${PYTHON_REQUIRED_USE} ) |
376 |
-" |
377 |
- |
378 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" |
379 |
- |
380 |
-# Added util-linux multilib dependency to have libmount support (which |
381 |
-# is always turned on on linux systems, unless explicitly disabled, but |
382 |
-# this ebuild does not do that anyway) (bug #599586) |
383 |
- |
384 |
-RDEPEND=" |
385 |
- !<dev-util/gdbus-codegen-${PV} |
386 |
- >=dev-libs/libpcre-8.13:3[${MULTILIB_USEDEP},static-libs?] |
387 |
- >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] |
388 |
- >=virtual/libffi-3.0.13-r1[${MULTILIB_USEDEP}] |
389 |
- >=virtual/libintl-0-r2[${MULTILIB_USEDEP}] |
390 |
- >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] |
391 |
- kernel_linux? ( sys-apps/util-linux[${MULTILIB_USEDEP}] ) |
392 |
- selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] ) |
393 |
- xattr? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] ) |
394 |
- fam? ( >=virtual/fam-0-r1[${MULTILIB_USEDEP}] ) |
395 |
- utils? ( |
396 |
- ${PYTHON_DEPS} |
397 |
- >=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}] |
398 |
- virtual/libelf:0= |
399 |
- ) |
400 |
-" |
401 |
-DEPEND="${RDEPEND} |
402 |
- app-text/docbook-xml-dtd:4.1.2 |
403 |
- >=dev-libs/libxslt-1.0 |
404 |
- >=sys-devel/gettext-0.11 |
405 |
- >=dev-util/gtk-doc-am-1.20 |
406 |
- systemtap? ( >=dev-util/systemtap-1.3 ) |
407 |
- test? ( |
408 |
- sys-devel/gdb |
409 |
- ${PYTHON_DEPS} |
410 |
- >=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}] |
411 |
- >=sys-apps/dbus-1.2.14 ) |
412 |
- !<dev-util/gtk-doc-1.15-r2 |
413 |
-" |
414 |
-PDEPEND="!<gnome-base/gvfs-1.6.4-r990 |
415 |
- dbus? ( gnome-base/dconf ) |
416 |
- mime? ( x11-misc/shared-mime-info ) |
417 |
-" |
418 |
-# shared-mime-info needed for gio/xdgmime, bug #409481 |
419 |
-# dconf is needed to be able to save settings, bug #498436 |
420 |
-# Earlier versions of gvfs do not work with glib |
421 |
- |
422 |
-MULTILIB_CHOST_TOOLS=( |
423 |
- /usr/bin/gio-querymodules$(get_exeext) |
424 |
-) |
425 |
- |
426 |
-pkg_setup() { |
427 |
- if use kernel_linux ; then |
428 |
- CONFIG_CHECK="~INOTIFY_USER" |
429 |
- if use test ; then |
430 |
- CONFIG_CHECK="~IPV6" |
431 |
- WARNING_IPV6="Your kernel needs IPV6 support for running some tests, skipping them." |
432 |
- fi |
433 |
- linux-info_pkg_setup |
434 |
- fi |
435 |
-} |
436 |
- |
437 |
-src_prepare() { |
438 |
- # Prevent build failure in stage3 where pkgconfig is not available, bug #481056 |
439 |
- mv -f "${WORKDIR}"/pkg-config-*/pkg.m4 "${S}"/m4macros/ || die |
440 |
- # Copy missing gengiotypefuncs.py |
441 |
- cp "${FILESDIR}"/gengiotypefuncs.py "${S}"/gio/tests/ || die |
442 |
- |
443 |
- # We need gengiotypefuncs |
444 |
- if use test; then |
445 |
- # Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629, upstream bug #629163 |
446 |
- if ! has_version dev-util/desktop-file-utils ; then |
447 |
- ewarn "Some tests will be skipped due dev-util/desktop-file-utils not being present on your system," |
448 |
- ewarn "think on installing it to get these tests run." |
449 |
- sed -i -e "/appinfo\/associations/d" gio/tests/appinfo.c || die |
450 |
- sed -i -e "/g_test_add_func/d" gio/tests/desktop-app-info.c || die |
451 |
- fi |
452 |
- |
453 |
- # gdesktopappinfo requires existing terminal (gnome-terminal or any |
454 |
- # other), falling back to xterm if one doesn't exist |
455 |
- if ! has_version x11-terms/xterm && ! has_version x11-terms/gnome-terminal ; then |
456 |
- ewarn "Some tests will be skipped due to missing terminal program" |
457 |
- sed -i -e "/appinfo\/launch/d" gio/tests/appinfo.c || die |
458 |
- fi |
459 |
- |
460 |
- # https://bugzilla.gnome.org/show_bug.cgi?id=722604 |
461 |
- sed -i -e "/timer\/stop/d" glib/tests/timer.c || die |
462 |
- sed -i -e "/timer\/basic/d" glib/tests/timer.c || die |
463 |
- |
464 |
- ewarn "Tests for search-utils have been skipped" |
465 |
- sed -i -e "/search-utils/d" glib/tests/Makefile.am || die |
466 |
- else |
467 |
- # Don't build tests, also prevents extra deps, bug #512022 |
468 |
- sed -i -e 's/ tests//' {.,gio,glib}/Makefile.am || die |
469 |
- fi |
470 |
- |
471 |
- # gdbus-codegen is a separate package |
472 |
- eapply "${FILESDIR}"/${PN}-2.54.2-external-codegen.patch |
473 |
- |
474 |
- # Leave python shebang alone - handled by python_replicate_script |
475 |
- # We could call python_setup and give configure a valid --with-python |
476 |
- # arg, but that would mean a build dep on python when USE=utils. |
477 |
- sed -e '/${PYTHON}/d' \ |
478 |
- -i glib/Makefile.{am,in} || die |
479 |
- |
480 |
- gnome-meson_src_prepare |
481 |
- |
482 |
- epunt_cxx |
483 |
-} |
484 |
- |
485 |
-multilib_src_configure() { |
486 |
- # TODO is this still relevent? |
487 |
- # Avoid circular depend with dev-util/pkgconfig and |
488 |
- # native builds (cross-compiles won't need pkg-config |
489 |
- # in the target ROOT to work here) |
490 |
- if ! tc-is-cross-compiler && ! $(tc-getPKG_CONFIG) --version >& /dev/null; then |
491 |
- if has_version sys-apps/dbus; then |
492 |
- export DBUS1_CFLAGS="-I/usr/include/dbus-1.0 -I/usr/$(get_libdir)/dbus-1.0/include" |
493 |
- export DBUS1_LIBS="-ldbus-1" |
494 |
- fi |
495 |
- export LIBFFI_CFLAGS="-I$(echo /usr/$(get_libdir)/libffi-*/include)" |
496 |
- export LIBFFI_LIBS="-lffi" |
497 |
- export PCRE_CFLAGS=" " # test -n "$PCRE_CFLAGS" needs to pass |
498 |
- export PCRE_LIBS="-lpcre" |
499 |
- fi |
500 |
- |
501 |
- # These configure tests don't work when cross-compiling. |
502 |
- if tc-is-cross-compiler ; then |
503 |
- # https://bugzilla.gnome.org/show_bug.cgi?id=756473 |
504 |
- case ${CHOST} in |
505 |
- hppa*|metag*) export glib_cv_stack_grows=yes ;; |
506 |
- *) export glib_cv_stack_grows=no ;; |
507 |
- esac |
508 |
- # https://bugzilla.gnome.org/show_bug.cgi?id=756474 |
509 |
- export glib_cv_uscore=no |
510 |
- # https://bugzilla.gnome.org/show_bug.cgi?id=756475 |
511 |
- export ac_cv_func_posix_get{pwuid,grgid}_r=yes |
512 |
- fi |
513 |
- |
514 |
- local myconf |
515 |
- |
516 |
- # FIXME multilib automagic for libelf |
517 |
- # FIXME set systemtap/tapse/static-lib install dir and test it. |
518 |
- # FIXME no selinux, fam, xattr for now. |
519 |
- # FIXME enable docs if possible. |
520 |
- |
521 |
- use static-libs && myconf="-Ddefault_library='static'" |
522 |
- use debug && myconf="$myconf -Dbuildtype='debug'" |
523 |
- |
524 |
- gnome-meson_src_configure \ |
525 |
- ${myconf} \ |
526 |
- -Denable-libmount=$(usex kernel_linux yes no) \ |
527 |
- $(meson_use systemtap enable-dtrace) \ |
528 |
- $(meson_use systemtap enable-systemtap) \ |
529 |
- -Dwith-pcre=system \ |
530 |
- -Dwith-docs=no \ |
531 |
- -Dwith-man=yes |
532 |
- |
533 |
- if multilib_is_native_abi; then |
534 |
- local d |
535 |
- for d in glib gio gobject; do |
536 |
- ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die |
537 |
- done |
538 |
- fi |
539 |
-} |
540 |
- |
541 |
-multilib_src_compile() { |
542 |
- gnome-meson_src_compile |
543 |
-} |
544 |
-# FIXME |
545 |
-multilib_src_test() { |
546 |
- export XDG_CONFIG_DIRS=/etc/xdg |
547 |
- export XDG_DATA_DIRS=/usr/local/share:/usr/share |
548 |
- export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp" |
549 |
- export LC_TIME=C # bug #411967 |
550 |
- unset GSETTINGS_BACKEND # bug #596380 |
551 |
- python_setup |
552 |
- |
553 |
- # Related test is a bit nitpicking |
554 |
- mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR" |
555 |
- chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR" |
556 |
- |
557 |
- # Hardened: gdb needs this, bug #338891 |
558 |
- if host-is-pax ; then |
559 |
- pax-mark -mr "${BUILD_DIR}"/tests/.libs/assert-msg-test \ |
560 |
- || die "Hardened adjustment failed" |
561 |
- fi |
562 |
- |
563 |
- # Need X for dbus-launch session X11 initialization |
564 |
- virtx meson_src_test |
565 |
-} |
566 |
- |
567 |
-multilib_src_install() { |
568 |
- chmod +x glib-gettextize || die |
569 |
- gnome-meson_src_install completiondir="$(get_bashcompdir)" |
570 |
- keepdir /usr/$(get_libdir)/gio/modules |
571 |
-} |
572 |
- |
573 |
-multilib_src_install_all() { |
574 |
- einstalldocs |
575 |
- |
576 |
- if use utils ; then |
577 |
- python_replicate_script "${ED}"/usr/bin/gtester-report |
578 |
- else |
579 |
- rm "${ED}usr/bin/gtester-report" |
580 |
- rm "${ED}usr/share/man/man1/gtester-report.1" |
581 |
- fi |
582 |
- |
583 |
- # Do not install charset.alias even if generated, leave it to libiconv |
584 |
- rm -f "${ED}/usr/lib/charset.alias" |
585 |
- |
586 |
- # Don't install gdb python macros, bug 291328 |
587 |
- rm -rf "${ED}/usr/share/gdb/" "${ED}/usr/share/glib-2.0/gdb/" |
588 |
-} |
589 |
- |
590 |
-pkg_preinst() { |
591 |
- gnome-meson_pkg_preinst |
592 |
- |
593 |
- # Make gschemas.compiled belong to glib alone |
594 |
- local cache="usr/share/glib-2.0/schemas/gschemas.compiled" |
595 |
- |
596 |
- if [[ -e ${EROOT}${cache} ]]; then |
597 |
- cp "${EROOT}"${cache} "${ED}"/${cache} || die |
598 |
- else |
599 |
- touch "${ED}"/${cache} || die |
600 |
- fi |
601 |
- |
602 |
- multilib_pkg_preinst() { |
603 |
- # Make giomodule.cache belong to glib alone |
604 |
- local cache="usr/$(get_libdir)/gio/modules/giomodule.cache" |
605 |
- |
606 |
- if [[ -e ${EROOT}${cache} ]]; then |
607 |
- cp "${EROOT}"${cache} "${ED}"/${cache} || die |
608 |
- else |
609 |
- touch "${ED}"/${cache} || die |
610 |
- fi |
611 |
- } |
612 |
- |
613 |
- # Don't run the cache ownership when cross-compiling, as it would end up with an empty cache |
614 |
- # file due to inability to create it and GIO might not look at any of the modules there |
615 |
- if ! tc-is-cross-compiler ; then |
616 |
- multilib_foreach_abi multilib_pkg_preinst |
617 |
- fi |
618 |
-} |
619 |
- |
620 |
-pkg_postinst() { |
621 |
- # force (re)generation of gschemas.compiled |
622 |
- GNOME2_ECLASS_GLIB_SCHEMAS="force" |
623 |
- |
624 |
- gnome-meson_pkg_postinst |
625 |
- |
626 |
- multilib_pkg_postinst() { |
627 |
- gnome2_giomodule_cache_update \ |
628 |
- || die "Update GIO modules cache failed (for ${ABI})" |
629 |
- } |
630 |
- if ! tc-is-cross-compiler ; then |
631 |
- multilib_foreach_abi multilib_pkg_postinst |
632 |
- else |
633 |
- ewarn "Updating of GIO modules cache skipped due to cross-compilation." |
634 |
- ewarn "You might want to run gio-querymodules manually on the target for" |
635 |
- ewarn "your final image for performance reasons and re-run it when packages" |
636 |
- ewarn "installing GIO modules get upgraded or added to the image." |
637 |
- fi |
638 |
-} |
639 |
- |
640 |
-pkg_postrm() { |
641 |
- gnome-meson_pkg_postrm |
642 |
- |
643 |
- if [[ -z ${REPLACED_BY_VERSION} ]]; then |
644 |
- multilib_pkg_postrm() { |
645 |
- rm -f "${EROOT}"usr/$(get_libdir)/gio/modules/giomodule.cache |
646 |
- } |
647 |
- multilib_foreach_abi multilib_pkg_postrm |
648 |
- rm -f "${EROOT}"usr/share/glib-2.0/schemas/gschemas.compiled |
649 |
- fi |
650 |
-} |
651 |
|
652 |
diff --git a/dev-libs/glib/glib-2.54.3-r4.ebuild b/dev-libs/glib/glib-2.54.3-r4.ebuild |
653 |
deleted file mode 100644 |
654 |
index db057e34..00000000 |
655 |
--- a/dev-libs/glib/glib-2.54.3-r4.ebuild |
656 |
+++ /dev/null |
657 |
@@ -1,301 +0,0 @@ |
658 |
-# Copyright 1999-2018 Gentoo Foundation |
659 |
-# Distributed under the terms of the GNU General Public License v2 |
660 |
- |
661 |
-# Until bug #537330 glib is a reverse dependency of pkgconfig and, then |
662 |
-# adding new dependencies end up making stage3 to grow. Every addition needs |
663 |
-# then to be think very closely. |
664 |
- |
665 |
-EAPI=6 |
666 |
-PYTHON_COMPAT=( python2_7 ) |
667 |
-# Completely useless with or without USE static-libs, people need to use |
668 |
-# pkg-config |
669 |
-GNOME2_LA_PUNT="yes" |
670 |
- |
671 |
-inherit autotools bash-completion-r1 epunt-cxx flag-o-matic gnome2 libtool linux-info \ |
672 |
- multilib multilib-minimal pax-utils python-r1 toolchain-funcs versionator virtualx |
673 |
- |
674 |
-DESCRIPTION="The GLib library of C routines" |
675 |
-HOMEPAGE="https://www.gtk.org/" |
676 |
-SRC_URI="${SRC_URI} |
677 |
- https://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz" # pkg.m4 for eautoreconf |
678 |
- |
679 |
-LICENSE="LGPL-2.1+" |
680 |
-SLOT="2" |
681 |
-IUSE="dbus debug fam kernel_linux +mime selinux static-libs systemtap test utils xattr" |
682 |
-REQUIRED_USE=" |
683 |
- utils? ( ${PYTHON_REQUIRED_USE} ) |
684 |
- test? ( ${PYTHON_REQUIRED_USE} ) |
685 |
-" |
686 |
- |
687 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" |
688 |
- |
689 |
-# Added util-linux multilib dependency to have libmount support (which |
690 |
-# is always turned on on linux systems, unless explicitly disabled, but |
691 |
-# this ebuild does not do that anyway) (bug #599586) |
692 |
- |
693 |
-RDEPEND=" |
694 |
- !<dev-util/gdbus-codegen-${PV} |
695 |
- >=dev-libs/libpcre-8.13:3[${MULTILIB_USEDEP},static-libs?] |
696 |
- >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] |
697 |
- >=virtual/libffi-3.0.13-r1[${MULTILIB_USEDEP}] |
698 |
- >=virtual/libintl-0-r2[${MULTILIB_USEDEP}] |
699 |
- >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] |
700 |
- kernel_linux? ( sys-apps/util-linux[${MULTILIB_USEDEP}] ) |
701 |
- selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] ) |
702 |
- xattr? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] ) |
703 |
- fam? ( >=virtual/fam-0-r1[${MULTILIB_USEDEP}] ) |
704 |
- utils? ( |
705 |
- ${PYTHON_DEPS} |
706 |
- >=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}] |
707 |
- virtual/libelf:0= |
708 |
- ) |
709 |
-" |
710 |
-DEPEND="${RDEPEND} |
711 |
- app-text/docbook-xml-dtd:4.1.2 |
712 |
- >=dev-libs/libxslt-1.0 |
713 |
- >=sys-devel/gettext-0.11 |
714 |
- >=dev-util/gtk-doc-am-1.20 |
715 |
- systemtap? ( >=dev-util/systemtap-1.3 ) |
716 |
- test? ( |
717 |
- sys-devel/gdb |
718 |
- ${PYTHON_DEPS} |
719 |
- >=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}] |
720 |
- >=sys-apps/dbus-1.2.14 ) |
721 |
- !<dev-util/gtk-doc-1.15-r2 |
722 |
-" |
723 |
-PDEPEND="!<gnome-base/gvfs-1.6.4-r990 |
724 |
- dbus? ( gnome-base/dconf ) |
725 |
- mime? ( x11-misc/shared-mime-info ) |
726 |
-" |
727 |
-# shared-mime-info needed for gio/xdgmime, bug #409481 |
728 |
-# dconf is needed to be able to save settings, bug #498436 |
729 |
-# Earlier versions of gvfs do not work with glib |
730 |
- |
731 |
-MULTILIB_CHOST_TOOLS=( |
732 |
- /usr/bin/gio-querymodules$(get_exeext) |
733 |
-) |
734 |
- |
735 |
-pkg_setup() { |
736 |
- if use kernel_linux ; then |
737 |
- CONFIG_CHECK="~INOTIFY_USER" |
738 |
- if use test ; then |
739 |
- CONFIG_CHECK="~IPV6" |
740 |
- WARNING_IPV6="Your kernel needs IPV6 support for running some tests, skipping them." |
741 |
- fi |
742 |
- linux-info_pkg_setup |
743 |
- fi |
744 |
-} |
745 |
- |
746 |
-src_prepare() { |
747 |
- # Prevent build failure in stage3 where pkgconfig is not available, bug #481056 |
748 |
- mv -f "${WORKDIR}"/pkg-config-*/pkg.m4 "${S}"/m4macros/ || die |
749 |
- |
750 |
- if use test; then |
751 |
- # Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629, upstream bug #629163 |
752 |
- if ! has_version dev-util/desktop-file-utils ; then |
753 |
- ewarn "Some tests will be skipped due dev-util/desktop-file-utils not being present on your system," |
754 |
- ewarn "think on installing it to get these tests run." |
755 |
- sed -i -e "/appinfo\/associations/d" gio/tests/appinfo.c || die |
756 |
- sed -i -e "/g_test_add_func/d" gio/tests/desktop-app-info.c || die |
757 |
- fi |
758 |
- |
759 |
- # gdesktopappinfo requires existing terminal (gnome-terminal or any |
760 |
- # other), falling back to xterm if one doesn't exist |
761 |
- if ! has_version x11-terms/xterm && ! has_version x11-terms/gnome-terminal ; then |
762 |
- ewarn "Some tests will be skipped due to missing terminal program" |
763 |
- sed -i -e "/appinfo\/launch/d" gio/tests/appinfo.c || die |
764 |
- fi |
765 |
- |
766 |
- # https://bugzilla.gnome.org/show_bug.cgi?id=722604 |
767 |
- sed -i -e "/timer\/stop/d" glib/tests/timer.c || die |
768 |
- sed -i -e "/timer\/basic/d" glib/tests/timer.c || die |
769 |
- |
770 |
- ewarn "Tests for search-utils have been skipped" |
771 |
- sed -i -e "/search-utils/d" glib/tests/Makefile.am || die |
772 |
- else |
773 |
- # Don't build tests, also prevents extra deps, bug #512022 |
774 |
- sed -i -e 's/ tests//' {.,gio,glib}/Makefile.am || die |
775 |
- fi |
776 |
- |
777 |
- # gdbus-codegen is a separate package |
778 |
- eapply "${FILESDIR}"/${PN}-2.54.3-external-gdbus-codegen-for-autotools.patch |
779 |
- |
780 |
- # Leave python shebang alone - handled by python_replicate_script |
781 |
- # We could call python_setup and give configure a valid --with-python |
782 |
- # arg, but that would mean a build dep on python when USE=utils. |
783 |
- sed -e '/${PYTHON}/d' \ |
784 |
- -i glib/Makefile.{am,in} || die |
785 |
- sed -e 's:@PYTHON@:python:' \ |
786 |
- -i gobject/glib-{genmarshal.in,mkenums.in} || die |
787 |
- # Also needed to prevent cross-compile failures, see bug #267603 |
788 |
- eautoreconf |
789 |
- |
790 |
- gnome2_src_prepare |
791 |
- |
792 |
- epunt_cxx |
793 |
-} |
794 |
- |
795 |
-multilib_src_configure() { |
796 |
- # Avoid circular depend with dev-util/pkgconfig and |
797 |
- # native builds (cross-compiles won't need pkg-config |
798 |
- # in the target ROOT to work here) |
799 |
- if ! tc-is-cross-compiler && ! $(tc-getPKG_CONFIG) --version >& /dev/null; then |
800 |
- if has_version sys-apps/dbus; then |
801 |
- export DBUS1_CFLAGS="-I/usr/include/dbus-1.0 -I/usr/$(get_libdir)/dbus-1.0/include" |
802 |
- export DBUS1_LIBS="-ldbus-1" |
803 |
- fi |
804 |
- export LIBFFI_CFLAGS="-I$(echo /usr/$(get_libdir)/libffi-*/include)" |
805 |
- export LIBFFI_LIBS="-lffi" |
806 |
- export PCRE_CFLAGS=" " # test -n "$PCRE_CFLAGS" needs to pass |
807 |
- export PCRE_LIBS="-lpcre" |
808 |
- fi |
809 |
- |
810 |
- # These configure tests don't work when cross-compiling. |
811 |
- if tc-is-cross-compiler ; then |
812 |
- # https://bugzilla.gnome.org/show_bug.cgi?id=756473 |
813 |
- case ${CHOST} in |
814 |
- hppa*|metag*) export glib_cv_stack_grows=yes ;; |
815 |
- *) export glib_cv_stack_grows=no ;; |
816 |
- esac |
817 |
- # https://bugzilla.gnome.org/show_bug.cgi?id=756474 |
818 |
- export glib_cv_uscore=no |
819 |
- # https://bugzilla.gnome.org/show_bug.cgi?id=756475 |
820 |
- export ac_cv_func_posix_get{pwuid,grgid}_r=yes |
821 |
- fi |
822 |
- |
823 |
- local myconf |
824 |
- |
825 |
- case "${CHOST}" in |
826 |
- *-mingw*) myconf="${myconf} --with-threads=win32" ;; |
827 |
- *) myconf="${myconf} --with-threads=posix" ;; |
828 |
- esac |
829 |
- |
830 |
- # libelf used only by the gresource bin |
831 |
- ECONF_SOURCE="${S}" gnome2_src_configure ${myconf} \ |
832 |
- $(usex debug --enable-debug=yes ' ') \ |
833 |
- $(use_enable xattr) \ |
834 |
- $(use_enable fam) \ |
835 |
- $(use_enable kernel_linux libmount) \ |
836 |
- $(use_enable selinux) \ |
837 |
- $(use_enable static-libs static) \ |
838 |
- $(use_enable systemtap dtrace) \ |
839 |
- $(use_enable systemtap systemtap) \ |
840 |
- $(multilib_native_use_enable utils libelf) \ |
841 |
- --disable-compile-warnings \ |
842 |
- --enable-man \ |
843 |
- --with-pcre=system \ |
844 |
- --with-xml-catalog="${EPREFIX}/etc/xml/catalog" |
845 |
- |
846 |
- if multilib_is_native_abi; then |
847 |
- local d |
848 |
- for d in glib gio gobject; do |
849 |
- ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die |
850 |
- done |
851 |
- fi |
852 |
-} |
853 |
- |
854 |
-multilib_src_test() { |
855 |
- export XDG_CONFIG_DIRS=/etc/xdg |
856 |
- export XDG_DATA_DIRS=/usr/local/share:/usr/share |
857 |
- export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp" |
858 |
- export LC_TIME=C # bug #411967 |
859 |
- unset GSETTINGS_BACKEND # bug #596380 |
860 |
- python_setup |
861 |
- |
862 |
- # Related test is a bit nitpicking |
863 |
- mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR" |
864 |
- chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR" |
865 |
- |
866 |
- # Hardened: gdb needs this, bug #338891 |
867 |
- if host-is-pax ; then |
868 |
- pax-mark -mr "${BUILD_DIR}"/tests/.libs/assert-msg-test \ |
869 |
- || die "Hardened adjustment failed" |
870 |
- fi |
871 |
- |
872 |
- # Need X for dbus-launch session X11 initialization |
873 |
- virtx emake check |
874 |
-} |
875 |
- |
876 |
-multilib_src_install() { |
877 |
- gnome2_src_install completiondir="$(get_bashcompdir)" |
878 |
- keepdir /usr/$(get_libdir)/gio/modules |
879 |
-} |
880 |
- |
881 |
-multilib_src_install_all() { |
882 |
- einstalldocs |
883 |
- |
884 |
- if use utils ; then |
885 |
- python_replicate_script "${ED}"/usr/bin/gtester-report |
886 |
- else |
887 |
- rm "${ED}usr/bin/gtester-report" |
888 |
- rm "${ED}usr/share/man/man1/gtester-report.1" |
889 |
- fi |
890 |
- |
891 |
- # Do not install charset.alias even if generated, leave it to libiconv |
892 |
- rm -f "${ED}/usr/lib/charset.alias" |
893 |
- |
894 |
- # Don't install gdb python macros, bug 291328 |
895 |
- rm -rf "${ED}/usr/share/gdb/" "${ED}/usr/share/glib-2.0/gdb/" |
896 |
-} |
897 |
- |
898 |
-pkg_preinst() { |
899 |
- gnome2_pkg_preinst |
900 |
- |
901 |
- # Make gschemas.compiled belong to glib alone |
902 |
- local cache="usr/share/glib-2.0/schemas/gschemas.compiled" |
903 |
- |
904 |
- if [[ -e ${EROOT}${cache} ]]; then |
905 |
- cp "${EROOT}"${cache} "${ED}"/${cache} || die |
906 |
- else |
907 |
- touch "${ED}"/${cache} || die |
908 |
- fi |
909 |
- |
910 |
- multilib_pkg_preinst() { |
911 |
- # Make giomodule.cache belong to glib alone |
912 |
- local cache="usr/$(get_libdir)/gio/modules/giomodule.cache" |
913 |
- |
914 |
- if [[ -e ${EROOT}${cache} ]]; then |
915 |
- cp "${EROOT}"${cache} "${ED}"/${cache} || die |
916 |
- else |
917 |
- touch "${ED}"/${cache} || die |
918 |
- fi |
919 |
- } |
920 |
- |
921 |
- # Don't run the cache ownership when cross-compiling, as it would end up with an empty cache |
922 |
- # file due to inability to create it and GIO might not look at any of the modules there |
923 |
- if ! tc-is-cross-compiler ; then |
924 |
- multilib_foreach_abi multilib_pkg_preinst |
925 |
- fi |
926 |
-} |
927 |
- |
928 |
-pkg_postinst() { |
929 |
- # force (re)generation of gschemas.compiled |
930 |
- GNOME2_ECLASS_GLIB_SCHEMAS="force" |
931 |
- |
932 |
- gnome2_pkg_postinst |
933 |
- |
934 |
- multilib_pkg_postinst() { |
935 |
- gnome2_giomodule_cache_update \ |
936 |
- || die "Update GIO modules cache failed (for ${ABI})" |
937 |
- } |
938 |
- if ! tc-is-cross-compiler ; then |
939 |
- multilib_foreach_abi multilib_pkg_postinst |
940 |
- else |
941 |
- ewarn "Updating of GIO modules cache skipped due to cross-compilation." |
942 |
- ewarn "You might want to run gio-querymodules manually on the target for" |
943 |
- ewarn "your final image for performance reasons and re-run it when packages" |
944 |
- ewarn "installing GIO modules get upgraded or added to the image." |
945 |
- fi |
946 |
-} |
947 |
- |
948 |
-pkg_postrm() { |
949 |
- gnome2_pkg_postrm |
950 |
- |
951 |
- if [[ -z ${REPLACED_BY_VERSION} ]]; then |
952 |
- multilib_pkg_postrm() { |
953 |
- rm -f "${EROOT}"usr/$(get_libdir)/gio/modules/giomodule.cache |
954 |
- } |
955 |
- multilib_foreach_abi multilib_pkg_postrm |
956 |
- rm -f "${EROOT}"usr/share/glib-2.0/schemas/gschemas.compiled |
957 |
- fi |
958 |
-} |
959 |
|
960 |
diff --git a/dev-libs/glib/glib-2.56.1-r1.ebuild b/dev-libs/glib/glib-2.56.1-r1.ebuild |
961 |
deleted file mode 100644 |
962 |
index 8ff7a9f9..00000000 |
963 |
--- a/dev-libs/glib/glib-2.56.1-r1.ebuild |
964 |
+++ /dev/null |
965 |
@@ -1,300 +0,0 @@ |
966 |
-# Copyright 1999-2018 Gentoo Foundation |
967 |
-# Distributed under the terms of the GNU General Public License v2 |
968 |
- |
969 |
-# Until bug #537330 glib is a reverse dependency of pkgconfig and, then |
970 |
-# adding new dependencies end up making stage3 to grow. Every addition needs |
971 |
-# then to be think very closely. |
972 |
- |
973 |
-EAPI=6 |
974 |
-PYTHON_COMPAT=( python{2_7,3_5,3_6} ) |
975 |
-# Completely useless with or without USE static-libs, people need to use |
976 |
-# pkg-config |
977 |
-GNOME2_LA_PUNT="yes" |
978 |
- |
979 |
-inherit autotools bash-completion-r1 epunt-cxx flag-o-matic gnome2 libtool linux-info \ |
980 |
- multilib multilib-minimal pax-utils python-single-r1 toolchain-funcs versionator virtualx |
981 |
- |
982 |
-DESCRIPTION="The GLib library of C routines" |
983 |
-HOMEPAGE="https://www.gtk.org/" |
984 |
-SRC_URI="${SRC_URI} |
985 |
- https://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz" # pkg.m4 for eautoreconf |
986 |
- |
987 |
-LICENSE="LGPL-2.1+" |
988 |
-SLOT="2" |
989 |
-IUSE="dbus debug fam kernel_linux +mime selinux static-libs systemtap test utils xattr" |
990 |
-REQUIRED_USE=" |
991 |
- ${PYTHON_REQUIRED_USE} |
992 |
- test? ( ${PYTHON_REQUIRED_USE} ) |
993 |
-" # test dep left here and elsewhere to not forget, as global python requirement is supposed to be temporary until a split package is made with meson |
994 |
- |
995 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux" |
996 |
- |
997 |
-# Added util-linux multilib dependency to have libmount support (which |
998 |
-# is always turned on on linux systems, unless explicitly disabled, but |
999 |
-# this ebuild does not do that anyway) (bug #599586) |
1000 |
- |
1001 |
-RDEPEND=" |
1002 |
- !<dev-util/gdbus-codegen-${PV} |
1003 |
- >=dev-libs/libpcre-8.13:3[${MULTILIB_USEDEP},static-libs?] |
1004 |
- >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] |
1005 |
- >=virtual/libffi-3.0.13-r1[${MULTILIB_USEDEP}] |
1006 |
- >=virtual/libintl-0-r2[${MULTILIB_USEDEP}] |
1007 |
- >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] |
1008 |
- kernel_linux? ( sys-apps/util-linux[${MULTILIB_USEDEP}] ) |
1009 |
- selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] ) |
1010 |
- xattr? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] ) |
1011 |
- fam? ( >=virtual/fam-0-r1[${MULTILIB_USEDEP}] ) |
1012 |
- ${PYTHON_DEPS} |
1013 |
- utils? ( |
1014 |
- >=dev-util/gdbus-codegen-${PV} |
1015 |
- virtual/libelf:0= |
1016 |
- ) |
1017 |
-" |
1018 |
-DEPEND="${RDEPEND} |
1019 |
- app-text/docbook-xml-dtd:4.1.2 |
1020 |
- >=dev-libs/libxslt-1.0 |
1021 |
- >=sys-devel/gettext-0.11 |
1022 |
- >=dev-util/gtk-doc-am-1.20 |
1023 |
- systemtap? ( >=dev-util/systemtap-1.3 ) |
1024 |
- test? ( |
1025 |
- sys-devel/gdb |
1026 |
- ${PYTHON_DEPS} |
1027 |
- >=dev-util/gdbus-codegen-${PV} |
1028 |
- >=sys-apps/dbus-1.2.14 ) |
1029 |
- !<dev-util/gtk-doc-1.15-r2 |
1030 |
-" |
1031 |
-PDEPEND="!<gnome-base/gvfs-1.6.4-r990 |
1032 |
- dbus? ( gnome-base/dconf ) |
1033 |
- mime? ( x11-misc/shared-mime-info ) |
1034 |
-" |
1035 |
-# shared-mime-info needed for gio/xdgmime, bug #409481 |
1036 |
-# dconf is needed to be able to save settings, bug #498436 |
1037 |
-# Earlier versions of gvfs do not work with glib |
1038 |
- |
1039 |
-MULTILIB_CHOST_TOOLS=( |
1040 |
- /usr/bin/gio-querymodules$(get_exeext) |
1041 |
-) |
1042 |
- |
1043 |
-pkg_setup() { |
1044 |
- if use kernel_linux ; then |
1045 |
- CONFIG_CHECK="~INOTIFY_USER" |
1046 |
- if use test ; then |
1047 |
- CONFIG_CHECK="~IPV6" |
1048 |
- WARNING_IPV6="Your kernel needs IPV6 support for running some tests, skipping them." |
1049 |
- fi |
1050 |
- linux-info_pkg_setup |
1051 |
- fi |
1052 |
- # FIXME: Move python deps that are only required at build time of other packages to a split package |
1053 |
- python-single-r1_pkg_setup |
1054 |
-} |
1055 |
- |
1056 |
-src_prepare() { |
1057 |
- # Prevent build failure in stage3 where pkgconfig is not available, bug #481056 |
1058 |
- mv -f "${WORKDIR}"/pkg-config-*/pkg.m4 "${S}"/m4macros/ || die |
1059 |
- |
1060 |
- if use test; then |
1061 |
- # Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629, upstream bug #629163 |
1062 |
- if ! has_version dev-util/desktop-file-utils ; then |
1063 |
- ewarn "Some tests will be skipped due dev-util/desktop-file-utils not being present on your system," |
1064 |
- ewarn "think on installing it to get these tests run." |
1065 |
- sed -i -e "/appinfo\/associations/d" gio/tests/appinfo.c || die |
1066 |
- sed -i -e "/g_test_add_func/d" gio/tests/desktop-app-info.c || die |
1067 |
- fi |
1068 |
- |
1069 |
- # gdesktopappinfo requires existing terminal (gnome-terminal or any |
1070 |
- # other), falling back to xterm if one doesn't exist |
1071 |
- if ! has_version x11-terms/xterm && ! has_version x11-terms/gnome-terminal ; then |
1072 |
- ewarn "Some tests will be skipped due to missing terminal program" |
1073 |
- sed -i -e "/appinfo\/launch/d" gio/tests/appinfo.c || die |
1074 |
- fi |
1075 |
- |
1076 |
- # https://bugzilla.gnome.org/show_bug.cgi?id=722604 |
1077 |
- sed -i -e "/timer\/stop/d" glib/tests/timer.c || die |
1078 |
- sed -i -e "/timer\/basic/d" glib/tests/timer.c || die |
1079 |
- |
1080 |
- ewarn "Tests for search-utils have been skipped" |
1081 |
- sed -i -e "/search-utils/d" glib/tests/Makefile.am || die |
1082 |
- else |
1083 |
- # Don't build tests, also prevents extra deps, bug #512022 |
1084 |
- sed -i -e 's/ tests//' {.,gio,glib}/Makefile.am || die |
1085 |
- fi |
1086 |
- |
1087 |
- # gdbus-codegen is a separate package |
1088 |
- eapply "${FILESDIR}"/${PN}-2.56.1-external-gdbus-codegen-for-autotools.patch |
1089 |
- # Leave gtester-report python shebang alone - handled by python_fix_shebang |
1090 |
- sed -e '/${PYTHON}/d' -i glib/Makefile.{am,in} || die |
1091 |
- |
1092 |
- # Also needed to prevent cross-compile failures, see bug #267603 |
1093 |
- eautoreconf |
1094 |
- |
1095 |
- gnome2_src_prepare |
1096 |
- |
1097 |
- epunt_cxx |
1098 |
-} |
1099 |
- |
1100 |
-multilib_src_configure() { |
1101 |
- # Avoid circular depend with dev-util/pkgconfig and |
1102 |
- # native builds (cross-compiles won't need pkg-config |
1103 |
- # in the target ROOT to work here) |
1104 |
- if ! tc-is-cross-compiler && ! $(tc-getPKG_CONFIG) --version >& /dev/null; then |
1105 |
- if has_version sys-apps/dbus; then |
1106 |
- export DBUS1_CFLAGS="-I/usr/include/dbus-1.0 -I/usr/$(get_libdir)/dbus-1.0/include" |
1107 |
- export DBUS1_LIBS="-ldbus-1" |
1108 |
- fi |
1109 |
- export LIBFFI_CFLAGS="-I$(echo /usr/$(get_libdir)/libffi-*/include)" |
1110 |
- export LIBFFI_LIBS="-lffi" |
1111 |
- export PCRE_CFLAGS=" " # test -n "$PCRE_CFLAGS" needs to pass |
1112 |
- export PCRE_LIBS="-lpcre" |
1113 |
- fi |
1114 |
- |
1115 |
- # These configure tests don't work when cross-compiling. |
1116 |
- if tc-is-cross-compiler ; then |
1117 |
- # https://bugzilla.gnome.org/show_bug.cgi?id=756473 |
1118 |
- case ${CHOST} in |
1119 |
- hppa*|metag*) export glib_cv_stack_grows=yes ;; |
1120 |
- *) export glib_cv_stack_grows=no ;; |
1121 |
- esac |
1122 |
- # https://bugzilla.gnome.org/show_bug.cgi?id=756474 |
1123 |
- export glib_cv_uscore=no |
1124 |
- # https://bugzilla.gnome.org/show_bug.cgi?id=756475 |
1125 |
- export ac_cv_func_posix_get{pwuid,grgid}_r=yes |
1126 |
- fi |
1127 |
- |
1128 |
- local myconf |
1129 |
- |
1130 |
- case "${CHOST}" in |
1131 |
- *-mingw*) myconf="${myconf} --with-threads=win32" ;; |
1132 |
- *) myconf="${myconf} --with-threads=posix" ;; |
1133 |
- esac |
1134 |
- |
1135 |
- # libelf used only by the gresource bin |
1136 |
- ECONF_SOURCE="${S}" gnome2_src_configure ${myconf} \ |
1137 |
- $(usex debug --enable-debug=yes ' ') \ |
1138 |
- $(use_enable xattr) \ |
1139 |
- $(use_enable fam) \ |
1140 |
- $(use_enable kernel_linux libmount) \ |
1141 |
- $(use_enable selinux) \ |
1142 |
- $(use_enable static-libs static) \ |
1143 |
- $(use_enable systemtap dtrace) \ |
1144 |
- $(use_enable systemtap systemtap) \ |
1145 |
- $(multilib_native_use_enable utils libelf) \ |
1146 |
- --with-python=${EPYTHON} \ |
1147 |
- --disable-compile-warnings \ |
1148 |
- --enable-man \ |
1149 |
- --with-pcre=system \ |
1150 |
- --with-xml-catalog="${EPREFIX}/etc/xml/catalog" |
1151 |
- |
1152 |
- if multilib_is_native_abi; then |
1153 |
- local d |
1154 |
- for d in glib gio gobject; do |
1155 |
- ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die |
1156 |
- done |
1157 |
- fi |
1158 |
-} |
1159 |
- |
1160 |
-multilib_src_test() { |
1161 |
- export XDG_CONFIG_DIRS=/etc/xdg |
1162 |
- export XDG_DATA_DIRS=/usr/local/share:/usr/share |
1163 |
- export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp" |
1164 |
- export LC_TIME=C # bug #411967 |
1165 |
- unset GSETTINGS_BACKEND # bug #596380 |
1166 |
- python_setup |
1167 |
- |
1168 |
- # Related test is a bit nitpicking |
1169 |
- mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR" |
1170 |
- chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR" |
1171 |
- |
1172 |
- # Hardened: gdb needs this, bug #338891 |
1173 |
- if host-is-pax ; then |
1174 |
- pax-mark -mr "${BUILD_DIR}"/tests/.libs/assert-msg-test \ |
1175 |
- || die "Hardened adjustment failed" |
1176 |
- fi |
1177 |
- |
1178 |
- # Need X for dbus-launch session X11 initialization |
1179 |
- virtx emake check |
1180 |
-} |
1181 |
- |
1182 |
-multilib_src_install() { |
1183 |
- gnome2_src_install completiondir="$(get_bashcompdir)" |
1184 |
- keepdir /usr/$(get_libdir)/gio/modules |
1185 |
-} |
1186 |
- |
1187 |
-multilib_src_install_all() { |
1188 |
- einstalldocs |
1189 |
- |
1190 |
- if use utils ; then |
1191 |
- python_fix_shebang "${ED}"/usr/bin/gtester-report |
1192 |
- else |
1193 |
- # gtester-report is heavily deprecated, so do not install by default - https://bugzilla.gnome.org/show_bug.cgi?id=668035#c4 |
1194 |
- rm "${ED}usr/bin/gtester-report" |
1195 |
- rm "${ED}usr/share/man/man1/gtester-report.1" |
1196 |
- fi |
1197 |
- |
1198 |
- # Do not install charset.alias even if generated, leave it to libiconv |
1199 |
- rm -f "${ED}/usr/lib/charset.alias" |
1200 |
- |
1201 |
- # Don't install gdb python macros, bug 291328 |
1202 |
- rm -rf "${ED}/usr/share/gdb/" "${ED}/usr/share/glib-2.0/gdb/" |
1203 |
-} |
1204 |
- |
1205 |
-pkg_preinst() { |
1206 |
- gnome2_pkg_preinst |
1207 |
- |
1208 |
- # Make gschemas.compiled belong to glib alone |
1209 |
- local cache="usr/share/glib-2.0/schemas/gschemas.compiled" |
1210 |
- |
1211 |
- if [[ -e ${EROOT}${cache} ]]; then |
1212 |
- cp "${EROOT}"${cache} "${ED}"/${cache} || die |
1213 |
- else |
1214 |
- touch "${ED}"/${cache} || die |
1215 |
- fi |
1216 |
- |
1217 |
- multilib_pkg_preinst() { |
1218 |
- # Make giomodule.cache belong to glib alone |
1219 |
- local cache="usr/$(get_libdir)/gio/modules/giomodule.cache" |
1220 |
- |
1221 |
- if [[ -e ${EROOT}${cache} ]]; then |
1222 |
- cp "${EROOT}"${cache} "${ED}"/${cache} || die |
1223 |
- else |
1224 |
- touch "${ED}"/${cache} || die |
1225 |
- fi |
1226 |
- } |
1227 |
- |
1228 |
- # Don't run the cache ownership when cross-compiling, as it would end up with an empty cache |
1229 |
- # file due to inability to create it and GIO might not look at any of the modules there |
1230 |
- if ! tc-is-cross-compiler ; then |
1231 |
- multilib_foreach_abi multilib_pkg_preinst |
1232 |
- fi |
1233 |
-} |
1234 |
- |
1235 |
-pkg_postinst() { |
1236 |
- # force (re)generation of gschemas.compiled |
1237 |
- GNOME2_ECLASS_GLIB_SCHEMAS="force" |
1238 |
- |
1239 |
- gnome2_pkg_postinst |
1240 |
- |
1241 |
- multilib_pkg_postinst() { |
1242 |
- gnome2_giomodule_cache_update \ |
1243 |
- || die "Update GIO modules cache failed (for ${ABI})" |
1244 |
- } |
1245 |
- if ! tc-is-cross-compiler ; then |
1246 |
- multilib_foreach_abi multilib_pkg_postinst |
1247 |
- else |
1248 |
- ewarn "Updating of GIO modules cache skipped due to cross-compilation." |
1249 |
- ewarn "You might want to run gio-querymodules manually on the target for" |
1250 |
- ewarn "your final image for performance reasons and re-run it when packages" |
1251 |
- ewarn "installing GIO modules get upgraded or added to the image." |
1252 |
- fi |
1253 |
-} |
1254 |
- |
1255 |
-pkg_postrm() { |
1256 |
- gnome2_pkg_postrm |
1257 |
- |
1258 |
- if [[ -z ${REPLACED_BY_VERSION} ]]; then |
1259 |
- multilib_pkg_postrm() { |
1260 |
- rm -f "${EROOT}"usr/$(get_libdir)/gio/modules/giomodule.cache |
1261 |
- } |
1262 |
- multilib_foreach_abi multilib_pkg_postrm |
1263 |
- rm -f "${EROOT}"usr/share/glib-2.0/schemas/gschemas.compiled |
1264 |
- fi |
1265 |
-} |