move dev-java/jms dev-java/sun-jms

(Portage version: 2.0.53_rc5)

16 files changed, 148 insertions, 37 deletions

diff --git a/dev-java/avalon-logkit/ChangeLog b/dev-java/avalon-logkit/ChangeLog
index 4cd736a53e40..85d59f29cc92 100644
--- a/dev-java/avalon-logkit/ChangeLog
+++ b/dev-java/avalon-logkit/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/avalon-logkit
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/avalon-logkit/ChangeLog,v 1.20 2005/09/17 22:06:23 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/avalon-logkit/ChangeLog,v 1.21 2005/10/15 13:17:52 axxo Exp $
+
+  15 Oct 2005; Thomas Matthijs <axxo@gentoo.org> avalon-logkit-1.2.ebuild,
+  avalon-logkit-2.0.ebuild:
+  move dev-java/jms dev-java/sun-jms
 
   17 Sep 2005; Petteri Räty <betelgeuse@gentoo.org>
   avalon-logkit-1.2.ebuild, avalon-logkit-2.0.ebuild:
diff --git a/dev-java/avalon-logkit/avalon-logkit-1.2.ebuild b/dev-java/avalon-logkit/avalon-logkit-1.2.ebuild
index c9d1647b4354..d3d7ba6796d8 100644
--- a/dev-java/avalon-logkit/avalon-logkit-1.2.ebuild
+++ b/dev-java/avalon-logkit/avalon-logkit-1.2.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/avalon-logkit/avalon-logkit-1.2.ebuild,v 1.23 2005/09/17 22:06:23 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/avalon-logkit/avalon-logkit-1.2.ebuild,v 1.24 2005/10/15 13:17:52 axxo Exp $
 
 inherit java-pkg
 
@@ -17,7 +17,7 @@ RDEPEND=">=virtual/jre-1.3
 	)
 	jms? ( || (
 			!ppc? ( dev-java/openjms )
-			dev-java/jms
+			dev-java/sun-jms
 		)
 	)"
 DEPEND=">=virtual/jdk-1.3
@@ -54,8 +54,8 @@ src_unpack() {
 	if use jms; then
 		if has_version dev-java/openjms; then
 			java-pkg_jar-from openjms
-		elif has_version dev-java/jms; then
-			java-pkg_jar-from jms
+		elif has_version dev-java/sun-jms; then
+			java-pkg_jar-from sun-jms
 		fi
 	fi
 }
diff --git a/dev-java/avalon-logkit/avalon-logkit-2.0.ebuild b/dev-java/avalon-logkit/avalon-logkit-2.0.ebuild
index fd0a323737d8..416e67f773a4 100644
--- a/dev-java/avalon-logkit/avalon-logkit-2.0.ebuild
+++ b/dev-java/avalon-logkit/avalon-logkit-2.0.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/avalon-logkit/avalon-logkit-2.0.ebuild,v 1.14 2005/09/17 22:06:23 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/avalon-logkit/avalon-logkit-2.0.ebuild,v 1.15 2005/10/15 13:17:52 axxo Exp $
 
 inherit java-pkg
 
@@ -14,7 +14,7 @@ IUSE="doc jikes jms javamail source"
 RDEPEND=">=virtual/jre-1.4
 		dev-java/log4j
 		jms? ( || (
-			dev-java/jms
+			dev-java/sun-jms
 			!ppc? ( dev-java/openjms )
 			)
 		)
@@ -55,8 +55,8 @@ src_unpack() {
 	if use jms; then
 		if has_version dev-java/openjms; then
 			jms="openjms"
-		elif has_version dev-java/jms; then
-			jms="jms"
+		elif has_version dev-java/sun-jms; then
+			jms="sun-jms"
 		fi
 	fi
 
diff --git a/dev-java/jgroups/ChangeLog b/dev-java/jgroups/ChangeLog
index 27e9d4357f1c..b40c05d765c3 100644
--- a/dev-java/jgroups/ChangeLog
+++ b/dev-java/jgroups/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/jgroups
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jgroups/ChangeLog,v 1.5 2005/07/12 19:33:14 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jgroups/ChangeLog,v 1.6 2005/10/15 13:18:38 axxo Exp $
+
+  15 Oct 2005; Thomas Matthijs <axxo@gentoo.org> jgroups-2.2.7.ebuild:
+  move dev-java/jms dev-java/sun-jms
 
   12 Jul 2005; Thomas Matthijs <axxo@gentoo.org> jgroups-2.2.7.ebuild:
   Style fixes
diff --git a/dev-java/jgroups/jgroups-2.2.7.ebuild b/dev-java/jgroups/jgroups-2.2.7.ebuild
index af32d3760586..48352f48467b 100644
--- a/dev-java/jgroups/jgroups-2.2.7.ebuild
+++ b/dev-java/jgroups/jgroups-2.2.7.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/jgroups/jgroups-2.2.7.ebuild,v 1.6 2005/07/12 21:25:29 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jgroups/jgroups-2.2.7.ebuild,v 1.7 2005/10/15 13:18:38 axxo Exp $
 
 inherit java-pkg
 
@@ -12,7 +12,7 @@ SLOT="0"
 KEYWORDS="x86 amd64 ~ppc"
 RDEPEND=">=virtual/jre-1.4
 	dev-java/concurrent-util
-	dev-java/jms"
+	dev-java/sun-jms"
 DEPEND=">=virtual/jdk-1.4
 	${RDEPEND}
 	>=dev-java/ant-core-1.5
@@ -32,7 +32,7 @@ src_unpack() {
 	cd ${S}/lib
 	rm *.jar
 	java-pkg_jar-from concurrent-util
-	java-pkg_jar-from jms
+	java-pkg_jar-from sun-jms
 	if use junit ; then
 		ewarn "WARNING: Running unit tests can take a long time."
 		java-pkg_jar-from junit
diff --git a/dev-java/openjms/ChangeLog b/dev-java/openjms/ChangeLog
index 82932937e938..91e9804523be 100644
--- a/dev-java/openjms/ChangeLog
+++ b/dev-java/openjms/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/openjms
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/openjms/ChangeLog,v 1.4 2005/07/20 14:45:19 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/openjms/ChangeLog,v 1.5 2005/10/15 13:19:36 axxo Exp $
+
+*openjms-0.7.6.1-r1 (15 Oct 2005)
+
+  15 Oct 2005; Thomas Matthijs <axxo@gentoo.org> -openjms-0.7.6.1.ebuild,
+  +openjms-0.7.6.1-r1.ebuild:
+  move dev-java/jms dev-java/sun-jms
 
   20 Jul 2005; Gustavo Zacarias <gustavoz@gentoo.org>
   openjms-0.7.6.1.ebuild:
diff --git a/dev-java/openjms/Manifest b/dev-java/openjms/Manifest
index b19ead00dcce..8290a97976d4 100644
--- a/dev-java/openjms/Manifest
+++ b/dev-java/openjms/Manifest
@@ -1,19 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 474e82590c77f87c43d17fed3b5fa6cd openjms-0.7.6.1.ebuild 2266
-MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 MD5 898b63b4a1f498b3c7e75a4daaa80947 ChangeLog 872
-MD5 8727b914d0542c7961c2cf56f8114e46 files/digest-openjms-0.7.6.1 145
-MD5 d1af3351d5e9ab88690027aab468d22b files/0.7.6.1/rc2 759
 MD5 c515bd2931ce697be23219be4556b62e files/0.7.6.1/10openjms-0.7.6.1 37
-MD5 fdae6fd4595f87aba37b3a3674faf490 files/0.7.6.1/conf 21
 MD5 11397a4bdb1b5d7d6a489766a6c58279 files/0.7.6.1/buildfile.patch.bz2 797
+MD5 fdae6fd4595f87aba37b3a3674faf490 files/0.7.6.1/conf 21
+MD5 d1af3351d5e9ab88690027aab468d22b files/0.7.6.1/rc2 759
 MD5 2b897d3922776b256092ce64beb2792c files/0.7.6.1/source.patch.bz2 2628
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFC3mOhKRy60XGEcJIRAld3AKCwPguVGEIfHzO8gqRfAVYzHtHoAgCdE7Bs
-RqJ6NkR8QKVqlW8xBkWj1PI=
-=9Ptu
------END PGP SIGNATURE-----
+MD5 8727b914d0542c7961c2cf56f8114e46 files/digest-openjms-0.7.6.1 145
+MD5 34edc166c8f579300fc1cf16650b3c9e files/digest-openjms-0.7.6.1-r1 145
+MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
+MD5 3e2e1435bfa4d2c06554abde5ecc81c6 openjms-0.7.6.1-r1.ebuild 2274
+MD5 3e2e1435bfa4d2c06554abde5ecc81c6 openjms-0.7.6.1.ebuild 2274
diff --git a/dev-java/openjms/files/digest-openjms-0.7.6.1 b/dev-java/openjms/files/digest-openjms-0.7.6.1-r1
index fcd05c4dce1b..0d965a194f81 100644
--- a/dev-java/openjms/files/digest-openjms-0.7.6.1
+++ b/dev-java/openjms/files/digest-openjms-0.7.6.1-r1
@@ -1,2 +1,2 @@
-MD5 eb72c8a4141371cc373ab4e09314b2c8 openjms-0.7.6.1-src.tar.gz 7665924
 MD5 2c87474700becdf9501c5009464e3d0b openjms-0.7.6.1-scripts.tar.gz 8737
+MD5 eb72c8a4141371cc373ab4e09314b2c8 openjms-0.7.6.1-src.tar.gz 7665924
diff --git a/dev-java/openjms/openjms-0.7.6.1.ebuild b/dev-java/openjms/openjms-0.7.6.1-r1.ebuild
index a1986f34f2d0..e8baad94c1eb 100644
--- a/dev-java/openjms/openjms-0.7.6.1.ebuild
+++ b/dev-java/openjms/openjms-0.7.6.1-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/openjms/openjms-0.7.6.1.ebuild,v 1.5 2005/07/20 14:45:19 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/openjms/openjms-0.7.6.1-r1.ebuild,v 1.1 2005/10/15 13:19:36 axxo Exp $
 
 inherit java-pkg eutils
 
@@ -23,7 +23,7 @@ RDEPEND=">=virtual/jre-1.4
 	dev-java/exolabcore
 	dev-db/hsqldb
 	dev-java/jdbm
-	dev-java/jms
+	dev-java/sun-jms
 	dev-java/jta
 	dev-java/log4j
 	=dev-java/jakarta-oro-2.0*
@@ -56,7 +56,7 @@ src_unpack() {
 	java-pkg_jar-from exolabcore
 	java-pkg_jar-from hsqldb
 	java-pkg_jar-from jdbm-1
-	java-pkg_jar-from jms
+	java-pkg_jar-from sun-jms
 	java-pkg_jar-from jta
 	java-pkg_jar-from log4j
 	java-pkg_jar-from servletapi-2.3
diff --git a/dev-java/oscache/ChangeLog b/dev-java/oscache/ChangeLog
index cb535ea7b961..a9606d759569 100644
--- a/dev-java/oscache/ChangeLog
+++ b/dev-java/oscache/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/oscache
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/oscache/ChangeLog,v 1.3 2005/01/20 19:40:35 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/oscache/ChangeLog,v 1.4 2005/10/15 13:19:25 axxo Exp $
+
+  15 Oct 2005; Thomas Matthijs <axxo@gentoo.org> oscache-2.0.2.ebuild:
+  move dev-java/jms dev-java/sun-jms
 
   20 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org> oscache-2.0.2.ebuild:
   added missing jikes dependency. see #78819.
diff --git a/dev-java/oscache/oscache-2.0.2.ebuild b/dev-java/oscache/oscache-2.0.2.ebuild
index 0e812b23d7ad..225c1f29cfa6 100644
--- a/dev-java/oscache/oscache-2.0.2.ebuild
+++ b/dev-java/oscache/oscache-2.0.2.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/oscache/oscache-2.0.2.ebuild,v 1.4 2005/07/15 18:40:28 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/oscache/oscache-2.0.2.ebuild,v 1.5 2005/10/15 13:19:25 axxo Exp $
 
 inherit java-pkg
 
@@ -14,7 +14,7 @@ RDEPEND=">=virtual/jre-1.3
 		dev-java/commons-collections
 		dev-java/commons-logging
 		=dev-java/servletapi-2.3*
-		dev-java/jms
+		dev-java/sun-jms
 		dev-java/jgroups"
 DEPEND=">=virtual/jdk-1.3
 		${RDEPEND}
@@ -34,7 +34,7 @@ src_compile() {
 	use jikes && javac_cmd="jikes -bootclasspath ${JAVA_HOME}/jre/lib/rt.jar"
 
 	local build_dir=${S}/build
-	local classpath="-classpath $(java-pkg_getjars commons-logging,commons-collections,servletapi-2.3,jms,jgroups):${build_dir}:."
+	local classpath="-classpath $(java-pkg_getjars commons-logging,commons-collections,servletapi-2.3,sun-jms,jgroups):${build_dir}:."
 	mkdir ${build_dir}
 
 	echo "Building core..."
diff --git a/dev-java/sun-jms/ChangeLog b/dev-java/sun-jms/ChangeLog
new file mode 100644
index 000000000000..a04cc6b7807a
--- /dev/null
+++ b/dev-java/sun-jms/ChangeLog
@@ -0,0 +1,37 @@
+# ChangeLog for dev-java/sun-jms
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jms/ChangeLog,v 1.1 2005/10/15 13:16:53 axxo Exp $
+
+*sun-jms-1.1-r1 (15 Oct 2005)
+
+  15 Oct 2005; Thomas Matthijs <axxo@gentoo.org> +metadata.xml,
+  +sun-jms-1.1-r1.ebuild:
+  move dev-java/jms dev-java/sun-jms
+
+  30 May 2005; Gustavo Zacarias <gustavoz@gentoo.org> jms-1.1.ebuild:
+  Stable on sparc
+
+  18 May 2005; Markus Rothe <corsair@gentoo.org> jms-1.1.ebuild:
+  Stable on ppc64
+
+  04 May 2005; Jan Brinkmann <luckyduck@gentoo.org> jms-1.1.ebuild:
+  stable on amd64, ppc and x86
+
+  03 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org> jms-1.1.ebuild:
+  added ~ppc to KEYWORDS.
+
+  23 Mar 2005; Gustavo Zacarias <gustavoz@gentoo.org> jms-1.1.ebuild:
+  Keyworded ~sparc wrt #84992
+
+  13 Mar 2005; Markus Rothe <corsair@gentoo.org> jms-1.1.ebuild:
+  Added ~ppc64 to KEYWORDS
+
+  20 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org> jms-1.1.ebuild:
+  added missing jikes dependency.
+
+*jms-1.1 (30 Oct 2004)
+
+  30 Oct 2004; Thomas Matthijs <axxo@gentoo.org> +metadata.xml,
+  +jms-1.1.ebuild:
+  inital import, ebuild contributed by Dan <dan@intuitivelyobvious.net>
+
diff --git a/dev-java/sun-jms/Manifest b/dev-java/sun-jms/Manifest
new file mode 100644
index 000000000000..3220e84288da
--- /dev/null
+++ b/dev-java/sun-jms/Manifest
@@ -0,0 +1,5 @@
+MD5 a6af7c33b6481a23fb535478a8765808 ChangeLog 1048
+MD5 6ca22a64031fe5cba54a958c6c4769b7 files/digest-jms-1.1 67
+MD5 6ca22a64031fe5cba54a958c6c4769b7 files/digest-sun-jms-1.1-r1 67
+MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158
+MD5 dfaead78dfe89cb1007063485233ff90 sun-jms-1.1-r1.ebuild 1502
diff --git a/dev-java/sun-jms/files/digest-sun-jms-1.1-r1 b/dev-java/sun-jms/files/digest-sun-jms-1.1-r1
new file mode 100644
index 000000000000..915597770fa6
--- /dev/null
+++ b/dev-java/sun-jms/files/digest-sun-jms-1.1-r1
@@ -0,0 +1 @@
+MD5 11ca2cdc4706d02b372a17cbf33612f6 jms-1_1-fr-apidocs.zip 361922
diff --git a/dev-java/sun-jms/metadata.xml b/dev-java/sun-jms/metadata.xml
new file mode 100644
index 000000000000..7303cef96964
--- /dev/null
+++ b/dev-java/sun-jms/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>java</herd>
+</pkgmetadata>
diff --git a/dev-java/sun-jms/sun-jms-1.1-r1.ebuild b/dev-java/sun-jms/sun-jms-1.1-r1.ebuild
new file mode 100644
index 000000000000..d8e853e72666
--- /dev/null
+++ b/dev-java/sun-jms/sun-jms-1.1-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jms/sun-jms-1.1-r1.ebuild,v 1.1 2005/10/15 13:16:53 axxo Exp $
+
+inherit java-pkg
+
+At="jms-${PV/./_}-fr-apidocs.zip"
+DESCRIPTION="The Java Message Service (JMS) API is a messaging standard that allows application components to create, send, receive, and read messages."
+HOMEPAGE="http://java.sun.com/products/jms/"
+SRC_URI="${At}"
+LICENSE="sun-bcla-jms"
+SLOT=0
+KEYWORDS="x86 amd64 ppc64 sparc ppc"
+IUSE="jikes doc"
+RDEPEND=">=virtual/jre-1.3"
+DEPEND="app-arch/unzip
+	jikes? ( dev-java/jikes )
+	>=virtual/jdk-1.3"
+RESTRICT="fetch"
+
+S=${WORKDIR}/${PN//sun-/}${PV}
+
+pkg_nofetch() {
+	einfo
+	einfo " Due to license restrictions, we cannot fetch the"
+	einfo " distributables automagically."
+	einfo
+	einfo " 1. Visit ${HOMEPAGE} and select 'Downloads'"
+	einfo " 2. Select 'Download the version 1.1 API Documentation, Jar and Source'"
+	einfo " 3. Download ${At}"
+	einfo " 4. Move file to ${DISTDIR}"
+	einfo
+}
+
+src_compile() {
+	mkdir build
+	cd src/share
+	local javac_cmd="javac"
+	use jikes && java_cmd="jikes -bootclasspath ${JAVA_HOME}/jre/lib/rt.jar"
+
+	${javac_cmd} -nowarn -d ${S}/build $(find -name "*.java") || die "failed too build"
+	if use doc ; then
+		mkdir ${S}/api
+		javadoc -d ${S}/api -quiet javax.jms
+	fi
+
+	cd ${S}
+	jar cf jms.jar -C build . || die "failed too create jar"
+}
+
+src_install() {
+	java-pkg_dojar jms.jar
+	use doc && java-pkg_dohtml -r api
+}
+