commit: 6cae567896078ca6373b8d667af7835030438d12 Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> AuthorDate: Mon Apr 8 08:38:59 2019 +0000 Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> CommitDate: Mon Apr 8 08:38:59 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6cae5678
dev-libs/glib: remove old Package-Manager: Portage-2.3.52, Repoman-2.3.12 Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org> dev-libs/glib/Manifest | 1 - ...56.2-network-monitor-race-test-iterations.patch | 36 --- .../files/glib-2.54.3-external-gdbus-codegen.patch | 86 ------ .../glib/files/glib-2.58.2-gvariant-test-fix.patch | 96 ------- dev-libs/glib/glib-2.56.4.ebuild | 300 --------------------- 5 files changed, 519 deletions(-) diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest index 9f539cd8493..aa0ad833c86 100644 --- a/dev-libs/glib/Manifest +++ b/dev-libs/glib/Manifest @@ -1,3 +1,2 @@ -DIST glib-2.56.4.tar.xz 7029768 BLAKE2B 21cf840128e468151eeac55f0323f8f643973422b70bb65655e24c0a6b2f7ee72d5ae879bfae73df84fa2281fc425cc98328597910ba8fd99d7a52024e1b3ab6 SHA512 280a46c2af13283a08c15ff0b4f5492659c2884521930600ad45310ed181c44a878ad8f9b36bae68ed6e7d92db6f1630f7bf015148c513dc317d25807f13abb0 DIST glib-2.58.3.tar.xz 4863648 BLAKE2B 4269bd6e80869f39d567917438f750561debb1b45d40ecea487d2e76e2468e07dc8d80a23678699f7b8f7778c2ed9d29e866ae5e33770f51ed00709dd5fe97eb SHA512 1e1cb5b607367dcbadb95563d463e81702cf396b28f1173f6d933707f4f3d5595a70225423e918807a05994a24f16fa3ac87d2ec67e4b670244ea99836634cce DIST pkg-config-0.28.tar.gz 1931203 BLAKE2B bafdd4e838623965c6bd454421ddd9051fc43fc29948e1615b49fef463c3c3a18807aabe6416f96cfdf58d6b1c9e114d77f97bd985facee7c14284a8a64a768b SHA512 6eafa5ca77c5d44cd15f48457a5e96fcea2555b66d8e35ada5ab59864a0aa03d441e15f54ab9c6343693867b3b490f392c75b7d9312f024c9b7ec6a0194d8320 diff --git a/dev-libs/glib/files/2.56.2-network-monitor-race-test-iterations.patch b/dev-libs/glib/files/2.56.2-network-monitor-race-test-iterations.patch deleted file mode 100644 index 1ddec6db946..00000000000 --- a/dev-libs/glib/files/2.56.2-network-monitor-race-test-iterations.patch +++ /dev/null @@ -1,36 +0,0 @@ -From a90c578952219e740f24d9f2560f54f19ae7e906 Mon Sep 17 00:00:00 2001 -From: Philip Withnall <[email protected]> -Date: Wed, 11 Apr 2018 15:45:10 +0100 -Subject: [PATCH] tests: Lower number of iterations in network-monitor-race - -While 333 runs is very likely to reproduce the bug, Milan has previously -reproduced it with as few as 9 runs. Since this test will be run by the -CI machinery quite often, a lower number of runs each CI run will still -probably catch any regressions over time. - -This reduces the total test runtime from 33s to 2s. - -https://bugzilla.gnome.org/show_bug.cgi?id=793727 - -Signed-off-by: Philip Withnall <[email protected]> -Reviewed-by: nobody ---- - gio/tests/network-monitor-race.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gio/tests/network-monitor-race.c b/gio/tests/network-monitor-race.c -index 4b92c87a5..cadd62cee 100644 ---- a/gio/tests/network-monitor-race.c -+++ b/gio/tests/network-monitor-race.c -@@ -18,7 +18,7 @@ - #include <glib/glib.h> - #include <gio/gio.h> - --#define MAX_RUNS 333 -+#define MAX_RUNS 20 - - static gboolean - quit_loop (gpointer user_data) --- -2.17.0 - diff --git a/dev-libs/glib/files/glib-2.54.3-external-gdbus-codegen.patch b/dev-libs/glib/files/glib-2.54.3-external-gdbus-codegen.patch deleted file mode 100644 index a27966e0391..00000000000 --- a/dev-libs/glib/files/glib-2.54.3-external-gdbus-codegen.patch +++ /dev/null @@ -1,86 +0,0 @@ -From 2e47d49bc91d83cd0abea4c1944bfca4336040fa Mon Sep 17 00:00:00 2001 -From: Sobhan Mohammadpour <[email protected]> -Date: Fri, 23 Feb 2018 15:27:33 +0330 -Subject: [PATCH] glib-2.54.3-external-gdbus-codegen-for-autotools - ---- - configure.ac | 1 - - docs/reference/gio/Makefile.am | 1 - - gio/Makefile.am | 2 +- - gio/tests/Makefile.am | 6 ++---- - gio/tests/gdbus-object-manager-example/Makefile.am | 6 ++---- - 5 files changed, 5 insertions(+), 11 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 0457c90..07166c9 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -3469,7 +3469,6 @@ gobject/glib-mkenums - gobject/tests/Makefile - gthread/Makefile - gio/Makefile --gio/gdbus-2.0/codegen/Makefile - gio/gdbus-2.0/codegen/config.py - gio/gnetworking.h - gio/xdgmime/Makefile -diff --git a/docs/reference/gio/Makefile.am b/docs/reference/gio/Makefile.am -index 5741a3e..d38e768 100644 ---- a/docs/reference/gio/Makefile.am -+++ b/docs/reference/gio/Makefile.am -@@ -177,7 +177,6 @@ man_MANS += \ - gsettings.1 \ - gresource.1 \ - gdbus.1 \ -- gdbus-codegen.1 \ - gio.1 \ - $(NULL) - -diff --git a/gio/Makefile.am b/gio/Makefile.am -index b2db995..53d7162 100644 ---- a/gio/Makefile.am -+++ b/gio/Makefile.am -@@ -1,6 +1,6 @@ - include $(top_srcdir)/glib.mk - --SUBDIRS = gdbus-2.0/codegen -+SUBDIRS = - - if OS_UNIX - if !OS_COCOA -diff --git a/gio/tests/Makefile.am b/gio/tests/Makefile.am -index acc1da4..7c51eab 100644 ---- a/gio/tests/Makefile.am -+++ b/gio/tests/Makefile.am -@@ -460,10 +460,8 @@ gnotification_SOURCES = $(gdbus_sessionbus_sources) gnotifica - - BUILT_SOURCES += gdbus-test-codegen-generated.c gdbus-test-codegen-generated.h - gdbus-test-codegen.o: gdbus-test-codegen-generated.h --gdbus-test-codegen-generated.h: test-codegen.xml Makefile $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen -- $(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir) \ -- UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \ -- $(PYTHON) $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen \ -+gdbus-test-codegen-generated.h: test-codegen.xml Makefile -+ $(AM_V_GEN) gdbus-codegen \ - --interface-prefix org.project. \ - --generate-c-code gdbus-test-codegen-generated \ - --c-generate-object-manager \ -diff --git a/gio/tests/gdbus-object-manager-example/Makefile.am b/gio/tests/gdbus-object-manager-example/Makefile.am -index 1d0464c..f390dca 100644 ---- a/gio/tests/gdbus-object-manager-example/Makefile.am -+++ b/gio/tests/gdbus-object-manager-example/Makefile.am -@@ -11,10 +11,8 @@ GDBUS_GENERATED = \ - gdbus-example-objectmanager-generated-org.gtk.GDBus.Example.ObjectManager.Cat.xml \ - $(NULL) - --$(GDBUS_GENERATED) : gdbus-example-objectmanager.xml Makefile $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen -- $(AM_V_GEN) UNINSTALLED_GLIB_SRCDIR=$(top_srcdir) \ -- UNINSTALLED_GLIB_BUILDDIR=$(top_builddir) \ -- $(PYTHON) $(top_builddir)/gio/gdbus-2.0/codegen/gdbus-codegen \ -+$(GDBUS_GENERATED) : gdbus-example-objectmanager.xml Makefile -+ $(AM_V_GEN) gdbus-codegen \ - --interface-prefix org.gtk.GDBus.Example.ObjectManager. \ - --c-namespace Example \ - --c-generate-object-manager \ --- -2.16.1 - diff --git a/dev-libs/glib/files/glib-2.58.2-gvariant-test-fix.patch b/dev-libs/glib/files/glib-2.58.2-gvariant-test-fix.patch deleted file mode 100644 index 0bd3a85b018..00000000000 --- a/dev-libs/glib/files/glib-2.58.2-gvariant-test-fix.patch +++ /dev/null @@ -1,96 +0,0 @@ -From 8a028c250a82b667562efcfdf51d35506383adbb Mon Sep 17 00:00:00 2001 -From: Mart Raudsepp <[email protected]> -Date: Wed, 19 Dec 2018 16:22:21 +0200 -Subject: [PATCH] tests: Allocate gvariant data from the heap to guarantee - alignment - -On glib-2-58 branch we don't have !455, thus we need aligned data -for the gvariant tests to not fail on i686. - -Fixes #1626 ---- - glib/tests/gvariant.c | 15 ++++++++++++--- - 1 file changed, 12 insertions(+), 3 deletions(-) - -diff --git a/glib/tests/gvariant.c b/glib/tests/gvariant.c -index 8047ef5e8..5ca7b964e 100644 ---- a/glib/tests/gvariant.c -+++ b/glib/tests/gvariant.c -@@ -4770,6 +4770,7 @@ test_stack_dict_init (void) - static void - test_normal_checking_tuples (void) - { -+ gpointer aligned_data; - const guint8 data[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, - 'a', '(', 'a', 'o', 'a', 'o', 'a', 'a', 'o', 'a', 'a', 'o', ')' -@@ -4778,13 +4779,15 @@ test_normal_checking_tuples (void) - GVariant *variant = NULL; - GVariant *normal_variant = NULL; - -- variant = g_variant_new_from_data (G_VARIANT_TYPE_VARIANT, data, size, -+ aligned_data = g_memdup (data, size); /* guarantee alignment */ -+ variant = g_variant_new_from_data (G_VARIANT_TYPE_VARIANT, aligned_data, size, - FALSE, NULL, NULL); - g_assert_nonnull (variant); - - normal_variant = g_variant_get_normal_form (variant); - g_assert_nonnull (normal_variant); - -+ g_free (aligned_data); - g_variant_unref (normal_variant); - g_variant_unref (variant); - } -@@ -4896,6 +4899,7 @@ test_recursion_limits_array_in_variant (void) - static void - test_normal_checking_array_offsets (void) - { -+ gpointer aligned_data; - const guint8 data[] = { - 0x07, 0xe5, 0x00, 0x07, 0x00, 0x07, 0x00, 0x00, - 'a', 'a', 'a', 'a', 'a', 'a', 'a', 'a', 'a', 'a', 'a', 'a', 'a', 'g', -@@ -4904,13 +4908,15 @@ test_normal_checking_array_offsets (void) - GVariant *variant = NULL; - GVariant *normal_variant = NULL; - -- variant = g_variant_new_from_data (G_VARIANT_TYPE_VARIANT, data, size, -+ aligned_data = g_memdup (data, size); /* guarantee alignment */ -+ variant = g_variant_new_from_data (G_VARIANT_TYPE_VARIANT, aligned_data, size, - FALSE, NULL, NULL); - g_assert_nonnull (variant); - - normal_variant = g_variant_get_normal_form (variant); - g_assert_nonnull (normal_variant); - -+ g_free (aligned_data); - g_variant_unref (normal_variant); - g_variant_unref (variant); - } -@@ -4944,6 +4950,7 @@ test_normal_checking_tuple_offsets (void) - static void - test_normal_checking_empty_object_path (void) - { -+ gpointer aligned_data; - const guint8 data[] = { - 0x20, 0x20, 0x00, 0x00, 0x00, 0x00, - '(', 'h', '(', 'a', 'i', 'a', 'b', 'i', 'o', ')', ')', -@@ -4952,13 +4959,15 @@ test_normal_checking_empty_object_path (void) - GVariant *variant = NULL; - GVariant *normal_variant = NULL; - -- variant = g_variant_new_from_data (G_VARIANT_TYPE_VARIANT, data, size, -+ aligned_data = g_memdup (data, size); /* guarantee alignment */ -+ variant = g_variant_new_from_data (G_VARIANT_TYPE_VARIANT, aligned_data, size, - FALSE, NULL, NULL); - g_assert_nonnull (variant); - - normal_variant = g_variant_get_normal_form (variant); - g_assert_nonnull (normal_variant); - -+ g_free (aligned_data); - g_variant_unref (normal_variant); - g_variant_unref (variant); - } --- -2.17.0 - diff --git a/dev-libs/glib/glib-2.56.4.ebuild b/dev-libs/glib/glib-2.56.4.ebuild deleted file mode 100644 index 9cccbd6aa5b..00000000000 --- a/dev-libs/glib/glib-2.56.4.ebuild +++ /dev/null @@ -1,300 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} ) -GNOME2_EAUTORECONF=yes - -inherit autotools bash-completion-r1 epunt-cxx flag-o-matic gnome2 libtool linux-info \ - multilib multilib-minimal pax-utils python-any-r1 toolchain-funcs virtualx - -# Until bug #537330 glib is a reverse dependency of pkgconfig and, then -# adding new dependencies end up making stage3 to grow. Every addition needs -# then to be think very closely. - -DESCRIPTION="The GLib library of C routines" -HOMEPAGE="https://www.gtk.org/"; -SRC_URI="${SRC_URI} - https://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz"; # pkg.m4 for eautoreconf - -LICENSE="LGPL-2.1+" -SLOT="2" -IUSE="dbus debug fam kernel_linux +mime selinux static-libs systemtap test utils xattr" - -KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" - -# Added util-linux multilib dependency to have libmount support (which -# is always turned on on linux systems, unless explicitly disabled, but -# this ebuild does not do that anyway) (bug #599586) - -RDEPEND=" - !<dev-util/gdbus-codegen-${PV} - >=dev-libs/libpcre-8.13:3[${MULTILIB_USEDEP},static-libs?] - >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] - >=virtual/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}] - >=virtual/libintl-0-r2[${MULTILIB_USEDEP}] - >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] - kernel_linux? ( sys-apps/util-linux[${MULTILIB_USEDEP}] ) - selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] ) - xattr? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] ) - fam? ( >=virtual/fam-0-r1[${MULTILIB_USEDEP}] ) - utils? ( - >=dev-util/gdbus-codegen-${PV} - virtual/libelf:0= - ) -" -DEPEND="${RDEPEND} - app-text/docbook-xml-dtd:4.1.2 - >=dev-libs/libxslt-1.0 - >=sys-devel/gettext-0.11 - >=dev-util/gtk-doc-am-1.20 - systemtap? ( >=dev-util/systemtap-1.3 ) - ${PYTHON_DEPS} - test? ( - sys-devel/gdb - >=dev-util/gdbus-codegen-${PV} - >=sys-apps/dbus-1.2.14 ) - !<dev-util/gtk-doc-1.15-r2 -" -# Migration of glib-genmarshal, glib-mkenums and gtester-report to a separate -# python depending package, which can be buildtime depended in packages that -# need these tools, without pulling in python at runtime. -RDEPEND="${RDEPEND} - >=dev-util/glib-utils-${PV}" -PDEPEND=" - dbus? ( gnome-base/dconf ) - mime? ( x11-misc/shared-mime-info ) -" -# shared-mime-info needed for gio/xdgmime, bug #409481 -# dconf is needed to be able to save settings, bug #498436 - -MULTILIB_CHOST_TOOLS=( - /usr/bin/gio-querymodules$(get_exeext) -) - -pkg_setup() { - if use kernel_linux ; then - CONFIG_CHECK="~INOTIFY_USER" - if use test ; then - CONFIG_CHECK="~IPV6" - WARNING_IPV6="Your kernel needs IPV6 support for running some tests, skipping them." - fi - linux-info_pkg_setup - fi - python-any-r1_pkg_setup -} - -src_prepare() { - # Prevent build failure in stage3 where pkgconfig is not available, bug #481056 - mv -f "${WORKDIR}"/pkg-config-*/pkg.m4 "${S}"/m4macros/ || die - - if use test; then - # Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629, upstream bug #629163 - if ! has_version dev-util/desktop-file-utils ; then - ewarn "Some tests will be skipped due dev-util/desktop-file-utils not being present on your system," - ewarn "think on installing it to get these tests run." - sed -i -e "/appinfo\/associations/d" gio/tests/appinfo.c || die - sed -i -e "/g_test_add_func/d" gio/tests/desktop-app-info.c || die - fi - - # gdesktopappinfo requires existing terminal (gnome-terminal or any - # other), falling back to xterm if one doesn't exist - if ! has_version x11-terms/xterm && ! has_version x11-terms/gnome-terminal ; then - ewarn "Some tests will be skipped due to missing terminal program" - sed -i -e "/appinfo\/launch/d" gio/tests/appinfo.c || die - fi - - # https://bugzilla.gnome.org/show_bug.cgi?id=722604 - sed -i -e "/timer\/stop/d" glib/tests/timer.c || die - sed -i -e "/timer\/basic/d" glib/tests/timer.c || die - - ewarn "Tests for search-utils have been skipped" - sed -i -e "/search-utils/d" glib/tests/Makefile.am || die - else - # Don't build tests, also prevents extra deps, bug #512022 - sed -i -e 's/ tests//' {.,gio,glib}/Makefile.am || die - fi - - # Less max runs in network monitor race test to avoid hitting timeout limits - eapply "${FILESDIR}"/2.56.2-network-monitor-race-test-iterations.patch # included in 2.57.1 - - # https://gitlab.gnome.org/GNOME/glib/issues/1626 - eapply "${FILESDIR}"/${PN}-2.58.2-gvariant-test-fix.patch - - # gdbus-codegen is a separate package - eapply "${FILESDIR}"/${PN}-2.54.3-external-gdbus-codegen.patch - - gnome2_src_prepare - epunt_cxx -} - -multilib_src_configure() { - # Avoid circular depend with dev-util/pkgconfig and - # native builds (cross-compiles won't need pkg-config - # in the target ROOT to work here) - if ! tc-is-cross-compiler && ! $(tc-getPKG_CONFIG) --version >& /dev/null; then - if has_version sys-apps/dbus; then - export DBUS1_CFLAGS="-I/usr/include/dbus-1.0 -I/usr/$(get_libdir)/dbus-1.0/include" - export DBUS1_LIBS="-ldbus-1" - fi - export LIBFFI_CFLAGS="-I$(echo /usr/$(get_libdir)/libffi-*/include)" - export LIBFFI_LIBS="-lffi" - export PCRE_CFLAGS=" " # test -n "$PCRE_CFLAGS" needs to pass - export PCRE_LIBS="-lpcre" - fi - - # These configure tests don't work when cross-compiling. - if tc-is-cross-compiler ; then - # https://bugzilla.gnome.org/show_bug.cgi?id=756473 - case ${CHOST} in - hppa*|metag*) export glib_cv_stack_grows=yes ;; - *) export glib_cv_stack_grows=no ;; - esac - # https://bugzilla.gnome.org/show_bug.cgi?id=756474 - export glib_cv_uscore=no - # https://bugzilla.gnome.org/show_bug.cgi?id=756475 - export ac_cv_func_posix_get{pwuid,grgid}_r=yes - fi - - local myconf - - case "${CHOST}" in - *-mingw*) myconf="${myconf} --with-threads=win32" ;; - *) myconf="${myconf} --with-threads=posix" ;; - esac - - # libelf used only by the gresource bin - ECONF_SOURCE="${S}" gnome2_src_configure ${myconf} \ - $(usex debug --enable-debug=yes ' ') \ - $(use_enable xattr) \ - $(use_enable fam) \ - $(use_enable kernel_linux libmount) \ - $(use_enable selinux) \ - $(use_enable static-libs static) \ - $(use_enable systemtap dtrace) \ - $(use_enable systemtap systemtap) \ - $(multilib_native_use_enable utils libelf) \ - --with-python=${EPYTHON} \ - --disable-compile-warnings \ - --enable-man \ - --with-pcre=system \ - --with-xml-catalog="${EPREFIX}/etc/xml/catalog" - - if multilib_is_native_abi; then - local d - for d in glib gio gobject; do - ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die - done - fi -} - -multilib_src_test() { - export XDG_CONFIG_DIRS=/etc/xdg - export XDG_DATA_DIRS=/usr/local/share:/usr/share - export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp" - export LC_TIME=C # bug #411967 - unset GSETTINGS_BACKEND # bug #596380 - python_setup - - # Related test is a bit nitpicking - mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR" - chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR" - - # Hardened: gdb needs this, bug #338891 - if host-is-pax ; then - pax-mark -mr "${BUILD_DIR}"/tests/.libs/assert-msg-test \ - || die "Hardened adjustment failed" - fi - - # Need X for dbus-launch session X11 initialization - virtx emake check -} - -multilib_src_install() { - emake DESTDIR="${D}" completiondir="$(get_bashcompdir)" install - keepdir /usr/$(get_libdir)/gio/modules -} - -multilib_src_install_all() { - einstalldocs - - # These are installed by dev-util/glib-utils - # TODO: With patching we might be able to get rid of the python-any deps and removals, and test depend on glib-utils instead; revisit with meson - rm "${ED}usr/bin/glib-genmarshal" || die - rm "${ED}usr/share/man/man1/glib-genmarshal.1" || die - rm "${ED}usr/bin/glib-mkenums" || die - rm "${ED}usr/share/man/man1/glib-mkenums.1" || die - rm "${ED}usr/bin/gtester-report" || die - rm "${ED}usr/share/man/man1/gtester-report.1" || die - - # Do not install charset.alias even if generated, leave it to libiconv - rm -f "${ED}/usr/$(get_libdir)/charset.alias" - - # Don't install gdb python macros, bug 291328 - rm -rf "${ED}/usr/share/gdb/" "${ED}/usr/share/glib-2.0/gdb/" - - # Completely useless with or without USE static-libs, people need to use pkg-config - find "${ED}" -name '*.la' -delete || die -} - -pkg_preinst() { - gnome2_pkg_preinst - - # Make gschemas.compiled belong to glib alone - local cache="usr/share/glib-2.0/schemas/gschemas.compiled" - - if [[ -e ${EROOT}${cache} ]]; then - cp "${EROOT}"${cache} "${ED}"/${cache} || die - else - touch "${ED}"/${cache} || die - fi - - multilib_pkg_preinst() { - # Make giomodule.cache belong to glib alone - local cache="usr/$(get_libdir)/gio/modules/giomodule.cache" - - if [[ -e ${EROOT}${cache} ]]; then - cp "${EROOT}"${cache} "${ED}"/${cache} || die - else - touch "${ED}"/${cache} || die - fi - } - - # Don't run the cache ownership when cross-compiling, as it would end up with an empty cache - # file due to inability to create it and GIO might not look at any of the modules there - if ! tc-is-cross-compiler ; then - multilib_foreach_abi multilib_pkg_preinst - fi -} - -pkg_postinst() { - # force (re)generation of gschemas.compiled - GNOME2_ECLASS_GLIB_SCHEMAS="force" - - gnome2_pkg_postinst - - multilib_pkg_postinst() { - gnome2_giomodule_cache_update \ - || die "Update GIO modules cache failed (for ${ABI})" - } - if ! tc-is-cross-compiler ; then - multilib_foreach_abi multilib_pkg_postinst - else - ewarn "Updating of GIO modules cache skipped due to cross-compilation." - ewarn "You might want to run gio-querymodules manually on the target for" - ewarn "your final image for performance reasons and re-run it when packages" - ewarn "installing GIO modules get upgraded or added to the image." - fi -} - -pkg_postrm() { - gnome2_pkg_postrm - - if [[ -z ${REPLACED_BY_VERSION} ]]; then - multilib_pkg_postrm() { - rm -f "${EROOT}"usr/$(get_libdir)/gio/modules/giomodule.cache - } - multilib_foreach_abi multilib_pkg_postrm - rm -f "${EROOT}"usr/share/glib-2.0/schemas/gschemas.compiled - fi -}
