sync

(Portage version: 2.2.14-prefix/hg/SunOS i386, signed Manifest commit with key 0x5F75F607C5C74E89)

5 files changed, 355 insertions, 9 deletions

diff --git a/dev-libs/glib/ChangeLog b/dev-libs/glib/ChangeLog
index 8557deb7c9..40ff813b64 100644
--- a/dev-libs/glib/ChangeLog
+++ b/dev-libs/glib/ChangeLog
@@ -1,6 +1,26 @@
 # ChangeLog for dev-libs/glib
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.624 2014/10/11 11:35:18 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.630 2014/12/28 12:23:03 ago Exp $
+
+  28 Dec 2014; Agostino Sarubbo <ago@gentoo.org> glib-2.40.2.ebuild:
+  Stable for ppc, wrt bug #529964
+
+  19 Dec 2014; Pacho Ramos <pacho@gentoo.org> glib-2.40.2.ebuild:
+  amd64 stable, bug 529964
+
+  18 Dec 2014; Pacho Ramos <pacho@gentoo.org> glib-2.40.2.ebuild:
+  x86 stable, bug 529964
+
+*glib-2.42.1 (14 Dec 2014)
+
+  14 Dec 2014; Gilles Dartiguelongue <eva@gentoo.org> +glib-2.42.1.ebuild:
+  Version bump for Gnome 3.14.
+
+  12 Dec 2014; Jeroen Roovers <jer@gentoo.org> glib-2.40.2.ebuild:
+  Stable for HPPA (bug #529964).
+
+  27 Oct 2014; Mike Frysinger <vapier@gentoo.org> glib-2.40.0-r1.ebuild:
+  Mark arm64/m68k/s390/sh stable.
 
   11 Oct 2014; Markus Meier <maekke@gentoo.org> glib-2.40.0-r1.ebuild:
   arm stable, bug #512012
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index b9dba85d4f..3cf8a8dbb6 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -82,17 +82,19 @@ DIST glib-1.2.10.tar.gz 421480 SHA256 6e1ce7eedae713b11db82f11434d455d8a1379f783
 DIST glib-2.38.2.tar.xz 6718296 SHA256 056a9854c0966a0945e16146b3345b7a82562a5ba4d5516fd10398732aea5734 SHA512 f31531060d898dbe05e71ffc4d057f5a703106674e68c28ad2346d227304ef9454736beaf653f27553ed5397caac8baf3d76d3b31b062898762e5cf4e24ff0e0 WHIRLPOOL 4b126073d673f1cda9af4b1bfa0b6621e2cb883dfffe911d264bfc4c317a063579fc764ef94f7fe22b64a6fc8f0ed5f16de1015f1aa265dcaa85ec0d7392fa7b
 DIST glib-2.40.0.tar.xz 7016228 SHA256 0d27f195966ecb1995dcce0754129fd66ebe820c7cd29200d264b02af1aa28b5 SHA512 346a32f2d1447d3398ac2400047f0556517b914788cf9c8c9f28de5f395ef3993231f9a58fc103e08013fa2e7136a097de46aabdf4c035a46f883ca3971408a4 WHIRLPOOL d3e7ccfa3ac4270ccc5f950771238addabcbf025ebaf85a1586c7757493c6cdc3dc447f6ab92af1ed87f1c68c79d7b1bb6417b1894f8c0304fd87e04b1eb9b3b
 DIST glib-2.40.2.tar.xz 7001344 SHA256 e8ff8af2950897e805408480c454c415d1eade4e670ec5fb507f5e5853726c7a SHA512 6d4c254a033a2e558574fb1aa95f6f3215a24d49d69cdb353f0186cac186eb1301563ab271ac86d82734dd1586d88fdd9d53f1c0e2b43f103aae53223884c153 WHIRLPOOL 2b5bfb3647cd802264716cc69ea0e7e26385b9b0db0610ea7078ba99a0a90dadc9197c49fa122cc8082a8edb166ad8f2d6be76e5b7491e786c74ce4aac91d472
+DIST glib-2.42.1.tar.xz 6985120 SHA256 8f3f0865280e45b8ce840e176ef83bcfd511148918cc8d39df2ee89b67dcf89a SHA512 0d273e3e24f164f16f6663f88866ae412714eab7d15c1901fdef61f13649a08f9962e49f9d52e8a1683100f9c2dcc468b9a5bf8a9b3d6ca7b0d9488bc58f3f1e WHIRLPOOL 5cf0dbce9890a61210f0c1c0b43a6147bfff107ee8d37de959fc533b56fa9e253d74996ed3ad05b2d756aecf65c1bd8cb1faaaa50096304df2b2f09d05b28804
 DIST pkg-config-0.28.tar.gz 1931203 SHA256 6b6eb31c6ec4421174578652c7e141fdaae2dabad1021f420d8713206ac1f845 SHA512 6eafa5ca77c5d44cd15f48457a5e96fcea2555b66d8e35ada5ab59864a0aa03d441e15f54ab9c6343693867b3b490f392c75b7d9312f024c9b7ec6a0194d8320 WHIRLPOOL db4ddb4ce61724e629931c5ffccb4d7a551b4dc0f4efed5a966822307e4b5a786adee5705dd80ec0a9aa32cb1af9ad9615e307360e131fc34688207216161486
 EBUILD glib-1.2.10-r5.ebuild 1798 SHA256 cd909db83fa60296981362cc664f8a7f4b5e61e4d68349eb26f1ca50a5ee4fc2 SHA512 69323669d8e22673ce71f3e66ac1039a4ef839a60a353f656b53173bdc18924af556aab3491484a1dbc8f51d88cb4be414674b7614ae064e5f911ceca8856660 WHIRLPOOL 3ac88961662ce80ea5d74a2823f08c9230a2bfccce27e8fb8dedf9b8a96ca5e1dcdc41cc58ffd0bee4f8d75d5f650648f090652773ff08ce42881414243a1f1a
 EBUILD glib-2.38.2-r1.ebuild 12085 SHA256 095b520464965b4be947bc68706c8573dc9751a39572376df3c3a0d67b1773b4 SHA512 00a953ac40457174d6d9562932f245acf4f236368f5ee01a3ec690f484e7d6732e2a9229f4cb8fdc2ff7e875ed1c880d509d9a0a306919f85b6f773b6efc822a WHIRLPOOL 0377f3c4f7bb45ee558be0ab1b0b8218dd549d6e711b2657beeccbc5420b5d9586084f6fa00cb5455252b4ecbdefc2eb5a17238a68e4bb78c7ad0ba6b14bb8de
-EBUILD glib-2.40.0-r1.ebuild 11809 SHA256 f4777997bc869b70352d7a3c3602a0d7427cc6251a1b1356d44d3c05732cd9cf SHA512 ff7fc83e0777197e0c89175316f0d383af3f6e019f7ba5ebf2a88cf05ac3178855855e5ac98a9c6f265031737d1da246c6ad68cde8ef828fb597f178d11c640b WHIRLPOOL 5361f67e1ecc5456c2550ab28565995ca116dac42f77ad9c2cd29b700d2181ead0b31097387f2f8a6adefbd2d8fc12ca45e588e8479fb8f233650c7556dd6cfa
-EBUILD glib-2.40.2.ebuild 11520 SHA256 5e98bfda8ca8fc93cc004a0ae6c33326b7d50973404f4e123fce31f3cccbda33 SHA512 2e6a9412ec9cecdee0af5e8e552c8c0c6392a9d8cf5d39e9119ef53cc79bdff8246bff75f4e1b803f46e034daa20a510886ccc45b11745b05be68fcb1002118b WHIRLPOOL f0559594d78e39c2eccff12f079bffe614e42418c795c98eeec16c5bfa42bf69e0009f4e73a183193c5d0d11ed3ed2170330e901760bbcf0531c14c5cd56a9e1
-MISC ChangeLog 91155 SHA256 5caca659977a757c5032d307db9485a43408f0138417fa86ac792abb604ae07d SHA512 68cd8343dd845fea6d27671f06148d7058d7914ed26d653e775de87065a49bd50392f4869bf7e549f7cc04e1eb0f39ee3c94228e3f9bd74929f601bf1c4ced6a WHIRLPOOL 80b06cc924ac54af553e411fffdb68c906f31f0ead49f87698764cf18db4283c58613d13b02cd73563110d267b14fe0ca0f02978f53b3e1f703d9dcef9cced6b
+EBUILD glib-2.40.0-r1.ebuild 11809 SHA256 9e62cda2539e3661d23e8c6f21e2b81b5b345ce6aae5600de4e4644d6cb47931 SHA512 fdb3ccbb2f57706ad973a0d20a0a403048f95f000dd449c06885caf682c63d822c6a844a02748c5631092fbd807b0044fd3c9fb23bb02079ed2f79c6de6fbe17 WHIRLPOOL ffa121a0302002226c84ec13f01ec2cb0d483b21f0f743958f580a586b1da82d21d60b984f92bb45d15d5bb2718b2fb6d27f57b8e5a6c9bad4d54f742cc4d878
+EBUILD glib-2.40.2.ebuild 11518 SHA256 e099343dccc28f3a65cf258bbf54959659a25848cf3886c42a6ce4aa70c51f10 SHA512 47a7cc99f7df8841994f5eefaa70d87ea63e13979e62a6b7b294595cf52311117079f7ac91c41532a58624cbeddf6c9404045ddf755e8082ab24dcc29e917a82 WHIRLPOOL 33019c0bd9de63a16f5b7779c18a91ce6608cebb7a28598af66ac404be65bbca336fe238f4db2eed2bdb74ac54dadb280bc908123a8075cc22f58f7571383ba1
+EBUILD glib-2.42.1.ebuild 11473 SHA256 b4306cec520b8e5c9954303e9dd85e59c84c58ea6febfee0b85415b114ce08b1 SHA512 1a1d5459cf5bc1bc0e68f1c3347c918a730a233f13990d79e2db71f8cb1550fa9dcacaf600a668ff4d1c68e3e570befaa02fb2d2e39a1244e1982dc1700db09c WHIRLPOOL f2c8eecd2e6b1bdffb1b2bf85e16cab13a1a7666da3ad4391580adfb1c562e51d421a999bedb2d27a95790afb30756cda9436a448195123dbf8c6692df2a468c
+MISC ChangeLog 91786 SHA256 f4641f34e1a08f9c8d74bc74969207ef51d89d80366e2317645f4192a5525d6a SHA512 556f6d3d504193e6e126c578d4f3e78bdb34eccd02cc6fc3f593c4a0b68ef996150a704540b7ae7f6f9dbddecf1b78b7f6199b17fa5c3342605fa9c8dabd8e97 WHIRLPOOL 91db812adde860863423a2717fe37e48c1292fe50ecdd9024a770b63bd21c7b128fbb53a796a3733fff526e1a4082ab2b86f39aa6c966e40308b351cdf66a45b
 MISC metadata.xml 692 SHA256 d46beb748667144ea36ba0b32f8f7c27ca0e10faec80809852cb81fb3b798e5f SHA512 db21e2d66d280757c98065433ebb66720db113ee70807c1e69c21b782dc8c9832981098ffedd962839089f174c8b0545de717d5cd2969b8e7ae4640a382a3de1 WHIRLPOOL 7fc05ab8e50cfe9904f3f97123a16fa7e6f051d45e7c6c2616b0254529864cb7b029a329bda8102bf01bfeef287215f6536caca9090e22e7b0c7c59af8994951
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlRAGKMACgkQX3X2B8XHTomBsgCePJRyZVeRFlVvF3F6mZzUxqch
-WjIAnR3XgcKjNNUb5Dar7oABQDLfC/4V
-=C6Tp
+iEYEAREIAAYFAlSi6acACgkQX3X2B8XHTokyEwCgiShdBSVJwwtCIYYfqvNGqBS0
+9ggAnjT9rDqUi463KDFAnNDex8kObW52
+=7lfq
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/glib/glib-2.40.0-r1.ebuild b/dev-libs/glib/glib-2.40.0-r1.ebuild
index b41294cb57..b1b0e3ef9b 100644
--- a/dev-libs/glib/glib-2.40.0-r1.ebuild
+++ b/dev-libs/glib/glib-2.40.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.40.0-r1.ebuild,v 1.13 2014/10/11 11:35:18 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.40.0-r1.ebuild,v 1.14 2014/10/27 01:54:36 vapier Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python2_{6,7} )
diff --git a/dev-libs/glib/glib-2.40.2.ebuild b/dev-libs/glib/glib-2.40.2.ebuild
index 1c73b0eaef..edfac385ed 100644
--- a/dev-libs/glib/glib-2.40.2.ebuild
+++ b/dev-libs/glib/glib-2.40.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.40.2.ebuild,v 1.1 2014/09/28 12:52:54 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.40.2.ebuild,v 1.5 2014/12/28 12:23:03 ago Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python2_{6,7} )
diff --git a/dev-libs/glib/glib-2.42.1.ebuild b/dev-libs/glib/glib-2.42.1.ebuild
new file mode 100644
index 0000000000..6badbe72e1
--- /dev/null
+++ b/dev-libs/glib/glib-2.42.1.ebuild
@@ -0,0 +1,324 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.42.1.ebuild,v 1.1 2014/12/14 22:37:29 eva Exp $
+
+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}
+	http://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz" # pkg.m4 for eautoreconf
+
+LICENSE="LGPL-2+"
+SLOT="2"
+IUSE="fam kernel_linux +mime selinux static-libs systemtap test utils xattr"
+REQUIRED_USE="
+	utils? ( ${PYTHON_REQUIRED_USE} )
+	test? ( ${PYTHON_REQUIRED_USE} )
+"
+
+KEYWORDS="~ppc-aix ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+
+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}]
+	kernel_linux? ( || (
+		>=dev-libs/elfutils-0.142
+		>=dev-libs/libelf-0.8.12
+		>=sys-freebsd/freebsd-lib-9.2_rc1
+		) )
+	selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] )
+	x86-interix? ( sys-libs/itx-bind )
+	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}] )
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20130224-r9
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	)
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	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
+# virtual/pkgconfig due to eautoreconf (and configure most likely) #479276
+
+PDEPEND="!<gnome-base/gvfs-1.6.4-r990
+	mime? ( x11-misc/shared-mime-info )
+"
+# shared-mime-info needed for gio/xdgmime, bug #409481
+# Earlier versions of gvfs do not work with glib
+
+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."
+			export IPV6_DISABLED="yes"
+		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
+
+	# patch avoids autoreconf necessity
+	epatch "${FILESDIR}"/${PN}-2.32.1-solaris-thread.patch
+
+	# Fix gmodule issues on fbsd; bug #184301, upstream bug #107626
+	# Upstream doesn't even know if this is needed, looks like openBSD
+	# people is not needing it
+	#epatch "${FILESDIR}"/${PN}-2.12.12-fbsd.patch
+
+	epatch "${FILESDIR}"/${PN}-2.39.2-aix.patch # more AIX buildtime fixes
+
+	if use test; then
+		# Do not try to remove files on live filesystem, upstream bug #619274
+		sed 's:^\(.*"/desktop-app-info/delete".*\):/*\1*/:' \
+			-i "${S}"/gio/tests/desktop-app-info.c || die "sed failed"
+
+		# 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 "/desktop-app-info\/default/d" gio/tests/desktop-app-info.c || die
+			sed -i -e "/desktop-app-info\/fallback/d" gio/tests/desktop-app-info.c || die
+			sed -i -e "/desktop-app-info\/lastused/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
+		if [[ -n "${IPV6_DISABLED}" ]]; then
+			sed -i -e "/socket\/ipv6_sync/d" gio/tests/socket.c || die
+			sed -i -e "/socket\/ipv6_async/d" gio/tests/socket.c || die
+			sed -i -e "/socket\/ipv6_v4mapped/d" gio/tests/socket.c || die
+		fi
+
+		# Test relies on /usr/bin/true, but we have /bin/true, upstream bug #698655
+		sed -i -e "s:/usr/bin/true:${EPREFIX}/bin/true:" gio/tests/desktop-app-info.c || die
+
+		# thread test fails, upstream bug #679306
+		epatch "${FILESDIR}/${PN}-2.34.0-testsuite-skip-thread4.patch"
+
+		# This test is prone to fail, bug #504024, upstream bug #723719
+		sed -i -e '/gdbus-close-pending/d' gio/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"
+
+	# leave python shebang alone
+	sed -e '/${PYTHON}/d' \
+		-i glib/Makefile.{am,in} || die
+
+	# Gentoo handles completions in a different directory
+	sed -i "s|^completiondir =.*|completiondir = $(get_bashcompdir)|" \
+		gio/Makefile.am || die
+
+	epatch_user
+
+	# make default sane for us
+	if use prefix ; then
+		sed -i -e "s:/usr/local:${EPREFIX}/usr:" gio/xdgmime/xdgmime.c || die
+		# bug #308609, without path, bug #314057
+		export PERL=perl
+	fi
+
+	# build glib with parity for native win32
+	if [[ ${CHOST} == *-winnt* ]] ; then
+		epatch "${FILESDIR}"/${PN}-2.18.3-winnt-lt2.patch
+		# makes the iconv check more general, needed for winnt, but could
+		# be useful for others too, requires eautoreconf
+		epatch "${FILESDIR}"/${PN}-2.18.3-iconv.patch
+		epatch "${FILESDIR}"/${PN}-2.20.5-winnt-exeext.patch
+#		AT_M4DIR="m4macros" eautoreconf
+	fi
+
+	if [[ ${CHOST} == *-interix* ]]; then
+		# activate the itx-bind package...
+		append-flags "-I${EPREFIX}/usr/include/bind"
+		append-libs "-L${EPREFIX}/usr/lib/bind"
+	fi
+
+	# 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${EPREFIX}/usr/include/dbus-1.0 -I${EPREFIX}/usr/$(get_libdir)/dbus-1.0/include"
+			export DBUS1_LIBS="-ldbus-1"
+		fi
+		export LIBFFI_CFLAGS="-I$(echo "${EPREFIX}"/usr/$(get_libdir)/libffi-*/include)"
+		export LIBFFI_LIBS="-lffi"
+	fi
+
+	local myconf
+
+	case "${CHOST}" in
+		*-mingw*) myconf="${myconf} --with-threads=win32" ;;
+		*)        myconf="${myconf} --with-threads=posix" ;;
+	esac
+
+	# non-glibc platforms use GNU libiconv, but configure needs to know about
+	# that not to get confused when it finds something outside the prefix too
+	if use !elibc_glibc ; then
+		myconf="${myconf} --with-libiconv=gnu"
+		# add the libdir for libtool, otherwise it'll make love with system
+		# installed libiconv. Automake passes LDFLAGS before local libs,
+		# add this to LIBS instead to come after local lib dirs.
+		append-libs "-L${EPREFIX}/usr/$(get_libdir)"
+	fi
+
+	[[ ${CHOST} == *-interix* ]] && {
+		export ac_cv_func_mmap_fixed_mapped=yes
+		export ac_cv_func_poll=no
+	}
+
+	local mythreads=posix
+	[[ ${CHOST} == *-winnt* ]] && mythreads=win32
+
+	# Only used by the gresource bin
+	multilib_is_native_abi || myconf="${myconf} --disable-libelf"
+
+	# Always use internal libpcre, bug #254659
+	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) \
+		--disable-compile-warnings \
+		--enable-man \
+		--with-pcre=internal \
+		--with-threads=${mythreads} \
+		--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() {
+	unset DBUS_SESSION_BUS_ADDRESS
+	export XDG_CONFIG_DIRS="${EPREFIX}"/etc/xdg
+	export XDG_DATA_DIRS="${EPREFIX}"/usr/local/share:"${EPREFIX}"/usr/share
+	export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp"
+	export XDG_DATA_HOME="${T}"
+	unset GSETTINGS_BACKEND # bug 352451
+	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
+}
+
+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_postinst() {
+	gnome2_pkg_postinst
+	if has_version '<x11-libs/gtk+-3.0.12:3'; then
+		# To have a clear upgrade path for gtk+-3.0.x users, have to resort to
+		# a warning instead of a blocker
+		ewarn
+		ewarn "Using <gtk+-3.0.12:3 with ${P} results in frequent crashes."
+		ewarn "You should upgrade to a newer version of gtk+:3 immediately."
+	fi
+}