Version bump; fixes various bugs and improves window iconification.

Package-Manager: portage-2.2.0_alpha90/cvs/Linux x86_64

3 files changed, 220 insertions, 11 deletions

diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog
index 97c019481bb7..7914453bdbba 100644
--- a/x11-libs/gtk+/ChangeLog
+++ b/x11-libs/gtk+/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/gtk+
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.570 2012/03/13 13:11:13 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.571 2012/03/14 02:25:34 tetromino Exp $
+
+*gtk+-3.2.4 (14 Mar 2012)
+
+  14 Mar 2012; Alexandre Rostovtsev <tetromino@gentoo.org> +gtk+-3.2.4.ebuild:
+  Version bump; fixes various bugs and improves window iconification.
 
   13 Mar 2012; Agostino Sarubbo <ago@gentoo.org> gtk+-3.2.3.ebuild:
   Stable for amd64, wrt bug #407643
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index 8013cbe8cba2..f65554fe134f 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 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
@@ -31,6 +31,7 @@ DIST gtk+-2.24.9.tar.xz 13200580 RMD160 4e51be9955a9f3d359fcaca9cc30c12477789d28
 DIST gtk+-3.0.12-use-const2.patch.xz 12500 RMD160 2cebd73630f83530a76ac263d797e196032994ee SHA1 697b8d41ba24386acd1cfec1d733361901e797dd SHA256 f10b251a52a4f5d73b435315c94297dd30a4bc3c20a25bc947842bb214808cc4
 DIST gtk+-3.0.12.tar.xz 13104092 RMD160 c82d14e113ae287476f5887ca03b8b01b8d22e1b SHA1 1b87e12ef3dfe598ee757db1f5bdff6cd66e6558 SHA256 219fdea120897981840e909fac40d4d433fe061a37b12b9402e215c819ebeae9
 DIST gtk+-3.2.3.tar.xz 12668948 RMD160 48a19eb3df1e38c161aca6573d1f218f2552cd70 SHA1 8b95f6c65f9307a920780847e7c72bafa358eabb SHA256 e2cf20f2510ebbc7be122a1a33dd1f472a7d06aaf16b4f2a63eb048cd9141d3d
+DIST gtk+-3.2.4.tar.xz 12261004 RMD160 bbf0922f53a2acc2cb0337c08583208b39255768 SHA1 3d0b6413750bc0cb51e98a387abbd606a1aa021e SHA256 f981bf514858c00d7084bd6f6c34b3c60b8aebdb959e7aca6faa59ed67c136bd
 DIST introspection.m4.bz2 1181 RMD160 3648afa820c2ee7e240083076e1452285d043084 SHA1 e5188cc387d0d17feb77684feff7ff163779912f SHA256 69a2a57b12179159420825d1d44c74108014b0864c4d63500265639cfa9151ae
 EBUILD gtk+-1.2.10-r12.ebuild 2386 RMD160 ed251a32d854304c5d9622844d07f183f14c9bd5 SHA1 93a6ec39cde941b4939c04da955475d017a6ff6f SHA256 e4874d2dd01bc266e7e0f5b691fcf4e54f6bd3a79658dcec6d5374c5910aa78b
 EBUILD gtk+-2.24.10-r1.ebuild 7845 RMD160 f990cf9ede4536be3d67dba5810cb69e592c3a86 SHA1 79a1d39989b4271fb8dacb6587dde9a5e43df100 SHA256 265b4dd6606b2fa2e901a096cfbcdf83db9ae5f87aa0fbb1f90b0f1fc2ce7322
@@ -40,16 +41,13 @@ EBUILD gtk+-2.24.8-r1.ebuild 8011 RMD160 b150f4aeaa03f49df3c6553ff800dc385d86dfa
 EBUILD gtk+-2.24.9-r1.ebuild 7896 RMD160 b699c2ab445e9a48eb8c619ec46db3397da154a1 SHA1 87eede591144bb90415411f0f9061027620521d6 SHA256 a728ffdd17e21d7bfdec3e9952a1042e56637aaa5a8a947a49eac36dda875730
 EBUILD gtk+-3.0.12-r1.ebuild 6158 RMD160 d2fa789aa709cfe016e52c35c4c4eea72001b3de SHA1 71e7290bda484de1ec4f8d4b3b361c3e9eb280be SHA256 b71bfe7153b7b1d3b128a435157c59aeaea06a930ae5f9179ba27e45793462cf
 EBUILD gtk+-3.2.3.ebuild 6775 RMD160 c18703c208c4226f8c8547ef167172713f6c4345 SHA1 1b45077f30339c56f24942af14051a1c61653d70 SHA256 ac18cacb83f47f8ce63124e101129b4b7fcecad9c4a0e198e599f26d3ee53613
-MISC ChangeLog 87414 RMD160 ae56d07291fdeff79bf99f31f85d1d1b122b205e SHA1 221c295663af941d249a4b4106c3101c01018fef SHA256 68e97de2c00361639ddf1b0f03a0570289f67d561c59f54012631ee8e740d1fe
+EBUILD gtk+-3.2.4.ebuild 6783 RMD160 c2327c4147f16beecea68bad09a51df55db2a7c6 SHA1 c889393918ae8cc91e9a08fd4b4beb147ce78de2 SHA256 a2d2aace7a5aa7492f548f0c86d218686cdf3e245ebfd1fa630e0d1ff8b19dc1
+MISC ChangeLog 87597 RMD160 54373b5e1425e5dfb494095b42ca4eb2d5cb0f73 SHA1 452bdcceb4e90f3b16aea060663f583fdf75f325 SHA256 b2ecb0457e96f0740255b55e124a78bc186a9896463b3e07806c2477f6bd978c
 MISC metadata.xml 798 RMD160 9c1c01af06ea6cb0d398d66eda999eba1ec6880a SHA1 13f2860e4e48abb065d70fd85b7073074624ec28 SHA256 634c27d323d01eecbcda3159df57a7cc64557e2a0087eac60e6d9e3d94acd85c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBCgAGBQJPX0d3AAoJEOTDgjZ80txdw70H/A15A3mjqLD2xonI/sCaKa+9
-+R+si19Zxb8aeGAlsDSamfj+jv0VNzk3Q69l5HdUzGCvX0gF+DdBp1PHv8Pxf5c7
-o2AIYdVT7eOfG8aLleg7lm0GVFWghUl1Fuuykn1+X1d37hnIJnyZaW/D1ksR5SXT
-h3IX/6TgyXzSmSnxnpn5mCga60V/zjGlXyTfsM1JQS3yk6hOKuDEgHBGo0+IY+an
-Wsf8Muw+FQHSynWDF7pNhkECqLZ9XlWPTEa0xNDXZ21vSxwGonnS5Qep0jBhbXnK
-o0H/49AWAefVnAHCKWL5nyJHis9LUXBIQKBHoKYWxn6yySh33+8fbCmfZkKAh6w=
-=84kS
+iF4EAREIAAYFAk9gAaMACgkQdjK8w9WeBnChvQEAiZoE0Gh4M3A2uobcoQy+Kliy
+yYzosT71jT4uSjUzC4gBAJsnj17y/QhfiKgbmWYChIRCoyqyqQPcnmPhOPxMvwA2
+=AH7I
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/gtk+/gtk+-3.2.4.ebuild b/x11-libs/gtk+/gtk+-3.2.4.ebuild
new file mode 100644
index 000000000000..c1b448d95e74
--- /dev/null
+++ b/x11-libs/gtk+/gtk+-3.2.4.ebuild
@@ -0,0 +1,206 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-3.2.4.ebuild,v 1.1 2012/03/14 02:25:34 tetromino Exp $
+
+EAPI="4"
+
+inherit eutils flag-o-matic gnome.org gnome2-utils libtool virtualx
+
+DESCRIPTION="Gimp ToolKit +"
+HOMEPAGE="http://www.gtk.org/"
+
+LICENSE="LGPL-2"
+SLOT="3"
+# NOTE: This gtk+ has multi-gdk-backend support, see:
+#  * http://blogs.gnome.org/kris/2010/12/29/gdk-3-0-on-mac-os-x/
+#  * http://mail.gnome.org/archives/gtk-devel-list/2010-November/msg00099.html
+# 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"
+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)
+# Use gtk+:2 for gtk-update-icon-cache and gtk-builder-convert
+# >=x11-libs/gtk+-2.24:2 is needed for bug 359555
+COMMON_DEPEND="!aqua? (
+		x11-libs/libXrender
+		x11-libs/libX11
+		x11-libs/libXi
+		x11-libs/libXt
+		x11-libs/libXext
+		>=x11-libs/libXrandr-1.3
+		x11-libs/libXcursor
+		x11-libs/libXfixes
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		>=x11-libs/cairo-1.10.0[X,glib,svg]
+		>=x11-libs/gdk-pixbuf-2.23.5:2[X,introspection?]
+	)
+	aqua? (
+		>=x11-libs/cairo-1.10.0[aqua,glib,svg]
+		>=x11-libs/gdk-pixbuf-2.23.5:2[introspection?]
+	)
+	xinerama? ( x11-libs/libXinerama )
+	>=dev-libs/glib-2.29.14
+	>=x11-libs/pango-1.29.0[introspection?]
+	>=dev-libs/atk-2.1.5[introspection?]
+	>=x11-libs/gtk+-2.24:2
+	media-libs/fontconfig
+	x11-misc/shared-mime-info
+	colord? ( >=x11-misc/colord-0.1.9 )
+	cups? ( net-print/cups )
+	introspection? ( >=dev-libs/gobject-introspection-0.10.1 )"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/pkgconfig-0.9
+	!aqua? (
+		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.11
+		~app-text/docbook-xml-dtd-4.1.2 )
+	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 )"
+
+strip_builddir() {
+	local rule=$1
+	shift
+	local directory=$1
+	shift
+	sed -e "s/^\(${rule} =.*\)${directory}\(.*\)$/\1\2/" -i $@ \
+		|| die "Could not strip director ${directory} from build."
+}
+
+src_prepare() {
+	# -O3 and company cause random crashes in applications. Bug #133469
+	replace-flags -O3 -O2
+	strip-flags
+
+	# Non-working test in gentoo's env
+	sed 's:\(g_test_add_func ("/ui-tests/keys-events.*\):/*\1*/:g' \
+		-i gtk/tests/testing.c || die "sed 1 failed"
+	sed '\%/recent-manager/add%,/recent_manager_purge/ d' \
+		-i gtk/tests/recentmanager.c || die "sed 2 failed"
+
+	# Missing file, required for tests; https://bugzilla.gnome.org/show_bug.cgi?id=662024
+	cp "${FILESDIR}/${PN}-3.2.1-selector.errors" \
+		tests/css/parser/selector.errors || die "cp failed"
+
+	# FIXME: multiple reftests fail when run from portage (but succeed when
+	# run from a manual compile in a temp directory)
+	sed -e 's:\(SUBDIRS.*\)reftests:\1:' \
+		-i tests/Makefile.* || die "sed 3 failed"
+
+	# Test results depend on the list of mounted filesystems!
+	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
+	epatch "${FILESDIR}/${PN}-3.2.1-failing-tests.patch"
+
+	if ! use test; then
+		# don't waste time building tests
+		strip_builddir SRC_SUBDIRS tests Makefile.am
+		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
+		strip_builddir SRC_SUBDIRS demos Makefile.in
+	fi
+}
+
+src_configure() {
+	# png always on to display icons (foser)
+	local myconf="$(use_enable doc gtk-doc)
+		$(use_enable xinerama)
+		$(use_enable packagekit)
+		$(use_enable cups cups auto)
+		$(use_enable colord)
+		$(use_enable introspection)
+		--disable-papi
+		--enable-gtk2-dependency"
+
+	# XXX: Maybe with multi-backend we should enable x11 all the time?
+	if use aqua; then
+		myconf="${myconf} --enable-quartz-backend --disable-xinput"
+	else
+		myconf="${myconf} --enable-x11-backend --enable-xinput"
+	fi
+
+	# Passing --disable-debug is not recommended for production use
+	use debug && myconf="${myconf} --enable-debug=yes"
+
+	# need libdir here to avoid a double slash in a path that libtool doesn't
+	# grok so well during install (// between $EPREFIX and usr ...)
+	econf --libdir="${EPREFIX}/usr/$(get_libdir)" ${myconf}
+}
+
+src_test() {
+	# Tests require a new gnome-themes-standard, but adding it to DEPEND
+	# would result in circular dependencies.
+	# bug #398789, https://bugzilla.gnome.org/show_bug.cgi?id=669562
+	if ! has_version '=x11-themes/gnome-themes-standard-3.2*'; then
+		ewarn "Tests will be skipped beecause =gnome-themes-standard-3.2*"
+		ewarn "is not installed. Please re-run tests after installing the"
+		ewarn "required version of gnome-themes-standard."
+		return 0
+	fi
+	unset DBUS_SESSION_BUS_ADDRESS
+	# Exporting HOME fixes tests using XDG directories spec since all defaults
+	# are based on $HOME. It is also backward compatible with functions not
+	# yet ported to this spec.
+	XDG_DATA_HOME="${T}" HOME="${T}" Xemake check || die "tests failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	insinto /etc/gtk-3.0
+	doins "${FILESDIR}"/settings.ini
+
+	dodoc AUTHORS ChangeLog* HACKING NEWS* README*
+
+	# Remove unneeded *.la files
+	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
+		sed -i -e "s:Libs\: :Libs\: -framework Carbon :" "${ED}"usr/$(get_libdir)/pkgconfig/$i || die "sed failed"
+	done
+}
+
+pkg_preinst() {
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	gnome2_schemas_update
+
+	local GTK3_MODDIR="${EROOT}usr/$(get_libdir)/gtk-3.0/3.0.0"
+	gtk-query-immodules-3.0  > "${GTK3_MODDIR}/immodules.cache" \
+		|| ewarn "Failed to run gtk-query-immodules-3.0"
+
+	if ! has_version "app-text/evince"; then
+		elog "Please install app-text/evince for print preview functionality."
+		elog "Alternatively, check \"gtk-print-preview-command\" documentation and"
+		elog "add it to your settings.ini file."
+	fi
+}
+
+pkg_postrm() {
+	gnome2_schemas_update
+}