Version bump, fixing bug #207627 (Thanks to every single person participating). Remove old.

(Portage version: 2.2_rc12/cvs/Linux 2.6.26-gentoo-r1 x86_64)

9 files changed, 170 insertions, 144 deletions

diff --git a/media-sound/murmur/ChangeLog b/media-sound/murmur/ChangeLog
index b59ad0cf91bf..c1edbf7de3bc 100644
--- a/media-sound/murmur/ChangeLog
+++ b/media-sound/murmur/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-sound/murmur
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/murmur/ChangeLog,v 1.5 2008/03/15 17:47:55 drizzt Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/murmur/ChangeLog,v 1.6 2008/10/16 22:42:35 tgurr Exp $
+
+*murmur-1.1.6 (16 Oct 2008)
+
+  16 Oct 2008; Timo Gurr <tgurr@gentoo.org> files/murmur.confd,
+  +files/murmur.initd, +files/murmur.logrotate, -files/murmur.rc,
+  metadata.xml, -murmur-0.9.4.ebuild, -murmur-0.9.4-r1.ebuild,
+  +murmur-1.1.6.ebuild:
+  Version bump, fixing bug #207627 (Thanks to every single person
+  participating). Remove old.
 
   15 Mar 2008; Timothy Redaelli <drizzt@gentoo.org> metadata.xml:
   Drop maintainership
diff --git a/media-sound/murmur/files/murmur.confd b/media-sound/murmur/files/murmur.confd
index 361059149f08..4e8c0cead76f 100644
--- a/media-sound/murmur/files/murmur.confd
+++ b/media-sound/murmur/files/murmur.confd
@@ -1,12 +1,12 @@
-# where to look for config files
-MURMUR_CONFDIR=/etc/murmur
+# where to look for the config file
+MURMUR_CONF=/etc/murmur/murmur.ini
 
-# were to log
-MURMUR_LOGFILE=/var/log/murmur.log
+# where to look for the pid file
+MURMUR_PID=/var/run/murmur/murmur.pid
 
 # run as this user
 MURMUR_USER=murmur
 
 # HOME directory of MURMUR_USER
-# needs to be set for start-stop-daemon!
-MURMUR_HOMEDIR=/var/lib/murmur
+MURMUR_HOME=/var/lib/murmur
+
diff --git a/media-sound/murmur/files/murmur.initd b/media-sound/murmur/files/murmur.initd
new file mode 100644
index 000000000000..f674995f4982
--- /dev/null
+++ b/media-sound/murmur/files/murmur.initd
@@ -0,0 +1,36 @@
+#!/sbin/runscript
+
+opts="reload"
+
+depend() {
+	need dbus localmount net
+	use logger
+	after bootmisc mysql
+}
+
+start() {
+	ebegin "Starting Murmur"
+	start-stop-daemon --start --pidfile "${MURMUR_PID}" \
+		--user "${MURMUR_USER}" --env HOME="${MURMUR_HOME}" \
+		--exec /usr/bin/murmurd -- -ini "${MURMUR_CONF}"
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping Murmur"
+	start-stop-daemon --stop --pidfile "${MURMUR_PID}" \
+		--exec /usr/bin/murmurd
+	eend $?
+}
+
+reload() {
+	if [ ! -f "${MURMUR_PID}" ]; then
+		eerror "Murmur is not running"
+	return 1
+	fi
+	ebegin "Reloading Murmur"
+	start-stop-daemon --stop --oknodo --signal HUP --pidfile "${MURMUR_PID}" \
+		--exec /usr/bin/murmurd
+	eend $?
+}
+
diff --git a/media-sound/murmur/files/murmur.logrotate b/media-sound/murmur/files/murmur.logrotate
new file mode 100644
index 000000000000..c6ca48bbfb57
--- /dev/null
+++ b/media-sound/murmur/files/murmur.logrotate
@@ -0,0 +1,8 @@
+/var/log/murmur/*.log {
+	missingok
+	notifempty
+	sharedscripts
+	postrotate
+		/etc/init.d/murmur reload > /dev/null
+	endscript
+}
diff --git a/media-sound/murmur/files/murmur.rc b/media-sound/murmur/files/murmur.rc
deleted file mode 100644
index 9b0748af3119..000000000000
--- a/media-sound/murmur/files/murmur.rc
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/sbin/runscript
-
-depend() {
-	need net
-	need localmount
-	after bootmisc
-}
-
-start() {
-	ebegin "Starting Murmur voice chat server"
-	start-stop-daemon --start --make-pidfile --pidfile /var/run/murmur.pid \
-		--chuid $MURMUR_USER --env HOME=$MURMUR_HOMEDIR \
-		--exec /usr/bin/murmur -- -ini $MURMUR_CONFDIR/murmur.ini &> $MURMUR_LOGFILE &
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping Murmur voice chat server"
-	start-stop-daemon --stop --exec /usr/bin/murmur \
-		--pidfile /var/run/murmur.pid
-	eend $?
-	#rm /var/run/murmur.pid
-}
-
-#restart() {
-#  #(Commands necessary to restart the service)
-#}
diff --git a/media-sound/murmur/metadata.xml b/media-sound/murmur/metadata.xml
index 60479d553136..db54b8e670ef 100644
--- a/media-sound/murmur/metadata.xml
+++ b/media-sound/murmur/metadata.xml
@@ -5,4 +5,8 @@
 <longdescription lang="en">
 Mumble is a low-latency, high quality voice chat software primarily intended for use while gaming.
 </longdescription>
+<use>
+	<flag name='logrotate'>Use <pkg>app-admin/logrotate</pkg> for rotating
+		logs</flag>
+</use>
 </pkgmetadata>
diff --git a/media-sound/murmur/murmur-0.9.4-r1.ebuild b/media-sound/murmur/murmur-0.9.4-r1.ebuild
deleted file mode 100644
index 8e6217a0cc61..000000000000
--- a/media-sound/murmur/murmur-0.9.4-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/murmur/murmur-0.9.4-r1.ebuild,v 1.1 2007/04/18 10:30:31 drizzt Exp $
-
-inherit eutils toolchain-funcs
-
-MY_P=mumble-${PV}
-
-DESCRIPTION="voice chat software for gaming written in Qt4 (server)"
-HOMEPAGE="http://mumble.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="pch"
-
-DEPEND="=x11-libs/qt-4*"
-
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"/${MY_P}
-
-pkg_setup() {
-	if ! built_with_use -o =x11-libs/qt-4* sqlite sqlite3; then
-		echo
-		ewarn "You need to build Qt4 with the sqlite and/or sqlite3 use flag"
-		echo
-		die "Your Qt4 has no sqlite support"
-	fi
-	enewgroup murmur
-	enewuser murmur -1 -1 /var/lib/murmur murmur
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	use pch || sed -i -e '3s: precompile_header$::' mumble.pri
-}
-
-src_compile() {
-	qmake murmur.pro 	|| die "qmake failed"
-	emake CC="$(tc-getCC) ${CFLAGS}" \
-		CXX="$(tc-getCXX) ${CXXFLAGS}" \
-		LINK="$(tc-getCXX)" \
-		LFLAGS="${LDFLAGS}" || die "emake failed"
-}
-
-src_install() {
-	dodoc README CHANGES	|| die "installing docs failed"
-	dobin murmur			|| die "installing failed"
-	insinto /etc/murmur
-	doins murmur.ini
-	newinitd "${FILESDIR}"/murmur.rc murmur
-	newconfd "${FILESDIR}"/murmur.confd murmur
-}
diff --git a/media-sound/murmur/murmur-0.9.4.ebuild b/media-sound/murmur/murmur-0.9.4.ebuild
deleted file mode 100644
index 8e71461dec6d..000000000000
--- a/media-sound/murmur/murmur-0.9.4.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/murmur/murmur-0.9.4.ebuild,v 1.3 2007/02/28 09:24:31 drizzt Exp $
-
-inherit eutils toolchain-funcs
-
-MY_P=mumble-${PV}
-
-DESCRIPTION="voice chat software for gaming written in Qt4 (server)"
-HOMEPAGE="http://mumble.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="pch"
-
-DEPEND="=x11-libs/qt-4*"
-
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"/${MY_P}
-
-pkg_setup() {
-	if ! built_with_use -o =x11-libs/qt-4* sqlite sqlite3; then
-		echo
-		ewarn "You need to build Qt4 with the sqlite and/or sqlite3 use flag"
-		echo
-		die "Your Qt4 has no sqlite support"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	use pch || sed -i -e '3s: precompile_header$::' mumble.pri
-}
-
-src_compile() {
-	qmake murmur.pro 	|| die "qmake failed"
-	emake CC="$(tc-getCC) ${CFLAGS}" \
-		CXX="$(tc-getCXX) ${CXXFLAGS}" \
-		LINK="$(tc-getCXX)" \
-		LFLAGS="${LDFLAGS}" || die "emake failed"
-}
-
-src_install() {
-	dodoc README CHANGES	|| die "installing docs failed"
-	dobin murmur			|| die "installing failed"
-	insinto /etc/murmur
-	doins murmur.ini
-	newinitd "${FILESDIR}"/murmur.rc murmur
-	newconfd "${FILESDIR}"/murmur.confd murmur
-}
diff --git a/media-sound/murmur/murmur-1.1.6.ebuild b/media-sound/murmur/murmur-1.1.6.ebuild
new file mode 100644
index 000000000000..063bff323a2a
--- /dev/null
+++ b/media-sound/murmur/murmur-1.1.6.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/murmur/murmur-1.1.6.ebuild,v 1.1 2008/10/16 22:42:35 tgurr Exp $
+
+EAPI="2"
+
+inherit eutils qt4
+
+MY_PN=mumble
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Voice chat software for gaming written in Qt4 (server)"
+HOMEPAGE="http://mumble.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug logrotate pch"
+
+RDEPEND="dev-libs/boost
+	|| ( ( x11-libs/qt-core:4[ssl]
+			x11-libs/qt-sql:4
+			x11-libs/qt-dbus:4 )
+		( >=x11-libs/qt-4.3:4 ) )
+	logrotate? ( app-admin/logrotate )
+	dev-cpp/Ice"
+
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}"/${MY_P}
+
+pkg_setup() {
+	if ! has_version 'x11-libs/qt-sql[sqlite]' && ! has_version 'x11-libs/qt-sql[mysql]'; then
+		eerror "You need to built x11-libs/qt-sql with USE \"sqlite\" or \"mysql\" for a database backend."
+		die "No database backend selected."
+	fi
+
+	enewgroup murmur
+	enewuser murmur -1 -1 /var/lib/murmur murmur
+}
+
+src_prepare() {
+	sed -i \
+		-e 's:mumble-server:murmur:g' \
+		scripts/murmur.conf \
+		scripts/murmur.ini.system \
+		|| die "sed failed."
+}
+
+src_configure() {
+	use debug || conf_add="${conf_add} release"
+	use debug && conf_add="${conf_add} symbols debug"
+	use pch || echo "CONFIG-=precompile_header" >> src/mumble.pri
+
+	eqmake4 main.pro -recursive \
+		CONFIG+="${conf_add} no-client no-bundled-speex" \
+		|| die "eqmake4 failed."
+}
+
+src_install() {
+	dodoc README CHANGES || die "Installing docs failed."
+	docinto scripts ; dodoc scripts/*.php scripts/*.pl
+
+	local dir
+	if use debug; then
+		dir=debug
+	else
+		dir=release
+	fi
+
+	dobin "${dir}"/murmurd || die "Installing murmurd failed."
+
+	insinto /etc/murmur/
+	newins scripts/murmur.ini.system murmur.ini
+
+	if use logrotate; then
+		insinto /etc/logrotate.d/
+		newins "${FILESDIR}"/murmur.logrotate murmur
+	fi
+
+	insinto /etc/dbus-1/system.d/
+	doins scripts/murmur.conf
+
+	newinitd "${FILESDIR}"/murmur.initd murmur
+	newconfd "${FILESDIR}"/murmur.confd murmur
+
+	keepdir /var/lib/murmur /var/run/murmur /var/log/murmur
+	fowners -R murmur /var/lib/murmur /var/run/murmur /var/log/murmur
+	fperms 750 /var/lib/murmur /var/run/murmur /var/log/murmur
+
+	doman man/murmurd.1
+}
+
+pkg_postinst() {
+	echo
+	elog "Useful scripts are located in /usr/share/doc/murmur-${PV}/scripts."
+	elog "Please execute:"
+	elog "murmurd -ini /etc/murmur/murmur.ini -supw <pw>"
+	elog "chown murmur:murmur /var/lib/murmur/murmur.sqlite"
+	elog "to set the inbuild 'SuperUser' password before starting murmur."
+	elog "Please restart dbus before starting murmur,"
+	elog "or dbus registration will fail."
+	echo
+}
+