General clean-up of the ebuild.

Package-Manager: portage-2.0.53_rc5

3 files changed, 19 insertions, 21 deletions

diff --git a/games-fps/doom3/ChangeLog b/games-fps/doom3/ChangeLog
index b15dc64bb993..a7fb316cd371 100644
--- a/games-fps/doom3/ChangeLog
+++ b/games-fps/doom3/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-fps/doom3
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/doom3/ChangeLog,v 1.18 2005/10/22 16:51:55 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/doom3/ChangeLog,v 1.19 2005/10/24 19:29:26 wolf31o2 Exp $
+
+  24 Oct 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+  doom3-1.3.1302-r1.ebuild:
+  General clean-up of the ebuild.
 
 *doom3-1.3.1302-r1 (22 Oct 2005)
 
diff --git a/games-fps/doom3/Manifest b/games-fps/doom3/Manifest
index 0a6e66cf2410..1b6fe2523c74 100644
--- a/games-fps/doom3/Manifest
+++ b/games-fps/doom3/Manifest
@@ -1,5 +1,5 @@
-MD5 369ccdfd788216db8e98e1cac9a1ee08 ChangeLog 2842
-MD5 09097c40a537e4c46df6b2bae399cfb7 doom3-1.3.1302-r1.ebuild 2472
+MD5 1c86620f0ad2b6f833f9179ca08332b8 ChangeLog 2959
+MD5 6281508f1321cbe4fc34d95f92090ae9 doom3-1.3.1302-r1.ebuild 2376
 MD5 32e0f4b3043f88f4fb8b6643faf46f7a doom3-1.3.1302.ebuild 3028
 MD5 ee418b79762e7a8192014b3288671c9d files/digest-doom3-1.3.1302 127
 MD5 ee418b79762e7a8192014b3288671c9d files/digest-doom3-1.3.1302-r1 127
diff --git a/games-fps/doom3/doom3-1.3.1302-r1.ebuild b/games-fps/doom3/doom3-1.3.1302-r1.ebuild
index 28b0315c981b..f198b0af1df5 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-2005 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.1 2005/10/22 16:51:55 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/doom3/doom3-1.3.1302-r1.ebuild,v 1.2 2005/10/24 19:29:26 wolf31o2 Exp $
 
 inherit eutils games
 
@@ -36,11 +36,9 @@ src_unpack() {
 }
 
 src_install() {
-	dodir ${dir}
-
-	insinto ${dir}
+	insinto "${dir}"
 	doins License.txt CHANGES README version.info doom3.png
-	exeinto ${dir}
+	exeinto "${dir}"
 	doexe libgcc_s.so.1 libstdc++.so.5 || die "doexe libs"
 	doexe openurl.sh || die "openurl.sh"
 	if use x86; then
@@ -51,17 +49,15 @@ src_install() {
 		die "Cannot copy executables!"
 	fi
 
-	insinto ${dir}/pb
+	insinto "${dir}"/pb
 	doins pb/* || die "doins pb"
-	insinto ${dir}/d3xp
+	insinto "${dir}"/d3xp
 	doins d3xp/* || die "doins d3xp"
-	insinto ${dir}/base
+	insinto "${dir}"/base
 	doins base/* || die "doins base"
 
 	games_make_wrapper doom3 ./doom.x86 "${dir}" "${dir}"
-	games_make_wrapper doom3-ded ./doomded.x86 ${dir}
-
-	use cdinstall && find ${Ddir} -exec touch '{}' \;
+	games_make_wrapper doom3-ded ./doomded.x86 "${dir}" "${dir}"
 
 	doicon ${DISTDIR}/doom3.png || die "Copying icon"
 
@@ -72,18 +68,16 @@ src_install() {
 pkg_postinst() {
 	games_pkg_postinst
 
-	if use cdinstall; then
-		einfo "To play the game run:"
-		einfo " doom3"
-	else
+	if ! use cdinstall; then
 		einfo "You need to copy pak000.pk4, pak001.pk4, pak002.pk4, pak003.pk4, and"
 		einfo "pak004.pk4 from either your installation media or your hard drive to"
 		einfo "${dir}/base before running the game."
 		echo
 		einfo "To use the Ressurection of Evil expansion pack, you also need to copy"
 		einfo "pak000.pk4 to ${dir}/d3xp before running the game."
-		echo
-		einfo "To play the game run:"
-		einfo " doom3"
 	fi
+	echo
+	einfo "To play the game run:"
+	einfo " doom3"
+	echo
 }