gentoo resync : 14.07.2018

4 files changed, 123 insertions, 0 deletions

diff --git a/app-misc/realpath/files/realpath-1.14-no-po4a.patch b/app-misc/realpath/files/realpath-1.14-no-po4a.patch
new file mode 100644
index 000000000000..cfa780553646
--- /dev/null
+++ b/app-misc/realpath/files/realpath-1.14-no-po4a.patch
@@ -0,0 +1,12 @@
+Don't require po4a at build time.
+http://bugs.gentoo.org/269905
+
+--- realpath-1.14-orig/po/Makefile	2009-02-22 12:56:47.000000000 +0100
++++ realpath-1.14/po/Makefile	2009-05-19 23:45:26.000000000 +0200
+@@ -4,5 +4,5 @@
+ #
+ 
+ ALL_TARGET=
+-SUBDIRS=bin man
++SUBDIRS=bin
+ include ../common.mk
diff --git a/app-misc/realpath/files/realpath-1.15-prefix.patch b/app-misc/realpath/files/realpath-1.15-prefix.patch
new file mode 100644
index 000000000000..f9534641382f
--- /dev/null
+++ b/app-misc/realpath/files/realpath-1.15-prefix.patch
@@ -0,0 +1,39 @@
+diff --git a/common.mk b/common.mk
+index 2443a40..0a342ee 100644
+--- a/common.mk
++++ b/common.mk
+@@ -8,17 +8,19 @@ override TOPDIR   := $(dir $(call getCurrentMakefileName))
+ 
+ override PACKAGE  := realpath
+ 
+-PATH            := /usr/bin:/usr/sbin:/bin:/sbin:$(PATH)
++#PATH            := /usr/bin:/usr/sbin:/bin:/sbin:$(PATH)
++
++SHELL           := @GENTOO_PORTAGE_EPREFIX@/bin/bash
+ 
+ # build abstraction
+-install_file    := install -p -o root -g root -m 644
+-install_script  := install -p -o root -g root -m 755
+-install_dir     := install -d -o root -g root -m 755
++install_file    := install -p -m 644
++install_script  := install -p -m 755
++install_dir     := install -d -m 755
+ install_link    := ln -sf
+ compress        := gzip -9f
+ 
+-prefix          := /usr
+-etcdir          := /etc/$(PACKAGE)
++prefix          := @GENTOO_PORTAGE_EPREFIX@/usr
++etcdir          := @GENTOO_PORTAGE_EPREFIX@/etc/$(PACKAGE)
+ bindir          := $(prefix)/bin
+ sbindir         := $(prefix)/sbin
+ mandir          := $(prefix)/share/man
+@@ -33,7 +35,7 @@ webdocrootdir 	:= /var/www
+ webcgidir	      := $(prefix)/lib/cgi-bin
+ applicationsdir := $(prefix)/share/applications
+ 
+-PERL            := /usr/bin/perl
++PERL            := @GENTOO_PORTAGE_EPREFIX@/usr/bin/perl
+ CC              ?= gcc
+ CFLAGS          += -Wall -Wextra -Wstrict-prototypes -Wmissing-prototypes -DVERSION='"$(VERSION)"' -DPACKAGE='"$(PACKAGE)"' -DLOCALEDIR='"$(nlsdir)"'
+ LDFLAGS         +=
diff --git a/app-misc/realpath/files/realpath-1.16-nonls.patch b/app-misc/realpath/files/realpath-1.16-nonls.patch
new file mode 100644
index 000000000000..d758d03ff89b
--- /dev/null
+++ b/app-misc/realpath/files/realpath-1.16-nonls.patch
@@ -0,0 +1,29 @@
+ src/realpath.c |    6 +-----
+ 1 files changed, 1 insertions(+), 5 deletions(-)
+
+diff --git a/src/realpath.c b/src/realpath.c
+index 76fc909..e2cf86f 100644
+--- a/src/realpath.c
++++ b/src/realpath.c
+@@ -23,10 +23,9 @@
+ #include <errno.h>
+ #include <getopt.h>
+ #include <stdarg.h>
+-#include <libintl.h>
+ #include <locale.h>
+ 
+-#define _(String) gettext (String)
++#define _(String) (String)
+ 
+ static char *stripdir(char * dir, char *buf, int maxlen);
+ 
+@@ -116,9 +115,6 @@ int main(int argc, char **argv) {
+ 
+ 	myname = ( p = strchr(argv[0], '/') ) ? p+1 : argv[0];
+ 
+-	setlocale(LC_ALL, "");
+-	bindtextdomain(PACKAGE, LOCALEDIR);
+-	textdomain(PACKAGE);
+ 
+ 
+ 	parse_options(argc, argv);
diff --git a/app-misc/realpath/files/realpath-1.17-build.patch b/app-misc/realpath/files/realpath-1.17-build.patch
new file mode 100644
index 000000000000..c4a8b3dfc9b9
--- /dev/null
+++ b/app-misc/realpath/files/realpath-1.17-build.patch
@@ -0,0 +1,43 @@
+--- a/common.mk
++++ b/common.mk
+@@ -33,16 +33,9 @@
+ applicationsdir := $(prefix)/share/applications
+ 
+ PERL            := /usr/bin/perl
+-CC              := gcc
+-CFLAGS          += $(CPPFLAGS) -Wall -Wextra -Wstrict-prototypes -Wmissing-prototypes -Werror -g -DVERSION='"$(VERSION)"' -DPACKAGE='"$(PACKAGE)"' -DLOCALEDIR='"$(nlsdir)"'
+-LIBS            := 
+-
+-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+-  CFLAGS += -O0
+-else
+-  CFLAGS += -O2
+-endif
+-
++CC              ?= gcc
++CFLAGS          += $(CPPFLAGS) -Wall -Wextra -Wstrict-prototypes -Wmissing-prototypes -DVERSION='"$(VERSION)"' -DPACKAGE='"$(PACKAGE)"' -DLOCALEDIR='"$(nlsdir)"'
++LIBS            += 
+ 
+ # determine our version number
+ ifndef VERSION
+@@ -58,9 +51,6 @@
+   unexport CDPATH ENV
+ 
+   ifdef DESTDIR
+-    ifneq ($(DESTDIR),$(abspath $(DESTDIR)))
+-      $(error DESTDIR "$(DESTDIR)" is not an absolute path)
+-    endif
+     override ddirshort  :=  DESTDIR
+     export ddirshort
+   endif
+@@ -108,7 +99,9 @@
+     esac; fi;
+   endef
+ else
+-  msg := :
++  define msg
++    :
++  endef
+ endif
+ 
+ msgprefix         := *$(subst * ,*,$(wordlist 1,$(MAKELEVEL),* * * * * * * * * * * * * * * * * *))