summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTristan Heaven <tristan@gentoo.org>2009-09-30 00:58:31 +0000
committerTristan Heaven <tristan@gentoo.org>2009-09-30 00:58:31 +0000
commit5015ab67c8a780608773c4381100d9e253ee4e51 (patch)
tree8456a76f495fb48338dd6f0516f5f6d432b6f429 /games-fps
parentdrop old epatch line #286987 (diff)
downloadhistorical-5015ab67c8a780608773c4381100d9e253ee4e51.tar.gz
historical-5015ab67c8a780608773c4381100d9e253ee4e51.tar.bz2
historical-5015ab67c8a780608773c4381100d9e253ee4e51.zip
Move check_dvd function from games-ut2k4mod.eclass to here
Package-Manager: portage-2.2_rc42/cvs/Linux x86_64
Diffstat (limited to 'games-fps')
-rw-r--r--games-fps/ut2004-data/ChangeLog5
-rw-r--r--games-fps/ut2004-data/Manifest10
-rw-r--r--games-fps/ut2004-data/ut2004-data-3186-r3.ebuild37
3 files changed, 43 insertions, 9 deletions
diff --git a/games-fps/ut2004-data/ChangeLog b/games-fps/ut2004-data/ChangeLog
index dc718b8ab4e5..f651cb682db4 100644
--- a/games-fps/ut2004-data/ChangeLog
+++ b/games-fps/ut2004-data/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for games-fps/ut2004-data
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2004-data/ChangeLog,v 1.23 2009/06/19 12:42:39 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2004-data/ChangeLog,v 1.24 2009/09/30 00:58:31 nyhm Exp $
+
+ 30 Sep 2009; Tristan Heaven <nyhm@gentoo.org> ut2004-data-3186-r3.ebuild:
+ Move check_dvd function from games-ut2k4mod.eclass to here
19 Jun 2009; Tristan Heaven <nyhm@gentoo.org> ut2004-data-3186-r3.ebuild:
Don't install libsdl and openal, bug #264989
diff --git a/games-fps/ut2004-data/Manifest b/games-fps/ut2004-data/Manifest
index 4027a2c1ce4e..8f31b21bc05b 100644
--- a/games-fps/ut2004-data/Manifest
+++ b/games-fps/ut2004-data/Manifest
@@ -1,13 +1,13 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
-EBUILD ut2004-data-3186-r3.ebuild 7280 RMD160 599fee81ad83b2a8bde795d96f602198db190239 SHA1 3c377609e55c0b74000d3b1ec91937355be41dd0 SHA256 2833fa77bdcf3b0d87b16d64ac244015e402cd0ebd1c1f11e1a5a3207046e846
-MISC ChangeLog 4245 RMD160 a2272386e68fc29c433d9d6329933c537e06db3f SHA1 40a6561bab4a7e07d6e82bcd822424f597a07920 SHA256 434efb205a709cfe6e88ef99430d688681f64fa45f99ff81df1a4e926b197791
+EBUILD ut2004-data-3186-r3.ebuild 8034 RMD160 cab97f3b7e535ca9ea48f4478dc37d34e661b584 SHA1 2204f7a3cd22b34ad36f89a9d3bb58695a8575d1 SHA256 b7731ec6699baa91ae1866928584ed445cb5304476413b7bdf1ebcca5be8b843
+MISC ChangeLog 4383 RMD160 37ef6f1c90036dc009c66f88e204664f3ec558cd SHA1 9ff636d5c884040b391b01617097493621f03a78 SHA256 9d8758d733b61627c53a0f3e9e3a52f817d2b49d40cf8f47caaab6b653a16c00
MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.11 (GNU/Linux)
-iEYEARECAAYFAko7h8UACgkQdz7hIScOURF9lACfYGMHFmiP7llMVVSVY27Nusxd
-1QgAn0SAYzhplO1RAh7clnQWOMN9jJ4k
-=9tty
+iEYEARECAAYFAkrCrT0ACgkQdz7hIScOURFx8wCg8k8d+aQNvC+OTV7QNMvxBTHx
+xxgAn2SWxaUbxWvWK7XbeG0Xj9vFzWaR
+=DZDd
-----END PGP SIGNATURE-----
diff --git a/games-fps/ut2004-data/ut2004-data-3186-r3.ebuild b/games-fps/ut2004-data/ut2004-data-3186-r3.ebuild
index 5ab1e2031937..e317de913c83 100644
--- a/games-fps/ut2004-data/ut2004-data-3186-r3.ebuild
+++ b/games-fps/ut2004-data/ut2004-data-3186-r3.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2004-data/ut2004-data-3186-r3.ebuild,v 1.13 2009/06/19 12:42:39 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2004-data/ut2004-data-3186-r3.ebuild,v 1.14 2009/09/30 00:58:31 nyhm Exp $
-inherit eutils games games-ut2k4mod
+inherit eutils games
DESCRIPTION="Unreal Tournament 2004 - This is the data portion of UT2004"
HOMEPAGE="http://www.unrealtournament2004.com/"
@@ -13,7 +13,6 @@ SLOT="0"
KEYWORDS="amd64 x86"
RESTRICT="strip"
IUSE=""
-QA_TEXTRELS="${GAMES_PREFIX_OPT:1}/ut2004/System/libSDL-1.2.so.0"
DEPEND="games-util/uz2unpack"
PDEPEND="games-fps/ut2004"
@@ -24,6 +23,38 @@ GAMES_LICENSE_CHECK="yes"
dir=${GAMES_PREFIX_OPT}/ut2004
Ddir=${D}/${dir}
+check_dvd() {
+ # The following is a nasty mess to determine if we are installing from
+ # a DVD or from multiple CDs. Anyone feel free to submit patches to this
+ # to bugs.gentoo.org as I know it is a very ugly hack.
+
+ USE_DVD=
+ USE_ECE_DVD=
+ USE_MIDWAY_DVD=
+ USE_GERMAN_MIDWAY_DVD=
+
+ local r
+ for r in "${CD_ROOT}" "${CD_ROOT_1}" \
+ `mount | egrep -e '(iso|cdrom)' | awk '{print $3}'` ; do
+ if [[ -n "${r}" ]] ; then
+ einfo "Searching ${r}"
+ if [[ -e "${r}/AutoRunData/Unreal.ico" ]] \
+ && [[ -e "${r}/Disk5/data6.cab" ]] ; then
+ USE_MIDWAY_DVD=1
+ USE_DVD=1
+ elif [[ -e "${r}/autorund/unreal.ico" ]] \
+ && [[ -e "${r}/disk7/data8.cab" ]] ; then
+ USE_MIDWAY_DVD=1
+ USE_GERMAN_MIDWAY_DVD=1
+ USE_DVD=1
+ else
+ [[ -d "${r}/CD1" ]] && USE_DVD=1
+ [[ -d "${r}/CD7" ]] && USE_ECE_DVD=1
+ fi
+ fi
+ done
+}
+
grabdirs() {
local d srcdir