summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Huddleston <eradicator@gentoo.org>2005-07-20 21:59:59 +0000
committerJeremy Huddleston <eradicator@gentoo.org>2005-07-20 21:59:59 +0000
commitec3d9c48533761c94fab354da6e93b5f527b60e0 (patch)
treef4cfe6d8156cadb0443e0b065924e122e56f76af /app-accessibility/SphinxTrain
parentNew revision, including a patch for bug #91617 (no lazy bindings for a setgid... (diff)
downloadhistorical-ec3d9c48533761c94fab354da6e93b5f527b60e0.tar.gz
historical-ec3d9c48533761c94fab354da6e93b5f527b60e0.tar.bz2
historical-ec3d9c48533761c94fab354da6e93b5f527b60e0.zip
gcc-3.4 and installation fix thanks to laughingplant <hsggebhardt@ucdavis.edu> in bug #73586.
Package-Manager: portage-2.0.51.22-r2
Diffstat (limited to 'app-accessibility/SphinxTrain')
-rw-r--r--app-accessibility/SphinxTrain/ChangeLog7
-rw-r--r--app-accessibility/SphinxTrain/Manifest15
-rw-r--r--app-accessibility/SphinxTrain/SphinxTrain-0.9.1-r1.ebuild7
-rw-r--r--app-accessibility/SphinxTrain/files/gcc34.patch11
4 files changed, 35 insertions, 5 deletions
diff --git a/app-accessibility/SphinxTrain/ChangeLog b/app-accessibility/SphinxTrain/ChangeLog
index fdbcd2b896a8..51b501e4641f 100644
--- a/app-accessibility/SphinxTrain/ChangeLog
+++ b/app-accessibility/SphinxTrain/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for app-accessibility/SphinxTrain
# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/SphinxTrain/ChangeLog,v 1.7 2005/01/01 10:53:20 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/SphinxTrain/ChangeLog,v 1.8 2005/07/20 21:59:59 eradicator Exp $
+
+ 20 Jul 2005; Jeremy Huddleston <eradicator@gentoo.org> +files/gcc34.patch,
+ SphinxTrain-0.9.1-r1.ebuild:
+ gcc-3.4 and installation fix thanks to laughingplant
+ <hsggebhardt@ucdavis.edu> in bug #73586.
05 Oct 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
SphinxTrain-0.9.1-r1.ebuild:
diff --git a/app-accessibility/SphinxTrain/Manifest b/app-accessibility/SphinxTrain/Manifest
index 7a5b2c50f400..b6620314e7ac 100644
--- a/app-accessibility/SphinxTrain/Manifest
+++ b/app-accessibility/SphinxTrain/Manifest
@@ -1,5 +1,16 @@
-MD5 081f1df902e72212babbf6ff1c39ddc1 ChangeLog 1620
-MD5 1a4842b9589cce9c1750e7933cee02b6 SphinxTrain-0.9.1-r1.ebuild 881
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 34ccb5d0fad678901de3fb55668a7cd4 ChangeLog 1827
+MD5 c10264921e030d1878c19b378c63f190 SphinxTrain-0.9.1-r1.ebuild 1005
MD5 4f5d797c455932135181f0c31b5e71b2 metadata.xml 185
MD5 7ee585b5d5453d603e510f969b876524 files/digest-SphinxTrain-0.9.1-r1 74
MD5 993e38eaa81b891528bd3447e4d92a90 files/gcc.patch 816
+MD5 ec84597032aebb4fcfceb47872a5134d files/gcc34.patch 333
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFC3snFArHZZzCEUG0RAlA8AJ97/rG2TPIARHYC23yZrhfT+WdokQCfbNK+
+S064fbi/B/58KnJFXtSC5sk=
+=EzCA
+-----END PGP SIGNATURE-----
diff --git a/app-accessibility/SphinxTrain/SphinxTrain-0.9.1-r1.ebuild b/app-accessibility/SphinxTrain/SphinxTrain-0.9.1-r1.ebuild
index be170925dcc7..d8dfce734d80 100644
--- a/app-accessibility/SphinxTrain/SphinxTrain-0.9.1-r1.ebuild
+++ b/app-accessibility/SphinxTrain/SphinxTrain-0.9.1-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/SphinxTrain/SphinxTrain-0.9.1-r1.ebuild,v 1.7 2005/01/01 10:53:20 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/SphinxTrain/SphinxTrain-0.9.1-r1.ebuild,v 1.8 2005/07/20 21:59:59 eradicator Exp $
inherit eutils
@@ -23,10 +23,13 @@ src_unpack() {
unpack ${A}
cd ${S}
epatch ${FILESDIR}/gcc.patch
+ epatch ${FILESDIR}/gcc34.patch
}
src_install() {
- dobin bin.*/* || die
+ # dobin bin.*/* fails ... see bug #73586
+ find bin.* -mindepth 1 -maxdepth 1 -type f -exec dobin '{}' \; || die
+
dodoc README etc/*cfg
dohtml doc/*[txt html sgml]
}
diff --git a/app-accessibility/SphinxTrain/files/gcc34.patch b/app-accessibility/SphinxTrain/files/gcc34.patch
new file mode 100644
index 000000000000..124aa993edc9
--- /dev/null
+++ b/app-accessibility/SphinxTrain/files/gcc34.patch
@@ -0,0 +1,11 @@
+--- SphinxTrain/src/programs/count_3phone/phone_word_io.c~ 2001-04-05 16:00:33.000000000 -0400
++++ SphinxTrain/src/programs/count_3phone/phone_word_io.c 2005-05-01 12:48:42.000000000 -0400
+@@ -71,7 +71,7 @@
+ #ifdef __alpha
+ void *malloc();
+ #else
+-char *malloc();
++//char *malloc();
+ #endif
+
+ extern int Num_Phones, Num_Words;