Disabled java USE flag due to bug #106992

Package-Manager: portage-2.0.51.22-r2

diff --git a/dev-lang/ghc/ChangeLog b/dev-lang/ghc/ChangeLog
index 1889e53d1bc8df1fc440f097f7a9467e459e8189..40b3f3030f26a96ebe04bec71c518769f958f755 100644 (file)
--- a/dev-lang/ghc/ChangeLog
+++ b/dev-lang/ghc/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-lang/ghc
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.66 2005/09/22 13:37:55 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.67 2005/09/24 00:06:38 dcoutts Exp $
+
+  23 Sep 2005; <duncan@gentoo.org> ghc-6.4.1.ebuild:
+  Disabled java USE flag due to bug #106992
 
 *ghc-6.4.1 (22 Sep 2005)
 

diff --git a/dev-lang/ghc/Manifest b/dev-lang/ghc/Manifest
index 811c9333a3cf57dc0e8479bcb519c071e7cda598..e9a5dd1ecf6dd2993de0830158e5a4d55c8006ca 100644 (file)
--- a/dev-lang/ghc/Manifest
+++ b/dev-lang/ghc/Manifest
@@ -1,11 +1,11 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 ff2ada07b7eb78fe8bd3b887ed44e471 ghc-6.4.1.ebuild 6004
+MD5 a025d3894254271254721f5ecf30abe0 ghc-6.4.1.ebuild 6058
 MD5 6b0575f665b30bd942f60a152f52dca8 ghc-6.0.1.ebuild 4709
 MD5 44522ba468aae54fcea378e3817fcd72 ghc-6.2.2.ebuild 5562
 MD5 9620778937a1aff6ef88863c81222cfc ghc-6.4.ebuild 6109
-MD5 8f2072fc6e6925a51d0991c3ed579744 ChangeLog 12289
+MD5 9044fd7fb42b5dbed8e956c9c5b8bbf9 ChangeLog 12387
 MD5 a769ecfcd1cdd2d40986627df7dfb249 metadata.xml 224
 MD5 558c6b9e9b0e15185b69cdfe241dad9a files/ghc-updater 8775
 MD5 1ae8c6b539b6706ba0e8b988a918a944 files/ghc-6.2.hardened.patch 525
@@ -18,7 +18,7 @@ MD5 9c15b50bf0b73b7d70a06fd47510a3ef files/ghc-6.0.1.haddock.patch 380
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFDMrREkyZuKN4EQ6YRAjxFAJ9MrcbItexpyMRniGUQQXVWyrCV0gCeOiI5
-tI43tEDOP4H7Vx7DCDGd+W8=
-=xJqZ
+iD8DBQFDNJj3kyZuKN4EQ6YRAsjxAJ989JSGBi1B/1dDC1t/nK1nFrA3jQCfXioA
+vIxoKFsVP/AHUb2ynC1InBE=
+=FZPR
 -----END PGP SIGNATURE-----

diff --git a/dev-lang/ghc/ghc-6.4.1.ebuild b/dev-lang/ghc/ghc-6.4.1.ebuild
index 3bc6d3c6581766af67471ad727ddae11c77ef08b..657bd37e86e00d3b8d896cae784b6cf39f083130 100644 (file)
--- a/dev-lang/ghc/ghc-6.4.1.ebuild
+++ b/dev-lang/ghc/ghc-6.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.4.1.ebuild,v 1.1 2005/09/22 13:37:55 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.4.1.ebuild,v 1.2 2005/09/24 00:06:38 dcoutts Exp $
 
 # We abandon virtual/ghc in favor of || dependencies.
 # Here's a brief explanation of the new bootstrap logic:
@@ -17,7 +17,8 @@
 
 inherit base flag-o-matic eutils ghc-package
 
-IUSE="doc java opengl"
+IUSE="doc opengl"
+#java use flag disabled because of bug #106992
 
 DESCRIPTION="The Glasgow Haskell Compiler"
 HOMEPAGE="http://www.haskell.org/ghc/"
@@ -53,11 +54,11 @@ DEPEND="|| ( <=dev-lang/ghc-bin-6.5 <=dev-lang/ghc-6.5 )
        doc? (  ~app-text/docbook-xml-dtd-4.2
                app-text/docbook-xsl-stylesheets
                >=dev-libs/libxslt-1.1.2
-               >=dev-haskell/haddock-0.6-r2
-               java? ( >=dev-java/fop-0.20.5 ) )
+               >=dev-haskell/haddock-0.6-r2 )
        opengl? ( virtual/opengl
                virtual/glu
                virtual/glut )"
+# removed: java? ( >=dev-java/fop-0.20.5 )
 
 RDEPEND="virtual/libc
        >=sys-devel/gcc-2.95.3
@@ -124,9 +125,9 @@ src_compile() {
        # determine what to do with documentation
        if use doc; then
                mydoc="html"
-               if use java; then
-                       mydoc="${mydoc} ps"
-               fi
+#              if use java; then
+#                      mydoc="${mydoc} ps"
+#              fi
        else
                mydoc=""
                # needed to prevent haddock from being called