[gentoo-commits] proj/gamerlay:master commit in: games-fps/redeclipse/

["Azamat H. Hackimov" <winterheart@gentoo.ru>]

commit:     4a1de7f046c4fe6a1e07475da6908c5991907222
Author:     Azamat H. Hackimov <azamat.hackimov <AT> gmail <DOT> com>
AuthorDate: Sun May 13 18:09:08 2012 +0000
Commit:     Azamat H. Hackimov <winterheart <AT> gentoo <DOT> ru>
CommitDate: Sun May 13 18:09:08 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=4a1de7f0

[games-fps/redeclipse] Removed old 1.1, added man-pages and .desktop file.

(Portage version: 2.1.10.49/git/Linux x86_64, unsigned Manifest commit)

---
 games-fps/redeclipse/ChangeLog             |    4 ++
 games-fps/redeclipse/metadata.xml          |    2 +-
 games-fps/redeclipse/redeclipse-1.1.ebuild |   69 ----------------------------
 games-fps/redeclipse/redeclipse-1.2.ebuild |   47 +++++++++++++------
 4 files changed, 38 insertions(+), 84 deletions(-)

diff --git a/games-fps/redeclipse/ChangeLog b/games-fps/redeclipse/ChangeLog
index f120819..ae41e31 100644
--- a/games-fps/redeclipse/ChangeLog
+++ b/games-fps/redeclipse/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  13 May 2012; Azamat H. Hackimov <azamat.hackimov@gmail.com>
+  -redeclipse-1.1.ebuild, redeclipse-1.2.ebuild, metadata.xml:
+  Removed old 1.1, added man-pages and .desktop file.
+
 *redeclipse-1.2 (12 May 2012)
 
   12 May 2012; Michael Weber <xmw@gentoo.org> redeclipse-1.1.ebuild,

diff --git a/games-fps/redeclipse/metadata.xml b/games-fps/redeclipse/metadata.xml
index 7513f0b..d5c68c3 100644
--- a/games-fps/redeclipse/metadata.xml
+++ b/games-fps/redeclipse/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>no-herd</herd>
+<herd></herd>
 <maintainer>
 <email>azamat.hackimov@gmail.com</email>
 <name>Azamat H. Hackimov</name>

diff --git a/games-fps/redeclipse/redeclipse-1.1.ebuild b/games-fps/redeclipse/redeclipse-1.1.ebuild
deleted file mode 100644
index d934cb1..0000000
--- a/games-fps/redeclipse/redeclipse-1.1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=3
-
-inherit games
-
-DESCRIPTION="First-person ego-shooter, built as a total conversion of Cube Engine 2"
-HOMEPAGE="http://www.redeclipse.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}/${PN}_${PV}_linux_bsd.tar.bz2"
-
-# According to license.txt file
-LICENSE="as-is ZLIB CCPL-Attribution-ShareAlike-3.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="dedicated"
-
-DEPEND="!dedicated? (
-		media-libs/libsdl[opengl]
-		media-libs/sdl-image[jpeg,png]
-		media-libs/sdl-mixer[mp3,vorbis]
-		virtual/opengl
-		x11-libs/libX11
-	)
-	net-libs/enet:1.3
-	sys-libs/zlib
-"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"/${PN}
-
-src_prepare() {
-	# Respect GAMES_DATADIR
-	sed -i -e "s:\(addpackagedir(\"\)data:\1${GAMES_DATADIR}/${PN}/data:" \
-		src/engine/server.cpp || die "sed failed"
-
-	# Unbundle enet
-	sed -i \
-		-e "s:\(client\)\: libenet:\1\::" \
-		-e   "s:\(server\)\: libenet:\1\::" \
-		src/Makefile || die "sed failed"
-
-	# Remove strip
-	sed -i "/STRIP=strip/d" src/Makefile || die "sed failed"
-}
-
-src_compile() {
-	cd src
-	if ! use dedicated ; then
-		emake CXXFLAGS="${CXXFLAGS}" client server || die "Make failed"
-	else
-		emake CXXFLAGS="${CXXFLAGS}" server
-	fi
-}
-
-src_install() {
-	newgamesbin src/reserver ${PN}-server || die
-	dodoc readme.txt
-	if ! use dedicated ; then
-		newgamesbin src/reclient ${PN} || die
-		insinto "${GAMES_DATADIR}"/${PN}
-		doins -r data
-		newicon src/site/bits/favicon.png ${PN}.png || die
-		make_desktop_entry ${PN} "Red Eclipse" ${PN}
-	fi
-
-	prepgamesdirs
-}

diff --git a/games-fps/redeclipse/redeclipse-1.2.ebuild b/games-fps/redeclipse/redeclipse-1.2.ebuild
index 0a199cd..a6cbfa9 100644
--- a/games-fps/redeclipse/redeclipse-1.2.ebuild
+++ b/games-fps/redeclipse/redeclipse-1.2.ebuild
@@ -18,6 +18,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="dedicated"
 
 DEPEND="!dedicated? (
+		media-libs/freetype:2
 		media-libs/libsdl[opengl]
 		media-libs/sdl-image[jpeg,png]
 		media-libs/sdl-mixer[mp3,vorbis]
@@ -30,28 +31,41 @@ RDEPEND="${DEPEND}"
 
 S=${WORKDIR}/${PN}
 
-src_unpack() {
-	unpack $A
-	einfo "Copying favicon.png into ${WORKDIR}"
-	cp "${DISTDIR}"/${P}-favicon.png "${WORKDIR}/favicon.png" || die
-}
-
 src_prepare() {
 	# Respect GAMES_DATADIR
 	sed -i -e "s:\(addpackagedir(\"\)data:\1${GAMES_DATADIR}/${PN}/data:" \
 		src/engine/server.cpp || die
 
 	# Unbundle enet
-	sed -i \
-		-e "s:\(client\)\: libenet:\1\::" \
-		-e   "s:\(server\)\: libenet:\1\::" \
-		src/Makefile || die
+	sed	-e "s:\(client\)\: libenet:\1\::" \
+		-e "s:\(server\)\: libenet:\1\::" \
+		-i src/Makefile || die
 	rm -r src/enet || die
 
 	#respect LDFLAGS
 	sed -e "/^client/,+1s:-o reclient:-o reclient \$(LDFLAGS):" \
 		-e "/^server/,+1s:-o reserver:-o reserver \$(LDFLAGS):" \
 		-i src/Makefile || die
+
+	# Menu and mans
+	sed -e "s:@REDECLIPSE@:${PN}:" \
+		src/install/nix/redeclipse.desktop.am \
+		> src/install/nix/redeclipse.desktop || die
+
+	sed -e "s:@LIBEXECDIR@:$(games_get_libdir):g" \
+		-e "s:@DATADIR@:${GAMES_DATADIR}:g" \
+		-e "s:@DOCDIR@:${GAMES_DATADIR_BASE}/doc/${PF}:" \
+		-e "s:@REDECLIPSE@:${PN}:g" \
+		src/install/nix/redeclipse.6.am \
+		> src/install/nix/redeclipse.6 || die
+
+	sed -e "s:@LIBEXECDIR@:$(games_get_libdir):g" \
+		-e "s:@DATADIR@:${GAMES_DATADIR}:g" \
+		-e "s:@DOCDIR@:${GAMES_DATADIR_BASE}/doc/${PF}:" \
+		-e "s:@REDECLIPSE@:${PN}:g" \
+		src/install/nix/redeclipse-server.6.am \
+		> src/install/nix/redeclipse-server.6 || die
+
 }
 
 src_compile() {
@@ -59,19 +73,24 @@ src_compile() {
 	if ! use dedicated ; then
 		emake CXXFLAGS="${CXXFLAGS}" STRIP= client server || die "Make failed"
 	else
-		emake CXXFLAGS="${CXXFLAGS}" STRIPT= server
+		emake CXXFLAGS="${CXXFLAGS}" STRIP= server || die "Make failed"
 	fi
 }
 
 src_install() {
 	newgamesbin src/reserver ${PN}-server || die
-	dodoc readme.txt
+	doman src/install/nix/redeclipse-server.6 || die
+	dodoc readme.txt data/examples/servexec.cfg data/examples/servinit.cfg
 	if ! use dedicated ; then
 		newgamesbin src/reclient ${PN} || die
+
+		# Don't include examples into datadir
+		rm data/examples/servexec.cfg data/examples/servinit.cfg
 		insinto "${GAMES_DATADIR}"/${PN}
 		doins -r data
-		newicon ${WORKDIR}/favicon.png ${PN}.png || die
-		make_desktop_entry ${PN} "Red Eclipse" ${PN}
+		newicon "${DISTDIR}/${P}-favicon.png" ${PN}.png || die
+		domenu src/install/nix/redeclipse.desktop
+		doman src/install/nix/redeclipse.6
 	fi
 
 	prepgamesdirs