diff options
| -rw-r--r-- | dev-haskell/wxhaskell/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-haskell/wxhaskell/Manifest | 4 | ||||
| -rw-r--r-- | dev-haskell/wxhaskell/wxhaskell-0.8.ebuild | 18 |
3 files changed, 21 insertions, 6 deletions
diff --git a/dev-haskell/wxhaskell/ChangeLog b/dev-haskell/wxhaskell/ChangeLog index a95b1ea5fc1c..54bb3a574569 100644 --- a/dev-haskell/wxhaskell/ChangeLog +++ b/dev-haskell/wxhaskell/ChangeLog @@ -1,6 +1,9 @@ # 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.7 2004/08/23 13:15:43 kosmikus Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/wxhaskell/ChangeLog,v 1.8 2004/08/30 09:03:02 kosmikus Exp $ + + 30 Aug 2004; Andres Loeh <kosmikus@gentoo.org> wxhaskell-0.8.ebuild: + Make use of wxwidgets eclass (#61871). *wxhaskell-0.8 (23 Aug 2004) diff --git a/dev-haskell/wxhaskell/Manifest b/dev-haskell/wxhaskell/Manifest index 1f72a7d4967a..fd0a58afdd51 100644 --- a/dev-haskell/wxhaskell/Manifest +++ b/dev-haskell/wxhaskell/Manifest @@ -1,9 +1,9 @@ MD5 e22f934b9f040f325944ac24ac7478e5 wxhaskell-0.7.ebuild 2331 MD5 61868cbfbc9fef58146982ef2ad7c74e wxhaskell-0.6-r1.ebuild 2368 MD5 a07765cd08c1fd8eab7f40b2f18acf5b wxhaskell-0.6.ebuild 2238 -MD5 541c57ec11107ed79dd51e244f49ecab ChangeLog 1037 +MD5 f7cba4d883d53671b39323b80f6b967e ChangeLog 1150 MD5 a769ecfcd1cdd2d40986627df7dfb249 metadata.xml 224 -MD5 7d2b03769dbad0e69be03dffcb209cad wxhaskell-0.8.ebuild 2332 +MD5 be89953adffef07508c914b85daf9676 wxhaskell-0.8.ebuild 2628 MD5 3370d9be457b4e8fa9b80ec89b49f30b files/digest-wxhaskell-0.6 132 MD5 6f249be5b808ef834f9ea740d68b12c4 files/digest-wxhaskell-0.7 66 MD5 08efb7ecd02832c5599b968bdc329dc9 files/digest-wxhaskell-0.8 66 diff --git a/dev-haskell/wxhaskell/wxhaskell-0.8.ebuild b/dev-haskell/wxhaskell/wxhaskell-0.8.ebuild index d72ab176ab0d..eab5f06bc9d4 100644 --- a/dev-haskell/wxhaskell/wxhaskell-0.8.ebuild +++ b/dev-haskell/wxhaskell/wxhaskell-0.8.ebuild @@ -1,6 +1,8 @@ # 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.ebuild,v 1.1 2004/08/23 13:15:43 kosmikus Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/wxhaskell/wxhaskell-0.8.ebuild,v 1.2 2004/08/30 09:03:02 kosmikus Exp $ + +inherit wxwidgets DESCRIPTION="a portable and native GUI library for Haskell" HOMEPAGE="http://wxhaskell.sourceforge.net/" @@ -10,16 +12,22 @@ SLOT="0" KEYWORDS="~x86" -IUSE="doc" +IUSE="doc gtk2" DEPEND="${DEPEND} >=virtual/ghc-6.2 - >=x11-libs/wxGTK-2.4.1 + >=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 src_compile() { + #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 @@ -31,11 +39,15 @@ src_compile() { # (so that it's possible to install the library for # multiple versions of ghc) local myopts + local wxconfig 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}" + 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 \ |