Version bump, remove old.

Package-Manager: portage-2.2.0_alpha142/cvs/Linux x86_64

3 files changed, 44 insertions, 42 deletions

diff --git a/media-sound/mumble/ChangeLog b/media-sound/mumble/ChangeLog
index 2200fe27f9e1..07c53181c224 100644
--- a/media-sound/mumble/ChangeLog
+++ b/media-sound/mumble/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/mumble
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mumble/ChangeLog,v 1.36 2012/05/05 08:43:02 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mumble/ChangeLog,v 1.37 2012/11/16 00:56:34 tgurr Exp $
+
+*mumble-1.2.4_beta1 (16 Nov 2012)
+
+  16 Nov 2012; Timo Gurr <tgurr@gentoo.org> +mumble-1.2.4_beta1.ebuild,
+  -mumble-1.2.3-r1.ebuild:
+  Version bump, remove old.
 
   05 May 2012; Michał Górny <mgorny@gentoo.org> mumble-1.2.3-r1.ebuild,
   mumble-1.2.3-r2.ebuild:
@@ -187,4 +193,3 @@
   25 Nov 2006; Timothy Redaelli <drizzt@gentoo.org>
   +files/mumble-0.9.4-path.patch, +metadata.xml, +mumble-0.9.4.ebuild:
   New ebuild, thanks to Gorch wrt bug #155517
-
diff --git a/media-sound/mumble/Manifest b/media-sound/mumble/Manifest
index 1023c3a234ad..1d08a8e90f96 100644
--- a/media-sound/mumble/Manifest
+++ b/media-sound/mumble/Manifest
@@ -1,19 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-AUX mumble-1.2.3-fix-cert-validation.patch 930 RMD160 b1b2a9c8fa66daff53ea43339dc2d787f4b45c5b SHA1 99900bb1fa3d8de00545b9463d298d55aa96b7eb SHA256 5d6768d15012fe1e679dedb8c47da08785d2e67836b30e5ffd555a323264588d
-AUX mumble-1.2.3-set-file-permissions.patch 1880 RMD160 f907a24bd9237c80e92005cbe6fde9623483cf07 SHA1 8037e1590451b8a9e68c1696d6f48b88a9629c80 SHA256 e0daae0670ce5c64e341c8bd9266f960039af63df0e3ad7b316016346c43a528
-DIST mumble-1.2.3.tar.gz 3448053 RMD160 c02e1c42e6996e7b6052772089febd22be67582d SHA1 420e245ef978d7e51ca3ed97922acf13f5ef982d SHA256 05895122ae4abec3fb62ef24ed9d167ffd768e7080ed179c8bf3afca96d18a5c
-EBUILD mumble-1.2.3-r1.ebuild 3497 RMD160 87a0f1198ddb270c55ee8d5650ba96838b319f03 SHA1 33f0c129d6d1b81f708a5240af26d7aa5f55eceb SHA256 dc7ebcc60f89d1ad7b8cb5761a2a79369816c70d666264262cd25744dd2ba7f4
-EBUILD mumble-1.2.3-r2.ebuild 3033 RMD160 4885225244cbd411edd7b1c7622b22f0e8653d3f SHA1 b8857c2eb446226abc8719f6f624e87ba9b20a72 SHA256 8e71a69584b7fd0612dd536ba19ccc6bca8ce7e58b9c610bcf75db405ea4787a
-MISC ChangeLog 6993 RMD160 9fee19930178eb558de5bcbe415a809c8e19ec8f SHA1 d980e1be293e3779e5d5ade256e1a6f5f546f060 SHA256 f1867f6198c3681e8ce4c52692f5f666e755479771c36d148f7a5101586b733c
-MISC metadata.xml 549 RMD160 bf20d4ebeee550d7eca61800a73c35334d48c2c4 SHA1 c1ee529dac74906ffb1c8c32eb9e7923f8767dc1 SHA256 509dfd976cbcf31578d2a49906a7fee519fd5ec2dd664e85f5269d2da5337ff3
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iJwEAQEIAAYFAk+k6E4ACgkQfXuS5UK5QB0yqgP/WwMcOrEpaFrUev7F16Af1wdf
-001138GYBHxHQ8UD4ln78I8E3X31jzRinOPNWqCZ+lBXy0oc+3obpRxfq+RqEj5G
-VIeYMNoJehbVR3YXmkcPAq2LGTUskYn9LSf+wSAKXdISpEHtoOMTjHukSeIq1/B5
-YXK3H++At8PjmkQzgZM=
-=TBon
------END PGP SIGNATURE-----
+AUX mumble-1.2.3-fix-cert-validation.patch 930 SHA256 5d6768d15012fe1e679dedb8c47da08785d2e67836b30e5ffd555a323264588d SHA512 2ab7c9087ee3cc3ba905dcf961a96df2378148a0019a49fed664ee1cb44fafeb50f3736bf76ca276bbecfa10baff4e20b0527e8b3a13065e0597935a82f47298 WHIRLPOOL 17ad0be8d8951c9c5d14f75bef840dc492cf228dbe60e244a4d5fda772a0c63540a6043497b8d52a203fc3434c2d3881d0410dd7c5771d6ed870f935f770f93a
+AUX mumble-1.2.3-set-file-permissions.patch 1880 SHA256 e0daae0670ce5c64e341c8bd9266f960039af63df0e3ad7b316016346c43a528 SHA512 37ef5fcb692887943c9d62145df7e696d81d87ac68b8abedba1ca4aabe637066636a14dd2e15bd5761472bc8e95a144a1ddabfeb623daf27eddc8467b42cdae9 WHIRLPOOL 864efb165a40c27f3f4ca887df46b1c9c2de2fe2c55c222ce58762943d9b65c20e5bd9ff701fcbab683fa8294476361df81b699e45993f26c7b8a03624dafb43
+DIST mumble-1.2.3.tar.gz 3448053 SHA256 05895122ae4abec3fb62ef24ed9d167ffd768e7080ed179c8bf3afca96d18a5c
+DIST mumble-1.2.4~beta1.tar.gz 3269905 SHA256 4fcd1e8a230b05e268bc698e15184bda7129b41f58fc77b2007de1e6bccffd9a SHA512 d4ab11b41cc904ce9221a8dfb35d77df4546d94986fd2ae48406bf46898c4078c5869ef1de676478393d8ad7348183a69afee847264ffb2a359598d33649cb70 WHIRLPOOL 355f1e6193661006e16b9ea7dc87bd6e7a88c4af7810aa7c432530470fe348b789de42d45ede3ae1851038bd3994a561cebb6f234ab77284bdc6a5d6f61a4f07
+EBUILD mumble-1.2.3-r2.ebuild 3033 SHA256 8e71a69584b7fd0612dd536ba19ccc6bca8ce7e58b9c610bcf75db405ea4787a SHA512 ed1ecb20138c812727684c0770474384b1695a2b47a00c7f5dd86bd40ac8a3d559f9a11c780703f566db2fdec63bba59bbf5e10c6a572124614a050c4301929b WHIRLPOOL f8cabe60aaf329f06694c251dd8c9737f9719ac03c84be29acae07fe1415432dc4ddb64a8a083435ca7736020f3925e875edaa2d553691f08a594010efdeaf77
+EBUILD mumble-1.2.4_beta1.ebuild 3054 SHA256 5614c7cbdc1704e178e2128c3a5f0ba8ae371346a28a16208df84b32cbe3404b SHA512 ca4a1735614c532b199918e55a06e5085d8dc98accda2d0b88c4445d86bf36d44b79dc46f48c6afd1faa731e00c8906180d89d786b9f6d8b29e953f23295f619 WHIRLPOOL 8da8ed5c9047f2010c34d77d034d04f4502820addf330dfb85636c15a8eb4c34294f2cc5d66f5c9dc0642dbedffeb3f3ecdccb9189d323d86f68079880a5fa03
+MISC ChangeLog 7154 SHA256 2a141bc60f005ce914ae01b42a14f828b94f5a3a435e06854a791bce2fdacf76 SHA512 9a2e2c460cd4a2fb8ef41d59bfdbf8f25a922d471a01c1893b34b82e8b532cfc91fb7a12fd09e41c385f3fb2789a3ea9fe22b82c4587c348f578662e1429f6f9 WHIRLPOOL 1c3b2963cf086c64bac629d7579c680cc75da466bc1ef07379bc88aec0f5a274d6abd00180200304456f4e8e3116833f427ab9ab1eef025188a88b32d9192571
+MISC metadata.xml 549 SHA256 509dfd976cbcf31578d2a49906a7fee519fd5ec2dd664e85f5269d2da5337ff3 SHA512 efc824f64b258702cac6c69340c9228088ffc9bfb15fefe89a2a2897a1d8fd1361a9ae85c07067d6174052f0859a3290991a6c9c9b6084bd37d0f4a7a8f96553 WHIRLPOOL efe80a37785b679008f7d8aa2fae4cc695fc39e2bf6da29605691f1e549a2f072a2c70500224957c5325dd16537f42a56585c44577ca863775c4286c2fce82e9
diff --git a/media-sound/mumble/mumble-1.2.3-r1.ebuild b/media-sound/mumble/mumble-1.2.4_beta1.ebuild
index cd67ac18c755..5748138efcd0 100644
--- a/media-sound/mumble/mumble-1.2.3-r1.ebuild
+++ b/media-sound/mumble/mumble-1.2.4_beta1.ebuild
@@ -1,26 +1,33 @@
 # Copyright 1999-2012 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-r1.ebuild,v 1.3 2012/05/05 08:43:02 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mumble/mumble-1.2.4_beta1.ebuild,v 1.1 2012/11/16 00:56:34 tgurr Exp $
 
-EAPI="2"
+EAPI="4"
+
+QT_MINIMAL="4.6"
 
 inherit eutils multilib qt4-r2
 
+MY_P="${PN}-${PV/_/~}"
+
 DESCRIPTION="Mumble is an open source, low-latency, high quality voice chat software"
 HOMEPAGE="http://mumble.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+SRC_URI="http://mumble.info/snapshot/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 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/libsndfile-1.0.20[-minimal]
+	>=media-libs/opus-1.0.1
 	>=media-libs/speex-1.2_rc1
 	sys-apps/lsb-release
+	x11-libs/libX11
+	x11-libs/libXi
 	x11-libs/qt-core:4[ssl]
 	x11-libs/qt-gui:4
 	x11-libs/qt-opengl:4
@@ -34,10 +41,12 @@ RDEPEND=">=dev-libs/boost-1.41.0
 	portaudio? ( media-libs/portaudio )
 	pulseaudio? ( media-sound/pulseaudio )
 	speech? ( app-accessibility/speech-dispatcher )
-	zeroconf? ( || ( net-dns/avahi[mdnsresponder-compat] net-misc/mDNSResponder ) )"
+	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
+S="${WORKDIR}/${MY_P}"
+
 src_configure() {
 	local conf_add
 
@@ -60,18 +69,17 @@ src_configure() {
 	eqmake4 "${S}/main.pro" -recursive \
 		CONFIG+="${conf_add} \
 			bundled-celt \
-			no-11x \
+			no-bundled-opus \
 			no-bundled-speex \
 			no-embed-qt-translations \
 			no-server \
 			no-update" \
-		DEFINES+="PLUGIN_PATH=/usr/$(get_libdir)/mumble" \
-		|| die "eqmake4 failed."
+		DEFINES+="PLUGIN_PATH=/usr/$(get_libdir)/mumble"
 }
 
 src_install() {
-	newdoc README.Linux README || die "Installing docs failed."
-	dodoc CHANGES || die "Installing docs failed."
+	newdoc README.Linux README
+	dodoc CHANGES
 
 	local dir
 	if use debug; then
@@ -80,26 +88,26 @@ src_install() {
 		dir=release
 	fi
 
-	dobin "${dir}"/mumble || die "Installing mumble binary failed."
-	dobin scripts/mumble-overlay || die "Installing overlay script failed."
+	dobin "${dir}"/mumble
+	dobin scripts/mumble-overlay
 
 	insinto /usr/share/services
-	doins scripts/mumble.protocol || die "Installing mumble.protocol file failed."
+	doins scripts/mumble.protocol
 
-	domenu scripts/mumble.desktop || die "Installing menu entry failed."
+	domenu scripts/mumble.desktop
 
 	insinto /usr/share/icons/hicolor/scalable/apps
-	doins icons/mumble.svg || die "Installing icon failed."
+	doins icons/mumble.svg
 
-	doman man/mumble-overlay.1 || die "Installing mumble-overlay manpage failed."
-	doman man/mumble.1 || die "Installing mumble manpage failed."
+	doman man/mumble-overlay.1
+	doman man/mumble.1
 
 	insopts -o root -g root -m 0755
 	insinto "/usr/$(get_libdir)/mumble"
-	doins "${dir}"/libmumble.so.${PV} || die "Installing mumble lib failed."
-	dosym libmumble.so.${PV} /usr/$(get_libdir)/mumble/libmumble.so.1 || die "Installing libmumble symlink failed."
-	doins "${dir}"/libcelt0.so.0.{7,11}.0 || die "Installing celt libs failed."
-	doins "${dir}"/plugins/lib*.so* || die "Installing plugins failed."
+	doins "${dir}"/libmumble.so.1.2.4
+	dosym libmumble.so.1.2.4 /usr/$(get_libdir)/mumble/libmumble.so.1
+	doins "${dir}"/libcelt0.so.0.{7,11}.0
+	doins "${dir}"/plugins/lib*.so*
 }
 
 pkg_postinst() {