From e309a6b1fa3b389b6aa59d190c50fd0d824df72e Mon Sep 17 00:00:00 2001 From: Vlastimil Babka Date: Sun, 21 Jan 2007 23:29:03 +0000 Subject: [PATCH] Version bump, bug #159820. Now just a meta-packagedepending on split ant tasks. Package-Manager: portage-2.1.2-r1 --- dev-java/ant-tasks/ChangeLog | 7 +- dev-java/ant-tasks/Manifest | 25 +++-- dev-java/ant-tasks/ant-tasks-1.7.0.ebuild | 98 +++++++++++++++++++ .../ant-tasks/files/digest-ant-tasks-1.7.0 | 0 dev-java/ant/Manifest | 25 +++-- 5 files changed, 126 insertions(+), 29 deletions(-) create mode 100644 dev-java/ant-tasks/ant-tasks-1.7.0.ebuild create mode 100644 dev-java/ant-tasks/files/digest-ant-tasks-1.7.0 diff --git a/dev-java/ant-tasks/ChangeLog b/dev-java/ant-tasks/ChangeLog index 9492e2c9fef3..be8204865c9d 100644 --- a/dev-java/ant-tasks/ChangeLog +++ b/dev-java/ant-tasks/ChangeLog @@ -1,6 +1,11 @@ # 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.46 2007/01/14 17:44:40 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-tasks/ChangeLog,v 1.47 2007/01/21 23:29:03 caster Exp $ + +*ant-tasks-1.7.0 (21 Jan 2007) + + 21 Jan 2007; Vlastimil Babka +ant-tasks-1.7.0.ebuild: + Version bump, bug #159820. Now just a meta-packagedepending on split ant tasks. 14 Jan 2007; Petteri Räty ant-tasks-1.6.5-r3.ebuild: diff --git a/dev-java/ant-tasks/Manifest b/dev-java/ant-tasks/Manifest index dc8e11cf85a8..531bc049ca1b 100644 --- a/dev-java/ant-tasks/Manifest +++ b/dev-java/ant-tasks/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - DIST apache-ant-1.6.5-src.tar.bz2 6283500 RMD160 4680b53cd72d4915b9ca2bbe2131a71fcf505a84 SHA1 08e838c506ee580f5d220401a974c757ea80365d SHA256 f3ef501f06bf1dac88981038ebd5311c738bf2d50d220de85c3e6c7656169d59 EBUILD ant-tasks-1.6.5-r2.ebuild 3337 RMD160 dab2b829378b08c09ddc81a30bda4e8c2706a057 SHA1 e6d5475177f65a5e482584b6cd3f88fcf7b65e81 SHA256 458c9af9dcebf941884a9bca19a6b85f2d6cae1e168e505b7d35abed174575dc MD5 0ef8bff112db7a57310e03b9394cc860 ant-tasks-1.6.5-r2.ebuild 3337 @@ -10,10 +7,14 @@ EBUILD ant-tasks-1.6.5-r3.ebuild 3388 RMD160 b9f0044486e3b8ece82ea97651ed68102fb MD5 cae44f7708d5489ccb3651b83ec722a8 ant-tasks-1.6.5-r3.ebuild 3388 RMD160 b9f0044486e3b8ece82ea97651ed68102fb24c31 ant-tasks-1.6.5-r3.ebuild 3388 SHA256 fd9f6cbc63d43506f97ea1fef94f8d217fc8fa7b34a40455c84103d436a195b5 ant-tasks-1.6.5-r3.ebuild 3388 -MISC ChangeLog 12637 RMD160 4166e2642e41f6f381e78cbaeecb33a994e3a5e0 SHA1 f467cbf01efda67a396cd0f6fd361bb375e7cf89 SHA256 42d3ce502bd4572f1ac59364e691ddf63c1254dafe8d5663632caaab77cf81de -MD5 727e95bcf0ca51a7bd5f0b0a5efed312 ChangeLog 12637 -RMD160 4166e2642e41f6f381e78cbaeecb33a994e3a5e0 ChangeLog 12637 -SHA256 42d3ce502bd4572f1ac59364e691ddf63c1254dafe8d5663632caaab77cf81de ChangeLog 12637 +EBUILD ant-tasks-1.7.0.ebuild 3172 RMD160 b70bf48d59e936a90d6101d519e7cd2a4e1e4921 SHA1 081a2a66639f771f799ed333f1767d4d1b27cff9 SHA256 f1aa064893a2e3acfd9306fd91148b92dce1e429e55966ca56bf469fc9a674bf +MD5 a4060049654f244f7c900bce2e2e3e5b ant-tasks-1.7.0.ebuild 3172 +RMD160 b70bf48d59e936a90d6101d519e7cd2a4e1e4921 ant-tasks-1.7.0.ebuild 3172 +SHA256 f1aa064893a2e3acfd9306fd91148b92dce1e429e55966ca56bf469fc9a674bf ant-tasks-1.7.0.ebuild 3172 +MISC ChangeLog 12824 RMD160 98c47b82e1db1807ce9c99fd32f9524cc53a99b7 SHA1 2c6a22c342a33a1f7a8eb8f1def0a01b978f39ef SHA256 8f71842e9333a064781429cb467b77a26e333c47571e2bd41ca5dae1ac8acece +MD5 6ace6028503db2e971bfc3970dbc4e10 ChangeLog 12824 +RMD160 98c47b82e1db1807ce9c99fd32f9524cc53a99b7 ChangeLog 12824 +SHA256 8f71842e9333a064781429cb467b77a26e333c47571e2bd41ca5dae1ac8acece ChangeLog 12824 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 metadata.xml 158 @@ -24,10 +25,6 @@ SHA256 6d25121ad88d0c2a4d0822cff5bb2d50c9f6886369b452882476811f65c1b8f5 files/di 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 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.6 (GNU/Linux) - -iD8DBQFFqmwUcxLzpIGCsLQRAu9GAKCF6MF4GHZAu2IFTN8ZlZEROIIc8QCeOw1S -tmAzYVsR5+UKA9C/v4yxKxE= -=jefu ------END PGP SIGNATURE----- +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 diff --git a/dev-java/ant-tasks/ant-tasks-1.7.0.ebuild b/dev-java/ant-tasks/ant-tasks-1.7.0.ebuild new file mode 100644 index 000000000000..05278c1519e2 --- /dev/null +++ b/dev-java/ant-tasks/ant-tasks-1.7.0.ebuild @@ -0,0 +1,98 @@ +# 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.1 2007/01/21 23:29:03 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="~x86" +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 new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/dev-java/ant/Manifest b/dev-java/ant/Manifest index 7cc6aad4a39c..4aa06706d762 100644 --- a/dev-java/ant/Manifest +++ b/dev-java/ant/Manifest @@ -1,14 +1,15 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - EBUILD ant-1.6.5.ebuild 508 RMD160 921db51c8b5be5fb5b3d45d20d721cbe8780379f SHA1 a6ac23352955d08b67909e0a87c6989a795736d5 SHA256 ad40eb1a49d9bb9781fa28aaef4d247a3a7730cd0d5fd3b33767310e6ee1d591 MD5 74cf5a14072a98ac2e0dd5ff6bc0556b ant-1.6.5.ebuild 508 RMD160 921db51c8b5be5fb5b3d45d20d721cbe8780379f ant-1.6.5.ebuild 508 SHA256 ad40eb1a49d9bb9781fa28aaef4d247a3a7730cd0d5fd3b33767310e6ee1d591 ant-1.6.5.ebuild 508 -MISC ChangeLog 2546 RMD160 94ba13042fcb66640f951d8bdbb9641ce74ef704 SHA1 db8d73ad829b11e1f6d0515bcfa23ff4ef91add5 SHA256 a03852ae15d44f8099dc485f1a683101be3d006ff8129939b5f25c63a3af2fec -MD5 5c9c1d655e0d4ebfe617dc004a43db52 ChangeLog 2546 -RMD160 94ba13042fcb66640f951d8bdbb9641ce74ef704 ChangeLog 2546 -SHA256 a03852ae15d44f8099dc485f1a683101be3d006ff8129939b5f25c63a3af2fec ChangeLog 2546 +EBUILD ant-1.7.0.ebuild 472 RMD160 4c1721358ae5c6cf529760cb693e02590339a127 SHA1 d6a953e68f66bfe4d9d617edb173f247423390e0 SHA256 98dc31e22969d8a628a7bd42487405f23be663cc208349bdc6852ef34b5c6195 +MD5 87ace35befa8e51b0a578eb6f18728ab ant-1.7.0.ebuild 472 +RMD160 4c1721358ae5c6cf529760cb693e02590339a127 ant-1.7.0.ebuild 472 +SHA256 98dc31e22969d8a628a7bd42487405f23be663cc208349bdc6852ef34b5c6195 ant-1.7.0.ebuild 472 +MISC ChangeLog 2669 RMD160 1e29f7b5ece0f51a6131d2c8df1c236e9c7d593d SHA1 ffb09ca9a8cf3d3c4b9d2a994c3aebc41a8d1232 SHA256 23d7b4f2b807fb8ec2075c323023830a988d71c4a32da328db914848e3d1bf81 +MD5 ee03e28cd2858fd5ae42dc416fe1d4ac ChangeLog 2669 +RMD160 1e29f7b5ece0f51a6131d2c8df1c236e9c7d593d ChangeLog 2669 +SHA256 23d7b4f2b807fb8ec2075c323023830a988d71c4a32da328db914848e3d1bf81 ChangeLog 2669 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 metadata.xml 158 @@ -16,10 +17,6 @@ SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb metadata MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-ant-1.6.5 0 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-ant-1.6.5 0 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-ant-1.6.5 0 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.6 (GNU/Linux) - -iD8DBQFFeJ4mAiZjviIA2XgRAumcAJ9bjR1zO0PsRT/Py94yyQBFp1Q/xgCdFllX -8jiWaY0A0ggjVUHBy6yqwZY= -=L6lh ------END PGP SIGNATURE----- +MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-ant-1.7.0 0 +RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 files/digest-ant-1.7.0 0 +SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/digest-ant-1.7.0 0 -- 2.26.2