Version bump, remove old. Don't use system celt library for compatibility reasons wrt bug #354991.

(Portage version: 2.2.0_alpha24/cvs/Linux x86_64)

2 files changed, 16 insertions, 14 deletions

diff --git a/media-sound/mumble/ChangeLog b/media-sound/mumble/ChangeLog
index 164ba717e979..f465657d1ba5 100644
--- a/media-sound/mumble/ChangeLog
+++ b/media-sound/mumble/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/mumble
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mumble/ChangeLog,v 1.28 2010/12/07 22:01:42 tgurr Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mumble/ChangeLog,v 1.29 2011/02/20 22:11:52 tgurr Exp $
+
+*mumble-1.2.3 (20 Feb 2011)
+
+  20 Feb 2011; Timo Gurr <tgurr@gentoo.org> -mumble-1.2.3_rc1.ebuild,
+  +mumble-1.2.3.ebuild:
+  Version bump, remove old. Don't use system celt library for compatibility
+  reasons wrt bug #354991.
 
 *mumble-1.2.3_rc1 (07 Dec 2010)
 
diff --git a/media-sound/mumble/mumble-1.2.3_rc1.ebuild b/media-sound/mumble/mumble-1.2.3.ebuild
index ec3c32f6fc1a..d108b5ea6e1a 100644
--- a/media-sound/mumble/mumble-1.2.3_rc1.ebuild
+++ b/media-sound/mumble/mumble-1.2.3.ebuild
@@ -1,16 +1,14 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mumble/mumble-1.2.3_rc1.ebuild,v 1.1 2010/12/07 22:01:42 tgurr Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mumble/mumble-1.2.3.ebuild,v 1.1 2011/02/20 22:11:52 tgurr Exp $
 
 EAPI="2"
 
 inherit eutils multilib qt4-r2
 
-MY_P="${P/_/-}"
-
-DESCRIPTION="Mumble is an open source, low-latency, high quality voice chat software."
+DESCRIPTION="Mumble is an open source, low-latency, high quality voice chat software"
 HOMEPAGE="http://mumble.sourceforge.net/"
-SRC_URI="http://mumble.info/snapshot/${MY_P}.tar.gz"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
@@ -20,8 +18,7 @@ IUSE="+alsa +dbus debug g15 oss pch portaudio pulseaudio speech zeroconf"
 RDEPEND=">=dev-libs/boost-1.41.0
 	>=dev-libs/openssl-1.0.0b
 	>=dev-libs/protobuf-2.2.0
-	>=media-libs/celt-0.7.0
-	>=media-libs/libsndfile-1.0.20
+	>=media-libs/libsndfile-1.0.20[-minimal]
 	>=media-libs/speex-1.2_rc1
 	sys-apps/lsb-release
 	x11-libs/qt-core:4[ssl]
@@ -41,8 +38,6 @@ RDEPEND=">=dev-libs/boost-1.41.0
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
-S="${WORKDIR}/${MY_P}"
-
 src_configure() {
 	local conf_add
 
@@ -65,7 +60,6 @@ src_configure() {
 	eqmake4 "${S}/main.pro" -recursive \
 		CONFIG+="${conf_add} \
 			no-11x \
-			no-bundled-celt \
 			no-bundled-speex \
 			no-embed-qt-translations \
 			no-server \
@@ -101,7 +95,8 @@ src_install() {
 
 	insopts -o root -g root -m 0755
 	insinto "/usr/$(get_libdir)/mumble"
-	doins "${dir}"/lib*.so* || die "Installing plugins failed."
+	doins "${dir}"/libmumble.so.${PV} || die "Installing mumble lib failed."
+	doins "${dir}"/libcelt0.so.0.{7,11}.0 || die "Installing celt libs failed."
 	doins "${dir}"/plugins/lib*.so* || die "Installing plugins failed."
 }