gentoo resync : 23.03.2018

4 files changed, 47 insertions, 168 deletions

diff --git a/media-sound/murmur/Manifest b/media-sound/murmur/Manifest
index ebc185dc023f..0a8f6fcc081d 100644
--- a/media-sound/murmur/Manifest
+++ b/media-sound/murmur/Manifest
@@ -5,10 +5,7 @@ AUX murmur.logrotate 127 BLAKE2B eadd1ac994ff194a160ec609c4781d4b69c23eff405abc3
 AUX murmurd-dbus.service 297 BLAKE2B 30ca5427de360cacab404cfff42d8e2355f14def67156039ceff85cbdf77a89cde03f6c096eba0b9d0cce52283f039ea222298e3aa9a8eead7fb8b638ee5aa8c SHA512 e81031efa7cc2736748d5a5fdd001e28cf81430cf25f9f83b9aa8b94714dc787842e76c17c00e3b7a26192d8b4932f1e14bfdde207ee89680f2a696d4f9990a6
 AUX murmurd-dbus.tmpfiles 33 BLAKE2B 4040c58c142ae051e3086bfb179a1b28fc97f997d2b4ccf0392fb30d6212ac937f3d8ec120699210bee333b224af73dc1b72a40f3bda1cb4f4e8e683ac09b262 SHA512 9bc78c99dd5d830e6ea0fff82e1fdc3c323b7952e54f139754d8d0dd5e5e75c3374e26ea5a404029c96766cbf3a08afdffd53b99fdca5cd9c97dd8a28b8fc410
 AUX murmurd-no-dbus.service 222 BLAKE2B 11fc296fd5d5445347f077ff9d4aaea3364176dff9c28d06b6b2d0b4a8d0ff8ccd559c68a0fadddbc8363349d9c599c9ebd6da8e0055a680b18aa282e72875a5 SHA512 d58c04dde0286b07a494c99fff8b94cdf1c47f6fcacbb5552445b7e19421f2a9862186e7309886590bc33ae3c64c0c840a9a93c55b35ca600b7a8f9ec53dbab2
-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 murmur-1.2.17.ebuild 3043 BLAKE2B 3b9ab76954ee4c507ea7c4051db4adc96035ef257ec7b6068d46d40877c60108a357acefa0172158a61a6cfd674d79ef464da2f3ce20600c2e2bdcffe9181250 SHA512 2aaf7d9482bc978f4e3b2b98f507b242ff0b6914342577fe51135e97e7489605c0e13a20d3f1794252236675778af0bab3d13f766e70de09081186af6e444ff0
-EBUILD murmur-1.2.18.ebuild 3053 BLAKE2B 334667336631ae79048d7ab85cdcc60b32a7f5ffd4231983f87b2cb4650614b395b9e8883660b2aa22690b63d67d3f762e46c7761ec19ba608317786b892ffc4 SHA512 f64b5651303f97b403d3c15e757e7e01756f15df931d452fc3487e72987a449ba91a95d6d3c9e851a1ebcfeeb72bb9b4f485f8afb6a913a60e63ee0635fd0b1b
-EBUILD murmur-1.2.19.ebuild 3058 BLAKE2B c357596d720a14c2a5009dd0fdcfb516846c5a0dcbeb3c05980d42b1d0cd40df79d0a54a3a8e86037a1a6d0dedbb34133c8305dfa4c30f9daf862e453a79002b SHA512 fa4bc5a124e7d172b665ea42fa246c1a890069bcd7275f544f59232b5c0f505edbbcdc34c5cf8b41759863293a90e7d76e07a3b85d3736b049b13a0f65261645
+EBUILD murmur-1.2.19.ebuild 3056 BLAKE2B 87464662ba4230636288d5ac644316ed37585539354adee1910dd3708e265548108ebf04a6cd07f3e59a28cf778cbc5b1c05b0a72d5966ffd44b7468d6729bbc SHA512 8ab6d2a3dfc944aa5ad7a602fb6233586a6918589a8fd685481cb3609550a0bea87ae99c1ef650162af084c77cd8559fe488f7948f6a91d525c27955d4fa0192
+EBUILD murmur-9999.ebuild 3114 BLAKE2B 78d22916bdd01c291b16af0f9994e7e74ea325c60cf07f7d13adca263a4834b1c88263d53ebc6fd9263898750070e5df54e2560f309226a538b99c38ae20f6c7 SHA512 459a0ff23f62994a0b7308ddde9206b0ddaddcfc34a0cc1da02cd5fbc221490263bbcb14bdeac3ed9823f98d6f1dd1ab45c124ea18639e1a3a0191305c7a1398
 MISC metadata.xml 597 BLAKE2B 6eece3d62949bfb7c01c6249764ee6e47ca0273972ed0aa2bae704ed7acb9267e7cef706d2c3eeafb5becd4695d8665c975f67e577ef3ce4def50e78ba1ce273 SHA512 d7ffb25e7b3919cb27417debe5b2f84f2f2c330e1a238583f154bb44b697a3b3c3749794baf896807874633b0659076e93c2845a56e49acb24047958d29d2beb
diff --git a/media-sound/murmur/murmur-1.2.18.ebuild b/media-sound/murmur/murmur-1.2.18.ebuild
deleted file mode 100644
index 3bb302525ebf..000000000000
--- a/media-sound/murmur/murmur-1.2.18.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils qmake-utils systemd user readme.gentoo-r1
-
-MY_P="mumble-${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"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+dbus debug +ice pch zeroconf"
-
-RDEPEND=">=dev-libs/openssl-1.0.0b:0=
-	>=dev-libs/protobuf-2.2.0:=
-	sys-apps/lsb-release
-	>=sys-libs/libcap-2.15
-	dev-qt/qtcore:4[ssl]
-	|| ( dev-qt/qtsql:4[sqlite] dev-qt/qtsql:4[mysql] )
-	dev-qt/qtxmlpatterns:4
-	dbus? ( dev-qt/qtdbus:4 )
-	ice? ( dev-libs/Ice:= )
-	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )"
-
-DEPEND="${RDEPEND}
-	>=dev-libs/boost-1.41.0
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.2.17-ice-3.6.3-compat.patch
-)
-
-DOC_CONTENTS="
-	Useful scripts are located in /usr/share/doc/${PF}/scripts.\n
-	Please execute:\n
-	murmurd -ini /etc/murmur/murmur.ini -supw <pw>\n
-	chown murmur:murmur /var/lib/murmur/murmur.sqlite\n
-	to set the build-in 'SuperUser' password before starting murmur.
-	Please restart dbus before starting murmur, or else dbus
-	registration will fail.
-"
-
-pkg_setup() {
-	enewgroup murmur
-	enewuser murmur -1 -1 /var/lib/murmur murmur
-}
-
-src_prepare() {
-	default
-
-	sed \
-		-e 's:mumble-server:murmur:g' \
-		-e 's:/var/run:/run:g' \
-		-i "${S}"/scripts/murmur.{conf,ini.system} || die
-}
-
-src_configure() {
-	local conf_add
-
-	use dbus || conf_add="${conf_add} no-dbus"
-	use debug && conf_add="${conf_add} symbols debug" || conf_add="${conf_add} release"
-	use ice || conf_add="${conf_add} no-ice"
-	use pch || conf_add="${conf_add} no-pch"
-	use zeroconf || conf_add="${conf_add} no-bonjour"
-
-	eqmake4 main.pro -recursive \
-		CONFIG+="${conf_add} no-client"
-}
-
-src_install() {
-	dodoc README CHANGES
-
-	docinto scripts
-	dodoc scripts/*.php scripts/*.pl
-
-	local dir
-	if use debug; then
-		dir=debug
-	else
-		dir=release
-	fi
-
-	dobin "${dir}"/murmurd
-
-	insinto /etc/murmur/
-	newins scripts/murmur.ini.system murmur.ini
-
-	insinto /etc/logrotate.d/
-	newins "${FILESDIR}"/murmur.logrotate murmur
-
-	insinto /etc/dbus-1/system.d/
-	doins scripts/murmur.conf
-
-	insinto /usr/share/murmur/
-	doins src/murmur/Murmur.ice
-
-	newinitd "${FILESDIR}"/murmur.initd-r1 murmur
-	newconfd "${FILESDIR}"/murmur.confd murmur
-
-	if use dbus; then
-		systemd_newunit "${FILESDIR}"/murmurd-dbus.service "${PN}".service
-		systemd_newtmpfilesd "${FILESDIR}"/murmurd-dbus.tmpfiles "${PN}".conf
-	else
-		systemd_newunit "${FILESDIR}"/murmurd-no-dbus.service "${PN}".service
-	fi
-
-	keepdir /var/lib/murmur /var/log/murmur
-	fowners -R murmur /var/lib/murmur /var/log/murmur
-	fperms 750 /var/lib/murmur /var/log/murmur
-
-	# Fix permissions on config file as it might contain passwords.
-	# (bug #559362)
-	fowners root:murmur /etc/murmur/murmur.ini
-	fperms 640 /etc/murmur/murmur.ini
-
-	doman man/murmurd.1
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/media-sound/murmur/murmur-1.2.19.ebuild b/media-sound/murmur/murmur-1.2.19.ebuild
index 8129f26ff354..6f1603e98939 100644
--- a/media-sound/murmur/murmur-1.2.19.ebuild
+++ b/media-sound/murmur/murmur-1.2.19.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="https://mumble.info/snapshot/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="+dbus debug +ice pch zeroconf"
 
 RDEPEND=">=dev-libs/openssl-1.0.0b:0=
diff --git a/media-sound/murmur/murmur-1.2.17.ebuild b/media-sound/murmur/murmur-9999.ebuild
index 4f8e869a8ccd..e139859ffb57 100644
--- a/media-sound/murmur/murmur-1.2.17.ebuild
+++ b/media-sound/murmur/murmur-9999.ebuild
@@ -1,42 +1,48 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit eutils qmake-utils systemd user readme.gentoo-r1
-
-MY_P="mumble-${PV/_/~}"
+inherit qmake-utils systemd user readme.gentoo-r1
 
 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"
+if [[ "${PV}" = 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/mumble-voip/mumble.git"
+	EGIT_SUBMODULES=( '-*' )
+else
+	MY_P="mumble-${PV/_/~}"
+	SRC_URI="https://mumble.info/snapshot/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~x86"
+	S="${WORKDIR}/${MY_P}"
+fi
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 x86"
 IUSE="+dbus debug +ice pch zeroconf"
 
-RDEPEND=">=dev-libs/openssl-1.0.0b:0=
+RDEPEND="
+	>=dev-libs/openssl-1.0.0b:0=
 	>=dev-libs/protobuf-2.2.0:=
+	dev-qt/qtcore:5
+	dev-qt/qtnetwork:5
+	|| (
+		dev-qt/qtsql:5[sqlite]
+		dev-qt/qtsql:5[mysql]
+	)
+	dev-qt/qtxml:5
 	sys-apps/lsb-release
 	>=sys-libs/libcap-2.15
-	dev-qt/qtcore:4[ssl]
-	|| ( dev-qt/qtsql:4[sqlite] dev-qt/qtsql:4[mysql] )
-	dev-qt/qtxmlpatterns:4
-	dbus? ( dev-qt/qtdbus:4 )
+	dbus? ( dev-qt/qtdbus:5 )
 	ice? ( dev-libs/Ice:= )
-	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )"
+	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
+"
 
 DEPEND="${RDEPEND}
 	>=dev-libs/boost-1.41.0
 	virtual/pkgconfig"
 
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-ice-3.6.3-compat.patch
-)
-
 DOC_CONTENTS="
 	Useful scripts are located in /usr/share/doc/${PF}/scripts.\n
 	Please execute:\n
@@ -58,27 +64,33 @@ src_prepare() {
 	sed \
 		-e 's:mumble-server:murmur:g' \
 		-e 's:/var/run:/run:g' \
-		-i "${S}"/scripts/murmur.{conf,ini.system} || die
+		-i "${S}"/scripts/murmur.{conf,ini} || die
 }
 
 src_configure() {
-	local conf_add
-
-	use dbus || conf_add="${conf_add} no-dbus"
-	use debug && conf_add="${conf_add} symbols debug" || conf_add="${conf_add} release"
-	use ice || conf_add="${conf_add} no-ice"
-	use pch || conf_add="${conf_add} no-pch"
-	use zeroconf || conf_add="${conf_add} no-bonjour"
-
-	eqmake4 main.pro -recursive \
-		CONFIG+="${conf_add} no-client"
+	myuse() {
+		[[ -n "${1}" ]] || die "myconf: No use flag given."
+		use ${1} || echo "no-${1}"
+	}
+	local conf_add=(
+		no-client
+		$(myuse dbus)
+		$(usex debug 'symbols debug' release)
+		$(myuse ice)
+		$(myuse pch)
+		$(usex zeroconf '' no-bonjour)
+	)
+
+	eqmake5 main.pro -recursive \
+		CONFIG+="${conf_add[*]}"
 }
 
 src_install() {
 	dodoc README CHANGES
 
 	docinto scripts
-	dodoc scripts/*.php scripts/*.pl
+	dodoc -r scripts/server
+	docompress -x /usr/share/doc/${PF}/scripts
 
 	local dir
 	if use debug; then
@@ -90,7 +102,7 @@ src_install() {
 	dobin "${dir}"/murmurd
 
 	insinto /etc/murmur/
-	newins scripts/murmur.ini.system murmur.ini
+	doins scripts/murmur.ini
 
 	insinto /etc/logrotate.d/
 	newins "${FILESDIR}"/murmur.logrotate murmur