Fix dependencies. Set SUPPORT_PYTHON_ABIS.

Package-Manager: portage-2.2.0_alpha10_p8/cvs/Linux x86_64

3 files changed, 32 insertions, 22 deletions

diff --git a/dev-python/soya/ChangeLog b/dev-python/soya/ChangeLog
index a1ac619a6c9a..2abf18671f4b 100644
--- a/dev-python/soya/ChangeLog
+++ b/dev-python/soya/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/soya
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/soya/ChangeLog,v 1.27 2010/11/08 12:49:09 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/soya/ChangeLog,v 1.28 2010/12/26 17:15:01 arfrever Exp $
+
+  26 Dec 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  soya-0.14.ebuild:
+  Fix dependencies. Set SUPPORT_PYTHON_ABIS.
 
   08 Nov 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   -soya-0.10.2.ebuild, -soya-0.13_rc1.ebuild:
diff --git a/dev-python/soya/Manifest b/dev-python/soya/Manifest
index cb79c399cbeb..265eb9faa98f 100644
--- a/dev-python/soya/Manifest
+++ b/dev-python/soya/Manifest
@@ -1,6 +1,6 @@
 AUX soya-0.14-glu.patch 501 RMD160 c5c5e63cc6823bdf58b56858a2d22f1160574c07 SHA1 d4f941b855308a867db8fef7c97f21000715e077 SHA256 523443a2dae6e24c0d3a8502475a8d7a6fef03fa3d098630f57f21297b230778
 DIST Soya-0.14.tar.bz2 905659 RMD160 397622fb179c3a46b8737440816498386e93a2fe SHA1 baf8f46c1f113ea17ac7eb8f9be0e8044e1458e6 SHA256 dcb93206d7154dc575ec6eeb7fa3ecfd6bfb78fa233db639e423857cd2a99590
 DIST SoyaTutorial-0.14.tar.bz2 5223674 RMD160 093b0fe0a4f0aef8aad6116221c220e2350a92b5 SHA1 8cfe20c77cd0bb1e5e9280e4388c3339805a28bf SHA256 86d5b8189e7f7b4269976a65f23a51291bb99c6272f2884cbd129a6e9cc6cbec
-EBUILD soya-0.14.ebuild 1350 RMD160 d608f46c4f92f6bb5ac2172733d3148fda9b6220 SHA1 bf86399cd636ed5583e94e8edaf65cd860d25e62 SHA256 aecb6937944c1e55ed7e2a8e1373130e13e819bda07d4fc83496ffeac9f9ef86
-MISC ChangeLog 3879 RMD160 ba022da2121ae1c696949b26d40e420cd9ff73a2 SHA1 7d9869ef63bb03a42e49f38e4a8e5c2f83f4f5c2 SHA256 7341ff6e349de3e8b6ba08c424aa450c7269d46fa2abd0bd3fd13a839c38880f
+EBUILD soya-0.14.ebuild 1481 RMD160 e14d4974a59cc9948e53b272399cec879dc6ede4 SHA1 c44c6c935171764c0bcab1c803640d13d46a08f3 SHA256 e432e029fd64cb9450487fc3a78564f234213cfbd24e15d7243fa2b067bc1cf1
+MISC ChangeLog 4018 RMD160 17f90de652a918dd13e1eafd45b14906b1685b7a SHA1 707a5dd9da1a032c158729396b7ee6c5767ac284 SHA256 df68112484474f0057d5f2ce5d3e55a92bee2ec00a01b4b1643bd8d48653ea58
 MISC metadata.xml 159 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f SHA1 c8e604d56dae898258b5254d78cfeac0b981e288 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4
diff --git a/dev-python/soya/soya-0.14.ebuild b/dev-python/soya/soya-0.14.ebuild
index 76ef402b8294..f724ecd85206 100644
--- a/dev-python/soya/soya-0.14.ebuild
+++ b/dev-python/soya/soya-0.14.ebuild
@@ -1,54 +1,60 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/soya/soya-0.14.ebuild,v 1.5 2010/11/08 11:50:46 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/soya/soya-0.14.ebuild,v 1.6 2010/12/26 17:15:01 arfrever Exp $
 
-EAPI=2
-inherit eutils distutils
+EAPI="3"
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.* *-jython"
 
-MY_PV=${PV/_}
-MY_P=Soya-${MY_PV}
-TUT_P=SoyaTutorial-${MY_PV}
+inherit distutils eutils
+
+MY_PV="${PV/_}"
+MY_P="Soya-${MY_PV}"
+TUT_P="SoyaTutorial-${MY_PV}"
 
 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/${TUT_P}.tar.bz2 )
 	examples? ( http://download.gna.org/soya/${TUT_P}.tar.bz2 )"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc x86"
 IUSE="doc examples"
 
-DEPEND="virtual/opengl
-	media-libs/freeglut
-	>=dev-lang/python-2.4.2
+DEPEND=">=dev-games/ode-0.5
+	dev-python/editobj
 	>=dev-python/imaging-1.1.5
+	>=dev-python/pyopenal-0.1.6
+	media-fonts/freefonts
 	>=media-libs/cal3d-0.10
-	>=media-libs/glew-1.3.3
+	media-libs/freeglut
 	>=media-libs/freetype-2.1.5
-	media-fonts/freefonts
+	>=media-libs/glew-1.3.3
 	>=media-libs/libsdl-1.2.8[opengl]
-	>=dev-games/ode-0.5
 	media-libs/openal
-	>=dev-python/pyopenal-0.1.6"
+	virtual/opengl"
+RDEPEND="${DEPEND}"
 
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-glu.patch
 	distutils_src_prepare
+	epatch "${FILESDIR}/${P}-glu.patch"
 }
 
 src_install() {
 	distutils_src_install
 
 	insinto /usr/share/${PF}
-	if use doc ; then
+	if use doc; then
 		cd "${WORKDIR}/${TUT_P}/doc"
-		doins soya_guide.pdf pudding/pudding.pdf || die
+		doins soya_guide.pdf pudding/pudding.pdf || die "doins failed"
 	fi
-	if use examples ; then
+	if use examples; then
 		cd "${WORKDIR}/${TUT_P}"
-		doins -r tutorial || die
+		doins -r tutorial || die "doins failed"
 	fi
 }