Version bump with assorted bugfixes. Drop old.

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

4 files changed, 16 insertions, 207 deletions

diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog
index f4e4863ff5aa..f73f28f3a2a1 100644
--- a/x11-libs/gtk+/ChangeLog
+++ b/x11-libs/gtk+/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/gtk+
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.555 2011/12/20 21:36:51 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.556 2011/12/28 04:54:15 tetromino Exp $
+
+*gtk+-3.2.3 (28 Dec 2011)
+
+  28 Dec 2011; Alexandre Rostovtsev <tetromino@gentoo.org> -gtk+-3.2.1.ebuild,
+  -gtk+-3.2.2.ebuild, +gtk+-3.2.3.ebuild:
+  Version bump with assorted bugfixes. Drop old.
 
   20 Dec 2011; Jeroen Roovers <jer@gentoo.org> gtk+-2.24.8-r1.ebuild:
   Stable for HPPA (bug #393007).
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index a09f805788b9..9d19a6a5de53 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+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
@@ -30,9 +30,9 @@ DIST gtk+-2.24.7.tar.xz 13224600 RMD160 37fcc2702da52ec9785a6886939b795fb3c764ae
 DIST gtk+-2.24.8.tar.xz 12811268 RMD160 55a57b32f3034d7b3d190538f929920bc6c96aff SHA1 b69a7cf512b8254d8a6cd39a45b3f09cb02af20b SHA256 8a3b29f667933cf52eea2db7b066723edbc80443ca9c75b7cd7cbe8c8b90b93c
 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.1.tar.xz 12664740 RMD160 38f61e8881b5dd1230aeafecc01cfa45629bc6ef SHA1 7f3feaa6e9227bfc9247d58fd34962c677750591 SHA256 f1989f183700cd5f46681cfabc2253e2f526b19b56e4b631dcee2594dddb0ef3
 DIST gtk+-3.2.2-patches-2.tar.xz 9428 RMD160 5086a8502ae3b3ed03696f44eb55596d118cf872 SHA1 1ce95a8b22883246ed6b464cd550af014222940b SHA256 205449e86898fd4683d508e57ed93cab401a7036359a4ceb155c10cdc9b20bed
 DIST gtk+-3.2.2.tar.xz 12662804 RMD160 344ff194cda11b95e44ef75cd47f19a858b564b6 SHA1 fc88cbd2801efac02a6171a2f4b5ffe50eec61f7 SHA256 f7ec82de393cd7ae2aa45022576400941704709d1f0f35fb0b17f3be1f2e7d84
+DIST gtk+-3.2.3.tar.xz 12668948 RMD160 48a19eb3df1e38c161aca6573d1f218f2552cd70 SHA1 8b95f6c65f9307a920780847e7c72bafa358eabb SHA256 e2cf20f2510ebbc7be122a1a33dd1f472a7d06aaf16b4f2a63eb048cd9141d3d
 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.4.ebuild 7474 RMD160 6423a1cb33e4f0493c39da224d2a125c45494c8a SHA1 d6d4caaf3ad58d7d81884d82b3fd6fbff6a15120 SHA256 08ae86596433eca5aa8cfa82f6eca0f0463fb4860d5ebfca1363dacb08eb4cc5
@@ -42,16 +42,15 @@ EBUILD gtk+-2.24.7.ebuild 7680 RMD160 72bb82e782cf3cbc41509b8d353186fdc781e821 S
 EBUILD gtk+-2.24.8-r1.ebuild 7982 RMD160 b8e56a499e20398942fd920902f00b7f6a3da187 SHA1 fda6533d5ca9d2b7b7c0b96aa94d13ed5b3b9718 SHA256 e887c3e0a415f3fec1f997825ec59f6f85ae271a1ecb95fdca2da9785a46383f
 EBUILD gtk+-3.0.12-r1.ebuild 6158 RMD160 d2fa789aa709cfe016e52c35c4c4eea72001b3de SHA1 71e7290bda484de1ec4f8d4b3b361c3e9eb280be SHA256 b71bfe7153b7b1d3b128a435157c59aeaea06a930ae5f9179ba27e45793462cf
 EBUILD gtk+-3.0.12.ebuild 5914 RMD160 855ced0d7473e2c06411ffe7b88bc667663e8443 SHA1 b573ae7f942ba95de6c485b0884ad28c4f9432d4 SHA256 955f5ab87289a900b1ed275a803d910497067b4a5c9dba682b202b4aae8f0c6a
-EBUILD gtk+-3.2.1.ebuild 6236 RMD160 513668f35c2bc20dbcd3721bcada49ea36694297 SHA1 9aaf2156ac04521c65af2506a13357400b6fa633 SHA256 d7587f9be4ad79401bf7cae3d5a8db1135f89f91d31d6ce9be48f637fe47ba3e
 EBUILD gtk+-3.2.2-r1.ebuild 6476 RMD160 af140bb2a3ca691a8e0983545e1dfcbea80d1ad6 SHA1 8b243a68f5d616403127f9308ddfed3c0f34c9f7 SHA256 03681c40256004ba29f398adedba6a0cbb490fb2c134f4adbc1816268a5cf1fd
 EBUILD gtk+-3.2.2-r2.ebuild 6517 RMD160 445de82dfe421d457798dec25b502592f8058df4 SHA1 374b21044f6df4b179a3d5a248bfc5b0589c5a59 SHA256 77c1869b3c5b8a3af9615b42d96f4d449a6dfa71a33b0ffe99cc9d58dddd2eb7
-EBUILD gtk+-3.2.2.ebuild 6388 RMD160 f47e3cc109f30c01a10e61855377a43ad618e9ac SHA1 4ec8d5ddf43686bf4420cebf85b7d7eab81bd415 SHA256 47f511c2d4911d4eaa5569205063b74a76b0b93146142c5332d79825841d2aea
-MISC ChangeLog 84808 RMD160 ff8f5a43d045a2e7eff1275c4e71c8c106253e91 SHA1 8926bb7b33427400cf25191b1d3090f45e63b164 SHA256 870893db53190d0cdb629e522cf102d5494a0010ebf607ca9f31b3292621315c
+EBUILD gtk+-3.2.3.ebuild 6334 RMD160 4fcb8a54bcbdb120a8b4bc0310d532ab4fdece79 SHA1 6d878ad635f969bc12eab75ad636f72fc29a17f9 SHA256 b4b823e55d9774a92ab500043521f71452f18579b8eed2974b560ad345fa6680
+MISC ChangeLog 85012 RMD160 2c79c956bfb711f3812dce3d6fc84ec019ad8149 SHA1 dbc32b07b0a1662194977bc6e425b8a4795d76ce SHA256 e0788151f4db7ffca8c7e279b47564250229d4028d75c93608a209300adf0862
 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)
 
-iEYEARECAAYFAk7w//kACgkQVWmRsqeSphMAJACfeglTtRMQD9Qm59ngM2W4ffTF
-DxQAniHZmZdZHI/RlFGeHg4AXNeNKMVC
-=HZ7e
+iF4EAREIAAYFAk76oP0ACgkQdjK8w9WeBnAUUQD/aijQxZBya2+LCz1rTbpf3ATX
+G4Iqg4JKlbErfPG0zNoA/33c+8jhSCG5E6xyZSMnMZ5NN8KH9REuiCGp6fzXd7hx
+=zZVl
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/gtk+/gtk+-3.2.1.ebuild b/x11-libs/gtk+/gtk+-3.2.1.ebuild
deleted file mode 100644
index f8a57c259a3a..000000000000
--- a/x11-libs/gtk+/gtk+-3.2.1.ebuild
+++ /dev/null
@@ -1,195 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-3.2.1.ebuild,v 1.6 2011/12/14 19:58:13 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 )"
-RDEPEND="${COMMON_DEPEND}
-	!<gnome-base/gail-1000
-	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() {
-	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
-}
diff --git a/x11-libs/gtk+/gtk+-3.2.2.ebuild b/x11-libs/gtk+/gtk+-3.2.3.ebuild
index d6770ae2e0ee..1ab9647fdf4c 100644
--- a/x11-libs/gtk+/gtk+-3.2.2.ebuild
+++ b/x11-libs/gtk+/gtk+-3.2.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-3.2.2.ebuild,v 1.4 2011/12/14 19:58:13 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-3.2.3.ebuild,v 1.1 2011/12/28 04:54:15 tetromino Exp $
 
 EAPI="4"
 
@@ -68,7 +68,6 @@ DEPEND="${COMMON_DEPEND}
 		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
-# Remove blocker after >=vte-0.30.1-r1:2.90 is stable
 RDEPEND="${COMMON_DEPEND}
 	!<gnome-base/gail-1000
 	!<x11-libs/vte-0.30.1-r1:2.90