Revbump to add missing classes. Add jzlib to javadoc classpath. Migrate to EAPI 2. Remove old patch.

(Portage version: 2.2_rc23/cvs/Linux x86_64)

4 files changed, 86 insertions, 40 deletions

diff --git a/net-misc/mindterm/ChangeLog b/net-misc/mindterm/ChangeLog
index 942ce341baad..bc6c371993f8 100644
--- a/net-misc/mindterm/ChangeLog
+++ b/net-misc/mindterm/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-misc/mindterm
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/mindterm/ChangeLog,v 1.23 2008/05/15 01:30:53 rich0 Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mindterm/ChangeLog,v 1.24 2009/02/01 09:13:03 serkan Exp $
+
+*mindterm-3.2-r1 (01 Feb 2009)
+
+  01 Feb 2009; Serkan Kaba <serkan@gentoo.org>
+  +files/mindterm-3.2-missingclasses.patch, -files/2.4.2-buildxml.patch,
+  +mindterm-3.2-r1.ebuild:
+  Revbump to add missing classes. Add jzlib to javadoc classpath. Migrate to
+  EAPI 2. Remove old patch.
 
   15 May 2008; Richard Freeman <rich0@gentoo.org> mindterm-3.2.ebuild:
   amd64 stable - 219672
diff --git a/net-misc/mindterm/files/2.4.2-buildxml.patch b/net-misc/mindterm/files/2.4.2-buildxml.patch
deleted file mode 100644
index 13ce76a74b6a..000000000000
--- a/net-misc/mindterm/files/2.4.2-buildxml.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- build.xml.orig	2005-01-27 16:49:47.297475504 +0100
-+++ build.xml	2005-01-27 16:55:55.893440400 +0100
-@@ -15,9 +15,6 @@
-   <property name="doc"   location="javadoc"/>
-   <property name="src"   location="."/>
- 
--  <taskdef name="javamake"
--   classname="com.sun.tools.javamake.ant.JavaMake"/>
--
-   &filesets;
- 
-   <target name="init">
-@@ -31,20 +28,18 @@
- 
-   <target name="compile" depends="init"
-     description="Compile all classes except examples">
--    <javamake destdir="${build.mindterm}" srcdir="." target="1.1"
--        pdbFilename="${build.mindterm}/mindterm.pdb">
-+    <javac destdir="${build.mindterm}" srcdir="." target="1.1">
-        <include name="com/**"/>
-        <include name="netscape/**"/>
--     </javamake>
-+     </javac>
-   </target>
- 
-   <target name="compile_examples" depends="init, mindterm.jar"
-     description="Compile examples">
--    <javamake destdir="${build.examples}" srcdir="."
--        classpath="mindterm.jar"
--        pdbFilename="${build.examples}/examples.pdb">	
-+    <javac destdir="${build.examples}" srcdir="."
-+	    classpath="mindterm.jar">
-        <include name="examples/**"/>
--     </javamake>
-+     </javac>
-   </target>
- 
-   <target name="mindterm.jar" depends="compile"
diff --git a/net-misc/mindterm/files/mindterm-3.2-missingclasses.patch b/net-misc/mindterm/files/mindterm-3.2-missingclasses.patch
new file mode 100644
index 000000000000..b231d64ad9fa
--- /dev/null
+++ b/net-misc/mindterm/files/mindterm-3.2-missingclasses.patch
@@ -0,0 +1,19 @@
+diff -Nur mindterm_3.2/filesets.xml mindterm_3.2_patched/filesets.xml
+--- mindterm_3.2/filesets.xml	2007-10-02 16:09:12.000000000 +0300
++++ mindterm_3.2_patched/filesets.xml	2009-02-01 10:56:02.000000000 +0200
+@@ -145,6 +145,7 @@
+     com/mindbright/security/publickey/DSAPrivateKey.class
+     com/mindbright/security/publickey/DSAPublicKey.class
+     com/mindbright/security/publickey/DSAWithSHA1.class
++    com/mindbright/security/publickey/DSAWithSHA1$DSASIG.class
+     com/mindbright/security/publickey/DiffieHellman.class
+     com/mindbright/security/publickey/ModPGroups.class
+     com/mindbright/security/publickey/RawDSAWithSHA1.class
+@@ -565,6 +566,7 @@
+     com/mindbright/terminal/tandem6530/ProtectBlockMode.class
+     com/mindbright/terminal/tandem6530/ActionHandler.class
+     com/mindbright/terminal/tandem6530/Parser.class
++    com/mindbright/terminal/tandem6530/Parser*.class
+     com/mindbright/terminal/tandem6530/Parser$Collector.class
+     com/mindbright/terminal/tandem6530/ParseException.class
+     com/mindbright/terminal/tandem6530/BadColorException.class
diff --git a/net-misc/mindterm/mindterm-3.2-r1.ebuild b/net-misc/mindterm/mindterm-3.2-r1.ebuild
new file mode 100644
index 000000000000..0b5029197387
--- /dev/null
+++ b/net-misc/mindterm/mindterm-3.2-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/mindterm/mindterm-3.2-r1.ebuild,v 1.1 2009/02/01 09:13:03 serkan Exp $
+
+EAPI="2"
+WANT_ANT_TASKS="ant-nodeps"
+
+inherit eutils java-pkg-2 java-ant-2
+
+MY_P=${P/-/_}
+
+DESCRIPTION="A Java SSH Client"
+HOMEPAGE="http://www.appgate.com/products/80_MindTerm/"
+SRC_URI="http://www.appgate.com/products/80_MindTerm/110_MindTerm_Download/${MY_P}-src.zip"
+
+LICENSE="mindterm"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc examples"
+COMMON_DEP="dev-java/jzlib:0"
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEP}"
+DEPEND=">=virtual/jdk-1.4
+	app-arch/unzip
+	${COMMON_DEP}"
+
+S=${WORKDIR}/${MY_P}
+
+JAVA_PKG_FILTER_COMPILER="jikes"
+EANT_BUILD_TARGET="mindterm.jar lite"
+EANT_DOC_TARGET="doc"
+EANT_GENTOO_CLASSPATH="jzlib"
+JAVA_ANT_CLASSPATH_TAGS+=" javadoc"
+
+src_prepare() {
+	java-pkg-2_src_prepare
+	epatch "${FILESDIR}"/${P}-missingclasses.patch
+	java-ant_rewrite-classpath
+	rm -vr com/jcraft || die "Failed to remove bundled jcraft"
+}
+
+# Don't even compile
+RESTRICT="test"
+src_test() {
+	ANT_TASKS="ant-junit ant-nodeps" eant test \
+		-Dgentoo.classpath="$(java-pkg_getjars jzlib,junit):mindterm.jar"
+}
+
+src_install() {
+	java-pkg_dojar *.jar
+
+	java-pkg_dolauncher ${PN} --main com.mindbright.application.MindTerm
+
+	dodoc README.txt RELEASE_NOTES.txt CHANGES || die
+	use doc && java-pkg_dojavadoc javadoc
+	use examples && java-pkg_doexamples "${S}/examples/"
+}