gentoo resync : 03.03.2021

3 files changed, 156 insertions, 0 deletions

diff --git a/app-accessibility/caribou/Manifest b/app-accessibility/caribou/Manifest
index 15018b53fb5d..865a2b9b9dd4 100644
--- a/app-accessibility/caribou/Manifest
+++ b/app-accessibility/caribou/Manifest
@@ -1,7 +1,9 @@
 AUX caribou-fix-antler-style-css.patch 857 BLAKE2B e909c15b5907f80d24a719c9533cedf1edb5abac49d5e7b56ddadcd93a49ba6a23a27f99ca0a34983e4d4a62bef0ec2ff0c4200deb19241978acdb9562abe04f SHA512 d4129de776b424522e6df7f88858630fe130b805f705f41ad8e993fb57aa99c0b3a35f1cfb6d7d184540331aeb2f78abf05bd44257ae87f61bd0bb8ed40afbed
 AUX caribou-fix-compilation-error.patch 890 BLAKE2B 5e86e73326ba924d8f73121a031b57beed1fafcf53f0f09793ce61e1d6251b5ab3bcf19f791085ef141f4417d6df6f9d04ad5d0506779991f1af40942d06ccc2 SHA512 99e199361a9c50c65eec98a887734df3cbf3bfee3da588f24a76088c335e5f7ef3d750f223524c305360a4155b4812e512895301fdaf2b820f8568b72ef7bcb7
+AUX caribou-fix-python-env.patch 2508 BLAKE2B b27a37c5f14affb2610b6a2caca9827a4b51676fe36350e666960559322e42b9bb38e044708cb390726cca3ef2f276210ba01d6322450145bb8931615613abf7 SHA512 0b972f72e0d7d5c9ddb4b3b6ca874343f2e023f7123e9671773fe394a4a062aec7cec8badec9b13b400575c1eccc28dff4b32a0486a9d477b3cc22c0b85aa1c5
 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-r2.ebuild 2582 BLAKE2B 7fb7cfc2354bb9f945a23e93b0a4cdd85c1b8d653e4b4387940ea455224fb16794c273b4e1e5a82d01818363bb355f2e6f601122f3342583b2adaa2e44e4d5c6 SHA512 5abec28e094a414a73552a7c36fdfb415f47b7160c41749b484a0bd4ad81aebc66c124945d52798971f37721fc9c1c60874caa0249ca0f7603baa71fd971ea9d
+EBUILD caribou-0.4.21-r3.ebuild 2124 BLAKE2B 5a243dd805976616a57800e77aa6daf9b67fb42db7f2e02a4634309fccd10e8a8a178a85220362117345e28562aa9b644fd165c8d33ebc84274e829fd41a4a21 SHA512 f864de1f93f002a365bebefb18ed9ecc36b827ca871e4834b5ce7d29a8f2b467865215b912b54ae8d95075af753e703c21f68ab625a7eb82da827c519e7b27fc
 MISC metadata.xml 809 BLAKE2B c09e4f2616b808ebd600f0d9cd6251c08eff8e2c6b03251469e20c75f8aabb0d0d1058951ad14c48aa6e9072e9e61ce95dad8e6da8ea1a9eadbad775c8864390 SHA512 70a858f1ce80ad2dde3f688ef00803be1716bcd2d0e9900e497e1691d3eadbb414756a4c64966be6697cf9b76c9c5298732bb0ab5e2b9ea4309bc8a8726eef04
diff --git a/app-accessibility/caribou/caribou-0.4.21-r3.ebuild b/app-accessibility/caribou/caribou-0.4.21-r3.ebuild
new file mode 100644
index 000000000000..d5ff2747cb36
--- /dev/null
+++ b/app-accessibility/caribou/caribou-0.4.21-r3.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_REQ_USE="xml"
+
+inherit gnome.org gnome2-utils python-single-r1 vala
+
+DESCRIPTION="Input assistive technology intended for switch and pointer users"
+HOMEPAGE="https://wiki.gnome.org/Projects/Caribou"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+COMMON_DEPEND="
+	${PYTHON_DEPS}
+	app-accessibility/at-spi2-core
+	$(python_gen_cond_dep '
+		>=dev-python/pygobject-2.90.3:3[${PYTHON_USEDEP}]
+	')
+	>=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/gtk+-3:3[introspection]
+	x11-libs/libX11
+	x11-libs/libxklavier
+	x11-libs/libXtst
+"
+# 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]
+	$(python_gen_cond_dep '
+		>=dev-python/pyatspi-2.1.90[${PYTHON_USEDEP}]
+	')
+	>=gnome-base/gsettings-desktop-schemas-3
+	gnome-base/librsvg:2
+	sys-apps/dbus
+	!<x11-base/xorg-server-1.20.10
+"
+DEPEND="
+	${COMMON_DEPEND}
+	dev-libs/libxslt
+"
+BDEPEND="
+	$(vala_depend)
+	>=dev-util/intltool-0.35.5
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-fix-compilation-error.patch"
+	"${FILESDIR}/${PN}-fix-subkey-popmenu.patch"
+	"${FILESDIR}/${PN}-fix-xadapter-xkb-calls.patch"
+	"${FILESDIR}/${PN}-fix-antler-style-css.patch"
+	"${FILESDIR}/${PN}-fix-python-env.patch"
+)
+
+src_prepare() {
+	default
+	vala_src_prepare
+	gnome2_disable_deprecation_warning
+}
+
+src_configure() {
+	econf \
+		--disable-maintainer-mode \
+		--disable-schemas-compile \
+		--disable-docs \
+		--disable-static \
+		--disable-gtk2-module \
+		--enable-gtk3-module
+}
+
+src_install() {
+	DOCS="AUTHORS NEWS README"
+	default
+	find "${D}" -name '*.la' -delete || die
+	python_optimize
+}
+
+pkg_postinst() {
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	gnome2_schemas_update
+}
diff --git a/app-accessibility/caribou/files/caribou-fix-python-env.patch b/app-accessibility/caribou/files/caribou-fix-python-env.patch
new file mode 100644
index 000000000000..3a0b26698fa3
--- /dev/null
+++ b/app-accessibility/caribou/files/caribou-fix-python-env.patch
@@ -0,0 +1,58 @@
+--- a/bin/antler-keyboard.in
++++ b/bin/antler-keyboard.in
+@@ -18,24 +18,4 @@
+ # along with this program; if not, write to the Free Software Foundation,
+ # Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ 
+-script_dir="$(dirname "$(readlink -f ${0})")"
+-
+-prefix=@prefix@
+-exec_prefix=@exec_prefix@
+-datarootdir=@datarootdir@
+-
+-if [ $script_dir = "@libexecdir@" ]
+-then
+-  datadir="$(@PYTHON@ -c "from gi.repository import GLib; print(':'.join(GLib.get_system_data_dirs()))")"
+-  export PYTHONPATH="${prefix}/lib/python@PYTHON_VERSION@/site-packages:${prefix}/lib64/python@PYTHON_VERSION@/site-packages${PYTHONPATH:+:$PYTHONPATH}"
+-  export GI_TYPELIB_PATH="@libdir@/girepository-1.0${GI_TYPELIB_PATH:+:$GI_TYPELIB_PATH}"
+-  export LD_LIBRARY_PATH="@libdir@${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
+-  export XDG_DATA_DIRS="@datadir@${datadir:+:$datadir}"
+-else
+-  export PYTHONPATH="$(dirname $script_dir)${PYTHONPATH:+:$PYTHONPATH}"
+-  export GI_TYPELIB_PATH="$(dirname $script_dir)/libcaribou${GI_TYPELIB_PATH:+:$GI_TYPELIB_PATH}"
+-  export LD_LIBRARY_PATH="$(dirname $script_dir)/libcaribou/.libs${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
+-  export ANTLER_THEME_PATH="$(dirname $script_dir)/data"
+-fi
+-
+-@PYTHON@ -m caribou.antler.main "$@"
++exec @PYTHON@ -m caribou.antler.main "$@"
+--- a/bin/caribou-preferences.in
++++ b/bin/caribou-preferences.in
+@@ -18,26 +18,7 @@
+ # along with this program; if not, write to the Free Software Foundation,
+ # Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ 
+-script_dir="$(dirname "$(readlink -f ${0})")"
+-
+-prefix=@prefix@
+-exec_prefix=@exec_prefix@
+-datarootdir=@datarootdir@
+-
+-if [ $script_dir = "@bindir@" ]
+-then
+-  datadir="$(@PYTHON@ -c "from gi.repository import GLib; print(':'.join(GLib.get_system_data_dirs()))")"
+-  export PYTHONPATH="@prefix@/lib/python@PYTHON_VERSION@/site-packages${PYTHONPATH:+:$PYTHONPATH}"
+-  export GI_TYPELIB_PATH="@libdir@/girepository-1.0${GI_TYPELIB_PATH:+:$GI_TYPELIB_PATH}"
+-  export LD_LIBRARY_PATH="@libdir@${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
+-  export XDG_DATA_DIRS="@datadir@${datadir:+:$datadir}"
+-else
+-  export PYTHONPATH="$(dirname $script_dir)${PYTHONPATH:+:$PYTHONPATH}"
+-  export GI_TYPELIB_PATH="$(dirname $script_dir)/libcaribou${GI_TYPELIB_PATH:+:$GI_TYPELIB_PATH}"
+-  export LD_LIBRARY_PATH="$(dirname $script_dir)/libcaribou/.lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
+-fi
+-
+-@PYTHON@ -c "
++exec @PYTHON@ -c "
+ import signal
+ signal.signal(signal.SIGINT, signal.SIG_DFL)
+