Add a patch for ghc-6.4 compatability.

Package-Manager: portage-2.0.51.19

5 files changed, 45 insertions, 19 deletions

diff --git a/dev-haskell/gtk2hs/ChangeLog b/dev-haskell/gtk2hs/ChangeLog
index 0aa7a83be9d0..f9f217c42a0b 100644
--- a/dev-haskell/gtk2hs/ChangeLog
+++ b/dev-haskell/gtk2hs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-haskell/gtk2hs
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs/ChangeLog,v 1.10 2005/03/23 16:15:53 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs/ChangeLog,v 1.11 2005/05/08 14:53:43 dcoutts Exp $
+
+  08 May 2005; Duncan Coutts <dcoutts@gentoo.org>
+  +files/gtk2hs-0.9.7-ghc64.patch, gtk2hs-0.9.7.ebuild:
+  Add a patch for ghc-6.4 compatability.
 
   23 Mar 2005; Seemant Kulleen <seemant@gentoo.org> gtk2hs-0.9.7.ebuild:
   change dep from net-www/mozilla to www-client/mozilla
diff --git a/dev-haskell/gtk2hs/Manifest b/dev-haskell/gtk2hs/Manifest
index 1c563a96f18c..b3c8a45b87bd 100644
--- a/dev-haskell/gtk2hs/Manifest
+++ b/dev-haskell/gtk2hs/Manifest
@@ -1,6 +1,8 @@
-MD5 551e83cc724057274e99f592d3ba7bde ChangeLog 1275
+MD5 f30d4d3c20e28f4532c6dfc8097eed62 .ChangeLog.swp 12288
+MD5 ff647f8a6baf0b0d28d61438722a1e4b gtk2hs-0.9.7.ebuild 2864
+MD5 789207cdd739886542144a970d8e7698 ChangeLog 1423
+MD5 5cf11c08544b065d0144e11273f0000d metadata.xml 223
 MD5 785d6c4be9c0d72fcc6f890a83cf601d gtk2hs-0.9.6-r1.ebuild 2698
-MD5 5b826542f14267b048450fe16e549310 gtk2hs-0.9.7.ebuild 2381
-MD5 a769ecfcd1cdd2d40986627df7dfb249 metadata.xml 224
-MD5 96674cbaf4f6bddf1517166b6e6f13a5 files/digest-gtk2hs-0.9.6-r1 64
+MD5 690f4192d427c43531d990e34ff0ad0b files/gtk2hs-0.9.7-ghc64.patch.gz 6986
 MD5 6f7aca1981bfbd6384c83cea70a1e20c files/digest-gtk2hs-0.9.7 64
+MD5 96674cbaf4f6bddf1517166b6e6f13a5 files/digest-gtk2hs-0.9.6-r1 64
diff --git a/dev-haskell/gtk2hs/files/gtk2hs-0.9.7-ghc64.patch.gz b/dev-haskell/gtk2hs/files/gtk2hs-0.9.7-ghc64.patch.gz
new file mode 100644
index 000000000000..ada168cf7a82
--- /dev/null
+++ b/dev-haskell/gtk2hs/files/gtk2hs-0.9.7-ghc64.patch.gz
diff --git a/dev-haskell/gtk2hs/gtk2hs-0.9.7.ebuild b/dev-haskell/gtk2hs/gtk2hs-0.9.7.ebuild
index 1df451dac65d..df405c759fc2 100644
--- a/dev-haskell/gtk2hs/gtk2hs-0.9.7.ebuild
+++ b/dev-haskell/gtk2hs/gtk2hs-0.9.7.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs/gtk2hs-0.9.7.ebuild,v 1.2 2005/03/23 16:15:53 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs/gtk2hs-0.9.7.ebuild,v 1.3 2005/05/08 14:53:43 dcoutts Exp $
 
 inherit base check-reqs ghc-package
 
 DESCRIPTION="GTK+-2.x bindings for Haskell"
-HOMEPAGE="http://gtk2hs.sourceforge.net/"
+HOMEPAGE="http://haskell.org/gtk2hs/"
 SRC_URI="mirror://sourceforge/gtk2hs/${P}.tar.gz"
 LICENSE="LGPL-2 GPL-2"
 SLOT="0"
 
-KEYWORDS="~x86 ~ppc" #add ~sparc once we have ghc ~sparc
+KEYWORDS="~x86 ~ppc -amd64" #add ~sparc once we have ghc ~sparc
 
 IUSE="doc gnome mozilla"
 
@@ -29,6 +29,13 @@ pkg_setup() {
 	check_reqs
 }
 
+src_unpack() {
+	base_src_unpack
+
+	# patch for GHC 6.4 compatability
+	epatch ${FILESDIR}/gtk2hs-0.9.7-ghc64.patch.gz
+}
+
 src_compile() {
 	econf \
 		--libdir=$(ghc-libdir) \
@@ -41,7 +48,7 @@ src_compile() {
 		|| die "Configure failed"
 
 	# parallel build doesn't work, so specify -j1
-	emake -j1 HSTOOLFLAGS="-H300m -M350m" || die "Make failed"
+	emake -j1 HSTOOLFLAGS="-H380m -M380m" || die "Make failed"
 }
 
 src_install() {
@@ -52,19 +59,32 @@ src_install() {
 		haddockifacedir="/usr/share/doc/${PF}" \
 		|| die "Make install failed"
 
+	# for some reason it creates the doc dir even if it is configured
+	# to not generate docs, so lets remove the empty dirs in that case
+	# (and lets be cautious and only remove them if they're empty)
+	if ! use doc; then
+		rmdir ${D}/usr/share/doc/${PF}/html
+		rmdir ${D}/usr/share/doc/${PF}
+		rmdir ${D}/usr/share/doc
+		rmdir ${D}/usr/share
+	fi
+
 	# arrange for the packages to be registered
-	sed -i "s:\${pkglibdir}:$(ghc-libdir)/gtk2hs:" \
-		${D}/$(ghc-libdir)/gtk2hs/*.pkg
+	if ghc-cabal; then
+		pkgext=cabal
+	else
+		pkgext=pkg
+	fi
 	ghc-setup-pkg \
-		"${D}/$(ghc-libdir)/gtk2hs/glib.pkg" \
-		"${D}/$(ghc-libdir)/gtk2hs/gtk.pkg" \
-		"${D}/$(ghc-libdir)/gtk2hs/mogul.pkg" \
+		"${D}/$(ghc-libdir)/gtk2hs/glib.${pkgext}" \
+		"${D}/$(ghc-libdir)/gtk2hs/gtk.${pkgext}" \
+		"${D}/$(ghc-libdir)/gtk2hs/mogul.${pkgext}" \
 		$(useq gnome && echo \
-			"${D}/$(ghc-libdir)/gtk2hs/glade.pkg" \
-			"${D}/$(ghc-libdir)/gtk2hs/gconf.pkg" \
-			"${D}/$(ghc-libdir)/gtk2hs/sourceview.pkg") \
+			"${D}/$(ghc-libdir)/gtk2hs/glade.${pkgext}" \
+			"${D}/$(ghc-libdir)/gtk2hs/gconf.${pkgext}" \
+			"${D}/$(ghc-libdir)/gtk2hs/sourceview.${pkgext}") \
 		$(useq mozilla && echo \
-			"${D}/$(ghc-libdir)/gtk2hs/mozembed.pkg")
+			"${D}/$(ghc-libdir)/gtk2hs/mozembed.${pkgext}")
 	ghc-install-pkg
 
 	# build ghci .o files from .a files
diff --git a/dev-haskell/gtk2hs/metadata.xml b/dev-haskell/gtk2hs/metadata.xml
index a53a18c06081..6b65ac7fda83 100644
--- a/dev-haskell/gtk2hs/metadata.xml
+++ b/dev-haskell/gtk2hs/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
 <herd>haskell</herd>
 <maintainer>
-  <email>kosmikus@gentoo.org</email>
+  <email>dcoutts@gentoo.org</email>
 </maintainer>
 </pkgmetadata>