Raise jdk/jre dep to 1.5, retaining 1.4 bytecode, because classes from 1.5+ API are needed in one source file. Fixed bug #160845, thanks to Alistair Bush <alistair.bush@gmail.com>.

(Portage version: 2.1.2)

3 files changed, 76 insertions, 1 deletions

diff --git a/dev-java/ehcache/ChangeLog b/dev-java/ehcache/ChangeLog
index f1b17b180080..24c8210c4ac0 100644
--- a/dev-java/ehcache/ChangeLog
+++ b/dev-java/ehcache/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/ehcache
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ehcache/ChangeLog,v 1.5 2007/01/03 03:19:21 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ehcache/ChangeLog,v 1.6 2007/01/17 00:41:15 caster Exp $
+
+*ehcache-1.2.4-r1 (17 Jan 2007)
+
+  17 Jan 2007; Vlastimil Babka <caster@gentoo.org> +ehcache-1.2.4-r1.ebuild:
+  Raise jdk/jre dep to 1.5, retaining 1.4 bytecode, because classes from 1.5+
+  API are needed in one source file. Fixed bug #160845, thanks to Alistair
+  Bush <alistair.bush@gmail.com>.
 
   03 Jan 2007; Joshua Nichols <nichoj@gentoo.org> -ehcache-1.1.ebuild:
   Pruned unmigrated revision.
diff --git a/dev-java/ehcache/ehcache-1.2.4-r1.ebuild b/dev-java/ehcache/ehcache-1.2.4-r1.ebuild
new file mode 100644
index 000000000000..6c0755644715
--- /dev/null
+++ b/dev-java/ehcache/ehcache-1.2.4-r1.ebuild
@@ -0,0 +1,65 @@
+# 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-r1.ebuild,v 1.1 2007/01/17 00:41:15 caster 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-2.0"
+SLOT="1.2"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc source"
+
+COMMON_DEPEND="
+	dev-java/commons-collections
+	dev-java/commons-logging
+	~dev-java/servletapi-2.4"
+RDEPEND=">=virtual/jre-1.5
+	${COMMON_DEPEND}"
+DEPEND=">=virtual/jdk-1.5
+	${COMMON_DEPEND}
+	source? ( app-arch/zip )
+	>=dev-java/ant-core-1.5"
+
+JAVA_PKG_WANT_SOURCE="1.4"
+JAVA_PKG_WANT_TARGET="1.4"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	use doc && unzip -qq ${P}-javadoc.zip
+
+	mkdir src && cd src
+	unzip -qq ../${P}-sources.jar
+
+	# could use a USE flag, but would result in circular dep
+	rm -rf net/sf/ehcache/hibernate
+
+	cd ${S}
+	rm -f *.jar *.zip
+
+}
+
+src_compile() {
+	mkdir ${S}/classes
+	cd ${S}/src
+
+	find . -name "*.java" > ${T}/src.list
+	ejavac -d ${S}/classes \
+		-classpath 	$(java-pkg_getjars commons-logging,commons-collections,servletapi-2.4) \
+		@${T}/src.list
+
+	cd ${S}/classes
+	jar cf ${S}/${PN}.jar * || die "failed to create jar"
+}
+
+src_install() {
+	java-pkg_dojar ${PN}.jar
+	dodoc *.txt ehcache.xml ehcache.xsd
+	use source && java-pkg_dosrc src/net
+	use doc &&java-pkg_dojavadoc docs
+}
diff --git a/dev-java/ehcache/files/digest-ehcache-1.2.4-r1 b/dev-java/ehcache/files/digest-ehcache-1.2.4-r1
new file mode 100644
index 000000000000..6c4d73beeffa
--- /dev/null
+++ b/dev-java/ehcache/files/digest-ehcache-1.2.4-r1
@@ -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