Update EAPI. Fix dependencies. Use Python 2.

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

3 files changed, 33 insertions, 21 deletions

diff --git a/dev-python/cgkit/ChangeLog b/dev-python/cgkit/ChangeLog
index 234a9b00fd53..bae8c4ba4018 100644
--- a/dev-python/cgkit/ChangeLog
+++ b/dev-python/cgkit/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/cgkit
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/cgkit/ChangeLog,v 1.26 2009/09/03 12:25:32 patrick Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cgkit/ChangeLog,v 1.27 2010/11/08 18:44:19 arfrever Exp $
+
+  08 Nov 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  cgkit-2.0.0_alpha9.ebuild:
+  Update EAPI. Fix dependencies. Use Python 2.
 
 *cgkit-2.0.0_alpha9 (03 Sep 2009)
 
diff --git a/dev-python/cgkit/Manifest b/dev-python/cgkit/Manifest
index 67893e0fc1cc..1c14ea2e0d2d 100644
--- a/dev-python/cgkit/Manifest
+++ b/dev-python/cgkit/Manifest
@@ -1,6 +1,6 @@
 DIST cgkit-2.0.0alpha8.tar.gz 740289 RMD160 91c9d906f6cf4eff00fc70db97906aab10c942fe SHA1 56c18a9234596971267e02017b8c13e17f93f895 SHA256 bb45524a9ad0c38299fa1c333c532968a2dcb1a51498cfd3f40700dfbd505e89
 DIST cgkit-2.0.0alpha9.tar.gz 829549 RMD160 03349d98617dc08aeea5ae32bb546708ac8f2091 SHA1 6f0c3203325747610de44981d482606e7e71172c SHA256 593adde60c7994298c3dedd3e3b459cf762cecd5549b0149e2fea8b108634a75
 EBUILD cgkit-2.0.0_alpha8.ebuild 1806 RMD160 19f5f7edb8a3dfcdbcbb72c6dfed69ed3972aad7 SHA1 c833b3212f884dc90969a4c0608c8c574d2d709b SHA256 b563303115f4ef627a1ccc0fef8d88787ffa51ddf5b7d53bdeb69bcf61d04b85
-EBUILD cgkit-2.0.0_alpha9.ebuild 1806 RMD160 2d863516086e855e8f5eea975b59c2968ee8b8dc SHA1 dd81a80a1976f6f5e26db893a0993c6f2d2cbab2 SHA256 9fec08248280a3447850d33c69b1829b7f5ca5c0c74af3fadb4fb1548835e1ae
-MISC ChangeLog 3897 RMD160 4e667f61bb79a35008c62675f619f212bb0247fa SHA1 3744f8217e6517ff6998f39e6220bfb490301ff4 SHA256 86b6c3a068789013233727e64f13322b044776b68f3c8ebb6b138d8b2b5126f3
+EBUILD cgkit-2.0.0_alpha9.ebuild 1891 RMD160 2f00dc5beabea2f86b58db7f5f0241e73adddf8d SHA1 e57bc1d16485389b9b17f4ceaafec547f77ff76d SHA256 9f98ae87a1d742ce128ddbfd86d9aa55c806283fda3aa96baafc8df0b2a2b62c
+MISC ChangeLog 4048 RMD160 0aa28389ccdbf7d2bc73ba69da6403e3c5653567 SHA1 5a5573d2d2a698d66642a54b1c368ac1637808c4 SHA256 d32c59288097f08327ab1db9cea13fff382c3c1aea830380d0324b6e4f79a3b8
 MISC metadata.xml 508 RMD160 cc56b0c02a95c62be3e7bad71e44640c074be844 SHA1 7a35105804c6249bc00fb325eb1efe996be088fa SHA256 33ed536dbb1ead476a0bfe5dd5e80da983409b16ef75ccf803b9627a6c4ce05f
diff --git a/dev-python/cgkit/cgkit-2.0.0_alpha9.ebuild b/dev-python/cgkit/cgkit-2.0.0_alpha9.ebuild
index 08b0632cf43b..8bb5f0721769 100644
--- a/dev-python/cgkit/cgkit-2.0.0_alpha9.ebuild
+++ b/dev-python/cgkit/cgkit-2.0.0_alpha9.ebuild
@@ -1,15 +1,19 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/cgkit/cgkit-2.0.0_alpha9.ebuild,v 1.1 2009/09/03 12:25:32 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cgkit/cgkit-2.0.0_alpha9.ebuild,v 1.2 2010/11/08 18:44:19 arfrever Exp $
 
-inherit distutils flag-o-matic
+EAPI="3"
+PYTHON_DEPEND="2"
+
+inherit distutils
+
+MY_P="${P/_/}"
 
-MY_P=${P/_/}
 DESCRIPTION="Python library for creating 3D images"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 HOMEPAGE="http://cgkit.sourceforge.net"
-RDEPEND="dev-lang/python
-	dev-python/pyrex
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+RDEPEND="dev-python/pyrex
 	dev-libs/boost
 	dev-python/pyprotocols
 	dev-python/pyopengl
@@ -19,16 +23,20 @@ RDEPEND="dev-lang/python
 DEPEND="${RDEPEND}
 	dev-util/scons"
 
-SLOT="0"
 LICENSE="LGPL-2.1 MPL-1.1 GPL-2"
+SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="3ds"
 
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	distutils_src_prepare
 
 	sed -i -e "s/fPIC/fPIC\",\"${CFLAGS// /\",\"}/" supportlib/SConstruct
 	cp config_template.cfg config.cfg
@@ -52,16 +60,16 @@ src_unpack() {
 }
 
 src_compile() {
-	cd "${S}"/supportlib
+	pushd supportlib > /dev/null
 	scons ${MAKEOPTS}
-	cd "${S}"
+	popd > /dev/null
+
 	distutils_src_compile
 }
 
 src_test() {
 	cd unittests
 	# Remove failing tests due to non-existing files
-	rm test_maimport.py test_mayaascii.py test_mayabinary.py test_ri.py \
-		test_slparams.py
-	PYTHONPATH=$(ls -d ../build/lib*) ${python} all.py || die "tests failed"
+	rm test_maimport.py test_mayaascii.py test_mayabinary.py test_ri.py test_slparams.py
+	PYTHONPATH="$(ls -d ../build/lib*)" "$(PYTHON)" all.py || die "Tests failed"
 }