summaryrefslogtreecommitdiff
path: root/net-voip
diff options
context:
space:
mode:
Diffstat (limited to 'net-voip')
-rw-r--r--net-voip/Manifest.gzbin1045 -> 1042 bytes
-rw-r--r--net-voip/mumble/Manifest10
-rw-r--r--net-voip/mumble/files/mumble-1.4-force-alignment.patch28
-rw-r--r--net-voip/mumble/mumble-1.5.634.ebuild (renamed from net-voip/mumble/mumble-1.4.287-r1.ebuild)64
-rw-r--r--net-voip/mumble/mumble-9999.ebuild23
-rw-r--r--net-voip/murmur/Manifest14
-rw-r--r--net-voip/murmur/files/murmur-1.5.634-remove-redundant-OpenSSL-locking-c.patch54
-rw-r--r--net-voip/murmur/files/murmur.confd9
-rw-r--r--net-voip/murmur/files/murmurd-dbus.tmpfiles1
-rw-r--r--net-voip/murmur/metadata.xml1
-rw-r--r--net-voip/murmur/murmur-1.4.287-r2.ebuild200
-rw-r--r--net-voip/murmur/murmur-1.5.634.ebuild168
-rw-r--r--net-voip/murmur/murmur-9999.ebuild23
-rw-r--r--net-voip/umurmur/Manifest1
-rw-r--r--net-voip/umurmur/umurmur-9999.ebuild110
15 files changed, 285 insertions, 421 deletions
diff --git a/net-voip/Manifest.gz b/net-voip/Manifest.gz
index 9bce77c3d5c0..d928406f30ef 100644
--- a/net-voip/Manifest.gz
+++ b/net-voip/Manifest.gz
Binary files differ
diff --git a/net-voip/mumble/Manifest b/net-voip/mumble/Manifest
index 1e4c32407d41..969857620107 100644
--- a/net-voip/mumble/Manifest
+++ b/net-voip/mumble/Manifest
@@ -1,8 +1,4 @@
-AUX mumble-1.4-force-alignment.patch 890 BLAKE2B 43127c740b0ef7dabc205902ff080c3a7019bdac8b9518b6b9288799ed42300f9bf5a817f268f53cc41ce4b3d968a71e2801a03f4e76fb9420659c624444abf1 SHA512 3176bd137c472cc62a0ba6442f736a7f7e4a1809e0c8f7ffa83b48708f462f7c593e67a7aba343f9750daad6e6b0d50a5281a0fbde98048b11ddc5e9249681b3
-DIST mumble-1.4-crypto-threads.patch.xz 1472 BLAKE2B 18f64d7b63a5ac253792e31fe272870a8e6a8bec542c163c6f63e9c80157329ce07e3d8753aa4c29429980903207c457c6488ff81d7dffcc48426a022a8d1767 SHA512 981db1f7d877fa9ab92875449486074c31ea269a48db49cafa9e37380dfb1140d7d4a225765d2f5333b27aa2d271427287ac5c7d32a525eded455d734aca7d8b
-DIST mumble-1.4-odr.patch.xz 1088 BLAKE2B 48a7b04ef31f7d0f4cc7e5632ba8f328e5a7fa6961cd971b66a761366351a9a99e3cecce911c90701688083e03f2b63e6838083a8ab669f86fe0fecf23a8596d SHA512 600807cbd893f585c621e7267ee16e2828428fff17aa7eb36b8595164356ef73be2765a41ff9cd7c549c11a63abbf593b0172e56e07571e1c0a3c86fd14e5f15
-DIST mumble-1.4-openssl3.patch.xz 4172 BLAKE2B 5b68f023e218628a4d73b0991dcc7790ce5f92ce6a27c372c5e80b1f3a8beafa3ddd6416b884705b321aee31ea4f5e09dda6ceb240272dde64f420fbeb06845a SHA512 3a4e504f3365e93418cb85d0da4e6f2f54ab904283743907604bb39276560a4215d9bea1b225601789d1c3d84d270c04840ec57cd04e3df1204cc586ea42562a
-DIST mumble-1.4.287.tar.gz 9457292 BLAKE2B 5fc89c184aa54ab8269870fd87b6c9ce271d77c05a6ecb2aa78eccf297ffb842a50a18a142ac628c1b287a2b5e6c0ae0dced3237242303840a4de05b7f3e7040 SHA512 34ed30c18257ba8deae6938009a90147c8bc3a0aca28e69bea7ec0262e8d2cdacb9a840fac7d3dd623a52ef8d5903ed5424b62b483af21d6df6aa9632eae9d82
-EBUILD mumble-1.4.287-r1.ebuild 4138 BLAKE2B 3761785af0e3becaff28fd4c1d31bcc0bede8ae136fbd397db1527af6beeace2325ebfe2569d150be164fcfa6bdedac13f8ae9910ad9c4d433f41a7b05505628 SHA512 7c93d2540a6aaeb46da43ced787e2ce87319f9aacc3567538af880bd6cee8001d5f4f72cbe77a5c517c3e6fad925f0bdb8b39236d8155f0ddb3c450c7c387444
-EBUILD mumble-9999.ebuild 3871 BLAKE2B 78c85aebd45cf8a7d2260af7042bdf38c9bb6729d52b29ca5d58b587caaad4df9e604bc3360b2e0f3a0d1ab4ae1aef4fc158bedb45f914b143fb8fd03054ec54 SHA512 ebcc666175f3b17aa7753734dbdbbd3ea6e51ee502015f56fcbae667d52c8a3d06379f33bde09ca5ee2ea23190ca05a402abb55b135bc5e932d0147303cdd43c
+DIST mumble-1.5.634.tar.gz 26001230 BLAKE2B ebd1e3569dd7311d704dbb83ff0ef15875dfaba7a7ba357e3be88800544d4d2217e19a15c0df778deec5a701ddc3692ca3f053651dec1eb1525b7963107ae76e SHA512 5fa9479dd836b87cb84fb6c067019f75aac335aa201baa34939f1c73dd7c67279aed6079aecdab74a14cb6c285b69cb82798de8801b2140ccf99c764b3a84b59
+EBUILD mumble-1.5.634.ebuild 3843 BLAKE2B 27905d5417cfcf204dfd0afc060680dd1a5226904c416040b1d477fa85e69115417a4d30166606a32362e33ab96de163703585fce70680931d413ce22ae3640f SHA512 0336f37ce6dfa9eeeadf0a6f70217da5ac6116fff0bde9cf170aa73ad516a982240b22bd5617f680a75d1be9d2351ee90bcb2e74301724ceb52a03a27628e212
+EBUILD mumble-9999.ebuild 3847 BLAKE2B 48bef31f25ec85759d59c3c3b8d6cffa28174da89f122a819cd33cc4488f8ae1ea0eb7a4d56fde441f3bf193d832e9c8f6f3d7a0f4d19ef8aa4caa14735ecabe SHA512 45c6bc0bdb1bd4a2a39af4d11997b53d78aa10eef7d195ba202b486cfa074312029bd202c755f7ab0f969f3e4d500bcd274d05f8722beb66eb281ce250b9dff2
MISC metadata.xml 659 BLAKE2B 29aa7577035302a7cdcd6c433bcdfa6754b13b6b4c41add1779c176e9ab58a2b7a5b74a71269c0ab5e2a2cf6442218e1a9529c26175286431c121ea398e02276 SHA512 82d88c9d5d4fcbe79cbed7de582ad13dcdcbd81165cb808373b2917d59d56bd7b724ed5c1710c17552e8efde39d0f7cc058d3b30355379ea5f1ee3a4d1995227
diff --git a/net-voip/mumble/files/mumble-1.4-force-alignment.patch b/net-voip/mumble/files/mumble-1.4-force-alignment.patch
deleted file mode 100644
index ea0ae4792443..000000000000
--- a/net-voip/mumble/files/mumble-1.4-force-alignment.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 13c051b36b387356815cff5d685bc628b74ba136 Mon Sep 17 00:00:00 2001
-From: Davide Beatrici <git@davidebeatrici.dev>
-Date: Thu, 1 Sep 2022 23:32:57 +0200
-Subject: [PATCH] FIX(positional-audio): Force 8 bytes alignment for
- CCameraAngles in GTAV plugin
-
-https://en.cppreference.com/w/cpp/language/alignas
-
-This fixes compilation when the implicit alignment is not 8 bytes.
-
-It can be the case with 32 bit targets.
----
- plugins/gtav/structs.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/plugins/gtav/structs.h b/plugins/gtav/structs.h
-index 2829dc11e1..0e4f76edab 100644
---- a/plugins/gtav/structs.h
-+++ b/plugins/gtav/structs.h
-@@ -118,7 +118,7 @@ struct CCameraManagerAngles {
- ptr_t cameraAngles; // CCameraAngles *
- };
-
--struct CCameraAngles {
-+struct alignas(8) CCameraAngles {
- uint8_t pad1[960];
- ptr_t playerAngles; // CPlayerAngles *
- uint8_t pad2[60];
diff --git a/net-voip/mumble/mumble-1.4.287-r1.ebuild b/net-voip/mumble/mumble-1.5.634.ebuild
index 006c163c720a..51d7304ddd07 100644
--- a/net-voip/mumble/mumble-1.4.287-r1.ebuild
+++ b/net-voip/mumble/mumble-1.5.634.ebuild
@@ -1,17 +1,29 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-PYTHON_COMPAT=( python3_{9..11} )
-inherit cmake flag-o-matic python-any-r1 xdg
+PYTHON_COMPAT=( python3_{10..13} )
+inherit cmake flag-o-matic multilib python-any-r1 xdg
DESCRIPTION="Mumble is an open source, low-latency, high quality voice chat software"
HOMEPAGE="https://wiki.mumble.info"
if [[ "${PV}" == 9999 ]] ; then
inherit git-r3
EGIT_REPO_URI="https://github.com/mumble-voip/mumble.git"
- EGIT_SUBMODULES=( '-*' celt-0.7.0-src celt-0.11.0-src themes/Mumble 3rdparty/rnnoise-src 3rdparty/FindPythonInterpreter )
+
+ # needed for the included 3rdparty license script,
+ # even if these components may not be compiled in
+ EGIT_SUBMODULES=(
+ '-*'
+ 3rdparty/cmake-compiler-flags
+ 3rdparty/FindPythonInterpreter
+ 3rdparty/flag-icons
+ 3rdparty/minhook
+ 3rdparty/renamenoise
+ 3rdparty/speexdsp
+ 3rdparty/tracy
+ )
else
if [[ "${PV}" == *_pre* ]] ; then
SRC_URI="https://dev.gentoo.org/~concord/distfiles/${P}.tar.xz"
@@ -19,25 +31,23 @@ else
MY_PV="${PV/_/-}"
MY_P="${PN}-${MY_PV}"
SRC_URI="https://github.com/mumble-voip/mumble/releases/download/v${MY_PV}/${MY_P}.tar.gz"
- S="${WORKDIR}/${P}.src"
+ S="${WORKDIR}/${P/_*}"
fi
- KEYWORDS="amd64 ~arm64 ~ppc64 x86"
+ KEYWORDS="amd64 arm64 ppc64 x86"
fi
-SRC_URI+=" https://dev.gentoo.org/~concord/distfiles/${PN}-1.4-openssl3.patch.xz"
-SRC_URI+=" https://dev.gentoo.org/~concord/distfiles/${PN}-1.4-crypto-threads.patch.xz"
-SRC_URI+=" https://dev.gentoo.org/~concord/distfiles/${PN}-1.4-odr.patch.xz"
-
LICENSE="BSD MIT"
SLOT="0"
-IUSE="+alsa +dbus debug g15 jack pipewire portaudio pulseaudio multilib nls +rnnoise speech test zeroconf"
+IUSE="+alsa debug g15 jack pipewire portaudio pulseaudio multilib nls +rnnoise speech test zeroconf"
RESTRICT="!test? ( test )"
RDEPEND="
+ dev-cpp/ms-gsl
>=dev-libs/openssl-1.0.0b:0=
dev-libs/poco[util,xml,zip]
>=dev-libs/protobuf-2.2.0:=
dev-qt/qtcore:5
+ dev-qt/qtdbus:5
dev-qt/qtgui:5
dev-qt/qtnetwork:5[ssl]
dev-qt/qtsql:5[sqlite]
@@ -52,17 +62,17 @@ RDEPEND="
x11-libs/libX11
x11-libs/libXi
alsa? ( media-libs/alsa-lib )
- dbus? ( dev-qt/qtdbus:5 )
g15? ( app-misc/g15daemon:= )
jack? ( virtual/jack )
portaudio? ( media-libs/portaudio )
- pulseaudio? ( media-sound/pulseaudio )
+ pulseaudio? ( media-libs/libpulse )
pipewire? ( media-video/pipewire )
speech? ( >=app-accessibility/speech-dispatcher-0.8.0 )
zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
"
DEPEND="${RDEPEND}
${PYTHON_DEPS}
+ dev-cpp/nlohmann_json
dev-qt/qtconcurrent:5
dev-qt/qttest:5
dev-libs/boost
@@ -73,18 +83,13 @@ BDEPEND="
virtual/pkgconfig
"
-PATCHES=(
- "${WORKDIR}/${PN}-1.4-openssl3.patch"
- "${WORKDIR}/${PN}-1.4-crypto-threads.patch"
- "${WORKDIR}/${PN}-1.4-odr.patch"
- "${FILESDIR}/${PN}-1.4-force-alignment.patch"
-)
-
pkg_setup() {
python-any-r1_pkg_setup
}
src_prepare() {
+ sed '/TRACY_ON_DEMAND/s@ ON @ OFF @' -i src/CMakeLists.txt || die
+
# required because of xdg.eclass also providing src_prepare
cmake_src_prepare
}
@@ -93,11 +98,9 @@ src_configure() {
local mycmakeargs=(
-Dalsa="$(usex alsa)"
- -Dtests="$(usex test)"
- -Dbundled-celt="ON"
- -Dbundled-opus="OFF"
+ -Dbundled-gsl="OFF"
+ -Dbundled-json="OFF"
-Dbundled-speex="OFF"
- -Ddbus="$(usex dbus)"
-Dg15="$(usex g15)"
-Djackaudio="$(usex jack)"
-Doverlay="ON"
@@ -105,9 +108,11 @@ src_configure() {
-Doverlay-xcompile="$(usex multilib)"
-Dpipewire="$(usex pipewire)"
-Dpulseaudio="$(usex pulseaudio)"
- -Drnnoise="$(usex rnnoise)"
+ -Drenamenoise="$(usex rnnoise)"
-Dserver="OFF"
-Dspeechd="$(usex speech)"
+ -Dtests="$(usex test)"
+ -Dtracy="OFF"
-Dtranslations="$(usex nls)"
-Dupdate="OFF"
-Dwarnings-as-errors="OFF"
@@ -125,13 +130,6 @@ src_configure() {
cmake_src_configure
}
-src_test() {
- # https://bugs.gentoo.org/884049
- # increase timeout for tests
- local -x QTEST_FUNCTION_TIMEOUT=600000
- cmake_src_test
-}
-
src_install() {
cmake_src_install
diff --git a/net-voip/mumble/mumble-9999.ebuild b/net-voip/mumble/mumble-9999.ebuild
index 79e98b80ec73..d368df565216 100644
--- a/net-voip/mumble/mumble-9999.ebuild
+++ b/net-voip/mumble/mumble-9999.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-PYTHON_COMPAT=( python3_{9..11} )
-inherit cmake flag-o-matic python-any-r1 xdg
+PYTHON_COMPAT=( python3_{10..13} )
+inherit cmake flag-o-matic multilib python-any-r1 xdg
DESCRIPTION="Mumble is an open source, low-latency, high quality voice chat software"
HOMEPAGE="https://wiki.mumble.info"
@@ -18,10 +18,9 @@ if [[ "${PV}" == 9999 ]] ; then
'-*'
3rdparty/cmake-compiler-flags
3rdparty/FindPythonInterpreter
- 3rdparty/gsl
+ 3rdparty/flag-icons
3rdparty/minhook
- 3rdparty/opus
- 3rdparty/rnnoise-src
+ 3rdparty/renamenoise
3rdparty/speexdsp
3rdparty/tracy
)
@@ -32,21 +31,23 @@ else
MY_PV="${PV/_/-}"
MY_P="${PN}-${MY_PV}"
SRC_URI="https://github.com/mumble-voip/mumble/releases/download/v${MY_PV}/${MY_P}.tar.gz"
- S="${WORKDIR}/${P/_*}.src"
+ S="${WORKDIR}/${P/_*}"
fi
KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
fi
LICENSE="BSD MIT"
SLOT="0"
-IUSE="+alsa +dbus debug g15 jack pipewire portaudio pulseaudio multilib nls +rnnoise speech test zeroconf"
+IUSE="+alsa debug g15 jack pipewire portaudio pulseaudio multilib nls +rnnoise speech test zeroconf"
RESTRICT="!test? ( test )"
RDEPEND="
+ dev-cpp/ms-gsl
>=dev-libs/openssl-1.0.0b:0=
dev-libs/poco[util,xml,zip]
>=dev-libs/protobuf-2.2.0:=
dev-qt/qtcore:5
+ dev-qt/qtdbus:5
dev-qt/qtgui:5
dev-qt/qtnetwork:5[ssl]
dev-qt/qtsql:5[sqlite]
@@ -61,7 +62,6 @@ RDEPEND="
x11-libs/libX11
x11-libs/libXi
alsa? ( media-libs/alsa-lib )
- dbus? ( dev-qt/qtdbus:5 )
g15? ( app-misc/g15daemon:= )
jack? ( virtual/jack )
portaudio? ( media-libs/portaudio )
@@ -98,10 +98,9 @@ src_configure() {
local mycmakeargs=(
-Dalsa="$(usex alsa)"
+ -Dbundled-gsl="OFF"
-Dbundled-json="OFF"
- -Dbundled-opus="OFF"
-Dbundled-speex="OFF"
- -Ddbus="$(usex dbus)"
-Dg15="$(usex g15)"
-Djackaudio="$(usex jack)"
-Doverlay="ON"
@@ -109,7 +108,7 @@ src_configure() {
-Doverlay-xcompile="$(usex multilib)"
-Dpipewire="$(usex pipewire)"
-Dpulseaudio="$(usex pulseaudio)"
- -Drnnoise="$(usex rnnoise)"
+ -Drenamenoise="$(usex rnnoise)"
-Dserver="OFF"
-Dspeechd="$(usex speech)"
-Dtests="$(usex test)"
diff --git a/net-voip/murmur/Manifest b/net-voip/murmur/Manifest
index 54d6d1716637..170f000e1e22 100644
--- a/net-voip/murmur/Manifest
+++ b/net-voip/murmur/Manifest
@@ -1,12 +1,8 @@
-AUX murmur.confd 172 BLAKE2B 1f25ce417f1b9f504ea59d4e5216774f8eb2b00450577a1d137f645fbbd69f0991b510c35bad81ac739c868ce128f4de0c6b4e4095edcd977d3822fac622524c SHA512 4a05e2a640abf3f7a74c63b47ab87774718ad4e86f985c5308a2ba3167d816abedd9c35b07b8572f7789309ba91fa37bc0c1938493cc8d78844ecdeed7bd4171
+AUX murmur-1.5.634-remove-redundant-OpenSSL-locking-c.patch 1962 BLAKE2B 74934c9772f81d56155cae1662e24347c2bf84b9eca248f8a9eecdd1a1ea02028a36ed39d99907b8570b2b25d23c034563dadc7a73b3008aa453f3034dd2d2f3 SHA512 b9c663599fbcf217e48c4a8c01b749fec0c81c498210ff08bd858b96a4a5e7194b56edae9dee9a4150b65487a5e5c6004cbed798be7bc37169da867531b2fc44
AUX murmur.confd-r2 179 BLAKE2B bd4eecb479d0c12ed0ec29de964c949bfdfc17c89a0134ffe23fcbc885e1e2a82ca8fc003c49d25ba9eed5861f39be18d4b1b6784427a6728e91e901de420427 SHA512 4b293834867a6cdb909f6bd8abc952ea2d955daa2e465b370f09f6f884e13f857dee74b2c5058121f8009db3d9b6c951bafa25b3862d7b0375eee034055d2eeb
AUX murmur.initd-r2 511 BLAKE2B 2ff09ffdb62c5131f97f52960ac71360eb4959bb974c8cbc7f0fb0a27da91f34826a3065840be5a5ef9c24e243185cee0106c85285aa2aefbb534934cff9621d SHA512 3153254ec2c31e1b19e4991cce65ae9df7a609ad61c13ff569bbe822fc728dcf562c63c0a0d3198de3bd1599524db3f0e122004d1491b6bceafdbb28066a56cc
AUX murmur.logrotate 175 BLAKE2B b13282fc194ed7a576e22ac241285053a7882f670580b6a3004e8ce22b3cc5f3854f46aa2a89629931a0e8cdc826e2d4e1096e837aed41148d8ef87afd485676 SHA512 09bbc2f364e038dc81e55adb86210f4cdc178bd2dba770e373f6c411b2c21d08218fd9784fff0ba133b7e18c84ddc3b2ac86d9d67a99a3169d3be42bd7fe2863
-AUX murmurd-dbus.tmpfiles 33 BLAKE2B 4040c58c142ae051e3086bfb179a1b28fc97f997d2b4ccf0392fb30d6212ac937f3d8ec120699210bee333b224af73dc1b72a40f3bda1cb4f4e8e683ac09b262 SHA512 9bc78c99dd5d830e6ea0fff82e1fdc3c323b7952e54f139754d8d0dd5e5e75c3374e26ea5a404029c96766cbf3a08afdffd53b99fdca5cd9c97dd8a28b8fc410
-DIST mumble-1.4-crypto-threads.patch.xz 1472 BLAKE2B 18f64d7b63a5ac253792e31fe272870a8e6a8bec542c163c6f63e9c80157329ce07e3d8753aa4c29429980903207c457c6488ff81d7dffcc48426a022a8d1767 SHA512 981db1f7d877fa9ab92875449486074c31ea269a48db49cafa9e37380dfb1140d7d4a225765d2f5333b27aa2d271427287ac5c7d32a525eded455d734aca7d8b
-DIST mumble-1.4-odr.patch.xz 1088 BLAKE2B 48a7b04ef31f7d0f4cc7e5632ba8f328e5a7fa6961cd971b66a761366351a9a99e3cecce911c90701688083e03f2b63e6838083a8ab669f86fe0fecf23a8596d SHA512 600807cbd893f585c621e7267ee16e2828428fff17aa7eb36b8595164356ef73be2765a41ff9cd7c549c11a63abbf593b0172e56e07571e1c0a3c86fd14e5f15
-DIST mumble-1.4-openssl3.patch.xz 4172 BLAKE2B 5b68f023e218628a4d73b0991dcc7790ce5f92ce6a27c372c5e80b1f3a8beafa3ddd6416b884705b321aee31ea4f5e09dda6ceb240272dde64f420fbeb06845a SHA512 3a4e504f3365e93418cb85d0da4e6f2f54ab904283743907604bb39276560a4215d9bea1b225601789d1c3d84d270c04840ec57cd04e3df1204cc586ea42562a
-DIST mumble-1.4.287.tar.gz 9457292 BLAKE2B 5fc89c184aa54ab8269870fd87b6c9ce271d77c05a6ecb2aa78eccf297ffb842a50a18a142ac628c1b287a2b5e6c0ae0dced3237242303840a4de05b7f3e7040 SHA512 34ed30c18257ba8deae6938009a90147c8bc3a0aca28e69bea7ec0262e8d2cdacb9a840fac7d3dd623a52ef8d5903ed5424b62b483af21d6df6aa9632eae9d82
-EBUILD murmur-1.4.287-r2.ebuild 5076 BLAKE2B 81ff6d63cd6d3a34b86242523dd92ec9a0cde341259f91640f0f281a17adb53b91924eadefe48be384697360f5caab761ca5a0f793dc0469a2e933e81b9bfc3f SHA512 0ea39a18c3cadba14fac0405a6b4ba4f1f4b77ed1c361e8a4a7c02c509c8fa6942f6462d60582458651230aa698487ac5ded57eee4da887e8091bf73c8c28bbe
-EBUILD murmur-9999.ebuild 4145 BLAKE2B cb92119abf53bc148042fd6ad24147b48f05eef5f7eb04fdbc176daaf7f168f94c8b7511290ea6a9c64ac68780f63f34a9008b4536e4497e3b324718526f5a47 SHA512 0f1f3e60849a463e536db6fc4939af9264be38a8dd9f73409a7c589fba6f95006b9bdc2681a3e8d571c0dfce226184768341a6dd8aad04b5561fe98b2290794b
-MISC metadata.xml 590 BLAKE2B c8b9be5ba465c5a9a1d2b4ed33e5d1e86a148c6052eee9d39bd70c2073ec0578c3aad1ca14ddf2396611b43eb4c88d1dcae018d7c50530b64a1d8eecf807e3f0 SHA512 fef0cb21cb11c762b5ed70c89bd07dd30c3a0672b56cfdc09940b336cb7e13b2059fbde8eb738e355d7eb1a9e94d40e88f10073ed14f42f9edaf079d51f490d1
+DIST mumble-1.5.634.tar.gz 26001230 BLAKE2B ebd1e3569dd7311d704dbb83ff0ef15875dfaba7a7ba357e3be88800544d4d2217e19a15c0df778deec5a701ddc3692ca3f053651dec1eb1525b7963107ae76e SHA512 5fa9479dd836b87cb84fb6c067019f75aac335aa201baa34939f1c73dd7c67279aed6079aecdab74a14cb6c285b69cb82798de8801b2140ccf99c764b3a84b59
+EBUILD murmur-1.5.634.ebuild 4536 BLAKE2B 49869393f8c4b056367d4eac8c7e416c67daa1a0182d72edb13c4b703bea576662d3f074d55555918a82fa6a6fe60228da2604cf19e1df3ac7a3d9d4e31fe439 SHA512 a3817258a6642511915708369fadff773e23419814c3043e25c435abd32818d49658471980845d197f3aa1eaed24aaf808e1482cc2399d6aca9ab2f036bed965
+EBUILD murmur-9999.ebuild 4420 BLAKE2B 63d55eb952900c3f4114e874d795280c79c4d3f484e0e9a1af6eea33b89d17463d0b56e11489681a1d59e88b4ea1932bbc8a6e4ba16e84bf6341c42c96874702 SHA512 651b96e49ba4f6e94a52220a63dcb31f9abd925e095913b47d8c7aff90214f6ddd128260f9f9ac97a6961111180a907466aa1f12bbdbcb257e179b3092231989
+MISC metadata.xml 495 BLAKE2B d856fa5491939cbe46c66d445d0768429c1e1570ba7fa97b9601fbb53939a1aeabbd246a50705143dd5ea41d186f02c460fcaa0edf3c821813639fdc76ec6aed SHA512 0bccad9c369e38ddf5b4e212b0db6b7e5e6286e4aff4afbea64dd087d1b15934762bfd37a6289ac77119d6b5bbd68c7aecf2d2b433f9b854a3ed6b386d64661c
diff --git a/net-voip/murmur/files/murmur-1.5.634-remove-redundant-OpenSSL-locking-c.patch b/net-voip/murmur/files/murmur-1.5.634-remove-redundant-OpenSSL-locking-c.patch
new file mode 100644
index 000000000000..1e8806bda2fe
--- /dev/null
+++ b/net-voip/murmur/files/murmur-1.5.634-remove-redundant-OpenSSL-locking-c.patch
@@ -0,0 +1,54 @@
+From 2be534747d2bd111e64fb163120caa6c78d04abe Mon Sep 17 00:00:00 2001
+From: Alyssa Ross <hi@alyssa.is>
+Date: Mon, 16 Sep 2024 18:16:49 +0200
+Subject: [PATCH] FIX(client, server): Remove redundant OpenSSL locking
+ callback check
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+CRYPTO_get_locking_callback() has been defined to NULL since OpenSSL
+1.1.0. This check therefore doesn't do anything in any supported
+version of OpenSSL:
+
+https://github.com/openssl/openssl/blob/abd30777cc72029e8a44e4b67201cae8ed3d19c1/include/openssl/crypto.h#L220
+
+This fixes the following compiler error that I saw with GCC 14:
+
+/build/source/src/SSL.cpp: In static member function ‘static void MumbleSSL::initialize()’:
+/build/source/src/SSL.cpp:36:14: error: converting to ‘bool’ from ‘std::nullptr_t’ requires direct-initialization [-fpermissive]
+ 36 | if (!CRYPTO_get_locking_callback()) {
+ | ^~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+(cherry picked from commit 56945a9dfb62d29dccfe561572ebf64500deaed1)
+---
+ src/SSL.cpp | 13 +------------
+ 1 file changed, 1 insertion(+), 12 deletions(-)
+
+diff --git a/src/SSL.cpp b/src/SSL.cpp
+index bb30f7e9f..72161009c 100644
+--- a/src/SSL.cpp
++++ b/src/SSL.cpp
+@@ -24,18 +24,7 @@ void MumbleSSL::initialize() {
+ SSL_library_init(); // Safe to discard return value, per OpenSSL man pages.
+ SSL_load_error_strings();
+
+- // Determine if a locking callback has not been set.
+- // This should be the case if there are multiple copies
+- // of OpensSSL in the address space. This is mostly due
+- // to Qt dynamically loading OpenSSL when it is not
+- // configured with -openssl-linked.
+- //
+- // If we detect that no locking callback is configured, we
+- // have to set it up ourselves to allow multi-threaded use
+- // of OpenSSL.
+- if (!CRYPTO_get_locking_callback()) {
+- SSLLocks::initialize();
+- }
++ SSLLocks::initialize();
+ }
+
+ void MumbleSSL::destroy() {
+--
+2.46.2
+
diff --git a/net-voip/murmur/files/murmur.confd b/net-voip/murmur/files/murmur.confd
deleted file mode 100644
index 36367c51136b..000000000000
--- a/net-voip/murmur/files/murmur.confd
+++ /dev/null
@@ -1,9 +0,0 @@
-# where to look for the config file
-MURMUR_CONF=/etc/murmur/murmur.ini
-
-# run as this user
-MURMUR_USER=murmur
-
-# HOME directory of MURMUR_USER
-MURMUR_HOME=/var/lib/murmur
-
diff --git a/net-voip/murmur/files/murmurd-dbus.tmpfiles b/net-voip/murmur/files/murmurd-dbus.tmpfiles
deleted file mode 100644
index 70963d0a575b..000000000000
--- a/net-voip/murmur/files/murmurd-dbus.tmpfiles
+++ /dev/null
@@ -1 +0,0 @@
-d /run/murmur 0755 murmur murmur
diff --git a/net-voip/murmur/metadata.xml b/net-voip/murmur/metadata.xml
index 60eba5013c64..4a342d839e56 100644
--- a/net-voip/murmur/metadata.xml
+++ b/net-voip/murmur/metadata.xml
@@ -6,7 +6,6 @@
<name>Kenton Groombridge</name>
</maintainer>
<use>
- <flag name="grpc">Use <pkg>net-libs/grpc</pkg> to enable remote control capabilities.</flag>
<flag name="ice">Use <pkg>dev-libs/Ice</pkg> to enable remote control capabilities.</flag>
</use>
<upstream>
diff --git a/net-voip/murmur/murmur-1.4.287-r2.ebuild b/net-voip/murmur/murmur-1.4.287-r2.ebuild
deleted file mode 100644
index 61f7d8175087..000000000000
--- a/net-voip/murmur/murmur-1.4.287-r2.ebuild
+++ /dev/null
@@ -1,200 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake flag-o-matic systemd readme.gentoo-r1 tmpfiles
-
-DESCRIPTION="Mumble is an open source, low-latency, high quality voice chat software"
-HOMEPAGE="https://wiki.mumble.info"
-if [[ "${PV}" == 9999 ]] ; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/mumble-voip/mumble.git"
- EGIT_SUBMODULES=( '-*' )
-else
- MY_PN="mumble"
- if [[ "${PV}" == *_pre* ]] ; then
- MY_P="${MY_PN}-${PV}"
- SRC_URI="https://dev.gentoo.org/~concord/distfiles/${MY_P}.tar.xz"
- S="${WORKDIR}/${MY_P}"
- else
- MY_PV="${PV/_/-}"
- MY_P="${MY_PN}-${MY_PV}"
- SRC_URI="https://github.com/mumble-voip/mumble/releases/download/v${MY_PV}/${MY_P}.tar.gz
- https://dl.mumble.info/${MY_P}.tar.gz"
- S="${WORKDIR}/${MY_P}.src"
- fi
- KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-SRC_URI+=" https://dev.gentoo.org/~concord/distfiles/mumble-1.4-openssl3.patch.xz"
-SRC_URI+=" https://dev.gentoo.org/~concord/distfiles/mumble-1.4-crypto-threads.patch.xz"
-SRC_URI+=" https://dev.gentoo.org/~concord/distfiles/mumble-1.4-odr.patch.xz"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="+dbus grpc +ice test zeroconf"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- acct-group/murmur
- acct-user/murmur
- >=dev-libs/openssl-1.0.0b:0=
- >=dev-libs/protobuf-2.2.0:=
- dev-qt/qtcore:5
- dev-qt/qtnetwork:5[ssl]
- || (
- dev-qt/qtsql:5[sqlite]
- dev-qt/qtsql:5[mysql]
- )
- dev-qt/qtxml:5
- sys-apps/lsb-release
- >=sys-libs/libcap-2.15
- dbus? ( dev-qt/qtdbus:5 )
- grpc? ( net-libs/grpc )
- ice? ( dev-libs/Ice:= )
- zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
-"
-
-DEPEND="${RDEPEND}
- dev-libs/boost
- dev-qt/qttest:5
-"
-BDEPEND="
- acct-group/murmur
- acct-user/murmur
- virtual/pkgconfig
-"
-
-if [[ "${PV}" == *9999 ]] ; then
- # Required for the mkini.sh script which calls perl multiple times
- BDEPEND+="
- dev-lang/perl
- "
-fi
-
-DOC_CONTENTS="
- Useful scripts are located in /usr/share/doc/${PF}/scripts.
- The defualt 'SuperUser' password will be written into the log file
- when starting murmur for the first time.
- If you want to set it yourself, please execute:
- su murmur -s /bin/bash -c 'mumble-server -ini /etc/murmur/murmur.ini -supw <pw>'
- to set the build-in 'SuperUser' password before starting murmur.
- Please restart dbus before starting murmur, or else dbus
- registration will fail.
-"
-
-PATCHES=(
- "${WORKDIR}/mumble-1.4-openssl3.patch"
- "${WORKDIR}/mumble-1.4-crypto-threads.patch"
- "${WORKDIR}/mumble-1.4-odr.patch"
-)
-
-src_prepare() {
- if [[ "${PV}" == *9999 ]] ; then
- pushd scripts &>/dev/null || die
- ./mkini.sh || die
- popd &>/dev/null || die
- fi
-
- # Change dbus user from mumble-server to murmur
- sed \
- -e 's:mumble-server:murmur:g' \
- -i "${S}"/scripts/murmur.conf || die
-
- # Adjust default server settings to be correct for our default setup
- sed \
- -e 's:database=:database=/var/lib/murmur/database.sqlite:' \
- -e 's:;logfile=murmur.log:logfile=/var/log/murmur/murmur.log:' \
- -e 's:;pidfile=:pidfile=/run/murmur/murmur.pid:' \
- -i "${S}"/scripts/murmur.ini || die
-
- # Adjust systemd service file to our config location #689208
- sed \
- -e "s@/etc/${PN}\.ini@/etc/${PN}/${PN}.ini@" \
- -e "s@murmurd@mumble-server@" \
- -i scripts/${PN}.service || die
-
- cmake_src_prepare
-}
-
-src_configure() {
- myuse() {
- [[ -n "${1}" ]] || die "myconf: No use flag given."
- use ${1} || echo "no-${1}"
- }
- local mycmakeargs=(
- -DBUILD_TESTING="$(usex test)"
- -Dclient="OFF"
- -Ddbus="$(usex dbus)"
- -Dg15="OFF"
- -Dgrpc="$(usex grpc)"
- -Dice="$(usex ice)"
- -Doverlay="OFF"
- -Dserver="ON"
- -Dzeroconf="$(usex zeroconf)"
- )
- if [[ "${PV}" != 9999 ]] ; then
- mycmakeargs+=( -DBUILD_NUMBER="$(ver_cut 3)" )
- fi
-
- # https://bugs.gentoo.org/832978
- # fix tests (and possibly runtime issues) on arches with unsigned chars
- append-cxxflags -fsigned-char
-
- cmake_src_configure
-}
-
-src_install() {
- cmake_src_install
-
- dodoc README.md CHANGES
-
- docinto scripts
- dodoc -r scripts/server
- docompress -x /usr/share/doc/${PF}/scripts
-
- local etcdir="/etc/murmur"
- insinto ${etcdir}
- doins scripts/${PN}.ini
-
- insinto /etc/logrotate.d/
- newins "${FILESDIR}"/murmur.logrotate murmur
-
- insinto /etc/dbus-1/system.d/
- doins scripts/murmur.conf
-
- insinto /usr/share/murmur/
- doins src/murmur/Murmur.ice
-
- # Copy over the initd file so we can modify it incase zeroconf support is on.
- cp "${FILESDIR}"/murmur.initd-r2 "${T}"/murmur.initd
-
- if use zeroconf; then
- sed -e 's:need:need avahi-daemon:' -i "${T}"/murmur.initd || die
- fi
-
- newinitd "${T}"/murmur.initd murmur
- newconfd "${FILESDIR}"/murmur.confd murmur
-
- systemd_dounit scripts/${PN}.service
- newtmpfiles "${FILESDIR}"/murmurd-dbus.tmpfiles "${PN}".conf
-
- keepdir /var/lib/murmur /var/log/murmur
- fowners -R murmur /var/lib/murmur /var/log/murmur
- fperms 750 /var/lib/murmur /var/log/murmur
-
- # Fix permissions on config file as it might contain passwords.
- # (bug #559362)
- fowners root:murmur ${etcdir}/murmur.ini
- fperms 640 ${etcdir}/murmur.ini
-
- doman man/mumble-server.1
-
- readme.gentoo_create_doc
-}
-
-pkg_postinst() {
- tmpfiles_process ${PN}.conf
- readme.gentoo_print_elog
-}
diff --git a/net-voip/murmur/murmur-1.5.634.ebuild b/net-voip/murmur/murmur-1.5.634.ebuild
new file mode 100644
index 000000000000..64472a63810f
--- /dev/null
+++ b/net-voip/murmur/murmur-1.5.634.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic systemd readme.gentoo-r1 tmpfiles
+
+DESCRIPTION="Mumble is an open source, low-latency, high quality voice chat software"
+HOMEPAGE="https://wiki.mumble.info"
+if [[ "${PV}" == 9999 ]] ; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/mumble-voip/mumble.git"
+
+ # needed for the included 3rdparty license script,
+ # even if these components may not be compiled in
+ EGIT_SUBMODULES=(
+ '-*'
+ 3rdparty/cmake-compiler-flags
+ 3rdparty/FindPythonInterpreter
+ 3rdparty/flag-icons
+ 3rdparty/minhook
+ 3rdparty/speexdsp
+ 3rdparty/tracy
+ )
+else
+ MY_PN="mumble"
+ if [[ "${PV}" == *_pre* ]] ; then
+ MY_P="${MY_PN}-${PV}"
+ SRC_URI="https://dev.gentoo.org/~concord/distfiles/${MY_P}.tar.xz"
+ S="${WORKDIR}/${MY_P}"
+ else
+ MY_PV="${PV/_/-}"
+ MY_P="${MY_PN}-${MY_PV}"
+ SRC_URI="https://github.com/mumble-voip/mumble/releases/download/v${MY_PV}/${MY_P}.tar.gz"
+ S="${WORKDIR}/${MY_PN}-${PV/_*}"
+ fi
+ KEYWORDS="amd64 ~arm ~arm64 x86"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="+ice test zeroconf"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ acct-group/murmur
+ acct-user/murmur
+ dev-cpp/ms-gsl
+ >=dev-libs/openssl-1.0.0b:0=
+ >=dev-libs/protobuf-2.2.0:=
+ dev-qt/qtcore:5
+ dev-qt/qtdbus:5
+ dev-qt/qtnetwork:5[ssl]
+ || (
+ dev-qt/qtsql:5[sqlite]
+ dev-qt/qtsql:5[mysql]
+ )
+ dev-qt/qtxml:5
+ sys-apps/lsb-release
+ >=sys-libs/libcap-2.15
+ ice? ( dev-libs/Ice:= )
+ zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
+"
+
+DEPEND="${RDEPEND}
+ dev-libs/boost
+ dev-qt/qttest:5
+"
+BDEPEND="
+ acct-group/murmur
+ acct-user/murmur
+ virtual/pkgconfig
+"
+
+PATCHES=(
+ # fix build on musl, bug #888960
+ "${FILESDIR}"/murmur-1.5.634-remove-redundant-OpenSSL-locking-c.patch
+)
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+The default 'SuperUser' password will be written into the log file
+when starting murmur for the first time.
+
+If you want to manually set a password yourself, please execute:
+su murmur -s /bin/bash -c 'mumble-server -ini /etc/murmur/mumble-server.ini -supw <pw>'
+
+This will set the built-in 'SuperUser' password to '<pw>' when starting murmur.
+"
+
+src_prepare() {
+ # Adjust default server settings to be correct for our default setup
+ sed \
+ -e 's:database=:database=/var/lib/murmur/database.sqlite:' \
+ -e 's:;logfile=mumble-server.log:logfile=/var/log/murmur/murmur.log:' \
+ -e 's:;pidfile=:pidfile=/run/murmur/murmur.pid:' \
+ -i auxiliary_files/mumble-server.ini || die
+
+ # Replace the default group and user _mumble-server with murmur
+ grep -r -l _mumble-server auxiliary_files/ | xargs sed -i 's/_mumble-server/murmur/g' || die
+
+ cmake_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_TESTING="$(usex test)"
+ -Dbundled-gsl="OFF"
+ -Dclient="OFF"
+ -Dice="$(usex ice)"
+ -DMUMBLE_INSTALL_SYSCONFDIR="/etc/murmur"
+ -Dserver="ON"
+ -DMUMBLE_INSTALL_SERVICEFILEDIR=$(systemd_get_systemunitdir)
+ -DMUMBLE_INSTALL_SYSUSERSDIR=$(systemd_get_userunitdir)
+ -DMUMBLE_INSTALL_TMPFILESDIR="/usr/lib/tmpfiles.d"
+ -Dwarnings-as-errors="OFF"
+ -Dzeroconf="$(usex zeroconf)"
+ )
+ if [[ "${PV}" != 9999 ]] ; then
+ mycmakeargs+=( -DBUILD_NUMBER="$(ver_cut 3)" )
+ fi
+
+ # https://bugs.gentoo.org/832978
+ # fix tests (and possibly runtime issues) on arches with unsigned chars
+ append-cxxflags -fsigned-char
+
+ cmake_src_configure
+}
+
+src_install() {
+ cmake_src_install
+
+ dodoc README.md
+
+ insinto /etc/logrotate.d/
+ newins "${FILESDIR}"/murmur.logrotate murmur
+
+ # Copy over the initd file so we can modify it incase zeroconf support is on.
+ cp "${FILESDIR}"/murmur.initd-r2 "${T}"/murmur.initd || die
+
+ if use zeroconf; then
+ sed -e 's:need:need avahi-daemon:' -i "${T}"/murmur.initd || die
+ fi
+
+ newinitd "${T}"/murmur.initd murmur
+ newconfd "${FILESDIR}"/murmur.confd-r2 murmur
+
+ keepdir /var/lib/murmur /var/log/murmur
+ fowners -R murmur /var/lib/murmur /var/log/murmur
+ fperms 750 /var/lib/murmur /var/log/murmur
+
+ mv "${ED}"/etc/murmur/mumble-server.ini "${ED}"/etc/murmur/murmur.ini || die
+ mv "${D}/$(systemd_get_systemunitdir)/mumble-server.service" \
+ "${D}/$(systemd_get_systemunitdir)/murmur.service" || die
+ sed -i 's|mumble-server\.ini|murmur.ini|' "${D}/$(systemd_get_systemunitdir)/murmur.service" || die
+
+ readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+ tmpfiles_process mumble-server.conf
+ readme.gentoo_print_elog
+
+ if use zeroconf; then
+ elog "To turn on the zeroconf functionality, you need to uncomment and"
+ elog "change the 'bonjour=false' setting in mumble-server.ini to 'true'"
+ fi
+}
diff --git a/net-voip/murmur/murmur-9999.ebuild b/net-voip/murmur/murmur-9999.ebuild
index b5d57c5bea38..10ef9e24681e 100644
--- a/net-voip/murmur/murmur-9999.ebuild
+++ b/net-voip/murmur/murmur-9999.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit cmake flag-o-matic systemd readme.gentoo-r1 tmpfiles
@@ -17,10 +17,8 @@ if [[ "${PV}" == 9999 ]] ; then
'-*'
3rdparty/cmake-compiler-flags
3rdparty/FindPythonInterpreter
- 3rdparty/gsl
+ 3rdparty/flag-icons
3rdparty/minhook
- 3rdparty/opus
- 3rdparty/rnnoise-src
3rdparty/speexdsp
3rdparty/tracy
)
@@ -33,11 +31,10 @@ else
else
MY_PV="${PV/_/-}"
MY_P="${MY_PN}-${MY_PV}"
- SRC_URI="https://github.com/mumble-voip/mumble/releases/download/${MY_PV}/${MY_P}.tar.gz
- https://dl.mumble.info/${MY_P}.tar.gz"
- S="${WORKDIR}/${MY_PN}-${PV/_*}.src"
+ SRC_URI="https://github.com/mumble-voip/mumble/releases/download/v${MY_PV}/${MY_P}.tar.gz"
+ S="${WORKDIR}/${MY_PN}-${PV/_*}"
fi
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~x86"
fi
LICENSE="BSD"
@@ -48,6 +45,7 @@ RESTRICT="!test? ( test )"
RDEPEND="
acct-group/murmur
acct-user/murmur
+ dev-cpp/ms-gsl
>=dev-libs/openssl-1.0.0b:0=
>=dev-libs/protobuf-2.2.0:=
dev-qt/qtcore:5
@@ -102,15 +100,15 @@ src_prepare() {
src_configure() {
local mycmakeargs=(
-DBUILD_TESTING="$(usex test)"
+ -Dbundled-gsl="OFF"
-Dclient="OFF"
- -Dg15="OFF"
-Dice="$(usex ice)"
-DMUMBLE_INSTALL_SYSCONFDIR="/etc/murmur"
- -Doverlay="OFF"
-Dserver="ON"
-DMUMBLE_INSTALL_SERVICEFILEDIR=$(systemd_get_systemunitdir)
-DMUMBLE_INSTALL_SYSUSERSDIR=$(systemd_get_userunitdir)
-DMUMBLE_INSTALL_TMPFILESDIR="/usr/lib/tmpfiles.d"
+ -Dwarnings-as-errors="OFF"
-Dzeroconf="$(usex zeroconf)"
)
if [[ "${PV}" != 9999 ]] ; then
@@ -146,6 +144,11 @@ src_install() {
fowners -R murmur /var/lib/murmur /var/log/murmur
fperms 750 /var/lib/murmur /var/log/murmur
+ mv "${ED}"/etc/murmur/mumble-server.ini "${ED}"/etc/murmur/murmur.ini || die
+ mv "${D}/$(systemd_get_systemunitdir)/mumble-server.service" \
+ "${D}/$(systemd_get_systemunitdir)/murmur.service" || die
+ sed -i 's|mumble-server\.ini|murmur.ini|' "${D}/$(systemd_get_systemunitdir)/murmur.service" || die
+
readme.gentoo_create_doc
}
diff --git a/net-voip/umurmur/Manifest b/net-voip/umurmur/Manifest
index c29035788794..d989430b4a39 100644
--- a/net-voip/umurmur/Manifest
+++ b/net-voip/umurmur/Manifest
@@ -5,5 +5,4 @@ AUX umurmurd.initd 458 BLAKE2B e1f8dc704fa6237edfcfbb936e9d1c679e0f1a57ec862ec72
AUX umurmurd.service 363 BLAKE2B 373b02c3d2d9f80e3b1a44dc98032f68310e8c5b82682efc1001cf130bef21f6f925f4b535d0d02209617c92b4d4a3dad4a7b459c8dbbcf6f97b050bab933de0 SHA512 3366dc2b35623daf4704e30bc6207cf795e31cb4c9cd0c7e19f64fa9d92da772fcc309e5799261b6c07c95cfeacd2d9b898ec4a4be7b5acc46efda7a98308913
DIST umurmur-0.2.20.tar.gz 93152 BLAKE2B 7850d0f3a5c35db1f5ed2b2eea7725d288901eb7e49b9bf2f715963a102c6c6345ed90fd066d80a2666137918c73a58dd2c954321b69d0ce59f686e1c6d01e5a SHA512 0913f5ba84b30fec4ae6a1521c442ff8c48121bbbca5de9082e04e41b36434fadb5f81cb2ea0bd0a8c63f6e541d15eeda3637667d8cc7113d38935ded320cef4
EBUILD umurmur-0.2.20.ebuild 2522 BLAKE2B bc9fe55aa0e4c3fcba54ed10509ec0a80a5b04d5b20f0acf4bdee60cea6496bd0c7b5a2da10e82765090a928622a41ae93b8d966670aca4ee426bdfeb773fe83 SHA512 d78c8c90090a83c2d41773212295555511bef2ef8273eabf3cb1dbfea2f7ea5ae1f8c23bd5a744f5310a6142ee873aa42a5520808de8f101aa3107fd352d1344
-EBUILD umurmur-9999.ebuild 2460 BLAKE2B f2166a099ab77ae50f6020f7214f0849534d19cb8137d0356711d74a4b2ca65550363efebe16b99bc7847ddffd2cd428a01faadfc32545c730a0bd7539a8bc74 SHA512 77e260c9b81fa2fdd8acb2c5d5ddd6aa18245853f00485163902055172f307da42304fa044ca0f0c5cecd21c4e5d3e3efd4ddf9e18d6ccdc991bd5264b53fa33
MISC metadata.xml 1008 BLAKE2B feba592603f9cb71e517192271e9379ae130c38fd5c8979571197ced233160e38a8fa2fb927989289a2be5ba3f2609b29c278195e392998c45aba3ad576d1363 SHA512 5ecfd76cf6be609fb5f41ddc48ddf1a5eaa3b6af0355c51be0457e87c79e66cc87666ca8f0b2eb8ca52a18047bedc25b25d978f6b69b1bb44cfcf7f8d8924943
diff --git a/net-voip/umurmur/umurmur-9999.ebuild b/net-voip/umurmur/umurmur-9999.ebuild
deleted file mode 100644
index 68da6bed82ba..000000000000
--- a/net-voip/umurmur/umurmur-9999.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2022 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 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 0750 "${confdir}"
- fowners -R root:murmur "${confdir}"
- fperms 0640 "${confdir}"/umurmur.conf
-
- readme.gentoo_create_doc
-}
-
-pkg_postinst() {
- readme.gentoo_print_elog
-}
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-24 06:40:15 +0000