Changed nostrip to strip. Also removed the erroneous roe USE flag from the -r1 ebuild and made the wrapper call for dedicated only install if USE=dedicated.

Package-Manager: portage-2.1_pre7-r2

4 files changed, 19 insertions, 40 deletions

diff --git a/games-fps/doom3/ChangeLog b/games-fps/doom3/ChangeLog
index d5c3a9fa926f..2d9433c24a12 100644
--- a/games-fps/doom3/ChangeLog
+++ b/games-fps/doom3/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for games-fps/doom3
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/doom3/ChangeLog,v 1.24 2006/03/23 00:59:07 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/doom3/ChangeLog,v 1.25 2006/03/31 20:56:02 wolf31o2 Exp $
+
+  31 Mar 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  doom3-1.3.1302-r1.ebuild, doom3-1.3.1302-r2.ebuild:
+  Changed nostrip to strip. Also removed the erroneous roe USE flag from the
+  -r1 ebuild and made the wrapper call for dedicated only install if
+  USE=dedicated.
 
 *doom3-1.3.1302-r2 (23 Mar 2006)
 
diff --git a/games-fps/doom3/doom3-1.3.1302-r1.ebuild b/games-fps/doom3/doom3-1.3.1302-r1.ebuild
index 01be15609d5e..619f33109d61 100644
--- a/games-fps/doom3/doom3-1.3.1302-r1.ebuild
+++ b/games-fps/doom3/doom3-1.3.1302-r1.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/doom3/doom3-1.3.1302-r1.ebuild,v 1.6 2006/03/22 15:11:38 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/doom3/doom3-1.3.1302-r1.ebuild,v 1.7 2006/03/31 20:56:02 wolf31o2 Exp $
 
 inherit eutils games
 
@@ -13,8 +13,8 @@ SRC_URI="mirror://3dgamers/${PN}/${PN}-linux-${PV}.x86.run
 LICENSE="DOOM3"
 SLOT="0"
 KEYWORDS="-* amd64 x86"
-IUSE="cdinstall alsa dedicated opengl roe"
-RESTRICT="nostrip"
+IUSE="cdinstall alsa dedicated opengl"
+RESTRICT="strip"
 
 DEPEND="app-arch/bzip2
 	app-arch/tar"
@@ -32,15 +32,6 @@ GAMES_CHECK_LICENSE="yes"
 dir=${GAMES_PREFIX_OPT}/${PN}
 Ddir=${D}/${dir}
 
-pkg_setup() {
-	games_pkg_setup
-	if use cdinstall && use roe
-	then
-		built_with_use games-fps/doom3-data roe || \
-			die "You must emerge games-fps/doom3-data with USE=roe"
-	fi
-}
-
 src_unpack() {
 	unpack_makeself ${PN}-linux-${PV}.x86.run
 }
@@ -59,18 +50,12 @@ src_install() {
 		die "Cannot copy executables!"
 	fi
 
-	insinto "${dir}"/pb
-	doins pb/* || die "doins pb"
-	if use roe
-	then
-		insinto "${dir}"/d3xp
-		doins d3xp/* || die "doins d3xp"
-	fi
-	insinto "${dir}"/base
-	doins base/* || die "doins base"
+	insinto "${dir}"
+	doins -r pb base || die "doins pb base"
 
 	games_make_wrapper doom3 ./doom.x86 "${dir}" "${dir}"
-	games_make_wrapper doom3-ded ./doomded.x86 "${dir}" "${dir}"
+	use dedicated && \
+		games_make_wrapper doom3-ded ./doomded.x86 "${dir}" "${dir}"
 
 	doicon ${DISTDIR}/doom3.png || die "Copying icon"
 
diff --git a/games-fps/doom3/doom3-1.3.1302-r2.ebuild b/games-fps/doom3/doom3-1.3.1302-r2.ebuild
index 0ff8d668fc50..77a890db8658 100644
--- a/games-fps/doom3/doom3-1.3.1302-r2.ebuild
+++ b/games-fps/doom3/doom3-1.3.1302-r2.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/doom3/doom3-1.3.1302-r2.ebuild,v 1.1 2006/03/23 00:59:08 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/doom3/doom3-1.3.1302-r2.ebuild,v 1.2 2006/03/31 20:56:02 wolf31o2 Exp $
 
 inherit eutils games
 
@@ -14,7 +14,7 @@ LICENSE="DOOM3"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
 IUSE="alsa cdinstall opengl roe"
-RESTRICT="nostrip"
+RESTRICT="strip"
 
 DEPEND="app-arch/bzip2
 	app-arch/tar"
diff --git a/games-fps/enemy-territory-fortress/Manifest b/games-fps/enemy-territory-fortress/Manifest
index b5c085fa9e4e..dc10f6d276a3 100644
--- a/games-fps/enemy-territory-fortress/Manifest
+++ b/games-fps/enemy-territory-fortress/Manifest
@@ -1,21 +1,9 @@
-MD5 e57dc196515638428a7ea425e24c91a2 ChangeLog 1211
-RMD160 c033aa78699a9a600c7f7445dcbedb303a6da2cf ChangeLog 1211
-SHA256 009538ec471a908e8ae1c4c14477e981bf60f43c0858def655648f45d8e0c9e1 ChangeLog 1211
-MD5 cff379db019bdc652f2ef85d77f2771a enemy-territory-fortress-1.2.ebuild 766
-RMD160 26b9c550449b3894910e8c1d25007166aa25f351 enemy-territory-fortress-1.2.ebuild 766
-SHA256 fb9b9c2476ddafe109d038f67da5998dfd1ed3bfef52931636c84cbd7f373aab enemy-territory-fortress-1.2.ebuild 766
-MD5 2f2f8a56d89b352ad42efcdf4fffb530 enemy-territory-fortress-1.4.ebuild 639
-RMD160 e42a0f82f73a2e6332596707230bb864cd7da042 enemy-territory-fortress-1.4.ebuild 639
-SHA256 61603bd4e86c8d34069da25af953e5289e98e0c0207aceb3c3a29d06b378589c enemy-territory-fortress-1.4.ebuild 639
+MD5 945e64f9203539a96fbda1309a363d9e ChangeLog 1371
+RMD160 757a9cc7f28bf4db0ddfcf4a90ec838f1300903c ChangeLog 1371
+SHA256 9677b453c5e2229e24d620b3e9e4735e76c3e515e835997a71dfc8f4171383de ChangeLog 1371
 MD5 39c3aa6bf04d473cdedbea7eff63a4e0 enemy-territory-fortress-1.6-r1.ebuild 757
 RMD160 aae2c5b3e9feaba1f95287879978eda5324f71f5 enemy-territory-fortress-1.6-r1.ebuild 757
 SHA256 de7b33404bc418a3988442758cfe92b8e71e8cdf7602186604b4569787b6a522 enemy-territory-fortress-1.6-r1.ebuild 757
-MD5 7e48a1439277da2aa016c8ce198e13cf files/digest-enemy-territory-fortress-1.2 67
-RMD160 992acb61f15b5ee86deb2e413702bc85a150f534 files/digest-enemy-territory-fortress-1.2 67
-SHA256 dc0aa96c2546618dbc9f93bb534ddd1a540a3c73b3e8ea77e378dd34f2ba7803 files/digest-enemy-territory-fortress-1.2 67
-MD5 1ca6480f2a047603b9964bbf6bc66a9b files/digest-enemy-territory-fortress-1.4 69
-RMD160 53eba3a9dae48ed8b1797a48469885af0186066d files/digest-enemy-territory-fortress-1.4 69
-SHA256 4eaf815fa596468a30a6ef03915b316e6e611ccfeafa6e9b2e5778b4fbaef11c files/digest-enemy-territory-fortress-1.4 69
 MD5 241889c62783270b0ef5b6afb657ee59 files/digest-enemy-territory-fortress-1.6-r1 253
 RMD160 699c44999a29ea1ad49c656100e175919e5a69fe files/digest-enemy-territory-fortress-1.6-r1 253
 SHA256 a14bc1dd1e36017516fe41f7f8eb14b31a551d2749df9dd1fb04395e25ab49c6 files/digest-enemy-territory-fortress-1.6-r1 253