[games-action/exception_conflict] updated exception_conflict-1.09.ebuild

[games-action/exception_conflict]	new Manifest
[games-action/exception_conflict]	removed exception_conflict-1.03.ebuild
[games-action/exception_conflict]	added files/exception_conflict-1.09-boost.patch
[games-action/exception_conflict]	renamed files/disable-netplay-1.09.patch -> games-action/exception_conflict/files/exception_conflict-1.09-disable-netplay.patch
[games-action/exception_conflict]	renamed files/gcc-4.3-fixes-1.09.patch -> games-action/exception_conflict/files/exception_conflict-1.09-gcc-4.3-fixes.patch
[games-action/exception_conflict]	added files/exception_conflict-1.09-libpng14.patch
[games-action/exception_conflict]	renamed files/linuxfixes-1.09.patch -> games-action/exception_conflict/files/exception_conflict-1.09-linuxfixes.patch
[games-action/exception_conflict]	removed files/gcc-4.3-fixes.patch
[games-action/exception_conflict]	removed files/linuxfixes.patch

10 files changed, 75 insertions, 176 deletions

diff --git a/games-action/exception_conflict/Manifest b/games-action/exception_conflict/Manifest
index e90b2bc..3f33d76 100644
--- a/games-action/exception_conflict/Manifest
+++ b/games-action/exception_conflict/Manifest
@@ -1,11 +1,10 @@
-AUX disable-netplay-1.09.patch 1116 RMD160 a804f0772917c727e0e39fe1b31794c7c8d91d96 SHA1 24263d64edde9d8229a8098bde22595a52f524a6 SHA256 46e7a5ecb2f21c878dd3534003f2a2ddf174ed9762483f4aeb25f0c618d93554
+AUX exception_conflict-1.09-boost.patch 627 RMD160 ee292ffa6696b8fe1b4f7dcfab63b313e911ebd2 SHA1 4ffd45a686ec1b930a72d98ab3e147181c5c6bfa SHA256 8137648f94da7210f0085008f9d939f7bf67449d0234ffde09009d0ce608497e
+AUX exception_conflict-1.09-disable-netplay.patch 1116 RMD160 a804f0772917c727e0e39fe1b31794c7c8d91d96 SHA1 24263d64edde9d8229a8098bde22595a52f524a6 SHA256 46e7a5ecb2f21c878dd3534003f2a2ddf174ed9762483f4aeb25f0c618d93554
+AUX exception_conflict-1.09-gcc-4.3-fixes.patch 957 RMD160 c2c7bc51255ccecf776a8d4e890506284757a5e4 SHA1 1e20255c1e559cda05e5e4070050a5e8f82e427e SHA256 b5862b0c8d8363f44d7f077e46453e3230c4a99c9dc9aabd5fca16393ccec53c
+AUX exception_conflict-1.09-libpng14.patch 1648 RMD160 0cea28b563de684bf166e3232b8878f52a9b5e2a SHA1 d2c41872b23c810f6ba7784f5e7dbe64ee8f3e93 SHA256 69576b6eb0d928293f5de8419ef343194761ec55743481c2f035ffba4e2c4434
+AUX exception_conflict-1.09-linuxfixes.patch 4080 RMD160 8787d194fae7c15f39f00cdff05e5d594925bd1b SHA1 945a1c2e62361405025ed216f072c0a64eda9792 SHA256 0dda3880fc0d12924c7367e6544c25362bf289c2cabf51afa4b053b575b86677
 AUX exception_conflict.png 460 RMD160 ce0a75146ea496af0deb7413284d7e729cf5ec04 SHA1 f92ce0bce71d8aeb6947b06d911c1e3b5fca31d0 SHA256 5b7669748610345803494e590a33beeaa0c1b94bd7344c8506e3b47bfac340b2
-AUX gcc-4.3-fixes-1.09.patch 957 RMD160 c2c7bc51255ccecf776a8d4e890506284757a5e4 SHA1 1e20255c1e559cda05e5e4070050a5e8f82e427e SHA256 b5862b0c8d8363f44d7f077e46453e3230c4a99c9dc9aabd5fca16393ccec53c
-AUX gcc-4.3-fixes.patch 343 RMD160 b5438beec5a81f8eaf6630f040e8dc8d15cf6886 SHA1 69cfe2910e77b6ba1b80ea1dd49e4c9e9548fa08 SHA256 9a7733fa0766bb2a4d262cf517c1a19cf5bd7cec15ba31d8e584fc7a0568ad5b
-AUX linuxfixes-1.09.patch 4080 RMD160 8787d194fae7c15f39f00cdff05e5d594925bd1b SHA1 945a1c2e62361405025ed216f072c0a64eda9792 SHA256 0dda3880fc0d12924c7367e6544c25362bf289c2cabf51afa4b053b575b86677
-AUX linuxfixes.patch 3021 RMD160 25a591adaddf53a44a81ca0bc6496e8b521d678f SHA1 5b7794f0bc2eb4bef49e102da3952cde269b8aff SHA256 bc4aaf1b560c305a6ed9a661e14fc6ddb1eb779909cf6342bbbde77f8fc6e89e
 DIST 109.zip 1310305 RMD160 8bcd9f12275096e92fc9101230297b5ff055f8e7 SHA1 21b877bff1fe4a8cef0018b91919d850a427f9d6 SHA256 98630bebadd29003e2a2d990688734d71f07c3c171156fed5b1bb80f98208b29
 DIST exception_conflict.zip 41706682 RMD160 2092d6e1328b7ceed1efdf0b15be83ff295ad521 SHA1 f3be89eac3fd567559ebeb9749b60bdc4b5fcb4c SHA256 b41ad9ccfdaf73213ead858faf0db0f02fb9fb8b1b64d5f2d5b2a94ad28b054f
-EBUILD exception_conflict-1.03.ebuild 1381 RMD160 6df59ca577535fa0f8254f4aaf8e81133f855f73 SHA1 43ba725e20bb52bd1064d3220cf2b178330c6aaa SHA256 44099b0182d2cf5af8bdfbf3f688f0811b23c60c881c69d147bae26ca6994f3b
-EBUILD exception_conflict-1.09.ebuild 1536 RMD160 bb24a71ac1eef4b91a91eb71df93b0bcc9abcc3b SHA1 e86a990e1ebea22a960dcec6f1ae94152f334b10 SHA256 3f3efa8e622b6b1b83979ab4694f729273678322322d6321ddce030164b0e82c
+EBUILD exception_conflict-1.09.ebuild 1422 RMD160 22bb22332a60280f3fc511d757c599c0df3665e4 SHA1 56b7ecf30954601af61ec304bef4191b4725b24a SHA256 d4fbfa9fafb86bbb0448d941016f405bdee9734590171e1b207663940b92d1c3
 MISC metadata.xml 249 RMD160 220cde0fc1a8d7d355705f0f6772bd8d77cdc17a SHA1 34b33eb8d24cd8bfef2ddfb8e80334fd77cc9488 SHA256 3875fd5008d7f5bfe7f3cf7bf330c209a5034f5988d37c1699fb3be35a7be906
diff --git a/games-action/exception_conflict/exception_conflict-1.03.ebuild b/games-action/exception_conflict/exception_conflict-1.03.ebuild
deleted file mode 100644
index ffc7d12..0000000
--- a/games-action/exception_conflict/exception_conflict-1.03.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=2
-inherit eutils games
-
-DESCRIPTION="outstanding shmup using opengl and sdl"
-HOMEPAGE="http://i-saint.skr.jp/exception_conflict/"
-SRC_URI="http://xes.plala.jp/demo4/g4033/${PN}.zip"
-
-LICENSE="${PN}"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-RDEPEND="media-libs/libsdl
-	media-libs/ftgl
-	media-libs/freetype
-	media-libs/libpng
-	dev-ruby/rake
-	virtual/opengl
-	dev-libs/boost
-	media-libs/glew
-	media-libs/freeglut
-	media-libs/sdl-mixer"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${PN}/src
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	unzip src.zip
-}
-
-src_prepare(){
-	cd "${S}"/src
-	epatch "${FILESDIR}"/linuxfixes.patch
-	epatch "${FILESDIR}"/gcc-4.3-fixes.patch
-	sed -i -e "s:resource/:"${GAMES_DATADIR}"/"${PN}"/resource/:" -i app.cc
-	sed -i -e "s:resource/:"${GAMES_DATADIR}"/"${PN}"/resource/:" -i resource.cc
-
-}
-
-src_compile() {
-	cd "${S}"/src
-	rake || die
-}
-
-src_install() {
-	dogamesbin "${S}"/src/${PN} || die "dogamesbin ${PN} failed"
-
-	local datadir="${GAMES_DATADIR}"/"${PN}"
-	dodir ${datadir}
-	insinto "${datadir}"
-	doins -r "${WORKDIR}"/${PN}/resource || die "doins resource failed"
-
-	newicon "${FILESDIR}"/"${PN}.png" "${PN}.png"
-	make_desktop_entry "${PN}" "${PN}"
-	dodoc "${WORKDIR}"/${PN}/copyrights || die
-	prepgamesdirs
-}
-
-pkg_postinst() {
-	games_pkg_postinst
-}
diff --git a/games-action/exception_conflict/exception_conflict-1.09.ebuild b/games-action/exception_conflict/exception_conflict-1.09.ebuild
index 958be8e..eb8b217 100644
--- a/games-action/exception_conflict/exception_conflict-1.09.ebuild
+++ b/games-action/exception_conflict/exception_conflict-1.09.ebuild
@@ -38,9 +38,7 @@ src_unpack() {
 
 src_prepare(){
 	cd "${S}"/src
-	epatch "${FILESDIR}"/linuxfixes-${PV}.patch
-	epatch "${FILESDIR}"/gcc-4.3-fixes-${PV}.patch
-	epatch "${FILESDIR}"/disable-netplay-${PV}.patch
+	epatch "${FILESDIR}"/${P}-*
 	sed -i -e "s:resource/:"${GAMES_DATADIR}"/"${PN}"/resource/:" -i app.cc
 	sed -i -e "s:resource/:"${GAMES_DATADIR}"/"${PN}"/resource/:" -i resource.cc
 
diff --git a/games-action/exception_conflict/files/exception_conflict-1.09-boost.patch b/games-action/exception_conflict/files/exception_conflict-1.09-boost.patch
new file mode 100644
index 0000000..403b633
--- /dev/null
+++ b/games-action/exception_conflict/files/exception_conflict-1.09-boost.patch
@@ -0,0 +1,20 @@
+diff -Naur src/interface.h src/interface.h
+--- src/interface.h	2009-01-20 17:26:16.000000000 +0100
++++ src/interface.h	2009-12-06 11:02:28.000000000 +0100
+@@ -27,6 +27,7 @@
+ #include <boost/smart_ptr.hpp>
+ #include <boost/any.hpp>
+ #include <boost/regex.hpp>
++#include <boost/lexical_cast.hpp>
+ 
+ #include <ist/iterator.h>
+ #include <ist/ist_i3d.h>
+diff -Naur src/thread_specific.h src/thread_specific.h
+--- src/thread_specific.h	2009-01-08 03:23:22.000000000 +0100
++++ src/thread_specific.h	2009-12-06 11:02:51.000000000 +0100
+@@ -1,4 +1,5 @@
+ #include "stdafx.h"
++#include <boost/lexical_cast.hpp>
+ 
+ namespace exception {
+ 
diff --git a/games-action/exception_conflict/files/disable-netplay-1.09.patch b/games-action/exception_conflict/files/exception_conflict-1.09-disable-netplay.patch
index 4f1bf68..4f1bf68 100644
--- a/games-action/exception_conflict/files/disable-netplay-1.09.patch
+++ b/games-action/exception_conflict/files/exception_conflict-1.09-disable-netplay.patch
diff --git a/games-action/exception_conflict/files/gcc-4.3-fixes-1.09.patch b/games-action/exception_conflict/files/exception_conflict-1.09-gcc-4.3-fixes.patch
index f03eff0..f03eff0 100644
--- a/games-action/exception_conflict/files/gcc-4.3-fixes-1.09.patch
+++ b/games-action/exception_conflict/files/exception_conflict-1.09-gcc-4.3-fixes.patch
diff --git a/games-action/exception_conflict/files/exception_conflict-1.09-libpng14.patch b/games-action/exception_conflict/files/exception_conflict-1.09-libpng14.patch
new file mode 100644
index 0000000..c239985
--- /dev/null
+++ b/games-action/exception_conflict/files/exception_conflict-1.09-libpng14.patch
@@ -0,0 +1,48 @@
+diff -Naur exception_conflict/src/src/lib/ist/bitmap.cc exception_conflict-p//src/src/lib/ist/bitmap.cc
+--- exception_conflict/src/src/lib/ist/bitmap.cc	2008-12-31 18:41:14.000000000 +0100
++++ exception_conflict-p//src/src/lib/ist/bitmap.cc	2010-07-20 12:55:16.000000000 +0200
+@@ -416,7 +416,7 @@
+   png_infop info_ptr = png_create_info_struct(png_ptr);
+   if(info_ptr==0) {
+     fclose(fp);
+-    png_destroy_read_struct(&png_ptr, png_infopp_NULL, png_infopp_NULL);
++    png_destroy_read_struct(&png_ptr, NULL, NULL);
+     return false;
+   }
+ 
+@@ -426,7 +426,7 @@
+   int bit_depth, color_type, interlace_type;
+ 
+   png_read_info(png_ptr, info_ptr);
+-  png_get_IHDR(png_ptr, info_ptr, &w, &h, &bit_depth, &color_type, &interlace_type, int_p_NULL, int_p_NULL);
++  png_get_IHDR(png_ptr, info_ptr, &w, &h, &bit_depth, &color_type, &interlace_type, NULL, NULL);
+ 
+   resize(w, h);
+ 
+@@ -436,7 +436,7 @@
+     png_set_palette_to_rgb(png_ptr);
+   }
+   if(color_type == PNG_COLOR_TYPE_GRAY && bit_depth<8) {
+-    png_set_gray_1_2_4_to_8(png_ptr);
++    png_set_expand_gray_1_2_4_to_8(png_ptr);
+   }
+   if(png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)) {
+     png_set_tRNS_to_alpha(png_ptr);
+@@ -478,7 +478,7 @@
+   }
+ 
+   png_read_end(png_ptr, info_ptr);
+-  png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL);
++  png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
+   fclose(fp);
+   return true;
+ 
+@@ -505,7 +505,7 @@
+   png_infop info_ptr = png_create_info_struct(png_ptr);
+   if(info_ptr==0) {
+     fclose(fp);
+-    png_destroy_write_struct(&png_ptr,  png_infopp_NULL);
++    png_destroy_write_struct(&png_ptr,  NULL);
+     return false;
+   }
+ 
diff --git a/games-action/exception_conflict/files/linuxfixes-1.09.patch b/games-action/exception_conflict/files/exception_conflict-1.09-linuxfixes.patch
index 5744b32..5744b32 100644
--- a/games-action/exception_conflict/files/linuxfixes-1.09.patch
+++ b/games-action/exception_conflict/files/exception_conflict-1.09-linuxfixes.patch
diff --git a/games-action/exception_conflict/files/gcc-4.3-fixes.patch b/games-action/exception_conflict/files/gcc-4.3-fixes.patch
deleted file mode 100644
index 22fdd62..0000000
--- a/games-action/exception_conflict/files/gcc-4.3-fixes.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur src/lib/ist/bstream.h src-p/lib/ist/bstream.h
---- src/lib/ist/bstream.h	2009-07-15 10:20:37.000000000 +0200
-+++ src-p/lib/ist/bstream.h	2009-07-15 10:19:14.000000000 +0200
-@@ -8,6 +8,7 @@
- #include <algorithm>
- #include <iostream>
- #include <fstream>
-+#include <cstring>
- #ifdef IST_BSTREAM_ENABLE_ZLIB
-   #include <zlib.h>
- #endif
diff --git a/games-action/exception_conflict/files/linuxfixes.patch b/games-action/exception_conflict/files/linuxfixes.patch
deleted file mode 100644
index 4d2f6ff..0000000
--- a/games-action/exception_conflict/files/linuxfixes.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-diff -Naur src/character/rule_base.h src-diff/character/rule_base.h
---- src/character/rule_base.h	2008-12-31 18:41:14.000000000 +0100
-+++ src-diff/character/rule_base.h	2009-04-17 14:10:31.000000000 +0200
-@@ -68,7 +68,7 @@
-     ~RuleBase()
-     {
-       g_round2 = false;
--      g_rand.reset();
-+//      g_rand.reset();
-     }
- 
-     float getDrawPriority() { return 10.0f; }
-diff -Naur src/game.h src-diff/game.h
---- src/game.h	2009-01-04 01:05:04.000000000 +0100
-+++ src-diff/game.h	2009-04-17 14:10:12.000000000 +0200
-@@ -82,7 +82,9 @@
-       
-     void save()
-     {
--      FILE *f = fopen("config", "wb");
-+      char path[PATH_MAX];
-+      snprintf(path, PATH_MAX, "%s/.exception_conflict/config", getenv("HOME"));
-+      FILE *f = fopen(path, "wb");
-       if(!f) {
-         return;
-       }
-@@ -143,7 +145,9 @@
- 
-     void load()
-     {
--      FILE *in = fopen("config", "rb");
-+      char path[PATH_MAX];
-+      snprintf(path, PATH_MAX, "%s/.exception_conflict/config", getenv("HOME"));
-+      FILE *in = fopen(path, "rb");
-       if(!in) {
-         return;
-       }
-diff -Naur src/lib/sgui/sgui.h src-diff/lib/sgui/sgui.h
---- src/lib/sgui/sgui.h	2009-01-04 13:33:14.000000000 +0100
-+++ src-diff/lib/sgui/sgui.h	2009-04-17 14:21:29.000000000 +0200
-@@ -23,7 +23,7 @@
-   #include <dirent.h>
- #endif
- #include <boost/thread.hpp>
--#include <FTGL/FTGLTextureFont.h>
-+#include <FTGL/ftgl.h>
- #include <SDL/SDL.h>
- #include "sgui.h"
- 
-diff -Naur src/main.cc src-diff/main.cc
---- src/main.cc	2009-01-01 19:13:42.000000000 +0100
-+++ src-diff/main.cc	2009-04-17 14:41:33.000000000 +0200
-@@ -56,6 +56,9 @@
-   char *hoge = new char[128];
- #endif
- 
-+  char cfg_path[PATH_MAX];
-+  snprintf(cfg_path, PATH_MAX, "%s/.exception_conflict/", getenv("HOME"));
-+  mkdir(cfg_path, 0755);
- 
- #ifdef WIN32
-   while(FindProcess("updater.exe")) {
-diff -Naur src/Rakefile src-diff/Rakefile
---- src/Rakefile	2009-01-01 19:13:42.000000000 +0100
-+++ src-diff/Rakefile	2009-04-17 14:26:47.000000000 +0200
-@@ -4,7 +4,7 @@
- 
- CFLAGS = "-O2 -I ./ -I lib #{`freetype-config --cflags`} #{`sdl-config --cflags`}".gsub(/\n/, '')
- LFLAGS = ''
--LIBS = "-L lib/ist -L lib/sgui -lsgui -list -lboost_regex-gcc41-mt -lboost_date_time-gcc41-mt -lboost_system-gcc41-mt -lboost_thread-gcc41-mt -lz -lpng -lGL -lGLU -lGLEW -lftgl #{`sdl-config --libs`} -lSDL_mixer #{`freetype-config --libs`}".gsub(/\n/, '')
-+LIBS = "-L lib/ist -L lib/sgui -lsgui -list -lboost_regex-mt -lboost_date_time-mt -lboost_system-mt -lboost_thread-mt -lz -lpng -lGL -lGLU -lGLEW -lftgl #{`sdl-config --libs`} -lSDL_mixer #{`freetype-config --libs`}".gsub(/\n/, '')
- CC = 'g++'
- 
- SRCS = Dir.glob("{.,character}/*.cc")
-@@ -25,11 +25,10 @@
- 
- 
- task "default" => "all"
--task "all" => ["ist", "sgui", "exception"]
-+task "all" => ["ist", "sgui", "exception_conflict"]
- 
--file "exception" => OBJS do |t|
-+file "exception_conflict" => OBJS do |t|
-   sh "#{CC} -o #{t.name} #{t.prerequisites.join(' ')} #{CFLAGS} #{LIBS}"
--  sh "cp #{t.name} ../#{t.name}"
- end
- 
- rule ".o" => ".cc" do |t|