Further EAPI2 improvements and cosmetic cleanups, thanks zlin and Ingmar.

Package-Manager: portage-2.2_rc12/cvs/Linux 2.6.26-gentoo-r1 x86_64

3 files changed, 29 insertions, 30 deletions

diff --git a/media-sound/murmur/ChangeLog b/media-sound/murmur/ChangeLog
index c1edbf7de3bc..ed06c7c65ae5 100644
--- a/media-sound/murmur/ChangeLog
+++ b/media-sound/murmur/ChangeLog
@@ -1,6 +1,9 @@
 # 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.6 2008/10/16 22:42:35 tgurr Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/murmur/ChangeLog,v 1.7 2008/10/17 01:09:14 tgurr Exp $
+
+  17 Oct 2008; Timo Gurr <tgurr@gentoo.org> murmur-1.1.6.ebuild:
+  Further EAPI2 improvements and cosmetic cleanups, thanks zlin and Ingmar.
 
 *murmur-1.1.6 (16 Oct 2008)
 
diff --git a/media-sound/murmur/Manifest b/media-sound/murmur/Manifest
index ec4f3b35264f..3eef2e447720 100644
--- a/media-sound/murmur/Manifest
+++ b/media-sound/murmur/Manifest
@@ -2,6 +2,6 @@ AUX murmur.confd 244 RMD160 c15d1f5ea8ac2e7673f4a99853b8ffc04722ef6f SHA1 533369
 AUX murmur.initd 679 RMD160 4d5b1d13fb94ee818ad842d0c77dc5903855a123 SHA1 958cb102b8f60182154f0764819ea311577ce0bb SHA256 687905fb2b9b6ab27299be8795dfbd47fbc9d1fa70ecf3726456ef83b13ace44
 AUX murmur.logrotate 127 RMD160 1053af850dad13fa9d1232dc176752889ed9f8bd SHA1 22e7b4cbf222cf558267bf3ff0d4dae805f737c6 SHA256 203d1f0c159d1c8ed06aac13c7a2cf20d67f36cb4ad043f54d90bef3b9de62c6
 DIST mumble-1.1.6.tar.gz 1223126 RMD160 7f448b21fad7e6569e2c009229a96aa94983644a SHA1 50e9871207100ff2dc75be1d745e82a65c4e5ffc SHA256 c7672651cf99551bc9e96f6ceca08a95c44ff63055268b4610d891ce005e4d93
-EBUILD murmur-1.1.6.ebuild 2690 RMD160 db736061fe5fe56a3246189e54b338689a02ffc2 SHA1 1e1e8464314a3d74ca1e56613ef034985bdeaf8d SHA256 940519914e92f1a05d77e7bc8b6068d243dc15edf139b45844a1fe2e7cf607ce
-MISC ChangeLog 1434 RMD160 c69ee63fc96d01476ebf4b0eda5b7b390a2294db SHA1 fe7dc9985633815eb233e29faafd0fcfd5082fc9 SHA256 d949c30b9af9d6ab45fcf6aba4cc90bb78a1b85bdfcc7f8b35270755d53fbf6f
+EBUILD murmur-1.1.6.ebuild 2925 RMD160 d1fa89ee547b665968c7f9e24fb5e08a647eb82d SHA1 486a0241b8936731006edd4dac3718bd1640f9bf SHA256 015815bcc7fd1c377562f3d83b070e31ab7b3114953fa05deb99059647249a4b
+MISC ChangeLog 1576 RMD160 d0db25ed677cd163b54df61a54f29e08e7eeb9ff SHA1 39f73f6d8c34205471ebd2a8fbd5b920093d8354 SHA256 c5144cf903fceb23cd78ef61b5eb1482555352b63023c15b35238f304cc173c3
 MISC metadata.xml 402 RMD160 4341ed7124a257907e170f6375c468bb951ab7a6 SHA1 4e541152edf59afd05d3e233969b57ebf9ab9abf SHA256 721e574560281ead69e8e862a019db4bbf271b2977db027ef0f547586d9e80ad
diff --git a/media-sound/murmur/murmur-1.1.6.ebuild b/media-sound/murmur/murmur-1.1.6.ebuild
index 063bff323a2a..03bf940a1fc1 100644
--- a/media-sound/murmur/murmur-1.1.6.ebuild
+++ b/media-sound/murmur/murmur-1.1.6.ebuild
@@ -1,12 +1,12 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/murmur/murmur-1.1.6.ebuild,v 1.2 2008/10/17 01:09:14 tgurr Exp $
 
 EAPI="2"
 
 inherit eutils qt4
 
-MY_PN=mumble
+MY_PN="mumble"
 MY_P=${MY_PN}-${PV}
 
 DESCRIPTION="Voice chat software for gaming written in Qt4 (server)"
@@ -18,24 +18,20 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug logrotate pch"
 
-RDEPEND="dev-libs/boost
+RDEPEND="dev-cpp/Ice
+	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"
+			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,sqlite]
+		=x11-libs/qt-4.3*:4[dbus,ssl,mysql] )
+	logrotate? ( app-admin/logrotate )"
 
 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
 }
@@ -49,8 +45,7 @@ src_prepare() {
 }
 
 src_configure() {
-	use debug || conf_add="${conf_add} release"
-	use debug && conf_add="${conf_add} symbols debug"
+	use debug && conf_add="${conf_add} symbols debug" || conf_add="${conf_add} release"
 	use pch || echo "CONFIG-=precompile_header" >> src/mumble.pri
 
 	eqmake4 main.pro -recursive \
@@ -60,7 +55,9 @@ src_configure() {
 
 src_install() {
 	dodoc README CHANGES || die "Installing docs failed."
-	docinto scripts ; dodoc scripts/*.php scripts/*.pl
+
+	docinto scripts
+	dodoc scripts/*.php scripts/*.pl || die "Installing docs failed."
 
 	local dir
 	if use debug; then
@@ -69,32 +66,32 @@ src_install() {
 		dir=release
 	fi
 
-	dobin "${dir}"/murmurd || die "Installing murmurd failed."
+	dobin "${dir}"/murmurd || die "Installing murmurd binary failed."
 
 	insinto /etc/murmur/
-	newins scripts/murmur.ini.system murmur.ini
+	newins scripts/murmur.ini.system murmur.ini || die "Installing murmur.ini configuration file failed."
 
 	if use logrotate; then
 		insinto /etc/logrotate.d/
-		newins "${FILESDIR}"/murmur.logrotate murmur
+		newins "${FILESDIR}"/murmur.logrotate murmur || die "Installing murmur logrotate file failed."
 	fi
 
 	insinto /etc/dbus-1/system.d/
-	doins scripts/murmur.conf
+	doins scripts/murmur.conf || die "Installing murmur.conf dbus configuration file failed."
 
-	newinitd "${FILESDIR}"/murmur.initd murmur
-	newconfd "${FILESDIR}"/murmur.confd murmur
+	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
-	fperms 750 /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
+	doman man/murmurd.1 || die "Installing murmur manpage failed."
 }
 
 pkg_postinst() {
 	echo
-	elog "Useful scripts are located in /usr/share/doc/murmur-${PV}/scripts."
+	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"
@@ -103,4 +100,3 @@ pkg_postinst() {
 	elog "or dbus registration will fail."
 	echo
 }
-