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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 204CE138359 for ; Tue, 17 Nov 2020 09:01:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 28329E08E5; Tue, 17 Nov 2020 09:01:20 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0A5CCE08E5 for ; Tue, 17 Nov 2020 09:01:20 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AA68733BEAE for ; Tue, 17 Nov 2020 09:01:18 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 306FB3A6 for ; Tue, 17 Nov 2020 09:01:17 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1605603672.532899f70eae05cab95e5074fac79359ab91dba2.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/murmur/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-sound/murmur/metadata.xml media-sound/murmur/murmur-9999.ebuild X-VCS-Directories: media-sound/murmur/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 532899f70eae05cab95e5074fac79359ab91dba2 X-VCS-Branch: master Date: Tue, 17 Nov 2020 09:01:17 +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: 61e57dfe-225f-497c-8c4d-9a0a414d484f X-Archives-Hash: c2f6d6a663886244f29451b912742913 commit: 532899f70eae05cab95e5074fac79359ab91dba2 Author: Jannis Achstetter kripserver net> AuthorDate: Wed Oct 21 17:40:32 2020 +0000 Commit: Lars Wendler gentoo org> CommitDate: Tue Nov 17 09:01:12 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=532899f7 media-sound/murmur: Migrate live ebuild to cmake Closes: https://bugs.gentoo.org/745387 Closes: https://github.com/gentoo/gentoo/pull/17991 Package-Manager: Portage-3.0.8, Repoman-3.0.2 Signed-off-by: Jannis Achstetter kripserver.net> Signed-off-by: Lars Wendler gentoo.org> media-sound/murmur/metadata.xml | 1 + media-sound/murmur/murmur-9999.ebuild | 37 ++++++++++++++++++++--------------- 2 files changed, 22 insertions(+), 16 deletions(-) diff --git a/media-sound/murmur/metadata.xml b/media-sound/murmur/metadata.xml index 2299d0735ea..786a950d6d0 100644 --- a/media-sound/murmur/metadata.xml +++ b/media-sound/murmur/metadata.xml @@ -6,6 +6,7 @@ Lars Wendler + Use net-libs/grpc to enable remote control capabilities. Use dev-libs/Ice to enable remote control capabilities. diff --git a/media-sound/murmur/murmur-9999.ebuild b/media-sound/murmur/murmur-9999.ebuild index 6a55b973442..761b2f65bbb 100644 --- a/media-sound/murmur/murmur-9999.ebuild +++ b/media-sound/murmur/murmur-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit qmake-utils systemd readme.gentoo-r1 +inherit cmake systemd readme.gentoo-r1 DESCRIPTION="Mumble is an open source, low-latency, high quality voice chat software" HOMEPAGE="https://wiki.mumble.info" @@ -29,7 +29,8 @@ fi LICENSE="BSD" SLOT="0" -IUSE="+dbus debug +ice pch zeroconf" +IUSE="+dbus grpc +ice test zeroconf" +RESTRICT="!test? ( test )" RDEPEND=" acct-group/murmur @@ -46,6 +47,7 @@ RDEPEND=" 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] ) " @@ -93,6 +95,8 @@ src_prepare() { # Adjust systemd service file to our config location #689208 sed "s@/etc/${PN}\.ini@/etc/${PN}/${PN}.ini@" \ -i scripts/${PN}.service || die + + cmake_src_prepare } src_configure() { @@ -100,29 +104,30 @@ src_configure() { [[ -n "${1}" ]] || die "myconf: No use flag given." use ${1} || echo "no-${1}" } - local conf_add=( - no-client - $(myuse dbus) - $(usex debug 'symbols debug' release) - $(myuse ice) - $(myuse pch) - $(usex zeroconf '' no-bonjour) + 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)" ) - eqmake5 main.pro -recursive \ - CONFIG+="${conf_add[*]}" + cmake_src_configure } src_install() { - dodoc README CHANGES + cmake_src_install + + dodoc README.md CHANGES docinto scripts dodoc -r scripts/server docompress -x /usr/share/doc/${PF}/scripts - local dir="$(usex debug debug release)" - dobin "${dir}"/murmurd - local etcdir="/etc/murmur" insinto ${etcdir} newins scripts/${PN}.ini.system ${PN}.ini