diff options
| -rw-r--r-- | dev-java/jakarta-tomcat-jasper/jakarta-tomcat-jasper-2.ebuild | 34 | ||||
| -rw-r--r-- | dev-java/jarjar/jarjar-0.4_p20050105.ebuild | 12 |
2 files changed, 21 insertions, 25 deletions
diff --git a/dev-java/jakarta-tomcat-jasper/jakarta-tomcat-jasper-2.ebuild b/dev-java/jakarta-tomcat-jasper/jakarta-tomcat-jasper-2.ebuild index 9989aa1b9bfa..c887ee0f475e 100644 --- a/dev-java/jakarta-tomcat-jasper/jakarta-tomcat-jasper-2.ebuild +++ b/dev-java/jakarta-tomcat-jasper/jakarta-tomcat-jasper-2.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/jakarta-tomcat-jasper/jakarta-tomcat-jasper-2.ebuild,v 1.2 2005/05/25 15:10:03 luckyduck Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/jakarta-tomcat-jasper/jakarta-tomcat-jasper-2.ebuild,v 1.3 2005/07/16 11:30:12 axxo Exp $ inherit eutils java-pkg @@ -14,10 +14,6 @@ SLOT="2" KEYWORDS="~x86 ~amd64" IUSE="doc jikes source" -DEPEND=">=virtual/jdk-1.4 - dev-java/ant-core - jikes? ( dev-java/jikes ) - source? ( app-arch/zip )" RDEPEND=">=virtual/jdk-1.4 =dev-java/servletapi-2.4* =dev-java/xerces-1.3* @@ -28,6 +24,11 @@ RDEPEND=">=virtual/jdk-1.4 dev-java/commons-el dev-java/commons-logging dev-java/commons-launcher" +DEPEND=">=virtual/jdk-1.4 + ${RDEPEND} + dev-java/ant-core + jikes? ( dev-java/jikes ) + source? ( app-arch/zip )" S=${WORKDIR}/jakarta-tomcat-${TOMCAT_PV}-src/${PN}/jasper2 @@ -36,20 +37,13 @@ src_unpack() { cd ${S} # Setup build.properties - echo "servlet-api.jar=$(java-pkg_getjar servletapi-2.4 servlet-api.jar)" \ - >> build.properties - echo "jsp-api.jar=$(java-pkg_getjar servletapi-2.4 jsp-api.jar)" \ - >> build.properties - echo "ant.jar.jar=$(java-pkg_getjar ant-core ant.jar)" \ - >> build.properties - echo "xerces.jar=$(java-pkg_getjar xerces-1.3 xerces.jar)" \ - >> build.properties - echo "xercesImpl.jar=$(java-pkg_getjar xerces-2 xercesImpl.jar)" \ - >> build.properties - echo "xml-apis.jar=$(java-pkg_getjar xml-commons xml-apis.jar)" \ - >> build.properties - echo "commons-el.jar=$(java-pkg_getjar commons-el commons-el.jar)" \ - >> build.properties + echo "servlet-api.jar=$(java-pkg_getjar servletapi-2.4 servlet-api.jar)" >> build.properties + echo "jsp-api.jar=$(java-pkg_getjar servletapi-2.4 jsp-api.jar)" >> build.properties + echo "ant.jar.jar=$(java-pkg_getjar ant-core ant.jar)" >> build.properties + echo "xerces.jar=$(java-pkg_getjar xerces-1.3 xerces.jar)" >> build.properties + echo "xercesImpl.jar=$(java-pkg_getjar xerces-2 xercesImpl.jar)" >> build.properties + echo "xml-apis.jar=$(java-pkg_getjar xml-commons xml-apis.jar)" >> build.properties + echo "commons-el.jar=$(java-pkg_getjar commons-el commons-el.jar)" >> build.properties echo "commons-collections.jar=$(java-pkg_getjar commons-collections commons-collections.jar)" >> build.properties echo "commons-logging.jar=$(java-pkg_getjar commons-logging commons-logging.jar)" >> build.properties echo "commons-daemon-launcher=$(java-pkg_getjar commons-daemon commons-daemon.jar)" >> build.properties @@ -63,7 +57,7 @@ src_compile() { ant ${antflags} || die "compilation failed" } -src_install () { +src_install() { java-pkg_dojar ${S}/build/shared/lib/jasper-*.jar use doc && java-pkg_dohtml -r ${S}/build/javadoc diff --git a/dev-java/jarjar/jarjar-0.4_p20050105.ebuild b/dev-java/jarjar/jarjar-0.4_p20050105.ebuild index ea352edf1584..05b1f5459d15 100644 --- a/dev-java/jarjar/jarjar-0.4_p20050105.ebuild +++ b/dev-java/jarjar/jarjar-0.4_p20050105.ebuild @@ -1,22 +1,23 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/jarjar/jarjar-0.4_p20050105.ebuild,v 1.3 2005/05/18 22:58:58 luckyduck Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/jarjar/jarjar-0.4_p20050105.ebuild,v 1.4 2005/07/16 11:25:46 axxo Exp $ inherit eutils java-pkg -DESCRIPTION="Reduce Java dependency headaches by repackaging third-party jars." +DESCRIPTION="Reduce Java dependency headaches by repackaging third-party jars (evil!)." SRC_URI="mirror://gentoo/${P}.tar.bz2" HOMEPAGE="http://jarjar.sourceforge.net" LICENSE="GPL-2" SLOT="1" KEYWORDS="x86 amd64" IUSE="doc jikes" -DEPEND=">=virtual/jdk-1.3 - jikes? ( >=dev-java/jikes-1.21 ) - >=dev-java/ant-core-1.4" RDEPEND=">=virtual/jre-1.3 =dev-java/asm-2* =dev-java/gnu-regexp-1*" +DEPEND=">=virtual/jdk-1.3 + ${RDEPEND} + jikes? ( >=dev-java/jikes-1.21 ) + >=dev-java/ant-core-1.4" src_unpack() { unpack ${A} @@ -25,6 +26,7 @@ src_unpack() { epatch ${FILESDIR}/asm-2.0_alpha-buildfile.patch cd ${S}/lib + rm -f *.jar java-pkg_jar-from asm-2 java-pkg_jar-from gnu-regexp-1 } |