Fix jre deps, remove old.

(Portage version: 2.2_rc46/cvs/Linux x86_64)

4 files changed, 9 insertions, 159 deletions

diff --git a/dev-java/openjms/ChangeLog b/dev-java/openjms/ChangeLog
index aa53fd4e341f..6cc6d8dab3fd 100644
--- a/dev-java/openjms/ChangeLog
+++ b/dev-java/openjms/ChangeLog
@@ -1,6 +1,11 @@
 # 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.29 2009/10/30 10:56:03 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/openjms/ChangeLog,v 1.30 2009/11/01 19:20:34 caster Exp $
+
+  01 Nov 2009; Vlastimil Babka <caster@gentoo.org>
+  -openjms-0.7.6.1-r5.ebuild, -openjms-0.7.6.1-r6.ebuild,
+  openjms-0.7.6.1-r7.ebuild:
+  Fix jre deps, remove old.
 
   30 Oct 2009; Markus Meier <maekke@gentoo.org> openjms-0.7.6.1-r7.ebuild:
   amd64/x86 stable, bug #289555
diff --git a/dev-java/openjms/openjms-0.7.6.1-r5.ebuild b/dev-java/openjms/openjms-0.7.6.1-r5.ebuild
deleted file mode 100644
index a3fd754fdbef..000000000000
--- a/dev-java/openjms/openjms-0.7.6.1-r5.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# 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-r5.ebuild,v 1.4 2009/04/22 19:49:50 maekke 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=""
-RDEPEND="=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
-	dev-java/sun-jms:0
-	java-virtuals/transaction-api
-	dev-java/log4j:0
-	dev-java/jakarta-oro:2.0
-	java-virtuals/servlet-api:2.3"
-DEPEND="=virtual/jdk-1.4*
-	${RDEPEND}
-	dev-java/xerces:2"
-
-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 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
-}
diff --git a/dev-java/openjms/openjms-0.7.6.1-r6.ebuild b/dev-java/openjms/openjms-0.7.6.1-r6.ebuild
deleted file mode 100644
index db6cb88947a6..000000000000
--- a/dev-java/openjms/openjms-0.7.6.1-r6.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# 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-r6.ebuild,v 1.2 2009/06/19 09:57:11 fauli 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=""
-RDEPEND="=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.4*
-	${RDEPEND}
-	dev-java/xerces:2"
-
-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"
-
-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
-}
diff --git a/dev-java/openjms/openjms-0.7.6.1-r7.ebuild b/dev-java/openjms/openjms-0.7.6.1-r7.ebuild
index f3d369467df6..65da88060e05 100644
--- a/dev-java/openjms/openjms-0.7.6.1-r7.ebuild
+++ b/dev-java/openjms/openjms-0.7.6.1-r7.ebuild
@@ -1,6 +1,6 @@
 # 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.2 2009/10/30 10:56:03 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/openjms/openjms-0.7.6.1-r7.ebuild,v 1.3 2009/11/01 19:20:34 caster Exp $
 
 EAPI="2"
 JAVA_PKG_IUSE="doc"
@@ -15,8 +15,7 @@ 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]
+CDEPEND=">=dev-java/antlr-2.7.7:0[java]
 	dev-java/castor:0.9
 	dev-java/commons-dbcp:0
 	dev-java/commons-logging:0
@@ -30,7 +29,7 @@ CDEPEND="=virtual/jre-1.4*
 DEPEND="|| ( =virtual/jdk-1.5* =virtual/jdk-1.4* )
 	${CDEPEND}
 	dev-java/xerces:2"
-RDEPEND=">=virtual/jdk-1.4
+RDEPEND=">=virtual/jre-1.4
 	${CDEPEND}"
 
 java_prepare() {