Marking stable on x86/amd64 since the newer version is really needed for playing on most Internet servers. I've also added comments with regard to bug #114733 to the ebuild, added RESTRICT=stricter, and am removing older versions, since they're obsolete.

(Portage version: 2.0.53)

6 files changed, 22 insertions, 242 deletions

diff --git a/games-fps/ut2004/ChangeLog b/games-fps/ut2004/ChangeLog
index a0d5d0c72ea9..cc60f8af5c1d 100644
--- a/games-fps/ut2004/ChangeLog
+++ b/games-fps/ut2004/ChangeLog
@@ -1,6 +1,13 @@
 # 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.37 2005/12/13 18:56:03 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2004/ChangeLog,v 1.38 2005/12/14 21:07:30 wolf31o2 Exp $
+
+  14 Dec 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  -ut2004-3355-r1.ebuild, -ut2004-3369.ebuild, ut2004-3369-r1.ebuild:
+  Marking stable on x86/amd64 since the newer version is really needed for
+  playing on most Internet servers. I've also added comments with regard to
+  bug #114733 to the ebuild, added RESTRICT=stricter, and am removing older
+  versions, since they're obsolete.
 
 *ut2004-3369-r1 (13 Dec 2005)
 
diff --git a/games-fps/ut2004/files/digest-ut2004-3355-r1 b/games-fps/ut2004/files/digest-ut2004-3355-r1
deleted file mode 100644
index 04a31380f08e..000000000000
--- a/games-fps/ut2004/files/digest-ut2004-3355-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 379198183e16cefeb585a1c3252e63dd ut2004-lnxpatch3355.tar.bz2 20655315
-MD5 4c69c1a636f08a2e9a6d29944c02f79f ut2004-lnx-amd64-05282005.tar.bz2 4823490
diff --git a/games-fps/ut2004/files/digest-ut2004-3369 b/games-fps/ut2004/files/digest-ut2004-3369
deleted file mode 100644
index 25b16ab5bef6..000000000000
--- a/games-fps/ut2004/files/digest-ut2004-3369
+++ /dev/null
@@ -1 +0,0 @@
-MD5 be47e16b628a75097a8c82b8513b56d1 ut2004-lnxpatch3369.tar.bz2 22301478
diff --git a/games-fps/ut2004/ut2004-3355-r1.ebuild b/games-fps/ut2004/ut2004-3355-r1.ebuild
deleted file mode 100644
index 0fcb391765a0..000000000000
--- a/games-fps/ut2004/ut2004-3355-r1.ebuild
+++ /dev/null
@@ -1,116 +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-r1.ebuild,v 1.8 2005/12/12 14:09:11 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}
-	amd64? ( http://icculus.org/~icculus/tmp/${PN}-lnx-amd64-05282005.tar.bz2 )"
-
-LICENSE="ut2003"
-SLOT="0"
-KEYWORDS="amd64 x86"
-RESTRICT="nostrip nomirror"
-IUSE="opengl dedicated"
-
-RDEPEND="games-fps/ut2004-data
-	games-fps/ut2004-bonuspack-ece
-	opengl? ( virtual/opengl )
-	dedicated? ( app-misc/screen )
-	|| ( sys-libs/libstdc++-v3
-		=sys-devel/gcc-3.3* )"
-
-S=${WORKDIR}/UT2004-Patch
-
-dir=${GAMES_PREFIX_OPT}/${PN}
-Ddir=${D}/${dir}
-
-pkg_setup() {
-	check_license ut2003
-	games_pkg_setup
-}
-
-src_install() {
-	# moving patched binary into proper location
-	use amd64 && mv -f ${WORKDIR}/ut2004-bin-linux-amd64 ${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
-
-	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 "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-r1.ebuild b/games-fps/ut2004/ut2004-3369-r1.ebuild
index 29df152e00f5..1793f1e653a3 100644
--- a/games-fps/ut2004/ut2004-3369-r1.ebuild
+++ b/games-fps/ut2004/ut2004-3369-r1.ebuild
@@ -1,6 +1,6 @@
 # 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-3369-r1.ebuild,v 1.1 2005/12/13 18:56:03 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2004/ut2004-3369-r1.ebuild,v 1.2 2005/12/14 21:07:30 wolf31o2 Exp $
 
 inherit eutils games
 
@@ -13,8 +13,9 @@ SRC_URI="mirror://3dgamers/unrealtourn2k4/${MY_P}
 
 LICENSE="ut2003"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
-RESTRICT="nostrip nomirror"
+KEYWORDS="amd64 x86"
+# The executable pages are required.
+RESTRICT="nostrip nomirror stricter"
 IUSE="opengl dedicated"
 
 RDEPEND="games-fps/ut2004-data
@@ -76,6 +77,7 @@ pkg_postinst() {
 		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:"
@@ -84,6 +86,15 @@ pkg_postinst() {
 	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
diff --git a/games-fps/ut2004/ut2004-3369.ebuild b/games-fps/ut2004/ut2004-3369.ebuild
deleted file mode 100644
index c502be63f2ee..000000000000
--- a/games-fps/ut2004/ut2004-3369.ebuild
+++ /dev/null
@@ -1,119 +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-3369.ebuild,v 1.4 2005/12/12 14:09:11 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}"
-
-LICENSE="ut2003"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-RESTRICT="nostrip nomirror"
-IUSE="opengl dedicated"
-
-RDEPEND="games-fps/ut2004-data
-	games-fps/ut2004-bonuspack-ece
-	opengl? ( virtual/opengl )
-	dedicated? ( app-misc/screen )
-	|| ( sys-libs/libstdc++-v3
-		=sys-devel/gcc-3.3* )"
-
-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
-	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
-	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
-}