commit: 265cdd847717520d14fe94e5798ca64c9fff23b3 Author: Matthew S. Turnbull <sparky <AT> bluefang-logic <DOT> com> AuthorDate: Mon Jan 25 06:03:07 2021 +0000 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> CommitDate: Mon Mar 1 13:02:43 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=265cdd84
app-accessibility/caribou: Package clean-up * Update to EAPI7. * Convert to python-single-r1, as it doesn't look like it actually installs python bindings. Also remove env setup handling from launcher scripts. * Drop GTK-2 support. Closes: https://bugs.gentoo.org/629108 Closes: https://bugs.gentoo.org/642582 Bug: https://bugs.gentoo.org/772950 Package-Manager: Portage-3.0.13, Repoman-3.0.2 Signed-off-by: Matthew S. Turnbull <sparky <AT> bluefang-logic.com> Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> app-accessibility/caribou/caribou-0.4.21-r3.ebuild | 96 ++++++++++++++++++++++ .../caribou/files/caribou-fix-python-env.patch | 58 +++++++++++++ 2 files changed, 154 insertions(+) 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 00000000000..d5ff2747cb3 --- /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 00000000000..3a0b26698fa --- /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) +
