gentoo resync : 10.02.2020

10 files changed, 17 insertions, 137 deletions

diff --git a/app-accessibility/Manifest.gz b/app-accessibility/Manifest.gz
index bd26419d5e10..ad62f13771d1 100644
--- a/app-accessibility/Manifest.gz
+++ b/app-accessibility/Manifest.gz
diff --git a/app-accessibility/at-spi2-atk/Manifest b/app-accessibility/at-spi2-atk/Manifest
index 3a2eff529dd9..c10d6c007052 100644
--- a/app-accessibility/at-spi2-atk/Manifest
+++ b/app-accessibility/at-spi2-atk/Manifest
@@ -1,7 +1,5 @@
-DIST at-spi2-atk-2.26.2.tar.xz 322800 BLAKE2B 108a01fd8c16816d9953ad42721080dd6dcb9f75c95c412387d7f54920998c66eb5855eb859e8e00096a47b387d05779691887a7717d31f4c70681d69a9c8266 SHA512 f938b8e2b999fcdfa13e9433bd13c39430bae2ceae0c664a24caccc6af522947bf73de02de3c359807f5370a85961193df2ba24b193b60b915c61828ea747bb2
 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
-EBUILD at-spi2-atk-2.26.2.ebuild 1051 BLAKE2B 0207ef85f7c98b623c607a4000acc1446a443e5f23ced1971e1944f809a9f26ed5cfcbbd8cc87a56383856c3d884ba361f7b4884e2b78137d12d85657550e651 SHA512 5305f0f3fda8ae0aab4089a8e5d67df9103b7d51d9a109b47714433930184777abe2130a3c4462c66b4353e3117bdbbb1986983a658e6598c76353a3a8df80e3
 EBUILD at-spi2-atk-2.32.0.ebuild 993 BLAKE2B 74d5ca20ab2be38b6fd287125699f209759c3c3be671e3b7e0e8ed80862c6cbd7e44d416dac6b59746e72e16c8fdbbda707b86bfac918daaaeafc31fa899f8aa SHA512 e051670bcebb3a64dddec3c8ed98c0a4ab56b231d077c75d658ab6d501e68154a593aa8865706c6b935a9e8bde4f209b3e0c6795e1efd11df12bd4e028ac9443
 EBUILD at-spi2-atk-2.34.0.ebuild 1004 BLAKE2B cbf4a24cadcb494e391d73952ec8b3f19cbc0d14dd285f2625629579e209798b60033d2adbaa368c65f6d1657e221d35010a47ff5a71dbe499c66ae3e34c6a99 SHA512 874549badfc3ae3cb0f78696b36c3c11ee47a52c31d73f0dd1c577b9560dd4bc0a8365fe34655aa2e1f1c02891335ea0027179174bdc6b9fba69cfed56ce6acd
 MISC metadata.xml 562 BLAKE2B 5f5b7b6f0ecfc0067041c3f9982d322485db7a3f992ba2ec20ace679a9771da3731fa68f09768423af5eb042b05b5d665de2f6eb8026f5890941004c2741ca23 SHA512 d9cd5d0c04bc5a3e4e815f0b7a8a5ce0ed0aac2d5b4cf5540669b7450b3ecff7a7346c1a80daf033330e7a5aebe13f85d1821c109cf0c861f85ca514e7e2678f
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
deleted file mode 100644
index aea755f5d6d2..000000000000
--- a/app-accessibility/at-spi2-atk/at-spi2-atk-2.26.2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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 s390 ~sh 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.25.2[${MULTILIB_USEDEP}]
-	>=app-accessibility/at-spi2-core-2.25.3[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-	test? ( >=dev-libs/libxml2-2.9.1 )
-"
-
-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-core/Manifest b/app-accessibility/at-spi2-core/Manifest
index dbc6baaca165..3bec385e4ac6 100644
--- a/app-accessibility/at-spi2-core/Manifest
+++ b/app-accessibility/at-spi2-core/Manifest
@@ -1,9 +1,6 @@
-AUX 2.26.2-fix-inverted-logic.patch 858 BLAKE2B 23461bae3252ce92c767f6d1f4375d5fa40f2b64a925d3be9f8593fa59524363ace55919c2aef8dc022aee6a6079b7afef7a438ab47b24f8a200387c873593f3 SHA512 a1fa03e003691ccc5c774dec73626efc09b0bd019a23596a7d8aa0c79982249490d7e39be1d1c312b324d49f7855e8920db66475e1886c28c82cc8e9a3cbe6bb
 AUX at-spi2-core-2.0.2-disable-teamspaces-test.patch 302 BLAKE2B 4165c68b7e8d9835273a55f6bd7a05435a4b3982399871563da7ed1b37444377718a4e31766529dfdd320bf9e2cfb89fc9aad98b7e757c633cfbc1dfaf61487e SHA512 866a2e372999491a74aa3bd230e666151b8fbf74554f70b7ff01891c62a6b2e87459107d885340076c049ebba656e399cb13ea6cb93af88552a328e17b4f8753
-DIST at-spi2-core-2.26.2.tar.xz 494484 BLAKE2B 0c67cea9c0107fb6503a933de134eb662f192ae2a98734bde1b0629da151476858720d2dcb1791a00a44b61ae2ead945178fba659f88303c552567d7f3f9817b SHA512 6a8e158e30c37ce475467b6634aff046a318875271966d7bfa3e56052d0cd26cd37435d0b9ae14f079542b8b3e76088da5bd50ed39eb39f3f40394c55ed3f255
 DIST at-spi2-core-2.32.1.tar.xz 188952 BLAKE2B a12e234b19a38b0fcffbabb8430ef49dc538b38831cc22bbafc7f5d499082007909a82e785184d052f3a62853474cbc4838125540026a6d0e2ac2181e98a6a4c SHA512 cec6ea1426b25d9738c5c401a1038b39e04b1e989b7ef8e02590d117b35cfb253b260cc6e41b09e10e007801fedcb7702c48ba7f3a0c7b6c1f16edd4e8ad0cca
 DIST at-spi2-core-2.34.0.tar.xz 186736 BLAKE2B 6210ef0254760f1ef6e9c9124680f604864e24228650d4be1026dc73ce0ec5d10eec5e9958a98f0970e1292e4fc3935c8379278b10c633c87da5eb3960b94670 SHA512 99f6773e29fb5fcb339cbe5b23133dab78bc52e3c46a1d5bd748788c48345223f1def5078ac48e58756a7692459b177b0e26dc8059898a5ccac56ceb495b7de8
-EBUILD at-spi2-core-2.26.2.ebuild 1585 BLAKE2B 6346920392dd2d53753dca4e05e03f5e2f3fd4bac64ad1491ec32f8cd8362c7e40be8020f6d5d85cd9dafb50cf12105b318de8511ef8af91ff30df353b3c9a33 SHA512 f98bd4471b1ebaa0e37b92b0d9e62b6c05bf8e1f5edd45de86b852809ea48de0fde4f8e02a0db94e41f5895e7034cb2a2e3a432c49de40276005561edc5fa031
 EBUILD at-spi2-core-2.32.1.ebuild 1486 BLAKE2B 7d5f24a05cce4206650de3a40685fe23632eed18e262b042c7517ee1f3faa8581b76c28ea7a61bff1310b4fdae741b078e95ee3eda453840a47e216913dafee5 SHA512 07cdfe8ee52d2c1883a35a8ade5f9cf677525684d623c9f6cf8396b71efc16610111e49fa946caab0b7cee66205240b80887618f73284bc02a713194ab4398e5
 EBUILD at-spi2-core-2.34.0.ebuild 1522 BLAKE2B 984d61b0604193e018161d33f41130965d4740f83285a19ff054461ee2b8bec6952daf9d183fd6ff1327eaf0b59dd6fe3798a6e299a0e31054c20c1639cbccac SHA512 71c45e02d51f45c33ba2ef7f32465985affcf31d10a9dd7240595b308aeef59018319a723582431c96d37373c83b354719b3ac405edf2ac4cb6264f95f0343fc
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-accessibility/at-spi2-core/at-spi2-core-2.26.2.ebuild b/app-accessibility/at-spi2-core/at-spi2-core-2.26.2.ebuild
deleted file mode 100644
index 223688c4c8f3..000000000000
--- a/app-accessibility/at-spi2-core/at-spi2-core-2.26.2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2 multilib-minimal
-
-DESCRIPTION="D-Bus accessibility specifications and registration daemon"
-HOMEPAGE="https://wiki.gnome.org/Accessibility"
-
-LICENSE="LGPL-2+"
-SLOT="2"
-IUSE="X +introspection"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-
-# x11-libs/libSM is needed until upstream #719808 is solved either
-# making the dep unneeded or fixing their configure
-# Only libX11 is optional right now
-RDEPEND="
-	>=dev-libs/glib-2.36:2[${MULTILIB_USEDEP}]
-	>=sys-apps/dbus-1[${MULTILIB_USEDEP}]
-	introspection? ( >=dev-libs/gobject-introspection-1.32.0:= )
-	X? (
-		x11-libs/libX11[${MULTILIB_USEDEP}]
-		x11-libs/libXtst[${MULTILIB_USEDEP}]
-		x11-libs/libXi[${MULTILIB_USEDEP}]
-	)
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.25
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-"
-
-PATCHES=(
-	# disable teamspaces test since that requires Novell.ICEDesktop.Daemon
-	"${FILESDIR}/${PN}-2.0.2-disable-teamspaces-test.patch"
-	"${FILESDIR}/${PV}-fix-inverted-logic.patch"
-)
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} \
-	gnome2_src_configure \
-		$(multilib_native_use_enable introspection) \
-		$(use_enable X x11)
-
-	# work-around gtk-doc out-of-source brokedness
-	if multilib_is_native_abi; then
-		ln -s "${S}"/doc/libatspi/html doc/libatspi/html || die
-	fi
-}
-
-multilib_src_compile() { gnome2_src_compile; }
-multilib_src_install() { gnome2_src_install; }
diff --git a/app-accessibility/at-spi2-core/files/2.26.2-fix-inverted-logic.patch b/app-accessibility/at-spi2-core/files/2.26.2-fix-inverted-logic.patch
deleted file mode 100644
index 7aa10f8bfc2b..000000000000
--- a/app-accessibility/at-spi2-core/files/2.26.2-fix-inverted-logic.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From c2e87fe00b596dba20c9d57d406ab8faa744b15a Mon Sep 17 00:00:00 2001
-From: Maya Rashish <maya@NetBSD.org>
-Date: Sat, 2 Dec 2017 13:24:29 +0200
-Subject: [PATCH] Fix inverted logic.
-
-Don't write more into a buffer than it can hold.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=791124
----
- bus/at-spi-bus-launcher.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/bus/at-spi-bus-launcher.c b/bus/at-spi-bus-launcher.c
-index 261353f..eb2b8e3 100644
---- a/bus/at-spi-bus-launcher.c
-+++ b/bus/at-spi-bus-launcher.c
-@@ -244,7 +244,7 @@ unix_read_all_fd_to_string (int      fd,
- {
-   ssize_t bytes_read;
- 
--  while (max_bytes > 1 && (bytes_read = read (fd, buf, MAX (4096, max_bytes - 1))))
-+  while (max_bytes > 1 && (bytes_read = read (fd, buf, MIN (4096, max_bytes - 1))))
-     {
-       if (bytes_read < 0)
-         return FALSE;
--- 
-2.18.0
-
diff --git a/app-accessibility/caribou/Manifest b/app-accessibility/caribou/Manifest
index 6815e340fd32..21349b650891 100644
--- a/app-accessibility/caribou/Manifest
+++ b/app-accessibility/caribou/Manifest
@@ -1,3 +1,3 @@
 DIST caribou-0.4.21.tar.xz 426516 BLAKE2B bd5e27bbbdb08fc31edce3b65124177e30b6d51e0071601bcd84c325b5794ce936b3f782ac8639dca332c246e329773f462dcecc0f236f52aeb0dcc7c5607a24 SHA512 5fc0cf54a1cad50d41e659adbbb932b51d69d18951562f87497e99aaae17ac72b453b759dd7289ff8f68a79574dfce510b9de6bedc61408c14cb48b83eaf08da
-EBUILD caribou-0.4.21.ebuild 2396 BLAKE2B ad06b26860162c036219c1e66e818f06f605942ecc6c41269a3f970e559f0cbd5b7fc9e34e6fb9bd0382d99f654cf6d9d230caed4fad93d93cb7dc2e2c5f0070 SHA512 9f1500be9b4388f7692852d7dab12141ec115630248bc297b0e51dab14a19db3e01d122a1d2cd40bccef9f2ddcc654bdb3c160661dd37281718396cb67492079
+EBUILD caribou-0.4.21.ebuild 2390 BLAKE2B 8c45fca89ee00bd730bf14d06d3360e3cfeef63ba639ef559f741e7b0c981b16348e1c44832f83a525ddbbc5c00bb849a8828015a96f84e9ec6b749a950d9b50 SHA512 5a3a0d68a3323b2e96395f5a20b697e52eaf312469a30d66ff7e06e8226a314a68db344b387782e17d0dc2790d12ec3d889290620937996e3a5dd1103e9fa3ac
 MISC metadata.xml 682 BLAKE2B 4ff796697db62d8c6a21ff62794c5fef391691685cece76ee7b8c38178f775a145b9a457df9bf959ab6af03559ceb4d9ad97a2ab835d63b70e58b4894f71fa5d SHA512 bec00e1cbb64bfec610e3f4e724e8afb8539a4b676b1e443a17b7eaf2263bef1fbf5787d77de253d84ebb0a54b3ca4bd386ba421826c0bb903164bb7ecf5223d
diff --git a/app-accessibility/caribou/caribou-0.4.21.ebuild b/app-accessibility/caribou/caribou-0.4.21.ebuild
index 3daa5a67f33c..f0844ec4d4ac 100644
--- a/app-accessibility/caribou/caribou-0.4.21.ebuild
+++ b/app-accessibility/caribou/caribou-0.4.21.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 PYTHON_REQ_USE="xml"
 
 inherit gnome2 python-r1
diff --git a/app-accessibility/orca/Manifest b/app-accessibility/orca/Manifest
index 21a7ce445914..8d7a17319e8d 100644
--- a/app-accessibility/orca/Manifest
+++ b/app-accessibility/orca/Manifest
@@ -1,3 +1,3 @@
 DIST orca-3.32.0.tar.xz 2512032 BLAKE2B eae6c726e5e7361b7d60f0907f8c62c476895d681cf424940586e6308bcde147094a9557243aae6ecffef142bd556cb3cb30839955403e0958f123672400bf0a SHA512 015aa26ddaffa53d646e5d708ffed9e771beebbe925c27b963cbd3c3a2b36f730c0668cac6b89a371cd81cf8a570eb591711ba923fa4d013e00e31667749cf20
-EBUILD orca-3.32.0.ebuild 1442 BLAKE2B 7403b193c3f47e664f10377ed19c615bfcc0816b758ad150d614e6f55eb2eb75cb7fcd4f4bb8d292265694636cc9b519bb572c5ee7d606f63627e3716fec88ad SHA512 6748e4b4e4ce66bfc734fa12b22dbc3facb0bd39e07a54e19507e094f64b4a5de300fcd2b4113fafb2f72c204553b077101e935c079d916efe4502fd70de9276
+EBUILD orca-3.32.0-r1.ebuild 1581 BLAKE2B bd8534d0c6911aea40b693d08fc631dc98b555e133c032f994ba58b42e54300ded38f6f2eda728737af7c112447304f91be7bdc11a9acb1db3a0197b2a7a1adf SHA512 40c66ce3bf75bd9172a8462c759f820331f8cc94a092e06da2daa788328c4089bf6180ccd4310d1410ec43762fe7744d8c62b03d155d864001ea9702bc815033
 MISC metadata.xml 640 BLAKE2B 490290dba5378d6599afa55e56780f99333b32ce71d0ca17f241c9e87c9d7ae19f3e0656c059bb841dd707df66b330da7ff860f3c0b1eb221de552227ba4ca06 SHA512 6fd5af9a57c21a72a37740f458947dce9a54e378ce5b602c9443d954ed536792cfa74299a69d02a2b0d81905a892d5b2d43f93678367ce7e039aa350c882cbb8
diff --git a/app-accessibility/orca/orca-3.32.0.ebuild b/app-accessibility/orca/orca-3.32.0-r1.ebuild
index f5dff9cf8b0d..052a2b319bd4 100644
--- a/app-accessibility/orca/orca-3.32.0.ebuild
+++ b/app-accessibility/orca/orca-3.32.0-r1.ebuild
@@ -23,19 +23,26 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	>=app-accessibility/at-spi2-core-2.32:2[introspection]
 	>=dev-libs/atk-2.32
 	>=dev-libs/glib-2.28:2
-	dev-python/gst-python:1.0[${PYTHON_USEDEP}]
-	>=dev-python/pygobject-3.18:3[${PYTHON_USEDEP}]
 	media-libs/gstreamer:1.0[introspection]
 	>=x11-libs/gtk+-3.6.2:3[introspection]
+	$(python_gen_cond_dep '
+		dev-python/gst-python:1.0[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pygobject-3.18:3[${PYTHON_MULTI_USEDEP}]
+	')
 	braille? (
-		>=app-accessibility/brltty-5.0-r3[python,${PYTHON_USEDEP}]
-		dev-libs/liblouis[python,${PYTHON_USEDEP}] )
+		$(python_gen_cond_dep '
+			>=app-accessibility/brltty-5.0-r3[python,${PYTHON_MULTI_USEDEP}]
+			dev-libs/liblouis[python,${PYTHON_MULTI_USEDEP}]
+		')
+	)
 "
 RDEPEND="${COMMON_DEPEND}
-	>=app-accessibility/speech-dispatcher-0.8[python,${PYTHON_USEDEP}]
 	dev-libs/atk[introspection]
-	>=dev-python/pyatspi-2.32[${PYTHON_USEDEP}]
-	dev-python/setproctitle[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=app-accessibility/speech-dispatcher-0.8[python,${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pyatspi-2.32[${PYTHON_MULTI_USEDEP}]
+		dev-python/setproctitle[${PYTHON_MULTI_USEDEP}]
+	')
 	x11-libs/libwnck:3[introspection]
 	x11-libs/pango[introspection]
 "