diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 20:56:41 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 20:56:41 +0100 |
commit | d87262dd706fec50cd150aab3e93883b6337466d (patch) | |
tree | 246b44c33ad7a57550430b0a60fa0df86a3c9e68 /app-accessibility/brltty | |
parent | 71bc00c87bba1ce31de0dac6c3b7fd1aee6917fc (diff) |
gentoo resync : 14.07.2018
Diffstat (limited to 'app-accessibility/brltty')
-rw-r--r-- | app-accessibility/brltty/Manifest | 9 | ||||
-rw-r--r-- | app-accessibility/brltty/brltty-5.2-r1.ebuild | 197 | ||||
-rw-r--r-- | app-accessibility/brltty/files/brltty-5.2-fix-ldflags.patch | 56 | ||||
-rw-r--r-- | app-accessibility/brltty/files/brltty-5.2-respect-AR.patch | 11 | ||||
-rw-r--r-- | app-accessibility/brltty/files/brltty-5.2-sysmacros.patch | 20 | ||||
-rw-r--r-- | app-accessibility/brltty/files/brltty-5.2-udev.patch | 27 | ||||
-rw-r--r-- | app-accessibility/brltty/files/brltty.rc | 12 | ||||
-rw-r--r-- | app-accessibility/brltty/files/brltty.tmpfiles.conf | 1 | ||||
-rw-r--r-- | app-accessibility/brltty/metadata.xml | 29 |
9 files changed, 0 insertions, 362 deletions
diff --git a/app-accessibility/brltty/Manifest b/app-accessibility/brltty/Manifest deleted file mode 100644 index 57f601c7eedc..000000000000 --- a/app-accessibility/brltty/Manifest +++ /dev/null @@ -1,9 +0,0 @@ -AUX brltty-5.2-fix-ldflags.patch 2168 BLAKE2B c75da04cfb57b550634a18f67c81fb0fef857122795ff1a28c5d8fd654849cd4fe25a436b72aa851cb746f6eea52e7c2a52f5ba40f3d64797341678b4035070f SHA512 72ce6b722e90deb9e3d6d537b54ce2f8625154a5920eb555fb5fab1b65703a4ff88a2e0907b74a11454231507ebd9741533ee9b77ec5dfeffd3870179ebd98e8 -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.tmpfiles.conf 31 BLAKE2B e51c4c6e98da2d68ebd2aca39d3015ca28b40dbee5528155f9efb87ef8ec5264b382c78acf748514bd1f3902dbedcd471f4e18b0361c6a924108a950c75aceb9 SHA512 3d52a11e0d266ac508ab5447b6515f006f610e3bcb2ec396c3fe4c58a68874c9568f7fd6a143829f69c1b87680f1157953eae9fe326f5db3723c7e4b46390bf7 -DIST brltty-5.2.tar.xz 2532684 BLAKE2B 9b0555289177971abe12119f0604eebb196b8f493294741a31c684ebb5546eaccc0a729a8ca6b24e4075f0c29bf371e773743f02e0a102799c44c2293dc9894f SHA512 8e16701e9c9d776c76e3ad0cb4319b2753295fea229bd3f60cb0dffc0b6946037e6f98daafae873238c4eff90d4b8ddb697b7d425e700c5a098aba8fed9eed3f -EBUILD brltty-5.2-r1.ebuild 5229 BLAKE2B 9cda4dc74de430bd9f117e8dfd27c68a3aa726d251eec55a92dff78f763e7bbccc4bf53e00d561d85964fdd21858b1790c4ae58ec773703db9c3827dc6489593 SHA512 b3fd19b4318e1202b96ab46ecd5ac80601da4f9c8895e5f4b83db10c2294a4314683a7d4b023ef162d46f9c0914ae08599b3adf0a66e41a67bfc859b6bd94dec -MISC metadata.xml 1502 BLAKE2B 75f1750b615a2d6d022ed682f65ce6d0d45908e0d5724a162220a915371ae357cd904b0c09083153fb0f07facbc89024604fe86e3386e58a7d409a82f3865835 SHA512 337bf98d4e2ffac2ea0721a042bd31958809de5089090b0a79d73457f700d57fb8ffe637f4ad9e896992e98a13fdbe1ac9a3f7758d8ad2703334db8edfb7c32c diff --git a/app-accessibility/brltty/brltty-5.2-r1.ebuild b/app-accessibility/brltty/brltty-5.2-r1.ebuild deleted file mode 100644 index 3622819ef62d..000000000000 --- a/app-accessibility/brltty/brltty-5.2-r1.ebuild +++ /dev/null @@ -1,197 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) -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="virtual/pkgconfig - java? ( >=virtual/jdk-1.4 ) - python? ( >=dev-python/cython-0.16[${PYTHON_USEDEP}] ) - ${COMMON_DEP}" -RDEPEND="java? ( >=virtual/jre-1.4 ) - ${COMMON_DEP}" - -HTML_DOCS=( "${S}"/Documents/Manual-BrlAPI/. ) - -PATCHES=( - "${FILESDIR}"/${PN}-5.2-fix-ldflags.patch - "${FILESDIR}"/${PN}-5.2-udev.patch - "${FILESDIR}"/${PN}-5.2-respect-AR.patch - "${FILESDIR}"/${PN}-5.2-sysmacros.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() { - append-cppflags "$($(tc-getPKG_CONFIG) --cflags ncurses)" - append-libs "$($(tc-getPKG_CONFIG) --libs ncurses)" - - 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=/ - --localedir=/usr/share/locale - --includedir=/usr/include - --localstatedir=/var - --disable-stripping - --with-install-root="${D}" - --with-writable-directory="/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 -rf "${D}/usr/lib/java" - 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/udev.rules 70-brltty.rules - newinitd "${FILESDIR}"/brltty.rc brltty - systemd_dounit Autostart/Systemd/brltty.service - systemd_dotmpfilesd "${FILESDIR}/${PN}.tmpfiles.conf" - - libdir="$(get_libdir)" - mkdir -p "${D}"/usr/${libdir}/ - mv "${D}"/${libdir}/*.a "${D}"/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 "${D}/run/brltty" || die - rmdir "${D}/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-5.2-fix-ldflags.patch b/app-accessibility/brltty/files/brltty-5.2-fix-ldflags.patch deleted file mode 100644 index e60ea9a4e509..000000000000 --- a/app-accessibility/brltty/files/brltty-5.2-fix-ldflags.patch +++ /dev/null @@ -1,56 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -377,7 +377,7 @@ - case "${host_os}" - in - linux*|gnu*|openbsd*|freebsd*|kfreebsd*|netbsd*|*qnx*|cygwin*|mingw*|elf*) -- brltty_mkmod_ld_make="-shared" -+ brltty_mkmod_ld_make="-shared ${LDFLAGS}" - ;; - solaris*) - brltty_mkmod_ld_make="-G" -@@ -404,7 +404,7 @@ - esac - if test "${GCC}" = "yes" - then -- brltty_cv_prog_mkmod="\$(CC) ${brltty_mkmod_gcc_make=-shared} BRLTTY_OPTIONS_LD2CC([${brltty_mkmod_ld_options}]) -o" -+ brltty_cv_prog_mkmod="\$(CC) ${brltty_mkmod_gcc_make=-shared} ${LDFLAGS} BRLTTY_OPTIONS_LD2CC([${brltty_mkmod_ld_options}]) -o" - else - brltty_cv_prog_mkmod="\$(LD) ${brltty_mkmod_ld_make} ${brltty_mkmod_ld_options} -o" - fi]) -@@ -414,7 +414,7 @@ - case "${host_os}" - in - linux*|gnu*|openbsd*|freebsd*|kfreebsd*|netbsd*|*qnx*|elf*) -- brltty_mklib_ld_make="-shared" -+ brltty_mklib_ld_make="-shared ${LDFLAGS}" - brltty_mklib_ld_options="-soname" - ;; - solaris*) -@@ -449,7 +449,7 @@ - esac - if test "${GCC}" = "yes" - then -- brltty_cv_prog_mklib="\$(CC) ${brltty_mklib_gcc_make=-shared} BRLTTY_OPTIONS_LD2CC([${brltty_mklib_ld_options+${brltty_mklib_ld_options} <name>}]) -o" -+ brltty_cv_prog_mklib="\$(CC) ${brltty_mklib_gcc_make=-shared} ${LDFLAGS} BRLTTY_OPTIONS_LD2CC([${brltty_mklib_ld_options+${brltty_mklib_ld_options} <name>}]) -o" - else - brltty_cv_prog_mklib="\$(LD) ${brltty_mklib_ld_make} ${brltty_mklib_ld_options+${brltty_mklib_ld_options} <name>} -o" - fi]) ---- a/Bindings/OCaml/Makefile.in -+++ b/Bindings/OCaml/Makefile.in -@@ -55,13 +55,13 @@ - all : $(OCAML_FILES) - - $(OCAML_CLIBS) : brlapi_stubs.$O brlapi -- $(OCAMLMKLIB) $(API_LDFLAGS) -oc $(OCAML_LIB)_stubs brlapi_stubs.$O -+ $(OCAMLMKLIB) -ldopt "$(LDFLAGS)" $(API_LDFLAGS) -oc $(OCAML_LIB)_stubs brlapi_stubs.$O - - $(OCAML_BCLIB) : $(OCAML_CLIBS) brlapi.cmo - $(OCAMLC) -a $(OCAMLMKLIB_FLAGS) -o $(OCAML_LIB).cma brlapi.cmo - - $(OCAML_NCLIB) : $(OCAML_CLIBS) brlapi.cmx -- $(OCAMLMKLIB) $(OCAMLMKLIBOPT_FLAGS) -o $(OCAML_LIB) brlapi.cmx -+ $(OCAMLMKLIB) -ldopt "$(LDFLAGS)" $(OCAMLMKLIBOPT_FLAGS) -o $(OCAML_LIB) brlapi.cmx - - brlapi.cmi: brlapi.mli - $(OCAMLC) -o $@ -c brlapi.mli diff --git a/app-accessibility/brltty/files/brltty-5.2-respect-AR.patch b/app-accessibility/brltty/files/brltty-5.2-respect-AR.patch deleted file mode 100644 index c5698a2b9399..000000000000 --- a/app-accessibility/brltty/files/brltty-5.2-respect-AR.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/Programs/Makefile.in -+++ b/Programs/Makefile.in -@@ -434,7 +434,7 @@ - [ ! -f lib.def ] || mv lib.def $(API_DEF) - - $(API_ARC): $(API_CLIENT_OBJECTS) -- ar rc $@ $(API_CLIENT_OBJECTS) -+ $(AR) rc $@ $(API_CLIENT_OBJECTS) - $(RANLIB) $@ - - brlapi_client.$O: diff --git a/app-accessibility/brltty/files/brltty-5.2-sysmacros.patch b/app-accessibility/brltty/files/brltty-5.2-sysmacros.patch deleted file mode 100644 index f33e46a1890c..000000000000 --- a/app-accessibility/brltty/files/brltty-5.2-sysmacros.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/Programs/system_linux.c -+++ b/Programs/system_linux.c -@@ -24,6 +24,7 @@ - #include <fcntl.h> - #include <sys/ioctl.h> - #include <sys/stat.h> -+#include <sys/sysmacros.h> - - #include "log.h" - #include "file.h" ---- a/Programs/brlapi_client.c -+++ b/Programs/brlapi_client.c -@@ -73,6 +73,7 @@ - #include <linux/tty.h> - #include <linux/vt.h> - #define MAXIMUM_VIRTUAL_CONSOLE MAX_NR_CONSOLES -+#include <sys/sysmacros.h> - #endif /* linux */ - - #ifdef __OpenBSD__ diff --git a/app-accessibility/brltty/files/brltty-5.2-udev.patch b/app-accessibility/brltty/files/brltty-5.2-udev.patch deleted file mode 100644 index e6d56603b013..000000000000 --- a/app-accessibility/brltty/files/brltty-5.2-udev.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- a/Autostart/Udev/udev.rules -+++ b/Autostart/Udev/udev.rules -@@ -182,20 +182,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 deleted file mode 100644 index 0bc6c6c5375b..000000000000 --- a/app-accessibility/brltty/files/brltty.rc +++ /dev/null @@ -1,12 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -command=/bin/brltty -pidfile=/var/run/brltty.pid -command_args="-P $pidfile -q" - -depend() { - before * - after clock -} diff --git a/app-accessibility/brltty/files/brltty.tmpfiles.conf b/app-accessibility/brltty/files/brltty.tmpfiles.conf deleted file mode 100644 index 18cc4021e33b..000000000000 --- a/app-accessibility/brltty/files/brltty.tmpfiles.conf +++ /dev/null @@ -1 +0,0 @@ -d /run/brltty 0755 root root - diff --git a/app-accessibility/brltty/metadata.xml b/app-accessibility/brltty/metadata.xml deleted file mode 100644 index 53e30d6595d9..000000000000 --- a/app-accessibility/brltty/metadata.xml +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<maintainer type="project"> - <email>accessibility@gentoo.org</email> - <name>Gentoo Accessibility Project</name> - </maintainer> - <use> - <flag name="api">build brltty's application program interface</flag> - <flag name="beeper">support the console tone generator</flag> - <flag name="contracted-braille">support in-line contracted braille</flag> - <flag name="fm">support for the sound card synthesizer</flag> - <flag name="midi">support the musical instrument digital interface</flag> - <flag name="pcm">support for sound card digital audio</flag> - <flag name="speech">speech support</flag> -</use> -<longdescription lang="en"> -BRLTTY is a background process (daemon) which provides access to the Linux/Unix -console (when in text mode) for a blind person using a refreshable braille -display. It drives the braille display, and provides complete screen review -functionality. Some speech capability has also been incorporated. -</longdescription> -<longdescription lang="ja"> -BRLTTYは、盲人用ブライユ点字ディスプレイのためのLinux/Unixコンソールを制御するバ -ックグラウンド・プロセス(デーモン)です。ブライユ点字ディスプレイを動かし、その多 -機能な完全なスクリーン・レビューを提供します。幾つかの台詞読み上げ機能も統合され -ています。 -</longdescription> -</pkgmetadata> |