diff options
| author |   Thomas Matthijs <axxo@gentoo.org> | 2005-07-10 15:14:44 +0000 |
|---|---|---|
| committer | Thomas Matthijs <axxo@gentoo.org> | 2005-07-10 15:14:44 +0000 |
| commit | 16b53aa9a824f83f14ee05732d6a5af7b6e09153 (patch) | |
| tree | d0aaf8c986496761cc0563cda051163fac7b4b96 /dev-java | |
| parent | Added DEPEND on python (forcing repoman to sign) (diff) | |
| download | gentoo-2-16b53aa9a824f83f14ee05732d6a5af7b6e09153.tar.gz gentoo-2-16b53aa9a824f83f14ee05732d6a5af7b6e09153.tar.bz2 gentoo-2-16b53aa9a824f83f14ee05732d6a5af7b6e09153.zip | |
cleanup
(Portage version: 2.0.51.22-r1)
Diffstat (limited to 'dev-java')
| -rw-r--r-- | dev-java/struts-legacy/struts-legacy-1.0-r1.ebuild | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/dev-java/struts-legacy/struts-legacy-1.0-r1.ebuild b/dev-java/struts-legacy/struts-legacy-1.0-r1.ebuild index b55c1d50cb50..e62c47100943 100644 --- a/dev-java/struts-legacy/struts-legacy-1.0-r1.ebuild +++ b/dev-java/struts-legacy/struts-legacy-1.0-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/struts-legacy/struts-legacy-1.0-r1.ebuild,v 1.11 2005/05/29 15:53:37 corsair Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/struts-legacy/struts-legacy-1.0-r1.ebuild,v 1.12 2005/07/10 15:14:44 axxo Exp $ inherit java-pkg @@ -8,14 +8,12 @@ DESCRIPTION="Jakarta Struts Legacy Library" SRC_URI="mirror://apache/jakarta/struts/struts-legacy/${P}-src.tar.gz" HOMEPAGE="http://jakarta.apache.org/struts/" IUSE="doc jikes" +RDEPEND=">=virtual/jre-1.4 + dev-java/commons-logging" DEPEND=">=virtual/jdk-1.4 - dev-java/ant - jikes? ( dev-java/jikes )" -RDEPEND="|| ( - >=virtual/jdk-1.4 - ( >=virtual/jdk-1.3 >=dev-java/jdbc2-stdext-2.0 ) - ) - dev-java/commons-logging" + dev-java/ant + ${RDEPEND} + jikes? ( dev-java/jikes )" LICENSE="Apache-1.1" SLOT="0" KEYWORDS="~amd64 ~ppc ppc64 ~sparc ~x86" @@ -24,10 +22,7 @@ S=${WORKDIR}/${P}-src src_compile() { sed -i 's:compile,docs:compile:' build.xml || die "sed failed" - echo "commons-logging.jar=`java-config -p commons-logging | sed 's/.*://'`" > build.properties - if has_version jdbc2-stdext; then - echo "jdbc20ext.jar=`java-config -p jdbc2-stdext`" >> build.properties - fi + echo "commons-logging.jar=$(java-pkg_getjar commons-logging commons-logging.jar)" > build.properties echo "jdk.version=1.4" >> build.properties local antflags="dist" @@ -37,7 +32,7 @@ src_compile() { } src_install () { - java-pkg_dojar dist/*.jar + java-pkg_dojar dist/${PN}.jar dodoc STATUS.txt use doc && java-pkg_dohtml -r dist/docs/ } |