From 138bbdd587b1992d0dfa34a57affeedeb9ba34e1 Mon Sep 17 00:00:00 2001 From: Vlastimil Babka Date: Wed, 25 Apr 2007 20:45:54 +0000 Subject: [PATCH] Clean unused version. Package-Manager: portage-2.1.2.4 --- dev-java/ant-tasks/ChangeLog | 6 +- dev-java/ant-tasks/Manifest | 22 +--- dev-java/ant-tasks/ant-tasks-1.7.0-r1.ebuild | 119 ------------------ dev-java/ant-tasks/ant-tasks-1.7.0.ebuild | 98 --------------- .../ant-tasks/files/digest-ant-tasks-1.7.0 | 0 .../ant-tasks/files/digest-ant-tasks-1.7.0-r1 | 0 6 files changed, 9 insertions(+), 236 deletions(-) delete mode 100644 dev-java/ant-tasks/ant-tasks-1.7.0-r1.ebuild delete mode 100644 dev-java/ant-tasks/ant-tasks-1.7.0.ebuild delete mode 100644 dev-java/ant-tasks/files/digest-ant-tasks-1.7.0 delete mode 100644 dev-java/ant-tasks/files/digest-ant-tasks-1.7.0-r1 diff --git a/dev-java/ant-tasks/ChangeLog b/dev-java/ant-tasks/ChangeLog index 9f0d574f6d34..da665a0f5775 100644 --- a/dev-java/ant-tasks/ChangeLog +++ b/dev-java/ant-tasks/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-java/ant-tasks # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-tasks/ChangeLog,v 1.59 2007/03/28 09:36:43 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-tasks/ChangeLog,v 1.60 2007/04/25 20:45:54 caster Exp $ + + 25 Apr 2007; Vlastimil Babka -ant-tasks-1.7.0.ebuild, + -ant-tasks-1.7.0-r1.ebuild: + Clean unused version. *ant-tasks-1.7.0-r2 (28 Mar 2007) diff --git a/dev-java/ant-tasks/Manifest b/dev-java/ant-tasks/Manifest index 53b9475a020f..9b53a0001d78 100644 --- a/dev-java/ant-tasks/Manifest +++ b/dev-java/ant-tasks/Manifest @@ -3,22 +3,14 @@ EBUILD ant-tasks-1.6.5-r3.ebuild 3397 RMD160 e956b0d3265d3995fe6b949013ad0a9a973 MD5 5b2bd0964c8b921c3b0ae1347fe51bf4 ant-tasks-1.6.5-r3.ebuild 3397 RMD160 e956b0d3265d3995fe6b949013ad0a9a973d9054 ant-tasks-1.6.5-r3.ebuild 3397 SHA256 3c9ce4677736a7dde8cae241013dfb392be1222f4b479b6c0c01593ee76a263b ant-tasks-1.6.5-r3.ebuild 3397 -EBUILD ant-tasks-1.7.0-r1.ebuild 4000 RMD160 61f732a1a7b39b5a83fac382578f20b31d7d34a9 SHA1 32000562cc23e1d43e4e4467fce06d8a87b6512e SHA256 377fe4f7c30b2962fdde8a88f6ec68134d8ad114e1f2adaa75b26bbbab7f9f40 -MD5 c5c4bbfae95e78b9367aa227c8303984 ant-tasks-1.7.0-r1.ebuild 4000 -RMD160 61f732a1a7b39b5a83fac382578f20b31d7d34a9 ant-tasks-1.7.0-r1.ebuild 4000 -SHA256 377fe4f7c30b2962fdde8a88f6ec68134d8ad114e1f2adaa75b26bbbab7f9f40 ant-tasks-1.7.0-r1.ebuild 4000 EBUILD ant-tasks-1.7.0-r2.ebuild 4009 RMD160 96d68320a857558bdebef2ec4564b8812c21c7f3 SHA1 a78b9941305fc652b943ec51d138a9aa4b465070 SHA256 8d27f53bd27e9ba639c7670f9d040d8fcac222fddc07d106c5291b649c8e1f1e MD5 f23b7bcf7a3bf69f4e6246c7825e4e8d ant-tasks-1.7.0-r2.ebuild 4009 RMD160 96d68320a857558bdebef2ec4564b8812c21c7f3 ant-tasks-1.7.0-r2.ebuild 4009 SHA256 8d27f53bd27e9ba639c7670f9d040d8fcac222fddc07d106c5291b649c8e1f1e ant-tasks-1.7.0-r2.ebuild 4009 -EBUILD ant-tasks-1.7.0.ebuild 3210 RMD160 c9d6629ffcbcdca4de47c33a9bc41d9d899b0f46 SHA1 c9ce17b16740189b9510cadc02f6e70e1284ee9b SHA256 d87072bc9d3d618920dfa0f72cf3faaa51622ef45f0309f7b3eaed9001fdd7b5 -MD5 280f1da862ef71318a9762c1f2e0cb08 ant-tasks-1.7.0.ebuild 3210 -RMD160 c9d6629ffcbcdca4de47c33a9bc41d9d899b0f46 ant-tasks-1.7.0.ebuild 3210 -SHA256 d87072bc9d3d618920dfa0f72cf3faaa51622ef45f0309f7b3eaed9001fdd7b5 ant-tasks-1.7.0.ebuild 3210 -MISC ChangeLog 14614 RMD160 34ae5ab674fe03c641382ad62f61763643621332 SHA1 f214be072f6298ef1ff257aec0fd89ccbb69bdfe SHA256 07f5423f87f8ae9bd31e94f8e52da0483cf3ccfc8f49578cba82db2572a83c96 -MD5 ff12420a0e3a58e63d8ebb4397a8ac1b ChangeLog 14614 -RMD160 34ae5ab674fe03c641382ad62f61763643621332 ChangeLog 14614 -SHA256 07f5423f87f8ae9bd31e94f8e52da0483cf3ccfc8f49578cba82db2572a83c96 ChangeLog 14614 +MISC ChangeLog 14745 RMD160 48f03b2e71948ea579e1afdf76219197d5df5040 SHA1 89ecc737f039942d98994127f562b19fb66cc9d7 SHA256 b9c8dc8b5ab3d576fafc22e31e655910b9145945c39ea7626077a29c2e36cca6 +MD5 892d4393b0bdad88946d8b59c4a75487 ChangeLog 14745 +RMD160 48f03b2e71948ea579e1afdf76219197d5df5040 ChangeLog 14745 +SHA256 b9c8dc8b5ab3d576fafc22e31e655910b9145945c39ea7626077a29c2e36cca6 ChangeLog 14745 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 metadata.xml 158 @@ -26,12 +18,6 @@ SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb metadata MD5 31de0486a830c545c91a089241b3bb9a files/digest-ant-tasks-1.6.5-r3 268 RMD160 3a54cfc35c821291722b58076e3524c513ee1dc2 files/digest-ant-tasks-1.6.5-r3 268 SHA256 6d25121ad88d0c2a4d0822cff5bb2d50c9f6886369b452882476811f65c1b8f5 files/digest-ant-tasks-1.6.5-r3 268 -MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-ant-tasks-1.7.0 0 -RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-ant-tasks-1.7.0 0 -SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-ant-tasks-1.7.0 0 -MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-ant-tasks-1.7.0-r1 0 -RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-ant-tasks-1.7.0-r1 0 -SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-ant-tasks-1.7.0-r1 0 MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-ant-tasks-1.7.0-r2 0 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-ant-tasks-1.7.0-r2 0 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-ant-tasks-1.7.0-r2 0 diff --git a/dev-java/ant-tasks/ant-tasks-1.7.0-r1.ebuild b/dev-java/ant-tasks/ant-tasks-1.7.0-r1.ebuild deleted file mode 100644 index 192c0fc5a008..000000000000 --- a/dev-java/ant-tasks/ant-tasks-1.7.0-r1.ebuild +++ /dev/null @@ -1,119 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-tasks/ant-tasks-1.7.0-r1.ebuild,v 1.1 2007/03/11 00:37:02 caster Exp $ - -inherit java-pkg-2 eutils - -DESCRIPTION="Meta-package for Apache Ant's optional tasks." -HOMEPAGE="http://ant.apache.org/" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd" -IUSE="jai javamail noantlr nobcel nobsf nocommonsnet nocommonslogging nojdepend - nojmf nojsch nolog4j nooro noregexp noresolver noswing noxalan" -# nobeanutils nobsh nojython norhino noxerces - -RDEPEND=">=virtual/jre-1.4 - ~dev-java/ant-core-${PV} - ~dev-java/ant-nodeps-${PV} - ~dev-java/ant-junit-${PV} - !dev-java/ant-optional - !noantlr? ( ~dev-java/ant-antlr-${PV} ) - !nobcel? ( ~dev-java/ant-apache-bcel-${PV} ) - !nobsf? ( ~dev-java/ant-apache-bsf-${PV} ) - !nolog4j? ( ~dev-java/ant-apache-log4j-${PV} ) - !nooro? ( ~dev-java/ant-apache-oro-${PV} ) - !noregexp? ( ~dev-java/ant-apache-regexp-${PV} ) - !noresolver? ( ~dev-java/ant-apache-resolver-${PV} ) - !nocommonslogging? ( ~dev-java/ant-commons-logging-${PV} ) - !nocommonsnet? ( ~dev-java/ant-commons-net-${PV} ) - jai? ( ~dev-java/ant-jai-${PV} ) - javamail? ( ~dev-java/ant-javamail-${PV} ) - !nojdepend? ( ~dev-java/ant-jdepend-${PV} ) - !nojmf? ( ~dev-java/ant-jmf-${PV} ) - !nojsch? ( ~dev-java/ant-jsch-${PV} ) - !noswing? ( ~dev-java/ant-swing-${PV} ) - !noxalan? ( ~dev-java/ant-trax-${PV} )" - -# TODO: consider those -# !noxerces? ( >=dev-java/xerces-2.6.2-r1 ) -# !nobsh? ( >=dev-java/bsh-1.2-r7 ) -# !nobeanutils? ( =dev-java/commons-beanutils-1.6* ) -# !norhino? ( =dev-java/rhino-1.5* ) -# !nojython? ( >=dev-java/jython-2.1-r5 ) - -DEPEND=">=virtual/jdk-1.4 - ${RDEPEND}" - -S="${WORKDIR}" - -src_compile() { :; } - -my_reg_jars() { - # Recording jars to get the same behaviour as before - local oldifs="${IFS}" - IFS=":" - for jar in $(java-pkg_getjars ${1}); do - # these two are only for tasks, not core - if [[ "${1}" != ant-core ]]; then - # this one for package.env, thus java-config -p etc - java-pkg_regjar "${jar}" - # this one for broken stuff with hardcoded paths - dosym ${jar} /usr/share/${PN}/lib/ - fi - # this one for the non-split $ANT_HOME/lib expected by stuff that - # doesn't use the launcher (eclipse, ...) - dosym ${jar} /usr/share/ant/lib/ - done - IFS="${oldifs}" -} - -src_install() { - # create the fake ANT_HOME with symlinks to all ant jars - # starting with ant-core - dodir /usr/share/ant/lib - my_reg_jars ant-core - # just in case - dosym /usr/share/ant-core/bin /usr/share/ant/bin - - # now process the tasks - use !noantlr && my_reg_jars ant-antlr - use !nobcel && my_reg_jars ant-apache-bcel - use !nobsf && my_reg_jars ant-apache-bsf - use !nolog4j && my_reg_jars ant-apache-log4j - use !nooro && my_reg_jars ant-apache-oro - use !noregexp && my_reg_jars ant-apache-regexp - use !noresolver && my_reg_jars ant-apache-resolver - use !nocommonslogging && my_reg_jars ant-commons-logging - use !nocommonsnet && my_reg_jars ant-commons-net - use jai && my_reg_jars ant-jai - use javamail && my_reg_jars ant-javamail - use !nojdepend && my_reg_jars ant-jdepend - use !nojmf && my_reg_jars ant-jmf - use !nojsch && my_reg_jars ant-jsch - my_reg_jars ant-junit - use !noswing && my_reg_jars ant-swing - use !noxalan && my_reg_jars ant-trax - - # point ANT_HOME to the one with all symlinked jars - # ant-core startup script will ignore this one anyway - echo "ANT_HOME=\"/usr/share/ant\"" > ${T}/21ant-tasks - doenvd ${T}/21ant-tasks || die "failed to install env.d file" -} - -pkg_postinst() { - local noset=false - for x in ${IUSE} ; do - if [ "${x:0:2}" == "no" ] ; then - use ${x} && noset=true - fi - done - if [ ${noset} == "true" ]; then - ewarn "You have disabled some of the ant tasks. Be advised that this may" - ewarn "break building some of the Java packages!!" - ewarn "" - ewarn "We can only offer very limited support in cases where dev-java/ant-tasks" - ewarn "has been build with essential features disabled." - fi -} diff --git a/dev-java/ant-tasks/ant-tasks-1.7.0.ebuild b/dev-java/ant-tasks/ant-tasks-1.7.0.ebuild deleted file mode 100644 index 4c02c57cf263..000000000000 --- a/dev-java/ant-tasks/ant-tasks-1.7.0.ebuild +++ /dev/null @@ -1,98 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-tasks/ant-tasks-1.7.0.ebuild,v 1.7 2007/02/09 18:58:58 betelgeuse Exp $ - -inherit java-pkg-2 eutils - -DESCRIPTION="Meta-package for Apache Ant's optional tasks." -HOMEPAGE="http://ant.apache.org/" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd" -IUSE="jai javamail noantlr nobcel nobsf nocommonsnet nocommonslogging nojdepend - nojmf nojsch nolog4j nooro noregexp noresolver noswing noxalan" -# nobeanutils nobsh nojython norhino noxerces - -RDEPEND=">=virtual/jre-1.4 - ~dev-java/ant-core-${PV} - ~dev-java/ant-nodeps-${PV} - ~dev-java/ant-junit-${PV} - !dev-java/ant-optional - !noantlr? ( ~dev-java/ant-antlr-${PV} ) - !nobcel? ( ~dev-java/ant-apache-bcel-${PV} ) - !nobsf? ( ~dev-java/ant-apache-bsf-${PV} ) - !nolog4j? ( ~dev-java/ant-apache-log4j-${PV} ) - !nooro? ( ~dev-java/ant-apache-oro-${PV} ) - !noregexp? ( ~dev-java/ant-apache-regexp-${PV} ) - !noresolver? ( ~dev-java/ant-apache-resolver-${PV} ) - !nocommonslogging? ( ~dev-java/ant-commons-logging-${PV} ) - !nocommonsnet? ( ~dev-java/ant-commons-net-${PV} ) - jai? ( ~dev-java/ant-jai-${PV} ) - javamail? ( ~dev-java/ant-javamail-${PV} ) - !nojdepend? ( ~dev-java/ant-jdepend-${PV} ) - !nojmf? ( ~dev-java/ant-jmf-${PV} ) - !nojsch? ( ~dev-java/ant-jsch-${PV} ) - !noswing? ( ~dev-java/ant-swing-${PV} ) - !noxalan? ( ~dev-java/ant-trax-${PV} )" - -# TODO: consider those -# !noxerces? ( >=dev-java/xerces-2.6.2-r1 ) -# !nobsh? ( >=dev-java/bsh-1.2-r7 ) -# !nobeanutils? ( =dev-java/commons-beanutils-1.6* ) -# !norhino? ( =dev-java/rhino-1.5* ) -# !nojython? ( >=dev-java/jython-2.1-r5 ) - -DEPEND=">=virtual/jdk-1.4 - ${RDEPEND}" - -S="${WORKDIR}" - -src_compile() { :; } - -my_reg_jars() { - # Recording jars to get the same behaviour as before - local oldifs="${IFS}" - IFS=":" - for jar in $(java-pkg_getjars ${1}); do - java-pkg_regjar "${jar}" - dosym ${jar} /usr/share/${PN}/lib/ - done - IFS="${oldifs}" -} - -src_install() { - use !noantlr && my_reg_jars ant-antlr - use !nobcel && my_reg_jars ant-apache-bcel - use !nobsf && my_reg_jars ant-apache-bsf - use !nolog4j && my_reg_jars ant-apache-log4j - use !nooro && my_reg_jars ant-apache-oro - use !noregexp && my_reg_jars ant-apache-regexp - use !noresolver && my_reg_jars ant-apache-resolver - use !nocommonslogging && my_reg_jars ant-commons-logging - use !nocommonsnet && my_reg_jars ant-commons-net - use jai && my_reg_jars ant-jai - use javamail && my_reg_jars ant-javamail - use !nojdepend && my_reg_jars ant-jdepend - use !nojmf && my_reg_jars ant-jmf - use !nojsch && my_reg_jars ant-jsch - my_reg_jars ant-junit - use !noswing && my_reg_jars ant-swing - use !noxalan && my_reg_jars ant-trax -} - -pkg_postinst() { - local noset=false - for x in ${IUSE} ; do - if [ "${x:0:2}" == "no" ] ; then - use ${x} && noset=true - fi - done - if [ ${noset} == "true" ]; then - ewarn "You have disabled some of the ant tasks. Be advised that this may" - ewarn "break building some of the Java packages!!" - ewarn "" - ewarn "We can only offer very limited support in cases where dev-java/ant-tasks" - ewarn "has been build with essential features disabled." - fi -} diff --git a/dev-java/ant-tasks/files/digest-ant-tasks-1.7.0 b/dev-java/ant-tasks/files/digest-ant-tasks-1.7.0 deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/dev-java/ant-tasks/files/digest-ant-tasks-1.7.0-r1 b/dev-java/ant-tasks/files/digest-ant-tasks-1.7.0-r1 deleted file mode 100644 index e69de29bb2d1..000000000000 -- 2.26.2