From: Chris Bainbridge <chrb@gentoo.org>
Date: Fri, 17 Feb 2006 19:03:09 +0000 (+0000)
Subject: use old ogre so cgkit compiles - bug #123034
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=66f985c40377477f1dfb2ad61f8e15cfe74b24ab;p=gentoo.git

use old ogre so cgkit compiles - bug #123034
Package-Manager: portage-2.0.54
---

diff --git a/dev-python/cgkit/ChangeLog b/dev-python/cgkit/ChangeLog
index 9c8f07ba7a6b..2e1caa4ad687 100644
--- a/dev-python/cgkit/ChangeLog
+++ b/dev-python/cgkit/ChangeLog
@@ -1,6 +1,10 @@
 # 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.12 2005/11/22 22:51:06 chrb Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cgkit/ChangeLog,v 1.13 2006/02/17 19:03:09 chrb Exp $
+
+  17 Feb 2006; <chrb@gentoo.org> -cgkit-2.0.0_alpha3-r2.ebuild,
+  cgkit-2.0.0_alpha5.ebuild:
+  use old ogre so cgkit compiles - bug #123034
 
 *cgkit-2.0.0_alpha5 (22 Nov 2005)
 
diff --git a/dev-python/cgkit/Manifest b/dev-python/cgkit/Manifest
index cf6c14d4d072..3118c50d96a0 100644
--- a/dev-python/cgkit/Manifest
+++ b/dev-python/cgkit/Manifest
@@ -1,10 +1,8 @@
-MD5 f09b6a3c04767a95ff3e96dcb81e8d20 ChangeLog 1834
+MD5 89a4c87eb89479056c8fdfa4e6551671 ChangeLog 1975
 MD5 f9093463dd55946e4e458ac47703ab34 cgkit-1.1.0.ebuild 824
 MD5 e6d718e33908df222ca3ce670096596b cgkit-1.2.0.ebuild 821
-MD5 5b1289401593e59600d2926af4fea0f6 metadata.xml 358
-MD5 82b15a299f994182f4d884a0ebbb82e0 cgkit-2.0.0_alpha5.ebuild 1346
-MD5 48812b598c45ec655d03a8c0cc663ac9 cgkit-2.0.0_alpha3-r2.ebuild 1353
-MD5 b3d433cf87dee8a6d23fa4b8155c0f56 files/digest-cgkit-2.0.0_alpha5 69
-MD5 45a40e33a5e096f20eeb847570b7dab6 files/digest-cgkit-2.0.0_alpha3-r2 69
+MD5 0cb26d2319a7e0d761474b7157342519 cgkit-2.0.0_alpha5.ebuild 1354
 MD5 0dc9644564e6fe463b85fb42ed468ad3 files/digest-cgkit-1.1.0 123
 MD5 7d0cf9a35c0fe02d5a42ad636e5be31c files/digest-cgkit-1.2.0 123
+MD5 b3d433cf87dee8a6d23fa4b8155c0f56 files/digest-cgkit-2.0.0_alpha5 69
+MD5 5b1289401593e59600d2926af4fea0f6 metadata.xml 358
diff --git a/dev-python/cgkit/cgkit-2.0.0_alpha3-r2.ebuild b/dev-python/cgkit/cgkit-2.0.0_alpha3-r2.ebuild
deleted file mode 100644
index 421263c1ac0a..000000000000
--- a/dev-python/cgkit/cgkit-2.0.0_alpha3-r2.ebuild
+++ /dev/null
@@ -1,50 +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-r2.ebuild,v 1.3 2005/05/05 15:43:17 swegener 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
-	dev-python/pyprotocols
-	dev-python/numarray
-	dev-python/pyopengl
-	dev-python/pygame
-	dev-python/imaging
-	3ds? ( media-libs/lib3ds )
-	ogre? ( dev-games/ogre )"
-SLOT="0"
-LICENSE="LGPL-2.1"
-KEYWORDS="~x86 ~ppc"
-IUSE="3ds ogre"
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-	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
-		echo 'LIB3DS_AVAILABLE = True' >> config.cfg
-	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
-}
-
-src_compile() {
-	cd ${S}/supportlib
-	scons ${MAKEOPTS}
-	cd ${S}
-	distutils_src_compile
-}
diff --git a/dev-python/cgkit/cgkit-2.0.0_alpha5.ebuild b/dev-python/cgkit/cgkit-2.0.0_alpha5.ebuild
index 561fe28aa53a..a9839b44b3fd 100644
--- a/dev-python/cgkit/cgkit-2.0.0_alpha5.ebuild
+++ b/dev-python/cgkit/cgkit-2.0.0_alpha5.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/cgkit/cgkit-2.0.0_alpha5.ebuild,v 1.1 2005/11/22 22:51:06 chrb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cgkit/cgkit-2.0.0_alpha5.ebuild,v 1.2 2006/02/17 19:03:09 chrb Exp $
 
 inherit distutils flag-o-matic
 
@@ -18,7 +18,7 @@ DEPEND="dev-lang/python
 	dev-python/pygame
 	dev-python/imaging
 	3ds? ( media-libs/lib3ds )
-	ogre? ( dev-games/ogre )"
+	ogre? ( =dev-games/ogre-0.15.1 )"
 SLOT="0"
 LICENSE="LGPL-2.1"
 KEYWORDS="~x86 ~ppc"
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
deleted file mode 100644
index e05ddbf1d5bf..000000000000
--- a/dev-python/cgkit/files/digest-cgkit-2.0.0_alpha3-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8dbc7ae55e8c00db65b363bd40fa6e78 cgkit-2.0.0alpha3.tar.gz 511778