Supports ghc-package.eclass now (bug #69270). Added ~amd64 flag (bug #58590).

diff --git a/dev-haskell/wxhaskell/ChangeLog b/dev-haskell/wxhaskell/ChangeLog
index a4d35e432912eb52af4b067326f176bac0bdcbca..2219ed05143df396b6b5e5389cbc3655aad43a27 100644 (file)
--- a/dev-haskell/wxhaskell/ChangeLog
+++ b/dev-haskell/wxhaskell/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-haskell/wxhaskell
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/wxhaskell/ChangeLog,v 1.10 2004/11/10 19:02:26 kosmikus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/wxhaskell/ChangeLog,v 1.11 2004/11/25 21:41:48 kosmikus Exp $
+
+*wxhaskell-0.8-r1 (25 Nov 2004)
+
+  25 Nov 2004; Andres Loeh <kosmikus@gentoo.org> +wxhaskell-0.8-r1.ebuild:
+  Supports ghc-package.eclass now (bug #69270). Added ~amd64 flag (bug #58590).
 
   10 Nov 2004; Andres Loeh <kosmikus@gentoo.org> wxhaskell-0.8.ebuild:
   Fixed bug #70683.

diff --git a/dev-haskell/wxhaskell/Manifest b/dev-haskell/wxhaskell/Manifest
index 1bf0783283971f6ea9cf8f7570679873c9ef2f3e..c52cbced733c45cbf6994b11b90e0b286fedcb27 100644 (file)
--- a/dev-haskell/wxhaskell/Manifest
+++ b/dev-haskell/wxhaskell/Manifest
@@ -1,20 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 f9e3dd44cdcf7feae59f0f9fa1d5e34e wxhaskell-0.8-r1.ebuild 1793
 MD5 293b69594a911f53b2c4c0fec1884abe wxhaskell-0.7.ebuild 2335
 MD5 61868cbfbc9fef58146982ef2ad7c74e wxhaskell-0.6-r1.ebuild 2368
 MD5 a07765cd08c1fd8eab7f40b2f18acf5b wxhaskell-0.6.ebuild 2238
-MD5 78b1a77688f302156f92ce875d8ad05b ChangeLog 1339
+MD5 98f0cdaeec63e7864d29a61f1858604b ChangeLog 1528
 MD5 a769ecfcd1cdd2d40986627df7dfb249 metadata.xml 224
 MD5 ba7da1ae552ebf988650997c54739880 wxhaskell-0.8.ebuild 2752
 MD5 2b3cf83262913705b98fae84eb4e5757 files/digest-wxhaskell-0.6 66
 MD5 6f249be5b808ef834f9ea740d68b12c4 files/digest-wxhaskell-0.7 66
 MD5 08efb7ecd02832c5599b968bdc329dc9 files/digest-wxhaskell-0.8 66
 MD5 2b3cf83262913705b98fae84eb4e5757 files/digest-wxhaskell-0.6-r1 66
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
-
-iD8DBQFBpPo8I1lqEGTUzyQRAiWJAJ9MXpPD688g6AdIfWKYOXs1mbzATQCfQQ6c
-PxVz/mh48x5RFWeZ2bDYYGY=
-=mxDs
------END PGP SIGNATURE-----
+MD5 08efb7ecd02832c5599b968bdc329dc9 files/digest-wxhaskell-0.8-r1 66

diff --git a/dev-haskell/wxhaskell/files/digest-wxhaskell-0.8-r1 b/dev-haskell/wxhaskell/files/digest-wxhaskell-0.8-r1
new file mode 100644 (file)
index 0000000..e1024ca
--- /dev/null
+++ b/dev-haskell/wxhaskell/files/digest-wxhaskell-0.8-r1
@@ -0,0 +1 @@
+MD5 40e9765fbab3ace2cfdd1fe5571ceaec wxhaskell-src-0.8.zip 545291

diff --git a/dev-haskell/wxhaskell/wxhaskell-0.8-r1.ebuild b/dev-haskell/wxhaskell/wxhaskell-0.8-r1.ebuild
new file mode 100644 (file)
index 0000000..7bddd7b
--- /dev/null
+++ b/dev-haskell/wxhaskell/wxhaskell-0.8-r1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2004 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.1 2004/11/25 21:41:48 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
+}