7 files changed, 5 insertions, 215 deletions
diff --git a/dev-java/jgroups/ChangeLog b/dev-java/jgroups/ChangeLog
index d4cc63330762..0b892781f854 100644
--- a/dev-java/jgroups/ChangeLog
+++ b/dev-java/jgroups/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/jgroups
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jgroups/ChangeLog,v 1.20 2007/06/20 15:08:59 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jgroups/ChangeLog,v 1.21 2007/06/20 15:24:22 caster Exp $
+
+  20 Jun 2007; Vlastimil Babka <caster@gentoo.org> -jgroups-2.2.7-r1.ebuild,
+  -jgroups-2.2.7-r2.ebuild, -jgroups-2.4.1_p1.ebuild:
+  Remove old versions.
 
   20 Jun 2007; Christoph Mende <angelos@gentoo.org>
   jgroups-2.4.1_p1-r1.ebuild:
diff --git a/dev-java/jgroups/files/digest-jgroups-2.2.7-r1 b/dev-java/jgroups/files/digest-jgroups-2.2.7-r1
deleted file mode 100644
index a91e720b9aad..000000000000
--- a/dev-java/jgroups/files/digest-jgroups-2.2.7-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 19a5d8d645d398768897b7a03ebdbcf9 JGroups-2.2.7.src.zip 4294564
-RMD160 a04e4b2ee7ab93abe9e5eba13ac3fc19a37a923c JGroups-2.2.7.src.zip 4294564
-SHA256 2d2ab93c7a9f0e5bb9cad9c99b1636e99295b177b65c26145df82b91c5ca208e JGroups-2.2.7.src.zip 4294564
diff --git a/dev-java/jgroups/files/digest-jgroups-2.2.7-r2 b/dev-java/jgroups/files/digest-jgroups-2.2.7-r2
deleted file mode 100644
index a91e720b9aad..000000000000
--- a/dev-java/jgroups/files/digest-jgroups-2.2.7-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 19a5d8d645d398768897b7a03ebdbcf9 JGroups-2.2.7.src.zip 4294564
-RMD160 a04e4b2ee7ab93abe9e5eba13ac3fc19a37a923c JGroups-2.2.7.src.zip 4294564
-SHA256 2d2ab93c7a9f0e5bb9cad9c99b1636e99295b177b65c26145df82b91c5ca208e JGroups-2.2.7.src.zip 4294564
diff --git a/dev-java/jgroups/files/digest-jgroups-2.4.1_p1 b/dev-java/jgroups/files/digest-jgroups-2.4.1_p1
deleted file mode 100644
index 3a00272a721e..000000000000
--- a/dev-java/jgroups/files/digest-jgroups-2.4.1_p1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 dbe5417e129d63483b3277dd96aad9b0 JGroups-2.4.1-sp1.src.zip 7730494
-RMD160 d925f8f62a00edf29915b80b727d135102e563aa JGroups-2.4.1-sp1.src.zip 7730494
-SHA256 48229412ae47975cb0afcb3cbf24bb3e30fe5091f09a542d31e3e25964cdf051 JGroups-2.4.1-sp1.src.zip 7730494
diff --git a/dev-java/jgroups/jgroups-2.2.7-r1.ebuild b/dev-java/jgroups/jgroups-2.2.7-r1.ebuild
deleted file mode 100644
index 14e73ef50d36..000000000000
--- a/dev-java/jgroups/jgroups-2.2.7-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2006 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-r1.ebuild,v 1.6 2006/09/14 19:50:08 nichoj Exp $
-
-inherit java-pkg
-
-DESCRIPTION="JGroups is a toolkit for reliable multicast communication."
-SRC_URI="mirror://sourceforge/javagroups/JGroups-${PV}.src.zip"
-HOMEPAGE="http://www.jgroups.org/javagroupsnew/docs/"
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-RDEPEND=">=virtual/jre-1.4
-	dev-java/bsh
-	dev-java/commons-logging
-	dev-java/concurrent-util
-	dev-java/sun-jms"
-
-DEPEND=">=virtual/jdk-1.4
-	${RDEPEND}
-	>=dev-java/ant-core-1.5
-	app-arch/unzip
-	junit? ( dev-java/ant-tasks )
-	jikes? ( dev-java/jikes )"
-
-IUSE="doc junit jikes"
-
-S=${WORKDIR}/JGroups-${PV}.src
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}/lib
-	rm *.jar
-
-	java-pkg_jar-from bsh
-	java-pkg_jar-from commons-logging
-	java-pkg_jar-from concurrent-util
-	java-pkg_jar-from sun-jms
-
-	use junit &&  java-pkg_jar-from junit
-
-	# Removing so it doesn't get installed with all the other files
-	rm ${S}/doc/LICENSE
-}
-
-src_compile() {
-	local antflags="compile-1.4 jgroups-core.jar"
-	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
-	use doc && antflags="${antflags} javadoc"
-	use junit && antflags="${antflags} unittests"
-	ant ${antflags} || die "build failed"
-}
-
-src_install() {
-	java-pkg_dojar dist/jgroups-core.jar
-	dodoc doc/* CREDITS README
-
-	if use doc ; then
-		cd dist
-		java-pkg_dohtml -r javadoc
-	fi
-}
diff --git a/dev-java/jgroups/jgroups-2.2.7-r2.ebuild b/dev-java/jgroups/jgroups-2.2.7-r2.ebuild
deleted file mode 100644
index 1a06091004de..000000000000
--- a/dev-java/jgroups/jgroups-2.2.7-r2.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2007 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-r2.ebuild,v 1.3 2007/03/17 13:13:53 betelgeuse Exp $
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="JGroups is a toolkit for reliable multicast communication."
-SRC_URI="mirror://sourceforge/javagroups/JGroups-${PV}.src.zip"
-HOMEPAGE="http://www.jgroups.org/javagroupsnew/docs/"
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-RDEPEND=">=virtual/jre-1.4
-	dev-java/bsh
-	dev-java/commons-logging
-	dev-java/log4j
-	dev-java/junit
-	dev-java/concurrent-util
-	dev-java/sun-jms"
-
-DEPEND=">=virtual/jdk-1.4
-	${RDEPEND}
-	>=dev-java/ant-core-1.5
-	app-arch/unzip
-	source? ( app-arch/zip )"
-#test? ( dev-java/ant )
-
-IUSE="doc source"
-
-S=${WORKDIR}/JGroups-${PV}.src
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}/lib
-	rm *.jar
-
-	java-pkg_jar-from bsh
-	java-pkg_jar-from commons-logging
-	java-pkg_jar-from concurrent-util
-	java-pkg_jar-from sun-jms
-	java-pkg_jar-from log4j
-
-	# Needed for compile, not only for tests:
-	java-pkg_jar-from junit
-
-	# Removing so it doesn't get installed with all the other files
-	rm ${S}/doc/LICENSE
-}
-
-src_compile() {
-	eant compile-1.4 jgroups-core.jar $(use_doc)
-}
-
-src_install() {
-	java-pkg_dojar dist/jgroups-core.jar
-	dodoc doc/* CREDITS README || die
-
-	use doc && java-pkg_dojavadoc dist/javadoc
-	use source && java-pkg_dosrc src/*
-}
-
-RESTRICT="test"
-# A lot of these fail
-src_test() {
-	eant unittests
-}
diff --git a/dev-java/jgroups/jgroups-2.4.1_p1.ebuild b/dev-java/jgroups/jgroups-2.4.1_p1.ebuild
deleted file mode 100644
index bf093447e985..000000000000
--- a/dev-java/jgroups/jgroups-2.4.1_p1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jgroups/jgroups-2.4.1_p1.ebuild,v 1.3 2007/06/02 18:01:14 nixnut Exp $
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-ant-2
-
-MY_PN="JGroups"
-MY_PV="${PV/_p/-sp}"
-MY_P="${MY_PN}-${MY_PV}"
-DESCRIPTION="JGroups is a toolkit for reliable multicast communication."
-SRC_URI="mirror://sourceforge/javagroups/${MY_P}.src.zip"
-HOMEPAGE="http://www.jgroups.org/javagroupsnew/docs/"
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ppc x86"
-RDEPEND=">=virtual/jre-1.4
-	dev-java/bsh
-	dev-java/commons-logging
-	dev-java/concurrent-util
-	dev-java/sun-jms
-	dev-java/sun-jmx"
-
-DEPEND=">=virtual/jdk-1.4
-	${RDEPEND}
-	app-arch/unzip"
-
-S=${WORKDIR}/${MY_P}.src
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	epatch "${FILESDIR}/2.4.1-jdk4.patch"
-
-	cd "${S}/lib" || die
-	rm -v *.jar || die
-
-	java-pkg_jar-from bsh
-	java-pkg_jar-from commons-logging
-	java-pkg_jar-from concurrent-util
-	java-pkg_jar-from sun-jms
-	java-pkg_jar-from sun-jmx
-
-	# Needed for unit tests
-	#java-pkg_jar-from --build-only junit
-	# One unit tests needs this
-	#java-pkg_jar-from --build-only bcprov
-
-	# Just get rid of these as they are of no use to us as we don't install them
-	# Always tries to compile them. Does not build on 1.4 if we don't remove
-	# these as they require java.lang.management
-	rm -vr "${S}"/tests/{junit,other}/org || die
-	java-pkg_filter-compiler jikes
-}
-
-# The jar target generates jgroups-all.jar that has the demos and tests in it
-EANT_BUILD_TARGET="jgroups-core.jar"
-
-src_install() {
-	java-pkg_dojar dist/jgroups-*.jar
-	dodoc CREDITS README || die
-
-	use doc && java-pkg_dojavadoc dist/javadoc
-	use source && java-pkg_dosrc src/*
-
-	insinto /usr/share/docs/${PF}
-	doins -r doc/* || die
-}
-
-RESTRICT="test"
-# A lot of these fail
-src_test() {
-	# run the report target for nice html pages
-	ANT_TASKS="ant-junit" eant unittests-xml
-}