Added missing dependency on libxslt, and slightly cleaned up the ebuild.

Package-Manager: portage-2.0.51.19

3 files changed, 17 insertions, 10 deletions

diff --git a/dev-lang/ghc/ChangeLog b/dev-lang/ghc/ChangeLog
index a0073488572f..da517be27994 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.53 2005/03/11 16:30:24 kosmikus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ChangeLog,v 1.54 2005/03/23 14:11:18 kosmikus Exp $
+
+  23 Mar 2005; Andres Loeh <kosmikus@gentoo.org> ghc-6.4.ebuild:
+  Added missing dependency on libxslt, and slightly cleaned up the ebuild.
 
 *ghc-6.4 (11 Mar 2005)
 
diff --git a/dev-lang/ghc/Manifest b/dev-lang/ghc/Manifest
index 8198cb2d0e53..0dcf0cc1f06e 100644
--- a/dev-lang/ghc/Manifest
+++ b/dev-lang/ghc/Manifest
@@ -5,8 +5,8 @@ MD5 2852eaf66fdd3a9ae5fcf1082bb014b3 ghc-6.2.1-r1.ebuild 5794
 MD5 ea84406fb33d27987c0f7d51ece23975 ghc-6.2.ebuild 5007
 MD5 6b0575f665b30bd942f60a152f52dca8 ghc-6.0.1.ebuild 4709
 MD5 86839964ffb83a00d5b485ddc61f4f50 ghc-6.2.2.ebuild 5415
-MD5 6c8e0fc9c73498894c38c2352a519410 ghc-6.4.ebuild 5750
-MD5 11703afb85a29d822e2d5c3caf232a5a ChangeLog 10297
+MD5 844a2b7b395481dd8157d006754d6270 ghc-6.4.ebuild 5920
+MD5 eb4d9aed68c37a00a0a50e058fdd95b7 ChangeLog 10438
 MD5 a769ecfcd1cdd2d40986627df7dfb249 metadata.xml 224
 MD5 80f9ac24762d1342df58d731a756956d ghc-6.2-r1.ebuild 5190
 MD5 ee4e4b2265839fca7a4c06d565a51334 files/ghc-updater 8068
@@ -24,9 +24,9 @@ MD5 75417bc4dea34cd08ea105457ccd3032 files/digest-ghc-6.4 65
 MD5 c2e63b1796b9c089a23a07b0eb6e76a7 files/ghc-6.2.hardened.patch.bz2 362
 MD5 9c15b50bf0b73b7d70a06fd47510a3ef files/ghc-6.0.1.haddock.patch 380
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
+Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFCMci6OKSBj1ObwosRAnGFAJ9AWpnpsRkO35o50aiJ96Z7e8WEFQCgg5Xx
-TxwP0ktUjf+KpFURleti4fw=
-=DGJ/
+iD8DBQFCQXo5OKSBj1ObwosRAliBAKCFPrY4dZWQh3EHMtE/CUS0+0WFqgCfVYKI
+bnMaxyqbvl4MCM01GqW8pu0=
+=JnAY
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/ghc/ghc-6.4.ebuild b/dev-lang/ghc/ghc-6.4.ebuild
index 6f07d87407cc..6beea78d00df 100644
--- a/dev-lang/ghc/ghc-6.4.ebuild
+++ b/dev-lang/ghc/ghc-6.4.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.ebuild,v 1.1 2005/03/11 16:30:24 kosmikus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/ghc/ghc-6.4.ebuild,v 1.2 2005/03/23 14:11:18 kosmikus Exp $
 
 # Brief explanation of the bootstrap logic:
 #
@@ -49,6 +49,7 @@ DEPEND="virtual/ghc
 	>=sys-libs/readline-4.2
 	doc? (  ~app-text/docbook-xml-dtd-4.2
 		app-text/docbook-xsl-stylesheets
+		>=dev-libs/libxslt-1.1.2
 		java? ( >=dev-java/fop-0.20.5 ) )
 	opengl? ( virtual/opengl
 		virtual/glu
@@ -76,6 +77,9 @@ setup_cflags() {
 	check_cflags "-nopie -fno-stack-protector -fno-stack-protector-all"
 }
 
+# Portage's resolution of virtuals fails on virtual/ghc in some Portage releases,
+# the following function causes the build to fail with an informative error message
+# in such a case.
 pkg_setup() {
 	if ! has_version virtual/ghc; then
 		eerror "This ebuild needs a version of GHC to bootstrap from."
@@ -111,6 +115,8 @@ src_unpack() {
 
 src_compile() {
 	local myconf
+	local mydoc
+
 	if use opengl; then
 		myconf="--enable-hopengl"
 	fi
@@ -121,7 +127,6 @@ src_compile() {
 	# determine what to do with documentation
 	if use doc; then
 		mydoc="html"
-		insttarget="${insttarget} install-docs"
 		if use java; then
 			mydoc="${mydoc} ps"
 		fi
@@ -168,7 +173,6 @@ src_compile() {
 }
 
 src_install () {
-	local mydoc
 	local insttarget
 
 	insttarget="install"