diff options
author | William Thomson <wltjr@gentoo.org> | 2008-05-12 23:34:25 +0000 |
---|---|---|
committer | William Thomson <wltjr@gentoo.org> | 2008-05-12 23:34:25 +0000 |
commit | ffd4fbb68c6032408bd29e1273088d2aae6fe9c2 (patch) | |
tree | e9c2cd38e44beb0f311118e19556006ca5795cd6 | |
parent | Stable for HPPA (bug #221063). (diff) | |
download | gentoo-2-ffd4fbb68c6032408bd29e1273088d2aae6fe9c2.tar.gz gentoo-2-ffd4fbb68c6032408bd29e1273088d2aae6fe9c2.tar.bz2 gentoo-2-ffd4fbb68c6032408bd29e1273088d2aae6fe9c2.zip |
Removed previous versions in same slot as stable.
(Portage version: 2.1.5_rc6)
4 files changed, 6 insertions, 136 deletions
diff --git a/dev-java/tomcat-servlet-api/ChangeLog b/dev-java/tomcat-servlet-api/ChangeLog index 8200d8d8d1ce..3cfc033f23e9 100644 --- a/dev-java/tomcat-servlet-api/ChangeLog +++ b/dev-java/tomcat-servlet-api/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-java/tomcat-servlet-api # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/ChangeLog,v 1.47 2008/05/12 10:56:22 nixnut Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/ChangeLog,v 1.48 2008/05/12 23:34:25 wltjr Exp $ + + 12 May 2008; William L. Thomson Jr. <wltjr@gentoo.org> + -tomcat-servlet-api-5.5.25.ebuild, -tomcat-servlet-api-5.5.25-r1.ebuild, + -tomcat-servlet-api-6.0.14.ebuild: + Removed previous versions in same slot as stable. 12 May 2008; nixnut <nixnut@gentoo.org> tomcat-servlet-api-5.5.26.ebuild: Stable on ppc wrt bug 221153 diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.25-r1.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.25-r1.ebuild deleted file mode 100644 index b201008ee606..000000000000 --- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.25-r1.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2008 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.25-r1.ebuild,v 1.1 2008/01/15 16:19:10 elvanor Exp $ - -inherit eutils java-pkg-2 java-ant-2 java-osgi - -MY_P="apache-${P/-servlet-api/}-src" -DESCRIPTION="Tomcat's Servlet API 2.4/JSP API 2.0 implementation" -HOMEPAGE="http://tomcat.apache.org/" -SRC_URI="mirror://apache/tomcat/tomcat-5/v${PV/_/-}/src/${MY_P}.tar.gz" - -LICENSE="Apache-1.1" -SLOT="2.4" -KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd" -IUSE="doc java5 source" - -DEPEND="java5? ( >=virtual/jdk-1.5 ) - !java5? ( =virtual/jdk-1.4* ) - source? ( app-arch/zip )" -RDEPEND="java5? ( >=virtual/jdk-1.5 ) - !java5? ( =virtual/jdk-1.4* )" - -S="${WORKDIR}/${MY_P}/servletapi" - -src_compile() { - local antflags="jar $(use_doc javadoc examples)" - eant ${antflags} -f jsr154/build.xml - eant ${antflags} -f jsr152/build.xml -} - -src_install() { - mv jsr{154,152}/dist/lib/*.jar "${S}" - - if use doc ; then - mkdir docs - cd "${S}/jsr154/build" - mv docs "${S}/docs/servlet" - mv examples "${S}/docs/servlet/examples" - - cd "${S}/jsr152/build" - mv docs "${S}/docs/jsp" - mv examples "${S}/docs/jsp/examples" - fi - - cd "${S}" - java-osgi_dojar-fromfile --no-auto-version "jsp-api.jar" "${FILESDIR}/jsp-api-2.0-manifest" "Java Server Pages API Bundle" - java-osgi_dojar-fromfile --no-auto-version "servlet-api.jar" "${FILESDIR}/servlet-api-2.4-manifest" "Servlet API Bundle" - use doc && java-pkg_dohtml -r docs/* - use source && java-pkg_dosrc jsr{152,154}/src/share/javax -} diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.25.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.25.ebuild deleted file mode 100644 index 502790de2265..000000000000 --- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.25.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# 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.25.ebuild,v 1.3 2007/11/03 02:01:25 wltjr Exp $ - -inherit eutils java-pkg-2 java-ant-2 - -MY_P="apache-${P/-servlet-api/}-src" -DESCRIPTION="Tomcat's Servlet API 2.4/JSP API 2.0 implementation" -HOMEPAGE="http://tomcat.apache.org/" -SRC_URI="mirror://apache/tomcat/tomcat-5/v${PV/_/-}/src/${MY_P}.tar.gz" - -LICENSE="Apache-1.1" -SLOT="2.4" -KEYWORDS="amd64 ppc x86 ~x86-fbsd" -IUSE="doc java5 source" - -DEPEND="java5? ( >=virtual/jdk-1.5 ) - !java5? ( =virtual/jdk-1.4* ) - source? ( app-arch/zip )" -RDEPEND="java5? ( >=virtual/jdk-1.5 ) - !java5? ( =virtual/jdk-1.4* )" - -S="${WORKDIR}/${MY_P}/servletapi" - -src_compile() { - local antflags="jar $(use_doc javadoc examples)" - eant ${antflags} -f jsr154/build.xml - eant ${antflags} -f jsr152/build.xml -} - -src_install() { - mv jsr{154,152}/dist/lib/*.jar "${S}" - - if use doc ; then - mkdir docs - cd "${S}/jsr154/build" - mv docs "${S}/docs/servlet" - mv examples "${S}/docs/servlet/examples" - - cd "${S}/jsr152/build" - mv docs "${S}/docs/jsp" - mv examples "${S}/docs/jsp/examples" - fi - - cd "${S}" - java-pkg_dojar *.jar - use doc && java-pkg_dohtml -r docs/* - use source && java-pkg_dosrc jsr{152,154}/src/share/javax -} diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.14.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.14.ebuild deleted file mode 100644 index d9cdf5244c23..000000000000 --- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.14.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# 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.14.ebuild,v 1.6 2007/11/03 02:01:25 wltjr Exp $ - -JAVA_PKG_IUSE="source" - -inherit eutils java-pkg-2 java-ant-2 - -MY_A="apache-${P}-src" -MY_P="${MY_A/-servlet-api/}" -DESCRIPTION="Tomcat's Servlet API 2.5/JSP API 2.1 implementation" -HOMEPAGE="http://tomcat.apache.org/" -SRC_URI="mirror://apache/tomcat/tomcat-6/v${PV/_/-}/src/${MY_P}.tar.gz" - -LICENSE="Apache-1.1" -SLOT="2.5" -KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd" - -DEPEND=">=virtual/jdk-1.5" -RDEPEND=">=virtual/jre-1.5" - -S="${WORKDIR}/${MY_P}/" - -src_unpack() { - unpack ${A} - cd "${S}" - - cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml" - rm */*/build.xml -} - -src_install() { - java-pkg_dojar "${S}"/output/build/lib/*.jar -# use doc && java-pkg_dohtml -r docs/* - use source && java-pkg_dosrc java/javax/servlet/ -} |