gentoo resync : 18.08.2019

3 files changed, 122 insertions, 8 deletions

diff --git a/media-sound/umurmur/Manifest b/media-sound/umurmur/Manifest
index e5a7668cf6f8..55233b291981 100644
--- a/media-sound/umurmur/Manifest
+++ b/media-sound/umurmur/Manifest
@@ -7,5 +7,6 @@ DIST umurmur-0.2.17.tar.gz 93786 BLAKE2B 92fc7d63dc0eed228c3fbcb0d18861cd49967f4
 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-9999.ebuild 2660 BLAKE2B 60c76bfafedaa36fa4e0d1b5e1119e2601ab2bbabd871e099ed176e154d658497c5ecdb8f8195d9ef664e13240a2b692a44e6fe2d0b4b563a74b8f18e76388af SHA512 772ff1543f1cd79605475a23ce867eebcf4a227df2a3cf96e6fee6421b8290518e8a28bafaa631222704675b296cdad006be9fd8fec928e8c157c3f8c8bb0b18
+EBUILD umurmur-0.2.17-r3.ebuild 2625 BLAKE2B dc8ca273bc5b9d88686ef51ef9803d2c0e94e82d3c81e96fb4926077d0f7a8db79cf6f6f80e817cded610111b75e573c7d42dee532c8dcccf98a661cd63b42e6 SHA512 451bd9ed9f3f034992880ad81fb347a49b0d4750b0dbed044a9e54c112740024f16f6de0e0ca105df0dc130ac022b95bc0aa0fda7482dce0bb6d3e1a360bc176
+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.17-r3.ebuild b/media-sound/umurmur/umurmur-0.2.17-r3.ebuild
new file mode 100644
index 000000000000..d01e6411f0f8
--- /dev/null
+++ b/media-sound/umurmur/umurmur-0.2.17-r3.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools systemd readme.gentoo-r1
+
+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}
+	acct-group/murmur
+	acct-user/murmur
+"
+
+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
+}
+
+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-9999.ebuild b/media-sound/umurmur/umurmur-9999.ebuild
index 54434dd96ad0..d01e6411f0f8 100644
--- a/media-sound/umurmur/umurmur-9999.ebuild
+++ b/media-sound/umurmur/umurmur-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools systemd readme.gentoo-r1 user
+inherit autotools systemd readme.gentoo-r1
 
 DESCRIPTION="Minimalistic Murmur (Mumble server)"
 HOMEPAGE="https://github.com/umurmur/umurmur"
@@ -35,7 +35,10 @@ DEPEND=">=dev-libs/protobuf-c-1.0.0_rc2
 	)
 "
 
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	acct-group/murmur
+	acct-user/murmur
+"
 
 DOC_CONTENTS="
 	A configuration file has been installed at /etc/umurmur/umurmur.conf - you
@@ -66,11 +69,6 @@ pkg_pretend() {
 	fi
 }
 
-pkg_setup() {
-	enewgroup murmur
-	enewuser murmur "" "" "" murmur
-}
-
 src_prepare() {
 	default
 	eautoreconf