Version bump 0.10.2. Closes #89653

(Portage version: 2.1_pre9-r4)

7 files changed, 116 insertions, 13 deletions

diff --git a/dev-python/soya/ChangeLog b/dev-python/soya/ChangeLog
index 45d4dab677d5..34f35c7f50eb 100644
--- a/dev-python/soya/ChangeLog
+++ b/dev-python/soya/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-python/soya
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/soya/ChangeLog,v 1.14 2006/02/09 00:15:28 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/soya/ChangeLog,v 1.15 2006/04/26 18:23:47 fserb Exp $
+
+*soya-0.10.2 (26 Apr 2006)
+
+  26 Apr 2006; Fernando Serboncini <fserb@gentoo.org> soya-0.9.1.ebuild,
+  soya-0.9.2.ebuild, soya-0.10.ebuild, +soya-0.10.2.ebuild:
+  Version bump to 0.5.6
+  Added firefox USE flag (closes #89653)
+  Removed virtual/x11 dependency on old ebuilds
 
   25 Jan 2006; Marien Zwart <marienz@gentoo.org> soya-0.10.1.ebuild:
   Fix depend for modular.
diff --git a/dev-python/soya/files/digest-soya-0.10 b/dev-python/soya/files/digest-soya-0.10
index d84f0c2fc237..cdc0f9ee848e 100644
--- a/dev-python/soya/files/digest-soya-0.10
+++ b/dev-python/soya/files/digest-soya-0.10
@@ -1,2 +1,4 @@
 MD5 e64df35df78ac559bb29c95bc64701b0 Soya-0.10.tar.bz2 2201165
 MD5 dd6ca7683e122bebfd32b7511e0e86fc SoyaTutorial-0.10.tar.bz2 2837806
+RMD160 b969ab2ade54dd0a2cf4217a3214266bc99113fe SoyaTutorial-0.10.tar.bz2 2837806
+SHA256 988ddb7022b697c596467c1d3f48030e18aac99ec97b96ce5c6ef5c7b6852bd0 SoyaTutorial-0.10.tar.bz2 2837806
diff --git a/dev-python/soya/files/digest-soya-0.10.2 b/dev-python/soya/files/digest-soya-0.10.2
new file mode 100644
index 000000000000..7f181ef47c86
--- /dev/null
+++ b/dev-python/soya/files/digest-soya-0.10.2
@@ -0,0 +1,6 @@
+MD5 d92cb987c73a1356ab8fd273b3465668 Soya-0.10.2.tar.bz2 2167772
+RMD160 2ac9b982d46a10bde52b49705e6cc8ef32218e94 Soya-0.10.2.tar.bz2 2167772
+SHA256 6a3be34393e81481912abb2912717bb2435c6f156f388072a626996d416bc507 Soya-0.10.2.tar.bz2 2167772
+MD5 6f03171bb18ec3baf6aee582f5edc845 SoyaTutorial-0.10.2.tar.bz2 3970014
+RMD160 66a9f1e8d03007565c0534e43fa2b9d554764b4d SoyaTutorial-0.10.2.tar.bz2 3970014
+SHA256 26793a43fe0a14813ffd0613b2a8087e2e1d8a8b4a4af539536825e440705a8a SoyaTutorial-0.10.2.tar.bz2 3970014
diff --git a/dev-python/soya/soya-0.10.2.ebuild b/dev-python/soya/soya-0.10.2.ebuild
new file mode 100644
index 000000000000..007358a69e3f
--- /dev/null
+++ b/dev-python/soya/soya-0.10.2.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/soya/soya-0.10.2.ebuild,v 1.1 2006/04/26 18:23:47 fserb Exp $
+
+inherit distutils
+
+MY_P=${P/soya/Soya}
+MY_PN=${PN/soya/Soya}
+DESCRIPTION="A high-level 3D engine for Python, designed with games in mind"
+HOMEPAGE="http://oomadness.nekeme.net/Soya/FrontPage"
+SRC_URI="http://download.gna.org/soya/${MY_P}.tar.bz2
+	doc? ( http://download.gna.org/soya/${MY_PN}Tutorial-${PV}.tar.bz2 )
+	examples? ( http://download.gna.org/soya/${MY_PN}Tutorial-${PV}.tar.bz2 )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc"
+IUSE="doc examples ode openal"
+
+# Documented to need PIL (imaging) and pyrex
+# pyrex isn't actually needed for normal building of non-cvs.
+DEPEND="virtual/opengl
+	virtual/glut
+	>=dev-lang/python-2.4.2
+	>=dev-python/imaging-1.1.5
+	>=media-fonts/freefonts-0.10
+	>=media-libs/cal3d-0.10
+	>=media-libs/glew-1.3.3
+	>=media-libs/freetype-2.1.5
+	>=media-libs/libsdl-1.2.8
+	>=media-libs/libpng-1.2.8
+	ode? ( >=dev-games/ode-0.5 )"
+
+
+RDEPEND="${DEPEND}
+	>=dev-python/editobj-0.5.6
+	openal? ( >=dev-python/pyopenal-0.1.4 )"
+
+S=${WORKDIR}/${MY_P}
+
+src_compile() {
+
+	rm ${S}/pudding/test.py	# This file shouldn't be installed
+
+	if ! use ode; then
+		sed -i -e "s/^\(USE_ODE = \).*$/\1False/" setup.py || die "sed install.py failed"
+	fi
+	distutils_src_compile
+}
+
+src_install() {
+	distutils_src_install
+	if use doc; then
+		cd ${WORKDIR}/${MY_PN}Tutorial-${PV}
+		insinto /usr/share/${PN}/doc
+		doins doc/*
+		insinto /usr/share/${PN}/doc/blendertut
+		doins doc/blendertut/*
+		insinto /usr/share/${PN}/doc/pudding
+		doins doc/pudding/*
+	fi
+	if use examples; then
+		cd ${WORKDIR}/${MY_PN}Tutorial-${PV}
+		insinto /usr/share/${PN}/tutorial
+		doins tutorial/*
+		insinto /usr/share/${PN}/tutorial/results
+		doins tutorial/results/*
+		insinto /usr/share/${PN}/tutorial/data/blender
+		doins tutorial/data/blender/*
+		insinto /usr/share/${PN}/tutorial/data/images
+		doins tutorial/data/images/*
+		insinto /usr/share/${PN}/tutorial/data/levels
+		doins tutorial/data/levels/*
+		insinto /usr/share/${PN}/tutorial/data/ms3d
+		doins tutorial/data/ms3d/*
+		insinto /usr/share/${PN}/tutorial/data/shapes
+		doins tutorial/data/shapes/*
+		insinto /usr/share/${PN}/tutorial/data/shapes/balazar
+		doins tutorial/data/shapes/balazar/*
+		insinto /usr/share/${PN}/tutorial/data/sounds
+		doins tutorial/data/sounds/*
+		insinto /usr/share/${PN}/tutorial/data/svg
+		doins tutorial/data/svg/*
+		insopts -m0666
+		insinto /usr/share/${PN}/tutorial/data/worlds
+		doins tutorial/data/worlds/*
+		insinto /usr/share/${PN}/tutorial/data/materials
+		doins tutorial/data/materials/*
+	fi
+}
diff --git a/dev-python/soya/soya-0.10.ebuild b/dev-python/soya/soya-0.10.ebuild
index ddc0b902992f..91a195c79bbe 100644
--- a/dev-python/soya/soya-0.10.ebuild
+++ b/dev-python/soya/soya-0.10.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/soya/soya-0.10.ebuild,v 1.1 2005/09/29 23:01:42 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/soya/soya-0.10.ebuild,v 1.2 2006/04/26 18:23:47 fserb Exp $
 
 inherit distutils
 
@@ -20,8 +20,7 @@ IUSE="doc ode openal"
 # Documented to need PIL (imaging) and pyrex
 # pyrex isn't actually needed for normal building of non-cvs.
 # Versions are based off soya 0.6 ebuild; they're mainly undocumented.
-DEPEND="virtual/x11
-	virtual/opengl
+DEPEND="virtual/opengl
 	>=dev-lang/python-2.2.2
 	>=dev-python/imaging-1.1.4
 	>=media-fonts/freefonts-0.10
diff --git a/dev-python/soya/soya-0.9.1.ebuild b/dev-python/soya/soya-0.9.1.ebuild
index a0b7e0288bd6..d74352a373be 100644
--- a/dev-python/soya/soya-0.9.1.ebuild
+++ b/dev-python/soya/soya-0.9.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/soya/soya-0.9.1.ebuild,v 1.3 2005/02/09 23:21:31 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/soya/soya-0.9.1.ebuild,v 1.4 2006/04/26 18:23:47 fserb Exp $
 
 inherit distutils
 
@@ -17,8 +17,7 @@ LICENSE="GPL-2"
 # Documented to need PIL (imaging) and pyrex
 # pyrex isn't actually needed for normal building of non-cvs.
 # Versions are based off soya 0.6 ebuild; they're mainly undocumented.
-DEPEND="virtual/x11
-	virtual/opengl
+DEPEND="virtual/opengl
 	>=dev-lang/python-2.2.2
 	>=dev-python/editobj-0.3.1
 	>=media-libs/libsdl-1.2.4
diff --git a/dev-python/soya/soya-0.9.2.ebuild b/dev-python/soya/soya-0.9.2.ebuild
index f9d712a866f7..9535be71410a 100644
--- a/dev-python/soya/soya-0.9.2.ebuild
+++ b/dev-python/soya/soya-0.9.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/soya/soya-0.9.2.ebuild,v 1.3 2005/05/08 23:43:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/soya/soya-0.9.2.ebuild,v 1.4 2006/04/26 18:23:47 fserb Exp $
 
 inherit distutils
 
@@ -17,8 +17,7 @@ IUSE="ode"
 # Documented to need PIL (imaging) and pyrex
 # pyrex isn't actually needed for normal building of non-cvs.
 # Versions are based off soya 0.6 ebuild; they're mainly undocumented.
-DEPEND="virtual/x11
-	virtual/opengl
+DEPEND="virtual/opengl
 	>=dev-lang/python-2.2.2
 	>=media-libs/libsdl-1.2.4
 	>=media-libs/sdl-gfx-2.0.3