diff options
| -rw-r--r-- | dev-java/tomcat-servlet-api/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.23.ebuild | 9 | ||||
| -rw-r--r-- | dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.10.ebuild | 22 |
3 files changed, 12 insertions, 25 deletions
diff --git a/dev-java/tomcat-servlet-api/ChangeLog b/dev-java/tomcat-servlet-api/ChangeLog index 85095f270fee..ac78cab83744 100644 --- a/dev-java/tomcat-servlet-api/ChangeLog +++ b/dev-java/tomcat-servlet-api/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-java/tomcat-servlet-api # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/ChangeLog,v 1.17 2007/03/12 23:59:57 wltjr Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/ChangeLog,v 1.18 2007/04/02 16:24:27 betelgeuse Exp $ + + 02 Apr 2007; Petteri Räty <betelgeuse@gentoo.org> + tomcat-servlet-api-5.5.23.ebuild, tomcat-servlet-api-6.0.10.ebuild: + Stylistic cleanup. 12 Mar 2007; William L. Thomson Jr. <wltjr@gentoo.org> tomcat-servlet-api-5.5.20.ebuild, tomcat-servlet-api-5.5.23.ebuild, diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.23.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.23.ebuild index ea72374805ed..a904d8fea8c1 100644 --- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.23.ebuild +++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.23.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.23.ebuild,v 1.2 2007/03/12 23:59:57 wltjr Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.23.ebuild,v 1.3 2007/04/02 16:24:27 betelgeuse Exp $ inherit eutils java-pkg-2 java-ant-2 @@ -22,13 +22,6 @@ RDEPEND="java5? ( >=virtual/jdk-1.5 ) S="${WORKDIR}/${MY_P}/servletapi" -pkg_setup() { - if use java5; then - JAVA_PKG_WANT_SOURCE="1.5" - JAVA_PKG_WANT_TARGET="1.5" - fi -} - src_compile() { local antflags="jar $(use_doc javadoc examples)" eant ${antflags} -f jsr154/build.xml diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.10.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.10.ebuild index 59debda74e97..b67c4a54e516 100644 --- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.10.ebuild +++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.10.ebuild @@ -1,6 +1,8 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.10.ebuild,v 1.2 2007/03/12 23:59:57 wltjr Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.10.ebuild,v 1.3 2007/04/02 16:24:27 betelgeuse Exp $ + +JAVA_PKG_IUSE="source" inherit eutils java-pkg-2 java-ant-2 @@ -13,10 +15,8 @@ SRC_URI="mirror://apache/jakarta/tomcat-6/v${PV/_/-}/src/${MY_P}.tar.gz" LICENSE="Apache-1.1" SLOT="2.5" KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd" -IUSE="source" -DEPEND=">=virtual/jdk-1.5 - source? ( app-arch/zip )" +DEPEND=">=virtual/jdk-1.5" RDEPEND=">=virtual/jre-1.5" S="${WORKDIR}/${MY_P}/" @@ -29,18 +29,8 @@ src_unpack() { rm */*/build.xml } -src_compile() { -# local antflags="jar $(use_doc javadoc examples)" - local antflags="jar" - eant ${antflags} -} - src_install() { - cd "${S}/output/build/lib" - java-pkg_dojar *.jar + java-pkg_dojar "${S}"/output/build/lib/*.jar # use doc && java-pkg_dohtml -r docs/* - if use source; then - cd "${S}" - java-pkg_dosrc java/javax/servlet/ - fi + use source && java-pkg_dosrc java/javax/servlet/ } |