apply patch from upstream to fix the "svnversion: command not found"

error. This closes bug #361327.

Package-Manager: portage-2.2.0_alpha29/cvs/Linux i686

4 files changed, 41 insertions, 7 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/Manifest b/app-accessibility/brltty/Manifest
index 283a0d2db74c..dea423b7f176 100644
--- a/app-accessibility/brltty/Manifest
+++ b/app-accessibility/brltty/Manifest
@@ -3,18 +3,19 @@ Hash: SHA1
 
 AUX brltty-4.2-fix-ldflags.patch 2404 RMD160 64b5d89e0aab2c90895f055d54410b8081097473 SHA1 8afc9434f125a1665e7ea5388a911750274dc927 SHA256 5ebc7140937b3f2e43a8c7cd20a8ca5269d2874e150fcb65336d42b8f92e369b
 AUX brltty-4.2-fix-ocaml-install.patch 842 RMD160 72835d59022dc0fb2e865d7dab21a8b8f6427e40 SHA1 598e78ca4573eb75c4a8092afde12bf6494efb65 SHA256 4b9e48655afb62b758f72e49bc05ad6feb3ea0839bbac7ef5b4757b116f1b284
+AUX brltty-4.2-fix-svnversion.patch 918 RMD160 02a655d945d137ae81e72b4f988f8885d7c7a296 SHA1 42244c20a9678306b7cc060142a7b2ad0b02f374 SHA256 7ea5ba1d7521bc2382629c023dc862acd6b2a9ed1c059274cbcd218a4aa8a9fa
 AUX brltty-4.2-glibc-212.patch 287 RMD160 7d12d6e7b0311d9e205b5619d08cf27095322828 SHA1 c3ad4b457acad0808b8aa68ad1a05ad6f8a9247f SHA256 6fb14f246788b6668b0442201144a31dcae003f5e70185e643e14e3f01ce1516
 AUX brltty.rc 530 RMD160 60f5f91fbdba71954685330b9e2c4db1e2c1090f SHA1 5e4ddda21ef8d3eb04199f262006a589e8d08c2f SHA256 c6899cab19f94feb83030c9df4541a025891869d72009bac944b3cd3535a24c2
 DIST brltty-4.1.tar.gz 2169303 RMD160 a46c0e42dd3504b6b3ef24309042d2915dee770a SHA1 3e81746cb1e455ca5116d11fcce1e158371146df SHA256 29d0bd271ed3b8ec92c378bdf90489936c26d375515aa326f74bd515dfcb36a4
 DIST brltty-4.2.tar.gz 2234191 RMD160 f099f92c8e44f1cedf20a70e8b874796bae9daab SHA1 d25802d08599b75841e7bb2f29bc88737f2992d2 SHA256 fc2b1a96255afc26ac43cadd3f730fabb73d0b1d991ffefd4c2214c5e20a8aa2
 EBUILD brltty-4.1.ebuild 3594 RMD160 0e6b376b8d516c81478fe75c42cb922b9e6caad2 SHA1 6cd75f7ca050e3edca3a39b224cc0a7d226b0862 SHA256 8a4798cd09531abf24a8ff2677e9b9a94338c1ab297a839bf2b53f468f8500f9
-EBUILD brltty-4.2.ebuild 4092 RMD160 1c0e9784caae7adc9675351ab5282fc71d8fa551 SHA1 e8c4cd89ab0f3474dfbd3b109eef76bb441fb7f2 SHA256 b17be6a168f5d4398f0184c00c80f90a82c5cffe7acd299dc5041b02636d7657
-MISC ChangeLog 14151 RMD160 e24e90869312e96d81855ff2b462a1e829835854 SHA1 a12ca6dab179073cd1e6cb090593925dd243ac8b SHA256 2f9de6e5cd3c08a22cad02d09c08ad8360ce0310ea44aebd6101e51f55b04158
+EBUILD brltty-4.2.ebuild 4140 RMD160 9165367e85c698598f611e1ba1465fbebcb76b74 SHA1 e38db5c0707231a12af1a94cc69792b22240ffde SHA256 a9d4de4d16d5e11910cf5e6a21d358c806139bb11aeee4e9318ef9c35e2917d3
+MISC ChangeLog 14369 RMD160 25c2377f400e5d6e921d910c7d0d2ea9057530b3 SHA1 2e59d662d6c4a0b19299f67ccddab15e308d6122 SHA256 1a61fa33f12d196e8613c6f16b2138596b7bd0c12504578d8658f178f154325e
 MISC metadata.xml 1982 RMD160 3d40e297c89d9229fc36ec438b768f4332758e83 SHA1 5dff738da647498e9db6429d7b83aee9bd580a44 SHA256 7ac0165ae761e7474b97c5c89c798dcb7a7f365db1f06f52085dfee70a915e43
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk2VDvIACgkQblQW9DDEZThVhwCglHpblv4o7dNsknf63tvn1mjt
-NKAAnA5oi7XVEzI7LmgGO7IoJydjqdwc
-=uUnA
+iEYEARECAAYFAk2WGx4ACgkQblQW9DDEZTjj8wCfRv8BKkd90ErpkHgo3nATK++c
+WxsAn0ykPa30vL3svN5WojnB3p+QBulk
+=557P
 -----END PGP SIGNATURE-----
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