New version (bug #79352).

8 files changed, 92 insertions, 212 deletions

diff --git a/dev-haskell/gtk2hs/ChangeLog b/dev-haskell/gtk2hs/ChangeLog
index 67226dcc0181..b79ec145701d 100644
--- a/dev-haskell/gtk2hs/ChangeLog
+++ b/dev-haskell/gtk2hs/ChangeLog
@@ -1,6 +1,11 @@
 # 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.8 2005/01/19 11:00:27 kosmikus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs/ChangeLog,v 1.9 2005/01/26 17:31:00 kosmikus Exp $
+
+*gtk2hs-0.9.7 (26 Jan 2005)
+
+  26 Jan 2005; Andres Loeh <kosmikus@gentoo.org> +gtk2hs-0.9.7.ebuild:
+  New version (bug #79352).
 
   19 Jan 2005; Andres Loeh <kosmikus@gentoo.org> gtk2hs-0.9.6-r1.ebuild:
   Added a check of the memory requirements (see bug #62790, comment 37)
diff --git a/dev-haskell/gtk2hs/Manifest b/dev-haskell/gtk2hs/Manifest
index a712e21ced7a..8cdba8f848c4 100644
--- a/dev-haskell/gtk2hs/Manifest
+++ b/dev-haskell/gtk2hs/Manifest
@@ -1,8 +1,10 @@
 MD5 1366f724924c5a7023a7233d3f6b0793 gtk2hs-0.9.6.ebuild 3857
 MD5 d7cadbfc7d1c55bd4563a540c2a67c75 gtk2hs-0.9.5.ebuild 2588
+MD5 00af4f9973648312b2d041402dbbae96 gtk2hs-0.9.7.ebuild 2277
 MD5 1e1ff705775b41fca6776c5433bca17d ChangeLog 1016
 MD5 a769ecfcd1cdd2d40986627df7dfb249 metadata.xml 224
 MD5 785d6c4be9c0d72fcc6f890a83cf601d gtk2hs-0.9.6-r1.ebuild 2698
 MD5 2785816eabb8f055db732986a48f65fd files/digest-gtk2hs-0.9.5 64
 MD5 96674cbaf4f6bddf1517166b6e6f13a5 files/digest-gtk2hs-0.9.6 64
+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/digest-gtk2hs-0.9.5 b/dev-haskell/gtk2hs/files/digest-gtk2hs-0.9.5
deleted file mode 100644
index 1c1d5389c8e9..000000000000
--- a/dev-haskell/gtk2hs/files/digest-gtk2hs-0.9.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 cfbf29ce7ea5621e82856081aa246ef8 gtk2hs-0.9.5.tar.gz 436231
diff --git a/dev-haskell/gtk2hs/files/digest-gtk2hs-0.9.6 b/dev-haskell/gtk2hs/files/digest-gtk2hs-0.9.6
deleted file mode 100644
index 8016e09cd9b1..000000000000
--- a/dev-haskell/gtk2hs/files/digest-gtk2hs-0.9.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 fdd2d08d9789d1011b44a1df048c95b9 gtk2hs-0.9.6.tar.gz 457131
diff --git a/dev-haskell/gtk2hs/files/digest-gtk2hs-0.9.7 b/dev-haskell/gtk2hs/files/digest-gtk2hs-0.9.7
new file mode 100644
index 000000000000..b7310f8e53ef
--- /dev/null
+++ b/dev-haskell/gtk2hs/files/digest-gtk2hs-0.9.7
@@ -0,0 +1 @@
+MD5 af4476dec61c82bd522b537155282fb9 gtk2hs-0.9.7.tar.gz 546945
diff --git a/dev-haskell/gtk2hs/gtk2hs-0.9.5.ebuild b/dev-haskell/gtk2hs/gtk2hs-0.9.5.ebuild
deleted file mode 100644
index b239628bb4a7..000000000000
--- a/dev-haskell/gtk2hs/gtk2hs-0.9.5.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# 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.5.ebuild,v 1.3 2005/01/01 18:04:13 eradicator Exp $
-
-DESCRIPTION="GTK+-2.x bindings for Haskell"
-HOMEPAGE="http://gtk2hs.sourceforge.net/"
-SRC_URI="mirror://sourceforge/gtk2hs/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~x86"
-
-IUSE="gnome"
-
-RDEPEND=">=virtual/ghc-6.2
-	>=x11-libs/gtk+-2
-	gnome? ( >=gnome-base/libglade-2
-		>=x11-libs/gtksourceview-0.6 )"
-
-DEPEND="${RDEPEND}"
-
-# the variable ghc_version is used to store the ghc version
-# we are building against
-
-src_compile() {
-	# determine ghc library directory
-	# (so that it's possible to install the library for
-	# multiple versions of ghc)
-	local myopts
-	ghc_version=`best_version virtual/ghc | sed "s:.*/::"`
-	test -n ${ghc_version} && ghclibdir="/usr/lib/${ghc_version}"
-	test -n ${ghclibdir} || ghclibdir="/usr/lib"
-	test -n ${ghclibdir} && myopts="${myopts} --libdir=${D}${ghclibdir}"
-
-	# configure, override hc flags to not specify heap size
-	econf --with-hcflags="-O" \
-		`use_enable gnome sourceview` \
-		`use_enable gnome libglade` \
-		--disable-glext \
-		${myopts} \
-		|| die "Configure failed"
-
-	# parallel build doesn't work, so specify -j1
-	emake -j1 || die "Make failed"
-}
-
-src_install() {
-
-	make install-without-pkg || die "Make install failed"
-
-	# correct the package config files
-	sed -i "s:${D}::g" ${D}/${ghclibdir}/*.conf
-
-	# build ghci .o files from .a files
-	ld -r -x -o ${D}/${ghclibdir}/gtk2hs.o \
-		--whole-archive ${D}/${ghclibdir}/libgtk2hs.a
-	ld -r -x -o  ${D}/${ghclibdir}/mogul.o \
-		--whole-archive ${D}/${ghclibdir}/libmogul.a
-	use gnome && ld -r -x -o  ${D}/${ghclibdir}/sourceview.o \
-		--whole-archive ${D}/${ghclibdir}/libsourceview.a
-	use gnome && ld -r -x -o  ${D}/${ghclibdir}/glade2hs.o \
-		--whole-archive ${D}/${ghclibdir}/libglade2hs.a
-}
-
-pkg_postinst() {
-	register_ghc_packages
-}
-
-register_ghc_packages() {
-	einfo "Registering gtk2hs packages"
-	ghc-pkg -u -i ${ghclibdir}/gtk2.conf
-	ghc-pkg -u -i ${ghclibdir}/mogul.conf
-# sourceview package not usable from ghci due to linking problems
-#	use gnome && ghc-pkg -u -i ${ghclibdir}/sourceview.conf
-	use gnome && ghc-pkg -u -i ${ghclibdir}/glade.conf
-}
-
-pkg_prerm() {
-	# check if another version is still there
-	has_version "<${CATEGORY}/${PF}" \
-		|| has_version ">${CATEGORY}/${PF}" \
-		|| unregister_ghc_packages
-}
-
-unregister_ghc_packages() {
-	einfo "Unregistering gtk2hs packages"
-	ghc-pkg -r gtk2
-	ghc-pkg -r mogul
-	ghc-pkg -r glade
-	ghc-pkg -r sourceview
-}
-
diff --git a/dev-haskell/gtk2hs/gtk2hs-0.9.6.ebuild b/dev-haskell/gtk2hs/gtk2hs-0.9.6.ebuild
deleted file mode 100644
index 5ae10d9ba421..000000000000
--- a/dev-haskell/gtk2hs/gtk2hs-0.9.6.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# 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.6.ebuild,v 1.3 2005/01/01 18:04:13 eradicator Exp $
-
-DESCRIPTION="GTK+-2.x bindings for Haskell"
-HOMEPAGE="http://gtk2hs.sourceforge.net/"
-SRC_URI="mirror://sourceforge/gtk2hs/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~x86"
-
-IUSE="gnome"
-
-DEPEND=">=virtual/ghc-5.04
-		>=x11-libs/gtk+-2
-		gnome? ( >=gnome-base/libglade-2
-		         >=x11-libs/gtksourceview-0.6
-				 >=gnome-base/gconf-2 )"
-
-# the variable ghc_version is used to store the ghc version
-# we are building against
-
-src_compile() {
-	# determine ghc library directory
-	# (so that it's possible to install the library for
-	# multiple versions of ghc)
-	local myopts
-	ghc_version=`best_version virtual/ghc | sed "s:.*/::"`
-	test -n ${ghc_version} && ghclibdir="/usr/lib/${ghc_version}"
-	test -n ${ghclibdir} || ghclibdir="/usr/lib"
-	test -n ${ghclibdir} && myopts="${myopts} --libdir=${D}${ghclibdir}"
-
-	# configure, override hc flags to not specify heap size
-	econf --with-hcflags="-O" \
-	    `use_enable gnome gnome` \
-		`use_enable gnome libglade` \
-		${myopts} \
-		|| die "Configure failed"
-
-	#fix for bug in 0.9.6 tarball, directory missing so don't compile that demo
-	sed -i 's/MAKE_APPS += demo\/filechooser//' ${S}/Makefile
-	#or work out how to build without demos
-
-	# parallell build doesn't work, so specify -j1
-	emake -j1 || die "Make failed"
-}
-
-src_install() {
-
-	make install-without-pkg || die "Make install failed"
-
-	#the following actions are all for bug fixes:
-
-	# correct the package config files
-	sed -i "s:${D}::g" ${D}/${ghclibdir}/gtk2hs/*/*.conf
-
-	# build ghci .o files from .a files
-	ld -r -x -o ${D}/${ghclibdir}/gtk2hs/gtk2/gtk2hs.o \
-		--whole-archive ${D}/${ghclibdir}/gtk2hs/gtk2/libgtk2hs.a
-	ld -r -x -o  ${D}/${ghclibdir}/gtk2hs/mogul/mogul.o \
-		--whole-archive ${D}/${ghclibdir}/gtk2hs/mogul/libmogul.a
-	if use gnome ; then
-		ld -r -x -o ${D}/${ghclibdir}/gtk2hs/sourceview/sourceview.o \
-			--whole-archive ${D}/${ghclibdir}/gtk2hs/sourceview/libsourceview.a
-		ld -r -x -o ${D}/${ghclibdir}/gtk2hs/glade/glade2hs.o \
-			--whole-archive ${D}/${ghclibdir}/gtk2hs/glade/libglade2hs.a
-		ld -r -x -o ${D}/${ghclibdir}/gtk2hs/gconf/gconf.o \
-			--whole-archive ${D}/${ghclibdir}/gtk2hs/gconf/libgconf.a
-	fi
-
-	# fix dynamic linking with pthread bug for glade & sourview
-	sed -i 's:"pthread",::' ${D}/${ghclibdir}/gtk2hs/sourceview/sourceview.conf
-	sed -i 's:"pthread",::' ${D}/${ghclibdir}/gtk2hs/glade/glade.conf
-
-	# fix gconf hi file location install bug
-	mkdirhier ${D}/${ghclibdir}/gtk2hs/gconf/hi/System/Gnome/GConf
-	mv ${D}/${ghclibdir}/gtk2hs/gconf/hi/GConf.hi \
-	   ${D}/${ghclibdir}/gtk2hs/gconf/hi/System/Gnome/
-	mv ${D}/${ghclibdir}/gtk2hs/gconf/hi/GConfClient.hi \
-	   ${D}/${ghclibdir}/gtk2hs/gconf/hi/System/Gnome/GConf/
-	mv ${D}/${ghclibdir}/gtk2hs/gconf/hi/GConfType.hi \
-	   ${D}/${ghclibdir}/gtk2hs/gconf/hi/System/Gnome/GConf/
-	mv ${D}/${ghclibdir}/gtk2hs/gconf/hi/GConfValue.hi \
-	   ${D}/${ghclibdir}/gtk2hs/gconf/hi/System/Gnome/GConf/
-}
-
-pkg_postinst() {
-	register_ghc_packages
-}
-
-register_ghc_packages() {
-	einfo "Registering gtk2hs packages"
-	ghc-pkg -u -i ${ghclibdir}/gtk2hs/gtk2/gtk2.conf
-	ghc-pkg -u -i ${ghclibdir}/gtk2hs/mogul/mogul.conf
-	if use gnome ; then
-		ghc-pkg -u -i ${ghclibdir}/gtk2hs/sourceview/sourceview.conf
-		ghc-pkg -u -i ${ghclibdir}/gtk2hs/glade/glade.conf
-		ghc-pkg -u -i ${ghclibdir}/gtk2hs/gconf/gconf.conf
-	fi
-}
-
-pkg_prerm() {
-	# check if another version is still there
-	has_version "<${CATEGORY}/${PF}" \
-		|| has_version ">${CATEGORY}/${PF}" \
-		|| unregister_ghc_packages
-}
-
-unregister_ghc_packages() {
-	einfo "Unregistering gtk2hs packages"
-	ghc-pkg -r gtk2
-	ghc-pkg -r mogul
-	ghc-pkg -r glade
-	ghc-pkg -r sourceview
-	ghc-pkg -r gconf
-}
diff --git a/dev-haskell/gtk2hs/gtk2hs-0.9.7.ebuild b/dev-haskell/gtk2hs/gtk2hs-0.9.7.ebuild
new file mode 100644
index 000000000000..e46a5f11f9b5
--- /dev/null
+++ b/dev-haskell/gtk2hs/gtk2hs-0.9.7.ebuild
@@ -0,0 +1,83 @@
+# 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.1 2005/01/26 17:31:00 kosmikus Exp $
+
+inherit base check-reqs ghc-package
+
+DESCRIPTION="GTK+-2.x bindings for Haskell"
+HOMEPAGE="http://gtk2hs.sourceforge.net/"
+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
+
+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? ( >=net-www/mozilla-1.4 )
+		doc? ( >=dev-haskell/haddock-0.6 )"
+
+pkg_setup() {
+	# need this much memory (in MBytes) (does *not* check swap)
+	CHECKREQS_MEMORY="400"
+
+	check_reqs
+}
+
+src_compile() {
+	econf \
+		--libdir=$(ghc-libdir) \
+		--with-hcflags="-O" \
+		--without-pkgreg \
+		`use_enable gnome gnome` \
+		`use_enable gnome libglade` \
+		`use_enable mozilla mozilla` \
+		`use_enable doc docs` \
+		|| die "Configure failed"
+
+	# parallel build doesn't work, so specify -j1
+	emake -j1 HSTOOLFLAGS="-H300m -M350m" || die "Make failed"
+}
+
+src_install() {
+
+	make install \
+		DESTDIR=${D} \
+		htmldir="/usr/share/doc/${PF}/html" \
+		haddockifacedir="/usr/share/doc/${PF}" \
+		|| die "Make install failed"
+
+	# arrange for the packages to be registered
+	sed -i "s:\${pkglibdir}:$(ghc-libdir)/gtk2hs:" \
+		${D}/$(ghc-libdir)/gtk2hs/*.pkg
+	ghc-setup-pkg \
+		"${D}/$(ghc-libdir)/gtk2hs/glib.pkg" \
+		"${D}/$(ghc-libdir)/gtk2hs/gtk.pkg" \
+		"${D}/$(ghc-libdir)/gtk2hs/mogul.pkg" \
+		$(useq gnome && echo \
+			"${D}/$(ghc-libdir)/gtk2hs/glade.pkg" \
+			"${D}/$(ghc-libdir)/gtk2hs/gconf.pkg" \
+			"${D}/$(ghc-libdir)/gtk2hs/sourceview.pkg") \
+		$(useq mozilla && echo \
+			"${D}/$(ghc-libdir)/gtk2hs/mozembed.pkg")
+	ghc-install-pkg
+
+	# build ghci .o files from .a files
+	ghc-makeghcilib ${D}/$(ghc-libdir)/gtk2hs/libHSglib.a
+	ghc-makeghcilib ${D}/$(ghc-libdir)/gtk2hs/libHSgtk.a
+	ghc-makeghcilib ${D}/$(ghc-libdir)/gtk2hs/libHSmogul.a
+	if use gnome; then
+		ghc-makeghcilib ${D}/$(ghc-libdir)/gtk2hs/libHSglade.a
+		ghc-makeghcilib ${D}/$(ghc-libdir)/gtk2hs/libHSgconf.a
+		ghc-makeghcilib ${D}/$(ghc-libdir)/gtk2hs/libHSsourceview.a
+	fi
+	if use mozilla; then
+		ghc-makeghcilib ${D}/$(ghc-libdir)/gtk2hs/libHSmozembed.a
+	fi
+}
+