gentoo resync : 31.12.2018

3 files changed, 2 insertions, 52 deletions

diff --git a/app-accessibility/at-spi2-atk/Manifest b/app-accessibility/at-spi2-atk/Manifest
index 86398cdfaab8..8a2b8777ad33 100644
--- a/app-accessibility/at-spi2-atk/Manifest
+++ b/app-accessibility/at-spi2-atk/Manifest
@@ -7,10 +7,8 @@ AUX at-spi2-atk-2.20.0-tests-data/test-selection.xml 770 BLAKE2B 6ef23ab1eee641b
 AUX at-spi2-atk-2.20.0-tests-data/test-table.xml 3651 BLAKE2B 9172ab97658e676e6c5da9294bf4efdcecf3993696f8175eee05aef757bfe77ff13572e4d35b05eee29dd85626a83753a127a15a794c827f2a791772de42b068 SHA512 6c9a17ca1c548a9f3981101c2dcee35447d20e19dd117d7b7e5e3d557807adecbc8a589b317ef693366fcd4bdcc8988ba6ebcb7b3b3fa78a447a692ae43a5fb2
 AUX at-spi2-atk-2.20.0-tests-data/test-text.xml 561 BLAKE2B cbfe3f97aafc4f2408fac8877fd7cdc60bf4c0235c1ae3ad3b22422d281cec98d31ec7763f6a8c82a105a72df9e2b7e89cebba978f072847615851f48781b598 SHA512 ccb09491bb24d744633d88b555af94fa86739d1b226e9ad7fc15cb7ac3dec67a8cbe1a3c8b8d7272a681a978b1a72842bb88b2dd20567c3aa69b3d5797f6499a
 AUX at-spi2-atk-2.20.0-tests-data/test-value.xml 289 BLAKE2B 0d8a8421e4443aab9a97bd2a66878dd8584006785c5c3910ac283bf64f76ab3fe69f4aa5dbad6a1f53d37a8a40984b24f73291cae8975f386c97a4ac298bbc8d SHA512 d099f5ac14396a6d6093efe1dd44f8455a1a737a41f208f728480de662d280d4fb17f846cf9c86966230315a344023fbb2c36c3511699d45f22208a16551bc33
-DIST at-spi2-atk-2.22.0.tar.xz 306148 BLAKE2B 3606f96ca89dcc23700c2aaa67da9daf51709113b5d5a15d4864e565dd559e4136007f125801de08e9c6bc6c14d7b1c39e8307340c1758a6145aeb0caeb0a5c9 SHA512 9b815eecbe01164df8a3341a3b0e1fe57a4f333964a0836f89f54712512a32d69c333c0c099eb194716d081f5460bb6e6d2c852f7218df51549e88e75880f284
 DIST at-spi2-atk-2.24.1.tar.xz 308576 BLAKE2B 92b96c54cd5a2dbd8a3dddbaa3188b3396ef8e4631cc9438e4ba57da27672d509babae3415c66d2c6afc74855ff0536d4cc6f24a8cecf66478021d350b3572a1 SHA512 5dbc186c7ea4f7f34aa0acaf90f683e549162caa274ba5b5818ae9992b52f1b475923d9818870978e87e3dacdf1018db31810d2d53b39bb4f068bcb64a423f23
 DIST at-spi2-atk-2.26.2.tar.xz 322800 BLAKE2B 108a01fd8c16816d9953ad42721080dd6dcb9f75c95c412387d7f54920998c66eb5855eb859e8e00096a47b387d05779691887a7717d31f4c70681d69a9c8266 SHA512 f938b8e2b999fcdfa13e9433bd13c39430bae2ceae0c664a24caccc6af522947bf73de02de3c359807f5370a85961193df2ba24b193b60b915c61828ea747bb2
-EBUILD at-spi2-atk-2.22.0.ebuild 1294 BLAKE2B d4a3f6a58383e4baba77f5d1bd10dfd77cd49035f8651334a37e6028df9288e3808e823768fad70fc53fed649ecae2b4fd19baab06485c8aefd97533ede63a01 SHA512 44f5c0bc33a78dee67312e774b79c65e4b403a52a86822a6a2b9bceaaeba43d67aa2fd44723d5f8ea0208c0436a4b16a2aa481d31cafe91ba1341b0c3a21571c
 EBUILD at-spi2-atk-2.24.1.ebuild 1295 BLAKE2B 71f951fbfea338bc0b02a47e421f0be5c3b4f6596554c90f009a8e4798c626ce54e00be1574e94fa2fd12f825978a4a3ff88e49df80e4afe548014a556f003aa SHA512 bfccd577a9cd84257478d0ac1dfa9df89094f38dc36bbe45657ba8603a398a07097e316f386bf337e6fb1d545489f58d26303af73eaacaa23b1c42ae00919d08
-EBUILD at-spi2-atk-2.26.2.ebuild 1044 BLAKE2B 76617ee47b9db9e7edf5923e9d8c9a1698c9303dd583a2bf13fc6e91b7fa01ab79e8660436dfac29191f5dccb9d1cf4da66bcb3a082be80699e877907806ad5a SHA512 4d44190ffe9abee6a4bda335a332f061a9276859950ab274858efd2ae68596ebfeb44f09e8cfc41d93aa55cc5a44fc415ca5b778eb0318ba18fdd220e1bfb5de
+EBUILD at-spi2-atk-2.26.2.ebuild 1042 BLAKE2B 53236f7cce0ec847c182826a3266e2eb90533da51f7056199c282ff4f3d6e3f2e045102c2b35a2553a4bb54394711b9a9f71bfb87284f3b9404282d51c2a3976 SHA512 1c9ba2768d7143c556574e52091213c082eaf8963f638e318729fd50d0c8fc8e832e5e06985bff4796a6314f0e6c54f940aac87777978a4fcb30c99f17f70434
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-accessibility/at-spi2-atk/at-spi2-atk-2.22.0.ebuild b/app-accessibility/at-spi2-atk/at-spi2-atk-2.22.0.ebuild
deleted file mode 100644
index d5e666995bf6..000000000000
--- a/app-accessibility/at-spi2-atk/at-spi2-atk-2.22.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2 multilib-minimal virtualx
-
-DESCRIPTION="Gtk module for bridging AT-SPI to Atk"
-HOMEPAGE="https://wiki.gnome.org/Accessibility"
-
-LICENSE="LGPL-2+"
-SLOT="2"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="test"
-
-COMMON_DEPEND="
-	>=app-accessibility/at-spi2-core-2.17.90[${MULTILIB_USEDEP}]
-	>=dev-libs/atk-2.15.4[${MULTILIB_USEDEP}]
-	>=dev-libs/glib-2.32:2[${MULTILIB_USEDEP}]
-	>=sys-apps/dbus-1.5[${MULTILIB_USEDEP}]
-"
-RDEPEND="${COMMON_DEPEND}
-	!<gnome-extra/at-spi-1.32.0-r1
-"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-	test? ( >=dev-libs/libxml2-2.9.1 )
-"
-
-src_prepare() {
-	# Upstream forgot to put this in tarball, upstream #770615
-	cp -n "${FILESDIR}"/${PN}-2.20.0-tests-data/*.xml "${S}"/tests/data/ || die
-
-	gnome2_src_prepare
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} \
-	gnome2_src_configure --enable-p2p $(use_with test tests)
-}
-
-multilib_src_test() {
-	virtx emake check TESTS_ENVIRONMENT="dbus-run-session"
-}
-
-multilib_src_compile() { gnome2_src_compile; }
-multilib_src_install() { gnome2_src_install; }
diff --git a/app-accessibility/at-spi2-atk/at-spi2-atk-2.26.2.ebuild b/app-accessibility/at-spi2-atk/at-spi2-atk-2.26.2.ebuild
index 01b046169abf..8542983613c3 100644
--- a/app-accessibility/at-spi2-atk/at-spi2-atk-2.26.2.ebuild
+++ b/app-accessibility/at-spi2-atk/at-spi2-atk-2.26.2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Accessibility"
 
 LICENSE="LGPL-2+"
 SLOT="2"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="test"
 
 RDEPEND="