Cleaned up older versions and changed DESCRIPTION. Closing bug #126704.

(Portage version: 2.1_pre6-r2)

4 files changed, 7 insertions, 149 deletions

diff --git a/games-fps/ut2004/ChangeLog b/games-fps/ut2004/ChangeLog
index 1bc065613571..ddf4697299df 100644
--- a/games-fps/ut2004/ChangeLog
+++ b/games-fps/ut2004/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-fps/ut2004
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2004/ChangeLog,v 1.44 2006/03/17 21:16:49 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2004/ChangeLog,v 1.45 2006/03/20 19:40:22 wolf31o2 Exp $
+
+  20 Mar 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  -ut2004-3369-r3.ebuild, ut2004-3369-r4.ebuild:
+  Cleaned up older versions and changed DESCRIPTION.  Closing bug #126704.
 
 *ut2004-3369-r4 (17 Mar 2006)
 
diff --git a/games-fps/ut2004/files/digest-ut2004-3369-r3 b/games-fps/ut2004/files/digest-ut2004-3369-r3
deleted file mode 100644
index d228ce45be22..000000000000
--- a/games-fps/ut2004/files/digest-ut2004-3369-r3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 0fa447e05fe5a38e0e32adf171be405e ut2004-lnxpatch3369-2.tar.bz2 22465217
-RMD160 af632d8cd1f05e36e861eb3fab927ffc8ae3f59d ut2004-lnxpatch3369-2.tar.bz2 22465217
-SHA256 438b9b13a367d46f23cce12b065382a55afa2fc68add1f1dd3db03b015f60bb3 ut2004-lnxpatch3369-2.tar.bz2 22465217
diff --git a/games-fps/ut2004/ut2004-3369-r3.ebuild b/games-fps/ut2004/ut2004-3369-r3.ebuild
deleted file mode 100644
index daecbe047510..000000000000
--- a/games-fps/ut2004/ut2004-3369-r3.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2004/ut2004-3369-r3.ebuild,v 1.2 2006/03/15 21:39:00 wolf31o2 Exp $
-
-inherit eutils games
-
-MY_P="${PN}-lnxpatch${PV}-2.tar.bz2"
-DESCRIPTION="Unreal Tournament 2004 - Editor's Choice Edition"
-HOMEPAGE="http://www.unrealtournament2004.com/"
-SRC_URI="mirror://3dgamers/unrealtourn2k4/${MY_P}
-	http://speculum.twistedgamer.com/pub/0day.icculus.org/${PN}/${MY_P}
-	http://treefort.icculus.org/${PN}/${MY_P}
-	http://sonic-lux.net/data/mirror/ut2004/${MY_P}"
-
-LICENSE="ut2003"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-# The executable pages are required.
-RESTRICT="nostrip nomirror stricter"
-IUSE="opengl dedicated"
-
-RDEPEND=">=games-fps/ut2004-data-3186-r1
-	>=games-fps/ut2004-bonuspack-ece-1-r1
-	opengl? (
-		virtual/opengl )
-	dedicated? (
-		app-misc/screen )
-	|| (
-		sys-libs/libstdc++-v3
-		=sys-devel/gcc-3.3* )
-	|| (
-		(
-			x11-libs/libXext
-			x11-libs/libX11
-			x11-libs/libXau
-			x11-libs/libXdmcp )
-		virtual/x11 )
-	games-fps/ut2004-bonuspack-mega"
-
-S=${WORKDIR}/UT2004-Patch
-
-dir=${GAMES_PREFIX_OPT}/${PN}
-Ddir=${D}/${dir}
-
-pkg_setup() {
-	check_license ut2003
-	games_pkg_setup
-}
-
-src_install() {
-	# Installing patch files
-	for p in {Animations,Help,Speech,System,Textures,Web}
-	do
-		dodir ${dir}/${p}
-		cp -r ${S}/${p}/* ${Ddir}/${p} \
-			|| die "copying ${p} from patch"
-	done
-
-	use amd64 && rm ${Ddir}/System/u{cc,t2004}-bin \
-		&& mv ${Ddir}/System/ucc-bin-linux-amd64 ${Ddir}/System/ucc-bin \
-		&& mv ${Ddir}/System/ut2004-bin-linux-amd64 ${Ddir}/System/ut2004-bin \
-		&& chmod ug+x ${Ddir}/System/ucc-bin ${Ddir}/System/ut2004-bin
-	use x86 && rm ${Ddir}/System/ucc-bin-linux-amd64 \
-		${Ddir}/System/ut2004-bin-linux-amd64
-
-	# creating .manifest files
-	insinto ${dir}/.manifest
-	doins ${FILESDIR}/${PN}.xml
-
-	# creating .loki/installed links
-	mkdir -p ${D}/root/.loki/installed
-	dosym ${dir}/.manifest/${PN}.xml ${ROOT}/root/.loki/installed/${PN}.xml
-
-	games_make_wrapper ut2004 ./ut2004 "${dir}" "${dir}"
-
-	prepgamesdirs
-	make_desktop_entry ut2004 "Unreal Tournament 2004" ut2004.xpm
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-
-	# here is where we check for the existence of a cdkey...
-	# if we don't find one, we ask the user for it
-	if [ -f ${dir}/System/cdkey ]; then
-		einfo "A cdkey file is already present in ${dir}/System"
-	else
-		ewarn "You MUST run this before playing the game:"
-		ewarn "emerge --config =${CATEGORY}/${PF}"
-		ewarn "That way you can [re]enter your cdkey."
-	fi
-	echo
-	einfo "Starting with 3369, the game supports render-to-texture.  To enable"
-	einfo "it, you will need the Nvidia drivers of at least version 7676 and"
-	einfo "you should edit the following:"
-	einfo 'Set "UseRenderTargets=True" in the "[OpenGLDrv.OpenGLRenderDevice]"'
-	einfo 'section of your UT2004.ini/Default.ini and set "bPlayerShadows=True"'
-	einfo 'and "bBlobShadow=False" in the "[UnrealGame.UnrealPawn]" section of'
-	einfo 'your	User.ini/DefUser.ini'
-	echo
-	if use x86
-	then
-		einfo "The 32-bit version of UT2004 uses Pixomatic, which means it"
-		einfo "really does need an executable stack.  It is safe to ignore any"
-		einfo "warnings from portage about this.  See:"
-		einfo "http://bugs.gentoo.org/show_bug.cgi?id=114733"
-		einfo "for more information."
-	fi
-	echo
-	einfo "To play the game run:"
-	einfo " ut2004"
-	echo
-}
-
-pkg_postrm() {
-	ewarn "This package leaves a cdkey file in ${dir}/System that you need"
-	ewarn "to remove to completely get rid of this game's files."
-}
-
-pkg_config() {
-	ewarn "Your CD key is NOT checked for validity here."
-	ewarn "  Make sure you type it in correctly."
-	eerror "If you CTRL+C out of this, the game will not run!"
-	echo
-	einfo "CD key format is: XXXXX-XXXXX-XXXXX-XXXXX"
-	while true ; do
-		einfo "Please enter your CD key:"
-		read CDKEY1
-		einfo "Please re-enter your CD key:"
-		read CDKEY2
-		if [ "$CDKEY1" == "" ] ; then
-			echo "You entered a blank CD key.  Try again."
-		else
-			if [ "$CDKEY1" == "$CDKEY2" ] ; then
-				echo "$CDKEY1" | tr a-z A-Z > ${dir}/System/cdkey
-				einfo "Thank you!"
-				break
-			else
-				eerror "Your CD key entries do not match.  Try again."
-			fi
-		fi
-	done
-}
diff --git a/games-fps/ut2004/ut2004-3369-r4.ebuild b/games-fps/ut2004/ut2004-3369-r4.ebuild
index d5db3c40a1d4..db8c0ef41599 100644
--- a/games-fps/ut2004/ut2004-3369-r4.ebuild
+++ b/games-fps/ut2004/ut2004-3369-r4.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2004/ut2004-3369-r4.ebuild,v 1.1 2006/03/17 21:16:49 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2004/ut2004-3369-r4.ebuild,v 1.2 2006/03/20 19:40:22 wolf31o2 Exp $
 
 inherit eutils multilib games
 
 MY_P="${PN}-lnxpatch${PV}-2.tar.bz2"
-DESCRIPTION="Unreal Tournament 2004 - Editor's Choice Edition"
+DESCRIPTION="Unreal Tournament 2004 - Editor's Choice Edition plus Mega Pack"
 HOMEPAGE="http://www.unrealtournament2004.com/"
 SRC_URI="mirror://3dgamers/unrealtourn2k4/${MY_P}
 	http://speculum.twistedgamer.com/pub/0day.icculus.org/${PN}/${MY_P}