patched for gcc-3.4 (#64426)

7 files changed, 27 insertions, 106 deletions

diff --git a/dev-lang/hugs98/ChangeLog b/dev-lang/hugs98/ChangeLog
index 6e2f1d47e665..7fd7a3598b55 100644
--- a/dev-lang/hugs98/ChangeLog
+++ b/dev-lang/hugs98/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/hugs98
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/hugs98/ChangeLog,v 1.15 2004/10/18 16:54:02 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/hugs98/ChangeLog,v 1.16 2004/11/03 20:52:49 kosmikus Exp $
+
+  03 Nov 2004; Andres Loeh <kosmikus@gentoo.org> hugs98-2002.11-r1.ebuild,
+  hugs98-2002.11.ebuild, hugs98-2003.11.ebuild,
+  files/hugs98-2003.11-gcc34.patch:
+  Patched for gcc-3.4, thanks to several people (see bug #64426). Cleaned up.
 
   19 Oct 2004; Mamoru KOMACHI <usata@gentoo.org> hugs98-2003.11.ebuild:
   Fixed missing dependencies; bug #68021.
diff --git a/dev-lang/hugs98/files/digest-hugs98-2002.11 b/dev-lang/hugs98/files/digest-hugs98-2002.11
deleted file mode 100644
index 0c8f1a229872..000000000000
--- a/dev-lang/hugs98/files/digest-hugs98-2002.11
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8d3951d991661045713b612bf539c8c9 hugs98-Nov2002.tar.gz 1598806
diff --git a/dev-lang/hugs98/files/digest-hugs98-2002.11-r1 b/dev-lang/hugs98/files/digest-hugs98-2002.11-r1
deleted file mode 100644
index 0c8f1a229872..000000000000
--- a/dev-lang/hugs98/files/digest-hugs98-2002.11-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8d3951d991661045713b612bf539c8c9 hugs98-Nov2002.tar.gz 1598806
diff --git a/dev-lang/hugs98/files/hugs98-2003.11-gcc34.patch b/dev-lang/hugs98/files/hugs98-2003.11-gcc34.patch
new file mode 100644
index 000000000000..b8d974414c53
--- /dev/null
+++ b/dev-lang/hugs98/files/hugs98-2003.11-gcc34.patch
@@ -0,0 +1,11 @@
+--- ../fptools/libraries/base/Data/List.hs	2003-09-01 10:12:02.000000000 +0100
++++ List.hs	2004-10-29 16:38:36.481969520 +0100
+@@ -209,7 +209,7 @@
+ import GHC.Base
+ #endif
+ 
+-infix 5 \\ 
++infix 5 \\\
+ 
+ -- -----------------------------------------------------------------------------
+ -- List functions
diff --git a/dev-lang/hugs98/hugs98-2002.11-r1.ebuild b/dev-lang/hugs98/hugs98-2002.11-r1.ebuild
deleted file mode 100644
index ad573eaa63b3..000000000000
--- a/dev-lang/hugs98/hugs98-2002.11-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/hugs98/hugs98-2002.11-r1.ebuild,v 1.5 2004/07/02 04:27:34 eradicator Exp $
-
-IUSE=""
-
-MY_P="hugs98-Nov2002"
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="The HUGS98 Haskell interpreter"
-SRC_URI="http://cvs.haskell.org/Hugs/downloads/Nov2002/${MY_P}.tar.gz"
-HOMEPAGE="http://www.haskell.org/hugs"
-
-SLOT="0"
-KEYWORDS="x86 ~sparc"
-LICENSE="as-is"
-
-DEPEND="virtual/libc"
-
-src_compile() {
-	local myc
-
-	cd ${S}/src/unix || die
-	./configure \
-		--host=${CHOST} \
-		--prefix=/usr \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man \
-		--enable-ffi \
-		--enable-double-precision \
-		${myc} || die "./configure failed"
-	cd ..
-	emake || die
-}
-
-src_install () {
-	cd ${S}/src || die
-	make \
-		HUGSDIR=${D}/usr/lib/hugs \
-		prefix=${D}/usr \
-		mandir=${D}/usr/share/man \
-		infodir=${D}/usr/share/info \
-		install || die
-
-	#somewhat clean-up installation of few docs
-	cd ${S}
-	dodoc Credits License Readme
-	cd ${D}/usr/lib/hugs
-	rm Credits License Readme
-	mv demos/ docs/ ${D}/usr/share/doc/${PF}
-}
diff --git a/dev-lang/hugs98/hugs98-2002.11.ebuild b/dev-lang/hugs98/hugs98-2002.11.ebuild
deleted file mode 100644
index 3662b8334f6d..000000000000
--- a/dev-lang/hugs98/hugs98-2002.11.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/hugs98/hugs98-2002.11.ebuild,v 1.8 2004/07/02 04:27:34 eradicator Exp $
-
-IUSE=""
-
-MY_P="hugs98-Nov2002"
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="The HUGS98 Haskell interpreter"
-SRC_URI="http://cvs.haskell.org/Hugs/downloads/Nov2002/${MY_P}.tar.gz"
-HOMEPAGE="http://www.haskell.org/hugs"
-
-SLOT="0"
-KEYWORDS="x86 ~sparc"
-LICENSE="as-is"
-
-DEPEND="virtual/libc"
-
-src_compile() {
-	local myc
-
-	cd ${S}/src/unix || die
-	./configure \
-		--host=${CHOST} \
-		--prefix=/usr \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man \
-		--enable-ffi \
-		--enable-double-precision \
-		${myc} || die "./configure failed"
-	cd ..
-	emake || die
-}
-
-src_install () {
-	cd ${S}/src || die
-	cp HsFFI.h ../include || die
-	make \
-		HUGSDIR=.. \
-		prefix=${D}/usr \
-		mandir=${D}/usr/share/man \
-		infodir=${D}/usr/share/info \
-		install || die
-
-	#somewhat clean-up installation of few docs
-	cd ${S}
-	dodoc Credits License Readme
-	cd ${D}/usr/lib/hugs
-	rm Credits License Readme
-	mv demos/ docs/ ${D}/usr/share/doc/${PF}
-}
diff --git a/dev-lang/hugs98/hugs98-2003.11.ebuild b/dev-lang/hugs98/hugs98-2003.11.ebuild
index aa60673b2882..95349a131070 100644
--- a/dev-lang/hugs98/hugs98-2003.11.ebuild
+++ b/dev-lang/hugs98/hugs98-2003.11.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/hugs98/hugs98-2003.11.ebuild,v 1.6 2004/10/18 16:54:02 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/hugs98/hugs98-2003.11.ebuild,v 1.7 2004/11/03 20:52:49 kosmikus Exp $
+
+inherit base eutils
 
 IUSE="opengl"
 
@@ -11,13 +13,19 @@ SRC_URI="http://cvs.haskell.org/Hugs/downloads/Nov2003/${MY_P}.tar.gz"
 HOMEPAGE="http://www.haskell.org/hugs/"
 
 SLOT="0"
-KEYWORDS="~x86 ~sparc"
+KEYWORDS="x86 ~sparc"
 LICENSE="as-is"
 
 DEPEND="virtual/libc
 	opengl? ( virtual/opengl virtual/glu virtual/glut )
 	~app-text/docbook-sgml-dtd-4.2"
 
+src_unpack() {
+	base_src_unpack
+	cd ${S}/src
+	epatch ${FILESDIR}/${P}-gcc34.patch
+}
+
 src_compile() {
 	local myconf
 	if use opengl; then