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

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

5 files changed, 99 insertions, 42 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/Manifest b/net-misc/mindterm/Manifest
index 0f4831f7567e..cb8441fe8593 100644
--- a/net-misc/mindterm/Manifest
+++ b/net-misc/mindterm/Manifest
@@ -1,7 +1,18 @@
-AUX 2.4.2-buildxml.patch 1225 RMD160 28f15d6cbbac30022650305a3c4eca4b305e8098 SHA1 74d80258ac9f62a0d6613989ef2d31e44ac2ff83 SHA256 e6d6947506d9a097d1cb06def2dda5f6f84e3bdce440a8299aa8ff1f10bef015
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX mindterm-3.2-missingclasses.patch 1081 RMD160 fef115d54e22d24571b0c548bfad14aa0711f4d0 SHA1 a4282c6a93d54f3897613bfb4f29ff5a6e4daa20 SHA256 f0dfefe71f8c463f8f2a8789f7765cf87d96fa568b64be55c94897b62a445e36
 DIST mindterm_3.1.2-src.zip 1185108 RMD160 c5dcdd522b9078d6890fd76e2bf47c0a312907fd SHA1 d775dbebd836d1584188ff228a17130de26c212e SHA256 c03227cd578b9230e68f1c4e95880b74fb575724bfa674f258c854808971e116
 DIST mindterm_3.2-src.zip 1192279 RMD160 9c4eefc74b55c105dab3d09294074bb24294b0ad SHA1 330ebc9130a327022c76987c40cff531b42c17b4 SHA256 489ee6c3dcd58d1a333b6ad4d177908197ced49849b505c71ba1097821cdbba3
 EBUILD mindterm-3.1.2.ebuild 1339 RMD160 e018f31746a967c50ff53ecbddc49b5bb6922ace SHA1 f55f407f488081b04266b11240a55f2a86606aad SHA256 dd41a4d8611b23f16ad0a5f0a0a8bf55128a034879dcfebf49e24dbb52e60ead
+EBUILD mindterm-3.2-r1.ebuild 1487 RMD160 2627808dc50304a726b40886a3fae23aa03cfa59 SHA1 d06ba1897034e35be21391c09f9ad049ad33dad0 SHA256 04e91815f43aad1e809805e7bee4d7c0eff47c0e3dfec703c4a6030259d35151
 EBUILD mindterm-3.2.ebuild 1370 RMD160 967d5496ba96d5e9a3600d466bcc17da98368e44 SHA1 d735e94abc30db9579d557d6d6148f9aa6941086 SHA256 3d0638ce7895cef5c87ecbab28e57f8006c849fbcb16b865eaa685191da7ef43
-MISC ChangeLog 3037 RMD160 9215acd300e848dbaa53161398edf9e12c4ceb61 SHA1 7b8127469d2edd7a053d77157ebfab75c9fa369a SHA256 603c3a262e403b8bbcf0e9908796374a468a67f2c6cba290ca0e8b3daacd0d71
+MISC ChangeLog 3323 RMD160 898b81518df6534d692948dad3e00c05287ca887 SHA1 1b232696309f0dc50d0d1b585fd9e5c88dc392cf SHA256 33219b312f295eabf260800ac0fa0268a73f94080fff8aa0fae431e4c171ef89
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkmFZ6QACgkQRh6X64ivZaJj9gCfeEI5dB6F8gURZQxkVPuyVrvE
+JAYAnRf3JfIWD6RMy3s64UY/k5FBDFcP
+=lV7W
+-----END PGP SIGNATURE-----
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/"
+}