Fix symbolic icon loading with librsvg-2.36.4-r1 and 2.39.0 (bug #487110, thanks to pingoo).

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

4 files changed, 312 insertions, 9 deletions

diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog
index ab33e21232bf..9abf963f65ba 100644
--- a/x11-libs/gtk+/ChangeLog
+++ b/x11-libs/gtk+/ChangeLog
@@ -1,6 +1,13 @@
 # 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.677 2013/10/07 16:41:48 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.678 2013/10/07 19:35:42 tetromino Exp $
+
+*gtk+-3.6.3-r3 (07 Oct 2013)
+
+  07 Oct 2013; Alexandre Rostovtsev <tetromino@gentoo.org>
+  +gtk+-3.6.3-r3.ebuild, +files/gtk+-3.6.3-librsvg-2.39.patch:
+  Fix symbolic icon loading with librsvg-2.36.4-r1 and 2.39.0 (bug #487110,
+  thanks to pingoo).
 
   07 Oct 2013; Alexandre Rostovtsev <tetromino@gentoo.org> gtk+-2.24.21.ebuild:
   2.24.21 tarball doesn't have introspection.m4 (bug #487220, thanks to
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index b3b626287442..b0a1443bd7b0 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -15,6 +15,7 @@ AUX gtk+-3.3.18-fallback-theme.patch 2841 SHA256 a552218132b903835a480881803e29b
 AUX gtk+-3.3.20-wayland-xkbcommon-headers.patch 1347 SHA256 9876be3bf2ef19413248e5de51e285aa1545b3d94751e840692b811c7b4bd9a9 SHA512 8397530f85a0b8e611ab30fd4ea6a3421c7862a8aeb05ba1eaea951a2e82738bc4482e8c04be620cc03690e413190cce63f0efe0cd39aecb62e70e754e8d240c WHIRLPOOL 0a1f78b076166af3727740fb736471304124dfcf1544a0452ebd6551cd0fe00a02d09ce2c44863c6df51d1b5030cfa849e89226662cc4f633ac820c4d5d2ef78
 AUX gtk+-3.4.4-isnan.patch 1507 SHA256 5219d12c27fa6deba8da1530c504288ec8cb9629fbcdc7a9c1e2890bc82c6fd8 SHA512 1bbae03def87a92167fcde8800ec5554b240174c07d7f434e45f5ffc7ae64092cbbc04d428d786c001c0efba071f5a6e2f7db5da161fdb2cd94459b58a6e98a3 WHIRLPOOL e27c9d8d8f69a81e693df85576a29e3ef8d0badfa5b0c7325c185699fc4a70790ac3a5c20406c5d1ddd5756bcb6d1dadf8af8cde0ed43f4d931072af6f4a6190
 AUX gtk+-3.6.3-darwin-gtksettings.patch 448 SHA256 dfe31a1144c6a394677952501d36ab37f5c7b9d460066fe648d61bac8a7c2884 SHA512 06559714f0ea18461faba73f5b6cf66f5eea611bd2e60dd7abcbb78249f78b37af4b6403953895c5e82164e74f6fa8b50cea0a6a958e196665b5664d5a0803bd WHIRLPOOL db9d78112ee6d02b974c43b5e0e0bde030b2f02fe989a78cc62c1e40fdbbafff25fd8e584a70104173b458483d4419597b649946604682d880c86eed5777b242
+AUX gtk+-3.6.3-librsvg-2.39.patch 2843 SHA256 98242248be49bbe84157ece3eaf8b5ce8088515c4c947c2283d7d221df918acb SHA512 a5786519575456972fed2ea54794bc8fc79f3e7875a941aa57dc60528a7727c3e31a93fe8f2d16b024c1f1591d33b1ea1eb56fa3eac22d369186bc43d01c22e3 WHIRLPOOL dcd400e5fbb2600b0bceca9feee32d8ae3d625121eab7f8adc79e362eeb7eccd304f411e9bdedb20af3ce010978370f5d15718c7ce983d7d0741af41d535f62a
 AUX gtk+-3.6.3-revert-recompute-font.patch 1594 SHA256 406dfec289aa5c97235b9f051e095af5a356550ecdcbe3250caabfbcd3e62246 SHA512 ff02d98c5d86884d354b4dbe09fa7d3ffcc6b878d2b465b66a1d0cf693bdaef0947194879717a420e43ba5253f84b6ff01df55a25c7b1e49ab6ab1a222d86468 WHIRLPOOL f242aaa6246cfabbde13a173be4a8a4bdb0cd8c8add98efb22e10191b4d5a280399f32d1158ce94aa4a9fca99aec7d9c9e780bc9b16f02526f49e60b19078a83
 AUX gtk+-3.6.3-stylecontext-font-crash.patch 2243 SHA256 a72ce114fac2069d26e454a0736366e31ab7081d3e35cd1c1e17ec573b14c65b SHA512 e9fc027c48ff92179a3207452756b917aef2fe72e7e43a33a09c92b2729ad7718397fd39d33007081ed705d1c2d2ad7268c45cb09c9f4d3bb33b3b43ec4fafe6 WHIRLPOOL aaa8d09bc3b86d97b92c3e3b3800377fa7aed73c19b5d1b572577e3878833aed24c85a16a2c618d0c4e4ea1e094e80a4e17654e9b13a580cbba61302b4ef093b
 AUX gtkrc 627 SHA256 22e4197e5976ed623233399049082383033b613176d77126d246a1f6cb747294 SHA512 9fb246b8e483cfb5f8d3666397d50547ad0cdaa8bdf5737e67e14dd100952438ac93396f0d752306c02aa4934453a43eb360093c4e323e99bbe0706c40171dc4 WHIRLPOOL fdb1c72ce448e867dd8d591455103fb7790919e1d7e77d6c5aa46e9a3fbc590ad6a189c50d2bc958896471a31b975940960307dc80a2d88416b77fca581b4dfb
@@ -36,18 +37,19 @@ EBUILD gtk+-2.24.20.ebuild 8521 SHA256 b5c08ca673c1870ed3fd041a329a7f804199d94e2
 EBUILD gtk+-2.24.21.ebuild 7925 SHA256 48ea6713751a472553360a5affdf0b2826c0e99e17e29156595b326738fc5296 SHA512 a49746f96d22fb4d8cc856447351861a7c178e0d5f61359498e2d4a8b9821e26471babb93adc5bb2c1ce8871b5224c90268d5b036cd00f7dc73fa26ffcdbac0b WHIRLPOOL 6f773246b1b10006e0a01725d1c56b6d3fc8a16effdb0dbe977b20fa749943a3827b54c841b9b6f21f3c559d849cdb4d7a0137b714d74d298fb0e6c7f30d7db1
 EBUILD gtk+-3.4.4.ebuild 7076 SHA256 aa0defe046743a54ec62a77bd6f778179741df78faf35a154b01461ec0739b7c SHA512 adf621a389b83a55299aefb964fb49baff2f76f700c9ddb3d4dd96defa04b1d6b3dfb928e5b9d80aa1c86ea84fab77573ef508d73927f9a44ef1b814b4af03b4 WHIRLPOOL 989fc4c62b80d70e6e26c643d8366dfd5bce856fa12fcb7947e9c553dea6ad493a3d3f5d33fb0ca528dfcc6186bb2db6a48002f0a88a677459f25ef46f147975
 EBUILD gtk+-3.6.3-r2.ebuild 7227 SHA256 ccdc5f9d82c48e2655789fdf63edbe4dddee056556c421e43192f1ab0cb63b3d SHA512 bc1997e9c8f9d5a9c7a0cc14c16bde36966c6b2cd4eeba00cdeee626bc7baae12751e80ea939e9552e08617d80219d9e1c2c8c1c0bf1f3a4f6a9448247b1c71a WHIRLPOOL 77a5bca0ea2afd16a62a542085872153dfcd02cef943af1b593b8fa4c0ed90aa790888475e0035679056b5bd408d7c4dd387fd396e2fe53c9dfe2c7950eff235
+EBUILD gtk+-3.6.3-r3.ebuild 7368 SHA256 3c495118c494955e2a152acfc9ce660f010451cbf0133f65542ea484e8fa92c6 SHA512 39f9a46e9c9f8fb123e6d0b1682892d0f469cc065144fb28c7b18013ee131a0b541d8a2231cf274395a46a70d29e5ee912583f1692f074b638a0a5b2b2fe20b4 WHIRLPOOL 80e830860fa4adc7d821bbc45c8729bc095c575f4240af905e490288ac1ff21a83ee7c251ed4be6c211b77337cf2a1437674ecd69c2089c7b4ebcfb8c568cc12
 EBUILD gtk+-3.8.4.ebuild 6607 SHA256 1f5f940303c53a6e39153626ca93427904ff8bfc0166a389c961c7454481b19f SHA512 72c42ec5b6f71b9874f5e06f07b364743b1143f8860c8b9f534f5cdd37fe72c095a43b85272fb4322e4c4a3f6f4a71d24d5a54d72cec8c0fd5ec2345f7420cfc WHIRLPOOL b172628ffa3d390299a7b5944b19027ffbcc5fd630a0731bc880bff5d7010518c0b63ff3cc814f8143bdd4d30b0f8585d28e56fed8ab310ffc8f9b192c07ac75
-MISC ChangeLog 7695 SHA256 2ff3be259c4799983aef0fe91ef9949f1cf7675233be8df065eac98b828168d0 SHA512 b1b0e02efee1ec9d1a9749ff7a920408773da54263a9c2b88f208a61982ae65843e4296d3e529f7e296d605177b7589e276b471dab29c27ebc79c0d9698f3666 WHIRLPOOL 16603a4bbfa7566c2f37993555a3aa8313ed14c4c9c1afcea7c1d5b6de9354d7f24ba9a6563eb315b46dac35a6d141d7b8ad1b11d29196280bc6de1a3bf3ee7e
+MISC ChangeLog 7945 SHA256 2f4646bb314585a464637e4b73746510aa7ae0329d13b38d1393152ba774340e SHA512 924c61efc7d9e89a88ce70cc3c2532ba36d96f1e4ad1d84d406f9cb86f3e218323091c3b2f8b6027ce2a832365b4bf73c9ea8afefd4ce481b613e9864272dcdb WHIRLPOOL 406748ec44a01c52103e9c1975a5f74ac977a65f5d0bdf88377f4715606bfe6ec47c32235f52c7b49d40e8e8799309a9974302296f9624ae7864371f398c7c81
 MISC ChangeLog-2012 98793 SHA256 cace01db369f8f0e2902b3893738711adaf7f92ce43ad566b1a38d73b2a90633 SHA512 98499bb7fc111d86c5bc87b5ca415d0d3e73c3a1b3655a14e164e28e45e5f4141a8f0e1c259177141abf9861aecf47e48bddd4b3dfd5b902e5ab01cd9ab24a34 WHIRLPOOL 618327a12a938e54f1e3f86299d51f1721d8be69b12c8ea33fc0061df3020d83dd20025feb658a3ca26a5e05338102e0a37a62ecf8224e3e492bb4e3b571ceec
 MISC metadata.xml 902 SHA256 f4bad589c3732f53e882bde561c44c6b1beb6fe0bea42f2149e1f3fd07929ffc SHA512 aec419c5cd0cb202c00ede6a7bd822fbe562654d95dab37f5fcd4ac47dfa19d20573a0dbe718fb582b0eaf2cc1636302825df5363075d09b3fb7f2eba7129897 WHIRLPOOL 89cb8aadfb3ae4c90d48997f8dbafd7d17da02a3ded145ce5b5ff17302353c181f9729d1e161e6cef163dfaf947624fb4526bb08e7d13675ef47aee59f4458e9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.21 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSUuRRAAoJEJ0WA1zPCt1hHbIH/2r+AISHT75ivk9s37gTDKkU
-CIJ0O4oGeYiC77vAJ0f4NO+mpCUMRKysD9/ozbu9vUCwt5uBmDRvJAyuh12fYeB6
-/8geN2JM75+OWZtGrTZCsmaeGgBritZNT4D6NF8gWyLQX45Zro+tgOXIZSN0Dvpy
-Em6tla0zyxU/FFvpdZmShCBe773CrnyXxC2roTEuPSxIuf2zDmibY669k7Dr5ESw
-u7DkNJQDrflDGX90BofOQXCcz0QN20GfWYfYt8ccyYuGNJo5O+KspclbNdTCPQBT
-+HTtkbjKv9R7WyvDD6V18as2zK86UeCcVBbqyiYw4VqtP7P5JvqLnlWcfFWHFic=
-=jdIs
+iQEcBAEBCAAGBQJSUw0MAAoJEJ0WA1zPCt1hSpgH/RMqa10L6bJ5rKJOiOxjnB3y
+4OakZdqQrrfObI/zx5uYfIGioVIThDPJRoAxkx247397hmpjhDsAJRnWEnAo1zHn
+UDRGvBTNIfxm/cNQOBzEkjZ2q0oAsg8F9vph1d2hlC/fkLw6DIxHJlZif7p3o3R9
+HhcoQsVeO82DAAOj8rUvanv++gsUw6gM/aH9ooAdT6b3l+KHj+FF43og9d+a9tb5
+2Juq8uKY3732Y481+G7mcOW/98tvMHnB8ZRdfbJLY85wQqkvihsH1EPysDPyDXJV
+8BT8L17varbrfOU/asMMYuhBo8HLjNyqCB7n4HtnQq8+G4D7ER1PVICrcTWaboM=
+=/iTP
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/gtk+/files/gtk+-3.6.3-librsvg-2.39.patch b/x11-libs/gtk+/files/gtk+-3.6.3-librsvg-2.39.patch
new file mode 100644
index 000000000000..42d3c9c05b18
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-3.6.3-librsvg-2.39.patch
@@ -0,0 +1,70 @@
+From b26c7c4b74de9767e5a7f0b72b590fb78a9c3adf Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <mclasen@redhat.com>
+Date: Fri, 16 Aug 2013 18:57:21 -0400
+Subject: [PATCH] Make symbolic icons work with the current rsvg
+
+The rsvg loader now restricts what external files it will
+allow to load from an svg. Thus our xinclude trick doesn't work
+anymore. To work around that, embed the payload in a  data: uri.
+This is somewhat ugly, but the best we could come up with.
+
+[Alexandre Rostovtsev <tetromino@gentoo.org>: backport to 3.6.3]
+---
+ gtk/gtkicontheme.c | 15 +++++++++++++--
+ 1 file changed, 13 insertions(+), 2 deletions(-)
+
+diff --git a/gtk/gtkicontheme.c b/gtk/gtkicontheme.c
+index 58b643f..fef4283 100644
+--- a/gtk/gtkicontheme.c
++++ b/gtk/gtkicontheme.c
+@@ -3174,6 +3174,8 @@ _gtk_icon_info_load_symbolic_internal (GtkIconInfo  *icon_info,
+   gchar *data;
+   gchar *success, *warning, *err;
+   gchar *width, *height;
++  gchar *file_data, *escaped_file_data;
++  gsize file_len;
+ 
+   /* css_fg can't possibly have failed, otherwise
+    * that would mean we have a broken style */
+@@ -3197,10 +3199,15 @@ _gtk_icon_info_load_symbolic_internal (GtkIconInfo  *icon_info,
+       err = gdk_color_to_css (&error_default_color);
+     }
+ 
++  if (!g_file_get_contents (icon_info->filename, &file_data, &file_len, NULL))
++    return NULL;
++
+   if (!icon_info->symbolic_pixbuf_size)
+     {
+       /* Fetch size from the original icon */
+-      pixbuf = gdk_pixbuf_new_from_file (icon_info->filename, error);
++      stream = g_memory_input_stream_new_from_data (file_data, file_len, NULL);
++      pixbuf = gdk_pixbuf_new_from_stream (stream, NULL, error);
++      g_object_unref (stream);
+ 
+       if (!pixbuf)
+         return NULL;
+@@ -3214,6 +3221,9 @@ _gtk_icon_info_load_symbolic_internal (GtkIconInfo  *icon_info,
+   width = g_strdup_printf ("%d", icon_info->symbolic_pixbuf_size->width);
+   height = g_strdup_printf ("%d", icon_info->symbolic_pixbuf_size->height);
+ 
++  escaped_file_data = g_markup_escape_text (file_data, file_len);
++  g_free (file_data);
++
+   data = g_strconcat ("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n"
+                       "<svg version=\"1.1\"\n"
+                       "     xmlns=\"http://www.w3.org/2000/svg\"\n"
+@@ -3234,9 +3244,10 @@ _gtk_icon_info_load_symbolic_internal (GtkIconInfo  *icon_info,
+                       "      fill: ", css_success ? css_success : success," !important;\n"
+                       "    }\n"
+                       "  </style>\n"
+-                      "  <xi:include href=\"", icon_info->filename, "\"/>\n"
++                      "  <xi:include href=\"data:text/xml,", escaped_file_data, "\"/>\n"
+                       "</svg>",
+                       NULL);
++  g_free (escaped_file_data);
+   g_free (warning);
+   g_free (err);
+   g_free (success);
+-- 
+1.8.3.2
+
diff --git a/x11-libs/gtk+/gtk+-3.6.3-r3.ebuild b/x11-libs/gtk+/gtk+-3.6.3-r3.ebuild
new file mode 100644
index 000000000000..7fad2f00efb0
--- /dev/null
+++ b/x11-libs/gtk+/gtk+-3.6.3-r3.ebuild
@@ -0,0 +1,224 @@
+# 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-r3.ebuild,v 1.1 2013/10/07 19:35:42 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 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-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/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"
+
+	# Crashes when opening various dialogs, bug #450370; fixed in 3.6.4
+	epatch "${FILESDIR}/${P}-stylecontext-font-crash.patch"
+
+	# Fix QA violation, bug #422541, upstream bug #704767
+	epatch "${FILESDIR}/${P}-darwin-gtksettings.patch"
+
+	# Symbolic icon loading with librsvg-2.36.4-r1 and 2.39.0, bug #487110; fixed in 3.8.3
+	epatch "${FILESDIR}/${P}-librsvg-2.39.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 \
+		--with-xml-catalog="${EPREFIX}"/etc/xml/catalog \
+		--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
+}