gentoo auto-resync : 07:03:2024 - 19:06:58

4 files changed, 2 insertions, 188 deletions

diff --git a/net-voip/Manifest.gz b/net-voip/Manifest.gz
index e3f1fc457978..b681af8f09c7 100644
--- a/net-voip/Manifest.gz
+++ b/net-voip/Manifest.gz
diff --git a/net-voip/murmur/Manifest b/net-voip/murmur/Manifest
index cce734f0e2c4..54d6d1716637 100644
--- a/net-voip/murmur/Manifest
+++ b/net-voip/murmur/Manifest
@@ -7,7 +7,6 @@ DIST mumble-1.4-crypto-threads.patch.xz 1472 BLAKE2B 18f64d7b63a5ac253792e31fe27
 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-r1.ebuild 4425 BLAKE2B 5e325e3e095da8dfa8682936acb258910edd61c3a1876127a448157dfbdd88bb75b2cf4a16dd1f01faa482aff2f506d1a38808fc5216c16353c7b5f254ec640a SHA512 45d736a6b4c57f28b345b8c1be3e1e7631b8d7c88dbc970d0c4081296232c24c77ac000ed9d67daabd1baab0812e1d4b1c4912c733ed37e7d2c330d5bd812c7f
-EBUILD murmur-1.4.287-r2.ebuild 5078 BLAKE2B d3f23fa86c45e8c695da793bdade5708c49ac3628c60444da18f51860025fd1ccb294ce143f24ae00ca100a08f9a05909fc5e8b8058dc75c1ef3a4b8cd4d3d42 SHA512 08479c07acd4f132f06e6dd4ab9502196ed0d41df0212307d784a46e1c4bb31ffab3b62ecaaa654eca9ce8d95d222da5df0ea00470c3baa7faaa13005d5c7987
+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
diff --git a/net-voip/murmur/murmur-1.4.287-r1.ebuild b/net-voip/murmur/murmur-1.4.287-r1.ebuild
deleted file mode 100644
index da97454719ad..000000000000
--- a/net-voip/murmur/murmur-1.4.287-r1.ebuild
+++ /dev/null
@@ -1,185 +0,0 @@
-# Copyright 1999-2022 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.\n
-	Please execute:\n
-	murmurd -ini /etc/murmur/murmur.ini -supw <pw>\n
-	chown murmur:murmur /var/lib/murmur/murmur.sqlite\n
-	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
-
-	sed \
-		-e 's:mumble-server:murmur:g' \
-		-e 's:/var/run:/run:g' \
-		-i "${S}"/scripts/murmur.{conf,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
-
-	newinitd "${FILESDIR}"/murmur.initd-r2 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.4.287-r2.ebuild b/net-voip/murmur/murmur-1.4.287-r2.ebuild
index f439f3c88309..61f7d8175087 100644
--- a/net-voip/murmur/murmur-1.4.287-r2.ebuild
+++ b/net-voip/murmur/murmur-1.4.287-r2.ebuild
@@ -24,7 +24,7 @@ else
 			https://dl.mumble.info/${MY_P}.tar.gz"
 		S="${WORKDIR}/${MY_P}.src"
 	fi
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 SRC_URI+=" https://dev.gentoo.org/~concord/distfiles/mumble-1.4-openssl3.patch.xz"