Updating liguros repo

4 files changed, 12 insertions, 65 deletions

diff --git a/dev-java/jzlib/Manifest b/dev-java/jzlib/Manifest
index b73e08c7b396..c8b027b3b6e8 100644
--- a/dev-java/jzlib/Manifest
+++ b/dev-java/jzlib/Manifest
@@ -1,3 +1,2 @@
 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
+DIST jzlib-1.1.3.tar.gz 139424 BLAKE2B cae5f0f6ac8efd99cc916e8cc087280be84e1a2a8b43b8932dc68e2393ac5f1848e4dac1759aa75a54123adba63956463719aaa469ed88cf0c609eaa63647e16 SHA512 d78ed3feaded0bde62b3e2c6fb17b5051a6637bcf12e7fe0f5b1855922358b54b440b05bdba7328c5d2cb9f972bc68195f8f0570ce5d49de9251d7060018d88d
diff --git a/dev-java/jzlib/jzlib-1.0.7-r2.ebuild b/dev-java/jzlib/jzlib-1.0.7-r2.ebuild
index 3781906a9d7a..6684759ecda4 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 98987635a5c9..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="https://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 b0130b6a186c..2e11bc9021e8 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="https://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
 }