added dev-java/gnu-crypto dependency for arches which have an ibm-jdk, fixes #73337

Package-Manager: portage-2.0.51.19

4 files changed, 30 insertions, 10 deletions

diff --git a/dev-java/jsch/ChangeLog b/dev-java/jsch/ChangeLog
index 5a465aad4b6d..b94b7cbc651e 100644
--- a/dev-java/jsch/ChangeLog
+++ b/dev-java/jsch/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/jsch
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jsch/ChangeLog,v 1.24 2005/03/28 14:27:51 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jsch/ChangeLog,v 1.25 2005/03/29 13:42:09 luckyduck Exp $
+
+  29 Mar 2005; Jan Brinkmann <luckyduck@gentoo.org> jsch-0.1.16.ebuild,
+  jsch-0.1.17.ebuild, jsch-0.1.18.ebuild:
+  added dev-java/gnu-crypto dependency for arches which have an ibm-jdk, fixes
+  #73337
 
   28 Mar 2005; Gustavo Zacarias <gustavoz@gentoo.org> jsch-0.1.18.ebuild:
   Stable on sparc
diff --git a/dev-java/jsch/jsch-0.1.16.ebuild b/dev-java/jsch/jsch-0.1.16.ebuild
index cd9abe8cc96e..aa135ed5a3e9 100644
--- a/dev-java/jsch/jsch-0.1.16.ebuild
+++ b/dev-java/jsch/jsch-0.1.16.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jsch/jsch-0.1.16.ebuild,v 1.6 2005/01/26 21:36:39 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jsch/jsch-0.1.16.ebuild,v 1.7 2005/03/29 13:42:09 luckyduck Exp $
 
 inherit java-pkg
 
@@ -16,14 +16,19 @@ DEPEND=">=virtual/jdk-1.4
 	>=dev-java/ant-core-1.4
 	>=dev-java/jzlib-1.0.3
 	app-arch/unzip
-	jikes? ( >=dev-java/jikes-1.17 )"
+	jikes? ( >=dev-java/jikes-1.17 )
+	ppc? ( dev-java/gnu-crypto )"
 RDEPEND=">=virtual/jdk-1.4"
 
 src_compile() {
 	local antflags="dist"
 	use doc && antflags="${antflags} javadoc"
 	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
-	ant ${antflags} || die "compilation failed"
+	if use ppc; then
+		ant $(java-config -p gnu-crypto) ${antflags} || die "compilation failed"
+	else
+		ant ${antflags} || die "compilation failed"
+	fi
 }
 
 src_install() {
diff --git a/dev-java/jsch/jsch-0.1.17.ebuild b/dev-java/jsch/jsch-0.1.17.ebuild
index a19af543c754..a4e37283d77a 100644
--- a/dev-java/jsch/jsch-0.1.17.ebuild
+++ b/dev-java/jsch/jsch-0.1.17.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jsch/jsch-0.1.17.ebuild,v 1.4 2005/01/26 21:36:39 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jsch/jsch-0.1.17.ebuild,v 1.5 2005/03/29 13:42:09 luckyduck Exp $
 
 inherit java-pkg
 
@@ -16,14 +16,19 @@ DEPEND=">=virtual/jdk-1.4
 	>=dev-java/ant-core-1.4
 	>=dev-java/jzlib-1.0.3
 	app-arch/unzip
-	jikes? ( >=dev-java/jikes-1.17 )"
+	jikes? ( >=dev-java/jikes-1.17 )
+	ppc? ( dev-java/gnu-crypto )"
 RDEPEND=">=virtual/jdk-1.4"
 
 src_compile() {
 	local antflags="dist"
 	use doc && antflags="${antflags} javadoc"
 	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
-	ant ${antflags} || die "compilation failed"
+	if use ppc; then
+		ant $(java-config -p gnu-crypto) ${antflags} || die "compilation failed"
+	else
+		ant ${antflags} || die "compilation failed"
+	fi
 }
 
 src_install() {
diff --git a/dev-java/jsch/jsch-0.1.18.ebuild b/dev-java/jsch/jsch-0.1.18.ebuild
index e5222fc71c80..9465c2c3b64f 100644
--- a/dev-java/jsch/jsch-0.1.18.ebuild
+++ b/dev-java/jsch/jsch-0.1.18.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jsch/jsch-0.1.18.ebuild,v 1.6 2005/03/28 14:27:51 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jsch/jsch-0.1.18.ebuild,v 1.7 2005/03/29 13:42:09 luckyduck Exp $
 
 inherit java-pkg
 
@@ -16,14 +16,19 @@ DEPEND=">=virtual/jdk-1.4
 	>=dev-java/ant-core-1.4
 	>=dev-java/jzlib-1.0.3
 	app-arch/unzip
-	jikes? ( >=dev-java/jikes-1.17 )"
+	jikes? ( >=dev-java/jikes-1.17 )
+	!sparc?( dev-java/gnu-crypto )"
 RDEPEND=">=virtual/jdk-1.4"
 
 src_compile() {
 	local antflags="dist"
 	use doc && antflags="${antflags} javadoc"
 	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
-	ant ${antflags} || die "compilation failed"
+	if ! use sparc; then
+		ant -lib $(java-config -p gnu-crypto) ${antflags} || die "compilation failed"
+	else
+		ant ${antflags} || die "compilation failed"
+	fi
 }
 
 src_install() {