diff options
Diffstat (limited to 'media-sound/murmur')
-rw-r--r-- | media-sound/murmur/Manifest | 8 | ||||
-rw-r--r-- | media-sound/murmur/files/murmur.logrotate | 2 | ||||
-rw-r--r-- | media-sound/murmur/murmur-1.3.0_rc1.ebuild | 150 | ||||
-rw-r--r-- | media-sound/murmur/murmur-1.3.0_rc2-r1.ebuild (renamed from media-sound/murmur/murmur-1.3.0_rc2.ebuild) | 27 | ||||
-rw-r--r-- | media-sound/murmur/murmur-9999.ebuild | 34 |
5 files changed, 45 insertions, 176 deletions
diff --git a/media-sound/murmur/Manifest b/media-sound/murmur/Manifest index f78e732337af..da50c5ab091f 100644 --- a/media-sound/murmur/Manifest +++ b/media-sound/murmur/Manifest @@ -1,12 +1,10 @@ AUX murmur.confd 172 BLAKE2B 1f25ce417f1b9f504ea59d4e5216774f8eb2b00450577a1d137f645fbbd69f0991b510c35bad81ac739c868ce128f4de0c6b4e4095edcd977d3822fac622524c SHA512 4a05e2a640abf3f7a74c63b47ab87774718ad4e86f985c5308a2ba3167d816abedd9c35b07b8572f7789309ba91fa37bc0c1938493cc8d78844ecdeed7bd4171 AUX murmur.initd-r1 506 BLAKE2B fd483f5f1c43f1778a909c725abee43b7299251e70e3f4e365804e7da94f674035dbb953167f2143c2d00dfbb4e23d5ed3d378c8aa2acbafbae8e7cf93fab263 SHA512 e1178a42c10f4a62f9b937e977b9e13059cae501851a377aea221ae2bd2bf031a1574e1f29f6df1b0ee08406a6a88fae8fbffd8acd0546f9ff6b27189ef55653 -AUX murmur.logrotate 127 BLAKE2B eadd1ac994ff194a160ec609c4781d4b69c23eff405abc38fd9786f82cd2c1574759a5b11e7265bd5658e9f48fd0012746659facff7a8790ff6aed47a54ec04a SHA512 89f105c11da6da67d5e84faac2124840e0c447df492a80b71c277a2e3c9197d747bc31de0a26c80b79384838f1e0a20811fe1ffa66c74f3192eec1164f3f1911 +AUX murmur.logrotate 175 BLAKE2B b13282fc194ed7a576e22ac241285053a7882f670580b6a3004e8ce22b3cc5f3854f46aa2a89629931a0e8cdc826e2d4e1096e837aed41148d8ef87afd485676 SHA512 09bbc2f364e038dc81e55adb86210f4cdc178bd2dba770e373f6c411b2c21d08218fd9784fff0ba133b7e18c84ddc3b2ac86d9d67a99a3169d3be42bd7fe2863 AUX murmurd-dbus.service 297 BLAKE2B 30ca5427de360cacab404cfff42d8e2355f14def67156039ceff85cbdf77a89cde03f6c096eba0b9d0cce52283f039ea222298e3aa9a8eead7fb8b638ee5aa8c SHA512 e81031efa7cc2736748d5a5fdd001e28cf81430cf25f9f83b9aa8b94714dc787842e76c17c00e3b7a26192d8b4932f1e14bfdde207ee89680f2a696d4f9990a6 AUX murmurd-dbus.tmpfiles 33 BLAKE2B 4040c58c142ae051e3086bfb179a1b28fc97f997d2b4ccf0392fb30d6212ac937f3d8ec120699210bee333b224af73dc1b72a40f3bda1cb4f4e8e683ac09b262 SHA512 9bc78c99dd5d830e6ea0fff82e1fdc3c323b7952e54f139754d8d0dd5e5e75c3374e26ea5a404029c96766cbf3a08afdffd53b99fdca5cd9c97dd8a28b8fc410 AUX murmurd-no-dbus.service 222 BLAKE2B 11fc296fd5d5445347f077ff9d4aaea3364176dff9c28d06b6b2d0b4a8d0ff8ccd559c68a0fadddbc8363349d9c599c9ebd6da8e0055a680b18aa282e72875a5 SHA512 d58c04dde0286b07a494c99fff8b94cdf1c47f6fcacbb5552445b7e19421f2a9862186e7309886590bc33ae3c64c0c840a9a93c55b35ca600b7a8f9ec53dbab2 -DIST mumble-1.3.0-rc1.tar.gz 8638701 BLAKE2B 6c97c528e8b598bb86a7318e997067706216436b37aabb06931e509d1c713d0104aa599a72235dd0afd46b34779205bd622a496bf14fd54aa065d9ab1d869725 SHA512 e993b18b0ecf620d3a9a89f145c18b9ecde3aaf9b7217e235b7472908c81a365323c8683dd6fc9ed14b108160f8bf5244369c2a9ee57c22595550220d158516c DIST mumble-1.3.0-rc2.tar.gz 8759830 BLAKE2B 4df1001a174d042221a674a21dcdb7165742cba2428f778eb6ef7fcfe8128734f4207230222971fa97622af3ea81e40b676cc089e45704be3fecf76f97f72a36 SHA512 b31a92cbe9d2d973cb06e5f3bb237de22f0fa5f242e6a8141ffaa735268ca41097bda44445a73ea5dafef6ef3ff7a5050c52c7f9b9f5600d400e57aff6f2e4c4 -EBUILD murmur-1.3.0_rc1.ebuild 3361 BLAKE2B dde9b4c4867d3e5d6adc5fa3d631fd24073091bbef922df6cd3cbc4392eee61447f395ba12b7fb6f14683387c0967dba7415a034261a6a7221c7fae1152a6799 SHA512 e45eee4631d7a4c08ceff5b3e91601332dac18778495dae837d744a8af2d9bf8645653be14ded76dd30af18a4eed25d110e5253293f09db08a7f4add05302e15 -EBUILD murmur-1.3.0_rc2.ebuild 3269 BLAKE2B bcd647020380b09193036e30fa1fd86b2fe3fcd240b883fc1a7a20fc3aa0a041048632ce16605c1bc107bcf1b1ed923fc16e5f058b11fcc2864736d1e99b419a SHA512 4fed1a225e332f40df397838032f2ec64533a03f0ff34882cf3e752d86c50392b289bcbcd2fa25b4d8c71cf490319a68b37029e67088ecda4a48e21310ae5249 -EBUILD murmur-9999.ebuild 3269 BLAKE2B bcd647020380b09193036e30fa1fd86b2fe3fcd240b883fc1a7a20fc3aa0a041048632ce16605c1bc107bcf1b1ed923fc16e5f058b11fcc2864736d1e99b419a SHA512 4fed1a225e332f40df397838032f2ec64533a03f0ff34882cf3e752d86c50392b289bcbcd2fa25b4d8c71cf490319a68b37029e67088ecda4a48e21310ae5249 +EBUILD murmur-1.3.0_rc2-r1.ebuild 3565 BLAKE2B 4b8282c64999cf70a51fe234d23e0737b2c710984d188c733a97a90109120af9705eb21eef2a66da118043b64b6541fe372cabe92737f0981e5a9760d6cb6833 SHA512 b6fe723f3cf2e6468a47f2ffc0102d54f6fbc7cf374e5e97eaaa7e0853162f0604cf1b0db34e0b9c009f661a09c95ff0358cfd9dbf808ce9238c94b1f7f8ded3 +EBUILD murmur-9999.ebuild 3701 BLAKE2B 28c17e4ef71a4f38835fe66270873494718662321e7138e87c3d03017baa12da60eb5758274ca41b5860be0a13f500ae5b4a3edd735f3077fdf2b3029c88a36a SHA512 29c3ea8aea5c6a3da86d487a90a9fbf0d765ae31a73723e7b585f41fa36a5535605ec0efbbf4f0a3664d5e9bdd614d93cabf1220611981cf3e22acd0d5daa9ba MISC metadata.xml 597 BLAKE2B 6eece3d62949bfb7c01c6249764ee6e47ca0273972ed0aa2bae704ed7acb9267e7cef706d2c3eeafb5becd4695d8665c975f67e577ef3ce4def50e78ba1ce273 SHA512 d7ffb25e7b3919cb27417debe5b2f84f2f2c330e1a238583f154bb44b697a3b3c3749794baf896807874633b0659076e93c2845a56e49acb24047958d29d2beb diff --git a/media-sound/murmur/files/murmur.logrotate b/media-sound/murmur/files/murmur.logrotate index c6ca48bbfb57..a82cb1a336c4 100644 --- a/media-sound/murmur/files/murmur.logrotate +++ b/media-sound/murmur/files/murmur.logrotate @@ -3,6 +3,6 @@ notifempty sharedscripts postrotate - /etc/init.d/murmur reload > /dev/null + test -r /run/murmur/murmur.pid && kill -HUP $(cat /run/murmur/murmur.pid) &>/dev/null endscript } diff --git a/media-sound/murmur/murmur-1.3.0_rc1.ebuild b/media-sound/murmur/murmur-1.3.0_rc1.ebuild deleted file mode 100644 index 4ee163ac142e..000000000000 --- a/media-sound/murmur/murmur-1.3.0_rc1.ebuild +++ /dev/null @@ -1,150 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit qmake-utils systemd user 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" - S="${WORKDIR}/${MY_PN}-${PV/_*}" - fi - KEYWORDS="~amd64 ~arm ~x86" -fi - -LICENSE="BSD" -SLOT="0" -IUSE="+dbus debug +ice pch zeroconf" - -RDEPEND=" - >=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=" - virtual/pkgconfig" - -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. -" - -pkg_setup() { - enewgroup murmur - enewuser murmur -1 -1 /var/lib/murmur murmur -} - -src_prepare() { - default - - sed \ - -e 's:mumble-server:murmur:g' \ - -e 's:/var/run:/run:g' \ - -i "${S}"/scripts/murmur.{conf,ini} || 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=release - if use debug; then - dir=debug - fi - - dobin "${dir}"/murmurd - - insinto /etc/murmur/ - doins scripts/murmur.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 - - if use dbus; then - systemd_newunit "${FILESDIR}"/murmurd-dbus.service "${PN}".service - systemd_newtmpfilesd "${FILESDIR}"/murmurd-dbus.tmpfiles "${PN}".conf - else - systemd_newunit "${FILESDIR}"/murmurd-no-dbus.service "${PN}".service - fi - - 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 /etc/murmur/murmur.ini - fperms 640 /etc/murmur/murmur.ini - - doman man/murmurd.1 - - readme.gentoo_create_doc -} - -pkg_postinst() { - readme.gentoo_print_elog -} diff --git a/media-sound/murmur/murmur-1.3.0_rc2.ebuild b/media-sound/murmur/murmur-1.3.0_rc2-r1.ebuild index cfce5144e23e..0a7f6b035c25 100644 --- a/media-sound/murmur/murmur-1.3.0_rc2.ebuild +++ b/media-sound/murmur/murmur-1.3.0_rc2-r1.ebuild @@ -72,10 +72,20 @@ pkg_setup() { 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 + -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() { @@ -103,15 +113,12 @@ src_install() { dodoc -r scripts/server docompress -x /usr/share/doc/${PF}/scripts - local dir=release - if use debug; then - dir=debug - fi - + local dir="$(usex debug debug release)" dobin "${dir}"/murmurd - insinto /etc/murmur/ - doins scripts/murmur.ini + local etcdir="/etc/murmur" + insinto ${etcdir} + newins scripts/${PN}.ini.system ${PN}.ini insinto /etc/logrotate.d/ newins "${FILESDIR}"/murmur.logrotate murmur @@ -134,8 +141,8 @@ src_install() { # Fix permissions on config file as it might contain passwords. # (bug #559362) - fowners root:murmur /etc/murmur/murmur.ini - fperms 640 /etc/murmur/murmur.ini + fowners root:murmur ${etcdir}/murmur.ini + fperms 640 ${etcdir}/murmur.ini doman man/murmurd.1 diff --git a/media-sound/murmur/murmur-9999.ebuild b/media-sound/murmur/murmur-9999.ebuild index cfce5144e23e..e0d9d8f503ee 100644 --- a/media-sound/murmur/murmur-9999.ebuild +++ b/media-sound/murmur/murmur-9999.ebuild @@ -54,6 +54,13 @@ DEPEND="${RDEPEND} BDEPEND=" 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 @@ -72,10 +79,20 @@ pkg_setup() { 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 + -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() { @@ -103,15 +120,12 @@ src_install() { dodoc -r scripts/server docompress -x /usr/share/doc/${PF}/scripts - local dir=release - if use debug; then - dir=debug - fi - + local dir="$(usex debug debug release)" dobin "${dir}"/murmurd - insinto /etc/murmur/ - doins scripts/murmur.ini + local etcdir="/etc/murmur" + insinto ${etcdir} + newins scripts/${PN}.ini.system ${PN}.ini insinto /etc/logrotate.d/ newins "${FILESDIR}"/murmur.logrotate murmur @@ -134,8 +148,8 @@ src_install() { # Fix permissions on config file as it might contain passwords. # (bug #559362) - fowners root:murmur /etc/murmur/murmur.ini - fperms 640 /etc/murmur/murmur.ini + fowners root:murmur ${etcdir}/murmur.ini + fperms 640 ${etcdir}/murmur.ini doman man/murmurd.1 |