summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavide Cendron <scen@gentoo.org>2007-10-25 20:15:39 +0000
committerDavide Cendron <scen@gentoo.org>2007-10-25 20:15:39 +0000
commit555d47cd5c63a57bef2992f644139752d98a1654 (patch)
tree1b097919ad6c969ad1e4962916bf29b393123a95 /games-fps/uhexen2
parentbunch of keyword reorderings (diff)
downloadsunrise-reviewed-555d47cd5c63a57bef2992f644139752d98a1654.tar.gz
sunrise-reviewed-555d47cd5c63a57bef2992f644139752d98a1654.tar.bz2
sunrise-reviewed-555d47cd5c63a57bef2992f644139752d98a1654.zip
games-fps/uhexen2: Rollback (partially) previous change: uhexen2 and uhexen2-cvs cannot coexist
svn path=/sunrise/; revision=4862
Diffstat (limited to 'games-fps/uhexen2')
-rw-r--r--games-fps/uhexen2/ChangeLog3
-rw-r--r--games-fps/uhexen2/Manifest4
-rw-r--r--games-fps/uhexen2/uhexen2-1.4.2.ebuild3
3 files changed, 7 insertions, 3 deletions
diff --git a/games-fps/uhexen2/ChangeLog b/games-fps/uhexen2/ChangeLog
index 8aa969b96..7b4717409 100644
--- a/games-fps/uhexen2/ChangeLog
+++ b/games-fps/uhexen2/ChangeLog
@@ -2,6 +2,9 @@
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 25 Oct 2007; Davide Cendron (scen) <scen@gentoo.org> uhexen2-1.4.2.ebuild:
+ Rollback (partially) previous change: uhexen2 and uhexen2-cvs cannot coexist
+
19 Oct 2007; Markus Ullmann <jokey@gentoo.org> uhexen2-1.4.2:
Don't have an ebuild block itself
diff --git a/games-fps/uhexen2/Manifest b/games-fps/uhexen2/Manifest
index 9850daf5d..2724c12a4 100644
--- a/games-fps/uhexen2/Manifest
+++ b/games-fps/uhexen2/Manifest
@@ -1,6 +1,6 @@
DIST gamedata-all-1.19.tgz 3703620 RMD160 091d7fbb6db27dab197ad5932be9f40764b21209 SHA1 f898157169316a6557a70b469976b22ddc3c03cd SHA256 1d291d06f3de337bc0ef13dae3d1c0d7593d5a9308a8a2451196730ffb5fe7b1
DIST hexen2source-1.4.2.tgz 2062106 RMD160 bc9f000ce11b5be06ddce64e3a6fe09008b5ea71 SHA1 5b4470a615e82f43f7a4d75896402b1c83a93cc3 SHA256 cd12e4a24edf1958e773110493a6ef67947d400eb74be2821c3b6786c7769c49
DIST hexenworld-pakfiles-0.15.tgz 4956848 RMD160 cd6cafb8e597028e1405638b7a60e1f30ce6d846 SHA1 57af1db9a92f2e41f8fa0f1e5f779f4ec648e730 SHA256 215e92f58bc7ed6098f076b45a20b94092599bfce6c4cd00f2895b24a6ee72fe
-EBUILD uhexen2-1.4.2.ebuild 12811 RMD160 0190a0d7558fb6054b8e547c26fde1bd6c6261d4 SHA1 a8922b1fc3062dc0f93bbb883c2f6bf1c9a54690 SHA256 1c58704b7529012f785c9b8f4cabde08f37e88fd11d8136cf2518bb414330f6c
-MISC ChangeLog 1272 RMD160 2095c100233ffac3780b04c0b806f22827e83efb SHA1 b58b2080ec624f3f860948255a9b888aca269a88 SHA256 8b38271fa9e588da6d8c497fb6e2c54e25ad7c65588f5fc925344a71ca0fe0ed
+EBUILD uhexen2-1.4.2.ebuild 12835 RMD160 d02858942ab05fcd33c13d73f7f395be323cf24e SHA1 19996a50adbc4379609a17ce4b9c9d5d0b8a8ea0 SHA256 b8a37eb68c377a4bb249810313fa1e7a624f22cad14a6f578900a06aa57b1ba3
+MISC ChangeLog 1429 RMD160 af65119eacd7c520f52636d75dc35b15832e89f7 SHA1 576a350c1b2bb237c2d5f7972f0be259455ad1b8 SHA256 1dbf616f10d39706fe936ad438bf124388d634638a1a43ed3c3942e44b4558eb
MISC metadata.xml 321 RMD160 38328099fe4e3737564b5075ba94015829a70953 SHA1 48dbdf9f010778df1a854d8b1cce37da8adfac62 SHA256 df59705cd6050e64fd7d238a1ee22836d82f34a69c0db9d8cc70edfded51dc7e
diff --git a/games-fps/uhexen2/uhexen2-1.4.2.ebuild b/games-fps/uhexen2/uhexen2-1.4.2.ebuild
index 04d898f81..a6f4912c4 100644
--- a/games-fps/uhexen2/uhexen2-1.4.2.ebuild
+++ b/games-fps/uhexen2/uhexen2-1.4.2.ebuild
@@ -41,7 +41,8 @@ UIDEPEND=">=media-libs/libsdl-1.2.7
LNCHDEPEND="gtk? ( =x11-libs/gtk+-2* )"
# xdelta is needed to manually run the patch script
-RDEPEND="${UIDEPEND}
+RDEPEND="!games-fps/uhexen2-cvs
+ ${UIDEPEND}
${LNCHDEPEND}
demo? ( >=games-fps/hexen2-demodata-${DEMO_PV} )
lights? ( games-fps/hexen2-lights )