[gentoo-commits] dev/leio:master commit in: x11-libs/gtk+/

2015-03-11 Thread Mart Raudsepp
commit: f18afc2079fbffe66486e99f2d3f963fc89c57c0
Author: Mart Raudsepp leio AT gentoo DOT org
AuthorDate: Wed Mar 11 14:07:38 2015 +
Commit: Mart Raudsepp leio AT gentoo DOT org
CommitDate: Wed Mar 11 14:13:24 2015 +
URL:https://gitweb.gentoo.org/dev/leio.git/commit/?id=f18afc20

gtk+:2 - bump and sync with main tree

 x11-libs/gtk+/Manifest | 2 +-
 x11-libs/gtk+/{gtk+-2.24.26.ebuild = gtk+-2.24.27.ebuild} | 9 -
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index 88b83d1..adc3d3b 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -1,2 +1,2 @@
-DIST gtk+-2.24.26.tar.xz 13328708 SHA256 
d84fc0f1e3cd99e8b9ec756e754f42653940638579a8f28d0eabffc37018d133 SHA512 
2a3a366c41214fcacbc2a69719d5b20060e0efbb0576a1fc4f4123f97ea1f5ff1b06296302806655b32c06901629f5d23b91d65de9a01143053f63607d94498d
 WHIRLPOOL 
b0cf44be24dd1999f2f4aeb6ed779e536cb00c7d1b42cb1a4c8fc9a807093a1b8f26f4f750bb52533ca6a18e6a9ce481f7d879e0c186d7d11add6c793090c244
+DIST gtk+-2.24.27.tar.xz 13349252 SHA256 
20cb10cae43999732a9af2e9aac4d1adebf2a9c2e1ba147050976abca5cd24f4 SHA512 
ffe981a41137302713a411039238604e92d41146e25ea0643857ec40388ddfe69cbb15bdc1aa8300b87ddbb4d6fbcf0054cdb7ba39634fbe4bfd1802f5bc8ac6
 WHIRLPOOL 
02259afb7a410fe941b9cc20e8031d61d5dd90f2ac532e3b8525b203997cfa57999286cd59e76ef152a68de35f08e8712dc4b9cd107633f2ba2433eba633197c
 DIST gtk+-3.14.9.tar.xz 15716588 SHA256 
3be9560e6e99388d7706a168e3353ecd63fc30ec4f7f8bea23889e71ab7b6c64 SHA512 
3b64142d65ec4b4e0ed709c2fac629d80b95dac03481a3d6f8e3cc6c351ac779fe172a1edee552df7b3c40287f10c97fa0e99212e5f0e6b4751e3d8efd0896e5
 WHIRLPOOL 
bc45b3722913ebb90bff944ec724909d01e3e976d49f8bd273500de2af9de7dcedc85e24fca36226816993a10cb87f4477f4498cc67946449855b37a0790a2fa

diff --git a/x11-libs/gtk+/gtk+-2.24.26.ebuild 
b/x11-libs/gtk+/gtk+-2.24.27.ebuild
similarity index 96%
rename from x11-libs/gtk+/gtk+-2.24.26.ebuild
rename to x11-libs/gtk+/gtk+-2.24.27.ebuild
index 2f231e1..3fd16d8 100644
--- a/x11-libs/gtk+/gtk+-2.24.26.ebuild
+++ b/x11-libs/gtk+/gtk+-2.24.27.ebuild
@@ -103,10 +103,6 @@ set_gtk2_confdir() {
 }
 
 src_prepare() {
-   # Fix building due to moved definition, upstream bug #704766
-   # Upstream says it was fixed with a different commit
-#  epatch ${FILESDIR}/${PN}-2.24.20-darwin-quartz-pasteboard.patch
-
# Fix tests running when building out of sources, bug #510596, upstream 
bug #730319
epatch ${FILESDIR}/${PN}-2.24.24-out-of-source.patch
 
@@ -141,11 +137,6 @@ src_prepare() {
sed 's:\({ GtkFileChooserButton.*},\):/*\1*/:g' -i 
gtk/tests/object.c \
|| die failed to disable recentmanager test (3)
 
-   # Skip tests known to fail
-   # https://bugzilla.gnome.org/show_bug.cgi?id=646609
-#  sed -e '/g_test_add_func.*test_text_access/s:^://:' \
-#  -i ${S}/gtk/tests/testing.c || die
-
# https://bugzilla.gnome.org/show_bug.cgi?id=617473
sed -i -e 's:pltcheck.sh:$(NULL):g' \
gtk/Makefile.am || die



[gentoo-commits] dev/leio:master commit in: x11-libs/gtk+/

2015-03-03 Thread git@oystercatcher mirror+tproxy
commit: 1ed843a75423e90a70903343c9c710d6b0b214e7
Author: Mart Raudsepp leio AT gentoo DOT org
AuthorDate: Tue Mar  3 15:12:42 2015 +
Commit: git@oystercatcher mirror+tproxy git AT oystercatcher DOT 
gentoo DOT org
CommitDate: Tue Mar  3 15:12:42 2015 +
URL:http://sources.gentoo.org/gitweb/?p=dev/leio.git;a=commit;h=1ed843a7

gtk+:3 - bump and sync with main tree

 x11-libs/gtk+/Manifest   |  2 +-
 .../gtk+/{gtk+-3.14.8.ebuild = gtk+-3.14.9.ebuild}  | 20 +++-
 2 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index 311da31..88b83d1 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -1,2 +1,2 @@
 DIST gtk+-2.24.26.tar.xz 13328708 SHA256 
d84fc0f1e3cd99e8b9ec756e754f42653940638579a8f28d0eabffc37018d133 SHA512 
2a3a366c41214fcacbc2a69719d5b20060e0efbb0576a1fc4f4123f97ea1f5ff1b06296302806655b32c06901629f5d23b91d65de9a01143053f63607d94498d
 WHIRLPOOL 
b0cf44be24dd1999f2f4aeb6ed779e536cb00c7d1b42cb1a4c8fc9a807093a1b8f26f4f750bb52533ca6a18e6a9ce481f7d879e0c186d7d11add6c793090c244
-DIST gtk+-3.14.8.tar.xz 15689624 SHA256 
7a543ea8a85f2c8a7b7374f24fd57df454067858689d8b02ec6c90f24be2b344 SHA512 
110f39d0a8ef72bfcb02d8e11000210848da15d7232346277f9755c7918e16af39dce78ba409ddfcb73dd5fa9032cc51843cb658d5ce4a2b32ca401624cc5240
 WHIRLPOOL 
115a043e332119bc3fe582744ceeeb9a49f4361ded13131162c26fc6988f1c2c5281738e992c96580b96ea2bd966377a49f239ec6204d6072a5dbb09d4b0f22f
+DIST gtk+-3.14.9.tar.xz 15716588 SHA256 
3be9560e6e99388d7706a168e3353ecd63fc30ec4f7f8bea23889e71ab7b6c64 SHA512 
3b64142d65ec4b4e0ed709c2fac629d80b95dac03481a3d6f8e3cc6c351ac779fe172a1edee552df7b3c40287f10c97fa0e99212e5f0e6b4751e3d8efd0896e5
 WHIRLPOOL 
bc45b3722913ebb90bff944ec724909d01e3e976d49f8bd273500de2af9de7dcedc85e24fca36226816993a10cb87f4477f4498cc67946449855b37a0790a2fa

diff --git a/x11-libs/gtk+/gtk+-3.14.8.ebuild b/x11-libs/gtk+/gtk+-3.14.9.ebuild
similarity index 88%
rename from x11-libs/gtk+/gtk+-3.14.8.ebuild
rename to x11-libs/gtk+/gtk+-3.14.9.ebuild
index e1bb493..582d933 100644
--- a/x11-libs/gtk+/gtk+-3.14.8.ebuild
+++ b/x11-libs/gtk+/gtk+-3.14.9.ebuild
@@ -13,12 +13,7 @@ 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 examples gtk3-only +introspection test 
vim-syntax wayland X xinerama
+IUSE=aqua broadway cloudprint colord cups examples gtk3-only +introspection 
test vim-syntax wayland X xinerama
 REQUIRED_USE=
|| ( aqua wayland X )
xinerama? ( X )
@@ -146,6 +141,7 @@ multilib_src_configure() {
ECONF_SOURCE=${S} \
gnome2_src_configure \
$(use_enable aqua quartz-backend) \
+   $(use_enable broadway broadway-backend) \
$(use_enable cloudprint) \
$(use_enable colord) \
$(use_enable cups cups auto) \
@@ -175,16 +171,6 @@ multilib_src_configure() {
 }
 
 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
 
@@ -196,7 +182,7 @@ multilib_src_test() {
 multilib_src_install() {
gnome2_src_install
 
-   # add -framework Carbon to the .pc files
+   # add -framework Carbon to the .pc files, bug #
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 : \



[gentoo-commits] dev/leio:master commit in: x11-libs/gtk+/

2015-03-03 Thread Mart Raudsepp
commit: 1ed843a75423e90a70903343c9c710d6b0b214e7
Author: Mart Raudsepp leio AT gentoo DOT org
AuthorDate: Tue Mar  3 15:12:42 2015 +
Commit: Mart Raudsepp leio AT gentoo DOT org
CommitDate: Tue Mar  3 15:12:42 2015 +
URL:http://sources.gentoo.org/gitweb/?p=dev/leio.git;a=commit;h=1ed843a7

gtk+:3 - bump and sync with main tree

 x11-libs/gtk+/Manifest   |  2 +-
 .../gtk+/{gtk+-3.14.8.ebuild = gtk+-3.14.9.ebuild}  | 20 +++-
 2 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index 311da31..88b83d1 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -1,2 +1,2 @@
 DIST gtk+-2.24.26.tar.xz 13328708 SHA256 
d84fc0f1e3cd99e8b9ec756e754f42653940638579a8f28d0eabffc37018d133 SHA512 
2a3a366c41214fcacbc2a69719d5b20060e0efbb0576a1fc4f4123f97ea1f5ff1b06296302806655b32c06901629f5d23b91d65de9a01143053f63607d94498d
 WHIRLPOOL 
b0cf44be24dd1999f2f4aeb6ed779e536cb00c7d1b42cb1a4c8fc9a807093a1b8f26f4f750bb52533ca6a18e6a9ce481f7d879e0c186d7d11add6c793090c244
-DIST gtk+-3.14.8.tar.xz 15689624 SHA256 
7a543ea8a85f2c8a7b7374f24fd57df454067858689d8b02ec6c90f24be2b344 SHA512 
110f39d0a8ef72bfcb02d8e11000210848da15d7232346277f9755c7918e16af39dce78ba409ddfcb73dd5fa9032cc51843cb658d5ce4a2b32ca401624cc5240
 WHIRLPOOL 
115a043e332119bc3fe582744ceeeb9a49f4361ded13131162c26fc6988f1c2c5281738e992c96580b96ea2bd966377a49f239ec6204d6072a5dbb09d4b0f22f
+DIST gtk+-3.14.9.tar.xz 15716588 SHA256 
3be9560e6e99388d7706a168e3353ecd63fc30ec4f7f8bea23889e71ab7b6c64 SHA512 
3b64142d65ec4b4e0ed709c2fac629d80b95dac03481a3d6f8e3cc6c351ac779fe172a1edee552df7b3c40287f10c97fa0e99212e5f0e6b4751e3d8efd0896e5
 WHIRLPOOL 
bc45b3722913ebb90bff944ec724909d01e3e976d49f8bd273500de2af9de7dcedc85e24fca36226816993a10cb87f4477f4498cc67946449855b37a0790a2fa

diff --git a/x11-libs/gtk+/gtk+-3.14.8.ebuild b/x11-libs/gtk+/gtk+-3.14.9.ebuild
similarity index 88%
rename from x11-libs/gtk+/gtk+-3.14.8.ebuild
rename to x11-libs/gtk+/gtk+-3.14.9.ebuild
index e1bb493..582d933 100644
--- a/x11-libs/gtk+/gtk+-3.14.8.ebuild
+++ b/x11-libs/gtk+/gtk+-3.14.9.ebuild
@@ -13,12 +13,7 @@ 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 examples gtk3-only +introspection test 
vim-syntax wayland X xinerama
+IUSE=aqua broadway cloudprint colord cups examples gtk3-only +introspection 
test vim-syntax wayland X xinerama
 REQUIRED_USE=
|| ( aqua wayland X )
xinerama? ( X )
@@ -146,6 +141,7 @@ multilib_src_configure() {
ECONF_SOURCE=${S} \
gnome2_src_configure \
$(use_enable aqua quartz-backend) \
+   $(use_enable broadway broadway-backend) \
$(use_enable cloudprint) \
$(use_enable colord) \
$(use_enable cups cups auto) \
@@ -175,16 +171,6 @@ multilib_src_configure() {
 }
 
 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
 
@@ -196,7 +182,7 @@ multilib_src_test() {
 multilib_src_install() {
gnome2_src_install
 
-   # add -framework Carbon to the .pc files
+   # add -framework Carbon to the .pc files, bug #
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 : \



[gentoo-commits] dev/leio:master commit in: x11-libs/gtk+/

2015-02-26 Thread Mart Raudsepp
commit: 04737016b2424d5fce9e420f73db5ce749ecba6f
Author: Mart Raudsepp leio AT gentoo DOT org
AuthorDate: Thu Feb 19 19:00:41 2015 +
Commit: Mart Raudsepp leio AT gentoo DOT org
CommitDate: Thu Feb 19 19:00:41 2015 +
URL:http://sources.gentoo.org/gitweb/?p=dev/leio.git;a=commit;h=04737016

gtk+:2 - sync with portage

---
 x11-libs/gtk+/Manifest |  2 +-
 ...{gtk+-2.24.25-r1.ebuild = gtk+-2.24.26.ebuild} | 26 +++---
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index 5b2910b..311da31 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -1,2 +1,2 @@
-DIST gtk+-2.24.25.tar.xz 13327832 SHA256 
38af1020cb8ff3d10dda2c8807f11e92af9d2fa4045de61c62eedb7fbc7ea5b3 SHA512 
e102eabbd86e9e697402b4d915172dd3838374b7b8a16b95369ed602228857a013fdba7b6b8d742f925ff8d340b63a90b56c1ddbd4405d8dc454144c705ac08d
 WHIRLPOOL 
b4bcf058bcc582627be35bb8ba45a933c3814f007599df59172e537fc99003f51edac7011cf36783caad4e191c622f6fa044a6ff6e0ae3f4de7635c3815807a3
+DIST gtk+-2.24.26.tar.xz 13328708 SHA256 
d84fc0f1e3cd99e8b9ec756e754f42653940638579a8f28d0eabffc37018d133 SHA512 
2a3a366c41214fcacbc2a69719d5b20060e0efbb0576a1fc4f4123f97ea1f5ff1b06296302806655b32c06901629f5d23b91d65de9a01143053f63607d94498d
 WHIRLPOOL 
b0cf44be24dd1999f2f4aeb6ed779e536cb00c7d1b42cb1a4c8fc9a807093a1b8f26f4f750bb52533ca6a18e6a9ce481f7d879e0c186d7d11add6c793090c244
 DIST gtk+-3.14.8.tar.xz 15689624 SHA256 
7a543ea8a85f2c8a7b7374f24fd57df454067858689d8b02ec6c90f24be2b344 SHA512 
110f39d0a8ef72bfcb02d8e11000210848da15d7232346277f9755c7918e16af39dce78ba409ddfcb73dd5fa9032cc51843cb658d5ce4a2b32ca401624cc5240
 WHIRLPOOL 
115a043e332119bc3fe582744ceeeb9a49f4361ded13131162c26fc6988f1c2c5281738e992c96580b96ea2bd966377a49f239ec6204d6072a5dbb09d4b0f22f

diff --git a/x11-libs/gtk+/gtk+-2.24.25-r1.ebuild 
b/x11-libs/gtk+/gtk+-2.24.26.ebuild
similarity index 90%
rename from x11-libs/gtk+/gtk+-2.24.25-r1.ebuild
rename to x11-libs/gtk+/gtk+-2.24.26.ebuild
index fcbae00..2f231e1 100644
--- a/x11-libs/gtk+/gtk+-2.24.25-r1.ebuild
+++ b/x11-libs/gtk+/gtk+-2.24.26.ebuild
@@ -1,9 +1,10 @@
 # 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+-2.24.25-r1.ebuild,v 1.2 
2015/01/19 10:44:02 jer Exp $
+# $Header: $
 
 EAPI=5
-GCONF_DEBUG=no
+GCONF_DEBUG=yes
+GNOME2_LA_PUNT=yes
 
 inherit autotools eutils flag-o-matic gnome2 multilib virtualx readme.gentoo 
multilib-minimal
 
@@ -12,12 +13,12 @@ HOMEPAGE=http://www.gtk.org/;
 
 LICENSE=LGPL-2+
 SLOT=2
-IUSE=aqua cups debug examples gtk3-only +introspection test vim-syntax 
xinerama
+IUSE=aqua cups examples gtk3-only +introspection test vim-syntax xinerama
 REQUIRED_USE=
xinerama? ( !aqua )
 
 
-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 ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris 
~x64-solaris ~x86-solaris
+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 ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris 
~x64-solaris ~x86-solaris
 
 # NOTE: cairo[svg] dep is due to bug 291283 (not patched to avoid eautoreconf)
 COMMON_DEPEND=
@@ -103,20 +104,21 @@ set_gtk2_confdir() {
 
 src_prepare() {
# Fix building due to moved definition, upstream bug #704766
-   epatch ${FILESDIR}/${PN}-2.24.20-darwin-quartz-pasteboard.patch
+   # Upstream says it was fixed with a different commit
+#  epatch ${FILESDIR}/${PN}-2.24.20-darwin-quartz-pasteboard.patch
 
-   # Fix tests running when building out of sources, bug #510596
+   # Fix tests running when building out of sources, bug #510596, upstream 
bug #730319
epatch ${FILESDIR}/${PN}-2.24.24-out-of-source.patch
 
-   # marshalers code was pre-generated with glib-2.31, upstream bug #671763
+   # marshalers code was pre-generated with glib-2.31, upstream bug #662109
rm -v gdk/gdkmarshalers.c gtk/gtkmarshal.c gtk/gtkmarshalers.c \
perf/marshalers.c || die
 
-   # Stop trying to build unmaintained docs, bug #349754
+   # Stop trying to build unmaintained docs, bug #349754, upstream bug 
#623150
strip_builddir SUBDIRS tutorial docs/Makefile.{am,in}
strip_builddir SUBDIRS faq docs/Makefile.{am,in}
 
-   # -O3 and company cause random crashes in applications. Bug #133469
+   # -O3 and company cause random crashes in applications, bug #133469
replace-flags -O3 -O2
strip-flags
 
@@ -141,8 +143,8 @@ src_prepare() {
 
# Skip tests known to fail
# https://bugzilla.gnome.org/show_bug.cgi?id=646609
-   sed -e 

[gentoo-commits] dev/leio:master commit in: x11-libs/gtk+/files/, x11-libs/gtk+/

2015-02-16 Thread Mart Raudsepp
commit: f93dc817d504d390e69eff223f48de6faea85007
Author: Mart Raudsepp leio AT gentoo DOT org
AuthorDate: Tue Feb 17 01:14:05 2015 +
Commit: Mart Raudsepp leio AT gentoo DOT org
CommitDate: Tue Feb 17 01:14:48 2015 +
URL:http://sources.gentoo.org/gitweb/?p=dev/leio.git;a=commit;h=f93dc817

gtk+: sync with portage, add gtk2 that works with USE=gtk3-only

Unfortunately gles2 version of webkit-gtk isn't working out of the box yet
on the cmake using new stable series, so needing to use the old one, which
can build without GLES2 (accelerated compositing not required), but it is
also autotools based and gles2 support ought to work to provide AC (hidden
behind USE=webgl in Gentoo for some reason).
However that older webkit-gtk hard depends on gtk2 (can't disable gtk2
nsplugin support); so roll gtk2 that skips icon cache tools, preferring
gtk3, so that gtk3 is still the main, and once webkit-gtk supports gles2
in a newer version, can just skip gtk2 installation from binary packages
without rebuilding gtk+ packages.

---
 x11-libs/gtk+/Manifest |   3 +-
 .../gtk+-2.24.20-darwin-quartz-pasteboard.patch|  15 +
 .../gtk+/files/gtk+-2.24.24-out-of-source.patch|  33 +++
 x11-libs/gtk+/gtk+-2.24.25-r1.ebuild   | 310 +
 .../{gtk+-3.14.6.ebuild = gtk+-3.14.8.ebuild} |  12 +-
 5 files changed, 365 insertions(+), 8 deletions(-)

diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index 4986ded..5b2910b 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -1 +1,2 @@
-DIST gtk+-3.14.5.tar.xz 15666824 SHA256 
ba70f5ccde6646c6d8aa5a6398794b7bcf23fc45af22580a215d258f392dbbe2 SHA512 
4da1d6ff49cfdc412cc1ae90d0f1034e9ac0cf9b8f83a3eff03357b3b1676277baedd60c364159dca988535ac7a7a9af007f1ede271042eb88fd3b497f73e0cc
 WHIRLPOOL 
e58a63426bdabe68c90e75dadbccec044e00eabb4b144f40e208e9bbb46805a66bcfe03971f0b35accad6e97c8100b65013b01cfb8412923e2e98fce25d49398
+DIST gtk+-2.24.25.tar.xz 13327832 SHA256 
38af1020cb8ff3d10dda2c8807f11e92af9d2fa4045de61c62eedb7fbc7ea5b3 SHA512 
e102eabbd86e9e697402b4d915172dd3838374b7b8a16b95369ed602228857a013fdba7b6b8d742f925ff8d340b63a90b56c1ddbd4405d8dc454144c705ac08d
 WHIRLPOOL 
b4bcf058bcc582627be35bb8ba45a933c3814f007599df59172e537fc99003f51edac7011cf36783caad4e191c622f6fa044a6ff6e0ae3f4de7635c3815807a3
+DIST gtk+-3.14.8.tar.xz 15689624 SHA256 
7a543ea8a85f2c8a7b7374f24fd57df454067858689d8b02ec6c90f24be2b344 SHA512 
110f39d0a8ef72bfcb02d8e11000210848da15d7232346277f9755c7918e16af39dce78ba409ddfcb73dd5fa9032cc51843cb658d5ce4a2b32ca401624cc5240
 WHIRLPOOL 
115a043e332119bc3fe582744ceeeb9a49f4361ded13131162c26fc6988f1c2c5281738e992c96580b96ea2bd966377a49f239ec6204d6072a5dbb09d4b0f22f

diff --git a/x11-libs/gtk+/files/gtk+-2.24.20-darwin-quartz-pasteboard.patch 
b/x11-libs/gtk+/files/gtk+-2.24.20-darwin-quartz-pasteboard.patch
new file mode 100644
index 000..a07e653
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-2.24.20-darwin-quartz-pasteboard.patch
@@ -0,0 +1,15 @@
+gdk_quartz_target_to_pasteboard_type_libgtk_only was moved in
+a269c2f8d26a588c4b61ad605ef496e89759cc03
+https://mail.gnome.org/archives/commits-list/2013-March/msg20203.html
+https://bugzilla.gnome.org/show_bug.cgi?id=704766
+
+--- gtk/gtkclipboard-quartz.c
 gtk/gtkclipboard-quartz.c
+@@ -33,6 +33,7 @@
+ #include gtktextbuffer.h
+ #include gtkquartz.h
+ #include gtkalias.h
++#include quartz/gdkquartz.h
+ 
+ enum {
+   OWNER_CHANGE,

diff --git a/x11-libs/gtk+/files/gtk+-2.24.24-out-of-source.patch 
b/x11-libs/gtk+/files/gtk+-2.24.24-out-of-source.patch
new file mode 100644
index 000..451233c
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-2.24.24-out-of-source.patch
@@ -0,0 +1,33 @@
+From 9e0f33144aff8d792ab105927cf686eda0afd25e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= mgo...@gentoo.org
+Date: Sun, 18 May 2014 10:50:05 +0200
+Subject: [PATCH] aliasfilecheck: check for sources both in builddir  srcdir.
+
+The $gtk_all_c_sources variable contains both supplied and generated
+sources. The former reside in $srcdir, the latter in the build directory
+(cwd).
+
+In order to handle both kinds properly, first try to find each source
+file in cwd, and then fallback to $srcdir. This makes it possible to use
+out-of-source builds, and guarantees that fresh-built source files will
+be used rather than pre-generated copies included in the distribution
+tarball.
+---
+ gtk/aliasfilescheck.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gtk/aliasfilescheck.sh b/gtk/aliasfilescheck.sh
+index 31b49d4..3636a82 100755
+--- a/gtk/aliasfilescheck.sh
 b/gtk/aliasfilescheck.sh
+@@ -6,6 +6,6 @@ if test x$gtk_all_c_sources = x; then
+ fi
+ 
+ grep 'IN_FILE' ${srcdir-.}/gtk.symbols | sed 's/.*(//;s/).*//' | grep __ | 
sort -u  expected-files
+-{ cd ${srcdir-.}; grep '^ *# *define __' $gtk_all_c_sources; } | sed 
's/.*define //;s/ *$//' | sort  actual-files
++{ for f in 

[gentoo-commits] dev/leio:master commit in: x11-libs/gtk+/, x11-libs/gtk+/files/

2015-01-05 Thread Mart Raudsepp
commit: 90b68d24e60658d86da37024840cfd8420037abb
Author: Mart Raudsepp leio AT gentoo DOT org
AuthorDate: Sun Jan  4 09:58:12 2015 +
Commit: Mart Raudsepp leio AT gentoo DOT org
CommitDate: Mon Jan  5 12:32:06 2015 +
URL:http://sources.gentoo.org/gitweb/?p=dev/leio.git;a=commit;h=90b68d24

gtk+: Bump to 3.14.6, sync with portage

---
 x11-libs/gtk+/files/gtk+-non-bash-support.patch| 29 ++
 .../{gtk+-3.14.5.ebuild = gtk+-3.14.6.ebuild} | 45 ++
 2 files changed, 59 insertions(+), 15 deletions(-)

diff --git a/x11-libs/gtk+/files/gtk+-non-bash-support.patch 
b/x11-libs/gtk+/files/gtk+-non-bash-support.patch
new file mode 100644
index 000..efd13e6
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-non-bash-support.patch
@@ -0,0 +1,29 @@
+From c8ef010024db794e25ca58ef3c02663de685f1bb Mon Sep 17 00:00:00 2001
+From: Alexander Tsoy alexan...@tsoy.me
+Date: Sun, 26 Oct 2014 01:59:33 +0400
+Subject: [PATCH] gtk/Makefile.am: improve portability of ECHO
+
+---
+ gtk/Makefile.am | 6 +-
+ 1 file changed, 1 insertion(+), 5 deletions(-)
+
+diff --git a/gtk/Makefile.am b/gtk/Makefile.am
+index f60bec8..e923940 100644
+--- a/gtk/Makefile.am
 b/gtk/Makefile.am
+@@ -19,11 +19,7 @@ GTK_PRINT_PREVIEW_COMMAND=evince --unlink-tempfile 
--preview --print-settings %
+ endif
+ 
+ SUBDIRS = inspector native .
+-if OS_DARWIN
+-  ECHO=echo
+-else
+-  ECHO=echo -e
+-endif
++ECHO=printf '%b\n'
+ 
+ if HAVE_CLOUDPRINT
+ if HAVE_PAPI_CUPS
+-- 
+2.0.4
+

diff --git a/x11-libs/gtk+/gtk+-3.14.5.ebuild b/x11-libs/gtk+/gtk+-3.14.6.ebuild
similarity index 87%
rename from x11-libs/gtk+/gtk+-3.14.5.ebuild
rename to x11-libs/gtk+/gtk+-3.14.6.ebuild
index 074a076..88040d5 100644
--- a/x11-libs/gtk+/gtk+-3.14.5.ebuild
+++ b/x11-libs/gtk+/gtk+-3.14.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -6,7 +6,7 @@ EAPI=5
 GCONF_DEBUG=no
 GNOME2_LA_PUNT=yes
 
-inherit eutils flag-o-matic gnome2 multilib virtualx multilib-minimal
+inherit autotools eutils flag-o-matic gnome2 multilib virtualx multilib-minimal
 
 DESCRIPTION=Gimp ToolKit +
 HOMEPAGE=http://www.gtk.org/;
@@ -69,7 +69,8 @@ DEPEND=${COMMON_DEPEND}
app-text/docbook-xsl-stylesheets
app-text/docbook-xml-dtd:4.1.2
dev-libs/libxslt
-   dev-util/gdbus-codegen
+   dev-libs/gobject-introspection-common
+   =dev-util/gdbus-codegen-2.38.2
=dev-util/gtk-doc-am-1.20
sys-devel/gettext
virtual/pkgconfig[${MULTILIB_USEDEP}]
@@ -91,7 +92,12 @@ DEPEND=${COMMON_DEPEND}
 RDEPEND=${COMMON_DEPEND}
!gnome-base/gail-1000
!x11-libs/vte-0.31.0:2.90
+   =x11-themes/adwaita-icon-theme-3.14
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 )
 
@@ -109,26 +115,28 @@ strip_builddir() {
 }
 
 src_prepare() {
+   # see bug #525928
+   epatch ${FILESDIR}/${PN}-non-bash-support.patch
+
# -O3 and company cause random crashes in applications. Bug #133469
replace-flags -O3 -O2
strip-flags
 
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
+   strip_builddir SRC_SUBDIRS testsuite Makefile.{am,in}
+   strip_builddir SRC_SUBDIRS tests Makefile.{am,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
+   strip_builddir SRC_SUBDIRS demos Makefile.{am,in}
+   strip_builddir SRC_SUBDIRS examples Makefile.{am,in}
fi
 
+   epatch_user
+
+   eautoreconf
gnome2_src_prepare
 }
 
@@ -156,7 +164,8 @@ multilib_src_configure() {
--enable-man \
$(use_enable !gtk3-only gtk2-dependency) \
--with-xml-catalog=${EPREFIX}/etc/xml/catalog \
-   --libdir=${EPREFIX}/usr/$(get_libdir)
+   --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
@@ -182,6 +191,7 @@ multilib_src_test() {
${EROOT}${GLIB_COMPILE_SCHEMAS} --allow-any-name ${S}/gtk || die
 
unset 

[gentoo-commits] dev/leio:master commit in: x11-libs/gtk+/

2015-01-05 Thread Mart Raudsepp
commit: 3b117b74e6c421e8effbe37bf318296e9ed0ee12
Author: Mart Raudsepp leio AT gentoo DOT org
AuthorDate: Sun Jan  4 09:59:09 2015 +
Commit: Mart Raudsepp leio AT gentoo DOT org
CommitDate: Mon Jan  5 12:32:06 2015 +
URL:http://sources.gentoo.org/gitweb/?p=dev/leio.git;a=commit;h=3b117b74

gtk+: Remove wrong gdk-pixbuf[X] USE dep

gdk-pixbuf[X] only adds gdk-pixbuf-xlib package/library from it's contrib/, 
which
gtk+ does NOT use.

---
 x11-libs/gtk+/gtk+-3.14.6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-libs/gtk+/gtk+-3.14.6.ebuild b/x11-libs/gtk+/gtk+-3.14.6.ebuild
index 88040d5..200f460 100644
--- a/x11-libs/gtk+/gtk+-3.14.6.ebuild
+++ b/x11-libs/gtk+/gtk+-3.14.6.ebuild
@@ -34,7 +34,7 @@ COMMON_DEPEND=
=dev-libs/glib-2.41.2:2[${MULTILIB_USEDEP}]
media-libs/fontconfig[${MULTILIB_USEDEP}]
=x11-libs/cairo-1.12[aqua?,glib,svg,X?,${MULTILIB_USEDEP}]
-   =x11-libs/gdk-pixbuf-2.30:2[introspection?,X?,${MULTILIB_USEDEP}]
+   =x11-libs/gdk-pixbuf-2.30:2[introspection?,${MULTILIB_USEDEP}]
gtk3-only? ( !x11-libs/gtk+:2 )
!gtk3-only? ( =x11-libs/gtk+-2.24:2[${MULTILIB_USEDEP}] )
=x11-libs/pango-1.36.7[introspection?,${MULTILIB_USEDEP}]



[gentoo-commits] dev/leio:master commit in: x11-libs/gtk+/

2014-11-25 Thread Mart Raudsepp
commit: 897306a508e5588b4d74fc4d1bab5dba1fc308ae
Author: Mart Raudsepp leio AT gentoo DOT org
AuthorDate: Wed Nov 26 03:20:56 2014 +
Commit: Mart Raudsepp leio AT gentoo DOT org
CommitDate: Wed Nov 26 03:20:56 2014 +
URL:http://sources.gentoo.org/gitweb/?p=dev/leio.git;a=commit;h=897306a5

gtk+: Fix manifest (oops)

---
 x11-libs/gtk+/Manifest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index 4fa8c24..4986ded 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -1 +1 @@
-DIST gtk+-3.12.2.tar.xz 15015024 SHA256 
61d74eea74231b1ea4b53084a9d6fc9917ab0e1d71b69d92cbf60a4b4fb385d0 SHA512 
4a8d2f52328587d73e30f363bdbbd91322dae0198f5581a2da3ebbe96ef0a0635193d2537e8fc127dc0950a24df42862233edd3a873dcbd166dc675bae849c9e
 WHIRLPOOL 
26328632d78f986d25e40d8773ff3cc90a0b3a5bafb4f21224504bd1c8c78995df556e8337d7b374f047bfff2bd0b9e0082ec163591f7a0a035260b8a2db2932
+DIST gtk+-3.14.5.tar.xz 15666824 SHA256 
ba70f5ccde6646c6d8aa5a6398794b7bcf23fc45af22580a215d258f392dbbe2 SHA512 
4da1d6ff49cfdc412cc1ae90d0f1034e9ac0cf9b8f83a3eff03357b3b1676277baedd60c364159dca988535ac7a7a9af007f1ede271042eb88fd3b497f73e0cc
 WHIRLPOOL 
e58a63426bdabe68c90e75dadbccec044e00eabb4b144f40e208e9bbb46805a66bcfe03971f0b35accad6e97c8100b65013b01cfb8412923e2e98fce25d49398



[gentoo-commits] dev/leio:master commit in: x11-libs/gtk+/

2014-11-24 Thread Mart Raudsepp
commit: 886c417b1f2aca9d8aac5af431d2b2ce4d05e23c
Author: Mart Raudsepp leio AT gentoo DOT org
AuthorDate: Mon Nov 24 09:49:52 2014 +
Commit: Mart Raudsepp leio AT gentoo DOT org
CommitDate: Mon Nov 24 09:49:52 2014 +
URL:http://sources.gentoo.org/gitweb/?p=dev/leio.git;a=commit;h=886c417b

gtk+: Sync with portage (multilib support, Darwin patch)

---
 .../{gtk+-3.12.2.ebuild = gtk+-3.12.2-r1.ebuild}  | 134 +
 1 file changed, 81 insertions(+), 53 deletions(-)

diff --git a/x11-libs/gtk+/gtk+-3.12.2.ebuild 
b/x11-libs/gtk+/gtk+-3.12.2-r1.ebuild
similarity index 59%
rename from x11-libs/gtk+/gtk+-3.12.2.ebuild
rename to x11-libs/gtk+/gtk+-3.12.2-r1.ebuild
index e571a3a..253acda 100644
--- a/x11-libs/gtk+/gtk+-3.12.2.ebuild
+++ b/x11-libs/gtk+/gtk+-3.12.2-r1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2014 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.ebuild,v 1.6 
2014/08/21 10:46:39 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-3.12.2-r1.ebuild,v 1.2 
2014/11/24 01:41:45 tetromino Exp $
 
 EAPI=5
 GCONF_DEBUG=no
 GNOME2_LA_PUNT=yes
 
-inherit flag-o-matic gnome2 multilib virtualx
+inherit eutils flag-o-matic gnome2 multilib virtualx multilib-minimal
 
 DESCRIPTION=Gimp ToolKit +
 HOMEPAGE=http://www.gtk.org/;
@@ -18,51 +18,51 @@ SLOT=3
 #  * 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 gtk3-only test 
vim-syntax wayland X xinerama
+IUSE=aqua cloudprint colord cups debug examples gtk3-only +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
+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 unless USE=gtk3-only
 COMMON_DEPEND=
-   =dev-libs/atk-2.7.5[introspection?]
-   =dev-libs/glib-2.39.5:2
-   media-libs/fontconfig
-   =x11-libs/cairo-1.12[aqua?,glib,svg,X?]
-   =x11-libs/gdk-pixbuf-2.27.1:2[introspection?,X?]
+   =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}]
gtk3-only? ( !x11-libs/gtk+:2 )
-   !gtk3-only? ( =x11-libs/gtk+-2.24:2 )
-   =x11-libs/pango-1.32.4[introspection?]
+   !gtk3-only? ( =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
-   =dev-libs/json-glib-1.0 )
-   colord? ( =x11-misc/colord-0.1.9:0= )
-   cups? ( =net-print/cups-1.2 )
+   =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
-   || ( media-libs/mesa[wayland] 
media-libs/raspberrypi-userland[wayland] )
-   =x11-libs/libxkbcommon-0.2
+   =dev-libs/wayland-1.3.90[${MULTILIB_USEDEP}]
+   || ( media-libs/mesa[wayland,${MULTILIB_USEDEP}] 
media-libs/raspberrypi-userland[wayland] )
+   =x11-libs/libxkbcommon-0.2[${MULTILIB_USEDEP}]
)
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 )
+   =app-accessibility/at-spi2-atk-2.5.3[${MULTILIB_USEDEP}]
+   x11-libs/libXrender[${MULTILIB_USEDEP}]
+   

[gentoo-commits] dev/leio:master commit in: x11-libs/gtk+/files/, x11-libs/gtk+/

2014-08-23 Thread Mart Raudsepp
commit: bef2c5dce907da4a40a6496d5268e6794564de16
Author: Mart Raudsepp leio AT gentoo DOT org
AuthorDate: Sat Aug 23 08:41:25 2014 +
Commit: Mart Raudsepp leio AT gentoo DOT org
CommitDate: Sat Aug 23 08:42:51 2014 +
URL:http://sources.gentoo.org/gitweb/?p=dev/leio.git;a=commit;h=bef2c5dc

Add x11-libs/gtk+:3 modified to accept raspberrypi-userland[wayland] as a 
wayland wsys provider

---
 x11-libs/gtk+/Manifest   |   1 +
 x11-libs/gtk+/files/settings.ini |   4 +
 x11-libs/gtk+/gtk+-3.12.2.ebuild | 221 +++
 x11-libs/gtk+/metadata.xml   |  21 
 4 files changed, 247 insertions(+)

diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
new file mode 100644
index 000..4fa8c24
--- /dev/null
+++ b/x11-libs/gtk+/Manifest
@@ -0,0 +1 @@
+DIST gtk+-3.12.2.tar.xz 15015024 SHA256 
61d74eea74231b1ea4b53084a9d6fc9917ab0e1d71b69d92cbf60a4b4fb385d0 SHA512 
4a8d2f52328587d73e30f363bdbbd91322dae0198f5581a2da3ebbe96ef0a0635193d2537e8fc127dc0950a24df42862233edd3a873dcbd166dc675bae849c9e
 WHIRLPOOL 
26328632d78f986d25e40d8773ff3cc90a0b3a5bafb4f21224504bd1c8c78995df556e8337d7b374f047bfff2bd0b9e0082ec163591f7a0a035260b8a2db2932

diff --git a/x11-libs/gtk+/files/settings.ini b/x11-libs/gtk+/files/settings.ini
new file mode 100644
index 000..a65c0a8
--- /dev/null
+++ b/x11-libs/gtk+/files/settings.ini
@@ -0,0 +1,4 @@
+[Settings]
+gtk-theme-name = Adwaita
+gtk-icon-theme-name = gnome
+gtk-cursor-theme-name = Adwaita

diff --git a/x11-libs/gtk+/gtk+-3.12.2.ebuild b/x11-libs/gtk+/gtk+-3.12.2.ebuild
new file mode 100644
index 000..210357d
--- /dev/null
+++ b/x11-libs/gtk+/gtk+-3.12.2.ebuild
@@ -0,0 +1,221 @@
+# Copyright 1999-2014 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.ebuild,v 1.6 
2014/08/21 10:46:39 ago Exp $
+
+EAPI=5
+GCONF_DEBUG=no
+GNOME2_LA_PUNT=yes
+
+inherit flag-o-matic gnome2 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 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?]
+   =dev-libs/glib-2.39.5:2
+   media-libs/fontconfig
+   =x11-libs/cairo-1.12[aqua?,glib,svg,X?]
+   =x11-libs/gdk-pixbuf-2.27.1:2[introspection?,X?]
+   =x11-libs/gtk+-2.24:2
+   =x11-libs/pango-1.32.4[introspection?]
+   x11-misc/shared-mime-info
+
+   cloudprint? (
+   =net-libs/rest-0.7
+   =dev-libs/json-glib-1.0 )
+   colord? ( =x11-misc/colord-0.1.9:0= )
+   cups? ( =net-print/cups-1.2 )
+   introspection? ( =dev-libs/gobject-introspection-1.39 )
+   wayland? (
+   =dev-libs/wayland-1.3.90
+   || ( media-libs/mesa[wayland] 
media-libs/raspberrypi-userland[wayland] )
+   =x11-libs/libxkbcommon-0.2
+   )
+   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 )
+   )
+
+DEPEND=${COMMON_DEPEND}
+   app-text/docbook-xsl-stylesheets
+   app-text/docbook-xml-dtd:4.1.2
+   dev-libs/libxslt
+   dev-util/gdbus-codegen
+   =dev-util/gtk-doc-am-1.20
+   sys-devel/gettext
+   virtual/pkgconfig
+   X? (
+   x11-proto/xextproto
+   x11-proto/xproto
+   x11-proto/inputproto
+   x11-proto/damageproto
+   xinerama? ( x11-proto/xineramaproto )
+   )
+   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
+#