From: Vlastimil Babka Date: Wed, 17 Jan 2007 00:41:15 +0000 (+0000) Subject: Raise jdk/jre dep to 1.5, retaining 1.4 bytecode, because classes from 1.5+ API are... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e13a2cf21883e3c8dedbd8b028c220b003fbb620;p=gentoo.git 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 . Package-Manager: portage-2.1.2 --- 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 +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 . 03 Jan 2007; Joshua Nichols -ehcache-1.1.ebuild: Pruned unmigrated revision. diff --git a/dev-java/ehcache/Manifest b/dev-java/ehcache/Manifest index a8e974910597..663b5bbb0c6c 100644 --- a/dev-java/ehcache/Manifest +++ b/dev-java/ehcache/Manifest @@ -4,14 +4,18 @@ EBUILD ehcache-1.1-r1.ebuild 1227 RMD160 1ee5a7df9378a9260b65b2fc987ac37d3e38376 MD5 d40f843e835dd4f3d1fcb274aea8c570 ehcache-1.1-r1.ebuild 1227 RMD160 1ee5a7df9378a9260b65b2fc987ac37d3e383761 ehcache-1.1-r1.ebuild 1227 SHA256 e2cd9912635d2cae9f4c06cc763158ebf6a7ab48c6f138ce9a1e33e873c694df ehcache-1.1-r1.ebuild 1227 +EBUILD ehcache-1.2.4-r1.ebuild 1490 RMD160 23f7700f6d3f3333bed18a014e18d80541bb4749 SHA1 b1a2afd925ffa637df43cf47e07f2897401c8964 SHA256 802f18563575549226f1c90c9b58e233849e1b9c5e29ea0d737c1694d9d0ce69 +MD5 2e27787f46c979dcb7efd182340f291a ehcache-1.2.4-r1.ebuild 1490 +RMD160 23f7700f6d3f3333bed18a014e18d80541bb4749 ehcache-1.2.4-r1.ebuild 1490 +SHA256 802f18563575549226f1c90c9b58e233849e1b9c5e29ea0d737c1694d9d0ce69 ehcache-1.2.4-r1.ebuild 1490 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 1013 RMD160 b5a1e538a6c12e3b020e72f02093e0e4dcedcff5 SHA1 42169f8bfacc57a8d0bee2b9948c72869f6d283b SHA256 331082d318c0b77d284f4ae4e380a11e92fac8827099092bfb904e2f20470f01 -MD5 90dde13ba711e2951b6808742b05fb23 ChangeLog 1013 -RMD160 b5a1e538a6c12e3b020e72f02093e0e4dcedcff5 ChangeLog 1013 -SHA256 331082d318c0b77d284f4ae4e380a11e92fac8827099092bfb904e2f20470f01 ChangeLog 1013 +MISC ChangeLog 1311 RMD160 0007783d5bd58d0a39d0924f23bc781adf60919d SHA1 1d4275807848631b47d8b4d1068330fd4a04c8ef SHA256 aa0898374c6a933a6c97e459a04fc9fb4cb0bc3929124328300c7b1794f79907 +MD5 4512a92c520f1ac576f30728205ebf1b ChangeLog 1311 +RMD160 0007783d5bd58d0a39d0924f23bc781adf60919d ChangeLog 1311 +SHA256 aa0898374c6a933a6c97e459a04fc9fb4cb0bc3929124328300c7b1794f79907 ChangeLog 1311 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157 @@ -22,3 +26,6 @@ SHA256 e2cc8af1c9671a0e7689b8b6d6048a7b498f2ec6252e00942807efa8de12eec4 files/di 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 +MD5 7e0226c19145ca446caa534140694d6b files/digest-ehcache-1.2.4-r1 235 +RMD160 c567f65abb9150e4b37b4a96a7d1bb589ffec977 files/digest-ehcache-1.2.4-r1 235 +SHA256 16fb9d74efca4bfd54415a8608ed175173f019b7a2e535043367357b4b332a81 files/digest-ehcache-1.2.4-r1 235 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