From 6482af8f1a61259cb69118c71c1860cb1488be2d Mon Sep 17 00:00:00 2001 From: Akinori Hattori Date: Thu, 30 Mar 2017 23:10:42 +0900 Subject: dev-db/qdbm: rename patches Package-Manager: Portage-2.3.3, Repoman-2.3.1 --- dev-db/qdbm/files/qdbm-perl-runpath-vendor.diff | 22 -- dev-db/qdbm/files/qdbm-perl.patch | 22 ++ dev-db/qdbm/files/qdbm-ruby19.diff | 363 ------------------------ dev-db/qdbm/files/qdbm-ruby19.patch | 363 ++++++++++++++++++++++++ dev-db/qdbm/files/qdbm-runpath.diff | 36 --- dev-db/qdbm/files/qdbm-runpath.patch | 36 +++ dev-db/qdbm/qdbm-1.8.78-r1.ebuild | 8 +- 7 files changed, 425 insertions(+), 425 deletions(-) delete mode 100644 dev-db/qdbm/files/qdbm-perl-runpath-vendor.diff create mode 100644 dev-db/qdbm/files/qdbm-perl.patch delete mode 100644 dev-db/qdbm/files/qdbm-ruby19.diff create mode 100644 dev-db/qdbm/files/qdbm-ruby19.patch delete mode 100644 dev-db/qdbm/files/qdbm-runpath.diff create mode 100644 dev-db/qdbm/files/qdbm-runpath.patch (limited to 'dev-db/qdbm') diff --git a/dev-db/qdbm/files/qdbm-perl-runpath-vendor.diff b/dev-db/qdbm/files/qdbm-perl-runpath-vendor.diff deleted file mode 100644 index d46f9b3f236e..000000000000 --- a/dev-db/qdbm/files/qdbm-perl-runpath-vendor.diff +++ /dev/null @@ -1,22 +0,0 @@ -diff -ur qdbm-1.8.62.orig/perl/Makefile.in qdbm-1.8.62/perl/Makefile.in ---- qdbm-1.8.62.orig/perl/Makefile.in -+++ qdbm-1.8.62/perl/Makefile.in -@@ -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-perl.patch b/dev-db/qdbm/files/qdbm-perl.patch new file mode 100644 index 000000000000..d46f9b3f236e --- /dev/null +++ b/dev-db/qdbm/files/qdbm-perl.patch @@ -0,0 +1,22 @@ +diff -ur qdbm-1.8.62.orig/perl/Makefile.in qdbm-1.8.62/perl/Makefile.in +--- qdbm-1.8.62.orig/perl/Makefile.in ++++ qdbm-1.8.62/perl/Makefile.in +@@ -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.diff b/dev-db/qdbm/files/qdbm-ruby19.diff deleted file mode 100644 index 51c2800e74d7..000000000000 --- a/dev-db/qdbm/files/qdbm-ruby19.diff +++ /dev/null @@ -1,363 +0,0 @@ ---- qdbm-1.8.78.orig/ruby/Makefile.in -+++ qdbm-1.8.78/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' ---- qdbm-1.8.78.orig/ruby/curia/mod_curia.c -+++ qdbm-1.8.78/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); ---- qdbm-1.8.78.orig/ruby/curia/rbcrtest -+++ qdbm-1.8.78/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()) - - -Only in qdbm-1.8.78/ruby/depot: mkmf.log ---- qdbm-1.8.78.orig/ruby/depot/mod_depot.c -+++ qdbm-1.8.78/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); ---- qdbm-1.8.78.orig/ruby/depot/rbdptest -+++ qdbm-1.8.78/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()) - - ---- qdbm-1.8.78.orig/ruby/myrbdoc -+++ qdbm-1.8.78/ruby/myrbdoc -@@ -186,7 +186,7 @@ - - - # execute main --#$0.gsub!(/.*\//, "") -+#$0 = $0.gsub(/.*\//, "") - exit(main()) - - ---- qdbm-1.8.78.orig/ruby/villa/mod_villa.c -+++ qdbm-1.8.78/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]; ---- qdbm-1.8.78.orig/ruby/villa/rbvltest -+++ qdbm-1.8.78/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-ruby19.patch b/dev-db/qdbm/files/qdbm-ruby19.patch new file mode 100644 index 000000000000..51c2800e74d7 --- /dev/null +++ b/dev-db/qdbm/files/qdbm-ruby19.patch @@ -0,0 +1,363 @@ +--- qdbm-1.8.78.orig/ruby/Makefile.in ++++ qdbm-1.8.78/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' +--- qdbm-1.8.78.orig/ruby/curia/mod_curia.c ++++ qdbm-1.8.78/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); +--- qdbm-1.8.78.orig/ruby/curia/rbcrtest ++++ qdbm-1.8.78/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()) + + +Only in qdbm-1.8.78/ruby/depot: mkmf.log +--- qdbm-1.8.78.orig/ruby/depot/mod_depot.c ++++ qdbm-1.8.78/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); +--- qdbm-1.8.78.orig/ruby/depot/rbdptest ++++ qdbm-1.8.78/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()) + + +--- qdbm-1.8.78.orig/ruby/myrbdoc ++++ qdbm-1.8.78/ruby/myrbdoc +@@ -186,7 +186,7 @@ + + + # execute main +-#$0.gsub!(/.*\//, "") ++#$0 = $0.gsub(/.*\//, "") + exit(main()) + + +--- qdbm-1.8.78.orig/ruby/villa/mod_villa.c ++++ qdbm-1.8.78/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]; +--- qdbm-1.8.78.orig/ruby/villa/rbvltest ++++ qdbm-1.8.78/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.diff b/dev-db/qdbm/files/qdbm-runpath.diff deleted file mode 100644 index 4fc1a1f70291..000000000000 --- a/dev-db/qdbm/files/qdbm-runpath.diff +++ /dev/null @@ -1,36 +0,0 @@ -diff -ur qdbm-1.8.77.orig/Makefile.in qdbm-1.8.77/Makefile.in ---- qdbm-1.8.77.orig/Makefile.in -+++ qdbm-1.8.77/Makefile.in -@@ -61,7 +61,7 @@ - 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 -+LDENV = - AR = @AR@ - ARFLAGS = rcsv - RUNENV = LD_LIBRARY_PATH=.:/lib:/usr/lib:$(MYLIBDIR):$(HOME)/lib:/usr/local/lib -diff -urN qdbm-1.8.77.orig/cgi/Makefile.in qdbm-1.8.77/cgi/Makefile.in ---- qdbm-1.8.77.orig/cgi/Makefile.in 2006-08-24 11:55:12.000000000 +0900 -+++ qdbm-1.8.77/cgi/Makefile.in 2007-12-15 22:02:43.804668256 +0900 -@@ -28,7 +28,7 @@ - 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 -+LDENV = - - # Install destinations - prefix = @prefix@ -diff -urN qdbm-1.8.77.orig/plus/Makefile.in qdbm-1.8.77/plus/Makefile.in ---- qdbm-1.8.77.orig/plus/Makefile.in 2007-03-07 11:44:27.000000000 +0900 -+++ qdbm-1.8.77/plus/Makefile.in 2007-12-15 22:02:32.976636806 +0900 -@@ -51,7 +51,7 @@ - -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 -+LDENV = - AR = @AR@ - ARFLAGS = rcsv - RUNENV = LD_LIBRARY_PATH=.:..:/lib:/usr/lib:$(MYLIBDIR):$(HOME)/lib:/usr/local/lib diff --git a/dev-db/qdbm/files/qdbm-runpath.patch b/dev-db/qdbm/files/qdbm-runpath.patch new file mode 100644 index 000000000000..4fc1a1f70291 --- /dev/null +++ b/dev-db/qdbm/files/qdbm-runpath.patch @@ -0,0 +1,36 @@ +diff -ur qdbm-1.8.77.orig/Makefile.in qdbm-1.8.77/Makefile.in +--- qdbm-1.8.77.orig/Makefile.in ++++ qdbm-1.8.77/Makefile.in +@@ -61,7 +61,7 @@ + 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 ++LDENV = + AR = @AR@ + ARFLAGS = rcsv + RUNENV = LD_LIBRARY_PATH=.:/lib:/usr/lib:$(MYLIBDIR):$(HOME)/lib:/usr/local/lib +diff -urN qdbm-1.8.77.orig/cgi/Makefile.in qdbm-1.8.77/cgi/Makefile.in +--- qdbm-1.8.77.orig/cgi/Makefile.in 2006-08-24 11:55:12.000000000 +0900 ++++ qdbm-1.8.77/cgi/Makefile.in 2007-12-15 22:02:43.804668256 +0900 +@@ -28,7 +28,7 @@ + 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 ++LDENV = + + # Install destinations + prefix = @prefix@ +diff -urN qdbm-1.8.77.orig/plus/Makefile.in qdbm-1.8.77/plus/Makefile.in +--- qdbm-1.8.77.orig/plus/Makefile.in 2007-03-07 11:44:27.000000000 +0900 ++++ qdbm-1.8.77/plus/Makefile.in 2007-12-15 22:02:32.976636806 +0900 +@@ -51,7 +51,7 @@ + -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 ++LDENV = + AR = @AR@ + ARFLAGS = rcsv + RUNENV = LD_LIBRARY_PATH=.:..:/lib:/usr/lib:$(MYLIBDIR):$(HOME)/lib:/usr/local/lib diff --git a/dev-db/qdbm/qdbm-1.8.78-r1.ebuild b/dev-db/qdbm/qdbm-1.8.78-r1.ebuild index 4936df932ca4..b50def2b3ea0 100644 --- a/dev-db/qdbm/qdbm-1.8.78-r1.ebuild +++ b/dev-db/qdbm/qdbm-1.8.78-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI="5" @@ -22,9 +22,9 @@ DEPEND="${RDEPEND} java? ( >=virtual/jdk-1.4 )" src_prepare() { - epatch "${FILESDIR}"/${PN}-runpath.diff - epatch "${FILESDIR}"/${PN}-perl-runpath-vendor.diff - epatch "${FILESDIR}"/${PN}-ruby19.diff + epatch "${FILESDIR}"/${PN}-runpath.patch + epatch "${FILESDIR}"/${PN}-perl.patch + epatch "${FILESDIR}"/${PN}-ruby19.patch # apply flags sed -i "/^CFLAGS/s|$| ${CFLAGS}|" Makefile.in sed -i "/^OPTIMIZE/s|$| ${CFLAGS}|" perl/Makefile.in -- cgit v1.2.3-65-gdbad