add a default for the server config (bug #443650)

(Portage version: 2.1.11.31/cvs/Linux x86_64, unsigned Manifest commit)

2 files changed, 19 insertions, 15 deletions

diff --git a/games-fps/sauerbraten/ChangeLog b/games-fps/sauerbraten/ChangeLog
index 521f15ba2a03..4567990ba1c3 100644
--- a/games-fps/sauerbraten/ChangeLog
+++ b/games-fps/sauerbraten/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-fps/sauerbraten
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/sauerbraten/ChangeLog,v 1.15 2012/11/17 23:26:40 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/sauerbraten/ChangeLog,v 1.16 2012/11/18 00:03:51 mr_bones_ Exp $
+
+  18 Nov 2012; Michael Sterrett <mr_bones_@gentoo.org>
+  sauerbraten-2010.07.28.ebuild:
+  add a default for the server config (bug #443650)
 
   17 Nov 2012; Michael Sterrett <mr_bones_@gentoo.org> files/sauerbraten.init:
   fix init script (bug #443646)
diff --git a/games-fps/sauerbraten/sauerbraten-2010.07.28.ebuild b/games-fps/sauerbraten/sauerbraten-2010.07.28.ebuild
index 254b135b1405..cf4891a1b456 100644
--- a/games-fps/sauerbraten/sauerbraten-2010.07.28.ebuild
+++ b/games-fps/sauerbraten/sauerbraten-2010.07.28.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/sauerbraten/sauerbraten-2010.07.28.ebuild,v 1.2 2012/09/05 09:50:56 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/sauerbraten/sauerbraten-2010.07.28.ebuild,v 1.3 2012/11/18 00:03:51 mr_bones_ Exp $
 
 EAPI=2
 inherit eutils flag-o-matic games
@@ -38,20 +38,20 @@ src_prepare() {
 	sed -i \
 		-e 's:docs/::' \
 		README.html \
-		|| die "sed failed"
+		|| die
 	# Honor CXXFLAGS and LDFLAGS
 	sed -i \
 		-e 's/[[:space:]]*$//' \
 		-e '/^CXXFLAGS=/d' \
 		-e '/-o .*LIBS/s/$/ $(LDFLAGS)/' \
 		src/Makefile \
-		|| die "sed failed"
+		|| die
 }
 
 src_compile() {
 	use debug && append-flags "-D_DEBUG"
 	emake -C src master server $(use dedicated || echo client) \
-		|| die "emake failed"
+		|| die
 }
 
 src_install() {
@@ -62,11 +62,11 @@ src_install() {
 	if ! use dedicated ; then
 		# Install the game data
 		insinto "${DATADIR}"
-		doins -r data packages || die "doins -r failed"
+		doins -r data packages || die
 
 		# Install the client executable
 		exeinto "${LIBEXECDIR}"
-		doexe src/sauer_client || die "doexe failed"
+		doexe src/sauer_client || die
 
 		# Install the client wrapper
 		games_make_wrapper "${PN}-client" "${LIBEXECDIR}/sauer_client -q\$HOME/.${PN} -r" "${DATADIR}"
@@ -78,11 +78,11 @@ src_install() {
 
 	# Install the server config files
 	insinto "${STATEDIR}"
-	doins "server-init.cfg" || die "doins failed"
+	doins "server-init.cfg" || die
 
 	# Install the server executables
 	exeinto "${LIBEXECDIR}"
-	doexe src/sauer_{server,master} || die "doexe failed"
+	doexe src/sauer_{server,master} || die
 
 	games_make_wrapper "${PN}-server" \
 		"${LIBEXECDIR}/sauer_server -k${DATADIR} -q${STATEDIR}"
@@ -93,19 +93,19 @@ src_install() {
 	keepdir "${GAMES_STATEDIR}/run/${PN}"
 	cp "${FILESDIR}"/${PN}.init "${T}"
 	sed -i \
-		-e "s:%SYSCONFDIR%:${SYSCONFDIR}:g" \
+		-e "s:%SYSCONFDIR%:${STATEDIR}:g" \
 		-e "s:%LIBEXECDIR%:${LIBEXECDIR}:g" \
 		-e "s:%GAMES_STATEDIR%:${GAMES_STATEDIR}:g" \
-		"${T}"/${PN}.init || die "sed failed"
-	newinitd "${T}"/${PN}.init ${PN} || die "newinitd failed"
+		"${T}"/${PN}.init || die
+	newinitd "${T}"/${PN}.init ${PN} || die
 	cp "${FILESDIR}"/${PN}.conf "${T}"
 	sed -i \
-		-e "s:%SYSCONFDIR%:${SYSCONFDIR}:g" \
+		-e "s:%SYSCONFDIR%:${STATEDIR}:g" \
 		-e "s:%LIBEXECDIR%:${LIBEXECDIR}:g" \
 		-e "s:%GAMES_USER_DED%:${GAMES_USER_DED}:g" \
 		-e "s:%GAMES_GROUP%:${GAMES_GROUP}:g" \
-		"${T}"/${PN}.conf || die "sed failed"
-	newconfd "${T}"/${PN}.conf ${PN} || die "newconfd failed"
+		"${T}"/${PN}.conf || die
+	newconfd "${T}"/${PN}.conf ${PN} || die
 
 	dodoc src/*.txt docs/dev/*.txt
 	dohtml -r README.html docs/*