Remove unneeded dependencies and use transaction-api virtual.

Package-Manager: portage-2.2_rc6/cvs/Linux 2.6.26-gentoo i686

3 files changed, 96 insertions, 2 deletions

diff --git a/dev-java/openjms/ChangeLog b/dev-java/openjms/ChangeLog
index 1e371778d56c..77d30dac7d8a 100644
--- a/dev-java/openjms/ChangeLog
+++ b/dev-java/openjms/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/openjms
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/openjms/ChangeLog,v 1.19 2008/03/22 21:14:57 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/openjms/ChangeLog,v 1.20 2008/08/03 22:31:27 betelgeuse Exp $
+
+*openjms-0.7.6.1-r5 (03 Aug 2008)
+
+  03 Aug 2008; Petteri Räty <betelgeuse@gentoo.org>
+  +openjms-0.7.6.1-r5.ebuild:
+  Remove unneeded dependencies and use transaction-api virtual.
 
 *openjms-0.7.6.1-r4 (22 Mar 2008)
 
diff --git a/dev-java/openjms/Manifest b/dev-java/openjms/Manifest
index 39a0967d6b5a..6ff86713480c 100644
--- a/dev-java/openjms/Manifest
+++ b/dev-java/openjms/Manifest
@@ -1,3 +1,6 @@
+-----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
@@ -7,5 +10,13 @@ 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-r3.ebuild 2275 RMD160 619605e7176bf5dd1f7eedb09a4536d631ad5a44 SHA1 5a5a1a08eb3a7d474ddc0d9329c59cdf112e16c7 SHA256 3ca29d2c7e05c281591ed125c5bd75d5e6abc3b11ed2c4c06d7177a647ca4ec8
 EBUILD openjms-0.7.6.1-r4.ebuild 2295 RMD160 798c6262daf5acd8a7d7d18abefd92d9eec2b5c9 SHA1 6c71809ad3d851c39606a5d3c16a0444ce7e293d SHA256 71723ab1f2289ba1703315c2b5a14a096f5d269acd9d933fcf478f6687cdc837
-MISC ChangeLog 2986 RMD160 1e1c1de0864a92b989ce81a384863823ef40902a SHA1 b38a8c8654bafec41122d697fba66103b267ab62 SHA256 47cf8d3fd5878455a280ee5fbab2a6cca7c2e8242ce6e0cadcda6b6b44266048
+EBUILD openjms-0.7.6.1-r5.ebuild 2068 RMD160 96762f8e782b1578a5598e0daa5598d0f421a5c8 SHA1 ccb5a92fc550db4315f81d9dea978c5ad1d50fd9 SHA256 9e566caf768a59de9f28d6a1761d8ab1c3b0ce3a8ccbabeb9cc0c1c897de986b
+MISC ChangeLog 3174 RMD160 226072cf4b5ea237b5f06de00e03130bdbfc124b SHA1 7a180c5f788ced9e5a7caef022e01284ae4fa9ee SHA256 3ec0ec606c396dc8714227c3dea93c5a7b4a3ea11e681887589e18e248f38af5
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkiWMcgACgkQcxLzpIGCsLTbvwCfQ3PkJinZq/sU/euI4UNh14W4
+qYYAnikrnj9ZwZpuQr5uoPNFRe4Wl00a
+=N+Am
+-----END PGP SIGNATURE-----
diff --git a/dev-java/openjms/openjms-0.7.6.1-r5.ebuild b/dev-java/openjms/openjms-0.7.6.1-r5.ebuild
new file mode 100644
index 000000000000..ad4e73dcf2e9
--- /dev/null
+++ b/dev-java/openjms/openjms-0.7.6.1-r5.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2008 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-r5.ebuild,v 1.1 2008/08/03 22:31:27 betelgeuse Exp $
+
+EAPI=1
+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=""
+RDEPEND="=virtual/jre-1.4*
+	dev-java/antlr
+	dev-java/castor:0.9
+	dev-java/commons-dbcp
+	dev-java/commons-logging
+	dev-java/concurrent-util
+	dev-java/exolabcore
+	dev-java/sun-jms
+	java-virtuals/transaction-api
+	dev-java/log4j
+	dev-java/jakarta-oro:2.0
+	java-virtuals/servlet-api:2.3"
+DEPEND="=virtual/jdk-1.4*
+	${RDEPEND}
+	dev-java/xerces:2"
+
+src_unpack() {
+	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 sun-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"
+
+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
+}