[games-fps/redeclipse] Version bump to 1.3.1.

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

2 files changed, 27 insertions, 29 deletions

diff --git a/games-fps/redeclipse/Manifest b/games-fps/redeclipse/Manifest
index f964a15..28c98f3 100644
--- a/games-fps/redeclipse/Manifest
+++ b/games-fps/redeclipse/Manifest
@@ -1,5 +1,4 @@
-DIST redeclipse-1.2-favicon.png 3448 RMD160 c87023939b349c7015c48d80d63fd37aa52f06d2 SHA1 64163a7d53c6adedc452b13a7c39da0e8bc95159 SHA256 b33dafd95150ac043dbf7ae8c26c68b052a4762d9414601211dd78f7beed63e4
-DIST redeclipse_1.2_linux_bsd.tar.bz2 475330904 RMD160 a4bc97fe0ec15305e26ee61dc1f172d2c81cfcc7 SHA1 761be6ad087e7cd538d75ccdead9807b6de3a82b SHA256 5fb3e74711011404fa09f4fda26d343e67fda74b515b844bf36b4a39010dc308
-EBUILD redeclipse-1.2.ebuild 2723 RMD160 bbf93fcd4d0d6acdcbd7cdc8136b6eb318da62e5 SHA1 a87819be29a52ea41eb05931aaf097c79d9f2e0f SHA256 786ed379e5ac74647237bb6511197ccaa05ce743a44f74e9b9cc1ee94a085bbe
-MISC ChangeLog 511 RMD160 92edf67f10daf7d91a8ea1b5d3cd03136fd56102 SHA1 d91fee8dea1edf9804d00421810cf4043ee8bb62 SHA256 bf3ffe5180621a4c62744e746bdc33a266571c6211daff48108e3814c01f5f35
-MISC metadata.xml 372 RMD160 06f70088699c1cbf53346d7e1eb0c502d29c9ef3 SHA1 89f4699771d2dcc2385dc64fb77fc15f574b5ea7 SHA256 cefe2842c3674215aa9b15a2e07e2f6305df627aceb930c0c27ed28b65454a1b
+DIST redeclipse_1.3.1_nix_bsd.tar.bz2 505092683 SHA256 e29bc8a148c00b8a62b0e77752b7494f0d36f428cb4f24e9b5dc40cdcd67254e SHA512 bbf4f0f07033667cb86665f34449a2ddcc00eee0e399fc83fa5bf6998da57ba94860c8191845bd4652889af3df3cc12c9861dbb10ac2e4828a208e10a48b0543 WHIRLPOOL 5e09e88a1d983de0207c7a0199b17fe59dae48f11dc3ad4b5f59e7cc58b1a65fc1c051340f195b3fc8828baaa94d93601991875b7d7318bcd10b5f21d50ef94f
+EBUILD redeclipse-1.3.1.ebuild 2402 SHA256 91a5b5b6b1a6a4922cf2a871eaab381a27b4ba71c6c12ceaa51cc8f765db763c SHA512 02e99d104cd5dbd1aaa1d51f47bb8efefc50911531e0e29c1c97afa8d27ed79d861eda60019702e4a62ca40a83c1822ebf0f78e5f7495ae26055dbb73c632819 WHIRLPOOL bac6c08cb7bece67da70996ba3c16228e7553e6fa25673d68bb69ad3b87b667a32425eea033431771998a19559b7c7d2e89876d7146514c2d03693769af223f3
+MISC ChangeLog 511 SHA256 bf3ffe5180621a4c62744e746bdc33a266571c6211daff48108e3814c01f5f35 SHA512 63a3f9c7960795bbd41f94a0919fa9cbb1b162ed1bfbba6d7ecb588285e4e64909c597389f822bd5daf3f394c225fa025e9b8623854eabca6a313d2e00752dd0 WHIRLPOOL a1e84853f3d83072c8c7181c73a2984651b5158768d9881d2bba83d896eb1a4d0283acae0b410fa454c33260786316e16dbf6fe24976cc8358234865efbca12d
+MISC metadata.xml 372 SHA256 cefe2842c3674215aa9b15a2e07e2f6305df627aceb930c0c27ed28b65454a1b SHA512 60e0b202a9db58ec991ab1186be70ea6a22b26b331ed5b4c06381b80e405a8d38cb9bce6caf567f53ebce228eeecc0bc5d2a67e23bd5a730d732600a8eb00b65 WHIRLPOOL acd216a5bc11132b4732efcf6e03c69329503cd44c64cf2f82e411691de90fdbfb9962bfe5aff8c570b0b54807788d95b47f83498e6b8344bf1e1d4689f950b0
diff --git a/games-fps/redeclipse/redeclipse-1.2.ebuild b/games-fps/redeclipse/redeclipse-1.3.1.ebuild
index a6cbfa9..23e4dbb 100644
--- a/games-fps/redeclipse/redeclipse-1.2.ebuild
+++ b/games-fps/redeclipse/redeclipse-1.3.1.ebuild
@@ -2,14 +2,15 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
-inherit games
+inherit games versionator
+
+MAJOR_VERSION=$(get_version_component_range 1-2)
 
 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
-	http://sourceforge.net/apps/trac/redeclipse/export/3683/src/site/bits/favicon.png -> ${P}-favicon.png"
+SRC_URI="mirror://sourceforge/${PN}/${PN}_${MAJOR_VERSION}/${PN}_${PV}_nix_bsd.tar.bz2"
 
 # According to license.txt file
 LICENSE="as-is ZLIB CCPL-Attribution-ShareAlike-3.0"
@@ -34,63 +35,61 @@ S=${WORKDIR}/${PN}
 src_prepare() {
 	# Respect GAMES_DATADIR
 	sed -i -e "s:\(addpackagedir(\"\)data:\1${GAMES_DATADIR}/${PN}/data:" \
-		src/engine/server.cpp || die
+		src/engine/server.cpp
 
 	# Unbundle enet
 	sed	-e "s:\(client\)\: libenet:\1\::" \
 		-e "s:\(server\)\: libenet:\1\::" \
-		-i src/Makefile || die
-	rm -r src/enet || die
+		-i src/Makefile
+	rm -r src/enet
 
 	#respect LDFLAGS
 	sed -e "/^client/,+1s:-o reclient:-o reclient \$(LDFLAGS):" \
 		-e "/^server/,+1s:-o reserver:-o reserver \$(LDFLAGS):" \
-		-i src/Makefile || die
+		-i src/Makefile
 
 	# Menu and mans
-	sed -e "s:@REDECLIPSE@:${PN}:" \
+	sed -e "s:@APPNAME@:${PN}:" \
 		src/install/nix/redeclipse.desktop.am \
-		> src/install/nix/redeclipse.desktop || die
+		> src/install/nix/redeclipse.desktop
 
 	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
+		doc/man/redeclipse.6.am \
+		> doc/man/redeclipse.6
 
 	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
+		doc/man/redeclipse-server.6.am \
+		> doc/man/redeclipse-server.6
 
 }
 
 src_compile() {
 	cd src
 	if ! use dedicated ; then
-		emake CXXFLAGS="${CXXFLAGS}" STRIP= client server || die "Make failed"
+		emake CXXFLAGS="${CXXFLAGS}" STRIP= client server
 	else
-		emake CXXFLAGS="${CXXFLAGS}" STRIP= server || die "Make failed"
+		emake CXXFLAGS="${CXXFLAGS}" STRIP= server
 	fi
 }
 
 src_install() {
-	newgamesbin src/reserver ${PN}-server || die
-	doman src/install/nix/redeclipse-server.6 || die
-	dodoc readme.txt data/examples/servexec.cfg data/examples/servinit.cfg
+	newgamesbin src/reserver ${PN}-server
+	doman doc/man/redeclipse-server.6
+	dodoc readme.txt doc/examples/serv{exec,init}.cfg
 	if ! use dedicated ; then
-		newgamesbin src/reclient ${PN} || die
+		newgamesbin src/reclient ${PN}
 
-		# Don't include examples into datadir
-		rm data/examples/servexec.cfg data/examples/servinit.cfg
 		insinto "${GAMES_DATADIR}"/${PN}
 		doins -r data
-		newicon "${DISTDIR}/${P}-favicon.png" ${PN}.png || die
+		newicon src/install/nix/${PN}_x128.png ${PN}.png
 		domenu src/install/nix/redeclipse.desktop
-		doman src/install/nix/redeclipse.6
+		doman doc/man/redeclipse.6
 	fi
 
 	prepgamesdirs