gentoo resync : 03.11.2019

5 files changed, 64 insertions, 4 deletions

diff --git a/dev-java/ant-eclipse-ecj/Manifest b/dev-java/ant-eclipse-ecj/Manifest
index 814d98231375..b57e9c478452 100644
--- a/dev-java/ant-eclipse-ecj/Manifest
+++ b/dev-java/ant-eclipse-ecj/Manifest
@@ -1,12 +1,15 @@
-AUX ecj-4.10 326 BLAKE2B 5f0c336b144c94bb8ce57464854eacdf240d4172eb33c8a271f73680599672b668b7da98974f061969bb7153525d7361fea53492d947edf1349bfab89e9dd67d SHA512 9019fa5d98bbd759960e2ee1525962aef5f8b9402e84e5f3409812d3bcf8719b9495a39603d7f611c31a3a4327508b29d0bbba0952afbb38de2a251d52b9b3ed
+AUX ecj-4.10 342 BLAKE2B c69e9a66c9239e7ff4b7b35a4dcddec7cdec02ccf782862a0428e7e4d720dc22a931b58d40db5027e186a6129d0598702d9a95b1fc85ac38957ab6769377054b SHA512 c5ed672288d957ff52d6b44e2758dd589aba050e5915ebc1be92c112ef91c7506051893ac03f08115e9a75e16f91a68d26837e8e8e1e84c6bdb5fd8f4b953474
+AUX ecj-4.13 348 BLAKE2B 6faabe227677bccec08ae3c6a04dc08e30fbf8b2469908b73d63f2f7a2c03f04fb1e0bd9bec74312fec26cbeafab83b37d714a4cbe4069def5d9ab00276ac8a1 SHA512 9866236b6ae4923b3bd4d6147d1babb039f46dd2488a01d0495b5ee19c5900d64c809d1dcfdc958017afb4002fd8908984543deea237e9f52e7f79b13ca5f2a3
 AUX ecj-4.2 290 BLAKE2B 4c96c6ead1903a37769bb2453d6320f2cff933855e7086bd9e59b3577ce0a30ac0887aea26eac1599a89a28eb048fc19c05cb1eba21b4dad23caaacefa36cfc8 SHA512 9fee5e853c9ffde67103b35cb8b28d06dde9be305aba872703a14a95be3e51f5087a5c897e6685f0381794415a524513a4e988ca088b7d30a574518943f97713
 AUX ecj-4.4 314 BLAKE2B 9855d136e85d003ef85e2b0e854d0ea6d29ee37e4221ca612d1ed6c51f89e6f2268f9082dd946468119129240166394122f54618e1a6a799dded0eeb9f0046cc SHA512 a0023e61ed3b1174e7ab7ebc9eb2bc42e9df6a23e5010ede6c2456eca60c4f4a9e11633fcc6438824fe1db4c881499b5f384715c19381411460e78e78ddca678
 AUX ecj-4.5 322 BLAKE2B 2941d70de68459d2bea21ae10680dbbee7888e156753e2bb7bae89b4c2aa41e453106b6ab0ae3660790cf70799550e09fd612a8736b0ac07a3859cdc25446e86 SHA512 d46976eb709a65e1d01af6b48d095325daf10a1ee4ff5da22de12593a253ba21e9550538ff13d1b7844fdb2604462d28133011301ba6a69cab83b2de7c7324f2
 DIST ecjsrc-4.10.jar 2036945 BLAKE2B cf9e50e53dac970a0b6b1231024a4efdc9adc92e02585aa4767c6511b367b32eefaf6fb3461c3c5c8160cf7205c0f708af0c433f4636b5a49caf637ba60fa092 SHA512 e85cacf6d2e21d464ff0226eac12bab8388df7a1413cb16d2982e255eb7369341792562f5080354279be0643c08fd80564a8eb2d8f59b72c8443c02577e4e1ee
+DIST ecjsrc-4.13.jar 2074963 BLAKE2B d74caf3b81543ac12497148a477dcd99fb6d14bd1d601b9e2baa0fb82d12f1211533f5ee909465b190c780ac18f1fbc1f8e12c22cddfce10501923effd7a4cc1 SHA512 f7e49b29e8aa80d627230059c9aba3f1e1fe3824bfd43eac962331d545471df5af0ac49b489aa3795e79e161101a3c6406b29f71a06143914f241916ae6953a9
 DIST ecjsrc-4.2.1.jar 1417043 BLAKE2B dc6915ec85d96a6ecdafb04485549feeb6ef8329811e294647e9e179ff3b1ec3cea55c29ad23b306ff3489dbfe6f574dc691ee31080a592d71607d3a996e9bb4 SHA512 967b47a722893ea1f9eb17e69d386881dc87516e93c1d7a2a119d6fb2e053faa0d9d6455b6e4b89c3f23a3ec7ae33686f4acc305d7c6e51929ce7837c9c93eaf
 DIST ecjsrc-4.4.2.jar 1764959 BLAKE2B 402bcbb040c28fa10dad07c4223daed9976f3246d6984ac74d95087a6cdcd5a742072126a999435eb2d49d49bb2884474461ae8439a9839617b2891297cd7c07 SHA512 53e850fc64994b104d45f58c22f1302ceb1f23bcf69300940be5689dfa6278bea14b4506746fec7b14db6f48c24ccbee16755943fffcdd7f6ad4fe5d9ddc1f20
 DIST ecjsrc-4.5.1.jar 1809543 BLAKE2B 6d9dfed1756ac3e7edf8dd5b30f945afac8bb09bfb5b10f9abed46fff917f600afaebd28451665005b38831f20846090bd3cd19b979130043adbc6a7970d6b36 SHA512 ee615e6fb7fb4a16ef4aeefdff93bafdbf36c9d0ce15713b81f1d4dce0ae87379fa4a6de34c32a134f78db6ed1a68d6c7b4e2a431b7de57bf8262a718fdd6553
-EBUILD ant-eclipse-ecj-4.10.ebuild 1247 BLAKE2B fec5a58b0569cd24b4f992cce0aa3b3957365ac8e33e9ecd44d1198ee4c368272d8b7c825181519c573a1878d131608acc2bd9b06cf07e4f6007a906d3fe5077 SHA512 04f59d6699ec060918496fdfecfd3214f45ef41e86f81bd80b7d5e29dde9c65bd46cc8346b3751bbb5bd00d2456583a967b31428feeb24f525d10b4ccec9a297
+EBUILD ant-eclipse-ecj-4.10-r1.ebuild 1247 BLAKE2B fec5a58b0569cd24b4f992cce0aa3b3957365ac8e33e9ecd44d1198ee4c368272d8b7c825181519c573a1878d131608acc2bd9b06cf07e4f6007a906d3fe5077 SHA512 04f59d6699ec060918496fdfecfd3214f45ef41e86f81bd80b7d5e29dde9c65bd46cc8346b3751bbb5bd00d2456583a967b31428feeb24f525d10b4ccec9a297
+EBUILD ant-eclipse-ecj-4.13.ebuild 1252 BLAKE2B 697a4bfae3f28eda5f91137c1f31198c64f530374218f1b69f2ec3dadc04fd085583f950ef852c410abd0688355c31c5cf715a359ceaf8b2f2422d03c00535dc SHA512 3f6897bc51f8c1b641dee6c7735a38b4d00903d8920c2112f863b185f62fcb67a79a1feedcd09bd103cf9f3d58bfd818f10d3043f862f775df9643b9d01757e8
 EBUILD ant-eclipse-ecj-4.2.1.ebuild 1363 BLAKE2B 1fd46c888db8d7662c55ceda97bfcfb2074bde7d26a249f0837e9a4f53f130b7776b9e131f3714d0ce272dbe8a777879366160e7fcb03e809099d7d3e168de50 SHA512 edbcd030f67950128afb6aad948d2104ca9610152cded95750c10771513246463c3da9d9a7fd128a623c9669cb3d6559875c69f4045e2ff1ea6a0b6f6bae9461
 EBUILD ant-eclipse-ecj-4.4.2.ebuild 1248 BLAKE2B dd7249882bbb0c2511e424165dcc12ccdee58baf9985da2182d31d451fa1fb94f736407e303bc1a61d9d43355a7142fd7af1078ff7277122540e1bc0a47786f5 SHA512 310dd8cb237d922b55186fcfad23136e0861464dc6aaa252ea8615a9dcf61a3f6042c5edc463af1147fb1f9d4c76b61fca15a035b8b9718252cc8d9ef85c4277
 EBUILD ant-eclipse-ecj-4.5.1.ebuild 1249 BLAKE2B 4f0fd6db9c642716d87396a421521a5087d014c41235436596a1e3d81c32ffc71d6734d1dd858b1d3c4ec088b8adf1cf2920402575910f51f1bda35c6a6f964d SHA512 45c87738ac2c850d2fbbcf1fb2cdbb03b271900b63324f6d9418337431da7fb260371a39814354e6abae1115fa9e84ffd43d6036be7bca724ff0e32780bef69f
diff --git a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.10.ebuild b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.10-r1.ebuild
index 2749b9e70173..2749b9e70173 100644
--- a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.10.ebuild
+++ b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.10-r1.ebuild
diff --git a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.13.ebuild b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.13.ebuild
new file mode 100644
index 000000000000..de1022b748c7
--- /dev/null
+++ b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.13.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple prefix
+
+DMF="R-${PV}-201909161045"
+
+DESCRIPTION="Ant Compiler Adapter for Eclipse Java Compiler"
+HOMEPAGE="http://www.eclipse.org/"
+SRC_URI="http://download.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV}.jar"
+
+LICENSE="EPL-1.0"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+SLOT="4.13"
+IUSE=""
+
+CDEPEND="~dev-java/eclipse-ecj-${PV}:${SLOT}
+	dev-java/ant-core:0"
+RDEPEND="${CDEPEND}
+	>=virtual/jre-11"
+DEPEND="${CDEPEND}
+	app-arch/unzip
+	>=virtual/jdk-11"
+
+JAVA_GENTOO_CLASSPATH="ant-core,eclipse-ecj-${SLOT}"
+
+src_prepare() {
+	default
+
+	# Remove everything but the Ant component.
+	find org -type f ! -path "org/eclipse/jdt/internal/antadapter/*" ! -name "JDTCompilerAdapter.java" -delete || die
+
+	rm build.xml || die
+}
+
+src_compile() {
+	java-pkg-simple_src_compile
+	find org -type f ! -name "*.java" | xargs jar uvf "${PN}.jar" || die "jar update failed"
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	insinto /usr/share/java-config-2/compiler
+	doins "${FILESDIR}/ecj-${SLOT}"
+	eprefixify "${D}"/usr/share/java-config-2/compiler/ecj-${SLOT}
+}
diff --git a/dev-java/ant-eclipse-ecj/files/ecj-4.10 b/dev-java/ant-eclipse-ecj/files/ecj-4.10
index cdb259897705..cc87bb2fc4d6 100644
--- a/dev-java/ant-eclipse-ecj/files/ecj-4.10
+++ b/dev-java/ant-eclipse-ecj/files/ecj-4.10
@@ -1,7 +1,7 @@
 JAVAC="@GENTOO_PORTAGE_EPREFIX@/usr/bin/ecj-4.10"
 PACKAGE="=dev-java/ant-eclipse-ecj-4.10*"
-SUPPORTED_TARGET="1.1 1.2 1.3 1.4 1.5 1.6 1.7 1.8"
-SUPPORTED_SOURCE="1.3 1.4 1.5 1.6 1.7 1.8"
+SUPPORTED_TARGET="1.1 1.2 1.3 1.4 1.5 1.6 1.7 1.8 9 10 11"
+SUPPORTED_SOURCE="1.3 1.4 1.5 1.6 1.7 1.8 9 10 11"
 ANT_BUILD_COMPILER="org.eclipse.jdt.core.JDTCompilerAdapter"
 ANT_BUILD_COMPILER_DEPS="eclipse-ecj-4.10,ant-eclipse-ecj-4.10"
 GENERATION="2"
diff --git a/dev-java/ant-eclipse-ecj/files/ecj-4.13 b/dev-java/ant-eclipse-ecj/files/ecj-4.13
new file mode 100644
index 000000000000..08d3a4aaa9cb
--- /dev/null
+++ b/dev-java/ant-eclipse-ecj/files/ecj-4.13
@@ -0,0 +1,7 @@
+JAVAC="@GENTOO_PORTAGE_EPREFIX@/usr/bin/ecj-4.13"
+PACKAGE="=dev-java/ant-eclipse-ecj-4.13*"
+SUPPORTED_TARGET="1.1 1.2 1.3 1.4 1.5 1.6 1.7 1.8 9 10 11 12"
+SUPPORTED_SOURCE="1.3 1.4 1.5 1.6 1.7 1.8 9 10 11 12"
+ANT_BUILD_COMPILER="org.eclipse.jdt.core.JDTCompilerAdapter"
+ANT_BUILD_COMPILER_DEPS="eclipse-ecj-4.10,ant-eclipse-ecj-4.13"
+GENERATION="2"