diff options
| author |   Thomas Matthijs <axxo@gentoo.org> | 2005-07-15 18:54:47 +0000 |
|---|---|---|
| committer | Thomas Matthijs <axxo@gentoo.org> | 2005-07-15 18:54:47 +0000 |
| commit | 2e948d80389c94b4164ef4e40b3ab7aac336c926 (patch) | |
| tree | 0359c54f8b1a090f005e06b16a3ccfc74ded5e1f /dev-java | |
| parent | Stable on sparc (diff) | |
| download | gentoo-2-2e948d80389c94b4164ef4e40b3ab7aac336c926.tar.gz gentoo-2-2e948d80389c94b4164ef4e40b3ab7aac336c926.tar.bz2 gentoo-2-2e948d80389c94b4164ef4e40b3ab7aac336c926.zip | |
dep/style fixes
(Portage version: 2.0.51.22-r1)
Diffstat (limited to 'dev-java')
| -rw-r--r-- | dev-java/exolabcore/exolabcore-0.3.7_p20050205.ebuild | 15 | ||||
| -rw-r--r-- | dev-java/exolabtools/exolabtools-1.0_p20050205.ebuild | 13 |
2 files changed, 15 insertions, 13 deletions
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/* diff --git a/dev-java/exolabtools/exolabtools-1.0_p20050205.ebuild b/dev-java/exolabtools/exolabtools-1.0_p20050205.ebuild index 7c5ff52ae1c3..d547c7c1abe5 100644 --- a/dev-java/exolabtools/exolabtools-1.0_p20050205.ebuild +++ b/dev-java/exolabtools/exolabtools-1.0_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/exolabtools/exolabtools-1.0_p20050205.ebuild,v 1.9 2005/05/30 19:14:26 gustavoz Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/exolabtools/exolabtools-1.0_p20050205.ebuild,v 1.10 2005/07/15 18:52:25 axxo Exp $ inherit java-pkg @@ -15,13 +15,15 @@ SLOT="0" KEYWORDS="amd64 x86 sparc ~ppc" IUSE="doc jikes source" +RDEPEND=">=virtual/jre-1.4 + =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 )" -RDEPEND=">=virtual/jre-1.4 - =dev-java/jakarta-oro-2.0* - =dev-java/xerces-1.3*" S=${WORKDIR}/${MY_P} @@ -34,8 +36,7 @@ src_compile() { } src_install() { - mv dist/${PN}-1.0.jar ${PN}.jar - java-pkg_dojar ${PN}.jar + java-pkg_newjar dist/${PN}-1.0.jar ${PN}.jar if use doc; then dodoc src/etc/CHANGELOG src/etc/VERSION src/etc/JARS |