Remove old for servletapi removal. #398689

Package-Manager: portage-2.1.11.13/cvs/Linux x86_64

4 files changed, 20 insertions, 112 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/Manifest b/dev-java/soap/Manifest
index 5f7c2fb08aef..ec9c4dc8905b 100644
--- a/dev-java/soap/Manifest
+++ b/dev-java/soap/Manifest
@@ -1,7 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX soap-2.3.1-build.xml.patch 1334 SHA256 4828ccf6760b503db626657c1308332aa595f1142ef8cec6ca740ae34b759990 SHA512 623ed03291ce98d90272799435acdd6e02673c333070727f06387ddd43af8544d5ad442766c12bcc0adf11e3fc9687db0395653950d4e00bc0ad66273dbd1551 WHIRLPOOL ae413938f18418919ce9b6fe38fc8d993f2ca1cacd8de2938e808b51244eb9a69e54e58cc453f39f9b40e05bac295c2cde5e64ea9abad5377b93689d75171184
 DIST soap-src-2.3.1.tar.gz 142925 SHA256 4b580107a4026801c29975668e03c6fe959662086d910da979450eae2f808c87 SHA512 b289f8399b15e28ee2b7fa6c42fe56ee0cf42ed8202c234cfca2c3f2a877518e04a29af2fe07f140d8ac23bd6b19607964b79757f6c9733c0be746e3eaadcbce WHIRLPOOL a0e696fee2e187f111a1323c77fde3ce4c0d05f37e8595d5316cb62d563fac23a8e87c91013e65372091c8ace3a5c6da2c5658c1b77d0412736cd7d906bc5ff6
-EBUILD soap-2.3.1-r1.ebuild 1460 SHA256 db476f0cc0d94996fb9641ef16b52f7307d18234167ef8d1bd801e835e86fb03 SHA512 e049fb158a77ec06067c662d1cb47d8c2ed75505b5a68c1a74522ae082ebb517d4a6cf009d6f36828ee12a9f8ee85827386c09d1b620825ae6f45f331376a536 WHIRLPOOL 56b0b312999f0683899b54a0551b935cec94d5e61b40cb852b324baf2781013631f562ec60d10bfce6baf828f2f149af726d829cf2e1fab8b686a98b291c965d
-EBUILD soap-2.3.1-r2.ebuild 1484 SHA256 74dc6ca1bc0b89918a392d9d8ed725e9fa4f44859af96603791264d72290be8f SHA512 c18abf1414575b9235fefef8b185f5848d83efa44ab54ef8f30a0f3e90c1ca3eb9f849ad36760e6412d54b5eb322fa8f506ae4702126cc2d5cd0ad81f511a0fc WHIRLPOOL 9947dc3d13abe3deaa15ef53bdc02321fe185b70e9287383a8c0c7171845b1a4a06e6224c6c22d4d1725bf1d6a35f7138ae892eab20f1fbd939d138207fdfbf4
 EBUILD soap-2.3.1-r3.ebuild 1286 SHA256 2f87647dc4c55d03492c2f285c370e269cc2eaa1c58f35879c7c3608c24067c2 SHA512 79ef4ef5277b6b8bb98251878e7dfc5c8eb77395aa65613c275f0e411eb72096fa03e9e1766e8422cee94868e4e104eeefa302560e33f6b098dacfa1c07e1e5a WHIRLPOOL 20650494c4b471bd6b8f1492cd8c44ba2d9494456bf401f370e87b91c19da396fc607332249e3c91c43c96309acdc0a8b781a1bc98ddc127ccb20eae385dfea9
-MISC ChangeLog 2570 SHA256 9a174dfae7220fc3c615f3feb7f2b1f6d783e5d0783c15c5821598693f64b86e SHA512 753ba76cab4f609ddd1b6c582b5321b9b65584be122081a1c39e6cdc63a8fd18895cbe88c7fd8557c8c2ba63d6325e4d0789d9e9de6a499ff43b0334fe36f5b2 WHIRLPOOL e8c89677d9160c33a836f6bbc16f89b5541fab85013bf02b1ce7de0622556acbcd546e631e27499a4dfe9374e875da6944c42a6222b1aa0e2f2042f7322b4b64
+MISC ChangeLog 2712 SHA256 5a30dd433a521bc8a406280481d833cbe655b0ee507d8064419953d7fd617362 SHA512 eadd3aebe24c92df22f7cc65c15f5773a22883dcc7fd7f72927d14bb7f404a133218de0095a05c21301c21edb024cebd74645d3f07a777f88cac2e8bdb1d8f35 WHIRLPOOL d23cd624cf8e12ee3c49529592a03f5d04599faabc73ef305627bdf833b4620169958e6940da720ee80c342e2d26880ec9afdeab12c4eec1aa41faa0946df27b
 MISC metadata.xml 158 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb SHA512 54f88fc3270968439ba87295b04365a89101c55d33a8c209a56036dc60244e5c73f78ec09484b3e5af28de9dee2159b1dab670cbd5d80a9e0c4543145c0390a3 WHIRLPOOL fcffc4fb6751b5a6eec33aa833f9d7dea0168d3ab67f7e34565370f92fd917ed882bcc57585481bf4d31e601f83a592d99d1c3f50fc793f1c38cd174cc8b2f26
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJQZrYrAAoJEIUJ+svaV163mOUH/jKntmpp2+w3WUDulsraqzGp
+1gicBQlvFKVSHvuu5ovrIKd81hc++KW8qMYMepbUUiPxQZWfO3tMBcRyyIPRCRPd
+cWTRdsUq5CIOwWXXKRN0N9eXfmM22v/8PSevFcgDOcXjEO9Oeeqm/Xq4CvGjgHDJ
+lfCXMxgBXIFW7avKiH2mg8e1HxK5nLXzdw24z05/qJGKhO+7o1mhGMXquG750zS1
+O6dBrym8ebToJ9R4CTBcty6EzXSaxR7TBvUs/n6KF0ixlmrtl6ZI00SNSI+fQjko
+4Ow2rgZXCYCIaABL59+F0UCnIHUiLm7vrxUK0rpCuJ/Va+s3uae0uEtiyqRfoKY=
+=Ld3P
+-----END PGP SIGNATURE-----
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
-}