diff options
author | 2011-03-03 16:45:39 +0100 | |
---|---|---|
committer | 2011-03-03 16:45:39 +0100 | |
commit | cd8b27ca0c7db1db3a3a8b74cba186c9dd1745ad (patch) | |
tree | 713e6cd9170f8924b41116f661f9e4e23cddd99b | |
parent | vegastrike: fix copy-and-paste (diff) | |
download | nikai-cd8b27ca0c7db1db3a3a8b74cba186c9dd1745ad.tar.gz nikai-cd8b27ca0c7db1db3a3a8b74cba186c9dd1745ad.tar.bz2 nikai-cd8b27ca0c7db1db3a3a8b74cba186c9dd1745ad.zip |
vegastrike: sync ebuilds, fix mesher
-rw-r--r-- | games-simulation/vegastrike/Manifest | 4 | ||||
-rw-r--r-- | games-simulation/vegastrike/vegastrike-0.5.1_beta1.ebuild | 12 | ||||
-rw-r--r-- | games-simulation/vegastrike/vegastrike-9999.ebuild | 41 |
3 files changed, 26 insertions, 31 deletions
diff --git a/games-simulation/vegastrike/Manifest b/games-simulation/vegastrike/Manifest index 70c50d7..d64997d 100644 --- a/games-simulation/vegastrike/Manifest +++ b/games-simulation/vegastrike/Manifest @@ -1,4 +1,4 @@ DIST vegastrike-src-0.5.1.beta1.tar.bz2 11097379 RMD160 c9507be13a305bbb3c415c5cafaf78a3562509fd SHA1 020208cbfb558860652d2164ae25d54bc1b36369 SHA256 80f411941237f8b89d9922e5cf62b7cefa409a145ce9d015aca41f5f8b8434e6 -EBUILD vegastrike-0.5.1_beta1.ebuild 4935 RMD160 a74d39eec2b13e08ba23f8be3f8accf1bf17c790 SHA1 0a57b05e6126959604a837dc53c9b5fa3b406bd6 SHA256 18d9bc81fab0d5577137b4207e9accca6209b33bb498886b830ef28a10a6e3b5 -EBUILD vegastrike-9999.ebuild 4753 RMD160 fd14061bbab1a0d021bf0a0dc10dd85802d77f40 SHA1 c65349f85fe4ba2e01668819496fe090c9b9eb35 SHA256 c7cbe410f41979173f9f6c983b45e858f0b9c15bab1a0ad6046d72ce0b238764 +EBUILD vegastrike-0.5.1_beta1.ebuild 4860 RMD160 4af484adbb6d4e5fd5ab9fbe66e66a9a4c96ca71 SHA1 bc7c7e59893b92e36515daa2a311968ba5c2b616 SHA256 177a25a7968223c23f7a2eb432a6a25fb47ac8482903c87623054a463fcdf54a +EBUILD vegastrike-9999.ebuild 4645 RMD160 7bc2a804bf06b98e280a3f63e5a4c52b52389f59 SHA1 7ce646d068efdd11e1a81cb1d053ea4379669c6c SHA256 ebdf68d8030a23913a59c866136c66f8ff62d252a33c55fb39db40270542b678 MISC metadata.xml 1155 RMD160 ed5c41ffa01ee8f614fb5975c17202a962ddfb85 SHA1 bd4082320716449ca5419ca117857e238ac62229 SHA256 15c9d425d2fbd829ecfce1288356ce4c26025dba59901b0213011e5837467d9c diff --git a/games-simulation/vegastrike/vegastrike-0.5.1_beta1.ebuild b/games-simulation/vegastrike/vegastrike-0.5.1_beta1.ebuild index b81d001..62d556b 100644 --- a/games-simulation/vegastrike/vegastrike-0.5.1_beta1.ebuild +++ b/games-simulation/vegastrike/vegastrike-0.5.1_beta1.ebuild @@ -72,10 +72,10 @@ src_unpack() { unpack ${A} cd "${S}" - mv vegastrike-src-0.5.1.beta1 vegastrike - cd vegastrike + mv vegastrike-src-0.5.1.beta1 ${PN} # Sort out directory references + cd "${S}/${PN}" sed -i \ -e "s!/usr/games/vegastrike!${GAMES_DATADIR}/${PN}!" \ -e "s!/usr/local/bin!${GAMES_BINDIR}!" \ @@ -148,23 +148,23 @@ echo "Each playlist represents a place or situation in Vega Strike" exit 0 EOF - dogamesbin vegastrike-0.5.1_beta1_build/vegastrike \ + dogamesbin ${P}_build/vegastrike \ || die "Creation of vegastrike (the binary) failed" dogamesbin vsinstall \ || die "Creation of vsinstall failed" if use server; then - dogamesbin vegastrike-0.5.1_beta1_build/vegaserver \ + dogamesbin ${P}_build/vegaserver \ || die "Creation of vegaserver failed" fi if use mesher; then - dogamesbin vegastrike-0.5.1_beta1_build/objconv/mesh_tool \ + dogamesbin ${P}_build/objconv/mesh_tool \ || die "Creation of mesher failed" fi # cmake-utils_src_install - newgamesbin vegastrike-0.5.1_beta1_build/setup/vssetup vssetup \ + newgamesbin ${P}_build/setup/vssetup vssetup \ || { ewarn "vssetup was not built. You will have to"; \ ewarn "manually edit ~/.vegastrike/vegastrike.config."; } diff --git a/games-simulation/vegastrike/vegastrike-9999.ebuild b/games-simulation/vegastrike/vegastrike-9999.ebuild index 81ad232..37cbb60 100644 --- a/games-simulation/vegastrike/vegastrike-9999.ebuild +++ b/games-simulation/vegastrike/vegastrike-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ # Derived from bug 65084 @@ -47,11 +47,11 @@ CMAKE_USE_DIR="${S}/${PN}" pkg_setup() { games_pkg_setup - # FIXME: is this still a problem? - einfo "If compiling fails for you on gl_globals.h, try to replace your" - einfo "glext.h (usually found in /usr/include/GL/ with this one" - einfo "http://oss.sgi.com/projects/ogl-sample/ABI/glext.h" - einfo "remember to make backup of the original though" +# # FIXME: is this still a problem? +# einfo "If compiling fails for you on gl_globals.h, try to replace your" +# einfo "glext.h (usually found in /usr/include/GL/ with this one" +# einfo "http://oss.sgi.com/projects/ogl-sample/ABI/glext.h" +# einfo "remember to make backup of the original though" } src_unpack() { @@ -66,7 +66,7 @@ src_unpack() { fi einfo "Copying source to work directory..." - cp -a "${svn}"/vegastrike/* "${S}" >&/dev/null + cp -a "${svn}"/${PN}/* "${S}" >&/dev/null # Sort out directory references cd "${S}/${PN}" @@ -111,22 +111,17 @@ src_compile() { if use threads; then sed -i \ -e "s!CPU_SMP:STRING=1!CPU_SMP:STRING=${CPU_SMP}!" \ - vegastrike_build/CMakeCache.txt + ${PN}_build/CMakeCache.txt fi + cmake-utils_src_make vssetup || die "Failed to build vssetup" if use server; then - if use mesher; then - cmake-utils_src_make vssetup vegastrike vegaserver mesh_tool - else - cmake-utils_src_make vssetup vegastrike vegaserver - fi - else - if use mesher; then - cmake-utils_src_make vssetup vegastrike mesh_tool - else - cmake-utils_src_make vssetup vegastrike - fi + cmake-utils_src_make vegaserver + fi + if use mesher; then + cmake-utils_src_make mesh_tool fi + cmake-utils_src_make vegastrike || die "Failed to build vegastrike" } src_install() { @@ -146,23 +141,23 @@ echo "Each playlist represents a place or situation in Vega Strike" exit 0 EOF - dogamesbin vegastrike-9999_build/vegastrike \ + dogamesbin ${P}_build/vegastrike \ || die "Creation of vegastrike (the binary) failed" dogamesbin vsinstall \ || die "Creation of vsinstall failed" if use server; then - dogamesbin vegastrike-9999_build/vegaserver \ + dogamesbin ${P}_build/vegaserver \ || die "Creation of vegaserver failed" fi if use mesher; then - dogamesbin vegastrike_build/objconv/mesh_tool \ + dogamesbin ${P}_build/objconv/mesh_tool \ || die "Creation of mesher failed" fi # cmake-utils_src_install - newgamesbin vegastrike-9999_build/setup/vssetup vssetup \ + newgamesbin ${P}_build/setup/vssetup vssetup \ || { ewarn "vssetup was not built. You will have to"; \ ewarn "manually edit ~/.vegastrike/vegastrike.config."; } |