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

Package-Manager: portage-2.1.2_rc3-r1

6 files changed, 122 insertions, 15 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/Manifest b/dev-java/soap/Manifest
index 8ea5bacc3ff4..dc352aca07ef 100644
--- a/dev-java/soap/Manifest
+++ b/dev-java/soap/Manifest
@@ -1,14 +1,27 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 6d3610c11489f4cb7088267fbba82663 ChangeLog 910
-MD5 d6f2be463e8fcbbd0ec4b546ca02a649 files/digest-soap-2.3.1 66
-MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158
+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
+SHA256 4828ccf6760b503db626657c1308332aa595f1142ef8cec6ca740ae34b759990 files/soap-2.3.1-build.xml.patch 1334
+DIST soap-src-2.3.1.tar.gz 142925 RMD160 2d8a3177bff7341a5ffca27d767e88dd734ed7cd SHA1 b3cfa35899d0b0021a1b9ed9a5691ca516aaa5d5 SHA256 4b580107a4026801c29975668e03c6fe959662086d910da979450eae2f808c87
+EBUILD soap-2.3.1-r1.ebuild 1462 RMD160 964faf7e31698913face74664e442ab2b3db45ea SHA1 90b82a381d26d70335f760579422e89e6d351d99 SHA256 227b9ea5f5ee3aa8e20b45e1c87456cd2bc9078d344aae7425259ae1b42d36e7
+MD5 6a6120bbc2dedaade67b16f61e0e20df soap-2.3.1-r1.ebuild 1462
+RMD160 964faf7e31698913face74664e442ab2b3db45ea soap-2.3.1-r1.ebuild 1462
+SHA256 227b9ea5f5ee3aa8e20b45e1c87456cd2bc9078d344aae7425259ae1b42d36e7 soap-2.3.1-r1.ebuild 1462
+EBUILD soap-2.3.1.ebuild 1219 RMD160 a7f3c073f689153d2c1ce2d68fd6d1faead7d34e SHA1 b621e3b93d425ae54aea86b155237c67fef16cd3 SHA256 73132708983e31e359eef70356a3fe44133d80f9077b9d18eaee114c508f4138
 MD5 f07855b8f8154c64f424b402e2b39da5 soap-2.3.1.ebuild 1219
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDR9WXQiJ/wx066S4RAm57AJ9FPvbCaXlv6gA3Sfw6Vw2zXaEvIgCfXAs8
-yrI0x2QVzRk13KmgrtUWsg8=
-=9GKQ
------END PGP SIGNATURE-----
+RMD160 a7f3c073f689153d2c1ce2d68fd6d1faead7d34e soap-2.3.1.ebuild 1219
+SHA256 73132708983e31e359eef70356a3fe44133d80f9077b9d18eaee114c508f4138 soap-2.3.1.ebuild 1219
+MISC ChangeLog 1158 RMD160 7dab3f1f9a05c5e2079ba57332012e9cf1871c1c SHA1 4a6b99f1ee19c6bdcbcd694c4469639344192348 SHA256 c9c190f90a1c33472e816e3807f64bd9f6e3ac8a87eaf17e1538c3608fcf9bf0
+MD5 75409cc715e68249951ad06c26274cb7 ChangeLog 1158
+RMD160 7dab3f1f9a05c5e2079ba57332012e9cf1871c1c ChangeLog 1158
+SHA256 c9c190f90a1c33472e816e3807f64bd9f6e3ac8a87eaf17e1538c3608fcf9bf0 ChangeLog 1158
+MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
+MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158
+RMD160 493079b5fb71d66863beea1b023901c90ba81be5 metadata.xml 158
+SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb metadata.xml 158
+MD5 7ddb6b8c00bf94a8416b076c32474a01 files/digest-soap-2.3.1 244
+RMD160 ff171b6c0b3236e15967b2359c53064e919f58f7 files/digest-soap-2.3.1 244
+SHA256 f164228351d2afd395d38b92eefb1e94af48a5c55709ebff8b22a01c56c473ab files/digest-soap-2.3.1 244
+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
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
+}