Migrate 2.2.4 to generation 2, remove unneeded SLOTs.

(Portage version: 2.1.2.5)

7 files changed, 45 insertions, 79 deletions

diff --git a/dev-java/javolution/ChangeLog b/dev-java/javolution/ChangeLog
index 6085189f8fdc..ae75a80858c7 100644
--- a/dev-java/javolution/ChangeLog
+++ b/dev-java/javolution/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/javolution
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/javolution/ChangeLog,v 1.7 2007/04/24 10:19:10 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/javolution/ChangeLog,v 1.8 2007/04/28 16:36:17 nelchael Exp $
+
+*javolution-2.2.4-r1 (28 Apr 2007)
+
+  28 Apr 2007; Krzysiek Pawlik <nelchael@gentoo.org>
+  -javolution-2.2.0.ebuild, +javolution-2.2.4-r1.ebuild,
+  -javolution-3.2.4.ebuild:
+  Migrate 2.2.4 to generation 2, remove unneeded SLOTs.
 
 *javolution-4.0.2 (24 Apr 2007)
 
diff --git a/dev-java/javolution/files/digest-javolution-2.2.0 b/dev-java/javolution/files/digest-javolution-2.2.0
deleted file mode 100644
index dedcba09a500..000000000000
--- a/dev-java/javolution/files/digest-javolution-2.2.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 001adf39a04a74439ddaa829f57cb91c javolution-2.2.0-src.zip 386651
-RMD160 94cfa6f79359077a1dbcfca473f6cd67ea95bc22 javolution-2.2.0-src.zip 386651
-SHA256 2b46a26a555c2d4cb2cbd7b7a527f9fc555733b26b398d99da241c6aa2188ac4 javolution-2.2.0-src.zip 386651
diff --git a/dev-java/javolution/files/digest-javolution-2.2.4-r1 b/dev-java/javolution/files/digest-javolution-2.2.4-r1
new file mode 100644
index 000000000000..ea919fc07e8c
--- /dev/null
+++ b/dev-java/javolution/files/digest-javolution-2.2.4-r1
@@ -0,0 +1,3 @@
+MD5 c46c862d03dea51a19226e5946d80fb5 javolution-2.2.4-src.zip 391698
+RMD160 9183c93861948b514dae68cddb99e7152dcad485 javolution-2.2.4-src.zip 391698
+SHA256 72f117ec3e7d8772c67bb5114596e75edcb0ffb00a3824ed7a2b9516e11e3078 javolution-2.2.4-src.zip 391698
diff --git a/dev-java/javolution/files/digest-javolution-3.2.4 b/dev-java/javolution/files/digest-javolution-3.2.4
deleted file mode 100644
index f2d4d2dd786a..000000000000
--- a/dev-java/javolution/files/digest-javolution-3.2.4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 b082040b93aeb56e91a53dd2ea7b4e66 javolution-3.2.4-src.zip 429666
-RMD160 1e67ee1c72f4411180435447992499d12fce0ef0 javolution-3.2.4-src.zip 429666
-SHA256 ea674e25a1ba22e2d461db127d1ce3c652dbc3df579409f95b78adcbaabae278 javolution-3.2.4-src.zip 429666
diff --git a/dev-java/javolution/javolution-2.2.0.ebuild b/dev-java/javolution/javolution-2.2.0.ebuild
deleted file mode 100644
index 9d0a95152b80..000000000000
--- a/dev-java/javolution/javolution-2.2.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/javolution/javolution-2.2.0.ebuild,v 1.3 2005/07/15 22:22:33 axxo Exp $
-
-inherit eutils java-pkg
-
-DESCRIPTION="Java Solution for Real-Time and Embedded Systems"
-SRC_URI="http://javolution.org/${P}-src.zip"
-HOMEPAGE="http://javolution.org"
-LICENSE="LGPL-2.1"
-SLOT="2.2"
-KEYWORDS="amd64 x86"
-IUSE="doc source"
-DEPEND=">=virtual/jdk-1.4
-	>=dev-java/ant-core-1.4
-	app-arch/unzip
-	source? ( app-arch/zip )"
-	#jikes?( >=dev-java/jikes-1.21 )"
-RDEPEND=">=virtual/jre-1.4"
-
-S=${WORKDIR}/javolution-${PV%.*}
-
-src_compile() {
-	antflags="init_1.4 compile jar"
-	use doc && antflags="${antflags} doc"
-	# jikes support, doesnt work without patching
-	#use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
-	ant ${antflags} || die "ant build failed"
-}
-
-src_install() {
-	java-pkg_dojar javolution.jar
-	dodoc doc/coding_standard.txt
-	use doc && java-pkg_dohtml -r index.html api/*
-	use source && java-pkg_dosrc ${S}/src/javolution
-}
diff --git a/dev-java/javolution/javolution-2.2.4-r1.ebuild b/dev-java/javolution/javolution-2.2.4-r1.ebuild
new file mode 100644
index 000000000000..2cd848c71f13
--- /dev/null
+++ b/dev-java/javolution/javolution-2.2.4-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/javolution/javolution-2.2.4-r1.ebuild,v 1.1 2007/04/28 16:36:17 nelchael Exp $
+
+JAVA_PKG_IUSE="doc source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Java Solution for Real-Time and Embedded Systems"
+SRC_URI="http://javolution.org/${P}-src.zip"
+HOMEPAGE="http://javolution.org"
+LICENSE="LGPL-2.1"
+SLOT="2.2.4"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=">=virtual/jdk-1.4
+	app-arch/unzip"
+RDEPEND=">=virtual/jre-1.4"
+
+S="${WORKDIR}/javolution-${PV%.*}"
+
+EANT_BUILD_TARGET="init_1.4 compile jar"
+EANT_DOC_TARGET="doc"
+
+src_install() {
+
+	java-pkg_dojar javolution.jar
+
+	dodoc doc/coding_standard.txt
+	use doc && java-pkg_dojavadoc api
+	use source && java-pkg_dosrc "${S}/src/javolution"
+
+}
diff --git a/dev-java/javolution/javolution-3.2.4.ebuild b/dev-java/javolution/javolution-3.2.4.ebuild
deleted file mode 100644
index 4ee12b101677..000000000000
--- a/dev-java/javolution/javolution-3.2.4.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/javolution/javolution-3.2.4.ebuild,v 1.2 2005/07/15 22:22:33 axxo Exp $
-
-inherit eutils java-pkg
-
-DESCRIPTION="Java Solution for Real-Time and Embedded Systems"
-SRC_URI="http://javolution.org/${P}-src.zip"
-HOMEPAGE="http://javolution.org"
-LICENSE="LGPL-2.1"
-SLOT="3.2"
-KEYWORDS="~amd64 x86"
-IUSE="doc source"
-DEPEND=">=virtual/jdk-1.4
-	>=dev-java/ant-core-1.4
-	app-arch/unzip
-	source? ( app-arch/zip )"
-	#jikes?( >=dev-java/jikes-1.21 )"
-RDEPEND=">=virtual/jre-1.4"
-
-S=${WORKDIR}/javolution-${PV%.*}
-
-src_compile() {
-	antflags="init_1.4 compile jar"
-	use doc && antflags="${antflags} doc"
-	# jikes support disabled, doesnt work without patching
-	#use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
-	ant ${antflags} || die "ant build failed"
-}
-
-src_install() {
-	java-pkg_dojar javolution.jar
-	dodoc doc/coding_standard.txt
-	use doc && java-pkg_dohtml -r index.html api/*
-	use source && java-pkg_dosrc ${S}/src/javolution
-}