Cleaned up ebuild, and install binary into /opt/mbrola for compatibility with freetts.

Package-Manager: portage-2.0.51.22-r2

4 files changed, 40 insertions, 35 deletions

diff --git a/app-accessibility/mbrola/ChangeLog b/app-accessibility/mbrola/ChangeLog
index 400a33f028f0..fa3997623cf6 100644
--- a/app-accessibility/mbrola/ChangeLog
+++ b/app-accessibility/mbrola/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-accessibility/mbrola
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/mbrola/ChangeLog,v 1.17 2005/07/24 02:23:41 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/mbrola/ChangeLog,v 1.18 2005/07/25 19:52:31 eradicator Exp $
+
+*mbrola-3.0.1h-r3 (25 Jul 2005)
+
+  25 Jul 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  -mbrola-3.0.1h-r2.ebuild, +mbrola-3.0.1h-r3.ebuild:
+  Cleaned up ebuild, and install binary into /opt/mbrola for compatibility
+  with freetts.
 
   24 Jul 2005; Jeremy Huddleston <eradicator@gentoo.org>
   mbrola-3.0.1h-r2.ebuild:
diff --git a/app-accessibility/mbrola/Manifest b/app-accessibility/mbrola/Manifest
index 88733519bb6e..3678f73eb4b5 100644
--- a/app-accessibility/mbrola/Manifest
+++ b/app-accessibility/mbrola/Manifest
@@ -1,16 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 fbdfa0106c92a14feafec6f0b3e1bc60 ChangeLog 2846
+MD5 0e2c0c9caaad8fe2286ffe0319625233 ChangeLog 3082
 MD5 91c58b8e208c8000117987eea30b0a00 mbrola-3.0.1h-r1.ebuild 1690
 MD5 4f5d797c455932135181f0c31b5e71b2 metadata.xml 185
-MD5 ff3efa7835654acfaf51d63719e77faf mbrola-3.0.1h-r2.ebuild 2324
+MD5 eb5a71845c47f868f4df88c862f86ac0 mbrola-3.0.1h-r3.ebuild 2292
 MD5 d8e16d3a58393097a056fe4342968b55 files/digest-mbrola-3.0.1h-r1 236
-MD5 8fe36cd238dc7d4e89e3e6b8733cf770 files/digest-mbrola-3.0.1h-r2 991
+MD5 8fe36cd238dc7d4e89e3e6b8733cf770 files/digest-mbrola-3.0.1h-r3 991
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD4DBQFC4vvTArHZZzCEUG0RAvUSAJ9ntJ2Ri0yMuBW/OLZrImwv3YtSYACY4enO
-/VjlrQg6stH+lundQ9S9cw==
-=ePIU
+iD8DBQFC5UM8ArHZZzCEUG0RAkrHAJ97qfyzcsBMkpWHewQNJx50qupD0QCeIAdp
+PW/f8WGOmZQZ/LEmmaEV6Sk=
+=hsmW
 -----END PGP SIGNATURE-----
diff --git a/app-accessibility/mbrola/files/digest-mbrola-3.0.1h-r2 b/app-accessibility/mbrola/files/digest-mbrola-3.0.1h-r3
index de8456dcbd59..de8456dcbd59 100644
--- a/app-accessibility/mbrola/files/digest-mbrola-3.0.1h-r2
+++ b/app-accessibility/mbrola/files/digest-mbrola-3.0.1h-r3
diff --git a/app-accessibility/mbrola/mbrola-3.0.1h-r2.ebuild b/app-accessibility/mbrola/mbrola-3.0.1h-r3.ebuild
index 9c5fd5515850..394eeff587f8 100644
--- a/app-accessibility/mbrola/mbrola-3.0.1h-r2.ebuild
+++ b/app-accessibility/mbrola/mbrola-3.0.1h-r3.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/mbrola/mbrola-3.0.1h-r2.ebuild,v 1.3 2005/07/24 02:23:41 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/mbrola/mbrola-3.0.1h-r3.ebuild,v 1.1 2005/07/25 19:52:31 eradicator Exp $
 
 IUSE=""
 
@@ -36,50 +36,48 @@ LICENSE="MBROLA"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 src_unpack () {
-	if [ "${A}" != "" ]; then
-		unpack ${A}
+	unpack ${A}
 
-		case ${ARCH} in
-			x86|amd64)
-				cp mbrola-linux-i386 mbrola || die
-				;;
-			ppc)
-				cp mbrola206a-linux-ppc mbrola || die
-				;;
-			sparc)
-				cp mbrola-SuSElinux-ultra1.dat mbrola || die
-				;;
-			alpha)
-				cp mbrola-linux-alpha mbrola || die
-				;;
-			*)
-				einfo "mbrola binary not available on this architecture.  Still installing voices."
-		esac
-	fi
+	case ${ARCH} in
+		x86|amd64)
+			cp mbrola-linux-i386 mbrola || die
+			;;
+		ppc)
+			cp mbrola206a-linux-ppc mbrola || die
+			;;
+		sparc)
+			cp mbrola-SuSElinux-ultra1.dat mbrola || die
+			;;
+		alpha)
+			cp mbrola-linux-alpha mbrola || die
+			;;
+		*)
+			einfo "mbrola binary not available on this architecture.  Still installing voices."
+	esac
 }
 
 src_install () {
-	exeinto /opt/${PN}/bin
+	exeinto /opt/${PN}
 
 	# Take care of main binary
-	[ -f mbrola ] && doexe mbrola
+	[[ -f "mbrola" ]] && doexe mbrola
 
 	dodoc readme.txt
 
 	for voice in ??[0-9]; do
 		insinto /opt/${PN}/${voice}
-		[ -f ${voice}/license.txt ] && doins ${voice}/license.txt
-		[ -f ${voice}/${voice} ] && doins ${voice}/${voice}
-		[ -f ${voice}/${voice}mrpa ] && doins ${voice}/${voice}mrpa
+		[[ -f "${voice}/license.txt" ]] && doins ${voice}/license.txt
+		[[ -f "${voice}/${voice}" ]] && doins ${voice}/${voice}
+		[[ -f "${voice}/${voice}mrpa" ]] && doins ${voice}/${voice}mrpa
 
-		if [ -d ${voice}/TEST ]; then
+		if [[ -d "${voice}/TEST" ]]; then
 			insinto /opt/${PN}/${voice}/TEST
 			doins ${voice}/TEST/*
 		fi
 
-		[ -f ${voice}/${voice}.txt ] && dodoc ${voice}/${voice}.txt
+		[[ -f "${voice}/${voice}.txt" ]] && dodoc ${voice}/${voice}.txt
 	done
 
 	dodir /opt/bin
-	dosym /opt/${PN}/bin/mbrola /opt/bin/mbrola
+	dosym /opt/${PN}/mbrola /opt/bin/mbrola
 }