Hopefully fixed upgrade. Bug #295987

Package-Manager: portage-2.1.6.13/cvs/Linux i686

5 files changed, 23 insertions, 8 deletions

diff --git a/dev-games/ogre/ChangeLog b/dev-games/ogre/ChangeLog
index 2d7de586316b..0317bce4ec52 100644
--- a/dev-games/ogre/ChangeLog
+++ b/dev-games/ogre/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-games/ogre
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ChangeLog,v 1.60 2009/12/03 01:41:58 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ChangeLog,v 1.61 2009/12/16 21:17:34 tupone Exp $
+
+  16 Dec 2009; Tupone Alfredo <tupone@gentoo.org> ogre-1.6.4.ebuild,
+  +files/ogre-1.6.4-automake.patch:
+  Hopefully fixed upgrade. Bug #295987 by Dennis Schridde 
 
 *ogre-1.6.4 (03 Dec 2009)
 
diff --git a/dev-games/ogre/Manifest b/dev-games/ogre/Manifest
index ed2503c1f060..dbb37ded96db 100644
--- a/dev-games/ogre/Manifest
+++ b/dev-games/ogre/Manifest
@@ -1,9 +1,10 @@
 AUX ogre-1.4.9-as-needed.patch 437 RMD160 d5af96318bcb5161189babad19d65df7e72a8a55 SHA1 413bdf7b2a51eac1fc89077f058086549b0d1847 SHA256 729a6d677367b078fc68300baacb94f6de0338241e065c12821acc8413c1294a
 AUX ogre-1.4.9-cegui.patch 542 RMD160 e187f9e824c7853f3cad8f2ab682b06d08ecdc56 SHA1 3abb6ebfdca868efffca1eb882955eef1af15efe SHA256 a8cc5d0779902231a027fa5e39c3ac2eb4c17f594e8b259d830940c53cb4eb96
+AUX ogre-1.6.4-automake.patch 534 RMD160 f576d6a5fbf63fdcd2a7d2d69107968cb995f670 SHA1 6995c8f2283eb5e0a3a2b5666c34046928e1c2eb SHA256 ddbc4250bdce1323f14494cc4baad205a7e184b106f390d811dbbcfad353c45f
 AUX ogre-1.6.4-boost.patch 374 RMD160 019a214687e450edf269d3d604fb592f34ee294a SHA1 dfa607c916fb16a6071dd965c23bec4ca72166e2 SHA256 cc989efa68d9421a2d965f7998a5f5bb04cc518bf91e5f0e42ba4300fb7d93fc
 DIST ogre-v1-4-9.tar.bz2 29555312 RMD160 c95536520d222b410e30f7bbee15c55360ee9c8d SHA1 3b8fb296a16cac77cdba6370bd9c752bfcccf18a SHA256 38b17826b6b34e70bf1bab17d4791ab1d485409c938cf71e1e5f866f3391c35b
 DIST ogre-v1-6-4.tar.bz2 41792925 RMD160 1c7e5f83df812671bcdc6bcf5dfa6a38fc69c93f SHA1 8d0c3edd2c8e289675555d10692407203e9e8a4a SHA256 af348dc278ff53f5eec966073d1eb8a87ad5c29215339713ce91eda1501bf12e
-EBUILD ogre-1.4.9.ebuild 2474 RMD160 fde3e4726d13e7e33e09ef504113eb6a20754c9c SHA1 9e4c7432007c6fe97b7407db03c18d1c726fddfd SHA256 64c1648585f07452afbac82a81f2a9fef3d65a176b553857f90c91c0c5a0ebfa
-EBUILD ogre-1.6.4.ebuild 2199 RMD160 bd151f5cf60ebb7990594671b5af4a152d38fa1d SHA1 e3044f614f8f39d083f9af8c55571de032cb702f SHA256 49ab2927af820c3a5aba3411e733d0cce2ee3358d4fd80c206cff875f9f02cb7
-MISC ChangeLog 8663 RMD160 6d715669b6c3b132ff0a4db1a69412a2563e7387 SHA1 ab60f67ec15f598851caddb581587d476dc4c8fb SHA256 85be6a772f4877a5fad27c239ace80453e52e612c3fb4f6689fc60559c615cdb
+EBUILD ogre-1.4.9.ebuild 2471 RMD160 e4d5799c3181b5e018cf388e6f61af6ed105400d SHA1 cf23cea542cbf09cea5a5863a7e8e058f3122b16 SHA256 4a5e333060987d058edc37fd4af50a40fd8681ebb79c222900a4767a968b04c6
+EBUILD ogre-1.6.4.ebuild 2234 RMD160 a641d1c4345f46c65333ed6c8b7388774aa25fb0 SHA1 9b8594229c87da3ab0887ad26ef27a2fb9c97628 SHA256 4663d343512d021456ed0ed659b0bda69cf22b8c61746b9cdbf3efc5d389dfa6
+MISC ChangeLog 8825 RMD160 8a1797a02500087883d786128900b5e599500483 SHA1 ce4bd9e5ec94f2770c9357e1e4ccdd0e05fc9cc0 SHA256 ce972b73a07c910c95ab37b42f177754675a605c722cd202527877fd2997c0e4
 MISC metadata.xml 4514 RMD160 bd36a83acfbf75cac218d035281a0bd6d317837f SHA1 3b1ee9230a5a7781fc76606c6f7ff82c493d80af SHA256 b79edd7807e9b9b13b4d42bd4c37684c106357de9f73b868f871f3c2a8dd0304
diff --git a/dev-games/ogre/files/ogre-1.6.4-automake.patch b/dev-games/ogre/files/ogre-1.6.4-automake.patch
new file mode 100644
index 000000000000..bfb473a2381c
--- /dev/null
+++ b/dev-games/ogre/files/ogre-1.6.4-automake.patch
@@ -0,0 +1,9 @@
+--- RenderSystems/GL/src/Makefile.am.old	2009-12-16 12:12:56.000000000 +0100
++++ RenderSystems/GL/src/Makefile.am	2009-12-16 12:14:43.000000000 +0100
+@@ -42,4 +42,5 @@
+     $(top_builddir)/RenderSystems/GL/src/GLSL/src/libGLSL.la \
+     $(top_builddir)/RenderSystems/GL/src/nvparse/libnvparse.la \
+     $(top_builddir)/RenderSystems/GL/src/atifs/src/libatifs.la \
+-    $(GL_LIBS) $(GLSUPPORT_LIBS) -lOgreMain $(OGRE_THREAD_LIBS)
++    $(top_builddir)/OgreMain/src/libOgreMain.la \
++    $(GL_LIBS) $(GLSUPPORT_LIBS) $(OGRE_THREAD_LIBS)
diff --git a/dev-games/ogre/ogre-1.4.9.ebuild b/dev-games/ogre/ogre-1.4.9.ebuild
index 01dc9d96be62..212ff0669e1f 100644
--- a/dev-games/ogre/ogre-1.4.9.ebuild
+++ b/dev-games/ogre/ogre-1.4.9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ogre-1.4.9.ebuild,v 1.5 2009/11/12 21:30:30 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ogre-1.4.9.ebuild,v 1.6 2009/12/16 21:17:34 tupone Exp $
 
 inherit multilib eutils autotools flag-o-matic
 
diff --git a/dev-games/ogre/ogre-1.6.4.ebuild b/dev-games/ogre/ogre-1.6.4.ebuild
index cb6c281c8439..154828207b1f 100644
--- a/dev-games/ogre/ogre-1.6.4.ebuild
+++ b/dev-games/ogre/ogre-1.6.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ogre-1.6.4.ebuild,v 1.1 2009/12/03 01:41:58 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ogre-1.6.4.ebuild,v 1.2 2009/12/16 21:17:34 tupone Exp $
 
 EAPI=2
 inherit multilib eutils autotools flag-o-matic
@@ -47,7 +47,8 @@ src_prepare() {
 			|| die "sed failed"
 	fi
 	sed -i -e '/CPPUNIT/d' configure.in || die "sed failed"
-	epatch "${FILESDIR}"/${P}-boost.patch
+	epatch "${FILESDIR}"/${P}-boost.patch \
+		"${FILESDIR}"/${P}-automake.patch
 	eautoreconf
 }