added G15 fix from upstream

(Portage version: 2.1.10.49/cvs/Linux x86_64)

4 files changed, 62 insertions, 45 deletions

diff --git a/media-sound/mangler/ChangeLog b/media-sound/mangler/ChangeLog
index e8471c5a40ba..84a807d0ddbb 100644
--- a/media-sound/mangler/ChangeLog
+++ b/media-sound/mangler/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/mangler
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mangler/ChangeLog,v 1.15 2012/05/05 08:33:47 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mangler/ChangeLog,v 1.16 2012/06/16 20:19:34 prometheanfire Exp $
+
+*mangler-1.2.4 (16 Jun 2012)
+
+  16 Jun 2012; Matthew Thode <prometheanfire@gentoo.org> +mangler-1.2.4.ebuild,
+  -mangler-1.2.0.ebuild, metadata.xml:
+  added G15 fix from upstream
 
   05 May 2012; Michał Górny <mgorny@gentoo.org> mangler-1.2.0.ebuild,
   mangler-1.2.1.ebuild, mangler-1.2.2.ebuild:
diff --git a/media-sound/mangler/mangler-1.2.0.ebuild b/media-sound/mangler/mangler-1.2.0.ebuild
deleted file mode 100644
index d384d862eb9a..000000000000
--- a/media-sound/mangler/mangler-1.2.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mangler/mangler-1.2.0.ebuild,v 1.4 2012/05/05 08:33:47 mgorny Exp $
-
-EAPI=2
-
-DESCRIPTION="Open source VOIP client capable of connecting to Ventrilo 3.x servers"
-HOMEPAGE="http://www.mangler.org/"
-SRC_URI="http://www.mangler.org/downloads/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+alsa celt espeak g15 +gsm pulseaudio +speex +xosd"
-
-RDEPEND="dev-cpp/gtkmm:2.4
-	gnome-base/librsvg
-	alsa? ( media-libs/alsa-lib )
-	celt? ( media-libs/celt )
-	espeak? ( app-accessibility/espeak )
-	g15? ( app-misc/g15daemon )
-	gsm? ( media-sound/gsm )
-	>=dev-libs/dbus-glib-0.80
-	pulseaudio? ( media-sound/pulseaudio )
-	speex? ( media-libs/speex )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${P/_/}
-
-src_configure() {
-	econf $(use_with alsa) \
-	$(use_with pulseaudio) \
-	$(use_enable celt) \
-	$(use_enable espeak) \
-	$(use_enable g15) \
-	$(use_enable gsm) \
-	$(use_enable speex) \
-	$(use_enable xosd)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-}
diff --git a/media-sound/mangler/mangler-1.2.4.ebuild b/media-sound/mangler/mangler-1.2.4.ebuild
new file mode 100644
index 000000000000..1b891b57d1ea
--- /dev/null
+++ b/media-sound/mangler/mangler-1.2.4.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mangler/mangler-1.2.4.ebuild,v 1.1 2012/06/16 20:19:34 prometheanfire Exp $
+
+EAPI=2
+
+DESCRIPTION="Open source VOIP client capable of connecting to Ventrilo 3.x servers"
+HOMEPAGE="http://www.mangler.org/"
+SRC_URI="http://www.mangler.org/downloads/${P}.tar.bz2"
+
+LICENSE="GPL-3 LGPL-2.1 ZLIB"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+alsa opus espeak g15 +gsm oss pulseaudio static-libs +speex +xosd"
+
+RDEPEND="dev-cpp/gtkmm:2.4
+	gnome-base/librsvg
+	>=dev-libs/dbus-glib-0.80
+	>=dev-libs/glib-2.20.1:2
+	>=x11-libs/gtk+-2.16:2
+	x11-libs/libX11
+	x11-libs/libXi
+	alsa? ( media-libs/alsa-lib )
+	opus? ( media-libs/opus )
+	espeak? ( app-accessibility/espeak )
+	g15? ( app-misc/g15daemon )
+	gsm? ( media-sound/gsm )
+	pulseaudio? ( >=media-sound/pulseaudio-0.9.14 )
+	speex? ( >=media-libs/speex-1.2_rc1 )
+	xosd? ( x11-libs/xosd )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_configure() {
+	econf \
+		--disable-dependency-tracking \
+		$(use_enable static-libs static) \
+		$(use_enable gsm) \
+		$(use_enable speex) \
+		$(use_enable opus) \
+		$(use_enable xosd) \
+		$(use_enable g15) \
+		$(use_enable espeak) \
+		$(use_with pulseaudio) \
+		$(use_with alsa) \
+		$(use_with oss)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS ChangeLog
+
+	find "${D}" -name '*.la' -exec rm -f '{}' +
+}
diff --git a/media-sound/mangler/metadata.xml b/media-sound/mangler/metadata.xml
index d4018e2d92b0..8d47f12c4d4a 100644
--- a/media-sound/mangler/metadata.xml
+++ b/media-sound/mangler/metadata.xml
@@ -6,6 +6,7 @@
     <flag name="celt">High quality, low delay audio codec</flag>
     <flag name="espeak">Text to speach engine</flag>
     <flag name="g15">Logitech g15 lcd support</flag>
+	<flag name="opus">Codec specialized for speach over the internet</flag>
   </use>
   <maintainer>
     <email>prometheanfire@gentoo.org</email>