From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 49DBB15817D for ; Sat, 8 Jun 2024 19:14:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8754AE2A2D; Sat, 8 Jun 2024 19:14:49 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 61C07E2A2C for ; Sat, 8 Jun 2024 19:14:49 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 82294340A12 for ; Sat, 8 Jun 2024 19:14:48 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BC45B1610 for ; Sat, 8 Jun 2024 19:14:46 +0000 (UTC) From: "Kenton Groombridge" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Kenton Groombridge" Message-ID: <1717873943.083e54b61a2dc7172107c5b0ab00c22e100974ad.concord@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-voip/murmur/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-voip/murmur/Manifest net-voip/murmur/murmur-9999.ebuild X-VCS-Directories: net-voip/murmur/ X-VCS-Committer: concord X-VCS-Committer-Name: Kenton Groombridge X-VCS-Revision: 083e54b61a2dc7172107c5b0ab00c22e100974ad X-VCS-Branch: master Date: Sat, 8 Jun 2024 19:14:46 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: d0c63f90-15b8-4eac-be3e-99738bbfbff8 X-Archives-Hash: be42c55e4dbfb47239d978fde36b1d5d commit: 083e54b61a2dc7172107c5b0ab00c22e100974ad Author: Kenton Groombridge gentoo org> AuthorDate: Sat Jun 8 19:03:14 2024 +0000 Commit: Kenton Groombridge gentoo org> CommitDate: Sat Jun 8 19:12:23 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=083e54b6 net-voip/murmur: update live ebuild Signed-off-by: Kenton Groombridge gentoo.org> net-voip/murmur/Manifest | 1 + net-voip/murmur/murmur-9999.ebuild | 21 +++++++++++---------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/net-voip/murmur/Manifest b/net-voip/murmur/Manifest index e3a09445c321..a47bcf364138 100644 --- a/net-voip/murmur/Manifest +++ b/net-voip/murmur/Manifest @@ -2,3 +2,4 @@ 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 +DIST mumble-1.5.634.tar.gz 26001230 BLAKE2B ebd1e3569dd7311d704dbb83ff0ef15875dfaba7a7ba357e3be88800544d4d2217e19a15c0df778deec5a701ddc3692ca3f053651dec1eb1525b7963107ae76e SHA512 5fa9479dd836b87cb84fb6c067019f75aac335aa201baa34939f1c73dd7c67279aed6079aecdab74a14cb6c285b69cb82798de8801b2140ccf99c764b3a84b59 diff --git a/net-voip/murmur/murmur-9999.ebuild b/net-voip/murmur/murmur-9999.ebuild index b5d57c5bea38..93abe94c1455 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,11 +100,10 @@ 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) @@ -146,6 +143,10 @@ 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 "${ED}"/usr/lib/systemd/system/mumble-server.service "${ED}"/usr/lib/systemd/system/murmur.service || die + sed -ie 's|mumble-server\.ini|murmur.ini|' "${ED}"/usr/lib/systemd/system/murmur.service || die + readme.gentoo_create_doc }