Version bump with various bugfixes.

Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61

3 files changed, 231 insertions, 15 deletions

diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog
index 6a418571c4a9..5505eff86d2e 100644
--- a/x11-libs/gtk+/ChangeLog
+++ b/x11-libs/gtk+/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/gtk+
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.627 2013/01/01 13:29:30 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.628 2013/01/04 02:59:00 tetromino Exp $
+
+*gtk+-3.6.3 (04 Jan 2013)
+
+  04 Jan 2013; Alexandre Rostovtsev <tetromino@gentoo.org> +gtk+-3.6.3.ebuild:
+  Version bump with various bugfixes.
 
   01 Jan 2013; Andreas K. Huettel <dilfridge@gentoo.org> +ChangeLog-2012:
   Split ChangeLog.
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index 1712820a0b87..114a112cd1a6 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -28,6 +28,7 @@ DIST gtk+-2.24.14.tar.xz 13258752 SHA256 8bd1b8b511a3004e8972badf467ce829e6855cd
 DIST gtk+-3.2.4.tar.xz 12261004 SHA256 f981bf514858c00d7084bd6f6c34b3c60b8aebdb959e7aca6faa59ed67c136bd SHA512 89eb2157262a448cf32a5c11cc8ab5a6b916c04119d16fb6f33a44e616e0236427921a0ee221df175c21f395a73958f02516f5aa6167ca2cc3f5b4550e8d3e3a WHIRLPOOL f9c67a34d5a3bf59ebd623fe16e81a471a4af90f698a50848d163ff1d6a6c0989a3d061951793a286bec00a6008db09bea70d513bcd47aab78f7387af62dbf37
 DIST gtk+-3.4.4.tar.xz 12854476 SHA256 f154e460075034da4c0ce89c320025dcd459da2a1fdf32d92a09522eaca242c7 SHA512 1a16f54a511f85a22f74a8ea82d218efa14ea5a58fc94fca805b0e321bdcea48a5f0a018a6d996c954ee80a51a2a16b68bdb2e3f3ab57c2362f3241c6cfa9a56 WHIRLPOOL eb1d117544aafec4936920a668b684959e89383b5b014512b82be0e99b7e48e3bdf81ceff4202b64179df4aa77453390d85a433d6e913cce8740a6b31701b15a
 DIST gtk+-3.6.2.tar.xz 13288392 SHA256 aaccf2e1576338acf37816290578e8f19888935f381665b3847076be25fe513c SHA512 3b67c75e1de29679f2d3ffb095d7999a89967c77673b9daa574f63c8553fab9075627c892f92a4e5caf618c8736a5b476994eb13cedd4b29dadcab19b1a5d5aa WHIRLPOOL 24113134e6e73d62e2e1694fc4f9f0f6a8d2d0a976efed9c5638e0d7aa62431f37b0ca96c5cea90f1915a0161a155ed4fdcd8e39347a0cc6d1ca768f710f4c1f
+DIST gtk+-3.6.3.tar.xz 13274804 SHA256 da376bc0623650b1560c844d94dc3bc259edb7cac14ebab1ba3325b566213801 SHA512 40534e2404b63c25a402a84f551e07e190d70f5fabd14ae01373dcea409a9e8ee1a71578e3e3c23fe6358abec87675499e7a4ded67f06d0a46b51407c9bf0d05 WHIRLPOOL 26696a105c29214289ab9816482e36d7ec77f5b903574b1ff3e340ae9e8ae8da73ad26bae9060f9293be32743eef5f4c1280d9bfd27656da0e758e41a17b4d98
 DIST introspection.m4.bz2 1181 SHA256 69a2a57b12179159420825d1d44c74108014b0864c4d63500265639cfa9151ae SHA512 4af08dc9a7b495949b61861d7e1a1184650dc33ab1b595544d8bef14d397a3759d97361650ab0e4812390f5fb5e812818937a2d5121246c651edd7d39a076a11 WHIRLPOOL 6b9de2bee5898a9645c07c68586df5e96205d52fb6a6c77c971e8c0742f8436fce76de2b553d0533fbbe4976363180b49ae201c1a1303dfa05585db32ebc61fc
 EBUILD gtk+-1.2.10-r12.ebuild 2393 SHA256 1375c5850b23a82e3724f3ad23be8058dcf1c164e146aab6d8b60dd55f3c694d SHA512 4fffd0ed56f05583f5d12fafb47bfd90c84cd81d568d0f425620b3b867fa33e746bfdff528cc798c524781689ed55017b823a31b168b53447950e8abaca14d62 WHIRLPOOL 03b4508a09c1f18ce53bea5aac93658f3205e6fd727acc93903a7af23dc970defcc6e819eaccc2d4cb7793b7bdd0d13fdbbf535ec7d7ddf5178202e2e4571850
 EBUILD gtk+-2.24.12.ebuild 8395 SHA256 bb0df7d6771c06c2195df54a48d1b006b32a5d21aa493a4b8bad9d16c220eed6 SHA512 5ba4f233729d17ea3f4b0d6cef446f6e5d2bb939daec1b81d3d3055ff79c2b54402a59a8c6c7e28d5e316b0e51b4426f0d860c1996848dcea6b7c44043dacf57 WHIRLPOOL 177555bdcea980e48a2d037fbaa4ec607093271ab63908c12c4afb57f1ae684b3206bd0e913ed78981a59df6379ee2470fb08bdb4be3c5a269c6d9dbdcd31735
@@ -36,23 +37,18 @@ EBUILD gtk+-2.24.14.ebuild 8395 SHA256 dbc956990101408216e2f0e79e11d8157cb186619
 EBUILD gtk+-3.2.4-r1.ebuild 6922 SHA256 a5a138e1243cc1a25f6d6a29f9a1f3fcffabc939b4c12cb4c6fbfd46f1059299 SHA512 0a67fb5b8114ad8fedcc54dbc0d0ab9db1ec7252d7cc4f6bd092f770fa8c85de9bd743738d1da2824c18382e065dab95e27f1acd8b1347203777ee6a22ef65af WHIRLPOOL ffabadedaea7bbc5807ec2304c45d758156f9c40e3319a1c88eea4600221f3cbe35e27b1d4a1d05f0985117b715152c46da8bbb9b7f20cfef6c3fba726bf6178
 EBUILD gtk+-3.4.4.ebuild 7094 SHA256 928b0f6acf86fba5109d8e8f4d5bc1b365d19ec8092b2b7103f5c8ff005cda27 SHA512 2df2bf8b4c9d1535a2c4ca3a27f2324de4eff6ec79f712ff4cef72849fdb0b0fc6a7cb8a5084483881d97e55032c177e3c59f92f60444d0701c53b76224b1ac5 WHIRLPOOL 745c204b2459e94a6fa225a4d19a99581ff3f71713a3559cdd9a6871f8fff80c6c7e5c673059a2377145b16dda5ffb1371ad0c9bb0bf0eb806000a3e49d1f6bb
 EBUILD gtk+-3.6.2.ebuild 6925 SHA256 af197eece03f09038608ba677cffab72f039d4d2a29a94bde92518508bee48e9 SHA512 a1524689e9d2dd9b334e4bf1be452aa6f6e00611444a30aa62426c0fe7e6c0d74037c37ea80a65e2409037701816810a112a2c679c996dbba9ad64eb8b5c9562 WHIRLPOOL c42d2e1ea314072c1c0810c549b6cf9c69dbb67668b7353694f9d18ac2e9814198d397df1f0d76bd23eab977fb468dbaa9f6e7b6b28ad931f51cb51e8eff9ecf
-MISC ChangeLog 350 SHA256 123408e99995afa3df35f69f754f208c4be350f10b54334454adb223be16cdfc SHA512 4cf5d71267cd884fd6eb7181b754491fd3a66a92f2f35a970dbc3a424d101889778bcfaef402526a5e81436a7955af9f0fa429c48eff45dbbe03f5d89138f1e5 WHIRLPOOL 3cf793706540cb99788fe339b296be9d2f49e22b7a78d89f026f0b7a16653f34f160ad6e506b82d0750e45c9ef206fb66d10944269b7daa7aff156053ca594af
+EBUILD gtk+-3.6.3.ebuild 6930 SHA256 e804b05698c99cd41e3ceb9c833bb078a72a8ce99de9a5d8e328a526432f7c62 SHA512 a22020dab398c32fb9399df07b1e1abda1c5481f19a3c8b3d636de7f928c2b7d78c115eda1cfa1e22f7fa4f52e441a9509bad11079c129b108ca77db11450acd WHIRLPOOL deba6c163edc06b51045a30878fd6d1e6887cbbc3ad0251676752d8fdcb8fbd3106a053318343e2b226b426e4949e5319bf8fdff2e0e9c2ed203e3afd40c03ad
+MISC ChangeLog 495 SHA256 7016f5cd84704b8554d22c3cc373baca0f320da079f74d5d0ebe782455027ab9 SHA512 dacacefa932d02e2ac7f9d824e30ad3ea95d2877b96513a59c44b05488d63d286c684ab0a1d3da6fefd5cb0c278c218c45e202efc8dfa942dd5392554303c84c WHIRLPOOL e31fdf17b6e154db7ec7ef83462ee900ad5388a873fa37b5d85788eeb6417eff5dede6ce3841f0b74879a8b2303b77060bc149e72f48cc9733c3c29a5465b491
 MISC ChangeLog-2012 98793 SHA256 cace01db369f8f0e2902b3893738711adaf7f92ce43ad566b1a38d73b2a90633 SHA512 98499bb7fc111d86c5bc87b5ca415d0d3e73c3a1b3655a14e164e28e45e5f4141a8f0e1c259177141abf9861aecf47e48bddd4b3dfd5b902e5ab01cd9ab24a34 WHIRLPOOL 618327a12a938e54f1e3f86299d51f1721d8be69b12c8ea33fc0061df3020d83dd20025feb658a3ca26a5e05338102e0a37a62ecf8224e3e492bb4e3b571ceec
 MISC metadata.xml 819 SHA256 209dfda45798143d24e44a476d11c0c1b6d714069cbdb45e1eda91384d316266 SHA512 2c67e6ef20846e825c2b9f90a4f1d8d69d20bcaeae0b27b4d318944653259e4f0afe4107ed457471f36cb832eefed007bde17f4aa59d8c97062fb641f4adc9d0 WHIRLPOOL cb99e984950e6144a68886606962b66004dc2b97e6930fe350ddb7a0a5bb0e2f4af671f9c9292be803629a05ce7fe4dc2a9ebef422951568e8c2f20aa53b378a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQ4uUEAAoJEEb+UGWnxTyH6OkP/0OAJHF+/ATkaIYGNJEC++0A
-pQDaRzAWGS53gCqfaLfuzkF3gQ2usvqew86GSAZqPM8oo8zfraGIAam3foNlXhhZ
-trlFNyJhB8Q1M6J2G3xaUclqumukAT38/eE8XvDleGCm2VPmIbfZE0kVYzfmAXdV
-JAwp72cj7zYQuBOeyahdXvq0i3l37daNtQEObyIi7nyvpoyaKvGF98vivZvuittM
-ZtXn/NH6vKjR/q3oZZ6ThguxKrk0gAg03Fz2F2Jx4+7fnc9j0FCtf60NU1uIdOsR
-0kU/h908wLydaSJRGjW6q+KqdmLEhLZgyirU0ufxo2shfMZMkB3DgHwnUQs5iDq8
-RRFuAS2CFo6IZmrBrObalHHjkwlIzxnxgLkxdTucoxDDHNJMzepJ4KkybMoi8SCS
-rQUsqxSIR8kx7vkPY+3FfuYlq4hOHQX1ClB6SrFFIG0aiJBN7BFb+RgoFjR/5wX2
-urfWu8CkPz6zqQ3G736xwG5hivXSqPAX69UQGcuQuiQxwnhuCgdwLmdDdTFABoQb
-WfevDbk+UYGH513fNw37Ya0jSvaMCFm/AockCOKKtKzCXK4UxLOobJVW6jEzZyFV
-HzClGbW9Rtw6WFPVNXn/aVEF9GYM6+4VffqjziCinfUNyqFkZ5UDOCv3TwDh1Ygk
-YBoHfzm70EwXW3/Vqrh5
-=kC8i
+iQEcBAEBCAAGBQJQ5kV2AAoJEJ0WA1zPCt1hsxoH/jcWJQ6k5j/ELEYa7scmxYbC
+CtYy2g//P2UuZ1f2Bje1+Ay4rCYI3DHjHr3C1bfTqACy5xUndkACwG6EOrNQ17UR
+AkMJKCb6ydq6WBGNMo5j3UzA5eKzsw09KzlIj1u5aUfaVNjifucx01INmUGZqO4S
+Q9+PPQsQGbsH1EWm+D1q3Mu8CPBIDpdQ9G698y/Ys8sR2u/y35nxndAKcnqBY/Q9
+te9mH1eeVJhuU8UsuD/nmnNhCoOqOoPPfx26QhdWRxrnh+4zKanzLvGneXXblRkC
+aRnyFEU+8B7Ihv4IrpyDJbNky+o7NW7oqjzGmCjhGbkD8xvDnw/hbGgZLz+rGLE=
+=Ry3g
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/gtk+/gtk+-3.6.3.ebuild b/x11-libs/gtk+/gtk+-3.6.3.ebuild
new file mode 100644
index 000000000000..fe94e4a11fa0
--- /dev/null
+++ b/x11-libs/gtk+/gtk+-3.6.3.ebuild
@@ -0,0 +1,215 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-3.6.3.ebuild,v 1.1 2013/01/04 02:59:00 tetromino Exp $
+
+EAPI="5"
+
+inherit eutils flag-o-matic gnome.org gnome2-utils multilib 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 egl 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 ~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? (
+		>=app-accessibility/at-spi2-atk-2.5.3
+		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-1.0
+		media-libs/mesa[egl?,wayland]
+		>=x11-libs/libxkbcommon-0.2
+		egl? ( x11-libs/cairo[opengl] )
+	)
+	>=dev-libs/glib-2.33.1
+	>=x11-libs/pango-1.30[introspection?]
+	>=dev-libs/atk-2.5.3[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}
+	app-text/docbook-xsl-stylesheets
+	app-text/docbook-xml-dtd:4.1.2
+	dev-libs/libxslt
+	virtual/pkgconfig
+	X? (
+		x11-proto/xextproto
+		x11-proto/xproto
+		x11-proto/inputproto
+		x11-proto/damageproto
+		xinerama? ( x11-proto/xineramaproto )
+	)
+	>=dev-util/gtk-doc-am-1.11
+	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=654108
+	epatch "${FILESDIR}/${PN}-3.3.18-fallback-theme.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
+
+	epatch_user
+
+	[[ ${PV} = 9999 ]] && gnome2_src_prepare
+}
+
+src_configure() {
+	# Passing --disable-debug is not recommended for production use
+	# 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 \
+		$(use_enable aqua quartz-backend) \
+		$(usex wayland $(use_enable egl wayland-cairo-gl) "") \
+		$(use_enable colord) \
+		$(use_enable cups cups auto) \
+		$(usex debug --enable-debug=yes "") \
+		$(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-man \
+		--enable-gtk2-dependency \
+		--libdir="${EPREFIX}/usr/$(get_libdir)"
+}
+
+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.6[gtk]'; then
+		ewarn "Tests will be skipped because >=gnome-themes-standard-3.6[gtk]"
+		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
+	prune_libtool_files --all
+
+	# 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
+}