Revert "gentoo resync : 13.10.2019"

This reverts commit ab499d7cfb9ad23e83cf7a4f5052bdf1b4c42030.

3 files changed, 166 insertions, 2 deletions

diff --git a/app-text/texlive/Manifest b/app-text/texlive/Manifest
index 596a45ce49df..7bee6bb89612 100644
--- a/app-text/texlive/Manifest
+++ b/app-text/texlive/Manifest
@@ -1,2 +1,3 @@
-EBUILD texlive-2019.ebuild 7262 BLAKE2B 17dd50ca97edbca18fcd43822afecf60f9738a646cfb647cd9808c99103793fbab016bc6df11f7bdc8fb4fde44eedc7208bd69cd2138d5e031e77a9731b13f60 SHA512 4879d053bd20a2e2b67316ce321cfb60a5f4727afb8f984d6193610cb7a179ab6f19f61cf102056c55f38a1c5cc8d03347710640506bcfffdd4a144976cc8ec3
+EBUILD texlive-2017.ebuild 7276 BLAKE2B 4bb6c9de41736664687aa1ba4318aef71d43e3823c64807755743ac1f30c8a0441b330bd98bcb265c118676953b406e2a138a376a1a14e17397aa6db838d8e66 SHA512 08a2ffabfb4b5732391a20afaab0615ac5c3a3ff5caba16c90430fff6eb144f00280969753b405a57167606cd40501287130cee059495287e8b7b8281d62ee07
+EBUILD texlive-2019.ebuild 7278 BLAKE2B 5240c3ecb111469ab16774375bed0ce4443a69342ad2943064cd88d8dbe22bd27135572ee9632eb9eaa0e634da4ffdcdc5870116c185b36b270f0e2edbda07fb SHA512 0d51c436b0df8fe31cf4161ecb6860fc699e53bcfe29a65dc7c18132d88c2a30206bad0f4afdcae699f405e2fc4d52af1049a54b2fa6af5bbbb10322fcc08175
 MISC metadata.xml 2419 BLAKE2B 2627379a58f80fd304b4c77ac3f3466520d8237458e4236d88ffc2b33a062d50e33a0f2cb07c6120abbbd27d0dd7d4aa79eaa44790280f719eb10fcfc230664d SHA512 e20c3f1c67f6250209b381aa21d827ee27006d6ba5558e913ce01ac704ba0d04f16b1c5b4666ed8833e6c744b7045276d98e777f3e3e1289dc33e861bc745941
diff --git a/app-text/texlive/texlive-2017.ebuild b/app-text/texlive/texlive-2017.ebuild
new file mode 100644
index 000000000000..e05547b4564a
--- /dev/null
+++ b/app-text/texlive/texlive-2017.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+DESCRIPTION="A complete TeX distribution"
+HOMEPAGE="http://tug.org/texlive/"
+SRC_URI=""
+
+LICENSE="metapackage"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="cjk context detex dvi2tty extra epspdf games graphics
+humanities jadetex luatex metapost music pdfannotextractor png pstricks publishers
+science tex4ht texi2html truetype xetex xindy xml X"
+
+LANGS="af ar as bg bn br ca cs cy da de el en eo es et eu fa fi fr ga gl gu he
+	hi hr hsb hu hy ia id is it ja ko kn la lo lt lv ml mn mr nb nl nn no or pa
+	pl pt rm ro ru sa sco sk sl sq sr sv ta te th tk tr uk vi zh"
+
+for X in ${LANGS}; do
+	IUSE="${IUSE} l10n_${X}"
+done
+
+TEXLIVE_CAT="dev-texlive"
+
+DEPEND=">=app-text/texlive-core-${PV}"
+RDEPEND="${DEPEND}
+	app-text/psutils
+	>=${TEXLIVE_CAT}/texlive-fontutils-${PV}
+	media-gfx/sam2p
+	texi2html? ( app-text/texi2html )
+	sys-apps/texinfo
+	app-text/t1utils
+	>=app-text/lcdf-typetools-2.92[kpathsea]
+	truetype? ( >=app-text/ttf2pk2-2.0_p20150521 )
+	detex? ( dev-tex/detex )
+	app-text/ps2eps
+	dvi2tty? ( dev-tex/dvi2tty )
+	png? ( app-text/dvipng )
+	X? ( >=app-text/xdvik-22.87 )
+	>=${TEXLIVE_CAT}/texlive-basic-${PV}
+	>=${TEXLIVE_CAT}/texlive-fontsrecommended-${PV}
+	>=${TEXLIVE_CAT}/texlive-latex-${PV}
+	luatex? ( >=${TEXLIVE_CAT}/texlive-luatex-${PV} )
+	>=${TEXLIVE_CAT}/texlive-latexrecommended-${PV}
+	>=dev-tex/xcolor-2.11
+	>=dev-tex/latex-beamer-3.36
+	metapost? (
+		>=${TEXLIVE_CAT}/texlive-metapost-${PV}
+			dev-tex/feynmf
+	)
+	>=${TEXLIVE_CAT}/texlive-plaingeneric-${PV}
+	pdfannotextractor? ( dev-tex/pdfannotextractor )
+	extra? (
+		dev-tex/chktex
+		app-text/dvisvgm
+		dev-tex/latexdiff
+		>=dev-tex/latexmk-418
+		>=app-text/pdfjam-2.02
+		>=${TEXLIVE_CAT}/texlive-bibtexextra-${PV}
+		>=${TEXLIVE_CAT}/texlive-fontsextra-${PV}
+		>=${TEXLIVE_CAT}/texlive-formatsextra-${PV}
+		>=${TEXLIVE_CAT}/texlive-latexextra-${PV}
+			>=dev-tex/glossaries-2.07
+			>=dev-tex/leaflet-20041222
+			>=dev-tex/currvita-0.9i-r1
+			>=dev-tex/g-brief-4.0.2
+			>=dev-tex/envlab-1.2-r1
+			>=dev-tex/europecv-20060424-r1
+			>=dev-tex/svninfo-0.7.3-r1
+	)
+	xetex? ( >=${TEXLIVE_CAT}/texlive-xetex-${PV} )
+	graphics? ( >=${TEXLIVE_CAT}/texlive-pictures-${PV}
+		dev-tex/dot2texi )
+	epspdf? ( app-text/epspdf )
+	science? ( >=${TEXLIVE_CAT}/texlive-mathscience-${PV} )
+	publishers? ( >=${TEXLIVE_CAT}/texlive-publishers-${PV} )
+	music? ( >=${TEXLIVE_CAT}/texlive-music-${PV} )
+	pstricks? ( >=${TEXLIVE_CAT}/texlive-pstricks-${PV} )
+	context? ( >=${TEXLIVE_CAT}/texlive-context-${PV} )
+	games? ( >=${TEXLIVE_CAT}/texlive-games-${PV} )
+	humanities? ( >=${TEXLIVE_CAT}/texlive-humanities-${PV} )
+	tex4ht? ( >=dev-tex/tex4ht-20090611_p1038-r3 )
+	xml? (
+		>=dev-tex/xmltex-1.9-r2
+		app-text/passivetex
+	)
+	jadetex? ( >=app-text/jadetex-3.13-r2 )
+	l10n_af?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_ar?    ( >=${TEXLIVE_CAT}/texlive-langarabic-${PV} )
+	l10n_fa?    ( >=${TEXLIVE_CAT}/texlive-langarabic-${PV} )
+	l10n_hy?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	cjk? ( >=${TEXLIVE_CAT}/texlive-langcjk-${PV}
+		   >=dev-tex/cjk-latex-4.8.4 )
+	l10n_hr?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_bg?    ( >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
+	l10n_br?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_ru?    ( >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
+	l10n_uk?    ( >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
+	l10n_cs?    ( >=${TEXLIVE_CAT}/texlive-langczechslovak-${PV}
+	              >=app-text/vlna-1.3 )
+	l10n_sk?    ( >=${TEXLIVE_CAT}/texlive-langczechslovak-${PV} )
+	l10n_da?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_nl?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_en?    ( >=${TEXLIVE_CAT}/texlive-langenglish-${PV} )
+	l10n_fi?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_eu?    ( >=${TEXLIVE_CAT}/texlive-langfrench-${PV} )
+	l10n_fr?    ( >=${TEXLIVE_CAT}/texlive-langfrench-${PV} )
+	l10n_de?    ( >=${TEXLIVE_CAT}/texlive-langgerman-${PV} )
+	l10n_el?    ( >=${TEXLIVE_CAT}/texlive-langgreek-${PV} )
+	l10n_he?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_hu?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_as?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_bn?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_gu?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_hi?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_kn?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_ml?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_mr?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_or?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_pa?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_sa?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_ta?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_te?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_it?    ( >=${TEXLIVE_CAT}/texlive-langitalian-${PV} )
+	l10n_ja?    ( >=${TEXLIVE_CAT}/texlive-langjapanese-${PV} )
+	l10n_ko?    ( >=${TEXLIVE_CAT}/texlive-langkorean-${PV} )
+	l10n_la?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_lt?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_lv?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_mn?    ( >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
+	l10n_nb?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_nn?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_no?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_cy?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_eo?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_et?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_ga?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_rm?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_hsb?   ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_ia?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_id?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_is?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_lo?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_ro?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_sq?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_sr?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV}
+	              >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
+	l10n_sl?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_tr?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_pl?    ( >=${TEXLIVE_CAT}/texlive-langpolish-${PV} )
+	l10n_pt?    ( >=${TEXLIVE_CAT}/texlive-langportuguese-${PV} )
+	l10n_ca?    ( >=${TEXLIVE_CAT}/texlive-langspanish-${PV} )
+	l10n_gl?    ( >=${TEXLIVE_CAT}/texlive-langspanish-${PV} )
+	l10n_es?    ( >=${TEXLIVE_CAT}/texlive-langspanish-${PV} )
+	l10n_sco?   ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_sv?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_tk?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_vi?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_zh?    ( >=${TEXLIVE_CAT}/texlive-langchinese-${PV} )
+	xindy? ( app-text/xindy )
+"
diff --git a/app-text/texlive/texlive-2019.ebuild b/app-text/texlive/texlive-2019.ebuild
index 0fa8ecad4f1a..c44916e25ef2 100644
--- a/app-text/texlive/texlive-2019.ebuild
+++ b/app-text/texlive/texlive-2019.ebuild
@@ -9,7 +9,7 @@ SRC_URI=""
 
 LICENSE="metapackage"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 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"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="cjk context detex dvi2tty extra epspdf games graphics
 humanities jadetex luatex metapost music pdfannotextractor png pstricks publishers
 science tex4ht texi2html truetype xetex xindy xml X"