Removing experimental version as 3369 includes the functionality.

Package-Manager: portage-2.0.53

4 files changed, 9 insertions, 164 deletions

diff --git a/games-fps/ut2004/ChangeLog b/games-fps/ut2004/ChangeLog
index 8064a4791b44..4d5e48445a0a 100644
--- a/games-fps/ut2004/ChangeLog
+++ b/games-fps/ut2004/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-fps/ut2004
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2004/ChangeLog,v 1.33 2005/12/04 15:30:12 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2004/ChangeLog,v 1.34 2005/12/07 22:26:42 wolf31o2 Exp $
+
+  07 Dec 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  -ut2004-3355-r2.ebuild:
+  Removing experimental version as 3369 includes the functionality.
 
 *ut2004-3369 (04 Dec 2005)
 
diff --git a/games-fps/ut2004/Manifest b/games-fps/ut2004/Manifest
index 5428b79da9ff..1a1a98973283 100644
--- a/games-fps/ut2004/Manifest
+++ b/games-fps/ut2004/Manifest
@@ -1,9 +1,7 @@
+MD5 0d08f2fad9d636d18fee309b73e95c5e ChangeLog 5989
+MD5 3953d9c3f549c05431bb62a8df17a787 files/digest-ut2004-3355-r1 153
+MD5 2729ca7eae0fa14ecce9669115aa71d3 files/digest-ut2004-3369 74
+MD5 e199cda0f458ab3a4b3ca2e482451c8f files/ut2004.xml 358
 MD5 11a7e1491b1ac042ac7216b26b4ad1fb metadata.xml 254
-MD5 3717f6bafd3418228e3a4373823e6052 ut2004-3355-r2.ebuild 4654
 MD5 4e276a5c3353bfd4ee5d59b140ab21ef ut2004-3355-r1.ebuild 3275
-MD5 14d03c4fbc3f0146766720994d8d2fa2 ChangeLog 5840
 MD5 f3a628286216ed086578789608ca4b4e ut2004-3369.ebuild 3085
-MD5 e199cda0f458ab3a4b3ca2e482451c8f files/ut2004.xml 358
-MD5 e02d7893c2788aa939dfb8896c0cc3b3 files/digest-ut2004-3355-r2 162
-MD5 3953d9c3f549c05431bb62a8df17a787 files/digest-ut2004-3355-r1 153
-MD5 2729ca7eae0fa14ecce9669115aa71d3 files/digest-ut2004-3369 74
diff --git a/games-fps/ut2004/files/digest-ut2004-3355-r2 b/games-fps/ut2004/files/digest-ut2004-3355-r2
deleted file mode 100644
index a41761a1c7bd..000000000000
--- a/games-fps/ut2004/files/digest-ut2004-3355-r2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 379198183e16cefeb585a1c3252e63dd ut2004-lnxpatch3355.tar.bz2 20655315
-MD5 bc5ff36eeb1bbdf0e9593fa80167b804 ut2004-lnx-3355-with-rendertargets.tar.bz2 4514586
diff --git a/games-fps/ut2004/ut2004-3355-r2.ebuild b/games-fps/ut2004/ut2004-3355-r2.ebuild
deleted file mode 100644
index 12a6b61435d7..000000000000
--- a/games-fps/ut2004/ut2004-3355-r2.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2004/ut2004-3355-r2.ebuild,v 1.5 2005/10/16 21:53:41 wolf31o2 Exp $
-
-inherit eutils games
-
-MY_P="${PN}-lnxpatch${PV}.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}
-	experimental? ( http://icculus.org/~icculus/tmp/${PN}-lnx-${PV}-with-rendertargets.tar.bz2 )"
-
-LICENSE="ut2003"
-SLOT="0"
-KEYWORDS="~x86"
-RESTRICT="nostrip nomirror"
-IUSE="opengl dedicated experimental"
-
-RDEPEND="games-fps/ut2004-data
-	games-fps/ut2004-bonuspack-ece
-	opengl? ( virtual/opengl )
-	dedicated? ( app-misc/screen )"
-
-S=${WORKDIR}/UT2004-Patch
-
-dir=${GAMES_PREFIX_OPT}/${PN}
-Ddir=${D}/${dir}
-
-pkg_setup() {
-	check_license ut2003
-	if use experimental
-	then
-		ewarn "You are enabling support for an experimental patch from icculus."
-		ewarn "This patch solves some missing issues with the Linux version of"
-		ewarn "the game.  Please report all bugs you find with this version to"
-		ewarn "https://bugzilla.icculus.org"
-		ebeep
-		epause
-	fi
-	games_pkg_setup
-}
-
-src_install() {
-	# moving patched binary into proper location
-	 use experimental && mv -f ${WORKDIR}/ut2004-bin ${S}/System
-
-	# 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
-
-	# Here we edit the Default.ini to enable support for the experimentla patch
-#	if use experimental
-#	then
-#		ed ${Ddir}/System/Default.ini >/dev/null 2>&1 <<EOT
-#$
-#?OpenGLDrv.OpenGLRenderDevice?
-#a
-#UseRenderTargets=True
-#.
-#w
-#q
-#EOT
-#		sed -i -e 's/bPlayerShadows=False/bPlayerShadows=True/' \
-#			-e 's/bBlobShadow=True/bBlobShadow=False/' \
-#			-e 's/bVehicleShadows=False/bVehicleShadows=True/' \
-#			${Ddir}/System/DefUser.ini
-#	fi
-
-	games_make_wrapper ut2004 ./ut2004 ${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 "To play the game run:"
-	einfo " ut2004"
-	echo
-	if use experimental
-	then
-		ewarn "If you are not installing for the first time and wish to test"
-		ewarn "the new Render to Texture patch, then you will probably need to"
-		ewarn "edit your ~/.ut2004/System/UT2004.ini file and add a line that"
-		ewarn "says UseRenderTargets=True to your"
-		ewarn "[OpenGLDrv.OpenGLRenderDevice] section.  You will also need to"
-		ewarn "edit your ~/.ut2004/System/User.ini file and make sure that you"
-		ewarn "have bPlayerShadows=True and bBlobShadow=False in your"
-		ewarn "[UnrealGame.UnrealPawn] section.  Also, be sure to set"
-		ewarn "bVehicleShadows=True in your [Engine.Vehicle] section."
-		ebeep
-		epause
-	fi
-}
-
-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
-}