Update to work with latest autotools

Package-Manager: portage-2.1.11.31

5 files changed, 57 insertions, 59 deletions

diff --git a/dev-games/ogreopcode/Manifest b/dev-games/ogreopcode/Manifest
index 47209c9..6c6ee41 100644
--- a/dev-games/ogreopcode/Manifest
+++ b/dev-games/ogreopcode/Manifest
@@ -1,4 +1,7 @@
-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
+AUX ogreopcode-417-autotools.patch 1255 SHA256 0c4f2f34ee95a2db03b77254ed23169cfa90d6a7a98a561ead3918e6031c7ea8 SHA512 60aaa1f369803cce8bb7d89ec75afe5c872a9a1a9a0fcc70f2300118423cd11b386735191efb35c397163de55c47dc43bdc06a3561b722fdd54eb8c1a791b440 WHIRLPOOL da7eb4cd27bb02ea1dfad1fe1d5a246b50cfca9a7349fa0ad052eb47c1f1a19166e4e3f2a50138761f54937eade965f63dd360e0ee43c077909533896318b5ba
+AUX ogreopcode-417-ogre-1.8.0.patch 2303 SHA256 b7706b8df772c04fb545dd223c3b99ce9ed745653cbc43b2292c0ae9971a8c88 SHA512 b5b905ecf7689894f8aaa4ab0453c386062c58492fa9c5be0842d218314547b20ff56dec2ded3e41450a5659363d4fbfbbdca66f1614c2020c3cdd62802f323f WHIRLPOOL 18aae44745f74bad78068e8c8c24612d88e7a24d47f94d2beb05ad316a6ce33a26670061175832be6a14a876e386d74df304f5933a74924037d9574455ce9144
+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 725 SHA256 8db2655b3f0747f0db8114d0071b5905738c6f4c12d57646d82066fa907cf9a0 SHA512 77ec93cbc57495026bb8b73cf42273011f7f18b1af375bbb9cf24a9e34be7d9b28ae43886a7e78c5fc46364cf752c3f51936710436d238cbb892607e1ceefeb8 WHIRLPOOL 8a64813ad92cc23034ef6f16d24f01e4db68b9c2e72a6ea73ca20a953f8d89b6cbadbb74bc0ab702b0aacaa6215b32c47658557a5083fede6eeeebac17e18681
 MISC ChangeLog 1456 SHA256 a5b951f857767de506136b794393bedbdb25086e4a8a22bfaa3c761ae63a7956 SHA512 d0a2b98ae4722b5ba48e320030b91f9d73ac276a66f0697e3f294df9708fbe7a3e24968676828bae74be99320954b10e5dac97a973f4bb8c40a08c435555267d WHIRLPOOL cace36f97b9494f54bc2e14cb2ff66c10fdc36288d7f7b8724c27258e62df1e075bb501782081e766f5a8e4f3dc4c30ac82cb8d8d63870cb6a03e17e9d228532
-MISC metadata.xml 225 SHA256 4e2111c4227c34a36c3477bb355a39b8716e982e6ccdb67df1359a3a5f25d655 SHA512 3491fc1b84e75f659918ff5c3edc847d83cd1313fa8e5cf7859cec27ee38cbdf6fb91a73098ad1b4035f428dcbf7e0807686180d8304af485b79fb3e1f8b0c72 WHIRLPOOL ba7176f721ef5548423f54b8dda2cf845e0f3430a691d6e72004b197f03f7db1cc48cdc88799ec8247f6922cac7d2a79ebc93631900bcbc1f0ab73aca7a9d1ac
+MISC metadata.xml 204 SHA256 e808030aad62dfe3e81350c1c879870c3d406c50e908ddc3f521480aec65e8d5 SHA512 4e3e5b3211b0bd063a20b73fc3489bcb4f483990dc0eeb4c677a969f653b72b182e266bdf370669ab83713a9a2b1e26ae6eb703e219d9931c5220d51fb9f5f02 WHIRLPOOL 17bb47a871a62dbb7e5baf653d0e099928ba21409fd66c270f762e528ac1a6323e660c5e3ad8c72847a737ffd105f1d7528ad856608f9f9ac48bb5e55ab13d24
diff --git a/dev-games/ogreopcode/files/ogreopcode-417-autotools.patch b/dev-games/ogreopcode/files/ogreopcode-417-autotools.patch
new file mode 100644
index 0000000..3ea8038
--- /dev/null
+++ b/dev-games/ogreopcode/files/ogreopcode-417-autotools.patch
@@ -0,0 +1,49 @@
+--- src/Makefile.am	2012-12-22 12:06:59.701392947 +0100
++++ src/Makefile.am	2012-12-22 12:11:23.124734277 +0100
+@@ -1,10 +1,8 @@
+-INCLUDES = \
++AM_CPPFLAGS =\
+ 	-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
+ 	-DPACKAGE_SRC_DIR=\""$(srcdir)"\" \
+ 	-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
+-	-I$(top_srcdir)/include
+-
+-AM_CFLAGS =\
++	-I$(top_srcdir)/include \
+ 	 -Wall\
+ 	 -g
+ 
+--- src/Opcode/Makefile.am	2012-12-22 12:06:59.821392952 +0100
++++ src/Opcode/Makefile.am	2012-12-22 12:10:26.121399219 +0100
+@@ -44,5 +44,5 @@
+ libopcode_la_LDFLAGS = \
+ 	-version-info @OPCODE_VERSION_INFO@
+ 
+-INCLUDES = -I$(top_srcdir)/include
++AM_CPPFLAGS = -I$(top_srcdir)/include
+ 
+--- configure.ac	2012-12-22 12:06:33.401392149 +0100
++++ configure.ac	2012-12-22 12:24:09.858090892 +0100
+@@ -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)
+ 
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 c553ee2..cce9790 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,30 +1,3 @@
-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)

@@ -91,31 +64,4 @@ Index: src/OgreMeshCollisionShape.cpp
 -		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 

+ 	}
\ No newline at end of file
diff --git a/dev-games/ogreopcode/metadata.xml b/dev-games/ogreopcode/metadata.xml
index 3154a6a..1188c23 100644
--- a/dev-games/ogreopcode/metadata.xml
+++ b/dev-games/ogreopcode/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>no-herd</herd>
 <maintainer>
   <email>egore911@egore911.de</email>
 </maintainer>
diff --git a/dev-games/ogreopcode/ogreopcode-417.ebuild b/dev-games/ogreopcode/ogreopcode-417.ebuild
index 1a8f961..dea18bf 100644
--- a/dev-games/ogreopcode/ogreopcode-417.ebuild
+++ b/dev-games/ogreopcode/ogreopcode-417.ebuild
@@ -27,5 +27,6 @@ src_unpack(){
 }
 
 src_prepare() {
+	epatch "${FILESDIR}"/ogreopcode-417-autotools.patch
 	epatch "${FILESDIR}"/ogreopcode-417-ogre-1.8.0.patch
 }