gentoo resync : 09.06.2018

33 files changed, 110 insertions, 945 deletions

diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 04ebb3a65cc6..b2a6e6297f7c 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/aspell/Manifest b/app-text/aspell/Manifest
index 125139e60797..b57c3ea7e4c2 100644
--- a/app-text/aspell/Manifest
+++ b/app-text/aspell/Manifest
@@ -4,5 +4,5 @@ AUX aspell-0.60.6-darwin-bundles.patch 967 BLAKE2B 2b159dbac972ad9a246723fd7fbbd
 AUX aspell-0.60.6.1-clang.patch 1288 BLAKE2B fa2da2471f3ec3c6d5c9a98c0afd000bd86cd116b8380ea7ef2acdd1ffb1bf4f241fa60222b2228c60cfd643bb5f310c5671a649e71850ec830ec6d5fcc44cf8 SHA512 453e46b6057dc9fba5e80aa9a3c569f5aa2bc04deeebc4951539e6f251babfba0f6ea2e4f51c59d6e870bf69b1ef7d03b76816d7557a6b673ed0d276f0b3244f
 AUX aspell-0.60.6.1-unicode.patch 8273 BLAKE2B ceadde03ffb1904e58c76074444013d2517a20dafeb5847963b6d8e3dbd4ab7fb00fe0d13fd26d3381edeb4e68b2feefb2c8b44186336bdfe197d483920dd509 SHA512 8601183d2e84801c193f5a4412e021ff79ccd27e031c0e8ec85a879619868d13389cb60fb0f4fa971114da64645dd4fc5cbe480f49e88d575826cf429a533b98
 DIST aspell-0.60.7-rc1.tar.gz 2034916 BLAKE2B 7518660b0bb7f75aa3b659519a97132675b39dac7e8806d5450d43f40d62683e4c4a41a8c18cd08b6ab9ca53911caeb87e0898eb04ad9d2f98185e2bb6033d5c SHA512 e13240d78b8afd74d8a8cfd5fc7fe2081de85b33621e86543cdf942ed601d36c4e0cbf38a54be083e951127fa9435677cec2997387cb0e7b51a5597386e7e8d1
-EBUILD aspell-0.60.7_rc1.ebuild 2691 BLAKE2B a55a61b5cffba91ec4092cc24d06d52393eaa7eaf6bcf613c227cb290ff756f82b064eeb8a2b968b5b69249edb74e39b00151016b4dba6114cf6e706cf9883fb SHA512 8b8333ac2337dacaf27b4c4757c74f4e0216287aed64f50c0d41401e342c861db1e7c04ea5e42baf46b41084b44fdbece376b2a277a8386716edd47c036ebae8
+EBUILD aspell-0.60.7_rc1.ebuild 2690 BLAKE2B 950e49305ac09a4552c73031d7b280282e0c34f89a210e4f6d43d47a5b3ad362285e80089178b60aee2b8567c71735da26cd01b6ba7156fbddedd58c594b787a SHA512 2a7ee108fb975808dd9c4514c021a87cb40e5fc084f50653ea9acc7bdcdc28b95c38d73a3ce5f44b5a5f35ca77a28ac0c1edbe5abc5bfdc106d9dacffbf1eb07
 MISC metadata.xml 139 BLAKE2B b4a59c22790dfec3fbcfaea41ef363401766736b68a85bedae00e1944d0a848aa97104c2f34244c0fe7b6363029281f965fc1b3545301d341cda371eaa976274 SHA512 8be912ace7468a4396eb1da00a9785030a8ce35da4357a01591876a1056fd45e44da65de2af3e1eb0506ce6551714962c40c3ae5a3aefa2ad231de35af2519be
diff --git a/app-text/aspell/aspell-0.60.7_rc1.ebuild b/app-text/aspell/aspell-0.60.7_rc1.ebuild
index 47dd47b852f8..eecfee4dcba2 100644
--- a/app-text/aspell/aspell-0.60.7_rc1.ebuild
+++ b/app-text/aspell/aspell-0.60.7_rc1.ebuild
@@ -17,7 +17,7 @@ fi
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="nls unicode"
 
 PDEPEND="app-dicts/aspell-en"
diff --git a/app-text/build-docbook-catalog/Manifest b/app-text/build-docbook-catalog/Manifest
index d800bbc8021d..d7d10571e22b 100644
--- a/app-text/build-docbook-catalog/Manifest
+++ b/app-text/build-docbook-catalog/Manifest
@@ -1,3 +1,3 @@
 DIST build-docbook-catalog-1.21.tar.xz 4620 BLAKE2B ed4aa645a5bb8e168c291c05891a2359114c9148a81588d93542528a0c74828a1824dc98a14468e8ba65525edf5aae8c936f29190d54063064cd54e2af8dbc3c SHA512 0becc1bae100101b072c62bee844157151336aebc39a046030c8b7b501e13f1b3552097b244ac51339abd2e724304f4fe728861b7d5f070c26973998936861bc
-EBUILD build-docbook-catalog-1.21.ebuild 1090 BLAKE2B 353dde30a03468cae9cda862842a51a2a6033f49af44ae071676a218cf95ed3f9fdd805c782ee39225c858ea989d91b2de939ae95a6bf2986ee27a6635e2a22e SHA512 a0e597a8b6cb90257d2820ffa21c42df559fb40270d82be3c1f7b0653692c5cebb9a54bdebd47ddc8e7aa8c2b743812a53f9f8a3d837166e0561af76c13783ed
+EBUILD build-docbook-catalog-1.21.ebuild 1089 BLAKE2B b987992b70a158e6c339de604d65365e1e9f98397c3a84d5222c94412ed9ade8829509791ff42c7150720df96958c3d764494f778a3dabb5dc94d85efc676635 SHA512 b84b885a7e21d66d9f24874e13fbb439e61cde2c705e702af77e1fd52bfc69f4604db8e2c3bc783aead874994348fdbdb1f50d8e53f4c2cb694a7ee865be2de7
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/build-docbook-catalog/build-docbook-catalog-1.21.ebuild b/app-text/build-docbook-catalog/build-docbook-catalog-1.21.ebuild
index 68f0e171cef7..7b232a82be1c 100644
--- a/app-text/build-docbook-catalog/build-docbook-catalog-1.21.ebuild
+++ b/app-text/build-docbook-catalog/build-docbook-catalog-1.21.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="|| ( sys-apps/util-linux app-misc/getopt )
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index 94f661c91796..523f7d578f1d 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -5,10 +5,6 @@ AUX calibre-server-3.conf 541 BLAKE2B 06593633721e6adf2cf2077dffa83953eea46ccdcd
 AUX calibre-server-3.init 1796 BLAKE2B f87d785d6f6fc10fa648d40944ec8538027854bb872d9a3be6b5b35b0abf3cda1e4e93874a9422914da5eb4287f193459733956e3f1e25e61bec0c214c552c99 SHA512 88110ded1b9c6cf8d3bfc3d5889654f77578f9d299e88daea9023767b930082e00fbddbb92a6e43c46d900248f3684232d93396ec1d0e784c7ec14b44783f98a
 AUX calibre-server.conf 523 BLAKE2B a9fb65a327656f9b2f54eab27dcaf2cdfbcbe5f0d637204ea39f891c515ae899da156098609bc99398354337524843afbf45409bbb1098605f293661bb8381e7 SHA512 4595786d9b6ed7662a1124e8acc32e03e0149f614a07890f9df08d05811a1b8de51cc33cc1bfbf30b072c7ad75dc3b8247e9de53d20ee2b45017cb4160437058
 AUX calibre-server.init 1811 BLAKE2B fe22257128896d4299c5d5edab6ac63cdcf79da483f4afc49b0d1649b17599389dd4b9f88c35a964e289cbe6d961136f1e5760a2244137c404e573510899bd60 SHA512 760aa7a8f51b23b116ba07749855737869ff2313f0528d67e5a46bc362e5c0a04a7e1f46c32dd6e82add4fa5dc41d397db32dbd1a09c912008e0890d1a133eeb
-DIST calibre-2.78.0.tar.xz 38739404 BLAKE2B a563883407b8c5cdbc8080ef94d7325eca76f938d0238d0ffd7a6836453a6aa1f5dc06a602eb255cfe99e083734f352bc1e18e6ab1834dd6e003b357ca03b42e SHA512 0779ac385dde45ac4baee7cecb0916e245f3e1cf20662bad9d9a4278265390b1aa89c2b478601b57113e7de08a69343288488ee299e8b43332f0129e650aa0ca
 DIST calibre-3.15.0.tar.xz 38177684 BLAKE2B 7d3892f81db61f8d4a08589a42ccd71183d9dc7fa401480d4426d1205a9a633216a79865140481f63e1e3a741d34f604ea9d7f98c490949d0d4452cb9123fb9b SHA512 93a9f3b7122d8f4cd1d847727f6d1ccd1f9d828651e9ee77a34544742884b3e925552ca61ec1d0a1196b04a0874e97fc877e679dd8a69ba8b754b7688b730697
-DIST calibre-3.8.0.tar.xz 37922608 BLAKE2B 6ae465da15a50f45621753b4f8fdcb978fa3b3cf170575cca0a9e4ae3cd324fbb4b194861180961539f8057ce3650066d7113368dee404d899ed8ca1a58f80e6 SHA512 db7ff5cb0ee82b3237090cbf6a13d13bfa5e27139dd067290ed59d407d2dbbae2ecd3dab338a0beed845079387a051b092233350091ef6ec82623d3a16b1d48d
-EBUILD calibre-2.78.0.ebuild 8462 BLAKE2B c003b08ecf1a556c5e397cd29d1057f4e160ccb87c7e41c4b6b5ed65b4e90f7166c74c7ac2d3b32e19936028a4d9e92684e8100a8a694a8b3056aefe44dde1ea SHA512 ae96524bf61a2b4484229c7b9a04799c904506fa6e2d9160eeae03be80e9840116d6438e0730cde5ed9135822b83abbb32b9f7d07fc4e5e29cf60866cf60a7b7
 EBUILD calibre-3.15.0.ebuild 9288 BLAKE2B cf28b1c8127288117bfaf3454a61a3485c1636cec5c2ab8dd07df47a9b5d3665e0c5a86768e6752ee57d88d24d7eb6cc2c1f78fb46ab53a71db695aec4cfd4da SHA512 fc2c83770465ad21f358b5592da05838527956b9e491ad3f1adead3a575936e5bba5fe1e1153200171ad9aaa3c10e313bd3f5c678614d6e6784651c2d9af33c1
-EBUILD calibre-3.8.0.ebuild 9253 BLAKE2B f95bbd5d45cf38953a903e954533e890ca0d96950d83191c68d6b3adbf999a9b9919b076211305737f4284d54df08eaab3989d3708286c38ebc5fc7735ec702a SHA512 8e29b98ab341e9b3ff5d068364eb46f2a2e6df4af031578df384963bdde16532044a43b9d0c93ad24570abdec80e29354ca498f72afa791c865bb0f25b1c8d6a
 MISC metadata.xml 382 BLAKE2B 87fa7e63a6ed7a4ea55247b362288b43f7edd312cc3085bb8c1b947402ae4aa0df01fac4f6646d260653ff8af7fe28d3dabb8a213dbf3e206181b69835b33d5f SHA512 8503e0a4a48d93682c386eb1d6507b4b26585afc9d62b7cd52bc00b457a887bd17422a03669ff404570ff7f5ff6f0bba14ee935979f8b54722870d6620097de5
diff --git a/app-text/calibre/calibre-2.78.0.ebuild b/app-text/calibre/calibre-2.78.0.ebuild
deleted file mode 100644
index cfab16f44cea..000000000000
--- a/app-text/calibre/calibre-2.78.0.ebuild
+++ /dev/null
@@ -1,268 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite,ssl"
-
-inherit eutils bash-completion-r1 gnome2-utils multilib toolchain-funcs python-single-r1 xdg-utils
-
-DESCRIPTION="Ebook management application"
-HOMEPAGE="https://calibre-ebook.com/"
-SRC_URI="https://download.calibre-ebook.com/${PV}/${P}.tar.xz"
-
-LICENSE="
-	GPL-3+
-	GPL-3
-	GPL-2+
-	GPL-2
-	GPL-1+
-	LGPL-3+
-	LGPL-2.1+
-	LGPL-2.1
-	BSD
-	MIT
-	Old-MIT
-	Apache-2.0
-	public-domain
-	|| ( Artistic GPL-1+ )
-	CC-BY-3.0
-	OFL-1.1
-	PSF-2
-	unRAR
-"
-KEYWORDS="amd64 ~arm x86"
-SLOT="0"
-IUSE="+udisks"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	>=app-text/podofo-0.8.2:=
-	>=app-text/poppler-0.26.5[qt5]
-	>=dev-libs/chmlib-0.40:=
-	dev-libs/glib:2
-	>=dev-libs/icu-4.4:=
-	>=dev-python/apsw-3.7.17[${PYTHON_USEDEP}]
-	>=dev-python/beautifulsoup-3.0.5:python-2[${PYTHON_USEDEP}]
-	>=dev-python/cssselect-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/cssutils-0.9.9[${PYTHON_USEDEP}]
-	>=dev-python/dbus-python-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/lxml-3.2.1[${PYTHON_USEDEP}]
-	>=dev-python/mechanize-0.1.11[${PYTHON_USEDEP}]
-	dev-python/netifaces[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.0.1[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-1.4.1[${PYTHON_USEDEP}]
-	>=dev-python/PyQt5-5.3.1[gui,svg,webkit,widgets,network,printsupport,${PYTHON_USEDEP}]
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-util/desktop-file-utils
-	dev-util/gtk-update-icon-cache
-	media-fonts/liberation-fonts
-	>=media-gfx/imagemagick-6.5.9[jpeg,png]
-	media-libs/fontconfig
-	>=media-libs/freetype-2:=
-	>=media-libs/libmtp-1.1.5:=
-	>=media-libs/libwmf-0.2.8
-	sys-libs/zlib
-	virtual/libusb:1=
-	virtual/python-dnspython[${PYTHON_USEDEP}]
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrender
-	x11-misc/shared-mime-info
-	>=x11-misc/xdg-utils-1.0.2-r2
-	udisks? ( virtual/libudev )"
-RDEPEND="${COMMON_DEPEND}
-	udisks? ( || ( sys-fs/udisks:2 sys-fs/udisks:0 ) )"
-DEPEND="${COMMON_DEPEND}
-	>=dev-python/setuptools-0.6_rc5[${PYTHON_USEDEP}]
-	>=virtual/podofo-build-0.8.2
-	virtual/pkgconfig"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary && $(gcc-major-version) -lt 6 ]]; then
-		eerror "Calibre cannot be built with this version of gcc."
-		eerror "You need at least gcc-6.0"
-		die "Your C compiler is too old for this package."
-	fi
-}
-
-src_prepare() {
-	# no_updates: do not annoy user with "new version is availible all the time
-	# disable_plugins: walking sec-hole, wait for upstream to use GHNS interface
-	eapply \
-		"${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch" \
-		"${FILESDIR}/${PN}-disable_plugins.patch" \
-		"${FILESDIR}/${PN}-2.83.0-lzxd-bounds-error-bug-540596.patch"
-
-	eapply_user
-
-	# Fix outdated version constant.
-	#sed -e "s#\\(^numeric_version =\\).*#\\1 (${PV//./, })#" \
-	#	-i src/calibre/constants.py || \
-	#	die "sed failed to patch constants.py"
-
-	# Avoid sandbox violation in /usr/share/gnome/apps when linux.py
-	# calls xdg-* (bug #258938).
-	sed -e "s|'xdg-desktop-menu', 'install'|\\0, '--mode', 'user'|" \
-		-e "s|check_call(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
-		-e "s|\\(CurrentDir(tdir)\\), \\\\\$|\\1:|" \
-		-e "s|, PreserveMIMEDefaults():|:|" \
-		-e "s|'xdg-icon-resource', 'install'|\\0, '--mode', 'user'|" \
-		-e "s|cmd\[2\]|cmd[4]|" \
-		-e "s|cc(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
-		-e "s|'xdg-mime', 'install'|\\0, '--mode', 'user'|" \
-		-i src/calibre/linux.py || die "sed failed to patch linux.py"
-
-	# Disable unnecessary privilege dropping for bug #287067.
-	sed -e "s:if os.geteuid() == 0:if False and os.geteuid() == 0:" \
-		-i setup/install.py || die "sed failed to patch install.py"
-
-	sed -e "/^            self\\.check_call(qmc + \\[.*\\.pro'\\])$/a\
-\\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ self.check_call(['sed', \
-'-e', 's|^CFLAGS .*|\\\\\\\\0 ${CFLAGS}|', \
-'-e', 's|^CXXFLAGS .*|\\\\\\\\0 ${CXXFLAGS}|', \
-'-e', 's|^LFLAGS .*|\\\\\\\\0 ${LDFLAGS}|', \
-'-i', 'Makefile'])" \
-		-i setup/build.py || die "sed failed to patch build.py"
-
-	# use system beautifulsoup, instead of bundled
-	rm -f "${S}"/src/calibre/ebooks/BeautifulSoup.py \
-		|| die "could not remove bundled beautifulsoup"
-	find "${S}" -type f -name \*.py -exec \
-		sed -e 's/calibre.ebooks.BeautifulSoup/BeautifulSoup/' -i {} + \
-		|| die "could not sed bundled beautifulsoup out of the source tree"
-
-	# avoid failure of xdg tools to recognize vendor prefix
-	sed -e "s|xdg-icon-resource install|xdg-icon-resource install --novendor|" \
-		-e "s|'xdg-mime', 'install'|'xdg-mime', 'install', '--novendor'|" \
-		-e "s|'xdg-desktop-menu', 'install'|'xdg-desktop-menu', 'install', '--novendor'|" \
-		-i "${S}"/src/calibre/linux.py || die 'sed failed'
-
-	# don't create/install uninstaller
-	sed '/self\.create_uninstaller()/d' -i src/calibre/linux.py || die
-}
-
-src_install() {
-	# Bypass kbuildsycoca and update-mime-database in order to
-	# avoid sandbox violations if xdg-mime tries to call them.
-	cat - > "${T}/kbuildsycoca" <<-EOF
-	#!${BASH}
-	echo $0 : $@
-	exit 0
-	EOF
-
-	cp "${T}"/{kbuildsycoca,update-mime-database} || die
-	chmod +x "${T}"/{kbuildsycoca,update-mime-database} || die
-
-	export QMAKE="${EPREFIX}/usr/$(get_libdir)/qt5/bin/qmake"
-
-	# Unset DISPLAY in order to prevent xdg-mime from triggering a sandbox
-	# violation with kbuildsycoca as in bug #287067, comment #13.
-	export -n DISPLAY
-
-	# Bug #352625 - Some LANGUAGE values can trigger the following ValueError:
-	#   File "/usr/lib/python2.6/locale.py", line 486, in getdefaultlocale
-	#    return _parse_localename(localename)
-	#  File "/usr/lib/python2.6/locale.py", line 418, in _parse_localename
-	#    raise ValueError, 'unknown locale: %s' % localename
-	#ValueError: unknown locale: 46
-	export -n LANGUAGE
-
-	# Bug #295672 - Avoid sandbox violation in ~/.config by forcing
-	# variables to point to our fake temporary $HOME.
-	export HOME="${T}/fake_homedir"
-	export XDG_CONFIG_HOME="${HOME}/.config"
-	export XDG_DATA_HOME="${HOME}/.local/share"
-	export CALIBRE_CONFIG_DIRECTORY="${XDG_CONFIG_HOME}/calibre"
-	mkdir -p "${XDG_DATA_HOME}" "${CALIBRE_CONFIG_DIRECTORY}" || die
-
-	tc-export CC CXX
-	# Bug #334243 - respect LDFLAGS when building extensions
-	export OVERRIDE_CFLAGS="$CFLAGS" OVERRIDE_LDFLAGS="$LDFLAGS"
-	local libdir=$(get_libdir)
-	[[ -n $libdir ]] || die "get_libdir returned an empty string"
-
-	# Bug #472690 - Avoid sandbox violation for /dev/dri/card0.
-	local x
-	for x in /dev/dri/card[0-9] ; do
-		[[ -e ${x} ]] && addpredict ${x}
-	done
-
-	#dodir "/usr/$(get_libdir)/python2.7/site-packages" # for init_calibre.py
-	#dodir $(python_get_sitedir)
-	PATH=${T}:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
-	"${PYTHON}" setup.py install \
-		--root="${D}" \
-		--prefix="${EPREFIX}/usr" \
-		--libdir="${EPREFIX}/usr/${libdir}" \
-		--staging-root="${ED}usr" \
-		--staging-libdir="${ED}usr/${libdir}" || die
-
-	# The menu entries end up here due to '--mode user' being added to
-	# xdg-* options in src_prepare.
-	dodir /usr/share/mime/packages
-	chmod -fR a+rX,u+w,g-w,o-w "${HOME}"/.local
-	mv "${HOME}"/.local/share/mime/packages/* "${ED}"usr/share/mime/packages/ ||
-		die "failed to register mime types"
-	dodir /usr/share/icons
-	mv "${HOME}"/.local/share/icons/* "${ED}"usr/share/icons/ ||
-		die "failed to install icon files"
-
-	domenu "${HOME}"/.local/share/applications/*.desktop ||
-		die "failed to install .desktop menu files"
-
-	find "${ED}"usr/share -type d -empty -delete
-
-	cd "${ED}"/usr/share/calibre/fonts/liberation || die
-	local x
-	for x in * ; do
-		[[ -f ${EPREFIX}usr/share/fonts/liberation-fonts/${x} ]] || continue
-		ln -sf "../../../fonts/liberation-fonts/${x}" "${x}" || die
-	done
-
-	einfo "Converting python shebangs"
-	python_fix_shebang "${ED}"
-
-	einfo "Compiling python modules"
-	python_optimize "${ED}"usr/lib/calibre
-
-	newinitd "${FILESDIR}"/calibre-server.init calibre-server
-	newconfd "${FILESDIR}"/calibre-server.conf calibre-server
-
-	bashcomp_alias calibre \
-		lrfviewer \
-		calibre-debug \
-		ebook-meta \
-		calibre-server \
-		ebook-viewer \
-		ebook-polish \
-		fetch-ebook-metadata \
-		lrf2lrs \
-		ebook-convert \
-		ebook-edit \
-		calibre-smtp \
-		ebook-device
-
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
diff --git a/app-text/calibre/calibre-3.8.0.ebuild b/app-text/calibre/calibre-3.8.0.ebuild
deleted file mode 100644
index 18095fd34d29..000000000000
--- a/app-text/calibre/calibre-3.8.0.ebuild
+++ /dev/null
@@ -1,291 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite,ssl"
-
-inherit eutils bash-completion-r1 gnome2-utils multilib toolchain-funcs python-single-r1 xdg-utils
-
-DESCRIPTION="Ebook management application"
-HOMEPAGE="https://calibre-ebook.com/"
-SRC_URI="https://download.calibre-ebook.com/${PV}/${P}.tar.xz"
-
-LICENSE="
-	GPL-3+
-	GPL-3
-	GPL-2+
-	GPL-2
-	GPL-1+
-	LGPL-3+
-	LGPL-2.1+
-	LGPL-2.1
-	BSD
-	MIT
-	Old-MIT
-	Apache-2.0
-	public-domain
-	|| ( Artistic GPL-1+ )
-	CC-BY-3.0
-	OFL-1.1
-	PSF-2
-	unRAR
-"
-KEYWORDS="~amd64 ~arm ~x86"
-SLOT="0"
-IUSE="ios +udisks"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	>=app-text/podofo-0.8.2:=
-	>=app-text/poppler-0.26.5[qt5]
-	>=dev-libs/chmlib-0.40:=
-	dev-libs/glib:2
-	>=dev-libs/icu-57.1:=
-	>=dev-python/apsw-3.13.0[${PYTHON_USEDEP}]
-	>=dev-python/beautifulsoup-3.0.5:python-2[${PYTHON_USEDEP}]
-	dev-python/chardet[${PYTHON_USEDEP}]
-	>=dev-python/cssselect-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/cssutils-1.0.1[${PYTHON_USEDEP}]
-	>=dev-python/dbus-python-1.2.4[${PYTHON_USEDEP}]
-	>=dev-libs/dbus-glib-0.106
-	>=sys-apps/dbus-1.10.8
-	dev-python/html5-parser[${PYTHON_USEDEP}]
-	>=dev-python/lxml-3.2.1[${PYTHON_USEDEP}]
-	>=dev-python/mechanize-0.2.5[${PYTHON_USEDEP}]
-	dev-python/msgpack[${PYTHON_USEDEP}]
-	dev-python/netifaces[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.1.3[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}]
-	>=dev-python/PyQt5-5.8[gui,svg,webkit,widgets,network,printsupport,${PYTHON_USEDEP}]
-	dev-python/regex[${PYTHON_USEDEP}]
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-util/desktop-file-utils
-	dev-util/gtk-update-icon-cache
-	media-fonts/liberation-fonts
-	>=media-gfx/imagemagick-6.5.9[jpeg,png]
-	media-libs/fontconfig
-	>=media-libs/freetype-2:=
-	>=media-libs/libmtp-1.1.11:=
-	>=media-libs/libwmf-0.2.8
-	>=media-gfx/optipng-0.7.6
-	sys-libs/zlib
-	virtual/libusb:1=
-	virtual/python-dnspython[${PYTHON_USEDEP}]
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXrender
-	x11-misc/shared-mime-info
-	>=x11-misc/xdg-utils-1.0.2-r2
-	ios? (
-		>=app-pda/usbmuxd-1.0.8
-		>=app-pda/libimobiledevice-1.2.0
-	)
-	udisks? ( virtual/libudev )"
-RDEPEND="${COMMON_DEPEND}
-	udisks? ( || ( sys-fs/udisks:2 sys-fs/udisks:0 ) )"
-DEPEND="${COMMON_DEPEND}
-	>=dev-python/setuptools-23.1.0[${PYTHON_USEDEP}]
-	>=virtual/podofo-build-0.9.4
-	virtual/pkgconfig"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary && $(gcc-major-version) -lt 6 ]]; then
-		eerror "Calibre cannot be built with this version of gcc."
-		eerror "You need at least gcc-6.0"
-		die "Your C compiler is too old for this package."
-	fi
-}
-
-src_prepare() {
-	# no_updates: do not annoy user with "new version is availible all the time
-	# disable_plugins: walking sec-hole, wait for upstream to use GHNS interface
-	eapply \
-		"${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch" \
-		"${FILESDIR}/${PN}-disable_plugins.patch"
-
-	eapply_user
-
-	# Fix outdated version constant.
-	#sed -e "s#\\(^numeric_version =\\).*#\\1 (${PV//./, })#" \
-	#	-i src/calibre/constants.py || \
-	#	die "sed failed to patch constants.py"
-
-	# Avoid sandbox violation in /usr/share/gnome/apps when linux.py
-	# calls xdg-* (bug #258938).
-	sed -e "s|'xdg-desktop-menu', 'install'|\\0, '--mode', 'user'|" \
-		-e "s|check_call(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
-		-e "s|\\(CurrentDir(tdir)\\), \\\\\$|\\1:|" \
-		-e "s|, PreserveMIMEDefaults():|:|" \
-		-e "s|'xdg-icon-resource', 'install'|\\0, '--mode', 'user'|" \
-		-e "s|cmd\[2\]|cmd[4]|" \
-		-e "s|cc(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
-		-e "s|'xdg-mime', 'install'|\\0, '--mode', 'user'|" \
-		-i src/calibre/linux.py || die "sed failed to patch linux.py"
-
-	# Disable unnecessary privilege dropping for bug #287067.
-	sed -e "s:if os.geteuid() == 0:if False and os.geteuid() == 0:" \
-		-i setup/install.py || die "sed failed to patch install.py"
-
-	sed -e "/^                self.check_call(\\[QMAKE\\] + qmc + \\[proname\\])$/a\
-\\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ self.check_call(['sed', \
-'-e', 's|^CFLAGS .*|\\\\\\\\0 ${CFLAGS}|', \
-'-e', 's|^CXXFLAGS .*|\\\\\\\\0 ${CXXFLAGS}|', \
-'-e', 's|^LFLAGS .*|\\\\\\\\0 ${LDFLAGS}|', \
-'-i', 'Makefile'])" \
-		-i setup/build.py || die "sed failed to patch build.py"
-
-	# use system beautifulsoup, instead of bundled
-	rm -f "${S}"/src/calibre/ebooks/BeautifulSoup.py \
-		|| die "could not remove bundled beautifulsoup"
-	find "${S}" -type f -name \*.py -exec \
-		sed -e 's/calibre.ebooks.BeautifulSoup/BeautifulSoup/' -i {} + \
-		|| die "could not sed bundled beautifulsoup out of the source tree"
-
-	# avoid failure of xdg tools to recognize vendor prefix
-	sed -e "s|xdg-icon-resource install|xdg-icon-resource install --novendor|" \
-		-e "s|'xdg-mime', 'install'|'xdg-mime', 'install', '--novendor'|" \
-		-e "s|'xdg-desktop-menu', 'install'|'xdg-desktop-menu', 'install', '--novendor'|" \
-		-i "${S}"/src/calibre/linux.py || die 'sed failed'
-
-	# don't create/install uninstaller
-	sed '/self\.create_uninstaller()/d' -i src/calibre/linux.py || die
-}
-
-src_install() {
-	# Bypass kbuildsycoca and update-mime-database in order to
-	# avoid sandbox violations if xdg-mime tries to call them.
-	cat - > "${T}/kbuildsycoca" <<-EOF
-	#!${BASH}
-	echo $0 : $@
-	exit 0
-	EOF
-
-	cp "${T}"/{kbuildsycoca,update-mime-database} || die
-	chmod +x "${T}"/{kbuildsycoca,update-mime-database} || die
-
-	export QMAKE="${EPREFIX}/usr/$(get_libdir)/qt5/bin/qmake"
-
-	# Unset DISPLAY in order to prevent xdg-mime from triggering a sandbox
-	# violation with kbuildsycoca as in bug #287067, comment #13.
-	export -n DISPLAY
-
-	# Bug #352625 - Some LANGUAGE values can trigger the following ValueError:
-	#   File "/usr/lib/python2.6/locale.py", line 486, in getdefaultlocale
-	#    return _parse_localename(localename)
-	#  File "/usr/lib/python2.6/locale.py", line 418, in _parse_localename
-	#    raise ValueError, 'unknown locale: %s' % localename
-	#ValueError: unknown locale: 46
-	export -n LANGUAGE
-
-	# Bug #295672 - Avoid sandbox violation in ~/.config by forcing
-	# variables to point to our fake temporary $HOME.
-	export HOME="${T}/fake_homedir"
-	export XDG_CONFIG_HOME="${HOME}/.config"
-	export XDG_DATA_HOME="${HOME}/.local/share"
-	export CALIBRE_CONFIG_DIRECTORY="${XDG_CONFIG_HOME}/calibre"
-	mkdir -p "${XDG_DATA_HOME}" "${CALIBRE_CONFIG_DIRECTORY}" || die
-
-	tc-export CC CXX
-	# Bug #334243 - respect LDFLAGS when building extensions
-	export OVERRIDE_CFLAGS="$CFLAGS" OVERRIDE_LDFLAGS="$LDFLAGS"
-	local libdir=$(get_libdir)
-	[[ -n $libdir ]] || die "get_libdir returned an empty string"
-
-	# Bug #472690 - Avoid sandbox violation for /dev/dri/card0.
-	local x
-	for x in /dev/dri/card[0-9] ; do
-		[[ -e ${x} ]] && addpredict ${x}
-	done
-
-	#dodir "/usr/$(get_libdir)/python2.7/site-packages" # for init_calibre.py
-	#dodir $(python_get_sitedir)
-	PATH=${T}:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
-	"${PYTHON}" setup.py install \
-		--root="${D}" \
-		--prefix="${EPREFIX}/usr" \
-		--libdir="${EPREFIX}/usr/${libdir}" \
-		--staging-root="${ED}usr" \
-		--staging-libdir="${ED}usr/${libdir}" || die
-
-	# The menu entries end up here due to '--mode user' being added to
-	# xdg-* options in src_prepare.
-	dodir /usr/share/mime/packages
-	chmod -fR a+rX,u+w,g-w,o-w "${HOME}"/.local
-	mv "${HOME}"/.local/share/mime/packages/* "${ED}"usr/share/mime/packages/ ||
-		die "failed to register mime types"
-	dodir /usr/share/icons
-	mv "${HOME}"/.local/share/icons/* "${ED}"usr/share/icons/ ||
-		die "failed to install icon files"
-
-	domenu "${HOME}"/.local/share/applications/*.desktop ||
-		die "failed to install .desktop menu files"
-
-	find "${ED}"usr/share -type d -empty -delete
-
-	cd "${ED}"/usr/share/calibre/fonts/liberation || die
-	local x
-	for x in * ; do
-		[[ -f ${EPREFIX}usr/share/fonts/liberation-fonts/${x} ]] || continue
-		ln -sf "../../../fonts/liberation-fonts/${x}" "${x}" || die
-	done
-
-	einfo "Converting python shebangs"
-	python_fix_shebang "${ED}"
-
-	einfo "Compiling python modules"
-	python_optimize "${ED}"usr/lib/calibre
-
-	newinitd "${FILESDIR}"/calibre-server-3.init calibre-server
-	newconfd "${FILESDIR}"/calibre-server-3.conf calibre-server
-
-	bashcomp_alias calibre \
-		lrfviewer \
-		calibre-debug \
-		ebook-meta \
-		calibre-server \
-		ebook-viewer \
-		ebook-polish \
-		fetch-ebook-metadata \
-		lrf2lrs \
-		ebook-convert \
-		ebook-edit \
-		calibre-smtp \
-		ebook-device
-
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-	# Indentify stray directories from upstream's "Binary install"
-	# method (see bug 622728).
-	CALIBRE_LIB_DIR=/usr/$(get_libdir)/calibre
-	CALIBRE_LIB_CONTENT=$(for x in "${ED%/}${CALIBRE_LIB_DIR}"/*; do
-		printf -- "${x##*/} "; done) || die "Failed to list ${ED%/}${CALIBRE_LIB_DIR}"
-}
-
-pkg_postinst() {
-	[[ -n ${CALIBRE_LIB_DIR} ]] || die "CALIBRE_LIB_DIR is unset"
-	local x
-	for x in "${EROOT%/}${CALIBRE_LIB_DIR}"/*; do
-		if [[ " ${CALIBRE_LIB_CONTENT} " != *" ${x##*/} "* ]]; then
-			elog "Purging '${x}'"
-			rm -rf "${x}"
-		fi
-	done
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
diff --git a/app-text/convertlit/Manifest b/app-text/convertlit/Manifest
index 5dd4ee06cd3c..d976735ca438 100644
--- a/app-text/convertlit/Manifest
+++ b/app-text/convertlit/Manifest
@@ -3,6 +3,5 @@ AUX convertlit-1.8-respectflags.patch 840 BLAKE2B cb61c62e453d3bea6287cfa372d52f
 AUX fix-Wformat-security-warnings.patch 936 BLAKE2B 636599eb3840f5ea084dd60fd96f462f6757a4ec04e41360469eacb03badb3b8271a595692f055d10162e591600994be7e4676800e0f8a8feadbbabccbaeb21a SHA512 6f8798a8b54951c15da4f28d4c8103811c4d77ba96eb12a4e19bc35876c148c1247d19ea5b3d60028b156d50d5dbd67ec5254e47a556d195ca8c084bbc571e4d
 AUX support-ar-variable.patch 408 BLAKE2B d3649dcc362cb54a67eba34b9b6bfc6a52a22cd0ed33de95aad3cd5dad75729c35c45b8817e9c64040b3ea4baee876b456121a7e55094f0ceb01aabf4d6a2a8b SHA512 8d807507cccc58979092becb1725d4871f62746f06b3d4ac8740a0704019d3900cd60098497a0d770fcb9bab68e9bf34dc50219afda0995209ea88a71b084ce6
 DIST clit18src.zip 135120 BLAKE2B b2c47c03df2cee8779f50eee1a19f46907fa966165629d17fb25c66e5bf7b68b6ada6efa1790d36deb6a10f69c17ec7ef2cc66551796cbba04a3f2f7e5e3294d SHA512 0d4b7d525f5164a73a47a00e1c4e93ff50e738a4e6c541ded283c4779e6a67138f601c23a41344517ca5d7f8c9141b25cc6edc7f3967fbf9042e99f647354f36
-EBUILD convertlit-1.8-r1.ebuild 890 BLAKE2B ac2ce2273bbf2a05fbc2499ddf6a2216e8e2810dfa212f93a7e5f0796c107eb6ff259ad05e08d300eb3d7054c569615c3abfe5d17f0cd5a7cb84761da689e33d SHA512 61059c578fa28ddd7b3ecbac807f36f7ca2b58d662a233fa80c4645ec81c928011b8c1a4a7a4d53598cf1d76bef42da06d6eb901b713eb70ca04d0632cfefc9b
 EBUILD convertlit-1.8-r3.ebuild 951 BLAKE2B 710d2cea0762a47128c8ab78b49ff4d7d3000d986d83f8a14fc5bd9b7aaf2fc029017f5ee7c546cd9100230a2cade1dc4a885af41af85983747bbe601d892a9b SHA512 b95136ce98aeb00b1bcd455984bcc1f2605afac35364e6b7c17558aac169f99eceee28ac1bf1c755ccde14057a42dbdade005fd8a77e26c876baf0fb00e9c196
 MISC metadata.xml 562 BLAKE2B 65f7b124b050f42c8c6f800e2e05d2e9404869c42a1217e0d280895d52d8f2588f37bbb4a696cffb58129f080580aee9cbca83740e888ccf9d272a8162a053ef SHA512 1264f1669bece35fbd465ebf7911c7d416d85d092aa6e1601b240728fc2a0cb521d913e3bae08962fc5e70c2b70ee17989191e0bc21f04c9c1ed30592ff4820e
diff --git a/app-text/convertlit/convertlit-1.8-r1.ebuild b/app-text/convertlit/convertlit-1.8-r1.ebuild
deleted file mode 100644
index 30171f29362a..000000000000
--- a/app-text/convertlit/convertlit-1.8-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils toolchain-funcs
-
-MY_P="clit${PV//./}"
-
-DESCRIPTION="CLit converts MS ebook .lit files to .opf (xml+html+png+jpg)"
-HOMEPAGE="http://www.convertlit.com/"
-SRC_URI="http://www.convertlit.com/${MY_P}src.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-RDEPEND=">=dev-libs/libtommath-0.36-r1"
-
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-RDEPEND="${RDEPEND}
-	!app-text/open_c-lit"
-
-S=${WORKDIR}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${P}-respectflags.patch"
-}
-
-src_compile() {
-	tc-export CC
-
-	cd "${S}"/lib
-	emake || die "make lib failed"
-	cd "${S}"/${MY_P}
-	emake || die "make ${MY_P} failed"
-}
-
-src_install() {
-	dobin ${MY_P}/clit || die
-	dodoc README
-}
diff --git a/app-text/ghostscript-gpl/Manifest b/app-text/ghostscript-gpl/Manifest
index ab54894504a0..aef2b66dc99e 100644
--- a/app-text/ghostscript-gpl/Manifest
+++ b/app-text/ghostscript-gpl/Manifest
@@ -1,4 +1,4 @@
 DIST ghostscript-9.21.tar.xz 29164532 BLAKE2B 275e81e44585e186cdfd9f517d1ac77ec840c62ef01f107f6ec0131546c4a2b526000cbc4ba6a91b55eedb8f3783fbf831059d791ea441a484ce29dd5dd6af0e SHA512 cfea089b92fb01e3f7c18a9ce05e7165fc8b356e2914bf53b7f2fd9de672279c8b97ced07e983e619f0d4334ce16018b100cfbf0cc872c215a8cf2aff4c78731
 DIST ghostscript-gpl-9.21-patchset-1.tar.xz 6196 BLAKE2B d2bccba582873d29c1724469af66a5aa72755d6ff73bbdadbf33e5eb4a2027c2cf14415319c3c3c6d03a9fbd9bad43e3bf7ef57eb7a3361305f6efb7fa550675 SHA512 58fef7080ca17a238231fb528be48f52bcfa771b1e496d7fede6df45fb927f1bb1c755cb77e02aa739295b0ccf0b3d3959f9a05a1628d32ffd11e134c0e0d355
-EBUILD ghostscript-gpl-9.21.ebuild 5550 BLAKE2B f7af81cc6a38408faeccb9dd87321708d09639c05725ea97beda1da43b9c4847bc8d2131582fd2eff6d4e9fc30b9b3ca535d7fc07a27dc9be603f53bab6ced02 SHA512 2108fdfa94749954f86eb0e303c2da07f6feca991c2e13d95b90ad90e5172b84de6ed9ffe6a722b67f2da5f801e51ebdd4a4e31cb44a8cb2293392ce75056861
+EBUILD ghostscript-gpl-9.21.ebuild 5551 BLAKE2B 99f5358fba87a426588f826555eeb4d025b973cfc902c6353b0c9d8f176db1d9a20e7c704abcd030246d4477a6a58e76081458c2dc71630be88892c040984e81 SHA512 aa490d083fdfc94dbadbf2ed488ee66a0601d57a35d2b6bfc18bfbafa13392fec131b07fa964aadef7296e3d709ec29ad47aa71d5a9fb4d719e6b79fced2d1d4
 MISC metadata.xml 516 BLAKE2B 6afad0e1422537a40a445465a9ae3b974d40e45b177cced532a8b1cee0163cc8af68e1d0f8c79212876e8439a0c3826892d6d639fdcfdf4fcf7d4e22116e837b SHA512 2f20a51f4716d8581748520da0c353f3b9846182ab77ac459abe178f6fd68942c9fc15614ac5a01ae183ff94f3db318037038f48fae54620d6aa7a25de9834d6
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-9.21.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.21.ebuild
index b0391f26d812..d3dfd6871f21 100644
--- a/app-text/ghostscript-gpl/ghostscript-gpl-9.21.ebuild
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-9.21.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 inherit autotools multilib versionator flag-o-matic toolchain-funcs
 
 DESCRIPTION="Ghostscript is an interpreter for the PostScript language and for PDF"
-HOMEPAGE="http://ghostscript.com/"
+HOMEPAGE="https://ghostscript.com/"
 
 MY_P=${P/-gpl}
 PVM=$(get_version_component_range 1-2)
diff --git a/app-text/libepubgen/Manifest b/app-text/libepubgen/Manifest
index c0ea49729dae..37bfbb757692 100644
--- a/app-text/libepubgen/Manifest
+++ b/app-text/libepubgen/Manifest
@@ -1,3 +1,5 @@
 DIST libepubgen-0.1.0.tar.xz 319652 BLAKE2B e6573e0a680711380ac3d2ef742413e38030e76dc50639f9659544e7410f7d7f987cdf1aa20cf2f2afa924bbcbecaf7141225d387fc509d0db6387cd144cb16e SHA512 6be431d06321807991048567aebd7111359f8aa364fe33e651c991553f832c03ad3bb3520b9f7e8d72a861a9ebd84483587becb9062e226bcd1d8ade1819b4a9
+DIST libepubgen-0.1.1.tar.xz 324380 BLAKE2B f2dd4ee4987aa69f3972f83fe6348e8f0d4ba2d5c2f8f871e81d7e9dd5dcc00e10fc2be27fcbbb6170f5a673b86c62261fb8d25ff3bf788cda726e64a254ec7d SHA512 9d911384672b5394ff1df3280a5c9fe12888530c41f177aa100f135954e2ec279b64193f8388f12c96f6a6e587483ce853e74fe45b29fb748a930512dd011c2b
 EBUILD libepubgen-0.1.0.ebuild 725 BLAKE2B df6c45b50db98bc979374adead89de3e2cb5d7a055b298d6538ce2dea44790b201cef4b437e1af86755ea3bae0c7cd6f8eb4de27f3c610e6db78df4ebf497f4d SHA512 8de1cf0aa61451aa11703e3dadb1fb00a03e3945f4ed2dfb8b4e7fa96f28fd0da2d14124f45e71b5868c72bf62e7488cd63785a4f68c652df618b15f25d43691
+EBUILD libepubgen-0.1.1.ebuild 706 BLAKE2B 00fadb6d869bf4866b3aaaceee60c70284af1ad92e487ec9d382bb329e7ff17e053b5acf22a3aed2494b05bf38498b1037a0e8cd7d0198fecc478e124519dd2c SHA512 b01ef9bedb52c698aa18d64378b41a72f72738cb3f64d1ce8040dc28d193864a1374a92db39f6c85a279eecd271999d163058fb4efc0cb91309628a4214f43e8
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/app-text/libepubgen/libepubgen-0.1.1.ebuild b/app-text/libepubgen/libepubgen-0.1.1.ebuild
new file mode 100644
index 000000000000..2fe034fa1608
--- /dev/null
+++ b/app-text/libepubgen/libepubgen-0.1.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="EPUB generator for librevenge"
+HOMEPAGE="https://sourceforge.net/projects/libepubgen/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="debug doc test"
+
+RDEPEND="
+	dev-libs/librevenge
+"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	test? (
+		dev-util/cppunit
+		dev-libs/libxml2:2
+	)
+"
+
+src_configure() {
+	econf \
+		--disable-weffc \
+		$(use_enable debug) \
+		$(use_with doc docs) \
+		$(use_enable test tests)
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/app-text/master-pdf-editor/Manifest b/app-text/master-pdf-editor/Manifest
index f2ff03b6122f..789fb821d54d 100644
--- a/app-text/master-pdf-editor/Manifest
+++ b/app-text/master-pdf-editor/Manifest
@@ -1,5 +1,7 @@
 DIST master-pdf-editor-4.3.61_qt5.amd64.tar.gz 14950654 BLAKE2B a9dabeecde4a4f8657d29bca61f9ffbc1cb3f4e5f5002afba965a9a444572791a27316257768f3f2b793215f49d538b4ac68b4ae5271e5c1500557ab5cd9a192 SHA512 0c416df191a2796fdafa6014c258166d47037039fcc9205398138a46d59b1f771d9ffe38eb16f22f4300c3e965435300037d7413a86efb997395e6e974baecb5
 DIST master-pdf-editor-4.3.82_qt5.amd64.tar.gz 14934502 BLAKE2B f93c756f9270b2857af02047c6ebd242d35ddaf23b70118d440c21cc7a0718937aa9945bb24adad6544e984f9390e9f49bfce5298bb8bc54f3c705372aff0fd4 SHA512 9bc6b056bdc8ce349dbab139f64c90948f3e0498918f07df6249fee2fad98a35b133aa7913e375366d062e134878feed0fadd097ab1d5504e97884ffa2c37b24
+DIST master-pdf-editor-5.0.15_qt5.amd64.tar.gz 16008649 BLAKE2B ef8fb3a583eb13c0b3c1ecb125e90fc520f6b707cd9d54871eb16ee32b7dea961612e4e0fbb004791edf549dffa18b25e85e61f58024ceeb356b7f968cfd6c6b SHA512 b3f0d3b269b49680bba05c669ad14375710fbb19396c8242caaa564c961660af25c5654f6df2b477272b0a0966c7f46a0221d1792596cccaaf738effbdc369d9
 EBUILD master-pdf-editor-4.3.61.ebuild 1629 BLAKE2B c88f6d22a43d73855583732a4b7c409b2db9af4153e67180b08f7f614458dba1afaef55dbae7f4f0e82f789d7947b801982b36f63f879850c199649934d250b5 SHA512 8c5ac33caf8c69d9a606da47152c84aae104d4b566653003c5e437e5f018a09201a65ffd954f779404bd51cbdce43591e73a6a56867ff1eb3cd1ce6546aa2a9a
 EBUILD master-pdf-editor-4.3.82.ebuild 1457 BLAKE2B 6c12bbe6de844440a5924d0c8b8a417a5ab06c82163316e495da75b97345963d9ff5912b1f8eee42129c631079bd5fa8500a6a935beba441e31d45a4e9f2d287 SHA512 8af3a7995a69b851d0b0e0874d65460fe1e4fa203c7b39db676ed07ec8968a7dd84eeed00e0872216246b893cb6e64f4dce8268cdba022fc7262a25aa684d48b
+EBUILD master-pdf-editor-5.0.15.ebuild 1206 BLAKE2B 6c96819062e25858e9d9ab0edb4d4db7699c22b79b44b7ce47a102467bae4c0c3babfa88eed75355a7faca205f7501ad9aef1dc1a053a0ec74b43a3c1b896b0c SHA512 fcd6190b22638d71ae28b51d5c1247dc114f12ac61228ebb8d8191c68bd37f43b66dcd17bde29ae0fcc8949b2e8087a7f8b491958a2fc81db5005d1ae6c2c62f
 MISC metadata.xml 367 BLAKE2B 8636a0f12f2f2a38aaa943268b978e9269877950e8ec447f4d012e9c1833c474cff5b1d7f53a99f2ec29315858812068e7ab7f42df60127944c8edcda3a5746e SHA512 d54bf635e54008ebabde5039e2527297b8f80204138c90c7744d928041445ca667232a92e6b7ca357f844f2c8ada6b80f13b7de4ae4768e30ec676b55ae73156
diff --git a/app-text/master-pdf-editor/master-pdf-editor-5.0.15.ebuild b/app-text/master-pdf-editor/master-pdf-editor-5.0.15.ebuild
new file mode 100644
index 000000000000..6ef28a8e6ba9
--- /dev/null
+++ b/app-text/master-pdf-editor/master-pdf-editor-5.0.15.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit xdg-utils desktop
+
+DESCRIPTION="Master PDF Editor is a complete solution for viewing and editing PDF files"
+HOMEPAGE="https://code-industry.net/free-pdf-editor/"
+SRC_URI="http://code-industry.net/public/${P}_qt5.amd64.tar.gz"
+
+LICENSE="master-pdf-editor"
+SLOT="0"
+KEYWORDS="~amd64"
+RESTRICT="mirror"
+
+COMMON_DEPEND="
+	>=media-gfx/sane-backends-1.0
+	>=dev-qt/qtsvg-5.4.1:5
+	>=dev-qt/qtnetwork-5.4.1:5
+	>=dev-qt/qtgui-5.4.1:5
+	>=dev-qt/qtprintsupport-5.4.1:5
+"
+
+RDEPEND="${COMMON_DEPEND}"
+
+QA_PREBUILT="/opt/${PN}/masterpdfeditor5"
+
+S="${WORKDIR}/${PN}-${PV%%.*}"
+
+src_install() {
+	insinto /opt/${PN}
+	doins -r fonts lang stamps templates masterpdfeditor5.png
+
+	exeinto /opt/${PN}
+	doexe masterpdfeditor5
+
+	dosym ../${PN}/masterpdfeditor5 /opt/bin/masterpdfeditor5
+	make_desktop_entry "masterpdfeditor5 %f" \
+		"Master PDF Editor ${PV}" /opt/${PN}/masterpdfeditor5.png \
+		"Office;Graphics;Viewer" \
+		"MimeType=application/pdf;application/x-bzpdf;application/x-gzpdf;\nTerminal=false"
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/app-text/openjade/Manifest b/app-text/openjade/Manifest
index e84c35915fc6..59cfd3f7d1db 100644
--- a/app-text/openjade/Manifest
+++ b/app-text/openjade/Manifest
@@ -9,5 +9,5 @@ AUX openjade-1.3.2-respect-ldflags.patch 500 BLAKE2B 65c8a9a71b7141e6fa8d47220e4
 AUX openjade-1.3.2-wchar_t-uint.patch 492 BLAKE2B f08e967feb9944285d0eb7b257841432ef4a462386c4609908e1fc8678e18fcde72d99d49c7f527f7b4e200c16ce834aa2781f8881f424b1e2b029cb7647d395 SHA512 5485e8bf2a781f87b14cef2e1b054604a1bca554a682d6f064c940df0b2eadaa1103085e56d57ec6b5bf816792be6ef954095c90349d30d1dd0e37faf766fc0d
 AUX openjade-1.3.2.dsssl-catalog 269 BLAKE2B 1faaba3f7b351d312c3499005d9b3d71186b8e1cdd8f2144c8b91f384cf8e2e70763bbc929beba64be019b430ef8166d726688f4d1ddeaf5f9aa05b301fae60f SHA512 fba4332fb995c05ae9f9a83cea5422c11ae37ec99b4e37f40edf11acd5be011cff9c7d3b0fcfd0bf2f9569bbe991374678811301ca07a7ef033556309012e340
 DIST openjade-1.3.2.tar.gz 894834 BLAKE2B 972251c63d27f86fa3e1a0760e05213dbac440e7222c81c67dfa6a5c216922ef575705bb7a6093306d6aab771b8a9e1335fb0aaca4b893de5a4d792dc0b55da9 SHA512 c39f70ec8020bd7a2b3e125cbd146b49ddb57910a042bd212da02722617ed5681f32dab60acc26ab89ac658997c6f604911d7be3be391d6278267481f3bcf2f1
-EBUILD openjade-1.3.2-r7.ebuild 3681 BLAKE2B 55b6180e1382199f63eedbd24b378b1f95aa7ed6ba30f42e494a5686c7e418688ca0e5ceb0bfb7b2ec494e0a85966b5ed087514be5929aa53aad6f50e7fddd63 SHA512 7120e658a97872fc5d2f486a8d32473d527d1a828a914ce2c66b03ee1f0eff380b8f4c9caba33b79f73cd083e52557ec8da33d0687157b59e2fb461a0136c351
+EBUILD openjade-1.3.2-r7.ebuild 3678 BLAKE2B 477ff1defb0270a6e61b449c896d22b519acbf77f128b53fc45b09a07624cdbec1629e0e79844b9ee732d291323ed2faa772ab66d4e883a63aa5409a6a4e12bd SHA512 5e3678fa85225737b6880bcab51dd64160431cfc6603722a0112735a7cc2220cd98e5c10d05bd1fa9c3967fd8a3a5eb255f0ae20f4671e1b3ac7244f08fc4a34
 MISC metadata.xml 245 BLAKE2B f01e184cc74cf4d5924bc0d9eaf955adf9797f656ddc41a13443a9c2dbf158ee403dc6f0f39970aa736d87111017b593c93750542a2f2ad539d1a644c96f664e SHA512 5d2a537b74c248094a700b0eeed29425d8d62c36ae30fca3ea8381daf41f74284333344775a108ff374b94b9f334516aa41892a983c825efa855b35a0f110c40
diff --git a/app-text/openjade/openjade-1.3.2-r7.ebuild b/app-text/openjade/openjade-1.3.2-r7.ebuild
index f82ff6a2224e..15297e079041 100644
--- a/app-text/openjade/openjade-1.3.2-r7.ebuild
+++ b/app-text/openjade/openjade-1.3.2-r7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/openjade/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~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"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~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="static-libs"
 
 RDEPEND="app-text/sgml-common
diff --git a/app-text/pdf2htmlEX/Manifest b/app-text/pdf2htmlEX/Manifest
index 5dabb174a324..edd4586f5f50 100644
--- a/app-text/pdf2htmlEX/Manifest
+++ b/app-text/pdf2htmlEX/Manifest
@@ -1,4 +1,4 @@
 DIST pdf2htmlEX-0.14.6.2.tgz 9066685 BLAKE2B b139f72c806e432facce5472e55a23567e74204829956d06bd9ead0426cbadad4ce36c581fb1d39c96eeef27fb416b2c6387dff7b0ca08b10479de24b8ffdc9b SHA512 03d04437386b2eb83530551ff15ce9d21b7990127fa659d204a269405f0d49912c622687eb6920cc4e88be8e94ab41024b378663effb61d1eda905eeb98093d3
 EBUILD pdf2htmlEX-0.14.6.2.ebuild 1017 BLAKE2B a9dda802e28273f531e35b0cea8b7f23602f48f8dd024d6367841d745edb31c39cd9d284ddae57a0cd101f694cd4fb1f2c82571386cffb5749ce9d01d828e890 SHA512 4a2003bd64ad816714b3df3065ebee4158c6ea885ac997cc2f5de19f55f79f4c10f99c97aabdb1d313a9a95f459876b40a9685a7398bba383813cb7bd2707965
-EBUILD pdf2htmlEX-9999.ebuild 1091 BLAKE2B 717cc446930f6dab311fa32f6fa6667134b283d422e6a2329006155d04e11e00c85bcfffcac1b2d8f08117c9d83184344f3ebe11feaacbc15a5eb98b000d8fc7 SHA512 b23b0dbafe433b2d1edc969d6dc6808b2244919f8e59708d92ebc5d2aa4b0bbc66d8c43ec568a84f788450d6802866ab068c6a57cb5ad10f733afde5946b6365
+EBUILD pdf2htmlEX-9999.ebuild 1065 BLAKE2B f34a94bdfa9bdbd7b9e1aa64c408c95907d7b4c3cc9df64381ae481a4d0473299b43a1dbe8e06b9daef03fb6124a3923ec19f1eb820601e0f052264510e043a6 SHA512 8b0459124a1eeb825e60b22c04b433d7c265b2e592ad303b7279c074060742c9974871771f2a4663b40f17367c285156b917d088dda73d8eda136a036194d853
 MISC metadata.xml 355 BLAKE2B da386c9bf8cf6684e23a3bf7638d341b7f8872ecc7d733b946ae697e9e13096df65398f6d4b2d4594b47eba7ec1e482dc8ab14a69395ed1a32c00cdc7d91c2b5 SHA512 c416fe8d4c3edf1055170e0c4cd84fa9da19437c6eab58fde5198561048018ae6b9387d52017dfbc38db717ef370fc70a1dcc0eb37c8843b4e65cfa7e80314ff
diff --git a/app-text/pdf2htmlEX/pdf2htmlEX-9999.ebuild b/app-text/pdf2htmlEX/pdf2htmlEX-9999.ebuild
index 327250408f93..4bba2c9ce1e4 100644
--- a/app-text/pdf2htmlEX/pdf2htmlEX-9999.ebuild
+++ b/app-text/pdf2htmlEX/pdf2htmlEX-9999.ebuild
@@ -22,7 +22,6 @@ IUSE=""
 
 CDEPEND="
 	>=app-text/poppler-0.61.1:=[jpeg,png]
-	<app-text/poppler-0.64.0
 	app-text/poppler-data
 	~media-gfx/fontforge-20170731
 	media-libs/freetype
diff --git a/app-text/sdcv/Manifest b/app-text/sdcv/Manifest
index ba5680c3f962..c7a8a4b4fc11 100644
--- a/app-text/sdcv/Manifest
+++ b/app-text/sdcv/Manifest
@@ -1,4 +1,3 @@
 DIST sdcv-0.5.0-beta2-Source.tar.bz2 51508 BLAKE2B f2cca4dea35df82015607c88b225da593780d027978f5cd9c03d6f31b03d7ca134e0f2be3bd7ad6c4ed71f7c4ce8fab1bdd546914867b247e6c814ca669e7da5 SHA512 e00ce45042ddd289bdf41f8907c9b8ece983bb6c24356f4905c4b017741d664d590c8f9a159aff600e96d8c3edf792a568d6afdf01865484d1cd5d94f7786570
-EBUILD sdcv-0.5.0_beta2-r1.ebuild 1428 BLAKE2B 62563018b8dc46595e76fa29f1e3740c540fa1e303b352a469affd3762a8b27123baf71c520325c3ad0e431f7e344ace54e47264b1cc26b4b77610dc0b696c6e SHA512 f988b97d6d318c3919c309c933a3ef39f276a2e22f040a8ab968ea5c6e12706ddef367e47fd0331a5d10a1a61a2cf27bc00a29b99332c10582fb194799d689c3
-EBUILD sdcv-0.5.0_beta2.ebuild 784 BLAKE2B e4e06b91eeda040259b6a6815b7d2ba929798073cd8601d33fdbfb249a7f80031217d576389d09d5d77870449a05b0055ebeb421fbde8e115a99517cb65f2ee9 SHA512 3421819e4a02b4e62be853a371439040a2ead97b1de3f3f85b725b926212e755ce8047dace4d0bcd528726d391afc5a7ea4ff9982f342a2bfaa12dfe1477bc28
+EBUILD sdcv-0.5.0_beta2-r1.ebuild 1426 BLAKE2B 6711cb854f6f010a06bf7e016de9739d719a3429e400005009847ee53087c4c1c2b49bd64e342b365cbe70d1fd9efbf333bf3287470537585ef29da1f7fe8023 SHA512 c721c50436f5f3224412f6229ca2796ab685bec580702025a341656b1d3b62400e5cbddbeea13ef0178e7635b55ee7616db6ac39c06ce4640ac464d837423d00
 MISC metadata.xml 523 BLAKE2B a3ccbb4d5965978e7eeeda8acc971d81d6ce65f04e4ab0342c1da8d3de0dc5512c8f172a7642b5d1c6f201717f52f6a850f459dfcf61e10fa041a35998c9f0a2 SHA512 d1c4be3dea4d7cf435bb98f6a02cce92925c113fc17c505377659095b53c1857b2730fa2363910630e51dda847f6d85f9dd6dd80abece74b844995ca7a09c8c8
diff --git a/app-text/sdcv/sdcv-0.5.0_beta2-r1.ebuild b/app-text/sdcv/sdcv-0.5.0_beta2-r1.ebuild
index 7eeabd07deb2..f521e22ff60e 100644
--- a/app-text/sdcv/sdcv-0.5.0_beta2-r1.ebuild
+++ b/app-text/sdcv/sdcv-0.5.0_beta2-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_PF}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="darkterm nls"
 
 RDEPEND="sys-libs/zlib
diff --git a/app-text/sdcv/sdcv-0.5.0_beta2.ebuild b/app-text/sdcv/sdcv-0.5.0_beta2.ebuild
deleted file mode 100644
index 84bd106223f1..000000000000
--- a/app-text/sdcv/sdcv-0.5.0_beta2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils
-
-DESCRIPTION="Console version of Stardict program"
-HOMEPAGE="http://sdcv.sourceforge.net"
-MY_PV="${PV/_beta/-beta}-Source"
-MY_PF="${PN}-${MY_PV}"
-S="${WORKDIR}/${MY_PF}"
-SRC_URI="mirror://sourceforge/${PN}/${MY_PF}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="nls"
-
-RDEPEND="sys-libs/zlib
-	sys-libs/readline:=
-	>=dev-libs/glib-2.6.1"
-DEPEND="${RDEPEND}
-	nls? ( >=sys-devel/gettext-0.14.1 )"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_with nls)
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-	cmake-utils_src_compile lang
-}
-
-src_install() {
-	cmake-utils_src_install
-	dodoc AUTHORS NEWS
-}
diff --git a/app-text/sigil/Manifest b/app-text/sigil/Manifest
index e9db6a424fd8..2c857f074f97 100644
--- a/app-text/sigil/Manifest
+++ b/app-text/sigil/Manifest
@@ -1,11 +1,4 @@
-AUX sigil-0.9.4-proper-gumbo-install.patch 1582 BLAKE2B 8ee3adb3a3a97e9a499f771ece023c8a9f3e9cfac046db8d6d3cf6780c653272218e016f83b652ca107ca668bd1a0fadf2f63bbbed7113971e695d7d4cbb45be SHA512 880a34ffddee86e5e66fe6d0ca12798e29af0a3e554fcde69872f9c6cd9e731e8cc02e6a88acafd0e3d418883c6e9346cefcfd7e0c7aae6f05758b2a667fccb6
 AUX sigil-0.9.8-proper-gumbo-install.patch 1351 BLAKE2B d24d6e0be9b7c56c944aad2d97528ef38b3f96b4d81504b1169095112cc939a662101754ccc9f4d8e9303cd0e9d2ad084e8c86c32d73d43720d1a1736ec572d3 SHA512 743250a34b257ca7619b53f4373efed48867f9a059db378ee3d8192e4cc73861ba8eb490b7a72a96ee923b034922eb0224a0ef963d455bdbc1cf6f4425881f89
-DIST Sigil-0.9.5-Code.zip 19224845 BLAKE2B 181ed1cf18ad72df71b4d3a1e42770eb9de98631dbddffbcbd0e279aa6c30624b75d5e03385ea295ec6ec6ebcebfa593c5e48b89fb71e7742bccbf9be1c49946 SHA512 f2e151f716ce57f9bb94d621ae8e5281c6a0cce12e58b49abe959d1f602fbdb8d28f16d5dc418dca871b100efba2fe13f7f2a66c6704346b5a40755a68e8f625
-DIST Sigil-0.9.6-Code.zip 19307454 BLAKE2B 109577f7ba65a07872b84ba4c8adfe93a647da5944b59090fbda4e504d224f12be85cfaebe0045e9106d088c87faeb824cdc27cd6872961aa410ddb1b959543a SHA512 8ae5ce89baf199a10b940d25b3bb3cb97a03dab993e318c5a2b5e6fcba7d4741cbc865f3408d36bd5ad784c35833e4ab3d7b3e282047560d57cd7790c6709417
 DIST Sigil-0.9.8-Code.zip 19807795 BLAKE2B 002626842b2619b94889780a66e4de1f6d6fc9f07e36069608d2edae1078516d7c0fbedad6d4966f2cff64ccd21730719a04c144b3c3c1740ad727448aff8af2 SHA512 18cd137ead965bc97626499ec73dddb8db82b4d538c30f70e62546bd1eeb6e2e76ce7587d572354d973363a07e93ec33b60024bbef7914a22cbfc28a76af2a00
-DIST sigil-0.8.7.tar.gz 19394061 BLAKE2B 9d93c7cacf5e3f10a416f0726c7a11b8e8cfb9b8d8c1310af742bd838ccaf44e33bd36dbd833837268d77d2d34e17ea2c79e93906781316a85b58761c59109d0 SHA512 24b74c835ae1f8fb887c9d2c59b3ccc6720ce1fe8d19a6b0056754ab5ea6e63c34c4b229f4e4b3a880e722876d288e58385f5a0ad15b295f147b77b1acf28652
-EBUILD sigil-0.8.7-r1.ebuild 1277 BLAKE2B 0622505aa25df4368314ea8f179d206fcd3b595f7c0aa5e55a0259b3467963622c4e82d360b3257eb441d4e31da9619e241c18ccc6449237a5fcace2e09aa1f8 SHA512 97fb05e2a1763ea865fc34a6b4277640a43810c02b2bd10d803345ced35badc3c517afa06f50f3cf4d01548f6557681eceba4f453722e609059beefe9308a395
-EBUILD sigil-0.9.5-r2.ebuild 2243 BLAKE2B 7451df7209863e172b66b03cb7ed6c93615bae1c5ce4d1fe952df4f45a2ebee95247f340db100e25980804487186348f7fbdb585b0b3d1e5a463afd684f1dd08 SHA512 42f52a39fdb392464b74c3cfc7cf2a2452214acd6f10a2ec8ed169f191489284fc2436347e5c3df8ee71f3ac8cbd891319edf7adab7d9bfd1f4c7e040ce2a070
-EBUILD sigil-0.9.6.ebuild 2243 BLAKE2B 7451df7209863e172b66b03cb7ed6c93615bae1c5ce4d1fe952df4f45a2ebee95247f340db100e25980804487186348f7fbdb585b0b3d1e5a463afd684f1dd08 SHA512 42f52a39fdb392464b74c3cfc7cf2a2452214acd6f10a2ec8ed169f191489284fc2436347e5c3df8ee71f3ac8cbd891319edf7adab7d9bfd1f4c7e040ce2a070
 EBUILD sigil-0.9.8.ebuild 2243 BLAKE2B 15162b1409146781c53ba3270486745192d0b99173137b2725fbc4d8109ee34ec572828e3978a7104eea91228a725008fdf77e3911d97fce928bfba81a39d8c7 SHA512 602fdbcb111823fdd2f3447567d3cb02d1e3f089410c0c15453958f77775a56ca7282480b1c916a2499dca2a9665f7229f1edd471732ae7914aae50374efbbdf
 MISC metadata.xml 389 BLAKE2B 8f9988168470e8545fa0fa47e520d7019cb9cf1ba8af0c502fa0b66a8a6a4567feea882d0ddc44864aac2193b411010eee2bd7d5905c68b34a32550ba4f6e223 SHA512 0728fc5f14cceb331ea75a6231d176ecbd22defa77b6d90a6859ec6e001feb3cd1f9c57c779bdcf83f81a4f7dca06e120964d6c93e372e39584293addacb5929
diff --git a/app-text/sigil/files/sigil-0.9.4-proper-gumbo-install.patch b/app-text/sigil/files/sigil-0.9.4-proper-gumbo-install.patch
deleted file mode 100644
index 6e7db28fe99a..000000000000
--- a/app-text/sigil/files/sigil-0.9.4-proper-gumbo-install.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -Naur Sigil-0.9.4/internal/gumbo/CMakeLists.txt Sigil-0.9.4.b/internal/gumbo/CMakeLists.txt
---- Sigil-0.9.4/internal/gumbo/CMakeLists.txt	2016-03-13 20:20:52.000000000 +0100
-+++ Sigil-0.9.4.b/internal/gumbo/CMakeLists.txt	2016-03-22 14:50:26.026558216 +0100
-@@ -40,4 +40,5 @@
- 
- if( UNIX AND NOT APPLE )
- 	set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99" )
-+  install( TARGETS sigilgumbo DESTINATION ${CMAKE_INSTALL_PREFIX}/${LIBDIR}/sigil/ )
- endif()
-diff -Naur Sigil-0.9.4/src/CMakeLists.txt Sigil-0.9.4.b/src/CMakeLists.txt
---- Sigil-0.9.4/src/CMakeLists.txt	2016-03-13 20:20:52.000000000 +0100
-+++ Sigil-0.9.4.b/src/CMakeLists.txt	2016-03-22 14:49:49.628556236 +0100
-@@ -1015,12 +1015,10 @@
-     endif()
- 
-     # Standard Linux 'make install'
--    install( TARGETS sigil DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/sigil/ )
-+    install( TARGETS sigil DESTINATION ${CMAKE_INSTALL_PREFIX}/${LIBDIR}/sigil/ )
-     install( PROGRAMS ${LINUX_LAUNCH_INSTALL_SCRIPT_CONFIGURED} DESTINATION ${CMAKE_INSTALL_PREFIX}/bin/ RENAME ${PROJECT_NAME} )
-     if( NOT USE_SYSTEM_LIBS OR NOT HUNSPELL_FOUND )
--        install( PROGRAMS ${HUNSPELL_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/sigil/ )
-     endif()
--    install( PROGRAMS ${GUMBO_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/sigil/ )
-     install( FILES ${LINUX_DESKTOP_FILE} DESTINATION ${SHARE_INSTALL_PREFIX}/share/applications/ )
-     install( FILES ${LINUX_DESKTOP_ICON_FILE} DESTINATION ${SHARE_INSTALL_PREFIX}/share/pixmaps RENAME sigil.png )
-     install( FILES ${QM_FILES} DESTINATION ${SIGIL_SHARE_ROOT}/translations/ )
diff --git a/app-text/sigil/sigil-0.8.7-r1.ebuild b/app-text/sigil/sigil-0.8.7-r1.ebuild
deleted file mode 100644
index 1fa96bf64425..000000000000
--- a/app-text/sigil/sigil-0.8.7-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# This ebuild could use some python checks, as sigil contains python plugin architecture.
-
-inherit cmake-utils
-
-MY_PN="Sigil"
-
-DESCRIPTION="Sigil is a multi-platform WYSIWYG ebook editor for ePub format"
-HOMEPAGE="https://sigil-ebook.com/"
-SRC_URI="https://github.com/Sigil-Ebook/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=app-text/hunspell-1.3.2
-	>=dev-libs/boost-1.49[threads]
-	>=dev-libs/libpcre-8.31[pcre16]
-	>=dev-libs/xerces-c-3.1.1[icu]
-	>=dev-qt/qtconcurrent-5.4:5
-	>=dev-qt/qtcore-5.4:5
-	>=dev-qt/qtgui-5.4:5
-	>=dev-qt/qtnetwork-5.4:5
-	>=dev-qt/qtprintsupport-5.4:5
-	>=dev-qt/qtsvg-5.4:5
-	>=dev-qt/qtwebkit-5.4:5
-	>=dev-qt/qtwidgets-5.4:5
-	>=dev-qt/qtxml-5.4:5
-	>=dev-qt/qtxmlpatterns-5.4:5
-	>=sys-libs/zlib-1.2.7[minizip]
-"
-DEPEND="${RDEPEND}
-	>=sys-devel/gcc-4.8
-	virtual/pkgconfig
-	>=dev-qt/linguist-tools-5.4:5
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-DOCS=( README.md )
-
-src_prepare() {
-	# sigil tries to copy non-needed qt libs for deb package, safe to ignore this completely
-	sed -e '/set( QT_LIBS/d' -i src/Sigil/CMakeLists.txt || die "sed failed"
-
-	cmake-utils_src_prepare
-}
diff --git a/app-text/sigil/sigil-0.9.5-r2.ebuild b/app-text/sigil/sigil-0.9.5-r2.ebuild
deleted file mode 100644
index 6418c4507528..000000000000
--- a/app-text/sigil/sigil-0.9.5-r2.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_4 python3_5 )
-
-inherit cmake-utils python-single-r1
-
-my_pn="Sigil"
-
-DESCRIPTION="Sigil is a multi-platform WYSIWYG ebook editor for ePub format"
-HOMEPAGE="https://sigil-ebook.com/"
-SRC_URI="https://github.com/Sigil-Ebook/${my_pn}/releases/download/${PV}/${my_pn}-${PV}-Code.zip"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	app-text/hunspell
-	dev-libs/boost[threads]
-	dev-libs/libpcre[pcre16]
-	dev-libs/xerces-c[icu]
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/cssselect[${PYTHON_USEDEP}]
-	dev-python/cssutils[${PYTHON_USEDEP}]
-	dev-python/html5lib[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/regex[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	>=dev-qt/qtconcurrent-5.4:5
-	>=dev-qt/qtcore-5.4:5
-	>=dev-qt/qtgui-5.4:5
-	>=dev-qt/qtprintsupport-5.4:5
-	>=dev-qt/qtwebkit-5.4:5
-	>=dev-qt/qtwidgets-5.4:5
-	>=dev-qt/qtxmlpatterns-5.4:5
-	sys-libs/zlib[minizip]
-"
-DEPEND="${RDEPEND}
-	>=sys-devel/gcc-4.8
-	virtual/pkgconfig
-	>=dev-qt/linguist-tools-5.4:5
-	app-arch/unzip
-"
-
-S="${WORKDIR}"
-
-PATCHES=(
-	# sigil tries to copy non-needed qt libs for deb package, safe to ignore this completely
-	"${FILESDIR}"/${PN}-0.9.4-proper-gumbo-install.patch
-)
-DOCS=( ChangeLog.txt README.md )
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_SYSTEM_LIBS=1
-		-DSYSTEM_LIBS_REQUIRED=1
-		-DLIBDIR="$(get_libdir)"
-	)
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	elog "From Sigil's release notes:"
-	elog "When you fire up Sigil for the very first time:"
-	elog "navigate to the new General Preferences and select the default"
-	elog "epub version you plan to work with (epub 2 or epub3) so that new"
-	elog "empty ebooks start with the correct code."
-	elog "if you plan to work with epub3 epubs, you should change your"
-	elog "PreserveEntities setting to use ONLY NUMERIC entities."
-	elog ""
-	elog "For example use & # 1 6 0 ; for non-breaking spaces and etc."
-	elog ""
-	elog "We strongly recommend enabling Mend On Open in your settings"
-	elog "for best performance with Sigil."
-}
diff --git a/app-text/sigil/sigil-0.9.6.ebuild b/app-text/sigil/sigil-0.9.6.ebuild
deleted file mode 100644
index 6418c4507528..000000000000
--- a/app-text/sigil/sigil-0.9.6.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_4 python3_5 )
-
-inherit cmake-utils python-single-r1
-
-my_pn="Sigil"
-
-DESCRIPTION="Sigil is a multi-platform WYSIWYG ebook editor for ePub format"
-HOMEPAGE="https://sigil-ebook.com/"
-SRC_URI="https://github.com/Sigil-Ebook/${my_pn}/releases/download/${PV}/${my_pn}-${PV}-Code.zip"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	app-text/hunspell
-	dev-libs/boost[threads]
-	dev-libs/libpcre[pcre16]
-	dev-libs/xerces-c[icu]
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/cssselect[${PYTHON_USEDEP}]
-	dev-python/cssutils[${PYTHON_USEDEP}]
-	dev-python/html5lib[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/regex[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	>=dev-qt/qtconcurrent-5.4:5
-	>=dev-qt/qtcore-5.4:5
-	>=dev-qt/qtgui-5.4:5
-	>=dev-qt/qtprintsupport-5.4:5
-	>=dev-qt/qtwebkit-5.4:5
-	>=dev-qt/qtwidgets-5.4:5
-	>=dev-qt/qtxmlpatterns-5.4:5
-	sys-libs/zlib[minizip]
-"
-DEPEND="${RDEPEND}
-	>=sys-devel/gcc-4.8
-	virtual/pkgconfig
-	>=dev-qt/linguist-tools-5.4:5
-	app-arch/unzip
-"
-
-S="${WORKDIR}"
-
-PATCHES=(
-	# sigil tries to copy non-needed qt libs for deb package, safe to ignore this completely
-	"${FILESDIR}"/${PN}-0.9.4-proper-gumbo-install.patch
-)
-DOCS=( ChangeLog.txt README.md )
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_SYSTEM_LIBS=1
-		-DSYSTEM_LIBS_REQUIRED=1
-		-DLIBDIR="$(get_libdir)"
-	)
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	elog "From Sigil's release notes:"
-	elog "When you fire up Sigil for the very first time:"
-	elog "navigate to the new General Preferences and select the default"
-	elog "epub version you plan to work with (epub 2 or epub3) so that new"
-	elog "empty ebooks start with the correct code."
-	elog "if you plan to work with epub3 epubs, you should change your"
-	elog "PreserveEntities setting to use ONLY NUMERIC entities."
-	elog ""
-	elog "For example use & # 1 6 0 ; for non-breaking spaces and etc."
-	elog ""
-	elog "We strongly recommend enabling Mend On Open in your settings"
-	elog "for best performance with Sigil."
-}
diff --git a/app-text/t1utils/Manifest b/app-text/t1utils/Manifest
index e115fea380f8..a38c7d215d72 100644
--- a/app-text/t1utils/Manifest
+++ b/app-text/t1utils/Manifest
@@ -1,9 +1,7 @@
 AUX t1utils-1.41-memmem.patch 703 BLAKE2B 3d7801d11e9120701c3229bb495d5cbef8b538a1486bcbe40039b2915af9ed11c444f20914d8e678af4a8beb9db999052c53d7bb04ea912f0c665871ec7848fb SHA512 ab7a8f5273aaf478c4e2fd9aa201d5b081adfa431e147ccd429ca5eaefca1858008e09dbe62d7847ae3fe307d5b1f72a16093d026f7d73f665531abde5f5c60b
 DIST t1utils-1.39.tar.gz 175047 BLAKE2B 346c6a400351e3662cb7ab88183c2f3b3934d4dd124742c06513c0d582d1359803fb32272ebb6744a227e1a862e7c55f195273087c8cc401a8bdf507227b967d SHA512 930fa0f264136fdc5d3d18e9a3b45c4818413d01ed12a32daa1b5ecfcc0ea4d6554faf428c6bab9247a2cfc16973787c0b6f0dfbb0273fa6a03a3e8d1d501301
-DIST t1utils-1.40.tar.gz 176192 BLAKE2B fedad4e273c7994f9de5d8a9f88cdaf305608807a18bf7db4cd61ddee3194ee7829c829f4608ee87d7068a627fbdab116a61bef4ed1918ab9e71516f210e4293 SHA512 790a6196b9dedd7ff7b25b7933678190d6380a341d543ca9064372c2c1c8eb8114a054dadd67f7f198084f1d7ed2cc10d78a6dbee6805b8e614328e0809a1807
 DIST t1utils-1.41.tar.gz 176552 BLAKE2B 69ccc07a3b98de18355b09532129f80e4188d64817a1ad4e8439b3a0e37917a63b9e187a25fedfc5aba486b2e60279586a425992e9f25a111ba9c77ed3863f6e SHA512 b532d3af38a73903a512eb1297ba7510747dcbe8362acc4a0f20f2a3c786d82d8f5b22997ed3867114f33153a34cdd71c4c8e6a093db3cecc3825b6e4725a00b
 EBUILD t1utils-1.39.ebuild 644 BLAKE2B 9c15a7a5374adb05e68cd58074357208f53aa1d8e77aefc156577442879097696f939aebf22f745917c3cda777859e35eed43f2d646dfe65d6f64ab5ba5ada9b SHA512 b3a01745789d41b50a4ae48bfc020cc8d85da4c4b72e43976b45ff8b6cd8a542cc461afedac3452d7b39f23417d59acecc886a4c87e3ee3515693f63c9230e2d
-EBUILD t1utils-1.40.ebuild 653 BLAKE2B 0ee9782426adf8898907e8c13a322e2ce810033b9b982ce72470f93989306a1545108d73a0ceb49dc1936292bfd604adef502a9b2a54310c1fafd92ec022d8f3 SHA512 78a5fd5ed3596e25b8d37ab9dee52c143f08b8a87aa77c65988d3f66f689164e3f93f52facdb8c6bc039f1d8eab4f483629e0e8bb3524e6f64c4f2a898c0ec19
 EBUILD t1utils-1.41-r1.ebuild 582 BLAKE2B 42785ac05287fd06f1656f0f92e3b0ba85c4ef25302581b6b736b935db13a3f1bf2324a222e730c4fa5ecffd56a8302d2a335159dfe0478dc3adcd1b51f71f96 SHA512 ec09c0b28ff09f1add4d9436df2c3fe293980ade630d31e58a0831140cc2ec68268ce59e1d4c7cb81e288420e42a2620154516783b456b55f8b072365334be18
 EBUILD t1utils-1.41-r2.ebuild 687 BLAKE2B 2758b3ee7c62fa6b6e9db3b1fcae9aa432ecb06f0ae701f5ef52de545fe6a426da68e611ae0e47217b7a6b6bef662ee9d471ac6ab91c2bf8722f76627b30f1af SHA512 34328663ef83080d489b5731909aebd3e5406077170e4a6fc0a75c8f3a1f1a2ad79e0a70339cf8ad7b83239092a1af458a8b6b18f07d0d3a11cc3e3fc5559f44
 MISC metadata.xml 347 BLAKE2B 2f19fa13fe0a6a3f521653e00c787e1e5b61a0d53ef30e06efb6ef104d560e90417512d9e72bed79f51a81bd465494ac469f23246705876cfb91da82fe31cddb SHA512 6a4884011de9218a6c0417b64690cc76c9c5be7a525f4439fb04e70c3ed287080fdb5707004d611107dee69230bb1f892078260bd18dfe7aa824d88e23dffc16
diff --git a/app-text/t1utils/t1utils-1.40.ebuild b/app-text/t1utils/t1utils-1.40.ebuild
deleted file mode 100644
index 1fefc90782cf..000000000000
--- a/app-text/t1utils/t1utils-1.40.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-IUSE=""
-
-DESCRIPTION="Type 1 Font utilities"
-SRC_URI="http://www.lcdf.org/type/${P}.tar.gz"
-HOMEPAGE="http://www.lcdf.org/type/#t1utils"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~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"
-SLOT="0"
-LICENSE="BSD"
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	!<media-libs/freetype-1.4_pre20080316"
-
-src_install () {
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc NEWS README
-}
diff --git a/app-text/texlive-core/Manifest b/app-text/texlive-core/Manifest
index ec1a0f0a45d5..02c2a975e754 100644
--- a/app-text/texlive-core/Manifest
+++ b/app-text/texlive-core/Manifest
@@ -319,6 +319,6 @@ DIST texlive-module-web-2017.tar.xz 524 BLAKE2B 264e7fdff3293d66b4793974995f3522
 DIST texlive-module-web.doc-2016.tar.xz 41924 BLAKE2B 020be249269dc535725cf30618b28fec3b107cc861319d25ff4854e4407361c1194821e493303be6603e1aabfa458ba213d7f5923fbc752d746d9d9024dd29d4 SHA512 1f47b9fe15e48f0c29e754ce51c563bd44bd31c5f8dc0810a0ea6c42b24e2a8b70e02ec38dcb14e6aa6603fa34d0ba72d6ae481088e105a8972c4d364df1af40
 DIST texlive-module-web.doc-2017.tar.xz 41924 BLAKE2B 020be249269dc535725cf30618b28fec3b107cc861319d25ff4854e4407361c1194821e493303be6603e1aabfa458ba213d7f5923fbc752d746d9d9024dd29d4 SHA512 1f47b9fe15e48f0c29e754ce51c563bd44bd31c5f8dc0810a0ea6c42b24e2a8b70e02ec38dcb14e6aa6603fa34d0ba72d6ae481088e105a8972c4d364df1af40
 EBUILD texlive-core-2016-r6.ebuild 11521 BLAKE2B 0ee71aaf90d8803d9f125ea694268fe9e4ff50e5affdeaa3d7b2a9e2b014028eee543c3fcf0131e5ac86c36328d983023304118813e7244ff353ad2bef7b182e SHA512 1d78173f44f67d97f389256573aad38cb43eb87e4f202480bbe2aa30f9a27b626056aaa50b791e939f09652d031d2a23406597f96cef55ad928c37ed973e49b7
-EBUILD texlive-core-2017-r3.ebuild 11617 BLAKE2B bf43718d6880773265bf2a92fe7917e454eac57f971cedb9834567823248383c06e57728a911cff591ab5afde636a26b110ff42d762373d4cef395c1b79217b3 SHA512 c2bf5307f56da0e6fc81bedc2708e2c5e81216fd990bea46273ca013d87a5667dd6e94c85c98f1b0a77b428144c657fc1ede61ae3aecac9f83d7a8e1418232eb
-EBUILD texlive-core-2017-r4.ebuild 11821 BLAKE2B 62559c2b3c51c9bac7208e1021773307120c4edfc1b9a5c7d962b744807fadabe9054b1f2442d389fa5e0ada4e88bf62011f1878139293606831e3cdb6c310cd SHA512 e675228dc4887beb96649daed4cf3f11f193f4f2d617226949a417532bc7db21d158ae700136155ea579d106830cf7415dab2566dd75115c8a73fcadbc35c736
+EBUILD texlive-core-2017-r3.ebuild 11616 BLAKE2B 1285fa47a8f24b7f055728e71e83208e21687491063b3edba33fbc254f92f5d5c20e899ded68ec8b4fd9200025bb4c88ab3c24e3e3c5a3bfc68dcdb33fc42af2 SHA512 0f2f0d97ff0933bb680a5a591d34b63b9c898dda27e908e7404ab0ffe7190d620b70a9900945c556cd5269944f46986681bdb94ebef8ece7dede2679651eae73
+EBUILD texlive-core-2017-r4.ebuild 11820 BLAKE2B 45c785077cb15ae9f771deaad2d9139ac24447e4692c11c0af7083d1bded2c15583c0ba7ae5f22536ca6d75e9c7d5ea9d2215c7f5d179e269956b7740ab1a4e3 SHA512 21618e4f6243b34c0cc88b87084fcd09f35227697d89580d3fbf7c1885d35e76ad0ff659a143a74ee6f713c42b8d36ab24a260e4e4bc2a1b322b3b90ed837278
 MISC metadata.xml 661 BLAKE2B 23fd3817c5a9861b9adec9a78b6dcae0a23743cf685560a86a991896ed8f102fe66aa15a416939829c0c085cdfee24668f7a07631b3f4aeee469002f35b481e6 SHA512 c00ae9537fced06990a4ffff5fbe5101670ce1d84c879c0e9eeaf5c979107dd6a1f92f8f8271731b6c4818abead15b759fc9958ece317e554effbd3cb23fd2b9
diff --git a/app-text/texlive-core/texlive-core-2017-r3.ebuild b/app-text/texlive-core/texlive-core-2017-r3.ebuild
index adf3b9b004ec..29ea8dc071dd 100644
--- a/app-text/texlive-core/texlive-core-2017-r3.ebuild
+++ b/app-text/texlive-core/texlive-core-2017-r3.ebuild
@@ -74,7 +74,7 @@ for i in ${TL_CORE_EXTRA_SRC_MODULES}; do
 done
 SRC_URI="${SRC_URI} )"
 
-KEYWORDS="alpha amd64 arm arm64 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"
+KEYWORDS="alpha amd64 arm arm64 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
@@ -118,7 +118,7 @@ COMMON_DEPEND="${MODULAR_X_DEPEND}
 	cjk? ( >=dev-libs/ptexenc-1.3.5 )"
 
 DEPEND="${COMMON_DEPEND}
-	<media-libs/freetype-2.9.1-r2
+	<media-libs/freetype-2.9.1-r3
 	virtual/pkgconfig
 	sys-apps/ed
 	sys-devel/flex
diff --git a/app-text/texlive-core/texlive-core-2017-r4.ebuild b/app-text/texlive-core/texlive-core-2017-r4.ebuild
index 44ef1da83724..53455753c23f 100644
--- a/app-text/texlive-core/texlive-core-2017-r4.ebuild
+++ b/app-text/texlive-core/texlive-core-2017-r4.ebuild
@@ -76,7 +76,7 @@ for i in ${TL_CORE_EXTRA_SRC_MODULES}; do
 done
 SRC_URI="${SRC_URI} )"
 
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~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