gentoo resync : 23.09.2020

4 files changed, 14 insertions, 68 deletions

diff --git a/dev-java/jzlib/Manifest b/dev-java/jzlib/Manifest
index 48504abe01aa..b6b343b935bc 100644
--- a/dev-java/jzlib/Manifest
+++ b/dev-java/jzlib/Manifest
@@ -1,7 +1,5 @@
 DIST jzlib-1.0.7.tar.gz 50303 BLAKE2B d38a1560fcbfbda479b797727d8e0ff0e6197ad13f78018d451346ae2f7a201bbffbf87a6ed727776dac2e9eb890aa0ea81486e0c78e11ddcb893c8654711618 SHA512 8cbc492857d432f79da08a9f6dcebc401e25bd888adada8d94caee15d67d0b89b4f66876a5b2275170157977527e1505386dd5a1575dbe658de233d4389941ea
-DIST jzlib-1.1.1.zip 105191 BLAKE2B ba2d53d2d2fb12de6ce6016b393a9147e0a0ffbed576940f629fae50bb60329d076d42a912897925517a2f6a75dca1fba4fc4836046152c45aafadd9e0983e8e SHA512 de76c008e640f17788c69ed2aae72cddbd0a72d039ce61169ca7af640571952080c48ec588b0fdb497a795d3f7644170ec541bdbe834b6b638e6260ffb57dc07
-DIST jzlib-1.1.3.zip 176747 BLAKE2B fb868a254e6beea192de9965bdb8c13313099efd68c0f11b6196c0b70d10bd189b6c82ef75c73376ec391b99e2c029b117cb51cee4bc9d6f888b400fe737c620 SHA512 844a157053a8d6c9b722e9c27e0f1520f3061d7e323f0e50d276c301477128f46dc7b1250c2ca337225690bc641b6f663ee76be8831b6e0c288438e64aa935b0
-EBUILD jzlib-1.0.7-r2.ebuild 762 BLAKE2B c4d8ab0af10c8b0cb09940d823a5df522d2f7afa374e21e94b10dbb985c9754df2fe69b345d709526de2644dc8dcf29dd5c225d2337cf5822993980263c8a784 SHA512 5364cd2fa32bd41178fee876f16be79c454587f6a4bdecce72daa1daf9cbd239d4c0013d36623d9101984cc823551fc4935506ae45c6e134d56996b88e521162
-EBUILD jzlib-1.1.1.ebuild 1360 BLAKE2B 0b6f492e0f41327af685fd4f9458c88df8d1cc47618e33aa8e95307921915d038dd8f93a2ef464eea0851dffdd207ecf6c0cccaf86c7c698557a8c6324f48733 SHA512 0bbb2582a9da8526fdb56698cfca29f988ade0eeeee46d441e06accc2f6a29c532bc9af150f7773a35ff8d956e22c5f7644bbb3250d3d79522de69d2f0451bd5
-EBUILD jzlib-1.1.3.ebuild 1313 BLAKE2B 633f77c17e22f391f2be1e3c59f8e95cad551103b51771f039d71db4baa075454e41df5d943d5e49913f42aeb64f7b9b7a7e81e99c51bedd19031cb72026365a SHA512 3ee03ac380a1abf20dbcc2d0c539f04441c4b1003b299cb127b0ee3916f156f6a3c2fa85a8f71bdcdd69257f3a8adddc373baecfcf52f207bf6348507cba1b68
+DIST jzlib-1.1.3.tar.gz 139424 BLAKE2B cae5f0f6ac8efd99cc916e8cc087280be84e1a2a8b43b8932dc68e2393ac5f1848e4dac1759aa75a54123adba63956463719aaa469ed88cf0c609eaa63647e16 SHA512 d78ed3feaded0bde62b3e2c6fb17b5051a6637bcf12e7fe0f5b1855922358b54b440b05bdba7328c5d2cb9f972bc68195f8f0570ce5d49de9251d7060018d88d
+EBUILD jzlib-1.0.7-r2.ebuild 755 BLAKE2B 4743a43849553e4a2f3766f653388d090fbc4cadcc3191d8d7855d9e319d49d9db1c6c9640246ebb19efb7bd52c649b2d85de1e62d8a77077d625e13a9805c87 SHA512 fc169c1fba14d791429a282805cff3b0c230a1acdeabc29ecdb05ea385f5653fa64f4d26b0c4026fd27455eca2a904b68e4fa7fb88b3136fcd7788141d456ca7
+EBUILD jzlib-1.1.3-r1.ebuild 1323 BLAKE2B 76016461e618b9404bdb579cb261a62c5a31decaea7343fb4cad8d49ad9c8fc43b12cca29b961ea7949505c36b7bc85dbfc329f0ea4258d11381a63b76176720 SHA512 3d323508aca27cb8bf9ee3a664352216fdf5c36da8f7d963730a8a90677f50cd9ccbb3c6819ec01343abe9931b48d3e342d1bbb9b23a6bb956fe550e6bd8bf69
 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
index cafaafe1b74a..4f55768422a5 100644
--- a/dev-java/jzlib/jzlib-1.0.7-r2.ebuild
+++ b/dev-java/jzlib/jzlib-1.0.7-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 JAVA_PKG_IUSE="doc source examples"
 
@@ -14,14 +14,10 @@ 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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
 
-RDEPEND="
-	>=virtual/jre-1.6"
-
-DEPEND="
-	source? ( app-arch/zip )
-	>=virtual/jdk-1.6"
+BDEPEND="source? ( app-arch/zip )"
+RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.6"
 
 S="${WORKDIR}/${P}"
 
diff --git a/dev-java/jzlib/jzlib-1.1.1.ebuild b/dev-java/jzlib/jzlib-1.1.1.ebuild
deleted file mode 100644
index f07ebfacbbda..000000000000
--- a/dev-java/jzlib/jzlib-1.1.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-JAVA_PKG_IUSE="doc examples source test"
-
-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}.zip"
-
-LICENSE="BSD"
-SLOT="1.1"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="
-	>=virtual/jre-1.5"
-DEPEND="
-	>=virtual/jdk-1.5"
-#	test? (
-#		dev-lang/scala
-#		dev-java/junit:4 )"
-# Restrict test due to missing keywords for scala
-RESTRICT="test"
-
-S="${WORKDIR}/${P}"
-JAVA_SRC_DIR="src/main/java"
-
-java_prepare() {
-	# Maven not yet supported, use java-pkg-simple instead.
-	rm -v pom.xml || die
-}
-
-src_test() {
-	local CP TESTS
-	CP="${PN}.jar:$(java-pkg_getjars --with-dependencies scala,junit-4)" || die
-	TESTS=$(find src/test/scala -name '*Test.scala' -printf com.jcraft.jzlib. -exec basename {} .scala \;) || die
-
-	mkdir -p target/test || die
-	find src/test/scala -name '*.scala' -exec scalac -classpath "${CP}" -d target/test {} + || die
-	ejunit4 -classpath "target/test:${CP}" ${TESTS}
-}
-
-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.ebuild b/dev-java/jzlib/jzlib-1.1.3-r1.ebuild
index 0f0ba0e65841..c90e35e36ccd 100644
--- a/dev-java/jzlib/jzlib-1.1.3.ebuild
+++ b/dev-java/jzlib/jzlib-1.1.3-r1.ebuild
@@ -1,14 +1,15 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI=7
+
 JAVA_PKG_IUSE="examples source test"
 
 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="https://github.com/ymnk/${PN}/archive/${PV}.zip -> ${P}.zip"
+SRC_URI="https://github.com/ymnk/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="1.1.3"
@@ -27,7 +28,8 @@ RESTRICT="test"
 S="${WORKDIR}/${P}"
 JAVA_SRC_DIR="src/main/java"
 
-java_prepare() {
+src_prepare() {
+	default
 	rm pom.xml || die
 }