gentoo resync : 14.07.2018

4 files changed, 545 insertions, 0 deletions

diff --git a/dev-db/qdbm/files/qdbm-configure.patch b/dev-db/qdbm/files/qdbm-configure.patch
new file mode 100644
index 000000000000..364c5c9f653e
--- /dev/null
+++ b/dev-db/qdbm/files/qdbm-configure.patch
@@ -0,0 +1,108 @@
+--- a/cgi/configure.in
++++ b/cgi/configure.in
+@@ -13,15 +13,6 @@
+ # Export variables
+ TARGETS="all"
+ 
+-# Building paths
+-pathtmp="$PATH"
+-PATH="$HOME/bin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin"
+-PATH="$PATH:/usr/ccs/bin:/usr/ucb:/usr/xpg4/bin:/usr/xpg6/bin:$pathtmp"
+-LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LIBRARY_PATH"
+-LD_LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LD_LIBRARY_PATH"
+-CPATH="$HOME/include:/usr/local/include:$CPATH"
+-export PATH LIBRARY_PATH LD_LIBRARY_PATH CPATH
+-
+ 
+ 
+ #================================================================
+--- a/configure.in
++++ b/configure.in
+@@ -20,15 +20,6 @@
+ LD="ld"
+ AR="ar"
+ 
+-# Building paths
+-pathtmp="$PATH"
+-PATH="$HOME/bin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin"
+-PATH="$PATH:/usr/ccs/bin:/usr/ucb:/usr/xpg4/bin:/usr/xpg6/bin:$pathtmp"
+-LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LIBRARY_PATH"
+-LD_LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LD_LIBRARY_PATH"
+-CPATH="$HOME/include:/usr/local/include:$CPATH"
+-export PATH LIBRARY_PATH LD_LIBRARY_PATH CPATH
+-
+ 
+ 
+ #================================================================
+--- a/java/configure.in
++++ b/java/configure.in
+@@ -25,15 +25,6 @@
+ MYOPTS=""
+ LD="ld"
+ 
+-# Building paths
+-pathtmp="$PATH"
+-PATH="$HOME/bin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin"
+-PATH="$PATH:/usr/ccs/bin:/usr/ucb:/usr/xpg4/bin:/usr/xpg6/bin:$pathtmp"
+-LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LIBRARY_PATH"
+-LD_LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LD_LIBRARY_PATH"
+-CPATH="$HOME/include:/usr/local/include:$CPATH"
+-export PATH LIBRARY_PATH LD_LIBRARY_PATH CPATH
+-
+ 
+ 
+ #================================================================
+--- a/perl/configure.in
++++ b/perl/configure.in
+@@ -5,15 +5,6 @@
+ # Targets
+ AC_INIT(qdbm-perl, 1.0.0)
+ 
+-# Building paths
+-pathtmp="$PATH"
+-PATH="$HOME/bin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin"
+-PATH="$PATH:/usr/ccs/bin:/usr/ucb:/usr/xpg4/bin:/usr/xpg6/bin:$pathtmp"
+-LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LIBRARY_PATH"
+-LD_LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LD_LIBRARY_PATH"
+-CPATH="$HOME/include:/usr/local/include:$CPATH"
+-export PATH LIBRARY_PATH LD_LIBRARY_PATH CPATH
+-
+ # Setting the default prefix
+ if test "$prefix" = NONE
+ then
+--- a/plus/configure.in
++++ b/plus/configure.in
+@@ -19,15 +19,6 @@
+ LD="ld"
+ AR="ar"
+ 
+-# Building paths
+-pathtmp="$PATH"
+-PATH="$HOME/bin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin"
+-PATH="$PATH:/usr/ccs/bin:/usr/ucb:/usr/xpg4/bin:/usr/xpg6/bin:$pathtmp"
+-LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LIBRARY_PATH"
+-LD_LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LD_LIBRARY_PATH"
+-CPATH="$HOME/include:/usr/local/include:$CPATH"
+-export PATH LIBRARY_PATH LD_LIBRARY_PATH CPATH
+-
+ 
+ 
+ #================================================================
+--- a/ruby/configure.in
++++ b/ruby/configure.in
+@@ -5,15 +5,6 @@
+ # Targets
+ AC_INIT(qdbm-ruby, 1.0.0)
+ 
+-# Building paths
+-pathtmp="$PATH"
+-PATH="$HOME/bin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin"
+-PATH="$PATH:/usr/ccs/bin:/usr/ucb:/usr/xpg4/bin:/usr/xpg6/bin:$pathtmp"
+-LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LIBRARY_PATH"
+-LD_LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LD_LIBRARY_PATH"
+-CPATH="$HOME/include:/usr/local/include:$CPATH"
+-export PATH LIBRARY_PATH LD_LIBRARY_PATH CPATH
+-
+ # Setting the default prefix
+ if test "$prefix" = NONE
+ then
diff --git a/dev-db/qdbm/files/qdbm-perl.patch b/dev-db/qdbm/files/qdbm-perl.patch
new file mode 100644
index 000000000000..1a7ca6a70dcd
--- /dev/null
+++ b/dev-db/qdbm/files/qdbm-perl.patch
@@ -0,0 +1,34 @@
+--- a/perl/Makefile.in
++++ b/perl/Makefile.in
+@@ -25,10 +25,10 @@
+ DESTDIR =
+ 
+ # Building binaries
+-CC = gcc
++CC = @CC@
+ INC = -I. -I../.. -I$(HOME)/include -I/usr/local/include
+ OPTIMIZE = -O2
+-LD = gcc
++LD = @CC@
+ LIBS = -L../.. -I$(HOME)/lib -L/usr/local/lib -lqdbm @LIBS@
+ RUNENV = LD_LIBRARY_PATH=.:..:../..:/usr/local/lib:$(HOME)/lib
+ 
+@@ -42,15 +42,15 @@
+ all :
+ 	cd depot && [ -f Makefile ] || \
+ 	  $(RUNENV) perl Makefile.PL CC="$(CC)" INC="$(INC)" OPTIMIZE="$(OPTIMIZE)" \
+-	    LD="$(LD)" LIBS="$(LIBS)" PREFIX="$(prefix)" ; \
++	    LD="$(LD)" LIBS="$(LIBS)" PREFIX="$(prefix)" INSTALLDIRS="vendor" ; \
+ 	  $(RUNENV) make
+ 	cd curia && [ -f Makefile ] || \
+ 	  $(RUNENV) perl Makefile.PL CC="$(CC)" INC="$(INC)" OPTIMIZE="$(OPTIMIZE)" \
+-	    LD="$(LD)" LIBS="$(LIBS)" PREFIX="$(prefix)" ; \
++	    LD="$(LD)" LIBS="$(LIBS)" PREFIX="$(prefix)" INSTALLDIRS="vendor" ; \
+ 	  $(RUNENV) make
+ 	cd villa && [ -f Makefile ] || \
+ 	  $(RUNENV) perl Makefile.PL CC="$(CC)" INC="$(INC)" OPTIMIZE="$(OPTIMIZE)" \
+-	    LD="$(LD)" LIBS="$(LIBS)" PREFIX="$(prefix)" ; \
++	    LD="$(LD)" LIBS="$(LIBS)" PREFIX="$(prefix)" INSTALLDIRS="vendor" ; \
+ 	  $(RUNENV) make
+ 	@printf '\n'
+ 	@printf '#================================================================\n'
diff --git a/dev-db/qdbm/files/qdbm-ruby19.patch b/dev-db/qdbm/files/qdbm-ruby19.patch
new file mode 100644
index 000000000000..8724e7cdc4ed
--- /dev/null
+++ b/dev-db/qdbm/files/qdbm-ruby19.patch
@@ -0,0 +1,373 @@
+--- a/ruby/Makefile.in
++++ b/ruby/Makefile.in
+@@ -85,27 +85,27 @@
+ 	sync ; sync
+ 	cd depot && rm -rf casket
+ 	cd depot && \
+-	  $(RUNENV) ruby -w -Ilib rbdptest write casket 10000 1000
++	  $(RUNENV) ruby -w -Ilib -I. rbdptest write casket 10000 1000
+ 	cd depot && \
+-	  $(RUNENV) ruby -w -Ilib rbdptest read casket
++	  $(RUNENV) ruby -w -Ilib -I. rbdptest read casket
+ 	cd depot && \
+-	  $(RUNENV) ruby -w -Ilib rbdptest misc casket
++	  $(RUNENV) ruby -w -Ilib -I. rbdptest misc casket
+ 	cd depot && rm -rf casket
+ 	cd curia && rm -rf casket
+ 	cd curia && \
+-	  $(RUNENV) ruby -w -Ilib rbcrtest write casket 10000 1000 10
++	  $(RUNENV) ruby -w -Ilib -I. rbcrtest write casket 10000 1000 10
+ 	cd curia && \
+-	  $(RUNENV) ruby -w -Ilib rbcrtest read casket
++	  $(RUNENV) ruby -w -Ilib -I. rbcrtest read casket
+ 	cd curia && \
+-	  $(RUNENV) ruby -w -Ilib rbcrtest misc casket
++	  $(RUNENV) ruby -w -Ilib -I. rbcrtest misc casket
+ 	cd curia && rm -rf casket
+ 	cd villa && rm -rf casket
+ 	cd villa && \
+-	  $(RUNENV) ruby -w -Ilib rbvltest write casket 10000
++	  $(RUNENV) ruby -w -Ilib -I. rbvltest write casket 10000
+ 	cd villa && \
+-	  $(RUNENV) ruby -w -Ilib rbvltest read casket
++	  $(RUNENV) ruby -w -Ilib -I. rbvltest read casket
+ 	cd villa && \
+-	  $(RUNENV) ruby -w -Ilib rbvltest misc casket
++	  $(RUNENV) ruby -w -Ilib -I. rbvltest misc casket
+ 	cd villa && rm -rf casket
+ 	@printf '\n'
+ 	@printf '#================================================================\n'
+--- a/ruby/configure.in
++++ b/ruby/configure.in
+@@ -17,7 +17,7 @@
+ # Setting the default prefix
+ if test "$prefix" = NONE
+ then
+-  prefix=`ruby -rrbconfig -e 'puts(Config::CONFIG.fetch("prefix"))'`
++  prefix=`ruby -rrbconfig -e 'puts(RbConfig::CONFIG.fetch("prefix"))'`
+ fi
+ 
+ # Duplication of QDBM for Ruby
+--- a/ruby/curia/mod_curia.c
++++ b/ruby/curia/mod_curia.c
+@@ -24,6 +24,13 @@
+ 
+ #define MAXOPEN 1024
+ 
++#ifndef StringValuePtr
++# define StringValuePtr(v) STR2CSTR(v)
++#endif
++#ifndef RSTRING_LEN
++# define RSTRING_LEN(s) (RSTRING(s)->len)
++#endif
++
+ 
+ VALUE ccuriaerror;
+ VALUE ccuriaerror_ENOERR;
+@@ -233,7 +240,7 @@
+   const char *name;
+   int index, omode, bnum, dnum;
+   if((index = getnewindex()) == -1) myerror(DP_EMISC);
+-  name = STR2CSTR(vname);
++  name = StringValuePtr(vname);
+   FIXNUM_P(vomode);
+   omode = FIX2INT(vomode);
+   FIXNUM_P(vbnum);
+@@ -276,10 +283,10 @@
+   int index, ksiz, vsiz, dmode;
+   FIXNUM_P(vindex);
+   if((index = FIX2INT(vindex)) == -1) myerror(DP_EMISC);
+-  kbuf = STR2CSTR(vkey);
+-  ksiz = RSTRING(vkey)->len;
+-  vbuf = STR2CSTR(vval);
+-  vsiz = RSTRING(vval)->len;
++  kbuf = StringValuePtr(vkey);
++  ksiz = RSTRING_LEN(vkey);
++  vbuf = StringValuePtr(vval);
++  vsiz = RSTRING_LEN(vval);
+   FIXNUM_P(vdmode);
+   dmode = FIX2INT(vdmode);
+   curia = crtable[index];
+@@ -297,8 +304,8 @@
+   int index, ksiz;
+   FIXNUM_P(vindex);
+   if((index = FIX2INT(vindex)) == -1) myerror(DP_EMISC);
+-  kbuf = STR2CSTR(vkey);
+-  ksiz = RSTRING(vkey)->len;
++  kbuf = StringValuePtr(vkey);
++  ksiz = RSTRING_LEN(vkey);
+   curia = crtable[index];
+   if(!crout(curia, kbuf, ksiz)){
+     if(crsltable[index] && dpecode == DP_ENOITEM) return Qfalse;
+@@ -316,8 +323,8 @@
+   VALUE vval;
+   FIXNUM_P(vindex);
+   if((index = FIX2INT(vindex)) == -1) myerror(DP_EMISC);
+-  kbuf = STR2CSTR(vkey);
+-  ksiz = RSTRING(vkey)->len;
++  kbuf = StringValuePtr(vkey);
++  ksiz = RSTRING_LEN(vkey);
+   FIXNUM_P(vstart);
+   start = FIX2INT(vstart);
+   FIXNUM_P(vmax);
+@@ -339,8 +346,8 @@
+   int index, ksiz, vsiz;
+   FIXNUM_P(vindex);
+   if((index = FIX2INT(vindex)) == -1) myerror(DP_EMISC);
+-  kbuf = STR2CSTR(vkey);
+-  ksiz = RSTRING(vkey)->len;
++  kbuf = StringValuePtr(vkey);
++  ksiz = RSTRING_LEN(vkey);
+   curia = crtable[index];
+   if((vsiz = crvsiz(curia, kbuf, ksiz)) == -1){
+     if(crsltable[index] && dpecode == DP_ENOITEM) return INT2FIX(-1);
+--- a/ruby/curia/rbcrtest
++++ b/ruby/curia/rbcrtest
+@@ -21,7 +21,7 @@
+ 
+ # main routine
+ def main()
+-  $0.gsub!(/.*\//, "")
++  $0 = $0.gsub(/.*\//, "")
+   (ARGV.length >= 1) || usage()
+   if(ARGV[0] == "write")
+     rv = runwrite()
+@@ -283,7 +283,7 @@
+ 
+ 
+ # execute main
+-$0.gsub!(/.*\//, "")
++$0 = $0.gsub(/.*\//, "")
+ exit(main())
+ 
+ 
+--- a/ruby/depot/mod_depot.c
++++ b/ruby/depot/mod_depot.c
+@@ -23,6 +23,13 @@
+ 
+ #define MAXOPEN 1024
+ 
++#ifndef StringValuePtr
++# define StringValuePtr(v) STR2CSTR(v)
++#endif
++#ifndef RSTRING_LEN
++# define RSTRING_LEN(s) (RSTRING(s)->len)
++#endif
++
+ 
+ VALUE cdepoterror;
+ VALUE cdepoterror_ENOERR;
+@@ -232,7 +239,7 @@
+   const char *name;
+   int index, omode, bnum;
+   if((index = getnewindex()) == -1) myerror(DP_EMISC);
+-  name = STR2CSTR(vname);
++  name = StringValuePtr(vname);
+   FIXNUM_P(vomode);
+   omode = FIX2INT(vomode);
+   FIXNUM_P(vbnum);
+@@ -273,10 +280,10 @@
+   int index, ksiz, vsiz, dmode;
+   FIXNUM_P(vindex);
+   if((index = FIX2INT(vindex)) == -1) myerror(DP_EMISC);
+-  kbuf = STR2CSTR(vkey);
+-  ksiz = RSTRING(vkey)->len;
+-  vbuf = STR2CSTR(vval);
+-  vsiz = RSTRING(vval)->len;
++  kbuf = StringValuePtr(vkey);
++  ksiz = RSTRING_LEN(vkey);
++  vbuf = StringValuePtr(vval);
++  vsiz = RSTRING_LEN(vval);
+   FIXNUM_P(vdmode);
+   dmode = FIX2INT(vdmode);
+   depot = dptable[index];
+@@ -294,8 +301,8 @@
+   int index, ksiz;
+   FIXNUM_P(vindex);
+   if((index = FIX2INT(vindex)) == -1) myerror(DP_EMISC);
+-  kbuf = STR2CSTR(vkey);
+-  ksiz = RSTRING(vkey)->len;
++  kbuf = StringValuePtr(vkey);
++  ksiz = RSTRING_LEN(vkey);
+   depot = dptable[index];
+   if(!dpout(depot, kbuf, ksiz)){
+     if(dpsltable[index] && dpecode == DP_ENOITEM) return Qfalse;
+@@ -313,8 +320,8 @@
+   VALUE vval;
+   FIXNUM_P(vindex);
+   if((index = FIX2INT(vindex)) == -1) myerror(DP_EMISC);
+-  kbuf = STR2CSTR(vkey);
+-  ksiz = RSTRING(vkey)->len;
++  kbuf = StringValuePtr(vkey);
++  ksiz = RSTRING_LEN(vkey);
+   FIXNUM_P(vstart);
+   start = FIX2INT(vstart);
+   FIXNUM_P(vmax);
+@@ -336,8 +343,8 @@
+   int index, ksiz, vsiz;
+   FIXNUM_P(vindex);
+   if((index = FIX2INT(vindex)) == -1) myerror(DP_EMISC);
+-  kbuf = STR2CSTR(vkey);
+-  ksiz = RSTRING(vkey)->len;
++  kbuf = StringValuePtr(vkey);
++  ksiz = RSTRING_LEN(vkey);
+   depot = dptable[index];
+   if((vsiz = dpvsiz(depot, kbuf, ksiz)) == -1){
+     if(dpsltable[index] && dpecode == DP_ENOITEM) return INT2FIX(-1);
+--- a/ruby/depot/rbdptest
++++ b/ruby/depot/rbdptest
+@@ -21,7 +21,7 @@
+ 
+ # main routine
+ def main()
+-  $0.gsub!(/.*\//, "")
++  $0 = $0.gsub(/.*\//, "")
+   (ARGV.length >= 1) || usage()
+   if(ARGV[0] == "write")
+     rv = runwrite()
+@@ -278,7 +278,7 @@
+ 
+ 
+ # execute main
+-$0.gsub!(/.*\//, "")
++$0 = $0.gsub(/.*\//, "")
+ exit(main())
+ 
+ 
+--- a/ruby/myrbdoc
++++ b/ruby/myrbdoc
+@@ -186,7 +186,7 @@
+ 
+ 
+ # execute main
+-#$0.gsub!(/.*\//, "")
++#$0 = $0.gsub(/.*\//, "")
+ exit(main())
+ 
+ 
+--- a/ruby/villa/mod_villa.c
++++ b/ruby/villa/mod_villa.c
+@@ -25,6 +25,13 @@
+ 
+ #define MAXOPEN 1024
+ 
++#ifndef StringValuePtr
++# define StringValuePtr(v) STR2CSTR(v)
++#endif
++#ifndef RSTRING_LEN
++# define RSTRING_LEN(s) (RSTRING(s)->len)
++#endif
++
+ 
+ VALUE cvillaerror;
+ VALUE cvillaerror_ENOERR;
+@@ -304,7 +311,7 @@
+   int index, omode, cmode;
+   VLCFUNC cmp;
+   if((index = getnewindex()) == -1) myerror(DP_EMISC);
+-  name = STR2CSTR(vname);
++  name = StringValuePtr(vname);
+   FIXNUM_P(vomode);
+   omode = FIX2INT(vomode);
+   FIXNUM_P(vcmode);
+@@ -352,10 +359,10 @@
+   int index, ksiz, vsiz, dmode;
+   FIXNUM_P(vindex);
+   if((index = FIX2INT(vindex)) == -1) myerror(DP_EMISC);
+-  kbuf = STR2CSTR(vkey);
+-  ksiz = RSTRING(vkey)->len;
+-  vbuf = STR2CSTR(vval);
+-  vsiz = RSTRING(vval)->len;
++  kbuf = StringValuePtr(vkey);
++  ksiz = RSTRING_LEN(vkey);
++  vbuf = StringValuePtr(vval);
++  vsiz = RSTRING_LEN(vval);
+   FIXNUM_P(vdmode);
+   dmode = FIX2INT(vdmode);
+   villa = vltable[index];
+@@ -373,8 +380,8 @@
+   int index, ksiz;
+   FIXNUM_P(vindex);
+   if((index = FIX2INT(vindex)) == -1) myerror(DP_EMISC);
+-  kbuf = STR2CSTR(vkey);
+-  ksiz = RSTRING(vkey)->len;
++  kbuf = StringValuePtr(vkey);
++  ksiz = RSTRING_LEN(vkey);
+   villa = vltable[index];
+   if(!vlout(villa, kbuf, ksiz)){
+     if(vlsltable[index] && dpecode == DP_ENOITEM) return Qfalse;
+@@ -391,8 +398,8 @@
+   VALUE vval;
+   FIXNUM_P(vindex);
+   if((index = FIX2INT(vindex)) == -1) myerror(DP_EMISC);
+-  kbuf = STR2CSTR(vkey);
+-  ksiz = RSTRING(vkey)->len;
++  kbuf = StringValuePtr(vkey);
++  ksiz = RSTRING_LEN(vkey);
+   villa = vltable[index];
+   if(!(vbuf = vlget(villa, kbuf, ksiz, &vsiz))){
+     if(vlsltable[index] && dpecode == DP_ENOITEM) return Qnil;
+@@ -409,8 +416,8 @@
+   int index, ksiz, vsiz;
+   FIXNUM_P(vindex);
+   if((index = FIX2INT(vindex)) == -1) myerror(DP_EMISC);
+-  kbuf = STR2CSTR(vkey);
+-  ksiz = RSTRING(vkey)->len;
++  kbuf = StringValuePtr(vkey);
++  ksiz = RSTRING_LEN(vkey);
+   villa = vltable[index];
+   if((vsiz = vlvsiz(villa, kbuf, ksiz)) == -1){
+     if(vlsltable[index] && dpecode == DP_ENOITEM) return INT2FIX(-1);
+@@ -426,8 +433,8 @@
+   int index, ksiz, vnum;
+   FIXNUM_P(vindex);
+   if((index = FIX2INT(vindex)) == -1) myerror(DP_EMISC);
+-  kbuf = STR2CSTR(vkey);
+-  ksiz = RSTRING(vkey)->len;
++  kbuf = StringValuePtr(vkey);
++  ksiz = RSTRING_LEN(vkey);
+   villa = vltable[index];
+   vnum = vlvnum(villa, kbuf, ksiz);
+   return INT2FIX(vnum);
+@@ -497,8 +504,8 @@
+   VALUE vval;
+   FIXNUM_P(vindex);
+   if((index = FIX2INT(vindex)) == -1) myerror(DP_EMISC);
+-  kbuf = STR2CSTR(vkey);
+-  ksiz = RSTRING(vkey)->len;
++  kbuf = StringValuePtr(vkey);
++  ksiz = RSTRING_LEN(vkey);
+   FIXNUM_P(vjmode);
+   jmode = FIX2INT(vjmode);
+   villa = vltable[index];
+@@ -551,8 +558,8 @@
+   int index, vsiz, cpmode;
+   FIXNUM_P(vindex);
+   if((index = FIX2INT(vindex)) == -1) myerror(DP_EMISC);
+-  vbuf = STR2CSTR(vval);
+-  vsiz = RSTRING(vval)->len;
++  vbuf = StringValuePtr(vval);
++  vsiz = RSTRING_LEN(vval);
+   FIXNUM_P(vcpmode);
+   cpmode = FIX2INT(vcpmode);
+   villa = vltable[index];
+--- a/ruby/villa/rbvltest
++++ b/ruby/villa/rbvltest
+@@ -21,7 +21,7 @@
+ 
+ # main routine
+ def main()
+-  $0.gsub!(/.*\//, "")
++  $0 = $0.gsub(/.*\//, "")
+   (ARGV.length >= 1) || usage()
+   if(ARGV[0] == "write")
+     rv = runwrite()
+@@ -280,7 +280,7 @@
+ 
+ 
+ # execute main
+-$0.gsub!(/.*\//, "")
++$0 = $0.gsub(/.*\//, "")
+ exit(main())
+ 
+ 
diff --git a/dev-db/qdbm/files/qdbm-runpath.patch b/dev-db/qdbm/files/qdbm-runpath.patch
new file mode 100644
index 000000000000..56d85a5b14a5
--- /dev/null
+++ b/dev-db/qdbm/files/qdbm-runpath.patch
@@ -0,0 +1,30 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -61,7 +61,6 @@
+ LIBS = -lqdbm @LIBS@
+ LIBLDFLAGS = @LDFLAGS@ -L. -L$(MYLIBDIR) -L$(HOME)/lib -L/usr/local/lib @LIBS@
+ LDFLAGS = @LDFLAGS@ -L. -L$(MYLIBDIR) -L$(HOME)/lib -L/usr/local/lib $(LIBS)
+-LDENV = LD_RUN_PATH=/lib:/usr/lib:$(MYLIBDIR):$(HOME)/lib:/usr/local/lib
+ AR = @AR@
+ ARFLAGS = rcsv
+ RUNENV = LD_LIBRARY_PATH=.:/lib:/usr/lib:$(MYLIBDIR):$(HOME)/lib:/usr/local/lib
+--- a/cgi/Makefile.in
++++ b/cgi/Makefile.in
+@@ -28,7 +28,6 @@
+ CFLAGS = -Wall -ansi -pedantic -fsigned-char -O2
+ LIBS = -lqdbm @LIBS@
+ LDFLAGS = -L$(srcdir)/.. -L$(HOME)/lib -L/usr/local/lib $(LIBS)
+-LDENV = LD_RUN_PATH=/lib:/usr/lib:$(HOME)/lib:/usr/local/lib:$(prefix)/lib
+ 
+ # Install destinations
+ prefix = @prefix@
+--- a/plus/Makefile.in
++++ b/plus/Makefile.in
+@@ -51,7 +51,6 @@
+   -L$(HOME)/lib -L/usr/local/lib $(LIBS)
+ LDFLAGS = @LDFLAGS@ -L. -L$(srcdir)/.. -L$(MYLIBDIR) \
+   -L$(HOME)/lib -L/usr/local/lib -lxqdbm $(LIBS)
+-LDENV = LD_RUN_PATH=/lib:/usr/lib:$(MYLIBDIR):$(HOME)/lib:/usr/local/lib
+ AR = @AR@
+ ARFLAGS = rcsv
+ RUNENV = LD_LIBRARY_PATH=.:..:/lib:/usr/lib:$(MYLIBDIR):$(HOME)/lib:/usr/local/lib