commit:     61a378f5ffd2996f2bf8b21c61a67430a6e34567
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 30 19:29:29 2016 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sat Jul 30 20:36:43 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61a378f5

dev-libs/glib: Drop old

Package-Manager: portage-2.3.0

 dev-libs/glib/Manifest              |   1 -
 dev-libs/glib/glib-2.46.2-r2.ebuild | 314 ------------------------------------
 dev-libs/glib/glib-2.48.0-r1.ebuild | 296 ---------------------------------
 3 files changed, 611 deletions(-)

diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index c543151..f8b0e92 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -2,6 +2,5 @@ DIST glib-1.2.10-r1-as-needed.patch.bz2 9099 SHA256 
3bb8c45706f97b526da851061c89
 DIST glib-1.2.10.tar.gz 421480 SHA256 
6e1ce7eedae713b11db82f11434d455d8a1379f783a79812cd2e05fc024a8d9f SHA512 
4452b741382194d4ca425f084fa60e1a9e30040ac2e839c9136047d0461cf4b1ebcc16aac4e65998d1b9329ead8f617966b3d09317a83634f14d556a7e14b7a8
 WHIRLPOOL 
478957ce8e49228d022bae50b042cdfc6d522d0d4880a0328b5695471295450c81c5e186e1760e56e317a4c4c95aabc5f2010d7a9b912fc451d04e14610e7dca
 DIST glib-2.44.1.tar.xz 7132940 SHA256 
8811deacaf8a503d0a9b701777ea079ca6a4277be10e3d730d2112735d5eca07 SHA512 
c24d307408e061b2657f7e7d1b8245c55605ebda26ee2dcc3497ee9d90bfc137d8e5f42f0cd5acf4b49ea28c424fa901e81f75ecf81833f6d0fe51d5e36e5888
 WHIRLPOOL 
6a1eef94b3ffed4d5cb551f4def6859ddff8ea0aac50048e706863f2bd4957c40b7034946852fa4604a109eb121c55b94ec51b3708a325ace5692f61fd1babb7
 DIST glib-2.46.2.tar.xz 7344636 SHA256 
5031722e37036719c1a09163cc6cf7c326e4c4f1f1e074b433c156862bd733db SHA512 
8b5298712710d77b4a47367071f782d2bb3042b149ec8fde8c065f80bf3c5375c94318d19665c0092572e4895e590231a47324d25f371310f02b43feb3009588
 WHIRLPOOL 
700b69360110351544780ace4dcb14f29505f63d8840882532a4b7c017860b6da86e09cbabca691b7b24cb08b8722e772555de044b8b21e4b0952c8a8e4e6ecb
-DIST glib-2.48.0.tar.xz 7487800 SHA256 
744be6931ca914c68af98dc38ff6b0cf8381d65e335060faddfbf04c17147c34 SHA512 
684544bc594d9f6c905495d895daed40b074bcf5fa835aefb9a1034afc9564b2bd464e68d4c378c210e96918ef5d5202350da53a7104794420e990049ddbebf5
 WHIRLPOOL 
39ddd7fd17ecc2100f2156165210d2cf68ae13724b252e42705bc89d0c4145cddca3a30f9e3bf9b6a2971cbffe0e108d2acae1200c8fe6d9db91b4b3953c4950
 DIST glib-2.48.1.tar.xz 7441032 SHA256 
74411bff489cb2a3527bac743a51018841a56a4d896cc1e0d0d54f8166a14612 SHA512 
5bbea7d07ba6d75c35c6be8f1ebc685aa2549bd20030741b2d6e2c30e9b2d476c2afa50a974bbdad98c305666c8b04357b51619c97fe50d3e9965700088aad9b
 WHIRLPOOL 
2f08854815fee79b6246accedb62a714845b7f0bc67bcd6cde48aa0147a957e6c9cbbc424100d651ee5573f31a3db89ee1935e3ffdc97c5bf1d5711a85545eb2
 DIST pkg-config-0.28.tar.gz 1931203 SHA256 
6b6eb31c6ec4421174578652c7e141fdaae2dabad1021f420d8713206ac1f845 SHA512 
6eafa5ca77c5d44cd15f48457a5e96fcea2555b66d8e35ada5ab59864a0aa03d441e15f54ab9c6343693867b3b490f392c75b7d9312f024c9b7ec6a0194d8320
 WHIRLPOOL 
db4ddb4ce61724e629931c5ffccb4d7a551b4dc0f4efed5a966822307e4b5a786adee5705dd80ec0a9aa32cb1af9ad9615e307360e131fc34688207216161486

diff --git a/dev-libs/glib/glib-2.46.2-r2.ebuild 
b/dev-libs/glib/glib-2.46.2-r2.ebuild
deleted file mode 100644
index 23f7d38..0000000
--- a/dev-libs/glib/glib-2.46.2-r2.ebuild
+++ /dev/null
@@ -1,314 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# 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.
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-# Building with --disable-debug highly unrecommended.  It will build glib in
-# an unusable form as it disables some commonly used API.  Please do not
-# convert this to the use_enable form, as it results in a broken build.
-GCONF_DEBUG="yes"
-# Completely useless with or without USE static-libs, people need to use
-# pkg-config
-GNOME2_LA_PUNT="yes"
-
-inherit autotools bash-completion-r1 gnome2 libtool eutils flag-o-matic        
multilib \
-       pax-utils python-r1 toolchain-funcs versionator virtualx linux-info 
multilib-minimal
-
-DESCRIPTION="The GLib library of C routines"
-HOMEPAGE="http://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+"
-SLOT="2"
-IUSE="dbus fam kernel_linux +mime selinux static-libs systemtap test utils 
xattr"
-REQUIRED_USE="
-       utils? ( ${PYTHON_REQUIRED_USE} )
-       test? ( ${PYTHON_REQUIRED_USE} )
-"
-
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh 
~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
-
-RDEPEND="
-       !<dev-util/gdbus-codegen-${PV}
-       >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
-       >=virtual/libffi-3.0.13-r1[${MULTILIB_USEDEP}]
-       >=sys-libs/zlib-1.2.8-r1[${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? (
-               ${PYTHON_DEPS}
-               >=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}]
-               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 )
-       test? (
-               sys-devel/gdb
-               ${PYTHON_DEPS}
-               >=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}]
-               >=sys-apps/dbus-1.2.14 )
-       !<dev-util/gtk-doc-1.15-r2
-"
-# gobject-introspection blocker to ensure people don't mix
-# different g-i and glib major versions
-
-PDEPEND="!<gnome-base/gvfs-1.6.4-r990
-       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
-# Earlier versions of gvfs do not work with glib
-
-MULTILIB_CHOST_TOOLS=(
-       /usr/bin/gio-querymodules
-)
-
-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
-}
-
-src_prepare() {
-       # GDBusProxy: Fix a memory leak during initialization (from 2.46 branch)
-       epatch "${FILESDIR}"/${P}-memleak.patch
-
-       # 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
-
-               # Disable tests requiring dbus-python and pygobject; bugs 
#349236, #377549, #384853
-               if ! has_version dev-python/dbus-python || ! has_version 
'dev-python/pygobject:3' ; then
-                       ewarn "Some tests will be skipped due to 
dev-python/dbus-python or dev-python/pygobject:3"
-                       ewarn "not being present on your system, think on 
installing them to get these tests run."
-                       sed -i -e "/connection\/filter/d" 
gio/tests/gdbus-connection.c || die
-                       sed -i -e "/connection\/large_message/d" 
gio/tests/gdbus-connection-slow.c || die
-                       sed -i -e "/gdbus\/proxy/d" gio/tests/gdbus-proxy.c || 
die
-                       sed -i -e "/gdbus\/proxy-well-known-name/d" 
gio/tests/gdbus-proxy-well-known-name.c || die
-                       sed -i -e "/gdbus\/introspection-parser/d" 
gio/tests/gdbus-introspection.c || die
-                       sed -i -e "/g_test_add_func/d" 
gio/tests/gdbus-threading.c || die
-                       sed -i -e "/gdbus\/method-calls-in-thread/d" 
gio/tests/gdbus-threading.c || die
-                       # needed to prevent gdbus-threading from asserting
-                       ln -sfn $(type -P true) gio/tests/gdbus-testserver.py
-               fi
-
-               # Some tests need ipv6, upstream bug #667468
-               # https://bugs.gentoo.org/show_bug.cgi?id=508752
-               if [[ ! -f /proc/net/if_net6 ]]; then
-                       sed -i -e "/gdbus\/peer-to-peer/d" 
gio/tests/gdbus-peer.c || die
-                       sed -i -e "/gdbus\/delayed-message-processing/d" 
gio/tests/gdbus-peer.c || die
-                       sed -i -e "/gdbus\/nonce-tcp/d" gio/tests/gdbus-peer.c 
|| die
-               fi
-
-               # This test is prone to fail, bug #504024, upstream bug #723719
-               sed -i -e '/gdbus-close-pending/d' gio/tests/Makefile.am || die
-
-               # 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
-       else
-               # Don't build tests, also prevents extra deps, bug #512022
-               sed -i -e 's/ tests//' {.,gio,glib}/Makefile.am || die
-       fi
-
-       # gdbus-codegen is a separate package
-       epatch "${FILESDIR}"/${PN}-2.40.0-external-gdbus-codegen.patch
-
-       # leave python shebang alone
-       sed -e '/${PYTHON}/d' \
-               -i glib/Makefile.{am,in} || die
-
-       epatch_user
-
-       # Also needed to prevent cross-compile failures, see bug #267603
-       eautoreconf
-
-       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"
-       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
-
-       # FIXME: Always use internal libpcre, bug #254659
-       # (maybe consider going back to system lib)
-       # libelf used only by the gresource bin
-       ECONF_SOURCE="${S}" gnome2_src_configure ${myconf} \
-               $(use_enable xattr) \
-               $(use_enable fam) \
-               $(use_enable selinux) \
-               $(use_enable static-libs static) \
-               $(use_enable systemtap dtrace) \
-               $(use_enable systemtap systemtap) \
-               $(multilib_native_use_enable utils libelf) \
-               --disable-compile-warnings \
-               --enable-man \
-               --with-pcre=internal \
-               --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
-       python_export_best
-
-       # 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
-       Xemake check
-}
-
-multilib_src_install() {
-       gnome2_src_install completiondir="$(get_bashcompdir)"
-       keepdir /usr/$(get_libdir)/gio/modules
-}
-
-multilib_src_install_all() {
-       DOCS="AUTHORS ChangeLog* NEWS* README"
-       einstalldocs
-
-       if use utils ; then
-               python_replicate_script "${ED}"/usr/bin/gtester-report
-       else
-               rm "${ED}usr/bin/gtester-report"
-               rm "${ED}usr/share/man/man1/gtester-report.1"
-       fi
-
-       # Do not install charset.alias even if generated, leave it to libiconv
-       rm -f "${ED}/usr/lib/charset.alias"
-
-       # Don't install gdb python macros, bug 291328
-       rm -rf "${ED}/usr/share/gdb/" "${ED}/usr/share/glib-2.0/gdb/"
-}
-
-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/giomodule.cache"
-
-               if [[ -e ${EROOT}${cache} ]]; then
-                       cp "${EROOT}"${cache} "${ED}"/${cache} || die
-               else
-                       touch "${ED}"/${cache} || die
-               fi
-       }
-
-       multilib_foreach_abi multilib_pkg_preinst
-}
-
-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})"
-       }
-       multilib_foreach_abi multilib_pkg_postinst
-}
-
-pkg_postrm() {
-       gnome2_pkg_postrm
-
-       if [[ -z ${REPLACED_BY_VERSION} ]]; then
-               multilib_pkg_postrm() {
-                       rm -f "${EROOT}"usr/$(get_libdir)/gio/giomodule.cache
-               }
-               multilib_foreach_abi multilib_pkg_postrm
-               rm -f "${EROOT}"usr/share/glib-2.0/schemas/gschemas.compiled
-       fi
-}

diff --git a/dev-libs/glib/glib-2.48.0-r1.ebuild 
b/dev-libs/glib/glib-2.48.0-r1.ebuild
deleted file mode 100644
index e1e0dd9..0000000
--- a/dev-libs/glib/glib-2.48.0-r1.ebuild
+++ /dev/null
@@ -1,296 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# 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.
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-# Building with --disable-debug highly unrecommended.  It will build glib in
-# an unusable form as it disables some commonly used API.  Please do not
-# convert this to the use_enable form, as it results in a broken build.
-GCONF_DEBUG="yes"
-# Completely useless with or without USE static-libs, people need to use
-# pkg-config
-GNOME2_LA_PUNT="yes"
-
-inherit autotools bash-completion-r1 gnome2 libtool eutils flag-o-matic        
multilib \
-       pax-utils python-r1 toolchain-funcs versionator virtualx linux-info 
multilib-minimal
-
-DESCRIPTION="The GLib library of C routines"
-HOMEPAGE="http://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+"
-SLOT="2"
-IUSE="dbus fam kernel_linux +mime selinux static-libs systemtap test utils 
xattr"
-REQUIRED_USE="
-       utils? ( ${PYTHON_REQUIRED_USE} )
-       test? ( ${PYTHON_REQUIRED_USE} )
-"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux 
~x86-linux"
-
-RDEPEND="
-       !<dev-util/gdbus-codegen-${PV}
-       >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
-       >=virtual/libffi-3.0.13-r1[${MULTILIB_USEDEP}]
-       >=sys-libs/zlib-1.2.8-r1[${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? (
-               ${PYTHON_DEPS}
-               >=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}]
-               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 )
-       test? (
-               sys-devel/gdb
-               ${PYTHON_DEPS}
-               >=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}]
-               >=sys-apps/dbus-1.2.14 )
-       !<dev-util/gtk-doc-1.15-r2
-"
-# gobject-introspection blocker to ensure people don't mix
-# different g-i and glib major versions
-
-PDEPEND="!<gnome-base/gvfs-1.6.4-r990
-       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
-# Earlier versions of gvfs do not work with glib
-
-MULTILIB_CHOST_TOOLS=(
-       /usr/bin/gio-querymodules
-)
-
-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
-}
-
-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
-
-       # gdbus-codegen is a separate package
-       epatch "${FILESDIR}"/${PN}-2.40.0-external-gdbus-codegen.patch
-
-       # crash in Firefox when choosing default application, fixed in 2.48.1; 
bug #577686
-       epatch "${FILESDIR}"/${PN}-2.48.0-GContextSpecificGroup.patch
-
-       # missing from 2.48.0 tarball, should be fixed in 2.48.1; bug #578238
-       cp "${FILESDIR}"/${P}-gobject.stp.in gobject/gobject.stp.in || die
-
-       # Leave python shebang alone - handled by python_replicate_script
-       # We could call python_setup and give configure a valid --with-python
-       # arg, but that would mean a build dep on python when USE=utils.
-       sed -e '/${PYTHON}/d' \
-               -i glib/Makefile.{am,in} || die
-
-       epatch_user
-
-       # Also needed to prevent cross-compile failures, see bug #267603
-       eautoreconf
-
-       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"
-       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
-
-       # FIXME: Always use internal libpcre, bug #254659
-       # (maybe consider going back to system lib)
-       # libelf used only by the gresource bin
-       ECONF_SOURCE="${S}" gnome2_src_configure ${myconf} \
-               $(use_enable xattr) \
-               $(use_enable fam) \
-               $(use_enable selinux) \
-               $(use_enable static-libs static) \
-               $(use_enable systemtap dtrace) \
-               $(use_enable systemtap systemtap) \
-               $(multilib_native_use_enable utils libelf) \
-               --disable-compile-warnings \
-               --enable-man \
-               --with-pcre=internal \
-               --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
-       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
-       Xemake check
-}
-
-multilib_src_install() {
-       gnome2_src_install completiondir="$(get_bashcompdir)"
-       keepdir /usr/$(get_libdir)/gio/modules
-}
-
-multilib_src_install_all() {
-       DOCS="AUTHORS ChangeLog* NEWS* README"
-       einstalldocs
-
-       if use utils ; then
-               python_replicate_script "${ED}"/usr/bin/gtester-report
-       else
-               rm "${ED}usr/bin/gtester-report"
-               rm "${ED}usr/share/man/man1/gtester-report.1"
-       fi
-
-       # Do not install charset.alias even if generated, leave it to libiconv
-       rm -f "${ED}/usr/lib/charset.alias"
-
-       # Don't install gdb python macros, bug 291328
-       rm -rf "${ED}/usr/share/gdb/" "${ED}/usr/share/glib-2.0/gdb/"
-}
-
-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/giomodule.cache"
-
-               if [[ -e ${EROOT}${cache} ]]; then
-                       cp "${EROOT}"${cache} "${ED}"/${cache} || die
-               else
-                       touch "${ED}"/${cache} || die
-               fi
-       }
-
-       multilib_foreach_abi multilib_pkg_preinst
-}
-
-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})"
-       }
-       multilib_foreach_abi multilib_pkg_postinst
-}
-
-pkg_postrm() {
-       gnome2_pkg_postrm
-
-       if [[ -z ${REPLACED_BY_VERSION} ]]; then
-               multilib_pkg_postrm() {
-                       rm -f "${EROOT}"usr/$(get_libdir)/gio/giomodule.cache
-               }
-               multilib_foreach_abi multilib_pkg_postrm
-               rm -f "${EROOT}"usr/share/glib-2.0/schemas/gschemas.compiled
-       fi
-}

Reply via email to