Version bump, also fixing bug #311849 thanks to Perry Venters.

Package-Manager: portage-2.2.0_alpha24/cvs/Linux x86_64

3 files changed, 123 insertions, 3 deletions

diff --git a/media-sound/murmur/ChangeLog b/media-sound/murmur/ChangeLog
index 43555bf5a828..c4723312d52f 100644
--- a/media-sound/murmur/ChangeLog
+++ b/media-sound/murmur/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/murmur
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/murmur/ChangeLog,v 1.23 2010/06/08 08:30:08 dev-zero Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/murmur/ChangeLog,v 1.24 2011/02/23 21:10:19 tgurr Exp $
+
+*murmur-1.2.3 (23 Feb 2011)
+
+  23 Feb 2011; Timo Gurr <tgurr@gentoo.org> +murmur-1.2.3.ebuild:
+  Version bump, also fixing bug #311849 thanks to Perry Venters.
 
   08 Jun 2010; Tiziano Müller <dev-zero@gentoo.org> murmur-1.1.8.ebuild,
   murmur-1.2.2.ebuild:
diff --git a/media-sound/murmur/Manifest b/media-sound/murmur/Manifest
index 1bc773aad7f5..d56011f69f35 100644
--- a/media-sound/murmur/Manifest
+++ b/media-sound/murmur/Manifest
@@ -3,7 +3,9 @@ AUX murmur.initd 679 RMD160 8f9a9eb252201fa9714137d9578edf680c8be6c8 SHA1 5a5239
 AUX murmur.logrotate 127 RMD160 1053af850dad13fa9d1232dc176752889ed9f8bd SHA1 22e7b4cbf222cf558267bf3ff0d4dae805f737c6 SHA256 203d1f0c159d1c8ed06aac13c7a2cf20d67f36cb4ad043f54d90bef3b9de62c6
 DIST mumble-1.1.8.tar.gz 1241365 RMD160 d2d05993b38749f30ed67b8b92a22ef236dc7cf1 SHA1 83b5ef771b6801953290ee184f1590686e831b8c SHA256 4cef76457e3178f9d854327f4a02c3521b19ddf64c03947b3ba182f871a81856
 DIST mumble-1.2.2.tar.gz 2920587 RMD160 501aa1c4c170fb5aad2841cdfe3421376e62a07b SHA1 b2a7fd50e70147b3ea2361cbc5a577b0e1ae45ea SHA256 2c564e3d5b7481129482f2365375a2dc77e134c0c00012073cfdfbeadaa49be8
+DIST mumble-1.2.3.tar.gz 3448053 RMD160 c02e1c42e6996e7b6052772089febd22be67582d SHA1 420e245ef978d7e51ca3ed97922acf13f5ef982d SHA256 05895122ae4abec3fb62ef24ed9d167ffd768e7080ed179c8bf3afca96d18a5c
 EBUILD murmur-1.1.8.ebuild 2845 RMD160 c533fb32d57915ccfa3721cfb530d7d9fa85c6cf SHA1 c1a1a937eeda981420235ac1768b6921bd56e652 SHA256 07f16db719ed5f33a4fdf601235797cd107cd77def524c781ecfbbc3ef6cd05a
 EBUILD murmur-1.2.2.ebuild 3167 RMD160 97225e1215337db09e3b37727960c983cbd8036e SHA1 ba32b596e4aded07e929bf8b1f1905ed8436754b SHA256 e4a8fd5ad36da3fe8085496fc1b59d96fa44c5c04636c5cda7ce2dd1681e6bd7
-MISC ChangeLog 4240 RMD160 a55b077895c3a3e9f145ca28f3cb11fbffdb9351 SHA1 0289ef7c18304f9fb23feb5087e74c37e907dc2e SHA256 5abb6171ffd587cc51d7a9837b7fd8b63f252c0daa8c9bd3ee8d61e3bc086647
+EBUILD murmur-1.2.3.ebuild 3298 RMD160 02881113bbe1d7a217dc23a61302c6fa9350438a SHA1 a30c9d97d55e959a812d8f353c16ba4c31b7a1cd SHA256 c22952fd9ac621373518cf90296f19f0a9f6d3a54d5254a533808813be082843
+MISC ChangeLog 4398 RMD160 7b87e3424ff3318eba5d61d295bbab706c5a75fc SHA1 2f6a5e561a6656b635ce7261ac45c76953442698 SHA256 768104583a111f8dba3aecf49decf50a9b8a28cfa146c931aca83cfb79594707
 MISC metadata.xml 480 RMD160 6e9216bf763dbbc619a699b787a4ae20c0c8f500 SHA1 bd2ab47ea3dce184e6a560a8a77034ecc2b85372 SHA256 4fa0864013dcdcda9b1e16a8f97af9e0af12b4ccefd2d163954f241391f76c2c
diff --git a/media-sound/murmur/murmur-1.2.3.ebuild b/media-sound/murmur/murmur-1.2.3.ebuild
new file mode 100644
index 000000000000..1b10fe3e5a0e
--- /dev/null
+++ b/media-sound/murmur/murmur-1.2.3.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/murmur/murmur-1.2.3.ebuild,v 1.1 2011/02/23 21:10:19 tgurr Exp $
+
+EAPI="2"
+
+inherit eutils qt4-r2
+
+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="mirror://sourceforge/mumble/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~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
+	x11-libs/qt-core:4[ssl]
+	|| ( x11-libs/qt-sql:4[sqlite] x11-libs/qt-sql:4[mysql] )
+	x11-libs/qt-xmlpatterns:4
+	dbus? ( x11-libs/qt-dbus:4 )
+	ice? ( dev-libs/Ice )
+	zeroconf? ( || ( net-dns/avahi[mdnsresponder-compat] net-misc/mDNSResponder ) )"
+
+DEPEND="${RDEPEND}
+	>=dev-libs/boost-1.41.0
+	dev-util/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	enewgroup murmur
+	enewuser murmur -1 -1 /var/lib/murmur murmur
+}
+
+src_prepare() {
+	sed -i \
+		-e 's:mumble-server:murmur:g' \
+		"${S}"/scripts/murmur.conf \
+		"${S}"/scripts/murmur.ini.system \
+		|| die "sed failed."
+}
+
+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" \
+		|| die "eqmake4 failed."
+}
+
+src_compile() {
+	# parallel make workaround, upstream bug #3190498
+	emake -j1 || die "emake failed."
+}
+
+src_install() {
+	dodoc README CHANGES || die "Installing docs failed."
+
+	docinto scripts
+	dodoc scripts/*.php scripts/*.pl || die "Installing docs failed."
+
+	local dir
+	if use debug; then
+		dir=debug
+	else
+		dir=release
+	fi
+
+	dobin "${dir}"/murmurd || die "Installing murmurd binary failed."
+
+	insinto /etc/murmur/
+	newins scripts/murmur.ini.system murmur.ini || die "Installing murmur.ini configuration file failed."
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}"/murmur.logrotate murmur || die "Installing murmur logrotate file failed."
+
+	insinto /etc/dbus-1/system.d/
+	doins scripts/murmur.conf || die "Installing murmur.conf dbus configuration file failed."
+
+	newinitd "${FILESDIR}"/murmur.initd murmur || die "Installing murmur init.d file failed."
+	newconfd "${FILESDIR}"/murmur.confd murmur || die "Installing murmur conf.d file failed."
+
+	keepdir /var/lib/murmur /var/run/murmur /var/log/murmur
+	fowners -R murmur /var/lib/murmur /var/run/murmur /var/log/murmur || die "fowners failed."
+	fperms 750 /var/lib/murmur /var/run/murmur /var/log/murmur || die "fperms failed."
+
+	doman man/murmurd.1 || die "Installing murmur manpage failed."
+}
+
+pkg_postinst() {
+	echo
+	elog "Useful scripts are located in /usr/share/doc/${PF}/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 build-in 'SuperUser' password before starting murmur."
+	elog "Please restart dbus before starting murmur, or else dbus"
+	elog "registration will fail."
+	echo
+}