Version bump, fixing bug #206792 (Thanks Dennis Schridde for the updated ebuild and everyone else who contributed in any way). Remove old.

(Portage version: 2.2_rc12/cvs/Linux 2.6.26-gentoo-r1 x86_64)

7 files changed, 96 insertions, 195 deletions

diff --git a/media-sound/mumble/ChangeLog b/media-sound/mumble/ChangeLog
index c93c3ef16f62..98f68653c118 100644
--- a/media-sound/mumble/ChangeLog
+++ b/media-sound/mumble/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-sound/mumble
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mumble/ChangeLog,v 1.11 2008/07/28 21:21:14 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mumble/ChangeLog,v 1.12 2008/10/22 23:14:22 tgurr Exp $
+
+*mumble-1.1.6 (22 Oct 2008)
+
+  22 Oct 2008; Timo Gurr <tgurr@gentoo.org> -files/mumble-0.9.4-path.patch,
+  -files/mumble-1.1.1-path.patch, metadata.xml, -mumble-0.9.4.ebuild,
+  -mumble-1.1.1.ebuild, +mumble-1.1.6.ebuild:
+  Version bump, fixing bug #206792 (Thanks Dennis Schridde for the updated
+  ebuild and everyone else who contributed in any way). Remove old.
 
   28 Jul 2008; Carsten Lohrke <carlo@gentoo.org> mumble-0.9.4.ebuild,
   mumble-1.1.1.ebuild:
diff --git a/media-sound/mumble/files/mumble-0.9.4-path.patch b/media-sound/mumble/files/mumble-0.9.4-path.patch
deleted file mode 100644
index 1fc24f818c02..000000000000
--- a/media-sound/mumble/files/mumble-0.9.4-path.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- Database.cpp.orig	2006-11-25 12:13:13.745701315 +0100
-+++ Database.cpp	2006-11-25 12:14:31.167122733 +0100
-@@ -37,10 +37,10 @@
- 	QStringList datapaths;
- 	int i;
- 
--	datapaths << qs.value("InstPath").toString();
--	datapaths << QDir::homePath();
--	datapaths << qApp->applicationDirPath();
--	datapaths << QDir::currentPath();
-+	QDir dir;
-+
-+	datapaths << QDir::homePath() + "/.qt";
-+	dir.mkpath (datapaths[0]);
- 	bool found = false;
- 
- 	for(i = 0; (i < datapaths.size()) && ! found; i++) {
diff --git a/media-sound/mumble/files/mumble-1.1.1-path.patch b/media-sound/mumble/files/mumble-1.1.1-path.patch
deleted file mode 100644
index 966e7824e4c7..000000000000
--- a/media-sound/mumble/files/mumble-1.1.1-path.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- src/mumble/Database.cpp.orig	2006-11-25 12:13:13.745701315 +0100
-+++ src/mumble/Database.cpp	2006-11-25 12:14:31.167122733 +0100
-@@ -37,10 +37,10 @@
- 	QStringList datapaths;
- 	int i;
- 
--	datapaths << qs.value(QLatin1String("InstPath")).toString();
--	datapaths << QDir::homePath();
--	datapaths << qApp->applicationDirPath();
--	datapaths << QDir::currentPath();
-+	QDir dir;
-+
-+	datapaths << QDir::homePath() + "/.qt";
-+	dir.mkpath (datapaths[0]);
- 	bool found = false;
- 
- 	for(i = 0; (i < datapaths.size()) && ! found; i++) {
diff --git a/media-sound/mumble/metadata.xml b/media-sound/mumble/metadata.xml
index 74ac835bd3ee..723598ddc97e 100644
--- a/media-sound/mumble/metadata.xml
+++ b/media-sound/mumble/metadata.xml
@@ -8,4 +8,7 @@
 <longdescription lang="en">
 Mumble is a low-latency, high quality voice chat software primarily intended for use while gaming.
 </longdescription>
+<use>
+	<flag name='speech'>Enables text-to-speech support in Mumble.</flag>
+</use>
 </pkgmetadata>
diff --git a/media-sound/mumble/mumble-0.9.4.ebuild b/media-sound/mumble/mumble-0.9.4.ebuild
deleted file mode 100644
index 608c84f15495..000000000000
--- a/media-sound/mumble/mumble-0.9.4.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mumble/mumble-0.9.4.ebuild,v 1.9 2008/07/28 21:21:14 carlo Exp $
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="voice chat software for gaming written in Qt4"
-HOMEPAGE="http://mumble.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="vanilla"
-
-DEPEND="dev-libs/boost
-	=x11-libs/qt-4.3*
-	>=media-libs/speex-1.1.12
-	media-libs/alsa-lib
-	x11-libs/libXevie"
-
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	if ! built_with_use -o =x11-libs/qt-4* sqlite sqlite3; then
-		echo
-		ewarn "You need to build Qt4 with the sqlite and/or sqlite3 use flag"
-		echo
-		die "Your Qt4 has no sqlite support"
-	fi
-	if [[ $(gcc-major-version) -eq 3 && $(gcc-minor-version) -lt 4 ]]; then
-		ewarn "You need >=sys-devel/gcc-3.4 to compile ${PN}."
-		die "System gcc is too old to compile ${PN}."
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	use vanilla || epatch "${FILESDIR}"/${P}-path.patch
-}
-
-src_compile() {
-	qmake mumble.pro 	|| die "qmake failed"
-	lrelease mumble.pro	|| die "mumble translation failed"
-	emake CC="$(tc-getCC) ${CFLAGS}" \
-		CXX="$(tc-getCXX) ${CXXFLAGS}" \
-		LINK="$(tc-getCXX)" \
-		LFLAGS="${LDFLAGS}" || die "emake failed"
-}
-
-src_install() {
-	dodoc README CHANGES	|| die "installing docs failed"
-	dobin mumble		|| die "installing failed"
-	insinto /usr/share/pixmaps
-	newins mumble.png.0 mumble.png \
-		|| die "installing icon failed"
-	make_desktop_entry mumble "Mumble" mumble "KDE;Qt;AudioVideo" \
-		|| die "installing desktop entry failed"
-}
diff --git a/media-sound/mumble/mumble-1.1.1.ebuild b/media-sound/mumble/mumble-1.1.1.ebuild
deleted file mode 100644
index cb230fd564ab..000000000000
--- a/media-sound/mumble/mumble-1.1.1.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mumble/mumble-1.1.1.ebuild,v 1.5 2008/07/28 21:21:14 carlo Exp $
-
-EAPI=1
-
-inherit eutils toolchain-funcs qt4
-
-DESCRIPTION="Voice chat software for gaming written in Qt4"
-HOMEPAGE="http://mumble.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="pulseaudio vanilla"
-
-DEPEND="=x11-libs/qt-4.3*:4
-	>=media-libs/speex-1.2_beta3
-	media-libs/alsa-lib
-	dev-libs/boost
-	x11-libs/libXevie
-	pulseaudio? ( media-sound/pulseaudio )"
-
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	if ! built_with_use -a =x11-libs/qt-4* sqlite3 dbus ; then
-		echo
-		if ! built_with_use =x11-libs/qt-4* sqlite3; then
-			eerror "You need to build Qt4 with the sqlite3 use-flag"
-		fi
-		if ! built_with_use =x11-libs/qt-4* dbus; then
-			eerror "You need to build Qt4 with the dbus use-flag"
-		fi
-		echo
-		die "Your Qt4 installation lacks propper useflag configuration, see above"
-	fi
-
-	if [[ $(gcc-major-version) -eq 3 && $(gcc-minor-version) -lt 4 ]]; then
-		eerror "You need >=sys-devel/gcc-3.4 to compile ${PN}."
-		die "System gcc is too old to compile ${PN}."
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	use pulseaudio || sed -i -e '/CONFIG  += oss/s/ pulseaudio//' \
-		"${S}"/src/mumble/mumble.pro || die
-	use vanilla || epatch "${FILESDIR}"/${P}-path.patch
-
-	sed -i -e '/LIBS /s/-lspeex/& -lspeexdsp/' \
-		"${S}"/src/mumble/mumble.pro || die
-}
-
-src_compile() {
-	local dir
-	for dir in src/mumble overlay_gl; do
-		cd "${S}/$dir"
-		qmake ${dir##*/}.pro	|| die "qmake failed"
-		lrelease ${dir##*/}.pro || die "lrelease failed"
-		emake CC="$(tc-getCC) ${CFLAGS}" \
-			CXX="$(tc-getCXX) ${CXXFLAGS}" \
-			LINK="$(tc-getCXX)" || die "emake failed"
-	done
-}
-
-src_install() {
-	newdoc README.Linux README
-	dodoc CHANGES
-
-	local dir
-	if built_with_use =x11-libs/qt-4* debug; then
-		dir=debug
-		ewarn "Built debug-version because your Qt4 has the debug use-flag enabled."
-	else
-		dir=release
-	fi
-
-	dobin ${dir}/mumble	|| die "installing failed"
-	dolib.so ${dir}/lib*.so* || die "installing failed"
-
-	dobin scripts/mumble-overlay || die "installing failed"
-	newicon icons/mumble.64x64.png mumble.png || die "installing icon failed"
-	make_desktop_entry ${PN} "Mumble" mumble "KDE;Qt;AudioVideo" \
-		|| die "installing menu entry failed"
-}
-
-pkg_postinst() {
-	elog
-	elog "Visit http://mumble.sourceforge.net/Audio_Tuning for futher configuration"
-	elog "type mumble to run the client"
-	elog "you might want to add this to your xorg.conf to get shortcut support"
-	elog "  Section \"Extensions\""
-	elog "   Option         \"XEVIE\" \"Enable\""
-	elog "  EndSection"
-}
diff --git a/media-sound/mumble/mumble-1.1.6.ebuild b/media-sound/mumble/mumble-1.1.6.ebuild
new file mode 100644
index 000000000000..4e4d8061eed4
--- /dev/null
+++ b/media-sound/mumble/mumble-1.1.6.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mumble/mumble-1.1.6.ebuild,v 1.1 2008/10/22 23:14:22 tgurr Exp $
+
+EAPI="2"
+
+inherit eutils multilib qt4
+
+DESCRIPTION="Voice chat software for gaming written in Qt4."
+HOMEPAGE="http://mumble.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa dbus debug oss portaudio pulseaudio speech"
+
+RDEPEND="dev-libs/boost
+	>=media-libs/speex-1.2_beta3_p2
+	x11-libs/libXevie
+	|| ( ( x11-libs/qt-core:4[ssl]
+			x11-libs/qt-gui:4
+			x11-libs/qt-opengl:4
+			x11-libs/qt-sql:4[sqlite]
+			dbus? ( x11-libs/qt-dbus:4 ) )
+		( =x11-libs/qt-4.3*:4[dbus,opengl,sqlite3,ssl] ) )
+	alsa? ( media-libs/alsa-lib )
+	portaudio? ( media-libs/portaudio )
+	pulseaudio? ( media-sound/pulseaudio )
+	speech? ( app-accessibility/speech-dispatcher )"
+
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	use dbus || conf_add="${conf_add} no-dbus"
+	use portaudio || conf_add="${conf_add} no-portaudio"
+	use pulseaudio || conf_add="${conf_add} no-pulseaudio"
+	use alsa || conf_add="${conf_add} no-alsa"
+	use oss || conf_add="${conf_add} no-oss"
+	use speech || conf_add="${conf_add} no-speechd"
+	use debug && conf_add="${conf_add} symbols debug" || conf_add="${conf_add} release"
+
+	eqmake4 "${S}/main.pro" -recursive \
+		CONFIG+="${conf_add} no-server no-bundled-speex" \
+		DEFINES+="PLUGIN_PATH=/usr/$(get_libdir)/mumble" \
+		|| die "eqmake4 failed."
+}
+
+src_install() {
+	newdoc README.Linux README || die "Installing docs failed."
+	dodoc CHANGES || die "Installing docs failed."
+
+	local dir
+	if use debug; then
+		dir=debug
+	else
+		dir=release
+	fi
+
+	dobin "${dir}"/mumble || die "Installing mumble binary failed."
+
+	CONF_LIBDIR="$(get_libdir)/mumble" dolib.so "${dir}"/lib*.so* || die "Installing libraries failed."
+	CONF_LIBDIR="$(get_libdir)/mumble" dolib.so "${dir}"/plugins/lib*.so* || die "Installing libraries failed."
+
+	insinto /usr/share/services
+	doins scripts/mumble.protocol || die "Installing mumble.protocol file failed."
+
+	dobin scripts/mumble-overlay || die "Installing overlay script failed."
+
+	newicon icons/mumble.64x64.png mumble.png || die "Installing icon failed."
+
+	make_desktop_entry ${PN} "Mumble" mumble "Qt;KDE;Network;Telephony;" \
+		|| die "Installing menu entry failed."
+
+	doman man/mumble-overlay.1 || die "Installing mumble-overlay manpage failed."
+	doman man/mumble.1 || die "Installing mumble manpage failed."
+}
+
+pkg_postinst() {
+	echo
+	elog "Visit http://mumble.sourceforge.net/Audio_Tuning for futher configuration."
+	elog "Run mumble-overlay to start the OpenGL overlay (after starting mumble)."
+	echo
+}