5 files changed, 28 insertions, 51 deletions
diff --git a/dev-java/j2ssh/ChangeLog b/dev-java/j2ssh/ChangeLog
index 2d0e08acc05a..705e39b494fe 100644
--- a/dev-java/j2ssh/ChangeLog
+++ b/dev-java/j2ssh/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/j2ssh
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/j2ssh/ChangeLog,v 1.9 2005/05/15 16:15:37 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/j2ssh/ChangeLog,v 1.10 2005/06/12 18:58:09 luckyduck Exp $
+
+  12 Jun 2005; Jan Brinkmann <luckyduck@gentoo.org> -j2ssh-0.2.7.ebuild,
+  j2ssh-0.2.7-r1.ebuild:
+  Introduced support for the examples and the source useflag.
 
   15 May 2005; Jan Brinkmann <luckyduck@gentoo.org> j2ssh-0.2.7-r1.ebuild:
   stable on ppc
diff --git a/dev-java/j2ssh/Manifest b/dev-java/j2ssh/Manifest
index 28afccb8793d..367e3843bdd0 100644
--- a/dev-java/j2ssh/Manifest
+++ b/dev-java/j2ssh/Manifest
@@ -1,16 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 1d14f225d2748c13141dc9c5e8fe9728 j2ssh-0.2.7.ebuild 909
-MD5 d89ef2e9f6393ffe1b30a8aa2d912c28 j2ssh-0.2.7-r1.ebuild 1211
-MD5 67cc580953113d72ca33925069bc3a10 ChangeLog 1229
+MD5 3c97ea4fd426cf938d91e006bede0aac j2ssh-0.2.7-r1.ebuild 1360
+MD5 e58a59975a6b3627f1a6da975f554acc ChangeLog 1391
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 MD5 c0c163f1e4dcccc73192bfc69ba092a3 files/digest-j2ssh-0.2.7-r1 68
-MD5 c0c163f1e4dcccc73192bfc69ba092a3 files/digest-j2ssh-0.2.7 68
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.0 (GNU/Linux)
 
-iD8DBQFCh3W806ebR+OMO78RAj+YAJ0VldPJPJbDbQPzMUyZDk+bJt6MqACggA6t
-mP5tdrx7xjkpB9m3gKS4lnA=
-=Smdl
+iD8DBQFCrIXd06ebR+OMO78RArHpAJ4zt2sj3Hua5+XFZfqlOT63FkqlSwCfVw5q
+0ylSUjGP2cWOVQd9sltRqnE=
+=0YqQ
 -----END PGP SIGNATURE-----
diff --git a/dev-java/j2ssh/files/digest-j2ssh-0.2.7 b/dev-java/j2ssh/files/digest-j2ssh-0.2.7
deleted file mode 100644
index 24ef4e9e5f0a..000000000000
--- a/dev-java/j2ssh/files/digest-j2ssh-0.2.7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 e2921583255ca567a3fad9aab9e6a044 j2ssh-0.2.7-src.tar.gz 2188240
diff --git a/dev-java/j2ssh/j2ssh-0.2.7-r1.ebuild b/dev-java/j2ssh/j2ssh-0.2.7-r1.ebuild
index 35154f239417..2925f887c69b 100644
--- a/dev-java/j2ssh/j2ssh-0.2.7-r1.ebuild
+++ b/dev-java/j2ssh/j2ssh-0.2.7-r1.ebuild
@@ -1,22 +1,25 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/j2ssh/j2ssh-0.2.7-r1.ebuild,v 1.6 2005/05/15 16:15:37 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/j2ssh/j2ssh-0.2.7-r1.ebuild,v 1.7 2005/06/12 18:58:09 luckyduck Exp $
 
 inherit java-pkg
 
 DESCRIPTION="Java SSH API"
 HOMEPAGE="http://sourceforge.net/projects/sshtools/"
-SRC_URI="mirror://sourceforge/sshtools/j2ssh-${PV}-src.tar.gz"
+SRC_URI="mirror://sourceforge/sshtools/${P}-src.tar.gz"
+
 LICENSE="LGPL-2.1"
 SLOT="0"
-IUSE="doc jikes"
 KEYWORDS="x86 ppc amd64"
+IUSE="doc examples jikes source"
+
 DEPEND=">=virtual/jdk-1.3
-		dev-java/ant
-		dev-java/commons-logging
-		>=dev-java/xerces-2.6.2-r1
-		jikes? ( dev-java/jikes )"
-RDEPEND=">=virtual/jdk-1.3"
+	dev-java/ant-core
+	jikes? ( dev-java/jikes )
+	source? ( app-arch/zip )"
+RDEPEND=">=virtual/jdk-1.3
+	dev-java/commons-logging
+	=dev-java/xerces-2.6*"
 
 S="${WORKDIR}/${PN}"
 
@@ -40,5 +43,11 @@ src_install() {
 	java-pkg_dojar dist/lib/*.jar
 	insinto /usr/share/${PN}
 	doins j2ssh.properties
-	use doc && java-pkg_dohtml -r docs/ && cp -R ${S}/examples ${D}/usr/share/${PN}
+
+	use doc && java-pkg_dohtml -r docs/
+	if use examples; then
+		dodir /usr/share/doc/${PF}/examples
+		cp -R ${S}/examples/* ${D}/usr/share/doc/${PF}/examples
+	fi
+	use source && java-pkg_dosrc src/*
 }
diff --git a/dev-java/j2ssh/j2ssh-0.2.7.ebuild b/dev-java/j2ssh/j2ssh-0.2.7.ebuild
deleted file mode 100644
index 4f4f02688ba5..000000000000
--- a/dev-java/j2ssh/j2ssh-0.2.7.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/j2ssh/j2ssh-0.2.7.ebuild,v 1.5 2004/10/22 11:03:36 absinthe Exp $
-
-inherit java-pkg
-
-DESCRIPTION="Java SSH API"
-HOMEPAGE="http://sourceforge.net/projects/sshtools/"
-SRC_URI="mirror://sourceforge/sshtools/j2ssh-${PV}-src.tar.gz"
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="doc jikes"
-KEYWORDS="x86 ~amd64"
-DEPEND=">=virtual/jdk-1.3
-		dev-java/ant
-		jikes? ( dev-java/jikes )"
-RDEPEND=">=virtual/jdk-1.3"
-
-S="${WORKDIR}/${PN}"
-
-src_compile() {
-	local antflags="build"
-	use doc && antflags="${antflags} javadoc"
-	use jikes && antflag="${antflags} -Dbuild.compiler=jikes"
-	ant ${antflags}
-}
-
-src_install() {
-	java-pkg_dojar dist/lib/*.jar
-	insinto /usr/share/${PN}
-	doins j2ssh.properties
-	use doc && java-pkg_dohtml -r docs/ && cp -R ${S}/examples ${D}/usr/share/${PN}
-}