fixed two errors.

svn path=/sunrise/; revision=10549

diff --git a/games-fps/assaultcube/ChangeLog b/games-fps/assaultcube/ChangeLog
index 0385ca8b5c29b756873b88394b29639e7cfd8266..bdb14cfb6ce5018970dc32bb053fe6782a0dedb2 100644 (file)
--- a/games-fps/assaultcube/ChangeLog
+++ b/games-fps/assaultcube/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  12 May 2010; Michael Weber (xmw) <gentoo@xmw.de> assaultcube-1.0.4.ebuild:
+  The enet.patch is only needed for the exact version 1.2 of enet, thanks to
+  Paul Hartman <gentoo@h5n.us> for the report. Corrected typo in passing
+  toolchains CXX to build system.
+
   01 May 2010; Michael Weber (xmw) <gentoo@xmw.de>
   +assaultcube-1.0.4.ebuild, +metadata.xml:
   New Ebuild for bug 162945

diff --git a/games-fps/assaultcube/Manifest b/games-fps/assaultcube/Manifest
index 9d5bcf9ccc0baef60cd95131a48b4792b55cb422..c6ce86edb7b896f9ff968bbb27ca931bc1528729 100644 (file)
--- a/games-fps/assaultcube/Manifest
+++ b/games-fps/assaultcube/Manifest
@@ -2,6 +2,6 @@ DIST AssaultCube_v1.0.2.tar.bz2 42673504 RMD160 d95f2d8b569aeb7e7dd9f7d654b51bae
 DIST AssaultCube_v1.0.4-Update.tar.bz2 3339841 RMD160 79f42b89953850e1ca58ee251593b353ef0359d7 SHA1 3e667802282955958031ca89e0c46ddb8b9c7920 SHA256 fa72e537ac29b6ba91438585b765185a6898e522c04d4c08f74910040648606c
 DIST assaultcube-1.0.4-Makefile.patch 1473 RMD160 bfb027db3a60ce7213f25dc4f77e2753098e18cb SHA1 21026dfa555991a41ad64aca02a8913d370dcd6e SHA256 b6cb7a9fef21cca67fdae70a5772494d3f670728cdb1b7260d3d690a6a3253ab
 DIST assaultcube-1.0.4-enet.patch 3788 RMD160 42326d3b8ae8041a84286602d14cf9ba66c78d64 SHA1 a4db7af1fc65e7416ab0e33c6e60f2eeb878fe4d SHA256 879ccc7cb4596f03a1622c6cc23bd0cd851595fa1f34b5dde329679ce880794d
-EBUILD assaultcube-1.0.4.ebuild 2495 RMD160 e1927ff8e53df1dbdc582e34d514f2914f9627f2 SHA1 d1f441369ea3096e0f7595526efe61063e272acf SHA256 f137c9418090a05c8dde698dfd5f258aa36e15f182d679a00dd8d22c5b6f6391
-MISC ChangeLog 246 RMD160 f807b2efe2f39ab3b85c9eea138e4a79dc84d1d7 SHA1 b2a8441663f3ec2de70b9c5ad2d133739e90b31d SHA256 ca00ca61d93b5efc1b6607f716bcf55bfd73f542e1ad37329cff99728457690e
+EBUILD assaultcube-1.0.4.ebuild 2537 RMD160 27b143ec65303b773dd49d94f5d2835394d21574 SHA1 2b4ca1c4bb67fc61c0f93887ea044e49889f44f3 SHA256 0085ffb851263f1b4782e4b9664745c80321ef46208e73412bba6bdc20b2a96a
+MISC ChangeLog 508 RMD160 8ead566504665a0fa7e01ef98376d16b8f7f0225 SHA1 da7afc08348e30c7ce19b914ba94523a1a2136df SHA256 d8267ca7f14b799abfbae5ea80855706cecaf2b5f62b301b8ddc83a8a28a8efc
 MISC metadata.xml 229 RMD160 f0f6417bec31ce8baba6d476664f7210c8c84c98 SHA1 e5f94f5caadc6f843fc90bb7959570cd503676fd SHA256 3b08fca3c878bdfc4e7639f477dd542d55a4ab5dce39a475e82633071d13eb3f

diff --git a/games-fps/assaultcube/assaultcube-1.0.4.ebuild b/games-fps/assaultcube/assaultcube-1.0.4.ebuild
index 1365e98a5f19893cb73cc998d20c83b2f77c54cc..d07fbdbadf9f53dfc7745b38918a6d80d6181e81 100644 (file)
--- a/games-fps/assaultcube/assaultcube-1.0.4.ebuild
+++ b/games-fps/assaultcube/assaultcube-1.0.4.ebuild
@@ -54,15 +54,17 @@ src_prepare() {
        winicontoppm icon.ico | ppmtoxpm > ${PN}.xpm || die
 
        epatch "${DISTDIR}"/${P}-Makefile.patch
-       epatch "${DISTDIR}"/${P}-enet.patch
+       if has_version "=net-libs/enet-1.2" ; then
+               epatch "${DISTDIR}"/${P}-enet.patch
+       fi
 
        sed -i -e "/^CUBE_DIR=/d ; 2iCUBE_DIR=${GAMES_DATADIR}/${PN}" ${PN}.sh server.sh || die
        sed -i -e "s:\${CUBE_DIR}/bin_unix/\${SYSTEM_NAME}\${MACHINE_NAME}:$(games_get_libdir)/${PN}/ac_:" ${PN}.sh server.sh || die
 }
 
 src_compile() {
+       tc-export CXX
        emake -C source/src \
-               CC="$(tc-getCXX)" \
                CXXOPTFLAGS="${CXXFLAGS}" \
                $(use opengl && echo client) \
                $(use dedicated && echo server) || die