I have forced a revision bump here since this package will now *always* install the ECE content. I'm sure some users are going to hate me for this, but it had to be done. Closing bug #97726.

Package-Manager: portage-2.1_pre7-r5

5 files changed, 83 insertions, 94 deletions

diff --git a/games-fps/ut2004-bonuspack-ece/ChangeLog b/games-fps/ut2004-bonuspack-ece/ChangeLog
index 519b13ef7c53..f6c1e32c21c3 100644
--- a/games-fps/ut2004-bonuspack-ece/ChangeLog
+++ b/games-fps/ut2004-bonuspack-ece/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for games-fps/ut2004-bonuspack-ece
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2004-bonuspack-ece/ChangeLog,v 1.7 2006/04/11 11:47:46 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2004-bonuspack-ece/ChangeLog,v 1.8 2006/04/13 17:49:43 wolf31o2 Exp $
+
+*ut2004-bonuspack-ece-1-r2 (13 Apr 2006)
+
+  13 Apr 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  -ut2004-bonuspack-ece-1-r1.ebuild, +ut2004-bonuspack-ece-1-r2.ebuild:
+  I have forced a revision bump here since this package will now *always*
+  install the ECE content. I'm sure some users are going to hate me for this,
+  but it had to be done. Closing bug #97726.
 
   11 Apr 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   ut2004-bonuspack-ece-1-r1.ebuild:
diff --git a/games-fps/ut2004-bonuspack-ece/Manifest b/games-fps/ut2004-bonuspack-ece/Manifest
index 8c7d578d1e35..17b5c980361c 100644
--- a/games-fps/ut2004-bonuspack-ece/Manifest
+++ b/games-fps/ut2004-bonuspack-ece/Manifest
@@ -1,18 +1,18 @@
-MD5 60326dfb20326574f334753facd97c96 ChangeLog 1496
-RMD160 b5aae400deeb67e74e4c0961d9c8a7261bc8eecb ChangeLog 1496
-SHA256 5c3cbcc1297086981603702b0d7426e3faadcc2340b66232e5e4605275e6b327 ChangeLog 1496
+MD5 f75bb0e95d09c6326abd91aa4e8babc7 ChangeLog 1862
+RMD160 833e4ea3ad6dab198637a57a3ad0f2b9844f92b9 ChangeLog 1862
+SHA256 0ee07720924b0b3ddb074190de7f491d09e9897175b5dfcf2d3e4c52801e9fad ChangeLog 1862
 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
-MD5 e3c41949e25972ae303320a2f8a69efd files/digest-ut2004-bonuspack-ece-1-r1 274
-RMD160 c43a3d4780ab59f6e4c38f9d0b79b2f492d59ea6 files/digest-ut2004-bonuspack-ece-1-r1 274
-SHA256 276d4778f06e98344e320ae2fa8102c5ed5dac8a934e685f059dde8001105ca2 files/digest-ut2004-bonuspack-ece-1-r1 274
+MD5 e3c41949e25972ae303320a2f8a69efd files/digest-ut2004-bonuspack-ece-1-r2 274
+RMD160 c43a3d4780ab59f6e4c38f9d0b79b2f492d59ea6 files/digest-ut2004-bonuspack-ece-1-r2 274
+SHA256 276d4778f06e98344e320ae2fa8102c5ed5dac8a934e685f059dde8001105ca2 files/digest-ut2004-bonuspack-ece-1-r2 274
 MD5 11a7e1491b1ac042ac7216b26b4ad1fb metadata.xml 254
 RMD160 877a1dc36df2be58926bc51041093feafdefe429 metadata.xml 254
 SHA256 2916aab684ec3908fffb515065eeb2c481cde563380b682646add582bed5f535 metadata.xml 254
-MD5 eb59423c38be1c9b68a3e596667132bb ut2004-bonuspack-ece-1-r1.ebuild 2324
-RMD160 d1e1b692932439549ccea787256738878e668caf ut2004-bonuspack-ece-1-r1.ebuild 2324
-SHA256 6b4b88cd86c8b31369984516c30824384d991f8e837b5cd102970c0b956f2e90 ut2004-bonuspack-ece-1-r1.ebuild 2324
+MD5 58f9c9f4a29d063492889478bfe4587c ut2004-bonuspack-ece-1-r2.ebuild 2098
+RMD160 3c6e053390fe098e809008fd1a456d905a6d0e70 ut2004-bonuspack-ece-1-r2.ebuild 2098
+SHA256 26db319ad2e35b7e5c8ca8e0d3a5fadd63be667aef8598460f92c60744689c38 ut2004-bonuspack-ece-1-r2.ebuild 2098
 MD5 a8e4c8c9b41232ba5a9a061378f355cc ut2004-bonuspack-ece-1.ebuild 1193
 RMD160 14f8f699d7d1187b3d995f2e555e5e143419140a ut2004-bonuspack-ece-1.ebuild 1193
 SHA256 e06f28a8f43e37b834805514a06a2a7606f0b403a9e137f5a1027adce915ac20 ut2004-bonuspack-ece-1.ebuild 1193
diff --git a/games-fps/ut2004-bonuspack-ece/files/digest-ut2004-bonuspack-ece-1-r1 b/games-fps/ut2004-bonuspack-ece/files/digest-ut2004-bonuspack-ece-1-r2
index 38b19955bc69..38b19955bc69 100644
--- a/games-fps/ut2004-bonuspack-ece/files/digest-ut2004-bonuspack-ece-1-r1
+++ b/games-fps/ut2004-bonuspack-ece/files/digest-ut2004-bonuspack-ece-1-r2
diff --git a/games-fps/ut2004-bonuspack-ece/ut2004-bonuspack-ece-1-r1.ebuild b/games-fps/ut2004-bonuspack-ece/ut2004-bonuspack-ece-1-r1.ebuild
deleted file mode 100644
index 719b4611ee1e..000000000000
--- a/games-fps/ut2004-bonuspack-ece/ut2004-bonuspack-ece-1-r1.ebuild
+++ /dev/null
@@ -1,84 +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-ece/ut2004-bonuspack-ece-1-r1.ebuild,v 1.4 2006/04/11 11:47:46 wolf31o2 Exp $
-
-inherit games games-ut2k4mod
-
-MY_P="ut2004megapack-linux.tar.bz2"
-
-DESCRIPTION="Unreal Tournament 2004 - Editor's Choice Edition 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="amd64 x86"
-RESTRICT="mirror strip"
-IUSE=""
-
-# Override games-ut2k4mod eclass
-RDEPEND=">=games-fps/ut2004-3369-r1
-	games-fps/ut2004-data"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/UT2004MegaPack
-dir=${GAMES_PREFIX_OPT}/ut2004
-Ddir=${D}/${dir}
-
-pkg_setup() {
-	check_dvd
-
-	if [[ ! ${USE_ECE_DVD} -eq 1 ]]
-	then
-		games_pkg_setup
-	fi
-}
-
-src_unpack() {
-	if [[ ! ${USE_ECE_DVD} -eq 1 ]]
-	then
-		unpack ${A}
-	fi
-}
-
-src_install() {
-	if [[ ! ${USE_ECE_DVD} -eq 1 ]]
-	then
-		# Remove megapack files which are not in ece
-		rm Animations/ONSNewTank-A.ukx
-		rm Help/ReadMePatch.int.txt
-		# Help/{DebuggerLogo.bmp,InstallerLogo.bmp,Unreal.ico,UnrealEd.ico}
-		# are not in megapack.
-		# Keep new Help/UT2004Logo.bmp
-		# Manual dir does not exist in megapack
-		rm Maps/{AS*,CTF*,DM*}
-		rm Sounds/A_Announcer_BP2.uax
-		rm StaticMeshes/{JumpShipObjects.usx,Ty_RocketSMeshes.usx}
-		rm System/{A*,b*,B*,CacheRecords.ucl,*.det,*.est,*.frt,*.itt,*.kot}
-		rm System/{CTF*,D*,Editor*,G*,I*,L*,ONS-Arc*,Onslaught.*,*.md5}
-		rm System/{u*,U*,V*,X*,Core.u,Engine.u,F*,*.ucl,Sk*}
-		rm Textures/{J*,j*,T*}
-		rm -r Web
-
-		# The file lists of ut2004-3369-r1 and -r2 are identical
-		# Remove files owned by ut2004-3369-r2
-		rm Help/UT2004Logo.bmp
-		# The 2 Manifest files have not changed
-		rm System/{Manifest.in{i,t},OnslaughtFull.int}
-		rm System/{Core.int,Engine.int,Setup.int,Window.int}
-		rm System/{OnslaughtFull.u,OnslaughtBP.u}
-
-		# Install Editor's Choice Edition
-		for n in {Animations,Help,Maps,Sounds,StaticMeshes,System,Textures}
-		do
-			dodir "${dir}"/${n}
-			cp -r "${S}"/${n}/* "${Ddir}"/${n} \
-				|| die "copying ${n} from Editor's Choice Edition"
-		done
-
-		prepgamesdirs
-	fi
-}
diff --git a/games-fps/ut2004-bonuspack-ece/ut2004-bonuspack-ece-1-r2.ebuild b/games-fps/ut2004-bonuspack-ece/ut2004-bonuspack-ece-1-r2.ebuild
new file mode 100644
index 000000000000..a0f94989043f
--- /dev/null
+++ b/games-fps/ut2004-bonuspack-ece/ut2004-bonuspack-ece-1-r2.ebuild
@@ -0,0 +1,65 @@
+# 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-ece/ut2004-bonuspack-ece-1-r2.ebuild,v 1.1 2006/04/13 17:49:43 wolf31o2 Exp $
+
+inherit games games-ut2k4mod
+
+MY_P="ut2004megapack-linux.tar.bz2"
+
+DESCRIPTION="Unreal Tournament 2004 - Editor's Choice Edition 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="~amd64 ~x86"
+RESTRICT="mirror strip"
+IUSE=""
+
+# Override games-ut2k4mod eclass
+RDEPEND=">=games-fps/ut2004-3369-r1
+	>=games-fps/ut2004-data-3186-r3"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/UT2004MegaPack
+dir=${GAMES_PREFIX_OPT}/ut2004
+Ddir=${D}/${dir}
+
+src_install() {
+	# Remove megapack files which are not in ece
+	rm Animations/ONSNewTank-A.ukx
+	rm Help/ReadMePatch.int.txt
+	# Help/{DebuggerLogo.bmp,InstallerLogo.bmp,Unreal.ico,UnrealEd.ico}
+	# are not in megapack.
+	# Keep new Help/UT2004Logo.bmp
+	# Manual dir does not exist in megapack
+	rm Maps/{AS*,CTF*,DM*}
+	rm Sounds/A_Announcer_BP2.uax
+	rm StaticMeshes/{JumpShipObjects.usx,Ty_RocketSMeshes.usx}
+	rm System/{A*,b*,B*,CacheRecords.ucl,*.det,*.est,*.frt,*.itt,*.kot}
+	rm System/{CTF*,D*,Editor*,G*,I*,L*,ONS-Arc*,Onslaught.*,*.md5}
+	rm System/{u*,U*,V*,X*,Core.u,Engine.u,F*,*.ucl,Sk*}
+	rm Textures/{J*,j*,T*}
+	rm -r Web
+
+	# The file lists of ut2004-3369-r1 and -r2 are identical
+	# Remove files owned by ut2004-3369-r2
+	rm Help/UT2004Logo.bmp
+	# The 2 Manifest files have not changed
+	rm System/{Manifest.in{i,t},OnslaughtFull.int}
+	rm System/{Core.int,Engine.int,Setup.int,Window.int}
+	rm System/{OnslaughtFull.u,OnslaughtBP.u}
+
+	# Install Editor's Choice Edition
+	for n in {Animations,Help,Maps,Sounds,StaticMeshes,System,Textures}
+	do
+		dodir "${dir}"/${n}
+		cp -r "${S}"/${n}/* "${Ddir}"/${n} \
+			|| die "copying ${n} from Editor's Choice Edition"
+	done
+
+	prepgamesdirs
+}