use games_get_libdir

(Portage version: 2.1.2.3)

3 files changed, 11 insertions, 148 deletions

diff --git a/games-strategy/uqm/files/digest-uqm-0.5.0 b/games-strategy/uqm/files/digest-uqm-0.5.0
deleted file mode 100644
index 9a534867de22..000000000000
--- a/games-strategy/uqm/files/digest-uqm-0.5.0
+++ /dev/null
@@ -1,21 +0,0 @@
-MD5 a20cacc8e66f5ff1fdf5e1d3a3b93fd2 uqm-0.5.0-3domusic.uqm 18980071
-RMD160 68056bac27534e6db49c1e34922d38c5f368dbb9 uqm-0.5.0-3domusic.uqm 18980071
-SHA256 c3e72569720d1e17ab2d08301d9dc90f2c4ab272811c488e18f878f38b84cac8 uqm-0.5.0-3domusic.uqm 18980071
-MD5 1d03864b141a2626a7284bc7cfdefb47 uqm-0.5.0-content.uqm 11584345
-RMD160 cc380c40224deb421d7f3cb65ebacdce8e647514 uqm-0.5.0-content.uqm 11584345
-SHA256 060a0da6aedc231c11714a7a2174831f0cd6345075c80e682a8ff50f1f6cedc6 uqm-0.5.0-content.uqm 11584345
-MD5 9002b1bc2de9285588dd97b618a867a7 uqm-0.5.0-source.tar.gz 1267039
-RMD160 8737d2516c0110f76e6af348d5c11e90b9029b81 uqm-0.5.0-source.tar.gz 1267039
-SHA256 bdb715784bf0c94825cf40f97c60a5ec83fd3e17e9e186a78cd145781c4d9804 uqm-0.5.0-source.tar.gz 1267039
-MD5 52a084cfaa0bc7fcc63a295feb8cbd28 uqm-0.5.0-voice.uqm 114823413
-RMD160 505d13efbb5bf5e07d27227c27b57258b8edaf57 uqm-0.5.0-voice.uqm 114823413
-SHA256 8ddbfe831cc20eac78c8153d1c706516fe97126612f9384f02d31be90480ae0c uqm-0.5.0-voice.uqm 114823413
-MD5 2df402b2951c0187604a81c3997fbb9d uqm-remix-pack1.zip 50188123
-RMD160 1c0cf233d6377918b676bcd591f4304b8da85aa1 uqm-remix-pack1.zip 50188123
-SHA256 1b9ccc799e531f50580952af92b342fb6684ae97b7bdc434f3b7e22d0c230644 uqm-remix-pack1.zip 50188123
-MD5 d5a9fb72b369bf5a5dbca3db9f1e1ea3 uqm-remix-pack2.zip 60281175
-RMD160 441edc71e3006e43629ee262fef8ef8676573832 uqm-remix-pack2.zip 60281175
-SHA256 1dff1792a558a52eb5cbdf24e0c1b8b7ec85aff75a00ddb403ec988607f51dd0 uqm-remix-pack2.zip 60281175
-MD5 567bc2d9e3ca067d21170c5ac5538441 uqm-remix-pack3.zip 39923803
-RMD160 786e8dfd7924abf6ef886e7223c1d57b0740d524 uqm-remix-pack3.zip 39923803
-SHA256 4e347d52279785eba4ba5355beae63048ce3b550db3181d4d55df6a20361682d uqm-remix-pack3.zip 39923803
diff --git a/games-strategy/uqm/uqm-0.5.0.ebuild b/games-strategy/uqm/uqm-0.5.0.ebuild
deleted file mode 100644
index 603f84008ada..000000000000
--- a/games-strategy/uqm/uqm-0.5.0.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/uqm/uqm-0.5.0.ebuild,v 1.4 2007/03/12 18:16:25 genone Exp $
-
-inherit eutils games
-
-DESCRIPTION="The Ur-Quan Masters: Port of Star Control 2"
-HOMEPAGE="http://sc2.sourceforge.net/"
-SRC_URI="mirror://sourceforge/sc2/${P}-source.tar.gz
-	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-pack1.zip \
-		mirror://sourceforge/sc2/${PN}-remix-pack2.zip \
-		mirror://sourceforge/sc2/${PN}-remix-pack3.zip )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="ppc x86"
-IUSE="music opengl remix voice"
-
-RDEPEND="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}
-	app-arch/unzip"
-
-src_unpack() {
-	local myopengl
-
-	unpack ${P}-source.tar.gz
-	cd "${S}"
-
-	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"
-
-	# support the user's CFLAGS.
-	sed -i \
-		-e "s/-O3/${CFLAGS}/" build/unix/build.config \
-		|| die "sed build.config failed"
-}
-
-src_compile() {
-	./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_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/packages"
-	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/packages/addons/uqmremix
-		doins "${DISTDIR}"/${PN}-remix-pack{1,2,3}.zip || die "doins failed"
-	fi
-
-	dodoc AUTHORS ChangeLog Contributing README TODO WhatsNew \
-		doc/users/manual.txt
-	docinto devel
-	dodoc doc/devel/*
-	make_desktop_entry uqm "The Ur-Quan Masters"
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-	if use remix ; then
-		echo
-		elog "To hear all the remixed music made by the The Ur-Quan Masters"
-		elog "project's Precursors Team instead of the original ones,"
-		elog "start the game with:"
-		elog "    --addon uqmremix"
-		echo
-	fi
-}
diff --git a/games-strategy/uqm/uqm-0.6.2.ebuild b/games-strategy/uqm/uqm-0.6.2.ebuild
index 1586ad0e1afe..998a8ced07d6 100644
--- a/games-strategy/uqm/uqm-0.6.2.ebuild
+++ b/games-strategy/uqm/uqm-0.6.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/uqm/uqm-0.6.2.ebuild,v 1.4 2007/03/12 18:16:25 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/uqm/uqm-0.6.2.ebuild,v 1.5 2007/04/04 19:36:29 nyhm Exp $
 
 inherit eutils multilib games
 
@@ -22,12 +22,11 @@ IUSE="music opengl remix voice"
 RDEPEND="media-libs/libvorbis
 	media-libs/jpeg
 	media-libs/libpng
-	>=media-libs/libsdl-1.2.8
-	>=media-libs/sdl-image-1.2.4
+	media-libs/libsdl
+	media-libs/sdl-image
 	media-libs/libogg
 	media-libs/libvorbis
-	media-libs/libmikmod
-	sys-libs/zlib"
+	media-libs/libmikmod"
 DEPEND="${RDEPEND}
 	app-arch/unzip"
 
@@ -69,6 +68,10 @@ src_unpack() {
 	sed -i \
 		-e "s/-O3/${CFLAGS}/" build/unix/build.config \
 		|| die "sed build.config failed"
+
+	sed -i \
+		-e "s:/usr/games/lib/:$(games_get_libdir)/:g" uqm-wrapper \
+		|| die "sed uqm-wrapper failed"
 }
 
 src_compile() {
@@ -79,21 +82,16 @@ 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.
-	sed -i \
-		-e "s@/usr/games/lib/@${GAMES_LIBDIR}/@g" uqm-wrapper \
-		|| die "sed uqm-wrapper failed"
 	newgamesbin uqm-wrapper uqm || die "newgamesbin failed"
-	exeinto "${GAMES_LIBDIR}/${PN}"
-	echo "${GAMES_LIBDIR}/${PN}"
-	ls "${GAMES_LIBDIR}/${PN}"
+	exeinto "$(games_get_libdir)"/${PN}
 	doexe uqm || die "doexe failed"
 
-	insinto "${GAMES_DATADIR}/${PN}/content/packages"
+	insinto "${GAMES_DATADIR}"/${PN}/content/packages
 	doins "${DISTDIR}"/${PN}-0.6.0-content.uqm || die "doins failed"
 	echo ${P} > "${D}${GAMES_DATADIR}"/${PN}/content/version \
 		|| die "creating version file failed"
 
-	insinto "${GAMES_DATADIR}/${PN}/content/packages"
+	insinto "${GAMES_DATADIR}"/${PN}/content/packages
 	if use music; then
 		doins "${DISTDIR}"/${PN}-0.6.0-3domusic.uqm || die "doins failed"
 	fi