fixes bug #108534.

Package-Manager: portage-2.0.51.22-r3

5 files changed, 44 insertions, 16 deletions

diff --git a/dev-db/qdbm/ChangeLog b/dev-db/qdbm/ChangeLog
index 713469bfdf20..d0cfe6f8af0c 100644
--- a/dev-db/qdbm/ChangeLog
+++ b/dev-db/qdbm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-db/qdbm
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/qdbm/ChangeLog,v 1.50 2005/10/15 09:12:42 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/qdbm/ChangeLog,v 1.51 2005/10/29 11:22:45 hattya Exp $
+
+*qdbm-1.8.33-r2 (24 Oct 2005)
+
+  24 Oct 2005; Akinori Hattori <hattya@gentoo.org> files/qdbm-runpath.diff,
+  -qdbm-1.8.33-r1.ebuild, +qdbm-1.8.33-r2.ebuild:
+  fixes bug #108534.
 
   15 Oct 2005; Akinori Hattori <hattya@gentoo.org> -qdbm-1.8.24.ebuild:
   remove old ebuild.
diff --git a/dev-db/qdbm/Manifest b/dev-db/qdbm/Manifest
index bf462dbc1a6f..32b4c44ccde8 100644
--- a/dev-db/qdbm/Manifest
+++ b/dev-db/qdbm/Manifest
@@ -1,13 +1,13 @@
-MD5 fa325bf01e659bd876a9ce1fe074c723 ChangeLog 5241
+MD5 9fa6c6621d8383031c077baafe2c03d7 ChangeLog 5420
 MD5 c9f54ac0eadf3d14a44e5dc692f0df73 metadata.xml 230
 MD5 baa34b4deb9f8a225a9751b44b1f2d71 qdbm-1.8.16.ebuild 1165
 MD5 da3f7a934564aae0528dbeec95c99fe1 qdbm-1.8.17.ebuild 1200
 MD5 358c12eedbb9ecdff61f17ae3f6aca73 qdbm-1.8.30.ebuild 1202
 MD5 35939dae282498c83fdfdd9316003774 qdbm-1.8.31.ebuild 1209
-MD5 3ef9f8d542b23881de004c41b82cd633 qdbm-1.8.33-r1.ebuild 1304
+MD5 9dd44d5c0f71ed59438504f596ff0e2e qdbm-1.8.33-r2.ebuild 1304
 MD5 5e73e3df7c9ba5df4312934edf80cd9a files/digest-qdbm-1.8.16 63
 MD5 340399145118f869822d6127294a3ebb files/digest-qdbm-1.8.17 63
 MD5 171bad7087326755b76957b5ffafc318 files/digest-qdbm-1.8.30 63
 MD5 c43f02bd9ab5d91d1db4789f70d6b3cd files/digest-qdbm-1.8.31 63
-MD5 83382b2a04b7b2532ac3246aa49a982f files/digest-qdbm-1.8.33-r1 63
-MD5 24694ac3440142bafd0d9c82880c1711 files/qdbm-runpath.diff 431
+MD5 83382b2a04b7b2532ac3246aa49a982f files/digest-qdbm-1.8.33-r2 63
+MD5 481bf1a867128b4b4f9b9f1949b40d66 files/qdbm-runpath.diff 1344
diff --git a/dev-db/qdbm/files/digest-qdbm-1.8.33-r1 b/dev-db/qdbm/files/digest-qdbm-1.8.33-r2
index 3c2879405b5c..3c2879405b5c 100644
--- a/dev-db/qdbm/files/digest-qdbm-1.8.33-r1
+++ b/dev-db/qdbm/files/digest-qdbm-1.8.33-r2
diff --git a/dev-db/qdbm/files/qdbm-runpath.diff b/dev-db/qdbm/files/qdbm-runpath.diff
index 42e0168fe3a6..d67e27c23e02 100644
--- a/dev-db/qdbm/files/qdbm-runpath.diff
+++ b/dev-db/qdbm/files/qdbm-runpath.diff
@@ -1,12 +1,34 @@
-diff -urN qdbm-1.8.33.orig/perl/Makefile.in qdbm-1.8.33/perl/Makefile.in
---- qdbm-1.8.33.orig/perl/Makefile.in	2005-06-19 08:12:23.000000000 +0900
-+++ qdbm-1.8.33/perl/Makefile.in	2005-10-10 18:24:00.420000000 +0900
-@@ -30,7 +30,7 @@
- OPTIMIZE = -O2
- LD = ld
- LIBS = -L../.. -L/usr/local/lib -lqdbm @LIBS@
--RUNENV = LD_LIBRARY_PATH=.:..:../..:/usr/local/lib
-+RUNENV = LD_LIBRARY_PATH=.:..:../..:/usr/local/lib LD_RUN_PATH=""
- 
+--- perl/Makefile.in.orig	2005-10-09 16:35:47.000000000 +1000
++++ perl/Makefile.in	2005-10-09 16:41:46.000000000 +1000
+@@ -43,15 +43,15 @@
+ 	cd depot && [ -f Makefile ] || \
+ 	  $(RUNENV) perl Makefile.PL CC="$(CC)" INC="$(INC)" OPTIMIZE="$(OPTIMIZE)" \
+ 	    LD="$(LD)" LIBS="$(LIBS)" PREFIX="$(prefix)" ; \
+-	  $(RUNENV) make
++	  $(RUNENV) make LD_RUN_PATH=""
+ 	cd curia && [ -f Makefile ] || \
+ 	  $(RUNENV) perl Makefile.PL CC="$(CC)" INC="$(INC)" OPTIMIZE="$(OPTIMIZE)" \
+ 	    LD="$(LD)" LIBS="$(LIBS)" PREFIX="$(prefix)" ; \
+-	  $(RUNENV) make
++	  $(RUNENV) make LD_RUN_PATH=""
+ 	cd villa && [ -f Makefile ] || \
+ 	  $(RUNENV) perl Makefile.PL CC="$(CC)" INC="$(INC)" OPTIMIZE="$(OPTIMIZE)" \
+ 	    LD="$(LD)" LIBS="$(LIBS)" PREFIX="$(prefix)" ; \
+-	  $(RUNENV) make
++	  $(RUNENV) make LD_RUN_PATH=""
+ 	@printf '\n'
+ 	@printf '#================================================================\n'
+ 	@printf '# Ready to install.\n'
+@@ -69,9 +69,9 @@
  
  
+ install :
+-	cd depot && $(RUNENV) make install
+-	cd curia && $(RUNENV) make install
+-	cd villa && $(RUNENV) make install
++	cd depot && $(RUNENV) make LD_RUN_PATH="" install
++	cd curia && $(RUNENV) make LD_RUN_PATH="" install
++	cd villa && $(RUNENV) make LD_RUN_PATH="" install
+ 	mkdir -p $(DESTDIR)$(MYBINDIR)
+ 	cp -f $(MYBINS) $(DESTDIR)$(MYBINDIR)
+ 	mkdir -p $(DESTDIR)$(MYDATADIR)
diff --git a/dev-db/qdbm/qdbm-1.8.33-r1.ebuild b/dev-db/qdbm/qdbm-1.8.33-r2.ebuild
index ca7fb456233b..2cfa96479894 100644
--- a/dev-db/qdbm/qdbm-1.8.33-r1.ebuild
+++ b/dev-db/qdbm/qdbm-1.8.33-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/qdbm/qdbm-1.8.33-r1.ebuild,v 1.1 2005/10/15 09:06:56 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/qdbm/qdbm-1.8.33-r2.ebuild,v 1.1 2005/10/29 11:22:45 hattya Exp $
 
 inherit eutils java-pkg multilib