gentoo resync : 25.11.2020

3 files changed, 2 insertions, 220 deletions

diff --git a/app-accessibility/brltty/Manifest b/app-accessibility/brltty/Manifest
index bd3b7201ac9c..e89b3ebeadfc 100644
--- a/app-accessibility/brltty/Manifest
+++ b/app-accessibility/brltty/Manifest
@@ -2,8 +2,6 @@ AUX brltty-5.2-respect-AR.patch 260 BLAKE2B 4bdf1c41a881e59477e9472a8e9f691bccce
 AUX brltty-6.0-udev.patch 1033 BLAKE2B d5220b3351af4191ab78f122265296ed802209d0320ebde04c3e947ba736132f5c16db8be18f3e1964c39fe61aadb535d4f84f75d070f68caeea4ca3b3c3ee05 SHA512 0512fbfcd9e9085e37b3b935f8f5a002e82fb514aa56ad807819a39d9da16fbf3bc5f45540ae1ca754160a81957f62d5c5bc8acc6295ee1af971aa9acf5b915a
 AUX brltty.rc 241 BLAKE2B 873b1344cc6dee3aa6272d9c8857b58a751200e77d7fa0d96f9ff992f2825267503db5fc11ea07d7064a0fa4fe78af637c41ced04212d063efb92183bb936c9f SHA512 d3b91fddbfa61e212537c58444585262d2781fa97ff7f8f4e9ab3c3ad937c680b230d805f7541e2701050e2b001d7d11f7e5937476568a3459d73bb36026f847
 AUX brltty.tmpfiles.conf 31 BLAKE2B e51c4c6e98da2d68ebd2aca39d3015ca28b40dbee5528155f9efb87ef8ec5264b382c78acf748514bd1f3902dbedcd471f4e18b0361c6a924108a950c75aceb9 SHA512 3d52a11e0d266ac508ab5447b6515f006f610e3bcb2ec396c3fe4c58a68874c9568f7fd6a143829f69c1b87680f1157953eae9fe326f5db3723c7e4b46390bf7
-DIST brltty-6.0.tar.xz 2879976 BLAKE2B 31bd45b63838d119d940492c615deb27ec47389c68afa39f19da3534324914695343344260799a10deae6ca3de41bedf9b0c1de1f78dbe01a89b694c2aa6e265 SHA512 07344fa902ad169967ca39d19b09dfea24e698011031dd63dce3eb997a4cb86622ee9427b216976b3ef60e5cbabb710a621621447c6bfa2313748fc1a1cf4b06
 DIST brltty-6.1.tar.xz 3394852 BLAKE2B 03e6358721dcd5c3bdee3301a1ed827a690128ec339669543279c7e9a115bef6c5d8630e4af2d0b214b9c7c3eaa9001ab4c54ae7fb899cb3bc675985f51d6933 SHA512 030ef60ef7a9a60dc2fba2a64ea0a0868395eee6f2f86876b4e4111e804a05b44f798a154a69a8f5e0f6358130993c360a550f7decac0535450f9cf939231eaf
-EBUILD brltty-6.0-r1.ebuild 5565 BLAKE2B db02667b4dcdf3487fcc5349f703c76c1856516b8d8f5bb4d947a9cd628af64b85a4c6b2070aabe6c58587fb7094ff2a6e1124ff3a225ea4bfb835129b7e0156 SHA512 f903d60af1501e7c89d2a653fa4bd0d32adb6fa3f5e5e26b553912e0d86377e5644ee76d5991d2192d45ad4ada389e91063f45fcfea7e4a1b222b0a31d4e017e
-EBUILD brltty-6.1.ebuild 5560 BLAKE2B e8358ee2be2a38ebc280eccaf8344bc4be51cae3151ac287efc3f6070f2928519aaca5984532d719c78fcfdb0f34b5b4c13159410549b817020773348cd023a1 SHA512 1219f88ce5288f76f48781de4d6f2a445396a291adba68f28844b271769a0f4976283265ce9c230e15268148856bdf0a141877e6abdde0403674427cc544f659
+EBUILD brltty-6.1.ebuild 5558 BLAKE2B c58b7d52bc72650e666d730126c079aa7d918ae6ed330b6fab0631f6c391f589ebc4ce7c11e88885057c8c1f226512f034a2827443da1de0dae4e7e56e3cc39f SHA512 00345812968327f0d8c41f88c93684bc48f7193d75612510086ae4a5ad7a34602ebf8c77baca1bfcec44f8f1e87b135b3a40c13704b45abb8a5274949d6b1d96
 MISC metadata.xml 1661 BLAKE2B a4687ddd715019cf8273353b4a70a4981e4925f5e931859280b2f836b8f56f82708b82a1cc184a3e056febb15649987650e1312a00ac8a35efa833ae2e4d1f7d SHA512 c7904bf90031faaa478456e3f3e6c59f969e9abba2cee33ac7ad7041edaaab8ea89ca3301f4bd7a7f385507623f316fa4908ac2c6e66a94ac108bce2aad87936
diff --git a/app-accessibility/brltty/brltty-6.0-r1.ebuild b/app-accessibility/brltty/brltty-6.0-r1.ebuild
deleted file mode 100644
index b6798c7faed6..000000000000
--- a/app-accessibility/brltty/brltty-6.0-r1.ebuild
+++ /dev/null
@@ -1,216 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-FINDLIB_USE="ocaml"
-JAVA_PKG_WANT_SOURCE="1.8"
-JAVA_PKG_WANT_TARGET="1.8"
-
-inherit findlib eutils multilib toolchain-funcs java-pkg-opt-2 flag-o-matic usr-ldscript \
-	autotools udev systemd python-r1
-
-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 ppc ppc64 x86"
-IUSE="+api +beeper bluetooth +contracted-braille 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 )"
-
-COMMON_DEP="
-	app-accessibility/at-spi2-core:2
-	dev-libs/libpcre2[pcre32]
-	sys-apps/dbus
-	bluetooth? ( 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
-		app-accessibility/flite
-		app-accessibility/speech-dispatcher
-	)
-	systemd? ( sys-apps/systemd )
-	tcl? ( >=dev-lang/tcl-8.4.15:0= )
-	usb? ( virtual/libusb:0 )
-	xml? ( dev-libs/expat )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXaw
-		x11-libs/libXt
-		x11-libs/libXtst
-	)"
-DEPEND="${COMMON_DEP}"
-BDEPEND="
-	virtual/pkgconfig
-	java? ( >=virtual/jdk-1.4 )
-	nls? ( virtual/libintl )
-	python? ( >=dev-python/cython-0.16[${PYTHON_USEDEP}] )
-"
-RDEPEND="java? ( >=virtual/jre-1.4 )
-	${COMMON_DEP}"
-
-HTML_DOCS=( "${S}"/Documents/Manual-BrlAPI/. )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.0-udev.patch
-	"${FILESDIR}"/${PN}-5.2-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 prefix in order to install into /
-	# braille terminal needs to be available as soon in the boot process as
-	# possible
-	# Also override localstatedir so that the lib/brltty directory is installed
-	# correctly.
-	# Disable stripping since we do that ourselves.
-	local myconf=(
-		--prefix="${EPREFIX}"/
-		--localedir="${EPREFIX}"/usr/share/locale
-		--includedir="${EPREFIX}"/usr/include
-		--localstatedir="${EPREFIX}"/var
-		--disable-stripping
-		--with-install-root="${D}"
-		--with-writable-directory="${EPREFIX}"/run/brltty
-		$(use_enable api)
-		$(use_with beeper beep-package)
-		$(use_enable contracted-braille)
-		$(use_with fm fm-package)
-		$(use_enable gpm)
-		$(use_enable iconv)
-		$(use_enable icu)
-		$(use_enable java java-bindings)
-		$(use_enable louis liblouis)
-		$(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) )
-
-	econf "${myconf[@]}"
-
-	if use python; then
-		python_configure() {
-			econf "${myconf[@]}"
-		}
-		python_foreach_impl run_in_build_dir python_configure
-	fi
-}
-
-src_compile() {
-	emake JAVA_JNI_FLAGS="${JAVA_JNI_FLAGS}" JAVAC="${JAVAC}"
-
-	if use python; then
-		python_build() {
-			cd "Bindings/Python" || die
-			emake
-		}
-		python_foreach_impl run_in_build_dir python_build
-	fi
-}
-
-src_install() {
-	if use ocaml; then
-		findlib_src_preinst
-	fi
-
-	emake OCAML_LDCONF= install
-
-	if use python; then
-		python_install() {
-			cd "Bindings/Python" || die
-			emake 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
-	udev_newrules Autostart/Udev/rules 70-brltty.rules
-	newinitd "${FILESDIR}"/brltty.rc brltty
-	systemd_dounit Autostart/Systemd/brltty@.service
-	systemd_dotmpfilesd "${FILESDIR}/${PN}.tmpfiles.conf"
-
-	if use api ; then
-		local libdir="$(get_libdir)"
-		mkdir -p "${ED}"/usr/${libdir}/ || die
-		mv "${ED}"/${libdir}/*.a "${ED}"/usr/${libdir}/ || die
-		gen_usr_ldscript libbrlapi.so
-	fi
-
-	cd Documents || die
-	mv Manual-BRLTTY/English/BRLTTY.txt BRLTTY-en.txt || die
-	mv Manual-BRLTTY/French/BRLTTY.txt BRLTTY-fr.txt || die
-	mv Manual-BrlAPI/English/BrlAPI.txt BrlAPI-en.txt || die
-	dodoc CONTRIBUTORS ChangeLog HISTORY README* TODO BRLTTY-*.txt
-	if use doc; then
-		dodoc BrlAPI-*.txt
-		HTML_DOCS="Manual-BRLTTY" einstalldocs
-	fi
-
-	keepdir /var/lib/BrlAPI
-	rmdir "${ED}/run/brltty" || die
-	rmdir "${ED}/run" || die
-}
-
-pkg_postinst() {
-	elog
-	elog "please be sure ${ROOT}/etc/brltty.conf is correct for your system."
-	elog
-	elog "To make brltty start on boot, type this command as root:"
-	elog
-	elog "rc-update add brltty boot"
-}
diff --git a/app-accessibility/brltty/brltty-6.1.ebuild b/app-accessibility/brltty/brltty-6.1.ebuild
index d790bfab9b30..4c7b17e51c1e 100644
--- a/app-accessibility/brltty/brltty-6.1.ebuild
+++ b/app-accessibility/brltty/brltty-6.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://brltty.app/archive/${P}.tar.xz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 x86"
 IUSE="+api +beeper bluetooth +contracted-braille doc +fm gpm iconv icu
 		java louis +midi ncurses nls ocaml +pcm policykit python
 		usb systemd +speech tcl xml X"