Version bump. Added as slot 1.2 because there are a few subtle API incompatibilities.

Package-Manager: portage-2.1.2_rc4-r4

4 files changed, 79 insertions, 6 deletions

diff --git a/dev-java/ehcache/ChangeLog b/dev-java/ehcache/ChangeLog
index c67c9cd0cd77..1776f2535939 100644
--- a/dev-java/ehcache/ChangeLog
+++ b/dev-java/ehcache/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/ehcache
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ehcache/ChangeLog,v 1.3 2006/09/08 04:02:51 nichoj Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ehcache/ChangeLog,v 1.4 2007/01/03 03:17:03 nichoj Exp $
+
+*ehcache-1.2.4 (03 Jan 2007)
+
+  03 Jan 2007; Joshua Nichols <nichoj@gentoo.org> +ehcache-1.2.4.ebuild:
+  Version bump. Added as slot 1.2 because there are a few subtle API
+  incompatibilities.
 
 *ehcache-1.1-r1 (08 Sep 2006)
 
diff --git a/dev-java/ehcache/Manifest b/dev-java/ehcache/Manifest
index c1c05acb6f5a..c640200359e1 100644
--- a/dev-java/ehcache/Manifest
+++ b/dev-java/ehcache/Manifest
@@ -1,4 +1,5 @@
 DIST ehcache-1.1.tgz 228733 RMD160 5710d408549d9526bde89cc44f1d2f6433aa1048 SHA1 0ae1b51a440d48b9c25a056fdd929218aa30d989 SHA256 b1709cdb27a7dee9c3f6beb8967a2f64549d9cc32af7867f8fa43b0d5b4bf226
+DIST ehcache-1.2.4.tgz 1330344 RMD160 c59deec7647c2ed659de471bda3cfc721723b23a SHA1 e876bace62cc387ce5c476baa9513ddfb8cd2300 SHA256 47b5dad87d8c75773e66aef471b1b464118956f8ce3bf9ca0e0292f020a20a64
 EBUILD ehcache-1.1-r1.ebuild 1227 RMD160 1ee5a7df9378a9260b65b2fc987ac37d3e383761 SHA1 5f460610528b2374f51e3a4d5bddb93fd938986f SHA256 e2cd9912635d2cae9f4c06cc763158ebf6a7ab48c6f138ce9a1e33e873c694df
 MD5 d40f843e835dd4f3d1fcb274aea8c570 ehcache-1.1-r1.ebuild 1227
 RMD160 1ee5a7df9378a9260b65b2fc987ac37d3e383761 ehcache-1.1-r1.ebuild 1227
@@ -7,10 +8,14 @@ EBUILD ehcache-1.1.ebuild 1232 RMD160 f754c06e95b36771a3e65c88e1d37ebede2660f9 S
 MD5 678bbda39744517df1c91226a16c7922 ehcache-1.1.ebuild 1232
 RMD160 f754c06e95b36771a3e65c88e1d37ebede2660f9 ehcache-1.1.ebuild 1232
 SHA256 aa48ea15a6b7591199f665134da42a9d1f135530f1910dbbc275d9e75c5fc9d2 ehcache-1.1.ebuild 1232
-MISC ChangeLog 717 RMD160 76a976b4afd797124529d0832dfb175a63db4a88 SHA1 e8298f40bfa7c95907fbb723a97a0372caf94967 SHA256 7d452f799e9f0587820454221c2096ff6f346345e037082757307043f134fac7
-MD5 3619576d30484edb6239fa2f468a5497 ChangeLog 717
-RMD160 76a976b4afd797124529d0832dfb175a63db4a88 ChangeLog 717
-SHA256 7d452f799e9f0587820454221c2096ff6f346345e037082757307043f134fac7 ChangeLog 717
+EBUILD ehcache-1.2.4.ebuild 1364 RMD160 191258e11635ad24cac35922711c0f85c1b1ce84 SHA1 8709bfff021c94ca7d0719ed0ec910c95578bf19 SHA256 f3b0ce7443e0eeb058e8a918390e276983c28f67017888a10c958c34fdc55149
+MD5 0b79bce769cce96610cefbfe2ba6489c ehcache-1.2.4.ebuild 1364
+RMD160 191258e11635ad24cac35922711c0f85c1b1ce84 ehcache-1.2.4.ebuild 1364
+SHA256 f3b0ce7443e0eeb058e8a918390e276983c28f67017888a10c958c34fdc55149 ehcache-1.2.4.ebuild 1364
+MISC ChangeLog 911 RMD160 4fdb3789289a236365a27214ebf1f70c13db136c SHA1 e92b6e3d8f26b04bb4783f79ff3520b90e4b0fca SHA256 6e10383a3ff4aae223457db320606e0de0232c6903c166b4901f80f77f918a4c
+MD5 cb5bc150062f9f5b2dbe06c218e2bed3 ChangeLog 911
+RMD160 4fdb3789289a236365a27214ebf1f70c13db136c ChangeLog 911
+SHA256 6e10383a3ff4aae223457db320606e0de0232c6903c166b4901f80f77f918a4c ChangeLog 911
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
@@ -21,3 +26,6 @@ SHA256 e2cc8af1c9671a0e7689b8b6d6048a7b498f2ec6252e00942807efa8de12eec4 files/di
 MD5 77a7de4c6302c3454fc656b3858d2e91 files/digest-ehcache-1.1-r1 226
 RMD160 86ac41e2ff463cc119b72214e2312ef4d0ca497f files/digest-ehcache-1.1-r1 226
 SHA256 e2cc8af1c9671a0e7689b8b6d6048a7b498f2ec6252e00942807efa8de12eec4 files/digest-ehcache-1.1-r1 226
+MD5 7e0226c19145ca446caa534140694d6b files/digest-ehcache-1.2.4 235
+RMD160 c567f65abb9150e4b37b4a96a7d1bb589ffec977 files/digest-ehcache-1.2.4 235
+SHA256 16fb9d74efca4bfd54415a8608ed175173f019b7a2e535043367357b4b332a81 files/digest-ehcache-1.2.4 235
diff --git a/dev-java/ehcache/ehcache-1.2.4.ebuild b/dev-java/ehcache/ehcache-1.2.4.ebuild
new file mode 100644
index 000000000000..90ee8b411087
--- /dev/null
+++ b/dev-java/ehcache/ehcache-1.2.4.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ehcache/ehcache-1.2.4.ebuild,v 1.1 2007/01/03 03:17:03 nichoj Exp $
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Ehcache is a pure Java, fully-featured, in-process cache."
+SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
+HOMEPAGE="http://ehcache.sourceforge.net"
+
+LICENSE="Apache-1.1"
+SLOT="1.2"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc source"
+
+COMMON_DEPEND="
+		dev-java/commons-collections
+		dev-java/concurrent-util
+		dev-java/commons-logging
+		~dev-java/servletapi-2.4"
+RDEPEND=">=virtual/jre-1.4
+		${COMMON_DEPEND}"
+DEPEND=">=virtual/jdk-1.4
+		${COMMON_DEPEND}
+		source? ( app-arch/zip )
+		>=dev-java/ant-core-1.5"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	mkdir src && cd src
+	unzip -qq ../${P}-sources.jar || die
+	rm -rf net/sf/ehcache/hibernate
+}
+
+src_compile() {
+	mkdir ${S}/classes
+	cd ${S}/src
+
+	ejavac -d ${S}/classes \
+		-classpath 	$(java-pkg_getjars commons-logging,commons-collections,servletapi-2.4) \
+		$(find . -name "*.java")
+
+	cd ${S}/classes
+	jar cf ${S}/${P}.jar * || die "failed to create jar"
+}
+
+src_install() {
+	java-pkg_newjar ${S}/${P}.jar
+	dodoc *.txt ehcache.xml ehcache.xsd
+	use source && java-pkg_dosrc src
+	if use doc ; then
+		unzip -qq ${P}-javadoc.zip || die
+		java-pkg_dohtml -r docs
+	fi
+}
diff --git a/dev-java/ehcache/files/digest-ehcache-1.2.4 b/dev-java/ehcache/files/digest-ehcache-1.2.4
new file mode 100644
index 000000000000..6c4d73beeffa
--- /dev/null
+++ b/dev-java/ehcache/files/digest-ehcache-1.2.4
@@ -0,0 +1,3 @@
+MD5 963cfdc7fbaa212a5227b47e733de785 ehcache-1.2.4.tgz 1330344
+RMD160 c59deec7647c2ed659de471bda3cfc721723b23a ehcache-1.2.4.tgz 1330344
+SHA256 47b5dad87d8c75773e66aef471b1b464118956f8ce3bf9ca0e0292f020a20a64 ehcache-1.2.4.tgz 1330344