[gentoo-commits] proj/gnome:master commit in: x11-libs/gtk+/

[Nirbheek Chauhan]

commit:     3d600af7fa94baf6989dd946a5c3b41cce7f3bf5
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 24 19:06:48 2011 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Sat Dec 24 19:10:00 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=3d600af7

x11-libs/gtk+: bump to 3.3.6

---
 .../gtk+/{gtk+-9999.ebuild => gtk+-3.3.6.ebuild}   |   26 +++++++-------------
 x11-libs/gtk+/gtk+-9999.ebuild                     |   13 ++++-----
 2 files changed, 15 insertions(+), 24 deletions(-)

diff --git a/x11-libs/gtk+/gtk+-9999.ebuild b/x11-libs/gtk+/gtk+-3.3.6.ebuild
similarity index 89%
copy from x11-libs/gtk+/gtk+-9999.ebuild
copy to x11-libs/gtk+/gtk+-3.3.6.ebuild
index b55d38a..b9d5b14 100644
--- a/x11-libs/gtk+/gtk+-9999.ebuild
+++ b/x11-libs/gtk+/gtk+-3.3.6.ebuild
@@ -1,13 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-3.2.2-r2.ebuild,v 1.1 2011/12/15 23:46:04 tetromino Exp $
 
 EAPI="4"
 
 inherit eutils flag-o-matic gnome.org gnome2-utils libtool virtualx
-if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
-fi
 
 DESCRIPTION="Gimp ToolKit +"
 HOMEPAGE="http://www.gtk.org/"
@@ -20,11 +17,7 @@ SLOT="3"
 # I tried this and got it all compiling, but the end result is unusable as it
 # horribly mixes up the backends -- grobian
 IUSE="aqua colord cups debug doc examples +introspection packagekit test vim-syntax xinerama"
-if [[ ${PV} = 9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # FIXME: introspection data is built against system installation of gtk+:3
 # NOTE: cairo[svg] dep is due to bug 291283 (not patched to avoid eautoreconf)
@@ -49,7 +42,7 @@ COMMON_DEPEND="!aqua? (
 		>=x11-libs/gdk-pixbuf-2.23.5:2[introspection?]
 	)
 	xinerama? ( x11-libs/libXinerama )
-	>=dev-libs/glib-2.29.14
+	>=dev-libs/glib-2.31.6
 	>=x11-libs/pango-1.29.0[introspection?]
 	>=dev-libs/atk-2.1.5[introspection?]
 	>=x11-libs/gtk+-2.24:2
@@ -74,8 +67,10 @@ DEPEND="${COMMON_DEPEND}
 	test? (
 		media-fonts/font-misc-misc
 		media-fonts/font-cursor-misc )"
+# gtk+-3.2.2 breaks Alt key handling in <=x11-libs/vte-0.30.1:2.90
 RDEPEND="${COMMON_DEPEND}
 	!<gnome-base/gail-1000
+	!<x11-libs/vte-0.30.1-r1:2.90
 	packagekit? ( app-admin/packagekit-base )"
 PDEPEND="vim-syntax? ( app-vim/gtk-syntax )"
 
@@ -109,7 +104,7 @@ src_prepare() {
 		-i tests/Makefile.* || die "sed 3 failed"
 
 	# Test results depend on the list of mounted filesystems!
-	rm tests/a11y/pickers.{ui,txt} || die "rm failed"
+	rm -v tests/a11y/pickers.{ui,txt} || die "rm failed"
 
 	# Failing treeview scrolling tests; bug #384855,
 	# https://bugzilla.gnome.org/show_bug.cgi?id=660931
@@ -118,20 +113,17 @@ src_prepare() {
 	if ! use test; then
 		# don't waste time building tests
 		strip_builddir SRC_SUBDIRS tests Makefile.am
-		[[ ${PV} != 9999 ]] && strip_builddir SRC_SUBDIRS tests Makefile.in
+		strip_builddir SRC_SUBDIRS tests Makefile.in
 	fi
 
 	if ! use examples; then
 		# don't waste time building demos
 		strip_builddir SRC_SUBDIRS demos Makefile.am
-		[[ ${PV} != 9999 ]] && strip_builddir SRC_SUBDIRS demos Makefile.in
+		strip_builddir SRC_SUBDIRS demos Makefile.in
 	fi
-
-	[[ ${PV} == 9999 ]] && gnome2_src_prepare
 }
 
 src_configure() {
-	# png always on to display icons (foser)
 	local myconf="$(use_enable doc gtk-doc)
 		$(use_enable xinerama)
 		$(use_enable packagekit)
@@ -173,7 +165,7 @@ src_install() {
 	dodoc AUTHORS ChangeLog* HACKING NEWS* README*
 
 	# Remove unneeded *.la files
-	find "${ED}" -name "*.la" -delete
+	find "${D}" -name '*.la' -exec rm -f {} +
 
 	# add -framework Carbon to the .pc files
 	use aqua && for i in gtk+-3.0.pc gtk+-quartz-3.0.pc gtk+-unix-print-3.0.pc; do

diff --git a/x11-libs/gtk+/gtk+-9999.ebuild b/x11-libs/gtk+/gtk+-9999.ebuild
index b55d38a..c2e17d0 100644
--- a/x11-libs/gtk+/gtk+-9999.ebuild
+++ b/x11-libs/gtk+/gtk+-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-3.2.2-r2.ebuild,v 1.1 2011/12/15 23:46:04 tetromino Exp $
 
 EAPI="4"
 
@@ -49,7 +49,7 @@ COMMON_DEPEND="!aqua? (
 		>=x11-libs/gdk-pixbuf-2.23.5:2[introspection?]
 	)
 	xinerama? ( x11-libs/libXinerama )
-	>=dev-libs/glib-2.29.14
+	>=dev-libs/glib-2.31.6
 	>=x11-libs/pango-1.29.0[introspection?]
 	>=dev-libs/atk-2.1.5[introspection?]
 	>=x11-libs/gtk+-2.24:2
@@ -74,8 +74,10 @@ DEPEND="${COMMON_DEPEND}
 	test? (
 		media-fonts/font-misc-misc
 		media-fonts/font-cursor-misc )"
+# gtk+-3.2.2 breaks Alt key handling in <=x11-libs/vte-0.30.1:2.90
 RDEPEND="${COMMON_DEPEND}
 	!<gnome-base/gail-1000
+	!<x11-libs/vte-0.30.1-r1:2.90
 	packagekit? ( app-admin/packagekit-base )"
 PDEPEND="vim-syntax? ( app-vim/gtk-syntax )"
 
@@ -109,7 +111,7 @@ src_prepare() {
 		-i tests/Makefile.* || die "sed 3 failed"
 
 	# Test results depend on the list of mounted filesystems!
-	rm tests/a11y/pickers.{ui,txt} || die "rm failed"
+	rm -v tests/a11y/pickers.{ui,txt} || die "rm failed"
 
 	# Failing treeview scrolling tests; bug #384855,
 	# https://bugzilla.gnome.org/show_bug.cgi?id=660931
@@ -126,12 +128,9 @@ src_prepare() {
 		strip_builddir SRC_SUBDIRS demos Makefile.am
 		[[ ${PV} != 9999 ]] && strip_builddir SRC_SUBDIRS demos Makefile.in
 	fi
-
-	[[ ${PV} == 9999 ]] && gnome2_src_prepare
 }
 
 src_configure() {
-	# png always on to display icons (foser)
 	local myconf="$(use_enable doc gtk-doc)
 		$(use_enable xinerama)
 		$(use_enable packagekit)
@@ -173,7 +172,7 @@ src_install() {
 	dodoc AUTHORS ChangeLog* HACKING NEWS* README*
 
 	# Remove unneeded *.la files
-	find "${ED}" -name "*.la" -delete
+	find "${D}" -name '*.la' -exec rm -f {} +
 
 	# add -framework Carbon to the .pc files
 	use aqua && for i in gtk+-3.0.pc gtk+-quartz-3.0.pc gtk+-unix-print-3.0.pc; do