diff options
| -rw-r--r-- | dev-haskell/haddock/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-haskell/haddock/Manifest | 12 | ||||
| -rw-r--r-- | dev-haskell/haddock/haddock-0.7.ebuild | 15 | ||||
| -rw-r--r-- | dev-haskell/happy/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-haskell/happy/Manifest | 16 | ||||
| -rw-r--r-- | dev-haskell/happy/happy-1.15.ebuild | 17 |
6 files changed, 29 insertions, 41 deletions
diff --git a/dev-haskell/haddock/ChangeLog b/dev-haskell/haddock/ChangeLog index c5c97774f976..1665e71aef1d 100644 --- a/dev-haskell/haddock/ChangeLog +++ b/dev-haskell/haddock/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-haskell/haddock # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v 1.28 2005/09/19 06:54:56 araujo Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/ChangeLog,v 1.29 2005/12/12 22:29:10 araujo Exp $ + + 12 Dec 2005; Luis f. Araujo <araujo@gentoo.org> haddock-0.7.ebuild: + Removing java use flag, bug #107019 19 Sep 2005; Luis F. Araujo <araujo@gentoo.org> haddock-0.7.ebuild: Fixed multilib inheritance diff --git a/dev-haskell/haddock/Manifest b/dev-haskell/haddock/Manifest index 9c8f4860bf24..c59555fff7bb 100644 --- a/dev-haskell/haddock/Manifest +++ b/dev-haskell/haddock/Manifest @@ -1,19 +1,9 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - MD5 8e1d215c97780123dc3e313382b39f0a ChangeLog 4240 MD5 8bf7027e7c34557be795ad102a3da7a6 haddock-0.6-r2.ebuild 2646 MD5 c1dc72fd2a7923d460c09e6ff273f5d0 haddock-0.6-r3.ebuild 2895 MD5 a769ecfcd1cdd2d40986627df7dfb249 metadata.xml 224 -MD5 4399948c20502c047b795fb42dca07e5 haddock-0.7.ebuild 2488 +MD5 d73bbd6379573ba2a17cce1fb889d668 haddock-0.7.ebuild 2526 MD5 6c35081e22594c96591797459c28da01 files/digest-haddock-0.6-r2 67 MD5 6c35081e22594c96591797459c28da01 files/digest-haddock-0.6-r3 67 MD5 bd211a7c5442dadeee6975dbb15f2e45 files/haddock-0.6-gcc3.4.patch 1967 MD5 574da10760a87f23fa635f37265b7c0c files/digest-haddock-0.7 67 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.2 (GNU/Linux) - -iD8DBQFDLmDaBQBy/eDH5uERAuHKAJ9miH5G8ZPZBMZ2k9Pg74xM6WBC8ACgnw8m -l95V5P2g5fMfBH/E7S9dNIk= -=pvmt ------END PGP SIGNATURE----- diff --git a/dev-haskell/haddock/haddock-0.7.ebuild b/dev-haskell/haddock/haddock-0.7.ebuild index f95ba85662e2..1294088d8cd6 100644 --- a/dev-haskell/haddock/haddock-0.7.ebuild +++ b/dev-haskell/haddock/haddock-0.7.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/haddock/haddock-0.7.ebuild,v 1.3 2005/09/19 06:54:56 araujo Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/haddock/haddock-0.7.ebuild,v 1.4 2005/12/12 22:29:10 araujo Exp $ # # USE variable summary: # doc - Build extra documenation from DocBook sources, @@ -9,7 +9,8 @@ inherit ghc-package multilib -IUSE="doc java" +IUSE="doc" +#java use flag disable, bug #107019 DESCRIPTION="A documentation tool for Haskell" SRC_URI="http://www.haskell.org/haddock/${P}-src.tar.gz" @@ -23,8 +24,8 @@ DEPEND="virtual/ghc doc? ( ~app-text/docbook-xml-dtd-4.2 app-text/docbook-xsl-stylesheets >=dev-libs/libxslt-1.1.2 - >=dev-haskell/haddock-0.6-r2 - java? ( >=dev-java/fop-0.20.5 ) )" + >=dev-haskell/haddock-0.6-r2 )" +# java? ( >=dev-java/fop-0.20.5 ) )" RDEPEND="" pkg_setup() { @@ -56,9 +57,9 @@ src_compile() { # determine what to do with documentation if use doc; then mydoc="html" - if use java; then - mydoc="${mydoc} ps" - fi + #if use java; then + # mydoc="${mydoc} ps" + #fi else mydoc="" # needed to prevent haddock from being called diff --git a/dev-haskell/happy/ChangeLog b/dev-haskell/happy/ChangeLog index 4a680cedb49d..eac5ac1517dd 100644 --- a/dev-haskell/happy/ChangeLog +++ b/dev-haskell/happy/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-haskell/happy # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/happy/ChangeLog,v 1.14 2005/10/04 15:12:34 dcoutts Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/happy/ChangeLog,v 1.15 2005/12/12 22:25:07 araujo Exp $ + + 12 Dec 2005; Luis f. Araujo <araujo@gentoo.org> happy-1.15.ebuild: + Removing java use flag, bug #107019 04 Oct 2005; <duncan@gentoo.org> happy-1.15.ebuild: Added ~sparc to KEYWORDS. diff --git a/dev-haskell/happy/Manifest b/dev-haskell/happy/Manifest index 0ed3c296ecbf..ab3dae237400 100644 --- a/dev-haskell/happy/Manifest +++ b/dev-haskell/happy/Manifest @@ -1,17 +1,7 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -MD5 8d51b9945c4b7f48e8b857dbb279b591 happy-1.15.ebuild 1459 -MD5 de509a6365e2f5e31d0628ce8587d8ad happy-1.14.ebuild 719 MD5 2f8995916b8448c0609cc6fe7abb0870 ChangeLog 1798 +MD5 de509a6365e2f5e31d0628ce8587d8ad happy-1.14.ebuild 719 +MD5 4684fb05eddd61e023c6be3cf4e362e5 happy-1.15.ebuild 1499 MD5 a769ecfcd1cdd2d40986627df7dfb249 metadata.xml 224 -MD5 ccdd754a8212bb8a0ad2fa759a297250 files/happy-1.14-gcc3.4.patch 1849 MD5 e4734e57e0ebad5144da11376e6aed02 files/digest-happy-1.14 66 MD5 eb8bc65651f73e615f61ffc31a95a7c6 files/digest-happy-1.15 66 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.1 (GNU/Linux) - -iD8DBQFDQpxUkyZuKN4EQ6YRApq+AJ94KY1EzIzirsggR2NSQ/nPkgcRBQCfTWKC -L80aZiSiiE9vPYKd6w0tHq4= -=9NtO ------END PGP SIGNATURE----- +MD5 ccdd754a8212bb8a0ad2fa759a297250 files/happy-1.14-gcc3.4.patch 1849 diff --git a/dev-haskell/happy/happy-1.15.ebuild b/dev-haskell/happy/happy-1.15.ebuild index 5e2c37a41f26..4f9c3bc0c5a3 100644 --- a/dev-haskell/happy/happy-1.15.ebuild +++ b/dev-haskell/happy/happy-1.15.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/happy/happy-1.15.ebuild,v 1.7 2005/10/04 15:12:34 dcoutts Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/happy/happy-1.15.ebuild,v 1.8 2005/12/12 22:25:07 araujo Exp $ inherit base eutils ghc-package @@ -10,12 +10,13 @@ SRC_URI="http://haskell.cs.yale.edu/happy/dist/${PV}/${P}-src.tar.gz" LICENSE="BSD" SLOT="0" KEYWORDS="x86 ~amd64 ~ppc ~sparc" -IUSE="doc java" +IUSE="doc" +#java use flag disabled, bug #107019 DEPEND=">=virtual/ghc-5.04 doc? ( ~app-text/docbook-xml-dtd-4.2 - app-text/docbook-xsl-stylesheets - java? ( >=dev-java/fop-0.20.5 ) )" + app-text/docbook-xsl-stylesheets )" +# java? ( >=dev-java/fop-0.20.5 ) )" RDEPEND="" src_unpack() { @@ -30,9 +31,9 @@ src_compile() { emake -j1 || die "make failed" if use doc; then emake -j1 html || die "make html failed" - if use java; then - emake -j1 ps || die "make ps failed" - fi + #if use java; then + # emake -j1 ps || die "make ps failed" + #fi fi } @@ -40,7 +41,7 @@ src_install() { local docways if use doc; then docways="html" - use java && docways="${docways} ps" + #use java && docways="${docways} ps" else docways="" fi |