Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: Mikle Kolyada <zlogene@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-tex/luatex/files/, dev-tex/luatex/
Date: Mon, 04 Nov 2019 17:16:32
Message-Id: 1572887782.6efe7ddfffde2e80eaa19100afe6ca17689d4586.zlogene@gentoo
1 commit: 6efe7ddfffde2e80eaa19100afe6ca17689d4586
2 Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
3 AuthorDate: Mon Nov 4 17:15:18 2019 +0000
4 Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
5 CommitDate: Mon Nov 4 17:16:22 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6efe7ddf
7
8 dev-tex/luatex: port to EAPI=7
9
10 Package-Manager: Portage-2.3.76, Repoman-2.3.16
11 Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
12
13 dev-tex/luatex/files/poppler018.patch | 4 +-
14 dev-tex/luatex/files/poppler022.patch | 4 +-
15 dev-tex/luatex/files/poppler026-backport.patch | 8 ++--
16 dev-tex/luatex/files/poppler026.patch | 8 ++--
17 .../luatex/files/remove-zlib-version-check.patch | 4 +-
18 ...ex-0.70.1-r2.ebuild => luatex-0.70.1-r3.ebuild} | 49 ++++++++++++----------
19 ...uatex-0.76.0.ebuild => luatex-0.76.0-r1.ebuild} | 29 +++++++------
20 7 files changed, 56 insertions(+), 50 deletions(-)
21
22 diff --git a/dev-tex/luatex/files/poppler018.patch b/dev-tex/luatex/files/poppler018.patch
23 index d21253853db..0fd55a29671 100644
24 --- a/dev-tex/luatex/files/poppler018.patch
25 +++ b/dev-tex/luatex/files/poppler018.patch
26 @@ -2,8 +2,8 @@ by Martin von Gagern
27 https://bugs.gentoo.org/show_bug.cgi?id=384875
28 http://thread.gmane.org/gmane.comp.tex.luatex/2630
29
30 ---- luatex-beta-0.70.1/source/texk/web2c/luatexdir/lua/lepdflib.cc
31 -+++ luatex-beta-0.70.1/source/texk/web2c/luatexdir/lua/lepdflib.cc
32 +--- a/texk/web2c/luatexdir/lua/lepdflib.cc
33 ++++ b/texk/web2c/luatexdir/lua/lepdflib.cc
34 @@ -89,7 +89,6 @@ new_poppler_userdata(AnnotBorder);
35 new_poppler_userdata(Annots);
36 new_poppler_userdata(Array);
37
38 diff --git a/dev-tex/luatex/files/poppler022.patch b/dev-tex/luatex/files/poppler022.patch
39 index 223cbcb2745..75d07b75189 100644
40 --- a/dev-tex/luatex/files/poppler022.patch
41 +++ b/dev-tex/luatex/files/poppler022.patch
42 @@ -5,8 +5,8 @@ poppler-0.18.patch and poppler-0.20.patch. Here to solve bug 449538.
43
44 diff -ruN luatex-beta-0.70.1.gentoo/source/texk/web2c/luatexdir/lua/lepdflib.cc
45 luatex-beta-0.70.1/source/texk/web2c/luatexdir/lua/lepdflib.cc
46 ---- luatex-beta-0.70.1.gentoo/source/texk/web2c/luatexdir/lua/lepdflib.cc 2013-03-10 13:31:22.000000000 +0100
47 -+++ luatex-beta-0.70.1/source/texk/web2c/luatexdir/lua/lepdflib.cc 2013-03-10 13:47:24.000000000 +0100
48 +--- a/texk/web2c/luatexdir/lua/lepdflib.cc 2013-03-10 13:31:22.000000000 +0100
49 ++++ b/texk/web2c/luatexdir/lua/lepdflib.cc 2013-03-10 13:47:24.000000000 +0100
50 @@ -1,7 +1,7 @@
51 /* lepdflib.cc
52
53
54 diff --git a/dev-tex/luatex/files/poppler026-backport.patch b/dev-tex/luatex/files/poppler026-backport.patch
55 index ee151a30b47..a32d3e96120 100644
56 --- a/dev-tex/luatex/files/poppler026-backport.patch
57 +++ b/dev-tex/luatex/files/poppler026-backport.patch
58 @@ -1,6 +1,6 @@
59 diff -ruN luatex-beta-0.70.1.patched.orig/source/texk/web2c/luatexdir/image/epdf.h luatex-beta-0.70.1.patched/source/texk/web2c/luatexdir/image/epdf.h
60 ---- luatex-beta-0.70.1.patched.orig/source/texk/web2c/luatexdir/image/epdf.h 2011-05-19 07:38:37.000000000 +0200
61 -+++ luatex-beta-0.70.1.patched/source/texk/web2c/luatexdir/image/epdf.h 2014-10-11 12:17:00.028331243 +0200
62 +--- a/texk/web2c/luatexdir/image/epdf.h 2011-05-19 07:38:37.000000000 +0200
63 ++++ b/texk/web2c/luatexdir/image/epdf.h 2014-10-11 12:17:00.028331243 +0200
64 @@ -33,6 +33,7 @@
65 # include <sys/stat.h>
66 # include <dirent.h>
67 @@ -10,8 +10,8 @@ diff -ruN luatex-beta-0.70.1.patched.orig/source/texk/web2c/luatexdir/image/epdf
68 # include <goo/gmem.h>
69 # include <goo/gfile.h>
70 diff -ruN luatex-beta-0.70.1.patched.orig/source/texk/web2c/luatexdir/lua/lepdflib.cc luatex-beta-0.70.1.patched/source/texk/web2c/luatexdir/lua/lepdflib.cc
71 ---- luatex-beta-0.70.1.patched.orig/source/texk/web2c/luatexdir/lua/lepdflib.cc 2014-10-11 12:24:52.509357663 +0200
72 -+++ luatex-beta-0.70.1.patched/source/texk/web2c/luatexdir/lua/lepdflib.cc 2014-10-11 12:42:03.665415321 +0200
73 +--- a/texk/web2c/luatexdir/lua/lepdflib.cc 2014-10-11 12:24:52.509357663 +0200
74 ++++ b/texk/web2c/luatexdir/lua/lepdflib.cc 2014-10-11 12:42:03.665415321 +0200
75 @@ -48,23 +48,24 @@
76
77 //**********************************************************************
78
79 diff --git a/dev-tex/luatex/files/poppler026.patch b/dev-tex/luatex/files/poppler026.patch
80 index f7b5ba35b48..c09ff05e109 100644
81 --- a/dev-tex/luatex/files/poppler026.patch
82 +++ b/dev-tex/luatex/files/poppler026.patch
83 @@ -4,8 +4,8 @@ http://cvsweb.de.netbsd.org/cgi-bin/cvsweb.cgi/pkgsrc/print/luatex/patches/
84
85
86 diff -ruN luatex-beta-0.76.0.orig/source/texk/web2c/luatexdir/image/epdf.h luatex-beta-0.76.0/source/texk/web2c/luatexdir/image/epdf.h
87 ---- luatex-beta-0.76.0.orig/source/texk/web2c/luatexdir/image/epdf.h 2013-04-05 12:58:37.000000000 +0200
88 -+++ luatex-beta-0.76.0/source/texk/web2c/luatexdir/image/epdf.h 2014-05-01 01:39:39.838462783 +0200
89 +--- a/texk/web2c/luatexdir/image/epdf.h 2013-04-05 12:58:37.000000000 +0200
90 ++++ b/texk/web2c/luatexdir/image/epdf.h 2014-05-01 01:39:39.838462783 +0200
91 @@ -37,6 +37,7 @@
92 # include <sys/stat.h>
93 # include <dirent.h>
94 @@ -15,8 +15,8 @@ diff -ruN luatex-beta-0.76.0.orig/source/texk/web2c/luatexdir/image/epdf.h luate
95 # include <goo/gmem.h>
96 # include <goo/gfile.h>
97 diff -ruN luatex-beta-0.76.0.orig/source/texk/web2c/luatexdir/lua/lepdflib.cc luatex-beta-0.76.0/source/texk/web2c/luatexdir/lua/lepdflib.cc
98 ---- luatex-beta-0.76.0.orig/source/texk/web2c/luatexdir/lua/lepdflib.cc 2013-04-05 12:58:37.000000000 +0200
99 -+++ luatex-beta-0.76.0/source/texk/web2c/luatexdir/lua/lepdflib.cc 2014-05-01 01:40:15.698461067 +0200
100 +--- a/texk/web2c/luatexdir/lua/lepdflib.cc 2013-04-05 12:58:37.000000000 +0200
101 ++++ b/texk/web2c/luatexdir/lua/lepdflib.cc 2014-05-01 01:40:15.698461067 +0200
102 @@ -48,25 +48,26 @@
103
104 //**********************************************************************
105
106 diff --git a/dev-tex/luatex/files/remove-zlib-version-check.patch b/dev-tex/luatex/files/remove-zlib-version-check.patch
107 index 98508501251..f3f21a595a0 100644
108 --- a/dev-tex/luatex/files/remove-zlib-version-check.patch
109 +++ b/dev-tex/luatex/files/remove-zlib-version-check.patch
110 @@ -4,8 +4,8 @@ needless rebuilds after every zlib update. By Ulrich Müller.
111 https://bugs.gentoo.org/show_bug.cgi?id=310487
112 http://www.ntg.nl/pipermail/dev-luatex/2012-July/004534.html
113
114 ---- luatex-beta-0.70.1-orig/source/texk/web2c/luatexdir/luazlib/lzlib.c
115 -+++ luatex-beta-0.70.1/source/texk/web2c/luatexdir/luazlib/lzlib.c
116 +--- a/texk/web2c/luatexdir/luazlib/lzlib.c
117 ++++ b/texk/web2c/luatexdir/luazlib/lzlib.c
118 @@ -549,14 +549,6 @@
119
120 /* ====================================================================== */
121
122 diff --git a/dev-tex/luatex/luatex-0.70.1-r2.ebuild b/dev-tex/luatex/luatex-0.70.1-r3.ebuild
123 similarity index 75%
124 rename from dev-tex/luatex/luatex-0.70.1-r2.ebuild
125 rename to dev-tex/luatex/luatex-0.70.1-r3.ebuild
126 index 18bf55c9d0b..b06166bb98e 100644
127 --- a/dev-tex/luatex/luatex-0.70.1-r2.ebuild
128 +++ b/dev-tex/luatex/luatex-0.70.1-r3.ebuild
129 @@ -1,9 +1,9 @@
130 -# Copyright 1999-2017 Gentoo Foundation
131 +# Copyright 1999-2019 Gentoo Authors
132 # Distributed under the terms of the GNU General Public License v2
133
134 -EAPI=5
135 +EAPI=7
136
137 -inherit libtool eutils flag-o-matic texlive-common
138 +inherit flag-o-matic libtool texlive-common
139
140 DESCRIPTION="An extended version of pdfTeX using Lua as an embedded scripting language"
141 HOMEPAGE="http://www.luatex.org/"
142 @@ -18,10 +18,12 @@ IUSE="doc"
143 RDEPEND="dev-libs/zziplib
144 >=media-libs/libpng-1.4
145 app-text/poppler:=[xpdf-headers(+)]
146 - sys-libs/zlib
147 + sys-libs/zlib:*
148 >=dev-libs/kpathsea-6.0.1_p20110627"
149 -DEPEND="${RDEPEND}
150 - virtual/pkgconfig"
151 +
152 +DEPEND="${RDEPEND}"
153 +
154 +BDEPEND="virtual/pkgconfig"
155
156 S="${WORKDIR}/${PN}-beta-${PV}/source"
157 PRELIBS="libs/obsdcompat"
158 @@ -29,12 +31,13 @@ PRELIBS="libs/obsdcompat"
159 #kpathsea_extraconf="--disable-shared --disable-largefile"
160
161 src_prepare() {
162 - has_version '>=app-text/poppler-0.18.0:0' && epatch "${FILESDIR}/poppler018.patch"
163 - has_version '>=app-text/poppler-0.20.0:0' && epatch "${FILESDIR}/poppler020.patch"
164 - has_version '>=app-text/poppler-0.22.0:0' && epatch "${FILESDIR}/poppler022.patch"
165 - has_version '>=app-text/poppler-0.26.0:0' && epatch "${FILESDIR}/poppler026-backport.patch"
166 + default
167 + has_version '>=app-text/poppler-0.18.0:0' && eapply "${FILESDIR}/poppler018.patch"
168 + has_version '>=app-text/poppler-0.20.0:0' && eapply "${FILESDIR}/poppler020.patch"
169 + has_version '>=app-text/poppler-0.22.0:0' && eapply "${FILESDIR}/poppler022.patch"
170 + has_version '>=app-text/poppler-0.26.0:0' && eapply "${FILESDIR}/poppler026-backport.patch"
171 has_version '>=app-text/poppler-0.57.0:0' && append-cxxflags -std=c++11 # bug 627538
172 - epatch "${FILESDIR}/kpathsea2012.patch" \
173 + eapply "${FILESDIR}/kpathsea2012.patch" \
174 "${FILESDIR}/remove-zlib-version-check.patch"
175 S="${S}/build-aux" elibtoolize --shallow
176 }
177 @@ -49,7 +52,7 @@ src_configure() {
178 myconf=""
179 #has_version '>=app-text/texlive-core-2009' && myconf="--with-system-kpathsea"
180
181 - cd "${S}/texk/web2c"
182 + cd "${S}/texk/web2c" || die
183 econf \
184 --disable-cxx-runtime-hack \
185 --disable-all-pkgs \
186 @@ -81,7 +84,7 @@ src_configure() {
187 local j=$(basename $i)_extraconf
188 local myconf
189 eval myconf=\${$j}
190 - cd "${S}/${i}"
191 + cd "${S}/${i}" || die
192 econf ${myconf}
193 done
194 }
195 @@ -89,23 +92,23 @@ src_configure() {
196 src_compile() {
197 texk/web2c/luatexdir/getluatexsvnversion.sh || die
198 for i in ${PRELIBS} ; do
199 - cd "${S}/${i}"
200 - emake || die "failed to build ${i}"
201 + cd "${S}/${i}" || die
202 + emake
203 done
204 - cd "${WORKDIR}/${PN}-beta-${PV}/source/texk/web2c"
205 - emake luatex || die "failed to build luatex"
206 + cd "${WORKDIR}/${PN}-beta-${PV}/source/texk/web2c" || die
207 + emake luatex
208 }
209
210 src_install() {
211 - cd "${WORKDIR}/${PN}-beta-${PV}/source/texk/web2c"
212 + cd "${WORKDIR}/${PN}-beta-${PV}/source/texk/web2c" || die
213 emake DESTDIR="${D}" bin_PROGRAMS="luatex" SUBDIRS="" nodist_man_MANS="" \
214 - install-exec-am || die
215 + install-exec-am
216
217 - dodoc "${WORKDIR}/${PN}-beta-${PV}/README" || die
218 - doman "${WORKDIR}/texmf/doc/man/man1/"*.1 || die
219 + dodoc "${WORKDIR}/${PN}-beta-${PV}/README"
220 + doman "${WORKDIR}/texmf/doc/man/man1/"*.1
221 if use doc ; then
222 - dodoc "${WORKDIR}/${PN}-beta-${PV}/manual/"*.pdf || die
223 - dodoc "${WORKDIR}/texmf/doc/man/man1/"*.pdf || die
224 + dodoc "${WORKDIR}/${PN}-beta-${PV}/manual/"*.pdf
225 + dodoc "${WORKDIR}/texmf/doc/man/man1/"*.pdf
226 fi
227 }
228
229
230 diff --git a/dev-tex/luatex/luatex-0.76.0.ebuild b/dev-tex/luatex/luatex-0.76.0-r1.ebuild
231 similarity index 84%
232 rename from dev-tex/luatex/luatex-0.76.0.ebuild
233 rename to dev-tex/luatex/luatex-0.76.0-r1.ebuild
234 index 3b6d960b74c..cb38d3df2de 100644
235 --- a/dev-tex/luatex/luatex-0.76.0.ebuild
236 +++ b/dev-tex/luatex/luatex-0.76.0-r1.ebuild
237 @@ -1,9 +1,9 @@
238 -# Copyright 1999-2017 Gentoo Foundation
239 +# Copyright 1999-2019 Gentoo Authors
240 # Distributed under the terms of the GNU General Public License v2
241
242 -EAPI=5
243 +EAPI=7
244
245 -inherit libtool eutils flag-o-matic texlive-common
246 +inherit libtool flag-o-matic texlive-common
247
248 MY_P=${PN}-beta-${PV}
249 DESCRIPTION="An extended version of pdfTeX using Lua as an embedded scripting language"
250 @@ -22,17 +22,20 @@ RDEPEND="dev-libs/zziplib
251 >=x11-libs/cairo-1.12
252 >x11-libs/pixman-0.18
253 app-text/poppler:=[xpdf-headers(+)]
254 - sys-libs/zlib
255 + sys-libs/zlib:*
256 >=dev-libs/kpathsea-6.1.0_p20120701"
257 -DEPEND="${RDEPEND}
258 - virtual/pkgconfig"
259 +
260 +DEPEND="${RDEPEND}"
261 +
262 +BDEPEND="virtual/pkgconfig"
263
264 S="${WORKDIR}/${MY_P}/source"
265
266 src_prepare() {
267 - has_version '>=app-text/poppler-0.26.0:0' && epatch "${FILESDIR}/poppler026.patch"
268 + default
269 + has_version '>=app-text/poppler-0.26.0:0' && eapply "${FILESDIR}/poppler026.patch"
270 has_version '>=app-text/poppler-0.57.0:0' && append-cxxflags -std=c++11 # bug 627538
271 - epatch "${FILESDIR}/remove-zlib-version-check.patch" \
272 + eapply "${FILESDIR}/remove-zlib-version-check.patch" \
273 "${FILESDIR}/includes.patch"
274 S="${S}/build-aux" elibtoolize --shallow
275 }
276 @@ -43,7 +46,7 @@ src_configure() {
277 # So we set LC_ALL to C in order to avoid problems.
278 export LC_ALL=C
279
280 - cd "${S}/texk/web2c"
281 + cd "${S}/texk/web2c" || die
282 econf \
283 --disable-cxx-runtime-hack \
284 --disable-all-pkgs \
285 @@ -76,18 +79,18 @@ src_configure() {
286
287 src_compile() {
288 texk/web2c/luatexdir/getluatexsvnversion.sh || die
289 - cd "${WORKDIR}/${MY_P}/source/texk/web2c"
290 + cd "${WORKDIR}/${MY_P}/source/texk/web2c" || die
291 emake luatex
292 }
293
294 src_install() {
295 - cd "${WORKDIR}/${MY_P}/source/texk/web2c"
296 + cd "${WORKDIR}/${MY_P}/source/texk/web2c" || die
297 emake DESTDIR="${D}" bin_PROGRAMS="luatex" SUBDIRS="" nodist_man_MANS="" \
298 install-exec-am
299
300 dodoc "${WORKDIR}/${MY_P}/README" luatexdir/NEWS
301 - cp source/texk/web2c/man
302 - cp man/luatex.man "${T}/luatex.1"
303 + cp source/texk/web2c/man || die
304 + cp man/luatex.man "${T}/luatex.1" || die
305 doman "${T}/luatex.1"
306 use doc && dodoc "${WORKDIR}/${MY_P}/manual/"*.pdf
307 }
Report Message
Find on MARC Find on Google Groups