New version 0.9. Marked 0.8-r1 stable on x86. Removed 0.6 versions.

9 files changed, 90 insertions, 172 deletions

diff --git a/dev-haskell/wxhaskell/ChangeLog b/dev-haskell/wxhaskell/ChangeLog
index 136c31f4dbe1..5fbfe3204f6a 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.12 2005/01/01 18:06:13 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/wxhaskell/ChangeLog,v 1.13 2005/02/26 14:48:04 kosmikus Exp $
+
+*wxhaskell-0.9 (26 Feb 2005)
+
+  26 Feb 2005; Andres Loeh <kosmikus@gentoo.org> -wxhaskell-0.6-r1.ebuild,
+  -wxhaskell-0.6.ebuild, wxhaskell-0.8-r1.ebuild, +wxhaskell-0.9.ebuild:
+  New version 0.9. Marked 0.8-r1 stable on x86. Removed 0.6 versions.
 
 *wxhaskell-0.8-r1 (25 Nov 2004)
 
diff --git a/dev-haskell/wxhaskell/Manifest b/dev-haskell/wxhaskell/Manifest
index 225c917a4365..8d4684462e1e 100644
--- a/dev-haskell/wxhaskell/Manifest
+++ b/dev-haskell/wxhaskell/Manifest
@@ -1,12 +1,10 @@
-MD5 009982210b81760e545672f44875df28 ChangeLog 1530
-MD5 a769ecfcd1cdd2d40986627df7dfb249 metadata.xml 224
-MD5 c84d44ce7f1f2e2809a0ccc0ab6627fd wxhaskell-0.6-r1.ebuild 2370
-MD5 643094b813b0e6dc654c7c142766eb76 wxhaskell-0.6.ebuild 2240
+MD5 dbeef1e1dd96a7092cb7d58aa73a2fa8 wxhaskell-0.8-r1.ebuild 1792
 MD5 fcfdf2c26918f2ddf365f42b665ee544 wxhaskell-0.7.ebuild 2337
+MD5 ded37aba8c94b7bf9888ac1cebcbf9cd wxhaskell-0.9.ebuild 1790
+MD5 4a36c21c21466c37efdb7c7ab8a41832 ChangeLog 1777
+MD5 a769ecfcd1cdd2d40986627df7dfb249 metadata.xml 224
 MD5 882fc93bbe268dd5aa30b7d06b7b4b23 wxhaskell-0.8.ebuild 2754
-MD5 0e6c6040f3d793269f82c9be5981e764 wxhaskell-0.8-r1.ebuild 1795
-MD5 2b3cf83262913705b98fae84eb4e5757 files/digest-wxhaskell-0.6 66
-MD5 2b3cf83262913705b98fae84eb4e5757 files/digest-wxhaskell-0.6-r1 66
 MD5 6f249be5b808ef834f9ea740d68b12c4 files/digest-wxhaskell-0.7 66
 MD5 08efb7ecd02832c5599b968bdc329dc9 files/digest-wxhaskell-0.8 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.6 b/dev-haskell/wxhaskell/files/digest-wxhaskell-0.6
deleted file mode 100644
index ba89df4821ee..000000000000
--- a/dev-haskell/wxhaskell/files/digest-wxhaskell-0.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ff5889eb6893da83092938541fbe9b61 wxhaskell-src-0.6.zip 506746
diff --git a/dev-haskell/wxhaskell/files/digest-wxhaskell-0.6-r1 b/dev-haskell/wxhaskell/files/digest-wxhaskell-0.6-r1
deleted file mode 100644
index ba89df4821ee..000000000000
--- a/dev-haskell/wxhaskell/files/digest-wxhaskell-0.6-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ff5889eb6893da83092938541fbe9b61 wxhaskell-src-0.6.zip 506746
diff --git a/dev-haskell/wxhaskell/files/digest-wxhaskell-0.9 b/dev-haskell/wxhaskell/files/digest-wxhaskell-0.9
new file mode 100644
index 000000000000..94e2db72d49a
--- /dev/null
+++ b/dev-haskell/wxhaskell/files/digest-wxhaskell-0.9
@@ -0,0 +1 @@
+MD5 d510ba16540e280093edd2ee50d43f3e wxhaskell-src-0.9.zip 564588
diff --git a/dev-haskell/wxhaskell/wxhaskell-0.6-r1.ebuild b/dev-haskell/wxhaskell/wxhaskell-0.6-r1.ebuild
deleted file mode 100644
index 731e25b0efbb..000000000000
--- a/dev-haskell/wxhaskell/wxhaskell-0.6-r1.ebuild
+++ /dev/null
@@ -1,81 +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.6-r1.ebuild,v 1.5 2005/01/01 18:06:13 eradicator 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"
-
-IUSE="doc"
-
-DEPEND="${DEPEND}
-	>=virtual/ghc-6.2
-	>=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:' \
-		-e 's:wxwinlibs="`$.*$:wxwinlibs="`$wxconfig --libs` `$wxconfig --gl-libs`":' \
-		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 \
-		${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() {
-	make install || die "make install failed"
-	mv ${D}/usr/lib/${ghc_version}/libwxc-${PV}.so ${D}/usr/lib
-	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.6.ebuild b/dev-haskell/wxhaskell/wxhaskell-0.6.ebuild
deleted file mode 100644
index 6d0868605271..000000000000
--- a/dev-haskell/wxhaskell/wxhaskell-0.6.ebuild
+++ /dev/null
@@ -1,79 +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.6.ebuild,v 1.5 2005/01/01 18:06:13 eradicator 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"
-
-IUSE="doc"
-
-DEPEND="${DEPEND}
-	>=virtual/ghc-6.2
-	>=x11-libs/wxGTK-2.4.1
-	doc? ( >=dev-haskell/haddock-0.6-r2 )"
-
-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:' \
-		-e 's:wxwinlibs="`$.*$:wxwinlibs="`$wxconfig --libs` `$wxconfig --gl-libs`":' \
-		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 ghc_version
-	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 \
-		${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() {
-	make install || die "make install failed"
-	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.8-r1.ebuild b/dev-haskell/wxhaskell/wxhaskell-0.8-r1.ebuild
index c0634377c07c..02fa7ccd7e7c 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.2 2005/01/01 18:06:13 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/wxhaskell/wxhaskell-0.8-r1.ebuild,v 1.3 2005/02/26 14:48:05 kosmikus Exp $
 
 inherit flag-o-matic wxwidgets ghc-package
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/wxhaskell/${PN}-src-${PV}.zip"
 LICENSE="wxWinLL-3"
 SLOT="0"
 
-KEYWORDS="~x86 ~ppc ~amd64"
+KEYWORDS="x86 ~ppc ~amd64"
 
 IUSE="doc gtk2"
 
diff --git a/dev-haskell/wxhaskell/wxhaskell-0.9.ebuild b/dev-haskell/wxhaskell/wxhaskell-0.9.ebuild
new file mode 100644
index 000000000000..f8b70fea843f
--- /dev/null
+++ b/dev-haskell/wxhaskell/wxhaskell-0.9.ebuild
@@ -0,0 +1,75 @@
+# 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 $
+
+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-r2
+	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 Makefile to respect CXXFLAGS
+	sed -i 's:^\(WXC-CXXFLAGS.*=\):\1\$(CXXFLAGS) :' ${S}/makefile
+}
+
+src_compile() {
+	local wxconfig
+	ghc-setup-pkg
+
+	#wxhaskell supports gtk or gtk2, but not unicode yet:
+	if ! use gtk2; then
+		need-wxwidgets gtk
+	else
+		need-wxwidgets gtk2
+	fi
+
+	[ "${ARCH}" = "amd64" ] && append-flags -fPIC
+
+	# non-standard configure, so econf is not an option
+	wxconfig="${WX_CONFIG}"
+	# --wx-config must appear first according to configure file comments 
+	./configure \
+		--wx-config=${wxconfig} \
+		--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
+}