x11-libs/gtk+: bump to 3.5.8 + deps

4 files changed, 7 insertions, 55 deletions

diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index c50e187d..e76cab78 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -1,6 +1,5 @@
 AUX gtk+-3.3.18-fallback-theme.patch 2841 SHA256 a552218132b903835a480881803e29be678a311d3a653b8111eba1fd0ea04922 SHA512 2be5cd482625292780e88c6be5ec3e2932a1b3187ac57f2a0bbb37ebdeb9b34e56481a4ca74fc7af088389fb68dbb748e8e2cffc984052695fa6032bff0556cb WHIRLPOOL 8ae2ea9175a6ad5e0cfa6f8e018bd9ddb580548f496a81360ca302cc9d4d7cf70f5cb86f52967ee770e71f530b238d7b070b8aa61ffd040990ef0cb7b1811804
-AUX gtk+-3.3.20-wayland-xkbcommon-headers.patch 1347 SHA256 9876be3bf2ef19413248e5de51e285aa1545b3d94751e840692b811c7b4bd9a9 SHA512 8397530f85a0b8e611ab30fd4ea6a3421c7862a8aeb05ba1eaea951a2e82738bc4482e8c04be620cc03690e413190cce63f0efe0cd39aecb62e70e754e8d240c WHIRLPOOL 0a1f78b076166af3727740fb736471304124dfcf1544a0452ebd6551cd0fe00a02d09ce2c44863c6df51d1b5030cfa849e89226662cc4f633ac820c4d5d2ef78
 AUX settings.ini 96 SHA256 a42c86c26b5bfa0da806961e28cdff21da6e2f7c35febf67c67d7f2667658163 SHA512 76eff45e3413ed7b2fb6bb557c363cd6d8a65ae505709cf5ce26d579470e38968d51e72615779f47fac2994937a3c64ac4143c6cbd2cf5a2db23a01bcd9b6418 WHIRLPOOL 64a2c11ef1a6eda0bca40555a182023229202bcf15d527e6da8c52703be2fca26629b78ed677522eb626de7b7f456a7c37ab7fc3fe41907f1a46d770edb1fd67
-DIST gtk+-3.5.6.tar.xz 12990552 SHA256 8f044a9ac03b156258e72196b44aab0d893a90f63a093642edf27f3f6c690881 SHA512 fcddcc0003a3573266840651c47ed9540896468f62714d8657f5273664de530496e857c52977b01a555dd4f04c4c5744385d9894f2fbd0f76aa27dd2f69b237c WHIRLPOOL d99f6f8f006573afe94733da4d61b532fb771215e32c36aff72e68557df8a411a08513f5627d37cb8da4261ef89410545d5a1beb40ecfe0bce972a350ccd641e
-EBUILD gtk+-3.5.6.ebuild 7374 SHA256 cdcc488969166730b387e3d6b0a9459478e9dc0f4e6fa50367cf201a4ec5a918 SHA512 4fc0bc7c80903bd466f29a993d7cdda5db67acd9b3bf595912f1326cf8459fe69c8ca70b5467f9303a38619c28978c338c17a97ddf0987c27630f15667e3451f WHIRLPOOL b5c727f5cbbfd1aadc9cf40228e85919c1591d3b03ae57ba3a073a0cb4b633a2fb0938c880387c37390d77b0c5203329cab80b1f85765afc4abff22a08b3b773
-EBUILD gtk+-9999.ebuild 7366 SHA256 405d95ca44c8ef62c504c81ed805b1f4245ba57a4f165c7e66060eb1e553aad4 SHA512 1f78d04021518c2d5e2cfe267262eaabee8840e25774b2bc96ca51caa2d2eac4fd4a84ce6257f636fcee8598736dba11f11ee6267fd9e170b8bad55265c29cf4 WHIRLPOOL b812334736091844ed5e9be6f40bdebf7838c2800ffca77bc0c4779434ef94fa19043ceed09bf7e8c3163ca1372d003b2a974073f595a8ee38eb9898b2036fff
+DIST gtk+-3.5.8.tar.xz 13018968 SHA256 bfbb19487ba0087476fb080d43f4e50acf985c2c1e82b5e6d92d912e6022a3cf SHA512 b189d36ee2c47084880f480aacb4f9b48438c0e294a0dec3ec665910466f9b6eb662240ba91d52b904286961fcd90a11ab51fa39ca34b54dc097264b41001ef3 WHIRLPOOL b530d1b73f358991958eb6344de5797d70e93fac2f01bb1e610ad44b39cf6d0e3765e32f305046fb9dceb78eb574e4a1c7dc1b98892fecf938f5eac51fcaa7b9
+EBUILD gtk+-3.5.8.ebuild 7187 SHA256 0c44ca85fab1f183dd594e0e4161ba5e44542496fdb2ef697b073a6f3b1470d5 SHA512 5e20eb8681d71d81673fdefa70ae3748bbafa0c649a70024d4bdd9232aa3169ae67025cb333834c0422da38425bca024ad15e36cee25222664c948866ec4449c WHIRLPOOL cafc414069142b5df8d09ec56d2c5ae27f26fa72f63e08a58964387ed6f43db75154acea0708c1c0653dc41b4d4f98eef9037f7cc6bb1c177bde9128bfd113f7
+EBUILD gtk+-9999.ebuild 7187 SHA256 0c44ca85fab1f183dd594e0e4161ba5e44542496fdb2ef697b073a6f3b1470d5 SHA512 5e20eb8681d71d81673fdefa70ae3748bbafa0c649a70024d4bdd9232aa3169ae67025cb333834c0422da38425bca024ad15e36cee25222664c948866ec4449c WHIRLPOOL cafc414069142b5df8d09ec56d2c5ae27f26fa72f63e08a58964387ed6f43db75154acea0708c1c0653dc41b4d4f98eef9037f7cc6bb1c177bde9128bfd113f7
diff --git a/x11-libs/gtk+/files/gtk+-3.3.20-wayland-xkbcommon-headers.patch b/x11-libs/gtk+/files/gtk+-3.3.20-wayland-xkbcommon-headers.patch
deleted file mode 100644
index 2e052d9a..00000000
--- a/x11-libs/gtk+/files/gtk+-3.3.20-wayland-xkbcommon-headers.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff --git a/gdk/wayland/gdkdevice-wayland.c b/gdk/wayland/gdkdevice-wayland.c
-index 9e8e6b1..237a5b8 100644
---- a/gdk/wayland/gdkdevice-wayland.c
-+++ b/gdk/wayland/gdkdevice-wayland.c
-@@ -32,7 +32,7 @@
- #include "gdkdevicemanagerprivate.h"
- #include "gdkprivate-wayland.h"
- 
--#include <X11/extensions/XKBcommon.h>
-+#include <xkbcommon/xkbcommon.h>
- #include <X11/keysym.h>
- 
- #include <sys/time.h>
-diff --git a/gdk/wayland/gdkdisplaymanager-wayland.c b/gdk/wayland/gdkdisplaymanager-wayland.c
-index eca6f92..d59563a 100644
---- a/gdk/wayland/gdkdisplaymanager-wayland.c
-+++ b/gdk/wayland/gdkdisplaymanager-wayland.c
-@@ -27,7 +27,7 @@
- 
- #include "gdkinternals.h"
- 
--#include <X11/extensions/XKBcommon.h>
-+#include <xkbcommon/xkbcommon.h>
- 
- typedef struct _GdkWaylandDisplayManager GdkWaylandDisplayManager;
- typedef struct _GdkWaylandDisplayManagerClass GdkWaylandDisplayManagerClass;
-diff --git a/gdk/wayland/gdkkeys-wayland.c b/gdk/wayland/gdkkeys-wayland.c
-index f3e9d3c..bc26a43 100644
---- a/gdk/wayland/gdkkeys-wayland.c
-+++ b/gdk/wayland/gdkkeys-wayland.c
-@@ -39,7 +39,7 @@
- #include "gdkdisplay-wayland.h"
- #include "gdkkeysprivate.h"
- 
--#include <X11/extensions/XKBcommon.h>
-+#include <xkbcommon/xkbcommon.h>
- 
- typedef struct _GdkWaylandKeymap          GdkWaylandKeymap;
- typedef struct _GdkWaylandKeymapClass     GdkWaylandKeymapClass;
diff --git a/x11-libs/gtk+/gtk+-3.5.6.ebuild b/x11-libs/gtk+/gtk+-3.5.8.ebuild
index 8cb50ea1..972753c2 100644
--- a/x11-libs/gtk+/gtk+-3.5.6.ebuild
+++ b/x11-libs/gtk+/gtk+-3.5.8.ebuild
@@ -46,7 +46,6 @@ COMMON_DEPEND="X? (
 		x11-libs/libXdamage
 		xinerama? ( x11-libs/libXinerama )
 	)
-	accessibility? ( >=app-accessibility/at-spi2-atk-2.5.3 )
 	wayland? (
 		dev-libs/wayland
 		media-libs/mesa[egl,wayland]
@@ -55,7 +54,8 @@ COMMON_DEPEND="X? (
 	)
 	>=dev-libs/glib-2.33.1
 	>=x11-libs/pango-1.30[introspection?]
-	>=dev-libs/atk-2.2[introspection?]
+	>=app-accessibility/at-spi2-atk-2.5.3
+	>=dev-libs/atk-2.5.3[introspection?]
 	>=x11-libs/cairo-1.10.0[aqua?,glib,svg,X?]
 	>=x11-libs/gdk-pixbuf-2.26:2[introspection?,X?]
 	>=x11-libs/gtk+-2.24:2
@@ -108,9 +108,6 @@ src_prepare() {
 	# https://bugzilla.gnome.org/show_bug.cgi?id=65410
 	epatch "${FILESDIR}/${PN}-3.3.18-fallback-theme.patch"
 
-	# Apparently needed for new libxkbcommon headers; bug #408131
-	epatch "${FILESDIR}/${PN}-3.3.20-wayland-xkbcommon-headers.patch"
-
 	# Work around https://bugzilla.gnome.org/show_bug.cgi?id=663991
 	if [[ ${CHOST} == *-solaris* ]]; then
 		sed -i -e '/_XOPEN_SOURCE/s/500/600/' gtk/gtksearchenginesimple.c || die
@@ -161,7 +158,6 @@ src_configure() {
 		$(use_enable X xkb)
 		$(use_enable X xrandr)
 		$(use_enable xinerama)
-		$(use_with accessibility atk-bridge)
 		--disable-papi
 		--enable-gtk2-dependency"
 
diff --git a/x11-libs/gtk+/gtk+-9999.ebuild b/x11-libs/gtk+/gtk+-9999.ebuild
index 8483377d..972753c2 100644
--- a/x11-libs/gtk+/gtk+-9999.ebuild
+++ b/x11-libs/gtk+/gtk+-9999.ebuild
@@ -46,7 +46,6 @@ COMMON_DEPEND="X? (
 		x11-libs/libXdamage
 		xinerama? ( x11-libs/libXinerama )
 	)
-	accessibility? ( app-accessibility/at-spi2-atk )
 	wayland? (
 		dev-libs/wayland
 		media-libs/mesa[egl,wayland]
@@ -55,7 +54,8 @@ COMMON_DEPEND="X? (
 	)
 	>=dev-libs/glib-2.33.1
 	>=x11-libs/pango-1.30[introspection?]
-	>=dev-libs/atk-2.2[introspection?]
+	>=app-accessibility/at-spi2-atk-2.5.3
+	>=dev-libs/atk-2.5.3[introspection?]
 	>=x11-libs/cairo-1.10.0[aqua?,glib,svg,X?]
 	>=x11-libs/gdk-pixbuf-2.26:2[introspection?,X?]
 	>=x11-libs/gtk+-2.24:2
@@ -108,9 +108,6 @@ src_prepare() {
 	# https://bugzilla.gnome.org/show_bug.cgi?id=65410
 	epatch "${FILESDIR}/${PN}-3.3.18-fallback-theme.patch"
 
-	# Apparently needed for new libxkbcommon headers; bug #408131
-	epatch "${FILESDIR}/${PN}-3.3.20-wayland-xkbcommon-headers.patch"
-
 	# Work around https://bugzilla.gnome.org/show_bug.cgi?id=663991
 	if [[ ${CHOST} == *-solaris* ]]; then
 		sed -i -e '/_XOPEN_SOURCE/s/500/600/' gtk/gtksearchenginesimple.c || die
@@ -161,7 +158,6 @@ src_configure() {
 		$(use_enable X xkb)
 		$(use_enable X xrandr)
 		$(use_enable xinerama)
-		$(use_with accessibility atk-bridge)
 		--disable-papi
 		--enable-gtk2-dependency"