Version bump.

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 5270BA51)

2 files changed, 141 insertions, 2 deletions

diff --git a/media-sound/murmur/ChangeLog b/media-sound/murmur/ChangeLog
index 67af4aab9ba6..9b9cf8b701ed 100644
--- a/media-sound/murmur/ChangeLog
+++ b/media-sound/murmur/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/murmur
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/murmur/ChangeLog,v 1.51 2013/11/17 23:50:12 tgurr Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/murmur/ChangeLog,v 1.52 2014/02/07 16:43:27 tgurr Exp $
+
+*murmur-1.2.5 (07 Feb 2014)
+
+  07 Feb 2014; Timo Gurr <tgurr@gentoo.org> +murmur-1.2.5.ebuild:
+  Version bump.
 
   17 Nov 2013; Timo Gurr <tgurr@gentoo.org> -murmur-1.2.3-r4.ebuild,
   -murmur-1.2.4.ebuild, -files/mumble-1.2.3-fix-cert-validation.patch,
diff --git a/media-sound/murmur/murmur-1.2.5.ebuild b/media-sound/murmur/murmur-1.2.5.ebuild
new file mode 100644
index 000000000000..1cbbb8217c61
--- /dev/null
+++ b/media-sound/murmur/murmur-1.2.5.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/murmur/murmur-1.2.5.ebuild,v 1.1 2014/02/07 16:43:27 tgurr Exp $
+
+EAPI="5"
+
+QT_MINIMAL="4.6"
+
+inherit eutils qt4-r2 systemd user readme.gentoo
+
+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
+	>=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() {
+	qt4-r2_src_prepare
+
+	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_compile() {
+	# parallel make workaround, upstream bug #3190498
+	emake -j1
+}
+
+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
+}