gentoo resync : 03.11.2019

5 files changed, 2 insertions, 303 deletions

diff --git a/media-sound/umurmur/Manifest b/media-sound/umurmur/Manifest
index 55233b291981..9f4ed505744d 100644
--- a/media-sound/umurmur/Manifest
+++ b/media-sound/umurmur/Manifest
@@ -2,11 +2,7 @@ AUX umurmur.conf 1637 BLAKE2B ba9519dc2a09512c3b8398009c1ee41a8d49f1a18de5800dd5
 AUX umurmurd.confd 64 BLAKE2B d98d616da50acabd055333c36699ab0dd060193fc4507528370b1b77d5c3335f61e0c0ab6cc28bb8530aa9876345bb9ff01bdb1db56f0d0e44b09ef7d6a12eff SHA512 4af070ab4d8f4a9a2d5b59b8be95cfb49c22faae809843d9c8ede954bdf39f1224bb31cc53e5cf0f771a2033dfe904890345a6031055c9e79fdd315447e54840
 AUX umurmurd.initd 458 BLAKE2B e1f8dc704fa6237edfcfbb936e9d1c679e0f1a57ec862ec7215c3f263de0582baf70a0b822a1712c2423d753dda9e2602ff404d11f2f0d02df02116cdfb3729d SHA512 d60c700bf0bb54c904faff658e09dc37a6cd79edb69e4aa54f46872f474c8f673a91ebe022a47dc0d6b4f624a86f70be99f661a1e80a672b04dff6af3328b28d
 AUX umurmurd.service 363 BLAKE2B 373b02c3d2d9f80e3b1a44dc98032f68310e8c5b82682efc1001cf130bef21f6f925f4b535d0d02209617c92b4d4a3dad4a7b459c8dbbcf6f97b050bab933de0 SHA512 3366dc2b35623daf4704e30bc6207cf795e31cb4c9cd0c7e19f64fa9d92da772fcc309e5799261b6c07c95cfeacd2d9b898ec4a4be7b5acc46efda7a98308913
-DIST umurmur-0.2.16a.tar.gz 91187 BLAKE2B ba306dfa4c6fa958735ab02bd262729d582acdd5f33e642066712c2188549b8675f1b9305642af198c608108e5277820d6aac2c09470cce0d5e9e3f272b11c2f SHA512 432a85e93cb7d53c505caf8b97c1bb7c173c8f625127510de61cc0a1e3abaea9abcf96ab1c0a8c5039ba82af5d29710e4973f70c1438bfd44ba00fa0c3f64c9e
 DIST umurmur-0.2.17.tar.gz 93786 BLAKE2B 92fc7d63dc0eed228c3fbcb0d18861cd49967f44378d980e856f8fb24fe7abc3429a4ca8e811eda6096727b76780724c909c46c04975b5edef70d848b7511618 SHA512 a496a51fd7815ad117f5aee17bb78cbd319c584ad60ab8aebbfd8ddf7b1760f443f2337bc74be1e0d5af17d3c3df2ae6c9060eca576cf1e6ed4c6cb0825e9c15
-EBUILD umurmur-0.2.16a-r1.ebuild 2136 BLAKE2B e8ccba8b874014b89991f731abd0c2f1b724c126aeedd6563c4b118efcc630004d3cdd46a122678499f680d4e065f410bf5656e442d8c7ca560b64e05e96f406 SHA512 d65241e668ebb560a8f4ca482374c2d4a3738ee7eb700ae7273bb2c350b5b508678c19b174848f4b59adf3f077a108cca0aaf472fe87947473aac0a7d81251f3
-EBUILD umurmur-0.2.17-r1.ebuild 2163 BLAKE2B 95d724db07bd1f6b6a405a921d21569bcda8f4baa781ef2a6e1c21e167adbc61d9f8dd975caf2f228577f30b7fff4f0a713af3a630313f7b5a5d0a27a7625d88 SHA512 265168d48225f8df2263cdaf37bc665c7f624071a63fe33b9570cc3f5e1ca9121e61923e6e0f07f45f8c2750e6090882752327e1e031b527ceee722a759c5837
-EBUILD umurmur-0.2.17-r2.ebuild 2660 BLAKE2B 60c76bfafedaa36fa4e0d1b5e1119e2601ab2bbabd871e099ed176e154d658497c5ecdb8f8195d9ef664e13240a2b692a44e6fe2d0b4b563a74b8f18e76388af SHA512 772ff1543f1cd79605475a23ce867eebcf4a227df2a3cf96e6fee6421b8290518e8a28bafaa631222704675b296cdad006be9fd8fec928e8c157c3f8c8bb0b18
-EBUILD umurmur-0.2.17-r3.ebuild 2625 BLAKE2B dc8ca273bc5b9d88686ef51ef9803d2c0e94e82d3c81e96fb4926077d0f7a8db79cf6f6f80e817cded610111b75e573c7d42dee532c8dcccf98a661cd63b42e6 SHA512 451bd9ed9f3f034992880ad81fb347a49b0d4750b0dbed044a9e54c112740024f16f6de0e0ca105df0dc130ac022b95bc0aa0fda7482dce0bb6d3e1a360bc176
+EBUILD umurmur-0.2.17-r3.ebuild 2623 BLAKE2B 4163646ffda96651ed9c88ae6e0bb8599f95d77abd9f4567d86fb63bd8cd19943dfd3ddf72a526368395a967c9a15931a7acfd5f925b9c35d5c7a9577acf0bb7 SHA512 667ab4fb2db0db3c92728b91354f78b1cbe80374db702b150a9cda3de732750b079917575b1a9c2c1e878bddd1d637b581d2cd42cf619e4bc4975e4cd8d644f8
 EBUILD umurmur-9999.ebuild 2625 BLAKE2B dc8ca273bc5b9d88686ef51ef9803d2c0e94e82d3c81e96fb4926077d0f7a8db79cf6f6f80e817cded610111b75e573c7d42dee532c8dcccf98a661cd63b42e6 SHA512 451bd9ed9f3f034992880ad81fb347a49b0d4750b0dbed044a9e54c112740024f16f6de0e0ca105df0dc130ac022b95bc0aa0fda7482dce0bb6d3e1a360bc176
 MISC metadata.xml 1091 BLAKE2B fc7db1a6e1f3d32e9e579a8ba870b1d0322042cc2e9b723d0dcc120a4a714cb9d3a9e2e5da51e73c7d45e41976ae13b6566aaf0da856e0ef692d997f2ddf17bb SHA512 3e45f70e658253e9eb2fda16e3c054c0a670083142cb699247f47aac208ae67249fa66588a07730588e0ce64677a90e77dcd7015eb9d5478aef8b70933855831
diff --git a/media-sound/umurmur/umurmur-0.2.16a-r1.ebuild b/media-sound/umurmur/umurmur-0.2.16a-r1.ebuild
deleted file mode 100644
index 137b63342690..000000000000
--- a/media-sound/umurmur/umurmur-0.2.16a-r1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools systemd eutils readme.gentoo-r1 user
-
-DESCRIPTION="Minimalistic Murmur (Mumble server)"
-HOMEPAGE="https://github.com/umurmur/umurmur"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="gnutls libressl shm"
-
-# ssl-provider precendence: gnutls, libressl
-# and openssl if none specified
-DEPEND=">=dev-libs/protobuf-c-1.0.0_rc2
-	dev-libs/libconfig
-	gnutls? ( >=net-libs/gnutls-3.0.0 )
-	libressl? ( !gnutls? ( dev-libs/libressl ) )
-	!gnutls? ( !libressl? ( dev-libs/openssl:0= ) )"
-
-RDEPEND="${DEPEND}"
-
-DOC_CONTENTS="
-	A configuration file has been installed at /etc/umurmur/umurmur.conf - you
-	may	want to review it. See also\n
-	https://github.com/umurmur/umurmur/wiki/Configuration "
-
-pkg_pretend() {
-	local ssl_provider=(  )
-	use gnutls && ssl_provider+=( gnutls )
-	use libressl && ssl_provider+=( libressl )
-
-	if [[ ${#ssl_provider[@]} -gt 1 ]] ; then
-		ewarn "More than one ssl provider selected (${ssl_provider[@]})"
-		ewarn "defaulting to ${ssl_provider[0]}."
-	fi
-}
-
-pkg_setup() {
-	enewgroup murmur
-	enewuser murmur "" "" "" murmur
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-
-	econf \
-		--with-ssl=$(usev gnutls || echo openssl) \
-		$(use_enable shm shmapi)
-}
-
-src_install() {
-	local confdir
-
-	emake DESTDIR="${D}" install
-
-	newinitd "${FILESDIR}"/umurmurd.initd umurmurd
-	newconfd "${FILESDIR}"/umurmurd.confd umurmurd
-	systemd_dounit "${FILESDIR}"/umurmurd.service
-
-	dodoc AUTHORS ChangeLog
-	newdoc README.md README
-
-	confdir="/etc/umurmur"
-	insinto "${confdir}"
-	doins "${FILESDIR}"/umurmur.conf
-
-	# Some permissions are adjusted as the config may contain a server
-	# password, and /etc/umurmur will typically contain the cert and the
-	# key used to sign it, which are read after priveleges are dropped.
-	fperms 0750 "${confdir}"
-	fowners -R root:murmur "${confdir}"
-	fperms 0640 "${confdir}"/umurmur.conf
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/media-sound/umurmur/umurmur-0.2.17-r1.ebuild b/media-sound/umurmur/umurmur-0.2.17-r1.ebuild
deleted file mode 100644
index 4ca66ad93d0b..000000000000
--- a/media-sound/umurmur/umurmur-0.2.17-r1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools systemd eutils readme.gentoo-r1 user
-
-DESCRIPTION="Minimalistic Murmur (Mumble server)"
-HOMEPAGE="https://github.com/umurmur/umurmur"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV/_}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="gnutls libressl shm"
-
-# ssl-provider precendence: gnutls, libressl
-# and openssl if none specified
-DEPEND=">=dev-libs/protobuf-c-1.0.0_rc2
-	dev-libs/libconfig
-	gnutls? ( >=net-libs/gnutls-3.0.0 )
-	libressl? ( !gnutls? ( dev-libs/libressl ) )
-	!gnutls? ( !libressl? ( dev-libs/openssl:0= ) )"
-
-RDEPEND="${DEPEND}"
-
-DOC_CONTENTS="
-	A configuration file has been installed at /etc/umurmur/umurmur.conf - you
-	may	want to review it. See also\n
-	https://github.com/umurmur/umurmur/wiki/Configuration "
-
-S="${WORKDIR}/${P/_}"
-
-pkg_pretend() {
-	local ssl_provider=(  )
-	use gnutls && ssl_provider+=( gnutls )
-	use libressl && ssl_provider+=( libressl )
-
-	if [[ ${#ssl_provider[@]} -gt 1 ]] ; then
-		ewarn "More than one ssl provider selected (${ssl_provider[@]})"
-		ewarn "defaulting to ${ssl_provider[0]}."
-	fi
-}
-
-pkg_setup() {
-	enewgroup murmur
-	enewuser murmur "" "" "" murmur
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-
-	econf \
-		--with-ssl=$(usev gnutls || echo openssl) \
-		$(use_enable shm shmapi)
-}
-
-src_install() {
-	local confdir
-
-	emake DESTDIR="${D}" install
-
-	newinitd "${FILESDIR}"/umurmurd.initd umurmurd
-	newconfd "${FILESDIR}"/umurmurd.confd umurmurd
-	systemd_dounit "${FILESDIR}"/umurmurd.service
-
-	dodoc AUTHORS ChangeLog
-	newdoc README.md README
-
-	confdir="/etc/umurmur"
-	insinto "${confdir}"
-	doins "${FILESDIR}"/umurmur.conf
-
-	# Some permissions are adjusted as the config may contain a server
-	# password, and /etc/umurmur will typically contain the cert and the
-	# key used to sign it, which are read after priveleges are dropped.
-	fperms 0750 "${confdir}"
-	fowners -R root:murmur "${confdir}"
-	fperms 0640 "${confdir}"/umurmur.conf
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/media-sound/umurmur/umurmur-0.2.17-r2.ebuild b/media-sound/umurmur/umurmur-0.2.17-r2.ebuild
deleted file mode 100644
index 54434dd96ad0..000000000000
--- a/media-sound/umurmur/umurmur-0.2.17-r2.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools systemd readme.gentoo-r1 user
-
-DESCRIPTION="Minimalistic Murmur (Mumble server)"
-HOMEPAGE="https://github.com/umurmur/umurmur"
-if [[ "${PV}" == 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/umurmur/umurmur.git"
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV/_}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-LICENSE="BSD"
-SLOT="0"
-IUSE="gnutls libressl mbedtls shm"
-
-# ssl-provider precendence: gnutls, mbedtls, libressl
-# and openssl if none specified
-DEPEND=">=dev-libs/protobuf-c-1.0.0_rc2
-	dev-libs/libconfig
-	gnutls? (
-		dev-libs/nettle:=
-		>=net-libs/gnutls-3.0.0
-	)
-	!gnutls? (
-		mbedtls? ( net-libs/mbedtls )
-		!mbedtls? (
-			libressl? ( dev-libs/libressl:0= )
-			!libressl? ( dev-libs/openssl:0= )
-		)
-	)
-"
-
-RDEPEND="${DEPEND}"
-
-DOC_CONTENTS="
-	A configuration file has been installed at /etc/umurmur/umurmur.conf - you
-	may	want to review it. See also\n
-	https://github.com/umurmur/umurmur/wiki/Configuration "
-
-S="${WORKDIR}/${P/_}"
-
-get_ssl_impl() {
-	local ssl_provider=()
-
-	use gnutls && ssl_provider+=( gnutls )
-	use mbedtls && ssl_provider+=( mbedtls )
-	use libressl && ssl_provider+=( libressl )
-
-	if ! use gnutls && ! use mbedtls && ! use libressl ; then
-		ssl_provider+=( openssl )
-	fi
-	echo ${ssl_provider[@]}
-}
-
-pkg_pretend() {
-	local ssl_provider=( $(get_ssl_impl) )
-
-	if [[ ${#ssl_provider[@]} -gt 1 ]] ; then
-		ewarn "More than one ssl provider selected (${ssl_provider[@]})"
-		ewarn "defaulting to ${ssl_provider[0]}."
-	fi
-}
-
-pkg_setup() {
-	enewgroup murmur
-	enewuser murmur "" "" "" murmur
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local ssl_provider=( $(sed 's@libressl@openssl@' <<< $(get_ssl_impl)) )
-
-	local myeconfargs=(
-		--with-ssl="${ssl_provider[@]}"
-		$(use_enable shm shmapi)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	local confdir
-
-	emake DESTDIR="${D}" install
-
-	newinitd "${FILESDIR}"/umurmurd.initd umurmurd
-	newconfd "${FILESDIR}"/umurmurd.confd umurmurd
-	systemd_dounit "${FILESDIR}"/umurmurd.service
-
-	dodoc AUTHORS ChangeLog
-	newdoc README.md README
-
-	confdir="/etc/umurmur"
-	insinto "${confdir}"
-	doins "${FILESDIR}"/umurmur.conf
-
-	# Some permissions are adjusted as the config may contain a server
-	# password, and /etc/umurmur will typically contain the cert and the
-	# key used to sign it, which are read after priveleges are dropped.
-	fperms 0750 "${confdir}"
-	fowners -R root:murmur "${confdir}"
-	fperms 0640 "${confdir}"/umurmur.conf
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/media-sound/umurmur/umurmur-0.2.17-r3.ebuild b/media-sound/umurmur/umurmur-0.2.17-r3.ebuild
index d01e6411f0f8..368646a5296a 100644
--- a/media-sound/umurmur/umurmur-0.2.17-r3.ebuild
+++ b/media-sound/umurmur/umurmur-0.2.17-r3.ebuild
@@ -12,7 +12,7 @@ if [[ "${PV}" == 9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/umurmur/umurmur.git"
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV/_}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="amd64 ~arm x86"
 fi
 LICENSE="BSD"
 SLOT="0"