Resize the patch.

Package-Manager: portage-2.2_rc38/cvs/Linux x86_64

4 files changed, 293 insertions, 9 deletions

diff --git a/dev-games/kyra/ChangeLog b/dev-games/kyra/ChangeLog
index acdf3844b136..6ce88b717559 100644
--- a/dev-games/kyra/ChangeLog
+++ b/dev-games/kyra/ChangeLog
@@ -1,11 +1,11 @@
 # ChangeLog for dev-games/kyra
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/kyra/ChangeLog,v 1.13 2009/08/13 06:10:16 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/kyra/ChangeLog,v 1.14 2009/08/13 06:32:34 ssuominen Exp $
 
 *kyra-2.1.3_p20090813 (13 Aug 2009)
 
   13 Aug 2009; Samuli Suominen <ssuominen@gentoo.org>
-  +kyra-2.1.3_p20090813.ebuild:
+  +kyra-2.1.3_p20090813.ebuild, +files/kyra-2.1.3_p20090813-compile.patch:
   Version bump.
 
   16 Jan 2009; Tupone Alfredo <tupone@gentoo.org>
diff --git a/dev-games/kyra/Manifest b/dev-games/kyra/Manifest
index 68b45d87fb23..6c23c76ad919 100644
--- a/dev-games/kyra/Manifest
+++ b/dev-games/kyra/Manifest
@@ -1,10 +1,10 @@
 AUX kyra-2.0.7-gcc41.patch 1625 RMD160 427622ba0a08623ca6b59d497dc3cda65f746cce SHA1 4e7df5958c92e8100a618becb32f782c5e80efb1 SHA256 a6e6da8256d051632f1659e74ca3822ce2b457309e8fadcccb0b633eb51f4819
 AUX kyra-2.0.7-gcc43.patch 728 RMD160 777167a023dcc4ad57ddcdfc45b471144da94394 SHA1 59bbdb87bb72e65dc7c0437d006ea0b91d6d17c8 SHA256 0c2a196670940b8da1e87837eef1663ca67b96190fb33ee0957dea2444f30715
 AUX kyra-2.0.7-sdl.patch 467 RMD160 b9735ca6ac0bfed805bb575ed2438849040e2c3a SHA1 73bc37d7f8bea10c0b30988b7a1a3b5fc7b0533c SHA256 c27531b9db4acaca978b0c474bf9ee88d0ea618ab6daa1b3b94b30c4781beca4
-DIST kyra-2.1.3_p20090813-build.patch.bz2 16444 RMD160 b6eae52b201c55b123bc96b7fd5b0c7eb0a0bddb SHA1 4699a9ae2ae18d914a9ef2a20e28fa441a7d1657 SHA256 00cd487cb0ce6c46c80adc8c868f02e99df6bd94247c70b22ee32e5115eb9bc2
+AUX kyra-2.1.3_p20090813-compile.patch 9223 RMD160 4d63ed29991fc4eaf4559b8c2264e85eba89f904 SHA1 488a337eb4ca81759ee379e68216dd10047a1421 SHA256 298b2f7c49a9dad421550f579df4f6ab2d8b23c48aca5bbddf5a3d307fa8e0a8
 DIST kyra-2.1.3_p20090813.tar.bz2 2230937 RMD160 183681ea9c8cada35e97959c051a67ab3183bae6 SHA1 09b793ed0a12c5d722ee820ddfa4d8f5e48de1ec SHA256 acc6903d52f534c8e3b3ed3c692ddb43d377f3bc81eb6f8dcbfbcb9bf2c5d8da
 DIST kyra_src_2_0_7.tar.gz 1994743 RMD160 e9e78a67d452cdc5082da5e16113f4ccd910c70b SHA1 09e02a072aa3db874593e65c0255842df3e379c4 SHA256 63502490ed5e0a0c1c7fb68410412ab498eb3b26898ec7ebdd328845bba114c6
 EBUILD kyra-2.0.7.ebuild 902 RMD160 2932f8dd761ab5097a12e1fa10f787b004658e48 SHA1 ba0e9fb7418eb5cda580b010147cb5bea12c7801 SHA256 3ad3db4404837c39129811f19cdd9eab8de3643a44499dbbfb4cdd16fd051ed6
-EBUILD kyra-2.1.3_p20090813.ebuild 872 RMD160 ce5d8b0efd2ed1f7dbb21bea6b7eabfa7ba0db9a SHA1 4484f952a3c80652a604a86704737cebe9b47415 SHA256 c9d0195c98d176469f1425e10e65c5c8d78e0c553b56bf4095ddf35c5b78e391
-MISC ChangeLog 1589 RMD160 f01c6cc2683d1566a2ee723e45c0cbd9d2f60e8b SHA1 e0650331ed894593fcab4dc275eb86e93ef918d9 SHA256 87d623824936e2fd053c03124591e11cda074dc20c7bb86f2658c02b96074a57
+EBUILD kyra-2.1.3_p20090813.ebuild 837 RMD160 a2b35bd6e736411ad1b064b6968cc43ba10ac591 SHA1 5909e6638582372a4d0f919d35021a7df966e5e5 SHA256 9f5e91587691de7b326ef848da5f825daef522890ce500ea197112a74c3bf5ad
+MISC ChangeLog 1632 RMD160 9656c7036e08d28b1ce407e9c92b7c68c5d6bab3 SHA1 5631979d62041d0916b28b6aa23409bdd09e4b29 SHA256 d61d18335c352938f5719dfe5319c4be5b6ab9663bf162e5dd45baa015dd3643
 MISC metadata.xml 2481 RMD160 09171f66958637e45994da3a50375877b59f9d62 SHA1 421d6b3e519d70201cf79da93d118f2e03061f0d SHA256 6e4d5c1d2524111ca002698be79bc8647a630602a0318ce3f66a8aa865194937
diff --git a/dev-games/kyra/files/kyra-2.1.3_p20090813-compile.patch b/dev-games/kyra/files/kyra-2.1.3_p20090813-compile.patch
new file mode 100644
index 000000000000..9f0fcf06c676
--- /dev/null
+++ b/dev-games/kyra/files/kyra-2.1.3_p20090813-compile.patch
@@ -0,0 +1,285 @@
+diff -ur kyra.orig/configure.in kyra/configure.in
+--- kyra.orig/configure.in	2006-07-21 04:54:05.000000000 +0300
++++ kyra/configure.in	2009-08-13 09:32:42.000000000 +0300
+@@ -82,7 +82,6 @@
+ AC_SUBST(KYRA_LIBS)
+ 
+ AC_OUTPUT(	Makefile
+-          	tinyxml/Makefile
+ 			util/Makefile
+ 	  		gui/Makefile
+ 			guiExtended/Makefile
+diff -ur kyra.orig/encoder/main.cpp kyra/encoder/main.cpp
+--- kyra.orig/encoder/main.cpp	2006-08-20 01:30:50.000000000 +0300
++++ kyra/encoder/main.cpp	2009-08-13 09:32:42.000000000 +0300
+@@ -29,9 +29,9 @@
+ 	The full text of the license can be found in lgpl.txt
+ */
+ 
++#define TIXML_USE_STL
++#include <tinyxml.h>
+ 
+-
+-#include "../../tinyxml/tinyxml.h"
+ #ifdef _MSC_VER
+ // Disable the no-exception handling warning.
+ #pragma warning( disable : 4530 )
+diff -ur kyra.orig/encoder/Makefile.am kyra/encoder/Makefile.am
+--- kyra.orig/encoder/Makefile.am	2004-03-09 08:41:46.000000000 +0200
++++ kyra/encoder/Makefile.am	2009-08-13 09:32:42.000000000 +0300
+@@ -4,5 +4,5 @@
+ krencoder_LDADD = ../engine/libengine.la \
+ 				  ../util/libutil.la \
+ 				  ../gui/libgui.la \
+-				  ../tinyxml/libtinyxml.la \
++				  -ltinyxml \
+ 				  @SDL_LIBS@ 
+diff -ur kyra.orig/engine/encoder.h kyra/engine/encoder.h
+--- kyra.orig/engine/encoder.h	2006-07-23 06:55:25.000000000 +0300
++++ kyra/engine/encoder.h	2009-08-13 09:32:42.000000000 +0300
+@@ -35,7 +35,9 @@
+ #include "SDL.h"
+ #include <vector>
+ 
+-#include "../../tinyxml/tinyxml.h"
++#define TIXML_USE_STL
++#include <tinyxml.h>
++
+ #ifdef _MSC_VER
+ // Disable the no-exception handling warning.
+ #pragma warning( disable : 4530 )
+diff -ur kyra.orig/engine/imagetree.h kyra/engine/imagetree.h
+--- kyra.orig/engine/imagetree.h	2005-03-31 04:02:38.000000000 +0300
++++ kyra/engine/imagetree.h	2009-08-13 09:32:42.000000000 +0300
+@@ -190,7 +190,7 @@
+ 	void Clear( KrImNode* root );	// delete the entire tree
+ 
+ 	// Recursive hit test walk.
+-	bool KrImageTree::HitTestRec( KrImNode* node, int x, int y, int flags, std::vector<KrImage*>* outputArray, int windowIndex );
++	bool HitTestRec( KrImNode* node, int x, int y, int flags, std::vector<KrImage*>* outputArray, int windowIndex );
+ 
+ 	KrImNode*  root;			// The root to position the window
+ 	KrImNode*  offsetRoot;		// The root as returned to the client
+diff -ur kyra.orig/engine/kyra.h kyra/engine/kyra.h
+--- kyra.orig/engine/kyra.h	2005-03-31 04:02:39.000000000 +0300
++++ kyra/engine/kyra.h	2009-08-13 09:32:42.000000000 +0300
+@@ -72,7 +72,9 @@
+ #include "dataresource.h"
+ 
+ // Tinyxml includes
+-#include "../../tinyxml/tinyxml.h"
++#define TIXML_USE_STL
++#include <tinyxml.h>
++
+ #ifdef _MSC_VER
+ // Disable the no-exception handling warning.
+ #pragma warning( disable : 4530 )
+diff -ur kyra.orig/engine/Makefile.am kyra/engine/Makefile.am
+--- kyra.orig/engine/Makefile.am	2005-04-10 07:58:51.000000000 +0300
++++ kyra/engine/Makefile.am	2009-08-13 09:32:42.000000000 +0300
+@@ -15,10 +15,6 @@
+ 	mkdir -p $(DESTDIR)/$(includedir)/Kyra/guiExtended
+ 	cp ../guiExtended/*.h $(DESTDIR)/$(includedir)/Kyra/guiExtended
+  
+-#and another ... could probably be combined with install-data-hook
+-install-exec-hook:
+-	mkdir -p $(DESTDIR)/$(includedir)/Kyra/tinyxml
+-
+ libengineinclude_HEADERS = action.h \
+ box.h \
+ boxresource.h \
+@@ -84,10 +80,6 @@
+ vault.cpp \
+ namefield.cpp \
+ ogltexture.cpp \
+-../../tinyxml/tinyxml.cpp \
+-../../tinyxml/tinyxmlparser.cpp \
+-../../tinyxml/tinystr.cpp \
+-../../tinyxml/tinyxmlerror.cpp \
+ ../../grinliz/gldebug.cpp \
+ ../../grinliz/glmemorypool.cpp \
+ ../../grinliz/glrandom.cpp \
+@@ -95,5 +87,6 @@
+ ../../grinliz/glperformance.cpp \
+ ../../grinliz/glutil.cpp \
+ ../../grinliz/glmatrix.cpp \
+-../../grinliz/glprime.cpp
++../../grinliz/glprime.cpp \
++../../grinliz/gldynamic.cpp
+ 
+diff -ur kyra.orig/engine/parser.cpp kyra/engine/parser.cpp
+--- kyra.orig/engine/parser.cpp	2005-03-31 04:02:41.000000000 +0300
++++ kyra/engine/parser.cpp	2009-08-13 09:32:42.000000000 +0300
+@@ -29,7 +29,9 @@
+ 	The full text of the license can be found in lgpl.txt
+ */
+ 
+-#include "../../tinyxml/tinyxml.h"
++#define TIXML_USE_STL
++#include <tinyxml.h>
++
+ #ifdef _MSC_VER
+ // Disable the no-exception handling warning.
+ #pragma warning( disable : 4530 )
+diff -ur kyra.orig/guiExtended/progress.h kyra/guiExtended/progress.h
+--- kyra.orig/guiExtended/progress.h	2004-11-21 21:28:32.000000000 +0200
++++ kyra/guiExtended/progress.h	2009-08-13 09:32:42.000000000 +0300
+@@ -43,7 +43,7 @@
+ 	/** if width of the resource is greater then its height then makes
+ 		a horizontal, else makes a vertical progress bar
+ 	*/
+-	KrProgress::KrProgress (int width,
++	KrProgress (int width,
+ 							int height,
+ 							KrRGBA FillColor,
+ 							KrRGBA ChangeColor,
+@@ -53,7 +53,7 @@
+ 	/** if width of the resource is greater then its height then makes
+ 		a horizontal, else makes a vertical progress bar
+ 	*/
+-	KrProgress::KrProgress (int width,
++	KrProgress (int width,
+ 							int height,
+ 							const KrScheme& scheme);
+ 
+diff -ur kyra.orig/isogen/isogen.h kyra/isogen/isogen.h
+--- kyra.orig/isogen/isogen.h	2007-03-27 06:16:45.000000000 +0300
++++ kyra/isogen/isogen.h	2009-08-13 09:32:42.000000000 +0300
+@@ -40,7 +40,8 @@
+ #include "../../grinliz/glgeometry.h"
+ #include "../../grinliz/glcolor.h"
+ 
+-#include "../../tinyxml/tinyxml.h"
++#define TIXML_USE_STL
++#include <tinyxml.h>
+ 
+ enum {
+ 	USE_TEXTURE =	0x01,
+diff -ur kyra.orig/Makefile.am kyra/Makefile.am
+--- kyra.orig/Makefile.am	2005-04-10 07:58:48.000000000 +0300
++++ kyra/Makefile.am	2009-08-13 09:32:42.000000000 +0300
+@@ -1,4 +1,4 @@
+-SUBDIRS = engine gui util guiExtended tinyxml encoder spriteed
++SUBDIRS = engine gui util guiExtended encoder spriteed
+ bin_SCRIPTS = kyra-config 
+ 
+ EXTRA_DIST = ltconfig kyra.m4 kyra.h
+@@ -16,13 +16,13 @@
+ 
+ #and another
+ install-data-hook:
+-	mkdir -p $(includedir)/Kyra/util
+-	cp util/*.h $(includedir)/Kyra/util
+-	cp kyra.h $(includedir)/Kyra
+-	mkdir -p $(includedir)/Kyra/gui
+-	cp gui/*.h $(includedir)/Kyra/gui
+-	mkdir -p $(includedir)/Kyra/guiExtended
+-	cp guiExtended/*.h $(includedir)/Kyra/guiExtended
++	mkdir -p $(DESTDIR)$(includedir)/Kyra/util
++	cp util/*.h $(DESTDIR)$(includedir)/Kyra/util
++	cp kyra.h $(DESTDIR)$(includedir)/Kyra
++	mkdir -p $(DESTDIR)$(includedir)/Kyra/gui
++	cp gui/*.h $(DESTDIR)$(includedir)/Kyra/gui
++	mkdir -p $(DESTDIR)$(includedir)/Kyra/guiExtended
++	cp guiExtended/*.h $(DESTDIR)$(includedir)/Kyra/guiExtended
+  
+ #and another ... could probably be combined with install-data-hook
+ install-exec-hook:
+diff -ur kyra.orig/mapmaker/xmlutil.h kyra/mapmaker/xmlutil.h
+--- kyra.orig/mapmaker/xmlutil.h	2005-03-31 04:03:28.000000000 +0300
++++ kyra/mapmaker/xmlutil.h	2009-08-13 09:32:42.000000000 +0300
+@@ -1,7 +1,9 @@
+ #ifndef MAPMAKER_XMLUTIL_INCLUDED
+ #define MAPMAKER_XMLUTIL_INCLUDED
+ 
+-#include "../tinyxml/tinyxml.h"
++#define TIXML_USE_STL
++#include <tinyxml.h>
++
+ #ifdef _MSC_VER
+ // Disable the no-exception handling warning.
+ #pragma warning( disable : 4530 )
+@@ -68,4 +70,4 @@
+ 	KrSquareWorldMap* worldMap;
+ };
+ 
+-#endif
+\ No newline at end of file
++#endif
+diff -ur kyra.orig/spriteed/dom.cpp kyra/spriteed/dom.cpp
+--- kyra.orig/spriteed/dom.cpp	2005-04-06 08:07:22.000000000 +0300
++++ kyra/spriteed/dom.cpp	2009-08-13 09:32:42.000000000 +0300
+@@ -36,7 +36,9 @@
+ #include "../engine/imagetree.h"
+ #include "../engine/textbox.h"
+ 
+-#include "../../tinyxml/tinyxml.h"
++#define TIXML_USE_STL
++#include <tinyxml.h>
++
+ #ifdef _MSC_VER
+ // Disable the no-exception handling warning.
+ #pragma warning( disable : 4530 )
+diff -ur kyra.orig/spriteed/Makefile.am kyra/spriteed/Makefile.am
+--- kyra.orig/spriteed/Makefile.am	2004-03-09 08:41:46.000000000 +0200
++++ kyra/spriteed/Makefile.am	2009-08-13 09:32:42.000000000 +0300
+@@ -21,6 +21,6 @@
+ 
+ krspriteed_LDADD = ../engine/libengine.la \
+ ../gui/libgui.la \
+-../tinyxml/libtinyxml.la \
++-ltinyxml \
+ ../util/libutil.la \
+ @SDL_LIBS@
+diff -ur kyra.orig/spriteed/sharedstate.h kyra/spriteed/sharedstate.h
+--- kyra.orig/spriteed/sharedstate.h	2006-08-12 23:04:37.000000000 +0300
++++ kyra/spriteed/sharedstate.h	2009-08-13 09:32:42.000000000 +0300
+@@ -40,7 +40,10 @@
+ #endif
+ 
+ #include <string>
+-#include "../../tinyxml/tinyxml.h"
++
++#define TIXML_USE_STL
++#include <tinyxml.h>
++
+ #include "SDL.h"
+ 
+ #include "../engine/color.h"
+diff -ur kyra.orig/spriteed/states.h kyra/spriteed/states.h
+--- kyra.orig/spriteed/states.h	2005-04-06 08:07:22.000000000 +0300
++++ kyra/spriteed/states.h	2009-08-13 09:32:42.000000000 +0300
+@@ -33,7 +33,10 @@
+ #define STATES_INCLUDED
+ 
+ #include "../engine/krmath.h"
+-#include "../../tinyxml/tinyxml.h"
++
++#define TIXML_USE_STL
++#include <tinyxml.h>
++
+ #ifdef _MSC_VER
+ // Disable the no-exception handling warning.
+ #pragma warning( disable : 4530 )
+diff -ur kyra.orig/stitch/main.cpp kyra/stitch/main.cpp
+--- kyra.orig/stitch/main.cpp	2005-04-06 08:07:22.000000000 +0300
++++ kyra/stitch/main.cpp	2009-08-13 09:32:42.000000000 +0300
+@@ -24,7 +24,10 @@
+ #include "stitch.h"
+ #include "../engine/color.h"
+ #include "../engine/painter.h"
+-#include "../../tinyxml/tinyxml.h"
++
++#define TIXML_USE_STL
++#include <tinyxml.h>
++
+ #ifdef _MSC_VER
+ // Disable the no-exception handling warning.
+ #pragma warning( disable : 4530 )
+@@ -444,4 +447,4 @@
+ 	SDL_FreeSurface( s );
+ 	SDL_Quit();
+ 	return 0;
+-}
+\ No newline at end of file
++}
diff --git a/dev-games/kyra/kyra-2.1.3_p20090813.ebuild b/dev-games/kyra/kyra-2.1.3_p20090813.ebuild
index c96637c14a6b..d41174809876 100644
--- a/dev-games/kyra/kyra-2.1.3_p20090813.ebuild
+++ b/dev-games/kyra/kyra-2.1.3_p20090813.ebuild
@@ -1,14 +1,13 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/kyra/kyra-2.1.3_p20090813.ebuild,v 1.2 2009/08/13 06:10:16 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/kyra/kyra-2.1.3_p20090813.ebuild,v 1.3 2009/08/13 06:32:34 ssuominen Exp $
 
 EAPI=2
 inherit autotools eutils
 
 DESCRIPTION="Kyra Sprite Engine"
 HOMEPAGE="http://www.grinninglizard.com/kyra/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2
-	mirror://gentoo/${P}-build.patch.bz2"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -23,7 +22,7 @@ DEPEND="media-libs/libsdl[opengl?]
 S=${WORKDIR}/${PN}
 
 src_prepare() {
-	epatch "${WORKDIR}"/${P}-build.patch
+	epatch "${FILESDIR}"/${P}-compile.patch
 	eautoreconf
 }