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

(Portage version: 2.0.51.19)

5 files changed, 36 insertions, 26 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/Manifest b/dev-java/jsch/Manifest
index 1c608fdde1a7..ad0c1f2d4efb 100644
--- a/dev-java/jsch/Manifest
+++ b/dev-java/jsch/Manifest
@@ -1,20 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 e906a8406bf88c46db5e03d257409197 jsch-0.1.16.ebuild 992
-MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
-MD5 1804aa439a265308cebb07499446585f ChangeLog 3183
-MD5 fa7b6d8fa4c0c6c2ff89200fecc589bf jsch-0.1.18.ebuild 996
+MD5 a067dbe01b1653b4fbe636b15956ce61 jsch-0.1.17.ebuild 1126
+MD5 2a853215d2b21e4fa8bd7bb3134b78b1 jsch-0.1.16.ebuild 1126
+MD5 375d56e93c196eb00b32dae275cb445c jsch-0.1.18.ebuild 1141
+MD5 84b172e4c67cbb4e133fa734e8c66617 ChangeLog 3386
 MD5 ae7721b7793c0b48ec5baebfd7186fa5 jsch-0.1.15.ebuild 988
-MD5 32e0032b986f05250d78cf9560b10c62 jsch-0.1.17.ebuild 992
+MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 MD5 d5f449a0c2ef9fa25fce49d1258916d1 files/digest-jsch-0.1.15 60
 MD5 d08475096e782d87daa3748aa6ed4ebe files/digest-jsch-0.1.16 60
-MD5 3ea4f3d468b864097aa05187c1c750ba files/digest-jsch-0.1.18 60
 MD5 53d260d9dbe97b01d9c72f8d71748f1b files/digest-jsch-0.1.17 60
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCSBRAKRy60XGEcJIRAiMwAJ4yOTXngcF/ta6xrvypFyooLP/wLQCeJ0jB
-6H0GZpGvzQ7ORSS/ZK6dFjo=
-=t0iO
------END PGP SIGNATURE-----
+MD5 3ea4f3d468b864097aa05187c1c750ba files/digest-jsch-0.1.18 60
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() {