diff options
Diffstat (limited to 'app-accessibility')
8 files changed, 8 insertions, 428 deletions
diff --git a/app-accessibility/brltty/ChangeLog b/app-accessibility/brltty/ChangeLog index 24b863ca0289..8f05ce39e5d7 100644 --- a/app-accessibility/brltty/ChangeLog +++ b/app-accessibility/brltty/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for app-accessibility/brltty # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-accessibility/brltty/ChangeLog,v 1.147 2014/02/22 19:52:12 teiresias Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-accessibility/brltty/ChangeLog,v 1.148 2014/02/22 20:04:25 teiresias Exp $ + + 22 Feb 2014; Christopher Brannon <teiresias@gentoo.org> -brltty-4.2.ebuild, + -brltty-4.2-r1.ebuild, -files/brltty-4.2-fix-a2.patch, + -files/brltty-4.2-fix-ldflags.patch, + -files/brltty-4.2-fix-ocaml-install.patch, + -files/brltty-4.2-fix-svnversion.patch, -files/brltty-4.2-glibc-212.patch: + Remove old versions. *brltty-5.0-r2 (22 Feb 2014) diff --git a/app-accessibility/brltty/brltty-4.2-r1.ebuild b/app-accessibility/brltty/brltty-4.2-r1.ebuild deleted file mode 100644 index 1432fb8a60a6..000000000000 --- a/app-accessibility/brltty/brltty-4.2-r1.ebuild +++ /dev/null @@ -1,146 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-accessibility/brltty/brltty-4.2-r1.ebuild,v 1.4 2013/06/18 16:51:25 vapier Exp $ - -EAPI="4" -FINDLIB_USE="ocaml" - -inherit findlib eutils multilib toolchain-funcs java-pkg-opt-2 flag-o-matic \ - autotools udev - -DESCRIPTION="Daemon that provides access to the Linux/Unix console for a blind person" -HOMEPAGE="http://mielke.cc/brltty/" -SRC_URI="http://mielke.cc/brltty/releases/${P}.tar.gz" - -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 +learn-mode +midi nls ocaml +pcm python usb +speech - tcl X" -REQUIRED_USE="doc? ( api ) - java? ( api ) - ocaml? ( api ) - python? ( api ) - tcl? ( api )" - -COMMON_DEP="bluetooth? ( net-wireless/bluez ) - gpm? ( >=sys-libs/gpm-1.20 ) - iconv? ( virtual/libiconv ) - icu? ( dev-libs/icu ) - nls? ( virtual/libintl ) - python? ( >=dev-python/pyrex-0.9.4.1 ) - tcl? ( >=dev-lang/tcl-8.4.15 ) - usb? ( virtual/libusb:0 ) - X? ( x11-libs/libXaw )" -DEPEND="virtual/pkgconfig - java? ( >=virtual/jdk-1.4 ) - ${COMMON_DEP}" -RDEPEND="java? ( >=virtual/jre-1.4 ) - ${COMMON_DEP}" - -src_prepare() { - epatch "${FILESDIR}"/${P}-fix-a2.patch - epatch "${FILESDIR}"/${P}-fix-ldflags.patch - epatch "${FILESDIR}"/${P}-fix-ocaml-install.patch - epatch "${FILESDIR}"/${P}-fix-svnversion.patch - epatch "${FILESDIR}"/${P}-glibc-212.patch - - 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 -} - -src_configure() { - # 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. - econf \ - --prefix=/ \ - --includedir=/usr/include \ - --localstatedir=/var \ - --disable-stripping \ - --with-install-root="${D}" \ - $(use_enable api) \ - $(use_enable beeper beeper-support) \ - $(use_enable contracted-braille) \ - $(use_enable fm fm-support) \ - $(use_enable gpm) \ - $(use_enable iconv) \ - $(use_enable icu) \ - $(use_enable java java-bindings) \ - $(use_enable learn-mode) \ - $(use_enable midi midi-support) \ - $(use_enable nls i18n) \ - $(use_enable ocaml caml-bindings) \ - $(use_enable pcm pcm-support) \ - $(use_enable python python-bindings) \ - $(use_enable speech speech-support) \ - $(use_enable tcl tcl-bindings) \ - $(use_enable X x) \ - $(use_with bluetooth bluetooth-package) \ - $(use_with usb usb-package) -} - -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 - - # workaround for parallel build failure, bug #340903. - emake -j1 JAVA_JNI_FLAGS="${OUR_JNI_FLAGS}" JAVAC="${JAVAC_CONF}" -} - -src_install() { - if use ocaml; then - findlib_src_preinst - fi - - emake OCAML_LDCONF= install - - 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 Hotplug/udev.rules 70-brltty.rules - newinitd "${FILESDIR}"/brltty.rc brltty - - libdir="$(get_libdir)" - mkdir -p "${D}"/usr/${libdir}/ - mv "${D}"/${libdir}/*.a "${D}"/usr/${libdir}/ - gen_usr_ldscript libbrlapi.so - - cd Documents - mv Manual-BRLTTY/English/BRLTTY.txt BRLTTY-en.txt - mv Manual-BRLTTY/French/BRLTTY.txt BRLTTY-fr.txt - mv Manual-BrlAPI/English/BrlAPI.txt BrlAPI-en.txt - dodoc CONTRIBUTORS ChangeLog HISTORY README* TODO BRLTTY-*.txt - dohtml -r Manual-BRLTTY - if use doc; then - dohtml -r Manual-BrlAPI - dodoc BrlAPI-*.txt - fi -} - -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-4.2.ebuild b/app-accessibility/brltty/brltty-4.2.ebuild deleted file mode 100644 index b3252f949b0d..000000000000 --- a/app-accessibility/brltty/brltty-4.2.ebuild +++ /dev/null @@ -1,145 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-accessibility/brltty/brltty-4.2.ebuild,v 1.17 2012/12/11 14:46:38 ssuominen Exp $ - -EAPI="4" -FINDLIB_USE="ocaml" - -inherit findlib eutils multilib toolchain-funcs java-pkg-opt-2 flag-o-matic \ - autotools udev - -DESCRIPTION="Daemon that provides access to the Linux/Unix console for a blind person" -HOMEPAGE="http://mielke.cc/brltty/" -SRC_URI="http://mielke.cc/brltty/releases/${P}.tar.gz" - -LICENSE="GPL-2 LGPL-2.1" -SLOT="0" -KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 x86" -IUSE="+api +beeper bluetooth +contracted-braille doc +fm gpm iconv icu - java +learn-mode +midi nls ocaml +pcm python usb +speech - tcl X" -REQUIRED_USE="doc? ( api ) - java? ( api ) - ocaml? ( api ) - python? ( api ) - tcl? ( api )" - -COMMON_DEP="bluetooth? ( net-wireless/bluez ) - gpm? ( >=sys-libs/gpm-1.20 ) - iconv? ( virtual/libiconv ) - icu? ( dev-libs/icu ) - nls? ( virtual/libintl ) - python? ( >=dev-python/pyrex-0.9.4.1 ) - tcl? ( >=dev-lang/tcl-8.4.15 ) - usb? ( virtual/libusb:0 ) - X? ( x11-libs/libXaw )" -DEPEND="java? ( >=virtual/jdk-1.4 ) - ${COMMON_DEP}" -RDEPEND="java? ( >=virtual/jre-1.4 ) - ${COMMON_DEP}" - -src_prepare() { - epatch "${FILESDIR}"/${P}-fix-a2.patch - epatch "${FILESDIR}"/${P}-fix-ldflags.patch - epatch "${FILESDIR}"/${P}-fix-ocaml-install.patch - epatch "${FILESDIR}"/${P}-fix-svnversion.patch - epatch "${FILESDIR}"/${P}-glibc-212.patch - - 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 -} - -src_configure() { - # 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. - econf \ - --prefix=/ \ - --includedir=/usr/include \ - --localstatedir=/var \ - --disable-stripping \ - --with-install-root="${D}" \ - $(use_enable api) \ - $(use_enable beeper beeper-support) \ - $(use_enable contracted-braille) \ - $(use_enable fm fm-support) \ - $(use_enable gpm) \ - $(use_enable iconv) \ - $(use_enable icu) \ - $(use_enable java java-bindings) \ - $(use_enable learn-mode) \ - $(use_enable midi midi-support) \ - $(use_enable nls i18n) \ - $(use_enable ocaml caml-bindings) \ - $(use_enable pcm pcm-support) \ - $(use_enable python python-bindings) \ - $(use_enable speech speech-support) \ - $(use_enable tcl tcl-bindings) \ - $(use_enable X x) \ - $(use_with bluetooth bluetooth-package) \ - $(use_with usb usb-package) -} - -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 - - # workaround for parallel build failure, bug #340903. - emake -j1 JAVA_JNI_FLAGS="${OUR_JNI_FLAGS}" JAVAC="${JAVAC_CONF}" -} - -src_install() { - if use ocaml; then - findlib_src_preinst - fi - - emake OCAML_LDCONF= install - - 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 Hotplug/udev.rules 70-brltty.rules - newinitd "${FILESDIR}"/brltty.rc brltty - - libdir="$(get_libdir)" - mkdir -p "${D}"/usr/${libdir}/ - mv "${D}"/${libdir}/*.a "${D}"/usr/${libdir}/ - gen_usr_ldscript libbrlapi.so - - cd Documents - mv Manual-BRLTTY/English/BRLTTY.txt BRLTTY-en.txt - mv Manual-BRLTTY/French/BRLTTY.txt BRLTTY-fr.txt - mv Manual-BrlAPI/English/BrlAPI.txt BrlAPI-en.txt - dodoc CONTRIBUTORS ChangeLog HISTORY README* TODO BRLTTY-*.txt - dohtml -r Manual-BRLTTY - if use doc; then - dohtml -r Manual-BrlAPI - dodoc BrlAPI-*.txt - fi -} - -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-4.2-fix-a2.patch b/app-accessibility/brltty/files/brltty-4.2-fix-a2.patch deleted file mode 100644 index 55510523c7aa..000000000000 --- a/app-accessibility/brltty/files/brltty-4.2-fix-a2.patch +++ /dev/null @@ -1,15 +0,0 @@ -Index: configure.ac -=================================================================== ---- configure.ac (revision 5483) -+++ configure.ac (working copy) -@@ -1455,7 +1455,9 @@ - ]) - - BRLTTY_HAVE_PACKAGE([dbus], ["dbus-1 >= 1.0"], [dnl -- BRLTTY_SCREEN_DRIVER([a2], [AtSpi2], [$(DBUS_LIBS)]) -+ AC_CHECK_HEADERS([X11/keysym.h], [dnl -+ BRLTTY_SCREEN_DRIVER([a2], [AtSpi2], [$(DBUS_LIBS)]) -+ ]) - ]) - - BRLTTY_ARG_DRIVER([screen], [Screen]) diff --git a/app-accessibility/brltty/files/brltty-4.2-fix-ldflags.patch b/app-accessibility/brltty/files/brltty-4.2-fix-ldflags.patch deleted file mode 100644 index c3b73ca14aed..000000000000 --- a/app-accessibility/brltty/files/brltty-4.2-fix-ldflags.patch +++ /dev/null @@ -1,60 +0,0 @@ -Index: configure.ac -=================================================================== ---- configure.ac (revision 5474) -+++ configure.ac (working copy) -@@ -377,7 +377,7 @@ - case "${host_os}" - in - linux*|gnu*|openbsd*|freebsd*|kfreebsd*|netbsd*|*qnx*|cygwin*|mingw*|eabi*) -- 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*|eabi*) -- 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]) -Index: Bindings/Caml/Makefile.in -=================================================================== ---- Bindings/Caml/Makefile.in (revision 5474) -+++ Bindings/Caml/Makefile.in (working copy) -@@ -55,13 +55,13 @@ - all : $(OCAML_FILES) - - $(OCAML_CLIBS) : brlapi_stubs.$O -- $(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-4.2-fix-ocaml-install.patch b/app-accessibility/brltty/files/brltty-4.2-fix-ocaml-install.patch deleted file mode 100644 index 24d7b012d03a..000000000000 --- a/app-accessibility/brltty/files/brltty-4.2-fix-ocaml-install.patch +++ /dev/null @@ -1,21 +0,0 @@ -Index: Bindings/Caml/Makefile.in -=================================================================== ---- Bindings/Caml/Makefile.in (revision 5474) -+++ Bindings/Caml/Makefile.in (working copy) -@@ -31,6 +31,7 @@ - OCAMLFIND = @OCAMLFIND@ - OCAML_INSTALL_TARGET = @OCAML_INSTALL_TARGET@ - OCAML_UNINSTALL_TARGET = @OCAML_UNINSTALL_TARGET@ -+OCAML_LDCONF = -ldconf "$(OCAML_DESTDIR)/ld.conf" - - OCAML_LIB = $(API_NAME) - OCAML_BCLIB = $(OCAML_LIB).cma -@@ -102,7 +103,7 @@ - install-with-findlib: - $(INSTALL_DIRECTORY) $(OCAML_DESTDIR) - $(OCAMLFIND) remove -destdir "$(OCAML_DESTDIR)" $(OCAML_LIB) -- $(OCAMLFIND) install -destdir "$(OCAML_DESTDIR)" -ldconf "$(OCAML_DESTDIR)/ld.conf" $(OCAML_LIB) $(OCAML_FILES) -+ $(OCAMLFIND) install -destdir "$(OCAML_DESTDIR)" $(OCAML_LDCONF) $(OCAML_LIB) $(OCAML_FILES) - - uninstall: $(OCAML_UNINSTALL_TARGET) - diff --git a/app-accessibility/brltty/files/brltty-4.2-fix-svnversion.patch b/app-accessibility/brltty/files/brltty-4.2-fix-svnversion.patch deleted file mode 100644 index d4db66bcb440..000000000000 --- a/app-accessibility/brltty/files/brltty-4.2-fix-svnversion.patch +++ /dev/null @@ -1,27 +0,0 @@ -Index: revision -=================================================================== ---- revision (revision 5475) -+++ revision (working copy) -@@ -18,15 +18,17 @@ - ############################################################################### - - . "`dirname "${0}"`/prologue.sh" -+set -e - --[ "${#}" -eq 0 ] && syntaxError "missing source root." -+[ "${#}" -gt 0 ] || syntaxError "missing source root" - sourceRoot="${1}" - shift - --[ "${#}" -eq 0 ] || syntaxError "too many parameters." -+[ "${#}" -eq 0 ] || syntaxError "too many parameters" - --set -e --revision="`svnversion -n "${sourceRoot}"`" -+revision="`svnversion -n "${sourceRoot}" 2>/dev/null`" || semanticError "build revision cannot be determined - subversion not installed" - [ "${revision}" != "exported" ] || revision="" --[ -z "${revision}" ] || echo "${revision}" -+[ -n "${revision}" ] || semanticError "build revision not known" -+ -+echo "${revision}" - exit 0 diff --git a/app-accessibility/brltty/files/brltty-4.2-glibc-212.patch b/app-accessibility/brltty/files/brltty-4.2-glibc-212.patch deleted file mode 100644 index 20e472d305e0..000000000000 --- a/app-accessibility/brltty/files/brltty-4.2-glibc-212.patch +++ /dev/null @@ -1,13 +0,0 @@ -http://bugs.gentoo.org/339846 - ---- Programs/sys_linux.c -+++ Programs/sys_linux.c -@@ -22,6 +22,8 @@ - #include <string.h> - #include <errno.h> - #include <fcntl.h> -+#include <sys/types.h> /* sys/stat.h */ -+#include <sys/stat.h> /* S_ISCHR */ - #include <sys/ioctl.h> - #include <linux/kd.h> - |