4 files changed, 128 insertions, 2 deletions
diff --git a/games-strategy/uqm/ChangeLog b/games-strategy/uqm/ChangeLog
index 2a205dc9c747..d39c999a5999 100644
--- a/games-strategy/uqm/ChangeLog
+++ b/games-strategy/uqm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-strategy/uqm
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/uqm/ChangeLog,v 1.6 2004/02/26 21:16:18 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/uqm/ChangeLog,v 1.7 2004/03/06 23:44:37 mr_bones_ Exp $
+
+*uqm-0.3-r2 (06 Mar 2004)
+
+  06 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> uqm-0.3-r2.ebuild:
+  Addition of remixed addon music.  patch from Eldad Zack via bug #43875
 
 *uqm-0.3-r1 (26 Feb 2004)
 
diff --git a/games-strategy/uqm/Manifest b/games-strategy/uqm/Manifest
index 2ce6fc473fb0..5dfbb9b7cc20 100644
--- a/games-strategy/uqm/Manifest
+++ b/games-strategy/uqm/Manifest
@@ -1,6 +1,8 @@
 MD5 8b3f92568b4244b5db5a8ef24761272f ChangeLog 964
 MD5 fffadd053673e473f6456c2b2ed93739 uqm-0.3.ebuild 2070
-MD5 a30c9d4ce8f9629d6d7323eaab258343 metadata.xml 241
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 MD5 2cfc4d22fd704d8ff1502ee0f811f4f9 uqm-0.3-r1.ebuild 2463
+MD5 25aae5f045a9c0343892b2a744068334 uqm-0.3-r2.ebuild 2875
 MD5 352d8c8a28dfc130e621263c405143f4 files/digest-uqm-0.3-r1 261
 MD5 352d8c8a28dfc130e621263c405143f4 files/digest-uqm-0.3 261
+MD5 ea11faa119f0ca347760a6224ac01b24 files/digest-uqm-0.3-r2 393
diff --git a/games-strategy/uqm/files/digest-uqm-0.3-r2 b/games-strategy/uqm/files/digest-uqm-0.3-r2
new file mode 100644
index 000000000000..0d03ec457145
--- /dev/null
+++ b/games-strategy/uqm/files/digest-uqm-0.3-r2
@@ -0,0 +1,6 @@
+MD5 9073251b0d96393441f0b40016010576 uqm-0.3-3domusic.zip 18980505
+MD5 b17bb7b54df03b2d0ae3a23b91382b27 uqm-0.3-content.zip 12554418
+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
diff --git a/games-strategy/uqm/uqm-0.3-r2.ebuild b/games-strategy/uqm/uqm-0.3-r2.ebuild
new file mode 100644
index 000000000000..cc2508814211
--- /dev/null
+++ b/games-strategy/uqm/uqm-0.3-r2.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# 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.1 2004/03/06 23:44: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
+	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"
+
+KEYWORDS="x86 ~ppc"
+LICENSE="GPL-2"
+IUSE="opengl"
+SLOT="0"
+
+RDEPEND="virtual/glibc
+	virtual/x11
+	media-libs/libvorbis
+	media-libs/jpeg
+	media-libs/libpng
+	>=media-libs/libsdl-1.2.5
+	>=media-libs/sdl-image-1.2.3
+	media-libs/libogg
+	media-libs/libvorbis
+	sys-libs/zlib"
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4
+	sys-apps/coreutils
+	app-arch/unzip"
+
+src_unpack() {
+	local myopengl
+
+	unpack ${P}-source.tgz
+	cd ${S}
+
+	use opengl \
+		&& myopengl=opengl \
+		|| myopengl=pure
+
+	cat <<-EOF > config.state
+	CHOICE_debug_VALUE='nodebug'
+	CHOICE_graphics_VALUE='${myopengl}'
+	CHOICE_sound_VALUE='mixsdl'
+	INPUT_install_prefix_VALUE='${GAMES_PREFIX}'
+	INPUT_install_bindir_VALUE='\$prefix/bin'
+	INPUT_install_libdir_VALUE='\$prefix/lib'
+	EOF
+
+	# 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"
+
+	# support the user's CFLAGS.
+	sed -i \
+		-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
+	exec /usr/games/lib/uqm/uqm --contentdir="${GAMES_DATADIR}/${PN}/content" "\$@"
+EOF
+}
+
+src_compile() {
+	./build.sh uqm || die
+}
+
+src_install() {
+	# Using the included install scripts seems quite painful.
+	# This manual install is totally fragile but maybe they'll
+	# use a sane build system.
+	dogamesbin "${T}/uqm" || die "dogamesbin failed"
+	exeinto "${GAMES_LIBDIR}/${PN}"
+	doexe uqm || die "doexe failed"
+
+	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"
+
+	dodoc AUTHORS ChangeLog Contributing README TODO WhatsNew \
+		doc/users/manual.txt
+	docinto devel
+	dodoc doc/devel/*
+
+	prepgamesdirs
+}
+
+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
+}