gentoo resync : 27.01.2018

3 files changed, 2 insertions, 76 deletions

diff --git a/app-accessibility/orca/Manifest b/app-accessibility/orca/Manifest
index d602256f5e03..5353f3f146a9 100644
--- a/app-accessibility/orca/Manifest
+++ b/app-accessibility/orca/Manifest
@@ -1,5 +1,3 @@
-DIST orca-3.22.2.tar.xz 2345292 BLAKE2B 86a0d0ab6d7ea7e0d25100e9a3eb525ca8981270648849594ce53257b098dcfec49eaccc4922fcc701418e57a91603796a20f1727b0020b359500662bdadc860 SHA512 0c4f3055509fd983da1081c4e33a4675ca498e75a8f2701318c000810cf691758eaded01969a6b56a2c25cf507bc4cb7e099f8498d1a0f6fa739d074a23528c5
 DIST orca-3.24.0.tar.xz 2391740 BLAKE2B 1f294bc8e1c593690c511f0d7d660230c420b33de59c8b1e78ee8d7b16f973b9fff9ce4d656de7202ffd5789ae3604d030c442e8c35eecfd5c5dca058031e996 SHA512 9aa65b534f69bb4a1b800e715776416843ac3756ec1267feca3c66476e34e54f6744f70c0f8ac8868a009d38b6cc165267268491a9ad29ebbd3601dba09d424c
-EBUILD orca-3.22.2.ebuild 1876 BLAKE2B ff412f58015b0e8fb63e529ae0b719cb3b33d74c95f40cf8fd4c478984d39d95a27b413531c8f7bf9090e5563752543df1e1511ca2ed7393b0d5c20d9bb8a66a SHA512 5d2b5d9997fc9693636eac17f1c447a22f09522932b38e47df89914465a908d68a1795fe4fdd887665f14084e60773c4a1996233ae3823bc31c25c17a2d23061
-EBUILD orca-3.24.0.ebuild 1879 BLAKE2B d4a95e255e6de4b00afeed3f470db2298238f7bd3baa7507af1788f1ff56f951a686ab871b7054f6247f2b9094cf7b198c396895c1c7c435951971f2268c9f5a SHA512 c770c0e71d49de68ea259bf16dbe237a8ccd5450afba9d5dc644f27aa285c4dae208a6d2de4011e0aa3badb4f04e2bc5140f7449a6d432ba874c33b299aa0508
+EBUILD orca-3.24.0.ebuild 1878 BLAKE2B f3831feb7b8d95a3c4291b0a97048f58baea95ffb94793de3c25b8ff5ae4944c5a42297efb3b6802cda6e8ccdd29f15855a8520b8b3a847cf95f34d835a9470c SHA512 6437a256bf980f50cc766029959400c829b6a48f8c10b89a377b42e98cac3cade2022d7dba836512dc7af00a702d0b69b92eae21adbec53a03c05f0744adb01f
 MISC metadata.xml 640 BLAKE2B 490290dba5378d6599afa55e56780f99333b32ce71d0ca17f241c9e87c9d7ae19f3e0656c059bb841dd707df66b330da7ff860f3c0b1eb221de552227ba4ca06 SHA512 6fd5af9a57c21a72a37740f458947dce9a54e378ce5b602c9443d954ed536792cfa74299a69d02a2b0d81905a892d5b2d43f93678367ce7e039aa350c882cbb8
diff --git a/app-accessibility/orca/orca-3.22.2.ebuild b/app-accessibility/orca/orca-3.22.2.ebuild
deleted file mode 100644
index 5fef8aef7e15..000000000000
--- a/app-accessibility/orca/orca-3.22.2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python3_{4,5} )
-PYTHON_REQ_USE="threads"
-
-inherit gnome2 python-r1
-
-DESCRIPTION="Extensible screen reader that provides access to the desktop"
-HOMEPAGE="https://wiki.gnome.org/Projects/Orca"
-
-LICENSE="LGPL-2.1+ CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
-
-IUSE="+braille"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	>=app-accessibility/at-spi2-atk-2.12:2
-	>=app-accessibility/at-spi2-core-2.12:2[introspection]
-	>=dev-libs/atk-2.10
-	>=dev-libs/glib-2.28:2
-	dev-python/gst-python:1.0[${PYTHON_USEDEP}]
-	>=dev-python/pygobject-3.10:3[${PYTHON_USEDEP}]
-	media-libs/gstreamer:1.0[introspection]
-	>=x11-libs/gtk+-3.6.2:3[introspection]
-	braille? (
-		>=app-accessibility/brltty-5.0-r3[python,${PYTHON_USEDEP}]
-		dev-libs/liblouis[python,${PYTHON_USEDEP}] )
-"
-RDEPEND="${COMMON_DEPEND}
-	>=app-accessibility/speech-dispatcher-0.8[python,${PYTHON_USEDEP}]
-	dev-libs/atk[introspection]
-	dev-python/pyatspi[${PYTHON_USEDEP}]
-	dev-python/setproctitle[${PYTHON_USEDEP}]
-	x11-libs/libwnck:3[introspection]
-	x11-libs/pango[introspection]
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.50
-	dev-util/itstool
-	virtual/pkgconfig
-"
-#	app-text/yelp-tools
-
-src_prepare() {
-	gnome2_src_prepare
-	python_copy_sources
-}
-
-src_configure() {
-	python_foreach_impl run_in_build_dir gnome2_src_configure \
-		$(use_with braille liblouis)
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir gnome2_src_compile
-}
-
-src_install() {
-	installing() {
-		gnome2_src_install
-		# Massage shebang to make python_doscript happy
-		sed -e 's:#!'"${PYTHON}:#!/usr/bin/python:" \
-			-i src/orca/orca || die
-		python_doscript src/orca/orca
-	}
-	python_foreach_impl run_in_build_dir installing
-}
diff --git a/app-accessibility/orca/orca-3.24.0.ebuild b/app-accessibility/orca/orca-3.24.0.ebuild
index 80423afe0ace..216575e26152 100644
--- a/app-accessibility/orca/orca-3.24.0.ebuild
+++ b/app-accessibility/orca/orca-3.24.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Orca"
 
 LICENSE="LGPL-2.1+ CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
 
 IUSE="+braille"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"