gentoo resync : 05.04.2019

7 files changed, 7 insertions, 163 deletions

diff --git a/dev-java/xz-java/Manifest b/dev-java/xz-java/Manifest
index eb07273ec6d8..740f18a59b7c 100644
--- a/dev-java/xz-java/Manifest
+++ b/dev-java/xz-java/Manifest
@@ -1,11 +1,3 @@
-AUX xz-java-stop-fetching-external-files.patch 693 BLAKE2B 8b6e55a71921a3b6f16aab712b298684577639cb57cb8a3b2216811effd3e107c385ca26cb4edb5bfb83a035ed46fe4a1dc7493e92f48b66b4ca5b425a6aff12 SHA512 048a21f8a99091f5e940f775b187eccbeda10c4b6c41e194dd5295f9be618676195ad0e256752ac1929989e90eafb272d10d93bfea5d85027dfc88d296c90125
-DIST xz-java-1.5.zip 131544 BLAKE2B 3984cf1e20bbf1d5f2508766e3ef4aff87f0bef774cb6f7a3f6e6b4bf7b744e74f1640330a4278b70006b7ec05e9d758bb55d63f247cc7afb1c2f4a4e64591aa SHA512 8f425b86b216927490c1ab7303ae9db7faf2c275777765ec7d10c4acd4717d2ecf76068afe9a81d099ea0941c05c517cd5e7fe1b4e8bfec804fd3355dd064f41
-DIST xz-java-1.6.zip 138434 BLAKE2B 015074e64f8b354b617cd2519f83cf4a7aa491a7229e54fecb012eabe80d3ff65394a433b88eb58b5c2eadf1855aeefa0eb4c0e904f34ab36d0c430c04a7ba90 SHA512 a1a6a2da05d51695e58b8e91503106bae6030cb83853df32bc7b8a23db4189c4afef01544c21de91ee3df9ad11e065059c758f121c52e6b6a319b93b2136f666
-DIST xz-java-1.7.zip 151864 BLAKE2B 6fc952d8f5ff7f75eecf64c8a26ca1a0cff78f5fe8cc71b7cf12d516d702a92b503e5e7e9ef2a3980922f2bcbc57fc95df475b612fe2f19e49969ef1c873a85e SHA512 6909d4c6bcf0479a5c1a6178c56971517dbb2a923ce6e05b3d21bd5dd1e1ead7d06f3f533276279f440f129607b89e6eb9ba909bad94340d67b16d83cf72b445
 DIST xz-java-1.8.zip 152470 BLAKE2B 601e3292936cb8b3a885551a275248628171f0fa15829785e2fb99d5dfefab59fd2283df4040f090a9d96d30bef5dacd5f4aed4f9d3163ee17dea4a72ad1b0f8 SHA512 3d30804baf9bf743347d87befdbf103107f413c4460639171257e87c4ac96c5e9bc6401a85c44939cd40a25b965162d916a552ae9967f1ff1c71ed389508f5b0
-EBUILD xz-java-1.5.ebuild 764 BLAKE2B 4748847ca4d7c6281423767b7b6e749c4d19b0157bbf2b9e994883aff286cba9153760d7770bf4151dd3573446e76da7957b0d3b0064ba5524796c4bcfd8ce6d SHA512 8184e39d04253dffff50d9899230176fed63ea957817f75d6568c2d7a33a2aa7d5dfcda32c32a9cef8507e07f42b48844d0b1026fc11ec3a6fd0d011178f3a96
-EBUILD xz-java-1.6-r1.ebuild 651 BLAKE2B c810d938d1e27719d5098d6d256c5a5f5383e49ccdebb309c5c53ba1f302f67ab95c017dd35d92aae7dcebb85e4dca2f874cf13fb45347257c6221b42d73de09 SHA512 0266edcbf8678ca58bba9bf01d10dd7eaa3d96fd405803aa8c60ea25b903bc0e44f11f043a5c238d9405215bf252c24a0c7a7aa9acb508916d3af6141725aa43
-EBUILD xz-java-1.6.ebuild 808 BLAKE2B a3222e8abac79531bc0c3a87211054ca499f11639076772820de127cdb448e2d978b643e083b7449a3679d0dec24cef78670ee15bf44e47218162721ba669aa3 SHA512 cbcfaa0cc5bfef2ad065b4493cb58fae2e45bcd219745e68a5c775073747d7141f23583927ccbbac042997353b9bbeb3dc5aa0292f921a194b5d67c08af84307
-EBUILD xz-java-1.7.ebuild 651 BLAKE2B c810d938d1e27719d5098d6d256c5a5f5383e49ccdebb309c5c53ba1f302f67ab95c017dd35d92aae7dcebb85e4dca2f874cf13fb45347257c6221b42d73de09 SHA512 0266edcbf8678ca58bba9bf01d10dd7eaa3d96fd405803aa8c60ea25b903bc0e44f11f043a5c238d9405215bf252c24a0c7a7aa9acb508916d3af6141725aa43
-EBUILD xz-java-1.8.ebuild 660 BLAKE2B 6dc92c4712cefb487a8b308e0aa9c10eb8de677b454b7aed11d8d5e8762206c29058660e7394ed303afa224efb9654b422c1ea0ab480b432a9c432bebf008e8d SHA512 164a6599a3beb22d04d8f2e535fb055a2013598b0df53de7611f70e928ff7ecec4ac6461879ba009175549f6826d664edab176b084e8f11780654e6c0b26a0da
+EBUILD xz-java-1.8.ebuild 662 BLAKE2B 9d57c11528036c18086d05c822225f4d69c7dd4e2a8919957b818f03b0b0e41cfb55b7ff9ba7897978d0562b8aa4d9f030cfdbc19be67b0681d17aa600586873 SHA512 e52035c81cc10268b66734d4b89fdfb1ea559d05c645160481bd0a4a73c9f5c257563d5cb01fa2622b15406aae8490d14b7c585e5a068bcc82a511342c86bed6
 MISC metadata.xml 352 BLAKE2B 8390000455654697f473905c14903172230b9667fd16c4db74dd32643b096cb7c8efa21f8614b30d676fb32e052a76c613298e2a28c362d6135f61a4fe27c242 SHA512 a3c6ce3cd97b39644238700277dd416e1ee79df975184de3429810ca4d77f7160112adef6a9b56f77243a003187f6642798b278cf8501d55da766ccfbaa861cf
diff --git a/dev-java/xz-java/files/xz-java-stop-fetching-external-files.patch b/dev-java/xz-java/files/xz-java-stop-fetching-external-files.patch
deleted file mode 100644
index c5630a9c5052..000000000000
--- a/dev-java/xz-java/files/xz-java-stop-fetching-external-files.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/build.xml
-+++ b/build.xml
-@@ -35,12 +35,9 @@
-             description="Generates HTML documentation with javadoc">
-         <mkdir dir="${doc_dir}"/>
-         <mkdir dir="${extdoc_dir}"/>
--        <get src="${extdoc_url}/package-list"
--             dest="${extdoc_dir}/package-list" skipexisting="true"/>
-         <javadoc sourcepath="${src_dir}" destdir="${doc_dir}"
-                  source="${sourcever}" packagenames="org.tukaani.xz"
--                 windowtitle="XZ data compression"
--                 linkoffline="${extdoc_url} ${extdoc_dir}"/>
-+                 windowtitle="XZ data compression"/>
-     </target>
- 
-     <target name="compile" description="Compiles the classes">
diff --git a/dev-java/xz-java/xz-java-1.5.ebuild b/dev-java/xz-java/xz-java-1.5.ebuild
deleted file mode 100644
index 7ac75ef44151..000000000000
--- a/dev-java/xz-java/xz-java-1.5.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-JAVA_PKG_IUSE="doc examples source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Implementation of xz data compression in pure java"
-HOMEPAGE="https://tukaani.org/xz/java.html"
-SRC_URI="https://tukaani.org/xz/${P}.zip"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND=">=virtual/jre-1.4"
-DEPEND=">=virtual/jdk-1.4
-	app-arch/unzip"
-
-EANT_DOC_TARGET="doc"
-
-S=${WORKDIR}
-
-java_prepare() {
-	epatch "${FILESDIR}"/${PN}-stop-fetching-external-files.patch
-}
-
-src_install() {
-	java-pkg_dojar build/jar/xz.jar
-	use doc && java-pkg_dojavadoc build/doc
-	use examples && java-pkg_doexamples src/*Demo.java
-	use source && java-pkg_dosrc src/org
-}
diff --git a/dev-java/xz-java/xz-java-1.6-r1.ebuild b/dev-java/xz-java/xz-java-1.6-r1.ebuild
deleted file mode 100644
index 0be4079e7b1d..000000000000
--- a/dev-java/xz-java/xz-java-1.6-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc examples source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Implementation of xz data compression in pure java"
-HOMEPAGE="https://tukaani.org/xz/java.html"
-SRC_URI="https://tukaani.org/xz/${P}.zip"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-RDEPEND=">=virtual/jre-1.6"
-DEPEND=">=virtual/jdk-1.6"
-
-S="${WORKDIR}"
-
-JAVA_SRC_DIR="src/org"
-
-DOCS=( README NEWS COPYING THANKS )
-
-src_install() {
-	java-pkg-simple_src_install
-	use examples && java-pkg_doexamples src/*Demo.java
-	einstalldocs
-}
diff --git a/dev-java/xz-java/xz-java-1.6.ebuild b/dev-java/xz-java/xz-java-1.6.ebuild
deleted file mode 100644
index 3d3e3bd071d3..000000000000
--- a/dev-java/xz-java/xz-java-1.6.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-JAVA_PKG_IUSE="doc examples source"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Implementation of xz data compression in pure java"
-HOMEPAGE="https://tukaani.org/xz/java.html"
-SRC_URI="https://tukaani.org/xz/${P}.zip"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=virtual/jre-1.4"
-DEPEND=">=virtual/jdk-1.4
-	app-arch/unzip"
-
-EANT_DOC_TARGET="doc"
-
-S="${WORKDIR}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-stop-fetching-external-files.patch"
-)
-
-src_prepare() {
-	default
-	java-utils-2_src_prepare
-}
-
-src_install() {
-	java-pkg_dojar build/jar/xz.jar
-	use doc && java-pkg_dojavadoc build/doc
-	use examples && java-pkg_doexamples src/*Demo.java
-	use source && java-pkg_dosrc src/org
-}
diff --git a/dev-java/xz-java/xz-java-1.7.ebuild b/dev-java/xz-java/xz-java-1.7.ebuild
deleted file mode 100644
index 0be4079e7b1d..000000000000
--- a/dev-java/xz-java/xz-java-1.7.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc examples source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Implementation of xz data compression in pure java"
-HOMEPAGE="https://tukaani.org/xz/java.html"
-SRC_URI="https://tukaani.org/xz/${P}.zip"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-RDEPEND=">=virtual/jre-1.6"
-DEPEND=">=virtual/jdk-1.6"
-
-S="${WORKDIR}"
-
-JAVA_SRC_DIR="src/org"
-
-DOCS=( README NEWS COPYING THANKS )
-
-src_install() {
-	java-pkg-simple_src_install
-	use examples && java-pkg_doexamples src/*Demo.java
-	einstalldocs
-}
diff --git a/dev-java/xz-java/xz-java-1.8.ebuild b/dev-java/xz-java/xz-java-1.8.ebuild
index bfb68767547f..cb0f85323b73 100644
--- a/dev-java/xz-java/xz-java-1.8.ebuild
+++ b/dev-java/xz-java/xz-java-1.8.ebuild
@@ -13,10 +13,13 @@ 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"
-DEPEND=">=virtual/jdk-1.6"
+RDEPEND="
+	>=virtual/jre-1.6"
+
+DEPEND="
+	>=virtual/jdk-1.6"
 
 S="${WORKDIR}"