Added missing dependencies, both in DEPEND and jars, to satisfy java-strict

Package-Manager: portage-2.1.1_pre4-r2

diff --git a/dev-java/ant-owanttask/ChangeLog b/dev-java/ant-owanttask/ChangeLog
index d7835680bde9f70e7421cb7e5439ddfd7c4779f7..d6afbc88618007d16c6ece8699edd4aedde08060 100644 (file)
--- a/dev-java/ant-owanttask/ChangeLog
+++ b/dev-java/ant-owanttask/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/ant-owanttask
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-owanttask/ChangeLog,v 1.13 2006/07/01 14:22:53 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-owanttask/ChangeLog,v 1.14 2006/08/06 00:09:40 nichoj Exp $
+
+  06 Aug 2006; Joshua Nichols <nichoj@gentoo.org>
+  +files/ant-owanttask-1.1-classpath.patch, ant-owanttask-1.1-r11.ebuild:
+  Added missing dependencies, both in DEPEND and jars, to satisfy java-strict
 
   01 Jul 2006; Joshua Nichols <nichoj@gentoo.org>
   +ant-owanttask-1.1-r11.ebuild:

diff --git a/dev-java/ant-owanttask/Manifest b/dev-java/ant-owanttask/Manifest
index 237abea01e25e1e55c4835329cbe67d41c0e2028..e2f7083688e06c676bd92fbe18c2267c80a643e5 100644 (file)
--- a/dev-java/ant-owanttask/Manifest
+++ b/dev-java/ant-owanttask/Manifest
@@ -1,16 +1,20 @@
+AUX ant-owanttask-1.1-classpath.patch 745 RMD160 10dba27b50313240154369cebb7565c97748dd1f SHA1 ba210d663cb053142bd1075156a68612d4c69aea SHA256 44ceda113479ea7a2d7e3b1ac1dac51d74a30af19390d8d27fa1dbed774ab081
+MD5 742cbceb69f85c049222bd18167779cf files/ant-owanttask-1.1-classpath.patch 745
+RMD160 10dba27b50313240154369cebb7565c97748dd1f files/ant-owanttask-1.1-classpath.patch 745
+SHA256 44ceda113479ea7a2d7e3b1ac1dac51d74a30af19390d8d27fa1dbed774ab081 files/ant-owanttask-1.1-classpath.patch 745
 DIST owanttask-1.1-gentoo.tar.bz2 9275 RMD160 156f8b6bae7628f64c73d5388a24b558ae77243c SHA1 4cd043960871193436e63f41d9228fdd38068bf0 SHA256 b1cfae92078383eb2aadde9fbfdf5a01ca390fb2719c169375c9325014603e82
 EBUILD ant-owanttask-1.1-r1.ebuild 799 RMD160 9a69acc7cedc8cc8b54fc35d2970e7f7c8b5d3b1 SHA1 7444435e6da9f6ca95675908b20fcfcf2420dd92 SHA256 3b3a20c7c81d9c44ceda94daf55660135bade769e38db3fff543142b5c33eaf8
 MD5 a1eb8f15fa0c18dac5c6c8e475f0658d ant-owanttask-1.1-r1.ebuild 799
 RMD160 9a69acc7cedc8cc8b54fc35d2970e7f7c8b5d3b1 ant-owanttask-1.1-r1.ebuild 799
 SHA256 3b3a20c7c81d9c44ceda94daf55660135bade769e38db3fff543142b5c33eaf8 ant-owanttask-1.1-r1.ebuild 799
-EBUILD ant-owanttask-1.1-r11.ebuild 806 RMD160 485fd16adf35a2538f8f96943275e3ad64f5f087 SHA1 d0339391b9f5f26d8da58ae9c9d44cbc74a9592a SHA256 224a4af7f41880c4879724beb64e3064ef7f2f703bf9339d554dc6014de199d3
-MD5 a0f2119726282d7e18d9e7a7a1524e21 ant-owanttask-1.1-r11.ebuild 806
-RMD160 485fd16adf35a2538f8f96943275e3ad64f5f087 ant-owanttask-1.1-r11.ebuild 806
-SHA256 224a4af7f41880c4879724beb64e3064ef7f2f703bf9339d554dc6014de199d3 ant-owanttask-1.1-r11.ebuild 806
-MISC ChangeLog 1249 RMD160 caf5f6a566f7150d8012de3de8f24f22cb3f5e9b SHA1 3970352f3e43367cfa99937a2c8aa23a4aa8330f SHA256 5458af4c4e026c866c0fec323257dea655a2ce205e6c4cb217af29a32a189498
-MD5 8ae0515fa8f9bd6557853afb19d2aa92 ChangeLog 1249
-RMD160 caf5f6a566f7150d8012de3de8f24f22cb3f5e9b ChangeLog 1249
-SHA256 5458af4c4e026c866c0fec323257dea655a2ce205e6c4cb217af29a32a189498 ChangeLog 1249
+EBUILD ant-owanttask-1.1-r11.ebuild 990 RMD160 429d6b2db1ba34274d1b8c5c1ec8a793e154c5c6 SHA1 d97698026f20cbded22ebcc7dcc6d98ee6bb586c SHA256 2956df9c02b2b4b521bf6b69d8e61910ccafef649bc35bdea50081fa9594cec0
+MD5 e60f7d9051e17ddc3cc711119d3893bf ant-owanttask-1.1-r11.ebuild 990
+RMD160 429d6b2db1ba34274d1b8c5c1ec8a793e154c5c6 ant-owanttask-1.1-r11.ebuild 990
+SHA256 2956df9c02b2b4b521bf6b69d8e61910ccafef649bc35bdea50081fa9594cec0 ant-owanttask-1.1-r11.ebuild 990
+MISC ChangeLog 1452 RMD160 3d38e3c27b981c582413d946d7e64c3448a579a7 SHA1 d4e7ea911e6266aeb5387015a10e67b69d1d1a0c SHA256 fb51b63f79c7287b25b099798408d72e0b94a886eff3930c2cac1e0cd758cc20
+MD5 867b91b19a54f6900df939745be6645d ChangeLog 1452
+RMD160 3d38e3c27b981c582413d946d7e64c3448a579a7 ChangeLog 1452
+SHA256 fb51b63f79c7287b25b099798408d72e0b94a886eff3930c2cac1e0cd758cc20 ChangeLog 1452
 MISC metadata.xml 158 RMD160 d71171daf5fa0ea076b61129327d757cc9c75225 SHA1 b9baf1a1cb9a7070400cd44b2f9b35d59b9c17a1 SHA256 6f42ac97aed8ab989921aa4a0f8c45b167af3c6dc25811326d7f6cf1ccb9d189
 MD5 0cc53bfb30a3ec902aabe97af1698512 metadata.xml 158
 RMD160 d71171daf5fa0ea076b61129327d757cc9c75225 metadata.xml 158

diff --git a/dev-java/ant-owanttask/ant-owanttask-1.1-r11.ebuild b/dev-java/ant-owanttask/ant-owanttask-1.1-r11.ebuild
index c381a01d0a7242437aed5a686a806b23c36be3a5..2822a4b2ffa624f395e5cf6d214d0b2705d20884 100644 (file)
--- a/dev-java/ant-owanttask/ant-owanttask-1.1-r11.ebuild
+++ b/dev-java/ant-owanttask/ant-owanttask-1.1-r11.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-owanttask/ant-owanttask-1.1-r11.ebuild,v 1.1 2006/07/01 14:22:53 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-owanttask/ant-owanttask-1.1-r11.ebuild,v 1.2 2006/08/06 00:09:40 nichoj Exp $
 
-inherit java-ant-2 java-pkg-2
+inherit java-ant-2 java-pkg-2 eutils
 
 DESCRIPTION="ObjectWeb's Ant tasks"
 HOMEPAGE="http://monolog.objectweb.org"
@@ -13,9 +13,20 @@ KEYWORDS="~x86 ~ppc ~amd64"
 IUSE=""
 DEPEND=">=virtual/jdk-1.4"
 RDEPEND=">=virtual/jre-1.4
-       dev-java/ant-core"
+       dev-java/ant-core
+       dev-java/xalan"
 S=${WORKDIR}/owanttask-${PV}
 
+src_unpack() {
+       unpack ${A}
+       cd ${S}
+       epatch ${FILESDIR}/${P}-classpath.patch
+       mkdir lib
+       cd lib
+       java-pkg_jar-from ant-core ant.jar
+       java-pkg_jar-from xalan
+}
+
 src_compile() {
        eant jar
 }

diff --git a/dev-java/ant-owanttask/files/ant-owanttask-1.1-classpath.patch b/dev-java/ant-owanttask/files/ant-owanttask-1.1-classpath.patch
new file mode 100644 (file)
index 0000000..cd3d2e0
--- /dev/null
+++ b/dev-java/ant-owanttask/files/ant-owanttask-1.1-classpath.patch
@@ -0,0 +1,17 @@
+diff -ru owanttask-1.1/build.xml owanttask-1.1-patched/build.xml
+--- owanttask-1.1/build.xml    2004-02-09 03:57:02.000000000 -0500
++++ owanttask-1.1-patched/build.xml    2006-08-05 20:06:03.000000000 -0400
+@@ -3,9 +3,12 @@
+     <property name="out" value="${basedir}/output"/>
+     <property name="out.build" value="${out}/build"/>
+     <property name="out.lib" value="${out}/lib"/>
++    <path id="build.classpath">
++        <fileset dir="lib" includes="*.jar"/>
++    </path>
+       <target name="compile">
+               <mkdir dir="${out.build}"/>
+-              <javac srcdir="${prj.src}" destdir="${out.build}" debug="on">
++              <javac srcdir="${prj.src}" destdir="${out.build}" debug="on" classpathref="build.classpath">
+                       <include name="**/*.java"/>
+               </javac>
+       </target>