projects / gentoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: a1ccd7f)
Fix typo and cleanup, bug #157601
authorTristan Heaven <tristan@gentoo.org>
Sun, 10 Dec 2006 21:55:08 +0000 (21:55 +0000)
committerTristan Heaven <tristan@gentoo.org>
Sun, 10 Dec 2006 21:55:08 +0000 (21:55 +0000)
Package-Manager: portage-2.1.2_rc3-r1

games-arcade/stepmania/ChangeLog patch | blob | history
games-arcade/stepmania/Manifest patch | blob | history
games-arcade/stepmania/stepmania-3.9.ebuild patch | blob | history

diff --git a/games-arcade/stepmania/ChangeLog b/games-arcade/stepmania/ChangeLog
index ca7b105a74f63942ca86060f395cea8be9467004..bd0991afe86a76dd72410581c5543794c15ba168 100644 (file)
--- a/games-arcade/stepmania/ChangeLog
+++ b/games-arcade/stepmania/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-arcade/stepmania
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/stepmania/ChangeLog,v 1.14 2006/12/01 22:19:28 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/stepmania/ChangeLog,v 1.15 2006/12/10 21:55:08 nyhm Exp $
+
+  10 Dec 2006; Tristan Heaven <nyhm@gentoo.org> stepmania-3.9.ebuild:
+  Fix typo and cleanup, bug #157601
 
   01 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org> stepmania-3.9.ebuild:
   Added built_with_use check for bug #156609.
diff --git a/games-arcade/stepmania/Manifest b/games-arcade/stepmania/Manifest
index 6cd772f45e393bb906c9643ee82d2299cb1d1a83..d28e5c21acc429700a04378ad47da23d62667d44 100644 (file)
--- a/games-arcade/stepmania/Manifest
+++ b/games-arcade/stepmania/Manifest
@@ -31,14 +31,14 @@ RMD160 fdac52f93d738ecdb9f91aeb2ea23ec509c213eb files/stepmania-3.9-vorbis.patch
 SHA256 ea8992e76c5240f96257e7b78594709b222274df9c58a4f4082ae462d51030ba files/stepmania-3.9-vorbis.patch 616
 DIST StepMania-3.9-linux.tar.gz 10174400 RMD160 426b11d652669be85753161f2cd03f2fe81df860 SHA1 100b1a2771fec1d208798ef03ba164259a589bf2 SHA256 ccb6e549e8d026e79de7d6bbfadc7f1ac7f7c05242a90edf56cf652f5ddeaae0
 DIST StepMania-3.9-src.tar.gz 3090223 RMD160 e7451192fe67f53a7a93baf99bf9a20bc3d1f7cf SHA1 b2d2c3a50c23506844ba7e22289e59d270bb8b2e SHA256 31082d388fa64b9764aee4d7628f377bc0fe47b8f157b8bcc66d9e3678479c85
-EBUILD stepmania-3.9.ebuild 2235 RMD160 1d4b9bc20d32caba9f0c8739a1b0728b06aa497a SHA1 370b0ca2d1c3edba5cd66ed0e2311a0afde8f4eb SHA256 ce5961e37350a7350ac5fb51434ab40cd90febaa731a1a95282d0e3e294cb7d3
-MD5 0106a6d2465716ecf2d018796dc957ba stepmania-3.9.ebuild 2235
-RMD160 1d4b9bc20d32caba9f0c8739a1b0728b06aa497a stepmania-3.9.ebuild 2235
-SHA256 ce5961e37350a7350ac5fb51434ab40cd90febaa731a1a95282d0e3e294cb7d3 stepmania-3.9.ebuild 2235
-MISC ChangeLog 2598 RMD160 6574080c4a622f5155d7ed9b5d6f41726d61a627 SHA1 23a18a800b3fe195bb78de77fe34c6a84b42bce4 SHA256 66dc216a3e9877895ab8b2927e10e7bb195775b344ed92420fe87f1d470f1a5e
-MD5 1660f18eda0ddc90b3a35a11c7a0182e ChangeLog 2598
-RMD160 6574080c4a622f5155d7ed9b5d6f41726d61a627 ChangeLog 2598
-SHA256 66dc216a3e9877895ab8b2927e10e7bb195775b344ed92420fe87f1d470f1a5e ChangeLog 2598
+EBUILD stepmania-3.9.ebuild 2335 RMD160 4c20fd8c5f1d4ba74edc6f5df2c67cece38712aa SHA1 8d73621c2fb25d877127378a5d98d08c023e139b SHA256 fcaa1eb50ca32e4b72ba8308f7cffd9d941ef1b731d2787a935ca8f7b8e9982b
+MD5 45ded3e7d8f927f68f75d7f57b688169 stepmania-3.9.ebuild 2335
+RMD160 4c20fd8c5f1d4ba74edc6f5df2c67cece38712aa stepmania-3.9.ebuild 2335
+SHA256 fcaa1eb50ca32e4b72ba8308f7cffd9d941ef1b731d2787a935ca8f7b8e9982b stepmania-3.9.ebuild 2335
+MISC ChangeLog 2701 RMD160 e148124803593dd98b4de6dc3ed0d5cbb03ccc6b SHA1 a37de0eca9a4ab9aa16dc1bfef140cbb20c603bf SHA256 584b3495da94dbc811617c369af4889ffc43d7e506a7f7f146524b47ec640048
+MD5 a4c2d50b476a6d0b281200d0a6e9e9f1 ChangeLog 2701
+RMD160 e148124803593dd98b4de6dc3ed0d5cbb03ccc6b ChangeLog 2701
+SHA256 584b3495da94dbc811617c369af4889ffc43d7e506a7f7f146524b47ec640048 ChangeLog 2701
 MISC metadata.xml 220 RMD160 9644806f89f8b8d272e5ece60b993df5cd41a900 SHA1 97c2910ccf82c9a3600a4bb822777a7bf342a17a SHA256 2482823056583dedefb8c75afb2d017147227f6d93f81655e2f7b0721d178178
 MD5 441e3a625f4d1889a960a7f9adefe87b metadata.xml 220
 RMD160 9644806f89f8b8d272e5ece60b993df5cd41a900 metadata.xml 220
@@ -47,9 +47,9 @@ MD5 c1e3bef52068916fd35ad333c8bc9729 files/digest-stepmania-3.9 521
 RMD160 8de9c7da4cd2c2689dc0da18f83213b514f507e1 files/digest-stepmania-3.9 521
 SHA256 d808db368491b77f5196ebef8f35817eead695add6514ed9337dbc24bc2a1f0c files/digest-stepmania-3.9 521
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
+Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFFcKj/kT4lNIS36YERAlWJAJsH8ZIsdxhIubl4SACXThydmYaEpQCfX1gk
-UT+iibkA5lxI/8PEBu8c558=
-=NOTU
+iD8DBQFFfIJCdz7hIScOURERAqijAJ0eu3cqJ0FqU5PFI9wNuEB9F7AZowCgvUVv
+pWt4S6Dy5/1t/Mwk94LC+yY=
+=P2FI
 -----END PGP SIGNATURE-----
diff --git a/games-arcade/stepmania/stepmania-3.9.ebuild b/games-arcade/stepmania/stepmania-3.9.ebuild
index c1c330a0e0b4b3cde88ab070af39fd6bba71a9ac..c60bed52fb4f800ca508f6b1e4e93a1c1918b70a 100644 (file)
--- a/games-arcade/stepmania/stepmania-3.9.ebuild
+++ b/games-arcade/stepmania/stepmania-3.9.ebuild
@@ -1,22 +1,21 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/stepmania/stepmania-3.9.ebuild,v 1.6 2006/12/01 22:19:28 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/stepmania/stepmania-3.9.ebuild,v 1.7 2006/12/10 21:55:08 nyhm Exp $
 
+WANT_AUTOCONF=latest
 inherit eutils autotools games
 
-IUSE="debug gtk jpeg mp3 mpeg vorbis force-oss"
-
 MY_PV="${PV/_/-}"
-S="${WORKDIR}/StepMania-${MY_PV}-src"
-SMDATA="${WORKDIR}/StepMania-${MY_PV}"
 DESCRIPTION="An advanced DDR simulator"
 HOMEPAGE="http://www.stepmania.com/stepmania/"
 SRC_URI="mirror://sourceforge/stepmania/StepMania-${MY_PV}-src.tar.gz
        mirror://sourceforge/stepmania/StepMania-${MY_PV}-linux.tar.gz"
 
-SLOT="0"
 LICENSE="MIT"
+SLOT="0"
 KEYWORDS="~amd64 ~ppc x86"
+IUSE="debug gtk jpeg mp3 mpeg vorbis force-oss"
+RESTRICT="test"
 
 DEPEND="gtk? ( >=x11-libs/gtk+-2.0 )
        mp3? ( media-libs/libmad )
@@ -24,20 +23,27 @@ DEPEND="gtk? ( >=x11-libs/gtk+-2.0 )
        media-libs/libsdl
        jpeg? ( media-libs/jpeg )
        media-libs/libpng
-       sys-libs/zlib
        mpeg? ( media-video/ffmpeg )
        vorbis? ( media-libs/libvorbis )
-       virtual/opengl"
+       virtual/opengl
+       virtual/glu"
+
+S=${WORKDIR}/StepMania-${MY_PV}-src
 
 pkg_setup() {
-       built_with_use media-libs/libsdl opengl || \
-               die "You need to compile meida-libs/libsdl with USE=opengl."
+       games_pkg_setup
+       built_with_use media-libs/libsdl opengl \
+               || die "You need to compile media-libs/libsdl with USE=opengl."
 }
 
 src_unpack() {
        unpack ${A}
        cd "${S}"
-       epatch "${FILESDIR}/${P}"-gentoo.patch \
+       sed "s:/usr/share/games/${PN}:${GAMES_DATADIR}/${PN}:" \
+               "${FILESDIR}"/${P}-gentoo.patch > "${T}"/gentoo.patch \
+               || die "sed failed"
+       epatch \
+               "${T}"/gentoo.patch \
                "${FILESDIR}/${P}"-gcc41.patch \
                "${FILESDIR}/${P}"-64bits.patch \
                "${FILESDIR}/${P}"-ffmpeg.patch \
@@ -49,38 +55,38 @@ src_unpack() {
 
 src_compile() {
        econf \
+               --disable-dependency-tracking \
                $(use_with debug) \
                $(use_with jpeg) \
                $(use_with vorbis) \
                $(use_with mp3) \
                $(use_enable gtk gtk2) \
                $(use_enable force-oss) \
-               || die "Configure failed"
-
-       emake || die "Make failed"
+               || die
+       emake || die "emake failed"
 }
 
 src_install() {
        local dir=${GAMES_DATADIR}/${PN}
 
-       dodir ${dir}
-       exeinto ${dir}
-       doexe src/stepmania || die "Install failed"
+       exeinto "${dir}"
+       doexe src/stepmania || die "doexe failed"
        if use gtk; then
-               doexe src/GtkModule.so || die "Install failed"
+               doexe src/GtkModule.so || die "doexe failed"
        fi
 
-       insinto ${dir}
+       cd "${WORKDIR}"/StepMania-${MY_PV}
+
+       insinto "${dir}"
+       doins -r Announcers BGAnimations CDTitles Characters Courses Data Docs \
+               NoteSkins RandomMovies Songs Themes Visualizations || die "doins failed"
 
-       cd ${SMDATA}
-       doins Copying.txt NEWS README-FIRST.html || die "Install failed"
-       cp -r Announcers BGAnimations CDTitles Characters Courses Data Docs \
-               NoteSkins RandomMovies Songs Themes Visualizations ${D}/${dir} || die "Install failed"
+       dodoc Copying.txt NEWS README-FIRST.html
 
-       make_desktop_entry stepmania Stepmania stepmania.png
-       newicon Themes/default/Graphics/Common\ window\ icon.png stepmania.png
+       make_desktop_entry ${PN} Stepmania
+       newicon "Themes/default/Graphics/Common window icon.png" ${PN}.png
 
-       games_make_wrapper stepmania ${dir}/stepmania ${dir}
+       games_make_wrapper ${PN} "${dir}"/${PN} "${dir}"
 
        prepgamesdirs
 }
Unnamed repository; edit this file 'description' to name the repository.