3 files changed, 2 insertions, 226 deletions
diff --git a/app-accessibility/brltty/Manifest b/app-accessibility/brltty/Manifest
index e9a6a403881b..55acb3144c6e 100644
--- a/app-accessibility/brltty/Manifest
+++ b/app-accessibility/brltty/Manifest
@@ -4,7 +4,6 @@ AUX brltty-6.6-cython3.patch 1594 BLAKE2B d18b09f888e688efb8a33c0de6cbde25956d10
 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 5919 BLAKE2B 6a1f9ddd2f678a55800555be65fdc1fec1c70227d7965ae55642fae21ba7efc7bb69fd64c1a9292c48edb38024ce774c7122ce5b1630984d9e5664e688c26291 SHA512 a218d1b0aac5f201871e47f3b239f174058050c7bc5fcd2fbb4fe47b2d3691a87c5ef79ae54edfc3095a357457386460cc628234fa6a1b0ce58c4c770a10a160
-EBUILD brltty-6.6-r1.ebuild 5804 BLAKE2B 766013ab566da6cf1ea0b2b989f6ae24f248ab1b82d169f412e2f6603840edd20f1f2020bba764428d9651b6f761cd3fe5079a591af172ade446da1924cbe5d3 SHA512 1353739a5a03703f1064629d516b68b1f619a93f5f76c1756990571e7a4ffefcee57df682378fc567af52044945b0e60bd5836b6db2e1f6d9343eafa1847f24f
+EBUILD brltty-6.6-r1.ebuild 5803 BLAKE2B 639ebe7debaa7643bc2c8f0579a1cbc6de294fb3543b8a7fe7e7c62f99611a05e17cf84871c8f48a24ec4fa652ca4886c10de7a6abbda05a863006758a95ac07 SHA512 d437fae8899618e2846bbbb068724f8a4da4f7f30996d5066104e712532c9ebc0adcaf0ddb0f6537270cbaae61c18a9c806edb6d4e765a29b8b23db54a448fdd
 MISC metadata.xml 1596 BLAKE2B a0eb74542a3ad8ea8d36e269d9c0c9266b1dda440ff9c5a02b53f60c9b406e30c55d7ef58a2c49d02348b410515fb2b4ca5d36e152f006b9bab7445577441a6e SHA512 369c801ef0a8be96d66c2c163fa6000fcf35b49fd83a5521d93a6a2bac5da1f540c2fa977198fc651451959f804a9e3b3630ca8a0470231892861ed1d5cc5b6f
diff --git a/app-accessibility/brltty/brltty-6.5-r2.ebuild b/app-accessibility/brltty/brltty-6.5-r2.ebuild
deleted file mode 100644
index 3ba415f349b0..000000000000
--- a/app-accessibility/brltty/brltty-6.5-r2.ebuild
+++ /dev/null
@@ -1,223 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..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.4.15:0= )
-	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-3[${PYTHON_USEDEP}] )
-"
-
-HTML_DOCS=( "${S}"/Documents/Manual-BrlAPI/. )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.4-respect-AR.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
-		--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[@]}"
-		}
-		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() {
-			cd "Bindings/Python" || die
-			emake -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() {
-			cd "Bindings/Python" || die
-			emake -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/brltty-6.6-r1.ebuild b/app-accessibility/brltty/brltty-6.6-r1.ebuild
index e2d3a528f5d0..a9bd416f9470 100644
--- a/app-accessibility/brltty/brltty-6.6-r1.ebuild
+++ b/app-accessibility/brltty/brltty-6.6-r1.ebuild
@@ -16,7 +16,7 @@ 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"
+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"