diff options
author | Duncan Coutts <dcoutts@gentoo.org> | 2007-01-29 12:11:47 +0000 |
---|---|---|
committer | Duncan Coutts <dcoutts@gentoo.org> | 2007-01-29 12:11:47 +0000 |
commit | 4637a0344c89d56d2e413603fca392910b0986b1 (patch) | |
tree | 859bb62a4aac2a2cca0b05dece4cf4247bac8551 /dev-haskell/wxhaskell | |
parent | stable x86; bug #164079 (diff) | |
download | gentoo-2-4637a0344c89d56d2e413603fca392910b0986b1.tar.gz gentoo-2-4637a0344c89d56d2e413603fca392910b0986b1.tar.bz2 gentoo-2-4637a0344c89d56d2e413603fca392910b0986b1.zip |
Remove old versions that depend on wxGTK-2.4. Fixes bug #164145.
(Portage version: 2.1.2-r4)
Diffstat (limited to 'dev-haskell/wxhaskell')
-rw-r--r-- | dev-haskell/wxhaskell/ChangeLog | 6 | ||||
-rw-r--r-- | dev-haskell/wxhaskell/files/digest-wxhaskell-0.8-r1 | 3 | ||||
-rw-r--r-- | dev-haskell/wxhaskell/files/digest-wxhaskell-0.9 | 3 | ||||
-rw-r--r-- | dev-haskell/wxhaskell/wxhaskell-0.8-r1.ebuild | 100 | ||||
-rw-r--r-- | dev-haskell/wxhaskell/wxhaskell-0.9.ebuild | 100 |
5 files changed, 5 insertions, 207 deletions
diff --git a/dev-haskell/wxhaskell/ChangeLog b/dev-haskell/wxhaskell/ChangeLog index efe6ab28795f..2c727c9a1adb 100644 --- a/dev-haskell/wxhaskell/ChangeLog +++ b/dev-haskell/wxhaskell/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-haskell/wxhaskell # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/wxhaskell/ChangeLog,v 1.22 2007/01/06 18:11:19 kosmikus Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/wxhaskell/ChangeLog,v 1.23 2007/01/29 12:11:47 dcoutts Exp $ + + 28 Jan 2007; Duncan Coutts <dcoutts@gentoo.org> -wxhaskell-0.8-r1.ebuild, + -wxhaskell-0.9.ebuild: + Remove old versions that depend on wxGTK-2.4. Fixes bug #164145. 06 Jan 2007; Andres Loeh <kosmikus@gentoo.org> wxhaskell-0.8-r1.ebuild, wxhaskell-0.9.ebuild, wxhaskell-0.9.4.ebuild: diff --git a/dev-haskell/wxhaskell/files/digest-wxhaskell-0.8-r1 b/dev-haskell/wxhaskell/files/digest-wxhaskell-0.8-r1 deleted file mode 100644 index ba586abd8d53..000000000000 --- a/dev-haskell/wxhaskell/files/digest-wxhaskell-0.8-r1 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 40e9765fbab3ace2cfdd1fe5571ceaec wxhaskell-src-0.8.zip 545291 -RMD160 6802992948677663e4543070875963a7932ee99a wxhaskell-src-0.8.zip 545291 -SHA256 81527b40468a87183c2d7d46cc0b1fa886caaad3abb5c0ae7b8c57eb875824b0 wxhaskell-src-0.8.zip 545291 diff --git a/dev-haskell/wxhaskell/files/digest-wxhaskell-0.9 b/dev-haskell/wxhaskell/files/digest-wxhaskell-0.9 deleted file mode 100644 index ef1b1582cfed..000000000000 --- a/dev-haskell/wxhaskell/files/digest-wxhaskell-0.9 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 d510ba16540e280093edd2ee50d43f3e wxhaskell-src-0.9.zip 564588 -RMD160 9509c0da854abb4b6f82a0585968832c892efaec wxhaskell-src-0.9.zip 564588 -SHA256 5794a9fe1023b07bcd53459f81751157643cc129e712b2cda657065e3cb769b7 wxhaskell-src-0.9.zip 564588 diff --git a/dev-haskell/wxhaskell/wxhaskell-0.8-r1.ebuild b/dev-haskell/wxhaskell/wxhaskell-0.8-r1.ebuild deleted file mode 100644 index 89687c73f808..000000000000 --- a/dev-haskell/wxhaskell/wxhaskell-0.8-r1.ebuild +++ /dev/null @@ -1,100 +0,0 @@ -# Copyright 1999-2007 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.9 2007/01/06 18:11:19 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" - -RDEPEND=">=virtual/ghc-6.2 - !>=virtual/ghc-6.4 - =x11-libs/wxGTK-2.4*" - -DEPEND="${RDEPEND} - app-arch/unzip - doc? ( >=dev-haskell/haddock-0.6-r2 )" - -pkg_setup() { - if ! built_with_use x11-libs/wxGTK X; then - eerror "wxhaskell needs wxGTK that has been built with X11 support." - eerror "Please re-emerge wxGTK with USE=\"X -odbc -unicode\"" - die "wxhaskell requires wxGTK to be built with USE=\"X -odbc -unicode\"" - fi - if built_with_use x11-libs/wxGTK odbc; then - eerror "Sadly wxhaskell does not work with wxGTK that has been built" - eerror "with USE=\"odbc\"." - eerror "Please re-emerge wxGTK with USE=\"-odbc\"" - die "wxhaskell requires wxGTK to be built with USE=\"-odbc\"" - fi -} - -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() { - ghc-setup-pkg - - #wxhaskell supports gtk or gtk2, but not unicode yet. However since the gtk2 - #USE flag is deprecated we now only build with gtk2: - WX_GTK_VER=2.4 - need-wxwidgets gtk2 - - # 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=/usr \ - --with-opengl \ - --libdir=/usr/lib/${P} \ - --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 - - # don't register the packages, just install the files - emake -j1 install-files DESTDIR="${D}" || die "make install failed" - - # the .so needs to be on the lib path - mkdir -p ${D}/usr/lib - for f in ${D}/usr/lib/${P}/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 - - # substitute for the ${wxhlibdir} in package files and register them - sed -i -e "s:\${wxhlibdir}:${D}/usr/lib/${P}:" ${D}/usr/lib/${P}/*.pkg - ghc-setup-pkg ${D}/usr/lib/${P}/*.pkg - ghc-install-pkg -} diff --git a/dev-haskell/wxhaskell/wxhaskell-0.9.ebuild b/dev-haskell/wxhaskell/wxhaskell-0.9.ebuild deleted file mode 100644 index 21bc2ef9a7c7..000000000000 --- a/dev-haskell/wxhaskell/wxhaskell-0.9.ebuild +++ /dev/null @@ -1,100 +0,0 @@ -# Copyright 1999-2007 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.6 2007/01/06 18:11:19 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" - -RDEPEND=">=virtual/ghc-6.2 - !>=virtual/ghc-6.4 - =x11-libs/wxGTK-2.4*" - -DEPEND="${RDEPEND} - app-arch/unzip - doc? ( >=dev-haskell/haddock-0.6-r2 )" - -pkg_setup() { - if ! built_with_use x11-libs/wxGTK X; then - eerror "wxhaskell needs wxGTK that has been built with X11 support." - eerror "Please re-emerge wxGTK with USE=\"X -odbc -unicode\"" - die "wxhaskell requires wxGTK to be built with USE=\"X -odbc -unicode\"" - fi - if built_with_use x11-libs/wxGTK odbc; then - eerror "Sadly wxhaskell does not work with wxGTK that has been built" - eerror "with USE=\"odbc\"." - eerror "Please re-emerge wxGTK with USE=\"-odbc\"" - die "wxhaskell requires wxGTK to be built with USE=\"-odbc\"" - fi -} - -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() { - ghc-setup-pkg - - #wxhaskell supports gtk or gtk2, but not unicode yet. However since the gtk2 - #USE flag is deprecated we now only build with gtk2: - WX_GTK_VER=2.4 - need-wxwidgets gtk2 - - # 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=/usr \ - --with-opengl \ - --libdir=/usr/lib/${P} \ - --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 - - # don't register the packages, just install the files - emake -j1 install-files DESTDIR="${D}" || die "make install failed" - - # the .so needs to be on the lib path - mkdir -p ${D}/usr/lib - for f in ${D}/usr/lib/${P}/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 - - # substitute for the ${wxhlibdir} in package files and register them - sed -i -e "s:\${wxhlibdir}:${D}/usr/lib/${P}:" ${D}/usr/lib/${P}/*.pkg - ghc-setup-pkg ${D}/usr/lib/${P}/*.pkg - ghc-install-pkg -} |