Include image data in the builtin icon cache (#518352 by Leho Kraav, Rafał Mużyło...

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

diff --git a/x11-libs/gtk+/ChangeLog b/x11-libs/gtk+/ChangeLog
index a80b74131e0d395e138ce7569316624a7a805c7c..e614305b05b627ba1473177063656809b39191b4 100644 (file)
--- a/x11-libs/gtk+/ChangeLog
+++ b/x11-libs/gtk+/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for x11-libs/gtk+
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.752 2015/01/01 21:14:20 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/ChangeLog,v 1.753 2015/01/02 11:53:03 pacho Exp $
+
+*gtk+-3.12.2-r2 (02 Jan 2015)
+
+  02 Jan 2015; Pacho Ramos <pacho@gentoo.org>
+  +files/gtk+-3.12.2-builtin-icon.patch, +gtk+-3.12.2-r2.ebuild,
+  gtk+-3.14.6.ebuild:
+  Include image data in the builtin icon cache (#518352 by Leho Kraav, Rafał
+  Mużyło and more), newer gdbus-codegen needed (#500216 by Vladimir Dolzhenko),
+  unset DISPLAY to make tests work in more environments (#527682 by Gangræna
+  Gorgeous, Mark Wright and Alexander Tsoy).
 
   01 Jan 2015; Markus Meier <maekke@gentoo.org> gtk+-2.24.25.ebuild:
   arm stable, bug #529964

diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index 1a7f40f5c00e71a70f9753713e853aaf2d34f3f5..3db91f5571d7e4d985a1910583f071d637a7934c 100644 (file)
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -9,6 +9,7 @@ AUX gtk+-1.2.10-cleanup.patch 246 SHA256 6db4c8163e3e9032b5195acf230773d9bfd0c38
 AUX gtk+-1.2.10-m4.patch 220 SHA256 88f45c2f0413f29d62ca138c87b41d24a73b47456f5b469277843de827717324 SHA512 4900aad1e8b84f3fa9bc497455fe28d521950708e33274da5776f18444f19bdb383d65406142550f2fc6fb7bffe5ac5fd7b1c40ac2d008ab166a1a0c6a8b1d8b WHIRLPOOL d68204ec81a08541b8fd4076f8082882371a21563fed02519563edcbb1d4390600ab86d492703f43115c2a6c7b59ce4a140abd13de18db04a1e775bfa31f0653
 AUX gtk+-2.24.20-darwin-quartz-pasteboard.patch 435 SHA256 3eaf1b2f534309344f046c1155b29d821c96287360705f13d88e182e720777b1 SHA512 123526aadb43c98490f361b964d709d78b9e10beebb845b71474a4db8eb7bfe1b102a9736b50f4c6e20bb4fa7ad8dafa52e4237f30dcae9094d2575446148126 WHIRLPOOL cf9bde6aac5e34dae5e5788d0a098e2c1230c585cb614a71d784ca587c6f0bc5f874d42d684af2e9d2314df8a2aee23e2a66d8fb36f625f04925374a7ba5bd64
 AUX gtk+-2.24.24-out-of-source.patch 1487 SHA256 3492f3c22df40f7e0696098eb689b949ce0b6152293aba0a54adb8a859ec5250 SHA512 794903f8254a49f7d0e24f9730658dc69184969bb450419bd34bc2a9e7065d99931df4ae5ecd93abc0a18bff546aeb6816aae47531e8a79dc5aef5beaf9b6aa2 WHIRLPOOL abc0a7572bd27afc3d4b0d0dbae78e93ebfec8c8bbc6787c632de80401d4f0b9f6621ccb0fbae867a70cea8767f97542b7c42c9f532598676d89563677cd79d3
+AUX gtk+-3.12.2-builtin-icon.patch 916 SHA256 ab655e9de25bc30698312108a87f15ce208004b38800ae802e62133007197758 SHA512 a12d25e92854c0e73ada4edf4ef26ccde18c052c229c2de1ab03feb26759452de804d44c51954584e68aa42ae0fae3c254aae19fd50bf999e6eda2c0c619f467 WHIRLPOOL 2077652a65be2073193cbb6f3fdcf5de7f5c1474cd98bf464b5a6adcca560fb5fc4f86f0ba50fd6da387fdd18c5fde53b4a1395ce3b9ec34f981b376e5f149da
 AUX gtk+-3.12.2-darwin10.6.patch 1269 SHA256 ecda99fd1a105c09843183b1a2709c605d7c5129f2985fd8a29d32b967eb8537 SHA512 2dafca048fba34f1b06430cc70e90b148dfc325e67dbe90195440609adb60fa4bdea9cb7dd0d16cf039452151271bf137e9c3ea8277a8795e3d0cd719bbc05aa WHIRLPOOL c464c8b573e256b44552150b8bc7be43e2c7112d5a0032be452323bd914830b7b35f04f6240c2ba8d696161753df19ffd7a6ac20626299392877e4e06bc10d5e
 AUX gtk+-3.3.18-fallback-theme.patch 2841 SHA256 a552218132b903835a480881803e29be678a311d3a653b8111eba1fd0ea04922 SHA512 2be5cd482625292780e88c6be5ec3e2932a1b3187ac57f2a0bbb37ebdeb9b34e56481a4ca74fc7af088389fb68dbb748e8e2cffc984052695fa6032bff0556cb WHIRLPOOL 8ae2ea9175a6ad5e0cfa6f8e018bd9ddb580548f496a81360ca302cc9d4d7cf70f5cb86f52967ee770e71f530b238d7b070b8aa61ffd040990ef0cb7b1811804
 AUX gtk+-3.3.20-wayland-xkbcommon-headers.patch 1347 SHA256 9876be3bf2ef19413248e5de51e285aa1545b3d94751e840692b811c7b4bd9a9 SHA512 8397530f85a0b8e611ab30fd4ea6a3421c7862a8aeb05ba1eaea951a2e82738bc4482e8c04be620cc03690e413190cce63f0efe0cd39aecb62e70e754e8d240c WHIRLPOOL 0a1f78b076166af3727740fb736471304124dfcf1544a0452ebd6551cd0fe00a02d09ce2c44863c6df51d1b5030cfa849e89226662cc4f633ac820c4d5d2ef78
@@ -30,16 +31,17 @@ EBUILD gtk+-2.24.25-r1.ebuild 9931 SHA256 673dab9c3a0d41cf0a834358f2625f4eb0b1b5
 EBUILD gtk+-2.24.25.ebuild 9307 SHA256 a161027f7138affa448629679ccf0a7b54ce0943b2d86187d5be33b845ed729d SHA512 c7a56b7011640eaae8e08a1bc41119aa39fee8289bd50ce6596f76ee780867e3c6ea729751ef2fd21149ed495943d63c744a614b05c79042ab79806c90efc8a1 WHIRLPOOL 9049f6f4fdf151147d860dc5a1ef40a3b52641734bf4eead998959847a4e6b2d1310177c72e9c618633b67dc175962e3ace6ba642bcbcbf37cab2f2494e67fd0
 EBUILD gtk+-3.10.8.ebuild 6476 SHA256 538f97ea50eded5aa850c46f2cca1d25f8742700aa0bf69bef2872b06bae83e9 SHA512 69b710dd6ba6f356a6b9f0bb425957b160a39666762d64ffe32839471b7386403dbd9e3f826b2b904b819be7671a256361738b217f2be5afe91d5898be6675cb WHIRLPOOL e0d166bad4fdaec041280aab3f2c77945d584c3919e9a5fdeca0e0c6b2b542ea854983a756dcb21498d447dd7c6f3208dcc99fe62ecddf9a8704990c82ba8cb3
 EBUILD gtk+-3.12.2-r1.ebuild 7955 SHA256 45a2af90ec49cde7fb697e1d254e9cc4f9558b465b0bbbaaa8e314db6b76c6b1 SHA512 9899184828fd5157751324ddeb0ae3fdf415567d32626363ffbeb4ed3e1de2fc5fdeef8e0878bf8eb7bbb0c34b98293bd6f76a410fe9424106c2a000b58b1b2d WHIRLPOOL 8aec7706aeda8e30822991c53770311e47863b3a22b376946788d08458567ca0a73289b07e8d6478eb41e059e43141c861044c32e0c7a8fdce963eb45115f665
+EBUILD gtk+-3.12.2-r2.ebuild 8224 SHA256 4d833909ed83ac025864ac24afb1e25399c0cf8fdbe43f7f45bc0ebc46937d27 SHA512 b2a823e5da0be7a2d10d27d78e88858371f49d165412965b356c7b534d846a76a883f7d54d6ede2f26cfe07d686aedf04b7cd11c9326e79710a210a1fd3a44c5 WHIRLPOOL 86215ba90ef03866bb22ce146531356428e99c733d3266c8196a6e34330abca6649ed0fbbf48f0be3caf2554c343a3a62ec57eb4e095fafc09448d5e368d7cdc
 EBUILD gtk+-3.12.2.ebuild 6597 SHA256 be97832d070fab365a441ef5b124b803417f8ca1fa1fefd22f17772af6632e7e SHA512 d78b8d1696f16607feb4b2695ae48756cf69ea7704b73a1dda99e6f7aec119e8483c2f4197dba17188131ba9ea9a7fc18d1c97190ff3dd3a1981c3093810cd05 WHIRLPOOL e6435dd7ee84c81b9e5f1fa6b9989b6c0bd62aad8f8e35419a6dce57e174507cf60968441681057dfdcd0924f50de8409881f341253fc0d1421faedfe5a67467
-EBUILD gtk+-3.14.6.ebuild 8006 SHA256 9fc82c17b2528ab3b0bc3daadd4ed482f77b6ac0bbf82dcd36b6c0f4899cbd83 SHA512 cc9110ff3243f41ad716e785e095328335756d16669e021f02f2931442ad03ffb678a5a1da12d15f439698ec3aa0718562ea0f91f9f856dae17e0d4914123955 WHIRLPOOL 9ac8d9236be33132e0d5d30b52b2ae0f3a099ff1c17837bbaca1ff76e90cd976db0b6f4e77818c7ed369c8c2d31276a3afd1055329dfbf017a1d78737a10fe65
+EBUILD gtk+-3.14.6.ebuild 8040 SHA256 aae9cbdc6b7332f372c5812aa3acda4a1b146e0ce326a744f9c41bf78eb3b3ad SHA512 c9b1663f5bdeb4c09185a7a217b8c99e6861d69d627915d7be90df461ef8f5b8905f83aeafada13fabf74d7d81b56612049ecaedce9ae434553181677af02a5b WHIRLPOOL 161a436e21840e4a6e6bc269b0397a82deb7a410bdb3f8c9f096b35d8c668b39a388b9e4710290c0911d15e82d14ad5090672db56bb8394517b51c148da673e9
 EBUILD gtk+-3.4.4.ebuild 7078 SHA256 5c03753346c92b03ce8876ff2223240855225ac69f8e99ad3d0f594778f4d83c SHA512 2b86d907df0cf1613d4aab3adc4ccbec8960513cd07dcbc41a933587a7cba85d0c7e078158431f5315ec91818f7793d2deed76d4ec643d5df19682193e1b5570 WHIRLPOOL f2196bef499be6eec55554d2dea442f7aa480c13fb590dab010efb6564886bb746b27479265c4ba48a93a0c630e574a37cf319fee228dfda82d333c8e4a3b093
-MISC ChangeLog 18636 SHA256 36cb44746c43b8cbcd8b7d191c306c71ff9633134c8fba1bad31539e96601a8b SHA512 35891a9a01608add2716d96841b14a1ba089dd1d7190946a73abf466cd6ccf9c8dfd5cc2f891685114345682fe61a38d943e525c385482f6cb5e216843e9c1dd WHIRLPOOL ee22afb10b0228566d8119dc5e5f4841a7ed4593ec93b53da1403bf56473de78f93d2dc4be77dd26084fc10ca00166531db8cb351da2dff61dcb8c2b66b9744a
+MISC ChangeLog 19083 SHA256 1147874912913788c7653832e27d92d0de0baa1a8a584e45347084c051896701 SHA512 b2860376f20211146fa77fb09b9f7c9e93eea2d6c013aa7ddb3b6c6101de1613f5a2b9a15ff04d089a188fc34e47f0e46edb9424b2ed2ebc37d189e8ec6e8204 WHIRLPOOL c1d0a9e0142b645db1dd70d3cdab10e0a30a16b2e6f37d40325685f467dd143ad26c479f3cc70c53f56c3678d197c12eb370b6aba8c5587058dac334d76a2148
 MISC ChangeLog-2012 98793 SHA256 cace01db369f8f0e2902b3893738711adaf7f92ce43ad566b1a38d73b2a90633 SHA512 98499bb7fc111d86c5bc87b5ca415d0d3e73c3a1b3655a14e164e28e45e5f4141a8f0e1c259177141abf9861aecf47e48bddd4b3dfd5b902e5ab01cd9ab24a34 WHIRLPOOL 618327a12a938e54f1e3f86299d51f1721d8be69b12c8ea33fc0061df3020d83dd20025feb658a3ca26a5e05338102e0a37a62ecf8224e3e492bb4e3b571ceec
 MISC metadata.xml 848 SHA256 cfb2904b37626135ebeb5e4be0626a51e68d64e211414eefde98b738631d82f0 SHA512 7c0cfa1f2b09ca41911e4f6ccad76becd4f6edf4c5c1a9e3e60eb423b907f08d15c2bfbef378773b9428232d1e7c20bd250eec0b327d073f4de41f815ce92226 WHIRLPOOL 786c7b8987736aaa4fa7b637b84f81e56765f435c77d65aa0afe9409d4bc6c191cf04ad4bab4d7c7b704a2762c828346f1042b408234b38c145abb21df0fbd21
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlSluK0ACgkQkKaRLQcq0GKriQCfRbLJdGEuMUHtJWz5SgX8VHF+
-4k4AoIGSzEmzRpsu8p1SjZmcFCJqCAJ+
-=2a2i
+iEYEAREIAAYFAlSmhqEACgkQCaWpQKGI+9SprACeJPfPwgboVxkwg6T1GpbESw4x
+VwcAn3dKuOZDFSJuIvkKahXYaQzm2ub6
+=haP+
 -----END PGP SIGNATURE-----

diff --git a/x11-libs/gtk+/files/gtk+-3.12.2-builtin-icon.patch b/x11-libs/gtk+/files/gtk+-3.12.2-builtin-icon.patch
new file mode 100644 (file)
index 0000000..176583f
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-3.12.2-builtin-icon.patch
@@ -0,0 +1,29 @@
+From 46ac7e51d96c8ffb41c1c055fbe97474dcf096f8 Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <mclasen@redhat.com>
+Date: Fri, 15 Aug 2014 10:37:05 -0400
+Subject: Include image data in the builtin icon cache
+
+
+diff --git a/gtk/Makefile.am b/gtk/Makefile.am
+index c281666..9369273 100644
+--- a/gtk/Makefile.am
++++ b/gtk/Makefile.am
+@@ -1779,8 +1779,13 @@ else
+       $(AM_V_at) $(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache$(EXEEXT)
+ endif
+ endif
+-      $(AM_V_GEN) $(gtk_update_icon_cache_program) --quiet --force --ignore-theme-index               \
+-         --source builtin_icons stock-icons > gtkbuiltincache.h.tmp &&        \
++      $(AM_V_GEN) $(gtk_update_icon_cache_program)    \
++              --quiet                                 \
++              --force                                 \
++              --ignore-theme-index                    \
++              --include-image-data                    \
++              --source builtin_icons stock-icons      \
++                      > gtkbuiltincache.h.tmp &&      \
+       mv gtkbuiltincache.h.tmp gtkbuiltincache.h
+ 
+ EXTRA_DIST +=                   \
+-- 
+cgit v0.10.1
+

diff --git a/x11-libs/gtk+/gtk+-3.12.2-r2.ebuild b/x11-libs/gtk+/gtk+-3.12.2-r2.ebuild
new file mode 100644 (file)
index 0000000..a149934
--- /dev/null
+++ b/x11-libs/gtk+/gtk+-3.12.2-r2.ebuild
@@ -0,0 +1,256 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-3.12.2-r2.ebuild,v 1.1 2015/01/02 11:53:03 pacho Exp $
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit autotools eutils flag-o-matic gnome2 multilib virtualx multilib-minimal
+
+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 cloudprint colord cups debug examples +introspection test vim-syntax wayland X xinerama"
+REQUIRED_USE="
+       || ( aqua wayland X )
+       xinerama? ( X )
+"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~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="
+       >=dev-libs/atk-2.7.5[introspection?,${MULTILIB_USEDEP}]
+       >=dev-libs/glib-2.39.5:2[${MULTILIB_USEDEP}]
+       media-libs/fontconfig[${MULTILIB_USEDEP}]
+       >=x11-libs/cairo-1.12[aqua?,glib,svg,X?,${MULTILIB_USEDEP}]
+       >=x11-libs/gdk-pixbuf-2.27.1:2[introspection?,X?,${MULTILIB_USEDEP}]
+       >=x11-libs/gtk+-2.24:2[${MULTILIB_USEDEP}]
+       >=x11-libs/pango-1.32.4[introspection?,${MULTILIB_USEDEP}]
+       x11-misc/shared-mime-info
+
+       cloudprint? (
+               >=net-libs/rest-0.7[${MULTILIB_USEDEP}]
+               >=dev-libs/json-glib-1.0[${MULTILIB_USEDEP}] )
+       colord? ( >=x11-misc/colord-0.1.9:0=[${MULTILIB_USEDEP}] )
+       cups? ( >=net-print/cups-1.2[${MULTILIB_USEDEP}] )
+       introspection? ( >=dev-libs/gobject-introspection-1.39 )
+       wayland? (
+               >=dev-libs/wayland-1.3.90[${MULTILIB_USEDEP}]
+               media-libs/mesa[wayland,${MULTILIB_USEDEP}]
+               >=x11-libs/libxkbcommon-0.2[${MULTILIB_USEDEP}]
+       )
+       X? (
+               >=app-accessibility/at-spi2-atk-2.5.3[${MULTILIB_USEDEP}]
+               x11-libs/libXrender[${MULTILIB_USEDEP}]
+               x11-libs/libX11[${MULTILIB_USEDEP}]
+               >=x11-libs/libXi-1.3[${MULTILIB_USEDEP}]
+               x11-libs/libXext[${MULTILIB_USEDEP}]
+               >=x11-libs/libXrandr-1.3[${MULTILIB_USEDEP}]
+               x11-libs/libXcursor[${MULTILIB_USEDEP}]
+               x11-libs/libXfixes[${MULTILIB_USEDEP}]
+               x11-libs/libXcomposite[${MULTILIB_USEDEP}]
+               x11-libs/libXdamage[${MULTILIB_USEDEP}]
+               xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
+       )
+"
+DEPEND="${COMMON_DEPEND}
+       app-text/docbook-xsl-stylesheets
+       app-text/docbook-xml-dtd:4.1.2
+       dev-libs/libxslt
+       >=dev-util/gdbus-codegen-2.38.2
+       >=dev-util/gtk-doc-am-1.20
+       sys-devel/gettext
+       virtual/pkgconfig[${MULTILIB_USEDEP}]
+       X? (
+               x11-proto/xextproto[${MULTILIB_USEDEP}]
+               x11-proto/xproto[${MULTILIB_USEDEP}]
+               x11-proto/inputproto[${MULTILIB_USEDEP}]
+               x11-proto/damageproto[${MULTILIB_USEDEP}]
+               xinerama? ( x11-proto/xineramaproto[${MULTILIB_USEDEP}] )
+       )
+       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
+       X? ( !<x11-base/xorg-server-1.11.4 )
+       abi_x86_32? (
+               !<=app-emulation/emul-linux-x86-gtklibs-20140508-r3
+               !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
+       )
+"
+PDEPEND="vim-syntax? ( app-vim/gtk-syntax )"
+
+MULTILIB_CHOST_TOOLS=(
+       /usr/bin/gtk-query-immodules-3.0
+)
+
+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
+
+       # Build fix on Darwin 10.6; bug #519058
+       epatch "${FILESDIR}/${P}-darwin10.6.patch"
+
+       # Include image data in the builtin icon cache, needs --enable-gtk2-dependency
+       # and, then, upstream reverted this patch lately. Fixed in 3.14.x, bug #518352
+       epatch "${FILESDIR}/${PN}-3.12.2-builtin-icon.patch"
+
+       if ! use test ; then
+               # don't waste time building tests
+               strip_builddir SRC_SUBDIRS testsuite Makefile.am
+               strip_builddir SRC_SUBDIRS testsuite Makefile.in
+               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
+               strip_builddir SRC_SUBDIRS examples Makefile.am
+               strip_builddir SRC_SUBDIRS examples Makefile.in
+       fi
+
+       eautoreconf
+       gnome2_src_prepare
+}
+
+multilib_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_SOURCE=${S} \
+       gnome2_src_configure \
+               $(use_enable aqua quartz-backend) \
+               $(use_enable cloudprint) \
+               $(use_enable colord) \
+               $(use_enable cups cups auto) \
+               $(usex debug --enable-debug=yes "") \
+               $(multilib_native_use_enable introspection) \
+               $(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) \
+               CUPS_CONFIG="${EPREFIX}/usr/bin/${CHOST}-cups-config"
+
+       # work-around gtk-doc out-of-source brokedness
+       if multilib_is_native_abi; then
+               local d
+               for d in gdk gtk libgail-util; do
+                       ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die
+               done
+       fi
+}
+
+multilib_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
+
+       # FIXME: this should be handled at eclass level
+       "${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/gtk" || die
+
+       unset DBUS_SESSION_BUS_ADDRESS
+       unset DISPLAY #527682
+       GSETTINGS_SCHEMA_DIR="${S}/gtk" Xemake check
+}
+
+multilib_src_install() {
+       gnome2_src_install
+
+       # add -framework Carbon to the .pc files
+       if use aqua ; then
+               for i in gtk+-3.0.pc gtk+-quartz-3.0.pc gtk+-unix-print-3.0.pc; do
+                       sed -e "s:Libs\: :Libs\: -framework Carbon :" \
+                               -i "${ED}"usr/$(get_libdir)/pkgconfig/$i || die "sed failed"
+               done
+       fi
+}
+
+multilib_src_install_all() {
+       insinto /etc/gtk-3.0
+       doins "${FILESDIR}"/settings.ini
+
+       dodoc AUTHORS ChangeLog* HACKING NEWS* README*
+}
+
+pkg_preinst() {
+       gnome2_pkg_preinst
+
+       multilib_pkg_preinst() {
+               # Make sure loaders.cache belongs to gdk-pixbuf alone
+               local cache="usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache"
+
+               if [[ -e ${EROOT}${cache} ]]; then
+                       cp "${EROOT}"${cache} "${ED}"/${cache} || die
+               else
+                       touch "${ED}"/${cache} || die
+               fi
+       }
+       multilib_parallel_foreach_abi multilib_pkg_preinst
+}
+
+pkg_postinst() {
+       gnome2_pkg_postinst
+       gnome2_query_immodules_gtk3
+
+       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_pkg_postrm
+
+       if [[ -z ${REPLACED_BY_VERSIONS} ]]; then
+               multilib_pkg_postrm() {
+                       rm -f "${EROOT}"usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache
+               }
+               multilib_foreach_abi multilib_pkg_postrm
+       fi
+}

diff --git a/x11-libs/gtk+/gtk+-3.14.6.ebuild b/x11-libs/gtk+/gtk+-3.14.6.ebuild
index d3445915b48559cd0af87c54e5286e78b85e4df4..54816298f15d7fb669714c0cdf7375ee795c550e 100644 (file)
--- a/x11-libs/gtk+/gtk+-3.14.6.ebuild
+++ b/x11-libs/gtk+/gtk+-3.14.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-3.14.6.ebuild,v 1.3 2014/12/28 23:10:20 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-3.14.6.ebuild,v 1.4 2015/01/02 11:53:03 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -69,7 +69,7 @@ DEPEND="${COMMON_DEPEND}
        app-text/docbook-xml-dtd:4.1.2
        dev-libs/libxslt
        dev-libs/gobject-introspection-common
-       dev-util/gdbus-codegen
+       >=dev-util/gdbus-codegen-2.38.2
        >=dev-util/gtk-doc-am-1.20
        sys-devel/gettext
        virtual/pkgconfig[${MULTILIB_USEDEP}]
@@ -190,6 +190,7 @@ multilib_src_test() {
        "${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/gtk" || die
 
        unset DBUS_SESSION_BUS_ADDRESS
+       unset DISPLAY #527682
        GSETTINGS_SCHEMA_DIR="${S}/gtk" Xemake check
 }