diff options
| author |   Thomas Matthijs <axxo@gentoo.org> | 2005-07-12 23:33:29 +0000 |
|---|---|---|
| committer | Thomas Matthijs <axxo@gentoo.org> | 2005-07-12 23:33:29 +0000 |
| commit | 5023fff0a11aca3be8e4a71d3ae9a90efb8fe14b (patch) | |
| tree | 25a422b3a65fda046025a42c89ee655627fb9f47 /dev-java | |
| parent | dep fixes (diff) | |
| download | gentoo-2-5023fff0a11aca3be8e4a71d3ae9a90efb8fe14b.tar.gz gentoo-2-5023fff0a11aca3be8e4a71d3ae9a90efb8fe14b.tar.bz2 gentoo-2-5023fff0a11aca3be8e4a71d3ae9a90efb8fe14b.zip | |
Dep/Style fixes
(Portage version: 2.0.51.22-r1)
Diffstat (limited to 'dev-java')
| -rw-r--r-- | dev-java/castor/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-java/castor/castor-0.9.5.3-r1.ebuild | 16 |
2 files changed, 11 insertions, 10 deletions
diff --git a/dev-java/castor/ChangeLog b/dev-java/castor/ChangeLog index c495f7ad4677..067584a0c171 100644 --- a/dev-java/castor/ChangeLog +++ b/dev-java/castor/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-java/castor # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/castor/ChangeLog,v 1.10 2005/05/19 20:50:12 luckyduck Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/castor/ChangeLog,v 1.11 2005/07/12 23:33:29 axxo Exp $ + + 12 Jul 2005; Thomas Matthijs <axxo@gentoo.org> castor-0.9.5.3-r1.ebuild: + Dep/Style fixes *castor-0.9.5.3-r1 (19 May 2005) diff --git a/dev-java/castor/castor-0.9.5.3-r1.ebuild b/dev-java/castor/castor-0.9.5.3-r1.ebuild index 5d059b1b02e7..07fa69d056a0 100644 --- a/dev-java/castor/castor-0.9.5.3-r1.ebuild +++ b/dev-java/castor/castor-0.9.5.3-r1.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/castor/castor-0.9.5.3-r1.ebuild,v 1.1 2005/05/19 20:50:12 luckyduck Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/castor/castor-0.9.5.3-r1.ebuild,v 1.2 2005/07/12 23:33:29 axxo Exp $ inherit eutils java-pkg @@ -12,11 +12,7 @@ KEYWORDS="x86 amd64 sparc" SLOT="0.9" IUSE="doc jikes postgres source" -DEPEND=">=virtual/jdk-1.4 - ${RDEPEND}" - RDEPEND=">=virtual/jre-1.4 - >=dev-java/ant-core-1.5 >=dev-java/adaptx-0.9.5.3 >=dev-java/commons-logging-1.0.4 =dev-java/jakarta-oro-2.0* @@ -29,6 +25,10 @@ RDEPEND=">=virtual/jre-1.4 =dev-java/xerces-1.3* postgres? ( =dev-java/jdbc2-postgresql-7.3* )" +DEPEND=">=virtual/jdk-1.4 + >=dev-java/ant-core-1.5 + ${RDEPEND}" + src_unpack() { unpack ${A} @@ -53,7 +53,6 @@ src_unpack() { use postgres && java-pkg_jar-from jdbc2-postgresql-5 } - src_compile() { cd ${S}/src local antflags="jar" @@ -63,9 +62,8 @@ src_compile() { } src_install() { - mv dist/${P}-xml.jar ${PN}-xml.jar - mv dist/${P}.jar ${PN}.jar - java-pkg_dojar *.jar + java-pkg_newjar dist/${P}-xml.jar ${PN}-xml.jar + java-pkg_newjar dist/${P}.jar ${PN}.jar use doc && java-pkg_dohtml -r build/doc/javadoc/* use source && java-pkg_dosrc src/main/* |