Fixed problems building with lib3ds and ogre support.

Package-Manager: portage-2.0.51.19

7 files changed, 17 insertions, 43 deletions

diff --git a/dev-python/cgkit/ChangeLog b/dev-python/cgkit/ChangeLog
index 5c309ee64a19..2aa023412dff 100644
--- a/dev-python/cgkit/ChangeLog
+++ b/dev-python/cgkit/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/cgkit
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/cgkit/ChangeLog,v 1.7 2005/04/22 12:11:44 chrb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cgkit/ChangeLog,v 1.8 2005/04/30 17:32:11 chrb Exp $
+
+*cgkit-2.0.0_alpha3-r2 (30 Apr 2005)
+
+  30 Apr 2005; Chris Bainbridge <chrb@gentoo.org>
+  -cgkit-2.0.0_alpha3.ebuild, -cgkit-2.0.0_alpha3-r1.ebuild,
+  +cgkit-2.0.0_alpha3-r2.ebuild:
+  Fixed problems building with lib3ds and ogre support.
 
 *cgkit-2.0.0_alpha3-r1 (22 Apr 2005)
 
diff --git a/dev-python/cgkit/Manifest b/dev-python/cgkit/Manifest
index 607ff7e8a99a..6b4a6e5dc7e5 100644
--- a/dev-python/cgkit/Manifest
+++ b/dev-python/cgkit/Manifest
@@ -1,10 +1,8 @@
-MD5 5d2d852f61b7e4d738c6fe0537afb9fc ChangeLog 1127
+MD5 7fcdde7cfdb19c12ba4db8a44f1c251f ChangeLog 1366
 MD5 f9093463dd55946e4e458ac47703ab34 cgkit-1.1.0.ebuild 824
 MD5 e6d718e33908df222ca3ce670096596b cgkit-1.2.0.ebuild 821
 MD5 d620963da5abf8c705abab1b731a31a7 metadata.xml 236
-MD5 84eb54d8ee3834bbd65cf49e4ecf8d45 cgkit-2.0.0_alpha3.ebuild 751
-MD5 593478fffcc9f1c2dc4540983a99fecd cgkit-2.0.0_alpha3-r1.ebuild 1318
-MD5 03cbc1579a965b187358c32488c10fa6 files/digest-cgkit-2.0.0_alpha3 69
-MD5 03cbc1579a965b187358c32488c10fa6 files/digest-cgkit-2.0.0_alpha3-r1 69
+MD5 2b399b9091b6e610b5952e863fdbb411 cgkit-2.0.0_alpha3-r2.ebuild 1338
+MD5 45a40e33a5e096f20eeb847570b7dab6 files/digest-cgkit-2.0.0_alpha3-r2 69
 MD5 0dc9644564e6fe463b85fb42ed468ad3 files/digest-cgkit-1.1.0 123
 MD5 7d0cf9a35c0fe02d5a42ad636e5be31c files/digest-cgkit-1.2.0 123
diff --git a/dev-python/cgkit/cgkit-2.0.0_alpha3-r1.ebuild b/dev-python/cgkit/cgkit-2.0.0_alpha3-r2.ebuild
index 4572ba47a0b5..9b72043fc548 100644
--- a/dev-python/cgkit/cgkit-2.0.0_alpha3-r1.ebuild
+++ b/dev-python/cgkit/cgkit-2.0.0_alpha3-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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_alpha3-r1.ebuild,v 1.1 2005/04/22 12:11:44 chrb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cgkit/cgkit-2.0.0_alpha3-r2.ebuild,v 1.1 2005/04/30 17:32:11 chrb Exp $
 
 inherit distutils flag-o-matic
 
@@ -8,8 +8,6 @@ MY_P=${P/_/}
 DESCRIPTION="Python library for creating 3D images"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 HOMEPAGE="http://cgkit.sourceforge.net"
-# note: this could be split into depend/rdepend if someone takes the time
-# also many of these are optional. local use flags would be nice.
 DEPEND="dev-lang/python
 	dev-python/pyrex
 	dev-util/scons
@@ -29,9 +27,8 @@ S=${WORKDIR}/${MY_P}
 
 src_unpack() {
 	unpack ${A}
-	append-flags -fPIC
-	sed -i -e "s/CFLAGS = \"\"/CFLAGS = \"${CFLAGS}\"/" ${S}/supportlib/SConstruct
 	cd ${S}
+	sed -i -e "s/fPIC/fPIC\",\"${CFLAGS// /\",\"}/" supportlib/SConstruct
 	cp config_template.cfg config.cfg
 	echo 'LIBS += ["GL", "GLU", "glut"]' >> config.cfg
 	if use 3ds; then
@@ -39,6 +36,9 @@ src_unpack() {
 	fi
 	if use ogre; then
 		echo 'OGRE_AVAILABLE = True' >> config.cfg
+		echo 'INC_DIRS += ["/usr/include/OGRE"]' >> config.cfg
+		echo 'MACROS += [("EXT_HASH", None),("GCC_3_1",None)]' >> config.cfg
+		sed -i -e "s/#include <Math.h>//" wrappers/ogre/OgreCore.h
 	fi
 }
 
diff --git a/dev-python/cgkit/cgkit-2.0.0_alpha3.ebuild b/dev-python/cgkit/cgkit-2.0.0_alpha3.ebuild
deleted file mode 100644
index d63564276d53..000000000000
--- a/dev-python/cgkit/cgkit-2.0.0_alpha3.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2005 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_alpha3.ebuild,v 1.1 2005/04/21 00:07:39 chrb Exp $
-
-inherit distutils flag-o-matic
-
-MY_P=${P/_/}
-DESCRIPTION="Python library for creating 3D images"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-HOMEPAGE="http://cgkit.sourceforge.net"
-DEPEND="dev-lang/python
-	dev-python/pyrex
-	dev-util/scons
-	dev-libs/boost"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc"
-IUSE=""
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-	append-flags -fPIC
-	sed -i -e "s/CFLAGS = \"\"/CFLAGS = \"${CFLAGS}\"/" ${S}/supportlib/SConstruct
-}
-
-src_compile() {
-	cd ${S}/supportlib
-	scons ${MAKEOPTS}
-}
diff --git a/dev-python/cgkit/files/digest-cgkit-2.0.0_alpha3 b/dev-python/cgkit/files/digest-cgkit-2.0.0_alpha3
deleted file mode 100644
index 39466ceb4124..000000000000
--- a/dev-python/cgkit/files/digest-cgkit-2.0.0_alpha3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d5f73f716a4a5dfa4259ef24e30d9d72 cgkit-2.0.0alpha3.tar.gz 484210
diff --git a/dev-python/cgkit/files/digest-cgkit-2.0.0_alpha3-r1 b/dev-python/cgkit/files/digest-cgkit-2.0.0_alpha3-r1
deleted file mode 100644
index 39466ceb4124..000000000000
--- a/dev-python/cgkit/files/digest-cgkit-2.0.0_alpha3-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d5f73f716a4a5dfa4259ef24e30d9d72 cgkit-2.0.0alpha3.tar.gz 484210
diff --git a/dev-python/cgkit/files/digest-cgkit-2.0.0_alpha3-r2 b/dev-python/cgkit/files/digest-cgkit-2.0.0_alpha3-r2
new file mode 100644
index 000000000000..e05ddbf1d5bf
--- /dev/null
+++ b/dev-python/cgkit/files/digest-cgkit-2.0.0_alpha3-r2
@@ -0,0 +1 @@
+MD5 8dbc7ae55e8c00db65b363bd40fa6e78 cgkit-2.0.0alpha3.tar.gz 511778