patched for gcc-3.4 (#64426)

diff --git a/dev-lang/hugs98/ChangeLog b/dev-lang/hugs98/ChangeLog
index 6e2f1d47e665140b4c93fadcef69b79df1fabed1..7fd7a3598b55c0782db9f557a102c9009c49ffb4 100644 (file)
--- 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/Manifest b/dev-lang/hugs98/Manifest
index 437072b67f751a0b7270bdad886c3461c54f2b7d..dd1023bd684bd9166a3bf27c055f696cccfe2873 100644 (file)
--- a/dev-lang/hugs98/Manifest
+++ b/dev-lang/hugs98/Manifest
@@ -1,18 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 b6d2a663977f8149681bce53df81e785 ChangeLog 3646
-MD5 50b209165d0f91988c32ebffa62d87ee hugs98-2002.11-r1.ebuild 1130
-MD5 e9e9352e129646bd141ed316037c09db hugs98-2002.11.ebuild 1142
+MD5 215844c8b9e395e0ed39d622dc1a38c3 hugs98-2003.11.ebuild 2180
+MD5 cdfddb4be3f52df941beffa28cff41b1 ChangeLog 3887
 MD5 a769ecfcd1cdd2d40986627df7dfb249 metadata.xml 224
-MD5 5416349e8bac79ae9af1c6359478f209 hugs98-2003.11.ebuild 2072
 MD5 eb7ae57bb23e867135381cbd99c5c1c0 files/digest-hugs98-2003.11 67
-MD5 e34344bfc901d89daf1e5350ec13926d files/digest-hugs98-2002.11 67
-MD5 e34344bfc901d89daf1e5350ec13926d files/digest-hugs98-2002.11-r1 67
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBc/PNVWNWqTUmv+0RAqDgAJ9HVYMngz3eQxiqfUZFSSrr3X2A4QCfahGS
-rYKmZ8/p+2WsPQtu/hknDfo=
-=z2VM
------END PGP SIGNATURE-----
+MD5 4c6e27fe15252dea9f141e0f6b06ed36 files/hugs98-2003.11-gcc34.patch 303

diff --git a/dev-lang/hugs98/files/digest-hugs98-2002.11 b/dev-lang/hugs98/files/digest-hugs98-2002.11
deleted file mode 100644 (file)
index 0c8f1a2..0000000
--- 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 (file)
index 0c8f1a2..0000000
--- 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 (file)
index 0000000..b8d9744
--- /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 (file)
index ad573ea..0000000
--- 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 (file)
index 3662b83..0000000
--- 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 aa60673b2882756f8d10db1a678d06a89258f8b6..95349a131070bab89a7619d9ec07882ed9e36e81 100644 (file)
--- 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