gentoo resync : 31.05.2021

3 files changed, 4 insertions, 36 deletions

diff --git a/dev-java/jzlib/Manifest b/dev-java/jzlib/Manifest
index 6c61bef1ef4a..cd20170db481 100644
--- a/dev-java/jzlib/Manifest
+++ b/dev-java/jzlib/Manifest
@@ -1,5 +1,3 @@
-DIST jzlib-1.0.7.tar.gz 50303 BLAKE2B d38a1560fcbfbda479b797727d8e0ff0e6197ad13f78018d451346ae2f7a201bbffbf87a6ed727776dac2e9eb890aa0ea81486e0c78e11ddcb893c8654711618 SHA512 8cbc492857d432f79da08a9f6dcebc401e25bd888adada8d94caee15d67d0b89b4f66876a5b2275170157977527e1505386dd5a1575dbe658de233d4389941ea
 DIST jzlib-1.1.3.tar.gz 139424 BLAKE2B cae5f0f6ac8efd99cc916e8cc087280be84e1a2a8b43b8932dc68e2393ac5f1848e4dac1759aa75a54123adba63956463719aaa469ed88cf0c609eaa63647e16 SHA512 d78ed3feaded0bde62b3e2c6fb17b5051a6637bcf12e7fe0f5b1855922358b54b440b05bdba7328c5d2cb9f972bc68195f8f0570ce5d49de9251d7060018d88d
-EBUILD jzlib-1.0.7-r2.ebuild 744 BLAKE2B b902748fdadbf73d5d6161cbccbbae7bda8b3d8decad11702b7a96da92554fc10fa0e8ddbcb8a99e6aac7d20e6eb0c2340d5117a51d91568a8c8a887816d4865 SHA512 c6951bb1a71a5b1ad6b25a1b94764502e8381408654f6093bb4c7d079195e599e28a23453876d14e7d3b708fff28a93bee13be62a9eccfb92e57448ede9ac6e4
-EBUILD jzlib-1.1.3-r1.ebuild 1312 BLAKE2B 367eaf5cc1e3daf94117a8e20b106cc9e6c21041930ca92d7658de6f4c7456587ebbfca572e8ab564ffd55483ea016b4d155891577d9229005b41c72a57102c0 SHA512 533bc6796918f37ac7c5aeb2d6f7f0a76994dbf1cc2d6ae6ff1f0a159c3ad2dc74fc26b11e2820c3cba56525e115dfbb8d2b97aa791af85ed0dce89d55999d4c
+EBUILD jzlib-1.1.3-r2.ebuild 1312 BLAKE2B f010a9c7dc70ff37c862c44a922e6106cae46b7cd5e84f5a2e3f0cbbafde1e361f610f6a58a60b3918f5bbe0eae6bd3f69f0a2ad21c3f8ef91efabedb0e29747 SHA512 77250bd8531793c7774bf2d47be9bf10a0364c8ad7d344266796c73ff3434adbae943714f2ba5cfce8931e836bc846c148a334edf628ea7c6b57dc100b317ad9
 MISC metadata.xml 321 BLAKE2B 446bb7ac28e63630afcf6bc8583857b6ec3206b0db5fce1ba0c5564fbe6e662f1df4a711e794960dfa00c31b7d1a28779c0bbc48072e2133326cd1d1fbfce1b2 SHA512 0602c7d4ec61795409acf409461bb44105b58d340a3740ace885d3dba9bee4ff146ee1a1ad6a8dd995d51ea406962fe6e5654b1a55a94c05c14cea3482a6ab8e
diff --git a/dev-java/jzlib/jzlib-1.0.7-r2.ebuild b/dev-java/jzlib/jzlib-1.0.7-r2.ebuild
deleted file mode 100644
index cb18a81912d8..000000000000
--- a/dev-java/jzlib/jzlib-1.0.7-r2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source examples"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="JZlib is a re-implementation of zlib in pure Java"
-HOMEPAGE="http://www.jcraft.com/jzlib/"
-SRC_URI="http://www.jcraft.com/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-BDEPEND="source? ( app-arch/zip )"
-RDEPEND=">=virtual/jre-1.6"
-DEPEND=">=virtual/jdk-1.6"
-
-S="${WORKDIR}/${P}"
-
-JAVA_SRC_DIR="com"
-
-src_install() {
-	java-pkg-simple_src_install
-	dodoc README ChangeLog
-	use examples && java-pkg_doexamples example
-}
diff --git a/dev-java/jzlib/jzlib-1.1.3-r1.ebuild b/dev-java/jzlib/jzlib-1.1.3-r2.ebuild
index b58fc292b34a..615a5512fc00 100644
--- a/dev-java/jzlib/jzlib-1.1.3-r1.ebuild
+++ b/dev-java/jzlib/jzlib-1.1.3-r2.ebuild
@@ -12,13 +12,13 @@ HOMEPAGE="http://www.jcraft.com/jzlib/"
 SRC_URI="https://github.com/ymnk/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
-SLOT="1.1.3"
+SLOT="0"
 KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
-	>=virtual/jre-1.5"
+	>=virtual/jre-1.8:*"
 DEPEND="
-	>=virtual/jdk-1.5"
+	>=virtual/jdk-1.8:*"
 #	test? (
 #		dev-lang/scala
 #		dev-java/junit:4 )"