4 files changed, 1 insertions, 217 deletions
diff --git a/net-voip/murmur/Manifest b/net-voip/murmur/Manifest
index 501ca0ddae01..a84080f0e192 100644
--- a/net-voip/murmur/Manifest
+++ b/net-voip/murmur/Manifest
@@ -1,14 +1,8 @@
-AUX murmur.confd 172 BLAKE2B 1f25ce417f1b9f504ea59d4e5216774f8eb2b00450577a1d137f645fbbd69f0991b510c35bad81ac739c868ce128f4de0c6b4e4095edcd977d3822fac622524c SHA512 4a05e2a640abf3f7a74c63b47ab87774718ad4e86f985c5308a2ba3167d816abedd9c35b07b8572f7789309ba91fa37bc0c1938493cc8d78844ecdeed7bd4171
 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
 DIST mumble-1.5.634.tar.gz 26001230 BLAKE2B ebd1e3569dd7311d704dbb83ff0ef15875dfaba7a7ba357e3be88800544d4d2217e19a15c0df778deec5a701ddc3692ca3f053651dec1eb1525b7963107ae76e SHA512 5fa9479dd836b87cb84fb6c067019f75aac335aa201baa34939f1c73dd7c67279aed6079aecdab74a14cb6c285b69cb82798de8801b2140ccf99c764b3a84b59
-EBUILD murmur-1.4.287-r2.ebuild 5076 BLAKE2B 81ff6d63cd6d3a34b86242523dd92ec9a0cde341259f91640f0f281a17adb53b91924eadefe48be384697360f5caab761ca5a0f793dc0469a2e933e81b9bfc3f SHA512 0ea39a18c3cadba14fac0405a6b4ba4f1f4b77ed1c361e8a4a7c02c509c8fa6942f6462d60582458651230aa698487ac5ded57eee4da887e8091bf73c8c28bbe
 EBUILD murmur-1.5.634.ebuild 4418 BLAKE2B fc0b1b23c8ce31184a187c5e5e1e1e3690c8e26ab68e513bcc2a47ae2ae79bee9fcb8d4d4c8a6aeac5c2dcc2816416d4b881357b981f7eb5819fa48868870932 SHA512 5fd930c29f19765c115483f61bbf5f27b85a5d11fc57cea8851ace7e656db61561d2b75b21c56c67eb2e081b16e29b01ba47d85916eebef8a251644c860bbb0e
 EBUILD murmur-9999.ebuild 4420 BLAKE2B 63d55eb952900c3f4114e874d795280c79c4d3f484e0e9a1af6eea33b89d17463d0b56e11489681a1d59e88b4ea1932bbc8a6e4ba16e84bf6341c42c96874702 SHA512 651b96e49ba4f6e94a52220a63dcb31f9abd925e095913b47d8c7aff90214f6ddd128260f9f9ac97a6961111180a907466aa1f12bbdbcb257e179b3092231989
-MISC metadata.xml 590 BLAKE2B c8b9be5ba465c5a9a1d2b4ed33e5d1e86a148c6052eee9d39bd70c2073ec0578c3aad1ca14ddf2396611b43eb4c88d1dcae018d7c50530b64a1d8eecf807e3f0 SHA512 fef0cb21cb11c762b5ed70c89bd07dd30c3a0672b56cfdc09940b336cb7e13b2059fbde8eb738e355d7eb1a9e94d40e88f10073ed14f42f9edaf079d51f490d1
+MISC metadata.xml 495 BLAKE2B d856fa5491939cbe46c66d445d0768429c1e1570ba7fa97b9601fbb53939a1aeabbd246a50705143dd5ea41d186f02c460fcaa0edf3c821813639fdc76ec6aed SHA512 0bccad9c369e38ddf5b4e212b0db6b7e5e6286e4aff4afbea64dd087d1b15934762bfd37a6289ac77119d6b5bbd68c7aecf2d2b433f9b854a3ed6b386d64661c
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/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
-}