Fix building ehcache.

Package-Manager: portage-2.1.2.4

diff --git a/dev-java/ehcache/ChangeLog b/dev-java/ehcache/ChangeLog
index 3a054a887d3e71be4bac56e5a80505a474bf9fdd..c6085b010c9aeb6ac884856c37848ac00ebdbf7c 100644 (file)
--- a/dev-java/ehcache/ChangeLog
+++ b/dev-java/ehcache/ChangeLog
@@ -1,6 +1,10 @@
 # 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.7 2007/04/19 16:40:44 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ehcache/ChangeLog,v 1.8 2007/04/19 19:10:37 nelchael Exp $
+
+  19 Apr 2007; Krzysiek Pawlik <nelchael@gentoo.org>
+  +files/build.xml-1.2.4-r2, ehcache-1.2.4-r2.ebuild:
+  Fix building ehcache.
 
 *ehcache-1.2.4-r2 (19 Apr 2007)
 

diff --git a/dev-java/ehcache/Manifest b/dev-java/ehcache/Manifest
index 98a123b356924d07214d3983e88838dd8869e326..21159f505351693746b0ac24b999451c425562e1 100644 (file)
--- a/dev-java/ehcache/Manifest
+++ b/dev-java/ehcache/Manifest
@@ -1,24 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX build.xml-1.2.4-r2 605 RMD160 93e9c0e022a252728af6a4a4acd25487348f9632 SHA1 8939824111c0cfd0dcb182815d11bf458bcd79ef SHA256 f0e595f3de8ef425c5b69df443d3fa08a29b09dce90632d17ab31f3d6a78cfc5
+MD5 54d6e8a54ab5195176914a350f932fa7 files/build.xml-1.2.4-r2 605
+RMD160 93e9c0e022a252728af6a4a4acd25487348f9632 files/build.xml-1.2.4-r2 605
+SHA256 f0e595f3de8ef425c5b69df443d3fa08a29b09dce90632d17ab31f3d6a78cfc5 files/build.xml-1.2.4-r2 605
 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-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-r2.ebuild 1450 RMD160 b1ae00593b6c39acede59211f0cc2fe8f49db4d6 SHA1 5f2ff4955c26cc24a5ac36764942bb523ab6cde6 SHA256 3e6b12624db8556f47b10fc6e179fd327df3b003d9f509d88dd88de1439f442b
+MD5 7b23580e22136076c09ceeedbb46f030 ehcache-1.2.4-r2.ebuild 1450
+RMD160 b1ae00593b6c39acede59211f0cc2fe8f49db4d6 ehcache-1.2.4-r2.ebuild 1450
+SHA256 3e6b12624db8556f47b10fc6e179fd327df3b003d9f509d88dd88de1439f442b ehcache-1.2.4-r2.ebuild 1450
 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 1526 RMD160 deae082dc97c758f9f46e8589b3a797aa036b9f5 SHA1 148adeff9d79a4dcee99a4a13efe9eae41dc1e68 SHA256 1fefef971fed85f89f2eb8dae72d0735857fc7113eb2257d33b824d955557ea7
-MD5 39cc3276f5721cf17a87244d0d009297 ChangeLog 1526
-RMD160 deae082dc97c758f9f46e8589b3a797aa036b9f5 ChangeLog 1526
-SHA256 1fefef971fed85f89f2eb8dae72d0735857fc7113eb2257d33b824d955557ea7 ChangeLog 1526
+MISC ChangeLog 1658 RMD160 1ded7f5fc49490bcc23b9cc313a8ce7543810212 SHA1 42ef9409b7005de1126c21c43c2880b0a5f166af SHA256 862c862346c21735c7906603598ec0913d971eec1bf85155fb68e5504206caa3
+MD5 dae2d6050fa13f6bbc8a82ca58a4c599 ChangeLog 1658
+RMD160 1ded7f5fc49490bcc23b9cc313a8ce7543810212 ChangeLog 1658
+SHA256 862c862346c21735c7906603598ec0913d971eec1bf85155fb68e5504206caa3 ChangeLog 1658
 MISC metadata.xml 159 RMD160 7da5c733c224383ffe350605bc36721a3ff2536f SHA1 99c2655c7bbee2cbc8c79edb2d00d481d62faf95 SHA256 a4ced33e98b00e3a3f725c4c40ef8e76c338db53389465ef871105fbe6e8cbbb
 MD5 9f455923f62e1ecb14ebb7f29636850a metadata.xml 159
 RMD160 7da5c733c224383ffe350605bc36721a3ff2536f metadata.xml 159
@@ -35,7 +39,7 @@ SHA256 16fb9d74efca4bfd54415a8608ed175173f019b7a2e535043367357b4b332a81 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFGJ5u3go/w9rxVVVERAnrFAJ4o2bdEym1Q7ymJu4ymA9435trUDwCeJljQ
-BXbXhrCJ2ahS6C31A/qvy9E=
-=+c9m
+iD8DBQFGJ77Ygo/w9rxVVVERAohfAKCQTE7+wA7qEZRjAn+a7bL2ibn+gQCgmgEV
+tVyj+0WspMfmnQK+y/wpOLc=
+=8Rzv
 -----END PGP SIGNATURE-----

diff --git a/dev-java/ehcache/ehcache-1.2.4-r2.ebuild b/dev-java/ehcache/ehcache-1.2.4-r2.ebuild
index 0ce465864bdc2202318370ba50574e0a7db2c492..683a7d9ad9294048889242baba99f589e48b31d7 100644 (file)
--- a/dev-java/ehcache/ehcache-1.2.4-r2.ebuild
+++ b/dev-java/ehcache/ehcache-1.2.4-r2.ebuild
@@ -1,6 +1,8 @@
 # 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-r2.ebuild,v 1.1 2007/04/19 16:40:44 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ehcache/ehcache-1.2.4-r2.ebuild,v 1.2 2007/04/19 19:10:37 nelchael Exp $
+
+JAVA_PKG_IUSE="doc source"
 
 inherit java-pkg-2 java-ant-2
 
@@ -11,7 +13,7 @@ HOMEPAGE="http://ehcache.sourceforge.net"
 LICENSE="Apache-2.0"
 SLOT="1.2"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc source"
+IUSE=""
 
 COMMON_DEPEND="
        dev-java/commons-collections
@@ -28,10 +30,11 @@ 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
+       use doc && unpack ${P}-javadoc.zip
 
        mkdir src && cd src
        unzip -qq ../${P}-sources.jar
@@ -41,27 +44,24 @@ src_unpack() {
 
        cd ${S}
        rm -f *.jar *.zip
+       cp "${FILESDIR}/build.xml-${PVR}" build.xml || die
+       mv "${S}/ehcache.xml" "${S}/ehcache-failsafe.xml" || die
 
-}
-
-src_compile() {
-       mkdir ${S}/classes
-       cd ${S}/src
+       mkdir ${S}/lib
+       cd ${S}/lib
 
-       find . -name "*.java" > ${T}/src.list
-       ejavac -d ${S}/classes \
-               -classpath      $(java-pkg_getjars commons-logging,commons-collections,servletapi-2.4) \
-               @${T}/src.list
+       java-pkg_jarfrom commons-logging
+       java-pkg_jarfrom commons-collections
+       java-pkg_jarfrom servletapi-2.4
 
-       cp "${S}/ehcache.xml" "${S}/classes/ehcache-failsafe.xml" || die
-
-       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
+
+       dodoc *.txt ehcache.xsd
        use source && java-pkg_dosrc src/net
        use doc &&java-pkg_dojavadoc docs
+
 }

diff --git a/dev-java/ehcache/files/build.xml-1.2.4-r2 b/dev-java/ehcache/files/build.xml-1.2.4-r2
new file mode 100644 (file)
index 0000000..468cd44
--- /dev/null
+++ b/dev-java/ehcache/files/build.xml-1.2.4-r2
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<project name="ehcache" default="jar" basedir=".">
+  <path id="globalClassPath">
+    <fileset dir="lib/" includes="*.jar"/>
+  </path>
+  <target name="compile">
+    <mkdir dir="classes"/>
+    <javac srcdir="src" destdir="classes/" classpathref="globalClassPath"/>
+    <copy todir="classes/">
+      <fileset dir="." includes="ehcache-failsafe.xml"/>
+    </copy>
+  </target>
+  <target name="jar" depends="compile">
+    <jar destfile="ehcache.jar">
+      <fileset dir="classes" includes="**/*.class"/>
+      <fileset dir="classes" includes="**/*.xml"/>
+    </jar>
+  </target>
+</project>