-files/ogreopcode-ogre-1.7.1.patch, +ogreopcode-417.ebuild, +files/ogreopcode-417-ogre-1.7.2.patch, -ogreopcode-9999.ebuild

Add r417 which is known to work and 9999 always breaks.

5 files changed, 111 insertions, 50 deletions

diff --git a/dev-games/ogreopcode/ChangeLog b/dev-games/ogreopcode/ChangeLog
index d1907b5..453aa7a 100644
--- a/dev-games/ogreopcode/ChangeLog
+++ b/dev-games/ogreopcode/ChangeLog
@@ -1,7 +1,14 @@
 # ChangeLog for dev-games/ogreopcode
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*ogreopcode-417 (31 Jul 2011)
+
+  31 Jul 2011; Christoph Brill <egore911@egore911.de>
+  -files/ogreopcode-ogre-1.7.1.patch, +ogreopcode-417.ebuild,
+  +files/ogreopcode-417-ogre-1.7.2.patch, -ogreopcode-9999.ebuild:
+  Add r417 which is known to work and 9999 always breaks.
+
 *ogreopcode-9999 (30 Dec 2009)
 
   02 Okt 2010; Christoph Brill <egore911@egore911.de> ogreopcode-9999.ebuild:
diff --git a/dev-games/ogreopcode/Manifest b/dev-games/ogreopcode/Manifest
index 19d28f0..9c8492c 100644
--- a/dev-games/ogreopcode/Manifest
+++ b/dev-games/ogreopcode/Manifest
@@ -1,4 +1,4 @@
-AUX ogreopcode-ogre-1.7.1.patch 1357 RMD160 b09aff1e7f8f2b271d7ebcc6122e552622a5a1a6 SHA1 66924545ebe2740f6fc3a0f7942a48e1f18b98d4 SHA256 a89977e52f21e0e3f8cda7d96077cdf40995f7acc4c26f27f2af27850ace9c0d
-EBUILD ogreopcode-9999.ebuild 794 RMD160 440e267ecf810274ae9b73188f9651a26cd318ac SHA1 50dfecc2aa259b322a2b1e6c646d39e6308134a4 SHA256 263e013ca818b0a7137777892822dee6c98bb987e7dd3d2e6eb051bf40e74229
-MISC ChangeLog 625 RMD160 e85a99af07ab259a8ed108a6ab2c0db8e295e750 SHA1 fe3c500d1b89216c2b020ba2a7d25df395da494e SHA256 5be68ce9d666b39eaa1e26ec34388c54dce32687f1e19869641a2465e313fade
+AUX ogreopcode-417-ogre-1.7.2.patch 2579 RMD160 28a8ad03a1dc1fe6e9248bdcfa88b24f0dec5cdb SHA1 4b6cdbc2914d3e3ee10ac3183e06c17db362e1ff SHA256 a8aa5fe12a969230ee46b264cb831b34c3f00d31f5f7c7f2c242b81f9293d401
+EBUILD ogreopcode-417.ebuild 858 RMD160 646677c098131c27dc52df2e21fc37d9c14cbe5b SHA1 78f4485ce885d341072c771028f82aee664d8d41 SHA256 f02c2a65570b3d84776f6ed9bf4e4da77541c7fd292801a1613e551505b53713
+MISC ChangeLog 898 RMD160 6d2911a8d518d076d82ea099b244dba6b71fb0fe SHA1 7d0434a026aea737136b2b6f123ee627b03b9523 SHA256 c03007ce2f9c0632e02cdb777ca3849d57f03cece016fc8460889eb595d46b6a
 MISC metadata.xml 225 RMD160 4c506d7c9b24eec779d50ce5ede69834a7f6178a SHA1 a318096995ed1f48d6657e4b08a13371852b12de SHA256 4e2111c4227c34a36c3477bb355a39b8716e982e6ccdb67df1359a3a5f25d655
diff --git a/dev-games/ogreopcode/files/ogreopcode-417-ogre-1.7.2.patch b/dev-games/ogreopcode/files/ogreopcode-417-ogre-1.7.2.patch
new file mode 100644
index 0000000..f3e83cb
--- /dev/null
+++ b/dev-games/ogreopcode/files/ogreopcode-417-ogre-1.7.2.patch
@@ -0,0 +1,85 @@
+Index: configure.ac
+===================================================================
+--- configure.ac	(revision 417)
++++ configure.ac	(working copy)
+@@ -13,11 +13,12 @@
+ AM_CONFIG_HEADER(config.h)
+ AM_MAINTAINER_MODE
+ 
++LT_INIT([dlopen,win32-dll])
++
+ # Checks for programs.
+ AC_ISC_POSIX
+ AC_PROG_CXX
+ AM_PROG_CC_STDC
+-AC_PROG_LIBTOOL
+ 
+ # Checks for header files.
+ AC_HEADER_STDC
+Index: src/IOgreCollisionShape.cpp
+===================================================================
+--- src/IOgreCollisionShape.cpp	(revision 417)
++++ src/IOgreCollisionShape.cpp	(working copy)
+@@ -264,7 +264,7 @@
+ 		if(!mHasCostumTransform)

+ 		{

+ 			getParentSceneNode()->_update(true, true);

+-			getParentSceneNode()->getWorldTransforms(&mFullTransform);

++			mFullTransform = getParentSceneNode()->_getFullTransform();

+ 		}

+ 		return mFullTransform;

+ 	}

+Index: src/OgreBoxCollisionShape.cpp
+===================================================================
+--- src/OgreBoxCollisionShape.cpp	(revision 417)
++++ src/OgreBoxCollisionShape.cpp	(working copy)
+@@ -204,8 +204,7 @@
+ 

+ 		calculateSize();

+ 

+-		mParentNode->getWorldTransforms(&mFullTransform);

+-		//mFullTransform = mParentNode->_getFullTransform();

++		mFullTransform = mParentNode->_getFullTransform();

+ 

+ 		return true;

+ 	}

+Index: src/OgreMeshCollisionShape.cpp
+===================================================================
+--- src/OgreMeshCollisionShape.cpp	(revision 417)
++++ src/OgreMeshCollisionShape.cpp	(working copy)
+@@ -287,8 +287,7 @@
+ 		}

+ 

+ 		mParentNode = mDummyNode;

+-		//mFullTransform = mEntity->getParentSceneNode()->_getFullTransform();

+-		mParentNode->getWorldTransforms(&mFullTransform);

++		mFullTransform = mParentNode->_getFullTransform();

+ 		return rebuild();

+ 	}

+ 

+Index: bootstrap
+===================================================================
+--- bootstrap	(revision 417)
++++ bootstrap	(working copy)
+@@ -7,8 +7,8 @@
+ #  - libtool 1.4+
+ 
+ # Deal with some gentoo-specific issues
+-export WANT_AUTOMAKE='1.7'
+-export WANT_AUTOCONF='2.5'
++#export WANT_AUTOMAKE='1.7'
++#export WANT_AUTOCONF='2.5'
+ 
+ ## Using prereq in autoconf rather than here, mostly for the debian systems at
+ ## this point
+@@ -31,4 +31,9 @@
+ rm -rf autom4te.cache
+ 
+ # Fire up autotools
+-libtoolize --force --copy && aclocal -I scripts/m4 $ACLOCAL_FLAGS && autoheader && automake --include-deps --add-missing --foreign --copy && autoconf 
++autoreconf
++libtoolize --force --copy 
++aclocal -I scripts/m4 $ACLOCAL_FLAGS 
++autoheader 
++automake --include-deps --add-missing --foreign --copy 
++autoconf 
diff --git a/dev-games/ogreopcode/files/ogreopcode-ogre-1.7.1.patch b/dev-games/ogreopcode/files/ogreopcode-ogre-1.7.1.patch
deleted file mode 100644
index 3cff75c..0000000
--- a/dev-games/ogreopcode/files/ogreopcode-ogre-1.7.1.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Index: src/IOgreCollisionShape.cpp
-===================================================================
---- src/IOgreCollisionShape.cpp	(revision 417)
-+++ src/IOgreCollisionShape.cpp	(working copy)
-@@ -264,7 +264,7 @@
- 		if(!mHasCostumTransform)
- 		{
- 			getParentSceneNode()->_update(true, true);
--			getParentSceneNode()->getWorldTransforms(&mFullTransform);
-+			mFullTransform = getParentSceneNode()->_getFullTransform();
- 		}
- 		return mFullTransform;
- 	}
-Index: src/OgreBoxCollisionShape.cpp
-===================================================================
---- src/OgreBoxCollisionShape.cpp	(revision 417)
-+++ src/OgreBoxCollisionShape.cpp	(working copy)
-@@ -204,7 +204,7 @@
- 
- 		calculateSize();
- 
--		mParentNode->getWorldTransforms(&mFullTransform);
-+		mFullTransform = mParentNode->_getFullTransform();
- 		//mFullTransform = mParentNode->_getFullTransform();
- 
- 		return true;
-Index: src/OgreMeshCollisionShape.cpp
-===================================================================
---- src/OgreMeshCollisionShape.cpp	(revision 417)
-+++ src/OgreMeshCollisionShape.cpp	(working copy)
-@@ -287,8 +287,7 @@
- 		}
- 
- 		mParentNode = mDummyNode;
--		//mFullTransform = mEntity->getParentSceneNode()->_getFullTransform();
--		mParentNode->getWorldTransforms(&mFullTransform);
-+		mFullTransform = mParentNode->_getFullTransform();
- 		return rebuild();
- 	}
- 
diff --git a/dev-games/ogreopcode/ogreopcode-9999.ebuild b/dev-games/ogreopcode/ogreopcode-417.ebuild
index ce428e2..ab33f51 100644
--- a/dev-games/ogreopcode/ogreopcode-9999.ebuild
+++ b/dev-games/ogreopcode/ogreopcode-417.ebuild
@@ -1,9 +1,11 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
+EAPI=3
+
 ESVN_REPO_URI="https://ogreconglo.svn.sourceforge.net/svnroot/ogreconglo/ogreopcode/trunk"
-# tested with revision 372
+ESVN_REVISION="${PV}"
 inherit distutils autotools subversion
 
 DESCRIPTION="collision detection library for Ogre based on OPCODE"
@@ -11,21 +13,28 @@ HOMEPAGE="http://www.jacmoe.dk/forum/"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64"
 IUSE=""
 
-RDEPEND=">=dev-games/ogre-1.7.0"
+RDEPEND=">=dev-games/ogre-1.7.2"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
 src_unpack(){
 	subversion_src_unpack
+	cd "${S}"
 	eautoreconf || die "eautoreconf failed"
-	epatch "${FILESDIR}"/ogreopcode-ogre-1.7.1.patch
 }
 
-src_compile() {
+src_prepare() {
+	epatch "${FILESDIR}"/ogreopcode-417-ogre-1.7.2.patch
+}
+
+src_configure() {
 	econf || die "econf failed"
+}
+
+src_compile() {
 	emake || die "emake failed"
 }