From 6561f34a4a23e8e8ec01f5837f47a6b5b82bf274 Mon Sep 17 00:00:00 2001 From: Vlastimil Babka Date: Wed, 24 Jan 2007 17:57:16 +0000 Subject: [PATCH] Revbump to be somewhat compatible with ant-1.7.0. The incompatible MultipleCopy task is replaced with a dummy. No asm ebuild (the only package using this in the tree) excercises this task. Package-Manager: portage-2.1.2-r3 --- dev-java/ant-owanttask/ChangeLog | 12 ++++- dev-java/ant-owanttask/Manifest | 19 ++++++-- .../ant-owanttask-1.1-r12.ebuild | 44 +++++++++++++++++++ .../ant-owanttask/files/MultipleCopy.java | 12 +++++ .../files/digest-ant-owanttask-1.1-r12 | 3 ++ 5 files changed, 84 insertions(+), 6 deletions(-) create mode 100644 dev-java/ant-owanttask/ant-owanttask-1.1-r12.ebuild create mode 100644 dev-java/ant-owanttask/files/MultipleCopy.java create mode 100644 dev-java/ant-owanttask/files/digest-ant-owanttask-1.1-r12 diff --git a/dev-java/ant-owanttask/ChangeLog b/dev-java/ant-owanttask/ChangeLog index d6afbc886180..b701509eee96 100644 --- a/dev-java/ant-owanttask/ChangeLog +++ b/dev-java/ant-owanttask/ChangeLog @@ -1,6 +1,14 @@ # 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.14 2006/08/06 00:09:40 nichoj Exp $ +# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-owanttask/ChangeLog,v 1.15 2007/01/24 17:57:16 caster Exp $ + +*ant-owanttask-1.1-r12 (24 Jan 2007) + + 24 Jan 2007; Vlastimil Babka +files/MultipleCopy.java, + +ant-owanttask-1.1-r12.ebuild: + Revbump to be somewhat compatible with ant-1.7.0. The incompatible + MultipleCopy task is replaced with a dummy. No asm ebuild (the only package + using this in the tree) excercises this task. 06 Aug 2006; Joshua Nichols +files/ant-owanttask-1.1-classpath.patch, ant-owanttask-1.1-r11.ebuild: diff --git a/dev-java/ant-owanttask/Manifest b/dev-java/ant-owanttask/Manifest index e2f7083688e0..f342ddf3e5cb 100644 --- a/dev-java/ant-owanttask/Manifest +++ b/dev-java/ant-owanttask/Manifest @@ -1,3 +1,7 @@ +AUX MultipleCopy.java 295 RMD160 f467af55764b4d43337bf382ff5dd5ff443950c3 SHA1 c10ce2fa34d45b0eaf966d13fa0f59068b25ef8a SHA256 81589be71d092b5e56d6e27f917d374c8e1ae684961792dc9ae063052b4d3352 +MD5 581f43807966974bf69dd1b0a178a608 files/MultipleCopy.java 295 +RMD160 f467af55764b4d43337bf382ff5dd5ff443950c3 files/MultipleCopy.java 295 +SHA256 81589be71d092b5e56d6e27f917d374c8e1ae684961792dc9ae063052b4d3352 files/MultipleCopy.java 295 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 @@ -11,10 +15,14 @@ EBUILD ant-owanttask-1.1-r11.ebuild 990 RMD160 429d6b2db1ba34274d1b8c5c1ec8a793e 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 +EBUILD ant-owanttask-1.1-r12.ebuild 1090 RMD160 8ac727a34a79b7aca616f9eb491e3bf81fead9a2 SHA1 b4ac4494f5c1ea2f990c0692c5820a3b73f6c7ff SHA256 d43d81e363f2d98b088f212e7f33b57f9d287d7ddde23d8a759195182e8151d3 +MD5 c9f8ca6628f22ba8ac39e512e82fa09e ant-owanttask-1.1-r12.ebuild 1090 +RMD160 8ac727a34a79b7aca616f9eb491e3bf81fead9a2 ant-owanttask-1.1-r12.ebuild 1090 +SHA256 d43d81e363f2d98b088f212e7f33b57f9d287d7ddde23d8a759195182e8151d3 ant-owanttask-1.1-r12.ebuild 1090 +MISC ChangeLog 1796 RMD160 95b4da92cfcb9f1cdf5cd919bf974c3ab103a6ff SHA1 b3bf5a64a61130aebde31db96304fc2d2c415b57 SHA256 9e985f71bb8f9f4b711606fd776ca54c4f627e1f32df966210e7a31c57540a8d +MD5 0ff821fdfed732ecc55baa57696df08d ChangeLog 1796 +RMD160 95b4da92cfcb9f1cdf5cd919bf974c3ab103a6ff ChangeLog 1796 +SHA256 9e985f71bb8f9f4b711606fd776ca54c4f627e1f32df966210e7a31c57540a8d ChangeLog 1796 MISC metadata.xml 158 RMD160 d71171daf5fa0ea076b61129327d757cc9c75225 SHA1 b9baf1a1cb9a7070400cd44b2f9b35d59b9c17a1 SHA256 6f42ac97aed8ab989921aa4a0f8c45b167af3c6dc25811326d7f6cf1ccb9d189 MD5 0cc53bfb30a3ec902aabe97af1698512 metadata.xml 158 RMD160 d71171daf5fa0ea076b61129327d757cc9c75225 metadata.xml 158 @@ -25,3 +33,6 @@ SHA256 219a7ca453f6a5cf8b07f42ad9b62b70f82da6dc0d4688f5856e0740eb930506 files/di MD5 d4bea1f7f6ea862322b9883d827fbb31 files/digest-ant-owanttask-1.1-r11 259 RMD160 468fdbd46d200d32996a4bd17e8c08d9d80725cc files/digest-ant-owanttask-1.1-r11 259 SHA256 219a7ca453f6a5cf8b07f42ad9b62b70f82da6dc0d4688f5856e0740eb930506 files/digest-ant-owanttask-1.1-r11 259 +MD5 d4bea1f7f6ea862322b9883d827fbb31 files/digest-ant-owanttask-1.1-r12 259 +RMD160 468fdbd46d200d32996a4bd17e8c08d9d80725cc files/digest-ant-owanttask-1.1-r12 259 +SHA256 219a7ca453f6a5cf8b07f42ad9b62b70f82da6dc0d4688f5856e0740eb930506 files/digest-ant-owanttask-1.1-r12 259 diff --git a/dev-java/ant-owanttask/ant-owanttask-1.1-r12.ebuild b/dev-java/ant-owanttask/ant-owanttask-1.1-r12.ebuild new file mode 100644 index 000000000000..39a4206d4120 --- /dev/null +++ b/dev-java/ant-owanttask/ant-owanttask-1.1-r12.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2007 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-r12.ebuild,v 1.1 2007/01/24 17:57:16 caster Exp $ + +inherit java-ant-2 java-pkg-2 eutils + +DESCRIPTION="ObjectWeb's Ant tasks" +HOMEPAGE="http://monolog.objectweb.org" +SRC_URI="http://www.gentoo.org/~karltk/java/distfiles/owanttask-${PV}-gentoo.tar.bz2" +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~x86 ~ppc ~amd64" +IUSE="" +DEPEND=">=virtual/jdk-1.4" +RDEPEND=">=virtual/jre-1.4 + >=dev-java/ant-core-1.7.0 + dev-java/xalan" +S=${WORKDIR}/owanttask-${PV} + +src_unpack() { + unpack ${A} + cd ${S} + epatch ${FILESDIR}/${P}-classpath.patch + + cp -f ${FILESDIR}/MultipleCopy.java src/org/objectweb/util/ant + + mkdir lib + cd lib + java-pkg_jar-from ant-core ant.jar + java-pkg_jar-from xalan +} + +src_compile() { + eant jar +} + +src_install() { + java-pkg_dojar output/lib/ow_util_ant_tasks.jar +} + +pkg_preinst() { + ewarn "The MultipleCopy task is not compatible with ant-1.7.0 and newer" + ewarn "Attempt to use it will break building." +} diff --git a/dev-java/ant-owanttask/files/MultipleCopy.java b/dev-java/ant-owanttask/files/MultipleCopy.java new file mode 100644 index 000000000000..bd6a431bf06c --- /dev/null +++ b/dev-java/ant-owanttask/files/MultipleCopy.java @@ -0,0 +1,12 @@ +package org.objectweb.util.ant; + +import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.taskdefs.Copy; + +public class MultipleCopy extends Copy { + + public void execute() throws BuildException { + throw new BuildException("MultipleCopy is not compatible with ant >=1.7.0"); + } + +} diff --git a/dev-java/ant-owanttask/files/digest-ant-owanttask-1.1-r12 b/dev-java/ant-owanttask/files/digest-ant-owanttask-1.1-r12 new file mode 100644 index 000000000000..d7a543795003 --- /dev/null +++ b/dev-java/ant-owanttask/files/digest-ant-owanttask-1.1-r12 @@ -0,0 +1,3 @@ +MD5 56017c7d84c718156f5e0e4cb05acd0b owanttask-1.1-gentoo.tar.bz2 9275 +RMD160 156f8b6bae7628f64c73d5388a24b558ae77243c owanttask-1.1-gentoo.tar.bz2 9275 +SHA256 b1cfae92078383eb2aadde9fbfdf5a01ca390fb2719c169375c9325014603e82 owanttask-1.1-gentoo.tar.bz2 9275 -- 2.26.2