make music optional at upstream request (bug #195447)

Package-Manager: portage-2.1.3.9

4 files changed, 58 insertions, 24 deletions

diff --git a/games-simulation/singularity/ChangeLog b/games-simulation/singularity/ChangeLog
index 87eb8ec52532..c6bb439637a6 100644
--- a/games-simulation/singularity/ChangeLog
+++ b/games-simulation/singularity/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-simulation/singularity
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/singularity/ChangeLog,v 1.4 2007/10/02 06:46:57 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/singularity/ChangeLog,v 1.5 2007/10/14 07:26:57 mr_bones_ Exp $
+
+  14 Oct 2007; Michael Sterrett <mr_bones_@gentoo.org>
+  +files/singularity-0.26a-musicdir.patch, singularity-0.26a.ebuild:
+  make music optional at upstream request (bug #195447)
 
 *singularity-0.26a (02 Oct 2007)
 
diff --git a/games-simulation/singularity/Manifest b/games-simulation/singularity/Manifest
index 754aa2c06744..001b4de8f145 100644
--- a/games-simulation/singularity/Manifest
+++ b/games-simulation/singularity/Manifest
@@ -1,6 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX singularity-0.26a-musicdir.patch 1145 RMD160 13602f4dd865539b9eeeb15ebacf78a7114a1aa3 SHA1 46a80b9c0b87057720bfd5f02ddca2fb2314ca6a SHA256 b2c1a11508711d83e8c76afe9a0cb00e6e43db30f87f2759e3aaebabef445edc
+MD5 b950dc665004d5394cbf60cf6725c35b files/singularity-0.26a-musicdir.patch 1145
+RMD160 13602f4dd865539b9eeeb15ebacf78a7114a1aa3 files/singularity-0.26a-musicdir.patch 1145
+SHA256 b2c1a11508711d83e8c76afe9a0cb00e6e43db30f87f2759e3aaebabef445edc files/singularity-0.26a-musicdir.patch 1145
 DIST endgame-singularity-music-001.zip 23997713 RMD160 e2ee47d6fde5da48825a6198af8d1a4fc8fcc585 SHA1 fe112cd67974f740015f922d75b3b5dee28ac8da SHA256 f0d68beebac597252930fc458d19381b5806226f33b338e495f4af0b9407a8b6
 DIST singularity_0.25.tar.gz 468709 RMD160 e77e89153ca564af20d40520b55081604618fbb8 SHA1 edbd5013e8c79427d1e55da6eb880870455a0c40 SHA256 d32cab6e03d01f48b2f09adfaf9b245511820017991b26fd2472a93a3edd1ea3
 DIST singularity_0.26a.tar.gz 1262046 RMD160 8241cd5cc8d1ec6e449e351f4f7d06b5a2b243fc SHA1 547724c9d6f5cbf6f39530008abb5529743fa418 SHA256 3d457ae793c2dc80387c9f1548c2fb3232aec95c650bb8401d9107dbeeb601d4
@@ -8,14 +9,14 @@ EBUILD singularity-0.25.ebuild 955 RMD160 cec1ea50f6229ebea0ad4df67fdf8f1b117387
 MD5 55ac48712626bc97b9ee144e5386c224 singularity-0.25.ebuild 955
 RMD160 cec1ea50f6229ebea0ad4df67fdf8f1b11738708 singularity-0.25.ebuild 955
 SHA256 1694d0c9f8081bc09df9dbc94b53b41c4cf78f8fd7bed4cc594520e56e436e78 singularity-0.25.ebuild 955
-EBUILD singularity-0.26a.ebuild 1091 RMD160 7e8ca1bfe2ba1d6dc09c031026707f6bacdfc900 SHA1 637a45694830a6e2f18e0b8bc174aacea074c063 SHA256 4cce49f9a62f62d125050edc2964a1962d39413a86be8d39b4423e2e194a8269
-MD5 324b632ce09a5270016fc74b68025f29 singularity-0.26a.ebuild 1091
-RMD160 7e8ca1bfe2ba1d6dc09c031026707f6bacdfc900 singularity-0.26a.ebuild 1091
-SHA256 4cce49f9a62f62d125050edc2964a1962d39413a86be8d39b4423e2e194a8269 singularity-0.26a.ebuild 1091
-MISC ChangeLog 820 RMD160 53d55433442d419abe7e061279fe8fe3c8ee6737 SHA1 2d1264e35c8121def94e77c4a8a75f023c622876 SHA256 2e64a287efc97ec7fb8a2c20122105655680e29025ac607e2668ec956aa1cf9c
-MD5 b5736eced4726fdf4c340bedcfdf7df6 ChangeLog 820
-RMD160 53d55433442d419abe7e061279fe8fe3c8ee6737 ChangeLog 820
-SHA256 2e64a287efc97ec7fb8a2c20122105655680e29025ac607e2668ec956aa1cf9c ChangeLog 820
+EBUILD singularity-0.26a.ebuild 1217 RMD160 6c9e68247c26b9db4ee2fdff77251f032daaf2d8 SHA1 3aa0a5bd5032d1ea2f6f403db92b4e2226c11817 SHA256 6ee2edee3bb9860a3b23919e5dab4f72e5715bbe203f4f4195965ba18c9b619e
+MD5 253b6c7178e3b253ac404b6d32ddc0e5 singularity-0.26a.ebuild 1217
+RMD160 6c9e68247c26b9db4ee2fdff77251f032daaf2d8 singularity-0.26a.ebuild 1217
+SHA256 6ee2edee3bb9860a3b23919e5dab4f72e5715bbe203f4f4195965ba18c9b619e singularity-0.26a.ebuild 1217
+MISC ChangeLog 1004 RMD160 b641abd6df3e89690c89561beaf3bcbb75170f6a SHA1 a0bc79930673d733017f2fe0268598fc321f713c SHA256 545280a8b839a46a134f4bf0ed170dc2b899631755bc8cba78e38f1f73fcd11a
+MD5 f2fa2a0f78edf293eca6de11f9a00210 ChangeLog 1004
+RMD160 b641abd6df3e89690c89561beaf3bcbb75170f6a ChangeLog 1004
+SHA256 545280a8b839a46a134f4bf0ed170dc2b899631755bc8cba78e38f1f73fcd11a ChangeLog 1004
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3
 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158
@@ -26,10 +27,3 @@ SHA256 4196306f993d45361e07f74cdd1292e038f13278ed0992ee52336da02e5442b3 files/di
 MD5 97e1df8c37a47eb8bb5c1aeff01225eb files/digest-singularity-0.26a 542
 RMD160 ec9ee1e88c38cd2c5405da2d22566ef9a58e5436 files/digest-singularity-0.26a 542
 SHA256 df8d019ae5d0537e449a9466b9659afe1fb5be977f110906e7a5b57e05bf5780 files/digest-singularity-0.26a 542
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.7 (GNU/Linux)
-
-iD8DBQFHAelq8qKy9+b2Hl0RAmIJAJ9w9otxfjAdAtJKRD5pcl1xdsVbLwCgg53y
-J9iSosVVxKdON5zhT9Llx6U=
-=Gkds
------END PGP SIGNATURE-----
diff --git a/games-simulation/singularity/files/singularity-0.26a-musicdir.patch b/games-simulation/singularity/files/singularity-0.26a-musicdir.patch
new file mode 100644
index 000000000000..3a80f1e31d65
--- /dev/null
+++ b/games-simulation/singularity/files/singularity-0.26a-musicdir.patch
@@ -0,0 +1,32 @@
+Index: code/g.py
+===================================================================
+--- code/g.py   (revision 406)
++++ code/g.py   (revision 407)
+@@ -142,14 +142,21 @@
+     musicarray = []
+     musicarraylen=0
+     musicpath=path.join(data_loc, "..", "music")
++    default_music_available = True
+     if not path.isdir(musicpath):
+-        makedirs(musicpath)
+-    temp_ls = listdir(musicpath)
+-    temp_ls_len = len(temp_ls)
+-    for file_name in temp_ls:
+-        if file_name[-3:] == "ogg" or file_name[-3:] == "mp3":
+-            musicarray.append(path.join(musicpath, file_name))
++        try:
++            makedirs(musicpath)
++        except:
+
++            # We don't have permission to write here.  Don't bother
++            # trying to load music.
++            default_music_available = False
++
++    if default_music_available:
++        for file_name in listdir(musicpath):
++            if file_name[-3:] == "ogg" or file_name[-3:] == "mp3":
++                musicarray.append(path.join(musicpath, file_name))
++
+     #also, grab any user files
+     musicpath=path.join(get_save_folder(True), "music")
+     if not path.isdir(musicpath):
diff --git a/games-simulation/singularity/singularity-0.26a.ebuild b/games-simulation/singularity/singularity-0.26a.ebuild
index 65cd49f5f663..cae88aa66a0f 100644
--- a/games-simulation/singularity/singularity-0.26a.ebuild
+++ b/games-simulation/singularity/singularity-0.26a.ebuild
@@ -1,20 +1,20 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/singularity/singularity-0.26a.ebuild,v 1.1 2007/10/02 06:46:57 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/singularity/singularity-0.26a.ebuild,v 1.2 2007/10/14 07:26:57 mr_bones_ Exp $
 
-inherit games
+inherit eutils games
 
 MUSIC=endgame-${PN}-music-001
 
 DESCRIPTION="A simulation of a true AI. Go from computer to computer, pursued by the entire world. Keep hidden, and you might have a chance."
 HOMEPAGE="http://www.emhsoft.com/singularity/"
 SRC_URI="http://www.emhsoft.com/singularity/${PN}_${PV}.tar.gz
-	http://www.emhsoft.com/singularity/${MUSIC}.zip"
+	music? ( http://www.emhsoft.com/singularity/${MUSIC}.zip )"
 
 LICENSE="GPL-2 CCPL-Attribution-ShareAlike-2.5"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="music"
 
 RDEPEND="dev-python/pygame"
 DEPEND="${RDEPEND}
@@ -25,11 +25,15 @@ src_unpack() {
 	cd "${S}"
 
 	rm code/*.pyc data/*.html # Remove unecessary files
+	epatch "${FILESDIR}/${P}-musicdir.patch"
 }
 
 src_install() {
 	insinto "${GAMES_DATADIR}/${PN}"
-	doins -r code data ../${MUSIC}/music || die "doins failed"
+	doins -r code data || die "doins failed"
+	if use music ; then
+		doins -r ../${MUSIC}/music || die "doins failed"
+	fi
 	games_make_wrapper singularity "python ./singularity.py" "${GAMES_DATADIR}/${PN}/code"
 	dodoc README.txt TODO Changelog AUTHORS
 	prepgamesdirs