New version, that is compatible with ghc-6.4.

(Portage version: 2.0.51.21)

6 files changed, 95 insertions, 91 deletions

diff --git a/dev-haskell/wxhaskell/ChangeLog b/dev-haskell/wxhaskell/ChangeLog
index 1825aa993036..2da38995ceb6 100644
--- a/dev-haskell/wxhaskell/ChangeLog
+++ b/dev-haskell/wxhaskell/ChangeLog
@@ -1,6 +1,12 @@
 # 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.15 2005/04/10 18:37:53 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/wxhaskell/ChangeLog,v 1.16 2005/05/11 21:26:56 kosmikus Exp $
+
+*wxhaskell-0.9.4 (11 May 2005)
+
+  11 May 2005; Andres Loeh <kosmikus@gentoo.org> -wxhaskell-0.7.ebuild,
+  +wxhaskell-0.9.4.ebuild:
+  New version, that is compatible with ghc-6.4.
 
   10 Apr 2005; Michael Hanselmann <hansmi@gentoo.org>
   wxhaskell-0.8-r1.ebuild:
diff --git a/dev-haskell/wxhaskell/Manifest b/dev-haskell/wxhaskell/Manifest
index 570a95810bd3..5f33c44d6452 100644
--- a/dev-haskell/wxhaskell/Manifest
+++ b/dev-haskell/wxhaskell/Manifest
@@ -1,8 +1,10 @@
-MD5 a769ecfcd1cdd2d40986627df7dfb249 metadata.xml 224
-MD5 41c62e72cbc618dbf6dd6231a6f7897e wxhaskell-0.9.ebuild 1810
-MD5 bc306923e0af3a2325bbe15ffd4816e6 ChangeLog 2066
 MD5 94a3b57037bef592ac7def9aa9f05ab3 wxhaskell-0.8-r1.ebuild 1809
 MD5 e0961f29aa49504567f8b29e7552d5d8 wxhaskell-0.7.ebuild 2355
-MD5 252f6e6df89834ca7cc1f0b68cecbd3c files/digest-wxhaskell-0.9 66
+MD5 41c62e72cbc618dbf6dd6231a6f7897e wxhaskell-0.9.ebuild 1810
+MD5 c5db7e5321d2a746e13eca2889e5a7ca wxhaskell-0.9.4.ebuild 2057
+MD5 bc306923e0af3a2325bbe15ffd4816e6 ChangeLog 2066
+MD5 a769ecfcd1cdd2d40986627df7dfb249 metadata.xml 224
+MD5 3a0410506498ebc06bcb1ce2c504fe75 files/digest-wxhaskell-0.9.4 68
 MD5 6f249be5b808ef834f9ea740d68b12c4 files/digest-wxhaskell-0.7 66
+MD5 252f6e6df89834ca7cc1f0b68cecbd3c files/digest-wxhaskell-0.9 66
 MD5 08efb7ecd02832c5599b968bdc329dc9 files/digest-wxhaskell-0.8-r1 66
diff --git a/dev-haskell/wxhaskell/files/digest-wxhaskell-0.7 b/dev-haskell/wxhaskell/files/digest-wxhaskell-0.7
deleted file mode 100644
index 0e85880c7250..000000000000
--- a/dev-haskell/wxhaskell/files/digest-wxhaskell-0.7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d0a548857f7ae3ffcce97b22dfcb8206 wxhaskell-src-0.7.zip 524205
diff --git a/dev-haskell/wxhaskell/files/digest-wxhaskell-0.9.4 b/dev-haskell/wxhaskell/files/digest-wxhaskell-0.9.4
new file mode 100644
index 000000000000..7a7938298e02
--- /dev/null
+++ b/dev-haskell/wxhaskell/files/digest-wxhaskell-0.9.4
@@ -0,0 +1 @@
+MD5 72cbec17285f67a37349a1900fb4a830 wxhaskell-src-0.9.4.zip 569954
diff --git a/dev-haskell/wxhaskell/wxhaskell-0.7.ebuild b/dev-haskell/wxhaskell/wxhaskell-0.7.ebuild
deleted file mode 100644
index e24adbf1871a..000000000000
--- a/dev-haskell/wxhaskell/wxhaskell-0.7.ebuild
+++ /dev/null
@@ -1,85 +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.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/"
-SRC_URI="mirror://sourceforge/wxhaskell/${PN}-src-${PV}.zip"
-LICENSE="wxWinLL-3"
-SLOT="0"
-
-KEYWORDS="x86 ppc"
-
-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 )"
-
-# the variable ghc_version is used to store the ghc version we are building against
-
-src_compile() {
-	# 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
-	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 \
-		--prefix=${D}/usr \
-		--hcpkg=/bin/true \
-		--with-opengl \
-		${myopts} \
-		|| die "./configure failed"
-	# emake doesn't work
-	make || die "make failed"
-	# create documentation
-	if use doc; then
-		make doc || die "make doc failed"
-	fi
-}
-
-src_install() {
-	local f
-	make 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 ${S}/config/wxcore.pkg
-	einfo "Registering wx package"
-	wxhlibdir=${ghclibdir} ghc-pkg -u -i ${S}/config/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.4.ebuild b/dev-haskell/wxhaskell/wxhaskell-0.9.4.ebuild
new file mode 100644
index 000000000000..84e860428fb1
--- /dev/null
+++ b/dev-haskell/wxhaskell/wxhaskell-0.9.4.ebuild
@@ -0,0 +1,81 @@
+# 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.4.ebuild,v 1.1 2005/05/11 21:26:56 kosmikus Exp $
+
+inherit flag-o-matic wxwidgets ghc-package
+
+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 ~amd64"
+
+IUSE="doc gtk2"
+
+DEPEND="${DEPEND}
+	>=virtual/ghc-6.2
+	>=x11-libs/wxGTK-2.4.2
+	doc? ( >=dev-haskell/haddock-0.6-r2 )"
+
+src_unpack() {
+	unpack ${A}
+	# adapt to Gentoo path convention
+	sed -i 's:/doc/html:/share/doc/html:' ${S}/configure
+	# fix superfluous dependencies on hslibs packages
+	sed -i -e 's:,lang::' -e 's:,"lang"::' \
+		-e 's:,concurrent::' -e 's:,"concurrent"::' ${S}/configure
+	# fix Makefile to respect CXXFLAGS
+	sed -i 's:^\(WXC-CXXFLAGS.*=\):\1\$(CXXFLAGS) :' ${S}/makefile
+}
+
+src_compile() {
+	# use the highest possible wxGTK version, i.e., 2.6 by default
+	if has_version '>=x11-libs/wxGTK-2.6'; then
+		WX_GTK_VER=2.6
+	fi
+	ghc-setup-pkg
+
+	#wxhaskell supports gtk or gtk2, but not unicode yet:
+	if ! use gtk2; then
+		need-wxwidgets gtk
+	else
+		need-wxwidgets gtk2
+	fi
+
+	# every C compiler result ends up in a shared lib
+	append-flags -fPIC
+
+	# non-standard configure, so econf is not an option
+	# --wx-config must appear first according to configure file comments 
+	./configure \
+		--wx-config="${WX_CONFIG}" \
+		--prefix=${D}/usr \
+		--with-opengl \
+		--libdir=${D}/$(ghc-libdir) \
+		--package-conf=${S}/$(ghc-localpkgconf) \
+		|| 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}/$(ghc-libdir)/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
+
+	ghc-install-pkg
+}