[gentoo-commits] repo/gentoo:master commit in: app-text/texlive-core/

["Alexis Ballier" <aballier@gentoo.org>]

commit:     c10bb44ea735ea2c9eaeba57f8a63a49e0866508
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Wed Feb  8 17:40:48 2017 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Wed Feb  8 17:41:02 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c10bb44e

app-text/texlive-core: remove overshadowed versions

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 app-text/texlive-core/Manifest                    |   5 -
 app-text/texlive-core/texlive-core-2012.ebuild    | 343 ---------------------
 app-text/texlive-core/texlive-core-2013-r1.ebuild | 354 ----------------------
 app-text/texlive-core/texlive-core-2014-r1.ebuild | 336 --------------------
 app-text/texlive-core/texlive-core-2014-r3.ebuild | 336 --------------------
 app-text/texlive-core/texlive-core-2014.ebuild    | 334 --------------------
 app-text/texlive-core/texlive-core-2015.ebuild    | 347 ---------------------
 7 files changed, 2055 deletions(-)

diff --git a/app-text/texlive-core/Manifest b/app-text/texlive-core/Manifest
index 5b084e71aa..c07ab7c36d 100644
--- a/app-text/texlive-core/Manifest
+++ b/app-text/texlive-core/Manifest
@@ -3,15 +3,10 @@ DIST texlive-20130530-source.tar.xz 179963948 SHA256 a905832e4c04dd1cb16db4bb7ba
 DIST texlive-20140525-source.tar.xz 41657688 SHA256 08bb4eb02923ac65ce1183612c6b64da185904f26a1660f5ca4f902d055795be SHA512 09169af15d806abd721e55ffc20ed684c0a7ad60783272d49fabfe9c88857c4abd15b60f30e3f5511ceda1982fdc1d33db8265f97e374bfa5b250dbb5612f8ad WHIRLPOOL fd7fffeeaf319bca5333f6d5d8d9cc6517f76ffe5b2793a73604d844cb7474d83c23826f98d4d11ea5e1a35c0f273e12b2fe6f5945f9880a9577fedad6625014
 DIST texlive-20150521-source.tar.xz 45459552 SHA256 ed9bcd7bdce899c3c27c16a8c5c3017c4f09e1d7fd097038351b72497e9d4669 SHA512 9d06bb88c489715787ce619c4c6b5e2d4251e1db8d48ae7fe2d1a253634c76bc6d7282ef9c93c77847845cae01eafb58dfb37ba3fb83a6d223f0d7fe8f5d3855 WHIRLPOOL e19e4cf9c6122e8a2e80d3ad62171591a2d53317792ce69d7b2afdd6978d397c873565d597b1457d23ba6f5b5de33750955690a92fb6c34d814c075397b67a0b
 DIST texlive-20160523-source.tar.xz 45941100 SHA256 a8b32ca47f0a403661a09e202f4567a995beb718c18d8f81ca6d76daa1da21ed SHA512 915fa2f5e2099dd385ef81033db7aafdf09558c0c200fed0748a8a42fd61f69d3eaac9decea334e30981af739dd81061a9b1d6853c7f6d00285fe0be40e26c3e WHIRLPOOL 25d27fb7a7bdb47d40ddf951394e36546b184d71f2e09adb20698bd0f960e54841ddd0313a87510cb2ef43953eb4d9d05d30b88d25d15762dd774575c88fedbe
-DIST texlive-core-patches-36.tar.xz 2200 SHA256 409d48ef65032ec3c335be09ba8eaa5e746a02ed88cc13c0b0b0a5de4007652e SHA512 2e09516ec005a76d0c1fad8edf5930dcd57c77983ec2d8f4b0a020f5a95799797190d95e0e0bfdb1ce378df2337de64967d814cc807630666200ade71c2bf571 WHIRLPOOL d6dc2cf107b128ddb334a28b55da1440cfd249f69a7bbbc3860a1e57a3d22cd2e2c12f429c481f953590528955b491c8fa0b0eb14298ff7913d04b7e33570a84
 DIST texlive-core-patches-39.tar.xz 3056 SHA256 685705f1994b751df42738cb542a6ca0b4adbc013275318667c634665b8bd25b SHA512 95e7161820a648d667c2a69bd74c1d24a20670128889d1ebbec2e700b0459d84bb4d96b2d9f355e519d9efe0e126689b29225af1a184e5a06e0cb398fefc7cc3 WHIRLPOOL 24359dbca04f3e9f9c09a9afc195dd6858da2284947cbebaa770e73ef78276059f9d2e3c8a95c5005971fa64be76367a55887f1f94e423e7d0ca227d5573dc95
-DIST texlive-core-patches-41.tar.xz 2340 SHA256 64f914d6e32c1d91cd484b230e651a2646f94c90e94b8ca5b5accf634bf3905d SHA512 e829c9c68c6f9e7edbf582c6820d5b42483b9411754fcddc6a076ad4790497ef3ea30babbd4950451b543e3b0d960561d6cc099feb54282325040a8009b506b5 WHIRLPOOL d606d537f80aa30bdb05dd5a60afdcf23f9b863fdcc62aa22f1bb5a34ec89b79960efdc89fc19351e6d1f69236363a246cffe9059ee3df67d82308616dfb4bc4
-DIST texlive-core-patches-42.tar.xz 2508 SHA256 e3b4d4de520ff58420a7b695491ffd780d88621c5bef135e59f35e3112ed5fec SHA512 fb5753a25a07f8f9a42494ed96c29f01f11c3f1a070972eafceb8c5ab5fa598c4d7fd5d7533608e6595621394f71563c187e3aaa1e2ba7a6b4e09fe2ae273991 WHIRLPOOL f31aefa1fad71bc294b18655e2db222ce272b6e286693bb62a880a25493d5eed933a3ef549a7a6a814c12677833110f77dcb71f36792aad8755a900a4aba9193
-DIST texlive-core-patches-47.tar.xz 4556 SHA256 9a5f220e25a8d9980486d5599d38e14dc5fc19892354fac92ff890c9e788bcfe SHA512 737a959df416a013a7a1970f5d0c4a6ea3798825375bcd22e532fb0ded4e06c9c21890817d9abf16c6aa3d9e69f082930207c86c4bd7046456eadaa0907f7079 WHIRLPOOL caff55f3a250e38f21c4ef82689fc8273644c51d368ce05509e4e3b521ded826b2c8fcd03363c7c70fd3278101d1a3028eaeee383a65664c7c6d1d8d86cb3046
 DIST texlive-core-patches-48.tar.xz 3528 SHA256 521bffc6a9d3a79fe157855f6a58954b26308230ab2d4daa382f5c101e836177 SHA512 af7e3de4ab378e837a07bf5cd1e0db0bffd043273cc90b6d93484a1a4dfdee52df9846d656ab7821a2b3af82ccdc8ea6f86f35fea97a846166a9cd92e0f06021 WHIRLPOOL 5a5151960dea201cf87fada0a3e3cf297580d6a9b92ed5cc97ee49c0dd8d473798ddc858a4301b16c15dff71d1aafe663ab3017f0f391ea3aad1f0de8506ddc6
 DIST texlive-core-patches-49.tar.xz 2796 SHA256 2c17e0b8d24dd007e86ff7fbe7ef14d42f1b5287e08c133ab2c5c82cedc16709 SHA512 4faf0b9653b9a5335e4b210d15200b4118245687ff12e617f181bdece5d2b5cd827247fc72bdc304722f72d8f017804b8026300a9be18f7663749ddc82c7bb17 WHIRLPOOL 8145a9d5d4fa2713a1aaf0e51f546a20a844d1a12306d7f2b82e66ece961edafd34f9e6aebfc3f3110a23366dc1d43a13cc4fa7fc69c9f67fd300c55f7bb7b92
 DIST texlive-core-patches-50.tar.xz 4632 SHA256 417d50014d1701bb75aee0cfcae95716926fefdc7d0057c9784ba68bd1eab2e4 SHA512 f8fab7940b417b7065c9c467f7a9612e161a1a44db50a4523ee4a092ba381f7580adf1c3d75375165795dfc3f23d005028d67351815481dbdbd6edb13f376b64 WHIRLPOOL 9611be98c2fe494c1d354a23a1c1dfcaf30ca9e6f321056dbe34b99eef64dc8fbcc59428cf5ef8099584968b0b574d0e3e6acac87e37c5583e78eb87f87733b6
-DIST texlive-core-patches-51.tar.xz 3040 SHA256 7edcc57ba831f040a5fcd07080c6e197955c9b979c81c6722c3914fff9ed9a03 SHA512 a1b7132bf25ab0e374e232351cbe64f509a7aab4e795b2d1fb03cd59f7dd0ed87f34c4ee5058dcb544f4b6d7e50d1cf22db29fbb65bde8fe213963856cb486f2 WHIRLPOOL 2c5db621b11cc6c93d0f58aef0221f3a4ace13352fc2de86df89ceeb137edda53fa7f44cb1052570d7a1053417c60910c61b214a61713b9b10c9684fc1983f03
 DIST texlive-core-patches-52.tar.xz 3376 SHA256 294f44d6b24801206eec23a497d0b17f68ed88f8ef3d33492efd75e889db309f SHA512 fbc84217911d797373ad03e3da3bcb2277d74edf3a9fd77a5bf67bed7fb207d1cd3d9c9c7947c906ee10989fe6ceb6c263a4002a592217bce7e873db813dc367 WHIRLPOOL e249a1aa3c563beb14ebe88f93c2b144dfa6de3b7d47b502a9a7e18a8a0f39ab399925a47bd7e4406ecf2010589791fee09a71b6db48a04beadac18294cb0474
 DIST texlive-core-patches-64.tar.xz 4084 SHA256 3c851c4ccf8bdc6b4b2446dd0e490da64a88907c06eee34af7d438aa3727cc34 SHA512 188b64a027eebaa47e803a847c183985daf83c86dcfee85f61f9e608c614391d03b070405355159813d11ec48c10709be12455696320ddcd0bcb3f98cd906c82 WHIRLPOOL 9c935339c10c73fba88a4d9cc8df1b8b6382d3788178fe6842497fb15542f47511fdccceede050ca883b976bdb3303a77ddb0b65f4a6e741d57cfd986d9f05d5
 DIST texlive-module-a2ping-2012.tar.xz 31124 SHA256 37b769091af7c7c9f95c52f92cbc26b22f72dc0de5ecb0e9e37cf1482438605a SHA512 b4f74f037d1113d204d3f0e34c8418e354ae002ab09e8c326458bf7c9c9a9bfa3211317e03bb7e69d7f2e83a2b22851410287477176dab5288dacf5a9ec4a8a6 WHIRLPOOL 5e76ab0e818c3e20d8211c35230a9ee1084f1de830c988b1ed9707036481582540aa97c6ee9e31b0dd1ee2a8346dc3b81197d8c0489563122bba2dd7dffe5fe1

diff --git a/app-text/texlive-core/texlive-core-2012.ebuild b/app-text/texlive-core/texlive-core-2012.ebuild
deleted file mode 100644
index 5eabb670a4..0000000000
--- a/app-text/texlive-core/texlive-core-2012.ebuild
+++ /dev/null
@@ -1,343 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=3
-
-#TL_UPSTREAM_PATCHLEVEL="1"
-PATCHLEVEL="36"
-TL_SOURCE_VERSION=20120701
-
-inherit eutils flag-o-matic toolchain-funcs libtool texlive-common
-
-MY_PV=${PN%-core}-${TL_SOURCE_VERSION}-source
-
-DESCRIPTION="A complete TeX distribution"
-HOMEPAGE="http://tug.org/texlive/"
-SLOT="0"
-LICENSE="GPL-2 LPPL-1.3c TeX"
-
-SRC_URI="mirror://gentoo/${MY_PV}.tar.xz"
-
-# Fetch patches
-SRC_URI="${SRC_URI} mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.xz"
-#	mirror://gentoo/texlive-core-upstream-patches-${TL_UPSTREAM_PATCHLEVEL}.tar.xz"
-
-TL_CORE_BINEXTRA_MODULES="
-	a2ping asymptote bibtex8 bundledoc ctanify ctanupload ctie cweb de-macro dtl
-	dvi2tty dviasm dvicopy dvidvi dviljk dvipng dvipos findhyph fragmaster
-	hyphenex installfont lacheck latex2man latexfileversion latexpand
-	listings-ext match_parens mkjobtexmf patgen pdfcrop pdftools pkfix
-	pkfix-helper purifyeps seetexk sty2dtx synctex texcount texdef texdiff
-	texdirflatten texdoc texliveonfly texloganalyser texware tie tpic2pdftex
-	typeoutfileinfo web	collection-binextra
-	"
-TL_CORE_BINEXTRA_DOC_MODULES="
-	a2ping.doc asymptote.doc bibtex8.doc bundledoc.doc ctanify.doc
-	ctanupload.doc ctie.doc cweb.doc de-macro.doc dvi2tty.doc dvicopy.doc
-	dviljk.doc dvipng.doc dvipos.doc findhyph.doc fragmaster.doc installfont.doc
-	latex2man.doc latexfileversion.doc latexpand.doc listings-ext.doc
-	match_parens.doc mkjobtexmf.doc patgen.doc pdfcrop.doc pdftools.doc
-	pkfix.doc pkfix-helper.doc purifyeps.doc sty2dtx.doc synctex.doc
-	texcount.doc texdef.doc texdiff.doc texdirflatten.doc texdoc.doc
-	texliveonfly.doc texloganalyser.doc texware.doc tie.doc tpic2pdftex.doc
-	typeoutfileinfo web.doc
-	"
-TL_CORE_BINEXTRA_SRC_MODULES="hyphenex.source listings-ext.source mkjobtexmf.source texdef.source"
-
-TL_CORE_EXTRA_MODULES="tetex hyphen-base texconfig gsftopk texlive.infra ${TL_CORE_BINEXTRA_MODULES}"
-TL_CORE_EXTRA_DOC_MODULES="tetex.doc texconfig.doc gsftopk.doc texlive.infra.doc ${TL_CORE_BINEXTRA_DOC_MODULES}"
-TL_CORE_EXTRA_SRC_MODULES="${TL_CORE_BINEXTRA_SRC_MODULES}"
-
-for i in ${TL_CORE_EXTRA_MODULES}; do
-	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.tar.xz"
-done
-
-SRC_URI="${SRC_URI} doc? ( "
-for i in ${TL_CORE_EXTRA_DOC_MODULES}; do
-	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.tar.xz"
-done
-SRC_URI="${SRC_URI} )"
-SRC_URI="${SRC_URI} source? ( "
-for i in ${TL_CORE_EXTRA_SRC_MODULES}; do
-	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.tar.xz"
-done
-SRC_URI="${SRC_URI} )"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="cjk X doc source tk xetex"
-
-MODULAR_X_DEPEND="X? (
-				x11-libs/libXmu
-				x11-libs/libXp
-				x11-libs/libXpm
-				x11-libs/libXaw
-	)"
-
-COMMON_DEPEND="${MODULAR_X_DEPEND}
-	!app-text/ptex
-	!app-text/tetex
-	!<app-text/texlive-2007
-	!app-text/xetex
-	!<dev-texlive/texlive-basic-2009
-	!<dev-texlive/texlive-metapost-2011
-	!app-text/dvibook
-	sys-libs/zlib
-	>=media-libs/libpng-1.2.43-r2:0
-	>=app-text/poppler-0.12.3-r3
-	xetex? (
-		app-text/teckit
-		media-libs/fontconfig
-		media-libs/freetype:2
-		media-libs/silgraphite
-	)
-	>=dev-libs/kpathsea-6.1.0_p20120701
-	cjk? ( >=dev-libs/ptexenc-1.2.0_p20120701 )"
-
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	sys-apps/ed
-	sys-devel/flex
-	app-arch/xz-utils"
-
-RDEPEND="${COMMON_DEPEND}
-	>=app-text/ps2pkm-1.5_p20120701
-	>=app-text/dvipsk-5.992_p20120701
-	>=dev-tex/bibtexu-3.71_p20120701
-	virtual/perl-Getopt-Long
-	xetex? ( >=app-text/xdvipdfmx-0.7.8_p20120701 )
-	tk? ( dev-perl/Tk )"
-
-# texdoc needs luatex.
-PDEPEND=">=dev-tex/luatex-0.70"
-
-S="${WORKDIR}/${P}_build"
-B="${WORKDIR}/${MY_PV}"
-
-src_prepare() {
-	mkdir -p "${S}" || die "failed to create build dir"
-	mv "${WORKDIR}"/texmf* "${B}" || die "failed to move texmf files"
-
-	cd "${B}"
-	#EPATCH_MULTI_MSG="Applying patches from upstream bugfix branch..." EPATCH_SUFFIX="patch" epatch "${WORKDIR}/gentoo_branch2011_patches"
-	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
-
-	elibtoolize
-}
-
-src_configure() {
-	# It fails on alpha without this
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# Bug #265232 and bug #414271:
-	if use hppa; then
-		append-cppflags "-DU_IS_BIG_ENDIAN=1"
-	fi
-
-	# Too many regexps use A-Z a-z constructs, what causes problems with locales
-	# that don't have the same alphabetical order than ascii. Bug #242430
-	# So we set LC_ALL to C in order to avoid problems.
-	export LC_ALL=C
-	tc-export CC CXX AR
-	ECONF_SOURCE="${B}" \
-		econf -C \
-		--bindir=/usr/bin \
-		--datadir="${S}" \
-		--with-system-freetype2 \
-		--with-freetype2-include=/usr/include \
-		--with-system-zlib \
-		--with-system-libpng \
-		--with-system-xpdf \
-		--with-system-poppler \
-		--with-system-teckit \
-		--with-teckit-includes=/usr/include/teckit \
-		--with-system-graphite \
-		--with-system-kpathsea \
-		--with-system-icu \
-		--with-system-ptexenc \
-		--without-texinfo \
-		--disable-dialog \
-		--disable-multiplatform \
-		--enable-epsfwin \
-		--enable-mftalkwin \
-		--enable-regiswin \
-		--enable-tektronixwin \
-		--enable-unitermwin \
-		--with-ps=gs \
-		--disable-psutils \
-		--disable-t1utils \
-		--enable-ipc \
-		--disable-biber \
-		--disable-bibtexu \
-		--disable-dvipng \
-		--disable-dvipsk \
-		--disable-dvipdfmx \
-		--disable-chktex \
-		--disable-lcdf-typetools \
-		--disable-pdfopen \
-		--disable-ps2eps \
-		--disable-ps2pkm \
-		--disable-detex \
-		--disable-ttf2pk \
-		--disable-tex4htk \
-		--disable-cjkutils \
-		--disable-xdvik \
-		--disable-xindy \
-		--disable-luatex \
-		--disable-dvi2tty \
-		--disable-dvisvgm \
-		--disable-vlna \
-		--disable-xdvipdfmx \
-		--enable-shared \
-		--disable-native-texlive-build \
-		--disable-largefile \
-		$(use_enable xetex) \
-		$(use_enable cjk ptex) \
-		$(use_enable cjk eptex) \
-		$(use_enable cjk uptex) \
-		$(use_enable cjk euptex) \
-		$(use_enable cjk mendexk) \
-		$(use_enable cjk makejvf) \
-		$(use_with X x)
-}
-
-src_compile() {
-	emake SHELL=/bin/sh texmf=${TEXMF_PATH:-/usr/share/texmf} || die "emake failed"
-
-	cd "${B}"
-	# Mimic updmap --syncwithtrees to enable only fonts installed
-	# Code copied from updmap script
-	for i in `egrep '^(Mixed)?Map' "texmf/web2c/updmap.cfg" | sed 's@.* @@'`; do
-		texlive-common_is_file_present_in_texmf "$i" || echo "$i"
-	done > "${T}/updmap_update"
-	{
-		sed 's@/@\\/@g; s@^@/^MixedMap[     ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
-		sed 's@/@\\/@g; s@^@/^Map[  ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
-	} > "${T}/updmap_update2"
-	sed -f "${T}/updmap_update2" "texmf/web2c/updmap.cfg" >	"${T}/updmap_update3"\
-		&& cat "${T}/updmap_update3" > "texmf/web2c/updmap.cfg"
-}
-
-src_test() {
-	ewarn "Due to modular layout of texlive ebuilds,"
-	ewarn "It would not make much sense to use tests into the ebuild"
-	ewarn "And tests would fail anyway"
-	ewarn "Alternatively you can try to compile any tex file"
-	ewarn "Tex warnings should be considered as errors and reported"
-	ewarn "You can also run fmtutil-sys --all and check for errors/warnings there"
-}
-
-src_install() {
-	dodir ${TEXMF_PATH:-/usr/share/texmf}/web2c
-	emake DESTDIR="${D}" texmf="${D}${TEXMF_PATH:-/usr/share/texmf}" run_texlinks="true" run_mktexlsr="true" install || die "install failed"
-
-	cd "${B}"
-	dodir /usr/share # just in case
-	cp -pR texmf{,-dist} "${D}/usr/share/" || die "failed to install texmf trees"
-	cp -pR "${WORKDIR}"/tlpkg "${D}/usr/share/" || die "failed to install tlpkg files"
-
-	newsbin "${FILESDIR}/texmf-update2010" texmf-update
-
-	# When X is disabled mf-nowin doesn't exist but some scripts expect it to
-	# exist. Instead, it is called mf, so we symlink it to please everything.
-	use X || dosym mf /usr/bin/mf-nowin
-
-	docinto texk
-	cd "${B}/texk"
-	dodoc ChangeLog README || die "failed to install texk docs"
-
-	docinto dviljk
-	cd "${B}/texk/dviljk"
-	dodoc ChangeLog README NEWS || die "failed to install dviljk docs"
-
-	docinto makeindexk
-	cd "${B}/texk/makeindexk"
-	dodoc ChangeLog NOTES README || die "failed to install makeindexk docs"
-
-	docinto web2c
-	cd "${B}/texk/web2c"
-	dodoc ChangeLog NEWS PROJECTS README || die "failed to install web2c docs"
-
-	use doc || rm -rf "${D}/usr/share/texmf/doc"
-	use doc || rm -rf "${D}/usr/share/texmf-dist/doc"
-
-	dodir /etc/env.d
-	echo 'CONFIG_PROTECT_MASK="/etc/texmf/web2c /etc/texmf/language.dat.d /etc/texmf/language.def.d /etc/texmf/updmap.d"' > "${D}/etc/env.d/98texlive"
-	# populate /etc/texmf
-	keepdir /etc/texmf/web2c
-
-	# take care of updmap.cfg and language.d files
-	keepdir /etc/texmf/{updmap.d,language.dat.d,language.def.d,language.dat.lua.d}
-
-	mv "${D}${TEXMF_PATH}/web2c/updmap.cfg"	"${D}/etc/texmf/updmap.d/00updmap.cfg" || die "moving updmap.cfg failed"
-
-	# Remove fmtutil.cnf, it will be regenerated from /etc/texmf/fmtutil.d files
-	# by texmf-update
-	rm -f "${D}${TEXMF_PATH}/web2c/fmtutil.cnf"
-	# Remove bundled and invalid updmap.cfg
-	rm -f "${D}/usr/share/texmf-dist/web2c/updmap.cfg"
-
-	texlive-common_handle_config_files
-
-	keepdir /usr/share/texmf-site
-
-	# the virtex symlink is not installed
-	# The links has to be relative, since the targets
-	# is not present at this stage and MacOS doesn't
-	# like non-existing targets
-	dosym tex /usr/bin/virtex
-	dosym pdftex /usr/bin/pdfvirtex
-
-	# Remove texdoctk if we don't want it
-	if ! use tk ; then
-		rm -f "${D}/usr/bin/texdoctk" "${D}/usr/share/texmf/scripts/tetex/texdoctk.pl" "${D}/usr/share/man/man1/texdoctk.1" || die "failed to remove texdoc tk!"
-	fi
-
-	# Rename mpost to leave room for mplib
-	mv "${D}/usr/bin/mpost" "${D}/usr/bin/mpost-${P}"
-	dosym "mpost-${P}" /usr/bin/mpost
-
-	# Ditto for pdftex
-	mv "${D}/usr/bin/pdftex" "${D}/usr/bin/pdftex-${P}"
-	dosym "pdftex-${P}" /usr/bin/pdftex
-}
-
-pkg_preinst() {
-	# Remove stray files to keep the upgrade path sane
-	if has_version =app-text/texlive-core-2007* ; then
-		for i in pdftex/pdflatex aleph/aleph aleph/lamed omega/lambda omega/omega xetex/xetex xetex/xelatex tex/tex pdftex/etex pdftex/pdftex pdftex/pdfetex ; do
-			for j in log fmt ; do
-				local file="${ROOT}/var/lib/texmf/web2c/${i}.${j}"
-				if [ -f "${file}" ] ; then
-					elog "Removing stray ${file} from TeXLive 2007 install."
-					rm -f "${file}"
-				fi
-			done
-		done
-		for j in base log ; do
-			local file="${ROOT}/var/lib/texmf/web2c/metafont/mf.${j}"
-			if [ -f "${file}" ] ; then
-				elog "Removing stray ${file} from TeXLive 2007 install."
-				rm -f "${file}"
-			fi
-		done
-	fi
-}
-
-pkg_postinst() {
-	etexmf-update
-
-	elog
-	elog "If you have configuration files in /etc/texmf to merge,"
-	elog "please update them and run /usr/sbin/texmf-update."
-	elog
-	ewarn "If you are migrating from an older TeX distribution"
-	ewarn "Please make sure you have read:"
-	ewarn "https://wiki.gentoo.org/wiki/Project:TeX/Tex_Live_Migration_Guide"
-	ewarn "in order to avoid possible problems"
-	elog
-	elog "TeXLive has been split in various ebuilds. If you are missing a"
-	elog "package to process your TeX documents, you can install"
-	elog "dev-tex/texmfind to easily search for them."
-	elog
-}

diff --git a/app-text/texlive-core/texlive-core-2013-r1.ebuild b/app-text/texlive-core/texlive-core-2013-r1.ebuild
deleted file mode 100644
index 73ee55a5b7..0000000000
--- a/app-text/texlive-core/texlive-core-2013-r1.ebuild
+++ /dev/null
@@ -1,354 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-#TL_UPSTREAM_PATCHLEVEL="1"
-PATCHLEVEL="41"
-TL_SOURCE_VERSION=20130530
-
-inherit eutils flag-o-matic toolchain-funcs libtool texlive-common
-
-MY_PV=${PN%-core}-${TL_SOURCE_VERSION}-source
-
-DESCRIPTION="A complete TeX distribution"
-HOMEPAGE="http://tug.org/texlive/"
-SLOT="0"
-LICENSE="GPL-2 LPPL-1.3c TeX"
-
-SRC_URI="mirror://gentoo/${MY_PV}.tar.xz"
-
-# Fetch patches
-SRC_URI="${SRC_URI} mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.xz"
-#	mirror://gentoo/texlive-core-upstream-patches-${TL_UPSTREAM_PATCHLEVEL}.tar.xz"
-
-TL_CORE_BINEXTRA_MODULES="
-	a2ping adhocfilelist asymptote bundledoc ctanify ctanupload ctie cweb
-	de-macro dtl dtxgen dvi2tty dviasm dvicopy dvidvi dviljk dvipos findhyph
-	fragmaster hyphenex installfont lacheck latex2man latexfileversion
-	latexpand ltxfileinfo listings-ext match_parens mkjobtexmf patgen pdfcrop
-	pdftools pfarrei pkfix pkfix-helper purifyeps seetexk sty2dtx synctex
-	texcount texdef texdiff texdirflatten texdoc texliveonfly texloganalyser
-	texware tie tpic2pdftex typeoutfileinfo web	collection-binextra
-	"
-TL_CORE_BINEXTRA_DOC_MODULES="
-	a2ping.doc adhocfilelist.doc asymptote.doc bundledoc.doc ctanify.doc
-	ctanupload.doc ctie.doc cweb.doc de-macro.doc dtxgen.doc dvi2tty.doc
-	dvicopy.doc	dviljk.doc dvipos.doc findhyph.doc fragmaster.doc
-	installfont.doc	latex2man.doc latexfileversion.doc latexpand.doc
-	ltxfileinfo.doc listings-ext.doc match_parens.doc mkjobtexmf.doc patgen.doc
-	pdfcrop.doc pdftools.doc pfarrei.doc pkfix.doc pkfix-helper.doc
-	purifyeps.doc sty2dtx.doc synctex.doc texcount.doc texdef.doc texdiff.doc
-	texdirflatten.doc texdoc.doc texliveonfly.doc texloganalyser.doc texware.doc
-	tie.doc tpic2pdftex.doc	typeoutfileinfo web.doc
-	"
-TL_CORE_BINEXTRA_SRC_MODULES="
-	adhocfilelist.source hyphenex.source listings-ext.source mkjobtexmf.source
-	pfarrei.source texdef.source
-	"
-
-TL_CORE_EXTRA_MODULES="tetex hyphen-base texconfig gsftopk texlive.infra ${TL_CORE_BINEXTRA_MODULES}"
-TL_CORE_EXTRA_DOC_MODULES="tetex.doc texconfig.doc gsftopk.doc texlive.infra.doc ${TL_CORE_BINEXTRA_DOC_MODULES}"
-TL_CORE_EXTRA_SRC_MODULES="${TL_CORE_BINEXTRA_SRC_MODULES}"
-
-for i in ${TL_CORE_EXTRA_MODULES}; do
-	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.tar.xz"
-done
-
-SRC_URI="${SRC_URI} doc? ( "
-for i in ${TL_CORE_EXTRA_DOC_MODULES}; do
-	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.tar.xz"
-done
-SRC_URI="${SRC_URI} )"
-SRC_URI="${SRC_URI} source? ( "
-for i in ${TL_CORE_EXTRA_SRC_MODULES}; do
-	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.tar.xz"
-done
-SRC_URI="${SRC_URI} )"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="cjk X doc source tk xetex"
-
-TEXMF_PATH=/usr/share/texmf-dist
-
-MODULAR_X_DEPEND="X? (
-				x11-libs/libXmu
-				x11-libs/libXp
-				x11-libs/libXpm
-				x11-libs/libXaw
-	)"
-
-COMMON_DEPEND="${MODULAR_X_DEPEND}
-	!app-text/ptex
-	!app-text/tetex
-	!<app-text/texlive-2007
-	!app-text/xetex
-	!<dev-texlive/texlive-basic-2013
-	!<dev-texlive/texlive-metapost-2011
-	!app-text/dvibook
-	sys-libs/zlib
-	>=media-libs/libpng-1.2.43-r2:0=
-	>=app-text/poppler-0.12.3-r3:=
-	>=x11-libs/cairo-1.12
-	>=x11-libs/pixman-0.18
-	xetex? (
-		>=media-libs/harfbuzz-0.9.20[icu,graphite]
-		>=dev-libs/icu-50:=
-		app-text/teckit
-		media-libs/fontconfig
-		media-gfx/graphite2
-		media-libs/freetype:2
-	)
-	>=dev-libs/kpathsea-6.1.1_p20130530
-	cjk? ( >=dev-libs/ptexenc-1.3.1_p20130530 )"
-
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	sys-apps/ed
-	sys-devel/flex
-	app-arch/xz-utils"
-
-RDEPEND="${COMMON_DEPEND}
-	>=app-text/ps2pkm-1.5_p20130530
-	>=app-text/dvipsk-5.993_p20130530
-	>=dev-tex/bibtexu-3.71_p20130530
-	virtual/perl-Getopt-Long
-	xetex? ( >=app-text/xdvipdfmx-0.7.9_p20130530 )
-	tk? ( dev-perl/Tk )"
-
-# texdoc needs luatex.
-PDEPEND=">=dev-tex/luatex-0.76"
-
-S="${WORKDIR}/${P}_build"
-B="${WORKDIR}/${MY_PV}"
-
-src_unpack() {
-	unpack ${A}
-	mkdir -p "${S}" || die "failed to create build dir"
-}
-
-RELOC_TARGET=texmf-dist
-
-src_prepare() {
-	cd "${WORKDIR}"
-	# From texlive-module.eclass.
-	grep -H RELOC tlpkg/tlpobj/* | awk '{print $2}' | sed 's#^RELOC/##' > "${T}/reloclist"
-	{ for i in $(<"${T}/reloclist"); do  dirname $i; done; } | uniq > "${T}/dirlist"
-	for i in $(<"${T}/dirlist"); do
-		[ -d "${RELOC_TARGET}/${i}" ] || mkdir -p "${RELOC_TARGET}/${i}"
-	done
-	for i in $(<"${T}/reloclist"); do
-		mv "${i}" "${RELOC_TARGET}"/$(dirname "${i}") || die "failed to relocate ${i} to ${RELOC_TARGET}/$(dirname ${i})"
-	done
-
-	mv "${WORKDIR}"/texmf* "${B}" || die "failed to move texmf files"
-
-	cd "${B}"
-	#EPATCH_MULTI_MSG="Applying patches from upstream bugfix branch..." EPATCH_SUFFIX="patch" epatch "${WORKDIR}/gentoo_branch2011_patches"
-	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
-
-	elibtoolize
-}
-
-src_configure() {
-	# It fails on alpha without this
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# Too many regexps use A-Z a-z constructs, what causes problems with locales
-	# that don't have the same alphabetical order than ascii. Bug #242430
-	# So we set LC_ALL to C in order to avoid problems.
-	export LC_ALL=C
-	tc-export CC CXX AR RANLIB
-	ECONF_SOURCE="${B}" \
-		econf -C \
-		--bindir="${EPREFIX}"/usr/bin \
-		--datadir="${S}" \
-		--with-system-freetype2 \
-		--with-system-zlib \
-		--with-system-libpng \
-		--with-system-xpdf \
-		--with-system-poppler \
-		--with-system-teckit \
-		--with-teckit-includes="${EPREFIX}"/usr/include/teckit \
-		--with-system-kpathsea \
-		--with-kpathsea-includes="${EPREFIX}"/usr/include \
-		--with-system-icu \
-		--with-system-ptexenc \
-		--with-system-harfbuzz \
-		--with-system-icu \
-		--with-system-graphite2 \
-		--with-system-cairo \
-		--with-system-pixman \
-		--without-texinfo \
-		--disable-dialog \
-		--disable-multiplatform \
-		--enable-epsfwin \
-		--enable-mftalkwin \
-		--enable-regiswin \
-		--enable-tektronixwin \
-		--enable-unitermwin \
-		--with-ps=gs \
-		--disable-psutils \
-		--disable-t1utils \
-		--enable-ipc \
-		--disable-biber \
-		--disable-bibtex-x \
-		--disable-dvipng \
-		--disable-dvipsk \
-		--disable-dvipdfmx \
-		--disable-chktex \
-		--disable-lcdf-typetools \
-		--disable-pdfopen \
-		--disable-ps2eps \
-		--disable-ps2pkm \
-		--disable-detex \
-		--disable-ttf2pk \
-		--disable-tex4htk \
-		--disable-cjkutils \
-		--disable-xdvik \
-		--disable-xindy \
-		--disable-luatex \
-		--disable-dvi2tty \
-		--disable-dvisvgm \
-		--disable-vlna \
-		--disable-xdvipdfmx \
-		--enable-shared \
-		--disable-native-texlive-build \
-		--disable-largefile \
-		$(use_enable xetex) \
-		$(use_enable cjk ptex) \
-		$(use_enable cjk eptex) \
-		$(use_enable cjk uptex) \
-		$(use_enable cjk euptex) \
-		$(use_enable cjk mendexk) \
-		$(use_enable cjk makejvf) \
-		$(use_enable tk texdoctk) \
-		$(use_with X x)
-}
-
-src_compile() {
-	tc-export CC CXX AR RANLIB
-	emake SHELL="${EPREFIX}"/bin/sh texmf="${EPREFIX}"${TEXMF_PATH:-/usr/share/texmf-dist} || die "emake failed"
-
-	cd "${B}"
-	# Mimic updmap --syncwithtrees to enable only fonts installed
-	# Code copied from updmap script
-	for i in `egrep '^(Mixed|Kanji)?Map' "texmf-dist/web2c/updmap.cfg" | sed 's@.* @@'`; do
-		texlive-common_is_file_present_in_texmf "$i" || echo "$i"
-	done > "${T}/updmap_update"
-	{
-		sed 's@/@\\/@g; s@^@/^MixedMap[     ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
-		sed 's@/@\\/@g; s@^@/^Map[  ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
-		sed 's@/@\\/@g; s@^@/^KanjiMap[     ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
-	} > "${T}/updmap_update2"
-	sed -f "${T}/updmap_update2" "texmf-dist/web2c/updmap.cfg" >	"${T}/updmap_update3"\
-		&& cat "${T}/updmap_update3" > "texmf-dist/web2c/updmap.cfg"
-}
-
-src_install() {
-	dodir ${TEXMF_PATH:-/usr/share/texmf-dist}/web2c
-	emake DESTDIR="${D}" texmf="${ED}${TEXMF_PATH:-/usr/share/texmf-dist}" run_texlinks="true" run_mktexlsr="true" install || die "install failed"
-
-	cd "${B}"
-	dodir /usr/share # just in case
-	cp -pR texmf-dist "${ED}/usr/share/" || die "failed to install texmf trees"
-	cp -pR "${WORKDIR}"/tlpkg "${ED}/usr/share/" || die "failed to install tlpkg files"
-
-	# When X is disabled mf-nowin doesn't exist but some scripts expect it to
-	# exist. Instead, it is called mf, so we symlink it to please everything.
-	use X || dosym mf /usr/bin/mf-nowin
-
-	docinto texk
-	cd "${B}/texk"
-	dodoc ChangeLog README || die "failed to install texk docs"
-
-	docinto dviljk
-	cd "${B}/texk/dviljk"
-	dodoc ChangeLog README NEWS || die "failed to install dviljk docs"
-
-	docinto makeindexk
-	cd "${B}/texk/makeindexk"
-	dodoc ChangeLog NOTES README || die "failed to install makeindexk docs"
-
-	docinto web2c
-	cd "${B}/texk/web2c"
-	dodoc ChangeLog NEWS PROJECTS README || die "failed to install web2c docs"
-
-	use doc || rm -rf "${ED}/usr/share/texmf-dist/doc"
-
-	dodir /etc/env.d
-	echo 'CONFIG_PROTECT_MASK="/etc/texmf/web2c /etc/texmf/language.dat.d /etc/texmf/language.def.d /etc/texmf/updmap.d"' > "${ED}/etc/env.d/98texlive"
-	# populate /etc/texmf
-	keepdir /etc/texmf/web2c
-
-	# take care of updmap.cfg and language.d files
-	keepdir /etc/texmf/{updmap.d,language.dat.d,language.def.d,language.dat.lua.d}
-
-	mv "${ED}${TEXMF_PATH}/web2c/updmap.cfg" "${ED}/etc/texmf/updmap.d/00updmap.cfg" || die "moving updmap.cfg failed"
-
-	# Remove fmtutil.cnf, it will be regenerated from /etc/texmf/fmtutil.d files
-	# by texmf-update
-	rm -f "${ED}${TEXMF_PATH}/web2c/fmtutil.cnf"
-	# Remove bundled and invalid updmap.cfg
-	rm -f "${ED}/usr/share/texmf-dist/web2c/updmap.cfg"
-
-	texlive-common_handle_config_files
-
-	keepdir /usr/share/texmf-site
-
-	# the virtex symlink is not installed
-	# The links has to be relative, since the targets
-	# is not present at this stage and MacOS doesn't
-	# like non-existing targets
-	dosym tex /usr/bin/virtex
-	dosym pdftex /usr/bin/pdfvirtex
-
-	# Rename mpost to leave room for mplib
-	mv "${ED}/usr/bin/mpost" "${ED}/usr/bin/mpost-${P}"
-	dosym "mpost-${P}" /usr/bin/mpost
-
-	# Ditto for pdftex
-	mv "${ED}/usr/bin/pdftex" "${ED}/usr/bin/pdftex-${P}"
-	dosym "pdftex-${P}" /usr/bin/pdftex
-}
-
-pkg_preinst() {
-	# Remove stray files to keep the upgrade path sane
-	if has_version =app-text/texlive-core-2007* ; then
-		for i in pdftex/pdflatex aleph/aleph aleph/lamed omega/lambda omega/omega xetex/xetex xetex/xelatex tex/tex pdftex/etex pdftex/pdftex pdftex/pdfetex ; do
-			for j in log fmt ; do
-				local file="${EROOT}/var/lib/texmf/web2c/${i}.${j}"
-				if [ -f "${file}" ] ; then
-					elog "Removing stray ${file} from TeXLive 2007 install."
-					rm -f "${file}"
-				fi
-			done
-		done
-		for j in base log ; do
-			local file="${EROOT}/var/lib/texmf/web2c/metafont/mf.${j}"
-			if [ -f "${file}" ] ; then
-				elog "Removing stray ${file} from TeXLive 2007 install."
-				rm -f "${file}"
-			fi
-		done
-	fi
-}
-
-pkg_postinst() {
-	etexmf-update
-
-	elog
-	elog "If you have configuration files in ${EPREFIX}/etc/texmf to merge,"
-	elog "please update them and run ${EPREFIX}/usr/sbin/texmf-update."
-	elog
-	ewarn "If you are migrating from an older TeX distribution"
-	ewarn "Please make sure you have read:"
-	ewarn "https://wiki.gentoo.org/wiki/Project:TeX/Tex_Live_Migration_Guide"
-	ewarn "in order to avoid possible problems"
-	elog
-	elog "TeXLive has been split in various ebuilds. If you are missing a"
-	elog "package to process your TeX documents, you can install"
-	elog "dev-tex/texmfind to easily search for them."
-	elog
-}

diff --git a/app-text/texlive-core/texlive-core-2014-r1.ebuild b/app-text/texlive-core/texlive-core-2014-r1.ebuild
deleted file mode 100644
index af04449573..0000000000
--- a/app-text/texlive-core/texlive-core-2014-r1.ebuild
+++ /dev/null
@@ -1,336 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-#TL_UPSTREAM_PATCHLEVEL="1"
-PATCHLEVEL="42"
-TL_SOURCE_VERSION=20140525
-
-inherit eutils flag-o-matic toolchain-funcs libtool texlive-common
-
-MY_PV=${PN%-core}-${TL_SOURCE_VERSION}-source
-
-DESCRIPTION="A complete TeX distribution"
-HOMEPAGE="http://tug.org/texlive/"
-SLOT="0"
-LICENSE="GPL-2 LPPL-1.3c TeX"
-
-SRC_URI="mirror://gentoo/${MY_PV}.tar.xz"
-
-# Fetch patches
-SRC_URI="${SRC_URI} mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.xz"
-#	mirror://gentoo/texlive-core-upstream-patches-${TL_UPSTREAM_PATCHLEVEL}.tar.xz"
-
-TL_CORE_BINEXTRA_MODULES="
-	a2ping adhocfilelist asymptote bundledoc ctanify ctanupload ctie cweb
-	de-macro dtl dtxgen dvi2tty dviasm dvicopy dvidvi dviljk dvipos findhyph
-	fragmaster hyphenex installfont lacheck latex-git-log latex2man
-	latexfileversion latexpand latexindent ltxfileinfo ltximg listings-ext
-	match_parens mkjobtexmf patgen pdfcrop pdftools pfarrei pkfix pkfix-helper
-	purifyeps seetexk sty2dtx synctex texcount texdef texdiff texdirflatten
-	texdoc texliveonfly texloganalyser texware tie tpic2pdftex typeoutfileinfo
-	web collection-binextra
-	"
-TL_CORE_BINEXTRA_DOC_MODULES="
-	a2ping.doc adhocfilelist.doc asymptote.doc bundledoc.doc ctanify.doc
-	ctanupload.doc ctie.doc cweb.doc de-macro.doc dtxgen.doc dvi2tty.doc
-	dvicopy.doc	dviljk.doc dvipos.doc findhyph.doc fragmaster.doc
-	installfont.doc	latex-git-log.doc latex2man.doc latexfileversion.doc
-	latexpand.doc latexindent.doc ltxfileinfo.doc ltximg.doc listings-ext.doc
-	match_parens.doc mkjobtexmf.doc patgen.doc pdfcrop.doc pdftools.doc
-	pfarrei.doc pkfix.doc pkfix-helper.doc purifyeps.doc sty2dtx.doc synctex.doc
-	texcount.doc texdef.doc texdiff.doc texdirflatten.doc texdoc.doc
-	texliveonfly.doc texloganalyser.doc texware.doc tie.doc tpic2pdftex.doc
-	typeoutfileinfo.doc web.doc
-	"
-TL_CORE_BINEXTRA_SRC_MODULES="
-	adhocfilelist.source hyphenex.source listings-ext.source mkjobtexmf.source
-	pfarrei.source texdef.source
-	"
-
-TL_CORE_EXTRA_MODULES="tetex hyphen-base texconfig gsftopk texlive.infra ${TL_CORE_BINEXTRA_MODULES}"
-TL_CORE_EXTRA_DOC_MODULES="tetex.doc texconfig.doc gsftopk.doc texlive.infra.doc ${TL_CORE_BINEXTRA_DOC_MODULES}"
-TL_CORE_EXTRA_SRC_MODULES="${TL_CORE_BINEXTRA_SRC_MODULES}"
-
-for i in ${TL_CORE_EXTRA_MODULES}; do
-	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.tar.xz"
-done
-
-SRC_URI="${SRC_URI} doc? ( "
-for i in ${TL_CORE_EXTRA_DOC_MODULES}; do
-	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.tar.xz"
-done
-SRC_URI="${SRC_URI} )"
-SRC_URI="${SRC_URI} source? ( "
-for i in ${TL_CORE_EXTRA_SRC_MODULES}; do
-	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.tar.xz"
-done
-SRC_URI="${SRC_URI} )"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="cjk X doc source tk xetex"
-
-TEXMF_PATH=/usr/share/texmf-dist
-
-MODULAR_X_DEPEND="X? (
-				x11-libs/libXmu
-				x11-libs/libXp
-				x11-libs/libXpm
-				x11-libs/libXaw
-	)"
-
-COMMON_DEPEND="${MODULAR_X_DEPEND}
-	!app-text/ptex
-	!app-text/tetex
-	!<app-text/texlive-2007
-	!app-text/xetex
-	!<dev-texlive/texlive-basic-2014
-	!<dev-texlive/texlive-metapost-2011
-	!app-text/dvibook
-	!dev-tex/luatex
-	!app-text/dvipdfm
-	!app-text/dvipdfmx
-	!app-text/xdvipdfmx
-	sys-libs/zlib
-	>=media-libs/libpng-1.2.43-r2:0=
-	>=app-text/poppler-0.12.3-r3:=
-	>=x11-libs/cairo-1.12
-	>=x11-libs/pixman-0.18
-	dev-libs/zziplib
-	app-text/libpaper
-	xetex? (
-		>=media-libs/harfbuzz-0.9.20[icu,graphite]
-		>=dev-libs/icu-50:=
-		app-text/teckit
-		media-libs/fontconfig
-		media-gfx/graphite2
-	)
-	media-libs/freetype:2
-	>=dev-libs/kpathsea-6.2.0
-	cjk? ( >=dev-libs/ptexenc-1.3.2_p20140525-r1 )"
-
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	sys-apps/ed
-	sys-devel/flex
-	app-arch/xz-utils"
-
-RDEPEND="${COMMON_DEPEND}
-	>=app-text/ps2pkm-1.5_p20130530
-	>=app-text/dvipsk-5.993_p20130530
-	>=dev-tex/bibtexu-3.71_p20130530
-	virtual/perl-Getopt-Long
-	tk? ( dev-perl/Tk )"
-
-S="${WORKDIR}/${P}_build"
-B="${WORKDIR}/${MY_PV}"
-
-src_unpack() {
-	unpack ${A}
-	mkdir -p "${S}" || die "failed to create build dir"
-}
-
-RELOC_TARGET=texmf-dist
-
-src_prepare() {
-	cd "${WORKDIR}"
-	# From texlive-module.eclass.
-	grep -H RELOC tlpkg/tlpobj/* | awk '{print $2}' | sed 's#^RELOC/##' > "${T}/reloclist"
-	{ for i in $(<"${T}/reloclist"); do  dirname $i; done; } | uniq > "${T}/dirlist"
-	for i in $(<"${T}/dirlist"); do
-		[ -d "${RELOC_TARGET}/${i}" ] || mkdir -p "${RELOC_TARGET}/${i}"
-	done
-	for i in $(<"${T}/reloclist"); do
-		mv "${i}" "${RELOC_TARGET}"/$(dirname "${i}") || die "failed to relocate ${i} to ${RELOC_TARGET}/$(dirname ${i})"
-	done
-
-	mv "${WORKDIR}"/texmf* "${B}" || die "failed to move texmf files"
-
-	cd "${B}"
-	#EPATCH_MULTI_MSG="Applying patches from upstream bugfix branch..." EPATCH_SUFFIX="patch" epatch "${WORKDIR}/gentoo_branch2011_patches"
-	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
-
-	elibtoolize
-}
-
-src_configure() {
-	# It fails on alpha without this
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# Too many regexps use A-Z a-z constructs, what causes problems with locales
-	# that don't have the same alphabetical order than ascii. Bug #242430
-	# So we set LC_ALL to C in order to avoid problems.
-	export LC_ALL=C
-	tc-export CC CXX AR RANLIB
-	ECONF_SOURCE="${B}" \
-		econf -C \
-		--bindir="${EPREFIX}"/usr/bin \
-		--datadir="${S}" \
-		--with-system-freetype2 \
-		--with-system-zlib \
-		--with-system-libpng \
-		--with-system-xpdf \
-		--with-system-poppler \
-		--with-system-teckit \
-		--with-teckit-includes="${EPREFIX}"/usr/include/teckit \
-		--with-system-kpathsea \
-		--with-kpathsea-includes="${EPREFIX}"/usr/include \
-		--with-system-icu \
-		--with-system-ptexenc \
-		--with-system-harfbuzz \
-		--with-system-icu \
-		--with-system-graphite2 \
-		--with-system-cairo \
-		--with-system-pixman \
-		--with-system-zziplib \
-		--with-system-libpaper \
-		--without-texinfo \
-		--disable-dialog \
-		--disable-multiplatform \
-		--enable-epsfwin \
-		--enable-mftalkwin \
-		--enable-regiswin \
-		--enable-tektronixwin \
-		--enable-unitermwin \
-		--with-ps=gs \
-		--disable-psutils \
-		--disable-t1utils \
-		--enable-ipc \
-		--disable-biber \
-		--disable-bibtex-x \
-		--disable-dvipng \
-		--disable-dvipsk \
-		--disable-chktex \
-		--disable-lcdf-typetools \
-		--disable-pdfopen \
-		--disable-ps2eps \
-		--disable-ps2pkm \
-		--disable-detex \
-		--disable-ttf2pk2 \
-		--disable-tex4htk \
-		--disable-cjkutils \
-		--disable-xdvik \
-		--disable-xindy \
-		--enable-luatex \
-		--disable-dvi2tty \
-		--disable-dvisvgm \
-		--disable-vlna \
-		--enable-shared \
-		--disable-native-texlive-build \
-		--disable-largefile \
-		$(use_enable xetex) \
-		$(use_enable cjk ptex) \
-		$(use_enable cjk eptex) \
-		$(use_enable cjk uptex) \
-		$(use_enable cjk euptex) \
-		$(use_enable cjk mendexk) \
-		$(use_enable cjk makejvf) \
-		$(use_enable tk texdoctk) \
-		$(use_with X x)
-}
-
-src_compile() {
-	tc-export CC CXX AR RANLIB
-	emake SHELL="${EPREFIX}"/bin/sh texmf="${EPREFIX}"${TEXMF_PATH:-/usr/share/texmf-dist} || die "emake failed"
-
-	cd "${B}"
-	# Mimic updmap --syncwithtrees to enable only fonts installed
-	# Code copied from updmap script
-	for i in `egrep '^(Mixed|Kanji)?Map' "texmf-dist/web2c/updmap.cfg" | sed 's@.* @@'`; do
-		texlive-common_is_file_present_in_texmf "$i" || echo "$i"
-	done > "${T}/updmap_update"
-	{
-		sed 's@/@\\/@g; s@^@/^MixedMap[     ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
-		sed 's@/@\\/@g; s@^@/^Map[  ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
-		sed 's@/@\\/@g; s@^@/^KanjiMap[     ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
-	} > "${T}/updmap_update2"
-	sed -f "${T}/updmap_update2" "texmf-dist/web2c/updmap.cfg" >	"${T}/updmap_update3"\
-		&& cat "${T}/updmap_update3" > "texmf-dist/web2c/updmap.cfg"
-}
-
-src_install() {
-	dodir ${TEXMF_PATH:-/usr/share/texmf-dist}/web2c
-	emake DESTDIR="${D}" texmf="${ED}${TEXMF_PATH:-/usr/share/texmf-dist}" run_texlinks="true" run_mktexlsr="true" install || die "install failed"
-
-	cd "${B}"
-	dodir /usr/share # just in case
-	cp -pR texmf-dist "${ED}/usr/share/" || die "failed to install texmf trees"
-	cp -pR "${WORKDIR}"/tlpkg "${ED}/usr/share/" || die "failed to install tlpkg files"
-
-	# When X is disabled mf-nowin doesn't exist but some scripts expect it to
-	# exist. Instead, it is called mf, so we symlink it to please everything.
-	use X || dosym mf /usr/bin/mf-nowin
-
-	docinto texk
-	cd "${B}/texk"
-	dodoc ChangeLog README || die "failed to install texk docs"
-
-	docinto dviljk
-	cd "${B}/texk/dviljk"
-	dodoc ChangeLog README NEWS || die "failed to install dviljk docs"
-
-	docinto makeindexk
-	cd "${B}/texk/makeindexk"
-	dodoc ChangeLog NOTES README || die "failed to install makeindexk docs"
-
-	docinto web2c
-	cd "${B}/texk/web2c"
-	dodoc ChangeLog NEWS PROJECTS README || die "failed to install web2c docs"
-
-	use doc || rm -rf "${ED}/usr/share/texmf-dist/doc"
-
-	dodir /etc/env.d
-	echo 'CONFIG_PROTECT_MASK="/etc/texmf/web2c /etc/texmf/language.dat.d /etc/texmf/language.def.d /etc/texmf/updmap.d"' > "${ED}/etc/env.d/98texlive"
-	# populate /etc/texmf
-	keepdir /etc/texmf/web2c
-
-	# take care of updmap.cfg and language.d files
-	keepdir /etc/texmf/{updmap.d,language.dat.d,language.def.d,language.dat.lua.d}
-
-	mv "${ED}${TEXMF_PATH}/web2c/updmap.cfg" "${ED}/etc/texmf/updmap.d/00updmap.cfg" || die "moving updmap.cfg failed"
-
-	# Remove fmtutil.cnf, it will be regenerated from /etc/texmf/fmtutil.d files
-	# by texmf-update
-	rm -f "${ED}${TEXMF_PATH}/web2c/fmtutil.cnf"
-	# Remove bundled and invalid updmap.cfg
-	rm -f "${ED}/usr/share/texmf-dist/web2c/updmap.cfg"
-
-	texlive-common_handle_config_files
-
-	keepdir /usr/share/texmf-site
-
-	# the virtex symlink is not installed
-	# The links has to be relative, since the targets
-	# is not present at this stage and MacOS doesn't
-	# like non-existing targets
-	dosym tex /usr/bin/virtex
-	dosym pdftex /usr/bin/pdfvirtex
-
-	# Rename mpost to leave room for mplib
-	mv "${ED}/usr/bin/mpost" "${ED}/usr/bin/mpost-${P}"
-	dosym "mpost-${P}" /usr/bin/mpost
-
-	# Ditto for pdftex
-	mv "${ED}/usr/bin/pdftex" "${ED}/usr/bin/pdftex-${P}"
-	dosym "pdftex-${P}" /usr/bin/pdftex
-}
-
-pkg_postinst() {
-	etexmf-update
-
-	elog
-	elog "If you have configuration files in ${EPREFIX}/etc/texmf to merge,"
-	elog "please update them and run ${EPREFIX}/usr/sbin/texmf-update."
-	elog
-	ewarn "If you are migrating from an older TeX distribution"
-	ewarn "Please make sure you have read:"
-	ewarn "https://wiki.gentoo.org/wiki/Project:TeX/Tex_Live_Migration_Guide"
-	ewarn "in order to avoid possible problems"
-	elog
-	elog "TeXLive has been split in various ebuilds. If you are missing a"
-	elog "package to process your TeX documents, you can install"
-	elog "dev-tex/texmfind to easily search for them."
-	elog
-}

diff --git a/app-text/texlive-core/texlive-core-2014-r3.ebuild b/app-text/texlive-core/texlive-core-2014-r3.ebuild
deleted file mode 100644
index 3e439e3383..0000000000
--- a/app-text/texlive-core/texlive-core-2014-r3.ebuild
+++ /dev/null
@@ -1,336 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-#TL_UPSTREAM_PATCHLEVEL="1"
-PATCHLEVEL="47"
-TL_SOURCE_VERSION=20140525
-
-inherit eutils flag-o-matic toolchain-funcs libtool texlive-common
-
-MY_PV=${PN%-core}-${TL_SOURCE_VERSION}-source
-
-DESCRIPTION="A complete TeX distribution"
-HOMEPAGE="http://tug.org/texlive/"
-SLOT="0"
-LICENSE="GPL-2 LPPL-1.3c TeX"
-
-SRC_URI="mirror://gentoo/${MY_PV}.tar.xz"
-
-# Fetch patches
-SRC_URI="${SRC_URI} mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.xz"
-#	mirror://gentoo/texlive-core-upstream-patches-${TL_UPSTREAM_PATCHLEVEL}.tar.xz"
-
-TL_CORE_BINEXTRA_MODULES="
-	a2ping adhocfilelist asymptote bundledoc ctanify ctanupload ctie cweb
-	de-macro dtl dtxgen dvi2tty dviasm dvicopy dvidvi dviljk dvipos findhyph
-	fragmaster hyphenex installfont lacheck latex-git-log latex2man
-	latexfileversion latexpand latexindent ltxfileinfo ltximg listings-ext
-	match_parens mkjobtexmf patgen pdfcrop pdftools pfarrei pkfix pkfix-helper
-	purifyeps seetexk sty2dtx synctex texcount texdef texdiff texdirflatten
-	texdoc texliveonfly texloganalyser texware tie tpic2pdftex typeoutfileinfo
-	web collection-binextra
-	"
-TL_CORE_BINEXTRA_DOC_MODULES="
-	a2ping.doc adhocfilelist.doc asymptote.doc bundledoc.doc ctanify.doc
-	ctanupload.doc ctie.doc cweb.doc de-macro.doc dtxgen.doc dvi2tty.doc
-	dvicopy.doc	dviljk.doc dvipos.doc findhyph.doc fragmaster.doc
-	installfont.doc	latex-git-log.doc latex2man.doc latexfileversion.doc
-	latexpand.doc latexindent.doc ltxfileinfo.doc ltximg.doc listings-ext.doc
-	match_parens.doc mkjobtexmf.doc patgen.doc pdfcrop.doc pdftools.doc
-	pfarrei.doc pkfix.doc pkfix-helper.doc purifyeps.doc sty2dtx.doc synctex.doc
-	texcount.doc texdef.doc texdiff.doc texdirflatten.doc texdoc.doc
-	texliveonfly.doc texloganalyser.doc texware.doc tie.doc tpic2pdftex.doc
-	typeoutfileinfo.doc web.doc
-	"
-TL_CORE_BINEXTRA_SRC_MODULES="
-	adhocfilelist.source hyphenex.source listings-ext.source mkjobtexmf.source
-	pfarrei.source texdef.source
-	"
-
-TL_CORE_EXTRA_MODULES="tetex hyphen-base texconfig gsftopk texlive.infra ${TL_CORE_BINEXTRA_MODULES}"
-TL_CORE_EXTRA_DOC_MODULES="tetex.doc texconfig.doc gsftopk.doc texlive.infra.doc ${TL_CORE_BINEXTRA_DOC_MODULES}"
-TL_CORE_EXTRA_SRC_MODULES="${TL_CORE_BINEXTRA_SRC_MODULES}"
-
-for i in ${TL_CORE_EXTRA_MODULES}; do
-	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.tar.xz"
-done
-
-SRC_URI="${SRC_URI} doc? ( "
-for i in ${TL_CORE_EXTRA_DOC_MODULES}; do
-	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.tar.xz"
-done
-SRC_URI="${SRC_URI} )"
-SRC_URI="${SRC_URI} source? ( "
-for i in ${TL_CORE_EXTRA_SRC_MODULES}; do
-	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.tar.xz"
-done
-SRC_URI="${SRC_URI} )"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="cjk X doc source tk xetex"
-
-TEXMF_PATH=/usr/share/texmf-dist
-
-MODULAR_X_DEPEND="X? (
-				x11-libs/libXmu
-				x11-libs/libXp
-				x11-libs/libXpm
-				x11-libs/libXaw
-	)"
-
-COMMON_DEPEND="${MODULAR_X_DEPEND}
-	!app-text/ptex
-	!app-text/tetex
-	!<app-text/texlive-2007
-	!app-text/xetex
-	!<dev-texlive/texlive-basic-2014
-	!<dev-texlive/texlive-metapost-2011
-	!app-text/dvibook
-	!dev-tex/luatex
-	!app-text/dvipdfm
-	!app-text/dvipdfmx
-	!app-text/xdvipdfmx
-	sys-libs/zlib
-	>=media-libs/libpng-1.2.43-r2:0=
-	>=app-text/poppler-0.12.3-r3:=
-	>=x11-libs/cairo-1.12
-	>=x11-libs/pixman-0.18
-	dev-libs/zziplib
-	app-text/libpaper
-	xetex? (
-		>=media-libs/harfbuzz-0.9.20[icu,graphite]
-		>=dev-libs/icu-50:=
-		app-text/teckit
-		media-libs/fontconfig
-		media-gfx/graphite2
-	)
-	media-libs/freetype:2
-	>=dev-libs/kpathsea-6.2.0
-	cjk? ( >=dev-libs/ptexenc-1.3.2_p20140525-r1 )"
-
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	sys-apps/ed
-	sys-devel/flex
-	app-arch/xz-utils"
-
-RDEPEND="${COMMON_DEPEND}
-	>=app-text/ps2pkm-1.5_p20130530
-	>=app-text/dvipsk-5.993_p20130530
-	>=dev-tex/bibtexu-3.71_p20130530
-	virtual/perl-Getopt-Long
-	tk? ( dev-perl/Tk )"
-
-S="${WORKDIR}/${P}_build"
-B="${WORKDIR}/${MY_PV}"
-
-src_unpack() {
-	unpack ${A}
-	mkdir -p "${S}" || die "failed to create build dir"
-}
-
-RELOC_TARGET=texmf-dist
-
-src_prepare() {
-	cd "${WORKDIR}"
-	# From texlive-module.eclass.
-	grep -H RELOC tlpkg/tlpobj/* | awk '{print $2}' | sed 's#^RELOC/##' > "${T}/reloclist"
-	{ for i in $(<"${T}/reloclist"); do  dirname $i; done; } | uniq > "${T}/dirlist"
-	for i in $(<"${T}/dirlist"); do
-		[ -d "${RELOC_TARGET}/${i}" ] || mkdir -p "${RELOC_TARGET}/${i}"
-	done
-	for i in $(<"${T}/reloclist"); do
-		mv "${i}" "${RELOC_TARGET}"/$(dirname "${i}") || die "failed to relocate ${i} to ${RELOC_TARGET}/$(dirname ${i})"
-	done
-
-	mv "${WORKDIR}"/texmf* "${B}" || die "failed to move texmf files"
-
-	cd "${B}"
-	#EPATCH_MULTI_MSG="Applying patches from upstream bugfix branch..." EPATCH_SUFFIX="patch" epatch "${WORKDIR}/gentoo_branch2011_patches"
-	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
-
-	elibtoolize
-}
-
-src_configure() {
-	# It fails on alpha without this
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# Too many regexps use A-Z a-z constructs, what causes problems with locales
-	# that don't have the same alphabetical order than ascii. Bug #242430
-	# So we set LC_ALL to C in order to avoid problems.
-	export LC_ALL=C
-	tc-export CC CXX AR RANLIB
-	ECONF_SOURCE="${B}" \
-		econf -C \
-		--bindir="${EPREFIX}"/usr/bin \
-		--datadir="${S}" \
-		--with-system-freetype2 \
-		--with-system-zlib \
-		--with-system-libpng \
-		--with-system-xpdf \
-		--with-system-poppler \
-		--with-system-teckit \
-		--with-teckit-includes="${EPREFIX}"/usr/include/teckit \
-		--with-system-kpathsea \
-		--with-kpathsea-includes="${EPREFIX}"/usr/include \
-		--with-system-icu \
-		--with-system-ptexenc \
-		--with-system-harfbuzz \
-		--with-system-icu \
-		--with-system-graphite2 \
-		--with-system-cairo \
-		--with-system-pixman \
-		--with-system-zziplib \
-		--with-system-libpaper \
-		--without-texinfo \
-		--disable-dialog \
-		--disable-multiplatform \
-		--enable-epsfwin \
-		--enable-mftalkwin \
-		--enable-regiswin \
-		--enable-tektronixwin \
-		--enable-unitermwin \
-		--with-ps=gs \
-		--disable-psutils \
-		--disable-t1utils \
-		--enable-ipc \
-		--disable-biber \
-		--disable-bibtex-x \
-		--disable-dvipng \
-		--disable-dvipsk \
-		--disable-chktex \
-		--disable-lcdf-typetools \
-		--disable-pdfopen \
-		--disable-ps2eps \
-		--disable-ps2pkm \
-		--disable-detex \
-		--disable-ttf2pk2 \
-		--disable-tex4htk \
-		--disable-cjkutils \
-		--disable-xdvik \
-		--disable-xindy \
-		--enable-luatex \
-		--disable-dvi2tty \
-		--disable-dvisvgm \
-		--disable-vlna \
-		--enable-shared \
-		--disable-native-texlive-build \
-		--disable-largefile \
-		$(use_enable xetex) \
-		$(use_enable cjk ptex) \
-		$(use_enable cjk eptex) \
-		$(use_enable cjk uptex) \
-		$(use_enable cjk euptex) \
-		$(use_enable cjk mendexk) \
-		$(use_enable cjk makejvf) \
-		$(use_enable tk texdoctk) \
-		$(use_with X x)
-}
-
-src_compile() {
-	tc-export CC CXX AR RANLIB
-	emake SHELL="${EPREFIX}"/bin/sh texmf="${EPREFIX}"${TEXMF_PATH:-/usr/share/texmf-dist}
-
-	cd "${B}" || die
-	# Mimic updmap --syncwithtrees to enable only fonts installed
-	# Code copied from updmap script
-	for i in `egrep '^(Mixed|Kanji)?Map' "texmf-dist/web2c/updmap.cfg" | sed 's@.* @@'`; do
-		texlive-common_is_file_present_in_texmf "$i" || echo "$i"
-	done > "${T}/updmap_update"
-	{
-		sed 's@/@\\/@g; s@^@/^MixedMap[     ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
-		sed 's@/@\\/@g; s@^@/^Map[  ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
-		sed 's@/@\\/@g; s@^@/^KanjiMap[     ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
-	} > "${T}/updmap_update2"
-	sed -f "${T}/updmap_update2" "texmf-dist/web2c/updmap.cfg" >	"${T}/updmap_update3"\
-		&& cat "${T}/updmap_update3" > "texmf-dist/web2c/updmap.cfg"
-}
-
-src_install() {
-	dodir ${TEXMF_PATH:-/usr/share/texmf-dist}/web2c
-	emake DESTDIR="${D}" texmf="${ED}${TEXMF_PATH:-/usr/share/texmf-dist}" run_texlinks="true" run_mktexlsr="true" install
-
-	cd "${B}" || die
-	dodir /usr/share # just in case
-	cp -pR texmf-dist "${ED}/usr/share/" || die "failed to install texmf trees"
-	cp -pR "${WORKDIR}"/tlpkg "${ED}/usr/share/" || die "failed to install tlpkg files"
-
-	# When X is disabled mf-nowin doesn't exist but some scripts expect it to
-	# exist. Instead, it is called mf, so we symlink it to please everything.
-	use X || dosym mf /usr/bin/mf-nowin
-
-	docinto texk
-	cd "${B}/texk"
-	dodoc ChangeLog README
-
-	docinto dviljk
-	cd "${B}/texk/dviljk"
-	dodoc ChangeLog README NEWS
-
-	docinto makeindexk
-	cd "${B}/texk/makeindexk"
-	dodoc ChangeLog NOTES README
-
-	docinto web2c
-	cd "${B}/texk/web2c"
-	dodoc ChangeLog NEWS PROJECTS README
-
-	use doc || rm -rf "${ED}/usr/share/texmf-dist/doc"
-
-	dodir /etc/env.d
-	echo 'CONFIG_PROTECT_MASK="/etc/texmf/web2c /etc/texmf/language.dat.d /etc/texmf/language.def.d /etc/texmf/updmap.d"' > "${ED}/etc/env.d/98texlive"
-	# populate /etc/texmf
-	keepdir /etc/texmf/web2c
-
-	# take care of updmap.cfg and language.d files
-	keepdir /etc/texmf/{updmap.d,language.dat.d,language.def.d,language.dat.lua.d}
-
-	mv "${ED}${TEXMF_PATH}/web2c/updmap.cfg" "${ED}/etc/texmf/updmap.d/00updmap.cfg" || die "moving updmap.cfg failed"
-
-	# Remove fmtutil.cnf, it will be regenerated from /etc/texmf/fmtutil.d files
-	# by texmf-update
-	rm -f "${ED}${TEXMF_PATH}/web2c/fmtutil.cnf"
-	# Remove bundled and invalid updmap.cfg
-	rm -f "${ED}/usr/share/texmf-dist/web2c/updmap.cfg"
-
-	texlive-common_handle_config_files
-
-	keepdir /usr/share/texmf-site
-
-	# the virtex symlink is not installed
-	# The links has to be relative, since the targets
-	# is not present at this stage and MacOS doesn't
-	# like non-existing targets
-	dosym tex /usr/bin/virtex
-	dosym pdftex /usr/bin/pdfvirtex
-
-	# Rename mpost to leave room for mplib
-	mv "${ED}/usr/bin/mpost" "${ED}/usr/bin/mpost-${P}"
-	dosym "mpost-${P}" /usr/bin/mpost
-
-	# Ditto for pdftex
-	mv "${ED}/usr/bin/pdftex" "${ED}/usr/bin/pdftex-${P}"
-	dosym "pdftex-${P}" /usr/bin/pdftex
-}
-
-pkg_postinst() {
-	etexmf-update
-
-	elog
-	elog "If you have configuration files in ${EPREFIX}/etc/texmf to merge,"
-	elog "please update them and run ${EPREFIX}/usr/sbin/texmf-update."
-	elog
-	ewarn "If you are migrating from an older TeX distribution"
-	ewarn "Please make sure you have read:"
-	ewarn "https://wiki.gentoo.org/wiki/Project:TeX/Tex_Live_Migration_Guide"
-	ewarn "in order to avoid possible problems"
-	elog
-	elog "TeXLive has been split in various ebuilds. If you are missing a"
-	elog "package to process your TeX documents, you can install"
-	elog "dev-tex/texmfind to easily search for them."
-	elog
-}

diff --git a/app-text/texlive-core/texlive-core-2014.ebuild b/app-text/texlive-core/texlive-core-2014.ebuild
deleted file mode 100644
index 80048ab96a..0000000000
--- a/app-text/texlive-core/texlive-core-2014.ebuild
+++ /dev/null
@@ -1,334 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-#TL_UPSTREAM_PATCHLEVEL="1"
-PATCHLEVEL="42"
-TL_SOURCE_VERSION=20140525
-
-inherit eutils flag-o-matic toolchain-funcs libtool texlive-common
-
-MY_PV=${PN%-core}-${TL_SOURCE_VERSION}-source
-
-DESCRIPTION="A complete TeX distribution"
-HOMEPAGE="http://tug.org/texlive/"
-SLOT="0"
-LICENSE="GPL-2 LPPL-1.3c TeX"
-
-SRC_URI="mirror://gentoo/${MY_PV}.tar.xz"
-
-# Fetch patches
-SRC_URI="${SRC_URI} mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.xz"
-#	mirror://gentoo/texlive-core-upstream-patches-${TL_UPSTREAM_PATCHLEVEL}.tar.xz"
-
-TL_CORE_BINEXTRA_MODULES="
-	a2ping adhocfilelist asymptote bundledoc ctanify ctanupload ctie cweb
-	de-macro dtl dtxgen dvi2tty dviasm dvicopy dvidvi dviljk dvipos findhyph
-	fragmaster hyphenex installfont lacheck latex-git-log latex2man
-	latexfileversion latexpand latexindent ltxfileinfo ltximg listings-ext
-	match_parens mkjobtexmf patgen pdfcrop pdftools pfarrei pkfix pkfix-helper
-	purifyeps seetexk sty2dtx synctex texcount texdef texdiff texdirflatten
-	texdoc texliveonfly texloganalyser texware tie tpic2pdftex typeoutfileinfo
-	web collection-binextra
-	"
-TL_CORE_BINEXTRA_DOC_MODULES="
-	a2ping.doc adhocfilelist.doc asymptote.doc bundledoc.doc ctanify.doc
-	ctanupload.doc ctie.doc cweb.doc de-macro.doc dtxgen.doc dvi2tty.doc
-	dvicopy.doc	dviljk.doc dvipos.doc findhyph.doc fragmaster.doc
-	installfont.doc	latex-git-log.doc latex2man.doc latexfileversion.doc
-	latexpand.doc latexindent.doc ltxfileinfo.doc ltximg.doc listings-ext.doc
-	match_parens.doc mkjobtexmf.doc patgen.doc pdfcrop.doc pdftools.doc
-	pfarrei.doc pkfix.doc pkfix-helper.doc purifyeps.doc sty2dtx.doc synctex.doc
-	texcount.doc texdef.doc texdiff.doc texdirflatten.doc texdoc.doc
-	texliveonfly.doc texloganalyser.doc texware.doc tie.doc tpic2pdftex.doc
-	typeoutfileinfo.doc web.doc
-	"
-TL_CORE_BINEXTRA_SRC_MODULES="
-	adhocfilelist.source hyphenex.source listings-ext.source mkjobtexmf.source
-	pfarrei.source texdef.source
-	"
-
-TL_CORE_EXTRA_MODULES="tetex hyphen-base texconfig gsftopk texlive.infra ${TL_CORE_BINEXTRA_MODULES}"
-TL_CORE_EXTRA_DOC_MODULES="tetex.doc texconfig.doc gsftopk.doc texlive.infra.doc ${TL_CORE_BINEXTRA_DOC_MODULES}"
-TL_CORE_EXTRA_SRC_MODULES="${TL_CORE_BINEXTRA_SRC_MODULES}"
-
-for i in ${TL_CORE_EXTRA_MODULES}; do
-	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.tar.xz"
-done
-
-SRC_URI="${SRC_URI} doc? ( "
-for i in ${TL_CORE_EXTRA_DOC_MODULES}; do
-	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.tar.xz"
-done
-SRC_URI="${SRC_URI} )"
-SRC_URI="${SRC_URI} source? ( "
-for i in ${TL_CORE_EXTRA_SRC_MODULES}; do
-	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.tar.xz"
-done
-SRC_URI="${SRC_URI} )"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="cjk X doc source tk xetex"
-
-TEXMF_PATH=/usr/share/texmf-dist
-
-MODULAR_X_DEPEND="X? (
-				x11-libs/libXmu
-				x11-libs/libXp
-				x11-libs/libXpm
-				x11-libs/libXaw
-	)"
-
-COMMON_DEPEND="${MODULAR_X_DEPEND}
-	!app-text/ptex
-	!app-text/tetex
-	!<app-text/texlive-2007
-	!app-text/xetex
-	!<dev-texlive/texlive-basic-2014
-	!<dev-texlive/texlive-metapost-2011
-	!app-text/dvibook
-	!dev-tex/luatex
-	!app-text/dvipdfm
-	!app-text/dvipdfmx
-	!app-text/xdvipdfmx
-	sys-libs/zlib
-	>=media-libs/libpng-1.2.43-r2:0=
-	>=app-text/poppler-0.12.3-r3:=
-	>=x11-libs/cairo-1.12
-	>=x11-libs/pixman-0.18
-	dev-libs/zziplib
-	xetex? (
-		>=media-libs/harfbuzz-0.9.20[icu,graphite]
-		>=dev-libs/icu-50:=
-		app-text/teckit
-		media-libs/fontconfig
-		media-gfx/graphite2
-	)
-	media-libs/freetype:2
-	>=dev-libs/kpathsea-6.2.0
-	cjk? ( >=dev-libs/ptexenc-1.3.2_p20140525-r1 )"
-
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	sys-apps/ed
-	sys-devel/flex
-	app-arch/xz-utils"
-
-RDEPEND="${COMMON_DEPEND}
-	>=app-text/ps2pkm-1.5_p20130530
-	>=app-text/dvipsk-5.993_p20130530
-	>=dev-tex/bibtexu-3.71_p20130530
-	virtual/perl-Getopt-Long
-	tk? ( dev-perl/Tk )"
-
-S="${WORKDIR}/${P}_build"
-B="${WORKDIR}/${MY_PV}"
-
-src_unpack() {
-	unpack ${A}
-	mkdir -p "${S}" || die "failed to create build dir"
-}
-
-RELOC_TARGET=texmf-dist
-
-src_prepare() {
-	cd "${WORKDIR}"
-	# From texlive-module.eclass.
-	grep -H RELOC tlpkg/tlpobj/* | awk '{print $2}' | sed 's#^RELOC/##' > "${T}/reloclist"
-	{ for i in $(<"${T}/reloclist"); do  dirname $i; done; } | uniq > "${T}/dirlist"
-	for i in $(<"${T}/dirlist"); do
-		[ -d "${RELOC_TARGET}/${i}" ] || mkdir -p "${RELOC_TARGET}/${i}"
-	done
-	for i in $(<"${T}/reloclist"); do
-		mv "${i}" "${RELOC_TARGET}"/$(dirname "${i}") || die "failed to relocate ${i} to ${RELOC_TARGET}/$(dirname ${i})"
-	done
-
-	mv "${WORKDIR}"/texmf* "${B}" || die "failed to move texmf files"
-
-	cd "${B}"
-	#EPATCH_MULTI_MSG="Applying patches from upstream bugfix branch..." EPATCH_SUFFIX="patch" epatch "${WORKDIR}/gentoo_branch2011_patches"
-	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
-
-	elibtoolize
-}
-
-src_configure() {
-	# It fails on alpha without this
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# Too many regexps use A-Z a-z constructs, what causes problems with locales
-	# that don't have the same alphabetical order than ascii. Bug #242430
-	# So we set LC_ALL to C in order to avoid problems.
-	export LC_ALL=C
-	tc-export CC CXX AR RANLIB
-	ECONF_SOURCE="${B}" \
-		econf -C \
-		--bindir="${EPREFIX}"/usr/bin \
-		--datadir="${S}" \
-		--with-system-freetype2 \
-		--with-system-zlib \
-		--with-system-libpng \
-		--with-system-xpdf \
-		--with-system-poppler \
-		--with-system-teckit \
-		--with-teckit-includes="${EPREFIX}"/usr/include/teckit \
-		--with-system-kpathsea \
-		--with-kpathsea-includes="${EPREFIX}"/usr/include \
-		--with-system-icu \
-		--with-system-ptexenc \
-		--with-system-harfbuzz \
-		--with-system-icu \
-		--with-system-graphite2 \
-		--with-system-cairo \
-		--with-system-pixman \
-		--with-system-zziplib \
-		--without-texinfo \
-		--disable-dialog \
-		--disable-multiplatform \
-		--enable-epsfwin \
-		--enable-mftalkwin \
-		--enable-regiswin \
-		--enable-tektronixwin \
-		--enable-unitermwin \
-		--with-ps=gs \
-		--disable-psutils \
-		--disable-t1utils \
-		--enable-ipc \
-		--disable-biber \
-		--disable-bibtex-x \
-		--disable-dvipng \
-		--disable-dvipsk \
-		--disable-chktex \
-		--disable-lcdf-typetools \
-		--disable-pdfopen \
-		--disable-ps2eps \
-		--disable-ps2pkm \
-		--disable-detex \
-		--disable-ttf2pk2 \
-		--disable-tex4htk \
-		--disable-cjkutils \
-		--disable-xdvik \
-		--disable-xindy \
-		--enable-luatex \
-		--disable-dvi2tty \
-		--disable-dvisvgm \
-		--disable-vlna \
-		--enable-shared \
-		--disable-native-texlive-build \
-		--disable-largefile \
-		$(use_enable xetex) \
-		$(use_enable cjk ptex) \
-		$(use_enable cjk eptex) \
-		$(use_enable cjk uptex) \
-		$(use_enable cjk euptex) \
-		$(use_enable cjk mendexk) \
-		$(use_enable cjk makejvf) \
-		$(use_enable tk texdoctk) \
-		$(use_with X x)
-}
-
-src_compile() {
-	tc-export CC CXX AR RANLIB
-	emake SHELL="${EPREFIX}"/bin/sh texmf="${EPREFIX}"${TEXMF_PATH:-/usr/share/texmf-dist} || die "emake failed"
-
-	cd "${B}"
-	# Mimic updmap --syncwithtrees to enable only fonts installed
-	# Code copied from updmap script
-	for i in `egrep '^(Mixed|Kanji)?Map' "texmf-dist/web2c/updmap.cfg" | sed 's@.* @@'`; do
-		texlive-common_is_file_present_in_texmf "$i" || echo "$i"
-	done > "${T}/updmap_update"
-	{
-		sed 's@/@\\/@g; s@^@/^MixedMap[     ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
-		sed 's@/@\\/@g; s@^@/^Map[  ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
-		sed 's@/@\\/@g; s@^@/^KanjiMap[     ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
-	} > "${T}/updmap_update2"
-	sed -f "${T}/updmap_update2" "texmf-dist/web2c/updmap.cfg" >	"${T}/updmap_update3"\
-		&& cat "${T}/updmap_update3" > "texmf-dist/web2c/updmap.cfg"
-}
-
-src_install() {
-	dodir ${TEXMF_PATH:-/usr/share/texmf-dist}/web2c
-	emake DESTDIR="${D}" texmf="${ED}${TEXMF_PATH:-/usr/share/texmf-dist}" run_texlinks="true" run_mktexlsr="true" install || die "install failed"
-
-	cd "${B}"
-	dodir /usr/share # just in case
-	cp -pR texmf-dist "${ED}/usr/share/" || die "failed to install texmf trees"
-	cp -pR "${WORKDIR}"/tlpkg "${ED}/usr/share/" || die "failed to install tlpkg files"
-
-	# When X is disabled mf-nowin doesn't exist but some scripts expect it to
-	# exist. Instead, it is called mf, so we symlink it to please everything.
-	use X || dosym mf /usr/bin/mf-nowin
-
-	docinto texk
-	cd "${B}/texk"
-	dodoc ChangeLog README || die "failed to install texk docs"
-
-	docinto dviljk
-	cd "${B}/texk/dviljk"
-	dodoc ChangeLog README NEWS || die "failed to install dviljk docs"
-
-	docinto makeindexk
-	cd "${B}/texk/makeindexk"
-	dodoc ChangeLog NOTES README || die "failed to install makeindexk docs"
-
-	docinto web2c
-	cd "${B}/texk/web2c"
-	dodoc ChangeLog NEWS PROJECTS README || die "failed to install web2c docs"
-
-	use doc || rm -rf "${ED}/usr/share/texmf-dist/doc"
-
-	dodir /etc/env.d
-	echo 'CONFIG_PROTECT_MASK="/etc/texmf/web2c /etc/texmf/language.dat.d /etc/texmf/language.def.d /etc/texmf/updmap.d"' > "${ED}/etc/env.d/98texlive"
-	# populate /etc/texmf
-	keepdir /etc/texmf/web2c
-
-	# take care of updmap.cfg and language.d files
-	keepdir /etc/texmf/{updmap.d,language.dat.d,language.def.d,language.dat.lua.d}
-
-	mv "${ED}${TEXMF_PATH}/web2c/updmap.cfg" "${ED}/etc/texmf/updmap.d/00updmap.cfg" || die "moving updmap.cfg failed"
-
-	# Remove fmtutil.cnf, it will be regenerated from /etc/texmf/fmtutil.d files
-	# by texmf-update
-	rm -f "${ED}${TEXMF_PATH}/web2c/fmtutil.cnf"
-	# Remove bundled and invalid updmap.cfg
-	rm -f "${ED}/usr/share/texmf-dist/web2c/updmap.cfg"
-
-	texlive-common_handle_config_files
-
-	keepdir /usr/share/texmf-site
-
-	# the virtex symlink is not installed
-	# The links has to be relative, since the targets
-	# is not present at this stage and MacOS doesn't
-	# like non-existing targets
-	dosym tex /usr/bin/virtex
-	dosym pdftex /usr/bin/pdfvirtex
-
-	# Rename mpost to leave room for mplib
-	mv "${ED}/usr/bin/mpost" "${ED}/usr/bin/mpost-${P}"
-	dosym "mpost-${P}" /usr/bin/mpost
-
-	# Ditto for pdftex
-	mv "${ED}/usr/bin/pdftex" "${ED}/usr/bin/pdftex-${P}"
-	dosym "pdftex-${P}" /usr/bin/pdftex
-}
-
-pkg_postinst() {
-	etexmf-update
-
-	elog
-	elog "If you have configuration files in ${EPREFIX}/etc/texmf to merge,"
-	elog "please update them and run ${EPREFIX}/usr/sbin/texmf-update."
-	elog
-	ewarn "If you are migrating from an older TeX distribution"
-	ewarn "Please make sure you have read:"
-	ewarn "https://wiki.gentoo.org/wiki/Project:TeX/Tex_Live_Migration_Guide"
-	ewarn "in order to avoid possible problems"
-	elog
-	elog "TeXLive has been split in various ebuilds. If you are missing a"
-	elog "package to process your TeX documents, you can install"
-	elog "dev-tex/texmfind to easily search for them."
-	elog
-}

diff --git a/app-text/texlive-core/texlive-core-2015.ebuild b/app-text/texlive-core/texlive-core-2015.ebuild
deleted file mode 100644
index 148fd5a38a..0000000000
--- a/app-text/texlive-core/texlive-core-2015.ebuild
+++ /dev/null
@@ -1,347 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-#TL_UPSTREAM_PATCHLEVEL="1"
-PATCHLEVEL="51"
-TL_SOURCE_VERSION=20150521
-
-inherit eutils flag-o-matic toolchain-funcs libtool texlive-common
-
-MY_PV=${PN%-core}-${TL_SOURCE_VERSION}-source
-
-DESCRIPTION="A complete TeX distribution"
-HOMEPAGE="http://tug.org/texlive/"
-SLOT="0"
-LICENSE="GPL-2 LPPL-1.3c TeX"
-
-SRC_URI="mirror://gentoo/${MY_PV}.tar.xz"
-
-# Fetch patches
-SRC_URI="${SRC_URI} mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.xz"
-#	mirror://gentoo/texlive-core-upstream-patches-${TL_UPSTREAM_PATCHLEVEL}.tar.xz"
-
-TL_CORE_BINEXTRA_MODULES="
-	a2ping adhocfilelist asymptote bundledoc ctanify ctanupload ctie cweb
-	de-macro dtl dtxgen dvi2tty dviasm dvicopy dvidvi dviljk dvipos findhyph
-	fragmaster hyphenex installfont lacheck latex-git-log latex2man
-	latexfileversion latexpand latexindent ltxfileinfo ltximg listings-ext
-	match_parens mkjobtexmf patgen pdfcrop pdftools pfarrei pkfix pkfix-helper
-	purifyeps seetexk sty2dtx synctex texcount texdef texdiff texdirflatten
-	texdoc texliveonfly texloganalyser texware tie tpic2pdftex typeoutfileinfo
-	web collection-binextra
-	"
-TL_CORE_BINEXTRA_DOC_MODULES="
-	a2ping.doc adhocfilelist.doc asymptote.doc bundledoc.doc ctanify.doc
-	ctanupload.doc ctie.doc cweb.doc de-macro.doc dtxgen.doc dvi2tty.doc
-	dvicopy.doc	dviljk.doc dvipos.doc findhyph.doc fragmaster.doc
-	installfont.doc	latex-git-log.doc latex2man.doc latexfileversion.doc
-	latexpand.doc latexindent.doc ltxfileinfo.doc ltximg.doc listings-ext.doc
-	match_parens.doc mkjobtexmf.doc patgen.doc pdfcrop.doc pdftools.doc
-	pfarrei.doc pkfix.doc pkfix-helper.doc purifyeps.doc sty2dtx.doc synctex.doc
-	texcount.doc texdef.doc texdiff.doc texdirflatten.doc texdoc.doc
-	texliveonfly.doc texloganalyser.doc texware.doc tie.doc tpic2pdftex.doc
-	typeoutfileinfo.doc web.doc
-	"
-TL_CORE_BINEXTRA_SRC_MODULES="
-	adhocfilelist.source hyphenex.source listings-ext.source mkjobtexmf.source
-	pfarrei.source texdef.source
-	"
-
-TL_CORE_EXTRA_MODULES="tetex hyphen-base texconfig gsftopk texlive.infra ${TL_CORE_BINEXTRA_MODULES}"
-TL_CORE_EXTRA_DOC_MODULES="tetex.doc texconfig.doc gsftopk.doc texlive.infra.doc ${TL_CORE_BINEXTRA_DOC_MODULES}"
-TL_CORE_EXTRA_SRC_MODULES="${TL_CORE_BINEXTRA_SRC_MODULES}"
-
-for i in ${TL_CORE_EXTRA_MODULES}; do
-	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.tar.xz"
-done
-
-SRC_URI="${SRC_URI} doc? ( "
-for i in ${TL_CORE_EXTRA_DOC_MODULES}; do
-	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.tar.xz"
-done
-SRC_URI="${SRC_URI} )"
-SRC_URI="${SRC_URI} source? ( "
-for i in ${TL_CORE_EXTRA_SRC_MODULES}; do
-	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.tar.xz"
-done
-SRC_URI="${SRC_URI} )"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="cjk X doc source tk +luajittex xetex"
-
-TEXMF_PATH=/usr/share/texmf-dist
-
-MODULAR_X_DEPEND="X? (
-				x11-libs/libXmu
-				x11-libs/libXp
-				x11-libs/libXpm
-				x11-libs/libXaw
-	)"
-
-COMMON_DEPEND="${MODULAR_X_DEPEND}
-	!app-text/ptex
-	!app-text/tetex
-	!<app-text/texlive-2007
-	!app-text/xetex
-	!<dev-texlive/texlive-basic-2014
-	!<dev-texlive/texlive-metapost-2011
-	!app-text/dvibook
-	!dev-tex/luatex
-	!app-text/dvipdfm
-	!app-text/dvipdfmx
-	!app-text/xdvipdfmx
-	sys-libs/zlib
-	>=media-libs/libpng-1.2.43-r2:0=
-	>=app-text/poppler-0.12.3-r3:=
-	>=x11-libs/cairo-1.12
-	>=x11-libs/pixman-0.18
-	dev-libs/zziplib
-	app-text/libpaper
-	dev-libs/gmp:0
-	dev-libs/mpfr:0
-	xetex? (
-		>=media-libs/harfbuzz-0.9.20[icu,graphite]
-		>=dev-libs/icu-50:=
-		>=app-text/teckit-2.5.3
-		media-libs/fontconfig
-		media-gfx/graphite2
-	)
-	media-libs/freetype:2
-	>=dev-libs/kpathsea-6.2.1
-	cjk? ( >=dev-libs/ptexenc-1.3.3_p20150521 )"
-
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	sys-apps/ed
-	sys-devel/flex
-	app-arch/xz-utils"
-
-RDEPEND="${COMMON_DEPEND}
-	>=app-text/ps2pkm-1.7_p20150521
-	>=app-text/dvipsk-5.995_p20150521
-	>=dev-tex/bibtexu-3.71_p20150521
-	virtual/perl-Getopt-Long
-	tk? ( dev-perl/Tk )"
-
-S="${WORKDIR}/${P}_build"
-B="${WORKDIR}/${MY_PV}"
-
-src_unpack() {
-	unpack ${A}
-	mkdir -p "${S}" || die "failed to create build dir"
-}
-
-RELOC_TARGET=texmf-dist
-
-src_prepare() {
-	cd "${WORKDIR}"
-	# From texlive-module.eclass.
-	grep -H RELOC tlpkg/tlpobj/* | awk '{print $2}' | sed 's#^RELOC/##' > "${T}/reloclist"
-	{ for i in $(<"${T}/reloclist"); do  dirname $i; done; } | uniq > "${T}/dirlist"
-	for i in $(<"${T}/dirlist"); do
-		[ -d "${RELOC_TARGET}/${i}" ] || mkdir -p "${RELOC_TARGET}/${i}"
-	done
-	for i in $(<"${T}/reloclist"); do
-		mv "${i}" "${RELOC_TARGET}"/$(dirname "${i}") || die "failed to relocate ${i} to ${RELOC_TARGET}/$(dirname ${i})"
-	done
-
-	mv "${WORKDIR}"/texmf* "${B}" || die "failed to move texmf files"
-
-	cd "${B}"
-	#EPATCH_MULTI_MSG="Applying patches from upstream bugfix branch..." EPATCH_SUFFIX="patch" epatch "${WORKDIR}/gentoo_branch2011_patches"
-	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
-
-	sed -i \
-		-e "s,/usr/include /usr/local/include.*echo \$KPATHSEA_INCLUDES.*,${EPREFIX}/usr/include\"," \
-		texk/web2c/configure || die
-
-	elibtoolize
-}
-
-src_configure() {
-	# It fails on alpha without this
-	use alpha && append-ldflags "-Wl,--no-relax"
-
-	# Too many regexps use A-Z a-z constructs, what causes problems with locales
-	# that don't have the same alphabetical order than ascii. Bug #242430
-	# So we set LC_ALL to C in order to avoid problems.
-	export LC_ALL=C
-	tc-export CC CXX AR RANLIB
-	ECONF_SOURCE="${B}" \
-		econf -C \
-		--bindir="${EPREFIX}"/usr/bin \
-		--datadir="${S}" \
-		--with-system-freetype2 \
-		--with-system-zlib \
-		--with-system-libpng \
-		--with-system-xpdf \
-		--with-system-poppler \
-		--with-system-teckit \
-		--with-teckit-includes="${EPREFIX}"/usr/include/teckit \
-		--with-system-kpathsea \
-		--with-kpathsea-includes="${EPREFIX}"/usr/include \
-		--with-system-icu \
-		--with-system-ptexenc \
-		--with-system-harfbuzz \
-		--with-system-icu \
-		--with-system-graphite2 \
-		--with-system-cairo \
-		--with-system-pixman \
-		--with-system-zziplib \
-		--with-system-libpaper \
-		--with-system-gmp \
-		--with-system-mpfr \
-		--without-texinfo \
-		--disable-dialog \
-		--disable-multiplatform \
-		--enable-epsfwin \
-		--enable-mftalkwin \
-		--enable-regiswin \
-		--enable-tektronixwin \
-		--enable-unitermwin \
-		--with-ps=gs \
-		--disable-psutils \
-		--disable-t1utils \
-		--enable-ipc \
-		--disable-biber \
-		--disable-bibtex-x \
-		--disable-dvipng \
-		--disable-dvipsk \
-		--disable-chktex \
-		--disable-lcdf-typetools \
-		--disable-pdfopen \
-		--disable-ps2eps \
-		--disable-ps2pk \
-		--disable-detex \
-		--disable-ttf2pk2 \
-		--disable-tex4htk \
-		--disable-cjkutils \
-		--disable-xdvik \
-		--disable-xindy \
-		--enable-luatex \
-		--disable-dvi2tty \
-		--disable-dvisvgm \
-		--disable-vlna \
-		--enable-shared \
-		--disable-native-texlive-build \
-		--disable-largefile \
-		$(use_enable luajittex) \
-		$(use_enable xetex) \
-		$(use_enable cjk ptex) \
-		$(use_enable cjk eptex) \
-		$(use_enable cjk uptex) \
-		$(use_enable cjk euptex) \
-		$(use_enable cjk mendexk) \
-		$(use_enable cjk makejvf) \
-		$(use_enable cjk pmp) \
-		$(use_enable cjk upmp) \
-		$(use_enable tk texdoctk) \
-		$(use_with X x)
-}
-
-src_compile() {
-	tc-export CC CXX AR RANLIB
-	emake SHELL="${EPREFIX}"/bin/sh texmf="${EPREFIX}"${TEXMF_PATH:-/usr/share/texmf-dist}
-
-	cd "${B}" || die
-	# Mimic updmap --syncwithtrees to enable only fonts installed
-	# Code copied from updmap script
-	for i in `egrep '^(Mixed|Kanji)?Map' "texmf-dist/web2c/updmap.cfg" | sed 's@.* @@'`; do
-		texlive-common_is_file_present_in_texmf "$i" || echo "$i"
-	done > "${T}/updmap_update"
-	{
-		sed 's@/@\\/@g; s@^@/^MixedMap[     ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
-		sed 's@/@\\/@g; s@^@/^Map[  ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
-		sed 's@/@\\/@g; s@^@/^KanjiMap[     ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
-	} > "${T}/updmap_update2"
-	sed -f "${T}/updmap_update2" "texmf-dist/web2c/updmap.cfg" >	"${T}/updmap_update3"\
-		&& cat "${T}/updmap_update3" > "texmf-dist/web2c/updmap.cfg"
-}
-
-src_install() {
-	dodir ${TEXMF_PATH:-/usr/share/texmf-dist}/web2c
-	emake DESTDIR="${D}" texmf="${ED}${TEXMF_PATH:-/usr/share/texmf-dist}" run_texlinks="true" run_mktexlsr="true" install
-
-	cd "${B}" || die
-	dodir /usr/share # just in case
-	cp -pR texmf-dist "${ED}/usr/share/" || die "failed to install texmf trees"
-	cp -pR "${WORKDIR}"/tlpkg "${ED}/usr/share/" || die "failed to install tlpkg files"
-
-	# When X is disabled mf-nowin doesn't exist but some scripts expect it to
-	# exist. Instead, it is called mf, so we symlink it to please everything.
-	use X || dosym mf /usr/bin/mf-nowin
-
-	docinto texk
-	cd "${B}/texk"
-	dodoc ChangeLog README
-
-	docinto dviljk
-	cd "${B}/texk/dviljk"
-	dodoc ChangeLog README NEWS
-
-	docinto makeindexk
-	cd "${B}/texk/makeindexk"
-	dodoc ChangeLog NOTES README
-
-	docinto web2c
-	cd "${B}/texk/web2c"
-	dodoc ChangeLog NEWS PROJECTS README
-
-	use doc || rm -rf "${ED}/usr/share/texmf-dist/doc"
-
-	dodir /etc/env.d
-	echo 'CONFIG_PROTECT_MASK="/etc/texmf/web2c /etc/texmf/language.dat.d /etc/texmf/language.def.d /etc/texmf/updmap.d"' > "${ED}/etc/env.d/98texlive"
-	# populate /etc/texmf
-	keepdir /etc/texmf/web2c
-
-	# take care of updmap.cfg and language.d files
-	keepdir /etc/texmf/{updmap.d,language.dat.d,language.def.d,language.dat.lua.d}
-
-	mv "${ED}${TEXMF_PATH}/web2c/updmap.cfg" "${ED}/etc/texmf/updmap.d/00updmap.cfg" || die "moving updmap.cfg failed"
-
-	# Remove fmtutil.cnf, it will be regenerated from /etc/texmf/fmtutil.d files
-	# by texmf-update
-	rm -f "${ED}${TEXMF_PATH}/web2c/fmtutil.cnf"
-	# Remove bundled and invalid updmap.cfg
-	rm -f "${ED}/usr/share/texmf-dist/web2c/updmap.cfg"
-
-	texlive-common_handle_config_files
-
-	keepdir /usr/share/texmf-site
-
-	# the virtex symlink is not installed
-	# The links has to be relative, since the targets
-	# is not present at this stage and MacOS doesn't
-	# like non-existing targets
-	dosym tex /usr/bin/virtex
-	dosym pdftex /usr/bin/pdfvirtex
-
-	# Rename mpost to leave room for mplib
-	mv "${ED}/usr/bin/mpost" "${ED}/usr/bin/mpost-${P}"
-	dosym "mpost-${P}" /usr/bin/mpost
-
-	# Ditto for pdftex
-	mv "${ED}/usr/bin/pdftex" "${ED}/usr/bin/pdftex-${P}"
-	dosym "pdftex-${P}" /usr/bin/pdftex
-}
-
-pkg_postinst() {
-	etexmf-update
-
-	elog
-	elog "If you have configuration files in ${EPREFIX}/etc/texmf to merge,"
-	elog "please update them and run ${EPREFIX}/usr/sbin/texmf-update."
-	elog
-	ewarn "If you are migrating from an older TeX distribution"
-	ewarn "Please make sure you have read:"
-	ewarn "https://wiki.gentoo.org/wiki/Project:TeX/Tex_Live_Migration_Guide"
-	ewarn "in order to avoid possible problems"
-	elog
-	elog "TeXLive has been split in various ebuilds. If you are missing a"
-	elog "package to process your TeX documents, you can install"
-	elog "dev-tex/texmfind to easily search for them."
-	elog
-}