EAPI=2; remove dedicated and opengl USE flags; let games-mods.eclass handle install

Package-Manager: portage-2.2_rc44/cvs/Linux x86_64

4 files changed, 34 insertions, 63 deletions

diff --git a/games-fps/ut2004-bonuspack-ece/ChangeLog b/games-fps/ut2004-bonuspack-ece/ChangeLog
index b7a15972f067..0dcf6d12762a 100644
--- a/games-fps/ut2004-bonuspack-ece/ChangeLog
+++ b/games-fps/ut2004-bonuspack-ece/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-fps/ut2004-bonuspack-ece
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2004-bonuspack-ece/ChangeLog,v 1.15 2008/07/28 16:47:39 wolf31o2 Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2004-bonuspack-ece/ChangeLog,v 1.16 2009/10/10 23:58:30 nyhm Exp $
+
+  10 Oct 2009; Tristan Heaven <nyhm@gentoo.org>
+  ut2004-bonuspack-ece-1-r3.ebuild:
+  EAPI=2; remove dedicated and opengl USE flags; let games-mods.eclass
+  handle install
 
   28 Jul 2008; Chris Gianelloni <wolf31o2@gentoo.org> metadata.xml:
   Removing myself from metadata.xml since I am retiring from the project.
diff --git a/games-fps/ut2004-bonuspack-ece/ut2004-bonuspack-ece-1-r3.ebuild b/games-fps/ut2004-bonuspack-ece/ut2004-bonuspack-ece-1-r3.ebuild
index 8a147798c4c4..50a4017db459 100644
--- a/games-fps/ut2004-bonuspack-ece/ut2004-bonuspack-ece-1-r3.ebuild
+++ b/games-fps/ut2004-bonuspack-ece/ut2004-bonuspack-ece-1-r3.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 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-r3.ebuild,v 1.3 2009/10/01 22:05:13 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2004-bonuspack-ece/ut2004-bonuspack-ece-1-r3.ebuild,v 1.4 2009/10/10 23:58:30 nyhm Exp $
+
+EAPI=2
 
 MOD_DESC="Editor's Choice Edition bonus pack"
 MOD_NAME="Editor's Choice Edition"
@@ -8,7 +10,6 @@ MOD_NAME="Editor's Choice Edition"
 inherit games games-mods
 
 MY_P="ut2004megapack-linux.tar.bz2"
-
 HOMEPAGE="http://www.unrealtournament2004.com/"
 SRC_URI="mirror://3dgamers/unrealtourn2k4/Missions/${MY_P}
 	http://0day.icculus.org/ut2004/${MY_P}
@@ -17,21 +18,14 @@ SRC_URI="mirror://3dgamers/unrealtourn2k4/Missions/${MY_P}
 
 LICENSE="ut2003"
 KEYWORDS="amd64 x86"
-IUSE="dedicated opengl"
+IUSE=""
 
-RDEPEND="games-fps/ut2004-data"
+src_prepare() {
+	mv -f UT2004MegaPack/* . || die
+	rmdir UT2004MegaPack
 
-S=${WORKDIR}/UT2004MegaPack
-dir=${GAMES_PREFIX_OPT}/${GAME}
-Ddir=${D}/${dir}
-
-pkg_setup() {
-	games_pkg_setup
-}
+	rm -r Music Speech
 
-src_unpack() {
-	games-mods_src_unpack
-	cd "${S}"
 	# Remove megapack files which are not in ece
 	rm Animations/ONSNewTank-A.ukx
 	rm Help/ReadMePatch.int.txt
@@ -42,7 +36,8 @@ src_unpack() {
 	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/{A*,b*,B*,CacheRecords.ucl}
+	rm System/{*.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*}
@@ -56,15 +51,3 @@ src_unpack() {
 	rm System/{Core.int,Engine.int,Setup.int,Window.int}
 	rm System/{OnslaughtFull.u,OnslaughtBP.u}
 }
-
-src_install() {
-	# 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
-}
diff --git a/games-fps/ut2004-bonuspack-mega/ChangeLog b/games-fps/ut2004-bonuspack-mega/ChangeLog
index 290f92ec602e..353162dccb2b 100644
--- a/games-fps/ut2004-bonuspack-mega/ChangeLog
+++ b/games-fps/ut2004-bonuspack-mega/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-fps/ut2004-bonuspack-mega
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2004-bonuspack-mega/ChangeLog,v 1.10 2008/07/28 16:48:06 wolf31o2 Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2004-bonuspack-mega/ChangeLog,v 1.11 2009/10/10 23:58:47 nyhm Exp $
+
+  10 Oct 2009; Tristan Heaven <nyhm@gentoo.org>
+  ut2004-bonuspack-mega-1-r2.ebuild:
+  EAPI=2; remove dedicated and opengl USE flags; let games-mods.eclass
+  handle install
 
   28 Jul 2008; Chris Gianelloni <wolf31o2@gentoo.org> metadata.xml:
   Removing myself from metadata.xml since I am retiring from the project.
diff --git a/games-fps/ut2004-bonuspack-mega/ut2004-bonuspack-mega-1-r2.ebuild b/games-fps/ut2004-bonuspack-mega/ut2004-bonuspack-mega-1-r2.ebuild
index 9ce70c5e56f3..d1cb045fff78 100644
--- a/games-fps/ut2004-bonuspack-mega/ut2004-bonuspack-mega-1-r2.ebuild
+++ b/games-fps/ut2004-bonuspack-mega/ut2004-bonuspack-mega-1-r2.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 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-r2.ebuild,v 1.3 2009/10/01 22:07:01 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2004-bonuspack-mega/ut2004-bonuspack-mega-1-r2.ebuild,v 1.4 2009/10/10 23:58:47 nyhm Exp $
+
+EAPI=2
 
 MOD_DESC="Megapack bonus pack"
 MOD_NAME="Megapack"
@@ -8,8 +10,6 @@ MOD_NAME="Megapack"
 inherit games games-mods
 
 MY_P="ut2004megapack-linux.tar.bz2"
-MY_PN="Megapack"
-
 HOMEPAGE="http://www.unrealtournament2004.com/"
 SRC_URI="mirror://3dgamers/unrealtourn2k4/Missions/${MY_P}
 	http://0day.icculus.org/ut2004/${MY_P}
@@ -18,22 +18,17 @@ SRC_URI="mirror://3dgamers/unrealtourn2k4/Missions/${MY_P}
 
 LICENSE="ut2003"
 KEYWORDS="amd64 x86"
-IUSE="dedicated opengl"
+IUSE=""
 
-RDEPEND="games-fps/ut2004-data"
+src_prepare() {
+	mv -f UT2004MegaPack/* . || die
+	rmdir UT2004MegaPack
 
-S=${WORKDIR}/UT2004MegaPack
-dir=${GAMES_PREFIX_OPT}/ut2004
-Ddir=${D}/${dir}
-
-src_unpack() {
-	games-mods_src_unpack
-	cd "${S}"
 	# 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
+	mv Help/BonusPackReadme.txt Help/MegapackReadme.txt
 
 	rm Maps/ONS-{Adara,IslandHop,Tricky,Urban}.ut2
 	rm Sounds/{CicadaSnds,DistantBooms,ONSBPSounds}.uax
@@ -45,20 +40,3 @@ src_unpack() {
 	rm System/{ucc,ut2004}-bin-linux-amd64
 	rm Textures/{AW-2k4XP,BenTex02,BenTropical01,BonusParticles,CicadaTex,Construction_S,HourAdaraTexor,jwfasterfiles,ONSBP_DestroyedVehicles,ONSBPTextures,PC_UrbanTex,UT2004ECEPlayerSkins}.utx
 }
-
-src_install() {
-	# Backup files which a future bonuspack may try to overwrite
-	for n in {Manifest.in{i,t},Packages.md5} ; do
-		cp System/${n} System/${n}-${MY_PN}
-	done
-
-	# 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
-}