--- a/gtk+-3.24.22.ebuild	2020-08-27 22:53:22.099772352 -0400
+++ a/gtk+-3.24.22.ebuild	2020-08-27 23:39:53.281599638 -0400
@@ -12,7 +12,7 @@ 
 
 LICENSE="LGPL-2+"
 SLOT="3"
-IUSE="aqua broadway cloudprint colord cups examples gtk-doc +introspection test vim-syntax wayland +X xinerama"
+IUSE="aqua atk-bridge broadway cloudprint colord cups examples gtk-doc +introspection test vim-syntax wayland +X xinerama"
 REQUIRED_USE="
 	|| ( aqua wayland X )
 	xinerama? ( X )
@@ -51,7 +51,7 @@ 
 		>=x11-libs/libxkbcommon-0.2[${MULTILIB_USEDEP}]
 	)
 	X? (
-		>=app-accessibility/at-spi2-atk-2.5.3[${MULTILIB_USEDEP}]
+		atk-bridge? ( >=app-accessibility/at-spi2-atk-2.5.3[${MULTILIB_USEDEP}] )
 		media-libs/mesa[X(+),${MULTILIB_USEDEP}]
 		x11-libs/libX11[${MULTILIB_USEDEP}]
 		>=x11-libs/libXi-1.3[${MULTILIB_USEDEP}]
@@ -130,6 +130,11 @@ 
 	# Fix broken autotools logic
 	eapply "${FILESDIR}"/${PN}-3.22.20-libcloudproviders-automagic.patch
 
+	# get rid of gtk3-atk-bridge if not wanted
+	if ! use atk-bridge; then
+		eapply "${FILESDIR}"/${PN}-3.22.30.atk-bridge.patch
+	fi
+
 	gnome2_src_prepare
 }
 
@@ -150,6 +155,7 @@ 
 		$(use_enable X xkb)
 		$(use_enable X xrandr)
 		$(use_enable xinerama)
+		$(use_with atk-bridge)
 		# cloudprovider is not packaged in Gentoo yet
 		--disable-cloudproviders
 		--disable-papi