From: Petteri Räty Date: Fri, 20 Apr 2007 10:41:42 +0000 (+0000) Subject: Add dev-java/xalan to DEPEND. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4ce58ecc46c2fc63d233f7f939bded166e077d44;p=gentoo.git Add dev-java/xalan to DEPEND. Package-Manager: portage-2.1.2.4 --- diff --git a/dev-java/ant-owanttask/ChangeLog b/dev-java/ant-owanttask/ChangeLog index 88265618e58d..00b05c006325 100644 --- a/dev-java/ant-owanttask/ChangeLog +++ b/dev-java/ant-owanttask/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-java/ant-owanttask # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-owanttask/ChangeLog,v 1.21 2007/02/11 00:16:07 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-owanttask/ChangeLog,v 1.22 2007/04/20 10:41:42 betelgeuse Exp $ + + 20 Apr 2007; Petteri Räty + ant-owanttask-1.1-r12.ebuild: + Add dev-java/xalan to DEPEND. 11 Feb 2007; Vlastimil Babka -ant-owanttask-1.1-r1.ebuild: @@ -37,6 +41,8 @@ +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 +*ant-owanttask-1.1-r11 (01 Jul 2006) + 01 Jul 2006; Joshua Nichols +ant-owanttask-1.1-r11.ebuild: Revision bump to use new Java system. diff --git a/dev-java/ant-owanttask/Manifest b/dev-java/ant-owanttask/Manifest index 92732e2a52e2..05ca6b2e609b 100644 --- a/dev-java/ant-owanttask/Manifest +++ b/dev-java/ant-owanttask/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX MultipleCopy.java 295 RMD160 f467af55764b4d43337bf382ff5dd5ff443950c3 SHA1 c10ce2fa34d45b0eaf966d13fa0f59068b25ef8a SHA256 81589be71d092b5e56d6e27f917d374c8e1ae684961792dc9ae063052b4d3352 MD5 581f43807966974bf69dd1b0a178a608 files/MultipleCopy.java 295 RMD160 f467af55764b4d43337bf382ff5dd5ff443950c3 files/MultipleCopy.java 295 @@ -11,14 +14,14 @@ EBUILD ant-owanttask-1.1-r11.ebuild 1014 RMD160 6b24417a1e17b4f8adebe9aac527f093 MD5 4be5f3751d3fb3f5d866a500188826d9 ant-owanttask-1.1-r11.ebuild 1014 RMD160 6b24417a1e17b4f8adebe9aac527f09357c715e1 ant-owanttask-1.1-r11.ebuild 1014 SHA256 71253d232595c16f6f482c1d59df5565c88e416f68c12bfb588623fa064e0e8b ant-owanttask-1.1-r11.ebuild 1014 -EBUILD ant-owanttask-1.1-r12.ebuild 1090 RMD160 3539d0c13f844aa71eccde2f4b4d9f1853247adf SHA1 8813a133ae62d5c8a6027cb2121e1b18f45ae117 SHA256 38393f387dd0c288a66f09030850cd2591aad9513b5fc1e66e478ea5fcdf7fa9 -MD5 fd6eb2083344f9fbf5eec89a790289ab ant-owanttask-1.1-r12.ebuild 1090 -RMD160 3539d0c13f844aa71eccde2f4b4d9f1853247adf ant-owanttask-1.1-r12.ebuild 1090 -SHA256 38393f387dd0c288a66f09030850cd2591aad9513b5fc1e66e478ea5fcdf7fa9 ant-owanttask-1.1-r12.ebuild 1090 -MISC ChangeLog 2558 RMD160 23bbfac3aff5634ff1b4ec6dfee829486a87d6b3 SHA1 ff53e76fc251199984c4650961e69f2fcf837e9b SHA256 391a4e45f0e404fa408056c26c506a218a2187a57313e2529004c98b81627c96 -MD5 5408351cb5d852ed88fb39fc36c80ebc ChangeLog 2558 -RMD160 23bbfac3aff5634ff1b4ec6dfee829486a87d6b3 ChangeLog 2558 -SHA256 391a4e45f0e404fa408056c26c506a218a2187a57313e2529004c98b81627c96 ChangeLog 2558 +EBUILD ant-owanttask-1.1-r12.ebuild 1122 RMD160 e3998d98cc937d62cf49628abb9c56d0f5d17c97 SHA1 7034355e865aee621f07fbecb7035b0456b56b9c SHA256 88d5c6520519126af9e6cd0132dade1996a109d88c36ec0d904cd3243a95aab8 +MD5 5f9b7d416f17cde2d6d48635339284ae ant-owanttask-1.1-r12.ebuild 1122 +RMD160 e3998d98cc937d62cf49628abb9c56d0f5d17c97 ant-owanttask-1.1-r12.ebuild 1122 +SHA256 88d5c6520519126af9e6cd0132dade1996a109d88c36ec0d904cd3243a95aab8 ant-owanttask-1.1-r12.ebuild 1122 +MISC ChangeLog 2718 RMD160 dfbf55dadc38c4e86bf2d9ff8168918009d5d920 SHA1 6dc49c39acc69c82c4559a080d6419070af724d3 SHA256 8bf48ce345b87c193baa35de51ff972fb8ddc248048296f1cbdbe045b7ce4eba +MD5 c0c0aa8b6d0a1a044995bd1550046548 ChangeLog 2718 +RMD160 dfbf55dadc38c4e86bf2d9ff8168918009d5d920 ChangeLog 2718 +SHA256 8bf48ce345b87c193baa35de51ff972fb8ddc248048296f1cbdbe045b7ce4eba ChangeLog 2718 MISC metadata.xml 158 RMD160 d71171daf5fa0ea076b61129327d757cc9c75225 SHA1 b9baf1a1cb9a7070400cd44b2f9b35d59b9c17a1 SHA256 6f42ac97aed8ab989921aa4a0f8c45b167af3c6dc25811326d7f6cf1ccb9d189 MD5 0cc53bfb30a3ec902aabe97af1698512 metadata.xml 158 RMD160 d71171daf5fa0ea076b61129327d757cc9c75225 metadata.xml 158 @@ -29,3 +32,10 @@ SHA256 219a7ca453f6a5cf8b07f42ad9b62b70f82da6dc0d4688f5856e0740eb930506 files/di 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 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.3 (GNU/Linux) + +iD8DBQFGKJjwcxLzpIGCsLQRAjo2AJ0anmI9H4CJVHh+DQsB1AF2hNKoOgCgmqN3 +d+jDCYyprbsZNz9tUrE0yyk= +=pN7e +-----END PGP SIGNATURE----- diff --git a/dev-java/ant-owanttask/ant-owanttask-1.1-r12.ebuild b/dev-java/ant-owanttask/ant-owanttask-1.1-r12.ebuild index abeaf88baa24..458d0a85a153 100644 --- a/dev-java/ant-owanttask/ant-owanttask-1.1-r12.ebuild +++ b/dev-java/ant-owanttask/ant-owanttask-1.1-r12.ebuild @@ -1,28 +1,32 @@ # 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.2 2007/01/30 00:05:12 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-owanttask/ant-owanttask-1.1-r12.ebuild,v 1.3 2007/04/20 10:41:42 betelgeuse Exp $ inherit eutils java-pkg-2 java-ant-2 DESCRIPTION="ObjectWeb's Ant tasks" HOMEPAGE="http://monolog.objectweb.org" -SRC_URI="http://www.gentoo.org/~karltk/java/distfiles/owanttask-${PV}-gentoo.tar.bz2" +MY_P="owanttask-${PV}" +SRC_URI="http://www.gentoo.org/~karltk/java/distfiles/${MY_P}-gentoo.tar.bz2" LICENSE="LGPL-2.1" SLOT="0" KEYWORDS="~x86 ~ppc ~amd64" IUSE="" -DEPEND=">=virtual/jdk-1.4" +COMMON_DEP="dev-java/xalan" +DEPEND=">=virtual/jdk-1.4 + ${COMMON_DEP}" RDEPEND=">=virtual/jre-1.4 >=dev-java/ant-core-1.7.0 - dev-java/xalan" -S=${WORKDIR}/owanttask-${PV} + ${COMMON_DEP}" + +S=${WORKDIR}/${MY_P} src_unpack() { unpack ${A} - cd ${S} - epatch ${FILESDIR}/${P}-classpath.patch + cd "${S}" + epatch "${FILESDIR}/${P}-classpath.patch" - cp -f ${FILESDIR}/MultipleCopy.java src/org/objectweb/util/ant + cp -f "${FILESDIR}/MultipleCopy.java" src/org/objectweb/util/ant mkdir lib cd lib @@ -30,15 +34,11 @@ src_unpack() { java-pkg_jar-from xalan } -src_compile() { - eant jar -} - src_install() { java-pkg_dojar output/lib/ow_util_ant_tasks.jar } -pkg_preinst() { +pkg_postinst() { ewarn "The MultipleCopy task is not compatible with ant-1.7.0 and newer" ewarn "Attempt to use it will break building." }