diff options
author | V3n3RiX <venerix@koprulu.sector> | 2022-02-02 01:39:05 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2022-02-02 01:39:05 +0000 |
commit | fcc5224904648a8e6eb528d7603154160a20022f (patch) | |
tree | 3bfce096b38a9cea8eed13fc70c1526c456e9abd /media-sound/murmur | |
parent | 2fd57282f0262ca084e05b0f2c63fbada395d02b (diff) |
gentoo resync : 02.02.2022
Diffstat (limited to 'media-sound/murmur')
-rw-r--r-- | media-sound/murmur/Manifest | 5 | ||||
-rw-r--r-- | media-sound/murmur/files/murmur.initd-r2 | 24 | ||||
-rw-r--r-- | media-sound/murmur/murmur-1.4.230-r2.ebuild | 172 | ||||
-rw-r--r-- | media-sound/murmur/murmur-9999.ebuild | 21 |
4 files changed, 213 insertions, 9 deletions
diff --git a/media-sound/murmur/Manifest b/media-sound/murmur/Manifest index 3b01eb418c5e..cc1dfe650177 100644 --- a/media-sound/murmur/Manifest +++ b/media-sound/murmur/Manifest @@ -1,10 +1,13 @@ AUX murmur.confd 172 BLAKE2B 1f25ce417f1b9f504ea59d4e5216774f8eb2b00450577a1d137f645fbbd69f0991b510c35bad81ac739c868ce128f4de0c6b4e4095edcd977d3822fac622524c SHA512 4a05e2a640abf3f7a74c63b47ab87774718ad4e86f985c5308a2ba3167d816abedd9c35b07b8572f7789309ba91fa37bc0c1938493cc8d78844ecdeed7bd4171 AUX murmur.initd-r1 506 BLAKE2B fd483f5f1c43f1778a909c725abee43b7299251e70e3f4e365804e7da94f674035dbb953167f2143c2d00dfbb4e23d5ed3d378c8aa2acbafbae8e7cf93fab263 SHA512 e1178a42c10f4a62f9b937e977b9e13059cae501851a377aea221ae2bd2bf031a1574e1f29f6df1b0ee08406a6a88fae8fbffd8acd0546f9ff6b27189ef55653 +AUX murmur.initd-r2 511 BLAKE2B 2ff09ffdb62c5131f97f52960ac71360eb4959bb974c8cbc7f0fb0a27da91f34826a3065840be5a5ef9c24e243185cee0106c85285aa2aefbb534934cff9621d SHA512 3153254ec2c31e1b19e4991cce65ae9df7a609ad61c13ff569bbe822fc728dcf562c63c0a0d3198de3bd1599524db3f0e122004d1491b6bceafdbb28066a56cc AUX murmur.logrotate 175 BLAKE2B b13282fc194ed7a576e22ac241285053a7882f670580b6a3004e8ce22b3cc5f3854f46aa2a89629931a0e8cdc826e2d4e1096e837aed41148d8ef87afd485676 SHA512 09bbc2f364e038dc81e55adb86210f4cdc178bd2dba770e373f6c411b2c21d08218fd9784fff0ba133b7e18c84ddc3b2ac86d9d67a99a3169d3be42bd7fe2863 AUX murmurd-dbus.tmpfiles 33 BLAKE2B 4040c58c142ae051e3086bfb179a1b28fc97f997d2b4ccf0392fb30d6212ac937f3d8ec120699210bee333b224af73dc1b72a40f3bda1cb4f4e8e683ac09b262 SHA512 9bc78c99dd5d830e6ea0fff82e1fdc3c323b7952e54f139754d8d0dd5e5e75c3374e26ea5a404029c96766cbf3a08afdffd53b99fdca5cd9c97dd8a28b8fc410 DIST mumble-1.3.3.tar.gz 8591354 BLAKE2B e5bf4d0a21f3c9af761b0892c4a5a7d86244d3283070976fe7a779a10567ffd857e0c19dad750cdbae40d851ce1dcf17b66c63a2cb5142a13358af6f272445dd SHA512 be4c6d4de82a1059bf30d4c7e3c44e41e4bb50dc4a811b7d0def808c52059ff7bcccf65140db940f18cc1bb66d58ea4dab23ba5dcfae3b8b904866751f32edb3 DIST mumble-1.3.4.tar.gz 8592741 BLAKE2B bcde3fd859ec4faea06f996cd4c583af7c0b8409cca79cb05ef8ba7fcdeac9e49ed1d07a4131225dd582da7610190d4006abc731fd4276b2288e02e8c18effb6 SHA512 e2dde5aad30d1a931e7acd8d7db0b8c785d3a268d0b8cf5626fa03953a51bcadb719c6682c440d02524e83beee13d73d8f5bb3fdf98ab1c82d3ecf824cc25f68 +DIST mumble-1.4.230.tar.gz 9441667 BLAKE2B da433f3c15d7e45dfac0c8a78c9dbe86ba8d5cd078d2d87fd4d90718968fc9e5928c3c5c5ba2e40a8a54d02a646c5fc6a7ee2fff4b71dfa411d74f395b097c26 SHA512 6cffc7a95d88b33876f4093b99266468210f5c14f190fbd2fbe4991bef91a567e55296e7c8c6cc99e19c054853211085cc3cc08109e367e6776afb70766b3a53 EBUILD murmur-1.3.3.ebuild 3717 BLAKE2B b696165aaefb36ddc61ca17008bfc128d01664bccac3dd02729865a8d9f0b12b5d9f75648099d1b43d374e5cba18ff99c89cbec7174130e8c4598d6569c86958 SHA512 a76d12a2cc60d016cd4527b9776898e7dae75a4aa438eee36617afa40d118cd619396cec8db5eff2cd5579aac2cf61941cc77e027120a5996fbe5f574e7b0320 EBUILD murmur-1.3.4.ebuild 3719 BLAKE2B 3b0dd3378a043e2bbfc5ebde7832985365a83ac4b524e818f5bb2a70963824376e3bf2973c6a43f02edf8b59c33947572150e250206595a73cf21a95f4a59d21 SHA512 5ecf3483b8c9e1c5bd74f385e5e4bd129f0997df9b51c18595797bfb60a624757be69592f0b0ed7b7b7e9a339eb52412ce9a0d9fbd309ca16d88382a6ffeea27 -EBUILD murmur-9999.ebuild 3777 BLAKE2B 4a25f63367c23082d3dff4e75027e077ca402612e1587246c21410a7cf582d20fa7a59c52f08ff9206cbd56df308d67524075c2258ed9557b6739566b5f64a90 SHA512 dab8a355b497a0b78a6958166960d2bde03edc2b07d56394420f5372e0aa9995aaf91b57b6e570221d5436904f9c15ab932aa12901205ac2646e8078a09d1c59 +EBUILD murmur-1.4.230-r2.ebuild 3894 BLAKE2B 658989f4911510a3c75a9a30b78d92bdc5077db00c37d9325068f69b8fd65ef4f0b1633d48bd70eb42a531b360908d5476325b99f50ee6ade6dfb7f485700b6f SHA512 b65c4ebbe0865464f2a303a02fe070507e878dd32c9f627f041939e447d62ce4e5634f0b1dfd0a7ad17f54a4508409d9d4c9547437f7b669901362d1ec6da1ec +EBUILD murmur-9999.ebuild 3894 BLAKE2B 658989f4911510a3c75a9a30b78d92bdc5077db00c37d9325068f69b8fd65ef4f0b1633d48bd70eb42a531b360908d5476325b99f50ee6ade6dfb7f485700b6f SHA512 b65c4ebbe0865464f2a303a02fe070507e878dd32c9f627f041939e447d62ce4e5634f0b1dfd0a7ad17f54a4508409d9d4c9547437f7b669901362d1ec6da1ec MISC metadata.xml 531 BLAKE2B 26cf46acdb8163b6afed12a320ef3a4f776dc1dad34191544da5525c75a5af718bbee12fd1505294bee016fbe40cc0fb3c923fdac9b07428419f0de6efb44c4c SHA512 a11789a617bbf4f78bdf3ab2b406dff874d1db2bc1c24ac48b8eccdb49049d2679b511a809be6004967798fc0d89b52adcdc6e855420eebf2e7bfcba424953fc diff --git a/media-sound/murmur/files/murmur.initd-r2 b/media-sound/murmur/files/murmur.initd-r2 new file mode 100644 index 000000000000..b754c242462b --- /dev/null +++ b/media-sound/murmur/files/murmur.initd-r2 @@ -0,0 +1,24 @@ +#!/sbin/openrc-run + +pidfile="/run/murmur/murmur.pid" +command="/usr/bin/mumble-server" +command_args="-ini \"${MURMUR_CONF}\"" +start_stop_daemon_args="-u \"${MURMUR_USER}\" --env HOME=\"${MURMUR_HOME}\" --wait 20" +extra_started_commands="reload" + +depend() { + need localmount net + use dbus logger + after bootmisc mysql +} + +start_pre() { + checkpath -q -d -o ${MURMUR_USER} ${pidfile%/*} +} + +reload() { + ebegin "Reloading Murmur" + start-stop-daemon --signal HUP --pidfile "${pidfile}" \ + --exec ${command} + eend $? +} diff --git a/media-sound/murmur/murmur-1.4.230-r2.ebuild b/media-sound/murmur/murmur-1.4.230-r2.ebuild new file mode 100644 index 000000000000..50cc111347c0 --- /dev/null +++ b/media-sound/murmur/murmur-1.4.230-r2.ebuild @@ -0,0 +1,172 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake systemd readme.gentoo-r1 tmpfiles + +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/_*}.src" + fi + KEYWORDS="~amd64 ~x86" +fi + +LICENSE="BSD" +SLOT="0" +IUSE="+dbus grpc +ice test zeroconf" +RESTRICT="!test? ( test )" + +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 ) + grpc? ( net-libs/grpc ) + ice? ( dev-libs/Ice:= ) + zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) +" + +DEPEND="${RDEPEND} + >=dev-libs/boost-1.41.0 + dev-qt/qttest:5 +" +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} || die + + # Adjust systemd service file to our config location #689208 + sed \ + -e "s@/etc/${PN}\.ini@/etc/${PN}/${PN}.ini@" \ + -e "s@murmurd@mumble-server@" \ + -i scripts/${PN}.service || die + + cmake_src_prepare +} + +src_configure() { + myuse() { + [[ -n "${1}" ]] || die "myconf: No use flag given." + use ${1} || echo "no-${1}" + } + 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)" + ) + if [[ "${PV}" != 9999 ]] ; then + mycmakeargs+=( -DBUILD_NUMBER="$(ver_cut 3)" ) + fi + cmake_src_configure +} + +src_install() { + cmake_src_install + + dodoc README.md CHANGES + + docinto scripts + dodoc -r scripts/server + docompress -x /usr/share/doc/${PF}/scripts + + local etcdir="/etc/murmur" + insinto ${etcdir} + doins scripts/${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-r2 murmur + newconfd "${FILESDIR}"/murmur.confd murmur + + systemd_dounit scripts/${PN}.service + newtmpfiles "${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() { + tmpfiles_process ${PN}.conf + readme.gentoo_print_elog +} diff --git a/media-sound/murmur/murmur-9999.ebuild b/media-sound/murmur/murmur-9999.ebuild index 49460f4e5a97..50cc111347c0 100644 --- a/media-sound/murmur/murmur-9999.ebuild +++ b/media-sound/murmur/murmur-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -22,9 +22,9 @@ else 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/_*}" + S="${WORKDIR}/${MY_PN}-${PV/_*}.src" fi - KEYWORDS="~amd64 ~arm ~x86" + KEYWORDS="~amd64 ~x86" fi LICENSE="BSD" @@ -54,6 +54,7 @@ RDEPEND=" DEPEND="${RDEPEND} >=dev-libs/boost-1.41.0 + dev-qt/qttest:5 " BDEPEND=" acct-group/murmur @@ -90,10 +91,12 @@ src_prepare() { sed \ -e 's:mumble-server:murmur:g' \ -e 's:/var/run:/run:g' \ - -i "${S}"/scripts/murmur.{conf,ini.system} || die + -i "${S}"/scripts/murmur.{conf,ini} || die # Adjust systemd service file to our config location #689208 - sed "s@/etc/${PN}\.ini@/etc/${PN}/${PN}.ini@" \ + sed \ + -e "s@/etc/${PN}\.ini@/etc/${PN}/${PN}.ini@" \ + -e "s@murmurd@mumble-server@" \ -i scripts/${PN}.service || die cmake_src_prepare @@ -115,7 +118,9 @@ src_configure() { -Dserver="ON" -Dzeroconf="$(usex zeroconf)" ) - + if [[ "${PV}" != 9999 ]] ; then + mycmakeargs+=( -DBUILD_NUMBER="$(ver_cut 3)" ) + fi cmake_src_configure } @@ -130,7 +135,7 @@ src_install() { local etcdir="/etc/murmur" insinto ${etcdir} - newins scripts/${PN}.ini.system ${PN}.ini + doins scripts/${PN}.ini insinto /etc/logrotate.d/ newins "${FILESDIR}"/murmur.logrotate murmur @@ -141,7 +146,7 @@ src_install() { insinto /usr/share/murmur/ doins src/murmur/Murmur.ice - newinitd "${FILESDIR}"/murmur.initd-r1 murmur + newinitd "${FILESDIR}"/murmur.initd-r2 murmur newconfd "${FILESDIR}"/murmur.confd murmur systemd_dounit scripts/${PN}.service |