gentoo resync : 28.04.2019

4 files changed, 3 insertions, 76 deletions

diff --git a/dev-java/xjavac/Manifest b/dev-java/xjavac/Manifest
index 7e0ec4062130..2a5b1b100ad3 100644
--- a/dev-java/xjavac/Manifest
+++ b/dev-java/xjavac/Manifest
@@ -1,6 +1,3 @@
-AUX xjavac-20041208-build.xml 1088 BLAKE2B 45fff43f290db1e415427a3558556bfc89de78b59fbd8dc8794016c600de6cac64c1cde973925949d383f4321c8c85019e799d775a8262876e02b9692f4c5d2a SHA512 5ed5cfe711a4666d2db2dbe91ba8ac0d1dc9e95cf5be82891382632db6e4a250775aabbd38111134d82a09fa9d7d81efead52256e7511a726144689e1e389469
 DIST xjavac-2.4.0.tar.gz 2472 BLAKE2B 4693c2fa74a2951909ff6dc55638e7f3de19fecf82bcfeba0abfeaff82f941ea9d02dde3de969e850da9c5bfc98684b0a34be391d6db6c3fe12de0a734137afd SHA512 6a12c605f6f455f20981214d1ce8ed752070ae2b268e9279692a3b05921c84857636055d9c4d7b1de92bafbaa4b528f36983dc2eca0ca883a7fa340320e503a0
-DIST xjavac-20110814.tar.gz 2217 BLAKE2B 2a2faa87f958c1a089ae600798eca190c7784f5343887fd6236447e433f500bf134f9241dfd98aca4a1a0223811f9a426c0f7a3c73c4b7c4fd6c682e30561cd3 SHA512 f4c5aa437d135a8495c926387df68df8f47878e206ea8f279a7c3e8e32561dbac5a8c8002f77a2bf03863f42475cad5068e3c1031121b64b32fb4d15242c3b3e
-EBUILD xjavac-2.4.0.ebuild 665 BLAKE2B e700eccc7deff99e5121184a349cb8a50e9ad364b78091e8fed10d2955a41919ff469b34539d30ad80407b41f15ac6f2ccd65fdb8899c01b8526dcae5fac9eff SHA512 a9c4908b869f9a6bf7d954e2e197e10f377a3a249c503147821a826767793ec9191fcc788408b183f85fdbcbc58a6e926b5718e5f36bcecf37c1338432d8af47
-EBUILD xjavac-20110814.ebuild 952 BLAKE2B f143d3429c9eaceb2948303ad39947d0dc2caf2a85a2c7cbb5d80b4c4e2f44c5f6b1dad864b08d57c4491794d55e4a62b60980216614692287246d701e2bd2c2 SHA512 f9323cf655ac2e5328255732a4267062757b4205f49301e76386ebb54c4b7234088c2a8961f48ca880742bb23a10ab3c97b3a84f099fe6aca15be1137c2b5981
+EBUILD xjavac-2.4.0.ebuild 666 BLAKE2B 53ff28cbcd4e403313f686547f95e5454722840563cd3f8d2db905f35aca4071327e5acf09a37f66d368e9e7439ad697b6cb00906563e2d59d9b181e0d2b00c3 SHA512 4f28557c34981eb71bbd59d8390f8fb6d23a767053b58b26b6860845d9779d7aeb2b53ac02e5d968fbe0214cdda9797bfcdc0868d04ef1ebb5e60b13438178cb
 MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/xjavac/files/xjavac-20041208-build.xml b/dev-java/xjavac/files/xjavac-20041208-build.xml
deleted file mode 100644
index 5c9a466ca8e8..000000000000
--- a/dev-java/xjavac/files/xjavac-20041208-build.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="xjavac" default="jar">
-	<!-- some properties -->
-	<property name="src.dir" value="." />
-	<property name="build.dir" value="build" />
-	<property name="docs.dir" value="docs" />
-	<property name="dist.dir" value="dist" />
-	<property name="lib.dir" value="lib" />
-	<property name="jarfile" value="${dist.dir}/xjavac.jar" />
-	<property name="target.jdk" value="1.4" />
-	
-	<!-- init -->
-	<target name="init">
-		<mkdir dir="${dist.dir}" />
-		<mkdir dir="${build.dir}" />
-		<mkdir dir="${docs.dir}" />
-	</target>	
-
-	<!-- compile everything -->
-	<target name="compile" depends="init">
-		<mkdir dir="${build.dir}" />
-		<javac srcdir="${src.dir}" 
-			destdir="${build.dir}"
-			classpath="${classpath}"
-			source="${target.jdk}"
-			target="${target.jdk}"/>
-	</target>
-
-	<!-- build the jar file -->
-	<target name="jar" depends="compile">
-		<jar jarfile="${jarfile}" basedir="${build.dir}" />
-	</target>
-	
-	<!-- clean up -->
-	<target name="clean">
-		<delete dir="${build.dir}" />
-		<delete dir="${docs.dir}" />
-		<delete dir="${dist.dir}" />
-	</target>
-</project>
diff --git a/dev-java/xjavac/xjavac-2.4.0.ebuild b/dev-java/xjavac/xjavac-2.4.0.ebuild
index 8198e0008d8d..c3c95f345da0 100644
--- a/dev-java/xjavac/xjavac-2.4.0.ebuild
+++ b/dev-java/xjavac/xjavac-2.4.0.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,7 +14,7 @@ SRC_URI="https://dev.gentoo.org/~monsieurp/packages/${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="1"
 
-KEYWORDS="~amd64 ~arm ~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="dev-java/ant-core:0"
 
diff --git a/dev-java/xjavac/xjavac-20110814.ebuild b/dev-java/xjavac/xjavac-20110814.ebuild
deleted file mode 100644
index 9478e4db552b..000000000000
--- a/dev-java/xjavac/xjavac-20110814.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="The implementation of the javac compiler for IBM JDK 1.4 (needed for xerces-2)"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-#Note that the tarball has xjavac-ibm-1_5.patch already applied (not in upstream)
-IUSE=""
-HOMEPAGE="http://cvs.apache.org/viewcvs.cgi/xml-xerces/java/tools/src/XJavac.java"
-LICENSE="Apache-2.0"
-SLOT="1"
-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.4"
-RDEPEND=">=virtual/jdk-1.4
-	>=dev-java/ant-core-1.7"
-
-java_prepare() {
-	cp "${FILESDIR}/${PN}-20041208-build.xml" ./build.xml || die "failed to cp build.xml"
-}
-
-src_compile() {
-	eant jar -Dclasspath=$(java-pkg_getjars ant-core)
-}
-
-src_install() {
-	java-pkg_dojar dist/${PN}.jar
-}