Stable ppc #291480. Remove old.

Package-Manager: portage-2.2_rc61/cvs/Linux x86_64

4 files changed, 8 insertions, 103 deletions

diff --git a/dev-java/tomcat-servlet-api/ChangeLog b/dev-java/tomcat-servlet-api/ChangeLog
index b70bbcadf1a5..49ed4b209414 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-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/ChangeLog,v 1.71 2010/01/15 17:47:50 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/ChangeLog,v 1.72 2010/01/22 11:12:00 caster Exp $
+
+  22 Jan 2010; Vlastimil Babka <caster@gentoo.org>
+  -tomcat-servlet-api-5.5.26.ebuild, -tomcat-servlet-api-5.5.27.ebuild,
+  tomcat-servlet-api-5.5.27-r1.ebuild:
+  Stable ppc #291480. Remove old.
 
   15 Jan 2010; Fabian Groffen <grobian@gentoo.org>
   tomcat-servlet-api-3.ebuild, tomcat-servlet-api-4.1.36.ebuild,
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.26.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.26.ebuild
deleted file mode 100644
index c56df138576e..000000000000
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.26.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2009 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.26.ebuild,v 1.5 2009/06/13 17:21:32 betelgeuse 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-2.0"
-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.27-r1.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.27-r1.ebuild
index d68689f20911..8ec9147d06ee 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.27-r1.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.27-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.27-r1.ebuild,v 1.3 2010/01/03 21:39:54 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.27-r1.ebuild,v 1.4 2010/01/22 11:12:00 caster Exp $
 
 inherit eutils java-pkg-2 java-ant-2 java-osgi
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-5/v${PV/_/-}/src/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="2.4"
-KEYWORDS="amd64 ~ppc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ppc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
 IUSE="doc source"
 
 DEPEND=">=virtual/jdk-1.5
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.27.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.27.ebuild
deleted file mode 100644
index 4729dd09ae03..000000000000
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.27.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2009 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.27.ebuild,v 1.3 2009/06/13 17:21:32 betelgeuse 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-2.0"
-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
-}