wxhaskell is blocked by ghc-6.4 for now

(Portage version: 2.0.51.19)

6 files changed, 11 insertions, 106 deletions

diff --git a/dev-haskell/wxhaskell/ChangeLog b/dev-haskell/wxhaskell/ChangeLog
index 5fbfe3204f6a..0e1a6e48efc8 100644
--- a/dev-haskell/wxhaskell/ChangeLog
+++ b/dev-haskell/wxhaskell/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-haskell/wxhaskell
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/wxhaskell/ChangeLog,v 1.13 2005/02/26 14:48:04 kosmikus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/wxhaskell/ChangeLog,v 1.14 2005/03/14 18:22:12 kosmikus Exp $
+
+  14 Mar 2005; Andres Loeh <kosmikus@gentoo.org> wxhaskell-0.7.ebuild,
+  wxhaskell-0.8-r1.ebuild, -wxhaskell-0.8.ebuild, wxhaskell-0.9.ebuild:
+  wxHaskell is not yet compatible with ghc-6.4.
 
 *wxhaskell-0.9 (26 Feb 2005)
 
diff --git a/dev-haskell/wxhaskell/files/digest-wxhaskell-0.8 b/dev-haskell/wxhaskell/files/digest-wxhaskell-0.8
deleted file mode 100644
index e1024cadae05..000000000000
--- a/dev-haskell/wxhaskell/files/digest-wxhaskell-0.8
+++ /dev/null
@@ -1 +0,0 @@
-MD5 40e9765fbab3ace2cfdd1fe5571ceaec wxhaskell-src-0.8.zip 545291
diff --git a/dev-haskell/wxhaskell/wxhaskell-0.7.ebuild b/dev-haskell/wxhaskell/wxhaskell-0.7.ebuild
index fae4f32f0cba..e24adbf1871a 100644
--- a/dev-haskell/wxhaskell/wxhaskell-0.7.ebuild
+++ b/dev-haskell/wxhaskell/wxhaskell-0.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/wxhaskell/wxhaskell-0.7.ebuild,v 1.7 2005/01/01 18:06:13 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/wxhaskell/wxhaskell-0.7.ebuild,v 1.8 2005/03/14 18:22:12 kosmikus Exp $
 
 DESCRIPTION="a portable and native GUI library for Haskell"
 HOMEPAGE="http://wxhaskell.sourceforge.net/"
@@ -14,6 +14,7 @@ IUSE="doc"
 
 DEPEND="${DEPEND}
 	>=virtual/ghc-6.2
+	!>=virtual/ghc-6.4
 	>=x11-libs/wxGTK-2.4.1
 	doc? ( >=dev-haskell/haddock-0.6-r2 )"
 
diff --git a/dev-haskell/wxhaskell/wxhaskell-0.8-r1.ebuild b/dev-haskell/wxhaskell/wxhaskell-0.8-r1.ebuild
index 02fa7ccd7e7c..7519def30715 100644
--- a/dev-haskell/wxhaskell/wxhaskell-0.8-r1.ebuild
+++ b/dev-haskell/wxhaskell/wxhaskell-0.8-r1.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/wxhaskell/wxhaskell-0.8-r1.ebuild,v 1.3 2005/02/26 14:48:05 kosmikus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/wxhaskell/wxhaskell-0.8-r1.ebuild,v 1.4 2005/03/14 18:22:12 kosmikus Exp $
 
 inherit flag-o-matic wxwidgets ghc-package
 
@@ -16,6 +16,7 @@ IUSE="doc gtk2"
 
 DEPEND="${DEPEND}
 	>=virtual/ghc-6.2
+	!>=virtual/ghc-6.4
 	>=x11-libs/wxGTK-2.4.2-r2
 	doc? ( >=dev-haskell/haddock-0.6-r2 )"
 
diff --git a/dev-haskell/wxhaskell/wxhaskell-0.8.ebuild b/dev-haskell/wxhaskell/wxhaskell-0.8.ebuild
deleted file mode 100644
index 8b41a8d31f90..000000000000
--- a/dev-haskell/wxhaskell/wxhaskell-0.8.ebuild
+++ /dev/null
@@ -1,101 +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/wxhaskell/wxhaskell-0.8.ebuild,v 1.6 2005/01/01 18:06:13 eradicator Exp $
-
-inherit wxwidgets
-
-DESCRIPTION="a portable and native GUI library for Haskell"
-HOMEPAGE="http://wxhaskell.sourceforge.net/"
-SRC_URI="mirror://sourceforge/wxhaskell/${PN}-src-${PV}.zip"
-LICENSE="wxWinLL-3"
-SLOT="0"
-
-KEYWORDS="x86 ~ppc"
-
-IUSE="doc gtk2"
-
-DEPEND="${DEPEND}
-	>=virtual/ghc-6.2
-	>=x11-libs/wxGTK-2.4.2-r2
-	doc? ( >=dev-haskell/haddock-0.6-r2 )"
-
-# the variable ghc_version is used to store the ghc version we are building against
-
-pkg_setup() {
-	ghc_version=`best_version virtual/ghc | sed -e "s:.*/::" -e "s:-r.*::"`
-	test -n ${ghc_version} && ghclibdir="/usr/lib/${ghc_version}"
-	test -n ${ghclibdir} || ghclibdir="/usr/lib"
-	einfo "Using GHC library dir ${ghclibdir}."
-}
-
-
-src_compile() {
-	einfo "Using GHC library dir ${ghclibdir}."
-	#wxhaskell supports gtk or gtk2, but not unicode yet:
-	if ! use gtk2; then
-		need-wxwidgets gtk
-	else
-		need-wxwidgets gtk2
-	fi
-	# non-standard configure, so econf is not an option
-	mv configure configure.orig
-	# adapt to Gentoo path convention
-	sed -e 's:/doc/html:/share/doc/html:' \
-		configure.orig > configure
-	# sed -e 's:test "$wxwinlib\":test "":' configure.orig > configure
-	chmod u+x ./configure
-	# determine ghc library directory
-	# (so that it's possible to install the library for
-	# multiple versions of ghc)
-	local myopts
-	local wxconfig
-	test -n ${ghclibdir} && myopts="${myopts} --libdir=${D}/${ghclibdir}"
-	wxconfig="${WX_CONFIG}"
-	# --wx-config must appear first according to configure file comments 
-	./configure \
-		--wx-config=${wxconfig} \
-		--prefix=${D}/usr \
-		--hcpkg=/bin/true \
-		--with-opengl \
-		${myopts} \
-		|| die "./configure failed"
-	emake -j1 || die "make failed"
-	# create documentation
-	if use doc; then
-		emake -j1 doc || die "make doc failed"
-	fi
-}
-
-src_install() {
-	local f
-	emake -j1 install || die "make install failed"
-	for f in ${D}/usr/lib/${ghc_version}/libwxc-*.so; do
-		mv ${f} ${D}/usr/lib
-	done
-	if use doc; then
-		dohtml -A haddock -r out/doc/*
-		cp -r samples ${D}/usr/share/doc/${PF}
-	fi
-}
-
-pkg_postinst() {
-	einfo "Registering wxcore package"
-	wxhlibdir=${ghclibdir} ghc-pkg -u -i ${ghclibdir}/wxcore.pkg
-	einfo "Registering wx package"
-	wxhlibdir=${ghclibdir} ghc-pkg -u -i ${ghclibdir}/wx.pkg
-}
-
-pkg_postrm() {
-	# check if another version is still there
-	has_version "<${CATEGORY}/${PF}" \
-		|| has_version ">${CATEGORY}/${PF}" \
-		|| unregister_ghc_packages
-}
-
-unregister_ghc_packages() {
-	einfo "Unregistering wx package"
-	/usr/bin/ghc-pkg -r wx
-	einfo "Unregistering wxcore package"
-	/usr/bin/ghc-pkg -r wxcore
-}
-
diff --git a/dev-haskell/wxhaskell/wxhaskell-0.9.ebuild b/dev-haskell/wxhaskell/wxhaskell-0.9.ebuild
index f8b70fea843f..74c2bf8f1848 100644
--- a/dev-haskell/wxhaskell/wxhaskell-0.9.ebuild
+++ b/dev-haskell/wxhaskell/wxhaskell-0.9.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/wxhaskell/wxhaskell-0.9.ebuild,v 1.1 2005/02/26 14:48:05 kosmikus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/wxhaskell/wxhaskell-0.9.ebuild,v 1.2 2005/03/14 18:22:12 kosmikus Exp $
 
 inherit flag-o-matic wxwidgets ghc-package
 
@@ -16,6 +16,7 @@ IUSE="doc gtk2"
 
 DEPEND="${DEPEND}
 	>=virtual/ghc-6.2
+	!>=virtual/ghc-6.4
 	>=x11-libs/wxGTK-2.4.2-r2
 	doc? ( >=dev-haskell/haddock-0.6-r2 )"