public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: media-sound/murmur/, media-sound/murmur/files/
@ 2016-02-09 14:30 Lars Wendler
  0 siblings, 0 replies; 3+ messages in thread
From: Lars Wendler @ 2016-02-09 14:30 UTC (permalink / raw
  To: gentoo-commits

commit:     c1d3ba79d81a650d24b0ff38c3d9353da7cb44b2
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Feb  9 14:22:09 2016 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Feb  9 14:30:21 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1d3ba79

media-sound/murmur: Bump to version 1.2.13

Package-Manager: portage-2.2.27
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 media-sound/murmur/Manifest              |   1 +
 media-sound/murmur/files/murmur.initd-r1 |   2 +-
 media-sound/murmur/murmur-1.2.13.ebuild  | 127 +++++++++++++++++++++++++++++++
 3 files changed, 129 insertions(+), 1 deletion(-)

diff --git a/media-sound/murmur/Manifest b/media-sound/murmur/Manifest
index 0d797ee..e471d47 100644
--- a/media-sound/murmur/Manifest
+++ b/media-sound/murmur/Manifest
@@ -1,4 +1,5 @@
 DIST mumble-1.2.10.tar.gz 3195427 SHA256 c6367a63ef54aac8e6d556066297e536a8c288495d53490219a113e43aa85b04 SHA512 d4ff0572fd744cbf3473b25353b2ab8b2fc2d68921179c02f3047460d63c9e388d6d9e04fc4fb4b27eeaa63baf74d8bf3dc098cf24285619aef1b29f636b972e WHIRLPOOL 9aadb47756c7d1939c075079911a5851d619f973359e6346d209e5baaf7db9a80b2d622befd4e6ea10480875b1ea6479d9b4785111d9f88d9d009b17ecbc774a
 DIST mumble-1.2.11.tar.gz 3196837 SHA256 e8ec96ec367151064352195d3f84aa9fe4e456e70c57037e0d0cb84155d603e6 SHA512 72500362dc137909465f8b932648cee6e9dd4d2c57e6f85a73de21cfe1e99ca8e290f899d50ae237729b24e86406ffedca8024977e94a30ffc863525c82c2995 WHIRLPOOL 7a32e57f8744c2e1b7dd8088334f062266af30f7cc2f64191f9e74e340b01e4b0253b6f23b8edf80dc20082ffd6d44f30e447a11a40d7c4710c208c649da4f3a
 DIST mumble-1.2.12.tar.gz 3197498 SHA256 5981ec2e8e62a0b47f1bfa9240721a885c9edb89e14cdf5db149e0ee723d5727 SHA512 fb800fc7b7eab57faefdd8fec1f6f28d7485a872faef8f7a8bfa27ff42d06813be8aca59d28bef2f857e467a5a7ba70e36b02b8391752ce15ee93f3d118501e0 WHIRLPOOL 46d1177e955e0e359422b94c656403e9788aa9188c8dc7e923fc9e0f5a6cbe9e7b393953c95fee67cdff7dd00a1fd6d4a9f803491c9deb8d3c370d6dfd7eeafa
+DIST mumble-1.2.13.tar.gz 3197575 SHA256 b7db708fc3760cb6a5f81142a8bac0866f0d82d3aa401773a38c75c416020146 SHA512 0315a7027add1c11f340930d52256dd02fbd5433a38e9043e5cc98342c18ceee04f7635948f01717faf85255271eb5bcf8dfb9dfba67f51c9da39e4779d33f79 WHIRLPOOL 75ae2a7c67e30026908995dda0554a818668ae99449ebd9f1e2bdea48f421e5b0f51b1251338118f2627df0b4e27d88302f2dbb602b9ce1b6f211c6bc911541e
 DIST mumble-1.2.5.tar.gz 3200216 SHA256 915156946f7662c2488e4c40c95cb95c4ff00532789515da7df775a36d544faf SHA512 bc1761f1e2fc833124ff2ff9af994be59dc9ef96a1ed49316d5383d9b5d91c37ddce87bf6afefc99315824a2a52c615162b2e6050c78f90beca591b58229e7b1 WHIRLPOOL 1f4b226c4036d35a73f65beb4ea66ec0c4363c6122320e8d70a52e0f40b0e2e550282206dcf158bf5a4bb1109202c38a9451374c1bbce96bc559c576a18346c3

diff --git a/media-sound/murmur/files/murmur.initd-r1 b/media-sound/murmur/files/murmur.initd-r1
index 29b2f9d..43ffb3a 100644
--- a/media-sound/murmur/files/murmur.initd-r1
+++ b/media-sound/murmur/files/murmur.initd-r1
@@ -1,4 +1,4 @@
-#!/sbin/runscript
+#!/sbin/openrc-run
 
 pidfile="/run/murmur/murmur.pid"
 command="/usr/bin/murmurd"

diff --git a/media-sound/murmur/murmur-1.2.13.ebuild b/media-sound/murmur/murmur-1.2.13.ebuild
new file mode 100644
index 0000000..e95b4fa
--- /dev/null
+++ b/media-sound/murmur/murmur-1.2.13.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit eutils qmake-utils systemd user readme.gentoo-r1
+
+MY_P="${PN/murmur/mumble}-${PV/_/~}"
+
+DESCRIPTION="Mumble is an open source, low-latency, high quality voice chat software"
+HOMEPAGE="http://mumble.sourceforge.net/"
+SRC_URI="http://mumble.info/snapshot/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~x86"
+IUSE="+dbus debug +ice pch zeroconf"
+
+RDEPEND=">=dev-libs/openssl-1.0.0b:0=
+	>=dev-libs/protobuf-2.2.0
+	sys-apps/lsb-release
+	>=sys-libs/libcap-2.15
+	dev-qt/qtcore:4[ssl]
+	|| ( dev-qt/qtsql:4[sqlite] dev-qt/qtsql:4[mysql] )
+	dev-qt/qtxmlpatterns:4
+	dbus? ( dev-qt/qtdbus:4 )
+	ice? ( dev-libs/Ice )
+	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )"
+
+DEPEND="${RDEPEND}
+	>=dev-libs/boost-1.41.0
+	virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.2.4-ice-3.5.0-compat.patch
+	"${FILESDIR}"/${PN}-1.2.4-ice-3.5.1-compat.patch
+)
+
+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.system} || die
+}
+
+src_configure() {
+	local conf_add
+
+	use dbus || conf_add="${conf_add} no-dbus"
+	use debug && conf_add="${conf_add} symbols debug" || conf_add="${conf_add} release"
+	use ice || conf_add="${conf_add} no-ice"
+	use pch || conf_add="${conf_add} no-pch"
+	use zeroconf || conf_add="${conf_add} no-bonjour"
+
+	eqmake4 main.pro -recursive \
+		CONFIG+="${conf_add} no-client"
+}
+
+src_install() {
+	dodoc README CHANGES
+
+	docinto scripts
+	dodoc scripts/*.php scripts/*.pl
+
+	local dir
+	if use debug; then
+		dir=debug
+	else
+		dir=release
+	fi
+
+	dobin "${dir}"/murmurd
+
+	insinto /etc/murmur/
+	newins scripts/murmur.ini.system 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
+
+	doman man/murmurd.1
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/murmur/, media-sound/murmur/files/
@ 2016-10-22 11:24 David Seifert
  0 siblings, 0 replies; 3+ messages in thread
From: David Seifert @ 2016-10-22 11:24 UTC (permalink / raw
  To: gentoo-commits

commit:     2a56222bddc768a4ac73fb7109b48d55eb0989b0
Author:     Robert Förster <Dessa <AT> gmake <DOT> de>
AuthorDate: Sat Oct 22 02:08:54 2016 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Oct 22 11:24:07 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a56222b

media-sound/murmur: fix build with Ice-3.6.3, add subslot dep

Package-Manager: portage-2.3.2
Closes: https://github.com/gentoo/gentoo/pull/2628

Signed-off-by: David Seifert <soap <AT> gentoo.org>

 media-sound/murmur/files/murmur-1.2.17-ice-3.6.3-compat.patch | 11 +++++++++++
 media-sound/murmur/murmur-1.2.17.ebuild                       |  5 ++---
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/media-sound/murmur/files/murmur-1.2.17-ice-3.6.3-compat.patch b/media-sound/murmur/files/murmur-1.2.17-ice-3.6.3-compat.patch
new file mode 100644
index 00000000..a8ad91e
--- /dev/null
+++ b/media-sound/murmur/files/murmur-1.2.17-ice-3.6.3-compat.patch
@@ -0,0 +1,11 @@
+--- mumble-1.2.17/src/murmur/murmur.pro	2016-09-24 14:37:47.000000000 +0200
++++ mumble-1.2.17.new/src/murmur/murmur.pro	2016-10-21 13:52:31.470049513 +0200
+@@ -74,7 +74,7 @@
+ 	win32 {
+ 		slice.commands = slice2cpp --checksum -I\"$$ICE_PATH/slice\" ${QMAKE_FILE_NAME}
+ 	} else {
+-		slice.commands = slice2cpp --checksum -I/usr/local/share/Ice -I/usr/share/Ice/slice -I/usr/share/slice -I/usr/share/Ice-3.4.1/slice/ -I/usr/share/Ice-3.3.1/slice/ -I/usr/share/Ice-3.4.2/slice/ ${QMAKE_FILE_NAME}
++		slice.commands = slice2cpp --checksum -I/usr/local/share/Ice -I/usr/share/Ice/slice -I/usr/share/slice -I/usr/share/Ice-3.4.1/slice/ -I/usr/share/Ice-3.3.1/slice/ -I/usr/share/Ice-3.4.2/slice/ -I/usr/share/Ice-3.5.1/slice/ -I/usr/share/Ice-3.6.3/slice/ ${QMAKE_FILE_NAME}
+ 	}
+ 	slice.input = SLICEFILES
+ 	slice.CONFIG *= no_link explicit_dependencies

diff --git a/media-sound/murmur/murmur-1.2.17.ebuild b/media-sound/murmur/murmur-1.2.17.ebuild
index 7ac04b7..4cfe620 100644
--- a/media-sound/murmur/murmur-1.2.17.ebuild
+++ b/media-sound/murmur/murmur-1.2.17.ebuild
@@ -25,7 +25,7 @@ RDEPEND=">=dev-libs/openssl-1.0.0b:0=
 	|| ( dev-qt/qtsql:4[sqlite] dev-qt/qtsql:4[mysql] )
 	dev-qt/qtxmlpatterns:4
 	dbus? ( dev-qt/qtdbus:4 )
-	ice? ( dev-libs/Ice )
+	ice? ( dev-libs/Ice:= )
 	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )"
 
 DEPEND="${RDEPEND}
@@ -35,8 +35,7 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/${MY_P}"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-1.2.4-ice-3.5.0-compat.patch
-	"${FILESDIR}"/${PN}-1.2.4-ice-3.5.1-compat.patch
+	"${FILESDIR}"/${P}-ice-3.6.3-compat.patch
 )
 
 DOC_CONTENTS="


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/murmur/, media-sound/murmur/files/
@ 2022-01-31 21:15 Lars Wendler
  0 siblings, 0 replies; 3+ messages in thread
From: Lars Wendler @ 2022-01-31 21:15 UTC (permalink / raw
  To: gentoo-commits

commit:     5d8b0afb38cc95f2143fc7650d1c7fdb1946ce0d
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 31 21:15:17 2022 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon Jan 31 21:15:48 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d8b0afb

media-sound/murmur: Revbump to fix init script

Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 media-sound/murmur/files/murmur.initd-r2           | 24 ++++++++++++++++++++++
 ...mur-1.4.230.ebuild => murmur-1.4.230-r1.ebuild} |  2 +-
 media-sound/murmur/murmur-9999.ebuild              |  2 +-
 3 files changed, 26 insertions(+), 2 deletions(-)

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.ebuild b/media-sound/murmur/murmur-1.4.230-r1.ebuild
similarity index 98%
rename from media-sound/murmur/murmur-1.4.230.ebuild
rename to media-sound/murmur/murmur-1.4.230-r1.ebuild
index 3fd6f4ad9a21..7192a806faa5 100644
--- a/media-sound/murmur/murmur-1.4.230.ebuild
+++ b/media-sound/murmur/murmur-1.4.230-r1.ebuild
@@ -142,7 +142,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

diff --git a/media-sound/murmur/murmur-9999.ebuild b/media-sound/murmur/murmur-9999.ebuild
index 3fd6f4ad9a21..7192a806faa5 100644
--- a/media-sound/murmur/murmur-9999.ebuild
+++ b/media-sound/murmur/murmur-9999.ebuild
@@ -142,7 +142,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


^ permalink raw reply related	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2022-01-31 21:15 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-01-31 21:15 [gentoo-commits] repo/gentoo:master commit in: media-sound/murmur/, media-sound/murmur/files/ Lars Wendler
  -- strict thread matches above, loose matches on Subject: below --
2016-10-22 11:24 David Seifert
2016-02-09 14:30 Lars Wendler

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