summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app-accessibility')
-rw-r--r--app-accessibility/brltty/ChangeLog7
-rw-r--r--app-accessibility/brltty/brltty-4.2.ebuild3
-rw-r--r--app-accessibility/brltty/files/brltty-4.2-fix-svnversion.patch27
3 files changed, 35 insertions, 2 deletions
diff --git a/app-accessibility/brltty/ChangeLog b/app-accessibility/brltty/ChangeLog
index 20298bf3ddf8..e4163166a442 100644
--- a/app-accessibility/brltty/ChangeLog
+++ b/app-accessibility/brltty/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for app-accessibility/brltty
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/brltty/ChangeLog,v 1.115 2011/03/31 23:31:41 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/brltty/ChangeLog,v 1.116 2011/04/01 18:35:57 williamh Exp $
+
+ 01 Apr 2011; William Hubbs <williamh@gentoo.org> brltty-4.2.ebuild,
+ +files/brltty-4.2-fix-svnversion.patch:
+ apply patch from upstream to fix the "svnversion: command not found"
+ error. This closes bug #361327.
31 Mar 2011; William Hubbs <williamh@gentoo.org> brltty-4.2.ebuild:
x86 stable wrt #358503.
diff --git a/app-accessibility/brltty/brltty-4.2.ebuild b/app-accessibility/brltty/brltty-4.2.ebuild
index 644acc88c489..45e26beabc1b 100644
--- a/app-accessibility/brltty/brltty-4.2.ebuild
+++ b/app-accessibility/brltty/brltty-4.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 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.10 2011/03/31 23:31:41 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/brltty/brltty-4.2.ebuild,v 1.11 2011/04/01 18:35:57 williamh Exp $
EAPI="4"
FINDLIB_USE="ocaml"
@@ -41,6 +41,7 @@ RDEPEND="java? ( >=virtual/jre-1.4 )
src_prepare() {
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
diff --git a/app-accessibility/brltty/files/brltty-4.2-fix-svnversion.patch b/app-accessibility/brltty/files/brltty-4.2-fix-svnversion.patch
new file mode 100644
index 000000000000..d4db66bcb440
--- /dev/null
+++ b/app-accessibility/brltty/files/brltty-4.2-fix-svnversion.patch
@@ -0,0 +1,27 @@
+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