fixed patch, 40197

7 files changed, 28 insertions, 50 deletions

diff --git a/dev-db/henplus/ChangeLog b/dev-db/henplus/ChangeLog
index 1a9f4c54b12b..48391cdc08ed 100644
--- a/dev-db/henplus/ChangeLog
+++ b/dev-db/henplus/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-db/henplus
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/henplus/ChangeLog,v 1.5 2004/07/19 09:48:32 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/henplus/ChangeLog,v 1.6 2004/07/23 09:25:20 axxo Exp $
+
+*henplus-0.9.5-r2 (23 Jul 2004)
+
+  23 Jul 2004; Thomas Matthijs <axxo@gentoo.org> files/henplus.patch,
+  +henplus-0.9.5-r2.ebuild:
+  Fixed patch to find readline thanks to Ole Langbehn <neurolabs@web.de> in 40197
 
   19 Jul 2004; David Holm <dholm@gentoo.org> henplus-0.9.5-r1.ebuild:
   Added to ~ppc.
diff --git a/dev-db/henplus/Manifest b/dev-db/henplus/Manifest
index 37cf2964472c..70a4aa9c2355 100644
--- a/dev-db/henplus/Manifest
+++ b/dev-db/henplus/Manifest
@@ -1,7 +1,5 @@
-MD5 052292b5e4c2f3040d244b22680081f6 ChangeLog 606
-MD5 e78f4c5229de020da1601d3e936aab1c henplus-0.9.5.ebuild 1054
+MD5 7bbdf0172250f2b3c21dc9d7a2010434 henplus-0.9.5-r2.ebuild 1164
+MD5 c71f23bb566fd973a57ba0e5aede9013 ChangeLog 819
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
-MD5 7f537e06c164df5b36a252f7b3dd01bb henplus-0.9.5-r1.ebuild 1165
-MD5 cde5d89f324a87299196a42dfffaf617 files/digest-henplus-0.9.5 65
-MD5 cde5d89f324a87299196a42dfffaf617 files/digest-henplus-0.9.5-r1 65
-MD5 8bb4e9e0346231c15f8fcd9b836ce86e files/henplus.patch 1003
+MD5 37806893919cdec72d86e859fb03c0ef files/henplus.patch 1301
+MD5 cde5d89f324a87299196a42dfffaf617 files/digest-henplus-0.9.5-r2 65
diff --git a/dev-db/henplus/files/digest-henplus-0.9.5-r1 b/dev-db/henplus/files/digest-henplus-0.9.5-r1
deleted file mode 100644
index 7db26f4124e9..000000000000
--- a/dev-db/henplus/files/digest-henplus-0.9.5-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 135e00fddd80ec0cf903171760c02a1b henplus-0.9.5.tar.gz 106161
diff --git a/dev-db/henplus/files/digest-henplus-0.9.5 b/dev-db/henplus/files/digest-henplus-0.9.5-r2
index 7db26f4124e9..7db26f4124e9 100644
--- a/dev-db/henplus/files/digest-henplus-0.9.5
+++ b/dev-db/henplus/files/digest-henplus-0.9.5-r2
diff --git a/dev-db/henplus/files/henplus.patch b/dev-db/henplus/files/henplus.patch
index 4c6fa7038f45..c1028161c4cc 100644
--- a/dev-db/henplus/files/henplus.patch
+++ b/dev-db/henplus/files/henplus.patch
@@ -1,6 +1,14 @@
 --- bin/henplus	2004-02-02 14:53:28.000000000 +0100
-+++ bin/henplus	2004-07-18 15:56:40.061422352 +0200
-@@ -13,20 +13,9 @@
++++ /usr/bin/henplus	2004-07-23 11:21:11.518166136 +0200
+@@ -2,6 +2,7 @@
+ # $Id: henplus.patch,v 1.2 2004/07/23 09:25:20 axxo Exp $
+ ##
+ 
++echo $(dirname $0)
+ # additional flags you might want to pass to the java interpreter
+ # like -Dfile.encoding=ISO-8859-1
+ JAVA_FLAGS=
+@@ -13,20 +14,8 @@
      JAVA=$JAVA_HOME/bin/java
  fi
  
@@ -12,22 +20,23 @@
 -if [ ! -d "$HENPLUSDIR" ] ; then
 -	HENPLUSDIR=$THISDIR/../build
 -fi
-+HENPLUSDIR=$(dirname $(java-config -p henplus))
- 
+-
 -# location of the readline lib.
 -# Modify this, if you installation stores this at a different
 -# position.
 -LD_LIBRARY_PATH=$THISDIR/../lib:/usr/lib/jni:$LD_LIBRARY_PATH
 -CLASSPATH=$CLASSPATH:$THISDIR/../share/java/libreadline-java.jar
++HENPLUSDIR=$(dirname $(java-config -p henplus))
 +CLASSPATH=$CLASSPATH:$(java-config -p libreadline-java)
  
  # you may just throw your own jar files in this dir.
  # (like additional JDBC-drivers, that are not in default
-@@ -66,6 +55,4 @@
+@@ -65,7 +54,4 @@
+         CLASSPATH=$CLASSPATH:$f
      fi
  done
- 
+-
 -export CLASSPATH LD_LIBRARY_PATH
 -
 -exec $JAVA $JAVA_FLAGS henplus.HenPlus "$@"
-+exec $JAVA -cp $CLASSPATH $JAVA_FLAGS henplus.HenPlus "$@"
++LD_LIBRARY_PATH="/usr/lib:$LD_LIBRARY_PATH" exec $JAVA -cp $CLASSPATH $JAVA_FLAGS henplus.HenPlus "$@"
diff --git a/dev-db/henplus/henplus-0.9.5-r1.ebuild b/dev-db/henplus/henplus-0.9.5-r2.ebuild
index 5ed56a295206..7ad3065500c7 100644
--- a/dev-db/henplus/henplus-0.9.5-r1.ebuild
+++ b/dev-db/henplus/henplus-0.9.5-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/henplus/henplus-0.9.5-r1.ebuild,v 1.2 2004/07/19 09:48:32 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/henplus/henplus-0.9.5-r2.ebuild,v 1.1 2004/07/23 09:25:20 axxo Exp $
 
 inherit java-pkg eutils
 
diff --git a/dev-db/henplus/henplus-0.9.5.ebuild b/dev-db/henplus/henplus-0.9.5.ebuild
deleted file mode 100644
index c7155cd518fe..000000000000
--- a/dev-db/henplus/henplus-0.9.5.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/henplus/henplus-0.9.5.ebuild,v 1.2 2004/06/24 21:54:30 agriffis Exp $
-
-inherit java-pkg
-
-DESCRIPTION="HenPlus is a SQL shell that can handle multiple sessions in parallel. The commandline interface with the usual history functions features TAB-completion for commands, tables and columns. Database connect via JDBC."
-HOMEPAGE="http://www.sourceforge.net/projects/henplus"
-SRC_URI="mirror://sourceforge/henplus/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~sparc"
-IUSE="jikes"
-
-DEPEND=">=virtual/jdk-1.3
-	>=dev-java/ant-1.4.1
-	dev-java/libreadline-java
-	jikes? ( >=dev-java/jikes-1.17 )"
-
-RDEPEND=">=virtual/jdk-1.3"
-
-src_compile() {
-	local antflags="jar"
-	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
-	export CLASSPATH="$CLASSPATH:`java-config --classpath=libreadline-java`"
-
-	ant ${antflags} || die "compile problem"
-}
-
-src_install () {
-	java-pkg_dojar build/*.jar
-	dodoc README
-}
-