[gentoo-commits] proj/gnome:gnome-next commit in: dev-libs/glib/

[gentoo-commits] proj/gnome:gnome-next commit in: dev-libs/glib/

[Alexandre Restovtsev]

commit:     e808372d1ebc8e74dc5d3f0be2a6390466d28290
Author:     Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Tue Aug 16 19:46:46 2011 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Tue Aug 16 19:46:46 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=e808372d

dev-libs/glib: 2.29.14 → 2.29.16

Version bump, adds lots of new API, including GTlsDatabase and GHmac.

---
 .../{glib-2.29.14.ebuild => glib-2.29.16.ebuild}   |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/dev-libs/glib/glib-2.29.14.ebuild b/dev-libs/glib/glib-2.29.16.ebuild
similarity index 99%
rename from dev-libs/glib/glib-2.29.14.ebuild
rename to dev-libs/glib/glib-2.29.16.ebuild
index 943c006..e169966 100644
--- a/dev-libs/glib/glib-2.29.14.ebuild
+++ b/dev-libs/glib/glib-2.29.16.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="3"
 GNOME_TARBALL_SUFFIX="xz"
-PYTHON_DEPEND="2"
+PYTHON_DEPEND="2:2.5"
 
 inherit autotools gnome.org libtool eutils flag-o-matic multilib pax-utils python virtualx
 if [[ ${PV} = 9999 ]]; then

[gentoo-commits] proj/gnome:gnome-next commit in: dev-libs/glib/

[Alexandre Restovtsev]

commit:     d49fe2573fb89f1ea80864edcdc5aff64efd3107
Author:     Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Wed Sep 28 23:44:00 2011 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Thu Sep 29 02:19:56 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=d49fe257

dev-libs/glib: fix tests (bug #384853)

Require python-2 to run tests, and disable tests that need pygobject and
dbus-python to prevent circular dependencies. Fixes bug #384853.

Also, hard disable the /gdbus/connection/life-cycle test, since it fails
around 1/3 of the time I try to run it.

---
 dev-libs/glib/glib-9999.ebuild |   26 ++++++++++++++++++++++++++
 1 files changed, 26 insertions(+), 0 deletions(-)

diff --git a/dev-libs/glib/glib-9999.ebuild b/dev-libs/glib/glib-9999.ebuild
index fcd1a7e..46f0e9d 100644
--- a/dev-libs/glib/glib-9999.ebuild
+++ b/dev-libs/glib/glib-9999.ebuild
@@ -5,6 +5,7 @@
 EAPI="4"
 
 inherit autotools gnome.org libtool eutils flag-o-matic multilib pax-utils virtualx
+# Do not inherit python.eclass to avoid python runtime dependency; #377549
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 fi
@@ -37,6 +38,7 @@ DEPEND="${RDEPEND}
 		~app-text/docbook-xml-dtd-4.1.2 )
 	systemtap? ( >=dev-util/systemtap-1.3 )
 	test? (
+		=dev-lang/python-2*
 		>=dev-util/gdbus-codegen-2.30.0
 		>=sys-apps/dbus-1.2.14 )
 	!<dev-util/gtk-doc-1.15-r2"
@@ -84,6 +86,27 @@ src_prepare() {
 			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
+
+		# Disable flaky gdbus/connection/life-cycle test; bug #384853
+		sed -i -e "/connection\/life-cycle/d" gio/tests/gdbus-connection.c || die
+
+		# Disable tests requiring dbus-python and pygobject; bugs #349236, #377549, #384853
+		if ! has_version dev-python/dbus-python || ! has_version 'dev-python/pygobject:2' ; then
+			ewarn "Some tests will be skipped due to dev-python/dbus-python or dev-python/pygobject:2"
+			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
+		else
+			# use python2 for the test server
+			sed -i -e 's:/usr/bin/env python$:/usr/bin/env python2:' gio/tests/gdbus-testserver.py || die
+		fi
 	fi
 
 	# gdbus-codegen is a separate package
@@ -92,6 +115,9 @@ src_prepare() {
 	# disable pyc compiling
 	ln -sfn $(type -P true) py-compile
 
+	# python2 needed for gtester-report
+	sed -e 's:/usr/bin/env python$:/usr/bin/env python2:' -i glib/gtester-report || die
+
 	# Needed for the punt-python-check patch, disabling timeout test
 	# Also needed to prevent croscompile failures, see bug #267603
 	# Also needed for the no-gdbus-codegen patch

[gentoo-commits] proj/gnome:gnome-next commit in: dev-libs/glib/

[Alexandre Restovtsev]

commit:     259ea03755a312fff9e9c41fbd2d75f5bc0e62c3
Author:     Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Wed Sep  7 20:23:22 2011 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Wed Sep  7 20:23:22 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=259ea037

dev-libs/glib: 2.29.18 → 2.29.90

Version bump. Includes several API changes (g_date_time_source_new() was
dropped, unix signal API was changed). Add a patch to fix a gsettings
threading bug.

---
 .../{glib-2.29.18.ebuild => glib-2.29.90.ebuild}   |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/dev-libs/glib/glib-2.29.18.ebuild b/dev-libs/glib/glib-2.29.90.ebuild
similarity index 98%
rename from dev-libs/glib/glib-2.29.18.ebuild
rename to dev-libs/glib/glib-2.29.90.ebuild
index d9a1261..f5ce828 100644
--- a/dev-libs/glib/glib-2.29.18.ebuild
+++ b/dev-libs/glib/glib-2.29.90.ebuild
@@ -58,6 +58,9 @@ src_prepare() {
 		fi
 	fi
 
+	# Fixes g_settings_apply threading bug; will be in next release
+	epatch "${FILESDIR}/${P}-gsettings-threading.patch"
+
 	# Don't fail gio tests when ran without userpriv, upstream bug 552912
 	# This is only a temporary workaround, remove as soon as possible
 	epatch "${FILESDIR}/${PN}-2.18.1-workaround-gio-test-failure-without-userpriv.patch"

[gentoo-commits] proj/gnome:gnome-next commit in: dev-libs/glib/

[Alexandre Restovtsev]

commit:     d7ac54f16acefd844d695536d14526eed0d73c2f
Author:     Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Sun Aug 14 20:42:23 2011 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Sun Aug 14 20:42:23 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=d7ac54f1

dev-libs/glib: sync with gx86 for bug 379115

Also, update python dependency for live version.

---
 dev-libs/glib/glib-2.29.14.ebuild |    5 +++--
 dev-libs/glib/glib-9999.ebuild    |    7 ++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/dev-libs/glib/glib-2.29.14.ebuild b/dev-libs/glib/glib-2.29.14.ebuild
index fdb4539..943c006 100644
--- a/dev-libs/glib/glib-2.29.14.ebuild
+++ b/dev-libs/glib/glib-2.29.14.ebuild
@@ -168,8 +168,9 @@ src_install() {
 	done
 	rm -rf "${ED}/etc"
 
-	# Redudant with pkg-config files in place
-	use static-libs || find "${ED}" -name '*.la' -exec rm -f {} +
+	# Completely useless with or without USE static-libs, people need to use
+	# pkg-config
+	find "${ED}" -name '*.la' -exec rm -f {} +
 }
 
 src_test() {

diff --git a/dev-libs/glib/glib-9999.ebuild b/dev-libs/glib/glib-9999.ebuild
index fdb4539..e169966 100644
--- a/dev-libs/glib/glib-9999.ebuild
+++ b/dev-libs/glib/glib-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="3"
 GNOME_TARBALL_SUFFIX="xz"
-PYTHON_DEPEND="2"
+PYTHON_DEPEND="2:2.5"
 
 inherit autotools gnome.org libtool eutils flag-o-matic multilib pax-utils python virtualx
 if [[ ${PV} = 9999 ]]; then
@@ -168,8 +168,9 @@ src_install() {
 	done
 	rm -rf "${ED}/etc"
 
-	# Redudant with pkg-config files in place
-	use static-libs || find "${ED}" -name '*.la' -exec rm -f {} +
+	# Completely useless with or without USE static-libs, people need to use
+	# pkg-config
+	find "${ED}" -name '*.la' -exec rm -f {} +
 }
 
 src_test() {

[gentoo-commits] proj/gnome:gnome-next commit in: dev-libs/glib/

[Alexandre Restovtsev]

commit:     38d7c10aea0f1285f0b17520765f4f478cb51ca5
Author:     Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Sat Aug 13 18:40:24 2011 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Sat Aug 13 18:40:24 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=38d7c10a

dev-libs/glib: sync with gx86, update gtk+ warning

Apply the following change from gx86:

 Wed Aug 10 20:07:52 2011 UTC by ssuominen

 Fix circular depend with USE="test" and dev-util/pkgconfig. Remove
 libtool files.

However, we do not want to remove .la files when USE=static-libs.

Also, adjust the gtk+ incompatibility warning, since gtk+-3.0.12
includes the glib-2.29.12 compatibility patch.

---
 dev-libs/glib/glib-2.29.14.ebuild |   18 +++++++++++++-----
 dev-libs/glib/glib-9999.ebuild    |   18 +++++++++++++-----
 2 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/dev-libs/glib/glib-2.29.14.ebuild b/dev-libs/glib/glib-2.29.14.ebuild
index 18d9d7f..fdb4539 100644
--- a/dev-libs/glib/glib-2.29.14.ebuild
+++ b/dev-libs/glib/glib-2.29.14.ebuild
@@ -38,8 +38,7 @@ DEPEND="${RDEPEND}
 		>=dev-util/gtk-doc-1.15
 		~app-text/docbook-xml-dtd-4.1.2 )
 	systemtap? ( >=dev-util/systemtap-1.3 )
-	test? ( dev-util/pkgconfig
-		>=sys-apps/dbus-1.2.14 )
+	test? ( >=sys-apps/dbus-1.2.14 )
 	!<dev-util/gtk-doc-1.15-r2"
 PDEPEND="introspection? ( dev-libs/gobject-introspection )
 	!<gnome-base/gvfs-1.6.4-r990" # Earlier versions do not work with glib
@@ -120,6 +119,12 @@ src_prepare() {
 }
 
 src_configure() {
+	# Avoid circular depend with dev-util/pkgconfig
+	if ! has_version dev-util/pkgconfig; then
+		export DBUS1_CFLAGS="-I/usr/include/dbus-1.0 -I/usr/$(get_libdir)/dbus-1.0/include"
+		export DBUS1_LIBS="-ldbus-1"
+	fi
+
 	local myconf
 
 	# Building with --disable-debug highly unrecommended.  It will build glib in
@@ -162,6 +167,9 @@ src_install() {
 		newins "${ED}/etc/bash_completion.d/${f}-bash-completion.sh" ${f} || die
 	done
 	rm -rf "${ED}/etc"
+
+	# Redudant with pkg-config files in place
+	use static-libs || find "${ED}" -name '*.la' -exec rm -f {} +
 }
 
 src_test() {
@@ -206,12 +214,12 @@ pkg_postinst() {
 		ewarn "rebuilding dev-libs/dbus-glib"
 	fi
 
-	if has_version '<x11-libs/gtk+-3.1.8-r1:3'; then
+	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.x with ${P} results in frequent crashes."
-		ewarn "You should upgrade to >=gtk+-3.1.8-r1 immediately."
+		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
 
 	python_need_rebuild

diff --git a/dev-libs/glib/glib-9999.ebuild b/dev-libs/glib/glib-9999.ebuild
index 18d9d7f..fdb4539 100644
--- a/dev-libs/glib/glib-9999.ebuild
+++ b/dev-libs/glib/glib-9999.ebuild
@@ -38,8 +38,7 @@ DEPEND="${RDEPEND}
 		>=dev-util/gtk-doc-1.15
 		~app-text/docbook-xml-dtd-4.1.2 )
 	systemtap? ( >=dev-util/systemtap-1.3 )
-	test? ( dev-util/pkgconfig
-		>=sys-apps/dbus-1.2.14 )
+	test? ( >=sys-apps/dbus-1.2.14 )
 	!<dev-util/gtk-doc-1.15-r2"
 PDEPEND="introspection? ( dev-libs/gobject-introspection )
 	!<gnome-base/gvfs-1.6.4-r990" # Earlier versions do not work with glib
@@ -120,6 +119,12 @@ src_prepare() {
 }
 
 src_configure() {
+	# Avoid circular depend with dev-util/pkgconfig
+	if ! has_version dev-util/pkgconfig; then
+		export DBUS1_CFLAGS="-I/usr/include/dbus-1.0 -I/usr/$(get_libdir)/dbus-1.0/include"
+		export DBUS1_LIBS="-ldbus-1"
+	fi
+
 	local myconf
 
 	# Building with --disable-debug highly unrecommended.  It will build glib in
@@ -162,6 +167,9 @@ src_install() {
 		newins "${ED}/etc/bash_completion.d/${f}-bash-completion.sh" ${f} || die
 	done
 	rm -rf "${ED}/etc"
+
+	# Redudant with pkg-config files in place
+	use static-libs || find "${ED}" -name '*.la' -exec rm -f {} +
 }
 
 src_test() {
@@ -206,12 +214,12 @@ pkg_postinst() {
 		ewarn "rebuilding dev-libs/dbus-glib"
 	fi
 
-	if has_version '<x11-libs/gtk+-3.1.8-r1:3'; then
+	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.x with ${P} results in frequent crashes."
-		ewarn "You should upgrade to >=gtk+-3.1.8-r1 immediately."
+		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
 
 	python_need_rebuild

[gentoo-commits] proj/gnome:gnome-next commit in: dev-libs/glib/

[Alexandre Restovtsev]

commit:     0a7f0154b14d611de22253599461f9253e89728b
Author:     Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Fri Jul 22 08:32:55 2011 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Fri Jul 22 08:32:55 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=0a7f0154

dev-libs/glib: 2.29.12 → 2.29.14

Version bump with numerous improvements. Also, fix the gtk+ warning
message to take slots into account.

---
 .../{glib-2.29.12.ebuild => glib-2.29.14.ebuild}   |    2 +-
 dev-libs/glib/glib-9999.ebuild                     |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-libs/glib/glib-2.29.12.ebuild b/dev-libs/glib/glib-2.29.14.ebuild
similarity index 99%
rename from dev-libs/glib/glib-2.29.12.ebuild
rename to dev-libs/glib/glib-2.29.14.ebuild
index ed567bd..18d9d7f 100644
--- a/dev-libs/glib/glib-2.29.12.ebuild
+++ b/dev-libs/glib/glib-2.29.14.ebuild
@@ -206,7 +206,7 @@ pkg_postinst() {
 		ewarn "rebuilding dev-libs/dbus-glib"
 	fi
 
-	if has_version '<x11-libs/gtk+-3.1.8-r1'; then
+	if has_version '<x11-libs/gtk+-3.1.8-r1: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

diff --git a/dev-libs/glib/glib-9999.ebuild b/dev-libs/glib/glib-9999.ebuild
index ed567bd..18d9d7f 100644
--- a/dev-libs/glib/glib-9999.ebuild
+++ b/dev-libs/glib/glib-9999.ebuild
@@ -206,7 +206,7 @@ pkg_postinst() {
 		ewarn "rebuilding dev-libs/dbus-glib"
 	fi
 
-	if has_version '<x11-libs/gtk+-3.1.8-r1'; then
+	if has_version '<x11-libs/gtk+-3.1.8-r1: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

[gentoo-commits] proj/gnome:gnome-next commit in: dev-libs/glib/

[Alexandre Restovtsev]

commit:     b95addad546b3bb4d08f75a3c25fe69de638c2a0
Author:     Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Thu Jul 21 00:14:21 2011 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Thu Jul 21 00:14:21 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=b95addad

dev-libs/glib: add warning about gtk+-3.0.x incompatibility.

Unfortunately, to have an upgrade path from glib-2.28.x+gtk+-3.0.x to
glib-2.29.x+gtk+-3.1.x, this will have to be a warning instead of a
blocker.

---
 dev-libs/glib/glib-2.29.12.ebuild |    9 ++++++++-
 dev-libs/glib/glib-9999.ebuild    |    9 ++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/dev-libs/glib/glib-2.29.12.ebuild b/dev-libs/glib/glib-2.29.12.ebuild
index a41a8ff..ed567bd 100644
--- a/dev-libs/glib/glib-2.29.12.ebuild
+++ b/dev-libs/glib/glib-2.29.12.ebuild
@@ -206,9 +206,16 @@ pkg_postinst() {
 		ewarn "rebuilding dev-libs/dbus-glib"
 	fi
 
+	if has_version '<x11-libs/gtk+-3.1.8-r1'; 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.x with ${P} results in frequent crashes."
+		ewarn "You should upgrade to >=gtk+-3.1.8-r1 immediately."
+	fi
+
 	python_need_rebuild
 	python_mod_optimize /usr/$(get_libdir)/gdbus-codegen
-
 }
 
 pkg_postrm() {

diff --git a/dev-libs/glib/glib-9999.ebuild b/dev-libs/glib/glib-9999.ebuild
index a41a8ff..ed567bd 100644
--- a/dev-libs/glib/glib-9999.ebuild
+++ b/dev-libs/glib/glib-9999.ebuild
@@ -206,9 +206,16 @@ pkg_postinst() {
 		ewarn "rebuilding dev-libs/dbus-glib"
 	fi
 
+	if has_version '<x11-libs/gtk+-3.1.8-r1'; 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.x with ${P} results in frequent crashes."
+		ewarn "You should upgrade to >=gtk+-3.1.8-r1 immediately."
+	fi
+
 	python_need_rebuild
 	python_mod_optimize /usr/$(get_libdir)/gdbus-codegen
-
 }
 
 pkg_postrm() {

[gentoo-commits] proj/gnome:gnome-next commit in: dev-libs/glib/

[Alexandre Restovtsev]

commit:     7c96df8ca4b9f4de006a8fb751509ab6bf7162f1
Author:     Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Wed Jul 20 16:07:43 2011 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Wed Jul 20 16:07:43 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=7c96df8c

dev-libs/glib: 2.29.10 → 2.29.12

Version bump with a new API for atomic unicode composition.

---
 .../{glib-2.29.10.ebuild => glib-2.29.12.ebuild}   |    0
 1 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/dev-libs/glib/glib-2.29.10.ebuild b/dev-libs/glib/glib-2.29.12.ebuild
similarity index 100%
rename from dev-libs/glib/glib-2.29.10.ebuild
rename to dev-libs/glib/glib-2.29.12.ebuild

[gentoo-commits] proj/gnome:gnome-next commit in: dev-libs/glib/

[Alexandre Restovtsev]

commit:     37fd3748c8a3605481ecb918113a7964e4ce0701
Author:     Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Wed Jul  6 17:53:30 2011 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Wed Jul  6 17:56:47 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=37fd3748

dev-libs/glib: 2.29.8 → 2.29.10

Version bump with lots of changes. Add test disabling changes from gx86.
Add systemtap support. Properly handle the gdbus-codegen python code.

---
 .../{glib-2.29.8.ebuild => glib-2.29.10.ebuild}    |   73 ++++++++++++--------
 dev-libs/glib/glib-9999.ebuild                     |   73 ++++++++++++--------
 2 files changed, 86 insertions(+), 60 deletions(-)

diff --git a/dev-libs/glib/glib-2.29.8.ebuild b/dev-libs/glib/glib-2.29.10.ebuild
similarity index 70%
rename from dev-libs/glib/glib-2.29.8.ebuild
rename to dev-libs/glib/glib-2.29.10.ebuild
index 514df69..a41a8ff 100644
--- a/dev-libs/glib/glib-2.29.8.ebuild
+++ b/dev-libs/glib/glib-2.29.10.ebuild
@@ -6,7 +6,7 @@ EAPI="3"
 GNOME_TARBALL_SUFFIX="xz"
 PYTHON_DEPEND="2"
 
-inherit autotools gnome.org libtool eutils flag-o-matic pax-utils python virtualx
+inherit autotools gnome.org libtool eutils flag-o-matic multilib pax-utils python virtualx
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 fi
@@ -18,7 +18,7 @@ SRC_URI="${SRC_URI}
 
 LICENSE="LGPL-2"
 SLOT="2"
-IUSE="debug doc fam +introspection selinux +static-libs test xattr"
+IUSE="debug doc fam +introspection selinux +static-libs systemtap test xattr"
 if [[ ${PV} = 9999 ]]; then
 	KEYWORDS=""
 else
@@ -37,6 +37,7 @@ DEPEND="${RDEPEND}
 		>=dev-libs/libxslt-1.0
 		>=dev-util/gtk-doc-1.15
 		~app-text/docbook-xml-dtd-4.1.2 )
+	systemtap? ( >=dev-util/systemtap-1.3 )
 	test? ( dev-util/pkgconfig
 		>=sys-apps/dbus-1.2.14 )
 	!<dev-util/gtk-doc-1.15-r2"
@@ -76,35 +77,39 @@ src_prepare() {
 	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
-	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
-
-	# Disable tests requiring dev-python/dbus-python, bug #349236
-	if ! has_version dev-python/dbus-python ; then
-		ewarn "Some tests will be skipped due dev-python/dbus-python not being present on your system,"
-		ewarn "think on installing it 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\/bus-watch-name/d" gio/tests/gdbus-names.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 "/gdbus\/method-calls-in-thread/d" gio/tests/gdbus-threading.c || die
-	fi
-
 	if ! use test; then
 		# don't waste time building tests
-		sed 's/^\(SUBDIRS =.*\)tests\(.*\)$/\1\2/' -i Makefile.am Makefile.in \
-			|| die "sed failed"
+		sed 's/^\(.*\SUBDIRS .*\=.*\)tests\(.*\)$/\1\2/' -i $(find . -name Makefile.am -o -name Makefile.in) || die
+	else
+		# Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629
+		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
+
+		# Disable tests requiring dev-python/dbus-python, bug #349236
+		if ! has_version dev-python/dbus-python ; then
+			ewarn "Some tests will be skipped due dev-python/dbus-python not being present on your system,"
+			ewarn "think on installing it 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\/bus-watch-name/d" gio/tests/gdbus-names.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 "/gdbus\/method-calls-in-thread/d" gio/tests/gdbus-threading.c || die
+		fi
 	fi
 
+	python_convert_shebangs -r 2 gio/gdbus-codegen/
+
+	# disable pyc compiling
+	ln -sfn $(type -P true) py-compile
+
 	# Needed for the punt-python-check patch, disabling timeout test
 	# Also needed to prevent croscompile failures, see bug #267603
 	AT_M4DIR="${WORKDIR}" eautoreconf
@@ -131,11 +136,11 @@ src_configure() {
 		$(use_enable fam) \
 		$(use_enable selinux) \
 		$(use_enable static-libs static) \
+		$(use_enable systemtap dtrace) \
+		$(use_enable systemtap systemtap) \
 		--enable-regex \
 		--with-pcre=internal \
-		--with-threads=posix \
-		--disable-dtrace \
-		--disable-systemtap
+		--with-threads=posix
 }
 
 src_install() {
@@ -200,4 +205,12 @@ pkg_postinst() {
 		ewarn "If you experience a breakage after updating dev-libs/glib try"
 		ewarn "rebuilding dev-libs/dbus-glib"
 	fi
+
+	python_need_rebuild
+	python_mod_optimize /usr/$(get_libdir)/gdbus-codegen
+
+}
+
+pkg_postrm() {
+	python_mod_cleanup /usr/$(get_libdir)/gdbus-codegen
 }

diff --git a/dev-libs/glib/glib-9999.ebuild b/dev-libs/glib/glib-9999.ebuild
index 514df69..a41a8ff 100644
--- a/dev-libs/glib/glib-9999.ebuild
+++ b/dev-libs/glib/glib-9999.ebuild
@@ -6,7 +6,7 @@ EAPI="3"
 GNOME_TARBALL_SUFFIX="xz"
 PYTHON_DEPEND="2"
 
-inherit autotools gnome.org libtool eutils flag-o-matic pax-utils python virtualx
+inherit autotools gnome.org libtool eutils flag-o-matic multilib pax-utils python virtualx
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 fi
@@ -18,7 +18,7 @@ SRC_URI="${SRC_URI}
 
 LICENSE="LGPL-2"
 SLOT="2"
-IUSE="debug doc fam +introspection selinux +static-libs test xattr"
+IUSE="debug doc fam +introspection selinux +static-libs systemtap test xattr"
 if [[ ${PV} = 9999 ]]; then
 	KEYWORDS=""
 else
@@ -37,6 +37,7 @@ DEPEND="${RDEPEND}
 		>=dev-libs/libxslt-1.0
 		>=dev-util/gtk-doc-1.15
 		~app-text/docbook-xml-dtd-4.1.2 )
+	systemtap? ( >=dev-util/systemtap-1.3 )
 	test? ( dev-util/pkgconfig
 		>=sys-apps/dbus-1.2.14 )
 	!<dev-util/gtk-doc-1.15-r2"
@@ -76,35 +77,39 @@ src_prepare() {
 	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
-	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
-
-	# Disable tests requiring dev-python/dbus-python, bug #349236
-	if ! has_version dev-python/dbus-python ; then
-		ewarn "Some tests will be skipped due dev-python/dbus-python not being present on your system,"
-		ewarn "think on installing it 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\/bus-watch-name/d" gio/tests/gdbus-names.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 "/gdbus\/method-calls-in-thread/d" gio/tests/gdbus-threading.c || die
-	fi
-
 	if ! use test; then
 		# don't waste time building tests
-		sed 's/^\(SUBDIRS =.*\)tests\(.*\)$/\1\2/' -i Makefile.am Makefile.in \
-			|| die "sed failed"
+		sed 's/^\(.*\SUBDIRS .*\=.*\)tests\(.*\)$/\1\2/' -i $(find . -name Makefile.am -o -name Makefile.in) || die
+	else
+		# Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629
+		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
+
+		# Disable tests requiring dev-python/dbus-python, bug #349236
+		if ! has_version dev-python/dbus-python ; then
+			ewarn "Some tests will be skipped due dev-python/dbus-python not being present on your system,"
+			ewarn "think on installing it 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\/bus-watch-name/d" gio/tests/gdbus-names.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 "/gdbus\/method-calls-in-thread/d" gio/tests/gdbus-threading.c || die
+		fi
 	fi
 
+	python_convert_shebangs -r 2 gio/gdbus-codegen/
+
+	# disable pyc compiling
+	ln -sfn $(type -P true) py-compile
+
 	# Needed for the punt-python-check patch, disabling timeout test
 	# Also needed to prevent croscompile failures, see bug #267603
 	AT_M4DIR="${WORKDIR}" eautoreconf
@@ -131,11 +136,11 @@ src_configure() {
 		$(use_enable fam) \
 		$(use_enable selinux) \
 		$(use_enable static-libs static) \
+		$(use_enable systemtap dtrace) \
+		$(use_enable systemtap systemtap) \
 		--enable-regex \
 		--with-pcre=internal \
-		--with-threads=posix \
-		--disable-dtrace \
-		--disable-systemtap
+		--with-threads=posix
 }
 
 src_install() {
@@ -200,4 +205,12 @@ pkg_postinst() {
 		ewarn "If you experience a breakage after updating dev-libs/glib try"
 		ewarn "rebuilding dev-libs/dbus-glib"
 	fi
+
+	python_need_rebuild
+	python_mod_optimize /usr/$(get_libdir)/gdbus-codegen
+
+}
+
+pkg_postrm() {
+	python_mod_cleanup /usr/$(get_libdir)/gdbus-codegen
 }