Ported to python-single-r1 (used funnyboat-1.5-r1 as an example). Added workaround to stable ebuild to run python2 (bug #381809 by Chris Mayo).

Package-Manager: portage-2.2.0_alpha182_p1/cvs/Linux x86_64
Manifest-Sign-Key: 0x611FF3AA

4 files changed, 70 insertions, 22 deletions

diff --git a/games-simulation/singularity/ChangeLog b/games-simulation/singularity/ChangeLog
index eadac36a01cb..310207c3b229 100644
--- a/games-simulation/singularity/ChangeLog
+++ b/games-simulation/singularity/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-simulation/singularity
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/singularity/ChangeLog,v 1.21 2013/02/07 22:16:13 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/singularity/ChangeLog,v 1.22 2013/06/29 11:31:56 slyfox Exp $
+
+*singularity-0.30c-r1 (29 Jun 2013)
+
+  29 Jun 2013; Sergei Trofimovich <slyfox@gentoo.org>
+  +singularity-0.30c-r1.ebuild, singularity-0.30c.ebuild:
+  Ported to python-single-r1 (used funnyboat-1.5-r1 as an example). Added
+  workaround to stable ebuild to run python2 (bug #381809 by Chris Mayo).
 
   07 Feb 2013; Ulrich Müller <ulm@gentoo.org> singularity-0.30c.ebuild:
   Move Creative Commons licenses to shorter names.
diff --git a/games-simulation/singularity/Manifest b/games-simulation/singularity/Manifest
index bc55e968b007..b9e2cb4d1a8a 100644
--- a/games-simulation/singularity/Manifest
+++ b/games-simulation/singularity/Manifest
@@ -1,25 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST endgame-singularity-music-006.zip 28250705 SHA256 469697285c00564d831249898204d3e532f2685a17b4cf47ee4abc3ffc29276f
-DIST singularity-0.30c-src.tar.gz 2265133 SHA256 f4759fc059ef136c2d4d9668a021b14922dd7300ab5f37ed318ad6778c83f28f
-EBUILD singularity-0.30c.ebuild 1139 SHA256 160a2316f348aaa74f7f51579f7a68c816adfa028bc4f92152f285cddb251d0c SHA512 5bf84a723d16d03d12517f45fca13dd1f3640e625624ea420b5a81e9d0635e4bf4b92dbd4ae1e93f77fd2113ecc2c39e0d418c66ae88ec75d0e989ff5340bc10 WHIRLPOOL 0664dfa66744269c6fa57c90182334467fc9a2f36337b9bb426e44e5aca27d361ccd6608b50393e2a313415f536d4f5660200536995a65a80bddb9cb05438c04
-MISC ChangeLog 3157 SHA256 7454c06eb6a42ca73fb21ccc06972d63d98b8296f4b8cab2459a8812a2ce8ab1 SHA512 72dfcf5c8c96deb3aaf4071587d87de94c30a9581ecb9f7d6b625b76817c9179ce94686f3daf469db856c783315575f4b6fa83f25f97897267c7604cc25cc0f8 WHIRLPOOL 341bb78dbcf8bb62bbb3aabfaad7e09f566f4d8c56a049642d504e52fa408caec15aaa37db143a8333b54c0fae523a9f073401c569dae3850956c176d16a90d2
+DIST endgame-singularity-music-006.zip 28250705 SHA256 469697285c00564d831249898204d3e532f2685a17b4cf47ee4abc3ffc29276f SHA512 47e489112309cc742c2dcffec004aff25c54488fdf2a5f2dc67b7dcf67ca55996fe8e8403e4a16712fbc4e22289f12e612ad9d4322cd1d1aaab871f0ffb27e19 WHIRLPOOL bb94d4a5c50ef9fdc55e1384132c3ebb8788aa3746b70f8440b1855598682f7d6c99fb058d398012ca0b8bbe47d9b1362e070c3815ec96c05c9c9a66469da4bf
+DIST singularity-0.30c-src.tar.gz 2265133 SHA256 f4759fc059ef136c2d4d9668a021b14922dd7300ab5f37ed318ad6778c83f28f SHA512 ffca50c179b745561a25e3fb3525abb862d72f63f533f8a41472067d0ce94c8a236486c9c40a5040335d84e903c498805d591dc546a92d0a7651105103fe114f WHIRLPOOL f7b95b170df3aa5bd5080f1d7480b655fb63bb513a9b16b5e5d9873779bf478d8c19e537c1274bbdbd04cc688c1c9ce3ba1507c28a503904703afff678a0bf0b
+EBUILD singularity-0.30c-r1.ebuild 1426 SHA256 c00b6995938d3665c8d819f543d78db1972ffbe005ac8139cbd2f44d2b276558 SHA512 ae4827addef97373afff77e672cc6e0bdb8da4211976e7f9038fb6e23683b39de10ae956bc256f6e9fac053136af06f6c7d2fce3ef0b4f6377acd0ba5c5fa88a WHIRLPOOL 942cace9c5a6a4f74b2dcd01fd143ab4923deb491ada4e74bb77b482e9938eb9a7667863bf153d855807a4a5261ea632dfa4a326f5caf2c8c9106542c7851c87
+EBUILD singularity-0.30c.ebuild 1198 SHA256 88c81cd355bcb21585df10d7888413129c7aeafac3a6c8b0abc4bb0e97d52f9f SHA512 c4f90d73b523ea2ece2c0662e3213b4b9338fb365a1fb491d7141309d38a7334db3346d2bcd95b281261762a01c41ab930c3efbb7d5ad38d6bfce53b41697446 WHIRLPOOL 9dfd0836e9980f1735a9d4cb82508149634337508d593f97ae6c85281d27cd250d23dc36a9c72be748050ae7d3c63dce8a5d5a113a32ccfceda981634ddd8d4d
+MISC ChangeLog 3458 SHA256 79b4432c625299c33a27b50ad24d6e9732606d41546afde5f34268b30a695821 SHA512 8ce7a7060a0bc1705513ce1c588c9e345431d08ccf0a6c975b381bf34449ab46b11a9cedd7cd290ddedf6c8b540e86fdad278cefa301486b38876ddf1c464865 WHIRLPOOL f3603e5aa5c4ff0ac0d491630208afa7978db730a9d43f0dbe0e4089cf2ee41fe9f90d90ea9f229b6f45ef4e706d2300eb54f449ffc0a9f52661ab8e640f96e3
 MISC metadata.xml 311 SHA256 9c5b948e1498ef429b4e676f60f859b8eaedbd4931577c2e7249a676572d9e2a SHA512 c3ab2bc84cd5de53d88ca118efed9a56a2071db5e9481b8fa45caf867c4db73895e732826f14003d0bc12585b532dbdf9c252fc8a706853060a74eea6993dc90 WHIRLPOOL c550e666a8ef4b42cf7cf1d9ae0b052892399fa7da75464848d01881c9b91514583cee300b0e0d0bac3c52d56c1dfc7b1554eb0a5c22b0703613226128971c89
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRFCiaAAoJEDxpGckxwJCBqB0P/R2/3lcVHlyPeASxEWgnOfYY
-BlHl76Nkvxn+wRpwmZRyZgRu7pOVQFKG1dRLvYPmVdwC1GFz0qoG3LhpHswHGEc0
-ft0ZL+GNm9SD5eo7pTsg/V9FIg5D9jVR7jLnq9WUHijS22Ruu1qNemZm5RmUF8nZ
-ygct6To0Rl+VGiwrs+5Vr+7hhyOpX5V+KIXxTpc9PAftwgnfYYotVM6Yz9C+xLEE
-QpKGgk2Ms5Fpseztg3/eAw5JoyuYdYSCWaQtuJjNj6zXbUddsBNZ4wfe6wfPyVwA
-8LXGXZdGYv9RFwVw244lqzBNYvPj5t4RQFqLXQxahMgCGxEyeiT821dE1jRbJk6P
-M9oXyf1e1aZIr3q7OJ7/eH/pvZ2etGX+DbOL25FQhVshxay/jW9d/SskuMZsIKFO
-LKkB4rIbCiOk4jk25/gCCSmAM/PV59W5NZPPjdgtU7U1LSK1RRr6Rdis1F/uusQK
-QXm9eMjcY82nhi+lqjdRclkzUXhsRuGXdu86tCEaBsdr5QkQ9bXTjeuqh+5P3wOt
-6WBY/Sf/BzIv/8ocrJzvvdBo0IvIyQCmzRh6zVOuS8VIpXEyj+R9jjZomY3Ca33Y
-8cg/gfuxU61BU/dBobAv2ZPXUGB6fKoU/rglo8dnF/Fv7b+oI9l39Lb2uDYkiUk2
-QtK2uxWHrePiKY3aTA37
-=RkLi
+iEYEAREIAAYFAlHOxTsACgkQcaHudmEf86pz+ACfXqdgZ+KeVkwbVi6cs8y5mTmg
+/J8AmgLLK1LdzTyPSs8qhVhxVMnA8Pwg
+=oFJI
 -----END PGP SIGNATURE-----
diff --git a/games-simulation/singularity/singularity-0.30c-r1.ebuild b/games-simulation/singularity/singularity-0.30c-r1.ebuild
new file mode 100644
index 000000000000..ce847aeb8c5a
--- /dev/null
+++ b/games-simulation/singularity/singularity-0.30c-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/singularity/singularity-0.30c-r1.ebuild,v 1.1 2013/06/29 11:31:56 slyfox Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_5 python2_6 python2_7 )
+inherit eutils python-single-r1 games
+
+MUSIC=endgame-${PN}-music-006
+DESCRIPTION="A simulation of a true AI. Go from computer to computer, pursued by the entire world"
+HOMEPAGE="http://www.emhsoft.com/singularity/"
+SRC_URI="http://endgame-singularity.googlecode.com/files/${P}-src.tar.gz
+	music? ( http://endgame-singularity.googlecode.com/files/${MUSIC}.zip )"
+
+LICENSE="GPL-2 CC-BY-SA-2.5"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+music"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}"
+RDEPEND="${DEPEND}
+	dev-python/pygame[${PYTHON_USEDEP}]
+	media-libs/sdl-mixer[vorbis]"
+DEPEND="${DEPEND}
+	app-arch/unzip"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	games_pkg_setup
+}
+
+src_prepare() {
+	rm -f code/{,*}/*.pyc data/*.html || die # Remove unecessary files
+}
+
+src_install() {
+	insinto "${GAMES_DATADIR}/${PN}"
+	doins -r code data ${PN}.py || die "doins failed"
+	python_optimize "${ED%/}/${GAMES_DATADIR}"/${PN}
+
+	if use music ; then
+		doins -r ../${MUSIC}/music || die "doins failed"
+	fi
+	games_make_wrapper ${PN} "${EPYTHON} ${PN}.py" "${GAMES_DATADIR}/${PN}"
+	dodoc README.txt TODO Changelog AUTHORS
+	prepgamesdirs
+}
diff --git a/games-simulation/singularity/singularity-0.30c.ebuild b/games-simulation/singularity/singularity-0.30c.ebuild
index 4a635dc96142..2237294f1c4c 100644
--- a/games-simulation/singularity/singularity-0.30c.ebuild
+++ b/games-simulation/singularity/singularity-0.30c.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-simulation/singularity/singularity-0.30c.ebuild,v 1.4 2013/02/07 22:16:13 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-simulation/singularity/singularity-0.30c.ebuild,v 1.5 2013/06/29 11:31:56 slyfox Exp $
 
 EAPI=2
 inherit eutils games
@@ -16,7 +16,8 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="+music"
 
-RDEPEND="dev-python/pygame
+RDEPEND="=dev-lang/python-2*
+	dev-python/pygame
 	media-libs/sdl-mixer[vorbis]"
 DEPEND="${RDEPEND}
 	app-arch/unzip"
@@ -31,7 +32,8 @@ src_install() {
 	if use music ; then
 		doins -r ../${MUSIC}/music || die "doins failed"
 	fi
-	games_make_wrapper ${PN} "python ${PN}.py" "${GAMES_DATADIR}/${PN}"
+	# uses python-2 style exceptions
+	games_make_wrapper ${PN} "python2 ${PN}.py" "${GAMES_DATADIR}/${PN}"
 	dodoc README.txt TODO Changelog AUTHORS
 	prepgamesdirs
 }