Version bump, fixing bug #256848 (thanks Atman Sense for the diff). Remove old and take over maintainership.

(Portage version: 2.2_rc23/cvs/Linux x86_64)

3 files changed, 34 insertions, 17 deletions

diff --git a/media-sound/mumble/ChangeLog b/media-sound/mumble/ChangeLog
index 9c0a82bae0d3..584f4f8afd2e 100644
--- a/media-sound/mumble/ChangeLog
+++ b/media-sound/mumble/ChangeLog
@@ -1,6 +1,13 @@
 # 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.13 2008/11/07 17:05:23 tgurr Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mumble/ChangeLog,v 1.14 2009/01/30 00:55:21 tgurr Exp $
+
+*mumble-1.1.7 (30 Jan 2009)
+
+  30 Jan 2009; Timo Gurr <tgurr@gentoo.org> metadata.xml,
+  -mumble-1.1.6-r1.ebuild, +mumble-1.1.7.ebuild:
+  Version bump, fixing bug #256848 (thanks Atman Sense for the diff). Remove
+  old and take over maintainership.
 
 *mumble-1.1.6-r1 (07 Nov 2008)
 
diff --git a/media-sound/mumble/metadata.xml b/media-sound/mumble/metadata.xml
index 723598ddc97e..98f6882ca9bb 100644
--- a/media-sound/mumble/metadata.xml
+++ b/media-sound/mumble/metadata.xml
@@ -3,12 +3,13 @@
 <pkgmetadata>
 <herd>voip</herd>
 <maintainer>
-<email>drizzt@gentoo.org</email>
+<email>tgurr@gentoo.org</email>
 </maintainer>
 <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>
+	<flag name='g15'>Enable support for the Logitech G15 LCD (and compatible devices).</flag>
+	<flag name='speech'>Enable text-to-speech support in Mumble.</flag>
 </use>
 </pkgmetadata>
diff --git a/media-sound/mumble/mumble-1.1.6-r1.ebuild b/media-sound/mumble/mumble-1.1.7.ebuild
index a0a09e3960a9..f85ae243a990 100644
--- a/media-sound/mumble/mumble-1.1.6-r1.ebuild
+++ b/media-sound/mumble/mumble-1.1.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 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-r1.ebuild,v 1.1 2008/11/07 17:05:23 tgurr Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mumble/mumble-1.1.7.ebuild,v 1.1 2009/01/30 00:55:21 tgurr Exp $
 
 EAPI="2"
 
@@ -13,17 +13,17 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="alsa dbus debug oss portaudio pulseaudio speech"
+IUSE="alsa dbus debug g15 oss pch portaudio pulseaudio speech"
 
 RDEPEND="dev-libs/boost
 	>=media-libs/speex-1.2_beta3_p2
-	|| ( ( 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] ) )
+	x11-libs/qt-core:4[ssl]
+	x11-libs/qt-gui:4
+	x11-libs/qt-opengl:4
+	x11-libs/qt-sql:4[sqlite]
 	alsa? ( media-libs/alsa-lib )
+	dbus? ( x11-libs/qt-dbus:4 )
+	g15? ( app-misc/g15daemon )
 	portaudio? ( media-libs/portaudio )
 	pulseaudio? ( media-sound/pulseaudio )
 	speech? ( app-accessibility/speech-dispatcher )"
@@ -31,16 +31,25 @@ RDEPEND="dev-libs/boost
 DEPEND="${RDEPEND}"
 
 src_configure() {
+	local conf_add
+
+	if has_version '<=sys-devel/gcc-4.2'; then
+		conf_add="${conf_add} no-pch"
+	else
+		use pch || conf_add="${conf_add} no-pch"
+	fi
+
+	use alsa || conf_add="${conf_add} no-alsa"
 	use dbus || conf_add="${conf_add} no-dbus"
+	use debug && conf_add="${conf_add} symbols debug" || conf_add="${conf_add} release"
+	use g15 || conf_add="${conf_add} no-g15"
+	use oss || conf_add="${conf_add} no-oss"
 	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 no-xevie" \
+		CONFIG+="${conf_add} no-bundled-speex no-embed-qt-translations no-server no-xevie" \
 		DEFINES+="PLUGIN_PATH=/usr/$(get_libdir)/mumble" \
 		|| die "eqmake4 failed."
 }