Version bump for Gnome 3.14.

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xC6085806

3 files changed, 285 insertions, 5 deletions

diff --git a/dev-libs/glib/ChangeLog b/dev-libs/glib/ChangeLog
index 6b44d46cab72..d0114fa20a04 100644
--- a/dev-libs/glib/ChangeLog
+++ b/dev-libs/glib/ChangeLog
@@ -1,6 +1,11 @@
 # 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.626 2014/12/12 11:47:17 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.627 2014/12/14 22:37:29 eva Exp $
+
+*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).
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index 1da11e78d9b8..3fafcda2ce14 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -18,17 +18,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 1802 SHA256 b8561be2cdbe967604c39b6316bee46016e62131e9858d26fb26d8f1699c2029 SHA512 d2c84ba968f81bc851f53fbf1bad01f62de58f16dc49565e341bf7e9396b5f8870501de2027d5b49c5dcd2a8416dca6f530a34491c63ccb26ab94aeafea442ba WHIRLPOOL 1fd9b784429c287fa5dbb4e20db42dd9e1f67cc03ac60c7d47fb751878ed827f2791a2bd6622d84773a4a4607c190a671cef6a6d9b7a61943bf12b7b0e1d6b45
 EBUILD glib-2.38.2-r1.ebuild 10136 SHA256 e276186ee74001eb75dd8b300a04395446034279ea30f81d4a9c3c60a3938b1d SHA512 30edcf3a44987b941451b0f0e24bb3d08aa2a233315a4bb02135c109aa334c9db8420a0739bc92aeecbe8d90478caff24deea3d30ceb661189dad6f20406afbc WHIRLPOOL 44f83bb6b1581a64c4037528c3c26e86661efbd07843ca887174c70de76c3a0ffc9ad5091a5604a30df86000da09808ce80bfbfa8c420c17cfe5fdd2e41f413a
 EBUILD glib-2.40.0-r1.ebuild 10046 SHA256 dffa65f057a95a6fabf9330e7ae025fd4b0d84b2e6b889547c9d7370b9d030fd SHA512 74d9ee1e22b2dad5442f143c91e2310f20dcb0d0e1e20571331e9b63287de64b64ceb7b47aaeaa7e8ad98059ed93187b56ee67f893ff40af5ec193483d3bdc94 WHIRLPOOL 1f8656d4ab290a4b40c892ddd17bfd4f36e9e6de0d1fc6d6d6c04c69f38f92db2395ef6cf1ef66ddcfaceeddcfa2419f661cd04786afdac1b39cc76ce15d5bba
 EBUILD glib-2.40.2.ebuild 9630 SHA256 f8d68139efb3504aa61d8ba6820bdf0d781830eaf5e9f0a3f67688ed8037aa0d SHA512 7ea222ed07ae70aa3c1ae33d0b8c9878761158a51ca2804dfb85ef89a16e08435f6c6ed2b9e3db7a19d2e7896ab3723fe8986565a35baef0b283547ab0d22ecc WHIRLPOOL e258ea0f061b241218711121c0afb683dda6931f7bc6d536114d9089e733fb410699a33374a95e7d106bd302f47dcdb7da5ca108e4f91e6994c10e59cbce1fca
-MISC ChangeLog 87998 SHA256 c93b370ca91c50f5eddb31207fc64becd3ab97aaa0e943a592312ce9f99b8ca4 SHA512 171cc67af29fd0f6b9a333d6f74c76a712b369a164c03b292fb812902cf8e1f080550f797457b5082ca63f072ec2cf1bf18b477adace670934840e3f190d06d1 WHIRLPOOL 70cda655df327818f65b4c9a62055e7360ec898eb55bdbb189cb32605b1a8ab809c55b44d47aa848b9a60edc1671602a7ddc5501d2a63d3fcc21e30cd006420c
+EBUILD glib-2.42.1.ebuild 9586 SHA256 7755e45404e62a40ffd8baa73acca26d791d3f9504b3539c4a8c2867ef0276e9 SHA512 84704160193d3302bf9d40a85dfae731865664d2563c0118756aa1d60f2b70830e3230e4067df2ff77ca3a32acf1e25fcc744773231a45406d6e365d7c51698e WHIRLPOOL 5bc2b06a633e77296bc537b349331a67c92b660d1919c49689233b3aa8ed8e7508fb3f13d732d01c8f6d7ebced45012273cc79384515be517ca8dcfb9ec3c999
+MISC ChangeLog 88133 SHA256 eb6763b54183fdfdd1e0e3b56da7782ad06fc0c1e93b0ac1c92879b63754335b SHA512 dcf57c67c0e93e6760f0f2b8489b609f747395e961581df247f85a5f6d86c15b37382c4724b5b37add98ec61f36885871498ddfb6e15f6f5be420907fd80c1e4 WHIRLPOOL 18703f008c96a352807c9082430dbcb36f095e308a79f96d72f2ec781fc477450e2cd24c1f738b9ce3a6431e5c023e51376e5f82241fd5a5e01edbf4516669a9
 MISC metadata.xml 692 SHA256 d46beb748667144ea36ba0b32f8f7c27ca0e10faec80809852cb81fb3b798e5f SHA512 db21e2d66d280757c98065433ebb66720db113ee70807c1e69c21b782dc8c9832981098ffedd962839089f174c8b0545de717d5cd2969b8e7ae4640a382a3de1 WHIRLPOOL 7fc05ab8e50cfe9904f3f97123a16fa7e6f051d45e7c6c2616b0254529864cb7b029a329bda8102bf01bfeef287215f6536caca9090e22e7b0c7c59af8994951
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlSK1cYACgkQVWmRsqeSphOpVQCfeLj7W0/aF2dHiCOuyOkfInHd
-7E8AmwaJU1Cn8fYBeK2N0kS/bIyAPu2h
-=4zk0
+iEYEAREIAAYFAlSOESoACgkQ1fmVwcYIWAYL4wCbBEHeRvSwZqcRqaOiol1BWK1F
+m84AoN4YJaubRksTRkxfBUQDojniAxdV
+=Pi07
 -----END PGP SIGNATURE-----
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 000000000000..f82b25a5760d
--- /dev/null
+++ b/dev-libs/glib/glib-2.42.1.ebuild
@@ -0,0 +1,273 @@
+# 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="~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}]
+	|| (
+		>=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}] )
+	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}
+	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
+	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
+
+	# 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
+
+	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:/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
+
+	# 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
+
+	local myconf
+
+	case "${CHOST}" in
+		*-mingw*) myconf="${myconf} --with-threads=win32" ;;
+		*)        myconf="${myconf} --with-threads=posix" ;;
+	esac
+
+	# 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-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=/etc/xdg
+	export XDG_DATA_DIRS=/usr/local/share:/usr/share
+	export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp"
+	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
+}