add vorbis use flag check and updated music file (reported by Wai Ling in bug

Package-Manager: portage-2.1.1-r2

diff --git a/games-rpg/tmw/ChangeLog b/games-rpg/tmw/ChangeLog
index ae7e279e8f18e3d5577ccbf2f3305f638f8ee960..fc0ff8510fd4313b86df02aefe43999e609812bc 100644 (file)
--- a/games-rpg/tmw/ChangeLog
+++ b/games-rpg/tmw/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-rpg/tmw
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/tmw/ChangeLog,v 1.20 2006/12/28 22:46:59 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/tmw/ChangeLog,v 1.21 2006/12/29 04:57:34 mr_bones_ Exp $
+
+  29 Dec 2006; Michael Sterrett <mr_bones_@gentoo.org> tmw-0.0.22.ebuild:
+  add vorbis use flag check and updated music file (reported by Wai Ling in bug
+  #154570)
 
 *tmw-0.0.22 (28 Dec 2006)
 

diff --git a/games-rpg/tmw/Manifest b/games-rpg/tmw/Manifest
index 31bcfb5fa06a840433e9c4e1e421b466a9683a54..23a330bbaf79663d4256f12ad42929eb496ed938 100644 (file)
--- a/games-rpg/tmw/Manifest
+++ b/games-rpg/tmw/Manifest
@@ -5,18 +5,19 @@ SHA256 7b1c1c391366931e5a9c0876f7e6c2e0d63316fc5b6bc06dcb257846c5be398d files/tm
 DIST tmw-0.0.21.tar.gz 3363620 RMD160 ff94073c229e37d5c6ff48a87a231fcd860d73f6 SHA1 0521c15defb794398b07bb0aebbb66b6905ce3c5 SHA256 180470d0d3e0977ef3f0bb8990b2aa12c5d6325b0086a955fdbff914dcf82bb3
 DIST tmw-0.0.22.tar.gz 3571205 RMD160 e6f583491a5f15458ac03b95367da10a342f33fa SHA1 5daf452d0413ab6ccf4d45c8d90c7d43f4e560f3 SHA256 3af8ce85f11f192077143b82c3e5f71bfe34834b18033637746cfed08c89cb7b
 DIST tmw-Magick-Real.ogg 840811 RMD160 d293aff31cc3f2b57bbb9a91c7b444c4fda5c375 SHA1 3afcea0aa27b57a1c2656549b0fb26d3996b8d73 SHA256 9cd8ffc59689fadb35884309cab14cc1c23ed1061fadec26b875688d2bbff13b
+DIST tmwmusic-0.0.20.tar.gz 9259802 RMD160 a7212f90b40f864d0670905fe037564eba48ab30 SHA1 c1e3126ff7f53f6e12caaf885a493cd5c4aed6e3 SHA256 964bb27235cdc3199c392f6ddf25ce293c6f32e013abe85592b96221a5896939
 EBUILD tmw-0.0.21.ebuild 1435 RMD160 3da6c189cba6f201b1a1d2342ec7215a1660280c SHA1 a08cc8b2739a920a28083019cca85fe1adb8c68b SHA256 3d78afe329c91d53e6a25ad3fcdc2409a600e6455358f951fd085c808fd6e26b
 MD5 4bc7e016d1710d4d3e034219e78f84e8 tmw-0.0.21.ebuild 1435
 RMD160 3da6c189cba6f201b1a1d2342ec7215a1660280c tmw-0.0.21.ebuild 1435
 SHA256 3d78afe329c91d53e6a25ad3fcdc2409a600e6455358f951fd085c808fd6e26b tmw-0.0.21.ebuild 1435
-EBUILD tmw-0.0.22.ebuild 1435 RMD160 2b329bbbec2e2eaa3b515bbeafcbadeb92cb49da SHA1 1450710f62bbc8a85d7af80c8c31323a4429f1c1 SHA256 ce380fc4a26de32ee7bccde71d764f9c1f0d78f0ead97d8ababd04eabfb0a966
-MD5 3b54f1addd4f63cd406a5210959faa03 tmw-0.0.22.ebuild 1435
-RMD160 2b329bbbec2e2eaa3b515bbeafcbadeb92cb49da tmw-0.0.22.ebuild 1435
-SHA256 ce380fc4a26de32ee7bccde71d764f9c1f0d78f0ead97d8ababd04eabfb0a966 tmw-0.0.22.ebuild 1435
-MISC ChangeLog 2810 RMD160 da8ec0a08cea8eff0203ee2cfddfefc5c0d754f3 SHA1 7243dd61692451a49b6809f8838b6f1d875da206 SHA256 ce9c7d27064363b77974c16d0ab0556fa3f97634616ef6078d228d1f74ca13a5
-MD5 3130ba531433e7edddfa712f65f83685 ChangeLog 2810
-RMD160 da8ec0a08cea8eff0203ee2cfddfefc5c0d754f3 ChangeLog 2810
-SHA256 ce9c7d27064363b77974c16d0ab0556fa3f97634616ef6078d228d1f74ca13a5 ChangeLog 2810
+EBUILD tmw-0.0.22.ebuild 1578 RMD160 8cff92a44faa2f99802b6ae1b623d499d740e3aa SHA1 2604d84a9e5b92cd17427dc1ba5fa93ade874e88 SHA256 5ba028ce7cf3911953b595858283aa0f164a844ededc15ed8a5ad5924e5eeb6d
+MD5 7ab7dc6d70993f9b64b766e9dffd3378 tmw-0.0.22.ebuild 1578
+RMD160 8cff92a44faa2f99802b6ae1b623d499d740e3aa tmw-0.0.22.ebuild 1578
+SHA256 5ba028ce7cf3911953b595858283aa0f164a844ededc15ed8a5ad5924e5eeb6d tmw-0.0.22.ebuild 1578
+MISC ChangeLog 2976 RMD160 39e2ab2754c58a61a3c9c3d9f4c4430d6ac31d26 SHA1 4d0e266e1ad558a0073484c631cf35514c6eca92 SHA256 7d97cde7ad5c30aa93305390eb86ef86e8e8ffadb6bf68fa77401364b004e853
+MD5 c6517987109401582613f8f11ab8d8de ChangeLog 2976
+RMD160 39e2ab2754c58a61a3c9c3d9f4c4430d6ac31d26 ChangeLog 2976
+SHA256 7d97cde7ad5c30aa93305390eb86ef86e8e8ffadb6bf68fa77401364b004e853 ChangeLog 2976
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
@@ -24,6 +25,6 @@ SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata
 MD5 91ea6884ed42e88a875afd4d604dae35 files/digest-tmw-0.0.21 473
 RMD160 61d909b192db120134cf94f8894ee130f8bcfcf3 files/digest-tmw-0.0.21 473
 SHA256 ce2bfb21097d77234c7a1799e596025c5f46e9086ff767ba35452547bbcbca62 files/digest-tmw-0.0.21 473
-MD5 efdefec9bb5eaf8bf531ff5b1e5a090b files/digest-tmw-0.0.22 473
-RMD160 b80423129070494817781f86f9155fd8379c1cd7 files/digest-tmw-0.0.22 473
-SHA256 1ba5a9f1140572c1eab37ac36d79475544132898834f44f53c0c70abe61e4a10 files/digest-tmw-0.0.22 473
+MD5 1ed14076b39f07b337ef84cb5a8f005a files/digest-tmw-0.0.22 485
+RMD160 e488bc48c58e47862cd01e631d43733277541b08 files/digest-tmw-0.0.22 485
+SHA256 de6ffb4496e9caec68dea68a118f757790bc2a32d1b323443ad8c273d4b821eb files/digest-tmw-0.0.22 485

diff --git a/games-rpg/tmw/files/digest-tmw-0.0.22 b/games-rpg/tmw/files/digest-tmw-0.0.22
index cec85161aa7e96bfad1c2c1b63a5bbb0c81a149c..2bf647781aea58fc66aa979a356c86a8e7a8ed4c 100644 (file)
--- a/games-rpg/tmw/files/digest-tmw-0.0.22
+++ b/games-rpg/tmw/files/digest-tmw-0.0.22
@@ -1,6 +1,6 @@
 MD5 f2028ac0aa4ebd325ddef119ba7f1051 tmw-0.0.22.tar.gz 3571205
 RMD160 e6f583491a5f15458ac03b95367da10a342f33fa tmw-0.0.22.tar.gz 3571205
 SHA256 3af8ce85f11f192077143b82c3e5f71bfe34834b18033637746cfed08c89cb7b tmw-0.0.22.tar.gz 3571205
-MD5 54ccc5d114eeb70d2bcb866e1e686c25 tmw-Magick-Real.ogg 840811
-RMD160 d293aff31cc3f2b57bbb9a91c7b444c4fda5c375 tmw-Magick-Real.ogg 840811
-SHA256 9cd8ffc59689fadb35884309cab14cc1c23ed1061fadec26b875688d2bbff13b tmw-Magick-Real.ogg 840811
+MD5 eec5e7d6c8ddb8938209815dbf5da812 tmwmusic-0.0.20.tar.gz 9259802
+RMD160 a7212f90b40f864d0670905fe037564eba48ab30 tmwmusic-0.0.20.tar.gz 9259802
+SHA256 964bb27235cdc3199c392f6ddf25ce293c6f32e013abe85592b96221a5896939 tmwmusic-0.0.20.tar.gz 9259802

diff --git a/games-rpg/tmw/tmw-0.0.22.ebuild b/games-rpg/tmw/tmw-0.0.22.ebuild
index a18d7cc245243a43137217fd49b20856e058a81c..8e029f0f835fd3b6b8a1163e598207933a347301 100644 (file)
--- a/games-rpg/tmw/tmw-0.0.22.ebuild
+++ b/games-rpg/tmw/tmw-0.0.22.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-rpg/tmw/tmw-0.0.22.ebuild,v 1.1 2006/12/28 22:46:59 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-rpg/tmw/tmw-0.0.22.ebuild,v 1.2 2006/12/29 04:57:34 mr_bones_ Exp $
 
 inherit eutils games
 
+MUSIC=tmwmusic-0.0.20
 DESCRIPTION="A fully free and open source MMORPG game with the looks of \"old-fashioned\" 2D RPG"
 HOMEPAGE="http://themanaworld.org/"
 SRC_URI="mirror://sourceforge/themanaworld/${P}.tar.gz
-       mirror://gentoo/tmw-Magick-Real.ogg"
-#      http://riekale.com/~rotonen/tmw/data/music/Magick%20-%20Real.ogg"
+       mirror://sourceforge/themanaworld/${MUSIC}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -28,13 +28,16 @@ pkg_setup() {
        games_pkg_setup
        if ! built_with_use dev-games/guichan sdl ; then
                eerror "dev-games/guichan needs to be built with USE=sdl"
-               die "please re-emerge guichan with USE=sdl"
+               die "please re-emerge dev-games/guichan with USE=sdl"
+       fi
+       if ! built_with_use media-libs/sdl-mixer vorbis ; then
+               eerror "media-libs/sdl-mixer needs to be built with USE=vorbis"
+               die "please re-emerge media-libs/sdl-mixer with USE=vorbis"
        fi
 }
 
 src_unpack() {
-       unpack ${P}.tar.gz
-       cp "${DISTDIR}"/tmw-Magick-Real.ogg . || die
+       unpack ${A}
        cd "${S}"
        epatch "${FILESDIR}"/${PN}-0.0.12-desktop.patch
 }
@@ -45,9 +48,11 @@ src_compile() {
 }
 
 src_install() {
-       make DESTDIR="${D}" install || die "install failed"
-       insinto "${GAMES_DATADIR}"/${PN}/data/music
-       newins "${WORKDIR}"/tmw-Magick-Real.ogg "Magick - Real.ogg" || die
+       emake DESTDIR="${D}" install || die "make install failed"
        dodoc AUTHORS ChangeLog NEWS README
+       cd ${WORKDIR}
+       insinto "${GAMES_DATADIR}"/${PN}/data/music
+       doins ${MUSIC}/data/music/*.ogg || die
+       newdoc ${MUSIC}/README README.music
        prepgamesdirs
 }