Remove old for servletapi removal. #398689

(Portage version: 2.1.11.13/cvs/Linux x86_64)

3 files changed, 5 insertions, 109 deletions

diff --git a/dev-java/soap/ChangeLog b/dev-java/soap/ChangeLog
index 4e9dd3aa2c72..4b74a0f3b94d 100644
--- a/dev-java/soap/ChangeLog
+++ b/dev-java/soap/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/soap
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/soap/ChangeLog,v 1.16 2012/06/21 01:11:24 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/soap/ChangeLog,v 1.17 2012/09/29 08:49:34 sera Exp $
+
+  29 Sep 2012; Ralph Sennhauser <sera@gentoo.org> -soap-2.3.1-r1.ebuild,
+  -soap-2.3.1-r2.ebuild:
+  Remove old for servletapi removal. #398689
 
   21 Jun 2012; Jeff Horelick <jdhore@gentoo.org> soap-2.3.1-r3.ebuild:
   marked x86 per bug 422029
diff --git a/dev-java/soap/soap-2.3.1-r1.ebuild b/dev-java/soap/soap-2.3.1-r1.ebuild
deleted file mode 100644
index 4d731c9e1961..000000000000
--- a/dev-java/soap/soap-2.3.1-r1.ebuild
+++ /dev/null
@@ -1,53 +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/soap/soap-2.3.1-r1.ebuild,v 1.3 2007/03/11 20:53:00 nichoj Exp $
-
-inherit java-pkg-2 java-ant-2 eutils
-
-MY_P=${P//./_}
-DESCRIPTION="Apache SOAP (Simple Object Access Protocol) is an implementation of the SOAP submission to W3C"
-HOMEPAGE="http://ws.apache.org/soap/"
-SRC_URI="mirror://apache/ws/soap/version-${PV}/soap-src-${PV}.tar.gz"
-
-LICENSE="Apache-1.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc source"
-
-CDEPEND="dev-java/sun-javamail
-	dev-java/sun-jaf
-	=dev-java/servletapi-2.4*
-	>=dev-java/xerces-2.7"
-RDEPEND=">=virtual/jre-1.4
-	${CDEPEND}"
-DEPEND=">=virtual/jdk-1.4
-	dev-java/ant-core
-	source? ( app-arch/zip )
-	${CDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# get rid of automagical tests, add gentoo.classpath to <javac>
-	epatch "${FILESDIR}/${P}-build.xml.patch"
-	# javadoc is a stupid thing, why it has -source 1.4 if not for this?!
-	if use doc; then
-		find src -name "*.java" -exec sed -i s/enum/enum1/g "{}" ";" \
-			|| die "failed to rewrite enum keywords"
-	fi
-}
-
-src_compile() {
-	local gcp="$(java-pkg_getjars sun-javamail,sun-jaf,xerces-2,servletapi-2.4)"
-	eant "-Dgentoo.classpath=\"${gcp}\"" compile $(use_doc javadocs)
-}
-
-src_install() {
-	java-pkg_dojar build/lib/${PN}.jar
-
-	use doc && java-pkg_dojavadoc build/javadocs
-	use source && java-pkg_dosrc src/org
-}
diff --git a/dev-java/soap/soap-2.3.1-r2.ebuild b/dev-java/soap/soap-2.3.1-r2.ebuild
deleted file mode 100644
index 1333dc7045ae..000000000000
--- a/dev-java/soap/soap-2.3.1-r2.ebuild
+++ /dev/null
@@ -1,55 +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/soap/soap-2.3.1-r2.ebuild,v 1.4 2008/05/17 14:23:45 ken69267 Exp $
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2 eutils
-
-MY_P=${P//./_}
-DESCRIPTION="Apache SOAP (Simple Object Access Protocol) is an implementation of the SOAP submission to W3C"
-HOMEPAGE="http://ws.apache.org/soap/"
-SRC_URI="mirror://apache/ws/soap/version-${PV}/soap-src-${PV}.tar.gz"
-
-LICENSE="Apache-1.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-CDEPEND="java-virtuals/javamail
-	dev-java/sun-jaf
-	=dev-java/servletapi-2.4*
-	>=dev-java/xerces-2.7"
-RDEPEND=">=virtual/jre-1.4
-	${CDEPEND}"
-DEPEND=">=virtual/jdk-1.4
-	dev-java/ant-core
-	${CDEPEND}"
-JAVA_PKG_FILTER_COMPILER="jikes"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# get rid of automagical tests, add gentoo.classpath to <javac>
-	epatch "${FILESDIR}/${P}-build.xml.patch"
-	# javadoc is a stupid thing, why it has -source 1.4 if not for this?!
-	if use doc; then
-		find src -name "*.java" -exec sed -i s/enum/enum1/g "{}" ";" \
-			|| die "failed to rewrite enum keywords"
-	fi
-}
-
-src_compile() {
-	local gcp="$(java-pkg_getjars javamail,sun-jaf,xerces-2,servletapi-2.4)"
-	eant "-Dgentoo.classpath=\"${gcp}\"" compile $(use_doc javadocs)
-}
-
-src_install() {
-	java-pkg_dojar build/lib/${PN}.jar
-
-	use doc && java-pkg_dojavadoc build/javadocs
-	use source && java-pkg_dosrc src/org
-}