Revbump to register also ant-nodeps into package.env which was forgotten. Fixes bug...

Package-Manager: portage-2.1.2.2

diff --git a/dev-java/ant-tasks/ChangeLog b/dev-java/ant-tasks/ChangeLog
index cfb2de962569bfefb38bdc415f66b42539b3e946..9f0d574f6d34c9587844ee51367e407d590596a1 100644 (file)
--- a/dev-java/ant-tasks/ChangeLog
+++ b/dev-java/ant-tasks/ChangeLog
@@ -1,6 +1,13 @@
 # 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.58 2007/03/11 00:37:02 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-tasks/ChangeLog,v 1.59 2007/03/28 09:36:43 caster Exp $
+
+*ant-tasks-1.7.0-r2 (28 Mar 2007)
+
+  28 Mar 2007; Vlastimil Babka <caster@gentoo.org>
+  +ant-tasks-1.7.0-r2.ebuild:
+  Revbump to register also ant-nodeps into package.env which was forgotten.
+  Fixes bug #166864.
 
 *ant-tasks-1.7.0-r1 (11 Mar 2007)
 

diff --git a/dev-java/ant-tasks/Manifest b/dev-java/ant-tasks/Manifest
index 580da7fc01718ad42ed999b56f43e8d069f7c769..53b9475a020f3c81405938340d7fe1786e2eefa3 100644 (file)
--- a/dev-java/ant-tasks/Manifest
+++ b/dev-java/ant-tasks/Manifest
@@ -7,14 +7,18 @@ EBUILD ant-tasks-1.7.0-r1.ebuild 4000 RMD160 61f732a1a7b39b5a83fac382578f20b31d7
 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 14400 RMD160 158b02caa04be7015a0ad8e3547ce393c3663f7d SHA1 a3cc5a82067a30d6fdc7c4280429313090e19322 SHA256 6990477eb9c0e89f0c8d550793ed1620e74443af82bca15bd2160fd057b612ea
-MD5 c12a10b0fbf886e70040647368cd3e6b ChangeLog 14400
-RMD160 158b02caa04be7015a0ad8e3547ce393c3663f7d ChangeLog 14400
-SHA256 6990477eb9c0e89f0c8d550793ed1620e74443af82bca15bd2160fd057b612ea ChangeLog 14400
+MISC ChangeLog 14614 RMD160 34ae5ab674fe03c641382ad62f61763643621332 SHA1 f214be072f6298ef1ff257aec0fd89ccbb69bdfe SHA256 07f5423f87f8ae9bd31e94f8e52da0483cf3ccfc8f49578cba82db2572a83c96
+MD5 ff12420a0e3a58e63d8ebb4397a8ac1b ChangeLog 14614
+RMD160 34ae5ab674fe03c641382ad62f61763643621332 ChangeLog 14614
+SHA256 07f5423f87f8ae9bd31e94f8e52da0483cf3ccfc8f49578cba82db2572a83c96 ChangeLog 14614
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
 MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158
 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 metadata.xml 158
@@ -28,3 +32,6 @@ SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/di
 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-r2.ebuild b/dev-java/ant-tasks/ant-tasks-1.7.0-r2.ebuild
new file mode 100644 (file)
index 0000000..55a63b2
--- /dev/null
+++ b/dev-java/ant-tasks/ant-tasks-1.7.0-r2.ebuild
@@ -0,0 +1,120 @@
+# 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.1 2007/03/28 09:36:43 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
+               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
+       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/files/digest-ant-tasks-1.7.0-r2 b/dev-java/ant-tasks/files/digest-ant-tasks-1.7.0-r2
new file mode 100644 (file)
index 0000000..e69de29