update mumble to 1.2.10

11 files changed, 483 insertions, 560 deletions

diff --git a/media-sound/mumble/ChangeLog b/media-sound/mumble/ChangeLog
new file mode 100644
index 0000000..7ff86d4
--- /dev/null
+++ b/media-sound/mumble/ChangeLog
@@ -0,0 +1,85 @@
+# ChangeLog for media-sound/mumble
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# (auto-generated from git log)
+
+*mumble-1.2.8 (09 Aug 2015)
+*mumble-1.2.6 (09 Aug 2015)
+
+  09 Aug 2015; Robin H. Johnson <robbat2@gentoo.org>
+  +files/mumble-1.2.4-speech-dispatcher.patch, +metadata.xml,
+  +mumble-1.2.6.ebuild, +mumble-1.2.8.ebuild:
+  proj/gentoo: Initial commit
+
+  This commit represents a new era for Gentoo:
+  Storing the gentoo-x86 tree in Git, as converted from CVS.
+
+  This commit is the start of the NEW history.
+  Any historical data is intended to be grafted onto this point.
+
+  Creation process:
+  1. Take final CVS checkout snapshot
+  2. Remove ALL ChangeLog* files
+  3. Transform all Manifests to thin
+  4. Remove empty Manifests
+  5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
+  5.1. Do not touch files with -kb/-ko keyword flags.
+
+  Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
+  X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration
+  tests
+  X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this
+  project
+  X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo
+  developer, wrote Git features for the migration
+  X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve
+  cvs2svn
+  X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
+  X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014
+  work in migration
+  X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
+  X-Thanks: All of other Gentoo developers - many ideas and lots of paint on
+  the bikeshed
+
+  24 Aug 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Use https by default
+
+  Convert all URLs for sites supporting encrypted connections from http to
+  https
+
+  Signed-off-by: Justin Lecher <jlec@gentoo.org>
+
+  24 Aug 2015; Mike Gilbert <floppym@gentoo.org> metadata.xml:
+  Revert DOCTYPE SYSTEM https changes in metadata.xml
+
+  repoman does not yet accept the https version.
+  This partially reverts eaaface92ee81f30a6ac66fe7acbcc42c00dc450.
+
+  Bug: https://bugs.gentoo.org/552720
+
+  01 Oct 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add missing remote-id type=sourceforge
+
+  Signed-off-by: Justin Lecher <jlec@gentoo.org>
+
+  02 Oct 2015; Ryan Hill <rhill@gentoo.org> +files/mumble-1.2.8-gcc49.patch,
+  mumble-1.2.8.ebuild:
+  Fix build with GCC 4.9.
+
+  Gentoo-Bug: https://bugs.gentoo.org/532180
+
+  Package-Manager: portage-2.2.22
+  Signed-off-by: Ryan Hill <rhill@gentoo.org>
+
+*mumble-1.2.10 (02 Oct 2015)
+
+  02 Oct 2015; Lars Wendler <polynomial-c@gentoo.org> +mumble-1.2.10.ebuild:
+  Bump to version 1.2.10 (bug #552092)
+
+  Package-Manager: portage-2.2.22
+  Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
+
+*mumble-1.2.10-r1 (04 Oct 2015)
+
+  04 Oct 2015; Julian Ospald <hasufell@gentoo.org> +mumble-1.2.10-r1.ebuild:
+  add libressl support
+
diff --git a/media-sound/mumble/ChangeLog-2015 b/media-sound/mumble/ChangeLog-2015
new file mode 100644
index 0000000..226a0ed
--- /dev/null
+++ b/media-sound/mumble/ChangeLog-2015
@@ -0,0 +1,256 @@
+# ChangeLog for media-sound/mumble
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mumble/ChangeLog,v 1.53 2014/10/30 21:50:38 tgurr Exp $
+
+*mumble-1.2.8 (30 Oct 2014)
+
+  30 Oct 2014; Timo Gurr <tgurr@gentoo.org> +mumble-1.2.8.ebuild:
+  Version bump, wrt bug #519010.
+
+  06 Jun 2014; Sergey Popov <pinkbyte@gentoo.org> -mumble-1.2.5.ebuild:
+  Security cleanup, wrt bug #510380
+
+  04 Jun 2014; Agostino Sarubbo <ago@gentoo.org> mumble-1.2.6.ebuild:
+  Stable for x86, wrt bug #510380
+
+  04 Jun 2014; Agostino Sarubbo <ago@gentoo.org> mumble-1.2.6.ebuild:
+  Stable for amd64, wrt bug #510380
+
+*mumble-1.2.6 (15 May 2014)
+
+  15 May 2014; Timo Gurr <tgurr@gentoo.org> +mumble-1.2.6.ebuild:
+  Version bump. Fixes security bug #510380 (CVE-2014-3755).
+
+  26 Mar 2014; Timo Gurr <tgurr@gentoo.org> -mumble-1.2.4.ebuild:
+  Remove old.
+
+  15 Feb 2014; Agostino Sarubbo <ago@gentoo.org> mumble-1.2.5.ebuild:
+  Stable for x86, wrt bug #500486
+
+  15 Feb 2014; Agostino Sarubbo <ago@gentoo.org> mumble-1.2.5.ebuild:
+  Stable for amd64, wrt bug #500486
+
+*mumble-1.2.5 (07 Feb 2014)
+
+  07 Feb 2014; Timo Gurr <tgurr@gentoo.org> +mumble-1.2.5.ebuild:
+  Version bump. Fixes security bug #500486 (CVE-2014-004{4,5}).
+
+  17 Nov 2013; Timo Gurr <tgurr@gentoo.org> -mumble-1.2.3-r2.ebuild,
+  -files/mumble-1.2.3-fix-cert-validation.patch,
+  -files/mumble-1.2.3-set-file-permissions.patch:
+  Remove old.
+
+  27 Oct 2013; Pacho Ramos <pacho@gentoo.org> metadata.xml:
+  Voip herd is removed: http://article.gmane.org/gmane.linux.gentoo.devel/88434
+
+  13 Jul 2013; Agostino Sarubbo <ago@gentoo.org> mumble-1.2.4.ebuild:
+  Stable for x86, wrt bug #476266
+
+  13 Jul 2013; Agostino Sarubbo <ago@gentoo.org> mumble-1.2.4.ebuild:
+  Stable for amd64, wrt bug #476266
+
+  07 Jun 2013; Timo Gurr <tgurr@gentoo.org> mumble-1.2.4.ebuild,
+  +files/mumble-1.2.4-speech-dispatcher.patch:
+  Fix building with speech-dispatcher >=0.8 wrt bug #472366.
+
+*mumble-1.2.4 (04 Jun 2013)
+
+  04 Jun 2013; Timo Gurr <tgurr@gentoo.org> -mumble-1.2.4_beta1.ebuild,
+  +mumble-1.2.4.ebuild:
+  Version bump, remove old. Fixes bug #396479,#445960,#472182
+
+  02 Mar 2013; Markos Chandras <hwoarang@gentoo.org> mumble-1.2.3-r2.ebuild,
+  mumble-1.2.4_beta1.ebuild:
+  Move Qt dependencies to the new category
+
+*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:
+  dev-util/pkgconfig -> virtual/pkgconfig
+
+  18 Feb 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org> mumble-1.2.3-r2.ebuild:
+  x86 stable wrt bug #403939
+
+  16 Feb 2012; Agostino Sarubbo <ago@gentoo.org> mumble-1.2.3-r2.ebuild:
+  Stable for AMD64, wrt security bug #403845
+
+*mumble-1.2.3-r2 (16 Feb 2012)
+
+  16 Feb 2012; Timo Gurr <tgurr@gentoo.org> -mumble-1.1.8.ebuild,
+  -mumble-1.2.2.ebuild, +mumble-1.2.3-r2.ebuild,
+  +files/mumble-1.2.3-fix-cert-validation.patch,
+  +files/mumble-1.2.3-set-file-permissions.patch:
+  Revbump fixing security issue wrt bug #403939. Removing mDNSResponder wrt
+  upcomming last rite. Added patch for Qt 4.8 SSL. EAPI bump. Remove old.
+
+  14 Jun 2011; Markus Meier <maekke@gentoo.org> mumble-1.2.3-r1.ebuild:
+  amd64/x86 stable, bug #370245
+
+*mumble-1.2.3-r1 (03 Mar 2011)
+
+  03 Mar 2011; Timo Gurr <tgurr@gentoo.org> -mumble-1.2.3.ebuild,
+  +mumble-1.2.3-r1.ebuild:
+  Revbump installing libmumble symlink fixing bug #356525, thanks to Daniel
+  Troeder.
+
+  21 Feb 2011; Timo Gurr <tgurr@gentoo.org> mumble-1.2.3.ebuild:
+  Force bundled celt libraries even when a system celt library is detected,
+  fixes bug #355781.
+
+*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)
+
+  07 Dec 2010; Timo Gurr <tgurr@gentoo.org> +mumble-1.2.3_rc1.ebuild:
+  Version bump, fix bug #307643 thanks to Nikos Chantziaras.
+
+*mumble-1.2.2 (10 Feb 2010)
+
+  10 Feb 2010; Timo Gurr <tgurr@gentoo.org> -mumble-1.2.1-r1.ebuild,
+  -files/mumble-1.2.1-celt-libnaming.patch, +mumble-1.2.2.ebuild:
+  Version bump, remove old.
+
+*mumble-1.2.1-r1 (02 Feb 2010)
+
+  02 Feb 2010; Timo Gurr <tgurr@gentoo.org> -mumble-1.2.1.ebuild,
+  +mumble-1.2.1-r1.ebuild, +files/mumble-1.2.1-celt-libnaming.patch:
+  Fix usage of newer celt versions wrt bug #293300. Thanks to Dennis
+  Schridde again.
+
+*mumble-1.2.1 (08 Jan 2010)
+
+  08 Jan 2010; Timo Gurr <tgurr@gentoo.org> -mumble-1.2.0.ebuild,
+  +mumble-1.2.1.ebuild:
+  Version bump, remove old.
+
+*mumble-1.2.0 (11 Dec 2009)
+
+  11 Dec 2009; Timo Gurr <tgurr@gentoo.org> -mumble-1.2.0_beta2.ebuild,
+  +mumble-1.2.0.ebuild:
+  Version bump, remove old.
+
+*mumble-1.2.0_beta2 (08 Dec 2009)
+
+  08 Dec 2009; Timo Gurr <tgurr@gentoo.org> -mumble-1.2.0_beta1.ebuild,
+  +mumble-1.2.0_beta2.ebuild:
+  Version bump.
+
+  14 Nov 2009; Timo Gurr <tgurr@gentoo.org> mumble-1.2.0_beta1.ebuild:
+  Depend on >=dev-libs/boost-1.36.0-r1, fixing bug #293156.
+
+  14 Nov 2009; Timo Gurr <tgurr@gentoo.org> mumble-1.2.0_beta1.ebuild:
+  Disable build of 11x client.
+
+*mumble-1.2.0_beta1 (13 Nov 2009)
+
+  13 Nov 2009; Timo Gurr <tgurr@gentoo.org> +mumble-1.2.0_beta1.ebuild,
+  -mumble-1.2.0_pre20090911.ebuild:
+  Version bump.
+
+*mumble-1.2.0_pre20090911 (13 Sep 2009)
+
+  13 Sep 2009; Timo Gurr <tgurr@gentoo.org>
+  -mumble-1.2.0_pre20090808.ebuild, +mumble-1.2.0_pre20090911.ebuild:
+  New snapshot, also fixing bug #281683.
+
+*mumble-1.2.0_pre20090808 (13 Aug 2009)
+
+  13 Aug 2009; Timo Gurr <tgurr@gentoo.org>
+  +mumble-1.2.0_pre20090808.ebuild, metadata.xml:
+  Version bump to latest snapshot. Beware that the new release is not
+  compatible with older versions.
+
+  25 Mar 2009; Timo Gurr <tgurr@gentoo.org> mumble-1.1.8.ebuild:
+  IUSE default love.
+
+  25 Mar 2009; Timo Gurr <tgurr@gentoo.org> mumble-1.1.8.ebuild:
+  Install the shipped .desktop file instead of creating our own.
+
+*mumble-1.1.8 (25 Mar 2009)
+
+  25 Mar 2009; Timo Gurr <tgurr@gentoo.org> -mumble-1.1.7.ebuild,
+  +mumble-1.1.8.ebuild:
+  Version bump, remove old.
+
+*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)
+
+  07 Nov 2008; Timo Gurr <tgurr@gentoo.org> -mumble-1.1.6.ebuild,
+  +mumble-1.1.6-r1.ebuild:
+  Revision bump removing deprecated XEvIE support, fixing bug #245081 and
+  bug #245557 (Thanks Hal Engel and Rémi Cardona.
+
+*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:
+  QA: Get rid of deprecated qt4_min_version(). Please fix your ebuilds to
+  support split Qt 4.4 dependencies, cf. bug 217161 comment 11.
+
+  29 Feb 2008; Carsten Lohrke <carlo@gentoo.org> mumble-0.9.4.ebuild,
+  mumble-1.1.1.ebuild:
+  Remove icon extension from desktop entry to match Icon Theme Specification.
+
+  06 Jan 2008; Timothy Redaelli <drizzt@gentoo.org> mumble-1.1.1.ebuild:
+  Fix for speex 1.2_beta3.
+  Bug #204422 and #204462.
+
+*mumble-1.1.1 (23 Dec 2007)
+
+  23 Dec 2007; Timothy Redaelli <drizzt@gentoo.org>
+  +files/mumble-1.1.1-path.patch, +mumble-1.1.1.ebuild:
+  Add new media-sound/mumble for testing wrt bug #183781.
+
+  05 May 2007; Timothy Redaelli <drizzt@gentoo.org>
+  files/mumble-0.9.4-path.patch, mumble-0.9.4.ebuild:
+  Add vanilla use flag and fixed the patch.
+  Thanks to Mikkel Krautz wrt bug #177167.
+
+  01 May 2007; Timothy Redaelli <drizzt@gentoo.org> mumble-0.9.4.ebuild:
+  Remove pch use flags since it does not work anymore. Force
+  >=sys-devel/gcc-3.4. Thanks to Perttu Luukko for reporting wrt #176513. P.s.
+  please don't use forum for bug reporting since we (developers) cannot follow
+  all the forum threads.
+
+  23 Mar 2007; Timothy Redaelli <drizzt@gentoo.org> mumble-0.9.4.ebuild:
+  Oops, I forgot -o to built_with_use (thanks to jabub for reporting)
+
+  28 Feb 2007; Timothy Redaelli <drizzt@gentoo.org> mumble-0.9.4.ebuild:
+  Add use pch (as suggested by X on comment 2 of bug #167428).
+  Accept also qt with sqlite3 use (thanks to desowin wrt bug #166215).
+
+  08 Feb 2007; Timothy Redaelli <drizzt@gentoo.org>
+  -files/mumble-0.9.4-missing_typedefs.patch, mumble-0.9.4.ebuild:
+  Removed mumble-0.9.4_missing-typdefs.patch thanks to Gorch wrt bug #165927
+
+  20 Jan 2007; Timothy Redaelli <drizzt@gentoo.org>
+  +files/mumble-0.9.4-missing_typedefs.patch, mumble-0.9.4.ebuild:
+  Add Gorch patch for missing typedefs on gcc 3, wrt bug #162912.
+
+*mumble-0.9.4 (25 Nov 2006)
+
+  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 3a3f3c3..56e0cb1 100644
--- a/media-sound/mumble/Manifest
+++ b/media-sound/mumble/Manifest
@@ -1,6 +1,8 @@
-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
-AUX mumble-jack-support-r2.patch 16201 SHA256 a2b6fc5a0f5d4b399af89f474c4b0ff878ce77fac01848f1681c9eec32739efb SHA512 3dd1c87016aa55bd8bc04108bca9be16b7d8290347401eb9ee8417b8719fa07854e8eb52bffc2bfe7e5df6c6e189ac151e7a7c6d69cb639b3cc2746f07810ac5 WHIRLPOOL 3ce57d7fb784208ae3e5492fcb82d99b79445fd4a66a4eba1d3e5dba8a41199085e9ab63f4eb533d300ff39ef946c5fd6d6d3123007784112064b233b48b22e3
-AUX mumble-jack-support.patch 16200 SHA256 8fb331d65363e394b7020c321e1105418c2150208bb9ab5f974e6f361dc557d4 SHA512 da44e6365aec060bae447f7a574ad2668bb2531cda723367b580e09190e7f3b293e6f9de889be44d41321efb7c798432fb3930513266ea5d92fa84582fab8d67 WHIRLPOOL 444223fd8d2d7463486889c6dc101297c5b449db1e524732c9e993a7fd92f47f5465cc691d3b781de363f3953f4aa7c5899f125115506322544d2401ba009158
-DIST mumble-1.2.3.tar.gz 3448053 SHA256 05895122ae4abec3fb62ef24ed9d167ffd768e7080ed179c8bf3afca96d18a5c SHA512 a50a9d93adf66de243f1fbcee4ed635681f8030965c7c23e0f5ee46eb4b5214d4e1ee7f1ba5201bd4b7e775d32df5cc95783721b0a325e3c49808ca1ffd88fe4 WHIRLPOOL 23d93c6ce47c72c4231b0064d8f5692b5a18e2cebf64117c3a64a2d39f02005731d886801252017a89f26a000401826436b55cef90cd6730d93e415ec5694689
-EBUILD mumble-1.2.3-r3.ebuild 3295 SHA256 2bdea77ec0cb6ff2b1b438b9581a9d5e535e9006e1425074302f7f313d396ad2 SHA512 5fec41e11c553222bcf81d57b1c1f6db8d3fb17044522e4afaf0c91dd76ae864b24fe940a786fc78fd663c7dfc9fae7ed7a3ad7036352b3a7373b78464ab901c WHIRLPOOL 36f6117fdbd92dc2cfa782108822d9ea84aad3d970ca2dee7090b12b4f7a3ac790ad25b20bac5345c01c0fc414a447d15cadd1ec9357ee6b9961d92b1989bb87
+AUX mumble-1.2.4-speech-dispatcher.patch 1289 SHA256 d9443303de024e2efb4c0969121f46b2ebbc45351ab5ab52181ac291aa7a4265 SHA512 32b83ba846fbda3529c222df2cf6fa0f615dabdd7e211051119fb9ed53bdc3e8e11aaa1b132bbdfcedffd72b1e19666aaf083799f7ebbbf60f536a9f9a0c6a2a WHIRLPOOL a1696342523dca02ea2c136239e9dbcc6066d4de7cbf195b4a288459b2886e93abb893ff85fad11e4afd21702ad8775002e9487a5068c315fa0b2a0269a07ee5
+AUX mumble-1.2.8-gcc49.patch 722 SHA256 c2aeeb7bfd1b2e2da1a4859f36a078fc89ae29012793ce8a121cf333f420cc88 SHA512 ede8f591291dab6877cd1bbb5fe6b56991df297ae56b2ca1b537abb2b03e15fc273ca26a143a8049c4f7eaba8beab92b23293d1241e015c19b5d03ebc451ec03 WHIRLPOOL 102db5d413d6b031ffe79f3f83fd449c944e64af101fa145efff83cd9501a0e9a82439c08c09c845f1a4657c0543a06c8840dc68f026368ef10d37c44e0ec378
+AUX mumble-jack-support.patch 16257 SHA256 86119fa9e9bbdf3da9aa44c0c99cb2a899d53f07a9e0b27080e24c67402bc143 SHA512 451084ff79b4b19f4895ea357e0da8db65405dd90a6965d7c4d12539b86dd2032de054482a0602a130cc1aa8b7b14b9d78cb466ec2696d085dfbc1a0daa5c825 WHIRLPOOL 127b344667a0ddafc3e234306527cbc6ca7161653f8c380190a0fb68a0fce19ce9303ad77da3442d9e32842dcf6199fc16caae982039a388373f892ec3569609
+DIST mumble-1.2.10.tar.gz 3195427 SHA256 c6367a63ef54aac8e6d556066297e536a8c288495d53490219a113e43aa85b04 SHA512 d4ff0572fd744cbf3473b25353b2ab8b2fc2d68921179c02f3047460d63c9e388d6d9e04fc4fb4b27eeaa63baf74d8bf3dc098cf24285619aef1b29f636b972e WHIRLPOOL 9aadb47756c7d1939c075079911a5851d619f973359e6346d209e5baaf7db9a80b2d622befd4e6ea10480875b1ea6479d9b4785111d9f88d9d009b17ecbc774a
+EBUILD mumble-1.2.10-r2.ebuild 3274 SHA256 509a8764ba4aa6fcea0c6834525b115301c120d7a9cc41d550f3d594c69d2e30 SHA512 ad7e37624b9ff3a4325dadba61d00cb783b56349b17b011286780ddc2d8a3ac635c1ae738ea2482f0e434d37e4ffb23a07c8f2cfa4efd7fa47b7fe19650462ac WHIRLPOOL 9e6c888f4030613504748f1bcc80fa3663f05003d88119d6f45afe650e5ca5ce4f7d9105ab17e4e61e553cc5717f92a3647515c1a89ae4c211522cdd9ae3d1c6
+MISC ChangeLog 2926 SHA256 50f2836dc0ae8f823adeb62dbe8a11410dec716515fe02ad2335f690befb7498 SHA512 f8e25bfb65d0adf11da9353487013576560c4cb679a3c60f7c4ffedb84eacce241d93159347112996914e6d2850c36ca2a4576724daf45aeb74866b6b9912554 WHIRLPOOL 700c19d2318b8f20c9da23efc5485a01b7d07be9bf8fe8a8df6c48b9191e1b99b8476292f81c5618e71e72363484334840cadcba5f700ef75ab2b09e2c17d051
+MISC ChangeLog-2015 9261 SHA256 286a0a7ae11db8c9647d6b7e881ebd6fae8890d9ca1e22f3e594c3fcf33d738c SHA512 04222e89743bc722bc65c9b47c6d3d0afa53bcc28961eddc0fcff9032ae10ec748fbad3d52071636f1a783e86a76677d565210cbae7a28ac31f1ab13688ef4cf WHIRLPOOL ad319ea3f2be80609019dea520fcba6166afe0b258c26642711579365d6fca1d93221b303eeee72b235e09b9134155647a51a96e1f358b2c9c597e3a4dd78734
+MISC metadata.xml 617 SHA256 6c178496863bd09713f92189ed4bacdb82b9ac2517546501084f996c7c00d5a7 SHA512 0a5620ebd31157c56270e78aed6466c3eea7839020508dc1e39d9fcf59d44fb5ce9cf443317f689a31f0946825e5187a85818f28ba95924743ff09bc3de3939b WHIRLPOOL 1f1eb2ce923ca2a0d8e74278ed5731a62602d813637e67af0294e6888d1356c4025021a7c6099efd7c24f060c4048e0c332062fa5385f2071f685e742c69bf9d
diff --git a/media-sound/mumble/files/mumble-1.2.3-fix-cert-validation.patch b/media-sound/mumble/files/mumble-1.2.3-fix-cert-validation.patch
deleted file mode 100644
index 1417417..0000000
--- a/media-sound/mumble/files/mumble-1.2.3-fix-cert-validation.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: Fix certificate validation with QT 4.8. For some reason, the
- new on-demand root cert loading is not working with mumble.
-Author: Marc Deslauriers <marc.deslauriers@canonical.com>
-Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/mumble/+bug/928296
-
-diff -Naur mumble-1.2.3/src/SSL.cpp mumble-1.2.3.new/src/SSL.cpp
---- mumble-1.2.3/src/SSL.cpp	2011-02-19 22:35:16.000000000 +0100
-+++ mumble-1.2.3.new/src/SSL.cpp	2012-02-16 02:45:20.353665502 +0100
-@@ -252,6 +252,11 @@
- 	QSslSocket::setDefaultCaCertificates(ql);
- #endif // NO_SYSTEM_CA_OVERRIDE
- 
-+#if QT_VERSION >= 0x040800
-+	// Don't perform on-demand loading of root certificates
-+	QSslSocket::setDefaultCaCertificates(QSslSocket::systemCaCertificates());
-+#endif
-+
- 	for (unsigned int i=0;i<sizeof(recommended_cas)/sizeof(recommended_cas[0]);++i) {
- 		QSslCertificate cert(recommended_cas[i]);
- 		if (! QSslSocket::defaultCaCertificates().contains(cert)) {
diff --git a/media-sound/mumble/files/mumble-1.2.3-set-file-permissions.patch b/media-sound/mumble/files/mumble-1.2.3-set-file-permissions.patch
deleted file mode 100644
index 83be96a..0000000
--- a/media-sound/mumble/files/mumble-1.2.3-set-file-permissions.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 5632c35d6759f5e13a7dfe78e4ee6403ff6a8e3e Mon Sep 17 00:00:00 2001
-From: Thorvald Natvig <slicer@users.sourceforge.net>
-Date: Fri, 27 May 2011 16:59:15 -0700
-Subject: [PATCH] Explicitly remove file permissions for settings and DB
-
----
- src/mumble/Database.cpp |    5 +++++
- src/mumble/Settings.cpp |   11 +++++++++++
- 2 files changed, 16 insertions(+), 0 deletions(-)
-
-diff --git a/src/mumble/Database.cpp b/src/mumble/Database.cpp
-index 5449fbe..8c3854f 100644
---- a/src/mumble/Database.cpp
-+++ b/src/mumble/Database.cpp
-@@ -94,6 +94,11 @@
- 		qWarning("Database: Database is read-only");
- 	}
- 
-+	{
-+		QFile f(db.databaseName());
-+		f.setPermissions(f.permissions() & ~(QFile::ReadGroup | QFile::WriteGroup | QFile::ExeGroup | QFile::ReadOther | QFile::WriteOther | QFile::ExeOther));
-+	}
-+
- 	QSqlQuery query;
- 
- 	query.exec(QLatin1String("CREATE TABLE IF NOT EXISTS `servers` (`id` INTEGER PRIMARY KEY AUTOINCREMENT, `name` TEXT, `hostname` TEXT, `port` INTEGER DEFAULT " MUMTEXT(DEFAULT_MUMBLE_PORT) ", `username` TEXT, `password` TEXT)"));
-diff --git a/src/mumble/Settings.cpp b/src/mumble/Settings.cpp
-index 404692b..b5e9202 100644
---- a/src/mumble/Settings.cpp
-+++ b/src/mumble/Settings.cpp
-@@ -716,6 +716,17 @@ void OverlaySettings::save() {
- void OverlaySettings::save(QSettings* settings_ptr) {
- 	OverlaySettings def;
- 
-+	settings_ptr->setValue(QLatin1String("version"), QLatin1String(MUMTEXT(MUMBLE_VERSION_STRING)));
-+	settings_ptr->sync();
-+
-+#if defined(Q_OS_WIN) || defined(Q_OS_MAC)
-+	if (settings_ptr->format() == QSettings::IniFormat)
-+#endif
-+        {
-+               QFile f(settings_ptr->fileName());
-+               f.setPermissions(f.permissions() & ~(QFile::ReadGroup | QFile::WriteGroup | QFile::ExeGroup | QFile::ReadOther | QFile::WriteOther | QFile::ExeOther));
-+        }
-+
- 	SAVELOAD(bEnable, "enable");
- 
- 	SAVELOAD(osShow, "show");
--- 
-1.7.5.4
-
diff --git a/media-sound/mumble/files/mumble-1.2.4-speech-dispatcher.patch b/media-sound/mumble/files/mumble-1.2.4-speech-dispatcher.patch
new file mode 100644
index 0000000..3a2c216
--- /dev/null
+++ b/media-sound/mumble/files/mumble-1.2.4-speech-dispatcher.patch
@@ -0,0 +1,49 @@
+From 22d18212acec9e97231a13a6dc02a0c451df9b89 Mon Sep 17 00:00:00 2001
+From: Mikkel Krautz <mikkel@krautz.dk>
+Date: Thu, 6 Jun 2013 22:17:31 +0200
+Subject: [PATCH] mumble.pro: add speech-dispatcher 0.8 compatibiltiy.
+
+Based on initial patch by Timo Gurr <timo.gurr@gmail.com>
+---
+ src/mumble/TextToSpeech_unix.cpp | 6 +++++-
+ src/mumble/mumble.pro            | 7 ++++++-
+ 2 files changed, 11 insertions(+), 2 deletions(-)
+
+diff --git a/src/mumble/TextToSpeech_unix.cpp b/src/mumble/TextToSpeech_unix.cpp
+index d0fbb82..6443c07 100644
+--- a/src/mumble/TextToSpeech_unix.cpp
++++ b/src/mumble/TextToSpeech_unix.cpp
+@@ -33,7 +33,11 @@
+ #include "TextToSpeech.h"
+ 
+ #ifdef USE_SPEECHD
+-#include <libspeechd.h>
++# ifdef USE_SPEECHD_PKGCONFIG
++#  include <speech-dispatcher/libspeechd.h>
++# else
++#  include <libspeechd.h>
++# endif
+ #endif
+ 
+ #include "Global.h"
+diff --git a/src/mumble/mumble.pro b/src/mumble/mumble.pro
+index 04f5a36..ff3c02f 100644
+--- a/src/mumble/mumble.pro
++++ b/src/mumble/mumble.pro
+@@ -279,7 +279,12 @@ dbus {
+ 
+ speechd {
+ 	DEFINES *= USE_SPEECHD
+-	LIBS *= -lspeechd
++	system(pkg-config --atleast-version=0.8 speech-dispatcher) {
++		DEFINES *= USE_SPEECHD_PKGCONFIG
++		PKGCONFIG *= speech-dispatcher
++	} else {
++		LIBS *= -lspeechd
++	}
+ }
+ 
+ directsound {
+-- 
+1.8.1.6
+
diff --git a/media-sound/mumble/files/mumble-1.2.8-gcc49.patch b/media-sound/mumble/files/mumble-1.2.8-gcc49.patch
new file mode 100644
index 0000000..cecb3d3
--- /dev/null
+++ b/media-sound/mumble/files/mumble-1.2.8-gcc49.patch
@@ -0,0 +1,26 @@
+https://bugs.gentoo.org/532180
+
+Avoid "jump to label crosses initialization" error.
+
+ Move variable "buffer" into the while loop to avoid a compile error
+ with g++ 4.9.0.
+
+ Although earlier compiler versions did accept the code, jumping into the
+ scope of an variable length array is not allowed:
+ http://gcc.gnu.org/onlinedocs/gcc-4.3.0/gcc/Variable-Length.html
+
+
+--- a/src/mumble/OSS.cpp
++++ b/src/mumble/OSS.cpp
+@@ -243,9 +243,9 @@ void OSSInput::run() {
+ 	eMicFormat = SampleShort;
+ 	initializeMixer();
+ 
+-	short buffer[iMicLength];
+-
+ 	while (bRunning) {
++		short buffer[iMicLength];
++
+ 		int len = static_cast<int>(iMicLength * iMicChannels * sizeof(short));
+ 		ssize_t l = read(fd, buffer, len);
+ 		if (l != len) {
diff --git a/media-sound/mumble/files/mumble-jack-support-r2.patch b/media-sound/mumble/files/mumble-jack-support-r2.patch
deleted file mode 100644
index fa94f44..0000000
--- a/media-sound/mumble/files/mumble-jack-support-r2.patch
+++ /dev/null
@@ -1,454 +0,0 @@
-diff -U 3 -H -d -r -N -- mumble-1.2.3/src/mumble/JackAudio.cpp mumble-1.2.3/src/mumble/JackAudio.cpp
---- mumble-1.2.3/src/mumble/JackAudio.cpp	1970-01-01 01:00:00.000000000 +0100
-+++ mumble-1.2.3/src/mumble/JackAudio.cpp	2011-01-26 06:02:00.000000000 +0000
-@@ -0,0 +1,314 @@
-+/* Copyright (C) 2011, Benjamin Jemlich <pcgod@users.sourceforge.net>
-+   Copyright (C) 2011, Filipe Coelho <falktx@gmail.com>
-+
-+   All rights reserved.
-+
-+   Redistribution and use in source and binary forms, with or without
-+   modification, are permitted provided that the following conditions
-+   are met:
-+
-+   - Redistributions of source code must retain the above copyright notice,
-+     this list of conditions and the following disclaimer.
-+   - Redistributions in binary form must reproduce the above copyright notice,
-+     this list of conditions and the following disclaimer in the documentation
-+     and/or other materials provided with the distribution.
-+   - Neither the name of the Mumble Developers nor the names of its
-+     contributors may be used to endorse or promote products derived from this
-+     software without specific prior written permission.
-+
-+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-+   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-+   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-+   A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR
-+   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-+   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-+   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-+   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-+   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-+   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-+   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+*/
-+
-+#include "JackAudio.h"
-+#include "User.h"
-+#include "Global.h"
-+#include "MainWindow.h"
-+#include "Timer.h"
-+
-+#include <cstring>
-+
-+static JackAudioSystem *jasys = NULL;
-+
-+class JackAudioInputRegistrar : public AudioInputRegistrar {
-+        public:
-+                JackAudioInputRegistrar();
-+                virtual AudioInput *create();
-+                virtual const QList<audioDevice> getDeviceChoices();
-+                virtual void setDeviceChoice(const QVariant &, Settings &);
-+                virtual bool canEcho(const QString &) const;
-+};
-+
-+class JackAudioOutputRegistrar : public AudioOutputRegistrar {
-+        public:
-+                JackAudioOutputRegistrar();
-+                virtual AudioOutput *create();
-+                virtual const QList<audioDevice> getDeviceChoices();
-+                virtual void setDeviceChoice(const QVariant &, Settings &);
-+};
-+
-+class JackAudioInit : public DeferInit {
-+        public:
-+                JackAudioInputRegistrar *airJackAudio;
-+                JackAudioOutputRegistrar *aorJackAudio;
-+                void initialize() {
-+                        jasys = new JackAudioSystem();
-+                        jasys->init_jack();
-+                        jasys->qmWait.lock();
-+                        jasys->qwcWait.wait(&jasys->qmWait, 1000);
-+                        jasys->qmWait.unlock();
-+                        if (jasys->bJackIsGood) {
-+                                airJackAudio = new JackAudioInputRegistrar();
-+                                aorJackAudio = new JackAudioOutputRegistrar();
-+                        } else {
-+                                airJackAudio = NULL;
-+                                aorJackAudio = NULL;
-+                                delete jasys;
-+                                jasys = NULL;
-+                        }
-+                };
-+                void destroy() {
-+                        if (airJackAudio)
-+                                delete airJackAudio;
-+                        if (aorJackAudio)
-+                                delete aorJackAudio;
-+                        if (jasys) {
-+                                jasys->close_jack();
-+                                delete jasys;
-+                                jasys = NULL;
-+                        }
-+                };
-+};
-+
-+static JackAudioInit jackinit; //unused
-+
-+JackAudioSystem::JackAudioSystem() {
-+        bJackIsGood = false;
-+        iSampleRate = 0;
-+}
-+
-+JackAudioSystem::~JackAudioSystem() {
-+}
-+
-+void JackAudioSystem::init_jack()
-+{
-+        client = jack_client_open("mumble", JackNullOption, 0);
-+
-+        if (client) {
-+                in_port = jack_port_register(client, "input", JACK_DEFAULT_AUDIO_TYPE, JackPortIsInput, 0);
-+                out_port = jack_port_register(client, "output", JACK_DEFAULT_AUDIO_TYPE, JackPortIsOutput, 0);
-+                jack_set_process_callback(client, process_callback, this);
-+                jack_set_sample_rate_callback(client, srate_callback, this);
-+                jack_on_shutdown(client, shutdown_callback, this);
-+
-+                iSampleRate = jack_get_sample_rate(client);
-+
-+                if (jack_activate(client) || in_port == NULL || out_port == NULL) {
-+                    client = NULL;
-+                    return;
-+                }
-+
-+                int port_flags;
-+                unsigned i = -1;
-+                const char** ports = jack_get_ports(client, 0, 0, JackPortIsPhysical);
-+
-+                if (ports) {
-+                    while (ports[++i])
-+                    {
-+                        jack_port_t* port = jack_port_by_name(client, ports[i]);
-+                        port_flags = jack_port_flags(port);
-+
-+                        if (port_flags & (JackPortIsPhysical|JackPortIsOutput) && strstr(jack_port_type(port), "audio")) {
-+                            jack_connect(client, ports[i], jack_port_name(in_port));
-+                        }
-+                        if (port_flags & (JackPortIsPhysical|JackPortIsInput) && strstr(jack_port_type(port), "audio")) {
-+                            jack_connect(client, jack_port_name(out_port), ports[i]);
-+                        }
-+                    }
-+                }
-+
-+                jack_free(ports);
-+
-+                // If we made it this far, then everything is okay
-+                qhInput.insert(QString(), tr("Hardware Ports"));
-+                qhOutput.insert(QString(), tr("Hardware Ports"));
-+                bJackIsGood = true;
-+
-+            } else {
-+                bJackIsGood = false;
-+                client = NULL;
-+            }
-+}
-+
-+void JackAudioSystem::close_jack()
-+{
-+        if (client) {
-+                jack_deactivate(client);
-+                jack_client_close(client);
-+                client = NULL;
-+        }
-+}
-+
-+int JackAudioSystem::process_callback(jack_nframes_t nframes, void *arg)
-+{
-+        JackAudioSystem *jas = (JackAudioSystem*)arg;
-+
-+        if (jas && jas->bJackIsGood) {
-+                AudioInputPtr ai = g.ai;
-+                AudioOutputPtr ao = g.ao;
-+                JackAudioInput *jai = (JackAudioInput*)(ai.get());
-+                JackAudioOutput *jao = (JackAudioOutput*)(ao.get());
-+
-+                if (jai && jai->bRunning && jai->iMicChannels > 0 && !jai->isFinished()) {
-+                        void* input = jack_port_get_buffer(jas->in_port, nframes);
-+                        if ((float*)input != 0)
-+                            jai->addMic(input, nframes);
-+                }
-+
-+                if (jao && jao->bRunning && jao->iChannels > 0 && !jao->isFinished()) {
-+                        jack_default_audio_sample_t* output = (jack_default_audio_sample_t*)jack_port_get_buffer(jas->out_port, nframes);
-+                        memset(output, 0, sizeof(jack_default_audio_sample_t)*nframes); //TEST
-+                        jao->mix(output, nframes);
-+                }
-+        }
-+
-+        return 0;
-+}
-+
-+int JackAudioSystem::srate_callback(jack_nframes_t frames, void *arg)
-+{
-+        JackAudioSystem *jas = (JackAudioSystem*)arg;
-+        jas->iSampleRate = frames;
-+        return 0;
-+}
-+
-+void JackAudioSystem::shutdown_callback(void *arg)
-+{
-+        JackAudioSystem *jas = (JackAudioSystem*)arg;
-+        jas->bJackIsGood = false;
-+}
-+
-+JackAudioInputRegistrar::JackAudioInputRegistrar() : AudioInputRegistrar(QLatin1String("JACK"), 10) {
-+}
-+
-+AudioInput *JackAudioInputRegistrar::create() {
-+        return new JackAudioInput();
-+}
-+
-+const QList<audioDevice> JackAudioInputRegistrar::getDeviceChoices() {
-+        QList<audioDevice> qlReturn;
-+
-+        QStringList qlInputDevs = jasys->qhInput.keys();
-+        qSort(qlInputDevs);
-+
-+        foreach(const QString &dev, qlInputDevs) {
-+                qlReturn << audioDevice(jasys->qhInput.value(dev), dev);
-+        }
-+
-+        return qlReturn;
-+}
-+
-+void JackAudioInputRegistrar::setDeviceChoice(const QVariant &choice, Settings &s) {
-+        Q_UNUSED(choice);
-+        Q_UNUSED(s);
-+}
-+
-+bool JackAudioInputRegistrar::canEcho(const QString &osys) const {
-+        Q_UNUSED(osys);
-+        return false;
-+}
-+
-+JackAudioOutputRegistrar::JackAudioOutputRegistrar() : AudioOutputRegistrar(QLatin1String("JACK"), 10) {
-+}
-+
-+AudioOutput *JackAudioOutputRegistrar::create() {
-+        return new JackAudioOutput();
-+}
-+
-+const QList<audioDevice> JackAudioOutputRegistrar::getDeviceChoices() {
-+        QList<audioDevice> qlReturn;
-+
-+        QStringList qlOutputDevs = jasys->qhOutput.keys();
-+        qSort(qlOutputDevs);
-+
-+        foreach(const QString &dev, qlOutputDevs) {
-+                qlReturn << audioDevice(jasys->qhOutput.value(dev), dev);
-+        }
-+
-+        return qlReturn;
-+}
-+
-+void JackAudioOutputRegistrar::setDeviceChoice(const QVariant &choice, Settings &s) {
-+        Q_UNUSED(choice);
-+        Q_UNUSED(s);
-+}
-+
-+JackAudioInput::JackAudioInput() {
-+        bRunning = true;
-+        iMicChannels = 0;
-+};
-+
-+JackAudioInput::~JackAudioInput() {
-+        bRunning = false;
-+        iMicChannels = 0;
-+        qmMutex.lock();
-+        qwcWait.wakeAll();
-+        qmMutex.unlock();
-+        wait();
-+}
-+
-+void JackAudioInput::run() {
-+        if (jasys && jasys->bJackIsGood) {
-+            iMicFreq = jasys->iSampleRate;
-+            iMicChannels = 1;
-+            eMicFormat = SampleFloat;
-+            initializeMixer();
-+        }
-+
-+        qmMutex.lock();
-+        while (bRunning)
-+                qwcWait.wait(&qmMutex);
-+        qmMutex.unlock();
-+}
-+
-+JackAudioOutput::JackAudioOutput() {
-+        bRunning = true;
-+        iChannels = 0;
-+}
-+
-+JackAudioOutput::~JackAudioOutput() {
-+        bRunning = false;
-+        iChannels = 0;
-+        qmMutex.lock();
-+        qwcWait.wakeAll();
-+        qmMutex.unlock();
-+        wait();
-+}
-+
-+void JackAudioOutput::run() {
-+        if (jasys && jasys->bJackIsGood) {
-+            unsigned int chanmasks[32];
-+
-+            chanmasks[0] = SPEAKER_FRONT_LEFT;
-+            chanmasks[1] = SPEAKER_FRONT_RIGHT;
-+
-+            eSampleFormat = SampleFloat;
-+            iMixerFreq = jasys->iSampleRate;
-+            iChannels = 1;
-+            initializeMixer(chanmasks);
-+        }
-+
-+        qmMutex.lock();
-+        while (bRunning)
-+                qwcWait.wait(&qmMutex);
-+        qmMutex.unlock();
-+}
-diff -U 3 -H -d -r -N -- mumble-1.2.3/src/mumble/JackAudio.h mumble-1.2.3/src/mumble/JackAudio.h
---- mumble-1.2.3/src/mumble/JackAudio.h	1970-01-01 01:00:00.000000000 +0100
-+++ mumble-1.2.3/src/mumble/JackAudio.h	2011-01-26 06:03:58.000000000 +0000
-@@ -0,0 +1,97 @@
-+/* Copyright (C) 2011, Benjamin Jemlich <pcgod@users.sourceforge.net>
-+   Copyright (C) 2011, Filipe Coelho <falktx@gmail.com>
-+
-+   All rights reserved.
-+
-+   Redistribution and use in source and binary forms, with or without
-+   modification, are permitted provided that the following conditions
-+   are met:
-+
-+   - Redistributions of source code must retain the above copyright notice,
-+     this list of conditions and the following disclaimer.
-+   - Redistributions in binary form must reproduce the above copyright notice,
-+     this list of conditions and the following disclaimer in the documentation
-+     and/or other materials provided with the distribution.
-+   - Neither the name of the Mumble Developers nor the names of its
-+     contributors may be used to endorse or promote products derived from this
-+     software without specific prior written permission.
-+
-+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-+   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-+   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-+   A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR
-+   CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-+   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-+   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-+   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-+   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-+   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-+   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+*/
-+
-+#ifndef _JACKAUDIO_H
-+#define _JACKAUDIO_H
-+
-+#include "AudioInput.h"
-+#include "AudioOutput.h"
-+#include <jack/jack.h>
-+
-+class JackAudioOutput;
-+class JackAudioInput;
-+
-+class JackAudioSystem : public QObject {
-+        private:
-+                Q_OBJECT
-+                Q_DISABLE_COPY(JackAudioSystem)
-+        protected:
-+                jack_client_t* client;
-+                jack_port_t* in_port;
-+                jack_port_t* out_port;
-+
-+                static int process_callback(jack_nframes_t nframes, void *arg);
-+                static int srate_callback(jack_nframes_t frames, void *arg);
-+                static void shutdown_callback(void *arg);
-+        public:
-+                QHash<QString, QString> qhInput;
-+                QHash<QString, QString> qhOutput;
-+                bool bJackIsGood;
-+                int iSampleRate;
-+                QMutex qmWait;
-+                QWaitCondition qwcWait;
-+
-+                void init_jack();
-+                void close_jack();
-+
-+                JackAudioSystem();
-+                ~JackAudioSystem();
-+};
-+
-+class JackAudioInput : public AudioInput {
-+                friend class JackAudioSystem;
-+        private:
-+                Q_OBJECT
-+                Q_DISABLE_COPY(JackAudioInput)
-+        protected:
-+                QMutex qmMutex;
-+                QWaitCondition qwcWait;
-+        public:
-+                JackAudioInput();
-+                ~JackAudioInput();
-+                void run();
-+};
-+
-+class JackAudioOutput : public AudioOutput {
-+                friend class JackAudioSystem;
-+        private:
-+                Q_OBJECT
-+                Q_DISABLE_COPY(JackAudioOutput)
-+        protected:
-+                QMutex qmMutex;
-+                QWaitCondition qwcWait;
-+        public:
-+                JackAudioOutput();
-+                ~JackAudioOutput();
-+                void run();
-+};
-+
-+#endif
-diff -U 3 -H -d -r -N -- mumble-1.2.3/src/mumble/mumble.pro mumble-1.2.3/src/mumble/mumble.pro
---- mumble-1.2.3/src/mumble/mumble.pro	2011-02-19 22:35:17.000000000 +0000
-+++ mumble-1.2.3/src/mumble/mumble.pro	2011-08-22 00:19:05.000000000 +0000
-@@ -99,11 +100,17 @@
- unix {
-   HAVE_PULSEAUDIO=$$system(pkg-config --modversion --silence-errors libpulse)
-   HAVE_PORTAUDIO=$$system(pkg-config --modversion --silence-errors portaudio-2.0)
-+  HAVE_JACKAUDIO=$$system(pkg-config --modversion --silence-errors jack)
- 
-   !isEmpty(HAVE_PORTAUDIO):!CONFIG(no-portaudio) {
-     CONFIG *= portaudio
-   }
- 
-+  !isEmpty(HAVE_JACKAUDIO):!CONFIG(no-jackaudio) {
-+    CONFIG -= portaudio
-+    CONFIG *= jackaudio
-+  }
-+
-   !isEmpty(HAVE_PULSEAUDIO):!CONFIG(no-pulseaudio) {
-     CONFIG -= portaudio
-     CONFIG *= pulseaudio
-@@ -116,6 +123,13 @@
-     QMAKE_CXXFLAGS_DEBUG *= -I../../speex/include -I../../speexbuild
-   }
- 
-+  jackaudio {
-+        DEFINES *= USE_JACKAUDIO
-+        PKGCONFIG *= jack
-+        HEADERS *= JackAudio.h
-+        SOURCES *= JackAudio.cpp
-+  }
-+
-   CONFIG *= link_pkgconfig
- 
-   PKGCONFIG *= openssl sndfile
diff --git a/media-sound/mumble/files/mumble-jack-support.patch b/media-sound/mumble/files/mumble-jack-support.patch
index 8ab2d07..840d924 100644
--- a/media-sound/mumble/files/mumble-jack-support.patch
+++ b/media-sound/mumble/files/mumble-jack-support.patch
@@ -1,5 +1,5 @@
-diff -U 3 -H -d -r -N -- mumble-1.2.2/src/mumble/JackAudio.cpp mumble-1.2.2/src/mumble/JackAudio.cpp
---- mumble-1.2.2/src/mumble/JackAudio.cpp	1970-01-01 01:00:00.000000000 +0100
+diff -U 3 -H -d -r -N -- mumble-1.2.2.orig/src/mumble/JackAudio.cpp mumble-1.2.2/src/mumble/JackAudio.cpp
+--- mumble-1.2.2.orig/src/mumble/JackAudio.cpp	1970-01-01 01:00:00.000000000 +0100
 +++ mumble-1.2.2/src/mumble/JackAudio.cpp	2011-01-26 06:02:00.000000000 +0000
 @@ -0,0 +1,314 @@
 +/* Copyright (C) 2011, Benjamin Jemlich <pcgod@users.sourceforge.net>
@@ -316,10 +316,10 @@ diff -U 3 -H -d -r -N -- mumble-1.2.2/src/mumble/JackAudio.cpp mumble-1.2.2/src/
 +                qwcWait.wait(&qmMutex);
 +        qmMutex.unlock();
 +}
-diff -U 3 -H -d -r -N -- mumble-1.2.2/src/mumble/JackAudio.h mumble-1.2.2/src/mumble/JackAudio.h
---- mumble-1.2.2/src/mumble/JackAudio.h	1970-01-01 01:00:00.000000000 +0100
+diff -U 3 -H -d -r -N -- mumble-1.2.2.orig/src/mumble/JackAudio.h mumble-1.2.2/src/mumble/JackAudio.h
+--- mumble-1.2.2.orig/src/mumble/JackAudio.h	1970-01-01 01:00:00.000000000 +0100
 +++ mumble-1.2.2/src/mumble/JackAudio.h	2011-01-26 06:03:58.000000000 +0000
-@@ -0,0 +1,97 @@
+@@ -0,0 +1,98 @@
 +/* Copyright (C) 2011, Benjamin Jemlich <pcgod@users.sourceforge.net>
 +   Copyright (C) 2011, Filipe Coelho <falktx@gmail.com>
 +
@@ -357,6 +357,7 @@ diff -U 3 -H -d -r -N -- mumble-1.2.2/src/mumble/JackAudio.h mumble-1.2.2/src/mu
 +#include "AudioInput.h"
 +#include "AudioOutput.h"
 +#include <jack/jack.h>
++#include <QWaitCondition>
 +
 +class JackAudioOutput;
 +class JackAudioInput;
@@ -417,8 +418,8 @@ diff -U 3 -H -d -r -N -- mumble-1.2.2/src/mumble/JackAudio.h mumble-1.2.2/src/mu
 +};
 +
 +#endif
-diff -U 3 -H -d -r -N -- mumble-1.2.2/src/mumble/mumble.pro mumble-1.2.2/src/mumble/mumble.pro
---- mumble-1.2.2/src/mumble/mumble.pro	2010-02-09 16:34:51.000000000 +0000
+diff -U 3 -H -d -r -N -- mumble-1.2.2.orig/src/mumble/mumble.pro mumble-1.2.2/src/mumble/mumble.pro
+--- mumble-1.2.2.orig/src/mumble/mumble.pro	2010-02-09 16:34:51.000000000 +0000
 +++ mumble-1.2.2/src/mumble/mumble.pro	2011-01-26 01:45:55.000000000 +0000
 @@ -93,11 +93,17 @@
  unix {
diff --git a/media-sound/mumble/metadata.xml b/media-sound/mumble/metadata.xml
new file mode 100644
index 0000000..1e264d9
--- /dev/null
+++ b/media-sound/mumble/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>tgurr@gentoo.org</email>
+	</maintainer>
+	<longdescription lang="en">
+Mumble is an open source, low-latency, high quality voice chat software primarily intended for use while gaming.
+	</longdescription>
+	<use>
+		<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>
+	<upstream>
+		<remote-id type="sourceforge">mumble</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/media-sound/mumble/mumble-1.2.3-r3.ebuild b/media-sound/mumble/mumble-1.2.10-r2.ebuild
index 7322bb0..53992a3 100644
--- a/media-sound/mumble/mumble-1.2.3-r3.ebuild
+++ b/media-sound/mumble/mumble-1.2.10-r2.ebuild
@@ -1,26 +1,34 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2015 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.2 2011/06/14 20:10:41 maekke Exp $
+# $Id$
 
-EAPI="4"
+EAPI="5"
+
+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"
+LICENSE="BSD MIT"
 SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+alsa +dbus debug g15 jack oss pch portaudio pulseaudio speech zeroconf"
+KEYWORDS="~amd64 ~x86"
+IUSE="+alsa +dbus debug g15 jack libressl oss pch portaudio pulseaudio speech zeroconf"
 
 RDEPEND=">=dev-libs/boost-1.41.0
-	>=dev-libs/openssl-1.0.0b
+	!libressl? ( >=dev-libs/openssl-1.0.0b:0 )
+	libressl? ( dev-libs/libressl )
 	>=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
 	dev-qt/qtcore:4[ssl]
 	dev-qt/qtgui:4
 	dev-qt/qtopengl:4
@@ -35,19 +43,19 @@ 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}
-	dev-util/pkgconfig"
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.2.4-speech-dispatcher.patch
+)
 
-PATCHDIR="${WORKDIR}/${MY_P}"
+S="${WORKDIR}/${MY_P}"
 
-src_unpack() {
-	unpack ${A}
-	epatch "${FILESDIR}"/${PN}-1.2.3-fix-cert-validation.patch
-	#don't work
-	#epatch "${FILESDIR}"/${PN}-1.2.3-set-file-permissions.patch
-	use jack && cd ${PATCHDIR}
-	use jack && epatch "${FILESDIR}"/mumble-jack-support-r2.patch
+src_prepare() {
+	epatch ${PATCHES[@]}
+	use jack && epatch "${FILESDIR}"/${PN}-jack-support.patch
 }
 
 src_configure() {
@@ -72,17 +80,21 @@ 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_compile() {
+	# parallel make workaround, bug #445960
+	emake -j1
 }
 
 src_install() {
-	newdoc README.Linux README 
+	newdoc README.Linux README
 	dodoc CHANGES
 
 	local dir