diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-11-25 22:39:15 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-11-25 22:39:15 +0000 |
commit | d934827bf44b7cfcf6711964418148fa60877668 (patch) | |
tree | 0625f358789b5e015e49db139cc1dbc9be00428f /media-sound/murmur | |
parent | 2e34d110f164bf74d55fced27fe0000201b3eec5 (diff) |
gentoo resync : 25.11.2020
Diffstat (limited to 'media-sound/murmur')
-rw-r--r-- | media-sound/murmur/Manifest | 6 | ||||
-rw-r--r-- | media-sound/murmur/metadata.xml | 1 | ||||
-rw-r--r-- | media-sound/murmur/murmur-1.3.3.ebuild | 161 | ||||
-rw-r--r-- | media-sound/murmur/murmur-9999.ebuild | 37 |
4 files changed, 187 insertions, 18 deletions
diff --git a/media-sound/murmur/Manifest b/media-sound/murmur/Manifest index 5cdc87a47306..c32457ac1f65 100644 --- a/media-sound/murmur/Manifest +++ b/media-sound/murmur/Manifest @@ -4,7 +4,9 @@ AUX murmur.logrotate 175 BLAKE2B b13282fc194ed7a576e22ac241285053a7882f670580b6a AUX murmurd-dbus.tmpfiles 33 BLAKE2B 4040c58c142ae051e3086bfb179a1b28fc97f997d2b4ccf0392fb30d6212ac937f3d8ec120699210bee333b224af73dc1b72a40f3bda1cb4f4e8e683ac09b262 SHA512 9bc78c99dd5d830e6ea0fff82e1fdc3c323b7952e54f139754d8d0dd5e5e75c3374e26ea5a404029c96766cbf3a08afdffd53b99fdca5cd9c97dd8a28b8fc410 DIST mumble-1.3.1.tar.gz 8587417 BLAKE2B e0ff9911727ce74035cef658ff8ce21bfab6dcfd94306abe4a206853a1b2e2e4ddc7215e757f89559c30be64df4329dffc81618a0509df2b281f5b5b59d7de2f SHA512 f622ae5e4f7cd00ef60d225ee6db3cc13fcae5fdc1b03252d17ad6a18156526517e7d019f796b5600219e90e8662d095102fc6d61033fb20fd109afdf427a6d7 DIST mumble-1.3.2.tar.gz 8586828 BLAKE2B 38af4a0a2ab934388607745a2e31ea7310b7bc040bbe6ac32cc7128f2ac2949f5754090b6eaed3b0baaca6f76c42f004fdd093d88b8486d84187d063d01976e9 SHA512 22e23a682bc9c11420c6ae1d8ff01a80906ebbfb4f073ee25c6d2923d345d12031ddfeca3dabaaf5cf183b82b22eb3c788c88fa0f5313bc399e15795a945b874 +DIST mumble-1.3.3.tar.gz 8591354 BLAKE2B e5bf4d0a21f3c9af761b0892c4a5a7d86244d3283070976fe7a779a10567ffd857e0c19dad750cdbae40d851ce1dcf17b66c63a2cb5142a13358af6f272445dd SHA512 be4c6d4de82a1059bf30d4c7e3c44e41e4bb50dc4a811b7d0def808c52059ff7bcccf65140db940f18cc1bb66d58ea4dab23ba5dcfae3b8b904866751f32edb3 EBUILD murmur-1.3.1.ebuild 3688 BLAKE2B 620347f0ed06e982ffa44509581b95706d0860f5b937e25c9afc51d4ae03f3272d2af323575e6234a582d6a4e0cf3a57fcebc5f80ad03392787b1e6b3b694206 SHA512 46bebc6ceadbdf18cb9ca26702da1d853436cd448e64c2dcfe0e51c88ab5314318259264b6f2c0d46c30d5cd1daebd94ad7af4b23145aa2d472cf67798e6fa57 EBUILD murmur-1.3.2.ebuild 3690 BLAKE2B bc7a49642fd3389fc43fa5188c3bbb64d9818fefcbfe4bfd0920a79bf4128c88eee13f029ce79682874db637f51b012ab459424161edb6853b3ede252e90645a SHA512 d02b017155372a00c422bad3d79decb7563e857db1639cc80253d6e48cbfe0a412debf758009928611527305f52df928240c60f20abd11d35744da630b1f5101 -EBUILD murmur-9999.ebuild 3690 BLAKE2B 03dfc78a08930265518faaada25f6e857d39cd705e6ba3975ad7f12481efdba60b0f5b331e5ee785481ada733265f5caa0f681ba5aa0442d4cf45a1b96e742cd SHA512 9bab53e3b0282ac3adebb9055c1b57e2dbe0780a5f3e8cb2bbde227b22ebe057a85e3abf50a5106ce704ca07e2f56ede16ec03543676941d65269238488e6352 -MISC metadata.xml 435 BLAKE2B 6628c9f2a8a849eea9d7a987a5226835529032a1b7acd443efb9f5f5f46249da602939f8cb5291ce596856ff7258be09665886a24937eb1425c05efea0d7313f SHA512 ea4d122a1a40ff30ea188254cd241f62fa1e47d873089491088228680e336ca47d5ee5941aa53e47976dd8979554f496df75bbb7688b99f26112ef27d004e85d +EBUILD murmur-1.3.3.ebuild 3690 BLAKE2B bc7a49642fd3389fc43fa5188c3bbb64d9818fefcbfe4bfd0920a79bf4128c88eee13f029ce79682874db637f51b012ab459424161edb6853b3ede252e90645a SHA512 d02b017155372a00c422bad3d79decb7563e857db1639cc80253d6e48cbfe0a412debf758009928611527305f52df928240c60f20abd11d35744da630b1f5101 +EBUILD murmur-9999.ebuild 3748 BLAKE2B 220d4e0fd63cf2464fe0586938525c8c3c8c8b26f3b08c55d5c8e5dd4f9a7a996567fb28f7fb9bef6a602c3f041b743180445f0fd1024583dc68b4a81d472b23 SHA512 0cfb9421a3c7e389ea3dea6a536e49485fd586a6785d0813435165ece1401597b7e7858f6378bf1ca7793ddbdaecdbf9410e0bc5ffbdfcc13d392ba59156c404 +MISC metadata.xml 530 BLAKE2B a6618cb804deee82cf3f88ee683a5b406eee1317e9ca815f7f4e363a0e14c7c8cc2bcf4400d3a79b62f5652881e46be4405d0ac88afe610187419978ac57c9a6 SHA512 ef162d69805d3262f9f4f1732e9d8a031cac73e130f04013123d8f8e1d8e48132df243653ef2464bda1d8b8c0b88485fd32edaab8b3e62555a6295c676c1f5b5 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-1.3.3.ebuild b/media-sound/murmur/murmur-1.3.3.ebuild new file mode 100644 index 000000000000..17d28a117c43 --- /dev/null +++ b/media-sound/murmur/murmur-1.3.3.ebuild @@ -0,0 +1,161 @@ +# 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 + +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/~polynomial-c/dist/${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/${MY_PV}/${MY_P}.tar.gz + https://dl.mumble.info/${MY_P}.tar.gz" + S="${WORKDIR}/${MY_PN}-${PV/_*}" + fi + KEYWORDS="~amd64 ~arm ~x86" +fi + +LICENSE="BSD" +SLOT="0" +IUSE="+dbus debug +ice pch zeroconf" + +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 ) + ice? ( dev-libs/Ice:= ) + zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) +" + +DEPEND="${RDEPEND} + >=dev-libs/boost-1.41.0 +" +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. +" + +src_prepare() { + default + + 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.system} || die + + # Adjust systemd service file to our config location #689208 + sed "s@/etc/${PN}\.ini@/etc/${PN}/${PN}.ini@" \ + -i scripts/${PN}.service || die +} + +src_configure() { + myuse() { + [[ -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) + ) + + eqmake5 main.pro -recursive \ + CONFIG+="${conf_add[*]}" +} + +src_install() { + dodoc README 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 + + 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-r1 murmur + newconfd "${FILESDIR}"/murmur.confd murmur + + systemd_dounit scripts/${PN}.service + systemd_newtmpfilesd "${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/murmurd.1 + + readme.gentoo_create_doc +} + +pkg_postinst() { + readme.gentoo_print_elog +} 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 |