gentoo resync : 28.04.2021

3 files changed, 39 insertions, 2 deletions

diff --git a/app-text/ttf2pk2/Manifest b/app-text/ttf2pk2/Manifest
index a4633665a610..7a2d50dbf326 100644
--- a/app-text/ttf2pk2/Manifest
+++ b/app-text/ttf2pk2/Manifest
@@ -1,3 +1,5 @@
 DIST texlive-20200406-source.tar.xz 55383320 BLAKE2B 3bc024166ebfc269389531c7cf818b062856cd2dcc27cf0a2e790f07cd941d9905c9c6a54566ea627ea1ca334d2b6da8d3e5bd1c686dc9d6f8ac15aac388c1e3 SHA512 65be52cb5e1b52f12feb62c6cf23e56c581b9dccb8d3b9ccc85c12c62b0cb67dd71de8d22d967d2cbf8403502c66bccb238523d13a0d081be104fc9f9c68b477
-EBUILD ttf2pk2-2.0_p20200406.ebuild 1100 BLAKE2B 4ed88e2d099091286e3f5e820a0f5015b32333f342c6b6a59d4bd7bdd5cbb855eeceeac56d824616e8ef82d161b52c737e266ae9512a734962fa4014ebf8deff SHA512 6c9d9b819ae17f1d1c4081f5e192cb690141e6d28b481bf0535c8e4a944d02848ba18fa598735890bae634ab0cefe0cafd05ba60d32d94f8201893075fa18ecd
+DIST texlive-20210325-source.tar.xz 54837368 BLAKE2B 66bd4bdd43ff53513004b9b9b90ababa0ab5efcf183a27864a3d39cde9cf90721456bda90c49ad6014f4b12d2e6293feaf9a8b152b85a89ffaa96bf5056347df SHA512 afd6eb24efaeac7c58d43ff24162aece919079a9ae02934509f068c7a3828223c33c14d9db11ff7fea3560b08a06f352446ba7f845eefb4a56a87b96f088f213
+EBUILD ttf2pk2-2.0_p20200406.ebuild 1101 BLAKE2B 1c0d69f29874d00338abec7380780aa1958c009374a37eb28288af031ac1f2a449207e87ed4e44d790a99b92762b8b04607713511790f02b479d61df3c08e1bb SHA512 33026725c2140d795dea8f0330da93f059ada8ef764d2e85a30e3238022f0d62d86d947bdab6b85c4a8d79d9c2a0dbc0350a4f794c282aa938517183a01e1f13
+EBUILD ttf2pk2-2.0_p20210325.ebuild 1108 BLAKE2B 75679e56225c6c9877d637d32dd9f73842a5d1ba440efa1b1a5d43af3698ccc8b66e0c3f6f44d322447c134c6d935919185c140f5fd87361b0f12cadb4f63d4e SHA512 112f6b98f929a7ea21e5a17bf82625b7b969fcc66437478dcc9f5ed8f9b861a9453c9076aa3e2c07dafb3a80e1cdb28af9b414f4368ec06b9694be71f78ae64e
 MISC metadata.xml 245 BLAKE2B ee3a163cfe0a4bc59c0dfb46f9ddb580e2d259b4d0e33cb4e684eb9e6d4b901bf97c6edd891f3b75a613a782f1b89318d0ee3ec9bee4e34c4441d9e8f4267678 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690
diff --git a/app-text/ttf2pk2/ttf2pk2-2.0_p20200406.ebuild b/app-text/ttf2pk2/ttf2pk2-2.0_p20200406.ebuild
index 293df0af0ba9..e211ff725b7d 100644
--- a/app-text/ttf2pk2/ttf2pk2-2.0_p20200406.ebuild
+++ b/app-text/ttf2pk2/ttf2pk2-2.0_p20200406.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~zlogene/texlive/texlive-${PV#*_p}-source.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 # Note about blockers: it is a freetype2 based replacement for ttf2pk and
diff --git a/app-text/ttf2pk2/ttf2pk2-2.0_p20210325.ebuild b/app-text/ttf2pk2/ttf2pk2-2.0_p20210325.ebuild
new file mode 100644
index 000000000000..01907bf57002
--- /dev/null
+++ b/app-text/ttf2pk2/ttf2pk2-2.0_p20210325.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Freetype 2 based TrueType font to TeX's PK format converter"
+HOMEPAGE="http://tug.org/texlive/"
+SRC_URI="https://dev.gentoo.org/~zlogene/texlive/texlive-${PV#*_p}-source.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+# Note about blockers: it is a freetype2 based replacement for ttf2pk and
+# ttf2tfm from freetype1, so block freetype1.
+# It installs some data that collides with
+# dev-texlive/texlive-langcjk-2011[source]. Hope it'd be fixed with 2012,
+# meanwhile we can start dropping freetype1.
+RDEPEND=">=dev-libs/kpathsea-6.2.1
+	media-libs/freetype:2
+	sys-libs/zlib
+	!media-libs/freetype:1"
+
+BDEPEND="virtual/pkgconfig"
+
+S=${WORKDIR}/texlive-${PV#*_p}-source/texk/${PN}
+
+src_configure() {
+	econf --with-system-kpathsea \
+		--with-system-freetype2 \
+		--with-system-zlib
+}