unmask + gcc3 patch

6 files changed, 48 insertions, 14 deletions

diff --git a/dev-games/clanlib/ChangeLog b/dev-games/clanlib/ChangeLog
index d1f1ef73fcda..14c67c4b7ce6 100644
--- a/dev-games/clanlib/ChangeLog
+++ b/dev-games/clanlib/ChangeLog
@@ -1,9 +1,12 @@
 # ChangeLog for dev-games/clanlib
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/clanlib/ChangeLog,v 1.3 2003/07/26 07:38:53 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/clanlib/ChangeLog,v 1.4 2003/09/02 16:06:10 vapier Exp $
 
 *clanlib-0.7.2-r1 (16 Jul 2003)
 
+  02 Sep 2003; Mike Frysinger <vapier@gentoo.org> :
+  Added gcc3 patch #27349.
+
   16 Jul 2003; Mike Frysinger <vapier@gentoo.org> :
   SLOT-ed version #22594.
 
@@ -23,6 +26,9 @@
 
 *clanlib-0.6.5-r1 (16 Jul 2003)
 
+  02 Sep 2003; Mike Frysinger <vapier@gentoo.org> :
+  Added gcc3 patch #27349.
+
   16 Jul 2003; Mike Frysinger <vapier@gentoo.org> :
   SLOT-ed version #22594.
 
diff --git a/dev-games/clanlib/clanlib-0.6.5-r1.ebuild b/dev-games/clanlib/clanlib-0.6.5-r1.ebuild
index 99468e850c8b..fc7dd9e6db14 100644
--- a/dev-games/clanlib/clanlib-0.6.5-r1.ebuild
+++ b/dev-games/clanlib/clanlib-0.6.5-r1.ebuild
@@ -1,17 +1,17 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/clanlib/clanlib-0.6.5-r1.ebuild,v 1.1 2003/07/17 00:12:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/clanlib/clanlib-0.6.5-r1.ebuild,v 1.2 2003/09/02 16:04:56 vapier Exp $
 
 inherit eutils flag-o-matic
 replace-flags -O? -O2
 
 DESCRIPTION="multi-platform game development library"
-SRC_URI="http://www.clanlib.org/download/files/ClanLib-${PV}-1.tar.gz"
 HOMEPAGE="http://www.clanlib.org/"
+SRC_URI="http://www.clanlib.org/download/files/ClanLib-${PV}-1.tar.gz"
 
-KEYWORDS="~x86"
-SLOT="0.6"
 LICENSE="LGPL-2"
+SLOT="0.6"
+KEYWORDS="x86"
 IUSE="arts oss esd alsa png opengl truetype X oggvorbis mikmod jpeg directfb joystick"
 
 DEPEND=">=media-libs/hermes-1.3.2
@@ -27,7 +27,8 @@ S=${WORKDIR}/ClanLib-${PV}
 
 src_unpack() {
 	unpack ${A}
-	epatch ${FILESDIR}/${P}.patch
+	cd ${S}
+	epatch ${FILESDIR}/${PV}-gcc3.patch
 }
 
 src_compile() {
diff --git a/dev-games/clanlib/clanlib-0.6.5.ebuild b/dev-games/clanlib/clanlib-0.6.5.ebuild
index 83fc07cdc47b..4d15139d658d 100644
--- a/dev-games/clanlib/clanlib-0.6.5.ebuild
+++ b/dev-games/clanlib/clanlib-0.6.5.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/clanlib/clanlib-0.6.5.ebuild,v 1.1 2003/07/13 03:13:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/clanlib/clanlib-0.6.5.ebuild,v 1.2 2003/09/02 16:04:57 vapier Exp $
 
 inherit eutils
 
 DESCRIPTION="multi-platform game development library"
-SRC_URI="http://www.clanlib.org/download/files/ClanLib-${PV}-1.tar.gz"
 HOMEPAGE="http://www.clanlib.org/"
+SRC_URI="http://www.clanlib.org/download/files/ClanLib-${PV}-1.tar.gz"
 
-KEYWORDS="x86"
-SLOT="0"
 LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="x86"
 IUSE="arts oss esd alsa png opengl truetype X oggvorbis mikmod jpeg directfb"
 
 DEPEND=">=media-libs/hermes-1.3.2
@@ -26,7 +26,8 @@ S=${WORKDIR}/ClanLib-${PV}
 
 src_unpack() {
 	unpack ${A}
-	epatch ${FILESDIR}/${P}.patch
+	cd ${S}
+	epatch ${FILESDIR}/${PV}-gcc3.patch
 }
 
 src_compile() {
diff --git a/dev-games/clanlib/clanlib-0.7.2-r1.ebuild b/dev-games/clanlib/clanlib-0.7.2-r1.ebuild
index 6c3ceefa50ad..7cdb047dd084 100644
--- a/dev-games/clanlib/clanlib-0.7.2-r1.ebuild
+++ b/dev-games/clanlib/clanlib-0.7.2-r1.ebuild
@@ -1,17 +1,17 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/clanlib/clanlib-0.7.2-r1.ebuild,v 1.1 2003/07/17 00:12:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/clanlib/clanlib-0.7.2-r1.ebuild,v 1.2 2003/09/02 16:04:57 vapier Exp $
 
 inherit flag-o-matic
 replace-flags -O? -O2
 
 DESCRIPTION="multi-platform game development library"
-SRC_URI="http://www.clanlib.org/~sphair/download/ClanLib-${PV}-1.tar.bz2"
 HOMEPAGE="http://www.clanlib.org/"
+SRC_URI="http://www.clanlib.org/~sphair/download/ClanLib-${PV}-1.tar.bz2"
 
 LICENSE="LGPL-2"
 SLOT="0.7"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE="arts oss esd alsa png opengl truetype X oggvorbis mikmod jpeg directfb joystick"
 
 DEPEND=">=media-libs/hermes-1.3.2
@@ -25,6 +25,12 @@ DEPEND=">=media-libs/hermes-1.3.2
 
 S=${WORKDIR}/ClanLib-${PV}
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PV}-gcc3.patch
+}
+
 src_compile() {
 	local myconf=""
 	use jpeg || myconf="${myconf} --enable-smalljpeg"
diff --git a/dev-games/clanlib/files/clanlib-0.6.5.patch b/dev-games/clanlib/files/0.6.5-gcc3.patch
index cb991e4c5dd2..104e135f1a94 100644
--- a/dev-games/clanlib/files/clanlib-0.6.5.patch
+++ b/dev-games/clanlib/files/0.6.5-gcc3.patch
@@ -38,3 +38,13 @@
  
    surface->GetSize (surface, &width, &height);
  
+--- ClanLib-0.7.2/Sources/Core/IOData/Unix/directory_scanner_unix.cpp	2003-08-26 13:25:59.113908305 +0200
++++ ClanLib-0.7.2/Sources/Core/IOData/Unix/directory_scanner_unix.cpp	2003-08-26 13:26:10.402254445 +0200
+@@ -21,6 +21,7 @@
+ #include <fnmatch.h>
+ #include <unistd.h>
+ #include "directory_scanner_unix.h"
++#include <assert.h>
+ 
+ CL_DirectoryScanner_Unix::CL_DirectoryScanner_Unix ()
+ 	: dir_temp (NULL), entry (NULL)
diff --git a/dev-games/clanlib/files/0.7.2-gcc3.patch b/dev-games/clanlib/files/0.7.2-gcc3.patch
new file mode 100644
index 000000000000..a20a656ed13e
--- /dev/null
+++ b/dev-games/clanlib/files/0.7.2-gcc3.patch
@@ -0,0 +1,10 @@
+--- ClanLib-0.7.2/Sources/Core/IOData/Unix/directory_scanner_unix.cpp	2003-08-26 13:25:59.113908305 +0200
++++ ClanLib-0.7.2/Sources/Core/IOData/Unix/directory_scanner_unix.cpp	2003-08-26 13:26:10.402254445 +0200
+@@ -21,6 +21,7 @@
+ #include <fnmatch.h>
+ #include <unistd.h>
+ #include "directory_scanner_unix.h"
++#include <assert.h>
+ 
+ CL_DirectoryScanner_Unix::CL_DirectoryScanner_Unix ()
+ 	: dir_temp (NULL), entry (NULL)