5 files changed, 150 insertions, 251 deletions
diff --git a/media-sound/mumble/Manifest b/media-sound/mumble/Manifest
index 5f504b7f326a..dfc5a3de9b3c 100644
--- a/media-sound/mumble/Manifest
+++ b/media-sound/mumble/Manifest
@@ -1,8 +1,5 @@
 AUX mumble-1.2.4-speech-dispatcher.patch 1289 BLAKE2B 674312376997a2ee7f70886f8a7ec13731f46bc25870c1af239d6814ef66192999f89d644caf63eb98a3ad4fa3460c16fbfb2acb35c845c181cf08943d142c3b SHA512 32b83ba846fbda3529c222df2cf6fa0f615dabdd7e211051119fb9ed53bdc3e8e11aaa1b132bbdfcedffd72b1e19666aaf083799f7ebbbf60f536a9f9a0c6a2a
-DIST mumble-1.2.17.tar.gz 3207840 BLAKE2B c10eb489cf9555ac02126d007515632c08c1de755ff0e734a13b112fc7496c356fd0eadeb99f1f0c58e7cf3bef355c91a8d73a2907d9fd38f3dae5b221200e78 SHA512 03cb0a2048d42bd480741e0580cb4bf6961d607d6cf9b620434aea87ac0cd7cdbfae33863b71821ac8b931300df490ae5436f3c8098d6a5f37dd1eab0fb34dbe
-DIST mumble-1.2.18.tar.gz 3210749 BLAKE2B 3614d9714fc6825ed86a308d8dc7be0f30463a016eca37b0d25943f23dfc8b57dd2dc6a1e472a9bd355edd97d7ec58cd2f4318015c78803f78342b788f7019cd SHA512 bd8b10cb34733d566fd6aae2410e8fe5f098efe5c5b106f569112d4e5205d8a045d43a0adc02a7a9d3e16b15e3515d908784596f293a7e2972fba20830161074
 DIST mumble-1.2.19.tar.gz 3210865 BLAKE2B 7ce466ab9d5ca761308d08633abf8efb6105b3097b7fde0a886f957dff4a16442d1f12c93123bd0291b37d14b412e0087b89f781d0f63a5182bd6ca2d3f2d3fe SHA512 f91111194a899149b500a94afcf7cc5b9691c7ce8669f07fca2c66adbb3916ddb863bf703d04fb8387133fb75f3c8edb52974d1acf3febfafa1f73da19946de4
-EBUILD mumble-1.2.17.ebuild 3022 BLAKE2B 33beccec519300b806e1fe463c35630f123a1aa3d09b007649eca040ad5b6c68d4af8612504bc650d03fa46ca79640219178dda96d48fb0a50c7440262893675 SHA512 a5358d0a9399921d3e4f98ab7e71434930eafae9206c313126b4ee4d9940c484b16758a1b5af8136216e1b37cf80ccdb3831dda537c13ceb940293c1dde50a43
-EBUILD mumble-1.2.18.ebuild 3090 BLAKE2B 5ff6e5852d20ccb8f79c0999b43271f4f043b2e432399e26478fe4aa090121135df31b1eda8276001408492f54e369997e923e217618d08c6000df2724412d1e SHA512 9af5be4611e433d3ce47a27193a07fd505115a10f6e0d18fa6af70aa628ec6413c7f6177d3de15bec34f5581b84c8d3a19c335ab307409f43c90d2fa4d67609c
 EBUILD mumble-1.2.19.ebuild 3095 BLAKE2B 2c2e2584dafe44c878c62a9515c329b97c151135726fa519e488ed8aaff987262fc9acd1252538b1f4600943c68ce1fdc79622769ee859c0028fa2b4872b9b27 SHA512 0353785b6799d7adb7a1bf161232ab44e5b3dda33fdb74ac83296839d0613ff4960c5653661594fd6cf8434b262f93c391ee945dc79d327916aa334871987231
-MISC metadata.xml 666 BLAKE2B 6a2e64cb002d8ebe5457265b4b602e1fdbb136ac8846d6528dbfb18e6dae78b16b5cfac3a0fe60f3b8dcc61f718a8579c3b9f87c288150194e2f72258e0685a1 SHA512 c9cd557297af63d195a20c1b913758ea6c4433373f55561b1dc06fc3053a949495e2a19542b43affb0c799e4ff9747410cd0a260568e9365a529aa6943910fb9
+EBUILD mumble-9999.ebuild 3313 BLAKE2B b5c29e260fae45bf655f19e0fbfdab29aaead30071745f74799505f4167f72475cd63be4c46ee2147e492fb13978bd4e3a56e09be0c4298d98a0cb6301f787ae SHA512 55fbebd08f2ec064451450592c585b6d7ab303c1dfa94de49240a37ae7afde952691482d68d8916c7af32f050478aa5308d67fe3cea6c7a27446a8d914ae433b
+MISC metadata.xml 751 BLAKE2B 17b72569ef8313fa654bd444572521c482b1b2c4d14bc73b41be5f6ddf8e9c8e9064fa1a87b4589f7a18a5ceae835fb60718226059f5b96d4dfa6e2b26256630 SHA512 78d4d18e60dfbcbab8b1ae64f214c2f6aa0ae7ea01323590f3847b1ed50fc90a29acbb5a44c65e82747237e60d5d4a24c9b2808d4e4a90a996ab90952340c18b
diff --git a/media-sound/mumble/metadata.xml b/media-sound/mumble/metadata.xml
index e455ad4ea643..59327713616d 100644
--- a/media-sound/mumble/metadata.xml
+++ b/media-sound/mumble/metadata.xml
@@ -10,6 +10,7 @@ Mumble is an open source, low-latency, high quality voice chat software primaril
 	</longdescription>
 	<use>
 		<flag name="g15">Enable support for the Logitech G15 LCD (and compatible devices).</flag>
+		<flag name="opus">Enable Opus codec support via <pkg>media-libs/opus</pkg>.</flag>
 		<flag name="speech">Enable text-to-speech support in Mumble.</flag>
 	</use>
 	<upstream>
diff --git a/media-sound/mumble/mumble-1.2.17.ebuild b/media-sound/mumble/mumble-1.2.17.ebuild
deleted file mode 100644
index f111557926a1..000000000000
--- a/media-sound/mumble/mumble-1.2.17.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils multilib qmake-utils
-
-MY_P="${PN}-${PV/_/~}"
-
-DESCRIPTION="Mumble is an open source, low-latency, high quality voice chat software"
-HOMEPAGE="https://wiki.mumble.info"
-SRC_URI="https://mumble.info/snapshot/${MY_P}.tar.gz"
-
-LICENSE="BSD MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+alsa +dbus debug g15 libressl oss pch portaudio pulseaudio speech zeroconf"
-
-RDEPEND=">=dev-libs/boost-1.41.0
-	!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
-	dev-qt/qtsql:4[sqlite]
-	dev-qt/qtsvg:4
-	dev-qt/qtxmlpatterns:4
-	x11-proto/inputproto
-	alsa? ( media-libs/alsa-lib )
-	dbus? ( dev-qt/qtdbus:4 )
-	g15? ( app-misc/g15daemon )
-	portaudio? ( media-libs/portaudio )
-	pulseaudio? ( media-sound/pulseaudio )
-	speech? ( app-accessibility/speech-dispatcher )
-	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.2.4-speech-dispatcher.patch
-)
-
-S="${WORKDIR}/${MY_P}"
-
-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 speech || conf_add="${conf_add} no-speechd"
-	use zeroconf || conf_add="${conf_add} no-bonjour"
-
-	eqmake4 "${S}/main.pro" -recursive \
-		CONFIG+="${conf_add} \
-			bundled-celt \
-			no-bundled-opus \
-			no-bundled-speex \
-			no-embed-qt-translations \
-			no-server \
-			no-update" \
-		DEFINES+="PLUGIN_PATH=/usr/$(get_libdir)/mumble"
-}
-
-src_install() {
-	newdoc README.Linux README
-	dodoc CHANGES
-
-	local dir
-	if use debug; then
-		dir=debug
-	else
-		dir=release
-	fi
-
-	dobin "${dir}"/mumble
-	dobin scripts/mumble-overlay
-
-	insinto /usr/share/services
-	doins scripts/mumble.protocol
-
-	domenu scripts/mumble.desktop
-
-	insinto /usr/share/icons/hicolor/scalable/apps
-	doins icons/mumble.svg
-
-	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}
-	dosym libmumble.so.${PV} /usr/$(get_libdir)/mumble/libmumble.so.1
-	doins "${dir}"/libcelt0.so.0.{7,11}.0
-	doins "${dir}"/plugins/lib*.so*
-}
-
-pkg_postinst() {
-	echo
-	elog "Visit http://mumble.sourceforge.net/ for futher configuration instructions."
-	elog "Run mumble-overlay to start the OpenGL overlay (after starting mumble)."
-	echo
-}
diff --git a/media-sound/mumble/mumble-1.2.18.ebuild b/media-sound/mumble/mumble-1.2.18.ebuild
deleted file mode 100644
index b27c4b19f7b0..000000000000
--- a/media-sound/mumble/mumble-1.2.18.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils multilib qmake-utils
-
-MY_P="${PN}-${PV/_/~}"
-
-DESCRIPTION="Mumble is an open source, low-latency, high quality voice chat software"
-HOMEPAGE="https://wiki.mumble.info"
-SRC_URI="https://mumble.info/snapshot/${MY_P}.tar.gz"
-
-LICENSE="BSD MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+alsa +dbus debug g15 libressl oss pch portaudio pulseaudio speech zeroconf"
-
-RDEPEND=">=dev-libs/boost-1.41.0
-	!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.0
-			media-libs/speexdsp
-		)
-		<media-libs/speex-1.2.0
-	)
-	sys-apps/lsb-release
-	x11-libs/libX11
-	x11-libs/libXi
-	dev-qt/qtcore:4[ssl]
-	dev-qt/qtgui:4
-	dev-qt/qtopengl:4
-	dev-qt/qtsql:4[sqlite]
-	dev-qt/qtsvg:4
-	dev-qt/qtxmlpatterns:4
-	x11-proto/inputproto
-	alsa? ( media-libs/alsa-lib )
-	dbus? ( dev-qt/qtdbus:4 )
-	g15? ( app-misc/g15daemon )
-	portaudio? ( media-libs/portaudio )
-	pulseaudio? ( media-sound/pulseaudio )
-	speech? ( app-accessibility/speech-dispatcher )
-	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.2.4-speech-dispatcher.patch
-)
-
-S="${WORKDIR}/${MY_P}"
-
-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 speech || conf_add="${conf_add} no-speechd"
-	use zeroconf || conf_add="${conf_add} no-bonjour"
-
-	eqmake4 "${S}/main.pro" -recursive \
-		CONFIG+="${conf_add} \
-			bundled-celt \
-			no-bundled-opus \
-			no-bundled-speex \
-			no-embed-qt-translations \
-			no-server \
-			no-update" \
-		DEFINES+="PLUGIN_PATH=/usr/$(get_libdir)/mumble"
-}
-
-src_install() {
-	newdoc README.Linux README
-	dodoc CHANGES
-
-	local dir
-	if use debug; then
-		dir=debug
-	else
-		dir=release
-	fi
-
-	dobin "${dir}"/mumble
-	dobin scripts/mumble-overlay
-
-	insinto /usr/share/services
-	doins scripts/mumble.protocol
-
-	domenu scripts/mumble.desktop
-
-	insinto /usr/share/icons/hicolor/scalable/apps
-	doins icons/mumble.svg
-
-	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}
-	dosym libmumble.so.${PV} /usr/$(get_libdir)/mumble/libmumble.so.1
-	doins "${dir}"/libcelt0.so.0.{7,11}.0
-	doins "${dir}"/plugins/lib*.so*
-}
-
-pkg_postinst() {
-	echo
-	elog "Visit http://mumble.sourceforge.net/ for futher configuration instructions."
-	elog "Run mumble-overlay to start the OpenGL overlay (after starting mumble)."
-	echo
-}
diff --git a/media-sound/mumble/mumble-9999.ebuild b/media-sound/mumble/mumble-9999.ebuild
new file mode 100644
index 000000000000..ca0d0e8d553d
--- /dev/null
+++ b/media-sound/mumble/mumble-9999.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multilib desktop qmake-utils xdg-utils
+
+DESCRIPTION="Mumble is an open source, low-latency, high quality voice chat software"
+HOMEPAGE="https://wiki.mumble.info"
+if [[ "${PV}" = 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/mumble-voip/mumble.git"
+	EGIT_SUBMODULES=( '-*' celt-0.7.0-src celt-0.11.0-src themes/Mumble )
+else
+	MY_P="${PN}-${PV/_/~}"
+	SRC_URI="https://mumble.info/snapshot/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+LICENSE="BSD MIT"
+SLOT="0"
+IUSE="+alsa +dbus debug g15 libressl +opus oss pch portaudio pulseaudio speech zeroconf"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsql:5[sqlite]
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	>=dev-libs/protobuf-2.2.0:=
+	>=media-libs/libsndfile-1.0.20[-minimal]
+	|| (
+		(
+			>=media-libs/speex-1.2.0
+			media-libs/speexdsp
+		)
+		<media-libs/speex-1.2.0
+	)
+	sys-apps/lsb-release
+	x11-libs/libX11
+	x11-libs/libXi
+	alsa? ( media-libs/alsa-lib )
+	dbus? ( dev-qt/qtdbus:5 )
+	g15? ( app-misc/g15daemon )
+	!libressl? ( >=dev-libs/openssl-1.0.0b:0= )
+	libressl? ( dev-libs/libressl )
+	opus? ( >=media-libs/opus-1.0.1 )
+	portaudio? ( media-libs/portaudio )
+	pulseaudio? ( media-sound/pulseaudio )
+	speech? ( >=app-accessibility/speech-dispatcher-0.8.0 )
+	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
+"
+DEPEND="${RDEPEND}
+	>=dev-libs/boost-1.41.0
+	virtual/pkgconfig
+	x11-proto/inputproto
+"
+
+src_configure() {
+	myuse() {
+		[[ -n "${1}" ]] || die "myuse: No use option given"
+		use ${1} || echo no-${1}
+	}
+
+	local conf_add=(
+		bundled-celt
+		no-bundled-opus
+		no-bundled-speex
+		no-embed-qt-translations
+		no-server
+		no-update
+		$(myuse alsa)
+		$(myuse dbus)
+		$(usex debug 'symbols debug' release)
+		$(myuse g15)
+		$(myuse opus)
+		$(myuse oss)
+		$(myuse portaudio)
+		$(myuse speech)
+		$(usex zeroconf '' no-bonjour)
+	)
+
+	if has_version '<=sys-devel/gcc-4.2'; then
+		conf_add+=( no-pch )
+	else
+		use pch || conf_add+=( no-pch )
+	fi
+
+	eqmake5 "${S}/main.pro" -recursive \
+		CONFIG+="${conf_add[*]}" \
+		DEFINES+="PLUGIN_PATH=/usr/$(get_libdir)/mumble"
+}
+
+src_install() {
+	local soversion
+	if [[ "${PV}" = 9999 ]] ; then
+		soversion="$(sed -n '/^VERSION\b/s@.*= \([[:digit:]\.]\+\)$@\1@p' src/mumble.pri)"
+	else
+		soversion="${PV}"
+	fi
+
+	newdoc README.Linux README
+	dodoc CHANGES
+
+	local dir
+	if use debug; then
+		dir=debug
+	else
+		dir=release
+	fi
+
+	dobin "${dir}"/mumble
+	dobin scripts/mumble-overlay
+
+	insinto /usr/share/services
+	doins scripts/mumble.protocol
+
+	domenu scripts/mumble.desktop
+
+	insinto /usr/share/icons/hicolor/scalable/apps
+	doins icons/mumble.svg
+
+	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.${soversion}
+	dosym libmumble.so.${soversion} /usr/$(get_libdir)/mumble/libmumble.so.1
+	doins "${dir}"/libcelt0.so.0.{7,11}.0
+	doins "${dir}"/plugins/lib*.so*
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	echo
+	elog "Visit http://mumble.sourceforge.net/ for futher configuration instructions."
+	elog "Run mumble-overlay to start the OpenGL overlay (after starting mumble)."
+	echo
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}