Migrated to gen-2 eclasses. Replaced sun-jaf-bin and sun-javamail-bin dependencies with nonbin versions.

(Portage version: 2.1.2_rc3-r1)

5 files changed, 96 insertions, 2 deletions

diff --git a/dev-java/soap/ChangeLog b/dev-java/soap/ChangeLog
index 3724d46e8673..d6fad66a07c6 100644
--- a/dev-java/soap/ChangeLog
+++ b/dev-java/soap/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/soap
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/soap/ChangeLog,v 1.5 2005/05/25 18:43:43 luckyduck Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/soap/ChangeLog,v 1.6 2006/12/11 02:40:14 caster Exp $
+
+*soap-2.3.1-r1 (11 Dec 2006)
+
+  11 Dec 2006; Vlastimil Babka <caster@gentoo.org>
+  +files/soap-2.3.1-build.xml.patch, +soap-2.3.1-r1.ebuild:
+  Migrated to gen-2 eclasses. Replaced sun-jaf-bin and sun-javamail-bin
+  dependencies with nonbin versions.
 
   25 May 2005; Jan Brinkmann <luckyduck@gentoo.org> soap-2.3.1.ebuild:
   removed problem with the classpath, fixes #93980
diff --git a/dev-java/soap/files/digest-soap-2.3.1 b/dev-java/soap/files/digest-soap-2.3.1
index 45decc2e2281..d767f1a85fb6 100644
--- a/dev-java/soap/files/digest-soap-2.3.1
+++ b/dev-java/soap/files/digest-soap-2.3.1
@@ -1 +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/files/digest-soap-2.3.1-r1 b/dev-java/soap/files/digest-soap-2.3.1-r1
new file mode 100644
index 000000000000..d767f1a85fb6
--- /dev/null
+++ b/dev-java/soap/files/digest-soap-2.3.1-r1
@@ -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/files/soap-2.3.1-build.xml.patch b/dev-java/soap/files/soap-2.3.1-build.xml.patch
new file mode 100644
index 000000000000..4e8ebd52547f
--- /dev/null
+++ b/dev-java/soap/files/soap-2.3.1-build.xml.patch
@@ -0,0 +1,29 @@
+--- build.xml.orig	2006-12-11 03:00:56.000000000 +0100
++++ build.xml	2006-12-11 03:03:36.000000000 +0100
+@@ -92,7 +92,8 @@
+   <!-- =================================================================== -->

+   <target name="prepare" depends="init">

+     <mkdir dir="${build.dir}"/>

+-    <available property="bsf.present" classname="com.ibm.bsf.BSFManager" />

++    <!--
++	<available property="bsf.present" classname="com.ibm.bsf.BSFManager" />

+     <available property="xmi.present" classname="com.ibm.xmi.job.Job" />

+     <available property="pop3.present" 

+       classname="com.ibm.network.mail.pop3.event.StatusListener" />

+@@ -101,6 +102,7 @@
+     <available property="ejb.present" classname="javax.ejb.SessionBean" />

+     <available property="ssl.present" classname="javax.net.ssl.SSLSocket" />

+     <available property="junit.present" classname="junit.framework.TestCase" />

++	-->
+ 

+ 

+     <uptodate property="javac.notRequired"

+@@ -173,7 +175,7 @@
+           depends="prepare"

+           description="Compiles the source files.">

+     <mkdir dir="${build.dest}"/>

+-    <javac srcdir="${src.dir}" destdir="${build.dest}" debug="${debug}">

++    <javac srcdir="${src.dir}" destdir="${build.dest}" debug="${debug}" classpath="${gentoo.classpath}">

+       <patternset refid="javac.source.files"/>

+     </javac>

+ 

diff --git a/dev-java/soap/soap-2.3.1-r1.ebuild b/dev-java/soap/soap-2.3.1-r1.ebuild
new file mode 100644
index 000000000000..6f1e0d61b36f
--- /dev/null
+++ b/dev-java/soap/soap-2.3.1-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2006 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.1 2006/12/11 02:40:14 caster 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
+}