gentoo auto-resync : 10:10:2023 - 12:09:13

3 files changed, 268 insertions, 0 deletions

diff --git a/app-accessibility/brltty/Manifest b/app-accessibility/brltty/Manifest
index 7bc6dd18212a..763eb7895bba 100644
--- a/app-accessibility/brltty/Manifest
+++ b/app-accessibility/brltty/Manifest
@@ -1,7 +1,10 @@
 AUX brltty-6.4-respect-AR.patch 385 BLAKE2B 0029b98054c21b86bb3d03ff52a358fd08585fd10dcf43443c44857c13c17e65e8a60c1e14c06e708dbf77e55760d465a7929bf35cb37cb5758b42770cd7e4c7 SHA512 d603e195d9981a608b46ebb047536acece13c5106b46d1a4b76cc7e7aad6db2fb47d338224faaa9973295e10994fdd62a6986b0a3fd193a4808d432681d3dd60
 AUX brltty-6.5-gettext-0.22.patch 1831 BLAKE2B 922617f90a62701f64b06fad466e9695ac8f4c6c37742dae319b7169c7104e3650b2a56080ed43da9297e5b7dd97fdc0ddfa71fe8a5dff45d7cf20e310cb93f9 SHA512 9bf509c100c2f2851590284c23ea1ff4db57ef4a2cd04ab5749cb2268a5e8f5885c535d93b744874ee58552dd52cc23e323698d8f5833567f601c5cac5d8f6de
+AUX brltty-6.6-cython3.patch 1594 BLAKE2B d18b09f888e688efb8a33c0de6cbde25956d1024caa74484b49a48ec65d4dfba06166e26094add5696ba8f8b0563956ff743c81b0510b20db8918ad17ed37f92 SHA512 d4e596a24fbc66629cf935bb6c4c259c594b287a2ea187a362484cd7343247b413f11615afaeb35d761f9497d113d5305819b19830558def0d805036fc4c7149
 AUX brltty.initd 241 BLAKE2B 80969e4840d2d38af6bc310ecf18e0253ef01667517135bc5a2f92e50882c2b72e8a4763b215c62ccbfd8d2250067b44ce9a4cb5d318dd6eb48b298826d8d5de SHA512 55ea97a546a2335ee1148396df71363442b66ed4526f8adb93e88c2cf489f10a21b5361658f590b3f64eec24844235491b15349bd0e1c4533fef7b1390fc3a6e
 DIST brltty-6.5.tar.xz 3631628 BLAKE2B b2e5f82f15dff9a99bf3d75523f6ec48d531d413d860079af0023b9efdc07a93563226c6388cc89ce025f8d13b1635e883680f0ddb8a688ffcc4cd9c335d7aee SHA512 bbfbb89b1c3ba5063ad3bc0aa97b859dd23acea1feb79dab20c57dc74ff2f26649942fcecc7030a3f70555596f4d9d35cd05616af2a8e101d4d56b4c471a6ad3
+DIST brltty-6.6.tar.xz 3684592 BLAKE2B c1ae05b925384f3869d3c90ccc06197da2a592691830504ff01a530da87319d463e25cd7b387805c199562be815ca4e79f3679f592f3a1107025e3aba17ec159 SHA512 852bfd9179570be7b0da8b1279f84bdfedc14a319988d9c2eac5a20a9ce8977f31fdee167e8e96bb411184a1d72f4cdc633944c7b3f55bddae411fc71a9e6898
 EBUILD brltty-6.5-r2.ebuild 5679 BLAKE2B 67d58f16d14d2cdf55bb440622c55126c7b2dd5c77dbe4616a7ac864e862751e9a8748010283398725d1849ed0c2fb791abc6a56925e45450a2648ff4cdec93e SHA512 0afc4bc7eb38f32b4379f4a88c97ebce54a58781301f7bd460a7beedc7971a7e98c5a9b2f50e9c479276cfe61e6be3c571dd13ffb537e0340d495e6f06946ae5
 EBUILD brltty-6.5-r3.ebuild 5924 BLAKE2B b3cc183855f4ee657e4d815f4c546e13d90b3868aa20db720ec891a1d7d88386e718cc99f3c4b3eb207372795ca6009bf810c75a8e649d05002b9bb0d656ffc5 SHA512 d8204da48fcb41b54ede5f573e8c15cb379e7c96226ff2b15db7433682c1177c5fe2ecaf40657e645fe1f2fa2ac5d5c2ce40405cd2446a0273c35582cc9be7f7
+EBUILD brltty-6.6.ebuild 5846 BLAKE2B 6693530e2557deaf50b7a6e78819a3d0ee172e07fc7c9b3a0f854cd8b2b7c4109038c5463739fc9e562b7a1cfc900ca059cb8d108e680f40b8684d9da1987330 SHA512 e136424bbe73b4d9ee6029021c424811ad36da639e8c66ef0e9cd82f40b28e04f15478f769b99c9f9ca005b89eb0208195774c40d501dad72efdbb0f4e526ece
 MISC metadata.xml 1640 BLAKE2B eb6127143a054eda7263e2a3bf27555ac6193c2d9363476be6e6cb4e9269f454a808890ff8587189784a51877f44ed8ff5b9231aeea8d4c3172c98f66481c856 SHA512 74017c3f562c638fe1f547ed3e23c303d2248cbcc602404a4e394439ed4ad314ca359a9dccd181ba264a19b822fc46c7c961f992ad2bce95f6c3bfb3436d461f
diff --git a/app-accessibility/brltty/brltty-6.6.ebuild b/app-accessibility/brltty/brltty-6.6.ebuild
new file mode 100644
index 000000000000..c01143a96851
--- /dev/null
+++ b/app-accessibility/brltty/brltty-6.6.ebuild
@@ -0,0 +1,224 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..11} )
+FINDLIB_USE="ocaml"
+JAVA_PKG_WANT_SOURCE="1.8"
+JAVA_PKG_WANT_TARGET="1.8"
+
+inherit findlib toolchain-funcs java-pkg-opt-2 autotools python-r1 tmpfiles
+
+DESCRIPTION="Daemon that provides access to the Linux/Unix console for a blind person"
+HOMEPAGE="https://brltty.app/"
+SRC_URI="https://brltty.app/archive/${P}.tar.xz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+IUSE="+api +beeper bluetooth doc +fm gpm iconv icu
+		java louis +midi ncurses nls ocaml +pcm policykit python
+		usb systemd +speech tcl xml X"
+REQUIRED_USE="doc? ( api )
+	java? ( api )
+	ocaml? ( api )
+	python? ( api ${PYTHON_REQUIRED_USE} )
+	tcl? ( api )"
+
+DEPEND="
+	acct-group/brltty
+	acct-user/brltty
+	dev-libs/libpcre2[pcre32]
+	bluetooth? (
+		sys-apps/dbus
+		net-wireless/bluez
+	)
+	gpm? ( >=sys-libs/gpm-1.20 )
+	iconv? ( virtual/libiconv )
+	icu? ( dev-libs/icu:= )
+	louis? ( dev-libs/liblouis:= )
+	midi? ( media-libs/alsa-lib )
+	ncurses? ( sys-libs/ncurses:0= )
+	pcm? ( media-libs/alsa-lib )
+	policykit? ( sys-auth/polkit )
+	python? ( ${PYTHON_DEPS} )
+	speech? (
+		app-accessibility/espeak-ng
+		app-accessibility/flite
+		app-accessibility/speech-dispatcher
+	)
+	systemd? ( sys-apps/systemd )
+	tcl? ( >=dev-lang/tcl-8.6.13-r1:= )
+	usb? ( virtual/libusb:1 )
+	xml? ( dev-libs/expat )
+	X? (
+		app-accessibility/at-spi2-core:2
+		sys-apps/dbus
+		x11-libs/libX11
+		x11-libs/libXaw
+		x11-libs/libXfixes
+		x11-libs/libXt
+		x11-libs/libXtst
+	)"
+RDEPEND="${DEPEND}
+	java? ( >=virtual/jre-1.8:* )
+"
+BDEPEND="
+	virtual/pkgconfig
+	java? ( >=virtual/jdk-1.8:* )
+	nls? ( virtual/libintl )
+	python? ( dev-python/cython[${PYTHON_USEDEP}] )
+"
+
+HTML_DOCS=( "${S}"/Documents/Manual-BrlAPI/. )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.4-respect-AR.patch
+	"${FILESDIR}"/${P}-cython3.patch
+)
+
+src_prepare() {
+	default
+
+	java-pkg-opt-2_src_prepare
+
+	# We run eautoconf instead of using eautoreconf because brltty uses
+	# a custom build system that uses autoconf without the rest of the
+	# autotools.
+	eautoconf
+	use python && python_copy_sources
+}
+
+src_configure() {
+	tc-export AR LD PKG_CONFIG
+
+	export JAVAC=""
+	export JAVA_JNI_FLAGS=""
+	if use java; then
+		export JAVA_HOME="$(java-config -g JAVA_HOME)"
+		export JAVAC_HOME="${JAVA_HOME}/bin"
+		export JAVA_JNI_FLAGS="$(java-pkg_get-jni-cflags)"
+		export JAVAC="$(java-pkg_get-javac) -encoding UTF-8 $(java-pkg_javac-args)"
+	fi
+
+	# Override bindir for backward compatibility.
+	# Also override localstatedir so that the lib/brltty directory is installed
+	# correctly.
+	# Disable stripping since we do that ourselves.
+	local myconf=(
+		--bindir="${EPREFIX}"/bin
+		--htmldir="${EPREFIX}"/usr/share/doc/"${P}"/html
+		--localstatedir="${EPREFIX}"/var
+		--runstatedir="${EPREFIX}"/run
+		# the next two lines should be removed once support is added.
+		--disable-emacs-bindings
+		--disable-lua-bindings
+		# Python bindings are built separately per-impl
+		--disable-python-bindings
+		--disable-stripping
+		--with-updatable-directory="${EPREFIX}"/var/lib/brltty
+		--with-writable-directory="${EPREFIX}"/run/brltty
+		--with-privilege-parameters=lx:user=brltty
+		$(use_enable api)
+		$(use_with beeper beep-package)
+#		$(use_enable emacs emacs-bindings)
+		$(use_with fm fm-package)
+		$(use_enable gpm)
+		$(use_enable iconv)
+		$(use_enable icu)
+		$(use_enable java java-bindings)
+		$(use_enable louis liblouis)
+#		$(use_enable lua lua-bindings)
+		$(use_with midi midi-package)
+		$(use_enable nls i18n)
+		$(use_enable ocaml ocaml-bindings)
+		$(use_with pcm pcm-package)
+		$(use_enable policykit polkit)
+		$(use_enable python python-bindings)
+		$(use_enable speech speech-support)
+		$(use_with systemd service-package)
+		$(use_enable tcl tcl-bindings)
+		$(use_enable xml expat)
+		$(use_enable X x)
+		$(use_with bluetooth bluetooth-package)
+		$(use_with ncurses curses)
+		$(use_with usb usb-package)
+	)
+	# disable espeak since we use espeak-ng
+	use speech && myconf+=( --with-speech-driver=-es )
+
+	econf "${myconf[@]}"
+
+	if use python; then
+		python_configure() {
+			econf "${myconf[@]}" --enable-python-bindings PYTHON="${PYTHON}"
+		}
+		python_foreach_impl run_in_build_dir python_configure
+	fi
+}
+
+src_compile() {
+	emake -j1 JAVA_JNI_FLAGS="${JAVA_JNI_FLAGS}" JAVAC="${JAVAC}"
+
+	if use python; then
+		python_build() {
+			emake -C "${BUILD_DIR}"/Bindings/Python -j1
+		}
+		python_foreach_impl run_in_build_dir python_build
+	fi
+}
+
+src_install() {
+	if use ocaml; then
+		findlib_src_preinst
+	fi
+
+	emake -j1 INSTALL_ROOT="${D}" OCAML_LDCONF= install
+
+	if use python; then
+		python_install() {
+			emake -C "${BUILD_DIR}"/Bindings/Python -j1 INSTALL_ROOT="${D}" install
+		}
+		python_foreach_impl run_in_build_dir python_install
+	fi
+
+	if use java; then
+		java-pkg_doso Bindings/Java/libbrlapi_java.so
+		java-pkg_dojar Bindings/Java/brlapi.jar
+	fi
+
+	insinto /etc
+	doins Documents/brltty.conf
+	newinitd "${FILESDIR}"/brltty.initd brltty
+	pushd Autostart/Systemd 1> /dev/null || die
+	emake -j1 INSTALL_ROOT="${ED}" install
+	popd || die
+	pushd Autostart/Udev 1> /dev/null || die
+	emake -j1 INSTALL_ROOT="${ED}" install
+	popd || die
+
+	dodoc Documents/{CONTRIBUTORS,ChangeLog,HISTORY,README*,TODO}
+	if use doc; then
+		HTML_DOCS="doc/Manual-BRLTTY" einstalldocs
+	fi
+
+	keepdir /var/lib/BrlAPI
+	rm -fr "${ED}/run" || die
+	find "${ED}" -name '*.a' -delete || die
+}
+
+pkg_postinst() {
+	tmpfiles_process ${PN}.conf
+
+	elog "please be sure ${EROOT}/etc/brltty.conf is correct for your system."
+	elog
+	elog "To make brltty start on boot on an OpenRC system, type this command:"
+	elog "# rc-update add brltty boot"
+	elog
+	elog "If you are using systemd, type this command:"
+	elog "# systemctl daemon-reload"
+	elog
+	elog "Please reload udev by typing:"
+	elog "# udevadm control --reload"
+}
diff --git a/app-accessibility/brltty/files/brltty-6.6-cython3.patch b/app-accessibility/brltty/files/brltty-6.6-cython3.patch
new file mode 100644
index 000000000000..01a860a4d646
--- /dev/null
+++ b/app-accessibility/brltty/files/brltty-6.6-cython3.patch
@@ -0,0 +1,41 @@
+https://bugs.gentoo.org/913019
+https://github.com/brltty/brltty/commit/e6707d5e094dc36db4319ce4d052a6ad568a5d26
+
+From e6707d5e094dc36db4319ce4d052a6ad568a5d26 Mon Sep 17 00:00:00 2001
+From: Samuel Thibault <samuel.thibault@ens-lyon.org>
+Date: Tue, 15 Aug 2023 16:29:13 +0200
+Subject: [PATCH] brlapi: Fix python crash on connection error
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From Lukáš Tyrychtr:
+“
+Cython 3.0 started using the new Python object finalization APIs from PEP 442
+”
+
+This means that __del__ gets called even when raising an exception from
+__init__, while it was not before. To cope with both behaviors, we can
+set self.h to NULL to determine whether it still exists or not.
+
+Thanks Lukáš Tyrychtr for the investigation and patch draft!
+--- a/Bindings/Python/brlapi.pyx
++++ b/Bindings/Python/brlapi.pyx
+@@ -453,6 +453,7 @@ cdef class Connection:
+ 		c_brlapi.brlapi_protocolExceptionInit(self.h)
+ 		if self.fd == -1:
+ 			c_brlapi.free(self.h)
++			self.h = NULL
+ 			raise ConnectionError(self.settings.host, self.settings.auth)
+ 
+ 	def closeConnection(self):
+@@ -465,7 +466,8 @@ cdef class Connection:
+ 		"""Release resources used by the connection"""
+ 		if self.fd != -1:
+ 			c_brlapi.brlapi__closeConnection(self.h)
+-		c_brlapi.free(self.h)
++		if self.h != NULL:
++			c_brlapi.free(self.h)
+ 
+ 	property host:
+ 		"""To get authorized to connect, libbrlapi has to tell the BrlAPI server a secret key, for security reasons. This is the path to the file which holds it; it will hence have to be readable by the application."""