New version.

(Portage version: 2.0.51.19)

5 files changed, 108 insertions, 15 deletions

diff --git a/dev-haskell/gtk2hs/ChangeLog b/dev-haskell/gtk2hs/ChangeLog
index f9f217c42a0b..68293ecb888d 100644
--- a/dev-haskell/gtk2hs/ChangeLog
+++ b/dev-haskell/gtk2hs/ChangeLog
@@ -1,6 +1,15 @@
 # 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.11 2005/05/08 14:53:43 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs/ChangeLog,v 1.12 2005/06/24 05:52:51 dcoutts Exp $
+
+*gtk2hs-0.9.8 (24 Jun 2005)
+
+  24 Jun 2005; <duncan@gentoo.org> gtk2hs-0.9.7.ebuild,
+  +gtk2hs-0.9.8.ebuild:
+  New version.
+
+  20 May 2005; <duncan@gentoo.org> gtk2hs-0.9.7.ebuild:
+  Added ~sparc to KEYWORDS.
 
   08 May 2005; Duncan Coutts <dcoutts@gentoo.org>
   +files/gtk2hs-0.9.7-ghc64.patch, gtk2hs-0.9.7.ebuild:
diff --git a/dev-haskell/gtk2hs/Manifest b/dev-haskell/gtk2hs/Manifest
index 7f0df479c3a2..c4704b155edc 100644
--- a/dev-haskell/gtk2hs/Manifest
+++ b/dev-haskell/gtk2hs/Manifest
@@ -1,17 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 ff647f8a6baf0b0d28d61438722a1e4b gtk2hs-0.9.7.ebuild 2864
-MD5 789207cdd739886542144a970d8e7698 ChangeLog 1423
+MD5 69f1e6a7b3b86371e78986b364e4ee45 gtk2hs-0.9.8.ebuild 2721
+MD5 56b0d58c8e09661d36a7ec09289558a7 gtk2hs-0.9.7.ebuild 2835
+MD5 e288e5b58b8ce7169a437d08b42205c5 ChangeLog 1508
 MD5 5cf11c08544b065d0144e11273f0000d metadata.xml 223
 MD5 785d6c4be9c0d72fcc6f890a83cf601d gtk2hs-0.9.6-r1.ebuild 2698
 MD5 690f4192d427c43531d990e34ff0ad0b files/gtk2hs-0.9.7-ghc64.patch.gz 6986
 MD5 6f7aca1981bfbd6384c83cea70a1e20c files/digest-gtk2hs-0.9.7 64
+MD5 3b88c846dd87e7256e9396fbe9682f1f files/digest-gtk2hs-0.9.8 64
 MD5 96674cbaf4f6bddf1517166b6e6f13a5 files/digest-gtk2hs-0.9.6-r1 64
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCflqGI1lqEGTUzyQRAhRPAJ9sj6747TW+11qgGjCex8qyObgjJQCg1PqE
-Y50NuV1U3Ezia32CLDtYtig=
-=5aOs
------END PGP SIGNATURE-----
diff --git a/dev-haskell/gtk2hs/files/digest-gtk2hs-0.9.8 b/dev-haskell/gtk2hs/files/digest-gtk2hs-0.9.8
new file mode 100644
index 000000000000..b935c8f86331
--- /dev/null
+++ b/dev-haskell/gtk2hs/files/digest-gtk2hs-0.9.8
@@ -0,0 +1 @@
+MD5 2f7afbb25e7f0dc418ce06c63c0fe5ad gtk2hs-0.9.8.tar.gz 749983
diff --git a/dev-haskell/gtk2hs/gtk2hs-0.9.7.ebuild b/dev-haskell/gtk2hs/gtk2hs-0.9.7.ebuild
index df405c759fc2..706b7c987e98 100644
--- a/dev-haskell/gtk2hs/gtk2hs-0.9.7.ebuild
+++ b/dev-haskell/gtk2hs/gtk2hs-0.9.7.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-haskell/gtk2hs/gtk2hs-0.9.7.ebuild,v 1.3 2005/05/08 14:53:43 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs/gtk2hs-0.9.7.ebuild,v 1.4 2005/06/24 05:52:51 dcoutts Exp $
 
 inherit base check-reqs ghc-package
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/gtk2hs/${P}.tar.gz"
 LICENSE="LGPL-2 GPL-2"
 SLOT="0"
 
-KEYWORDS="~x86 ~ppc -amd64" #add ~sparc once we have ghc ~sparc
+KEYWORDS="~x86 ~ppc -amd64 ~sparc"
 
 IUSE="doc gnome mozilla"
 
diff --git a/dev-haskell/gtk2hs/gtk2hs-0.9.8.ebuild b/dev-haskell/gtk2hs/gtk2hs-0.9.8.ebuild
new file mode 100644
index 000000000000..e72fe038797b
--- /dev/null
+++ b/dev-haskell/gtk2hs/gtk2hs-0.9.8.ebuild
@@ -0,0 +1,91 @@
+# 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.8.ebuild,v 1.1 2005/06/24 05:52:51 dcoutts Exp $
+
+inherit base ghc-package multilib
+
+DESCRIPTION="GTK+-2.x bindings for Haskell"
+HOMEPAGE="http://haskell.org/gtk2hs/"
+SRC_URI="mirror://sourceforge/gtk2hs/${P}.tar.gz"
+LICENSE="LGPL-2"
+SLOT="0"
+
+KEYWORDS="~x86 -amd64"
+#enable amd64 when ghc-6.4.1 is out
+#enable sparc when CFLAGS/-mcpu ebuild bug is fixed
+#enable ppc when it's been tested!
+
+IUSE="doc gnome mozilla"
+
+DEPEND=">=virtual/ghc-5.04
+		>=x11-libs/gtk+-2
+		gnome? ( >=gnome-base/libglade-2
+				 >=x11-libs/gtksourceview-0.6
+				 >=gnome-base/gconf-2 )
+		mozilla? ( >=www-client/mozilla-1.4 )
+		doc? ( >=dev-haskell/haddock-0.6 )"
+
+src_compile() {
+	econf \
+		--enable-packager-mode \
+		`use_enable gnome libglade` \
+		`use_enable gnome gconf` \
+		`use_enable gnome sourceview` \
+		`use_enable mozilla mozilla` \
+		`use_enable doc docs` \
+		|| die "Configure failed"
+
+	# parallel build doesn't work, so specify -j1
+	emake -j1 || die "Make failed"
+}
+
+src_install() {
+
+	make install \
+		DESTDIR=${D} \
+		htmldir="/usr/share/doc/${PF}/html" \
+		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
+	if ghc-cabal; then
+		pkgext=cabal
+	else
+		pkgext=pkg
+	fi
+	ghc-setup-pkg \
+		"${D}/usr/$(get_libdir)/gtk2hs/glib.${pkgext}" \
+		"${D}/usr/$(get_libdir)/gtk2hs/gtk.${pkgext}" \
+		"${D}/usr/$(get_libdir)/gtk2hs/mogul.${pkgext}" \
+		$(useq gnome && echo \
+			"${D}/usr/$(get_libdir)/gtk2hs/glade.${pkgext}" \
+			"${D}/usr/$(get_libdir)/gtk2hs/gconf.${pkgext}" \
+			"${D}/usr/$(get_libdir)/gtk2hs/sourceview.${pkgext}") \
+		$(useq mozilla && echo \
+			"${D}/usr/$(get_libdir)/gtk2hs/mozembed.${pkgext}")
+	ghc-install-pkg
+
+	# build ghci .o files from .a files
+	ghc-makeghcilib ${D}/usr/$(get_libdir)/gtk2hs/libHSglib.a
+	ghc-makeghcilib ${D}/usr/$(get_libdir)/gtk2hs/libHSgtk.a
+	ghc-makeghcilib ${D}/usr/$(get_libdir)/gtk2hs/libHSmogul.a
+	if use gnome; then
+		ghc-makeghcilib ${D}/usr/$(get_libdir)/gtk2hs/libHSglade.a
+		ghc-makeghcilib ${D}/usr/$(get_libdir)/gtk2hs/libHSgconf.a
+		ghc-makeghcilib ${D}/usr/$(get_libdir)/gtk2hs/libHSsourceview.a
+	fi
+	if use mozilla; then
+		ghc-makeghcilib ${D}/usr/$(get_libdir)/gtk2hs/libHSmozembed.a
+	fi
+}
+