4 files changed, 57 insertions, 36 deletions
diff --git a/games-strategy/uqm/ChangeLog b/games-strategy/uqm/ChangeLog
index f02fb085da24..ce75b53d2016 100644
--- a/games-strategy/uqm/ChangeLog
+++ b/games-strategy/uqm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-strategy/uqm
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/uqm/ChangeLog,v 1.9 2004/11/24 21:40:47 josejx Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/uqm/ChangeLog,v 1.10 2005/02/09 07:34:37 mr_bones_ Exp $
+
+  09 Feb 2005; Michael Sterrett <mr_bones_@gentoo.org> uqm-0.3-r2.ebuild:
+  more use flag knobs to support specific content install (bug #67045) -
+  ebuild mods from John Croisant
 
   25 Nov 2004; Joseph Jezak <josejx@gentoo.org> uqm-0.3-r2.ebuild:
   Markked ppc stable.
diff --git a/games-strategy/uqm/Manifest b/games-strategy/uqm/Manifest
index db72047ff3db..cfbc1cddbfa7 100644
--- a/games-strategy/uqm/Manifest
+++ b/games-strategy/uqm/Manifest
@@ -1,4 +1,4 @@
-MD5 f7b0499800887d16aa70da37a222ddff ChangeLog 1217
+MD5 192070c9d0a5cb1069aadcdd0f936d85 ChangeLog 1402
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
-MD5 c2ef5e0cba92c615a7af134176dbb375 uqm-0.3-r2.ebuild 3002
-MD5 ea11faa119f0ca347760a6224ac01b24 files/digest-uqm-0.3-r2 393
+MD5 6cae0cb5830f71abed5c7997832a11e2 uqm-0.3-r2.ebuild 3381
+MD5 66274a64a0ad3d68e466be478cd28186 files/digest-uqm-0.3-r2 459
diff --git a/games-strategy/uqm/files/digest-uqm-0.3-r2 b/games-strategy/uqm/files/digest-uqm-0.3-r2
index 0d03ec457145..8beb13822150 100644
--- a/games-strategy/uqm/files/digest-uqm-0.3-r2
+++ b/games-strategy/uqm/files/digest-uqm-0.3-r2
@@ -1,6 +1,7 @@
-MD5 9073251b0d96393441f0b40016010576 uqm-0.3-3domusic.zip 18980505
+MD5 6abcdc3caf7efd3bd978332743ee7568 uqm-0.3-source.tgz 906653
 MD5 b17bb7b54df03b2d0ae3a23b91382b27 uqm-0.3-content.zip 12554418
+MD5 9073251b0d96393441f0b40016010576 uqm-0.3-3domusic.zip 18980505
 MD5 9a44f0037d05c453b9e570b88b12595f uqm-0.3-voice.zip 114985054
-MD5 6abcdc3caf7efd3bd978332743ee7568 uqm-0.3-source.tgz 906653
 MD5 2df402b2951c0187604a81c3997fbb9d uqm-remix-pack1.zip 50188123
 MD5 d5a9fb72b369bf5a5dbca3db9f1e1ea3 uqm-remix-pack2.zip 60281175
+MD5 567bc2d9e3ca067d21170c5ac5538441 uqm-remix-pack3.zip 39923803
diff --git a/games-strategy/uqm/uqm-0.3-r2.ebuild b/games-strategy/uqm/uqm-0.3-r2.ebuild
index c9530cd1ca13..b3c3f8d244cc 100644
--- a/games-strategy/uqm/uqm-0.3-r2.ebuild
+++ b/games-strategy/uqm/uqm-0.3-r2.ebuild
@@ -1,22 +1,23 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/uqm/uqm-0.3-r2.ebuild,v 1.4 2004/11/24 21:40:47 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/uqm/uqm-0.3-r2.ebuild,v 1.5 2005/02/09 07:34:37 mr_bones_ Exp $
 
 inherit games
 
 DESCRIPTION="The Ur-Quan Masters: Port of Star Control 2"
 HOMEPAGE="http://sc2.sourceforge.net/"
-SRC_URI="mirror://sourceforge/sc2/${P}-3domusic.zip
+SRC_URI="mirror://sourceforge/sc2/${P}-source.tgz
 	mirror://sourceforge/sc2/${P}-content.zip
-	mirror://sourceforge/sc2/${P}-voice.zip
-	mirror://sourceforge/sc2/${P}-source.tgz
-	mirror://sourceforge/sc2/${PN}-remix-pack1.zip
-	mirror://sourceforge/sc2/${PN}-remix-pack2.zip"
+	music? ( mirror://sourceforge/sc2/${P}-3domusic.zip )
+	voice? ( mirror://sourceforge/sc2/${P}-voice.zip )
+	remix? ( mirror://sourceforge/sc2/${PN}-remix-pack1.zip \
+		mirror://sourceforge/sc2/${PN}-remix-pack2.zip \
+		mirror://sourceforge/sc2/${PN}-remix-pack3.zip )"
 
-KEYWORDS="x86 ppc"
 LICENSE="GPL-2"
-IUSE="opengl"
 SLOT="0"
+KEYWORDS="x86 ppc"
+IUSE="opengl music voice remix"
 
 RDEPEND="virtual/libc
 	virtual/x11
@@ -54,13 +55,13 @@ src_unpack() {
 
 	# Take out the read so we can be non-interactive.
 	sed -i \
-		-e '/read CHOICE/d' build/unix/menu_functions || \
-		die "sed menu_functions failed"
+		-e '/read CHOICE/d' build/unix/menu_functions \
+		|| die "sed menu_functions failed"
 
 	# support the user's CFLAGS.
 	sed -i \
-		-e "s/-O3/${CFLAGS}/" build/unix/build.config || \
-		die "sed build.config failed"
+		-e "s/-O3/${CFLAGS}/" build/unix/build.config \
+		|| die "sed build.config failed"
 	cat > ${T}/uqm <<-EOF
 	#!/bin/sh
 	# Wrapper script for starting The Ur-Quan Masters
@@ -69,7 +70,7 @@ EOF
 }
 
 src_compile() {
-	./build.sh uqm || die
+	./build.sh uqm || die "build failed"
 }
 
 src_install() {
@@ -83,14 +84,29 @@ src_install() {
 	dodir "${GAMES_DATADIR}/${PN}/content/packages/content"
 	cp content/version "${D}${GAMES_DATADIR}/${PN}/content" \
 		|| die "cp version failed"
-	cp ${DISTDIR}/${P}-{3domusic,content,voice}.zip \
-		"${D}${GAMES_DATADIR}/${PN}/content/packages" \
-			|| die "cp media archives failed"
 
-	dodir "${GAMES_DATADIR}/${PN}/content/packages/addons/uqmremix"
-	cp ${DISTDIR}/${PN}-remix-pack{1,2}.zip \
-		"${D}${GAMES_DATADIR}/${PN}/content/packages/addons/uqmremix" \
-			|| die "cp media archives addons failed"
+	cp ${DISTDIR}/${P}-content.zip\
+		 "${D}${GAMES_DATADIR}/${PN}/content/packages"\
+		|| die "cp failed"
+
+	if use music; then
+		cp ${DISTDIR}/${P}-3domusic.zip \
+			"${D}${GAMES_DATADIR}/${PN}/content/packages" \
+			|| die "cp failed"
+	fi
+
+	if use voice; then
+		cp ${DISTDIR}/${P}-voice.zip \
+			"${D}${GAMES_DATADIR}/${PN}/content/packages" \
+			|| die "cp failed"
+	fi
+
+	if use remix; then
+		dodir "${GAMES_DATADIR}/${PN}/content/packages/addons/uqmremix"
+		cp ${DISTDIR}/${PN}-remix-pack{1,2,3}.zip \
+			"${D}${GAMES_DATADIR}/${PN}/content/packages/addons/uqmremix" \
+			|| die "cp failed"
+	fi
 
 	dodoc AUTHORS ChangeLog Contributing README TODO WhatsNew \
 		doc/users/manual.txt
@@ -102,12 +118,12 @@ src_install() {
 
 pkg_postinst() {
 	games_pkg_postinst
-	echo
-	einfo "To hear all the remixed music made by the The Ur-Quan Masters"
-	einfo "project's Precursors Team instead of the original ones,"
-	einfo "start the game with:"
-	einfo
-	einfo "    --addon uqmremix"
-	einfo
-	echo
+	if use remix ; then
+		echo
+		einfo "To hear all the remixed music made by the The Ur-Quan Masters"
+		einfo "project's Precursors Team instead of the original ones,"
+		einfo "start the game with:"
+		einfo "    --addon uqmremix"
+		echo
+	fi
 }