diff options
| author |   Vlastimil Babka <caster@gentoo.org> | 2007-12-20 10:39:46 +0000 |
|---|---|---|
| committer | Vlastimil Babka <caster@gentoo.org> | 2007-12-20 10:39:46 +0000 |
| commit | 15b5004fd53b4952b3a0680d4d687484e5bb9dd7 (patch) | |
| tree | f2f9f06b0813668743c562bc5ec663efb315e0a6 /app-editors/jedit/jedit-4.2-r2.ebuild | |
| parent | check that cairo is built with USE=svg, bug #202781 (diff) | |
| download | gentoo-2-15b5004fd53b4952b3a0680d4d687484e5bb9dd7.tar.gz gentoo-2-15b5004fd53b4952b3a0680d4d687484e5bb9dd7.tar.bz2 gentoo-2-15b5004fd53b4952b3a0680d4d687484e5bb9dd7.zip | |
Version bump to 4.3pre12 - bug #196961. Fix building of 4.2 with jdk 1.6 - bug #189815, patch by Yoann Pannier <gentoo-bugs@umsar.org>. Remove 4.3pre9.
(Portage version: 2.1.4_rc10)
Diffstat (limited to 'app-editors/jedit/jedit-4.2-r2.ebuild')
| -rw-r--r-- | app-editors/jedit/jedit-4.2-r2.ebuild | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/app-editors/jedit/jedit-4.2-r2.ebuild b/app-editors/jedit/jedit-4.2-r2.ebuild index 918ce56649ec..9e5414639130 100644 --- a/app-editors/jedit/jedit-4.2-r2.ebuild +++ b/app-editors/jedit/jedit-4.2-r2.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/app-editors/jedit/jedit-4.2-r2.ebuild,v 1.11 2007/11/13 06:50:26 opfer Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/jedit/jedit-4.2-r2.ebuild,v 1.12 2007/12/20 10:39:45 caster Exp $ inherit java-pkg-2 eutils java-ant-2 @@ -16,11 +16,7 @@ SLOT="0" IUSE="doc" RDEPEND=">=virtual/jre-1.4" -# FIXME doesn't like Java 1.6 for some reason -DEPEND="|| ( - =virtual/jdk-1.5* - =virtual/jdk-1.4* - ) +DEPEND=">=virtual/jdk-1.4 doc? ( =app-text/docbook-xml-dtd-4.3* >=app-text/docbook-xsl-stylesheets-1.65.1 @@ -33,6 +29,8 @@ src_unpack() { unpack ${A} cd "${S}" + epatch "${FILESDIR}/${P}-jdk-1.6.patch" + if use doc; then local xsl=$(echo /usr/share/sgml/docbook/xsl-stylesheets-*) xsl=${xsl// */} |