Version bump with various bugfixes, including better smooth scrolling performance.

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

3 files changed, 230 insertions, 7 deletions

diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog
index 4ebd2be61c61..73172d6e38b6 100644
--- a/x11-libs/gtk+/ChangeLog
+++ b/x11-libs/gtk+/ChangeLog
@@ -1,6 +1,12 @@
 # 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.578 2012/04/01 17:27:56 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.579 2012/04/14 03:31:15 tetromino Exp $
+
+*gtk+-3.4.1 (14 Apr 2012)
+
+  14 Apr 2012; Alexandre Rostovtsev <tetromino@gentoo.org> +gtk+-3.4.1.ebuild:
+  Version bump with various bugfixes, including better smooth scrolling
+  performance.
 
   01 Apr 2012; Raúl Porcel <armin76@gentoo.org> gtk+-3.2.3.ebuild:
   alpha/ia64/sh/sparc stable wrt #407643
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index 95e7f8a3becf..64765e7bf8b5 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
@@ -36,6 +36,7 @@ DIST gtk+-3.0.12.tar.xz 13104092 RMD160 c82d14e113ae287476f5887ca03b8b01b8d22e1b
 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 gtk+-3.4.0.tar.xz 12861176 RMD160 373149d69ad8f6341a2ca8e1dec657459e238704 SHA1 40df26d54e56932dbd879ff85da9823c78179e83 SHA256 00af8be8bc60355e08a8f57e3e7503c916cec5cd5c6acb3eaedb01330b81f3e0
+DIST gtk+-3.4.1.tar.xz 12809412 RMD160 e8c0c8c71167e037eb88689713b8ae05aed29b03 SHA1 91b68f0dd5f6558eae98811f4031f32ff46ad172 SHA256 0716b533de0ff2ffdec1076bb85c7a95e2b7b6ac9ece71e84625043ae3eb25f7
 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 8013 RMD160 e346c16cebd985f8248bf4a07d534eeff8955cba SHA1 7666bd6043566ad62de09fdfbc75da5479cad881 SHA256 b90ddfcb3993f1cbf42093c475eecb1f53f449e2b9f1c20750f76b8647aabad2
@@ -47,12 +48,13 @@ EBUILD gtk+-3.2.3.ebuild 6772 RMD160 bc8b01274b35fc412918a382060f5947fb47099f SH
 EBUILD gtk+-3.2.4-r1.ebuild 7024 RMD160 362669e6bfd12ebd9f01eb59836c9a69f1220e16 SHA1 756dcb4e99925a6d6af1352b1c85e6427d82c6eb SHA256 c8d22f7e2f1237cdc3cfdd93bacadd37e45b6aba2417d3a2443173fc616be83f
 EBUILD gtk+-3.2.4.ebuild 6912 RMD160 2dae7816d7c2fa9ef1f15ca0c7f7657f0c9c2759 SHA1 cb825154ae19abb4692e645dfa7946e14dda5d7a SHA256 c561ae0cb065d05953d2f367766a3c481267184695bc34a9a11138d29dc1a821
 EBUILD gtk+-3.4.0.ebuild 6955 RMD160 5f511aebb053f45296094104565a92c20646311e SHA1 764d1a086e1c702c3a1596140aaaab9976aa1849 SHA256 09290e7becf898d61f81598c8ccb94ce85b3bccc21893441ea2b81ba5d8c6c28
-MISC ChangeLog 89060 RMD160 2fcdf2571889cedfe19ebf64d067d8b8e26420cf SHA1 ef8288ade262c8a8060f741be9f1929efa5cb55b SHA256 1e1cc3ede8d7035559812727648e8fe059f6203c2ae9e825cc4167331e09f61c
+EBUILD gtk+-3.4.1.ebuild 6944 RMD160 4e2a824a190f74bbd558e77b5ee115ae036cf22c SHA1 0c24748bd8da6ba843ebf2607bda3a57cee4020b SHA256 1381fd0d6980c316da18e3395327d68acc00c3f306feb9d0ba0f1ea205d07795
+MISC ChangeLog 89256 RMD160 9559153d9cc3a2d551c6e04d7efe95bdcb4ec388 SHA1 b01666ecd33eb4ebe9fc17de835333799f9aa6e2 SHA256 b5a5eb27d82160562942ff2748d496dabcfeec8fe9304850b49cae1b257fae9b
 MISC metadata.xml 870 RMD160 a94fb5c6acb8fb9015e5f4c40c8b9b1eb3ddf9d8 SHA1 2769a95a236ce2a234c7d5bd75231de142345445 SHA256 90835d0edfdbbc25c781b0c7bcf9b7b6db82ce5f412082ec56d250891e1853ea
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk94kCIACgkQuQc30/atMkDCQACgtAAca435vcgCL2rmvnnHREcH
-EusAoMJy+PCGRaY3thUtDwyBavPesrUf
-=SGKz
+iF4EAREIAAYFAk+I74gACgkQdjK8w9WeBnB93wD9Ew7jT2K1SUuIGm7y4zbEJk4d
+JBELHnzHfBrLpi57XfEA/194d/U+Itl243SQrp9wz/e6N4l9ieG3h0irD6oVjRqT
+=wZ+c
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/gtk+/gtk+-3.4.1.ebuild b/x11-libs/gtk+/gtk+-3.4.1.ebuild
new file mode 100644
index 000000000000..5c3ac1207df6
--- /dev/null
+++ b/x11-libs/gtk+/gtk+-3.4.1.ebuild
@@ -0,0 +1,215 @@
+# 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.4.1.ebuild,v 1.1 2012/04/14 03:31:15 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 wayland X xinerama"
+REQUIRED_USE="
+	|| ( aqua wayland X )
+	xinerama? ( X )"
+
+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
+COMMON_DEPEND="X? (
+		x11-libs/libXrender
+		x11-libs/libX11
+		>=x11-libs/libXi-1.3
+		x11-libs/libXt
+		x11-libs/libXext
+		>=x11-libs/libXrandr-1.3
+		x11-libs/libXcursor
+		x11-libs/libXfixes
+		x11-libs/libXcomposite
+		x11-libs/libXdamage
+		xinerama? ( x11-libs/libXinerama )
+	)
+	wayland? (
+		dev-libs/wayland
+		media-libs/mesa[egl,wayland]
+		x11-libs/cairo[opengl]
+		x11-libs/libxkbcommon
+	)
+	>=dev-libs/glib-2.32
+	>=x11-libs/pango-1.30[introspection?]
+	>=dev-libs/atk-2.2[introspection?]
+	>=x11-libs/cairo-1.10.0[aqua?,glib,svg,X?]
+	>=x11-libs/gdk-pixbuf-2.26:2[introspection?,X?]
+	>=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-1.2 )
+	introspection? ( >=dev-libs/gobject-introspection-1.32 )"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/pkgconfig-0.9
+	X? (
+		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
+# gtk+-3.3.18 breaks scrolling in <=x11-libs/vte-0.31.0:2.90
+# >=xorg-server-1.11.4 needed for
+#  http://mail.gnome.org/archives/desktop-devel-list/2012-March/msg00024.html
+RDEPEND="${COMMON_DEPEND}
+	!<gnome-base/gail-1000
+	!<x11-libs/vte-0.31.0:2.90
+	packagekit? ( app-admin/packagekit-base )
+	X? ( !<x11-base/xorg-server-1.11.4 )"
+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
+
+	# https://bugzilla.gnome.org/show_bug.cgi?id=65410
+	epatch "${FILESDIR}/${PN}-3.3.18-fallback-theme.patch"
+
+	# Apparently needed for new libxkbcommon headers; bug #408131
+	epatch "${FILESDIR}/${PN}-3.3.20-wayland-xkbcommon-headers.patch"
+
+	# 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"
+
+	# 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"
+
+	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
+	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
+	fi
+
+	[[ ${PV} = 9999 ]] && gnome2_src_prepare
+}
+
+src_configure() {
+	local myconf="$(use_enable aqua quartz-backend)
+		$(use_enable colord)
+		$(use_enable cups cups auto)
+		$(use_enable doc gtk-doc)
+		$(use_enable introspection)
+		$(use_enable packagekit)
+		$(use_enable wayland wayland-backend)
+		$(use_enable X x11-backend)
+		$(use_enable X xcomposite)
+		$(use_enable X xdamage)
+		$(use_enable X xfixes)
+		$(use_enable X xkb)
+		$(use_enable X xrandr)
+		$(use_enable xinerama)
+		--disable-papi
+		--enable-gtk2-dependency"
+
+	# 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.
+	# https://bugzilla.gnome.org/show_bug.cgi?id=669562
+	if ! has_version '>=x11-themes/gnome-themes-standard-3.3.91'; then
+		ewarn "Tests will be skipped beecause >=gnome-themes-standard-3.3.90"
+		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
+}