1 |
commit: 409700a1e4a57b5bd9b87bf52bbf4b432e8180ec |
2 |
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Jun 28 18:24:33 2018 +0000 |
4 |
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Jun 28 18:32:24 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=409700a1 |
7 |
|
8 |
dev-libs/glib: remove old |
9 |
|
10 |
Package-Manager: Portage-2.3.40, Repoman-2.3.9 |
11 |
|
12 |
dev-libs/glib/Manifest | 1 - |
13 |
.../files/glib-2.50.3-fix-gdatetime-tests.patch | 52 ---- |
14 |
dev-libs/glib/glib-2.50.3-r1.ebuild | 303 --------------------- |
15 |
3 files changed, 356 deletions(-) |
16 |
|
17 |
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest |
18 |
index b840e13b7cd..d4cc80bc6fe 100644 |
19 |
--- a/dev-libs/glib/Manifest |
20 |
+++ b/dev-libs/glib/Manifest |
21 |
@@ -1,4 +1,3 @@ |
22 |
-DIST glib-2.50.3.tar.xz 7589284 BLAKE2B 8648e5d9e8f4c943ca3ec5a5ec01f380f55f76555bf4ec731e211b33d0e23c29ea2a9323e2e839f35f89f292863df76d4e8c622fc44c0e5905eb904576618dbd SHA512 ef35806c15170b6608445f255136c0bebd2d433adf903c2af2865f6a57b4f2fcfc1e4a7cea1a0dac48ff5fe26248fbf7886dba4a8d209506f0a94160df8fb7af |
23 |
DIST glib-2.52.3.tar.xz 7679972 BLAKE2B 8d9f6b714571bd04ab9717fbf9ded8556664e43dcdb7dd59436b8b7f1a8a5cdf98e9ce60ca1ead941af1d57688044fefb6c749fa735084622a3482b058864ff6 SHA512 a068f2519cfb82de8d4b7f004e7c1f15e841cad4046430a83b02b359d011e0c4077cdff447a1687ed7c68f1a11b4cf66b9ed9fc23ab5f0c7c6be84eb0ddc3017 |
24 |
DIST glib-2.54.3-patchset.tar.xz 39488 BLAKE2B 0bebd1f8eadd1796c355dbad20739ec2428a5b67e363e6ea61e2bab1e672506c438c80c602e87ec7d221ad92ad5c52adf7b57fb13441835e41f1e1208c26c6db SHA512 3d880c2681893da9267c8b2ba9a695eddbb1cef63f4ea26e052ce2f69e1e9d78eccdb27b235cbf0693ecd262bd70d020b24f82fc72ab11a4dbc2c929cfb72942 |
25 |
DIST glib-2.54.3.tar.xz 7836536 BLAKE2B 140e7cf09a41b72a5b22e5b87e9674cbfdfe1b82f3cf5f0fd3ecb2ed6b1f62a90f8b4c0bc2f655e297f91394f771f6ecad210357e31f104ee49ca178be6b9d76 SHA512 23eb4458684624f80c17aa784eab42a38eec87bb5979fcfe56f0bc63b5c7bcf8251a0d4ea916fe2c8109ff5b14a4b60c6260755d079ff984c0d8e6a2871d307d |
26 |
|
27 |
diff --git a/dev-libs/glib/files/glib-2.50.3-fix-gdatetime-tests.patch b/dev-libs/glib/files/glib-2.50.3-fix-gdatetime-tests.patch |
28 |
deleted file mode 100644 |
29 |
index 6c41c5cf7e5..00000000000 |
30 |
--- a/dev-libs/glib/files/glib-2.50.3-fix-gdatetime-tests.patch |
31 |
+++ /dev/null |
32 |
@@ -1,52 +0,0 @@ |
33 |
-From ec02a1875f29ecb8e46c0d8c1403cd00a0b3a9e4 Mon Sep 17 00:00:00 2001 |
34 |
-From: Iain Lane <iain@××××××××××××××××.uk> |
35 |
-Date: Mon, 13 Mar 2017 16:52:11 +0000 |
36 |
-Subject: [PATCH] tests/gdatetime: Use a real rather than invented timezone |
37 |
- |
38 |
-The tzdata maintainers had previously invented abbreviations for |
39 |
-timezones. As of their 2017a release, the one we were testing ("BRT") |
40 |
-has been dropped. |
41 |
- |
42 |
-Switch to testing PST, which is a real timezone abbreviation. |
43 |
- |
44 |
-https://bugzilla.gnome.org/show_bug.cgi?id=779799 |
45 |
---- |
46 |
- glib/tests/gdatetime.c | 12 ++++++------ |
47 |
- 1 file changed, 6 insertions(+), 6 deletions(-) |
48 |
- |
49 |
-diff --git a/glib/tests/gdatetime.c b/glib/tests/gdatetime.c |
50 |
-index dcb8a8f..c54031d 100644 |
51 |
---- a/glib/tests/gdatetime.c |
52 |
-+++ b/glib/tests/gdatetime.c |
53 |
-@@ -635,22 +635,22 @@ test_GDateTime_new_full (void) |
54 |
- g_date_time_unref (dt); |
55 |
- |
56 |
- #ifdef G_OS_UNIX |
57 |
-- tz = g_time_zone_new ("America/Recife"); |
58 |
-+ tz = g_time_zone_new ("America/Tijuana"); |
59 |
- #elif defined G_OS_WIN32 |
60 |
-- tz = g_time_zone_new ("E. South America Standard Time"); |
61 |
-+ tz = g_time_zone_new ("Pacific Standard Time"); |
62 |
- #endif |
63 |
-- dt = g_date_time_new (tz, 2010, 5, 24, 8, 4, 0); |
64 |
-+ dt = g_date_time_new (tz, 2010, 11, 24, 8, 4, 0); |
65 |
- g_time_zone_unref (tz); |
66 |
- g_assert_cmpint (2010, ==, g_date_time_get_year (dt)); |
67 |
-- g_assert_cmpint (5, ==, g_date_time_get_month (dt)); |
68 |
-+ g_assert_cmpint (11, ==, g_date_time_get_month (dt)); |
69 |
- g_assert_cmpint (24, ==, g_date_time_get_day_of_month (dt)); |
70 |
- g_assert_cmpint (8, ==, g_date_time_get_hour (dt)); |
71 |
- g_assert_cmpint (4, ==, g_date_time_get_minute (dt)); |
72 |
- g_assert_cmpint (0, ==, g_date_time_get_second (dt)); |
73 |
- #ifdef G_OS_UNIX |
74 |
-- g_assert_cmpstr ("BRT", ==, g_date_time_get_timezone_abbreviation (dt)); |
75 |
-+ g_assert_cmpstr ("PST", ==, g_date_time_get_timezone_abbreviation (dt)); |
76 |
- #elif defined G_OS_WIN32 |
77 |
-- g_assert_cmpstr ("E. South America Standard Time", ==, |
78 |
-+ g_assert_cmpstr ("Pacific Standard Time", ==, |
79 |
- g_date_time_get_timezone_abbreviation (dt)); |
80 |
- #endif |
81 |
- g_assert (!g_date_time_is_daylight_savings (dt)); |
82 |
--- |
83 |
-2.10.1 |
84 |
- |
85 |
|
86 |
diff --git a/dev-libs/glib/glib-2.50.3-r1.ebuild b/dev-libs/glib/glib-2.50.3-r1.ebuild |
87 |
deleted file mode 100644 |
88 |
index b7ab8d4b96b..00000000000 |
89 |
--- a/dev-libs/glib/glib-2.50.3-r1.ebuild |
90 |
+++ /dev/null |
91 |
@@ -1,303 +0,0 @@ |
92 |
-# Copyright 1999-2018 Gentoo Foundation |
93 |
-# Distributed under the terms of the GNU General Public License v2 |
94 |
- |
95 |
-# Until bug #537330 glib is a reverse dependency of pkgconfig and, then |
96 |
-# adding new dependencies end up making stage3 to grow. Every addition needs |
97 |
-# then to be think very closely. |
98 |
- |
99 |
-EAPI=6 |
100 |
-PYTHON_COMPAT=( python2_7 ) |
101 |
-# Completely useless with or without USE static-libs, people need to use |
102 |
-# pkg-config |
103 |
-GNOME2_LA_PUNT="yes" |
104 |
- |
105 |
-inherit autotools bash-completion-r1 epunt-cxx flag-o-matic gnome2 libtool linux-info \ |
106 |
- multilib multilib-minimal pax-utils python-r1 toolchain-funcs versionator virtualx |
107 |
- |
108 |
-DESCRIPTION="The GLib library of C routines" |
109 |
-HOMEPAGE="https://www.gtk.org/" |
110 |
-SRC_URI="${SRC_URI} |
111 |
- https://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz" # pkg.m4 for eautoreconf |
112 |
- |
113 |
-LICENSE="LGPL-2+" |
114 |
-SLOT="2" |
115 |
-IUSE="dbus debug fam kernel_linux +mime selinux static-libs systemtap test utils xattr" |
116 |
-REQUIRED_USE=" |
117 |
- utils? ( ${PYTHON_REQUIRED_USE} ) |
118 |
- test? ( ${PYTHON_REQUIRED_USE} ) |
119 |
-" |
120 |
- |
121 |
-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" |
122 |
- |
123 |
-# Added util-linux multilib dependency to have libmount support (which |
124 |
-# is always turned on on linux systems, unless explicitly disabled, but |
125 |
-# this ebuild does not do that anyway) (bug #599586) |
126 |
- |
127 |
-RDEPEND=" |
128 |
- !<dev-util/gdbus-codegen-${PV} |
129 |
- >=dev-libs/libpcre-8.13:3[${MULTILIB_USEDEP},static-libs?] |
130 |
- >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] |
131 |
- >=virtual/libffi-3.0.13-r1[${MULTILIB_USEDEP}] |
132 |
- >=virtual/libintl-0-r2[${MULTILIB_USEDEP}] |
133 |
- >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] |
134 |
- kernel_linux? ( sys-apps/util-linux[${MULTILIB_USEDEP}] ) |
135 |
- selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] ) |
136 |
- xattr? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] ) |
137 |
- fam? ( >=virtual/fam-0-r1[${MULTILIB_USEDEP}] ) |
138 |
- utils? ( |
139 |
- ${PYTHON_DEPS} |
140 |
- >=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}] |
141 |
- virtual/libelf:0= |
142 |
- ) |
143 |
-" |
144 |
-DEPEND="${RDEPEND} |
145 |
- app-text/docbook-xml-dtd:4.1.2 |
146 |
- >=dev-libs/libxslt-1.0 |
147 |
- >=sys-devel/gettext-0.11 |
148 |
- >=dev-util/gtk-doc-am-1.20 |
149 |
- systemtap? ( >=dev-util/systemtap-1.3 ) |
150 |
- test? ( |
151 |
- sys-devel/gdb |
152 |
- ${PYTHON_DEPS} |
153 |
- >=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}] |
154 |
- >=sys-apps/dbus-1.2.14 ) |
155 |
- !<dev-util/gtk-doc-1.15-r2 |
156 |
-" |
157 |
-PDEPEND="!<gnome-base/gvfs-1.6.4-r990 |
158 |
- dbus? ( gnome-base/dconf ) |
159 |
- mime? ( x11-misc/shared-mime-info ) |
160 |
-" |
161 |
-# shared-mime-info needed for gio/xdgmime, bug #409481 |
162 |
-# dconf is needed to be able to save settings, bug #498436 |
163 |
-# Earlier versions of gvfs do not work with glib |
164 |
- |
165 |
-MULTILIB_CHOST_TOOLS=( |
166 |
- /usr/bin/gio-querymodules$(get_exeext) |
167 |
-) |
168 |
- |
169 |
-pkg_setup() { |
170 |
- if use kernel_linux ; then |
171 |
- CONFIG_CHECK="~INOTIFY_USER" |
172 |
- if use test ; then |
173 |
- CONFIG_CHECK="~IPV6" |
174 |
- WARNING_IPV6="Your kernel needs IPV6 support for running some tests, skipping them." |
175 |
- fi |
176 |
- linux-info_pkg_setup |
177 |
- fi |
178 |
-} |
179 |
- |
180 |
-src_prepare() { |
181 |
- # Prevent build failure in stage3 where pkgconfig is not available, bug #481056 |
182 |
- mv -f "${WORKDIR}"/pkg-config-*/pkg.m4 "${S}"/m4macros/ || die |
183 |
- |
184 |
- if use test; then |
185 |
- # Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629, upstream bug #629163 |
186 |
- if ! has_version dev-util/desktop-file-utils ; then |
187 |
- ewarn "Some tests will be skipped due dev-util/desktop-file-utils not being present on your system," |
188 |
- ewarn "think on installing it to get these tests run." |
189 |
- sed -i -e "/appinfo\/associations/d" gio/tests/appinfo.c || die |
190 |
- sed -i -e "/g_test_add_func/d" gio/tests/desktop-app-info.c || die |
191 |
- fi |
192 |
- |
193 |
- # gdesktopappinfo requires existing terminal (gnome-terminal or any |
194 |
- # other), falling back to xterm if one doesn't exist |
195 |
- if ! has_version x11-terms/xterm && ! has_version x11-terms/gnome-terminal ; then |
196 |
- ewarn "Some tests will be skipped due to missing terminal program" |
197 |
- sed -i -e "/appinfo\/launch/d" gio/tests/appinfo.c || die |
198 |
- fi |
199 |
- |
200 |
- # https://bugzilla.gnome.org/show_bug.cgi?id=722604 |
201 |
- sed -i -e "/timer\/stop/d" glib/tests/timer.c || die |
202 |
- sed -i -e "/timer\/basic/d" glib/tests/timer.c || die |
203 |
- |
204 |
- ewarn "Tests for search-utils have been skipped" |
205 |
- sed -i -e "/search-utils/d" glib/tests/Makefile.am || die |
206 |
- else |
207 |
- # Don't build tests, also prevents extra deps, bug #512022 |
208 |
- sed -i -e 's/ tests//' {.,gio,glib}/Makefile.am || die |
209 |
- fi |
210 |
- |
211 |
- # Fix tests with timezone-data-2017a and newer |
212 |
- eapply "${FILESDIR}"/${P}-fix-gdatetime-tests.patch |
213 |
- |
214 |
- # gdbus-codegen is a separate package |
215 |
- eapply "${FILESDIR}"/${PN}-2.50.0-external-gdbus-codegen.patch |
216 |
- |
217 |
- # Leave python shebang alone - handled by python_replicate_script |
218 |
- # We could call python_setup and give configure a valid --with-python |
219 |
- # arg, but that would mean a build dep on python when USE=utils. |
220 |
- sed -e '/${PYTHON}/d' \ |
221 |
- -i glib/Makefile.{am,in} || die |
222 |
- |
223 |
- # Also needed to prevent cross-compile failures, see bug #267603 |
224 |
- eautoreconf |
225 |
- |
226 |
- gnome2_src_prepare |
227 |
- |
228 |
- epunt_cxx |
229 |
-} |
230 |
- |
231 |
-multilib_src_configure() { |
232 |
- # Avoid circular depend with dev-util/pkgconfig and |
233 |
- # native builds (cross-compiles won't need pkg-config |
234 |
- # in the target ROOT to work here) |
235 |
- if ! tc-is-cross-compiler && ! $(tc-getPKG_CONFIG) --version >& /dev/null; then |
236 |
- if has_version sys-apps/dbus; then |
237 |
- export DBUS1_CFLAGS="-I/usr/include/dbus-1.0 -I/usr/$(get_libdir)/dbus-1.0/include" |
238 |
- export DBUS1_LIBS="-ldbus-1" |
239 |
- fi |
240 |
- export LIBFFI_CFLAGS="-I$(echo /usr/$(get_libdir)/libffi-*/include)" |
241 |
- export LIBFFI_LIBS="-lffi" |
242 |
- export PCRE_CFLAGS=" " # test -n "$PCRE_CFLAGS" needs to pass |
243 |
- export PCRE_LIBS="-lpcre" |
244 |
- fi |
245 |
- |
246 |
- # These configure tests don't work when cross-compiling. |
247 |
- if tc-is-cross-compiler ; then |
248 |
- # https://bugzilla.gnome.org/show_bug.cgi?id=756473 |
249 |
- case ${CHOST} in |
250 |
- hppa*|metag*) export glib_cv_stack_grows=yes ;; |
251 |
- *) export glib_cv_stack_grows=no ;; |
252 |
- esac |
253 |
- # https://bugzilla.gnome.org/show_bug.cgi?id=756474 |
254 |
- export glib_cv_uscore=no |
255 |
- # https://bugzilla.gnome.org/show_bug.cgi?id=756475 |
256 |
- export ac_cv_func_posix_get{pwuid,grgid}_r=yes |
257 |
- fi |
258 |
- |
259 |
- local myconf |
260 |
- |
261 |
- case "${CHOST}" in |
262 |
- *-mingw*) myconf="${myconf} --with-threads=win32" ;; |
263 |
- *) myconf="${myconf} --with-threads=posix" ;; |
264 |
- esac |
265 |
- |
266 |
- # libelf used only by the gresource bin |
267 |
- ECONF_SOURCE="${S}" gnome2_src_configure ${myconf} \ |
268 |
- $(usex debug --enable-debug=yes ' ') \ |
269 |
- $(use_enable xattr) \ |
270 |
- $(use_enable fam) \ |
271 |
- $(use_enable kernel_linux libmount) \ |
272 |
- $(use_enable selinux) \ |
273 |
- $(use_enable static-libs static) \ |
274 |
- $(use_enable systemtap dtrace) \ |
275 |
- $(use_enable systemtap systemtap) \ |
276 |
- $(multilib_native_use_enable utils libelf) \ |
277 |
- --disable-compile-warnings \ |
278 |
- --enable-man \ |
279 |
- --with-pcre=system \ |
280 |
- --with-xml-catalog="${EPREFIX}/etc/xml/catalog" |
281 |
- |
282 |
- if multilib_is_native_abi; then |
283 |
- local d |
284 |
- for d in glib gio gobject; do |
285 |
- ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die |
286 |
- done |
287 |
- fi |
288 |
-} |
289 |
- |
290 |
-multilib_src_test() { |
291 |
- export XDG_CONFIG_DIRS=/etc/xdg |
292 |
- export XDG_DATA_DIRS=/usr/local/share:/usr/share |
293 |
- export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp" |
294 |
- export LC_TIME=C # bug #411967 |
295 |
- unset GSETTINGS_BACKEND # bug #596380 |
296 |
- python_setup |
297 |
- |
298 |
- # Related test is a bit nitpicking |
299 |
- mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR" |
300 |
- chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR" |
301 |
- |
302 |
- # Hardened: gdb needs this, bug #338891 |
303 |
- if host-is-pax ; then |
304 |
- pax-mark -mr "${BUILD_DIR}"/tests/.libs/assert-msg-test \ |
305 |
- || die "Hardened adjustment failed" |
306 |
- fi |
307 |
- |
308 |
- # Need X for dbus-launch session X11 initialization |
309 |
- virtx emake check |
310 |
-} |
311 |
- |
312 |
-multilib_src_install() { |
313 |
- gnome2_src_install completiondir="$(get_bashcompdir)" |
314 |
- keepdir /usr/$(get_libdir)/gio/modules |
315 |
-} |
316 |
- |
317 |
-multilib_src_install_all() { |
318 |
- einstalldocs |
319 |
- |
320 |
- if use utils ; then |
321 |
- python_replicate_script "${ED}"/usr/bin/gtester-report |
322 |
- else |
323 |
- rm "${ED}usr/bin/gtester-report" |
324 |
- rm "${ED}usr/share/man/man1/gtester-report.1" |
325 |
- fi |
326 |
- |
327 |
- # Do not install charset.alias even if generated, leave it to libiconv |
328 |
- rm -f "${ED}/usr/lib/charset.alias" |
329 |
- |
330 |
- # Don't install gdb python macros, bug 291328 |
331 |
- rm -rf "${ED}/usr/share/gdb/" "${ED}/usr/share/glib-2.0/gdb/" |
332 |
-} |
333 |
- |
334 |
-pkg_preinst() { |
335 |
- gnome2_pkg_preinst |
336 |
- |
337 |
- # Make gschemas.compiled belong to glib alone |
338 |
- local cache="usr/share/glib-2.0/schemas/gschemas.compiled" |
339 |
- |
340 |
- if [[ -e ${EROOT}${cache} ]]; then |
341 |
- cp "${EROOT}"${cache} "${ED}"/${cache} || die |
342 |
- else |
343 |
- touch "${ED}"/${cache} || die |
344 |
- fi |
345 |
- |
346 |
- multilib_pkg_preinst() { |
347 |
- # Make giomodule.cache belong to glib alone |
348 |
- local cache="usr/$(get_libdir)/gio/modules/giomodule.cache" |
349 |
- |
350 |
- if [[ -e ${EROOT}${cache} ]]; then |
351 |
- cp "${EROOT}"${cache} "${ED}"/${cache} || die |
352 |
- else |
353 |
- touch "${ED}"/${cache} || die |
354 |
- fi |
355 |
- } |
356 |
- |
357 |
- # Don't run the cache ownership when cross-compiling, as it would end up with an empty cache |
358 |
- # file due to inability to create it and GIO might not look at any of the modules there |
359 |
- if ! tc-is-cross-compiler ; then |
360 |
- multilib_foreach_abi multilib_pkg_preinst |
361 |
- fi |
362 |
-} |
363 |
- |
364 |
-pkg_postinst() { |
365 |
- # force (re)generation of gschemas.compiled |
366 |
- GNOME2_ECLASS_GLIB_SCHEMAS="force" |
367 |
- |
368 |
- gnome2_pkg_postinst |
369 |
- |
370 |
- multilib_pkg_postinst() { |
371 |
- gnome2_giomodule_cache_update \ |
372 |
- || die "Update GIO modules cache failed (for ${ABI})" |
373 |
- } |
374 |
- if ! tc-is-cross-compiler ; then |
375 |
- multilib_foreach_abi multilib_pkg_postinst |
376 |
- else |
377 |
- ewarn "Updating of GIO modules cache skipped due to cross-compilation." |
378 |
- ewarn "You might want to run gio-querymodules manually on the target for" |
379 |
- ewarn "your final image for performance reasons and re-run it when packages" |
380 |
- ewarn "installing GIO modules get upgraded or added to the image." |
381 |
- fi |
382 |
-} |
383 |
- |
384 |
-pkg_postrm() { |
385 |
- gnome2_pkg_postrm |
386 |
- |
387 |
- if [[ -z ${REPLACED_BY_VERSION} ]]; then |
388 |
- multilib_pkg_postrm() { |
389 |
- rm -f "${EROOT}"usr/$(get_libdir)/gio/modules/giomodule.cache |
390 |
- } |
391 |
- multilib_foreach_abi multilib_pkg_postrm |
392 |
- rm -f "${EROOT}"usr/share/glib-2.0/schemas/gschemas.compiled |
393 |
- fi |
394 |
-} |