New version for GNOME 2.26. New GtkOrientable API, a lot of bug fixes and polish all over the place.

Package-Manager: portage-2.2_rc31/cvs/Linux x86_64

3 files changed, 63 insertions, 54 deletions

diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog
index 51e11c02b4df..03a763608a8d 100644
--- a/x11-libs/gtk+/ChangeLog
+++ b/x11-libs/gtk+/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-libs/gtk+
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.420 2009/04/27 13:08:12 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.421 2009/05/04 22:28:22 eva Exp $
+
+*gtk+-2.16.1 (04 May 2009)
+
+  04 May 2009; Gilles Dartiguelongue <eva@gentoo.org> -gtk+-2.10.14.ebuild,
+  +gtk+-2.16.1.ebuild:
+  New version for GNOME 2.26. New GtkOrientable API, a lot of bug fixes and
+  polish all over the place.
 
   27 Apr 2009; Jeroen Roovers <jer@gentoo.org> gtk+-2.14.7-r2:
   Stable for HPPA (bug #260063).
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index 5c862dfc9388..ca4e12c95b76 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gtk+-1.2-locale_fix.patch 419 RMD160 a0fbf3fb111f39b7a62c3fa31a803ef2a0ee945a SHA1 569c877ff692a7694e8aca5aceae9558844ba5dd SHA256 2e3cf84902d2f318dcbf4f9ad976573295d8d984c7a860291f37f768fc7966cb
 AUX gtk+-1.2.10-as-needed.patch 19865 RMD160 17c6b5d447b2d1c56fcc89dad676156caf0d700e SHA1 1027f38d29492c6f77205fc40992d8e625da8dbe SHA256 0864194a1e2be5f1b3df91d7dceb50bbe038fbb29f24901891c22829d55d4da7
 AUX gtk+-1.2.10-automake.patch 3270 RMD160 fce6e376c7581db2a15e0e7024eb28c0712f0f8e SHA1 1ba127d50f7eddc86e07a37c819b9dd233d27926 SHA256 f36beb9303dcf08b87ffc404576c001003c1068ae0ad66fe1585a7c1f0c462d2
@@ -20,14 +23,21 @@ AUX gtk+-2.8.10-xinerama.patch 1083 RMD160 499801f3be2289bdc656563bb5c96797d1451
 AUX gtkrc 627 RMD160 3171e0c9132bb2a9119c51750702db23c4a5f076 SHA1 cdb4665e94e1b9e8bc3985390eecca463469c3b3 SHA256 22e4197e5976ed623233399049082383033b613176d77126d246a1f6cb747294
 DIST gtk+-1.2.10-r8-gentoo.diff.bz2 81223 RMD160 fa41bb12e41f0c60c605dbeac03a1aaa905f4333 SHA1 7350d1ed147e52ddc870a4d4b52073f7407d9f0d SHA256 517bdadbaa0e13285b2d72a667b311219342306d4f68d838c3c1dbc5bfbf1684
 DIST gtk+-1.2.10.tar.gz 2868322 RMD160 9b38310d2768e947c4f6173db009243dd11db288 SHA1 a5adcb909257da01ae4d4761e1d41081d06e4d7c SHA256 3fb843ea671c89b909fd145fa09fd2276af3312e58cbab29ed1c93b462108c34
-DIST gtk+-2.10.14.tar.bz2 15172170 RMD160 234d7240732b28a31a260aa9e04c34fc502acbf4 SHA1 78b819814d52caa66739ab64611e41f35e5b48c3 SHA256 d02344239d048390ba02fcfd7de4f9efc0dfb51e7b06dfa46a6314d666ea4de2
 DIST gtk+-2.12.11.tar.bz2 16232428 RMD160 189baa48d16736ab60fd2ed2b124cd4fa2448d78 SHA1 c3e3b9f9f5dd46e88a8433dbb60c54d99a8e526b SHA256 c447b7f42c75ed5bea3e5488a0af82c0f5ed04536ddbf04c9f2f4f42815ba4a9
 DIST gtk+-2.12.12.tar.bz2 16222631 RMD160 2aeeeb6557530d6062e799e11138186a57ddaed2 SHA1 e3c247783da930ff3bdce7f4cdc738d74ee1a03f SHA256 eeacb49b99312e89c611d9ee72b4351b36a136c1344064af2c831d452dd92116
 DIST gtk+-2.14.7.tar.bz2 17475873 RMD160 2ed6451d3de050e9b2423f6509d15e39ba69a6ab SHA1 f4b9c65dbdc78cad6fc9b601640cbad1d3abb57f SHA256 e82f4728e52dbafc35713b755eb863a47dc155334912dda0240dc3de9cb07e14
+DIST gtk+-2.16.1.tar.bz2 18297352 RMD160 41bdf85d93a38236eea12f4882289efb671e16af SHA1 01cba21f12e6fa3762fe47437eb4dc335a2fb841 SHA256 2f1f3fbdb2f5f907913838d6efbb595419e370c950838bb7fad51eb0ed776d50
 EBUILD gtk+-1.2.10-r12.ebuild 2386 RMD160 ed251a32d854304c5d9622844d07f183f14c9bd5 SHA1 93a6ec39cde941b4939c04da955475d017a6ff6f SHA256 e4874d2dd01bc266e7e0f5b691fcf4e54f6bd3a79658dcec6d5374c5910aa78b
-EBUILD gtk+-2.10.14.ebuild 4335 RMD160 47f67f37d7b7298597b4f58c16303a3c4cb465de SHA1 17fe525f100af8ee7d319f69766a8c1393fee42a SHA256 8f743af4e0475d09662081923fdeb16585da1569564e34110a4297477d90c9e9
 EBUILD gtk+-2.12.11.ebuild 4958 RMD160 940e8c7b465316386f7878590a274ce3b74b4593 SHA1 db01e240a5e17bc78c616c47f27b2bab8bbb0f23 SHA256 ac75435bc30144c72351b7075140719deeb9ba78bb1ae575d453ed337706e9d7
 EBUILD gtk+-2.12.12.ebuild 4964 RMD160 96178ab4ded53396ba6c17fa8ed6d8d858046e61 SHA1 c8a3e1340574f3603f1a4ff335be2bbac802c20b SHA256 712d43258904b8254aab79598c1d9d25a92f5b8e671fdc3ce39063b60a352ca9
 EBUILD gtk+-2.14.7-r2.ebuild 4837 RMD160 d4756b6e99afefee642f0939e645c9382983e1db SHA1 d32b99bbcf345438c3f812f755eca0a0e92f46ba SHA256 8dc785991f9cd614edf3b6f0e3c4adfcd2691dcc4ef963727ffaefb4eafaf0aa
-MISC ChangeLog 61664 RMD160 1bd49b6517632f03aaa500c89a5777499f659741 SHA1 73342428b4ca8284c6d67eb1d7abe84917f72938 SHA256 64f7d5480c8f782533799503b9f37f36e81728a88fc80b0ce33a2aae05b3e691
+EBUILD gtk+-2.16.1.ebuild 4368 RMD160 98221ddcd50c082c807419e8f07aff7b06cb89ff SHA1 aa2f07d4cc6240290e72bdca2730d9d496e09449 SHA256 7377271b9d7801c3af3bf2f45b747f3fc2818045cf706369d481c7eccd3dcb60
+MISC ChangeLog 61897 RMD160 8189428fc51d341791cc80d98665f9d54db42ec4 SHA1 0f60117fd20f65acb2465b94c9e352ddeb62d9bd SHA256 2d6c4f6b01cde662ff8ee59fbd1a4bf771ee2454b833de3a46ac26a5d63b13ac
 MISC metadata.xml 424 RMD160 b1748199254d5d0f0db468fdec36f07bb75a3231 SHA1 2e7dc93c7931af2139609dfb75dd38101a45d62a SHA256 8b65272928e676824c407ed438004d9e5d50077a09beee0b60984eadb695bc2d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkn/bA0ACgkQ1fmVwcYIWAaSPgCePDU06OuFR2QY4pA69pc1PA2O
+IzwAnRFJQW5oHQhlf3N0pW+KGQi0qyIc
+=cY6w
+-----END PGP SIGNATURE-----
diff --git a/x11-libs/gtk+/gtk+-2.10.14.ebuild b/x11-libs/gtk+/gtk+-2.16.1.ebuild
index 4bc79c6cbd7a..9a7210a4a17d 100644
--- a/x11-libs/gtk+/gtk+-2.10.14.ebuild
+++ b/x11-libs/gtk+/gtk+-2.16.1.ebuild
@@ -1,55 +1,55 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.10.14.ebuild,v 1.12 2008/11/30 13:13:59 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.16.1.ebuild,v 1.1 2009/05/04 22:28:22 eva Exp $
 
-inherit gnome.org flag-o-matic eutils autotools virtualx
+EAPI="2"
+
+inherit gnome.org flag-o-matic eutils libtool virtualx
 
 DESCRIPTION="Gimp ToolKit +"
 HOMEPAGE="http://www.gtk.org/"
 
 LICENSE="LGPL-2"
 SLOT="2"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE="debug doc jpeg tiff xinerama"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="cups debug doc jpeg jpeg2k tiff vim-syntax xinerama"
 
+# FIXME: configure says >=xrandr-1.2.99 but remi tells me it's broken
 RDEPEND="x11-libs/libXrender
 	x11-libs/libX11
 	x11-libs/libXi
 	x11-libs/libXt
 	x11-libs/libXext
+	>=x11-libs/libXrandr-1.2
 	x11-libs/libXcursor
-	x11-libs/libXrandr
 	x11-libs/libXfixes
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
 	xinerama? ( x11-libs/libXinerama )
-	>=dev-libs/glib-2.12.1
-	>=x11-libs/pango-1.12.0
-	>=dev-libs/atk-1.10.1
-	>=x11-libs/cairo-1.2.0
+	>=dev-libs/glib-2.19.7
+	>=x11-libs/pango-1.20
+	>=dev-libs/atk-1.13
+	>=x11-libs/cairo-1.6[X]
 	media-libs/fontconfig
 	x11-misc/shared-mime-info
 	>=media-libs/libpng-1.2.1
+	cups? ( net-print/cups )
 	jpeg? ( >=media-libs/jpeg-6b-r2 )
-	tiff? ( >=media-libs/tiff-3.5.7 )"
-
+	jpeg2k? ( media-libs/jasper )
+	tiff? ( >=media-libs/tiff-3.5.7 )
+	!<gnome-base/gail-1000"
 DEPEND="${RDEPEND}
-	sys-devel/autoconf
 	>=dev-util/pkgconfig-0.9
-	=sys-devel/automake-1.7*
 	x11-proto/xextproto
 	x11-proto/xproto
 	x11-proto/inputproto
+	x11-proto/damageproto
 	xinerama? ( x11-proto/xineramaproto )
+	>=dev-util/gtk-doc-am-1.11
 	doc? (
-			>=dev-util/gtk-doc-1.4
-			~app-text/docbook-xml-dtd-4.1.2
-		 )"
-
-pkg_setup() {
-	if ! built_with_use x11-libs/cairo X; then
-		einfo "Please re-emerge x11-libs/cairo with the X USE flag set"
-		die "cairo needs the X flag set"
-	fi
-}
+		>=dev-util/gtk-doc-1.11
+		~app-text/docbook-xml-dtd-4.1.2 )"
+PDEPEND="vim-syntax? ( app-vim/gtk-syntax )"
 
 set_gtk2_confdir() {
 	# An arch specific config directory is used on multilib systems
@@ -57,22 +57,16 @@ set_gtk2_confdir() {
 	GTK2_CONFDIR=${GTK2_CONFDIR:=/etc/gtk-2.0}
 }
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Optionalize xinerama support
-	epatch "${FILESDIR}/${PN}-2.8.10-xinerama.patch"
-
-	# Make gtk-update-icon-cache check subdirs in it's update check
-	epatch "${FILESDIR}"/${PN}-2.10.11-update-icon-subdirs.patch
-
+src_prepare() {
 	# use an arch-specific config directory so that 32bit and 64bit versions
 	# dont clash on multilib systems
 	has_multilib_profile && epatch "${FILESDIR}/${PN}-2.8.0-multilib.patch"
 
-	# Revert DND change that makes mozilla products DND broken
-	EPATCH_OPTS="-R" epatch "${FILESDIR}/${PN}-2.10.7-mozilla-dnd-fix.patch"
+	# Workaround adobe flash infinite loop. Patch from http://bugzilla.gnome.org/show_bug.cgi?id=463773#c11
+	epatch "${FILESDIR}/${PN}-2.12.0-flash-workaround.patch"
+
+	# Don't break inclusion of gtkclist.h, upstream bug 536767
+	epatch "${FILESDIR}/${PN}-2.14.3-limit-gtksignal-includes.patch"
 
 	# -O3 and company cause random crashes in applications. Bug #133469
 	replace-flags -O3 -O2
@@ -80,22 +74,17 @@ src_unpack() {
 
 	use ppc64 && append-flags -mminimal-toc
 
-	# remember, eautoreconf applies elibtoolize.
-	# if you remove this, you should manually run elibtoolize
-	export WANT_AUTOMAKE=1.7
-	cp aclocal.m4 old_macros.m4
-	AT_M4DIR="."
-	eautoreconf
-
-	epunt_cxx
+	elibtoolize
 }
 
-src_compile() {
+src_configure() {
 	# png always on to display icons (foser)
 	local myconf="$(use_enable doc gtk-doc) \
 		$(use_with jpeg libjpeg) \
+		$(use_with jpeg2k libjasper) \
 		$(use_with tiff libtiff) \
 		$(use_enable xinerama) \
+		$(use_enable cups cups auto) \
 		--with-libpng \
 		--with-gdktarget=x11 \
 		--with-xinput"
@@ -103,17 +92,16 @@ src_compile() {
 	# Passing --disable-debug is not recommended for production use
 	use debug && myconf="${myconf} --enable-debug=yes"
 
-	econf ${myconf} || die "configure failed"
-
-	emake || die "compile failed"
+	econf ${myconf}
 }
 
 src_test() {
-	Xmake check || die
+	unset DBUS_SESSION_BUS_ADDRESS
+	Xemake check || die "tests failed"
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die "Installation failed"
+	emake DESTDIR="${D}" install || die "Installation failed"
 
 	set_gtk2_confdir
 	dodir ${GTK2_CONFDIR}
@@ -127,6 +115,10 @@ src_install() {
 	echo "GDK_USE_XFT=1" > "${D}/etc/env.d/50gtk2"
 
 	dodoc AUTHORS ChangeLog* HACKING NEWS* README*
+
+	# This has to be removed, because it's multilib specific; generated in
+	# postinst
+	rm "${D}/etc/gtk-2.0/gtk.immodules"
 }
 
 pkg_postinst() {