diff options
| author |   Timo Gurr <tgurr@gentoo.org> | 2008-10-31 20:25:08 +0000 |
|---|---|---|
| committer | Timo Gurr <tgurr@gentoo.org> | 2008-10-31 20:25:08 +0000 |
| commit | f6b43bdebbdd64c4bd24254765352542e3d7ba34 (patch) | |
| tree | 12ba6b4bbfaca8cd7b78408c1777021e5825d5ea /media-sound/murmur | |
| parent | don't inherit elisp-common, bug 184167 (diff) | |
| download | gentoo-2-f6b43bdebbdd64c4bd24254765352542e3d7ba34.tar.gz gentoo-2-f6b43bdebbdd64c4bd24254765352542e3d7ba34.tar.bz2 gentoo-2-f6b43bdebbdd64c4bd24254765352542e3d7ba34.zip | |
Fix dbus usage in init script and introduce ice USE flag. Thanks Dennis Schridde, Atman and Sascha Jüngling.
(Portage version: 2.2_rc12/cvs/Linux 2.6.27-gentoo-r1 x86_64)
Diffstat (limited to 'media-sound/murmur')
| -rw-r--r-- | media-sound/murmur/ChangeLog | 7 | ||||
| -rw-r--r-- | media-sound/murmur/files/murmur.initd | 4 | ||||
| -rw-r--r-- | media-sound/murmur/metadata.xml | 2 | ||||
| -rw-r--r-- | media-sound/murmur/murmur-1.1.6.ebuild | 12 |
4 files changed, 17 insertions, 8 deletions
diff --git a/media-sound/murmur/ChangeLog b/media-sound/murmur/ChangeLog index b4f6dc72c91a..b454d8f0495f 100644 --- a/media-sound/murmur/ChangeLog +++ b/media-sound/murmur/ChangeLog @@ -1,6 +1,11 @@ # 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.8 2008/10/22 23:34:35 tgurr Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/murmur/ChangeLog,v 1.9 2008/10/31 20:25:08 tgurr Exp $ + + 31 Oct 2008; Timo Gurr <tgurr@gentoo.org> files/murmur.initd, + metadata.xml, murmur-1.1.6.ebuild: + Fix dbus usage in init script and introduce ice USE flag. Thanks Dennis + Schridde, Atman and Sascha Jüngling. 22 Oct 2008; Timo Gurr <tgurr@gentoo.org> metadata.xml, murmur-1.1.6.ebuild: diff --git a/media-sound/murmur/files/murmur.initd b/media-sound/murmur/files/murmur.initd index f674995f4982..38054eac3f02 100644 --- a/media-sound/murmur/files/murmur.initd +++ b/media-sound/murmur/files/murmur.initd @@ -3,8 +3,8 @@ opts="reload" depend() { - need dbus localmount net - use logger + need localmount net + use dbus logger after bootmisc mysql } diff --git a/media-sound/murmur/metadata.xml b/media-sound/murmur/metadata.xml index 9c1eecbe2683..92bdc20abdaa 100644 --- a/media-sound/murmur/metadata.xml +++ b/media-sound/murmur/metadata.xml @@ -9,6 +9,8 @@ Mumble is a low-latency, high quality voice chat software primarily intended for use while gaming. </longdescription> <use> + <flag name='ice'>Use <pkg>dev-cpp/Ice</pkg> to enable remote control + capabilities</flag> <flag name='logrotate'>Use <pkg>app-admin/logrotate</pkg> for rotating logs</flag> </use> diff --git a/media-sound/murmur/murmur-1.1.6.ebuild b/media-sound/murmur/murmur-1.1.6.ebuild index f477321d4ab0..abbd1db19437 100644 --- a/media-sound/murmur/murmur-1.1.6.ebuild +++ b/media-sound/murmur/murmur-1.1.6.ebuild @@ -1,6 +1,6 @@ # 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.3 2008/10/22 23:34:35 tgurr Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/murmur/murmur-1.1.6.ebuild,v 1.4 2008/10/31 20:25:08 tgurr Exp $ EAPI="2" @@ -16,16 +16,17 @@ SRC_URI="mirror://sourceforge/${MY_PN}/${MY_P}.tar.gz" LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="debug logrotate pch" +IUSE="debug +ice logrotate pch" -RDEPEND="dev-cpp/Ice - dev-libs/boost +RDEPEND=" || ( ( x11-libs/qt-core:4[ssl] x11-libs/qt-dbus:4 || ( x11-libs/qt-sql:4[sqlite] x11-libs/qt-sql:4[mysql] ) ) =x11-libs/qt-4.3*:4[dbus,ssl,sqlite3] =x11-libs/qt-4.3*:4[dbus,ssl,mysql] ) - logrotate? ( app-admin/logrotate )" + ice? ( dev-cpp/Ice dev-libs/boost ) + logrotate? ( app-admin/logrotate ) +" DEPEND="${RDEPEND}" @@ -46,6 +47,7 @@ src_prepare() { src_configure() { use debug && conf_add="${conf_add} symbols debug" || conf_add="${conf_add} release" + use ice || conf_add="${conf_add} no-ice" use pch || echo "CONFIG-=precompile_header" >> src/mumble.pri eqmake4 main.pro -recursive \ |