Changed check_license to explicitly list license to check. Added x86 to 3355-r1 ebuild, as there is no difference for x86 from 3355. Cleaning up older ebuilds.

(Portage version: 2.0.52-r1)

4 files changed, 12 insertions, 119 deletions

diff --git a/games-fps/ut2004/ChangeLog b/games-fps/ut2004/ChangeLog
index 76a7fe75909a..2bdfdb2ad99b 100644
--- a/games-fps/ut2004/ChangeLog
+++ b/games-fps/ut2004/ChangeLog
@@ -1,6 +1,12 @@
 # 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.29 2005/08/30 19:25:57 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2004/ChangeLog,v 1.30 2005/09/21 20:50:01 wolf31o2 Exp $
+
+  21 Sep 2005; Chris Gianelloni <wolf31o2@gentoo.org> -ut2004-3355.ebuild,
+  ut2004-3355-r1.ebuild:
+  Changed check_license to explicitly list license to check. Added x86 to
+  3355-r1 ebuild, as there is no difference for x86 from 3355. Cleaning up
+  older ebuilds.
 
   30 Aug 2005; Chris Gianelloni <wolf31o2@gentoo.org> ut2004-3355.ebuild,
   ut2004-3355-r1.ebuild, ut2004-3355-r2.ebuild:
diff --git a/games-fps/ut2004/files/digest-ut2004-3355 b/games-fps/ut2004/files/digest-ut2004-3355
deleted file mode 100644
index 00276a0f7f5f..000000000000
--- a/games-fps/ut2004/files/digest-ut2004-3355
+++ /dev/null
@@ -1 +0,0 @@
-MD5 379198183e16cefeb585a1c3252e63dd ut2004-lnxpatch3355.tar.bz2 20655315
diff --git a/games-fps/ut2004/ut2004-3355-r1.ebuild b/games-fps/ut2004/ut2004-3355-r1.ebuild
index d561b7e34459..8dfa8c6a3d2b 100644
--- a/games-fps/ut2004/ut2004-3355-r1.ebuild
+++ b/games-fps/ut2004/ut2004-3355-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-3355-r1.ebuild,v 1.4 2005/08/30 19:25:57 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2004/ut2004-3355-r1.ebuild,v 1.5 2005/09/21 20:50:01 wolf31o2 Exp $
 
 inherit games
 
@@ -9,11 +9,11 @@ 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://icculus.org/~icculus/tmp/${PN}-lnx-amd64-05282005.tar.bz2"
+	amd64? ( http://icculus.org/~icculus/tmp/${PN}-lnx-amd64-05282005.tar.bz2 )"
 
 LICENSE="ut2003"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="amd64 x86"
 RESTRICT="nostrip nomirror"
 IUSE="opengl dedicated"
 
@@ -29,14 +29,13 @@ dir=${GAMES_PREFIX_OPT}/${PN}
 Ddir=${D}/${dir}
 
 pkg_setup() {
-	check_license || die "License check failed"
-
+	check_license ut2003
 	games_pkg_setup
 }
 
 src_install() {
 	# moving patched binary into proper location
-	mv -f ${WORKDIR}/ut2004-bin-linux-amd64 ${S}/System
+	use amd64 && mv -f ${WORKDIR}/ut2004-bin-linux-amd64 ${S}/System
 
 	# Installing patch files
 	for p in {Animations,Help,Speech,System,Textures,Web}
diff --git a/games-fps/ut2004/ut2004-3355.ebuild b/games-fps/ut2004/ut2004-3355.ebuild
deleted file mode 100644
index b52ba00495b3..000000000000
--- a/games-fps/ut2004/ut2004-3355.ebuild
+++ /dev/null
@@ -1,111 +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.ebuild,v 1.3 2005/08/30 19:25:57 wolf31o2 Exp $
-
-inherit 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="x86 amd64"
-RESTRICT="nostrip nomirror"
-IUSE="opengl dedicated"
-
-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 || die "License check failed"
-
-	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}
-
-	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 "ebuild /var/db/pkg/${CATEGORY}/${PF}/${PF}.ebuild config"
-		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
-}