New version. Hopefully this fixes bug #144028.

(Portage version: 2.1.2.9)

4 files changed, 116 insertions, 7 deletions

diff --git a/dev-haskell/gtk2hs/ChangeLog b/dev-haskell/gtk2hs/ChangeLog
index 0fab9d239c7f..bfddc0fdb205 100644
--- a/dev-haskell/gtk2hs/ChangeLog
+++ b/dev-haskell/gtk2hs/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-haskell/gtk2hs
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs/ChangeLog,v 1.32 2007/06/03 18:57:55 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs/ChangeLog,v 1.33 2007/07/27 21:18:24 dcoutts Exp $
+
+*gtk2hs-0.9.12 (27 Jul 2007)
+
+  27 Jul 2007; Duncan Coutts <dcoutts@gentoo.org> gtk2hs-0.9.11.ebuild,
+  +gtk2hs-0.9.12.ebuild:
+  New version. Hopefully this fixes bug #144028.
+  Also allow building with xulrunner.
 
   03 Jun 2007; Duncan Coutts <dcoutts@gentoo.org> gtk2hs-0.9.11.ebuild:
   Fix seamonkey build, should fix bug #180682.
diff --git a/dev-haskell/gtk2hs/files/digest-gtk2hs-0.9.12 b/dev-haskell/gtk2hs/files/digest-gtk2hs-0.9.12
new file mode 100644
index 000000000000..10f71c887df2
--- /dev/null
+++ b/dev-haskell/gtk2hs/files/digest-gtk2hs-0.9.12
@@ -0,0 +1,3 @@
+MD5 32752a42c225f55b0280151f8e19a3ed gtk2hs-0.9.12.tar.gz 997153
+RMD160 bfc3ad81be80fdbbf1694493d93ddf863efbf6d8 gtk2hs-0.9.12.tar.gz 997153
+SHA256 b7427fca5d1958a829b2623715a9b16d4b08d67820df0b46ad32e5bd6e1f44d2 gtk2hs-0.9.12.tar.gz 997153
diff --git a/dev-haskell/gtk2hs/gtk2hs-0.9.11.ebuild b/dev-haskell/gtk2hs/gtk2hs-0.9.11.ebuild
index 2c059ee2866c..d6637337dac6 100644
--- a/dev-haskell/gtk2hs/gtk2hs-0.9.11.ebuild
+++ b/dev-haskell/gtk2hs/gtk2hs-0.9.11.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs/gtk2hs-0.9.11.ebuild,v 1.3 2007/06/03 18:57:55 dcoutts Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs/gtk2hs-0.9.11.ebuild,v 1.4 2007/07/27 21:18:24 dcoutts Exp $
 
-inherit base eutils ghc-package multilib
+inherit base eutils ghc-package multilib toolchain-funcs versionator
 
 DESCRIPTION="A GUI Library for Haskell based on Gtk+"
 HOMEPAGE="http://haskell.org/gtk2hs/"
@@ -12,9 +12,9 @@ SLOT="0"
 
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
 
-IUSE="doc glade gnome opengl firefox seamonkey profile"
+IUSE="doc glade gnome opengl firefox seamonkey profile xulrunner"
 
-RDEPEND=">=virtual/ghc-6.2.2
+RDEPEND=">=dev-lang/ghc-6.2
 		dev-haskell/mtl
 		>=x11-libs/gtk+-2
 		glade? ( >=gnome-base/libglade-2 )
@@ -24,13 +24,16 @@ RDEPEND=">=virtual/ghc-6.2.2
 				 >=gnome-base/librsvg-2.16 )
 		opengl? ( x11-libs/gtkglext )
 		seamonkey? ( >=www-client/seamonkey-1.0.2 )
-		firefox? ( >=www-client/mozilla-firefox-1.0.4 )"
+		firefox? ( >=www-client/mozilla-firefox-1.0.4 )
+		xulrunner? ( net-libs/xulrunner )"
 DEPEND="${RDEPEND}
 		doc? ( >=dev-haskell/haddock-0.7 )"
 
 src_compile() {
 	econf \
 		--enable-packager-mode \
+		$(version_is_at_least "4.2" "$(gcc-version)" && \
+			echo --disable-split-objs) \
 		$(has_version '>=x11-libs/gtk+-2.8' && echo --enable-cairo) \
 		$(use glade || use gnome && echo --enable-libglade) \
 		$(use_enable gnome gconf) \
@@ -39,6 +42,7 @@ src_compile() {
 		$(use_enable opengl opengl) \
 		$(use_enable seamonkey seamonkey) \
 		$(use_enable firefox firefox) \
+		$(use_enable xulrunner xulrunner) \
 		$(use_enable doc docs) \
 		$(use_enable profile profiling) \
 		|| die "Configure failed"
@@ -85,7 +89,7 @@ src_install() {
 			"${D}/usr/$(get_libdir)/gtk2hs/svgcairo.${pkgext}") \
 		$(use opengl && echo \
 			"${D}/usr/$(get_libdir)/gtk2hs/gtkglext.${pkgext}") \
-		$(use seamonkey || use firefox && echo \
+		$(use seamonkey || use firefox || use xulrunner && echo \
 			"${D}/usr/$(get_libdir)/gtk2hs/mozembed.${pkgext}")
 	ghc-install-pkg
 }
diff --git a/dev-haskell/gtk2hs/gtk2hs-0.9.12.ebuild b/dev-haskell/gtk2hs/gtk2hs-0.9.12.ebuild
new file mode 100644
index 000000000000..c0432691e6bb
--- /dev/null
+++ b/dev-haskell/gtk2hs/gtk2hs-0.9.12.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs/gtk2hs-0.9.12.ebuild,v 1.1 2007/07/27 21:18:24 dcoutts Exp $
+
+inherit base eutils ghc-package multilib toolchain-funcs versionator
+
+DESCRIPTION="A GUI Library for Haskell based on Gtk+"
+HOMEPAGE="http://haskell.org/gtk2hs/"
+SRC_URI="mirror://sourceforge/gtk2hs/${P}.tar.gz"
+LICENSE="LGPL-2.1"
+SLOT="0"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="doc glade gnome opengl firefox seamonkey profile xulrunner"
+
+RDEPEND=">=dev-lang/ghc-6.2
+		dev-haskell/mtl
+		>=x11-libs/gtk+-2
+		glade? ( >=gnome-base/libglade-2 )
+		gnome? ( >=gnome-base/libglade-2
+				 >=x11-libs/gtksourceview-0.6
+				 >=gnome-base/gconf-2
+				 >=gnome-base/librsvg-2.16 )
+		opengl? ( x11-libs/gtkglext )
+		seamonkey? ( >=www-client/seamonkey-1.0.2 )
+		firefox? ( >=www-client/mozilla-firefox-1.0.4 )
+		xulrunner? ( net-libs/xulrunner )"
+DEPEND="${RDEPEND}
+		doc? ( >=dev-haskell/haddock-0.8 )"
+
+src_compile() {
+	econf \
+		--enable-packager-mode \
+		$(version_is_at_least "4.2" "$(gcc-version)" && \
+			echo --disable-split-objs) \
+		$(has_version '>=x11-libs/gtk+-2.8' && echo --enable-cairo) \
+		$(use glade || use gnome && echo --enable-libglade) \
+		$(use_enable gnome gconf) \
+		$(use_enable gnome sourceview) \
+		$(use_enable gnome svg) \
+		$(use_enable opengl opengl) \
+		$(use_enable seamonkey seamonkey) \
+		$(use_enable firefox firefox) \
+		$(use_enable xulrunner xulrunner) \
+		$(use_enable doc docs) \
+		$(use_enable profile profiling) \
+		|| 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=package.conf
+	else
+		pkgext=pkg
+	fi
+	ghc-setup-pkg \
+		"${D}/usr/$(get_libdir)/gtk2hs/glib.${pkgext}" \
+		$(has_version '>=x11-libs/gtk+-2.8' && echo \
+			"${D}/usr/$(get_libdir)/gtk2hs/cairo.${pkgext}") \
+		"${D}/usr/$(get_libdir)/gtk2hs/gtk.${pkgext}" \
+		"${D}/usr/$(get_libdir)/gtk2hs/soegtk.${pkgext}" \
+		$(use glade || use gnome && echo \
+			"${D}/usr/$(get_libdir)/gtk2hs/glade.${pkgext}") \
+		$(use gnome && echo \
+			"${D}/usr/$(get_libdir)/gtk2hs/gconf.${pkgext}" \
+			"${D}/usr/$(get_libdir)/gtk2hs/sourceview.${pkgext}" \
+			"${D}/usr/$(get_libdir)/gtk2hs/svgcairo.${pkgext}") \
+		$(use opengl && echo \
+			"${D}/usr/$(get_libdir)/gtk2hs/gtkglext.${pkgext}") \
+		$(use seamonkey || use firefox || use xulrunner && echo \
+			"${D}/usr/$(get_libdir)/gtk2hs/mozembed.${pkgext}")
+	ghc-install-pkg
+}