summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrice Clement <monsieurp@gentoo.org>2015-07-27 10:21:14 +0000
committerPatrice Clement <monsieurp@gentoo.org>2015-07-27 10:21:14 +0000
commitd43919ab78c77d2dcb92faa1a16fdc331941226c (patch)
treef2716fd8d232dee1f6a64462c985ad21b3291e0c /dev-java
parentUpdating remote-id in metadata.xml (diff)
downloadhistorical-d43919ab78c77d2dcb92faa1a16fdc331941226c.tar.gz
historical-d43919ab78c77d2dcb92faa1a16fdc331941226c.tar.bz2
historical-d43919ab78c77d2dcb92faa1a16fdc331941226c.zip
Set javadoc flag failonerror to false in build.xml so that the documentation generation can succeed. Fixes bug 556008.
Signed-off-by: Patrice Clement <monsieurp@gentoo.org> Package-Manager: portage-2.2.18/cvs/Linux x86_64 Manifest-Sign-Key: 0x93491BB8
Diffstat (limited to 'dev-java')
-rw-r--r--dev-java/ant-core/ChangeLog6
-rw-r--r--dev-java/ant-core/Manifest28
-rw-r--r--dev-java/ant-core/ant-core-1.9.2.ebuild8
3 files changed, 22 insertions, 20 deletions
diff --git a/dev-java/ant-core/ChangeLog b/dev-java/ant-core/ChangeLog
index bc7aafc498fb..804551ac1f31 100644
--- a/dev-java/ant-core/ChangeLog
+++ b/dev-java/ant-core/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-java/ant-core
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ChangeLog,v 1.137 2015/07/11 09:20:53 chewi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ChangeLog,v 1.138 2015/07/27 10:21:09 monsieurp Exp $
+
+ 27 Jul 2015; Patrice Clement <monsieurp@gentoo.org> ant-core-1.9.2.ebuild:
+ Set javadoc flag failonerror to false in build.xml so that the documentation
+ generation can succeed. Fixes bug 556008.
11 Jul 2015; James Le Cuirot <chewi@gentoo.org> ant-core-1.9.2.ebuild:
Drop java on ia64.
diff --git a/dev-java/ant-core/Manifest b/dev-java/ant-core/Manifest
index 307facd30450..eafacd81350a 100644
--- a/dev-java/ant-core/Manifest
+++ b/dev-java/ant-core/Manifest
@@ -3,25 +3,17 @@ Hash: SHA256
DIST ant-1.9.2-gentoo.tar.bz2 14884 SHA256 0e2b1888b1f5d840db6d13da833b5289df96076c1d2d6b5497840e74b6cb4bdc SHA512 2bb84e71d1f07fa9341e674164ee680875381a0a52f5309a1a6f4092df691bf9a83955e4b1a9bcc907fbb2f4d4427afa192bffb8909314b8e519f0b76ebf5b7f WHIRLPOOL d91b2c3bbc30a2b395a182a8248785edea8ce9e6734fcaedd715e3a64e967de494ed78370c70d549f8de96e70e61c67fe1f22b56842cfdbfd66a723d2c8f62f8
DIST apache-ant-1.9.2-src.tar.bz2 3402876 SHA256 cf95317f683f28ae3d263327447abbebd30a6c910cfa069a05c5ee39aa5ad0e3 SHA512 44d37e7b6c22741293ae9d6f331bc5a21a807206d22082b111af95a0d1820b62f806c5ee8d8ac638566b86990ec802bc948066c4ac9da27262659b24545fc629 WHIRLPOOL 94fa5f5f3f2d52ed37efea5b6e6da9ace7a6ddb9e0e9377fd655fe2ead58f707c9a9e461ac4069138bf8af728b9c5c320ac5f969e655f2004dc92ebd62e4ed9d
-EBUILD ant-core-1.9.2.ebuild 3248 SHA256 903defcfe2d65b960aaa8f659ed79d2caf545ee6c94a377494c572d9e23450bc SHA512 245e7f863d07e87812ce29bb749c1ee6e791870e20250ced46e2371dbae74ce9b5c4144a1d598d25166cc8612985e517b82710456436e5f41aa12ffa32fa11dc WHIRLPOOL 55eab561fab2bc77e949f184074c0d0c741a7fa114aa4746d136fa4be675763e7f19c4e0e8c1239a1b142de27d4702db082c0f8d3e3c2bcd8761e9039693cd72
-MISC ChangeLog 33834 SHA256 0acc99393071c9822d5c18698ea84578c1e61d0f86b6ca3751e07c2e2004b4bd SHA512 206ddb6923d0eaf2b26b6f88bf13d7e71a3553e596e68ef22db323afecfe23d9d39c9f2434f16fed63dee5987a7acc16957e2e6f5b532bf90e32533cae06b83f WHIRLPOOL 26d6c0b845515f31ad5b65cfa0981c6783d7fee4570349fe463b22e59d04e2c79346cd96506d585e656d5330ecbb59338ba43be5228b8e9b39e9f54c6ca8963c
+EBUILD ant-core-1.9.2.ebuild 3361 SHA256 95b93165abb244b512507976c0385880d2ebfda29b7184a091d7bbf9b63c6948 SHA512 b6120fa90d1078bd742d71caa4c253ba0828eeda66b0150fdaeba8f3acbe7d1b4a8ed2cef6b1e77c7a62365d9918808bcb38ec7b30d08734bee6c6e63cd91cf3 WHIRLPOOL a27b902335601e55148c7adb8ea4e8b5a1c7133a1d6ce4a16de1d3978d3794136983049cefcf702e8d16d42ce7d53d144e7276c058cba02fa43a7be31dd9bd0e
+MISC ChangeLog 34039 SHA256 9417fd682934159bd5077a5d1dfe273b29f3180280851228f1864c6357947f31 SHA512 6fa99aea4826377d047fc9c116deb7e5587b4ce41c75d11f55f32574b3c713724ef8c7134f5d070fe671c97055c57c1a80516b4b0c5322650f362a04bb15e270 WHIRLPOOL 5d7f9b38e9b665dc619242d4bacad86b6ab7f2c09af1113d9455b058855508e0b798ed4de415f41d692da5a9dcfe0bd57706bea26f57eda0ecb09e37822fc413
MISC metadata.xml 158 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb SHA512 54f88fc3270968439ba87295b04365a89101c55d33a8c209a56036dc60244e5c73f78ec09484b3e5af28de9dee2159b1dab670cbd5d80a9e0c4543145c0390a3 WHIRLPOOL fcffc4fb6751b5a6eec33aa833f9d7dea0168d3ab67f7e34565370f92fd917ed882bcc57585481bf4d31e601f83a592d99d1c3f50fc793f1c38cd174cc8b2f26
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.1
+Version: GnuPG v2
-iQJ8BAEBCABmBQJVoN/2XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1MjhERTZCRDg2OTFBNDM5MUZEQTJFRDQy
-MUM2MzIxMjlDNkQ3REU0AAoJECHGMhKcbX3k7uQP/1GAoyMOVBlAdF91+WWevepI
-ETg4Os3kmNvz1wGqe/QEYd2psdpHUZCiml9ZmOoQNBhGnaDfVmGKESt0PiPsKSPh
-y/zvVIPFFn1QyIT0GI0CazrnHc+GazsAyG+lB5WwugaP3Rs8z+7B8joPT3wBdD9j
-pnmdixPV3P8ZgsSTEPv0b+yocZH/r3pAXx2AyikjPx9pEFdQN+gyJjMucIThjGCf
-AUw1Ue6U9mWP3CDf3fUVIFDNHhiTutAoatE8eduvS6BoHZ3bXirl0z0HbkZudoEN
-Mq7zZQE4ZOZYUkvWEbb4Mr+p1AWcZqJv7180Sd0ca8XS8v7KAndqd50sRNREIB6Y
-cXaLov7vZgm/LgZGzklYIqHBmQdZjqijvqSBI0tuAHJ913jHF42aa78GV2mBjeXI
-7IfV31IlEdKrFks/juHoc1fRbtZ98Y4SQH7ASm2KSgit04Ec7HDn21ZZsdH14WtT
-7vQ2Kne/ZauHAKySAmLlMbL7th8MOBgNYGAD9C1ThEI8BzK9BkJbhdK0hG/ixPAg
-6VxRSqQJ7GlxSp76E1A2k9SOP+sb7FxSKckDzUUZMgbodUZ5YTtcu1CGSCSfAAVj
-eys7R1x3Z2rDMTk9u9BceaOox5owkTEyrSLFO/lgOjhBt1zD8ReAGwWftx+TIRJp
-ZOqzJ0UbkNhvKUDKUYEZ
-=BFr9
+iQEcBAEBCAAGBQJVthRWAAoJEJGRpfGTSRu4sb0H/2CiB3Y1PS0IYbhbT585rgG2
+wMkeuuWOXRdgpydObCGjTna5HUAslYae7drxoz+GM79ZNewVClPwkhIni20kCzTz
+S9jYznIpe2mtAsBV3jjsB88hqR6s9pi4tzMB9iGE5wpnq23oJ1qoT8im1sLSZfJe
+KcRFqFSYLOUdL4RiT7dgs2S6LbhDgPpxYXnU7HI5kd0flL4yHj3J+0tEUL+1zF/9
+6M2iUbainBraXyvTFVVUmmYZk1XQSS8WlNlsaQMNqK2zbDRd3wWwh85KUbNijG/N
+0NfdYvsH/M9eUTLuyw/lirc9mNGhZOh3b33GQntePHzAG3EP+EZ0joXHW7UuJR0=
+=q+8P
-----END PGP SIGNATURE-----
diff --git a/dev-java/ant-core/ant-core-1.9.2.ebuild b/dev-java/ant-core/ant-core-1.9.2.ebuild
index 61cb9056e7c1..a209e648c267 100644
--- a/dev-java/ant-core/ant-core-1.9.2.ebuild
+++ b/dev-java/ant-core/ant-core-1.9.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 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.9.2.ebuild,v 1.10 2015/07/11 09:20:53 chewi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant-core/ant-core-1.9.2.ebuild,v 1.11 2015/07/27 10:21:09 monsieurp Exp $
EAPI="5"
@@ -40,6 +40,12 @@ src_prepare() {
# use our split-ant build.xml.
mv -f "${WORKDIR}/build.xml" . || die
+ # Fixes bug 556008.
+ java-ant_xml-rewrite -f build.xml \
+ -c -e javadoc \
+ -a failonerror \
+ -v "false"
+
# See bug #196080 for more details.
java-ant_bsfix_one build.xml
java-pkg-2_src_prepare