From b44780b2e96d9d50e2a1788d75937127565ff279 Mon Sep 17 00:00:00 2001 From: Thomas Matthijs Date: Fri, 15 Jul 2005 18:54:47 +0000 Subject: dep/style fixes Package-Manager: portage-2.0.51.22-r1 --- dev-java/exolabcore/exolabcore-0.3.7_p20050205.ebuild | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'dev-java/exolabcore') diff --git a/dev-java/exolabcore/exolabcore-0.3.7_p20050205.ebuild b/dev-java/exolabcore/exolabcore-0.3.7_p20050205.ebuild index 782c45a7b4e6..ec1094e6a0af 100644 --- a/dev-java/exolabcore/exolabcore-0.3.7_p20050205.ebuild +++ b/dev-java/exolabcore/exolabcore-0.3.7_p20050205.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/exolabcore/exolabcore-0.3.7_p20050205.ebuild,v 1.6 2005/07/10 02:59:27 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/exolabcore/exolabcore-0.3.7_p20050205.ebuild,v 1.7 2005/07/15 18:54:47 axxo Exp $ inherit eutils java-pkg @@ -15,10 +15,6 @@ SLOT="0" KEYWORDS="amd64 x86 sparc" IUSE="doc jikes source" -DEPEND=">=virtual/jdk-1.4 - dev-java/ant-core - jikes? ( dev-java/jikes ) - source? ( app-arch/zip )" RDEPEND=">=virtual/jre-1.4 dev-java/cdegroot-db dev-java/commons-cli @@ -27,6 +23,11 @@ RDEPEND=">=virtual/jre-1.4 dev-java/log4j =dev-java/jakarta-oro-2.0* =dev-java/xerces-1.3*" +DEPEND=">=virtual/jdk-1.4 + ${RDEPEND} + dev-java/ant-core + jikes? ( dev-java/jikes ) + source? ( app-arch/zip )" S=${WORKDIR}/${MY_P} @@ -37,6 +38,7 @@ src_unpack() { epatch ${FILESDIR}/${P}-buildfile.patch cd ${S}/lib + rm -f *.jar java-pkg_jar-from cdegroot-db-1 java-pkg_jar-from commons-cli-1 java-pkg_jar-from commons-logging @@ -56,8 +58,7 @@ src_compile() { } src_install() { - mv dist/${PN}-0.3.7.jar ${PN}.jar - java-pkg_dojar ${PN}.jar + java-pkg_newjar dist/${PN}-0.3.7.jar ${PN}.jar use doc && java-pkg_dohtml -r build/doc/* use source && java-pkg_dosrc src/main/* -- cgit v1.2.3-65-gdbad