Made a few modifications to the ebuild to make the install a bit cleaner, as well as fixing bug #148958.

Package-Manager: portage-2.1.2_pre1-r4

3 files changed, 53 insertions, 36 deletions

diff --git a/games-fps/ut2003-demo/ChangeLog b/games-fps/ut2003-demo/ChangeLog
index c9719608766e..b73df63c94ce 100644
--- a/games-fps/ut2003-demo/ChangeLog
+++ b/games-fps/ut2003-demo/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-fps/ut2003-demo
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2003-demo/ChangeLog,v 1.23 2006/09/15 20:26:41 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2003-demo/ChangeLog,v 1.24 2006/09/29 20:27:19 wolf31o2 Exp $
+
+  29 Sep 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  ut2003-demo-2206-r3.ebuild:
+  Made a few modifications to the ebuild to make the install a bit cleaner, as
+  well as fixing bug #148958.
 
   15 Sep 2006; Chris Gianelloni <wolf31o2@gentoo.org> files/benchmark,
   files/ut2003-demo, ut2003-demo-2206-r3.ebuild:
diff --git a/games-fps/ut2003-demo/Manifest b/games-fps/ut2003-demo/Manifest
index 5a50845fa919..d79b4efb17b4 100644
--- a/games-fps/ut2003-demo/Manifest
+++ b/games-fps/ut2003-demo/Manifest
@@ -17,17 +17,17 @@ AUX ut2003-demo 692 RMD160 6ee19137378fc8db596847a948bbac9f96be88b0 SHA1 4974b26
 MD5 68a3cf54360ab9b7666c614f8b53432b files/ut2003-demo 692
 RMD160 6ee19137378fc8db596847a948bbac9f96be88b0 files/ut2003-demo 692
 SHA256 a40b124f93f8f47c5823ddec5234eef4c249e7f488a69fbb0f0949921d92474b files/ut2003-demo 692
-DIST UT2003CrashFix.zip 2764 RMD160 647c14d1b6574e4c117426a1a21e1f0e3d846160 SHA256 df1a6fdf81f388486b20abf301ef86fb72b0b12d96bec789d7cb7103da579813
-DIST ut2003-demo-misc.tar.bz2 31851 RMD160 54f9f746389a752184a223f2fc0d44818d5eb825 SHA256 215a82cc4768c93a979771b1abf6250bcbe36be466d119df41acd041ac189ced
-DIST ut2003demo-lnx-2206.sh.bin 137253079 RMD160 db31bfdfd031dc7394f9d2a84f89b11af7a460c5 SHA256 e7664d20d6364e4f151199e3f7e111888abeb63e1d93146c88d932c6a2b94173
-EBUILD ut2003-demo-2206-r3.ebuild 3543 RMD160 8fdf40f35c4bbbbc03b7bdf24ea5362e83363ae7 SHA1 06d998e8c07cc3c6adcfafa3a263935ea018e2b7 SHA256 b76fe7019487d052a95e0f8696ad04e52d8856b228e5ed63c4d4a6ad82b30fda
-MD5 d690e05b615391af34aaea58e4ad3419 ut2003-demo-2206-r3.ebuild 3543
-RMD160 8fdf40f35c4bbbbc03b7bdf24ea5362e83363ae7 ut2003-demo-2206-r3.ebuild 3543
-SHA256 b76fe7019487d052a95e0f8696ad04e52d8856b228e5ed63c4d4a6ad82b30fda ut2003-demo-2206-r3.ebuild 3543
-MISC ChangeLog 6824 RMD160 367ea3c6c46f34b8c0818e1e3734b17a787b37cf SHA1 b2aef9bbc5d9cf9def5cc4de1c116e3ebccca23a SHA256 442d2750efd63380bddc8b451cf76a40352f663934f2c73046c9e6b30b9ce611
-MD5 f9cb728ac43c2ddf6bc397e8e14bf363 ChangeLog 6824
-RMD160 367ea3c6c46f34b8c0818e1e3734b17a787b37cf ChangeLog 6824
-SHA256 442d2750efd63380bddc8b451cf76a40352f663934f2c73046c9e6b30b9ce611 ChangeLog 6824
+DIST UT2003CrashFix.zip 2764 RMD160 647c14d1b6574e4c117426a1a21e1f0e3d846160 SHA1 420335203b972303f6701f35ff7260e327fa8441 SHA256 df1a6fdf81f388486b20abf301ef86fb72b0b12d96bec789d7cb7103da579813
+DIST ut2003-demo-misc.tar.bz2 31851 RMD160 54f9f746389a752184a223f2fc0d44818d5eb825 SHA1 47d9de41241cf3dbbc58476cd17d5dbe8592165a SHA256 215a82cc4768c93a979771b1abf6250bcbe36be466d119df41acd041ac189ced
+DIST ut2003demo-lnx-2206.sh.bin 137253079 RMD160 db31bfdfd031dc7394f9d2a84f89b11af7a460c5 SHA1 b39ed3bd61ca8d86386b8dbbc1cbfac7e160e8da SHA256 e7664d20d6364e4f151199e3f7e111888abeb63e1d93146c88d932c6a2b94173
+EBUILD ut2003-demo-2206-r3.ebuild 3775 RMD160 9251ba60c5c8bf96af3a744cb11c9f1195ba86c7 SHA1 9cc30c6268e1e9509972939632cb4d765174f466 SHA256 9bc5337e705336bd41a36cedee21a3a682c76a9e0ba38dd9fb6a9664734da982
+MD5 a0a34613f75646e844b59ca14e2a90ea ut2003-demo-2206-r3.ebuild 3775
+RMD160 9251ba60c5c8bf96af3a744cb11c9f1195ba86c7 ut2003-demo-2206-r3.ebuild 3775
+SHA256 9bc5337e705336bd41a36cedee21a3a682c76a9e0ba38dd9fb6a9664734da982 ut2003-demo-2206-r3.ebuild 3775
+MISC ChangeLog 7018 RMD160 366a6ec50d8538877d25310ce6d784cf78da63e7 SHA1 c721e4a575d2c69c5a3ae4a53871f9820fe40881 SHA256 55c58371c9e9df0db7210f264b7ed0ad06d13d30cc298fd55a632dce86d45e23
+MD5 7e25c0a9b69bacf3e3a050eb940613cc ChangeLog 7018
+RMD160 366a6ec50d8538877d25310ce6d784cf78da63e7 ChangeLog 7018
+SHA256 55c58371c9e9df0db7210f264b7ed0ad06d13d30cc298fd55a632dce86d45e23 ChangeLog 7018
 MISC metadata.xml 607 RMD160 29edc49f7f222cbe32ce2c89050e754f4bb0156f SHA1 385129c0ec5c75ed6870de4b77891eae48ac25be SHA256 a7245eb0e1eaa658e9eb48539ece13de36c0859d2ad89d4cc97a968501a161a3
 MD5 d1603da79c3c68c905ab4524a4e2152d metadata.xml 607
 RMD160 29edc49f7f222cbe32ce2c89050e754f4bb0156f metadata.xml 607
@@ -38,7 +38,7 @@ SHA256 84d7ca286b9387f2ae1c563a3925dd3e98b219c824660cfe6eb1589f37a988ad files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFCwyIkT4lNIS36YERAow1AJ9/cNf1PHBqPuNT5i+K+fxie8nTjgCgrNcO
-HMy78DigaVeKP9JEjtker/0=
-=TKbR
+iD4DBQFFHYHCkT4lNIS36YERArVcAJ44w906IoUe3IRCLDI0csuBqyQFVACXQeVq
+9Ae1nNlD17xOyEdRlEK4wg==
+=Iamh
 -----END PGP SIGNATURE-----
diff --git a/games-fps/ut2003-demo/ut2003-demo-2206-r3.ebuild b/games-fps/ut2003-demo/ut2003-demo-2206-r3.ebuild
index 28b8f89894db..e122428b90f4 100644
--- a/games-fps/ut2003-demo/ut2003-demo-2206-r3.ebuild
+++ b/games-fps/ut2003-demo/ut2003-demo-2206-r3.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-demo/ut2003-demo-2206-r3.ebuild,v 1.18 2006/09/15 20:26:41 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/ut2003-demo/ut2003-demo-2206-r3.ebuild,v 1.19 2006/09/29 20:27:19 wolf31o2 Exp $
 
 inherit eutils games
 
@@ -20,11 +20,8 @@ DEPEND="app-arch/unzip"
 RDEPEND="virtual/opengl
 	~virtual/libstdc++-3.3
 	x86? (
-		|| (
-			(
-				x11-libs/libX11
-				x11-libs/libXext )
-			virtual/x11 ) )
+		x11-libs/libX11
+		x11-libs/libXext )
 	amd64? (
 		app-emulation/emul-linux-x86-xlibs )"
 
@@ -39,19 +36,28 @@ src_unpack() {
 		|| die "unpacking demo"
 	unzip "${DISTDIR}"/UT2003CrashFix.zip \
 		|| die "unpacking crash-fix"
-	unpack setupstuff.tar.gz || die
+	cd "${S}"
+	unpack ./setupstuff.tar.gz || die
+	unpack ./ut2003lnx_demo.tar.bz2 || die
+	unpack ${PN}-misc.tar.bz2 || die
 }
 
 src_install() {
 	einfo "This will take a while ... go get a pizza or something"
 	dodir "${dir}"
 
-	tar -jxvf ut2003lnx_demo.tar.bz2 -C "${Ddir}" || die
-	tar -jxvf "${DISTDIR}"/${PN}-misc.tar.bz2 -C "${Ddir}" || die
+	local i
+	for i in Animations Benchmark Help KarmaData Maps Music Sounds \
+	StaticMeshes System Textures Web extras
+	do
+		dodir "${dir}"/${i}
+		cp -pPR "${S}"/${i}/* "${Ddir}"/${i}
+	done
 
-	# fix the benchmark configurations to use SDL rather than the Windows driver
+	# Fix the benchmark configurations to use SDL rather than the Windows driver
 	local f
-	for f in MaxDetail.ini MinDetail.ini ; do
+	for f in MaxDetail.ini MinDetail.ini
+	do
 		sed -i \
 			-e 's/RenderDevice=D3DDrv.D3DRenderDevice/\;RenderDevice=D3DDrv.D3DRenderDevice/' \
 			-e 's/ViewportManager=WinDrv.WindowsClient/\;ViewportManager=WinDrv.WindowsClient/' \
@@ -61,7 +67,8 @@ src_install() {
 			|| die "sed ${dir}/Benchmark/Stuff/${f} failed"
 	done
 
-	# have the benchmarks run the nifty wrapper script rather than ../System/ut2003-bin directly
+	# Have the benchmarks run the nifty wrapper script rather than
+	# ../System/ut2003-bin directly
 	for f in "${Ddir}"/Benchmark/*-*.sh ; do
 		sed -i \
 			-e 's:\.\./System/ut2003-bin:../ut2003_demo:' "${f}" \
@@ -73,8 +80,8 @@ src_install() {
 	exeinto "${dir}"/Benchmark
 	doexe "${FILESDIR}/"{benchmark,results.sh} || die "doexe failed"
 	dosed "s:GAMES_PREFIX_OPT:${GAMES_PREFIX_OPT}:" \
-		"${GAMES_BINDIR}"/benchmark "${dir}"/Benchmark/benchmark \
-		|| die "sed"
+		"${GAMES_BINDIR}"/${PN} "${dir}"/Benchmark/benchmark \
+		|| die "sed GAMES_PREFIX_OPT"
 
 	# Here we apply DrSiN's crash patch
 	cp "${S}"/CrashFix/System/crashfix.u "${Ddir}"/System \
@@ -90,6 +97,10 @@ w
 q
 EOT
 
+	exeinto "${dir}"
+	insinto "${dir}"
+	doins DemoLicense.int README.linux
+	doexe ucc ut2003_demo
 	newicon Unreal.xpm ut2003-demo.xpm
 	make_desktop_entry ut2003-demo "Unreal Tournament 2003 (Demo)" ${PN}.xpm
 
@@ -98,18 +109,19 @@ EOT
 
 pkg_postinst() {
 	games_pkg_postinst
-	einfo "To play the demo run:"
-	einfo " ut2003-demo"
-	echo
-	einfo "You can run benchmarks by typing 'ut2003-demo --bench' (MinDetail seems"
-	einfo "to not be working for some unknown reason :/)"
+	elog "You can run benchmarks by typing 'ut2003-demo --bench' (MinDetail seems"
+	elog "to not be working for some unknown reason :/)"
 	echo
-	einfo "Read ${dir}/README.linux for instructions on how to run a"
-	einfo "dedicated server."
+	elog "Read ${dir}/README.linux for instructions on how to run a"
+	elog "dedicated server."
 	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 "~/.ut2003demo/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."
+	echo
+	elog "To play the demo run:"
+	elog " ut2003-demo"
+	echo
 }