[gentoo-commits] gentoo-x86 commit in games-simulation/singularity: singularity-0.30c.ebuild singularity-0.30c-r1.ebuild ChangeLog

[Sergei Trofimovich (slyfox)]

slyfox      13/06/29 11:31:57

  Modified:             singularity-0.30c.ebuild ChangeLog
  Added:                singularity-0.30c-r1.ebuild
  Log:
  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).
  
  (Portage version: 2.2.0_alpha182_p1/cvs/Linux x86_64, signed Manifest commit with key 611FF3AA)

Revision  Changes    Path
1.5                  games-simulation/singularity/singularity-0.30c.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-simulation/singularity/singularity-0.30c.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-simulation/singularity/singularity-0.30c.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-simulation/singularity/singularity-0.30c.ebuild?r1=1.4&r2=1.5

Index: singularity-0.30c.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/games-simulation/singularity/singularity-0.30c.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- singularity-0.30c.ebuild	7 Feb 2013 22:16:13 -0000	1.4
+++ singularity-0.30c.ebuild	29 Jun 2013 11:31:56 -0000	1.5
@@ -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 @@
 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 @@
 	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
 }



1.22                 games-simulation/singularity/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-simulation/singularity/ChangeLog?rev=1.22&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-simulation/singularity/ChangeLog?rev=1.22&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-simulation/singularity/ChangeLog?r1=1.21&r2=1.22

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/games-simulation/singularity/ChangeLog,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- ChangeLog	7 Feb 2013 22:16:13 -0000	1.21
+++ ChangeLog	29 Jun 2013 11:31:56 -0000	1.22
@@ -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@g.o>
+  +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@g.o> singularity-0.30c.ebuild:
   Move Creative Commons licenses to shorter names.



1.1                  games-simulation/singularity/singularity-0.30c-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-simulation/singularity/singularity-0.30c-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-simulation/singularity/singularity-0.30c-r1.ebuild?rev=1.1&content-type=text/plain

Index: singularity-0.30c-r1.ebuild
===================================================================
# 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
}