gentoo auto-resync : 07:12:2022 - 21:14:14

6 files changed, 7 insertions, 195 deletions

diff --git a/net-voip/Manifest.gz b/net-voip/Manifest.gz
index adb45561a330..787875eadfff 100644
--- a/net-voip/Manifest.gz
+++ b/net-voip/Manifest.gz
diff --git a/net-voip/murmur/Manifest b/net-voip/murmur/Manifest
index c202252d2919..c7aaf6cd9a58 100644
--- a/net-voip/murmur/Manifest
+++ b/net-voip/murmur/Manifest
@@ -7,10 +7,8 @@ DIST mumble-1.3.4.tar.gz 8592741 BLAKE2B bcde3fd859ec4faea06f996cd4c583af7c0b840
 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.274.tar.gz 9446657 BLAKE2B db1909eaab0bd1fca1f65023ff695c753af7721032305ad0c2da8246cfd91f0ed097fe0dc3b6e09c96a78f1b9df671847e1c48f3f24ac58b477148b91e24e660 SHA512 6a585b75db966c45783eab9097dc93d597ef1b718a3b7b9cf544f92c94d4305c2cac6c959931ade62d5d104a89cb41e7ca44347d49ec170687fc92d2e8b718a2
 DIST mumble-1.4.287.tar.gz 9457292 BLAKE2B 5fc89c184aa54ab8269870fd87b6c9ce271d77c05a6ecb2aa78eccf297ffb842a50a18a142ac628c1b287a2b5e6c0ae0dced3237242303840a4de05b7f3e7040 SHA512 34ed30c18257ba8deae6938009a90147c8bc3a0aca28e69bea7ec0262e8d2cdacb9a840fac7d3dd623a52ef8d5903ed5424b62b483af21d6df6aa9632eae9d82
 EBUILD murmur-1.3.4.ebuild 3708 BLAKE2B 5d8adec92ba1d2a34bd785991e228cce40076d3e84be69b1c8ac35b84a4fa5e83fbd7feb17a63bde98008bab56f75c973d64db2fd98033f59721ffb157255e83 SHA512 c224ea63b57a387cfabaaa9a1ff6358113ecc29b7862a6add2f3dfa5e70d06d22c1132118e83e00a33b06f1448ea582781e4a6cb26e7ede55d34502a9a91376a
-EBUILD murmur-1.4.274-r1.ebuild 4423 BLAKE2B 2692dbcb799b593cd49b94acdd863d26a6181917b2bdd85a26d55c780f1c7e95efcd9f00380ed1f5baf2be9d1fe199a78ffa33293372155aa99f1bf1bc1b7ccd SHA512 54c3391cffd6b3a1b04745259c8cd50c59ad9479b24a93bd3a09b417ae0dc4dd5ff89e3753d263af58c104456de64f5df8c5b96e10e1600f3b0b931735aca7bc
 EBUILD murmur-1.4.287.ebuild 4420 BLAKE2B 804fe4297784539036e3d50f5499db62027ff045175829f5a3e209dd941c6422298213010fd75dfc1f7fcf3ab865602c0e9b0661dd6ba2153416f224713f27d4 SHA512 7ebd9dad51bce41fde3b32256d39b67d1caa8f5d210a0e89e2e76c104e642cb617b087336ab476ac79e2a122b3558f393130aa97d0a42ed48dfab386319e7314
 EBUILD murmur-9999.ebuild 4096 BLAKE2B a8dab155ddfb00225078bae416c6ae061f591161debac32a0cf0cabfe77a4718af990055c19edd6bdce1120b2ef600b8ce2615300181515051b52b7ca5f85b2c SHA512 236ff227654dea5bc0c92edf12afd417871d10fc6a0eef230be09420b81619c371c18bd8e6c8d207f5f6be51480ede954a57fce3c36bba8da77093a14b84fd56
-MISC metadata.xml 532 BLAKE2B 033c64eda04542535df56a2ab4daedb41367f776873b757610e41a7afc450cc8acc2679f07dc749a75c82b6ac2b904fe8d63afa2ca6f017263d0230269e7bc78 SHA512 7ec514d46eb13c349514504ba976f8f787202497354515be2535793d3b1a9e287c210b861bec5778ce7d6de17aa40819c1520e58642ddc384cae6d009c193c24
+MISC metadata.xml 590 BLAKE2B c8b9be5ba465c5a9a1d2b4ed33e5d1e86a148c6052eee9d39bd70c2073ec0578c3aad1ca14ddf2396611b43eb4c88d1dcae018d7c50530b64a1d8eecf807e3f0 SHA512 fef0cb21cb11c762b5ed70c89bd07dd30c3a0672b56cfdc09940b336cb7e13b2059fbde8eb738e355d7eb1a9e94d40e88f10073ed14f42f9edaf079d51f490d1
diff --git a/net-voip/murmur/metadata.xml b/net-voip/murmur/metadata.xml
index 453aea68c4d9..60eba5013c64 100644
--- a/net-voip/murmur/metadata.xml
+++ b/net-voip/murmur/metadata.xml
@@ -10,6 +10,7 @@
 		<flag name="ice">Use <pkg>dev-libs/Ice</pkg> to enable remote control capabilities.</flag>
 	</use>
 	<upstream>
+		<remote-id type="github">mumble-voip/mumble</remote-id>
 		<remote-id type="sourceforge">mumble</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/net-voip/murmur/murmur-1.4.274-r1.ebuild b/net-voip/murmur/murmur-1.4.274-r1.ebuild
deleted file mode 100644
index 2e6317cfe7d9..000000000000
--- a/net-voip/murmur/murmur-1.4.274-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_PN}-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
-	|| (
-		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/telepathy-gabble/Manifest b/net-voip/telepathy-gabble/Manifest
index 3fb77812bfc6..18f4ab50b38a 100644
--- a/net-voip/telepathy-gabble/Manifest
+++ b/net-voip/telepathy-gabble/Manifest
@@ -2,5 +2,5 @@ AUX telepathy-gabble-0.18.4-build-fix-no-jingle.patch 774 BLAKE2B 3a861c8f32d090
 AUX telepathy-gabble-0.18.4-openssl-1.1.patch 8115 BLAKE2B 155503c50aa76003c202b1244bbba321aa4e4060074a5d298e24989597f70fadf712b42203aba65742bc8550292eceeff940b9628bbdced012b3f3697eba5b7e SHA512 07384272d1aa91cbb821080146841aae9fa8ca25d6a91bd5cd2d93a3ebc06cafd1f7272bbed28c1191b32cc5692d3d6f69186914865eafdfaa52bf6a821d7b19
 DIST telepathy-gabble-0.18.4-python3.patch 16302 BLAKE2B 6cbd6469febe4acc6d8d07c0c209b47fbf79990601f41c4715f13944d81165df6dccfc344b3cc674fa131fc383a609ae628d8508ff96b05ef63634af6c32b638 SHA512 3b8ea10b5330c5d02d4bc4508a7d9a348bb4c9a93a92419fb66668e06f461097fb16a1a4b956c327740cf6dc77693b921a63f37a6095c21fcab6d1169e62a2f4
 DIST telepathy-gabble-0.18.4.tar.gz 2584311 BLAKE2B c1708be2ebe0b7dd06b53af1087c349e1a1f0b83dfffe463c72e31e459d2efd4db5bad7ade7a478bd4b91948aade822bfa6c13fe175863759cc98c44beca8178 SHA512 4303f1da7eeadf1f0e69fa881cd8b08dc41f4fd061df3f2ecdc80735d8be3e8cf24d8482f265f1858d8dfed71f62e8bc02c13f9525db8d21c9d927e25fa66218
-EBUILD telepathy-gabble-0.18.4-r4.ebuild 2508 BLAKE2B af7effa6020378f0308a4de81c87a591fda1826fd15e562153a978daa642e039709c4527f92791ac9285ea36bb88f84891c3a2378b26a97f678bd9e0b52811db SHA512 c59dbfbdf936cb9879a9e7e6051d44b833693b05b1ae80554d02d40865a0a09db67e038f508381edaf01064fa3b00168148c0a5da6d891080280b69e7c55540c
+EBUILD telepathy-gabble-0.18.4-r5.ebuild 2478 BLAKE2B 5c38a17edf3c2d7cc6bbf8154fa7a13d462e1a51cff1e171d5e553019d06d449d94e5417edd8d29f972fbbb2daa8fc346332ab709b87a838fab6f1bfd444d25b SHA512 e1893550d02d5fb96466a240f9fe59310cc45ee4e14bb84f07d6b97f84fbd97d45ebe3469ad5dfc67cc9a40db0eb1160d44e63c423012394db6320bac8ccb544
 MISC metadata.xml 407 BLAKE2B b98f1d7ec12aa895354e550243f203a46208a97cee2a3aa22e3406ca84f061da8905a63dead15729119305162d8bddcd3c970c47c3fc9827bb684442ce4f245c SHA512 bc016579ae294a6990e2af143793305b93dd01305a16195e94a42029107f8ef5171ebc40d63f04b5842bc79d32d05ba4db0327cc64a6c8b96cd1a86def65305c
diff --git a/net-voip/telepathy-gabble/telepathy-gabble-0.18.4-r4.ebuild b/net-voip/telepathy-gabble/telepathy-gabble-0.18.4-r5.ebuild
index fac937ff9bda..add0d6216ddb 100644
--- a/net-voip/telepathy-gabble/telepathy-gabble-0.18.4-r4.ebuild
+++ b/net-voip/telepathy-gabble/telepathy-gabble-0.18.4-r5.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
+
 # Python is used during build for some scripted source files generation (and twisted tests)
 PYTHON_COMPAT=( python3_{8..11} )
 
@@ -45,7 +46,8 @@ RDEPEND="
 
 	!<net-im/telepathy-mission-control-5.5.0
 "
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	${PYTHON_DEPS}
 	dev-util/glib-utils
 	>=dev-util/gtk-doc-am-1.17
@@ -66,10 +68,6 @@ PATCHES=(
 	"${DISTDIR}"/${P}-python3.patch
 )
 
-pkg_setup() {
-	python-any-r1_pkg_setup
-}
-
 src_configure() {
 	gnome2_src_configure \
 		--disable-coding-style-checks \