diff options
| author |   Duncan Coutts <dcoutts@gentoo.org> | 2007-12-13 00:45:33 +0000 |
|---|---|---|
| committer | Duncan Coutts <dcoutts@gentoo.org> | 2007-12-13 00:45:33 +0000 |
| commit | 4b99915cf7f39c9a01f328ecea4ce39e5dc9947f (patch) | |
| tree | 9eb634d19a2f4b0f417dea72d4dc109ff3a12363 /dev-haskell/haddock | |
| parent | Does not work with gtksourceview 2.x. Fixes bug #201210. (diff) | |
| download | gentoo-2-4b99915cf7f39c9a01f328ecea4ce39e5dc9947f.tar.gz gentoo-2-4b99915cf7f39c9a01f328ecea4ce39e5dc9947f.tar.bz2 gentoo-2-4b99915cf7f39c9a01f328ecea4ce39e5dc9947f.zip | |
Remove unnecessary blocker. Fix shell quoting.
(Portage version: 2.1.3.19)
Diffstat (limited to 'dev-haskell/haddock')
| -rw-r--r-- | dev-haskell/haddock/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-haskell/haddock/haddock-0.7.ebuild | 16 | ||||
| -rw-r--r-- | dev-haskell/haddock/haddock-0.8.ebuild | 10 |
3 files changed, 16 insertions, 15 deletions
diff --git a/dev-haskell/haddock/ChangeLog b/dev-haskell/haddock/ChangeLog index e776ed5fa852..91bf6dcd0e81 100644 --- a/dev-haskell/haddock/ChangeLog +++ b/dev-haskell/haddock/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-haskell/haddock # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v 1.50 2007/10/31 12:57:11 dcoutts Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v 1.51 2007/12/13 00:45:33 dcoutts Exp $ + + 12 Dec 2007; Duncan Coutts <dcoutts@gentoo.org> haddock-0.7.ebuild: + Remove unnecessary blocker. 31 Oct 2007; Duncan Coutts <dcoutts@gentoo.org> haddock-0.7.ebuild, haddock-0.8.ebuild: diff --git a/dev-haskell/haddock/haddock-0.7.ebuild b/dev-haskell/haddock/haddock-0.7.ebuild index 53b5630acaae..9dde0b2ad326 100644 --- a/dev-haskell/haddock/haddock-0.7.ebuild +++ b/dev-haskell/haddock/haddock-0.7.ebuild @@ -1,11 +1,11 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-0.7.ebuild,v 1.16 2007/10/31 12:57:11 dcoutts Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-0.7.ebuild,v 1.17 2007/12/13 00:45:33 dcoutts Exp $ # # USE variable summary: -# doc - Build extra documenation from DocBook sources, -# in HTML format. -# java - Build the above docs as PostScript as well. +# doc - Build extra documenation from DocBook sources, +# in HTML format. +# java - Build the above docs as PostScript as well. inherit ghc-package multilib IUSE="doc" @@ -19,8 +19,7 @@ SLOT="0" KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86" LICENSE="as-is" -DEPEND="dev-lang/ghc - !>=dev-lang/ghc-6.6 +DEPEND="<dev-lang/ghc-6.6 doc? ( ~app-text/docbook-xml-dtd-4.2 app-text/docbook-xsl-stylesheets >=dev-libs/libxslt-1.1.2 @@ -75,7 +74,6 @@ src_compile() { src_install() { local insttarget - insttarget="install" use doc && insttarget="${insttarget} install-docs" @@ -89,6 +87,6 @@ src_install() { libdir0="${D}/usr/$(get_libdir)" \ || die "make install failed" - cd ${S}/haddock - dodoc CHANGES LICENSE README TODO + cd "${S}/haddock" + dodoc CHANGES README TODO } diff --git a/dev-haskell/haddock/haddock-0.8.ebuild b/dev-haskell/haddock/haddock-0.8.ebuild index 995ac2a7b88e..05d4a36777d9 100644 --- a/dev-haskell/haddock/haddock-0.8.ebuild +++ b/dev-haskell/haddock/haddock-0.8.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-0.8.ebuild,v 1.10 2007/10/31 12:57:11 dcoutts Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-0.8.ebuild,v 1.11 2007/12/13 00:45:33 dcoutts Exp $ CABAL_FEATURES="bin" inherit haskell-cabal eutils versionator @@ -29,9 +29,9 @@ S="${WORKDIR}/${MY_PF}" src_compile () { cabal_src_compile if use doc; then - cd ${S}/doc + cd "${S}/doc" autoconf - ./configure --prefix=${D}/usr/ \ + ./configure --prefix="${D}/usr/" \ || die 'error configuring documentation.' make html || die 'error building documentation.' fi @@ -40,7 +40,7 @@ src_compile () { src_install () { cabal_src_install if use doc; then - dohtml -r ${S}/doc/haddock/* + dohtml -r "${S}/doc/haddock/"* fi - dodoc CHANGES LICENSE README + dodoc CHANGES README } |