ogreopcode-417.ebuild, files/ogreopcode-417-ogre-1.8.0.patch, -ogreopcode-20120908.ebuild

Update to EAPI 4

4 files changed, 81 insertions, 95 deletions

diff --git a/dev-games/ogreopcode/ChangeLog b/dev-games/ogreopcode/ChangeLog
index 66824ed..01b0f69 100644
--- a/dev-games/ogreopcode/ChangeLog
+++ b/dev-games/ogreopcode/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  16 Sep 2012; Christoph Brill <egore911@egore911.de> ogreopcode-417.ebuild,
+  files/ogreopcode-417-ogre-1.8.0.patch, -ogreopcode-20120908.ebuild:
+  Update to EAPI 4
+
   09 Sep 2012; Christoph Brill <egore911@egore911.de> ogreopcode-417.ebuild,
   -files/ogreopcode-417-ogre-1.7.2.patch,
   +files/ogreopcode-417-ogre-1.8.0.patch:
diff --git a/dev-games/ogreopcode/Manifest b/dev-games/ogreopcode/Manifest
index f168c06..47209c9 100644
--- a/dev-games/ogreopcode/Manifest
+++ b/dev-games/ogreopcode/Manifest
@@ -1,6 +1,4 @@
-AUX ogreopcode-417-ogre-1.8.0.patch 4001 SHA256 955a7ea6657ad4a4a1549c53b81de0e75c316bd4117dd12cbf7ca04f633da8e8 SHA512 f9605874665bbc3f0fe85c613561aa7241fc61bd80ba5fab3eadddb1cedd25f2e3ce865a822504526428394aaf944a9a8ecf5f49185fc33b99e97aa2cc74499e WHIRLPOOL fd53d7eab4fc8dd0c0a53331b398b30e82a3fc3d76a784e639473a7aebd651791dfc30cf5ca3c83388b6917f16770d9efded0ba54b481400752a2d4fe76fc01f
-DIST Opcode.zip 201547 SHA256 ecf649c786b4916e15cd613eef1ec5b727ee7cca11865fc9fae886151644fb91 SHA512 1dfd7c6a16a2fa8fe7593717a1ddb268b0a881ef1ee0c5cdd857768c7e854d28d1e3c51a1e2491bc2b69e5ee5d3921431b66d6e2836b5b230f0d2952ab72269a WHIRLPOOL e5e79bec70896fdc4baa884a1f4839c809baefc6d1f52fdd9540b6f6b98ae8c0f9d9543d68f6b90e91e1323ae5d8c35e759f2366ed905d72e64710453d958d7e
-EBUILD ogreopcode-20120908.ebuild 721 SHA256 2f06aea6747d24973ee7c1e31ded706faa6123cbf4cef381f4d42d7e666b46ad SHA512 469478a780c974d540187b1f4a476ae545cf06bf87815d0cb53f9a30298dbe8ec390195881ef1f4d5406a144b758210b4409a59f4ef8cac8beac36219a018733 WHIRLPOOL 4d8c635b2d2cc7554448e1c946552c7640f45d83f0a5cff240f56dc7ed419c6331448f813c3b81e32a68f56f0de05ee12e2538ff58d8ff76fe2b886f6dc448fc
-EBUILD ogreopcode-417.ebuild 848 SHA256 ee4c3501b1a40484c6f2ebada1b6e963c6f9990f61ae87f0521a5c05789af4f8 SHA512 fbaa14a4f641d7ad296c0a168241d59a1be2e643813999ff89b743e445126e67e59901bab5290e84325dff7485ca7814808547e11a50b112bb2989ea62fc7cf8 WHIRLPOOL 9a0294d4fd1e8d0fc733d0ba5fd0a653623473efa69176d430685b7d1cc2f7866dcd7356fb91d16d93435c6b3b5c2aac7175198108ffa39fdcefc863e330e2d3
-MISC ChangeLog 1289 SHA256 d9311ebcb7fd8d18106a85e921889668d4c0229bbc8226032695150228dead45 SHA512 271241b1a2ab9fe8f66e27dba15c35eadf324737749f3b76c1b143ee3764eff964dc313f3ec0a089722da5b8ff2777589c5535cfd5ef9c6dc475d54db8d67b1f WHIRLPOOL 2d0234cb795f6a6ad85143df4bfe8b12c6cf9ab542ffd618063c994b9f33d0e3c70e414a20db922c598c11efbf42bf94a41b95459d1855e9ae80e848f48b9b61
+AUX ogreopcode-417-ogre-1.8.0.patch 3795 SHA256 de27801fb89cefe675decc7726d7c50ce6fcf24cea87db60c3cfc69062dc002d SHA512 2810ec1b8a6b13d248e15dc8012039e0c6c4a68abf399763242ab0041b2f501ef7954ad666f3ea528ce7454758772fb5ad983184502b210a02a1079a760db9d6 WHIRLPOOL 4c2f8935135c56c9e345ee6507a917223b2fea41f100311555f73e97e24c6051306f31d110b06140ac07aee825dbd6c696e04faca66c25f80d0da9bc4f259dfe
+EBUILD ogreopcode-417.ebuild 672 SHA256 bce4c1a4d3a15abba396ac387ba63865097f11ef505a75be19d23ebf3df71aba SHA512 d84c60aaccea42be65763641a3fd7635b1d7fb86c603d6c90ba32a30c4ca969b82c84cff862e6dcda8863a088515e2f82b0c018be9b798027fcac0ab4042f746 WHIRLPOOL 242a31df5c1cf8e3683c31b94d2cf8a9cfb604d0cde57d640aae586e50e667e859bcc66698f0e6776d2ada977695b9bdeba4113c0a5222a95eb72a126031a323
+MISC ChangeLog 1456 SHA256 a5b951f857767de506136b794393bedbdb25086e4a8a22bfaa3c761ae63a7956 SHA512 d0a2b98ae4722b5ba48e320030b91f9d73ac276a66f0697e3f294df9708fbe7a3e24968676828bae74be99320954b10e5dac97a973f4bb8c40a08c435555267d WHIRLPOOL cace36f97b9494f54bc2e14cb2ff66c10fdc36288d7f7b8724c27258e62df1e075bb501782081e766f5a8e4f3dc4c30ac82cb8d8d63870cb6a03e17e9d228532
 MISC metadata.xml 225 SHA256 4e2111c4227c34a36c3477bb355a39b8716e982e6ccdb67df1359a3a5f25d655 SHA512 3491fc1b84e75f659918ff5c3edc847d83cd1313fa8e5cf7859cec27ee38cbdf6fb91a73098ad1b4035f428dcbf7e0807686180d8304af485b79fb3e1f8b0c72 WHIRLPOOL ba7176f721ef5548423f54b8dda2cf845e0f3430a691d6e72004b197f03f7db1cc48cdc88799ec8247f6922cac7d2a79ebc93631900bcbc1f0ab73aca7a9d1ac
diff --git a/dev-games/ogreopcode/files/ogreopcode-417-ogre-1.8.0.patch b/dev-games/ogreopcode/files/ogreopcode-417-ogre-1.8.0.patch
index 16fd448..c553ee2 100644
--- a/dev-games/ogreopcode/files/ogreopcode-417-ogre-1.8.0.patch
+++ b/dev-games/ogreopcode/files/ogreopcode-417-ogre-1.8.0.patch
@@ -1,52 +1,35 @@
-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 
-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 @@
+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

+@@ -35,7 +36,7 @@

+ # Checks for library functions.

+ AC_CHECK_FUNCS([floor memmove memset sqrt strchr strstr])

+ 

+-PKG_CHECK_MODULES(OGRE, [OGRE >= 1.0.0])

++PKG_CHECK_MODULES(OGRE, [OGRE >= 1.8.0])

+ AC_SUBST(OGRE_CFLAGS)

+ AC_SUBST(OGRE_LIBS)

+ 

+Index: src/IOgreCollisionShape.cpp

+===================================================================

+--- src/IOgreCollisionShape.cpp	(revision 417)

++++ src/IOgreCollisionShape.cpp	(working copy)

+@@ -264,7 +264,7 @@

  		if(!mHasCostumTransform)

  		{

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

@@ -55,11 +38,11 @@ Index: src/IOgreCollisionShape.cpp
  		}

  		return mFullTransform;

  	}

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

+===================================================================

+--- src/OgreBoxCollisionShape.cpp	(revision 417)

++++ src/OgreBoxCollisionShape.cpp	(working copy)

+@@ -204,8 +204,7 @@

  

  		calculateSize();

  

@@ -69,24 +52,11 @@ Index: src/OgreBoxCollisionShape.cpp
  

  		return true;

  	}

-Index: src/OgreCollisionContext.cpp
-===================================================================
---- src/OgreCollisionContext.cpp	(revision 417)
-+++ src/OgreCollisionContext.cpp	(working copy)
-@@ -420,7 +420,7 @@
- 						// do the contact check between 2 moving spheres

- 						sphere s0(position,radius);

- 						sphere s1(p1,(*other)->getRadius());

--						float u0,u1;

-+						Ogre::Real u0,u1;

- 						checkReportHandler.mTotalBVBVTests++;

- 						if (s0.intersect_sweep(movementVector,s1,v1,u0,u1))

- 						{

-Index: src/OgreCollisionManager.cpp
-===================================================================
---- src/OgreCollisionManager.cpp	(revision 417)
-+++ src/OgreCollisionManager.cpp	(working copy)
-@@ -36,19 +36,19 @@
+Index: src/OgreCollisionManager.cpp

+===================================================================

+--- src/OgreCollisionManager.cpp	(revision 417)

++++ src/OgreCollisionManager.cpp	(working copy)

+@@ -36,19 +36,19 @@

  

  using namespace Ogre;

  using namespace OgreOpcode::Details;

@@ -109,11 +79,11 @@ Index: src/OgreCollisionManager.cpp
  	}

  

  	CollisionManager::CollisionManager(SceneManager* sMgr)

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

+===================================================================

+--- src/OgreMeshCollisionShape.cpp	(revision 417)

++++ src/OgreMeshCollisionShape.cpp	(working copy)

+@@ -287,8 +287,7 @@

  		}

  

  		mParentNode = mDummyNode;

@@ -123,3 +93,29 @@ Index: src/OgreMeshCollisionShape.cpp
  		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/ogreopcode-417.ebuild b/dev-games/ogreopcode/ogreopcode-417.ebuild
index 395ba49..1a8f961 100644
--- a/dev-games/ogreopcode/ogreopcode-417.ebuild
+++ b/dev-games/ogreopcode/ogreopcode-417.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=4
 
 ESVN_REPO_URI="https://ogreconglo.svn.sourceforge.net/svnroot/ogreconglo/ogreopcode/trunk"
 ESVN_REVISION="${PV}"
@@ -29,15 +29,3 @@ src_unpack(){
 src_prepare() {
 	epatch "${FILESDIR}"/ogreopcode-417-ogre-1.8.0.patch
 }
-
-src_configure() {
-	econf || die "econf failed"
-}
-
-src_compile() {
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-}