gentoo resync : 24.03.2019

5 files changed, 227 insertions, 3 deletions

diff --git a/app-accessibility/Manifest.gz b/app-accessibility/Manifest.gz
index 5f7735519627..bdcd9e0ccdb1 100644
--- a/app-accessibility/Manifest.gz
+++ b/app-accessibility/Manifest.gz
diff --git a/app-accessibility/brltty/Manifest b/app-accessibility/brltty/Manifest
index 1828c69f1a51..e8ca4622fe40 100644
--- a/app-accessibility/brltty/Manifest
+++ b/app-accessibility/brltty/Manifest
@@ -2,8 +2,11 @@ AUX brltty-5.2-fix-ldflags.patch 2168 BLAKE2B c75da04cfb57b550634a18f67c81fb0fef
 AUX brltty-5.2-respect-AR.patch 260 BLAKE2B 4bdf1c41a881e59477e9472a8e9f691bccce5c837b1d1358f405df9e485aab9041b8612dfffa78d30cf90814668e8234b947b43f933d80e8e00e5c618ae8e768 SHA512 2b8de99e98e257041d7a2131775a936166f183197dc02a242cb9efaebebc19afed45292defa9567f86f8ce71e32458743b8c2d3361b1b290f6c93df88e83b1ff
 AUX brltty-5.2-sysmacros.patch 458 BLAKE2B ed2f09ed3a137758603d0067ec18708bbfc24fb3cad90954905ebeac4900dd70b679ccfc1d64c6f23fc9d4c7de0275a760222f8dcd935086541ef16cfd9ac963 SHA512 8e1ea5351c963df01603ff2469ff01079896fac40fbc1b91bb88f976749b639b4c925382e041f402f1cfef8a16716fb46109650b173539d69131f1e275ee1392
 AUX brltty-5.2-udev.patch 1025 BLAKE2B 8c83d2cf3dd09f4ee73d1dad104518449ca1136768945c879dfffa1774f7d11fac14dad53f3da840bebd77d72f10c2ed9ed6ebb69ab1ffb17bc69cc226296501 SHA512 3ef8e8ea2f7e03c88079b7cf91930ca0a86c0b383202d5e70c63419ead9e2e607812ad966e0eccce90615b3eed8600d71c63a0eabc1a01587ca959a29a484d8c
-AUX brltty.rc 242 BLAKE2B 68fc8de846cdaff11b2b6377d49985c8cbad1342dad03e60f3a3ef2e8aeb728994c05f6b9bb9378e5434c1e4cd03ead0716abf7344dea3f993ac10d9c12edc23 SHA512 067dc15ca297774ad773512f57e0b828ce97a07ac7156e4c72fc25b8b045eeca313ae566564c954193be83c72928dc3a26e1fadc4b2cc1755c607f515590cb9a
+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-5.2.tar.xz 2532684 BLAKE2B 9b0555289177971abe12119f0604eebb196b8f493294741a31c684ebb5546eaccc0a729a8ca6b24e4075f0c29bf371e773743f02e0a102799c44c2293dc9894f SHA512 8e16701e9c9d776c76e3ad0cb4319b2753295fea229bd3f60cb0dffc0b6946037e6f98daafae873238c4eff90d4b8ddb697b7d425e700c5a098aba8fed9eed3f
+DIST brltty-6.0.tar.xz 2879976 BLAKE2B 31bd45b63838d119d940492c615deb27ec47389c68afa39f19da3534324914695343344260799a10deae6ca3de41bedf9b0c1de1f78dbe01a89b694c2aa6e265 SHA512 07344fa902ad169967ca39d19b09dfea24e698011031dd63dce3eb997a4cb86622ee9427b216976b3ef60e5cbabb710a621621447c6bfa2313748fc1a1cf4b06
 EBUILD brltty-5.2-r1.ebuild 5222 BLAKE2B c08dc651756c02ebbe30b3d55989c814ce9b049c08f5f775f2f2a2d369cbeb5681cf8eebbad09fa66825c391e94f54c56996bdbbfb2b333e4e8e9560b872e932 SHA512 3456c6d7bb6badda1f2cce1e6d6edaae677cd2d4eac62d3a5e67c9ad5a98b0383fed0d5e9fa6b65a4c17b853da26824806d828fc4861a255be32b9f89b43a006
+EBUILD brltty-6.0.ebuild 5123 BLAKE2B 28841cc01a7cfdf6fb648107eb880464e9eb5a2b9fb5803cec2462bc8cb11d767eeab690f60c8483558540e1f6980bc680843d0e8bcc7f1c36bf9a5fa6fe51fa SHA512 5d1512b27f6ba53741ce172cd305feb87f2928081f197d304398d38a4414ba54780daeeb8f90e27db2f750d9b2da41cfcc75a5a463c488ea37aeee6da76c66b9
 MISC metadata.xml 1502 BLAKE2B 75f1750b615a2d6d022ed682f65ce6d0d45908e0d5724a162220a915371ae357cd904b0c09083153fb0f07facbc89024604fe86e3386e58a7d409a82f3865835 SHA512 337bf98d4e2ffac2ea0721a042bd31958809de5089090b0a79d73457f700d57fb8ffe637f4ad9e896992e98a13fdbe1ac9a3f7758d8ad2703334db8edfb7c32c
diff --git a/app-accessibility/brltty/brltty-6.0.ebuild b/app-accessibility/brltty/brltty-6.0.ebuild
new file mode 100644
index 000000000000..badd7a116780
--- /dev/null
+++ b/app-accessibility/brltty/brltty-6.0.ebuild
@@ -0,0 +1,194 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+FINDLIB_USE="ocaml"
+
+inherit findlib eutils multilib toolchain-funcs java-pkg-opt-2 flag-o-matic \
+	autotools udev systemd python-r1
+
+DESCRIPTION="Daemon that provides access to the Linux/Unix console for a blind person"
+HOMEPAGE="http://brltty.com/"
+SRC_URI="http://brltty.com/archive/${P}.tar.xz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="+api +beeper bluetooth +contracted-braille doc +fm gpm iconv icu
+		java +midi ncurses nls ocaml +pcm python usb +speech
+		tcl X"
+REQUIRED_USE="doc? ( api )
+	java? ( api )
+	ocaml? ( api )
+	python? ( api ${PYTHON_REQUIRED_USE} )
+	tcl? ( api )"
+
+COMMON_DEP="bluetooth? ( net-wireless/bluez )
+	gpm? ( >=sys-libs/gpm-1.20 )
+	iconv? ( virtual/libiconv )
+	icu? ( dev-libs/icu:= )
+	python? ( ${PYTHON_DEPS} )
+	ncurses? ( sys-libs/ncurses:0= )
+	nls? ( virtual/libintl )
+	tcl? ( >=dev-lang/tcl-8.4.15:0= )
+	usb? ( virtual/libusb:0 )
+	X? ( x11-libs/libXaw )"
+DEPEND="${COMMON_DEP}"
+BDEPEND="
+	virtual/pkgconfig
+	java? ( >=virtual/jdk-1.4 )
+	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
+
+	# The code runs `pkg-config` directly instead of locating a suitable
+	# pkg-config wrapper (or respecting $PKG_CONFIG).
+	sed -i \
+		-e 's/\<pkg-config\>/${PKG_CONFIG:-pkg-config}/' \
+		aclocal.m4 configure.ac || die
+
+	# We run eautoconf instead of using eautoreconf because brltty uses
+	# a custom build system that uses autoconf without the rest of the
+	# autotools.
+	eautoconf
+	python_copy_sources
+}
+
+src_configure() {
+	tc-export AR LD PKG_CONFIG
+	# 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_with midi midi-package)
+		$(use_enable nls i18n)
+		$(use_enable ocaml ocaml-bindings)
+		$(use_with pcm pcm-package)
+		$(use_enable speech speech-support)
+		$(use_enable tcl tcl-bindings)
+		$(use_enable X x)
+		$(use_with bluetooth bluetooth-package)
+		$(use_with ncurses curses)
+		$(use_with usb usb-package) )
+
+	econf "${myconf[@]}"
+
+	if use python; then
+		myconf+=( $(use_enable python python-bindings ) )
+
+		python_configure() {
+			econf "${myconf[@]}"
+		}
+		python_foreach_impl run_in_build_dir python_configure
+	fi
+}
+
+src_compile() {
+	local JAVAC_CONF=""
+	local OUR_JNI_FLAGS=""
+	if use java; then
+		OUR_JNI_FLAGS="$(java-pkg_get-jni-cflags)"
+		JAVAC_CONF="${JAVAC} -encoding UTF-8 $(java-pkg_javac-args)"
+	fi
+
+	emake JAVA_JNI_FLAGS="${OUR_JNI_FLAGS}" JAVAC="${JAVAC_CONF}"
+
+	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
+		# make install puts the _java.so there, and no it's not $(get_libdir)
+		rm -r "${ED}/usr/lib/java" || die
+		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"
+
+	local libdir="$(get_libdir)"
+	mkdir -p "${ED}"/usr/${libdir}/ || die
+	mv "${ED}"/${libdir}/*.a "${ED}"/usr/${libdir}/ || die
+	gen_usr_ldscript libbrlapi.so
+
+	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/files/brltty-6.0-udev.patch b/app-accessibility/brltty/files/brltty-6.0-udev.patch
new file mode 100644
index 000000000000..e53b7a6aa664
--- /dev/null
+++ b/app-accessibility/brltty/files/brltty-6.0-udev.patch
@@ -0,0 +1,27 @@
+--- brltty-6.0/Autostart/Udev/rules
++++ brltty-6.0/Autostart/Udev/rules
+@@ -276,20 +276,22 @@
+ # FreedomScientific [Focus Blue]
+ ENV{PRODUCT}=="f4e/114/*", ENV{BRLTTY_BRAILLE_DRIVER}="fs", GOTO="brltty_usb_run"
+ 
++# Seika rules are commented out, because they conflict with USB-to-serial
++# converters.
+ # Device: 10C4:EA60
+ # Generic Identifier
+ # Vendor: Cygnal Integrated Products, Inc.
+ # Product: CP210x UART Bridge / myAVR mySmartUSB light
+ # BrailleMemo [Pocket]
+ # Seika [Braille Display]
+-ENV{PRODUCT}=="10c4/ea60/*", ENV{BRLTTY_BRAILLE_DRIVER}="mm,sk", GOTO="brltty_usb_run"
++#ENV{PRODUCT}=="10c4/ea60/*", ENV{BRLTTY_BRAILLE_DRIVER}="mm,sk", GOTO="brltty_usb_run"
+ 
+ # Device: 10C4:EA80
+ # Generic Identifier
+ # Vendor: Cygnal Integrated Products, Inc.
+ # Product: CP210x UART Bridge
+ # Seika [Note Taker]
+-ENV{PRODUCT}=="10c4/ea80/*", ENV{BRLTTY_BRAILLE_DRIVER}="sk", GOTO="brltty_usb_run"
++#ENV{PRODUCT}=="10c4/ea80/*", ENV{BRLTTY_BRAILLE_DRIVER}="sk", GOTO="brltty_usb_run"
+ 
+ # Device: 1148:0301
+ # BrailleMemo [Smart]
diff --git a/app-accessibility/brltty/files/brltty.rc b/app-accessibility/brltty/files/brltty.rc
index 0bc6c6c5375b..100dd29b778a 100644
--- a/app-accessibility/brltty/files/brltty.rc
+++ b/app-accessibility/brltty/files/brltty.rc
@@ -1,10 +1,10 @@
 #!/sbin/openrc-run
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 command=/bin/brltty
 pidfile=/var/run/brltty.pid
-command_args="-P $pidfile -q"
+command_args="-P ${pidfile} -q"
 
 depend() {
 	before *