fix bug #438992 and #438980

Package-Manager: portage-2.2.0_alpha140/cvs/Linux x86_64
Manifest-Sign-Key: 0xE73C35B3

3 files changed, 136 insertions, 2 deletions

diff --git a/games-strategy/uqm/ChangeLog b/games-strategy/uqm/ChangeLog
index d7156e388e8f..61e08d7603b6 100644
--- a/games-strategy/uqm/ChangeLog
+++ b/games-strategy/uqm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-strategy/uqm
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/uqm/ChangeLog,v 1.38 2012/08/24 19:15:48 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/uqm/ChangeLog,v 1.39 2012/10/19 22:54:29 hasufell Exp $
+
+*uqm-0.7.0-r2 (19 Oct 2012)
+
+  19 Oct 2012; Julian Ospald <hasufell@gentoo.org> +uqm-0.7.0-r2.ebuild:
+  fix bug #438992 and #438980
 
   24 Aug 2012; Michael Sterrett <mr_bones_@gentoo.org> -uqm-0.7.0.ebuild:
   old
diff --git a/games-strategy/uqm/Manifest b/games-strategy/uqm/Manifest
index 5d798b1e0808..35734b4359b9 100644
--- a/games-strategy/uqm/Manifest
+++ b/games-strategy/uqm/Manifest
@@ -1,10 +1,28 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST uqm-0.7.0-3domusic.uqm 18980671 SHA256 c57085e64dad4bddf8a679a9aa2adf63f2156d5f6cbabe63af80519033dbcb82 SHA512 e7d723194685388813d72e1add9a710ecd3de9b33381dfe66acee6c31a31634ee9031ecc83c2003a5222b9381efe150a2f2a9289f8505d842182ca03b012183b WHIRLPOOL c975e37f7ade37891e9009c84b1219d57b17c354efec6d7d777623385c8e1ea8c82ac11a05d14391052a262645205d5f9f9c04f41e5b7590e6103c77a85f59cb
 DIST uqm-0.7.0-content.uqm 11538533 SHA256 b8f6db8ba29f0628fb1d5c233830896b19f441aee3744bda671ea264b44da3bf SHA512 c80aa9f1158d07534abc1ef625662dfcd5021cb5e8091d46b3e9a2d96a0fffbe7e9e6cc88680b43d810c8e68a580f7a0d4b62c08e9f7b948ae7f017e4ad20dd2 WHIRLPOOL 328bbbd68701d560eb1bb3f838166afa0f958bb8bd7e6dcc5f7c223a1a5d79c57f08a48cda33612e99d7904d55a0e23b78eabe419f5c5a35ba009cd0b45d8104
 DIST uqm-0.7.0-source.tgz 1562003 SHA256 a3695c5f7f0be7ec9c0f80ec569907b382023a1fee6e635532bd53b7b53bb221 SHA512 443ac13da401d45743f913755647b3309834c57f371fb673c3ea2cacb81184bf30430db10af9001de854363520d1f792f47faffd690c8c2b2f3d12d63b217815 WHIRLPOOL 2e35a334ed575d13c3b48dd819298442cbe30554b00c34dd3cf687a30793c9b4d403339cf807331307d51dd609f253d063930b4dc9f2ce68ce9aff86480cce99
 DIST uqm-0.7.0-voice.uqm 115143439 SHA256 bcccf801b4ba37594ff6217b292744ea586ee2d447e927804842ccae8b73c979 SHA512 693a4869f8567637b112138f8a074b65919776175addbd353e3601085ee4e4bb4758daca64921c902463f5dc38baa6f7fda4ad32f3cf1786646ef48f15cdeb80 WHIRLPOOL 6c447e5d6e09e195390346e93b8052ce6a7b2f9a4ccad7e15b30fd1473029fdec41cb2bc743129de36fe6c136e4fface6f3cbedfcb9360b19a219e47207401ce
+DIST uqm-remix-disc1.uqm 50188876 SHA256 b697694745d939311e8ebffdd5edf692e010c25d7966e1481074940a4d0487e8 SHA512 fed2a6e260ee96802898ad9b6c968acaac3613187fe38370fb557d6d220b499b922447ea04edd15763d0161f5c156ce03bc9d55a86ed3b4e2e0140a4fb17e99b WHIRLPOOL fee79171e43fb203dcc2b8cbca7d3e2edfa4c6334a1f0996fa8951dc67ef94e67f06edbe250810e1385f5887834a7a0755e1e40a9aa3cdae0cdfb937e238fe46
+DIST uqm-remix-disc2.uqm 60282662 SHA256 7fbb4744102e31273e4459b01a156da052ec537c128fe91793643e348bc1bade SHA512 3053693417facef6d01cdb366a15c1bd2a6272961df5870c4151a928845dd76e4ac5fc59f232da5034d56fd9476d3074840a2e9f16d63dba341aeffd92827c4e WHIRLPOOL e52f1eb1c8cd0007eb77d80719f8feeb044c61bb2d72c14fae92ba62ea8ad1225ffa427db39dadd864304818839c4df0e1e0fe9c0d8a2b265ceead14f70df56e
+DIST uqm-remix-disc3.uqm 39924875 SHA256 e6d89f8f66cf1df1cb278fca1e92261b1776ee670dff26132e33f14dbd31e91d SHA512 2337752e3a2447ab048cc6782153bbb120d2d6b890c5bfae9cbef60a46d12abf716917863286b0196bf6f5e8ef301b5f84338237520880b10cbf75e450076951 WHIRLPOOL ba1ed49bb6761d9955fe9beced1987dd4458cd0203a9c8e712bb55034fd8d278f489c995969866cb7096bea75e88b330031f070b7aeb7e09f48fda0ece862e36
 DIST uqm-remix-pack1.zip 50188123 SHA256 1b9ccc799e531f50580952af92b342fb6684ae97b7bdc434f3b7e22d0c230644 SHA512 8e089713b14da72458cd25989a8e710016113c0accb95bde41e320d3091ea5bf40867b40a3ffb5c4d293447de32fb0899095cbb379864d0e533ed69cf2fc329d WHIRLPOOL 659356e8394a1e36689296b7100b84546247f26212d5e0a2c0431e9c7e7700c5108c29cf153cbcedd39eb36764e1e84abf811e965191f76a5847fbf3f02b0d30
 DIST uqm-remix-pack2.zip 60281175 SHA256 1dff1792a558a52eb5cbdf24e0c1b8b7ec85aff75a00ddb403ec988607f51dd0 SHA512 0982a9b10af36d9e3871858357a20c97ee7f4470688c1c81bcfccf09ffd6378e3930093766dc129830a54a5d9826f750c2cfa63e67d5eaebcf115f1a414c4806 WHIRLPOOL 8813e69ede4b404b513dca2ad405c40f51eacce798132437c8b85732c833b5d3a221961325866ff9618b441d493dce0dd6dc6c5f151ca44438d1a2b13e230732
 DIST uqm-remix-pack3.zip 39923803 SHA256 4e347d52279785eba4ba5355beae63048ce3b550db3181d4d55df6a20361682d SHA512 36957005983df41cc08e4492a313c0606bb2eef0bad645b3b865f00986a44045c1ddf18fd4ba1030119c742db8d6de3b9946fc0e2f5f5ea675788a8d30e1203e WHIRLPOOL 4c309d66f074de111cac088a31cfa48572eb7715da854b507df97640bcc7fe69c9e683ffb270eb7cdb6105881129254b67ae49db02f65c42da6f6ab4b97f95e0
 EBUILD uqm-0.7.0-r1.ebuild 3636 SHA256 da38c50c8400a82eb13a7be0d7397f5d6cfb5c6a0d7cf2ab34c3f3151c35dc8b SHA512 25062f82a13ceea74d149ddf593c25dca3d38d2de1855cac727260256bd2ebd3ff2cb0ab8bce85bc6f78d37e2d87a593a52eb45dd1350785f23a0b3bc698e81f WHIRLPOOL 1e66645fd0b2278763ef7dd583359be602130587bff20ecfa2c3d52f38725d2ad75694ba60424c9bd171e7bd88c824c32e6bad8ce0491d627c15ca17ca60d1d9
-MISC ChangeLog 4637 SHA256 d25a22e027f8f5909a0f8d2d0ec6e5926399f85106014637be9190285b34440b SHA512 d62eb3ecd194688799d3d15c2a96068af36f8daaf7dd5910c270f7289d30766f40ebcd6f3868e7521bb481a5b5e8738451874afdb5edc73938cf588dbc6515bc WHIRLPOOL 378c5f1681265f0e3f8089b2fedcb2c72b254c4b2eed872af433ebd33a3e3f4727651d461fa6643ba248e212ec37e42065a04347497a590b11ecf6c032fe69bb
+EBUILD uqm-0.7.0-r2.ebuild 3244 SHA256 7dd12b9e5413c5024009e4ec8d18390386db7dd471396c865277cfd4acaf012a SHA512 b789ed42d90a5893d177a1030c41491d4d3e0fff2f51232d977ad2bd27372207d199f79c59c17fa135ca902df7fda0e644f56bb06f0f89a0d8328ecf59b520a5 WHIRLPOOL a78832f74d5b0aef0577515df9c4860b3605027370fe107f88527ddd2c912a7ff5ebe69bf826aa8ddc18e9ed8addd802f840b504fd518c38f25f87f6b00fb85c
+MISC ChangeLog 4769 SHA256 76733643b1f5367b271f262bf9ff9181bc1e1d55f7332ce887179dea99d96f89 SHA512 b7c179cfe4452b774e68b22d938cb54e33d0dda09aad4bfc76894ba371ac9c90688c470c12d43d96fd9e6a5457c7ded27caf624ade265591bbb6bab228da58d8 WHIRLPOOL 327c9ea6ffd60ca5b70681457b721347520315195b2d19139910cdf6ec0ba36245193e1ba6ca5d304230247bda62c70143fdc5c7a9e5e8e32312e47e18f5f521
 MISC metadata.xml 396 SHA256 b6d936f701a8b3777501f3fa1c255f7aec921f1dd1cc999a2d75432ec849df16 SHA512 7f6567cabd77dfa78c23f5d4c0bba1cdc6fcc1672bc3833b64f3ba4fb4df4e73929ddecc7b1d5d712aeb7f49821d06cb36bce47e48d907e881ac71fdc291835a WHIRLPOOL 06f32726592b9c8a7c6c2e25664718cd383c0c3f7a2c944344340b94c0cc5ac289f6678d9f4ac1e2c912027e2c39afd2899e4050c4e53c4ab78cfd7560b9cd28
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJQgdomAAoJEFpvPKfnPDWzF/AH/2zMKpEbH1AurF6GJRNI+W3m
+qCXKbqnuzMjTDIVrgdE9lAsKUHoBoOIj6/FcNqkGodlO3xX06ep1E5D0LEzeUJ69
+RVUkOhE+q0rTnRp6fhWlbevWIArSueEL2eO0vDITaxZG3HfPOL0wi/ru7R/WIbhI
+q9vIHUaRjfOu8VNkwlS+zFDxhVim3mgKgjFfoVVZDiYQ+vyu73mQppaQWp5uxMDw
+nOMhydPzQHstjhQUoeU64J1v2Vry8mA7EjkhpYU5B7hjGqxiSgdPTHT2oRXDmHTo
+18eIOB6W6ViAO15eQQchX0FjJNkeOzh4Bz89F7ctIMBRbiRBkddCCraBVPz6EDE=
+=UoSM
+-----END PGP SIGNATURE-----
diff --git a/games-strategy/uqm/uqm-0.7.0-r2.ebuild b/games-strategy/uqm/uqm-0.7.0-r2.ebuild
new file mode 100644
index 000000000000..6d1bec0d6660
--- /dev/null
+++ b/games-strategy/uqm/uqm-0.7.0-r2.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/uqm/uqm-0.7.0-r2.ebuild,v 1.1 2012/10/19 22:54:29 hasufell Exp $
+
+EAPI=2
+inherit eutils multilib toolchain-funcs games
+
+DESCRIPTION="The Ur-Quan Masters: Port of Star Control 2"
+HOMEPAGE="http://sc2.sourceforge.net/"
+SRC_URI="mirror://sourceforge/sc2/${P}-source.tgz
+	mirror://sourceforge/sc2/${P}-content.uqm
+	music? ( mirror://sourceforge/sc2/${P}-3domusic.uqm )
+	voice? ( mirror://sourceforge/sc2/${P}-voice.uqm )
+	remix? ( mirror://sourceforge/sc2/${PN}-remix-disc1.uqm \
+		mirror://sourceforge/sc2/${PN}-remix-disc2.uqm \
+		mirror://sourceforge/sc2/${PN}-remix-disc3.uqm )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="music opengl remix voice"
+
+RDEPEND="media-libs/libmikmod
+	media-libs/libogg
+	>=media-libs/libpng-1.4
+	media-libs/libsdl[X,audio,joystick,video]
+	media-libs/libvorbis
+	media-libs/sdl-image[png]
+	sys-libs/zlib
+	opengl? ( virtual/opengl )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	local myopengl
+
+	use opengl \
+		&& myopengl=opengl \
+		|| myopengl=pure
+
+	cat <<-EOF > config.state
+	CHOICE_debug_VALUE='nodebug'
+	CHOICE_graphics_VALUE='${myopengl}'
+	CHOICE_sound_VALUE='mixsdl'
+	CHOICE_accel_VALUE='plainc'
+	INPUT_install_prefix_VALUE='${GAMES_PREFIX}'
+	INPUT_install_bindir_VALUE='\$prefix/bin'
+	INPUT_install_libdir_VALUE='\$prefix/lib'
+	INPUT_install_sharedir_VALUE='${GAMES_DATADIR}/'
+	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"
+
+	# respect CFLAGS
+	sed -i \
+		-e "s/-O3//" build/unix/build.config \
+		|| die "sed build.config failed"
+
+	sed -i \
+		-e "s:@INSTALL_LIBDIR@:$(games_get_libdir)/:g" build/unix/uqm-wrapper.in \
+		|| die "sed uqm-wrapper.in failed"
+
+	# respect CC
+	sed -i \
+		-e 's/PROG_gcc_FILE="gcc"/PROG_gcc_FILE="'$(tc-getCC)'"/' \
+		build/unix/config_proginfo_build \
+		|| die "sed config_proginfo_build failed"
+}
+
+src_compile() {
+	MAKE_VERBOSE=1 ./build.sh uqm || die "build failed"
+}
+
+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 for the next release.
+	newgamesbin uqm-wrapper uqm || die "newgamesbin failed"
+	exeinto "$(games_get_libdir)"/${PN}
+	doexe uqm || die "doexe failed"
+
+	insinto "${GAMES_DATADIR}"/${PN}/content/packages
+	doins "${DISTDIR}"/${P}-content.uqm || die "doins failed"
+	echo ${P} > "${D}${GAMES_DATADIR}"/${PN}/content/version \
+		|| die "creating version file failed"
+
+	insinto "${GAMES_DATADIR}"/${PN}/content/addons
+	if use music; then
+		doins "${DISTDIR}"/${P}-3domusic.uqm || die "doins failed"
+	fi
+
+	if use voice; then
+		doins "${DISTDIR}"/${P}-voice.uqm || die "doins failed"
+	fi
+
+	if use remix; then
+		insinto "${GAMES_DATADIR}"/${PN}/content/addons
+		doins "${DISTDIR}"/${PN}-remix-disc{1,2,3}.uqm || die "doins failed"
+	fi
+
+	dodoc AUTHORS ChangeLog Contributing README WhatsNew doc/users/manual.txt
+	docinto devel
+	dodoc doc/devel/[!n]*
+	docinto devel/netplay
+	dodoc doc/devel/netplay/*
+	make_desktop_entry uqm "The Ur-Quan Masters"
+	prepgamesdirs
+}