EAPI=2; add gcc44 patch submitted by Fredric Johansson via bug #275791

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

4 files changed, 50 insertions, 24 deletions

diff --git a/dev-games/clanlib/ChangeLog b/dev-games/clanlib/ChangeLog
index 28329eb178c7..15c0291bb30a 100644
--- a/dev-games/clanlib/ChangeLog
+++ b/dev-games/clanlib/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-games/clanlib
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/clanlib/ChangeLog,v 1.44 2008/08/26 20:53:25 nyhm Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-games/clanlib/ChangeLog,v 1.45 2009/08/04 21:24:39 mr_bones_ Exp $
+
+  04 Aug 2009; Michael Sterrett <mr_bones_@gentoo.org> clanlib-0.8.1.ebuild,
+  +files/clanlib-0.8.1-gcc44.patch:
+  EAPI=2; add gcc44 patch submitted by Fredric Johansson via bug #275791
 
   26 Aug 2008; Tristan Heaven <nyhm@gentoo.org> clanlib-0.8.1.ebuild:
   Add missing media-libs/alsa-lib dependency, bug #227509
diff --git a/dev-games/clanlib/Manifest b/dev-games/clanlib/Manifest
index 6079ce5d5d93..4b03644255a8 100644
--- a/dev-games/clanlib/Manifest
+++ b/dev-games/clanlib/Manifest
@@ -1,16 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX clanlib-0.8.1-gcc43.patch 605 RMD160 939a1dd266d570b340e625cc89186fbbedd85773 SHA1 4c21d82abbbecec432db51cfe87315231c5212c4 SHA256 97420cdbef4a3f09b61ddf54881a907616b8c73337928fcdc6e11d783f584320
+AUX clanlib-0.8.1-gcc44.patch 1523 RMD160 e48308b599927ded6cbb49a6ec951ba430ddf775 SHA1 c3ae9bd2a6fb0a33402223e4ede26ff2c5f51abb SHA256 e6b8dc302fc3587fae86d1ecf4ac5fbaf2a0563996887b38ea3f55d84b79e979
 AUX clanlib-0.8.1-ndebug.patch 866 RMD160 1b6febbcb84230627ba3c0d3f6185fec6d517b72 SHA1 b91bb16b0fdd59dec3aad28ba8f0b7c88ddd6261 SHA256 d48bdb0b6dee6b84b139eb951da657fa4d2c8427b9b4e7eb76b41a98e7aaf8d5
 DIST ClanLib-0.8.1.tgz 7629019 RMD160 b4a48861dc5a133052d2acec5172c9291cff2b91 SHA1 5999b9c882efcaf06fd007bb69e659e322b8e155 SHA256 094331dda35b0d263431d1551991eb208d8e969824434925548a9fcd1d34e495
-EBUILD clanlib-0.8.1.ebuild 2075 RMD160 357928aea7c3d37efd9d8d44aa2dcc6baf418e2f SHA1 73952b84bf483a2744665c3598837c82bbf881c0 SHA256 cec2cc55f990c1162eba0d050cd03aa61f3230453a97d07d3bfa21b2d60b469f
-MISC ChangeLog 9160 RMD160 66e2916c9803e9172b008ddd33852f8eb45e301e SHA1 3546a01bcae874c88b1845ca796a5518d0d047c1 SHA256 53713517d6c8a6f29beb908ce0a40ca539bb29a1a6c18526c61e84bbfb054c28
+EBUILD clanlib-0.8.1.ebuild 2061 RMD160 c4fb55ba9410f2ca8b7ea7f35d7694d5e5380ab5 SHA1 67b23377d6f091eb1b0006c58cbe542ad43da8e5 SHA256 8383d24ba93c51226a1d00eed41b94a4ceac0e27007b2c92de5461be12053acc
+MISC ChangeLog 9352 RMD160 8373e16916c97b176b95a21543811538318e708d SHA1 343c841a5b90f1f17b6c8701e52233c41ea94d74 SHA256 f10c91c91a8df1ed38a1172ae38390c86e3e62292cdeaad6829070595f735f4c
 MISC metadata.xml 2920 RMD160 725718878c95be29849b2c3c4f47be9e21e4ea41 SHA1 7b05a6cdc831e23c0679217a14e739acdea504b9 SHA256 390505368337501a27b0d5eb795582bd656627c828d4bb982375fecdfbea8dec
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAki0bUsACgkQdz7hIScOUREL0ACglZfBuk1lJTa27fUbEc/F1t4h
-Q/QAn0Rf4SJztsJYVlYDKeud10w5y4LD
-=ABUx
------END PGP SIGNATURE-----
diff --git a/dev-games/clanlib/clanlib-0.8.1.ebuild b/dev-games/clanlib/clanlib-0.8.1.ebuild
index 1aa60b1a66b0..989d2f45c104 100644
--- a/dev-games/clanlib/clanlib-0.8.1.ebuild
+++ b/dev-games/clanlib/clanlib-0.8.1.ebuild
@@ -1,7 +1,8 @@
-# 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/clanlib/clanlib-0.8.1.ebuild,v 1.4 2008/08/26 20:53:25 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/clanlib/clanlib-0.8.1.ebuild,v 1.5 2009/08/04 21:24:39 mr_bones_ Exp $
 
+EAPI=2
 inherit flag-o-matic eutils
 
 DESCRIPTION="multi-platform game development library"
@@ -34,15 +35,14 @@ DEPEND="${RDEPEND}
 
 S=${WORKDIR}/ClanLib-${PV}
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	epatch \
 		"${FILESDIR}"/${P}-ndebug.patch \
-		"${FILESDIR}"/${P}-gcc43.patch
+		"${FILESDIR}"/${P}-gcc43.patch \
+		"${FILESDIR}"/${P}-gcc44.patch
 }
 
-src_compile() {
+src_configure() {
 	#clanSound only controls mikmod/vorbis so there's
 	# no need to pass --{en,dis}able-clanSound ...
 	#clanDisplay only controls X, SDL, OpenGL plugins
@@ -58,9 +58,7 @@ src_compile() {
 		$(use_enable sdl clanSDL) \
 		$(use_enable vorbis clanVorbis) \
 		$(use_enable mikmod clanMikMod) \
-		$(use_enable ipv6 getaddr) \
-		|| die
-	emake || die "emake failed"
+		$(use_enable ipv6 getaddr)
 }
 
 src_install() {
diff --git a/dev-games/clanlib/files/clanlib-0.8.1-gcc44.patch b/dev-games/clanlib/files/clanlib-0.8.1-gcc44.patch
new file mode 100644
index 000000000000..ddf5a170b027
--- /dev/null
+++ b/dev-games/clanlib/files/clanlib-0.8.1-gcc44.patch
@@ -0,0 +1,33 @@
+diff -Naur ClanLib-0.8.1-old/Sources/GL/canvas_opengl.cpp ClanLib-0.8.1/Sources/GL/canvas_opengl.cpp
+--- ClanLib-0.8.1-old/Sources/GL/canvas_opengl.cpp	2009-08-01 18:15:44.000000000 +0200
++++ ClanLib-0.8.1/Sources/GL/canvas_opengl.cpp	2009-08-01 18:08:55.000000000 +0200
+@@ -48,6 +48,7 @@
+ #include "graphic_context_opengl.h"
+ #include "surface_target_opengl.h"
+ #include <cstring>
++#include <cstdio>
+ 
+ /////////////////////////////////////////////////////////////////////////////
+ // CL_Canvas_OpenGL construction:
+diff -Naur ClanLib-0.8.1-old/Sources/GL/GLX/input_device_linuxevent.cpp ClanLib-0.8.1/Sources/GL/GLX/input_device_linuxevent.cpp
+--- ClanLib-0.8.1-old/Sources/GL/GLX/input_device_linuxevent.cpp	2009-08-01 18:17:25.000000000 +0200
++++ ClanLib-0.8.1/Sources/GL/GLX/input_device_linuxevent.cpp	2009-08-01 18:11:23.000000000 +0200
+@@ -35,6 +35,7 @@
+ #include <iostream>
+ #include <errno.h>
+ #include <cstring>
++#include <cstdio>
+ 
+ #include "API/Core/System/error.h"
+ #include "API/Core/System/clanstring.h"
+diff -Naur ClanLib-0.8.1-old/Sources/GL/GLX/input_device_xinput.cpp ClanLib-0.8.1/Sources/GL/GLX/input_device_xinput.cpp
+--- ClanLib-0.8.1-old/Sources/GL/GLX/input_device_xinput.cpp	2009-08-01 18:17:41.000000000 +0200
++++ ClanLib-0.8.1/Sources/GL/GLX/input_device_xinput.cpp	2009-08-01 18:12:56.000000000 +0200
+@@ -29,6 +29,7 @@
+ 
+ #include <iostream>
+ #include <cstring>
++#include <cstdio>
+ #include "API/Core/System/log.h"
+ #include "API/Display/input_device.h"
+ #include "API/Display/input_event.h"