Change install location, fix LDFLAGS issue, and change maintainer.

mbrola now installs to /usr/share/mbrola, instead of /opt/mbrola.
See bug #346869.

Since the binary is closed-source, it does not respect LDFLAGS.
I added it to QA_PREBUILT.
Fixes bug #340319.

Also, changed the maintainer to myself.

Package-Manager: portage-2.1.9.44/cvs/Linux i686

4 files changed, 121 insertions, 5 deletions

diff --git a/app-accessibility/mbrola/ChangeLog b/app-accessibility/mbrola/ChangeLog
index cdb886e9e732..f74ecf13f1e1 100644
--- a/app-accessibility/mbrola/ChangeLog
+++ b/app-accessibility/mbrola/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for app-accessibility/mbrola
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/mbrola/ChangeLog,v 1.50 2009/01/08 00:52:15 williamh Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/mbrola/ChangeLog,v 1.51 2011/03/23 17:22:30 cbrannon Exp $
+
+*mbrola-3.0.1h-r6 (23 Mar 2011)
+
+  23 Mar 2011; Christopher Brannon <cbrannon@gentoo.org>
+  +mbrola-3.0.1h-r6.ebuild, metadata.xml:
+  Change the location in which mbrola is installed.
+  We used to install in /opt/mbrola. We now install under
+  /usr/share/mbrola. Fixes bug #346869
+
+  Add the mbrola binary to QA_PREBUILT. This is the correct fix,
+  because the binary is closed-source. Fixes bug #340319
+
+  Add myself as maintainer to metadata.xml.
 
   08 Jan 2009; William Hubbs <williamh@gentoo.org> -mbrola-3.0.1h-r4.ebuild:
   Removed old version.
diff --git a/app-accessibility/mbrola/Manifest b/app-accessibility/mbrola/Manifest
index 9ba391dddf71..e6e0385a63d9 100644
--- a/app-accessibility/mbrola/Manifest
+++ b/app-accessibility/mbrola/Manifest
@@ -15,6 +15,7 @@ DIST it3-010304.zip 5349273 RMD160 d18522be8b4a0484289a1a2e7632a121bd01d551 SHA1
 DIST it4-010926.zip 5044168 RMD160 37d8b72d17010ea5103329f1f503fda37d866986 SHA1 ab32870a3a310020cc5a47c7b581132c3d983ae0 SHA256 8ec74af698fdd9bebf37cbf0877bc2f0382df60ff6cbe7c4c72186ba5b809a69
 DIST la1.zip 7627631 RMD160 c0257cc39e24aa8b690f67f0a5fb2ef72e103592 SHA1 7fdc6682fb30c32b4d82be9af03cd3932e4514e7 SHA256 6f86749c79127125b4bcd347852e3b0d15722398fb3e0ca53b0c9d902e0aad27
 DIST mbr301h-r5.zip 309820 RMD160 e4a9601fc79945a955fbd3b0652a6329c4f55bf8 SHA1 7cd2b1a5a46384a33832343dc0fe0ce999bf84cd SHA256 df402fad97c823206fce68837c1d716b9c0466a4cfb554dfb244df7da5589d6e
+DIST mbr301h.zip 309820 RMD160 e4a9601fc79945a955fbd3b0652a6329c4f55bf8 SHA1 7cd2b1a5a46384a33832343dc0fe0ce999bf84cd SHA256 df402fad97c823206fce68837c1d716b9c0466a4cfb554dfb244df7da5589d6e
 DIST pl1.zip 4050906 RMD160 9fa967f536e1cac71924954c031ff964718e22e0 SHA1 bfb5b20bd3d01cece1d729b0b13c484e7aa4f766 SHA256 0966ed3114950983285efde2284e285d8f2a709d4af8a94d9cb226d2409f9917
 DIST ro1-980317.zip 3222054 RMD160 5b0f285107e5ccda14d3494427b9a0f6ea5cdefe SHA1 5868232bc9e722c8f93b71289e3608cede073f9b SHA256 6ae11eef95172c7e8aeb2c305104cbaef4c574e54bc0f28e1fee0b8657adf89f
 DIST sw1-980623.zip 9386828 RMD160 31e825a2c319de29f153de07b912bb70b0fc0e7e SHA1 44760570b489fa07ae4bc386472f0abc2889dae3 SHA256 f63adba2905ae36cc3428c0656bebe3c159ca40b59a52e07522d5ddbaa5af176
@@ -23,5 +24,6 @@ DIST us1-980512.zip 6562915 RMD160 32907bc8ba7af50318a32738035f23ba26126a4c SHA1
 DIST us2-980812.zip 6387442 RMD160 9793ab0244f8117de84d19c28caf7eb7d04eabdb SHA1 24657341dad89db260d9972350d019c2760e6eaf SHA256 1c9ad0645dbac724acc6f53238be288a951b162f2ca65a1cecf09ac450f47a62
 DIST us3-990208.zip 6195800 RMD160 180c0d76b770d9f022e2066b01da85aa22b2db64 SHA1 8d9831a0b03789041601cb2389875e446b1f94c7 SHA256 ebaf8af32dab2b7f3b7483b824f86b1d8151cde7e0ef50d2d88488948564b601
 EBUILD mbrola-3.0.1h-r5.ebuild 2825 RMD160 d52a60ad32c15bb8d09720b3d9ea771b35994feb SHA1 a9a0e522a6e53f71575b8bbf2ddef9dbb15ff1cf SHA256 459b6b00e0fe843a602f1f34b94e1fc01959f2d3da3c21de167785204b33f3b2
-MISC ChangeLog 6898 RMD160 68ee989bf125149a0713898ee29ac1f022ff9ebb SHA1 34e9933d37bf005ead56a56b2b78dbad474fa92d SHA256 113922abbadf51779d453eb7b9b4dd69cc5cbb7370410b88e5d5db22fd9b41bd
-MISC metadata.xml 248 RMD160 ba4734da964d3d5db60feb339d3e89de2eb87ab6 SHA1 bdd70f0d466d7bea88716581054941113ce22a16 SHA256 b40271c6a99e7610d9df3544a98da28417f406b82a48b04f1a8a9bb474cd04cc
+EBUILD mbrola-3.0.1h-r6.ebuild 2891 RMD160 df16f0a961f4fcbf6cd20d852fc2598568d3f193 SHA1 db6916fb723b241572fa06ecbd5a83434427124a SHA256 c3404ea0e36fb5c396a6636b94ab82a63c40713bf92f96eed7de7634cae78c32
+MISC ChangeLog 7348 RMD160 abae1458f20d61fbba2c47db827869a9793dbb1c SHA1 9e31246ac4cc9ff4b41c7b44efceb18ccb1456b3 SHA256 26fb566f70eceff763e5113fad96d7e9d7ee0a57d382ece3a62016663dbb8c21
+MISC metadata.xml 248 RMD160 8fc0d18ac0946a1ff0ea9271efb6ee32d0701b29 SHA1 8150da786d02137bffa5b6f6d28ceb8bd2a797a5 SHA256 24053225083a4aaecf9cf45e8058a31a3b621237e60084a111fc9e34c25e22e9
diff --git a/app-accessibility/mbrola/mbrola-3.0.1h-r6.ebuild b/app-accessibility/mbrola/mbrola-3.0.1h-r6.ebuild
new file mode 100644
index 000000000000..cdd67c683402
--- /dev/null
+++ b/app-accessibility/mbrola/mbrola-3.0.1h-r6.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2011 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-r6.ebuild,v 1.1 2011/03/23 17:22:30 cbrannon Exp $
+
+IUSE="linguas_de linguas_es linguas_fr linguas_it linguas_la linguas_pl
+	linguas_ro linguas_sv"
+
+S=${WORKDIR}
+
+DESCRIPTION="Speech synthesizer based on the concatenation of diphones. Includes sample voices."
+HOMEPAGE="http://tcts.fpms.ac.be/synthesis/mbrola.html"
+MY_PV=${PV//./}
+TCTS="http://tcts.fpms.ac.be/synthesis"
+SRC_URI="http://tcts.fpms.ac.be/synthesis/${PN}/bin/pclinux/mbr${MY_PV}.zip
+	${TCTS}/mbrola/dba/us1/us1-980512.zip
+	${TCTS}/mbrola/dba/us1/us2-980812.zip
+	${TCTS}/mbrola/dba/us3/us3-990208.zip
+	linguas_de? ( ${TCTS}/mbrola/dba/de1/de1-980227.zip
+		${TCTS}/mbrola/dba/de2/de2-990106.zip
+		${TCTS}/mbrola/dba/de3/de3-000307.zip
+		${TCTS}/mbrola/dba/de4/de4.zip
+		${TCTS}/mbrola/dba/de5/de5.zip
+		${TCTS}/mbrola/dba/de8/de8.zip )
+	linguas_es? ( ${TCTS}/mbrola/dba/es1/es1-980610.zip
+		${TCTS}/mbrola/dba/es2/es2-989825.zip
+		${TCTS}/mbrola/dba/es4/es4.zip )
+	linguas_fr? ( ${TCTS}/mbrola/dba/fr1/fr1-990204.zip
+		${TCTS}/mbrola/dba/fr2/fr2-980806.zip
+		${TCTS}/mbrola/dba/fr3/fr3-990324.zip
+		${TCTS}/mbrola/dba/fr6/fr6-010330.zip )
+	linguas_it? ( ${TCTS}/mbrola/dba/it3/it3-010304.zip
+		${TCTS}/mbrola/dba/it4/it4-010926.zip )
+	linguas_la? ( ${TCTS}/mbrola/dba/la1/la1.zip )
+	linguas_pl? ( ${TCTS}/mbrola/dba/pl1/pl1.zip )
+	linguas_ro? ( ${TCTS}/mbrola/dba/ro1/ro1-980317.zip )
+	linguas_sv? ( ${TCTS}/mbrola/dba/sw1/sw1-980623.zip
+		${TCTS}/mbrola/dba/sw2/sw2-140102.zip )"
+
+DEPEND="app-arch/unzip"
+
+RDEPEND=""
+
+RESTRICT="strip"
+QA_PREBUILT="/usr/bin/mbrola"
+
+SLOT="0"
+LICENSE="MBROLA"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+
+src_unpack () {
+	unpack ${A}
+
+	if [[ -f pl1 ]]; then
+		mkdir pl1DIR
+		mv pl1 pl1.txt pl1DIR
+		mv test pl1DIR/TEST
+		mv pl1DIR pl1
+	fi
+
+	case ${ARCH} in
+		x86|amd64)
+			cp mbrola-linux-i386 mbrola || die
+			;;
+		ppc)
+			cp mbrola302b-linux-ppc mbrola || die
+			;;
+		sparc)
+			cp mbrola-SuSElinux-ultra1.dat mbrola || die
+			;;
+		alpha)
+			cp mbrola-linux-alpha mbrola || die
+			;;
+		*)
+			elog "mbrola binary not available on this architecture.  Still installing voices."
+	esac
+}
+
+src_install () {
+
+	# Take care of main binary
+	if [[ -f "mbrola" ]]; then
+		dobin mbrola
+	dosym /usr/bin/mbrola "/usr/share/${PN}/mbrola"
+	fi
+
+	dodoc readme.txt
+
+	for voice in ??[0-9]; do
+		insinto /usr/share/${PN}/${voice}
+		[[ -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
+			insinto /usr/share/${PN}/${voice}/TEST
+			doins ${voice}/TEST/*
+		fi
+
+		[[ -f "${voice}/${voice}.txt" ]] && dodoc ${voice}/${voice}.txt
+	done
+}
diff --git a/app-accessibility/mbrola/metadata.xml b/app-accessibility/mbrola/metadata.xml
index 118f18d5d59d..54d325e4b402 100644
--- a/app-accessibility/mbrola/metadata.xml
+++ b/app-accessibility/mbrola/metadata.xml
@@ -4,6 +4,6 @@
 <herd>accessibility</herd>
 <herd>sound</herd>
 <maintainer>
-	<email>williamh@gentoo.org</email>
+	<email>cbrannon@gentoo.org</email>
 </maintainer>
 </pkgmetadata>