patched for gcc-3.4

12 files changed, 73 insertions, 464 deletions

diff --git a/dev-haskell/haddock/ChangeLog b/dev-haskell/haddock/ChangeLog
index e9ad11bb8aec..8535129f3d81 100644
--- a/dev-haskell/haddock/ChangeLog
+++ b/dev-haskell/haddock/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-haskell/haddock
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v 1.15 2004/10/18 16:45:58 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v 1.16 2004/10/21 14:09:36 kosmikus Exp $
+
+*haddock-0.6-r3 (21 Oct 2004)
+
+  21 Oct 2004; Andres Loeh <kosmikus@gentoo.org> haddock-0.4.ebuild,
+  haddock-0.5.ebuild, haddock-0.6-r1.ebuild, haddock-0.6-r3.ebuild,
+  haddock-0.6.ebuild, files/haddock-0.4-ghc6.patch,
+  files/haddock-0.6-gcc3.4.patch:
+  Patched to build with gcc-3.4. Removed old versions.
 
   19 Oct 2004; Mamoru KOMACHI <usata@gentoo.org> haddock-0.4.ebuild,
   haddock-0.5.ebuild, haddock-0.6-r1.ebuild, haddock-0.6-r2.ebuild,
diff --git a/dev-haskell/haddock/Manifest b/dev-haskell/haddock/Manifest
index de32f5f9d1b9..7d3b14a15c4f 100644
--- a/dev-haskell/haddock/Manifest
+++ b/dev-haskell/haddock/Manifest
@@ -1,23 +1,16 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 3844031600db93db8e366550cb6a2a3c ChangeLog 2518
+MD5 e840b12d8e339b635266cbbcd80a212b haddock-0.6-r2.ebuild 1964
 MD5 334e58c2bde7264b3d4c1a9eadca4e6d haddock-0.4.ebuild 2039
+MD5 ec08b75db21049d8e6c97749ec23c930 haddock-0.6.ebuild 1959
+MD5 d0fed0b48c927cfbad74c22ea29c2d88 haddock-0.6-r1.ebuild 1961
+MD5 b54ee69032c224632ed7aff343686e21 haddock-0.6-r3.ebuild 2044
 MD5 23c0627111ec2ccabcaf76839e6ebef1 haddock-0.5.ebuild 1945
+MD5 3844031600db93db8e366550cb6a2a3c ChangeLog 2518
 MD5 a769ecfcd1cdd2d40986627df7dfb249 metadata.xml 224
-MD5 d0fed0b48c927cfbad74c22ea29c2d88 haddock-0.6-r1.ebuild 1961
-MD5 e840b12d8e339b635266cbbcd80a212b haddock-0.6-r2.ebuild 1964
-MD5 ec08b75db21049d8e6c97749ec23c930 haddock-0.6.ebuild 1959
+MD5 6c35081e22594c96591797459c28da01 files/digest-haddock-0.6-r1 67
+MD5 6c35081e22594c96591797459c28da01 files/digest-haddock-0.6-r2 67
+MD5 6c35081e22594c96591797459c28da01 files/digest-haddock-0.6-r3 67
+MD5 bd211a7c5442dadeee6975dbb15f2e45 files/haddock-0.6-gcc3.4.patch 1967
+MD5 0fe55540bd0531c1ca8da69fb5098d76 files/haddock-0.4-ghc6.patch 6858
 MD5 345c00e86d5388d60c897e487987922a files/digest-haddock-0.4 67
 MD5 8f05c67dab27a2cac367e6499281ca06 files/digest-haddock-0.5 67
-MD5 0fe55540bd0531c1ca8da69fb5098d76 files/haddock-0.4-ghc6.patch 6858
 MD5 6c35081e22594c96591797459c28da01 files/digest-haddock-0.6 67
-MD5 6c35081e22594c96591797459c28da01 files/digest-haddock-0.6-r1 67
-MD5 6c35081e22594c96591797459c28da01 files/digest-haddock-0.6-r2 67
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBc/HoVWNWqTUmv+0RAtw/AJ9eu7g7GxcJzWIXrEKnQEZiATQYtwCfWiGq
-sW2RVqTDg9vyER+o4YaKmy4=
-=kjnb
------END PGP SIGNATURE-----
diff --git a/dev-haskell/haddock/files/digest-haddock-0.4 b/dev-haskell/haddock/files/digest-haddock-0.4
deleted file mode 100644
index 01ae36b36df6..000000000000
--- a/dev-haskell/haddock/files/digest-haddock-0.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 919e38378b91a223cb1e48178f1a85bd haddock-0.4-src.tar.gz 381200
diff --git a/dev-haskell/haddock/files/digest-haddock-0.5 b/dev-haskell/haddock/files/digest-haddock-0.5
deleted file mode 100644
index 2177a42ef0e7..000000000000
--- a/dev-haskell/haddock/files/digest-haddock-0.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c103855f8e1643034b3df02e9b8ae247 haddock-0.5-src.tar.gz 427144
diff --git a/dev-haskell/haddock/files/digest-haddock-0.6-r1 b/dev-haskell/haddock/files/digest-haddock-0.6-r1
deleted file mode 100644
index fc424528e86b..000000000000
--- a/dev-haskell/haddock/files/digest-haddock-0.6-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6f15d15a3e4352f77f003fb133b1d9b2 haddock-0.6-src.tar.gz 429708
diff --git a/dev-haskell/haddock/files/digest-haddock-0.6 b/dev-haskell/haddock/files/digest-haddock-0.6-r3
index fc424528e86b..fc424528e86b 100644
--- a/dev-haskell/haddock/files/digest-haddock-0.6
+++ b/dev-haskell/haddock/files/digest-haddock-0.6-r3
diff --git a/dev-haskell/haddock/files/haddock-0.4-ghc6.patch b/dev-haskell/haddock/files/haddock-0.4-ghc6.patch
deleted file mode 100644
index d5192c49aaf8..000000000000
--- a/dev-haskell/haddock/files/haddock-0.4-ghc6.patch
+++ /dev/null
@@ -1,203 +0,0 @@
-diff -Naur haddock-0.4-orig/haddock/src/Binary.hs haddock-0.4/haddock/src/Binary.hs
---- haddock-0.4-orig/haddock/src/Binary.hs	2002-06-23 14:54:00.000000000 +0000
-+++ haddock-0.4/haddock/src/Binary.hs	2003-07-28 12:29:09.000000000 +0000
-@@ -64,7 +64,6 @@
- import Monad
- import Exception
- import GlaExts hiding (ByteArray, newByteArray, freezeByteArray)
--import Array
- import IO
- #if __GLASGOW_HASKELL__ < 503
- import PrelIOBase	--	( IOError(..), IOErrorType(..) )
-@@ -77,11 +76,19 @@
- #endif
- 
- type BinArray = MutableByteArray RealWorld Int
-+newArray_ :: Ix ix => (ix, ix) -> IO (MutableByteArray RealWorld ix)
- newArray_ bounds     = stToIO (newCharArray bounds)
-+
-+unsafeWrite :: Ix ix => MutableByteArray RealWorld ix -> ix -> Word8 -> IO ()
- unsafeWrite arr ix e = stToIO (writeWord8Array arr ix e)
-+
-+unsafeRead :: Ix ix => MutableByteArray RealWorld ix -> ix -> IO Word8
- unsafeRead  arr ix   = stToIO (readWord8Array arr ix)
- 
-+hPutArray :: Handle -> MutableByteArray RealWorld a -> Int -> IO ()
- hPutArray h arr sz   = hPutBufBA h arr sz
-+
-+hGetArray :: Handle -> MutableByteArray RealWorld a -> Int -> IO Int
- hGetArray h sz       = hGetBufBA h sz
- 
- #if __GLASGOW_HASKELL__ < 503
-@@ -160,14 +167,15 @@
-  | size <= 0 = error "Data.Binary.openBinMem: size must be >= 0"
-  | otherwise = do
-    arr <- newArray_ (0,size-1)
--   arr_r <- newIORef arr
-+   arr_r0 <- newIORef arr
-    ix_r <- newFastMutInt
-    writeFastMutInt ix_r 0
--   sz_r <- newFastMutInt
--   writeFastMutInt sz_r size
--   return (BinMem undefined ix_r sz_r arr_r)
-+   sz_r0 <- newFastMutInt
-+   writeFastMutInt sz_r0 size
-+   return (BinMem undefined ix_r sz_r0 arr_r0)
- 
--noBinHandleUserData = error "Binary.BinHandle: no user data"
-+--noBinHandleUserData :: a
-+--noBinHandleUserData = error "Binary.BinHandle: no user data"
- 
- --getUserData :: BinHandle -> BinHandleState
- --getUserData bh = state bh
-@@ -180,24 +188,24 @@
- seekBin (BinIO _ ix_r h) (BinPtr p) = do 
-   writeFastMutInt ix_r p
-   hSeek h AbsoluteSeek (fromIntegral p)
--seekBin h@(BinMem _ ix_r sz_r a) (BinPtr p) = do
--  sz <- readFastMutInt sz_r
-+seekBin h@(BinMem _ ix_r sz_r0 _) (BinPtr p) = do
-+  sz <- readFastMutInt sz_r0
-   if (p >= sz)
- 	then do expandBin h p; writeFastMutInt ix_r p
- 	else writeFastMutInt ix_r p
- 
- isEOFBin :: BinHandle -> IO Bool
--isEOFBin (BinMem _ ix_r sz_r a) = do
-+isEOFBin (BinMem _ ix_r sz_r0 _) = do
-   ix <- readFastMutInt ix_r
--  sz <- readFastMutInt sz_r
-+  sz <- readFastMutInt sz_r0
-   return (ix >= sz)
--isEOFBin (BinIO _ ix_r h) = hIsEOF h
-+isEOFBin (BinIO _ _ h) = hIsEOF h
- 
- writeBinMem :: BinHandle -> FilePath -> IO ()
- writeBinMem (BinIO _ _ _) _ = error "Data.Binary.writeBinMem: not a memory handle"
--writeBinMem (BinMem _ ix_r sz_r arr_r) fn = do
-+writeBinMem (BinMem _ ix_r _ arr_r0) fn = do
-   h <- openFileEx fn (BinaryMode WriteMode)
--  arr <- readIORef arr_r
-+  arr <- readIORef arr_r0
-   ix  <- readFastMutInt ix_r
-   hPutArray h arr ix
-   hClose h
-@@ -212,24 +220,24 @@
-   when (count /= filesize)
- 	(error ("Binary.readBinMem: only read " ++ show count ++ " bytes"))
-   hClose h
--  arr_r <- newIORef arr
-+  arr_r0 <- newIORef arr
-   ix_r <- newFastMutInt
-   writeFastMutInt ix_r 0
--  sz_r <- newFastMutInt
--  writeFastMutInt sz_r filesize
--  return (BinMem undefined {-initReadState-} ix_r sz_r arr_r)
-+  sz_r0 <- newFastMutInt
-+  writeFastMutInt sz_r0 filesize
-+  return (BinMem undefined {-initReadState-} ix_r sz_r0 arr_r0)
- 
- -- expand the size of the array to include a specified offset
- expandBin :: BinHandle -> Int -> IO ()
--expandBin (BinMem _ ix_r sz_r arr_r) off = do
--   sz <- readFastMutInt sz_r
-+expandBin (BinMem _ _ sz_r0 arr_r0) off = do
-+   sz <- readFastMutInt sz_r0
-    let sz' = head (dropWhile (<= off) (iterate (* 2) sz))
--   arr <- readIORef arr_r
-+   arr <- readIORef arr_r0
-    arr' <- newArray_ (0,sz'-1)
-    sequence_ [ unsafeRead arr i >>= unsafeWrite arr' i
-  	     | i <- [ 0 .. sz-1 ] ]
--   writeFastMutInt sz_r sz'
--   writeIORef arr_r arr'
-+   writeFastMutInt sz_r0 sz'
-+   writeIORef arr_r0 arr'
-    hPutStrLn stderr ("expanding to size: " ++ show sz')
-    return ()
- expandBin (BinIO _ _ _) _ = return ()
-@@ -239,14 +247,14 @@
- -- Low-level reading/writing of bytes
- 
- putWord8 :: BinHandle -> Word8 -> IO ()
--putWord8 h@(BinMem _ ix_r sz_r arr_r) w = do
-+putWord8 h@(BinMem _ ix_r sz_r0 arr_r0) w = do
-     ix <- readFastMutInt ix_r
--    sz <- readFastMutInt sz_r
-+    sz <- readFastMutInt sz_r0
- 	-- double the size of the array if it overflows
-     if (ix >= sz) 
- 	then do expandBin h ix
- 		putWord8 h w
--	else do arr <- readIORef arr_r
-+	else do arr <- readIORef arr_r0
- 		unsafeWrite arr ix w
-     		writeFastMutInt ix_r (ix+1)
-     		return ()
-@@ -257,12 +265,12 @@
-     return ()
- 
- getWord8 :: BinHandle -> IO Word8
--getWord8 (BinMem _ ix_r sz_r arr_r) = do
-+getWord8 (BinMem _ ix_r sz_r0 arr_r0) = do
-     ix <- readFastMutInt ix_r
--    sz <- readFastMutInt sz_r
-+    sz <- readFastMutInt sz_r0
-     when (ix >= sz)  $
--	throw (mkIOError eofErrorType "Data.Binary.getWord8" Nothing Nothing)
--    arr <- readIORef arr_r
-+	ioError (mkIOError eofErrorType "Data.Binary.getWord8" Nothing Nothing)
-+    arr <- readIORef arr_r0
-     w <- unsafeRead arr ix
-     writeFastMutInt ix_r (ix+1)
-     return w
-@@ -363,8 +371,8 @@
- -- Instances for standard types
- 
- instance Binary () where
--    put_ bh () = return ()
--    get  _     = return ()
-+    put_ _ () = return ()
-+    get  _    = return ()
- --    getF bh p  = case getBitsF bh 0 p of (_,b) -> ((),b)
- 
- instance Binary Bool where
-@@ -494,22 +502,23 @@
- data MBA = MBA (MutableByteArray# RealWorld)
- 
- newByteArray :: Int# -> IO MBA
--newByteArray sz = IO $ \s ->
--  case newByteArray# sz s of { (# s, arr #) ->
-+newByteArray sz = IO $ \s0 ->
-+  case newByteArray# sz s0 of { (# s, arr #) ->
-   (# s, MBA arr #) }
- 
- freezeByteArray :: MutableByteArray# RealWorld -> IO ByteArray
--freezeByteArray arr = IO $ \s ->
--  case unsafeFreezeByteArray# arr s of { (# s, arr #) ->
-+freezeByteArray arr0 = IO $ \s0 ->
-+  case unsafeFreezeByteArray# arr0 s0 of { (# s, arr #) ->
-   (# s, BA arr #) }
- 
- writeByteArray :: MutableByteArray# RealWorld -> Int# -> Word8 -> IO ()
- 
--writeByteArray arr i w8 = IO $ \s ->
--  case word8ToWord w8 of { W# w# -> 
--  case writeCharArray# arr i (chr# (word2Int# w#)) s  of { s ->
-+writeByteArray arr i w8 = IO $ \s0 ->
-+  case fromIntegral w8 of { W# w# -> 
-+  case writeCharArray# arr i (chr# (word2Int# w#)) s0  of { s ->
-   (# s , () #) }}
- 
-+indexByteArray :: ByteArray# -> Int# -> Word8
- indexByteArray a# n# = fromIntegral (I# (ord# (indexCharArray# a# n#)))
- 
- instance (Integral a, Binary a) => Binary (Ratio a) where
-@@ -530,6 +539,7 @@
-   word8s :: [Word8]
-   word8s = map (fromIntegral.ord) str
- 
-+getString :: BinHandle -> IO String
- getString bh = do
-   word8s <- get bh
-   return (map (chr.fromIntegral) (word8s :: [Word8]))
diff --git a/dev-haskell/haddock/files/haddock-0.6-gcc3.4.patch b/dev-haskell/haddock/files/haddock-0.6-gcc3.4.patch
new file mode 100644
index 000000000000..81de6bb12dfc
--- /dev/null
+++ b/dev-haskell/haddock/files/haddock-0.6-gcc3.4.patch
@@ -0,0 +1,46 @@
+diff -Naur haddock-0.6.orig/haddock/src/HaddockUtil.hs haddock-0.6/haddock/src/HaddockUtil.hs
+--- haddock-0.6.orig/haddock/src/HaddockUtil.hs	2004-10-21 15:00:16.000000000 +0200
++++ haddock-0.6/haddock/src/HaddockUtil.hs	2004-10-21 15:51:10.211521360 +0200
+@@ -188,12 +188,12 @@
+ 
+ moduleHeaderRE :: Regex
+ moduleHeaderRE = mkRegexWithOpts
+-			 "^([ \t\n]*Module[ \t]*:.*\n)?\ 
+-			  \([ \t\n]*Copyright[ \t]*:.*\n)?\ 
+-			  \([ \t\n]*License[ \t]*:.*\n)?\ 
+-			  \[ \t\n]*Maintainer[ \t]*:(.*)\n\ 
+-			  \[ \t\n]*Stability[ \t]*:(.*)\n\ 
+-			  \[ \t\n]*Portability[ \t]*:([^\n]*)\n"
++			( "^([ \t\n]*Module[ \t]*:.*\n)?" ++
++			  "([ \t\n]*Copyright[ \t]*:.*\n)?" ++
++			  "([ \t\n]*License[ \t]*:.*\n)?" ++
++			  "[ \t\n]*Maintainer[ \t]*:(.*)\n" ++
++			  "[ \t\n]*Stability[ \t]*:(.*)\n" ++
++			  "[ \t\n]*Portability[ \t]*:([^\n]*)\n" )
+ 		True -- match "\n" with "."
+ 		False -- not case sensitive
+ 	-- All fields except the last (Portability) may be multi-line.
+diff -Naur haddock-0.6.orig/haddock/src/HaddockVersion.hs haddock-0.6/haddock/src/HaddockVersion.hs
+--- haddock-0.6.orig/haddock/src/HaddockVersion.hs	2004-10-21 15:00:16.000000000 +0200
++++ haddock-0.6/haddock/src/HaddockVersion.hs	2004-10-21 15:51:13.734985712 +0200
+@@ -14,5 +14,4 @@
+ 
+ -- The version comes in via CPP from mk/version.mk
+ projectVersion :: String
+-projectVersion = tail "\ 
+-  \ HADDOCK_VERSION"
++projectVersion = "0.6"
+diff -Naur haddock-0.6.orig/haddock/src/Main.hs haddock-0.6/haddock/src/Main.hs
+--- haddock-0.6.orig/haddock/src/Main.hs	2004-10-21 15:00:16.000000000 +0200
++++ haddock-0.6/haddock/src/Main.hs	2004-10-21 15:51:19.185157160 +0200
+@@ -460,8 +460,8 @@
+ 
+   when (not (null name_strings)) $
+ 	  tell ["Warning: " ++ show mdl ++ 
+-		": the following names could not be resolved:\n\ 
+-		\   " ++ concat (map (' ':) name_strings)
++		": the following names could not be resolved:\n" ++
++		"   " ++ concat (map (' ':) name_strings)
+ 		]
+ 
+   return (mdl, Interface { 
diff --git a/dev-haskell/haddock/haddock-0.4.ebuild b/dev-haskell/haddock/haddock-0.4.ebuild
deleted file mode 100644
index df5db2e4ee10..000000000000
--- a/dev-haskell/haddock/haddock-0.4.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-0.4.ebuild,v 1.11 2004/10/18 16:45:58 usata Exp $
-#
-# USE variable summary:
-#   doc    - Build extra documenation from DocBook sources,
-#               in HTML format.
-#   tetex  - Build the above docs as PostScript as well.
-
-
-inherit base
-IUSE="doc tetex"
-
-DESCRIPTION="A documentation tool for Haskell"
-SRC_URI="http://www.haskell.org/haddock/${P}-src.tar.gz"
-HOMEPAGE="http://www.haskell.org/haddock"
-
-SLOT="0"
-KEYWORDS="x86 ~sparc"
-LICENSE="as-is"
-
-DEPEND="virtual/ghc
-	doc? ( >=app-text/openjade-1.3.1
-		>=app-text/sgml-common-0.6.3
-		~app-text/docbook-sgml-dtd-3.1
-		>=app-text/docbook-dsssl-stylesheets-1.64
-		tetex? ( virtual/tetex
-		>=app-text/jadetex-3.12 ) )"
-
-RDEPEND=""
-
-# extend path to /opt/ghc/bin to guarantee that ghc-bin is found
-GHCPATH="${PATH}:/opt/ghc/bin"
-
-src_unpack() {
-	base_src_unpack
-	cd ${S}
-	patch -p1 < ${FILESDIR}/haddock-${PV}-ghc6.patch
-}
-
-src_compile() {
-	# unset SGML_CATALOG_FILES because documentation installation
-	# breaks otherwise ...
-	PATH="${GHCPATH}" SGML_CATALOG_FILES="" econf || die "econf failed"
-	# using make because emake behaved strangely on my machine
-	make || die
-
-	# if documentation has been requested, build documentation ...
-	if use doc; then
-		cd ${S}/haddock/doc
-		emake html || die
-		if use tetex; then
-			emake ps || die
-		fi
-	fi
-}
-
-src_install() {
-	local mydoc
-
-	use doc && mydoc="html" || mydoc=""
-	use doc && use tetex && mydoc="${mydoc} ps"
-
-	echo SGMLDocWays="${mydoc}" >> mk/build.mk
-	make install install-docs \
-		prefix="${D}/usr" \
-		datadir="${D}/usr/share/doc/${PF}" \
-		infodir="${D}/usr/share/info" \
-		mandir="${D}/usr/share/man" || die
-
-	cd ${S}/haddock
-	dodoc CHANGES LICENSE README TODO
-
-	if use doc; then
-		cd ${S}/haddock/doc
-		dohtml -r haddock/* || die
-		dosym haddock.html /usr/share/doc/${PF}/html/index.html
-		if use tetex; then
-			docinto ps
-			dodoc haddock.ps || die
-		fi
-	fi
-}
diff --git a/dev-haskell/haddock/haddock-0.5.ebuild b/dev-haskell/haddock/haddock-0.5.ebuild
deleted file mode 100644
index a61a93db1a7d..000000000000
--- a/dev-haskell/haddock/haddock-0.5.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-0.5.ebuild,v 1.8 2004/10/18 16:45:58 usata Exp $
-#
-# USE variable summary:
-#   doc    - Build extra documenation from DocBook sources,
-#               in HTML format.
-#   tetex  - Build the above docs as PostScript as well.
-
-
-inherit base
-IUSE="doc tetex"
-
-DESCRIPTION="A documentation tool for Haskell"
-SRC_URI="http://www.haskell.org/haddock/${P}-src.tar.gz"
-HOMEPAGE="http://www.haskell.org/haddock"
-
-SLOT="0"
-KEYWORDS="~x86 ~sparc"
-LICENSE="as-is"
-
-DEPEND="virtual/ghc
-	doc? ( >=app-text/openjade-1.3.1
-		>=app-text/sgml-common-0.6.3
-		~app-text/docbook-sgml-dtd-3.1
-		>=app-text/docbook-dsssl-stylesheets-1.64
-		tetex? ( virtual/tetex
-		>=app-text/jadetex-3.12 ) )"
-
-RDEPEND=""
-
-# extend path to /opt/ghc/bin to guarantee that ghc-bin is found
-GHCPATH="${PATH}:/opt/ghc/bin"
-
-src_compile() {
-	# unset SGML_CATALOG_FILES because documentation installation
-	# breaks otherwise ...
-	PATH="${GHCPATH}" SGML_CATALOG_FILES="" econf || die "econf failed"
-	# using make because emake behaved strangely on my machine
-	make || die
-
-	# if documentation has been requested, build documentation ...
-	if use doc; then
-		cd ${S}/haddock/doc
-		emake html || die
-		if use tetex; then
-			emake ps || die
-		fi
-	fi
-}
-
-src_install() {
-	local mydoc
-
-	use doc && mydoc="html" || mydoc=""
-	use doc && use tetex && mydoc="${mydoc} ps"
-
-	echo SGMLDocWays="${mydoc}" >> mk/build.mk
-	make install install-docs \
-		prefix="${D}/usr" \
-		datadir="${D}/usr/share/doc/${PF}" \
-		infodir="${D}/usr/share/info" \
-		mandir="${D}/usr/share/man" || die
-
-	cd ${S}/haddock
-	dodoc CHANGES LICENSE README TODO
-
-	if use doc; then
-		cd ${S}/haddock/doc
-		dohtml -r haddock/* || die
-		dosym haddock.html /usr/share/doc/${PF}/html/index.html
-		if use tetex; then
-			docinto ps
-			dodoc haddock.ps || die
-		fi
-	fi
-}
diff --git a/dev-haskell/haddock/haddock-0.6-r1.ebuild b/dev-haskell/haddock/haddock-0.6-r3.ebuild
index 18b7d665089a..901964c82fbe 100644
--- a/dev-haskell/haddock/haddock-0.6-r1.ebuild
+++ b/dev-haskell/haddock/haddock-0.6-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-0.6-r1.ebuild,v 1.7 2004/10/18 16:45:58 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-0.6-r3.ebuild,v 1.1 2004/10/21 14:09:36 kosmikus Exp $
 #
 # USE variable summary:
 #   doc    - Build extra documenation from DocBook sources,
@@ -8,7 +8,7 @@
 #   tetex  - Build the above docs as PostScript as well.
 
 
-inherit base
+inherit base eutils
 IUSE="doc tetex"
 
 DESCRIPTION="A documentation tool for Haskell"
@@ -16,7 +16,7 @@ SRC_URI="http://www.haskell.org/haddock/${P}-src.tar.gz"
 HOMEPAGE="http://www.haskell.org/haddock"
 
 SLOT="0"
-KEYWORDS="~x86 ~sparc"
+KEYWORDS="x86 ~sparc ~ppc"
 LICENSE="as-is"
 
 DEPEND="virtual/ghc
@@ -32,6 +32,11 @@ RDEPEND=""
 # extend path to /opt/ghc/bin to guarantee that ghc-bin is found
 GHCPATH="${PATH}:/opt/ghc/bin"
 
+src_unpack() {
+	base_src_unpack
+	epatch ${FILESDIR}/${P}-gcc3.4.patch
+}
+
 src_compile() {
 	# unset SGML_CATALOG_FILES because documentation installation
 	# breaks otherwise ...
diff --git a/dev-haskell/haddock/haddock-0.6.ebuild b/dev-haskell/haddock/haddock-0.6.ebuild
deleted file mode 100644
index 9fb05d36f84d..000000000000
--- a/dev-haskell/haddock/haddock-0.6.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-0.6.ebuild,v 1.7 2004/10/18 16:45:58 usata Exp $
-#
-# USE variable summary:
-#   doc    - Build extra documenation from DocBook sources,
-#               in HTML format.
-#   tetex  - Build the above docs as PostScript as well.
-
-
-inherit base
-IUSE="doc tetex"
-
-DESCRIPTION="A documentation tool for Haskell"
-SRC_URI="http://www.haskell.org/haddock/${P}-src.tar.gz"
-HOMEPAGE="http://www.haskell.org/haddock"
-
-SLOT="0"
-KEYWORDS="~x86 ~sparc"
-LICENSE="as-is"
-
-DEPEND="virtual/ghc
-	doc? ( >=app-text/openjade-1.3.1
-		>=app-text/sgml-common-0.6.3
-		~app-text/docbook-sgml-dtd-3.1
-		>=app-text/docbook-dsssl-stylesheets-1.64
-		tetex? ( virtual/tetex
-		>=app-text/jadetex-3.12 ) )"
-
-RDEPEND=""
-
-# extend path to /opt/ghc/bin to guarantee that ghc-bin is found
-GHCPATH="${PATH}:/opt/ghc/bin"
-
-src_compile() {
-	# unset SGML_CATALOG_FILES because documentation installation
-	# breaks otherwise ...
-	PATH="${GHCPATH}" SGML_CATALOG_FILES="" econf || die "econf failed"
-	# using make because emake behaved strangely on my machine
-	make || die "make failed"
-
-	# if documentation has been requested, build documentation ...
-	if use doc; then
-		cd ${S}/haddock/doc
-		emake html \
-			datadir="/usr/share/doc/${PF}" \
-			|| die "emake html failed"
-		if use tetex; then
-			emake ps \
-				datadir="/usr/share/doc/${PF}" \
-				|| die "emake ps failed"
-		fi
-	fi
-}
-
-src_install() {
-	local mydoc
-
-	make install \
-		prefix="${D}/usr" \
-		datadir="${D}/usr/share/${PF}" \
-		infodir="${D}/usr/share/info" \
-		mandir="${D}/usr/share/man" || die "make install failed"
-
-	cd ${S}/haddock
-	dodoc CHANGES LICENSE README TODO
-
-	if use doc; then
-		cd ${S}/haddock/doc
-		dohtml -r haddock/* || die
-		dosym haddock.html /usr/share/doc/${PF}/html/index.html
-		if use tetex; then
-			docinto ps
-			dodoc haddock.ps || die
-		fi
-	fi
-}