gentoo resync : 02.04.2018

9 files changed, 70 insertions, 40 deletions

diff --git a/www-client/w3mmee/files/w3mmee-0.3.2_p24-boehm-gc.patch b/www-client/w3mmee/files/w3mmee-boehm-gc.patch
index 81e6a6dea0f3..d9bafa069046 100644
--- a/www-client/w3mmee/files/w3mmee-0.3.2_p24-boehm-gc.patch
+++ b/www-client/w3mmee/files/w3mmee-boehm-gc.patch
@@ -1,5 +1,3 @@
-diff --git a/configure b/configure
-index 32afb35..3be66fd 100755
 --- a/configure
 +++ b/configure
 @@ -1503,7 +1503,7 @@ if [ -n "$gclib" -a -n "$gcinclude" ]; then
diff --git a/www-client/w3mmee/files/w3mmee-gcc44.patch b/www-client/w3mmee/files/w3mmee-gcc-4.4.patch
index 092adb5ba40c..e724244ab869 100644
--- a/www-client/w3mmee/files/w3mmee-gcc44.patch
+++ b/www-client/w3mmee/files/w3mmee-gcc-4.4.patch
@@ -1,6 +1,5 @@
-diff -ur w3mmee-p24-22.orig/indep.c w3mmee-p24-22/indep.c
---- w3mmee-p24-22.orig/indep.c	2002-11-27 16:35:37.000000000 +0200
-+++ w3mmee-p24-22/indep.c	2009-07-25 23:06:52.000000000 +0300
+--- a/indep.c
++++ b/indep.c
 @@ -14,7 +14,7 @@
  {
  #ifdef HAVE_STRTOLL
diff --git a/www-client/w3mmee/files/w3mmee-gcc45.patch b/www-client/w3mmee/files/w3mmee-gcc-4.5.patch
index db6f86e4deee..3e7d1aa0cc0d 100644
--- a/www-client/w3mmee/files/w3mmee-gcc45.patch
+++ b/www-client/w3mmee/files/w3mmee-gcc-4.5.patch
@@ -1,11 +1,9 @@
-Fixing build with gcc-4.5
+https://bugs.gentoo.org/317815
 
-https://bugs.gentoo.org/show_bug.cgi?id=317815
+Author: Kacper Kowalik <xarthisius.kk@gmail.com>
 
-Patch written by Kacper Kowalik <xarthisius.kk@gmail.com>
-
---- configure
-+++ configure
+--- a/configure
++++ b/configure
 @@ -2636,7 +2636,7 @@
  fi
  
diff --git a/www-client/w3mmee/files/w3mmee-0.3.2_p24-glibc214.patch b/www-client/w3mmee/files/w3mmee-glibc-2.14.patch
index dc9be94732c6..7a2b0d9cb39e 100644
--- a/www-client/w3mmee/files/w3mmee-0.3.2_p24-glibc214.patch
+++ b/www-client/w3mmee/files/w3mmee-glibc-2.14.patch
@@ -1,5 +1,3 @@
-diff --git a/istream.c b/istream.c
-index de5fbd3..6718b41 100644
 --- a/istream.c
 +++ b/istream.c
 @@ -132,7 +132,7 @@ newFileStream(FILE *f, void (*closep)())
@@ -11,8 +9,6 @@ index de5fbd3..6718b41 100644
    stream->handle.file->f = f;
  
    if (closep)
-diff --git a/istream.h b/istream.h
-index 168882f..3e7132f 100644
 --- a/istream.h
 +++ b/istream.h
 @@ -20,7 +20,7 @@ struct stream_buffer {
diff --git a/www-client/w3mmee/files/w3mmee-rc_name.patch b/www-client/w3mmee/files/w3mmee-rc_name.patch
new file mode 100644
index 000000000000..a16a7b9cf2c9
--- /dev/null
+++ b/www-client/w3mmee/files/w3mmee-rc_name.patch
@@ -0,0 +1,11 @@
+--- a/rc_name.mk_btri.h
++++ b/rc_name.mk_btri.h
+@@ -2,7 +2,7 @@
+ 
+ #define STRING_LITERAL(x) # x
+ #undef def_rcsect_begin
+-#define def_rcsect_begin(n) STRING_LITERAL(* ## n), &sections[secti_ ## n]
++#define def_rcsect_begin(n) STRING_LITERAL(*n), &sections[secti_ ## n]
+ 
+ #undef def_rcsect_end
+ #define def_rcsect_end(n)
diff --git a/www-client/w3mmee/files/w3mmee-time.patch b/www-client/w3mmee/files/w3mmee-time.patch
new file mode 100644
index 000000000000..c63d6542c326
--- /dev/null
+++ b/www-client/w3mmee/files/w3mmee-time.patch
@@ -0,0 +1,32 @@
+https://bugs.gentoo.org/586258
+
+Author: kouyu <ckyoog@gmail.com>
+
+--- a/terms.c
++++ b/terms.c
+@@ -305,11 +305,7 @@
+ 		     struct timeval *tout)
+ {
+     static struct timeval polltv = {
+-#if CLOCKS_PER_SEC > 1
+-	0, 1000000 / CLOCKS_PER_SEC
+-#else
+-	0, 10000
+-#endif
++	0, CLOCKS_PER_SEC > 1 ? 1000000 / CLOCKS_PER_SEC : 10000
+     };
+     int m;
+     struct timeval tv;
+@@ -779,11 +775,7 @@
+ #endif
+ 
+ static struct timeval display_delta = {
+-#if CLOCKS_PER_SEC > 1
+-    0, 1000000 / CLOCKS_PER_SEC,
+-#else
+-    0, 10000
+-#endif
++    0, CLOCKS_PER_SEC > 1 ? 1000000 / CLOCKS_PER_SEC : 10000
+ };
+ 
+ static int
diff --git a/www-client/w3mmee/files/w3mmee-0.3.2_p24-tinfo.patch b/www-client/w3mmee/files/w3mmee-tinfo.patch
index 603e30bb4038..c29f43ada30d 100644
--- a/www-client/w3mmee/files/w3mmee-0.3.2_p24-tinfo.patch
+++ b/www-client/w3mmee/files/w3mmee-tinfo.patch
@@ -1,5 +1,3 @@
-diff --git a/configure b/configure
-index 73e247b..32afb35 100755
 --- a/configure
 +++ b/configure
 @@ -1354,7 +1354,7 @@ main()
diff --git a/www-client/w3mmee/files/w3mmee-w3mman-gentoo.diff b/www-client/w3mmee/files/w3mmee-w3mman-gentoo.diff
deleted file mode 100644
index 967e679f02b2..000000000000
--- a/www-client/w3mmee/files/w3mmee-w3mman-gentoo.diff
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -urN w3mmee-p24-19.ORIG/scripts/w3mman/w3mman.in w3mmee-p24-19/scripts/w3mman/w3mman.in
---- w3mmee-p24-19.ORIG/scripts/w3mman/w3mman.in	2002-03-17 14:07:08.000000000 +0900
-+++ w3mmee-p24-19/scripts/w3mman/w3mman.in	2003-12-06 20:49:15.000000000 +0900
-@@ -1,7 +1,7 @@
- #!@PERL@
- 
- @W3M = split(' ', '@W3M@');
--$ENV{'MAN'} = '@MAN@';
-+$ENV{'MAN'} = 'env LC_MESSAGES=${LC_MESSAGES:-${LC_ALL:-${LANG}}} LANG=C @MAN@';
- $SCRIPT = 'file:///$LIB/w3mman2html.cgi';
- 
- sub usage {
-diff -urN w3mmee-p24-19.ORIG/scripts/w3mman/w3mman2html.cgi.in w3mmee-p24-19/scripts/w3mman/w3mman2html.cgi.in
---- w3mmee-p24-19.ORIG/scripts/w3mman/w3mman2html.cgi.in	2002-03-17 14:07:08.000000000 +0900
-+++ w3mmee-p24-19/scripts/w3mman/w3mman2html.cgi.in	2003-12-06 20:49:53.000000000 +0900
-@@ -1,6 +1,6 @@
- #!@PERL@
- 
--$MAN = $ENV{'MAN'} || '@MAN@';
-+$MAN = $ENV{'MAN'} || 'env LC_MESSAGES=${LC_MESSAGES:-${LC_ALL:-${LANG}}} LANG=C @MAN@';
- $QUERY = $ENV{'QUERY_STRING'} || $ARGV[0];
- $SCRIPT_NAME = $ENV{'SCRIPT_NAME'} || $0;
- $CGI = "file://$SCRIPT_NAME";
diff --git a/www-client/w3mmee/files/w3mmee-w3mman.patch b/www-client/w3mmee/files/w3mmee-w3mman.patch
new file mode 100644
index 000000000000..dd669191e763
--- /dev/null
+++ b/www-client/w3mmee/files/w3mmee-w3mman.patch
@@ -0,0 +1,21 @@
+--- a/scripts/w3mman/w3mman.in
++++ b/scripts/w3mman/w3mman.in
+@@ -1,7 +1,7 @@
+ #!@PERL@
+ 
+ @W3M = split(' ', '@W3M@');
+-$ENV{'MAN'} = '@MAN@';
++$ENV{'MAN'} = 'env LC_MESSAGES=${LC_MESSAGES:-${LC_ALL:-${LANG}}} LANG=C @MAN@';
+ $SCRIPT = 'file:///$LIB/w3mman2html.cgi';
+ 
+ sub usage {
+--- a/scripts/w3mman/w3mman2html.cgi.in
++++ b/scripts/w3mman/w3mman2html.cgi.in
+@@ -1,6 +1,6 @@
+ #!@PERL@
+ 
+-$MAN = $ENV{'MAN'} || '@MAN@';
++$MAN = $ENV{'MAN'} || 'env LC_MESSAGES=${LC_MESSAGES:-${LC_ALL:-${LANG}}} LANG=C @MAN@';
+ $QUERY = $ENV{'QUERY_STRING'} || $ARGV[0];
+ $SCRIPT_NAME = $ENV{'SCRIPT_NAME'} || $0;
+ $CGI = "file://$SCRIPT_NAME";