[gentoo-commits] proj/gnome:master commit in: x11-libs/gtk+/

2014-04-20 Thread Gilles Dartiguelongue 
commit: fadc3af0d5ebff6de560e48f3dec6c6cca4a6a80
Author: Mike Auty  gentoo  org>
AuthorDate: Thu Apr 17 00:36:43 2014 +
Commit: Gilles Dartiguelongue  gentoo  org>
CommitDate: Sun Apr 20 15:48:29 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=fadc3af0

x11-libs/gtk+: 3.10.8 → 3.12.0

Bump gtk+ with wayland, gtk-doc and glib dep bumps.
Also added in cloudprint optional component with dependencies.

---
 x11-libs/gtk+/gtk+-3.12.0.ebuild | 220 +++
 1 file changed, 220 insertions(+)

diff --git a/x11-libs/gtk+/gtk+-3.12.0.ebuild b/x11-libs/gtk+/gtk+-3.12.0.ebuild
new file mode 100644
index 000..d891bcc
--- /dev/null
+++ b/x11-libs/gtk+/gtk+-3.12.0.ebuild
@@ -0,0 +1,220 @@
+# 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.10.8.ebuild,v 1.4 
2014/04/16 07:49:22 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 packagekit 
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
+
+   colord? ( >=x11-misc/colord-0.1.9 )
+   cups? ( >=net-print/cups-1.2 )
+   cloudprint? ( >=net-libs/rest-0.7 
+ >=dev-libs/json-glib-1.0 )
+   introspection? ( >=dev-libs/gobject-introspection-1.39 )
+   wayland? (
+   >=dev-libs/wayland-1.3.90
+   media-libs/mesa[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
+   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
+# >=xorg-server-1.11.4 needed for
+#  http://mail.gnome.org/archives/desktop-devel-list/2012-March/msg00024.html
+RDEPEND="${COMMON_DEPEND}
+   !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
+   GSETTINGS_SCHEMA_DIR="${S}/gtk" Xemake check
+}
+
+src_install() {
+   gnome2_src_install
+
+   insinto /etc/gtk-3.0
+   doins "${FILESDIR}"/settings.ini
+
+   dodoc AUTHORS ChangeLog* HACKING NEWS* README*
+

[gentoo-commits] proj/gnome:master commit in: x11-libs/gtk+/

2014-04-22 Thread Gilles Dartiguelongue 
commit: 32dd5cd7b1949e3c1422c5dbd95a6b250add5c9b
Author: Gilles Dartiguelongue  gentoo  org>
AuthorDate: Tue Apr 22 21:16:11 2014 +
Commit: Gilles Dartiguelongue  gentoo  org>
CommitDate: Tue Apr 22 21:16:11 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=32dd5cd7

x11-libs/gtk+: 3.12.0 → 3.12.1

---
 x11-libs/gtk+/{gtk+-3.12.0.ebuild => gtk+-3.12.1.ebuild} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/x11-libs/gtk+/gtk+-3.12.0.ebuild b/x11-libs/gtk+/gtk+-3.12.1.ebuild
similarity index 100%
rename from x11-libs/gtk+/gtk+-3.12.0.ebuild
rename to x11-libs/gtk+/gtk+-3.12.1.ebuild

[gentoo-commits] proj/gnome:master commit in: x11-libs/gtk+/

2014-04-25 Thread Gilles Dartiguelongue 
commit: 840bf487a082b36dee3d48e845167779046449a8
Author: Gilles Dartiguelongue  gentoo  org>
AuthorDate: Fri Apr 25 23:35:08 2014 +
Commit: Gilles Dartiguelongue  gentoo  org>
CommitDate: Fri Apr 25 23:35:08 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=840bf487

x11-libs/gtk+: needs rebuild with colord changes subslot

---
 x11-libs/gtk+/gtk+-3.12.1.ebuild | 2 +-
 x11-libs/gtk+/gtk+-.ebuild   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/x11-libs/gtk+/gtk+-3.12.1.ebuild b/x11-libs/gtk+/gtk+-3.12.1.ebuild
index ee97028..1fc1a1b 100644
--- a/x11-libs/gtk+/gtk+-3.12.1.ebuild
+++ b/x11-libs/gtk+/gtk+-3.12.1.ebuild
@@ -41,7 +41,7 @@ COMMON_DEPEND="
cloudprint? (
>=net-libs/rest-0.7
>=dev-libs/json-glib-1.0 )
-   colord? ( >=x11-misc/colord-0.1.9 )
+   colord? ( >=x11-misc/colord-0.1.9:0= )
cups? ( >=net-print/cups-1.2 )
introspection? ( >=dev-libs/gobject-introspection-1.39 )
wayland? (

diff --git a/x11-libs/gtk+/gtk+-.ebuild b/x11-libs/gtk+/gtk+-.ebuild
index 9c81c07..8313158 100644
--- a/x11-libs/gtk+/gtk+-.ebuild
+++ b/x11-libs/gtk+/gtk+-.ebuild
@@ -49,7 +49,7 @@ COMMON_DEPEND="
cloudprint? (
>=net-libs/rest-0.7
>=dev-libs/json-glib-1.0 )
-   colord? ( >=x11-misc/colord-0.1.9 )
+   colord? ( >=x11-misc/colord-0.1.9:0= )
cups? ( >=net-print/cups-1.2 )
introspection? ( >=dev-libs/gobject-introspection-1.39 )
wayland? (

[gentoo-commits] proj/gnome:master commit in: x11-libs/gtk+/

2015-04-25 Thread Alexandre Rostovtsev 
commit: e7758a4ed2669d32965e342422ca2b7f09723d25
Author: Alexandre Rostovtsev  gentoo  org>
AuthorDate: Sat Apr 25 18:48:11 2015 +
Commit: Alexandre Rostovtsev  gentoo  org>
CommitDate: Sat Apr 25 18:48:11 2015 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=e7758a4e

x11-libs/gtk+: sync deps with gx86 (bug #547710)

Package-Manager: portage-2.2.18
Manifest-Sign-Key: 0x18E5B6F2D8D5EC8D

 x11-libs/gtk+/gtk+-3.16.2.ebuild | 5 -
 x11-libs/gtk+/gtk+-.ebuild   | 5 -
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/x11-libs/gtk+/gtk+-3.16.2.ebuild b/x11-libs/gtk+/gtk+-3.16.2.ebuild
index 893508c..5e2890a 100644
--- a/x11-libs/gtk+/gtk+-3.16.2.ebuild
+++ b/x11-libs/gtk+/gtk+-3.16.2.ebuild
@@ -95,7 +95,10 @@ RDEPEND="${COMMON_DEPEND}
!app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
)
 "
-PDEPEND="vim-syntax? ( app-vim/gtk-syntax )"
+# librsvg for svg icons (PDEPEND to avoid circular dep), bug #547710
+PDEPEND="gnome-base/librsvg[${MULTILIB_USEDEP}]
+   vim-syntax? ( app-vim/gtk-syntax )
+"
 
 MULTILIB_CHOST_TOOLS=(
/usr/bin/gtk-query-immodules-3.0

diff --git a/x11-libs/gtk+/gtk+-.ebuild b/x11-libs/gtk+/gtk+-.ebuild
index 723f8ae..e610614 100644
--- a/x11-libs/gtk+/gtk+-.ebuild
+++ b/x11-libs/gtk+/gtk+-.ebuild
@@ -110,7 +110,10 @@ RDEPEND="${COMMON_DEPEND}
!app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
)
 "
-PDEPEND="vim-syntax? ( app-vim/gtk-syntax )"
+# librsvg for svg icons (PDEPEND to avoid circular dep), bug #547710
+PDEPEND="gnome-base/librsvg[${MULTILIB_USEDEP}]
+   vim-syntax? ( app-vim/gtk-syntax )
+"
 
 MULTILIB_CHOST_TOOLS=(
/usr/bin/gtk-query-immodules-3.0

[gentoo-commits] proj/gnome:master commit in: x11-libs/gtk+/

2015-06-09 Thread Gilles Dartiguelongue 
commit: ac3d1a959a5c56709d5d9977805af40c2307
Author: Gilles Dartiguelongue  gentoo  org>
AuthorDate: Mon Jun  8 22:16:58 2015 +
Commit: Gilles Dartiguelongue  gentoo  org>
CommitDate: Mon Jun  8 22:16:58 2015 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=ac3d1a95

x11-libs/gtk+: moved to gentoo-x86

 x11-libs/gtk+/gtk+-3.16.3.ebuild | 249 ---
 1 file changed, 249 deletions(-)

diff --git a/x11-libs/gtk+/gtk+-3.16.3.ebuild b/x11-libs/gtk+/gtk+-3.16.3.ebuild
deleted file mode 100644
index 55b2a89..000
--- a/x11-libs/gtk+/gtk+-3.16.3.ebuild
+++ /dev/null
@@ -1,249 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-GCONF_DEBUG="yes"
-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"
-IUSE="aqua broadway cloudprint colord cups 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)
-COMMON_DEPEND="
-   >=dev-libs/atk-2.15[introspection?,${MULTILIB_USEDEP}]
-   >=dev-libs/glib-2.43.4:2[${MULTILIB_USEDEP}]
-   media-libs/fontconfig[${MULTILIB_USEDEP}]
-   >=media-libs/libepoxy-1.0[${MULTILIB_USEDEP}]
-   >=x11-libs/cairo-1.14[aqua?,glib,svg,X?,${MULTILIB_USEDEP}]
-   >=x11-libs/gdk-pixbuf-2.30:2[introspection?,X?,${MULTILIB_USEDEP}]
-   >=x11-libs/pango-1.36.7[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.5.91[${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-libs/gobject-introspection-common
-   >=dev-util/gdbus-codegen-2.38.2
-   >=dev-util/gtk-doc-am-1.20
-   >=sys-devel/gettext-0.18.3[${MULTILIB_USEDEP}]
-   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 )
-   examples? ( media-libs/libcanberra[gtk3] )
-"
-# 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}
-   >=dev-util/gtk-update-icon-cache-3
-   !=x11-themes/adwaita-icon-theme-3.14
-   X? ( !

[gentoo-commits] proj/gnome:master commit in: x11-libs/gtk+/

2014-10-25 Thread Gilles Dartiguelongue 
commit: d6983e920906050b3105fd9c9449b632453d908a
Author: Gilles Dartiguelongue  gentoo  org>
AuthorDate: Sat Oct 25 20:11:57 2014 +
Commit: Gilles Dartiguelongue  gentoo  org>
CommitDate: Sat Oct 25 20:12:12 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=d6983e92

x11-libs/gtk+: clean up metadata.xml

---
 x11-libs/gtk+/metadata.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/x11-libs/gtk+/metadata.xml b/x11-libs/gtk+/metadata.xml
index dde3aef..c619de0 100644
--- a/x11-libs/gtk+/metadata.xml
+++ b/x11-libs/gtk+/metadata.xml
@@ -11,8 +11,6 @@
   
 Use x11-misc/colord for color management
  in printing
-Enable support for the distro-neutral package
- manager GUI app-admin/packagekit in application 
chooser
   
   
 cpe:/a:gtk:gtk%2B

[gentoo-commits] proj/gnome:master commit in: x11-libs/gtk+/

2014-11-23 Thread Remi Cardona 
commit: f3cdc71f834a3723ae85a4f80acde76cdb42e721
Author: Rémi Cardona  gentoo  org>
AuthorDate: Sun Nov 23 23:23:37 2014 +
Commit: Remi Cardona  gentoo  org>
CommitDate: Sun Nov 23 23:48:55 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=f3cdc71f

x11-libs/gtk+: sync with portage (mostly multilib)

---
 x11-libs/gtk+/gtk+-3.14.4.ebuild | 121 +++
 x11-libs/gtk+/gtk+-.ebuild   | 119 ++
 2 files changed, 141 insertions(+), 99 deletions(-)

diff --git a/x11-libs/gtk+/gtk+-3.14.4.ebuild b/x11-libs/gtk+/gtk+-3.14.4.ebuild
index f6d9192..122f8e6 100644
--- a/x11-libs/gtk+/gtk+-3.14.4.ebuild
+++ b/x11-libs/gtk+/gtk+-3.14.4.ebuild
@@ -6,7 +6,7 @@ EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
-inherit eutils flag-o-matic gnome2 multilib virtualx
+inherit eutils flag-o-matic gnome2 multilib virtualx multilib-minimal
 
 DESCRIPTION="Gimp ToolKit +"
 HOMEPAGE="http://www.gtk.org/";
@@ -30,38 +30,38 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 
~s390 ~sh ~sparc ~x86
 # 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.12[introspection?]
-   >=dev-libs/glib-2.41.2:2
-   media-libs/fontconfig
-   >=x11-libs/cairo-1.12[aqua?,glib,svg,X?]
-   >=x11-libs/gdk-pixbuf-2.30:2[introspection?,X?]
-   >=x11-libs/gtk+-2.24:2
-   >=x11-libs/pango-1.36.7[introspection?]
+   >=dev-libs/atk-2.12[introspection?,${MULTILIB_USEDEP}]
+   >=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/gtk+-2.24:2[${MULTILIB_USEDEP}]
+   >=x11-libs/pango-1.36.7[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.5.91
-   media-libs/mesa[wayland]
-   >=x11-libs/libxkbcommon-0.2
+   >=dev-libs/wayland-1.5.91[${MULTILIB_USEDEP}]
+   media-libs/mesa[wayland,${MULTILIB_USEDEP}]
+   >=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}]
+   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}
@@ -71,13 +71,13 @@ DEPEND="${COMMON_DEPEND}
dev-util/gdbus-codegen
>=dev-util/gtk-doc-am-1.20
sys-devel/gettext
-   virtual/pkgconfig
+   virtual/pkgconfig[${MULTILIB_USEDEP}]
X? (
-   x11-proto/xextproto
-   x11-proto/xproto
-   x11-proto/inputproto
-   x11-proto/damageproto
-   xinerama? ( x11-proto/xineramaproto )
+   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
@@ -94,6 +94,10 @@ RDEPEND="${COMMON_DEPEND}
 "
 PDEPEND="vim-syntax? ( app-vim/gtk-syntax )"
 
+MULTILIB_CHOST_TOOLS=(
+   /usr/bin/gtk-query-immodules-3.0
+)
+
 strip_builddir() {
local rule=$1
shift
@@ -127,1

[gentoo-commits] proj/gnome:master commit in: x11-libs/gtk+/

2014-11-23 Thread Remi Cardona 
commit: d08a0ec8e065f8af516977ad0fb1779c346e4e5c
Author: Rémi Cardona  gentoo  org>
AuthorDate: Sun Nov 23 23:38:57 2014 +
Commit: Remi Cardona  gentoo  org>
CommitDate: Sun Nov 23 23:49:42 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=d08a0ec8

x11-libs/gtk+: 3.14.4 → 3.14.5

---
 x11-libs/gtk+/{gtk+-3.14.4.ebuild => gtk+-3.14.5.ebuild} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/x11-libs/gtk+/gtk+-3.14.4.ebuild b/x11-libs/gtk+/gtk+-3.14.5.ebuild
similarity index 100%
rename from x11-libs/gtk+/gtk+-3.14.4.ebuild
rename to x11-libs/gtk+/gtk+-3.14.5.ebuild

[gentoo-commits] proj/gnome:master commit in: x11-libs/gtk+/

2015-10-11 Thread Ole Reifschneider 
commit: 2bace6e4ddefc13c09b967e8f197be12f76f977f
Author: Ole Reifschneider  gentoo  org>
AuthorDate: Sun Oct  4 10:41:44 2015 +
Commit: Ole Reifschneider  gentoo  org>
CommitDate: Sun Oct 11 20:46:12 2015 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=2bace6e4

x11-libs/gtk+: Bump version to 3.18.0

Package-Manager: portage-2.2.22
Manifest-Sign-Key: 7E8B4D42

 .../gtk+/{gtk+-.ebuild => gtk+-3.18.0.ebuild}  | 55 +++---
 x11-libs/gtk+/gtk+-.ebuild | 10 ++--
 2 files changed, 22 insertions(+), 43 deletions(-)

diff --git a/x11-libs/gtk+/gtk+-.ebuild b/x11-libs/gtk+/gtk+-3.18.0.ebuild
similarity index 79%
copy from x11-libs/gtk+/gtk+-.ebuild
copy to x11-libs/gtk+/gtk+-3.18.0.ebuild
index 13bc54c..b70ecdf 100644
--- a/x11-libs/gtk+/gtk+-.ebuild
+++ b/x11-libs/gtk+/gtk+-3.18.0.ebuild
@@ -6,10 +6,7 @@ EAPI="5"
 GCONF_DEBUG="yes"
 GNOME2_LA_PUNT="yes"
 
-inherit eutils flag-o-matic gnome2 multilib virtualx multilib-minimal
-if [[ ${PV} =  ]]; then
-   inherit gnome2-live
-fi
+inherit autotools eutils flag-o-matic gnome2 multilib virtualx multilib-minimal
 
 DESCRIPTION="Gimp ToolKit +"
 HOMEPAGE="http://www.gtk.org/";
@@ -22,23 +19,18 @@ REQUIRED_USE="
xinerama? ( X )
 "
 
-if [[ ${PV} =  ]]; then
-   IUSE="${IUSE} doc"
-   KEYWORDS=""
-else
-   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"
-fi
+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)
 COMMON_DEPEND="
>=dev-libs/atk-2.15[introspection?,${MULTILIB_USEDEP}]
-   >=dev-libs/glib-2.43.4:2[${MULTILIB_USEDEP}]
+   >=dev-libs/glib-2.45.8:2[${MULTILIB_USEDEP}]
media-libs/fontconfig[${MULTILIB_USEDEP}]
>=media-libs/libepoxy-1.0[${MULTILIB_USEDEP}]
>=x11-libs/cairo-1.14[aqua?,glib,svg,X?,${MULTILIB_USEDEP}]
>=x11-libs/gdk-pixbuf-2.30:2[introspection?,X?,${MULTILIB_USEDEP}]
-   >=x11-libs/pango-1.36.7[introspection?,${MULTILIB_USEDEP}]
+   >=x11-libs/pango-1.37.3[introspection?,${MULTILIB_USEDEP}]
x11-misc/shared-mime-info
 
cloudprint? (
@@ -46,7 +38,7 @@ COMMON_DEPEND="
>=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 )
+   introspection? ( >=dev-libs/gobject-introspection-1.39:= )
wayland? (
>=dev-libs/wayland-1.5.91[${MULTILIB_USEDEP}]
media-libs/mesa[wayland,${MULTILIB_USEDEP}]
@@ -85,18 +77,11 @@ DEPEND="${COMMON_DEPEND}
test? (
media-fonts/font-misc-misc
media-fonts/font-cursor-misc )
-   examples? ( media-libs/libcanberra[gtk3] )
 "
-
-if [[ ${PV} =  ]]; then
-   DEPEND="${DEPEND}
-   doc? ( >=dev-util/gtk-doc-1.20 )"
-fi
-
 # 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
+#  https://mail.gnome.org/archives/desktop-devel-list/2012-March/msg00024.html
 RDEPEND="${COMMON_DEPEND}
>=dev-util/gtk-update-icon-cache-3
!=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 )
+   introspection? ( >=dev-libs/gobject-introspection-1.39:= )
wayland? (
>=dev-libs/wayland-1.5.91[${MULTILIB_USEDEP}]
media-libs/mesa[wayland,${MULTILIB_USEDEP}]
@@ -85,7 +85,6 @@ DEPEND="${COMMON_DEPEND}
test? (
media-fonts/font-misc-misc
media-fonts/font-cursor-misc )
-   examples? ( media-libs/libcanberra[gtk3] )
 "
 
 if [[ ${PV} =  ]]; then
@@ -96,7 +95,7 @@ fi
 # 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
+#  https://mail.gnome.org/archives/desktop-devel-list/2012-March/msg00024.html
 RDEPEND="${COMMON_DEPEND}
>=dev-util/gtk-update-icon-cache-3
!

[gentoo-commits] proj/gnome:master commit in: x11-libs/gtk+/

2014-10-13 Thread Gilles Dartiguelongue 
commit: 3d0b30d016f6ca5285d22585ce765b8da328c66d
Author: Gilles Dartiguelongue  gentoo  org>
AuthorDate: Mon Oct 13 21:31:09 2014 +
Commit: Gilles Dartiguelongue  gentoo  org>
CommitDate: Mon Oct 13 21:31:09 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=3d0b30d0

x11-libs/gtk+: 3.14.2 → 3.14.3

---
 x11-libs/gtk+/{gtk+-3.14.2.ebuild => gtk+-3.14.3.ebuild} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/x11-libs/gtk+/gtk+-3.14.2.ebuild b/x11-libs/gtk+/gtk+-3.14.3.ebuild
similarity index 100%
rename from x11-libs/gtk+/gtk+-3.14.2.ebuild
rename to x11-libs/gtk+/gtk+-3.14.3.ebuild

[gentoo-commits] proj/gnome:master commit in: x11-libs/gtk+/

2018-01-12 Thread Dennis Lamm 
commit: 3f7d84e6127ec62b49c9225b341338d2078d3ccd
Author: Dennis Lamm  gentoo  org>
AuthorDate: Fri Jan 12 14:59:19 2018 +
Commit: Dennis Lamm  gentoo  org>
CommitDate: Fri Jan 12 14:59:19 2018 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=3f7d84e6

x11-libs/gtk+: drop old

Package-Manager: Portage-2.3.13, Repoman-2.3.3

 x11-libs/gtk+/gtk+-3.20.2.ebuild | 235 ---
 1 file changed, 235 deletions(-)

diff --git a/x11-libs/gtk+/gtk+-3.20.2.ebuild b/x11-libs/gtk+/gtk+-3.20.2.ebuild
deleted file mode 100644
index 27481f26..
--- a/x11-libs/gtk+/gtk+-3.20.2.ebuild
+++ /dev/null
@@ -1,235 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="yes"
-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"
-IUSE="aqua broadway cloudprint colord cups examples +introspection test 
vim-syntax wayland X xinerama"
-REQUIRED_USE="
-   || ( aqua wayland X )
-   xinerama? ( X )
-"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~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)
-COMMON_DEPEND="
-   >=dev-libs/atk-2.15[introspection?,${MULTILIB_USEDEP}]
-   >=dev-libs/glib-2.45.8:2[${MULTILIB_USEDEP}]
-   media-libs/fontconfig[${MULTILIB_USEDEP}]
-   >=media-libs/libepoxy-1.0[${MULTILIB_USEDEP}]
-   >=x11-libs/cairo-1.14[aqua?,glib,svg,X?,${MULTILIB_USEDEP}]
-   >=x11-libs/gdk-pixbuf-2.30:2[introspection?,X?,${MULTILIB_USEDEP}]
-   >=x11-libs/pango-1.37.3[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.9.91[${MULTILIB_USEDEP}]
-   >=dev-libs/wayland-protocols-1.0.0[${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.5[${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-libs/gobject-introspection-common
-   >=dev-util/gdbus-codegen-2.38.2
-   >=dev-util/gtk-doc-am-1.20
-   >=sys-devel/gettext-0.18.3[${MULTILIB_USEDEP}]
-   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
-#  https://mail.gnome.org/archives/desktop-devel-list/2012-March/msg00024.html
-RDEPEND="${COMMON_DEPEND}
-   >=dev-util/gtk-update-icon-cache-3
-   !=x11-themes/adwaita-icon-theme-3.14
-   X? ( !

[gentoo-commits] proj/gnome:master commit in: x11-libs/gtk+/

2016-04-09 Thread Ole Reifschneider 
commit: 47c01b37d19b2184024e9b38e24fe2d3a2b0dce3
Author: Ole Reifschneider  gentoo  org>
AuthorDate: Sat Apr  9 09:46:11 2016 +
Commit: Ole Reifschneider  gentoo  org>
CommitDate: Sat Apr  9 09:46:11 2016 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=47c01b37

x11-libs/gtk+: Bump version to 3.20.2

Package-Manager: portage-2.2.28
Manifest-Sign-Key: 0xE9E568677E8B4D42

 x11-libs/gtk+/{gtk+-3.20.0.ebuild => gtk+-3.20.2.ebuild} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/x11-libs/gtk+/gtk+-3.20.0.ebuild b/x11-libs/gtk+/gtk+-3.20.2.ebuild
similarity index 100%
rename from x11-libs/gtk+/gtk+-3.20.0.ebuild
rename to x11-libs/gtk+/gtk+-3.20.2.ebuild

[gentoo-commits] proj/gnome:master commit in: x11-libs/gtk+/

2016-03-24 Thread Ole Reifschneider 
commit: 7d64fc2c829f9bc2aabbe26af6fd5af16f36be91
Author: Ole Reifschneider  gentoo  org>
AuthorDate: Sat Mar 19 16:34:53 2016 +
Commit: Ole Reifschneider  gentoo  org>
CommitDate: Fri Mar 25 00:52:42 2016 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=7d64fc2c

x11-libs/gtk+: Bump version to 3.20.0

Package-Manager: portage-2.2.28
Manifest-Sign-Key: 0xE9E568677E8B4D42

 .../{gtk+-3.18.0.ebuild => gtk+-3.20.0.ebuild} | 25 ++
 x11-libs/gtk+/gtk+-.ebuild |  7 +++---
 2 files changed, 10 insertions(+), 22 deletions(-)

diff --git a/x11-libs/gtk+/gtk+-3.18.0.ebuild b/x11-libs/gtk+/gtk+-3.20.0.ebuild
similarity index 87%
rename from x11-libs/gtk+/gtk+-3.18.0.ebuild
rename to x11-libs/gtk+/gtk+-3.20.0.ebuild
index b70ecdf..27481f2 100644
--- a/x11-libs/gtk+/gtk+-3.18.0.ebuild
+++ b/x11-libs/gtk+/gtk+-3.20.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -19,7 +19,7 @@ REQUIRED_USE="
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 ~arm64 ~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)
@@ -40,7 +40,8 @@ COMMON_DEPEND="
cups? ( >=net-print/cups-1.2[${MULTILIB_USEDEP}] )
introspection? ( >=dev-libs/gobject-introspection-1.39:= )
wayland? (
-   >=dev-libs/wayland-1.5.91[${MULTILIB_USEDEP}]
+   >=dev-libs/wayland-1.9.91[${MULTILIB_USEDEP}]
+   >=dev-libs/wayland-protocols-1.0.0[${MULTILIB_USEDEP}]
media-libs/mesa[wayland,${MULTILIB_USEDEP}]
>=x11-libs/libxkbcommon-0.2[${MULTILIB_USEDEP}]
)
@@ -50,7 +51,7 @@ COMMON_DEPEND="
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/libXrandr-1.5[${MULTILIB_USEDEP}]
x11-libs/libXcursor[${MULTILIB_USEDEP}]
x11-libs/libXfixes[${MULTILIB_USEDEP}]
x11-libs/libXcomposite[${MULTILIB_USEDEP}]
@@ -88,10 +89,6 @@ RDEPEND="${COMMON_DEPEND}
!=x11-themes/adwaita-icon-theme-3.14
X? ( !=x11-libs/libXi-1.3[${MULTILIB_USEDEP}]
x11-libs/libXext[${MULTILIB_USEDEP}]
-   >=x11-libs/libXrandr-1.3[${MULTILIB_USEDEP}]
+   >=x11-libs/libXrandr-1.5[${MULTILIB_USEDEP}]
x11-libs/libXcursor[${MULTILIB_USEDEP}]
x11-libs/libXfixes[${MULTILIB_USEDEP}]
x11-libs/libXcomposite[${MULTILIB_USEDEP}]

[gentoo-commits] proj/gnome:master commit in: x11-libs/gtk+/

2014-11-03 Thread Gilles Dartiguelongue 
commit: 1d42ec882b9576cebcf60aed006379fc1a3b3f9b
Author: Gilles Dartiguelongue  gentoo  org>
AuthorDate: Sun Nov  2 16:29:52 2014 +
Commit: Gilles Dartiguelongue  gentoo  org>
CommitDate: Sun Nov  2 16:29:52 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=1d42ec88

x11-libs/gtk+: 3.14.3 → 3.14.4

---
 x11-libs/gtk+/{gtk+-3.14.3.ebuild => gtk+-3.14.4.ebuild} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/x11-libs/gtk+/gtk+-3.14.3.ebuild b/x11-libs/gtk+/gtk+-3.14.4.ebuild
similarity index 100%
rename from x11-libs/gtk+/gtk+-3.14.3.ebuild
rename to x11-libs/gtk+/gtk+-3.14.4.ebuild

[gentoo-commits] proj/gnome:master commit in: x11-libs/gtk+/

2015-05-24 Thread Alexandre Rostovtsev 
commit: 993dfd9fdafc02b4b8f17a25d62acf44bc5e8548
Author: Alexandre Rostovtsev  gentoo  org>
AuthorDate: Mon May 25 02:03:05 2015 +
Commit: Alexandre Rostovtsev  gentoo  org>
CommitDate: Mon May 25 02:03:05 2015 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=993dfd9f

x11-libs/gtk+: revbump to not collide with gx86

Package-Manager: portage-2.2.20
Manifest-Sign-Key: 0x18E5B6F2D8D5EC8D

 x11-libs/gtk+/{gtk+-2.24.28.ebuild => gtk+-2.24.28-r1.ebuild} | 0
 x11-libs/gtk+/{gtk+-3.14.13.ebuild => gtk+-3.14.13-r1.ebuild} | 0
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/x11-libs/gtk+/gtk+-2.24.28.ebuild 
b/x11-libs/gtk+/gtk+-2.24.28-r1.ebuild
similarity index 100%
rename from x11-libs/gtk+/gtk+-2.24.28.ebuild
rename to x11-libs/gtk+/gtk+-2.24.28-r1.ebuild

diff --git a/x11-libs/gtk+/gtk+-3.14.13.ebuild 
b/x11-libs/gtk+/gtk+-3.14.13-r1.ebuild
similarity index 100%
rename from x11-libs/gtk+/gtk+-3.14.13.ebuild
rename to x11-libs/gtk+/gtk+-3.14.13-r1.ebuild

[gentoo-commits] proj/gnome:master commit in: x11-libs/gtk+/

2015-05-12 Thread Gilles Dartiguelongue 
commit: 7458b115ef7a1e92e658378a3fb1194d00696116
Author: Gilles Dartiguelongue  gentoo  org>
AuthorDate: Tue May 12 19:03:46 2015 +
Commit: Gilles Dartiguelongue  gentoo  org>
CommitDate: Tue May 12 19:05:30 2015 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=7458b115

x11-libs/gtk+: 3.16.2 → 3.16.3

 x11-libs/gtk+/{gtk+-3.16.2.ebuild => gtk+-3.16.3.ebuild} | 2 +-
 x11-libs/gtk+/gtk+-.ebuild   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/x11-libs/gtk+/gtk+-3.16.2.ebuild b/x11-libs/gtk+/gtk+-3.16.3.ebuild
similarity index 99%
rename from x11-libs/gtk+/gtk+-3.16.2.ebuild
rename to x11-libs/gtk+/gtk+-3.16.3.ebuild
index 80e3822..55b2a89 100644
--- a/x11-libs/gtk+/gtk+-3.16.2.ebuild
+++ b/x11-libs/gtk+/gtk+-3.16.3.ebuild
@@ -134,7 +134,7 @@ src_prepare() {
fi
 
# Do no build and install gtk-update-icon-cache which is done by gtk+:2
-   epatch "${FILESDIR}"/${P}-remove_update-icon-cache.patch
+   epatch "${FILESDIR}"/${PN}-3.16.2-remove_update-icon-cache.patch
 
epatch_user
 

diff --git a/x11-libs/gtk+/gtk+-.ebuild b/x11-libs/gtk+/gtk+-.ebuild
index c2c45c3..284cd91 100644
--- a/x11-libs/gtk+/gtk+-.ebuild
+++ b/x11-libs/gtk+/gtk+-.ebuild
@@ -149,7 +149,7 @@ src_prepare() {
fi
 
# Do no build and install gtk-update-icon-cache which is done by gtk+:2
-   epatch "${FILESDIR}"/${P}-remove_update-icon-cache.patch
+   epatch "${FILESDIR}"/${PN}-3.16.2-remove_update-icon-cache.patch
 
epatch_user

[gentoo-commits] proj/gnome:master commit in: x11-libs/gtk+/

2015-05-14 Thread Gilles Dartiguelongue 
commit: 4df73d48979c25415fd4dc446b41c14994ec20eb
Author: Gilles Dartiguelongue  gentoo  org>
AuthorDate: Thu May 14 10:58:38 2015 +
Commit: Gilles Dartiguelongue  gentoo  org>
CommitDate: Thu May 14 10:58:38 2015 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=4df73d48

x11-libs/gtk+: 2.24.27-r2 → 2.24.28

 x11-libs/gtk+/{gtk+-2.24.27-r2.ebuild => gtk+-2.24.28.ebuild} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/x11-libs/gtk+/gtk+-2.24.27-r2.ebuild 
b/x11-libs/gtk+/gtk+-2.24.28.ebuild
similarity index 100%
rename from x11-libs/gtk+/gtk+-2.24.27-r2.ebuild
rename to x11-libs/gtk+/gtk+-2.24.28.ebuild

[gentoo-commits] proj/gnome:master commit in: x11-libs/gtk+/

2014-12-14 Thread Gilles Dartiguelongue 
commit: 4ded56b4dd158ee154e929f4f5d77a1117e2bf0d
Author: Gilles Dartiguelongue  gentoo  org>
AuthorDate: Sun Dec 14 22:43:06 2014 +
Commit: Gilles Dartiguelongue  gentoo  org>
CommitDate: Sun Dec 14 22:45:42 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=4ded56b4

x11-libs/gtk+: moved to gentoo-x86, sync live ebuild

---
 x11-libs/gtk+/gtk+-3.14.6.ebuild | 246 ---
 x11-libs/gtk+/gtk+-.ebuild   |   8 ++
 2 files changed, 8 insertions(+), 246 deletions(-)

diff --git a/x11-libs/gtk+/gtk+-3.14.6.ebuild b/x11-libs/gtk+/gtk+-3.14.6.ebuild
deleted file mode 100644
index 98e6e47..000
--- a/x11-libs/gtk+/gtk+-3.14.6.ebuild
+++ /dev/null
@@ -1,246 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit eutils flag-o-matic autotools 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.12[introspection?,${MULTILIB_USEDEP}]
-   >=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/gtk+-2.24:2[${MULTILIB_USEDEP}]
-   >=x11-libs/pango-1.36.7[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.5.91[${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
-   >=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}
-   !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. Plea

[gentoo-commits] proj/gnome:master commit in: x11-libs/gtk+/

2014-12-14 Thread Gilles Dartiguelongue 
commit: 629e8bf04a43fc64ebcce23e1556b392e567c94c
Author: Gilles Dartiguelongue  gentoo  org>
AuthorDate: Sun Dec 14 21:42:00 2014 +
Commit: Gilles Dartiguelongue  gentoo  org>
CommitDate: Sun Dec 14 22:45:36 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=629e8bf0

x11-libs/gtk+: 3.14.5 → 3.14.6

---
 x11-libs/gtk+/{gtk+-3.14.5.ebuild => gtk+-3.14.6.ebuild} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/x11-libs/gtk+/gtk+-3.14.5.ebuild b/x11-libs/gtk+/gtk+-3.14.6.ebuild
similarity index 100%
rename from x11-libs/gtk+/gtk+-3.14.5.ebuild
rename to x11-libs/gtk+/gtk+-3.14.6.ebuild

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

2014-04-20 Thread Gilles Dartiguelongue 
commit: ce681553520b9ea3372eb3d7c9aa360a2f2b8c94
Author: Gilles Dartiguelongue  gentoo  org>
AuthorDate: Sun Apr 20 15:38:08 2014 +
Commit: Gilles Dartiguelongue  gentoo  org>
CommitDate: Sun Apr 20 15:48:30 2014 +
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=ce681553

x11-libs/gtk+: QAed

* Packagekit support was dropped.
* Cosmetic changes to dependencies.
* Fix keywords.
* Sync live ebuild.

---
 .../gtk+/files/gtk+-3.3.18-fallback-theme.patch| 81 --
 x11-libs/gtk+/gtk+-3.12.0.ebuild   | 17 +++--
 x11-libs/gtk+/gtk+-.ebuild | 41 ++-
 3 files changed, 28 insertions(+), 111 deletions(-)

diff --git a/x11-libs/gtk+/files/gtk+-3.3.18-fallback-theme.patch 
b/x11-libs/gtk+/files/gtk+-3.3.18-fallback-theme.patch
deleted file mode 100644
index 7f5d0a1..000
--- a/x11-libs/gtk+/files/gtk+-3.3.18-fallback-theme.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From 1a3f790830c2db70eb3369e684c3cd8ac3b8051b Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev 
-Date: Wed, 14 Mar 2012 23:08:53 -0400
-Subject: [PATCH] settings: fall back to settings.ini gtk theme if requested
- theme fails
-
-If a gtk3 application is run in gnome2 and the settings daemon uses
-xsettings to request a gtk2 theme with no gtk3 version (which is the
-case by default), then instead of failing to load any theme, we should
-attempt to fall back to the theme specified in settings.ini files.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=654108

- gtk/gtksettings.c |   23 +++
- 1 files changed, 23 insertions(+), 0 deletions(-)
-
-diff --git a/gtk/gtksettings.c b/gtk/gtksettings.c
-index 2e17430..354ba34 100644
 a/gtk/gtksettings.c
-+++ b/gtk/gtksettings.c
-@@ -115,6 +115,7 @@ struct _GtkSettingsPrivate
-   GtkCssProvider *theme_provider;
-   GtkCssProvider *key_theme_provider;
-   GtkStyleProperties *style;
-+  gchar *fallback_gtk_theme_name;
- };
- 
- typedef enum
-@@ -1528,6 +1529,8 @@ gtk_settings_finalize (GObject *object)
-   if (priv->style)
- g_object_unref (priv->style);
- 
-+  g_free (priv->fallback_gtk_theme_name);
-+
-   G_OBJECT_CLASS (gtk_settings_parent_class)->finalize (object);
- }
- 
-@@ -1889,6 +1892,12 @@ apply_queued_setting (GtkSettings *settings,
-   if (pspec->param_id == PROP_COLOR_SCHEME)
- merge_color_scheme (settings, &tmp_value, qvalue->source);
- 
-+  if (!g_strcmp0 (pspec->name, "gtk-theme-name") && qvalue->source == 
GTK_SETTINGS_SOURCE_DEFAULT)
-+{
-+  g_free (priv->fallback_gtk_theme_name);
-+  priv->fallback_gtk_theme_name = g_value_dup_string (&tmp_value);
-+}
-+
-   if (priv->property_values[pspec->param_id - 1].source <= qvalue->source)
- {
-   g_value_copy (&tmp_value, &priv->property_values[pspec->param_id - 
1].value);
-@@ -2594,6 +2603,10 @@ _gtk_settings_reset_rc_values (GtkSettings *settings)
- }
-   i++;
- }
-+
-+  g_free (priv->fallback_gtk_theme_name);
-+  priv->fallback_gtk_theme_name = NULL;
-+
-   g_object_thaw_notify (G_OBJECT (settings));
-   g_free (pspecs);
- }
-@@ -2881,6 +2894,16 @@ settings_update_theme (GtkSettings *settings)
- 
-   if (!provider)
- provider = gtk_css_provider_get_named (theme_name, NULL);
-+
-+  /* If we failed, fall back to the theme from settings.ini */
-+  if (!provider && priv->fallback_gtk_theme_name && 
*priv->fallback_gtk_theme_name
-+  && g_strcmp0 (theme_name, priv->fallback_gtk_theme_name))
-+{
-+  provider = gtk_css_provider_get_named 
(priv->fallback_gtk_theme_name, NULL);
-+
-+  if (!provider)
-+provider = gtk_css_provider_get_named 
(priv->fallback_gtk_theme_name, NULL);
-+}
- }
- 
-   /* If we didn't find the named theme, fall back */
--- 
-1.7.8.5
-

diff --git a/x11-libs/gtk+/gtk+-3.12.0.ebuild b/x11-libs/gtk+/gtk+-3.12.0.ebuild
index d891bcc..ee97028 100644
--- a/x11-libs/gtk+/gtk+-3.12.0.ebuild
+++ b/x11-libs/gtk+/gtk+-3.12.0.ebuild
@@ -1,6 +1,6 @@
 # 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.10.8.ebuild,v 1.4 
2014/04/16 07:49:22 ago Exp $
+# $Header: $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -18,12 +18,12 @@ 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 packagekit 
test vim-syntax wayland X xinerama"
+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-inter

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

2015-04-19 Thread Ole Reifschneider 
commit: d3b33a458d7baea4e9192441932d87d2cde10610
Author: Ole Reifschneider  gentoo  org>
AuthorDate: Sun Apr 19 11:26:43 2015 +
Commit: Ole Reifschneider  gentoo  org>
CommitDate: Sun Apr 19 11:26:43 2015 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=d3b33a45

Bump x11-libs/gtk+ version to 3.16.2

Package-Manager: portage-2.2.14
Manifest-Sign-Key: 7E8B4D42

 .../gtk+-3.16.2-remove_update-icon-cache.patch |  24 +
 x11-libs/gtk+/files/gtk+-non-bash-support.patch|  29 --
 .../gtk+/{gtk+-.ebuild => gtk+-3.16.2.ebuild}  | 109 -
 x11-libs/gtk+/gtk+-.ebuild |   6 +-
 x11-libs/gtk+/metadata.xml |   2 +
 5 files changed, 72 insertions(+), 98 deletions(-)

diff --git a/x11-libs/gtk+/files/gtk+-3.16.2-remove_update-icon-cache.patch 
b/x11-libs/gtk+/files/gtk+-3.16.2-remove_update-icon-cache.patch
new file mode 100644
index 000..b121dd5
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-3.16.2-remove_update-icon-cache.patch
@@ -0,0 +1,24 @@
+From d83443d10381a53637226b937094454951de44c1 Mon Sep 17 00:00:00 2001
+From: Ole Reifschneider 
+Date: Thu, 16 Apr 2015 23:51:51 +0200
+Subject: [PATCH] Remove update-icon-cache from bin_PROGRAMS
+
+---
+ gtk/Makefile.am | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/gtk/Makefile.am b/gtk/Makefile.am
+index 83dfe31..a5afc03 100644
+--- a/gtk/Makefile.am
 b/gtk/Makefile.am
+@@ -1380,7 +1380,6 @@ endif
+ #
+ bin_PROGRAMS = \
+   gtk-query-immodules-3.0 \
+-  gtk-update-icon-cache \
+   gtk-encode-symbolic-svg \
+   gtk-launch
+
+--
+2.0.5
+

diff --git a/x11-libs/gtk+/files/gtk+-non-bash-support.patch 
b/x11-libs/gtk+/files/gtk+-non-bash-support.patch
deleted file mode 100644
index efd13e6..000
--- a/x11-libs/gtk+/files/gtk+-non-bash-support.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From c8ef010024db794e25ca58ef3c02663de685f1bb Mon Sep 17 00:00:00 2001
-From: Alexander Tsoy 
-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+-.ebuild b/x11-libs/gtk+/gtk+-3.16.2.ebuild
similarity index 66%
copy from x11-libs/gtk+/gtk+-.ebuild
copy to x11-libs/gtk+/gtk+-3.16.2.ebuild
index c7e2c21..893508c 100644
--- a/x11-libs/gtk+/gtk+-.ebuild
+++ b/x11-libs/gtk+/gtk+-3.16.2.ebuild
@@ -1,47 +1,35 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-3.14.10.ebuild,v 1.1 
2015/03/28 09:52:54 pacho Exp $
 
 EAPI="5"
-GCONF_DEBUG="no"
+GCONF_DEBUG="yes"
 GNOME2_LA_PUNT="yes"
 
-inherit eutils flag-o-matic gnome2 multilib virtualx multilib-minimal
-if [[ ${PV} =  ]]; then
-   inherit gnome2-live
-fi
+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"
+IUSE="aqua broadway cloudprint colord cups examples +introspection test 
vim-syntax wayland X xinerama"
 REQUIRED_USE="
|| ( aqua wayland X )
xinerama? ( X )
 "
 
-if [[ ${PV} =  ]]; then
-   IUSE="${IUSE} doc"
-   KEYWORDS=""
-else
-   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"
-fi
+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.12[introspectio

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

2014-11-30 Thread Remi Cardona 
commit: e8432718a163db9e0c2389815e034678413b247e
Author: Rémi Cardona  gentoo  org>
AuthorDate: Sun Nov 30 15:51:35 2014 +
Commit: Remi Cardona  gentoo  org>
CommitDate: Sun Nov 30 15:52:17 2014 +
URL:
http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=e8432718

x11-libs/gtk+: Fix build with dash as /bin/sh

See bug #525928.

---
 x11-libs/gtk+/files/gtk+-non-bash-support.patch | 29 +
 x11-libs/gtk+/gtk+-3.14.5.ebuild|  6 -
 2 files changed, 34 insertions(+), 1 deletion(-)

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 
+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.5.ebuild
index 122f8e6..98e6e47 100644
--- a/x11-libs/gtk+/gtk+-3.14.5.ebuild
+++ b/x11-libs/gtk+/gtk+-3.14.5.ebuild
@@ -6,7 +6,7 @@ EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
-inherit eutils flag-o-matic gnome2 multilib virtualx multilib-minimal
+inherit eutils flag-o-matic autotools gnome2 multilib virtualx multilib-minimal
 
 DESCRIPTION="Gimp ToolKit +"
 HOMEPAGE="http://www.gtk.org/";
@@ -108,6 +108,9 @@ 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
@@ -128,6 +131,7 @@ src_prepare() {
strip_builddir SRC_SUBDIRS examples Makefile.in
fi
 
+   eautoreconf
gnome2_src_prepare
 }

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

2015-05-09 Thread Gilles Dartiguelongue 
commit: 359446c5a33a787dd9d1c0b8c27939d1ae707602
Author: Gilles Dartiguelongue  gentoo  org>
AuthorDate: Sat May  9 21:45:01 2015 +
Commit: Gilles Dartiguelongue  gentoo  org>
CommitDate: Sat May  9 22:24:42 2015 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=359446c5

x11-libs/gtk+: depend on split gtk-update-icon-cache

Also sync ebuilds across slots and re-tests src_prepare tests.

 .../gtk+/files/gtk+-2.24.24-out-of-source.patch|  33 +++
 .../files/gtk+-2.24.27-update-icon-cache.patch |  64 +
 x11-libs/gtk+/files/gtk+-non-bash-support.patch|  56 
 x11-libs/gtk+/gtk+-2.24.27-r2.ebuild   | 292 +
 .../{gtk+-3.16.2.ebuild => gtk+-3.14.13.ebuild}|  35 ++-
 x11-libs/gtk+/gtk+-3.16.2.ebuild   |  14 +-
 x11-libs/gtk+/gtk+-.ebuild |  65 +++--
 7 files changed, 498 insertions(+), 61 deletions(-)

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?= 
+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 $gtk_all_c_sources; do if test -f ${f}; then grep '^ *# *define 
__' ${f}; else grep '^ *# *define __' "${srcdir-.}"/${f}; fi; done } | sed 
's/.*define //;s/ *$//' | sort > actual-files
+ 
+ diff expected-files actual-files && rm -f expected-files actual-files
+-- 
+1.9.3
+

diff --git a/x11-libs/gtk+/files/gtk+-2.24.27-update-icon-cache.patch 
b/x11-libs/gtk+/files/gtk+-2.24.27-update-icon-cache.patch
new file mode 100644
index 000..f88e02e
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-2.24.27-update-icon-cache.patch
@@ -0,0 +1,64 @@
+From 2537d97e4685767ce22834c0dd24d37ba715fb52 Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue 
+Date: Sat, 9 May 2015 23:30:58 +0200
+Subject: [PATCH] Always use external gtk-update-icon-cache
+
+---
+ configure.ac|  8 +++-
+ gtk/Makefile.am | 13 ++---
+ 2 files changed, 5 insertions(+), 16 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 2671a3d..fa46004 100644
+--- a/configure.ac
 b/configure.ac
+@@ -913,11 +913,9 @@ dnl Look for a host system's gdk-pixbuf-csource if we are 
cross-compiling
+ 
+ AM_CONDITIONAL(CROSS_COMPILING, test $cross_compiling = yes)
+ 
+-if test $cross_compiling = yes; then
+-  AC_PATH_PROG(GTK_UPDATE_ICON_CACHE, gtk-update-icon-cache, no)
+-  if test x$GTK_UPDATE_ICON_CACHE = xno; then
+-REBUILD_PNGS=#
+-  fi
++AC_PATH_PROG(GTK_UPDATE_ICON_CACHE, gtk-update-icon-cache, no)
++if test x$GTK_UPDATE_ICON_CACHE = xno; then
++  REBUILD_PNGS=#
+ fi
+ 
+ AC_PATH_PROG(GDK_PIXBUF_CSOURCE, gdk-pixbuf-csource, no)
+diff --git a/gtk/Makefile.am b/gtk/Makefile.am
+index 248220d..42e4c23 100644
+--- a/gtk/Makefile.am
 b/gtk/Makefile.am
+@@ -1039,8 +1039,7 @@ endif
+ # Installed tools
+ #
+ bin_PROGRAMS = \
+-  gtk-query-immodules-2.0 \
+-  gtk-update-icon-cache
++  gtk-query-immodules-2.0
+ 
+ bin_SCRIPTS = gtk-builder-convert
+ 
+@@ -1390,16 +1389,8 @@ stamp-icons: $(STOCK_ICONS)
+   ) done  \
+   && touch stamp-icons
+ 
+-if CROSS_COMPILING
+-gtk_update_icon_cache_program = $(GTK_UPDATE_ICON_CACHE)
+-else
+-gtk_update_icon_cache_program =   
\
+- ./gtk-update-icon-cache
+-endif
+-
+ gtkbuiltincache.h: @REBUILD@ stamp-icons
+-  $(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache$(EXEEXT)
+-  $(gtk_update_icon_cache_program) --force --ignore-theme-index   
\
++  $(GTK_UPDATE_ICON_CACHE) --force --ignore-theme-index   \
+  --include-image-data

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

2019-01-18 Thread Mart Raudsepp 
commit: 7a029594c850603a417d3575fd43132377f541f3
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Fri Jan 18 21:05:54 2019 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Fri Jan 18 21:05:54 2019 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=7a029594

x11-libs/gtk+: Remove very outdated live ebuild

It's gtk4 into SLOT=3, tries to build with autotools (isn't a thing
for gtk4 git), and hasn't been synced with other changes for over
3 years, it seems. On top of that, later blind fixes broke the
dependency string.

Closes: https://bugs.gentoo.org/674514
Signed-off-by: Mart Raudsepp  gentoo.org>

 .../gtk+-3.16.2-remove_update-icon-cache.patch |  24 --
 x11-libs/gtk+/files/gtk+-non-bash-support.patch|  56 -
 x11-libs/gtk+/files/settings.ini   |   4 -
 x11-libs/gtk+/gtk+-.ebuild | 265 -
 x11-libs/gtk+/metadata.xml |  23 --
 5 files changed, 372 deletions(-)

diff --git a/x11-libs/gtk+/files/gtk+-3.16.2-remove_update-icon-cache.patch 
b/x11-libs/gtk+/files/gtk+-3.16.2-remove_update-icon-cache.patch
deleted file mode 100644
index b121dd57..
--- a/x11-libs/gtk+/files/gtk+-3.16.2-remove_update-icon-cache.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From d83443d10381a53637226b937094454951de44c1 Mon Sep 17 00:00:00 2001
-From: Ole Reifschneider 
-Date: Thu, 16 Apr 2015 23:51:51 +0200
-Subject: [PATCH] Remove update-icon-cache from bin_PROGRAMS
-

- gtk/Makefile.am | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/gtk/Makefile.am b/gtk/Makefile.am
-index 83dfe31..a5afc03 100644
 a/gtk/Makefile.am
-+++ b/gtk/Makefile.am
-@@ -1380,7 +1380,6 @@ endif
- #
- bin_PROGRAMS = \
-   gtk-query-immodules-3.0 \
--  gtk-update-icon-cache \
-   gtk-encode-symbolic-svg \
-   gtk-launch
-
---
-2.0.5
-

diff --git a/x11-libs/gtk+/files/gtk+-non-bash-support.patch 
b/x11-libs/gtk+/files/gtk+-non-bash-support.patch
deleted file mode 100644
index a1aac42c..
--- a/x11-libs/gtk+/files/gtk+-non-bash-support.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 43a4a28cdc60ac7347bb89f84cf049cb3401621d Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?R=C3=A9mi=20Cardona?= 
-Date: Sun, 26 Oct 2014 01:59:33 +0400
-Subject: [PATCH] gtk/Makefile.am: Remove bashisms
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-- improve portability of ECHO
-- remove use of shopt
-
-https://bugzilla.gnome.org/show_bug.cgi?id=738835
-
-From: Alexander Tsoy 
-Signed-off-by: Rémi Cardona 

- gtk/Makefile.am | 13 +
- 1 file changed, 5 insertions(+), 8 deletions(-)
-
-diff --git a/gtk/Makefile.am b/gtk/Makefile.am
-index 96c651a..b1478ce 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
-@@ -1405,12 +1401,13 @@ gtk.gresource.xml: Makefile.am
- n=`basename $$f`; \
- $(ECHO) "ui/$$n" >> $@; \
-   done; \
--  shopt -s nullglob; \
-   for s in 16x16 22x22 24x24 32x32 48x48; do \
- for c in actions status; do \
-   for f in $(srcdir)/resources/icons/$$s/$$c/*.png; do \
--n=`basename $$f`; \
--$(ECHO) "icons/$$s/$$c/$$n" >> $@; \
-+if [ -e "$$f" ] ; then \
-+  n=`basename $$f`; \
-+  $(ECHO) "icons/$$s/$$c/$$n" >> $@; \
-+fi; \
-   done; \
- done; \
-   done; \
--- 
-2.3.0
-

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

diff --git a/x11-libs/gtk+/gtk+-.ebuild b/x11-libs/gtk+/gtk+-.ebuild
deleted file mode 100644
index b6b62d7d..
--- a/x11-libs/gtk+/gtk+-.ebuild
+++ /dev/null
@@ -1,265 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-
-inherit eutils flag-o-matic gnome2 multilib virtualx multilib-minimal
-if [[ ${PV} =  ]]; then
-   inherit gnome2-live
-fi
-
-DESCRIPTION="Gimp ToolKit +"
-HOMEPAGE="http://www.gtk.org/";
-
-LICENSE="LGPL-2+"
-SLOT="3"
-IUSE="aqua broadway cloudprint colord cups examples +introspection test 
vim-syntax wayland X xinerama"
-REQUIRED_USE="
-   || ( aqua wayland X )
-   xinerama? ( X )
-"
-
-if [[ ${PV} =  ]]; then
-   IUSE="${IUSE} doc"
-   KEYWORDS=""
-else
-   KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-in

[gentoo-commits] proj/gnome:master commit in: x11-libs/gtk+/, x11-libs/gtk+/files/, dev-util/gtk-update-icon-cache/

2015-05-24 Thread Alexandre Rostovtsev 
commit: 65018f50b9ad0a19cbfdc7f069117f86d0c684ed
Author: Alexandre Rostovtsev  gentoo  org>
AuthorDate: Mon May 25 04:13:56 2015 +
Commit: Alexandre Rostovtsev  gentoo  org>
CommitDate: Mon May 25 04:13:56 2015 +
URL:https://gitweb.gentoo.org/proj/gnome.git/commit/?id=65018f50

dev-util/gtk-update-icon-cache: moved to gx86

Package-Manager: portage-2.2.20
Manifest-Sign-Key: 0x18E5B6F2D8D5EC8D

 .../gtk-update-icon-cache-2.24.27.ebuild   |  29 --
 .../gtk-update-icon-cache-3.14.13.ebuild   |  29 --
 dev-util/gtk-update-icon-cache/metadata.xml|  13 -
 .../gtk+/files/gtk+-2.24.24-out-of-source.patch|  33 ---
 .../files/gtk+-2.24.27-update-icon-cache.patch |  64 -
 x11-libs/gtk+/gtk+-2.24.28-r1.ebuild   | 292 -
 x11-libs/gtk+/gtk+-3.14.13-r1.ebuild   | 244 -
 7 files changed, 704 deletions(-)

diff --git 
a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-2.24.27.ebuild 
b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-2.24.27.ebuild
deleted file mode 100644
index 55b1797..000
--- a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-2.24.27.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-GCONF_DEBUG="no"
-
-inherit gnome2
-
-DESCRIPTION="GTK update icon cache"
-HOMEPAGE="http://www.gtk.org/";
-SRC_URI="http://dev.gentoo.org/~eva/distfiles/${PN}/${P}.tar.xz";
-
-LICENSE="LGPL-2+"
-SLOT="0"
-IUSE=""
-
-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"
-
-RDEPEND="
-   >=dev-libs/glib-2.28:2
-   >=x11-libs/gdk-pixbuf-2.21:2
-   !http://www.gtk.org/";
-SRC_URI="http://dev.gentoo.org/~eva/distfiles/${PN}/${P}.tar.xz";
-
-LICENSE="LGPL-2+"
-SLOT="0"
-IUSE=""
-
-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"
-
-RDEPEND="
-   >=dev-libs/glib-2.41.2:2
-   >=x11-libs/gdk-pixbuf-2.30:2
-   !
-http://www.gentoo.org/dtd/metadata.dtd";>
-
-  gnome
-  
-gtk-update-icon-cache is a tool from GTK+ to update icons and themes
-caches.
-
-It is split from the GTK+ sources by the Gentoo Gnome team to help
-GTK+ 2 and 3 to co-exist better by extracting the single conflicting
-tool.
-  
-

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
deleted file mode 100644
index 451233c..000
--- a/x11-libs/gtk+/files/gtk+-2.24.24-out-of-source.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 9e0f33144aff8d792ab105927cf686eda0afd25e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= 
-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 $gtk_all_c_sources; do if test -f ${f}; then grep '^ *# *define 
__' ${f}; else grep '^ *# *define __' "${srcdir-.}"/${f}; fi; done } | sed 
's/.*define //;s/ *$//' | sort > actual-files
- 
- diff expected-files actual-files && rm -f expected-files actual-files
--- 
-1.9.3
-

diff --git a/x11-libs/gtk+/files/gtk+-2.24.27-update-icon-cache.patch 
b/x11-libs/gtk+/files/gtk+-2.24.27-update-icon-cache.patch
deleted file mode 100644
index f88e02e..000
--- a/x11-libs/gtk+/files/gtk+-2.24.27-update-icon-cache.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 2537d97e4685767ce22834c0dd24d37ba715fb52 Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue 
-Date: Sat, 9 May 2015 23:30:58 +0200
-Subject: [PATCH] Always use external gtk-update-icon-cache
-

- configure.ac|  8 +++-
- gtk/Makefile.a