diff options
author | Azamat H. Hackimov <azamat.hackimov@gmail.com> | 2013-04-19 00:12:12 +0600 |
---|---|---|
committer | Azamat H. Hackimov <azamat.hackimov@gmail.com> | 2013-04-19 00:12:12 +0600 |
commit | 805ea5cea7b69bef11f67d4ccba8b069d2420446 (patch) | |
tree | 41d1dfe7bfd8429dedc09f5ee07398ab04f9c568 /games-fps | |
parent | [games-action/rochard] fixed x86 installing (diff) | |
download | gamerlay-805ea5cea7b69bef11f67d4ccba8b069d2420446.tar.gz gamerlay-805ea5cea7b69bef11f67d4ccba8b069d2420446.tar.bz2 gamerlay-805ea5cea7b69bef11f67d4ccba8b069d2420446.zip |
[games-fps/redeclipse] Version bump to 1.4.
Package-Manager: portage-2.1.11.55
Manifest-Sign-Key: A018DE8C
Diffstat (limited to 'games-fps')
-rw-r--r-- | games-fps/redeclipse/ChangeLog | 10 | ||||
-rw-r--r-- | games-fps/redeclipse/Manifest | 18 | ||||
-rw-r--r-- | games-fps/redeclipse/files/redeclipse-1.4_gamesdatadir.patch | 20 | ||||
-rw-r--r-- | games-fps/redeclipse/redeclipse-1.4.ebuild (renamed from games-fps/redeclipse/redeclipse-1.3.1.ebuild) | 50 |
4 files changed, 60 insertions, 38 deletions
diff --git a/games-fps/redeclipse/ChangeLog b/games-fps/redeclipse/ChangeLog index 8ce0106..d52db7f 100644 --- a/games-fps/redeclipse/ChangeLog +++ b/games-fps/redeclipse/ChangeLog @@ -1,7 +1,14 @@ # ChangeLog for games-fps/redeclipse -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*redeclipse-1.4 (18 Apr 2013) + + 18 Apr 2013; Azamat H. Hackimov <azamat.hackimov@gmail.com> + +files/redeclipse-1.4_gamesdatadir.patch, +redeclipse-1.4.ebuild, + -redeclipse-1.3.1.ebuild: + [games-fps/redeclipse] Version bump to 1.4. + *redeclipse-1.3.1 (30 Sep 2012) 30 Sep 2012; Azamat H. Hackimov <azamat.hackimov@gmail.com> @@ -34,4 +41,3 @@ 28 Mar 2011; Azamat H. Hackimov <azamat.hackimov@gmail.com> +metadata.xml, +redeclipse-1.0.ebuild: Initial ebuild 1.0 from source code. - diff --git a/games-fps/redeclipse/Manifest b/games-fps/redeclipse/Manifest index f1b008b..ae1f772 100644 --- a/games-fps/redeclipse/Manifest +++ b/games-fps/redeclipse/Manifest @@ -1,21 +1,11 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -DIST redeclipse_1.3.1_nix_bsd.tar.bz2 505092683 SHA256 e29bc8a148c00b8a62b0e77752b7494f0d36f428cb4f24e9b5dc40cdcd67254e SHA512 bbf4f0f07033667cb86665f34449a2ddcc00eee0e399fc83fa5bf6998da57ba94860c8191845bd4652889af3df3cc12c9861dbb10ac2e4828a208e10a48b0543 WHIRLPOOL 5e09e88a1d983de0207c7a0199b17fe59dae48f11dc3ad4b5f59e7cc58b1a65fc1c051340f195b3fc8828baaa94d93601991875b7d7318bcd10b5f21d50ef94f +DIST redeclipse_1.4_nix.tar.bz2 678617164 SHA256 a0dfc527b0f437170a423b55df68a97e1b6e60d8c9fb6c842519b6670c1e69bf SHA512 d9bbafeb5a417391befe53d757252e8de6f6e54c11b11db52f216d66ee11d3fe3dad432385b25868fb3e17f2af7a8462c44a39d2746da58ae761d82ab41d78f1 WHIRLPOOL ff0bae34ce8f3ab9d91590d3116a1069f6bde563c17bfe34878b6fab35a80c7781f9b879046cc7a150212e5cfc81ef5a319f7d5445bad71861412cc84ceaacdd -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iQIcBAEBCAAGBQJQlghgAAoJECZQPTSbOzNL7NkQAJDe+r9ae8fheIQRdjepfZsn -Bg4iQCJFJ8SW3kZud4YRbslmqTZmoEZ7wuG7bqCig0NUTMzIAiCtJtZQKTFcuG/N -jVOQaOyrg2pAX1XXqkzzXMA+HoTAmK7FVOGyWwiHi0o1Q2SSZkreHEIMlONy+rhD -46Ll9C4jV54fuJT1az97GBftTzieNlEE6nFW1zz95ux5yVaYoXvpXLMzeCWPTI0Y -2GFrDKZr3O2koHuXnYmkVBove5DElaVFCe3v0rj2qTrh0EdCTiG/gm1C5vT7He+u -0zvUI/Y90dVnlsJYspBhGMm4P5jBVeEV+tOhMgfhntGBtb3vSEvNU+4bnvyltlFh -7DbtbCoIfRgpFF5ZtG3KZmFC/wi4X+5MOdLZQzLLkCIpX+0Czndd2/OqolXE1ukG -uBcXIWTGxA35aDRa9e+sQDjLwPjzQuMQHOBC/xY+UyEBuCQO79EdhgcPQ3NkQnP9 -K2oxPlTkTM4SOdkKaF8F/9UBAW6UKIy/wexd1AwH7XLh/TSNn4stnTvmJ8V4YBzE -ao4PqjKIBCYufjWvorlzudBplaKzB8VbbIq3MLRU2umdQJmLD+PXncVYfNINOMJU -/u9ikfKnOVT3E9epIkbkZSaaZBgEDfrddtwIdN79nA7bGXnMYvYawZGu8BaRWj/w -hYXHODAB8PEaW83tz259 -=1NNq +iF4EAREIAAYFAlFwN3wACgkQz+A7F6AY3oynHgEAlzgntX3PBS11YAEmfpcyCuc0 +82vpid65xNZ7+1HwGroBAMN/boiSMe7flafZ4yjAKTP6w39m7g8sFKGpQjCDHyov +=6CyC -----END PGP SIGNATURE----- diff --git a/games-fps/redeclipse/files/redeclipse-1.4_gamesdatadir.patch b/games-fps/redeclipse/files/redeclipse-1.4_gamesdatadir.patch new file mode 100644 index 0000000..fbca38b --- /dev/null +++ b/games-fps/redeclipse/files/redeclipse-1.4_gamesdatadir.patch @@ -0,0 +1,20 @@ +diff -Nuar redeclipse-1.4.orig/src/engine/server.cpp redeclipse-1.4/src/engine/server.cpp +--- redeclipse-1.4.orig/src/engine/server.cpp 2013-04-18 23:14:32.899377004 +0600 ++++ redeclipse-1.4/src/engine/server.cpp 2013-04-18 23:18:12.528384587 +0600 +@@ -1407,13 +1407,13 @@ + chdir(dir); + } + #endif +- loopi(3) if(!fileexists(findfile("data/config/keymap.cfg", "r"), "r")) ++ loopi(3) if(!fileexists(findfile("/usr/share/games/redeclipse/data/config/keymap.cfg", "r"), "r")) + { + if(i != 2) chdir(".."); + else fatal("could not find data directory"); + } +- addpackagedir("data"); +- defformatstring(gamedata)("game/%s", server::gameid()); ++ addpackagedir("/usr/share/games/redeclipse/data"); ++ defformatstring(gamedata)("/usr/share/games/redeclipse/game/%s", server::gameid()); + addpackagedir(gamedata); + execfile("version.cfg", false, EXEC_VERSION); + if(wanthome) diff --git a/games-fps/redeclipse/redeclipse-1.3.1.ebuild b/games-fps/redeclipse/redeclipse-1.4.ebuild index 23e4dbb..e049e27 100644 --- a/games-fps/redeclipse/redeclipse-1.3.1.ebuild +++ b/games-fps/redeclipse/redeclipse-1.4.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ -EAPI=4 +EAPI=5 inherit games versionator @@ -10,19 +10,19 @@ 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}_${MAJOR_VERSION}/${PN}_${PV}_nix_bsd.tar.bz2" +SRC_URI="mirror://sourceforge/${PN}/${PN}_${MAJOR_VERSION}/${PN}_${PV}_nix.tar.bz2" -# According to license.txt file -LICENSE="as-is ZLIB CCPL-Attribution-ShareAlike-3.0" +# According to doc/license.txt file +LICENSE="HPND ZLIB CC-BY-SA-3.0" SLOT="0" 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] + media-libs/libsdl:0[opengl] + media-libs/sdl-image:0[jpeg,png] + media-libs/sdl-mixer:0[mp3,vorbis] virtual/opengl x11-libs/libX11 ) @@ -30,23 +30,29 @@ DEPEND="!dedicated? ( sys-libs/zlib" RDEPEND="${DEPEND}" -S=${WORKDIR}/${PN} +#S=${WORKDIR}/${PN} src_prepare() { # Respect GAMES_DATADIR - sed -i -e "s:\(addpackagedir(\"\)data:\1${GAMES_DATADIR}/${PN}/data:" \ - src/engine/server.cpp + epatch "${FILESDIR}"/${P}_gamesdatadir.patch +# sed -e "s:\(addpackagedir(\"\)data:\1${GAMES_DATADIR}/${PN}/data:" \ +# -e "s:::" +# +# -i src/engine/server.cpp # Unbundle enet sed -e "s:\(client\)\: libenet:\1\::" \ -e "s:\(server\)\: libenet:\1\::" \ - -i src/Makefile + -e "s:-Lenet/.libs ::" \ + -e "s:-Ienet/include ::" \ + -i src/core.mk + sed -e ":src/enet \\:d" -i src/dist.mk 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 +# sed -e "/^client/,+1s:-o reclient:-o reclient \$(LDFLAGS):" \ +# -e "/^server/,+1s:-o reserver:-o reserver \$(LDFLAGS):" \ +# -i src/core.mk # Menu and mans sed -e "s:@APPNAME@:${PN}:" \ @@ -70,23 +76,23 @@ src_prepare() { } src_compile() { - cd src +# cd src if ! use dedicated ; then - emake CXXFLAGS="${CXXFLAGS}" STRIP= client server + emake CXXFLAGS="${CXXFLAGS}" STRIP= -C src client server else - emake CXXFLAGS="${CXXFLAGS}" STRIP= server + emake CXXFLAGS="${CXXFLAGS}" STRIP= -C src server fi } src_install() { - newgamesbin src/reserver ${PN}-server + dogamesbin src/${PN}_server doman doc/man/redeclipse-server.6 - dodoc readme.txt doc/examples/serv{exec,init}.cfg + dodoc readme.txt doc/examples/servinit.cfg if ! use dedicated ; then - newgamesbin src/reclient ${PN} + dogamesbin src/redeclipse insinto "${GAMES_DATADIR}"/${PN} - doins -r data + doins -r data game newicon src/install/nix/${PN}_x128.png ${PN}.png domenu src/install/nix/redeclipse.desktop doman doc/man/redeclipse.6 |