| 1 |
commit: f497a7ea4495d150d7cb6bd8999d35e781c915a3 |
| 2 |
Author: Justin Lecher <jlec <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Feb 22 10:58:22 2016 +0000 |
| 4 |
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Feb 22 10:58:22 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=f497a7ea |
| 7 |
|
| 8 |
app-text/dgs: Bump to EAPI=6 |
| 9 |
|
| 10 |
* Amend patches for -p1 |
| 11 |
|
| 12 |
Package-Manager: portage-2.2.27 |
| 13 |
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org> |
| 14 |
|
| 15 |
app-text/dgs/dgs-0.5.10-r2.ebuild | 12 ++++++++---- |
| 16 |
app-text/dgs/files/dgs-0.5.10-gcc-3.4.diff | 8 ++++---- |
| 17 |
app-text/dgs/files/dgs-0.5.10-gs-time_.h-gentoo.diff | 4 ++-- |
| 18 |
app-text/dgs/files/dgs-fix-as-needed.patch | 4 ++-- |
| 19 |
4 files changed, 16 insertions(+), 12 deletions(-) |
| 20 |
|
| 21 |
diff --git a/app-text/dgs/dgs-0.5.10-r2.ebuild b/app-text/dgs/dgs-0.5.10-r2.ebuild |
| 22 |
index e94540b..35de192 100644 |
| 23 |
--- a/app-text/dgs/dgs-0.5.10-r2.ebuild |
| 24 |
+++ b/app-text/dgs/dgs-0.5.10-r2.ebuild |
| 25 |
@@ -1,10 +1,10 @@ |
| 26 |
-# Copyright 1999-2014 Gentoo Foundation |
| 27 |
+# Copyright 1999-2016 Gentoo Foundation |
| 28 |
# Distributed under the terms of the GNU General Public License v2 |
| 29 |
# $Id$ |
| 30 |
|
| 31 |
# Upstream is dead. |
| 32 |
|
| 33 |
-EAPI=5 |
| 34 |
+EAPI=6 |
| 35 |
|
| 36 |
WANT_AUTOCONF="2.1" |
| 37 |
|
| 38 |
@@ -13,10 +13,12 @@ inherit autotools eutils |
| 39 |
DESCRIPTION="A Ghostscript based Display Postscript (DPS) server" |
| 40 |
HOMEPAGE="http://www.gnustep.org/developers/DGS.html" |
| 41 |
SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/old/dgs/${P}.tar.gz" |
| 42 |
+ |
| 43 |
LICENSE="GPL-2" |
| 44 |
SLOT="0" |
| 45 |
KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64 ~hppa ~mips ~ppc64 ~ia64" |
| 46 |
IUSE="tcpd" |
| 47 |
+ |
| 48 |
RDEPEND=" |
| 49 |
dev-libs/glib:1 |
| 50 |
!<x11-base/xorg-x11-7" |
| 51 |
@@ -26,15 +28,17 @@ DEPEND="${RDEPEND} |
| 52 |
|
| 53 |
DOCS=( ANNOUNCE ChangeLog FAQ NEWS NOTES README STATUS TODO Version ) |
| 54 |
|
| 55 |
-src_prepare() { |
| 56 |
- epatch \ |
| 57 |
+PATCHES=( |
| 58 |
"${FILESDIR}"/${P}-gs-time_.h-gentoo.diff \ |
| 59 |
"${FILESDIR}"/${P}-tcpd-gentoo.diff \ |
| 60 |
"${FILESDIR}"/${P}-gcc-3.4.diff \ |
| 61 |
"${FILESDIR}"/${P}-fix-table-bullet.diff \ |
| 62 |
"${FILESDIR}"/${PV}-workaround-include-in-comments.patch \ |
| 63 |
"${FILESDIR}"/${PN}-fix-as-needed.patch |
| 64 |
+) |
| 65 |
|
| 66 |
+src_prepare() { |
| 67 |
+ default |
| 68 |
eautoconf |
| 69 |
export MAKEOPTS+=" -j1" |
| 70 |
} |
| 71 |
|
| 72 |
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 |
| 73 |
index e66ab47..ec6492e 100644 |
| 74 |
--- a/app-text/dgs/files/dgs-0.5.10-gcc-3.4.diff |
| 75 |
+++ b/app-text/dgs/files/dgs-0.5.10-gcc-3.4.diff |
| 76 |
@@ -1,5 +1,5 @@ |
| 77 |
---- DPS/clients/makepsres/makepsres.c.old 2004-04-22 19:48:50.568331512 +0100 |
| 78 |
-+++ DPS/clients/makepsres/makepsres.c 2004-04-22 19:50:34.076595864 +0100 |
| 79 |
+--- a/DPS/clients/makepsres/makepsres.c.old 2004-04-22 19:48:50.568331512 +0100 |
| 80 |
++++ b/DPS/clients/makepsres/makepsres.c 2004-04-22 19:50:34.076595864 +0100 |
| 81 |
@@ -124,8 +124,6 @@ |
| 82 |
|
| 83 |
char *program; |
| 84 |
@@ -9,8 +9,8 @@ |
| 85 |
#if !defined(__NetBSD__) && !defined(__FreeBSD__) |
| 86 |
# if !defined(__GLIBC__) |
| 87 |
extern char *sys_errlist[]; |
| 88 |
---- DPS/clients/pswrap/psw.c.old 2004-04-22 19:54:13.609221832 +0100 |
| 89 |
-+++ DPS/clients/pswrap/psw.c 2004-04-22 19:54:39.149339144 +0100 |
| 90 |
+--- a/DPS/clients/pswrap/psw.c.old 2004-04-22 19:54:13.609221832 +0100 |
| 91 |
++++ b/DPS/clients/pswrap/psw.c 2004-04-22 19:54:39.149339144 +0100 |
| 92 |
@@ -1906,7 +1906,6 @@ |
| 93 |
|
| 94 |
char *psw_malloc(s) int s; { |
| 95 |
|
| 96 |
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 |
| 97 |
index d02bcf3..488eaf0 100644 |
| 98 |
--- a/app-text/dgs/files/dgs-0.5.10-gs-time_.h-gentoo.diff |
| 99 |
+++ b/app-text/dgs/files/dgs-0.5.10-gs-time_.h-gentoo.diff |
| 100 |
@@ -1,5 +1,5 @@ |
| 101 |
---- gs/time_.h~ Thu Apr 1 07:31:53 1999 |
| 102 |
-+++ gs/time_.h Wed Mar 14 17:11:12 2001 |
| 103 |
+--- a/gs/time_.h Thu Apr 1 07:31:53 1999 |
| 104 |
++++ b/gs/time_.h Wed Mar 14 17:11:12 2001 |
| 105 |
@@ -43,9 +43,7 @@ |
| 106 |
*/ |
| 107 |
#ifdef HAVE_SYS_TIME_H |
| 108 |
|
| 109 |
diff --git a/app-text/dgs/files/dgs-fix-as-needed.patch b/app-text/dgs/files/dgs-fix-as-needed.patch |
| 110 |
index 69e432c..ac13cb7 100644 |
| 111 |
--- a/app-text/dgs/files/dgs-fix-as-needed.patch |
| 112 |
+++ b/app-text/dgs/files/dgs-fix-as-needed.patch |
| 113 |
@@ -1,5 +1,5 @@ |
| 114 |
---- DPS/lib/dpstk/Makefile.in~ 2000-06-16 05:54:36.000000000 +0200 |
| 115 |
-+++ DPS/lib/dpstk/Makefile.in 2009-09-17 22:18:34.417953240 +0200 |
| 116 |
+--- a/DPS/lib/dpstk/Makefile.in~ 2000-06-16 05:54:36.000000000 +0200 |
| 117 |
++++ b/DPS/lib/dpstk/Makefile.in 2009-09-17 22:18:34.417953240 +0200 |
| 118 |
@@ -96,7 +96,7 @@ |
| 119 |
libdpstk_la_SOURCES = $(dps_sources) XDPSshare.c XDPSpreview.c XDPSuserpath.c FontSBI.h dpsXcommonI.h |
Archives