Removed com.caucho.services to a separate package from 2.1.12 and 3.0.8 does not install bundled burlap any more.

(Portage version: 2.0.53_rc6)

6 files changed, 38 insertions, 27 deletions

diff --git a/dev-java/hessian/ChangeLog b/dev-java/hessian/ChangeLog
index 6ee25b4c9b83..c653dcb46610 100644
--- a/dev-java/hessian/ChangeLog
+++ b/dev-java/hessian/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-java/hessian
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/hessian/ChangeLog,v 1.1 2005/10/21 14:27:32 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/hessian/ChangeLog,v 1.2 2005/10/22 20:33:13 betelgeuse Exp $
+
+*hessian-3.0.8-r1 (22 Oct 2005)
+*hessian-2.1.12-r1 (22 Oct 2005)
+
+  22 Oct 2005; Petteri Räty <betelgeuse@gentoo.org> -hessian-2.1.12.ebuild,
+  +hessian-2.1.12-r1.ebuild, -hessian-3.0.8.ebuild,
+  +hessian-3.0.8-r1.ebuild:
+  Removed com.caucho.services to a separate package from 2.1.12 and 3.0.8 does
+  not install bundled burlap any more.
 
 *hessian-3.0.8 (21 Oct 2005)
 *hessian-2.1.12 (21 Oct 2005)
diff --git a/dev-java/hessian/Manifest b/dev-java/hessian/Manifest
index 3081b1345598..09a4e90ccb2c 100644
--- a/dev-java/hessian/Manifest
+++ b/dev-java/hessian/Manifest
@@ -1,18 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 85697aa16eaa82f8525fd00572e68dc4 ChangeLog 537
+MD5 4795f882a41d2bea58b16ba0e8dbc677 ChangeLog 879
 MD5 c089b7d34f96c556a34bb8c402794023 files/build-2.1.12.xml 1546
 MD5 c089b7d34f96c556a34bb8c402794023 files/build-3.0.8.xml 1546
-MD5 dd6372768b0929aa8504a4526358ff34 files/digest-hessian-2.1.12 67
-MD5 3b1b79f1af4dbee2b94e9b3cfaaea881 files/digest-hessian-3.0.8 66
-MD5 45cc330851ab33e6237231eb99158f36 hessian-2.1.12.ebuild 1419
-MD5 8403d0569f1ac6a66fc0ff6060d685ed hessian-3.0.8.ebuild 1394
+MD5 dd6372768b0929aa8504a4526358ff34 files/digest-hessian-2.1.12-r1 67
+MD5 3b1b79f1af4dbee2b94e9b3cfaaea881 files/digest-hessian-3.0.8-r1 66
+MD5 59833e1827741f0271c25197e65e0e80 hessian-2.1.12-r1.ebuild 1599
+MD5 e978be1be8991af1985ea5800cf78fb8 hessian-3.0.8-r1.ebuild 1518
 MD5 1ee3b9eb31c4a1302dc9c690a069fb77 metadata.xml 493
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDWPyLQiJ/wx066S4RAvSEAJ4lpyaYO4g2GKpcahK++NIFUePBjgCfZptx
-CPmJYT/RO3MKqV5zzgOMLN0=
-=W7l9
------END PGP SIGNATURE-----
diff --git a/dev-java/hessian/files/digest-hessian-2.1.12 b/dev-java/hessian/files/digest-hessian-2.1.12-r1
index 89d985e80d26..89d985e80d26 100644
--- a/dev-java/hessian/files/digest-hessian-2.1.12
+++ b/dev-java/hessian/files/digest-hessian-2.1.12-r1
diff --git a/dev-java/hessian/files/digest-hessian-3.0.8 b/dev-java/hessian/files/digest-hessian-3.0.8-r1
index cc7053a5d4bf..cc7053a5d4bf 100644
--- a/dev-java/hessian/files/digest-hessian-3.0.8
+++ b/dev-java/hessian/files/digest-hessian-3.0.8-r1
diff --git a/dev-java/hessian/hessian-2.1.12.ebuild b/dev-java/hessian/hessian-2.1.12-r1.ebuild
index 695409cf8211..cf72cc4b366e 100644
--- a/dev-java/hessian/hessian-2.1.12.ebuild
+++ b/dev-java/hessian/hessian-2.1.12-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/hessian/hessian-2.1.12.ebuild,v 1.2 2005/10/21 14:32:40 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/hessian/hessian-2.1.12-r1.ebuild,v 1.1 2005/10/22 20:33:13 betelgeuse Exp $
 
 inherit java-pkg
 
@@ -13,12 +13,14 @@ SLOT="2.1"
 KEYWORDS="~x86"
 IUSE="doc jikes source"
 
+RDEPEND=">=virtual/jre-1.4
+		=dev-java/servletapi-2.3*
+		=dev-java/caucho-services-${PV}*"
 DEPEND=">=virtual/jdk-1.4
 		jikes? ( dev-java/jikes )
 		source? ( app-arch/zip )
-		dev-java/ant-core"
-RDEPEND=">=virtual/jre-1.4
-		=dev-java/servletapi-2.3*"
+		dev-java/ant-core
+		${REDEND}"
 
 src_unpack() {
 	jar xvf ${DISTDIR}/${A}
@@ -27,12 +29,16 @@ src_unpack() {
 	mkdir -p ${S}/src
 	mv com ${S}/src
 
+	rm -fr ${S}/src/com/caucho/services
+
 	cd ${S}
 	# No included ant script! Bad Java developer, bad!
-	cp ${FILESDIR}/build-${PVR}.xml build.xml
+	cp ${FILESDIR}/build-${PV}.xml build.xml
 
 	# Populate classpath
-	echo "classpath=$(java-pkg_getjars servletapi-2.3)" >> build.properties
+	local classpath="classpath=$(java-pkg_getjars servletapi-2.3)"
+	classpath="${classpath}:$(java-pkg_getjars caucho-services-2.1)"
+	echo ${classpath} >> build.properties
 }
 
 src_compile() {
diff --git a/dev-java/hessian/hessian-3.0.8.ebuild b/dev-java/hessian/hessian-3.0.8-r1.ebuild
index 664bafa045c7..5eafb7bc1c1b 100644
--- a/dev-java/hessian/hessian-3.0.8.ebuild
+++ b/dev-java/hessian/hessian-3.0.8-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/hessian/hessian-3.0.8.ebuild,v 1.2 2005/10/21 14:32:40 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/hessian/hessian-3.0.8-r1.ebuild,v 1.1 2005/10/22 20:33:13 betelgeuse Exp $
 
 inherit java-pkg
 
@@ -13,21 +13,27 @@ SLOT="3.0.8"
 KEYWORDS="~x86"
 IUSE="doc jikes source"
 
+RDEPEND=">=virtual/jre-1.4
+		=dev-java/servletapi-2.3*"
+
 DEPEND=">=virtual/jdk-1.4
 		app-arch/unzip
 		jikes? ( dev-java/jikes )
 		source? ( app-arch/zip )
-		dev-java/ant-core"
-RDEPEND=">=virtual/jre-1.4
-		=dev-java/servletapi-2.3*"
+		dev-java/ant-core
+		${RDEPEND}"
 
 src_unpack() {
 	mkdir -p ${P}/src
 	unzip -qq -d ${S}/src ${DISTDIR}/${A}
 
+	# They package stuff from burlap in here
+	# Burlap is a separate protocol
+	rm -fr ${S}/src/com/caucho/burlap
+
 	cd ${S}
 	# No included ant script! Bad Java developer, bad!
-	cp ${FILESDIR}/build-${PVR}.xml build.xml
+	cp ${FILESDIR}/build-${PV}.xml build.xml
 
 	# Populate classpath
 	echo "classpath=$(java-pkg_getjars servletapi-2.3)" >> build.properties