commit:     c58f21de8c2749761302ccc432c662c734772cb1
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 23 10:45:15 2020 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Wed Sep 23 10:45:15 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c58f21de

dev-java/jsch: added missing dep to 0.1.54 + cleanup

Bug: https://bugs.gentoo.org/743643
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 dev-java/jsch/Manifest           |  1 -
 dev-java/jsch/jsch-0.1.52.ebuild | 50 ----------------------------------------
 dev-java/jsch/jsch-0.1.54.ebuild |  1 +
 3 files changed, 1 insertion(+), 51 deletions(-)

diff --git a/dev-java/jsch/Manifest b/dev-java/jsch/Manifest
index 72d076e4bef..018afebf8cf 100644
--- a/dev-java/jsch/Manifest
+++ b/dev-java/jsch/Manifest
@@ -1,2 +1 @@
-DIST jsch-0.1.52.zip 363648 BLAKE2B 
37f5105920868957409c6eed8fb7b1517c0816ee6c1da25b0ad5f1cb0b1e6c71954e30e255b8aa94989495e11767ee11c5ce8bfd9721da12d6823832dd57bb16
 SHA512 
a5a998b6139638eee403e120f5f217112a5c09e81db8e1b1240d53ca311df4540b56aaa5f67f7a5c40cbc8420535d72d456e4fbfc95fe86d46376a00295bec4d
 DIST jsch-0.1.54.zip 365455 BLAKE2B 
5cd6fa012e5a511bad8f23a233559e6ad6d600f39ea7b519e66e118b1fdb997491b7ac8cff5bc1491c28f7ee99f0f4a3b4727f5d8ec02030576f34949d74e203
 SHA512 
2ed29f07495fbc28d6eb7b4fe414e8a9a96b911b2feea5b1513cc48a9439adba12341bceb23a3ea9ab307e32d48bfd4356c7bc877c56e77f6f55d69214db3a9e

diff --git a/dev-java/jsch/jsch-0.1.52.ebuild b/dev-java/jsch/jsch-0.1.52.ebuild
deleted file mode 100644
index 29979e49365..00000000000
--- a/dev-java/jsch/jsch-0.1.52.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-JAVA_PKG_IUSE="doc source examples"
-
-inherit java-pkg-2 java-ant-2 java-osgi
-
-DESCRIPTION="JSch is a pure Java implementation of SSH2"
-HOMEPAGE="http://www.jcraft.com/jsch/";
-SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
-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="zlib"
-
-CDEPEND=""
-
-RDEPEND="
-       ${CDEPEND}
-       >=virtual/jre-1.6
-       zlib? ( dev-java/jzlib:0 )"
-
-DEPEND="
-       ${CDEPEND}
-       app-arch/unzip
-       >=virtual/jdk-1.6"
-
-EANT_BUILD_TARGET="dist"
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-src_compile() {
-       if use zlib; then
-               EANT_EXTRA_ARGS="-Djzlib.available=true"
-               EANT_GENTOO_CLASSPATH="jzlib"
-       fi
-
-       java-pkg-2_src_compile
-}
-
-src_install() {
-       java-osgi_newjar dist/lib/jsch*.jar "com.jcraft.jsch" "JSch" \
-               "com.jcraft.jsch, com.jcraft.jsch.jce;x-internal:=true, \
-               com.jcraft.jsch.jcraft;x-internal:=true"
-
-       dodoc README ChangeLog
-       use doc && java-pkg_dojavadoc javadoc
-       use source && java-pkg_dosrc src/*
-       use examples && java-pkg_doexamples examples
-}

diff --git a/dev-java/jsch/jsch-0.1.54.ebuild b/dev-java/jsch/jsch-0.1.54.ebuild
index 6c3800633d3..96b5ef30363 100644
--- a/dev-java/jsch/jsch-0.1.54.ebuild
+++ b/dev-java/jsch/jsch-0.1.54.ebuild
@@ -24,6 +24,7 @@ RDEPEND="
 
 DEPEND="
        ${CDEPEND}
+       app-arch/unzip
        >=virtual/jdk-1.6"
 
 EANT_BUILD_TARGET="dist"

Reply via email to