Remove additionalparam flags from javadoc target for the javadoc to compile smoothly with Java 7. Fix bug 554486.

Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x93491BB8

3 files changed, 21 insertions, 21 deletions

diff --git a/dev-java/junit/ChangeLog b/dev-java/junit/ChangeLog
index 456a9cb51795..2408757fd483 100644
--- a/dev-java/junit/ChangeLog
+++ b/dev-java/junit/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/junit
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/junit/ChangeLog,v 1.86 2015/07/11 09:20:21 chewi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/junit/ChangeLog,v 1.87 2015/07/11 13:21:27 monsieurp Exp $
+
+  11 Jul 2015; Patrice Clement <monsieurp@gentoo.org>
+  files/junit-4.12-build.xml:
+  Remove additionalparam flags from javadoc target for the javadoc to compile
+  smoothly with Java 7. Fix bug 554486.
 
   11 Jul 2015; James Le Cuirot <chewi@gentoo.org> junit-3.8.2-r1.ebuild,
   -junit-4.6.ebuild, -junit-4.8.2-r1.ebuild:
diff --git a/dev-java/junit/Manifest b/dev-java/junit/Manifest
index a003d94384f2..e3193c668d79 100644
--- a/dev-java/junit/Manifest
+++ b/dev-java/junit/Manifest
@@ -4,33 +4,29 @@ Hash: SHA256
 AUX gentoo-manifest.mf 54 SHA256 0e474881c459301cd882146728b6a912ae24009baa9f87331d548ab84d446269 SHA512 6e1be608ba73dd56b44c8604684886a654742f09c4b9c3661a9a06d84a1a8a0d4eb835c89580879b5b6d3edc2c51164e195732000527ee4cf9c9725fd9b9e460 WHIRLPOOL 6ef8c2a998d42df2fab735bbdb52fd18461d00fac51bee0f672291893e8214a4a322e6ab7f714a39810f459af77e55b3df7332b1cb1643f89543f4b7bd6a9376
 AUX junit-3.8.2-build.xml 3179 SHA256 ab78187535ef97b9984d969f313aff39944efbb57427071a8851f973dedf9042 SHA512 6d2c74c70569feed235db70fdb646c813ce9453b5e7fae6d5fe8c818d0ce820fc155eef8426d8f3263cff45cd4b78542d5524aa1d5efbb84e43698c1d4466f55 WHIRLPOOL f73a9854484abdbbe5a5a04a425627acdb76eb0202bb4b9e1d2c44ba6e20e9a8d022dad15b4e49d75c7584beefd7fc026936b79ddebe6e105ce15cceae157e6c
 AUX junit-4.11-do-not-unpack-hamcrest-sources.patch 613 SHA256 f9469e2a31c13a6781ee495f452c1a29c6a604a6fbe96afac2a2757672f5ae31 SHA512 c2cc1918b5b85c13153ef9ade7086193c287d5b7b7acb0cc1d514a255282850d908583a3bf194417330cee5952b5d53dc789d269123be93b4b01baf8683897f8 WHIRLPOOL af63cc9887754e5d86dd24f8cdac0ccc06400585af94c1bce7d988831d0766a7fc6e6c0e1d35ca27502ac0c386ef7d7caf7984a957ba5c9203d70deeaac56453
-AUX junit-4.12-build.xml 10981 SHA256 3ef86bb09f07010d8fcc91f3b14f9c40b0a4ed290e235fff59c8c85e461886e0 SHA512 6b9077c3544a2032ed590838534dbdc2c8c2872152139ff126aa1eff38631ae6b144ed6e1f5f97306c1e41af1465bc16586ff7f0bec9dc8dae121759352cef4f WHIRLPOOL 7ce70043670d1d0d39f6674161940f8d09d209c8bbc812e494a9fc79a60a646c74bcbd191c4cf24202478cd33ea294fd63d17fd5dd3ecebd02b241e8163cd188
+AUX junit-4.12-build.xml 10906 SHA256 fad9a541bc8589808f0b1e411a1142b472bd0648f2096a68f15977bd4f883ad6 SHA512 8a9d372bfebd2866f6128200994d8cd2902f00b2138a2dcf8e06d6567a978c0e3de89311182372880227a7ce3274add9a9ccf1882914f832d4be6a09008934be WHIRLPOOL 916ea7977892e465a7ff09ea88d30e00184d16041d5e7a5c07420dab634198e4fe4f3215c388a1e382229508fcf85f43afdaac8dfe4581325de40ee1bda6015b
 DIST junit3.8.2.zip 461426 SHA256 aae23d20e6f4dc45b4bf0b10fedcbd209c100342a0cafce1aa07d2da6da1f24a SHA512 f203332ccc2bdc38c683a95bdbe448f38cbfbeea81ecc431bf9ebf0a3292f0150fcfe5cd5dd6da481be034366820f95775a33581931aed9e4cc12a6ff27e3930 WHIRLPOOL 284a51a8b659b8dbce378a381475ae2bcedb78231cfe5435382053335ebe5d44b4eec90b9f14bc510fd5b9060b44672896fe0bfad57743e5aca0128f006781d8
 DIST junit4.10.zip 1781594 SHA256 49d1e176f518730c0d34a361932d9bd79d1bebd555126d95337ad7ad6fc9c6b6 SHA512 07cb518b684a254325d8972132f44dda8f8b52b627232b480bd90766a0f14afc6d8751e44b4162305cf9ab3cedd2858fcd7d388ab01b4f67b706dddb696a8cf6 WHIRLPOOL 72e3f6a3615d1e7f98ac24e7e7f4f634c93cdfdadcaafc0d59d7a1c8b218f019f821d2683c932f3716f1d69b9f0cf5c0fd664be6c35a0f297976b8a745ef612b
 DIST junit4.11.zip 2043600 SHA256 0bbf3818026984fd0c9c4f3cb1a9083d2be545147e13ba1cb101ee14161a3487 SHA512 947ba504aa009afc0773189e6ec89e34d5ff844430b0656cabc7b9f3fe5651c08b5b3c25b848454ee7f0a85e7573155d2c0c86e0ca5502c6e1bb573c970ade62 WHIRLPOOL bf21e351dd47099d3e7c280fe62192aa175c1f251ae4157971cfb69602af2724e6dfcb0592bb6fc8227548abe713c9f1056a22ee49446f48bb00e19ef0fa537b
+DIST junit4.6.zip 1259346 SHA256 fa0acd11fab2b1b0cd57dd0bc7fdb4e7084d2e1a3ade7bc2c54a0f397f989b26 SHA512 e3f65183b3c37f0088e9448e3fd4740f87866a6044ec3aefcfcc0da8aa66d770c8b9e0d4c36b1c0278604097642deb0f598da48443e2ea5917095d66609fbdfd WHIRLPOOL 6513e05fe1a59e8725a197dd93bdb5abed8111ff1cdc02594717b3e834bcf62e2a942204067ded34a780413aa5659a282fb45ad019079f1284b38d5fb5179417
+DIST junit4.8.2.zip 1594318 SHA256 c677cc9a08683848299f0e67fe313415de5cbaae5bfd7dee11f7d53bd8ae5107 SHA512 6c1564026b4243d9af4e24e27cf4f14343b74fa3d599b00d5c517b30fdfe4d329228da12c751a308d317b85e105641804478be0899c2b3c52d6c67185b33970b WHIRLPOOL b399c88a0483dc05bd8cdf1e602ce030f84c82566078c0415ebd7fd559a9abeb089f350c50f703f1fe8bc74a4459835c7588720b17b93c823ffb49f1c379df2e
 DIST r4.12.zip 672377 SHA256 519971406171c580304fdf7b582b5d1df3ff396bb8855a70cb68592f3d53476b SHA512 773f38476cc89f352fe9518f9de27dac32afbd501b498c3a876b7d79ee45a1c567f1ee2064067bc0721dcc06081b3faffe55fe74fbe49d2ce72884b39a2b76f6 WHIRLPOOL f25480ffe47fe615fc7cd7016bf42e037a307879214e21f2b487b4e3d667bb9209f99d372774e5b8e060e0d2678f31d3e10a9b1ea2292a7734f7f26102e3f0ff
 EBUILD junit-3.8.2-r1.ebuild 1145 SHA256 c2dc1112494dd76830e0253693eec6e248374d1bf81b6efd75028b2ebb269c9e SHA512 5c51b14bcd8e10b651a0ca69fe67ec2f989d926542f30b75b5cda7c122c1e9619b0d07aee49e317b80f2c7aeda6f5b4b1e31dc074edf90fdff21e757013b0cf5 WHIRLPOOL 6945ae7b43f77f82c2b24de075eb2052bc31a7c31b175f0b99e4e064d03d2d3fb154984bac8fde28a22f007428bb7ed2abb919fc0bcefb45510a032e2e856c0d
 EBUILD junit-4.10.ebuild 2633 SHA256 bce81ec91ebe3a3d848f72d279846ebcd257309a16a290115e60cde2583418ac SHA512 d9b92b04f3121d948cbfc362cd24f299aac6de5b12b636342f9369936a957da01367fe96728a81f5cccfdbeef4ff4f7bd28e35e1fbfee29a47c4b418f118a5b6 WHIRLPOOL ee1f9d880365e3559a24cbb2eae614aea2957865fa8353d5ff100c5d74d48e513dee11b06c9b300e46a40f4c70bb4269e12cd4959a91c90e888cd8ea5b2fc3e0
 EBUILD junit-4.11.ebuild 2921 SHA256 3ef727b67f5f3195bb0b6da31384103990e74f9812fd3badf88e8507100b00b0 SHA512 2b3691f801a44edd79e15427bf172dd40c9be4bb6534cae8c8e8ba1beef23ceff9bb308dbb59c4f3a5317e088b17d9c3d828d7ed4d89d59109ffb8dae7a383d6 WHIRLPOOL 72e025142a7959d822b3f290ff8162fa9c286b0af103407f5920fdd3b9a94e1ed3f1c1edddfbb71ce8564ea2155f24f6db2d313acb733716cc9a0fca231364dd
 EBUILD junit-4.12.ebuild 1580 SHA256 b75fca52bb5b336013b5eb42a078a5a6199c47f6deef1d5df887c3a6e6db18ef SHA512 e121b18262fa866d33e6208f30f7e696b3ac43cfee5f9f8be5c210fbefe74d27df331d836bf2b6b21f1aaad219284e19ae1202d77c98e3403939e7efd5ed590c WHIRLPOOL b849fbca5c8deece4e2b86df33d9a4d866661e2810449a0e1f35baf4f5c1af1b64ca08e59926d8d1c291fb1e5fe7e112793aa196c5f5ffbc44819536e7a22e0d
-MISC ChangeLog 11327 SHA256 39731205fb48b71c95b96ca0ae9c78fc4c0b0b21a12c4983208d4a9461da9039 SHA512 1806b17b31bdba905cd131da2135efa6f2dd839514058ae696d758dffd2a191c5f1e4629abff0a09529abac9e03b73dcf2ff713a4bb81f49d66dd6787e121ece WHIRLPOOL ba3995b1fcf0513eff8f6ed66a00dae762b04acc99467d575c4a79b7ea95cdd189e5a3a465de81fe6914448a0b19368fb5e0c5026c3dd6bffd434f3d3609b2cd
+EBUILD junit-4.6.ebuild 2168 SHA256 a21fdc5902080baf1d6425c2b1f65ce4100f7699655dab5e31ea9f2f3dd2bfdc SHA512 1c32b911d21c054bb2ec2220f19d438d80fa48ef1b38f56c4418d9e87f025ee581011c34394a540c6e7ebdcee54ce5742a7ba5bca761410145c70546c77d9b21 WHIRLPOOL a2815eb0a5406786d263168a170fc2f91be5f8264190122316bc85888dbac8030a0b216b611b584c3fd257eef53f8e6c1cf3e7d737966cd81456d539f34d767c
+EBUILD junit-4.8.2-r1.ebuild 2613 SHA256 a08d7ab44faf2c24ae6e25afc84117dadc93c5259e6a333c7ba2f7a5318d534b SHA512 df64089f1809f767faa88dab452c2044d6cf52f320565bbb4b8d6b047befe75d77a35403f684bde676c504cedaca1059a03083863b10f28d753082e091603bd4 WHIRLPOOL b9c11945ea18bed7f5a26dd82eba2d22aa705a1de31f041fc8912f043a7e1ed4b7d302dcdcb3bdd6c432231ac300c2e35fa48b80512cc29919cbbe3ba72b8dbc
+MISC ChangeLog 11534 SHA256 5d4eddd50e148703c95f3b3f1d76d73e8b1252bc7e29d57733e9df872f3c27ed SHA512 3b3241e0a14f8e736a226758fb62afefcdca651e3ea271d3179f25cfb193523d9b06626c9823c0d474c0cab3da472542a6a898fe006d6f78516a90dd73a673f9 WHIRLPOOL 93b6082b3d9db5d7ae36bf0ab59708d45ce5f46e58d087dbcf82179ae659f924815d3e08dbb50a12fb87d5780ccd43f6c410d2cd557227fc44ac029c857f644a
 MISC metadata.xml 157 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 SHA512 bbae663e26f48fdc5e272adc2b06c14f77f34c53caf84acb53908ff036e7c12a3edbbc0929d2db56bee861a453381d979c7e0983a23716f629ed2135c22ffece WHIRLPOOL 887e153e2481e7d76f0f1b67a395f10f0328b93930185ecdb8fcb5fe3c50f839086a18831d61cf45b34657aaffca6c3b7900cf3c04b712846a05027a84602448
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.1
+Version: GnuPG v2
 
-iQJ8BAEBCABmBQJVoN/WXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1MjhERTZCRDg2OTFBNDM5MUZEQTJFRDQy
-MUM2MzIxMjlDNkQ3REU0AAoJECHGMhKcbX3kHbwP/je0zSZNvHYOsQdrk+FRlFzP
-U4DSqIMzjXrNqsPlhQ1PJXDBtH3AlKuygLfpgQKNVhAqtxkEn6ODR0Rk1P/9cwkA
-Hsm8LiVKJdR/m1PwHrDZNHTugYEELi6fpWvmVFW8lt2raRF19lSUzNbf1GnR39nZ
-fKYHD/pvRF2fc4I0b59UbVxy+ME4sp02KwLyzI55t8t8i+EiPFfcYusIaGS+YrlQ
-Hs2M68BtZksxUc01+kwbXs0vN+zQnwpUWyzUsdIGxvvTmtNfPONIhofoEcCrl4/Q
-COVHaHNSEDx1zU5rIslVTmEAyq5zXWcRBGPyxiilZ/jI2igiUsr3S+3Qw//mzYnS
-9nRsRW2psejNXLGVH9TaYzFxN6GXOB6J867Md+m2pu3Tb2sDyuwwGFxOcT+eyda5
-MiECGnEi0JE0rNyiP2kZGWqNHMpPevK0VHInO0W6soyRQM06ew+KLbBlxZAtOhv1
-iinW+3K0d/3mIin9tXJ0ppoZwIAXQwY+qWydq2SAR/nKEYNIBNqw0a3ohYpLiAGi
-fkqwm4S9NY5qLjEYKJYnEVjGpBQmSDdRP7UfdGdx37HEkDnDERZfff2wZE9hwzCk
-j/j7SVRJlf4fxYYEEYv4ktdErTWHcNvUuOZ/VDu19zBd8L8fF7IZ9AfplW3ruajx
-zJpsG1PG1gNgVC908fwf
-=zjCh
+iQEcBAEBCAAGBQJVoSayAAoJEJGRpfGTSRu49coIALXDGFpk63VxqEmkjFRdMLBn
+RmhtO1gwq3vQ2PcGFFWFzdl1M3MugBRCxe+2amw1vKUDSWAS4UcSTii3RojBnrzb
+Jypo/HcFdAiBUVaf2OgrHOwlePKuCLsIzQBSdHE+PmN828umnSGQIEfJmyjjV2iF
+38+lubmU6qU3KGIqqMskyPCcDwHUbcT+jy2juPj2FZfgyKOYSOuiF2giZRz65H6f
+RvmoOV6r9NwVxXQEtFigya+BqPc/q+q/C77VuDwy46CJosekyMOJGfbEOX3XAT+s
+ejXkNxkw7tadEqV4/JFbaXqgTGNao9mXH5GUHZ8fhR9Yl6sdEGi3lXSf2EJVaVg=
+=TsaB
 -----END PGP SIGNATURE-----
diff --git a/dev-java/junit/files/junit-4.12-build.xml b/dev-java/junit/files/junit-4.12-build.xml
index 0bf70c314614..ad246aa708fe 100644
--- a/dev-java/junit/files/junit-4.12-build.xml
+++ b/dev-java/junit/files/junit-4.12-build.xml
@@ -222,8 +222,7 @@
              charset="ISO-8859-1" 
              linksource="true" 
              breakiterator="false" 
-             maxmemory="128m" 
-             additionalparam="-Xdoclint:accessibility -Xdoclint:reference"/>
+             maxmemory="128m" />
   </target>
 
   <!-- ====================================================================== -->