New revision with patch for the treestore.

(Portage version: 2.1_pre7-r4)

5 files changed, 161 insertions, 1 deletions

diff --git a/dev-haskell/gtk2hs/ChangeLog b/dev-haskell/gtk2hs/ChangeLog
index 07ff9f4cfecd..fa3ca0520fae 100644
--- a/dev-haskell/gtk2hs/ChangeLog
+++ b/dev-haskell/gtk2hs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-haskell/gtk2hs
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs/ChangeLog,v 1.26 2006/03/01 19:25:58 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs/ChangeLog,v 1.27 2006/04/07 21:29:31 araujo Exp $
+
+*gtk2hs-0.9.10-r1 (07 Apr 2006)
+
+  07 Apr 2006; Luis F. Araujo <araujo@gentoo.org>
+  +files/gtk2hs-0.9.10-store.patch, +gtk2hs-0.9.10-r1.ebuild:
+  New revision with patch for the treestore.
 
   01 Mar 2006; Markus Rothe <corsair@gentoo.org> gtk2hs-0.9.10.ebuild:
   Added ~ppc64; bug #124469
diff --git a/dev-haskell/gtk2hs/Manifest b/dev-haskell/gtk2hs/Manifest
index 37e190dbd0c4..6bbce008e621 100644
--- a/dev-haskell/gtk2hs/Manifest
+++ b/dev-haskell/gtk2hs/Manifest
@@ -1,8 +1,33 @@
 MD5 5b78b37d9d7f27e8ed6604ad567684ef ChangeLog 3292
+RMD160 018c3a9d721d61a3cb952c90dfa75ecd1dbfa411 ChangeLog 3292
+SHA256 34ade8b8330a9657c2958bdec6483ba2e36174ffc4a7db4d2fabf16b9b6b93dd ChangeLog 3292
 MD5 d165e3eb925c10e6c6316aec5b6b7477 files/digest-gtk2hs-0.9.10 241
+RMD160 935c458d76ad82bde6181be1f45d59deb695926d files/digest-gtk2hs-0.9.10 241
+SHA256 501f52c81b4d0072d05c93246175010dc391d7bf6b3e8b36f3d6eeed99a436bd files/digest-gtk2hs-0.9.10 241
+MD5 d165e3eb925c10e6c6316aec5b6b7477 files/digest-gtk2hs-0.9.10-r1 241
+RMD160 935c458d76ad82bde6181be1f45d59deb695926d files/digest-gtk2hs-0.9.10-r1 241
+SHA256 501f52c81b4d0072d05c93246175010dc391d7bf6b3e8b36f3d6eeed99a436bd files/digest-gtk2hs-0.9.10-r1 241
 MD5 a0148d13d7414bb83ec383c7124ea654 files/digest-gtk2hs-0.9.9 64
+RMD160 0363b492a3048160b3ae3cd414bf15e54ef16957 files/digest-gtk2hs-0.9.9 64
+SHA256 6f6c55dfd880134a0fe7d0e247b9244c0c65212f0fa5ec9a42825065e7576dee files/digest-gtk2hs-0.9.9 64
 MD5 a9f993b40c06f3946a5ea7135e753bb3 files/gtk2hs-0.9.10-cflags.patch 1233
+RMD160 eb5cb160a304cc4f5535be9a218549aaaad7c56c files/gtk2hs-0.9.10-cflags.patch 1233
+SHA256 867b3dec0d2d0bea714f85eadcc4825dd1815f021feb53bb070d1f78e330ccef files/gtk2hs-0.9.10-cflags.patch 1233
 MD5 1d88116a10dcaabba0212ade034f0815 files/gtk2hs-0.9.10-ghc622.patch 1440
+RMD160 aa50f1a098efbb464993c2824314f79b58131ead files/gtk2hs-0.9.10-ghc622.patch 1440
+SHA256 48d5b2565eb8a77658f0e6950e021cbf1a0c88ba2810fd8f4ece0c92d4d23b66 files/gtk2hs-0.9.10-ghc622.patch 1440
+MD5 7f8f0b73ff10730feb4320d63f0e5809 files/gtk2hs-0.9.10-store.patch 678
+RMD160 9369b99cfca278e252ea6b5c25ba23bcb53603e8 files/gtk2hs-0.9.10-store.patch 678
+SHA256 e47de4d759ff4e68ef9d278ddb5d8db77c463a87ac964578fe929db0ba1cf06f files/gtk2hs-0.9.10-store.patch 678
+MD5 1b158b42e32542ac4c3fd41bc2952fab gtk2hs-0.9.10-r1.ebuild 3613
+RMD160 ebbd7cf1ca0782637a4c54578d5d56656e4803d1 gtk2hs-0.9.10-r1.ebuild 3613
+SHA256 fee7b5e543ee15ed27727e2d0d86a3529bf58c5f47bac328bc86937ad7d1607a gtk2hs-0.9.10-r1.ebuild 3613
 MD5 e68bd175dbd9ac56aa6cd5ef282970d2 gtk2hs-0.9.10.ebuild 3566
+RMD160 431fb2c562f61882821e6dddf42c9057626ba8a7 gtk2hs-0.9.10.ebuild 3566
+SHA256 b1550e9b94cbf20ba2471011bf078acf74d6da796f9f0fbd5d77a186db34364c gtk2hs-0.9.10.ebuild 3566
 MD5 05c2042c54431c623ff56c03e7b5c1f1 gtk2hs-0.9.9.ebuild 2698
+RMD160 6df67a58d8596e648acbdf6c2d369bf032f681ba gtk2hs-0.9.9.ebuild 2698
+SHA256 aa1337b8b7f89adb27b00e3ad5f73f20665c61cdd1853c651b82d0b661c9f43c gtk2hs-0.9.9.ebuild 2698
 MD5 5cf11c08544b065d0144e11273f0000d metadata.xml 223
+RMD160 eb1d7f78c4800a9e0b74e5d99b83a17d0eb247be metadata.xml 223
+SHA256 8c4b3cde4b0d254edca1f695296876df4ac96ca844d68e8152cfc5f6dbe39792 metadata.xml 223
diff --git a/dev-haskell/gtk2hs/files/digest-gtk2hs-0.9.10-r1 b/dev-haskell/gtk2hs/files/digest-gtk2hs-0.9.10-r1
new file mode 100644
index 000000000000..7326ea1f2c69
--- /dev/null
+++ b/dev-haskell/gtk2hs/files/digest-gtk2hs-0.9.10-r1
@@ -0,0 +1,3 @@
+MD5 13d300e07153f37ba5893ac336b078bc gtk2hs-0.9.10.tar.gz 830866
+RMD160 2b0a5275b43c0b22588028ba7944622ff08fbbb6 gtk2hs-0.9.10.tar.gz 830866
+SHA256 da99b248f3674acba43bd636d1c67813851290ed11860f7f99a44a882cdea924 gtk2hs-0.9.10.tar.gz 830866
diff --git a/dev-haskell/gtk2hs/files/gtk2hs-0.9.10-store.patch b/dev-haskell/gtk2hs/files/gtk2hs-0.9.10-store.patch
new file mode 100644
index 000000000000..38794a89662f
--- /dev/null
+++ b/dev-haskell/gtk2hs/files/gtk2hs-0.9.10-store.patch
@@ -0,0 +1,12 @@
+diff -urwpN gtk2hs-0.9.10.orig/glib/System/Glib/GValue.chs gtk2hs-0.9.10/glib/System/Glib/GValue.chs
+--- gtk2hs-0.9.10.orig/glib/System/Glib/GValue.chs	2005-04-18 22:04:08.000000000 -0400
++++ gtk2hs-0.9.10/glib/System/Glib/GValue.chs	2006-03-05 14:53:20.000000000 -0400
+@@ -68,7 +68,7 @@ valueGetType (GValue gvPtr) = {# get GVa
+ --
+ allocaGValue :: (GValue -> IO b) -> IO b
+ allocaGValue body =
+-  allocaBytes {# sizeof GValue #} $ \gvPtr -> do
++  allocaBytes ({# sizeof GType #}+ 2* {# sizeof guint64 #}) $ \gvPtr -> do
+   -- The g_type field of the value must be zero or g_value_init will fail.
+   {# set GValue->g_type #} gvPtr (0 :: GType)
+   result <- body (GValue gvPtr)
diff --git a/dev-haskell/gtk2hs/gtk2hs-0.9.10-r1.ebuild b/dev-haskell/gtk2hs/gtk2hs-0.9.10-r1.ebuild
new file mode 100644
index 000000000000..df15091df2a6
--- /dev/null
+++ b/dev-haskell/gtk2hs/gtk2hs-0.9.10-r1.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs/gtk2hs-0.9.10-r1.ebuild,v 1.1 2006/04/07 21:29:31 araujo Exp $
+
+inherit base eutils ghc-package multilib autotools
+
+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"
+SLOT="0"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+#enable sparc when CFLAGS/-mcpu ebuild bug is fixed
+
+IUSE="doc glade gnome mozilla firefox"
+
+RDEPEND=">=virtual/ghc-5.04.3
+		amd64? ( || ( >=dev-lang/ghc-6.4.1 >=dev-lang/ghc-bin-6.4.1 ) )
+		>=x11-libs/gtk+-2
+		glade? ( >=gnome-base/libglade-2 )
+		gnome? ( >=gnome-base/libglade-2
+				 >=x11-libs/gtksourceview-0.6
+				 >=gnome-base/gconf-2 )
+		mozilla? ( >=www-client/mozilla-1.4 )
+		firefox? ( >=www-client/mozilla-firefox-1.0.4 )"
+DEPEND="${RDEPEND}
+		doc? ( >=dev-haskell/haddock-0.7 )"
+
+src_unpack() {
+	base_src_unpack
+	cd "${S}"
+	epatch "${FILESDIR}/${PN}-0.9.10-cflags.patch"
+	epatch "${FILESDIR}/${PN}-0.9.10-ghc622.patch"
+	epatch "${FILESDIR}/${PN}-0.9.10-store.patch"
+}
+
+src_compile() {
+	# only needed because of the cflags patch above.
+	eautoreconf
+
+	econf \
+		--enable-packager-mode \
+		$(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 mozilla mozilla) \
+		$(use_enable firefox firefox) \
+		$(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=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/mogul.${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}") \
+		$(use mozilla || use firefox && 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"
+	if has_version '>=x11-libs/gtk+-2.8'; then
+		ghc-makeghcilib "${D}/usr/$(get_libdir)/gtk2hs/libHScairo.a"
+	fi
+	ghc-makeghcilib "${D}/usr/$(get_libdir)/gtk2hs/libHSgtk.a"
+	ghc-makeghcilib "${D}/usr/$(get_libdir)/gtk2hs/libHSmogul.a"
+	if use glade || use gnome; then
+		ghc-makeghcilib "${D}/usr/$(get_libdir)/gtk2hs/libHSglade.a"
+	fi
+	if use gnome; then
+		ghc-makeghcilib "${D}/usr/$(get_libdir)/gtk2hs/libHSgconf.a"
+		ghc-makeghcilib "${D}/usr/$(get_libdir)/gtk2hs/libHSsourceview.a"
+	fi
+	if use mozilla || use firefox; then
+		ghc-makeghcilib "${D}/usr/$(get_libdir)/gtk2hs/libHSmozembed.a"
+	fi
+}
+