1 |
commit: 92286876cdcb2909101096daf5cd5b1515d89f40 |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Oct 4 23:20:20 2020 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Oct 4 23:20:20 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92286876 |
7 |
|
8 |
media-gfx/zgv: port to EAPI 7 |
9 |
|
10 |
Closes: https://bugs.gentoo.org/746023 |
11 |
Package-Manager: Portage-3.0.4, Repoman-3.0.1 |
12 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
13 |
|
14 |
media-gfx/zgv/files/zgv-5.9-Makefile-QA.patch | 5 ++-- |
15 |
media-gfx/zgv/files/zgv-5.9-cmyk-yccl-fix.diff | 4 +-- |
16 |
media-gfx/zgv/files/zgv-5.9-libpng15.patch | 4 +-- |
17 |
media-gfx/zgv/zgv-5.9.ebuild | 40 ++++++++++++++------------ |
18 |
4 files changed, 28 insertions(+), 25 deletions(-) |
19 |
|
20 |
diff --git a/media-gfx/zgv/files/zgv-5.9-Makefile-QA.patch b/media-gfx/zgv/files/zgv-5.9-Makefile-QA.patch |
21 |
index e4569547d17..6d3a1341ecb 100644 |
22 |
--- a/media-gfx/zgv/files/zgv-5.9-Makefile-QA.patch |
23 |
+++ b/media-gfx/zgv/files/zgv-5.9-Makefile-QA.patch |
24 |
@@ -1,6 +1,5 @@ |
25 |
-diff -NrU5 zgv-5.9.original/src/Makefile zgv-5.9/src/Makefile |
26 |
---- zgv-5.9.original/src/Makefile 2009-09-28 15:31:29.000000000 -0600 |
27 |
-+++ zgv-5.9/src/Makefile 2009-09-28 15:56:26.000000000 -0600 |
28 |
+--- a/src/Makefile 2009-09-28 15:31:29.000000000 -0600 |
29 |
++++ b/src/Makefile 2009-09-28 15:56:26.000000000 -0600 |
30 |
@@ -45,11 +45,11 @@ |
31 |
readbmp.o readtga.o readpng.o readpcx.o \ |
32 |
readxvpic.o readmrf.o readxbm.o readxpm.o \ |
33 |
|
34 |
diff --git a/media-gfx/zgv/files/zgv-5.9-cmyk-yccl-fix.diff b/media-gfx/zgv/files/zgv-5.9-cmyk-yccl-fix.diff |
35 |
index e510a4ba9ec..662838c57ee 100644 |
36 |
--- a/media-gfx/zgv/files/zgv-5.9-cmyk-yccl-fix.diff |
37 |
+++ b/media-gfx/zgv/files/zgv-5.9-cmyk-yccl-fix.diff |
38 |
@@ -1,5 +1,5 @@ |
39 |
---- zgv-5.9/src/readjpeg.c Sun Oct 31 14:54:26 2004 |
40 |
-+++ zgv/src/readjpeg.c Wed Sep 21 21:03:22 2005 |
41 |
+--- a/src/readjpeg.c Sun Oct 31 14:54:26 2004 |
42 |
++++ b/src/readjpeg.c Wed Sep 21 21:03:22 2005 |
43 |
@@ -92,11 +92,13 @@ |
44 |
int *real_width,int *real_height) |
45 |
{ |
46 |
|
47 |
diff --git a/media-gfx/zgv/files/zgv-5.9-libpng15.patch b/media-gfx/zgv/files/zgv-5.9-libpng15.patch |
48 |
index 2f12532831d..3d7e4ecb5df 100644 |
49 |
--- a/media-gfx/zgv/files/zgv-5.9-libpng15.patch |
50 |
+++ b/media-gfx/zgv/files/zgv-5.9-libpng15.patch |
51 |
@@ -1,7 +1,7 @@ |
52 |
http://bugs.gentoo.org/389591 |
53 |
|
54 |
---- src/readpng.c |
55 |
-+++ src/readpng.c |
56 |
+--- a/src/readpng.c |
57 |
++++ b/src/readpng.c |
58 |
@@ -63,7 +63,7 @@ |
59 |
use_errmsg=1; |
60 |
|
61 |
|
62 |
diff --git a/media-gfx/zgv/zgv-5.9.ebuild b/media-gfx/zgv/zgv-5.9.ebuild |
63 |
index c5761d43e5f..c22ba876d4a 100644 |
64 |
--- a/media-gfx/zgv/zgv-5.9.ebuild |
65 |
+++ b/media-gfx/zgv/zgv-5.9.ebuild |
66 |
@@ -1,8 +1,9 @@ |
67 |
-# Copyright 1999-2011 Gentoo Foundation |
68 |
+# Copyright 1999-2020 Gentoo Authors |
69 |
# Distributed under the terms of the GNU General Public License v2 |
70 |
|
71 |
-EAPI=4 |
72 |
-inherit eutils toolchain-funcs |
73 |
+EAPI=7 |
74 |
+ |
75 |
+inherit toolchain-funcs |
76 |
|
77 |
DESCRIPTION="A svgalib console image viewer" |
78 |
HOMEPAGE="http://www.svgalib.org/rus/zgv/" |
79 |
@@ -11,24 +12,27 @@ SRC_URI="http://www.svgalib.org/rus/zgv/${P}.tar.gz" |
80 |
LICENSE="GPL-2" |
81 |
SLOT="0" |
82 |
KEYWORDS="x86" |
83 |
-IUSE="" |
84 |
|
85 |
-RDEPEND=">=media-libs/svgalib-1.4.2 |
86 |
- virtual/jpeg |
87 |
+RDEPEND=" |
88 |
media-libs/libpng |
89 |
+ >=media-libs/svgalib-1.4.2 |
90 |
>=media-libs/tiff-3.5.5 |
91 |
+ sys-apps/gawk |
92 |
>=sys-libs/zlib-1.1.4 |
93 |
- sys-apps/gawk" |
94 |
+ virtual/jpeg |
95 |
+" |
96 |
DEPEND="${RDEPEND}" |
97 |
|
98 |
+PATCHES=( |
99 |
+ "${FILESDIR}"/${P}-Makefile-QA.patch |
100 |
+ "${FILESDIR}"/${P}-cmyk-yccl-fix.diff |
101 |
+ "${FILESDIR}"/${P}-libpng15.patch |
102 |
+) |
103 |
+ |
104 |
src_prepare() { |
105 |
sed -i -e "/^CFLAGS=/s:=.*:=${CFLAGS}:" config.mk || die |
106 |
sed -i -e 's:$(RM):echo:' doc/Makefile || die |
107 |
- |
108 |
- epatch \ |
109 |
- "${FILESDIR}"/${P}-Makefile-QA.patch \ |
110 |
- "${FILESDIR}"/${P}-cmyk-yccl-fix.diff \ |
111 |
- "${FILESDIR}"/${P}-libpng15.patch |
112 |
+ default |
113 |
} |
114 |
|
115 |
src_compile() { |
116 |
@@ -39,18 +43,18 @@ src_install() { |
117 |
dodir /usr/bin /usr/share/info /usr/share/man/man1 |
118 |
|
119 |
emake \ |
120 |
- PREFIX="${D}"/usr \ |
121 |
- INFODIR="${D}"/usr/share/info \ |
122 |
- MANDIR="${D}"/usr/share/man/man1 \ |
123 |
+ PREFIX="${ED}"/usr \ |
124 |
+ INFODIR="${ED}"/usr/share/info \ |
125 |
+ MANDIR="${ED}"/usr/share/man/man1 \ |
126 |
install |
127 |
|
128 |
dodoc AUTHORS ChangeLog INSTALL NEWS README* SECURITY TODO |
129 |
|
130 |
# Fix info files |
131 |
cd "${D}"/usr/share/info |
132 |
- rm dir* |
133 |
- mv zgv zgv.info |
134 |
+ rm dir* || die |
135 |
+ mv zgv zgv.info || die |
136 |
for i in 1 2 3 4 ; do |
137 |
- mv zgv-$i zgv.info-$i |
138 |
+ mv zgv-$i zgv.info-$i || die |
139 |
done |
140 |
} |