Add version which includes ehcache-failsafe.xml in jar.

Package-Manager: portage-2.1.2.4

diff --git a/dev-java/ehcache/ChangeLog b/dev-java/ehcache/ChangeLog
index 24c8210c4ac011f6e7d6f8af1a68765de8a2493e..3a054a887d3e71be4bac56e5a80505a474bf9fdd 100644 (file)
--- a/dev-java/ehcache/ChangeLog
+++ b/dev-java/ehcache/ChangeLog
@@ -1,6 +1,12 @@
 # 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.6 2007/01/17 00:41:15 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ehcache/ChangeLog,v 1.7 2007/04/19 16:40:44 nelchael Exp $
+
+*ehcache-1.2.4-r2 (19 Apr 2007)
+
+  19 Apr 2007; Krzysiek Pawlik <nelchael@gentoo.org> metadata.xml,
+  -ehcache-1.2.4-r1.ebuild, +ehcache-1.2.4-r2.ebuild:
+  Add version which includes ehcache-failsafe.xml in jar.
 
 *ehcache-1.2.4-r1 (17 Jan 2007)
 

diff --git a/dev-java/ehcache/Manifest b/dev-java/ehcache/Manifest
index 663b5bbb0c6c1c78908cd6ec3072ba0463aed627..98a123b356924d07214d3983e88838dd8869e326 100644 (file)
--- a/dev-java/ehcache/Manifest
+++ b/dev-java/ehcache/Manifest
@@ -1,31 +1,41 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 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
 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-r2.ebuild 1559 RMD160 0500a31c0e3032f5e5baa3667d2c817adb7e695c SHA1 6c130aee496a46bc9581f37a56a0d4e4197787e9 SHA256 2fdc9b71275b3201d3fd7966acab4c8f821ff5c462618cba785efcdfcda79a1d
+MD5 99bb12fd54a8d3523fa6b7a95bbcc02c ehcache-1.2.4-r2.ebuild 1559
+RMD160 0500a31c0e3032f5e5baa3667d2c817adb7e695c ehcache-1.2.4-r2.ebuild 1559
+SHA256 2fdc9b71275b3201d3fd7966acab4c8f821ff5c462618cba785efcdfcda79a1d ehcache-1.2.4-r2.ebuild 1559
 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 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
-SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 metadata.xml 157
+MISC ChangeLog 1526 RMD160 deae082dc97c758f9f46e8589b3a797aa036b9f5 SHA1 148adeff9d79a4dcee99a4a13efe9eae41dc1e68 SHA256 1fefef971fed85f89f2eb8dae72d0735857fc7113eb2257d33b824d955557ea7
+MD5 39cc3276f5721cf17a87244d0d009297 ChangeLog 1526
+RMD160 deae082dc97c758f9f46e8589b3a797aa036b9f5 ChangeLog 1526
+SHA256 1fefef971fed85f89f2eb8dae72d0735857fc7113eb2257d33b824d955557ea7 ChangeLog 1526
+MISC metadata.xml 159 RMD160 7da5c733c224383ffe350605bc36721a3ff2536f SHA1 99c2655c7bbee2cbc8c79edb2d00d481d62faf95 SHA256 a4ced33e98b00e3a3f725c4c40ef8e76c338db53389465ef871105fbe6e8cbbb
+MD5 9f455923f62e1ecb14ebb7f29636850a metadata.xml 159
+RMD160 7da5c733c224383ffe350605bc36721a3ff2536f metadata.xml 159
+SHA256 a4ced33e98b00e3a3f725c4c40ef8e76c338db53389465ef871105fbe6e8cbbb metadata.xml 159
 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
-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
+MD5 7e0226c19145ca446caa534140694d6b files/digest-ehcache-1.2.4-r2 235
+RMD160 c567f65abb9150e4b37b4a96a7d1bb589ffec977 files/digest-ehcache-1.2.4-r2 235
+SHA256 16fb9d74efca4bfd54415a8608ed175173f019b7a2e535043367357b4b332a81 files/digest-ehcache-1.2.4-r2 235
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.3 (GNU/Linux)
+
+iD8DBQFGJ5u3go/w9rxVVVERAnrFAJ4o2bdEym1Q7ymJu4ymA9435trUDwCeJljQ
+BXbXhrCJ2ahS6C31A/qvy9E=
+=+c9m
+-----END PGP SIGNATURE-----

diff --git a/dev-java/ehcache/ehcache-1.2.4-r1.ebuild b/dev-java/ehcache/ehcache-1.2.4-r2.ebuild
similarity index 92%
rename from dev-java/ehcache/ehcache-1.2.4-r1.ebuild
rename to dev-java/ehcache/ehcache-1.2.4-r2.ebuild
index 6c0755644715e3363d95e388cbc4e1b8112cf8b5..0ce465864bdc2202318370ba50574e0a7db2c492 100644 (file)
--- a/dev-java/ehcache/ehcache-1.2.4-r1.ebuild
+++ b/dev-java/ehcache/ehcache-1.2.4-r2.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ehcache/ehcache-1.2.4-r2.ebuild,v 1.1 2007/04/19 16:40:44 nelchael Exp $
 
 inherit java-pkg-2 java-ant-2
 
@@ -53,6 +53,8 @@ src_compile() {
                -classpath      $(java-pkg_getjars commons-logging,commons-collections,servletapi-2.4) \
                @${T}/src.list
 
+       cp "${S}/ehcache.xml" "${S}/classes/ehcache-failsafe.xml" || die
+
        cd ${S}/classes
        jar cf ${S}/${PN}.jar * || die "failed to create jar"
 }

diff --git a/dev-java/ehcache/files/digest-ehcache-1.2.4-r1 b/dev-java/ehcache/files/digest-ehcache-1.2.4-r2
similarity index 100%
rename from dev-java/ehcache/files/digest-ehcache-1.2.4-r1
rename to dev-java/ehcache/files/digest-ehcache-1.2.4-r2

diff --git a/dev-java/ehcache/metadata.xml b/dev-java/ehcache/metadata.xml
index 838c00a4a44841e1470ca454b4b0bb8259723efd..250f2d1940ead3717a16811ef97adb5b0729f6c0 100644 (file)
--- a/dev-java/ehcache/metadata.xml
+++ b/dev-java/ehcache/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>java</herd>
+  <herd>java</herd>
 </pkgmetadata>