Merge branch 'edge' into next

2 files changed, 0 insertions, 45 deletions

diff --git a/app-accessibility/at-spi2-atk/Manifest b/app-accessibility/at-spi2-atk/Manifest
index e9ec6f7abff5..ba75bd71c592 100644
--- a/app-accessibility/at-spi2-atk/Manifest
+++ b/app-accessibility/at-spi2-atk/Manifest
@@ -1,7 +1,5 @@
 DIST at-spi2-atk-2.32.0.tar.xz 94952 BLAKE2B 972bb32590a51549eb8b0b3c46a068e95cc43783f0f0e31ca3663ff1669196a88def63342c01d056d45d6f4fb4bcc2127b50a49be37fd45d33aa1daeadca5172 SHA512 095ceaa33d5b35f1f4f81a31bea00487c054493cb29d4fdbcf74331ec8d1b9570dc7cb93e1cc06da9ea3f5805e7a3a9e7bf80cfdbce86a1822c2a46327109393
-DIST at-spi2-atk-2.34.0.tar.xz 96116 BLAKE2B 242b29b988d97b06ca85495be77f9c4cf1c621d9ff977cd73ea37f97b42fc636474df34429e7397fb3f91d3d11b14ce1b3de5d68c0b30f85877f444c78389564 SHA512 515ad4d0a000fa47a7848f3ea9f95f8e0c582f9d9876725deb8e521c60e290f73655445456e6c238f382cb8773b56db2795c221029ec931bad68395326b6bb04
 DIST at-spi2-atk-2.34.2.tar.xz 96608 BLAKE2B 4a3ef71580f4eaf3ea0846c8a6909b686f7ae0c7202918f3e11de019fa7290dada5a2eb3f495ce476bb56a28787967fa87fe74d422d4144e7555541ef99911da SHA512 59e7ad5c944748ca00af8b0a9df03c9ffbc6afae6e65c25a2566a9e2a30e66724c4492076be1730c2894c636f82c795c533669572584d8d5675f68b349ad16c4
 EBUILD at-spi2-atk-2.32.0.ebuild 990 BLAKE2B bb6cfc5c0d313cf14d34c347d30631be9b7e29a580c91418dd9f4f07f32926f9b1bfafc142b9916cbc8e5c5d28c0f20815d1657dedc21750e0306729ea22ac4d SHA512 604f26faf87462148d4126c758ef3d2f2aeee503636cb2825fa7dc4a995772e5ae369157001958222b0d80e6e5df62a49b42abb62fc5fa13124f64085166fab5
-EBUILD at-spi2-atk-2.34.0.ebuild 1000 BLAKE2B 01778f220e8f9d2fee40e9ac7eb1f1f5a2afa468f87f023287989e1ac9c1927d8693e9b5419ffc3f9b25c6105af3151c211767fc4cb535ba9bafdc1ccd7e1c76 SHA512 73ca486ca0dc4b34ee3267427a29411b8bf755f40e6f6b6b696e55b2ead8310d0c8fd59c6f648744c314b16caf3bf8e89d270ead07d0f56d2bd8b6f6c91b7477
 EBUILD at-spi2-atk-2.34.2.ebuild 995 BLAKE2B cec7aba59dbc72a24be5e5fb01369e785182bcb1049af54b25e43e193d29842c54f19aab4073b1e8f521e053993cafdf785a6277f768b68ab0cfd235c666074d SHA512 f5b295da7f4559dbefbf541b7bf3faa98605e80add22b67214a98ba51425a3ac4c56f2b9c00b29eb48649299d43b0b2bd537682b7d01636f438d8ea8ef011d34
 MISC metadata.xml 562 BLAKE2B 5f5b7b6f0ecfc0067041c3f9982d322485db7a3f992ba2ec20ace679a9771da3731fa68f09768423af5eb042b05b5d665de2f6eb8026f5890941004c2741ca23 SHA512 d9cd5d0c04bc5a3e4e815f0b7a8a5ce0ed0aac2d5b4cf5540669b7450b3ecff7a7346c1a80daf033330e7a5aebe13f85d1821c109cf0c861f85ca514e7e2678f
diff --git a/app-accessibility/at-spi2-atk/at-spi2-atk-2.34.0.ebuild b/app-accessibility/at-spi2-atk/at-spi2-atk-2.34.0.ebuild
deleted file mode 100644
index c6a01cab85b6..000000000000
--- a/app-accessibility/at-spi2-atk/at-spi2-atk-2.34.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome.org meson multilib-minimal virtualx xdg
-
-DESCRIPTION="Gtk module for bridging AT-SPI to Atk"
-HOMEPAGE="https://wiki.gnome.org/Accessibility"
-
-LICENSE="LGPL-2.1+"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=sys-apps/dbus-1.5[${MULTILIB_USEDEP}]
-	>=dev-libs/glib-2.32:2[${MULTILIB_USEDEP}]
-	>=dev-libs/atk-2.33.3[${MULTILIB_USEDEP}]
-	>=app-accessibility/at-spi2-core-2.33.2[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-	test? ( >=dev-libs/libxml2-2.9.1 )
-"
-
-multilib_src_configure() {
-	meson_src_configure
-}
-
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_test() {
-	virtx dbus-run-session meson test -C "${BUILD_DIR}"
-}
-
-multilib_src_install() {
-	meson_src_install
-}