Moved games_pkg_postinst to beginning of pkg_postinst and cleaning up older ebuilds.

Package-Manager: portage-2.1_pre6-r6

6 files changed, 27 insertions, 218 deletions

diff --git a/games-fps/ut2003/ChangeLog b/games-fps/ut2003/ChangeLog
index 13f280c0616d..1908811e6e2d 100644
--- a/games-fps/ut2003/ChangeLog
+++ b/games-fps/ut2003/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-fps/ut2003
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2003/ChangeLog,v 1.38 2006/01/05 22:13:13 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2003/ChangeLog,v 1.39 2006/03/24 22:24:00 wolf31o2 Exp $
+
+  24 Mar 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  -ut2003-2225-r3.ebuild, ut2003-2225-r4.ebuild:
+  Moved games_pkg_postinst to beginning of pkg_postinst and cleaning up older
+  ebuilds.
 
   05 Jan 2006; Chris Gianelloni <wolf31o2@gentoo.org> ut2003-2225-r4.ebuild:
   Marking stable on amd64/x86.
diff --git a/games-fps/ut2003/files/digest-ut2003-2225-r3 b/games-fps/ut2003/files/digest-ut2003-2225-r3
deleted file mode 100644
index cb69d599a31b..000000000000
--- a/games-fps/ut2003/files/digest-ut2003-2225-r3
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 bba41d9a1c552ae1664c7521798324cd UT2003CrashFix.zip 2764
-MD5 3d991e6b097025e0908ee0c1569a5a3b ut2003lnx_patch2225.tar.tar 10039316
diff --git a/games-fps/ut2003/ut2003-2225-r3.ebuild b/games-fps/ut2003/ut2003-2225-r3.ebuild
deleted file mode 100644
index 866c8a6918d9..000000000000
--- a/games-fps/ut2003/ut2003-2225-r3.ebuild
+++ /dev/null
@@ -1,202 +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/ut2003/ut2003-2225-r3.ebuild,v 1.8 2005/10/21 17:47:39 wolf31o2 Exp $
-
-inherit eutils games
-
-DESCRIPTION="Unreal Tournament 2003 - Sequel to the 1999 Game of the Year multi-player first-person shooter"
-HOMEPAGE="http://www.unrealtournament2003.com/"
-SRC_URI="http://download.factoryunreal.com/mirror/UT2003CrashFix.zip
-	ftp://ftp.infogrames.net/misc/ut2003/ut2003lnx_patch2225.tar.tar"
-
-LICENSE="ut2003"
-SLOT="0"
-KEYWORDS="x86"
-IUSE="dedicated"
-RESTRICT="nostrip"
-
-DEPEND="virtual/libc
-	app-arch/unzip
-	games-util/uz2unpack
-	games-util/loki_patch"
-RDEPEND="dedicated? ( games-server/ut2003-ded )
-	!dedicated? ( virtual/opengl )"
-
-S="${WORKDIR}"
-
-dir="${GAMES_PREFIX_OPT}/${PN}"
-
-pkg_setup() {
-	check_license ut2003
-	ewarn "The installed game takes about 2.7GB of space!"
-	cdrom_get_cds System/Packages.md5 StaticMeshes/AWHardware.usx.uz2 \
-		Extras/MayaPLE/Maya4PersonalLearningEditionEpic.exe
-	games_pkg_setup
-}
-
-src_unpack() {
-	unpack ut2003lnx_patch${PV}.tar.tar \
-		|| die "unpacking patch"
-	unzip ${DISTDIR}/UT2003CrashFix.zip \
-		|| die "unpacking crash-fix"
-}
-
-src_install() {
-	local Ddir="${D}/${dir}"
-
-	dodir ${dir}/System
-
-	# Disk 1
-	einfo "Copying files from Disk 1..."
-	cp -r ${CDROM_ROOT}/{Animations,ForceFeedback,Help,KarmaData,Maps,Sounds,Textures,Web} ${Ddir} || die "copying files"
-	cp -r ${CDROM_ROOT}/System/{editorres,*.{bmp,dat,det,est,frt,ini,int,itt,md5,u,upl,url}} ${Ddir}/System || die "copying files"
-	mkdir -p ${Ddir}/Benchmark/Stuff || die "creating benchamrk folders"
-	cp -r ${CDROM_ROOT}/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}/{Music,Sounds,StaticMeshes,Textures} ${Ddir} || die "copying files"
-	cdrom_load_next_cd
-
-	# Disk 3
-	einfo "Copying files from Disk 3..."
-	cp -r ${CDROM_ROOT}/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
-
-	# remove Default, DefUser, UT2003 and User ini files
-	rm ${Ddir}/System/{Def{ault,User},UT2003,User}.ini || die "deleting ini files"
-
-	# unpack_makeself won't take absolute path
-	unpack_makeself ${CDROM_ROOT}/linux_installer.sh || die "unpacking linux installer"
-
-	# install extra help files
-	insinto ${dir}/Help
-	doins ${S}/Help/Unreal.bmp
-
-	# install Default and DefUser ini files
-	insinto ${dir}/System
-	doins ${S}/System/Def{ault,User}.ini
-
-	# install eula
-	insinto ${dir}
-	doins ${S}/eula/License.int
-
-	# uncompress original binaries/libraries
-	tar -xf ut2003lnxbins.tar || die "unpacking original binaries/libraries"
-
-	# copying extra/updater
-	cp -r ${S}/{extras,updater} ${Ddir} || die "copying extras/updater"
-
-	# install benchmarks
-	cp -r ${S}/Benchmark ${Ddir} || die "copying benchmark files"
-
-	# copy ut2003/ucc
-	exeinto ${dir}
-	doexe ${S}/bin/ut2003 ${S}/ucc || die "copying ut2003/ucc"
-
-	# copy binaries/libraries
-	exeinto ${dir}/System
-	doexe ${S}/System/{*-bin,*.so.0,*.so} || die "copying system binaries/libraries"
-
-	# uncompressing files
-	einfo "Uncompressing files... this may take a while..."
-	for j in {Animations,Maps,Sounds,StaticMeshes,Textures} ; do
-		games_ut_unpack ${Ddir}/${j} || die "uncompressing files"
-	done
-
-	# installing documentation/icon
-	dodoc ${S}/README.linux || die "dodoc README.linux"
-	newicon Unreal.xpm ut2003.xpm || die "copying pixmap"
-	insinto ${dir}
-	doins ${S}/README.linux ${S}/Unreal.xpm || die "copying readme/icon"
-
-	games_make_wrapper ut2003 ./ut2003 "${dir}" "${dir}"
-
-	# this brings our install up to the newest version
-	cp -r ${S}/ut2003-lnx-2225/* ${Ddir} || die
-
-	# Here we apply DrSiN's crash patch
-	cp ${S}/CrashFix/System/crashfix.u ${Ddir}/System
-
-	ed ${Ddir}/System/Default.ini >/dev/null 2>&1 <<EOT
-$
-?Engine.GameInfo?
-a
-AccessControlClass=crashfix.iaccesscontrolini
-.
-w
-q
-EOT
-
-	# Here we apply fix for bug #54726
-	dosed "s:UplinkToGamespy=True:UplinkToGamespy=False:" \
-		${dir}/System/Default.ini
-
-	# now, since these files are coming off a cd, the times/sizes/md5sums wont
-	# be different ... that means portage will try to unmerge some files (!)
-	# we run touch on ${D} so as to make sure portage doesnt do any such thing
-	find ${Ddir} -exec touch '{}' \;
-
-	prepgamesdirs
-	make_desktop_entry ut2003 "Unreal Tournament 2003" UT2003.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 " ut2003"
-	echo
-	ewarn "If you are not installing for the first time and you plan on running"
-	ewarn "a server, you will probably need to edit your"
-	ewarn "~/.ut2003/System/UT2003.ini file and add a line that says"
-	ewarn "AccessControlClass=crashfix.iaccesscontrolini to your"
-	ewarn "[Engine.GameInfo] section to close a security issue."
-}
-
-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: XXXX-XXXX-XXXX-XXXX"
-	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!"
-				chown games:games ${dir}/System/cdkey
-				break
-			else
-				eerror "Your CD key entries do not match.  Try again."
-			fi
-		fi
-	done
-}
diff --git a/games-fps/ut2003/ut2003-2225-r4.ebuild b/games-fps/ut2003/ut2003-2225-r4.ebuild
index 4b04d1fbfc74..740782502ffb 100644
--- a/games-fps/ut2003/ut2003-2225-r4.ebuild
+++ b/games-fps/ut2003/ut2003-2225-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2003/ut2003-2225-r4.ebuild,v 1.7 2006/01/05 22:13:13 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2003/ut2003-2225-r4.ebuild,v 1.8 2006/03/24 22:24:00 wolf31o2 Exp $
 
 inherit eutils games
 
@@ -36,12 +36,12 @@ src_install() {
 	insinto ${dir}
 
 	games_make_wrapper ut2003 ./ut2003 "${dir}" "${dir}"
+	make_desktop_entry ut2003 "Unreal Tournament 2003" ut2003.xpm
 
 	# this brings our install up to the newest version
 	cp -r ${S}/ut2003-lnx-2225/* ${Ddir} || die
 
 	prepgamesdirs
-	make_desktop_entry ut2003 "Unreal Tournament 2003" ut2003.xpm
 }
 
 pkg_postinst() {
diff --git a/games-fps/ut2004-bonuspack-ece/Manifest b/games-fps/ut2004-bonuspack-ece/Manifest
index 71c32ecee652..a9868bdac8f9 100644
--- a/games-fps/ut2004-bonuspack-ece/Manifest
+++ b/games-fps/ut2004-bonuspack-ece/Manifest
@@ -1,6 +1,6 @@
-MD5 37f27bb78d1dee9bf24577e29fef5533 ChangeLog 985
-RMD160 86a5159aee86e2b9cd44286b6a14f61e6b408693 ChangeLog 985
-SHA256 f2d7aa808a1765fe14a1f5bce0dbc6aece670ee87373393e4b51e5fc78e90b30 ChangeLog 985
+MD5 1ec06dd9fa477c8027fca4ec1c1c126d ChangeLog 1143
+RMD160 6a8d319eda40df4d3310869564ef3da09b2f6360 ChangeLog 1143
+SHA256 0c1d52e12aef4475b8c164631e26e757d6ab7208504ddca569cc76868cda9da9 ChangeLog 1143
 MD5 491929956cf7b9bec7f7fc6d0631a433 files/digest-ut2004-bonuspack-ece-1 74
 RMD160 2de1b3f19e12e21634efa12b3a16e2d917408a5c files/digest-ut2004-bonuspack-ece-1 74
 SHA256 86a2a5420951662a843a9dd62de0f34b26f90786d3cda0359ca12c9c79266dc0 files/digest-ut2004-bonuspack-ece-1 74
@@ -10,9 +10,9 @@ SHA256 276d4778f06e98344e320ae2fa8102c5ed5dac8a934e685f059dde8001105ca2 files/di
 MD5 11a7e1491b1ac042ac7216b26b4ad1fb metadata.xml 254
 RMD160 877a1dc36df2be58926bc51041093feafdefe429 metadata.xml 254
 SHA256 2916aab684ec3908fffb515065eeb2c481cde563380b682646add582bed5f535 metadata.xml 254
-MD5 32a44549f48f2d8352f2f5bbde47c7ee ut2004-bonuspack-ece-1-r1.ebuild 2370
-RMD160 c529ccfa488168eb708b48a99f73cc5793d2c70a ut2004-bonuspack-ece-1-r1.ebuild 2370
-SHA256 93ee443d7452452c973c1264328f33b0bc2ccf4166f13bf4becd301d014a49d9 ut2004-bonuspack-ece-1-r1.ebuild 2370
-MD5 10a9c2feabcce6eb151c040bde916972 ut2004-bonuspack-ece-1.ebuild 1237
-RMD160 46e5aa0ad7c5e79557a02717be4202af7a4dffdf ut2004-bonuspack-ece-1.ebuild 1237
-SHA256 ba45160eab35ce8c8deaefd4266b4cbae2342f039ba503dc77c9eed0dba38a2b ut2004-bonuspack-ece-1.ebuild 1237
+MD5 12d8a2b2484e5ba1c2d77573ab3c672a ut2004-bonuspack-ece-1-r1.ebuild 2330
+RMD160 3dd49a7eb4592580ea5ea5e1ba4646815c56d05d ut2004-bonuspack-ece-1-r1.ebuild 2330
+SHA256 0e64cb908915a60b4264e2826741659e1cc58f0945ac8f433ed6aaf3930d3a29 ut2004-bonuspack-ece-1-r1.ebuild 2330
+MD5 c1d65bae40a06178eec3001ef4fc9341 ut2004-bonuspack-ece-1.ebuild 1197
+RMD160 f9955f8ff512b75b9ecc62554af11fe55bdae982 ut2004-bonuspack-ece-1.ebuild 1197
+SHA256 2fe7a5f93a95139f26e54cd56adc9fef0a9cd9b4ed42741346d4e05193ce113c ut2004-bonuspack-ece-1.ebuild 1197
diff --git a/games-fps/ut2004-demo/Manifest b/games-fps/ut2004-demo/Manifest
index be64d8a7f05d..797205ea57be 100644
--- a/games-fps/ut2004-demo/Manifest
+++ b/games-fps/ut2004-demo/Manifest
@@ -1,4 +1,12 @@
-MD5 1e133c3c62bc823b1fcb897881e722f1 ChangeLog 3760
+MD5 4eed8ca8f17cb87b68dabcf03c338a36 ChangeLog 3899
+RMD160 512483e86d8de27def19f010131680931aa2b224 ChangeLog 3899
+SHA256 f16a32d63598e56b4381ffa4039e032711603f96cff920fbb61663743959d6bb ChangeLog 3899
 MD5 7339313ef9ff4f1f6da1972ab63a2c2e files/digest-ut2004-demo-3334 71
+RMD160 bdea69cf3981f357f8b9bba22cd03bf8b380aedf files/digest-ut2004-demo-3334 71
+SHA256 050afa62ac5419fc0523850234f28d5cece99f7f9b2196bbd84910022d1b354f files/digest-ut2004-demo-3334 71
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
-MD5 fdeb7725578e4423ab016b12f205ea48 ut2004-demo-3334.ebuild 2040
+RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
+SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
+MD5 94f09bf1154e1687d872d6c90bb2f509 ut2004-demo-3334.ebuild 2040
+RMD160 2f352241200d1d5a5d8686ea96528575f0d38dd4 ut2004-demo-3334.ebuild 2040
+SHA256 f8a3e04e080d76050b5bd67c98a266b64255c520b6569fff61d401752a269290 ut2004-demo-3334.ebuild 2040