diff options
| author |   Jannis Achstetter <kripton@kripserver.net> | 2020-10-21 19:40:32 +0200 |
|---|---|---|
| committer |   Lars Wendler <polynomial-c@gentoo.org> | 2020-11-17 10:01:12 +0100 |
| commit | 532899f70eae05cab95e5074fac79359ab91dba2 (patch) | |
| tree | e1217514fdc05fe960ee468d374853dce89efcca /media-sound | |
| parent | sci-geosciences/gpxsee: bump to 7.36 (diff) | |
| download | gentoo-532899f70eae05cab95e5074fac79359ab91dba2.tar.gz gentoo-532899f70eae05cab95e5074fac79359ab91dba2.tar.bz2 gentoo-532899f70eae05cab95e5074fac79359ab91dba2.zip | |
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@kripserver.net>
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
Diffstat (limited to 'media-sound')
| -rw-r--r-- | media-sound/murmur/metadata.xml | 1 | ||||
| -rw-r--r-- | 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 2299d0735ea9..786a950d6d06 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 6a55b9734426..761b2f65bbb7 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 |