Gentoo Archives: gentoo-commits

From: Jory Pratt <anarchy@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/musl:master commit in: dev-tex/luatex/
Date: Wed, 06 Nov 2019 22:41:00
Message-Id: 1573079554.f9cbf1d6367a1d96cc80f8aa63b9f767f9fac429.anarchy@gentoo
1 commit: f9cbf1d6367a1d96cc80f8aa63b9f767f9fac429
2 Author: Jory Pratt <anarchy <AT> gentoo <DOT> org>
3 AuthorDate: Wed Nov 6 22:32:34 2019 +0000
4 Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org>
5 CommitDate: Wed Nov 6 22:32:34 2019 +0000
6 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=f9cbf1d6
7
8 dev-tex/luatex: sync for eapi support
9
10 Package-Manager: Portage-2.3.78, Repoman-2.3.17
11 RepoMan-Options: --force
12 Signed-off-by: Jory Pratt <anarchy <AT> gentoo.org>
13
14 ...ex-0.70.1-r2.ebuild => luatex-0.70.1-r3.ebuild} | 54 ++++++++++++----------
15 1 file changed, 29 insertions(+), 25 deletions(-)
16
17 diff --git a/dev-tex/luatex/luatex-0.70.1-r2.ebuild b/dev-tex/luatex/luatex-0.70.1-r3.ebuild
18 similarity index 68%
19 rename from dev-tex/luatex/luatex-0.70.1-r2.ebuild
20 rename to dev-tex/luatex/luatex-0.70.1-r3.ebuild
21 index ad40cbe..bf63675 100644
22 --- a/dev-tex/luatex/luatex-0.70.1-r2.ebuild
23 +++ b/dev-tex/luatex/luatex-0.70.1-r3.ebuild
24 @@ -1,9 +1,9 @@
25 -# Copyright 1999-2017 Gentoo Foundation
26 +# Copyright 1999-2019 Gentoo Authors
27 # Distributed under the terms of the GNU General Public License v2
28
29 -EAPI=5
30 +EAPI=7
31
32 -inherit libtool eutils texlive-common
33 +inherit flag-o-matic libtool texlive-common
34
35 DESCRIPTION="An extended version of pdfTeX using Lua as an embedded scripting language"
36 HOMEPAGE="http://www.luatex.org/"
37 @@ -12,16 +12,18 @@ SRC_URI="http://foundry.supelec.fr/gf/download/frsrelease/392/1730/${PN}-beta-${
38
39 LICENSE="GPL-2"
40 SLOT="0"
41 -KEYWORDS="amd64 arm arm64 ia64 ~mips ppc sh sparc x86"
42 +KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
43 IUSE="doc"
44
45 RDEPEND="dev-libs/zziplib
46 >=media-libs/libpng-1.4
47 app-text/poppler:=[xpdf-headers(+)]
48 - sys-libs/zlib
49 + sys-libs/zlib:*
50 >=dev-libs/kpathsea-6.0.1_p20110627"
51 -DEPEND="${RDEPEND}
52 - virtual/pkgconfig"
53 +
54 +DEPEND="${RDEPEND}"
55 +
56 +BDEPEND="virtual/pkgconfig"
57
58 S="${WORKDIR}/${PN}-beta-${PV}/source"
59 PRELIBS="libs/obsdcompat"
60 @@ -29,12 +31,14 @@ PRELIBS="libs/obsdcompat"
61 #kpathsea_extraconf="--disable-shared --disable-largefile"
62
63 src_prepare() {
64 - has_version '>=app-text/poppler-0.18.0:0' && epatch "${FILESDIR}/poppler018.patch"
65 - has_version '>=app-text/poppler-0.20.0:0' && epatch "${FILESDIR}/poppler020.patch"
66 - has_version '>=app-text/poppler-0.22.0:0' && epatch "${FILESDIR}/poppler022.patch"
67 - has_version '>=app-text/poppler-0.26.0:0' && epatch "${FILESDIR}/poppler026-backport.patch"
68 - epatch "${FILESDIR}/kpathsea2012.patch" \
69 - "${FILESDIR}/remove-zlib-version-check.patch" \
70 + default
71 + has_version '>=app-text/poppler-0.18.0:0' && eapply "${FILESDIR}/poppler018.patch"
72 + has_version '>=app-text/poppler-0.20.0:0' && eapply "${FILESDIR}/poppler020.patch"
73 + has_version '>=app-text/poppler-0.22.0:0' && eapply "${FILESDIR}/poppler022.patch"
74 + has_version '>=app-text/poppler-0.26.0:0' && eapply "${FILESDIR}/poppler026-backport.patch"
75 + has_version '>=app-text/poppler-0.57.0:0' && append-cxxflags -std=c++11 # bug 627538
76 + eapply "${FILESDIR}/kpathsea2012.patch" \
77 + "${FILESDIR}/remove-zlib-version-check.patch"
78 "${FILESDIR}/jmpbuf.patch"
79 S="${S}/build-aux" elibtoolize --shallow
80 }
81 @@ -49,7 +53,7 @@ src_configure() {
82 myconf=""
83 #has_version '>=app-text/texlive-core-2009' && myconf="--with-system-kpathsea"
84
85 - cd "${S}/texk/web2c"
86 + cd "${S}/texk/web2c" || die
87 econf \
88 --disable-cxx-runtime-hack \
89 --disable-all-pkgs \
90 @@ -81,7 +85,7 @@ src_configure() {
91 local j=$(basename $i)_extraconf
92 local myconf
93 eval myconf=\${$j}
94 - cd "${S}/${i}"
95 + cd "${S}/${i}" || die
96 econf ${myconf}
97 done
98 }
99 @@ -89,23 +93,23 @@ src_configure() {
100 src_compile() {
101 texk/web2c/luatexdir/getluatexsvnversion.sh || die
102 for i in ${PRELIBS} ; do
103 - cd "${S}/${i}"
104 - emake || die "failed to build ${i}"
105 + cd "${S}/${i}" || die
106 + emake
107 done
108 - cd "${WORKDIR}/${PN}-beta-${PV}/source/texk/web2c"
109 - emake luatex || die "failed to build luatex"
110 + cd "${WORKDIR}/${PN}-beta-${PV}/source/texk/web2c" || die
111 + emake luatex
112 }
113
114 src_install() {
115 - cd "${WORKDIR}/${PN}-beta-${PV}/source/texk/web2c"
116 + cd "${WORKDIR}/${PN}-beta-${PV}/source/texk/web2c" || die
117 emake DESTDIR="${D}" bin_PROGRAMS="luatex" SUBDIRS="" nodist_man_MANS="" \
118 - install-exec-am || die
119 + install-exec-am
120
121 - dodoc "${WORKDIR}/${PN}-beta-${PV}/README" || die
122 - doman "${WORKDIR}/texmf/doc/man/man1/"*.1 || die
123 + dodoc "${WORKDIR}/${PN}-beta-${PV}/README"
124 + doman "${WORKDIR}/texmf/doc/man/man1/"*.1
125 if use doc ; then
126 - dodoc "${WORKDIR}/${PN}-beta-${PV}/manual/"*.pdf || die
127 - dodoc "${WORKDIR}/texmf/doc/man/man1/"*.pdf || die
128 + dodoc "${WORKDIR}/${PN}-beta-${PV}/manual/"*.pdf
129 + dodoc "${WORKDIR}/texmf/doc/man/man1/"*.pdf
130 fi
131 }