Version bump for bug #146572 reported by Ole Langbehn <neurolabs@web.de>. Migrated to gen-2 java eclasses, added doc and source USE flags.

(Portage version: 2.1.2_pre3-r3)

6 files changed, 131 insertions, 1 deletions

diff --git a/dev-db/henplus/ChangeLog b/dev-db/henplus/ChangeLog
index f61dd98f7be8..c8a8baab4be8 100644
--- a/dev-db/henplus/ChangeLog
+++ b/dev-db/henplus/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-db/henplus
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/henplus/ChangeLog,v 1.13 2006/10/05 14:55:40 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/henplus/ChangeLog,v 1.14 2006/10/17 21:47:39 caster Exp $
+
+*henplus-0.9.7 (17 Oct 2006)
+
+  17 Oct 2006; Vlastimil Babka <caster@gentoo.org>
+  +files/henplus-0.9.7-build.xml.patch, +files/henplus.pre,
+  +henplus-0.9.7.ebuild:
+  Version bump for bug #146572 reported by Ole Langbehn <neurolabs@web.de>.
+  Migrated to gen-2 java eclasses, added doc and source USE flags.
 
   05 Oct 2006; Gustavo Zacarias <gustavoz@gentoo.org>
   henplus-0.9.5-r2.ebuild:
diff --git a/dev-db/henplus/files/digest-henplus-0.9.5-r2 b/dev-db/henplus/files/digest-henplus-0.9.5-r2
index 7db26f4124e9..44ff8d62445c 100644
--- a/dev-db/henplus/files/digest-henplus-0.9.5-r2
+++ b/dev-db/henplus/files/digest-henplus-0.9.5-r2
@@ -1 +1,3 @@
 MD5 135e00fddd80ec0cf903171760c02a1b henplus-0.9.5.tar.gz 106161
+RMD160 06d6ec9e4955e3fc35a195a2b2ce0a516e59497f henplus-0.9.5.tar.gz 106161
+SHA256 d324b1ebdb417c9e65638a8e184be79914419f38010fddd6d8a62170a287c426 henplus-0.9.5.tar.gz 106161
diff --git a/dev-db/henplus/files/digest-henplus-0.9.7 b/dev-db/henplus/files/digest-henplus-0.9.7
new file mode 100644
index 000000000000..8a32ec6a3148
--- /dev/null
+++ b/dev-db/henplus/files/digest-henplus-0.9.7
@@ -0,0 +1,3 @@
+MD5 9e20fad7e4042230cd54f2e49146572f henplus-0.9.7.tar.gz 219625
+RMD160 42c8067f8b0f205a34cb79bd053650debe9382e3 henplus-0.9.7.tar.gz 219625
+SHA256 9dff883c30c377a5e2c58928ad7442ed94710252df0f1d96fc509063839d33e7 henplus-0.9.7.tar.gz 219625
diff --git a/dev-db/henplus/files/henplus-0.9.7-build.xml.patch b/dev-db/henplus/files/henplus-0.9.7-build.xml.patch
new file mode 100644
index 000000000000..2e4a43a039e3
--- /dev/null
+++ b/dev-db/henplus/files/henplus-0.9.7-build.xml.patch
@@ -0,0 +1,34 @@
+--- build.xml.orig	2006-10-17 22:25:57.000000000 +0200
++++ build.xml	2006-10-17 22:27:34.000000000 +0200
+@@ -21,26 +21,26 @@
+      <property name="libreadline-java" value="libreadline-java-0.8.0.jar"/>
+ 
+      <path id="compile.classpath">
+-        <fileset dir="${lib}">
+-           <include name="${libreadline-java}"/>
+-           <include name="${commons-cli}"/>
+-        </fileset>
++        <fileset dir="${lib}" includes="**/*.jar"/>
+      </path>
+ 
+      <path id="run.classpath">
+         <path refid="compile.classpath" />
+         <pathelement path="${classes}" />
+      </path>
+-
++	
++	 <!--
+      <taskdef name="ant-server" classname="net.sweetohm.ant.server.ServerTask">
+         <classpath>
+            <pathelement location="${lib}/build/sat-0.7.jar" />
+         </classpath>
+      </taskdef>
++	 
+ 
+      <target name="server">
+         <ant-server/>
+      </target>
++	 -->
+ 
+      <target name="prepare">
+         <tstamp>
diff --git a/dev-db/henplus/files/henplus.pre b/dev-db/henplus/files/henplus.pre
new file mode 100755
index 000000000000..59b20bc3f176
--- /dev/null
+++ b/dev-db/henplus/files/henplus.pre
@@ -0,0 +1,30 @@
+# starting at the current directory we look for additional
+# JDBC-drivers in .henplus/lib-directories up the path. 
+# if no directory like that has been found the one in the 
+# home directory will be used
+DIR=`pwd`
+CUSTOM_HENPLUSDIR=""
+
+while [ $DIR != "/" ] ; do
+        if [ -d $DIR"/.henplus/lib" ]; then
+            CUSTOM_HENPLUSDIR=$DIR"/.henplus/lib"
+            break
+        fi
+        DIR=`dirname $DIR`
+done
+
+if [ -z $CUSTOM_HENPLUSDIR ]; then
+     if [ -d "/.henplus/lib" ]; then
+         CUSTOM_HENPLUSDIR="/.henplus/lib"
+     else
+         CUSTOM_HENPLUSDIR=$HOME/.henplus/lib
+     fi
+fi
+
+for f in $CUSTOM_HENPLUSDIR/*.jar $CUSTOM_HENPLUSDIR/*.zip ; do
+    if [ -r "$f" ] ; then
+        CLASSPATH=$CLASSPATH:$f
+    fi
+done
+
+export CLASSPATH
diff --git a/dev-db/henplus/henplus-0.9.7.ebuild b/dev-db/henplus/henplus-0.9.7.ebuild
new file mode 100644
index 000000000000..9ba50bd71d57
--- /dev/null
+++ b/dev-db/henplus/henplus-0.9.7.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/henplus/henplus-0.9.7.ebuild,v 1.1 2006/10/17 21:47:39 caster Exp $
+
+inherit java-pkg-2 eutils
+
+DESCRIPTION="Java-based multisession SQL shell for databases with JDBC support."
+HOMEPAGE="http://${PN}.sf.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc source"
+
+COMMON_DEPEND="=dev-java/commons-cli-1*
+	dev-java/libreadline-java"
+RDEPEND=">=virtual/jre-1.3
+	${COMMON_DEPEND}"
+DEPEND=">=virtual/jdk-1.3
+	dev-java/ant-core
+	source? ( app-arch/zip )
+	${COMMON_DEPEND}"
+
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-build.xml.patch"
+
+	cd lib
+	rm -v *.jar build/*.jar
+	java-pkg_jar-from commons-cli-1 commons-cli.jar
+	java-pkg_jar-from libreadline-java libreadline-java.jar
+}
+
+src_compile() {
+	eant jar $(use_doc)
+}
+
+src_install () {
+	java-pkg_dojar "build/${PN}.jar"
+
+	java-pkg_dolauncher ${PN} -pre "${FILESDIR}/${PN}.pre" \
+		--main henplus.HenPlus
+
+	dodoc README
+	dohtml doc/HenPlus.html
+	use doc && java-pkg_dojavadoc javadoc/api
+
+	use source && java-pkg_dosrc "src/${PN}"
+}
+