summaryrefslogtreecommitdiff
path: root/dev-java
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2019-12-15 18:09:03 +0000
committerV3n3RiX <venerix@redcorelinux.org>2019-12-15 18:09:03 +0000
commit7bc9c63c9da678a7e6fceb095d56c634afd22c56 (patch)
tree4a67d50a439e9af63947e5f8b6ba3719af98b6c9 /dev-java
parentb284a3168fa91a038925d2ecf5e4791011ea5e7d (diff)
gentoo resync : 15.12.2019
Diffstat (limited to 'dev-java')
-rw-r--r--dev-java/Manifest.gzbin86785 -> 86802 bytes
-rw-r--r--dev-java/ant-antlr/Manifest8
-rw-r--r--dev-java/ant-antlr/ant-antlr-1.10.5.ebuild20
-rw-r--r--dev-java/ant-antlr/ant-antlr-1.10.7.ebuild2
-rw-r--r--dev-java/ant-antlr/ant-antlr-1.9.13.ebuild20
-rw-r--r--dev-java/ant-apache-bcel/Manifest8
-rw-r--r--dev-java/ant-apache-bcel/ant-apache-bcel-1.10.5.ebuild15
-rw-r--r--dev-java/ant-apache-bcel/ant-apache-bcel-1.10.7.ebuild2
-rw-r--r--dev-java/ant-apache-bcel/ant-apache-bcel-1.9.13.ebuild15
-rw-r--r--dev-java/ant-apache-bsf/Manifest8
-rw-r--r--dev-java/ant-apache-bsf/ant-apache-bsf-1.10.5.ebuild23
-rw-r--r--dev-java/ant-apache-bsf/ant-apache-bsf-1.10.7.ebuild2
-rw-r--r--dev-java/ant-apache-bsf/ant-apache-bsf-1.9.13.ebuild23
-rw-r--r--dev-java/ant-apache-log4j/Manifest8
-rw-r--r--dev-java/ant-apache-log4j/ant-apache-log4j-1.10.5.ebuild15
-rw-r--r--dev-java/ant-apache-log4j/ant-apache-log4j-1.10.7.ebuild2
-rw-r--r--dev-java/ant-apache-log4j/ant-apache-log4j-1.9.13.ebuild15
-rw-r--r--dev-java/ant-apache-oro/Manifest8
-rw-r--r--dev-java/ant-apache-oro/ant-apache-oro-1.10.5.ebuild15
-rw-r--r--dev-java/ant-apache-oro/ant-apache-oro-1.10.7.ebuild2
-rw-r--r--dev-java/ant-apache-oro/ant-apache-oro-1.9.13.ebuild15
-rw-r--r--dev-java/ant-apache-regexp/Manifest8
-rw-r--r--dev-java/ant-apache-regexp/ant-apache-regexp-1.10.5.ebuild15
-rw-r--r--dev-java/ant-apache-regexp/ant-apache-regexp-1.10.7.ebuild2
-rw-r--r--dev-java/ant-apache-regexp/ant-apache-regexp-1.9.13.ebuild15
-rw-r--r--dev-java/ant-apache-resolver/Manifest8
-rw-r--r--dev-java/ant-apache-resolver/ant-apache-resolver-1.10.5.ebuild15
-rw-r--r--dev-java/ant-apache-resolver/ant-apache-resolver-1.10.7.ebuild2
-rw-r--r--dev-java/ant-apache-resolver/ant-apache-resolver-1.9.13.ebuild15
-rw-r--r--dev-java/ant-apache-xalan2/Manifest8
-rw-r--r--dev-java/ant-apache-xalan2/ant-apache-xalan2-1.10.5.ebuild22
-rw-r--r--dev-java/ant-apache-xalan2/ant-apache-xalan2-1.10.7.ebuild2
-rw-r--r--dev-java/ant-apache-xalan2/ant-apache-xalan2-1.9.13.ebuild22
-rw-r--r--dev-java/ant-commons-logging/Manifest8
-rw-r--r--dev-java/ant-commons-logging/ant-commons-logging-1.10.5.ebuild14
-rw-r--r--dev-java/ant-commons-logging/ant-commons-logging-1.10.7.ebuild2
-rw-r--r--dev-java/ant-commons-logging/ant-commons-logging-1.9.13.ebuild14
-rw-r--r--dev-java/ant-commons-net/Manifest8
-rw-r--r--dev-java/ant-commons-net/ant-commons-net-1.10.5.ebuild14
-rw-r--r--dev-java/ant-commons-net/ant-commons-net-1.10.7.ebuild2
-rw-r--r--dev-java/ant-commons-net/ant-commons-net-1.9.13.ebuild14
-rw-r--r--dev-java/ant-core/Manifest8
-rw-r--r--dev-java/ant-core/ant-core-1.10.5-r2.ebuild102
-rw-r--r--dev-java/ant-core/ant-core-1.10.7.ebuild6
-rw-r--r--dev-java/ant-core/ant-core-1.9.13-r2.ebuild102
-rw-r--r--dev-java/ant-jai/Manifest8
-rw-r--r--dev-java/ant-jai/ant-jai-1.10.5.ebuild16
-rw-r--r--dev-java/ant-jai/ant-jai-1.10.7.ebuild2
-rw-r--r--dev-java/ant-jai/ant-jai-1.9.13.ebuild16
-rw-r--r--dev-java/ant-javamail/Manifest8
-rw-r--r--dev-java/ant-javamail/ant-javamail-1.10.5.ebuild18
-rw-r--r--dev-java/ant-javamail/ant-javamail-1.10.7.ebuild2
-rw-r--r--dev-java/ant-javamail/ant-javamail-1.9.13.ebuild17
-rw-r--r--dev-java/ant-jdepend/Manifest8
-rw-r--r--dev-java/ant-jdepend/ant-jdepend-1.10.5.ebuild14
-rw-r--r--dev-java/ant-jdepend/ant-jdepend-1.10.7.ebuild2
-rw-r--r--dev-java/ant-jdepend/ant-jdepend-1.9.13.ebuild14
-rw-r--r--dev-java/ant-jmf/Manifest8
-rw-r--r--dev-java/ant-jmf/ant-jmf-1.10.5.ebuild16
-rw-r--r--dev-java/ant-jmf/ant-jmf-1.10.7.ebuild2
-rw-r--r--dev-java/ant-jmf/ant-jmf-1.9.13.ebuild16
-rw-r--r--dev-java/ant-jsch/Manifest8
-rw-r--r--dev-java/ant-jsch/ant-jsch-1.10.5.ebuild14
-rw-r--r--dev-java/ant-jsch/ant-jsch-1.10.7.ebuild2
-rw-r--r--dev-java/ant-jsch/ant-jsch-1.9.13.ebuild14
-rw-r--r--dev-java/ant-junit/Manifest8
-rw-r--r--dev-java/ant-junit/ant-junit-1.10.5-r1.ebuild24
-rw-r--r--dev-java/ant-junit/ant-junit-1.10.7.ebuild2
-rw-r--r--dev-java/ant-junit/ant-junit-1.9.13-r1.ebuild24
-rw-r--r--dev-java/ant-junit4/Manifest8
-rw-r--r--dev-java/ant-junit4/ant-junit4-1.10.5.ebuild37
-rw-r--r--dev-java/ant-junit4/ant-junit4-1.10.7.ebuild2
-rw-r--r--dev-java/ant-junit4/ant-junit4-1.9.13.ebuild37
-rw-r--r--dev-java/ant-junitlauncher/Manifest5
-rw-r--r--dev-java/ant-junitlauncher/ant-junitlauncher-1.10.5.ebuild12
-rw-r--r--dev-java/ant-junitlauncher/ant-junitlauncher-1.10.7.ebuild2
-rw-r--r--dev-java/ant-swing/Manifest8
-rw-r--r--dev-java/ant-swing/ant-swing-1.10.5.ebuild15
-rw-r--r--dev-java/ant-swing/ant-swing-1.10.7.ebuild2
-rw-r--r--dev-java/ant-swing/ant-swing-1.9.13.ebuild15
-rw-r--r--dev-java/ant-testutil/Manifest8
-rw-r--r--dev-java/ant-testutil/ant-testutil-1.10.5.ebuild36
-rw-r--r--dev-java/ant-testutil/ant-testutil-1.10.7.ebuild2
-rw-r--r--dev-java/ant-testutil/ant-testutil-1.9.13.ebuild36
-rw-r--r--dev-java/ant-xz/Manifest5
-rw-r--r--dev-java/ant-xz/ant-xz-1.10.5.ebuild17
-rw-r--r--dev-java/ant-xz/ant-xz-1.10.7.ebuild2
-rw-r--r--dev-java/ant/Manifest5
-rw-r--r--dev-java/ant/ant-1.10.5-r1.ebuild49
-rw-r--r--dev-java/ant/ant-1.10.5.ebuild48
-rw-r--r--dev-java/ant/ant-1.10.7.ebuild4
-rw-r--r--dev-java/ant/ant-1.9.13.ebuild47
-rw-r--r--dev-java/antlr/Manifest8
-rw-r--r--dev-java/antlr/antlr-3.2.ebuild1
-rw-r--r--dev-java/antlr/antlr-3.5.2.ebuild1
-rw-r--r--dev-java/antlr/antlr-4.5.1.ebuild1
-rw-r--r--dev-java/antlr/antlr-4.5.3.ebuild1
-rw-r--r--dev-java/avalon-framework/Manifest2
-rw-r--r--dev-java/avalon-framework/avalon-framework-4.2.0-r2.ebuild2
-rw-r--r--dev-java/backport-util-concurrent/Manifest2
-rw-r--r--dev-java/backport-util-concurrent/backport-util-concurrent-3.1-r1.ebuild2
-rw-r--r--dev-java/bcel/Manifest2
-rw-r--r--dev-java/bcel/bcel-6.0_rc3.ebuild1
-rw-r--r--dev-java/browserlauncher2/Manifest2
-rw-r--r--dev-java/browserlauncher2/browserlauncher2-1.3-r1.ebuild2
-rw-r--r--dev-java/bsf/Manifest2
-rw-r--r--dev-java/bsf/bsf-2.4.0-r2.ebuild2
-rw-r--r--dev-java/colt/Manifest2
-rw-r--r--dev-java/colt/colt-1.2.0-r3.ebuild2
-rw-r--r--dev-java/commons-beanutils/Manifest2
-rw-r--r--dev-java/commons-beanutils/commons-beanutils-1.9.2.ebuild2
-rw-r--r--dev-java/commons-cli/Manifest4
-rw-r--r--dev-java/commons-cli/commons-cli-1.3.1.ebuild3
-rw-r--r--dev-java/commons-cli/commons-cli-1.4.ebuild3
-rw-r--r--dev-java/commons-codec/Manifest2
-rw-r--r--dev-java/commons-codec/commons-codec-1.7.ebuild3
-rw-r--r--dev-java/commons-collections/Manifest6
-rw-r--r--dev-java/commons-collections/commons-collections-3.2.1-r1.ebuild5
-rw-r--r--dev-java/commons-collections/commons-collections-3.2.1-r2.ebuild3
-rw-r--r--dev-java/commons-collections/commons-collections-4.1.ebuild3
-rw-r--r--dev-java/commons-configuration/Manifest2
-rw-r--r--dev-java/commons-configuration/commons-configuration-1.6-r2.ebuild2
-rw-r--r--dev-java/commons-digester/Manifest2
-rw-r--r--dev-java/commons-digester/commons-digester-1.8.1-r2.ebuild2
-rw-r--r--dev-java/commons-email/Manifest2
-rw-r--r--dev-java/commons-email/commons-email-1.4.ebuild2
-rw-r--r--dev-java/commons-io/Manifest2
-rw-r--r--dev-java/commons-io/commons-io-2.4.ebuild3
-rw-r--r--dev-java/commons-jelly/Manifest2
-rw-r--r--dev-java/commons-jelly/commons-jelly-1.0-r8.ebuild2
-rw-r--r--dev-java/commons-jexl/Manifest2
-rw-r--r--dev-java/commons-jexl/commons-jexl-1.1-r1.ebuild2
-rw-r--r--dev-java/commons-lang/Manifest8
-rw-r--r--dev-java/commons-lang/commons-lang-2.0-r3.ebuild2
-rw-r--r--dev-java/commons-lang/commons-lang-2.6-r1.ebuild4
-rw-r--r--dev-java/commons-lang/commons-lang-3.3.2.ebuild4
-rw-r--r--dev-java/commons-lang/commons-lang-3.4.ebuild4
-rw-r--r--dev-java/commons-logging/Manifest4
-rw-r--r--dev-java/commons-logging/commons-logging-1.2-r1.ebuild8
-rw-r--r--dev-java/commons-logging/commons-logging-1.2-r2.ebuild4
-rw-r--r--dev-java/cortado/Manifest2
-rw-r--r--dev-java/cortado/cortado-0.6.0-r1.ebuild3
-rw-r--r--dev-java/dnsjava/Manifest4
-rw-r--r--dev-java/dnsjava/dnsjava-2.1.6.ebuild2
-rw-r--r--dev-java/dnsjava/dnsjava-2.1.7.ebuild2
-rw-r--r--dev-java/dynalang/Manifest2
-rw-r--r--dev-java/dynalang/dynalang-0.4-r1.ebuild3
-rw-r--r--dev-java/fec/Manifest2
-rw-r--r--dev-java/fec/fec-1.0.4-r2.ebuild4
-rw-r--r--dev-java/fontbox/Manifest2
-rw-r--r--dev-java/fontbox/fontbox-1.8.11.ebuild3
-rw-r--r--dev-java/freehep-graphics2d/Manifest2
-rw-r--r--dev-java/freehep-graphics2d/freehep-graphics2d-2.4.ebuild3
-rw-r--r--dev-java/freehep-graphicsbase/Manifest2
-rw-r--r--dev-java/freehep-graphicsbase/freehep-graphicsbase-2.4.ebuild3
-rw-r--r--dev-java/freehep-graphicsio-emf/Manifest2
-rw-r--r--dev-java/freehep-graphicsio-emf/freehep-graphicsio-emf-2.4.ebuild3
-rw-r--r--dev-java/freehep-graphicsio-svg/Manifest2
-rw-r--r--dev-java/freehep-graphicsio-svg/freehep-graphicsio-svg-2.4.ebuild3
-rw-r--r--dev-java/freehep-graphicsio/Manifest2
-rw-r--r--dev-java/freehep-graphicsio/freehep-graphicsio-2.4.ebuild3
-rw-r--r--dev-java/freehep-io/Manifest2
-rw-r--r--dev-java/freehep-io/freehep-io-2.2.2.ebuild3
-rw-r--r--dev-java/fscript/Manifest2
-rw-r--r--dev-java/fscript/fscript-1.17-r1.ebuild2
-rw-r--r--dev-java/gnu-crypto/Manifest1
-rw-r--r--dev-java/gnu-crypto/gnu-crypto-2.0.1-r2.ebuild51
-rw-r--r--dev-java/helpgui/Manifest2
-rw-r--r--dev-java/helpgui/helpgui-1.1-r2.ebuild2
-rw-r--r--dev-java/htmlcleaner/Manifest2
-rw-r--r--dev-java/htmlcleaner/htmlcleaner-2.13.ebuild3
-rw-r--r--dev-java/icedtea-sound/Manifest2
-rw-r--r--dev-java/icedtea-sound/icedtea-sound-1.0.1.ebuild1
-rw-r--r--dev-java/icedtea/Manifest14
-rw-r--r--dev-java/icedtea/icedtea-3.13.0.ebuild1
-rw-r--r--dev-java/icedtea/icedtea-3.14.0.ebuild375
-rw-r--r--dev-java/jackson-annotations/Manifest2
-rw-r--r--dev-java/jackson-annotations/jackson-annotations-2.9.10.ebuild1
-rw-r--r--dev-java/jackson/Manifest2
-rw-r--r--dev-java/jackson/jackson-2.9.10.ebuild1
-rw-r--r--dev-java/jacl/Manifest2
-rw-r--r--dev-java/jacl/jacl-1.4.1-r1.ebuild2
-rw-r--r--dev-java/jamon/Manifest2
-rw-r--r--dev-java/jamon/jamon-2.81.ebuild3
-rw-r--r--dev-java/jamvm/Manifest2
-rw-r--r--dev-java/jamvm/jamvm-2.0.0-r1.ebuild4
-rw-r--r--dev-java/java-config/Manifest2
-rw-r--r--dev-java/java-config/java-config-2.2.0-r4.ebuild1
-rw-r--r--dev-java/java-getopt/Manifest2
-rw-r--r--dev-java/java-getopt/java-getopt-1.0.14.ebuild2
-rw-r--r--dev-java/java-service-wrapper/Manifest2
-rw-r--r--dev-java/java-service-wrapper/java-service-wrapper-3.5.25-r1.ebuild4
-rw-r--r--dev-java/javassist/Manifest2
-rw-r--r--dev-java/javassist/javassist-3.18.2.ebuild2
-rw-r--r--dev-java/javatoolkit/Manifest2
-rw-r--r--dev-java/javatoolkit/javatoolkit-0.6.2-r1.ebuild4
-rw-r--r--dev-java/jdbc-postgresql/Manifest6
-rw-r--r--dev-java/jdbc-postgresql/jdbc-postgresql-9.2_p1003.ebuild3
-rw-r--r--dev-java/jdbc-postgresql/jdbc-postgresql-9.2_p1004.ebuild3
-rw-r--r--dev-java/jdbc-postgresql/jdbc-postgresql-9.3_p1100.ebuild3
-rw-r--r--dev-java/jdepend/Manifest2
-rw-r--r--dev-java/jdepend/jdepend-2.9-r5.ebuild4
-rw-r--r--dev-java/jdom/Manifest4
-rw-r--r--dev-java/jdom/jdom-1.1.3.ebuild2
-rw-r--r--dev-java/jdom/jdom-2.0.6-r4.ebuild3
-rw-r--r--dev-java/jempbox/Manifest6
-rw-r--r--dev-java/jempbox/jempbox-1.7.1-r1.ebuild2
-rw-r--r--dev-java/jempbox/jempbox-1.7.1.ebuild45
-rw-r--r--dev-java/jempbox/jempbox-1.8.11-r1.ebuild3
-rw-r--r--dev-java/jempbox/jempbox-1.8.11.ebuild45
-rw-r--r--dev-java/jettison/Manifest2
-rw-r--r--dev-java/jettison/jettison-1.3.7.ebuild3
-rw-r--r--dev-java/jflex/Manifest2
-rw-r--r--dev-java/jflex/jflex-1.6.1.ebuild1
-rw-r--r--dev-java/jgoodies-looks/Manifest2
-rw-r--r--dev-java/jgoodies-looks/jgoodies-looks-2.3.1-r1.ebuild4
-rw-r--r--dev-java/jgrapht/Manifest2
-rw-r--r--dev-java/jgrapht/jgrapht-0.8.3.ebuild2
-rw-r--r--dev-java/jline/Manifest2
-rw-r--r--dev-java/jline/jline-2.12.1-r1.ebuild3
-rw-r--r--dev-java/jrobin/Manifest2
-rw-r--r--dev-java/jrobin/jrobin-1.6.0-r1.ebuild3
-rw-r--r--dev-java/jsch/Manifest2
-rw-r--r--dev-java/jsch/jsch-0.1.52.ebuild2
-rw-r--r--dev-java/json/Manifest2
-rw-r--r--dev-java/json/json-20150729.ebuild2
-rw-r--r--dev-java/jts-core/Manifest2
-rw-r--r--dev-java/jts-core/jts-core-1.14.ebuild3
-rw-r--r--dev-java/junit-addons/Manifest2
-rw-r--r--dev-java/junit-addons/junit-addons-1.4-r1.ebuild2
-rw-r--r--dev-java/l2fprod-common/Manifest2
-rw-r--r--dev-java/l2fprod-common/l2fprod-common-7.3-r2.ebuild2
-rw-r--r--dev-java/leiningen-bin/Manifest2
-rw-r--r--dev-java/leiningen-bin/leiningen-bin-2.9.1.ebuild2
-rw-r--r--dev-java/metadata-extractor/Manifest2
-rw-r--r--dev-java/metadata-extractor/metadata-extractor-2.8.1.ebuild3
-rw-r--r--dev-java/netty-buffer/Manifest2
-rw-r--r--dev-java/netty-buffer/netty-buffer-4.0.36.ebuild3
-rw-r--r--dev-java/netty-codec-http/Manifest2
-rw-r--r--dev-java/netty-codec-http/netty-codec-http-4.0.36.ebuild3
-rw-r--r--dev-java/netty-codec/Manifest2
-rw-r--r--dev-java/netty-codec/netty-codec-4.0.36.ebuild3
-rw-r--r--dev-java/netty-common/Manifest2
-rw-r--r--dev-java/netty-common/netty-common-4.0.36.ebuild3
-rw-r--r--dev-java/netty-handler/Manifest2
-rw-r--r--dev-java/netty-handler/netty-handler-4.0.36.ebuild3
-rw-r--r--dev-java/netty-transport/Manifest2
-rw-r--r--dev-java/netty-transport/netty-transport-4.0.36.ebuild3
-rw-r--r--dev-java/odfdom/Manifest2
-rw-r--r--dev-java/odfdom/odfdom-0.8.6-r1.ebuild2
-rw-r--r--dev-java/openjdk-bin/Manifest6
-rw-r--r--dev-java/openjdk-bin/openjdk-bin-8.222_p10-r1.ebuild2
-rw-r--r--dev-java/openjdk-bin/openjdk-bin-8.232_p09.ebuild4
-rw-r--r--dev-java/openjdk/Manifest2
-rw-r--r--dev-java/openjdk/openjdk-8.222_p10.ebuild2
-rw-r--r--dev-java/oracle-javamail/Manifest6
-rw-r--r--dev-java/oracle-javamail/oracle-javamail-1.5.2.ebuild4
-rw-r--r--dev-java/oracle-javamail/oracle-javamail-1.5.5.ebuild4
-rw-r--r--dev-java/oracle-javamail/oracle-javamail-1.5.6.ebuild4
-rw-r--r--dev-java/osgi-core-api/Manifest1
-rw-r--r--dev-java/osgi-core-api/osgi-core-api-5.0.0.ebuild29
-rw-r--r--dev-java/prefuse/Manifest2
-rw-r--r--dev-java/prefuse/prefuse-20071021_beta.ebuild2
-rw-r--r--dev-java/protobuf-java/Manifest6
-rw-r--r--dev-java/protobuf-java/protobuf-java-3.10.1.ebuild (renamed from dev-java/protobuf-java/protobuf-java-3.6.1.3.ebuild)26
-rw-r--r--dev-java/protobuf-java/protobuf-java-9999.ebuild2
-rw-r--r--dev-java/sbt-bin/Manifest8
-rw-r--r--dev-java/sbt-bin/sbt-bin-1.1.4.ebuild8
-rw-r--r--dev-java/sbt-bin/sbt-bin-1.1.5.ebuild8
-rw-r--r--dev-java/sbt-bin/sbt-bin-1.2.8.ebuild8
-rw-r--r--dev-java/sbt-bin/sbt-bin-1.3.2.ebuild8
-rw-r--r--dev-java/slf4j-api/Manifest2
-rw-r--r--dev-java/slf4j-api/slf4j-api-1.7.7.ebuild3
-rw-r--r--dev-java/slf4j-log4j12/Manifest2
-rw-r--r--dev-java/slf4j-log4j12/slf4j-log4j12-1.7.7.ebuild3
-rw-r--r--dev-java/slf4j-simple/Manifest2
-rw-r--r--dev-java/slf4j-simple/slf4j-simple-1.7.7.ebuild3
-rw-r--r--dev-java/snakeyaml/Manifest2
-rw-r--r--dev-java/snakeyaml/snakeyaml-1.16.ebuild3
-rw-r--r--dev-java/stringtemplate/Manifest4
-rw-r--r--dev-java/stringtemplate/stringtemplate-3.2.1-r1.ebuild3
-rw-r--r--dev-java/stringtemplate/stringtemplate-4.0.8.ebuild3
-rw-r--r--dev-java/swt/Manifest2
-rw-r--r--dev-java/swt/swt-3.7.2-r2.ebuild2
-rw-r--r--dev-java/tagsoup/Manifest2
-rw-r--r--dev-java/tagsoup/tagsoup-1.2.1.ebuild4
-rw-r--r--dev-java/tomcat-jstl-compat/Manifest2
-rw-r--r--dev-java/tomcat-jstl-compat/tomcat-jstl-compat-1.2.5-r1.ebuild3
-rw-r--r--dev-java/tomcat-jstl-el/Manifest2
-rw-r--r--dev-java/tomcat-jstl-el/tomcat-jstl-el-1.2.5-r1.ebuild3
-rw-r--r--dev-java/tomcat-jstl-impl/Manifest2
-rw-r--r--dev-java/tomcat-jstl-impl/tomcat-jstl-impl-1.2.5-r1.ebuild3
-rw-r--r--dev-java/tomcat-jstl-spec/Manifest2
-rw-r--r--dev-java/tomcat-jstl-spec/tomcat-jstl-spec-1.2.5-r1.ebuild3
-rw-r--r--dev-java/tomcat-native/Manifest4
-rw-r--r--dev-java/tomcat-native/tomcat-native-1.2.21.ebuild1
-rw-r--r--dev-java/tomcat-native/tomcat-native-1.2.23.ebuild1
-rw-r--r--dev-java/tomcat-servlet-api/Manifest15
-rw-r--r--dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.53-r1.ebuild2
-rw-r--r--dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.53.ebuild34
-rw-r--r--dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.47.ebuild2
-rw-r--r--dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.49.ebuild (renamed from dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.46.ebuild)8
-rw-r--r--dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.27.ebuild2
-rw-r--r--dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.29.ebuild (renamed from dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.26.ebuild)4
-rw-r--r--dev-java/treelayout/Manifest2
-rw-r--r--dev-java/treelayout/treelayout-1.0.2.ebuild3
-rw-r--r--dev-java/wstx/Manifest2
-rw-r--r--dev-java/wstx/wstx-3.2.9-r1.ebuild3
-rw-r--r--dev-java/xz-java/Manifest2
-rw-r--r--dev-java/xz-java/xz-java-1.8.ebuild2
310 files changed, 778 insertions, 1748 deletions
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 9894e2e9e6ad..6d057934752b 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
Binary files differ
diff --git a/dev-java/ant-antlr/Manifest b/dev-java/ant-antlr/Manifest
index e1d81c3b78b7..6bf3751ac2de 100644
--- a/dev-java/ant-antlr/Manifest
+++ b/dev-java/ant-antlr/Manifest
@@ -1,10 +1,4 @@
-DIST ant-1.10.5-gentoo.tar.bz2 6381 BLAKE2B a03f5f57d3fdb43b5b08404e4e84fe82d1b8e9dff00ad25b78e3b9af55110e221b01f90424d193c729ed1025fe1690d0fb3507c2ab663961ea05e287ea2ff00a SHA512 c296a867328d0d5c471f0cb98efc9f5e5fbd16148e608373c6dd76a17f5e8b4785175615ea992b42c9864c6e0b975f9dc8dccd27703c958a72cb7e7c2ca78d4d
DIST ant-1.10.7-gentoo.tar.bz2 6686 BLAKE2B 77e5850b68ab079f26722b5b2ff1afb29a35197afb79f80ae2f775855e2d8f3a478324b1175e9a73695b4e6a6798bf4458dc84d2f763a1d72c331505d31303ea SHA512 f5c5a2ea99a780413a71799d56e783f3ac861169bd7f29c3a85d039f61240abb91ed223eeb111c67a6a1328a6cf2203d7cbf93ad762e49bc11f9a948e7f2091c
-DIST ant-1.9.13-gentoo.tar.bz2 7189 BLAKE2B 65bc50bb401cd9ad48763acfa1208e1d52a87bf4df3591dfcdb0f2ded2e7e70c9a42199b0160c7bc233dff83f6889b2ce5fd5aa09a76973f7ea03e963bc9e73e SHA512 0c04116399fa4e83e3283c6d2a69b562aeac0eacda44eb6ce0210e2b0846f48c72975dcfc17315e072226adeb6c1438cd7f83189d4e2974a8a90ec7c6534c898
-DIST apache-ant-1.10.5-src.tar.bz2 4465063 BLAKE2B 3cab99ae4a4800a42af3595ca6955877e3ab90c2df7086636b0f1ae0e3a45912f0c815164378616b758d76afe0a2f23cc0af6094d2f84fe17f29c3abe2e6f9aa SHA512 082dad03db4fb09b36560bd5e1fbd53f456eecad06d95140569661b6509861bb9b87b87843ef2f30a5de18c549dd993209aa17b47ac77d450f573309a272950e
DIST apache-ant-1.10.7-src.tar.bz2 4530166 BLAKE2B 6998fffbda6a0adbe3434ef0013b3e669ec8f15a09d9a5917509733f3232a538e9be83758b9eacccd673522812a8d482e1fd526d5493634d9c08759f47bfc7a7 SHA512 5849e81aa037b9ba7f4e67057a0cde50301d183fc244673c7f11e34997b11d21c33306c07ab820bf60d454afa8ad5b159c3442427c8cb5403896f29ed179b10d
-DIST apache-ant-1.9.13-src.tar.bz2 3954912 BLAKE2B 1ec249bb33f54fde80ba8a17248755e7412eb3415b14a03f0558bcc220c3eb47dc88128d435e59f10118f74c31eab8eea83f5d5db09640e1a5aaf08bac1490c1 SHA512 27cd4566df35a09873f32f897ea47c55ad3940f48440b52ce9838e5fcd9e8ca55b27151a25597f21c430cd2921e3b2b6b105962d0d40294a1eb06ed689b05810
-EBUILD ant-antlr-1.10.5.ebuild 509 BLAKE2B dae291dc2d44bef9a26c393534fe613f296d3365f29ff8af17a5feadb4dd5c6899dcb871b47fc5994c19d121fe53384a1b5031ebb8bc0406ecce403d587a358c SHA512 fbaf43264178726791d2f47553948e7056e643b162405be5d8324dd4be56bae5657afcdb0df14d1966c7bda4bcc8df48382c4530a0c3ccfde80d3fc56992e884
-EBUILD ant-antlr-1.10.7.ebuild 512 BLAKE2B ef86b2d25d451a22e3723195f9cf3205ef37d3c3b99638200f0c943a88e98d6214a8620a06d811c65b926d68f30f9596b1545042651ef8edcfcff6ab7b7cc07c SHA512 5659a574055f232b6004c88b607905d287b13215b4cbe9e63d7a33780a3c7f0578361f679779dd178f641e7b87f72a7cbb1a609124f69825b61fca9ff1eb8510
-EBUILD ant-antlr-1.9.13.ebuild 509 BLAKE2B dae291dc2d44bef9a26c393534fe613f296d3365f29ff8af17a5feadb4dd5c6899dcb871b47fc5994c19d121fe53384a1b5031ebb8bc0406ecce403d587a358c SHA512 fbaf43264178726791d2f47553948e7056e643b162405be5d8324dd4be56bae5657afcdb0df14d1966c7bda4bcc8df48382c4530a0c3ccfde80d3fc56992e884
+EBUILD ant-antlr-1.10.7.ebuild 509 BLAKE2B a42e17423275fd66170751d4ed6c40ab14b5e614d0eba30f813af9f562e48b28dd4a552ebde0505d9edf474bff91a199416bdcb0703db3661a26facef40905f1 SHA512 8564474bccccee47185a14ecf4f06e9b259ab89b874852060fc3895ffbd68a9f6cb21496c40bf4567cff08305f5dbbbe17c243c0a362c93fca7ecc5ac4ff20c6
MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-antlr/ant-antlr-1.10.5.ebuild b/dev-java/ant-antlr/ant-antlr-1.10.5.ebuild
deleted file mode 100644
index e50708dd9bab..000000000000
--- a/dev-java/ant-antlr/ant-antlr-1.10.5.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ANT_TASK_JDKVER=1.8
-ANT_TASK_JREVER=1.8
-ANT_TASK_DEPNAME=""
-
-inherit ant-tasks
-
-DESCRIPTION="Apache Ant's optional tasks for Antlr"
-KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND=">=dev-java/antlr-2.7.7-r7:0"
-
-src_install() {
- ant-tasks_src_install
- java-pkg_register-dependency antlr
-}
diff --git a/dev-java/ant-antlr/ant-antlr-1.10.7.ebuild b/dev-java/ant-antlr/ant-antlr-1.10.7.ebuild
index ef05cb23ca41..fa304c149cc2 100644
--- a/dev-java/ant-antlr/ant-antlr-1.10.7.ebuild
+++ b/dev-java/ant-antlr/ant-antlr-1.10.7.ebuild
@@ -10,7 +10,7 @@ ANT_TASK_DEPNAME=""
inherit ant-tasks
DESCRIPTION="Apache Ant's optional tasks for Antlr"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND=">=dev-java/antlr-2.7.7-r7:0"
diff --git a/dev-java/ant-antlr/ant-antlr-1.9.13.ebuild b/dev-java/ant-antlr/ant-antlr-1.9.13.ebuild
deleted file mode 100644
index e50708dd9bab..000000000000
--- a/dev-java/ant-antlr/ant-antlr-1.9.13.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ANT_TASK_JDKVER=1.8
-ANT_TASK_JREVER=1.8
-ANT_TASK_DEPNAME=""
-
-inherit ant-tasks
-
-DESCRIPTION="Apache Ant's optional tasks for Antlr"
-KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND=">=dev-java/antlr-2.7.7-r7:0"
-
-src_install() {
- ant-tasks_src_install
- java-pkg_register-dependency antlr
-}
diff --git a/dev-java/ant-apache-bcel/Manifest b/dev-java/ant-apache-bcel/Manifest
index e93f199fa649..4b4e28e61768 100644
--- a/dev-java/ant-apache-bcel/Manifest
+++ b/dev-java/ant-apache-bcel/Manifest
@@ -1,10 +1,4 @@
-DIST ant-1.10.5-gentoo.tar.bz2 6381 BLAKE2B a03f5f57d3fdb43b5b08404e4e84fe82d1b8e9dff00ad25b78e3b9af55110e221b01f90424d193c729ed1025fe1690d0fb3507c2ab663961ea05e287ea2ff00a SHA512 c296a867328d0d5c471f0cb98efc9f5e5fbd16148e608373c6dd76a17f5e8b4785175615ea992b42c9864c6e0b975f9dc8dccd27703c958a72cb7e7c2ca78d4d
DIST ant-1.10.7-gentoo.tar.bz2 6686 BLAKE2B 77e5850b68ab079f26722b5b2ff1afb29a35197afb79f80ae2f775855e2d8f3a478324b1175e9a73695b4e6a6798bf4458dc84d2f763a1d72c331505d31303ea SHA512 f5c5a2ea99a780413a71799d56e783f3ac861169bd7f29c3a85d039f61240abb91ed223eeb111c67a6a1328a6cf2203d7cbf93ad762e49bc11f9a948e7f2091c
-DIST ant-1.9.13-gentoo.tar.bz2 7189 BLAKE2B 65bc50bb401cd9ad48763acfa1208e1d52a87bf4df3591dfcdb0f2ded2e7e70c9a42199b0160c7bc233dff83f6889b2ce5fd5aa09a76973f7ea03e963bc9e73e SHA512 0c04116399fa4e83e3283c6d2a69b562aeac0eacda44eb6ce0210e2b0846f48c72975dcfc17315e072226adeb6c1438cd7f83189d4e2974a8a90ec7c6534c898
-DIST apache-ant-1.10.5-src.tar.bz2 4465063 BLAKE2B 3cab99ae4a4800a42af3595ca6955877e3ab90c2df7086636b0f1ae0e3a45912f0c815164378616b758d76afe0a2f23cc0af6094d2f84fe17f29c3abe2e6f9aa SHA512 082dad03db4fb09b36560bd5e1fbd53f456eecad06d95140569661b6509861bb9b87b87843ef2f30a5de18c549dd993209aa17b47ac77d450f573309a272950e
DIST apache-ant-1.10.7-src.tar.bz2 4530166 BLAKE2B 6998fffbda6a0adbe3434ef0013b3e669ec8f15a09d9a5917509733f3232a538e9be83758b9eacccd673522812a8d482e1fd526d5493634d9c08759f47bfc7a7 SHA512 5849e81aa037b9ba7f4e67057a0cde50301d183fc244673c7f11e34997b11d21c33306c07ab820bf60d454afa8ad5b159c3442427c8cb5403896f29ed179b10d
-DIST apache-ant-1.9.13-src.tar.bz2 3954912 BLAKE2B 1ec249bb33f54fde80ba8a17248755e7412eb3415b14a03f0558bcc220c3eb47dc88128d435e59f10118f74c31eab8eea83f5d5db09640e1a5aaf08bac1490c1 SHA512 27cd4566df35a09873f32f897ea47c55ad3940f48440b52ce9838e5fcd9e8ca55b27151a25597f21c430cd2921e3b2b6b105962d0d40294a1eb06ed689b05810
-EBUILD ant-apache-bcel-1.10.5.ebuild 394 BLAKE2B 4590d1f5e73c91725455cbb43ff2f607d905f6d4138909e4d115d6a44617251ccb40ee3576185ced8394e74ec4469e0dd28fa808c1851a6b5ca7a6165afb3830 SHA512 17a1defbbdcdd410cab9d743557ba02c7eb7f815b74efd6a7609b53e04ef661192f1c369195852b6ecfa8336f4a2573e5a22de0df641cd723fccac96d6e203e6
-EBUILD ant-apache-bcel-1.10.7.ebuild 397 BLAKE2B 4f9c9059db2916b02583bcd7ca7a9bd172d509789bfaf7b00a48d2fa22cc5e5e679c90942617d64a1509e9b5f8a5b75b3d8bfa8ecb01f3c99c19f047966d85db SHA512 3318a9094d5b551e5c7c27339448c226c4be54cbabeab1ba72239c9c0853ae8c3af25933c75541d1d15175a8aa03f7192ddb8850b7eb54af7f945243c2b6c222
-EBUILD ant-apache-bcel-1.9.13.ebuild 394 BLAKE2B 4590d1f5e73c91725455cbb43ff2f607d905f6d4138909e4d115d6a44617251ccb40ee3576185ced8394e74ec4469e0dd28fa808c1851a6b5ca7a6165afb3830 SHA512 17a1defbbdcdd410cab9d743557ba02c7eb7f815b74efd6a7609b53e04ef661192f1c369195852b6ecfa8336f4a2573e5a22de0df641cd723fccac96d6e203e6
+EBUILD ant-apache-bcel-1.10.7.ebuild 394 BLAKE2B 9e9810422e9179883e31de48f35c4bf177cdf0b394f9b9618ae9f9e683cfb8699bfdf2507472fc00721668717ab3c462a73fb38e7a00b992cf118ea65d89d9e0 SHA512 82d4e4de216358d8ea472f8813a31b9fd5f312c073b7e921fd2473f5c523a462e5cae94c8c5936d884bc118b3df88c549bca267462e92723d26531adbba494b1
MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-apache-bcel/ant-apache-bcel-1.10.5.ebuild b/dev-java/ant-apache-bcel/ant-apache-bcel-1.10.5.ebuild
deleted file mode 100644
index 7feb081ccd8f..000000000000
--- a/dev-java/ant-apache-bcel/ant-apache-bcel-1.10.5.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ANT_TASK_JDKVER=1.8
-ANT_TASK_JREVER=1.8
-ANT_TASK_DEPNAME="bcel"
-
-inherit ant-tasks
-
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-DEPEND=">=dev-java/bcel-5.1-r3:0"
-RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-apache-bcel/ant-apache-bcel-1.10.7.ebuild b/dev-java/ant-apache-bcel/ant-apache-bcel-1.10.7.ebuild
index a323d9ea93ac..c597ab560b2d 100644
--- a/dev-java/ant-apache-bcel/ant-apache-bcel-1.10.7.ebuild
+++ b/dev-java/ant-apache-bcel/ant-apache-bcel-1.10.7.ebuild
@@ -9,7 +9,7 @@ ANT_TASK_DEPNAME="bcel"
inherit ant-tasks
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
DEPEND=">=dev-java/bcel-5.1-r3:0"
RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-apache-bcel/ant-apache-bcel-1.9.13.ebuild b/dev-java/ant-apache-bcel/ant-apache-bcel-1.9.13.ebuild
deleted file mode 100644
index 7feb081ccd8f..000000000000
--- a/dev-java/ant-apache-bcel/ant-apache-bcel-1.9.13.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ANT_TASK_JDKVER=1.8
-ANT_TASK_JREVER=1.8
-ANT_TASK_DEPNAME="bcel"
-
-inherit ant-tasks
-
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-DEPEND=">=dev-java/bcel-5.1-r3:0"
-RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-apache-bsf/Manifest b/dev-java/ant-apache-bsf/Manifest
index 7d6dc768fc77..0a76e04e7ea9 100644
--- a/dev-java/ant-apache-bsf/Manifest
+++ b/dev-java/ant-apache-bsf/Manifest
@@ -1,10 +1,4 @@
-DIST ant-1.10.5-gentoo.tar.bz2 6381 BLAKE2B a03f5f57d3fdb43b5b08404e4e84fe82d1b8e9dff00ad25b78e3b9af55110e221b01f90424d193c729ed1025fe1690d0fb3507c2ab663961ea05e287ea2ff00a SHA512 c296a867328d0d5c471f0cb98efc9f5e5fbd16148e608373c6dd76a17f5e8b4785175615ea992b42c9864c6e0b975f9dc8dccd27703c958a72cb7e7c2ca78d4d
DIST ant-1.10.7-gentoo.tar.bz2 6686 BLAKE2B 77e5850b68ab079f26722b5b2ff1afb29a35197afb79f80ae2f775855e2d8f3a478324b1175e9a73695b4e6a6798bf4458dc84d2f763a1d72c331505d31303ea SHA512 f5c5a2ea99a780413a71799d56e783f3ac861169bd7f29c3a85d039f61240abb91ed223eeb111c67a6a1328a6cf2203d7cbf93ad762e49bc11f9a948e7f2091c
-DIST ant-1.9.13-gentoo.tar.bz2 7189 BLAKE2B 65bc50bb401cd9ad48763acfa1208e1d52a87bf4df3591dfcdb0f2ded2e7e70c9a42199b0160c7bc233dff83f6889b2ce5fd5aa09a76973f7ea03e963bc9e73e SHA512 0c04116399fa4e83e3283c6d2a69b562aeac0eacda44eb6ce0210e2b0846f48c72975dcfc17315e072226adeb6c1438cd7f83189d4e2974a8a90ec7c6534c898
-DIST apache-ant-1.10.5-src.tar.bz2 4465063 BLAKE2B 3cab99ae4a4800a42af3595ca6955877e3ab90c2df7086636b0f1ae0e3a45912f0c815164378616b758d76afe0a2f23cc0af6094d2f84fe17f29c3abe2e6f9aa SHA512 082dad03db4fb09b36560bd5e1fbd53f456eecad06d95140569661b6509861bb9b87b87843ef2f30a5de18c549dd993209aa17b47ac77d450f573309a272950e
DIST apache-ant-1.10.7-src.tar.bz2 4530166 BLAKE2B 6998fffbda6a0adbe3434ef0013b3e669ec8f15a09d9a5917509733f3232a538e9be83758b9eacccd673522812a8d482e1fd526d5493634d9c08759f47bfc7a7 SHA512 5849e81aa037b9ba7f4e67057a0cde50301d183fc244673c7f11e34997b11d21c33306c07ab820bf60d454afa8ad5b159c3442427c8cb5403896f29ed179b10d
-DIST apache-ant-1.9.13-src.tar.bz2 3954912 BLAKE2B 1ec249bb33f54fde80ba8a17248755e7412eb3415b14a03f0558bcc220c3eb47dc88128d435e59f10118f74c31eab8eea83f5d5db09640e1a5aaf08bac1490c1 SHA512 27cd4566df35a09873f32f897ea47c55ad3940f48440b52ce9838e5fcd9e8ca55b27151a25597f21c430cd2921e3b2b6b105962d0d40294a1eb06ed689b05810
-EBUILD ant-apache-bsf-1.10.5.ebuild 673 BLAKE2B 45099d210b9c1429428e37b359b123a364fcaf3803e202ba4f4a6874eb3cbec21ccd49086a12de32ffefa7cb7f7c6e33fd08e776124124c119d61c06350c445c SHA512 a31d2738317a8d3d98eeb214f2a71a33f75a73b37676c4131682488313cd311943052898765812888bdc42503152951e61406d09aed28fdf24f29ca0251cffdf
-EBUILD ant-apache-bsf-1.10.7.ebuild 676 BLAKE2B 8de582835bdbe81d37b8fed063aed0dd8ec6375516177989dba0c49ce92d3e4522026bcd566de79b706131b30338f240520971147e5816ab47c831fb2e3e8a82 SHA512 7367007c2a480375574d674f64402a915e82fb4a9b2db2b2281c2500f5e84e9fd8a31d1899ac639062c298e2cc7ed6d34cbbe6d137daaaeb44dc539c41386eb5
-EBUILD ant-apache-bsf-1.9.13.ebuild 673 BLAKE2B 45099d210b9c1429428e37b359b123a364fcaf3803e202ba4f4a6874eb3cbec21ccd49086a12de32ffefa7cb7f7c6e33fd08e776124124c119d61c06350c445c SHA512 a31d2738317a8d3d98eeb214f2a71a33f75a73b37676c4131682488313cd311943052898765812888bdc42503152951e61406d09aed28fdf24f29ca0251cffdf
+EBUILD ant-apache-bsf-1.10.7.ebuild 673 BLAKE2B c205ddfbd7c75ad7e9394f8fcaa500eec4052e209adbe4e04b4ee613051b215e2789872a90e1ab719e9259adb74534fd3362fbd1f6dc8ac789e8f3e9599dc2c1 SHA512 da7b6e9974aa9dcb99d77b508df79518d03e1c577014a7dcccc20e5fb8fb08c843db4209dc93d3fe9050fc5c689c7b59a4db2dd6c62c3b67378f1b81032704bc
MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-apache-bsf/ant-apache-bsf-1.10.5.ebuild b/dev-java/ant-apache-bsf/ant-apache-bsf-1.10.5.ebuild
deleted file mode 100644
index 4afc6a0bcacc..000000000000
--- a/dev-java/ant-apache-bsf/ant-apache-bsf-1.10.5.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ANT_TASK_JDKVER=1.8
-ANT_TASK_JREVER=1.8
-ANT_TASK_DEPNAME="bsf-2.3"
-
-inherit ant-tasks
-
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="python javascript tcl"
-
-DEPEND=">=dev-java/bsf-2.4.0-r1:2.3[python?,javascript?,tcl?]"
-RDEPEND="${DEPEND}"
-
-pkg_postinst() {
- if [[ -z "${REPLACING_VERSIONS}" ]]; then
- elog "Also, >=dev-java/bsf-2.4.0-r1 adds optional support for groovy,"
- elog "ruby and beanshell. See its postinst elog messages for instructions."
- fi
-}
diff --git a/dev-java/ant-apache-bsf/ant-apache-bsf-1.10.7.ebuild b/dev-java/ant-apache-bsf/ant-apache-bsf-1.10.7.ebuild
index ad08876584f6..e6990e06c9cb 100644
--- a/dev-java/ant-apache-bsf/ant-apache-bsf-1.10.7.ebuild
+++ b/dev-java/ant-apache-bsf/ant-apache-bsf-1.10.7.ebuild
@@ -9,7 +9,7 @@ ANT_TASK_DEPNAME="bsf-2.3"
inherit ant-tasks
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="python javascript tcl"
DEPEND=">=dev-java/bsf-2.4.0-r1:2.3[python?,javascript?,tcl?]"
diff --git a/dev-java/ant-apache-bsf/ant-apache-bsf-1.9.13.ebuild b/dev-java/ant-apache-bsf/ant-apache-bsf-1.9.13.ebuild
deleted file mode 100644
index 4afc6a0bcacc..000000000000
--- a/dev-java/ant-apache-bsf/ant-apache-bsf-1.9.13.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ANT_TASK_JDKVER=1.8
-ANT_TASK_JREVER=1.8
-ANT_TASK_DEPNAME="bsf-2.3"
-
-inherit ant-tasks
-
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="python javascript tcl"
-
-DEPEND=">=dev-java/bsf-2.4.0-r1:2.3[python?,javascript?,tcl?]"
-RDEPEND="${DEPEND}"
-
-pkg_postinst() {
- if [[ -z "${REPLACING_VERSIONS}" ]]; then
- elog "Also, >=dev-java/bsf-2.4.0-r1 adds optional support for groovy,"
- elog "ruby and beanshell. See its postinst elog messages for instructions."
- fi
-}
diff --git a/dev-java/ant-apache-log4j/Manifest b/dev-java/ant-apache-log4j/Manifest
index 8ae38db72530..2f3fa86d82ae 100644
--- a/dev-java/ant-apache-log4j/Manifest
+++ b/dev-java/ant-apache-log4j/Manifest
@@ -1,10 +1,4 @@
-DIST ant-1.10.5-gentoo.tar.bz2 6381 BLAKE2B a03f5f57d3fdb43b5b08404e4e84fe82d1b8e9dff00ad25b78e3b9af55110e221b01f90424d193c729ed1025fe1690d0fb3507c2ab663961ea05e287ea2ff00a SHA512 c296a867328d0d5c471f0cb98efc9f5e5fbd16148e608373c6dd76a17f5e8b4785175615ea992b42c9864c6e0b975f9dc8dccd27703c958a72cb7e7c2ca78d4d
DIST ant-1.10.7-gentoo.tar.bz2 6686 BLAKE2B 77e5850b68ab079f26722b5b2ff1afb29a35197afb79f80ae2f775855e2d8f3a478324b1175e9a73695b4e6a6798bf4458dc84d2f763a1d72c331505d31303ea SHA512 f5c5a2ea99a780413a71799d56e783f3ac861169bd7f29c3a85d039f61240abb91ed223eeb111c67a6a1328a6cf2203d7cbf93ad762e49bc11f9a948e7f2091c
-DIST ant-1.9.13-gentoo.tar.bz2 7189 BLAKE2B 65bc50bb401cd9ad48763acfa1208e1d52a87bf4df3591dfcdb0f2ded2e7e70c9a42199b0160c7bc233dff83f6889b2ce5fd5aa09a76973f7ea03e963bc9e73e SHA512 0c04116399fa4e83e3283c6d2a69b562aeac0eacda44eb6ce0210e2b0846f48c72975dcfc17315e072226adeb6c1438cd7f83189d4e2974a8a90ec7c6534c898
-DIST apache-ant-1.10.5-src.tar.bz2 4465063 BLAKE2B 3cab99ae4a4800a42af3595ca6955877e3ab90c2df7086636b0f1ae0e3a45912f0c815164378616b758d76afe0a2f23cc0af6094d2f84fe17f29c3abe2e6f9aa SHA512 082dad03db4fb09b36560bd5e1fbd53f456eecad06d95140569661b6509861bb9b87b87843ef2f30a5de18c549dd993209aa17b47ac77d450f573309a272950e
DIST apache-ant-1.10.7-src.tar.bz2 4530166 BLAKE2B 6998fffbda6a0adbe3434ef0013b3e669ec8f15a09d9a5917509733f3232a538e9be83758b9eacccd673522812a8d482e1fd526d5493634d9c08759f47bfc7a7 SHA512 5849e81aa037b9ba7f4e67057a0cde50301d183fc244673c7f11e34997b11d21c33306c07ab820bf60d454afa8ad5b159c3442427c8cb5403896f29ed179b10d
-DIST apache-ant-1.9.13-src.tar.bz2 3954912 BLAKE2B 1ec249bb33f54fde80ba8a17248755e7412eb3415b14a03f0558bcc220c3eb47dc88128d435e59f10118f74c31eab8eea83f5d5db09640e1a5aaf08bac1490c1 SHA512 27cd4566df35a09873f32f897ea47c55ad3940f48440b52ce9838e5fcd9e8ca55b27151a25597f21c430cd2921e3b2b6b105962d0d40294a1eb06ed689b05810
-EBUILD ant-apache-log4j-1.10.5.ebuild 399 BLAKE2B 804a596e878706223b14dac13b9fca4ce6187bc7280ac80352f1388f49b6e2bccfaabda35024a81b9e560bce543da6346956d6526c06cbbd394c0c4e0a8a5ecd SHA512 9e62ba88ad062cb12d37ba5e6ac8bfdb71656e63351d512ac1a6fb3e6f6c590c217decec72fdea71990cdd48a2064ba26e5329fb033c3439b70a58d4b453575d
-EBUILD ant-apache-log4j-1.10.7.ebuild 402 BLAKE2B fee10282ea30ac6388690cc3eaeb8ea9733ab61876dde82f7df0360ddfde8834cc171cc96d9719c3d866e42bbebb601c34b994d3208d06ef1924cd5a6837c28a SHA512 4e8f925df18cb13469b98c087d5f558efde24214e6a81dd7eb6c659ba7086eb7cb2807e80ef662cba48347885a116ec3b84f66afd6ad20bc5d863c80222bf8f8
-EBUILD ant-apache-log4j-1.9.13.ebuild 399 BLAKE2B 804a596e878706223b14dac13b9fca4ce6187bc7280ac80352f1388f49b6e2bccfaabda35024a81b9e560bce543da6346956d6526c06cbbd394c0c4e0a8a5ecd SHA512 9e62ba88ad062cb12d37ba5e6ac8bfdb71656e63351d512ac1a6fb3e6f6c590c217decec72fdea71990cdd48a2064ba26e5329fb033c3439b70a58d4b453575d
+EBUILD ant-apache-log4j-1.10.7.ebuild 399 BLAKE2B 3e7eb53c82576e7473a4f803195ec2f6fad0202db7900ef15774e9adca9316a1f19d638f38390d9f3cb4181327b922e8e503370793e7337f99c1964e47629fa5 SHA512 c36300f7707ac4f6dc475f3dad47f920320495883c11b883e25b2dc4267a6063e07d9f09dc7a6bdeb706ac3c758122a32ca83b906472be4b7085df4250790dc2
MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-apache-log4j/ant-apache-log4j-1.10.5.ebuild b/dev-java/ant-apache-log4j/ant-apache-log4j-1.10.5.ebuild
deleted file mode 100644
index 0d18b22953c5..000000000000
--- a/dev-java/ant-apache-log4j/ant-apache-log4j-1.10.5.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ANT_TASK_JDKVER=1.8
-ANT_TASK_JREVER=1.8
-ANT_TASK_DEPNAME="log4j"
-
-inherit ant-tasks
-
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-DEPEND=">=dev-java/log4j-1.2.13-r2:0"
-RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-apache-log4j/ant-apache-log4j-1.10.7.ebuild b/dev-java/ant-apache-log4j/ant-apache-log4j-1.10.7.ebuild
index 661919e8793d..b4660cdfcd66 100644
--- a/dev-java/ant-apache-log4j/ant-apache-log4j-1.10.7.ebuild
+++ b/dev-java/ant-apache-log4j/ant-apache-log4j-1.10.7.ebuild
@@ -9,7 +9,7 @@ ANT_TASK_DEPNAME="log4j"
inherit ant-tasks
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
DEPEND=">=dev-java/log4j-1.2.13-r2:0"
RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-apache-log4j/ant-apache-log4j-1.9.13.ebuild b/dev-java/ant-apache-log4j/ant-apache-log4j-1.9.13.ebuild
deleted file mode 100644
index 0d18b22953c5..000000000000
--- a/dev-java/ant-apache-log4j/ant-apache-log4j-1.9.13.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ANT_TASK_JDKVER=1.8
-ANT_TASK_JREVER=1.8
-ANT_TASK_DEPNAME="log4j"
-
-inherit ant-tasks
-
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-DEPEND=">=dev-java/log4j-1.2.13-r2:0"
-RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-apache-oro/Manifest b/dev-java/ant-apache-oro/Manifest
index 2cb1d3bd8a2d..a51f3a5b737f 100644
--- a/dev-java/ant-apache-oro/Manifest
+++ b/dev-java/ant-apache-oro/Manifest
@@ -1,10 +1,4 @@
-DIST ant-1.10.5-gentoo.tar.bz2 6381 BLAKE2B a03f5f57d3fdb43b5b08404e4e84fe82d1b8e9dff00ad25b78e3b9af55110e221b01f90424d193c729ed1025fe1690d0fb3507c2ab663961ea05e287ea2ff00a SHA512 c296a867328d0d5c471f0cb98efc9f5e5fbd16148e608373c6dd76a17f5e8b4785175615ea992b42c9864c6e0b975f9dc8dccd27703c958a72cb7e7c2ca78d4d
DIST ant-1.10.7-gentoo.tar.bz2 6686 BLAKE2B 77e5850b68ab079f26722b5b2ff1afb29a35197afb79f80ae2f775855e2d8f3a478324b1175e9a73695b4e6a6798bf4458dc84d2f763a1d72c331505d31303ea SHA512 f5c5a2ea99a780413a71799d56e783f3ac861169bd7f29c3a85d039f61240abb91ed223eeb111c67a6a1328a6cf2203d7cbf93ad762e49bc11f9a948e7f2091c
-DIST ant-1.9.13-gentoo.tar.bz2 7189 BLAKE2B 65bc50bb401cd9ad48763acfa1208e1d52a87bf4df3591dfcdb0f2ded2e7e70c9a42199b0160c7bc233dff83f6889b2ce5fd5aa09a76973f7ea03e963bc9e73e SHA512 0c04116399fa4e83e3283c6d2a69b562aeac0eacda44eb6ce0210e2b0846f48c72975dcfc17315e072226adeb6c1438cd7f83189d4e2974a8a90ec7c6534c898
-DIST apache-ant-1.10.5-src.tar.bz2 4465063 BLAKE2B 3cab99ae4a4800a42af3595ca6955877e3ab90c2df7086636b0f1ae0e3a45912f0c815164378616b758d76afe0a2f23cc0af6094d2f84fe17f29c3abe2e6f9aa SHA512 082dad03db4fb09b36560bd5e1fbd53f456eecad06d95140569661b6509861bb9b87b87843ef2f30a5de18c549dd993209aa17b47ac77d450f573309a272950e
DIST apache-ant-1.10.7-src.tar.bz2 4530166 BLAKE2B 6998fffbda6a0adbe3434ef0013b3e669ec8f15a09d9a5917509733f3232a538e9be83758b9eacccd673522812a8d482e1fd526d5493634d9c08759f47bfc7a7 SHA512 5849e81aa037b9ba7f4e67057a0cde50301d183fc244673c7f11e34997b11d21c33306c07ab820bf60d454afa8ad5b159c3442427c8cb5403896f29ed179b10d
-DIST apache-ant-1.9.13-src.tar.bz2 3954912 BLAKE2B 1ec249bb33f54fde80ba8a17248755e7412eb3415b14a03f0558bcc220c3eb47dc88128d435e59f10118f74c31eab8eea83f5d5db09640e1a5aaf08bac1490c1 SHA512 27cd4566df35a09873f32f897ea47c55ad3940f48440b52ce9838e5fcd9e8ca55b27151a25597f21c430cd2921e3b2b6b105962d0d40294a1eb06ed689b05810
-EBUILD ant-apache-oro-1.10.5.ebuild 416 BLAKE2B 222e0f6eaaf6353e58ee4509badd35a3ec18f0a2f6031e7cb32300e183236242dff128654751b56791d5605da040a1d1bf1e1a47674525bb7296fc140fe860e7 SHA512 33a18e5e4e8a7898a0e16e790a8c311b4b1434e4073a29ff5385435298d6db13405cda990abdf20aaf1cc9d4c8d2352f67c432093eece91bf9f41c4a617d1867
-EBUILD ant-apache-oro-1.10.7.ebuild 419 BLAKE2B 04c94253604b99e352ab789ad4d9891f08de2ee9b128a52c3aa855316cc84f64bf5b94c1a690e8c38cf72b30d100edf19fe3e36917fdc79e9ed9094cfb571474 SHA512 40d409337d816b366835ffe5ccec4cf22c9c675493b5d53cdbf277e8aef46dedd4e72ed98ea15d2efc35ade257dca84b4df20c4803f3ec828c86bfe44b7c38b4
-EBUILD ant-apache-oro-1.9.13.ebuild 416 BLAKE2B 222e0f6eaaf6353e58ee4509badd35a3ec18f0a2f6031e7cb32300e183236242dff128654751b56791d5605da040a1d1bf1e1a47674525bb7296fc140fe860e7 SHA512 33a18e5e4e8a7898a0e16e790a8c311b4b1434e4073a29ff5385435298d6db13405cda990abdf20aaf1cc9d4c8d2352f67c432093eece91bf9f41c4a617d1867
+EBUILD ant-apache-oro-1.10.7.ebuild 416 BLAKE2B 8f3b0534a397c17e3ecf73181286f17b7e48f869f3246635ef6545eb971dece352406ccca2b98398cd0455e968f6f49cc48a89cef6f24b3f17c6709e837140c9 SHA512 7362c1f237a6c239c8e1fc5554a231bf33ec436d54825f9eaf95e09475d7c2bae8205a30a7a450832c901610adfc263005a119a9ed3a9e5f3330ee46afb2c4b5
MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-apache-oro/ant-apache-oro-1.10.5.ebuild b/dev-java/ant-apache-oro/ant-apache-oro-1.10.5.ebuild
deleted file mode 100644
index 8d8e14886bb2..000000000000
--- a/dev-java/ant-apache-oro/ant-apache-oro-1.10.5.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ANT_TASK_JDKVER=1.8
-ANT_TASK_JREVER=1.8
-ANT_TASK_DEPNAME="jakarta-oro-2.0"
-
-inherit ant-tasks
-
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-DEPEND=">=dev-java/jakarta-oro-2.0.8-r2:2.0"
-RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-apache-oro/ant-apache-oro-1.10.7.ebuild b/dev-java/ant-apache-oro/ant-apache-oro-1.10.7.ebuild
index 627c57a055fd..6ef87dbdb5fb 100644
--- a/dev-java/ant-apache-oro/ant-apache-oro-1.10.7.ebuild
+++ b/dev-java/ant-apache-oro/ant-apache-oro-1.10.7.ebuild
@@ -9,7 +9,7 @@ ANT_TASK_DEPNAME="jakarta-oro-2.0"
inherit ant-tasks
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
DEPEND=">=dev-java/jakarta-oro-2.0.8-r2:2.0"
RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-apache-oro/ant-apache-oro-1.9.13.ebuild b/dev-java/ant-apache-oro/ant-apache-oro-1.9.13.ebuild
deleted file mode 100644
index 8d8e14886bb2..000000000000
--- a/dev-java/ant-apache-oro/ant-apache-oro-1.9.13.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ANT_TASK_JDKVER=1.8
-ANT_TASK_JREVER=1.8
-ANT_TASK_DEPNAME="jakarta-oro-2.0"
-
-inherit ant-tasks
-
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-DEPEND=">=dev-java/jakarta-oro-2.0.8-r2:2.0"
-RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-apache-regexp/Manifest b/dev-java/ant-apache-regexp/Manifest
index 7dd9d37cec9b..d77d55143c5a 100644
--- a/dev-java/ant-apache-regexp/Manifest
+++ b/dev-java/ant-apache-regexp/Manifest
@@ -1,10 +1,4 @@
-DIST ant-1.10.5-gentoo.tar.bz2 6381 BLAKE2B a03f5f57d3fdb43b5b08404e4e84fe82d1b8e9dff00ad25b78e3b9af55110e221b01f90424d193c729ed1025fe1690d0fb3507c2ab663961ea05e287ea2ff00a SHA512 c296a867328d0d5c471f0cb98efc9f5e5fbd16148e608373c6dd76a17f5e8b4785175615ea992b42c9864c6e0b975f9dc8dccd27703c958a72cb7e7c2ca78d4d
DIST ant-1.10.7-gentoo.tar.bz2 6686 BLAKE2B 77e5850b68ab079f26722b5b2ff1afb29a35197afb79f80ae2f775855e2d8f3a478324b1175e9a73695b4e6a6798bf4458dc84d2f763a1d72c331505d31303ea SHA512 f5c5a2ea99a780413a71799d56e783f3ac861169bd7f29c3a85d039f61240abb91ed223eeb111c67a6a1328a6cf2203d7cbf93ad762e49bc11f9a948e7f2091c
-DIST ant-1.9.13-gentoo.tar.bz2 7189 BLAKE2B 65bc50bb401cd9ad48763acfa1208e1d52a87bf4df3591dfcdb0f2ded2e7e70c9a42199b0160c7bc233dff83f6889b2ce5fd5aa09a76973f7ea03e963bc9e73e SHA512 0c04116399fa4e83e3283c6d2a69b562aeac0eacda44eb6ce0210e2b0846f48c72975dcfc17315e072226adeb6c1438cd7f83189d4e2974a8a90ec7c6534c898
-DIST apache-ant-1.10.5-src.tar.bz2 4465063 BLAKE2B 3cab99ae4a4800a42af3595ca6955877e3ab90c2df7086636b0f1ae0e3a45912f0c815164378616b758d76afe0a2f23cc0af6094d2f84fe17f29c3abe2e6f9aa SHA512 082dad03db4fb09b36560bd5e1fbd53f456eecad06d95140569661b6509861bb9b87b87843ef2f30a5de18c549dd993209aa17b47ac77d450f573309a272950e
DIST apache-ant-1.10.7-src.tar.bz2 4530166 BLAKE2B 6998fffbda6a0adbe3434ef0013b3e669ec8f15a09d9a5917509733f3232a538e9be83758b9eacccd673522812a8d482e1fd526d5493634d9c08759f47bfc7a7 SHA512 5849e81aa037b9ba7f4e67057a0cde50301d183fc244673c7f11e34997b11d21c33306c07ab820bf60d454afa8ad5b159c3442427c8cb5403896f29ed179b10d
-DIST apache-ant-1.9.13-src.tar.bz2 3954912 BLAKE2B 1ec249bb33f54fde80ba8a17248755e7412eb3415b14a03f0558bcc220c3eb47dc88128d435e59f10118f74c31eab8eea83f5d5db09640e1a5aaf08bac1490c1 SHA512 27cd4566df35a09873f32f897ea47c55ad3940f48440b52ce9838e5fcd9e8ca55b27151a25597f21c430cd2921e3b2b6b105962d0d40294a1eb06ed689b05810
-EBUILD ant-apache-regexp-1.10.5.ebuild 420 BLAKE2B 2c4db795faab73dd8fb4783723ecc1bfa3017a79ad333999448e14360b9fc8f71a000dc14cc144f010dfe6eebd5be1f28dd8ecc67b9a89de4ac6e4a1cf6fc1cd SHA512 fa84c5788c9e4298a2fa5233fba5d8845e0ff280b5c75fa5a399ab402237c0637d35f2991129bde7ebc78374a3cd57f930b52b6b06d2f73849f3d7fab2f22172
-EBUILD ant-apache-regexp-1.10.7.ebuild 423 BLAKE2B c308577884c35099cd1a455bbd7960c217452eb9c9d7a44e16c73332300cceb5a1183fe18b612110ba6f0671a443008860f53077348d0e9f6fc1b5a14dd24d5e SHA512 bbbca27f158b81dc1455332a86e446ec65ca4a93fe176ccb245015b06bf9ba3e54fbb78a1905baa9b28225e1e45676764c849047d702e1c7998d33136fd1147d
-EBUILD ant-apache-regexp-1.9.13.ebuild 420 BLAKE2B 2c4db795faab73dd8fb4783723ecc1bfa3017a79ad333999448e14360b9fc8f71a000dc14cc144f010dfe6eebd5be1f28dd8ecc67b9a89de4ac6e4a1cf6fc1cd SHA512 fa84c5788c9e4298a2fa5233fba5d8845e0ff280b5c75fa5a399ab402237c0637d35f2991129bde7ebc78374a3cd57f930b52b6b06d2f73849f3d7fab2f22172
+EBUILD ant-apache-regexp-1.10.7.ebuild 420 BLAKE2B 56ab64ba83537bab4ade70301f6051a36812c217c121f9934705b27fbc71b54dad2663f346a28949d8c263742bc1ec0c9a51bb2afa7eaac2c57d862a6b2901ed SHA512 671ad75644e51bddccb7f5837674bdadf8d46312d347cd4ac6179abc7b1d660bb1698f71d14840578a68e60986422d62c6065e12c92480c2620100923c365fb9
MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-apache-regexp/ant-apache-regexp-1.10.5.ebuild b/dev-java/ant-apache-regexp/ant-apache-regexp-1.10.5.ebuild
deleted file mode 100644
index ae618d471a14..000000000000
--- a/dev-java/ant-apache-regexp/ant-apache-regexp-1.10.5.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ANT_TASK_JDKVER=1.8
-ANT_TASK_JREVER=1.8
-ANT_TASK_DEPNAME="jakarta-regexp-1.4"
-
-inherit ant-tasks
-
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-DEPEND=">=dev-java/jakarta-regexp-1.4-r1:1.4"
-RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-apache-regexp/ant-apache-regexp-1.10.7.ebuild b/dev-java/ant-apache-regexp/ant-apache-regexp-1.10.7.ebuild
index 71f2fdd93dc6..0bfb1bd995c0 100644
--- a/dev-java/ant-apache-regexp/ant-apache-regexp-1.10.7.ebuild
+++ b/dev-java/ant-apache-regexp/ant-apache-regexp-1.10.7.ebuild
@@ -9,7 +9,7 @@ ANT_TASK_DEPNAME="jakarta-regexp-1.4"
inherit ant-tasks
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
DEPEND=">=dev-java/jakarta-regexp-1.4-r1:1.4"
RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-apache-regexp/ant-apache-regexp-1.9.13.ebuild b/dev-java/ant-apache-regexp/ant-apache-regexp-1.9.13.ebuild
deleted file mode 100644
index ae618d471a14..000000000000
--- a/dev-java/ant-apache-regexp/ant-apache-regexp-1.9.13.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ANT_TASK_JDKVER=1.8
-ANT_TASK_JREVER=1.8
-ANT_TASK_DEPNAME="jakarta-regexp-1.4"
-
-inherit ant-tasks
-
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-DEPEND=">=dev-java/jakarta-regexp-1.4-r1:1.4"
-RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-apache-resolver/Manifest b/dev-java/ant-apache-resolver/Manifest
index 24cf59ac1e8f..0b0569e4ab8b 100644
--- a/dev-java/ant-apache-resolver/Manifest
+++ b/dev-java/ant-apache-resolver/Manifest
@@ -1,10 +1,4 @@
-DIST ant-1.10.5-gentoo.tar.bz2 6381 BLAKE2B a03f5f57d3fdb43b5b08404e4e84fe82d1b8e9dff00ad25b78e3b9af55110e221b01f90424d193c729ed1025fe1690d0fb3507c2ab663961ea05e287ea2ff00a SHA512 c296a867328d0d5c471f0cb98efc9f5e5fbd16148e608373c6dd76a17f5e8b4785175615ea992b42c9864c6e0b975f9dc8dccd27703c958a72cb7e7c2ca78d4d
DIST ant-1.10.7-gentoo.tar.bz2 6686 BLAKE2B 77e5850b68ab079f26722b5b2ff1afb29a35197afb79f80ae2f775855e2d8f3a478324b1175e9a73695b4e6a6798bf4458dc84d2f763a1d72c331505d31303ea SHA512 f5c5a2ea99a780413a71799d56e783f3ac861169bd7f29c3a85d039f61240abb91ed223eeb111c67a6a1328a6cf2203d7cbf93ad762e49bc11f9a948e7f2091c
-DIST ant-1.9.13-gentoo.tar.bz2 7189 BLAKE2B 65bc50bb401cd9ad48763acfa1208e1d52a87bf4df3591dfcdb0f2ded2e7e70c9a42199b0160c7bc233dff83f6889b2ce5fd5aa09a76973f7ea03e963bc9e73e SHA512 0c04116399fa4e83e3283c6d2a69b562aeac0eacda44eb6ce0210e2b0846f48c72975dcfc17315e072226adeb6c1438cd7f83189d4e2974a8a90ec7c6534c898
-DIST apache-ant-1.10.5-src.tar.bz2 4465063 BLAKE2B 3cab99ae4a4800a42af3595ca6955877e3ab90c2df7086636b0f1ae0e3a45912f0c815164378616b758d76afe0a2f23cc0af6094d2f84fe17f29c3abe2e6f9aa SHA512 082dad03db4fb09b36560bd5e1fbd53f456eecad06d95140569661b6509861bb9b87b87843ef2f30a5de18c549dd993209aa17b47ac77d450f573309a272950e
DIST apache-ant-1.10.7-src.tar.bz2 4530166 BLAKE2B 6998fffbda6a0adbe3434ef0013b3e669ec8f15a09d9a5917509733f3232a538e9be83758b9eacccd673522812a8d482e1fd526d5493634d9c08759f47bfc7a7 SHA512 5849e81aa037b9ba7f4e67057a0cde50301d183fc244673c7f11e34997b11d21c33306c07ab820bf60d454afa8ad5b159c3442427c8cb5403896f29ed179b10d
-DIST apache-ant-1.9.13-src.tar.bz2 3954912 BLAKE2B 1ec249bb33f54fde80ba8a17248755e7412eb3415b14a03f0558bcc220c3eb47dc88128d435e59f10118f74c31eab8eea83f5d5db09640e1a5aaf08bac1490c1 SHA512 27cd4566df35a09873f32f897ea47c55ad3940f48440b52ce9838e5fcd9e8ca55b27151a25597f21c430cd2921e3b2b6b105962d0d40294a1eb06ed689b05810
-EBUILD ant-apache-resolver-1.10.5.ebuild 423 BLAKE2B d30a3d13e9a241d245a26a49903dd90ce1d5c7f83be9f0c0c3afdc8788f0480f21fc21018fc8e49d492c11700eccc76b4b2184af0053c384abfedd22a6f56462 SHA512 02a92299e74fcf3466f80517ea9dbb874a79314b8153a54098d75dd2016ec70a3fb9b458a398701fd1b55efe42d28cc910a9c4802d704f54eb5c156a8da00216
-EBUILD ant-apache-resolver-1.10.7.ebuild 426 BLAKE2B f8b34cbe21b93dd62197c2048d20b94e3021246eca7c7316f7a029fdd6e3a99b71a6af3b6a80c2c5e199339ef6b2f62e106ac91d65105023ada36eb3da9d3d39 SHA512 64a2691a50ec6d3bf07eb373ae306055fa59d01bb7883d48e8ca4e7ab64c900cae9283ca98ea89d07551c55c31d7037e7e0d97f5f0a7e96ad408eda0d158a588
-EBUILD ant-apache-resolver-1.9.13.ebuild 423 BLAKE2B d30a3d13e9a241d245a26a49903dd90ce1d5c7f83be9f0c0c3afdc8788f0480f21fc21018fc8e49d492c11700eccc76b4b2184af0053c384abfedd22a6f56462 SHA512 02a92299e74fcf3466f80517ea9dbb874a79314b8153a54098d75dd2016ec70a3fb9b458a398701fd1b55efe42d28cc910a9c4802d704f54eb5c156a8da00216
+EBUILD ant-apache-resolver-1.10.7.ebuild 423 BLAKE2B e93e091e0c6837f7d21566c7fdb2d4a54a23c752be822cdf938a8e329dd9d4557d2a2b80375ac6ebb9676aa6caebf641281b962215f1fdb9987bf1aabaaab29a SHA512 3895124361b3b85b381f1444d06b059b07994d52127b0ebb19ff36c23f486f1a1a4c01a561e4c04e5bef9d5c12ea6a33cf2f07f0b76799335cf92fbaec1f5563
MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-apache-resolver/ant-apache-resolver-1.10.5.ebuild b/dev-java/ant-apache-resolver/ant-apache-resolver-1.10.5.ebuild
deleted file mode 100644
index 2bc244ab0761..000000000000
--- a/dev-java/ant-apache-resolver/ant-apache-resolver-1.10.5.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ANT_TASK_JDKVER=1.8
-ANT_TASK_JREVER=1.8
-ANT_TASK_DEPNAME="xml-commons-resolver"
-
-inherit ant-tasks
-
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-DEPEND=">=dev-java/xml-commons-resolver-1.2:0"
-RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-apache-resolver/ant-apache-resolver-1.10.7.ebuild b/dev-java/ant-apache-resolver/ant-apache-resolver-1.10.7.ebuild
index d12dc64eb71b..2cbcd9742868 100644
--- a/dev-java/ant-apache-resolver/ant-apache-resolver-1.10.7.ebuild
+++ b/dev-java/ant-apache-resolver/ant-apache-resolver-1.10.7.ebuild
@@ -9,7 +9,7 @@ ANT_TASK_DEPNAME="xml-commons-resolver"
inherit ant-tasks
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
DEPEND=">=dev-java/xml-commons-resolver-1.2:0"
RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-apache-resolver/ant-apache-resolver-1.9.13.ebuild b/dev-java/ant-apache-resolver/ant-apache-resolver-1.9.13.ebuild
deleted file mode 100644
index 2bc244ab0761..000000000000
--- a/dev-java/ant-apache-resolver/ant-apache-resolver-1.9.13.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ANT_TASK_JDKVER=1.8
-ANT_TASK_JREVER=1.8
-ANT_TASK_DEPNAME="xml-commons-resolver"
-
-inherit ant-tasks
-
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-DEPEND=">=dev-java/xml-commons-resolver-1.2:0"
-RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-apache-xalan2/Manifest b/dev-java/ant-apache-xalan2/Manifest
index bce72ac5e887..2e7e64840b94 100644
--- a/dev-java/ant-apache-xalan2/Manifest
+++ b/dev-java/ant-apache-xalan2/Manifest
@@ -1,10 +1,4 @@
-DIST ant-1.10.5-gentoo.tar.bz2 6381 BLAKE2B a03f5f57d3fdb43b5b08404e4e84fe82d1b8e9dff00ad25b78e3b9af55110e221b01f90424d193c729ed1025fe1690d0fb3507c2ab663961ea05e287ea2ff00a SHA512 c296a867328d0d5c471f0cb98efc9f5e5fbd16148e608373c6dd76a17f5e8b4785175615ea992b42c9864c6e0b975f9dc8dccd27703c958a72cb7e7c2ca78d4d
DIST ant-1.10.7-gentoo.tar.bz2 6686 BLAKE2B 77e5850b68ab079f26722b5b2ff1afb29a35197afb79f80ae2f775855e2d8f3a478324b1175e9a73695b4e6a6798bf4458dc84d2f763a1d72c331505d31303ea SHA512 f5c5a2ea99a780413a71799d56e783f3ac861169bd7f29c3a85d039f61240abb91ed223eeb111c67a6a1328a6cf2203d7cbf93ad762e49bc11f9a948e7f2091c
-DIST ant-1.9.13-gentoo.tar.bz2 7189 BLAKE2B 65bc50bb401cd9ad48763acfa1208e1d52a87bf4df3591dfcdb0f2ded2e7e70c9a42199b0160c7bc233dff83f6889b2ce5fd5aa09a76973f7ea03e963bc9e73e SHA512 0c04116399fa4e83e3283c6d2a69b562aeac0eacda44eb6ce0210e2b0846f48c72975dcfc17315e072226adeb6c1438cd7f83189d4e2974a8a90ec7c6534c898
-DIST apache-ant-1.10.5-src.tar.bz2 4465063 BLAKE2B 3cab99ae4a4800a42af3595ca6955877e3ab90c2df7086636b0f1ae0e3a45912f0c815164378616b758d76afe0a2f23cc0af6094d2f84fe17f29c3abe2e6f9aa SHA512 082dad03db4fb09b36560bd5e1fbd53f456eecad06d95140569661b6509861bb9b87b87843ef2f30a5de18c549dd993209aa17b47ac77d450f573309a272950e
DIST apache-ant-1.10.7-src.tar.bz2 4530166 BLAKE2B 6998fffbda6a0adbe3434ef0013b3e669ec8f15a09d9a5917509733f3232a538e9be83758b9eacccd673522812a8d482e1fd526d5493634d9c08759f47bfc7a7 SHA512 5849e81aa037b9ba7f4e67057a0cde50301d183fc244673c7f11e34997b11d21c33306c07ab820bf60d454afa8ad5b159c3442427c8cb5403896f29ed179b10d
-DIST apache-ant-1.9.13-src.tar.bz2 3954912 BLAKE2B 1ec249bb33f54fde80ba8a17248755e7412eb3415b14a03f0558bcc220c3eb47dc88128d435e59f10118f74c31eab8eea83f5d5db09640e1a5aaf08bac1490c1 SHA512 27cd4566df35a09873f32f897ea47c55ad3940f48440b52ce9838e5fcd9e8ca55b27151a25597f21c430cd2921e3b2b6b105962d0d40294a1eb06ed689b05810
-EBUILD ant-apache-xalan2-1.10.5.ebuild 497 BLAKE2B 2d6e7c26d33c4c30126b5190784bc02ea09bb968019e0d342add99a4c3f1d3b519dbc5adbf69b915550a009e4f35e68515eea566334555c8257610efe6ffb4a9 SHA512 bc821689f61d675321f29139bfec2767552854e363c0f26331d2d81c0007159351258ba9d5560a65b397c66fed72bc8d002ad7854f406cca831d194235b7df3a
-EBUILD ant-apache-xalan2-1.10.7.ebuild 500 BLAKE2B 00c3707a42cef78eb7e2d24f408d627214408f8b8058390af1809794de5639fa52e67a80c5d912d10b5dd35118b59db818d9ec1d29408992ab304d0a82c824ae SHA512 3775efd2b15bc0c48919d9f9ee58cdd339c55d82a96e9ed85a5f4301c8736130aba2e8727a4e408f85927160c7f7320439e8ce5187fe8853f1458c2a83dc6ed8
-EBUILD ant-apache-xalan2-1.9.13.ebuild 497 BLAKE2B 2d6e7c26d33c4c30126b5190784bc02ea09bb968019e0d342add99a4c3f1d3b519dbc5adbf69b915550a009e4f35e68515eea566334555c8257610efe6ffb4a9 SHA512 bc821689f61d675321f29139bfec2767552854e363c0f26331d2d81c0007159351258ba9d5560a65b397c66fed72bc8d002ad7854f406cca831d194235b7df3a
+EBUILD ant-apache-xalan2-1.10.7.ebuild 497 BLAKE2B b783f7a57de54f74d3624c31eb7882f1099b3def59bdfe1cc6230804ce8b2b31988112b3b232f7aee4a9f9fa6a4159a7a5a95316029914eec8365770118a1efe SHA512 c93f41d5af958ce1fc7977388bb889daf2551e269cc6e5fe40267e6ae292d4393ad8b309639b5998e50e6860c6fd4a9ffbbcd5753eee66a02de155da9ec085df
MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-apache-xalan2/ant-apache-xalan2-1.10.5.ebuild b/dev-java/ant-apache-xalan2/ant-apache-xalan2-1.10.5.ebuild
deleted file mode 100644
index 6f19db4c5ffa..000000000000
--- a/dev-java/ant-apache-xalan2/ant-apache-xalan2-1.10.5.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ANT_TASK_JDKVER=1.8
-ANT_TASK_JREVER=1.8
-ANT_TASK_DEPNAME="xalan"
-
-inherit ant-tasks
-
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-DEPEND="dev-java/xalan:0
- dev-java/xalan-serializer:0"
-
-RDEPEND="${DEPEND}"
-
-src_unpack() {
- ant-tasks_src_unpack all
- java-pkg_jar-from xalan-serializer
-}
diff --git a/dev-java/ant-apache-xalan2/ant-apache-xalan2-1.10.7.ebuild b/dev-java/ant-apache-xalan2/ant-apache-xalan2-1.10.7.ebuild
index 6a729b172d26..59d4d903a2b0 100644
--- a/dev-java/ant-apache-xalan2/ant-apache-xalan2-1.10.7.ebuild
+++ b/dev-java/ant-apache-xalan2/ant-apache-xalan2-1.10.7.ebuild
@@ -9,7 +9,7 @@ ANT_TASK_DEPNAME="xalan"
inherit ant-tasks
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
DEPEND="dev-java/xalan:0
dev-java/xalan-serializer:0"
diff --git a/dev-java/ant-apache-xalan2/ant-apache-xalan2-1.9.13.ebuild b/dev-java/ant-apache-xalan2/ant-apache-xalan2-1.9.13.ebuild
deleted file mode 100644
index 6f19db4c5ffa..000000000000
--- a/dev-java/ant-apache-xalan2/ant-apache-xalan2-1.9.13.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ANT_TASK_JDKVER=1.8
-ANT_TASK_JREVER=1.8
-ANT_TASK_DEPNAME="xalan"
-
-inherit ant-tasks
-
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-DEPEND="dev-java/xalan:0
- dev-java/xalan-serializer:0"
-
-RDEPEND="${DEPEND}"
-
-src_unpack() {
- ant-tasks_src_unpack all
- java-pkg_jar-from xalan-serializer
-}
diff --git a/dev-java/ant-commons-logging/Manifest b/dev-java/ant-commons-logging/Manifest
index 6cd415bad975..c0809b470058 100644
--- a/dev-java/ant-commons-logging/Manifest
+++ b/dev-java/ant-commons-logging/Manifest
@@ -1,10 +1,4 @@
-DIST ant-1.10.5-gentoo.tar.bz2 6381 BLAKE2B a03f5f57d3fdb43b5b08404e4e84fe82d1b8e9dff00ad25b78e3b9af55110e221b01f90424d193c729ed1025fe1690d0fb3507c2ab663961ea05e287ea2ff00a SHA512 c296a867328d0d5c471f0cb98efc9f5e5fbd16148e608373c6dd76a17f5e8b4785175615ea992b42c9864c6e0b975f9dc8dccd27703c958a72cb7e7c2ca78d4d
DIST ant-1.10.7-gentoo.tar.bz2 6686 BLAKE2B 77e5850b68ab079f26722b5b2ff1afb29a35197afb79f80ae2f775855e2d8f3a478324b1175e9a73695b4e6a6798bf4458dc84d2f763a1d72c331505d31303ea SHA512 f5c5a2ea99a780413a71799d56e783f3ac861169bd7f29c3a85d039f61240abb91ed223eeb111c67a6a1328a6cf2203d7cbf93ad762e49bc11f9a948e7f2091c
-DIST ant-1.9.13-gentoo.tar.bz2 7189 BLAKE2B 65bc50bb401cd9ad48763acfa1208e1d52a87bf4df3591dfcdb0f2ded2e7e70c9a42199b0160c7bc233dff83f6889b2ce5fd5aa09a76973f7ea03e963bc9e73e SHA512 0c04116399fa4e83e3283c6d2a69b562aeac0eacda44eb6ce0210e2b0846f48c72975dcfc17315e072226adeb6c1438cd7f83189d4e2974a8a90ec7c6534c898
-DIST apache-ant-1.10.5-src.tar.bz2 4465063 BLAKE2B 3cab99ae4a4800a42af3595ca6955877e3ab90c2df7086636b0f1ae0e3a45912f0c815164378616b758d76afe0a2f23cc0af6094d2f84fe17f29c3abe2e6f9aa SHA512 082dad03db4fb09b36560bd5e1fbd53f456eecad06d95140569661b6509861bb9b87b87843ef2f30a5de18c549dd993209aa17b47ac77d450f573309a272950e
DIST apache-ant-1.10.7-src.tar.bz2 4530166 BLAKE2B 6998fffbda6a0adbe3434ef0013b3e669ec8f15a09d9a5917509733f3232a538e9be83758b9eacccd673522812a8d482e1fd526d5493634d9c08759f47bfc7a7 SHA512 5849e81aa037b9ba7f4e67057a0cde50301d183fc244673c7f11e34997b11d21c33306c07ab820bf60d454afa8ad5b159c3442427c8cb5403896f29ed179b10d
-DIST apache-ant-1.9.13-src.tar.bz2 3954912 BLAKE2B 1ec249bb33f54fde80ba8a17248755e7412eb3415b14a03f0558bcc220c3eb47dc88128d435e59f10118f74c31eab8eea83f5d5db09640e1a5aaf08bac1490c1 SHA512 27cd4566df35a09873f32f897ea47c55ad3940f48440b52ce9838e5fcd9e8ca55b27151a25597f21c430cd2921e3b2b6b105962d0d40294a1eb06ed689b05810
-EBUILD ant-commons-logging-1.10.5.ebuild 383 BLAKE2B 752fd23c92c8dc8c5c7f1853e8bcdeb98219f0eb4752fdada322b205b7f5fdc698228c5c63b2d44777df1591f7259a1b36dc35b0634fd1b29e86a14d408cc648 SHA512 045522b2e046bce070fb42bfe605d4346d2a1fc567ba686da83e64e07bcbe7b41a53f990b94400166aac81185c74d471bca95436b4220ba1cf94a59ed07d92c0
-EBUILD ant-commons-logging-1.10.7.ebuild 386 BLAKE2B 3ee8a4bd4d1cd0f7729826e1e8af987cf86a272ee6d8c3b1ea675eec1c3999b1f06e22af9f392971c3fec98e7fa772ab8ff79ecdabf88c27c4a5422e61279ac4 SHA512 457d3533bf3d56bbeb746c81223b6137c2f925ee365346b4f9e7207b16072335dde6ce9c05b5df55c6c9ec1dd972b7af5488251782160a1de0c06ad57c2321d5
-EBUILD ant-commons-logging-1.9.13.ebuild 383 BLAKE2B 752fd23c92c8dc8c5c7f1853e8bcdeb98219f0eb4752fdada322b205b7f5fdc698228c5c63b2d44777df1591f7259a1b36dc35b0634fd1b29e86a14d408cc648 SHA512 045522b2e046bce070fb42bfe605d4346d2a1fc567ba686da83e64e07bcbe7b41a53f990b94400166aac81185c74d471bca95436b4220ba1cf94a59ed07d92c0
+EBUILD ant-commons-logging-1.10.7.ebuild 383 BLAKE2B c325b9d179d7141f34d01d4a3ca114c26f779da53a687f02fb8f49f74abb4fbe882c53d205dcb6de14f15533786c6dbb608f7e00b9f03223e99d541f19b749be SHA512 2dd5598fa05802283e11a2ba12f07181a9f9b83e073b6b223c47e083cf98264ae65d7948847b5ebaaf6300fc2cd4ffb3e5ad9d0fa0a6b2c9134e4d68a352c584
MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-commons-logging/ant-commons-logging-1.10.5.ebuild b/dev-java/ant-commons-logging/ant-commons-logging-1.10.5.ebuild
deleted file mode 100644
index 08a8e5d3a50b..000000000000
--- a/dev-java/ant-commons-logging/ant-commons-logging-1.10.5.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ANT_TASK_JDKVER=1.8
-ANT_TASK_JREVER=1.8
-
-inherit ant-tasks
-
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-DEPEND=">=dev-java/commons-logging-1.0.4-r2:0"
-RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-commons-logging/ant-commons-logging-1.10.7.ebuild b/dev-java/ant-commons-logging/ant-commons-logging-1.10.7.ebuild
index 04a8d93f0570..e0947d69ad09 100644
--- a/dev-java/ant-commons-logging/ant-commons-logging-1.10.7.ebuild
+++ b/dev-java/ant-commons-logging/ant-commons-logging-1.10.7.ebuild
@@ -8,7 +8,7 @@ ANT_TASK_JREVER=1.8
inherit ant-tasks
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
DEPEND=">=dev-java/commons-logging-1.0.4-r2:0"
RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-commons-logging/ant-commons-logging-1.9.13.ebuild b/dev-java/ant-commons-logging/ant-commons-logging-1.9.13.ebuild
deleted file mode 100644
index 08a8e5d3a50b..000000000000
--- a/dev-java/ant-commons-logging/ant-commons-logging-1.9.13.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ANT_TASK_JDKVER=1.8
-ANT_TASK_JREVER=1.8
-
-inherit ant-tasks
-
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-DEPEND=">=dev-java/commons-logging-1.0.4-r2:0"
-RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-commons-net/Manifest b/dev-java/ant-commons-net/Manifest
index d730c8399aaa..15225f759e50 100644
--- a/dev-java/ant-commons-net/Manifest
+++ b/dev-java/ant-commons-net/Manifest
@@ -1,10 +1,4 @@
-DIST ant-1.10.5-gentoo.tar.bz2 6381 BLAKE2B a03f5f57d3fdb43b5b08404e4e84fe82d1b8e9dff00ad25b78e3b9af55110e221b01f90424d193c729ed1025fe1690d0fb3507c2ab663961ea05e287ea2ff00a SHA512 c296a867328d0d5c471f0cb98efc9f5e5fbd16148e608373c6dd76a17f5e8b4785175615ea992b42c9864c6e0b975f9dc8dccd27703c958a72cb7e7c2ca78d4d
DIST ant-1.10.7-gentoo.tar.bz2 6686 BLAKE2B 77e5850b68ab079f26722b5b2ff1afb29a35197afb79f80ae2f775855e2d8f3a478324b1175e9a73695b4e6a6798bf4458dc84d2f763a1d72c331505d31303ea SHA512 f5c5a2ea99a780413a71799d56e783f3ac861169bd7f29c3a85d039f61240abb91ed223eeb111c67a6a1328a6cf2203d7cbf93ad762e49bc11f9a948e7f2091c
-DIST ant-1.9.13-gentoo.tar.bz2 7189 BLAKE2B 65bc50bb401cd9ad48763acfa1208e1d52a87bf4df3591dfcdb0f2ded2e7e70c9a42199b0160c7bc233dff83f6889b2ce5fd5aa09a76973f7ea03e963bc9e73e SHA512 0c04116399fa4e83e3283c6d2a69b562aeac0eacda44eb6ce0210e2b0846f48c72975dcfc17315e072226adeb6c1438cd7f83189d4e2974a8a90ec7c6534c898
-DIST apache-ant-1.10.5-src.tar.bz2 4465063 BLAKE2B 3cab99ae4a4800a42af3595ca6955877e3ab90c2df7086636b0f1ae0e3a45912f0c815164378616b758d76afe0a2f23cc0af6094d2f84fe17f29c3abe2e6f9aa SHA512 082dad03db4fb09b36560bd5e1fbd53f456eecad06d95140569661b6509861bb9b87b87843ef2f30a5de18c549dd993209aa17b47ac77d450f573309a272950e
DIST apache-ant-1.10.7-src.tar.bz2 4530166 BLAKE2B 6998fffbda6a0adbe3434ef0013b3e669ec8f15a09d9a5917509733f3232a538e9be83758b9eacccd673522812a8d482e1fd526d5493634d9c08759f47bfc7a7 SHA512 5849e81aa037b9ba7f4e67057a0cde50301d183fc244673c7f11e34997b11d21c33306c07ab820bf60d454afa8ad5b159c3442427c8cb5403896f29ed179b10d
-DIST apache-ant-1.9.13-src.tar.bz2 3954912 BLAKE2B 1ec249bb33f54fde80ba8a17248755e7412eb3415b14a03f0558bcc220c3eb47dc88128d435e59f10118f74c31eab8eea83f5d5db09640e1a5aaf08bac1490c1 SHA512 27cd4566df35a09873f32f897ea47c55ad3940f48440b52ce9838e5fcd9e8ca55b27151a25597f21c430cd2921e3b2b6b105962d0d40294a1eb06ed689b05810
-EBUILD ant-commons-net-1.10.5.ebuild 379 BLAKE2B a29535bfa7a740ab54bfa546fc1bdfe48e4ac0c69af90bf66f9b6c82a572bed5930d53ab412e6447677ea50e8cc63e1bf6f8c15f033ce6d7fb057fa59a7a4638 SHA512 873e21e3c5db5f58ca3d90324adcb9d79f836e5ea9e8109140fce06c4e06b17fe911cf314a5e012320c85cd12449bdc4d290be5a357c419594e31dd6c15658c8
-EBUILD ant-commons-net-1.10.7.ebuild 382 BLAKE2B 0eabd7c21909722cad0b344dcf9101c52a1b3a7cf5879c71a813a0fa6942a2d3b8544b8219de701332c6290b67c6ab8b531bbe7c812bafcf0d704579efd51758 SHA512 97434b1a935a910407e2f27bc771268952a86804a2d7de4ace0981018fa516b816fa67c4eb9014a637405b2005252e0240162925c0461d23fd6f4289cf2d0613
-EBUILD ant-commons-net-1.9.13.ebuild 379 BLAKE2B a29535bfa7a740ab54bfa546fc1bdfe48e4ac0c69af90bf66f9b6c82a572bed5930d53ab412e6447677ea50e8cc63e1bf6f8c15f033ce6d7fb057fa59a7a4638 SHA512 873e21e3c5db5f58ca3d90324adcb9d79f836e5ea9e8109140fce06c4e06b17fe911cf314a5e012320c85cd12449bdc4d290be5a357c419594e31dd6c15658c8
+EBUILD ant-commons-net-1.10.7.ebuild 379 BLAKE2B f87705c6d98492e6ca9f1b7d0a351a087daab2291a107610b1aebe7954208d54d5f1f485ddd24787c8a953cb9012754208a9e03d60d14b74d390189f97c58a0e SHA512 ff37dc41e48c74996fa671c9cf5b6eb4fb085bcbdd02da0848e14c3c4994fab0b0d0ef1fd2b9c5bc169c111b812756bd38f24dbd867edc6464e4bd1148dca755
MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-commons-net/ant-commons-net-1.10.5.ebuild b/dev-java/ant-commons-net/ant-commons-net-1.10.5.ebuild
deleted file mode 100644
index 65bcbe7e7e44..000000000000
--- a/dev-java/ant-commons-net/ant-commons-net-1.10.5.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ANT_TASK_JDKVER=1.8
-ANT_TASK_JREVER=1.8
-
-inherit ant-tasks
-
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-DEPEND=">=dev-java/commons-net-1.4.1-r1:0"
-RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-commons-net/ant-commons-net-1.10.7.ebuild b/dev-java/ant-commons-net/ant-commons-net-1.10.7.ebuild
index b3428da3ce8d..6de2db6bfff8 100644
--- a/dev-java/ant-commons-net/ant-commons-net-1.10.7.ebuild
+++ b/dev-java/ant-commons-net/ant-commons-net-1.10.7.ebuild
@@ -8,7 +8,7 @@ ANT_TASK_JREVER=1.8
inherit ant-tasks
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
DEPEND=">=dev-java/commons-net-1.4.1-r1:0"
RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-commons-net/ant-commons-net-1.9.13.ebuild b/dev-java/ant-commons-net/ant-commons-net-1.9.13.ebuild
deleted file mode 100644
index 65bcbe7e7e44..000000000000
--- a/dev-java/ant-commons-net/ant-commons-net-1.9.13.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ANT_TASK_JDKVER=1.8
-ANT_TASK_JREVER=1.8
-
-inherit ant-tasks
-
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-DEPEND=">=dev-java/commons-net-1.4.1-r1:0"
-RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-core/Manifest b/dev-java/ant-core/Manifest
index 81d2f81648a3..4e3515841e3a 100644
--- a/dev-java/ant-core/Manifest
+++ b/dev-java/ant-core/Manifest
@@ -1,10 +1,4 @@
-DIST ant-1.10.5-r1-gentoo.tar.bz2 6400 BLAKE2B 349a45ee678217ee31ae2f6e982ceec2d31138dcb58e614f496125d7d9bc01a0fa3630be069fbf0d131f4006cb7912597c31392bc82ab7f9b0a1189bbe9a763e SHA512 adf544c151f46df8a7fb7f7d33450f9a2390f568dd4c7b1c0e8850b1a155ea0ddc1f834d869d657806570d59af2d194cb443ddfc653627967246f3b38e264b12
DIST ant-1.10.7-gentoo.tar.bz2 6686 BLAKE2B 77e5850b68ab079f26722b5b2ff1afb29a35197afb79f80ae2f775855e2d8f3a478324b1175e9a73695b4e6a6798bf4458dc84d2f763a1d72c331505d31303ea SHA512 f5c5a2ea99a780413a71799d56e783f3ac861169bd7f29c3a85d039f61240abb91ed223eeb111c67a6a1328a6cf2203d7cbf93ad762e49bc11f9a948e7f2091c
-DIST ant-1.9.13-r1-gentoo.tar.bz2 7208 BLAKE2B 6f041a69f5f8e38e95b26030cf4d730ed22b071ad1d6e87ab1fb2707e2b40c7e23e1c8f7759d6904ad2b25793a7d9b2ead1c2649b6b029296cd9d05bec4ea296 SHA512 5b105ea00fbc7d6f63c0016b288f5e46a81b89cc46015e2ffcb2a4d41f915331ac8f8183752fea547396f204748132f6ce7aa7b3e6f6181c4983b4eb7ee84d54
-DIST apache-ant-1.10.5-src.tar.bz2 4465063 BLAKE2B 3cab99ae4a4800a42af3595ca6955877e3ab90c2df7086636b0f1ae0e3a45912f0c815164378616b758d76afe0a2f23cc0af6094d2f84fe17f29c3abe2e6f9aa SHA512 082dad03db4fb09b36560bd5e1fbd53f456eecad06d95140569661b6509861bb9b87b87843ef2f30a5de18c549dd993209aa17b47ac77d450f573309a272950e
DIST apache-ant-1.10.7-src.tar.bz2 4530166 BLAKE2B 6998fffbda6a0adbe3434ef0013b3e669ec8f15a09d9a5917509733f3232a538e9be83758b9eacccd673522812a8d482e1fd526d5493634d9c08759f47bfc7a7 SHA512 5849e81aa037b9ba7f4e67057a0cde50301d183fc244673c7f11e34997b11d21c33306c07ab820bf60d454afa8ad5b159c3442427c8cb5403896f29ed179b10d
-DIST apache-ant-1.9.13-src.tar.bz2 3954912 BLAKE2B 1ec249bb33f54fde80ba8a17248755e7412eb3415b14a03f0558bcc220c3eb47dc88128d435e59f10118f74c31eab8eea83f5d5db09640e1a5aaf08bac1490c1 SHA512 27cd4566df35a09873f32f897ea47c55ad3940f48440b52ce9838e5fcd9e8ca55b27151a25597f21c430cd2921e3b2b6b105962d0d40294a1eb06ed689b05810
-EBUILD ant-core-1.10.5-r2.ebuild 2653 BLAKE2B df4360edf2fbaa343490debf6e87548c572dfcfa44d87f3cac9f8b4808e058e9a69702f70cf218f8622a1e268d7f7235e83082f74abf89aa88f6f5ab93030aa9 SHA512 c3195af22b207302e9f77c4ee8e687f8a4b30bf71b3b53236fd783b345203bdaa36907e054f20c5b31db5d4b4cfeace518c7507624e285dfbfb8434758daf7ea
-EBUILD ant-core-1.10.7.ebuild 2817 BLAKE2B f7fb45d0f86f9142424264380dcf5fb2640a7e7d783210f2a9bd69b44249a83029944d3fc6e3ba17285ab17566d664530fa371a9a7fcdef1d19f50cbcc24ba53 SHA512 28226580698b9b3110d45408637d3bfd139dcc8fa4d24fe6309e1a15d4ec5c7056f63f88148d78e684f2f24c19bdaca831394ac2debfc814dcc5f195251b7d14
-EBUILD ant-core-1.9.13-r2.ebuild 2654 BLAKE2B 62f228991b0193a06c424ac9d6f2c114cfb7c0aa973be3b13e65ac6c476f02c3530db5c58bac14907b8cafbe6bc1fb76d3e2e3526ed5fd8ca4a47f0eadca340a SHA512 67e31bbd86bd6f6af968396cee7c526cbb992ab046b9918fc9f5d140dd42bb832eb490f8d7dd722fdbb9ed0ab41315f1b676943016e18c8733f522c7aec1cc88
+EBUILD ant-core-1.10.7.ebuild 2768 BLAKE2B 188fdb5427548cdf155bcbe6c16627aad533189eb2ac1f85fc8e8112de1571dacf83ca4388a1c9f367ee28f71e8c2a29f84d7cc481b3daa928f15759b22cd642 SHA512 50eba5fe3077ae9ada0f71d2739ba0179df19e4ebf70f3b8b2cc79da91353f22a76d7e9891104856e1b34c2046ff325b08fc2c41a08f1c5559417780345a1307
MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-core/ant-core-1.10.5-r2.ebuild b/dev-java/ant-core/ant-core-1.10.5-r2.ebuild
deleted file mode 100644
index 823285c258de..000000000000
--- a/dev-java/ant-core/ant-core-1.10.5-r2.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Don't depend on itself.
-JAVA_ANT_DISABLE_ANT_CORE_DEP="true"
-
-# Rewriting build.xml files for the testcases has no use at the moment.
-JAVA_PKG_BSFIX_ALL="no"
-JAVA_PKG_IUSE="doc source"
-
-inherit eutils java-pkg-2 java-ant-2 prefix eapi7-ver
-
-MY_P="apache-ant-${PV}"
-
-DESCRIPTION="Java-based build tool similar to 'make' that uses XML configuration files"
-HOMEPAGE="https://ant.apache.org/"
-SRC_URI="https://archive.apache.org/dist/ant/source/${MY_P}-src.tar.bz2
- https://dev.gentoo.org/~fordfrog/distfiles/ant-${PV}-r1-gentoo.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-DEPEND=">=virtual/jdk-1.8:*
- !dev-java/ant-tasks
- !dev-java/ant-optional"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-RESTRICT="test"
-
-src_prepare() {
- epatch "${WORKDIR}/${PV}-build.patch"
- epatch "${WORKDIR}/${PV}-launch.patch"
-
- eprefixify "${S}/src/script/ant"
-
- # 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
-}
-
-src_compile() {
- export ANT_HOME=""
- # Avoid error message that package ant-core was not found
- export ANT_TASKS="none"
-
- local bsyscp
-
- # This ensures that when building ant with bootstrapped ant,
- # only the source is used for resolving references, and not
- # the classes in bootstrapped ant but jikes in kaffe has issues with this...
- if ! java-pkg_current-vm-matches kaffe; then
- bsyscp="-Dbuild.sysclasspath=ignore"
- fi
-
- CLASSPATH="$(java-config -t)" ./build.sh ${bsyscp} jars dist-internal \
- $(use_doc javadocs) || die "build failed"
-}
-
-src_install() {
- dodir /usr/share/ant/lib
-
- for jar in ant.jar ant-bootstrap.jar ant-launcher.jar ; do
- java-pkg_dojar build/lib/${jar}
- dosym ../../${PN}/lib/${jar} /usr/share/ant/lib/${jar}
- done
-
- dobin src/script/ant
-
- dodir /usr/share/${PN}/bin
- for each in antRun antRun.pl runant.pl runant.py ; do
- dobin "${S}/src/script/${each}"
- dosym ../../../bin/${each} /usr/share/${PN}/bin/${each}
- done
- dosym ../${PN}/bin /usr/share/ant/bin
-
- insinto /usr/share/${PN}
- doins -r dist/etc
- dosym ../${PN}/etc /usr/share/ant/etc
-
- echo "ANT_HOME=\"${EPREFIX}/usr/share/ant\"" > "${T}/20ant"
- doenvd "${T}/20ant"
-
- dodoc NOTICE README WHATSNEW KEYS
-
- if use doc; then
- dohtml -r manual/*
- java-pkg_dojavadoc --symlink manual/api build/javadocs
- fi
-
- use source && java-pkg_dosrc src/main/*
-}
diff --git a/dev-java/ant-core/ant-core-1.10.7.ebuild b/dev-java/ant-core/ant-core-1.10.7.ebuild
index e9e1e3cd6aac..4c9e8245d240 100644
--- a/dev-java/ant-core/ant-core-1.10.7.ebuild
+++ b/dev-java/ant-core/ant-core-1.10.7.ebuild
@@ -21,11 +21,9 @@ SRC_URI="https://archive.apache.org/dist/ant/source/${MY_P}-src.tar.bz2
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-CDEPEND=">=virtual/jdk-1.8:*
- !dev-java/ant-tasks
- !dev-java/ant-optional"
+CDEPEND=">=virtual/jdk-1.8:*"
DEPEND="${CDEPEND}"
RDEPEND="${CDEPEND}"
diff --git a/dev-java/ant-core/ant-core-1.9.13-r2.ebuild b/dev-java/ant-core/ant-core-1.9.13-r2.ebuild
deleted file mode 100644
index 6452cfa885e8..000000000000
--- a/dev-java/ant-core/ant-core-1.9.13-r2.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Don't depend on itself.
-JAVA_ANT_DISABLE_ANT_CORE_DEP="true"
-
-# Rewriting build.xml files for the testcases has no use at the moment.
-JAVA_PKG_BSFIX_ALL="no"
-JAVA_PKG_IUSE="doc source"
-
-inherit eutils java-pkg-2 java-ant-2 prefix eapi7-ver
-
-MY_P="apache-ant-${PV}"
-
-DESCRIPTION="Java-based build tool similar to 'make' that uses XML configuration files"
-HOMEPAGE="https://ant.apache.org/"
-SRC_URI="https://archive.apache.org/dist/ant/source/${MY_P}-src.tar.bz2
- https://dev.gentoo.org/~fordfrog/distfiles/ant-${PV}-r1-gentoo.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-DEPEND=">=virtual/jdk-1.8:*
- !dev-java/ant-tasks
- !dev-java/ant-optional"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-RESTRICT="test"
-
-src_prepare() {
- epatch "${WORKDIR}/${PV}-build.patch"
- epatch "${WORKDIR}/${PV}-launch.patch"
-
- eprefixify "${S}/src/script/ant"
-
- # 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
-}
-
-src_compile() {
- export ANT_HOME=""
- # Avoid error message that package ant-core was not found
- export ANT_TASKS="none"
-
- local bsyscp
-
- # This ensures that when building ant with bootstrapped ant,
- # only the source is used for resolving references, and not
- # the classes in bootstrapped ant but jikes in kaffe has issues with this...
- if ! java-pkg_current-vm-matches kaffe; then
- bsyscp="-Dbuild.sysclasspath=ignore"
- fi
-
- CLASSPATH="$(java-config -t)" ./build.sh ${bsyscp} jars dist-internal \
- $(use_doc javadocs) || die "build failed"
-}
-
-src_install() {
- dodir /usr/share/ant/lib
-
- for jar in ant.jar ant-bootstrap.jar ant-launcher.jar ; do
- java-pkg_dojar build/lib/${jar}
- dosym ../../${PN}/lib/${jar} /usr/share/ant/lib/${jar}
- done
-
- dobin src/script/ant
-
- dodir /usr/share/${PN}/bin
- for each in antRun antRun.pl runant.pl runant.py ; do
- dobin "${S}/src/script/${each}"
- dosym ../../../bin/${each} /usr/share/${PN}/bin/${each}
- done
- dosym ../${PN}/bin /usr/share/ant/bin
-
- insinto /usr/share/${PN}
- doins -r dist/etc
- dosym ../${PN}/etc /usr/share/ant/etc
-
- echo "ANT_HOME=\"${EPREFIX}/usr/share/ant\"" > "${T}/20ant"
- doenvd "${T}/20ant"
-
- dodoc NOTICE README WHATSNEW KEYS
-
- if use doc; then
- dohtml -r manual/*
- java-pkg_dojavadoc --symlink manual/api build/javadocs
- fi
-
- use source && java-pkg_dosrc src/main/*
-}
diff --git a/dev-java/ant-jai/Manifest b/dev-java/ant-jai/Manifest
index e1e35ad1a467..500077fdce1f 100644
--- a/dev-java/ant-jai/Manifest
+++ b/dev-java/ant-jai/Manifest
@@ -1,10 +1,4 @@
-DIST ant-1.10.5-gentoo.tar.bz2 6381 BLAKE2B a03f5f57d3fdb43b5b08404e4e84fe82d1b8e9dff00ad25b78e3b9af55110e221b01f90424d193c729ed1025fe1690d0fb3507c2ab663961ea05e287ea2ff00a SHA512 c296a867328d0d5c471f0cb98efc9f5e5fbd16148e608373c6dd76a17f5e8b4785175615ea992b42c9864c6e0b975f9dc8dccd27703c958a72cb7e7c2ca78d4d
DIST ant-1.10.7-gentoo.tar.bz2 6686 BLAKE2B 77e5850b68ab079f26722b5b2ff1afb29a35197afb79f80ae2f775855e2d8f3a478324b1175e9a73695b4e6a6798bf4458dc84d2f763a1d72c331505d31303ea SHA512 f5c5a2ea99a780413a71799d56e783f3ac861169bd7f29c3a85d039f61240abb91ed223eeb111c67a6a1328a6cf2203d7cbf93ad762e49bc11f9a948e7f2091c
-DIST ant-1.9.13-gentoo.tar.bz2 7189 BLAKE2B 65bc50bb401cd9ad48763acfa1208e1d52a87bf4df3591dfcdb0f2ded2e7e70c9a42199b0160c7bc233dff83f6889b2ce5fd5aa09a76973f7ea03e963bc9e73e SHA512 0c04116399fa4e83e3283c6d2a69b562aeac0eacda44eb6ce0210e2b0846f48c72975dcfc17315e072226adeb6c1438cd7f83189d4e2974a8a90ec7c6534c898
-DIST apache-ant-1.10.5-src.tar.bz2 4465063 BLAKE2B 3cab99ae4a4800a42af3595ca6955877e3ab90c2df7086636b0f1ae0e3a45912f0c815164378616b758d76afe0a2f23cc0af6094d2f84fe17f29c3abe2e6f9aa SHA512 082dad03db4fb09b36560bd5e1fbd53f456eecad06d95140569661b6509861bb9b87b87843ef2f30a5de18c549dd993209aa17b47ac77d450f573309a272950e
DIST apache-ant-1.10.7-src.tar.bz2 4530166 BLAKE2B 6998fffbda6a0adbe3434ef0013b3e669ec8f15a09d9a5917509733f3232a538e9be83758b9eacccd673522812a8d482e1fd526d5493634d9c08759f47bfc7a7 SHA512 5849e81aa037b9ba7f4e67057a0cde50301d183fc244673c7f11e34997b11d21c33306c07ab820bf60d454afa8ad5b159c3442427c8cb5403896f29ed179b10d
-DIST apache-ant-1.9.13-src.tar.bz2 3954912 BLAKE2B 1ec249bb33f54fde80ba8a17248755e7412eb3415b14a03f0558bcc220c3eb47dc88128d435e59f10118f74c31eab8eea83f5d5db09640e1a5aaf08bac1490c1 SHA512 27cd4566df35a09873f32f897ea47c55ad3940f48440b52ce9838e5fcd9e8ca55b27151a25597f21c430cd2921e3b2b6b105962d0d40294a1eb06ed689b05810
-EBUILD ant-jai-1.10.5.ebuild 365 BLAKE2B 01d123b2736ee2c62e76877373354e36bab5d8a2a0921049b2686f9a3ebced433f35ead29d1649ac2ad970bd022f3271382b5878b58fac089295f65b0ecc7352 SHA512 4d9f2edb95473b8d4f93680c409b6568a68e634345bc6613921adda3862b3ae6a747b58fa04aeedaf614aaa7f89066e512023a519c4ee12b50cee10ff541b027
-EBUILD ant-jai-1.10.7.ebuild 368 BLAKE2B 6a2617274eff0e68d3f7caa502726a8cae8027bcec2e622bf1f8d63749d1af119f7827cbcca333b169ebf3f070694d717d72f267575b671de5bb093f0202decc SHA512 4f27a58ef3c64a093ea36a783386af5edb118ba0f35c29caa1f44575823a2de04110af5b41c7b5d68b01ccf5c67d43496a0b34d13b1b1f14b19c69d7b8a7704f
-EBUILD ant-jai-1.9.13.ebuild 365 BLAKE2B 01d123b2736ee2c62e76877373354e36bab5d8a2a0921049b2686f9a3ebced433f35ead29d1649ac2ad970bd022f3271382b5878b58fac089295f65b0ecc7352 SHA512 4d9f2edb95473b8d4f93680c409b6568a68e634345bc6613921adda3862b3ae6a747b58fa04aeedaf614aaa7f89066e512023a519c4ee12b50cee10ff541b027
+EBUILD ant-jai-1.10.7.ebuild 365 BLAKE2B f4ee2442dba7df688ded1f1b23fc80d14a91dd34084d7fce303f5ccc9bcaff130fa504e1eadf425fa9e71fa45a12fa2467ce4a3448f8c9c619e979b4701e5829 SHA512 fb1c82e6dd89e134a2983cc1ee28b6f2823a198eb82a3b2bdbb6ee1f76def106a1c808d17d1a0c17f2bfb4c73d97cc82e43f4751797bf8bc0a4de38c3bb9fb04
MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-jai/ant-jai-1.10.5.ebuild b/dev-java/ant-jai/ant-jai-1.10.5.ebuild
deleted file mode 100644
index e7040b30e24d..000000000000
--- a/dev-java/ant-jai/ant-jai-1.10.5.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ANT_TASK_JDKVER=1.8
-ANT_TASK_JREVER=1.8
-ANT_TASK_DEPNAME="sun-jai-bin"
-
-inherit ant-tasks
-
-KEYWORDS="amd64 ppc64 x86"
-
-# Unmigrated, has textrels and there's also some source one now too.
-DEPEND=">=dev-java/sun-jai-bin-1.1.2.01-r1"
-RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-jai/ant-jai-1.10.7.ebuild b/dev-java/ant-jai/ant-jai-1.10.7.ebuild
index d7c138ca85f3..65eabb258f33 100644
--- a/dev-java/ant-jai/ant-jai-1.10.7.ebuild
+++ b/dev-java/ant-jai/ant-jai-1.10.7.ebuild
@@ -9,7 +9,7 @@ ANT_TASK_DEPNAME="sun-jai-bin"
inherit ant-tasks
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ppc64 x86"
# Unmigrated, has textrels and there's also some source one now too.
DEPEND=">=dev-java/sun-jai-bin-1.1.2.01-r1"
diff --git a/dev-java/ant-jai/ant-jai-1.9.13.ebuild b/dev-java/ant-jai/ant-jai-1.9.13.ebuild
deleted file mode 100644
index e7040b30e24d..000000000000
--- a/dev-java/ant-jai/ant-jai-1.9.13.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ANT_TASK_JDKVER=1.8
-ANT_TASK_JREVER=1.8
-ANT_TASK_DEPNAME="sun-jai-bin"
-
-inherit ant-tasks
-
-KEYWORDS="amd64 ppc64 x86"
-
-# Unmigrated, has textrels and there's also some source one now too.
-DEPEND=">=dev-java/sun-jai-bin-1.1.2.01-r1"
-RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-javamail/Manifest b/dev-java/ant-javamail/Manifest
index 44e4fa1e8984..21a06a2fa8d8 100644
--- a/dev-java/ant-javamail/Manifest
+++ b/dev-java/ant-javamail/Manifest
@@ -1,10 +1,4 @@
-DIST ant-1.10.5-gentoo.tar.bz2 6381 BLAKE2B a03f5f57d3fdb43b5b08404e4e84fe82d1b8e9dff00ad25b78e3b9af55110e221b01f90424d193c729ed1025fe1690d0fb3507c2ab663961ea05e287ea2ff00a SHA512 c296a867328d0d5c471f0cb98efc9f5e5fbd16148e608373c6dd76a17f5e8b4785175615ea992b42c9864c6e0b975f9dc8dccd27703c958a72cb7e7c2ca78d4d
DIST ant-1.10.7-gentoo.tar.bz2 6686 BLAKE2B 77e5850b68ab079f26722b5b2ff1afb29a35197afb79f80ae2f775855e2d8f3a478324b1175e9a73695b4e6a6798bf4458dc84d2f763a1d72c331505d31303ea SHA512 f5c5a2ea99a780413a71799d56e783f3ac861169bd7f29c3a85d039f61240abb91ed223eeb111c67a6a1328a6cf2203d7cbf93ad762e49bc11f9a948e7f2091c
-DIST ant-1.9.13-gentoo.tar.bz2 7189 BLAKE2B 65bc50bb401cd9ad48763acfa1208e1d52a87bf4df3591dfcdb0f2ded2e7e70c9a42199b0160c7bc233dff83f6889b2ce5fd5aa09a76973f7ea03e963bc9e73e SHA512 0c04116399fa4e83e3283c6d2a69b562aeac0eacda44eb6ce0210e2b0846f48c72975dcfc17315e072226adeb6c1438cd7f83189d4e2974a8a90ec7c6534c898
-DIST apache-ant-1.10.5-src.tar.bz2 4465063 BLAKE2B 3cab99ae4a4800a42af3595ca6955877e3ab90c2df7086636b0f1ae0e3a45912f0c815164378616b758d76afe0a2f23cc0af6094d2f84fe17f29c3abe2e6f9aa SHA512 082dad03db4fb09b36560bd5e1fbd53f456eecad06d95140569661b6509861bb9b87b87843ef2f30a5de18c549dd993209aa17b47ac77d450f573309a272950e
DIST apache-ant-1.10.7-src.tar.bz2 4530166 BLAKE2B 6998fffbda6a0adbe3434ef0013b3e669ec8f15a09d9a5917509733f3232a538e9be83758b9eacccd673522812a8d482e1fd526d5493634d9c08759f47bfc7a7 SHA512 5849e81aa037b9ba7f4e67057a0cde50301d183fc244673c7f11e34997b11d21c33306c07ab820bf60d454afa8ad5b159c3442427c8cb5403896f29ed179b10d
-DIST apache-ant-1.9.13-src.tar.bz2 3954912 BLAKE2B 1ec249bb33f54fde80ba8a17248755e7412eb3415b14a03f0558bcc220c3eb47dc88128d435e59f10118f74c31eab8eea83f5d5db09640e1a5aaf08bac1490c1 SHA512 27cd4566df35a09873f32f897ea47c55ad3940f48440b52ce9838e5fcd9e8ca55b27151a25597f21c430cd2921e3b2b6b105962d0d40294a1eb06ed689b05810
-EBUILD ant-javamail-1.10.5.ebuild 529 BLAKE2B dbbe16298ad8cd48e364f11428feedcf61fd34f7274d1e0a1a459fb44ca66851418e3e84a1b9de6ee3fd650c8dfaa2d1f4653a6fe02c1edf2e2a9bc509113e06 SHA512 879e978e23637d1f72d1afd0fc39e54955de4c350ea2ebdaa42532fb273436efd557b31463784e219ae21f3b489862534d25accb3df8d92fdda12e41d1a1822c
-EBUILD ant-javamail-1.10.7.ebuild 532 BLAKE2B 11b8d77b3df387e7383f3a55a837ed4542a3e65198b512d5c6804a299330769c2d5761fe23bbadb364dc3d82064d9707687145471e9bfe6b96300c00fe10745a SHA512 bf62a4478b160618b208e1a9c2530ef22953b10076c9c69b38f9708b84d1aaa604473a18f6dd9a89b63868d807aea7ae88ce58692131c58e6a5d5c3c8f629f4a
-EBUILD ant-javamail-1.9.13.ebuild 509 BLAKE2B eca670652896ae4aa6db9e335b2af3938ef63b476ce869b0c5a1c76fe67ca1a2c6d2210204996a7f2b1cd51f387dd05353a19ddf6214e3ffab81a3b6476541a2 SHA512 adb4a707a4b9356b27e9d4b611cc4650ffafe8c48ae6f1cc8cf1da8e7edb8222988ac507d80b478bc403878504449586aef4e77b3ef5a81d5fec9c9d4143bec3
+EBUILD ant-javamail-1.10.7.ebuild 529 BLAKE2B 11926a8e6bbb86ac17517be775cb29c39c61ce6638101ad8f7374ea95c334fb85730b9c07499253845fd4a0825dc50c42f197d42506e274b98bcdb15e19894a4 SHA512 92015b3e212d01de9c01fa811ba4edbe4fda7433ce12842365835fc1c9c5114425b78316f61d2efaf1fe3466baaa04e2ea2d9bb09bf7301f429f38cb3624afc7
MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-javamail/ant-javamail-1.10.5.ebuild b/dev-java/ant-javamail/ant-javamail-1.10.5.ebuild
deleted file mode 100644
index 2a818de51649..000000000000
--- a/dev-java/ant-javamail/ant-javamail-1.10.5.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ANT_TASK_JDKVER=1.8
-ANT_TASK_JREVER=1.8
-ANT_TASK_DEPNAME=( "gnu-jaf-1" "oracle-javamail" )
-
-inherit ant-tasks
-
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-# needs some classes from javax.activation.* which are not in jdk 11
-DEPEND="virtual/jdk:1.8
- dev-java/gnu-jaf:1
- dev-java/oracle-javamail:0"
-RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-javamail/ant-javamail-1.10.7.ebuild b/dev-java/ant-javamail/ant-javamail-1.10.7.ebuild
index c0640d2c94ac..a376cbf43cca 100644
--- a/dev-java/ant-javamail/ant-javamail-1.10.7.ebuild
+++ b/dev-java/ant-javamail/ant-javamail-1.10.7.ebuild
@@ -9,7 +9,7 @@ ANT_TASK_DEPNAME=( "gnu-jaf-1" "oracle-javamail" )
inherit ant-tasks
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
# needs some classes from javax.activation.* which are not in jdk 11
DEPEND="virtual/jdk:1.8
diff --git a/dev-java/ant-javamail/ant-javamail-1.9.13.ebuild b/dev-java/ant-javamail/ant-javamail-1.9.13.ebuild
deleted file mode 100644
index f29242fcc930..000000000000
--- a/dev-java/ant-javamail/ant-javamail-1.9.13.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ANT_TASK_JDKVER=1.8
-ANT_TASK_JREVER=1.8
-ANT_TASK_DEPNAME=( "gnu-jaf-1" "oracle-javamail" )
-
-inherit ant-tasks
-
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-# needs some classes from javax.activation.* which are not in jdk 11
-DEPEND="virtual/jdk:1.8
- dev-java/oracle-javamail:0"
-RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-jdepend/Manifest b/dev-java/ant-jdepend/Manifest
index 6b09333ec9f3..0822e345efad 100644
--- a/dev-java/ant-jdepend/Manifest
+++ b/dev-java/ant-jdepend/Manifest
@@ -1,10 +1,4 @@
-DIST ant-1.10.5-gentoo.tar.bz2 6381 BLAKE2B a03f5f57d3fdb43b5b08404e4e84fe82d1b8e9dff00ad25b78e3b9af55110e221b01f90424d193c729ed1025fe1690d0fb3507c2ab663961ea05e287ea2ff00a SHA512 c296a867328d0d5c471f0cb98efc9f5e5fbd16148e608373c6dd76a17f5e8b4785175615ea992b42c9864c6e0b975f9dc8dccd27703c958a72cb7e7c2ca78d4d
DIST ant-1.10.7-gentoo.tar.bz2 6686 BLAKE2B 77e5850b68ab079f26722b5b2ff1afb29a35197afb79f80ae2f775855e2d8f3a478324b1175e9a73695b4e6a6798bf4458dc84d2f763a1d72c331505d31303ea SHA512 f5c5a2ea99a780413a71799d56e783f3ac861169bd7f29c3a85d039f61240abb91ed223eeb111c67a6a1328a6cf2203d7cbf93ad762e49bc11f9a948e7f2091c
-DIST ant-1.9.13-gentoo.tar.bz2 7189 BLAKE2B 65bc50bb401cd9ad48763acfa1208e1d52a87bf4df3591dfcdb0f2ded2e7e70c9a42199b0160c7bc233dff83f6889b2ce5fd5aa09a76973f7ea03e963bc9e73e SHA512 0c04116399fa4e83e3283c6d2a69b562aeac0eacda44eb6ce0210e2b0846f48c72975dcfc17315e072226adeb6c1438cd7f83189d4e2974a8a90ec7c6534c898
-DIST apache-ant-1.10.5-src.tar.bz2 4465063 BLAKE2B 3cab99ae4a4800a42af3595ca6955877e3ab90c2df7086636b0f1ae0e3a45912f0c815164378616b758d76afe0a2f23cc0af6094d2f84fe17f29c3abe2e6f9aa SHA512 082dad03db4fb09b36560bd5e1fbd53f456eecad06d95140569661b6509861bb9b87b87843ef2f30a5de18c549dd993209aa17b47ac77d450f573309a272950e
DIST apache-ant-1.10.7-src.tar.bz2 4530166 BLAKE2B 6998fffbda6a0adbe3434ef0013b3e669ec8f15a09d9a5917509733f3232a538e9be83758b9eacccd673522812a8d482e1fd526d5493634d9c08759f47bfc7a7 SHA512 5849e81aa037b9ba7f4e67057a0cde50301d183fc244673c7f11e34997b11d21c33306c07ab820bf60d454afa8ad5b159c3442427c8cb5403896f29ed179b10d
-DIST apache-ant-1.9.13-src.tar.bz2 3954912 BLAKE2B 1ec249bb33f54fde80ba8a17248755e7412eb3415b14a03f0558bcc220c3eb47dc88128d435e59f10118f74c31eab8eea83f5d5db09640e1a5aaf08bac1490c1 SHA512 27cd4566df35a09873f32f897ea47c55ad3940f48440b52ce9838e5fcd9e8ca55b27151a25597f21c430cd2921e3b2b6b105962d0d40294a1eb06ed689b05810
-EBUILD ant-jdepend-1.10.5.ebuild 373 BLAKE2B d14452867622a51876db8bc6d4f0e9a9aa04ad3a98292cf4d03eba0603ae890198e29b083195e0aeba823854804585f2d2ea5f01310f354a442f7013180bbd12 SHA512 6ef49c2fc02f4b2038cc893f026e679a69d7551e71ab3c91db61ebb2eb18ac3b2b6cb9722deaaf7fef93ce6656e5fbcb203a86af332e83e5ae2df4697a4948a0
-EBUILD ant-jdepend-1.10.7.ebuild 376 BLAKE2B 33eb5d417f65e230cfe8f5e83023ab4ce387a6636c9d0af2853c5a393da2f671934a824e53db990a377979da34259b242f766495969393e796327740a015af3c SHA512 9048e8c8159785769adec31e5b9b1879a5c99a6047c176cf50685b0cad98d5ac210443c2460536c7d55b43ef3221f0949f1771e2398518c904edd6392c69e790
-EBUILD ant-jdepend-1.9.13.ebuild 373 BLAKE2B d14452867622a51876db8bc6d4f0e9a9aa04ad3a98292cf4d03eba0603ae890198e29b083195e0aeba823854804585f2d2ea5f01310f354a442f7013180bbd12 SHA512 6ef49c2fc02f4b2038cc893f026e679a69d7551e71ab3c91db61ebb2eb18ac3b2b6cb9722deaaf7fef93ce6656e5fbcb203a86af332e83e5ae2df4697a4948a0
+EBUILD ant-jdepend-1.10.7.ebuild 373 BLAKE2B 1350dcf27709643920e3b0560da5a20b0b1e1b79712fdeed67ef19686c0f88abcf6938749eb089a84bbc2d817b1b323bca2989ee7d7795f407aac926fd1f666f SHA512 e2d9e355bed80c10783c7cde4079b78126c6c66747ccdee54b483e17423fc3631be2e24021f4586be593ebe0aa924c0d91bbd7d432eb9efb8d95ea3fa891c79b
MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-jdepend/ant-jdepend-1.10.5.ebuild b/dev-java/ant-jdepend/ant-jdepend-1.10.5.ebuild
deleted file mode 100644
index 8d01abfd0ad8..000000000000
--- a/dev-java/ant-jdepend/ant-jdepend-1.10.5.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ANT_TASK_JDKVER=1.8
-ANT_TASK_JREVER=1.8
-
-inherit ant-tasks
-
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-DEPEND=">=dev-java/jdepend-2.9-r2:0"
-RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-jdepend/ant-jdepend-1.10.7.ebuild b/dev-java/ant-jdepend/ant-jdepend-1.10.7.ebuild
index 89812bff409d..62714bc65d9f 100644
--- a/dev-java/ant-jdepend/ant-jdepend-1.10.7.ebuild
+++ b/dev-java/ant-jdepend/ant-jdepend-1.10.7.ebuild
@@ -8,7 +8,7 @@ ANT_TASK_JREVER=1.8
inherit ant-tasks
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
DEPEND=">=dev-java/jdepend-2.9-r2:0"
RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-jdepend/ant-jdepend-1.9.13.ebuild b/dev-java/ant-jdepend/ant-jdepend-1.9.13.ebuild
deleted file mode 100644
index 8d01abfd0ad8..000000000000
--- a/dev-java/ant-jdepend/ant-jdepend-1.9.13.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ANT_TASK_JDKVER=1.8
-ANT_TASK_JREVER=1.8
-
-inherit ant-tasks
-
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-DEPEND=">=dev-java/jdepend-2.9-r2:0"
-RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-jmf/Manifest b/dev-java/ant-jmf/Manifest
index 74c2490422f0..c56903ab8785 100644
--- a/dev-java/ant-jmf/Manifest
+++ b/dev-java/ant-jmf/Manifest
@@ -1,10 +1,4 @@
-DIST ant-1.10.5-gentoo.tar.bz2 6381 BLAKE2B a03f5f57d3fdb43b5b08404e4e84fe82d1b8e9dff00ad25b78e3b9af55110e221b01f90424d193c729ed1025fe1690d0fb3507c2ab663961ea05e287ea2ff00a SHA512 c296a867328d0d5c471f0cb98efc9f5e5fbd16148e608373c6dd76a17f5e8b4785175615ea992b42c9864c6e0b975f9dc8dccd27703c958a72cb7e7c2ca78d4d
DIST ant-1.10.7-gentoo.tar.bz2 6686 BLAKE2B 77e5850b68ab079f26722b5b2ff1afb29a35197afb79f80ae2f775855e2d8f3a478324b1175e9a73695b4e6a6798bf4458dc84d2f763a1d72c331505d31303ea SHA512 f5c5a2ea99a780413a71799d56e783f3ac861169bd7f29c3a85d039f61240abb91ed223eeb111c67a6a1328a6cf2203d7cbf93ad762e49bc11f9a948e7f2091c
-DIST ant-1.9.13-gentoo.tar.bz2 7189 BLAKE2B 65bc50bb401cd9ad48763acfa1208e1d52a87bf4df3591dfcdb0f2ded2e7e70c9a42199b0160c7bc233dff83f6889b2ce5fd5aa09a76973f7ea03e963bc9e73e SHA512 0c04116399fa4e83e3283c6d2a69b562aeac0eacda44eb6ce0210e2b0846f48c72975dcfc17315e072226adeb6c1438cd7f83189d4e2974a8a90ec7c6534c898
-DIST apache-ant-1.10.5-src.tar.bz2 4465063 BLAKE2B 3cab99ae4a4800a42af3595ca6955877e3ab90c2df7086636b0f1ae0e3a45912f0c815164378616b758d76afe0a2f23cc0af6094d2f84fe17f29c3abe2e6f9aa SHA512 082dad03db4fb09b36560bd5e1fbd53f456eecad06d95140569661b6509861bb9b87b87843ef2f30a5de18c549dd993209aa17b47ac77d450f573309a272950e
DIST apache-ant-1.10.7-src.tar.bz2 4530166 BLAKE2B 6998fffbda6a0adbe3434ef0013b3e669ec8f15a09d9a5917509733f3232a538e9be83758b9eacccd673522812a8d482e1fd526d5493634d9c08759f47bfc7a7 SHA512 5849e81aa037b9ba7f4e67057a0cde50301d183fc244673c7f11e34997b11d21c33306c07ab820bf60d454afa8ad5b159c3442427c8cb5403896f29ed179b10d
-DIST apache-ant-1.9.13-src.tar.bz2 3954912 BLAKE2B 1ec249bb33f54fde80ba8a17248755e7412eb3415b14a03f0558bcc220c3eb47dc88128d435e59f10118f74c31eab8eea83f5d5db09640e1a5aaf08bac1490c1 SHA512 27cd4566df35a09873f32f897ea47c55ad3940f48440b52ce9838e5fcd9e8ca55b27151a25597f21c430cd2921e3b2b6b105962d0d40294a1eb06ed689b05810
-EBUILD ant-jmf-1.10.5.ebuild 477 BLAKE2B e0e27fd10e9c67ea3f59aac03c124f49f0417f0013b3fba11bda5de5a7608dd092d680d9228667dde113ba5b1b3afe143c026da14318814022af0b9085f057c0 SHA512 273ab0b8899c84bed50556cc7ff6567f91d4913d1fcf3d6d624b4d5893bedc3b3770fc7896bafa4ebd46a898534bfccf65b29dcc74e1230987ff496caf18c876
-EBUILD ant-jmf-1.10.7.ebuild 480 BLAKE2B e513bd2ddb1d7acea4158070f4276eab4897afbf2ac394a2a7db1edaea408aad7a3fa1515cffd8153b11ea94083534e0370e3930c4ab35ba318cc54b387f9821 SHA512 2c8f91482e72b774c335902409439c4e2ce826c76c8691b2d405a38707a713fe9ed551bc61a1d66d1b04cd8b6a2fc9538c36c501983c639af2a0db49353dc4ff
-EBUILD ant-jmf-1.9.13.ebuild 477 BLAKE2B e0e27fd10e9c67ea3f59aac03c124f49f0417f0013b3fba11bda5de5a7608dd092d680d9228667dde113ba5b1b3afe143c026da14318814022af0b9085f057c0 SHA512 273ab0b8899c84bed50556cc7ff6567f91d4913d1fcf3d6d624b4d5893bedc3b3770fc7896bafa4ebd46a898534bfccf65b29dcc74e1230987ff496caf18c876
+EBUILD ant-jmf-1.10.7.ebuild 477 BLAKE2B d459cbd23be12db89687f3d3e771d8bd6ff0cfcdd26c01c98821f341f75820287b895e70341d7836efdae4e878bf89dfb1d08bc5d327e5b05753a578def06c65 SHA512 99b6963ddbeeedcb4a3bdcb0d8a877c732ae796398373e2c65625e0f4bbe1d862f505670457dd9252167d3285971536a877ae036e7ddcf8a95d9304df43525bb
MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-jmf/ant-jmf-1.10.5.ebuild b/dev-java/ant-jmf/ant-jmf-1.10.5.ebuild
deleted file mode 100644
index a85c9005c40f..000000000000
--- a/dev-java/ant-jmf/ant-jmf-1.10.5.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ANT_TASK_JDKVER=1.8
-ANT_TASK_JREVER=1.8
-# Seems we don't need to depend on jmf-bin, the classes ant imports are in J2SE
-# API since version 1.3.
-ANT_TASK_DEPNAME=""
-
-inherit ant-tasks
-
-DESCRIPTION="Apache Ant's optional tasks for the Java Media Framework (JMF)"
-
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
diff --git a/dev-java/ant-jmf/ant-jmf-1.10.7.ebuild b/dev-java/ant-jmf/ant-jmf-1.10.7.ebuild
index 419a4e56e719..ad64f691d610 100644
--- a/dev-java/ant-jmf/ant-jmf-1.10.7.ebuild
+++ b/dev-java/ant-jmf/ant-jmf-1.10.7.ebuild
@@ -13,4 +13,4 @@ inherit ant-tasks
DESCRIPTION="Apache Ant's optional tasks for the Java Media Framework (JMF)"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
diff --git a/dev-java/ant-jmf/ant-jmf-1.9.13.ebuild b/dev-java/ant-jmf/ant-jmf-1.9.13.ebuild
deleted file mode 100644
index a85c9005c40f..000000000000
--- a/dev-java/ant-jmf/ant-jmf-1.9.13.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ANT_TASK_JDKVER=1.8
-ANT_TASK_JREVER=1.8
-# Seems we don't need to depend on jmf-bin, the classes ant imports are in J2SE
-# API since version 1.3.
-ANT_TASK_DEPNAME=""
-
-inherit ant-tasks
-
-DESCRIPTION="Apache Ant's optional tasks for the Java Media Framework (JMF)"
-
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
diff --git a/dev-java/ant-jsch/Manifest b/dev-java/ant-jsch/Manifest
index 670e057fe58d..89e74f7e4409 100644
--- a/dev-java/ant-jsch/Manifest
+++ b/dev-java/ant-jsch/Manifest
@@ -1,10 +1,4 @@
-DIST ant-1.10.5-gentoo.tar.bz2 6381 BLAKE2B a03f5f57d3fdb43b5b08404e4e84fe82d1b8e9dff00ad25b78e3b9af55110e221b01f90424d193c729ed1025fe1690d0fb3507c2ab663961ea05e287ea2ff00a SHA512 c296a867328d0d5c471f0cb98efc9f5e5fbd16148e608373c6dd76a17f5e8b4785175615ea992b42c9864c6e0b975f9dc8dccd27703c958a72cb7e7c2ca78d4d
DIST ant-1.10.7-gentoo.tar.bz2 6686 BLAKE2B 77e5850b68ab079f26722b5b2ff1afb29a35197afb79f80ae2f775855e2d8f3a478324b1175e9a73695b4e6a6798bf4458dc84d2f763a1d72c331505d31303ea SHA512 f5c5a2ea99a780413a71799d56e783f3ac861169bd7f29c3a85d039f61240abb91ed223eeb111c67a6a1328a6cf2203d7cbf93ad762e49bc11f9a948e7f2091c
-DIST ant-1.9.13-gentoo.tar.bz2 7189 BLAKE2B 65bc50bb401cd9ad48763acfa1208e1d52a87bf4df3591dfcdb0f2ded2e7e70c9a42199b0160c7bc233dff83f6889b2ce5fd5aa09a76973f7ea03e963bc9e73e SHA512 0c04116399fa4e83e3283c6d2a69b562aeac0eacda44eb6ce0210e2b0846f48c72975dcfc17315e072226adeb6c1438cd7f83189d4e2974a8a90ec7c6534c898
-DIST apache-ant-1.10.5-src.tar.bz2 4465063 BLAKE2B 3cab99ae4a4800a42af3595ca6955877e3ab90c2df7086636b0f1ae0e3a45912f0c815164378616b758d76afe0a2f23cc0af6094d2f84fe17f29c3abe2e6f9aa SHA512 082dad03db4fb09b36560bd5e1fbd53f456eecad06d95140569661b6509861bb9b87b87843ef2f30a5de18c549dd993209aa17b47ac77d450f573309a272950e
DIST apache-ant-1.10.7-src.tar.bz2 4530166 BLAKE2B 6998fffbda6a0adbe3434ef0013b3e669ec8f15a09d9a5917509733f3232a538e9be83758b9eacccd673522812a8d482e1fd526d5493634d9c08759f47bfc7a7 SHA512 5849e81aa037b9ba7f4e67057a0cde50301d183fc244673c7f11e34997b11d21c33306c07ab820bf60d454afa8ad5b159c3442427c8cb5403896f29ed179b10d
-DIST apache-ant-1.9.13-src.tar.bz2 3954912 BLAKE2B 1ec249bb33f54fde80ba8a17248755e7412eb3415b14a03f0558bcc220c3eb47dc88128d435e59f10118f74c31eab8eea83f5d5db09640e1a5aaf08bac1490c1 SHA512 27cd4566df35a09873f32f897ea47c55ad3940f48440b52ce9838e5fcd9e8ca55b27151a25597f21c430cd2921e3b2b6b105962d0d40294a1eb06ed689b05810
-EBUILD ant-jsch-1.10.5.ebuild 370 BLAKE2B ab08572c64c2bfe212d303f6216598f96e32584cfdbf791a2b37c929334851a88156e8f8e688866ad1e670f6cdc32848f491061c1d8af3018f4f89cee9e79a37 SHA512 2e57a4c727c97c62a35ff61916cc3c618a78416d0d298941f3188dc6efb01e9bd8b26eab02d340a2c888762e4775e4a6d486477452f1c1a589e2a225bda5f625
-EBUILD ant-jsch-1.10.7.ebuild 373 BLAKE2B e4625857c86f91f250e820a46e8cfcbf38636b1756c32402802faa89314ec11df08750358e3bbfb6175d372ac182e13eafe6793461ae6537a4cc7982483c7a01 SHA512 5f4d989c1f725e1dcb45ecd475d0a61f07bec8eefa70f6771aa58ea20f6380e4f08eea44d918257c02ee83565baacb69d0c75738824f81b3525c71aa32ddf9af
-EBUILD ant-jsch-1.9.13.ebuild 370 BLAKE2B ab08572c64c2bfe212d303f6216598f96e32584cfdbf791a2b37c929334851a88156e8f8e688866ad1e670f6cdc32848f491061c1d8af3018f4f89cee9e79a37 SHA512 2e57a4c727c97c62a35ff61916cc3c618a78416d0d298941f3188dc6efb01e9bd8b26eab02d340a2c888762e4775e4a6d486477452f1c1a589e2a225bda5f625
+EBUILD ant-jsch-1.10.7.ebuild 370 BLAKE2B 93a0b9c02e2650b09359c38c44579693c69e8614b52a8c2ed0a2fa20d3f9870e4d0d88a09b53c6f8ac191787deec45eb400c111ae70c1ce67f35c6ff895b99fa SHA512 3c82cdfecdb2c34ee3ddbd4ab62c436dd339f5a85429f6d27912150ddac1405222d484c0b174827ab299c3911a3d2526150e69e04315d2f5c65b8ad4d0486c20
MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-jsch/ant-jsch-1.10.5.ebuild b/dev-java/ant-jsch/ant-jsch-1.10.5.ebuild
deleted file mode 100644
index ff9b37b1c72f..000000000000
--- a/dev-java/ant-jsch/ant-jsch-1.10.5.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ANT_TASK_JDKVER=1.8
-ANT_TASK_JREVER=1.8
-
-inherit ant-tasks
-
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-DEPEND=">=dev-java/jsch-0.1.37:0"
-RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-jsch/ant-jsch-1.10.7.ebuild b/dev-java/ant-jsch/ant-jsch-1.10.7.ebuild
index 3d78c1a06cff..9ae89c252c39 100644
--- a/dev-java/ant-jsch/ant-jsch-1.10.7.ebuild
+++ b/dev-java/ant-jsch/ant-jsch-1.10.7.ebuild
@@ -8,7 +8,7 @@ ANT_TASK_JREVER=1.8
inherit ant-tasks
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
DEPEND=">=dev-java/jsch-0.1.37:0"
RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-jsch/ant-jsch-1.9.13.ebuild b/dev-java/ant-jsch/ant-jsch-1.9.13.ebuild
deleted file mode 100644
index ff9b37b1c72f..000000000000
--- a/dev-java/ant-jsch/ant-jsch-1.9.13.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ANT_TASK_JDKVER=1.8
-ANT_TASK_JREVER=1.8
-
-inherit ant-tasks
-
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-DEPEND=">=dev-java/jsch-0.1.37:0"
-RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-junit/Manifest b/dev-java/ant-junit/Manifest
index 1761dec646a3..aca375ab0a61 100644
--- a/dev-java/ant-junit/Manifest
+++ b/dev-java/ant-junit/Manifest
@@ -1,10 +1,4 @@
-DIST ant-1.10.5-gentoo.tar.bz2 6381 BLAKE2B a03f5f57d3fdb43b5b08404e4e84fe82d1b8e9dff00ad25b78e3b9af55110e221b01f90424d193c729ed1025fe1690d0fb3507c2ab663961ea05e287ea2ff00a SHA512 c296a867328d0d5c471f0cb98efc9f5e5fbd16148e608373c6dd76a17f5e8b4785175615ea992b42c9864c6e0b975f9dc8dccd27703c958a72cb7e7c2ca78d4d
DIST ant-1.10.7-gentoo.tar.bz2 6686 BLAKE2B 77e5850b68ab079f26722b5b2ff1afb29a35197afb79f80ae2f775855e2d8f3a478324b1175e9a73695b4e6a6798bf4458dc84d2f763a1d72c331505d31303ea SHA512 f5c5a2ea99a780413a71799d56e783f3ac861169bd7f29c3a85d039f61240abb91ed223eeb111c67a6a1328a6cf2203d7cbf93ad762e49bc11f9a948e7f2091c
-DIST ant-1.9.13-gentoo.tar.bz2 7189 BLAKE2B 65bc50bb401cd9ad48763acfa1208e1d52a87bf4df3591dfcdb0f2ded2e7e70c9a42199b0160c7bc233dff83f6889b2ce5fd5aa09a76973f7ea03e963bc9e73e SHA512 0c04116399fa4e83e3283c6d2a69b562aeac0eacda44eb6ce0210e2b0846f48c72975dcfc17315e072226adeb6c1438cd7f83189d4e2974a8a90ec7c6534c898
-DIST apache-ant-1.10.5-src.tar.bz2 4465063 BLAKE2B 3cab99ae4a4800a42af3595ca6955877e3ab90c2df7086636b0f1ae0e3a45912f0c815164378616b758d76afe0a2f23cc0af6094d2f84fe17f29c3abe2e6f9aa SHA512 082dad03db4fb09b36560bd5e1fbd53f456eecad06d95140569661b6509861bb9b87b87843ef2f30a5de18c549dd993209aa17b47ac77d450f573309a272950e
DIST apache-ant-1.10.7-src.tar.bz2 4530166 BLAKE2B 6998fffbda6a0adbe3434ef0013b3e669ec8f15a09d9a5917509733f3232a538e9be83758b9eacccd673522812a8d482e1fd526d5493634d9c08759f47bfc7a7 SHA512 5849e81aa037b9ba7f4e67057a0cde50301d183fc244673c7f11e34997b11d21c33306c07ab820bf60d454afa8ad5b159c3442427c8cb5403896f29ed179b10d
-DIST apache-ant-1.9.13-src.tar.bz2 3954912 BLAKE2B 1ec249bb33f54fde80ba8a17248755e7412eb3415b14a03f0558bcc220c3eb47dc88128d435e59f10118f74c31eab8eea83f5d5db09640e1a5aaf08bac1490c1 SHA512 27cd4566df35a09873f32f897ea47c55ad3940f48440b52ce9838e5fcd9e8ca55b27151a25597f21c430cd2921e3b2b6b105962d0d40294a1eb06ed689b05810
-EBUILD ant-junit-1.10.5-r1.ebuild 496 BLAKE2B 54692d1ed0dd3ae37b961b67e064378d6ba861276dbf4a2935e52296ff5d11eb868bea3bc50adfb61e6095c3758ce044b139ca16b6cd26be8eb71508b2fbae6a SHA512 0f2e756b2131d5181d71feef7b0d2b395b5c2ed1f5c7df0e7d139fd6c105f70ce4230545c1ceddda1be21674f41e0f8a35049e33d3005a97d5acd071b50c094f
-EBUILD ant-junit-1.10.7.ebuild 500 BLAKE2B 83475c488afb53dc0a9269bebfb4d461bde7b2a153b3bb1bb96366bd64c241bc11a893ed1b2b62ec8eb8e678a3979a1793f52363c20d4edec4be076c58f7575a SHA512 d66c56dd7cd1e34e23c79101359b4e2a926998ec383eb28c2ce71371186d76184a0b5681ac5f48845d876f7f8f6c4b378f7e408683a92614abf6a11b51c0bdd4
-EBUILD ant-junit-1.9.13-r1.ebuild 497 BLAKE2B 0207bc0b6a519399adcb49c2ddcbc1a73ecb39bf54a87e726fd33346ffc6b3f4163b2fcb70796540ec55a143fe38694d580eab5beb5fd34ba10dbf821db27028 SHA512 36ef29c67d3c0051837a474ea185023cc1664f67d7fc4cf7252ac65f8d0e2519e779bf2aecbe77487cea9f9172da0b3f5d3bf56b36e481853438053c65f669ca
+EBUILD ant-junit-1.10.7.ebuild 496 BLAKE2B 286ed5603b8fdde53f11a056b47c05fb5c0423fa38b7b5a22168d5db47a892f9f41ac9be814f79cc3fc8986ce1d8955b755a88fe988d4ddb0732061295857577 SHA512 5ba204c07a7079c70ef36b8729fb15411862a5ce808b148eb1514973dd216b359ae60b61821a77a65e6280b9dd85d0641f2e0dea25da10318736ca0d3bd2551a
MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-junit/ant-junit-1.10.5-r1.ebuild b/dev-java/ant-junit/ant-junit-1.10.5-r1.ebuild
deleted file mode 100644
index 396f79a943f4..000000000000
--- a/dev-java/ant-junit/ant-junit-1.10.5-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ANT_TASK_JDKVER=1.8
-ANT_TASK_JREVER=1.8
-
-inherit ant-tasks
-
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-DEPEND="
- dev-java/junit:0
- dev-java/junit:4
-"
-RDEPEND="${DEPEND}"
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="junit-4"
-
-src_compile() {
- eant jar-junit
-}
diff --git a/dev-java/ant-junit/ant-junit-1.10.7.ebuild b/dev-java/ant-junit/ant-junit-1.10.7.ebuild
index 19d5b57501e8..e2d1e14ddca2 100644
--- a/dev-java/ant-junit/ant-junit-1.10.7.ebuild
+++ b/dev-java/ant-junit/ant-junit-1.10.7.ebuild
@@ -8,7 +8,7 @@ ANT_TASK_JREVER=1.8
inherit ant-tasks
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
DEPEND="
dev-java/junit:0
diff --git a/dev-java/ant-junit/ant-junit-1.9.13-r1.ebuild b/dev-java/ant-junit/ant-junit-1.9.13-r1.ebuild
deleted file mode 100644
index db0df142a354..000000000000
--- a/dev-java/ant-junit/ant-junit-1.9.13-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ANT_TASK_JDKVER=1.8
-ANT_TASK_JREVER=1.8
-
-inherit ant-tasks
-
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-DEPEND="
- dev-java/junit:0
- dev-java/junit:4
-"
-RDEPEND="${DEPEND}"
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="junit-4"
-
-src_compile() {
- eant jar-junit
-}
diff --git a/dev-java/ant-junit4/Manifest b/dev-java/ant-junit4/Manifest
index 4f4dce112378..bfe667632dd9 100644
--- a/dev-java/ant-junit4/Manifest
+++ b/dev-java/ant-junit4/Manifest
@@ -1,10 +1,4 @@
-DIST ant-1.10.5-gentoo.tar.bz2 6381 BLAKE2B a03f5f57d3fdb43b5b08404e4e84fe82d1b8e9dff00ad25b78e3b9af55110e221b01f90424d193c729ed1025fe1690d0fb3507c2ab663961ea05e287ea2ff00a SHA512 c296a867328d0d5c471f0cb98efc9f5e5fbd16148e608373c6dd76a17f5e8b4785175615ea992b42c9864c6e0b975f9dc8dccd27703c958a72cb7e7c2ca78d4d
DIST ant-1.10.7-gentoo.tar.bz2 6686 BLAKE2B 77e5850b68ab079f26722b5b2ff1afb29a35197afb79f80ae2f775855e2d8f3a478324b1175e9a73695b4e6a6798bf4458dc84d2f763a1d72c331505d31303ea SHA512 f5c5a2ea99a780413a71799d56e783f3ac861169bd7f29c3a85d039f61240abb91ed223eeb111c67a6a1328a6cf2203d7cbf93ad762e49bc11f9a948e7f2091c
-DIST ant-1.9.13-gentoo.tar.bz2 7189 BLAKE2B 65bc50bb401cd9ad48763acfa1208e1d52a87bf4df3591dfcdb0f2ded2e7e70c9a42199b0160c7bc233dff83f6889b2ce5fd5aa09a76973f7ea03e963bc9e73e SHA512 0c04116399fa4e83e3283c6d2a69b562aeac0eacda44eb6ce0210e2b0846f48c72975dcfc17315e072226adeb6c1438cd7f83189d4e2974a8a90ec7c6534c898
-DIST apache-ant-1.10.5-src.tar.bz2 4465063 BLAKE2B 3cab99ae4a4800a42af3595ca6955877e3ab90c2df7086636b0f1ae0e3a45912f0c815164378616b758d76afe0a2f23cc0af6094d2f84fe17f29c3abe2e6f9aa SHA512 082dad03db4fb09b36560bd5e1fbd53f456eecad06d95140569661b6509861bb9b87b87843ef2f30a5de18c549dd993209aa17b47ac77d450f573309a272950e
DIST apache-ant-1.10.7-src.tar.bz2 4530166 BLAKE2B 6998fffbda6a0adbe3434ef0013b3e669ec8f15a09d9a5917509733f3232a538e9be83758b9eacccd673522812a8d482e1fd526d5493634d9c08759f47bfc7a7 SHA512 5849e81aa037b9ba7f4e67057a0cde50301d183fc244673c7f11e34997b11d21c33306c07ab820bf60d454afa8ad5b159c3442427c8cb5403896f29ed179b10d
-DIST apache-ant-1.9.13-src.tar.bz2 3954912 BLAKE2B 1ec249bb33f54fde80ba8a17248755e7412eb3415b14a03f0558bcc220c3eb47dc88128d435e59f10118f74c31eab8eea83f5d5db09640e1a5aaf08bac1490c1 SHA512 27cd4566df35a09873f32f897ea47c55ad3940f48440b52ce9838e5fcd9e8ca55b27151a25597f21c430cd2921e3b2b6b105962d0d40294a1eb06ed689b05810
-EBUILD ant-junit4-1.10.5.ebuild 940 BLAKE2B f4eff21908f9362bf6d00892cfbf4db10f898c45e3e207a939c6cc2c4db2591d53d3ffd4570b3537d944138a85185a5a381cf357acf33785e0ae7e3dc1423e1c SHA512 25c9a902be0d5f28cd2fc364a50542d33ecc2f42e8180af31caee13811fd078cef6c724b798d21948a36d7df0adc814cba05a419e7ea66628a16783ea4629cfd
-EBUILD ant-junit4-1.10.7.ebuild 943 BLAKE2B 0ad78e1848caeb51dd1524301f86f7a3b68573d071fbdd1f292e71dc28d0da03f5fbefc9135207497138a49c41a27731d5a3ff39b6a9d2f232a419ce84c680f9 SHA512 3584de5cb4fccc25aff05855ec7f0a740e8203c126e6d633b5f59ad9c88fdbbb49d2e6b141ff2d02ca651f570fee90a59d0548b62b0d677c8b50f86c8bc66cbb
-EBUILD ant-junit4-1.9.13.ebuild 940 BLAKE2B f4eff21908f9362bf6d00892cfbf4db10f898c45e3e207a939c6cc2c4db2591d53d3ffd4570b3537d944138a85185a5a381cf357acf33785e0ae7e3dc1423e1c SHA512 25c9a902be0d5f28cd2fc364a50542d33ecc2f42e8180af31caee13811fd078cef6c724b798d21948a36d7df0adc814cba05a419e7ea66628a16783ea4629cfd
+EBUILD ant-junit4-1.10.7.ebuild 939 BLAKE2B 7ccbe217a1cfef571a1c11aba47c16a78d671abac94b8e4a8a1027dc0c4e941e3f91a1a5e80ceb47aba59319313b1bc37189ec04e442607ca04c605ac1b4890d SHA512 18936a5e9143e89587f9f98619a37b919f6ecce39d02941b8e1cec26f5169ae81edf969a1b465783cc63a625145b9e633cc774a92ec9053904aab1c0ddb02bac
MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-junit4/ant-junit4-1.10.5.ebuild b/dev-java/ant-junit4/ant-junit4-1.10.5.ebuild
deleted file mode 100644
index 676db3e8bdee..000000000000
--- a/dev-java/ant-junit4/ant-junit4-1.10.5.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ANT_TASK_JDKVER=1.8
-ANT_TASK_JREVER=1.8
-ANT_TASK_DEPNAME="junit-4"
-
-inherit ant-tasks
-
-KEYWORDS="amd64 ~arm64 ppc64 x86"
-
-DEPEND="dev-java/junit:4
- ~dev-java/ant-junit-${PV}"
-
-RDEPEND="${DEPEND}"
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="junit-4,ant-junit"
-
-src_prepare() {
- default
-
- java-pkg_jar-from --build-only --into "${S}/lib" ant-junit
-}
-
-src_install() {
- # No registration as ant-task, would be loaded together with ant-junit.
- java-pkg_dojar build/lib/ant-junit4.jar
-
- # As we dont't want to depend on and-junit in package.env, because it depends
- # on junit:0. Instead, we "steal" its jar and record it to our package.env as
- # if it belongs to this package's classpath.
- java-pkg_getjar --build-only ant-junit ant-junit.jar
- java-pkg_regjar $(java-pkg_getjar --build-only ant-junit ant-junit.jar)
-}
diff --git a/dev-java/ant-junit4/ant-junit4-1.10.7.ebuild b/dev-java/ant-junit4/ant-junit4-1.10.7.ebuild
index 7dc055115082..756310d347a2 100644
--- a/dev-java/ant-junit4/ant-junit4-1.10.7.ebuild
+++ b/dev-java/ant-junit4/ant-junit4-1.10.7.ebuild
@@ -9,7 +9,7 @@ ANT_TASK_DEPNAME="junit-4"
inherit ant-tasks
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ppc64 x86"
DEPEND="dev-java/junit:4
~dev-java/ant-junit-${PV}"
diff --git a/dev-java/ant-junit4/ant-junit4-1.9.13.ebuild b/dev-java/ant-junit4/ant-junit4-1.9.13.ebuild
deleted file mode 100644
index 676db3e8bdee..000000000000
--- a/dev-java/ant-junit4/ant-junit4-1.9.13.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ANT_TASK_JDKVER=1.8
-ANT_TASK_JREVER=1.8
-ANT_TASK_DEPNAME="junit-4"
-
-inherit ant-tasks
-
-KEYWORDS="amd64 ~arm64 ppc64 x86"
-
-DEPEND="dev-java/junit:4
- ~dev-java/ant-junit-${PV}"
-
-RDEPEND="${DEPEND}"
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_GENTOO_CLASSPATH="junit-4,ant-junit"
-
-src_prepare() {
- default
-
- java-pkg_jar-from --build-only --into "${S}/lib" ant-junit
-}
-
-src_install() {
- # No registration as ant-task, would be loaded together with ant-junit.
- java-pkg_dojar build/lib/ant-junit4.jar
-
- # As we dont't want to depend on and-junit in package.env, because it depends
- # on junit:0. Instead, we "steal" its jar and record it to our package.env as
- # if it belongs to this package's classpath.
- java-pkg_getjar --build-only ant-junit ant-junit.jar
- java-pkg_regjar $(java-pkg_getjar --build-only ant-junit ant-junit.jar)
-}
diff --git a/dev-java/ant-junitlauncher/Manifest b/dev-java/ant-junitlauncher/Manifest
index d8973d8858a5..c62004cef0dc 100644
--- a/dev-java/ant-junitlauncher/Manifest
+++ b/dev-java/ant-junitlauncher/Manifest
@@ -1,7 +1,4 @@
-DIST ant-1.10.5-gentoo.tar.bz2 6381 BLAKE2B a03f5f57d3fdb43b5b08404e4e84fe82d1b8e9dff00ad25b78e3b9af55110e221b01f90424d193c729ed1025fe1690d0fb3507c2ab663961ea05e287ea2ff00a SHA512 c296a867328d0d5c471f0cb98efc9f5e5fbd16148e608373c6dd76a17f5e8b4785175615ea992b42c9864c6e0b975f9dc8dccd27703c958a72cb7e7c2ca78d4d
DIST ant-1.10.7-gentoo.tar.bz2 6686 BLAKE2B 77e5850b68ab079f26722b5b2ff1afb29a35197afb79f80ae2f775855e2d8f3a478324b1175e9a73695b4e6a6798bf4458dc84d2f763a1d72c331505d31303ea SHA512 f5c5a2ea99a780413a71799d56e783f3ac861169bd7f29c3a85d039f61240abb91ed223eeb111c67a6a1328a6cf2203d7cbf93ad762e49bc11f9a948e7f2091c
-DIST apache-ant-1.10.5-src.tar.bz2 4465063 BLAKE2B 3cab99ae4a4800a42af3595ca6955877e3ab90c2df7086636b0f1ae0e3a45912f0c815164378616b758d76afe0a2f23cc0af6094d2f84fe17f29c3abe2e6f9aa SHA512 082dad03db4fb09b36560bd5e1fbd53f456eecad06d95140569661b6509861bb9b87b87843ef2f30a5de18c549dd993209aa17b47ac77d450f573309a272950e
DIST apache-ant-1.10.7-src.tar.bz2 4530166 BLAKE2B 6998fffbda6a0adbe3434ef0013b3e669ec8f15a09d9a5917509733f3232a538e9be83758b9eacccd673522812a8d482e1fd526d5493634d9c08759f47bfc7a7 SHA512 5849e81aa037b9ba7f4e67057a0cde50301d183fc244673c7f11e34997b11d21c33306c07ab820bf60d454afa8ad5b159c3442427c8cb5403896f29ed179b10d
-EBUILD ant-junitlauncher-1.10.5.ebuild 347 BLAKE2B 2ab9a7ecb10b7634d4cc6d0b4f177fae88cb821384952014db6831a2c6b7b40d9d6d5fe064dba413b716eb47c54d11e227ae9d53b35109a2618e3cb262821514 SHA512 6dff0abaa30952daa2302e3fa870dba41b6fe6807da6dcf2aec71b9eb10aafb2582dbad81d3bc3924a564232b675479c9ba942f1126c6208051d1a0b0f719794
-EBUILD ant-junitlauncher-1.10.7.ebuild 350 BLAKE2B 0384d0f60b37a66390dc8c7baddca69ddc613dc8ef8df738bf312348005938ac7d86bf92da2f94f9a5ae20823d37f6a996e537f35dc1b944f9cba81c52685089 SHA512 6d97ae0dc67c4e85c648da7b83f9b2f0bb7b605bc6ab5a398bf9b19760a7082584f3dae5129ad732d9d7aac7d1643ffcce8f9590aaf75e24122f048810ebf03c
+EBUILD ant-junitlauncher-1.10.7.ebuild 346 BLAKE2B 4882eb2f9ed7abecf58f9ea98ef86b52ed0481b6caa8364db07e99f1686f8d12cf0a9db809423083faa4bb7fca5b4be59c5851666155b8c5a0e014addaf6c7e7 SHA512 150a38ff54a34a8d8f47d5a8647291de91468083f270a15688ca7cb847fcfcbd2f1c58131dbeb015ce55acf17714c5afae3fdaa886906fd2eadc24114a16ce14
MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-junitlauncher/ant-junitlauncher-1.10.5.ebuild b/dev-java/ant-junitlauncher/ant-junitlauncher-1.10.5.ebuild
deleted file mode 100644
index a06684f6c892..000000000000
--- a/dev-java/ant-junitlauncher/ant-junitlauncher-1.10.5.ebuild
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ANT_TASK_JDKVER=1.8
-ANT_TASK_JREVER=1.8
-ANT_TASK_DEPNAME=""
-
-inherit ant-tasks
-
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
diff --git a/dev-java/ant-junitlauncher/ant-junitlauncher-1.10.7.ebuild b/dev-java/ant-junitlauncher/ant-junitlauncher-1.10.7.ebuild
index 2738d9499c3a..d319ec030706 100644
--- a/dev-java/ant-junitlauncher/ant-junitlauncher-1.10.7.ebuild
+++ b/dev-java/ant-junitlauncher/ant-junitlauncher-1.10.7.ebuild
@@ -9,4 +9,4 @@ ANT_TASK_DEPNAME=""
inherit ant-tasks
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
diff --git a/dev-java/ant-swing/Manifest b/dev-java/ant-swing/Manifest
index 6830fd23b2d8..8270545aa8d0 100644
--- a/dev-java/ant-swing/Manifest
+++ b/dev-java/ant-swing/Manifest
@@ -1,10 +1,4 @@
-DIST ant-1.10.5-gentoo.tar.bz2 6381 BLAKE2B a03f5f57d3fdb43b5b08404e4e84fe82d1b8e9dff00ad25b78e3b9af55110e221b01f90424d193c729ed1025fe1690d0fb3507c2ab663961ea05e287ea2ff00a SHA512 c296a867328d0d5c471f0cb98efc9f5e5fbd16148e608373c6dd76a17f5e8b4785175615ea992b42c9864c6e0b975f9dc8dccd27703c958a72cb7e7c2ca78d4d
DIST ant-1.10.7-gentoo.tar.bz2 6686 BLAKE2B 77e5850b68ab079f26722b5b2ff1afb29a35197afb79f80ae2f775855e2d8f3a478324b1175e9a73695b4e6a6798bf4458dc84d2f763a1d72c331505d31303ea SHA512 f5c5a2ea99a780413a71799d56e783f3ac861169bd7f29c3a85d039f61240abb91ed223eeb111c67a6a1328a6cf2203d7cbf93ad762e49bc11f9a948e7f2091c
-DIST ant-1.9.13-gentoo.tar.bz2 7189 BLAKE2B 65bc50bb401cd9ad48763acfa1208e1d52a87bf4df3591dfcdb0f2ded2e7e70c9a42199b0160c7bc233dff83f6889b2ce5fd5aa09a76973f7ea03e963bc9e73e SHA512 0c04116399fa4e83e3283c6d2a69b562aeac0eacda44eb6ce0210e2b0846f48c72975dcfc17315e072226adeb6c1438cd7f83189d4e2974a8a90ec7c6534c898
-DIST apache-ant-1.10.5-src.tar.bz2 4465063 BLAKE2B 3cab99ae4a4800a42af3595ca6955877e3ab90c2df7086636b0f1ae0e3a45912f0c815164378616b758d76afe0a2f23cc0af6094d2f84fe17f29c3abe2e6f9aa SHA512 082dad03db4fb09b36560bd5e1fbd53f456eecad06d95140569661b6509861bb9b87b87843ef2f30a5de18c549dd993209aa17b47ac77d450f573309a272950e
DIST apache-ant-1.10.7-src.tar.bz2 4530166 BLAKE2B 6998fffbda6a0adbe3434ef0013b3e669ec8f15a09d9a5917509733f3232a538e9be83758b9eacccd673522812a8d482e1fd526d5493634d9c08759f47bfc7a7 SHA512 5849e81aa037b9ba7f4e67057a0cde50301d183fc244673c7f11e34997b11d21c33306c07ab820bf60d454afa8ad5b159c3442427c8cb5403896f29ed179b10d
-DIST apache-ant-1.9.13-src.tar.bz2 3954912 BLAKE2B 1ec249bb33f54fde80ba8a17248755e7412eb3415b14a03f0558bcc220c3eb47dc88128d435e59f10118f74c31eab8eea83f5d5db09640e1a5aaf08bac1490c1 SHA512 27cd4566df35a09873f32f897ea47c55ad3940f48440b52ce9838e5fcd9e8ca55b27151a25597f21c430cd2921e3b2b6b105962d0d40294a1eb06ed689b05810
-EBUILD ant-swing-1.10.5.ebuild 413 BLAKE2B cd63db00ea34820084071e7e1e7b83aacbf2ea6bfd9855cfb91bc3daed6a4ab11af81d2c585797df36a2ad2ea2cc2049e37a4efd3cff0c7c0ecbd1d83f065f3a SHA512 c4a483ae8e34ba1f42db8298dd5713a70e1384f740b3eb99cc2f207f7041941c0160f36f434a0af1b8f824fff6e25ebc860b6228d1357d6be43a62ef1db59413
-EBUILD ant-swing-1.10.7.ebuild 416 BLAKE2B 37a3a1bee1ae0f01497cbec58d19429d8a834d106051ee5f93a0923ee3025d43b0845dc5b108495e1977fcf06743ad53c4dc2bab7f0a497151b5b1164be23c84 SHA512 4a1d9978ca23740a8b32763a16a33325f36f180e7046c0fc14f4ae7b8184a1924ecacc369303b93475c7614c773d577e2d0aeef0979d2e54317a0a656f2c9146
-EBUILD ant-swing-1.9.13.ebuild 413 BLAKE2B cd63db00ea34820084071e7e1e7b83aacbf2ea6bfd9855cfb91bc3daed6a4ab11af81d2c585797df36a2ad2ea2cc2049e37a4efd3cff0c7c0ecbd1d83f065f3a SHA512 c4a483ae8e34ba1f42db8298dd5713a70e1384f740b3eb99cc2f207f7041941c0160f36f434a0af1b8f824fff6e25ebc860b6228d1357d6be43a62ef1db59413
+EBUILD ant-swing-1.10.7.ebuild 413 BLAKE2B cc6ba1db31ce3cc5c01cde417670ca54ea994c08bc597270fa1018e272e02447cf2d408020f29c4e5844cb7eab203904b798abe8cc3b564750bd994d06c56fc6 SHA512 d2778a9c7fd320f5b81c4672578ae263dcbb5c118de62f8cde23435162f79662e9905eca9ddb0ae63d901992dfecb6ef1e8ace1e36eec787c579895c2de44e7d
MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-swing/ant-swing-1.10.5.ebuild b/dev-java/ant-swing/ant-swing-1.10.5.ebuild
deleted file mode 100644
index bd64e5ee54dd..000000000000
--- a/dev-java/ant-swing/ant-swing-1.10.5.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ANT_TASK_JDKVER=1.8
-ANT_TASK_JREVER=1.8
-# No extra dependencies are needed.
-ANT_TASK_DEPNAME=""
-
-inherit ant-tasks
-
-DESCRIPTION="Apache Ant's optional tasks for Swing"
-
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
diff --git a/dev-java/ant-swing/ant-swing-1.10.7.ebuild b/dev-java/ant-swing/ant-swing-1.10.7.ebuild
index 5bcebdf1c836..4faaf9336b35 100644
--- a/dev-java/ant-swing/ant-swing-1.10.7.ebuild
+++ b/dev-java/ant-swing/ant-swing-1.10.7.ebuild
@@ -12,4 +12,4 @@ inherit ant-tasks
DESCRIPTION="Apache Ant's optional tasks for Swing"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
diff --git a/dev-java/ant-swing/ant-swing-1.9.13.ebuild b/dev-java/ant-swing/ant-swing-1.9.13.ebuild
deleted file mode 100644
index bd64e5ee54dd..000000000000
--- a/dev-java/ant-swing/ant-swing-1.9.13.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ANT_TASK_JDKVER=1.8
-ANT_TASK_JREVER=1.8
-# No extra dependencies are needed.
-ANT_TASK_DEPNAME=""
-
-inherit ant-tasks
-
-DESCRIPTION="Apache Ant's optional tasks for Swing"
-
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
diff --git a/dev-java/ant-testutil/Manifest b/dev-java/ant-testutil/Manifest
index 783764488ef8..113786cd311f 100644
--- a/dev-java/ant-testutil/Manifest
+++ b/dev-java/ant-testutil/Manifest
@@ -1,10 +1,4 @@
-DIST ant-1.10.5-gentoo.tar.bz2 6381 BLAKE2B a03f5f57d3fdb43b5b08404e4e84fe82d1b8e9dff00ad25b78e3b9af55110e221b01f90424d193c729ed1025fe1690d0fb3507c2ab663961ea05e287ea2ff00a SHA512 c296a867328d0d5c471f0cb98efc9f5e5fbd16148e608373c6dd76a17f5e8b4785175615ea992b42c9864c6e0b975f9dc8dccd27703c958a72cb7e7c2ca78d4d
DIST ant-1.10.7-gentoo.tar.bz2 6686 BLAKE2B 77e5850b68ab079f26722b5b2ff1afb29a35197afb79f80ae2f775855e2d8f3a478324b1175e9a73695b4e6a6798bf4458dc84d2f763a1d72c331505d31303ea SHA512 f5c5a2ea99a780413a71799d56e783f3ac861169bd7f29c3a85d039f61240abb91ed223eeb111c67a6a1328a6cf2203d7cbf93ad762e49bc11f9a948e7f2091c
-DIST ant-1.9.13-gentoo.tar.bz2 7189 BLAKE2B 65bc50bb401cd9ad48763acfa1208e1d52a87bf4df3591dfcdb0f2ded2e7e70c9a42199b0160c7bc233dff83f6889b2ce5fd5aa09a76973f7ea03e963bc9e73e SHA512 0c04116399fa4e83e3283c6d2a69b562aeac0eacda44eb6ce0210e2b0846f48c72975dcfc17315e072226adeb6c1438cd7f83189d4e2974a8a90ec7c6534c898
-DIST apache-ant-1.10.5-src.tar.bz2 4465063 BLAKE2B 3cab99ae4a4800a42af3595ca6955877e3ab90c2df7086636b0f1ae0e3a45912f0c815164378616b758d76afe0a2f23cc0af6094d2f84fe17f29c3abe2e6f9aa SHA512 082dad03db4fb09b36560bd5e1fbd53f456eecad06d95140569661b6509861bb9b87b87843ef2f30a5de18c549dd993209aa17b47ac77d450f573309a272950e
DIST apache-ant-1.10.7-src.tar.bz2 4530166 BLAKE2B 6998fffbda6a0adbe3434ef0013b3e669ec8f15a09d9a5917509733f3232a538e9be83758b9eacccd673522812a8d482e1fd526d5493634d9c08759f47bfc7a7 SHA512 5849e81aa037b9ba7f4e67057a0cde50301d183fc244673c7f11e34997b11d21c33306c07ab820bf60d454afa8ad5b159c3442427c8cb5403896f29ed179b10d
-DIST apache-ant-1.9.13-src.tar.bz2 3954912 BLAKE2B 1ec249bb33f54fde80ba8a17248755e7412eb3415b14a03f0558bcc220c3eb47dc88128d435e59f10118f74c31eab8eea83f5d5db09640e1a5aaf08bac1490c1 SHA512 27cd4566df35a09873f32f897ea47c55ad3940f48440b52ce9838e5fcd9e8ca55b27151a25597f21c430cd2921e3b2b6b105962d0d40294a1eb06ed689b05810
-EBUILD ant-testutil-1.10.5.ebuild 915 BLAKE2B ac51e0d21775cc262872696d04d8131527976a06640267b7d68d52909d5fbdc5cb7e9ec8d94dc173b45abf74b263e2c65b5e1cdd62d3f31f084e356d8455be3e SHA512 e01d34bd411749cb0e8fcf4cf0fda67c40f23e1c3a85c72a300a0608e9d03423a85ea7aa0571f2b4339b94f86887847a1902e8dfa89a25c575f457c8eb04584b
-EBUILD ant-testutil-1.10.7.ebuild 971 BLAKE2B 8acfaf0a7133e635c7bdcbafaad98b0ea9dab5d90d29674e52a5300e5414bc67580626cf86e472e5f45f13247ac9defffa49926c1eb3ee4b8d133c98f1778cb8 SHA512 f882e8fada14b85589497efd5691a56abdff85dc6c65f162399e195391ff7bd66582bf83715ae8c26d0b6a269591c0c823e43bddb36b3aa5e39e8305b50ec1df
-EBUILD ant-testutil-1.9.13.ebuild 915 BLAKE2B ac51e0d21775cc262872696d04d8131527976a06640267b7d68d52909d5fbdc5cb7e9ec8d94dc173b45abf74b263e2c65b5e1cdd62d3f31f084e356d8455be3e SHA512 e01d34bd411749cb0e8fcf4cf0fda67c40f23e1c3a85c72a300a0608e9d03423a85ea7aa0571f2b4339b94f86887847a1902e8dfa89a25c575f457c8eb04584b
+EBUILD ant-testutil-1.10.7.ebuild 968 BLAKE2B c4eeba752d2d8c7784cdd239a18aaa663fd974f0bedc35038c05060c79faeec616680a6236aa23b50347086d08c2d276966608d8a29af7bba88f302811db3907 SHA512 5904f6a4f99db8860832ec876c91baf3135ff1dd91f2cb2cc059bb8949f977837545fbf25654924b625a2374848c672c7f675895fc39a630a98733e1877d8bc0
MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-testutil/ant-testutil-1.10.5.ebuild b/dev-java/ant-testutil/ant-testutil-1.10.5.ebuild
deleted file mode 100644
index 075585d0e327..000000000000
--- a/dev-java/ant-testutil/ant-testutil-1.10.5.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ANT_TASK_JDKVER=1.8
-ANT_TASK_JREVER=1.8
-
-inherit ant-tasks
-
-DESCRIPTION="Apache Ant's optional test utility classes"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-CDEPEND="dev-java/ant-core:0"
-
-DEPEND="${CDEPEND}
- >=virtual/jdk-1.8
- >=dev-java/junit-4.11:4
- ~dev-java/ant-swing-${PV}
- ~dev-java/ant-junit4-${PV}"
-
-RDEPEND="${CDEPEND}
- >=virtual/jre-1.8"
-
-# The build system builds much more than it actually packages, so there are many
-# build-only deps, but since those are quite common, it wasn't worth to patch it.
-
-src_unpack() {
- ant-tasks_src_unpack base
- java-pkg_jar-from --build-only junit-4,ant-junit4,ant-swing
- java-pkg_jar-from --build-only ant-core ant-launcher.jar
-}
-
-src_compile() {
- eant test-jar
-}
diff --git a/dev-java/ant-testutil/ant-testutil-1.10.7.ebuild b/dev-java/ant-testutil/ant-testutil-1.10.7.ebuild
index 5f83841637f1..d35b6c6ae953 100644
--- a/dev-java/ant-testutil/ant-testutil-1.10.7.ebuild
+++ b/dev-java/ant-testutil/ant-testutil-1.10.7.ebuild
@@ -9,7 +9,7 @@ ANT_TASK_JREVER=1.8
inherit ant-tasks
DESCRIPTION="Apache Ant's optional test utility classes"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
CDEPEND="dev-java/ant-core:0"
diff --git a/dev-java/ant-testutil/ant-testutil-1.9.13.ebuild b/dev-java/ant-testutil/ant-testutil-1.9.13.ebuild
deleted file mode 100644
index 075585d0e327..000000000000
--- a/dev-java/ant-testutil/ant-testutil-1.9.13.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ANT_TASK_JDKVER=1.8
-ANT_TASK_JREVER=1.8
-
-inherit ant-tasks
-
-DESCRIPTION="Apache Ant's optional test utility classes"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-CDEPEND="dev-java/ant-core:0"
-
-DEPEND="${CDEPEND}
- >=virtual/jdk-1.8
- >=dev-java/junit-4.11:4
- ~dev-java/ant-swing-${PV}
- ~dev-java/ant-junit4-${PV}"
-
-RDEPEND="${CDEPEND}
- >=virtual/jre-1.8"
-
-# The build system builds much more than it actually packages, so there are many
-# build-only deps, but since those are quite common, it wasn't worth to patch it.
-
-src_unpack() {
- ant-tasks_src_unpack base
- java-pkg_jar-from --build-only junit-4,ant-junit4,ant-swing
- java-pkg_jar-from --build-only ant-core ant-launcher.jar
-}
-
-src_compile() {
- eant test-jar
-}
diff --git a/dev-java/ant-xz/Manifest b/dev-java/ant-xz/Manifest
index 53945535e38d..df89000e34b0 100644
--- a/dev-java/ant-xz/Manifest
+++ b/dev-java/ant-xz/Manifest
@@ -1,7 +1,4 @@
-DIST ant-1.10.5-gentoo.tar.bz2 6381 BLAKE2B a03f5f57d3fdb43b5b08404e4e84fe82d1b8e9dff00ad25b78e3b9af55110e221b01f90424d193c729ed1025fe1690d0fb3507c2ab663961ea05e287ea2ff00a SHA512 c296a867328d0d5c471f0cb98efc9f5e5fbd16148e608373c6dd76a17f5e8b4785175615ea992b42c9864c6e0b975f9dc8dccd27703c958a72cb7e7c2ca78d4d
DIST ant-1.10.7-gentoo.tar.bz2 6686 BLAKE2B 77e5850b68ab079f26722b5b2ff1afb29a35197afb79f80ae2f775855e2d8f3a478324b1175e9a73695b4e6a6798bf4458dc84d2f763a1d72c331505d31303ea SHA512 f5c5a2ea99a780413a71799d56e783f3ac861169bd7f29c3a85d039f61240abb91ed223eeb111c67a6a1328a6cf2203d7cbf93ad762e49bc11f9a948e7f2091c
-DIST apache-ant-1.10.5-src.tar.bz2 4465063 BLAKE2B 3cab99ae4a4800a42af3595ca6955877e3ab90c2df7086636b0f1ae0e3a45912f0c815164378616b758d76afe0a2f23cc0af6094d2f84fe17f29c3abe2e6f9aa SHA512 082dad03db4fb09b36560bd5e1fbd53f456eecad06d95140569661b6509861bb9b87b87843ef2f30a5de18c549dd993209aa17b47ac77d450f573309a272950e
DIST apache-ant-1.10.7-src.tar.bz2 4530166 BLAKE2B 6998fffbda6a0adbe3434ef0013b3e669ec8f15a09d9a5917509733f3232a538e9be83758b9eacccd673522812a8d482e1fd526d5493634d9c08759f47bfc7a7 SHA512 5849e81aa037b9ba7f4e67057a0cde50301d183fc244673c7f11e34997b11d21c33306c07ab820bf60d454afa8ad5b159c3442427c8cb5403896f29ed179b10d
-EBUILD ant-xz-1.10.5.ebuild 466 BLAKE2B 96f152e7a3d8d90722a8e27cae9a10c301e030167dd9908be98f71dddfdac8df25c229dbdb6b72f794a4f4eb0f6ece32903687025358b9aeb792269a5ed068c0 SHA512 a42b03dc835bafc6602aa2760760ea2ba3dff09811354ab268764a4c7e0931c2927bdf63d31b79d707f5d4e8dc85d50c528ef6bd7f1eec205a999c12f84da795
-EBUILD ant-xz-1.10.7.ebuild 466 BLAKE2B cb10cc48d03b213bbc284b7bb88925873481a0f2dd9d2ba0477854f2576b58096f18505d6a64c0c48f45ba6c34609c86d7ae4079ae54a271863a63ea8d739a25 SHA512 6eea3b74ddd6f42aef884f930911d365e6ae4df7e109f110ac9f4fe22752fa0343c769beddab526669640da919742c4af3ed05078dae75c280056f94d1241f89
+EBUILD ant-xz-1.10.7.ebuild 462 BLAKE2B feb8dab91aa15ca136f3cc99738ffa9594ed13de7abca26d42e05a55eebef51141948689b29046959d80937c4ef8c127ecc373c7a44dd4b9a6ecb86df6854c1b SHA512 ce44870b61bb72c4dfb3d0ff60dc022dfba927c04e1cf67e1be67ba6a81a172cc1f106e5b29aac8b3874fdd93aa04bb3bf1eead1914e5b437d6a3991664ab889
MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/ant-xz/ant-xz-1.10.5.ebuild b/dev-java/ant-xz/ant-xz-1.10.5.ebuild
deleted file mode 100644
index fa1d30ba21b9..000000000000
--- a/dev-java/ant-xz/ant-xz-1.10.5.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-ANT_TASK_JDKVER=1.8
-ANT_TASK_JREVER=1.8
-ANT_TASK_DEPNAME="xz-java"
-
-inherit ant-tasks
-
-DESCRIPTION="Apache Ant's optional tasks for XZ compression"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-DEPEND="dev-java/xz-java"
-RDEPEND="${DEPEND}"
diff --git a/dev-java/ant-xz/ant-xz-1.10.7.ebuild b/dev-java/ant-xz/ant-xz-1.10.7.ebuild
index 9829522c18ea..23e0ee3ff29a 100644
--- a/dev-java/ant-xz/ant-xz-1.10.7.ebuild
+++ b/dev-java/ant-xz/ant-xz-1.10.7.ebuild
@@ -11,7 +11,7 @@ inherit ant-tasks
DESCRIPTION="Apache Ant's optional tasks for XZ compression"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
DEPEND="dev-java/xz-java"
RDEPEND="${DEPEND}"
diff --git a/dev-java/ant/Manifest b/dev-java/ant/Manifest
index 7500ed4becd6..2cf8f95ca24d 100644
--- a/dev-java/ant/Manifest
+++ b/dev-java/ant/Manifest
@@ -1,5 +1,2 @@
-EBUILD ant-1.10.5-r1.ebuild 1690 BLAKE2B a5a34ec4e6f4587f2e966ebb2b513fedef27a261837f3e3f2b9fb03a8408201e941d59364b9ff6fc4fd2f44408bc0f85773905441394ec6dff476c1dade0b839 SHA512 1c07c6f9dbcaa729f18361b4b61a191c5cd98a280db1f28ffab9119a261d0f8f75f6878d217f784066b5f68ded7ec6676d17416892e436c6506c595dc17ab59f
-EBUILD ant-1.10.5.ebuild 1652 BLAKE2B bd8eeb5e5b0faddb84086fc0a3084ec43bb32766f855dd6433922499cf7ee5bdc25a8d3eb75f5804556bce316e6453372573053d7098002c1031bef2387bd294 SHA512 31a9c15de893e36c8cc223803ef606779b5512aa2407b411ef0d30cb1e64266c8af3d512041a7d795a438125a60b4860ad2c58642b9ae822c58c2b7f04ee0e07
-EBUILD ant-1.10.7.ebuild 1690 BLAKE2B 12f2a7ca2bee327ae88ca0848bcbb3a09fa3851ad1c33f0eea144bb0f538bc4dd950537984d720160b99adcb76b531d55176f35b027b98cd18c0ee2f3cef8563 SHA512 bca1afc34ed38ca577efc601d9ddc72e1ff11e19b8172eb3e78d34479b90362998977eb02c8eed41610ea048c81df6b3432b6b42d1a6dc4cf1d5e23efbc31031
-EBUILD ant-1.9.13.ebuild 1583 BLAKE2B d8cb9a5ce2a9a3d0c5d79d732b75ec8b9dbcc2f6b1ddf95632dfe796602385d0225c206caba3c202253c300b35fea6049dcea91e02bfdce097380b201314f83c SHA512 e94bf1c4b76bf3c220df56c1192d994ec8663fbaf21b5fa4e171e233448c148cb2a99d2687c51dd3eda77df618546f85cecaa7e1dfddf65daa39d9efd2cf0dea
+EBUILD ant-1.10.7.ebuild 1642 BLAKE2B 6c723227e7c6fe13b2c006bdd60a8a8e89e17eb3d6670a464e4ff4a6cba8ed524f409e8171b13861c38a977fb142e5e7b963bdbb37c6e1c4f2698a7e6a9d8ebe SHA512 3d251bfe8a1700516ca4a508231b673b46d7d52df51172a419106790256b55ab632080fb9384a0919cb63fe1fc440556e82e04b5c96ea6dbebbb5b85e20a6987
MISC metadata.xml 1540 BLAKE2B 5536e37e8d4b18a8b744b88968c8f5f87973dedd25dfc5a0c96202bed4991034e93b57ad9a8737b5dfab6526adfa1e563768f08c6b85442f87f0b4ebc87345a4 SHA512 651f97c959e8322e51a7d937dd5886604e3118249907cbd7c0695e65b91b39c22539aeac2870c4f8ffe49e6f4edb8736459eb68266cfc4cb0baac9e439d0a4e5
diff --git a/dev-java/ant/ant-1.10.5-r1.ebuild b/dev-java/ant/ant-1.10.5-r1.ebuild
deleted file mode 100644
index 5fa60ad60e8e..000000000000
--- a/dev-java/ant/ant-1.10.5-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Java-based build tool similar to 'make' that uses XML configuration files"
-HOMEPAGE="https://ant.apache.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-IUSE="X +antlr +bcel +bsf +commonslogging +commonsnet jai +javamail +jdepend jmf
- +jsch +junit +junit4 +junitlauncher +log4j +oro +regexp +resolver swing testutil xz"
-
-DEPEND="~dev-java/ant-core-${PV}"
-
-RDEPEND="${DEPEND}
- ~dev-java/ant-core-${PV}
- ~dev-java/ant-junit-${PV}
- !dev-java/ant-optional
- !dev-java/ant-tasks
- ~dev-java/ant-apache-xalan2-${PV}
- antlr? ( ~dev-java/ant-antlr-${PV} )
- bcel? ( ~dev-java/ant-apache-bcel-${PV} )
- bsf? ( ~dev-java/ant-apache-bsf-${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} )
- junit? ( ~dev-java/ant-junit-${PV} )
- junit4? ( ~dev-java/ant-junit4-${PV} )
- junitlauncher? ( ~dev-java/ant-junitlauncher-${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} )
- swing? ( ~dev-java/ant-swing-${PV} )
- testutil? ( ~dev-java/ant-testutil-${PV} )
- X? ( ~dev-java/ant-swing-${PV} )
- xz? ( ~dev-java/ant-xz-${PV} )
-"
-
-S="${WORKDIR}"
-
-src_compile() { :; }
diff --git a/dev-java/ant/ant-1.10.5.ebuild b/dev-java/ant/ant-1.10.5.ebuild
deleted file mode 100644
index 7ae9053339ac..000000000000
--- a/dev-java/ant/ant-1.10.5.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Java-based build tool similar to 'make' that uses XML configuration files"
-HOMEPAGE="https://ant.apache.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-IUSE="X +antlr +bcel +bsf +commonslogging +commonsnet jai +javamail +jdepend jmf
- +jsch +junit +junit4 +junitlauncher +log4j +oro +regexp +resolver swing testutil"
-
-DEPEND="~dev-java/ant-core-${PV}"
-
-RDEPEND="${DEPEND}
- ~dev-java/ant-core-${PV}
- ~dev-java/ant-junit-${PV}
- !dev-java/ant-optional
- !dev-java/ant-tasks
- ~dev-java/ant-apache-xalan2-${PV}
- antlr? ( ~dev-java/ant-antlr-${PV} )
- bcel? ( ~dev-java/ant-apache-bcel-${PV} )
- bsf? ( ~dev-java/ant-apache-bsf-${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} )
- junit? ( ~dev-java/ant-junit-${PV} )
- junit4? ( ~dev-java/ant-junit4-${PV} )
- junitlauncher? ( ~dev-java/ant-junitlauncher-${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} )
- swing? ( ~dev-java/ant-swing-${PV} )
- testutil? ( ~dev-java/ant-testutil-${PV} )
- X? ( ~dev-java/ant-swing-${PV} )
-"
-
-S="${WORKDIR}"
-
-src_compile() { :; }
diff --git a/dev-java/ant/ant-1.10.7.ebuild b/dev-java/ant/ant-1.10.7.ebuild
index f19c021ed020..b11e25c8c08b 100644
--- a/dev-java/ant/ant-1.10.7.ebuild
+++ b/dev-java/ant/ant-1.10.7.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://ant.apache.org/"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="X +antlr +bcel +bsf +commonslogging +commonsnet jai +javamail +jdepend jmf
+jsch +junit +junit4 +junitlauncher +log4j +oro +regexp +resolver swing testutil xz"
@@ -18,8 +18,6 @@ DEPEND="~dev-java/ant-core-${PV}"
RDEPEND="${DEPEND}
~dev-java/ant-core-${PV}
~dev-java/ant-junit-${PV}
- !dev-java/ant-optional
- !dev-java/ant-tasks
~dev-java/ant-apache-xalan2-${PV}
antlr? ( ~dev-java/ant-antlr-${PV} )
bcel? ( ~dev-java/ant-apache-bcel-${PV} )
diff --git a/dev-java/ant/ant-1.9.13.ebuild b/dev-java/ant/ant-1.9.13.ebuild
deleted file mode 100644
index 4bb3de7a1b1f..000000000000
--- a/dev-java/ant/ant-1.9.13.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Java-based build tool similar to 'make' that uses XML configuration files"
-HOMEPAGE="https://ant.apache.org/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-IUSE="X +antlr +bcel +bsf +commonslogging +commonsnet jai +javamail +jdepend jmf
- +jsch +junit +junit4 +log4j +oro +regexp +resolver swing testutil"
-
-DEPEND="~dev-java/ant-core-${PV}"
-
-RDEPEND="${DEPEND}
- ~dev-java/ant-core-${PV}
- ~dev-java/ant-junit-${PV}
- !dev-java/ant-optional
- !dev-java/ant-tasks
- ~dev-java/ant-apache-xalan2-${PV}
- antlr? ( ~dev-java/ant-antlr-${PV} )
- bcel? ( ~dev-java/ant-apache-bcel-${PV} )
- bsf? ( ~dev-java/ant-apache-bsf-${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} )
- junit? ( ~dev-java/ant-junit-${PV} )
- junit4? ( ~dev-java/ant-junit4-${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} )
- swing? ( ~dev-java/ant-swing-${PV} )
- testutil? ( ~dev-java/ant-testutil-${PV} )
- X? ( ~dev-java/ant-swing-${PV} )
-"
-
-S="${WORKDIR}"
-
-src_compile() { :; }
diff --git a/dev-java/antlr/Manifest b/dev-java/antlr/Manifest
index a55bbc70dfea..857ed56a0c50 100644
--- a/dev-java/antlr/Manifest
+++ b/dev-java/antlr/Manifest
@@ -12,8 +12,8 @@ DIST antlr-4.5.3-complete.jar 1485121 BLAKE2B 84d41b17bd30dfad7a79e9759802c76d98
DIST antlr-4.5.3.tar.gz 6760401 BLAKE2B d436b4a964c527e230912a0ba23146af199478570cf5491eadeb5025e814642658cc71d71e6a09b5df3cc18e9b8991abf930cab70677d117a112e0922e046e07 SHA512 d0e61baebb338e5e4e8eaf87aa6ef52a568ec51bc86bc07acf8f82be0c173ea4f0f85978dfd034c2642505888c0849663f6b6fb030c4c19e0571f29277fb54f7
EBUILD antlr-2.7.7-r7.ebuild 1087 BLAKE2B e866bec6a53c4476202468cdb009b266a3ef0748b5ed79c71e6baa2d30da07572804ebe59e332a569b2afdb97073268b0947e0747421140f792425bf61868152 SHA512 c06da2c925aae9677b26a216f3e3fc297bc40212f7255ad7b19b303895ef13a0905588b02b3f9c2521b03b82092f6692d28517bdabcefcfaf7d87e32b88fa16c
EBUILD antlr-2.7.7-r8.ebuild 1098 BLAKE2B 4ac646f7bac4b5ef9c614436eb39f0fbb83629ef2861e1875d0901aa48f28ad0d618ab3476be5efa2c4de8c31a7d0d6428ed99923f6d8e4025b6d12fd67d442f SHA512 92e22ad8ef1ca16072bf1d436779a868149bffcc2e9e5c1ca7b9c6ac3b10a0fceafd40f33ec2e0195c422174d9929abd50e5c3d17610a63c03adb6cb5033aa3b
-EBUILD antlr-3.2.ebuild 3242 BLAKE2B 4d463526d52ef8388f2a7cdac14bfca58e9ac8fc7b5d7abfc35dc68226148de413011811bccd1bd546646f7cba66e4cf148a807af6d4b14bf578e79a24e64a6f SHA512 39c832838c3d41f2d8c73abcd19ecbf8477e32e9272435ae6e2751e2dd083f61c4ec979e5d72d0df29cf27e0ed40339e322c93fd6f076a9217b71ebbe6dc277b
-EBUILD antlr-3.5.2.ebuild 2994 BLAKE2B 89247112dc695710cebef62ccb98993d502919a508154485f2a7ad70ccefa2baa7ac693c763fd1bf8f378a256328a795b6377009f9e1e4d4f523b9c03f2c56b6 SHA512 2dccce51680acd132dffe98c26fd0a99cc5242c9a8c68e8fff2b1c208a575fe518ed4f1ad5f318942eff08535a3871ab0b15a1bd4f23fd38a38f3bd8d81bd2ee
-EBUILD antlr-4.5.1.ebuild 2451 BLAKE2B 7c7352432059072d726d3549c2086aeb90f784ab1e73fc09a9d5d0fd9326de74542a1e567a0285f4e571f8a853b33e6027858fa81bfd47401483229b92c2918b SHA512 6b82a8149c534b23285d929410138a2c6a888b6ea5283f0180094ff1f6f8239f918e011e92f3281e95a620e6d1f134d92de91067cd8abea542bd84b0a36b0ada
-EBUILD antlr-4.5.3.ebuild 2454 BLAKE2B b89f966069c356af301f53d3e6a270168d47e6fa1c349075b1aed60e6caf2567af8fe4af3b0f31f34f0360d77f6998bed80d9f72a885b3f1e75acb29e20a8587 SHA512 a55975e3c26da42281dfbcda08314d20515822688188a84a10f6834286daa815977528ff2ac3a53878ada84a49410706075185340655c16928d5fde5b0e0da9a
+EBUILD antlr-3.2.ebuild 3269 BLAKE2B 235e24e79fcc6548e1663f4ab04b28d990c9bf326ae6ba34a6360edb9ea85fba98aa150b0f191d7c98919fc8c96bf9ff003eaac44dbb12c5d22fc23bbf85cb35 SHA512 6baafe3168efbc63d11e36d719550a36b9c2c2d36c955d52502113142a7fa51b30928de00d2ac3cdb17669652966aa81427ed70f82e5abedb0569cd3dda46ffa
+EBUILD antlr-3.5.2.ebuild 3021 BLAKE2B 330626b14527d4935f30acee8dd725996f00b461eed5572e55aac7ef552fd20bab50d78ba698d4f58f0bb3bf33d7c9643ceb6714c9ed7b96337bf777d9dc36c2 SHA512 e51a96e9e3a690a9de88fb2a071bdb518c8a16ed288b276dbb782afd61e033b2cf4d9e68ae34a444011cdf579e84e7da684e7de836c21a8e65416ffba6b1dcda
+EBUILD antlr-4.5.1.ebuild 2478 BLAKE2B e36feaf0bf7eb33d4e5fcc7e1f9c498b937e037a5a72e2049eaab57269f09dc20cb7e9a5ddb57055611bb7e1aadeb91173129fda355351d3e26e12c4db245157 SHA512 51e8489bb173e237ba78be7bd9b3667a6c5522583d64ecf88b902b20006c089e4134bf278369a30f32507680ed1628321c672b06f4dacc7e9f89d0f1caa26b11
+EBUILD antlr-4.5.3.ebuild 2481 BLAKE2B f7796f007f9d6895a29b3e23b6aef08f34fec373d1b424305669b1d8aa1ef68dcb0a63e89a0181bad95b59685a8772a8c4d7ac4252e66e5c1c3e7f2944e9a5c8 SHA512 14f93b7d1c64257b8c3307ef6e67e7da3b1d027701a8ed861b7be0a0067e0f0f6de799688fb60feff7195d39dc947da0456c9997a094fe9dbf2dac300c2fc5eb
MISC metadata.xml 313 BLAKE2B 211bde607161c54e23a30950b17cda11291e84a9f745a2c44c17c7c224ad8ef309786ec4952f094e90cc569d86e0186bd2fa426fc1de6718541e207be12c3fd0 SHA512 01f11b9e45bc3c331d445213704287f1f034087930d4b55cbde700a483dcb64260d4805a4c2ec3686a99b59f3225999409d499cb63a40b3d8278d8a2e6213f57
diff --git a/dev-java/antlr/antlr-3.2.ebuild b/dev-java/antlr/antlr-3.2.ebuild
index 48831af505d1..594e6c4cb1a1 100644
--- a/dev-java/antlr/antlr-3.2.ebuild
+++ b/dev-java/antlr/antlr-3.2.ebuild
@@ -13,6 +13,7 @@ LICENSE="BSD"
SLOT="3"
KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc test"
+RESTRICT="!test? ( test )"
CDEPEND=">=dev-java/antlr-2.7.7-r7:0
dev-java/stringtemplate:0"
diff --git a/dev-java/antlr/antlr-3.5.2.ebuild b/dev-java/antlr/antlr-3.5.2.ebuild
index ffbb7faf52a2..330d0ce8f429 100644
--- a/dev-java/antlr/antlr-3.5.2.ebuild
+++ b/dev-java/antlr/antlr-3.5.2.ebuild
@@ -13,6 +13,7 @@ LICENSE="BSD"
SLOT="3.5"
KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc test"
+RESTRICT="!test? ( test )"
CDEPEND="dev-java/stringtemplate:4"
diff --git a/dev-java/antlr/antlr-4.5.1.ebuild b/dev-java/antlr/antlr-4.5.1.ebuild
index 38d9b405e655..4949c2284c33 100644
--- a/dev-java/antlr/antlr-4.5.1.ebuild
+++ b/dev-java/antlr/antlr-4.5.1.ebuild
@@ -15,6 +15,7 @@ LICENSE="BSD"
SLOT="4"
KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc test"
+RESTRICT="!test? ( test )"
CDEPEND="dev-java/antlr:3.5
dev-java/stringtemplate:4
diff --git a/dev-java/antlr/antlr-4.5.3.ebuild b/dev-java/antlr/antlr-4.5.3.ebuild
index ed1027b16e89..5c66074f5d0e 100644
--- a/dev-java/antlr/antlr-4.5.3.ebuild
+++ b/dev-java/antlr/antlr-4.5.3.ebuild
@@ -15,6 +15,7 @@ LICENSE="BSD"
SLOT="4"
KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc test"
+RESTRICT="!test? ( test )"
CDEPEND="dev-java/antlr:3.5
dev-java/stringtemplate:4
diff --git a/dev-java/avalon-framework/Manifest b/dev-java/avalon-framework/Manifest
index 77d271aa7885..16c8049f4ef4 100644
--- a/dev-java/avalon-framework/Manifest
+++ b/dev-java/avalon-framework/Manifest
@@ -2,5 +2,5 @@ AUX build.xml 1838 BLAKE2B aa6ad2f58ef4bc96837c5f616376e2bc6dca2b338d0bdbff575b4
DIST avalon-framework-4.1.5.src.tar.gz 99475 BLAKE2B c57c89661042137dd0f5b8d6fe4295030a861499b300d84a8c2dc6364d6bdca443cda96e954816da0351fda3d3ce70d47734656949bffba8d823f7e1c9f4ead9 SHA512 7a15dc2f7c691d7daaa5cbb589eb21e23ef8d6232b5bd1b6b3bb1d6962f4a4dd2dff0c0a1793309d7e8f3aaf4e75de65a9705431e1103c2e33c575770131471b
DIST avalon-framework-4.2.0-src.tar.gz 68887 BLAKE2B da71631548bf725315c57439c5db017107d4dac529fbfdd59f68da6b97faa8b9a78fc5d89b05ccd05c7ec68b2de05d286ece6654137278b3e8873c78c65adf6c SHA512 b53dc20ecec058ef0b35a626bea6e04f85f6ae8b3645d7dc5c33c194db49b42071093cd305ef718f925b948ec1b885b2a0d8bec534592f97dc48d6e93db45671
EBUILD avalon-framework-4.1.5-r2.ebuild 912 BLAKE2B 21826ee57ae0b7416c9f788023df6ddef04179b7f57fb92c6cdc95996e44c89f2c8a3a5e0b447c41484aba6aa512369a652dd73987911165425de90bba6516a5 SHA512 f9bf863f6bddf52aed8b471916c6e4ea97dd6140820081235011ffeebe1331c337deb11762f1f1b0457490296827532dcd173ab352da732c311ff02ef795b992
-EBUILD avalon-framework-4.2.0-r2.ebuild 998 BLAKE2B 4ec6b85a20b7364367715cc157a2f1850729cdfd31c75aabece68039e1a8680b02a445ccc1f728595e4ed1e38c319d40f52c903e3d45fb84a2653bb33c2ddb89 SHA512 3952ee84211430b442e245ba912c46e9fd9f78b5236b2a0a51cea9df0f7d0fe05f0bc38ebf3388cc2ca84db7f6e9d58bb466664e09b67fa61445ede78541c69b
+EBUILD avalon-framework-4.2.0-r2.ebuild 991 BLAKE2B 6c5478cc63638ae97a5d0c008f8454d4eb33f00520d118fca12e80d014326bb7c1b9a8d8a51175f501c77bf481c3e2c17b9b8b7adc4dd780104dcdbc3991dc93 SHA512 7b4750a7c28b91796c7ead3731b3f8220d399504eb9c7ab3210a5156efbe4e4685ae70d39722e9e3c48534b853e62ea53119406ae4cc0546305f85f7efe2c35e
MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/avalon-framework/avalon-framework-4.2.0-r2.ebuild b/dev-java/avalon-framework/avalon-framework-4.2.0-r2.ebuild
index ba8118af4f5f..7d691bd713eb 100644
--- a/dev-java/avalon-framework/avalon-framework-4.2.0-r2.ebuild
+++ b/dev-java/avalon-framework/avalon-framework-4.2.0-r2.ebuild
@@ -34,7 +34,7 @@ java_prepare() {
src_install() {
java-pkg_dojar "${S}"/dist/avalon-framework.jar
- dodoc NOTICE.TXT || die
+ dodoc NOTICE.TXT
use doc && java-pkg_dojavadoc target/docs
use source && java-pkg_dosrc impl/src/java/*
}
diff --git a/dev-java/backport-util-concurrent/Manifest b/dev-java/backport-util-concurrent/Manifest
index 61b9417f9d03..7a11cc8a90f9 100644
--- a/dev-java/backport-util-concurrent/Manifest
+++ b/dev-java/backport-util-concurrent/Manifest
@@ -1,5 +1,5 @@
AUX backport-util-concurrent-3.0-notest.patch 491 BLAKE2B ea587be0736cd1aa4fcbc4095c31dd321816cbefa0cec4d6f0c8969e24e9e96038b30db4baec0d386ba18828cafad0c2d084b48d69c7db77414dd5282f1197f0 SHA512 f2f53a87283c1a6b13e360ba0140a93b0580a023cefbcb5dcd8658ddc7e80c401878229a323416213368f493226b445b5896bb0ff51f1a2bd95ef460f4ddd080
AUX backport-util-concurrent-3.0-test.patch 380 BLAKE2B 5e1e437564035e652d6c41f8ab75b0589257e955aa06f2b83d8fb488ec7f2d7c4879fdc1556a47599231bf2ab1497243cdacfb7f64f5142bb4728265c296790a SHA512 01ad87f71b07c25193faf1d67de159233b2b298ef4ea31013f3af8d326a09b83f73bdbcfa5629f5531ffc0a0c02b20843c11377f1260448a9758be05c64420fe
DIST backport-util-concurrent-Java60-3.1-src.tar.bz2 622882 BLAKE2B 49dd1065fb80d697dc917aeff1bf653a1c82bc24e3edf6d1eb272f3cee17130a6db20f562f40e7911a6382f8c545bdf37e1ce34b69a6a7ddf5a569e114a78e87 SHA512 caef9eef43d0de5ee3d05a84b44d3d2f6bb9498bdc82105626bd2631494fcd0347387da9beb6000fe9c80efacbbf2c2c3603a97b53e4c74037eaf629d790cd54
-EBUILD backport-util-concurrent-3.1-r1.ebuild 1163 BLAKE2B 9f5bc96e8401dd8451d213c04942458c46b8fa3c0d2d944e27727b6bdb63801cc0011b9b495eddd9678536e8b9fe9b0ff13769d81adabd12b58831bdf5952855 SHA512 ad14c0f08d9eae8e5cf8ea1281705bab4d4b225c51c5ffc8c9fc49c1bebc6ac80a9da8ca765a7e5e49afe9a62225df5b3f86d8eb4b82bfa68f20341a01aa3e76
+EBUILD backport-util-concurrent-3.1-r1.ebuild 1156 BLAKE2B 8a0af98574df5e47c6574f1e8e5b8bfcaa2f23753a5985196738aa556b2fb8d9d418678621b5bafe5f9b1036c70b90fb443f73cc3b5fa3182f8d7ff905534ea0 SHA512 1627fb351bb9a81bd4a6f5ee54a0eee5bef59aae9f78e908fdbee949e4a32443af3c2da0526e43864169510e1b7b49f50f8464bd7b6ce5d63bfaee3679370f1d
MISC metadata.xml 490 BLAKE2B 8c30e55ff1a4b70180d42e365d9eba3405a1591438e0fc801383b8a1ee65daf759b2544c1edb3b2a03cfe8f7932b5c4de8d12980c630fd5b625ad2f6a674c291 SHA512 81d2a6f504093869e765c56667feb53583a85c7cfe98bf12f571b2d4e202e5ab247e24b8a92ad5141654069d3a66179fbb28790781464dd43821ab55dee62eb9
diff --git a/dev-java/backport-util-concurrent/backport-util-concurrent-3.1-r1.ebuild b/dev-java/backport-util-concurrent/backport-util-concurrent-3.1-r1.ebuild
index 0c7e2df0256c..6748f4a38eb7 100644
--- a/dev-java/backport-util-concurrent/backport-util-concurrent-3.1-r1.ebuild
+++ b/dev-java/backport-util-concurrent/backport-util-concurrent-3.1-r1.ebuild
@@ -47,7 +47,7 @@ EANT_TEST_TARGET="test"
src_install() {
java-pkg_dojar ${PN}.jar
- dohtml README.html || die
+ dohtml README.html
use doc && java-pkg_dojavadoc doc/api
use source && java-pkg_dosrc src/*
diff --git a/dev-java/bcel/Manifest b/dev-java/bcel/Manifest
index a2fe7961ac24..322a141d85aa 100644
--- a/dev-java/bcel/Manifest
+++ b/dev-java/bcel/Manifest
@@ -1,3 +1,3 @@
DIST BCEL_6_0_RC3.tar.gz 929878 BLAKE2B 05e2e307f226785cda54c06e80b47b8f738d2f5117deb4492cc758e4bfc2b046068f2aa7836336c26514f56c99525732c62acb02ed982e7f446dc254a5aeab3f SHA512 05ccf95ebf6b374fb112296509b4011d741acf2315b331aa971f8c3bc6be2f73b39592721a8c769b6b9d631e78e348c124c56f567adc2338ed5508d5ec3bed77
-EBUILD bcel-6.0_rc3.ebuild 1191 BLAKE2B 13cdc05ac6187d496c2e796e7f53c54e832b4a9ea617eb98bf6c125ea878956f7db8d9cf6f3cfdceec83f72f0c6860f9c2f32444bd9c3a1b493f59c73354d183 SHA512 758dde9401a9a0f1d06e9f28f32766a81078e9c3df37daf71ae90dd225a12bc82b049e7e97d062e28d243ca4f6cc959ff653cc47e33fb6ce8706d0a1c4a8d46a
+EBUILD bcel-6.0_rc3.ebuild 1218 BLAKE2B 42a06568a7591d3fce18c6906dba36a7fbbe4791d9ff85c64c1d14089b4fd3b03e5b7741aed8f0127d8c5298f275dcf6c574bca08f3177167820a0ebaa8c3452 SHA512 aaa11d61771a5187927f70cfad4fcf3bb4088899d648ae7a7c0d59a37dffdd6387d2e5eb33cae8e1fe63555917f70f734264db51bb39cef5fbc558bd2976b745
MISC metadata.xml 819 BLAKE2B e997d77649047065ba6102ad1e4c71a3622fb20544234f529566e665c6c97830bead40f81fb4664f3565225f07abb6d7829b9a6a9f2b7d5365c9fdd02572b020 SHA512 2dd8f3339c680fe11255c65ea92b2ad808ec4cb59d49b47ea533092119fef14424859368feee8ce94e7621a607ef71c4499ab78e518ce07886388def593e7281
diff --git a/dev-java/bcel/bcel-6.0_rc3.ebuild b/dev-java/bcel/bcel-6.0_rc3.ebuild
index 5247d0b95179..ad7829dbc886 100644
--- a/dev-java/bcel/bcel-6.0_rc3.ebuild
+++ b/dev-java/bcel/bcel-6.0_rc3.ebuild
@@ -19,6 +19,7 @@ LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
+RESTRICT="!test? ( test )"
RDEPEND=">=virtual/jre-1.5"
DEPEND=">=virtual/jdk-1.5
diff --git a/dev-java/browserlauncher2/Manifest b/dev-java/browserlauncher2/Manifest
index a8ff5c9b77a1..db6f22586648 100644
--- a/dev-java/browserlauncher2/Manifest
+++ b/dev-java/browserlauncher2/Manifest
@@ -1,3 +1,3 @@
DIST BrowserLauncher2-all-1_3.jar 186442 BLAKE2B b26509cf9a6700bd7261423b387479fde852f55735ddf6fb419e717c454b398a0a8c0c8acbd4be2e59aca6bd36837c0329f3a635482863273a1e9a389806bcdd SHA512 529195a94b757578afb3863c6b53cf16584097c659c576167fcbf86897cc484d80092c8d6e409ba1fdec69cb4f4a42b65c89c881663ae64bbc0a0a496309da5f
-EBUILD browserlauncher2-1.3-r1.ebuild 1111 BLAKE2B 343a7c5b94719bdfea674b5f3cf9916fe1bead20ed10512ffaad39a8133fd51bfc75fc693e00b6ee25ec83ddf55bd61b895a10a68e943880143ff1daa2524c50 SHA512 4cd6731a72bea53839c13cf46c472d609d5738e154898e0ff305fdf111292a5d188593750b18d87ed750cc1c57191d83d85ca8037bbc99015b4097d0904d51c0
+EBUILD browserlauncher2-1.3-r1.ebuild 1104 BLAKE2B 5357814ea2c0e6431800dade0700f3daf5d8a12c87ad7b2bb174d1e08905799c73f09476710a03b3f5a0dc112b536754168feb8e04f1b5297832e05bb16c3dc3 SHA512 47b3e8820b5af7aad4f03e9b28e953395535133a58329564ad7de614755c85306fcd935b8f13afb4ac63899372c8c5687e1fc4ca421a47db04da92d7123b7846
MISC metadata.xml 628 BLAKE2B 1cf381041505b896f78e6eff1771be500ad84af5827a59f5243b5c55883cebd53f53ddb5ec1e07c7491b2e0ac98eedd86353c50bf4a437be8302e43a5ab548d0 SHA512 0a45a31198ed3fa2b1e78a43342b9b079cf0ac421668ec360443e803272f25da44dac62f458568a030c67efc720a80eda629532dd2687c8324aebb506436a3d4
diff --git a/dev-java/browserlauncher2/browserlauncher2-1.3-r1.ebuild b/dev-java/browserlauncher2/browserlauncher2-1.3-r1.ebuild
index 315f0a029bed..8d5e98ca31ee 100644
--- a/dev-java/browserlauncher2/browserlauncher2-1.3-r1.ebuild
+++ b/dev-java/browserlauncher2/browserlauncher2-1.3-r1.ebuild
@@ -40,7 +40,7 @@ src_install() {
java-pkg_dolauncher BrowserLauncherTestApp-${SLOT} \
--main "edu.stanford.ejalbert.testing.BrowserLauncherTestApp"
- dodoc README* || die
+ dodoc README*
use doc && java-pkg_dojavadoc api
use source && java-pkg_dosrc source
}
diff --git a/dev-java/bsf/Manifest b/dev-java/bsf/Manifest
index bfd19426542a..acbb531e751b 100644
--- a/dev-java/bsf/Manifest
+++ b/dev-java/bsf/Manifest
@@ -1,5 +1,5 @@
AUX bsf-2.4.0-PyJavaInstance.patch 1650 BLAKE2B ceb772a69d454d1d85e05486d28d13824724813e7875f731a165aaf97bdd7f0c006baa927e849f82de7fa16228c3de5847f8d59013142f8df4823a951b42c785 SHA512 7946622658473ef4cf6b5921f58d224f7378cb00c345a748653306d2648a89b5ab3ed68786d09bbb170b95dc657f7f55501013c854536d6dfd6b38e6a1f3963e
AUX bsf-2.4.0-build-properties.xml 1984 BLAKE2B 6db0c1ca7f899e95a0728d61b79ef6c0a1320ee747b5479c9c50a7bd258dc7fee0b6b569e3813f323cbc694d405f9af1d269dd5370ac82e6eca2bde5072d905d SHA512 d262daec432d7a22c217e24089f22e4c349be0487fd00a2e6992e77770a3699e7e2b5977e2108455d7f73c31b372d6a73febdff2856e256f93b25f3781e11679
DIST bsf-src-2.4.0.tar.gz 299749 BLAKE2B 41f3cfe77b1ccf6b78493df7f5f288b397234b3236977c4b7d2e6c85b330e40319474419f560eefa1632da4d0524593b8c3e0c66cd27b852749b1405c20df5a6 SHA512 a1e7564fd14abbf725fee75c4b0ba5f92d7eada0e242ad05897753bb4afe639d859c42cae1d684e8dd9151409d4cc68e1a422a70bc74d8016144cc30d03a2d43
-EBUILD bsf-2.4.0-r2.ebuild 2713 BLAKE2B 36f4a13e7af9b0c02106346cd6927ca94d05cbbdd52e9fb396b789b5f1b1123232793ba2c821b1b8d620707c658d8002612bc1a35d3a4113242085e8cfcde736 SHA512 a639398a172fc896f123832b0ea5f5026c565a779f9848eb9361d77379cd61ac404ac2a6fb03f27dcf61a6e083e24980ba0a06679bb4f56ce437c7b993f036d6
+EBUILD bsf-2.4.0-r2.ebuild 2706 BLAKE2B 03ab668138f79de45283b5ff7e041a8c4f749d11c9ab4448ec310b2a0eab44095972b320108c5083c01a3162b2fce1d3daf0fbf5e0cdecb37102b67925e026f9 SHA512 f14c6867976af5d14416792036cf0ef4fdf9533a83e43545561a6a3cddd89f50cf44bfd43dd83d854f40cf0a49cdb5926ef9ad8ac7a6b7d659995e231f26db84
MISC metadata.xml 903 BLAKE2B 65b2684054dd53636f1fddfa7b83c5fc9bf9c10253f12d426a8641fbf431418c24acaf6762e02159f5a2f3e1bd3c16fe97d4b44093ff04a518a79d2645f11515 SHA512 f55f803d1d0fc7a1ce20ea5d46ee89afe46b738362a2b78adfd5f6a4e9d09360f3522de148c56a9b2fae9370df1ed003611d7b68b8ba8e2e4cd7ff5683696abf
diff --git a/dev-java/bsf/bsf-2.4.0-r2.ebuild b/dev-java/bsf/bsf-2.4.0-r2.ebuild
index ba7669ffd2c1..66799c831bf6 100644
--- a/dev-java/bsf/bsf-2.4.0-r2.ebuild
+++ b/dev-java/bsf/bsf-2.4.0-r2.ebuild
@@ -90,7 +90,7 @@ src_install() {
java-pkg_dolauncher ${PN} --main org.apache.bsf.Main
- dodoc CHANGES.txt NOTICE.txt README.txt RELEASE-NOTE.txt TODO.txt || die
+ dodoc CHANGES.txt NOTICE.txt README.txt RELEASE-NOTE.txt TODO.txt
use doc && java-pkg_dojavadoc build/javadocs
use examples && java-pkg_doexamples samples
diff --git a/dev-java/colt/Manifest b/dev-java/colt/Manifest
index 76c34c4284d4..ca4422e59938 100644
--- a/dev-java/colt/Manifest
+++ b/dev-java/colt/Manifest
@@ -1,5 +1,5 @@
AUX colt-1.2.0-benchmark-no-deprecation.patch 1180 BLAKE2B 748b1d14c0982ceb1d703cbf7dd478428c406afb0ae34ed22faf10fc93b97c36ff9d6764ac4b57057eabe4e85984fa5a650b9c65d24e0420e99a81046a67b1b9 SHA512 523a887bc104062a22ecb4e4350c1c8a4a0be642490b98770943b20e6e8e747d95657d10d042198516b2fd830feb0987ff3473b8ab83278ad3db57d29e9239c7
AUX colt-1.2.0-remove-concurrent-util-imports.patch 6924 BLAKE2B 9ceaed0b61e0e8510d49c2151b9c42f2f125f42592ab98e8fd95812e0af572a8675b18642d103add8dbbec003683fe0d8b32e942a613a46245f3595a1c0827aa SHA512 86b568d66b342ede74dc3207268675c8f91b6b3dcc622486d649ba6a0a283de8b20a46f4ac16da8d90d89b4af603b1c8378b990866123e8e4b8b4e3733be4a36
DIST colt-1.2.0.tar.gz 2545695 BLAKE2B be5a1e2ca50650a3dfe003855801350f4b01b931b11b59f41e635c4daeb011b7a761a7db8532168157bfbfac5a4473a39e0b49698d9ccd32e0099149dd7d4adb SHA512 a5e88e0cf671faeb336241d120daeb1ad90f1e2061827d06c0c2dc507cd3ae2ab45f2b80451aaedca0f5a8b3de66c13533178e3b6352ed8b2df886d25a924ce0
-EBUILD colt-1.2.0-r3.ebuild 1065 BLAKE2B 56292fa064677733e864b31e236dd475f0d87d57194fd648c70f5d200084e372eefd049224c191c6f2070976b3921533ad75dc1eb37b840a1096a9feef1040a9 SHA512 aaf5bf0dbb8193ba0b435218d2d23d8cedecfe5812ae65a374525730a2ec36436cd9511bab80e2d77920768231f68bad19cf0159efafb6d72601989c78af016c
+EBUILD colt-1.2.0-r3.ebuild 1058 BLAKE2B 322c12ac6e655dfe3c6e025b237d10a56a0666d0570bc190bcbdf391de465a03cc17177a068577ac89748180f4ab87f5a5d0359f929287389c227a92ecaba2fa SHA512 e3b317c790841dfcf62811d98dd4b75b682257857de65bdc71588dfcf5d5f6b1003bc3887d38df4ed0805bded29c5d402019a65f1257923bdcab773d521a11db
MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/colt/colt-1.2.0-r3.ebuild b/dev-java/colt/colt-1.2.0-r3.ebuild
index 118e1c232f82..ce5c2ef0fea4 100644
--- a/dev-java/colt/colt-1.2.0-r3.ebuild
+++ b/dev-java/colt/colt-1.2.0-r3.ebuild
@@ -39,7 +39,7 @@ java_prepare() {
src_install() {
java-pkg_dojar "lib/${PN}.jar"
- dohtml README.html || die
+ dohtml README.html
use doc && java-pkg_dojavadoc doc/api
use source && java-pkg_dosrc src/*
}
diff --git a/dev-java/commons-beanutils/Manifest b/dev-java/commons-beanutils/Manifest
index 10d25ea25457..e193abd1dad7 100644
--- a/dev-java/commons-beanutils/Manifest
+++ b/dev-java/commons-beanutils/Manifest
@@ -1,3 +1,3 @@
DIST commons-beanutils-1.9.2-src.tar.gz 396910 BLAKE2B 1324c49605c9640aa3eee5c016a43bbb45b1984dd49eeab8f9b7a4ef1c5284ff8869228dda51719c2e6b3576517fdd02018a4f36654efc7f92d3fb7432008d05 SHA512 cf43aace33eb91368f86445874b16d977e827451f1355bb00e9b33bf0707855b5d757b0d58ad617f3a7f86f9065e7c900907dd604ba4de5ae61473d40cb758a9
-EBUILD commons-beanutils-1.9.2.ebuild 1897 BLAKE2B b684bad7e63c70cb8aa3e30947dcdd28650b0f580e777f3a93516569d966bbaeeac4b78023ffe8b592fc014e189f28c5a371987970ebe6bc0b0fe5cd394e1915 SHA512 fee166916e7fff8d39cf99d8e0b6278471b2e0ee7f740ca6075ec8cde4cce598b27796f02777b0b2cb44f25b218e77dc605f295fab735791e34933388cb9717f
+EBUILD commons-beanutils-1.9.2.ebuild 1890 BLAKE2B f4c77ac0328f6d4b151f379901cd4cb958d1bddbb38a0bd64714afb6295ffa4c7d36c407b78a2ddb9a85c4bb1e162b2c3ede4d85bd822f312957ade3c34b8892 SHA512 1976d1e28454b6c95a7dd8bd079214cbc19a601ff04fb699b5d34dc2f0265e36623a6ea79e25a3cfdf53112cdc53084a2983e76a0cfe490fd8d72b8797734958
MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/commons-beanutils/commons-beanutils-1.9.2.ebuild b/dev-java/commons-beanutils/commons-beanutils-1.9.2.ebuild
index e5b223986bbe..9391c5af9925 100644
--- a/dev-java/commons-beanutils/commons-beanutils-1.9.2.ebuild
+++ b/dev-java/commons-beanutils/commons-beanutils-1.9.2.ebuild
@@ -58,7 +58,7 @@ src_test() {
src_install() {
java-pkg_newjar dist/${P}.jar
- dodoc RELEASE-NOTES.txt || die
+ dodoc RELEASE-NOTES.txt
use doc && java-pkg_dojavadoc dist/docs/api
use source && java-pkg_dosrc src/main/java/org
diff --git a/dev-java/commons-cli/Manifest b/dev-java/commons-cli/Manifest
index d6e20fa5e32e..ce02a002a09c 100644
--- a/dev-java/commons-cli/Manifest
+++ b/dev-java/commons-cli/Manifest
@@ -1,5 +1,5 @@
DIST commons-cli-1.3.1-src.tar.gz 145886 BLAKE2B 951dd516a2b80089cbd3029e456dec295adef12a6e2225a99cf3acf88cb7434bbe0ea3b2dd40190ac1cbbaaf099a88405ac7c4cd9ae096ceeb13c9a13bd0198e SHA512 b5c569bea3c213a1959ae698894f2234477a7a5ed246f8e81142041173f668802959be018011bce6aa2a5631081378e67d69eeba9136fa19c96193dbdf2a7d15
DIST commons-cli-1.4-src.tar.gz 148530 BLAKE2B 72460ee073b4e8c5179da03c3d599cf04b37b5b3aff89e4927b07765bd879acc9ac56f52e7dee03214e21f7ba9e5af3adf54d2f943aebb266bfa9b4983ba0380 SHA512 a5db856f6154e4340aab1865e3b34c752c0dceb8063faa64740ed470d8e6b3e7782242ae51d6bb57a535a6d6dad2943cc3130d7202223b8f89b8cbecdc3d9d4f
-EBUILD commons-cli-1.3.1.ebuild 1021 BLAKE2B b8e5af04fc22daac049f839ff28b3bb3f9bec1e6c3f412dda46510a05273ee4acdd3fdeef08c5b248b12a38d9963e26d3a8bd43a585e08d1b460b3f4cf1feb60 SHA512 a8f52c8889c3c75778bce7c491fb8b128da0578c33c5bff0477ef9c4c5f6f5fdcd1cafb9649630074213431efe02364ee731ce582480f238ea5d24d710718b1d
-EBUILD commons-cli-1.4.ebuild 1024 BLAKE2B 212a0952bd184096959f49d57df0a6cabb7dad9faf755c5a76fd3735a230dcd296fc756ae7a2400b3fae6075b18a0370fc5409c7240baddb332508da15f73ab7 SHA512 3c1f769888ebb51a017a73a92f89006735f28db41d8ee146eb1180d14a25e0d1487ee1712c795cd46ac7bd8df082671d1ce8294b8f075033bf21bbaf65b5ddc9
+EBUILD commons-cli-1.3.1.ebuild 1045 BLAKE2B f319b09adecfd2fcc3418768067b742d5b5803bf8a81d4b3c6f7d3b7a39a61fc08c4536b98d49ca7c69fc084a636e3dfb2dc3cd278e8f62e182dc0754e06f7c9 SHA512 288e57d8087eff46b3aa61f17b54f7d45856e220af92bd7d245029d7014a296032880696c2536335c774fa6a85643591297b3ac8e0af15a706317fd51086d09a
+EBUILD commons-cli-1.4.ebuild 1048 BLAKE2B bc46b123e82de6e8842622ba63b808455990b7adb6fb1e195c7356482976d32aed17265e284d3acec9d9cb9b0a9ef9c6aa5c37e33b898bdaacaa221a11abb4b3 SHA512 bf38005a8e233cd5c8edb50c0d74ac9d8506b1d1d1e5101e0a083629eb08c89c9abddad1c776851fe76df0989110625e4e89e2b6da6ab355efcbc8c092783fde
MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/commons-cli/commons-cli-1.3.1.ebuild b/dev-java/commons-cli/commons-cli-1.3.1.ebuild
index a61fd6a54cde..514f882b5b6a 100644
--- a/dev-java/commons-cli/commons-cli-1.3.1.ebuild
+++ b/dev-java/commons-cli/commons-cli-1.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -14,6 +14,7 @@ LICENSE="Apache-2.0"
SLOT="1"
KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="test"
+RESTRICT="!test? ( test )"
RDEPEND=">=virtual/jre-1.7"
diff --git a/dev-java/commons-cli/commons-cli-1.4.ebuild b/dev-java/commons-cli/commons-cli-1.4.ebuild
index 91a2f1e31ae3..997d2c07fd44 100644
--- a/dev-java/commons-cli/commons-cli-1.4.ebuild
+++ b/dev-java/commons-cli/commons-cli-1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -14,6 +14,7 @@ LICENSE="Apache-2.0"
SLOT="1"
KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
IUSE="test"
+RESTRICT="!test? ( test )"
RDEPEND=">=virtual/jre-1.7"
diff --git a/dev-java/commons-codec/Manifest b/dev-java/commons-codec/Manifest
index b8333b15b303..497ee8beb052 100644
--- a/dev-java/commons-codec/Manifest
+++ b/dev-java/commons-codec/Manifest
@@ -2,5 +2,5 @@ AUX commons-codec-1.11-build.xml 8949 BLAKE2B f1a5dfadeebbc183c075d96a8769218e98
DIST commons-codec-1.11.tar.gz 369538 BLAKE2B 6b77cb3c69c81a9684b298ac5233b788d6651ecc96b70ac7fda9face5af5a60970c5bb2531fd285d20dce7732829f7470b9e4941d63025faf47247410f1ffba2 SHA512 b3159308f28b2fc50208421412d8cc81f439cc07dc3d071df7b50f2d862aab65b3d20bc8eb2906367a05ecf5138c56b5f12c6cf9c224def8b8286fe12ac5346f
DIST commons-codec-1.7-src.tar.gz 291251 BLAKE2B b8fecdb9b88a21ceb3106a13332493617ecd2c8064c84a1514dec1c1c254e18116ff4926f7445bef4171000ba77da411efd6a93fe80a4795e887832035373e10 SHA512 31358283ac2827cb05486b8ff1512242153f61deb086f7fe145ee3ca38d96e43fba080a1e89a3b8cd44d09761015ff4dbe5226d29b7f9fcd59e68ca7701b28d6
EBUILD commons-codec-1.11.ebuild 1048 BLAKE2B f742d3ac245d6561e53fef06b73472ccde6ea21ce33e5b26777f74db1ca92d6788d782e3e38ed4a972bc1cb41595cc82f23674d8b47d1a54ddd259d93999dca2 SHA512 ec45f17ca4f6517343389136407dc1ef5745b7ffef3d7e69f69c8f0139e470ae7d59ba1bc77dc894e39a864520ab0e7ba50685b334ee40e054fb8034c6aec607
-EBUILD commons-codec-1.7.ebuild 895 BLAKE2B 25171d147e9638b88f210f02b6e12d13e6c391b51191a1c00ab118cac8e4fba1a063e824ab852500fcb2a99081378c81e12317d31349f8e0e6c15a9ceeceeb41 SHA512 d842c00d962bfbd508e893aa14e303ad74f9d5e9afdd85ab9df7ee67ffad174dc77d950328333566e29eaf04c5402b95a1080439724579cd4bd0209102945619
+EBUILD commons-codec-1.7.ebuild 919 BLAKE2B 52fc0eb97e191db5b1d74b6122789a1da01786e0ed8e1f758e56df2a3f879de851f5ac4994f3bed01a661c6b12d7e93c2350ba8f117acf95cd1439637f3d9f81 SHA512 e4f9fc611fba68b649bf06aab9bfb969545fa461395b9ae09e229f1dfa07e7c960239bb60c617f180308338b2691f51394538aa1a7c6cb4e0faae439a13b2459
MISC metadata.xml 1360 BLAKE2B 5e996a35877486521352b61fdb44872970caab9497267c9d95d1364bd299838486f1853b46f35ec140259d33e7158bca7224488f21c388caa4fa9e7a153006bb SHA512 d16f70860d4880e50d25e6297823fb71955c147eedd115ca7eda0a0bf6c4cbc6121bf8b12062241192facd4583f10df56a838c84940b5914f75d13f10c96e9ae
diff --git a/dev-java/commons-codec/commons-codec-1.7.ebuild b/dev-java/commons-codec/commons-codec-1.7.ebuild
index 8a328da43bbc..02146ba0a65f 100644
--- a/dev-java/commons-codec/commons-codec-1.7.ebuild
+++ b/dev-java/commons-codec/commons-codec-1.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -14,6 +14,7 @@ LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x86-macos"
IUSE="test"
+RESTRICT="!test? ( test )"
RDEPEND=">=virtual/jre-1.6"
DEPEND=">=virtual/jdk-1.6
diff --git a/dev-java/commons-collections/Manifest b/dev-java/commons-collections/Manifest
index bbbff6d57b9b..7d3e7576d225 100644
--- a/dev-java/commons-collections/Manifest
+++ b/dev-java/commons-collections/Manifest
@@ -1,7 +1,7 @@
AUX commons-collections-3.2.1-Java-8.patch 7059 BLAKE2B c2dd3d388b15cd61224e96eb8b380f881ad4629ce58082c1b80cb843372741f10eaa4f3a71689a3f7817d7a702a82ef61dc7634187992fb03b2a8730262035ff SHA512 1007c9c46944c4b0104b0b13c4c2acdfc9791274019b20bd38b95769095843e4be1ee29d81ff61517d9a7d9b2ad5bd77c92a2f25ebe3bab68f9a04d3a986a44d
DIST commons-collections-3.2.1-src.tar.gz 609930 BLAKE2B 547b785b82e16f1c318fafb5761292c5fe8beb57dd4a4881cc16ef7df7328df279713442cd1fc4a64fad0d84457c06d5536c084fd8084f62495ce44bfde19a34 SHA512 8b9b5344528b3b8a53142abd944ff6b89cc149a3fa0c1eadf3f2172509499af5820ba86859e47fe7f15f994f680fa3c577c21891540b64f41f826babe81a0fc0
DIST commons-collections4-4.1-src.tar.gz 704671 BLAKE2B dea1b630168373013ca937c9b02414b92845fdd9ddf7a22a05c4d7f8d30ff26d73f3a2d399d7a4c026f8ec43a282120fdf3d3cb1042a311c3b490ffed1774e30 SHA512 c5666f41b68c9fdba3731730595616b16f98579c077cf047f421a46729b5a65476a8707125a2c0b0c6c024ca94df8c2633123bd99e705149fcb1afadcd3bf68b
-EBUILD commons-collections-3.2.1-r1.ebuild 1728 BLAKE2B 56dd7214eff19ebe391363a1c1066ab234290a458ee8943e5e13838cf41f6eca68abd6e9a31e62bc8e2c4285c628afdda809c2b6544080ba13b2ee54498d12dd SHA512 dea746396617ff3b693f444056ab157510980f191567d09910005352d51c0b3807d7a2c91897125da8a9a5608a35991898f41ad77d7948082ab100d7f64f15e3
-EBUILD commons-collections-3.2.1-r2.ebuild 1294 BLAKE2B a61b2884d319cc5c648ce5133d57a87f6d95128094d344adf4f206e5eacb3e925e370adeb958adaf8f41bac4a7d9b73a2010c3477dfb175cc487db9b6e822db4 SHA512 bccd79f3babd4416a1cdd0d27f3c6540258c61a395a261af024f84622f01f8bfcd3d0a3bcccff8f392a3a921637e40709dee12e1812f87f3533ab35b45be3cb8
-EBUILD commons-collections-4.1.ebuild 1182 BLAKE2B c127dfbfc2dcab974143e7efb1a5eee63e2472b81f2a75b8eff8d011d8b6528e023326aec74de1447bec9acdfb330e91ee19b949941dd33939333965291eb7c2 SHA512 e55765f2d3896a45f064cbaecb05b90d5a8bc9004055ca22629428b6778c62584a0ce3264cd3285edbcd5cfe7ce10559cd24f202b55d6e2a718948142a717605
+EBUILD commons-collections-3.2.1-r1.ebuild 1745 BLAKE2B cf353fe324ea17e1c9213fd3c894d279b0fca09563500528e4bdf13488aa07cf489e6b666b2787efcc8416a1e0e10dfe66f5395775359f906130a267760917b4 SHA512 94aa87794739723dd4323c5ec86d47365a9587c0896e5d446089ed9f9979e119b807e2b9d32fa9e3d305944fc075aa7efbb3c4a898004fc39475963347809bde
+EBUILD commons-collections-3.2.1-r2.ebuild 1318 BLAKE2B 09af538d0f2f8e5fff792965299b1246e6e9df01118c6023770c7b8cd208941eb9dd105ce1635a2e868c87766c7f3754d0dcfee210a402a56bb662c76c23c26f SHA512 e5c5fc51fecdd033dc9dcf261285e2bda153f682b837dbb2ea115f05a2e1d41947e1a32f80d9c539faca63192a812cee2427eb3e56beeb481fa4a4a0177e89c1
+EBUILD commons-collections-4.1.ebuild 1206 BLAKE2B 595e0add9f94d0a7c452625e6f550455dfebf209dbe0d9561f6b4537ce9c8e87077af889d7a79d4a412de7e56cc1606b3fc9cba2e4fdcd7ab2b609c8643ead52 SHA512 78b082d24ce429ab517e85148d7bdb66506a1224469ad6e9cdb160542ca2a5d4397c27cccf82398d5e2add638451007b77fca1588f36fd9201ab1f25db6865ca
MISC metadata.xml 325 BLAKE2B af3d8863d79f6cb8290734821ff82fbff7b65ec3d017f7f530e5c74d745d94f4a15713fa06b24b7e3dcd092dedc10f6642a0a480ee13e916bbd5895c52f1fab0 SHA512 23d211dbb0efeb5909d6d43ddf7a58ab34d33d25fc80216e0e6d7722424c06df89912947105070e63a64d44b6ad37e3053e19bcddc4c808d9cfc234f4d923645
diff --git a/dev-java/commons-collections/commons-collections-3.2.1-r1.ebuild b/dev-java/commons-collections/commons-collections-3.2.1-r1.ebuild
index accce8f13e04..9d19658925d7 100644
--- a/dev-java/commons-collections/commons-collections-3.2.1-r1.ebuild
+++ b/dev-java/commons-collections/commons-collections-3.2.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -15,6 +15,7 @@ LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
IUSE="test-framework"
+RESTRICT="!test? ( test )"
CDEPEND="
test-framework? (
@@ -62,7 +63,7 @@ src_install() {
java-pkg_newjar build/${PN}-testframework-${PV}.jar \
${PN}-testframework.jar
- dodoc README.txt || die
+ dodoc README.txt
java-pkg_dohtml *.html || die
if use doc; then
java-pkg_dojavadoc build/docs/apidocs
diff --git a/dev-java/commons-collections/commons-collections-3.2.1-r2.ebuild b/dev-java/commons-collections/commons-collections-3.2.1-r2.ebuild
index 50ad9b9cf0a5..2c5e6d18421e 100644
--- a/dev-java/commons-collections/commons-collections-3.2.1-r2.ebuild
+++ b/dev-java/commons-collections/commons-collections-3.2.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -15,6 +15,7 @@ LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
IUSE="test"
+RESTRICT="!test? ( test )"
DEPEND="
test? (
diff --git a/dev-java/commons-collections/commons-collections-4.1.ebuild b/dev-java/commons-collections/commons-collections-4.1.ebuild
index bd84b509220a..6a1080bb83c2 100644
--- a/dev-java/commons-collections/commons-collections-4.1.ebuild
+++ b/dev-java/commons-collections/commons-collections-4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -16,6 +16,7 @@ SRC_URI="mirror://apache/${PN/-//}/source/${MY_P}-src.tar.gz"
LICENSE="Apache-2.0"
KEYWORDS="amd64 ppc64 x86"
IUSE="test"
+RESTRICT="!test? ( test )"
DEPEND="
>=virtual/jdk-1.7
diff --git a/dev-java/commons-configuration/Manifest b/dev-java/commons-configuration/Manifest
index 7bfdc5f593f4..c4da701fa49b 100644
--- a/dev-java/commons-configuration/Manifest
+++ b/dev-java/commons-configuration/Manifest
@@ -1,4 +1,4 @@
AUX commons-configuration-1.6-gentoo.patch 979 BLAKE2B 37076bf72f33c69dd00a0b1715cdff1746c0ccdf6d59dfe11a40960b0c317c280a30ee2a70d5d3534d5eb22edba0d489c186e7a813c455918cde6f81ce32d906 SHA512 6e0e3e69a77b31a39ad2f160a80ff08b9cdac2b0788b58b06e09f9a07a90a36bc1a4171e6bd739495b8e4c6271cc49ffbfe221dda73756f3407cf268dafec5a7
DIST commons-configuration-1.6-src.tar.gz 559621 BLAKE2B ce6ca821c03b4948796c46fe796684dbcc8eafbc6004e2abace573f8fa316f638056c03684d10d29c0f3126554bc8cf2c9195228044a2db7203f847d2b71b22e SHA512 5d82b844cf39162976820d030d05afeeec1151aa33bf4353f9ca844e552c55ea26daa1b74158baa31d0677e311e9dd83a1d9721c8d5f4e23d21068c4ca2eeb01
-EBUILD commons-configuration-1.6-r2.ebuild 1686 BLAKE2B 693bdb25d448691d9d9e491f94ab0df1b2bbdf864bb34d4fb7847d6bb6609b1e0e6cc038c2df7653900eeb21fe4f9b84c866b354ef9cd83963f91e3fd574ee53 SHA512 73bd9b24c738b0942547cb2df6c78dbab264faa7333955b2aa55a665660bc57bb3398fa64c4ced2b05f44ca50d7828d8882c0988f2420c716031b764ce500ca4
+EBUILD commons-configuration-1.6-r2.ebuild 1679 BLAKE2B 2dce9a08eb53923dff1f9c66cc2dc3d7dded384cc2ce5931fd5fb60952ac713f00ad1726f09f6e7a88cf032e65aee652e25586ad2f40e6f091de016efe2b3880 SHA512 6357dca71b65bf289d0c572036a4eb2ddd33c388aa337c79c37072fb7644fa749747898abf3a395256b6aa09e5dad571aa0cdc0edf92d6e9e392f69535633883
MISC metadata.xml 429 BLAKE2B 5a7d59e205a26abfec76c9391d4c8b66710b082ba4a9362e70c4b40775d8d448ed531185dd4f65a04fc19643764364e3a885a4215e883127a781c8af39752cf0 SHA512 eda224d5bad6200ce652d798d7ddd2f5f7de3652419728d05068c2bde19caa2486b1060b8d98d9dc5adca2d00014e868b93dac646ee129d57c7239a6917a260e
diff --git a/dev-java/commons-configuration/commons-configuration-1.6-r2.ebuild b/dev-java/commons-configuration/commons-configuration-1.6-r2.ebuild
index 811493b46bd9..b8d6af15b0dc 100644
--- a/dev-java/commons-configuration/commons-configuration-1.6-r2.ebuild
+++ b/dev-java/commons-configuration/commons-configuration-1.6-r2.ebuild
@@ -61,7 +61,7 @@ RESTRICT="test"
src_install() {
java-pkg_newjar target/${P}.jar
- dodoc RELEASE-NOTES.txt || die
+ dodoc RELEASE-NOTES.txt
use doc && java-pkg_dohtml -r dist/docs/api
use source && java-pkg_dosrc src/java/*
}
diff --git a/dev-java/commons-digester/Manifest b/dev-java/commons-digester/Manifest
index 7853c51edbf2..e266af539ca0 100644
--- a/dev-java/commons-digester/Manifest
+++ b/dev-java/commons-digester/Manifest
@@ -3,7 +3,7 @@ AUX commons-digester-2.1-build.xml 12816 BLAKE2B 7309479a61897c3ecc28e6394714c1f
DIST commons-digester-1.8.1-src.tar.gz 303266 BLAKE2B 618885c812a9bf40c080bc5736b8b4be4e18fe4d2f732d2a44d39369ae6cf3beb3af0cf500da3d103d7aa8c18b41b84d06907b6fc90f7f10d30840d6cfc83012 SHA512 0a39069662b4792d4856b79b5cedc2b44cb70303a19045d21c233d45ae4dde9e80662bd242a381e759d7cdb5adaf0b9fa6206bb8397b53348fa9eac12e9a4e96
DIST commons-digester-2.1-src.tar.gz 304060 BLAKE2B 2360f6f8ab77b20ad6b4058e0437aa792bf3886ddec2e09b6db259bc142c070965ce066ef224e92fb91614075631a2af1358ae4b4fc065fe9118e1d2559bb9bb SHA512 6bdb63431ed1e17f5e8ba24951762750a0e59b70c76eabecbf13f5fe6974864825456beed615c8f2c16f9a2f1404f2e56bdbc3ba335656c3661d5f368c708b88
DIST commons-digester3-3.2-src.tar.gz 324555 BLAKE2B 7b8bdaa70eeafb069e9ecbfe697ab86f5167ae3b9933e8aa306f0080de0ec99d12bd023067678b7b904329178f553fd6d4d98141ab329154a1c27385b33e449f SHA512 6d5ed9a1cc7612244747dcbd5c713349f27d63d1cef39fa368b4e91eaa3b1fe7043ab2fb498a73e8afde8081b8ff26a966e5b87b8b6dc68a3d907e9b25aa7cad
-EBUILD commons-digester-1.8.1-r2.ebuild 1334 BLAKE2B 041afef35e29c544ef5a55d636e1567282e9aa88f3777ee092563b0b69587eb73c0cd1a6d613a292d8cf59f79c324cc9239ff80fc0412dae51fb9606b5b447f8 SHA512 e86d5c4195016eccc3a76a78c70d9ced9ff0cb7b7fc5ba1cd49720e84d57f439cc3fb8ea206c7f9bee8cd5e13fbc20da6dcbbb53d8404c875e142cfd5d64eed2
+EBUILD commons-digester-1.8.1-r2.ebuild 1327 BLAKE2B 25c01d14ace8b931614199418ac5857c77d65ebfb54d9ed7501d0684e9557e58b003defcfef659168127eb288e09cbb182c4564e8e237f74a0e0cfe70cb49879 SHA512 04d2e6860fdc72bd26fbf7662c96dcf8fca7ce36415a738f75d31254c3ae9a3fb6f357266fd6c8a24b46f8f9868a516d5afb6fdf95ebcfd88b750d33b6207e59
EBUILD commons-digester-2.1-r1.ebuild 1271 BLAKE2B 627edfe47d49d94e97b2d40773a4a55ccbc885bd95f5889500fd1a6662fb008d5d5efbf4727bec54e04e7a9e6fb6b412bf5425316aaeea5454ac86ff076cc3d6 SHA512 3b6b050868c748e172afcaa91f3f7632f265272cf9cf87a7d8aa24ae044dae92ebb60ab2ba05fc1bc7c5b823d22ea7597d856f7b0151cf4ad4dd2d545a035054
EBUILD commons-digester-3.2-r2.ebuild 1346 BLAKE2B 569d0a11ac290485043abeaad1f6d5605e23e3c86e2514fddb14c90422499139056ae938d93d1f0c237740e7368844ca9a721f2a36a4c852e65f7d93e353f504 SHA512 380541befcf378f7446af7af0931fb3d95b682400b4fae1beb369a48d1ec807ecfb816a6a120085147924358ed17037027f03f9d9d049659342c3dc7a3882c0e
MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/commons-digester/commons-digester-1.8.1-r2.ebuild b/dev-java/commons-digester/commons-digester-1.8.1-r2.ebuild
index ef48eccd8418..e6cb1b16c607 100644
--- a/dev-java/commons-digester/commons-digester-1.8.1-r2.ebuild
+++ b/dev-java/commons-digester/commons-digester-1.8.1-r2.ebuild
@@ -49,7 +49,7 @@ src_test() {
src_install() {
java-pkg_dojar "dist/${PN}.jar"
- dodoc RELEASE-NOTES.txt || die
+ dodoc RELEASE-NOTES.txt
use doc && java-pkg_dojavadoc dist/docs/api
use source && java-pkg_dosrc src/java/org
diff --git a/dev-java/commons-email/Manifest b/dev-java/commons-email/Manifest
index 98fe5c009faa..a945a71b6e9b 100644
--- a/dev-java/commons-email/Manifest
+++ b/dev-java/commons-email/Manifest
@@ -1,6 +1,6 @@
AUX commons-email-1.4-build.xml 10956 BLAKE2B ed6aca64d4aa19035754ccff5c1acd4a8351d60144b2794c2116e8c0175a3cd1879d25afa97e9ca066d3f525481bd0ecd2ade32c152ec822cd1fe0ced7993cad SHA512 2555322efb15f1f4d26d78bea3638ae20b002c431891ec5ab8a45ef88df23b67f0ac0caf3fbba17e8f32fc2474eb09ae481bed05eb2b612386f31df5b0007cdb
DIST commons-email-1.4-src.tar.gz 288876 BLAKE2B 17de5c947e68db988b5999ab95f122570a9f52f0557bbdb9a483676576a81d6cfb150058a0ed530bc8dde8732313839e320f4bd7ecfc088b483947dde5760441 SHA512 2a62256e284b9f4f428cf8544e46e81aa521476c41243df1c4f8a9e1bd4bcea3c768346aaab862b8c2a8b271c6012a38164c6d62867d2849a3ee0c2820fe422c
DIST commons-email-1.5.jar 62954 BLAKE2B fe3970fcdb55f4b6859ff30b4da4f71e96ad8d47e76c280d6f0eb0040d18a39bcf1461eee48fc71733b11c24006328c45c5a7252261410bd4717186116f95732 SHA512 db88b00724a0ea5b103758beeae3a9d61d455edc4a2bbe39f7906565a73dff967b91fd73b64668e5d4ec7993faf23bd69096727b998544c73a7bfb08f9c45988
-EBUILD commons-email-1.4.ebuild 1089 BLAKE2B 017b1443086d1eee4e3778a95e8b2bf3ad1f06e5c8146448d57f1ab83917df2631f101f2a20c23d1cdc9e5705939152a7534eaab69f07ceec69c342af7d49799 SHA512 a85d7e3ec14da9425519bf15ba4f4e576fcf9ed0dc5c3482ed9ecde53168ea067b16bf0aef6b06668ff0b6a0a224a20b1943c3a834b73764b870b52676cddb83
+EBUILD commons-email-1.4.ebuild 1082 BLAKE2B 3e95a685ba315b5b5c2f1087415dc7ec1d4a5815913a5879c9600fdd71a033a552565573215e2ea9c6d5fb1808c096af33ba19c254083051f2d9d920d7e0a98a SHA512 335b6e7dbb6132a8a48fb2abb3de1b534c90c78f8dcfe211773bb74792eda971ce7dae24a6ca3ee0254331e5558304abd413b1ede1f4da47b2f9b9ec609e9461
EBUILD commons-email-1.5.ebuild 619 BLAKE2B ac892f6124f0fa2beb5300e4c4dd94bdbe98d3e2253cff77e40858b3769b127a57be4dc781cd5d4f1ea4502a1d698f47c4cfe5fc621ac9357543a1bddba552dd SHA512 8613c27dd04706405f1974882200330541aaa57ae034fa34a4ba23a9cfbc6992168668e0a3a13910816bb9cdc29c1e55e485b5426050b528929291b22c10204e
MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/commons-email/commons-email-1.4.ebuild b/dev-java/commons-email/commons-email-1.4.ebuild
index ebcea82ec21e..d07ecdea6210 100644
--- a/dev-java/commons-email/commons-email-1.4.ebuild
+++ b/dev-java/commons-email/commons-email-1.4.ebuild
@@ -47,7 +47,7 @@ src_test() {
src_install() {
java-pkg_newjar "target/${P}.jar" "${PN}.jar"
- dodoc {NOTICE,README,RELEASE-NOTES}.txt || die
+ dodoc {NOTICE,README,RELEASE-NOTES}.txt
use doc && java-pkg_dojavadoc target/site/apidocs
use source && java-pkg_dosrc src/main/java
}
diff --git a/dev-java/commons-io/Manifest b/dev-java/commons-io/Manifest
index 988a8396ebad..e4b2a480ecf8 100644
--- a/dev-java/commons-io/Manifest
+++ b/dev-java/commons-io/Manifest
@@ -1,3 +1,3 @@
DIST commons-io-2.4-src.tar.gz 330961 BLAKE2B 1a1ae7c968bfc38b4a4f3c4c131de088c4efdd8fff0858e7493e057909076c74d4b0ebee1999ef01af9636d88600ecca71bb0808686a6f9c1a20f4d7a5cbe6e6 SHA512 69ac5f7b8de952d8b519ad89d4e9a33a9d269af0e68b735c0180ee8853a30e2a09147ceac362626a2fb3a041bd46eca094be2661ff280c1bab54a0548cae0aee
-EBUILD commons-io-2.4.ebuild 1558 BLAKE2B 72e6e2ac3f82e4ec4ae670309b8512cde13af0508e6daf9ab97b015b25aa62ded0f6e23a7242557242ed6d71b8ff64107a9288bb81387aebd9a4ebb78e66e995 SHA512 cb2bedb1bea8e6147bc957d67f6c3aa8ea71c433a2d4bad134bfe71f58cda58f36c0b4eb3b712b9176bac4e0a4ecfc5d6c8f2598f2c9ee8ad0b9631bf3827bde
+EBUILD commons-io-2.4.ebuild 1582 BLAKE2B cc175b3fd6ab639dc9cd773bafc6ff75f0455541ef330b3a260e3e08d9d031713b9934d84a044a910508a4afb33b1c76560a257f58a684889899e46390ab0e8e SHA512 b62d2f3faed6dd8a2500c07847123429f198cc69c4e85342f466075da97fffcd1375997079788d02fcfe5e8c3eb1321c7e577a54d00ec2de7b1e809fabb7e52d
MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/commons-io/commons-io-2.4.ebuild b/dev-java/commons-io/commons-io-2.4.ebuild
index 464bb54f6738..5e934a66a868 100644
--- a/dev-java/commons-io/commons-io-2.4.ebuild
+++ b/dev-java/commons-io/commons-io-2.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -15,6 +15,7 @@ LICENSE="Apache-2.0"
SLOT="1"
KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="test"
+RESTRICT="!test? ( test )"
RDEPEND=">=virtual/jre-1.6"
DEPEND=">=virtual/jdk-1.6
diff --git a/dev-java/commons-jelly/Manifest b/dev-java/commons-jelly/Manifest
index 02c52ccc412c..5d1b39553502 100644
--- a/dev-java/commons-jelly/Manifest
+++ b/dev-java/commons-jelly/Manifest
@@ -1,4 +1,4 @@
AUX commons-jelly-1.0-gentoo.patch 2224 BLAKE2B bc79266243cf9016690cecfc414076f4aaa67a8b10074ccd77971c4b8f00d251315712d8769ef58c188cb67f3534b16946beabbb3c31d3d2601eb7b018949629 SHA512 726b64273320f1a089ce9d9b8121359cc377e070ce4b49155de52ce31559d0601b137fb6e208b8c5ab696c64224047592c26957ad3d7a49dc390b523c821f7b5
DIST commons-jelly-1.0-src.tar.gz 174769 BLAKE2B 2dc43eef28c76252976616f0509aacbfed31ec0b99916730d86d084ec54bacc4f49000d04a953002717670d17a4ae2ae7249d57b327258414c3515dbb8abde7f SHA512 a72ae2dc8eea3fc19838f386dca38807a16326a3a93f483219212844f8ec033088b7721c78a4370f78a06cbee0c685144a2b16f171d54134822d06f653bcef35
-EBUILD commons-jelly-1.0-r8.ebuild 1539 BLAKE2B 09c197747867e4ffe01db3ac58a63dbefdb4ade35a1d2ccd10882ce2055e35c23ddde0ef9cbbdffbb51d10fbccce2bb1e8f16aa952d04cd559c81c79c91aff77 SHA512 b6cffabfdb0087b8a42492d19e413093e65d3146f0843ab8246791509376d1870996acabc9dd9e9eb9807993957f962f663b7c03ab779d4fbbfa6663c7a8a504
+EBUILD commons-jelly-1.0-r8.ebuild 1532 BLAKE2B 4a5e03526aad413813976978508e57073ef73297d4955f25a8bb4a13e9b3d43523343b65c146494262b78573995ac3dc1da8266a4ad0dd8d4af4f9f0416f6ea0 SHA512 413a6099bc5213931f28c67f4ae19395a46029ef9a13439acac47c30a74b8e789734533f3b56fb68bde9f5a6553facc4acb508df4bd947703d41f304a9d5d65a
MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/commons-jelly/commons-jelly-1.0-r8.ebuild b/dev-java/commons-jelly/commons-jelly-1.0-r8.ebuild
index 00885443116b..6cdda5bfc129 100644
--- a/dev-java/commons-jelly/commons-jelly-1.0-r8.ebuild
+++ b/dev-java/commons-jelly/commons-jelly-1.0-r8.ebuild
@@ -57,7 +57,7 @@ src_test() {
src_install() {
java-pkg_newjar target/${P}.jar ${PN}.jar
- dodoc NOTICE.txt README.txt RELEASE-NOTES.txt || die
+ dodoc NOTICE.txt README.txt RELEASE-NOTES.txt
use doc && java-pkg_dojavadoc dist/docs/api
use source && java-pkg_dosrc src/java/*
}
diff --git a/dev-java/commons-jexl/Manifest b/dev-java/commons-jexl/Manifest
index fc83aa01cc88..21826d9f2134 100644
--- a/dev-java/commons-jexl/Manifest
+++ b/dev-java/commons-jexl/Manifest
@@ -2,6 +2,6 @@ AUX 1.1-test-target.patch 607 BLAKE2B 93abe546683310bb4ac0937a4a1ee9ebe8f7f72e5e
AUX 2.1.1-build.xml 5742 BLAKE2B 900957b362f993314f47b09cbfd2f86c641b685be795c837e8af676a632b28b6638debaffe6208fc62b87d7f9df7bfb701ce69aaeb6b0c0602b25e1a78e9c16b SHA512 f19df3e608bdb85681e90e3e331b1920e9c9be2fa43da38cb9eecc9c569d0254ed5a75dd10962442477e076495bf63e902204f49545140a86c5392a4c6bd78ad
DIST commons-jexl-1.1-src.tar.gz 128030 BLAKE2B 9694077640cf54e9621a2860fbfa5eae8c7135447e39b64147180db1b859f68b2fe610f161ceca71a432fe2216ebac2386e00ea3ba7e27bd687736a5aa39e95c SHA512 d403e945060385c4546cf173af9ec4a795c074a9b56aacdf16f301b875c9f78b47a91fdfb84059805a082466d8a4a371bcb6ef6336e6ba806272ad8e2cce9e13
DIST commons-jexl-2.1.1-src.tar.gz 208559 BLAKE2B 031095ab8549f295e99048873ebc5eee2ebce2e79bdef28afec4ea3adef051cc397ca8740b3d9c2a2c02c51555b3ab3b7c79c0222368fdf6c652e4ed2369d7e4 SHA512 259c0956bb10f102cb3d860b1c99d3d2b2bc5d705e4160f743fa774640ed8c1ee6f3aad518a8a69e8f94a164b21cb2ae26e47cd3e81e92a086a3c3f753befacb
-EBUILD commons-jexl-1.1-r1.ebuild 1085 BLAKE2B 38dcda95f91f900a9d5ab4fafaba57f0840599cfba0741582ab1a78300da4a4f651cf5d1d2e8d176c0f5aa7f5f0abf0d5e48abd7037f74fa90e1093b345cd99b SHA512 96f6a5e42eabac7408059b0fd9fe229135857afc377a9d5b8626cc06bc1ef81c13cc0a7d18377231f3534705a3167538a7e72b480478faaa01a20dffe7f0f240
+EBUILD commons-jexl-1.1-r1.ebuild 1078 BLAKE2B 727e179bebc5d3faf9c80e8b2727ea8467379298eba7bfae4816cedc741ba9db4af3e51f3fd06617bf692c3382397c9701d471b0f7a85893c895dd6d5ea3d614 SHA512 7dd8da0a0204cedf3ef025d0a43721fe9262d66ad5204a03ff98702c2fb9f3e5eb6c9ec2137b32d950569056032375136404149c4910c3fea1f45e15df0806ad
EBUILD commons-jexl-2.1.1.ebuild 1563 BLAKE2B 7cae693c0acd225a5e318d0ac191ff24d955ed3cf16ba0ba75f596af07682d32af75331db21017746b16dd61a4527f3bbe31f95f55f1cc72bed4b5bca3e38b27 SHA512 f0a13af541986aa9bb54148d88716f2e8fdb4ed2ce17eca0d163c71e8cc1cca7cab1412ddc768ddc505417e03703bb9a1a5ea177aeefa3c58f54586614c7c266
MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/commons-jexl/commons-jexl-1.1-r1.ebuild b/dev-java/commons-jexl/commons-jexl-1.1-r1.ebuild
index 236a5c1dcd70..25ef0baa46ac 100644
--- a/dev-java/commons-jexl/commons-jexl-1.1-r1.ebuild
+++ b/dev-java/commons-jexl/commons-jexl-1.1-r1.ebuild
@@ -42,7 +42,7 @@ src_test() {
src_install() {
java-pkg_newjar target/${P}*.jar
- dodoc RELEASE-NOTES.txt || die
+ dodoc RELEASE-NOTES.txt
use doc && java-pkg_dojavadoc dist/docs/api
use source && java-pkg_dosrc "${S}"/src/java/*
}
diff --git a/dev-java/commons-lang/Manifest b/dev-java/commons-lang/Manifest
index a05029cb22ec..49b5859365ba 100644
--- a/dev-java/commons-lang/Manifest
+++ b/dev-java/commons-lang/Manifest
@@ -4,10 +4,10 @@ DIST commons-lang-3.6.tar.gz 852347 BLAKE2B 4a3ad5f557d27e4a109f6e65f9fe8d792b01
DIST commons-lang3-3.1-src.tar.gz 638619 BLAKE2B f971afc9bdd3896178bc4be0b6c5d8809f1c1ac0d69ad73ba0d71c185c600ca7a55c3b4877af64b552ccebed9567aa7830f236f2c0d9c38f259870b894c9d745 SHA512 4d201c695a9b908a1809bbab689f80c6aa508b221b4c2786974eada08e647936f5879841c64eed509032ffdd5410735480e7ecb2910295d0f79e857c27019560
DIST commons-lang3-3.3.2-src.tar.gz 740462 BLAKE2B dbf8fe7f6a4bb0cf462e2281d709e4ecd65e5fa116bb707af14a2b7b248eb1877f872f937fde2e5743bbe9b4775fabd1d0897ebeb8ebe92af235914cac7dbc2f SHA512 be889e0e9d7aaa7d6635e41c17d19dd1e5f9e03fd78eac61fd5f5483321170b9a72007ad0bfa7023e6ff55ae418b40eaa01dae350641c4e88138ac59d4001667
DIST commons-lang3-3.4-src.tar.gz 771275 BLAKE2B 870f9c5aa18cb68cb88edc28d426df258af69eb6efc3dfe77bab40e2e81bddd4e56b1244a5ad4433f9dd4c0d533dc7b3b10c865fcaaefd9602e1f681bb48538b SHA512 44e93f2d8f7e6a54becaa797ee3348c6125ccdce96d772158f2a1e5ba2a7ecaecf00a6290f2e0fe2fa61db422313709ec6bc836d9296e2f16c5acf6635bb12b5
-EBUILD commons-lang-2.0-r3.ebuild 860 BLAKE2B c75078eb5c4b40727ebb7d8767158b6458c3de3e6d7220a32f5426b5d8bc388ddd6f27d036cd5e009c92bd8dd13a6cc5b1bac91ce28402c5f66a2a3e3c1c40cb SHA512 a5343eb554e885fa53d92f388538917d7138ebc083799ddd4b341003ac16fca1df0d756deb0c04f93cb7443458063e697a8d7ca802761f0a5593210a7aefb830
-EBUILD commons-lang-2.6-r1.ebuild 855 BLAKE2B e6c3f943bb7a61064323748ec99c54e44acef2ac7899c864dcc554e66d23a7463d4e1e6e786a3145ebae636bb976896d26a038fedca3c5c195d64139ef8d0e02 SHA512 b3a1a0c9eea0742c8803046880b91784c87d0719bc38121246d143b3de1f1a04ef9ec775692b2862833a0f07f565af1dbd16f750cc439e2a6d69de9d7a455d40
+EBUILD commons-lang-2.0-r3.ebuild 853 BLAKE2B b3b1ef307f8f400e60549b30742f950e9768eb9f98f05221906fc911e66e75c5c29e4e5dd852c689923becb69ae02a126948d630992942adf5f6397290f9930d SHA512 8474d22076ad123848ad765100b5f84c0a76d74980451c6a2fe983bb7bbff5b5ec28968e86cb422dd07390af4eb6b0bdb0db7d904cc46a514a1fb835887517e8
+EBUILD commons-lang-2.6-r1.ebuild 841 BLAKE2B d21f73d96b0335a1048056fd0c1570e8f0961f4a9f9bc820fd41cf68e34cf85fad1d8aa3585a3d4437e585c727abb5b91dc4da04b59c26f9fd297e29c3e5671f SHA512 2a47b5444859beed98e249fd48d06c6c97178503607a740e2265d95da062d8fb6ee139edac3f76ed00bd7d44f7a8d7c18525fb2300b83195ff1f441297e0030a
EBUILD commons-lang-3.1.ebuild 841 BLAKE2B 1de87e9c73eea5aebd3891889025b5a81107ae54d6e8b3e456d66a9519cb87e90412ef16680cdefb06451320bfe021d490b1e42a4d205b9927676a5af2e8e012 SHA512 95de6c0c16b0b07def8cd4d698ec9ab5e79cb2715c658e95be67d9b7f3c28c04f47c5649edfa71be51026fcfa98c618e5283fa031ebcd621a1700dbe1d539c98
-EBUILD commons-lang-3.3.2.ebuild 1112 BLAKE2B 1b45826fa5fb04a270fd93c0b3526223d48fe32289f8a3c9d02b5c99b2997f65eff7d542700c13aafc68cb5c95e7af7cc8d9b7b74840d5a7d4b6c1fe715e3e2f SHA512 dba87629c9c5234c6b29604aa1401a52933644f901005c17f8a3eb4bd68fe5b6b5bc9c45096b7822e95aaedb292cc835604ec31b817c4babcde442cd2e4f11b6
-EBUILD commons-lang-3.4.ebuild 1110 BLAKE2B 3be8caf7bab320369e1ae456305abd79faaed94979835c7677f4c81019ccc0e7ea67fdbafbf839cf1c831cd8ba92730621350357db3f8e01cb84333ce62a0541 SHA512 c59defe42c47944e7ed60ae9bb3d6b52cf9e942617f1191f5f7cb8947b1995ab4e4c8db6cb26d1b1fa6f6edd1da1b355648b5f75ee782c6e8256b1a7d929ab2d
+EBUILD commons-lang-3.3.2.ebuild 1111 BLAKE2B fecd7695bede1dbaf79d944466678d0671bfa248979e52264c05201aca89db664fd9c21e15f242662dc0908d73eee16bad165dd8a028e8c571fe505042b4433b SHA512 3d50c00b2e0c6795a454a39c0fd3ff9651a04c8243cb1ebc208835a5b2e929857af153870cf2ad7ed097630a422fc0734b059ea06aad3aa0c2b5ee36e76864f9
+EBUILD commons-lang-3.4.ebuild 1109 BLAKE2B 7106a50e065ec2be273259cee1f7b3af8646cddbb7c5bcbe859a16f0b8bcd68c5e63d0f323b7437b2df8eb6361397a69917e2b612409885fae3d643f496578ce SHA512 5789acfafd94d8d5cba8a8dc7748007f86147835eb08968d6083fc7c407ef7ae9849a21f42f53d8f226577d322798ab80c9341ae870f69c10d4b44bd400287a0
EBUILD commons-lang-3.6.ebuild 957 BLAKE2B 70397b21b4bbb9e46bfcd3a2f9731486a94efcb9ef3a24f5000e3d7140c153d94782c4d630291c11c7b2da0e23017ef0a472d422ef1927d8cee89821fd1ac22c SHA512 15abf5f5fb7c29fcaf85e6fda4fd64f6352a88e4547839e00aa75dfe4f284a9ae37ea5efcfd557486f1f857c2a92c0c2dfd274b05ad6b1914172ee367d739c13
MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/commons-lang/commons-lang-2.0-r3.ebuild b/dev-java/commons-lang/commons-lang-2.0-r3.ebuild
index be7a4b9bb238..6fe664f4a31a 100644
--- a/dev-java/commons-lang/commons-lang-2.0-r3.ebuild
+++ b/dev-java/commons-lang/commons-lang-2.0-r3.ebuild
@@ -26,7 +26,7 @@ java_prepare() {
src_install() {
java-pkg_newjar dist/${P}.jar ${PN}.jar
- dodoc RELEASE-NOTES.txt || die
+ dodoc RELEASE-NOTES.txt
java-pkg_dohtml DEVELOPERS-GUIDE.html PROPOSAL.html STATUS.html
use doc && java-pkg_dojavadoc dist/docs/api
use source && java-pkg_dosrc src/java/*
diff --git a/dev-java/commons-lang/commons-lang-2.6-r1.ebuild b/dev-java/commons-lang/commons-lang-2.6-r1.ebuild
index b108cd7918ee..0d01911f7fb3 100644
--- a/dev-java/commons-lang/commons-lang-2.6-r1.ebuild
+++ b/dev-java/commons-lang/commons-lang-2.6-r1.ebuild
@@ -28,8 +28,8 @@ JAVA_ANT_ENCODING="ISO-8859-1"
src_install() {
java-pkg_newjar "target/${P}.jar" "${PN}.jar"
- dodoc RELEASE-NOTES.txt NOTICE.txt || die
- dohtml *.html || die
+ dodoc RELEASE-NOTES.txt NOTICE.txt
+ dohtml *.html
use doc && java-pkg_dojavadoc target/apidocs
use source && java-pkg_dosrc src/main/java/*
}
diff --git a/dev-java/commons-lang/commons-lang-3.3.2.ebuild b/dev-java/commons-lang/commons-lang-3.3.2.ebuild
index d25470181c51..40adb7c1f814 100644
--- a/dev-java/commons-lang/commons-lang-3.3.2.ebuild
+++ b/dev-java/commons-lang/commons-lang-3.3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -28,7 +28,7 @@ RDEPEND=">=virtual/jre-1.6"
LICENSE="Apache-2.0"
SLOT="3.3"
KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris"
-RESTRICT="ppc? ( test ) ppc64? ( test )"
+RESTRICT+=" ppc? ( test ) ppc64? ( test )"
S="${WORKDIR}/${MY_P}-src"
diff --git a/dev-java/commons-lang/commons-lang-3.4.ebuild b/dev-java/commons-lang/commons-lang-3.4.ebuild
index b6f7bc8b459c..d614bf91c656 100644
--- a/dev-java/commons-lang/commons-lang-3.4.ebuild
+++ b/dev-java/commons-lang/commons-lang-3.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -28,7 +28,7 @@ RDEPEND=">=virtual/jre-1.6"
LICENSE="Apache-2.0"
SLOT="3.4"
KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris"
-RESTRICT="ppc? ( test ) ppc64? ( test )"
+RESTRICT+=" ppc? ( test ) ppc64? ( test )"
S="${WORKDIR}/${MY_P}-src"
diff --git a/dev-java/commons-logging/Manifest b/dev-java/commons-logging/Manifest
index 60ec7a48ebff..ac0930825acb 100644
--- a/dev-java/commons-logging/Manifest
+++ b/dev-java/commons-logging/Manifest
@@ -1,6 +1,6 @@
AUX commons-logging-1.2-gentoo.patch 825 BLAKE2B 154927ebbda77a76007fe9b448fc2801404717fa933002a69916b9a0558af82b0172039ef294ba01b4cb98bcc93bf40b54681d4c2343e4a404e58772e8a8585d SHA512 1886a28bbccf0f8aa42a147628aeac444a672cb3dc006604088a67d536c376a03781b22394770c580d80c5616569b751e63c91d86cbff6f5caa47100897cd027
AUX commons-logging-1.2-servletapi.patch 1783 BLAKE2B 5f8bc256542335b5d955d998ef2ee49d8becca46b367ba0ac1152f68ea4fccc226afcd2475331cf292c3f0f11471052e6917c9508a6737c6482c556c2ec87363 SHA512 bf2f0aca771b7278f2d80ae3c149492040c137c1ab190513fd9894fad315f75e4b0423f65a5ffaff04faed3f7256728b5f474cfbe0aefc2a53d60337a6344d39
DIST commons-logging-1.2-src.tar.gz 188536 BLAKE2B 80613b78619f7b3429f60df4fb9b66dd4836e8b89fcf93a3a1bcd5cb7e410d474be010da16b325143e028a40ff4dd971753962c9d9145f85b1738f5dda13ba99 SHA512 9f3761184950f2f13e85d8bc447709ab8be631dfd231b4f053f8147468db1bf71fb116ddba95e39f4afc4cf28c742e07d40c7a637f28004a60dc13935f9609f9
-EBUILD commons-logging-1.2-r1.ebuild 2212 BLAKE2B b91b91b4e26f1d9a5aea2a3743f979df0eb0f884ec00b5ac10087d0859828e6ca0b981fdcdcd520272d224b3f0b377eac8cb1da1566fd08671e3c9d6a6343153 SHA512 63621491db41bc2627c1a673c161218c4b999a3b925493f92e2442a053d9c6feffc5bf8a7c35f05d1a7c6f26504e0e87d723829d25496359c5bea71e4cd3d646
-EBUILD commons-logging-1.2-r2.ebuild 2303 BLAKE2B 3c11c135b650f00c703dfad89cb12648dcbe61bf251de7a7428bce266a51c980187cfbc902e4a7500b5d7c2b457c21d556bd547754ec5fc011a4eb5b7cd62830 SHA512 39b7fd0405164b07c062f300b7f0b71e29650b25d06873fb83171f6571dc63852238a47b71a1f1253fe7f3398556a09441f45220ae621dbbde694fe5daece285
+EBUILD commons-logging-1.2-r1.ebuild 2211 BLAKE2B b08909ddee2e5a33b14e08a414b4ead6e28a6cdcb1a0636c5c45e953dcf1508c89b767f117d524282e822fd0893b4ff379f66e87139555f39a42c786db1716b3 SHA512 f9cf0941c6b8637980734ef0c26fc043a443d496e91017c56bcddee9cfb65d3eb92c588e39737aa98505d4edd65f47b2cd4a7f4444c36847e2d71b0841f6770b
+EBUILD commons-logging-1.2-r2.ebuild 2316 BLAKE2B 9cdec18e702b826e1981a555e25921fcf76492dcde0d12bd5c40a7117786202f8faccd18981a85b0046fa83c39e6ce396f4890e47c7cd3920ca2a0952d6a41bd SHA512 ee663d8d3c443a19f5bbbcc004e68cd22d536acb566a6e77c9ee4111279802a4a2276b234e1bf20c08a231295b2fd7b66a8efe50aafe14924234e6b675590fc4
MISC metadata.xml 551 BLAKE2B c48c3681129ce8ab7a497385bc3bed8a16ca0f5f4557ebda30565db471b25fea1b6c48ad43a470cf27930a0b2dc3a282242600aee3f60eff66291e6d0c80491f SHA512 1ea71763a6890b1f01fb357a7427b99bcb4918eb87290997e61918808daea37dab371b7fd5b6fee114104b2ee4445e022c0f090a2a58017a3d8b755f8dfcd5bd
diff --git a/dev-java/commons-logging/commons-logging-1.2-r1.ebuild b/dev-java/commons-logging/commons-logging-1.2-r1.ebuild
index d31cbb5b606b..b0c5a76ff00c 100644
--- a/dev-java/commons-logging/commons-logging-1.2-r1.ebuild
+++ b/dev-java/commons-logging/commons-logging-1.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -15,7 +15,7 @@ LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="avalon-framework avalon-logkit log4j servletapi test"
-RESTRICT="!servletapi? ( test )"
+RESTRICT="!test? ( test ) !servletapi? ( test )"
CDEPEND="avalon-framework? ( dev-java/avalon-framework:4.2 )
avalon-logkit? ( dev-java/avalon-logkit:2.0 )
@@ -57,8 +57,8 @@ src_install() {
java-pkg_newjar target/${PN}-api-${PV}.jar ${PN}-api.jar
java-pkg_newjar target/${PN}-adapters-${PV}.jar ${PN}-adapters.jar
- dodoc RELEASE-NOTES.txt || die
- dohtml PROPOSAL.html || die
+ dodoc RELEASE-NOTES.txt
+ dohtml PROPOSAL.html
use doc && java-pkg_dojavadoc target/docs/
use source && java-pkg_dosrc src/main/java/org
}
diff --git a/dev-java/commons-logging/commons-logging-1.2-r2.ebuild b/dev-java/commons-logging/commons-logging-1.2-r2.ebuild
index 0f4bba416ed0..22f763911556 100644
--- a/dev-java/commons-logging/commons-logging-1.2-r2.ebuild
+++ b/dev-java/commons-logging/commons-logging-1.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -15,7 +15,7 @@ LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="avalon-framework avalon-logkit log4j servletapi test"
-RESTRICT="!servletapi? ( test )"
+RESTRICT="!test? ( test ) !servletapi? ( test )"
CDEPEND="
log4j? ( dev-java/log4j:0 )
diff --git a/dev-java/cortado/Manifest b/dev-java/cortado/Manifest
index 28bdffd40a53..8f61b8b63cc1 100644
--- a/dev-java/cortado/Manifest
+++ b/dev-java/cortado/Manifest
@@ -1,3 +1,3 @@
DIST cortado-0.6.0.tar.gz 233854 BLAKE2B 54ace339a6038b46bbf2d993eb911f1845f8717dcf4eeaae0fcd807488a0293bb6618fe72ffa5bc425dc9f7d47f5362ff55168191aab15dbed59547f7c1d72dd SHA512 56113259da05a73f4d4e7aca92d031fa934987ad3607a69b31666c9e452330a95728e7780c45d825ddeb9c0815ace479d7a55df0e68a50e63a76ddf5602c76da
-EBUILD cortado-0.6.0-r1.ebuild 760 BLAKE2B fe0c7962ee3a8e53738663efde1c97fe8d7ef6bc110ac6926fa28c86a142e0466f0f546c0df64182db6d76b2eb574c90f3fc91fd53872f43bc7c3ce08caf2d31 SHA512 22dff7958965edb3f60c0e52ceb71807e31ee3c82689411f4f0e7600a8c975e96eb42ff5ad3a4396edb922357ad441c0458a2bc1081a083b10f16ebc0e9852fe
+EBUILD cortado-0.6.0-r1.ebuild 734 BLAKE2B 07a8b8685ffa611ff2bd577457b8a42b09422a9f445ef4bae52edf920a1fa5a65f3af43cbdf76c673797c71c83792ec717507b6a2b4f08f220b4e91eac588df6 SHA512 f8c0690ecd8789fd2c4010abe713a1860e7db4651f4493c27d5ebe02308308dbebe57019d60c20041343a0bded91e3ee48f63573cb6ef1958c9a7743beca895d
MISC metadata.xml 1038 BLAKE2B 57d9c273358e312774313b2a136f5e42474da701de597389647cb4e8fa212267020d3d15ad5e2beb8e69eb1be75a621cbc58a40e66c85536cf6ecf27d7f38378 SHA512 312aed5403631ad536cc71d9557a494bca084d24b344a7dbafa01fb98f45eebcf4db725f5e50fb1ced363103bee3df36777bbd18f8608dd9042346e9087608ec
diff --git a/dev-java/cortado/cortado-0.6.0-r1.ebuild b/dev-java/cortado/cortado-0.6.0-r1.ebuild
index 350b3b47d896..fe8148871378 100644
--- a/dev-java/cortado/cortado-0.6.0-r1.ebuild
+++ b/dev-java/cortado/cortado-0.6.0-r1.ebuild
@@ -26,6 +26,5 @@ src_prepare() {
src_install() {
java-pkg_newjar "output/dist/applet/${PN}-ovt-stripped-${PV}.jar"
- dodoc ChangeLog HACKING NEWS README RELEASE TODO \
- || die "dodoc failed"
+ dodoc ChangeLog HACKING NEWS README RELEASE TODO
}
diff --git a/dev-java/dnsjava/Manifest b/dev-java/dnsjava/Manifest
index d14154474da0..93d812291355 100644
--- a/dev-java/dnsjava/Manifest
+++ b/dev-java/dnsjava/Manifest
@@ -2,7 +2,7 @@ AUX 2.1.6-no-network-tests.patch 1354 BLAKE2B 3990543ea76ae8c2a485b6444e75ceff4a
DIST dnsjava-2.1.6.tar.gz 1087908 BLAKE2B af9edda95d8cdd9c02b39c5a86646efc85cef576361d4ab765ce65d8b6e20621bcbdc9e32327f8ae1a3e2cbb83e60d61736ce9d71ae3bd091b0fca306727e158 SHA512 0d30504190aabbb176cc914834eb26a2f5522741c4473dbbf32f16e1d62fe39cf244a3ddd543b88d3a1e595afa9c6509e42d1418205677aa6523c6d11c49f497
DIST dnsjava-2.1.7.tar.gz 1078980 BLAKE2B 16fd027c6f46463d6b4322bcf88943a3f06186d853a7e5615b8829d93aee897dca489dec00d61af857d58df566905c559e1c8d9922f5592ef2146bc715dc9b0b SHA512 07b11b94833f4a6f5d9bd8e0265444f15704eeba6420b2fa2c4efef46823c2768e8e691d6b101bb6d1ed9ebda1e55dbf518f447d62eb686fdd583c281313afdd
DIST dnsjava-2.1.8.tar.gz 460532 BLAKE2B 761e99643710aca3aebc50972504284c388685dee12b3fc1fcbe6e4a8698762833dab725ff61395aee2b0292d0f71004eb2247c899c87d01dcc938e4283d31c1 SHA512 d38be6d52b275906b66468cd375ebd46c0d669de2fd06a50253631589a7dd6fbf4e92d4b20778dacd9f19cd489df013e4d42bc16c935581dcaa370ac9ce3c55b
-EBUILD dnsjava-2.1.6.ebuild 969 BLAKE2B af4539556594c58b087a0ac80b72ab06bd385a4964693458e9fa96d4e51e186a758b936d60c3bb79c7a6481f749f79a0a368742cab5cac111df63b6c989b6849 SHA512 e870857f8efd9d839c7ed23d3361b8b7106a309fddd1c25229249044f90e5d1258531788a9b64b33ea28c3405fc239d5273afed4c2cc636b5a91897f03edd43d
-EBUILD dnsjava-2.1.7.ebuild 947 BLAKE2B 2efeb06a288649571c3169350188d44e4017b267ac58ba4980408512152b1cee3f8722c3a3c9373695bb8933b6e52062776554a7564f69b92b45798c85740aad SHA512 c397ce0f0562fc2a9a6e7bded5976a1e670ebbb752e3f1f892a90bd5669d17732e1016b9ae1dde3c4e6430f1f283096c5951ab462494d65e1e8bf6c0de66267a
+EBUILD dnsjava-2.1.6.ebuild 962 BLAKE2B b3f8dc3e517a85315ffc3404ad6123fd60ed6e750474f75562e6a3e33ef9c993aea97407e6c0c6d839f1e2361c59cfca26e97c969479ada26247a9fac4ee8729 SHA512 84d11811efab0a1cc1a1427b9d8118c7ed62ecfcb22c597cb724367c88d8fd7a0c9b520a787aa9416a725a6aa5045f0e23801daba959c4e3ff40c178a12ad984
+EBUILD dnsjava-2.1.7.ebuild 940 BLAKE2B 5d11ec37e36d0f109c09c72623eed086469b11600e6007e4e41a5222fd96f0574cc9f64d002d56ed33052f5e864fbdebba5a5691de159d9ecfe13f1758c048d2 SHA512 f6b7ef4507569a06de4e8813fb57c8881895cebaea134b30802acc4e6daceba308c077c14dfa902a3a569080f96e2eba213f46089dca6786317d4614bb9c5e06
EBUILD dnsjava-2.1.8.ebuild 946 BLAKE2B 5d495bbdb2d6479cb3dc581708f1e164403a9aa72a7658aed803876dff462c37a2d065726d559bee02bb9b75a1defde04c9bc27a8b4b2c3600283f4d452fe4d4 SHA512 cb50f8513144de9bba8ac760b637edff739775c75b25de0a0daa1d94d4dd24c7286e17c3932577bf5e8ac14a2e2825d50057a035c69c333a41ec92848dfcfe42
MISC metadata.xml 765 BLAKE2B 106c05f7c8b1f594e668610ed2e244c395868461cb3cb9908c3956861388a5f37c62363b008c9c1e626b0b191914fe2fa0a03fa8d99dacc4bb7253f9a12b6a74 SHA512 800c2681a0c1fcdfa661d1c1ad996367f88f725e32dac8994b24b3ebd51dad3544c70ddfb009561f7987780cb4237809de3fd58bb642fdd8e1bcd20e239cfdda
diff --git a/dev-java/dnsjava/dnsjava-2.1.6.ebuild b/dev-java/dnsjava/dnsjava-2.1.6.ebuild
index b40db04e30e0..c45f80d04cab 100644
--- a/dev-java/dnsjava/dnsjava-2.1.6.ebuild
+++ b/dev-java/dnsjava/dnsjava-2.1.6.ebuild
@@ -39,7 +39,7 @@ java_prepare() {
src_install() {
java-pkg_newjar "${P}.jar"
- dodoc README USAGE || die
+ dodoc README USAGE
use doc && java-pkg_dojavadoc doc
use source && java-pkg_dosrc org/
}
diff --git a/dev-java/dnsjava/dnsjava-2.1.7.ebuild b/dev-java/dnsjava/dnsjava-2.1.7.ebuild
index b2e98f812f19..a7d0260b9eba 100644
--- a/dev-java/dnsjava/dnsjava-2.1.7.ebuild
+++ b/dev-java/dnsjava/dnsjava-2.1.7.ebuild
@@ -39,7 +39,7 @@ java_prepare() {
src_install() {
java-pkg_newjar "${P}.jar"
- dodoc README USAGE || die
+ dodoc README USAGE
use doc && java-pkg_dojavadoc doc
use source && java-pkg_dosrc org/
}
diff --git a/dev-java/dynalang/Manifest b/dev-java/dynalang/Manifest
index 06fe3daec6f6..4b66dd2d624e 100644
--- a/dev-java/dynalang/Manifest
+++ b/dev-java/dynalang/Manifest
@@ -1,4 +1,4 @@
AUX build.xml 6721 BLAKE2B 6e3c4e1710cc45640427ec99b1843a1a097b2abae17f90ae0ea0499bf68d1a38c71b0068d0d0dd7324445a1d97df7f55b4cf832815945478586fba1473f9c634 SHA512 e18fcef8b62ef09a55063afed6beeb484fe98e2d3fee904bb68eb776d6d11e8d5055b5b2160ef57576247ee2fcc7e7db059ac3e7c69360b0e27790ad1ffba40e
DIST dynalang-mop-0.4.tgz 227338 BLAKE2B 91b3316c1c96722d9cc08ecc3894b539626171f7476001ced9972eaec6e49375cc0b283f0fedc1e93624162bde4be85858bef504f5191b6051472f60bf443fb5 SHA512 b7501fbc44ae29e10cf3eb55002420d88d83226f790861f43f59aaddc0cd1bd5021fed207d831d5c3adb14ceab01dc17ff53cd31cb6a93c0fc00240b8e3e9797
-EBUILD dynalang-0.4-r1.ebuild 1377 BLAKE2B 352458538fc04d9cf4225e8f9d2974a64a16ecf2cb4df4dd893c0fff20737154f893b898f7ca1b5045f116692264800cd3f189b11feaa46e9c7813f46665c379 SHA512 d65bce327e3e95e7a210fc5779836942eaea635746cc3aa8b4eb53e600663c8347195b2f9faa3ae9b3e9bd3a5673f03a48b98d0791f726324750c1fd042f56df
+EBUILD dynalang-0.4-r1.ebuild 1401 BLAKE2B 8d242f18cf07e848dff7350e88a25e68f45b525d83c34ea1a4751f6a44f5e5871cf80c18115c22e97152e13bec90e2e87a5255fca5750643e8642d18202fc2ae SHA512 e7bd511c46cb57e9925673b8edf79c1dc28be8b76d2e35263bcc009d3a37a3d0bfebbdbc55028a9c576c8519994e12de47bf020b81cd5cb6ccfe15d2f1e0a3fa
MISC metadata.xml 314 BLAKE2B fae9e5f59b701a754caf714390148921e76c85a050bd6350ac13f855030b6cfbe7030d69b9a8add43437d976b8ff7aca1017610c78052d715e407d5b7513553a SHA512 6c6f4b185b8a3c8c677de4d759060151a07692c0629f7da13601dc082dd18e733e3b956fc34ad4f8d8092aeeecaa5cdefe8e51cbe0ab093e74ab9c11f7dcfa42
diff --git a/dev-java/dynalang/dynalang-0.4-r1.ebuild b/dev-java/dynalang/dynalang-0.4-r1.ebuild
index 2e6b4bd63b98..cb82aae1d8dd 100644
--- a/dev-java/dynalang/dynalang-0.4-r1.ebuild
+++ b/dev-java/dynalang/dynalang-0.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -19,6 +19,7 @@ SLOT="0"
KEYWORDS="amd64"
IUSE="test"
+RESTRICT="!test? ( test )"
RDEPEND=">=virtual/jre-1.6"
DEPEND=">=virtual/jdk-1.6
diff --git a/dev-java/fec/Manifest b/dev-java/fec/Manifest
index f1bbec4b3383..b3df14a60be4 100644
--- a/dev-java/fec/Manifest
+++ b/dev-java/fec/Manifest
@@ -3,5 +3,5 @@ AUX fec-1.0.4-libfec8path.patch 1087 BLAKE2B 085c732b1ebf4bd8a6e6d7ddd7f5995c291
AUX fec-1.0.4-remove-concurrent-util-imports.patch 3142 BLAKE2B 028451e332afc9ec5d5afdacc9bc75364708dc5700d8691a428fde2e7c24595dba5d1e39901555095aa4577180e884000c21bf2f55a375616de59b82244a3a14 SHA512 195d2d5ec252d9e8c83762de318393b50d08fd50c900a13489e082e6d08bcc6f85b6425dd350fe1d24e2aab5ed8753ce25dc87f35aa8754721cdf5949ad49aa6
AUX fec-1.0.4-soname.patch 786 BLAKE2B 0037363c6a8a8506f1981980296708cc202815ecb48b0357a71ff2f7a1cb9a6a438974d35b548f10688dffa6cef736f1c24b56ef27a3b6767b63c56b4698d088 SHA512 d75e6198f2f7193fbb65b686118f597c289576726d77ce3d65e122b4d6ca1f790fb8530e42e3e174c97a4b45083f95407478499f11b457d813d06e85b5d21c1d
DIST fec-1.0.4.tar.gz 449406 BLAKE2B 132bb87ff0da35b9a1830d014c46fb82209b344d159b88c6dbf36c706de668cdb2dfc10894690009e9a47f461100beaf9cf25ad1c75a3b18194e5499457bcb6b SHA512 0244de5e44ab108e921c6ca4cf341ce7b3ba807a76d24b768cfe3de71ffd525c9ebf389f9981e7eaa83fec301a65ba60ef4f51c5b3befa6c7af42b793d430343
-EBUILD fec-1.0.4-r2.ebuild 1512 BLAKE2B 29fecbf8036b2eb60a998547b17172a814ce73962229ba050350fe8784045936f226eca3ea6c72722013e0419d11b7bba1430d91fecfb6819b7a7f8fe9e7a1a5 SHA512 ca83c503d157a694dfc338a7027dab4a3ef2415ca19f464e9a877c4ca5c938145d140bff18325f3cfc8a56935094120a802e1734545299f4eec05400423e1a01
+EBUILD fec-1.0.4-r2.ebuild 1498 BLAKE2B b1d62acc07c2ca5eec3a397c871f22435238e53823a45718fd2bb0bc85403b1916944a0eac177c78207ccbd0286fa9df05d8641609ea40bbdab37d30c944941a SHA512 9248440a109bfa8245da3c114e42186fe625cee6da2d0122edf12db626609d9026ebb0dc543ab5cd5fcfa15f3a26b333f79c1af70dac67c8c1ca98bf45ccf9aa
MISC metadata.xml 434 BLAKE2B 5d425c2f0f2e1a03b58db97d2a16fe676852acee35af62283445b4046935fe6ade6c2bfabbfeb8fe155ab0eb4bc175bbc45a7a4a2f9af75e56a91177d2acd6a5 SHA512 bdbd0a880e9267ffee492085dd0d6a260e14b9981087cd24cfd2572079ac77b6a629556ca56e08155439f0a37a3bb97e16a2687ebe6ad3aa25340023f7c628f1
diff --git a/dev-java/fec/fec-1.0.4-r2.ebuild b/dev-java/fec/fec-1.0.4-r2.ebuild
index e1b2f635b328..b925d176c372 100644
--- a/dev-java/fec/fec-1.0.4-r2.ebuild
+++ b/dev-java/fec/fec-1.0.4-r2.ebuild
@@ -57,7 +57,7 @@ src_compile() {
cd "${S}"/src/csrc || die
append-flags -fPIC
- emake CC=$(tc-getCC) CFLAGS="${CFLAGS} $(java-pkg_get-jni-cflags)" || die
+ emake CC=$(tc-getCC) CFLAGS="${CFLAGS} $(java-pkg_get-jni-cflags)"
einfo "Sucessfully compiled C files!"
}
@@ -65,5 +65,5 @@ src_install() {
java-pkg_newjar "lib/onion-${PN}.jar" "${PN}.jar"
use doc && java-pkg_dojavadoc javadoc
use source && java-pkg_dosrc src/com
- dolib.so src/csrc/libfec{8,16}.so || die
+ dolib.so src/csrc/libfec{8,16}.so
}
diff --git a/dev-java/fontbox/Manifest b/dev-java/fontbox/Manifest
index 3e07f700f48d..b2eb051695e6 100644
--- a/dev-java/fontbox/Manifest
+++ b/dev-java/fontbox/Manifest
@@ -2,5 +2,5 @@ AUX fontbox-1.7.1-build.xml 10618 BLAKE2B 6fe7b6a3b274ee3a419675c56e86a865d1e05c
DIST fontbox-1.7.1.zip 9167805 BLAKE2B f9e02d1540eaf7e4bb748906e56887494d81eecc88685fa9d758cb50712a530528573f4a7e5f816b4ff57d664a416b35444517d840c9b37239ec1e2b5a62b5a1 SHA512 8b2af3d8f431626c106e4f6e9e1d59d14abcd58cfdc9553f20c5057eef9f9cfbd0287e14e58e4d34472ad81198eb3f4d0a2fd6e88bd1fa5cbcf01e4befbf77d0
DIST pdfbox-1.8.11-src.zip 11026359 BLAKE2B b3eb1add38e9bd0e5a1fcb116263fdbc372d6adb77132aeb0647a6c5d2c2b735345220f0a5c22caa97d04f78ad6517df388327aaa625677bd8c99d2051329a9c SHA512 05c8e5075379ed5ebb09555b39434dd936fce9dd24445871d24ea7f0f6afa49e74242bf0c9eba2d1a847b505143789b687dd039ca51ce76851132f2f18d434d1
EBUILD fontbox-1.7.1-r1.ebuild 971 BLAKE2B 5d0a36f8cca1a5793386111563cf793a57c665f903c467c8a244dcfbe6986b59072661fbee1b363d1d0aaff1dc1f921d016c0723a3237a722ae9b05227c1fc0b SHA512 44d237b4a9e505dc45ff2bd0afbd4cbe8452ffc66e7b6155dfe3ecc00dedd1467e8a5870d429ad494cd48d8437461dcedeaa5c68f2fb02f613363c5134abc2d5
-EBUILD fontbox-1.8.11.ebuild 1146 BLAKE2B c448e815ad5f90dd1b689948a994e7c37e5d48c2b292c0bb40fffcfc8046591ddb4693f4b6c07abdb8f817f5cb6ec42c4271c2d63e240a6e48810ce44e2811ba SHA512 ee11087e709c98760b273d3d71848b233ed7906d8d1bbc81d55ff5b2418bfa71d6033e98e83dea8823ffcc7034570f3129101ffbacca8ca347d11e2a13026956
+EBUILD fontbox-1.8.11.ebuild 1170 BLAKE2B a483121fdab73f9a92f4e9057114b92a90990f26cb3fbcfb3d28f8424af3b01a836b7eb7a8a2af11ba99dfa5db3e027f21761372d55cb00606b6bf626c79c2ea SHA512 dc7940fd45a410e30a147a7d4669aeabbbdcbbbf7415ffe59cce7c9130263980c375decde18aeab7e1956e78b2826ce6c4866393577ff7686b1b32c277dbd607
MISC metadata.xml 586 BLAKE2B dced74e0b5e677040e5bc60d35050eb2acd6e0c9f88f02ba5fe41dfcf6d90a1dacd70e17f85d1d091b6e4a6135cf31c54629107ae0fe33ff863644f849ceb96d SHA512 d7f91851ceae4b6d8a9315e201f5e5ba09a92c29ae26f4abc8dd4faeec30b1de64b1528f89e09cb84372197de93576a468a6e5897ca55a62c8c39c53e4943809
diff --git a/dev-java/fontbox/fontbox-1.8.11.ebuild b/dev-java/fontbox/fontbox-1.8.11.ebuild
index 182cd4100ed7..8177f7c9f41d 100644
--- a/dev-java/fontbox/fontbox-1.8.11.ebuild
+++ b/dev-java/fontbox/fontbox-1.8.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -17,6 +17,7 @@ LICENSE="Apache-2.0"
SLOT="1.8"
KEYWORDS="amd64 ~arm64 ppc64 x86"
IUSE="test"
+RESTRICT="!test? ( test )"
CDEPEND=">=dev-java/commons-logging-1.1.1:0"
diff --git a/dev-java/freehep-graphics2d/Manifest b/dev-java/freehep-graphics2d/Manifest
index c1754f33a302..448a69021801 100644
--- a/dev-java/freehep-graphics2d/Manifest
+++ b/dev-java/freehep-graphics2d/Manifest
@@ -1,4 +1,4 @@
DIST freehep-chartable-converter-plugin-2.2.1.tar.gz 18159 BLAKE2B 3b0c166c00fb2fa86fbb13adf8855ac21907d7397bb62997457e8528c7fd2d88657f7bdd4c820e4561e4303a36730b3826806e0cbc76506d49f27d0a4d528996 SHA512 4caac8b83b9efdee59e2a801bb001fdf7bab144bb5734bdb89ef3e1163bc9ffd05b2c8c59d611665573c432045a854fba28eb4d24260baea5286b34ae298add1
DIST freehep-vectorgraphics-2.4.tar.gz 4118379 BLAKE2B c8a5840ebab43398a6f87f97855a38f843b0e05267f5446b5f22a0c0124c98717c00801fe93ef3b541b2c53d07176ab1319a27ad26ed177b6dded11e3fa2e7bb SHA512 b5cf083cc6951e7c4b438d5e648f61ca20b23e02163a8cfc4669beaaec2fa9e33338b0ba6875bfe4a3864ac48f9774acfedc2a3b2f59a7488ef99a4817e39382
-EBUILD freehep-graphics2d-2.4.ebuild 2117 BLAKE2B 6809cc9f158934341aca65775326f5f4a0fd2bd24ffd6ccb107abceba32eb82589aef3a2110a9741ec54fe6beb46ba58a7b4c8a7621f4a393f57a9043ba4f808 SHA512 ffb2db76c69531324a98993d79581b925e3b635072d24aee77d35ccccdaba730d0dee1de6fe9c50cada3a74bd96c32625205b6da0d0591f9f4bd3e5cebc1b3c1
+EBUILD freehep-graphics2d-2.4.ebuild 2141 BLAKE2B 214249b8dc2096a95d1611faff0ed8a4cbfd7142c2eb01e104e06b1a1bc8e614e60a5ce980b326858082c1ffb50f6543d13683e040abf0a2a48499c62f498921 SHA512 aa2621a52d1203044b0872eb3b55afbde6489044e57ef460d1a1c501e9e30bb9976c12b63afccac949188eda216010e707eef140d5fa5b7c7c1e6bcde0a313e7
MISC metadata.xml 331 BLAKE2B b05dee2e48a0495dea84595a536797a1a53dbd82bca89b838b334060e5142ef729f4a3be30e413eaf24a164d3f1998f3197b18bc92eb0e5fe4e1195453869694 SHA512 f7bb0530f563d9ba4e8062f41b32340ac316e267adfffc964156bc4e87a469a7bde0a1af4553240c9dc167d405a3e892ebe501043ca5399e03377164eb71bfb5
diff --git a/dev-java/freehep-graphics2d/freehep-graphics2d-2.4.ebuild b/dev-java/freehep-graphics2d/freehep-graphics2d-2.4.ebuild
index 97a88563854a..9b6f57c388c4 100644
--- a/dev-java/freehep-graphics2d/freehep-graphics2d-2.4.ebuild
+++ b/dev-java/freehep-graphics2d/freehep-graphics2d-2.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -21,6 +21,7 @@ LICENSE="Apache-2.0 LGPL-2.1"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="test"
+RESTRICT="!test? ( test )"
CDEPEND="~dev-java/freehep-graphicsbase-${PV}:${SLOT}"
diff --git a/dev-java/freehep-graphicsbase/Manifest b/dev-java/freehep-graphicsbase/Manifest
index e7f5e5b3f16d..876761dea80a 100644
--- a/dev-java/freehep-graphicsbase/Manifest
+++ b/dev-java/freehep-graphicsbase/Manifest
@@ -1,3 +1,3 @@
DIST freehep-vectorgraphics-2.4.tar.gz 4118379 BLAKE2B c8a5840ebab43398a6f87f97855a38f843b0e05267f5446b5f22a0c0124c98717c00801fe93ef3b541b2c53d07176ab1319a27ad26ed177b6dded11e3fa2e7bb SHA512 b5cf083cc6951e7c4b438d5e648f61ca20b23e02163a8cfc4669beaaec2fa9e33338b0ba6875bfe4a3864ac48f9774acfedc2a3b2f59a7488ef99a4817e39382
-EBUILD freehep-graphicsbase-2.4.ebuild 1208 BLAKE2B b9d6f370046db9792b84496cd930ba0cb14b32205bdcc7731043302696dd0ede7edae631e2caba997578645cf32b121844c7288471e6f41a34beacf08f7b53fb SHA512 30cad1df7b1ac2f00395c4fb3161992ae984c26ae7f2c2e596ffa152365169e08e169ee25bce0a03f91344b173f68bd63f9eaaa6423b1587ed127dfe113878b6
+EBUILD freehep-graphicsbase-2.4.ebuild 1232 BLAKE2B 96548095f99407031b5b33578598020279f28549ee2521d2359e935f7f0f53665deb26fb6d489a340a9de670add1468ea7b68819a848df8d5dccced2db775d34 SHA512 91fc0324bcd02ee36e446bb5ec081eee54da58743ddab0fd086e22a92bde956cfe276725bf51e532e5927a5fd7295587d420b1d55da8ed7d78a5b28b1767f81e
MISC metadata.xml 331 BLAKE2B b05dee2e48a0495dea84595a536797a1a53dbd82bca89b838b334060e5142ef729f4a3be30e413eaf24a164d3f1998f3197b18bc92eb0e5fe4e1195453869694 SHA512 f7bb0530f563d9ba4e8062f41b32340ac316e267adfffc964156bc4e87a469a7bde0a1af4553240c9dc167d405a3e892ebe501043ca5399e03377164eb71bfb5
diff --git a/dev-java/freehep-graphicsbase/freehep-graphicsbase-2.4.ebuild b/dev-java/freehep-graphicsbase/freehep-graphicsbase-2.4.ebuild
index 75736b878100..75ea8d477b41 100644
--- a/dev-java/freehep-graphicsbase/freehep-graphicsbase-2.4.ebuild
+++ b/dev-java/freehep-graphicsbase/freehep-graphicsbase-2.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -16,6 +16,7 @@ LICENSE="Apache-2.0 LGPL-2.1"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="test"
+RESTRICT="!test? ( test )"
CDEPEND="dev-java/freehep-io:0
dev-java/junit:4"
diff --git a/dev-java/freehep-graphicsio-emf/Manifest b/dev-java/freehep-graphicsio-emf/Manifest
index 11993fbcf533..76a9c97d1d54 100644
--- a/dev-java/freehep-graphicsio-emf/Manifest
+++ b/dev-java/freehep-graphicsio-emf/Manifest
@@ -1,4 +1,4 @@
AUX github-30.patch 1643 BLAKE2B dbeeaf08b2a3342c8711d4be892084616e6beece15700633f21f2d56696d2f3408a21afdd18709a2ca86d08f060ba15370af694453841ae17dad666a8a4e9f60 SHA512 63a89ce9bfe23a0c0110e69d34fc76faf2f18c2f2361044fbe426c36f10f596279c958734398efcadc84890a2ecd08dbaf23bdc3c16aa2208fa8b9aab37b4e43
DIST freehep-vectorgraphics-2.4.tar.gz 4118379 BLAKE2B c8a5840ebab43398a6f87f97855a38f843b0e05267f5446b5f22a0c0124c98717c00801fe93ef3b541b2c53d07176ab1319a27ad26ed177b6dded11e3fa2e7bb SHA512 b5cf083cc6951e7c4b438d5e648f61ca20b23e02163a8cfc4669beaaec2fa9e33338b0ba6875bfe4a3864ac48f9774acfedc2a3b2f59a7488ef99a4817e39382
-EBUILD freehep-graphicsio-emf-2.4.ebuild 1615 BLAKE2B 83b0378ad394e20aa8eadf5ec7d995cc5f7b06075c53fee8451cd38613bfa96e2d7103f5409df18ea579c9ad096adec823b26d6c66cd72479747c040c199abc3 SHA512 dd0c9cd16357e1c244d1417f63c725a3fa5e3e120fa50c68e4106920a6c348a5c36217af3399c688fcce843e12c92582362d632f3ec644a9d5ea5b6c5d5aa915
+EBUILD freehep-graphicsio-emf-2.4.ebuild 1639 BLAKE2B e795fb8d7cfbcf5bd198b6dcef8ef8bd5cfefd30c176d3da8de850937e401c97b7d2840a2f58bc3403940129b2dc64cd6ceba5485fbad8f59f0ceaf5e6ae043c SHA512 2812e7c2def2ecc8589995894e8f0aa435370e9e8b9e8f811f65a1067c9ea80ca88a8983e3387df18bcc71923280568337acd4e6b6650f6eb0261e1adc30be9a
MISC metadata.xml 331 BLAKE2B b05dee2e48a0495dea84595a536797a1a53dbd82bca89b838b334060e5142ef729f4a3be30e413eaf24a164d3f1998f3197b18bc92eb0e5fe4e1195453869694 SHA512 f7bb0530f563d9ba4e8062f41b32340ac316e267adfffc964156bc4e87a469a7bde0a1af4553240c9dc167d405a3e892ebe501043ca5399e03377164eb71bfb5
diff --git a/dev-java/freehep-graphicsio-emf/freehep-graphicsio-emf-2.4.ebuild b/dev-java/freehep-graphicsio-emf/freehep-graphicsio-emf-2.4.ebuild
index 597c3c26fadd..e10420f55980 100644
--- a/dev-java/freehep-graphicsio-emf/freehep-graphicsio-emf-2.4.ebuild
+++ b/dev-java/freehep-graphicsio-emf/freehep-graphicsio-emf-2.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -16,6 +16,7 @@ LICENSE="Apache-2.0 LGPL-2.1"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="test"
+RESTRICT="!test? ( test )"
CDEPEND="~dev-java/freehep-graphics2d-${PV}:${SLOT}
~dev-java/freehep-graphicsbase-${PV}:${SLOT}
diff --git a/dev-java/freehep-graphicsio-svg/Manifest b/dev-java/freehep-graphicsio-svg/Manifest
index 24e4c78750ea..8bbae821426b 100644
--- a/dev-java/freehep-graphicsio-svg/Manifest
+++ b/dev-java/freehep-graphicsio-svg/Manifest
@@ -1,3 +1,3 @@
DIST freehep-vectorgraphics-2.4.tar.gz 4118379 BLAKE2B c8a5840ebab43398a6f87f97855a38f843b0e05267f5446b5f22a0c0124c98717c00801fe93ef3b541b2c53d07176ab1319a27ad26ed177b6dded11e3fa2e7bb SHA512 b5cf083cc6951e7c4b438d5e648f61ca20b23e02163a8cfc4669beaaec2fa9e33338b0ba6875bfe4a3864ac48f9774acfedc2a3b2f59a7488ef99a4817e39382
-EBUILD freehep-graphicsio-svg-2.4.ebuild 1369 BLAKE2B 8afb32aef66918013b0bf312434e06e23244c97e949adef9c1a3330a2c60f85eb18bc92f457ef59b0fb50edd2c565834f002b5d78b19f2a42c8fcb5106d98869 SHA512 f5fb3c5e001380d1b4da636fd122d1f628f040f71fc3ecc514b7a6f69311b2619403232db351fd9a68cf5786476273a951ad77d72377abfc9f6565da966b096a
+EBUILD freehep-graphicsio-svg-2.4.ebuild 1393 BLAKE2B 1bbf4d080dcbf88d5d6289e55d8caf278aa68a8ba5be6b69a156bcc4331f5f7412efe64d0e3f8f9a36bf25626ec1efe69694c885b0e3d93c15f195776232a6d5 SHA512 2776fde707a23dce7f32ffdbb5cc2c5a615dcda4faff24c2a0192ae60e5cb6cb341c3485d2ad72360ff1bb91c58724e616f0d5eb993e4e877dbf6334c24d3098
MISC metadata.xml 331 BLAKE2B b05dee2e48a0495dea84595a536797a1a53dbd82bca89b838b334060e5142ef729f4a3be30e413eaf24a164d3f1998f3197b18bc92eb0e5fe4e1195453869694 SHA512 f7bb0530f563d9ba4e8062f41b32340ac316e267adfffc964156bc4e87a469a7bde0a1af4553240c9dc167d405a3e892ebe501043ca5399e03377164eb71bfb5
diff --git a/dev-java/freehep-graphicsio-svg/freehep-graphicsio-svg-2.4.ebuild b/dev-java/freehep-graphicsio-svg/freehep-graphicsio-svg-2.4.ebuild
index 3524b4c57c9e..290ad16874de 100644
--- a/dev-java/freehep-graphicsio-svg/freehep-graphicsio-svg-2.4.ebuild
+++ b/dev-java/freehep-graphicsio-svg/freehep-graphicsio-svg-2.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -16,6 +16,7 @@ LICENSE="Apache-2.0 LGPL-2.1"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="test"
+RESTRICT="!test? ( test )"
CDEPEND="~dev-java/freehep-graphics2d-${PV}:${SLOT}
~dev-java/freehep-graphicsbase-${PV}:${SLOT}
diff --git a/dev-java/freehep-graphicsio/Manifest b/dev-java/freehep-graphicsio/Manifest
index 06e007ad26e5..3557c2f3db90 100644
--- a/dev-java/freehep-graphicsio/Manifest
+++ b/dev-java/freehep-graphicsio/Manifest
@@ -1,3 +1,3 @@
DIST freehep-vectorgraphics-2.4.tar.gz 4118379 BLAKE2B c8a5840ebab43398a6f87f97855a38f843b0e05267f5446b5f22a0c0124c98717c00801fe93ef3b541b2c53d07176ab1319a27ad26ed177b6dded11e3fa2e7bb SHA512 b5cf083cc6951e7c4b438d5e648f61ca20b23e02163a8cfc4669beaaec2fa9e33338b0ba6875bfe4a3864ac48f9774acfedc2a3b2f59a7488ef99a4817e39382
-EBUILD freehep-graphicsio-2.4.ebuild 1316 BLAKE2B 0db87b991c786c4c85881e93930e8b173c6a022eb23178c3e9374afce6addd109c22c4f4bf93845053e9a714b56ff169bf1a3ecbc89f8906d382f066dbaceb33 SHA512 633ec6e6dfa0821b414bad3b9ecf2604302a725c3719c9ac1b78fbf40d078a607c9ce9b0cd23ca07b35020efe67a739a36632ed5c4d4a8af0e425e7b3cc18f18
+EBUILD freehep-graphicsio-2.4.ebuild 1340 BLAKE2B 6858ef4757d0748dd8190f7eb4e984dd221d9895ee2dbfc0b1aac2b2c2c1b2e296c93a8b44103f7b54ea9240c0c92624d77d9b7b834d183d9f91fc45f3c19ab6 SHA512 dac3e5f955700eed2ce0207f1d83d740767cff56d21dd6a70d99f119fa832fb594e5322141ebf61f9cd98356ccf31df0f6bf103c8951a1907ed043a0d333f153
MISC metadata.xml 331 BLAKE2B b05dee2e48a0495dea84595a536797a1a53dbd82bca89b838b334060e5142ef729f4a3be30e413eaf24a164d3f1998f3197b18bc92eb0e5fe4e1195453869694 SHA512 f7bb0530f563d9ba4e8062f41b32340ac316e267adfffc964156bc4e87a469a7bde0a1af4553240c9dc167d405a3e892ebe501043ca5399e03377164eb71bfb5
diff --git a/dev-java/freehep-graphicsio/freehep-graphicsio-2.4.ebuild b/dev-java/freehep-graphicsio/freehep-graphicsio-2.4.ebuild
index 15b5b40186ca..9e6123138882 100644
--- a/dev-java/freehep-graphicsio/freehep-graphicsio-2.4.ebuild
+++ b/dev-java/freehep-graphicsio/freehep-graphicsio-2.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -16,6 +16,7 @@ LICENSE="Apache-2.0 LGPL-2.1"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="test"
+RESTRICT="!test? ( test )"
CDEPEND="~dev-java/freehep-graphics2d-${PV}:${SLOT}
~dev-java/freehep-graphicsbase-${PV}:${SLOT}
diff --git a/dev-java/freehep-io/Manifest b/dev-java/freehep-io/Manifest
index 32a84acca697..dfa60fc384c3 100644
--- a/dev-java/freehep-io/Manifest
+++ b/dev-java/freehep-io/Manifest
@@ -1,3 +1,3 @@
DIST freehep-io-2.2.2.tar.gz 76935 BLAKE2B 11468effa883c44f4376bac7282881942209cd5769545083bd761489f31eceec96c909d452f2a056172c8fee65917895acb34c18583d771a258883e4e12c3906 SHA512 1cc7cab3d9648b119aa8c637c84cd985adc0f9dd2cdd153021500831325d719ef5fa41d8964ccbeed3af95b87e09c4886597c0ede1370a209f6807932636b0ee
-EBUILD freehep-io-2.2.2.ebuild 912 BLAKE2B b0af793ed7bcb34527b73c1dd83abc831de9cf17301de21c5f2620b14b891855fb297d4de567bd4e3779f3c2eb028c92ca839c25ecdf4a9be9eaeb554ef059bc SHA512 7ef173a74fadaec2be6d235a01be2da8a5d2f55419ab5f31db04d1cdf1af11a20abd575fb2daaaa6b919fac7e48c0ebf08b0bcea1c350f4243a6db281fac125d
+EBUILD freehep-io-2.2.2.ebuild 936 BLAKE2B cf9191988fe948d49462eaa97f18f52fd86ee3c241216230a37d30ac1da1cba2c70135f0a792ab40666725470c5028177d2b4aab1cd2c3d6c53ec9dd70a3bd9e SHA512 720219b1e3fce51361ec3cc4cc99206463abc77931d02c9320b41ffa073e253552f4777bbdfa92ec9595877f21d1f5a411aba6a9f366619384b052529f8331f7
MISC metadata.xml 319 BLAKE2B ad988afc5f8c9c81de7629530afb00356007d90ecd2aea514a89db270489de30170b11d3aeecc01bde5950759b4a8b62fd459e91102e317fc22395769be71bfe SHA512 4da3787100462ce6feff5ecf42ed8cf70a3c5b5c3ed45d9c9afb88b341c110d230d8b89d911a17eb9d632dcac8eeae44c93468cc518c2ad1b8c972e51ecea5a0
diff --git a/dev-java/freehep-io/freehep-io-2.2.2.ebuild b/dev-java/freehep-io/freehep-io-2.2.2.ebuild
index 1343d8707ff8..12bf7791effb 100644
--- a/dev-java/freehep-io/freehep-io-2.2.2.ebuild
+++ b/dev-java/freehep-io/freehep-io-2.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -14,6 +14,7 @@ LICENSE="Apache-2.0 LGPL-2.1"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="test"
+RESTRICT="!test? ( test )"
DEPEND=">=virtual/jdk-1.7
test? ( dev-java/junit:4 )"
diff --git a/dev-java/fscript/Manifest b/dev-java/fscript/Manifest
index 717f1eeba126..7cb4ac2d761c 100644
--- a/dev-java/fscript/Manifest
+++ b/dev-java/fscript/Manifest
@@ -1,3 +1,3 @@
DIST fscript-1.17.tgz 117300 BLAKE2B ffbf993164d822fd8aaa25025c773d98f79127df8cc800d78475be5686a2785e962447f817cd1b705c03350a83b48c5e669b5faaa62649a1b2ead7cd2d4e9288 SHA512 9f4280ab1131f7ccdf2564fdb9bf1b6e91b593b5ef2934203a68aae87c3d89adfd73e82d0409d6cddd8685ee7bddb69dd67532c6f13a046381b12faf97d47e50
-EBUILD fscript-1.17-r1.ebuild 821 BLAKE2B 0e34db18999ad7db5a2c8629b041cf42b6b5f789902471450392e9408a4b751734bbdf1948b199fd5364c57c2fb1ed631df9d93453f28d035fa2c51b2526b6ef SHA512 7b585a2e7ded3b88cfc42c997160f9bee6e435a5b4c3248e5a7f8021523be5db202bea66a0451ccf8dbaf17a2649d5155a244d3d1ff39d32c167f0a044e68790
+EBUILD fscript-1.17-r1.ebuild 814 BLAKE2B 05694ffe8fa35e8a529736fd8ded3b07c2ed0171d120515972aefa460862f970e194f48cb0e6c6b9052e91f59c9db1f435c51214523e943f2dfafe3c0c76fcc7 SHA512 bee7a4ad3cf15d136096fab44c2b935bee896daed5f02a401c40f32e7a9ccebf4f0f62be5fff9efef803987f62285406fac4e1829b7d81c68b33233bcf23c58e
MISC metadata.xml 313 BLAKE2B 431a725f648a5ad1c888b84ace78b86e6a78404e57fe3d86662b7b44fe20fab91f5ba8a2aaaf3ef7e868b114ca9a0673ee282d879268bd16dd7c8c24196a27e1 SHA512 3d5ab8833eb9f0fddbe88d26cec561da98211b3db51ad3566b15470b0cc1829db2193afdc8a89c358d4ac2ba2441ec0434c439cfe98b3686bf8dd5d3326004eb
diff --git a/dev-java/fscript/fscript-1.17-r1.ebuild b/dev-java/fscript/fscript-1.17-r1.ebuild
index ec3c1c39692d..9d5ac52bc08a 100644
--- a/dev-java/fscript/fscript-1.17-r1.ebuild
+++ b/dev-java/fscript/fscript-1.17-r1.ebuild
@@ -32,7 +32,7 @@ src_test() {
src_install() {
java-pkg_dojar *.jar
- dodoc CREDITS README VERSION || die
+ dodoc CREDITS README VERSION
# docs/* contains not only javadoc:
use doc && java-pkg_dohtml -r docs/*
use examples && java-pkg_doexamples examples/
diff --git a/dev-java/gnu-crypto/Manifest b/dev-java/gnu-crypto/Manifest
index 9854fa901f07..48e3ee8d57c6 100644
--- a/dev-java/gnu-crypto/Manifest
+++ b/dev-java/gnu-crypto/Manifest
@@ -1,5 +1,4 @@
AUX gnu-crypto-2.0.1-jdk15.patch 1551 BLAKE2B 9111fdc0ca8eff845c61a298b92fc1abc39c88caf0cbd04e2adb4ca50aa025a21c3f2694854df54c250505bab580cf40a40db9b67ab0ec881d65aa3baea3ca36 SHA512 f30f33e29bf400eb8bdd465ffd649fd2aec03ab6d3a315c5da2a8b6375524f1cc20f6ec3f813a9940fbdecf4364c8985bed946ada633d73bda9508c0dc198923
DIST gnu-crypto-2.0.1.tar.bz2 3895714 BLAKE2B 4838f7aa58cbd34d97afb7f503a29b7393ae3085f1b83c8ae65110f20ff7143928351f0aaf2a61a2abb363f764dc67dbd12955fbd0f86dd685dafda550e0e7f1 SHA512 c14aa73fb23663559195e8fc7f85a220b25078fa8ab4e7cf43b84febe96599d990ccf52fcf1f6f66f2b547d9b644bbc99b3d44dc4a777dcb72530e58c8509015
-EBUILD gnu-crypto-2.0.1-r2.ebuild 1134 BLAKE2B 9381cf170ffe744c24f29a9098683d4da17071b5117efa95ea4840ac700e71751cc58d0344dec776adbe1b992c1bb2d49b37b8c66af7b05243cc2d3c37cc21e9 SHA512 34ab8c7a250c6b5e3c18338f53bd0e3ce6cac95fa659b174bf69c751fb764dbff883f55a270d37346f93689763e9c6f4e0e8d85e0e8c6fd526caf5cc5746ae09
EBUILD gnu-crypto-2.0.1-r3.ebuild 1238 BLAKE2B 301eb79891ff1580da7fdafa88fc44e743a5df88e250d86606dcc02d647db5910bca22511c5875625b1a79bee5ea81b8c33cafc85b66adde0044b26024f54c25 SHA512 01b474db07874cd33fda2671c147c965f445e08c5c51b2ccd34377f34c639bf06fde2875762e1c4166d62de0f450bfac20c56e75d9793bc35b5f6b7bfccd2828
MISC metadata.xml 535 BLAKE2B 2271d87cef0c6759b2e79d1f22025c8f5899990f5689f9e4343c45e1c039a22a7e242ca0adb95950899e222671dda176c1d5248b8f3d2a9134a58b481b7a5bb2 SHA512 113c98ec48fed10332c9677b90df1803bbcaae3311e5f71be6c681f89bb449618f66b11736bc76bfea5d21828671d30879fe56c49278e9f75b137c62ccb5eb22
diff --git a/dev-java/gnu-crypto/gnu-crypto-2.0.1-r2.ebuild b/dev-java/gnu-crypto/gnu-crypto-2.0.1-r2.ebuild
deleted file mode 100644
index a193aa43cf2d..000000000000
--- a/dev-java/gnu-crypto/gnu-crypto-2.0.1-r2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 eutils
-
-DESCRIPTION="GNU Crypto cryptographic primitives for Java"
-HOMEPAGE="https://www.gnu.org/software/gnu-crypto/"
-SRC_URI="ftp://ftp.gnupg.org/GnuPG/gnu-crypto/gnu-crypto-2.0.1.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.3"
-RDEPEND=">=virtual/jre-1.3"
-
-RESTRICT="test"
-
-src_prepare() {
- epatch "${FILESDIR}/${P}-jdk15.patch"
-}
-
-src_configure() {
- # jikes support disabled, doesnt work: #86655
- econf JAVAC="javac" JAVACFLAGS="$(java-pkg_javac-args)" --with-jce=yes --with-sasl=yes
-}
-
-src_compile() {
- emake -j1
- if use doc ; then
- emake -j1 javadoc
- fi
-}
-
-src_install() {
- einstall
- rm "${ED}"/usr/share/*.jar
-
- java-pkg_dojar source/gnu-crypto.jar
- java-pkg_dojar jce/javax-crypto.jar
- java-pkg_dojar security/javax-security.jar
-
- use doc && java-pkg_dojavadoc api
- use source && java-pkg_dosrc source/* jce/* security/*
-
- dodoc AUTHORS ChangeLog NEWS README THANKS
-}
diff --git a/dev-java/helpgui/Manifest b/dev-java/helpgui/Manifest
index 9eb604162bf9..6d372a914bb0 100644
--- a/dev-java/helpgui/Manifest
+++ b/dev-java/helpgui/Manifest
@@ -1,3 +1,3 @@
DIST helpgui-1.1-src.jar 168356 BLAKE2B 4f14e4b7f7ffa91f80913dfaf5c395ac6f49b847f76a5cd75932ba07c2932aefc6964b907dddb2fcac6e0c888feb4c47dffac8b866922a0820ccafe23863ac3f SHA512 feb76605c841210cd9bfa140d22985a090e72712fad08e23963fee3f6e28cb6c198583bde8eae5999e80ed5e351ed8aa30dc5cd7318bd1817a4ba351a1c99a77
-EBUILD helpgui-1.1-r2.ebuild 701 BLAKE2B e639b3ede8a6e22da48a7915789ca69db1ce0b50bad916b9067778f0f3a160fbaeda72b9f1796298edb5c53614205e87d37d1ca40b2a24f15fcc7bee03eabd4b SHA512 9ab2f72a599679fc60fa36de77e1f8b67f0273a8cff5392c5ebac13ee0551575ab888d0aeb38fb1f94103729039ae4ae9c06b6b25ae0ff38e4def3e8acaa5848
+EBUILD helpgui-1.1-r2.ebuild 694 BLAKE2B 228ce322dcd52dd4cf603e41c10901019504d5a5d2637ae9d3cfd2e6deeed1495d66ba5beb563c03c42fcb3397427f83dfed750883c30eebd431d191ab1e6201 SHA512 272a61fb0e7e241a35ac0202fb2b54e72b2567daf104ffac991c007e73981d68af754958152611d1fb203896ee80c6b52d6662074bfb2b66f86eafffafdc20c7
MISC metadata.xml 313 BLAKE2B 629ad9a15596a24dfacf2458cc4b4ebe8430c9ea47b235e88d5ae588eb7939a699f52ffb09f3a002e7013a118efa23c33b4e4bb53bf8cc6454fdd5aa72a28216 SHA512 c359d2269a1a5b9d1b9987366bbbfb678dfd4d35930b235b3e7463edbb9c90377c06ea23c3702f9d3978128b15b2efc7aa7f3a621ba464ca38e4f1a2f88407cf
diff --git a/dev-java/helpgui/helpgui-1.1-r2.ebuild b/dev-java/helpgui/helpgui-1.1-r2.ebuild
index 114379b2a443..e9d32f2214ae 100644
--- a/dev-java/helpgui/helpgui-1.1-r2.ebuild
+++ b/dev-java/helpgui/helpgui-1.1-r2.ebuild
@@ -26,7 +26,7 @@ EANT_DOC_TARGET="javadocs"
src_install() {
java-pkg_newjar build/${P}.jar ${PN}.jar
- dodoc README || die
+ dodoc README
use doc && java-pkg_dojavadoc build/docs/api
use source && java-pkg_dosrc src/*
}
diff --git a/dev-java/htmlcleaner/Manifest b/dev-java/htmlcleaner/Manifest
index 92a5d5accd47..5c4aafb80ecc 100644
--- a/dev-java/htmlcleaner/Manifest
+++ b/dev-java/htmlcleaner/Manifest
@@ -1,3 +1,3 @@
DIST htmlcleaner-2.13-src.zip 346998 BLAKE2B 883a2550b9ddc0f56d88b1a412b2d9f809e0bb53d56827104aad99f15b4fc5c7f6c88b37cd10dbea5d05e27bc650d93f038142c66ea97ab0bb1bcea810bb40c5 SHA512 bf9cc014688ebb20b0bafba82fc710f25c1db8c173dd3e9f742c31c64f127c3c89b29b151e64a3368b04d278733cce8828831f297834ca9b872a60951e0a2d47
-EBUILD htmlcleaner-2.13.ebuild 1573 BLAKE2B eb12dab9e8eea8a01dea91730b9ee4c233da3e22c9deb9a566cf39a4abdd435ac4bfc4080d78bcb06938bc671d4c13534a8835ab4c649c1eb9e1fe7f70be4d9f SHA512 c5b00de839e7f61bcf4529266882af9194ad703c54503d8f70361439841fa28ad59f6d9cbd1350d10c35434f4818f0c3c829ee1cadfdebd4e9e1ae1ec9ae8870
+EBUILD htmlcleaner-2.13.ebuild 1597 BLAKE2B 0f63cbc475912060956ad1dfbebbc639be55caf89a0cf59424c4ba86b25b798e3efd675fe2ac71fcb6b518461f10e530bb0d1e3a2531954abaf4694545357af0 SHA512 c6a686dde0292fe2a2eff15c11a51f6d11dae268af0e5a5e75b0e53668fff3dfc53c924862220753d6acf588203cf4516d7d2eb2c74f40631b02fa44d5b543ef
MISC metadata.xml 956 BLAKE2B e9aac65fc4b7ea06f1151cf3f09d1d9363770332ee2d3c711099591edb6d4ee09bd385fadefdd95512ef84f3a870407fae0e2e69bbabd16b24980341095ff7cc SHA512 def5b0f8710cfbd49e0c25f8a5623f0ef7a8e37fab31d4324540d9eeee257423767dd947475fab51f4b84100428c556aa0457c6a8b92076b9f267f35ee9475f0
diff --git a/dev-java/htmlcleaner/htmlcleaner-2.13.ebuild b/dev-java/htmlcleaner/htmlcleaner-2.13.ebuild
index b3b24a805173..0d2f1e083023 100644
--- a/dev-java/htmlcleaner/htmlcleaner-2.13.ebuild
+++ b/dev-java/htmlcleaner/htmlcleaner-2.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -15,6 +15,7 @@ LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="test"
+RESTRICT="!test? ( test )"
CDEPEND="dev-java/jdom:2"
diff --git a/dev-java/icedtea-sound/Manifest b/dev-java/icedtea-sound/Manifest
index fd1cac4f9e87..1ea9a9928d6c 100644
--- a/dev-java/icedtea-sound/Manifest
+++ b/dev-java/icedtea-sound/Manifest
@@ -1,3 +1,3 @@
DIST icedtea-sound-1.0.1.tar.xz 1515308 BLAKE2B 4d9939e1bc0e0b331b032c3a54244960d61354d6b85b83cbbce1aeb96f2748906d5bd0936b36e2aacac526bd7927dbc0686a47a0dd0f41568ca86e3805b943ea SHA512 505d02f5ce885d4c7638cde8042a686aa3651de9072d325db6fefb8c5bd3d7de73253b27162555396e827a65f50aeed8326e99099757d5efe18d14ccebc1c07a
-EBUILD icedtea-sound-1.0.1.ebuild 857 BLAKE2B e0c9c974b8e120a237eb2fe1c07f020fe6ed45741463a5addb29d2c86f1f0af82d5f0ad441b359fbc019decf10bbef2ab09c27300652651c2808bb470dc97bbf SHA512 3dfc82d61590332bb651c8189250ce804fb6140b73e09971f87e6e655c3d29efa81089bdf788befd53683d095ca5cb540c8f91b6fd135c0a68c822521a3df7f9
+EBUILD icedtea-sound-1.0.1.ebuild 884 BLAKE2B cbeab5af2535f85b974f70eb861412ea9f94e7c48adc82d72a2b51930053d45cf894dbf9c9a499f33b207a84b5fdfca1b65a95c695ed0060bf4603b1901780b2 SHA512 0de6493e5357a26f9577c98496e66e72b96452e5f5d92f7e6e1c1d3c7470563b793266d280caa672b593cadac7b5d6e21996ccc391ce3af8758432d8a2e77d47
MISC metadata.xml 502 BLAKE2B 956158234bf2b4cf3e69d59e5db820789235dba816167c1a64ae1c94e585996f14c75b72526c8344584950336fb273c094176b9dd042fc41baaadfa56f46e2b9 SHA512 2d7a91be3364f491b4402f6cd525ff8e27fd4ed27b89268817ccc9d8318f207a0b315827fdf12bae8a443751469ebc9987e0bd6f08857199f53b62f4db93c00e
diff --git a/dev-java/icedtea-sound/icedtea-sound-1.0.1.ebuild b/dev-java/icedtea-sound/icedtea-sound-1.0.1.ebuild
index 497d77c4f528..8baacadd296d 100644
--- a/dev-java/icedtea-sound/icedtea-sound-1.0.1.ebuild
+++ b/dev-java/icedtea-sound/icedtea-sound-1.0.1.ebuild
@@ -16,6 +16,7 @@ SLOT="0"
KEYWORDS="amd64 ~arm arm64 ppc64 x86"
IUSE="+doc test"
+RESTRICT="!test? ( test )"
COMMON_DEP="
>=virtual/jdk-1.6.0
diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest
index 41b3eec31228..df4a7efbad20 100644
--- a/dev-java/icedtea/Manifest
+++ b/dev-java/icedtea/Manifest
@@ -10,7 +10,19 @@ DIST icedtea-3.13-nashorn-69b1da223d93.tar.xz 2320140 BLAKE2B f2534ef33181545f9d
DIST icedtea-3.13-openjdk-c8f86954855a.tar.xz 361204 BLAKE2B af71575af9e68b05a7b31808ccc10318569db83b938f72cb9717e0e4d7532fd342e514442969945bf39d861514cd9173bb256b6f253a83211de95b29b8081e2c SHA512 e5e1072f43b024d8341e770eb8768d0161dd91f483cfa9a719790eb81458dd2a4da4e688a2c7828025f5b39247558ea69881176c53700cddd161708f0cedb764
DIST icedtea-3.13-shenandoah-ff69edbcd7ae.tar.xz 7071080 BLAKE2B 4af91356631762cde7e2af12f5cda2fbe30a6953fa7d0828a122c091e4e13ff10e1c3b916c2add5ff43d30756c355c879102edda0610579c9d652d328031e503 SHA512 898ad626cc84a8ff223feb8f6673e8338bee3e4112ecd977f1a61a66bdf3729fe006d16c97071bdb191e8aa83397cf1eb4ce0505d265e670d2db430d7264376d
DIST icedtea-3.13.0.tar.xz 1526900 BLAKE2B 6fbfd5cfbd2ba712ab2c03465ae3df68f87613857e763ca7b0283876a6d86330f07c94e85868f313dda9de3f6c82dc41e11ce9d7fada22300ef2b018295a6577 SHA512 312bcc6660360eb73b96801fdac0475d6b192bc3fcb80e250225cbb4dfe39ce178e0fa5154c509e7f5605113b34077a6f9c252a52024e568bab7ed6a74140f7c
+DIST icedtea-3.14-aarch32-0d7b61c79fee.tar.xz 6845944 BLAKE2B 803595c6d51ed7373cfcccd9218b5dc4f8dee0a3ed6c532438072ad82dff3e21a1e0e8097a67fc26e42de5cc7b4c57428633a085956e5c8626948e58ad34a8b0 SHA512 6db1c437440609807a1b14aca69d87987e5fda526306b6ef2821bdcffbb29e63ade3291ca87e1491061f360e1db5a9c5f535e8e888e7a63abef9faa55aef2335
+DIST icedtea-3.14-corba-a37140ba122d.tar.xz 946604 BLAKE2B a091ae07051a07f0a1fb066f5ae63f33f45ac86b434a67ac766d38965c5128fba5bfee16aa3be9b43ba49b8d7b7bfe5b52397efeeba1db7b7e44e311ea74fece SHA512 5aedab2cff0dd8b4cb98121643009593d10da9abd150ab938cf45f5b8f18cae5f31dcc31c30090b736cf52413a290b6b11e6fc42b3575ea50e213bf334a07159
+DIST icedtea-3.14-hotspot-4ccc1ae03940.tar.xz 6899612 BLAKE2B 8d3ea95ebf4091bd5c0822547be35146580b58a389c3ce0ea9784c6e0f271ef66bcb61e878e734ca7111f110efda392b9b4843018470812d1ede6a122962090b SHA512 258cca176c6f930268f189f77dd4e6bd683fb90fbd7866870d22ca42105292cedeca7d274b70979e59af15229ebba22da64444ef14c641066e10688286ec302d
+DIST icedtea-3.14-jaxp-9f2145980ba0.tar.xz 2292812 BLAKE2B 5d9a4346c05a9513260518a45939d42430a73e1b7ac98701a38de279c3e43fac17e043bf86ab0b9b5df9250657be74335573ba7fb0b3398d6898689032ffc43c SHA512 16a34a65b20650f66eece6e33e82aefaf46bbf46c8332bac8c266405839168b924235395cbf7d6c5210d35b416ee0ab2ed0bd09c3f1c90195bff35d3db4b596d
+DIST icedtea-3.14-jaxws-af5760dceec0.tar.xz 2275368 BLAKE2B a9e870972d211f796bb2bf2cc4befdf38bcb72ae6734414482e9437707d435ceb3d81042994406cfdd1d7bc357cb1d4dc7fd21eb1bd71216c98cfe703fb98340 SHA512 706b9ce4d32c92adca44d9643e44ebe757e8503798e2b24b2591660774f4a4719f2015d3edb02f3374ec4b88c5b2f0b5578369345a9db4c5def1ff37f630bb5d
+DIST icedtea-3.14-jdk-ce6c8c2cad27.tar.xz 39515148 BLAKE2B a7749056ffa824ee03f3441fc7be1ace633953d15b3b5153f8b3818f33234a6c234917e19d463e53d15c88167d8ecea2eb7eaec21b734a9be44bef58b8b65faa SHA512 2e44c646bcbf56ce7e91be0fdb46db9887cfe7f538f866e61d757e657a4a3726caca50bd885355a85675451ea8ff9810bccb7ea026239219373688455dcc8476
+DIST icedtea-3.14-langtools-ccec65feaaac.tar.xz 2077244 BLAKE2B 53609e69b64064530137a39bcf7cc2fd9937369f25650efde7f0698985ded4bf3298159480e91f0bd38972ec0aef9e91b1a45e26fa284adc1bc2698ab896f7ce SHA512 ceef08eb53e895156afd0ec342a045c3aa29551a7939803cd821121286ec05fb3538d3b46a44c99f1a2805163b6e7351ec42b1486aaf6a8ecb7fdccc526c410d
+DIST icedtea-3.14-nashorn-13722b4babad.tar.xz 2319268 BLAKE2B 1e9d7f3e300b94f6e1d0a30840a5ce439046e9d60fee16c5ff31b3e856916ba204e58ed063a1d4bb896c7d19adcac036fb74a314fb5fec544745b655d538312b SHA512 59af524388b501c63c567dd36abbe29b3254b3f05191730740aec84e73f93cf77850ab36d9972528781bbf47a6541a75d7e80e26c4c425d6cbb6460e2b4bdbda
+DIST icedtea-3.14-openjdk-454c6cbb8073.tar.xz 361988 BLAKE2B 900a2ba53d9300ef895b8a17276055c5a776b55db2d2e56e9d56a88e254fa381d9ba554453c426a1ded7e5a9fbb0acfa61aa8b7a9bdcf2dec471f4035fecaa7d SHA512 1e8009155a9ad39405e11704bb1f8b4c51ae0f64563baa7a7ce29a79613339e82b8776193a0076b993f8839b1c5959edff18cdadaa7f2f163fa5d3b7f7d60396
+DIST icedtea-3.14-shenandoah-9e52f8d3b511.tar.xz 7061948 BLAKE2B bf26c9684d088dd24d1a7232be2b1e61ad924549a34389042820230cbe6d64cef63f8565dd0b85c5173637c9b1637a46c3213044322e156c62d7a1cdd7e033e7 SHA512 67aea51a3a37ad34ef9f0706ba0a536017be170c6dd0d26b14416fdbaa91206e7d9833c6ccaaaf7037cd242286e1442bd3746c521365fbc32f4bdb811bdf67a4
+DIST icedtea-3.14.0.tar.xz 1528612 BLAKE2B 1dd24bda5f461c2d8a354e592f618925b8c027a8aaed3b30697a2bc9b8a5aeb33fd198895985e0564d15a6e65ed6adb703f6018e0ff9fe31613eb7d72a9d6e39 SHA512 6cd366a1adde12b5cc2c0c64c0c353ebf9ad5b0ad79b77c5cca3acc93219752110eb222b74bd62180fe0bf5b063db12df6316c334d5940d1636c9d10824085ed
DIST icedtea-cacao-c182f119eaad.tar.xz 3056520 BLAKE2B 6b1be66ce19f491d49f1591babcd8c088e8e327f828dca3f30b8f8b04c132140f8b9f487ef6d91aed212aebab2c7c3052d79fa3f2d76d3832341d94d48e77089 SHA512 22e8a031db5f93f82b276b310c175f1e926e48d64e1e50bebe51138e0f66391cd005501491a959d31663f338f27a29ec984ac29f77078f59472856e4d08edef7
DIST icedtea-jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz 317187 BLAKE2B 1ca581a02be4cf5c09162687bbc90ec01b58b4910d866d11512cf17a1caff181fdc69e42f7498b2df9deb875ddc6efc6bc2888428f411da94bbc2313ddf5a2c9 SHA512 a31348481e1c02747f5bb9db333f855c45a1555aa187ee35de5ef553a10a8a47dfcc1beb1e69502046c1758438b91958a328e0a0015812c153221f67734a70a6
-EBUILD icedtea-3.13.0.ebuild 12198 BLAKE2B fdaf3e7ed6d196484da044cab7a60fc5776705ae7bfdad2f8c9f0b32677e8a9503d698688f9fbdaffa34bd5ba207337aff5b579053921cfb3ca22cc10e5dbe04 SHA512 f8283af449969e4adf92776ebc058857d170ab4be556a7f2eddafe6b705702dd3871afaf71e364bb96a1505840aafbb742d3152bffb6367730c3015a8d5f3130
+EBUILD icedtea-3.13.0.ebuild 12225 BLAKE2B 5b3318159ace6d0dc07d5420980a60dd4a4c698510f178e076a5c074654603bd81f8ab17695277ed8e0d4330ade2901a644462a540df1610d13ca4c395c41cee SHA512 0ff677a0f7f8f73daeb1ad1c03491db1cbe2944ba492f2419462c544fcc55c6d8da1ae5c1a2e372c738d402d8fc1b222ef75260bbb21fef50d5d1c6c51ef8a2d
+EBUILD icedtea-3.14.0.ebuild 12225 BLAKE2B 249265ff1d03dc2f3a37924a8ad5e01192dfb557e81a83cd4bc925d4627712bc4bfa71b8b54df48617462c5fe915e24a009ff923e88420cd31bdeb24d502fa7a SHA512 4859674f38c97c222d0f2f1c3c9a0e04965e460ca8eec16e3d08b73eebaea61ef6c26e2f584e53c47782952046e3c5a20ea25dd20a6981ae3b99c164f0e86aac
MISC metadata.xml 2258 BLAKE2B 589f588b726745c7c488da1a900a97586cd7283534e675fe478149c3ea178e7c4fe6149b0430ca6db3546f74a632ec6da7ddb12f6efecc0e0aebbe8fd63790ae SHA512 22d6948a51e8b56d98aa60158903eda355fca255f5ea1d8b0cfb7767c346d91ed38d51fe0a06938e95efee3d544708d880f8a41fec9cb789a6af9eb1126a95d7
diff --git a/dev-java/icedtea/icedtea-3.13.0.ebuild b/dev-java/icedtea/icedtea-3.13.0.ebuild
index 175031fa754f..b68d66cb8ce8 100644
--- a/dev-java/icedtea/icedtea-3.13.0.ebuild
+++ b/dev-java/icedtea/icedtea-3.13.0.ebuild
@@ -73,6 +73,7 @@ IUSE="+alsa cacao +cups doc examples +gtk headless-awt
jamvm +jbootstrap kerberos libressl nsplugin pax_kernel +pch
pulseaudio sctp selinux shenandoah smartcard +source +system-lcms test +webstart zero"
+RESTRICT="!test? ( test )"
REQUIRED_USE="gtk? ( !headless-awt )"
# Ideally the following were optional at build time.
diff --git a/dev-java/icedtea/icedtea-3.14.0.ebuild b/dev-java/icedtea/icedtea-3.14.0.ebuild
new file mode 100644
index 000000000000..c52bf3276540
--- /dev/null
+++ b/dev-java/icedtea/icedtea-3.14.0.ebuild
@@ -0,0 +1,375 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
+
+# *********************************************************
+# * IF YOU CHANGE THIS EBUILD, CHANGE ICEDTEA-6.* AS WELL *
+# *********************************************************
+
+EAPI="6"
+SLOT="8"
+
+inherit check-reqs flag-o-matic java-pkg-2 java-vm-2 multiprocessing pax-utils prefix versionator xdg-utils
+
+ICEDTEA_VER=$(get_version_component_range 1-3)
+ICEDTEA_BRANCH=$(get_version_component_range 1-2)
+ICEDTEA_PKG=icedtea-${ICEDTEA_VER}
+ICEDTEA_PRE=$(get_version_component_range _)
+
+CORBA_TARBALL="a37140ba122d.tar.xz"
+JAXP_TARBALL="9f2145980ba0.tar.xz"
+JAXWS_TARBALL="af5760dceec0.tar.xz"
+JDK_TARBALL="ce6c8c2cad27.tar.xz"
+LANGTOOLS_TARBALL="ccec65feaaac.tar.xz"
+OPENJDK_TARBALL="454c6cbb8073.tar.xz"
+NASHORN_TARBALL="13722b4babad.tar.xz"
+HOTSPOT_TARBALL="4ccc1ae03940.tar.xz"
+SHENANDOAH_TARBALL="9e52f8d3b511.tar.xz"
+AARCH32_TARBALL="0d7b61c79fee.tar.xz"
+
+CACAO_TARBALL="cacao-c182f119eaad.tar.xz"
+JAMVM_TARBALL="jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz"
+
+CORBA_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-corba-${CORBA_TARBALL}"
+JAXP_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jaxp-${JAXP_TARBALL}"
+JAXWS_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jaxws-${JAXWS_TARBALL}"
+JDK_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-jdk-${JDK_TARBALL}"
+LANGTOOLS_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-langtools-${LANGTOOLS_TARBALL}"
+OPENJDK_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-openjdk-${OPENJDK_TARBALL}"
+NASHORN_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-nashorn-${NASHORN_TARBALL}"
+HOTSPOT_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-hotspot-${HOTSPOT_TARBALL}"
+SHENANDOAH_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-shenandoah-${SHENANDOAH_TARBALL}"
+AARCH32_GENTOO_TARBALL="icedtea-${ICEDTEA_BRANCH}-aarch32-${AARCH32_TARBALL}"
+
+CACAO_GENTOO_TARBALL="icedtea-${CACAO_TARBALL}"
+JAMVM_GENTOO_TARBALL="icedtea-${JAMVM_TARBALL}"
+
+DROP_URL="https://icedtea.classpath.org/download/drops"
+ICEDTEA_URL="${DROP_URL}/icedtea${SLOT}/${ICEDTEA_VER}"
+
+DESCRIPTION="A harness to build OpenJDK using Free Software build tools and dependencies"
+HOMEPAGE="https://icedtea.classpath.org"
+SRC_PKG="${ICEDTEA_PKG}.tar.xz"
+SRC_URI="
+ https://icedtea.classpath.org/download/source/${SRC_PKG}
+ ${ICEDTEA_URL}/openjdk.tar.xz -> ${OPENJDK_GENTOO_TARBALL}
+ ${ICEDTEA_URL}/corba.tar.xz -> ${CORBA_GENTOO_TARBALL}
+ ${ICEDTEA_URL}/jaxp.tar.xz -> ${JAXP_GENTOO_TARBALL}
+ ${ICEDTEA_URL}/jaxws.tar.xz -> ${JAXWS_GENTOO_TARBALL}
+ ${ICEDTEA_URL}/jdk.tar.xz -> ${JDK_GENTOO_TARBALL}
+ ${ICEDTEA_URL}/hotspot.tar.xz -> ${HOTSPOT_GENTOO_TARBALL}
+ ${ICEDTEA_URL}/nashorn.tar.xz -> ${NASHORN_GENTOO_TARBALL}
+ ${ICEDTEA_URL}/langtools.tar.xz -> ${LANGTOOLS_GENTOO_TARBALL}
+ shenandoah? ( ${ICEDTEA_URL}/shenandoah.tar.xz -> ${SHENANDOAH_GENTOO_TARBALL} )
+ arm? ( ${ICEDTEA_URL}/aarch32.tar.xz -> ${AARCH32_GENTOO_TARBALL} )
+ ${DROP_URL}/cacao/${CACAO_TARBALL} -> ${CACAO_GENTOO_TARBALL}
+ ${DROP_URL}/jamvm/${JAMVM_TARBALL} -> ${JAMVM_GENTOO_TARBALL}"
+
+LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 MPL-1.0 MPL-1.1 public-domain W3C"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+IUSE="+alsa cacao +cups doc examples +gtk headless-awt
+ jamvm +jbootstrap kerberos libressl nsplugin pax_kernel +pch
+ pulseaudio sctp selinux shenandoah smartcard +source +system-lcms test +webstart zero"
+
+RESTRICT="!test? ( test )"
+REQUIRED_USE="gtk? ( !headless-awt )"
+
+# Ideally the following were optional at build time.
+ALSA_COMMON_DEP="
+ >=media-libs/alsa-lib-1.0"
+CUPS_COMMON_DEP="
+ >=net-print/cups-1.2.12"
+X_COMMON_DEP="
+ >=media-libs/giflib-4.1.6:0=
+ >=media-libs/libpng-1.2:0=
+ >=x11-libs/libX11-1.1.3
+ >=x11-libs/libXext-1.1.1
+ >=x11-libs/libXi-1.1.3
+ >=x11-libs/libXrender-0.9.4
+ >=x11-libs/libXtst-1.0.3
+ x11-libs/libXcomposite"
+X_DEPEND="
+ x11-base/xorg-proto
+ >=x11-libs/libXau-1.0.3
+ >=x11-libs/libXdmcp-1.0.2
+ >=x11-libs/libXinerama-1.0.2"
+
+# The Javascript requirement is obsolete; OpenJDK 8+ has Nashorn
+COMMON_DEP="
+ >=dev-libs/glib-2.26:2=
+ >=dev-util/systemtap-1
+ media-libs/fontconfig:1.0=
+ >=media-libs/freetype-2.5.3:2=
+ >=sys-libs/zlib-1.2.3
+ virtual/jpeg:0=
+ kerberos? ( virtual/krb5 )
+ sctp? ( net-misc/lksctp-tools )
+ smartcard? ( sys-apps/pcsc-lite )
+ system-lcms? ( >=media-libs/lcms-2.9:2= )"
+
+# Gtk+ will move to COMMON_DEP in time; PR1982
+# gsettings-desktop-schemas will be needed for native proxy support; PR1976
+RDEPEND="${COMMON_DEP}
+ !dev-java/icedtea:0
+ !dev-java/icedtea-web:7
+ >=gnome-base/gsettings-desktop-schemas-3.12.2
+ >=sys-apps/baselayout-java-0.1.0-r1
+ virtual/ttf-fonts
+ alsa? ( ${ALSA_COMMON_DEP} )
+ cups? ( ${CUPS_COMMON_DEP} )
+ gtk? (
+ >=dev-libs/atk-1.30.0
+ >=x11-libs/cairo-1.8.8
+ x11-libs/gdk-pixbuf:2
+ >=x11-libs/gtk+-2.8:2
+ >=x11-libs/pango-1.24.5
+ )
+ !headless-awt? ( ${X_COMMON_DEP} )
+ selinux? ( sec-policy/selinux-java )"
+
+# ca-certificates, perl and openssl are used for the cacerts keystore generation
+# perl is needed for running the SystemTap tests and the bootstrap javac
+# lsb-release is used to obtain distro information for the version & crash dump output
+# attr is needed for xattr.h which defines the extended attribute syscalls used by NIO2
+# x11-libs/libXt is needed for headers only (Intrinsic.h, IntrinsicP.h, Shell.h, StringDefs.h)
+# Ant is no longer needed under the new build system
+DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP} ${X_DEPEND}
+ || (
+ dev-java/icedtea-bin:8
+ dev-java/icedtea:8
+ dev-java/openjdk:8
+ dev-java/openjdk-bin:8
+ )
+ app-arch/cpio
+ app-arch/unzip
+ app-arch/zip
+ app-misc/ca-certificates
+ dev-lang/perl
+ !libressl? ( dev-libs/openssl:0 )
+ libressl? ( dev-libs/libressl:0 )
+ sys-apps/attr
+ sys-apps/lsb-release
+ x11-libs/libXt
+ virtual/pkgconfig
+ pax_kernel? ( sys-apps/elfix )"
+
+PDEPEND="webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
+ nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )
+ pulseaudio? ( dev-java/icedtea-sound )"
+
+S="${WORKDIR}"/${ICEDTEA_PKG}
+
+icedtea_check_requirements() {
+ local CHECKREQS_DISK_BUILD
+
+ if use doc; then
+ CHECKREQS_DISK_BUILD="9000M"
+ else
+ CHECKREQS_DISK_BUILD="8500M"
+ fi
+
+ check-reqs_pkg_${EBUILD_PHASE}
+}
+
+pkg_pretend() {
+ icedtea_check_requirements
+}
+
+pkg_setup() {
+ icedtea_check_requirements
+
+ JAVA_PKG_WANT_BUILD_VM="
+ icedtea-8 icedtea-bin-8
+ openjdk-8 openjdk-bin-8"
+ JAVA_PKG_WANT_SOURCE="1.5"
+ JAVA_PKG_WANT_TARGET="1.5"
+
+ java-vm-2_pkg_setup
+ java-pkg-2_pkg_setup
+}
+
+src_unpack() {
+ unpack ${SRC_PKG}
+}
+
+src_configure() {
+ # For bootstrap builds as the sandbox control file might not yet exist.
+ addpredict /proc/self/coredump_filter
+
+ # icedtea doesn't like some locales. #330433 #389717
+ export LANG="C" LC_ALL="C"
+
+ local cacao_config config hotspot_port hs_config jamvm_config use_cacao use_jamvm use_zero zero_config
+ local vm=$(java-pkg_get-current-vm)
+
+ # gcj-jdk ensures ecj is present.
+ if use jbootstrap || has "${vm}" gcj-jdk; then
+ use jbootstrap || einfo "bootstrap is necessary when building with ${vm}, ignoring USE=\"-jbootstrap\""
+ config+=" --enable-bootstrap"
+ else
+ config+=" --disable-bootstrap"
+ fi
+
+ # Use Zero if requested
+ if use zero; then
+ use_zero="yes"
+ fi
+
+ # Use JamVM if requested
+ if use jamvm; then
+ use_jamvm="yes"
+ fi
+
+ # Use CACAO if requested
+ if use cacao; then
+ use_cacao="yes"
+ fi
+
+ # Are we on a architecture with a HotSpot port?
+ # In-tree JIT ports are available for amd64, arm, arm64, ppc64 (be&le), SPARC and x86.
+ if { use amd64 || use arm || use arm64 || use ppc64 || use sparc || use x86; }; then
+ hotspot_port="yes"
+ # Work around stack alignment issue, bug #647954.
+ use x86 && append-flags -mincoming-stack-boundary=2
+ fi
+
+ # Always use HotSpot as the primary VM if available. #389521 #368669 #357633 ...
+ # Otherwise use Zero for now until alternate VMs are working
+ if test "x${hotspot_port}" != "xyes"; then
+ use_zero="yes"
+ fi
+
+ if use shenandoah; then
+ if { use amd64 || use arm64; }; then
+ hs_config="--with-hotspot-build=shenandoah"
+ hs_config+=" --with-hotspot-src-zip="${DISTDIR}/${SHENANDOAH_GENTOO_TARBALL}""
+ else
+ eerror "Shenandoah is only supported on arm64 and x86_64. Please re-build with USE="-shenandoah""
+ fi
+ else
+ if use arm ; then
+ hs_config="--with-hotspot-src-zip="${DISTDIR}/${AARCH32_GENTOO_TARBALL}""
+ else
+ hs_config="--with-hotspot-src-zip="${DISTDIR}/${HOTSPOT_GENTOO_TARBALL}""
+ fi
+ fi
+
+ # Turn on JamVM if needed (non-HS archs) or requested
+ if test "x${use_jamvm}" = "xyes"; then
+ if test "x${hotspot_port}" = "xyes"; then
+ ewarn 'Enabling JamVM on an architecture with HotSpot support; issues may result.'
+ ewarn 'If so, please rebuild with USE="-jamvm"'
+ fi
+ ewarn 'JamVM is known to still have issues with IcedTea 3.x; please rebuild with USE="-jamvm"'
+ jamvm_config="--enable-jamvm"
+ fi
+
+ # Turn on CACAO if needed (non-HS archs) or requested
+ if test "x${use_cacao}" = "xyes"; then
+ if test "x${hotspot_port}" = "xyes"; then
+ ewarn 'Enabling CACAO on an architecture with HotSpot support; issues may result.'
+ ewarn 'If so, please rebuild with USE="-cacao"'
+ fi
+ ewarn 'CACAO is known to still have issues with IcedTea 3.x; please rebuild with USE="-cacao"'
+ cacao_config="--enable-cacao"
+ fi
+
+ # Turn on Zero if needed (non-HS/CACAO archs) or requested
+ if test "x${use_zero}" = "xyes"; then
+ if test "x${hotspot_port}" = "xyes"; then
+ ewarn 'Enabling Zero on an architecture with HotSpot support; performance will be significantly reduced.'
+ fi
+ zero_config="--enable-zero"
+ fi
+
+ # PaX breaks pch, bug #601016
+ if use pch && ! host-is-pax; then
+ config+=" --enable-precompiled-headers"
+ else
+ config+=" --disable-precompiled-headers"
+ fi
+
+ config+=" --with-parallel-jobs=$(makeopts_jobs)"
+
+ unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
+
+ econf ${config} \
+ --with-openjdk-src-zip="${DISTDIR}/${OPENJDK_GENTOO_TARBALL}" \
+ --with-corba-src-zip="${DISTDIR}/${CORBA_GENTOO_TARBALL}" \
+ --with-jaxp-src-zip="${DISTDIR}/${JAXP_GENTOO_TARBALL}" \
+ --with-jaxws-src-zip="${DISTDIR}/${JAXWS_GENTOO_TARBALL}" \
+ --with-jdk-src-zip="${DISTDIR}/${JDK_GENTOO_TARBALL}" \
+ --with-langtools-src-zip="${DISTDIR}/${LANGTOOLS_GENTOO_TARBALL}" \
+ --with-nashorn-src-zip="${DISTDIR}/${NASHORN_GENTOO_TARBALL}" \
+ --with-cacao-src-zip="${DISTDIR}/${CACAO_GENTOO_TARBALL}" \
+ --with-jamvm-src-zip="${DISTDIR}/${JAMVM_GENTOO_TARBALL}" \
+ --with-jdk-home="$(java-config -O)" \
+ --prefix="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}" \
+ --mandir="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}/man" \
+ --docdir="${EPREFIX}/usr/share/doc/${PF}" \
+ --htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
+ --with-pkgversion="Gentoo ${PF}" \
+ --disable-ccache \
+ --disable-downloading --disable-Werror --disable-tests \
+ --disable-systemtap-tests --enable-improved-font-rendering \
+ --enable-system-jpeg --enable-system-zlib \
+ $(use_enable headless-awt headless) \
+ $(use_enable !headless-awt system-gif) \
+ $(use_enable !headless-awt system-png) \
+ $(use_enable doc docs) \
+ $(use_enable kerberos system-kerberos) \
+ $(use_enable system-lcms) \
+ $(use_with pax_kernel pax "${EPREFIX}/usr/sbin/paxmark.sh") \
+ $(use_enable sctp system-sctp) \
+ $(use_enable smartcard system-pcsc) \
+ ${zero_config} ${cacao_config} ${jamvm_config} ${hs_config}
+}
+
+src_compile() {
+ default
+}
+
+src_test() {
+ default
+}
+
+src_install() {
+ default
+
+ local dest="/usr/$(get_libdir)/icedtea${SLOT}"
+ local ddest="${ED}${dest#/}"
+
+ if ! use alsa; then
+ rm -v "${ddest}"/jre/lib/$(get_system_arch)/libjsoundalsa.* || die
+ fi
+
+ if ! use examples; then
+ rm -r "${ddest}"/demo "${ddest}"/sample || die
+ fi
+
+ if ! use source; then
+ rm -v "${ddest}"/src.zip || die
+ fi
+
+ dosym /usr/share/doc/${PF} /usr/share/doc/${PN}${SLOT}
+
+ # Fix the permissions.
+ find "${ddest}" \! -type l \( -perm /111 -exec chmod 755 {} \; -o -exec chmod 644 {} \; \) || die
+
+ dosym "${EPREFIX}"/etc/ssl/certs/java/cacerts "${dest}"/jre/lib/security/cacerts
+
+ java-vm_install-env "${FILESDIR}/icedtea.env.sh"
+ java-vm_sandbox-predict /proc/self/coredump_filter
+}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+ java-vm-2_pkg_postinst
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+ java-vm-2_pkg_postrm
+}
diff --git a/dev-java/jackson-annotations/Manifest b/dev-java/jackson-annotations/Manifest
index 6cf2dc5d5231..a276fc947420 100644
--- a/dev-java/jackson-annotations/Manifest
+++ b/dev-java/jackson-annotations/Manifest
@@ -1,3 +1,3 @@
DIST jackson-annotations-2.9.10.tar.gz 57322 BLAKE2B 85e3ac040e3adc986fa7b2a1892bb536ff2b46415af9390a6ec4e59bc9770b2bced4fd80edffc7b2083853b0b1bb5022dde137fda7e9920ec27e3fa54858e5fc SHA512 27c28e9453570aab4758031d406bfc8b8ba0eb443dcd0a884d6098840e5b577b2628288daf10e9de6ce5d1e4da2f4b8e4ec36a6559233e012725a906c4da21b9
-EBUILD jackson-annotations-2.9.10.ebuild 1036 BLAKE2B 34c92c554471a5347b8eaf8038ced92f1836c22134ab714afc32899cb1e2d8af462276cfe1f6244634820a4efd6d781cd6f3a3ed973a1efa6ba9c2f90bf30691 SHA512 50e0dd7ae6ff3f2d7da4e7f90d3c9b33e233ff8f84b86730e4b6d4e714f89562547a1a2280482cb982b775b300161f1af0246b76bcd61d992c34ff878aaa08fd
+EBUILD jackson-annotations-2.9.10.ebuild 1063 BLAKE2B de11416bbf9be0341af53dcf611353c2b51ee5ac73ce7549ab5ab28e6e17385028bc4fcc617e7f9c5dc24d22edf8a984f275fd65131d24ddd610231ab6a48c7a SHA512 05165dd349526129b1619d4f54bf1641b68a9573a2978161e1ee99fc49462616d7d06b1d5c25f58fcd59c3e93868ab6969f2c63b7e5107c0f10b3f286e44b50e
MISC metadata.xml 340 BLAKE2B a9f7d89117ded69cf6f51d86ad904597123d218e694938716deafd4fa66f0308777eaf89a42f1b8c030b0fb23646ddbfd5dfddebe8a17562bc332cf8f174b469 SHA512 52a2836de2359eb77cf2ff83ecc97efb34e19028261cb69655808cb2e939bb1120eaa4e3dcfac242747998ca397caabcf9ca4448e52c8a9772558f3ebf4037f7
diff --git a/dev-java/jackson-annotations/jackson-annotations-2.9.10.ebuild b/dev-java/jackson-annotations/jackson-annotations-2.9.10.ebuild
index ea9864354038..5f6b0bc2fef8 100644
--- a/dev-java/jackson-annotations/jackson-annotations-2.9.10.ebuild
+++ b/dev-java/jackson-annotations/jackson-annotations-2.9.10.ebuild
@@ -14,6 +14,7 @@ LICENSE="Apache-2.0"
SLOT="2"
KEYWORDS="~amd64 ~x86"
IUSE="test"
+RESTRICT="!test? ( test )"
RDEPEND=">=virtual/jre-1.7"
diff --git a/dev-java/jackson/Manifest b/dev-java/jackson/Manifest
index 9befb833c7ca..94a82d86fbce 100644
--- a/dev-java/jackson/Manifest
+++ b/dev-java/jackson/Manifest
@@ -1,3 +1,3 @@
DIST jackson-core-2.9.10.tar.gz 416803 BLAKE2B 9d8efc39b09b9619da301dc7fec3bd6339133c3fea3af46bbd77530883662b3b1d4ba2536cb8bd7ff7609a79ae6cfce135a3a5d75076bb7884e5e2878ac0107b SHA512 26b22e3fa60190877f5227c936ee32fdb4014347307904b140a6c787bb732df598b0ed48e7014cb6e51172abe52783e4d866f135706c8ebc77e24bdf087e9e71
-EBUILD jackson-2.9.10.ebuild 1475 BLAKE2B a5f482a1f59bd8341864ee54b3d3cc28f3807e8c50d29c484012806a74816fd634e64ecfc11802eb84a7ac66d9d0c94772de57d167069cc95ff6a9a436482684 SHA512 86d390ad11e76da3723f9a2b99c0c49511744e499cb3de5d4920ae14009822949e9bfe0b2351997a0624655d635cdee3582fd2ce7c816ea948736a867c0966d9
+EBUILD jackson-2.9.10.ebuild 1502 BLAKE2B 40a35ecba9eec0ce42df3e90654e4004edb213b64252a22c9c62e2dff9255477422f24e8b4c0004bd2ee578bdf7ca9a04e1e3c6664874d2c5e0d1d50f9a6713b SHA512 12045c6457733ef6d8c67ab94052ca543c293482ae3027756601acc99bf4b1cac99bc035e163c714200f7fdc915b8683bf8a824d21ac9f2eb09e608c278c0711
MISC metadata.xml 333 BLAKE2B e99f0c591182d75965d697a1dc4860ed964ac9cac4140b68d9ffc5ae1ae6021027b0514ca3f57520fe948c60388e4670c95f63546f2355d9d81258396a870879 SHA512 c5994d267b092ad22aec1586e2a884ed023f945a005310205e737fdf60648837c15764616bba08c8a69314ebee43fe9940c790c624555ec00c0e3d3d529d3a1e
diff --git a/dev-java/jackson/jackson-2.9.10.ebuild b/dev-java/jackson/jackson-2.9.10.ebuild
index 20987cc01db5..b495fe7cf278 100644
--- a/dev-java/jackson/jackson-2.9.10.ebuild
+++ b/dev-java/jackson/jackson-2.9.10.ebuild
@@ -14,6 +14,7 @@ LICENSE="Apache-2.0"
SLOT="2"
KEYWORDS="~amd64 ~x86"
IUSE="test"
+RESTRICT="!test? ( test )"
RDEPEND=">=virtual/jre-1.7"
DEPEND=">=virtual/jdk-1.7
diff --git a/dev-java/jacl/Manifest b/dev-java/jacl/Manifest
index c0830190e9d6..b9e134527207 100644
--- a/dev-java/jacl/Manifest
+++ b/dev-java/jacl/Manifest
@@ -1,3 +1,3 @@
DIST jacl-1.4.1.tar.gz 1921630 BLAKE2B 1b5693aa79fc50b5ff7a1ef86608b640d0bf391ced72dbe5d30f30fb46b26174535aac9d0ec32e1528f16af9e54def344d2fe38602700f921d612761f706fcce SHA512 e4b906efbd3ef4ab9338e8bf2f50c3b820e25b9fbe61f194e90cc0fa128f68d64eb459f7b05171d4b86b4c9635ef483906a02952bdedcee89ccb92256b789247
-EBUILD jacl-1.4.1-r1.ebuild 975 BLAKE2B 6a0183b04ed9e4d0ea797d19e53774653fdb3bac4e9e2039fd8b9f0eee3814c9ae643411e6c00dfd41a4a5cb14cbb98f480a7fb18700aca17147007af3572b02 SHA512 7114f0f2d99e2a06b58eb5f0b9443e69baaeed5fb81ec7ac1c42a3915db12ba773903536677cdae93aa8a956b87911b8d08291ab9fb4087bcc651d005e0aa4eb
+EBUILD jacl-1.4.1-r1.ebuild 968 BLAKE2B 8c91bde2f3ee92e895ff97c463b37aebb093a2d71d9965e3d1e5fa5bc9821c0a15fe507640a4862cb45fff476e580aac82b3dd9b4b96d5c35e4ceab474729222 SHA512 37d37c33a0f0ab28e20febd2a11542903416b5bf6a85ec9bb25064723eeb84ed6c09891952fd01da033358d176073719e819020dc520aff8333437980be3b64c
MISC metadata.xml 2116 BLAKE2B 5dd3d0eaa2e83ff6b387c77b1b4a156502925bf37334b7b7ffabb7ed7ba6368cdada2f61881812225215233acd2df7cc9a611b377188e1f67c2960f60c1e616f SHA512 221bd082cf7a036c0417d003a216bd919f8d6391211da62abaf57c560f192bbe27dba23c260a4d731e09e46dd0e30b4a185a45ccf7375908b947667bf5df7966
diff --git a/dev-java/jacl/jacl-1.4.1-r1.ebuild b/dev-java/jacl/jacl-1.4.1-r1.ebuild
index 2a090c5d697a..1b1b4647978a 100644
--- a/dev-java/jacl/jacl-1.4.1-r1.ebuild
+++ b/dev-java/jacl/jacl-1.4.1-r1.ebuild
@@ -48,5 +48,5 @@ src_compile() {
src_install() {
java-pkg-simple_src_install
java-pkg_dolauncher jaclsh --main tcl.lang.Shell
- dodoc README ChangeLog known_issues.txt || die
+ dodoc README ChangeLog known_issues.txt
}
diff --git a/dev-java/jamon/Manifest b/dev-java/jamon/Manifest
index 3c3e0f30be2d..86a8a1e6952b 100644
--- a/dev-java/jamon/Manifest
+++ b/dev-java/jamon/Manifest
@@ -1,3 +1,3 @@
DIST jamonapi-2_81.tar.gz 23149879 BLAKE2B 1e21c6ae849a1fec74b87614594007653ccb573b450c495396951532dfe713ab47944425f421b212e052153c84163f79f376413946d16917e0900ec5fe64be8b SHA512 09fba65aec2754f8a1b85dd7f5691b8bae5c4f1c852dd69cddb3642a594bb44baa5b6a3c611657041d6ce2cc37c824a111adeaa929761e3983d43d7080ce05b1
-EBUILD jamon-2.81.ebuild 2127 BLAKE2B f596cadc1b44a6c37b41ef0e53e1f9f4c4bd601f18b69e56a74528b5b39bfe9810ede3e7e33d9490155917cd8f186fbc377779292eec5cba77021c946d8c38ae SHA512 8fd75fc92760bc7b32be9b06481491bcdcec606771952c323a7161bf56762ed35776f014b20afa2a38c845924769af244284d6567609725ea0cf4c5758b14a25
+EBUILD jamon-2.81.ebuild 2151 BLAKE2B 65ffd5798a56e4856edff66b404c300e99ffbed6d4af21d68063866376dac7b0cdd9b024496acefd59577fa17abdd0668b41557ffe40d30ee538fe39c44b8fa4 SHA512 ed673338068ce9d8298e27e4884f1b25574bb63b7e353a48b6201c08754f544705490f47286047605b0ad3e5c9cef2c06d9b25d034346c346d7c1119ab77598e
MISC metadata.xml 536 BLAKE2B 9dc1bf087206fa0f3490ea7dd9dfb057107dbed6bfd89ebe7c6164eea017914a34dd839cef1963dd0db71d14836a056627fcc4bb1119e601b1cb085de8dcc06f SHA512 f0a085f6e20c4f486c0a06b802030c285cf0ee5af593b4d17ae4e05a27fa63afc7e202b8a170113add4a4af82af95af0a69d01e0abf46cb8dbf5b7e136807b6b
diff --git a/dev-java/jamon/jamon-2.81.ebuild b/dev-java/jamon/jamon-2.81.ebuild
index e506a3e9809c..32622058bb3a 100644
--- a/dev-java/jamon/jamon-2.81.ebuild
+++ b/dev-java/jamon/jamon-2.81.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -18,6 +18,7 @@ LICENSE="BSD"
SLOT="2"
KEYWORDS="~amd64 ~x86"
IUSE="test"
+RESTRICT="!test? ( test )"
CDEPEND="dev-java/log4j:0
java-virtuals/interceptor-api:0
diff --git a/dev-java/jamvm/Manifest b/dev-java/jamvm/Manifest
index 64450cad29c2..64cfb467cf08 100644
--- a/dev-java/jamvm/Manifest
+++ b/dev-java/jamvm/Manifest
@@ -3,5 +3,5 @@ AUX jamvm-2.0.0-env.file 544 BLAKE2B 25197538a4c10d6ae1b0038113c094cdbca9a1a22b2
AUX jamvm-2.0.0-javac.in 1739 BLAKE2B ff167bfba594dbfb71dd1d09e41ce502ebfcc598fbcef0794cb967c00894745f8b16412adc7b4afbd167878defa29351e99b30a71b4377987c5c8a692f404e30 SHA512 65170b747012e114b072cd28a688089cdf2f54ddd151ba0cea92241b9b75fd0c7c410bfa4186cf9d233af4328bf962e13e8838a0cc09a1fbf2c28d29b13e36cb
AUX jamvm-2.0.0-noexecstack.patch 1387 BLAKE2B afd020772bf627c3dbd6b5da9e03d3b03e8f5c9dc3844279fe325183819cb11deadaedb4920ebfb0c6b25321daeee9f0e4fff45addd162e2b6c02e3f3ea12d31 SHA512 17c38ad0017e5659295dea7ed57f263eb0eee673bbc1f5d1e44e0c8fe588f4172a8a05c832a1fd41f3dc094779fade66aa710c8ce48c754412b0b6afdea6551a
DIST jamvm-2.0.0.tar.gz 741459 BLAKE2B 9b8b0f8cfd8f56c0b835144c07aaca709ef466fdfe5df18438d05c66cd8a07fecfebf27e1581c67658feb3674a96c2e916b85f13dc434baf2db9be4e4fbfd0cf SHA512 8ac27787ee94fa8fde962635d3c08d1dc1e5244c9d56bb693e73f3fd9b58e944ad3f7a0127afeed727d7c00d904a775d2c483157f5ac87e7eab6ecade1aad21d
-EBUILD jamvm-2.0.0-r1.ebuild 3701 BLAKE2B 22026d1c5487c76207fe309aad02dedece43e952f4d1324e34ce54ef855309aa2dc988be0b95d9ccaa5bd4eb562fb222e24ed8e0d70d797d75fc1b45601dd995 SHA512 96967a52414796749f5bce41695d8db746d2bbe720c968c15a3db6977d9b2ac4a72de508a2512457d04a9326af5d9cb2ceecd707427a845a17a651e39a4d07d9
+EBUILD jamvm-2.0.0-r1.ebuild 3687 BLAKE2B b7fedfd711f672023a3a5428ab6f3d5d9358368daeeb0ba2a0604be3b2aa650befb8c8c84505932a9fa56009f2a76625ad66bc90e85adac1ae9c3f6317873cfa SHA512 a7ee77a0ea283a5e76859f897e775815921734a11e309fc7591ba9772c07bef01ff374e9b5dc870b246c0af04c2e034e3b5b70417ec5451796c7a0a0af1ab8d4
MISC metadata.xml 311 BLAKE2B f89901d2404c3d1004a7b53345d8e533059995634d1109f620d6685de9defd6126dc1e619f8c8ba0d8f53d57a1d7b1f2f51b0f93fc12b1afb179385b30b4d514 SHA512 3c73e7134e8adf35e0a1418dfcb0215082b5cfc7e3baabc11d89fb1044996a382c551309e5c04dbc54257a65173384b690ad951ceaec2b8569d89bb8a5e757ee
diff --git a/dev-java/jamvm/jamvm-2.0.0-r1.ebuild b/dev-java/jamvm/jamvm-2.0.0-r1.ebuild
index b418c899262f..457e883de306 100644
--- a/dev-java/jamvm/jamvm-2.0.0-r1.ebuild
+++ b/dev-java/jamvm/jamvm-2.0.0-r1.ebuild
@@ -86,10 +86,10 @@ src_install() {
dosym /usr/bin/jamvm ${JDK_DIR}/bin/java
for files in ${CLASSPATH_DIR}/g*; do
if [ $files = "${CLASSPATH_DIR}/bin/gjdoc" ] ; then
- dosym $files ${JDK_DIR}/bin/javadoc || die
+ dosym $files ${JDK_DIR}/bin/javadoc
else
dosym $files \
- ${JDK_DIR}/bin/$(echo $files|sed "s#$(dirname $files)/g##") || die
+ ${JDK_DIR}/bin/$(echo $files|sed "s#$(dirname $files)/g##")
fi
done
diff --git a/dev-java/java-config/Manifest b/dev-java/java-config/Manifest
index 43695b19b429..9a2e163a8a9f 100644
--- a/dev-java/java-config/Manifest
+++ b/dev-java/java-config/Manifest
@@ -1,4 +1,4 @@
AUX java-config-2.2.0-prefix.patch 653 BLAKE2B 837f741e45b8228944e6287a57b05e933d85db00375ea68690e32b101da45b8150bcc6665d1d03ed6836724bbe43c4bfe1e89fb9449723fb4532dca4f4dcf01a SHA512 591591828ddadf76b5ed65811f7ed9e1e60583c5575926edf175ebc7ed1d76562ec980ec3bb530dedc7626f841dc7d143383bad25303399eac2ad49328d63dc0
DIST java-config-2.2.0.tar.bz2 51851 BLAKE2B 7b7c15dc988d2f5f54ebacba224f57193577e24f99a798657b40d83d723280562e314ba71319958a83be44defc6a48ac1114cce37eaeddea025ea31f26cf331a SHA512 a491cfe86bde8afadfc5b875740d79f9077526d8650ffb034fdad67a7ffa1b02646f67b1ef0eab7b0fe3ae57b5d767fa6a0d5593fe07416993d60588a8ed595a
-EBUILD java-config-2.2.0-r4.ebuild 977 BLAKE2B 5c84e00e02608c0402f7c0aab63f3a4d580027cda0723e4c34a44b66c5ab37b0c95668302ecc94e26859abbdbab8a49266a292620eeff3290a71306510897cf9 SHA512 be2f4b043634cc9b0b80678e798e90075fcc0bc621e0c688efa31fd78bc4c73b064be225857e84d4b75f0090fa42f31701f3ba2a3c0973d8c661bd1fabfd80de
+EBUILD java-config-2.2.0-r4.ebuild 1004 BLAKE2B 855263e897311a546388a71402a17b6bc69f48c6af31c007c6a5d0a375ae7c2f103951131a83b6b8776f84277acf57d5674d2313323afbf7feea26159b0878d9 SHA512 f37af0308756340f205bcff424e6e28b2a82813a4f156d92d886bd8968115384aa598aa92a6306ca03540396954e1022172e780a1b4f822386d8c6d0870324d3
MISC metadata.xml 560 BLAKE2B a2cc44cb88cb8e0b80ef1fb56ed610fc10257a0858725fc01f793ae9275fc5ef6e37708c377ccf56425c08eacceea6e52a84eee35a7b2c239484080b6203c4d7 SHA512 9bd085048548f98faa638b23333ee0cf83b870c962b1aba62fa2df897393ce37c2b2e60736c988230252f29fc42e9dbe58ab8e720f7ec05a3e0b3d4c999e2c8a
diff --git a/dev-java/java-config/java-config-2.2.0-r4.ebuild b/dev-java/java-config/java-config-2.2.0-r4.ebuild
index 5ab370d88996..f84cdf1be071 100644
--- a/dev-java/java-config/java-config-2.2.0-r4.ebuild
+++ b/dev-java/java-config/java-config-2.2.0-r4.ebuild
@@ -16,6 +16,7 @@ LICENSE="GPL-2"
SLOT="2"
KEYWORDS="amd64 ~arm arm64 ppc64 x86"
IUSE="test"
+RESTRICT="!test? ( test )"
DEPEND="test? ( sys-apps/portage[${PYTHON_USEDEP}] )"
diff --git a/dev-java/java-getopt/Manifest b/dev-java/java-getopt/Manifest
index 1574036b21ef..abe3377e296d 100644
--- a/dev-java/java-getopt/Manifest
+++ b/dev-java/java-getopt/Manifest
@@ -1,3 +1,3 @@
DIST java-getopt-1.0.14.tar.gz 45561 BLAKE2B d82234c2e49f6f556ddabd38cd283a63c2f6365ed23c227c42c48c75d834ce7de6a3fdc84c890762f05a63d4e09bab7e584f1cb9d17ef0a4784cd36c62f3128e SHA512 611a08b60ed787eaa1bf6bf6ce45075ed2bd75d7eead941879e019ef12cb4fcd7a196d0e64e9a75adaf35240c872f14590d7afa4e2dda03016fa970bd2e2dc25
-EBUILD java-getopt-1.0.14.ebuild 862 BLAKE2B f84c185cbe343483e770700b9dd783fd2dffde9ceae47079009030249145bf73ff8012869309eac9b16a4b092b5fa22230d350eb73a75ad8c660a5a78c221dc8 SHA512 132efc32f672e5e5f0c0404016f64a64fcab479e23284d44f919597f06aeeec8ac77b315820c97034d58dfc66e480a2c30e59932dd3058273bdf0ae4421d7d7e
+EBUILD java-getopt-1.0.14.ebuild 855 BLAKE2B 0164b1d9246fd44fee54d261b29298d72834e7895339a6dbfa4ea06b5321f21596d47cc9482408d484bcf35936a51a63f087d481885d20ae46dc17bb1f5652df SHA512 2aa44137ac2a3f7ee408f604e8d6d4def49c1de64e5d14111d2271deb2e0084a83ef977d706f9cf2d1ba6a06f6e73d056b1e5437a85ba8c8c1dc8b0e46614231
MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/java-getopt/java-getopt-1.0.14.ebuild b/dev-java/java-getopt/java-getopt-1.0.14.ebuild
index a7baab751965..ed3d17cc0682 100644
--- a/dev-java/java-getopt/java-getopt-1.0.14.ebuild
+++ b/dev-java/java-getopt/java-getopt-1.0.14.ebuild
@@ -27,7 +27,7 @@ java_prepare() {
src_install() {
java-pkg_dojar build/lib/gnu.getopt.jar
- dodoc gnu/getopt/COPYING.LIB gnu/getopt/ChangeLog gnu/getopt/README || die
+ dodoc gnu/getopt/COPYING.LIB gnu/getopt/ChangeLog gnu/getopt/README
use doc && java-pkg_dojavadoc build/api
use source && java-pkg_dosrc gnu
}
diff --git a/dev-java/java-service-wrapper/Manifest b/dev-java/java-service-wrapper/Manifest
index c2bb2ef86f00..2224bf164d27 100644
--- a/dev-java/java-service-wrapper/Manifest
+++ b/dev-java/java-service-wrapper/Manifest
@@ -2,5 +2,5 @@ AUX java-service-wrapper-3.5.25-as-needed.patch 6957 BLAKE2B 9e6aa50657ad0833ea4
AUX java-service-wrapper-3.5.25-gentoo-wrapper-defaults.patch 1256 BLAKE2B d1da7d6f8f195d690d687f4d1f48f302b45dd2a12612c75fcce5fae3881469a1dd237baedef5846861deb4c8c697633de3b24598f62ca650deb339f6f2dbb219 SHA512 907f07bcf3debd45d07639ea8b60c21be1190cb7939b28c05eaebdd8713e818402d8da9722be09a7d20fb5598a44d0682bb32a6897b97ef7faf2bd74ca9f8824
AUX java-service-wrapper-3.5.25-testsuite.patch 463 BLAKE2B aa5f7e4e298265afd227d2eb0edede37650bb8dfa1c7a8e9a18109f34eabfb5ddc7b9db67c2922403b0448997cc96d8e83c96b62974b25da22a624d91dc500cf SHA512 c058363d17e0594ccce355183358d016acf8ec06dd88ff3dc3b360d143cd56fd1a70b5d7d9f5bf774451ea0eed5a78752c8b3fcc32422a1a97d52eb43e057e91
DIST wrapper_3.5.25_src.tar.gz 556678 BLAKE2B bead95eb2feebe0c22f8c66ca948185c320a979e498fb5156de576d443ba6e3375efb6244a66db6af101fa7dc459d983b51631fc237ad4578505be47059cf2c7 SHA512 4ce8ab5dc7acc4d78e7b902a61bb1e3785b5455f81438aa61a877107647e88ade595075ff0b8d5db0ff2b33bb94d70c2b1331561d6d282e497998eea9494c6f4
-EBUILD java-service-wrapper-3.5.25-r1.ebuild 1435 BLAKE2B 370ff8bc3bf0507327ab66044ae4c53f32e0ed2449edf01411f2051e66361af61d0497e05cf0acef07ad073f20b46090d935ae14a0bc8ba895f3463c8ab65962 SHA512 6403872649e5e0558e3837d9c91bcb12ed7073214730dcbb75a65a69e8303180a16e7d43aef06bb88d7ce3097b1ec399820d60bd34782320d79d0f0d8fbcaa21
+EBUILD java-service-wrapper-3.5.25-r1.ebuild 1421 BLAKE2B 815e5300a102e50be7ad3119a777d0f919928b9600e70fbc52fae94c763916733bbc581d2b05320c85af468660c504775c154cfba12bb6aacfa683a7d69b2fe2 SHA512 f0b2fb500ec37633e06887d46a8b4f166bd30b5032a1281f76976075d0a8555643135cfa7c949d186f0f7fee8ce1802905120a52dd281d32aecd4cdaea6785f3
MISC metadata.xml 639 BLAKE2B 835791890bc6ee84347d2fd82601698b2c1c516b46971df7b567f2000b41ed065bc3bcf3fafb1a97a15ae6ef3c37397580079de48ca56523779f055a99eea8d6 SHA512 4df27ebd9d7503edc1c62e311dbf564bb991963820753df523459baf8e0d65e7464e6b42dbbe1ee6649791c66dae552991eed3cfa1e8e2d100ffe512a8e0df6f
diff --git a/dev-java/java-service-wrapper/java-service-wrapper-3.5.25-r1.ebuild b/dev-java/java-service-wrapper/java-service-wrapper-3.5.25-r1.ebuild
index 661ff4893720..2261beb2f119 100644
--- a/dev-java/java-service-wrapper/java-service-wrapper-3.5.25-r1.ebuild
+++ b/dev-java/java-service-wrapper/java-service-wrapper-3.5.25-r1.ebuild
@@ -61,8 +61,8 @@ src_install() {
java-pkg_doso lib/libwrapper.so
dobin bin/wrapper
- dodoc README*.txt || die
- dodoc doc/revisions.txt || die
+ dodoc README*.txt
+ dodoc doc/revisions.txt
use doc && java-pkg_dojavadoc api
use source && java-pkg_dosrc src/java/*
diff --git a/dev-java/javassist/Manifest b/dev-java/javassist/Manifest
index e89945661460..4f3014f460f1 100644
--- a/dev-java/javassist/Manifest
+++ b/dev-java/javassist/Manifest
@@ -1,5 +1,5 @@
DIST javassist-2.6.zip 1143271 BLAKE2B 05f4e5ebc47420054d4c3d2f77cde33b92e616f3c6740fc030e69b90a697bfbb67be300375d9efc1929a2acfe3493f427222f8a7b1e3137d8bc42f749e51f840 SHA512 8a6da5e2a44cc3bc5b87538a4eda56808d13998d8c9932153f9bb42a1c7844d1a1c7311eb22b0b4ad04649bb7c22156acf851bee638cffbd3328bcef1d2a9f37
DIST javassist-3.18.2.tar.gz 1179428 BLAKE2B cc7dfebca2e47576f902e6249c1efb65c18823e75ba3698c2d94541bdc910b9b7547e8619c1f19a84c158771230ddd112ddb0445ed97cd64810beacf3468a1ba SHA512 67f22a70584eba31088d63b7862f0f7872a6a7ec57f4397b95044695af75be005e86aa5a5f20fe8e650c2178a9b63b4b922accf940b46ceb1c8e7ce9c51798ca
EBUILD javassist-2.6-r2.ebuild 756 BLAKE2B 42f0ab587abaa592c82da66bca499abca1c726ed39b9588a8cdfe3a74c78a8d1c30982aaaa8c754af53c9728e0f341b4c4ec7b189249ac161ae63bd220c6a738 SHA512 58373704cb574b16a6bae4c2a1788c565fdfc83eaa6774a21f6dcae1814fd0be1c9306209b08d8aec801e5d4e34ef6a0f190cfa6ff410515230ef626c439c50f
-EBUILD javassist-3.18.2.ebuild 978 BLAKE2B ab7462cb7e09179b4ccf61bce4cb9b17188d72a00413777e6d1e0f724919a301bf6c1cd3c673040fa278c65492b101938b7cf9e7d300b7a7d24fe33ec9686d8d SHA512 c6cbd4ce4f9fb179a49a7d2f18bd9f8fc06b66b2ba7d0a3631d681d1802b71d20c54e0e07b4ce47bfb9687afc37afab1c5d03bc8ebc985405423f906495d9f1b
+EBUILD javassist-3.18.2.ebuild 971 BLAKE2B 661a130dd6945499104fc8538e041dee22708b5286b6e0ceb24fe1a4e98495bce832c040c69890bc5d03e19cd3470f06fcb1c8fa72f69f5fef6435eae4e23e6c SHA512 233566ebfc48c0d425f2b7a9ff01f1cea115c852a9386c7a5a0493fff14b6d37188ae853b523fac70509194f713ecb2cd216f1f26eecfd58ca0220f272051521
MISC metadata.xml 376 BLAKE2B 4f31c9b79818bbba1a766800296ce4cdfa81b1a7f10d4c6cf18b59d99e6e59071552a85ae216f6383b2ed5356f433d029be4ce8e9d6f6575adc60b2dfcb8ee07 SHA512 ebd682e2a4913e15c4c93c7f22c10e8f540fb377f2d90f137291bedd1ed7410b5af36215e94543f6e048803bd4475ee69371ff00255f227c4f2df9432f118ba3
diff --git a/dev-java/javassist/javassist-3.18.2.ebuild b/dev-java/javassist/javassist-3.18.2.ebuild
index 9233b253e3ef..d2f8df82b49d 100644
--- a/dev-java/javassist/javassist-3.18.2.ebuild
+++ b/dev-java/javassist/javassist-3.18.2.ebuild
@@ -32,7 +32,7 @@ java_prepare() {
src_install() {
java-pkg_dojar ${PN}.jar
- dohtml Readme.html || die
+ dohtml Readme.html
use doc && java-pkg_dojavadoc html
use source && java-pkg_dosrc src/main/javassist
use examples && java-pkg_doexamples sample/*
diff --git a/dev-java/javatoolkit/Manifest b/dev-java/javatoolkit/Manifest
index 7081649818fe..4f0ccf10ba47 100644
--- a/dev-java/javatoolkit/Manifest
+++ b/dev-java/javatoolkit/Manifest
@@ -5,6 +5,6 @@ DIST javatoolkit-0.6.1.tar.bz2 26036 BLAKE2B 1e63a848ff5941e34fe5c4d449b5494cb9c
DIST javatoolkit-0.6.2.tar.bz2 26046 BLAKE2B 9e6eec5e055fe63191cdb67b7103c4f27df4569256da0e6231eece55f1d0c32f754b9b4784c2a7f79224404dea41d9583eace8aebab6e1e10bf0cfc875d74591 SHA512 70eede9a700fa8db48fef62116eff2cc89b637991c0691e5385a66ed1830788dff355c6f6d343533e58bd89bf1fbf017d5bcc6867f6d4cf23bd56d5ee857d145
EBUILD javatoolkit-0.3.0-r9.ebuild 888 BLAKE2B 046e65b74a8cf478d6c3bcda668c47be15818c63b95fd32b357b9c4a24d458d8be24a48937d4f4fab6326fe5ac4f649e5571049de74602b7d4a620f82b90c04a SHA512 73692e960858bc62c61aca95f224021552f74298a11667f1e48e0ba514fea47bc2e4118adcbb590b5e5425fda7b20a17d33e4e0ca1c931375a05a3b9fdc46f92
EBUILD javatoolkit-0.6.1.ebuild 834 BLAKE2B 7bac902c01c766fd8925042f8e538db6a36f4c7e5dd2e3473ba45525992d52bb0021b205cd1e999884a5e8c118eebd7af6d94f785fd5d5664cad3149d2ea567e SHA512 37856d129645de18e6ccd9c76c829ae81216685c11e189e039b98a64eae2a350b74294aa3df751f4646901aa87a017640304a4f6f99d1b14482b31d9d0ed5e08
-EBUILD javatoolkit-0.6.2-r1.ebuild 824 BLAKE2B 3dc180218e29cb7ea36aeee2aea9f32958e69153abf0b15b2724d0455d17b2c9c6f9f5ef24b521d790cf7c102eeba15334211e7d66339c18035320913d5ac9e1 SHA512 27a92a13cf4ddd6624f1290d75495d4167e93b2288718ff8f3b2e0d82f72118735a914442cb646851a8ce8852d84131b9a80cd75693421bda24bfe704901e2b6
+EBUILD javatoolkit-0.6.2-r1.ebuild 817 BLAKE2B 493e327ab9d0147d1fa68d04890b9198393e452d00879e552f08f29130b3aabdf379fbd9950e15083bf1a74da527e5202484523581ad197e8e8ccbf61c73e9fb SHA512 a1a4b42b0248164a0d2314f1780077ed8f38f7f59bf4eb0254164cc245a9873f0e4a6819c33a3d85647dacb525837ce546b2b9b8b804e3c08e7bd738bdc41223
EBUILD javatoolkit-9999.ebuild 676 BLAKE2B cd8e02bb65fd37d6eb50e7283dbd74ff9c1a9636056e83069693612c0760858f9f4ea2498545cc860872fbfe704c617068423adc483ed90c9f6386826452d2cd SHA512 56812eb6eceac6151ce6ff573cd7ed2d936a5188c84571bfcbf285d9077fb5dd1219a4938062f238f3d3187c79998deb09b1fa2b7f7fea965dee8a35ebfbcbf4
MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/javatoolkit/javatoolkit-0.6.2-r1.ebuild b/dev-java/javatoolkit/javatoolkit-0.6.2-r1.ebuild
index dc16dbce00e7..296071a0736c 100644
--- a/dev-java/javatoolkit/javatoolkit-0.6.2-r1.ebuild
+++ b/dev-java/javatoolkit/javatoolkit-0.6.2-r1.ebuild
@@ -3,10 +3,10 @@
EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} )
PYTHON_REQ_USE="xml(+)"
-inherit distutils-r1 multilib prefix
+inherit distutils-r1 prefix
DESCRIPTION="Collection of Gentoo-specific tools for Java"
HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Java"
diff --git a/dev-java/jdbc-postgresql/Manifest b/dev-java/jdbc-postgresql/Manifest
index 2ae5e3906ad2..951f91f47be7 100644
--- a/dev-java/jdbc-postgresql/Manifest
+++ b/dev-java/jdbc-postgresql/Manifest
@@ -5,9 +5,9 @@ DIST postgresql-jdbc-9.2-1004.src.tar.gz 1842921 BLAKE2B 4cf0cb6da5749a9da194b91
DIST postgresql-jdbc-9.3-1100.src.tar.gz 1852465 BLAKE2B a81f385ff23679a1e6b268b53ea72dda744c50d043d02fe50a88421c43561a8fc63c849a974e84e1f1caa93ab20c01cc58cc9abe96f5567f5ac626263f402126 SHA512 43968a62f9443739721016ede186b2f41fa6db2d1ef319cd65059f8715e90eda7c7f568995b293578c39e04d43085cfdfece587500f99ed1a49964c12d8c747a
DIST postgresql-jdbc-9.4-1205.src.tar.gz 2028968 BLAKE2B d4f55bc7c173795202f9eed58a67effba747b56f8dc5aaeeb2941532b3d0ce3f66ed113c38af9c2c40998191fd15d2828d05a1b693eb13a78a3d39b9fe6667b5 SHA512 ebb46c0cfcabc34083e6f481bc97536fba98d082462670d39efdd75e6463f1286db6fa07cd35546c749e456f1c06fb1d022cbc9f5cace2a1b968fab76a57d281
DIST postgresql-jdbc-9.4-1206.src.tar.gz 2029837 BLAKE2B b222a0b2f8f99becaf0ae350407fafeb23d9d4bdb130c17996373b4211e0d56d1a76bc5737401dc6fc6618d2a891943d096b0f60f0770ff6ce859ade3e7a178d SHA512 b16816f1afd3ee5986fca197bd7608c2e2f334054e41a8c541c47985827f4f59d7691d23983bdac01c85fc364cd001c991ac6b4e8567429b9d1f4161388dd6bd
-EBUILD jdbc-postgresql-9.2_p1003.ebuild 1954 BLAKE2B 8e10a598948bfd92c0fbbf7baab34c4987fe77bca32852353c8e477cc290f0b7fb9c538da6f488a857b9085d2da86a3a35e7000ee845f30b48cc65a5fe6ddb51 SHA512 760f4705c00ac28155f1f36802dacc6e700aa55fbe5fcc753f5bc46b7847324a20c002670c8544a384ee2f98f70c4495253e5245d7d7773a8937db5eb142f9d6
-EBUILD jdbc-postgresql-9.2_p1004.ebuild 1957 BLAKE2B 6c9ca6191a38cac848393a98a23ad0bdeed90f139410abf5c8503ede4fca407af90b1a91a2fff8f91792117e1db8bb7d39a40c51a908fe6b51c4c60a6a0f9448 SHA512 c5a6ec3669bff3bc9e16c3c2ff472a6ba743cc78fc682d7f3d79c59f4db3569691d2baaaa906638c37118f945f6c3883a4753efeda00bc01bac6a21a0005fe54
-EBUILD jdbc-postgresql-9.3_p1100.ebuild 1957 BLAKE2B 6c9ca6191a38cac848393a98a23ad0bdeed90f139410abf5c8503ede4fca407af90b1a91a2fff8f91792117e1db8bb7d39a40c51a908fe6b51c4c60a6a0f9448 SHA512 c5a6ec3669bff3bc9e16c3c2ff472a6ba743cc78fc682d7f3d79c59f4db3569691d2baaaa906638c37118f945f6c3883a4753efeda00bc01bac6a21a0005fe54
+EBUILD jdbc-postgresql-9.2_p1003.ebuild 1978 BLAKE2B 16e40127eb5113a26752cb5d1cf2fa3fe2894dca80ebaf892fd61793622b89f44aee644b238e9b4e643ec7abb6d7056bbbd9082bb409dc14c193dd7f92e47a52 SHA512 38cba94f33f11c6c22b68cd759e7514f1013a4c247f489e8239f3eed56051b8295604a5bfeaefe76a5aca6226cba32c4033b6761c5efcc1632cb20714218d8d8
+EBUILD jdbc-postgresql-9.2_p1004.ebuild 1981 BLAKE2B 2ccb65c367ac2e25fc03dc69d85e403482ce409352b3aa4b1218ef7849b121b3e989bc0d4029c7129a0fa2ec90731bcb81f3a2a5e8c6a135ab369290bfd188d0 SHA512 d010e27b8d0f51fe5802116e2c27f97940d94228b16e5b4a118f0293008db55b0650cb1aedb3b3097cdca2101d7fddfc62bf3b87ede36e655491018948145f12
+EBUILD jdbc-postgresql-9.3_p1100.ebuild 1981 BLAKE2B 2ccb65c367ac2e25fc03dc69d85e403482ce409352b3aa4b1218ef7849b121b3e989bc0d4029c7129a0fa2ec90731bcb81f3a2a5e8c6a135ab369290bfd188d0 SHA512 d010e27b8d0f51fe5802116e2c27f97940d94228b16e5b4a118f0293008db55b0650cb1aedb3b3097cdca2101d7fddfc62bf3b87ede36e655491018948145f12
EBUILD jdbc-postgresql-9.4_p1205.ebuild 3127 BLAKE2B becf3c1a4b1b487f6d98e1488271767e9ef93a34d5c2f5f53e6276692f5a72bbe88314f2f8d0730c3e29299495e0639afd82ebbd1ec3bf0478d3ddd185ee17aa SHA512 74098a2f42506e87d322d11912aebf5d434887775c484c017142daf04c74df91541915858bbbeb4c76418999f76f30c74113ca3f83dc3d7fdd49dee9cd9a20e8
EBUILD jdbc-postgresql-9.4_p1206.ebuild 3124 BLAKE2B 6a55d4555ebd5eb675ca261d893496319dc9399621f9e5457dc3e176270adac3a760cc31999399827f2c76d0b13ae09079b023de8ce7274270e2010bc110b585 SHA512 4e686cf33aa5933556ccc19ae4b059aa58dec11036991d5dd944c7c1262c7c41cf78944cc2e0ce8a94ae22255c9d871fc9ded491b9727d3dc707e4d675d40cc5
MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/jdbc-postgresql/jdbc-postgresql-9.2_p1003.ebuild b/dev-java/jdbc-postgresql/jdbc-postgresql-9.2_p1003.ebuild
index 276db9dd4d51..49c60a72aeab 100644
--- a/dev-java/jdbc-postgresql/jdbc-postgresql-9.2_p1003.ebuild
+++ b/dev-java/jdbc-postgresql/jdbc-postgresql-9.2_p1003.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -19,6 +19,7 @@ LICENSE="POSTGRESQL"
SLOT="0"
KEYWORDS="amd64 ppc64 x86"
IUSE="test"
+RESTRICT="!test? ( test )"
DEPEND="
>=virtual/jdk-1.6
diff --git a/dev-java/jdbc-postgresql/jdbc-postgresql-9.2_p1004.ebuild b/dev-java/jdbc-postgresql/jdbc-postgresql-9.2_p1004.ebuild
index 85728f172373..e5cff42377a1 100644
--- a/dev-java/jdbc-postgresql/jdbc-postgresql-9.2_p1004.ebuild
+++ b/dev-java/jdbc-postgresql/jdbc-postgresql-9.2_p1004.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -19,6 +19,7 @@ LICENSE="POSTGRESQL"
SLOT="0"
KEYWORDS="~amd64 ~ppc64 ~x86"
IUSE="test"
+RESTRICT="!test? ( test )"
DEPEND="
>=virtual/jdk-1.6
diff --git a/dev-java/jdbc-postgresql/jdbc-postgresql-9.3_p1100.ebuild b/dev-java/jdbc-postgresql/jdbc-postgresql-9.3_p1100.ebuild
index 85728f172373..e5cff42377a1 100644
--- a/dev-java/jdbc-postgresql/jdbc-postgresql-9.3_p1100.ebuild
+++ b/dev-java/jdbc-postgresql/jdbc-postgresql-9.3_p1100.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -19,6 +19,7 @@ LICENSE="POSTGRESQL"
SLOT="0"
KEYWORDS="~amd64 ~ppc64 ~x86"
IUSE="test"
+RESTRICT="!test? ( test )"
DEPEND="
>=virtual/jdk-1.6
diff --git a/dev-java/jdepend/Manifest b/dev-java/jdepend/Manifest
index f3e645be52ab..f80ad51598f8 100644
--- a/dev-java/jdepend/Manifest
+++ b/dev-java/jdepend/Manifest
@@ -1,3 +1,3 @@
DIST jdepend-2.9.zip 302836 BLAKE2B dcf3b9c37037926d3792932327ddeb1e95fbbc47beaffb2197653b32bb919a0f3bb4d80c3b32d8e8d83f58e3c216ae5ae6e7ad923971adb460ef0d7fd6036149 SHA512 93ae1ca82422be0dce9794f25ad98c078da7437bca59c697405806a462f81b52028e0536075e2a2f428d8f8c5a27ae50fa7a580b75edbd4e8c9c750315b1c919
-EBUILD jdepend-2.9-r5.ebuild 867 BLAKE2B 4746955577691bea512a8e5294e14769b85d522342f4220a4bccd8589da1b81876cfa0d493906057360dae73355271ffdf62ace15b3e3e7f59dcd2578a344d2a SHA512 5ee63dee5b8a989c727dfea01f0c8306a8d61cf49a4702b71b4f6827f2595d0eaae39be518b5fbd217e14369e16bc5acfeecc1b707520087bcbba48029b5b980
+EBUILD jdepend-2.9-r5.ebuild 853 BLAKE2B 83db23fa74a375343fc1cf1b0db350cd2d914c33f48a2208847c85b6afee8f0f654a6798dbc4a3b48c4b850e4540c63e99858dd9e33151c041d2733ddaa22ec0 SHA512 dcbd387e0db1d3d85dcbfd0a01fe7d3b97522a2e6a2811a1354c93987fadc69fb6c0a37301664272b94e03134a415903dd89c27008efc67c5a420598ef65367b
MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/jdepend/jdepend-2.9-r5.ebuild b/dev-java/jdepend/jdepend-2.9-r5.ebuild
index 0874404b4dec..efb4182bddad 100644
--- a/dev-java/jdepend/jdepend-2.9-r5.ebuild
+++ b/dev-java/jdepend/jdepend-2.9-r5.ebuild
@@ -26,8 +26,8 @@ java_prepare() {
src_install() {
java-pkg_newjar dist/jdepend-2.9.jar
- dodoc README || die
- dohtml -r docs/* || die
+ dodoc README
+ dohtml -r docs/*
use doc && java-pkg_dojavadoc build/docs/api
use source && java-pkg_dosrc src/*
}
diff --git a/dev-java/jdom/Manifest b/dev-java/jdom/Manifest
index a1cecfe703cd..2ae27c15ffae 100644
--- a/dev-java/jdom/Manifest
+++ b/dev-java/jdom/Manifest
@@ -1,6 +1,6 @@
AUX build-xml-2.patch 1529 BLAKE2B 37aee7dc0ab5b130c16a67b2470e8e3d4052b73c9cc944fc5f1e6cf5b1c8d57d046260829f7a785a0f7b35240318fc9bbcb28fc10b245981dd36957637084fa3 SHA512 210f0fa113a75a0bb2f34b50e3893df69e5b7f02174f7f10ea981cd16371da515a6c8514c2f82045c3a6a64c5a11874b2f81e5ad975270f11eb8c12fa707f563
DIST JDOM-2.0.6.tar.gz 8344114 BLAKE2B 0b9a568fe4de1fb9afc5a547d75aa1d3556bf497c76e3d32d1ebd7658634ea02e4fafa3c6261b64d9b803fc6e78ae013fb8a366bcbd5024e8ab0aced83f58e33 SHA512 d585b39159f0887485b2e681609b51113de6bc7c43627c42d7e81eb06ac65c507b43cf3d81c5df4399b1e3abf454c8852264a84567940bc5ba0c358eb9c0c4a1
DIST jdom-1.1.3.tar.gz 4233403 BLAKE2B 9e4afacc6f10d2be1d793bd3b9f438f79e8e27f50bcae83eac5054df806c01c211ac493465bcda58ac204e796663ffb8aedf43a177f23c23a69af399243461a0 SHA512 a693fcc0d5c8ab3cf086a7904c7fb711e7deedca542089b84c6d011584e0d889495a58843033bff25272fdf130b1347419e31b9a4650c85ce9dfa19022dc0278
-EBUILD jdom-1.1.3.ebuild 1253 BLAKE2B 7b79acd0573e7b67b9c4fad200cf3e9500575aa452c773f6fa5856a500b62825b31d09d1b80d76df81674a857cd5a57dd6404d2b799aede87bd158bac2d9e66d SHA512 fd7aa96f0eba2719d98a02aa6f3e95528d399c096ada58d3db320f7eb113cca1f2da1754c2a0c653b52cecbd4de9f90ee1bd415616c8bc1204977aba6330c7ec
-EBUILD jdom-2.0.6-r4.ebuild 1358 BLAKE2B a55b3a295f11d855d15cd2ab4f91a0fc8805aa8881cf2f374d970c4b43ef829add955b283ba410202d370c0eb53777f87e943d54868d2ff0c0e327c6160cdf11 SHA512 32aaaca3059544b6aaae40545f3350799efd730cf790d5acb101886b3534f6b21d75df5bfc9e2addb0964cf5466a5f527a0ea127eeab2045b70ebbda9d488b01
+EBUILD jdom-1.1.3.ebuild 1246 BLAKE2B 3ef43cd51122845127dce0d1df9dc6917ed9fddcdc33531ce526cd0ed6084594af4af0bb4ab870e14b44a14b5042277dc2337589b94c6bdb984c7cbc5c7aabff SHA512 5d76371202339ad4de3e1562676b075790c76377642ee3dc0e27c508dfd4389d7c9fb5e40c9449fb7b4e1aea1949d78e7324977a2925ea8dd9ac44cbac0f645d
+EBUILD jdom-2.0.6-r4.ebuild 1382 BLAKE2B 3c600a0e572d247b11bd180987000c5b7694bb1b6fc6fe143497e5522f9f4241ad8f94164e4ae49523834122dcbe69e8c0dfffaf7f32b1804e67f8d1fcf62975 SHA512 2db797004eab417c2d8aea1771a36504c8b2c5eeb960efe80e414cd7f2747e8eea1d487be4d3fef21dd82659e87256c3897c3bb9fbc012cdbc89163e8b28386e
MISC metadata.xml 318 BLAKE2B cbcc3f9c0ce67aa9619d21197006bffc71f6ae3d0707a5bdd3902a0d51f90724f3ce81e21c80f6a011885cd036f397d2cb679335d05a0e1bf7e4bff3470c9019 SHA512 1587f961d80cba775d94e97a9c41516766d6a502f9b144f401ebcd0ee0b21b2e04220730c03a44986af8bc860a0311acdd6e721d4de201defcbc89599df5803b
diff --git a/dev-java/jdom/jdom-1.1.3.ebuild b/dev-java/jdom/jdom-1.1.3.ebuild
index 8fc3d32e45a6..7d7440c09783 100644
--- a/dev-java/jdom/jdom-1.1.3.ebuild
+++ b/dev-java/jdom/jdom-1.1.3.ebuild
@@ -42,7 +42,7 @@ EANT_BUILD_TARGET="package"
src_install() {
java-pkg_dojar build/*.jar
- dodoc CHANGES.txt COMMITTERS.txt README.txt TODO.txt || die
+ dodoc CHANGES.txt COMMITTERS.txt README.txt TODO.txt
use doc && java-pkg_dojavadoc build/apidocs
use examples && java-pkg_doexamples samples
use source && java-pkg_dosrc src/java/org
diff --git a/dev-java/jdom/jdom-2.0.6-r4.ebuild b/dev-java/jdom/jdom-2.0.6-r4.ebuild
index d93a466620b3..518050c95023 100644
--- a/dev-java/jdom/jdom-2.0.6-r4.ebuild
+++ b/dev-java/jdom/jdom-2.0.6-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -15,6 +15,7 @@ LICENSE="Apache-1.1"
SLOT="2"
KEYWORDS="amd64 ppc64 x86"
IUSE="test"
+RESTRICT="!test? ( test )"
CDEPEND="
dev-java/xalan:0
diff --git a/dev-java/jempbox/Manifest b/dev-java/jempbox/Manifest
index 4ba23b14bafb..902b7920795c 100644
--- a/dev-java/jempbox/Manifest
+++ b/dev-java/jempbox/Manifest
@@ -1,8 +1,6 @@
AUX jempbox-1.7.1_maven-build.xml 10502 BLAKE2B 041be81aaf3b81969ad26926a3f2eac7b4655c17b3ba925b6ec2b16ddf49bcf7d87fc32655e3e357f274acc16a052afbc8010c6e0fc06f8e51770d68478e2efd SHA512 230436b03ddd8146f6aca41b26f54c0beba208eed9836aaf12e1326de75f226572e473e28c3d313c49a53266d3a827ee62097a49849d1782c546fe9e8bc1d269
DIST pdfbox-1.7.1-src.zip 9167805 BLAKE2B f9e02d1540eaf7e4bb748906e56887494d81eecc88685fa9d758cb50712a530528573f4a7e5f816b4ff57d664a416b35444517d840c9b37239ec1e2b5a62b5a1 SHA512 8b2af3d8f431626c106e4f6e9e1d59d14abcd58cfdc9553f20c5057eef9f9cfbd0287e14e58e4d34472ad81198eb3f4d0a2fd6e88bd1fa5cbcf01e4befbf77d0
DIST pdfbox-1.8.11-src.zip 11026359 BLAKE2B b3eb1add38e9bd0e5a1fcb116263fdbc372d6adb77132aeb0647a6c5d2c2b735345220f0a5c22caa97d04f78ad6517df388327aaa625677bd8c99d2051329a9c SHA512 05c8e5075379ed5ebb09555b39434dd936fce9dd24445871d24ea7f0f6afa49e74242bf0c9eba2d1a847b505143789b687dd039ca51ce76851132f2f18d434d1
-EBUILD jempbox-1.7.1-r1.ebuild 881 BLAKE2B e03e4cb634e7c50e26578a3bd74c9f54a416cf78c56b006c9a37a17aaefb94f1d0450add7671473a8383bd2196c5fe3599f447a77b7c07d93c977afacc048753 SHA512 9897a716e490a2575deadcff887dd4e24978f971c979ffc5781daf10d8cd1ad5ddf09b96123b7d4b1fed54ba19298d2a86adde72bd3cf91a86a544922255076c
-EBUILD jempbox-1.7.1.ebuild 874 BLAKE2B 28f129024f2e1d52d3120857ae09c24857ab5743a047ff454a575ae2a7c9fb4a043735efa0ece97aaa35e30d46e08dad0d8cbaa3a5ba46dbfd2907f40d0fa534 SHA512 543459515df66a6315938c6a5fb7a9c4dfdbd7ab56de552bb84da1bb6f6ec5aa59dee390e3afb479b477cb79d2e011b9fe1787b16329fd7a283d1f3463d29857
-EBUILD jempbox-1.8.11-r1.ebuild 1018 BLAKE2B a09a44de912031bd41f2aceeac9f45ca7c8ab0f523f4a60e67202051819c14feeb6689d4932608e470000e245a50c75a14dcfbc3ddcf1e1f000df232bfd97257 SHA512 c14263b1c11445af89046acb29b0144a7991a525043e31f60663fd048ac7546a106dc77b705b35fce27cfedb74b0bac34e69d70f6a866f3b486f87ac92b75694
-EBUILD jempbox-1.8.11.ebuild 1017 BLAKE2B 3b08bb9827e2ff319f3885c24defb4456b13c391bbcb97787d7a5f45fed2edb494ec8b1ddf41fbba9f4a47115386d3dd82ea2231cf2915951d6a086ac74e8499 SHA512 7d31ea467b558f892ed798df1dd87bcd4d0f1a8869a3a8655162036bcafc8641c7f797edabffdf3be0d2382e6a96bac8a0d67f7e09dcfacb95f9a4a239081754
+EBUILD jempbox-1.7.1-r1.ebuild 879 BLAKE2B cc8af982e8a9870cc9c5dd18be0d497caefbdc99b65eeeffbfe767f4dfd210eb2708e2a23059c8b9da1762a5fc0dba30de5e7cf410c22ce1f3fe50514531c596 SHA512 de17be28ded6bec6b87500a3a67be02787261208330d7e08548b420ea5e6d0b43177102b54bfacbcb47d0adf599ed38fa03e2070dc2fcc88668f8fd8749150c9
+EBUILD jempbox-1.8.11-r1.ebuild 1041 BLAKE2B 970c1a252a5dd5cb60cb41def4018c851e572088c830b5bd9ee5c5f736dceb8fa7b045c86aaaea730c73599acedee9b25486f26fb68c9b8131690a87a302b62e SHA512 bea46801de76d6b5a9b32f8b1ec8970bda0365834b7042c7e462cd7cf95e4249d9e2d3e8146ab8f5d26e96d420bf5aa911a59dea49dac227796e2b3dd3784aee
MISC metadata.xml 314 BLAKE2B 4b4abd03c1f6ec6ebdacfd3f11f8365a9a867f9a4ad809998242c822dee13b75e35dcb44603c51f4b9f57828f71e0d8b09bfef83c3a9ad01111c2bd9410a1695 SHA512 3b771fec64eb63ed8b1de377745aa069c22e8cae003bf4155729ab8cb5c6a1ed5ca70cb977de152bfc926c2c4f6e94db6efc6498091736e0aa5304675b5019e7
diff --git a/dev-java/jempbox/jempbox-1.7.1-r1.ebuild b/dev-java/jempbox/jempbox-1.7.1-r1.ebuild
index 74126da57f9a..12e0360d573b 100644
--- a/dev-java/jempbox/jempbox-1.7.1-r1.ebuild
+++ b/dev-java/jempbox/jempbox-1.7.1-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/${MY_PN}/${PV}/${MY_PN}-${PV}-src.zip"
LICENSE="BSD"
SLOT="1.7"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
RDEPEND="
diff --git a/dev-java/jempbox/jempbox-1.7.1.ebuild b/dev-java/jempbox/jempbox-1.7.1.ebuild
deleted file mode 100644
index d5f8087253ab..000000000000
--- a/dev-java/jempbox/jempbox-1.7.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2
-
-MY_PN=pdfbox
-
-DESCRIPTION="An open source Java library for parsing font files"
-HOMEPAGE="http://pdfbox.apache.org/"
-SRC_URI="mirror://apache/${MY_PN}/${PV}/${MY_PN}-${PV}-src.zip"
-
-LICENSE="BSD"
-SLOT="1.7"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
- >=virtual/jre-1.5"
-DEPEND="
- >=virtual/jdk-1.5
- app-arch/unzip
- test? ( dev-java/ant-junit:0 )"
-
-S="${WORKDIR}/${MY_PN}-${PV}/${PN}"
-
-java_prepare() {
- cp -v "${FILESDIR}"/${P}_maven-build.xml build.xml || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-
-src_test() {
- java-pkg-2_src_test
-}
-
-src_install() {
- java-pkg_newjar target/${P}.jar ${PN}.jar
-
- use doc && java-pkg_dojavadoc target/site/apidocs
- use source && java-pkg_dosrc src/main/java/org
-}
diff --git a/dev-java/jempbox/jempbox-1.8.11-r1.ebuild b/dev-java/jempbox/jempbox-1.8.11-r1.ebuild
index 65c154444a2f..47984f37aa4d 100644
--- a/dev-java/jempbox/jempbox-1.8.11-r1.ebuild
+++ b/dev-java/jempbox/jempbox-1.8.11-r1.ebuild
@@ -15,8 +15,9 @@ HOMEPAGE="https://pdfbox.apache.org/"
SRC_URI="mirror://apache/${MY_PN}/${PV}/${MY_P}-src.zip"
LICENSE="Apache-2.0"
SLOT="1.8"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ppc64 x86"
IUSE="test"
+RESTRICT="!test? ( test )"
RDEPEND=">=virtual/jre-1.8"
diff --git a/dev-java/jempbox/jempbox-1.8.11.ebuild b/dev-java/jempbox/jempbox-1.8.11.ebuild
deleted file mode 100644
index 7653bdb73e99..000000000000
--- a/dev-java/jempbox/jempbox-1.8.11.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_PN="pdfbox"
-MY_P="${MY_PN}-${PV}"
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="An open source Java library for working with XMP metadata"
-HOMEPAGE="http://pdfbox.apache.org/"
-SRC_URI="mirror://apache/${MY_PN}/${PV}/${MY_P}-src.zip"
-LICENSE="Apache-2.0"
-SLOT="1.8"
-KEYWORDS="amd64 ~arm64 ppc64 x86"
-IUSE="test"
-
-RDEPEND=">=virtual/jre-1.6"
-
-DEPEND=">=virtual/jdk-1.6
- app-arch/unzip
- test? ( dev-java/junit:4 )"
-
-S="${WORKDIR}/${MY_P}/${PN}"
-JAVA_SRC_DIR="src/main/java"
-
-src_install() {
- java-pkg-simple_src_install
- dodoc README.txt
-}
-
-src_test() {
- local DIR=src/test/java
- local CP="${DIR}:${PN}.jar:$(java-pkg_getjars junit-4)"
- local TESTS=$(find ${DIR} -name "*Test.java")
- TESTS="${TESTS//src\/test\/java\/}"
- TESTS="${TESTS//.java}"
- TESTS="${TESTS//\//.}"
-
- ejavac -cp "${CP}" -d ${DIR} $(find ${DIR} -name "*.java")
- ejunit4 -classpath "${CP}" ${TESTS}
-}
diff --git a/dev-java/jettison/Manifest b/dev-java/jettison/Manifest
index 9b7c69b2c05f..1563bbd4d260 100644
--- a/dev-java/jettison/Manifest
+++ b/dev-java/jettison/Manifest
@@ -1,3 +1,3 @@
DIST jettison-1.3.7.tar.gz 63200 BLAKE2B b33f53a1605b0fa4acd0204602193e4fb7a994c777accf2e64dd77f865501be648aff0d3293730348b9f0c2812c39e74c776adc20780bb902e6f75a538a764a2 SHA512 c669d0c1c4605c683d1d726ea7eea0f0079cd5fdddc40f4bc4e08b20b7ef7df414f4b2265fd91e1c34e30809c78f9e8690382c51a1ba6653a6fd688b22c07cd4
-EBUILD jettison-1.3.7.ebuild 942 BLAKE2B 2576951d9de8e864935b877396bb69803ac020347e477e907beca9d46508b821d8f7c504e472e2b8ae0e9d7275ccfd8d13d7899c6457c6573d6d28c5e7b7af6f SHA512 09604f1cad60d54a76e01d6a8fcb601cd47ae4d42fd28c721af30917c34929ac5e5d148852da9284757cda4224be2193d8fbccf9bc732e9a0baa6bd67b634cf1
+EBUILD jettison-1.3.7.ebuild 966 BLAKE2B fae138b34ef078f879bc8bce2f835ab1f23af9414e6aa4a4ecad1ae9683c8bdcfd9dbe15161b08fa3b63e2418c472139545ffd5dc843a5698bbcfbaead9b6a62 SHA512 48ab640617fef0715e15e35b1e87d9df42d6defeb3b4045c70c92272754ec54a54838e932ea1dd1c5b83080bf2e1a43bfb46de5487b13214af111ab5c7a0d721
MISC metadata.xml 607 BLAKE2B 39b24dd0be0b0264413e3b4ca99b7e1989d36004b289f3f243d1fc69894e47ac61340ea521acc9061c5bac7862f08b4e9dd2b1f6857e4ddea4884d73b4787e74 SHA512 1dc350358996542f846e7d41e4348efba367610a1905c0f40992b2cf9eaeccab077eabc7f11cd38730579e4bcbd8f32630c825c79a1214d77153c65f81c2337c
diff --git a/dev-java/jettison/jettison-1.3.7.ebuild b/dev-java/jettison/jettison-1.3.7.ebuild
index c02d303d2230..ec0bb15ebbab 100644
--- a/dev-java/jettison/jettison-1.3.7.ebuild
+++ b/dev-java/jettison/jettison-1.3.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -13,6 +13,7 @@ LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
IUSE="test"
+RESTRICT="!test? ( test )"
RDEPEND=">=virtual/jre-1.6"
diff --git a/dev-java/jflex/Manifest b/dev-java/jflex/Manifest
index b7cfa080e716..22229c7adbe4 100644
--- a/dev-java/jflex/Manifest
+++ b/dev-java/jflex/Manifest
@@ -1,4 +1,4 @@
AUX icedtea-arm.patch 710 BLAKE2B dc479f8db4f1188ecb63708700d1ef0905590aba6b552b573c9fc05027e195d2dc1143542ca1998a5a6feac53af4ef64326da3f746f8aff1149b0bb01a3793a9 SHA512 9ebf22f2771672bb9ef28fcb7eff0d907e9fe4466b18b3ec3915b27caa2edb07934a47311abf41fbe124b484cccbb19ca68f69acd5bd76e46a49b029dbf275b6
DIST jflex-1.6.1.tar.gz 3027791 BLAKE2B 4262f75c16a847314db8cb175901658ff6b424469e66523b41564179fa30f0e64bcf2d7ad0e06ad918336e5a41e166a74d55f19f7451662d19fbcaa29f716dce SHA512 436840c90d906042205d27e1d3c56dec724bf62cc3d8c8d3445f217af0a50c9ca2bb56ed91f0cd3c37a930f7ca22f4cc50e8c28dbe905f02adf695c8e96fb07b
-EBUILD jflex-1.6.1.ebuild 3532 BLAKE2B 856a902a68a9b26d92e2eeba080ab3bf52eb8e3ef4fe125505df2d6351807d40d90a7571c91aae52eb6c8b0cd0f69d3fea9ddd69405c485bebe924762c18ee7d SHA512 d4d38d66b90fb7b2e45a2a20be5434472e9accc92751e6e08b00a62377214ae4c7063ac2def81ce9e827adf15687d7192286d1a4e45806c3088b584f09473e0b
+EBUILD jflex-1.6.1.ebuild 3559 BLAKE2B cb64c186c540b03a3fe3f9dde699ca72f6df0cbc12e6043f2884908c3877fb3d9de918b3bf36acea532b0c07e2468d97ba2d5485661923bd5226fdb310c59aa0 SHA512 7362361d75e0ab5ce0db6ebd14429d326fa415ef9bb105735ae04fad9a4fddbce87da6887ba69860b1722d55d2d81feecf938d9e6da0f074f7e4eb2e2655155f
MISC metadata.xml 365 BLAKE2B 59ac73e145626ce1448d4edef5ad2b115fcf762d368131b3b59438e3d21a8f4aaee0d56723a3c79539b7806caa8c456acf0554ce22333b097caf9f3f07dc8014 SHA512 cb20e2901f90975ffa7722c69edbc884b0f6ebc7500636e6ea41668754e8d8dd4732a71774dbb74a7d38240b2fbd6c1941adfc092fe83154e1ee70f6ab89e379
diff --git a/dev-java/jflex/jflex-1.6.1.ebuild b/dev-java/jflex/jflex-1.6.1.ebuild
index 2990735567f4..21a082774ba9 100644
--- a/dev-java/jflex/jflex-1.6.1.ebuild
+++ b/dev-java/jflex/jflex-1.6.1.ebuild
@@ -14,6 +14,7 @@ LICENSE="BSD"
SLOT="0"
KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~ppc-macos ~x64-macos ~x86-macos"
IUSE="examples test vim-syntax"
+RESTRICT="!test? ( test )"
CDEPEND="dev-java/ant-core:0"
diff --git a/dev-java/jgoodies-looks/Manifest b/dev-java/jgoodies-looks/Manifest
index 1c9aa1672d8c..a20bac201d79 100644
--- a/dev-java/jgoodies-looks/Manifest
+++ b/dev-java/jgoodies-looks/Manifest
@@ -5,6 +5,6 @@ DIST jgoodies-looks-2_6_0.zip 2444893 BLAKE2B 97d00131cf07f609141c97e4fd3e6b3c93
DIST looks-1_2_2.zip 1811849 BLAKE2B 47dd516b5523b655757c08ba108b58e7b1e2e113ae4d0e90649db88c4353b66810f9a7b3cc810fe7bdbd5e9c1ad2a32d4b504665d3ffa2917f7a46647f444d09 SHA512 d9c5f0590a44dbc7d778a9da135361f5753eca4d47bef3636f21aa0d014df86dbad90031b5289928b99c352147ea702948028b18b36eb3bc44aef800326fb302
DIST looks-2_3_1.zip 2105839 BLAKE2B 590412d7ed00d68a3fd8f8e5402802ca69039f2619e542619de787c6e9b4b2019096e87b7809e3b1f5a7d72963da3657fae7e465a245ef1ab0a5630219a968ed SHA512 61278cc0b8556ce19cfb5bdaaab2b42d7035fcdf71d614a8d3673629d5b04c5698e2be521df3e0518e781f78c03a8d3f466f1fdfba525f679e9de7409faf1088
EBUILD jgoodies-looks-1.2.2-r2.ebuild 951 BLAKE2B 4ae873faf78ee14aa149df23dc3e8f35afa17e15aa4d465ee6faab2b8f5082d321c3a319131e1b5a6d06e78a5f9e8d302136bf1bc0a9310848d8fefccd49c2be SHA512 9fa06f4d662fa9be1fbabe0660d0f30ef6f128c930aa7683a11c0b32e885034807a4ea75ad969922e4900e502f51f218adf8675ea8328bafcdcc39079965007e
-EBUILD jgoodies-looks-2.3.1-r1.ebuild 1452 BLAKE2B 1f1711ed8df98359f3124e20e6877e500f49abf47c3c76997a66598e4f2ece31eb539fd4be1828babe9f6882d95914221e8236898e8932431a218d0566ddb016 SHA512 ee303358c202b8947aa44043efa8a03a0e9f327970ba00026725b6e1ecc2e503426d366116ab8c561256053f290eb84fe48e7d15d62d02ff52d1df3ae9fbffd9
+EBUILD jgoodies-looks-2.3.1-r1.ebuild 1438 BLAKE2B df30740411e427a0ad83274b39bcfa59c8c09c1d4dde39e5c4c320b5687a59f97bbf3114f3e9d6ae6d363c11498af3260bff2a75c83aa1cfb75c3b99e8fee157 SHA512 50fe058d0def9efc4d0d0c42c1a9bb97d7affee754a297c7a2cd600a6bbd59739fec5e2a9abfc400c8e0807af7cc40726c56470321c74dc02b30cfd3db27dabc
EBUILD jgoodies-looks-2.6.0.ebuild 779 BLAKE2B 4acc9508d50f8be4892f2d082bb8949a5df0be8a2f8002b3568163a161dacf9333d6ba97131c8346ed0eeff1be0cdd67e738c2703b7369cf625776313a42bf50 SHA512 c5999ca3a392652c2b3cb36e88dbc7081fa9ff0e2d24acc179bb0c983a414775eb3f67ca3adf66ef309d9dc275d2f6f25089c4705f59cdd9ca4522712771d788
MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/jgoodies-looks/jgoodies-looks-2.3.1-r1.ebuild b/dev-java/jgoodies-looks/jgoodies-looks-2.3.1-r1.ebuild
index b852487d7d15..3a949d007d8b 100644
--- a/dev-java/jgoodies-looks/jgoodies-looks-2.3.1-r1.ebuild
+++ b/dev-java/jgoodies-looks/jgoodies-looks-2.3.1-r1.ebuild
@@ -52,8 +52,8 @@ java_prepare() {
src_install() {
java-pkg_dojar build/looks.jar
- dodoc RELEASE-NOTES.txt || die
- dohtml README.html || die
+ dodoc RELEASE-NOTES.txt
+ dohtml README.html
use doc && java-pkg_dojavadoc build/docs/api
use source && java-pkg_dosrc src/core/com
use examples && java-pkg_doexamples src/demo
diff --git a/dev-java/jgrapht/Manifest b/dev-java/jgrapht/Manifest
index 8aa0c78aa2b9..48282ed0f188 100644
--- a/dev-java/jgrapht/Manifest
+++ b/dev-java/jgrapht/Manifest
@@ -1,3 +1,3 @@
DIST jgrapht-0.8.3.tar.gz 1268147 BLAKE2B 78b9c6a4787adead9c27a4cf74f9ce821bab1ff35a62828383d058d50e4b568118f54bb0270449d75268aaae4d4d47231349342d064d185b4906ceb6b19022d1 SHA512 964790dc74fea1d84f4a4cda4a253ede810725ee7173a2b376acb3f0e10baa2eefcbc38c76441600e0c282e0486243a464116cb803308eac134561181a2c28e6
-EBUILD jgrapht-0.8.3.ebuild 1062 BLAKE2B 7bc9f9097b0ed041badd686d413b46b76b4df618c65d1b10b7f55735a64cec8da64c7e5a80cf6714d7c6fac5fe9de301bc69dcc0605e2067300f2270b548973f SHA512 cf0dda5088d2d4326f37c574489e1e6bdd4651800529c99ee474e3f4e26b702dbe31e56bafc2ceed66a6f54b2dd4a09e8ff166315bc9d2d8f5e9b20db329b631
+EBUILD jgrapht-0.8.3.ebuild 1055 BLAKE2B d65974a3acfe4a2e8b80280a0341ef27ecb9dd9437ebc171299471301cb3f2119e0a4de6e174c8189b10bf2699304321c9cb6c8c106e0998fbcc44f27a5f1ba1 SHA512 81e0723609e3bc3ee9e5a1ae6a37056f10a84c32980ebda39f9b05ddd50c66b96203e3dd7e4ecc6025ed408cc497dffb3710cdc985011181dc76a1c0ec27ff8c
MISC metadata.xml 313 BLAKE2B 4144798a29806efe72bce4ac739d01b6e56112670ae49bcaa9daf136bc68f6d375a534f5cb1450b4804c2a991200e08432bb8a63146c10172ab978a876727e4f SHA512 f133e2841c59716d604538e5472d1b1d81a1c0a01d8ce1dd43d8a62115bbd3cb272a1c9c257c40f760c1b3236540e7ec0835e949073c6ca6d1c20d3de825ad67
diff --git a/dev-java/jgrapht/jgrapht-0.8.3.ebuild b/dev-java/jgrapht/jgrapht-0.8.3.ebuild
index d35de3c1861e..1ea27d57362a 100644
--- a/dev-java/jgrapht/jgrapht-0.8.3.ebuild
+++ b/dev-java/jgrapht/jgrapht-0.8.3.ebuild
@@ -42,7 +42,7 @@ src_test() {
src_install() {
java-pkg_newjar ${PN}*.jar || die
- dohtml README.html || die
+ dohtml README.html
use doc && java-pkg_dojavadoc javadoc
use source && java-pkg_dosrc src/org
}
diff --git a/dev-java/jline/Manifest b/dev-java/jline/Manifest
index b55702b51b99..79980393c76e 100644
--- a/dev-java/jline/Manifest
+++ b/dev-java/jline/Manifest
@@ -3,5 +3,5 @@ AUX maven-build.xml 8634 BLAKE2B 4d1078e1201baf11da35772d0e48304522cad6b606a6d60
DIST jline-1.0.zip 463082 BLAKE2B 4f4eec5a2674bf97ed9fe83c60d339fce54dcd556aca6e95db74438e87253fd4e36e4eef26b3ac14ed84fff3d2fe1b58ba3a6fe13f33d96fe50a34f7bb34f541 SHA512 2957e19a3536d89aeaf8f27afb1f8eb4eb8bcc99560244c7f1ba14693a84a2f5e677a6c21d5f85ec519674cc4cd6cb3c9e4725cb4797144168d2f6df3954aba9
DIST jline-2.12.1.tar.gz 97289 BLAKE2B 375711ad78cba26c0b4702dd739a18dd4db2fd1e8b16ce817dd1f567c405b7b0f96c72a6c6b7fabff1520617cf9149a29040e132d0b61e2d57149bb83b404c8d SHA512 368492fa0b28e6aa3827db05d266b332935d9a03c2f6645d039941c61a698e85fd57accfac444503de4cb2f2dae5787496924b8d258faad1c18b6cafe787f99d
EBUILD jline-1.0-r1.ebuild 1659 BLAKE2B 65eb4c6d80491a6344634beafe1ea296734a716f19e930f76ff5550a8e5295347ed5b87dabcf535c4ae95631a6efe205ab336967237bd402e7b6822cc3f2bb15 SHA512 31653297f1d0bfc2d169cafdf09e84f17e9b0aec2995bd08fdfc123c8d634f3e5e2436927ebaec4772779e3bfd8e999bdf7145853407a112d0e4c382d75f9f37
-EBUILD jline-2.12.1-r1.ebuild 1262 BLAKE2B 21b4efdf0413e9af3693154de0e7259f098b31bda663edb5ca40ba3f7ce46c03f7f98924ef0b4cc40a0ecbcca8ecfe6a7a40065fe81bcb0f0558187d6a3d485a SHA512 47891ca0a85a3e3414bab175e9cfd95b037f855effb069f682335042de102a622e16dc7bb8236481347d5e7493c1186ee9dff690c3ac72cc447b8542288e3ced
+EBUILD jline-2.12.1-r1.ebuild 1286 BLAKE2B 617c3fa79f322537294de7546548a0ffe9d0ecf5ea7fff4bdd2becf22c20c0d648b4c0835c6d94756cf8f55b9bd5f8c95609ee0a52aed1808f7829a68de02820 SHA512 efe14afc050da11b56004f1abc43dd4d4346a8c50a839e8292e054958e372e8d2d56cf62631a702fe06cff7efc78a99cda92f859dbf30941f94e4ab3380c2ebd
MISC metadata.xml 375 BLAKE2B 6ac502feb83c678011ccf4b923c31184399f1feafdf3dbd8703d0c3c69900c1460da474eeb304d48590cb19ab7d128c8d8c0db48982e1283b527a0dfaf1668c2 SHA512 17a44da075005f0417e99ae638ba547800d799b98375f73c4bf7fc418b12e33e916952812850b63c623234bce98ebfd6eb525f7015e67cdaee16c38ad5f4b684
diff --git a/dev-java/jline/jline-2.12.1-r1.ebuild b/dev-java/jline/jline-2.12.1-r1.ebuild
index 2cf20f9d9991..e40695a585b8 100644
--- a/dev-java/jline/jline-2.12.1-r1.ebuild
+++ b/dev-java/jline/jline-2.12.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -15,6 +15,7 @@ LICENSE="BSD"
SLOT="2"
KEYWORDS="amd64 ~arm64 x86"
IUSE="test"
+RESTRICT="!test? ( test )"
CDEPEND="
dev-java/jansi:0
diff --git a/dev-java/jrobin/Manifest b/dev-java/jrobin/Manifest
index 6b08b7583bf6..4538fc8ef04f 100644
--- a/dev-java/jrobin/Manifest
+++ b/dev-java/jrobin/Manifest
@@ -1,3 +1,3 @@
DIST jrobin-1.6.0-1.tar.gz 7340700 BLAKE2B 2db142423c3ad0006609b31fed38a4121e942f1253a5b6ed8b10f83c71c9b9fbf271346bad1f419f7337871cd4e61e59a4117de79a07715557335458944fccea SHA512 c5428906bf975f6c31f90185da3f0cbcaaff74d68e35e37b5e425340899fe01290d3d9813f1ecd60bd599512e3d62f635de290db9a9a1bd45292ac9c187b15c7
-EBUILD jrobin-1.6.0-r1.ebuild 1568 BLAKE2B 30e3a3f247b510336509df2834362c71b905d54c1d633dcbc75b240ec4bd463762743a57da924a746498c98d04330f8bbbb44b12cffd15d6945fcaeb7eb80bcf SHA512 42f36f0be9c58a03e86632a99dcdfeb404e84c17aab715fc00ed9b2b5bd175c9ecf764bd82165caac56e715f51ff573547d043ee29a3548d5c7865aea3d626f2
+EBUILD jrobin-1.6.0-r1.ebuild 1592 BLAKE2B ee87d6b590cdb056ddda0cd94c461e7f3260a62df371be8cf4c25e0f78abb911f44fe3371d89c1d6ffc5ea01395ae97b051cfc5644a0eefd2edd1a2748901ef5 SHA512 a6f70667b55ab8630e44d168c09252bab98f3c07a9764c082880f91081e79f7060b7a53f788c03dbbbf7e08ca0ade875e91f4b4f80ff3aebe1b9084d4a933402
MISC metadata.xml 602 BLAKE2B 8bfff3b518c2aa5731032876ac38afa49f49049c11a74387aa9007742659dcd06697ad9fb1044a5a1f96a2799f7f19845e720e6566c26e216b60c5d2e50ab821 SHA512 38a6b1ecf0ebe88c64718f48d77cf459f11facc7b422cda53630da3ae9d040de0fd004e4ea571d93bc9f8f315e8f0c65cfc16d0f57c399174198facd98613d37
diff --git a/dev-java/jrobin/jrobin-1.6.0-r1.ebuild b/dev-java/jrobin/jrobin-1.6.0-r1.ebuild
index 2eee39fbc808..3b819e8ef465 100644
--- a/dev-java/jrobin/jrobin-1.6.0-r1.ebuild
+++ b/dev-java/jrobin/jrobin-1.6.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -15,6 +15,7 @@ LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="amd64 x86"
IUSE="test"
+RESTRICT="!test? ( test )"
RDEPEND=">=virtual/jre-1.6"
DEPEND=">=virtual/jdk-1.6
diff --git a/dev-java/jsch/Manifest b/dev-java/jsch/Manifest
index 4bacac52ea5b..fd9eaef59e3f 100644
--- a/dev-java/jsch/Manifest
+++ b/dev-java/jsch/Manifest
@@ -1,5 +1,5 @@
DIST jsch-0.1.52.zip 363648 BLAKE2B 37f5105920868957409c6eed8fb7b1517c0816ee6c1da25b0ad5f1cb0b1e6c71954e30e255b8aa94989495e11767ee11c5ce8bfd9721da12d6823832dd57bb16 SHA512 a5a998b6139638eee403e120f5f217112a5c09e81db8e1b1240d53ca311df4540b56aaa5f67f7a5c40cbc8420535d72d456e4fbfc95fe86d46376a00295bec4d
DIST jsch-0.1.54.zip 365455 BLAKE2B 5cd6fa012e5a511bad8f23a233559e6ad6d600f39ea7b519e66e118b1fdb997491b7ac8cff5bc1491c28f7ee99f0f4a3b4727f5d8ec02030576f34949d74e203 SHA512 2ed29f07495fbc28d6eb7b4fe414e8a9a96b911b2feea5b1513cc48a9439adba12341bceb23a3ea9ab307e32d48bfd4356c7bc877c56e77f6f55d69214db3a9e
-EBUILD jsch-0.1.52.ebuild 1196 BLAKE2B 5460a7e13f495d3ad958bf083d5131b4ef8838d981f777cf44594f6f6fd64454057a40655f70f04165e25e5eff3b5f9305b5177d6f81b432d4487e6082aa3ef1 SHA512 99af14f4aa3c09acf739297173fc89baede7facdbbd7223a3bc98835cb48246a2eae8803a99c7008973e7e1a761f071f6fda60977b2bde9352800321245e50b5
+EBUILD jsch-0.1.52.ebuild 1189 BLAKE2B e1e2045e8b468aed2a19b065d70b00712c8a189eb37e5bd704773fe1ae96f52c847f85616bf04223ba87f27c8b62b6a4f78ecd0fe1f62d471abb8e3578f83f0c SHA512 dc1b37b2fc880253b4628bca7a79463f697868de8022e4faba4905e144c9984195057cad452a5efb5f69af1d8c23c04cc26acbe88fadaaf3ed9a1880bcc95e9d
EBUILD jsch-0.1.54.ebuild 1169 BLAKE2B a09d7b8eba17059fdf49b15ff459bfe4b35c0da97898e9afd8a1083be958afb3e2e7bc3c8dd10e761de56df87bc9ffb5fc9067e1e3edd5ae8fed059a0e433f1b SHA512 92f6a520c797230e0671d7f590a0794151b954a2ce97eb5cf0fdb6ae226db37846f57ebd01626e4d19923326dd2b4f8728a395032ee38cd542d7ce5106651380
MISC metadata.xml 310 BLAKE2B 6b76bef1eadb48caec1f3314829856f655be55da55fddeec91c3d3fd14f3eecf65dd2508de12a01fc75e2089e8ce1107481bbdb6f3c92eeac74fe85e5ba02aee SHA512 5051c200e3f618fda4991704418d902b513cf94b96917a1c23c1e552e1443cf9ccbf8a0a2ceddc8db46d7104284b43689be62dee0353d50b207c7c6ad3336262
diff --git a/dev-java/jsch/jsch-0.1.52.ebuild b/dev-java/jsch/jsch-0.1.52.ebuild
index 037e4ae36e32..29979e493654 100644
--- a/dev-java/jsch/jsch-0.1.52.ebuild
+++ b/dev-java/jsch/jsch-0.1.52.ebuild
@@ -43,7 +43,7 @@ src_install() {
"com.jcraft.jsch, com.jcraft.jsch.jce;x-internal:=true, \
com.jcraft.jsch.jcraft;x-internal:=true"
- dodoc README ChangeLog || die
+ dodoc README ChangeLog
use doc && java-pkg_dojavadoc javadoc
use source && java-pkg_dosrc src/*
use examples && java-pkg_doexamples examples
diff --git a/dev-java/json/Manifest b/dev-java/json/Manifest
index 52641bd9b2c6..8135779f13b4 100644
--- a/dev-java/json/Manifest
+++ b/dev-java/json/Manifest
@@ -1,5 +1,5 @@
DIST json-20150729.zip 52114 BLAKE2B 8730eaa92002debf3563f1b07901118b2b5fb8754d5d35491ef7e4a7c8f208687a00ea2ab587e183d0d88af59f5527deb2a64e244b2668196f9f31a80099148f SHA512 ad21ce236b9df04482e039e57a16edec4018214aa6e00379573dc7c6977062c759aa21084b70540d35656ebcdb5eaa6525defb88e281ee0e4e7277e32f22755c
DIST json-20160212.zip 52295 BLAKE2B a0cd21b9cdf5f14ad7531af2e48f8a6f22b8f05d3b2baba48c659bb91b7791681c74e37a4011bf2ef525c4e39edf2c7c73d1275514f44c8bc7e8eddf5c2b76e6 SHA512 6648443c55f7e427e700a2bcb5cce8e4b796c42c0afb53a455dc847b0636f2e009171a39f96f0c317fdc1080ddc106dcd4c8066cfbd71091db3ad83bf7c0ae2c
-EBUILD json-20150729.ebuild 707 BLAKE2B 28408eea2bf597c5166803173627a123d8a4a2e06bc763b2c6855473f0eef8ab69057d677baff597aa1ab4fc2d55655ff729dfbd8547abb6848dd3f691a43c4d SHA512 8c7db885fc7f7646669f5c428d43cbf3857b8b750fada516c7faa3d4e766f2c4bb1664c2e3e00871ef5e1744ecc2bf892b7c3f41ecb77ffd62cc267428e58dba
+EBUILD json-20150729.ebuild 700 BLAKE2B 28d118fc07ab4f4bc52e00f43d36f49291fa69fc91304ee2d89df9c111e72a09f7eea10e659d06ac8eccd5c3a9d038d7ac57dca5f50fcf9d9246873bba6559c9 SHA512 112177c08691722e2b9e0d0bbcc11bbe68da87c281a4918ff6e4ef64160b7137ecb1187a697bf0f7c3db01acc9cc4baa79a67b7e9385af9cdbf5b3cd4036b26c
EBUILD json-20160212.ebuild 700 BLAKE2B 982fb6fc37f874641f6984877eef6ea42a5b106fcfc59080f85737ed2ccc61df3834c7ef5d974a155ff822bdcf55d91dc8503eec38d7229178b2b4b51fb84be4 SHA512 23df25d4363faa278ab84475c26b992374f61a39ed816868f8695567f66e0bfae4e54c6021bca5c38dc87110206146576cd14b02d713ca576d2c6d60f8cc38b4
MISC metadata.xml 454 BLAKE2B 866e5582e539c06b6bd26785ff62c97b178aacf82888963aac47489844ad3a8d98fc00bba667ed43d3e527fb3e04bfb05c7c644eeb0cfc4c408bd45cdcdc0e7f SHA512 18ba78f62a286b7a86d2dd7f2f407b145946e5b79df2554d3252706f38162e562f176105746dd028ec46f50dfe07e00fdbc6a37ca31a7ea3d1093e069192b2b3
diff --git a/dev-java/json/json-20150729.ebuild b/dev-java/json/json-20150729.ebuild
index 1a1e7bda2a30..a40b3e9d7189 100644
--- a/dev-java/json/json-20150729.ebuild
+++ b/dev-java/json/json-20150729.ebuild
@@ -29,5 +29,5 @@ java_prepare() {
src_install() {
java-pkg-simple_src_install
- dodoc README || die
+ dodoc README
}
diff --git a/dev-java/jts-core/Manifest b/dev-java/jts-core/Manifest
index ee8306af9b05..45b6e225d89d 100644
--- a/dev-java/jts-core/Manifest
+++ b/dev-java/jts-core/Manifest
@@ -1,3 +1,3 @@
DIST jts-1.14.tar.gz 19693410 BLAKE2B 1784032fbd41858caebcca60898d947da4e47e98a33f82a25540bdf940203c923529df09066260b5998f9b85f475a725e32cf01d005401698dde71f380918542 SHA512 1d90f2e2774bf8738ce24fc65c5430f7970fcc1823c304a18bbdc243040e66409fc33bf9058ebc22217640e4c384772f852316031ef1b8779592d0e041e2261d
-EBUILD jts-core-1.14.ebuild 1072 BLAKE2B 27ca70f2326ef90ffd1fb8b77b8dbc63286ecc152ceb73dd6aa03e835b25a66aa105fbda9dc5f8bc3146d57eb327c55288b22b5dddb29a6ef334e980415e75b3 SHA512 aab15bdba6a01675aba8a4580c29bd8510bf924a37bf9d16e5c0be7ea9ba0ecaba5d29bef185679570ed687bb165207522483b60a582fcd8292eeb1fd78c11ee
+EBUILD jts-core-1.14.ebuild 1096 BLAKE2B de04d9e87010a866c055706e95916e1935fb7178c73ffa2f02cc12e4be347e4f49fa6a394fb47b4dfe58ebafc2939e6a7d3af6520155c8c82038cdd374f3f561 SHA512 b427e97b314ed5e41a8001396111663f845632b3a110e9846eb4487568a2de11c13a9bb3bd2c9666b3b64d34b474b88efa55eebaec7184082e21c84e2168affa
MISC metadata.xml 311 BLAKE2B af7b97c34bdece8fb17065e507ee06633fd911095d3eaeee8600d76826bfbd48e17123ed58a0425aeb7d6d2f595e2a4362db345876d116ba55346d72bbd2cd56 SHA512 58a717b155e3578187d875a85037af30366c22ed5f2a1c634b7cc43442d7ff3b123f11617569643fa5f0b7330e49c3e9d50f9850dd771d7e9a5180146ba251c2
diff --git a/dev-java/jts-core/jts-core-1.14.ebuild b/dev-java/jts-core/jts-core-1.14.ebuild
index b3559fafc3df..c69d022e3778 100644
--- a/dev-java/jts-core/jts-core-1.14.ebuild
+++ b/dev-java/jts-core/jts-core-1.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -18,6 +18,7 @@ LICENSE="LGPL-2.1+"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="test"
+RESTRICT="!test? ( test )"
DEPEND=">=virtual/jdk-1.7
app-arch/unzip
diff --git a/dev-java/junit-addons/Manifest b/dev-java/junit-addons/Manifest
index 37e3434c3c26..8ddf0dba6f83 100644
--- a/dev-java/junit-addons/Manifest
+++ b/dev-java/junit-addons/Manifest
@@ -1,5 +1,5 @@
AUX 1.4-build.xml 8725 BLAKE2B bdc668244b90693cd60f294d188b200b51929093c988ce96bda06231ae0df781515de678115cb6f8810aeda1f6c380f0405350bd9dc6e8804fb1240042d5c311 SHA512 3f3eae33867f9e311e8e2e58a87dbc67dc4beb6eb89793b2b477953a1fc5cba45aad2a8241e07717de472969ec448c6205617da2427243cfdb21f0cf4ba91b12
AUX 1.4-common.properties 540 BLAKE2B 48c40f53f6f5557f5b97753209782ef3c57c53817ad2e7e04de7cc234ce84cf1abc9b7bdeefad992d3ea0586fb8aa72fe37942d63833cc3ceba01b400f23b432 SHA512 9362f56305b2d6cd97a10ed6cd661de6ae86e700d250cf69c55f922fca2c6f57e8ce1c306ad4378196c18cc8b839bcd5440816f6ef60f908a28da7b4ef78bbc6
DIST junit-addons-1.4.zip 293750 BLAKE2B f305ae548ee9577ff9c5be01846768fe111a2cc7c523a080f5bfe823f6e2def5880fce091cd3e460eeae831e639616ec7cbf203dcee1dce66a7075a6343df1df SHA512 0ddc9a95d80190417c92e86697669020a2947e2211d2394334b80d76bca5397f132d90e00d0c679bf48607fbadf8d1d6e97d3770d06c35cab78c6cada198434a
-EBUILD junit-addons-1.4-r1.ebuild 1458 BLAKE2B 6c82788d394202095b5356e189603e27e57a43336e459b2f81c3fdb09d7363ef226fa6967709b4765dc1c8f930a1ce77a4a8b684d34b045814430c6bfeb5c469 SHA512 9b429406c445445282184cda4f61ee0cf8c43d3a7a7bd0fc27e0e59628e53121c752e659850e79aa07bd0f7fe426477a7c1a9f0e72cca341e77732e05d75ec57
+EBUILD junit-addons-1.4-r1.ebuild 1451 BLAKE2B 2798fc492b730bf4f778a395ac3edfc22fd8e9eae89b777c38e0a26a2a1bd19318f92a0a44e572cc110c53e8c191442bcfe35c7ca8ac3b3693a60ba61cf180c5 SHA512 4f59d65540a32b3ddf395f17b22a1e726435ff1d16d43805f7cd9c8f1b514d9082f5a3e945e909bbbcaf7c4c7bae122066dd635adde60d955df21c5585cb5ff0
MISC metadata.xml 490 BLAKE2B 01319745e5907693e1cc616f05f66b4e049258cfe26a585af35a4ba5e56c7d78a338b374ff42558ce05c7523da5d330084b274aa91967f8a6ad4a06adab4e564 SHA512 bfa7b8058d0f28bd1455f2ab6841b562f369a62d90bd6a1a875c67c991dc75ade65c6e854351a4dee83d2ae059185e82a84f3159095a174aa48fdbfa8070b3fa
diff --git a/dev-java/junit-addons/junit-addons-1.4-r1.ebuild b/dev-java/junit-addons/junit-addons-1.4-r1.ebuild
index 3e5a375987af..5676030d18b9 100644
--- a/dev-java/junit-addons/junit-addons-1.4-r1.ebuild
+++ b/dev-java/junit-addons/junit-addons-1.4-r1.ebuild
@@ -58,7 +58,7 @@ src_compile() {
src_install() {
java-pkg_newjar dist/${P}.jar
- dodoc README WHATSNEW || die
+ dodoc README WHATSNEW
use doc && java-pkg_dojavadoc api
if use source; then
insinto "${JAVA_PKG_SOURCESPATH}"
diff --git a/dev-java/l2fprod-common/Manifest b/dev-java/l2fprod-common/Manifest
index da4d38a547d0..4db5feac1252 100644
--- a/dev-java/l2fprod-common/Manifest
+++ b/dev-java/l2fprod-common/Manifest
@@ -1,4 +1,4 @@
AUX l2fprod-common-6.9.1-nodeps.patch 1776 BLAKE2B c7cf298871612ea9c168555fb5d0536fae85de786ae9cb3206f83816bfce86d8657dc36992e9864d342a2f7e97985d8d99f6ae72fcaa684addf02334c11131ea SHA512 636ac2851bc24b776fdcb54b2786879216cf112d400a67b032ef50b44dd3988fa0d35ba31044e74174906242aaeab1a8563900d23b0cee728d54eaace13f4086
DIST l2fprod-common-7.3.tar.bz2 475662 BLAKE2B 40e41e7fc335220c437befd866bd4c5ff9413235f8efc6cc64922f8f9dbb8661f2acee0491ca9d90599bf314038bf0b2a30099e5ff2a323c39d8d60c3a6b0433 SHA512 685dff4cd7a171fbc92d31c6ca25faa2feda2c5a10d5f646e8fa649f53c532d83bd97388518a2720a3b4b8b87c0fa54a63ced23aedbf500e19aa0f618b938a3a
-EBUILD l2fprod-common-7.3-r2.ebuild 1177 BLAKE2B 30e355383f434fc3c00922b9fafe35fec287643b4786ef6407366550957a734bff4822b8fef5701c2f21a0c5a7c0e2638f64e1cc77df1fc1129ecda92d573304 SHA512 a1f4cb29b388c647604e3e38595a73c61e4a1dc9760d3cba8e3f4820b8b5351ce8da979b2b80d8fbf456b9ff4f1f05604ce2869677cfb7a850e846feec7d42f4
+EBUILD l2fprod-common-7.3-r2.ebuild 1170 BLAKE2B 86d6debfcd9e58d6960ace5ffc79287c0ec90ee008100b297970b5a4d1d71791bdf0d1e1589a816d6f2591194fdd8da8380b93e3fe62bef9e27ebf2ed97506e0 SHA512 32008a30149c1dd7a3f6c7e4210098cc18746de94ddb937d363aae271858040dc468c086f3f14249cfb2428bb516c33f54b472f2060460c6d25d9e6a04c7f91d
MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/l2fprod-common/l2fprod-common-7.3-r2.ebuild b/dev-java/l2fprod-common/l2fprod-common-7.3-r2.ebuild
index 5e9f5c5ff03f..9e20e1fd5e83 100644
--- a/dev-java/l2fprod-common/l2fprod-common-7.3-r2.ebuild
+++ b/dev-java/l2fprod-common/l2fprod-common-7.3-r2.ebuild
@@ -42,5 +42,5 @@ src_compile() {
src_install() {
java-pkg_dojar build/jars/*.jar
- dodoc README.txt || die
+ dodoc README.txt
}
diff --git a/dev-java/leiningen-bin/Manifest b/dev-java/leiningen-bin/Manifest
index a82431308e06..9f8e55b538a3 100644
--- a/dev-java/leiningen-bin/Manifest
+++ b/dev-java/leiningen-bin/Manifest
@@ -10,5 +10,5 @@ DIST leiningen-2.9.1.sh 4511 BLAKE2B 66fd656c20ed9b109982840315951b062b1a3fbf0b2
EBUILD leiningen-bin-2.8.0.ebuild 1549 BLAKE2B 121745ac21ffc2a35bc7fcf9faf3cc60a94125445f426b6cbcc96dad0be74f0a94060ecf5f1490239c1cfc5e1eaff8e597a4f2823474c9c82ea201280f7e9912 SHA512 538011051c64acaf051b4b7b97e23e8a32655fe038520e4585d5d90d071ae6241c61e366b71e5b8d5178d2c1acd573d4b51796cfc2e1513cfb296232e9eee2af
EBUILD leiningen-bin-2.8.1.ebuild 1546 BLAKE2B 06c5c1d35e08895de62663541d2f49e221b89c24946ae30eedc8ef4eb49a72d885efd621be562b8477cb5381fdd7d369b236ab27956d04669682dbdbcf541d8e SHA512 ff8b91c1e3482867e6a6fb4fa02f9445c8cb49ad8531e37dd1be4e2256522b299333328660feabfbd10098cd959b1a6123793fa11fa19dbb50608291f1e1efdf
EBUILD leiningen-bin-2.8.3.ebuild 1546 BLAKE2B eea35f9cb33a79851688f15c92ab0e3ffeb167aefaa217cfcd53bd523675fac8a86fac89e8472b154a6831864f5146dcbb7eda6d251ee45316ba4fa75b60c88b SHA512 2d1e01491c03f3415e88bde8f9a0919f025abfccc41ae9f8675b4c276d2bd88349af5043de457afe0e048ab67f17d6b90c41abe6aafc7c1427f39ea1ee9afe8a
-EBUILD leiningen-bin-2.9.1.ebuild 1546 BLAKE2B eea35f9cb33a79851688f15c92ab0e3ffeb167aefaa217cfcd53bd523675fac8a86fac89e8472b154a6831864f5146dcbb7eda6d251ee45316ba4fa75b60c88b SHA512 2d1e01491c03f3415e88bde8f9a0919f025abfccc41ae9f8675b4c276d2bd88349af5043de457afe0e048ab67f17d6b90c41abe6aafc7c1427f39ea1ee9afe8a
+EBUILD leiningen-bin-2.9.1.ebuild 1551 BLAKE2B 711f1bf3e8452e3def5e88ebe555533f87875670160ca44843647e0aef1b19d5117f6c7281ecf32fc626ff8c155a0b287cce2e5551ab794b21e6687bebeb9c3e SHA512 b57c0ad469d3b3bd2f1fb2fe0873c027106d699b30e7291607107f588a8f1283cf714b2d81fa2d8a8bd4f9a80d4e375be933e38d17e76ba64a81ff9fc633bf69
MISC metadata.xml 408 BLAKE2B 5c7a156b3dce1942e988302fb75ffbb3fc3738bb4aeb21203804b61a46f313fcbe2b8314702b9361afe21d33db68d9643217eaa3db3f08b7f001f29100e06eca SHA512 be76fcdb5d5ab199c951e2b563976b5c2bfe4f95000822073dccd71305f2409e90488e4c0fa726e503cbb533b16ca6a85599d84cadcf15d46e8070c3e5d0a5d3
diff --git a/dev-java/leiningen-bin/leiningen-bin-2.9.1.ebuild b/dev-java/leiningen-bin/leiningen-bin-2.9.1.ebuild
index 8025bfa59aba..9ce40e8c97b8 100644
--- a/dev-java/leiningen-bin/leiningen-bin-2.9.1.ebuild
+++ b/dev-java/leiningen-bin/leiningen-bin-2.9.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
LICENSE="EPL-1.0"
SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x64-macos"
+KEYWORDS="amd64 arm64 ~x86 ~x64-macos"
RDEPEND=">=virtual/jre-1.8"
DEPEND=">=virtual/jdk-1.8"
diff --git a/dev-java/metadata-extractor/Manifest b/dev-java/metadata-extractor/Manifest
index 02f5bb7a0153..16eba39bbedc 100644
--- a/dev-java/metadata-extractor/Manifest
+++ b/dev-java/metadata-extractor/Manifest
@@ -1,3 +1,3 @@
DIST metadata-extractor-2.8.1.tar.gz 3132397 BLAKE2B 919a0bdb04304255efbe3cc39def8c8d6440334853e840acaf5c2c51f4eec53860f0abb5d2c99d26c8865c846270f5a331372cebce7cdf1fea9831e3701afe41 SHA512 4e9fe88be4112fbf9ce481e7fd3b3a7c9544d1d5b1ebd646d2c6e2a2a1fe2d53a4b80ab859fe5e277c3e72f5e035aa46d7af7a953a182f5b8215edf9cde99974
-EBUILD metadata-extractor-2.8.1.ebuild 1179 BLAKE2B 30e087e1e06bcb51f6ecc53def755d7984da880b6fd63e46fccbd159716d1737d82f82c96a723264ba5f33dae13fd2199ac0135293b5f2842d201081cc708a8f SHA512 86edd91c93b17f35fb6e62f4fe04a69f27cce096d0470c46be2f3bc02c296104cc80703cd4feb40c1b38d2327ed962076e0a9ddae7a094770b1a9a095ce93aab
+EBUILD metadata-extractor-2.8.1.ebuild 1203 BLAKE2B bcdef7a9393a1d346e913e433463adc138948a8fd4b09e1bbfcc6babb9f31efa1671d28a50419a4cd442d31bde4212670fcbbdf9ab998f5ada0753e4ed0ec55a SHA512 eb39d05ea89e9ecca6cd27c135c8a27c2c6d0914c2ef3ac5909777f2d7c072ba91ddf9ae7b0c0747be477dceeef1b496b1bed867f14f184e839dbbec0e08a7b2
MISC metadata.xml 744 BLAKE2B 6fa67251c20eefea15005ed8e193ea650a9f8b7fa0c4acabd38173ca7fa25be53a45efcf8a1e2da24a43a6513350adb5d714077e13e7069357f01210a61de921 SHA512 a83a4d45bd9abc54687d55cf3aa0756915d261391ec317f27775639b08a8e973f865e9f1885d306a5344630f101ee5cffc0b080b791ace2c35c46812d946c780
diff --git a/dev-java/metadata-extractor/metadata-extractor-2.8.1.ebuild b/dev-java/metadata-extractor/metadata-extractor-2.8.1.ebuild
index d92aacdc6272..adc3496b2da8 100644
--- a/dev-java/metadata-extractor/metadata-extractor-2.8.1.ebuild
+++ b/dev-java/metadata-extractor/metadata-extractor-2.8.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -14,6 +14,7 @@ LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="examples test"
+RESTRICT="!test? ( test )"
CDEPEND="dev-java/xmpcore:0"
diff --git a/dev-java/netty-buffer/Manifest b/dev-java/netty-buffer/Manifest
index c56bbc1bfb7c..2633c6e39bea 100644
--- a/dev-java/netty-buffer/Manifest
+++ b/dev-java/netty-buffer/Manifest
@@ -2,5 +2,5 @@ AUX netty-buffer-4.0.21-build.xml 9693 BLAKE2B ec0f0c5ba4b4c259e1ab1045124190aa7
DIST netty-4.0.21.Final.tar.gz 960489 BLAKE2B ef279fcc2d56baaee62841ad973702c585d5450a45e513ca6beafa295943878b88ed81b8a167091e77aa9f26bccbdcea4138230850dca57321f1241c4ff56d0b SHA512 5d432e9e433c22b82e67ed3463c6982ca95c2ad823165e1ca9a5046e598878f06aac4221be235f2bda15edfdb22028f2a4f74fb37d431f24a2636e4ec60fae74
DIST netty-4.0.36.Final.tar.gz 1267617 BLAKE2B 351b1f73b1a3c60fd843767254ae57e74d74cdfe570828b1a2e7aea55a203866ae4e232bad285c3937d8f2dc7689534ffb180fcd345c8cf10bced7048ec58ec3 SHA512 b222205963366d5a0f5539c7029dc47edea8d532fca05d169dfe12dbedf956959ba422a22254b09622db428b517da0fd0e58198d11e66193abdb6050481ccbe6
EBUILD netty-buffer-4.0.21.ebuild 1292 BLAKE2B 7109e2aa22415f7bc730213afedd242873bb98cb54432002cae0d12501393d4e00dde369177d2c6ef75323a4f6cfe11b4b37d6f8a29d57f193ce5188d1b79166 SHA512 51df749a4f546b5bc0e717d6b279397c8c5d1a9045392aea75cd84c89752b49aa0d25003b4cd0742c08980b7c554eec051ff0c78cee3ade65edd15d99e20ec42
-EBUILD netty-buffer-4.0.36.ebuild 1233 BLAKE2B b47b2d96c3b01113edcaffdacbc6a1880d0dc1d7a5151757b2fd39a120f2ba5a60d22adef04503db5a76c42f41234c65a5d24891fb6fa0cee49df66e38c04b4e SHA512 efb521ff910efe81d47ffa700fab5c3031686d00b229906325f532f463fa9039c584a78e823aada5c60951389afb83373e292a3c27db73a6a20ffb13276e90d8
+EBUILD netty-buffer-4.0.36.ebuild 1257 BLAKE2B 00f3c5190a72fd7fdc1ed8de82d92b25c2a182dfeec452115b6987a4b3f39377542df1d1937d4efd364253294fc7f81615aef1b9503f29efb6e142758bca1e9b SHA512 6d530b96783acb5a3c5e1608783c56ce1f0bdb2ed830b3b184d3babacfc74c4960b1f231e7f3aaef2337b9905a9e5fa3087c2ad14c8a8204742974b356cc77da
MISC metadata.xml 322 BLAKE2B bb75fefaf27a5201c39d59fe0baff0538451766c9772cbecaf3ae347774003a2b8fa715f9738ba4324f87ce3a9aece0cb6b7c918660b7cbc6b35909533875ab5 SHA512 70319387d42e91b6b175785761c6dc23500a3c1789ad06d83169c15f8853be4211ae6764ffc5049d5278684271a538c4da9c8dcc8cda9a98e856bf2cee60a65c
diff --git a/dev-java/netty-buffer/netty-buffer-4.0.36.ebuild b/dev-java/netty-buffer/netty-buffer-4.0.36.ebuild
index 2e4b6c85aa19..6c11aa310f28 100644
--- a/dev-java/netty-buffer/netty-buffer-4.0.36.ebuild
+++ b/dev-java/netty-buffer/netty-buffer-4.0.36.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -16,6 +16,7 @@ LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="test"
+RESTRICT="!test? ( test )"
CDEPEND="~dev-java/${MY_PN}-common-${PV}:0"
diff --git a/dev-java/netty-codec-http/Manifest b/dev-java/netty-codec-http/Manifest
index 51f0fc624e56..caf0c7f17cd2 100644
--- a/dev-java/netty-codec-http/Manifest
+++ b/dev-java/netty-codec-http/Manifest
@@ -1,3 +1,3 @@
DIST netty-4.0.36.Final.tar.gz 1267617 BLAKE2B 351b1f73b1a3c60fd843767254ae57e74d74cdfe570828b1a2e7aea55a203866ae4e232bad285c3937d8f2dc7689534ffb180fcd345c8cf10bced7048ec58ec3 SHA512 b222205963366d5a0f5539c7029dc47edea8d532fca05d169dfe12dbedf956959ba422a22254b09622db428b517da0fd0e58198d11e66193abdb6050481ccbe6
-EBUILD netty-codec-http-4.0.36.ebuild 1667 BLAKE2B c2460bb746caa5d83d925478bfd00ba6f13727fc779ebe5a6c06fe5e7817419b55077cd05136f03464a2aec422a91d4664b3764a34d4f99a0bb3c42e4448d8ee SHA512 fd8762b237b31d48ea4945f52fc5399e0957d6619e23e61d553afa9660caa1bbd5671fda2a4d9d59a3325736ece2f64af6d6b979af21e4fbacb67248ec0851f9
+EBUILD netty-codec-http-4.0.36.ebuild 1691 BLAKE2B a3899fb55a046d8487720f1748e33372aac2e6cd1a31fcfb0d8610ba9206a9ed1ba3037744fe129920ff8c403bfd50ff96b16f1a6664f6e706f299393eded3ec SHA512 dedc41466c7649ff75cb443049068cb337d067f2b6d64516b8f174a4e92515d78b201a9e6dad27cca131fa27ac6df7710065634c9f60a1daf943708bc3994782
MISC metadata.xml 322 BLAKE2B bb75fefaf27a5201c39d59fe0baff0538451766c9772cbecaf3ae347774003a2b8fa715f9738ba4324f87ce3a9aece0cb6b7c918660b7cbc6b35909533875ab5 SHA512 70319387d42e91b6b175785761c6dc23500a3c1789ad06d83169c15f8853be4211ae6764ffc5049d5278684271a538c4da9c8dcc8cda9a98e856bf2cee60a65c
diff --git a/dev-java/netty-codec-http/netty-codec-http-4.0.36.ebuild b/dev-java/netty-codec-http/netty-codec-http-4.0.36.ebuild
index 3753a6e2ebd3..4488d079b4eb 100644
--- a/dev-java/netty-codec-http/netty-codec-http-4.0.36.ebuild
+++ b/dev-java/netty-codec-http/netty-codec-http-4.0.36.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -16,6 +16,7 @@ LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64"
IUSE="test"
+RESTRICT="!test? ( test )"
CDEPEND="~dev-java/${MY_PN}-buffer-${PV}:0
~dev-java/${MY_PN}-codec-${PV}:0
diff --git a/dev-java/netty-codec/Manifest b/dev-java/netty-codec/Manifest
index 430f742034ef..c60b66b2c342 100644
--- a/dev-java/netty-codec/Manifest
+++ b/dev-java/netty-codec/Manifest
@@ -1,3 +1,3 @@
DIST netty-4.0.36.Final.tar.gz 1267617 BLAKE2B 351b1f73b1a3c60fd843767254ae57e74d74cdfe570828b1a2e7aea55a203866ae4e232bad285c3937d8f2dc7689534ffb180fcd345c8cf10bced7048ec58ec3 SHA512 b222205963366d5a0f5539c7029dc47edea8d532fca05d169dfe12dbedf956959ba422a22254b09622db428b517da0fd0e58198d11e66193abdb6050481ccbe6
-EBUILD netty-codec-4.0.36.ebuild 1565 BLAKE2B 5d2ad5241c60543295c11c9ee2899eeca50e3ff6b7b99c677351a6e22d5ccacf35093c902d0f9f617c6a91470e6cfd33acd24dd8b42f865cc3dc5234839b434d SHA512 ca21f4d16aa37dd8a7a129feed5cadf0ac5bb60c1fc703259057d914150d1e4cf5ddb799c372375ce22a6dfe6e59c5d1a078a474be27a3b17e1dcdf5f4150cdf
+EBUILD netty-codec-4.0.36.ebuild 1589 BLAKE2B 8b1535c1b88fc14ca4f9fc5bd74ae7c4e43b63365163e624e00846acc589993bce98b2c831b0ac618fa1a3d08b96b0bca6dfdbbcc273d00eedf4260b34e12d81 SHA512 58a66f40111f26981dabd76c9f140a15a96cc08806eace73da45cc97521b1bf2c018a04db8bb8319ea2e35bbc7208e8a4bb6bad7b8af5ca8602fddb023f54d6e
MISC metadata.xml 322 BLAKE2B bb75fefaf27a5201c39d59fe0baff0538451766c9772cbecaf3ae347774003a2b8fa715f9738ba4324f87ce3a9aece0cb6b7c918660b7cbc6b35909533875ab5 SHA512 70319387d42e91b6b175785761c6dc23500a3c1789ad06d83169c15f8853be4211ae6764ffc5049d5278684271a538c4da9c8dcc8cda9a98e856bf2cee60a65c
diff --git a/dev-java/netty-codec/netty-codec-4.0.36.ebuild b/dev-java/netty-codec/netty-codec-4.0.36.ebuild
index 447b8bcc347b..0dfadb0d25fa 100644
--- a/dev-java/netty-codec/netty-codec-4.0.36.ebuild
+++ b/dev-java/netty-codec/netty-codec-4.0.36.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -16,6 +16,7 @@ LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64"
IUSE="test"
+RESTRICT="!test? ( test )"
CDEPEND="~dev-java/${MY_PN}-buffer-${PV}:0
~dev-java/${MY_PN}-common-${PV}:0
diff --git a/dev-java/netty-common/Manifest b/dev-java/netty-common/Manifest
index 77941e1df3be..39591df3f109 100644
--- a/dev-java/netty-common/Manifest
+++ b/dev-java/netty-common/Manifest
@@ -1,5 +1,5 @@
DIST netty-4.0.21.Final.tar.gz 960489 BLAKE2B ef279fcc2d56baaee62841ad973702c585d5450a45e513ca6beafa295943878b88ed81b8a167091e77aa9f26bccbdcea4138230850dca57321f1241c4ff56d0b SHA512 5d432e9e433c22b82e67ed3463c6982ca95c2ad823165e1ca9a5046e598878f06aac4221be235f2bda15edfdb22028f2a4f74fb37d431f24a2636e4ec60fae74
DIST netty-4.0.36.Final.tar.gz 1267617 BLAKE2B 351b1f73b1a3c60fd843767254ae57e74d74cdfe570828b1a2e7aea55a203866ae4e232bad285c3937d8f2dc7689534ffb180fcd345c8cf10bced7048ec58ec3 SHA512 b222205963366d5a0f5539c7029dc47edea8d532fca05d169dfe12dbedf956959ba422a22254b09622db428b517da0fd0e58198d11e66193abdb6050481ccbe6
EBUILD netty-common-4.0.21.ebuild 1077 BLAKE2B acc67ea4fb21cffcb787c13589a3277b154ad5804ad43ed9de45bf04fd1ea16a247647e5b488d77514da20c69c33d0fcdcc5cebd90dc2063a64deb7937e86e44 SHA512 72a988bc64b7177345fe084746da732deb64391caef03bceae7dea6eedbe23061d2b9e362c6fe265ca8524b43386aff12c3f262f5885f8c34a70cdd6f2bbac22
-EBUILD netty-common-4.0.36.ebuild 1575 BLAKE2B 8cff7403f4d0b91c2fdd16ed3eb567b62d928750c4a81047cd4c5731b06411387cdc9056919e829b132ef244b5e1ab0fc7d9e8f0f177ac561615df5aafd7f86c SHA512 bbf723c2f46f15ec93c4a7e3de363709c40b1baf6601defbdd74db230a63f7a49a0e452ab96e71e9d45e1879aa8498c83bf1fc30ceadf213b9112b2519f8e0de
+EBUILD netty-common-4.0.36.ebuild 1599 BLAKE2B 323d3049a29e69d93dceda598bbe6ab8d4d59233e45eaf43c60f95ae23675918fb9eeb5646886f824ad8f5f3c5244dd0d88a69b2998b44a8f735104f54091bd2 SHA512 732d77a9953e7b90a737fc11f97f6067066de30f244144814c615ab83eac6d475741d51f55fb156d39a227b4833cacd672e2c5df760688669f07d2f663859477
MISC metadata.xml 322 BLAKE2B bb75fefaf27a5201c39d59fe0baff0538451766c9772cbecaf3ae347774003a2b8fa715f9738ba4324f87ce3a9aece0cb6b7c918660b7cbc6b35909533875ab5 SHA512 70319387d42e91b6b175785761c6dc23500a3c1789ad06d83169c15f8853be4211ae6764ffc5049d5278684271a538c4da9c8dcc8cda9a98e856bf2cee60a65c
diff --git a/dev-java/netty-common/netty-common-4.0.36.ebuild b/dev-java/netty-common/netty-common-4.0.36.ebuild
index f401578160c6..8864cbf62128 100644
--- a/dev-java/netty-common/netty-common-4.0.36.ebuild
+++ b/dev-java/netty-common/netty-common-4.0.36.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -16,6 +16,7 @@ LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~arm64 ~x86"
IUSE="test"
+RESTRICT="!test? ( test )"
CDEPEND="dev-java/commons-logging:0
dev-java/javassist:3
diff --git a/dev-java/netty-handler/Manifest b/dev-java/netty-handler/Manifest
index 51da82bebe29..b0672bc4bdb9 100644
--- a/dev-java/netty-handler/Manifest
+++ b/dev-java/netty-handler/Manifest
@@ -1,3 +1,3 @@
DIST netty-4.0.36.Final.tar.gz 1267617 BLAKE2B 351b1f73b1a3c60fd843767254ae57e74d74cdfe570828b1a2e7aea55a203866ae4e232bad285c3937d8f2dc7689534ffb180fcd345c8cf10bced7048ec58ec3 SHA512 b222205963366d5a0f5539c7029dc47edea8d532fca05d169dfe12dbedf956959ba422a22254b09622db428b517da0fd0e58198d11e66193abdb6050481ccbe6
-EBUILD netty-handler-4.0.36.ebuild 1707 BLAKE2B b0dd571df99cd93ca2a920052d0151e62289a79fc6d583adc956d2c9f28a68a03a94c3f5eada6c0ce9e9c16635d19cc029f274ba327f65246bb01b869b592ec0 SHA512 04e1047b637a53389058e5f21c47eaa871b4d792e980a9b1a166a610614e823dfc263080dd7c3de1c29446fedf2bd2558c056c7ae73ed5f79a73b1b6d419d77a
+EBUILD netty-handler-4.0.36.ebuild 1731 BLAKE2B b244e78e9f45f623ae0baaea52024e3184325e9d677cd6411c12c443dbd277849c37e8b08637454798e002380f7579e6d63b874aac2580bc3d1eeb1e71ed706e SHA512 2a68dfc5032499a06acee871b50f7c64855bf755ca4b10020e9c6aa5d5475c3ace9f4c23197f5e68fee4fb42438e2aa31f677f3843115689ee591dbe210a1ff6
MISC metadata.xml 322 BLAKE2B bb75fefaf27a5201c39d59fe0baff0538451766c9772cbecaf3ae347774003a2b8fa715f9738ba4324f87ce3a9aece0cb6b7c918660b7cbc6b35909533875ab5 SHA512 70319387d42e91b6b175785761c6dc23500a3c1789ad06d83169c15f8853be4211ae6764ffc5049d5278684271a538c4da9c8dcc8cda9a98e856bf2cee60a65c
diff --git a/dev-java/netty-handler/netty-handler-4.0.36.ebuild b/dev-java/netty-handler/netty-handler-4.0.36.ebuild
index d4ffae7bdcd0..91f939ecbf48 100644
--- a/dev-java/netty-handler/netty-handler-4.0.36.ebuild
+++ b/dev-java/netty-handler/netty-handler-4.0.36.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -16,6 +16,7 @@ LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64"
IUSE="test"
+RESTRICT="!test? ( test )"
CDEPEND="~dev-java/${MY_PN}-buffer-${PV}:0
~dev-java/${MY_PN}-codec-${PV}:0
diff --git a/dev-java/netty-transport/Manifest b/dev-java/netty-transport/Manifest
index 70e7ce39063e..b3c872f57e83 100644
--- a/dev-java/netty-transport/Manifest
+++ b/dev-java/netty-transport/Manifest
@@ -2,5 +2,5 @@ AUX netty-transport-4.0.21-build.xml 9699 BLAKE2B ca533763bf7d1a2c05436e598db421
DIST netty-4.0.21.Final.tar.gz 960489 BLAKE2B ef279fcc2d56baaee62841ad973702c585d5450a45e513ca6beafa295943878b88ed81b8a167091e77aa9f26bccbdcea4138230850dca57321f1241c4ff56d0b SHA512 5d432e9e433c22b82e67ed3463c6982ca95c2ad823165e1ca9a5046e598878f06aac4221be235f2bda15edfdb22028f2a4f74fb37d431f24a2636e4ec60fae74
DIST netty-4.0.36.Final.tar.gz 1267617 BLAKE2B 351b1f73b1a3c60fd843767254ae57e74d74cdfe570828b1a2e7aea55a203866ae4e232bad285c3937d8f2dc7689534ffb180fcd345c8cf10bced7048ec58ec3 SHA512 b222205963366d5a0f5539c7029dc47edea8d532fca05d169dfe12dbedf956959ba422a22254b09622db428b517da0fd0e58198d11e66193abdb6050481ccbe6
EBUILD netty-transport-4.0.21-r1.ebuild 1109 BLAKE2B 5dea13615eec6fe6c97f67d8c05b98fd8635aab081916c93bda4afb145086f91df79cde77127749a5501ef946796989baebe27df9554d24547f491a31824db7e SHA512 a0cd74bee02353cdccae2eecf70cc75f5bb99059dc2760c6db5dbc5aaf16673da8225ee95f569703c01f2a9a3f1248ee43379843ed7cc94904e5b4badaab0454
-EBUILD netty-transport-4.0.36.ebuild 1687 BLAKE2B f6533ffdc0f98aa173825562b5c35e9bbf59f9a746ad8e876dfe37fbb01ba4e57757676048e8224b7bd7a6e71f022b1e95736efdc09f10dff6c73fd972b96eda SHA512 2da281117fdf8b031d13c5ec5b580930414a17fd5d4c5f587dbd10dac2b89d5d1e7ca8b1e55e460b342ecebbe02301d622fff30b585db0b3f57014a18b9b3fcf
+EBUILD netty-transport-4.0.36.ebuild 1711 BLAKE2B 86a0e4fea5aaa225b497f5360e71070132afcf8e100001961b599f011495a4faff9a6036be36b281e374ed06fbef8b710c927113dc18eccdd903d1ccaf450ae6 SHA512 95c69366857ab03d292063f14a2158c8aa6891344230db4df94b5ec49fc42a1af192a19f9f6f57e89de518d15d13e07e218b7953ecd3b0366afa75ad04131dc9
MISC metadata.xml 322 BLAKE2B bb75fefaf27a5201c39d59fe0baff0538451766c9772cbecaf3ae347774003a2b8fa715f9738ba4324f87ce3a9aece0cb6b7c918660b7cbc6b35909533875ab5 SHA512 70319387d42e91b6b175785761c6dc23500a3c1789ad06d83169c15f8853be4211ae6764ffc5049d5278684271a538c4da9c8dcc8cda9a98e856bf2cee60a65c
diff --git a/dev-java/netty-transport/netty-transport-4.0.36.ebuild b/dev-java/netty-transport/netty-transport-4.0.36.ebuild
index 46802012be81..f8fd19a650cb 100644
--- a/dev-java/netty-transport/netty-transport-4.0.36.ebuild
+++ b/dev-java/netty-transport/netty-transport-4.0.36.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -16,6 +16,7 @@ LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="test"
+RESTRICT="!test? ( test )"
CDEPEND="~dev-java/${MY_PN}-buffer-${PV}:0
~dev-java/${MY_PN}-common-${PV}:0"
diff --git a/dev-java/odfdom/Manifest b/dev-java/odfdom/Manifest
index a2c9a48d3b66..7179e549f373 100644
--- a/dev-java/odfdom/Manifest
+++ b/dev-java/odfdom/Manifest
@@ -1,4 +1,4 @@
AUX build-0.8.6.xml 11328 BLAKE2B 73af33dddbcb829fa0a5e6354a8ac176836fbc975336f633709fb6519e834cc237af80b8bfc4822af58a85dbc89e452e891dcbbc16425f3c245ecc2ad6de5943 SHA512 6db30e3cf5b154e07bba0374beed2781c0aceb4000d73d1e44c9041f876c2aad3510f9d07d7838c7d427755819cb7e57907843a52140755bfdf8818bb15664ef
DIST odfdom-0.8.6-sources.zip 33171275 BLAKE2B ac509fad6891a715196e36b945071a44e6c1b096d69df1ad08690dead00f9f1ed5811f070859c81da546333fb12bbccf3eed5cbe06efe9520952cde2ed509d0f SHA512 7b71d55da01d604d89c5e0c7b9efcfd67e926db6807c885cb34cb9bd2e1fb1dc4a38d8e75967e08913b7ab1dcd85e7165d561fd3585a3d0c63df35a1a12c44e0
-EBUILD odfdom-0.8.6-r1.ebuild 1730 BLAKE2B c24df664ab771b3c5327d2bf69798b65d6602f54ffe52724265b35a186171cb281fc2bb22df4d2790d706f3e0742d7af5a146f96a816265474a6fbbaf02fd9ff SHA512 6349b4eabb9839eb89249475bb9fda23bdf4605b3c7fdbb14ef1f71c8fe7b5e8a00cd26df8325c13be0acf33c0847c00ae727b327b7855818dc7a1a730401d7d
+EBUILD odfdom-0.8.6-r1.ebuild 1723 BLAKE2B 147f3d9e28f450021423afa80df2b199553a9ce4942215c8c3b32a4d19fdb83fb028838894596d0d4c29acf80aedce40fa21fd70d5385d33c57a4ad55c77a472 SHA512 5218670fe7e049b62384d6eaaf3508897cee0068c0577e85032595a0c688da445a3877147b9a1ecbdab7d714bb4f68e3e8606c52279860003c3929b5187a8d68
MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/odfdom/odfdom-0.8.6-r1.ebuild b/dev-java/odfdom/odfdom-0.8.6-r1.ebuild
index d770b3a1f21f..647424a452f2 100644
--- a/dev-java/odfdom/odfdom-0.8.6-r1.ebuild
+++ b/dev-java/odfdom/odfdom-0.8.6-r1.ebuild
@@ -59,6 +59,6 @@ src_test() {
src_install() {
java-pkg_dojar target/odfdom.jar
- dodoc README.txt LICENSE.txt || die
+ dodoc README.txt LICENSE.txt
use doc && java-pkg_dojavadoc target/site/apidocs
}
diff --git a/dev-java/openjdk-bin/Manifest b/dev-java/openjdk-bin/Manifest
index 152fc53fa0c8..bb93bbcda3c7 100644
--- a/dev-java/openjdk-bin/Manifest
+++ b/dev-java/openjdk-bin/Manifest
@@ -8,13 +8,15 @@ DIST OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.5_10.tar.gz 181474028 BLAKE2B cc8
DIST OpenJDK11U-jdk_x64_linux_hotspot_11.0.4_11.tar.gz 196818652 BLAKE2B f67327882afb3fdf0636d5e5262236376ed8f98eef2c8153457be0ab068a5abeb523a3873f43ced650ac623b90079d80f2a744beb8f410d8763ff7798d5980dc SHA512 8b42abedf935b8fb186a2efa11203231021417a745f03d557782aea6c5ce84f7b9fb126d3a00ac5159c349347a5d1cc9aa52b2378b2aec58d82f55a5fbcf471f
DIST OpenJDK11U-jdk_x64_linux_hotspot_11.0.5_10.tar.gz 196955466 BLAKE2B 22f97b4d8a122f4727b0000dfd37304e781a88704622a1e07301b4370139497c96bd1c5d7c22f378e335682d380a0f2aa91dcf323dd3c8479521f123b07103d2 SHA512 893fcb0eb6bc5e330c5e7d3ea5a2b16d1d0301206bb1319730d084356310c7b26ecef2b699cf6f375bebf769e0eb4c96b2456488b43d4d52c51f0e2316a42618
DIST OpenJDK8U-jdk_aarch64_linux_hotspot_8u222b10.tar.gz 104510642 BLAKE2B c67f640ededdc0d91fc02144c9e1d58a4c94984d6679e22172ae536a7c1397296bd52d5037eabcf255a2655e0d2f2cb3fdfe2e10a6f5739cc351e1d982acdbce SHA512 229ab2fef5339d396ebf5923454f45a9989341e8e9c9d57ee8779c6d5c8bd78d9d62d7a24d236b7f66baf79db641b04b9f9809d0734c1028ade7039bb2a94926
+DIST OpenJDK8U-jdk_aarch64_linux_hotspot_8u232b09.tar.gz 104544830 BLAKE2B 9ccf24a2409da8989e2bf9c9dbca9176036b179a25b0e21df3d4532b7144edbf57dc45b739c6d0891251d2e6caa00f8eab664670602b004549a5c13a1d7dd133 SHA512 3bf3272b19c73652b485df1293f27ce1daa32be690bef053ff7df164f9ac73aa197f4d4ee782aafe410e5e81b1d0db005c4f16d601668b777f49a7d524ab5ef2
DIST OpenJDK8U-jdk_arm_linux_hotspot_8u222b10.tar.gz 99367073 BLAKE2B af507e3c1877a4e895f65fb4f47f8559ac626c78477919f281ff9ce34dcc0c6394f4ca4336d406efed541c3190147188e772922c09d91ba0efaac37ed7214a90 SHA512 1b166e21de8889a1aa7e90591e635c22bf18ccfa1b9d774dd01cbc97f4c0a732ebdebac8f18aed649869e52512fce35ee9a8398e1526c2e06d6109994e3772f9
+DIST OpenJDK8U-jdk_arm_linux_hotspot_8u232b09.tar.gz 99245777 BLAKE2B c8f2066cfa3f3fc9add7846ccf6c5d05031ff7adcfc41c9c6220615f80a1fb0168dd9b2faefeb58c9ee3fe2b31223d59c694b2b50635b13161c7f3c56bba7f78 SHA512 86490b52d27c6fb3031243e9f72284e5f77ce2362dce967cc7659263137818bedcaec147492e84bf9a88f066974fb257aecf36c59d91cd5789c57ab5e410ce57
DIST OpenJDK8U-jdk_ppc64le_linux_hotspot_8u222b10.tar.gz 101730569 BLAKE2B 3391a783edcd00820e7db92c11d2707331e9aecd352802b8cd0fe565eb42620d179e2decc32452a94bff4951b9f1fe9e276b773135d316847c215f7f42e24a7c SHA512 691ff8e2f2b8d7d3004fd11470cc881a8a7d3b60eed6007986db7ee8561bc41c3508b3c9b8f4da4a298a84e3023fd9b874f9d8f20664d89ce63cdb760f554465
DIST OpenJDK8U-jdk_ppc64le_linux_hotspot_8u232b09.tar.gz 101775907 BLAKE2B e051da5a0bfddd1310ab74d728936755504f99a055b8e3af9d91affd1e781fd76eaa1a5bea297565d81e946e2f19e9bbbfe146b634bd9fc30fef4d936c97261f SHA512 bab1105cbce30d8fcf5f4c48d28a155ac4d8fa635d8d4f9d2d5ccd337fbc78db398e991b6c81b75e3dd76c695a63686c22193ccaeab97f0439f67ada56acb61c
DIST OpenJDK8U-jdk_x64_linux_hotspot_8u222b10.tar.gz 104480114 BLAKE2B 83f85b07cb1613976560d2e4df9473cd483888aa61aad17ab310683689079dc4bdde68d134123d1f3431f38be362a281cdba16b0c71e50d3fbf6a5e9b9ec2956 SHA512 8c090817bdbe2c7e1caa61b568c43e1a98e9ab5623743f4c74f6fd05254b3148e9a092cd475f7d141b1ec8ceeb4207a0f74ec1bc408f9b024806cbb740f9a2da
DIST OpenJDK8U-jdk_x64_linux_hotspot_8u232b09.tar.gz 104521598 BLAKE2B 10ec4e5312fdcf1bfbcc85e899795fe0d962b816ba3cd8d229f97f7a273fe2e09666c69c55dda391ec6d44b1ba88810c204a357aefe91328af761f9cc019cd02 SHA512 989e69c8de49048fabc1ba3c91ad7e95329149293f58af545c23a444da974bc6d4157b21facb1298d9a5cac9b552250812c6c71b6652bee93cae7edc1e72ce5a
EBUILD openjdk-bin-11.0.4_p11.ebuild 3137 BLAKE2B 0718bcbcd50aedd6c446970a9ed652a0ea485949c505129fca1bf9c95ae2df1031000c8e21e736ec178e8acf0c056a29fc0c02283cc47e3cb20c3abe6d4d5a86 SHA512 c59cebe94522c7787487ff5e00d7abcbdd91b9332a161135fcb1d4695a6251ab84cc5b6cd10e5b98377056635bc326a08cafbd05d50949057aa6a8062196cc1e
EBUILD openjdk-bin-11.0.5_p10.ebuild 3104 BLAKE2B 4afa1206018e23a98cd85f09e90d99c960c6c2cf4fbd65c2c649e46805a1b8b514767cc21abb952932f36debe53a836985f0c2aee0ae9a3f2e3769ce2d26a235 SHA512 341f180a84fc144d18900d87a5c93125f9fbdc80628b0d664a977c820351befce0b1e238e9e93aa035ab664fc63ab37f0f8bc6cef5a8f6ab0bc4e8fe16a6428f
-EBUILD openjdk-bin-8.222_p10-r1.ebuild 2783 BLAKE2B 9717804b28b0f88ed97e55284435a45919c7487a8d197cb4510ad97a4160e9eb24a33f18480f49730266130a5e396cfcca016f9fd74b0bfac00fe53a25774968 SHA512 5bc1176227ce4afdba80aee89a255f8de6661bec848473494bccc3d5dcede212466401a08ef51656c2de18864fe6590b9592b4d92d507f46a2403c134d2574f5
-EBUILD openjdk-bin-8.232_p09.ebuild 2731 BLAKE2B d4fd186733a850c593d70c6da8f090b18be7fd03deb5cfc1d0491418c3ebbfd1284c430ec1957fef75db1e2805e562ef22769fff47ad1a3f962692e023b34238 SHA512 93bec68d819ec37b976e56cb221d01191441f742109236272b490f460e1ff63068e674f7ab34d1d3f056a83569026ef18a887a975c91a5a1535dd39886b8656e
+EBUILD openjdk-bin-8.222_p10-r1.ebuild 2782 BLAKE2B 287a31fbaa4ff3e4f3f6add02e66fbb78808387dd448406a72e6e12ba6164f1ac882b710b3e655bb92af7b9074c1cd4d9c55ce76e11382b5655777fbf23d689a SHA512 fce4a4388b0af3c0248b9e35c1c4f2db9975a68dae14f24ef3c1a0936f7f7dc88c3deee3f1374c05a8bebfa2bd5fe8e44d4a2b0d503c1aea479b214942f55ac1
+EBUILD openjdk-bin-8.232_p09.ebuild 2785 BLAKE2B 81656728c97375789236220070635dab30b5c56f8d31243038a77509cbdb32f62e8f506ba6d4dde0696ad11e424955deaddde51fbfd022f4612819907957152f SHA512 5a728a17c18811d0681db701ea4fc1f0ef01019e5a0c5c6e1bdc06449c4e0cb7d076a769bb34523ba2a1fffe9a0266e92f61178a3b709250a149d7639adf5210
MISC metadata.xml 1025 BLAKE2B d7678bc38651044e8551f51b82f628f6c682cd15305fbe4bc9a9fa9b8f66417e526da18d46ff092d1b82a13a83465d060ef6ffbcfa562ba82bfe6fb9e59de60e SHA512 809731d43dcecd74f45e328780e35ba70b4ae384aea3a28c796a84c6ce2ad8bfc7cf0a6920f150cb4096f61147e9d5326128aeddcc14836752694cf5cdd6e7e0
diff --git a/dev-java/openjdk-bin/openjdk-bin-8.222_p10-r1.ebuild b/dev-java/openjdk-bin/openjdk-bin-8.222_p10-r1.ebuild
index b9f011ddd95d..e856f20fbf4c 100644
--- a/dev-java/openjdk-bin/openjdk-bin-8.222_p10-r1.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-8.222_p10-r1.ebuild
@@ -24,7 +24,7 @@ SRC_URI="
"
LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="amd64 ~arm arm64 ~ppc64"
+KEYWORDS="amd64 ~arm arm64 ppc64"
IUSE="alsa cups examples +gentoo-vm headless-awt nsplugin selinux source +webstart"
diff --git a/dev-java/openjdk-bin/openjdk-bin-8.232_p09.ebuild b/dev-java/openjdk-bin/openjdk-bin-8.232_p09.ebuild
index ce7c10944e63..9af9550dd34d 100644
--- a/dev-java/openjdk-bin/openjdk-bin-8.232_p09.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-8.232_p09.ebuild
@@ -17,12 +17,14 @@ SLOT="$(ver_cut 1)"
DESCRIPTION="Prebuilt Java JDK binaries provided by AdoptOpenJDK"
HOMEPAGE="https://adoptopenjdk.net"
SRC_URI="
+ $(abi_uri arm)
+ $(abi_uri aarch64 arm64)
$(abi_uri ppc64le ppc64)
$(abi_uri x64 amd64)
"
LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="~amd64 ~ppc64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
IUSE="alsa cups examples +gentoo-vm headless-awt nsplugin selinux source +webstart"
diff --git a/dev-java/openjdk/Manifest b/dev-java/openjdk/Manifest
index c2c62e152d15..038b9d0614d0 100644
--- a/dev-java/openjdk/Manifest
+++ b/dev-java/openjdk/Manifest
@@ -32,6 +32,6 @@ EBUILD openjdk-11.0.3_p7-r4.ebuild 7412 BLAKE2B ae6891fa80816a734f9f9d85c2345109
EBUILD openjdk-11.0.4_p11.ebuild 7533 BLAKE2B 5ae76dae294c63c4286cc92c912f86e69fcb087904354408c782ee284c8bd56d4a919edac3c98cf89d10f4d2696c467352648dd5fb578c9c83af37ee318aa2b4 SHA512 f63f91e0c8310890e6616a281d12e2077ad73b35e3d055bc0d63d4c02ea7412a83dbf75c6a7e24e1a6e82919d2207fe6132dd77560500bf6eb5d18628188c36c
EBUILD openjdk-11.0.5_p10.ebuild 7533 BLAKE2B 5ae76dae294c63c4286cc92c912f86e69fcb087904354408c782ee284c8bd56d4a919edac3c98cf89d10f4d2696c467352648dd5fb578c9c83af37ee318aa2b4 SHA512 f63f91e0c8310890e6616a281d12e2077ad73b35e3d055bc0d63d4c02ea7412a83dbf75c6a7e24e1a6e82919d2207fe6132dd77560500bf6eb5d18628188c36c
EBUILD openjdk-8.212_p03-r3.ebuild 7338 BLAKE2B 2f1234bc40edaca88f1519a827ce29824b97e2b8ed3cfe366ff5fb7bab342f9ba5eb9f134edc6853de10e9c962e2957436b323720cbd5b455621de4951ae3d8d SHA512 891fa8038fd6ee9990d71817022c1659cb15a98ca738bd89b54977708fcdba96c2d28572414d4e81f36baa6f7342eae0097360ef77eb06debe0b6d0663ada6cc
-EBUILD openjdk-8.222_p10.ebuild 7428 BLAKE2B 9a3b18f0466f7cd99e9e1b9c5d6d5755d2d72d087d4ef8df5c099bae720844632433bc7c2c2c15bc60542b9014e15263366ead0647f6ea08397db86e8df80f21 SHA512 18ff0ab7f26c7be76bd4eb90982103f43da502a067c010c2f808ce51cf432ca30f6be23ade53504347fddffa23d1af9d5e6853d631854d770cc79b0e9f5b22d7
+EBUILD openjdk-8.222_p10.ebuild 7427 BLAKE2B 0d339951fe24a8e2baf7f717dfcf6dee3158b9c60fc44a033305c1462bb74231fd3f50ea42f388c5274bcbc7bf5ca529e4b567706fa39c01d2533ce4c008558f SHA512 f58f3bbe2f71912f6322f42e5833e07e5497a702c964c78861c9a2114121312eba2a1102fc0b769a9f1955d7a161764c8ef40a21b76120f81a6c1ea58538a0ff
EBUILD openjdk-8.232_p09.ebuild 7423 BLAKE2B 441c46eab29c687dfd8f3208404e1881cee5b3e6d8693fc9a1b8a9e9d69fd42cc76a020a9208fdcc6773e79db01382687b5ced207d62e832db594e7993c2a3d8 SHA512 ea10d96953b398b5c73a967d22874392f6e733edfccb6e1f1a7ba2afc492fd76c0fe65eb2aac828f3f0c71376b48693510fb443f286d219eddd32af8f68efd29
MISC metadata.xml 1398 BLAKE2B 7b99e080f6dc261c94314c7f7a0314ee25b48752ca494dd23d1534c5e8e3f930601262a0316ed674786c5fd960dfbc25dd6c6768cd06325ef45c0b41f920eafc SHA512 1747f484c6f784cb551f0969aab9ca1e6c42509c06b6187b72f3e16861ce3e2e71e131deb1ae6ebe2eda1c768276794cd5a0db7918eb419b9502a3c45bf78959
diff --git a/dev-java/openjdk/openjdk-8.222_p10.ebuild b/dev-java/openjdk/openjdk-8.222_p10.ebuild
index 5a7d7cdfbf48..047e06407e8d 100644
--- a/dev-java/openjdk/openjdk-8.222_p10.ebuild
+++ b/dev-java/openjdk/openjdk-8.222_p10.ebuild
@@ -24,7 +24,7 @@ SRC_URI="
LICENSE="GPL-2"
SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ppc64 ~x86"
IUSE="alsa debug cups doc examples gentoo-vm headless-awt +jbootstrap nsplugin +pch selinux source +webstart"
COMMON_DEPEND="
diff --git a/dev-java/oracle-javamail/Manifest b/dev-java/oracle-javamail/Manifest
index bb140249f463..d9c01cdcda1b 100644
--- a/dev-java/oracle-javamail/Manifest
+++ b/dev-java/oracle-javamail/Manifest
@@ -1,7 +1,7 @@
DIST javamail-1.5.2-src.zip 1573447 BLAKE2B 0ba805e20de84c8a4457d0a03225299a458c5324dc47bccbbf9708673a63521299565e45b66eec552d0216f144505aa319ea724a867ab7de2a69acd072e1a67f SHA512 9d2ae8c38a8e7464023219dac13df95a34cab52a5ff9f19015ea0dde73a838f49ae006c9dc1538eeb978844af7ac962ce3b22d89f0f9ccda684141f7b52840bc
DIST oracle-javamail-1.5.5.zip 1794428 BLAKE2B 6bcba7aa40ad668b8cfd55ae3b4afddcd0df51298860fb75a2e1ae805920b5a966ef031d91c7a5e0a6cd2f5a2892f4f70ae0e24c87c9623bc1a6c15df93be7a9 SHA512 20eb12e757d00ceedbf45c43ddc1b6fe1155e79766e5843fbb8fd58c3ad91305edb07351b4ff9ed411aaffe977e9e4f287ac16b88ac55541f6f4f93c1c81a58a
DIST oracle-javamail-1.5.6.zip 1812631 BLAKE2B 9fd43058b10726db9359c4b59fd42226da329268ec4974a510940a4e7d6bd16afc3a3a73b6ee17914cd5d3577c42ddf22f29bc93e2ca185660ea03196ed2bd28 SHA512 3fde7901f5975f4a58d675d94e397bf1a169db227b138bfd684c0e2d0f6522ea1c8e2a5425b23fc08775a6824a9e9e68b2d6e6312f20c53af127f00a897363e2
-EBUILD oracle-javamail-1.5.2.ebuild 1256 BLAKE2B e53887a1ad16fb179215f9df91d7a911175f58f40575649c6a15a2444b504edeb5990180cba566c1494a2fbd3b08ad722fe632530c6c32c189ef7d8f9d3ae46c SHA512 38ac3b08f7dcf9530c058d1d982c851606cac3865237aafecb18df69ea6eaab4f30ba286946621d46cc546f57a4a496c5f3d037e6d339f3559060302f2a66f59
-EBUILD oracle-javamail-1.5.5.ebuild 1271 BLAKE2B 8e5cbc325d8d60505d5834797d68b68d14ed12e148d619fdef5584023209d78d3d03803f04b283e8c9ae8a97b181b51c2cc2b74e04e112b5a374dad83a96cfe1 SHA512 8072133774a6864739b1aff8e00e611b5fc3782d80d1b034c2b145d5ee6aa0af00f0e9f6f3a8e9e71ee82b8d1f1576c1080de8bbb9062c63eaddc1e260f4b6a6
-EBUILD oracle-javamail-1.5.6.ebuild 1278 BLAKE2B 575ef4c929e7f644dcda4ffe67651c04347522791b5bf05b2d522cec18465098c637f97e796ac207a3df5bf8631cbcb3298b15d8991eeda3c12eb7370531621c SHA512 49e142b1912c4497a220c8397c5fea533a9b063e46d6a6858fe2a3a219eed47bb84893d3b874af4cde65b84d1df44c60d8662a299103c98af0b9e8b58da90863
+EBUILD oracle-javamail-1.5.2.ebuild 1242 BLAKE2B 4b78ffe20c74bf8a95544b657846d9197f31534c1f64057c3304509625b7bcddac1fe78d6e0a87ea4e44661ed24879b29f9d738cb788c3d7ddaca07954722f4c SHA512 da9bb50b684173beeefae7c3c7b08d634ded0b5766032e142cbc1a30e5432df625df1fc69193e894af4391399d0dd5ef0dd25f0c30df00e413e69a3cb060ab9d
+EBUILD oracle-javamail-1.5.5.ebuild 1257 BLAKE2B bb9eb357f3297185acc36e1337018d4f2a864d512e772144e882e26f90a82c162ce8e49911802ea9925b2203f959567809bbc37e32a7e82de70dd27041194416 SHA512 ea40d4db114504653cbc39780c2a8c466d116c55d7d9e8822305fb10e21662dc829ff2d3dacc634f63afcff9406622dadfd757445fcc5020404172a49d8b8941
+EBUILD oracle-javamail-1.5.6.ebuild 1264 BLAKE2B cf3e3825d165a1f636c643f6d9d1ffbf9a4c2e4c31cf747f3aa74aa9541c448ecab27ccf8e7bbf587d667c2776b80482bb6cbff227cbd70f33a06403e53f7f9b SHA512 ecb9b1e99ff6d3e3fd3ed79af538ba5b33c82a654f14ae2ff140e1c4643d1232144c08adc1404a175f74cd91cd4a222a156d5da9cde38e592881c7ae188228bb
MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/oracle-javamail/oracle-javamail-1.5.2.ebuild b/dev-java/oracle-javamail/oracle-javamail-1.5.2.ebuild
index 7ff17890673c..14621389420c 100644
--- a/dev-java/oracle-javamail/oracle-javamail-1.5.2.ebuild
+++ b/dev-java/oracle-javamail/oracle-javamail-1.5.2.ebuild
@@ -36,8 +36,8 @@ EANT_EXTRA_ARGS="-Dspec.dir=doc/spec"
src_install() {
java-pkg_dojar target/release/mail.jar
- dodoc doc/release/{CHANGES,COMPAT,NOTES,NTLMNOTES,README,SSLNOTES}.txt || die
- dohtml -r doc/release/{*.html,images} || die
+ dodoc doc/release/{CHANGES,COMPAT,NOTES,NTLMNOTES,README,SSLNOTES}.txt
+ dohtml -r doc/release/{*.html,images}
use doc && java-pkg_dojavadoc target/release/docs/javadocs
use source && java-pkg_dosrc mail/src/main/java
diff --git a/dev-java/oracle-javamail/oracle-javamail-1.5.5.ebuild b/dev-java/oracle-javamail/oracle-javamail-1.5.5.ebuild
index b50794d5b058..90e1f7aec221 100644
--- a/dev-java/oracle-javamail/oracle-javamail-1.5.5.ebuild
+++ b/dev-java/oracle-javamail/oracle-javamail-1.5.5.ebuild
@@ -36,8 +36,8 @@ EANT_EXTRA_ARGS="-Dspec.dir=doc/spec"
src_install() {
java-pkg_dojar target/release/mail.jar
- dodoc doc/release/{CHANGES,COMPAT,NOTES,NTLMNOTES,README,SSLNOTES}.txt || die
- dohtml -r doc/release/{*.html,images} || die
+ dodoc doc/release/{CHANGES,COMPAT,NOTES,NTLMNOTES,README,SSLNOTES}.txt
+ dohtml -r doc/release/{*.html,images}
use doc && java-pkg_dojavadoc target/release/docs/javadocs
use source && java-pkg_dosrc mail/src/main/java
diff --git a/dev-java/oracle-javamail/oracle-javamail-1.5.6.ebuild b/dev-java/oracle-javamail/oracle-javamail-1.5.6.ebuild
index 3a3a33a02b82..143e962b47e0 100644
--- a/dev-java/oracle-javamail/oracle-javamail-1.5.6.ebuild
+++ b/dev-java/oracle-javamail/oracle-javamail-1.5.6.ebuild
@@ -36,8 +36,8 @@ EANT_EXTRA_ARGS="-Dspec.dir=doc/spec"
src_install() {
java-pkg_dojar target/release/mail.jar
- dodoc doc/release/{CHANGES,COMPAT,NOTES,NTLMNOTES,README,SSLNOTES}.txt || die
- dohtml -r doc/release/{*.html,images} || die
+ dodoc doc/release/{CHANGES,COMPAT,NOTES,NTLMNOTES,README,SSLNOTES}.txt
+ dohtml -r doc/release/{*.html,images}
use doc && java-pkg_dojavadoc target/release/docs/javadocs
use source && java-pkg_dosrc mail/src/main/java
diff --git a/dev-java/osgi-core-api/Manifest b/dev-java/osgi-core-api/Manifest
index 9000324141a9..6a6f1fbd772d 100644
--- a/dev-java/osgi-core-api/Manifest
+++ b/dev-java/osgi-core-api/Manifest
@@ -1,4 +1,3 @@
DIST osgi.core-5.0.0.jar 418232 BLAKE2B d7cfb8b2c6ff955ffc8252f248eb7bec562d16598e1a56fb50f12c099adae8b5268bc26003e166794eaee8fa6cb116ce388eb1981ef5a09394c05b7ea8655f0d SHA512 de7c5aa327a4361b81d953951488b84071e525cfd3e50f0334450b8c1b25733248de9459239ee7091f8961ac8b047a0492d692fb7cd408a0ec07df090ea9e2c3
EBUILD osgi-core-api-5.0.0-r1.ebuild 573 BLAKE2B 3dda6dddda39e67478de66c50274bc8b4edfcb7b0be2927187e3da2aaaff9945f31e11e9bf0dfbcf213e8d411e2a4d368d27d8f62f5ef14fd42ca39e7397c29f SHA512 8dffdca34200090664cc8d0134bf6d852cc8245102c2bca7bc298f0282451e1f567da54492493e06919f1e3e1f1b7a7331698b7d866aae702082d554392f3a89
-EBUILD osgi-core-api-5.0.0.ebuild 562 BLAKE2B 7bc84b27e2bebd6417a985a80c529ba84f847fb98359c0fb029d9c723b59b22c3a76c8efdd7ca0dbfca5186ba1ad2773c80b6ca92ae58cf1b33978c5839d77aa SHA512 1b62a12d5c66b1a67ce1560441745ccc288db9a39c40676f87aa753f387977f0560c624241b546acc4cc2f136449b0cfbc4679b7f18b9c607a41f8bbb7bb1837
MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/osgi-core-api/osgi-core-api-5.0.0.ebuild b/dev-java/osgi-core-api/osgi-core-api-5.0.0.ebuild
deleted file mode 100644
index b00be73ca481..000000000000
--- a/dev-java/osgi-core-api/osgi-core-api-5.0.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="OSGi Service Platform Core API (Companion Code)"
-HOMEPAGE="http://www.osgi.org/Specifications/HomePage"
-SRC_URI="http://www.osgi.org/download/r5/osgi.core-${PV}.jar"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
- >=virtual/jre-1.5"
-DEPEND="
- >=virtual/jdk-1.5
- app-arch/unzip"
-
-JAVA_SRC_DIR="OSGI-OPT/src"
-
-java_prepare() {
- rm -r org || die
-}
diff --git a/dev-java/prefuse/Manifest b/dev-java/prefuse/Manifest
index daa8708eda51..f4f2da5b7195 100644
--- a/dev-java/prefuse/Manifest
+++ b/dev-java/prefuse/Manifest
@@ -1,3 +1,3 @@
DIST prefuse-beta-20071021.zip 4334966 BLAKE2B 3fd543ee65e67a8f0aa4eb5a2bac9f1cd74d0996709907563cdcf123292506888d9f044abb06867c08f043cfaf8383785adeebc9cc1227720a764a4759c82647 SHA512 289386d4614d5f04ac3dbe0bb0be41186540e278b36089a8dfd8f1accd813b229d85a1a36fb05f15d204b77c22e6e41eefa259cff42d8f26680574c6dec7e983
-EBUILD prefuse-20071021_beta.ebuild 1074 BLAKE2B 39a4156c696041232cbfa48e6f995b7eb5da439a9c8e62951127e73f9dfa67d3811422f961d806251ea04297e5a97d52173415108addc3be02219dada339d6e9 SHA512 14b4efbe29506731e89c1e9e23fd8617077d764daecac81d228d5c6cb3c91bab6f54ed3f18f93861d5c3301e29e896d135056419ca44648c9ed40793871fd6c1
+EBUILD prefuse-20071021_beta.ebuild 1067 BLAKE2B 1728970ae824f34a7c49d9bc8c1fc8eb872fa6407bcb4310bfcde096f6bd71536e4daa7aef840b754ce19d5e9e2967d6b676093dcc2e0a02cf3e7754006cf11c SHA512 873497e2f5aa231a0edf3ae37d4ea819e51440db21e25f996c17420c697f175bcd5de72c1c66b5ad5b3f9ef18301577d7b53e3b883103b2b807d2766f0d52b08
MISC metadata.xml 463 BLAKE2B 4533a338f44bf64fa4ec9875db7e6016ad374ad8fc579724697cbf1f098d9f7b96fded2a6836a4e0923820d5b25c5f9ff73e20d6e6082a21d5b48f0f2725caf6 SHA512 b3a36d44af155a6e546a49b098a2ceeca3885716c558fec5a4e15dc9f08f0e0dc5dfa4f8c723802d58b3ef3959e6199609eb8ac5cf538cb5435f8c56a19a0a42
diff --git a/dev-java/prefuse/prefuse-20071021_beta.ebuild b/dev-java/prefuse/prefuse-20071021_beta.ebuild
index cbfe38609155..adf15daf1e24 100644
--- a/dev-java/prefuse/prefuse-20071021_beta.ebuild
+++ b/dev-java/prefuse/prefuse-20071021_beta.ebuild
@@ -41,7 +41,7 @@ src_compile() {
src_install() {
java-pkg_dojar build/${PN}.jar
- dodoc readme.txt || die
+ dodoc readme.txt
use doc && java-pkg_dojavadoc doc/api
use source && java-pkg_dosrc src/*
use examples && java-pkg_doexamples demos/*
diff --git a/dev-java/protobuf-java/Manifest b/dev-java/protobuf-java/Manifest
index c5456d747a5a..e7e636654d70 100644
--- a/dev-java/protobuf-java/Manifest
+++ b/dev-java/protobuf-java/Manifest
@@ -1,12 +1,12 @@
-DIST protobuf-3.6.1.3.tar.gz 4490599 BLAKE2B 5a058f937330bd562e364a8d86e0b1376fdac9fded0fd23d6914cb59c5c15e8bfc1e203ea36b5a4eece8919708c1a9a6616b0ec2028d6ec339704da53ed81963 SHA512 9eadb46c7daa19e612516958169bc90943b38b429a4b2cf2171b66b57f50a2f8a9b66cbf58bdd44517af414b78e0f3ab2e1361891dc60ecd098185da2638d37e
+DIST protobuf-3.10.1.tar.gz 4905995 BLAKE2B 1dde3b6260918da8430c2ce69210462f339c492b2a4e53d5d9c1bea3747aead905370507fc4bd703560f6885c0f3f8393a998b875c19744ad94827109ecbb49f SHA512 aba0c4034c0d3b1759904adb6270eee94dd5dc568f433b219e3f1f70c0033993cdfa3bf476ad3f5767c7629edb9fd029c686405abf93731dde808286b336330d
DIST protobuf-3.7.1.tar.gz 4795774 BLAKE2B a91155169623ee24ba49e397b151829321c01ff06bb27541e6c02701c37ac96ea9606961291ef0d4616dd6dba045bf7e893ec6288f5809d30cc026b60ae76590 SHA512 7d4cfabd4bd55926336a3baafa0bc1f1f15380b1b2af945f70a2bb3ba24c6ac6567f49c492326d6d1c43a488166bff178f9266377758a05d8541d8b242f4f80f
DIST protobuf-3.8.0.tar.gz 4934577 BLAKE2B 4b86ab216e8a8b2c99c3620da9417c0562498e9d4dbf4957db186f51c62b0ed73b1322635a076b2d4054e015bdf6c8c50cc7fd0cb78d24a93b29d2a5b48f66fe SHA512 ba27c64e5193cd4a144bf0c9dc0d195fbbe6e580aaca01960362f0f185074588ca40046d3bcea76e1deae7508b722f6c5be484ea957122ae8e98229c7c3a4ad2
DIST protobuf-3.9.1.tar.gz 4947402 BLAKE2B c1e366438ca619044d84d7a75453c35b48d5f64867b7aaec78c04966d4e62223a8909a28be850156ce3d47f0e7f42e80a231ec5d814d2820e1edfa963d89e177 SHA512 9accb56c1aadef83bf27280e15a99809a3561cbd4b39d6605dec730cc112bf4fd2e9f1ac39127b32a1b87253e712be4b4f12afe4061a8f7be76266b3f4bca314
DIST protobuf-3.9.2.tar.gz 4947582 BLAKE2B ff0150970286d1eb452bd2f252fa8200617ddf491dcb3b9b60cebb36268c5a3072df3d24142ca9863306df6690f53ad4d4761c7846c677c4610716ec22e0838c SHA512 510349ddc59b4e53087b5247ca8784e9f852d66d755e1b014c6214e14c003f31dd336a724e9eb87a5b85a70e22793eb3211744c85a514b24b687346563717bec
-EBUILD protobuf-java-3.6.1.3.ebuild 1109 BLAKE2B d76e82ea1872d9c8d3a7cee220e243a424d5352dea09962435d487282c88157d937f89eb07e214f3a0bb62abdaab7afe88572cc4a00decc67e03ca13b6da4673 SHA512 8504a8fead79fe649cfd0d8bb63fe44c30e7f68c5fa8d0f3546a55460dc3e78fbd63f636b4f02269455159f471ead4a86d96431beb7d131c11c211b5b02d1e0a
+EBUILD protobuf-java-3.10.1.ebuild 1413 BLAKE2B 2ebc9838b48fcf8c84c946ceabae0b4f6d2442d9c3a0c6d9a7be5e1e71d074c26d9c4e79162a6aebe07ae5c7c333aa858085ccf8bb27fa3765a12a55fbbad5d6 SHA512 ded0cad291a8599064a40300d3bc9bc0c48c49c84fd3db1b6bb4e554b1ab788495b082af779738032d2b539bf330e7963e4372c49a7901a917693d6df49e31eb
EBUILD protobuf-java-3.7.1.ebuild 1446 BLAKE2B 0354f61083a5747a713621fcee7a59a938ff03c008260dadd8aec7b928f81758fbe348f4eeb406069ebedfaa2979d98edaede22c1b738d0ce24c25c944a795c6 SHA512 63de3822738f831d43399cfbecb0cadf341dc605c4016abddb7444d6f93b7580102fb9bb95e55c6eaa1c6b4e4cb6217227a69fe5a927c1ee0e5ce3496a34bf15
EBUILD protobuf-java-3.8.0.ebuild 1382 BLAKE2B ac6dd81e147854eeca83884b7462af2dbb71fd93c1cb805b59b705b76333c8e9a4d8532742c81930b5bfc6ef0e2d6734888fe45a78b811dd7c156b3d02efa008 SHA512 2eb33c0e82ef03a2c2ff5df6f3168310520f13838308a6ad1407b8c8506199c09305828abdb2c1bfa715fdacdb74fb7116ad6e9aa7de99e444e79d2c297acddf
EBUILD protobuf-java-3.9.1.ebuild 1385 BLAKE2B 9996fafa5a726e30a34d171d1540ccbef12e8e493459ecea750ce6feb9a5294ce476198b9d163d811b8c52fa423d848b2b4451b0d301186113c4a37d8fa0e539 SHA512 d94ab861cb3adaee0a5562429ec5277eb26fdb43b937f139c1c02a21ee2e1f3a1ec4fccafd004135990f7edb909d5e92555f7564af3d386329cbb16206f18ab7
EBUILD protobuf-java-3.9.2.ebuild 1413 BLAKE2B bb9f2aa01559aa681995d29d0046d5430f3e4202b72574c4168526ade346d9379dd9d763fae0e7c35b44184bf2a8d76988bb0844fe94c1d4415d0cf8f6a09ff7 SHA512 23acb84178e4f6169658090de437562da60e88ae3eb3f03eab013c9b6c667e753b3a355c306003429e5059332874f2174302be0993d0aeed970d91008f0d3c8e
-EBUILD protobuf-java-9999.ebuild 1333 BLAKE2B 46f89c6b9c4f4af37d03a0605706abacde2fa436ff647ba3611a7bb796d1a306eb71f319a18c17861b2314b9a89292427b708bcab9677a9652be89ce3cec1d9e SHA512 8a028d7aa15d77d886137c09d1396af1e287b6d47fdd321a2833c9a686c91019a1c160eeb08f4d6cb8129c089c0e38914555552b09d32ef82d247e8bdeee929e
+EBUILD protobuf-java-9999.ebuild 1333 BLAKE2B fb6b6a03d5c0b542d675ffbfce077e1af4ce209f41571f72fadfd102c885e5619f1efaff550f41140c122745d17e52fd5d6fd525b5b5d08122f83bb9a8f1f632 SHA512 5b82121c95ba38591ffde5fc6567752c8793e517a1e94ecd076c9394a01b9f01669b0853f8a6a391baa9ba08de74088468f2ff0b28f2d8779dbb93978112e451
MISC metadata.xml 535 BLAKE2B 9a137dca0f060e7fbede894aefb4dc4d05d0264cabc4dbcf65c240c6b9f130ce0a4287eedd0306aeea8d76009611d61ea4ab472a3163f93fddbeec8830e7bfae SHA512 22c4efebb2ac24924eff53af66c8a77439a8743cdd22636d1fa78b35482d0821c1fcf79268e75736a742da52b8c5d4a402ca8befef269436013bcdb8591fbed8
diff --git a/dev-java/protobuf-java/protobuf-java-3.6.1.3.ebuild b/dev-java/protobuf-java/protobuf-java-3.10.1.ebuild
index c2172fa14a11..66f0f362f4af 100644
--- a/dev-java/protobuf-java/protobuf-java-3.6.1.3.ebuild
+++ b/dev-java/protobuf-java/protobuf-java-3.10.1.ebuild
@@ -1,27 +1,43 @@
# Copyright 2008-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="6"
+EAPI="7"
JAVA_PKG_IUSE="doc source"
inherit java-pkg-2 java-pkg-simple
+if [[ "${PV}" == "9999" ]]; then
+ inherit git-r3
+
+ EGIT_REPO_URI="https://github.com/protocolbuffers/protobuf"
+ EGIT_SUBMODULES=()
+fi
+
DESCRIPTION="Google's Protocol Buffers - Java bindings"
HOMEPAGE="https://developers.google.com/protocol-buffers/ https://github.com/protocolbuffers/protobuf"
-SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> protobuf-${PV}.tar.gz"
+if [[ "${PV}" == "9999" ]]; then
+ SRC_URI=""
+else
+ SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> protobuf-${PV}.tar.gz"
+fi
LICENSE="BSD"
-SLOT="0/17"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 ~sh x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+SLOT="0/21"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sh ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
IUSE=""
-DEPEND="~dev-libs/protobuf-${PV}
+BDEPEND="~dev-libs/protobuf-${PV}
>=virtual/jdk-1.7"
+DEPEND=">=virtual/jdk-1.7"
RDEPEND=">=virtual/jre-1.7
!<dev-libs/protobuf-3[java(-)]"
S="${WORKDIR}/protobuf-${PV}/java"
+if [[ "${PV}" == "9999" ]]; then
+ EGIT_CHECKOUT_DIR="${WORKDIR}/protobuf-${PV}"
+fi
+
src_prepare() {
default
java-pkg-2_src_prepare
diff --git a/dev-java/protobuf-java/protobuf-java-9999.ebuild b/dev-java/protobuf-java/protobuf-java-9999.ebuild
index da1f108d721d..ffe2c1d9ca17 100644
--- a/dev-java/protobuf-java/protobuf-java-9999.ebuild
+++ b/dev-java/protobuf-java/protobuf-java-9999.ebuild
@@ -22,7 +22,7 @@ else
fi
LICENSE="BSD"
-SLOT="0/21"
+SLOT="0/22"
KEYWORDS=""
IUSE=""
diff --git a/dev-java/sbt-bin/Manifest b/dev-java/sbt-bin/Manifest
index d10932ff3971..d99a88900f17 100644
--- a/dev-java/sbt-bin/Manifest
+++ b/dev-java/sbt-bin/Manifest
@@ -2,8 +2,8 @@ DIST sbt-1.1.4.tgz 45858350 BLAKE2B 792b05bf9bf16968c6580f070e042395b13580c6137a
DIST sbt-1.1.5.tgz 49603901 BLAKE2B b458600bec2610fd76e5ca21633738b6815bf6c3e2918814147c904b97ab80b972a15b31f555777d0aa7f2e4613eef9b109745476d0cd7166506573aa2a72873 SHA512 bb538d88ec5ee7bb08b5eed6e7e250c45ee25419952473e4f093391316f936b26cc181f21c7b3501b9126a5c1f21b10514adffea4f9a09f7920203ba6330c2d4
DIST sbt-1.2.8.tgz 47179935 BLAKE2B f31dcf25168471cb7315d8dc8f168321098fbfbf985bcc5aa294ea95c6b65d299ee0f9b457d6dc3569eff6117f0fbf5fd51b37ca9294f7bcca2256f52e07b73f SHA512 e12d50de4481dc599b8e129b5caf86b4a6a42426612308f9c8dd791525b5ae325e65f1c1db479bdc00fed2421c108a0dcdd00585f90334446e2cef914484719a
DIST sbt-1.3.2.tgz 51817549 BLAKE2B ccb362b8cec867c64a04eba48982a9d339250d3ab51afb72fbbb7fe29406c6565d386ab0e02887007922f4134481b4ee764b63eb69300d7aa06dffd43a91a225 SHA512 2402f781962b80a46c63ac3aba0b2bb2b55ae509bb6b591d840385765dbf73cb6e5b40c12e6b95db2d8f4e77caeda32aad5a701a6439bde41ca3166d50f4b9b2
-EBUILD sbt-bin-1.1.4.ebuild 860 BLAKE2B b17b66c3d6a2f845a87bba126f99050e9e3cd19dce5650d8d91968730bb79a471f0c2224eb7aeaad8df7ad6447974bfe982ce39071c647f50f3f37c9ab33d2e6 SHA512 31a2bf25148fcbf9e387f51c535dd18cba311181ddd01cb6aa19637bb6269e83f596c70fb3d4bdeedb6e7d1136886722cdc54112747f9c07d41098a9f72d43df
-EBUILD sbt-bin-1.1.5.ebuild 860 BLAKE2B b17b66c3d6a2f845a87bba126f99050e9e3cd19dce5650d8d91968730bb79a471f0c2224eb7aeaad8df7ad6447974bfe982ce39071c647f50f3f37c9ab33d2e6 SHA512 31a2bf25148fcbf9e387f51c535dd18cba311181ddd01cb6aa19637bb6269e83f596c70fb3d4bdeedb6e7d1136886722cdc54112747f9c07d41098a9f72d43df
-EBUILD sbt-bin-1.2.8.ebuild 857 BLAKE2B f58cc58f25419b156ff7b454e793e560b86c98d727f126b77658d5af0c2264f8945d8c010b2c3b426d5a829c81f58154a2c5802b5649b8b4d20ddcabfb81116c SHA512 a8f14859b983a34efd4c64056e823fd6996dfc4c74d4fef1f57dc877cbe791c1021eab04451f4b03325937dad4411e7bea3c6a58019a41e3eac6708f152bf577
-EBUILD sbt-bin-1.3.2.ebuild 841 BLAKE2B 855bec14a503fde57da585d2802ade554ba9b0e5faf9411b037f6d6f49e429c8f8407d036a9182c50ececd277c586ccbdc953f91aa5f33608c141c4a3113432f SHA512 c996a60572958ff1ee2c06089d3750ee2feab41524e43b249aa6fb5e5904d7f4f26c26e0f4b1bcb66ed3ba7c79a5597a300cb6aa2c89323f586fcbacc5c6369f
+EBUILD sbt-bin-1.1.4.ebuild 832 BLAKE2B deb6fdf5965531b69babbf6765c7d0d139dc90accca5b2c27ea35b62123479af146d2a57794d3d6429ac576aa6d276c9cb6a8fbd441ce29a80b040ca09e85d59 SHA512 0f344994b2cbd340da83badc470769143f1e6e83c7f7f07a025ee203b011d26f636e548fa143d3dba106bec203fa5176ced5eaff0668674a596fa92efbb5edce
+EBUILD sbt-bin-1.1.5.ebuild 832 BLAKE2B deb6fdf5965531b69babbf6765c7d0d139dc90accca5b2c27ea35b62123479af146d2a57794d3d6429ac576aa6d276c9cb6a8fbd441ce29a80b040ca09e85d59 SHA512 0f344994b2cbd340da83badc470769143f1e6e83c7f7f07a025ee203b011d26f636e548fa143d3dba106bec203fa5176ced5eaff0668674a596fa92efbb5edce
+EBUILD sbt-bin-1.2.8.ebuild 829 BLAKE2B 4d229370b5704138e89193258c40704354aa2d6367bee708ce83a0c3578e6c8c9914f82ae3147e71ba2db30041ad846ccf8d6ba8c7336ed197ea9e120bec6ef2 SHA512 ba881c3ed0f8b5435413db518b28381bb7cdf11a707a042af85ad53fb0d08b9e80256c4e6e20f6488b84bc1591fd4f05e09f8f2ae3a412005f9f81ed2e6ac308
+EBUILD sbt-bin-1.3.2.ebuild 813 BLAKE2B da2f1272fca800f082139d1dca79a150cefab7df44f2ea2aaad2aa70845c1d4df2ad0cd332f94240c92fe456d39e19bab4cd13f4230fe919c3316c46718d5a09 SHA512 5a174b93c7d8b2fb25111a651958016cf2df63cfe6ac1e2eeb6f2f1aa0f7435e0990d12d5fce7f481ec08e74db6601e9ca3d985de7bdf930b70fcc0131a07e9f
MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/sbt-bin/sbt-bin-1.1.4.ebuild b/dev-java/sbt-bin/sbt-bin-1.1.4.ebuild
index 7d39ba4f4053..eb705fb853eb 100644
--- a/dev-java/sbt-bin/sbt-bin-1.1.4.ebuild
+++ b/dev-java/sbt-bin/sbt-bin-1.1.4.ebuild
@@ -39,11 +39,11 @@ src_install() {
bin/sbt-launch-lib.bash || die
insinto "${dest}/lib"
- doins bin/* || die
+ doins bin/*
insinto "${dest}"
- doins -r conf || die
+ doins -r conf
- fperms 0755 "${dest}/lib/sbt" || die
- dosym "${dest}/lib/sbt" /usr/bin/sbt || die
+ fperms 0755 "${dest}/lib/sbt"
+ dosym "${dest}/lib/sbt" /usr/bin/sbt
}
diff --git a/dev-java/sbt-bin/sbt-bin-1.1.5.ebuild b/dev-java/sbt-bin/sbt-bin-1.1.5.ebuild
index 7d39ba4f4053..eb705fb853eb 100644
--- a/dev-java/sbt-bin/sbt-bin-1.1.5.ebuild
+++ b/dev-java/sbt-bin/sbt-bin-1.1.5.ebuild
@@ -39,11 +39,11 @@ src_install() {
bin/sbt-launch-lib.bash || die
insinto "${dest}/lib"
- doins bin/* || die
+ doins bin/*
insinto "${dest}"
- doins -r conf || die
+ doins -r conf
- fperms 0755 "${dest}/lib/sbt" || die
- dosym "${dest}/lib/sbt" /usr/bin/sbt || die
+ fperms 0755 "${dest}/lib/sbt"
+ dosym "${dest}/lib/sbt" /usr/bin/sbt
}
diff --git a/dev-java/sbt-bin/sbt-bin-1.2.8.ebuild b/dev-java/sbt-bin/sbt-bin-1.2.8.ebuild
index fc9acfcd4e6a..c78f24f9901a 100644
--- a/dev-java/sbt-bin/sbt-bin-1.2.8.ebuild
+++ b/dev-java/sbt-bin/sbt-bin-1.2.8.ebuild
@@ -39,11 +39,11 @@ src_install() {
bin/sbt-launch-lib.bash || die
insinto "${dest}/lib"
- doins bin/* || die
+ doins bin/*
insinto "${dest}"
- doins -r conf || die
+ doins -r conf
- fperms 0755 "${dest}/lib/sbt" || die
- dosym "${dest}/lib/sbt" /usr/bin/sbt || die
+ fperms 0755 "${dest}/lib/sbt"
+ dosym "${dest}/lib/sbt" /usr/bin/sbt
}
diff --git a/dev-java/sbt-bin/sbt-bin-1.3.2.ebuild b/dev-java/sbt-bin/sbt-bin-1.3.2.ebuild
index 398eb3234255..e799b9d9121c 100644
--- a/dev-java/sbt-bin/sbt-bin-1.3.2.ebuild
+++ b/dev-java/sbt-bin/sbt-bin-1.3.2.ebuild
@@ -39,11 +39,11 @@ src_install() {
bin/sbt || die
insinto "${dest}/lib"
- doins bin/* || die
+ doins bin/*
insinto "${dest}"
- doins -r conf || die
+ doins -r conf
- fperms 0755 "${dest}/lib/sbt" || die
- dosym "${dest}/lib/sbt" /usr/bin/sbt || die
+ fperms 0755 "${dest}/lib/sbt"
+ dosym "${dest}/lib/sbt" /usr/bin/sbt
}
diff --git a/dev-java/slf4j-api/Manifest b/dev-java/slf4j-api/Manifest
index 8c4afdabada1..0bb6580325a0 100644
--- a/dev-java/slf4j-api/Manifest
+++ b/dev-java/slf4j-api/Manifest
@@ -1,4 +1,4 @@
AUX 1.7.7-build.xml 8474 BLAKE2B d6651256fe317ca494c30901f8b71c932c58580a26a6f94a49da76377045a17ee096c81f2069728f2ab49409dbf0108d4294c68aeeea4bcc5cc50c2346f7f4b3 SHA512 9810581760b885c9d0cd8c99da566a8d144b2e612a9a66401a9cf9e9868135bca1d8b98b5e5a237acf0d65029ba6e510bbab85c03e36742f3b1ba15380852d95
DIST slf4j-1.7.7.tar.gz 3031017 BLAKE2B 55020b493f9f0df534d199d86e8d312dcd64831155f6d18d5f2de6f5157ecb20853cc96689e25ded8c7f4f858481567eb67a21a1cf96a7c3a33ed1ddf9aa47eb SHA512 aefefe049ed36e8ec938469067be8d73d2c7a28189f54cf434606fecab1d380f00fdf8349a23ed99d574067d9a613b0aec48b913705cd27524af5a4a5d887418
-EBUILD slf4j-api-1.7.7.ebuild 996 BLAKE2B ddf56343573b90c51228656c6bb9457689c72d9ad2e225232501d36bd0ce7240d6c2a83031b79c84223056c199e43817065fa6ec8f3540bcea7644256b489275 SHA512 b3b8a8c1bb37c1a4326ff58c3628a3bcfd1fcf985be3840eb3254c1b63212c7e8607371ed991781743e875c7982662aa870894ae4438de1694f113dab0bf4d58
+EBUILD slf4j-api-1.7.7.ebuild 1020 BLAKE2B 7b222c87e16da78a1659a11532b92d92cb5f31f959318a8d16c04d0660ac48570f6aed005545a09d00a30ba618c1b948f103f288957d970bc41f8db24f292b44 SHA512 4a693df3997bf91be71a56a5baceb0276a4b8aaa2bb09fa3fb915d35afff981c4781f6d6ccf469e2ce498c150b6b9c726b140ff1dc52d14661705f5ee503b673
MISC metadata.xml 242 BLAKE2B 6bf5b48906c64a18d9f27e7ecec168ed039f8d390792d62aedb8c86627a13ff09d583a736982057d245fe5db27c4016257125d69792d6bbe424e7d2a35067675 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f
diff --git a/dev-java/slf4j-api/slf4j-api-1.7.7.ebuild b/dev-java/slf4j-api/slf4j-api-1.7.7.ebuild
index d25423ff91c0..23430992caad 100644
--- a/dev-java/slf4j-api/slf4j-api-1.7.7.ebuild
+++ b/dev-java/slf4j-api/slf4j-api-1.7.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -14,6 +14,7 @@ LICENSE="MIT"
SLOT="0"
KEYWORDS="amd64 ~arm64 ppc64 x86"
IUSE="test"
+RESTRICT="!test? ( test )"
RDEPEND=">=virtual/jre-1.6"
DEPEND=">=virtual/jdk-1.6
diff --git a/dev-java/slf4j-log4j12/Manifest b/dev-java/slf4j-log4j12/Manifest
index b7f34db476fb..8d7f6b779ab0 100644
--- a/dev-java/slf4j-log4j12/Manifest
+++ b/dev-java/slf4j-log4j12/Manifest
@@ -1,4 +1,4 @@
AUX slf4j-log4j12-1.7.7-maven-build.xml 10522 BLAKE2B 3396e8ae9452a54072457696261ac59745fbf11ca10e240b9b81de7e37441cf83185115b8d37d2662bffca02a7ee4e99c90ba9c1f02878c3aa0fc2706ce836f4 SHA512 169e6b50e5ec5e44047dae2be9144e1626e2a5e95a0fb92c61e01164804433887e7e8b1c0108ef3bcc7dbbadeff9eab86c85977572a80825bdb5ac2914d65ce9
DIST slf4j-1.7.7.tar.gz 3031017 BLAKE2B 55020b493f9f0df534d199d86e8d312dcd64831155f6d18d5f2de6f5157ecb20853cc96689e25ded8c7f4f858481567eb67a21a1cf96a7c3a33ed1ddf9aa47eb SHA512 aefefe049ed36e8ec938469067be8d73d2c7a28189f54cf434606fecab1d380f00fdf8349a23ed99d574067d9a613b0aec48b913705cd27524af5a4a5d887418
-EBUILD slf4j-log4j12-1.7.7.ebuild 1169 BLAKE2B fb73134918397ccf2bcc6281588a8ba78370bfde9e1b4d09fc4b95178438091eba9af8a5445397965330a557fb1d7bea28432175238efbe6d83414107e992bc1 SHA512 047fc8d5551d0539045aa406c218c4104de000e3b63659075a62879074e7f8caa8a922b8b5fe4c2b29da48e9308c9d925915d63bf9d28e08e95e7a0b7bcd6164
+EBUILD slf4j-log4j12-1.7.7.ebuild 1193 BLAKE2B aa9c7265313e458f004300b2874611bda741694e60a50ccf53cac19da0adc9d46eea7f315f94162c6b9ba86f7bee0f317e84d21ec56b2b950f0cbf77fc595c01 SHA512 156043e2934400584932ded6a3a3fdc9c8cafba79dc85dbb594663f2947ca36138881295086a63caeac826ecd77b0388587c1f320fd7654f53200c62b42f1a05
MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/slf4j-log4j12/slf4j-log4j12-1.7.7.ebuild b/dev-java/slf4j-log4j12/slf4j-log4j12-1.7.7.ebuild
index 87788627a484..e3f0c750c20c 100644
--- a/dev-java/slf4j-log4j12/slf4j-log4j12-1.7.7.ebuild
+++ b/dev-java/slf4j-log4j12/slf4j-log4j12-1.7.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -14,6 +14,7 @@ LICENSE="MIT"
SLOT="0"
KEYWORDS="amd64 x86"
IUSE="test"
+RESTRICT="!test? ( test )"
COMMON_DEPEND="
dev-java/log4j:0
diff --git a/dev-java/slf4j-simple/Manifest b/dev-java/slf4j-simple/Manifest
index 28ffac5a3fbe..6f2f42baac24 100644
--- a/dev-java/slf4j-simple/Manifest
+++ b/dev-java/slf4j-simple/Manifest
@@ -1,4 +1,4 @@
AUX 1.7.7-build.xml 8491 BLAKE2B 585e41d7760e2d05fee17fb4c35de203eced8f9298bfd880d5f2e4a698cd78f8e00488227dad96dba805ce646f2d2fd1444fb87e29f929fc2cb96d919efd5c1d SHA512 8961b303c86000433af761d448c016c13d105d99547e67ace24bdb2f9f95427bdf4a0d4e02fdaefced1a574d2968f9af7e4429e33fb85d1ceb8439036c888917
DIST slf4j-1.7.7.tar.gz 3031017 BLAKE2B 55020b493f9f0df534d199d86e8d312dcd64831155f6d18d5f2de6f5157ecb20853cc96689e25ded8c7f4f858481567eb67a21a1cf96a7c3a33ed1ddf9aa47eb SHA512 aefefe049ed36e8ec938469067be8d73d2c7a28189f54cf434606fecab1d380f00fdf8349a23ed99d574067d9a613b0aec48b913705cd27524af5a4a5d887418
-EBUILD slf4j-simple-1.7.7.ebuild 1096 BLAKE2B 1a82bebd4e26fe49d1f097d908c518ef5bc4b7755f22801e8c87b347afb79a446049e2e7de1aead2f13d63337601fe19f927476989aaf445012b9b5ac3e63921 SHA512 25ae34e58d5e134d327038934c4d582355bdc38e4b3da505999997118e829e016fbdac201168981691262f61f98b19141db8521b60a95db1f39d4c45708edb64
+EBUILD slf4j-simple-1.7.7.ebuild 1120 BLAKE2B 5a068ac3357e5d18ae85f2d210ba2f83a68d05395e176b6ab1a5d8a4851534051a631bbd2d5b97f5ca38f36073a901035c64e4d60390eb42e1f05ca119a8d67c SHA512 06e6dfdb72ad88e9eb69fb97e093b479cf2cfc2d2168ad37573c430f2edd92677473f97a8a8444430e7acfdfd4e38e15fd05e037b342e2a6070357fb00e15786
MISC metadata.xml 242 BLAKE2B 6bf5b48906c64a18d9f27e7ecec168ed039f8d390792d62aedb8c86627a13ff09d583a736982057d245fe5db27c4016257125d69792d6bbe424e7d2a35067675 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f
diff --git a/dev-java/slf4j-simple/slf4j-simple-1.7.7.ebuild b/dev-java/slf4j-simple/slf4j-simple-1.7.7.ebuild
index 3cc4d3beaafe..792d3f30f513 100644
--- a/dev-java/slf4j-simple/slf4j-simple-1.7.7.ebuild
+++ b/dev-java/slf4j-simple/slf4j-simple-1.7.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -15,6 +15,7 @@ LICENSE="MIT"
SLOT="0"
KEYWORDS="amd64 ~arm64 ppc64 x86"
IUSE="test"
+RESTRICT="!test? ( test )"
CDEPEND="
dev-java/slf4j-api:0"
diff --git a/dev-java/snakeyaml/Manifest b/dev-java/snakeyaml/Manifest
index 67062f475acc..54e5970060bb 100644
--- a/dev-java/snakeyaml/Manifest
+++ b/dev-java/snakeyaml/Manifest
@@ -1,3 +1,3 @@
DIST snakeyaml-1.16.tar.bz2 234954 BLAKE2B dea06c3501ceab4e92b4d125dc882ce7b7773d67ac5526fdf39fafb421f339fe892cfd3f8e80e413aa080fecbc94425842ccabd099d97e1c705eab7025c489e9 SHA512 77ef0b1fa2ebe7ab1618745c407436ac6965159e29e1271b0d571006b967bcd94658eb3a8047180ea7c3160eb66ecbac1f24414537a24a81c11fb735ce65e3a4
-EBUILD snakeyaml-1.16.ebuild 1306 BLAKE2B 29ca20cd99f68ec36a984d8c7c5dcfaf921c97b5b57fa045a4b139c5c9de700142de748d2cf3455aff6bcb5c18db90fda8a7267faf36b32ad7ff25eeb63f21ec SHA512 c01f82279a4990f1d6a23790d5c3eb69ffe996836fd1c594cc30bc72612398187b7ff2b8643e4593a79cdb9142ccfb536f6980e1d1818da0b57edbe5bed8f746
+EBUILD snakeyaml-1.16.ebuild 1330 BLAKE2B bc4ec2b97f5e12b611340669485f71e44fe56905c554761dd9628f14bfb8d501e57d2f322b8d0ef8bc8159720e05d643f7cc5626358ec71e029bd4fb73497608 SHA512 65553fab3d53a9feba2dbf1a5754a68710d796b8d5f182696869aa2c6224291b81156753c8cce6807c9c622b214bf9ab4dba70cdffdfdf36ecc6a0ffe7bf32a5
MISC metadata.xml 320 BLAKE2B f5e0df5b735f9728165a2b8a6cd9c5f6d0142878f75ace80705d73e6948654f4761ef4fa4715b23ae4f5d97ed25e2ab6aa72582a80790a3f7a13d8c59f73ad40 SHA512 149372d821a11d3dfce7ec38ddb98c9b5b5e64c513fdd1e27b74dce17f398eec6d24b5a61ad62fb5e6e0ee31f206f1ed005db953f5f2358177f1a1d56420d5cc
diff --git a/dev-java/snakeyaml/snakeyaml-1.16.ebuild b/dev-java/snakeyaml/snakeyaml-1.16.ebuild
index d0e257b8771e..84d47f987398 100644
--- a/dev-java/snakeyaml/snakeyaml-1.16.ebuild
+++ b/dev-java/snakeyaml/snakeyaml-1.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -14,6 +14,7 @@ LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
IUSE="test"
+RESTRICT="!test? ( test )"
DEPEND=">=virtual/jdk-1.6
test? (
diff --git a/dev-java/stringtemplate/Manifest b/dev-java/stringtemplate/Manifest
index 8dc4bb360545..5ff0a33b0573 100644
--- a/dev-java/stringtemplate/Manifest
+++ b/dev-java/stringtemplate/Manifest
@@ -3,6 +3,6 @@ AUX 4.0.8-test-fixes.patch 1503 BLAKE2B 3d5e19d7084e0553b0d94fcfc3278bda55744271
DIST antlr-3.5.2-complete.jar 2456317 BLAKE2B d9afa08ad98dbff16d30425b97a0ddac7402055916e6a7dd290c3b9a2b26a4751c02f405d8d13c186333430c370c94bd73419b14c8e46df2971f68536cc484a0 SHA512 560f208e38759b5e626de56816e1fce9c191c526c04ca782513859d468ac444d1e8e62c03870a68f8f9d8daee0f45fca465150e2bbfc71b46e46b952519044b1
DIST stringtemplate-3.2.1.tar.gz 1039803 BLAKE2B 6f6ab7e1d5bc1e2bb01960c0baaea0bd07267af26ff481c1e1586392e0a8938676cab3e54c22b2804bed2806befd938d4d09715de45cea12212e424e2e30fc4c SHA512 fe4c50584dd3695514034845ba7b8fa300cf582b6b302797afadce990f2665759323f6a29ece1bc07dfab244cc00455b4106fe3ad6851165edbb8736ad7ec714
DIST stringtemplate-4.0.8.tar.gz 147305 BLAKE2B 0c09326f4eecfc86db8588a9b8db801bac8d8e128f8ef004a3691813d1dfcbd1e397acd5cad47e4c9d44d7ee8c17b8f6b66386fb897e4137df43dc46f46dc3f3 SHA512 21e4936356a6d374bf92645f09351a495a5900a408ead8dce1903ed81d7fc70eb4b44b206b587b05ed87edb2d4792c1cf72907a9cb527e18373ba2e5f31b5724
-EBUILD stringtemplate-3.2.1-r1.ebuild 1451 BLAKE2B fac962bb19d1011548ba6c7ab45744ab912deedbb9af4d27138c3d51f46f042a64f65d3404dfca3ed9104f0d3a5e2bca3ba86da5024d6a1576c7367bf0b8930e SHA512 0057643878f937518d0505511b92a8342688e3dc4f910370f07e9b856041265b482abcb249ff8ed5e44e4a5e4da3e07b5727bfe5a11e36a4d3a41768c6017498
-EBUILD stringtemplate-4.0.8.ebuild 2147 BLAKE2B 9d7a24c8b8a6e3bf6180b08207c501fc0d73e5569055ee0d0e9f69911144f17b3db8a08cb2d15df7d0a8ca0ab34ddb219818e5c0fd34778a15706428c7a6f819 SHA512 5c25aa9130785faff5d1c8454401527077b403d7522128ced29c344acddff4ddab20ce5469de0aa58c4d8db18400a2511e255fe2530ab565fe1a0ce884ff0788
+EBUILD stringtemplate-3.2.1-r1.ebuild 1475 BLAKE2B 82afa01b1b78507d830624069f58d2435f805d2c217ba9dbadef72764f80b147f215477727de73132d0622fbeb75e6cca244e33461397dbc701f6adef4a1ff2b SHA512 2631bd95216430f64be2166df75c25d9a1f1ce509b221c17bd430108c6f76b784a224b24522863ee8c05e4de3065f250db18544849f7687efe4391f8d7b399ef
+EBUILD stringtemplate-4.0.8.ebuild 2171 BLAKE2B 09bd3adb7fc9c7c1b5e882b3a0835ee1d13f288554440064557c319254cba19c31502704e2ee39c07da750dd280186f952ebc8e0f3025aaceb8601b35425cac7 SHA512 25c3aa84f1b4eb761b6468c07d0610476bce336b5a1e91e915724325c56d4bfcbb97a0d2183f0ec7c681e953de276681266dedb8fa39a8704f8e48c2cbfac4dc
MISC metadata.xml 322 BLAKE2B a9d59ec72b635debef4618887bd9389b4db013017a0a952b28b5f07e7a2caef78976b51de098085b94cc16046fe5642a5b6da9e2a197aa51d39daac6b25f1c19 SHA512 76ac99f8c99d34b533c08ae008a9eb2ac2a3b64589df3d43460c93b78c3c53c45b944837cc7f5514e90afc2117554fb545306e74a2b2bcb5c8339c656998c449
diff --git a/dev-java/stringtemplate/stringtemplate-3.2.1-r1.ebuild b/dev-java/stringtemplate/stringtemplate-3.2.1-r1.ebuild
index 22164ff6a6e3..b8733c26b50c 100644
--- a/dev-java/stringtemplate/stringtemplate-3.2.1-r1.ebuild
+++ b/dev-java/stringtemplate/stringtemplate-3.2.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -14,6 +14,7 @@ LICENSE="BSD"
SLOT="0"
KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
+RESTRICT="!test? ( test )"
CDEPEND=">=dev-java/antlr-2.7.7-r7:0"
diff --git a/dev-java/stringtemplate/stringtemplate-4.0.8.ebuild b/dev-java/stringtemplate/stringtemplate-4.0.8.ebuild
index 7b0d10d82352..41fc1a76287a 100644
--- a/dev-java/stringtemplate/stringtemplate-4.0.8.ebuild
+++ b/dev-java/stringtemplate/stringtemplate-4.0.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -16,6 +16,7 @@ LICENSE="BSD"
SLOT="4"
KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
+RESTRICT="!test? ( test )"
RDEPEND=">=virtual/jre-1.6"
diff --git a/dev-java/swt/Manifest b/dev-java/swt/Manifest
index a3330720a3bf..37e4ecd732af 100644
--- a/dev-java/swt/Manifest
+++ b/dev-java/swt/Manifest
@@ -21,7 +21,7 @@ DIST swt-4.10-gtk-linux-x86_64.zip 3844306 BLAKE2B 0e0ed21708acce347fd025920ee63
DIST swt-4.2-gtk-linux-ppc64.zip 5935799 BLAKE2B 6b1ca0d25d81134239e56ead673303075b6d9c5f20e4ab07fb7b5b87d54582023d02c28a1d330fd40d647bdbc27823ca7b184837cb974706ee13809ebdfd2db4 SHA512 bedd64099380980a6dbe47b86f4719666366680f7580150f97282c6f6b6acc95822493469e950e8fcbc9c584f6fca9f35a59937551ae8b6e799b188dc3751e9d
DIST swt-4.2-gtk-linux-x86.zip 5561088 BLAKE2B cf8bda6a48d5d8e389c387162bf2aafde5a95c43d76e444a4b79008e1154348d2c99850851b3d0e428890e6b2da1e4bec53a7f9050169ad4866a5a8352e9ed2b SHA512 e3d53bcd0521411c40f4c37719917f3570a17fb3ea5c617560986273fd155b99d9b0790ba27c57da26663d49ebec4c6a8387b41bd01b0ba934b21724ba98e133
DIST swt-4.2-gtk-linux-x86_64.zip 5867140 BLAKE2B 994bf18799297529329637c1b9ebf15638187339b4f56bf8cc1dedfc97c25a1ea4a1664605cac1374fe3d79b321dc450c6129ebef00ddd6f9507f238b7836316 SHA512 56c5ec4ca2ddeed5256dd6ff350dc3911034ecbc414a06ba879f04ab53d6380ca9da9037097f76228ca8182f6076bcd9cc4cb9b01c10766c10048e6576fc5f50
-EBUILD swt-3.7.2-r2.ebuild 4606 BLAKE2B 9d782b21565f93a1d69e83f3f65ade694bbc1034f24ac2b1a59ceaa1c2da0defcd00e27d43c43907e04661b3a29094282dfca952caa99d4ece750b72491f28ec SHA512 6ca872bd210d5823d369abc031d3e412a3e3f869f541c37f4fcfc084bedefb1e3144f3aeb7d1bfc039b0337641c1582bcde76a279a5a0f6a2b5b0f5c4232495d
+EBUILD swt-3.7.2-r2.ebuild 4599 BLAKE2B 40622f45bbed4e5ccd75088e29aa1715faceaa3ff4823609ee832ef068ebc4d08c921f5b8f7e2a656c46f3f69ba7c8edb32c1defea7cc4c3f723f5765e60b1dc SHA512 9a97b882c2f18f0e9dc552a5dde1476fe360ef478741735601e6aa5cb847aad35b71c3f258644b9ca2cc1b1649e0838cd44ef7278f3f02682afc0f7c9d24da8c
EBUILD swt-3.8.2-r2.ebuild 4437 BLAKE2B 19f84cd5506ca1306754a26f601d9a1a18b6e3f3091e7f38fb768db833621c741502794417ab7099a1edec0546ba6c79785c918bb26aa0acfb3bdc5dc788b860 SHA512 c4e25e86c66d29d74d5bc100d97214b3742369ab7bbf96f38fd95ed28c7c03838f3260dcd45f755c90a07ba4f0f0a066702f7f8b2396e66569fe6f513770ab28
EBUILD swt-4.10.ebuild 4442 BLAKE2B 1c5ee9e7fda684687e298d1dede32fb468d279a3b0340308b490c39472dc05df04141fa874788b6c9463456bda9eb4125cabc95462eee53ed44f02ce1bc04558 SHA512 e07398f920e59fac400b0aac2cae521ef1bad900cb18969b780ce8706a0cd23c303e16b56c7b82334118ba258dfb69c6f7f03b11623c2a7e5781e9cc10f79fa3
EBUILD swt-4.2-r3.ebuild 4682 BLAKE2B 1e47fc517f3eba4ff626129f5b4810dba8930da995aa03788806d324192443e56570c280e3e732f4a58b6b3aad125574b22e8d024de11b56cced051675cb382c SHA512 15ffbb9e0cdaca5bc782327052d049efce05686d2a27ab84f44c9388e82a2f83ce42adab9e2c8110580b7572b18b111d5dcdf5ab601021cc2a321a84ffeca130
diff --git a/dev-java/swt/swt-3.7.2-r2.ebuild b/dev-java/swt/swt-3.7.2-r2.ebuild
index aa38b1de0654..8444b55d8ef2 100644
--- a/dev-java/swt/swt-3.7.2-r2.ebuild
+++ b/dev-java/swt/swt-3.7.2-r2.ebuild
@@ -165,5 +165,5 @@ src_install() {
java-pkg_sointo /usr/$(get_libdir)
java-pkg_doso *.so
- dohtml about.html || die
+ dohtml about.html
}
diff --git a/dev-java/tagsoup/Manifest b/dev-java/tagsoup/Manifest
index 5035a9f3590d..69ea5c27d5d7 100644
--- a/dev-java/tagsoup/Manifest
+++ b/dev-java/tagsoup/Manifest
@@ -1,3 +1,3 @@
DIST tagsoup-1.2.1-src.zip 222757 BLAKE2B 79a43edfa9aed7f08bfaedbe758b2a08d5ff596e268cc415707aee9076bcdbf8de0b4c2a855b9558ff2cf598ed4811a7a690aef6c5004e34484ffe3087bef8e9 SHA512 3bb1608746270663f6ed45318457e3ee27419929411689d962cffc0ab0c32ec4b858020043be46e929014b696c753a01b49d6eea9a98f18d81fb9205e99ac0a1
-EBUILD tagsoup-1.2.1.ebuild 1095 BLAKE2B 2ed1adecb2a8eea7f2970765e6cc0d22274d897b179bd0bdc22ce831366bed2355789eff466ed027b2caa089ded99df47cb61320358aabf5ccb0cd28363fb285 SHA512 706a39c9e8c4cf763ea7052a2fe8f429c87fb75f9dba24a5cd1701e582058fd8c7642eafe943be337c75cd5ec7fe1b438e20a9037671f20885611754e5b378c8
+EBUILD tagsoup-1.2.1.ebuild 1081 BLAKE2B c19d0ebb62307942249e5995d246136cdd0fd66f86aa2b3783b79fa3147e251796a8e534fd7a6b8fe293745e129992b92117c1304883e8d19c69df7d628f5203 SHA512 353d1bc5218d169b6334a5c1a8a54f622e417af726555965f31a8498e448e0d4c6131d417de79eb4074becd91240464efb58a78ede9c18d5b31d1af5d265b9c2
MISC metadata.xml 501 BLAKE2B e343c2ff8cc35280a493830bff0fbd4486a37fcc22d79eb8b74e6712250e9c879b50f8beede300189d233cdfa9579f02b921573f6e3af1bb399d34099764caf6 SHA512 e8abb4f880b76ee62dd56e0caa65868efa920f080cae9c137a9ff2646e77c2e22e5bb687e584f1b9621bb10140d6725626b01adad7df85f19ce55d80b4706ba1
diff --git a/dev-java/tagsoup/tagsoup-1.2.1.ebuild b/dev-java/tagsoup/tagsoup-1.2.1.ebuild
index 003f63259bff..0377d35022df 100644
--- a/dev-java/tagsoup/tagsoup-1.2.1.ebuild
+++ b/dev-java/tagsoup/tagsoup-1.2.1.ebuild
@@ -34,8 +34,8 @@ src_install() {
java-pkg_newjar dist/lib/${PN}-1.2.jar ${PN}.jar
java-pkg_dolauncher
- doman ${PN}.1 || die
- dodoc CHANGES README TODO || die
+ doman ${PN}.1
+ dodoc CHANGES README TODO
use doc && java-pkg_dojavadoc docs/api
use source && java-pkg_dosrc src/{java,templates}/*
diff --git a/dev-java/tomcat-jstl-compat/Manifest b/dev-java/tomcat-jstl-compat/Manifest
index 2a03b0b91092..59b0210a6e46 100644
--- a/dev-java/tomcat-jstl-compat/Manifest
+++ b/dev-java/tomcat-jstl-compat/Manifest
@@ -1,4 +1,4 @@
AUX tomcat-jstl-compat-1.2.5-build.xml 8436 BLAKE2B 7441db9ba5fcd306024dbdcc6777b09e3d0d1bd47ab25842c4eebc6799a7d9c46210dd38749c38fc38e64a0f64e552a2942b5faa93de8d5378c7303296c88f49 SHA512 a03eb25054c14fef478c6ed90b0c814c0bb48f39e778f225974a426fa86c39bfc53ded15dbc83ac45bf010f22b47cbf23384f96b1352f920297e680e77ebf6a2
DIST tomcat-jstl-compat-1.2.5.zip 615779 BLAKE2B f5c307625a84a7170659683913282df1cf7e8b6a021ffed9895aa0e770a35d8db5351660c96668091ed59e5be35d2e8ad9359f524cbfe5a380e89ebe4fe08b43 SHA512 ad4122cd75c66df901034e333c2b38ac3d2d8f5b0299abd36d0fd1c8f5975eacc71d66a475fc05638dd562ab0670ea532fe6a3ccb5497dfbeb9d859b03b659d0
-EBUILD tomcat-jstl-compat-1.2.5-r1.ebuild 1449 BLAKE2B f29075a5be950a7733201569143fb307bd0309c25f9313d347d4684f047dddd095b9b577e79f2fdeea855f9a95e3ecdbcbebcb7a582f8fcb12d46164d23c551a SHA512 23f5bcd12b0ec8927f681a6842a8c64dfa1123e52ee8d450d89c199c707768688ddc15991dfa85b38534fc7ec90996b9db5dce0e6e2c2310a40e9584a4a8781b
+EBUILD tomcat-jstl-compat-1.2.5-r1.ebuild 1473 BLAKE2B df58f94f08ae757732ea61ec534611f60aa7ef65831ed491d8ef936dbacc14a0b8d48ebe586bd41448fb6c004e12f362fdfa29e90bf378e31669b0859b9771b6 SHA512 f0a2ec87b9788f6ffb80b7c3aabea661a2b0267b2f8f87cb170067ea7efa8addbe21b8f34585832fb4fcbca30f87b72a2987f8eecf83df5f6a4049ed0a86b74b
MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/tomcat-jstl-compat/tomcat-jstl-compat-1.2.5-r1.ebuild b/dev-java/tomcat-jstl-compat/tomcat-jstl-compat-1.2.5-r1.ebuild
index 6cd82ef7d554..279a08d9fcb8 100644
--- a/dev-java/tomcat-jstl-compat/tomcat-jstl-compat-1.2.5-r1.ebuild
+++ b/dev-java/tomcat-jstl-compat/tomcat-jstl-compat-1.2.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -19,6 +19,7 @@ LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
IUSE="test"
+RESTRICT="!test? ( test )"
CDEPEND="
dev-java/tomcat-jstl-spec:0
diff --git a/dev-java/tomcat-jstl-el/Manifest b/dev-java/tomcat-jstl-el/Manifest
index a794cc2f26d0..ec3ba798c840 100644
--- a/dev-java/tomcat-jstl-el/Manifest
+++ b/dev-java/tomcat-jstl-el/Manifest
@@ -1,4 +1,4 @@
AUX tomcat-jstl-el-1.2.5-build.xml 10138 BLAKE2B a5715431485ad9c77943df2e1b672e05e5f5e6c122575dd1ef5c344a617aeebd5ca7fdf5da8900f12af851d765c9796984afa60a486256fc00b8e7bf3548396d SHA512 381bcecbf2350a0efcc85131983abc7d93c44cc8926455760922e9cf45dc8da24b24746a75355187b00956e6c050ad08d632e93258f6c9c24c8b36dd8df8d7fc
DIST tomcat-jstl-el-1.2.5.zip 615779 BLAKE2B f5c307625a84a7170659683913282df1cf7e8b6a021ffed9895aa0e770a35d8db5351660c96668091ed59e5be35d2e8ad9359f524cbfe5a380e89ebe4fe08b43 SHA512 ad4122cd75c66df901034e333c2b38ac3d2d8f5b0299abd36d0fd1c8f5975eacc71d66a475fc05638dd562ab0670ea532fe6a3ccb5497dfbeb9d859b03b659d0
-EBUILD tomcat-jstl-el-1.2.5-r1.ebuild 1426 BLAKE2B 7456538a62b9e47e51417066fad0de0d75d7c1f0f3d90de6067bc33f81c7389cf1dd47ef1e55fed43c44d15120971c336e58bd280d3b5d9f58cc213da7789d27 SHA512 6d0d8f3bcdf2a350d974c696db3a8450fd168dfdeabdc7dfbae9e4d4f7e6c205cff800c4b0f1a16d9b6db9ad1d19b38474aa3652d3fbe962cfda9b7dd0542488
+EBUILD tomcat-jstl-el-1.2.5-r1.ebuild 1450 BLAKE2B 7f5e0ccc1d25fee1946b6d96ae77104fef2f69dd4ed88f09b1146580c45669829f6a845926f3963df607ff8bc32cc9ed165b8b4adb061f582bb682afbe94c405 SHA512 930c6ad1590f7aa9e0b0fe56ebc516eb923ca671731600c23e4161ee7aa347275221cad21fbccf3f7ab83db6afff31230b36b44e7f91eb4e9c2060be098f78fc
MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/tomcat-jstl-el/tomcat-jstl-el-1.2.5-r1.ebuild b/dev-java/tomcat-jstl-el/tomcat-jstl-el-1.2.5-r1.ebuild
index acb770d95175..819873d5ddc8 100644
--- a/dev-java/tomcat-jstl-el/tomcat-jstl-el-1.2.5-r1.ebuild
+++ b/dev-java/tomcat-jstl-el/tomcat-jstl-el-1.2.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -19,6 +19,7 @@ LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
IUSE="test"
+RESTRICT="!test? ( test )"
CDEPEND="
dev-java/tomcat-jstl-impl:0
diff --git a/dev-java/tomcat-jstl-impl/Manifest b/dev-java/tomcat-jstl-impl/Manifest
index 03bb006d9553..0e984ad6c2a4 100644
--- a/dev-java/tomcat-jstl-impl/Manifest
+++ b/dev-java/tomcat-jstl-impl/Manifest
@@ -2,5 +2,5 @@ AUX tomcat-jstl-impl-1.2.5-ImportSupport.patch 1141 BLAKE2B 6781a2d1ab7b706895f4
AUX tomcat-jstl-impl-1.2.5-SetSupport.patch 1334 BLAKE2B ff3c948f782dd19f9d697045addb44e75c62f76890d450bceb6a6c743aa9688eee6cc627f23292f818d33698e274901b247d64fbe06c6a050b96550ed023ef93 SHA512 1a4f969c03312a02485e1eb37b3bcc0ce0153095f163c7c776c3a10e26c7b2c909fff1f3d16c7b2e178eac190f84432f0adeb2c3eda6004d699ad7d3377f3b22
AUX tomcat-jstl-impl-1.2.5-build.xml 10337 BLAKE2B 68f960261f773c48e06b0a41386770a63af71a8c04dcae794f235de17f9eb20905326166aa3e8aed9a966b1e5ee252f0c0846364648bd692e36bbbd1ec050448 SHA512 e2ecf367a8d30f64c65bc4cf2b84bd017fe7d2dc32cf6030b25e0b0dd3533609243b71c0f7805196901e702da12feb3c5b60cc4f6859f9aa2419e1732a589e8e
DIST tomcat-jstl-impl-1.2.5.zip 615779 BLAKE2B f5c307625a84a7170659683913282df1cf7e8b6a021ffed9895aa0e770a35d8db5351660c96668091ed59e5be35d2e8ad9359f524cbfe5a380e89ebe4fe08b43 SHA512 ad4122cd75c66df901034e333c2b38ac3d2d8f5b0299abd36d0fd1c8f5975eacc71d66a475fc05638dd562ab0670ea532fe6a3ccb5497dfbeb9d859b03b659d0
-EBUILD tomcat-jstl-impl-1.2.5-r1.ebuild 1738 BLAKE2B 5fb462e1d63f1a69b98006b0c5ee89016dfc87e394cc0eb7a870bb0d9c4308ae8f1e90db58dc6bf4a970455922a267dfa7df13e6fd39eb2cd687b4739c91b48f SHA512 69944c7638fa6bafc3b1b31a1945eea649ab3b25888fe560762079377b56b7b03c5325f5509766ce21194f15417330d17b7e0eff0ad7d034cfd5b1890209b214
+EBUILD tomcat-jstl-impl-1.2.5-r1.ebuild 1762 BLAKE2B b06769b3dec37efa0e5566ec73263c4ab6d09aa8c84df98095ec65440c792df21c00ea8830d85b275b569696105e5db3f8860bca681ccdf8c39a6305b6491977 SHA512 8e3f0d78d65b424bb5c8f6c54c1408c6e43eac75fd2f5d9cf1650d38037c51a158835cfecbd8dc4025d932bf7264ad48e42b2b06fc03b69025d6ffa4b8d5e01e
MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/tomcat-jstl-impl/tomcat-jstl-impl-1.2.5-r1.ebuild b/dev-java/tomcat-jstl-impl/tomcat-jstl-impl-1.2.5-r1.ebuild
index 42d13cb63240..80abba919d84 100644
--- a/dev-java/tomcat-jstl-impl/tomcat-jstl-impl-1.2.5-r1.ebuild
+++ b/dev-java/tomcat-jstl-impl/tomcat-jstl-impl-1.2.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -18,6 +18,7 @@ LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
IUSE="test"
+RESTRICT="!test? ( test )"
CDEPEND="
dev-java/xalan:0
diff --git a/dev-java/tomcat-jstl-spec/Manifest b/dev-java/tomcat-jstl-spec/Manifest
index 0502f5511bcd..6972feb927ae 100644
--- a/dev-java/tomcat-jstl-spec/Manifest
+++ b/dev-java/tomcat-jstl-spec/Manifest
@@ -1,4 +1,4 @@
AUX tomcat-jstl-spec-1.2.5-build.xml 9490 BLAKE2B 3616a227199fc79e3f65ca8f1d6d9804bcbbd52528122583d3aa5dfc7ddd27755149b794a64cdc86db76f39ad75957769202eb617e59f1dadc5721482424ced5 SHA512 7375c12b07eb3ce07e03826219f1e239a507cea6052605ceac5261ab9cfbb2c28a8d88d95ee8fb90c8172847317adccb4969ac5e8e4caf0c20f39f46ab20542e
DIST tomcat-jstl-spec-1.2.5.zip 615779 BLAKE2B f5c307625a84a7170659683913282df1cf7e8b6a021ffed9895aa0e770a35d8db5351660c96668091ed59e5be35d2e8ad9359f524cbfe5a380e89ebe4fe08b43 SHA512 ad4122cd75c66df901034e333c2b38ac3d2d8f5b0299abd36d0fd1c8f5975eacc71d66a475fc05638dd562ab0670ea532fe6a3ccb5497dfbeb9d859b03b659d0
-EBUILD tomcat-jstl-spec-1.2.5-r1.ebuild 1337 BLAKE2B c460db912a50ed3a9ac7ed6f41502c69e150debff8fa1727eaa567f15b7a1c22a42c2e5faf68e4f796f00f2a773147298878c083513c291b4e1a927c2bf1b1ab SHA512 518f5eeb6503a1bb19fcc3959094a28a624fe79e39ee92a20967f3ab88d29872a203ce8a2b29467f0ae238bd1bc9e237b9afa30e3b844fee39618b68d96cbe30
+EBUILD tomcat-jstl-spec-1.2.5-r1.ebuild 1361 BLAKE2B df921856d6bf08b26f87a7c5f3f144e9b067b07f39d468c842d871a0d0bc5bc781f8dd44b85f83e40b18fb1812ac981626e9af633e87254b1216027765972c4b SHA512 4fe459e64e14215f3cc5c74f9351781817acdc879c3831fde8df1f48eef273f3639f3bae8af6b11f692fd5f976f9ec90010776a74a49cb4d3fdb061683359ca9
MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/tomcat-jstl-spec/tomcat-jstl-spec-1.2.5-r1.ebuild b/dev-java/tomcat-jstl-spec/tomcat-jstl-spec-1.2.5-r1.ebuild
index 53f1365c8541..f765fd0acbcd 100644
--- a/dev-java/tomcat-jstl-spec/tomcat-jstl-spec-1.2.5-r1.ebuild
+++ b/dev-java/tomcat-jstl-spec/tomcat-jstl-spec-1.2.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -19,6 +19,7 @@ LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 x86"
IUSE="test"
+RESTRICT="!test? ( test )"
CDEPEND="java-virtuals/servlet-api:3.0"
diff --git a/dev-java/tomcat-native/Manifest b/dev-java/tomcat-native/Manifest
index 9beeb14c1bec..69cbbede56f5 100644
--- a/dev-java/tomcat-native/Manifest
+++ b/dev-java/tomcat-native/Manifest
@@ -1,5 +1,5 @@
DIST tomcat-native-1.2.21-src.tar.gz 418909 BLAKE2B f7559f204941cd8f8383bda7591e167c247062b4f79c507a5a449715a5554194197c4d34197f30622cbcbd81952597ae757623c903f11959dc8b4fa81234e127 SHA512 7f43f815785e5bc3e43f5b2e9ad1c90576a3c1528d57230328b7175bf475eb5f4e1f91b66fae74ad32cd76f044d7705f98a79109f6f84e5af75dc32bc8830b29
DIST tomcat-native-1.2.23-src.tar.gz 419428 BLAKE2B b8e0584d3e42c33158c4edf0432b029ee924a509b00625af6a34af3d580fec510fa0222367ea8679a20b51cb5a7c55198f5a2d4ec60d0fa9dbec3a0a22a11b52 SHA512 89a0363961d322a87f4e752f4727f54f28ac6e4ad10fa21b6b7390c62b041d4068672d95495d9233c1cad7d6c1dc3c85fbd0186894085b3b94e476876af160ee
-EBUILD tomcat-native-1.2.21.ebuild 1151 BLAKE2B 8420a566f91395dbcfb2eda52e1d2690d28d9eeb3da1591f331b479589b01a6303e5280f4ff5eee914c5207b3aa433be5779209b5550cb4b68401206a0d89a5c SHA512 384a632497f10dae1e481f0aeead04997f4742b32f00f53514d2851d0218e0b4cca519bb2340bc258935e5afb94f206bb5b790737f877f2708fc8b62e3e479b8
-EBUILD tomcat-native-1.2.23.ebuild 1152 BLAKE2B 04e90bd80d600dd27976d82caba2147d02926a26ebb701546eae0a8af8d07947dd9fac5af647f8644606cb8d00826786b4171a8f50f9e3ba1bddd0987fae29b2 SHA512 45e1bc65c3376b5f7c74f0d9df7a24a9be8648041852e4a3f7d8335bb335502ee598fa773c37b18901a3add1a3584895e1850a5be63c1a43da2967a801d9fbd3
+EBUILD tomcat-native-1.2.21.ebuild 1178 BLAKE2B f69f4effd576d7a50a24280e1a081461bff626e1e50448edea43d8e36817f38b6c0bdd134e47566305594d44cb5fad65fc74bbcfa1a8c4faa53a66deeaab70c0 SHA512 192715b2f01b2e8f4423f2990883360d275a45394288bcfe1fae3dc7f63b9611c01aadb41ee7ea647c89761c33b955e79f6556999ea8a694bf4dfebf9af8c63e
+EBUILD tomcat-native-1.2.23.ebuild 1179 BLAKE2B e18fbf8af973c9e262600ecbea14558d0bd701e07b973b06887f90368cae5cf4a3791443f982de1976b1419c5d4cefcb4c47026c9b18160515ed68dc1430ba5c SHA512 c6237df322fae9f55eed05a35510e6bdf90ad8d0835630099b488e36bb4026e1e69e40ed0d831bd257fd133878c08b03b02b1a91fb8fb64edb5e8953bd234ee3
MISC metadata.xml 806 BLAKE2B 7f193bb62b100b0c141677fcfe9671122b70bf5091663757fca98941ca2a7c195c0b7f4f1fd95c96706a8a8c8508a7a6b63858d2eb7a3afb75b4ec21f5eae021 SHA512 7bedd98efaa696458ae80b5bd844a569b2bda8903a7d4e7c9ee9ea197b80abacf7f257ff91aa14d4cf6df830425df58f08cac7c3e9ded79823424b352fd9e978
diff --git a/dev-java/tomcat-native/tomcat-native-1.2.21.ebuild b/dev-java/tomcat-native/tomcat-native-1.2.21.ebuild
index fb46a0bf4e2e..82f1d3aede1c 100644
--- a/dev-java/tomcat-native/tomcat-native-1.2.21.ebuild
+++ b/dev-java/tomcat-native/tomcat-native-1.2.21.ebuild
@@ -13,6 +13,7 @@ KEYWORDS="amd64 ~x86"
LICENSE="Apache-2.0"
SLOT="0"
IUSE="static-libs test"
+RESTRICT="!test? ( test )"
RDEPEND="dev-libs/apr:1=
dev-libs/openssl:0=
diff --git a/dev-java/tomcat-native/tomcat-native-1.2.23.ebuild b/dev-java/tomcat-native/tomcat-native-1.2.23.ebuild
index 0db3cc71d61c..176381b24148 100644
--- a/dev-java/tomcat-native/tomcat-native-1.2.23.ebuild
+++ b/dev-java/tomcat-native/tomcat-native-1.2.23.ebuild
@@ -13,6 +13,7 @@ KEYWORDS="~amd64 ~x86"
LICENSE="Apache-2.0"
SLOT="0"
IUSE="static-libs test"
+RESTRICT="!test? ( test )"
RDEPEND="dev-libs/apr:1=
dev-libs/openssl:0=
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index e6abd5d9ff0a..3e87e88bca70 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -8,19 +8,18 @@ DIST apache-tomcat-4.1.40-src.tar.gz 3709719 BLAKE2B f7ca82052c1148a5c384fcbc387
DIST apache-tomcat-5.5.36-src.tar.gz 3743113 BLAKE2B dbfcfd123a23b0ceb9f1fdd936e42324ea8b10cf327a1d0abf1703006535859c7122690a08b5ec27b86b526cc7709a7199b4f35f123538ff11f23f3b489358f3 SHA512 845636b5b992fbbb7d657d192afbab1e6a924bfd0c71b025cf22776eb4527d92d63f9b3f33475d4349a0df4cebd984ba3776eedd7482b820abdea909e90a97b7
DIST apache-tomcat-6.0.53-src.tar.gz 3522914 BLAKE2B 054b097c16861abaa8bdbeba713b49bc1dfcff573bb3f4bd0ff5807c33a2a0fb991af618f6e11e5b3ce3fa55c589fc6569342cab5d5a00349c79bc7061d81e40 SHA512 915a0a18f5c2883625c9441eed6465973eff4f6bf41e08e925c7edaea89ef8f6ee9476d3e06fa38228d4bcb4decaf53e3a7bdb7ec7e899e6250db3e12a9f5f2c
DIST apache-tomcat-7.0.96-src.tar.gz 4983881 BLAKE2B d5b828b7a4e8a7a5ce793a15421fbd6b12b55918aa7c15bc8209b4c762d7f422a7315e4cbe9b4ae2da754b6d8493bc11ae6a5c99f11a1ac3b23473e05fa26c83 SHA512 5797e66fb9ce558340e08d3a4ccd372d912707aabd6177318781925dd35055902a0ecc3e50e677d76b0feea547cc8fc038bb83ae5de65d28680cb4c9582f60c0
-DIST apache-tomcat-8.5.46-src.tar.gz 5599021 BLAKE2B 3755f15612e63ac06cbfa097f1531dc36542ba559a6ef60230b133e45d14bb4c4c54d4dcc8b05b9996f54ac253fb1630f6a6e900ee00e4af0a9200f83455a952 SHA512 02e93cc6fb4226e81b03ae60f479e15b438b1c68c1a4104200db9cc473939b92d66eea12f0783727b06f643d11ebe3da2a81c80cbe486ed497a3280e8cdb2e62
DIST apache-tomcat-8.5.47-src.tar.gz 5607118 BLAKE2B 3c326056f674032424d298c7581243a24dd01fae39b1ce7069b60e1bcf3d825de954164f643e887618c43c87d691bc41f942e73bf86b254b4c7dca9c68ce7cce SHA512 1513fdaf7751ee263d878cdfc05329bc4ee50e2f3aeea68e1d173a5f4d555ec59a43050222f013758f704967730dd25a64337cf1ba4365ab53b8730af87b4051
-DIST apache-tomcat-9.0.26-src.tar.gz 5750303 BLAKE2B 582acae0f24cab5fdd44c085b36e771508020d124f9329036b3bf0698da1fb2cda69d6f4254eeaca00ce3c34c3740fe69c077637107167fface60b9fa74c8869 SHA512 8f430439c66f5a43c7a35bc99edd11549100be28b17fb44e17ec432f72e1797cdebd641a7f19c1d918635e51c164ecd1c9d1399a63abfce05d9a8c37db381837
+DIST apache-tomcat-8.5.49-src.tar.gz 5633029 BLAKE2B a01e88df94e27446a7792cccea64ffd30580db40d5473445e62ec15cb21046fb1baf2155fa36462f72aa477a15fb1c892b2494a93e601eebcd49241d5316a9f6 SHA512 c90615ed1548ed6f7bcec77dbebb6b4b95c91086042cba53c207bf1475ab6183a435f3c2c1e3f8fb769f9a144216e64a6dd08b3f9dd56fe2e4b143e00a35161d
DIST apache-tomcat-9.0.27-src.tar.gz 5761278 BLAKE2B 7d4a65dfa43e0956a5dbb1dad3bf1aa475e7c503d3192ac24921d7cee9bd85379cd820ce693e8c583a7cab23263b0abfa960968d04d766764e222ba8c5bd97d4 SHA512 3f63cbd49f93e6a9d44ea63b4f787cf498930b82d19eaf60603c126b8800d2894d306c27e42ab73b042f3bba9cfb75b6c939b91b8b9141e4903eb1b88c2a4ec8
+DIST apache-tomcat-9.0.29-src.tar.gz 5783830 BLAKE2B e724bb6b35e9a466d39e95a8004751e982e50cdf303097fef6af1d6b3feac5442d38e1c30c141dbf91cd4b262954f0d266baab489d4e369e6c4056e101d9e6b5 SHA512 f4ea845ea4f6161ebc43f84b66704357ca507afe534d37f7605ccb7a0dfc22e6fdc53507d9c11108f01c458b937033472b8b5b01ecf50d082d21ef90aa516fdd
DIST apache-tomcat-9.0.7-src.tar.gz 5106551 BLAKE2B b4552146a40c2e7cbb2e454fb5ec9169425db5c08cf269c391ec3144425ad388a2b6f003a7c05f59a9fd724fb5c848102890a24fcfd43d5fea3d881141aa7798 SHA512 cb7dc5547671d94f7c7fb0b58eeb94d05128349cdabf576fc8ad837a4bf3ea655a8eab3342245dfa84a9db23f1cbee2918846eedd48e3ca372eecebfef13c5b2
EBUILD tomcat-servlet-api-4.1.40.ebuild 996 BLAKE2B 0820bfc92a49246c9d35774e8efcb02eb64a7a98b1276c847bdd42528f0331bfd9d3e8d8f4d6320667cc0fbb52552ca52fdee6735cf0ce97d6d975377061af91 SHA512 c3cca19f2a4206dd68328f6d6c902b15f6fb4a8b740dab698b8d668354f98c6fc272b19ec1df4bb7c4c65e729460b41a512d4d13ca765ee4be8879108b14766c
EBUILD tomcat-servlet-api-5.5.36.ebuild 1430 BLAKE2B 2bceaac608b1e285da260b9041596b18d5c360d9d7ff596f1b558fcddb6a4c38865ef1a384bcc98b8187e9ac4fb0ac45d57676fab2001bb7f595c6fb9080e0cc SHA512 b9745c4beb9d3ce8645c495345d7dd76fb9d930ce72c8f7387d9cc73e615b62f40a2f470b46cef407ed0b097b050413451763acb81edb0c87d0d95ffb28c9319
-EBUILD tomcat-servlet-api-6.0.53-r1.ebuild 965 BLAKE2B 01b1cec108dad93539e7d7f5b4e13db3f51cda7406d9a64be1ed45adf86feb8630870ca2f0b8e6531e42fe1569bc98219f9fc3e3a57d37583287353d1061fd3f SHA512 518a207337802c8f92fa5e5305fca8f891f45475b4aff625c5798243c4eddb83a2c287f5acb6f2d0075299a6a4de8a0a55c5fcd37d3081823409d5b003773605
-EBUILD tomcat-servlet-api-6.0.53.ebuild 938 BLAKE2B 60720f202a842d68d95ace516b2adfd8b5cb93d3a60d4f6ea642acd813a0523d29ad76e905c7805c1105a7149f5535fc8884fd9656199f8bf91999cc06fa726d SHA512 e5a82261c733db892d609ffd6d0c404abcb2b6c67bdd2d86dfc413573c2edfdaaa8f240b4865a97991719cf2edfe6ae610d266954a955ad3c26db30ba6af9adb
+EBUILD tomcat-servlet-api-6.0.53-r1.ebuild 962 BLAKE2B 6abe44ba77bb16d78f1529cacbb95bfc439c63ba7cc3ee594209cb22927374e184edb90804ad1f55aa6721f98aa927f3bd8ca713463085233db1b233837acb07 SHA512 7a45a663f00ae5a71bea3002a72bd11a640583af44c0ab6a3dfbd6551bbf3a6de5f35e880643294c56027ecb3b7757425a2c26f34a96fbf8cd26df4a545086c0
EBUILD tomcat-servlet-api-7.0.96.ebuild 903 BLAKE2B 96a68aedd7a8659c8e28026ba7bafb0f6ac8b468a95daf136eb44ef793b36e3d7adf16f1bf3f01bda4f198cbdd9f792051c492e47e5adf2b45f35d9e2b2d2702 SHA512 0867575b7ce8681f4a15edcdf70ed1ed3bb82bbed97128e238d650726e29e66f48dd2bbea4153e1426c24eb30b49b5eb783407533612336d1f5230d05a882eda
-EBUILD tomcat-servlet-api-8.5.46.ebuild 1007 BLAKE2B 6671b9a1acb4c81bc4f6fabd0cefa9474802071b8d674784cb008af1418183496cad29a6d1ab4ce285d9a5e036f099f034258fafe399c540fb60e3fa8ea0333c SHA512 2d78ce62cd3b66281a05681e53cc5f584fd301ad5971f22d971feabd692848f8eb7813da557f175032fbb7e9544dc10b9d63516317ae45035e592e306a4aad17
-EBUILD tomcat-servlet-api-8.5.47.ebuild 1008 BLAKE2B b0a72cde70dc747a59e3132f9e7137b9357e96246e3aff202fa2915f2bb8b605984861abfb2d6cbab144d829469b26644e8a996dca682d41d9beddcf6bbbf55b SHA512 4555d6f5edade7813fc1f36b7929221878447ef4224c96f978f5d36db262364bbe65b37c8bd0b844e10858055dddd7eb7d5840de00c32ef2b1fa219a741da1ba
-EBUILD tomcat-servlet-api-9.0.26.ebuild 1005 BLAKE2B 13c34d148546c4adaad25d2fa7ff3d90bb2464865b5af19832cc611ee3fb6c0a10c26fac4ca76da16d42e7fa9301deeed7b2c94e73e08c7ad0287c59730c81f0 SHA512 f552bd4b8f38a5e3a569755a2105fedf4ddf03572cfc3c363455e0a4bfc17a0272a0bc264b1e3d84dfaa51089f0f54fc4123a5964dc116be9b9181862b127f4e
-EBUILD tomcat-servlet-api-9.0.27.ebuild 1001 BLAKE2B d3ed95575adb0ac164f17e721146bb7f8c2e23bbe424cba29a1d2bf4bb97185371a635c5d5d06f78f395f0a8fda33bd00a707e545c706b4c43c288fbce976a94 SHA512 24d54ded5e701697509b6044be4b6f24591ad8349ff36ac331e7628c26eed22f7ec29f0ee82587b5005acf566f01e23e6e219670dc5e1269a80ff5536bc33765
+EBUILD tomcat-servlet-api-8.5.47.ebuild 1005 BLAKE2B 029fadc44ace7749ca1c4db4178f2c15cff949455e76510f31be9693266d9ddf08cd674922703045e462925ba413450b5bb61c3168796b0f21cfc498c3954cb4 SHA512 6e4e625564a15b37795c7f13277e0f3750a8ebd94d9b733867b28806f9dfa066baa88803840f6b26c1ec0a12b00c5b5440ef43a9bd77177161f7134aded2b5b6
+EBUILD tomcat-servlet-api-8.5.49.ebuild 1008 BLAKE2B b0a72cde70dc747a59e3132f9e7137b9357e96246e3aff202fa2915f2bb8b605984861abfb2d6cbab144d829469b26644e8a996dca682d41d9beddcf6bbbf55b SHA512 4555d6f5edade7813fc1f36b7929221878447ef4224c96f978f5d36db262364bbe65b37c8bd0b844e10858055dddd7eb7d5840de00c32ef2b1fa219a741da1ba
+EBUILD tomcat-servlet-api-9.0.27.ebuild 1000 BLAKE2B b410d7f4731df2e4bf4a6662e0af2499abb8025cd151f7945c36d5866ab9582794a1fec9ba83efc2ffeadbdf1be947a6827e2a022922dcd44912cc16eb0162a6 SHA512 d70c5000a9122e187b45d755f08a4bb8b76f994c5dfdc12146f6c4cef0d7e70607636dac9a43e221d8f7b6e50f85b34f435d221a8c837014cb309a2c9a993ed4
+EBUILD tomcat-servlet-api-9.0.29.ebuild 1001 BLAKE2B d3ed95575adb0ac164f17e721146bb7f8c2e23bbe424cba29a1d2bf4bb97185371a635c5d5d06f78f395f0a8fda33bd00a707e545c706b4c43c288fbce976a94 SHA512 24d54ded5e701697509b6044be4b6f24591ad8349ff36ac331e7628c26eed22f7ec29f0ee82587b5005acf566f01e23e6e219670dc5e1269a80ff5536bc33765
EBUILD tomcat-servlet-api-9.0.7.ebuild 1007 BLAKE2B 93f6cdc024db1fd4959c86661de3d58e4a3457e54e94bc26d28cfa14f276b17ae61113252b9004de8492f815fd4b02744e055c8082d3fe50918376e61dcca071 SHA512 4cbd09d197fa558fb2172bfb637c06c6f028939038ad3071074019de4663c833d24f8f96a1c7ca628241ae65ef16fc88a06b226f210070170844ad95e2890c51
MISC metadata.xml 343 BLAKE2B a80748e0afc76957694f9e0c5d086c538d4c88de015f5e66d7f1e0e21d38a2449f6986e708714610bc0ea3054b1330db2754f930c4500f213d8d6ca57f0b6c42 SHA512 62a67a69fdb781c32b070fa227e21223324678d315a5fa95687597744dd2d4afc26412ef0656d2e5cebc13d9ee2a0edf7f8e8f94b416a3996bb16b59bf2a83f3
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.53-r1.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.53-r1.ebuild
index 3f5e286bd928..58e80d34a727 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.53-r1.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.53-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://archive.apache.org/dist/tomcat/tomcat-6/v${PV}/src/${MY_P}.tar.
LICENSE="Apache-2.0"
SLOT="2.5"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=virtual/jdk-1.8"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.53.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.53.ebuild
deleted file mode 100644
index b1a2ab2e5ecc..000000000000
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.53.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-JAVA_PKG_IUSE="source"
-
-inherit eutils java-pkg-2 java-ant-2
-
-MY_A="apache-${P}-src"
-MY_P="${MY_A/-servlet-api/}"
-DESCRIPTION="Tomcat's Servlet API 2.5/JSP API 2.1 implementation"
-HOMEPAGE="http://tomcat.apache.org/"
-SRC_URI="mirror://apache/tomcat/tomcat-6/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="2.5"
-KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND=">=virtual/jdk-1.6"
-RDEPEND=">=virtual/jre-1.6"
-
-S="${WORKDIR}/${MY_P}"
-
-java_prepare() {
- cp "${FILESDIR}/${SLOT}-build-r1.xml" build.xml || die "Could not replace build.xml"
- rm -r */*/build.xml java/javax/{annotation,ejb,mail,persistence,xml}/ || die
- find -name '*.jar' -delete || die
-}
-
-src_install() {
- java-pkg_dojar "${S}"/output/build/lib/*.jar
- use source && java-pkg_dosrc java/javax
-}
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.47.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.47.ebuild
index 328f44502237..22fb494a8525 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.47.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.47.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="3.1"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=virtual/jdk-1.8"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.46.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.49.ebuild
index 9b931baf0d49..328f44502237 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.46.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.49.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="6"
+EAPI=7
JAVA_PKG_IUSE="source"
inherit eutils java-pkg-2 java-ant-2
@@ -14,11 +14,11 @@ SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="3.1"
-KEYWORDS="amd64 ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
IUSE=""
-DEPEND=">=virtual/jdk-1.7"
-RDEPEND=">=virtual/jre-1.7"
+DEPEND=">=virtual/jdk-1.8"
+RDEPEND=">=virtual/jre-1.8"
S="${WORKDIR}/${MY_P}/"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.27.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.27.ebuild
index 75af8e3a7dff..2fcbc10f1d8f 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.27.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.27.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-9/v${PV}/src/${MY_P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="4.0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=virtual/jdk-1.8"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.26.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.29.ebuild
index e35055493b79..75af8e3a7dff 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.26.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.29.ebuild
@@ -1,14 +1,14 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="6"
+EAPI=7
JAVA_PKG_IUSE="source"
inherit eutils java-pkg-2 java-ant-2
MY_A="apache-${PN}-${PV}-src"
MY_P="${MY_A/-servlet-api/}"
-DESCRIPTION="Tomcat's Servlet API 4.0/JSP API 2.4?/EL API 3.1? implementation"
+DESCRIPTION="Tomcat's Servlet API 4.0/JSP API 2.3/EL API 3.0 implementation"
HOMEPAGE="https://tomcat.apache.org/"
SRC_URI="mirror://apache/tomcat/tomcat-9/v${PV}/src/${MY_P}.tar.gz"
diff --git a/dev-java/treelayout/Manifest b/dev-java/treelayout/Manifest
index 93cfe145f590..d86496db03ca 100644
--- a/dev-java/treelayout/Manifest
+++ b/dev-java/treelayout/Manifest
@@ -1,3 +1,3 @@
DIST treelayout-1.0.2.tar.gz 1007086 BLAKE2B c5ef3f0bc2a7c99a983f648efcca65a4a4fd9d72710b7a1a8263629435da6a79a328778983475565dfc23738978bf658067e3e63e7c36db84a54189821c0da07 SHA512 89a627d8ab2f248bb9b22139de0a28f310deb555f78825f29f4acfd0df7b4c212c8df241b004f8452a4be8a0f7717ee996df3eef4dd88ca905f4ad211df92655
-EBUILD treelayout-1.0.2.ebuild 973 BLAKE2B 6a8196aa981ba9342bb3edbf0ad9e64ca30a07a71d9a410d370ce3163b216f5751e57e8045336c3abbf1cbfd4b4037bbc1f6a98a5c3ff89a9a2f5d43a7dda0a5 SHA512 24e85b8d21357b9816190b0a28c51a131dd38d24e7916fe2beb23bbf6a9d0a3e6f4e4f252216146313b202a0088d36cbea1161fab088a67b6fab99e5bd5995b3
+EBUILD treelayout-1.0.2.ebuild 997 BLAKE2B 6e989c85a5dbb00463f738ef625e72a00f0389250096299388069f16cf7c72c558af8e5401d22af7cdfa491e81a95a7e20cc41f5c771f94f56cb6d54feaf635f SHA512 03f72d722133252e6df276759f518a7fe97ed8a2f108907f6f90b083b05af0a8e138f6fb3a1d2c3921772fa5074ab10719e0a392be2e23101fbf2b3bf8518dec
MISC metadata.xml 677 BLAKE2B d1ed5c57f1b7ca4678e569abeefa3fe9ef1fe8113b6152ce27d5daa34faf84a90a612b3cc7f6f4977015cacb71c55457f2e4b26a5d5d07dc25424b8e3cb9bc7d SHA512 2abe1f3836f0efbfa2d52873e93d396b496e4bf52b7b0ac2b7c1641329a7756a04295a6600473160b863dc64866dbd2d69b8443599090dd36a77dee99fc9d42b
diff --git a/dev-java/treelayout/treelayout-1.0.2.ebuild b/dev-java/treelayout/treelayout-1.0.2.ebuild
index 5bd891235098..df9581ab4eb1 100644
--- a/dev-java/treelayout/treelayout-1.0.2.ebuild
+++ b/dev-java/treelayout/treelayout-1.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -14,6 +14,7 @@ LICENSE="BSD"
SLOT="0"
KEYWORDS="amd64 ~arm ppc64 x86"
IUSE="test"
+RESTRICT="!test? ( test )"
RDEPEND=">=virtual/jre-1.6"
diff --git a/dev-java/wstx/Manifest b/dev-java/wstx/Manifest
index 3b429be9f3ee..f66e4a9d5084 100644
--- a/dev-java/wstx/Manifest
+++ b/dev-java/wstx/Manifest
@@ -1,4 +1,4 @@
AUX wstx-3.2.9-build.xml.patch 389 BLAKE2B ddb6b3e359aaffeab92a7cf21bfd00070a178c9baf594d0d742dd393f2cbe5fa81d13ce8c2a1555eeecc9efe58e3797274547d3b9c9e746247fa34727a438132 SHA512 e9fb8f3c81957970b9b2fb73bdeb8d3b91d1fe30712829aa3dfa2efc3b0be5b97f0a3b668c99570d5d6ebd1893d0dfd11d8f1961af700a8ff4826ce3250ffcb5
DIST wstx-src-3.2.9.zip 2218419 BLAKE2B 98daf8a6bca50085cfa3f281c65567da5a51fd376042f6bb4fcb6bd1f77a442acbae8e27507e9aea8bc5da8da969f30c38a8e253f55d535f6669a3a0690c850e SHA512 316679a6586e453b85ffe4dd573a92019282b0d2028e931f33fafa8b0f3aef856c8326c72049ce42645e4b520bbd1bd91e74005f090dc22dc7ca7c76a0640117
-EBUILD wstx-3.2.9-r1.ebuild 1223 BLAKE2B 0851a5c8a77b35f0a0a4ffb0cd6e53b9cc4016f128953ea905e92238b9863ec06231b9ee06b5b2901306117614a4747924576422dc7e7e73b56e3c8318ca036e SHA512 e2808aac94bf465fc0041189edd97fc61e9a4039046fe27efbcd4684d8003e50c4910e348123e0ae2fed403feb4220370b05c6f5c2751a8dd0398103a6a53c2f
+EBUILD wstx-3.2.9-r1.ebuild 1247 BLAKE2B fedfc57253e9b936cd323f8be737dd0bad0fce388741597508a1bd03a5fb5bc4db4c990c2625979d419de5fd3cb50c0cee1ad5f245c9d8c3088855a39a05da09 SHA512 26e77262befddbca1cb3350915ccb2ec5d02c4d001352b364c7956af9045757ece1f771fb972ff0f1125d3d55657a69b2d015917263b587131e649fd9a72f42f
MISC metadata.xml 498 BLAKE2B 527aeb1edb2d32a86b920d0fe640c3665f62ed3c03d0512ae7bb7c3b2c011b94b487804dfa07bba68bc03ea46b69a05c2f4fad0e66738891615120a220d4807c SHA512 fe5cf72ac01bc004dc57fbf57a49e1c28b3b8191f236d5ef025dee65bfad7b44028abd374c02b4cc1107564e2a1706ef8c44e23c5b89a0dfda950cac4a6f75c1
diff --git a/dev-java/wstx/wstx-3.2.9-r1.ebuild b/dev-java/wstx/wstx-3.2.9-r1.ebuild
index 0db6b6957de9..aab3ce385731 100644
--- a/dev-java/wstx/wstx-3.2.9-r1.ebuild
+++ b/dev-java/wstx/wstx-3.2.9-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -14,6 +14,7 @@ LICENSE="Apache-2.0"
SLOT="3.2"
KEYWORDS="amd64 ppc64 x86"
IUSE="test"
+RESTRICT="!test? ( test )"
CDEPEND="
dev-java/sax:0
diff --git a/dev-java/xz-java/Manifest b/dev-java/xz-java/Manifest
index 740f18a59b7c..76d8b04b4d03 100644
--- a/dev-java/xz-java/Manifest
+++ b/dev-java/xz-java/Manifest
@@ -1,3 +1,3 @@
DIST xz-java-1.8.zip 152470 BLAKE2B 601e3292936cb8b3a885551a275248628171f0fa15829785e2fb99d5dfefab59fd2283df4040f090a9d96d30bef5dacd5f4aed4f9d3163ee17dea4a72ad1b0f8 SHA512 3d30804baf9bf743347d87befdbf103107f413c4460639171257e87c4ac96c5e9bc6401a85c44939cd40a25b965162d916a552ae9967f1ff1c71ed389508f5b0
-EBUILD xz-java-1.8.ebuild 662 BLAKE2B 9d57c11528036c18086d05c822225f4d69c7dd4e2a8919957b818f03b0b0e41cfb55b7ff9ba7897978d0562b8aa4d9f030cfdbc19be67b0681d17aa600586873 SHA512 e52035c81cc10268b66734d4b89fdfb1ea559d05c645160481bd0a4a73c9f5c257563d5cb01fa2622b15406aae8490d14b7c585e5a068bcc82a511342c86bed6
+EBUILD xz-java-1.8.ebuild 661 BLAKE2B 66e4e27578b1032045e02de05a4b8c87fba109863813fc7c9f8d780578a781f1ca6f9af82a252776195e2905bc544cfc9a28daeee9dff701eb3c257a27685799 SHA512 560a21f2a16d4b08b4f649faf20c19418abb956ada1945295260e8499543b8a643e8888e7f0c889c45df738f38788bab7529b6062baa5d97451f37e7328582be
MISC metadata.xml 352 BLAKE2B 8390000455654697f473905c14903172230b9667fd16c4db74dd32643b096cb7c8efa21f8614b30d676fb32e052a76c613298e2a28c362d6135f61a4fe27c242 SHA512 a3c6ce3cd97b39644238700277dd416e1ee79df975184de3429810ca4d77f7160112adef6a9b56f77243a003187f6642798b278cf8501d55da766ccfbaa861cf
diff --git a/dev-java/xz-java/xz-java-1.8.ebuild b/dev-java/xz-java/xz-java-1.8.ebuild
index cb0f85323b73..1213425ffb94 100644
--- a/dev-java/xz-java/xz-java-1.8.ebuild
+++ b/dev-java/xz-java/xz-java-1.8.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://tukaani.org/xz/${P}.zip"
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
RDEPEND="
>=virtual/jre-1.6"