amd64 stable, bug #177362.Removed past versions in same slot.
authorWilliam Thomson <wltjr@gentoo.org>
Mon, 3 Mar 2008 00:55:03 +0000 (00:55 +0000)
committerWilliam Thomson <wltjr@gentoo.org>
Mon, 3 Mar 2008 00:55:03 +0000 (00:55 +0000)
Package-Manager: portage-2.1.4.1

dev-java/ant-tasks/ChangeLog
dev-java/ant-tasks/Manifest
dev-java/ant-tasks/ant-tasks-1.7.0-r2.ebuild [deleted file]
dev-java/ant-tasks/ant-tasks-1.7.0-r3.ebuild [deleted file]
dev-java/ant-tasks/ant-tasks-1.7.0-r4.ebuild

index b7cffad00e207c8e9a6afb2acd500e4a7acbf1f8..0857e9a977cbeefa5ae80e9b6848ef039845fa1e 100644 (file)
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/ant-tasks
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-tasks/ChangeLog,v 1.78 2008/01/22 02:14:27 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-tasks/ChangeLog,v 1.79 2008/03/03 00:55:03 wltjr Exp $
+
+  03 Mar 2008; William L. Thomson Jr. <wltjr@gentoo.org>
+  -ant-tasks-1.7.0-r2.ebuild, -ant-tasks-1.7.0-r3.ebuild,
+  ant-tasks-1.7.0-r4.ebuild:
+  amd64 stable, bug #177362.Removed past versions in same slot.
 
   22 Jan 2008; Brent Baude <ranger@gentoo.org> ant-tasks-1.7.0-r4.ebuild:
   Marking ant-tasks-1.7.0-r4 ppc64 for bug 177362
index e8fe1c689689514c65206d472b3a0cd666876061..080198eec0315c8d25a0932d845de80e0739f2be 100644 (file)
@@ -1,7 +1,5 @@
 DIST apache-ant-1.6.5-src.tar.bz2 6283500 RMD160 4680b53cd72d4915b9ca2bbe2131a71fcf505a84 SHA1 08e838c506ee580f5d220401a974c757ea80365d SHA256 f3ef501f06bf1dac88981038ebd5311c738bf2d50d220de85c3e6c7656169d59
 EBUILD ant-tasks-1.6.5-r4.ebuild 3432 RMD160 f1cc44de605f3175f1ea84cc5a79c4f0c3675404 SHA1 9f6d517ee9db4bfea0d38e40a145ab318282132a SHA256 28033fdd909e6bbe8b69d575e273e27dd367ef06875248e2dcf6036569997d82
-EBUILD ant-tasks-1.7.0-r2.ebuild 3991 RMD160 96a0788097853338512aaf72587dff198dcee671 SHA1 e50e27475dc2b1bb03ba115c527dfaba593053aa SHA256 80f837cca99db720b4a31cc1487bf2221e522e715531ead00f3f022c4ca7f68c
-EBUILD ant-tasks-1.7.0-r3.ebuild 3273 RMD160 570b4283ed283cef1bcc7b99d1a91659aa2007da SHA1 efe6309c057b52328fc455f29d1bcbe2bd15d170 SHA256 db72bd7f51e47f97be3fe9692482feca46602b50340a040df1ae72b2091a03a0
-EBUILD ant-tasks-1.7.0-r4.ebuild 3372 RMD160 0e09cd5f897322e467c43dc1a1e3f5a83b3c4fa8 SHA1 e03a4f426464fe5750635d24d7921c8d91514b86 SHA256 b7ae94d7f924bb0fcbe8144038e07720c817939f187081ae51be536dcacc10fb
-MISC ChangeLog 17081 RMD160 b5b552ee7c1754f01e164bf3ff663aabc06ed922 SHA1 2429a44a90d483c3e4391adb80b586014833ccd5 SHA256 267b7728fc629175367e34adcb9c1801113c48dcd7f1d87852b2594e06000837
+EBUILD ant-tasks-1.7.0-r4.ebuild 3370 RMD160 23ad0047ec93de53885f7224651925d829c8e5fe SHA1 3ae4bb13117a50aab1f18fa9e7d355844b740555 SHA256 02b42ec7bc8e8345715e9b142d4d0f7f4f18b84264457f571dc670700bd80007
+MISC ChangeLog 17289 RMD160 35c97f983d65adf55c0eeab55b8628eea2e4d48c SHA1 bc1061e50685472776d038e2128bda9cf2c5132c SHA256 51cb75e7e825945e8aef954345ea5d6aaf7b6d13df61453b4555140e22622183
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
diff --git a/dev-java/ant-tasks/ant-tasks-1.7.0-r2.ebuild b/dev-java/ant-tasks/ant-tasks-1.7.0-r2.ebuild
deleted file mode 100644 (file)
index 95e148b..0000000
+++ /dev/null
@@ -1,118 +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-r2.ebuild,v 1.7 2007/10/30 01:20:18 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 jars="$(java-pkg_getjars ${1})"
-       for jar in ${jars//:/ }; 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
-               dosym ${jar} /usr/share/ant/lib/
-       done
-}
-
-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
-       my_reg_jars ant-nodeps
-       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-r3.ebuild b/dev-java/ant-tasks/ant-tasks-1.7.0-r3.ebuild
deleted file mode 100644 (file)
index 938dce7..0000000
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2008 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-r3.ebuild,v 1.1 2008/01/04 19:18:31 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="X antlr bcel bsf commonslogging commonsnet jai javamail jdepend jmf jsch
-       log4j oro regexp resolver"
-
-RDEPEND=">=virtual/jre-1.4
-       ~dev-java/ant-core-${PV}
-       ~dev-java/ant-nodeps-${PV}
-       ~dev-java/ant-junit-${PV}
-       !dev-java/ant-optional
-       ~dev-java/ant-trax-${PV}
-       antlr? ( ~dev-java/ant-antlr-${PV} )
-       bcel? ( ~dev-java/ant-apache-bcel-${PV} )
-       bsf? ( ~dev-java/ant-apache-bsf-${PV} )
-       log4j? ( ~dev-java/ant-apache-log4j-${PV} )
-       oro? ( ~dev-java/ant-apache-oro-${PV} )
-       regexp? ( ~dev-java/ant-apache-regexp-${PV} )
-       resolver? ( ~dev-java/ant-apache-resolver-${PV} )
-       commonslogging? ( ~dev-java/ant-commons-logging-${PV} )
-       commonsnet? ( ~dev-java/ant-commons-net-${PV} )
-       jai? ( ~dev-java/ant-jai-${PV} )
-       javamail? ( ~dev-java/ant-javamail-${PV} )
-       jdepend? ( ~dev-java/ant-jdepend-${PV} )
-       jmf? ( ~dev-java/ant-jmf-${PV} )
-       jsch? ( ~dev-java/ant-jsch-${PV} )
-       X? ( ~dev-java/ant-swing-${PV} )"
-
-DEPEND=">=virtual/jdk-1.4
-       ${RDEPEND}"
-
-S="${WORKDIR}"
-
-src_compile() { :; }
-
-my_reg_jars() {
-       # Recording jars to get the same behaviour as before
-       local jars="$(java-pkg_getjars ${1})"
-       for jar in ${jars//:/ }; 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
-               dosym ${jar} /usr/share/ant/lib/
-       done
-}
-
-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
-       my_reg_jars ant-nodeps
-       my_reg_jars ant-junit
-       my_reg_jars ant-trax
-       use antlr && my_reg_jars ant-antlr
-       use bcel && my_reg_jars ant-apache-bcel
-       use bsf && my_reg_jars ant-apache-bsf
-       use log4j && my_reg_jars ant-apache-log4j
-       use oro && my_reg_jars ant-apache-oro
-       use regexp && my_reg_jars ant-apache-regexp
-       use resolver && my_reg_jars ant-apache-resolver
-       use commonslogging && my_reg_jars ant-commons-logging
-       use commonsnet && my_reg_jars ant-commons-net
-       use jai && my_reg_jars ant-jai
-       use javamail && my_reg_jars ant-javamail
-       use jdepend && my_reg_jars ant-jdepend
-       use jmf && my_reg_jars ant-jmf
-       use jsch && my_reg_jars ant-jsch
-
-       use X && my_reg_jars ant-swing
-
-       # 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() {
-       elog "You may now freely set the USE flags of this package without breaking"
-       elog "building of Java packages, which DEPEND on the exact tasks they need."
-}
index 1d9acc3c763c09caeb20b330182b532b130a6bdd..fb6e2becea6c3e57b669642777081bd1af9f58b8 100644 (file)
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 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-r4.ebuild,v 1.4 2008/01/22 02:14:27 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-tasks/ant-tasks-1.7.0-r4.ebuild,v 1.5 2008/03/03 00:55:03 wltjr Exp $
 
 EAPI="1"
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://ant.apache.org/"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ppc ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ia64 ppc ppc64 x86 ~x86-fbsd"
 IUSE="X +antlr +bcel +bsf +commonslogging +commonsnet jai +javamail +jdepend jmf +jsch
        +log4j +oro +regexp +resolver"