[gentoo-commits] repo/gentoo:master commit in: media-sound/umurmur/files/, profiles/updates/, media-sound/umurmur/, ...

2022-06-29 Thread Kenton Groombridge
commit: 6a3f36ffcfc61182f7f9ac6e82a7e942e81e82df
Author: Kenton Groombridge  gentoo  org>
AuthorDate: Wed Jun 29 22:57:53 2022 +
Commit: Kenton Groombridge  gentoo  org>
CommitDate: Thu Jun 30 00:19:05 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a3f36ff

net-voip/umurmur: rename media-sound/umurmur

Signed-off-by: Kenton Groombridge  gentoo.org>

 {media-sound => net-voip}/umurmur/Manifest| 0
 {media-sound => net-voip}/umurmur/files/umurmur-0.2.20-openssl3.patch | 0
 {media-sound => net-voip}/umurmur/files/umurmur.conf  | 0
 {media-sound => net-voip}/umurmur/files/umurmurd.confd| 0
 {media-sound => net-voip}/umurmur/files/umurmurd.initd| 0
 {media-sound => net-voip}/umurmur/files/umurmurd.service  | 0
 {media-sound => net-voip}/umurmur/metadata.xml| 0
 {media-sound => net-voip}/umurmur/umurmur-0.2.17-r4.ebuild| 2 +-
 {media-sound => net-voip}/umurmur/umurmur-0.2.19.ebuild   | 2 +-
 {media-sound => net-voip}/umurmur/umurmur-0.2.20.ebuild   | 0
 {media-sound => net-voip}/umurmur/umurmur-.ebuild | 2 +-
 profiles/updates/2Q-2022  | 1 +
 12 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/media-sound/umurmur/Manifest b/net-voip/umurmur/Manifest
similarity index 100%
rename from media-sound/umurmur/Manifest
rename to net-voip/umurmur/Manifest

diff --git a/media-sound/umurmur/files/umurmur-0.2.20-openssl3.patch 
b/net-voip/umurmur/files/umurmur-0.2.20-openssl3.patch
similarity index 100%
rename from media-sound/umurmur/files/umurmur-0.2.20-openssl3.patch
rename to net-voip/umurmur/files/umurmur-0.2.20-openssl3.patch

diff --git a/media-sound/umurmur/files/umurmur.conf 
b/net-voip/umurmur/files/umurmur.conf
similarity index 100%
rename from media-sound/umurmur/files/umurmur.conf
rename to net-voip/umurmur/files/umurmur.conf

diff --git a/media-sound/umurmur/files/umurmurd.confd 
b/net-voip/umurmur/files/umurmurd.confd
similarity index 100%
rename from media-sound/umurmur/files/umurmurd.confd
rename to net-voip/umurmur/files/umurmurd.confd

diff --git a/media-sound/umurmur/files/umurmurd.initd 
b/net-voip/umurmur/files/umurmurd.initd
similarity index 100%
rename from media-sound/umurmur/files/umurmurd.initd
rename to net-voip/umurmur/files/umurmurd.initd

diff --git a/media-sound/umurmur/files/umurmurd.service 
b/net-voip/umurmur/files/umurmurd.service
similarity index 100%
rename from media-sound/umurmur/files/umurmurd.service
rename to net-voip/umurmur/files/umurmurd.service

diff --git a/media-sound/umurmur/metadata.xml b/net-voip/umurmur/metadata.xml
similarity index 100%
rename from media-sound/umurmur/metadata.xml
rename to net-voip/umurmur/metadata.xml

diff --git a/media-sound/umurmur/umurmur-0.2.17-r4.ebuild 
b/net-voip/umurmur/umurmur-0.2.17-r4.ebuild
similarity index 98%
rename from media-sound/umurmur/umurmur-0.2.17-r4.ebuild
rename to net-voip/umurmur/umurmur-0.2.17-r4.ebuild
index a840c65de765..c61a58654320 100644
--- a/media-sound/umurmur/umurmur-0.2.17-r4.ebuild
+++ b/net-voip/umurmur/umurmur-0.2.17-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7

diff --git a/media-sound/umurmur/umurmur-0.2.19.ebuild 
b/net-voip/umurmur/umurmur-0.2.19.ebuild
similarity index 98%
rename from media-sound/umurmur/umurmur-0.2.19.ebuild
rename to net-voip/umurmur/umurmur-0.2.19.ebuild
index ca21485b1db5..68da6bed82ba 100644
--- a/media-sound/umurmur/umurmur-0.2.19.ebuild
+++ b/net-voip/umurmur/umurmur-0.2.19.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7

diff --git a/media-sound/umurmur/umurmur-0.2.20.ebuild 
b/net-voip/umurmur/umurmur-0.2.20.ebuild
similarity index 100%
rename from media-sound/umurmur/umurmur-0.2.20.ebuild
rename to net-voip/umurmur/umurmur-0.2.20.ebuild

diff --git a/media-sound/umurmur/umurmur-.ebuild 
b/net-voip/umurmur/umurmur-.ebuild
similarity index 98%
rename from media-sound/umurmur/umurmur-.ebuild
rename to net-voip/umurmur/umurmur-.ebuild
index ca21485b1db5..68da6bed82ba 100644
--- a/media-sound/umurmur/umurmur-.ebuild
+++ b/net-voip/umurmur/umurmur-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7

diff --git a/profiles/updates/2Q-2022 b/profiles/updates/2Q-2022
index e65929238978..3653c431081f 100644
--- a/profiles/updates/2Q-2022
+++ b/profiles/updates/2Q-2022
@@ -10,3 +10,4 @@ move app-admin/undertaker-scripts 
app-admin/gentoo-retirement-scripts
 move dev-python/pep621 dev-python/pyproject-metadata
 move 

[gentoo-commits] repo/gentoo:master commit in: media-sound/umurmur/files/, media-sound/umurmur/

2022-03-04 Thread Lars Wendler
commit: 11ef57b76df54b68f0f14cbfe395714f01c3c61c
Author: Lars Wendler  gentoo  org>
AuthorDate: Sat Mar  5 00:04:12 2022 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Sat Mar  5 00:07:45 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11ef57b7

media-sound/umurmur: Fixed build against openssl-3

Closes: https://bugs.gentoo.org/806154
Signed-off-by: Lars Wendler  gentoo.org>

 media-sound/umurmur/files/umurmur-0.2.20-openssl3.patch | 11 +++
 media-sound/umurmur/umurmur-0.2.20.ebuild   |  6 +-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/media-sound/umurmur/files/umurmur-0.2.20-openssl3.patch 
b/media-sound/umurmur/files/umurmur-0.2.20-openssl3.patch
new file mode 100644
index ..ad7cc1177874
--- /dev/null
+++ b/media-sound/umurmur/files/umurmur-0.2.20-openssl3.patch
@@ -0,0 +1,11 @@
+--- umurmur-0.2.20/src/ssli_openssl.c
 umurmur-0.2.20/src/ssli_openssl.c
+@@ -142,8 +142,6 @@
+   
+   Log_info("Generating new server certificate.");
+   
+-  CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON);
+-  
+   x509 = X509_new();
+   if (!x509)
+   goto err_out;

diff --git a/media-sound/umurmur/umurmur-0.2.20.ebuild 
b/media-sound/umurmur/umurmur-0.2.20.ebuild
index ca21485b1db5..677e6fa4f97a 100644
--- a/media-sound/umurmur/umurmur-0.2.20.ebuild
+++ b/media-sound/umurmur/umurmur-0.2.20.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -41,6 +41,10 @@ DOC_CONTENTS="
may want to review it. See also\n
https://github.com/umurmur/umurmur/wiki/Configuration "
 
+PATCHES=(
+   "${FILESDIR}/${PN}-0.2.20-openssl3.patch" #806154
+)
+
 S="${WORKDIR}/${P/_}"
 
 get_ssl_impl() {



[gentoo-commits] repo/gentoo:master commit in: media-sound/umurmur/

2021-05-01 Thread Sam James
commit: c2bee47c146acccd2e6fa0f708a986f2cb63f17d
Author: Sam James  gentoo  org>
AuthorDate: Sat May  1 17:50:43 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat May  1 18:06:48 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2bee47c

media-sound/umurmur: drop obsolete LibreSSL support

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Sam James  gentoo.org>

 media-sound/umurmur/umurmur-0.2.17-r4.ebuild | 14 +-
 media-sound/umurmur/umurmur-0.2.19.ebuild|  7 ++-
 media-sound/umurmur/umurmur-0.2.20.ebuild|  2 +-
 media-sound/umurmur/umurmur-.ebuild  |  2 +-
 4 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/media-sound/umurmur/umurmur-0.2.17-r4.ebuild 
b/media-sound/umurmur/umurmur-0.2.17-r4.ebuild
index 5f27975b77c..a840c65de76 100644
--- a/media-sound/umurmur/umurmur-0.2.17-r4.ebuild
+++ b/media-sound/umurmur/umurmur-0.2.17-r4.ebuild
@@ -16,9 +16,9 @@ else
 fi
 LICENSE="BSD"
 SLOT="0"
-IUSE="gnutls libressl mbedtls shm"
+IUSE="gnutls mbedtls shm"
 
-# ssl-provider precendence: gnutls, mbedtls, libressl
+# ssl-provider precendence: gnutls, mbedtls
 # and openssl if none specified
 DEPEND=">=dev-libs/protobuf-c-1.0.0_rc2:=
dev-libs/libconfig:=
@@ -28,10 +28,7 @@ DEPEND=">=dev-libs/protobuf-c-1.0.0_rc2:=
)
!gnutls? (
mbedtls? ( net-libs/mbedtls:= )
-   !mbedtls? (
-   libressl? ( dev-libs/libressl:0= )
-   !libressl? ( dev-libs/openssl:0= )
-   )
+   !mbedtls? ( dev-libs/openssl:0= )
)
 "
 
@@ -52,9 +49,8 @@ get_ssl_impl() {
 
use gnutls && ssl_provider+=( gnutls )
use mbedtls && ssl_provider+=( mbedtls )
-   use libressl && ssl_provider+=( libressl )
 
-   if ! use gnutls && ! use mbedtls && ! use libressl ; then
+   if ! use gnutls && ! use mbedtls; then
ssl_provider+=( openssl )
fi
echo ${ssl_provider[@]}
@@ -75,7 +71,7 @@ src_prepare() {
 }
 
 src_configure() {
-   local ssl_provider=( $(sed 's@libressl@openssl@' <<< $(get_ssl_impl)) )
+   local ssl_provider=( $(get_ssl_impl) )
 
local myeconfargs=(
--with-ssl="${ssl_provider[@]}"

diff --git a/media-sound/umurmur/umurmur-0.2.19.ebuild 
b/media-sound/umurmur/umurmur-0.2.19.ebuild
index 5bc252e176b..ca21485b1db 100644
--- a/media-sound/umurmur/umurmur-0.2.19.ebuild
+++ b/media-sound/umurmur/umurmur-0.2.19.ebuild
@@ -16,7 +16,7 @@ else
 fi
 LICENSE="BSD"
 SLOT="0"
-IUSE="gnutls libressl mbedtls shm"
+IUSE="gnutls mbedtls shm"
 
 # ssl-provider precendence: gnutls, mbedtls and openssl if none specified
 DEPEND=">=dev-libs/protobuf-c-1.0.0_rc2:=
@@ -27,10 +27,7 @@ DEPEND=">=dev-libs/protobuf-c-1.0.0_rc2:=
)
!gnutls? (
mbedtls? ( net-libs/mbedtls:= )
-   !mbedtls? (
-   libressl? ( dev-libs/libressl:0= )
-   !libressl? ( dev-libs/openssl:0= )
-   )
+   !mbedtls? ( dev-libs/openssl:0= )
)
 "
 

diff --git a/media-sound/umurmur/umurmur-0.2.20.ebuild 
b/media-sound/umurmur/umurmur-0.2.20.ebuild
index 7b9bed7d269..ca21485b1db 100644
--- a/media-sound/umurmur/umurmur-0.2.20.ebuild
+++ b/media-sound/umurmur/umurmur-0.2.20.ebuild
@@ -16,7 +16,7 @@ else
 fi
 LICENSE="BSD"
 SLOT="0"
-IUSE="gnutls libressl mbedtls shm"
+IUSE="gnutls mbedtls shm"
 
 # ssl-provider precendence: gnutls, mbedtls and openssl if none specified
 DEPEND=">=dev-libs/protobuf-c-1.0.0_rc2:=

diff --git a/media-sound/umurmur/umurmur-.ebuild 
b/media-sound/umurmur/umurmur-.ebuild
index 7b9bed7d269..ca21485b1db 100644
--- a/media-sound/umurmur/umurmur-.ebuild
+++ b/media-sound/umurmur/umurmur-.ebuild
@@ -16,7 +16,7 @@ else
 fi
 LICENSE="BSD"
 SLOT="0"
-IUSE="gnutls libressl mbedtls shm"
+IUSE="gnutls mbedtls shm"
 
 # ssl-provider precendence: gnutls, mbedtls and openssl if none specified
 DEPEND=">=dev-libs/protobuf-c-1.0.0_rc2:=



[gentoo-commits] repo/gentoo:master commit in: media-sound/umurmur/

2021-03-26 Thread Lars Wendler
commit: 604d79f327176eecb05293d7154e24231229cb31
Author: Lars Wendler  gentoo  org>
AuthorDate: Fri Mar 26 09:30:39 2021 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Fri Mar 26 09:31:33 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=604d79f3

media-sound/umurmur: Removed old

Signed-off-by: Lars Wendler  gentoo.org>

 media-sound/umurmur/Manifest  |   1 -
 media-sound/umurmur/umurmur-0.2.18.ebuild | 115 --
 2 files changed, 116 deletions(-)

diff --git a/media-sound/umurmur/Manifest b/media-sound/umurmur/Manifest
index 3233b8a1981..88c77311084 100644
--- a/media-sound/umurmur/Manifest
+++ b/media-sound/umurmur/Manifest
@@ -1,4 +1,3 @@
 DIST umurmur-0.2.17.tar.gz 93786 BLAKE2B 
92fc7d63dc0eed228c3fbcb0d18861cd49967f44378d980e856f8fb24fe7abc3429a4ca8e811eda6096727b76780724c909c46c04975b5edef70d848b7511618
 SHA512 
a496a51fd7815ad117f5aee17bb78cbd319c584ad60ab8aebbfd8ddf7b1760f443f2337bc74be1e0d5af17d3c3df2ae6c9060eca576cf1e6ed4c6cb0825e9c15
-DIST umurmur-0.2.18.tar.gz 93039 BLAKE2B 
45a6e247dee604861e70698350b7b0ee28fd7ee82a94f684eae8ff5ab7daa0c3446b32c4aa28b39e64588944b8b81c4e2a11db79d0bde9e4a2012e67b4125be2
 SHA512 
bd1cd7149684dbe42b9804c9a5539cdb2becf6b721d74bd88d154e9037d3289ab57ee816c0592a0167ddd302da68d94017c86deb96348d272ec9bd21e9628656
 DIST umurmur-0.2.19.tar.gz 93117 BLAKE2B 
54d6fe6e67f51f24d6c9f0125fa330292004cd5df71791c40ece6aa7c2938bce98ca981e873a1e2b43598f99ea57c687963fd7cd8708400f5f2ce00ab11386eb
 SHA512 
4a10c41d8396d6bd2b195578ff6a29e69a105f8830daf85141217f768cc2c4ea6204a2b3b65599d07d76c841090750db4ad6264c4e9d7e5afa7f1b4cf27bc768
 DIST umurmur-0.2.20.tar.gz 93152 BLAKE2B 
7850d0f3a5c35db1f5ed2b2eea7725d288901eb7e49b9bf2f715963a102c6c6345ed90fd066d80a2666137918c73a58dd2c954321b69d0ce59f686e1c6d01e5a
 SHA512 
0913f5ba84b30fec4ae6a1521c442ff8c48121bbbca5de9082e04e41b36434fadb5f81cb2ea0bd0a8c63f6e541d15eeda3637667d8cc7113d38935ded320cef4

diff --git a/media-sound/umurmur/umurmur-0.2.18.ebuild 
b/media-sound/umurmur/umurmur-0.2.18.ebuild
deleted file mode 100644
index 2eaae13bc97..000
--- a/media-sound/umurmur/umurmur-0.2.18.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2021 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}" == * ]] ; 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 

[gentoo-commits] repo/gentoo:master commit in: media-sound/umurmur/

2021-03-26 Thread Lars Wendler
commit: 9ad8f6b01c876471547e6d0ea5189c68b266b87f
Author: Lars Wendler  gentoo  org>
AuthorDate: Fri Mar 26 09:30:13 2021 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Fri Mar 26 09:31:32 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ad8f6b0

media-sound/umurmur: Synced live ebuild

Signed-off-by: Lars Wendler  gentoo.org>

 media-sound/umurmur/umurmur-.ebuild | 5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/media-sound/umurmur/umurmur-.ebuild 
b/media-sound/umurmur/umurmur-.ebuild
index 5bc252e176b..7b9bed7d269 100644
--- a/media-sound/umurmur/umurmur-.ebuild
+++ b/media-sound/umurmur/umurmur-.ebuild
@@ -27,10 +27,7 @@ DEPEND=">=dev-libs/protobuf-c-1.0.0_rc2:=
)
!gnutls? (
mbedtls? ( net-libs/mbedtls:= )
-   !mbedtls? (
-   libressl? ( dev-libs/libressl:0= )
-   !libressl? ( dev-libs/openssl:0= )
-   )
+   !mbedtls? ( dev-libs/openssl:0= )
)
 "
 



[gentoo-commits] repo/gentoo:master commit in: media-sound/umurmur/

2021-03-26 Thread Lars Wendler
commit: 17b10ec0e830801e1db18a319ee8d19f2feb87d2
Author: Lars Wendler  gentoo  org>
AuthorDate: Fri Mar 26 09:29:38 2021 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Fri Mar 26 09:31:32 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17b10ec0

media-sound/umurmur: Bump to version 0.2.20

Signed-off-by: Lars Wendler  gentoo.org>

 media-sound/umurmur/Manifest  |   1 +
 media-sound/umurmur/umurmur-0.2.20.ebuild | 110 ++
 2 files changed, 111 insertions(+)

diff --git a/media-sound/umurmur/Manifest b/media-sound/umurmur/Manifest
index 022c1f5d819..3233b8a1981 100644
--- a/media-sound/umurmur/Manifest
+++ b/media-sound/umurmur/Manifest
@@ -1,3 +1,4 @@
 DIST umurmur-0.2.17.tar.gz 93786 BLAKE2B 
92fc7d63dc0eed228c3fbcb0d18861cd49967f44378d980e856f8fb24fe7abc3429a4ca8e811eda6096727b76780724c909c46c04975b5edef70d848b7511618
 SHA512 
a496a51fd7815ad117f5aee17bb78cbd319c584ad60ab8aebbfd8ddf7b1760f443f2337bc74be1e0d5af17d3c3df2ae6c9060eca576cf1e6ed4c6cb0825e9c15
 DIST umurmur-0.2.18.tar.gz 93039 BLAKE2B 
45a6e247dee604861e70698350b7b0ee28fd7ee82a94f684eae8ff5ab7daa0c3446b32c4aa28b39e64588944b8b81c4e2a11db79d0bde9e4a2012e67b4125be2
 SHA512 
bd1cd7149684dbe42b9804c9a5539cdb2becf6b721d74bd88d154e9037d3289ab57ee816c0592a0167ddd302da68d94017c86deb96348d272ec9bd21e9628656
 DIST umurmur-0.2.19.tar.gz 93117 BLAKE2B 
54d6fe6e67f51f24d6c9f0125fa330292004cd5df71791c40ece6aa7c2938bce98ca981e873a1e2b43598f99ea57c687963fd7cd8708400f5f2ce00ab11386eb
 SHA512 
4a10c41d8396d6bd2b195578ff6a29e69a105f8830daf85141217f768cc2c4ea6204a2b3b65599d07d76c841090750db4ad6264c4e9d7e5afa7f1b4cf27bc768
+DIST umurmur-0.2.20.tar.gz 93152 BLAKE2B 
7850d0f3a5c35db1f5ed2b2eea7725d288901eb7e49b9bf2f715963a102c6c6345ed90fd066d80a2666137918c73a58dd2c954321b69d0ce59f686e1c6d01e5a
 SHA512 
0913f5ba84b30fec4ae6a1521c442ff8c48121bbbca5de9082e04e41b36434fadb5f81cb2ea0bd0a8c63f6e541d15eeda3637667d8cc7113d38935ded320cef4

diff --git a/media-sound/umurmur/umurmur-0.2.20.ebuild 
b/media-sound/umurmur/umurmur-0.2.20.ebuild
new file mode 100644
index 000..7b9bed7d269
--- /dev/null
+++ b/media-sound/umurmur/umurmur-0.2.20.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2021 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}" == * ]] ; 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 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? ( 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 )
+
+   if ! use gnutls && ! use mbedtls ; 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=( $(get_ssl_impl) )
+
+   local myeconfargs=(
+   --with-ssl="${ssl_provider[0]}"
+   $(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 

[gentoo-commits] repo/gentoo:master commit in: media-sound/umurmur/

2021-01-29 Thread Lars Wendler
commit: 19367ed187244119173c6f847d1a87754227951e
Author: Lars Wendler  gentoo  org>
AuthorDate: Fri Jan 29 10:51:10 2021 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Fri Jan 29 10:51:17 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19367ed1

media-sound/umurmur: Synced live ebuild

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Lars Wendler  gentoo.org>

 media-sound/umurmur/umurmur-.ebuild | 10 --
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/media-sound/umurmur/umurmur-.ebuild 
b/media-sound/umurmur/umurmur-.ebuild
index 2eaae13bc97..5bc252e176b 100644
--- a/media-sound/umurmur/umurmur-.ebuild
+++ b/media-sound/umurmur/umurmur-.ebuild
@@ -18,8 +18,7 @@ LICENSE="BSD"
 SLOT="0"
 IUSE="gnutls libressl mbedtls shm"
 
-# ssl-provider precendence: gnutls, mbedtls, libressl
-# and openssl if none specified
+# ssl-provider precendence: gnutls, mbedtls and openssl if none specified
 DEPEND=">=dev-libs/protobuf-c-1.0.0_rc2:=
dev-libs/libconfig:=
gnutls? (
@@ -52,9 +51,8 @@ get_ssl_impl() {
 
use gnutls && ssl_provider+=( gnutls )
use mbedtls && ssl_provider+=( mbedtls )
-   use libressl && ssl_provider+=( libressl )
 
-   if ! use gnutls && ! use mbedtls && ! use libressl ; then
+   if ! use gnutls && ! use mbedtls ; then
ssl_provider+=( openssl )
fi
echo ${ssl_provider[@]}
@@ -75,10 +73,10 @@ src_prepare() {
 }
 
 src_configure() {
-   local ssl_provider=( $(sed 's@libressl@openssl@' <<< $(get_ssl_impl)) )
+   local ssl_provider=( $(get_ssl_impl) )
 
local myeconfargs=(
-   --with-ssl="${ssl_provider[@]}"
+   --with-ssl="${ssl_provider[0]}"
$(use_enable shm shmapi)
)
econf "${myeconfargs[@]}"



[gentoo-commits] repo/gentoo:master commit in: media-sound/umurmur/

2021-01-29 Thread Lars Wendler
commit: a4d74ca45c17f50cd84ee7721b11d389270d8e0d
Author: Lars Wendler  gentoo  org>
AuthorDate: Fri Jan 29 10:50:23 2021 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Fri Jan 29 10:51:16 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4d74ca4

media-sound/umurmur: Bump to version 0.2.19

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Lars Wendler  gentoo.org>

 media-sound/umurmur/Manifest  |   1 +
 media-sound/umurmur/umurmur-0.2.19.ebuild | 113 ++
 2 files changed, 114 insertions(+)

diff --git a/media-sound/umurmur/Manifest b/media-sound/umurmur/Manifest
index a456aa42469..022c1f5d819 100644
--- a/media-sound/umurmur/Manifest
+++ b/media-sound/umurmur/Manifest
@@ -1,2 +1,3 @@
 DIST umurmur-0.2.17.tar.gz 93786 BLAKE2B 
92fc7d63dc0eed228c3fbcb0d18861cd49967f44378d980e856f8fb24fe7abc3429a4ca8e811eda6096727b76780724c909c46c04975b5edef70d848b7511618
 SHA512 
a496a51fd7815ad117f5aee17bb78cbd319c584ad60ab8aebbfd8ddf7b1760f443f2337bc74be1e0d5af17d3c3df2ae6c9060eca576cf1e6ed4c6cb0825e9c15
 DIST umurmur-0.2.18.tar.gz 93039 BLAKE2B 
45a6e247dee604861e70698350b7b0ee28fd7ee82a94f684eae8ff5ab7daa0c3446b32c4aa28b39e64588944b8b81c4e2a11db79d0bde9e4a2012e67b4125be2
 SHA512 
bd1cd7149684dbe42b9804c9a5539cdb2becf6b721d74bd88d154e9037d3289ab57ee816c0592a0167ddd302da68d94017c86deb96348d272ec9bd21e9628656
+DIST umurmur-0.2.19.tar.gz 93117 BLAKE2B 
54d6fe6e67f51f24d6c9f0125fa330292004cd5df71791c40ece6aa7c2938bce98ca981e873a1e2b43598f99ea57c687963fd7cd8708400f5f2ce00ab11386eb
 SHA512 
4a10c41d8396d6bd2b195578ff6a29e69a105f8830daf85141217f768cc2c4ea6204a2b3b65599d07d76c841090750db4ad6264c4e9d7e5afa7f1b4cf27bc768

diff --git a/media-sound/umurmur/umurmur-0.2.19.ebuild 
b/media-sound/umurmur/umurmur-0.2.19.ebuild
new file mode 100644
index 000..5bc252e176b
--- /dev/null
+++ b/media-sound/umurmur/umurmur-0.2.19.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2021 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}" == * ]] ; 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 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 )
+
+   if ! use gnutls && ! use mbedtls ; 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=( $(get_ssl_impl) )
+
+   local myeconfargs=(
+   --with-ssl="${ssl_provider[0]}"
+   $(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
+}
+

[gentoo-commits] repo/gentoo:master commit in: media-sound/umurmur/

2021-01-05 Thread Lars Wendler
commit: 0cc802dca00a84c73efcc31bdbbf0f6eae13aee2
Author: Lars Wendler  gentoo  org>
AuthorDate: Tue Jan  5 09:53:31 2021 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Tue Jan  5 15:20:25 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0cc802dc

media-sound/umurmur: Bump to version 0.2.18

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Lars Wendler  gentoo.org>

 media-sound/umurmur/Manifest  |   1 +
 media-sound/umurmur/umurmur-0.2.18.ebuild | 115 ++
 2 files changed, 116 insertions(+)

diff --git a/media-sound/umurmur/Manifest b/media-sound/umurmur/Manifest
index ab9993a1b10..a456aa42469 100644
--- a/media-sound/umurmur/Manifest
+++ b/media-sound/umurmur/Manifest
@@ -1 +1,2 @@
 DIST umurmur-0.2.17.tar.gz 93786 BLAKE2B 
92fc7d63dc0eed228c3fbcb0d18861cd49967f44378d980e856f8fb24fe7abc3429a4ca8e811eda6096727b76780724c909c46c04975b5edef70d848b7511618
 SHA512 
a496a51fd7815ad117f5aee17bb78cbd319c584ad60ab8aebbfd8ddf7b1760f443f2337bc74be1e0d5af17d3c3df2ae6c9060eca576cf1e6ed4c6cb0825e9c15
+DIST umurmur-0.2.18.tar.gz 93039 BLAKE2B 
45a6e247dee604861e70698350b7b0ee28fd7ee82a94f684eae8ff5ab7daa0c3446b32c4aa28b39e64588944b8b81c4e2a11db79d0bde9e4a2012e67b4125be2
 SHA512 
bd1cd7149684dbe42b9804c9a5539cdb2becf6b721d74bd88d154e9037d3289ab57ee816c0592a0167ddd302da68d94017c86deb96348d272ec9bd21e9628656

diff --git a/media-sound/umurmur/umurmur-0.2.18.ebuild 
b/media-sound/umurmur/umurmur-0.2.18.ebuild
new file mode 100644
index 000..2eaae13bc97
--- /dev/null
+++ b/media-sound/umurmur/umurmur-0.2.18.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2021 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}" == * ]] ; 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
+}



[gentoo-commits] repo/gentoo:master commit in: media-sound/umurmur/

2021-01-05 Thread Lars Wendler
commit: 02233c337d4be37c589119a342ff29abb746a370
Author: Lars Wendler  gentoo  org>
AuthorDate: Tue Jan  5 09:54:08 2021 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Tue Jan  5 15:20:26 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02233c33

media-sound/umurmur: Synced live ebuild

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Lars Wendler  gentoo.org>

 media-sound/umurmur/umurmur-.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-sound/umurmur/umurmur-.ebuild 
b/media-sound/umurmur/umurmur-.ebuild
index 617a807375b..2eaae13bc97 100644
--- a/media-sound/umurmur/umurmur-.ebuild
+++ b/media-sound/umurmur/umurmur-.ebuild
@@ -7,7 +7,7 @@ inherit autotools systemd readme.gentoo-r1
 
 DESCRIPTION="Minimalistic Murmur (Mumble server)"
 HOMEPAGE="https://github.com/umurmur/umurmur;
-if [[ "${PV}" ==  ]] ; then
+if [[ "${PV}" == * ]] ; then
inherit git-r3
EGIT_REPO_URI="https://github.com/umurmur/umurmur.git;
 else
@@ -42,7 +42,7 @@ RDEPEND="${DEPEND}
 
 DOC_CONTENTS="
A configuration file has been installed at /etc/umurmur/umurmur.conf - 
you
-   may want to review it. See also\n
+   may want to review it. See also\n
https://github.com/umurmur/umurmur/wiki/Configuration "
 
 S="${WORKDIR}/${P/_}"



[gentoo-commits] repo/gentoo:master commit in: media-sound/umurmur/

2021-01-01 Thread Sam James
commit: c8efedca1b6b88c0db7c136ed723a6eaccba88be
Author: Sam James  gentoo  org>
AuthorDate: Sat Jan  2 01:36:10 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jan  2 01:43:15 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8efedca

media-sound/umurmur: more subslot deps

Package-Manager: Portage-3.0.12-prefix, Repoman-3.0.2
Signed-off-by: Sam James  gentoo.org>

 media-sound/umurmur/umurmur-0.2.17-r4.ebuild | 6 +++---
 media-sound/umurmur/umurmur-.ebuild  | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/media-sound/umurmur/umurmur-0.2.17-r4.ebuild 
b/media-sound/umurmur/umurmur-0.2.17-r4.ebuild
index 9bc2d4e0ca0..5f27975b77c 100644
--- a/media-sound/umurmur/umurmur-0.2.17-r4.ebuild
+++ b/media-sound/umurmur/umurmur-0.2.17-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -20,11 +20,11 @@ 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
+DEPEND=">=dev-libs/protobuf-c-1.0.0_rc2:=
dev-libs/libconfig:=
gnutls? (
dev-libs/nettle:=
-   >=net-libs/gnutls-3.0.0
+   >=net-libs/gnutls-3.0.0:=
)
!gnutls? (
mbedtls? ( net-libs/mbedtls:= )

diff --git a/media-sound/umurmur/umurmur-.ebuild 
b/media-sound/umurmur/umurmur-.ebuild
index edcef21466b..617a807375b 100644
--- a/media-sound/umurmur/umurmur-.ebuild
+++ b/media-sound/umurmur/umurmur-.ebuild
@@ -20,11 +20,11 @@ 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
+DEPEND=">=dev-libs/protobuf-c-1.0.0_rc2:=
dev-libs/libconfig:=
gnutls? (
dev-libs/nettle:=
-   >=net-libs/gnutls-3.0.0
+   >=net-libs/gnutls-3.0.0:=
)
!gnutls? (
mbedtls? ( net-libs/mbedtls:= )



[gentoo-commits] repo/gentoo:master commit in: media-sound/umurmur/

2021-01-01 Thread Sam James
commit: 8acd91dccf632ee50d809f23d26bbf4024bab0d3
Author: Sam James  gentoo  org>
AuthorDate: Sat Jan  2 00:28:39 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jan  2 00:28:39 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8acd91dc

media-sound/umurmur: add libconfig subslot dep in 

Package-Manager: Portage-3.0.12-prefix, Repoman-3.0.2
Signed-off-by: Sam James  gentoo.org>

 media-sound/umurmur/umurmur-.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-sound/umurmur/umurmur-.ebuild 
b/media-sound/umurmur/umurmur-.ebuild
index 36c6e284b8d..edcef21466b 100644
--- a/media-sound/umurmur/umurmur-.ebuild
+++ b/media-sound/umurmur/umurmur-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -21,7 +21,7 @@ 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
+   dev-libs/libconfig:=
gnutls? (
dev-libs/nettle:=
>=net-libs/gnutls-3.0.0



[gentoo-commits] repo/gentoo:master commit in: media-sound/umurmur/

2020-12-29 Thread Lars Wendler
commit: bf57fea2be047670f03f5d7ec8b3579360432d2e
Author: Daniel M. Weeks  danweeks  net>
AuthorDate: Tue Dec 29 13:54:12 2020 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Tue Dec 29 14:19:55 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf57fea2

media-sound/umurmur: depend on libconfig subslot

Closes: https://bugs.gentoo.org/762439
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Daniel M. Weeks  danweeks.net>
Closes: https://github.com/gentoo/gentoo/pull/18867
Signed-off-by: Lars Wendler  gentoo.org>

 .../umurmur/{umurmur-0.2.17-r3.ebuild => umurmur-0.2.17-r4.ebuild}  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/umurmur/umurmur-0.2.17-r3.ebuild 
b/media-sound/umurmur/umurmur-0.2.17-r4.ebuild
similarity index 99%
rename from media-sound/umurmur/umurmur-0.2.17-r3.ebuild
rename to media-sound/umurmur/umurmur-0.2.17-r4.ebuild
index 49866ba51ee..9bc2d4e0ca0 100644
--- a/media-sound/umurmur/umurmur-0.2.17-r3.ebuild
+++ b/media-sound/umurmur/umurmur-0.2.17-r4.ebuild
@@ -21,7 +21,7 @@ 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
+   dev-libs/libconfig:=
gnutls? (
dev-libs/nettle:=
>=net-libs/gnutls-3.0.0



[gentoo-commits] repo/gentoo:master commit in: media-sound/umurmur/

2020-01-10 Thread Lars Wendler
commit: 8fc58fe98fbb7a2b8efd659d557a50d63d87730c
Author: Lars Wendler  gentoo  org>
AuthorDate: Fri Jan 10 11:34:16 2020 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Fri Jan 10 11:34:33 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8fc58fe9

media-sound/umurmur: Added sub-slot dep for net-libs/mbedtls

Closes: https://bugs.gentoo.org/705040
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Lars Wendler  gentoo.org>

 media-sound/umurmur/umurmur-0.2.17-r3.ebuild | 4 ++--
 media-sound/umurmur/umurmur-.ebuild  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/media-sound/umurmur/umurmur-0.2.17-r3.ebuild 
b/media-sound/umurmur/umurmur-0.2.17-r3.ebuild
index 368646a5296..49866ba51ee 100644
--- a/media-sound/umurmur/umurmur-0.2.17-r3.ebuild
+++ b/media-sound/umurmur/umurmur-0.2.17-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -27,7 +27,7 @@ DEPEND=">=dev-libs/protobuf-c-1.0.0_rc2
>=net-libs/gnutls-3.0.0
)
!gnutls? (
-   mbedtls? ( net-libs/mbedtls )
+   mbedtls? ( net-libs/mbedtls:= )
!mbedtls? (
libressl? ( dev-libs/libressl:0= )
!libressl? ( dev-libs/openssl:0= )

diff --git a/media-sound/umurmur/umurmur-.ebuild 
b/media-sound/umurmur/umurmur-.ebuild
index d01e6411f0f..36c6e284b8d 100644
--- a/media-sound/umurmur/umurmur-.ebuild
+++ b/media-sound/umurmur/umurmur-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -27,7 +27,7 @@ DEPEND=">=dev-libs/protobuf-c-1.0.0_rc2
>=net-libs/gnutls-3.0.0
)
!gnutls? (
-   mbedtls? ( net-libs/mbedtls )
+   mbedtls? ( net-libs/mbedtls:= )
!mbedtls? (
libressl? ( dev-libs/libressl:0= )
!libressl? ( dev-libs/openssl:0= )



[gentoo-commits] repo/gentoo:master commit in: media-sound/umurmur/

2019-10-17 Thread Lars Wendler
commit: 56091b306dccf6263c9842303d81641c46b3277a
Author: Lars Wendler  gentoo  org>
AuthorDate: Thu Oct 17 12:10:18 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Thu Oct 17 12:10:18 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56091b30

media-sound/umurmur: Removed old

Package-Manager: Portage-2.3.77, Repoman-2.3.17
Signed-off-by: Lars Wendler  gentoo.org>

 media-sound/umurmur/Manifest  |   1 -
 media-sound/umurmur/umurmur-0.2.16a-r1.ebuild |  89 
 media-sound/umurmur/umurmur-0.2.17-r1.ebuild  |  91 
 media-sound/umurmur/umurmur-0.2.17-r2.ebuild  | 117 --
 4 files changed, 298 deletions(-)

diff --git a/media-sound/umurmur/Manifest b/media-sound/umurmur/Manifest
index d6252384dbd..ab9993a1b10 100644
--- a/media-sound/umurmur/Manifest
+++ b/media-sound/umurmur/Manifest
@@ -1,2 +1 @@
-DIST umurmur-0.2.16a.tar.gz 91187 BLAKE2B 
ba306dfa4c6fa958735ab02bd262729d582acdd5f33e642066712c2188549b8675f1b9305642af198c608108e5277820d6aac2c09470cce0d5e9e3f272b11c2f
 SHA512 
432a85e93cb7d53c505caf8b97c1bb7c173c8f625127510de61cc0a1e3abaea9abcf96ab1c0a8c5039ba82af5d29710e4973f70c1438bfd44ba00fa0c3f64c9e
 DIST umurmur-0.2.17.tar.gz 93786 BLAKE2B 
92fc7d63dc0eed228c3fbcb0d18861cd49967f44378d980e856f8fb24fe7abc3429a4ca8e811eda6096727b76780724c909c46c04975b5edef70d848b7511618
 SHA512 
a496a51fd7815ad117f5aee17bb78cbd319c584ad60ab8aebbfd8ddf7b1760f443f2337bc74be1e0d5af17d3c3df2ae6c9060eca576cf1e6ed4c6cb0825e9c15

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 137b6334269..000
--- 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 4ca66ad93d0..000
--- 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"
-
-# 

[gentoo-commits] repo/gentoo:master commit in: media-sound/umurmur/

2019-10-17 Thread Agostino Sarubbo
commit: 03843926dca50404af26f46a8a9dc8927fda446e
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu Oct 17 11:42:58 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu Oct 17 11:43:11 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03843926

media-sound/umurmur: amd64 stable wrt bug #697792

Package-Manager: Portage-2.3.76, Repoman-2.3.16
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-sound/umurmur/umurmur-0.2.17-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/umurmur/umurmur-0.2.17-r3.ebuild 
b/media-sound/umurmur/umurmur-0.2.17-r3.ebuild
index 05755dddae3..368646a5296 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}" ==  ]] ; 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"



[gentoo-commits] repo/gentoo:master commit in: media-sound/umurmur/

2019-10-17 Thread Agostino Sarubbo
commit: b07c442e6301885e1e8a9b2da97ba1336e2a1ea5
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu Oct 17 10:31:57 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu Oct 17 10:31:57 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b07c442e

media-sound/umurmur: x86 stable wrt bug #697792

Package-Manager: Portage-2.3.76, Repoman-2.3.16
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-sound/umurmur/umurmur-0.2.17-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/umurmur/umurmur-0.2.17-r3.ebuild 
b/media-sound/umurmur/umurmur-0.2.17-r3.ebuild
index d01e6411f0f..05755dddae3 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}" ==  ]] ; 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"



[gentoo-commits] repo/gentoo:master commit in: media-sound/umurmur/

2019-08-13 Thread Lars Wendler
commit: 9ff1945ff55d98681eed93d7b669757f55a3a2f4
Author: Lars Wendler  gentoo  org>
AuthorDate: Tue Aug  6 22:37:28 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Tue Aug 13 16:40:31 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ff1945f

edia-sound/umurmur: Revbump replacing user eclass

with murmur group/user packages.

Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Lars Wendler  gentoo.org>

 media-sound/umurmur/umurmur-0.2.17-r3.ebuild | 115 +++
 1 file changed, 115 insertions(+)

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 000..d01e6411f0f
--- /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}" ==  ]] ; 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
+}



[gentoo-commits] repo/gentoo:master commit in: media-sound/umurmur/

2019-08-13 Thread Lars Wendler
commit: c0a9de39f570999232659c811ecb8fedb8ad03ba
Author: Lars Wendler  gentoo  org>
AuthorDate: Tue Aug  6 22:39:59 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Tue Aug 13 16:40:31 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0a9de39

media-sound/umurmur: Synced live ebuild

Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Lars Wendler  gentoo.org>

 media-sound/umurmur/umurmur-.ebuild | 12 +---
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/media-sound/umurmur/umurmur-.ebuild 
b/media-sound/umurmur/umurmur-.ebuild
index 54434dd96ad..d01e6411f0f 100644
--- a/media-sound/umurmur/umurmur-.ebuild
+++ b/media-sound/umurmur/umurmur-.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



[gentoo-commits] repo/gentoo:master commit in: media-sound/umurmur/

2019-06-26 Thread Lars Wendler
commit: 0f3f8bbcd204c2bd2641802e0a7b8591dac02794
Author: Lars Wendler  gentoo  org>
AuthorDate: Wed Jun 26 21:47:58 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Wed Jun 26 21:47:58 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f3f8bbc

media-sound/umurmur: Added dev-libs/nettle to (R)DEPEND

Package-Manager: Portage-2.3.67, Repoman-2.3.16
Signed-off-by: Lars Wendler  gentoo.org>

 media-sound/umurmur/umurmur-0.2.17-r2.ebuild | 5 -
 media-sound/umurmur/umurmur-.ebuild  | 5 -
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/media-sound/umurmur/umurmur-0.2.17-r2.ebuild 
b/media-sound/umurmur/umurmur-0.2.17-r2.ebuild
index 4d9264eb15b..54434dd96ad 100644
--- a/media-sound/umurmur/umurmur-0.2.17-r2.ebuild
+++ b/media-sound/umurmur/umurmur-0.2.17-r2.ebuild
@@ -22,7 +22,10 @@ IUSE="gnutls libressl mbedtls shm"
 # and openssl if none specified
 DEPEND=">=dev-libs/protobuf-c-1.0.0_rc2
dev-libs/libconfig
-   gnutls? ( >=net-libs/gnutls-3.0.0 )
+   gnutls? (
+   dev-libs/nettle:=
+   >=net-libs/gnutls-3.0.0
+   )
!gnutls? (
mbedtls? ( net-libs/mbedtls )
!mbedtls? (

diff --git a/media-sound/umurmur/umurmur-.ebuild 
b/media-sound/umurmur/umurmur-.ebuild
index 4d9264eb15b..54434dd96ad 100644
--- a/media-sound/umurmur/umurmur-.ebuild
+++ b/media-sound/umurmur/umurmur-.ebuild
@@ -22,7 +22,10 @@ IUSE="gnutls libressl mbedtls shm"
 # and openssl if none specified
 DEPEND=">=dev-libs/protobuf-c-1.0.0_rc2
dev-libs/libconfig
-   gnutls? ( >=net-libs/gnutls-3.0.0 )
+   gnutls? (
+   dev-libs/nettle:=
+   >=net-libs/gnutls-3.0.0
+   )
!gnutls? (
mbedtls? ( net-libs/mbedtls )
!mbedtls? (



[gentoo-commits] repo/gentoo:master commit in: media-sound/umurmur/

2019-04-30 Thread Lars Wendler
commit: 86dcc865ba4045244375de9c7dcf9ea96841d048
Author: Lars Wendler  gentoo  org>
AuthorDate: Tue Apr 30 16:07:54 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Tue Apr 30 16:08:24 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86dcc865

media-sound/umurmur: Fixed build with USE="libressl"

Closes: https://bugs.gentoo.org/684806
Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Lars Wendler  gentoo.org>

 media-sound/umurmur/umurmur-0.2.17-r2.ebuild | 2 +-
 media-sound/umurmur/umurmur-.ebuild  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-sound/umurmur/umurmur-0.2.17-r2.ebuild 
b/media-sound/umurmur/umurmur-0.2.17-r2.ebuild
index cf1ac28351f..4d9264eb15b 100644
--- a/media-sound/umurmur/umurmur-0.2.17-r2.ebuild
+++ b/media-sound/umurmur/umurmur-0.2.17-r2.ebuild
@@ -74,7 +74,7 @@ src_prepare() {
 }
 
 src_configure() {
-   local ssl_provider=( $(get_ssl_impl) )
+   local ssl_provider=( $(sed 's@libressl@openssl@' <<< $(get_ssl_impl)) )
 
local myeconfargs=(
--with-ssl="${ssl_provider[@]}"

diff --git a/media-sound/umurmur/umurmur-.ebuild 
b/media-sound/umurmur/umurmur-.ebuild
index cf1ac28351f..4d9264eb15b 100644
--- a/media-sound/umurmur/umurmur-.ebuild
+++ b/media-sound/umurmur/umurmur-.ebuild
@@ -74,7 +74,7 @@ src_prepare() {
 }
 
 src_configure() {
-   local ssl_provider=( $(get_ssl_impl) )
+   local ssl_provider=( $(sed 's@libressl@openssl@' <<< $(get_ssl_impl)) )
 
local myeconfargs=(
--with-ssl="${ssl_provider[@]}"



[gentoo-commits] repo/gentoo:master commit in: media-sound/umurmur/

2019-04-29 Thread Lars Wendler
commit: 278f521120794ec54f3828f4ad20a3487d50202c
Author: Lars Wendler  gentoo  org>
AuthorDate: Mon Apr 29 16:04:44 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Mon Apr 29 16:06:18 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=278f5211

media-sound/umurmur: Added live ebuild with mbedtls support.

Bug: https://bugs.gentoo.org/647656
Package-Manager: Portage-2.3.65, Repoman-2.3.12
Signed-off-by: Lars Wendler  gentoo.org>

 media-sound/umurmur/metadata.xml|   1 +
 media-sound/umurmur/umurmur-.ebuild | 114 
 2 files changed, 115 insertions(+)

diff --git a/media-sound/umurmur/metadata.xml b/media-sound/umurmur/metadata.xml
index adb73f1fed5..e7684f6b35d 100644
--- a/media-sound/umurmur/metadata.xml
+++ b/media-sound/umurmur/metadata.xml
@@ -11,6 +11,7 @@
of Mumble is called Murmur, hence the name uMurmur.


+   Use net-libs/mbedtls as TLS 
provider
Enable shared memory support



diff --git a/media-sound/umurmur/umurmur-.ebuild 
b/media-sound/umurmur/umurmur-.ebuild
new file mode 100644
index 000..cf1ac28351f
--- /dev/null
+++ b/media-sound/umurmur/umurmur-.ebuild
@@ -0,0 +1,114 @@
+# 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}" ==  ]] ; 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? ( >=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=( $(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
+}



[gentoo-commits] repo/gentoo:master commit in: media-sound/umurmur/

2019-04-29 Thread Lars Wendler
commit: 9c3452893b828ec48768c4ce334b7bae602bd35f
Author: Lars Wendler  gentoo  org>
AuthorDate: Mon Apr 29 16:06:02 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Mon Apr 29 16:06:19 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c345289

media-sound/umurmur: Revbump adding mbedtls support.

Closes: https://bugs.gentoo.org/647656
Package-Manager: Portage-2.3.65, Repoman-2.3.12
Signed-off-by: Lars Wendler  gentoo.org>

 media-sound/umurmur/umurmur-0.2.17-r2.ebuild | 114 +++
 1 file changed, 114 insertions(+)

diff --git a/media-sound/umurmur/umurmur-0.2.17-r2.ebuild 
b/media-sound/umurmur/umurmur-0.2.17-r2.ebuild
new file mode 100644
index 000..cf1ac28351f
--- /dev/null
+++ b/media-sound/umurmur/umurmur-0.2.17-r2.ebuild
@@ -0,0 +1,114 @@
+# 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}" ==  ]] ; 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? ( >=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=( $(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
+}



[gentoo-commits] repo/gentoo:master commit in: media-sound/umurmur/

2019-01-19 Thread Jonas Stein
commit: 9c2da394a8d7f8068015eab309d810c8def760ba
Author: Jonas Stein  gentoo  org>
AuthorDate: Sat Jan 19 11:27:32 2019 +
Commit: Jonas Stein  gentoo  org>
CommitDate: Sat Jan 19 11:50:33 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c2da394

media-sound/umurmur: Maintainer retired

Proxied maintainer asked for retirement.
Bug: https://bugs.gentoo.org/632924
Package-Manager: Portage-2.3.56, Repoman-2.3.12
Signed-off-by: Jonas Stein  gentoo.org>

 media-sound/umurmur/metadata.xml | 8 
 1 file changed, 8 deletions(-)

diff --git a/media-sound/umurmur/metadata.xml b/media-sound/umurmur/metadata.xml
index 504b76505d6..adb73f1fed5 100644
--- a/media-sound/umurmur/metadata.xml
+++ b/media-sound/umurmur/metadata.xml
@@ -5,14 +5,6 @@
polynomia...@gentoo.org
Lars Wendler

-   
-   alex_y...@yahoo.ca
-   Alex Xu
-   
-   
-   proxy-ma...@gentoo.org
-   Proxy Maintainers
-   

uMurmur is a minimalistic Mumble server primarily targeted to
run on routers with an open OS like OpenWRT. The server part



[gentoo-commits] repo/gentoo:master commit in: media-sound/umurmur/

2018-03-16 Thread Lars Wendler
commit: 2cd1cc23d0b0422e675aa595ad6802950c7ac207
Author: Lars Wendler  gentoo  org>
AuthorDate: Fri Mar 16 22:41:19 2018 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Fri Mar 16 22:41:19 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2cd1cc23

media-sound/umurmur: Added sub-slot dep operator for dev-libs/openssl.

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 media-sound/umurmur/umurmur-0.2.16a-r1.ebuild | 4 ++--
 media-sound/umurmur/umurmur-0.2.17-r1.ebuild  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/media-sound/umurmur/umurmur-0.2.16a-r1.ebuild 
b/media-sound/umurmur/umurmur-0.2.16a-r1.ebuild
index 348df9a213b..137b6334269 100644
--- a/media-sound/umurmur/umurmur-0.2.16a-r1.ebuild
+++ b/media-sound/umurmur/umurmur-0.2.16a-r1.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
@@ -20,7 +20,7 @@ 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 ) )"
+   !gnutls? ( !libressl? ( dev-libs/openssl:0= ) )"
 
 RDEPEND="${DEPEND}"
 

diff --git a/media-sound/umurmur/umurmur-0.2.17-r1.ebuild 
b/media-sound/umurmur/umurmur-0.2.17-r1.ebuild
index fd839fd5831..4ca66ad93d0 100644
--- a/media-sound/umurmur/umurmur-0.2.17-r1.ebuild
+++ b/media-sound/umurmur/umurmur-0.2.17-r1.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
@@ -20,7 +20,7 @@ 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 ) )"
+   !gnutls? ( !libressl? ( dev-libs/openssl:0= ) )"
 
 RDEPEND="${DEPEND}"
 



[gentoo-commits] repo/gentoo:master commit in: media-sound/umurmur/

2017-06-09 Thread Lars Wendler
commit: 7e2583438cc93d2d47d95a427733f57bcf4c4624
Author: Lars Wendler  gentoo  org>
AuthorDate: Fri Jun  9 16:46:14 2017 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Fri Jun  9 16:46:57 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e258343

media-sound/umurmur: Revbumps to remove polarssl support (bug #618358).

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 media-sound/umurmur/metadata.xml   |  2 -
 media-sound/umurmur/umurmur-0.2.16a-r1.ebuild  | 24 ++
 media-sound/umurmur/umurmur-0.2.16a.ebuild | 87 --
 ...rmur-0.2.17.ebuild => umurmur-0.2.17-r1.ebuild} | 22 ++
 4 files changed, 13 insertions(+), 122 deletions(-)

diff --git a/media-sound/umurmur/metadata.xml b/media-sound/umurmur/metadata.xml
index 640782b9fdd..7ea309183ac 100644
--- a/media-sound/umurmur/metadata.xml
+++ b/media-sound/umurmur/metadata.xml
@@ -20,8 +20,6 @@
of Mumble is called Murmur, hence the name uMurmur.


-   Use net-libs/polarssl
-   instead of dev-libs/openssl
Enable shared memory support



diff --git a/media-sound/umurmur/umurmur-0.2.16a-r1.ebuild 
b/media-sound/umurmur/umurmur-0.2.16a-r1.ebuild
index b8464e0867d..348df9a213b 100644
--- a/media-sound/umurmur/umurmur-0.2.16a-r1.ebuild
+++ b/media-sound/umurmur/umurmur-0.2.16a-r1.ebuild
@@ -11,17 +11,16 @@ 
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 polarssl shm"
+KEYWORDS="amd64 ~arm x86"
+IUSE="gnutls libressl shm"
 
-# ssl-provider precendence: polarssl, gnutls, libressl
+# ssl-provider precendence: gnutls, libressl
 # and openssl if none specified
 DEPEND=">=dev-libs/protobuf-c-1.0.0_rc2
dev-libs/libconfig
-   polarssl? ( >=net-libs/polarssl-1.0.0 )
-   gnutls? ( !polarssl? ( >=net-libs/gnutls-3.0.0 ) )
-   libressl? ( !polarssl? ( !gnutls? ( dev-libs/libressl ) ) )
-   !gnutls? ( !polarssl? ( !libressl? ( dev-libs/openssl:0 ) ) )"
+   gnutls? ( >=net-libs/gnutls-3.0.0 )
+   libressl? ( !gnutls? ( dev-libs/libressl ) )
+   !gnutls? ( !libressl? ( dev-libs/openssl:0 ) )"
 
 RDEPEND="${DEPEND}"
 
@@ -32,7 +31,6 @@ DOC_CONTENTS="
 
 pkg_pretend() {
local ssl_provider=(  )
-   use polarssl && ssl_provider+=( polarssl )
use gnutls && ssl_provider+=( gnutls )
use libressl && ssl_provider+=( libressl )
 
@@ -56,7 +54,7 @@ src_configure() {
local myconf
 
econf \
-   --with-ssl=$(usev polarssl || usev gnutls || echo openssl) \
+   --with-ssl=$(usev gnutls || echo openssl) \
$(use_enable shm shmapi)
 }
 
@@ -88,12 +86,4 @@ src_install() {
 
 pkg_postinst() {
readme.gentoo_print_elog
-
-   if use polarssl ; then
-   elog
-   elog "Because you have enabled PolarSSL support, umurmurd will 
use a"
-   elog "predefined test-certificate and key if none are 
configured, which"
-   elog "is insecure. See 
https://code.google.com/p/umurmur/wiki/Installing02x#Installing_uMurmur_with_PolarSSL_support;
-   elog "for more information on how to create your certificate 
and key"
-   fi
 }

diff --git a/media-sound/umurmur/umurmur-0.2.16a.ebuild 
b/media-sound/umurmur/umurmur-0.2.16a.ebuild
deleted file mode 100644
index d5a3eb1f314..000
--- a/media-sound/umurmur/umurmur-0.2.16a.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools systemd eutils readme.gentoo 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 polarssl shm"
-
-DEPEND=">=dev-libs/protobuf-c-1.0.0_rc2
-   dev-libs/libconfig
-   gnutls? ( >=net-libs/gnutls-3.0.0 )
-   polarssl? ( >=net-libs/polarssl-1.0.0 )
-   !gnutls? ( !polarssl? ( 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_setup() {
-   enewgroup murmur
-   enewuser murmur "" "" "" murmur
-}
-
-src_prepare() {
-   eautoreconf
-}
-
-src_configure() {
-   local myconf
-
-   if use polarssl && use gnutls; then
-   ewarn "Both gnutls and polarssl requested, defaulting to 
polarssl."
-   fi
-
-   econf \
-   --with-ssl=$(usev polarssl || usev gnutls || echo openssl) \
-   $(use_enable shm shmapi)
-}
-
-src_install() {
-   local confdir
-
-   emake 

[gentoo-commits] repo/gentoo:master commit in: media-sound/umurmur/

2017-05-19 Thread Lars Wendler
commit: b803d1e890601abaff130f3d1d714c4b6f2870bf
Author: Lars Wendler  gentoo  org>
AuthorDate: Fri May 19 08:26:14 2017 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Fri May 19 08:26:42 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b803d1e8

media-sound/umurmur: Bump to version 0.2.17

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 media-sound/umurmur/Manifest| 2 +-
 .../umurmur/{umurmur-0.2.17_rc1.ebuild => umurmur-0.2.17.ebuild}| 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-sound/umurmur/Manifest b/media-sound/umurmur/Manifest
index 580292dfa42..8ba487b85b9 100644
--- a/media-sound/umurmur/Manifest
+++ b/media-sound/umurmur/Manifest
@@ -1,2 +1,2 @@
 DIST umurmur-0.2.16a.tar.gz 91187 SHA256 
d64df8f77ceaa4951d7f2adbb2dcc173841d1e387ef4cd2082c42150a84349a5 SHA512 
432a85e93cb7d53c505caf8b97c1bb7c173c8f625127510de61cc0a1e3abaea9abcf96ab1c0a8c5039ba82af5d29710e4973f70c1438bfd44ba00fa0c3f64c9e
 WHIRLPOOL 
98a01a25dad0427bda0379711f9702ee8ed70bbeb50daa439a9e8c40bfec174f79bfe6ed02e07ff20a4f0f8614de83cbd4806ccbacc0066c769d9e43678b508e
-DIST umurmur-0.2.17_rc1.tar.gz 93802 SHA256 
fbc9b228cd374befa41045af2efe9d515a368ef3067f87a107475a267cfc8e3f SHA512 
58d0e483aacbbb4d576aecc9d3584200b995f5da81ff8ba2608de9766f39d4ff7407a476c2c21aeb8885a477dff9c1ff31e829cde47c6b18636986eefbaeeef4
 WHIRLPOOL 
5618f9db363dd7d86351516342aca7a7728769d321df425c5543cc67117f8f12a2416e3b89f512d3fdad8ea316667b8c9a78895d76c4ebe1ca4bddc0a4d58516
+DIST umurmur-0.2.17.tar.gz 93786 SHA256 
e77b7b6616768f4a1c07442afe49a772692f667b00c23cc85909d4dd0ce206d2 SHA512 
a496a51fd7815ad117f5aee17bb78cbd319c584ad60ab8aebbfd8ddf7b1760f443f2337bc74be1e0d5af17d3c3df2ae6c9060eca576cf1e6ed4c6cb0825e9c15
 WHIRLPOOL 
37420b8969118f028eb20f36de9b22c366898ee4874ed47fc1b64ef73d02ade1139a8dcb0de2e83ea9447eaa442fa3921c1161d957b77e47e094973814c5c28e

diff --git a/media-sound/umurmur/umurmur-0.2.17_rc1.ebuild 
b/media-sound/umurmur/umurmur-0.2.17.ebuild
similarity index 100%
rename from media-sound/umurmur/umurmur-0.2.17_rc1.ebuild
rename to media-sound/umurmur/umurmur-0.2.17.ebuild



[gentoo-commits] repo/gentoo:master commit in: media-sound/umurmur/

2017-03-01 Thread Lars Wendler
commit: 40d5d183b9673360b51eccff3fd365f760d7169b
Author: Lars Wendler  gentoo  org>
AuthorDate: Wed Mar  1 15:34:04 2017 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Wed Mar  1 15:34:04 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40d5d183

media-sound/umurmur: Bump to version 0.2.17_rc1

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 media-sound/umurmur/Manifest  |   1 +
 media-sound/umurmur/umurmur-0.2.17_rc1.ebuild | 101 ++
 2 files changed, 102 insertions(+)

diff --git a/media-sound/umurmur/Manifest b/media-sound/umurmur/Manifest
index 171310f726c..580292dfa42 100644
--- a/media-sound/umurmur/Manifest
+++ b/media-sound/umurmur/Manifest
@@ -1 +1,2 @@
 DIST umurmur-0.2.16a.tar.gz 91187 SHA256 
d64df8f77ceaa4951d7f2adbb2dcc173841d1e387ef4cd2082c42150a84349a5 SHA512 
432a85e93cb7d53c505caf8b97c1bb7c173c8f625127510de61cc0a1e3abaea9abcf96ab1c0a8c5039ba82af5d29710e4973f70c1438bfd44ba00fa0c3f64c9e
 WHIRLPOOL 
98a01a25dad0427bda0379711f9702ee8ed70bbeb50daa439a9e8c40bfec174f79bfe6ed02e07ff20a4f0f8614de83cbd4806ccbacc0066c769d9e43678b508e
+DIST umurmur-0.2.17_rc1.tar.gz 93802 SHA256 
fbc9b228cd374befa41045af2efe9d515a368ef3067f87a107475a267cfc8e3f SHA512 
58d0e483aacbbb4d576aecc9d3584200b995f5da81ff8ba2608de9766f39d4ff7407a476c2c21aeb8885a477dff9c1ff31e829cde47c6b18636986eefbaeeef4
 WHIRLPOOL 
5618f9db363dd7d86351516342aca7a7728769d321df425c5543cc67117f8f12a2416e3b89f512d3fdad8ea316667b8c9a78895d76c4ebe1ca4bddc0a4d58516

diff --git a/media-sound/umurmur/umurmur-0.2.17_rc1.ebuild 
b/media-sound/umurmur/umurmur-0.2.17_rc1.ebuild
new file mode 100644
index 000..d6bf0d7775e
--- /dev/null
+++ b/media-sound/umurmur/umurmur-0.2.17_rc1.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2017 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 polarssl shm"
+
+# ssl-provider precendence: polarssl, gnutls, libressl
+# and openssl if none specified
+DEPEND=">=dev-libs/protobuf-c-1.0.0_rc2
+   dev-libs/libconfig
+   polarssl? ( >=net-libs/polarssl-1.0.0 )
+   gnutls? ( !polarssl? ( >=net-libs/gnutls-3.0.0 ) )
+   libressl? ( !polarssl? ( !gnutls? ( dev-libs/libressl ) ) )
+   !gnutls? ( !polarssl? ( !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 polarssl && ssl_provider+=( polarssl )
+   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 polarssl || 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
+
+   if use polarssl ; then
+   elog
+   elog "Because you have enabled PolarSSL support, umurmurd will 
use a"
+   elog "predefined test-certificate and key if none are 
configured, which"
+   elog "is insecure. See 
https://code.google.com/p/umurmur/wiki/Installing02x#Installing_uMurmur_with_PolarSSL_support;
+   elog "for more information on how to create your certificate 
and key"
+   fi
+}



[gentoo-commits] repo/gentoo:master commit in: media-sound/umurmur/

2017-02-28 Thread Michael Weber
commit: 0cfb4798f5c891854234b059f3efe4f9533d73e4
Author: Michael Weber  gentoo  org>
AuthorDate: Tue Feb 28 21:06:54 2017 +
Commit: Michael Weber  gentoo  org>
CommitDate: Tue Feb 28 21:06:54 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0cfb4798

media-sound/umurmur: Fix DOC_CONTENTS location of umurmur.conf.

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 media-sound/umurmur/umurmur-0.2.16a-r1.ebuild | 6 +++---
 media-sound/umurmur/umurmur-0.2.16a.ebuild| 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/media-sound/umurmur/umurmur-0.2.16a-r1.ebuild 
b/media-sound/umurmur/umurmur-0.2.16a-r1.ebuild
index b573045baa3..b8464e0867d 100644
--- a/media-sound/umurmur/umurmur-0.2.16a-r1.ebuild
+++ b/media-sound/umurmur/umurmur-0.2.16a-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -26,8 +26,8 @@ DEPEND=">=dev-libs/protobuf-c-1.0.0_rc2
 RDEPEND="${DEPEND}"
 
 DOC_CONTENTS="
-   A configuration file has been installed at /etc/umurmur.conf - you may
-   want to review it. See also\n
+   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() {

diff --git a/media-sound/umurmur/umurmur-0.2.16a.ebuild 
b/media-sound/umurmur/umurmur-0.2.16a.ebuild
index d5bdc244474..d5a3eb1f314 100644
--- a/media-sound/umurmur/umurmur-0.2.16a.ebuild
+++ b/media-sound/umurmur/umurmur-0.2.16a.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -23,8 +23,8 @@ DEPEND=">=dev-libs/protobuf-c-1.0.0_rc2
 RDEPEND="${DEPEND}"
 
 DOC_CONTENTS="
-   A configuration file has been installed at /etc/umurmur.conf - you may
-   want to review it. See also\n
+   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_setup() {



[gentoo-commits] repo/gentoo:master commit in: media-sound/umurmur/

2016-08-06 Thread Lars Wendler
commit: 167929cf70d7614b06ef57c14b49b2dbbb9a588b
Author: Lars Wendler  gentoo  org>
AuthorDate: Sat Aug  6 14:36:17 2016 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Sat Aug  6 14:36:31 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=167929cf

media-sound/umurmur: Adjusted HOMEPAGE variable.

Package-Manager: portage-2.3.0
Signed-off-by: Lars Wendler  gentoo.org>

 media-sound/umurmur/umurmur-0.2.16a-r1.ebuild | 9 +
 media-sound/umurmur/umurmur-0.2.16a.ebuild| 4 ++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/media-sound/umurmur/umurmur-0.2.16a-r1.ebuild 
b/media-sound/umurmur/umurmur-0.2.16a-r1.ebuild
index 958ee0d..0c83413 100644
--- a/media-sound/umurmur/umurmur-0.2.16a-r1.ebuild
+++ b/media-sound/umurmur/umurmur-0.2.16a-r1.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
-inherit autotools systemd eutils readme.gentoo user
+inherit autotools systemd eutils readme.gentoo-r1 user
 
 DESCRIPTION="Minimalistic Murmur (Mumble server)"
-HOMEPAGE="https://code.google.com/p/umurmur/ 
https://github.com/umurmur/umurmur;
+HOMEPAGE="https://github.com/umurmur/umurmur;
 SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
@@ -49,6 +49,7 @@ pkg_setup() {
 }
 
 src_prepare() {
+   default
eautoreconf
 }
 

diff --git a/media-sound/umurmur/umurmur-0.2.16a.ebuild 
b/media-sound/umurmur/umurmur-0.2.16a.ebuild
index 9ba2e3b..d1d3947 100644
--- a/media-sound/umurmur/umurmur-0.2.16a.ebuild
+++ b/media-sound/umurmur/umurmur-0.2.16a.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -7,7 +7,7 @@ EAPI=5
 inherit autotools systemd eutils readme.gentoo user
 
 DESCRIPTION="Minimalistic Murmur (Mumble server)"
-HOMEPAGE="https://code.google.com/p/umurmur/ 
https://github.com/umurmur/umurmur;
+HOMEPAGE="https://github.com/umurmur/umurmur;
 SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"



[gentoo-commits] repo/gentoo:master commit in: media-sound/umurmur/files/

2016-05-03 Thread Lars Wendler
commit: 8f223410a33834af6fa6d332d7a79d90b7043589
Author: Lars Wendler  gentoo  org>
AuthorDate: Tue May  3 09:27:54 2016 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Tue May  3 09:47:24 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f223410

media-sound/umurmur: Fixed openrc init script shebang.

Package-Manager: portage-2.2.28
Signed-off-by: Lars Wendler  gentoo.org>

 media-sound/umurmur/files/umurmurd.initd | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-sound/umurmur/files/umurmurd.initd 
b/media-sound/umurmur/files/umurmurd.initd
index 3d41831..5fd3e17 100644
--- a/media-sound/umurmur/files/umurmurd.initd
+++ b/media-sound/umurmur/files/umurmurd.initd
@@ -1,5 +1,5 @@
-#!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 



[gentoo-commits] repo/gentoo:master commit in: media-sound/umurmur/

2015-10-01 Thread Lars Wendler
commit: c5fb8ed958c5aec23184281f39cb7159b4a576f8
Author: Lars Wendler  gentoo  org>
AuthorDate: Thu Oct  1 07:49:06 2015 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Thu Oct  1 07:53:16 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5fb8ed9

media-sound/umurmur: Revbump to add libressl support (bug #561922)

Package-Manager: portage-2.2.22
Signed-off-by: Lars Wendler  gentoo.org>

 media-sound/umurmur/umurmur-0.2.16a-r1.ebuild | 99 +++
 1 file changed, 99 insertions(+)

diff --git a/media-sound/umurmur/umurmur-0.2.16a-r1.ebuild 
b/media-sound/umurmur/umurmur-0.2.16a-r1.ebuild
new file mode 100644
index 000..958ee0d
--- /dev/null
+++ b/media-sound/umurmur/umurmur-0.2.16a-r1.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools systemd eutils readme.gentoo user
+
+DESCRIPTION="Minimalistic Murmur (Mumble server)"
+HOMEPAGE="https://code.google.com/p/umurmur/ 
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 polarssl shm"
+
+# ssl-provider precendence: polarssl, gnutls, libressl
+# and openssl if none specified
+DEPEND=">=dev-libs/protobuf-c-1.0.0_rc2
+   dev-libs/libconfig
+   polarssl? ( >=net-libs/polarssl-1.0.0 )
+   gnutls? ( !polarssl? ( >=net-libs/gnutls-3.0.0 ) )
+   libressl? ( !polarssl? ( !gnutls? ( dev-libs/libressl ) ) )
+   !gnutls? ( !polarssl? ( !libressl? ( dev-libs/openssl:0 ) ) )"
+
+RDEPEND="${DEPEND}"
+
+DOC_CONTENTS="
+   A configuration file has been installed at /etc/umurmur.conf - you may
+   want to review it. See also\n
+   https://github.com/umurmur/umurmur/wiki/Configuration "
+
+pkg_pretend() {
+   local ssl_provider=(  )
+   use polarssl && ssl_provider+=( polarssl )
+   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() {
+   eautoreconf
+}
+
+src_configure() {
+   local myconf
+
+   econf \
+   --with-ssl=$(usev polarssl || 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
+
+   if use polarssl ; then
+   elog
+   elog "Because you have enabled PolarSSL support, umurmurd will 
use a"
+   elog "predefined test-certificate and key if none are 
configured, which"
+   elog "is insecure. See 
https://code.google.com/p/umurmur/wiki/Installing02x#Installing_uMurmur_with_PolarSSL_support;
+   elog "for more information on how to create your certificate 
and key"
+   fi
+}