use games_get_libdir

Package-Manager: portage-2.1.2.3

diff --git a/games-strategy/uqm/Manifest b/games-strategy/uqm/Manifest
index dd951d99b79bd17ee3ef452df20de3c33f8a63c9..ed3a90e9030016e7a9785e3a593a9dc621bd83c1 100644 (file)
--- a/games-strategy/uqm/Manifest
+++ b/games-strategy/uqm/Manifest
@@ -1,10 +1,6 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST uqm-0.5.0-3domusic.uqm 18980071 RMD160 68056bac27534e6db49c1e34922d38c5f368dbb9 SHA1 9e4777c89d17f8b1c9ae2ea343c4497f0f181a5a SHA256 c3e72569720d1e17ab2d08301d9dc90f2c4ab272811c488e18f878f38b84cac8
-DIST uqm-0.5.0-content.uqm 11584345 RMD160 cc380c40224deb421d7f3cb65ebacdce8e647514 SHA1 68554522a3c084bd98366e15470fff8658cc16b0 SHA256 060a0da6aedc231c11714a7a2174831f0cd6345075c80e682a8ff50f1f6cedc6
-DIST uqm-0.5.0-source.tar.gz 1267039 RMD160 8737d2516c0110f76e6af348d5c11e90b9029b81 SHA1 c9275ce431ee283b8dcaefb017520a096e1dbc72 SHA256 bdb715784bf0c94825cf40f97c60a5ec83fd3e17e9e186a78cd145781c4d9804
-DIST uqm-0.5.0-voice.uqm 114823413 RMD160 505d13efbb5bf5e07d27227c27b57258b8edaf57 SHA1 99102231d9de42ef4eac92d2ae5fbc0814d4c1f3 SHA256 8ddbfe831cc20eac78c8153d1c706516fe97126612f9384f02d31be90480ae0c
 DIST uqm-0.6.0-3domusic.uqm 18980071 RMD160 68056bac27534e6db49c1e34922d38c5f368dbb9 SHA1 9e4777c89d17f8b1c9ae2ea343c4497f0f181a5a SHA256 c3e72569720d1e17ab2d08301d9dc90f2c4ab272811c488e18f878f38b84cac8
 DIST uqm-0.6.0-content.uqm 11580000 RMD160 d56d06c377e44288d5bd41f8d68d59c87b58ccdb SHA1 f4b374d2029f0e2d26c0eaf5ed97fd157b53e4f5 SHA256 727679a66351d435c1a3c53ca3d2e87079f1f05c09fa0748035ed68fff1cd63d
 DIST uqm-0.6.0-voice.uqm 114823409 RMD160 3a6f2404d7bfeeb2bcb156c8010402579a0c58ab SHA1 57d80fa068e812e8c5a415251000e870ff87d215 SHA256 ee84c90873a996771ddfa2154640620e374366fffb51e18dfdfb4236050bc27a
@@ -12,14 +8,10 @@ DIST uqm-0.6.2-source.tgz 1497342 RMD160 3f36fdc750607fddb68d52195f079e31860020a
 DIST uqm-remix-pack1.zip 50188123 RMD160 1c0cf233d6377918b676bcd591f4304b8da85aa1 SHA1 7cbdc87887ebebae5439c689fc5bd2ffa9460fc8 SHA256 1b9ccc799e531f50580952af92b342fb6684ae97b7bdc434f3b7e22d0c230644
 DIST uqm-remix-pack2.zip 60281175 RMD160 441edc71e3006e43629ee262fef8ef8676573832 SHA1 f1ebca44ff105f968d6fcf65df935926523b1c97 SHA256 1dff1792a558a52eb5cbdf24e0c1b8b7ec85aff75a00ddb403ec988607f51dd0
 DIST uqm-remix-pack3.zip 39923803 RMD160 786e8dfd7924abf6ef886e7223c1d57b0740d524 SHA1 f55d198c56a0963a6bb2f9c2fe04c4c475b25086 SHA256 4e347d52279785eba4ba5355beae63048ce3b550db3181d4d55df6a20361682d
-EBUILD uqm-0.5.0.ebuild 3158 RMD160 a39ca1b8ae70459e57a48e9c47d65eb12d2a9243 SHA1 8f6ac980c993443ce822dc96766fca479389e21d SHA256 2b35ae3b0590aebf96ebd19aa70ab71e803bd499463113d183025d5b52768b55
-MD5 0b30f52fb05bf7ebb87c4ccbe2ea8936 uqm-0.5.0.ebuild 3158
-RMD160 a39ca1b8ae70459e57a48e9c47d65eb12d2a9243 uqm-0.5.0.ebuild 3158
-SHA256 2b35ae3b0590aebf96ebd19aa70ab71e803bd499463113d183025d5b52768b55 uqm-0.5.0.ebuild 3158
-EBUILD uqm-0.6.2.ebuild 3672 RMD160 1096d58a0491d3d8b2c5cd8fce052290336de8fb SHA1 8d21878b6e350b4774802b23b0a1b035af55c609 SHA256 7d00c04654658a8130e92141619aabf2af712bef3f29f7482c4200316dfacc85
-MD5 2c1170b6b9bc10f1d7052d5242ece32f uqm-0.6.2.ebuild 3672
-RMD160 1096d58a0491d3d8b2c5cd8fce052290336de8fb uqm-0.6.2.ebuild 3672
-SHA256 7d00c04654658a8130e92141619aabf2af712bef3f29f7482c4200316dfacc85 uqm-0.6.2.ebuild 3672
+EBUILD uqm-0.6.2.ebuild 3590 RMD160 3f619174f12e6c01eeaf1715b27bf0ce84841e55 SHA1 b29703af4e0bda65ddba5c8de149c07b712aff5d SHA256 39fcda74431483c065121ac2c48ca6dba2db85f91d86648f09cafa700b6a1cd3
+MD5 abbc29e278de09ae896d9ae9a287f6c9 uqm-0.6.2.ebuild 3590
+RMD160 3f619174f12e6c01eeaf1715b27bf0ce84841e55 uqm-0.6.2.ebuild 3590
+SHA256 39fcda74431483c065121ac2c48ca6dba2db85f91d86648f09cafa700b6a1cd3 uqm-0.6.2.ebuild 3590
 MISC ChangeLog 2695 RMD160 e5782bb6638562ca40277ab34ec5318ed17497b2 SHA1 15db838669fda9a0348fd8846e015a2487cec2c1 SHA256 4243c79fd454c5dfc5bcab162a1d17d55c0787bd242d7141ce95e7a6ff070fdd
 MD5 8df129408929782bc66f2c3ee6216d41 ChangeLog 2695
 RMD160 e5782bb6638562ca40277ab34ec5318ed17497b2 ChangeLog 2695
@@ -28,16 +20,13 @@ MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be525
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158
-MD5 7322b4d6f95b778e2a7c1a674f9523b7 files/digest-uqm-0.5.0 1735
-RMD160 fbf4ad9a7c338b9b6c47ef02b70a4d3a4862a117 files/digest-uqm-0.5.0 1735
-SHA256 af804d4d1450cbd01d8018c94b20ab7aebc396c73b644ceca3858200c8474c58 files/digest-uqm-0.5.0 1735
 MD5 9d9ae46853f6a0c7cce4c2ad32c094cb files/digest-uqm-0.6.2 1726
 RMD160 db6c3040805973c607d6a5bdc03149008013bc21 files/digest-uqm-0.6.2 1726
 SHA256 b9cbad1a1c8652c32a33ccdc359e193f663d746ddcfcf1698940d969f80c3c86 files/digest-uqm-0.6.2 1726
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFF9Zn06J2i8a8J4okRAvUsAKCgv2aXPn5t1IcXHYUujJCTzSzgKwCghrhY
-O5XUXgRb7VHAVJ3lLdvfw00=
-=LG3c
+iD8DBQFGE/5Edz7hIScOURERApmNAKCOhA0rQyU3jl02sEnr0NX3sEYWiQCcD0cx
+Iix7eU619sd9tJWsavZ7uMY=
+=twMp
 -----END PGP SIGNATURE-----

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 (file)
index 9a53486..0000000
--- 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 (file)
index 603f840..0000000
--- 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 1586ad0e1afe178321be088d9554b8dd3375df9f..998a8ced07d6a12912c62befab61923e9e6abf4f 100644 (file)
--- 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