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.

(Portage version: 2.1.9.44/cvs/Linux i686)

3 files changed, 117 insertions, 3 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/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>