Use readme.gentoo.eclass, bug #487462. Add ice-3.5.1-compat.patch, bug #488880.

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

3 files changed, 47 insertions, 12 deletions

diff --git a/media-sound/murmur/ChangeLog b/media-sound/murmur/ChangeLog
index d384d9cb655c..c9aa9c2f670b 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.49 2013/11/01 13:49:36 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/murmur/ChangeLog,v 1.50 2013/11/17 23:40:26 tgurr Exp $
+
+  17 Nov 2013; Timo Gurr <tgurr@gentoo.org> murmur-1.2.4-r2.ebuild,
+  +files/murmur-1.2.4-ice-3.5.1-compat.patch:
+  Use readme.gentoo.eclass, bug #487462. Add ice-3.5.1-compat.patch, bug
+  #488880.
 
   01 Nov 2013; Agostino Sarubbo <ago@gentoo.org> murmur-1.2.4-r2.ebuild:
   Stable for x86, wrt bug #486304
diff --git a/media-sound/murmur/files/murmur-1.2.4-ice-3.5.1-compat.patch b/media-sound/murmur/files/murmur-1.2.4-ice-3.5.1-compat.patch
new file mode 100644
index 000000000000..c5d7af520ed7
--- /dev/null
+++ b/media-sound/murmur/files/murmur-1.2.4-ice-3.5.1-compat.patch
@@ -0,0 +1,25 @@
+From d2ed7d2d38e4548b23d105c124737a871b1fc72c Mon Sep 17 00:00:00 2001
+From: Timo Gurr <timo.gurr@gmail.com>
+Date: Wed, 16 Oct 2013 13:27:19 +0200
+Subject: [PATCH] Update slice path for Ice 3.5.1
+
+---
+ src/murmur/murmur.pro | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/murmur/murmur.pro b/src/murmur/murmur.pro
+index adaeb2b..7621699 100644
+--- a/src/murmur/murmur.pro
++++ b/src/murmur/murmur.pro
+@@ -77,7 +77,7 @@ ice {
+ 	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/ -I/usr/share/Ice-3.5.0/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.0/slice/ -I/usr/share/Ice-3.5.1/slice/ ${QMAKE_FILE_NAME}
+ 	}
+ 	slice.input = SLICEFILES
+ 	slice.CONFIG *= no_link explicit_dependencies
+-- 
+1.8.4
+
diff --git a/media-sound/murmur/murmur-1.2.4-r2.ebuild b/media-sound/murmur/murmur-1.2.4-r2.ebuild
index 5415f2553cd2..97d104dc0144 100644
--- a/media-sound/murmur/murmur-1.2.4-r2.ebuild
+++ b/media-sound/murmur/murmur-1.2.4-r2.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/murmur/murmur-1.2.4-r2.ebuild,v 1.3 2013/11/01 13:49:36 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/murmur/murmur-1.2.4-r2.ebuild,v 1.4 2013/11/17 23:40:26 tgurr Exp $
 
 EAPI="5"
 
 QT_MINIMAL="4.6"
 
-inherit eutils qt4-r2 systemd user
+inherit eutils qt4-r2 systemd user readme.gentoo
 
 MY_P="${PN/murmur/mumble}-${PV/_/~}"
 
@@ -38,8 +38,19 @@ 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
@@ -114,16 +125,10 @@ src_install() {
 	fperms 750 /var/lib/murmur /var/log/murmur
 
 	doman man/murmurd.1
+
+	readme.gentoo_create_doc
 }
 
 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
+	readme.gentoo_print_elog
 }