We dont need the java/fop stuff since were only building html docs

(Portage version: 2.1_pre9-r4)

2 files changed, 10 insertions, 16 deletions

diff --git a/dev-lang/ghc/ChangeLog b/dev-lang/ghc/ChangeLog
index fb81bba715f9..3e032b1178d0 100644
--- a/dev-lang/ghc/ChangeLog
+++ b/dev-lang/ghc/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-lang/ghc
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.95 2006/04/27 15:26:43 marienz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.96 2006/04/27 21:41:38 dcoutts Exp $
+
+  27 Apr 2006; Duncan Coutts <dcoutts@gentoo.org> ghc-6.4.1-r3.ebuild:
+  We dont need the java/fop stuff since were only building html docs
 
   27 Apr 2006; Marien Zwart <marienz@gentoo.org> files/digest-ghc-6.2.2,
   files/digest-ghc-6.4.1-r2, Manifest:
diff --git a/dev-lang/ghc/ghc-6.4.1-r3.ebuild b/dev-lang/ghc/ghc-6.4.1-r3.ebuild
index 45bc6215b8b4..056a778d9365 100644
--- a/dev-lang/ghc/ghc-6.4.1-r3.ebuild
+++ b/dev-lang/ghc/ghc-6.4.1-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 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-r3.ebuild,v 1.3 2006/04/06 17:15:03 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.4.1-r3.ebuild,v 1.4 2006/04/27 21:41:38 dcoutts Exp $
 
 # Brief explanation of the bootstrap logic:
 #
@@ -32,7 +32,6 @@ LICENSE="as-is"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="doc X opengl openal"
-#java use flag disabled because of bug #106992
 
 S="${WORKDIR}/${MY_P}"
 
@@ -52,10 +51,9 @@ DEPEND="${RDEPEND}
 	<virtual/ghc-6.5
 	!>=virtual/ghc-6.6
 	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 )"
-# removed: java? ( >=dev-java/fop-0.20.5 )
+			app-text/docbook-xsl-stylesheets
+			>=dev-libs/libxslt-1.1.2
+			>=dev-haskell/haddock-0.6-r2 )"
 
 PDEPEND=">=dev-haskell/cabal-1.1.3"
 
@@ -152,18 +150,13 @@ src_compile() {
 	echo "SRC_CC_OPTS+=${CFLAGS} -Wa,--noexecstack" >> mk/build.mk
 
 	# determine what to do with documentation
-	local mydoc
 	if use doc; then
-		mydoc="html"
-#		if use java; then
-#			mydoc="${mydoc} ps"
-#		fi
+		echo XMLDocWays="html" >> mk/build.mk
 	else
-		mydoc=""
+		echo XMLDocWays="" >> mk/build.mk
 		# needed to prevent haddock from being called
 		echo NO_HADDOCK_DOCS=YES >> mk/build.mk
 	fi
-	echo XMLDocWays="${mydoc}" >> mk/build.mk
 
 	# circumvent a very strange bug that seems related with ghc producing too much
 	# output while being filtered through tee (e.g. due to portage logging)
@@ -207,8 +200,6 @@ src_compile() {
 		$(use_enable X hgl) \
 		|| die "econf failed"
 
-	# the build does not seem to work all that
-	# well with parallel make
 	emake all datadir="/usr/share/doc/${PF}" || die "make failed"
 	# the explicit datadir is required to make the haddock entries
 	# in the package.conf file point to the right place ...