Apply patch from bug 142311, thanks to Drew, fix for invalid free. Also fix implicit declaration of function exit by including stdlib.

Package-Manager: portage-2.1.3

5 files changed, 97 insertions, 5 deletions

diff --git a/media-sound/cvoicecontrol/ChangeLog b/media-sound/cvoicecontrol/ChangeLog
index ac3ad23a7702..29066df8aabf 100644
--- a/media-sound/cvoicecontrol/ChangeLog
+++ b/media-sound/cvoicecontrol/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-sound/cvoicecontrol
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/cvoicecontrol/ChangeLog,v 1.14 2007/02/22 00:54:46 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cvoicecontrol/ChangeLog,v 1.15 2007/07/29 20:40:49 drac Exp $
+
+*cvoicecontrol-0.9_alpha-r1 (29 Jul 2007)
+
+  29 Jul 2007; Samuli Suominen <drac@gentoo.org>
+  +files/cvoicecontrol-0.9_alpha-gentoo-2.patch,
+  +cvoicecontrol-0.9_alpha-r1.ebuild:
+  Apply patch from bug 142311, thanks to Drew, fix for invalid free. Also fix
+  implicit declaration of function exit by including stdlib.
 
   22 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
   Transition to Manifest2.
diff --git a/media-sound/cvoicecontrol/Manifest b/media-sound/cvoicecontrol/Manifest
index 149e5663a543..bee4ef4273fe 100644
--- a/media-sound/cvoicecontrol/Manifest
+++ b/media-sound/cvoicecontrol/Manifest
@@ -1,16 +1,24 @@
+AUX cvoicecontrol-0.9_alpha-gentoo-2.patch 1512 RMD160 0e1bac5a7008a59427c14574e3e908677ae79259 SHA1 bb6880dbda6c52d536c0813dfe869b6f71edb2e3 SHA256 b0785aedc49d9627f5706b9253a9a749975f2632a9aa9cf51b84e1997579e50f
+MD5 b5d577d1384efcd56b44b55401488dc6 files/cvoicecontrol-0.9_alpha-gentoo-2.patch 1512
+RMD160 0e1bac5a7008a59427c14574e3e908677ae79259 files/cvoicecontrol-0.9_alpha-gentoo-2.patch 1512
+SHA256 b0785aedc49d9627f5706b9253a9a749975f2632a9aa9cf51b84e1997579e50f files/cvoicecontrol-0.9_alpha-gentoo-2.patch 1512
 AUX cvoicecontrol-0.9_alpha-gentoo.diff 442 RMD160 99a6db53c62a6aaaad346f87a2be7522165829bd SHA1 5ac8b3d10b4921026d3b9a58aac48d4d8f853f3e SHA256 b7b75041979115416f36f61a045b3d6a00cb04c6ec7ebd7a7b1a079405183223
 MD5 07de3af430261f9f254dfa78a2b4702a files/cvoicecontrol-0.9_alpha-gentoo.diff 442
 RMD160 99a6db53c62a6aaaad346f87a2be7522165829bd files/cvoicecontrol-0.9_alpha-gentoo.diff 442
 SHA256 b7b75041979115416f36f61a045b3d6a00cb04c6ec7ebd7a7b1a079405183223 files/cvoicecontrol-0.9_alpha-gentoo.diff 442
 DIST cvoicecontrol-0.9alpha.tar.bz2 78081 RMD160 72f271ba099571e6cd220264aa46853ef511f063 SHA1 bec8bd1ef53d6817aebb13ed42e75a42ca05f388 SHA256 dbcb03ae8370c400b7d398c7715e100b5b719f109e1955a40042cd268df981ad
+EBUILD cvoicecontrol-0.9_alpha-r1.ebuild 968 RMD160 9974cc82e09f7ec75fc5537e62eed064ff706017 SHA1 b86549e0879d096a21618539cf812d41e38e7711 SHA256 d6737aff7866bec38dd30137e7167546359cab67dc100e2813b8ccc407a1a128
+MD5 b75b0cbf67e9cb6683e61d53a63bf959 cvoicecontrol-0.9_alpha-r1.ebuild 968
+RMD160 9974cc82e09f7ec75fc5537e62eed064ff706017 cvoicecontrol-0.9_alpha-r1.ebuild 968
+SHA256 d6737aff7866bec38dd30137e7167546359cab67dc100e2813b8ccc407a1a128 cvoicecontrol-0.9_alpha-r1.ebuild 968
 EBUILD cvoicecontrol-0.9_alpha.ebuild 1074 RMD160 1d064a9152d2b5db1d713a3241a66013e7fb04f0 SHA1 6de924872dcfb51b1567f65b6085ed49e59d8035 SHA256 bbc783612a2b70a5649e8f22ed854d69e6c4be8fa890bb6b4b5c30dad7fe81fc
 MD5 6117c0b0fbc7438ae1eb26248b964cc3 cvoicecontrol-0.9_alpha.ebuild 1074
 RMD160 1d064a9152d2b5db1d713a3241a66013e7fb04f0 cvoicecontrol-0.9_alpha.ebuild 1074
 SHA256 bbc783612a2b70a5649e8f22ed854d69e6c4be8fa890bb6b4b5c30dad7fe81fc cvoicecontrol-0.9_alpha.ebuild 1074
-MISC ChangeLog 1692 RMD160 fa4aa2cc439b7bc8ae3adf7bb0bcab9765f14336 SHA1 5f437c5413645026c00b50b77641d74e80c19060 SHA256 3a1c1794e6c8998adef57edfacd4df3b900d835228679af866a22f3844d943a2
-MD5 8c5b7296eff38e41a4fa895d234441ba ChangeLog 1692
-RMD160 fa4aa2cc439b7bc8ae3adf7bb0bcab9765f14336 ChangeLog 1692
-SHA256 3a1c1794e6c8998adef57edfacd4df3b900d835228679af866a22f3844d943a2 ChangeLog 1692
+MISC ChangeLog 2010 RMD160 c7c5ed076951ea2d36f162ea095400bef3e1c41e SHA1 8672d50d442c100eb79e3b1ceaf9fc6e029eb3ba SHA256 e1a320a9f9d60c0dbdf7f7c755c151318a0349180a2c1fe67a6c63e682a3584c
+MD5 04af417ec042422e22702ae542f04196 ChangeLog 2010
+RMD160 c7c5ed076951ea2d36f162ea095400bef3e1c41e ChangeLog 2010
+SHA256 e1a320a9f9d60c0dbdf7f7c755c151318a0349180a2c1fe67a6c63e682a3584c ChangeLog 2010
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158
@@ -18,3 +26,6 @@ SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b metadata
 MD5 73b82b42a75416d31e7879bcdb038a06 files/digest-cvoicecontrol-0.9_alpha 268
 RMD160 f9200123ca8aa7b60f6e377adeaee256bb63e764 files/digest-cvoicecontrol-0.9_alpha 268
 SHA256 2d2a861919a20e006939f01fc9a3a4a14375529bbc3921c850604bf48b7bc01d files/digest-cvoicecontrol-0.9_alpha 268
+MD5 73b82b42a75416d31e7879bcdb038a06 files/digest-cvoicecontrol-0.9_alpha-r1 268
+RMD160 f9200123ca8aa7b60f6e377adeaee256bb63e764 files/digest-cvoicecontrol-0.9_alpha-r1 268
+SHA256 2d2a861919a20e006939f01fc9a3a4a14375529bbc3921c850604bf48b7bc01d files/digest-cvoicecontrol-0.9_alpha-r1 268
diff --git a/media-sound/cvoicecontrol/cvoicecontrol-0.9_alpha-r1.ebuild b/media-sound/cvoicecontrol/cvoicecontrol-0.9_alpha-r1.ebuild
new file mode 100644
index 000000000000..468e5c67e6f8
--- /dev/null
+++ b/media-sound/cvoicecontrol/cvoicecontrol-0.9_alpha-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/cvoicecontrol/cvoicecontrol-0.9_alpha-r1.ebuild,v 1.1 2007/07/29 20:40:49 drac Exp $
+
+inherit eutils
+
+MY_P=${P/_/}
+
+DESCRIPTION="Console based speech recognition system"
+HOMEPAGE="http://www.kiecza.net/daniel/linux"
+SRC_URI="http://www.kiecza.net/daniel/linux/${MY_P}.tar.bz2"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+S="${WORKDIR}"/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gentoo-2.patch
+	sed -i -e "s/install-data-am: install-data-local/install-data-am:/" Makefile.in
+
+	# Handle documentation with dohtml instead.
+	sed -i -e "s:SUBDIRS = docs:#SUBDIRS = docs:" cvoicecontrol/Makefile.in
+
+}
+
+src_install () {
+	emake DESTDIR="${D}" install || die "emake install failed."
+	dodoc AUTHORS BUGS ChangeLog FAQ README
+	dohtml cvoicecontrol/docs/en/*.html
+}
diff --git a/media-sound/cvoicecontrol/files/cvoicecontrol-0.9_alpha-gentoo-2.patch b/media-sound/cvoicecontrol/files/cvoicecontrol-0.9_alpha-gentoo-2.patch
new file mode 100644
index 000000000000..7e1ae985b18d
--- /dev/null
+++ b/media-sound/cvoicecontrol/files/cvoicecontrol-0.9_alpha-gentoo-2.patch
@@ -0,0 +1,35 @@
+diff -ur cvoicecontrol-0.9alpha.orig/cvoicecontrol/cvoicecontrol.c cvoicecontrol-0.9alpha/cvoicecontrol/cvoicecontrol.c
+--- cvoicecontrol-0.9alpha.orig/cvoicecontrol/cvoicecontrol.c	2002-09-05 19:09:06.000000000 +0300
++++ cvoicecontrol-0.9alpha/cvoicecontrol/cvoicecontrol.c	2007-07-29 23:35:33.000000000 +0300
+@@ -38,6 +38,8 @@
+ #include<sys/select.h>
+ #endif
+ 
++#include <values.h>
++
+ #include "cvoicecontrol.h"
+ 
+ #include "model.h"
+diff -ur cvoicecontrol-0.9alpha.orig/cvoicecontrol/microphone_config.c cvoicecontrol-0.9alpha/cvoicecontrol/microphone_config.c
+--- cvoicecontrol-0.9alpha.orig/cvoicecontrol/microphone_config.c	2000-02-19 14:08:47.000000000 +0200
++++ cvoicecontrol-0.9alpha/cvoicecontrol/microphone_config.c	2007-07-29 23:36:08.000000000 +0300
+@@ -1099,8 +1099,6 @@
+       free(command);
+     }
+     fclose(f);
+-
+-    free(home);
+   }
+   else /***** couldn't retrieve home directory -> store results in /tmp/ */
+   {
+diff -ur cvoicecontrol-0.9alpha.orig/cvoicecontrol/semaphore.c cvoicecontrol-0.9alpha/cvoicecontrol/semaphore.c
+--- cvoicecontrol-0.9alpha.orig/cvoicecontrol/semaphore.c	2000-02-12 18:05:24.000000000 +0200
++++ cvoicecontrol-0.9alpha/cvoicecontrol/semaphore.c	2007-07-29 23:34:38.000000000 +0300
+@@ -26,6 +26,7 @@
+ ****************************************************************************/
+ 
+ #include "semaphore.h"
++#include <stdlib.h>
+ 
+ /********************************************************************************
+  * function must be called prior to semaphore use.
diff --git a/media-sound/cvoicecontrol/files/digest-cvoicecontrol-0.9_alpha-r1 b/media-sound/cvoicecontrol/files/digest-cvoicecontrol-0.9_alpha-r1
new file mode 100644
index 000000000000..d42d49d91ddd
--- /dev/null
+++ b/media-sound/cvoicecontrol/files/digest-cvoicecontrol-0.9_alpha-r1
@@ -0,0 +1,3 @@
+MD5 3668adb6e97b7cf2f81acfc244044abf cvoicecontrol-0.9alpha.tar.bz2 78081
+RMD160 72f271ba099571e6cd220264aa46853ef511f063 cvoicecontrol-0.9alpha.tar.bz2 78081
+SHA256 dbcb03ae8370c400b7d398c7715e100b5b719f109e1955a40042cd268df981ad cvoicecontrol-0.9alpha.tar.bz2 78081