summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDuncan Coutts <dcoutts@gentoo.org>2005-09-24 00:06:38 +0000
committerDuncan Coutts <dcoutts@gentoo.org>2005-09-24 00:06:38 +0000
commit616d7e40dbded33637f928e0f90fa60f40fcf078 (patch)
tree9c7eeab94b6abf3ef2feeb63f67e790716b3e964 /dev-lang
parentUpdate to latest upstream version. (diff)
downloadgentoo-2-616d7e40dbded33637f928e0f90fa60f40fcf078.tar.gz
gentoo-2-616d7e40dbded33637f928e0f90fa60f40fcf078.tar.bz2
gentoo-2-616d7e40dbded33637f928e0f90fa60f40fcf078.zip
Disabled java USE flag due to bug #106992
(Portage version: 2.0.51.22-r2)
Diffstat (limited to 'dev-lang')
-rw-r--r--dev-lang/ghc/ChangeLog5
-rw-r--r--dev-lang/ghc/ghc-6.4.1.ebuild15
2 files changed, 12 insertions, 8 deletions
diff --git a/dev-lang/ghc/ChangeLog b/dev-lang/ghc/ChangeLog
index 1889e53d1bc8..40b3f3030f26 100644
--- 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/ghc-6.4.1.ebuild b/dev-lang/ghc/ghc-6.4.1.ebuild
index 3bc6d3c65817..657bd37e86e0 100644
--- 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