fix deps, and source useflag support, cleanups

(Portage version: 2.0.51.22-r1)

9 files changed, 20 insertions, 135 deletions

diff --git a/dev-java/jsch/ChangeLog b/dev-java/jsch/ChangeLog
index af089d3c3933..5f0d920e52b8 100644
--- a/dev-java/jsch/ChangeLog
+++ b/dev-java/jsch/ChangeLog
@@ -1,6 +1,10 @@
 # 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.27 2005/05/27 00:03:01 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jsch/ChangeLog,v 1.28 2005/07/09 16:05:14 axxo Exp $
+
+  09 Jul 2005; Thomas Matthijs <axxo@gentoo.org> -jsch-0.1.15.ebuild,
+  -jsch-0.1.16.ebuild, -jsch-0.1.17.ebuild, jsch-0.1.18.ebuild:
+  fix deps, and source useflag support, cleanups
 
   27 May 2005; Jan Brinkmann <luckyduck@gentoo.org> jsch-0.1.18.ebuild:
   stable on ppc
diff --git a/dev-java/jsch/Manifest b/dev-java/jsch/Manifest
index 4f6a2ee4ef49..64158c49dfa8 100644
--- a/dev-java/jsch/Manifest
+++ b/dev-java/jsch/Manifest
@@ -1,10 +1,4 @@
+MD5 5ae53c5486b6a32a7e84a97b4608f6dc jsch-0.1.18.ebuild 1200
+MD5 292f760c874219e351ebdcf3efe7ae81 ChangeLog 3834
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
-MD5 ae7721b7793c0b48ec5baebfd7186fa5 jsch-0.1.15.ebuild 988
-MD5 0ac0c37ebfef1479b2cd199a3315b21f jsch-0.1.16.ebuild 1123
-MD5 d4b60e173ffed88fd58deebd8ac64b6e jsch-0.1.17.ebuild 1123
-MD5 e506b3b9199a84a009b7a08079d88a3f jsch-0.1.18.ebuild 1143
-MD5 5e8a456ad0d3b5ab96f2623344b2cec9 ChangeLog 3650
 MD5 3ea4f3d468b864097aa05187c1c750ba files/digest-jsch-0.1.18 60
-MD5 53d260d9dbe97b01d9c72f8d71748f1b files/digest-jsch-0.1.17 60
-MD5 d5f449a0c2ef9fa25fce49d1258916d1 files/digest-jsch-0.1.15 60
-MD5 d08475096e782d87daa3748aa6ed4ebe files/digest-jsch-0.1.16 60
diff --git a/dev-java/jsch/files/digest-jsch-0.1.15 b/dev-java/jsch/files/digest-jsch-0.1.15
deleted file mode 100644
index b78ea00687fe..000000000000
--- a/dev-java/jsch/files/digest-jsch-0.1.15
+++ /dev/null
@@ -1 +0,0 @@
-MD5 569bf084777b2cc94ab09e81f732ea70 jsch-0.1.15.zip 185285
diff --git a/dev-java/jsch/files/digest-jsch-0.1.16 b/dev-java/jsch/files/digest-jsch-0.1.16
deleted file mode 100644
index d38f13f10e98..000000000000
--- a/dev-java/jsch/files/digest-jsch-0.1.16
+++ /dev/null
@@ -1 +0,0 @@
-MD5 557ca07abd9d921b05bd56b60b4bfcee jsch-0.1.16.zip 188708
diff --git a/dev-java/jsch/files/digest-jsch-0.1.17 b/dev-java/jsch/files/digest-jsch-0.1.17
deleted file mode 100644
index f2aba85ecd7d..000000000000
--- a/dev-java/jsch/files/digest-jsch-0.1.17
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c1afcf8716f7fe9c8cf96c91325c87e8 jsch-0.1.17.zip 190645
diff --git a/dev-java/jsch/jsch-0.1.15.ebuild b/dev-java/jsch/jsch-0.1.15.ebuild
deleted file mode 100644
index 8efa2636dd81..000000000000
--- a/dev-java/jsch/jsch-0.1.15.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# 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.15.ebuild,v 1.8 2005/01/26 21:36:39 corsair Exp $
-
-inherit java-pkg
-
-DESCRIPTION="JSch is a pure Java implementation of SSH2."
-HOMEPAGE="http://www.jcraft.com/jsch/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}-${PV}.zip"
-LICENSE="jcraft"
-SLOT="0"
-KEYWORDS="x86 amd64 ppc sparc"
-IUSE="doc jikes"
-
-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 )"
-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"
-}
-
-src_install() {
-	mv dist/lib/jsch{*,}.jar
-	java-pkg_dojar dist/lib/jsch.jar || die "installation failed"
-	use doc && java-pkg_dohtml -r javadoc/*
-	dodoc LICENSE.txt README ChangeLog
-}
diff --git a/dev-java/jsch/jsch-0.1.16.ebuild b/dev-java/jsch/jsch-0.1.16.ebuild
deleted file mode 100644
index 70b1429e3ba4..000000000000
--- a/dev-java/jsch/jsch-0.1.16.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# 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.8 2005/03/31 15:10:11 axxo Exp $
-
-inherit java-pkg
-
-DESCRIPTION="JSch is a pure Java implementation of SSH2."
-HOMEPAGE="http://www.jcraft.com/jsch/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}-${PV}.zip"
-LICENSE="jcraft"
-SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc ~sparc"
-IUSE="doc jikes"
-
-DEPEND=">=virtual/jdk-1.4
-	>=dev-java/ant-core-1.6
-	>=dev-java/jzlib-1.0.3
-	app-arch/unzip
-	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"
-	if use ppc; then
-		ant $(java-config -p gnu-crypto) ${antflags} || die "compilation failed"
-	else
-		ant ${antflags} || die "compilation failed"
-	fi
-}
-
-src_install() {
-	mv dist/lib/jsch{*,}.jar
-	java-pkg_dojar dist/lib/jsch.jar || die "installation failed"
-	use doc && java-pkg_dohtml -r javadoc/*
-	dodoc LICENSE.txt README ChangeLog
-}
diff --git a/dev-java/jsch/jsch-0.1.17.ebuild b/dev-java/jsch/jsch-0.1.17.ebuild
deleted file mode 100644
index 5d67375940f9..000000000000
--- a/dev-java/jsch/jsch-0.1.17.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# 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.6 2005/03/31 15:10:11 axxo Exp $
-
-inherit java-pkg
-
-DESCRIPTION="JSch is a pure Java implementation of SSH2."
-HOMEPAGE="http://www.jcraft.com/jsch/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}-${PV}.zip"
-LICENSE="jcraft"
-SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc ~sparc"
-IUSE="doc jikes"
-
-DEPEND=">=virtual/jdk-1.4
-	>=dev-java/ant-core-1.6
-	>=dev-java/jzlib-1.0.3
-	app-arch/unzip
-	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"
-	if use ppc; then
-		ant $(java-config -p gnu-crypto) ${antflags} || die "compilation failed"
-	else
-		ant ${antflags} || die "compilation failed"
-	fi
-}
-
-src_install() {
-	mv dist/lib/jsch{*,}.jar
-	java-pkg_dojar dist/lib/jsch.jar || die "installation failed"
-	use doc && java-pkg_dohtml -r javadoc/*
-	dodoc LICENSE.txt README ChangeLog
-}
diff --git a/dev-java/jsch/jsch-0.1.18.ebuild b/dev-java/jsch/jsch-0.1.18.ebuild
index 8824e4064da8..bde78c146b2e 100644
--- a/dev-java/jsch/jsch-0.1.18.ebuild
+++ b/dev-java/jsch/jsch-0.1.18.ebuild
@@ -1,39 +1,41 @@
 # 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.10 2005/06/09 00:51:04 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jsch/jsch-0.1.18.ebuild,v 1.11 2005/07/09 16:05:14 axxo Exp $
 
 inherit java-pkg
 
 DESCRIPTION="JSch is a pure Java implementation of SSH2."
 HOMEPAGE="http://www.jcraft.com/jsch/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}-${PV}.zip"
+SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
 LICENSE="jcraft"
 SLOT="0"
 KEYWORDS="x86 amd64 ppc sparc ppc64"
-IUSE="doc jikes"
+IUSE="doc jikes source"
 
+RDEPEND=">=virtual/jdk-1.4
+	>=dev-java/jzlib-1.0.3
+	!sparc? ( dev-java/gnu-crypto )"
 DEPEND=">=virtual/jdk-1.4
 	>=dev-java/ant-core-1.6
-	>=dev-java/jzlib-1.0.3
 	app-arch/unzip
+	source? ( app-arch/zip )
 	jikes? ( >=dev-java/jikes-1.17 )
-	!sparc? ( dev-java/gnu-crypto )"
-RDEPEND=">=virtual/jdk-1.4"
+	${RDEPEND}"
 
 src_compile() {
 	local antflags="dist"
 	use doc && antflags="${antflags} javadoc"
 	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
 	if ! use sparc; then
-		ant -lib $(java-config -p gnu-crypto) ${antflags} || die "compilation failed"
+		ant -lib $(java-pkg_getjars gnu-crypto,jzlib) ${antflags} || die "compilation failed"
 	else
-		ant ${antflags} || die "compilation failed"
+		ant -lib $(java-pkg_getjars jzlib) ${antflags} || die "compilation failed"
 	fi
 }
 
 src_install() {
-	mv dist/lib/jsch{*,}.jar
-	java-pkg_dojar dist/lib/jsch.jar || die "installation failed"
+	java-pkg_newjar dist/lib/jsch*.jar jsch.jar
 	use doc && java-pkg_dohtml -r javadoc/*
-	dodoc LICENSE.txt README ChangeLog
+	use source && java-pkg_dosrc src/*
+	dodoc README ChangeLog
 }