Version bump. Closes bug #344991

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

4 files changed, 126 insertions, 3 deletions

diff --git a/app-accessibility/sphinx3/ChangeLog b/app-accessibility/sphinx3/ChangeLog
index 20a824c5ea09..62090c55be5a 100644
--- a/app-accessibility/sphinx3/ChangeLog
+++ b/app-accessibility/sphinx3/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-accessibility/sphinx3
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/sphinx3/ChangeLog,v 1.4 2009/04/01 18:05:03 williamh Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/sphinx3/ChangeLog,v 1.5 2011/11/17 17:45:56 neurogeek Exp $
+
+*sphinx3-0.8 (17 Nov 2011)
+
+  17 Nov 2011; Jesus Rivero <neurogeek@gentoo.org> +sphinx3-0.8.ebuild,
+  +files/sphinx3-0.8_heap_fix.patch:
+  Version bump. Closes bug #344991
 
   01 Apr 2009; William Hubbs <williamh@gentoo.org> sphinx3-0.6.3.ebuild:
   Stable on x86.
diff --git a/app-accessibility/sphinx3/Manifest b/app-accessibility/sphinx3/Manifest
index 89be55902130..562861395f24 100644
--- a/app-accessibility/sphinx3/Manifest
+++ b/app-accessibility/sphinx3/Manifest
@@ -1,4 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX sphinx3-0.8_heap_fix.patch 1475 RMD160 70b2916d44ab9d481b1580bffd08a51aa38ca4da SHA1 b48aa0ee8d13cb8bcf027d1581055aa5ee3e3863 SHA256 ade4d1bf57eeb4a182d917bf33ada2e9f681df0743a68fa7c8b592d850468b8f
 DIST sphinx3-0.6.3.tar.gz 26070353 RMD160 0d3e44af97fe24dbcca30a853ebc6d751c576fc6 SHA1 53e1d4106bf6cb50378618a7afe97b47c19afadc SHA256 f6a070a67d91ccd00dbce7b6cc55242ed7a5ebaae6d6429eb0364657c4056ede
+DIST sphinx3-0.8.tar.gz 25226326 RMD160 63696e35838f07a6b6e2490d48ad59bd24037b83 SHA1 631220266c7619c411659d1a1a571c3f868b6994 SHA256 1cf76a086f9b509e35f7226df2e61b0a0bf8b0858b9676e5b18cfc47b2ea2741
 EBUILD sphinx3-0.6.3.ebuild 600 RMD160 82c6ec47031d842081d55e9e33129df22f347ca6 SHA1 c29209eb882ed6cf63b4d6452a2a2cab228ddf16 SHA256 405c35abfe345079a721b225dd15534190e25cd1f16f3549a6a59ebdb619bb2c
-MISC ChangeLog 765 RMD160 8cef4eb11dced63d94a655834c2255664d83a8d6 SHA1 d2dcc82cd056e06be6e1060944a7338315e72b1d SHA256 50101705fe7a3b7936ea882a00f67907db3895b0b9c83158aa8ddc64291cbd92
+EBUILD sphinx3-0.8.ebuild 1392 RMD160 8ace4e3cc4b32c4a3ec2f6a53220785bbebea5e1 SHA1 7979c581c8fe448e0821b462729c36e26ddf738f SHA256 3ab67768d363746405c6ffee7c55b1524f10daed43b3e37c6a1e819c31a72734
+MISC ChangeLog 939 RMD160 305472ecb014f12c56fed520e077e4383f7395c8 SHA1 056c10c96bf26d54ab8bc69dc1653fdbf6904adb SHA256 9172889be1ceff8ef35d731d5758116648f72a18197f851bfe33e7ca160ecc48
 MISC metadata.xml 166 RMD160 61b5c672638182ae90aa0987021012f9bcac0c85 SHA1 03f155d94dfd6ed8455a0de382ae1956c3ec1692 SHA256 b405a4d46651e139c00ec6b19acf7bb3cd23456275250b6de43951b7559a0b21
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAk7FSIsACgkQdIssYB9vBoMh4QCdGGwK6mfULflE6X6w0dZecrxM
+zbUAnAnHuq+ArNmwcHllbFUvrXft+gYr
+=6CmN
+-----END PGP SIGNATURE-----
diff --git a/app-accessibility/sphinx3/files/sphinx3-0.8_heap_fix.patch b/app-accessibility/sphinx3/files/sphinx3-0.8_heap_fix.patch
new file mode 100644
index 000000000000..b7b71d974413
--- /dev/null
+++ b/app-accessibility/sphinx3/files/sphinx3-0.8_heap_fix.patch
@@ -0,0 +1,34 @@
+diff -uNr sphinx3-0.8.orig/python/setup.py sphinx3-0.8/python/setup.py
+--- sphinx3-0.8.orig/python/setup.py	2008-12-31 23:20:08.000000000 -0500
++++ sphinx3-0.8/python/setup.py	2011-11-17 09:46:57.000000000 -0500
+@@ -8,15 +8,10 @@
+     define_macros = []
+ 
+ module = Extension('_sphinx3',
+-                   include_dirs = ['../../sphinxbase/include',
+-                                   '../include',
+-                                   '/usr/local/include/sphinxbase/',
+-                                   '/usr/local/include/sphinx3',
+-                                   ],
++                   include_dirs = ['../include',
++                                   '@GENTOO_PORTAGE_EPREFIX@/usr/include/sphinxbase'],
+ 		   define_macros = define_macros,
+-		   library_dirs = ['../../sphinxbase/src/libsphinxbase/.libs',
+-				'../src/libs3decoder/.libs',
+-				'../../sphinxbase/lib/debug',
++		   library_dirs = ['../src/libs3decoder/.libs',
+ 				'../lib/debug',
+ 				],
+                    libraries = ['sphinxbase', 's3decoder'],
+diff -uNr sphinx3-0.8.orig/src/libs3decoder/libsearch/vithist.c sphinx3-0.8/src/libs3decoder/libsearch/vithist.c
+--- sphinx3-0.8.orig/src/libs3decoder/libsearch/vithist.c	2008-12-31 13:27:56.000000000 -0500
++++ sphinx3-0.8/src/libs3decoder/libsearch/vithist.c	2011-11-17 09:46:24.000000000 -0500
+@@ -647,7 +647,7 @@
+ {
+     int32 se, fe, filler_done, th;
+     vithist_entry_t *ve;
+-    heap_t h;
++    heap_t *h;
+     s3wid_t *wid;
+     int32 i;
+ 
diff --git a/app-accessibility/sphinx3/sphinx3-0.8.ebuild b/app-accessibility/sphinx3/sphinx3-0.8.ebuild
new file mode 100644
index 000000000000..08fa4df81c44
--- /dev/null
+++ b/app-accessibility/sphinx3/sphinx3-0.8.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/sphinx3/sphinx3-0.8.ebuild,v 1.1 2011/11/17 17:45:56 neurogeek Exp $
+
+EAPI=3
+PYTHON_DEPEND="python? 2:2.6"
+SUPPORT_PYTHON_ABIS="1"
+
+inherit autotools-utils prefix python
+
+DESCRIPTION="CMU Speech Recognition engine"
+HOMEPAGE="http://cmusphinx.sourceforge.net/"
+SRC_URI="mirror://sourceforge/cmusphinx/${P}.tar.gz"
+
+LICENSE="BSD as-is"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc python static-libs"
+
+DEPEND=">=app-accessibility/sphinxbase-0.7[static-libs?,python?]"
+RDEPEND="${DEPEND}"
+
+RESTRICT_PYTHON_ABIS="3*"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}_heap_fix.patch"
+	eprefixify 'python/setup.py'
+}
+
+src_configure() {
+	econf \
+		$( use_enable static-libs static )
+}
+
+src_compile() {
+	default
+
+	if use python; then
+		python_copy_sources python
+
+		building() {
+			"$(PYTHON)" setup.py build
+		}
+
+		python_execute_function -s --source-dir python building
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+
+	dodoc AUTHORS ChangeLog NEWS README
+
+	if use doc; then
+		cd doc
+		dohtml -r -x CVS s3* s3 *.html
+	fi
+
+	if use python; then
+
+		installing() {
+			"$(PYTHON)" setup.py install \
+				--install-lib="${D}/$(python_get_sitedir)"
+		}
+
+		python_execute_function -s --source-dir python installing
+	fi
+
+	remove_libtool_files
+}