gentoo (valentine's day) resync : 14.02.2021

3 files changed, 2 insertions, 98 deletions

diff --git a/app-accessibility/caribou/Manifest b/app-accessibility/caribou/Manifest
index ea563de29572..15018b53fb5d 100644
--- a/app-accessibility/caribou/Manifest
+++ b/app-accessibility/caribou/Manifest
@@ -3,6 +3,5 @@ AUX caribou-fix-compilation-error.patch 890 BLAKE2B 5e86e73326ba924d8f73121a031b
 AUX caribou-fix-subkey-popmenu.patch 916 BLAKE2B 5f833fded2a5d1dedf613aecd1e473f80954a730174f9509e2a3c846b790f8abe861fb65ddf683bee87b0cd99b8d18c4c6eab6413f978a295190cc5d9a355c51 SHA512 8ce9b33c09e19a24e2e8366674437afa03743637d0d1854e8c5b4f73cbd69148b8c4d59d65212c509146fd051015d7a20f9d8ff92e9c835b4d805ca6c564b5c2
 AUX caribou-fix-xadapter-xkb-calls.patch 1840 BLAKE2B c752a1e7f9cee33ed8ecdb5c9d72267e11b3881c6c1e4e7576b070088ecbe7893c9d5ef1dce8483b062ef31083441072a3b88309db523832a8b06e2254e65a82 SHA512 122b1004e601f3c669d8f8d33d4fd167d662086f54e0376f4cc6147e470b07a1345af99581313facb286c4392a2ae17b39565d36cca32fd5eeb7a44a49807999
 DIST caribou-0.4.21.tar.xz 426516 BLAKE2B bd5e27bbbdb08fc31edce3b65124177e30b6d51e0071601bcd84c325b5794ce936b3f782ac8639dca332c246e329773f462dcecc0f236f52aeb0dcc7c5607a24 SHA512 5fc0cf54a1cad50d41e659adbbb932b51d69d18951562f87497e99aaae17ac72b453b759dd7289ff8f68a79574dfce510b9de6bedc61408c14cb48b83eaf08da
-EBUILD caribou-0.4.21-r1.ebuild 2405 BLAKE2B 4e8e631ab0c172aa61337109ecc24f99da4147e8dc316b3176b82d838f6aac40a1f5c19807edb1acc897aa956a1325d8e01bd1fffb9d47d63d868be9c13964da SHA512 d7388c863fc514054b1dd52485ac06d410191c0f619bc1d7c3331209f281c4ef1feb07311d0657425c7cd90c816f087722958e64f370005b8d9a97a035d4f346
-EBUILD caribou-0.4.21-r2.ebuild 2583 BLAKE2B f30ed047db82376da1bc0752ec25313ca45b0d28b9f95b6a1121cda2c3609125af56d9d39da5a852e5813bd03f7f44d03012e7201d23bffbdf7838a772e62df8 SHA512 8d6441c20d575e09fd106915fb16e8d68f3c2aeb1e9cc3e8a517226690d000d1a2e972e9858171fadb567b79a85a6e71092666f01179c7ee2b6ee5f7528b0e53
+EBUILD caribou-0.4.21-r2.ebuild 2582 BLAKE2B 7fb7cfc2354bb9f945a23e93b0a4cdd85c1b8d653e4b4387940ea455224fb16794c273b4e1e5a82d01818363bb355f2e6f601122f3342583b2adaa2e44e4d5c6 SHA512 5abec28e094a414a73552a7c36fdfb415f47b7160c41749b484a0bd4ad81aebc66c124945d52798971f37721fc9c1c60874caa0249ca0f7603baa71fd971ea9d
 MISC metadata.xml 809 BLAKE2B c09e4f2616b808ebd600f0d9cd6251c08eff8e2c6b03251469e20c75f8aabb0d0d1058951ad14c48aa6e9072e9e61ce95dad8e6da8ea1a9eadbad775c8864390 SHA512 70a858f1ce80ad2dde3f688ef00803be1716bcd2d0e9900e497e1691d3eadbb414756a4c64966be6697cf9b76c9c5298732bb0ab5e2b9ea4309bc8a8726eef04
diff --git a/app-accessibility/caribou/caribou-0.4.21-r1.ebuild b/app-accessibility/caribou/caribou-0.4.21-r1.ebuild
deleted file mode 100644
index f0765688193d..000000000000
--- a/app-accessibility/caribou/caribou-0.4.21-r1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-GNOME2_LA_PUNT="yes"
-
-PYTHON_COMPAT=( python3_{7..8} )
-
-PYTHON_REQ_USE="xml"
-
-inherit gnome2 python-r1
-
-DESCRIPTION="Input assistive technology intended for switch and pointer users"
-HOMEPAGE="https://wiki.gnome.org/Projects/Caribou"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="
-	app-accessibility/at-spi2-core
-	>=dev-python/pygobject-2.90.3:3[${PYTHON_USEDEP}]
-	>=x11-libs/gtk+-3:3[introspection]
-	x11-libs/gtk+:2
-	>=dev-libs/gobject-introspection-0.10.7:=
-	dev-libs/libgee:0.8
-	dev-libs/libxml2
-	>=media-libs/clutter-1.5.11:1.0[introspection]
-	x11-libs/libX11
-	x11-libs/libxklavier
-	x11-libs/libXtst
-	${PYTHON_DEPS}
-"
-# gsettings-desktop-schemas is needed for the 'toolkit-accessibility' key
-# pyatspi-2.1.90 needed to run caribou if pygobject:3 is installed
-# librsvg needed to load svg images in css styles
-RDEPEND="${COMMON_DEPEND}
-	dev-libs/glib[dbus]
-	>=dev-python/pyatspi-2.1.90[${PYTHON_USEDEP}]
-	>=gnome-base/gsettings-desktop-schemas-3
-	gnome-base/librsvg:2
-	sys-apps/dbus
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/libxslt
-	>=dev-util/intltool-0.35.5
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	# FIXME: Now this supports python3 too...
-	# delete custom PYTHONPATH, useless on Gentoo and potential bug source
-	# + caribou is python2 only so fix the shell scripts
-#	sed -e '/export PYTHONPATH=.*python/ d' \
-#		-e "s:@PYTHON@:${EPREFIX}/usr/bin/python2:" \
-#		-i bin/{antler-keyboard,caribou-preferences}.in ||
-#		die "sed failed"
-
-	gnome2_src_prepare
-
-	prepare_caribou() {
-		mkdir -p "${BUILD_DIR}" || die
-	}
-	python_foreach_impl prepare_caribou
-}
-
-src_configure() {
-	ECONF_SOURCE="${S}" python_foreach_impl run_in_build_dir \
-		gnome2_src_configure \
-			--disable-docs \
-			--disable-static \
-			--enable-gtk3-module \
-			--enable-gtk2-module \
-			VALAC=$(type -P true)
-	# vala is not needed for tarball builds, but configure checks for it...
-}
-
-src_compile() {
-	python_foreach_impl run_in_build_dir gnome2_src_compile
-}
-
-src_test() {
-	python_foreach_impl run_in_build_dir default
-}
-
-src_install() {
-	python_foreach_impl run_in_build_dir gnome2_src_install
-
-	# https://bugzilla.gnome.org/show_bug.cgi?id=769323
-	dodoc AUTHORS NEWS README # ChangeLog simply points to git log
-}
diff --git a/app-accessibility/caribou/caribou-0.4.21-r2.ebuild b/app-accessibility/caribou/caribou-0.4.21-r2.ebuild
index ecee56604f0a..158e4af5f781 100644
--- a/app-accessibility/caribou/caribou-0.4.21-r2.ebuild
+++ b/app-accessibility/caribou/caribou-0.4.21-r2.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Caribou"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"