From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org)
	by finch.gentoo.org with esmtp (Exim 4.60)
	(envelope-from <gentoo-commits+bounces-372185-garchives=archives.gentoo.org@lists.gentoo.org>)
	id 1QsJxh-00044a-BR
	for garchives@archives.gentoo.org; Sat, 13 Aug 2011 19:33:37 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 5946321C0A8;
	Sat, 13 Aug 2011 19:33:29 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	by pigeon.gentoo.org (Postfix) with ESMTP id 1BA9821C0A8
	for <gentoo-commits@lists.gentoo.org>; Sat, 13 Aug 2011 19:33:28 +0000 (UTC)
Received: from pelican.gentoo.org (unknown [66.219.59.40])
	(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 645D01B4039
	for <gentoo-commits@lists.gentoo.org>; Sat, 13 Aug 2011 19:33:28 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
	by pelican.gentoo.org (Postfix) with ESMTP id 8513480040
	for <gentoo-commits@lists.gentoo.org>; Sat, 13 Aug 2011 19:33:27 +0000 (UTC)
From: "Alexandre Restovtsev" <tetromino@gmail.com>
To: gentoo-commits@lists.gentoo.org
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Alexandre Restovtsev" <tetromino@gmail.com>
Message-ID: <38d7c10aea0f1285f0b17520765f4f478cb51ca5.tetromino@gentoo>
Subject: [gentoo-commits] proj/gnome:gnome-next commit in: dev-libs/glib/
X-VCS-Repository: proj/gnome
X-VCS-Files: dev-libs/glib/glib-2.29.14.ebuild dev-libs/glib/glib-9999.ebuild
X-VCS-Directories: dev-libs/glib/
X-VCS-Committer: tetromino
X-VCS-Committer-Name: Alexandre Restovtsev
X-VCS-Revision: 38d7c10aea0f1285f0b17520765f4f478cb51ca5
Date: Sat, 13 Aug 2011 19:33:27 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: quoted-printable
X-Archives-Salt: 
X-Archives-Hash: 3184e20bfdf4b023a96c9d637a97774d

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=3Dproj/gnome.git;a=3D=
commit;h=3D38d7c10a

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=3D"test" and dev-util/pkgconfig. Remove
 libtool files.

However, we do not want to remove .la files when USE=3Dstatic-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=3D"${RDEPEND}
 		>=3Ddev-util/gtk-doc-1.15
 		~app-text/docbook-xml-dtd-4.1.2 )
 	systemtap? ( >=3Ddev-util/systemtap-1.3 )
-	test? ( dev-util/pkgconfig
-		>=3Dsys-apps/dbus-1.2.14 )
+	test? ( >=3Dsys-apps/dbus-1.2.14 )
 	!<dev-util/gtk-doc-1.15-r2"
 PDEPEND=3D"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() {
 }
=20
 src_configure() {
+	# Avoid circular depend with dev-util/pkgconfig
+	if ! has_version dev-util/pkgconfig; then
+		export DBUS1_CFLAGS=3D"-I/usr/include/dbus-1.0 -I/usr/$(get_libdir)/db=
us-1.0/include"
+		export DBUS1_LIBS=3D"-ldbus-1"
+	fi
+
 	local myconf
=20
 	# Building with --disable-debug highly unrecommended.  It will build gl=
ib in
@@ -162,6 +167,9 @@ src_install() {
 		newins "${ED}/etc/bash_completion.d/${f}-bash-completion.sh" ${f} || d=
ie
 	done
 	rm -rf "${ED}/etc"
+
+	# Redudant with pkg-config files in place
+	use static-libs || find "${ED}" -name '*.la' -exec rm -f {} +
 }
=20
 src_test() {
@@ -206,12 +214,12 @@ pkg_postinst() {
 		ewarn "rebuilding dev-libs/dbus-glib"
 	fi
=20
-	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 >=3Dgtk+-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
=20
 	python_need_rebuild

diff --git a/dev-libs/glib/glib-9999.ebuild b/dev-libs/glib/glib-9999.ebu=
ild
index 18d9d7f..fdb4539 100644
--- a/dev-libs/glib/glib-9999.ebuild
+++ b/dev-libs/glib/glib-9999.ebuild
@@ -38,8 +38,7 @@ DEPEND=3D"${RDEPEND}
 		>=3Ddev-util/gtk-doc-1.15
 		~app-text/docbook-xml-dtd-4.1.2 )
 	systemtap? ( >=3Ddev-util/systemtap-1.3 )
-	test? ( dev-util/pkgconfig
-		>=3Dsys-apps/dbus-1.2.14 )
+	test? ( >=3Dsys-apps/dbus-1.2.14 )
 	!<dev-util/gtk-doc-1.15-r2"
 PDEPEND=3D"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() {
 }
=20
 src_configure() {
+	# Avoid circular depend with dev-util/pkgconfig
+	if ! has_version dev-util/pkgconfig; then
+		export DBUS1_CFLAGS=3D"-I/usr/include/dbus-1.0 -I/usr/$(get_libdir)/db=
us-1.0/include"
+		export DBUS1_LIBS=3D"-ldbus-1"
+	fi
+
 	local myconf
=20
 	# Building with --disable-debug highly unrecommended.  It will build gl=
ib in
@@ -162,6 +167,9 @@ src_install() {
 		newins "${ED}/etc/bash_completion.d/${f}-bash-completion.sh" ${f} || d=
ie
 	done
 	rm -rf "${ED}/etc"
+
+	# Redudant with pkg-config files in place
+	use static-libs || find "${ED}" -name '*.la' -exec rm -f {} +
 }
=20
 src_test() {
@@ -206,12 +214,12 @@ pkg_postinst() {
 		ewarn "rebuilding dev-libs/dbus-glib"
 	fi
=20
-	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 >=3Dgtk+-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
=20
 	python_need_rebuild