[gentoo-commits] repo/gentoo:master commit in: media-sound/murmur/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Lars Wendler" <polynomial-c@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/murmur/
Date: Tue, 17 Nov 2020 09:01:17 +0000 (UTC)	[thread overview]
Message-ID: <1605603672.532899f70eae05cab95e5074fac79359ab91dba2.polynomial-c@gentoo> (raw)

commit:     532899f70eae05cab95e5074fac79359ab91dba2
Author:     Jannis Achstetter <kripton <AT> kripserver <DOT> net>
AuthorDate: Wed Oct 21 17:40:32 2020 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> 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 <kripton <AT> kripserver.net>
Signed-off-by: Lars Wendler <polynomial-c <AT> 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 @@
 		<name>Lars Wendler</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/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

next             reply	other threads:[~2020-11-17  9:01 UTC|newest]

Thread overview: 65+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-11-17  9:01 Lars Wendler [this message]
  -- strict thread matches above, loose matches on Subject: below --
2022-06-29 14:29 [gentoo-commits] repo/gentoo:master commit in: media-sound/murmur/ Kenton Groombridge
2022-03-08 12:17 Lars Wendler
2022-03-08 12:17 Lars Wendler
2022-02-01  6:18 Lars Wendler
2022-01-31 10:18 Lars Wendler
2022-01-31  9:19 Lars Wendler
2022-01-31  9:19 Lars Wendler
2021-02-10 17:59 Lars Wendler
2021-02-10 17:59 Lars Wendler
2020-12-20 12:34 Sam James
2020-12-02 23:31 Thomas Deutschmann
2020-10-07 13:22 Lars Wendler
2020-07-09  8:48 Lars Wendler
2020-06-25 14:03 Lars Wendler
2020-06-21 17:17 Agostino Sarubbo
2020-06-20 13:48 Thomas Deutschmann
2020-06-15  9:56 Lars Wendler
2020-05-05 15:04 Lars Wendler
2019-11-20  9:07 Lars Wendler
2019-09-08 13:46 Lars Wendler
2019-09-08 13:46 Lars Wendler
2019-08-13 18:51 Lars Wendler
2019-08-13 18:17 Lars Wendler
2019-08-13 16:40 Lars Wendler
2019-08-13 16:40 Lars Wendler
2019-07-11  8:31 Lars Wendler
2019-07-11  8:31 Lars Wendler
2019-07-11  8:31 Lars Wendler
2019-06-26  9:04 Lars Wendler
2019-06-26  9:04 Lars Wendler
2019-06-26  8:15 Lars Wendler
2019-03-20 20:33 Lars Wendler
2019-03-20 20:33 Lars Wendler
2019-03-13 15:33 Lars Wendler
2019-03-13 15:33 Lars Wendler
2018-04-12  9:41 Lars Wendler
2018-03-19 15:00 Lars Wendler
2018-03-19 11:11 Lars Wendler
2018-03-19 11:11 Lars Wendler
2018-03-17  6:45 Matt Turner
2017-02-23 12:38 Michael Weber
2017-01-30 20:53 Lars Wendler
2017-01-18 16:51 Lars Wendler
2016-12-15 10:29 Lars Wendler
2016-12-15 10:29 Lars Wendler
2016-12-15  8:59 Lars Wendler
2016-12-15  8:59 Lars Wendler
2016-09-28  8:40 Lars Wendler
2016-09-28  8:40 Lars Wendler
2016-08-06 17:04 Lars Wendler
2016-08-06 14:33 Lars Wendler
2016-08-06 11:37 Pacho Ramos
2016-05-09 14:08 Lars Wendler
2016-05-09 14:08 Lars Wendler
2016-04-19 21:16 Ian Stakenvicius
2016-03-09 12:46 Lars Wendler
2016-03-09 12:46 Lars Wendler
2016-03-01 16:14 Lars Wendler
2016-03-01 16:14 Lars Wendler
2016-02-09 14:30 Lars Wendler
2015-12-24 15:55 Lars Wendler
2015-12-16 10:50 Lars Wendler
2015-12-16 10:50 Lars Wendler
2015-10-02  8:42 Lars Wendler

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:2299d0735e dfblob:786a950d6d dfblob:6a55b97344
dfblob:761b2f65bb )
 OR (
bs:"[gentoo-commits] repo/gentoo:master commit in: media-sound/murmur/" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1605603672.532899f70eae05cab95e5074fac79359ab91dba2.polynomial-c@gentoo \
    --to=polynomial-c@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox