Updated script's patch to use java-config to get the right values for

Package-Manager: portage-2.0.53_rc7

diff --git a/dev-db/henplus/ChangeLog b/dev-db/henplus/ChangeLog
index 22af4d1018200e84f5d9a52a724ed25c6df2e6ae..faf842137dc5be4ee363557509e4e886922bf68f 100644 (file)
--- 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 bf81ced00522d745be3bd383baf7d5fabab30eac..655fdbd0889253814ad89a32a0f2e67fa562b165 100644 (file)
--- a/dev-db/henplus/Manifest
+++ b/dev-db/henplus/Manifest
@@ -1,15 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 f0554cadd0c2b13ce94d339d830cd3d2 ChangeLog 1144
+MD5 7bd4e9cf2027a9c48c3232ce43e56e61 ChangeLog 1307
 MD5 cde5d89f324a87299196a42dfffaf617 files/digest-henplus-0.9.5-r2 65
-MD5 f4342167b2ee4649dc37bf73e9b48974 files/henplus.patch 1320
+MD5 9dd8009f86e55c8154dcc8d97e35bc74 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
+iD8DBQFDiQPMndWRXhKOboURAlgVAJ9Xg4ZAlRygZ+yXWktoevUogEntSgCfdrfe
+Sc8ohs5Sa1DUtFnJw8SQV4w=
+=UH1C
 -----END PGP SIGNATURE-----

diff --git a/dev-db/henplus/files/henplus.patch b/dev-db/henplus/files/henplus.patch
index 64fbd3f48b8dfd8136a0d4bdace83fe6bb69f5c8..78523498919158467147f39a51e80b35d5918e4e 100644 (file)
--- 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 "$@"