diff options
| -rw-r--r-- | dev-java/batik/batik-1.5.1-r4.ebuild | 11 | ||||
| -rw-r--r-- | dev-java/batik/batik-1.5.ebuild | 19 |
2 files changed, 17 insertions, 13 deletions
diff --git a/dev-java/batik/batik-1.5.1-r4.ebuild b/dev-java/batik/batik-1.5.1-r4.ebuild index 9e6a081f1e28..2f4aec227c2f 100644 --- a/dev-java/batik/batik-1.5.1-r4.ebuild +++ b/dev-java/batik/batik-1.5.1-r4.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-java/batik/batik-1.5.1-r4.ebuild,v 1.5 2005/06/28 01:44:42 gustavoz Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/batik/batik-1.5.1-r4.ebuild,v 1.6 2005/07/12 19:58:14 axxo Exp $ inherit java-pkg @@ -13,13 +13,14 @@ SLOT="1.5.1" KEYWORDS="x86 sparc ppc amd64" IUSE="doc" -DEPEND=">=virtual/jdk-1.3 - app-arch/unzip - dev-java/ant-core" RDEPEND=">=virtual/jdk-1.3 =dev-java/rhino-1.5* =dev-java/xerces-2.6* dev-java/xml-commons" +DEPEND=">=virtual/jdk-1.3 + ${RDEPEND} + app-arch/unzip + dev-java/ant-core" S=${WORKDIR}/xml-batik @@ -37,7 +38,7 @@ src_compile() { ant ${antflags} || die "compile problem" } -src_install () { +src_install() { java-pkg_dojar ${P}/batik*.jar cd ${P}/lib diff --git a/dev-java/batik/batik-1.5.ebuild b/dev-java/batik/batik-1.5.ebuild index 4646be63ed6d..04acd8c36882 100644 --- a/dev-java/batik/batik-1.5.ebuild +++ b/dev-java/batik/batik-1.5.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-java/batik/batik-1.5.ebuild,v 1.11 2005/06/12 20:06:00 luckyduck Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/batik/batik-1.5.ebuild,v 1.12 2005/07/12 19:58:14 axxo Exp $ inherit java-pkg @@ -8,16 +8,19 @@ DESCRIPTION="Batik is a Java(tm) technology based toolkit for applications or ap SRC_URI="mirror://apache/xml/batik/${PN}-src-${PV}.zip" HOMEPAGE="http://xml.apache.org/batik/" IUSE="doc" -DEPEND=">=virtual/jdk-1.3 - =dev-java/rhino-1.5* - app-arch/unzip - >=dev-java/xerces-2.6.2-r1 - dev-java/ant" -RDEPEND=">=virtual/jdk-1.3" LICENSE="Apache-1.1" SLOT="1.5" KEYWORDS="~x86 ~sparc ~ppc ~amd64" +RDEPEND=">=virtual/jdk-1.3 + =dev-java/rhino-1.5* + =dev-java/xerces-2.6* + dev-java/xml-commons" +DEPEND=">=virtual/jdk-1.3 + ${RDEPEND} + app-arch/unzip + dev-java/ant-core" + S=${WORKDIR}/xml-batik src_unpack() { @@ -34,7 +37,7 @@ src_compile() { ant ${antflags} || die "compile problem" } -src_install () { +src_install() { java-pkg_dojar ${P}/batik*.jar cd ${P}/lib |