summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Väth <martin@mvath.de>2016-12-02 16:27:27 +0100
committerMartin Väth <martin@mvath.de>2016-12-02 16:27:27 +0100
commit1f8f1079e9ddb87da57fba1023a4873ae168d3dd (patch)
tree1e12a0953057df135b1f7a6b0f37c84d78685eec /x11-libs
parentRemove data which remains in gentoo repository (diff)
downloadmv-1f8f1079e9ddb87da57fba1023a4873ae168d3dd.tar.gz
mv-1f8f1079e9ddb87da57fba1023a4873ae168d3dd.tar.bz2
mv-1f8f1079e9ddb87da57fba1023a4873ae168d3dd.zip
x11-libs/gtk+: Version bump. Rename USE at-spi2-atk to atk-bridge
Diffstat (limited to 'x11-libs')
-rw-r--r--x11-libs/gtk+/Manifest2
-rw-r--r--x11-libs/gtk+/gtk+-3.22.4.ebuild (renamed from x11-libs/gtk+/gtk+-3.22.3.ebuild)10
-rw-r--r--x11-libs/gtk+/metadata.xml2
3 files changed, 8 insertions, 6 deletions
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index 31bd1526..3a3beb5d 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -1 +1 @@
-DIST gtk+-3.22.3.tar.xz 18236932 SHA256 e190ab1a9a893861b8e8be341aa57bce8b7146d6445ebfe5a8ab64236fe82ed3
+DIST gtk+-3.22.4.tar.xz 18243596 SHA256 7094a6fcfe133d01c578358bd5d3e499715f1a0206e87bd5cf6c834e301f387f
diff --git a/x11-libs/gtk+/gtk+-3.22.3.ebuild b/x11-libs/gtk+/gtk+-3.22.4.ebuild
index cf9eb822..215e428b 100644
--- a/x11-libs/gtk+/gtk+-3.22.3.ebuild
+++ b/x11-libs/gtk+/gtk+-3.22.4.ebuild
@@ -1,3 +1,5 @@
+# Copyright 2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
EAPI=6
GNOME2_LA_PUNT="yes"
@@ -9,7 +11,7 @@ HOMEPAGE="http://www.gtk.org/"
LICENSE="LGPL-2+"
SLOT="3"
-IUSE="adwaita-icon-theme aqua at-spi2-atk broadway cloudprint colord cups debug examples +introspection test vim-syntax wayland X xinerama"
+IUSE="adwaita-icon-theme aqua atk-bridge broadway cloudprint colord cups debug examples +introspection test vim-syntax wayland X xinerama"
REQUIRED_USE="
|| ( aqua wayland X )
xinerama? ( X )
@@ -47,7 +49,7 @@ COMMON_DEPEND="
>=x11-libs/libxkbcommon-0.2[${MULTILIB_USEDEP}]
)
X? (
- at-spi2-atk? ( >=app-accessibility/at-spi2-atk-2.5.3[${MULTILIB_USEDEP}] )
+ atk-bridge? ( >=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}]
@@ -134,7 +136,7 @@ src_prepare() {
# gtk-update-icon-cache is installed by dev-util/gtk-update-icon-cache
eapply "${FILESDIR}"/${PN}-3.22.2-update-icon-cache.patch
- # Use patches from BSD to make gtk3-atk-bridge (at-spi2-atk) a true option-
+ # Use patches from BSD to make gtk3-atk-bridge a true option -
# This was intentionally removed by upstream, see
# https://mail.gnome.org/archives/commits-list/2012-June/msg03813.html
eapply "${FILESDIR}"/${PN}-atk-bridge-config.ac.patch
@@ -164,7 +166,7 @@ multilib_src_configure() {
$(use_enable X xkb) \
$(use_enable X xrandr) \
$(use_enable xinerama) \
- $(use_with at-spi2-atk atk-bridge) \
+ $(use_with atk-bridge) \
$(usex debug --enable-debug --enable-debug=minimum) \
--disable-papi \
--disable-mir-backend \
diff --git a/x11-libs/gtk+/metadata.xml b/x11-libs/gtk+/metadata.xml
index 2d1d6f8b..fff54273 100644
--- a/x11-libs/gtk+/metadata.xml
+++ b/x11-libs/gtk+/metadata.xml
@@ -18,7 +18,7 @@
</longdescription>
<use>
<flag name="adwaita-icon-theme">Force the adwaita-icon-theme</flag>
- <flag name="at-spi2-atk">Enable the gtk3-atk-bridge, hard depending on app-accessibility/at-spi2-atk and thus on sys-apps/dbus</flag>
+ <flag name="atk-bridge">Enable the gtk3-atk-bridge, hard depending on app-accessibility/at-spi2-atk and thus on sys-apps/dbus</flag>
<flag name="broadway">Enable the GDK Broadway backend.</flag>
<flag name="cloudprint">Enable printing via Google Cloud Print.</flag>
<flag name="colord">Use <pkg>x11-misc/colord</pkg> for color management in printing</flag>