Changed DESCRIPTION to remove redundant 'pack' and cleaning up older ebuilds.

(Portage version: 2.1_pre6-r2)

4 files changed, 8 insertions, 100 deletions

diff --git a/games-fps/ut2004-bonuspack-mega/ChangeLog b/games-fps/ut2004-bonuspack-mega/ChangeLog
index 0b0fb1004387..fc0d6d124ce4 100644
--- a/games-fps/ut2004-bonuspack-mega/ChangeLog
+++ b/games-fps/ut2004-bonuspack-mega/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-fps/ut2004-bonuspack-mega
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2004-bonuspack-mega/ChangeLog,v 1.3 2006/03/17 21:16:24 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2004-bonuspack-mega/ChangeLog,v 1.4 2006/03/20 19:31:49 wolf31o2 Exp $
+
+  20 Mar 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  -ut2004-bonuspack-mega-1.ebuild, ut2004-bonuspack-mega-1-r1.ebuild:
+  Changed DESCRIPTION to remove redundant 'pack' and cleaning up older ebuilds.
 
   17 Mar 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   +ut2004-bonuspack-mega-1-r1.ebuild:
diff --git a/games-fps/ut2004-bonuspack-mega/files/digest-ut2004-bonuspack-mega-1 b/games-fps/ut2004-bonuspack-mega/files/digest-ut2004-bonuspack-mega-1
deleted file mode 100644
index 38b19955bc69..000000000000
--- a/games-fps/ut2004-bonuspack-mega/files/digest-ut2004-bonuspack-mega-1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 098be93d06823c5fd416fa701e83418f ut2004megapack-linux.tar.bz2 203124107
-RMD160 8a5fa450c0a5cb9c3a66c5996a2a92bff2a1302f ut2004megapack-linux.tar.bz2 203124107
-SHA256 b9122c8c405945d29c3cdf61f57fe4d21e886b79ea9caa0d8e0ca2e520aa472c ut2004megapack-linux.tar.bz2 203124107
diff --git a/games-fps/ut2004-bonuspack-mega/ut2004-bonuspack-mega-1-r1.ebuild b/games-fps/ut2004-bonuspack-mega/ut2004-bonuspack-mega-1-r1.ebuild
index 2dd9dbf47391..cc50471b5a94 100644
--- a/games-fps/ut2004-bonuspack-mega/ut2004-bonuspack-mega-1-r1.ebuild
+++ b/games-fps/ut2004-bonuspack-mega/ut2004-bonuspack-mega-1-r1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2004-bonuspack-mega/ut2004-bonuspack-mega-1-r1.ebuild,v 1.1 2006/03/17 21:16:24 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2004-bonuspack-mega/ut2004-bonuspack-mega-1-r1.ebuild,v 1.2 2006/03/20 19:31:49 wolf31o2 Exp $
 
 inherit games games-ut2k4mod
 
 MY_P="ut2004megapack-linux.tar.bz2"
 MY_PN="Megapack"
 
-DESCRIPTION="Unreal Tournament 2004 - Megapack bonus pack"
+DESCRIPTION="Unreal Tournament 2004 - Mega bonus pack"
 HOMEPAGE="http://www.unrealtournament2004.com/"
 SRC_URI="mirror://3dgamers/unrealtourn2k4/Missions/${MY_P}
 	http://0day.icculus.org/ut2004/${MY_P}
@@ -16,7 +16,7 @@ SRC_URI="mirror://3dgamers/unrealtourn2k4/Missions/${MY_P}
 
 LICENSE="ut2003"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 RESTRICT="nostrip nomirror"
 IUSE=""
 
diff --git a/games-fps/ut2004-bonuspack-mega/ut2004-bonuspack-mega-1.ebuild b/games-fps/ut2004-bonuspack-mega/ut2004-bonuspack-mega-1.ebuild
deleted file mode 100644
index c26d7aa48db4..000000000000
--- a/games-fps/ut2004-bonuspack-mega/ut2004-bonuspack-mega-1.ebuild
+++ /dev/null
@@ -1,93 +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-bonuspack-mega/ut2004-bonuspack-mega-1.ebuild,v 1.1 2006/03/14 22:53:34 wolf31o2 Exp $
-
-inherit games games-ut2k4mod
-
-MY_P="ut2004megapack-linux.tar.bz2"
-MY_PN="Megapack"
-
-DESCRIPTION="Unreal Tournament 2004 - Megapack bonus pack"
-HOMEPAGE="http://www.unrealtournament2004.com/"
-SRC_URI="mirror://3dgamers/unrealtourn2k4/Missions/${MY_P}
-	http://0day.icculus.org/ut2004/${MY_P}
-	ftp://ftp.games.skynet.be/pub/misc/${MY_P}
-	http://sonic-lux.net/data/mirror/ut2004/${MY_P}"
-
-LICENSE="ut2003"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-RESTRICT="nostrip nomirror"
-IUSE=""
-
-# Override games-ut2k4mod eclass
-# File comparison was made with ut2004-3369-r2
-RDEPEND=">=games-fps/ut2004-3369-r2
-	games-fps/ut2004-data
-	games-fps/ut2004-bonuspack-ece"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/UT2004MegaPack
-dir=${GAMES_PREFIX_OPT}/ut2004
-Ddir=${D}/${dir}
-
-src_unpack() {
-	# Override games-ut2k4mod
-	unpack ${A}
-}
-
-src_install() {
-	# The already-installed files are identical, except:
-	# System/Manifest.ini, System/Manifest.int, System/Packages.md5
-
-	# Remove files in Megapack which are already installed
-	rm -r Animations Speech Web
-
-	rm Help/{ReadMePatch.int.txt,UT2004Logo.bmp}
-	mv Help/BonusPackReadme.txt Help/${MY_PN}Readme.txt
-
-	rm Maps/ONS-{Adara,IslandHop,Tricky,Urban}.ut2
-	rm Sounds/{CicadaSnds,DistantBooms,ONSBPSounds}.uax
-	rm StaticMeshes/{BenMesh02,BenTropicalSM01,HourAdara,ONS-BPJW1,PC_UrbanStatic}.usx
-
-	# System
-	rm System/{AL,AS-,B,b,C,D,E,F,G,I,L,O,o,S,s,U,V,W,X,x}*
-	rm System/{ucc,ut2004}-bin
-	rm System/{ucc,ut2004}-bin-linux-amd64
-
-	# Handle the changed files gracefully
-	for n in {Manifest.in{i,t},Packages.md5} ; do
-		mv System/${n} System/${n}-${MY_PN}
-	done
-
-	rm Textures/{AW-2k4XP,BenTex02,BenTropical01,BonusParticles,CicadaTex,Construction_S,HourAdaraTexor,jwfasterfiles,ONSBP_DestroyedVehicles,ONSBPTextures,PC_UrbanTex,UT2004ECEPlayerSkins}.utx
-
-	# Install Megapack
-	for n in {Help,Maps,Music,Sounds,StaticMeshes,System,Textures} ; do
-		# doins is not used because of its unnecessary overhead
-		dodir "${dir}"/${n}
-		cp -r "${S}"/${n}/* "${Ddir}"/${n} \
-			|| die "copying ${n} from ${MY_PN}"
-	done
-
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	local sysdir=${dir}/System
-	local mfile=${sysdir}/Manifest.ini
-
-	# DM-BP2-GoopGod is a map from the Megapack
-	if [[ ! -e "${mfile}" ]] || \
-		[[ $(grep -c "DM-BP2-GoopGod.ut2," "${mfile}") = "0" ]] ; then
-		# Make the changed files live
-		for n in {Manifest.in{i,t},Packages.md5} ; do
-			einfo "Installing ${sysdir}/${n}"
-			cp -p "${sysdir}"/${n}-${MY_PN} "${sysdir}"/${n} \
-				|| die "cp ${n}-${MY_PN} failed"
-		done
-		echo
-	fi
-
-	games_pkg_postinst
-}