[gentoo-commits] proj/gnome:master commit in: dev-libs/glib/files/, dev-libs/glib/

["Alexandre Restovtsev" <tetromino@gmail.com>]

commit:     30b674018829b9b8404ddee6d091d8deda6851d6
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Thu May 24 07:25:24 2012 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Thu May 24 07:32:51 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=30b67401

sys-devel/gcc: update

Requested by Sholy. There is now a configure switch for disabling tests.
Drop ancient ia64 patch (does not apply, and should not be needed for
current stable versions of gcc on ia64). Drop assert-test-failure patch
(fixed upstream).

---
 .../glib/files/glib-2.10.3-ia64-atomic-ops.patch   |   39 --------------------
 dev-libs/glib/glib-9999.ebuild                     |   25 ++-----------
 2 files changed, 3 insertions(+), 61 deletions(-)

diff --git a/dev-libs/glib/files/glib-2.10.3-ia64-atomic-ops.patch b/dev-libs/glib/files/glib-2.10.3-ia64-atomic-ops.patch
deleted file mode 100644
index 0859e33..0000000
--- a/dev-libs/glib/files/glib-2.10.3-ia64-atomic-ops.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From Debian, this one is needed for gcc < 4.1...
-
---- glib-2.10.0/glib/gatomic.c	2006-02-24 14:02:51.000000000 +0000
-+++ glib-2.10.0/glib/gatomic.c	2006-03-06 18:12:06.000000000 +0000
-@@ -414,14 +414,14 @@
- g_atomic_int_exchange_and_add (volatile gint *atomic,
- 			       gint           val)
- {
--  return __sync_fetch_and_add (atomic, val);
-+  return __sync_fetch_and_add_si (atomic, val);
- }
-  
- void
- g_atomic_int_add (volatile gint *atomic, 
- 		  gint val)
- {
--  __sync_fetch_and_add (atomic, val);
-+  __sync_fetch_and_add_si (atomic, val);
- }
- 
- gboolean
-@@ -429,7 +429,7 @@
- 				   gint           oldval, 
- 				   gint           newval)
- {
--  return __sync_bool_compare_and_swap (atomic, oldval, newval);
-+  return __sync_bool_compare_and_swap_si (atomic, oldval, newval);
- }
- 
- gboolean
-@@ -437,7 +437,7 @@
- 				       gpointer           oldval, 
- 				       gpointer           newval)
- {
--  return __sync_bool_compare_and_swap ((long *)atomic, 
-+  return __sync_bool_compare_and_swap_di ((long *)atomic, 
- 				       (long)oldval, (long)newval);
- }
- 

diff --git a/dev-libs/glib/glib-9999.ebuild b/dev-libs/glib/glib-9999.ebuild
index ac3895a..73676d1 100644
--- a/dev-libs/glib/glib-9999.ebuild
+++ b/dev-libs/glib/glib-9999.ebuild
@@ -39,7 +39,7 @@ DEPEND="${RDEPEND}
 		>=dev-libs/libxslt-1.0
 		>=dev-util/gdbus-codegen-${PV}
 		>=dev-util/gtk-doc-1.15
-		~app-text/docbook-xml-dtd-4.1.2 )
+		app-text/docbook-xml-dtd:4.1.2 )
 	systemtap? ( >=dev-util/systemtap-1.3 )
 	test? (
 		sys-devel/gdb
@@ -69,34 +69,14 @@ src_prepare() {
 	[[ ${PV} = 9999 ]] && gnome2-live_src_prepare
 	mv -vf "${WORKDIR}"/pkg-config-*/pkg.m4 "${WORKDIR}"/ || die
 
-	if use ia64 ; then
-		# Only apply for < 4.1
-		local major=$(gcc-major-version)
-		local minor=$(gcc-minor-version)
-		if (( major < 4 || ( major == 4 && minor == 0 ) )); then
-			epatch "${FILESDIR}/glib-2.10.3-ia64-atomic-ops.patch"
-		fi
-	fi
-
-	# 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"
-
 	# Fix gmodule issues on fbsd; bug #184301
 	epatch "${FILESDIR}"/${PN}-2.12.12-fbsd.patch
 
-	# Fix test failure during upgrades, upstream bug 621368
-	epatch "${FILESDIR}/${PN}-2.31-assert-test-failure.patch"
-
 	# 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"
 
-	# need to build tests if USE=doc for bug #387385
-	if ! use test && ! use doc; then
-		# don't waste time building tests
-		sed 's/^\(.*\SUBDIRS .*\=.*\)tests\(.*\)$/\1\2/' -i $(find . -name Makefile.am -o -name Makefile.in) || die
-	else
+	if use test; then
 		# 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,"
@@ -170,6 +150,7 @@ src_configure() {
 		$(use_enable static-libs static) \
 		$(use_enable systemtap dtrace) \
 		$(use_enable systemtap systemtap) \
+		$(use_enable test modular-tests) \
 		--with-pcre=internal \
 		--with-threads=posix
 }