From 51d5f76d2dded5e412b541f21d09622acdb2c254 Mon Sep 17 00:00:00 2001 From: Vlastimil Babka Date: Sun, 21 Jan 2007 22:19:13 +0000 Subject: [PATCH] Disable self-dependency that would be caused by soon-to-come java-ant-2.eclass change. Package-Manager: portage-2.1.2-r1 --- dev-java/ant-core/ChangeLog | 7 ++++++- dev-java/ant-core/Manifest | 16 ++++++++-------- dev-java/ant-core/ant-core-1.6.5-r14.ebuild | 5 +++-- 3 files changed, 17 insertions(+), 11 deletions(-) diff --git a/dev-java/ant-core/ChangeLog b/dev-java/ant-core/ChangeLog index 13651e26aa99..48062b2cd5bf 100644 --- a/dev-java/ant-core/ChangeLog +++ b/dev-java/ant-core/ChangeLog @@ -1,11 +1,16 @@ # ChangeLog for dev-java/ant-core # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ChangeLog,v 1.60 2007/01/21 21:56:58 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ChangeLog,v 1.61 2007/01/21 22:19:13 caster Exp $ # Ant-core blocks lower/older versions of ant-tasks, # since it will not run when there is a version mismatch betwean the 2 packages # Please unemerge ant-tasks when updating ant-core. + 21 Jan 2007; Vlastimil Babka + ant-core-1.6.5-r14.ebuild: + Disable self-dependency that would be caused by soon-to-come + java-ant-2.eclass change. + *ant-core-1.7.0 (21 Jan 2007) 21 Jan 2007; Vlastimil Babka +files/1.7.0-ant, diff --git a/dev-java/ant-core/Manifest b/dev-java/ant-core/Manifest index 743e05833682..34fcc6e552b8 100644 --- a/dev-java/ant-core/Manifest +++ b/dev-java/ant-core/Manifest @@ -13,18 +13,18 @@ SHA256 bafac89599d2d5bbb8f17060e39922a01891826251925e39be2df38170d88e2b files/bu DIST ant-1.7.0-gentoo.tar.bz2 11720 RMD160 51d24f2c0c98195ed6ef1852045201a567a5d9ea SHA1 41acb8398a5ac9713dec30d6305b5abc6c014fff SHA256 7b1e0c63bec193c010c3fcca7a3524e2e35cc4ca56b86e4571737ac1e169e35c DIST apache-ant-1.6.5-src.tar.bz2 6283500 RMD160 4680b53cd72d4915b9ca2bbe2131a71fcf505a84 SHA1 08e838c506ee580f5d220401a974c757ea80365d SHA256 f3ef501f06bf1dac88981038ebd5311c738bf2d50d220de85c3e6c7656169d59 DIST apache-ant-1.7.0-src.tar.bz2 6831017 RMD160 e18ecde1996401f03529d80d2b6f3be2c55e64ab SHA1 3f01c35265ba50a49caafe1fb34ec8998bf45eb3 SHA256 a6698e8420f6d1cefd9e02c5a6b610b84495a3f9bfe1fc9e1b4fe8a8769e3779 -EBUILD ant-core-1.6.5-r14.ebuild 1883 RMD160 8fc379df9e583076cd2314e10d6f9986299b44cf SHA1 428a16d0c296f3c982ce22ed8f8e06d8a0ff5f64 SHA256 b02128de706b3d18831d8c73ac79180d1efebd835716c604227da8932780a800 -MD5 cf61cd3889944dd8a7adf4191980cdb4 ant-core-1.6.5-r14.ebuild 1883 -RMD160 8fc379df9e583076cd2314e10d6f9986299b44cf ant-core-1.6.5-r14.ebuild 1883 -SHA256 b02128de706b3d18831d8c73ac79180d1efebd835716c604227da8932780a800 ant-core-1.6.5-r14.ebuild 1883 +EBUILD ant-core-1.6.5-r14.ebuild 1918 RMD160 d4baa54a15d40ed6e1637647a9b4763460483eef SHA1 6e126c985cb5a8648e25bd3da95957e28e80331c SHA256 d6b721213737928c36e8bd8b426ccd214e81596f8a3a9202268cd391f43ea68b +MD5 e215468b2b9040222c18bb54f932f85c ant-core-1.6.5-r14.ebuild 1918 +RMD160 d4baa54a15d40ed6e1637647a9b4763460483eef ant-core-1.6.5-r14.ebuild 1918 +SHA256 d6b721213737928c36e8bd8b426ccd214e81596f8a3a9202268cd391f43ea68b ant-core-1.6.5-r14.ebuild 1918 EBUILD ant-core-1.7.0.ebuild 2138 RMD160 158314bad484308882854bd1b3e18062549e8319 SHA1 77fb916f6e14e0bc1fc3f586ff1309984d63d0aa SHA256 1bcc38a53e13f2e18937121bd72ee6d7fcb49e73a25b89f3b51c2c1155283ffd MD5 38525e33b39ca5b5979ed6dde9251302 ant-core-1.7.0.ebuild 2138 RMD160 158314bad484308882854bd1b3e18062549e8319 ant-core-1.7.0.ebuild 2138 SHA256 1bcc38a53e13f2e18937121bd72ee6d7fcb49e73a25b89f3b51c2c1155283ffd ant-core-1.7.0.ebuild 2138 -MISC ChangeLog 22897 RMD160 f5a0c075c9ecbcd7c8c30e3d28fb12e18de58e7e SHA1 61dc2a87f5d310cd9d833b10f0511baac2fd07b3 SHA256 ff571d2f5feaac97e37b62cd4c3fa38fd144e654e465f81ca72c3e901ff2bbc9 -MD5 2a12ef19797491d5a0b1e897307403d0 ChangeLog 22897 -RMD160 f5a0c075c9ecbcd7c8c30e3d28fb12e18de58e7e ChangeLog 22897 -SHA256 ff571d2f5feaac97e37b62cd4c3fa38fd144e654e465f81ca72c3e901ff2bbc9 ChangeLog 22897 +MISC ChangeLog 23069 RMD160 33f6d6d735cdf65166e3c6fb3399b15b85cdc18c SHA1 4fdea80dc5af60e1feb2954cd964ed176e4b2740 SHA256 92852d7c4507cae654487cebc36d1cc4beccbf46917e50ff7816d6b0962a01b8 +MD5 961e4a4cea323fdbd6bca7eacfb16b96 ChangeLog 23069 +RMD160 33f6d6d735cdf65166e3c6fb3399b15b85cdc18c ChangeLog 23069 +SHA256 92852d7c4507cae654487cebc36d1cc4beccbf46917e50ff7816d6b0962a01b8 ChangeLog 23069 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 metadata.xml 158 diff --git a/dev-java/ant-core/ant-core-1.6.5-r14.ebuild b/dev-java/ant-core/ant-core-1.6.5-r14.ebuild index 821a081cc11e..a990f2cf7071 100644 --- a/dev-java/ant-core/ant-core-1.6.5-r14.ebuild +++ b/dev-java/ant-core/ant-core-1.6.5-r14.ebuild @@ -1,7 +1,8 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ant-core-1.6.5-r14.ebuild,v 1.10 2006/12/09 12:52:38 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ant-core-1.6.5-r14.ebuild,v 1.11 2007/01/21 22:19:13 caster Exp $ +JAVA_ANT_DISABLE_ANT_CORE_DEP=true inherit java-pkg-2 eutils toolchain-funcs java-ant-2 MY_PN=${PN/-core} -- 2.26.2