commit:     b3740286aeeb08673398a7a294129f884319d538
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Mon Jun  3 16:03:15 2019 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Mon Jun  3 16:06:45 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3740286

app-text/texlive-core: backport patches; unbundle gd

Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11

 app-text/texlive-core/Manifest                 | 2 +-
 app-text/texlive-core/texlive-core-2019.ebuild | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/app-text/texlive-core/Manifest b/app-text/texlive-core/Manifest
index 8d67d055bfe..9eb69184e4e 100644
--- a/app-text/texlive-core/Manifest
+++ b/app-text/texlive-core/Manifest
@@ -2,7 +2,7 @@ DIST texlive-20170524-source-freetype.patch.xz 625056 BLAKE2B 
70bcd15da1edfe5422
 DIST texlive-20170524-source.tar.xz 63483372 BLAKE2B 
44669d1228f5be27e9d93672a4f4ead40f7f4c6cf386f2db6fef54d64f8b8a743a485fe1170904d8117b9745f71ec77db8434caa6cdd79359b1f3f387130a3b4
 SHA512 
18c18940992ab94ce22e22ccd4ad798253ea14ac2ab296a10ea5e9a8da9f33989f2e2641b42b564d1d5fb53bd371da3e68726b676d706b469016ad146cd19daa
 DIST texlive-20190410-source.tar.xz 53783408 BLAKE2B 
8e34c7c2b74eab1c4d16ddbf7eddd8566593e6d68c42a2634760f11d86e68970698d8b9deddcf3297966968ede11ecf30e0b04ec19b708dc3e6d0a2abcc3799d
 SHA512 
7759d8e668e53c0c73e48907096da9d8fb6384dd9c3342ddfb05e17d077054c5351d35256cf4e63a6da502de2f09f521979bede7209cdd5bd8ae80eba0efed2e
 DIST texlive-core-2017-poppler076.tar.xz 9232 BLAKE2B 
945e4f8e6f3230b78dc43560c664fbe4989fb32759b41c0ef83d656b43b008030cebdbf668718c4f22831d01c3fe1466f686f7f6b76183d3d1bb5e760f17140d
 SHA512 
63fb2b426921be5f6d310b31e7fea6fc0edc0900f4790445fcaface9c931ca6c3e8f98b81a3bccfd1c877750e854c9410a59ff9a124aa2826d7b4187d54ed8ab
-DIST texlive-core-2019-poppler076.patch.xz 7460 BLAKE2B 
92219d1119231b31f3d2ec49f9d3b8db8f4eaeb2b7790ccfb62f106b5626b0d9f6c197b4016129230b32fd873515d1fd99676677f1584d0cfb6bcbf352f7e704
 SHA512 
e7d6d4692d702b24714d3d28da258d615d614577ad81ebf9cf261be2c4cf8a8207dc8861cd3c86bd82b2425c6c4ab1766f11b8b0ad14f9d6de2b12e3f76fed14
+DIST texlive-core-patches-2019-1.tar.xz 11896 BLAKE2B 
f0c6283c4a1fd7158d9db26531db897c48d466dc32e60996221b70ebd799e702acb68760005fa4f8bbf60df8841b21e2117b5afad46c76e3cc749ed3de95da7c
 SHA512 
eca8bce62ea47871da24371474ccd3c8d0d9431ef8d3b585e0811bd3d48606bf26bc88d45075e046c5b95860fc9482fe6b5d1e1914231363712b2a273e0fd7c6
 DIST texlive-core-patches-70.tar.xz 13068 BLAKE2B 
011cf51af10d28ac9df7c9b9d7aea2cac3e562d393dcf09d57b3c2832fe6816cf926458417577f7c9d9414639a291c09240444145bdbb3d132170f51a8a16980
 SHA512 
fd26b92a03cd0446007728d0c16a8c7301e254515b997e6a0bd9b325db162bf3f2a2e96be0cb185f042038205c4b4dacf1785a216c8326328682f1c42da9079e
 DIST texlive-module-a2ping-2017.tar.xz 31136 BLAKE2B 
cc0d99992cb780711a2a423fa26135845fa1f2cbbac76485d64a0b3184e338e7a60cdcfeaca129e6251f72110b0069c32164f9c4904d7f7c9c2edc6306f50411
 SHA512 
4711f184222fd95498a6d3ee94db19209c7836e6b775303926766d97921f2e8324b0aa2252a958fb619dbeca50729d2be4851a2add5503e7e8f4e713fc993e41
 DIST texlive-module-a2ping-2019.tar.xz 30616 BLAKE2B 
545abfdd3aa23b8d2bed608d7b7aef0f9578d5c4d6039880d435144c687014edb8c841afcb2d9ca1fc48a365b2bcb57832d49d1c6bb35480a01a813e40e18ea6
 SHA512 
983084ca3d70eff729d81d5d52a74e1bf1f95e384916bc81d17be81290f70c1da5ac891c1665a2451975f36fd56ea0036e1d0dc46b2e98b61ddc660ac044c23c

diff --git a/app-text/texlive-core/texlive-core-2019.ebuild 
b/app-text/texlive-core/texlive-core-2019.ebuild
index 33c6995ada0..84f9cf4dd38 100644
--- a/app-text/texlive-core/texlive-core-2019.ebuild
+++ b/app-text/texlive-core/texlive-core-2019.ebuild
@@ -9,13 +9,15 @@ inherit flag-o-matic toolchain-funcs libtool texlive-common
 
 MY_P=${PN%-core}-${TL_SOURCE_VERSION}-source
 
+PATCHLEVEL=1
+
 DESCRIPTION="A complete TeX distribution"
 HOMEPAGE="https://tug.org/texlive/";
 SLOT="0"
 LICENSE="GPL-2 LPPL-1.3c TeX"
 
 SRC_URI="mirror://gentoo/${MY_P}.tar.xz
-       https://dev.gentoo.org/~zlogene/${P}-poppler076.patch.xz";
+       mirror://gentoo/${PN}-patches-${PV}-${PATCHLEVEL}.tar.xz"
 
 TL_CORE_BINEXTRA_MODULES="
        a2ping adhocfilelist arara asymptote bundledoc checklistings ctan_chk
@@ -83,6 +85,7 @@ COMMON_DEPEND="${MODULAR_X_DEPEND}
        !dev-tex/luatex
        sys-libs/zlib
        >=media-libs/libpng-1.2.43-r2:0=
+       media-libs/gd[png]
        >=app-text/poppler-0.58.0:=
        >=x11-libs/cairo-1.12
        >=x11-libs/pixman-0.18
@@ -143,7 +146,7 @@ src_prepare() {
 
        default
 
-       eapply "${WORKDIR}"/${P}-poppler076.patch
+       eapply "${WORKDIR}"/patches
 
        sed -i \
                -e "s,/usr/include /usr/local/include.*echo 
\$KPATHSEA_INCLUDES.*,${EPREFIX}/usr/include\"," \
@@ -184,6 +187,7 @@ src_configure() {
                --with-system-zziplib \
                --with-system-libpaper \
                --with-system-gmp \
+               --with-system-gd \
                --with-system-mpfr \
                --without-texinfo \
                --disable-dialog \

Reply via email to