RevBump soap to use java-virtuals/javamail

Package-Manager: portage-2.1.3.19

4 files changed, 74 insertions, 15 deletions

diff --git a/dev-java/soap/ChangeLog b/dev-java/soap/ChangeLog
index af286bfe601c..46d847d0ac90 100644
--- a/dev-java/soap/ChangeLog
+++ b/dev-java/soap/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/soap
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/soap/ChangeLog,v 1.9 2007/03/13 21:23:42 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/soap/ChangeLog,v 1.10 2007/11/19 09:21:21 ali_bush Exp $
+
+*soap-2.3.1-r2 (19 Nov 2007)
+
+  19 Nov 2007; <alistair@gentoo.org> +soap-2.3.1-r2.ebuild:
+  Revbumping soap to use java-virtuals/javamail
 
   13 Mar 2007; Petteri Räty <betelgeuse@gentoo.org> -soap-2.3.1.ebuild:
   Cleanup.
diff --git a/dev-java/soap/Manifest b/dev-java/soap/Manifest
index 43b67f3274b6..1aaf032d5376 100644
--- a/dev-java/soap/Manifest
+++ b/dev-java/soap/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX soap-2.3.1-build.xml.patch 1334 RMD160 46ebfebd9550c16c77491402f6aebb1a47808a3e SHA1 0f14d9db4e845d77d0e51d8fef8a0b7f8b0a3eb6 SHA256 4828ccf6760b503db626657c1308332aa595f1142ef8cec6ca740ae34b759990
 MD5 705f46e0eba3328abd5e59f7e261218e files/soap-2.3.1-build.xml.patch 1334
 RMD160 46ebfebd9550c16c77491402f6aebb1a47808a3e files/soap-2.3.1-build.xml.patch 1334
@@ -10,10 +7,14 @@ EBUILD soap-2.3.1-r1.ebuild 1460 RMD160 ea02b24b8ed93ab85df5b0f3e0b2551b48014766
 MD5 f420d4e91295446377c032fdeed80a97 soap-2.3.1-r1.ebuild 1460
 RMD160 ea02b24b8ed93ab85df5b0f3e0b2551b48014766 soap-2.3.1-r1.ebuild 1460
 SHA256 db476f0cc0d94996fb9641ef16b52f7307d18234167ef8d1bd801e835e86fb03 soap-2.3.1-r1.ebuild 1460
-MISC ChangeLog 1459 RMD160 52ffd0beb497c6e95c83d3ed75710ab547705ec0 SHA1 32b7be266d5e4acf6c5077713b463a4c3d6730b1 SHA256 36de926dfaac300d09e6c0498fd8c8cd7c551e81142d4fade9ce016bb5339d89
-MD5 3a213f6c22e5b0782e9addafa8ebdb51 ChangeLog 1459
-RMD160 52ffd0beb497c6e95c83d3ed75710ab547705ec0 ChangeLog 1459
-SHA256 36de926dfaac300d09e6c0498fd8c8cd7c551e81142d4fade9ce016bb5339d89 ChangeLog 1459
+EBUILD soap-2.3.1-r2.ebuild 1453 RMD160 d914d3d3754dfe3c6f5a738001489fab7fbe94ac SHA1 9c6b31ae0c7adcae04610036e00ed6b97bd4df01 SHA256 39f5e6f15750da2b0a6a8ff165395e0ba65d81b68fc9694d5ebfaa66828464c9
+MD5 a36ad0c99f743ddaf5a3cc511c812bcd soap-2.3.1-r2.ebuild 1453
+RMD160 d914d3d3754dfe3c6f5a738001489fab7fbe94ac soap-2.3.1-r2.ebuild 1453
+SHA256 39f5e6f15750da2b0a6a8ff165395e0ba65d81b68fc9694d5ebfaa66828464c9 soap-2.3.1-r2.ebuild 1453
+MISC ChangeLog 1597 RMD160 bd304b7aa7cc17c6c64e8f592eb7a0584d0dd4a0 SHA1 e84945f96ba6a013e32b875dbdc78077f9a3cad9 SHA256 176f879a85f91fd712d4a5a7ca7f01da9da53fb02569ebd81cf94c6fae208112
+MD5 29fe2acf7a75e8d597d33df6153d59f0 ChangeLog 1597
+RMD160 bd304b7aa7cc17c6c64e8f592eb7a0584d0dd4a0 ChangeLog 1597
+SHA256 176f879a85f91fd712d4a5a7ca7f01da9da53fb02569ebd81cf94c6fae208112 ChangeLog 1597
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
 MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158
 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 metadata.xml 158
@@ -21,10 +22,6 @@ SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb metadata
 MD5 7ddb6b8c00bf94a8416b076c32474a01 files/digest-soap-2.3.1-r1 244
 RMD160 ff171b6c0b3236e15967b2359c53064e919f58f7 files/digest-soap-2.3.1-r1 244
 SHA256 f164228351d2afd395d38b92eefb1e94af48a5c55709ebff8b22a01c56c473ab files/digest-soap-2.3.1-r1 244
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.2 (GNU/Linux)
-
-iD8DBQFF9xaBcxLzpIGCsLQRAlKmAJ9+y7Uwmo0k8A6QJLObtJuzOEjp/gCfcpJv
-0CW9lvdJIuoJgQeo7sZgQf4=
-=8uS8
------END PGP SIGNATURE-----
+MD5 7ddb6b8c00bf94a8416b076c32474a01 files/digest-soap-2.3.1-r2 244
+RMD160 ff171b6c0b3236e15967b2359c53064e919f58f7 files/digest-soap-2.3.1-r2 244
+SHA256 f164228351d2afd395d38b92eefb1e94af48a5c55709ebff8b22a01c56c473ab files/digest-soap-2.3.1-r2 244
diff --git a/dev-java/soap/files/digest-soap-2.3.1-r2 b/dev-java/soap/files/digest-soap-2.3.1-r2
new file mode 100644
index 000000000000..d767f1a85fb6
--- /dev/null
+++ b/dev-java/soap/files/digest-soap-2.3.1-r2
@@ -0,0 +1,3 @@
+MD5 ad2bb1b3f2b9a440055d72a635e0753e soap-src-2.3.1.tar.gz 142925
+RMD160 2d8a3177bff7341a5ffca27d767e88dd734ed7cd soap-src-2.3.1.tar.gz 142925
+SHA256 4b580107a4026801c29975668e03c6fe959662086d910da979450eae2f808c87 soap-src-2.3.1.tar.gz 142925
diff --git a/dev-java/soap/soap-2.3.1-r2.ebuild b/dev-java/soap/soap-2.3.1-r2.ebuild
new file mode 100644
index 000000000000..7be5d36ae7ae
--- /dev/null
+++ b/dev-java/soap/soap-2.3.1-r2.ebuild
@@ -0,0 +1,54 @@
+# 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-r2.ebuild,v 1.1 2007/11/19 09:21:21 ali_bush 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}"
+
+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
+}