app-text/dgs: Bump to EAPI=6

* Amend patches for -p1

Package-Manager: portage-2.2.27
Signed-off-by: Justin Lecher <jlec@gentoo.org>

4 files changed, 16 insertions, 12 deletions

diff --git a/app-text/dgs/dgs-0.5.10-r2.ebuild b/app-text/dgs/dgs-0.5.10-r2.ebuild
index e94540b67..35de192d4 100644
--- a/app-text/dgs/dgs-0.5.10-r2.ebuild
+++ b/app-text/dgs/dgs-0.5.10-r2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 # Upstream is dead.
 
-EAPI=5
+EAPI=6
 
 WANT_AUTOCONF="2.1"
 
@@ -13,10 +13,12 @@ inherit autotools eutils
 DESCRIPTION="A Ghostscript based Display Postscript (DPS) server"
 HOMEPAGE="http://www.gnustep.org/developers/DGS.html"
 SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/old/dgs/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64 ~hppa ~mips ~ppc64 ~ia64"
 IUSE="tcpd"
+
 RDEPEND="
 	dev-libs/glib:1
 	!<x11-base/xorg-x11-7"
@@ -26,15 +28,17 @@ DEPEND="${RDEPEND}
 
 DOCS=( ANNOUNCE ChangeLog FAQ NEWS NOTES README STATUS TODO Version )
 
-src_prepare() {
-	epatch \
+PATCHES=(
 		"${FILESDIR}"/${P}-gs-time_.h-gentoo.diff \
 		"${FILESDIR}"/${P}-tcpd-gentoo.diff \
 		"${FILESDIR}"/${P}-gcc-3.4.diff \
 		"${FILESDIR}"/${P}-fix-table-bullet.diff \
 		"${FILESDIR}"/${PV}-workaround-include-in-comments.patch \
 		"${FILESDIR}"/${PN}-fix-as-needed.patch
+)
 
+src_prepare() {
+	default
 	eautoconf
 	export MAKEOPTS+=" -j1"
 }
diff --git a/app-text/dgs/files/dgs-0.5.10-gcc-3.4.diff b/app-text/dgs/files/dgs-0.5.10-gcc-3.4.diff
index e66ab479c..ec6492e8d 100644
--- a/app-text/dgs/files/dgs-0.5.10-gcc-3.4.diff
+++ b/app-text/dgs/files/dgs-0.5.10-gcc-3.4.diff
@@ -1,5 +1,5 @@
---- DPS/clients/makepsres/makepsres.c.old	2004-04-22 19:48:50.568331512 +0100
-+++ DPS/clients/makepsres/makepsres.c	2004-04-22 19:50:34.076595864 +0100
+--- a/DPS/clients/makepsres/makepsres.c.old	2004-04-22 19:48:50.568331512 +0100
++++ b/DPS/clients/makepsres/makepsres.c	2004-04-22 19:50:34.076595864 +0100
 @@ -124,8 +124,6 @@
  
  char *program;
@@ -9,8 +9,8 @@
  #if !defined(__NetBSD__) && !defined(__FreeBSD__)
  # if !defined(__GLIBC__)
  extern char *sys_errlist[];
---- DPS/clients/pswrap/psw.c.old	2004-04-22 19:54:13.609221832 +0100
-+++ DPS/clients/pswrap/psw.c	2004-04-22 19:54:39.149339144 +0100
+--- a/DPS/clients/pswrap/psw.c.old	2004-04-22 19:54:13.609221832 +0100
++++ b/DPS/clients/pswrap/psw.c	2004-04-22 19:54:39.149339144 +0100
 @@ -1906,7 +1906,6 @@
  
  char *psw_malloc(s) int s; {
diff --git a/app-text/dgs/files/dgs-0.5.10-gs-time_.h-gentoo.diff b/app-text/dgs/files/dgs-0.5.10-gs-time_.h-gentoo.diff
index d02bcf351..488eaf081 100644
--- a/app-text/dgs/files/dgs-0.5.10-gs-time_.h-gentoo.diff
+++ b/app-text/dgs/files/dgs-0.5.10-gs-time_.h-gentoo.diff
@@ -1,5 +1,5 @@
---- gs/time_.h~	Thu Apr  1 07:31:53 1999
-+++ gs/time_.h	Wed Mar 14 17:11:12 2001
+--- a/gs/time_.h	Thu Apr  1 07:31:53 1999
++++ b/gs/time_.h	Wed Mar 14 17:11:12 2001
 @@ -43,9 +43,7 @@
   */
  #ifdef HAVE_SYS_TIME_H
diff --git a/app-text/dgs/files/dgs-fix-as-needed.patch b/app-text/dgs/files/dgs-fix-as-needed.patch
index 69e432c3f..ac13cb716 100644
--- a/app-text/dgs/files/dgs-fix-as-needed.patch
+++ b/app-text/dgs/files/dgs-fix-as-needed.patch
@@ -1,5 +1,5 @@
---- DPS/lib/dpstk/Makefile.in~	2000-06-16 05:54:36.000000000 +0200
-+++ DPS/lib/dpstk/Makefile.in	2009-09-17 22:18:34.417953240 +0200
+--- a/DPS/lib/dpstk/Makefile.in~	2000-06-16 05:54:36.000000000 +0200
++++ b/DPS/lib/dpstk/Makefile.in	2009-09-17 22:18:34.417953240 +0200
 @@ -96,7 +96,7 @@
  libdpstk_la_SOURCES =  	$(dps_sources) 	XDPSshare.c 	XDPSpreview.c 	XDPSuserpath.c 	FontSBI.h 	dpsXcommonI.h