Added a new revision from Paul Bredbury <brebs@sent.com> and closing bug #123202, bug #116528, and bug #126538.

(Portage version: 2.1_pre6-r3)

3 files changed, 207 insertions, 1 deletions

diff --git a/games-fps/ut2004-data/ChangeLog b/games-fps/ut2004-data/ChangeLog
index 1e22beecfa9f..ae42468df560 100644
--- a/games-fps/ut2004-data/ChangeLog
+++ b/games-fps/ut2004-data/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-fps/ut2004-data
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2004-data/ChangeLog,v 1.6 2006/03/14 23:16:09 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2004-data/ChangeLog,v 1.7 2006/03/17 21:13:59 wolf31o2 Exp $
+
+*ut2004-data-3186-r2 (17 Mar 2006)
+
+  17 Mar 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  +ut2004-data-3186-r2.ebuild:
+  Added a new revision from Paul Bredbury <brebs@sent.com> and closing bug
+  #123202, bug #116528, and bug #126538.
 
 *ut2004-data-3186-r1 (14 Mar 2006)
 
diff --git a/games-fps/ut2004-data/files/digest-ut2004-data-3186-r2 b/games-fps/ut2004-data/files/digest-ut2004-data-3186-r2
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/games-fps/ut2004-data/files/digest-ut2004-data-3186-r2
diff --git a/games-fps/ut2004-data/ut2004-data-3186-r2.ebuild b/games-fps/ut2004-data/ut2004-data-3186-r2.ebuild
new file mode 100644
index 000000000000..e6492e4199d4
--- /dev/null
+++ b/games-fps/ut2004-data/ut2004-data-3186-r2.ebuild
@@ -0,0 +1,199 @@
+# Copyright 1999-2006 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-r2.ebuild,v 1.1 2006/03/17 21:13:59 wolf31o2 Exp $
+
+inherit games games-ut2k4mod
+
+DESCRIPTION="Unreal Tournament 2004 - This is the data portion of UT2004"
+HOMEPAGE="http://www.unrealtournament2004.com/"
+SRC_URI=""
+
+LICENSE="ut2003"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="nostrip nomirror"
+IUSE=""
+
+DEPEND="games-util/uz2unpack"
+
+S=${WORKDIR}
+
+GAMES_LICENSE_CHECK="yes"
+dir=${GAMES_PREFIX_OPT}/ut2004
+Ddir=${D}/${dir}
+
+pkg_setup() {
+	ewarn "This is a huge package.  If you do not have at least 7GB of free"
+	ewarn "disk space in ${PORTAGE_TMPDIR} and also in ${GAMES_PREFIX_OPT} then"
+	ewarn "you should abort this installation now and free up some space."
+	games_pkg_setup
+	check_dvd
+
+	if [[ "${USE_DVD}" -eq 1 ]]
+	then
+		DISK1="CD1/"
+		DISK2="CD2/"
+		DISK3="CD3/"
+		DISK4="CD4/"
+		DISK5="CD5/"
+		DISK6="CD6/"
+		if [[ "${USE_ECE_DVD}" -eq 1 ]]
+		then
+			cdrom_get_cds "${DISK1}"System/UT2004.ini \
+				"${DISK2}"Textures/2K4Fonts.utx.uz2 \
+				"${DISK3}"Textures/ONSDeadVehicles-TX.utx.uz2 \
+				"${DISK4}"Textures/XGameShaders2004.utx.uz2 \
+				"${DISK5}"Speech/ons.xml \
+				"${DISK6}"/DirectX9/BDA.cab
+		else
+			cdrom_get_cds "${DISK1}"/System/UT2004.ini \
+				"${DISK2}"/Textures/2K4Fonts.utx.uz2 \
+				"${DISK3}"/Textures/ONSDeadVehicles-TX.utx.uz2 \
+				"${DISK4}"/Music/KR-UT2004-Menu.ogg \
+				"${DISK5}"/Speech/ons.xml "${DISK6}"/DirectX9/BDA.cab
+		fi
+	else
+		cdrom_get_cds System/UT2004.ini \
+			Textures/2K4Fonts.utx.uz2 \
+			Textures/ONSDeadVehicles-TX.utx.uz2 \
+			Music/KR-UT2004-Menu.ogg \
+			Speech/ons.xml DirectX9/BDA.cab
+	fi
+}
+
+src_unpack() {
+	unpack_makeself "${CDROM_ROOT}"/linux-installer.sh \
+		|| die "unpacking linux installer"
+	use x86 && tar -xf "${S}"/linux-x86.tar
+	use amd64 && tar -xf "${S}"/linux-amd64.tar
+}
+
+src_install() {
+	dodir "${dir}"/System/editorres
+
+	# Disk 1
+	einfo "Copying files from Disk 1..."
+	cp -r "${CDROM_ROOT}/${DISK1}"{Animations,ForceFeedback,Help,KarmaData,Maps,Sounds,Web} "${Ddir}" \
+		|| die "copying files"
+	cp -r "${CDROM_ROOT}/${DISK1}"System/{editorres,*.{bat,bmp,dat,det,est,frt,ini,int,itt,kot,md5,smt,tmt,u,ucl,upl,url}} \
+		"${Ddir}"/System || die "copying files"
+	mkdir -p "${Ddir}"/Manual || die "creating manual folder"
+	cp "${CDROM_ROOT}/${DISK1}"Manual/Manual.pdf "${Ddir}"/Manual \
+		|| die "copying manual"
+	mkdir -p "${Ddir}"/Benchmark/Stuff || die "creating benchmark folders"
+	cp -r "${CDROM_ROOT}/${DISK1}"Benchmark/Stuff/* "${Ddir}"/Benchmark/Stuff \
+		|| die "copying benchmark files"
+	cdrom_load_next_cd
+
+	# Disk 2
+	einfo "Copying files from Disk 2..."
+	cp -r "${CDROM_ROOT}/${DISK2}"{Sounds,Textures} "${Ddir}" || die "copying files"
+	cdrom_load_next_cd
+
+	# Disk 3
+	einfo "Copying files from Disk 3..."
+	cp -r "${CDROM_ROOT}/${DISK3}"Textures "${Ddir}" || die "copying files"
+	cdrom_load_next_cd
+
+	# Disk 4
+	einfo "Copying files from Disk 4..."
+	if [[ "${USE_ECE_DVD}" -eq 1 ]]
+	then
+		cp -r "${CDROM_ROOT}/${DISK4}"{StaticMeshes,Textures} "${Ddir}" \
+			|| die "copying files"
+	else
+		cp -r "${CDROM_ROOT}/${DISK4}"{Music,StaticMeshes,Textures} "${Ddir}" \
+			|| die "copying files"
+	fi
+	cdrom_load_next_cd
+
+	# Disk 5
+	einfo "Copying files from Disk 5..."
+	if [[ "${USE_ECE_DVD}" -eq 1 ]]
+	then
+		cp -r "${CDROM_ROOT}/${DISK5}"{Music,Sounds,Speech,StaticMeshes} "${Ddir}" \
+			|| die "copying files"
+	else
+		cp -r "${CDROM_ROOT}/${DISK5}"{Music,Sounds,Speech} "${Ddir}" \
+			|| die "copying files"
+	fi
+	cdrom_load_next_cd
+
+	# Disk 6
+	einfo "Copying files from Disk 6..."
+	cp -r "${CDROM_ROOT}/${DISK6}"/Sounds "${Ddir}" \
+		|| die "copying files"
+
+	# Create empty files in Benchmark
+	for j in {CSVs,Logs,Results}
+	do
+		mkdir -p "${Ddir}/Benchmark/${j}" || die "creating folders"
+		touch "${Ddir}/Benchmark/${j}"/DO_NOT_DELETE.ME || die "creating files"
+	done
+
+	# Install extra help files
+	insinto "${dir}"/Help
+	doins "${S}"/Unreal.bmp
+
+	# Install EULA
+	insinto "${dir}"
+	doins "${S}"/UT2004_EULA.txt
+
+	# Install System.inis
+	insinto "${dir}"/System
+	doins "${S}"/ini-{det,est,frt,int,itt,kot,smt,tmt}.tar
+
+	# Copy ut2004
+	exeinto "${dir}"
+	doexe "${S}"/bin/ut2004 || die "copying ut2004"
+
+	exeinto "${dir}"/System
+	# We install the provided libraries because upstream wants it that way.
+	# If you want to use your own system binaries, then feel free to uncomment
+	# the following.  You will also want to comment the doexe lines below that
+	# installs the libraries.
+#	newexe "${S}"/System/openal.so openal.so-binary
+#	newexe "${S}"/System/libSDL-1.2.so.0 libSDL-1.2.so.0-binary
+	doexe ${S}/System/{libSDL-1.2.so.0,openal.so} \
+		|| die "copying libraries"
+	doexe "${S}"/System/{u{cc,t2004}-bin} \
+		|| die "copying libs/ucc/ut2004"
+
+	# Uncompressing files
+	einfo "Uncompressing files... this *will* take a while..."
+	for j in {Animations,Maps,Sounds,StaticMeshes,Textures}
+	do
+		chmod -R u+w "${Ddir}/${j}" || die "chmod in uncompress"
+		games_ut_unpack "${Ddir}/${j}" || die "uncompressing files"
+	done
+
+	# Removing unneccessary files in System and Help
+	rm -f "${Ddir}"/Help/{InstallerLogo.bmp,SAPI-EULA.txt,{Unreal,UnrealEd}.ico}
+	rm -f "${Ddir}"/System/*.tar
+	rm -f "${Ddir}"/System/{{License,Manifest}.smt,{ucc,StdOut}.log}
+	rm -f "${Ddir}"/System/{User,UT2004,Manifest}.ini
+	rm -f "${Ddir}"/System/{Manifest.int,Packages.md5}
+
+	# Installing documentation/icon
+	dodoc "${S}"/README.linux || die "dodoc README.linux"
+	insinto /usr/share/pixmaps
+	doins "${S}"/ut2004.xpm || die "copying pixmap"
+	insinto "${dir}"
+	doins "${S}"/{README.linux,ut2004.xpm} || die "copying readme/icon"
+
+	# Now, since these files are coming off a CD, the times/sizes/md5sums won't
+	# be different ... that means portage will try to unmerge some files (!)
+	# We run touch on ${D} so as to make sure portage doesn't do any such thing
+	find "${Ddir}" -exec touch '{}' \;
+
+	prepgamesdirs
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+
+	echo
+	einfo "This is only the data portion of the game.  To play UT2004, you"
+	einfo "still need to emerge ut2004."
+	echo
+}