dev-games/game-editor: Patch file removed and fix src_prepare

svn path=/sunrise/; revision=10330

4 files changed, 13 insertions, 82 deletions

diff --git a/dev-games/game-editor/ChangeLog b/dev-games/game-editor/ChangeLog
index 0c0c8a262..3cecb3089 100644
--- a/dev-games/game-editor/ChangeLog
+++ b/dev-games/game-editor/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  22 Mar 2010; Angelo D'Autilia (sYdRo) <sydro@salug.it>
+  game-editor-9999.ebuild, -files/game-editor-9999.patch:
+  Patch file removed and fix src_prepare
+
   05 Mar 2010; Angelo D'Autilia (sYdRo) <sydro@salug.it>
   +game-editor-9999.ebuild, +files/game-editor-9999.patch, +metadata.xml:
   New ebuild for bug 289276
diff --git a/dev-games/game-editor/Manifest b/dev-games/game-editor/Manifest
index f1b251ae2..8e29c10b4 100644
--- a/dev-games/game-editor/Manifest
+++ b/dev-games/game-editor/Manifest
@@ -1,4 +1,3 @@
-AUX game-editor-9999.patch 3517 RMD160 5d9844a237253b550e40ecbe59a8dad35a136949 SHA1 83870269457213db01334de9bb9e073a9f3761cb SHA256 707c20fbe065d302554da963e2e781f6bb2c9aa4c1859689ab83a7a179dc4c74
-EBUILD game-editor-9999.ebuild 608 RMD160 b5294239e1ac4bbdcc4499049c2c08707529f639 SHA1 956d4ce2bfdbf3b93de5326ee140c804603902d2 SHA256 6e3a52e388d1e9d26ee99895c049dc7f25559c2e8042b0a7b383252ffd0309b2
-MISC ChangeLog 282 RMD160 8617238d510d475d7f067464606f1f74be942bb9 SHA1 fe8d1354ba37eb40ed61ea42a16f70a3d814c8b8 SHA256 68dc8402df43f6a6c351a04e40a724e99211340f74e1d34bfe701d999dfb0811
+EBUILD game-editor-9999.ebuild 1076 RMD160 827d4985e4bb7bae42f626b40d88f048713ae6a3 SHA1 66500226763081707553160361cf42090cb615e1 SHA256 73659447e6a154a399a32ca862b5c880003548934bc20a84211aad52529b08c8
+MISC ChangeLog 439 RMD160 5ffa78da69bc4b49b404c8deeef5ae69bd8be87f SHA1 881f50330da43a8c470c2d5609a8632dac57e2e7 SHA256 fd0eab6c81f5809e791f3e3a0571036b4734fb3d272c106bb2ed7961fffe8f9e
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
diff --git a/dev-games/game-editor/files/game-editor-9999.patch b/dev-games/game-editor/files/game-editor-9999.patch
deleted file mode 100644
index 12a655480..000000000
--- a/dev-games/game-editor/files/game-editor-9999.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-diff -ruN -x .svn game_editor-origin/gameEditor/FunctionPanel.cpp game_editor-fixed/gameEditor/FunctionPanel.cpp
---- game_editor-origin/gameEditor/FunctionPanel.cpp	2010-03-02 15:50:39.000000000 +0100
-+++ game_editor-fixed/gameEditor/FunctionPanel.cpp	2010-03-02 15:41:02.000000000 +0100
-@@ -210,7 +210,7 @@
- 	EditorDirectory editDir;

- 

- 	TiXmlDocument doc;

--	if(!doc.LoadFile("functions.xml")) return false;

-+	if(!doc.LoadFile("/usr/share/games/game-editor/functions.xml")) return false;

- 	

- 	//Check tree

- 	TiXmlElement* root = NULL;

-@@ -1213,4 +1213,4 @@
- }

- 

- 

--#endif
-\ No newline at end of file
-+#endif

-diff -ruN -x .svn game_editor-origin/gameEditor/makefile.editor game_editor-fixed/gameEditor/makefile.editor
---- game_editor-origin/gameEditor/makefile.editor	2010-03-02 15:50:39.000000000 +0100
-+++ game_editor-fixed/gameEditor/makefile.editor	2010-03-02 15:46:13.000000000 +0100
-@@ -10,7 +10,7 @@
- CFLAGS = $(INCS) $(TARGET) -DNO_STDIO_REDIRECT -DNO_LONG_LONG -DNO_DIRENT -DNO_FCNTL -DNO_STAT -DNO_UNISTD -DNO_TERMIOS -DNO_PIPE -DNO_POSIX -DNO_LONGLONG -DNO_HISTORY $(BUILD_TYPE) $(GAMEEDITOR_TYPE)

- 

- ifeq (,$(findstring LLVM,$(TARGET)))

--        LIBSYSTEM = -lstdc++ -lpthread -lX11 /usr/lib32/libXext.so

-+        LIBSYSTEM = -lstdc++ -lpthread -lX11 /usr/lib/libXext.so

-         CL=$(CC)

-         CLFLAGS=$(CFLAGS)

- else

-diff -ruN -x .svn game_editor-origin/gameEngine/EditBox.cpp game_editor-fixed/gameEngine/EditBox.cpp
---- game_editor-origin/gameEngine/EditBox.cpp	2010-03-02 15:52:30.000000000 +0100
-+++ game_editor-fixed/gameEngine/EditBox.cpp	2010-03-02 15:43:46.000000000 +0100
-@@ -264,7 +264,7 @@
- 		EditorDirectory dir;

- 

- 		icon = new Actor("ged_VariableSelector_icon", this);

--		icon->AddAnimation("icon", "b_xy.png", 1, 1);

-+		icon->AddAnimation("icon", "/usr/share/games/game-editor/b_xy.png", 1, 1);

- 		icon->SetPos(9 + (Width() - icon->Width()) / 2, 10 + (Height() - icon->Height()) / 2);

- 		icon->getSprite()->SetHitTest(false);	

- 	}

-diff -ruN -x .svn game_editor-origin/gameEngine/GameControl.cpp game_editor-fixed/gameEngine/GameControl.cpp
---- game_editor-origin/gameEngine/GameControl.cpp	2010-03-02 15:52:30.000000000 +0100
-+++ game_editor-fixed/gameEngine/GameControl.cpp	2010-03-02 15:42:06.000000000 +0100
-@@ -859,7 +859,7 @@
- 

- #define EDITOR_FRAME_RATE 120 //Use >= 60 to avoid flick in editor mode

- 

--gedString EDITOR_DAT("editor.dat");

-+gedString EDITOR_DAT("/usr/share/games/game-editor/editor.dat");

- 

- gedString AXIS_NAME("Axis");

- gedString REGION_NAME("gedRegion");

-diff -ruN -x .svn game_editor-origin/wxGameEditor/Behavior/wxJigsawEditor/wxJigsawEditorMainFrame.cpp game_editor-fixed/wxGameEditor/Behavior/wxJigsawEditor/wxJigsawEditorMainFrame.cpp
---- game_editor-origin/wxGameEditor/Behavior/wxJigsawEditor/wxJigsawEditorMainFrame.cpp	2010-03-02 15:52:23.000000000 +0100
-+++ game_editor-fixed/wxGameEditor/Behavior/wxJigsawEditor/wxJigsawEditorMainFrame.cpp	2010-03-02 15:40:36.000000000 +0100
-@@ -535,7 +535,7 @@
- 

- void wxJigsawEditorMainFrame::LoadConfig()

- {

--	wxString configFileName = wxT("config.xml");

-+	wxString configFileName = wxT("/usr/share/game/game-editor/config.xml");

- 	if(wxFileExists(configFileName))

- 	{

- 		m_XmlIO.DeserializeFromXml(configFileName);

-@@ -544,7 +544,7 @@
- 

- void wxJigsawEditorMainFrame::SaveConfig()

- {

--	wxString configFileName = wxT("config.xml");

-+	wxString configFileName = wxT("/usr/share/game/game-editor/config.xml");

- 	m_XmlIO.SerializeToXml(configFileName, true);

- }

- 

diff --git a/dev-games/game-editor/game-editor-9999.ebuild b/dev-games/game-editor/game-editor-9999.ebuild
index 3af6d9fcd..ab173f3a2 100644
--- a/dev-games/game-editor/game-editor-9999.ebuild
+++ b/dev-games/game-editor/game-editor-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="2"
 
-inherit games subversion
+inherit games multilib subversion
 
 DESCRIPTION="2D Game editor"
 HOMEPAGE="http://game-editor.com"
@@ -12,7 +12,7 @@ ESVN_REPO_URI="https://game-editor.svn.sourceforge.net/svnroot/game-editor/trunk
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~x86"
 IUSE=""
 
 DEPEND="x11-libs/libXext
@@ -20,7 +20,11 @@ DEPEND="x11-libs/libXext
 RDEPEND="${DEPEND}"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}.patch
+	sed -i -e "s:lib32:$(get_libdir):" gameEditor/makefile.editor || die
+	sed -i -e "s:functions.xml:${GAMES_DATADIR}/${PN}/functions.xml:" gameEditor/FunctionPanel.cpp || die
+	sed -i -e "s:b_xy.png:${GAMES_DATADIR}/${PN}/b_xy.png:" gameEngine/EditBox.cpp || die
+	sed -i -e "s:editor.dat:${GAMES_DATADIR}/${PN}/editor.dat:" gameEngine/GameControl.cpp || die
+	sed -i -e "s:config.xml:${GAMES_DATADIR}/${PN}/config.xml:" wxGameEditor/Behavior/wxJigsawEditor/wxJigsawEditorMainFrame.cpp || die
 }
 
 src_install() {