Bump openjms to allow files to be build with 1.5 or 1.4 vms.

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

3 files changed, 89 insertions, 12 deletions

diff --git a/dev-java/openjms/ChangeLog b/dev-java/openjms/ChangeLog
index f8e89e7f1658..4744c41ad3b1 100644
--- a/dev-java/openjms/ChangeLog
+++ b/dev-java/openjms/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/openjms
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/openjms/ChangeLog,v 1.27 2009/06/19 09:57:11 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/openjms/ChangeLog,v 1.28 2009/09/18 05:13:43 ali_bush Exp $
+
+*openjms-0.7.6.1-r7 (18 Sep 2009)
+
+  18 Sep 2009; Alistair Bush <ali_bush@gentoo.org>
+  +openjms-0.7.6.1-r7.ebuild:
+  Bump openjms to allow files to be build with 1.5 or 1.4 vms.
 
   19 Jun 2009; Christian Faulhammer <fauli@gentoo.org>
   openjms-0.7.6.1-r6.ebuild:
diff --git a/dev-java/openjms/Manifest b/dev-java/openjms/Manifest
index d71cfed123fe..b14e01ef299d 100644
--- a/dev-java/openjms/Manifest
+++ b/dev-java/openjms/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 0.7.6.1/10openjms-0.7.6.1 37 RMD160 1e3bdb44fc5f3b2b85e0e7bc363276167a16d6a0 SHA1 8d27a0af6c1c5708e5c18349238ba02f50df8ba2 SHA256 e4d28e93a3fa47d572ff383a099d3533892fd9871f7f01a43148e30f06e2dd0b
 AUX 0.7.6.1/buildfile.patch 3609 RMD160 8f8afb47c34ae467b01ce71f3166c6d1974e0403 SHA1 e73292d68b8a5eb0b487eb651914b28d535c11fb SHA256 3e168a28fafee04b9ca422bfea1fb37403d59ad330e92723423610a88160b3ab
 AUX 0.7.6.1/conf 21 RMD160 64cd5a2e8b5d1300394c50e49bdccc671f228494 SHA1 ee4505ebfce6dc2d4ef339a5ef78c03b96b3331e SHA256 d9636940e3b513b24534121c4744d754fb50c24d381cee96910d222612c863ad
@@ -10,12 +7,6 @@ DIST openjms-0.7.6.1-scripts.tar.gz 8737 RMD160 77dae767b598805d3d6305410f2bb5b3
 DIST openjms-0.7.6.1-src.tar.gz 7665924 RMD160 52a9c91e3f7542d9f718a30b1e862264a3ed2b18 SHA1 70bc2397fbd1e3420d1508893b6b15a6c63a6327 SHA256 9c47eb526643a19de739825f0a511a8fdd4762b07033a857d1b2adb325a84ac2
 EBUILD openjms-0.7.6.1-r5.ebuild 2095 RMD160 38c9bc4fd5680affea056a6da62a9d5df187a7b3 SHA1 50e56667056b3a3a8f36c92f05a3ad2b0685699c SHA256 de6e810e5c7f2af7fb9dd0a6edd5c9560dac2e0aa3a5e9e980d237353af553a9
 EBUILD openjms-0.7.6.1-r6.ebuild 2099 RMD160 5bbd758bcb883cab4b5cbff6d2406fc21a4cc9fb SHA1 d2ebdda57e81bb92c0e16554796cfca0dbc86746 SHA256 a3cfe7f6ddaa0993ab4c7956b55afb6ad8711c679f54d357487e0bf832c23bcc
-MISC ChangeLog 3981 RMD160 f8e64f212d8ec195f84a36b57aef9e7d1b70a379 SHA1 51432fc50a078d6993b5cd1653d6fadbcf3ce39f SHA256 8a62d1b2635484f256cded6c2eda109f00c74f4076166ae201d1971ca56041b4
+EBUILD openjms-0.7.6.1-r7.ebuild 2202 RMD160 d5c3a3f005f6120cef341ba8ddfd3a1260c9adb3 SHA1 411f61505bbd24043eac1aa288ad6e0a167ba0bf SHA256 0966c4b1e9b977d0efb5a4788f4897618f5a0ee4b0344c45a2f991c4bb73c013
+MISC ChangeLog 4164 RMD160 1012940cb2001429de596e16ceda7b69bca835ff SHA1 0f454b90c3d18ab366b506d892fd53541c76c8dd SHA256 4715b9c015c7d5b07e360faf3336293d635b4ec0e8fb2decc11ff009aaeac1a1
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAko7YP0ACgkQNQqtfCuFneOarwCfREsjUoGnnCxEooRlhzDM4/ww
-vdcAoJQy93pda0MhMi7K24Qf9RlHu9Pr
-=wPhT
------END PGP SIGNATURE-----
diff --git a/dev-java/openjms/openjms-0.7.6.1-r7.ebuild b/dev-java/openjms/openjms-0.7.6.1-r7.ebuild
new file mode 100644
index 000000000000..ac88d125b1c8
--- /dev/null
+++ b/dev-java/openjms/openjms-0.7.6.1-r7.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2009 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-r7.ebuild,v 1.1 2009/09/18 05:13:43 ali_bush Exp $
+
+EAPI="2"
+JAVA_PKG_IUSE="doc"
+WANT_ANT_TASKS="ant-antlr"
+
+inherit java-pkg-2 java-ant-2 eutils
+
+SLOT="0"
+LICENSE="GPL-2"
+DESCRIPTION="Open Java Messaging System"
+HOMEPAGE="http://openjms.sourceforge.net/"
+KEYWORDS="~amd64 ~x86"
+SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.gz mirror://gentoo/${P}-scripts.tar.gz"
+IUSE=""
+CDEPEND="=virtual/jre-1.4*
+	>=dev-java/antlr-2.7.7:0[java]
+	dev-java/castor:0.9
+	dev-java/commons-dbcp:0
+	dev-java/commons-logging:0
+	dev-java/concurrent-util:0
+	dev-java/exolabcore:0
+	java-virtuals/jms
+	java-virtuals/transaction-api
+	dev-java/log4j:0
+	dev-java/jakarta-oro:2.0
+	java-virtuals/servlet-api:2.3"
+DEPEND="|| ( =virtual/jdk-1.5* =virtual/jdk-1.4* )
+	${CDEPEND}
+	dev-java/xerces:2"
+RDEPEND=">=virtual/jdk-1.4
+	${CDEPEND}"
+
+java_prepare() {
+	unpack ${A}
+	mv "${WORKDIR}/bin" "${S}"
+	mv "${WORKDIR}/config" "${S}"
+
+	cd "${S}"
+	epatch "${FILESDIR}/${PV}/buildfile.patch"
+	epatch "${FILESDIR}/${PV}/source.patch"
+
+	cd "${S}/lib"
+	rm -v *.jar || die
+
+	java-pkg_jar-from antlr
+	java-pkg_jar-from castor-0.9
+	java-pkg_jar-from commons-dbcp
+	java-pkg_jar-from commons-logging
+	java-pkg_jar-from concurrent-util
+	java-pkg_jar-from exolabcore
+	java-pkg_jar-from --virtual jms
+	java-pkg_jar-from --virtual transaction-api
+	java-pkg_jar-from log4j
+	java-pkg_jar-from --virtual servlet-api-2.3
+	# The build.xml runs java with something that uses xerces
+	java-pkg_jar-from --with-dependencies --build-only xerces-2
+	java-pkg_jar-from jakarta-oro-2.0
+}
+
+EANT_DOC_TARGET=""
+EANT_BUILD_TARGET="jar war"
+EANT_EXTRA_ARGS="-Disjdk1.4=true"
+
+src_install() {
+	java-pkg_newjar lib/${P}.jar ${PN}.jar
+	java-pkg_newjar lib/${PN}-client-${PV}.jar ${PN}-client.jar
+	java-pkg_dowar lib/${PN}.war
+
+	dodir /opt/${PN}
+	cp -rP {bin,config,lib} "${D}"/opt/${PN}/
+	#use doc && cp -rP {docs,src} "${D}"/opt/${PN}/
+
+	fperms 755 /opt/${PN}/bin/*
+	newenvd "${FILESDIR}"/${PV}/10${P} 10${PN}
+	newinitd "${FILESDIR}"/${PV}/rc2 openjms
+	newconfd "${FILESDIR}"/${PV}/conf openjms
+}