gentoo resync : 07.01.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-01-07 18:44:07 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2018-01-07 18:44:07 +0000
commit: 5001a6c7b6da2956f5b17c695b1e0059dc7b8de5 (patch)
tree: 0528a53855a7ec96d20cde9edb9031aab030224c /app-text
parent: a8b0d35ab742f31538d515dea39716e566d533c0 (diff)
28 files changed, 1494 insertions, 73 deletions
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 10c0644dcefd..5c8936d231bb 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index 7c122481a546..ea226e5d5341 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -6,9 +6,11 @@ AUX calibre-server-3.init 1796 BLAKE2B f87d785d6f6fc10fa648d40944ec8538027854bb8
 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.3.0.tar.xz 36308116 BLAKE2B fe331df77ed256fb509028e777bd628cb7b316ae99d594c7335216c08e509de32df03ebe3c1393e2cdf6618b4a3820458d2bf9045380c43f979218544cb7757d SHA512 bb63f83d5e35079daba9ec6e7849e6a65c51cf0b2da9fc45b86a2b64cc147f862f08413730f3d2710793de7b045fc73913534dfca11b128ad0ea72e92033f977
 DIST calibre-3.8.0.tar.xz 37922608 BLAKE2B 6ae465da15a50f45621753b4f8fdcb978fa3b3cf170575cca0a9e4ae3cd324fbb4b194861180961539f8057ce3650066d7113368dee404d899ed8ca1a58f80e6 SHA512 db7ff5cb0ee82b3237090cbf6a13d13bfa5e27139dd067290ed59d407d2dbbae2ecd3dab338a0beed845079387a051b092233350091ef6ec82623d3a16b1d48d
 EBUILD calibre-2.78.0.ebuild 8033 BLAKE2B aa37993a33ea21f966b27673b972187c6fc0270ccd8db61af32114e7fe99cb39386399e55be7960196c2c419f87bb987a3f4e9ed335cdf5a4fcc8b6848f93c87 SHA512 c65f281218b26c1f77c6e226ab86bce7dab3089c99e5a8be39b52cf6f77c643520cfb5a1026d303a09964044bfe6c9ff2f5dc1fef1a625a61354a9d950d43487
+EBUILD calibre-3.15.0.ebuild 8880 BLAKE2B 13ea9ab57da2e5fce9e71707dc8711b6a95c642a12929e7144050f3b3aad01304fb9b00bfff6dac410dfb46cb4da47fb0cd94afcf3cd9b418fe130c2c54453d1 SHA512 6dace15dc9be284ad89113c8c6b9387b6bf30a4c3e2500dfc635c921d3a3d4cf8213e5731989bdb18fa2b8c7b1bff07c889f220cd799f07b076c7ebef85ac415
 EBUILD calibre-3.3.0.ebuild 8800 BLAKE2B be17c2dfa92c94084805d2c8dd736f8f8369b79bf2af8b78ce5a0cc0288162f97856a0c792e441b94635eb22ea4493785db72d02ce337beaecab199aafaa9833 SHA512 581cb6b0331a058b013cf32de5b7d87b7ddf35482f91c62dbb947d392c90d46cf58690780534a1bb2c243dca2cee1b015b0ef361ed9763fe3cddd20ef2faafb8
 EBUILD calibre-3.8.0.ebuild 8843 BLAKE2B 5bc3d0722e890fed9a95292f8fe6e27dcc5d502a4850335bf221f1cd6a9c6ec0c703819a199d79b0ab01b72ffbd0134d48b4435a6ed30c91272843b0b4a5193a SHA512 41a12022df5a61a6b7308a65c34cb04eb25187d6da72691bfe6d60f39b7fe6e33ce48fe4fd03d576193df41e246bfc61c0086266f1584093739a0709602b949a
 MISC metadata.xml 382 BLAKE2B 87fa7e63a6ed7a4ea55247b362288b43f7edd312cc3085bb8c1b947402ae4aa0df01fac4f6646d260653ff8af7fe28d3dabb8a213dbf3e206181b69835b33d5f SHA512 8503e0a4a48d93682c386eb1d6507b4b26585afc9d62b7cd52bc00b457a887bd17422a03669ff404570ff7f5ff6f0bba14ee935979f8b54722870d6620097de5
diff --git a/app-text/calibre/calibre-3.15.0.ebuild b/app-text/calibre/calibre-3.15.0.ebuild
new file mode 100644
index 000000000000..ec7d26d14536
--- /dev/null
+++ b/app-text/calibre/calibre-3.15.0.ebuild
@@ -0,0 +1,279 @@
+# 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 fdo-mime bash-completion-r1 multilib toolchain-funcs python-single-r1
+
+DESCRIPTION="Ebook management application"
+HOMEPAGE="http://calibre-ebook.com/"
+SRC_URI="http://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-libs/libinput:=
+	>=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/qtdbus:5=
+	dev-qt/qtgui:5=
+	dev-qt/qtwidgets:5=
+	media-fonts/liberation-fonts
+	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/libxkbcommon:=
+	x11-libs/libX11:=
+	x11-libs/libXext:=
+	x11-libs/libXrender:=
+	>=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"
+
+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() {
+	# 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
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
diff --git a/app-text/diffpdf/Manifest b/app-text/diffpdf/Manifest
index a7ccbc765da2..10492097d14b 100644
--- a/app-text/diffpdf/Manifest
+++ b/app-text/diffpdf/Manifest
@@ -1,3 +1,5 @@
+AUX diffpdf-2.1.3-qt5.patch 6240 BLAKE2B c4f522b41e4b036222f832e194088d2377f5063d35e8eb73714745db7a993d9b38fd9e5111eee69d7f2d86710a45289a8e54d25b8a3217b1ddd2fe53bd59b468 SHA512 96ae465bb5b27ff0b26a7c4686e7656af025669b418b755878627b1baf4b91bf14833e951f80c6510d907419efdb8759dffca3f5b7fb517b5bf20ae1ee6b3406
+AUX diffpdf.desktop 152 BLAKE2B e85754380c3e607d6bfe0f4db875983596f8e562d48b8bb732e26a23f9cb6137d7ec700ac2d0596fa3a13d79b6c527de671f46825646e266cf5579f33a1a1511 SHA512 3568a49e3fdcb2fa47688fce4d818cb01545d854890806e4508f228b18b712cbb5641a6e173927990e81c9086bdb49f5b4ffd870e5f0345f26de1b4e799eb0d7
 DIST diffpdf-2.1.3.tar.gz 91856 BLAKE2B a94b710674508a5b77ca1e18b48e906568b49ecf10ce5f96d425fceb91746922fdf454ee20ec77913cf3d7467e559e59257e7415bf96c44b9c136e1708d4e73f SHA512 137e00f7c1d696b097f271c51fa5f19d471efb85fb3d5381c096c32f1ff824083b1122bbefa758fb9320ac8e0c9c16e6b88c8b6286bd98388d88c45c714a948d
-EBUILD diffpdf-2.1.3.ebuild 678 BLAKE2B b02353d8a5f25b2500f04c63c8f810e5cd1c5ea0cca37f27b3df579016a976b28f28e499f4e7229e2b0dff6ca732d04b96c139e364f4f0307083d2ab6a848af5 SHA512 36af124c32eb8a4255dd137e83ae5c05253ba706088d8144f0e38d1146db1b40ec4653dbddbf6d5c41407208550b8193960e91954d8eceb52fae2dd4eb3ee476
+EBUILD diffpdf-2.1.3-r1.ebuild 801 BLAKE2B 7b1e48d31371bb35da8e84e3cdc2e8d88449e3a772f1f12171bc93e61a936ec49d3ef854d6022b49a295b4b1cb79c5d75e338300e91ba0735e73918c622d67cb SHA512 ed8a68efb77814f627f4ab85d195697814942ab2976e6f415ac3481db967921bd5919515175b0072c4630ff87272d1dda0729bacada1ee05ee03619aaa8ce400
 MISC metadata.xml 247 BLAKE2B 317f906045f70ecc77ab85491b683c74618c027d768a499226ea0c46d214b783ff308f6bcb79c1edfaf3c4a01821afd529786bf5ad2cf73e0570aac56177d36e SHA512 4ae39ceedf573357554a383ccfab1d716abb7265c3a1eb407d1dc4bf3b38fc91b5cdeec8ba0bad84efb2595aebb6d115ade1575e12812079e47797b7dcd3fa7a
diff --git a/app-text/diffpdf/diffpdf-2.1.3-r1.ebuild b/app-text/diffpdf/diffpdf-2.1.3-r1.ebuild
new file mode 100644
index 000000000000..1de17d540dfc
--- /dev/null
+++ b/app-text/diffpdf/diffpdf-2.1.3-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit desktop qmake-utils
+
+DESCRIPTION="Program that textually or visually compares two PDF files"
+HOMEPAGE="http://www.qtrac.eu/diffpdf.html"
+SRC_URI="http://www.qtrac.eu/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	app-text/poppler:=[qt5]
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+"
+
+PATCHES=( "${FILESDIR}"/${P}-qt5.patch )
+
+src_configure() {
+	$(qt5_get_bindir)/lrelease diffpdf.pro || die "Generating translations failed"
+	eqmake5 PREFIX="${EPREFIX}/usr" diffpdf.pro
+}
+
+src_install() {
+	einstalldocs
+	dobin diffpdf
+	doman diffpdf.1
+	domenu "${FILESDIR}"/${PN}.desktop
+	newicon images/icon.png ${PN}.png
+}
diff --git a/app-text/diffpdf/diffpdf-2.1.3.ebuild b/app-text/diffpdf/diffpdf-2.1.3.ebuild
deleted file mode 100644
index 51e213918991..000000000000
--- a/app-text/diffpdf/diffpdf-2.1.3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit qt4-r2 eutils qmake-utils
-
-DESCRIPTION="Program that textually or visually compares two PDF files"
-HOMEPAGE="http://www.qtrac.eu/diffpdf.html"
-SRC_URI="http://www.qtrac.eu/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE=""
-
-DEPEND="
-	app-text/poppler:=[qt4]
-	>=dev-qt/qtcore-4.6:4
-	>=dev-qt/qtgui-4.6:4
-"
-RDEPEND="${DEPEND}"
-
-DOCS="README"
-
-src_configure() {
-	$(qt4_get_bindir)/lrelease diffpdf.pro || die 'Generating translations failed'
-	qt4-r2_src_configure
-}
-
-src_install() {
-	qt4-r2_src_install
-
-	dobin diffpdf
-	doman diffpdf.1
-}
diff --git a/app-text/diffpdf/files/diffpdf-2.1.3-qt5.patch b/app-text/diffpdf/files/diffpdf-2.1.3-qt5.patch
new file mode 100644
index 000000000000..a7821388aa87
--- /dev/null
+++ b/app-text/diffpdf/files/diffpdf-2.1.3-qt5.patch
@@ -0,0 +1,173 @@
+Description: Build with Qt5
+ Enough changes to make things build with Qt5
+Author: Sune Vuorela <sune@debian.org>
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: https://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: 2017-11-25
+
+--- diffpdf-2.1.3.orig/aboutform.cpp
++++ diffpdf-2.1.3/aboutform.cpp
+@@ -11,7 +11,6 @@
+ */
+ 
+ #include "aboutform.hpp"
+-#include <poppler-version.h>
+ #include <QApplication>
+ #include <QHBoxLayout>
+ #include <QSettings>
+@@ -52,7 +51,7 @@ AboutForm::AboutForm(QWidget *parent) :
+     "</ul>"
+     "I also provide training and consultancy in C++, Go, Python&nbsp;2, "
+     "Python&nbsp;3, C++/Qt, and PyQt4.").arg(qApp->applicationName())
+-            .arg(Version).arg(qVersion()).arg(POPPLER_VERSION));
++            .arg(Version).arg(qVersion()).arg("Qt 5"));
+     QTextBrowser *contributorsBrowser = new QTextBrowser;
+     contributorsBrowser->setReadOnly(true);
+     contributorsBrowser->setHtml(tr("<table>"
+--- diffpdf-2.1.3.orig/diffpdf.pro
++++ diffpdf-2.1.3/diffpdf.pro
+@@ -31,35 +31,39 @@ TRANSLATIONS += diffpdf_fr.ts
+ TRANSLATIONS += diffpdf_de.ts
+ TRANSLATIONS += diffpdf_es.ts
+ CODECFORTR    = UTF-8
+-LIBS	     += -lpoppler-qt4
++LIBS	     += -lpoppler-qt5
++ QMAKE_CFLAGS += $$(CPPFLAGS) $$(CFLAGS)
++ QMAKE_CXXFLAGS += $$(CPPFLAGS) $$(CXXFLAGS)
++ QMAKE_LFLAGS += $$(LDFLAGS)
++QT += widgets printsupport
+ win32 {
+     CONFIG += release
+ }
+ exists($(HOME)/opt/poppler024/) {
+     message(Using locally built Poppler library)
+     INCLUDEPATH += $(HOME)/opt/poppler024/include/poppler/cpp
+-    INCLUDEPATH += $(HOME)/opt/poppler024/include/poppler/qt4
++    INCLUDEPATH += $(HOME)/opt/poppler024/include/poppler/qt5
+     LIBS += -Wl,-rpath -Wl,$(HOME)/opt/poppler024/lib -L$(HOME)/opt/poppler024/lib
+ } else {
+     exists(/poppler_lib) {
+ 	message(Using locally built Poppler library on Windows)
+ 	INCLUDEPATH += /c/poppler_lib/include/poppler/cpp
+-	INCLUDEPATH += /c/poppler_lib/include/poppler/qt4
++	INCLUDEPATH += /c/poppler_lib/include/poppler/qt5
+ 	LIBS += -Wl,-rpath -Wl,/c/poppler_lib/bin -Wl,-L/c/poppler_lib/bin
+     } else {
+-	exists(/usr/include/poppler/qt4) {
++	exists(/usr/include/poppler/qt5) {
+ 	    INCLUDEPATH += /usr/include/poppler/cpp
+-	    INCLUDEPATH += /usr/include/poppler/qt4
++	    INCLUDEPATH += /usr/include/poppler/qt5
+ 	} else {
+ 	    INCLUDEPATH += /usr/local/include/poppler/cpp
+-	    INCLUDEPATH += /usr/local/include/poppler/qt4
++	    INCLUDEPATH += /usr/local/include/poppler/qt5
+ 	}
+     }
+ }
+ #exists($(HOME)/opt/podofo09/) {
+ #    message(Using locally built PoDoFo library)
+ #    INCLUDEPATH += $(HOME)/opt/podofo09/include/poppler/cpp
+-#    INCLUDEPATH += $(HOME)/opt/podofo09/include/poppler/qt4
++#    INCLUDEPATH += $(HOME)/opt/podofo09/include/poppler/qt5
+ #    LIBS += -Wl,-rpath -Wl,$(HOME)/opt/podofo09/lib64 -Wl,-L$(HOME)/opt/podofo09/lib64
+ #} else {
+ #    exists(/usr/include/podofo) {
+--- diffpdf-2.1.3.orig/generic.hpp
++++ diffpdf-2.1.3/generic.hpp
+@@ -12,7 +12,7 @@
+     for more details.
+ */
+ 
+-#include <poppler-qt4.h>
++#include <poppler-qt5.h>
+ #include <QMetaType>
+ #include <QPair>
+ #include <QPixmap>
+--- diffpdf-2.1.3.orig/helpform.cpp
++++ diffpdf-2.1.3/helpform.cpp
+@@ -11,7 +11,6 @@
+ */
+ 
+ #include "helpform.hpp"
+-#include <poppler-version.h>
+ #include <QApplication>
+ #include <QFile>
+ #include <QKeySequence>
+--- diffpdf-2.1.3.orig/label.cpp
++++ diffpdf-2.1.3/label.cpp
+@@ -15,6 +15,7 @@
+ #include <QDragEnterEvent>
+ #include <QDragEnterEvent>
+ #include <QMouseEvent>
++#include <QMimeData>
+ 
+ Label::Label(QWidget *parent) : QLabel(parent)
+ {
+--- diffpdf-2.1.3.orig/lineedit.cpp
++++ diffpdf-2.1.3/lineedit.cpp
+@@ -14,6 +14,7 @@
+ #include "lineedit.hpp"
+ #include <QDragEnterEvent>
+ #include <QDragEnterEvent>
++#include <QMimeData>
+ 
+ 
+ LineEdit::LineEdit(QWidget *parent) : QLineEdit(parent)
+--- diffpdf-2.1.3.orig/main.cpp
++++ diffpdf-2.1.3/main.cpp
+@@ -31,7 +31,6 @@ int main(int argc, char *argv[])
+     app.setOrganizationDomain("qtrac.eu");
+     app.setApplicationName("DiffPDF");
+     app.setWindowIcon(QIcon(":/icon.png"));
+-    QTextCodec::setCodecForTr(QTextCodec::codecForName("UTF-8"));
+ 
+     QTextStream out(stdout);
+     QStringList args = app.arguments().mid(1);
+--- diffpdf-2.1.3.orig/mainwindow.hpp
++++ diffpdf-2.1.3/mainwindow.hpp
+@@ -19,7 +19,7 @@
+ #else
+ #include <tr1/memory>
+ #endif
+-#include <poppler-qt4.h>
++#include <poppler-qt5.h>
+ #include <QBrush>
+ #include <QList>
+ #include <QMainWindow>
+--- diffpdf-2.1.3.orig/optionsform.cpp
++++ diffpdf-2.1.3/optionsform.cpp
+@@ -76,9 +76,9 @@ void OptionsForm::createWidgets()
+             << qMakePair(tr("Diagonal \\"), Qt::FDiagPattern)
+             << qMakePair(tr("Diagonal Cross"), Qt::DiagCrossPattern))
+         brushStyleComboBox->addItem(brushSwatch(pair.second, color),
+-                                                pair.first, pair.second);
++                                                pair.first, QVariant::fromValue(pair.second));
+     brushStyleComboBox->setCurrentIndex(brushStyleComboBox->findData(
+-                brush.style()));
++                QVariant::fromValue(brush.style())));
+ 
+     penStyleComboBox = new QComboBox;
+     typedef QPair<QString, Qt::PenStyle> PenPair;
+@@ -90,9 +90,9 @@ void OptionsForm::createWidgets()
+             << qMakePair(tr("Dash-Dotted"), Qt::DashDotLine)
+             << qMakePair(tr("Dash-Dot-Dotted"), Qt::DashDotDotLine))
+         penStyleComboBox->addItem(penStyleSwatch(pair.second, color),
+-                                  pair.first, pair.second);
++                                  pair.first, QVariant::fromValue(pair.second));
+     penStyleComboBox->setCurrentIndex(penStyleComboBox->findData(
+-                pen.style()));
++                QVariant::fromValue(pen.style())));
+ 
+     alphaSpinBox = new QSpinBox;
+     alphaSpinBox->setRange(1, 100);
diff --git a/app-text/diffpdf/files/diffpdf.desktop b/app-text/diffpdf/files/diffpdf.desktop
new file mode 100644
index 000000000000..1f4d0cb0d090
--- /dev/null
+++ b/app-text/diffpdf/files/diffpdf.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Version=1.0
+Name=DiffPDF
+Comment=Compare two PDF files
+Exec=diffpdf
+Icon=diffpdf
+Terminal=false
+Type=Application
+Categories=Utility;Qt;
diff --git a/app-text/krop/Manifest b/app-text/krop/Manifest
index b7b23828e0d3..6ea56233a7a3 100644
--- a/app-text/krop/Manifest
+++ b/app-text/krop/Manifest
@@ -1,5 +1,3 @@
 DIST krop-0.4.13.5.tar.gz 40079 BLAKE2B 9d3505f7d9cbf0eef4ec7a28928f14940e6c0a2fd4499b6c5896fde7b3f7b8a0b84ddc4f9c7735ee348f89e9924a7b8f69a3d4dbfaa4668ac770a0fe8404d469 SHA512 218eb3e256dabcacc53af62b2e704031bd21bedacf2599c4aed7ee3b3847b35741c921a08137b7b6e7295ddfc7f87f4ffbf9d3fec3fb137d1ce36e3945dc6129
-DIST krop-0.4.13.tar.gz 36654 BLAKE2B 87c6ae2435ba7f4f7d5d8ad19f4804a1e45b9bb44bef7e03b46cf6e3c1a59cdf5dfd81a7a7d8c26a0f09b75e7d3dcdfa28b4795a786f8eb06d95881eacfc7cee SHA512 2d2af25124b45108715eb90344a5683adbda4c788bd419360b641e9f47553fe143a40205a44af9b3e4db6df4148b3328547e774f24b5c7c0fd23c9206e8a14b2
-EBUILD krop-0.4.13.5.ebuild 713 BLAKE2B 4b18cd8a175c62ea18e6fb7864bdc2995d54b27185ec4754538bdcb2c2176931532490d34f3a13f246c2d29f8c68c642fb23175e2328d1dfc79275342cf8c9c8 SHA512 deb6d8d593a350a026cb26ce9f425b736938ebd694686dd2b9fc954df131d6ca3921222cf500d681115c6163108448b3f049d8f8b2cefb3c971c614055c6465a
-EBUILD krop-0.4.13.ebuild 609 BLAKE2B a740a07ac30a2c7f3e2120f29eb9d54793b1b17705b0c50654f52a3e52face3cfd1d18d2acca69708bc8e2115cd31a10d708561e8d9aabc2b5adef0653966c2e SHA512 a0dd10fa9ede60ae319817da497cb5be4256e3fa2d6d98d1998f8f93fd88609ff31c80d8446d3757c501d338b48eb68008a63046667255a93583637010ec65b8
+EBUILD krop-0.4.13.5.ebuild 881 BLAKE2B 5a73a8b0ae93c3aae190cf8df89c437fca569ecd59b0efc67224658f943c02a3a885c8f4299ea2f7e58beb9056cdc0c32a0311a99306d6fbea3f67ca575cba3e SHA512 9bec5c026b6f772d3c7a10a16727b14962d356279740eaebf83983839a3f46d997ff2a4135fa7c635b97d388e9f779428ec0b485a78c263fbb8bdbfe776fe201
 MISC metadata.xml 333 BLAKE2B b62d23170b13a4d2375de72955c2708368a34435f022231b829b19b60c9f38a1546ec62887dae545691eb1df45998ab7810aa58df3b94729632991e49c4c098f SHA512 30ec13878bbe3b50c90f1849bbc5bf0f8dc05bf1b6a8f79695590f48c76618eef4666965b8130d1909db3c960a43d3149dba525017f342ce9635afc530b873f0
diff --git a/app-text/krop/krop-0.4.13.5.ebuild b/app-text/krop/krop-0.4.13.5.ebuild
index 23966dc8cf43..108c5f32c840 100644
--- a/app-text/krop/krop-0.4.13.5.ebuild
+++ b/app-text/krop/krop-0.4.13.5.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 
-inherit eutils distutils-r1
+inherit eutils distutils-r1 xdg-utils
 
 DESCRIPTION="A tool to crop PDF files"
 HOMEPAGE="http://arminstraub.com/software/krop"
 #SRC_URI="http://arminstraub.com/downloads/${PN}/${P}.tar.gz"
-SRC_URI="https://dev.gentoo.org/~huettel/distfiles/${P}.tar.gz"
+SRC_URI="https://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.gz"
 # this is a snapshot of the qt5 branch
 
 LICENSE="GPL-3"
@@ -25,3 +25,13 @@ src_install() {
 	distutils-r1_src_install
 	domenu "${WORKDIR}/${P}/${PN}.desktop"
 }
+
+pkg_postinst() {
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
diff --git a/app-text/krop/krop-0.4.13.ebuild b/app-text/krop/krop-0.4.13.ebuild
deleted file mode 100644
index a4a95ac16ae7..000000000000
--- a/app-text/krop/krop-0.4.13.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit eutils distutils-r1
-
-DESCRIPTION="A tool to crop PDF files"
-HOMEPAGE="http://arminstraub.com/software/krop"
-SRC_URI="http://arminstraub.com/downloads/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-python/python-poppler-qt4[${PYTHON_USEDEP}]
-	dev-python/PyPDF2[${PYTHON_USEDEP}]
-	dev-python/PyQt4[${PYTHON_USEDEP}]"
-
-src_install() {
-	distutils-r1_src_install
-	domenu "${WORKDIR}/${P}/${PN}.desktop"
-}
diff --git a/app-text/libabw/Manifest b/app-text/libabw/Manifest
index cf98be646a29..51085dbde510 100644
--- a/app-text/libabw/Manifest
+++ b/app-text/libabw/Manifest
@@ -2,5 +2,7 @@ AUX libabw-0.1.1-boost-1.59.patch 1077 BLAKE2B d7c9883639c9148ac5a1c4faf06d6f5cc
 AUX libabw-0.1.1-dereference-before-null-check.patch 989 BLAKE2B 92276e79e393805847d570dfec195b8d4dbeeb6f106f4d46f31bd801f927e8ea0e481e8e40ab72861900a7282f0a57e3733bf3d491ff47451784b476025634f1 SHA512 a9b3e07d4ca41579a44c0953e2934f9e8e4abbc5c42c50a71f64c5a665f6b2b35e93facd4822546342f349b78f19d9203598818fce3f19833c9c6bd4e3c5b694
 AUX libabw-0.1.1-do-not-let-AbiDocument_parse-throw.patch 1308 BLAKE2B 9e368b07ddd2ec2a983a94a55344aa2c7e0560f435e589c609fa0cc9837cda14c433b50c20be11309dd95d5851a0d5053ffe19c353982821843ccbd29cfdd3e9 SHA512 1bd8c97e171b489e4c183a73452a0fb33e98bb3dfb184dc9abc4989ab9f43ee43ee09ee319f6f1291b4141f759f2495b7a5b65c86b8d0f9bdcb0fc50a23fd242
 DIST libabw-0.1.1.tar.xz 287628 BLAKE2B c8873512d7bb4c6594330dd35f044a6d6fb7bd07f4b915b5f0d0752ae36c9c6d2c8a5e7e7f66947fb5c27256e0701214b3fe171e1f52c09cfd42bbf106bc689e SHA512 853dd86ecc79e8590d3163e05e145ad66240ae3cf12d206d021775a94bfb33d70aa5acdcdd193ac747baeae1ba0eed18099ea6f4515be23bdd70b431e96c4b1a
+DIST libabw-0.1.2.tar.xz 318400 BLAKE2B ba25542da0d6568530241892dbdba72d2b0dcf667b50e0c1a4e656e0facf82bf77ca8eff8db4d6e57ab699f12d8dad511d32aee291541ffe6460b2ee98590b68 SHA512 a365c1aa047a97a86eee6bce8463646bdf248a51013139ee288402a832fd545586e072d7c7fc11a56f42e3637de9e922197be20d0587e53c51fd80ced409a6cd
 EBUILD libabw-0.1.1.ebuild 1002 BLAKE2B 3d7fd086fa2281218e72065308bb6a041674a40e39aa1be0616cff80d67ff8f7a8b1ca817eecef398e13f042a523e5268c31b6e7129cb1512f5580aa71d9416d SHA512 bb979320eecd5bd653cc0fcaa37a7ca025dfe1b83ce76a9b99d6766ebd56483f76b4d22dde07d6591862c6997ac2705bc4a065e1b4d2c766f8f39763a1e2e27f
+EBUILD libabw-0.1.2.ebuild 797 BLAKE2B a36f3a09a84a8568bc8204e10b64399ba38ba21f9bd3a2bc1466d2353375e223ea68c96206f6c14b50479aa8d811cce87f5b9f6d841a576c6e878685f792697c SHA512 8f3121a61622c1a3868fd9d9e346b4b799e6ee87f2aae6c20228bb268ee57f0362f6bdd9f658719efe27504d552b5f5e770623a11674267a9163ad8a74b6620a
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/app-text/libabw/libabw-0.1.2.ebuild b/app-text/libabw/libabw-0.1.2.ebuild
new file mode 100644
index 000000000000..9db45bfc4cfa
--- /dev/null
+++ b/app-text/libabw/libabw-0.1.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="Library parsing abiword documents"
+HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libabw"
+SRC_URI="https://dev-www.libreoffice.org/src/${PN}/${P}.tar.xz"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="doc static-libs"
+
+RDEPEND="
+	dev-libs/librevenge
+	dev-libs/libxml2
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}
+	>=dev-libs/boost-1.46
+	sys-devel/libtool
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-werror \
+		$(use_with doc docs) \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/app-text/libebook/Manifest b/app-text/libebook/Manifest
index c1aafa5eb6bd..354fb74f8c52 100644
--- a/app-text/libebook/Manifest
+++ b/app-text/libebook/Manifest
@@ -1,5 +1,7 @@
 AUX libebook-0.1.2-boost-1.59-makefile.patch 335 BLAKE2B 21b62202de334b214e4dd04ea2d06e23fdacb49d35020a7e874f27cadecc13dd96221826469bac50d063583b2f10e93cd325d53fa6cff181ab806bb83623cf02 SHA512 fe435d531d0b4646d8642dfa471352519e3e606b31c3fe727ebbd1ebecdeef58663aadbd7ae95ac902055074b550b659c7eb5cc981a078315462da9a892abe43
 AUX libebook-0.1.2-tests.patch 784 BLAKE2B b7f2aa5b5abace8fb1276c534ef564d8e088b514569540d940f433b5d293a497e211782059186688d94db8139b1f9f0859180f59ea4ac7c0e9c86ca10d11a934 SHA512 e176746ed85e0564332b7ed6e375f0869931e7f489d734dc1ecbd685af595ce1247f933a82736c239df322d57505c40cd23af434db711b8087ee77e26de2c1ad
 DIST libe-book-0.1.2.tar.bz2 465922 BLAKE2B 11898cb34d41a6abbf256ed8a7ff44006f239616987ca5883a8a611041bcda2cce221acc00c57cd36d94f8c26510889df3206ca4f071c23ae272262938e2c396 SHA512 82982874f9c0f5e400166e9367a4b6017cf11bbd69e2e79240137385a5d68ddea08f13676f8c5d0e983f441de17cda9f4b5f7c90c5cb3515e319de638edf3a38
+DIST libe-book-0.1.3.tar.bz2 510498 BLAKE2B e29f9f80a85210447494af20cf30ce7f231ef43f40af9683df7f63e172f5ff8d944d74b995b5850856b2736044b1a5a1ac386262e52a48575325339224a1d339 SHA512 9afa2949f702a34fd6278145ce8d18d504326ed5a103bbc872d0493fcf3e2166d41d094bb0d74b80aa913ca6d082f5bd3259799a4a3c7359331ccdfa1e029a21
 EBUILD libebook-0.1.2-r1.ebuild 1022 BLAKE2B 818b0f0ec8ea3040383fa8997279019fb6de3cff6d4b396013116fc1a07f9481ed77a9a199437ee5668c4d98858e528fd0d5f9c4676725e83bac6f6326f47a03 SHA512 6532e18f8add0ec7405877df28901bfda5e9c62d2e121d12f0a952812bc28c911dd1dce03111c1d7fd6ada9c70dfb67bd46a7c486510cb04dbfe51990133b6fb
+EBUILD libebook-0.1.3.ebuild 954 BLAKE2B aa6bfd160dd3067c93d772959cc7e00ca7cbb6384c84ee08985d9a13bb70ecfd7032bf8230f6ab3a24d1ab400aa59b07ffbc5d1d34f9abbfc35de621c91f6fb9 SHA512 5c7881f7799a9686eb4400356aaae3215c7e52b803977116e4ca7ea59fbd0a71726547135d22932659fd1f995539da60a7363377c53f05642ebb79c219b86fa7
 MISC metadata.xml 404 BLAKE2B 69f06dd52ba8be857d504941c4aeb6778381d87d61f1c9a889a6c1ad16a9d7014dabf76c707db2ed6a160be300a010e6d15c2162d35e59ddd038181a4aa7fae8 SHA512 8e0679b60d1fd56fcb165fd7b5a8e1367f4ee472d7a58e157e6bb1445b502b1fee56b18d099837dcabaa35f7b18f52515cbb51f7bfe9c4c2a824210e4003a275
diff --git a/app-text/libebook/libebook-0.1.3.ebuild b/app-text/libebook/libebook-0.1.3.ebuild
new file mode 100644
index 000000000000..e58db48faea1
--- /dev/null
+++ b/app-text/libebook/libebook-0.1.3.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN="libe-book"
+MY_P="${MY_PN}-${PV}"
+
+inherit autotools
+
+DESCRIPTION="Library parsing various ebook formats"
+HOMEPAGE="http://www.sourceforge.net/projects/libebook/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="doc test tools"
+
+RDEPEND="
+	app-text/liblangtag
+	dev-libs/icu:=
+	dev-libs/librevenge
+	dev-libs/libxml2
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+	dev-util/gperf
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	test? ( dev-util/cppunit )
+"
+RDEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-static \
+		--disable-werror \
+		$(use_with doc docs) \
+		$(use_enable test tests) \
+		$(use_with tools)
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/app-text/libmspub/Manifest b/app-text/libmspub/Manifest
index 19b6bc8edf65..b754fe4b9575 100644
--- a/app-text/libmspub/Manifest
+++ b/app-text/libmspub/Manifest
@@ -1,4 +1,6 @@
 DIST libmspub-0.1.2.tar.xz 345556 BLAKE2B a3b47fb188fc859abf54e3375514d31a1fafa21fb57fe0ac4a20013741a223a7011adf8ce7784b61346b49e9f4c0b6c353138dc12a5035f7bcc24576a508aa50 SHA512 c19025a2b887c33f5966b0972204ab2a8ae841b82df38eaf53c0cdc8f99d93cccab5e1c78143a79d5aef9c7a7387bd6f2cf34833a00861058e0e4687f48be714
+DIST libmspub-0.1.3.tar.xz 377716 BLAKE2B 6b6592f92523d009b1e6c8b1d24ae2efd36efd692cde53e221fcd701aca3246004d20aa8d584271ef6c75add4251e62c93c5a2896d1d3cc5e65f8389dc88ae65 SHA512 3d3680a732c84f7817cf079ae458f56e1eac14663014d48c29f54a6b4dfee887c2cc296a6d6e00d2e05329126414e6513cd7d1187c760ce952c72c27a7ccda46
 EBUILD libmspub-0.1.2.ebuild 1104 BLAKE2B a1e08c89ea9985c4c87f36ad72ee87a3fdf5eee3b1196a0341075e983bb705ea43f9463108a190998e497f39f39a5dca6ae28628721025d233639e2cec66f4f3 SHA512 2b51600c91a38352d73d98571327f42f4a23213a5588e8e465162cf80fad926c6062964d76cfc2ef9b6f9e496ddfab157e29293ec5de9aff641b732c21fe16c5
-EBUILD libmspub-9999.ebuild 1081 BLAKE2B ae9db6180bccf4bfff557b9952c0ba34b4bd5b65b2fa95b68bb2a1bef7e0df940e0676bf745e0339ebc46f8690b9ff8e349c6fa4a3d5b7821ecbd3dc0fadf872 SHA512 f9628d9dfef0f93360ce7b7fa39894a272627ca3e00c382fa8bda258591fc56759505eed49a1fb77d8b8361b5a935ac12db7cda53d75a0222a66e914d15629e3
+EBUILD libmspub-0.1.3.ebuild 1106 BLAKE2B 469d12b4da818c67202e51be97e60d6d88b71ef409188dded463afd02aa09e8aaa8f7d267943cafdacdd084e9a369c758d81c54076db25cb16d71fdee4b8e9bd SHA512 87bb587cf932a6e7913e665d26702d7c4c98c1bd866034cefc24a95be30afba5bb6b34df1803d5c7995c4f6dbd1f39259e10f9caf517e22d2f05fcd5bcfe1805
+EBUILD libmspub-9999.ebuild 1106 BLAKE2B 469d12b4da818c67202e51be97e60d6d88b71ef409188dded463afd02aa09e8aaa8f7d267943cafdacdd084e9a369c758d81c54076db25cb16d71fdee4b8e9bd SHA512 87bb587cf932a6e7913e665d26702d7c4c98c1bd866034cefc24a95be30afba5bb6b34df1803d5c7995c4f6dbd1f39259e10f9caf517e22d2f05fcd5bcfe1805
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/app-text/libmspub/libmspub-0.1.3.ebuild b/app-text/libmspub/libmspub-0.1.3.ebuild
new file mode 100644
index 000000000000..221a09a70251
--- /dev/null
+++ b/app-text/libmspub/libmspub-0.1.3.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGIT_REPO_URI="https://anongit.freedesktop.org/git/libreoffice/libmspub.git"
+[[ ${PV} == 9999 ]] && inherit autotools git-r3
+
+DESCRIPTION="Library parsing Microsoft Publisher documents"
+HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libmspub"
+[[ ${PV} == 9999 ]] || SRC_URI="https://dev-www.libreoffice.org/src/libmspub/${P}.tar.xz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+
+# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
+[[ ${PV} == 9999 ]] || \
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+
+IUSE="doc static-libs"
+
+RDEPEND="
+	dev-libs/icu:=
+	dev-libs/librevenge
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+	sys-devel/libtool
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+
+src_prepare() {
+	default
+	[[ -d m4 ]] || mkdir "m4"
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-werror \
+		$(use_with doc docs) \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/app-text/libmspub/libmspub-9999.ebuild b/app-text/libmspub/libmspub-9999.ebuild
index 83a7b70ff42b..221a09a70251 100644
--- a/app-text/libmspub/libmspub-9999.ebuild
+++ b/app-text/libmspub/libmspub-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ SLOT="0"
 
 # Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
 [[ ${PV} == 9999 ]] || \
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
 
 IUSE="doc static-libs"
 
diff --git a/app-text/libqxp/Manifest b/app-text/libqxp/Manifest
index 8ba4acb4255e..7f1bffb854ff 100644
--- a/app-text/libqxp/Manifest
+++ b/app-text/libqxp/Manifest
@@ -1,3 +1,5 @@
 DIST libqxp-0.0.0.tar.xz 337292 BLAKE2B 16b59353f35d8a93d57600e0ad185755f5f072b41568886197684f65d9f10042e376ae3683f229ba9e526cc8af81b1c1c423defa00eccb3448611765eed7dbf6 SHA512 c92cb6298ea4643e29145732ff3b6df806f2d30c86ab4967e445dcbc8c43b6d9fdd17c30a3e6131b4f0f2a42135caa0137b61aac2ab2722528a08e1fd6c02df9
+DIST libqxp-0.0.1.tar.xz 340184 BLAKE2B 759e5d0fb5886485f4ebe4a6caa34d1d98dc623c0ae124c6666a1be5ce7fb73686fc83360712d59d020e4788b39aa57d32149b7641d71b73dde917df46617f17 SHA512 a03a9ada658a92f4d985cad91d467b3916334c74dc26c1e4de89e3929e0135ca0e9c7e7e18ce616ef56a67863ec19c2638494400785849017f9a4776df07c607
 EBUILD libqxp-0.0.0.ebuild 729 BLAKE2B cee28b3178da4ce7c6af4f2c6e068ad8639369d25e42d211b5d06886362e16e657a46aeea617286e7c56759a68624d7b742340b36109c2d92c589aa49bb6788f SHA512 d53e5c523bbc5fd08f428fe65a6a6b099588a5cff60399bee9718378e82038a0b167cbb084ae097faf373a50f6ffffe4bb73015a9002b00dab01f18054c67ac5
+EBUILD libqxp-0.0.1.ebuild 729 BLAKE2B 9622c30476ab4f488ace1ab438c287feaf133ba24e393713727b49f5d4a9bddcbbb86b3df590b27e0b9fce35ab664dccd775ee9172e962585555df175dc85d75 SHA512 f3f4acd7a71093f0f9e355f664e9d6b292401af486e4f62a24e00f7ec471d8b776d914134bce1907e6dfd000ba499cb6c95a40f06f2734095a75a5c53581c60d
 MISC metadata.xml 326 BLAKE2B 2058d5aa3fb12800596e894b6415bbb01df4d3b72efd60cb7cfc26d75f60d1de9ac3190aa4e82145fcfffbd3a48a80f8f2d0f984662160b82c6201aac48e3261 SHA512 97b3e21efde5b88155863552b56e196d2349d761106177deb84e587d3bd0c08cf4e91ec779caf1db86970ddd3f6ce7ce76ded2e08a8a763e93428a9042605e6e
diff --git a/app-text/libqxp/libqxp-0.0.1.ebuild b/app-text/libqxp/libqxp-0.0.1.ebuild
new file mode 100644
index 000000000000..7658d115ca4c
--- /dev/null
+++ b/app-text/libqxp/libqxp-0.0.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Library parsing QuarkXpress documents"
+HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/${PN}"
+SRC_URI="https://dev-www.libreoffice.org/src/${PN}/${P}.tar.xz"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc test tools"
+
+RDEPEND="
+	dev-libs/librevenge
+	dev-libs/icu:=
+"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+
+src_configure() {
+	econf \
+		--disable-weffc \
+		$(use_enable debug) \
+		$(use_with doc docs) \
+		$(use_enable test tests) \
+		$(use_enable tools)
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index c9f2a052e1bd..6372e25a72b1 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -22,6 +22,6 @@ DIST poppler-0.61.1.tar.xz 1433696 BLAKE2B 6749466223d3bb0e891c6b26c7f1faa5c774d
 DIST poppler-0.62.0.tar.xz 1423372 BLAKE2B 01c8745d0c1fa5b412ec92295a8784f5c1deff8b9fa709d09a3236d630f78fecc6af23fe3302964478d6356562712726db422ef51fe59a8b42e13e08370a77ac SHA512 91f7eae7b05965ae97a34e658bed2a676be8a6e4d34f82148ece6eb58932632dcf9a34d50c66412f93f560ce575abf5c608ed6b1e5184604b96024801886c706
 EBUILD poppler-0.57.0-r1.ebuild 4348 BLAKE2B 066b4f63c5347e883078bd8c7af3c345d0962dd12b824d53cb1024b4f40671141436bf4992774a0c1b6f18867c57b4bc88e007ad9d7370b3349dc2b9c8640bc0 SHA512 a93fb043158a88df8f52ef3f426dcc88645b5e9c3dacd5eef7939ab1ee0d016546c04c5508596162326765b3bad07579259bb6985cd33cd1695329dbecf69484
 EBUILD poppler-0.61.1.ebuild 3868 BLAKE2B ef755c13d074fcc01a826460fc1edca0574a28c980c3c7703c44a25b0300effeb221209f8b34a19854ea39786626e244d39223b8cce416dd2b4a0021ba52675d SHA512 8dbc4c7892553589e55515622cbad3abb9b8b1933c41a9c4e54cd1dc9ce2ea0bd0e1fce97e7e00ea17a4862bdb55ef0d030b23f35d8ed2af1cde7ad6be1084a1
-EBUILD poppler-0.62.0.ebuild 3515 BLAKE2B b983164b3feea275655e71d4036b1957548589bac7a7cb5fa20ec1a25ddd6b8663f496f5a4a35b0253225cd52cd75d6a97842511a2bb81c2f772d572d5babc2e SHA512 391d176942fda9bfbdbb334a93748c5010623acfa1a9cf51ab50b9b9e7cc0bb642c04b3146569247600f6d551ea5babb66e2d7764f64b7317ded5f8442db4d4b
+EBUILD poppler-0.62.0-r1.ebuild 3515 BLAKE2B 775e584508e001165e54cc7190c01755c4ffe09f92db52f98e8811daab0e74e6b353f223ebf7d65629e36b7dbeb0d755d1ec08af9d558b7607597bc0d6648fa5 SHA512 8e202e9810d5e944a35ddb70ca82b9319eb90dc5208b24848b5ff8da4d51654bdba42aa25f286cf0b90bf292547a99bca8df01440cd0a3a47719df0369146c29
 EBUILD poppler-9999.ebuild 3529 BLAKE2B 6d9fc0cebe9e50d42863645b8337347d9a30b17bdc959ff85d67c667f35626457b77e615bcb89c4d64d66de4ca127f32695d0a429370efaea4d9a92cc0fb0bdf SHA512 6e78f889d20409846cccfd6ab51f4a76b122f1932326347d9b80dac1abaf58fc16401d2805366613a24809f840c764cddde06fa30ac156d765e5003fd11f2e50
 MISC metadata.xml 910 BLAKE2B 163a59e6d3a7b5cb610928d57a4a0db99a5ce9277bbdcb74e7589cb0f6276d0d8d9cec0c9ca53f1e1c1f6ea2eb539c05c6cec8a701c710d08d5105c73a526f16 SHA512 a6c4a161d32c008cc5a439e48d18dcf7a6d0501106652bbc33ae1735e986c91dad759660bc8408f047ed0f13b15a66d2068a5dcaa30f4620ede01973c1048bfa
diff --git a/app-text/poppler/poppler-0.62.0.ebuild b/app-text/poppler/poppler-0.62.0-r1.ebuild
index 9934ad402fa5..b582e20f1f79 100644
--- a/app-text/poppler/poppler-0.62.0.ebuild
+++ b/app-text/poppler/poppler-0.62.0-r1.ebuild
@@ -12,7 +12,7 @@ if [[ "${PV}" == "9999" ]] ; then
 else
 	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-	SLOT="0/72"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+	SLOT="0/73"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
 DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
diff --git a/app-text/t1utils/Manifest b/app-text/t1utils/Manifest
index 099344d3c65b..0ad0ef617608 100644
--- a/app-text/t1utils/Manifest
+++ b/app-text/t1utils/Manifest
@@ -1,7 +1,9 @@
+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 636 BLAKE2B c93d88c0135586cf5f5cb1d77cb36d5e06a187a1e064bd4c3010129fb25afab10508d49c3e49f401b88e3e69992586b117a9fcb31aeb9d0c75dd7adf54ef471c SHA512 4c4e285265f05720bafeb2c6a272b55936ed7589cb41f463962fafb70b8bc7be9e1d1e6a8664ee14f5fd49c1ac05f64977d5472394c8b56e48a43538d7f9bf59
 EBUILD t1utils-1.40.ebuild 645 BLAKE2B 8cd9db742a2692897bd5c5f4a8009f46717c8dec9531aa951fcdb66e07e9c072c5617d13af1915c4e9c5543a09acac2c70e178e04a6cdb821e3ef38ad41a1d27 SHA512 6bfefc1d614f986f5b5bd0c3c731fff40dc6549254a213a72fde184113653998757a0bbc33bf09011892fc6ca50632839d9332952cb13e4c03613f0122c9190c
 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/files/t1utils-1.41-memmem.patch b/app-text/t1utils/files/t1utils-1.41-memmem.patch
new file mode 100644
index 000000000000..db6f19549e5e
--- /dev/null
+++ b/app-text/t1utils/files/t1utils-1.41-memmem.patch
@@ -0,0 +1,27 @@
+commit 3f1ddda424353f0f926dd28efa47b0ac61556ce8
+Author: Eddie Kohler <ekohler@gmail.com>
+Date:   Wed Aug 16 12:37:34 2017 -0400
+
+    Check for memmem declaration; sometimes it is not declared by default.
+
+diff --git a/configure.ac b/configure.ac
+index 5b4e3ff..b4dc4fb 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -19,6 +19,7 @@ dnl strerror()?
+ dnl
+ 
+ AC_REPLACE_FUNCS([strerror memmem])
++AC_CHECK_DECLS([memmem])
+ 
+ 
+ dnl
+@@ -88,7 +89,7 @@ char* strerror(int errno);
+ #endif
+ 
+ /* Prototype memmem if we don't have it. */
+-#if !HAVE_MEMMEM
++#if !HAVE_MEMMEM || !HAVE_DECL_MEMMEM
+ void* memmem(const void* haystack, size_t haystack_len,
+              const void* needle, size_t needle_len);
+ #endif
diff --git a/app-text/t1utils/t1utils-1.41-r2.ebuild b/app-text/t1utils/t1utils-1.41-r2.ebuild
new file mode 100644
index 000000000000..8148e274d981
--- /dev/null
+++ b/app-text/t1utils/t1utils-1.41-r2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+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"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	!<media-libs/freetype-1.4_pre20080316"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-memmem.patch
+)
+DOCS=( NEWS.md README.md )
+
+src_prepare() {
+	default
+	eautoreconf
+}
diff --git a/app-text/texlive-core/Manifest b/app-text/texlive-core/Manifest
index dd91ba08d21b..c4bc3799f3a8 100644
--- a/app-text/texlive-core/Manifest
+++ b/app-text/texlive-core/Manifest
@@ -10,8 +10,10 @@ DIST texlive-core-patches-48.tar.xz 3528 BLAKE2B 6f6fbb5c4c9add39957a98de3913b97
 DIST texlive-core-patches-49.tar.xz 2796 BLAKE2B ed35c494ab5d97f5e44d19348de477c724a0209442a7267bd1bab4e6b3b140808d4a41c6320c64ef2db31c04bd2b31485c3b34c1a5623f8793420b6c6f46b1c4 SHA512 4faf0b9653b9a5335e4b210d15200b4118245687ff12e617f181bdece5d2b5cd827247fc72bdc304722f72d8f017804b8026300a9be18f7663749ddc82c7bb17
 DIST texlive-core-patches-50.tar.xz 4632 BLAKE2B 8b5c5d46e820a568b0e47ba62d0e8c2cc874f2b2bebc8eb791470568659ff6e4115b65eea25eaad08923dfc4cd5e5808fe09289a58bd771f7211beef8b627dbe SHA512 f8fab7940b417b7065c9c467f7a9612e161a1a44db50a4523ee4a092ba381f7580adf1c3d75375165795dfc3f23d005028d67351815481dbdbd6edb13f376b64
 DIST texlive-core-patches-52.tar.xz 3376 BLAKE2B 57cea2599e4c59e0dd7dc8b078b79e8b3ad4b310fd7d7749c39c9fecec872307ca5d3e0ec826b8c63bc050ac0eb195b2c2bc2a2b514e0db7f4ac02cdf3df1c80 SHA512 fbc84217911d797373ad03e3da3bcb2277d74edf3a9fd77a5bf67bed7fb207d1cd3d9c9c7947c906ee10989fe6ceb6c263a4002a592217bce7e873db813dc367
+DIST texlive-core-patches-65.1.tar.xz 12080 BLAKE2B b6a51d733198e42c06bc896bb55786166b9b034ae3025c3a9a5c3e81e3aafac4732515088248c0e195bf0b9fb88e67b2a0d4a94e4173aecdaf307fedb0d269d9 SHA512 fa4de81cb694050728146ad7ca9a2a0247af7b1aef16efcfccebf9d0beac11ddcc334f333e1e1267658743b16b666a285dab902c3e75aa3b21c60946a82871f5
 DIST texlive-core-patches-65.tar.xz 4108 BLAKE2B da1f7f870c56fa7bf21186f6acdd495c0e1314e92fee9d546e3ef502307e68fc4482c362edd3bfa73aa9d0faec5363f90c2b2dd1ddefd2fc9085a046bfd6eefb SHA512 71ec54cce052ed60bd0d3c836901d5b2fdc8ab6190536056d617652953009b4645896e7d22ccb9d4ebf177aaefcdca30269600e0cb16daa8d395b036c679971c
 DIST texlive-core-patches-68.tar.xz 5140 BLAKE2B 830a8da64151169cb68e55daaf8c3843980a9dcb85120862d0dec31a42508ff7eec24df1f2069a96a5a4ae7e9b8011ffdb50548f5f6ae722a23132624a77ea22 SHA512 225e7019c132b7e8185343c409cc2b6f418cb062127e916aa3b70db0c6f19d7957415056f2b526f1ea7b7ad13d4367822f34bb710f85ab7cc6bc757b21871d20
+DIST texlive-core-patches-70.tar.xz 13068 BLAKE2B 011cf51af10d28ac9df7c9b9d7aea2cac3e562d393dcf09d57b3c2832fe6816cf926458417577f7c9d9414639a291c09240444145bdbb3d132170f51a8a16980 SHA512 fd26b92a03cd0446007728d0c16a8c7301e254515b997e6a0bd9b325db162bf3f2a2e96be0cb185f042038205c4b4dacf1785a216c8326328682f1c42da9079e
 DIST texlive-module-a2ping-2012.tar.xz 31124 BLAKE2B 5f9a4a7dba307c490c753296eecfce28811be14dfb13c2d4f81024d16d837a8dbe8af4c49902ab8cb977af5a6df6f18f707778445e6650f335fccd6fa33da8bb SHA512 b4f74f037d1113d204d3f0e34c8418e354ae002ab09e8c326458bf7c9c9a9bfa3211317e03bb7e69d7f2e83a2b22851410287477176dab5288dacf5a9ec4a8a6
 DIST texlive-module-a2ping-2013.tar.xz 31124 BLAKE2B 9f90c5429911b2ef3f462951f745144ae82790089aebcba3de7c9c219cf360143d37c836ce6027f2618bf258aa656bc7757d0c7c52a8b51583cf9a326aa18e19 SHA512 bc05c8610e58bacb6001fd41f848d12f8e77837b5e24d32f7af1c9939778d92aeac7ee07969f22e86c72a8850650ad1d06341681503d8d8699dbf6db1de4be62
 DIST texlive-module-a2ping-2014.tar.xz 31124 BLAKE2B c7bc4b68565703f0844291377cb771caa3cc18bc0e438f70a49511822c75cb09095ea534a671b2b27399acd87adc84c112639e4605d5ce282eef2dbd0b4b93e0 SHA512 d5b65f04a96b7206624fd80fae4a04779fd31995247ed4b04d3ddb7197aeb3373d6b3679f674e29fb39e7022f37115fab2a3f5fc7304b3c6c133456242fef8bb
@@ -784,5 +786,7 @@ EBUILD texlive-core-2013-r3.ebuild 11429 BLAKE2B 4acb2e48b6400c1fda6ded3b4e098f2
 EBUILD texlive-core-2014-r4.ebuild 10720 BLAKE2B 2887ea23e06a64622722b5857fd68355decfc87ebc2a272991653b690b337368f69106354739f8137620126db522795b016926e220d2bd2cad8d34387a9f5060 SHA512 efa6656f4242526b174c43eb4349ae2339c9f2f59e68190ac87dba6337b4750fc0404140e5c6df3f61a1cd96ee4a6b48279d3c8e8ae7fbd828264b191d7115f3
 EBUILD texlive-core-2015-r1.ebuild 10925 BLAKE2B 85715b6526c34cb996854834f70687c8602212e6adf6f8b88c040ffea1f667355b6249c624fadfcbd5f2d63691d9e97bc140f347997b618bad10ed39ee02aa13 SHA512 409576c65f51cc4b824c3a98d2b34273c4163b8aee3de426b0b38bde573b4dc4e08c36225aaab15b550842d86778d63780ece0d55fed0fb7070dc1d28d3026ad
 EBUILD texlive-core-2016-r5.ebuild 11555 BLAKE2B a518636f0d5ab05d7e76a5200e2ba94bb8a0c8d76c37193b31789c8176b32bb2142cf5616c5a278732c110914be82636f0598e3e4c9234187d38f049f4cc68e6 SHA512 8d17485bea8ed2f0da0b5a3443c38f8e1d78daba639033042464c609432f42a574264920b673e732193efc6a9522c015c8ca9a1529577b5c6a01551a39864237
+EBUILD texlive-core-2016-r6.ebuild 11566 BLAKE2B 6ee8433c05ac9d7175df9c255a1b2d5deda4338e36cc5464a9ec229ec277ee8f4ae375eb669af0991b7f814b57d878443f365a74f598b80b344405fc51c87d4b SHA512 2549c0716d265749e2e64e822d88cc05cf52680170e7155acdc7d3653bbbe734dbcef7d44391986ec61129d7fe224a480d2df01aabde8d232534cad05e5e9d23
 EBUILD texlive-core-2017-r2.ebuild 11637 BLAKE2B d2b7e0b062a14232492e21e7a7c2d747e054888091da79786d03898d7ab0eda2410ffe9fc9533c79b844c1ec4dd96cc8ac8610ad3428a9e16d1bcaff8421ac15 SHA512 2298ae898b67362cc5bb3c56bec13f105f0124980e26da8aaaca2ffc21edc04eac6cf7a755f1867f85835a98c00865656f9b97e741bea8dec22aac841e2e727c
+EBUILD texlive-core-2017-r3.ebuild 11611 BLAKE2B d948e66e0e764a6378fea7a36f861379c139b2ef911786f52cc21655eeb2d83ae713a1e4e9fe3d455a9ad16115388269e901b932f4c60fce40319f2baab6da4a SHA512 d6c41eb28d8c26cd0290477c1b4e6b23a35f34bc3bfdb1f1f4db90000d0acd26e29fb0c627a7b6244ecc1f4852ba4eb4104948e92cfc3311ccfcf8826680ce21
 MISC metadata.xml 661 BLAKE2B 23fd3817c5a9861b9adec9a78b6dcae0a23743cf685560a86a991896ed8f102fe66aa15a416939829c0c085cdfee24668f7a07631b3f4aeee469002f35b481e6 SHA512 c00ae9537fced06990a4ffff5fbe5101670ce1d84c879c0e9eeaf5c979107dd6a1f92f8f8271731b6c4818abead15b759fc9958ece317e554effbd3cb23fd2b9
diff --git a/app-text/texlive-core/texlive-core-2016-r6.ebuild b/app-text/texlive-core/texlive-core-2016-r6.ebuild
new file mode 100644
index 000000000000..c9a538691161
--- /dev/null
+++ b/app-text/texlive-core/texlive-core-2016-r6.ebuild
@@ -0,0 +1,356 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+#TL_UPSTREAM_PATCHLEVEL="1"
+PATCHLEVEL="65.1"
+TL_SOURCE_VERSION=20160523
+
+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 arara asymptote bundledoc checklistings ctan_chk
+	ctanify ctanupload ctie cweb de-macro dtl dtxgen dvi2tty dviasm dvicopy
+	dvidvi dviljk dvipos findhyph fragmaster hook-pre-commit-pkg hyphenex
+	installfont lacheck latex-git-log latex-papersize latex2man latex2nemeth
+	latexfileversion latexpand latexindent ltxfileinfo ltximg listings-ext make4ht
+	match_parens mflua mkjobtexmf patgen pdfbook2 pdfcrop pdflatexpicscale pdftools
+	pdfxup pfarrei pkfix pkfix-helper purifyeps seetexk srcredact sty2dtx
+	synctex tex4ebook texcount texdef texdiff texdirflatten texdoc texfot
+	texliveonfly texloganalyser texosquery texware tie tpic2pdftex typeoutfileinfo
+	web collection-binextra
+	"
+TL_CORE_BINEXTRA_DOC_MODULES="
+	a2ping.doc adhocfilelist.doc arara.doc asymptote.doc bundledoc.doc
+	checklistings.doc ctan_chk.doc ctanify.doc ctanupload.doc ctie.doc
+	cweb.doc de-macro.doc dtl.doc dtxgen.doc dvi2tty.doc dviasm.doc dvicopy.doc
+	dvidvi.doc dviljk.doc dvipos.doc findhyph.doc fragmaster.doc
+	hook-pre-commit-pkg.doc installfont.doc lacheck.doc latex-git-log.doc
+	latex-papersize.doc latex2man.doc latex2nemeth.doc latexfileversion.doc
+	latexpand.doc latexindent.doc ltxfileinfo.doc ltximg.doc listings-ext.doc
+	make4ht.doc match_parens.doc mkjobtexmf.doc patgen.doc pdfbook2.doc pdfcrop.doc
+	pdflatexpicscale.doc pdftools.doc pdfxup.doc pfarrei.doc pkfix.doc
+	pkfix-helper.doc purifyeps.doc pythontex.doc seetexk.doc srcredact.doc
+	sty2dtx.doc synctex.doc tex4ebook.doc texcount.doc texdef.doc texdiff.doc
+	texdirflatten.doc texdoc.doc texfot.doc texliveonfly.doc texloganalyser.doc
+	texosquery.doc texware.doc tie.doc tpic2pdftex.doc typeoutfileinfo.doc web.doc
+"
+TL_CORE_BINEXTRA_SRC_MODULES="
+	adhocfilelist.source arara.source checklistings.source hyphenex.source
+	listings-ext.source mkjobtexmf.source pfarrei.source pythontex.source
+	texdef.source texosquery.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 ~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
+
+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.4_p20160523 )"
+
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+	sys-apps/ed
+	sys-devel/flex
+	app-arch/xz-utils"
+
+RDEPEND="${COMMON_DEPEND}
+	>=app-text/ps2pkm-1.8_p20160523
+	>=app-text/dvipsk-5.996_p20160523
+	>=dev-tex/bibtexu-3.71_p20160523
+	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"
+
+	# Required for newest icu, bug #618732
+	append-cxxflags '-std=c++11'
+
+	# 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 luajittex mfluajit) \
+		$(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
+}
diff --git a/app-text/texlive-core/texlive-core-2017-r3.ebuild b/app-text/texlive-core/texlive-core-2017-r3.ebuild
new file mode 100644
index 000000000000..c903c3f605d2
--- /dev/null
+++ b/app-text/texlive-core/texlive-core-2017-r3.ebuild
@@ -0,0 +1,359 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+#TL_UPSTREAM_PATCHLEVEL="1"
+PATCHLEVEL="70"
+TL_SOURCE_VERSION=20170524
+
+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 arara asymptote bundledoc checklistings ctan_chk
+	ctanify ctanupload ctie cweb de-macro dtl dtxgen dvi2tty dviasm dvicopy
+	dvidvi dviljk dvipos findhyph fragmaster hook-pre-commit-pkg hyphenex
+	installfont lacheck latex-git-log latex-papersize latex2man latex2nemeth
+	latexfileversion latexpand latexindent ltxfileinfo ltximg listings-ext make4ht
+	match_parens mflua mkjobtexmf patgen pdfbook2 pdfcrop pdflatexpicscale pdftools
+	pdfxup pfarrei pkfix pkfix-helper purifyeps seetexk srcredact sty2dtx
+	synctex tex4ebook texcount texdef texdiff texdirflatten texdoc texfot
+	texliveonfly texloganalyser texosquery texware tie tpic2pdftex typeoutfileinfo
+	web collection-binextra
+	"
+TL_CORE_BINEXTRA_DOC_MODULES="
+	a2ping.doc adhocfilelist.doc arara.doc asymptote.doc bundledoc.doc
+	checklistings.doc ctan_chk.doc ctanify.doc ctanupload.doc ctie.doc
+	cweb.doc de-macro.doc dtl.doc dtxgen.doc dvi2tty.doc dviasm.doc dvicopy.doc
+	dvidvi.doc dviljk.doc dvipos.doc findhyph.doc fragmaster.doc
+	hook-pre-commit-pkg.doc installfont.doc lacheck.doc latex-git-log.doc
+	latex-papersize.doc latex2man.doc latex2nemeth.doc latexfileversion.doc
+	latexpand.doc latexindent.doc ltxfileinfo.doc ltximg.doc listings-ext.doc
+	make4ht.doc match_parens.doc mkjobtexmf.doc patgen.doc pdfbook2.doc pdfcrop.doc
+	pdflatexpicscale.doc pdftools.doc pdfxup.doc pfarrei.doc pkfix.doc
+	pkfix-helper.doc purifyeps.doc pythontex.doc seetexk.doc srcredact.doc
+	sty2dtx.doc synctex.doc tex4ebook.doc texcount.doc texdef.doc texdiff.doc
+	texdirflatten.doc texdoc.doc texfot.doc texliveonfly.doc texloganalyser.doc
+	texosquery.doc texware.doc tie.doc tpic2pdftex.doc typeoutfileinfo.doc web.doc
+"
+TL_CORE_BINEXTRA_SRC_MODULES="
+	adhocfilelist.source arara.source checklistings.source hyphenex.source
+	listings-ext.source mkjobtexmf.source pfarrei.source pythontex.source
+	texdef.source texosquery.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 ~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
+
+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-1.4.5[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.3
+	cjk? ( >=dev-libs/ptexenc-1.3.5 )"
+
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+	sys-apps/ed
+	sys-devel/flex
+	app-arch/xz-utils"
+
+RDEPEND="${COMMON_DEPEND}
+	>=app-text/ps2pkm-1.8_p20170524
+	>=app-text/dvipsk-5.997
+	>=dev-tex/bibtexu-3.71_p20170524
+	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"
+
+	# Required for newest icu, bug #618732
+	append-cxxflags '-std=c++11'
+
+	# 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 luajittex mfluajit) \
+		$(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
+
+	einfo "Regenerating TeX formats"
+	fmtutil-sys --all &> /dev/null
+
+	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
+}
author	V3n3RiX <venerix@redcorelinux.org>	2018-01-07 18:44:07 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2018-01-07 18:44:07 +0000
commit	5001a6c7b6da2956f5b17c695b1e0059dc7b8de5 (patch)
tree	0528a53855a7ec96d20cde9edb9031aab030224c /app-text
parent	a8b0d35ab742f31538d515dea39716e566d533c0 (diff)