Revision bump without resetting KEYWORDS. This is forcing a re-emerge of the package on systems which had a broken version of cpio installed. See bug #74882. Also better multilib support.

4 files changed, 35 insertions, 23 deletions

diff --git a/app-accessibility/speech-tools/ChangeLog b/app-accessibility/speech-tools/ChangeLog
index 9145cffabda8..9e663178d4ac 100644
--- a/app-accessibility/speech-tools/ChangeLog
+++ b/app-accessibility/speech-tools/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-accessibility/speech-tools
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-tools/ChangeLog,v 1.16 2005/01/02 19:45:55 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-tools/ChangeLog,v 1.17 2005/01/05 00:15:31 eradicator Exp $
+
+*speech-tools-1.2.3-r1 (03 Jan 2005)
+
+  03 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  +speech-tools-1.2.3-r1.ebuild, -speech-tools-1.2.3.ebuild:
+  Revision bump without resetting KEYWORDS. This is forcing a re-emerge of the
+  package on systems which had a broken version of cpio installed. See bug
+  #74882. Also better multilib support.
 
   02 Jan 2005; Jeremy Huddleston <eradicator@gentoo.org>
   speech-tools-1.2.3.ebuild:
diff --git a/app-accessibility/speech-tools/Manifest b/app-accessibility/speech-tools/Manifest
index 825fb2fd400e..060468d43325 100644
--- a/app-accessibility/speech-tools/Manifest
+++ b/app-accessibility/speech-tools/Manifest
@@ -1,17 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 34a4fd2454e5530898f467fbadca53c1 ChangeLog 2733
+MD5 f0cb7e0e914400f796ec67d950fe4425 ChangeLog 3084
 MD5 4f5d797c455932135181f0c31b5e71b2 metadata.xml 185
-MD5 87a58840f1e401cd793931da64c89260 speech-tools-1.2.3.ebuild 2687
+MD5 87a93202c5ff7810bad7c7d3b90c51dc speech-tools-1.2.3-r1.ebuild 2845
 MD5 f2a3bc530651a18ed72fc21647e649cd files/1.2.3-gcc3.4.patch 70365
 MD5 a143fa8cb76f282bdd72ae3ad821f9c5 files/58speech-tools 34
-MD5 39a388c0402196ce3c2dc7fb2891fa93 files/digest-speech-tools-1.2.3 145
+MD5 39a388c0402196ce3c2dc7fb2891fa93 files/digest-speech-tools-1.2.3-r1 145
 MD5 19e3325adc92d921d82884fe58485055 files/speech-tools-gcc3.3.diff 25787
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.0 (GNU/Linux)
 
-iD8DBQFB2E+HArHZZzCEUG0RAu77AJ4zKmPGbi59M2eNCTbz7/svtc8bGgCfXeHJ
-Va60mdMUv+LR0NJjGwGRD8s=
-=hsUR
+iD8DBQFB2zG2ArHZZzCEUG0RAo2gAJ9J4VjV08kILseGuFxVAHld/MpN0ACfQ1i7
+rq2/annbS/RGsiqHnX0jCuM=
+=bQ7u
 -----END PGP SIGNATURE-----
diff --git a/app-accessibility/speech-tools/files/digest-speech-tools-1.2.3 b/app-accessibility/speech-tools/files/digest-speech-tools-1.2.3-r1
index e1cbb2bbc3cd..e1cbb2bbc3cd 100644
--- a/app-accessibility/speech-tools/files/digest-speech-tools-1.2.3
+++ b/app-accessibility/speech-tools/files/digest-speech-tools-1.2.3-r1
diff --git a/app-accessibility/speech-tools/speech-tools-1.2.3.ebuild b/app-accessibility/speech-tools/speech-tools-1.2.3-r1.ebuild
index 2e06468798ea..45054aaeb0ca 100644
--- a/app-accessibility/speech-tools/speech-tools-1.2.3.ebuild
+++ b/app-accessibility/speech-tools/speech-tools-1.2.3-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/speech-tools/speech-tools-1.2.3.ebuild,v 1.16 2005/01/02 19:45:55 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-tools/speech-tools-1.2.3-r1.ebuild,v 1.1 2005/01/05 00:15:31 eradicator Exp $
 
 IUSE="doc"
 
@@ -19,6 +19,8 @@ KEYWORDS="amd64 ppc sparc x86"
 
 RDEPEND="|| ( sys-libs/ncurses sys-libs/libtermcap-compat )"
 DEPEND="${RDEPEND}
+	app-arch/cpio
+	sys-apps/findutils
 	>=sys-apps/sed-4"
 
 S="${WORKDIR}/speech_tools"
@@ -51,39 +53,41 @@ src_compile() {
 }
 
 src_install() {
-	into /usr/lib/speech-tools
+	cd ${S}/lib
+	dolib.so libestbase.so.1.2.3.1
+	dosym /usr/$(get_libdir)/libestbase.so.1.2.3.1 /usr/$(get_libdir)/libestbase.so
+	dolib.so libeststring.so.1.2
+	dosym /usr/$(get_libdir)/libeststring.so.1.2 /usr/$(get_libdir)/libeststring.so
+	dolib.a libestbase.a
+	dolib.a libestools.a
+	dolib.a libeststring.a
 
+	into /usr/lib/speech-tools
 	cd ${S}/bin
-	rm -f Makefile
 
 	dodir /usr/lib/speech-tools/share/testsuite
 	for file in * ; do
+		[ "${file}" = "Makefile" ] && continue
 		dobin ${file}
 		dosed "s:${S}/testsuite/data:/usr/lib/speech-tools/share/testsuite:g" /usr/lib/speech-tools/bin/${file} testsuite/data
 		dosed "s:${S}/bin:/usr/lib/speech-tools/bin:g" /usr/lib/speech-tools/bin/${file}
 		dosed "s:${S}/main:/usr/lib/speech-tools/bin:g" /usr/lib/speech-tools/bin/${file}
-		dosed "s:${S}/lib:/usr/lib/speech-tools/lib:g" /usr/lib/speech-tools/bin/${file}
+		dosed "s:${S}/lib:/usr/$(get_libdir):g" /usr/lib/speech-tools/bin/${file}
 	done
 
-	cd ${S}/lib
-	dolib.so libestbase.so.1.2.3.1
-	dosym /usr/lib/speech-tools/lib/libestbase.so.1.2.3.1 /usr/lib/speech-tools/lib/libestbase.so
-	dolib.so libeststring.so.1.2
-	dosym /usr/lib/speech-tools/lib/libeststring.so.1.2 /usr/lib/speech-tools/lib/libeststring.so
-	dolib.a libestbase.a
-	dolib.a libestools.a
-	dolib.a libeststring.a
-
 	insinto /usr/lib/speech-tools/lib/siod
 	cd ${S}/lib/siod
 	doins *
+
 	insinto /usr/share/doc/${PF}/example_data
 	cd ${S}/lib/example_data
 	doins *
 
 	cd ${S}
-	find config -print | cpio -pmd ${D}/usr/lib/speech-tools
-	find include -print | cpio -pmd ${D}/usr/lib/speech-tools
+	find config -print | cpio -pmd ${D}/usr/lib/speech-tools || die "Unable to install config files"
+	find include -print | cpio -pmd ${D}/usr/lib/speech-tools || die "Unable to install include files"
+
+	chown -R root:root ${D}/usr/lib/speech-tools
 
 	insinto /etc/env.d
 	doins ${FILESDIR}/58speech-tools
@@ -95,6 +99,6 @@ src_install() {
 
 	if use doc ; then
 		cd ${S}/festdoc/speech_tools/doc
-		dohtml *
+		dohtml -r *
 	fi
 }