app-text/epstool: 3.09 version bump, EAPI-7 bump

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

2 files changed, 58 insertions, 0 deletions

diff --git a/app-text/epstool/files/epstool-3.09-no-gcc-linker.patch b/app-text/epstool/files/epstool-3.09-no-gcc-linker.patch
new file mode 100644
index 000000000000..cf3e03dfa609
--- /dev/null
+++ b/app-text/epstool/files/epstool-3.09-no-gcc-linker.patch
@@ -0,0 +1,27 @@
+From cbd73f2bb7dd3a55d0d35b0638e84b8f17e56b52 Mon Sep 17 00:00:00 2001
+From: Helmut Grohne <helmut@subdivi.de>
+Date: Fri, 14 Sep 2018 18:17:39 +0200
+Subject: [PATCH] Make epstool cross buildable by not hardcoding gcc as linker
+
+---
+ src/unixcom.mak | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/unixcom.mak b/src/unixcom.mak
+index 1063b65..ca0b031 100755
+--- a/src/unixcom.mak
++++ b/src/unixcom.mak
+@@ -22,8 +22,8 @@ GSCFLAGS= $(CDEFS) -Wall -Wstrict-prototypes -Wmissing-declarations -Wmissing-pr
+ CCAUX=gcc

+ CC=gcc

+ LFLAGS=$(PLINK) $(LIBPNGLIBS) $(GTKLIBS)

+-CLINK=gcc $(LDFLAGS)

+-LINK=gcc $(LDFLAGS)

++CLINK=$(CC) $(LDFLAGS)

++LINK=$(CC) $(LDFLAGS)

+ 

+ 

+ COMP=$(CC) -I$(SRCDIR) -I$(OBJDIR) $(CFLAGS) $(GSCFLAGS)

+-- 
+2.29.2
+
diff --git a/app-text/epstool/files/epstool-3.09-no-use-gnu.patch b/app-text/epstool/files/epstool-3.09-no-use-gnu.patch
new file mode 100644
index 000000000000..cb42381138e2
--- /dev/null
+++ b/app-text/epstool/files/epstool-3.09-no-use-gnu.patch
@@ -0,0 +1,31 @@
+From 706546a4921b98834ebf241ea751e0db5d0d192f Mon Sep 17 00:00:00 2001
+From: Adrian Bunk <bunk@debian.org>
+Date: Fri, 14 Sep 2018 18:17:39 +0200
+Subject: [PATCH] src/cplat.h: Don't define __USE_GNU
+
+There were two things wrong with it:
+- __USE_GNU is glibc-internal, the external define is _GNU_SOURCE
+- defining such macros after the first include is wrong, in this case
+it caused FTBFS on ia64.
+
+An option would be to pass -D_GNU_SOURCE when building, but as far
+as I can see the define was not (anymore?) needed at all.
+---
+ src/cplat.h | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/src/cplat.h b/src/cplat.h
+index 8bbd9c5..ad5cee4 100755
+--- a/src/cplat.h
++++ b/src/cplat.h
+@@ -109,7 +109,6 @@ typedef struct POINT_s {
+ typedef struct _GdkRgbCmap GdkRgbCmap;

+ # endif

+ # include <unistd.h>

+-# define __USE_GNU	/* we might need recursive mutex */

+ # include <semaphore.h>

+ # include <pthread.h>

+ # define ZLIBNAME "libz.so"

+-- 
+2.29.2
+