summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Nichols <nichoj@gentoo.org>2005-11-26 23:51:20 +0000
committerJoshua Nichols <nichoj@gentoo.org>2005-11-26 23:51:20 +0000
commit6301756e39d246b6ef876c1162f46a31a26a1863 (patch)
tree5944bc181d35870aa9b662330b5ad6c2ad38f92c /dev-db/henplus
parentFix var ordering. (diff)
downloadgentoo-2-6301756e39d246b6ef876c1162f46a31a26a1863.tar.gz
gentoo-2-6301756e39d246b6ef876c1162f46a31a26a1863.tar.bz2
gentoo-2-6301756e39d246b6ef876c1162f46a31a26a1863.zip
Updated script's patch to use java-config to get the right values for
(Portage version: 2.0.53_rc7)
Diffstat (limited to 'dev-db/henplus')
-rw-r--r--dev-db/henplus/ChangeLog6
-rw-r--r--dev-db/henplus/Manifest12
-rw-r--r--dev-db/henplus/files/henplus.patch4
3 files changed, 8 insertions, 14 deletions
diff --git a/dev-db/henplus/ChangeLog b/dev-db/henplus/ChangeLog
index 22af4d101820..faf842137dc5 100644
--- a/dev-db/henplus/ChangeLog
+++ b/dev-db/henplus/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-db/henplus
# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/henplus/ChangeLog,v 1.10 2005/11/26 03:28:22 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/henplus/ChangeLog,v 1.11 2005/11/26 23:51:20 nichoj Exp $
+
+ 27 Nov 2005; Joshua Nichols <nichoj@gentoo.org> files/henplus.patch:
+ Updated script's patch to use java-config to get the right values for
+ LD_LIBRARY_PATH.
26 Nov 2005; Joshua Nichols <nichoj@gentoo.org> files/henplus.patch:
Fixed libreadline-java support (bug #109140)
diff --git a/dev-db/henplus/Manifest b/dev-db/henplus/Manifest
index bf81ced00522..6bd77743c04e 100644
--- a/dev-db/henplus/Manifest
+++ b/dev-db/henplus/Manifest
@@ -1,15 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
MD5 f0554cadd0c2b13ce94d339d830cd3d2 ChangeLog 1144
MD5 cde5d89f324a87299196a42dfffaf617 files/digest-henplus-0.9.5-r2 65
-MD5 f4342167b2ee4649dc37bf73e9b48974 files/henplus.patch 1320
+MD5 c6012560dd1cc1a5f6cd1539174379de files/henplus.patch 1329
MD5 1cf470255ef2513fa2acbb89289d3269 henplus-0.9.5-r2.ebuild 1146
MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFDh+RAndWRXhKOboURAu76AJwL7svDIQVmzbOCro+XXkYHECxmgwCg5zuW
-yjF3+s9Ema9uA1rooKi/9gI=
-=nhHU
------END PGP SIGNATURE-----
diff --git a/dev-db/henplus/files/henplus.patch b/dev-db/henplus/files/henplus.patch
index 64fbd3f48b8d..785234989191 100644
--- a/dev-db/henplus/files/henplus.patch
+++ b/dev-db/henplus/files/henplus.patch
@@ -1,7 +1,7 @@
--- bin/henplus 2004-02-02 14:53:28.000000000 +0100
+++ /usr/bin/henplus 2004-07-23 11:21:11.518166136 +0200
@@ -2,6 +2,7 @@
- # $Id: henplus.patch,v 1.3 2005/11/26 03:28:22 nichoj Exp $
+ # $Id: henplus.patch,v 1.4 2005/11/26 23:51:20 nichoj Exp $
##
+echo $(dirname $0)
@@ -39,4 +39,4 @@
-export CLASSPATH LD_LIBRARY_PATH
-
-exec $JAVA $JAVA_FLAGS henplus.HenPlus "$@"
-+LD_LIBRARY_PATH="/opt/libreadline-java/lib:$LD_LIBRARY_PATH" exec $JAVA -cp $CLASSPATH $JAVA_FLAGS henplus.HenPlus "$@"
++LD_LIBRARY_PATH="$(java-config -i libreadline-java):$LD_LIBRARY_PATH" exec $JAVA -cp $CLASSPATH $JAVA_FLAGS henplus.HenPlus "$@"