gentoo resync : 14.07.2018

2054 files changed, 50570 insertions, 6557 deletions

diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 58a849341f67..8e11e9a22e33 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/XML-Schema-learner-1.0.1 b/app-text/XML-Schema-learner-1.0.1
deleted file mode 100644
index 368354fa2f21..000000000000
--- a/app-text/XML-Schema-learner-1.0.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=test? ( dev-lang/php:*[cli,xml,xmlreader] dev-php/phpunit )
-DESCRIPTION=Algorithmic inferencing of XML schema definitions and DTDs
-EAPI=5
-HOMEPAGE=https://github.com/kore/XML-Schema-learner
-IUSE=test
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=dev-lang/php:*[cli,xml,xmlreader]
-SLOT=0
-SRC_URI=https://github.com/kore/XML-Schema-learner/archive/1.0.1.tar.gz -> XML-Schema-learner-1.0.1.tar.gz
-_md5_=48ae91e0ca348f34d4a5368cdc4de725
diff --git a/app-text/XML-Schema-learner/Manifest b/app-text/XML-Schema-learner/Manifest
new file mode 100644
index 000000000000..7350dc2001ed
--- /dev/null
+++ b/app-text/XML-Schema-learner/Manifest
@@ -0,0 +1,3 @@
+DIST XML-Schema-learner-1.0.1.tar.gz 51057 BLAKE2B db9e5c6176484278fcc050c201f4ee3c560536fd1439cadf1f7c2be29e967ef9d84a488ec01045cc3887f527a0cbaf53649bdb4a505f11df17c5697b344a6fd3 SHA512 f357c1a99ac6a7f807538910dfe5e19b14f789046816d333cb031addfbffc0858fd5641f52dcd7304417d0cf0b6c45d1eb3f2092652c4891c09fc45dd26feb9d
+EBUILD XML-Schema-learner-1.0.1.ebuild 990 BLAKE2B 5a23ea8a6271d76a86cff4494a542d12bed7542d6efea439899638ccaddf49a65549322b5816264db2100a0fefcb4b5a5ba1ba43ebef7d126413617d2beb9bfc SHA512 578bb825228e78d83617ec19bd72def2443b3c39b00da1982aec26c0cdcd19e89e1bd792c406854044394cd4f2405ce7815960a63871f611ed4fe99f9fb4c621
+MISC metadata.xml 942 BLAKE2B 99cfdc01afc572294b15a21d4a14a3e272c4e465e276d83990e01c6e03273730348265d3615da5fd3c5c1dc73e4c688d20ba161c9f4021f719357f1109f6c1c1 SHA512 48e0d860bbede84a76773ad1a77620cdee393eb0894f63461371ae7cb12a43fa0b640bb2dee17eb3eeb22fbe24899c90da704a74f70075e722e83f5d0be86bb2
diff --git a/app-text/XML-Schema-learner/XML-Schema-learner-1.0.1.ebuild b/app-text/XML-Schema-learner/XML-Schema-learner-1.0.1.ebuild
new file mode 100644
index 000000000000..b4d56e1a79ba
--- /dev/null
+++ b/app-text/XML-Schema-learner/XML-Schema-learner-1.0.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="Algorithmic inferencing of XML schema definitions and DTDs"
+HOMEPAGE="https://github.com/kore/${PN}"
+SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="test"
+
+# PHP dependency can be inferred from .travis.yml in the repository.
+# The necessary USE flags on the other hand were found the hard way.
+#
+# The dependencies here aren't as expressive as they should be. What we
+# really want is for php[...] to apply to everything in PHP_TARGETS, and
+# for those interpreters (the ones in PHP_TARGETS) to be used to run the
+# test suite.
+#
+# See bug #497606.
+#
+RDEPEND="dev-lang/php:*[cli,xml,xmlreader]"
+DEPEND="test? ( ${RDEPEND}
+				dev-php/phpunit )"
+
+src_compile() {
+	# Don't run make, the default target is 'check'.
+	:
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="/usr" install
+	dodoc README.rst
+}
diff --git a/app-text/XML-Schema-learner/metadata.xml b/app-text/XML-Schema-learner/metadata.xml
new file mode 100644
index 000000000000..a1b8a8d91692
--- /dev/null
+++ b/app-text/XML-Schema-learner/metadata.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>mjo@gentoo.org</email>
+  </maintainer>
+  <longdescription>
+    This software implements various state-of-the-art algorithms for
+    algorithmic learning of XML Schema definitions and Document Type
+    Definitions.
+
+    Given a set or a single XML instance it can algorithmically infer
+    a schema which describes the XML instances. The resulting schemas
+    are of high-quality and human readable.
+
+    The theory behind the project is described in Kore Nordmann's
+    thesis, "Algorithmic learning of XML Schema definitions from XML
+    data," available at
+    http://kore-nordmann.de/talks/11_03_learning_xml_schema_definitions_from_xml_data.pdf.
+  </longdescription>
+  <upstream>
+    <remote-id type="github">kore/XML-Schema-learner</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-text/a2ps-4.14-r6 b/app-text/a2ps-4.14-r6
deleted file mode 100644
index 6ac35c363297..000000000000
--- a/app-text/a2ps-4.14-r6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare
-DEPEND=app-text/ghostscript-gpl app-text/libpaper >=app-text/psutils-1.17 app-text/wdiff emacs? ( virtual/emacs ) latex? ( virtual/latex-base ) nls? ( virtual/libintl ) userland_GNU? ( >=sys-apps/coreutils-6.10-r1 ) userland_BSD? ( sys-freebsd/freebsd-ubin ) >=dev-util/gperf-2.7.2 virtual/yacc nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Any to PostScript filter
-EAPI=6
-HOMEPAGE=https://www.gnu.org/software/a2ps/
-IUSE=cjk emacs latex nls static-libs userland_BSD userland_GNU vanilla
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=GPL-3
-RDEPEND=app-text/ghostscript-gpl app-text/libpaper >=app-text/psutils-1.17 app-text/wdiff emacs? ( virtual/emacs ) latex? ( virtual/latex-base ) nls? ( virtual/libintl ) userland_GNU? ( >=sys-apps/coreutils-6.10-r1 ) userland_BSD? ( sys-freebsd/freebsd-ubin )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://gnu/a2ps/a2ps-4.14.tar.gz cjk? ( mirror://gentoo/a2ps-4.14-ja_nls.patch.gz )
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c3ceba7647253e75569c4a47401e299b
diff --git a/app-text/a2ps/Manifest b/app-text/a2ps/Manifest
new file mode 100644
index 000000000000..c10ffc2ef323
--- /dev/null
+++ b/app-text/a2ps/Manifest
@@ -0,0 +1,19 @@
+AUX 50a2ps-gentoo.el 218 BLAKE2B 59dc77b7859a5c6536077f6322c1aa5bffbfc3c27ba3b7ead28b703021282fc1f1c3db16d169fcf08088d30de9baf52406074b91bcd58b66ace6ddc312b707c1 SHA512 d1696581767c62903ea24cc7ffec2f25c30b64a0a7aa76d22e8a1872c5ea9b1aaa0f88f7ce24b1ee57f3da57bd3eaa36f2c5fd388437ce9a935bd82912075269
+AUX a2ps-4.13-manpage-chmod.patch 461 BLAKE2B 6b680219388611371e70bbb1170128e82fc34eafa3cbed157800f24f1a32eb46308ee5592b17b2ec94aa0e292ad34f5b5f45136f985d8566dd23c88204873873 SHA512 f3dc2698ee989928b3179b65b01bf12d828f4428bd860f6f1a3811daaa9d6256b353c2acb5cd4bf392dd89b040f8e9c15420ab4373f3d54b8b60652aaf23f864
+AUX a2ps-4.13-stdout.diff 462 BLAKE2B 9e8285a2d9b72fd752bcd39fc20f2318283aa4913f2fdf30dd56920a2741fc5a99d5a0b5f38c7f3c694af3fa772597df8d84720760f1a8468bfbb36d9337ee19 SHA512 61be8be21b08f39b0a7509bb96f67139165421baaaa20968ec54f9df37d5b8c355f06bc76513ed10c8c7d61608ed766ed28d4498211dff285d6b381aaf2454dc
+AUX a2ps-4.13c-emacs.patch 442 BLAKE2B f58e56256f45ba7dc9ab407f38cfdb7dac6a5eb7b39970e3b7e680a2ac61ec743e3d57bc28daca15fda55714af339590ffecd3dc64a25d0e99f3f46869ec175b SHA512 0ef1a215ecb757e249c4d4bdf9a789419c6cd433f7e330783fef13a0158c57c5c5e6a22526d8abcca0919bdb1dc08337869fdd3f0fe192284ca087eafad322a3
+AUX a2ps-4.13c-fnmatch-replacement.patch 1500 BLAKE2B bee0366e19cb8a648ded476ca9ff0accf82bb54a122ee301c74109e418b86c4c5dc1de1fa7c4f6511faeec8924dd667ffbc46f60232eab1503a750268e3afce9 SHA512 5509ae1277ff1f1f487fb106ed6673eb67fa7d1531a35bfa087f78a0bdb4dc0bf38c69b7fab95161a19406fc1acaef09b22b8a05ef603c6d43a8d7a8c3077b56
+AUX a2ps-4.13c-locale-gentoo.diff 981 BLAKE2B c8551a709fef34b4ccbc92b35c91872a5ba74afad5b92dd9b3a2722976375fe729a23d8b4e2d14972fb5c2e0219cc2c0eb30a0c1199003e583c1b6ad86929514 SHA512 56800ba839e04a89088c130df9676595cbcdfa15fb1853eb85560e9d529e93d6db4b5813375ede8cf82aa8b0fd51f81f5f080e2c5d38dc1a7739a8e62e0ab997
+AUX a2ps-4.14-CVE-2001-1593.patch 1728 BLAKE2B 8b357a50c4aece3749aacc4506e142ef9e6cc9b59d5d03175236fda0bc23970a02517b28ae080cb5b858e6d00c3e706f3908340adeeeed24bc6d6c39394f3c50 SHA512 1c83de1a53ed224ad5793041210023fb706ceb901c43ca0a7f8cb392500922851a8d25887ad5983a45fa9ec0bee2f41870134340c16544f3c1e7ff93c7e48c1f
+AUX a2ps-4.14-CVE-2014-0466.patch 1489 BLAKE2B 323fe56d7185c4a0e018db50eb691db6acadfb031186427120ebf7c33dda6a0b6697ae7f9a48bc10702103b30341d97fdb36cd681e1bd6f1871189d0d328a475 SHA512 b978261dfbe63fe2b2f66123d1fa1dfb33949f7902636fa23b0b8b299d779e5a494483b052f25039db81e9156fc2aeb2d6be4d56ddf0572f7bc0361ade9111fa
+AUX a2ps-4.14-check-mempcpy.patch 514 BLAKE2B 9dd0623d227ec4bc16006ba36b20edba387fbb466fbd79c0be8740495551d24dac8041d26c946d9287c90ffb6a9db72ed96479de630ee7728276ab99b9c829d4 SHA512 6835f5e9205cb549da52c4a3c13aad601c9e9d294f0f35ebe4d8cc6f8bd8b5f6fe77b857f8c92f552a43c02eb6de812021c078ce597c319bde176f0e91cd167b
+AUX a2ps-4.14-cleanup.patch 2633 BLAKE2B b2d0d48fc8041ed98cf28df2615319b6b7dd5ffa31f741901291e36265d467fc38a347ecbc598dc41db249b3ab8eb96ac7ec6e2ca8e2ef7c1e22f93d1d418326 SHA512 07afbf25203c6eacb92ab8c32fa6b913a832163a03fcd47c163cf3bdfd0cf07efd960342005fd7923108b978bc0395919c7f70e048d547b4bc5c083eed86a1f3
+AUX a2ps-4.14-fix-stpcpy-proto.patch 436 BLAKE2B 1044449a190930f28c5ba05dadc3b7510ab01a1330cb111aec8dc46ab95d3135085941c204f7c62cc3fdb16e7aa2761f2df8f73565ba5226a661dfc5d7f52f54 SHA512 439af060da55d93e8fa6962f7b77c292e47b1a39d987c35010edd52f0ebf360337b5bd29fd134d4d4ab8333187672e7ae97c2d0259c706e38a2cf9d719dcf7bb
+AUX a2ps-4.14-ja-cleanup.patch 3210 BLAKE2B 599c8bca7f599c3ffda2d1a071d9ca5c4d47141d1563302fcc4b6476c5718ea9b57902b045e70a1bd2c92d9b36cb7fc32ed01ebed1f92395ff4cbd65a76288b8 SHA512 1a2ce34b5b0bc79bf269fe171c64bcdef0a87bf4efa8508eee851228a1483efce9c8945a17def7abc4cdfe2f1f8611d63995d98099e290d06fb1be430350b778
+AUX a2ps-4.14-psset.patch 616 BLAKE2B 1554f3ea640b1e44cecc6b0cb6a2f593f1dc1aeec36b5f9a9d1e98c847e431a0848d35a0139ce1541cba55eedf3de619f6b5dcfd4099641112d0f4fe3c8ee251 SHA512 3118d91519c81e5e9f46a5386e9db757936231e71047ba8579b3d969a7c824bad6325b54221a61a0b171bb87669b548704a068bc71a1cd3b48d3a32416fe0c0f
+AUX a2ps-4.14-ptrdiff_t.patch 367 BLAKE2B 1a69ba36b72a08f3c853905d9d2a0f787259f4f1252ff83d4eb8ae09788aa0017a332847c9d4cb4a16096ecfe84197769ca6fca7cab239fc7da7b113e48d0d94 SHA512 b9ebff895614a20b8f9e891ce53cf0f7ec38452619f7e907deadff22840a019737dd129690f5ffec91f7f798ae03bd0c7c62f1aa751589865f589362825038c5
+AUX a2ps-4.14-texinfo-5.x.patch 5996 BLAKE2B 720a408c88c848fbe9b6ece319a8eb05a109df97dd2c25a26ed8a4ad8f49d545d111900cedc4d5eda05b4aa120b9f1f4aecd6434c6f20f1944d863b13d4952aa SHA512 1e93a21cda8547a49d09e429c8ffed23b68e7f7555fa356f615bc76eef059a0065cc71e62bb4f1a1239aaf140796195c7d264c5c884e1a89516facbdbcb955d9
+DIST a2ps-4.14-ja_nls.patch.gz 27576 BLAKE2B 7300971fb76f6c8d2b0e5ffa519cf6064519a33f24430b9894e43778dff5b78f7cf7e2b9fe1e98fb475f452b39ccc29f88f579bbe1922ac3ef70775a05591b32 SHA512 f02f553dd9d9dbd9dfe41ebfe103493000aa4e9de5634c94e7453f73b66d88fea6b0010095913a4a99c7285990a1df1ebcc39da451b2b34f96b0c191112b125f
+DIST a2ps-4.14.tar.gz 2552507 BLAKE2B cd15a2b85f54f8bfb92adf9f4cf2c3c29091e528ae8072d0e905c58cc94caf55b76ac3e37891f8a0bc0909a177c5ee434fe5aaab3625a2c14127dabad8b506ed SHA512 fd6ac8ab47d789114c283e8ca508f7f56feabd1a189f4ac772cad9e6be7e3791e210892cfffd04ad1d39efe4b15386b2e61bf4cd56b70ed581c0554f36bfe06f
+EBUILD a2ps-4.14-r6.ebuild 3586 BLAKE2B 0aeab0e2234264c064222ea83b2390bad9a950854c0f63ffe150efc5a66b238e4ae69354df63ef73e13d31c7ef1636d709585f334ebee74ba5ac37c2b5e94c91 SHA512 72ae818e2a7d5cb613a8aa3465b1a493be404d7159f5280aa2fefce224fc3a64e90f2b0c60b6cb5f8fc9b12561363a5ea5f88c4459a3aa22510b6445adc207a8
+MISC metadata.xml 346 BLAKE2B 5f3d7c0d868dfb3ce0ec6e47c33087f9d41b6b2e11d569c48b1a6a635f1a46e7cbb51e793f7df235c4b9dc20eb2eb24a5c8764ca2b6eee34a900d1f4641c4de7 SHA512 0973b9c922d40a291ad52b590c40ef122167070e2f3c2c30980a83188bf8ed8742d825542ca1ea88139fd7ceb0e251f91dff13822ffbec4c9a6af2ea2b7a0010
diff --git a/app-text/a2ps/a2ps-4.14-r6.ebuild b/app-text/a2ps/a2ps-4.14-r6.ebuild
new file mode 100644
index 000000000000..8d73b88d0665
--- /dev/null
+++ b/app-text/a2ps/a2ps-4.14-r6.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools elisp-common flag-o-matic
+
+DESCRIPTION="Any to PostScript filter"
+HOMEPAGE="https://www.gnu.org/software/a2ps/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz
+	cjk? ( mirror://gentoo/${P}-ja_nls.patch.gz )"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="cjk emacs latex nls static-libs userland_BSD userland_GNU vanilla"
+
+RESTRICT=test
+
+RDEPEND="app-text/ghostscript-gpl
+	app-text/libpaper
+	>=app-text/psutils-1.17
+	app-text/wdiff
+	emacs? ( virtual/emacs )
+	latex? ( virtual/latex-base )
+	nls? ( virtual/libintl )
+	userland_GNU? ( >=sys-apps/coreutils-6.10-r1 )
+	userland_BSD? ( sys-freebsd/freebsd-ubin )"
+DEPEND="${RDEPEND}
+	>=dev-util/gperf-2.7.2
+	virtual/yacc
+	nls? ( sys-devel/gettext )"
+
+SITEFILE=50${PN}-gentoo.el
+
+S=${WORKDIR}/${PN}-${PV:0:4}
+
+src_prepare() {
+	default
+
+	eapply "${FILESDIR}"/${PN}-4.13c-locale-gentoo.diff
+	use vanilla || eapply -p0 "${FILESDIR}"/${PN}-4.13-stdout.diff
+	if use cjk; then
+		eapply "${WORKDIR}"/${P}-ja_nls.patch
+		# bug #335803
+		eapply -p0 "${FILESDIR}"/${P}-ja-cleanup.patch
+	else
+		eapply "${FILESDIR}"/${P}-cleanup.patch
+	fi
+
+	# fix fnmatch replacement, bug #134546
+	eapply "${FILESDIR}"/${PN}-4.13c-fnmatch-replacement.patch
+
+	# bug #122026
+	eapply "${FILESDIR}"/${P}-psset.patch
+
+	# fix emacs printing, bug #114627
+	eapply "${FILESDIR}"/a2ps-4.13c-emacs.patch
+
+	# fix chmod error, #167670
+	eapply "${FILESDIR}"/a2ps-4.13-manpage-chmod.patch
+
+	# add configure check for mempcpy, bug 216588
+	eapply "${FILESDIR}"/${P}-check-mempcpy.patch
+
+	# fix compilation error due to invalid stpcpy() prototype, bug 216588
+	eapply -p0 "${FILESDIR}"/${P}-fix-stpcpy-proto.patch
+
+	# fix compilation error due to obstack.h issue, bug 269638
+	eapply "${FILESDIR}"/${P}-ptrdiff_t.patch
+
+	# fix compilation error due to texinfo 5.x, bug 482748
+	eapply "${FILESDIR}"/${P}-texinfo-5.x.patch
+
+	# fix CVE-2014-0466, bug 506352
+	eapply "${FILESDIR}"/${P}-CVE-2014-0466.patch
+
+	# fix CVE-2001-1593, bug 507024
+	eapply "${FILESDIR}"/${P}-CVE-2001-1593.patch
+
+	# fix building with sys-devel/automake >= 1.12, bug 420503
+	rm -f {.,ogonkify}/aclocal.m4 || die
+	sed -i \
+		-e '/^AM_C_PROTOTYPES/d' \
+		-e '/^AUTOMAKE_OPTIONS.*ansi2knr/d' \
+		-e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' \
+		-e 's:AM_PROG_CC_STDC:AC_PROG_CC:' \
+		configure.in {contrib/sample,lib,src}/Makefile.am m4/protos.m4 || die
+
+	eautoreconf
+}
+
+src_configure() {
+	append-cppflags -DPROTOTYPES #420503
+
+	local myconf="COM_netscape=no COM_acroread=no"
+
+	use emacs || myconf="${myconf} EMACS=no"
+	use latex || myconf="${myconf} COM_latex=no"
+
+	export LANG=C LC_ALL=C
+
+	econf \
+		--enable-shared \
+		$(use_enable static-libs static) \
+		--sysconfdir="${EPREFIX}"/etc/a2ps \
+		$(use_enable nls) \
+		${myconf}
+}
+
+src_compile() {
+	# parallel make b0rked
+	emake -j1
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		lispdir="${EPREFIX}${SITELISP}"/${PN} \
+		install
+
+	newdoc "${ED}"/usr/share/a2ps/README README.a2ps
+	newdoc "${ED}"/usr/share/a2ps/ppd/README README.a2ps.ppd
+	newdoc "${ED}"/usr/share/ogonkify/README README.ogonkify
+
+	rm -f "${ED}"/usr/share/{a2ps,a2ps/ppd,ogonkify}/README || die
+
+	prune_libtool_files
+
+	if use emacs; then
+		elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die
+	fi
+
+	dodoc ANNOUNCE AUTHORS ChangeLog FAQ NEWS README* THANKS TODO
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/app-text/a2ps/files/50a2ps-gentoo.el b/app-text/a2ps/files/50a2ps-gentoo.el
new file mode 100644
index 000000000000..3e12daaf9a4b
--- /dev/null
+++ b/app-text/a2ps/files/50a2ps-gentoo.el
@@ -0,0 +1,5 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'a2ps-mode "a2ps" nil t)
+(autoload 'a2ps-buffer "a2ps-print" nil t)
+(autoload 'a2ps-region "a2ps-print" nil t)
+(add-to-list 'auto-mode-alist '("\\.a2ps\\'" . a2ps-mode))
diff --git a/app-text/a2ps/files/a2ps-4.13-manpage-chmod.patch b/app-text/a2ps/files/a2ps-4.13-manpage-chmod.patch
new file mode 100644
index 000000000000..e0c61124e9df
--- /dev/null
+++ b/app-text/a2ps/files/a2ps-4.13-manpage-chmod.patch
@@ -0,0 +1,12 @@
+diff -ur a2ps-4.13.orig/man/Makefile.maint a2ps-4.13/man/Makefile.maint
+--- a2ps-4.13.orig/man/Makefile.maint	2002-03-04 20:46:26.000000000 +0200
++++ a2ps-4.13/man/Makefile.maint	2007-02-19 21:50:29.000000000 +0200
+@@ -20,7 +20,7 @@
+ 	    --include=$(basename $@).x \
+ 	    --include=common.x \
+ 	    $(executable) > $@-t || exit 1; \
+-	  chmod -w $@-t || exit 1; \
++	  chmod a-w $@-t || exit 1; \
+ 	  rm -f $@ || exit 1; \
+ 	  mv $@-t $@ || exit 1; \
+ 	else \
diff --git a/app-text/a2ps/files/a2ps-4.13-stdout.diff b/app-text/a2ps/files/a2ps-4.13-stdout.diff
new file mode 100644
index 000000000000..1e40e618fcbd
--- /dev/null
+++ b/app-text/a2ps/files/a2ps-4.13-stdout.diff
@@ -0,0 +1,13 @@
+--- lib/printers.c.orig       Tue Oct 12 00:01:59 1999
++++ lib/printers.c    Wed May  2 11:23:25 2001
+@@ -315,8 +315,8 @@
+   res->ppd = NULL;           /* Printer's ppd are not read yet */
+
+   /* Output */
+-  /* Default is to send to default printer */
+-  res->flag_output_is_printer = true;
++  /* Default is to send to stdout */
++  res->flag_output_is_printer = false;
+   res->flag_output_name = NULL;
+   res->output_is_file = true;
+   res->output_name = NULL;
diff --git a/app-text/a2ps/files/a2ps-4.13c-emacs.patch b/app-text/a2ps/files/a2ps-4.13c-emacs.patch
new file mode 100644
index 000000000000..f1cd5d9ebdfc
--- /dev/null
+++ b/app-text/a2ps/files/a2ps-4.13c-emacs.patch
@@ -0,0 +1,10 @@
+--- a2ps-4.13/contrib/emacs/a2ps-print.el.orig	2005-12-05 08:03:48.000000000 +0100
++++ a2ps-4.13/contrib/emacs/a2ps-print.el	2005-12-06 16:38:14.000000000 +0100
+@@ -93,6 +93,7 @@
+ 			  (concat "--center-title=" name)
+ 			  (concat "--footer=" (concat name " Emacs buffer"))
+ 			  (concat "--pretty-print=" filetype)
++			  (concat "-d")
+ ;Uncommenting the following gives a print preview (only):
+ ;			  (concat "--output=/tmp/foo.ps")
+ 			  )
diff --git a/app-text/a2ps/files/a2ps-4.13c-fnmatch-replacement.patch b/app-text/a2ps/files/a2ps-4.13c-fnmatch-replacement.patch
new file mode 100644
index 000000000000..c49ab78c93c0
--- /dev/null
+++ b/app-text/a2ps/files/a2ps-4.13c-fnmatch-replacement.patch
@@ -0,0 +1,43 @@
+diff -Naurp a2ps-4.13.orig/lib/fnmatch.c a2ps-4.13/lib/fnmatch.c
+--- a2ps-4.13.orig/lib/fnmatch.c	2002-03-04 12:46:25 -0600
++++ a2ps-4.13/lib/fnmatch.c	2006-05-27 11:41:15 -0500
+@@ -27,18 +27,6 @@
+ #include <fnmatch.h>
+ #include <ctype.h>
+ 
+-
+-/* Comment out all this code if we are using the GNU C Library, and are not
+-   actually compiling the library itself.  This code is part of the GNU C
+-   Library, but also included in many other GNU distributions.  Compiling
+-   and linking in this code is a waste when using the GNU C library
+-   (especially if it is a shared library).  Rather than having every GNU
+-   program understand `configure --with-gnu-libc' and omit the object files,
+-   it is simpler to just do this in the source for each such file.  */
+-
+-#if defined _LIBC || !defined __GNU_LIBRARY__
+-
+-
+ # if defined STDC_HEADERS || !defined isascii
+ #  define ISASCII(c) 1
+ # else
+@@ -52,10 +40,13 @@
+ extern int errno;
+ # endif
+ 
++/* fnmatch replacement taken from the GNU C Library for systems that 
++   provide a broken implementation. */
++
+ /* Match STRING against the filename pattern PATTERN, returning zero if
+    it matches, nonzero if not.  */
+ int
+-fnmatch (const char *pattern, const char *string, int flags)
++rpl_fnmatch (const char *pattern, const char *string, int flags)
+ {
+   register const char *p = pattern, *n = string;
+   register char c;
+@@ -233,5 +224,3 @@ fnmatch (const char *pattern, const char
+ 
+ # undef FOLD
+ }
+-
+-#endif	/* _LIBC or not __GNU_LIBRARY__.  */
diff --git a/app-text/a2ps/files/a2ps-4.13c-locale-gentoo.diff b/app-text/a2ps/files/a2ps-4.13c-locale-gentoo.diff
new file mode 100644
index 000000000000..0b59956ebc05
--- /dev/null
+++ b/app-text/a2ps/files/a2ps-4.13c-locale-gentoo.diff
@@ -0,0 +1,25 @@
+diff -urN a2ps-4.13.ORIG/config.h.in a2ps-4.13/config.h.in
+--- a2ps-4.13.ORIG/config.h.in	2003-09-27 19:33:38.000000000 +0900
++++ a2ps-4.13/config.h.in	2003-09-27 21:25:46.000000000 +0900
+@@ -181,6 +181,9 @@
+ /* Define to 1 if you have the `rename' function. */
+ #undef HAVE_RENAME
+ 
++/* Define to 1 if you have the <locale.h> header file. */
++#undef HAVE_LOCALE_H
++
+ /* Define to 1 if you have the `setlocale' function. */
+ #undef HAVE_SETLOCALE
+ 
+diff -urN a2ps-4.13.ORIG/configure.in a2ps-4.13/configure.in
+--- a2ps-4.13.ORIG/configure.in	2003-09-27 19:33:38.000000000 +0900
++++ a2ps-4.13/configure.in	2003-09-27 21:26:05.000000000 +0900
+@@ -71,7 +71,7 @@
+ AC_HEADER_DIRENT
+ AC_CHECK_HEADERS(sys/time.h sys/stat.h sys/types.h sys/ioctl.h  \
+  math.h string.h strings.h stdlib.h unistd.h stdarg.h pwd.h malloc.h \
+- memory.h errno.h fcntl.h stdbool.h fnmatch.h)
++ memory.h errno.h fcntl.h stdbool.h fnmatch.h locale.h)
+ 
+ ## --------------------- ##
+ ## Checks for typedefs.  ##
diff --git a/app-text/a2ps/files/a2ps-4.14-CVE-2001-1593.patch b/app-text/a2ps/files/a2ps-4.14-CVE-2001-1593.patch
new file mode 100644
index 000000000000..06153f4858c4
--- /dev/null
+++ b/app-text/a2ps/files/a2ps-4.14-CVE-2001-1593.patch
@@ -0,0 +1,82 @@
+CVE-2001-1593: Fix insecure use of /tmp
+
+
+Author(s):
+
+ * Fri Jan 05 2001 Preston Brown <pbrown@redhat.com>
+
+followed the next month by a fix to that patch:
+
+ * Mon Feb 12 2001 Tim Waugh <twaugh@redhat.com>
+
+(see https://bugzilla.redhat.com/show_bug.cgi?id=1060630#c5)
+
+Origin:
+
+http://pkgs.fedoraproject.org/cgit/a2ps.git/plain/a2ps-4.13-security.patch
+
+--- a/lib/routines.c
++++ b/lib/routines.c
+@@ -242,3 +242,50 @@
+   /* Don't complain if you can't unlink.  Who cares of a tmp file? */
+   unlink (filename);
+ }
++
++/*
++ * Securely generate a temp file, and make sure it gets
++ * deleted upon exit.
++ */
++static char **	tempfiles;
++static unsigned	ntempfiles;
++
++static void
++cleanup_tempfiles()
++{
++	while (ntempfiles--)
++		unlink(tempfiles[ntempfiles]);
++}
++
++char *
++safe_tempnam(const char *pfx)
++{
++	char	*dirname, *filename;
++	int	fd;
++
++	if (!(dirname = getenv("TMPDIR")))
++		dirname = "/tmp";
++
++	tempfiles = (char **) realloc(tempfiles,
++			(ntempfiles+1) * sizeof(char *));
++	if (tempfiles == NULL)
++		return NULL;
++
++	filename = malloc(strlen(dirname) + strlen(pfx) + sizeof("/XXXXXX"));
++	if (!filename)
++		return NULL;
++
++	sprintf(filename, "%s/%sXXXXXX", dirname, pfx);
++
++	if ((fd = mkstemp(filename)) < 0) {
++		free(filename);
++		return NULL;
++	}
++	close(fd);
++
++	if (ntempfiles == 0)
++		atexit(cleanup_tempfiles);
++	tempfiles[ntempfiles++] = filename;
++
++	return filename;
++}
+--- a/lib/routines.h
++++ b/lib/routines.h
+@@ -255,7 +255,8 @@
+ /* If _STR_ is not defined, give it a tempname in _TMPDIR_ */
+ #define tempname_ensure(Str)				\
+ do {							\
+-  (Str) = (Str) ? (Str) : tempnam (NULL, "a2_");	\
++  (Str) = (Str) ? (Str) : safe_tempnam("a2_");	\
+ } while (0)
++char * safe_tempnam(const char *);
+ 
+ #endif
diff --git a/app-text/a2ps/files/a2ps-4.14-CVE-2014-0466.patch b/app-text/a2ps/files/a2ps-4.14-CVE-2014-0466.patch
new file mode 100644
index 000000000000..56f0b2f527a2
--- /dev/null
+++ b/app-text/a2ps/files/a2ps-4.14-CVE-2014-0466.patch
@@ -0,0 +1,32 @@
+CVE-2014-0466: fixps does not invoke gs with -dSAFER
+
+A malicious PostScript file could delete files with the privileges of
+the invoking user.
+
+Author: Salvatore Bonaccorso <carnil@debian.org>
+Origin: https://bugs.debian.org/742902
+
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' a2ps~/contrib/fixps.in a2ps/contrib/fixps.in
+--- a2ps~/contrib/fixps.in	2014-03-30 12:24:50.000000000 +0200
++++ a2ps/contrib/fixps.in	2014-03-30 12:40:36.763249218 +0200
+@@ -389,7 +389,7 @@
+   	eval "$command" ;;
+       gs)
+         $verbose "$program: making a full rewrite of the file ($gs)." >&2
+-  	$gs -q -dNOPAUSE -dBATCH -sDEVICE=pswrite -sOutputFile=- -c save pop -f $file ;;
++  	$gs -q -dSAFER -dNOPAUSE -dBATCH -sDEVICE=pswrite -sOutputFile=- -c save pop -f $file ;;
+     esac
+   )
+ fi
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' a2ps~/contrib/fixps.m4 a2ps/contrib/fixps.m4
+--- a2ps~/contrib/fixps.m4	2014-03-30 12:24:50.000000000 +0200
++++ a2ps/contrib/fixps.m4	2014-03-30 12:40:36.767249254 +0200
+@@ -307,7 +307,7 @@
+   	eval "$command" ;;
+       gs)
+         $verbose "$program: making a full rewrite of the file ($gs)." >&2
+-  	$gs -q -dNOPAUSE -dBATCH -sDEVICE=pswrite -sOutputFile=- -c save pop -f $file ;;
++  	$gs -q -dSAFER -dNOPAUSE -dBATCH -sDEVICE=pswrite -sOutputFile=- -c save pop -f $file ;;
+     esac
+   )
+ fi
diff --git a/app-text/a2ps/files/a2ps-4.14-check-mempcpy.patch b/app-text/a2ps/files/a2ps-4.14-check-mempcpy.patch
new file mode 100644
index 000000000000..7b820cead05f
--- /dev/null
+++ b/app-text/a2ps/files/a2ps-4.14-check-mempcpy.patch
@@ -0,0 +1,12 @@
+--- a2ps-4.14-orig/configure.in	2008-04-16 08:36:03.000000000 +0200
++++ a2ps-4.14/configure.in	2008-04-16 08:36:29.000000000 +0200
+@@ -137,7 +137,8 @@
+ ad_REPLACE_FUNC_STRCASECMP
+ ad_REPLACE_FUNC_STRNCASECMP
+ ad_REPLACE_FUNC_RENAME
+-AC_CHECK_FUNCS(uname strchr strerror strerror_r getcwd bcopy bzero tempnam strsignal psignal setlocale)
++AC_CHECK_FUNCS(uname strchr strerror strerror_r getcwd bcopy bzero \
++  tempnam strsignal psignal setlocale mempcpy)
+ ad_FUNC_SYSTEMPAPERNAME
+ ad_FUNC_ATEXIT
+ ad_FUNC_STRFTIME
diff --git a/app-text/a2ps/files/a2ps-4.14-cleanup.patch b/app-text/a2ps/files/a2ps-4.14-cleanup.patch
new file mode 100644
index 000000000000..25187f315384
--- /dev/null
+++ b/app-text/a2ps/files/a2ps-4.14-cleanup.patch
@@ -0,0 +1,106 @@
+fix missing prototype and printf warnings
+
+--- a/lib/argmatch.c
++++ b/lib/argmatch.c
+@@ -21,6 +21,7 @@
+ #include "argmatch.h"
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ #ifdef STDC_HEADERS
+ # include <string.h>
+ #endif
+--- a/lib/encoding.c
++++ b/lib/encoding.c
+@@ -790,7 +790,7 @@ dump_encoding_setup (FILE * stream,
+   /* Create the dictionary and fill it */
+   fprintf (stream, "%% Dictionary for %s support\n",
+ 	  encoding->name);
+-  fprintf (stream, "/%sdict %d dict begin\n", encoding->key, nb);
++  fprintf (stream, "/%sdict %zu dict begin\n", encoding->key, nb);
+   for (i = 0 ; i < nb ; i++)
+     fprintf (stream, "  /f%s %sEncoding /%s reencode_font\n",
+ 	     font_names [i],
+--- a/lib/output.c
++++ b/lib/output.c
+@@ -84,7 +84,7 @@ new_derivation (enum derivation_type type)
+ static void
+ derivation_self_print (struct derivation * derivation, FILE * stream)
+ {
+-  fprintf (stream, "At %x: ", (int) derivation);
++  fprintf (stream, "At %p: ", derivation);
+   switch (derivation->type)
+     {
+     case nothing:
+@@ -525,7 +525,7 @@ output_file (struct output * out, a2ps_job * job,
+ 		     expand_user_string (job, FIRST_FILE (job),
+ 					 (const uchar *) "Expand: requirement",
+ 					 (const uchar *) token));
+-	output (dest, expansion);
++	output (dest, "%s", expansion);
+ 	continue;
+       }
+ 
+--- a/lib/parseppd.y
++++ b/lib/parseppd.y
+@@ -154,7 +154,7 @@ font_clause :
+ void
+ yyerror (const char *msg)
+ {
+-  error_at_line (1, 0, ppdfilename, ppdlineno, msg);
++  error_at_line (1, 0, ppdfilename, ppdlineno, "%s", msg);
+ }
+ 
+ /*
+--- a/lib/psgen.c
++++ b/lib/psgen.c
+@@ -232,7 +232,7 @@ output_marker (a2ps_job * job, const char * kind, uchar * marker)
+     default:
+       *buf = '\0';
+       ps_escape_char (job, cp[i], buf);
+-      output (jdiv, (char *) buf);
++      output (jdiv, "%s", buf);
+       break;
+     }
+   }
+--- a/lib/quotearg.c
++++ b/lib/quotearg.c
+@@ -60,6 +60,7 @@
+ 
+ #if HAVE_MBRTOWC && HAVE_WCHAR_H
+ # include <wchar.h>
++# include <wctype.h>
+ #else
+ # define iswprint(wc) 1
+ # define mbrtowc(pwc, s, n, ps) 1
+--- a/lib/title.c
++++ b/lib/title.c
+@@ -28,6 +28,7 @@
+ #endif
+ 
+ #include <stdio.h>
++#include <string.h>
+ 
+ #if HAVE_VPRINTF || HAVE_DOPRNT || _LIBC
+ # if __STDC__
+--- a/src/long-options.c
++++ b/src/long-options.c
+@@ -22,6 +22,7 @@
+ #endif
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <getopt.h>
+ #include "closeout.h"
+ #include "long-options.h"
+--- a/src/parsessh.y
++++ b/src/parsessh.y
+@@ -740,7 +740,7 @@ exception_def_opt:
+ void
+ yyerror (const char *msg)
+ {
+-  error_at_line (1, 0, sshfilename, sshlineno, msg);
++  error_at_line (1, 0, sshfilename, sshlineno, "%s", msg);
+ }
+ 
+ /*
diff --git a/app-text/a2ps/files/a2ps-4.14-fix-stpcpy-proto.patch b/app-text/a2ps/files/a2ps-4.14-fix-stpcpy-proto.patch
new file mode 100644
index 000000000000..7c3c69076ae9
--- /dev/null
+++ b/app-text/a2ps/files/a2ps-4.14-fix-stpcpy-proto.patch
@@ -0,0 +1,17 @@
+=== modified file 'lib/xstrrpl.c'
+--- lib/xstrrpl.c	2008-04-14 18:04:50 +0000
++++ lib/xstrrpl.c	2008-04-14 18:20:20 +0000
+@@ -20,12 +20,10 @@
+ 
+ #include "system.h"
+ #include <assert.h>
+ #include "xstrrpl.h"
+ 
+-extern char * stpcpy();
+-
+ /* Perform subsitutions in string.  Result is malloc'd
+    E.g., result = xstrrrpl ("1234", subst) gives result = "112333"
+    where subst = { {"1", "11"}, {"3", "333"}, { "4", ""}}
+    */
+ char *
+
diff --git a/app-text/a2ps/files/a2ps-4.14-ja-cleanup.patch b/app-text/a2ps/files/a2ps-4.14-ja-cleanup.patch
new file mode 100644
index 000000000000..16271b3ec674
--- /dev/null
+++ b/app-text/a2ps/files/a2ps-4.14-ja-cleanup.patch
@@ -0,0 +1,122 @@
+diff --git lib/argmatch.c lib/argmatch.c
+index f983e9d..eadc7ea 100644
+--- lib/argmatch.c
++++ lib/argmatch.c
+@@ -21,6 +21,7 @@
+ #include "argmatch.h"
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ #ifdef STDC_HEADERS
+ # include <string.h>
+ #endif
+diff --git lib/encoding.c lib/encoding.c
+index 9bd9f2a..f554a6d 100644
+--- lib/encoding.c
++++ lib/encoding.c
+@@ -989,7 +989,7 @@ dump_encoding_setup (FILE * stream,
+   /* Create the dictionary and fill it */
+   fprintf (stream, "%% Dictionary for %s support\n",
+ 	  encoding->name);
+-  fprintf (stream, "/%sdict %d dict begin\n", encoding->key,
++  fprintf (stream, "/%sdict %zu dict begin\n", encoding->key,
+ 	   (encoding->composite_flag == true)? nb+nb+ns:nb+ns);
+   for (i = 0 ; i < nb ; i++)
+     fprintf (stream, "  /f%s %sEncoding /%s reencode_font\n",
+diff --git lib/output.c lib/output.c
+index b5fc37d..5f67676 100644
+--- lib/output.c
++++ lib/output.c
+@@ -84,7 +84,7 @@ new_derivation (enum derivation_type type)
+ static void
+ derivation_self_print (struct derivation * derivation, FILE * stream)
+ {
+-  fprintf (stream, "At %x: ", (int) derivation);
++  fprintf (stream, "At %p: ", derivation);
+   switch (derivation->type)
+     {
+     case nothing:
+@@ -525,7 +525,7 @@ output_file (struct output * out, a2ps_job * job,
+ 		     expand_user_string (job, FIRST_FILE (job),
+ 					 (const uchar *) "Expand: requirement",
+ 					 (const uchar *) token));
+-	output (dest, expansion);
++	output (dest, "%s", expansion);
+ 	continue;
+       }
+ 
+diff --git lib/parseppd.y lib/parseppd.y
+index a7558ba..c89d188 100644
+--- lib/parseppd.y
++++ lib/parseppd.y
+@@ -154,7 +154,7 @@ font_clause :
+ void
+ yyerror (const char *msg)
+ {
+-  error_at_line (1, 0, ppdfilename, ppdlineno, msg);
++  error_at_line (1, 0, ppdfilename, ppdlineno, "%s", msg);
+ }
+ 
+ /*
+diff --git lib/psgen.c lib/psgen.c
+index 9eeef74..9d7a27d 100644
+--- lib/psgen.c
++++ lib/psgen.c
+@@ -232,7 +232,7 @@ output_marker (a2ps_job * job, const char * kind, uchar * marker)
+     default:
+       *buf = '\0';
+       ps_escape_char (job, cp[i], buf);
+-      output (jdiv, (char *) buf);
++      output (jdiv, "%s", buf);
+       break;
+     }
+   }
+diff --git lib/quotearg.c lib/quotearg.c
+index 16d0b91..89db991 100644
+--- lib/quotearg.c
++++ lib/quotearg.c
+@@ -60,6 +60,7 @@
+ 
+ #if HAVE_MBRTOWC && HAVE_WCHAR_H
+ # include <wchar.h>
++# include <wctype.h>
+ #else
+ # define iswprint(wc) 1
+ # define mbrtowc(pwc, s, n, ps) 1
+diff --git lib/title.c lib/title.c
+index cf4a34b..7a3e87b 100644
+--- lib/title.c
++++ lib/title.c
+@@ -28,6 +28,7 @@
+ #endif
+ 
+ #include <stdio.h>
++#include <string.h>
+ 
+ #if HAVE_VPRINTF || HAVE_DOPRNT || _LIBC
+ # if __STDC__
+diff --git src/long-options.c src/long-options.c
+index fb40cd9..7bd77b0 100644
+--- src/long-options.c
++++ src/long-options.c
+@@ -22,6 +22,7 @@
+ #endif
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <getopt.h>
+ #include "closeout.h"
+ #include "long-options.h"
+diff --git src/parsessh.y src/parsessh.y
+index 21e9559..569fdb6 100644
+--- src/parsessh.y
++++ src/parsessh.y
+@@ -740,7 +740,7 @@ exception_def_opt:
+ void
+ yyerror (const char *msg)
+ {
+-  error_at_line (1, 0, sshfilename, sshlineno, msg);
++  error_at_line (1, 0, sshfilename, sshlineno, "%s", msg);
+ }
+ 
+ /*
diff --git a/app-text/a2ps/files/a2ps-4.14-psset.patch b/app-text/a2ps/files/a2ps-4.14-psset.patch
new file mode 100644
index 000000000000..291c3aac4fa4
--- /dev/null
+++ b/app-text/a2ps/files/a2ps-4.14-psset.patch
@@ -0,0 +1,21 @@
+diff -Naur a2ps-4.14.orig/contrib/psset.in a2ps-4.14/contrib/psset.in
+--- a2ps-4.14.orig/contrib/psset.in	2007-12-29 12:29:01.000000000 +0900
++++ a2ps-4.14/contrib/psset.in	2009-04-12 12:17:43.000000000 +0900
+@@ -219,7 +219,7 @@
+ done
+ 
+ pspagedevice="% Pagedevice definitions:
+-countdictstack
++ countdictstack
+ % Push our own mark, since there can be several PS marks pushed depending
+ % where the failure really occured.
+ /psset_mark
+@@ -227,7 +227,7 @@
+ } stopped
+ % My cleartomark
+ { /psset_mark eq { exit } if } loop
+-countdictstack exch sub dup 0 gt
++ countdictstack exch sub dup 0 gt
+ {
+   { end } repeat
+ }{
diff --git a/app-text/a2ps/files/a2ps-4.14-ptrdiff_t.patch b/app-text/a2ps/files/a2ps-4.14-ptrdiff_t.patch
new file mode 100644
index 000000000000..00d955a819a9
--- /dev/null
+++ b/app-text/a2ps/files/a2ps-4.14-ptrdiff_t.patch
@@ -0,0 +1,14 @@
+diff -uNr a2ps-4.14/lib/obstack.h a2ps-4.14.test/lib/obstack.h
+--- a2ps-4.14/lib/obstack.h	2007-12-29 09:37:59.000000000 +0800
++++ a2ps-4.14.test/lib/obstack.h	2009-06-10 18:49:45.000000000 +0900
+@@ -138,9 +138,9 @@
+ #define __need_ptrdiff_t
+ #endif
+ #endif
++#endif
+ 
+ #include <stddef.h>
+-#endif
+ 
+ #if defined (__STDC__) && __STDC__
+ #define PTR_INT_TYPE ptrdiff_t
diff --git a/app-text/a2ps/files/a2ps-4.14-texinfo-5.x.patch b/app-text/a2ps/files/a2ps-4.14-texinfo-5.x.patch
new file mode 100644
index 000000000000..44cd4bfd099d
--- /dev/null
+++ b/app-text/a2ps/files/a2ps-4.14-texinfo-5.x.patch
@@ -0,0 +1,147 @@
+--- a2ps-4.14/doc/a2ps.texi.bero	2013-03-26 10:31:31.230137555 +0100
++++ a2ps-4.14/doc/a2ps.texi	2013-03-26 11:01:01.504006086 +0100
+@@ -44,10 +44,6 @@
+ @end ifnottex
+ 
+ @c TeX variants
+-@macro LaTeX
+-La@TeX{}
+-@end macro
+-
+ @macro PreTeX
+ Pre@TeX{}
+ @end macro
+@@ -417,9 +413,9 @@ Genesis
+ @c Now, that's what I call humor :)
+ @cindex First Page
+ This document describes GNU @pack{} version @value{VERSION}.  The latest
+-versions may be found on the @href{@value{WWWHOME},@pack{} home page}.
+-We plan to update the @href{http://www.gnu.org/software/a2ps/, GNU
+-@pack{} home page} in the near future, in which case the latter will be
++versions may be found on the @uref{@value{WWWHOME}, home page}.
++We plan to update the @uref{@value{WWWHOME}, GNU home page}
++in the near future, in which case the latter will be
+ a better source of information.
+ 
+ We tried to make this document informative and pleasant.  It tries to be
+@@ -431,8 +427,8 @@ difficult to use.  @xref{Glossary}, for
+ information.
+ 
+ Please, send us emailcards @code{:)}. Whatever the comment is, or if you
+-just like @pack{}, write to @email{Miguel.Santana@@st.com, Miguel
+-Santana} and @email{akim@@freefriends.org, Akim Demaille}.  But
++just like @pack{}, write to @email{Miguel.Santana@@st.com, Miguel Santana}
++and @email{akim@@freefriends.org, Akim Demaille}.  But
+ @emph{never} write to either of us for asking questions, or to report
+ bugs.  Chances are very high never to receive an answer, as we receive
+ too many messages.  @xref{a2ps Mailing Lists}, for information on the
+@@ -517,8 +513,8 @@ everybody so that mistakes get fixed as
+ 
+ So, if you have a problem (configuration error, compilation error,
+ runtime error, documentation error or unclear), first check in the FAQ
+-(@pxref{FAQ}), then on the page @href{@value{WWWHOME}/bugs.html,Known
+-@pack{} Bugs} if the issue has not been addressed yet.  If it is not the
++(@pxref{FAQ}), then on the page @uref{@value{WWWHOME}/bugs.html,Known Bugs}
++if the issue has not been addressed yet.  If it is not the
+ case, but it appears that the version of @pack{} you have is old,
+ consider upgrading.
+ 
+@@ -2802,8 +2798,7 @@ Thou shalt start your PostScript DSC con
+ 
+ The bad news is that some printers will reject this header.  Then you
+ may change this header without any worry since the PostScript produced
+-by @pack{} is also 100% PostScript level 1@footnote{That is to say, there
+-are no PostScript printers that don't understand these files.}.
++by @pack{} is also 100% PostScript level 1@footnote{That is to say, there are no PostScript printers that don't understand these files.}.
+ 
+ @defvr {Configuration Setting} OutputFirstLine: @var{magic-number}
+ @cindex @samp{OutputFirstLine:}
+@@ -3971,13 +3966,13 @@ Quote @var{text} so that no special sequ
+ @itemx \end@{enumerate@}
+ @itemx \begin@{description@}
+ @itemx \end@{description@}
+-These commands are legal in @LaTeX but have no sense in @PreTeX{}.
++These commands are legal in @LaTeX{} but have no sense in @PreTeX{}.
+ Hence there are simply ignored and not printed (if immediately followed
+ by an end-of-line).
+ @end table
+ 
+ @node Differences with LaTeX
+-@subsubsection Differences with @LaTeX
++@subsubsection Differences with @LaTeX{}
+ The following symbols, inherited from the style sheet @code{Symbol}, are
+ not supported by @LaTeX{}:
+ 
+@@ -4124,9 +4119,9 @@ beautiful, with any character you might
+ prefix part of the file name, and is alpha-numerical, lower case, and
+ less than 8 characters long.
+ 
+-Anywhere @pack{} needs to recognize a style sheet by a name, @strong{it
+-uses the key} (in the @file{sheets.map} file, with the option @samp{-E},
+-etc.).
++Anywhere @pack{} needs to recognize a style sheet by a name,
++@strong{it uses the key} (in the @file{sheets.map} file, with the
++option @samp{-E}, etc.).
+ 
+ As an example, C++ is implemented in a file called @file{cxx.ssh}, in
+ which the name is declared to be @samp{C++}.
+@@ -5672,7 +5667,7 @@ supporting a @samp{--help}-like option.
+ @subsection Invoking @code{card}
+ 
+ @example
+-card [@var{options}] @var{applications} [-- @var{@pack{}-options}]
++card [@var{options}] @var{applications} [-- @var{-options}]
+ @end example
+ 
+ @noindent
+@@ -5680,7 +5675,7 @@ card [@var{options}] @var{applications}
+ @var{applications}' help message (typically by the options @samp{--help}
+ or @samp{-h}), and pretty prints it thanks to @pack{} (or the content of
+ the environment variable @samp{A2PS} if it is set).
+-@var{@pack{}-options} are passed to @pack{}.
++@var{-options} are passed to @pack{}.
+ 
+ Supported options are:
+ 
+@@ -5874,12 +5869,12 @@ difference finder,wdiff,GNU wdiff}) to e
+ @subsection Invoking @code{pdiff}
+ 
+ @example
+-pdiff [@var{options}] @var{file-1} @var{file-2} [-- @var{@pack{}-options}]
++pdiff [@var{options}] @var{file-1} @var{file-2} [-- @var{-options}]
+ @end example
+ 
+ @noindent
+ make a pretty comparison between @var{file-1} and @var{file-2}.
+-@var{@pack{}-options} are passed to @pack{}.
++@var{-options} are passed to @pack{}.
+ 
+ Supported options are:
+ 
+@@ -6222,7 +6217,7 @@ Error related questions.
+ @subsection Why Does it Print Nothing?
+ 
+ @quotation
+-@i{@pack{} works OK, but the printer prints nothing.}
++@i{works OK, but the printer prints nothing.}
+ @end quotation
+ 
+ There are two ways that printing can fail: silently, or with a
+@@ -6351,7 +6346,7 @@ If it is incorrect, ask for help around
+ @subsection Why Does it Say my File is Binary?
+ 
+ @quotation
+-@i{@pack{} complains that my file is binary though it is not.}
++@i{complains that my file is binary though it is not.}
+ @end quotation
+ 
+ There are several reasons that can cause @pack{} to consider a file is
+@@ -6591,7 +6586,7 @@ format you want for the date: @xref{Esca
+ @subsection Why Have the Options Changed?
+ 
+ @quotation
+-@i{The options of this @pack{} are not the same as in the previous versions.}
++@i{The options of this are not the same as in the previous versions.}
+ @end quotation
+ 
+ True.  But the old scheme (up to version 4.6.1) prevented us from
diff --git a/app-text/a2ps/metadata.xml b/app-text/a2ps/metadata.xml
new file mode 100644
index 000000000000..98cea90097ed
--- /dev/null
+++ b/app-text/a2ps/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>printing@gentoo.org</email>
+	<name>Gentoo Printing Project</name>
+</maintainer>
+<maintainer type="project">
+	<email>cjk@gentoo.org</email>
+	<name>Cjk</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-text/active-dvi-1.10.2-r1 b/app-text/active-dvi-1.10.2-r1
deleted file mode 100644
index bfc95955c74d..000000000000
--- a/app-text/active-dvi-1.10.2-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare
-DEPEND=>=dev-lang/ocaml-3.11.2:=[ocamlopt?] >=dev-ml/camlimages-4.0.1:=[truetype,tiff,jpeg,postscript,X] virtual/latex-base app-text/ghostscript-gpl x11-libs/libXinerama dev-texlive/texlive-pstricks dev-texlive/texlive-pictures dev-texlive/texlive-latexextra x11-base/xorg-proto dev-ml/findlib app-text/htmlc dev-tex/hevea >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A DVI previewer and a presenter for slides written in LaTeX
-EAPI=5
-HOMEPAGE=http://gallium.inria.fr/advi/
-IUSE=+ocamlopt
-KEYWORDS=~amd64 ~ppc x86
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-lang/ocaml-3.11.2:=[ocamlopt?] >=dev-ml/camlimages-4.0.1:=[truetype,tiff,jpeg,postscript,X] virtual/latex-base app-text/ghostscript-gpl x11-libs/libXinerama
-SLOT=0
-SRC_URI=http://gallium.inria.fr/advi/advi-1.10.2.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e6965005127a9c6d30a5dd7b8db946f4
diff --git a/app-text/active-dvi/Manifest b/app-text/active-dvi/Manifest
new file mode 100644
index 000000000000..094a3f3066d5
--- /dev/null
+++ b/app-text/active-dvi/Manifest
@@ -0,0 +1,4 @@
+AUX active-dvi-1.9-htmlcflags.patch 464 BLAKE2B d7e84e2a095f5aa5575f4dc78429106e9c695b077110965c96dab9b60b0f634c493a93f9a38996b7d282fbb4f21dca3e4115109d54ec01a0f93ee2b182fdc271 SHA512 994e7310097baececcb2f028041e66c6fb36e33a8fc6761ab2a73fb3c0d32999b92bdfdcc784366bf8f291070a5c5cc53ded072d7a562e2bdb8f559a21151d03
+DIST advi-1.10.2.tar.gz 9772060 BLAKE2B c9a96037d6101014688847bebf2c49eee94803064ef730fbc4f6729de6146672485d769cc4808cf947f8796145627dd47c4fc4cd7d406752ac77738905adcaa7 SHA512 93479e22261019b571bc331604a659e4e58200284bcdd63929b2c7ab07f8e9fabbd120f8876081a36e7e09e08286eeba9a45f3b077b545a9e404060622ec45c8
+EBUILD active-dvi-1.10.2-r1.ebuild 1602 BLAKE2B 3d3197ed45dfdaa59f029c940ea1545dffc954e4e2c681b1282c55085a749709f94965c2ad81753bd6d3b6e062943a157ebb02254be198aacc54c825b4361635 SHA512 eada2dcb6016d203db20996061e56f1466cc84d27fe9b7a17383029e9e2ab465a9b218fd7f6c5de76fa8808ee30aa272b7501cfbad7b963e73a1944bc792c5c5
+MISC metadata.xml 245 BLAKE2B ee3a163cfe0a4bc59c0dfb46f9ddb580e2d259b4d0e33cb4e684eb9e6d4b901bf97c6edd891f3b75a613a782f1b89318d0ee3ec9bee4e34c4441d9e8f4267678 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690
diff --git a/app-text/active-dvi/active-dvi-1.10.2-r1.ebuild b/app-text/active-dvi/active-dvi-1.10.2-r1.ebuild
new file mode 100644
index 000000000000..ab1bc39469ff
--- /dev/null
+++ b/app-text/active-dvi/active-dvi-1.10.2-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils autotools texlive-common
+
+MY_PN=${PN/ctive-/}
+MY_P=${MY_PN}-${PV}
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="A DVI previewer and a presenter for slides written in LaTeX"
+SRC_URI="http://gallium.inria.fr/advi/${MY_P}.tar.gz"
+HOMEPAGE="http://gallium.inria.fr/advi/"
+LICENSE="LGPL-2.1"
+
+IUSE="+ocamlopt"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc x86"
+
+RDEPEND=">=dev-lang/ocaml-3.11.2:=[ocamlopt?]
+	>=dev-ml/camlimages-4.0.1:=[truetype,tiff,jpeg,postscript,X]
+	virtual/latex-base
+	app-text/ghostscript-gpl
+	x11-libs/libXinerama"
+DEPEND="${RDEPEND}
+	dev-texlive/texlive-pstricks
+	dev-texlive/texlive-pictures
+	dev-texlive/texlive-latexextra
+	x11-base/xorg-proto
+	dev-ml/findlib
+	app-text/htmlc
+	dev-tex/hevea"
+
+DOCS=( "README" "TODO" )
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-1.9-htmlcflags.patch"
+	AT_M4DIR="." eautoreconf
+}
+
+src_configure() {
+	TEXMFMAIN="${EPREFIX}"/usr/share/texmf-site econf $(use_enable ocamlopt native-program) \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" --enable-dependency-tracking #486066
+}
+
+src_compile() {
+	export VARTEXFONTS="${T}/fonts"
+	emake
+	cd doc || die
+	emake splash.dvi scratch_write_splash.dvi scratch_draw_splash.dvi
+}
+
+src_install() {
+	emake DESTDIR="${D}" PACKAGE="${PF}" install
+
+	# now install the documentation
+	dodoc ${DOCS}
+
+	export STRIP_MASK="*/bin/advi.byt"
+
+	for i in "${ED}/usr/share/doc/${PF}/"*.dvi ; do
+		docompress -x /usr/share/doc/${PF}/$(basename $i)
+	done
+}
+
+pkg_postinst() {
+	etexmf-update
+}
+
+pkg_postrm() {
+	etexmf-update
+}
diff --git a/app-text/active-dvi/files/active-dvi-1.9-htmlcflags.patch b/app-text/active-dvi/files/active-dvi-1.9-htmlcflags.patch
new file mode 100644
index 000000000000..59697ec4dc83
--- /dev/null
+++ b/app-text/active-dvi/files/active-dvi-1.9-htmlcflags.patch
@@ -0,0 +1,13 @@
+Index: advi-1.9/doc/Makefile.am
+===================================================================
+--- advi-1.9.orig/doc/Makefile.am
++++ advi-1.9/doc/Makefile.am
+@@ -113,6 +113,8 @@ TEX_ENV		= TEXINPUTS=$(srcdir):$(top_src
+ HEVEA_FLAGS	= -entities -I $(srcdir) -I $(top_srcdir)/tex
+ HTMLC_FLAGS	= -I $(srcdir)/includes \
+ 		  -D CamlVersion '$(OCAMLVERSION)' \
++		  -D HOSTNAME "$(HOSTNAME)" \
++		  -D USER "$(USER)" \
+ 		  -D version '$(VERSION)'
+ 
+ MV		= mv -f
diff --git a/app-text/active-dvi/metadata.xml b/app-text/active-dvi/metadata.xml
new file mode 100644
index 000000000000..13170c3184d8
--- /dev/null
+++ b/app-text/active-dvi/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>tex@gentoo.org</email>
+	<name>Gentoo TeX Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-text/agrep-2.04-r2 b/app-text/agrep-2.04-r2
deleted file mode 100644
index 39bb23d519a2..000000000000
--- a/app-text/agrep-2.04-r2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install
-DESCRIPTION=A tool for the fast searching of text allowing for errors in the search pattern
-EAPI=6
-HOMEPAGE=ftp://ftp.cs.arizona.edu/agrep/README
-KEYWORDS=amd64 arm ~mips ppc ppc64 sparc x86 ~ppc-macos ~sparc-solaris
-LICENSE=AGREP
-RDEPEND=!dev-libs/tre !dev-ruby/amatch !app-misc/glimpse
-SLOT=0
-SRC_URI=ftp://ftp.cs.arizona.edu/agrep/agrep-2.04.tar.Z
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=f72c5e7d7e64354037d446512ea7172e
diff --git a/app-text/agrep/Manifest b/app-text/agrep/Manifest
new file mode 100644
index 000000000000..eb7784fd9ad7
--- /dev/null
+++ b/app-text/agrep/Manifest
@@ -0,0 +1,3 @@
+DIST agrep-2.04.tar.Z 62351 BLAKE2B 7856c172aff84d188cc38e83fc8eece63f66cb30a8a1753ec5f54d98fbc47a33d9caad69520c531c66f2958c762f26312032ee7a9e4e4040709f4d366fdbf4a9 SHA512 4524250c2c0b309243fd245efb04fa8d867f45a92b0d977b29d2ff8ec99586c16c35b8a78cdd5aeb4c529fe0270c8b1220d6ddf52d947e6181a5f04bdbed5aee
+EBUILD agrep-2.04-r2.ebuild 767 BLAKE2B 8bec43c8e889884f6dc771ade019a90d082ef75f20ab841e68737de307ae7c2108bc82a8d4c45c744137d1ef9f5415d39576f0c1a1b5b5d8f2c4fc4927f4c45c SHA512 7feeb33bf97fe3a6763afce7791979b6f8562e7a067523ace0ee3f9d8cc62e5250ff95795ea5cff38950ee026c3a3b137dd01aad2015a7bbee2147cc44e01cbc
+MISC metadata.xml 265 BLAKE2B 75452ad720a31a08fc0dcd02eec704c18b11bc0660686f9a320b85fc879f55a564ce9c3b6a8c710781b74c5e8eb3d0544c02a042fb35a0b62a5e1491f675296a SHA512 176f814d8c555e8726f36e012367b698e8a19a0662982621029a7f9190beecc5e6798e43c51698dc149364966cdeff7061121e54fa9d4cf2a3559a6ce4904e25
diff --git a/app-text/agrep/agrep-2.04-r2.ebuild b/app-text/agrep/agrep-2.04-r2.ebuild
new file mode 100644
index 000000000000..d2ff1e0dd621
--- /dev/null
+++ b/app-text/agrep/agrep-2.04-r2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="A tool for the fast searching of text allowing for errors in the search pattern"
+HOMEPAGE="ftp://ftp.cs.arizona.edu/agrep/README"
+SRC_URI="ftp://ftp.cs.arizona.edu/${PN}/${P}.tar.Z"
+
+LICENSE="AGREP"
+SLOT="0"
+KEYWORDS="amd64 arm ~mips ppc ppc64 sparc x86 ~ppc-macos ~sparc-solaris"
+
+RDEPEND="
+	!dev-libs/tre
+	!dev-ruby/amatch
+	!app-misc/glimpse"
+
+DOCS=( README agrep.algorithms agrep.chronicle COPYRIGHT contribution.list )
+
+src_compile() {
+	sed -i \
+		-e 's/^CFLAGS.*//' \
+		-e "s:\$(CFLAGS):& \$(LDFLAGS) :" Makefile || die
+	tc-export CC
+	emake
+}
+
+src_install() {
+	dobin "${PN}"
+	doman "${PN}.1"
+	einstalldocs
+}
diff --git a/app-text/agrep/metadata.xml b/app-text/agrep/metadata.xml
new file mode 100644
index 000000000000..3cf14bf74636
--- /dev/null
+++ b/app-text/agrep/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>shell-tools@gentoo.org</email>
+		<name>Gentoo Shell Tools Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-text/aiksaurus-1.2.1 b/app-text/aiksaurus-1.2.1
deleted file mode 100644
index 30a540a4b588..000000000000
--- a/app-text/aiksaurus-1.2.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure prepare
-DEPEND=gtk? ( x11-libs/gtk+:2 ) gtk? ( virtual/pkgconfig ) >=app-portage/elt-patches-20170422
-DESCRIPTION=A thesaurus lib, tool and database
-EAPI=6
-HOMEPAGE=https://sourceforge.net/projects/aiksaurus
-IUSE=gtk
-KEYWORDS=alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=GPL-2
-RDEPEND=gtk? ( x11-libs/gtk+:2 )
-SLOT=0
-SRC_URI=mirror://sourceforge/aiksaurus/aiksaurus-1.2.1.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e9a6b2814dec3bc3d95a1761bc6396f0
diff --git a/app-text/aiksaurus/Manifest b/app-text/aiksaurus/Manifest
new file mode 100644
index 000000000000..93897e5f7cce
--- /dev/null
+++ b/app-text/aiksaurus/Manifest
@@ -0,0 +1,4 @@
+AUX aiksaurus-1.2.1-gcc43.patch 734 BLAKE2B 9c8b5c401bc116d9daa52ee100bd42127639330449b44d0012494fd8536d46dd99079ee606df794b515ae002d5834f379706af7ecb41785593be150842baaa53 SHA512 6f821ac66f0dd4601f84a6fe8f71b14712854e293f4ebc755a80d34032725cee61b919da1547b514e3d8b6a07edd29016ae53283a28f1792119ae99850016241
+DIST aiksaurus-1.2.1.tar.gz 928893 BLAKE2B 12bcc77eccd921e4e2dd3f148be76905bb162a38483b0aee620be2fe069685a4289df4ec12f91286eb88d9c2f1f4d58556b0b6ac38857fe4f11bb5d31adff496 SHA512 48591850f28f1a8f4b4986df14090ef7bd57cbfbad739cb0013db021f6f5bcb3c592b38e36774735499e27b9e99330504f8d9c6022158e25469cbc81d13f7463
+EBUILD aiksaurus-1.2.1.ebuild 803 BLAKE2B 4ea59eb9cd6bb4513091a92c72d346ec18cda4690b0bc5d3903e84fe57063f9ac6b3bbfee731dc48d51d906b8b26b012f84af146d9f11011e6f30d8bf10d7a52 SHA512 f442673ae7806af431baa5d49c7eef26aabce69935b22e26255547e25737b03501e6096b82f80db49c07b78e43e45fcc65ecc6bb3eaa4daef52388d3a55cd9b4
+MISC metadata.xml 245 BLAKE2B 163eaf1f9854d0f7906920339f1ddf8321c4658b23e14d44bdc7e07ea3eba22d7cedb1cc63285aff307a1287555463807160d380836d63032637eacd5ce97f1d SHA512 34945e0950bf668d24db2565287fdd8484cccb8968df2efbcc665905ee583f45222fe0ff848c267cf9a25f58d3aae9e870656d88b1f813b7812a185782564e08
diff --git a/app-text/aiksaurus/aiksaurus-1.2.1.ebuild b/app-text/aiksaurus/aiksaurus-1.2.1.ebuild
new file mode 100644
index 000000000000..e86e0fca8539
--- /dev/null
+++ b/app-text/aiksaurus/aiksaurus-1.2.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit flag-o-matic libtool
+
+DESCRIPTION="A thesaurus lib, tool and database"
+HOMEPAGE="https://sourceforge.net/projects/aiksaurus"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="gtk"
+
+RDEPEND="gtk? ( x11-libs/gtk+:2 )"
+DEPEND="${RDEPEND}
+	gtk? ( virtual/pkgconfig )"
+
+PATCHES=( "${FILESDIR}/${P}-gcc43.patch" )
+
+src_prepare() {
+	default
+	# Needed to make relink work on FreeBSD, without it won't install.
+	# Also needed for a sane .so versionning there.
+	elibtoolize
+}
+
+src_configure() {
+	filter-flags -fno-exceptions
+	econf $(use_with gtk)
+}
diff --git a/app-text/aiksaurus/files/aiksaurus-1.2.1-gcc43.patch b/app-text/aiksaurus/files/aiksaurus-1.2.1-gcc43.patch
new file mode 100644
index 000000000000..a6d570af569d
--- /dev/null
+++ b/app-text/aiksaurus/files/aiksaurus-1.2.1-gcc43.patch
@@ -0,0 +1,30 @@
+--- aiksaurus-1.2.1/base/aiksaurus.t.cpp
++++ aiksaurus-1.2.1/base/aiksaurus.t.cpp
+@@ -24,6 +24,7 @@
+ #include "config.h"
+ #include <iostream>
+ #include <string>
++#include <cstdlib>
+ using namespace std;
+ using AiksaurusImpl::AsciiCompare;
+ 
+--- aiksaurus-1.2.1/gtk/src/Display.cpp
++++ aiksaurus-1.2.1/gtk/src/Display.cpp
+@@ -22,6 +22,7 @@
+ #include "Meaning.h"
+ #include "DialogMediator.h"
+ #include "Exception.h"
++#include <cstring>
+ using namespace std;
+ 
+ namespace AiksaurusGTK_impl
+--- aiksaurus-1.2.1/gtk/src/gtkAiksaur.t.cpp
++++ aiksaurus-1.2.1/gtk/src/gtkAiksaur.t.cpp
+@@ -23,6 +23,7 @@
+ #include <gtk/gtk.h>
+ #include <iostream>
+ #include <string>
++#include <cstdlib>
+ using namespace std;
+ 
+ int main(int argc, char** argv)
diff --git a/app-text/aiksaurus/metadata.xml b/app-text/aiksaurus/metadata.xml
new file mode 100644
index 000000000000..fbf374360c7a
--- /dev/null
+++ b/app-text/aiksaurus/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="sourceforge">aiksaurus</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/an-1.2 b/app-text/an-1.2
deleted file mode 100644
index ee4606db1b58..000000000000
--- a/app-text/an-1.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=app-arch/xz-utils
-DESCRIPTION=Very fast anagram generator with dictionary lookup
-EAPI=5
-HOMEPAGE=http://packages.debian.org/unstable/games/an
-KEYWORDS=amd64 hppa ppc ppc64 x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/icu:= sys-apps/miscfiles[-minimal]
-SLOT=0
-SRC_URI=mirror://debian/pool/main/a/an/an_1.2.orig.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=019d6660513ed4911289b8186ddd7bbf
diff --git a/app-text/an-1.2-r1 b/app-text/an-1.2-r1
deleted file mode 100644
index 76c4daf18641..000000000000
--- a/app-text/an-1.2-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=dev-libs/icu:=
-DESCRIPTION=Very fast anagram generator with dictionary lookup
-EAPI=6
-HOMEPAGE=http://packages.debian.org/unstable/games/an
-KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/icu:= sys-apps/miscfiles[-minimal]
-SLOT=0
-SRC_URI=mirror://debian/pool/main/a/an/an_1.2.orig.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0774ab8b7ac4f020700fd4fcf75e77d2
diff --git a/app-text/an/Manifest b/app-text/an/Manifest
new file mode 100644
index 000000000000..bd3d024ceea1
--- /dev/null
+++ b/app-text/an/Manifest
@@ -0,0 +1,4 @@
+DIST an_1.2.orig.tar.xz 13196 BLAKE2B bbb19eb16e558f8fc3d331e5ad308611b13a7a88a65fb310b678bd21d46c39761747fb6f60a7eba99a1c2e756a8c9467543d26e97bbf7f9c93d17f66a4d7698c SHA512 919c525aa1215e3c1b2200c6820a357c6406c19b7447147cc4243d339c554b9892bea11797769df0bf96dd72c89f61bf3d977769faf9bc7f9edf609a7daeac3d
+EBUILD an-1.2-r1.ebuild 770 BLAKE2B f6ac00e6faf8e128ed85f7256fba39e6582cb976640cdc460ed4dee8fb0038b543a3d29e48d6c926cb6c85136626c0adf19970bdef3b642e4c67b88f75462df5 SHA512 618ae33718d53a0702798933fe3ee2c14856f76aee53682ea60c2baddc7c28f4800753cdc1f61a21cc9097824716d1d2237291d306d6642fbdabd4755299b226
+EBUILD an-1.2.ebuild 719 BLAKE2B 89ea6d80bdb55f99dab24ed234bc86ada3ab44202285b5d382c737bc42db8529ee19da1fb5c4f4aa120b95d0829f7bf5d384a5ecb21ff2600d19a358c11c75be SHA512 774b56f85bc3d9812e5824551f83aebca3d08e34e0857030cca8b378f57ab5032d6a6f5f1f0bc6b766df0c2b825b0cf91e30d259e4f6fb772ad374cc4b447d1b
+MISC metadata.xml 242 BLAKE2B 719b2221a59fb1ea608b2bab1d89d6694220253a34d1919062de0fd77c3148919ec1ee77a86e3a8699eb8034bec2ca03602fdbcc176784bd7d53e78cd29200e2 SHA512 01fa45ae0901d0f1bbae0a22f72b4c999c24b4718a0a1f7cf8db80ebb29c9a97903246e560ec7e5d5e6800f425b7e32172802206109e67545aa82b2fbac13cf9
diff --git a/app-text/an/an-1.2-r1.ebuild b/app-text/an/an-1.2-r1.ebuild
new file mode 100644
index 000000000000..d9c01423a53c
--- /dev/null
+++ b/app-text/an/an-1.2-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Very fast anagram generator with dictionary lookup"
+HOMEPAGE="http://packages.debian.org/unstable/games/an"
+
+SRC_URI="mirror://debian/pool/main/a/${PN}/${PN}_${PV}.orig.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+
+DEPEND="
+	dev-libs/icu:=
+"
+RDEPEND="
+	${DEPEND}
+	sys-apps/miscfiles[-minimal]
+"
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e '/^CC/s|:=|?=|' \
+		-e 's|$(CC) $(CFLAGS)|& $(LDFLAGS)|g' \
+		-e '/^CPPFLAGS/s|-D_BSD_SOURCE=1 -D_GNU_SOURCE=1|-D_DEFAULT_SOURCE=1|g' \
+		Makefile || die
+	tc-export CC
+}
+
+src_install() {
+	dobin ${PN}
+	newman ${PN}.6 ${PN}.1
+	dodoc ALGORITHM
+}
diff --git a/app-text/an/an-1.2.ebuild b/app-text/an/an-1.2.ebuild
new file mode 100644
index 000000000000..ee3b460ecd60
--- /dev/null
+++ b/app-text/an/an-1.2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Very fast anagram generator with dictionary lookup"
+HOMEPAGE="http://packages.debian.org/unstable/games/an"
+
+SRC_URI="mirror://debian/pool/main/a/${PN}/${PN}_${PV}.orig.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 hppa ppc ppc64 x86"
+IUSE=""
+
+CDEPEND="
+	dev-libs/icu:=
+"
+DEPEND="
+	app-arch/xz-utils
+"
+RDEPEND="
+	${CDEPEND}
+	sys-apps/miscfiles[-minimal]
+"
+
+src_prepare() {
+	sed -i \
+		-e '/^CC/s|:=|?=|' \
+		-e 's|$(CC) $(CFLAGS)|& $(LDFLAGS)|g' \
+		Makefile || die
+	tc-export CC
+}
+
+src_install() {
+	dobin ${PN}
+	newman ${PN}.6 ${PN}.1
+	dodoc ALGORITHM
+}
diff --git a/app-text/an/metadata.xml b/app-text/an/metadata.xml
new file mode 100644
index 000000000000..f5037f14a3cb
--- /dev/null
+++ b/app-text/an/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+  <email>jer@gentoo.org</email>
+  <name>Jeroen Roovers</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-text/ansifilter-2.10 b/app-text/ansifilter-2.10
deleted file mode 100644
index 81660ec152a2..000000000000
--- a/app-text/ansifilter-2.10
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
-DESCRIPTION=Handles text files containing ANSI terminal escape codes
-EAPI=6
-HOMEPAGE=http://www.andre-simon.de/
-IUSE=qt5
-KEYWORDS=amd64 x86
-LICENSE=GPL-3+
-RDEPEND=qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
-SLOT=0
-SRC_URI=http://www.andre-simon.de/zip/ansifilter-2.10.tar.bz2
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=c3edabe6751ea860f27d6b8eb4e7cbb4
diff --git a/app-text/ansifilter/Manifest b/app-text/ansifilter/Manifest
new file mode 100644
index 000000000000..c544671f7964
--- /dev/null
+++ b/app-text/ansifilter/Manifest
@@ -0,0 +1,3 @@
+DIST ansifilter-2.10.tar.bz2 436180 BLAKE2B b00a76867c17c63fa457c6e3ff6a57cfaedb6218df240d8afb52ec4acb46745f02b785fdbde294deb606a77564b9e6deb52e652cc4fdff32ebbb4c3a2ffcc846 SHA512 b2b2f7ec9d3343701cb1de19a1a3cb678ca9a908cc72e26e0eaf1e4cdf61cf7237edb4221bcde3159299aee3c05a84c46cf5706ad4f74b96ccec41b161ad44ec
+EBUILD ansifilter-2.10.ebuild 1000 BLAKE2B 06ba3ae0c29d11bd919576a98a01df3784354e97fe0ba8a2c3bbcee4af19b302f8b6f0680dbcaf5261a8019aa862d15b30a02c7e3c5add469306c750a5301bc5 SHA512 132461f3f691fcb2c3d4baa3101c03e04689095955b6391a77d12153aed9d2948c74a7ac4bdfca738b317a08d4621d9d465fdfeb82e6f188e1ac8740ba0a4b85
+MISC metadata.xml 221 BLAKE2B 6d597a7a853603bd878e86c6552cb68211e81f627cdb673ae99dc6c6133f50f617101e43f4b4631b45b5969ee6ec42849b156a62594f939d00c112ce51d769e1 SHA512 e50d6cad26239ebf4260f0cf4bdf4e29ef2038e999039adf94f49b184b5993f02bb0d4cdb3de6c7b5cda99890db42dcd2b65c5342256be50dc19e6aab2406353
diff --git a/app-text/ansifilter/ansifilter-2.10.ebuild b/app-text/ansifilter/ansifilter-2.10.ebuild
new file mode 100644
index 000000000000..05823fc22ef7
--- /dev/null
+++ b/app-text/ansifilter/ansifilter-2.10.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs qmake-utils
+
+DESCRIPTION="Handles text files containing ANSI terminal escape codes"
+HOMEPAGE="http://www.andre-simon.de/"
+SRC_URI="http://www.andre-simon.de/zip/${P}.tar.bz2"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="qt5"
+
+RDEPEND="
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	)"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+
+	# bug 431452
+	rm src/qt-gui/moc_mydialog.cpp || die
+}
+
+src_configure() {
+	if use qt5 ; then
+		pushd src/qt-gui > /dev/null || die
+		eqmake5
+		popd > /dev/null || die
+	fi
+}
+
+src_compile() {
+	emake -f makefile CC="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS} -DNDEBUG -std=c++11"
+
+	if use qt5 ; then
+		pushd src/qt-gui > /dev/null || die
+		emake
+		popd > /dev/null || die
+	fi
+}
+
+src_install() {
+	dobin src/${PN}
+	use qt5 && dobin src/qt-gui/${PN}-gui
+
+	gunzip man/${PN}.1.gz
+	doman man/${PN}.1
+	einstalldocs
+}
diff --git a/app-text/ansifilter/metadata.xml b/app-text/ansifilter/metadata.xml
new file mode 100644
index 000000000000..69570e849328
--- /dev/null
+++ b/app-text/ansifilter/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>kensington@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-text/antiword-0.37-r1 b/app-text/antiword-0.37-r1
deleted file mode 100644
index ee5cd8c85274..000000000000
--- a/app-text/antiword-0.37-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DESCRIPTION=free MS Word reader
-EAPI=5
-HOMEPAGE=http://www.winfield.demon.nl
-IUSE=kde
-KEYWORDS=alpha amd64 ~arm ~hppa ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://www.winfield.demon.nl/linux/antiword-0.37.tar.gz https://dev.gentoo.org/~grobian/distfiles/antiword-gentoo-patches-r2.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=509c574ec3c026953b9a5d6fd2b63ba0
diff --git a/app-text/antiword/Manifest b/app-text/antiword/Manifest
new file mode 100644
index 000000000000..8c0e8adaedac
--- /dev/null
+++ b/app-text/antiword/Manifest
@@ -0,0 +1,5 @@
+AUX antiword-0.37-CVE-2014-8123.patch 528 BLAKE2B 612718b3af9f3e91b5b755401a124c65268c482075b4f96ea71260f63e43d8fc5a1e009dce5a6ec527a56e013e4627855ea20259a6d72154e51ca0abf870554b SHA512 412884a236abb5ee75e5c707581c7e0158614d0e168cd9a8fe02dd8dcb8c0963ae2269c9575cd9cb9f4876efb3bec6bef7934fec5c7738530012495637a2d694
+DIST antiword-0.37.tar.gz 317884 BLAKE2B f47c815e2c6a1ddb33fefa33b3579fa5ba6e3900d3b9339350d28ebd0223853ad60ed717a1bccf4960c835427ebacc4de944548f9b354cd34889f0742de4e74a SHA512 6cd8fb9137238417544cf8754829a2d5296055d730ea62a8a025236baa79516190317d146401ff40cde73e1ee2c3c374a2ea01b2e5d24e149310bcabb8bfdce8
+DIST antiword-gentoo-patches-r2.tar.bz2 1747 BLAKE2B c01aa7c02539fb5148cb1ec01983a8406315bc3cb2f909118c022c2f218660919e6862582cda34dbd4c08a21beb02c928f685273853d1ff3350548957ae30cde SHA512 45ed3ee1c514a9ee78bc8963e56be18426b47ea628f02934dbcec83c2d632162e458f75f998da438daae4794fcce36fd8922a172804c0fc83c6f32c9a8092ffe
+EBUILD antiword-0.37-r1.ebuild 1431 BLAKE2B 2367955fe72a8c5d31e86fc8fb9303b858f4605e07d02458f63ce8d66fc35179e1ab5a6679cc31ea57f93f3e412dfef48e370b74384e4240f72741e64fbb7c8b SHA512 fdc188c4658e1093e4f843711a1843da8e827f1c737a627e54000bb3b4d16827eb828c52019b64adaca2fcfb20e6f57b29271f8d7c21241fc7fd9878c0204585
+MISC metadata.xml 343 BLAKE2B a255d4f9a7079612cf94d69b3136bf3dc5d1ac638629e02430c96512b039fbaa0d1d05a216f7181c7269a1701c096292e47251769581d1f4dc5bb1559c76501a SHA512 6a09982bb72f873e6fcfc90d8dcb8db7b06c11b43633793303f511b5bdc86f83a2b2ab560f6ce1e4b62e334c16cce96fd9b0ad983caee6381612a4b4102ccc09
diff --git a/app-text/antiword/antiword-0.37-r1.ebuild b/app-text/antiword/antiword-0.37-r1.ebuild
new file mode 100644
index 000000000000..7aafe949cf22
--- /dev/null
+++ b/app-text/antiword/antiword-0.37-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils toolchain-funcs
+
+IUSE="kde"
+PATCHVER="r2"
+DESCRIPTION="free MS Word reader"
+HOMEPAGE="http://www.winfield.demon.nl"
+SRC_URI="http://www.winfield.demon.nl/linux/${P}.tar.gz
+	https://dev.gentoo.org/~grobian/distfiles/${PN}-gentoo-patches-${PATCHVER}.tar.bz2"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="alpha amd64 ~arm ~hppa ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+
+src_prepare() {
+	# Makefile is a symlink to Makefile.Linux, avoid that we patch it by
+	# accident using patch <2.7, see bug #435492
+	rm Makefile || die
+
+	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/${PN}-gentoo-patches-${PATCHVER}"
+
+	# Re-add convenience symlink, see above
+	ln -s Makefile.Linux Makefile
+
+	epatch "${FILESDIR}"/${P}-CVE-2014-8123.patch
+}
+
+src_configure() { :; }
+
+src_compile() {
+	emake PREFIX="${EPREFIX}" OPT="${CFLAGS}" CC="$(tc-getCC)" LD="$(tc-getCC)" \
+		LDFLAGS="${LDFLAGS}" || die "emake failed"
+}
+
+src_install() {
+	emake -j1 PREFIX="${EPREFIX}" DESTDIR="${D}" global_install || die
+
+	use kde || rm -f "${ED}"/usr/bin/kantiword
+
+	insinto /usr/share/${PN}/examples
+	doins Docs/testdoc.doc Docs/antiword.php || die
+
+	cd Docs
+	doman antiword.1 || die
+	dodoc ChangeLog Exmh Emacs FAQ History Netscape QandA ReadMe Mozilla Mutt || die
+}
diff --git a/app-text/antiword/files/antiword-0.37-CVE-2014-8123.patch b/app-text/antiword/files/antiword-0.37-CVE-2014-8123.patch
new file mode 100644
index 000000000000..8b6baf9b2ca2
--- /dev/null
+++ b/app-text/antiword/files/antiword-0.37-CVE-2014-8123.patch
@@ -0,0 +1,17 @@
+index 8a95fb9..7797d1f 100644
+--- a/wordole.c
++++ b/wordole.c
+@@ -259,6 +259,11 @@ bGetPPS(FILE *pFile,
+ 		}
+ 		tNameSize = (size_t)usGetWord(0x40, aucBytes);
+ 		tNameSize = (tNameSize + 1) / 2;
++		if (tNameSize >= sizeof(atPPSlist[0].szName)) {
++			werr(0, "PPS %d appears to be invalid.", iIndex);
++			atPPSlist = xfree(atPPSlist);
++			return FALSE;
++		}
+ 		vName2String(atPPSlist[iIndex].szName, aucBytes, tNameSize);
+ 		atPPSlist[iIndex].ucType = ucGetByte(0x42, aucBytes);
+ 		if (atPPSlist[iIndex].ucType == 5) {
+-- 
+2.1.2
diff --git a/app-text/antiword/metadata.xml b/app-text/antiword/metadata.xml
new file mode 100644
index 000000000000..8ee341cec0e5
--- /dev/null
+++ b/app-text/antiword/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>grobian@gentoo.org</email>
+		<name>Fabian Groffen</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:antiword_project:antiword</remote-id>
+	</upstream>
+</pkgmetadata>
+
diff --git a/app-text/antixls-0.3b b/app-text/antixls-0.3b
deleted file mode 100644
index 05525bf505bb..000000000000
--- a/app-text/antixls-0.3b
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install unpack
-DEPEND=dev-perl/Spreadsheet-ParseExcel
-DESCRIPTION=Print out an XLS file with minimal formatting, or extract the data into CSV
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-KEYWORDS=~amd64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
-LICENSE=public-domain
-RDEPEND=dev-perl/Spreadsheet-ParseExcel
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~grobian/distfiles/antixls-0.3b.perl
-_md5_=613afb5afabc21ffecf2da00a2cb6703
diff --git a/app-text/antixls/Manifest b/app-text/antixls/Manifest
new file mode 100644
index 000000000000..a4892e35107a
--- /dev/null
+++ b/app-text/antixls/Manifest
@@ -0,0 +1,3 @@
+DIST antixls-0.3b.perl 4627 BLAKE2B c1ab58bf8ce934586edeaaf1961921341f32149e53ee8b4add0fe1bea5adbfeeb0626ab97ea9791b9e9de47a39a85075e08ef9392b6144f446fb4c0f643b36b7 SHA512 7e6a6ce26ea8134ee35bab55da73fefc1b211bb58b52468e012abb3ddd0688afea5f3b87b9de49bdb0daff1b6d79b02d4cd6bc2b045a88ff7dc557610ac6fd7f
+EBUILD antixls-0.3b.ebuild 622 BLAKE2B c82868017a2d0477fec57281ef9f6c6bf2c0f39242dddc98b8f358aa4a4c0762955b9d852b7ab57a84437ec67ee5aba5d26d05da905f4fac6b38cf5cec0a88fa SHA512 7c9ec8b2af98e250c563fdd19b975f83f8b9759a9c871ceb5e9790d57eda715d2ee12310281375b93525db99f12315f86b5cf2b5451b9a03a31d673df86a25d2
+MISC metadata.xml 248 BLAKE2B 60e4295b22f6f36039547e98305ae072755044f6516df2e29e65768732900ffc93dac9cbcf1da9e6c731403a62cf272f2f378d0641bd466974f8a234235c862a SHA512 f6fee7363592cb9dcd666011806321b791fb84bf0719fb2454d1f3ceb738650184286c17a13684c077bacd1a93581a71accfe9cef74adcaf40dfda7d8a167d13
diff --git a/app-text/antixls/antixls-0.3b.ebuild b/app-text/antixls/antixls-0.3b.ebuild
new file mode 100644
index 000000000000..53e29234db59
--- /dev/null
+++ b/app-text/antixls/antixls-0.3b.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Print out an XLS file with minimal formatting, or extract the data into CSV"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI="https://dev.gentoo.org/~grobian/distfiles/${P}.perl"
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE=""
+DEPEND="dev-perl/Spreadsheet-ParseExcel"
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+	mkdir "${S}" || die
+	cp "${DISTDIR}/${P}.perl" "${S}"/${PN} || die
+}
+
+src_install() {
+	dobin ${PN}
+}
diff --git a/app-text/antixls/metadata.xml b/app-text/antixls/metadata.xml
new file mode 100644
index 000000000000..a53ffbea77d3
--- /dev/null
+++ b/app-text/antixls/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>grobian@gentoo.org</email>
+		<name>Fabian Groffen</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-text/apvlv-0.1.5-r2 b/app-text/apvlv-0.1.5-r2
deleted file mode 100644
index 5dcc18318ce9..000000000000
--- a/app-text/apvlv-0.1.5-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=>=app-text/poppler-0.18[cairo,xpdf-headers(+)] dev-libs/glib:2 x11-libs/gtk+:3 djvu? ( app-text/djvu:= ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
-DESCRIPTION=Alf's PDF Viewer Like Vim
-EAPI=6
-HOMEPAGE=https://naihe2010.github.com/apvlv/
-IUSE=debug djvu
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=app-text/poppler-0.18[cairo,xpdf-headers(+)] dev-libs/glib:2 x11-libs/gtk+:3 djvu? ( app-text/djvu:= )
-SLOT=0
-SRC_URI=https://github.com/naihe2010/apvlv/archive/v0.1.5.tar.gz -> apvlv-0.1.5.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e5edfcd14362047dba5483c4dbb8d111
diff --git a/app-text/apvlv/Manifest b/app-text/apvlv/Manifest
new file mode 100644
index 000000000000..5f37dba8012f
--- /dev/null
+++ b/app-text/apvlv/Manifest
@@ -0,0 +1,6 @@
+AUX apvlv-0.1.5-cflags.patch 702 BLAKE2B f6679326fdf3263e5a304f11bb1b6d047fd5604288912c9099a18b9a990574e1031c92c751c147319aa8c0f9e066e8a239562483b56f77e29fecf649fe7f89d5 SHA512 de7842c8cb402f045240aa50bdf05a13c6e9a4bea099fc8c41f07329b330fbb98f6edc229f0bb78eec65b14ecfffe9240441387717024939c11b9a69cb65919f
+AUX apvlv-0.1.5-gcc6.patch 403 BLAKE2B d593c72ef63ddc22a76fe8b93ad12078b1739f359832dee54f3ff4f5fbf7fa4249457ac74921b8fd9734eafdae2088321703df0b3bf56a89a1c33b96a15908b8 SHA512 f838fe6c601765e7d03ba83575aa5ffa2562d90e257832109ebe879b29d67228784c920ff7c9716010f10d2c36f4e873bc2425fc337857c437c6a19e6bd5e5f5
+AUX apvlv-0.1.5-gcc7.patch 685 BLAKE2B 3ece21cc1bfb5bbf66d10fb67abb140a357c6953655ca1b02b37cbc3d09503b5382694fb20337b2a7e50fc0a7ab51657f1a3091060bf03e8666b2bdbd0b8a8dc SHA512 53102dfea587fd946bdd7300fdb60b8395d6b2436aef6fe67be539e4ac88063f9d7934282227316f456951aa1e0748db7db02ddda06e17056d32ea6b91588afb
+DIST apvlv-0.1.5.tar.gz 4254177 BLAKE2B 53bb949838353e7e8387219d086b8c7efef78d4bff15196c68e3d0fe6c298be8a771ecce4e156254f1d072d1715794caff640ebe795f8da73e09d6a4fe4addc9 SHA512 680b2d6e272cda34b0b9065f5fdf7b917a4e3ed4d54a6e78cb41a60cf43374c687b506d4148d6cecf87912957fbe6bc4c77e9278616fd236e49ade15774e1ccd
+EBUILD apvlv-0.1.5-r2.ebuild 1166 BLAKE2B 207a92587f645c66e9834b363dd63b20bde77fd47e6d52a3882cd0a5a2ca180135d3c8282fb2903c927a4ad3960ecd5007aea2c83ca27fce74201efd5aa4fe13 SHA512 f106f31cbe4a8963548034a3ea4f386342b0a548f50c0b4e51b3bb226a89c1fa9f3ed1cf4aeecf047f422b121281a8e0beed21f4d9f586f774c1674e2904c02d
+MISC metadata.xml 304 BLAKE2B bd4def156407f7aa104c4bb45814ecc48caa571fef3b68961e831c0c1997324c8f0773beb78da896ee23e14f8e82634a20696bf2b2fd201fc5d87037e995fa5a SHA512 0d01027269ed441b2c29ae9ae560e16eca4a6aed7ed7d0e418887c538673b913988dc3f7c6414982198dfda258044ff7ef3667b8fc53cfd9d4f7773dd5d35030
diff --git a/app-text/apvlv/apvlv-0.1.5-r2.ebuild b/app-text/apvlv/apvlv-0.1.5-r2.ebuild
new file mode 100644
index 000000000000..930aba29f219
--- /dev/null
+++ b/app-text/apvlv/apvlv-0.1.5-r2.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils desktop gnome2-utils
+
+DESCRIPTION="Alf's PDF Viewer Like Vim"
+HOMEPAGE="https://naihe2010.github.com/apvlv/"
+SRC_URI="https://github.com/naihe2010/apvlv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="debug djvu"
+
+RDEPEND="
+	>=app-text/poppler-0.18[cairo,xpdf-headers(+)]
+	dev-libs/glib:2
+	x11-libs/gtk+:3
+	djvu? ( app-text/djvu:= )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	# preserve cflags
+	"${FILESDIR}/${PN}-0.1.5-cflags.patch"
+	"${FILESDIR}/${PN}-0.1.5-gcc6.patch"
+	"${FILESDIR}/${PN}-0.1.5-gcc7.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DSYSCONFDIR=/etc/${PN}
+		-DDOCDIR=/usr/share/${PN}
+		-DMANDIR=/usr/share/man
+		-DAPVLV_WITH_HTML=OFF
+		-DAPVLV_WITH_UMD=OFF
+		-DAPVLV_WITH_TXT=ON
+		-DAPVLV_WITH_DJVU=$(usex djvu)
+		-DAPVLV_ENABLE_DEBUG=$(usex debug)
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	newicon -s 32 icons/pdf.png ${PN}.png
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/app-text/apvlv/files/apvlv-0.1.5-cflags.patch b/app-text/apvlv/files/apvlv-0.1.5-cflags.patch
new file mode 100644
index 000000000000..d1859fa25701
--- /dev/null
+++ b/app-text/apvlv/files/apvlv-0.1.5-cflags.patch
@@ -0,0 +1,20 @@
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index ae9ae09..5831e7a 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -1,13 +1,11 @@
+ IF (WIN32)
+   ADD_DEFINITIONS (-D_CRT_SECURE_NO_WARNINGS)
+ ELSE (WIN32)
+-  SET (CMAKE_CXX_FLAGS "-Wall -fno-strict-aliasing")
++  SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -fno-strict-aliasing")
+ 
+   OPTION (APVLV_ENABLE_DEBUG "If build binary with debug infomations." OFF)
+   IF (APVLV_ENABLE_DEBUG)
+-    SET (CMAKE_CXX_FLAGS "-D_DEBUG -g ${CMAKE_CXX_FLAGS}")
+-  ELSE (APVLV_ENABLE_DEBUG)
+-    SET (CMAKE_CXX_FLAGS "-O2 ${CMAKE_CXX_FLAGS}")
++    SET (CMAKE_CXX_FLAGS "-D_DEBUG ${CMAKE_CXX_FLAGS}")
+   ENDIF (APVLV_ENABLE_DEBUG)
+ ENDIF (WIN32)
+ 
diff --git a/app-text/apvlv/files/apvlv-0.1.5-gcc6.patch b/app-text/apvlv/files/apvlv-0.1.5-gcc6.patch
new file mode 100644
index 000000000000..0ffe3659d6d7
--- /dev/null
+++ b/app-text/apvlv/files/apvlv-0.1.5-gcc6.patch
@@ -0,0 +1,12 @@
+diff -Naur apvlv-0.1.5.orig/src/ApvlvParams.cc apvlv-0.1.5/src/ApvlvParams.cc
+--- apvlv-0.1.5.orig/src/ApvlvParams.cc	2015-01-10 15:04:24.000000000 +0100
++++ apvlv-0.1.5/src/ApvlvParams.cc	2017-02-09 20:03:08.655402750 +0100
+@@ -90,7 +90,7 @@
+ 	return false;
+       }
+ 
+-    while ((getline (os, str)) != NULL)
++    while (getline (os, str))
+       {
+ 	string argu, data, crap;
+ 	stringstream is (str);
diff --git a/app-text/apvlv/files/apvlv-0.1.5-gcc7.patch b/app-text/apvlv/files/apvlv-0.1.5-gcc7.patch
new file mode 100644
index 000000000000..e55f2771395a
--- /dev/null
+++ b/app-text/apvlv/files/apvlv-0.1.5-gcc7.patch
@@ -0,0 +1,22 @@
+--- apvlv-0.1.5+dfsg.orig/src/ApvlvCmds.cc
++++ apvlv-0.1.5+dfsg/src/ApvlvCmds.cc
+@@ -200,7 +200,7 @@ namespace apvlv
+ 
+     if (len >= 4
+ 	&& *s == '<'
+-	&& (e = strchr ((char *) s, '>')) != '\0' && *(s + 2) != '-')
++	&& (e = strchr ((char *) s, '>')) && *(s + 2) != '-')
+       {
+ 	e++;
+ 	StringKeyMap::iterator it;
+--- apvlv-0.1.5+dfsg.orig/src/ApvlvCore.cc
++++ apvlv-0.1.5+dfsg/src/ApvlvCore.cc
+@@ -90,7 +90,7 @@ namespace apvlv
+   {
+     mInuse = use;
+ 
+-    if (mInuse == false && gView->hasloaded (filename (), type ()) == false)
++    if (mInuse == false && !gView->hasloaded (filename (), type ()))
+       {
+ 	debug ("core :%p is not needed, delete it\n", this);
+ 	delete this;
diff --git a/app-text/apvlv/metadata.xml b/app-text/apvlv/metadata.xml
new file mode 100644
index 000000000000..2985af6e7c96
--- /dev/null
+++ b/app-text/apvlv/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <!-- maintainer-needed -->
+  <upstream>
+    <remote-id type="google-code">apvlv</remote-id>
+    <remote-id type="github">naihe2010/apvlv</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-text/asa-1.1-r1 b/app-text/asa-1.1-r1
deleted file mode 100644
index 3834a27f6206..000000000000
--- a/app-text/asa-1.1-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=ASA Carriage control conversion for ouput by Fortran programs
-EAPI=5
-HOMEPAGE=http://www.ibiblio.org/pub/Linux/devel/lang/fortran/
-KEYWORDS=amd64
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://www.ibiblio.org/pub/Linux/devel/lang/fortran/asa-1.1.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=bdafa3b9ec1e1a81c600012cc4a6498c
diff --git a/app-text/asa/Manifest b/app-text/asa/Manifest
new file mode 100644
index 000000000000..30932192374f
--- /dev/null
+++ b/app-text/asa/Manifest
@@ -0,0 +1,3 @@
+DIST asa-1.1.tar.gz 9893 BLAKE2B 72bdaef2652f9420c310d9fbcb632a12e021d7c6d2faa0b71d25a6db6a1f697ff3c5fa5df78bf127f29ef72dc98eb06c0cd5c038912c455b5a5024d7566b826c SHA512 70452783da23929d9a02cdf9cefd7403698fc8ae703ee5403dd84834b3ac39febf1edc02cb59b233cbdf51cd2f8c04922a77833dd8d851e2106de2e2fe444728
+EBUILD asa-1.1-r1.ebuild 582 BLAKE2B da2d5e70875440144286591afeefa5b6306affda921a0ab475898a8cc43debd8949e73872abeffe800eac68b61024afd5954d9912243669c8625fea73a67aeb4 SHA512 c8a99e085e4cc2ba763c7fe93c71476f66e7c1b9ce5e61418b79e8b784f117e4c69f4c36bb42a1ac93ece6ab53c3665197f626939963c918b94f9551e0a2edf1
+MISC metadata.xml 125 BLAKE2B e5427454feb3a48e131f81cbe1a66b4b1b26b98c1819add6afc7ff4da742f49574c0c7e39e3e1f365ba499620c56fb876ae50b00aa890e1f564549b0767aadbb SHA512 59faf3fa455a1926455e56e789043a1fab0a443aa3877152ac22dd29af6425676edc5d1fa67473465a4caf9dceb52dd868fd5fcb4cfbd02136d92a007ba68288
diff --git a/app-text/asa/asa-1.1-r1.ebuild b/app-text/asa/asa-1.1-r1.ebuild
new file mode 100644
index 000000000000..83a488a04c1c
--- /dev/null
+++ b/app-text/asa/asa-1.1-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit toolchain-funcs
+
+DESCRIPTION="ASA Carriage control conversion for ouput by Fortran programs"
+HOMEPAGE="http://www.ibiblio.org/pub/Linux/devel/lang/fortran/"
+SRC_URI="http://www.ibiblio.org/pub/Linux/devel/lang/fortran/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64"
+IUSE=""
+
+src_prepare() {
+	sed \
+		-e "s:-o:${LDFLAGS} -o:g" \
+		-e "/^CFLAGS/d" \
+		-i Makefile || die
+	tc-export CC
+}
+
+src_install() {
+	dobin asa
+	doman asa.1
+	dodoc README asa.dat
+}
diff --git a/app-text/asa/metadata.xml b/app-text/asa/metadata.xml
new file mode 100644
index 000000000000..e27d4d3e7e65
--- /dev/null
+++ b/app-text/asa/metadata.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata/>
diff --git a/app-text/asciidoc-8.6.10 b/app-text/asciidoc-8.6.10
deleted file mode 100644
index 23d6fe40bfae..000000000000
--- a/app-text/asciidoc-8.6.10
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare setup test
-DEPEND=test? ( app-text/dvipng dev-texlive/texlive-latex dev-util/source-highlight media-gfx/graphviz media-gfx/imagemagick media-sound/lilypond python_single_target_pypy? ( >=virtual/pypy-5:0= ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_pypy(+)?,python_single_target_python2_7(+)?] ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A plain text human readable/writable document format
-EAPI=6
-HOMEPAGE=http://asciidoc.org/
-IUSE=examples graphviz highlight test python_targets_pypy python_targets_python2_7 python_single_target_pypy python_single_target_python2_7
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=app-text/docbook-xml-dtd:4.5 >=app-text/docbook-xsl-stylesheets-1.75 dev-libs/libxslt python_single_target_pypy? ( >=virtual/pypy-5:0= ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_pypy(+)?,python_single_target_python2_7(+)?] graphviz? ( media-gfx/graphviz ) highlight? ( || ( dev-util/source-highlight dev-python/pygments[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_pypy(+)?,python_single_target_python2_7(+)?] app-text/highlight ) )
-REQUIRED_USE=^^ ( python_single_target_pypy python_single_target_python2_7 ) python_single_target_pypy? ( python_targets_pypy ) python_single_target_python2_7? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/asciidoc/asciidoc/archive/8.6.10.tar.gz -> asciidoc-8.6.10.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=9587b0990b76ed471ee278dbc9adcf28
diff --git a/app-text/asciidoc-8.6.9-r2 b/app-text/asciidoc-8.6.9-r2
deleted file mode 100644
index 3d1c3d581e57..000000000000
--- a/app-text/asciidoc-8.6.9-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare setup test
-DEPEND=test? ( dev-util/source-highlight media-sound/lilypond media-gfx/imagemagick dev-texlive/texlive-latex app-text/dvipng media-gfx/graphviz python_single_target_pypy? ( >=virtual/pypy-5:0= ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_pypy(+)?,python_single_target_python2_7(+)?] )
-DESCRIPTION=A plain text human readable/writable document format
-EAPI=5
-HOMEPAGE=http://asciidoc.org/
-IUSE=examples graphviz highlight test python_targets_pypy python_targets_python2_7 python_single_target_pypy python_single_target_python2_7
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=>=app-text/docbook-xsl-stylesheets-1.75 dev-libs/libxslt graphviz? ( media-gfx/graphviz ) app-text/docbook-xml-dtd:4.5 highlight? ( || ( dev-util/source-highlight dev-python/pygments[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_pypy(+)?,python_single_target_python2_7(+)?] app-text/highlight ) ) python_single_target_pypy? ( >=virtual/pypy-5:0= ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_pypy(+)?,python_single_target_python2_7(+)?]
-REQUIRED_USE=^^ ( python_single_target_pypy python_single_target_python2_7 ) python_single_target_pypy? ( python_targets_pypy ) python_single_target_python2_7? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://sourceforge/project/asciidoc/asciidoc/8.6.9/asciidoc-8.6.9.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	readme.gentoo	da528e0e6c88b426c83f9b3bce3df2ef	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7e48b87aafefc3b9546fecd0ea39544f
diff --git a/app-text/asciidoc-8.6.9-r6 b/app-text/asciidoc-8.6.9-r6
deleted file mode 100644
index 719df5a70b5d..000000000000
--- a/app-text/asciidoc-8.6.9-r6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare setup test
-DEPEND=test? ( app-text/dvipng dev-texlive/texlive-latex dev-util/source-highlight media-gfx/graphviz media-gfx/imagemagick media-sound/lilypond python_single_target_pypy? ( >=virtual/pypy-5:0= ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_pypy(+)?,python_single_target_python2_7(+)?] )
-DESCRIPTION=A plain text human readable/writable document format
-EAPI=6
-HOMEPAGE=http://asciidoc.org/
-IUSE=examples graphviz highlight test python_targets_pypy python_targets_python2_7 python_single_target_pypy python_single_target_python2_7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=app-text/docbook-xml-dtd:4.5 >=app-text/docbook-xsl-stylesheets-1.75 dev-libs/libxslt python_single_target_pypy? ( >=virtual/pypy-5:0= ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_pypy(+)?,python_single_target_python2_7(+)?] graphviz? ( media-gfx/graphviz ) highlight? ( || ( dev-util/source-highlight dev-python/pygments[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_pypy(+)?,python_single_target_python2_7(+)?] app-text/highlight ) )
-REQUIRED_USE=^^ ( python_single_target_pypy python_single_target_python2_7 ) python_single_target_pypy? ( python_targets_pypy ) python_single_target_python2_7? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://sourceforge/project/asciidoc/asciidoc/8.6.9/asciidoc-8.6.9.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=a5dca8cbb1eea471c0cdc53c46eb7678
diff --git a/app-text/asciidoc/Manifest b/app-text/asciidoc/Manifest
new file mode 100644
index 000000000000..53e9087d6abc
--- /dev/null
+++ b/app-text/asciidoc/Manifest
@@ -0,0 +1,6 @@
+DIST asciidoc-8.6.10.tar.gz 577208 BLAKE2B 320724c3e2306e14212a4e32f09fb735861f9b0126ce86695c6b5840b69f94d0e5befbbfc355006a10d13d34e8ed3582f0bfb678744654a7d2040555016b1681 SHA512 6ecc86977baaf1c756691e3f661e43ef2bb24e606898f6075bfa6f174d1fdc5e77d00853ffe014847e295364349d6ad34f3b8209cb97870e0233012fc38a281a
+DIST asciidoc-8.6.9.tar.gz 907253 BLAKE2B 45db42abd9ec73f6d3b20fc755bdd501eab1503bd8d5d6bb6b7d66c442cf8bcd47ee4325dbb572bdcfd01168ef1bccc3430ee7c545e7b3a6715b8ebf09516ad9 SHA512 1984482010dbd35c3a1def67f4915ce83ecfc29a7463f84aa312107d7a9ff647978f57615462c65e885bea424eed89a212df728cc3acd3c63df1c763dfa5e955
+EBUILD asciidoc-8.6.10.ebuild 2428 BLAKE2B 0684c4781333547a21565dd3c0c04415ff71b424793dc3e6263b210af63e87bd4af15853ab8ce2e0d62ab9e63ac80320012b692fabb4f87ab2b292434a869fdf SHA512 2e13bcb6df18d5ae9a785d1f0498617a5a8bc38e94775eef48d7902313b8f9b6f964dfaad868310073d681bbf94181c851dac5066f4b856cad36076b07dc9785
+EBUILD asciidoc-8.6.9-r2.ebuild 2182 BLAKE2B 9afcba8c17bdc898a80a57fd660bf0615d10a0757a12707b85b4f4d177e8782abc08476dd210329a522a809015353b4a4e8be1311deed0a54f39b4691a5e0aa1 SHA512 17bbf46f4f39ac05e83017e18997908a52dedbf624dcaf0e6c62506a683fc88917f2b042988a1e36cd43c71eab86001959e65c36bd92af40b45bc0a993ab0df7
+EBUILD asciidoc-8.6.9-r6.ebuild 2381 BLAKE2B 3f10a76d93d77748c69ed6655ae7bfe1cabc0c167af6132fc1f3a1ff3e527df9e61b3f69cec32a6fdc7821fb8e8d044877498f1e66e97f71e046c564694002ad SHA512 43f555c2811a278b8226941936ed8da27ea05a6daf244bd1fb62952f8941bb504f4614e8796d675849f28c8aebb1b2303a83b72d64d6e1d3402be0c3ed2f7018
+MISC metadata.xml 514 BLAKE2B 89fefee3e8081fc45a8251255bf365f58eba6aa9eef92a23bd8f234703b7062b1dd2a415260fcda1b799cffa4b46d0da22b153ba8de6b77cb6076666ff43ccb7 SHA512 2587ac6d8c24ceca295eef2dc6e0735461dd09864d6a1f282d67fc3c58cd18aa565099a2c280edec143024295b74a251152918932c37d3be450aef68d367ca70
diff --git a/app-text/asciidoc/asciidoc-8.6.10.ebuild b/app-text/asciidoc/asciidoc-8.6.10.ebuild
new file mode 100644
index 000000000000..79a10d61469a
--- /dev/null
+++ b/app-text/asciidoc/asciidoc-8.6.10.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit autotools python-single-r1 readme.gentoo-r1
+
+DESCRIPTION="A plain text human readable/writable document format"
+HOMEPAGE="http://asciidoc.org/"
+SRC_URI="https://github.com/asciidoc/asciidoc/archive/${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="examples graphviz highlight test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	app-text/docbook-xml-dtd:4.5
+	>=app-text/docbook-xsl-stylesheets-1.75
+	dev-libs/libxslt
+	${PYTHON_DEPS}
+	graphviz? ( media-gfx/graphviz )
+	highlight? (
+		|| (
+			dev-util/source-highlight
+			dev-python/pygments[${PYTHON_USEDEP}]
+			app-text/highlight
+		)
+	)"
+DEPEND="
+	test? (
+		app-text/dvipng
+		dev-texlive/texlive-latex
+		dev-util/source-highlight
+		media-gfx/graphviz
+		media-gfx/imagemagick
+		media-sound/lilypond
+		${PYTHON_DEPS}
+	)"
+
+DOC_CONTENTS="
+If you are going to use a2x, please also look at a2x(1) under
+REQUISITES for a list of runtime dependencies.
+"
+
+src_prepare() {
+	default
+	# Only needed for prefix - harmless (does nothing) otherwise
+	sed -i -e "s:^CONF_DIR=.*:CONF_DIR='${EPREFIX}/etc/asciidoc':" \
+		"${S}/asciidoc.py" || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf --sysconfdir="${EPREFIX}"/usr/share
+}
+
+src_test() {
+	local -x ASCIIDOC_PY=asciidoc.py
+	"${EPYTHON}" tests/test${PN}.py update || die
+	"${EPYTHON}" tests/test${PN}.py run || die
+}
+
+src_install() {
+	default
+	python_fix_shebang "${ED%/}"/usr/bin/*.py
+
+	readme.gentoo_create_doc
+	dodoc BUGS.txt CHANGELOG.txt README.asciidoc docbook-xsl/asciidoc-docbook-xsl.txt \
+		dblatex/dblatex-readme.txt filters/code/code-filter-readme.txt
+
+	# Below results in some files being installed twice in different locations, but they are
+	# in the right place, uncompressed, and there won't be any broken links. See bug #483336
+	if use examples; then
+		# examples/website is full of relative symlinks,
+		# deref them for copying, which dodoc doesn't do
+		cp -rL examples/website "${ED%/}"/usr/share/doc/${PF}/examples || die
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/app-text/asciidoc/asciidoc-8.6.9-r2.ebuild b/app-text/asciidoc/asciidoc-8.6.9-r2.ebuild
new file mode 100644
index 000000000000..cded88810c54
--- /dev/null
+++ b/app-text/asciidoc/asciidoc-8.6.9-r2.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit readme.gentoo python-single-r1
+
+DESCRIPTION="A plain text human readable/writable document format"
+HOMEPAGE="http://asciidoc.org/"
+SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.gz"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="examples graphviz highlight test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND=">=app-text/docbook-xsl-stylesheets-1.75
+		dev-libs/libxslt
+		graphviz? ( media-gfx/graphviz )
+		app-text/docbook-xml-dtd:4.5
+		highlight? ( || ( dev-util/source-highlight \
+			dev-python/pygments[${PYTHON_USEDEP}] \
+			app-text/highlight )
+		)
+		${PYTHON_DEPS}
+"
+DEPEND="test? ( dev-util/source-highlight
+			media-sound/lilypond
+			media-gfx/imagemagick
+			dev-texlive/texlive-latex
+			app-text/dvipng
+			media-gfx/graphviz
+			${PYTHON_DEPS} )
+"
+
+DOC_CONTENTS="
+If you are going to use a2x, please also look at a2x(1) under
+REQUISITES for a list of runtime dependencies.
+"
+
+src_prepare() {
+	# Only needed for prefix - harmless (does nothing) otherwise
+	sed -i -e "s:^CONF_DIR=.*:CONF_DIR='${EPREFIX}/etc/asciidoc':" \
+		"${S}/asciidoc.py" || die
+}
+
+src_configure() {
+	econf --sysconfdir="${EPREFIX}"/usr/share
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	python_fix_shebang "${ED}"/usr/bin/*.py
+
+	readme.gentoo_create_doc
+	dodoc BUGS CHANGELOG README docbook-xsl/asciidoc-docbook-xsl.txt \
+			dblatex/dblatex-readme.txt filters/code/code-filter-readme.txt
+
+	# Below results in some files being installed twice in different locations, but they are in the right place,
+	# uncompressed, and there won't be any broken links. See bug #483336.
+	if use examples; then
+		cp -rL examples/website "${D}"/usr/share/doc/${PF}/examples || die
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
+
+src_test() {
+	cd tests || die
+	local -x ASCIIDOC_PY=../asciidoc.py
+	"${PYTHON}" test${PN}.py update || die
+	"${PYTHON}" test${PN}.py run || die
+}
diff --git a/app-text/asciidoc/asciidoc-8.6.9-r6.ebuild b/app-text/asciidoc/asciidoc-8.6.9-r6.ebuild
new file mode 100644
index 000000000000..7be61c90a3f0
--- /dev/null
+++ b/app-text/asciidoc/asciidoc-8.6.9-r6.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit python-single-r1 readme.gentoo-r1
+
+DESCRIPTION="A plain text human readable/writable document format"
+HOMEPAGE="http://asciidoc.org/"
+SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.gz"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="examples graphviz highlight test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	app-text/docbook-xml-dtd:4.5
+	>=app-text/docbook-xsl-stylesheets-1.75
+	dev-libs/libxslt
+	${PYTHON_DEPS}
+	graphviz? ( media-gfx/graphviz )
+	highlight? (
+		|| (
+			dev-util/source-highlight
+			dev-python/pygments[${PYTHON_USEDEP}]
+			app-text/highlight
+		)
+	)"
+DEPEND="
+	test? (
+		app-text/dvipng
+		dev-texlive/texlive-latex
+		dev-util/source-highlight
+		media-gfx/graphviz
+		media-gfx/imagemagick
+		media-sound/lilypond
+		${PYTHON_DEPS}
+	)"
+
+DOC_CONTENTS="
+If you are going to use a2x, please also look at a2x(1) under
+REQUISITES for a list of runtime dependencies.
+"
+
+src_prepare() {
+	default
+	# Only needed for prefix - harmless (does nothing) otherwise
+	sed -i -e "s:^CONF_DIR=.*:CONF_DIR='${EPREFIX}/etc/asciidoc':" \
+		"${S}/asciidoc.py" || die
+}
+
+src_configure() {
+	econf --sysconfdir="${EPREFIX}"/usr/share
+}
+
+src_test() {
+	local -x ASCIIDOC_PY=asciidoc.py
+	"${EPYTHON}" tests/test${PN}.py update || die
+	"${EPYTHON}" tests/test${PN}.py run || die
+}
+
+src_install() {
+	default
+	python_fix_shebang "${ED%/}"/usr/bin/*.py
+
+	readme.gentoo_create_doc
+	dodoc BUGS CHANGELOG README docbook-xsl/asciidoc-docbook-xsl.txt \
+		dblatex/dblatex-readme.txt filters/code/code-filter-readme.txt
+
+	# Below results in some files being installed twice in different locations, but they are
+	# in the right place, uncompressed, and there won't be any broken links. See bug #483336
+	if use examples; then
+		# examples/website is full of relative symlinks,
+		# deref them for copying, which dodoc doesn't do
+		cp -rL examples/website "${ED%/}"/usr/share/doc/${PF}/examples || die
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/app-text/asciidoc/metadata.xml b/app-text/asciidoc/metadata.xml
new file mode 100644
index 000000000000..33454ff9d090
--- /dev/null
+++ b/app-text/asciidoc/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>marcec@gmx.de</email>
+		<name>Marc Joliet</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<use>
+		<flag name="highlight">Enable source code highlighting</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">asciidoc</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/aspell-0.60.7_rc1 b/app-text/aspell-0.60.7_rc1
deleted file mode 100644
index 88b01b9ed3d3..000000000000
--- a/app-text/aspell-0.60.7_rc1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=sys-libs/ncurses:0=[unicode?] nls? ( virtual/libintl ) !=app-dicts/aspell-en-0.5* virtual/pkgconfig nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A spell checker replacement for ispell
-EAPI=6
-HOMEPAGE=http://aspell.net/
-IUSE=nls unicode l10n_af l10n_be l10n_bg l10n_br l10n_ca l10n_cs l10n_cy l10n_da l10n_de l10n_de-1901 l10n_el l10n_en l10n_eo l10n_es l10n_et l10n_fi l10n_fo l10n_fr l10n_ga l10n_gl l10n_he l10n_hr l10n_hu l10n_hy l10n_is l10n_it l10n_la l10n_lt l10n_nl l10n_no l10n_pl l10n_pt l10n_pt-BR l10n_ro l10n_ru l10n_sk l10n_sl l10n_sr l10n_sv l10n_uk l10n_vi
-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
-LICENSE=LGPL-2
-PDEPEND=app-dicts/aspell-en l10n_af? ( app-dicts/aspell-af ) l10n_be? ( app-dicts/aspell-be ) l10n_bg? ( app-dicts/aspell-bg ) l10n_br? ( app-dicts/aspell-br ) l10n_ca? ( app-dicts/aspell-ca ) l10n_cs? ( app-dicts/aspell-cs ) l10n_cy? ( app-dicts/aspell-cy ) l10n_da? ( app-dicts/aspell-da ) l10n_de? ( app-dicts/aspell-de ) l10n_de-1901? ( app-dicts/aspell-de-alt ) l10n_el? ( app-dicts/aspell-el ) l10n_en? ( app-dicts/aspell-en ) l10n_eo? ( app-dicts/aspell-eo ) l10n_es? ( app-dicts/aspell-es ) l10n_et? ( app-dicts/aspell-et ) l10n_fi? ( app-dicts/aspell-fi ) l10n_fo? ( app-dicts/aspell-fo ) l10n_fr? ( app-dicts/aspell-fr ) l10n_ga? ( app-dicts/aspell-ga ) l10n_gl? ( app-dicts/aspell-gl ) l10n_he? ( app-dicts/aspell-he ) l10n_hr? ( app-dicts/aspell-hr ) l10n_hu? ( app-dicts/aspell-hu ) l10n_hy? ( app-dicts/aspell-hy ) l10n_is? ( app-dicts/aspell-is ) l10n_it? ( app-dicts/aspell-it ) l10n_la? ( app-dicts/aspell-la ) l10n_lt? ( app-dicts/aspell-lt ) l10n_nl? ( app-dicts/aspell-nl ) l10n_no? ( app-dicts/aspell-no ) l10n_pl? ( app-dicts/aspell-pl ) l10n_pt? ( app-dicts/aspell-pt ) l10n_pt-BR? ( app-dicts/aspell-pt-br ) l10n_ro? ( app-dicts/aspell-ro ) l10n_ru? ( app-dicts/aspell-ru ) l10n_sk? ( app-dicts/aspell-sk ) l10n_sl? ( app-dicts/aspell-sl ) l10n_sr? ( app-dicts/aspell-sr ) l10n_sv? ( app-dicts/aspell-sv ) l10n_uk? ( app-dicts/aspell-uk ) l10n_vi? ( app-dicts/aspell-vi )
-RDEPEND=sys-libs/ncurses:0=[unicode?] nls? ( virtual/libintl ) !=app-dicts/aspell-en-0.5*
-SLOT=0
-SRC_URI=mirror://gnu-alpha/aspell/aspell-0.60.7-rc1.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=953cc6f3912f44b6668ec8b7d64983db
diff --git a/app-text/aspell/Manifest b/app-text/aspell/Manifest
new file mode 100644
index 000000000000..b57c3ea7e4c2
--- /dev/null
+++ b/app-text/aspell/Manifest
@@ -0,0 +1,8 @@
+AUX aspell-0.60.5-nls.patch 443 BLAKE2B be4f32ceeded1b55e0c5d5384bbd1ea9adf9148ad2b44e70254eacfb4347b43e1335942c562629ac9849ae9bb9ab4f2279ad78e40a24e9589aa7937234553cfe SHA512 579de3e40e6036701b02e0936cbe7a0aebfe09f5fef35241827d9a64eea024148d530cb1cd435d5c9307358940c1704309511cd633e45307546e7f5d30d97120
+AUX aspell-0.60.5-solaris.patch 538 BLAKE2B bafba6f85217bca2f27382ce6f25d511e2db3063597e6770bdbc8fb1490fc52a0f0415690ea81a65ee8ac95b76cbf9c343f2918531df51c6b8095e45e8455282 SHA512 0386e629e77335cc42529134104ed62980c7b1a7bedf1b1925f78a2bd014c0db5292520bdd75152233464806527956761aa4795e7201569a9dbe365386ea8418
+AUX aspell-0.60.6-darwin-bundles.patch 967 BLAKE2B 2b159dbac972ad9a246723fd7fbbdd34d611ac1647828fc9ee7afdc70bef326bb11794e80ecfc1b14166fcedc199d880fbc83e54824d333cd2590873a14ae03e SHA512 d1725c48b0fcb77131ad7d8804afd87fc9552993552bbee52164ad9d8b49e9e3ddd6d78b1a519ab242462e4f66f32b375e995aca1feb88faaddb5c036f6cf6eb
+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 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
new file mode 100644
index 000000000000..eecfee4dcba2
--- /dev/null
+++ b/app-text/aspell/aspell-0.60.7_rc1.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools flag-o-matic libtool toolchain-funcs
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="A spell checker replacement for ispell"
+HOMEPAGE="http://aspell.net/"
+if [[ "${PV}" = *_rc* ]] ; then
+	SRC_URI="mirror://gnu-alpha/aspell/${MY_P}.tar.gz"
+else
+	SRC_URI="mirror://gnu/aspell/${MY_P}.tar.gz"
+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"
+IUSE="nls unicode"
+
+PDEPEND="app-dicts/aspell-en"
+LANGS="af be bg br ca cs cy da de de-1901 el en eo es et fi fo fr ga gl he hr
+hu hy is it la lt nl no pl pt pt-BR ro ru sk sl sr sv uk vi"
+for lang in ${LANGS}; do
+	IUSE+=" l10n_${lang}"
+	case ${lang} in
+		de-1901) dict="de-alt"  ;;
+		pt-BR)   dict="pt-br"   ;;
+		*)       dict="${lang}" ;;
+	esac
+	PDEPEND+=" l10n_${lang}? ( app-dicts/aspell-${dict} )"
+done
+unset dict lang LANGS
+
+# English dictionary 0.5 is incompatible with aspell-0.6
+RDEPEND="
+	sys-libs/ncurses:0=[unicode?]
+	nls? ( virtual/libintl )
+	!=app-dicts/aspell-en-0.5*
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+HTML_DOCS=( manual/aspell{,-dev}.html )
+PATCHES=(
+	"${FILESDIR}/${PN}-0.60.5-nls.patch"
+	"${FILESDIR}/${PN}-0.60.5-solaris.patch"
+	"${FILESDIR}/${PN}-0.60.6-darwin-bundles.patch"
+	"${FILESDIR}/${PN}-0.60.6.1-clang.patch"
+	# includes fix for bug #467602
+	"${FILESDIR}/${PN}-0.60.6.1-unicode.patch"
+)
+
+src_prepare() {
+	default
+
+	rm m4/lt* m4/libtool.m4 || die
+	eautoreconf
+	elibtoolize --reverse-deps
+
+	# Parallel install of libtool libraries doesn't always work.
+	# https://lists.gnu.org/archive/html/libtool/2011-03/msg00003.html
+	# This has to be after automake has run so that we don't clobber
+	# the default target that automake creates for us.
+	echo 'install-filterLTLIBRARIES: install-libLTLIBRARIES' >> Makefile.in || die
+
+	# unicode patch breaks on Darwin, NCURSES_WIDECHAR won't get set
+	# any more.  Fix this.
+	[[ ${CHOST} == *-darwin* ]] && use unicode && \
+		append-cppflags -DNCURSES_WIDECHAR=1
+}
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		$(use_enable unicode) \
+		--disable-static \
+		--sysconfdir="${EPREFIX}"/etc/aspell
+}
+
+src_install() {
+	default
+
+	docinto examples
+	dodoc "${S}"/examples/*.c
+
+	# install ispell/aspell compatibility scripts
+	newbin scripts/ispell ispell-aspell
+	newbin scripts/spell spell-aspell
+
+	# we explicitly pass '--disable-static' to econf,
+	# hence we can delete .la files unconditionally
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/app-text/aspell/files/aspell-0.60.5-nls.patch b/app-text/aspell/files/aspell-0.60.5-nls.patch
new file mode 100644
index 000000000000..3ea7c7c3f4ec
--- /dev/null
+++ b/app-text/aspell/files/aspell-0.60.5-nls.patch
@@ -0,0 +1,13 @@
+Index: aspell-0.60.5/Makefile.am
+===================================================================
+--- aspell-0.60.5/Makefile.am
++++ aspell-0.60.5/Makefile.am
+@@ -129,7 +129,7 @@ word_list_compress_SOURCES = prog/compre
+ 
+ aspell_SOURCES = prog/aspell.cpp prog/check_funs.cpp prog/checker_string.cpp
+ 
+-aspell_LDADD = libaspell.la $(CURSES_LIB)
++aspell_LDADD = libaspell.la $(CURSES_LIB) $(LTLIBINTL)
+ 
+ prezip_bin_SOURCES = prog/prezip.c
+ 
diff --git a/app-text/aspell/files/aspell-0.60.5-solaris.patch b/app-text/aspell/files/aspell-0.60.5-solaris.patch
new file mode 100644
index 000000000000..1cfc5f3e6caa
--- /dev/null
+++ b/app-text/aspell/files/aspell-0.60.5-solaris.patch
@@ -0,0 +1,27 @@
+* grobian@gentoo.org: on Solaris 10 _XOPEN_SOURCE_EXTENDED may not be
+  defined when including wchar.h with g++
+
+--- a/prog/check_funs.cpp
++++ b/prog/check_funs.cpp
+@@ -18,10 +18,6 @@
+ 
+ #include "settings.h"
+ 
+-#ifdef DEFINE_XOPEN_SOURCE_EXTENDED
+-#  define _XOPEN_SOURCE_EXTENDED 1
+-#endif
+-
+ #ifdef CURSES_NON_POSIX
+ #define CURSES_ONLY 1
+ #endif
+@@ -35,6 +31,10 @@
+ 
+ #include "gettext.h"
+ 
++#ifdef DEFINE_XOPEN_SOURCE_EXTENDED
++#  define _XOPEN_SOURCE_EXTENDED 1
++#endif
++
+ using namespace acommon;
+ 
+ StackPtr<CheckerString> state;
diff --git a/app-text/aspell/files/aspell-0.60.6-darwin-bundles.patch b/app-text/aspell/files/aspell-0.60.6-darwin-bundles.patch
new file mode 100644
index 000000000000..84e05833d9d8
--- /dev/null
+++ b/app-text/aspell/files/aspell-0.60.6-darwin-bundles.patch
@@ -0,0 +1,35 @@
+grobian@gentoo.org:
+Darwin: fix for finding bundles (libtool modules, no equivalent in ELF)
+This patch is not really upstreamable, bundles can have any name, but
+Apple suggests using .bundle.  libtool on Gentoo generates .bundle files
+for modules on Darwin, so we need aspell to actually look for .bundle,
+not .so.
+
+--- a/lib/new_filter.cpp
++++ b/lib/new_filter.cpp
+@@ -458,11 +458,23 @@
+       module->file.assign(option_file.str(), slash + 1 - option_file.str());
+       //module->file += "lib";
+       module->file += filter_name;
+-      module->file += "-filter.so";
++      module->file += "-filter."
++#ifdef __APPLE_CC__
++		  "bundle"
++#else
++		  "so"
++#endif
++		  ;
+     } else {
+       if (module->file[0] != '/')
+         module->file.insert(0, option_file.str(), slash + 1 - option_file.str());
+-      module->file += ".so";
++      module->file += "."
++#ifdef __APPLE_CC__
++		  "bundle"
++#else
++		  "so"
++#endif
++		  ;
+     }
+ 
+     return module.release();
diff --git a/app-text/aspell/files/aspell-0.60.6.1-clang.patch b/app-text/aspell/files/aspell-0.60.6.1-clang.patch
new file mode 100644
index 000000000000..8d3e62dcdf0b
--- /dev/null
+++ b/app-text/aspell/files/aspell-0.60.6.1-clang.patch
@@ -0,0 +1,47 @@
+From https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=180565
+--- a/interfaces/cc/aspell.h
++++ b/interfaces/cc/aspell.h
+@@ -237,6 +237,7 @@
+ /******************************** errors ********************************/
+ 
+ 
++#ifndef ASPELL_ERRORS__HPP
+ extern const struct AspellErrorInfo * const aerror_other;
+ extern const struct AspellErrorInfo * const aerror_operation_not_supported;
+ extern const struct AspellErrorInfo * const   aerror_cant_copy;
+@@ -322,6 +323,7 @@
+ extern const struct AspellErrorInfo * const   aerror_bad_magic;
+ extern const struct AspellErrorInfo * const aerror_expression;
+ extern const struct AspellErrorInfo * const   aerror_invalid_expression;
++#endif
+ 
+ 
+ /******************************* speller *******************************/
+--- a/prog/aspell.cpp
++++ b/prog/aspell.cpp
+@@ -25,6 +25,7 @@
+ # include <langinfo.h>
+ #endif
+ 
++#include "errors.hpp"
+ #include "aspell.h"
+ 
+ #ifdef USE_FILE_INO
+@@ -40,7 +41,6 @@
+ #include "convert.hpp"
+ #include "document_checker.hpp"
+ #include "enumeration.hpp"
+-#include "errors.hpp"
+ #include "file_util.hpp"
+ #include "fstream.hpp"
+ #include "info.hpp"
+--- a/prog/checker_string.hpp
++++ b/prog/checker_string.hpp
+@@ -6,6 +6,7 @@
+ 
+ #include <stdio.h>
+ 
++#include "errors.hpp"
+ #include "aspell.h"
+ 
+ #include "vector.hpp"
diff --git a/app-text/aspell/files/aspell-0.60.6.1-unicode.patch b/app-text/aspell/files/aspell-0.60.6.1-unicode.patch
new file mode 100644
index 000000000000..8e1957c727a9
--- /dev/null
+++ b/app-text/aspell/files/aspell-0.60.6.1-unicode.patch
@@ -0,0 +1,276 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -2,7 +2,7 @@
+ AC_CONFIG_SRCDIR(prog/aspell.cpp)
+ AC_CANONICAL_SYSTEM
+ AM_INIT_AUTOMAKE
+-AM_CONFIG_HEADER(gen/settings.h)
++AC_CONFIG_HEADERS([gen/settings.h])
+ 
+ AM_MAINTAINER_MODE
+ 
+@@ -52,14 +52,11 @@
+ AC_ARG_ENABLE(win32-relocatable,
+   [  --enable-win32-relocatable])
+ 
+-AC_ARG_ENABLE(curses,           
+-  AS_HELP_STRING([--enable-curses=LIBFILE],[cursor control library]))
++AC_ARG_ENABLE([curses],
++  AS_HELP_STRING([--enable-curses],[cursor control library]))
+ 
+-AC_ARG_ENABLE(curses-include,           
+-  [  --enable-curses-include=DIR])
+-
+-AC_ARG_ENABLE(wide-curses,
+-  AS_HELP_STRING([--disable-wide-curses],[disable wide char utf8 cursor control]))
++AC_ARG_ENABLE([unicode],
++  AS_HELP_STRING([--enable-unicode],[enable Unicode support]))
+ 
+ AC_ARG_ENABLE(regex,
+   [  --disable-regex])
+@@ -312,197 +309,18 @@
+   [AC_MSG_RESULT(no)]
+ )
+ 
+-AC_SUBST(CURSES_LIB)
+-AC_SUBST(CURSES_INCLUDE)
+-
+-if test "$enable_curses" != "no"
+-then
+-  use_curses=t
+-  case "$enable_curses" in
+-    yes | ""                     )                             ;;
+-    /* | *lib* | *.a | -l* | -L* ) CURSES_LIB="$enable_curses" ;;
+-    *                            ) CURSES_LIB=-l$enable_curses ;;
+-  esac
+-  case "$enable_curses_include" in
+-    yes | no | "")                                         ;;
+-    -I*          ) CURSES_INCLUDE="$enable_curses_include" ;;
+-    *            ) CURSES_INCLUDE=-I$enable_curses_include ;;
+-  esac
+-fi
+-
+-if test "$use_curses"
+-then
+-
+-  ORIG_LIBS="$LIBS"
+-  ORIG_CPPFLAGS="$CPPFLAGS"
+-  CPPFLAGS="$CURSES_INCLUDE $ORIG_CPPFLAGS"
+-
+-  if test -z "$CURSES_LIB"
+-  then
+-
+-    AC_MSG_CHECKING(for working curses library)
+-
+-    if test "$enable_wide_curses" != "no" -a -n "$have_mblen"
+-    then
+-      LIBS="-lncursesw $ORIG_LIBS"
+-      AC_TRY_LINK(
+-        [#include <ncursesw/curses.h>], [initscr()],
+-        [CURSES_LIB=-lncursesw
+-         AC_DEFINE(CURSES_HEADER, <ncursesw/curses.h>, [Defined to curses header file])
+-         AC_DEFINE(TERM_HEADER, <ncursesw/term.h>, [Defined to term header file])])
+-    fi
+-
+-    if test -z "$CURSES_LIB"
+-    then
+-      LIBS="-lncurses $ORIG_LIBS"
+-      AC_TRY_LINK(
+-        [#include <ncurses/curses.h>], [initscr()],
+-        [CURSES_LIB=-lncurses
+-         AC_DEFINE(CURSES_HEADER, <ncurses/curses.h>, [Defined to curses header file])
+-         AC_DEFINE(TERM_HEADER, <ncurses/term.h>, [Defined to term header file])],
+-        [
+-      LIBS="-lncurses $ORIG_LIBS"
+-      AC_TRY_LINK(
+-        [#include <ncurses.h>], [initscr()],
+-        [CURSES_LIB=-lncurses
+-         AC_DEFINE(CURSES_HEADER, <ncurses.h>, [Defined to curses header file])
+-         AC_DEFINE(TERM_HEADER, <term.h>, [Defined to term header file])],
+-        [
+-      LIBS="-lcurses $ORIG_LIBS"
+-      AC_TRY_LINK(
+-        [#include <curses.h>], [initscr()],
+-        [CURSES_LIB=-lcurses
+-         AC_DEFINE(CURSES_HEADER, <curses.h>, [Defined to curses header file])
+-         AC_DEFINE(TERM_HEADER, <term.h>, [Defined to term header file])],
+-        [
+-      LIBS="-lncurses $ORIG_LIBS"
+-      AC_TRY_LINK(
+-        [#include <curses.h>], [initscr()],
+-        [CURSES_LIB=-lncurses
+-         AC_DEFINE(CURSES_HEADER, <curses.h>, [Defined to curses header file])
+-         AC_DEFINE(TERM_HEADER, <term.h>, [Defined to term header file])],
+-      ) ]) ]) ])
+-    fi
+-
+-    if test -n "$CURSES_LIB"
+-    then
+-      AC_MSG_RESULT([found in $CURSES_LIB])
+-    else
+-      AC_MSG_RESULT([not found])
+-    fi
+-
+-  else
+-
+-    AC_DEFINE(CURSES_HEADER, <curses.h>, [Defined to curses header file])
+-    AC_DEFINE(TERM_HEADER, <term.h>, [Defined to term header file])
+-
+-  fi
+-
+-  if test -n "$CURSES_LIB"
+-  then
+-     LIBS="$CURSES_LIB $ORIG_LIBS"
+-
+-     if test "$enable_wide_curses" != "no"
+-     then
+-
+-       AC_MSG_CHECKING(for wide character support in curses libraray)
+-       if test -n "$have_mblen"
+-       then
+-         AC_TRY_LINK(
+-           [#include <wchar.h>
+-            #include CURSES_HEADER
+-           ],
+-           [wchar_t wch = 0;
+-            addnwstr(&wch, 1);],
+-           [AC_MSG_RESULT(yes)
+-            AC_DEFINE(HAVE_WIDE_CURSES, 1, [Defined if curses libraray includes wide character support])],
+-           [
+-
+-         AC_TRY_LINK(
+-           [#define _XOPEN_SOURCE_EXTENDED 1
+-            #include <wchar.h>
+-            #include CURSES_HEADER
+-           ],
+-           [wchar_t wch = 0;
+-            addnwstr(&wch, 1);],
+-           [AC_MSG_RESULT(yes)
+-            AC_DEFINE(HAVE_WIDE_CURSES, 1)
+-            AC_DEFINE(DEFINE_XOPEN_SOURCE_EXTENDED, 1, 
+-                      [Defined if _XOPEN_SOURCE_EXTENDED needs to be defined. 
+-                       (Can't define globally as that will cause problems with some systems)])
+-           ],
+-           [AC_MSG_RESULT(no)
+-            AC_MSG_WARN([Aspell will not be able to Display UTF-8 characters correctly.])])])
+-       else
+-         AC_MSG_RESULT([no, because "mblen" is not supported])
+-         AC_MSG_WARN([Aspell will not be able to Display UTF-8 characters correctly.])
+-       fi
+-
+-     fi
+- 
+-     AC_MSG_CHECKING(if standard curses include sequence will work)
+-     AC_TRY_LINK(
+-       [#ifdef DEFINE_XOPEN_SOURCE_EXTENDED
+-        #  define _XOPEN_SOURCE_EXTENDED 1
+-        #endif
+-        #include <termios.h>
+-	#include <unistd.h>
+-        #include CURSES_HEADER
+-	#include TERM_HEADER
+-       ],
+-       [tigetstr(const_cast<char *>("cup"));],
+-       [AC_MSG_RESULT(yes)
+-	AC_DEFINE(HAVE_LIBCURSES, 1, 
+-                  [Defined if the curses library is available])
+-	posix_termios=t
+-	AC_DEFINE(CURSES_INCLUDE_STANDARD, 1, 
+-                  [Defined if no special Workarounds are needed for Curses headers])],
+-       [AC_MSG_RESULT(no)
+-
+-     dnl else if
+-     AC_MSG_CHECKING(if curses workaround I will work)
+-     AC_TRY_LINK(
+-       [#ifdef DEFINE_XOPEN_SOURCE_EXTENDED
+-        #  define _XOPEN_SOURCE_EXTENDED 1
+-        #endif
+-        #include <termios.h>
+-	#include <unistd.h>
+-        #include CURSES_HEADER
+-	extern "C" {char * tigetstr(char * capname);}],
+-       [tigetstr(const_cast<char *>("cup"));],
+-       [AC_MSG_RESULT(yes)
+-	AC_DEFINE(HAVE_LIBCURSES, 1, [])
+-        posix_termios=t
+-	AC_DEFINE(CURSES_INCLUDE_WORKAROUND_1, 1, 
+-                  [Defined if special Wordaround I is need for Curses headers])],
+-       [AC_MSG_RESULT(no)
+-
+-     dnl else if
+-     AC_MSG_CHECKING(if curses without Unix stuff will work)
+-     AC_TRY_LINK(
+-       [#include CURSES_HEADER
+-       ],
+-       [initscr();],
+-       [AC_MSG_RESULT(yes)
+-	AC_DEFINE(HAVE_LIBCURSES, 1, [])
+-	AC_DEFINE(CURSES_ONLY, 1, 
+-                  [Defined if curses like POSIX Functions should be used])
+-        curses_only=t],
+-       [AC_MSG_RESULT(no)
+-
+-     dnl else
+-     use_curses=false
+-     CURSES_LIBS=""
+-     CURSES_INCLUDE=""
+-
+-     ]) ]) ])
+-
+-  fi
+-
+-  CPPFLAGS="$ORIG_CPPFLAGS"
+-  LIBS="$ORIG_LIBS"
+-
+-fi
++AS_IF([test "x$enable_curses" != "xno"],[
++  AS_IF([test "x$enable_unicode" != "xno"],
++    [AC_DEFINE([HAVE_WIDE_CURSES], [1], [Defined if curses library includes wide character support])
++     ncurses_library="ncursesw"],
++    [ncurses_library="ncurses"])
++
++  PKG_CHECK_MODULES([NCURSES], ["$ncurses_library"])
++
++  AC_DEFINE([HAVE_LIBCURSES], [1], [Defined if the curses library is available])
++  AC_DEFINE([CURSES_INCLUDE_STANDARD], [1], [Defined if no special Workarounds are needed for Curses headers])
++  posix_termios=t
++])
+ 
+ if test -z "$posix_termios" -a -z "$curses_only"
+ then
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -121,7 +121,7 @@
+ # Aspell Program
+ #
+ 
+-AM_CPPFLAGS += -DLOCALEDIR="$(localedir)"
++AM_CPPFLAGS += -DLOCALEDIR="$(localedir)" $(NCURSES_CFLAGS)
+ 
+ bin_PROGRAMS = word-list-compress aspell prezip-bin
+ 
+@@ -129,7 +129,7 @@
+ 
+ aspell_SOURCES = prog/aspell.cpp prog/check_funs.cpp prog/checker_string.cpp
+ 
+-aspell_LDADD = libaspell.la $(CURSES_LIB) $(LTLIBINTL)
++aspell_LDADD = libaspell.la $(NCURSES_LIBS) $(LTLIBINTL)
+ 
+ prezip_bin_SOURCES = prog/prezip.c
+ 
+--- a/prog/check_funs.cpp
++++ b/prog/check_funs.cpp
+@@ -62,11 +62,11 @@
+ 
+ #if HAVE_LIBCURSES
+ 
+-#include CURSES_HEADER
++#include <curses.h>
+ 
+ #if CURSES_INCLUDE_STANDARD
+ 
+-#include TERM_HEADER
++#include <term.h>
+ 
+ #elif CURSES_INCLUDE_WORKAROUND_1
+ 
diff --git a/app-text/aspell/metadata.xml b/app-text/aspell/metadata.xml
new file mode 100644
index 000000000000..097975e3adc2
--- /dev/null
+++ b/app-text/aspell/metadata.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+</pkgmetadata>
diff --git a/app-text/atril-1.12.2-r5 b/app-text/atril-1.12.2-r5
deleted file mode 100644
index 2070d431f9b3..000000000000
--- a/app-text/atril-1.12.2-r5
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=app-text/poppler-0.16[cairo] app-text/rarian:0 dev-libs/atk:0 >=dev-libs/glib-2.36:2 >=dev-libs/libxml2-2.5:2 >=mate-base/mate-desktop-1.9[gtk3(-)=] sys-libs/zlib:0 x11-libs/gdk-pixbuf:2 x11-libs/libICE:0 >=x11-libs/libSM-1:0 x11-libs/libX11:0 >=x11-libs/cairo-1.9.10:0 x11-libs/pango:0 caja? ( >=mate-base/caja-1.8[gtk3(-)=,introspection?] ) djvu? ( >=app-text/djvu-3.5.17:0 ) dvi? ( virtual/tex-base:0 t1lib? ( >=media-libs/t1lib-5:5 ) ) epub? ( dev-libs/mathjax ) gnome-keyring? ( >=app-crypt/libsecret-0.5:0 ) !gtk3? ( >=x11-libs/gtk+-2.24.0:2[introspection?] ) gtk3? ( >=x11-libs/gtk+-3.0:3[introspection?] epub? ( >=net-libs/webkit-gtk-2.4.3:4 ) ) introspection? ( >=dev-libs/gobject-introspection-0.6:= ) postscript? ( >=app-text/libspectre-0.2:0 ) tiff? ( >=media-libs/tiff-3.6:0 ) xps? ( >=app-text/libgxps-0.2.0:0 ) !!app-text/mate-document-viewer app-text/docbook-xml-dtd:4.1.2 app-text/yelp-tools:0 >=app-text/scrollkeeper-dtd-1:1.0 dev-util/gtk-doc dev-util/gtk-doc-am >=dev-util/intltool-0.50.1:* virtual/pkgconfig:* sys-devel/gettext:* >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=mate-base/mate-common-1.12
-DESCRIPTION=Atril document viewer for MATE
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=caja dbus debug djvu dvi epub +introspection gnome-keyring gtk3 +postscript t1lib tiff xps
-KEYWORDS=amd64 ~arm x86
-LICENSE=GPL-2
-RDEPEND=>=app-text/poppler-0.16[cairo] app-text/rarian:0 dev-libs/atk:0 >=dev-libs/glib-2.36:2 >=dev-libs/libxml2-2.5:2 >=mate-base/mate-desktop-1.9[gtk3(-)=] sys-libs/zlib:0 x11-libs/gdk-pixbuf:2 x11-libs/libICE:0 >=x11-libs/libSM-1:0 x11-libs/libX11:0 >=x11-libs/cairo-1.9.10:0 x11-libs/pango:0 caja? ( >=mate-base/caja-1.8[gtk3(-)=,introspection?] ) djvu? ( >=app-text/djvu-3.5.17:0 ) dvi? ( virtual/tex-base:0 t1lib? ( >=media-libs/t1lib-5:5 ) ) epub? ( dev-libs/mathjax ) gnome-keyring? ( >=app-crypt/libsecret-0.5:0 ) !gtk3? ( >=x11-libs/gtk+-2.24.0:2[introspection?] ) gtk3? ( >=x11-libs/gtk+-3.0:3[introspection?] epub? ( >=net-libs/webkit-gtk-2.4.3:4 ) ) introspection? ( >=dev-libs/gobject-introspection-0.6:= ) postscript? ( >=app-text/libspectre-0.2:0 ) tiff? ( >=media-libs/tiff-3.6:0 ) xps? ( >=app-text/libgxps-0.2.0:0 ) !!app-text/mate-document-viewer
-REQUIRED_USE=t1lib? ( dvi ) !gtk3? ( !epub )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.12/atril-1.12.2.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	mate	58aa134cca4a230873e4bde7fd57233c	mate-desktop.org	e10a19aa1a06b2fe47e07bf61d17f9ce	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=00c47a2d4925c1a2e47bbfc28872cad5
diff --git a/app-text/atril-1.14.2-r2 b/app-text/atril-1.14.2-r2
deleted file mode 100644
index 906a14c2adfe..000000000000
--- a/app-text/atril-1.14.2-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=app-text/poppler-0.16[cairo] dev-libs/atk:0 >=dev-libs/glib-2.36:2 >=dev-libs/libxml2-2.5:2 >=mate-base/mate-desktop-1.9[gtk3(-)=] sys-libs/zlib:0 x11-libs/gdk-pixbuf:2 x11-libs/libICE:0 >=x11-libs/libSM-1:0 x11-libs/libX11:0 >=x11-libs/cairo-1.9.10:0 x11-libs/pango:0 caja? ( >=mate-base/caja-1.8[gtk3(-)=,introspection?] ) djvu? ( >=app-text/djvu-3.5.17:0 ) dvi? ( virtual/tex-base:0 t1lib? ( >=media-libs/t1lib-5:5 ) ) epub? ( dev-libs/mathjax ) gnome-keyring? ( >=app-crypt/libsecret-0.5:0 ) !gtk3? ( >=x11-libs/gtk+-2.24.0:2[introspection?] ) gtk3? ( >=x11-libs/gtk+-3.0:3[introspection?] epub? ( >=net-libs/webkit-gtk-2.4.3:4 ) ) introspection? ( >=dev-libs/gobject-introspection-0.6:= ) postscript? ( >=app-text/libspectre-0.2:0 ) tiff? ( >=media-libs/tiff-3.6:0 ) xps? ( >=app-text/libgxps-0.2.0:0 ) !!app-text/mate-document-viewer app-text/docbook-xml-dtd:4.1.2 app-text/rarian:0 app-text/yelp-tools:0 >=app-text/scrollkeeper-dtd-1:1.0 dev-util/gtk-doc dev-util/gtk-doc-am >=dev-util/intltool-0.50.1:* virtual/pkgconfig:* sys-devel/gettext:* >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=mate-base/mate-common-1.14
-DESCRIPTION=Atril document viewer for MATE
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=caja dbus debug djvu dvi epub +introspection gnome-keyring gtk3 +postscript t1lib tiff xps
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=>=app-text/poppler-0.16[cairo] dev-libs/atk:0 >=dev-libs/glib-2.36:2 >=dev-libs/libxml2-2.5:2 >=mate-base/mate-desktop-1.9[gtk3(-)=] sys-libs/zlib:0 x11-libs/gdk-pixbuf:2 x11-libs/libICE:0 >=x11-libs/libSM-1:0 x11-libs/libX11:0 >=x11-libs/cairo-1.9.10:0 x11-libs/pango:0 caja? ( >=mate-base/caja-1.8[gtk3(-)=,introspection?] ) djvu? ( >=app-text/djvu-3.5.17:0 ) dvi? ( virtual/tex-base:0 t1lib? ( >=media-libs/t1lib-5:5 ) ) epub? ( dev-libs/mathjax ) gnome-keyring? ( >=app-crypt/libsecret-0.5:0 ) !gtk3? ( >=x11-libs/gtk+-2.24.0:2[introspection?] ) gtk3? ( >=x11-libs/gtk+-3.0:3[introspection?] epub? ( >=net-libs/webkit-gtk-2.4.3:4 ) ) introspection? ( >=dev-libs/gobject-introspection-0.6:= ) postscript? ( >=app-text/libspectre-0.2:0 ) tiff? ( >=media-libs/tiff-3.6:0 ) xps? ( >=app-text/libgxps-0.2.0:0 ) !!app-text/mate-document-viewer
-REQUIRED_USE=t1lib? ( dvi ) !gtk3? ( !epub )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.14/atril-1.14.2.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	mate	58aa134cca4a230873e4bde7fd57233c	mate-desktop.org	e10a19aa1a06b2fe47e07bf61d17f9ce	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4494a3c6930c58b79c8d096a0278d9c5
diff --git a/app-text/atril-1.16.1-r2 b/app-text/atril-1.16.1-r2
deleted file mode 100644
index 88ba5a32488d..000000000000
--- a/app-text/atril-1.16.1-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=app-text/poppler-0.22[cairo] dev-libs/atk:0 >=dev-libs/glib-2.36:2 >=dev-libs/libxml2-2.5:2 sys-libs/zlib:0 x11-libs/gdk-pixbuf:2 x11-libs/libICE:0 >=x11-libs/libSM-1:0 x11-libs/libX11:0 >=x11-libs/cairo-1.9.10:0 x11-libs/pango:0 caja? ( >=mate-base/caja-1.8[gtk3(-)=,introspection?] ) djvu? ( >=app-text/djvu-3.5.17:0 ) dvi? ( virtual/tex-base:0 t1lib? ( >=media-libs/t1lib-5:5 ) ) epub? ( dev-libs/mathjax ) gnome-keyring? ( >=app-crypt/libsecret-0.5:0 ) !gtk3? ( >=x11-libs/gtk+-2.24.0:2[introspection?] ) gtk3? ( >=x11-libs/gtk+-3.0:3[introspection?] epub? ( >=net-libs/webkit-gtk-2.4.3:4 ) ) introspection? ( >=dev-libs/gobject-introspection-0.6:= ) postscript? ( >=app-text/libspectre-0.2:0 ) tiff? ( >=media-libs/tiff-3.6:0 ) xps? ( >=app-text/libgxps-0.2.1:0 ) !!app-text/mate-document-viewer app-text/docbook-xml-dtd:4.1.2 app-text/rarian:0 app-text/yelp-tools:0 >=app-text/scrollkeeper-dtd-1:1.0 dev-util/gtk-doc dev-util/gtk-doc-am >=dev-util/intltool-0.50.1:* virtual/pkgconfig:* sys-devel/gettext:* >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=mate-base/mate-common-1.16
-DESCRIPTION=Atril document viewer for MATE
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=caja dbus debug djvu dvi epub +introspection gnome-keyring gtk3 +postscript t1lib tiff xps
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=>=app-text/poppler-0.22[cairo] dev-libs/atk:0 >=dev-libs/glib-2.36:2 >=dev-libs/libxml2-2.5:2 sys-libs/zlib:0 x11-libs/gdk-pixbuf:2 x11-libs/libICE:0 >=x11-libs/libSM-1:0 x11-libs/libX11:0 >=x11-libs/cairo-1.9.10:0 x11-libs/pango:0 caja? ( >=mate-base/caja-1.8[gtk3(-)=,introspection?] ) djvu? ( >=app-text/djvu-3.5.17:0 ) dvi? ( virtual/tex-base:0 t1lib? ( >=media-libs/t1lib-5:5 ) ) epub? ( dev-libs/mathjax ) gnome-keyring? ( >=app-crypt/libsecret-0.5:0 ) !gtk3? ( >=x11-libs/gtk+-2.24.0:2[introspection?] ) gtk3? ( >=x11-libs/gtk+-3.0:3[introspection?] epub? ( >=net-libs/webkit-gtk-2.4.3:4 ) ) introspection? ( >=dev-libs/gobject-introspection-0.6:= ) postscript? ( >=app-text/libspectre-0.2:0 ) tiff? ( >=media-libs/tiff-3.6:0 ) xps? ( >=app-text/libgxps-0.2.1:0 ) !!app-text/mate-document-viewer
-REQUIRED_USE=t1lib? ( dvi ) !gtk3? ( !epub )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.16/atril-1.16.1.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	mate	58aa134cca4a230873e4bde7fd57233c	mate-desktop.org	e10a19aa1a06b2fe47e07bf61d17f9ce	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e768349b174c57663f9015e8fea9dc75
diff --git a/app-text/atril-1.18.3 b/app-text/atril-1.18.3
deleted file mode 100644
index c9c01f68887b..000000000000
--- a/app-text/atril-1.18.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=app-text/poppler-0.22[cairo] dev-libs/atk:0 >=dev-libs/glib-2.36:2 >=dev-libs/libxml2-2.5:2 sys-libs/zlib:0 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.14:3[introspection?] x11-libs/libICE:0 >=x11-libs/libSM-1:0 x11-libs/libX11:0 >=x11-libs/cairo-1.9.10:0 x11-libs/pango:0 caja? ( >=mate-base/caja-1.17.1[introspection?] ) djvu? ( >=app-text/djvu-3.5.17:0 ) dvi? ( virtual/tex-base:0 t1lib? ( >=media-libs/t1lib-5:5 ) ) epub? ( dev-libs/mathjax >=net-libs/webkit-gtk-2.4.3:4 ) gnome-keyring? ( >=app-crypt/libsecret-0.5:0 ) introspection? ( >=dev-libs/gobject-introspection-0.6:= ) postscript? ( >=app-text/libspectre-0.2:0 ) tiff? ( >=media-libs/tiff-3.6:0 ) xps? ( >=app-text/libgxps-0.2.1:0 ) !!app-text/mate-document-viewer app-text/docbook-xml-dtd:4.1.2 app-text/rarian:0 app-text/yelp-tools:0 >=app-text/scrollkeeper-dtd-1:1.0 dev-util/gtk-doc dev-util/gtk-doc-am >=dev-util/intltool-0.50.1:* virtual/pkgconfig:* sys-devel/gettext:* >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=mate-base/mate-common-1.18
-DESCRIPTION=Atril document viewer for MATE
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=caja dbus debug djvu dvi epub +introspection gnome-keyring +postscript t1lib tiff xps
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=app-text/poppler-0.22[cairo] dev-libs/atk:0 >=dev-libs/glib-2.36:2 >=dev-libs/libxml2-2.5:2 sys-libs/zlib:0 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.14:3[introspection?] x11-libs/libICE:0 >=x11-libs/libSM-1:0 x11-libs/libX11:0 >=x11-libs/cairo-1.9.10:0 x11-libs/pango:0 caja? ( >=mate-base/caja-1.17.1[introspection?] ) djvu? ( >=app-text/djvu-3.5.17:0 ) dvi? ( virtual/tex-base:0 t1lib? ( >=media-libs/t1lib-5:5 ) ) epub? ( dev-libs/mathjax >=net-libs/webkit-gtk-2.4.3:4 ) gnome-keyring? ( >=app-crypt/libsecret-0.5:0 ) introspection? ( >=dev-libs/gobject-introspection-0.6:= ) postscript? ( >=app-text/libspectre-0.2:0 ) tiff? ( >=media-libs/tiff-3.6:0 ) xps? ( >=app-text/libgxps-0.2.1:0 ) !!app-text/mate-document-viewer
-REQUIRED_USE=t1lib? ( dvi )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.18/atril-1.18.3.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	mate	58aa134cca4a230873e4bde7fd57233c	mate-desktop.org	e10a19aa1a06b2fe47e07bf61d17f9ce	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=bf2cab5d99c8a427e96e3dbacf9469f2
diff --git a/app-text/atril/Manifest b/app-text/atril/Manifest
new file mode 100644
index 000000000000..7a8f585db2dd
--- /dev/null
+++ b/app-text/atril/Manifest
@@ -0,0 +1,10 @@
+AUX atril-cve-2017-1000083.patch 902 BLAKE2B d2840c3cd00f7961262c9b9256a594be77b598cd44fd27064336721f422f5ab315382d9917981a6a5b33b08d100fd32edb19cb54bea1f70f074064dd72af036e SHA512 b34d4cd356b6b0466e77bd837ea03aa5ff9d922f61b0f317fcd02b6d0b0c3efd87fa07ec442a9ee5d71f767751e4ebaa8bbcf6c1a3b0b5905a7610872fbb7d06
+DIST atril-1.12.2.tar.xz 1663920 BLAKE2B 7fa615a3d19fe33b086676d2326d690b5d6c694679a7e934ecf8922ad73aa83eb2ffb6c16aaf776e1d3798c3fa93fa844f52382b9eb9aa813cc6686395a4114e SHA512 2ceeda42adeb284a25caff3a69d15a231129988fb410e4d502a281ccf5819307b9963722a2e330307a1c3b15d3c82405b708d983ed1c266e091a35264766e6ec
+DIST atril-1.14.2.tar.xz 1703272 BLAKE2B e02fee02ad8644be9ea2c388f24c9f9e3480a68ae86bba41939e4fa195626189f9e6d93b97ea4b9d4a256f72ffc3d604f69fe4222c00a385f9d4ad9ac3a8e337 SHA512 9f77abe43848a3a35df1484edef4a6bbc6339f82b0d8e9f3c149c44fd632f2720acf24bcc1354b944c5c364fc4ce1d70b733c1ec5bc40b1a17041e59acf7bd9b
+DIST atril-1.16.1.tar.xz 1691456 BLAKE2B 5fccac614c64e7241ce0369842e97379c98df00f12d61524291afea22eebf18777ec2550592d734ff38aa64b92cbfa6350d11823a043337c6a7ee4b52757989f SHA512 69128171f13f50079b0b40bfada868967c289b5970e3cda3454f10e7cf723000ab29290c7c9ada67648c370472fd51eeb0a8dbbfa0af05babfc85cb28e3570fe
+DIST atril-1.18.3.tar.xz 1695960 BLAKE2B 2479ddd46104153631d34070054e9ba72956468c7b720aa5dc3c4a458a00cc00484cdfefb01981f2e8beeb7a13f1fc3db940dcc9a728863a1378b5b896e71e57 SHA512 d57cf4386651cb871455b003482e896a2735fb023e0b11f192ed1d169e364306f9ba55ef163df02ffd236b5f86d6afe2c1068d00d3fbc309807ded729ce2355a
+EBUILD atril-1.12.2-r5.ebuild 2382 BLAKE2B ec25ced8e7a2cd8a016a610f25934f6a7d3d51331837b9080698290a2a5d1efcc121c5bc4b5c250e497e6c445801ad83b8acfdadf05b0446bc46745a7682c9da SHA512 c5ba364d84fc7eaca092b67abeba1ba7b1fba69c2eba9b25c222d2bd90eb340e45013186ff7d1049fc80d0b073ed17cc7a28a019112cbdb82b5eaade6f2281eb
+EBUILD atril-1.14.2-r2.ebuild 2424 BLAKE2B 08574d5d036b9d82b488eb2eb22b51c45589966b66a1ea098ddbe6549f9aff4502b54e9fa16ed286409ba36a7d06a7db5c5bdce3a6cafb2f309e59dd1cd1eda5 SHA512 08a36e6834962d26061983ec642e1ef6b2ed5ef6b2acf581d760cd3bc7d4ef1b77e6b04242c030bf5c0431b48abaad0ae252f41996d1bbe6c418354bbdf545bd
+EBUILD atril-1.16.1-r2.ebuild 2361 BLAKE2B 976f440938df2ccbc05556b1ff48113467c6e37cd9ffe807b5c57d63bf9fe89de764862516856a08b040667fdbb1239961bea0cc343644e283919846e915d171 SHA512 b12c4cd1992f30ce6a33df8e0bb063afa3ebdc292ff9226fa63adae17642beb1a7f7ce1437238c745c0faab79d0b761d29251df4a022c68854d39962c321df0c
+EBUILD atril-1.18.3.ebuild 2166 BLAKE2B 317b5a70b879cef4660947239602677c1667140775381b94e16b76074cd675cd29e7f4af3ecd3521083f3d3163fd18dddac3863275b1252e8983d5d82ba29e27 SHA512 6c49d6f01717382a81807ad5b2bbb5c56a0b162492166c3a781051efaeb6ee1205fa448daaddc6ac71744d65c95d25e143ee972c177883c3fef39fdfa54dcee9
+MISC metadata.xml 843 BLAKE2B 85c02a872255c9b51727285c86f1f5df7c8b841576557ba7bbc240cc3e549ddf1f681e1c9f416785650d7d9e3168e4db06ca52ce61e50a47fe6660a73e97dc92 SHA512 9248d2446621337488268f0c7f839821383bba8d170620376cb95b96868448fc3bc411e336104f59db0d8bb5d304dc1c0b76ef818686b930c93a04764e9f4fdc
diff --git a/app-text/atril/atril-1.12.2-r5.ebuild b/app-text/atril/atril-1.12.2-r5.ebuild
new file mode 100644
index 000000000000..582095d7761e
--- /dev/null
+++ b/app-text/atril/atril-1.12.2-r5.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MATE_LA_PUNT="yes"
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="amd64 ~arm x86"
+fi
+
+DESCRIPTION="Atril document viewer for MATE"
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="caja dbus debug djvu dvi epub +introspection gnome-keyring gtk3 +postscript t1lib tiff xps"
+
+REQUIRED_USE="t1lib? ( dvi )
+	!gtk3? ( !epub )" #608604
+
+RDEPEND=">=app-text/poppler-0.16[cairo]
+	app-text/rarian:0
+	dev-libs/atk:0
+	>=dev-libs/glib-2.36:2
+	>=dev-libs/libxml2-2.5:2
+	>=mate-base/mate-desktop-1.9[gtk3(-)=]
+	sys-libs/zlib:0
+	x11-libs/gdk-pixbuf:2
+	x11-libs/libICE:0
+	>=x11-libs/libSM-1:0
+	x11-libs/libX11:0
+	>=x11-libs/cairo-1.9.10:0
+	x11-libs/pango:0
+	caja? ( >=mate-base/caja-1.8[gtk3(-)=,introspection?] )
+	djvu? ( >=app-text/djvu-3.5.17:0 )
+	dvi? (
+		virtual/tex-base:0
+		t1lib? ( >=media-libs/t1lib-5:5 )
+	)
+	epub? ( dev-libs/mathjax )
+	gnome-keyring? ( >=app-crypt/libsecret-0.5:0 )
+	!gtk3? (
+		>=x11-libs/gtk+-2.24.0:2[introspection?]
+	)
+	gtk3? (
+		>=x11-libs/gtk+-3.0:3[introspection?]
+		epub? ( >=net-libs/webkit-gtk-2.4.3:4 )
+	)
+	introspection? ( >=dev-libs/gobject-introspection-0.6:= )
+	postscript? ( >=app-text/libspectre-0.2:0 )
+	tiff? ( >=media-libs/tiff-3.6:0 )
+	xps? ( >=app-text/libgxps-0.2.0:0 )
+	!!app-text/mate-document-viewer"
+
+DEPEND="${RDEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/yelp-tools:0
+	>=app-text/scrollkeeper-dtd-1:1.0
+	dev-util/gtk-doc
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.50.1:*
+	virtual/pkgconfig:*
+	sys-devel/gettext:*"
+
+# Tests use dogtail which is not available on Gentoo.
+RESTRICT="test"
+
+FILES=( "${FILESDIR}/${PN}-cve-2017-1000083.patch" )
+
+src_configure() {
+	# Passing --disable-help would drop offline help, that would be inconsistent
+	# with helps of the most of GNOME apps that doesn't require network for that.
+	mate_src_configure \
+		--disable-tests \
+		--enable-comics \
+		--enable-pdf \
+		--enable-pixbuf \
+		--enable-previewer \
+		--enable-thumbnailer \
+		--with-matedesktop \
+		--with-gtk=$(usex gtk3 3.0 2.0) \
+		$(use_with gnome-keyring keyring) \
+		$(use_enable caja) \
+		$(use_enable dbus) \
+		$(use_enable debug) \
+		$(use_enable djvu) \
+		$(use_enable dvi) \
+		$(use_enable epub) \
+		$(use_enable introspection) \
+		$(use_enable postscript ps) \
+		$(use_enable t1lib) \
+		$(use_enable tiff) \
+		$(use_enable xps)
+}
diff --git a/app-text/atril/atril-1.14.2-r2.ebuild b/app-text/atril/atril-1.14.2-r2.ebuild
new file mode 100644
index 000000000000..d3ef2efb7e21
--- /dev/null
+++ b/app-text/atril/atril-1.14.2-r2.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MATE_LA_PUNT="yes"
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+DESCRIPTION="Atril document viewer for MATE"
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="caja dbus debug djvu dvi epub +introspection gnome-keyring gtk3 +postscript t1lib tiff xps"
+
+REQUIRED_USE="t1lib? ( dvi )
+	!gtk3? ( !epub )" #608604
+
+COMMON_DEPEND=">=app-text/poppler-0.16[cairo]
+	dev-libs/atk:0
+	>=dev-libs/glib-2.36:2
+	>=dev-libs/libxml2-2.5:2
+	>=mate-base/mate-desktop-1.9[gtk3(-)=]
+	sys-libs/zlib:0
+	x11-libs/gdk-pixbuf:2
+	x11-libs/libICE:0
+	>=x11-libs/libSM-1:0
+	x11-libs/libX11:0
+	>=x11-libs/cairo-1.9.10:0
+	x11-libs/pango:0
+	caja? ( >=mate-base/caja-1.8[gtk3(-)=,introspection?] )
+	djvu? ( >=app-text/djvu-3.5.17:0 )
+	dvi? (
+		virtual/tex-base:0
+		t1lib? ( >=media-libs/t1lib-5:5 )
+	)
+	epub? ( dev-libs/mathjax )
+	gnome-keyring? ( >=app-crypt/libsecret-0.5:0 )
+	!gtk3? (
+		>=x11-libs/gtk+-2.24.0:2[introspection?]
+	)
+	gtk3? (
+		>=x11-libs/gtk+-3.0:3[introspection?]
+		epub? ( >=net-libs/webkit-gtk-2.4.3:4 )
+	)
+	introspection? ( >=dev-libs/gobject-introspection-0.6:= )
+	postscript? ( >=app-text/libspectre-0.2:0 )
+	tiff? ( >=media-libs/tiff-3.6:0 )
+	xps? ( >=app-text/libgxps-0.2.0:0 )
+	!!app-text/mate-document-viewer"
+
+RDEPEND="${COMMON_DEPEND}"
+
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/rarian:0
+	app-text/yelp-tools:0
+	>=app-text/scrollkeeper-dtd-1:1.0
+	dev-util/gtk-doc
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.50.1:*
+	virtual/pkgconfig:*
+	sys-devel/gettext:*"
+
+# Tests use dogtail which is not available on Gentoo.
+RESTRICT="test"
+
+FILES=( "${FILESDIR}/${PN}-cve-2017-1000083.patch" )
+
+src_configure() {
+	# Passing --disable-help would drop offline help, that would be inconsistent
+	# with helps of the most of GNOME apps that doesn't require network for that.
+	mate_src_configure \
+		--disable-tests \
+		--enable-comics \
+		--enable-pdf \
+		--enable-pixbuf \
+		--enable-previewer \
+		--enable-thumbnailer \
+		--with-matedesktop \
+		--with-gtk=$(usex gtk3 3.0 2.0) \
+		$(use_with gnome-keyring keyring) \
+		$(use_enable caja) \
+		$(use_enable dbus) \
+		$(use_enable debug) \
+		$(use_enable djvu) \
+		$(use_enable dvi) \
+		$(use_enable epub) \
+		$(use_enable introspection) \
+		$(use_enable postscript ps) \
+		$(use_enable t1lib) \
+		$(use_enable tiff) \
+		$(use_enable xps)
+}
diff --git a/app-text/atril/atril-1.16.1-r2.ebuild b/app-text/atril/atril-1.16.1-r2.ebuild
new file mode 100644
index 000000000000..41128c94216b
--- /dev/null
+++ b/app-text/atril/atril-1.16.1-r2.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MATE_LA_PUNT="yes"
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+DESCRIPTION="Atril document viewer for MATE"
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="caja dbus debug djvu dvi epub +introspection gnome-keyring gtk3 +postscript t1lib tiff xps"
+
+REQUIRED_USE="t1lib? ( dvi )
+	!gtk3? ( !epub )" #608604
+
+COMMON_DEPEND=">=app-text/poppler-0.22[cairo]
+	dev-libs/atk:0
+	>=dev-libs/glib-2.36:2
+	>=dev-libs/libxml2-2.5:2
+	sys-libs/zlib:0
+	x11-libs/gdk-pixbuf:2
+	x11-libs/libICE:0
+	>=x11-libs/libSM-1:0
+	x11-libs/libX11:0
+	>=x11-libs/cairo-1.9.10:0
+	x11-libs/pango:0
+	caja? ( >=mate-base/caja-1.8[gtk3(-)=,introspection?] )
+	djvu? ( >=app-text/djvu-3.5.17:0 )
+	dvi? (
+		virtual/tex-base:0
+		t1lib? ( >=media-libs/t1lib-5:5 )
+	)
+	epub? ( dev-libs/mathjax )
+	gnome-keyring? ( >=app-crypt/libsecret-0.5:0 )
+	!gtk3? (
+		>=x11-libs/gtk+-2.24.0:2[introspection?]
+	)
+	gtk3? (
+		>=x11-libs/gtk+-3.0:3[introspection?]
+		epub? ( >=net-libs/webkit-gtk-2.4.3:4 )
+	)
+	introspection? ( >=dev-libs/gobject-introspection-0.6:= )
+	postscript? ( >=app-text/libspectre-0.2:0 )
+	tiff? ( >=media-libs/tiff-3.6:0 )
+	xps? ( >=app-text/libgxps-0.2.1:0 )
+	!!app-text/mate-document-viewer"
+
+RDEPEND="${COMMON_DEPEND}"
+
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/rarian:0
+	app-text/yelp-tools:0
+	>=app-text/scrollkeeper-dtd-1:1.0
+	dev-util/gtk-doc
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.50.1:*
+	virtual/pkgconfig:*
+	sys-devel/gettext:*"
+
+# Tests use dogtail which is not available on Gentoo.
+RESTRICT="test"
+
+FILES=( "${FILESDIR}/${PN}-cve-2017-1000083.patch" )
+
+src_configure() {
+	# Passing --disable-help would drop offline help, that would be inconsistent
+	# with helps of the most of GNOME apps that doesn't require network for that.
+	mate_src_configure \
+		--disable-tests \
+		--enable-comics \
+		--enable-pdf \
+		--enable-pixbuf \
+		--enable-previewer \
+		--enable-thumbnailer \
+		--with-gtk=$(usex gtk3 3.0 2.0) \
+		$(use_with gnome-keyring keyring) \
+		$(use_enable caja) \
+		$(use_enable dbus) \
+		$(use_enable debug) \
+		$(use_enable djvu) \
+		$(use_enable dvi) \
+		$(use_enable epub) \
+		$(use_enable introspection) \
+		$(use_enable postscript ps) \
+		$(use_enable t1lib) \
+		$(use_enable tiff) \
+		$(use_enable xps)
+}
diff --git a/app-text/atril/atril-1.18.3.ebuild b/app-text/atril/atril-1.18.3.ebuild
new file mode 100644
index 000000000000..e4db37226f49
--- /dev/null
+++ b/app-text/atril/atril-1.18.3.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MATE_LA_PUNT="yes"
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+DESCRIPTION="Atril document viewer for MATE"
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="caja dbus debug djvu dvi epub +introspection gnome-keyring +postscript t1lib tiff xps"
+
+REQUIRED_USE="t1lib? ( dvi )"
+
+COMMON_DEPEND=">=app-text/poppler-0.22[cairo]
+	dev-libs/atk:0
+	>=dev-libs/glib-2.36:2
+	>=dev-libs/libxml2-2.5:2
+	sys-libs/zlib:0
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.14:3[introspection?]
+	x11-libs/libICE:0
+	>=x11-libs/libSM-1:0
+	x11-libs/libX11:0
+	>=x11-libs/cairo-1.9.10:0
+	x11-libs/pango:0
+	caja? ( >=mate-base/caja-1.17.1[introspection?] )
+	djvu? ( >=app-text/djvu-3.5.17:0 )
+	dvi? (
+		virtual/tex-base:0
+		t1lib? ( >=media-libs/t1lib-5:5 )
+	)
+	epub? (
+		dev-libs/mathjax
+		>=net-libs/webkit-gtk-2.4.3:4
+	)
+	gnome-keyring? ( >=app-crypt/libsecret-0.5:0 )
+	introspection? ( >=dev-libs/gobject-introspection-0.6:= )
+	postscript? ( >=app-text/libspectre-0.2:0 )
+	tiff? ( >=media-libs/tiff-3.6:0 )
+	xps? ( >=app-text/libgxps-0.2.1:0 )
+	!!app-text/mate-document-viewer"
+
+RDEPEND="${COMMON_DEPEND}"
+
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/rarian:0
+	app-text/yelp-tools:0
+	>=app-text/scrollkeeper-dtd-1:1.0
+	dev-util/gtk-doc
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.50.1:*
+	virtual/pkgconfig:*
+	sys-devel/gettext:*"
+
+# Tests use dogtail which is not available on Gentoo.
+RESTRICT="test"
+
+src_configure() {
+	# Passing --disable-help would drop offline help, that would be inconsistent
+	# with helps of the most of GNOME apps that doesn't require network for that.
+	mate_src_configure \
+		--disable-tests \
+		--enable-comics \
+		--enable-pdf \
+		--enable-pixbuf \
+		--enable-previewer \
+		--enable-thumbnailer \
+		$(use_with gnome-keyring keyring) \
+		$(use_enable caja) \
+		$(use_enable dbus) \
+		$(use_enable debug) \
+		$(use_enable djvu) \
+		$(use_enable dvi) \
+		$(use_enable epub) \
+		$(use_enable introspection) \
+		$(use_enable postscript ps) \
+		$(use_enable t1lib) \
+		$(use_enable tiff) \
+		$(use_enable xps)
+}
diff --git a/app-text/atril/files/atril-cve-2017-1000083.patch b/app-text/atril/files/atril-cve-2017-1000083.patch
new file mode 100644
index 000000000000..29c81f7e5424
--- /dev/null
+++ b/app-text/atril/files/atril-cve-2017-1000083.patch
@@ -0,0 +1,28 @@
+From f4291fd62f7dfe6460d2406a979ccfac0c68dd59 Mon Sep 17 00:00:00 2001
+From: ZenWalker <scow@riseup.net>
+Date: Wed, 19 Jul 2017 11:00:09 +0200
+Subject: [PATCH] comics: make the files containing "--checkpoint-action="
+ unsupported
+
+Fixes #257
+---
+ backend/comics/comics-document.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/backend/comics/comics-document.c b/backend/comics/comics-document.c
+index 9f945c6..4d4d293 100644
+--- a/backend/comics/comics-document.c
++++ b/backend/comics/comics-document.c
+@@ -983,6 +983,12 @@ extract_argv (EvDocument *document, gint page)
+ 	char *command_line, *quoted_archive, *quoted_filename;
+ 	GError *err = NULL;
+ 
++	if (g_strrstr (comics_document->page_names->pdata[page], "--checkpoint-action="))
++	{
++		g_warning ("File unsupported\n");
++		gtk_main_quit ();
++	}
++
+         if (page >= comics_document->page_names->len)
+                 return NULL;
+ 
diff --git a/app-text/atril/metadata.xml b/app-text/atril/metadata.xml
new file mode 100644
index 000000000000..8c1303cd8bc9
--- /dev/null
+++ b/app-text/atril/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>mate@gentoo.org</email>
+		<name>Gentoo MATE Desktop</name>
+	</maintainer>
+	<use>
+		<flag name="caja">Enable property page extension in 
+			<pkg>mate-base/caja</pkg></flag>
+		<flag name="dvi">Enable build-in DVI viewer</flag>
+		<flag name="epub">Enable build-in DVI viewer using
+			<pkg>net-libs/webkit-gtk</pkg></flag>
+		<flag name="gtk3">Build with GTK+3 instead of GTK+2</flag>
+		<flag name="t1lib">Enable the Type-1 fonts for the build-in DVI viewer
+			(<pkg>media-libs/t1lib</pkg>)</flag>
+		<flag name="xps">Enable XPS viewer using 
+			<pkg>app-text/libgxps</pkg></flag>
+	</use>
+	<upstream>
+		<remote-id type="github">mate-desktop/atril</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/bact-0.13-r1 b/app-text/bact-0.13-r1
deleted file mode 100644
index 5e8b4b2f7123..000000000000
--- a/app-text/bact-0.13-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install test
-DESCRIPTION=Boosting Algorithm for Classification of Trees
-EAPI=6
-HOMEPAGE=http://chasen.org/~taku/software/bact/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://chasen.org/~taku/software/bact/bact-0.13.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=01607b957dca6a3f5f6ce0396f69c04e
diff --git a/app-text/bact/Manifest b/app-text/bact/Manifest
new file mode 100644
index 000000000000..82640310457d
--- /dev/null
+++ b/app-text/bact/Manifest
@@ -0,0 +1,4 @@
+AUX bact-0.13-cpp14.patch 1686 BLAKE2B 7e5778ea93bab4841658c3004ecae139fb10324b3ac612c61522eeae748bb2e2c6488670d9a718c6c1bd09d99d83afa306225ad9a403fdd88182fb1bdab3bf68 SHA512 c61d19a2aab85f8597ea40548ef4e2984aa20b44a7ef1c7d5b45d10ef38956cd614844ed5bee0e770a7cfe7f9c8778e491e0ead2585653a57676b4b33dad9204
+DIST bact-0.13.tar.gz 230681 BLAKE2B a12ebfb52db0baa83d95a6d32b18324ea1c1b795fe92e6fd0409e54ed9f82e8a9e4497ffa1e97e9844edbcefb78ae1ad8d7a77c8c7e69688f18991e4f74391db SHA512 ba531c41d93e60699d9a06bd1d1df71f6fb1559c1cccd86756a88bcf72279065d3c565cbb1664444cb74fa25a3472d77682419fe9efa8881d73b23f0bcddb9f8
+EBUILD bact-0.13-r1.ebuild 674 BLAKE2B bd1c74b187a60055ecec93ee624e6dac4170225420c8f651d56b00d25db34eb74e5390f7d766277a166d458cc0590fcb4690e3f2e0d1e5661cc09c0ac3d69a68 SHA512 b1601d1110fdd875cc2236c3ca2b19dc74e60d2da66307c84f8537115fb33d608a1b01a28dd124a5a14cd2805902dc99d11b11463bea09ec5c1a5bbce0cd0085
+MISC metadata.xml 490 BLAKE2B 05ec5b2e6e36ce38ecf95b8de0bbfe657db17da01e930b0d7b65e0dd672752a28a9670388277ed51bb2a21590c49f4e8364db305e171842ce775eafd1cfc0c29 SHA512 0772c6cc2a90788091a69e6b3ca315e5b74e3ee93b7f5f857ce30c588bde689464ca87629ef5c4c8911920eb18e2dcb9eda3d915e6d9a52aacb3f039760fc31a
diff --git a/app-text/bact/bact-0.13-r1.ebuild b/app-text/bact/bact-0.13-r1.ebuild
new file mode 100644
index 000000000000..aaf872d9bd2b
--- /dev/null
+++ b/app-text/bact/bact-0.13-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="Boosting Algorithm for Classification of Trees"
+HOMEPAGE="http://chasen.org/~taku/software/bact/"
+SRC_URI="http://chasen.org/~taku/software/bact/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
+
+HTML_DOCS=( index.html bact.css )
+PATCHES=( "${FILESDIR}/${P}-cpp14.patch" )
+
+src_compile() {
+	emake CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}"
+}
+
+src_test() {
+	emake test
+}
+
+src_install() {
+	dobin bact_learn bact_mkmodel bact_classify
+	einstalldocs
+}
diff --git a/app-text/bact/files/bact-0.13-cpp14.patch b/app-text/bact/files/bact-0.13-cpp14.patch
new file mode 100644
index 000000000000..fa083c223b12
--- /dev/null
+++ b/app-text/bact/files/bact-0.13-cpp14.patch
@@ -0,0 +1,44 @@
+Fix C++14 compilation errors -- since C++11 make_pair<T1,T2> is resolved to
+make_pair(T1&&, T2&&). Types should be deduced.
+Gentoo bug: https://bugs.gentoo.org/show_bug.cgi?id=594312
+
+--- a/bact_classify.cpp
++++ b/bact_classify.cpp
+@@ -86,7 +86,7 @@
+ 	if (id == -2) continue;
+ 	if (id != -1) {
+ 	  if (userule) 
+-	    rules.insert (std::make_pair <std::string, double> (item, alpha[id]));
++	    rules.insert (std::make_pair(item, alpha[id]));
+ 	  result.push_back (id);
+ 	}
+ 	project (item, size+1, newdepth, l, new_trie_pos, new_str_pos);
+@@ -138,7 +138,7 @@
+        if (id == -2) continue;
+        if (id >= 0) {
+ 	 if (userule) 
+-	   rules.insert (std::make_pair <std::string, double> (tree[i].val.key(), alpha[id]));
++	   rules.insert (std::make_pair(tree[i].val.key(), alpha[id]));
+ 	 result.push_back (id);
+        }
+        project (tree[i].val.key(), 1, 0, i, 0, 0);
+@@ -158,7 +158,7 @@
+ 
+     for (std::map <std::string, double>::iterator it = rules.begin();
+ 	 it != rules.end(); ++it) 
+-      tmp.push_back (std::make_pair <std::string, double> (it->first,  it->second));
++      tmp.push_back (std::make_pair(it->first,  it->second));
+       
+     std::sort (tmp.begin(), tmp.end(), pair_2nd_cmp<std::string, double>());
+ 
+--- a/bact_mkmodel.cpp
++++ b/bact_mkmodel.cpp
+@@ -111,7 +111,7 @@
+    
+   for (std::map<std::string, double>::iterator it = rules.begin(); it != rules.end(); ++it) {
+     double a = it->second / alpha_sum;
+-    ary2.push_back (std::make_pair <const char*, double>(it->first.c_str(), a));
++    ary2.push_back (std::make_pair(it->first.c_str(), a));
+     ary.push_back  ((Darts::DoubleArray::key_type *)it->first.c_str());
+     alpha.push_back (a);
+   }
diff --git a/app-text/bact/metadata.xml b/app-text/bact/metadata.xml
new file mode 100644
index 000000000000..38a3b6a3c089
--- /dev/null
+++ b/app-text/bact/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<longdescription lang="en">
+		BACT is an implementation of [Kudo &amp; Matsumoto 2004], and is
+		designed to handle the tree classification problem. The important
+		characteristic is that the input example x is represented not as a
+		numerical feature vector (bag-of-words) but a labeled ordered tree.
+	</longdescription>
+</pkgmetadata>
diff --git a/app-text/barcode-0.98-r1 b/app-text/barcode-0.98-r1
deleted file mode 100644
index 2bfd105fd0d8..000000000000
--- a/app-text/barcode-0.98-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=app-text/libpaper
-DESCRIPTION=barcode generator
-EAPI=5
-HOMEPAGE=https://www.gnu.org/software/barcode/
-KEYWORDS=amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=GPL-2
-RDEPEND=app-text/libpaper
-SLOT=0
-SRC_URI=mirror://gnu/barcode/barcode-0.98.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d3fab31b328f840598f40bd71ce15cb4
diff --git a/app-text/barcode-0.99 b/app-text/barcode-0.99
deleted file mode 100644
index 2dfbcb3a95fa..000000000000
--- a/app-text/barcode-0.99
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=app-text/libpaper
-DESCRIPTION=barcode generator
-EAPI=6
-HOMEPAGE=https://www.gnu.org/software/barcode/
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=GPL-2
-RDEPEND=app-text/libpaper
-SLOT=0
-SRC_URI=mirror://gnu/barcode/barcode-0.99.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=25e818716965c72bc8743324a0960bbe
diff --git a/app-text/barcode/Manifest b/app-text/barcode/Manifest
new file mode 100644
index 000000000000..721437a665bd
--- /dev/null
+++ b/app-text/barcode/Manifest
@@ -0,0 +1,6 @@
+AUX 0.98-info.patch 441 BLAKE2B 2e334be2e36e00a0528d220244affcd000da4ca7b4576501c34b210134ad9e5ff8af99c467d3be3ee34173b651690f8f0ec9a5584ceec60337b4abd1d7a4f825 SHA512 694c4ccd03baa7a17c0512b55b9a39fb2de34afef61194833fe5a481ba13c22f1d21217f53908ca8ad4cea536fbd9a6453486ba2778349e6b1651d2c67513ad7
+DIST barcode-0.98.tar.gz 335658 BLAKE2B 93694332200fce9311d4282c15b2e87e89a54af1a04cd251c9feb9b5ec056e62e97cca9f33e498df1d31d1d98d52e4f0b257f0669e9f7981addcc8e12a61f0cc SHA512 b2ff43d0c752a9fe7c17d65ef136ff2432ceddd27879c91cb18e46e9b0fc8ed6c174aa4154c0fa6d6e70c478ac86448b8eafa1857bb759159b2eaecc8d6f7ca1
+DIST barcode-0.99.tar.gz 890730 BLAKE2B 4695a9baaa2d95c898f0078fc7d49e642fdd5b21e3b0c92d1f275252c78b94e5bdfc78084e6dd8d28231748bf6c567678cf996e309fc1e4a1db53bb2ceb0eb5a SHA512 f500dbe7eaa657ed6879316835557533e0972c8740a8bb61bea46efdd4120827a3c412ca24fec6e1833395191521425dae272f10d8553a252896b363290118b1
+EBUILD barcode-0.98-r1.ebuild 805 BLAKE2B a731789d9c0643b41a3388e5eb234cbb69267da1218d68850e58bed2a0e35c6286babbca4352e69ed1fcb48c7fda7a70ed09969c5484c968b54931d9a326c935 SHA512 4a5207b85e31bd773e838541c0d4a33f762bbc484f11ffca272b3b90aa3c3369f51ec4639629d435afd5ec590967bb005083bd68f39a56f348a3717ef1ebe073
+EBUILD barcode-0.99.ebuild 674 BLAKE2B c493c0b0107b455b46402c7490c8c1d10b4b24cbd7cba8abccd7f698e9e40b3237ba696a011ddccc052c9b0ee8f42381f1116f890fb03d484e51f6ed86e2f38c SHA512 a6ffef8901b504023a4efa95405b4f171c07fb974c238f7e78f96af75b39fa00fd00f72cc358759a85276af3832ee5b604a3a3ca5d90aee5944ccb2a5b8dd0a0
+MISC metadata.xml 243 BLAKE2B c7e8ffa98061b37b0107cea12e59f7779ed014b1b83b008c1f8baa888fca120d4ba508078f2182c27c1bff0e8c2dea07bf3b33a3b086fdfbd7421cbf57b2494c SHA512 dbdb824584151c0ccb600c9fa433898cb613604bc97c7305b7a0809d22574007bc9ee3037b3922ee5256471519fd27510c3168b24ca3f75ab63e5c3051502d3f
diff --git a/app-text/barcode/barcode-0.98-r1.ebuild b/app-text/barcode/barcode-0.98-r1.ebuild
new file mode 100644
index 000000000000..ef3174b628d4
--- /dev/null
+++ b/app-text/barcode/barcode-0.98-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="barcode generator"
+HOMEPAGE="https://www.gnu.org/software/barcode/"
+SRC_URI="mirror://gnu/barcode/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE=""
+RDEPEND="app-text/libpaper"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PV}-info.patch
+	sed -i -e '/^LDFLAGS =/s:=:+=:' \
+		-e "/^aLIBDIR/s:lib:$(get_libdir):" \
+		-e '/^INFODIR/s:info:share/info:' \
+		-e '/^MAN/s:man:share/man:' \
+		Makefile.in || die
+}
+
+src_configure() {
+	tc-export CC
+	econf
+}
+
+src_install() {
+	emake install prefix="${ED}/usr"
+	dodoc ChangeLog README TODO doc/barcode.{pdf,ps}
+}
diff --git a/app-text/barcode/barcode-0.99.ebuild b/app-text/barcode/barcode-0.99.ebuild
new file mode 100644
index 000000000000..5b04b0aef75b
--- /dev/null
+++ b/app-text/barcode/barcode-0.99.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils multilib
+
+DESCRIPTION="barcode generator"
+HOMEPAGE="https://www.gnu.org/software/barcode/"
+SRC_URI="mirror://gnu/barcode/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE=""
+RDEPEND="app-text/libpaper"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	sed -i -e '/^LDFLAGS =/s:=:+=:' \
+		-e "/^aLIBDIR/s:lib:$(get_libdir):" \
+		-e '/^INFODIR/s:info:share/info:' \
+		-e '/^MAN/s:man:share/man:' \
+		Makefile.in || die
+
+	default
+}
+
+src_install() {
+	default
+	dodoc ChangeLog README TODO
+}
diff --git a/app-text/barcode/files/0.98-info.patch b/app-text/barcode/files/0.98-info.patch
new file mode 100644
index 000000000000..740458f88ed4
--- /dev/null
+++ b/app-text/barcode/files/0.98-info.patch
@@ -0,0 +1,14 @@
+--- doc/barcode.info.old	2003-10-26 19:08:39.000000000 -0800
++++ doc/barcode.info	2003-10-26 19:58:42.179447512 -0800
+@@ -1,6 +1,11 @@
+ This is barcode.info, produced by makeinfo version 4.0 from
+ barcode.texinfo.
+ 
++INFO-DIR-SECTION Miscellaneous
++START-INFO-DIR-ENTRY
++* Barcode: (barcode).                     Barcode generation library.
++END-INFO-DIR-ENTRY
++
+    This file is the User's Manual for the barcode library (version
+ 0.98).
+ 
diff --git a/app-text/barcode/metadata.xml b/app-text/barcode/metadata.xml
new file mode 100644
index 000000000000..7b2aa138b855
--- /dev/null
+++ b/app-text/barcode/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>tamiko@gentoo.org</email>
+	<name>Matthias Maier</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-text/bdf2psf-1.104 b/app-text/bdf2psf-1.104
deleted file mode 100644
index eec530698067..000000000000
--- a/app-text/bdf2psf-1.104
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install
-DESCRIPTION=Converter to generate console fonts from BDF source fonts
-EAPI=5
-HOMEPAGE=http://packages.debian.org/sid/bdf2psf
-KEYWORDS=alpha amd64 arm ia64 ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl
-SLOT=0
-SRC_URI=mirror://debian/pool/main/c/console-setup/console-setup_1.104.tar.gz
-_md5_=9ef14f0b6f69427a5c4d25304c7aba42
diff --git a/app-text/bdf2psf-1.155 b/app-text/bdf2psf-1.155
deleted file mode 100644
index d8377a966150..000000000000
--- a/app-text/bdf2psf-1.155
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install
-DESCRIPTION=Converter to generate console fonts from BDF source fonts
-EAPI=6
-HOMEPAGE=http://packages.debian.org/sid/bdf2psf
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl
-SLOT=0
-SRC_URI=mirror://debian/pool/main/c/console-setup/console-setup_1.155.tar.xz
-_md5_=e4a6af69d954eb8c825a79d72325c969
diff --git a/app-text/bdf2psf/Manifest b/app-text/bdf2psf/Manifest
new file mode 100644
index 000000000000..49502d3157e3
--- /dev/null
+++ b/app-text/bdf2psf/Manifest
@@ -0,0 +1,5 @@
+DIST console-setup_1.104.tar.gz 3272857 BLAKE2B ae7a5929a059ddd2258884e5207198ae517da1284e264527878ad25bf883e48b399e53f2a987265623a5cffa3eefce8cce5fe8ad632576c46bba40689c17c586 SHA512 72b07a0ed955069777c1691b16753534630bcbdb5cd94f05ae95e8c27436c233598f01418fbf52a29b6ecf7d8217e6af841778d8e5d329569f2f585b538ba03e
+DIST console-setup_1.155.tar.xz 1641952 BLAKE2B fbe1e58915c2aac1148a1de31eca5bc9b7fc078c9840b5d51d8b1211e178315360e294d81040c464e2404774594606b3fecab6f7924b1fd4bec4c24b219e9197 SHA512 e00b0b48d91c9587c0659714f74de259bf3efd1caa553c4a06d9bc545335463808db2da16797ffca1dc59cae4f524619d3cf9a68db2ff5ad7b47cdd8aced37ac
+EBUILD bdf2psf-1.104.ebuild 693 BLAKE2B 961f6e8ebac9a32f2086acf1428982ecbdede10cea9fc9fdbe8a6971b3892139f36bce1c6ffa98074855e3b131fc1e710ab8a71f34600a75bcda687623d6cb2b SHA512 a4c868d5e4d02b5de553fda422e02b662a73b95dad846a758527dd66ada333cac9406c46d596f37d915a23d2ebd482f0e4752351d337969035afdc6130a1ad5e
+EBUILD bdf2psf-1.155.ebuild 701 BLAKE2B 5b64a1d92b3856aee6429421bd65f931751f61200e3b9a6df2aa2a1974a95a0ceafd47e57855223eae50d77e5ee5381b00326a5db744dea7410e90c0a0871db1 SHA512 d47ddc0b4e9a2f2c6839c4ede3043cebbd8100e1621486b006f3412841f51c434c28d893e4f6fd2f34d9ac485771351aa66c99bc097ceed0e06fd96d998c85aa
+MISC metadata.xml 246 BLAKE2B f94a229d0ffd7220f14c23ca2b0b6b84128338b5af27cd18ddb0c9e2f95f51c943fdfbc368c03b4a87d7bb381c668158fdc169fd067cc0cd8cd35852acc29d62 SHA512 b6df287a6e1f18bf267a05d8eb6dea788ae7ec74de31d9cea76fea038e4090c6a83d62221505d280d55e9b314d059c409e442951d78eb3a58928307ff118147b
diff --git a/app-text/bdf2psf/bdf2psf-1.104.ebuild b/app-text/bdf2psf/bdf2psf-1.104.ebuild
new file mode 100644
index 000000000000..c9f47dc27058
--- /dev/null
+++ b/app-text/bdf2psf/bdf2psf-1.104.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="Converter to generate console fonts from BDF source fonts"
+HOMEPAGE="http://packages.debian.org/sid/bdf2psf"
+SRC_URI="mirror://debian/pool/main/c/console-setup/console-setup_${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ia64 ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND=""
+RDEPEND="dev-lang/perl"
+
+S="${WORKDIR}/console-setup-${PV}"
+
+src_compile() {
+	:
+}
+
+src_install() {
+	dobin Fonts/bdf2psf
+
+	insinto usr/share/bdf2psf
+	doins -r Fonts/*.equivalents Fonts/*.set Fonts/fontsets
+
+	doman man/bdf2psf.1
+	dodoc debian/README.fontsets
+}
diff --git a/app-text/bdf2psf/bdf2psf-1.155.ebuild b/app-text/bdf2psf/bdf2psf-1.155.ebuild
new file mode 100644
index 000000000000..29eca139506f
--- /dev/null
+++ b/app-text/bdf2psf/bdf2psf-1.155.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Converter to generate console fonts from BDF source fonts"
+HOMEPAGE="http://packages.debian.org/sid/bdf2psf"
+SRC_URI="mirror://debian/pool/main/c/console-setup/console-setup_${PV}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND=""
+RDEPEND="dev-lang/perl"
+
+S="${WORKDIR}/console-setup-${PV}"
+
+src_compile() {
+	:
+}
+
+src_install() {
+	dobin Fonts/bdf2psf
+
+	insinto usr/share/bdf2psf
+	doins -r Fonts/*.equivalents Fonts/*.set Fonts/fontsets
+
+	doman man/bdf2psf.1
+	dodoc debian/README.fontsets
+}
diff --git a/app-text/bdf2psf/metadata.xml b/app-text/bdf2psf/metadata.xml
new file mode 100644
index 000000000000..de09ffd8b089
--- /dev/null
+++ b/app-text/bdf2psf/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>floppym@gentoo.org</email>
+		<name>Mike Gilbert</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-text/bibclean-2.17 b/app-text/bibclean-2.17
deleted file mode 100644
index f30bdbf95ca7..000000000000
--- a/app-text/bibclean-2.17
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install
-DESCRIPTION=BibTeX bibliography prettyprinter and syntax checker
-EAPI=6
-HOMEPAGE=http://www.math.utah.edu/pub/bibclean/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://www.math.utah.edu/pub/bibclean/bibclean-2.17.tar.bz2
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=f3a685308b069272254accf5eab8368a
diff --git a/app-text/bibclean/Manifest b/app-text/bibclean/Manifest
new file mode 100644
index 000000000000..a3c67e74a889
--- /dev/null
+++ b/app-text/bibclean/Manifest
@@ -0,0 +1,3 @@
+DIST bibclean-2.17.tar.bz2 2253830 BLAKE2B 4d707f8d07f04c45c44fbea2b12bfffc7636cef2a847d90e62f339cb8fdadbb416cd89c2ba1cb04b0fc9c736dd7ca8480a2cbd4dab9c27b1f6804ddd18fc5419 SHA512 5f0d6b315ecc98c47f48c1e5fe7bcbd374cf97dec5cc97ce4438300a7419e6b2f1efae313efdf9d21211e9cd658c1f4bac10aa3b0d55dfa8a5783d982b1dde0f
+EBUILD bibclean-2.17.ebuild 593 BLAKE2B 01d318e8467d69d1d1cce3da545808b10e3c2717a61f4261526145e908b9e2e63200e0bc0af2061501ddfbf4c78c3b6f368cd018f1334420477b894c4827adc7 SHA512 d18ba47f1afefcae8711f1d450a26cbadef08c45a57f4ff971d10d15cd12afa342ccc17c0eda7fa3f3ff32a821ca7f83b61fd101494083857df72a2d18241ba6
+MISC metadata.xml 245 BLAKE2B ee3a163cfe0a4bc59c0dfb46f9ddb580e2d259b4d0e33cb4e684eb9e6d4b901bf97c6edd891f3b75a613a782f1b89318d0ee3ec9bee4e34c4441d9e8f4267678 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690
diff --git a/app-text/bibclean/bibclean-2.17.ebuild b/app-text/bibclean/bibclean-2.17.ebuild
new file mode 100644
index 000000000000..fc8d456dd364
--- /dev/null
+++ b/app-text/bibclean/bibclean-2.17.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="BibTeX bibliography prettyprinter and syntax checker"
+SRC_URI="http://www.math.utah.edu/pub/bibclean/${P}.tar.bz2"
+HOMEPAGE="http://www.math.utah.edu/pub/bibclean/"
+
+# http://packages.debian.org/changelogs/pool/main/b/bibclean/bibclean_2.11.4-5/bibclean.copyright
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+SLOT="0"
+
+src_compile() {
+	emake -j1 LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	dobin bibclean
+	newman bibclean.man bibclean.1
+}
diff --git a/app-text/bibclean/metadata.xml b/app-text/bibclean/metadata.xml
new file mode 100644
index 000000000000..13170c3184d8
--- /dev/null
+++ b/app-text/bibclean/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>tex@gentoo.org</email>
+	<name>Gentoo TeX Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-text/bibletime-2.11.0 b/app-text/bibletime-2.11.0
deleted file mode 100644
index 131e0590a706..000000000000
--- a/app-text/bibletime-2.11.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=app-text/sword-1.7.0 dev-cpp/clucene dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwebchannel:5 dev-qt/qtwebengine:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-libs/boost dev-libs/icu:= dev-qt/linguist-tools:5 dev-qt/qttest:5 net-misc/curl sys-libs/zlib sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Qt Bible study application using the SWORD library
-EAPI=6
-HOMEPAGE=http://www.bibletime.info/
-IUSE=debug
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=app-text/sword-1.7.0 dev-cpp/clucene dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwebchannel:5 dev-qt/qtwebengine:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/bibletime/bibletime/releases/download/v2.11.0/bibletime-2.11.0.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=dab65683e351bd1052e6bfa0c5f27b63
diff --git a/app-text/bibletime-2.11.2 b/app-text/bibletime-2.11.2
deleted file mode 100644
index b4c53cf4b570..000000000000
--- a/app-text/bibletime-2.11.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=app-text/sword-1.7.0 dev-cpp/clucene dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwebchannel:5 dev-qt/qtwebengine:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-libs/boost dev-libs/icu:= dev-qt/linguist-tools:5 dev-qt/qttest:5 net-misc/curl sys-libs/zlib sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Qt Bible study application using the SWORD library
-EAPI=6
-HOMEPAGE=http://www.bibletime.info/
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=app-text/sword-1.7.0 dev-cpp/clucene dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwebchannel:5 dev-qt/qtwebengine:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/bibletime/bibletime/releases/download/v2.11.2/bibletime-2.11.2.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=93561d95b70deca71b7e3adbb79118f0
diff --git a/app-text/bibletime/Manifest b/app-text/bibletime/Manifest
new file mode 100644
index 000000000000..130abd5fb53d
--- /dev/null
+++ b/app-text/bibletime/Manifest
@@ -0,0 +1,5 @@
+DIST bibletime-2.11.0.tar.xz 2403136 BLAKE2B fecf854a40ad0e188fde8ad3d047acf6274bfdf20f6a6211a6ff9d41e3de38f4d311db92e2b2fdf735e293163637cf4b553e722a05174d8c84201e94cf6e7b7c SHA512 41f0751db30b9001d04e1c4040dca022c83eb440987104e2c3465f4233f8c0ecb1c940eac0433409f97f78c89c00d0f880f822a51219eadcbf3fc6513cfa81e6
+DIST bibletime-2.11.2.tar.xz 2533472 BLAKE2B b116bbefaac8106d1f283d1c1a0c4d4c17e67d1cb41066c219ecca243914b0fa355748ebebb23ec88c1749548c853166d391764a454dd77b43c6617072a648a6 SHA512 99e2500e07797549e32ac28238c90a4db1cd98f74ea20f0161db7675127f42363006f20d859504be958bfdecf80a18a96229a1bbc105d332af97644fafc92d31
+EBUILD bibletime-2.11.0.ebuild 960 BLAKE2B 65bdcfeb1a85ac2ae4232f58c00b48b5453f310530da42b62a3380affdd9f6fa274aa87e1e764ef501467893f4b7dd899e55f615df6b11d961f28cd97a0281d8 SHA512 35dfdbdc5220a77856ad9d00ba93eb5b834a3f3bb00dea85d1f418af8a4212a959e09682f471b083e0cfff1e53a7dd3678dd55783e786f0adf39be16df786ec2
+EBUILD bibletime-2.11.2.ebuild 962 BLAKE2B e82a986d78a9f287b1c72dae5e525f4e61c4377af4f921455d588940f808edf766bcd69cddfb06e8c0f808e67cd6a0a8b1f78214863c2be7ff694849b9cea461 SHA512 fdbff40e6d53b358f1ed9ea15aa7171b743b24366d0000c2664406c9130bf8850fa1aa36f5dc257262eb3e46954156aec009d35b739c188905295803eed7509e
+MISC metadata.xml 658 BLAKE2B 0f4e1d9ffb30d6d0a9ca097739a4a58c9fdfd4d4b777f552c3bf3584a36e902d215f6757c83d449b17355b105076b231e775c9537337bc830f60d2a0799d475a SHA512 4d3e9dd30225ea7a354750d38bc4e4b9cac37a2cfe9e40d79835536b5ed9ae7c6704f1b12a32e0bf2926574378d6ec014ccdcc4a7af0b15f6e336d980060eeae
diff --git a/app-text/bibletime/bibletime-2.11.0.ebuild b/app-text/bibletime/bibletime-2.11.0.ebuild
new file mode 100644
index 000000000000..8c7cd16f9aa8
--- /dev/null
+++ b/app-text/bibletime/bibletime-2.11.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="Qt Bible study application using the SWORD library"
+HOMEPAGE="http://www.bibletime.info/"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="debug"
+
+# bug 313657
+RESTRICT="test"
+
+RDEPEND="
+	>=app-text/sword-1.7.0
+	dev-cpp/clucene
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtwebchannel:5
+	dev-qt/qtwebengine:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+	dev-libs/icu:=
+	dev-qt/linguist-tools:5
+	dev-qt/qttest:5
+	net-misc/curl
+	sys-libs/zlib
+"
+
+DOCS=( ChangeLog README.md )
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	sed -e "s:Dictionary;Qt:Dictionary;Office;TextTools;Utility;Qt:" \
+	    -i cmake/platforms/linux/bibletime.desktop.cmake || die "fixing .desktop file failed"
+}
diff --git a/app-text/bibletime/bibletime-2.11.2.ebuild b/app-text/bibletime/bibletime-2.11.2.ebuild
new file mode 100644
index 000000000000..ebbcd684ed65
--- /dev/null
+++ b/app-text/bibletime/bibletime-2.11.2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="Qt Bible study application using the SWORD library"
+HOMEPAGE="http://www.bibletime.info/"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+# bug 313657
+RESTRICT="test"
+
+RDEPEND="
+	>=app-text/sword-1.7.0
+	dev-cpp/clucene
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtwebchannel:5
+	dev-qt/qtwebengine:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+	dev-libs/icu:=
+	dev-qt/linguist-tools:5
+	dev-qt/qttest:5
+	net-misc/curl
+	sys-libs/zlib
+"
+
+DOCS=( ChangeLog README.md )
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	sed -e "s:Dictionary;Qt:Dictionary;Office;TextTools;Utility;Qt:" \
+	    -i cmake/platforms/linux/bibletime.desktop.cmake || die "fixing .desktop file failed"
+}
diff --git a/app-text/bibletime/metadata.xml b/app-text/bibletime/metadata.xml
new file mode 100644
index 000000000000..f1ef81c14f45
--- /dev/null
+++ b/app-text/bibletime/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>theology@gentoo.org</email>
+		<name>Theology</name>
+	</maintainer>
+	<longdescription>
+BibleTime is a Bible study application for Linux. It is based on the 
+K Desktop Environment and uses the SWORD programming library to work 
+with Bible texts, commentaries, dictionaries and books provided by 
+the Crosswire Bible Society.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">bibletime/bibletime</remote-id>
+		<remote-id type="sourceforge">bibletime</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/bibus-1.5.2-r3 b/app-text/bibus-1.5.2-r3
deleted file mode 100644
index 637715eada9e..000000000000
--- a/app-text/bibus-1.5.2-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm setup
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] app-office/libreoffice dev-python/wxpython:3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-db/sqliteodbc dev-db/unixODBC mysql? ( dev-python/mysql-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-db/myodbc )
-DESCRIPTION=Bibliographic and reference management software, integrates with LO and MS Word
-EAPI=6
-HOMEPAGE=http://bibus-biblio.sourceforge.net/
-IUSE=mysql python_targets_python2_7
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] app-office/libreoffice dev-python/wxpython:3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-db/sqliteodbc dev-db/unixODBC mysql? ( dev-python/mysql-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-db/myodbc )
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://sourceforge/bibus-biblio/bibus_1.5.2.orig.tar.gz https://dev.gentoo.org/~jlec/distfiles/bibus-1.5.2-lo-4.patch.xz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4686d74d58d9f36c606e809ba0228b4c
diff --git a/app-text/bibus/Manifest b/app-text/bibus/Manifest
new file mode 100644
index 000000000000..5267e2561d07
--- /dev/null
+++ b/app-text/bibus/Manifest
@@ -0,0 +1,7 @@
+AUX bibus-1.5.2-bibus.cfg.patch 1280 BLAKE2B 46d1d0f784636c02373372bab68bad592cf88a88f587a9c40411e38992ec58cbaef83ad3a1db4f3ba70701525312cdcda88e0041bd6bce59c899b868bfb76865 SHA512 f62aee3cd67d2c845cd3d19ee07ecab2a2a058d49c55232b7df51df3dde42bfba6a4f23cbc4d31f38788c9edf73780f444a4a5354b2deafac6a0f2d7158a2627
+AUX bibus-1.5.2-install.patch 5630 BLAKE2B 8f0da2eb8fcfde331b1008650f3ae0156a82f64e86fa894bcb051fc78322451a8cab3df2a19395791cfa3a09b4687669ecc0dd8521cbd342fa342d36ebeade76 SHA512 a553cd687d0bd861b65896acb2cface6f8950e3a6006975ae53108d5984ead2e9dde8e610e003b5c8888bd0b7e635542a83c1a502df09cb6a7dcb85b8a0a1e33
+AUX bibus-1.5.2-wx30.patch 7623 BLAKE2B 644d97804c8e43f63df0090026e0e757dc9a80eee521ac3f07630912619cb26ab9f9893351e56c7b1b1aa3024e3c15f71504392362404cf37d92b6c73182e2af SHA512 48915b9dedbaddc6fc1f7adc6f197e1e5df01942a897c6aab664fa36c980a0978d111deb29e05d2b282f9ec17e01ff2117f11d86cd53600a0fa6ebfc4c6de049
+DIST bibus-1.5.2-lo-4.patch.xz 13196 BLAKE2B 1dfef94699eee77537fea3d3b93aeb1613fc93b68df1deb43c4af6fae0bf5aeb2282bb823f4824272acdef53a5edcd9b30a52415e82da00952971fa65ec0d9dc SHA512 68b90574e9dd0bb3e2cc89c539ff35febdf4ac37dfb65c06709d21b62fdda0108c93f05d37ab96bf52c4f99bbe20caa361d562c297b05dc7ea37404eea659fd1
+DIST bibus_1.5.2.orig.tar.gz 5411889 BLAKE2B db95ea4b1e0ba22fd85cb36d945864741a2f40890499018698c679c9f7d4b77b2299d2aa941664b2e4011c41ea62a31463b39c392eb3678633de17482f928474 SHA512 33d091dacc707859a11010fcba57691a3e2726ae7579d601720b4398f7be29b580be978da8cd058fab491ec5b52dd3ce33c964a8d5077f8e80d8f0f387ffa2c4
+EBUILD bibus-1.5.2-r3.ebuild 2054 BLAKE2B 97ae9c2e3f09fe2e64f06a2518fa3f457c03bfec3e91b0f329626874abc3645b551a8ebe074173cb46e6f53254249792b2234303a02a82171424a8fe22021b2a SHA512 206cc042585499f922b1b50cb7d8bf8a34ac400e40da13e6de57c37e122c33360252ada918c6a3e1e011523788fd532439abe117aa3b496c8b51fb33932bea3e
+MISC metadata.xml 335 BLAKE2B 1bf81d23e26f3990b58cf0ae16ffb46f7b70d5e9a632c1a787145bf143a30e6721f872f077716d8abbd7c572659329a6927524ee9b17276839e04421cbbd80f8 SHA512 fe16c696e26755549539bce6b16f8370df11af5bf69c774a103ea608e99525e83a8e2b355efcff51a42f8296bc0146e66d4d4e49004e1a54dbbaba98dcdc867f
diff --git a/app-text/bibus/bibus-1.5.2-r3.ebuild b/app-text/bibus/bibus-1.5.2-r3.ebuild
new file mode 100644
index 000000000000..f046112d4e06
--- /dev/null
+++ b/app-text/bibus/bibus-1.5.2-r3.ebuild
@@ -0,0 +1,86 @@
+# 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"
+
+inherit python-r1 versionator xdg-utils
+
+DESCRIPTION="Bibliographic and reference management software, integrates with LO and MS Word"
+HOMEPAGE="http://bibus-biblio.sourceforge.net/"
+SRC_URI="
+	mirror://sourceforge/${PN}-biblio/${PN}_${PV}.orig.tar.gz
+	https://dev.gentoo.org/~jlec/distfiles/${P}-lo-4.patch.xz
+	"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+IUSE="mysql"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# Most of this mess is designed to give the choice of sqlite or mysql
+# but prefer sqlite. We also need to default to sqlite if neither is requested.
+# Cannot depend on virtual/ooo
+# bibus fails to start with app-office/openoffice-bin (bug #288232).
+RDEPEND="
+	${PYTHON_DEPS}
+	app-office/libreoffice
+	dev-python/wxpython:3.0[${PYTHON_USEDEP}]
+	dev-db/sqliteodbc
+	dev-db/unixODBC
+	mysql? (
+		dev-python/mysql-python[${PYTHON_USEDEP}]
+		dev-db/myodbc
+	)
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-install.patch
+	"${FILESDIR}"/${P}-bibus.cfg.patch
+	"${WORKDIR}"/${P}-lo-4.patch
+	"${FILESDIR}"/${P}-wx30.patch
+)
+
+pkg_setup() {
+	if [[ -d "/usr/$(get_libdir)/openoffice" ]] ; then
+		OFFICESUITE="/usr/$(get_libdir)/openoffice"
+	else
+		OFFICESUITE="/usr/$(get_libdir)/libreoffice"
+	fi
+}
+
+src_compile() { :; }
+
+src_install() {
+	einfo "Installing for ${OFFICESUITE}"
+	installation() {
+		emake \
+			DESTDIR="${D}" \
+			prefix="${EPREFIX}/usr" \
+			oopath="${OFFICESUITE}/program" \
+			ooure="${OFFICESUITE}/ure-link/lib" \
+			oobasis="${OFFICESUITE}/program" \
+			sysconfdir="${EPREFIX}/etc" \
+			pythondir="$(python_get_sitedir)" \
+			python=${PYTHON} \
+			install install-doc-en
+	}
+	python_foreach_impl installation
+	python_foreach_impl python_optimize
+
+	python_foreach_impl python_newscript bibusStart.py ${PN}
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/app-text/bibus/files/bibus-1.5.2-bibus.cfg.patch b/app-text/bibus/files/bibus-1.5.2-bibus.cfg.patch
new file mode 100644
index 000000000000..bfba0c0ac43b
--- /dev/null
+++ b/app-text/bibus/files/bibus-1.5.2-bibus.cfg.patch
@@ -0,0 +1,31 @@
+ bibusStart.py | 8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/bibusStart.py b/bibusStart.py
+index edfc19f..99c5381 100644
+--- a/bibusStart.py
++++ b/bibusStart.py
+@@ -17,12 +17,14 @@
+ # along with Bibus; if not, write to the Free Software
+ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA.
+ #
+-import ConfigParser,os,sys,urllib,urlparse
++import ConfigParser,os,sys,urllib,urlparse,site
+ cp=ConfigParser.ConfigParser()
+ fileName = sys.argv[0]
+ while os.path.islink(fileName): fileName = os.readlink(fileName)
+ sourcedir = os.path.abspath( os.path.dirname(fileName) )
+-cp.read( os.path.join(sourcedir,'bibus.cfg') )
++bibus_sitedir = os.path.join(site.getsitepackages()[0], 'bibus')
++bibus_cfg = os.path.join(bibus_sitedir, 'bibus.cfg')
++cp.read(bibus_cfg)
+ # We read first, then if it is not null we convert to absolute path
+ # otherwise, empty path will be converted to the current directory path
+ python = cp.get('PATH','python')
+@@ -69,5 +71,5 @@ else:
+ 	except KeyError:
+ 		os.environ[LIBPATH] = oopath
+ # starting Bibus
+-os.execl( python , os.path.basename(python) , QUOTE+ os.path.join(sourcedir,'bibus.py') +QUOTE )
++os.execl( python , os.path.basename(python) , QUOTE+ os.path.join(bibus_sitedir,'bibus.py') +QUOTE )
+ 
diff --git a/app-text/bibus/files/bibus-1.5.2-install.patch b/app-text/bibus/files/bibus-1.5.2-install.patch
new file mode 100644
index 000000000000..5225fcd6c3d8
--- /dev/null
+++ b/app-text/bibus/files/bibus-1.5.2-install.patch
@@ -0,0 +1,110 @@
+ Makefile |   62 ++++++++++++++++++++++++--------------------------------------
+ 1 files changed, 24 insertions(+), 38 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index d41b12d..b07cdff 100755
+--- a/Makefile
++++ b/Makefile
+@@ -14,62 +14,60 @@ mandir = $(prefix)/share/man
+ man1dir = $(mandir)/man1
+ 
+ define install-files
+-	install -d $(datadir)/bibus
+-	install -m644 *.py MySQL_Bibus.ini $(datadir)/bibus/
++	install -d $(DESTDIR)$(pythondir)/bibus
++	install -m644 *.py MySQL_Bibus.ini $(DESTDIR)/$(pythondir)/bibus/
+ 	#
+ 	for dir in Export Format Import StyleEditor FirstStart bibOOo db_models Pixmaps Data LyX Utilities; do \
+-		find $$dir ! -wholename '*CVS*' -a -type f -exec install -m644 '{}' -D $(datadir)/bibus/'{}' ';' ; \
++		find $$dir ! -wholename '*CVS*' -a -type f -exec install -m644 '{}' -D $(DESTDIR)/$(pythondir)/bibus/'{}' ';' ; \
+ 	done
+-	install -m644 Setup/UnoConnectionListener.odg -D $(datadir)/bibus/Setup/UnoConnectionListener.odg
++	install -m644 Setup/UnoConnectionListener.odg -D $(DESTDIR)/$(datadir)/bibus/Setup/UnoConnectionListener.odg
+ 	# locale files. We look for all the directory in locale/
+ 	for dir in $(wildcard locale/*); do \
+ 		if [ -d $$dir ] && [ $$dir != "locale/CVS" ]; then \
+-			install -m644 $$dir/LC_MESSAGES/bibus.mo -D $(datadir)/$$dir/LC_MESSAGES/bibus.mo ; \
++			install -m644 $$dir/LC_MESSAGES/bibus.mo -D $(DESTDIR)/$(datadir)/$$dir/LC_MESSAGES/bibus.mo ; \
+ 		fi; \
+ 	done
+ 	# bibus.config in /etc
+-	install -m644 bibus.config -D $(sysconfdir)/bibus.config
++	install -m644 bibus.config -D $(DESTDIR)/$(sysconfdir)/bibus.config
+ 	# man page
+-	install -m644 Setup/bibus.1 -D $(man1dir)/bibus.1
++	install -m644 Setup/bibus.1 -D $(DESTDIR)/$(man1dir)/bibus.1
+ 
+ 	# freedesktop icon and shortcut
+-	install -m644 Pixmaps/bibus.png -D $(datadir)/icons/hicolor/48x48/apps/bibus.png
+-	install -m644 Setup/bibus.desktop -D $(datadir)/applications/bibus.desktop
++	install -m644 Pixmaps/bibus.png -D $(DESTDIR)$(datadir)/pixmaps/bibus.png
++	install -m644 Setup/bibus.desktop -D $(DESTDIR)/$(datadir)/applications/bibus.desktop
+ 	# The following lines are presumably not needed since icons/desktop are in standard locations
+ 	#echo 'Exec=$(bindir)/bibus' >> $(datadir)/applications/bibus.desktop
+ 	#echo 'Icon=$(datadir)/icons/hicolor/48x48/apps/bibus.png' >> $(datadir)/applications/bibus.desktop
+ 
+ 	# bibus command
+-	install -d $(bindir)
+-	ln -sf $(datadir)/bibus/bibusStart.py $(bindir)/bibus
+-	chmod 755 $(datadir)/bibus/bibusStart.py
++	install -d $(DESTDIR)/$(bindir)
++	ln -sf $(pythondir)/bibus/bibusStart.py $(DESTDIR)/$(bindir)/bibus
++	chmod 755 $(DESTDIR)$(pythondir)/bibus/bibusStart.py
+ 
+ 	# basic doc files
+-	install -m755 -d $(datadir)/doc/bibus
+-	install -m644 Docs/*.txt Docs/CHANGELOG Docs/copying $(datadir)/doc/bibus
++	install -m755 -d $(DESTDIR)/$(datadir)/doc/${PF}
++	install -m644 Docs/*.txt Docs/CHANGELOG Docs/copying $(DESTDIR)/$(datadir)/doc/${PF}
+ 
+ 	# generating bibus.cfg file
+-	echo '[PATH]' > $(datadir)/bibus/bibus.cfg
+-	echo 'python = $(python)' >> $(datadir)/bibus/bibus.cfg
+-	echo 'oopath = $(oopath)' >> $(datadir)/bibus/bibus.cfg
+-	echo 'ooure = $(ooure)' >> $(datadir)/bibus/bibus.cfg
+-	echo 'oobasis = $(oobasis)' >> $(datadir)/bibus/bibus.cfg
+-	echo 'docdir = $(datadir)/doc/bibus/html' >> $(datadir)/bibus/bibus.cfg
+-	echo 'licence = $(datadir)/doc/bibus/copying' >> $(datadir)/bibus/bibus.cfg
+-	echo 'localedir = $(datadir)/locale' >> $(datadir)/bibus/bibus.cfg
+-	echo 'systemconf = $(sysconfdir)/bibus.config' >> $(datadir)/bibus/bibus.cfg
++	echo '[PATH]' > $(DESTDIR)/$(pythondir)/bibus/bibus.cfg
++	echo 'python = $(python)' >> $(DESTDIR)/$(pythondir)/bibus/bibus.cfg
++	echo 'oopath = $(oopath)' >> $(DESTDIR)/$(pythondir)/bibus/bibus.cfg
++	echo 'ooure = $(ooure)' >> $(DESTDIR)/$(pythondir)/bibus/bibus.cfg
++	echo 'oobasis = $(oobasis)' >> $(DESTDIR)/$(pythondir)/bibus/bibus.cfg
++	echo 'docdir = $(datadir)/doc/${PF}/html' >> $(DESTDIR)/$(pythondir)/bibus/bibus.cfg
++	echo 'localedir = $(datadir)/locale' >> $(DESTDIR)/$(pythondir)/bibus/bibus.cfg
++	echo 'systemconf = $(sysconfdir)/bibus.config' >> $(DESTDIR)/$(pythondir)/bibus/bibus.cfg
+ endef
+ 
+ define install-doc-en
+ 	# copying docs in from Docs/html/en/ for bibus-doc-en
+ 	cd Docs;\
+-	find html/en/* -type f -exec install -m644 '{}' -D $(datadir)/doc/bibus/'{}' ';'
++	find html/en/* -type f -exec install -m644 '{}' -D $(DESTDIR)/$(datadir)/doc/${PF}/'{}' ';'
+ endef
+ 
+ define compile
+ 	# compile recursively all the python files located in $(datadir)/bibus
+-	$(python) -c "import compileall ; compileall.compile_dir('$(datadir)/bibus')"
+-	$(python) -O -c "import compileall ; compileall.compile_dir('$(datadir)/bibus')"
++	echo "No compilation"
+ endef
+ 
+ install-files:
+@@ -83,15 +81,3 @@ install:
+ 	$(install-doc-en)
+ 	$(compile)
+ 
+-	# write uninstaller in $(datadir)/bibus/Setup/uninstall.sh
+-		echo "#!/bin/sh" > $(datadir)/bibus/Setup/uninstall.sh
+-		echo "rm -rf $(datadir)/bibus" >> $(datadir)/bibus/Setup/uninstall.sh
+-		echo "rm $(bindir)/bibus" >> $(datadir)/bibus/Setup/uninstall.sh
+-		echo "find $(datadir)/locale -name bibus.mo -exec rm -f {} \;" >> $(datadir)/bibus/Setup/uninstall.sh
+-		echo "rm $(sysconfdir)/bibus.config" >> $(datadir)/bibus/Setup/uninstall.sh
+-		echo "rm $(man1dir)/bibus.1" >> $(datadir)/bibus/Setup/uninstall.sh
+-		echo "rm -rf $(datadir)/doc/bibus" >> $(datadir)/bibus/Setup/uninstall.sh
+-		echo "rm $(datadir)/applications/bibus.desktop" >> $(datadir)/bibus/Setup/uninstall.sh
+-		echo "rm $(datadir)/icons/hicolor/48x48/apps/bibus.png" >> $(datadir)/bibus/Setup/uninstall.sh
+-	chmod 744 $(datadir)/bibus/Setup/uninstall.sh
+-	# end uninstaller
diff --git a/app-text/bibus/files/bibus-1.5.2-wx30.patch b/app-text/bibus/files/bibus-1.5.2-wx30.patch
new file mode 100644
index 000000000000..b53486741817
--- /dev/null
+++ b/app-text/bibus/files/bibus-1.5.2-wx30.patch
@@ -0,0 +1,158 @@
+Author: Jan Beyer <jan@beathovn.de>
+Copyright: Copyright 2014 Jan Beyer
+License: The same as the Bibus packaging.
+Description: Patch to migrate bibus from wxpython2.8 to wxpython 3.0
+ Thanks to Olly Betts for the script that did the main work:
+ http://anonscm.debian.org/cgit/collab-maint/wx-migration-tools.git
+
+--- a/ShortcutEd.py
++++ b/ShortcutEd.py
+@@ -27,7 +27,7 @@
+ 		self.category = category	# edited category
+ 		self.short = short		# current shortcuts list
+ 		# begin wxGlade: Capture.__init__
+-		kwds["style"] = wx.DIALOG_MODAL|wx.CAPTION|wx.RESIZE_BORDER|wx.THICK_FRAME
++		kwds["style"] = wx.CAPTION|wx.RESIZE_BORDER|wx.RESIZE_BORDER
+ 		wx.Dialog.__init__(self, *args, **kwds)
+ 		self.label_1 = wx.StaticText(self, -1, _("Capture from field"))
+ 		self.choice_field = wx.Choice(self, -1, choices=[])
+@@ -110,7 +110,7 @@
+ 		self.parentshort = short	# we keep a copy for updating it latter
+ 		self.db = db				# connection to the database
+ 		# begin wxGlade: ShortcutEd.__init__
+-		kwds["style"] = wx.DIALOG_MODAL|wx.CAPTION|wx.RESIZE_BORDER|wx.THICK_FRAME
++		kwds["style"] = wx.CAPTION|wx.RESIZE_BORDER|wx.RESIZE_BORDER
+ 		wx.Dialog.__init__(self, *args, **kwds)
+ 		self.list_shortcuts = wx.ListCtrl(self, -1, style=wx.LC_REPORT|wx.LC_EDIT_LABELS|wx.LC_NO_HEADER|wx.LC_SINGLE_SEL|wx.SUNKEN_BORDER)
+ 		self.button_new = wx.Button(self, -1, _("New"))
+--- a/bibus.py
++++ b/bibus.py
+@@ -120,7 +120,7 @@
+ #
+ class Bibus(wx.App):
+ 	def OnInit(self):
+-		wx.InitAllImageHandlers()
++		# no-op in wxPython2.8 and later: wx.InitAllImageHandlers()
+ 		self.SetAppName(APPNAME)
+ 		# reading and eventually converting the config file
+ 		if os.path.isfile( wx.StandardPaths.Get().GetUserDataDir() ):	# old config file in $HOME/.bibus
+--- a/Pref_Shortcuts.py
++++ b/Pref_Shortcuts.py
+@@ -26,7 +26,7 @@
+ 	def __init__(self, categories, *args, **kwds):
+ 		self.categories = categories  # current categories in parent. may be different from BIB.SHORTCUTS
+ 		# begin wxGlade: NewCategory.__init__
+-		kwds["style"] = wx.DIALOG_MODAL|wx.CAPTION|wx.RESIZE_BORDER|wx.THICK_FRAME
++		kwds["style"] = wx.CAPTION|wx.RESIZE_BORDER|wx.RESIZE_BORDER
+ 		wx.Dialog.__init__(self, *args, **kwds)
+ 		self.label_1 = wx.StaticText(self, -1, _("Name"))
+ 		self.text_ctrl_name = wx.TextCtrl(self, -1, "")
+@@ -80,7 +80,7 @@
+ 	def onFile(self,evt):
+ 		tmpfilen = self.text_ctrl_name.GetValue()
+ 		if not tmpfilen: tmpfilen = 'shortcut'
+-		filen = wx.FileSelector(_("Choose the file location and name"),default_filename=tmpfilen,parent=self, flags = wx.SAVE )
++		filen = wx.FileSelector(_("Choose the file location and name"),default_filename=tmpfilen,parent=self, flags = wx.FD_SAVE )
+ 		if filen:
+ 			self.text_ctrl_filen.SetValue(filen)
+ 
+--- a/moveFile.py
++++ b/moveFile.py
+@@ -96,7 +96,7 @@
+ 
+ if __name__ == "__main__":
+     app = wx.PySimpleApp(0)
+-    wx.InitAllImageHandlers()
++    # no-op in wxPython2.8 and later: wx.InitAllImageHandlers()
+     dialog_1 = MoveFile(None, -1, "")
+     app.SetTopWindow(dialog_1)
+     dialog_1.Show()
+--- a/OOo.py
++++ b/OOo.py
+@@ -103,7 +103,7 @@
+ 				self.saveDoc()
+ 				self.finalize()
+ 			except bibOOo_IOError:
+-				url = wx.FileSelector('Save as...',default_extension='odt',wildcard="%s (*.odt)|*.odt|%s (*.sxw)|*.sxw|%s (*.*)|*.*"%(_("OpenDocument Text"),_("OpenOffice.org Text Document"),  _("All files")),flags=wx.SAVE|wx.OVERWRITE_PROMPT)
++				url = wx.FileSelector('Save as...',default_extension='odt',wildcard="%s (*.odt)|*.odt|%s (*.sxw)|*.sxw|%s (*.*)|*.*"%(_("OpenDocument Text"),_("OpenOffice.org Text Document"),  _("All files")),flags=wx.FD_SAVE|wx.FD_OVERWRITE_PROMPT)
+ 				if url == '':
+ 					return
+ 				else:
+--- a/BibFrame.py
++++ b/BibFrame.py
+@@ -971,7 +971,7 @@
+ 
+     def __getFile(self,question=_("Please choose the file encoding"),mode='r',enc='ascii'):
+         """Get file and encoding. Return open file or None"""
+-        dlg = wx.FileDialog(self,_("Choose a File to import"),style = wx.OPEN | wx.CHANGE_DIR)
++        dlg = wx.FileDialog(self,_("Choose a File to import"),style = wx.FD_OPEN | wx.FD_CHANGE_DIR)
+         try:
+             answer = dlg.ShowModal()
+             filename = dlg.GetPath()
+@@ -1048,7 +1048,7 @@
+ # --------------------------------- File Export --------------------------------------------
+     def __saveFile(self,question=_("Please choose the file encoding"),mode='r',enc='latin_1'):
+         """Get file and encoding. Return open file or None"""
+-        dlg = wx.FileDialog(self,_("Save as..."),style = wx.SAVE | wx.OVERWRITE_PROMPT | wx.CHANGE_DIR)
++        dlg = wx.FileDialog(self,_("Save as..."),style = wx.FD_SAVE | wx.FD_OVERWRITE_PROMPT | wx.FD_CHANGE_DIR)
+         try:
+             answer = dlg.ShowModal()
+             filename = dlg.GetPath()
+@@ -1124,7 +1124,7 @@
+ 
+     def __saveFileHTML(self,question=_("Choose the destination file"),mode='w'):
+         """Get file. Return open file or None"""
+-        dlg = wx.FileDialog(self,_("Save as..."),style = wx.SAVE | wx.OVERWRITE_PROMPT | wx.CHANGE_DIR)
++        dlg = wx.FileDialog(self,_("Save as..."),style = wx.FD_SAVE | wx.FD_OVERWRITE_PROMPT | wx.FD_CHANGE_DIR)
+         try:
+             answer = dlg.ShowModal()
+         finally:
+@@ -1176,7 +1176,7 @@
+         ret = wx.GetSingleChoiceIndex(_('What do you want to export?'),_('Export'),[_('Selection'),_('Current key'),_('All')])
+         if ret == -1: return
+         # get the file destination
+-        answer = wx.FileSelector(_("Choose the name of the SQLite database"), flags = wx.SAVE | wx.OVERWRITE_PROMPT | wx.CHANGE_DIR )
++        answer = wx.FileSelector(_("Choose the name of the SQLite database"), flags = wx.FD_SAVE | wx.FD_OVERWRITE_PROMPT | wx.FD_CHANGE_DIR )
+         if answer == '': return
+         # we create the database
+         try:
+@@ -1746,7 +1746,7 @@
+ 
+         arcstarttime=time.time()
+         archivename=time.strftime('bibusbackup_%y%m%d_%H%M%S.tar', time.localtime(arcstarttime))
+-        dlg = wx.FileDialog(self,_("Archive all user data into file ..."),style = wx.SAVE | wx.OVERWRITE_PROMPT | wx.CHANGE_DIR)
++        dlg = wx.FileDialog(self,_("Archive all user data into file ..."),style = wx.FD_SAVE | wx.FD_OVERWRITE_PROMPT | wx.FD_CHANGE_DIR)
+         dlg.SetDirectory(userDocsDir)
+         dlg.SetFilename(archivename)
+         dlg.SetWildcard("TAR archive (*.tar)|*.tar")        
+--- a/FirstStart/MySQL_Setup.py
++++ b/FirstStart/MySQL_Setup.py
+@@ -533,7 +533,7 @@
+ 
+ if __name__ == "__main__":
+     app = wx.PySimpleApp(0)
+-    wx.InitAllImageHandlers()
++    # no-op in wxPython2.8 and later: wx.InitAllImageHandlers()
+     MySQL_Setup = MySQL_Setup_Main(None, -1, "")
+     app.SetTopWindow(MySQL_Setup)
+     MySQL_Setup.Show()
+--- a/StyleEditor/FormatEditor.py
++++ b/StyleEditor/FormatEditor.py
+@@ -33,7 +33,7 @@
+ 
+ class FormatEditor(wx.Dialog):
+ 	def __init__(self, *args, **kwds):
+-		#kwds["style"] = wx.TAB_TRAVERSAL | wx.CAPTION | wx.MINIMIZE_BOX | wx.MAXIMIZE_BOX | wx.THICK_FRAME
++		#kwds["style"] = wx.TAB_TRAVERSAL | wx.CAPTION | wx.MINIMIZE_BOX | wx.MAXIMIZE_BOX | wx.RESIZE_BORDER
+ 		kwds["style"] = wx.DEFAULT_FRAME_STYLE
+ 		self.filename = kwds['filename']
+ 		del kwds['filename']
+@@ -130,7 +130,7 @@
+ 			wx.MessageBox(_("The style name is not correct, please avoid: '/' under linux; '\\' and ':' under Windows"),_("Style name"),style=wx.OK|wx.ICON_ERROR)
+ 
+ #	def SaveAs(self,evt):
+-#		self.filename = wx.FileSelector(_('Where to save the style file?'), flags = wx.SAVE | wx.OVERWRITE_PROMPT)
++#		self.filename = wx.FileSelector(_('Where to save the style file?'), flags = wx.FD_SAVE | wx.FD_OVERWRITE_PROMPT)
+ #		#print "%r"%self.filename
+ #		if self.filename:
+ #			self.Save(evt)
diff --git a/app-text/bibus/metadata.xml b/app-text/bibus/metadata.xml
new file mode 100644
index 000000000000..114579753777
--- /dev/null
+++ b/app-text/bibus/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">bibus-biblio</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/bibutils-4.12 b/app-text/bibutils-4.12
deleted file mode 100644
index e76fcb889bef..000000000000
--- a/app-text/bibutils-4.12
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=Interconverts between various bibliography formats using common XML intermediate
-EAPI=2
-HOMEPAGE=http://www.scripps.edu/~cdputnam/software/bibutils/
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://www.scripps.edu/~cdputnam/software/bibutils/bibutils_4.12_src.tgz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=09332045f960dbf970324ac8514aa864
diff --git a/app-text/bibutils/Manifest b/app-text/bibutils/Manifest
new file mode 100644
index 000000000000..7130e5022b88
--- /dev/null
+++ b/app-text/bibutils/Manifest
@@ -0,0 +1,3 @@
+DIST bibutils_4.12_src.tgz 447566 BLAKE2B 64d185963028f29f4efb64c63ee6ddb59961744d525d4dbaf28bdd1edb28ac8ea86529082995d11245c258895f27457c9d01594564a44caa837b0ba76052b969 SHA512 04329ecb685bf4d5314c6d3a2d5bb21e67112d73bcb49f5a7808a4082f32a9aecb40add4ec4b5320be35f49cd8e101dc1e35409e7c6cad8c39238d2122f91dd0
+EBUILD bibutils-4.12.ebuild 1005 BLAKE2B 955eda004f2aa8378f379079bb0f5d2cfa64ab97bc95c6368ed432855b22152c4cb48e3f92604e17abb1ebd3ba560f2af542a3c24ff77069f5b56edb7a90be03 SHA512 fa3c470b226c04c7b3d4d1311ba44ee0eca3d70d34efcb4d69a11f1a6da85e94bf352fde88a76400a4cfbb3133b761bb71c4c45d9113775efa0e538ea390a61e
+MISC metadata.xml 249 BLAKE2B 03207049d5e7c62319639b2c37769d9d8c0d9cbf1e44fbc6cab9ea006e60bff3526193fea60902a0e64a362b02463104969700074602e31d8fb8f86a042d1ed8 SHA512 29a9c1817fd4299246d5fa995b73b9f1996b112b70f468139cf9cd8f07077d831e0788d3b93aaba67bb38dce5850830c27543fccbddbac02b0da4ff899def519
diff --git a/app-text/bibutils/bibutils-4.12.ebuild b/app-text/bibutils/bibutils-4.12.ebuild
new file mode 100644
index 000000000000..e81090fd06fe
--- /dev/null
+++ b/app-text/bibutils/bibutils-4.12.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=2
+inherit toolchain-funcs
+
+MY_P="${PN}_${PV}"
+DESCRIPTION="Interconverts between various bibliography formats using common XML intermediate"
+HOMEPAGE="http://www.scripps.edu/~cdputnam/software/bibutils/"
+SRC_URI="http://www.scripps.edu/~cdputnam/software/bibutils/${MY_P}_src.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	# The custom configure script sucks, so we'll just do its
+	# job ourselves
+	rm -f Makefile configure || die "Failed to purge old Makefile"
+	sed \
+		-e "s:REPLACE_CC:CC=\"$(tc-getCC) ${CFLAGS}\":g" \
+		-e "s:REPLACE_RANLIB:RANLIB=\"$(tc-getRANLIB)\":g" \
+		-e "s:REPLACE_INSTALLDIR:\"${D}/usr/bin\":g" \
+		-e 's:REPLACE_POSTFIX::g' \
+		-e 's:make:$(MAKE):g' \
+		Makefile_start > Makefile \
+		|| die "Failed to set up Makefile"
+}
+
+src_install() {
+	dodir /usr/bin
+	emake install || die
+	dodoc ChangeLog || die
+}
diff --git a/app-text/bibutils/metadata.xml b/app-text/bibutils/metadata.xml
new file mode 100644
index 000000000000..0c6991d7902b
--- /dev/null
+++ b/app-text/bibutils/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>sci@gentoo.org</email>
+	<name>Gentoo Science Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-text/binfind-0.0.3 b/app-text/binfind-0.0.3
deleted file mode 100644
index 5d6122cf19a2..000000000000
--- a/app-text/binfind-0.0.3
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=binfind searches files for a byte sequence specified on the command line
-EAPI=0
-HOMEPAGE=http://www.lith.at/binfind
-KEYWORDS=~x86 ~amd64
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://www.lith.at/binfind/binfind-0.0.3.tar.gz
-_md5_=5841125651d3fa8925f69f424b6c2ab5
diff --git a/app-text/binfind/Manifest b/app-text/binfind/Manifest
new file mode 100644
index 000000000000..1518270c5250
--- /dev/null
+++ b/app-text/binfind/Manifest
@@ -0,0 +1,3 @@
+DIST binfind-0.0.3.tar.gz 91222 BLAKE2B 87ab9faa611064b87771d5ddd799b792e27af457e5a768b4ee7c0f3976c41ed8692673a753b95450124ad0c3c8e5e473081961482b856dfb8e722323915d04d7 SHA512 b3a8b72669f701ce54fb3d1c2331262cfc7f396239d14741d3a106c999ef58739a7f33de87da427983ffb641baa7fae4857aa6aab2e1c0748a61d8b913dca3f1
+EBUILD binfind-0.0.3.ebuild 453 BLAKE2B 5147cc0ea8ca29b088441fbfe748b335dd480b044605fcdcfe83a364a2a3887c68d08ad22a1eca755356814e3d8dd89e940f3b2082807d0add66e22634d1594e SHA512 e1a3e7adfb8834cec7072e59ad120da632a15ea200d67f6a5f408762d1dc9c5abaffb336919d7bdf8c5b1f2df2acd914b55b62603ba0e1b4b6d12605fb0899cb
+MISC metadata.xml 216 BLAKE2B 20531789dc11e43feee7ec315a0c1c7249fdf73764e29cb7d6db439826e9ff72f24a5cdb8eb7f1ab99bbb41fb6e4226874a1d1fa4185de52598602bb3b0479a3 SHA512 e881b59fe49746eb25ad66c258b41aba501e4eb563129093a3898ea970a20506e7898f7c355cfcf99605234962bf2c77c1309c258b9a2b84ee4302ccb71c9dbd
diff --git a/app-text/binfind/binfind-0.0.3.ebuild b/app-text/binfind/binfind-0.0.3.ebuild
new file mode 100644
index 000000000000..4f084dc105ab
--- /dev/null
+++ b/app-text/binfind/binfind-0.0.3.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+DESCRIPTION="binfind searches files for a byte sequence specified on the command line"
+HOMEPAGE="http://www.lith.at/binfind"
+SRC_URI="http://www.lith.at/binfind/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE=""
+DEPEND=""
+RDEPEND=""
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS NEWS README ChangeLog
+}
diff --git a/app-text/binfind/metadata.xml b/app-text/binfind/metadata.xml
new file mode 100644
index 000000000000..79d462e85571
--- /dev/null
+++ b/app-text/binfind/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+  <email>robbat2@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/app-text/blahtexml-0.9 b/app-text/blahtexml-0.9
deleted file mode 100644
index 0b34b0d0182d..000000000000
--- a/app-text/blahtexml-0.9
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=dev-libs/xerces-c virtual/pkgconfig doc? ( app-text/texlive-core dev-libs/libxslt dev-tex/latex2html )
-DESCRIPTION=TeX-to-MathML converter
-EAPI=5
-HOMEPAGE=http://gva.noekeon.org/blahtexml
-IUSE=doc
-KEYWORDS=amd64 arm ~arm64 ~hppa ppc ppc64 x86
-LICENSE=BSD CC-BY-3.0 ZLIB
-RDEPEND=dev-libs/xerces-c
-SLOT=0
-SRC_URI=http://gva.noekeon.org/blahtexml/blahtexml-0.9-src.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9979fd8d5c5ca0cf09adba8a509eb762
diff --git a/app-text/blahtexml/Manifest b/app-text/blahtexml/Manifest
new file mode 100644
index 000000000000..672333f71600
--- /dev/null
+++ b/app-text/blahtexml/Manifest
@@ -0,0 +1,6 @@
+AUX blahtexml-0.9-Makefile.patch 1811 BLAKE2B c84ab5b3781413ff04e771849514ec244354a39c65d3568d698f48bd1b77d13374664e72007d0a8ab9cf69c10398d01f7d8c3cf63a7759a4bc66b566836deab1 SHA512 e27fc386b4392d33fe6b78379d364d3b17586c12843acf18fa16244169d151f8e750804289114c24f179fca6b0abe94f4eb622089af90c538dd7e9f3182d8d18
+AUX blahtexml-0.9-gcc-4.7.patch 672 BLAKE2B 37e3ed661675e36d833f9dcdc535de3ba62ba57fa283f39af7981659d8739798a6d76adf831c042f24813cdcb0f1495f978e5fd822b11a1064cb22e3d7b0cbb4 SHA512 d683ea1113f4aaefb692b8a7b0cb7365673c835fa3c85e229243d0c96ee2b2ff52026dec96d1670cc0e42f1fa9124dfd547445e6e5b0a85f462e881f177d2ad4
+AUX blahtexml.1 3094 BLAKE2B a1b1bd3d1a6952529685b8be5c22f12a1d6168b7d37eea958fd295a593e17ff363c966e46bf26f8f28a2f424a34344c7673e96d976088b9726dfd1717042edb3 SHA512 0f114e4cfb806fe6d120a738118ccd0817d898434a9d878cd20e5ea59d804420f07b90b9763a387e5b29251ca4acf9b1d7b7b845f9f86036d9dc729775155a7d
+DIST blahtexml-0.9-src.tar.gz 168564 BLAKE2B 941f241adf6e423cd0eff4a13b11313d6cad143badb6d862be01bd603f84aa04f224ae2d84abfef05341c66e410ba18bf39d99f636a8a33512e1da9739770a19 SHA512 5a5ddd50c0b3a25954135c44de0ac3a3d992e3e9dd691a552512415c385a39011595683877cdf98aee77d6ef2f9dae750214798ec2af69b8de089d0aec64b042
+EBUILD blahtexml-0.9.ebuild 793 BLAKE2B 1a17181c2e5dc6c8f73e09fbe7b4d4a8b5d7b461965cd73a1406d5d93cbbd7a17b2b0a4cbbb34b1ed9dce4f5ad5d5dc9dfa563f7c289fa4ecf8bdffea2a94bd5 SHA512 a3077051e5cf0638189d51a1bc43711fd7433d17311383f4fbd5d2805a9cb975becaf2e3855d119e588d3fda0a72f49a47f322dbeb3e084cc5c533a0127dea7b
+MISC metadata.xml 168 BLAKE2B 5f277cc66dbafa7e7985433f84b0f9a656a176a9b901862e2a8353ca2d4526797dded9696e835b9696c7f72324e94959cfb5a22de49a7e3e61604153886037ab SHA512 00eec08786156434460f5ed77b647579546cf1a86341a4f2c9c9c84326468c2c21dc5101c4277103b19266bb6f788823f4ddf3b9d044da26326d79bf2ac9a274
diff --git a/app-text/blahtexml/blahtexml-0.9.ebuild b/app-text/blahtexml/blahtexml-0.9.ebuild
new file mode 100644
index 000000000000..ee195e68bed9
--- /dev/null
+++ b/app-text/blahtexml/blahtexml-0.9.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="TeX-to-MathML converter"
+HOMEPAGE="http://gva.noekeon.org/blahtexml"
+SRC_URI="http://gva.noekeon.org/${PN}/${P}-src.tar.gz"
+
+LICENSE="BSD CC-BY-3.0 ZLIB"
+SLOT="0"
+KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 x86"
+IUSE="doc"
+
+RDEPEND="dev-libs/xerces-c"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? (
+		app-text/texlive-core
+		dev-libs/libxslt
+		dev-tex/latex2html )"
+
+src_prepare() {
+	tc-export CC CXX
+	epatch "${FILESDIR}"/${P}-{Makefile,gcc-4.7}.patch
+}
+
+src_compile() {
+	emake blahtex{,ml}-linux
+	use doc && emake doc
+}
+
+src_install() {
+	dobin blahtex ${PN}
+	doman "${FILESDIR}"/${PN}.1
+	use doc && dodoc Documentation/manual.pdf
+}
diff --git a/app-text/blahtexml/files/blahtexml-0.9-Makefile.patch b/app-text/blahtexml/files/blahtexml-0.9-Makefile.patch
new file mode 100644
index 000000000000..f5f01eac71aa
--- /dev/null
+++ b/app-text/blahtexml/files/blahtexml-0.9-Makefile.patch
@@ -0,0 +1,55 @@
+Use pkg-config for xerces-c
+Respect CXX and CC
+Replace CFLAGS with CXXFLAGS where needed
+Add LDFLAGS
+
+--- a/makefile
++++ b/makefile
+@@ -93,35 +93,40 @@
+ 
+ $(BINDIR_XMLIN)/InputSymbolTranslation.o: InputSymbolTranslation.cpp InputSymbolTranslation.inc
+ 
+-CFLAGS = -O2
++PKG_CONFIG ?= pkg-config
++CFLAGS ?= -O2
+ 
+ VPATH = Source:Source/BlahtexCore:Source/BlahtexXMLin
+ 
+ INCLUDES=-I. -ISource -ISource/BlahtexCore -ISource/BlahtexXMLin
+ 
++CXXFLAGS += $(shell $(PKG_CONFIG) --cflags xerces-c)
++
++XERCES_LIB = $(shell $(PKG_CONFIG) --libs xerces-c)
++
+ $(BINDIR)/%.o:%.cpp
+-	$(CXX) $(INCLUDES) $(CFLAGS) -c $< -o $@
++	$(CXX) $(INCLUDES) $(CXXFLAGS) -c $< -o $@
+ 
+ $(BINDIR)/%.o:%.c
+ 	$(CC) $(INCLUDES) $(CFLAGS) -c $< -o $@
+ 
+ $(BINDIR_XMLIN)/%.o:%.cpp
+-	$(CXX) $(INCLUDES) $(CFLAGS) -DBLAHTEXML_USING_XERCES -c $< -o $@
++	$(CXX) $(INCLUDES) $(CXXFLAGS) -DBLAHTEXML_USING_XERCES -c $< -o $@
+ 
+ $(BINDIR_XMLIN)/%.o:%.c
+ 	$(CC) $(INCLUDES) $(CFLAGS) -DBLAHTEXML_USING_XERCES -c $< -o $@
+ 
+ blahtex-linux:  $(BINDIR) $(OBJECTS)  $(HEADERS)
+-	$(CXX) $(CFLAGS) -o blahtex $(OBJECTS)
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o blahtex $(OBJECTS) $(LIBS)
+ 
+ blahtex-mac: $(BINDIR) $(OBJECTS)  $(HEADERS)
+-	$(CXX) $(CFLAGS) -o blahtex -liconv $(OBJECTS)
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o blahtex -liconv $(OBJECTS) $(LIBS)
+ 
+ blahtexml-linux:  $(BINDIR_XMLIN) $(OBJECTS_XMLIN)  $(HEADERS_XMLIN)
+-	$(CXX) $(CFLAGS) -o blahtexml $(OBJECTS_XMLIN) -lxerces-c
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o blahtexml $(OBJECTS_XMLIN) $(LIBS) $(XERCES_LIB)
+ 
+ blahtexml-mac: $(BINDIR_XMLIN) $(OBJECTS_XMLIN)  $(HEADERS_XMLIN)
+-	$(CXX) $(CFLAGS) -o blahtexml -liconv $(OBJECTS_XMLIN) -lxerces-c
++	$(CXX) $(CXXFLAGS) $(LDFLAGS) -o blahtexml -liconv $(OBJECTS_XMLIN) $(LIBS) $(XERCES_LIB)
+ 
+ clean:
+ 	rm -f blahtex $(OBJECTS) blahtexml $(OBJECTS_XMLIN)
diff --git a/app-text/blahtexml/files/blahtexml-0.9-gcc-4.7.patch b/app-text/blahtexml/files/blahtexml-0.9-gcc-4.7.patch
new file mode 100644
index 000000000000..c570e1de679b
--- /dev/null
+++ b/app-text/blahtexml/files/blahtexml-0.9-gcc-4.7.patch
@@ -0,0 +1,24 @@
+Description: Fix FTBFS with gcc 4.7 by fixing missing <unistd.h> includes.
+Author: Cyril Brulebois <kibi@debian.org>
+Bug-Debian: http://bugs.debian.org/667116
+
+--- blahtexml-0.9.orig/Source/main.cpp
++++ blahtexml-0.9/Source/main.cpp
+@@ -24,6 +24,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIG
+ #include <stdlib.h>
+ #include <sstream>
+ #include <stdexcept>
++#include <unistd.h>
+ 
+ using namespace std;
+ using namespace blahtex;
+--- blahtexml-0.9.orig/Source/mainPng.cpp
++++ blahtexml-0.9/Source/mainPng.cpp
+@@ -27,6 +27,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIG
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <sstream>
++#include <unistd.h>
+ 
+ 
+ using namespace std;
diff --git a/app-text/blahtexml/files/blahtexml.1 b/app-text/blahtexml/files/blahtexml.1
new file mode 100644
index 000000000000..a82c8491a770
--- /dev/null
+++ b/app-text/blahtexml/files/blahtexml.1
@@ -0,0 +1,90 @@
+.\"                                      Hey, EMACS: -*- nroff -*-
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.TH BLAHTEXML 1 "March 17, 2010"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh        disable hyphenation
+.\" .hy        enable hyphenation
+.\" .ad l      left justify
+.\" .ad b      justify to both left and right margins
+.\" .nf        disable filling
+.\" .fi        enable filling
+.\" .br        insert line break
+.\" .sp <n>    insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+blahtexml \- Converts TeX equations into MathML
+.SH SYNOPSIS
+.B blahtexml
+.RI [ options ] " files" ...
+.SH DESCRIPTION
+This manual page documents briefly the
+.B blahtexml
+command.
+.PP
+.\" TeX users may be more comfortable with the \fB<whatever>\fP and
+.\" \fI<whatever>\fP escape sequences to invode bold face and italics,
+.\" respectively.
+\fBblahtexml\fP converts an equation given in a syntax close to TeX into
+MathML. Blahtexml is a simple extension of blahtex. In addition to
+the functionality of blahtex, blahtexml has XML processing in mind
+and is able to process a whole XML document into another XML
+document. Instead of converting only one formula at a time, blahtexml
+can convert all the formulas of the given XML file into MathML.
+.SH OPTIONS
+These programs follow the usual GNU command line syntax, with long
+options starting with two dashes (`-').
+A summary of options is included below.
+For a complete description, see the online documentation.
+.TP
+.B \-\-help
+Show summary of options.
+.TP
+.B \-\-texvc-compatible-commands
+Enables use of commands that are specific to texvc, but that are not
+standard TeX/LaTeX/AMS-LaTeX commands.
+.TP
+.B \-\-print-error-messages
+This will print out a list of all error IDs and corresponding messages
+that blahtex can possibly emit inside an <error> block.
+.SH MATHML OPTIONS
+These options control the MathML output of the blahtexml program.
+
+.TP
+.B \-\-mathml
+Enables MathML output.
+.TP
+.B \-\-xmlin
+This allows one to embed TeX equations in an existing MathML code, using
+a special notation. The equations are given as attributes (inline or block)
+in the http://gva.noekeon.org/blahtexml namespace. Whenever blahtexml meets
+such an equation, it expands it into the equivalent MathML code.
+
+For more information check
+.RS
+http://gva.noekeon.org/blahtexml/how_to_use.html
+.RE
+.RS
+or the blahtexml manual.
+.RE
+.TP
+.B \-\-annotate-TeX
+Produces TeX annotations in the MathML output.
+.TP
+.B \-\-annotate-PNG
+Produces PNG files and annotates the MathML output with the PNG file name.
+.SH SEE ALSO
+The program is documented fully by the
+online manual available at:
+http://gva.noekeon.org/blahtexml
+.SH AUTHOR
+blahtexml was written by Gilles Van Assche.
+.br
+blahtex (whose superset is blahtexml) was written by David Harvey.
+.PP
+This manual page was written by Abhishek Dasgupta <abhidg@gmail.com>,
+for the Debian project (but may be used by others).
+
diff --git a/app-text/blahtexml/metadata.xml b/app-text/blahtexml/metadata.xml
new file mode 100644
index 000000000000..1b2becffa26c
--- /dev/null
+++ b/app-text/blahtexml/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/app-text/blogc-0.13.9 b/app-text/blogc-0.13.9
deleted file mode 100644
index d04a6113ad36..000000000000
--- a/app-text/blogc-0.13.9
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure prepare
-DEPEND=virtual/pkgconfig test? ( git? ( dev-vcs/git ) dev-util/cmocka )
-DESCRIPTION=A blog compiler
-EAPI=6
-HOMEPAGE=https://blogc.rgm.io/
-IUSE=git httpd make test
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=git? ( dev-vcs/git ) !dev-vcs/blogc-git-receiver !www-servers/blogc-runserver
-SLOT=0
-SRC_URI=https://github.com/blogc/blogc/releases/download/v0.13.9/blogc-0.13.9.tar.xz
-_md5_=d29b445bf33556bb45f8817f5e617c58
diff --git a/app-text/blogc-9999 b/app-text/blogc-9999
deleted file mode 100644
index 7b84b8b7708d..000000000000
--- a/app-text/blogc-9999
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure prepare unpack
-DEPEND=app-text/ronn virtual/pkgconfig test? ( git? ( dev-vcs/git ) dev-util/cmocka ) >=dev-vcs/git-1.8.2.1[curl] >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A blog compiler
-EAPI=6
-HOMEPAGE=https://blogc.rgm.io/
-IUSE=git httpd make test
-LICENSE=BSD
-RDEPEND=git? ( dev-vcs/git ) !dev-vcs/blogc-git-receiver !www-servers/blogc-runserver
-SLOT=0
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	git-r3	8f6de46b0aa318aea0e8cac62ece098b	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=15539d2be1699b5e2eeead4a7f9f83d4
diff --git a/app-text/blogc/Manifest b/app-text/blogc/Manifest
new file mode 100644
index 000000000000..a0b373948ee1
--- /dev/null
+++ b/app-text/blogc/Manifest
@@ -0,0 +1,4 @@
+DIST blogc-0.13.9.tar.xz 319084 BLAKE2B 2e23e85d657e2905a94f71cebae31868a241783d44dc4da76c3bda02cf7c96c0516a834399e0b5bb66716c959acc32dac9d1374388a4e597a03dff9e8e11fef3 SHA512 9160884fd0a4088abacb9f4f3168c80a5a8b01d81a13606f3abf8c0f54b2bf0459f1c3833ab953a072eb87b8b8d8fc31467036999e85e2448fecbc36f97bb1db
+EBUILD blogc-0.13.9.ebuild 1120 BLAKE2B 4d5a2dba5c10f3bd5015842da3f9a24b41ffa71343f783371a9c50aa0c32bc5e96b0becb56364c09d163d0e64246688d45676fb333de9ab8718c5fe8869bb001 SHA512 80e734b9155ac024c78b58e68216d7f591507ca5aa2cd264e69f0b2a71837943c3ec6b7acd00e5d5b4b08a6c64bc370bf926730a8b8ed7ffe8d1ce3ab0865e36
+EBUILD blogc-9999.ebuild 1120 BLAKE2B 234392dc7c1e42c3bcd2c3ac4b1a648ee9e4fa6fc486cfcc60ef0af1c0cfb97ea68bc2b2ce3da820bdd88f05ef5993b7dc6589e52137d8d1e7cbce19d9c0a064 SHA512 ed4c808f2cfa1435972a53ae17f76a9e3423943713759cb7ad7378e6417a3912dbb16e0964d963dac8a476be37c90a42d8f875128101ee806f12a8ab11a519d9
+MISC metadata.xml 785 BLAKE2B 90817e117dbf1f0e60d655206ad0cc3f3cecf2b97a16ba43fdf84ae0f621ee6296af2ab6a17bb205d82b1d107be3f62b75d9c740aeab0267b02947a4bcc50aea SHA512 31230bdb8113bb73662328e0e657e710cd33e65f126d638f0cefdacbe97525643604f48ce3da27f80b8163d129092c7df7eee265cd6d6194cd0181b138230206
diff --git a/app-text/blogc/blogc-0.13.9.ebuild b/app-text/blogc/blogc-0.13.9.ebuild
new file mode 100644
index 000000000000..29595c41810e
--- /dev/null
+++ b/app-text/blogc/blogc-0.13.9.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/blogc/blogc.git"
+	inherit git-r3 autotools
+fi
+
+DESCRIPTION="A blog compiler"
+HOMEPAGE="https://blogc.rgm.io/"
+
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz"
+KEYWORDS="~amd64 ~x86"
+if [[ ${PV} = *9999* ]]; then
+	SRC_URI=""
+	KEYWORDS=""
+	DEPEND="app-text/ronn"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="git httpd make test"
+
+RDEPEND="
+	git? (
+		dev-vcs/git )
+	!dev-vcs/blogc-git-receiver
+	!www-servers/blogc-runserver"
+
+DEPEND="${DEPEND}
+	virtual/pkgconfig
+	test? (
+		git? ( dev-vcs/git )
+		dev-util/cmocka )"
+
+src_prepare() {
+	[[ ${PV} = *9999* ]] && eautoreconf
+	eapply_user
+	default
+}
+
+src_configure() {
+	local myconf=""
+	if [[ ${PV} = *9999* ]]; then
+		myconf+="--enable-ronn"
+	else
+		myconf+="--disable-ronn"
+	fi
+	econf \
+		$(use_enable test tests) \
+		$(use_enable git git-receiver) \
+		$(use_enable make make) \
+		$(use_enable httpd runserver) \
+		--disable-make-embedded \
+		--disable-valgrind \
+		${myconf}
+}
diff --git a/app-text/blogc/blogc-9999.ebuild b/app-text/blogc/blogc-9999.ebuild
new file mode 100644
index 000000000000..eab99becb995
--- /dev/null
+++ b/app-text/blogc/blogc-9999.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/blogc/blogc.git"
+	inherit git-r3 autotools
+fi
+
+DESCRIPTION="A blog compiler"
+HOMEPAGE="https://blogc.rgm.io/"
+
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz"
+KEYWORDS="~amd64 ~x86"
+if [[ ${PV} = *9999* ]]; then
+	SRC_URI=""
+	KEYWORDS=""
+	DEPEND="app-text/ronn"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="git httpd make test"
+
+RDEPEND="
+	git? (
+		dev-vcs/git )
+	!dev-vcs/blogc-git-receiver
+	!www-servers/blogc-runserver"
+
+DEPEND="${DEPEND}
+	virtual/pkgconfig
+	test? (
+		git? ( dev-vcs/git )
+		dev-util/cmocka )"
+
+src_prepare() {
+	[[ ${PV} = *9999* ]] && eautoreconf
+	eapply_user
+	default
+}
+
+src_configure() {
+	local myconf=""
+	if [[ ${PV} = *9999* ]]; then
+		myconf+="--enable-ronn"
+	else
+		myconf+="--disable-ronn"
+	fi
+	econf \
+		$(use_enable test tests) \
+		$(use_enable git git-receiver) \
+		$(use_enable make make) \
+		$(use_enable httpd runserver) \
+		--disable-make-embedded \
+		--disable-valgrind \
+		${myconf}
+}
diff --git a/app-text/blogc/metadata.xml b/app-text/blogc/metadata.xml
new file mode 100644
index 000000000000..6a921452e508
--- /dev/null
+++ b/app-text/blogc/metadata.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>rafaelmartins@gentoo.org</email>
+		<name>Rafael G. Martins</name>
+	</maintainer>
+	<longdescription lang="en">
+		blogc(1) is a blog compiler. It converts source files and templates
+		into blog/website resources.
+	</longdescription>
+	<upstream>
+		<maintainer status="active">
+			<email>rafael@rafaelmartins.eng.br</email>
+			<name>Rafael G. Martins</name>
+		</maintainer>
+		<remote-id type="github">blogc/blogc</remote-id>
+	</upstream>
+	<use>
+		<flag name="git">Build blogc-git-receiver tool</flag>
+		<flag name="make">Build blogc-make tool</flag>
+		<flag name="httpd">Build blogc-runserver tool</flag>
+	</use>
+</pkgmetadata>
diff --git a/app-text/bogosort-0.4.2-r1 b/app-text/bogosort-0.4.2-r1
deleted file mode 100644
index af630883bf06..000000000000
--- a/app-text/bogosort-0.4.2-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DESCRIPTION=A file sorting program which uses the bogosort algorithm
-EAPI=5
-HOMEPAGE=http://www.lysator.liu.se/~qha/bogosort/
-KEYWORDS=amd64 hppa ~mips ppc sparc x86 ~x86-linux ~ppc-macos
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=ftp://ulrik.haugen.se/pub/unix/bogosort/bogosort-0.4.2.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5a760619ce66560c9a53def8cdf9b689
diff --git a/app-text/bogosort/Manifest b/app-text/bogosort/Manifest
new file mode 100644
index 000000000000..607b0c22c33f
--- /dev/null
+++ b/app-text/bogosort/Manifest
@@ -0,0 +1,5 @@
+AUX bogosort-0.4.2-glibc-2.10.patch 1479 BLAKE2B 6d5a6e9ff7f43a5275e8db8d1478a06ab69863105ffdfb3ed821bdbb7b901f2b0ed9b9158ee0795ca4e1dc01b01c5a3fdaedf5bd4996d3d9bc5ec4a89492e6eb SHA512 742b473df18b8eee876857fc3fa14bacc95bce4e14d083deb066d4451385437cd040cf40b6c572762c047b1aaa3e2ee973f2d880c5915993bf6a4ba130a776e4
+AUX xmalloc.patch 395 BLAKE2B 0ec83824e8ac740512c3c241cf2df352ca5b5d05a38507288fe5f96512eebb94d5532af0cfb6e05fcfcac9c10c96091584b917966629268e9921d964e8adb0c5 SHA512 c1479f342d71e1c53a2b038bc7bf858292c6585b8360b41c6006a4ef0efbafc3260cf8523efedee945c084247851186dda3450ab0533465c33176b038a8c0243
+DIST bogosort-0.4.2.tar.gz 161628 BLAKE2B 92abbb809747e3fdfd2a6e33f7f753f1ddccd4ecd9883f0a02fc843f8f680e0a5e6e6b65c3943708ed074a944e5187bb889297365ae0dd34292215b056bd46fc SHA512 2d2f7be36ec08aa78323cbdc5f1030297706c364d6fc82554065cf737295d11c90dd6061323f2732b63c70401d710b2018075bff6d1e6ab0078069b405ea62e9
+EBUILD bogosort-0.4.2-r1.ebuild 702 BLAKE2B d70ee1662cb0528e340837d4a95a5165edfe4387d92ce5d9512f16335ea8651718087b7c9960986f5f188dd6c28004ef10e2fc69989531b492e8a47ad77313d1 SHA512 7baec5a2de60f5bbef8689c12d6fdc54a3fd40dee3b64877af819422f986c50fb706c52906486a055af2ef16650e908a3c5b960181dba14b1ee14955d5c7a769
+MISC metadata.xml 500 BLAKE2B aeef2d2944fbcde35a34db35b8461e3fb22d5da60e0e6fee48cecbcd45991d44aa4511e0907587369c2a7c7bf2c735260ed516b5b9292e1fb60bd7a2e9c3859d SHA512 4975f3dcbf7a97db8c64835a83f45a0be5d3c34aaa9fe9f8b2e2e8bd5aaf102fe35a2f4dc609bbcd115ad08d86707818033c7b7759c17a3f233417af67604edb
diff --git a/app-text/bogosort/bogosort-0.4.2-r1.ebuild b/app-text/bogosort/bogosort-0.4.2-r1.ebuild
new file mode 100644
index 000000000000..5eff84f8ed58
--- /dev/null
+++ b/app-text/bogosort/bogosort-0.4.2-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A file sorting program which uses the bogosort algorithm"
+HOMEPAGE="http://www.lysator.liu.se/~qha/bogosort/"
+SRC_URI="ftp://ulrik.haugen.se/pub/unix/bogosort/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 hppa ~mips ppc sparc x86 ~x86-linux ~ppc-macos"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/xmalloc.patch \
+		"${FILESDIR}"/${P}-glibc-2.10.patch
+}
+
+src_configure() {
+	tc-export CC
+	econf || die
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die
+	dodoc README NEWS ChangeLog AUTHORS || die
+}
diff --git a/app-text/bogosort/files/bogosort-0.4.2-glibc-2.10.patch b/app-text/bogosort/files/bogosort-0.4.2-glibc-2.10.patch
new file mode 100644
index 000000000000..ac54c8b61b05
--- /dev/null
+++ b/app-text/bogosort/files/bogosort-0.4.2-glibc-2.10.patch
@@ -0,0 +1,41 @@
+diff -ur bogosort-0.4.2.orig/getlines.c bogosort-0.4.2/getlines.c
+--- bogosort-0.4.2.orig/getlines.c	2002-05-04 23:22:22.000000000 +0300
++++ bogosort-0.4.2/getlines.c	2009-08-06 14:32:22.000000000 +0300
+@@ -49,7 +49,7 @@
+     char **ss = NULL;
+ 
+     /* read all lines available */
+-    while ((s = getline(stream)) != NULL) {
++    while ((s = get_line(stream)) != NULL) {
+ 	if (numlines == allocated)		/* make more room if needed */
+ 	    ss = (char **)xrealloc(ss,
+ 		    (allocated += LINESTEP) * sizeof (char *));
+@@ -81,7 +81,7 @@
+     allocated = numlines + 1;	/* this is a lie, but it's close enough */
+ 
+     /* read all lines available */
+-    while ((s = getline(stream)) != NULL) {
++    while ((s = get_line(stream)) != NULL) {
+ 	if (numlines == allocated)		/* make more room if needed */
+ 	    ss = (char **)xrealloc(ss,
+ 		    (allocated += LINESTEP) * sizeof (char *));
+@@ -100,7 +100,7 @@
+  * line in stream, return NULL on EOF
+  */
+ char *
+-getline(FILE *stream)
++get_line(FILE *stream)
+ {
+     int c, numchars = 0, allocated = 0;
+     char *s = NULL;
+diff -ur bogosort-0.4.2.orig/getlines.h bogosort-0.4.2/getlines.h
+--- bogosort-0.4.2.orig/getlines.h	2002-03-16 00:04:38.000000000 +0200
++++ bogosort-0.4.2/getlines.h	2009-08-06 14:32:48.000000000 +0300
+@@ -39,6 +39,6 @@
+  * getline: return a pointer to a newly allocated string containing the next
+  * line in stream
+  */
+-char *getline(FILE *stream);
++char *get_line(FILE *stream);
+ 
+ #endif /* GETLINES_H */
diff --git a/app-text/bogosort/files/xmalloc.patch b/app-text/bogosort/files/xmalloc.patch
new file mode 100644
index 000000000000..41545ca34ba8
--- /dev/null
+++ b/app-text/bogosort/files/xmalloc.patch
@@ -0,0 +1,15 @@
+--- xmalloc.c.orig	2004-12-15 23:44:16.880786468 +0100
++++ xmalloc.c	2004-12-15 23:44:21.846546805 +0100
+@@ -68,12 +68,6 @@
+    The caller may set it to some other value.  */
+ int xmalloc_exit_failure = EXIT_FAILURE;
+ 
+-#if __STDC__ && (HAVE_VPRINTF || HAVE_DOPRNT)
+-void error (int, int, const char *, ...);
+-#else
+-void error ();
+-#endif
+-
+ static VOID *
+ fixup_null_alloc (n)
+      size_t n;
diff --git a/app-text/bogosort/metadata.xml b/app-text/bogosort/metadata.xml
new file mode 100644
index 000000000000..46dbedede5f6
--- /dev/null
+++ b/app-text/bogosort/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>shell-tools@gentoo.org</email>
+		<name>Gentoo Shell Tools Project</name>
+	</maintainer>
+	<longdescription lang="en">
+		The bogosort will sort a file in a similar way to sort(1), but using
+		the bogosort algorithm rather than the conventional qsort. The tool
+		can also randomise the lines in its input.
+	</longdescription>
+</pkgmetadata>
diff --git a/app-text/build-docbook-catalog-1.21 b/app-text/build-docbook-catalog-1.21
deleted file mode 100644
index fa0a211bba45..000000000000
--- a/app-text/build-docbook-catalog-1.21
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=postinst prepare setup
-DESCRIPTION=DocBook XML catalog auto-updater
-EAPI=5
-HOMEPAGE=https://sources.gentoo.org/gentoo-src/build-docbook-catalog/
-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
-LICENSE=GPL-2
-RDEPEND=|| ( sys-apps/util-linux app-misc/getopt ) !<app-text/docbook-xsl-stylesheets-1.73.1 dev-libs/libxml2
-SLOT=0
-SRC_URI=mirror://gentoo/build-docbook-catalog-1.21.tar.xz https://dev.gentoo.org/~haubi/distfiles/build-docbook-catalog-1.21.tar.xz
-_md5_=0977f347bd12ef72c76b2440e44b7bed
diff --git a/app-text/build-docbook-catalog/Manifest b/app-text/build-docbook-catalog/Manifest
new file mode 100644
index 000000000000..d7d10571e22b
--- /dev/null
+++ b/app-text/build-docbook-catalog/Manifest
@@ -0,0 +1,3 @@
+DIST build-docbook-catalog-1.21.tar.xz 4620 BLAKE2B ed4aa645a5bb8e168c291c05891a2359114c9148a81588d93542528a0c74828a1824dc98a14468e8ba65525edf5aae8c936f29190d54063064cd54e2af8dbc3c SHA512 0becc1bae100101b072c62bee844157151336aebc39a046030c8b7b501e13f1b3552097b244ac51339abd2e724304f4fe728861b7d5f070c26973998936861bc
+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
new file mode 100644
index 000000000000..7b232a82be1c
--- /dev/null
+++ b/app-text/build-docbook-catalog/build-docbook-catalog-1.21.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="DocBook XML catalog auto-updater"
+HOMEPAGE="https://sources.gentoo.org/gentoo-src/build-docbook-catalog/"
+SRC_URI="mirror://gentoo/${P}.tar.xz
+	https://dev.gentoo.org/~haubi/distfiles/${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"
+IUSE=""
+
+RDEPEND="|| ( sys-apps/util-linux app-misc/getopt )
+	!<app-text/docbook-xsl-stylesheets-1.73.1
+	dev-libs/libxml2"
+DEPEND=""
+
+pkg_setup() {
+	# export for bug #490754
+	export MAKEOPTS+=" EPREFIX=${EPREFIX}"
+}
+
+src_prepare() {
+	sed -i -e "/^EPREFIX=/s:=.*:='${EPREFIX}':" build-docbook-catalog || die
+	has_version sys-apps/util-linux || sed -i -e '/^GETOPT=/s/getopt/&-long/' build-docbook-catalog || die
+}
+
+pkg_postinst() {
+	# New version -> regen files
+	build-docbook-catalog
+}
diff --git a/app-text/build-docbook-catalog/metadata.xml b/app-text/build-docbook-catalog/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-text/build-docbook-catalog/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/app-text/c2ps-4.0 b/app-text/c2ps-4.0
deleted file mode 100644
index c9138906374f..000000000000
--- a/app-text/c2ps-4.0
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DESCRIPTION=Generates a beautified ps document from a source file (c/c++)
-EAPI=4
-HOMEPAGE=http://www.cs.technion.ac.il/users/c2ps
-KEYWORDS=amd64 ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://www.cs.technion.ac.il/users/c2ps/c2ps-4.0.tar.gz
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=740332954efecade6b2d7b99d6d9915f
diff --git a/app-text/c2ps/Manifest b/app-text/c2ps/Manifest
new file mode 100644
index 000000000000..15ced37b9ffe
--- /dev/null
+++ b/app-text/c2ps/Manifest
@@ -0,0 +1,4 @@
+AUX c2ps-4.0-LDFLAGS.patch 342 BLAKE2B 7f6b97c231d9180007daa7982b8caeb98989bdce8efbac983cd3b5333e68ca366a2cd9521e66ea54e9e2af6d0ca91af01a1bf2f6c4e56e257baf275b37d6fdcd SHA512 79e943df0b2edbb6a7ab915e4760c46d34ac281eb2249f24be26ead327cf0f2bdf1aea58cf9e76453e89b2902ec2790eb50210cfcb433ab91a8449b03fcc3945
+DIST c2ps-4.0.tar.gz 48137 BLAKE2B b2d07f97e1eee0d7e32070d828ec2c06d9d98fd6a480768e6580f8a12bf0974983ed144a6e92a9860f13e6b9ec780f9aa1a28ee42cedaa70c7d4ab6ca5e6eca9 SHA512 dde931a201950412c8aad04a59f9ca0862b21a221bb7212ee64cbba0193421f1538804525361075be3ed601c5015a0c4e0c3592696f8b545f5a45524b2c5c619
+EBUILD c2ps-4.0.ebuild 683 BLAKE2B d0681ebb59b6b65c7eb20c942f26733eedd52d94ae541bc9a5cd63f8e6dc1b67953e7a6283b528c6e87e29fc1177dc8025dde8cc08c3bee995fd6e3916cf2ce6 SHA512 a101fe636fef9abaacc97f96e225b99965462fbdf1744ef113a4abcee43bf351a5195d881b1537f97d4995b5017bb9ca112ecf808a6d6c054a711daf52d66111
+MISC metadata.xml 255 BLAKE2B 06f078acf8e4416705c8bad8b4802a44592eb962c08c050e11332bfa97564fafdf08754ab056eb813f6baeaa6cdfaf5d71672455d77e74045f86098c221d5136 SHA512 c6c5f966cfbe396fde1b15334442de9e0004b44c4b48775588b0b25a058ad1751252761370c9c254280e97561fa6306f5aa0cc7959c675d4ee11f7f95d777a36
diff --git a/app-text/c2ps/c2ps-4.0.ebuild b/app-text/c2ps/c2ps-4.0.ebuild
new file mode 100644
index 000000000000..667ebb401a85
--- /dev/null
+++ b/app-text/c2ps/c2ps-4.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+inherit base toolchain-funcs
+
+DESCRIPTION="Generates a beautified ps document from a source file (c/c++)"
+HOMEPAGE="http://www.cs.technion.ac.il/users/c2ps"
+SRC_URI="http://www.cs.technion.ac.il/users/c2ps/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE=""
+
+PATCHES=( "${FILESDIR}/${P}-LDFLAGS.patch" )
+
+src_compile() {
+	emake CC="$(tc-getCC)" CCFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	dodir /usr/bin /usr/share/man/man1
+	emake MAN="${ED}"/usr/share/man/man1 PREFIX="${ED}"/usr install
+	dodoc README
+}
diff --git a/app-text/c2ps/files/c2ps-4.0-LDFLAGS.patch b/app-text/c2ps/files/c2ps-4.0-LDFLAGS.patch
new file mode 100644
index 000000000000..d68002180091
--- /dev/null
+++ b/app-text/c2ps/files/c2ps-4.0-LDFLAGS.patch
@@ -0,0 +1,11 @@
+--- a/c2ps-4.0/Makefile	1997-05-15 11:50:56.000000000 -0400
++++ b/c2ps-4.0/Makefile	2010-09-24 19:42:33.000000000 -0400
+@@ -45,7 +45,7 @@
+ 	install -m 644 c2ps.1 $(MAN)
+ 
+ compile:	c2ps.c
+-	$(CC) $(PREP_OPTIONS) $(CCFLAGS) -o c2ps c2ps.c
++	$(CC) $(LDFLAGS) $(PREP_OPTIONS) $(CCFLAGS) -o c2ps c2ps.c $(LIBS)
+ 
+ clean:
+ 	$(RM) c2ps *.o core *~
diff --git a/app-text/c2ps/metadata.xml b/app-text/c2ps/metadata.xml
new file mode 100644
index 000000000000..c439b06d8c84
--- /dev/null
+++ b/app-text/c2ps/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>printing@gentoo.org</email>
+	<name>Gentoo Printing Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-text/calibre-3.15.0 b/app-text/calibre-3.15.0
deleted file mode 100644
index 0f18712949f7..000000000000
--- a/app-text/calibre-3.15.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare pretend setup
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,ssl] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=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_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/beautifulsoup-3.0.5:python-2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/chardet[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/cssselect-0.7.1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/cssutils-1.0.1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/dbus-python-1.2.4[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-libs/dbus-glib-0.106 >=sys-apps/dbus-1.10.8 dev-python/html5-parser[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/lxml-3.2.1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/mechanize-0.2.5[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/msgpack[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/netifaces[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/psutil[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/pygments-2.1.3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/python-dateutil-2.5.3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/PyQt5-5.8[gui,svg,webkit,widgets,network,printsupport,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/regex[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-qt/qtcore:5= dev-qt/qtdbus: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-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_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] x11-libs/libxkbcommon:= 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 ) >=dev-python/setuptools-23.1.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=virtual/podofo-build-0.9.4 virtual/pkgconfig >=sys-apps/sed-4
-DESCRIPTION=Ebook management application
-EAPI=6
-HOMEPAGE=https://calibre-ebook.com/
-IUSE=ios +udisks python_targets_python2_7
-KEYWORDS=amd64 ~arm x86
-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
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,ssl] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=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_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/beautifulsoup-3.0.5:python-2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/chardet[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/cssselect-0.7.1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/cssutils-1.0.1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/dbus-python-1.2.4[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-libs/dbus-glib-0.106 >=sys-apps/dbus-1.10.8 dev-python/html5-parser[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/lxml-3.2.1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/mechanize-0.2.5[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/msgpack[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/netifaces[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/psutil[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/pygments-2.1.3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/python-dateutil-2.5.3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/PyQt5-5.8[gui,svg,webkit,widgets,network,printsupport,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/regex[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-qt/qtcore:5= dev-qt/qtdbus: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-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_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] x11-libs/libxkbcommon:= 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 ) udisks? ( || ( sys-fs/udisks:2 sys-fs/udisks:0 ) )
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=https://download.calibre-ebook.com/3.15.0/calibre-3.15.0.tar.xz
-_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f44c785b67ffbc6b994ad58c5c27edfa
diff --git a/app-text/calibre-3.26.1 b/app-text/calibre-3.26.1
deleted file mode 100644
index 4cafd48c4819..000000000000
--- a/app-text/calibre-3.26.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst prepare pretend setup
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,ssl] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=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_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/beautifulsoup-3.0.5:python-2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/chardet[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/cssselect-0.7.1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/cssutils-1.0.1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/dbus-python-1.2.4[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-libs/dbus-glib-0.106 >=sys-apps/dbus-1.10.8 dev-python/html5-parser[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/lxml-3.2.1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/mechanize-0.2.5[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/msgpack[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/netifaces[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/psutil[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/pygments-2.1.3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/python-dateutil-2.5.3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/PyQt5-5.8[gui,svg,webkit,widgets,network,printsupport,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/regex[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-qt/qtcore:5= dev-qt/qtdbus: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-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_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] x11-libs/libxkbcommon:= 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 ) >=dev-python/setuptools-23.1.0[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=virtual/podofo-build-0.9.4 virtual/pkgconfig >=sys-apps/sed-4
-DESCRIPTION=Ebook management application
-EAPI=6
-HOMEPAGE=https://calibre-ebook.com/
-IUSE=ios +udisks python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~x86
-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
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,ssl] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=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_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/beautifulsoup-3.0.5:python-2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/chardet[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/cssselect-0.7.1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/cssutils-1.0.1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/dbus-python-1.2.4[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-libs/dbus-glib-0.106 >=sys-apps/dbus-1.10.8 dev-python/html5-parser[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/lxml-3.2.1[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/mechanize-0.2.5[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/msgpack[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/netifaces[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/psutil[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/pygments-2.1.3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/python-dateutil-2.5.3[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/PyQt5-5.8[gui,svg,webkit,widgets,network,printsupport,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/regex[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-qt/qtcore:5= dev-qt/qtdbus: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-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_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] x11-libs/libxkbcommon:= 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 ) udisks? ( || ( sys-fs/udisks:2 sys-fs/udisks:0 ) )
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=https://download.calibre-ebook.com/3.26.1/calibre-3.26.1.tar.xz
-_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d7c448ba230c25155d03085a0d4ce7d0
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
new file mode 100644
index 000000000000..0596c4a9b93e
--- /dev/null
+++ b/app-text/calibre/Manifest
@@ -0,0 +1,9 @@
+AUX calibre-2.9.0-no_updates_dialog.patch 1661 BLAKE2B c75fc49a621e8dbd16ee1bad748110399cf09a404b4a905d3f723bac1827787e4749f464ba026700b6e5b3cc0ee646a92de00f1f58d10cf12dc9bc91195ee8b6 SHA512 9663b95ed64bdc2bc40692922384d1c6073177eee58a49c412883c4d2ae098e4e0b4ea51b80443108b7c0c3e4f3fda60c00fc3be4d0b62a5d79d982697927235
+AUX calibre-disable_plugins.patch 1042 BLAKE2B 92a56016c2c54f1b156bc91031420594445545b98b701f7cce99cf4bb86847eebad1ccebdc20a0d1b67f9fa88a9250fc4926d7c04cb36405323388b3171cf502 SHA512 c152ddd92728a89db10c75a4d00a968bf119bef68da8b9116c76827e3cdc8f8a7e5c45fbb973f6ca8db1f79e461518351ce2d47e5e059c282f36d2df499d1629
+AUX calibre-server-3.conf 541 BLAKE2B 06593633721e6adf2cf2077dffa83953eea46ccdcdc857ad468a9b74788326e9424f6ab9058be344dbbac8e49d343f5a1e53ddb486f2018b77319a7f8f713cf4 SHA512 12ef793a5b6ffd4413f780a13cad63927a95f15d17d85d4229eb5005ead68e51779abb822f9898ab5ae8c2094affeec1f9e85c34f109499739e6726b7641542a
+AUX calibre-server-3.init 1796 BLAKE2B f87d785d6f6fc10fa648d40944ec8538027854bb872d9a3be6b5b35b0abf3cda1e4e93874a9422914da5eb4287f193459733956e3f1e25e61bec0c214c552c99 SHA512 88110ded1b9c6cf8d3bfc3d5889654f77578f9d299e88daea9023767b930082e00fbddbb92a6e43c46d900248f3684232d93396ec1d0e784c7ec14b44783f98a
+DIST calibre-3.15.0.tar.xz 38177684 BLAKE2B 7d3892f81db61f8d4a08589a42ccd71183d9dc7fa401480d4426d1205a9a633216a79865140481f63e1e3a741d34f604ea9d7f98c490949d0d4452cb9123fb9b SHA512 93a9f3b7122d8f4cd1d847727f6d1ccd1f9d828651e9ee77a34544742884b3e925552ca61ec1d0a1196b04a0874e97fc877e679dd8a69ba8b754b7688b730697
+DIST calibre-3.26.1.tar.xz 39109660 BLAKE2B 0e98c273b8a5dfafea7a7027de3f83ad25ab835edadedf78b7e9bc356bcac8937d915944f2ab6503b414c49b4e792e090e7bd2433a4e86373bf115720ed78b0a SHA512 893e36b101defaca29281b4bd072aafc1c4cb20a9cd3ee06a0b68fbe6b39cab34952799939ac4f54c77148c87861c5ab4ddff84f5ec8c2274ae7fa6424259ff5
+EBUILD calibre-3.15.0.ebuild 9288 BLAKE2B cf28b1c8127288117bfaf3454a61a3485c1636cec5c2ab8dd07df47a9b5d3665e0c5a86768e6752ee57d88d24d7eb6cc2c1f78fb46ab53a71db695aec4cfd4da SHA512 fc2c83770465ad21f358b5592da05838527956b9e491ad3f1adead3a575936e5bba5fe1e1153200171ad9aaa3c10e313bd3f5c678614d6e6784651c2d9af33c1
+EBUILD calibre-3.26.1.ebuild 9290 BLAKE2B 1604dc70aad55643625d11ba082087f24dd2812eadb6d52339d4b7ac054522b5653bb77f6890b841211780fb360a0d922d745abd20e33252e941dc84c198430a SHA512 1158d8a45b79f68d9618e568ed63bb274e22e33dcf5365644b32cd6711163bc4a111cc4abc411c985b8beb2222b5922960d362a644d8772aacf871b69f086599
+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..21301bcd085d
--- /dev/null
+++ b/app-text/calibre/calibre-3.15.0.ebuild
@@ -0,0 +1,293 @@
+# 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-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=
+	dev-util/desktop-file-utils
+	dev-util/gtk-update-icon-cache
+	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/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/calibre/calibre-3.26.1.ebuild b/app-text/calibre/calibre-3.26.1.ebuild
new file mode 100644
index 000000000000..ab8c6f98f7ae
--- /dev/null
+++ b/app-text/calibre/calibre-3.26.1.ebuild
@@ -0,0 +1,293 @@
+# 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-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=
+	dev-util/desktop-file-utils
+	dev-util/gtk-update-icon-cache
+	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/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/calibre/files/calibre-2.9.0-no_updates_dialog.patch b/app-text/calibre/files/calibre-2.9.0-no_updates_dialog.patch
new file mode 100644
index 000000000000..4d37c3b642f5
--- /dev/null
+++ b/app-text/calibre/files/calibre-2.9.0-no_updates_dialog.patch
@@ -0,0 +1,27 @@
+diff -burN calibre-2.9.0.orig/src/calibre/gui2/main.py calibre-2.9.0/src/calibre/gui2/main.py
+--- calibre-2.9.0.orig/src/calibre/gui2/main.py	2014-11-09 20:09:54.081231882 +0800
++++ calibre-2.9.0/src/calibre/gui2/main.py	2014-11-09 20:15:48.193033844 +0800
+@@ -37,8 +37,9 @@
+                       help=_('Start minimized to system tray.'))
+     parser.add_option('-v', '--verbose', default=0, action='count',
+                       help=_('Ignored, do not use. Present only for legacy reasons'))
+-    parser.add_option('--no-update-check', default=False, action='store_true',
+-            help=_('Do not check for updates'))
++    parser.add_option('--update-check', dest='no_update_check', default=True,
++            action='store_false',
++            help=_('Check for updates'))
+     parser.add_option('--ignore-plugins', default=False, action='store_true',
+             help=_('Ignore custom plugins, useful if you installed a plugin'
+                 ' that is preventing calibre from starting'))
+diff -burN calibre-2.9.0.orig/src/calibre/gui2/update.py calibre-2.9.0/src/calibre/gui2/update.py
+--- calibre-2.9.0.orig/src/calibre/gui2/update.py	2014-11-09 20:09:54.082231864 +0800
++++ calibre-2.9.0/src/calibre/gui2/update.py	2014-11-09 20:17:49.954767115 +0800
+@@ -154,6 +154,8 @@
+             self.update_checker.signal.update_found.connect(self.update_found,
+                     type=Qt.QueuedConnection)
+             self.update_checker.start()
++        else:
++            self.update_checker = None
+ 
+     def recalc_update_label(self, number_of_plugin_updates):
+         self.update_found(self.last_newest_calibre_version, number_of_plugin_updates)
diff --git a/app-text/calibre/files/calibre-disable_plugins.patch b/app-text/calibre/files/calibre-disable_plugins.patch
new file mode 100644
index 000000000000..9ef1dd04251d
--- /dev/null
+++ b/app-text/calibre/files/calibre-disable_plugins.patch
@@ -0,0 +1,17 @@
+Description: Disable plugin dialog. It uses a totally non-authenticated and non-trusted way of installing arbitrary code.
+Author: Martin Pitt <mpitt@debian.org>
+Bug-Debian: http://bugs.debian.org/640026
+
+Index: calibre-0.8.29+dfsg/src/calibre/gui2/actions/preferences.py
+===================================================================
+--- calibre-0.8.29+dfsg.orig/src/calibre/gui2/actions/preferences.py	2011-12-16 05:49:14.000000000 +0100
++++ calibre-0.8.29+dfsg/src/calibre/gui2/actions/preferences.py	2011-12-20 19:29:04.798468930 +0100
+@@ -28,8 +28,6 @@
+             pm.addAction(QIcon(I('config.png')), _('Preferences'), self.do_config)
+         cm('welcome wizard', _('Run welcome wizard'),
+                 icon='wizard.png', triggered=self.gui.run_wizard)
+-        cm('plugin updater', _('Get plugins to enhance calibre'),
+-                icon='plugins/plugin_updater.png', triggered=self.get_plugins)
+         if not DEBUG:
+             pm.addSeparator()
+             cm('restart', _('Restart in debug mode'), icon='debug.png',
diff --git a/app-text/calibre/files/calibre-server-3.conf b/app-text/calibre/files/calibre-server-3.conf
new file mode 100644
index 000000000000..bb456e858bd6
--- /dev/null
+++ b/app-text/calibre/files/calibre-server-3.conf
@@ -0,0 +1,13 @@
+# /etc/conf.d/calibre-server
+# Change this to the user you want to run calibre-server as.
+# You may specify a group too, after a colon
+# NOTE:  This must be set and not to root!
+CALIBRE_USER=
+
+# Set the path of the library to serve.
+# Defaults to the default location for CALIBRE_USER.
+#CALIBRE_LIBRARY='<user home directory>/Calibre Library'
+
+# Extra options to pass to calibre-server.
+# See the calibre-server man page for more options.
+#CALIBRE_SERVER_OPTS="--userdb /srv/calibre/users.sqlite --enable-auth --worker-count 10 --port 8080"
diff --git a/app-text/calibre/files/calibre-server-3.init b/app-text/calibre/files/calibre-server-3.init
new file mode 100644
index 000000000000..049d3e421a17
--- /dev/null
+++ b/app-text/calibre/files/calibre-server-3.init
@@ -0,0 +1,58 @@
+#!/sbin/openrc-run
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License, v2 or later
+
+depend() {
+	need net
+	need localmount
+	after bootmisc
+}
+
+checkconfig() {
+	if [ "${CALIBRE_USER}" = "" -o "${CALIBRE_USER}" = "root" ] ; then
+		eerror "Please edit /etc/conf.d/calibre-server"
+		eerror "You have to specify a user to run calibre-server as, as we will not run it as root!"
+		eerror "Modify CALIBRE_USER to your needs (you can also add a group, after a colon)"
+		return 1
+	fi
+	if ! getent passwd "${CALIBRE_USER%:*}" >/dev/null ; then
+		eerror "Please edit /etc/conf.d/calibre-server"
+		eerror "Your user has to exist!"
+		return 1
+	fi
+	if [ "${CALIBRE_USER%:*}" != "${CALIBRE_USER}" ] ; then
+		if ! getent group "${CALIBRE_USER#*:}" >/dev/null ; then
+			eerror "Please edit /etc/conf.d/calibre-server"
+			eerror "Your group has to exist too!"
+			return 1
+		fi
+	fi
+	if [ "${CALIBRE_LIBRARY}" = "" ] ; then
+		CALIBRE_USER_HOME=$(getent passwd "${CALIBRE_USER%:*}" | cut -d ':' -f 6)
+		CALIBRE_LIBRARY="${CALIBRE_USER_HOME}/Calibre Library"
+	fi
+	if [ ! -d "${CALIBRE_LIBRARY}" ] ; then
+		eerror "Please edit /etc/conf.d/calibre-server"
+		eerror "The Calibre library, '${CALIBRE_LIBRARY},' does not exist."
+		eerror "Please modify CALIBRE_LIBRARY to point to a valid library."
+		return 1
+	fi
+	return 0
+}
+
+start() {
+	checkconfig || return $?
+	local pidfile=/var/run/calibre-server.pid
+	ebegin "Starting calibre-server"
+	start-stop-daemon --user "${CALIBRE_USER}" \
+		--pidfile "${pidfile}" --make-pidfile --background --exec /usr/bin/calibre-server \
+		-- ${CALIBRE_OPTS} "${CALIBRE_LIBRARY}"
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping calibre-server"
+	start-stop-daemon --stop --user "${CALIBRE_USER}" \
+		--pidfile /var/run/calibre-server.pid
+	eend $?
+}
diff --git a/app-text/calibre/metadata.xml b/app-text/calibre/metadata.xml
new file mode 100644
index 000000000000..2196cbeb104f
--- /dev/null
+++ b/app-text/calibre/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>axs@gentoo.org</email>
+  </maintainer>
+  <maintainer type="person">
+    <email>zmedico@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="sourceforge">calibre</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-text/capyt-1.0 b/app-text/capyt-1.0
deleted file mode 100644
index c274c344a9c0..000000000000
--- a/app-text/capyt-1.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install setup
-DESCRIPTION=A python3 CLI utility to interface with cpy.pt paste service
-EAPI=6
-HOMEPAGE=https://github.com/lbatalha/capyt
-IUSE=python_targets_python3_5 python_targets_python3_6 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/requests[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_7(-),python_single_target_python3_5(+)?,python_single_target_python3_6(+)?]
-SLOT=0
-SRC_URI=https://github.com/lbatalha/capyt/archive/v1.0.tar.gz -> capyt-1.0.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=c2fe7378f6631bb07eb360a7d2f35ac8
diff --git a/app-text/capyt/Manifest b/app-text/capyt/Manifest
new file mode 100644
index 000000000000..71e233dffb77
--- /dev/null
+++ b/app-text/capyt/Manifest
@@ -0,0 +1,3 @@
+DIST capyt-1.0.tar.gz 2152 BLAKE2B bde81e802c310a95c37695943d35a6cc98557f92199b7f8d5983340d1cbd6d2ffe4c07b48a9ea724603766d371cd80519c01c663fb8303c1abec3879e12caf34 SHA512 325de4bdc3d6b7e6d0926f37cb7facfbc216c0d46280576a3424add0b8c081405809a23982cda3032b3443a41ddbd7f6997040f7353defcbe72895b1ceff8384
+EBUILD capyt-1.0.ebuild 563 BLAKE2B ffc4b2f372ae2cf90bf6239b0d19fe8828b6230e28faf639845fcd0cd44f08854aa48d8b2269b303abc5067b1a87a824f958f6e13ba3d4a714a74b2a64563100 SHA512 c6a28572d692f057816336fe4028f99982750592e2ff751481c5cf436f22a0f89c2fc6d80e8ea8d431e4096bdc12232787454d3bbf32a5ebf122f524c37ce4fd
+MISC metadata.xml 344 BLAKE2B 2b09c758b212196592a83ba9e2f30591f97d222619bf3a494fcc025789c46d70f55b955400c580dbc9d3f5ea3cdb3662d79e2960d88e8b7e089a741c7fa6041d SHA512 f9e35a54a3d719a4114e2bc758096c1f6365838163ab5f6a3353bd318581683ca4757be60d0dbb8457099c1e174518078091a94e2f23f086903f45be94c4915d
diff --git a/app-text/capyt/capyt-1.0.ebuild b/app-text/capyt/capyt-1.0.ebuild
new file mode 100644
index 000000000000..13690113dc90
--- /dev/null
+++ b/app-text/capyt/capyt-1.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{5..6} )
+
+inherit python-single-r1
+
+DESCRIPTION="A python3 CLI utility to interface with cpy.pt paste service"
+HOMEPAGE="https://github.com/lbatalha/capyt"
+SRC_URI="https://github.com/lbatalha/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	${PYTHON_DEPS}
+	dev-python/requests[${PYTHON_USEDEP}]
+"
+
+src_install() {
+	dodoc README.md
+
+	python_doscript capyt.py
+}
diff --git a/app-text/capyt/metadata.xml b/app-text/capyt/metadata.xml
new file mode 100644
index 000000000000..d9a6217dd22d
--- /dev/null
+++ b/app-text/capyt/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>juippis@gmail.com</email>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-text/catdoc-0.95 b/app-text/catdoc-0.95
deleted file mode 100644
index 7a466e7be6d8..000000000000
--- a/app-text/catdoc-0.95
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=tk? ( >=dev-lang/tk-8.1 )
-DESCRIPTION=Converter for Microsoft Word, Excel, PowerPoint and RTF files to text
-EAPI=6
-HOMEPAGE=http://www.wagner.pp.ru/~vitus/software/catdoc/
-IUSE=tk
-KEYWORDS=amd64 ~arm ~ppc x86 ~amd64-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://ftp.wagner.pp.ru/pub/catdoc/catdoc-0.95.tar.gz
-_md5_=5aa3034ae2067e5ea6c42addb4d04461
diff --git a/app-text/catdoc/Manifest b/app-text/catdoc/Manifest
new file mode 100644
index 000000000000..0d8780ea106a
--- /dev/null
+++ b/app-text/catdoc/Manifest
@@ -0,0 +1,4 @@
+AUX catdoc-0.95-parallel-make.patch 1568 BLAKE2B 868cad85a1882c60e1f6f37b630a233949c457afd66f59b1e07616a8403bcb4710cb7ed7d914e58ea2e5022787ad94a4c4db20572386d373b27e61257c5cb2ef SHA512 f40d7440bf19157b862226e8d956b5505e6d79db3a39a21f71f68d6943b162f62863333739f1f4777c2c38b4116b4745888ed0cf5cd4159ccc84d02979f691ea
+DIST catdoc-0.95.tar.gz 217779 BLAKE2B 37c01c485410a6eb08c5935351b00f60f1d4c418f4c1b3cca73da23f870cb5d5414ea6cf7c37effb295e6ccb12a7981367bd08ca6226ee0fc64d2dfdca2762ea SHA512 dd6bded4b6b70749c007256b182b063ff266f86d53024d8582001678821e8096c5b980bc8f43015d9c82bbe022d71d4ba5fe68aff31b2ff6db3688595e651b2c
+EBUILD catdoc-0.95.ebuild 1194 BLAKE2B 96629971c7c69ef5a46f6b0cde1ae1fd7a803c3d203c828ba3e7dbcceac53046aad29c62f524a48b691a7ff1c201bd13a2302239b9d84fa041779356d3ddb132 SHA512 48e93c76ff30043e9fb800109cdab36bd25e7d24895aede5767641b636a62ac30477e6a5dfda5d46a3d6c61f3cdcdd1876b3ecc6c0fecf539c06d7f3766adef5
+MISC metadata.xml 245 BLAKE2B ee3a163cfe0a4bc59c0dfb46f9ddb580e2d259b4d0e33cb4e684eb9e6d4b901bf97c6edd891f3b75a613a782f1b89318d0ee3ec9bee4e34c4441d9e8f4267678 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690
diff --git a/app-text/catdoc/catdoc-0.95.ebuild b/app-text/catdoc/catdoc-0.95.ebuild
new file mode 100644
index 000000000000..24c2ed8e4036
--- /dev/null
+++ b/app-text/catdoc/catdoc-0.95.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Converter for Microsoft Word, Excel, PowerPoint and RTF files to text"
+HOMEPAGE="http://www.wagner.pp.ru/~vitus/software/catdoc/"
+SRC_URI="http://ftp.wagner.pp.ru/pub/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~ppc x86 ~amd64-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="tk"
+
+DEPEND="tk? ( >=dev-lang/tk-8.1 )"
+
+DOCS="CODING.STD NEWS README TODO"
+# CREDITS missing by accident in catdoc-0.95
+
+PATCHES=(
+	"${FILESDIR}/${P}-parallel-make.patch"
+	)
+
+src_prepare() {
+	default
+
+	# Fix for case-insensitive filesystems
+	echo ".PHONY: all install clean distclean dist" >> Makefile.in || die
+
+	mv configure.{in,ac} || die
+}
+
+src_configure() {
+	econf --with-install-root="${D}" \
+		$(use_with tk wish "${EPREFIX}"/usr/bin/wish) \
+		$(use_enable tk wordview)
+}
+
+src_compile() {
+	emake LIB_DIR="${EPREFIX}"/usr/share/catdoc
+}
+
+src_install() {
+	default
+
+	if [[ -e ${ED}/usr/bin/xls2csv ]]; then
+		einfo "Renaming xls2csv to xls2csv-${PN} because of bug 314657."
+		mv -vf "${ED}"/usr/bin/xls2csv "${ED}"/usr/bin/xls2csv-${PN} || die
+	fi
+}
diff --git a/app-text/catdoc/files/catdoc-0.95-parallel-make.patch b/app-text/catdoc/files/catdoc-0.95-parallel-make.patch
new file mode 100644
index 000000000000..b3e2833eb4d3
--- /dev/null
+++ b/app-text/catdoc/files/catdoc-0.95-parallel-make.patch
@@ -0,0 +1,39 @@
+--- a/charsets/Makefile.in
++++ b/charsets/Makefile.in
+@@ -28,13 +28,13 @@
+ 
+ all: @charsetcheck@
+ clean:
+-install: install-dirs install-spc install-charsets
+-install-spc: tex.spc ascii.spc tex.rpl ascii.rpl
++install: install-spc install-charsets
++install-spc: install-dirs tex.spc ascii.spc tex.rpl ascii.rpl
+ 	    $(INSTALL) -m 644 ascii.spc $(installroot)$(LIB_DIR)/ascii$(SPEC_EXT) 
+ 	    $(INSTALL) -m 644 tex.spc $(installroot)$(LIB_DIR)/tex$(SPEC_EXT) 
+ 	    $(INSTALL) -m 644 ascii.rpl $(installroot)$(LIB_DIR)/ascii$(REPL_EXT)
+ 	    $(INSTALL) -m 644 tex.rpl $(installroot)$(LIB_DIR)/tex$(REPL_EXT)
+-install-charsets:
++install-charsets: install-dirs
+ 	for i in *.txt; do\
+ 	   $(INSTALL) -m 0644 $$i $(installroot)$(LIB_DIR);\
+ 	done
+--- a/doc/Makefile.in
++++ b/doc/Makefile.in
+@@ -29,13 +29,13 @@
+             xls2csv.txt xls2csv.ps \
+             wordview.txt wordview.ps build
+ install: @installtargets@
+-install-catdoc: catdoc.1 xls2csv.1 catppt.1
+-	../mkinstalldirs $(installroot)$(mandir)
++install-dirs:
++	../mkinstalldirs $(installroot)$(mandir)/man1
++install-catdoc: install-dirs catdoc.1 xls2csv.1 catppt.1
+ 	$(INSTALL) -m 644 catdoc.1 $(installroot)$(mandir)/man1/catdoc.1
+ 	$(INSTALL) -m 644 xls2csv.1 $(installroot)$(mandir)/man1/xls2csv.1
+ 	$(INSTALL) -m 644 catppt.1 $(installroot)$(mandir)/man1/catppt.1
+-install-wordview:	
+-	../mkinstalldirs $(installroot)$(mandir)
++install-wordview: install-dirs
+ 	$(INSTALL) -m 644 wordview.1 $(installroot)$(mandir)/man1/wordview.1
+ distclean: clean
+ 	$(RM)  Makefile catdoc.1 xls2csv.1 catppt.1 wordview.1
diff --git a/app-text/catdoc/metadata.xml b/app-text/catdoc/metadata.xml
new file mode 100644
index 000000000000..13170c3184d8
--- /dev/null
+++ b/app-text/catdoc/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>tex@gentoo.org</email>
+	<name>Gentoo TeX Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-text/cb2bib-1.9.7 b/app-text/cb2bib-1.9.7
deleted file mode 100644
index 3c7f3d81839a..000000000000
--- a/app-text/cb2bib-1.9.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 lzo? ( dev-libs/lzo:2 ) webkit? ( dev-qt/qtwebkit:5 ) webengine? ( dev-qt/qtwebengine:5[widgets] )
-DESCRIPTION=Tool for extracting unformatted bibliographic references
-EAPI=6
-HOMEPAGE=http://www.molspaces.com/cb2bib/
-IUSE=+lzo webengine +webkit
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 lzo? ( dev-libs/lzo:2 ) webkit? ( dev-qt/qtwebkit:5 ) webengine? ( dev-qt/qtwebengine:5[widgets] )
-REQUIRED_USE=?? ( webkit webengine )
-SLOT=0
-SRC_URI=http://www.molspaces.com/dl/progs/cb2bib-1.9.7.tar.gz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=f1e8640856b12a83378491a10dc1380a
diff --git a/app-text/cb2bib/Manifest b/app-text/cb2bib/Manifest
new file mode 100644
index 000000000000..82d6dd7d770e
--- /dev/null
+++ b/app-text/cb2bib/Manifest
@@ -0,0 +1,3 @@
+DIST cb2bib-1.9.7.tar.gz 845121 BLAKE2B eafce83874e82c20a45de5dc4c1558aa40346821f26bf2d9f53332f337e5cdaffb92c70972fd8b99823f72615608ea848808c9875e16ed50f02cf1d9655d552e SHA512 87a438288c6e7776db136de63de1a8e27f2abf8499d28c0691b60ad3ef4f848e8987af4fc47d1f2cfb1d47009e28e7535f6bab998811cb721bfc9f384941b1e4
+EBUILD cb2bib-1.9.7.ebuild 1790 BLAKE2B db2460c6938e26d0d349b6bf4ec5e3c8cf70484a9f88cd6774b1586ab1b16a847cae12dcc1aa0befaef92b45261136247b4b0eaa28c1502110f16958c49bd320 SHA512 32a00cff24547b539671f355083d5b8956d49a1ad416ad904c94f2c72b4ad2c1376298e6aaf1515a995f771cb9b6a2989c06a80ed408c24982b94dbc72109d7b
+MISC metadata.xml 443 BLAKE2B 84ddb4572f7fe86d4d59515a747dc2e09b185d0f4c0a540c2b4ba6794d3e69f9d371d726eeac7ca4c6e603db121e50d28d395084319798778460f03bb2c049e6 SHA512 d5c544ca2ebdbd563ec4230bcfdb71567902c681c489979d5bc0546faf0fd98a6b3d2107b5dc18c2347cda5db092b012158421286a539dd82747669de34f983a
diff --git a/app-text/cb2bib/cb2bib-1.9.7.ebuild b/app-text/cb2bib/cb2bib-1.9.7.ebuild
new file mode 100644
index 000000000000..ee41902c48f2
--- /dev/null
+++ b/app-text/cb2bib/cb2bib-1.9.7.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit qmake-utils
+
+DESCRIPTION="Tool for extracting unformatted bibliographic references"
+HOMEPAGE="http://www.molspaces.com/cb2bib/"
+SRC_URI="http://www.molspaces.com/dl/progs/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="+lzo webengine +webkit"
+
+REQUIRED_USE="?? ( webkit webengine )"
+
+DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	lzo? ( dev-libs/lzo:2 )
+	webkit? ( dev-qt/qtwebkit:5 )
+	webengine? ( dev-qt/qtwebengine:5[widgets] )
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( AUTHORS CHANGELOG COPYRIGHT )
+
+src_prepare() {
+	default
+
+	sed -i -e "s|../AUTHORS ../COPYRIGHT ../LICENSE ../CHANGELOG||" src/src.pro || die
+
+	use webengine || sed -i -e "s/qtHaveModule(webenginewidgets)/false/g" src/src.pro || die
+	use webkit || sed -i -e "s/qtHaveModule(webkitwidgets)/false/g" src/src.pro || die
+}
+
+src_configure() {
+	eqmake5 \
+		$(use !lzo && echo -config disable_lzo)
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+	einstalldocs
+}
+
+pkg_postinst() {
+	einfo
+	elog "For best functionality, emerge the following packages:"
+	elog "    app-text/poppler[utils] - for data import from PDF files"
+	elog "    app-text/dvipdfm        - for data import from DVI files"
+	elog "    app-text/bibutils       - for data import from ISI, endnote format"
+	elog "    media-fonts/jsmath      - for displaying mathematical notation"
+	elog "    media-libs/exiftool     - for proper UTF-8 metadata writing in PDF"
+	elog "                              text strings"
+	elog "    virtual/latex-base      - to check for BibTeX file correctness and to get"
+	elog "                              nice printing through the shell script bib2pdf"
+	einfo
+}
diff --git a/app-text/cb2bib/metadata.xml b/app-text/cb2bib/metadata.xml
new file mode 100644
index 000000000000..dca6445c8920
--- /dev/null
+++ b/app-text/cb2bib/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
+	<use>
+		<flag name="webengine">Use <pkg>dev-qt/qtwebengine</pkg> instead of <pkg>dev-qt/qtwebkit</pkg></flag>
+	</use>
+	<upstream>
+		<bugs-to>mailto:webmaster@molspaces.com</bugs-to>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/cedilla-0.6 b/app-text/cedilla-0.6
deleted file mode 100644
index 85fde4ba6b68..000000000000
--- a/app-text/cedilla-0.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=dev-lisp/clisp
-DESCRIPTION=UTF-8 to postscript converter
-EAPI=4
-HOMEPAGE=http://www.pps.jussieu.fr/~jch/software/cedilla/
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-lisp/clisp
-SLOT=0
-SRC_URI=http://www.pps.jussieu.fr/~jch/software/files/cedilla-0.6.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5c1e217d9e573e4d87ad51c8ebc7d830
diff --git a/app-text/cedilla-0.7 b/app-text/cedilla-0.7
deleted file mode 100644
index 471b2f8c0f37..000000000000
--- a/app-text/cedilla-0.7
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=dev-lisp/clisp
-DESCRIPTION=UTF-8 to postscript converter
-EAPI=6
-HOMEPAGE=http://www.pps.jussieu.fr/~jch/software/cedilla/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-lisp/clisp
-SLOT=0
-SRC_URI=http://www.pps.jussieu.fr/~jch/software/files/cedilla-0.7.tar.gz
-_md5_=98df181a2f7edf930262e16e6867c528
diff --git a/app-text/cedilla/Manifest b/app-text/cedilla/Manifest
new file mode 100644
index 000000000000..51db8cde98a5
--- /dev/null
+++ b/app-text/cedilla/Manifest
@@ -0,0 +1,6 @@
+AUX cedilla-gentoo-r1.patch 645 BLAKE2B cedc4626df03c6706c5fee463cd2b662f1b5e297050cb3e67e585609319daa013d499f37fd6cff1ce2a10fcb21626e6b5178dc5545a02eef0778c404cd00f9fb SHA512 4a9d4c4f28509e2b527568a28a69dbcce0c4e7a8d6ae9a967dfb33ff639f12a5dae16a885b0f51686d3d444c9f651cf904bb5c93326308fc37e13d4ec8bb4162
+DIST cedilla-0.6.tar.gz 130676 BLAKE2B e316dff5ab9bb89dd350e9842847ed700846cfd57370be17198aa3c54f0562a4c26d23a49acccf8c7dc0b55f1765668dbfa24dbf57f50e568ac3039f7b5d662c SHA512 95d98fd4ab95b48023f635d61133ea1a8138a797cd1c414da0d4907531eb067ac147e8d612a528373da425d37fee7c1139dc7f0019308938c096e37caebf4e38
+DIST cedilla-0.7.tar.gz 114899 BLAKE2B 100c22be30ffed585a1eb44c96109dadab9cbf90c5c3432efd4ed8daa135fa0d9fb82374eda9f9f13126cc5d453ecb5933d8733a58e374ab3192ea7d5bd6d273 SHA512 a137bceee2c70e911922b17e823093dc37b19cce8dece99596003ae7b4bc8c02afbae164d7dfa4e4873b4f549f7d948faf1da9dc1d3ef89cde6d1f36ba91be77
+EBUILD cedilla-0.6.ebuild 697 BLAKE2B c1f1bcb2967e8c6068d3b6906dee9ca5279360689e4aa80836d72aeca426db5d94631ee8f541acd3b71c89084965e87919b9e2a64a7ed837ddcb93c25e9c2e04 SHA512 61c7d132115f2e255de5b1aad34397541f89fdaa1ebd24dab36e7b2d71bac7e592884a78d36bc3addd8108133091455bd0025c28c672787f0a995b0bba919fae
+EBUILD cedilla-0.7.ebuild 654 BLAKE2B b784971be122031e96b156d0cf2d2b6930bb97236101a931b92094c0860e817618654fbc42ca3828222daa1208065722b62ba1b60d13c13c7ec163f9b2d4f92f SHA512 66dc5955c4b7391b91fa8f0cf521b5f1a7b8962c2ba8ded1c379dc678ed197db3217bf661da9cfa55569161acf45f70af95955d44e092d703237bf7afb01ade3
+MISC metadata.xml 253 BLAKE2B 34807135fdbc8396660d3fa85339e80c0c14693b937e360de963062b40d1a4306d86c3f6fbe60c45146632f934695d26c06083a2977031c36bdee17f57140f72 SHA512 06255a02d9a177532c33fb7a9271f8f538cef82354feb7689c839e2eb1516d53fd0e78aca22fee2f9a19dbf1e3f7ad96dea23c8d97efdac952e4b754314664d9
diff --git a/app-text/cedilla/cedilla-0.6.ebuild b/app-text/cedilla/cedilla-0.6.ebuild
new file mode 100644
index 000000000000..720592e2a72d
--- /dev/null
+++ b/app-text/cedilla/cedilla-0.6.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+
+inherit eutils
+
+DESCRIPTION="UTF-8 to postscript converter"
+HOMEPAGE="http://www.pps.jussieu.fr/~jch/software/cedilla/"
+SRC_URI="http://www.pps.jussieu.fr/~jch/software/files/${P}.tar.gz"
+
+KEYWORDS="amd64 x86"
+SLOT="0"
+LICENSE="GPL-2"
+IUSE=""
+
+DEPEND="dev-lisp/clisp"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/cedilla-gentoo-r1.patch
+}
+
+src_compile() {
+	./compile-cedilla || die "Compile failed."
+}
+
+src_install() {
+	sed -i "s#${ED%/}##g" cedilla || die "sed failed"
+	newman cedilla.man cedilla.1
+	./install-cedilla || die "Install failed."
+	dodoc NEWS README
+}
diff --git a/app-text/cedilla/cedilla-0.7.ebuild b/app-text/cedilla/cedilla-0.7.ebuild
new file mode 100644
index 000000000000..d6e687479ec5
--- /dev/null
+++ b/app-text/cedilla/cedilla-0.7.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="UTF-8 to postscript converter"
+HOMEPAGE="http://www.pps.jussieu.fr/~jch/software/cedilla/"
+SRC_URI="http://www.pps.jussieu.fr/~jch/software/files/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+LICENSE="GPL-2"
+
+DEPEND="dev-lisp/clisp"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/cedilla-gentoo-r1.patch )
+
+src_compile() {
+	./compile-cedilla || die "Compile failed."
+}
+
+src_install() {
+	sed "s#${ED%/}##g" -i cedilla || die "sed failed"
+	dodir /usr/share/man/man1/
+
+	./install-cedilla || die "Install failed."
+
+	einstalldocs
+}
diff --git a/app-text/cedilla/files/cedilla-gentoo-r1.patch b/app-text/cedilla/files/cedilla-gentoo-r1.patch
new file mode 100644
index 000000000000..af9c92a8ee7b
--- /dev/null
+++ b/app-text/cedilla/files/cedilla-gentoo-r1.patch
@@ -0,0 +1,22 @@
+diff -Naur cedilla-0.3.orig/cedilla-config cedilla-0.3/cedilla-config
+--- cedilla-0.3.orig/cedilla-config	2002-02-18 11:53:39.000000000 +0000
++++ cedilla-0.3/cedilla-config	2003-06-02 20:36:44.000000000 +0000
+@@ -2,14 +2,14 @@
+ CLISP=/usr/bin/clisp
+ 
+ # Where the main Cedilla binary will be installed
+-BINDIR=/usr/bin
++BINDIR=${ED%/}/usr/bin
+ 
+ # Where the cedilla-config.lisp file lives
+-ETCDIR=/etc
++ETCDIR=${ED%/}/etc
+ 
+ # Where Cedilla's FASL files will be kept
+-LIBDIR=/usr/lib/cedilla
++LIBDIR=${ED%/}/usr/lib/cedilla
+ 
+ # Where the cedilla(1) manual page will be installed
+-MANDIR=/usr/share/man/man1
++MANDIR=${ED%/}/usr/share/man/man1
+ 
diff --git a/app-text/cedilla/metadata.xml b/app-text/cedilla/metadata.xml
new file mode 100644
index 000000000000..b3c1d365eaad
--- /dev/null
+++ b/app-text/cedilla/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>titanofold@gentoo.org</email>
+		<name>Aaron W. Swenson</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-text/chasen-2.4.4-r3 b/app-text/chasen-2.4.4-r3
deleted file mode 100644
index fd2d776afbeb..000000000000
--- a/app-text/chasen-2.4.4-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-libs/darts-0.32 dev-lang/perl:=[-build(-)]
-DESCRIPTION=Japanese Morphological Analysis System, ChaSen
-EAPI=5
-HOMEPAGE=http://chasen-legacy.sourceforge.jp/
-IUSE=perl static-libs
-KEYWORDS=amd64 ppc ~ppc64 x86 ~sparc-solaris
-LICENSE=BSD
-PDEPEND=>=app-dicts/ipadic-2.7.0
-RDEPEND=>=dev-libs/darts-0.32 perl? ( !dev-perl/Text-ChaSen ) dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=mirror://sourceforge.jp/chasen-legacy/32224/chasen-2.4.4.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1be81dbeeef3cb7fb1922c81e09941f7
diff --git a/app-text/chasen/Manifest b/app-text/chasen/Manifest
new file mode 100644
index 000000000000..63f49cabee02
--- /dev/null
+++ b/app-text/chasen/Manifest
@@ -0,0 +1,4 @@
+AUX chasen-2.4.4-cve-2011-4000.patch 559 BLAKE2B ee5085a642c1b04ab5cefeaedd09690f988e5cb600953d0ffecd479fe8ddc207e67a27980ebb3df2fbf31dab1f9cc55d597ea09d25dd0c0b29b8fe1d0eddc6c6 SHA512 308a82dfcba13fc33733df853f0abf9979f2d8ff18e1c3f552ac7cd3b6c844dd40e125790fa62844a326ef7e546d0b24fc01c801f3e6cee0aa8b7b2a08474623
+DIST chasen-2.4.4.tar.gz 845720 BLAKE2B ae18e71d78588c108f747abc6f28835f90d0a2c84616a01d87acea2ae5e0e54ef6ff296ebb9dbdce9047a223bd34203cf2763e9b3d4fb28522a4add7bc823860 SHA512 4551d28be6c0de7a585decf03cf5b56def3d181cfdfd975565ac7236e2c3e8cc0bcf5331f1ae309a914f95c6715e13ba3e9d80ebbd6e86c2316a43b7ed831075
+EBUILD chasen-2.4.4-r3.ebuild 1084 BLAKE2B 4657d07c37e08ee0a55ff3b4d319c0b4b515216ac2e202595e1c31f8d243c5f315d696347bae01ca86db6d828d5bae853a8fb7a4133f8b42560cf91d6370b8fa SHA512 5bcc3c9aa096fdc223b71cf8b216bdaa09b33c4ced0c44b76c2f9bfb985d1169fc046c43f9371613ce3234ce8e79f91cc5651d2911f45c36852bc709701f098d
+MISC metadata.xml 320 BLAKE2B a218844660f8614413b8afeec00615885e71d7ba7fc1784496ca28fe8c2d689eedb160dfe56080f24cfa369c0652de87597c14b63ab4879cba1970761c8d2ac8 SHA512 1bf81a4a404bd57dd50b071ec19fa00e17b2a733d3988251d195406a8229d0fb3500498ebbb634f863df5d1d56445ceb1605a470421c54697a130769f0f4263c
diff --git a/app-text/chasen/chasen-2.4.4-r3.ebuild b/app-text/chasen/chasen-2.4.4-r3.ebuild
new file mode 100644
index 000000000000..918861f19523
--- /dev/null
+++ b/app-text/chasen/chasen-2.4.4-r3.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils perl-module
+
+DESCRIPTION="Japanese Morphological Analysis System, ChaSen"
+HOMEPAGE="http://chasen-legacy.sourceforge.jp/"
+SRC_URI="mirror://sourceforge.jp/chasen-legacy/32224/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ppc ~ppc64 x86 ~sparc-solaris"
+IUSE="perl static-libs"
+
+DEPEND=">=dev-libs/darts-0.32"
+RDEPEND="${DEPEND}
+	perl? ( !dev-perl/Text-ChaSen )"
+PDEPEND=">=app-dicts/ipadic-2.7.0"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-cve-2011-4000.patch
+}
+
+src_configure() {
+	econf $(use_enable static-libs static)
+	if use perl ; then
+		cd "${S}"/perl
+		perl-module_src_configure
+	fi
+}
+
+src_compile() {
+	default
+	if use perl ; then
+		cd "${S}"/perl || die
+		perl-module_src_compile
+	fi
+}
+
+src_test() {
+	default
+	if use perl ; then
+		cd "${S}"/perl || die
+		perl-module_src_test
+	fi
+}
+
+src_install () {
+	default
+
+	if use perl ; then
+		cd "${S}"/perl || die
+		perl-module_src_install
+		newdoc README README.perl
+	fi
+
+	prune_libtool_files
+}
diff --git a/app-text/chasen/files/chasen-2.4.4-cve-2011-4000.patch b/app-text/chasen/files/chasen-2.4.4-cve-2011-4000.patch
new file mode 100644
index 000000000000..61480622e40a
--- /dev/null
+++ b/app-text/chasen/files/chasen-2.4.4-cve-2011-4000.patch
@@ -0,0 +1,21 @@
+diff --git a/lib/chalib.c b/lib/chalib.c
+index 5d79e13..cddf51b 100644
+--- a/lib/chalib.c
++++ b/lib/chalib.c
+@@ -306,9 +306,14 @@ chasen_sparse_main(char *input, FILE *output)
+      */
+     while (*input) {
+ 	int c = 0, len, cursor;
+-	if ((crlf = strpbrk(input, "\r\n")) == NULL)
++	if ((crlf = strpbrk(input, "\r\n")) == NULL) {
+ 	    len = strlen(input);
+-	else {
++	    if (len >= CHA_INPUT_SIZE) {
++		len = CHA_INPUT_SIZE - 1;
++		crlf = input + CHA_INPUT_SIZE - 2;
++		c = 0;
++	    }
++	} else {
+ 	    len = crlf - input;
+ 	    c = *crlf;
+ 	    *crlf = '\0';
diff --git a/app-text/chasen/metadata.xml b/app-text/chasen/metadata.xml
new file mode 100644
index 000000000000..edc470c136a2
--- /dev/null
+++ b/app-text/chasen/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge-jp">chasen-legacy</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/cherrytree-0.37.0 b/app-text/cherrytree-0.37.0
deleted file mode 100644
index 982e41f476b2..000000000000
--- a/app-text/cherrytree-0.37.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=x11-libs/libX11 dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pyenchant[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/pygtk-2.16:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pygtksourceview:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] nls? ( sys-devel/gettext ) dev-util/desktop-file-utils x11-misc/shared-mime-info python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
-DESCRIPTION=A hierarchical note taking application
-EAPI=6
-HOMEPAGE=https://www.giuspen.com/cherrytree
-IUSE=nls python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=x11-libs/libX11 dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pyenchant[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=dev-python/pygtk-2.16:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pygtksourceview:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=https://github.com/giuspen/cherrytree/archive/0.37.0.tar.gz -> cherrytree-0.37.0.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=50151a6c6e696f5530ea2def3b8aab4f
diff --git a/app-text/cherrytree/Manifest b/app-text/cherrytree/Manifest
new file mode 100644
index 000000000000..989d47be2539
--- /dev/null
+++ b/app-text/cherrytree/Manifest
@@ -0,0 +1,3 @@
+DIST cherrytree-0.37.0.tar.gz 8888703 BLAKE2B 737c0c247c581086e23e4c3e5fba0b18459788b385078ec8092af8b7352d77c8b273c939f702178d0ae59c8633bf996a7a7e5223e22da703ced3c8bf1d7cbde3 SHA512 a1aaf92657c58c70430a45adaa771050b43476bc2a33dc929b108842d5ef46aa83c4fa4cfe8c4f54a9a3656fc0d30046fae34cbac5aa9fe3f32aa539058636f5
+EBUILD cherrytree-0.37.0.ebuild 1191 BLAKE2B 106630e09107a750bed11980bcb458fc39e194e7a6b03a3bd2d0a045ca84ba5e34f1337f92f3dad2e36a4f2c1cb979e6dfafa6a6434febf569ae482747ad26a5 SHA512 2cdb77421a542d6070be7fa933de3c083c0865f6cc58d93815ee9faf52c47f34154eb4acd7f0c6edea7c091e243789ee7824256ef947c725c3c78b5248de5e19
+MISC metadata.xml 250 BLAKE2B 9676935c062d76f3e06a49612672d533ba7f431e0819084758da368a632e3cdfbaa68da7e367b0847ed2e66db4e5a41377dd80819cca08af3dbce53fb3622d36 SHA512 c9d9bb6db803a0958073fb76a3d26192374ec85b66ccddaac01829afea556302126f99dc6158d71ae4cc9e5152da0ce203ad527ffe923edb6239c7ff43e19a76
diff --git a/app-text/cherrytree/cherrytree-0.37.0.ebuild b/app-text/cherrytree/cherrytree-0.37.0.ebuild
new file mode 100644
index 000000000000..70d1db48a137
--- /dev/null
+++ b/app-text/cherrytree/cherrytree-0.37.0.ebuild
@@ -0,0 +1,55 @@
+# 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"
+DISTUTILS_SINGLE_IMPL=true
+
+inherit xdg distutils-r1
+
+DESCRIPTION="A hierarchical note taking application"
+HOMEPAGE="https://www.giuspen.com/cherrytree"
+LICENSE="GPL-3"
+
+SLOT="0"
+SRC_URI="https://github.com/giuspen/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+
+RDEPEND="
+	x11-libs/libX11
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/pyenchant[${PYTHON_USEDEP}]
+	>=dev-python/pygtk-2.16:2[${PYTHON_USEDEP}]
+	dev-python/pygtksourceview:2[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )
+"
+
+PLOCALES="cs de es fr hy it ja lt nl pl pt_BR ru sl tr uk zh_CN"
+inherit l10n
+
+python_prepare_all() {
+	xdg_src_prepare
+
+	if use nls ; then
+		l10n_find_plocales_changes 'locale' '' '.po'
+
+		rm_loc() {
+			rm -v -f "locale/${1}.po" || return 1
+		}
+		l10n_for_each_disabled_locale_do rm_loc
+	fi
+
+	sed -r -e '/\bupdate-desktop-database\b/d' -i -- 'setup.py' || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	use nls || mydistutilsargs+=( --without-gettext )
+}
diff --git a/app-text/cherrytree/metadata.xml b/app-text/cherrytree/metadata.xml
new file mode 100644
index 000000000000..e69a8d811bcb
--- /dev/null
+++ b/app-text/cherrytree/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="github">giuspen/cherrytree</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/chm2pdf-0.9.1-r2 b/app-text/chm2pdf-0.9.1-r2
deleted file mode 100644
index 5b8ca5c66051..000000000000
--- a/app-text/chm2pdf-0.9.1-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare setup
-DESCRIPTION=A script that converts a CHM file into a single PDF file
-EAPI=5
-HOMEPAGE=https://code.google.com/p/chm2pdf/
-IUSE=python_targets_python2_7
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-python/pychm[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] app-text/htmldoc >=dev-libs/chmlib-0.40-r1[examples] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=https://chm2pdf.googlecode.com/files/chm2pdf-0.9.1.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2762069d2f4a4322015a010a54a5eafb
diff --git a/app-text/chm2pdf/Manifest b/app-text/chm2pdf/Manifest
new file mode 100644
index 000000000000..8de80a4acc34
--- /dev/null
+++ b/app-text/chm2pdf/Manifest
@@ -0,0 +1,4 @@
+AUX tempdir.patch 3694 BLAKE2B a88d3709ee23f43ab6a9a9b3ec83306d964d3d791b4552f99df26bdf09924cc40b721b0f24c8807b47f0e91b3eb8d46dae1c15ee53b9fe7974431c523bda5b50 SHA512 e7d29e71afad11c79d508c35c9060a39308c78e654f00808cb38b7e75ebf5f885bbd436f58e9900977c2e81d0f4a7f543daeab6bd2f9a919c4c3b74dba33c325
+DIST chm2pdf-0.9.1.tar.gz 19955 BLAKE2B 6f16f35d25904cf1b42e91c46f58b279fceb11a328a88e14f20a9749148a4a5932af4884a19f57dc89b0135b3b8acd2dc880265aa46dfb9887ab6212a59172bd SHA512 1d1997b17750f371e60cc6bf9693a8e4316deadd63247700f6ebd1bf02340f2e0524766a6be846d0f6349416b8551609da63fbf60ecd62766cf0d9b4f0c886d3
+EBUILD chm2pdf-0.9.1-r2.ebuild 768 BLAKE2B 3dee8875ae605f35e8e3cbc992d74ae0a3188a9801183775a7a15eff4f64009a44235e9498be0e68fb8065cd1a6391adb4ab8e16b79ee0473ca637cd2c7c8397 SHA512 e6015c7b5eed96714e2afac98132141f55067654cd65dfb510c4266a68fc69328fbaa28bc771cc8978ec45f512f50e3d4234e7be1c9f09932daec093ef35a7cf
+MISC metadata.xml 327 BLAKE2B 8fdf9fef07cf22c5abbe925f527c9978e877e0cb28f84fc80845f84b24a2f0a77b20967e582cf381149adfb36d870bcd5826bfa83c9a4f0c6317248a47a92dc5 SHA512 3d6d3798e07d0d313b4411c19c9183019924c080d8deb9aa52c6d882db3d8ccff0a2cf69d5e022fb2643a8eeb5ef8ab6d7f166afb440e7c70e5ac372c968b885
diff --git a/app-text/chm2pdf/chm2pdf-0.9.1-r2.ebuild b/app-text/chm2pdf/chm2pdf-0.9.1-r2.ebuild
new file mode 100644
index 000000000000..d4ace08fe54d
--- /dev/null
+++ b/app-text/chm2pdf/chm2pdf-0.9.1-r2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-single-r1
+
+DESCRIPTION="A script that converts a CHM file into a single PDF file"
+HOMEPAGE="https://code.google.com/p/chm2pdf/"
+SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="amd64 x86"
+SLOT="0"
+IUSE=""
+
+RDEPEND="dev-python/pychm[${PYTHON_USEDEP}]
+	app-text/htmldoc
+	>=dev-libs/chmlib-0.40-r1[examples]
+	${PYTHON_DEPS}"
+
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+PATCHES=( "${FILESDIR}/tempdir.patch" )
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare(){
+	python_fix_shebang .
+}
+
+src_install() {
+	default
+	python_doscript ${PN} || die "failed to create executable"
+}
diff --git a/app-text/chm2pdf/files/tempdir.patch b/app-text/chm2pdf/files/tempdir.patch
new file mode 100644
index 000000000000..6bb5fe55d00d
--- /dev/null
+++ b/app-text/chm2pdf/files/tempdir.patch
@@ -0,0 +1,71 @@
+--- chm2pdf-0.9.1.orig/chm2pdf	2008-07-09 12:42:26.000000000 +0200
++++ chm2pdf-0.9.1/chm2pdf	2009-02-25 20:58:53.000000000 +0100
+@@ -27,6 +27,8 @@
+ import os, os.path
+ import re, glob
+ import getopt
++import tempfile
++import shutil
+ # from BeautifulSoup import BeautifulSoup
+ 
+ global version
+@@ -39,8 +41,8 @@
+ global filename #the input filename
+ 
+ version = '0.9.1'
+-CHM2PDF_TEMP_WORK_DIR='/tmp/chm2pdf/work' 
+-CHM2PDF_TEMP_ORIG_DIR='/tmp/chm2pdf/orig'
++CHM2PDF_TEMP_WORK_DIR=tempfile.mkdtemp()
++CHM2PDF_TEMP_ORIG_DIR=tempfile.mkdtemp()
+ 
+ 
+ 
+@@ -299,16 +301,6 @@
+     # ########################### File extraction and correction: START ############################
+     #
+     if options['dontextract'] == '':
+-    
+-        try:
+-            os.mkdir(CHM2PDF_TEMP_WORK_DIR)
+-        except OSError: # The directory already exists.
+-            pass
+-        
+-        try:
+-            os.mkdir(CHM2PDF_TEMP_ORIG_DIR)
+-        except OSError: # The directory already exists.
+-            pass
+         
+         try:
+             os.mkdir(CHM2PDF_ORIG_DIR)
+@@ -620,7 +612,7 @@
+     print '\t--continuous\n\t\tSpecifies  that  the  HTML  sources are unstructured (plain web pages).\n\t\tNo page breaks are inserted between each file or URL in the output.'
+     print '\t--cookies \'name="value with space"; name=value\'\n\t\t'
+     print '\t--datadir directory\n\t\tSpecifies the  location  of  the  HTMLDOC  data  files,  usually  /usr/share/htmldoc  or  C:\Program Files\HTMLDOC '
+-    print "\t--dontextract \n\t\tIf given, %s will not extract the HTML files from the given CHM file, but will use previously extracted copies from the temporary directory " %name + '(i.e. ' + CHM2PDF_TEMP_ORIG_DIR + ' and ' + CHM2PDF_TEMP_WORK_DIR + '). Usually you will use this option after you have used the \'--extract-only\' option to extract the files in order to correct them manually (in ' + CHM2PDF_TEMP_WORK_DIR + '). After the correction, a call with \'--dontextract\' will not overwrite your changes, but will use the corrected files instead.'
++#    print "\t--dontextract \n\t\tIf given, %s will not extract the HTML files from the given CHM file, but will use previously extracted copies from the temporary directory " %name + '(i.e. ' + CHM2PDF_TEMP_ORIG_DIR + ' and ' + CHM2PDF_TEMP_WORK_DIR + '). Usually you will use this option after you have used the \'--extract-only\' option to extract the files in order to correct them manually (in ' + CHM2PDF_TEMP_WORK_DIR + '). After the correction, a call with \'--dontextract\' will not overwrite your changes, but will use the corrected files instead.'
+     print '\t--duplex\n\t\tSpecifies that the output should be formatted for double-sided printing.'
+     print '\t--effectduration {0.1..10.0}\n\t\tSpecifies the duration in seconds of PDF page transition effects.'
+     print '\t--embedfonts\n\t\tSpecifies that fonts should be embedded in PDF output.'
+@@ -1084,13 +1076,6 @@
+         print 'CHM file "' + filename + '" not found!'
+         return
+     
+-    #remove temporary files
+-    if options['dontextract'] == '':
+-        if options['verbose']=='--verbose' and options['verbositylevel']=='high':
+-            print 'Removing any previous temporary files...'
+-        os.system('rm -r '+CHM2PDF_ORIG_DIR+'/*')
+-        os.system('rm -r '+CHM2PDF_WORK_DIR+'/*')
+-    
+     cfile = chm.CHMFile()
+     cfile.LoadCHM(filename)
+ 
+@@ -1105,6 +1090,8 @@
+             os.system('extract_chmLib ' + filename + ' ' + CHM2PDF_ORIG_DIR + '&> /dev/null')
+     
+     convert_to_pdf(cfile, filename, outputfilename, options)
++    shutil.rmtree(CHM2PDF_TEMP_WORK_DIR)
++    shutil.rmtree(CHM2PDF_TEMP_ORIG_DIR)    
+ 
+ 
+ if __name__ == '__main__':
diff --git a/app-text/chm2pdf/metadata.xml b/app-text/chm2pdf/metadata.xml
new file mode 100644
index 000000000000..0d5011fb8a78
--- /dev/null
+++ b/app-text/chm2pdf/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>hwoarang@gentoo.org</email>
+		<name>Markos Chandras</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="google-code">chm2pdf</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/clara-20031214 b/app-text/clara-20031214
deleted file mode 100644
index bebedfc3e1aa..000000000000
--- a/app-text/clara-20031214
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst unpack
-DEPEND=x11-libs/libX11
-DESCRIPTION=An OCR (Optical Character Recognition) program
-EAPI=0
-HOMEPAGE=http://www.claraocr.org/
-KEYWORDS=amd64 ppc x86 ~ppc-macos ~sparc-solaris
-LICENSE=GPL-2
-RDEPEND=x11-libs/libX11
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://gentoo/clara-20031214.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=501f7653f8c39644f6561a289eca22f7
diff --git a/app-text/clara-20031214-r1 b/app-text/clara-20031214-r1
deleted file mode 100644
index 5331125c432c..000000000000
--- a/app-text/clara-20031214-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare
-DEPEND=x11-libs/libX11
-DESCRIPTION=An OCR (Optical Character Recognition) program
-EAPI=5
-HOMEPAGE=http://www.claraocr.org/
-KEYWORDS=~amd64 ~ppc ~x86 ~ppc-macos ~sparc-solaris
-LICENSE=GPL-2
-RDEPEND=x11-libs/libX11
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://gentoo/clara-20031214.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a89cd787d4a5752e286592da46288ca0
diff --git a/app-text/clara/Manifest b/app-text/clara/Manifest
new file mode 100644
index 000000000000..71f33045643d
--- /dev/null
+++ b/app-text/clara/Manifest
@@ -0,0 +1,6 @@
+AUX clara-20031214-debian-vararg.patch 1768 BLAKE2B 87457b832c224a4a199136abda7a8448fb80ec215d7d93a5f66a0d382b8bc3dc0a33412954a91040b5ed6a8a9e4d24619ff783b05b32481f2c6da694cc2fee5c SHA512 3ec7c2bb9a11721c670ac1f74f2038f0909d0282392381be8c2bb2b9fd564b32dc94b56ab9458d95a63bf701816729610501e8cea2ca9088f64db62f560611bb
+AUX clara_open_mode.patch 567 BLAKE2B 0b355d1ef6a2c8de21e2c90b4651d361799ce6d4972a1a235068d2d08fd0810d712bde3e3d759ce1305f9c52c094120e7e42bbfb6b1c332ccbcded64dcb64c5a SHA512 787972048c6ddcea4727b72a0b327486349876de2978358fcc4386010d5f43415e6573bf01d4c48ad747195718186954403ddae63a09f1bf5471995b17d27b34
+DIST clara-20031214.tar.gz 451539 BLAKE2B beed8b3a199825a8d8699c10b6a08c4d71fbafa3f3d2ebbbff6b13eafa35b4f38bacca35209039a93f0d31a993987a8773371b43440a1a0fbd61c40c455ec1f9 SHA512 260d710132a3903d71b6c4c0885ac1709b60d520861e3dcd5e4b75a3bf5627549c94423670be08245e7a9db6a870a93a9526c8d318fadaddcce00cbf02985f49
+EBUILD clara-20031214-r1.ebuild 1262 BLAKE2B ba3f6b45e1d17a56066134acf5991837d3e3fd92c6edf7ebf71833254d8c9f6eaa58b1369029d7a388a3dbb256cca75ae3d6804107fffac14f7361f6e95bfb6e SHA512 499a121d78c780e025ba45b9f56e1e8b8c16d7776ec2b21b1bd1af5b60b4c1526f5bd443c19ea697c12d5c7d519e902a17a15756c3d42f1cbe2972c49773335b
+EBUILD clara-20031214.ebuild 1245 BLAKE2B 46d3e3ea7114342eec8a8b6d298e41ceea7eb05a0af31ab7247daab97fe5645561cfcec96edb3886078548546ed6691783e802102935fca3520a151713ebd23d SHA512 e14f2c63eba3aa5dd9a3300b65bec2a0f263546dd778ec5ee826a6dc90d44dde778505abcaf21eeb8b7904e92f4fa7ab2f27aabee38d4505410bba29495d5a8e
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/clara/clara-20031214-r1.ebuild b/app-text/clara/clara-20031214-r1.ebuild
new file mode 100644
index 000000000000..758415dfd6af
--- /dev/null
+++ b/app-text/clara/clara-20031214-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="An OCR (Optical Character Recognition) program"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+HOMEPAGE="http://www.claraocr.org/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~x86 ~ppc-macos ~sparc-solaris"
+IUSE=""
+
+RDEPEND="x11-libs/libX11"
+DEPEND="${RDEPEND}"
+
+# The test provided by clara doesn't seem to make any sense.  It just
+# calls the binary with an unsupported option, which results in an
+# error.
+RESTRICT="test"
+
+src_prepare() {
+	sed -i -re "s/(C|LD)FLAGS =/\1FLAGS +=/" Makefile
+	epatch "${FILESDIR}/${PN}_open_mode.patch"
+	epatch "${FILESDIR}/${P}-debian-vararg.patch"
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" || die
+	emake doc || die
+}
+
+src_install() {
+	dobin ${PN} selthresh
+	doman doc/${PN}*.1 selthresh.1
+
+	dodoc ANNOUNCE CHANGELOG doc/FAQ
+	insinto /usr/share/doc/${P}
+	doins imre.pbm
+
+	dohtml doc/*.html
+}
+
+pkg_postinst() {
+	elog
+	elog "Please note that Clara OCR has to be trained to recognize text,"
+	elog "without a training session it simply won't work. Have a look at"
+	elog "the docs in /usr/share/doc/${P}/html/ to get more "
+	elog "info about the training procedure."
+	elog
+}
diff --git a/app-text/clara/clara-20031214.ebuild b/app-text/clara/clara-20031214.ebuild
new file mode 100644
index 000000000000..e1143a5a99b2
--- /dev/null
+++ b/app-text/clara/clara-20031214.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="An OCR (Optical Character Recognition) program"
+SRC_URI="mirror://gentoo/clara-20031214.tar.gz"
+HOMEPAGE="http://www.claraocr.org/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="amd64 ppc x86 ~ppc-macos ~sparc-solaris"
+IUSE=""
+
+RDEPEND="x11-libs/libX11"
+DEPEND="${RDEPEND}"
+
+# The test provided by clara doesn't seem to make any sense.  It just
+# calls the binary with an unsupported option, which results in an
+# error.
+RESTRICT="test"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	sed -i -re "s/(C|LD)FLAGS =/\1FLAGS +=/" Makefile
+	epatch "${FILESDIR}/clara_open_mode.patch"
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" || die
+	emake doc || die
+}
+
+src_install() {
+	dobin clara selthresh
+	doman doc/clara*.1 selthresh.1
+
+	dodoc ANNOUNCE CHANGELOG doc/FAQ
+	insinto /usr/share/doc/${P}
+	doins imre.pbm
+
+	dohtml doc/*.html
+}
+
+pkg_postinst() {
+	elog
+	elog "Please note that Clara OCR has to be trained to recognize text,"
+	elog "without a training session it simply won't work. Have a look at"
+	elog "the docs in /usr/share/doc/${P}/html/ to get more "
+	elog "info about the training procedure."
+	elog
+}
diff --git a/app-text/clara/files/clara-20031214-debian-vararg.patch b/app-text/clara/files/clara-20031214-debian-vararg.patch
new file mode 100644
index 000000000000..570bc4018993
--- /dev/null
+++ b/app-text/clara/files/clara-20031214-debian-vararg.patch
@@ -0,0 +1,90 @@
+--- clara-20031214.orig/clara.c
++++ clara-20031214/clara.c
+@@ -751,11 +751,12 @@
+     s[128] = 0;
+     logmsg(s);
+ 
+-    if (!trace)
+-        return;
+-    va_start(args,m);
+-    vfprintf(stderr,m,args);
+-    fprintf(stderr,"\n");
++    if (trace) {
++        vfprintf(stderr,m,args);
++        fprintf(stderr,"\n");
++    }
++
++    va_end(args);
+ }
+ 
+ /*
+@@ -775,10 +776,12 @@
+     logmsg(s);
+ 
+     /* send to stderr if requested */
+-    if (!debug)
+-        return;
+-    vfprintf(stderr,m,args);
+-    fprintf(stderr,"\n");
++    if (debug) {
++        vfprintf(stderr,m,args);
++        fprintf(stderr,"\n");
++    }
++
++    va_end(args);
+ }
+ 
+ /*
+@@ -797,9 +800,10 @@
+     s[128] = 0;
+     logmsg(s);
+ 
+-    va_start(args,m);
+     vfprintf(stderr,m,args);
+     fprintf(stderr,"\n");
++
++    va_end(args);
+ }
+ 
+ /* (devel)
+--- clara-20031214.orig/event.c
++++ clara-20031214/event.c
+@@ -638,6 +638,8 @@
+         }
+     }
+ 
++    va_end(args);
++
+ /*
+     printf("request (priority %d, mclip=%d, redraw=%d) to draw the message \"%s\"\n",f,mclip,redraw_stline,s);
+ */
+--- clara-20031214.orig/html.c
++++ clara-20031214/html.c
+@@ -1548,11 +1548,12 @@
+     va_list args;
+     int n=0,f;
+ 
+-    va_start(args, fmt);
+     for (f=0; f==0; ) {
+ 
+         /* try to write */
++        va_start(args, fmt);
+         n = vsnprintf(*t+*top+1,*sz-*top-1,fmt,args);
++        va_end(args);
+ 
+         /*
+             Some implementations of vsnprintf return -1 when
+@@ -1589,11 +1590,12 @@
+     va_list args;
+     int n=0,f;
+ 
+-    va_start(args, fmt);
+     for (f=0; f==0; ) {
+ 
+         /* try to write */
++        va_start(args, fmt);
+         n = vsnprintf(text+topt+1,textsz-topt-1,fmt,args);
++        va_end(args);
+ 
+         /*
+             Some implementations of vsnprintf return -1 when
diff --git a/app-text/clara/files/clara_open_mode.patch b/app-text/clara/files/clara_open_mode.patch
new file mode 100644
index 000000000000..3f73f466ab8c
--- /dev/null
+++ b/app-text/clara/files/clara_open_mode.patch
@@ -0,0 +1,20 @@
+--- pgmblock.c	2002-04-29 14:26:13.000000000 +0000
++++ pgmblock.c	2009-03-05 02:51:43.000000000 +0000
+@@ -161,7 +161,7 @@
+ 
+         printf("%d rare pixels (%1.4f)\n",t,((float)t)/(w*h));
+ 
+-        F = open("map",O_WRONLY|O_CREAT);
++        F = open("map",O_WRONLY|O_CREAT, 0644);
+         write(F,m,h*bpl);
+         write(F,map,256);
+         close(F);
+@@ -197,7 +197,7 @@
+     {
+         int i,j,F;
+ 
+-        F = open("map",O_RDONLY|O_CREAT);
++        F = open("map",O_RDONLY|O_CREAT, 0644);
+         read(F,m,h*bpl);
+         read(F,map,256);
+         close(F);
diff --git a/app-text/clara/metadata.xml b/app-text/clara/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-text/clara/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/app-text/cmark-0.28.0 b/app-text/cmark-0.28.0
deleted file mode 100644
index 4c65ccd30765..000000000000
--- a/app-text/cmark-0.28.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=test? ( || ( dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 ) ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=CommonMark parsing and rendering library and program in C
-EAPI=6
-HOMEPAGE=https://github.com/commonmark/cmark
-IUSE=test
-KEYWORDS=amd64 x86
-LICENSE=BSD-2
-SLOT=0
-SRC_URI=https://github.com/commonmark/cmark/archive/0.28.0.tar.gz -> cmark-0.28.0.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5a932b7ffdd6738113f19af361aa2ed1
diff --git a/app-text/cmark-0.28.3 b/app-text/cmark-0.28.3
deleted file mode 100644
index 6d10ef29cb3a..000000000000
--- a/app-text/cmark-0.28.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=test? ( || ( dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 ) ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=CommonMark parsing and rendering library and program in C
-EAPI=6
-HOMEPAGE=https://github.com/commonmark/cmark
-IUSE=test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
-LICENSE=BSD-2
-SLOT=0
-SRC_URI=https://github.com/commonmark/cmark/archive/0.28.3.tar.gz -> cmark-0.28.3.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=bd3c753787faff5148f625e14d2c2ef6
diff --git a/app-text/cmark/Manifest b/app-text/cmark/Manifest
new file mode 100644
index 000000000000..8d2dd0054ffe
--- /dev/null
+++ b/app-text/cmark/Manifest
@@ -0,0 +1,5 @@
+DIST cmark-0.28.0.tar.gz 228973 BLAKE2B e0f42a7a5929eb8fb7a2fb9405372d626b2fea5f895b9320a28629022a8280d01af67e8e13101565ce86a2dbc4b8191eb461e70e45e7fa33c72b8e8266c2ee78 SHA512 86aeb42f17440c8e743057851bc3cee9ed4b3fa27dacc37d6af54dee7739210a712020e59c102ed1852b7c3f904881cb4e9b80ea475772095514c4025284cbb6
+DIST cmark-0.28.3.tar.gz 229391 BLAKE2B b235d3dd8ed9b83d8fd6ec495d311bed854ad61d28e5a5087f40f7e512977892fcdff7c51e8683db87e0ee8e5e73338fe11b8829e70c6f07c59e917a8b7268cc SHA512 409105a3228a8ae22ba6acf95cd99bc9a2c20f8603aa0e803a33172eb6ef53f80f8f0262d2258b77f9fd6e1f2e9017a6c906b88f761e053c09ef88c9ffab7d29
+EBUILD cmark-0.28.0.ebuild 704 BLAKE2B 9c0ebfc47577cfef39d9333594d0a200d96ea64f57698cced39e681c3576790edcde14329e1ae8d03e9df38f05c2cce88c33d84691860482b073127f1536589e SHA512 c279cc5b8d899436fed2eed3d4979ac462b28f2248e2fbab934d8ce4075447c11525deb6bcd7fdc7544c36abf71b113ab6266f59f8a1f626c9b84b0fc38e0764
+EBUILD cmark-0.28.3.ebuild 718 BLAKE2B 977b531e4fab755bb761741e14355cbcf0d00d8598373fe58cc6612ea2ca6fb434dbb54e46b042793cad429b10346430c6cd8b96d68d538d2c42b91f097ddb7c SHA512 ea9c2dade4874fbe7b0793320b6663955ad517891a627f92007164a3bfd4f86bdb15711e7b6b41273d25740e6d98738e22ecfc01891d4eb4032a8e412a742302
+MISC metadata.xml 577 BLAKE2B f99edfb972715ce4b1660a5e68c0261c9b8d8f2914f5bd804227bbddeae1528205bbed55c20d6d366ecfdd6a01a69bb31decd57ed40f0440de4946e86339e659 SHA512 93ccb3c6ec9907489589f3aae77d00eb2858d5d436b78be1f711a060f47fadf92d2da8a81a9388ae7946ad1b6a93cc88cb96bfe15cdd81b1e56bdd7f4750a4c1
diff --git a/app-text/cmark/cmark-0.28.0.ebuild b/app-text/cmark/cmark-0.28.0.ebuild
new file mode 100644
index 000000000000..8645624e81eb
--- /dev/null
+++ b/app-text/cmark/cmark-0.28.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit cmake-utils python-any-r1
+
+DESCRIPTION="CommonMark parsing and rendering library and program in C"
+HOMEPAGE="https://github.com/commonmark/cmark"
+SRC_URI="https://github.com/commonmark/cmark/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="test"
+
+DEPEND="test? ( ${PYTHON_DEPS} )"
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMARK_LIB_FUZZER=OFF
+		-DCMARK_SHARED=ON
+		-DCMARK_STATIC=OFF
+		-DCMARK_TESTS="$(usex test)"
+	)
+	cmake-utils_src_configure
+}
diff --git a/app-text/cmark/cmark-0.28.3.ebuild b/app-text/cmark/cmark-0.28.3.ebuild
new file mode 100644
index 000000000000..706c679b378c
--- /dev/null
+++ b/app-text/cmark/cmark-0.28.3.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit cmake-utils python-any-r1
+
+DESCRIPTION="CommonMark parsing and rendering library and program in C"
+HOMEPAGE="https://github.com/commonmark/cmark"
+SRC_URI="https://github.com/commonmark/cmark/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="test"
+
+DEPEND="test? ( ${PYTHON_DEPS} )"
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMARK_LIB_FUZZER=OFF
+		-DCMARK_SHARED=ON
+		-DCMARK_STATIC=OFF
+		-DCMARK_TESTS="$(usex test)"
+	)
+	cmake-utils_src_configure
+}
diff --git a/app-text/cmark/metadata.xml b/app-text/cmark/metadata.xml
new file mode 100644
index 000000000000..da44e88f8f6e
--- /dev/null
+++ b/app-text/cmark/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>azamat.hackimov@gmail.com</email>
+    <name>Azamat H. Hackimov</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <longdescription>
+    CommonMark parsing and rendering library and program in C.
+  </longdescription>
+  <upstream>
+    <remote-id type="github">commonmark/cmark</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-text/cmigemo-1.3c b/app-text/cmigemo-1.3c
deleted file mode 100644
index e1857158131b..000000000000
--- a/app-text/cmigemo-1.3c
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst unpack
-DEPEND=app-i18n/qkc app-dicts/migemo-dict
-DESCRIPTION=C/Migemo -- Migemo library implementation in C
-EAPI=0
-HOMEPAGE=http://www.kaoriya.net/#CMIGEMO
-IUSE=emacs
-KEYWORDS=x86 alpha ppc
-LICENSE=cmigemo
-RDEPEND=app-dicts/migemo-dict emacs? ( >=app-text/migemo-0.40-r1 )
-SLOT=0
-SRC_URI=http://www.kaoriya.net/dist/var/cmigemo-1.3c.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=abb8d0071251c3c8b33754808d71069d
diff --git a/app-text/cmigemo-1.3c-r1 b/app-text/cmigemo-1.3c-r1
deleted file mode 100644
index 261400bf9f62..000000000000
--- a/app-text/cmigemo-1.3c-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare
-DEPEND=dev-lang/perl >=app-dicts/migemo-dict-200812[unicode=] app-i18n/qkc
-DESCRIPTION=C/Migemo -- Migemo library implementation in C
-EAPI=2
-HOMEPAGE=http://www.kaoriya.net/#CMIGEMO
-IUSE=emacs unicode vim-syntax
-KEYWORDS=alpha ~amd64 ~ppc x86
-LICENSE=MIT
-RDEPEND=>=app-dicts/migemo-dict-200812[unicode=] emacs? ( >=app-text/migemo-0.40-r1 )
-SLOT=0
-SRC_URI=http://www.kaoriya.net/dist/var/cmigemo-1.3c-MIT.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ea9aaa243529176deaa6b204158d0f6f
diff --git a/app-text/cmigemo-1.3c-r2 b/app-text/cmigemo-1.3c-r2
deleted file mode 100644
index c6d2408db3bd..000000000000
--- a/app-text/cmigemo-1.3c-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare
-DEPEND=>=app-dicts/migemo-dict-200812[unicode=] dev-lang/perl || ( net-misc/curl net-misc/wget net-misc/fetch ) app-i18n/nkf
-DESCRIPTION=C/Migemo -- Migemo library implementation in C
-EAPI=2
-HOMEPAGE=http://www.kaoriya.net/#CMIGEMO
-IUSE=emacs unicode vim-syntax
-KEYWORDS=~alpha amd64 ~ppc x86
-LICENSE=MIT
-RDEPEND=emacs? ( >=app-text/migemo-0.40-r1 )
-SLOT=0
-SRC_URI=http://www.kaoriya.net/dist/var/cmigemo-1.3c-MIT.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d313a8201d4e5035e640cab7e96f5f57
diff --git a/app-text/cmigemo/Manifest b/app-text/cmigemo/Manifest
new file mode 100644
index 000000000000..dc1d71e9f58f
--- /dev/null
+++ b/app-text/cmigemo/Manifest
@@ -0,0 +1,9 @@
+AUX cmigemo-1.2-migemo-dict.diff 825 BLAKE2B 59c4d476188839e81f68c97b838e903498b890903d22d42a21c41b5f5fddcb7299dee36c9034893785e26d7d90a5e0d5773aefb97188a62c5b9eced826cac8d6 SHA512 e7b6826c4ce5a87a7e95743f233efaa6a5edc2515a86c85dc24e7dcf9d9a105fbab2f9fd8a81b3ff124a032eaa8dfd5050ca23ef7818ea29a7e8f9c44877388a
+AUX cmigemo-1.3c-gentoo.patch 1948 BLAKE2B 5c182d0c9c93b06104d1067272d35b023386a9ce7bfee1828489268cfff1bacbe64d83cde803df1a0f52804b3474900077a8144a1bd5900785c73b77ea0ca1d0 SHA512 90035c0fbf3b341113e4991f08c9962e27d37f6f215983379e92d7c616a67662b8754f390f9f19f7c84f1d5cc9a51a815999ec6c84e7c642758b3324f05b7837
+AUX cmigemo-1.3c-ldflags.patch 502 BLAKE2B 3fc4c85592cc9feffbaeee636e8fcada10c7b7cd8696495239436808ddf9462da09713bbba10c3e5eb66cb45a3ec02e53f1e708fc0c1281dd96cc3e66db8caea SHA512 932bfad5afc4c90531cac96a9a7fb06d1ed690b3391ad9425c5ae1baa7caf2d8046d208e25816ea4ecfbbe44b2a95216e551cbbeb7808548f534853e6b817f7b
+DIST cmigemo-1.3c-MIT.tar.bz2 54447 BLAKE2B 37e561b992317dbf421b3d09203e92000c0217347235545483b4f8b99071794c2b240636a880c1758c1828782468670eb640fbd411abe779b28c52dfc3147650 SHA512 8c5b9109f4309906ed19d5d48643918f51c339be7f3b34c90d2d814fed1b6d30e77a1539f6c1e11ceb3560f83fd9e1079254af0b41e81b274e39128de6ffeb18
+DIST cmigemo-1.3c.tar.bz2 54323 BLAKE2B 4d63bde57c442131056e1aabcc702308243491de0632325b7a80af328e293c97479ac1733f29484a2ee7912f6d599360e7703d45612e8b30b52fd7a1228b5152 SHA512 240bdc92139d692cdb9e98a977f77105ef3ca716ede030629b3c4652276f0b0955ae80cc443fb879cada4b3fc83f7e4181043355e0285fcfe1011f4db4d13cc1
+EBUILD cmigemo-1.3c-r1.ebuild 1910 BLAKE2B 2137be59b724d22a4304ce6b385ea2d7f18fa284ee0ac641ae1d96bb8237c0d9d46f1d5576693d062f05da606d03bbb455352002f0ec2270885024a92b7ab56a SHA512 f8c23bbb27d3903b67923effcb087ca39c3e02a6168fa35867271935e408e2f1787fb30e23cab917050933c8d5c12b8d00f52e233630273649af43f98be08172
+EBUILD cmigemo-1.3c-r2.ebuild 2065 BLAKE2B 7922babddc037ccdc5e0f3ba99c250b1f66c5c3774e1989b94a10e1be5ce76e087857264b808eaabd3d955107c9c92aa13f9f727a9ce68333c0b36eb8ce790a1 SHA512 0b7889d5d72b57f5b9b9d917fff39a125e08b0f762cf0bb455370f4297788a3dc2ce50071c65e4e4cd5a01e10c54af38117f2cc785b121ad330b3bcd416b1772
+EBUILD cmigemo-1.3c.ebuild 1584 BLAKE2B 3962bce2bd338cb0871af5410d0cd8840075950dc728474131616e98354874940fc98999a9b683d1558e118c11d40dc6e8e9ef755ad7ca2b88b33a8e9471245c SHA512 dcb4708ea6ba2ed0f46a4ac61b3ca2776aa131e1880ec5a7ef39e1a474ec00504681569b1cb0dcc328c02e4962d0c8408e78c0d37eb976749616e65c89f94206
+MISC metadata.xml 234 BLAKE2B 8615ff091e2c6b2c5d9d4246dbec2ed0c5161ce154a59f492bc640a1428de7847757b68a8d926cae4bf78905d2aeeda10cb4cb0db9bf6870d38e811556299520 SHA512 16ea852f76297335e7ef70c8019fe09d46c0455922c049ba6e92696232e957955fd671d467ebdd0bf7837d39a26083d5be2a6f8abeba53807f0b8c5b97f2e441
diff --git a/app-text/cmigemo/cmigemo-1.3c-r1.ebuild b/app-text/cmigemo/cmigemo-1.3c-r1.ebuild
new file mode 100644
index 000000000000..6c9e1cd83229
--- /dev/null
+++ b/app-text/cmigemo/cmigemo-1.3c-r1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=2
+inherit eutils flag-o-matic multilib toolchain-funcs
+
+MY_P="${P}-MIT"
+DESCRIPTION="C/Migemo -- Migemo library implementation in C"
+HOMEPAGE="http://www.kaoriya.net/#CMIGEMO"
+SRC_URI="http://www.kaoriya.net/dist/var/${MY_P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="alpha ~amd64 ~ppc x86"
+IUSE="emacs unicode vim-syntax"
+
+DEPEND="dev-lang/perl
+	>=app-dicts/migemo-dict-200812[unicode=]
+	app-i18n/qkc"
+RDEPEND=">=app-dicts/migemo-dict-200812[unicode=]
+	emacs? ( >=app-text/migemo-0.40-r1 )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-1.2-migemo-dict.diff"
+	touch dict/SKK-JISYO.L
+	if use unicode ; then
+		sed -i -e "/gcc:/s/euc-jp/utf-8/" dict/dict.mak || die
+	fi
+
+	# Bug #246953
+	sed -i -e "s:-Wl,-rpath[^ ]*::" compile/Make_gcc.mak || die
+}
+
+src_compile() {
+	append-flags -fPIC
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" gcc || die
+}
+
+src_install() {
+	# parallel make install borks
+	emake -j1 \
+		prefix="${D}/usr" \
+		libdir="${D}/usr/$(get_libdir)" \
+		gcc-install || die
+
+	local encoding
+	if use unicode ; then
+		encoding="utf-8"
+	else
+		encoding="euc-jp"
+	fi
+
+	mv "${D}/usr/share/migemo/${encoding}/"*.dat "${D}/usr/share/migemo/"
+	rm -rf "${D}/usr/share/migemo/"{cp932,euc-jp,utf-8}
+
+	if use vim-syntax ; then
+		insinto /usr/share/vim/vimfiles/plugin
+		doins tools/migemo.vim
+	fi
+
+	dodoc doc/{README_j,TODO_j,vimigemo}.txt
+}
+
+pkg_postinst() {
+	if use emacs ; then
+		elog
+		elog "Please add to your ~/.emacs"
+		elog "    (setq migemo-command \"cmigemo\")"
+		elog "    (setq migemo-options '(\"-q\" \"--emacs\" \"-i\" \"\\\\a\"))"
+		elog "    (setq migemo-dictionary \"/usr/share/migemo/migemo-dict\")"
+		elog "    (setq migemo-user-dictionary nil)"
+		elog "    (setq migemo-regex-dictionary nil)"
+		elog "to use cmigemo instead of migemo under emacs."
+		elog
+	fi
+}
diff --git a/app-text/cmigemo/cmigemo-1.3c-r2.ebuild b/app-text/cmigemo/cmigemo-1.3c-r2.ebuild
new file mode 100644
index 000000000000..87e1a7d68af4
--- /dev/null
+++ b/app-text/cmigemo/cmigemo-1.3c-r2.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=2
+inherit eutils flag-o-matic multilib toolchain-funcs
+
+MY_P="${P}-MIT"
+DESCRIPTION="C/Migemo -- Migemo library implementation in C"
+HOMEPAGE="http://www.kaoriya.net/#CMIGEMO"
+SRC_URI="http://www.kaoriya.net/dist/var/${MY_P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~ppc x86"
+IUSE="emacs unicode vim-syntax"
+
+DEPEND=">=app-dicts/migemo-dict-200812[unicode=]
+	dev-lang/perl
+	|| (
+		net-misc/curl
+		net-misc/wget
+		net-misc/fetch
+	)
+	app-i18n/nkf"
+RDEPEND="${RDEPEND}
+	emacs? ( >=app-text/migemo-0.40-r1 )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	# Bug #246953
+	epatch "${FILESDIR}/${P}-gentoo.patch" \
+		"${FILESDIR}"/${P}-ldflags.patch
+
+	touch dict/SKK-JISYO.L
+	if use unicode ; then
+		sed -i -e "/gcc:/s/euc-jp/utf-8/" dict/dict.mak || die
+	fi
+
+	# Bug #255813
+	sed -i -e "/^docdir/s:/doc/migemo:/share/doc/${PF}:" compile/config.mk.in || die
+}
+
+src_compile() {
+	append-flags -fPIC
+	# parallel make b0rked
+	emake -j1 \
+		CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
+		gcc-all || die
+}
+
+src_install() {
+	# parallel make b0rked
+	emake -j1 \
+		prefix="${D}/usr" \
+		libdir="${D}/usr/$(get_libdir)" \
+		gcc-install || die
+
+	local encoding
+	if use unicode ; then
+		encoding="utf-8"
+	else
+		encoding="euc-jp"
+	fi
+
+	mv "${D}/usr/share/migemo/${encoding}/"*.dat "${D}/usr/share/migemo/"
+	rm -rf "${D}/usr/share/migemo/"{cp932,euc-jp,utf-8}
+
+	if use vim-syntax ; then
+		insinto /usr/share/vim/vimfiles/plugin
+		doins tools/migemo.vim
+	fi
+
+	dodoc doc/{README_j,TODO_j,vimigemo}.txt
+}
+
+pkg_postinst() {
+	if use emacs ; then
+		elog
+		elog "Please add to your ~/.emacs"
+		elog "    (setq migemo-command \"cmigemo\")"
+		elog "    (setq migemo-options '(\"-q\" \"--emacs\" \"-i\" \"\\\\a\"))"
+		elog "    (setq migemo-dictionary \"/usr/share/migemo/migemo-dict\")"
+		elog "    (setq migemo-user-dictionary nil)"
+		elog "    (setq migemo-regex-dictionary nil)"
+		elog "to use cmigemo instead of migemo under emacs."
+		elog
+	fi
+}
diff --git a/app-text/cmigemo/cmigemo-1.3c.ebuild b/app-text/cmigemo/cmigemo-1.3c.ebuild
new file mode 100644
index 000000000000..791d191e604f
--- /dev/null
+++ b/app-text/cmigemo/cmigemo-1.3c.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+inherit eutils
+
+DESCRIPTION="C/Migemo -- Migemo library implementation in C"
+HOMEPAGE="http://www.kaoriya.net/#CMIGEMO"
+SRC_URI="http://www.kaoriya.net/dist/var/${P}.tar.bz2"
+
+LICENSE="cmigemo"
+SLOT="0"
+KEYWORDS="x86 alpha ppc"	# development branch
+IUSE="emacs"
+
+DEPEND="app-i18n/qkc
+	app-dicts/migemo-dict"
+RDEPEND="app-dicts/migemo-dict
+	emacs? ( >=app-text/migemo-0.40-r1 )"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch "${FILESDIR}"/${PN}-1.2-migemo-dict.diff
+	touch ${S}/dict/SKK-JISYO.L
+
+	# Bug #246953
+	sed -i -e "s:-Wl,-rpath[^ ]*::" compile/Make_gcc.mak || die
+}
+
+src_compile() {
+	emake CFLAGS="-fPIC ${CFLAGS}" gcc || die
+}
+
+src_install() {
+	make \
+		prefix=${D}/usr \
+		docdir=${D}/usr/share/doc/${P} \
+		gcc-install || die
+
+	mv ${D}/usr/share/migemo/euc-jp/*.dat ${D}/usr/share/migemo
+	rm -rf ${D}/usr/share/migemo/{cp932,euc-jp}
+
+	if has_version 'app-editors/vim-core' ; then
+		insinto /usr/share/vim/vimfiles/plugin
+		doins tools/migemo.vim
+	fi
+
+	dodoc tools/migemo.vim
+	dodoc doc/{README_j,TODO_j,vimigemo}.txt
+}
+
+pkg_postinst() {
+	if use emacs ; then
+		elog
+		elog "Please add to your ~/.emacs"
+		elog "    (setq migemo-command \"cmigemo\")"
+		elog "    (setq migemo-options '(\"-q\" \"--emacs\" \"-i\" \"\\\\a\"))"
+		elog "    (setq migemo-dictionary \"/usr/share/migemo/migemo-dict\")"
+		elog "    (setq migemo-user-dictionary nil)"
+		elog "    (setq migemo-regex-dictionary nil)"
+		elog "to use cmigemo instead of migemo under emacs."
+		elog
+	fi
+}
diff --git a/app-text/cmigemo/files/cmigemo-1.2-migemo-dict.diff b/app-text/cmigemo/files/cmigemo-1.2-migemo-dict.diff
new file mode 100644
index 000000000000..a216ceafb0ca
--- /dev/null
+++ b/app-text/cmigemo/files/cmigemo-1.2-migemo-dict.diff
@@ -0,0 +1,23 @@
+diff -urN cmigemo-1.2.ORIG/tools/migemo.vim cmigemo-1.2/tools/migemo.vim
+--- cmigemo-1.2.ORIG/tools/migemo.vim	2003-01-07 22:57:59.000000000 +0900
++++ cmigemo-1.2/tools/migemo.vim	2004-03-13 17:25:31.944190968 +0900
+@@ -20,7 +20,7 @@
+     let dict = globpath(path, "migemo-dict")
+   endif
+   if dict == ''
+-    let dict = '/usr/local/share/migemo/'.&encoding.'/migemo-dict'
++    let dict = '/usr/share/migemo/migemo-dict'
+     if !filereadable(dict)
+       let dict = ''
+     endif
+@@ -43,7 +43,9 @@
+   nnoremap <Leader>f :call <SID>SearchChar(0)<CR>
+ else
+   " non-builtin version
+-  let g:migemodict = s:SearchDict()
++  if !exists('g:migemodict')
++    let g:migemodict = s:SearchDict()
++  endif
+   command! -nargs=* Migemo :call <SID>MigemoSearch(<q-args>)
+   nnoremap <silent> <leader>mi :call <SID>MigemoSearch('')<cr>
+ 
diff --git a/app-text/cmigemo/files/cmigemo-1.3c-gentoo.patch b/app-text/cmigemo/files/cmigemo-1.3c-gentoo.patch
new file mode 100644
index 000000000000..2f903bb9bb62
--- /dev/null
+++ b/app-text/cmigemo/files/cmigemo-1.3c-gentoo.patch
@@ -0,0 +1,55 @@
+diff -Naur cmigemo-1.3c-MIT.orig/compile/Make_gcc.mak cmigemo-1.3c-MIT/compile/Make_gcc.mak
+--- cmigemo-1.3c-MIT.orig/compile/Make_gcc.mak	2003-10-19 16:00:59.000000000 +0900
++++ cmigemo-1.3c-MIT/compile/Make_gcc.mak	2009-11-08 16:45:32.485952233 +0900
+@@ -14,7 +14,7 @@
+ libmigemo	= libmigemo.so
+ EXEEXT		=
+ CFLAGS_MIGEMO	= -fPIC
+-LDFLAGS_MIGEMO	= -Wl,-rpath,.,-rpath,/usr/local/lib,-rpath,/usr/lib
++LDFLAGS_MIGEMO	=
+ 
+ include config.mk
+ include compile/unix.mak
+diff -Naur cmigemo-1.3c-MIT.orig/configure cmigemo-1.3c-MIT/configure
+--- cmigemo-1.3c-MIT.orig/configure	2004-06-19 12:50:27.000000000 +0900
++++ cmigemo-1.3c-MIT/configure	2009-11-08 16:40:42.688962262 +0900
+@@ -31,12 +31,12 @@
+ fi
+ 
+ # Check encoding filter
+-if CHECK_COMMAND qkc ; then
+-  PROGRAM_ENCODEFILTER="qkc -q -u"
+-elif CHECK_COMMAND nkf ; then
++if CHECK_COMMAND nkf ; then
+   PROGRAM_ENCODEFILTER="nkf -x"
++elif CHECK_COMMAND qkc ; then
++  PROGRAM_ENCODEFILTER="qkc -q -u"
+ else
+-  echo "ERROR: Require qkc or nkf installed for encode filter."
++  echo "ERROR: Require nkf or qkc installed for encode filter."
+   exit 1
+ fi
+ 
+diff -Naur cmigemo-1.3c-MIT.orig/tools/migemo.vim cmigemo-1.3c-MIT/tools/migemo.vim
+--- cmigemo-1.3c-MIT.orig/tools/migemo.vim	2004-02-23 16:32:53.000000000 +0900
++++ cmigemo-1.3c-MIT/tools/migemo.vim	2009-11-08 16:42:19.572951008 +0900
+@@ -20,7 +20,7 @@
+     let dict = globpath(path, "migemo-dict")
+   endif
+   if dict == ''
+-    let dict = '/usr/local/share/migemo/'.&encoding.'/migemo-dict'
++    let dict = '/usr/share/migemo/migemo-dict'
+     if !filereadable(dict)
+       let dict = ''
+     endif
+@@ -43,7 +43,9 @@
+   nnoremap <Leader>f :call <SID>SearchChar(0)<CR>
+ else
+   " non-builtin version
+-  let g:migemodict = s:SearchDict()
++  if !exists('g:migemodict')
++    let g:migemodict = s:SearchDict()
++  endif
+   command! -nargs=* Migemo :call <SID>MigemoSearch(<q-args>)
+   nnoremap <silent> <leader>mi :call <SID>MigemoSearch('')<cr>
+ 
diff --git a/app-text/cmigemo/files/cmigemo-1.3c-ldflags.patch b/app-text/cmigemo/files/cmigemo-1.3c-ldflags.patch
new file mode 100644
index 000000000000..2f4f8c922431
--- /dev/null
+++ b/app-text/cmigemo/files/cmigemo-1.3c-ldflags.patch
@@ -0,0 +1,13 @@
+diff --git a/compile/Make_gcc.mak b/compile/Make_gcc.mak
+index f042ac6..f91fe92 100644
+--- a/compile/Make_gcc.mak
++++ b/compile/Make_gcc.mak
+@@ -28,7 +28,7 @@ include compile/clean_unix.mak
+ #
+ $(libmigemo_LIB): $(libmigemo_DSO)
+ $(libmigemo_DSO): $(libmigemo_OBJ)
+-	$(CC) -shared -o $(libmigemo_LIB) -Wl,-soname,$@ $(libmigemo_OBJ)
++	$(CC) -shared -o $(libmigemo_LIB) -Wl,-soname,$@ $(libmigemo_OBJ) $(LDFLAGS)
+ 	$(RM) $@ $(libmigemo)
+ 	ln -s $(libmigemo_LIB) $@
+ 	ln -s $(libmigemo_LIB) $(libmigemo)
diff --git a/app-text/cmigemo/metadata.xml b/app-text/cmigemo/metadata.xml
new file mode 100644
index 000000000000..6f2ca22da233
--- /dev/null
+++ b/app-text/cmigemo/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-text/code2html-0.9.1-r2 b/app-text/code2html-0.9.1-r2
deleted file mode 100644
index 82528c28e4e3..000000000000
--- a/app-text/code2html-0.9.1-r2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=Converts source files to colored HTML output
-EAPI=5
-HOMEPAGE=http://www.palfrader.org/code2html/
-KEYWORDS=amd64 hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=MIT
-RDEPEND=>=dev-lang/perl-5
-SLOT=0
-SRC_URI=http://www.palfrader.org/code2html/all/code2html-0.9.1.tar.gz mirror://gentoo/code2html-0.9.1-gentoo_patches.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3926a7668d90b6baa32b069fe3290b32
diff --git a/app-text/code2html/Manifest b/app-text/code2html/Manifest
new file mode 100644
index 000000000000..2a17dd47fbc6
--- /dev/null
+++ b/app-text/code2html/Manifest
@@ -0,0 +1,6 @@
+AUX code2html-0.9.1-prefix.patch 1393 BLAKE2B 84fc0e9c60772dab33ddee16fe62e96c36c321a92b973006aef6238a78a8aa7d769b14fe8e74fc993112ce7ff227876b8db467e3c10b60ccadab4f26f8b80a0c SHA512 3331c0590e992b098548cc10deffc270b4ed7cb790b747124a2053ba8a96274bcdaa08eaf8513f24a6ec8d9fb6b9bb93f8690a55d00e767085c005dc2e5f7ca4
+AUX code2html-0.9.1-scalar.patch 1435 BLAKE2B aff200017e0cb68ce17a9d8f7ee7eee6576cec4002b04ff4022f37232267169130fe1ab438258daf8f5a32283d99d4911e1203baa02b71486c9da3aef6c35632 SHA512 5e7124876b2888b24792d351d958efc09daee90422cf457a2a820920d6185df0d53dbd68f79acb084e4b4fed45fece8dcfc642ae94f0def78567e4f8366022b6
+DIST code2html-0.9.1-gentoo_patches.tar.bz2 2666 BLAKE2B 31c750aae9dbe9eddc77840a70535a5a6f1d495aa2015efe4afbded2481f2b7b171a95ab20ffcafd38a953170a6da0e8ccf895fded432ca7a16de6cdbc0d58d0 SHA512 cd478b53f0c11b9b4838a842bd8cb344698c85b1c3e09f03a75214f4002f4748a15f995530d6b6c743a4edb784c8aa703786ec10d3bda971b9485153e7090fdc
+DIST code2html-0.9.1.tar.gz 39811 BLAKE2B 57724d636d53066458b806266fc0a61e44919608ad44d65c540d0b6442e93acd822fcdc68c6c3279614b0887a9b7e6553e2de2c1a27679bd34c971ad1a05d70b SHA512 97fb8cadfe64a389711c58b13b7b5d977849f3a242c32a2456f93d7abd39f5d0a4152416f5c73aa05f151316ea0d8486b2b9923a5390eefec3e9d8253cc0b2d3
+EBUILD code2html-0.9.1-r2.ebuild 1024 BLAKE2B bdd4d69c61559aa2ae33573810cb7472ac10a8ee6acaf3e8d8aa0014415909ab559495548bd535a76c901f60d7cee403a5dc19e3d3705f31f0f1b00338583fc5 SHA512 17b5612546ef90b77cbaa14f3da9820dda7c7a11da5b7cf1d760b829aaafb14cd2b89bd8f5d3d8b5c3c1a0b34e3c72e12d380ad047decf3bacdd1a1831765a35
+MISC metadata.xml 363 BLAKE2B 7c3380eb1a4e1f2e83e72891a54030ee93e271468afff70a22034736f9a62475f2b275f8ec47b2e4d10de4aa5590987a04db1f0ea64b17b07bf163ced3a6ef3f SHA512 52e56f49ca7fa6b899f18be6602bd2e1c2987e5a4663593cc2e857a47e0f55637585801e656f79029e68d277a2b89d83f27953644fc778f6e7d425e2c3adb00f
diff --git a/app-text/code2html/code2html-0.9.1-r2.ebuild b/app-text/code2html/code2html-0.9.1-r2.ebuild
new file mode 100644
index 000000000000..fbcb1710f60b
--- /dev/null
+++ b/app-text/code2html/code2html-0.9.1-r2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils prefix
+
+DESCRIPTION="Converts source files to colored HTML output"
+HOMEPAGE="http://www.palfrader.org/code2html/"
+SRC_URI="http://www.palfrader.org/code2html/all/${P}.tar.gz
+	mirror://gentoo/${P}-gentoo_patches.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE=""
+
+DEPEND=""
+RDEPEND=">=dev-lang/perl-5"
+
+src_prepare() {
+	# Be consistent in color codes (bug #119406)
+	epatch "${WORKDIR}"/${P}-lowercase_color_codes.patch
+
+	# Improved C++ support (bug #133159)
+	epatch "${WORKDIR}"/${P}-cpp_keywords.patch
+
+	# Improved Ada support (bug #133176)
+	epatch "${WORKDIR}"/${P}-ada_identifiers.patch
+
+	# For prefix paths
+	epatch "${FILESDIR}"/${P}-prefix.patch
+	eprefixify code2html
+
+	# For newer Perl, bug 523610
+	epatch "${FILESDIR}"/${P}-scalar.patch
+}
+
+src_install() {
+	dobin code2html
+	dodoc ChangeLog CREDITS README
+	doman code2html.1
+}
diff --git a/app-text/code2html/files/code2html-0.9.1-prefix.patch b/app-text/code2html/files/code2html-0.9.1-prefix.patch
new file mode 100644
index 000000000000..cc27296fb71c
--- /dev/null
+++ b/app-text/code2html/files/code2html-0.9.1-prefix.patch
@@ -0,0 +1,30 @@
+--- code2html
++++ code2html
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl -w
++#!@GENTOO_PORTAGE_EPREFIX@/usr/bin/perl -w
+ use locale;
+ my $vernr = "0.9.1";
+ my $monthshort = "Jan";
+@@ -45,9 +45,9 @@
+ # PP: A hash would be nicer but then it would not possible to get the keys in this very order (AFAIK)
+ # PP: If names contain meta characters, then those must be metaquoted (if you don't want the meta chars to be meta chars of course)
+ my @CGI_ENCODING = (
+-		    ['bzip2'     , '/usr/bin/bzip2'    , '--stdout' ],
+-		    ['gzip'      , '/bin/gzip'         , '--stdout' ],
+-		    ['compress'  , '/usr/bin/compress' , '-c' ]
++		    ['bzip2'     , '@GENTOO_PORTAGE_EPREFIX@/usr/bin/bzip2'    , '--stdout' ],
++		    ['gzip'      , '@GENTOO_PORTAGE_EPREFIX@/bin/gzip'         , '--stdout' ],
++		    ['compress'  , '@GENTOO_PORTAGE_EPREFIX@/usr/bin/compress' , '-c' ]
+ 		   );
+ 
+ 
+@@ -147,7 +147,7 @@
+       # building up the database
+       # newer entries overwrite old ones
+       my @CONFIG_FILES;
+-      push @CONFIG_FILES, "/etc/code2html.config";
++      push @CONFIG_FILES, "@GENTOO_PORTAGE_EPREFIX@/etc/code2html.config";
+       push @CONFIG_FILES, $ENV{'HOME'}."/.code2html.config"   if (defined($ENV{'HOME'}));
+       push @CONFIG_FILES, split(/:/,$ENV{'CODE2HTML_CONFIG'}) if ($ENV{'CODE2HTML_CONFIG'});
+       push @CONFIG_FILES, split(/:/,$params{'langfile'})      if defined($params{'langfile'});
diff --git a/app-text/code2html/files/code2html-0.9.1-scalar.patch b/app-text/code2html/files/code2html-0.9.1-scalar.patch
new file mode 100644
index 000000000000..eddc89a6a8f7
--- /dev/null
+++ b/app-text/code2html/files/code2html-0.9.1-scalar.patch
@@ -0,0 +1,20 @@
+--- code2html.orig	2002-01-12 22:17:02.000000000 +0100
++++ code2html	2014-09-24 13:52:52.000000000 +0200
+@@ -1357,7 +1357,7 @@
+ 								   my @lines = split ( /\n/, $_[0] );
+ 
+                                                                    my $nr = 0;
+-                                                                   my $lengthofnr = length(@lines);
++                                                                   my $lengthofnr = length(scalar(@lines));
+                                                                    my $format = qq{<a name="$_[1]line%u">%${lengthofnr}u</a> %s\n} ;
+ 					                           join ('', map (  {$nr++; sprintf ( $format , $nr, $nr, $_ )} @lines));
+ 					                           },
+@@ -1367,7 +1367,7 @@
+ 								   my @lines = split ( /\n/, $_[0] );
+ 
+                                                                    my $nr = 0; 
+-                                                                   my $lengthofnr = length(@lines);
++                                                                   my $lengthofnr = length(scalar(@lines));
+                                                                    my $format = qq{<a name="$_[1]line%u" href="#$_[1]line%u">%$ {lengthofnr}u</a> %s\n};
+                                                                    join ('', map (  {$nr++; sprintf ( $format , $nr, $nr, $nr, $_ )} @lines));
+ 					                           }
diff --git a/app-text/code2html/metadata.xml b/app-text/code2html/metadata.xml
new file mode 100644
index 000000000000..a669204029fc
--- /dev/null
+++ b/app-text/code2html/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+<longdescription>
+  Code2HTML converts a program source code to syntax highlighted
+  HTML. It may be called as a CGI script. It can also handle include
+  commands in HTML files.
+</longdescription>
+</pkgmetadata>
diff --git a/app-text/convertlit-1.8-r3 b/app-text/convertlit-1.8-r3
deleted file mode 100644
index d316a8856dcc..000000000000
--- a/app-text/convertlit-1.8-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=>=dev-libs/libtommath-0.36-r1 app-arch/unzip
-DESCRIPTION=CLit converts MS ebook .lit files to .opf (xml+html+png+jpg)
-EAPI=6
-HOMEPAGE=http://www.convertlit.com/
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/libtommath-0.36-r1
-SLOT=0
-SRC_URI=http://www.convertlit.com/clit18src.zip
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=7530c8c1795f8eed62bde071360ebd7f
diff --git a/app-text/convertlit/Manifest b/app-text/convertlit/Manifest
new file mode 100644
index 000000000000..071b67e6af52
--- /dev/null
+++ b/app-text/convertlit/Manifest
@@ -0,0 +1,6 @@
+AUX convertlit-1.8-respectflags-r1.patch 838 BLAKE2B 4ba437ea3a7eb23e08c262b6e6bf031c27f31c7f9e84002767e8225fa939f0bf5142b8d7928a64fc279b28f4b51b2237b9590bb0d98eeb2fe33ba0493aa21c0c SHA512 d02f79dd787712eeab3b13ea7b7e8553a3aa31767bf1a10cc6a714c9e93b6c82ae1fefce9507393268bcbd8bcd9d5939ea41da4a5b18368f4244b5f2e6eb2256
+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-r3.ebuild 951 BLAKE2B 710d2cea0762a47128c8ab78b49ff4d7d3000d986d83f8a14fc5bd9b7aaf2fc029017f5ee7c546cd9100230a2cade1dc4a885af41af85983747bbe601d892a9b SHA512 b95136ce98aeb00b1bcd455984bcc1f2605afac35364e6b7c17558aac169f99eceee28ac1bf1c755ccde14057a42dbdade005fd8a77e26c876baf0fb00e9c196
+MISC metadata.xml 562 BLAKE2B 65f7b124b050f42c8c6f800e2e05d2e9404869c42a1217e0d280895d52d8f2588f37bbb4a696cffb58129f080580aee9cbca83740e888ccf9d272a8162a053ef SHA512 1264f1669bece35fbd465ebf7911c7d416d85d092aa6e1601b240728fc2a0cb521d913e3bae08962fc5e70c2b70ee17989191e0bc21f04c9c1ed30592ff4820e
diff --git a/app-text/convertlit/convertlit-1.8-r3.ebuild b/app-text/convertlit/convertlit-1.8-r3.ebuild
new file mode 100644
index 000000000000..7befeb7eb306
--- /dev/null
+++ b/app-text/convertlit/convertlit-1.8-r3.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit 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 ~arm64 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"
+
+S="${WORKDIR}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-respectflags-r1.patch"
+	"${FILESDIR}/fix-Wformat-security-warnings.patch"
+	"${FILESDIR}/support-ar-variable.patch"
+)
+
+src_compile() {
+	tc-export CC
+
+	cd "${S}/lib" || die "failed to change into ${S}/lib directory"
+	emake
+	cd "${S}/${MY_P}" || die "failed to change into ${S}/${MY_P} directory"
+	emake
+}
+
+src_install() {
+	einstalldocs
+	dobin "${MY_P}/clit"
+}
diff --git a/app-text/convertlit/files/convertlit-1.8-respectflags-r1.patch b/app-text/convertlit/files/convertlit-1.8-respectflags-r1.patch
new file mode 100644
index 000000000000..faedfa0a30a5
--- /dev/null
+++ b/app-text/convertlit/files/convertlit-1.8-respectflags-r1.patch
@@ -0,0 +1,28 @@
+Index: clit18/Makefile
+===================================================================
+--- a/clit18/Makefile
++++ b/clit18/Makefile
+@@ -1,9 +1,9 @@
+ all: clit

+ 

+-CFLAGS=-funsigned-char -Wall -O2 -I ../libtommath-0.30/ -I ../lib -I ../lib/des -I .

++CFLAGS+=-funsigned-char -I ../lib -I ../lib/des -I . 

+ clean:

+ 	rm -f *.o clit

+ 

+ clit: clit.o hexdump.o drm5.o explode.o transmute.o display.o utils.o manifest.o ../lib/openclit.a 

+-	gcc -o clit $^  ../libtommath-0.30/libtommath.a

++	$(CC) $(LDFLAGS) -o clit $^ -ltommath

+ 

+Index: lib/Makefile
+===================================================================
+--- a/lib/Makefile
++++ b/lib/Makefile
+@@ -1,6 +1,6 @@
+ all: openclit.a

+ 

+-CFLAGS=-O3 -Wall -Ides -Isha -Inewlzx -I.

++CFLAGS+=-Ides -Isha -Inewlzx -I.

+ clean:

+ 	rm -f *.o openclit.a des/*.o lzx/*.o sha/*.o

+ 

diff --git a/app-text/convertlit/files/fix-Wformat-security-warnings.patch b/app-text/convertlit/files/fix-Wformat-security-warnings.patch
new file mode 100644
index 000000000000..78410a960f78
--- /dev/null
+++ b/app-text/convertlit/files/fix-Wformat-security-warnings.patch
@@ -0,0 +1,34 @@
+From 79ab07db8d91b6c6e0c36358c8030893c28510ba Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Tue, 2 Aug 2016 10:32:53 -0400
+Subject: [PATCH 1/1] clit.c: fix -Wformat-security warnings.
+
+Two uses of printf() in clit.c were triggering -Wformat-security
+warnings due to a missing "%s" format string. This was causing
+compilation to fail with -Werror=format-security, so they have
+been fixed.
+
+Gentoo-Bug: 521246
+---
+ clit18/clit.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/clit18/clit.c b/clit18/clit.c
+index c13a75d..48b749f 100644
+--- a/clit18/clit.c
++++ b/clit18/clit.c
+@@ -125,9 +125,9 @@ int main(int argc, char ** argv)
+             dir_program[i+1] = '\0'; break;

+         }

+     }

+-    printf(sTitle);

++    printf("%s", sTitle);

+     if (argc < 3) { 

+-        printf(sUsage);

++        printf("%s", sUsage);

+         return -1;

+     }

+     base = 1;

+-- 
+2.7.3
+
diff --git a/app-text/convertlit/files/support-ar-variable.patch b/app-text/convertlit/files/support-ar-variable.patch
new file mode 100644
index 000000000000..4bd3e822f31d
--- /dev/null
+++ b/app-text/convertlit/files/support-ar-variable.patch
@@ -0,0 +1,11 @@
+diff --git a/lib/Makefile b/lib/Makefile
+index 9104f27..0c8b197 100644
+--- a/lib/Makefile
++++ b/lib/Makefile
+@@ -6,5 +6,5 @@ clean:
+ 

+ openclit.a: litatom.o litdrm.o litlib.o litembiggen.o littags.o litmetatags.o litmanifest.o litdirectory.o litsections.o litheaders.o litutil.o sha/mssha1.o des/des.o newlzx/lzxglue.o newlzx/lzxd.o

+ 	-rm -f openclit.a

+-	ar rv openclit.a $^

++	$(AR) rv openclit.a $^

+ 

diff --git a/app-text/convertlit/metadata.xml b/app-text/convertlit/metadata.xml
new file mode 100644
index 000000000000..d566173e69a9
--- /dev/null
+++ b/app-text/convertlit/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<longdescription lang="en">
+	Convert Lit is a simple program to use .lit or Microsoft ebook files on
+	Linux. It's able to "explode" the ebook into Open Ebook Specification
+	Format (OEBPS), which than can be read by Opera and other Linux programs
+	(it's just xml, html, png and jpeg). Note that you won't get any
+	DRM-bypassing, so your .lit-file must not be copy protected.
+	</longdescription>
+</pkgmetadata>
diff --git a/app-text/convmv-2.04 b/app-text/convmv-2.04
deleted file mode 100644
index c5b8536cfe11..000000000000
--- a/app-text/convmv-2.04
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install prepare test
-DEPEND=dev-lang/perl
-DESCRIPTION=convert filenames to utf8 or any other charset
-EAPI=6
-HOMEPAGE=https://www.j3e.de/linux/convmv/
-KEYWORDS=alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl
-SLOT=0
-SRC_URI=https://www.j3e.de/linux/convmv/convmv-2.04.tar.gz
-_md5_=c19e9c0bc877a6acf25e8671d6f0e1cf
diff --git a/app-text/convmv-2.05 b/app-text/convmv-2.05
deleted file mode 100644
index e42cbe29f1ea..000000000000
--- a/app-text/convmv-2.05
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install prepare test
-DEPEND=dev-lang/perl
-DESCRIPTION=convert filenames to utf8 or any other charset
-EAPI=6
-HOMEPAGE=https://www.j3e.de/linux/convmv/
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl
-SLOT=0
-SRC_URI=https://www.j3e.de/linux/convmv/convmv-2.05.tar.gz
-_md5_=34fbe7972cb01a29b489fedceaa1ecbd
diff --git a/app-text/convmv/Manifest b/app-text/convmv/Manifest
new file mode 100644
index 000000000000..0992dc4441c9
--- /dev/null
+++ b/app-text/convmv/Manifest
@@ -0,0 +1,5 @@
+DIST convmv-2.04.tar.gz 30082 BLAKE2B 51521e5e44c635b72c406b6b732850e7f5e50b64d30bfd8770ca1ab49e3fd10d45447114f8adbf8b79fd381dfaf6b4782246d3e10aae471a49a52a20c8ce0405 SHA512 987411047af0b1e952cd11937c70ddd972b2e3534f4fcc6c659243dedef69af4aad90ceaa3789aec6bad6cba0999c38839451f90844b171773165b6e5899f6ac
+DIST convmv-2.05.tar.gz 30680 BLAKE2B b0d4bb14995e42e55fa34cbdaa8cb8881e48972abb296af44eebfdf76664e837b05398e0cc4e9208ddee41213bc1dd7f11c3f503e39f9a6791d08797864776a1 SHA512 7fb0d1e2b64c3105c48d8a2cbb59fa4ea23202f17abc7cbf63acfca785683f00955fdcb03517e9dd8fe01be0171458ab2583e1c52d62c6081684462b0fec4125
+EBUILD convmv-2.04.ebuild 697 BLAKE2B 443ca020bb9892554971a94f01ac8a0a3ac46146f0ce988a05ca9761b333a1233d745881e8c161613925188b042069387bcebf83e1f49ad00f0a4d8a56006002 SHA512 4bb4a850b35166d82cba67b8e2c3da90e804c4d9fc6dd219566215bb0fe5af5649c67414eeef5e363fd6dab3ac3de1fa3fb68a3cf15b2b1f9e505a6262458f43
+EBUILD convmv-2.05.ebuild 712 BLAKE2B 0c338bcf39f82f15cb1e72fa53e7702a926f22890f548af0ae1aee2827ff1010dc5e809c012afab3e1a51dd4ddc4a0aed07fd0b1bb534d29c8f613b35f4a1f2c SHA512 fa5230e72fdf9e78df8c6b0e1d1c1170d96005660cedb3c829005312af4ab44ae7f9067adc8f6cdf30828b37e2cd6dbaa44731092f9540a53ab861705b57ffd5
+MISC metadata.xml 257 BLAKE2B 35c1b06807230338ceb9de70f79760d55e93dcdba508da3c663e785ab3966781edc2098abd8df084b2ecabbf40ff8e8e4a0d0a6e131daf648ff58e101cf27587 SHA512 ff078cacb115b8f3624b45d883d8ed72701e3d2fccae06c04c633eb60821b23681cc151e00689d1b6035c94570535e7ac0de51a55dae99f606886164883185ea
diff --git a/app-text/convmv/convmv-2.04.ebuild b/app-text/convmv/convmv-2.04.ebuild
new file mode 100644
index 000000000000..b63b14e8de57
--- /dev/null
+++ b/app-text/convmv/convmv-2.04.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="convert filenames to utf8 or any other charset"
+HOMEPAGE="https://www.j3e.de/linux/convmv/"
+SRC_URI="https://www.j3e.de/linux/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86"
+IUSE=""
+
+DEPEND="dev-lang/perl"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+	sed -i -e "1s|#!/usr|#!${EPREFIX}/usr|" convmv || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install
+	dodoc CREDITS Changes TODO VERSION
+}
+
+src_test() {
+	unpack ./testsuite.tar
+
+	cd "${S}"/suite
+	./dotests.sh || die "Tests failed"
+}
diff --git a/app-text/convmv/convmv-2.05.ebuild b/app-text/convmv/convmv-2.05.ebuild
new file mode 100644
index 000000000000..59f68eebfee8
--- /dev/null
+++ b/app-text/convmv/convmv-2.05.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="convert filenames to utf8 or any other charset"
+HOMEPAGE="https://www.j3e.de/linux/convmv/"
+SRC_URI="https://www.j3e.de/linux/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DEPEND="dev-lang/perl"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+	sed -i -e "1s|#!/usr|#!${EPREFIX}/usr|" convmv || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install
+	dodoc CREDITS Changes TODO VERSION
+}
+
+src_test() {
+	unpack ./testsuite.tar
+
+	cd "${S}"/suite || die
+	./dotests.sh || die "Tests failed"
+}
diff --git a/app-text/convmv/metadata.xml b/app-text/convmv/metadata.xml
new file mode 100644
index 000000000000..c7be278b6458
--- /dev/null
+++ b/app-text/convmv/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>polynomial-c@gentoo.org</email>
+    <name>Lars Wendler</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-text/cook-1.0.2-r1 b/app-text/cook-1.0.2-r1
deleted file mode 100644
index f28988072359..000000000000
--- a/app-text/cook-1.0.2-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install postinst
-DESCRIPTION=Embedded language which can be used as a macro preprocessor
-EAPI=0
-HOMEPAGE=http://cook.sourceforge.net/
-KEYWORDS=~amd64 ppc x86 ~x86-linux ~ppc-macos ~sparc-solaris
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://sourceforge/cook/cook-1.0.2.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=4d93ed6466e8c9448554d88bc4af1f0c
diff --git a/app-text/cook/Manifest b/app-text/cook/Manifest
new file mode 100644
index 000000000000..3edc6186a43b
--- /dev/null
+++ b/app-text/cook/Manifest
@@ -0,0 +1,3 @@
+DIST cook-1.0.2.tar.gz 139428 BLAKE2B c3f1a3e753a7de14fce4f357af64f99af5e0a515988bb2aef40b79a0cc70dcba4bb585c1fa31e0da1d235fc1c363e9693338756f2bd784898a7dc63944b9ed51 SHA512 6941d3541a6cccc18fcbf14128e0593556148d40f74715b0da943455a223099406d632466137fabef27a2083b582701df92666a1ad6e6a04f5d2d3dc0b62e1a1
+EBUILD cook-1.0.2-r1.ebuild 1131 BLAKE2B 054ff9116919a34d481cf45d4ac8a27dba153265e9debbfaf0e31803554015aec4ea39b6f5a66e7f9b0d51ebe23d01c74a30b320669bd645414336c993563c6b SHA512 0bc16805bb07f199d2885c06481343efea93647a57e50b9298437f202bcdc208ff5b8169cd8f109e7d84846cce8af34b409ee528e561ab91398af0a694212ecb
+MISC metadata.xml 241 BLAKE2B 6f92bb59126251d9e6b2cae4fa0a43926317c6c133dd882e845fe0b693238311241463d8de465e36ff2e90c7c25ea35309e3bc5b0c20a32153965ce0b626a1da SHA512 36edaae333e04297f6f6357cbcaaf6360580a83e20ec3af8b09c1010601e47c29c45b6eec5347cb90f8fc1fecdffeb1074d3ee55dda78c29026210ea58a7264c
diff --git a/app-text/cook/cook-1.0.2-r1.ebuild b/app-text/cook/cook-1.0.2-r1.ebuild
new file mode 100644
index 000000000000..cfa071431faf
--- /dev/null
+++ b/app-text/cook/cook-1.0.2-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+inherit toolchain-funcs
+
+DESCRIPTION="Embedded language which can be used as a macro preprocessor"
+HOMEPAGE="http://cook.sourceforge.net/"
+SRC_URI="mirror://sourceforge/cook/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ppc x86 ~x86-linux ~ppc-macos ~sparc-solaris"
+IUSE=""
+
+DEPEND=""
+
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" || die "emake failed"
+}
+
+src_install() {
+	use prefix || EPREFIX=
+
+	dodoc README doc/cook.txt doc/cook.html || die "dodoc failed"
+
+	insinto /usr/share/doc/${PF}/example
+	doins test/pcb.dbdef test/pcb.dg test/pcbprol.ps test/tempsens.pcb || die "doins failed"
+
+	newbin src/cook cookproc || die "newbin failed"
+
+	cat > "${T}"/README.Gentoo <<EOF
+NOTICE:
+
+ ${EPREFIX}/usr/bin/cook has been renamed to ${EPREFIX}/usr/bin/cookproc in Gentoo
+
+ -- Karl Trygve Kalleberg <karltk@gentoo.org>
+EOF
+	dodoc "${T}"/README.Gentoo || die "dodoc failed"
+}
+
+pkg_postinst() {
+	ewarn "${EPREFIX}/usr/bin/cook has been renamed to ${EPREFIX}/usr/bin/cookproc"
+}
diff --git a/app-text/cook/metadata.xml b/app-text/cook/metadata.xml
new file mode 100644
index 000000000000..7e1c91980a55
--- /dev/null
+++ b/app-text/cook/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="sourceforge">cook</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/coolreader-3.1.2.71-r4 b/app-text/coolreader-3.1.2.71-r4
deleted file mode 100644
index fb06151d233d..000000000000
--- a/app-text/coolreader-3.1.2.71-r4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=sys-libs/zlib media-libs/libpng:0 virtual/jpeg:0 media-libs/freetype wxwidgets? ( x11-libs/wxGTK:3.0 ) !wxwidgets? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
-DESCRIPTION=CoolReader - reader of eBook files (fb2,epub,htm,rtf,txt)
-EAPI=6
-HOMEPAGE=https://sourceforge.net/projects/crengine/
-IUSE=wxwidgets l10n_bg l10n_cs l10n_de l10n_es l10n_hu l10n_pl l10n_ru l10n_uk
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=sys-libs/zlib media-libs/libpng:0 virtual/jpeg:0 media-libs/freetype wxwidgets? ( x11-libs/wxGTK:3.0 ) !wxwidgets? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) wxwidgets? ( || ( media-fonts/liberation-fonts media-fonts/corefonts ) )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~grozin/coolreader-3.1.2.71.tar.bz2
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	04e063b0eff26daaea83d859dd9d6e05	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3a8c3e6c0ea63a52faff3f9d32264591
diff --git a/app-text/coolreader-3.2.2.1 b/app-text/coolreader-3.2.2.1
deleted file mode 100644
index 178c2c13303f..000000000000
--- a/app-text/coolreader-3.2.2.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=sys-libs/zlib media-libs/libpng:0 virtual/jpeg:0 media-libs/freetype wxwidgets? ( x11-libs/wxGTK:3.0 ) !wxwidgets? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4
-DESCRIPTION=CoolReader - reader of eBook files (fb2,epub,htm,rtf,txt)
-EAPI=6
-HOMEPAGE=https://sourceforge.net/projects/crengine/
-IUSE=wxwidgets l10n_bg l10n_cs l10n_de l10n_es l10n_hu l10n_pl l10n_ru l10n_uk
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=sys-libs/zlib media-libs/libpng:0 virtual/jpeg:0 media-libs/freetype wxwidgets? ( x11-libs/wxGTK:3.0 ) !wxwidgets? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) wxwidgets? ( || ( media-fonts/liberation-fonts media-fonts/corefonts ) )
-SLOT=0
-SRC_URI=https://github.com/buggins/coolreader/archive/cr3.2.2-1.tar.gz -> coolreader-3.2.2.1.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	04e063b0eff26daaea83d859dd9d6e05	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d4fe3af57035d4ef94d6ae3d7b8d5019
diff --git a/app-text/coolreader/Manifest b/app-text/coolreader/Manifest
new file mode 100644
index 000000000000..801284577731
--- /dev/null
+++ b/app-text/coolreader/Manifest
@@ -0,0 +1,7 @@
+AUX cr3.1.2.71-r1_qt5_wx.diff 10066 BLAKE2B 8b1ecc7765735608e9651f23d1d9882186766e34c0ac5f9cac1312da68345d7a9028abaf9792f4ee85a4ddb5490fa1521d220b751eeeda84aa5ac79d92d33e88 SHA512 9f7a82964d1f5c308ad5124433dd0ed7debd715f1c0c2431bc84c9bf71d1d5dbbfb82a669b1c6ee114196c5e8ba1b745b07cc2195d4198c664ea15cf82182384
+AUX cr3ini.diff 1535 BLAKE2B 1eb5908bedf2a706d461ed84a60ed3232a4c98bee5d4b29c55e63d780d54785a1e3f77e9eb85d0675ac0efeb1652d505e9cef93b9c7dce39086c3b0a3f765c6b SHA512 efd7bfda3617168bda2bfad9e561b7bf3de89f141cf4155618bc6864fa5497d5b0e08ea583b302f4e9e3f60442472c7e5358313dd49549dce3fe078d58ee4ee5
+DIST coolreader-3.1.2.71.tar.bz2 10141514 BLAKE2B 143a69082a2dcabbb7a246df575e7ed2fddb4b11c542910faa2f6d44155f0de8ba6d7e0fd321b53fc0eda47c8d2867bfec02af3b95edbcb623f6a15fa6c4bc72 SHA512 2859eabfc8ba603d1cb09b07358887135b6968268a5f2fa7f874a1e8613d1b5ebe69d9b133f16e84321d1a460eae5088a7947433c6fb340a47bde9ceee415735
+DIST coolreader-3.2.2.1.tar.gz 12463566 BLAKE2B 208026a87b36a06cd0a2e83b60bb506174b2edec4e3f4d1663c9d630cf316afd54aa0dbd0fdf0d3e44e03277d39692bbada8b03376a22970321928e594632997 SHA512 c2e3ea139ff3969c16985a56a9605a59ae31c59f9dc962abcc4aae5d87b8c48c8d7ed716a7077dd9da93cefc0d9ba0fe8a43c50e33e3d58acbcdfc35b73b3538
+EBUILD coolreader-3.1.2.71-r4.ebuild 2366 BLAKE2B 94049adc28a85bbba7648a992ae1975307816f477d15fbd48343314a99504889ed22e1d4ebd7379620b295a1e378675c0a331f41a144045ee6cd060caeb08628 SHA512 21be4a384808ca943d2278fe592c3acbbce7ea6951000efe107cb744b937c8b68c32fe2f8824abcf32c41343e835265bed865e7c5a01bef7d0d77a83093d7f43
+EBUILD coolreader-3.2.2.1.ebuild 2020 BLAKE2B 17bc4cfc083d7bb30ea67b98a0dc700695823b8a39e0fc20ff4b4ae80178c5207c60838874a80a23cbbf99430d7b1b26e39b430b94d4e870b981eefed46ec961 SHA512 f8b5daa8dc76471bce823563f53e9e3810c9530a58dde042400996b73ba636b8a726115b72b2666b561a9f419865e5e56c227d94034292c5aa7edd557451fc27
+MISC metadata.xml 624 BLAKE2B fa86114594d823c9b73b590ebfa0ffe74955550f1d66b5f1197672484d4095be484f5f8f754acef06e34f9d69d658609653109bf8499235439bb1f3ad95b7be5 SHA512 33e57dbe75c3e2efaf1d793dad06b534fac861b3ffd25e4d441af91b8d6a8cae96b8d5c19bbf0845aa78ff404eee167998e09f948009b4ce1902a2f38625f9a8
diff --git a/app-text/coolreader/coolreader-3.1.2.71-r4.ebuild b/app-text/coolreader/coolreader-3.1.2.71-r4.ebuild
new file mode 100644
index 000000000000..33c7a7c28be5
--- /dev/null
+++ b/app-text/coolreader/coolreader-3.1.2.71-r4.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+WX_GTK_VER="3.0"
+PLOCALES="bg cs de es hu pl ru uk"
+inherit cmake-utils wxwidgets l10n xdg-utils gnome2-utils
+
+if [ "${PV}" == 9999 ]
+then
+	inherit git-r3
+	# github mirror has some new commits to fix page margins settings
+	# sourceforge mirror saved as backup
+	#EGIT_REPO_URI="git://git.code.sf.net/p/crengine/crengine"
+	EGIT_REPO_URI="https://github.com/buggins/coolreader.git"
+	SRC_URI=""
+else
+	# git tag cr3.1.2-71
+	SRC_URI="https://dev.gentoo.org/~grozin/${P}.tar.bz2"
+fi
+
+DESCRIPTION="CoolReader - reader of eBook files (fb2,epub,htm,rtf,txt)"
+HOMEPAGE="https://sourceforge.net/projects/crengine/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="wxwidgets"
+
+DEPEND="sys-libs/zlib
+	media-libs/libpng:0
+	virtual/jpeg:0
+	media-libs/freetype
+	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER} )
+	!wxwidgets? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )"
+RDEPEND="${DEPEND}
+	wxwidgets? ( || ( media-fonts/liberation-fonts media-fonts/corefonts ) )"
+
+# 1st patch: To save cr3.ini to ~homedir.
+# 2nd patch: To build QT5 and WX GUI version of coolreader3;
+# setting correct vesrion number and years of cr3qt/cr3wx;
+# internal switching between wxGTK 2.8 or 3.0 version;
+# show wxWidgets version in "About" dialog window;
+# disabling "iCCP: known incorrect sRGB profile" warning popup window for wxwidgets GUI
+
+PATCHES=( "${FILESDIR}/cr3ini.diff" "${FILESDIR}/cr3.1.2.71-r1_qt5_wx.diff" )
+
+for lang in ${PLOCALES}; do
+	IUSE="${IUSE} l10n_${lang}"
+done
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# locales
+	l10n_find_plocales_changes "${S}"/cr3qt/src/i18n 'cr3_' '.ts'
+	local lang langs
+	langs=""
+	for lang in ${PLOCALES}; do
+		if use l10n_${lang}; then
+			langs="${langs} ${lang}"
+		fi
+	done
+	sed -e "s|SET(LANGUAGES .*)|SET(LANGUAGES ${langs})|" \
+		-i "${S}"/cr3qt/CMakeLists.txt \
+		|| die "sed CMakeLists.txt failed"
+}
+
+src_configure() {
+	CMAKE_USE_DIR="${S}"
+	CMAKE_BUILD_TYPE="Release"
+	if use wxwidgets; then
+		setup-wxwidgets
+		local mycmakeargs=(-D GUI=WX)
+	else
+		local mycmakeargs=(-D GUI=QT5)
+	fi
+	cmake-utils_src_configure
+}
+
+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/coolreader/coolreader-3.2.2.1.ebuild b/app-text/coolreader/coolreader-3.2.2.1.ebuild
new file mode 100644
index 000000000000..3d97d3b6b4e7
--- /dev/null
+++ b/app-text/coolreader/coolreader-3.2.2.1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+WX_GTK_VER="3.0"
+PLOCALES="bg cs de es hu pl ru uk"
+inherit cmake-utils wxwidgets l10n xdg-utils gnome2-utils eapi7-ver
+
+CR_PV=$(ver_rs 3 '-')
+
+if [ "${PV}" != 9999 ]
+then
+	# git tag cr3.2.2-1
+	SRC_URI="https://github.com/buggins/${PN}/archive/cr${CR_PV}.tar.gz -> ${P}.tar.gz"
+else
+	inherit git-r3
+	# github mirror has some new commits to fix page margins settings
+	# sourceforge mirror saved as backup
+	#EGIT_REPO_URI="git://git.code.sf.net/p/crengine/crengine"
+	EGIT_REPO_URI="https://github.com/buggins/${PN}.git"
+	SRC_URI=""
+fi
+
+DESCRIPTION="CoolReader - reader of eBook files (fb2,epub,htm,rtf,txt)"
+HOMEPAGE="https://sourceforge.net/projects/crengine/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="wxwidgets"
+
+DEPEND="sys-libs/zlib
+	media-libs/libpng:0
+	virtual/jpeg:0
+	media-libs/freetype
+	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER} )
+	!wxwidgets? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )"
+RDEPEND="${DEPEND}
+	wxwidgets? ( || ( media-fonts/liberation-fonts media-fonts/corefonts ) )"
+
+S="${WORKDIR}/${PN}-cr${CR_PV}"
+
+for lang in ${PLOCALES}; do
+	IUSE="${IUSE} l10n_${lang}"
+done
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# locales
+	l10n_find_plocales_changes "${S}"/cr3qt/src/i18n 'cr3_' '.ts'
+	local lang langs
+	langs=""
+	for lang in ${PLOCALES}; do
+		if use l10n_${lang}; then
+			langs="${langs} ${lang}"
+		fi
+	done
+	sed -e "s|SET(LANGUAGES .*)|SET(LANGUAGES ${langs})|" \
+		-i "${S}"/cr3qt/CMakeLists.txt \
+		|| die "sed CMakeLists.txt failed"
+}
+
+src_configure() {
+	CMAKE_USE_DIR="${S}"
+	CMAKE_BUILD_TYPE="Release"
+	if use wxwidgets; then
+		setup-wxwidgets
+		local mycmakeargs=(-D GUI=WX)
+	else
+		local mycmakeargs=(-D GUI=QT5)
+	fi
+	cmake-utils_src_configure
+}
+
+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/coolreader/files/cr3.1.2.71-r1_qt5_wx.diff b/app-text/coolreader/files/cr3.1.2.71-r1_qt5_wx.diff
new file mode 100644
index 000000000000..434d4556da94
--- /dev/null
+++ b/app-text/coolreader/files/cr3.1.2.71-r1_qt5_wx.diff
@@ -0,0 +1,242 @@
+diff -Naur old/CMakeLists.txt new/CMakeLists.txt
+--- old/CMakeLists.txt	2017-08-30 18:31:28.000000000 +0300
++++ new/CMakeLists.txt	2017-09-02 23:43:38.000000000 +0300
+@@ -29,7 +29,7 @@
+   endif()
+ elseif(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
+   # Update if necessary
+-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-long-long -pedantic")
++  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-long-long -pedantic -std=c++11 -fPIC")
+ endif()
+ 
+ if (NOT DEFINED GUI)
+@@ -323,7 +323,7 @@
+   message("Will make CR3/WX")
+   ADD_DEFINITIONS( ${DESKTOP_DEFS} -DCR_WX_SUPPORT=1 )
+   SET(wxWidgets_USE_LIBS base core )
+-  FIND_PACKAGE(wxWidgets)
++  FIND_PACKAGE(wxWidgets 2.8)
+   IF (wxWidgets_FOUND)
+     INCLUDE(${wxWidgets_USE_FILE})
+     include_directories( ${wxWidgets_INCLUDE_DIRS} )
+diff -Naur old/cr3qt/CMakeLists.txt new/cr3qt/CMakeLists.txt
+--- old/cr3qt/CMakeLists.txt	2017-08-30 18:31:28.000000000 +0300
++++ new/cr3qt/CMakeLists.txt	2017-09-03 00:53:38.000000000 +0300
+@@ -173,7 +173,11 @@
+     SET (EXTRA_LIBS ${QT_LIBRARIES} ${STD_LIBS} )
+ #${QT_LIBRARIES} 
+ ELSEIF (UNIX)
+-    SET (EXTRA_LIBS ${QT_LIBRARIES} fontconfig ${STD_LIBS} )
++    IF( ${GUI} STREQUAL QT )
++	SET (EXTRA_LIBS ${QT_LIBRARIES} fontconfig ${STD_LIBS} )
++    ELSE()
++        SET (EXTRA_LIBS fontconfig ${STD_LIBS} ${Qt5Core_LIBRARIES} ${Qt5Widgets_LIBRARIES})
++    ENDIF()
+ ELSE()
+     SET (EXTRA_LIBS ${STD_LIBS} ${QT_LIBRARIES} ${Qt5Core_LIBRARIES} ${Qt5Widgets_LIBRARIES} )
+ ENDIF(MAC)
+diff -Naur old/cr3qt/src/aboutdlg.ui new/cr3qt/src/aboutdlg.ui
+--- old/cr3qt/src/aboutdlg.ui	2017-08-30 18:31:28.000000000 +0300
++++ new/cr3qt/src/aboutdlg.ui	2017-09-03 00:56:14.000000000 +0300
+@@ -56,7 +56,7 @@
+      <item>
+       <widget class="QLabel" name="label_2">
+        <property name="text">
+-        <string notr="true">(c) 1998-2010 Vadim Lopatin</string>
++        <string notr="true">(c) 1998-2015 Vadim Lopatin</string>
+        </property>
+       </widget>
+      </item>
+diff -Naur old/cr3wx/CMakeLists.txt new/cr3wx/CMakeLists.txt
+--- old/cr3wx/CMakeLists.txt	2017-08-30 18:31:28.000000000 +0300
++++ new/cr3wx/CMakeLists.txt	2017-09-03 00:54:59.000000000 +0300
+@@ -10,7 +10,7 @@
+ )
+ LINK_DIRECTORIES(${wxWidgets_LIBRARY_DIRS})
+ ADD_EXECUTABLE(cr3 ${CR3_SOURCES})
+-SET (EXTRA_LIBS  ${wxWidgets_LIBRARIES} ${STD_LIBS})
++SET (EXTRA_LIBS  ${wxWidgets_LIBRARIES} fontconfig ${STD_LIBS})
+ TARGET_LINK_LIBRARIES(cr3 crengine tinydict ${EXTRA_LIBS})
+ 
+ IF (UNIX)
+@@ -22,6 +22,9 @@
+   INSTALL( DIRECTORY ../cr3qt/data/hyph DESTINATION share/cr3 
+   FILES_MATCHING PATTERN "*.pattern" )
+   INSTALL( DIRECTORY ../cr3qt/data/skins DESTINATION share/cr3/skins )
++  INSTALL( FILES ../cr3qt/src/desktop/cr3.desktop DESTINATION share/applications )
++  INSTALL( FILES ../cr3qt/src/desktop/cr3.png DESTINATION share/pixmaps )
++  INSTALL( FILES ../cr3qt/src/desktop/cr3.xpm DESTINATION share/pixmaps )
+ ELSE()
+   INSTALL( TARGETS cr3 RUNTIME DESTINATION . )
+   INSTALL( DIRECTORY ../cr3qt/data/ DESTINATION . 
+diff -Naur old/cr3wx/src/cr3.cpp new/cr3wx/src/cr3.cpp
+--- old/cr3wx/src/cr3.cpp	2017-08-30 18:31:28.000000000 +0300
++++ new/cr3wx/src/cr3.cpp	2017-09-03 02:30:35.000000000 +0300
+@@ -395,7 +395,11 @@
+ 
+ lString16 GetConfigFileName()
+ {
+-    lString16 cfgdir( wxStandardPaths::Get().GetUserDataDir().c_str() );
++    #if wxCHECK_VERSION(3, 0, 0)
++        lString16 cfgdir( wxStandardPaths::Get().GetUserDataDir().wx_str() );
++    #else
++        lString16 cfgdir( wxStandardPaths::Get().GetUserDataDir().c_str() );
++    #endif
+     if ( !wxDirExists( cfgdir.c_str() ) )
+         ::wxMkdir( wxString( cfgdir.c_str() ) );
+     lChar16 slash = detectSlash( cfgdir );
+@@ -520,6 +524,7 @@
+ 
+ wxBitmap cr3Frame::getIcon16x16( const lChar16 * name )
+ {
++    wxLogNull logNo; // Temporary disable warnings ( see: http://trac.wxwidgets.org/ticket/15331 )
+     lString16 dir;
+     if ( _toolbarSize==2 )
+         dir = "icons/22x22/";
+@@ -531,7 +536,7 @@
+     if ( icon.IsOk() )
+         return icon;
+     return wxNullBitmap;
+-}
++} // ~wxLogNull called, old log sink restored
+ 
+ #if (USE_FREETYPE==1)
+ bool getDirectoryFonts( lString16Collection & pathList, lString16 ext, lString16Collection & fonts, bool absPath )
+@@ -622,7 +627,11 @@
+     wxImage::AddHandler(new wxPNGHandler);
+     resources = new ResourceContainer();
+ 
+-    lString16 appname( argv[0] );
++    #if wxCHECK_VERSION(3, 0, 0)
++        lString16 appname( argv[0].wx_str() );
++    #else
++        lString16 appname( argv[0] );
++    #endif
+     int lastSlash=-1;
+     lChar16 slashChar = '/';
+     for ( int p=0; p<(int)appname.length(); p++ ) {
+@@ -777,7 +786,11 @@
+     int argc = wxGetApp().argc;
+     lString16 fnameToOpen;
+     for ( int i=1; i<argc; i++ ) {
+-        lString16 param = lString16( wxGetApp().argv[1] );
++        #if wxCHECK_VERSION(3, 0, 0)
++            lString16 param = lString16( wxGetApp().argv[1].wx_str() );
++        #else
++            lString16 param = lString16( wxGetApp().argv[1] );
++        #endif
+         if ( param[0]!='-' )
+             fnameToOpen = param;
+     }
+@@ -1193,7 +1206,11 @@
+     lString16 outFile;
+     bool convert = false;
+     for ( int i=1; i<argc; i++ ) {
+-        lString16 param = lString16( wxGetApp().argv[i] );
++        #if wxCHECK_VERSION(3, 0, 0)
++            lString16 param = lString16( wxGetApp().argv[i].wx_str() );
++        #else
++            lString16 param = lString16( wxGetApp().argv[i] );
++        #endif
+         if ( param[0]!='-' )
+             fnameToOpen = param;
+         else if (param.startsWith("--convert"))
+@@ -1470,7 +1487,11 @@
+         wxCursor hg( wxCURSOR_WAIT );
+         this->SetCursor( hg );
+         wxSetCursor( hg );
+-        _view->getDocView()->exportWolFile( dlg.GetPath(), opts.getMode()==0, opts.getLevels() );
++        #if wxCHECK_VERSION(3, 0, 0)
++            _view->getDocView()->exportWolFile( dlg.GetPath().wx_str(), opts.getMode()==0, opts.getLevels() );
++        #else
++            _view->getDocView()->exportWolFile( dlg.GetPath(), opts.getMode()==0, opts.getLevels() );
++        #endif
+         wxSetCursor( wxNullCursor );
+         this->SetCursor( wxNullCursor );
+     }
+@@ -1479,7 +1500,7 @@
+ void 
+ cr3Frame::OnAbout( wxCommandEvent& WXUNUSED( event ) )
+ {
+-    wxMessageBox( wxT( "Cool Reader " wxT(CR3_VERSION) wxT("\n(c) 1998-2007 Vadim Lopatin\nwxWidgets version\n") )
++    wxMessageBox( wxT( "Cool Reader " wxT(CR3_VERSION) wxT("\n(c) 1998-2015 Vadim Lopatin\n" wxVERSION_STRING"\n") )
+     wxT("\nBased on CREngine library " wxT(CR_ENGINE_VERSION) )
+     wxT("\nThird party libraries used:")
+     wxT("\nzlib, libpng, libjpeg, freetype2,")
+diff -Naur old/cr3wx/src/optdlg.cpp new/cr3wx/src/optdlg.cpp
+--- old/cr3wx/src/optdlg.cpp	2017-08-30 18:31:28.000000000 +0300
++++ new/cr3wx/src/optdlg.cpp	2017-09-03 02:36:51.000000000 +0300
+@@ -41,7 +41,11 @@
+             if ( v==_choices[i] )
+                 tb = i;
+         if ( _storeStringValues ) {
+-            props->setString( _option, lString16(_choices[tb]) );
++            #if wxCHECK_VERSION(3, 0, 0)
++                props->setString( _option, lString16(_choices[tb].wx_str()) );
++            #else
++                props->setString( _option, lString16(_choices[tb]) );
++            #endif
+         } else {
+             props->setInt( _option, tb );
+         }
+@@ -50,7 +54,11 @@
+     {
+         unsigned tb = _defvalue;
+         if ( _storeStringValues ) {
+-            lString8 s8 = UnicodeToUtf8( lString16(_choices[_defvalue]) );
++            #if wxCHECK_VERSION(3, 0, 0)
++                lString8 s8 = UnicodeToUtf8( lString16(_choices[_defvalue].wx_str()) );
++            #else
++                lString8 s8 = UnicodeToUtf8( lString16(_choices[_defvalue]) );
++            #endif
+             lString16 s16 = props->getStringDef( _option, s8.c_str() );
+             wxString v = s16.c_str();
+             for ( unsigned i=0; i<_choices.GetCount(); i++ )
+diff -Naur old/cr3wx/src/view.cpp new/cr3wx/src/view.cpp
+--- old/cr3wx/src/view.cpp	2017-08-30 18:31:28.000000000 +0300
++++ new/cr3wx/src/view.cpp	2017-09-03 02:40:42.000000000 +0300
+@@ -353,7 +353,11 @@
+ 
+ lString16 cr3view::GetHistoryFileName()
+ {
+-    lString16 cfgdir( wxStandardPaths::Get().GetUserDataDir().c_str() );
++    #if wxCHECK_VERSION(3, 0, 0)
++        lString16 cfgdir( wxStandardPaths::Get().GetUserDataDir().wx_str() );
++    #else
++        lString16 cfgdir( wxStandardPaths::Get().GetUserDataDir().c_str() );
++    #endif
+     if ( !wxDirExists( cfgdir.c_str() ) )
+         ::wxMkdir( wxString( cfgdir.c_str() ) );
+     lChar16 slash = detectSlash( cfgdir );
+@@ -667,13 +671,21 @@
+     //===========================================
+     GetParent()->Update();
+     //printf("   loading...  ");
+-    bool res = getDocView()->LoadDocument( fname.c_str() );
++    #if wxCHECK_VERSION(3, 0, 0)
++        bool res = getDocView()->LoadDocument( fname.wx_str() );
++    #else
++        bool res = getDocView()->LoadDocument( fname.c_str() );
++    #endif
+     //printf("   done. \n");
+ 	//DEBUG
+ 	//_docview->exportWolFile( "test.wol", true );
+ 	//_docview->SetPos(0);
+     if ( !res )
+-        getDocView()->createDefaultDocument(lString16("File open error"), lString16("Cannot open file ") + fname.c_str() );
++        #if wxCHECK_VERSION(3, 0, 0)
++            getDocView()->createDefaultDocument(lString16("File open error"), lString16("Cannot open file ") + fname.wx_str() );
++        #else
++            getDocView()->createDefaultDocument(lString16("File open error"), lString16("Cannot open file ") + fname.c_str() );
++        #endif
+     lString16 title = getDocView()->getAuthors();
+     if ( !title.empty() && !getDocView()->getTitle().empty() )
+         title << L". ";
+diff -Naur old/crengine/include/cr3version.h new/crengine/include/cr3version.h
+--- old/crengine/include/cr3version.h	2017-08-30 18:31:28.000000000 +0300
++++ new/crengine/include/cr3version.h	2017-09-03 00:55:28.000000000 +0300
+@@ -1,2 +1,2 @@
+-#define CR_ENGINE_VERSION "3.1.2-52"
+-#define CR_ENGINE_BUILD_DATE "2014-11-19"
++#define CR_ENGINE_VERSION "3.1.2-71"
++#define CR_ENGINE_BUILD_DATE "2015-07-02"
diff --git a/app-text/coolreader/files/cr3ini.diff b/app-text/coolreader/files/cr3ini.diff
new file mode 100644
index 000000000000..66562aa836a7
--- /dev/null
+++ b/app-text/coolreader/files/cr3ini.diff
@@ -0,0 +1,35 @@
+# Patch to allow creating cr3.ini file in the home directory of user
+# instead to trying save it in /usr/share/cr3/cr3.ini
+# Bug: https://sourceforge.net/p/crengine/bugs/179/
+# Patch was proposed by "Olexandr" (see bug report)
+diff --git a/cr3qt/src/mainwindow.cpp b/cr3qt/src/mainwindow.cpp
+index 142242a..0401f71 100644
+--- a/cr3qt/src/mainwindow.cpp
++++ b/cr3qt/src/mainwindow.cpp
+@@ -77,8 +77,8 @@ MainWindow::MainWindow(QWidget *parent)
+ #endif
+     QString cacheDir = homeDir + "cache";
+     QString bookmarksDir = homeDir + "bookmarks";
+-    QString histFile = exeDir + "cr3hist.bmk";
+-    QString histFile2 = homeDir + "cr3hist.bmk";
++    QString histFile2 = exeDir + "cr3hist.bmk";
++    QString histFile = homeDir + "cr3hist.bmk";
+     QString iniFile2 = exeDir + "cr3.ini";
+     QString iniFile = homeDir + "cr3.ini";
+     QString cssFile = homeDir + "fb2.css";
+@@ -92,9 +92,13 @@ MainWindow::MainWindow(QWidget *parent)
+     ldomDocCache::init( qt2cr( cacheDir ), DOC_CACHE_SIZE );
+     ui->view->setPropsChangeCallback( this );
+     if ( !ui->view->loadSettings( iniFile ) )
+-        ui->view->loadSettings( iniFile2 );
++        if ( !ui->view->loadSettings( iniFile2 ) )
++          ui->view->saveSettings( iniFile );
++
+     if ( !ui->view->loadHistory( histFile ) )
+-        ui->view->loadHistory( histFile2 );
++        if ( !ui->view->loadHistory( histFile2 ) )
++          ui->view->saveHistory( histFile );
++
+     if ( !ui->view->loadCSS( cssFile ) )
+         ui->view->loadCSS( cssFile2 );
+ #if ENABLE_BOOKMARKS_DIR==1
diff --git a/app-text/coolreader/metadata.xml b/app-text/coolreader/metadata.xml
new file mode 100644
index 000000000000..0bc14087cc2d
--- /dev/null
+++ b/app-text/coolreader/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>grozin@gentoo.org</email>
+  </maintainer>
+  <longdescription lang="en">
+    A fast and small cross-platform XML/CSS based eBook reader for desktops and handheld devices.
+    Supported formats: FB2, TXT, RTF, DOC, TCR, HTML, EPUB, CHM, PDB, MOBI.
+  </longdescription>
+  <use>
+    <flag name="wxwidgets">Use <pkg>x11-libs/wxGTK</pkg> instead of Qt5</flag>
+  </use>
+  <upstream>
+    <remote-id type="sourceforge">crengine</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-text/cpdf-2.1.1-r1 b/app-text/cpdf-2.1.1-r1
deleted file mode 100644
index a5ca65bae620..000000000000
--- a/app-text/cpdf-2.1.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=>=dev-lang/ocaml-4:= dev-ml/camlpdf:= >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=A command line tool for manipulating PDF files
-EAPI=5
-HOMEPAGE=http://community.coherentpdf.com/ https://github.com/johnwhitington/cpdf-source/
-IUSE=doc
-KEYWORDS=~amd64 ~x86
-LICENSE=Coherent-Graphics BSD
-RDEPEND=>=dev-lang/ocaml-4:= dev-ml/camlpdf:=
-RESTRICT=mirror bindist
-SLOT=0
-SRC_URI=https://github.com/johnwhitington/cpdf-source/archive/v2.1.1.tar.gz -> cpdf-2.1.1.tar.gz
-_eclasses_=findlib	45d6030075064a68da8d7143726a1150
-_md5_=4d09e662c83b6084931297bc51948119
diff --git a/app-text/cpdf/Manifest b/app-text/cpdf/Manifest
new file mode 100644
index 000000000000..8ae7aacab42b
--- /dev/null
+++ b/app-text/cpdf/Manifest
@@ -0,0 +1,3 @@
+DIST cpdf-2.1.1.tar.gz 349536 BLAKE2B 4064605890745ebaa24d32c3294a3293312dc8df6ab3989e1a7417989cdb19aca6b70faafb258c7c00d6febeba8b17379396c1f90628e72be0791cdefc579b6f SHA512 aa06efaf098d3fe3f560ea30da9c3546e13d294b22d61c4cc3df553eb90e338d59ee1b51d14d7982ce52967bcf98c2afec9a5b5ae101e2183961f4be862c6517
+EBUILD cpdf-2.1.1-r1.ebuild 815 BLAKE2B e3db88ff54d34fe7b74bb9bda9496dbc20a992bb4b50a0ff537ab7cb871cdb08bf55d57967f4ae2810ad5dd34dd5df5c9ec52665532d2b374c082bd9c1c74e61 SHA512 e51916639a09447f6cefa7d2400c0ea1349f52926acd16b6d4ef250c5a4d865af04501763e0f0d40d78735e426b601c8d88cf171d2cff374898b6b98a3c8fff8
+MISC metadata.xml 347 BLAKE2B 2f11a4f77be2b5501b6789daa1724cb1933313963450fa1df91072c095cab406f3907bb2656715022ffff4be94e6b8f4e70d5beae1feeb3b3fd5a2fa1c8413a1 SHA512 e97b4580d3d0e3c06a6e24aac842e66a354e2a9ea9eb70486383143999a2c8a188bdc5ac2d5672ae1ed83950f94d8fcce3d8c3a4d701009bd4102b88bd4b715d
diff --git a/app-text/cpdf/cpdf-2.1.1-r1.ebuild b/app-text/cpdf/cpdf-2.1.1-r1.ebuild
new file mode 100644
index 000000000000..74a530638f33
--- /dev/null
+++ b/app-text/cpdf/cpdf-2.1.1-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit findlib
+
+DESCRIPTION="A command line tool for manipulating PDF files"
+HOMEPAGE="http://community.coherentpdf.com/ https://github.com/johnwhitington/cpdf-source/"
+SRC_URI="https://github.com/johnwhitington/cpdf-source/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+# BSD is only for xmlm.ml
+LICENSE="Coherent-Graphics BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RDEPEND=">=dev-lang/ocaml-4:=
+	dev-ml/camlpdf:="
+DEPEND="${RDEPEND}"
+
+RESTRICT="mirror bindist"
+
+S=${WORKDIR}/${PN}-source-${PV}
+
+src_compile() {
+	# parallel make issues
+	emake -j1
+}
+
+src_install() {
+	findlib_src_install
+
+	dobin cpdf
+	dodoc Changes README.md
+
+	if use doc ; then
+		dodoc cpdfmanual.pdf
+		dohtml doc/cpdf/html/*
+	fi
+}
diff --git a/app-text/cpdf/metadata.xml b/app-text/cpdf/metadata.xml
new file mode 100644
index 000000000000..86681fac3204
--- /dev/null
+++ b/app-text/cpdf/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>radhermit@gentoo.org</email>
+    <name>Tim Harder</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">johnwhitington/cpdf-source</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-text/crf++-0.58 b/app-text/crf++-0.58
deleted file mode 100644
index 3260cd9fff7d..000000000000
--- a/app-text/crf++-0.58
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare test
-DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Yet Another CRF toolkit for segmenting/labelling sequential data
-EAPI=6
-HOMEPAGE=https://taku910.github.io/crfpp/
-IUSE=examples static-libs
-KEYWORDS=amd64 x86 ~x86-fbsd
-LICENSE=|| ( BSD LGPL-2.1 )
-SLOT=0
-SRC_URI=mirror://gentoo/CRF++-0.58.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=af032af4456f27d93c161298e6ee3054
diff --git a/app-text/crf++/Manifest b/app-text/crf++/Manifest
new file mode 100644
index 000000000000..8b3150097504
--- /dev/null
+++ b/app-text/crf++/Manifest
@@ -0,0 +1,4 @@
+AUX crf++-automake-1.13.patch 216 BLAKE2B 129027abc820acf499b9fd49ea152f0d404c458af0584c0f7acc3dde6a02c46f1f14f96321b0ea7e2d00e9345276e8bdefb2206cc475772e5c23890143c78d0d SHA512 5bd02a0d3f67e37d544255984341beda8c958e5f76ce51521fd2157eb7dc70dfb1d43d30913e4d02e7dfe21526f04520f6539e28a58beed6e577a31b5d4a16ca
+DIST CRF++-0.58.tar.gz 790570 BLAKE2B 8fdd3fea3e30f4196560e2e265519c961739aabbad75e9805040a8f7da0f501620d6bb2c4f589c6d0c8bb79af5c8f46bbe27b610a4ec6a0db632fef219ea5b46 SHA512 676b3e9ed89b5fb2f246175b58c384f10cab09fff8329c07311fed3832f55dbad26a25d2946c9efaa75cd8026517cb9e1742bb70ca26187367747852073e4eb9
+EBUILD crf++-0.58.ebuild 1142 BLAKE2B f3b9572d8fcedf2245d7e1ad51e5c43d9b13559c1894b47d9ca784fbdd447507e808f9df5c2f708f29dec06758740e0180770319ead3ddc56e77516c9330e707 SHA512 ecf7045059470e8a318fc8c46ae38af0eac567382755d29f5594d6f87f30baf35fb9c86a0a79d87f2b300c3675684924791a0656463a4191d94327c099bbbc30
+MISC metadata.xml 669 BLAKE2B 12280d15998c56ac4c2e3bd3e80fd2a22eb150b979836d8600df3d5a36008807f0cc7fd91b84cd3717c379c9ca603ce110a88c3f86b48e29be983f99faa1b6a0 SHA512 d479bf4332884e2dfdd57b6c496b585f7e55adad2200dd22684a9fe6f1cc1c69049fec20d3ee0683543119c4f4935c83cda7d6a501b44e51e612249283fda7f3
diff --git a/app-text/crf++/crf++-0.58.ebuild b/app-text/crf++/crf++-0.58.ebuild
new file mode 100644
index 000000000000..c358043e7e8e
--- /dev/null
+++ b/app-text/crf++/crf++-0.58.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit autotools
+
+MY_P="${P^^[crf]}"
+
+DESCRIPTION="Yet Another CRF toolkit for segmenting/labelling sequential data"
+HOMEPAGE="https://taku910.github.io/crfpp/"
+SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
+
+LICENSE="|| ( BSD LGPL-2.1 )"
+SLOT="0"
+KEYWORDS="amd64 x86 ~x86-fbsd"
+IUSE="examples static-libs"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=( "${FILESDIR}"/${PN}-automake-1.13.patch )
+HTML_DOCS=( doc/. )
+
+src_prepare() {
+	sed -i \
+		-e "/CFLAGS/s/-O3/${CFLAGS}/" \
+		-e "/CXXFLAGS/s/-O3/${CXXFLAGS}/" \
+		configure.in
+
+	default
+	mv configure.{in,ac} || die
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable static-libs static)
+}
+
+src_test() {
+	local d
+	for d in example/*; do
+		cd "${d}"
+		./exec.sh || die "failed test in ${d}"
+		cd - >/dev/null
+	done
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	einstalldocs
+
+	if use examples; then
+		docompress -x /usr/share/doc/${PF}/example
+		insinto /usr/share/doc/${PF}
+		doins -r example
+	fi
+
+	if ! use static-libs; then
+		find "${ED}" -name "*.la" -type f -delete || die
+	fi
+}
diff --git a/app-text/crf++/files/crf++-automake-1.13.patch b/app-text/crf++/files/crf++-automake-1.13.patch
new file mode 100644
index 000000000000..afff7edc0707
--- /dev/null
+++ b/app-text/crf++/files/crf++-automake-1.13.patch
@@ -0,0 +1,10 @@
+--- a/configure.in
++++ b/configure.in
+@@ -240,6 +240,6 @@
+ AC_MSG_RESULT([yes])
+ 
+ AC_SUBST(datarootdir)
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+ AC_OUTPUT([Makefile Makefile.msvc swig/version.h])
+ 
diff --git a/app-text/crf++/metadata.xml b/app-text/crf++/metadata.xml
new file mode 100644
index 000000000000..edc6c2bf83c2
--- /dev/null
+++ b/app-text/crf++/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
+	<longdescription lang="en">
+		CRF++ is a simple, customizable, and open source implementation
+		of Conditional Random Fields (CRFs) for segmenting/labeling
+		sequential data. CRF++ is designed for generic purpose and will be
+		applied to a lot of NLP tasks, such as Named Entity Recognition,
+		Information Extraction and Text Chunking.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">taku910/crfpp</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/crm114-20100106-r1 b/app-text/crm114-20100106-r1
deleted file mode 100644
index 863d78f5d104..000000000000
--- a/app-text/crm114-20100106-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare test
-DEPEND=static? ( dev-libs/tre[static-libs] ) !static? ( dev-libs/tre ) mew? ( app-emacs/mew ) mimencode? ( net-mail/metamail ) normalizemime? ( mail-filter/normalizemime ) test? ( sys-apps/miscfiles )
-DESCRIPTION=A powerful text processing tool, mainly used for spam filtering
-EAPI=6
-HOMEPAGE=http://crm114.sourceforge.net/
-IUSE=examples mew mimencode nls normalizemime static test
-KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=static? ( dev-libs/tre[static-libs] ) !static? ( dev-libs/tre ) mew? ( app-emacs/mew ) mimencode? ( net-mail/metamail ) normalizemime? ( mail-filter/normalizemime )
-SLOT=0
-SRC_URI=http://crm114.sourceforge.net/tarballs/crm114-20100106-BlameMichelson.src.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=4fcb14ad98a4625fe78786dd64cd665f
diff --git a/app-text/crm114/Manifest b/app-text/crm114/Manifest
new file mode 100644
index 000000000000..8381364c7342
--- /dev/null
+++ b/app-text/crm114/Manifest
@@ -0,0 +1,4 @@
+AUX crm114-20100106-fix-makefile.patch 1796 BLAKE2B 370bc77608f77960be4c4ecb88e3729eb62fb9e46e15fcca673ae8f4e4efcaf4425f30cd6beada25d8eb9fdf741dfa449c4e2a5c3ca9d06eab9ea25524e38136 SHA512 3011a85116510fce131bd3c13b5ec1e4faeefdb1eebf114782d417fb9ce8050ce15cae05f8b651728335233641be1e870fe48702fa620b542a8f1c963853b81c
+DIST crm114-20100106-BlameMichelson.src.tar.gz 724672 BLAKE2B ce5c3078030f2c4e78833edfb107d78e134a02c339d28411f2f60d4a67c333904d2ed0cf32a087997a72d961cbc5dabef46fb6c692d99fb509abd4161bd0094b SHA512 bb95fa50d6feef1a127e39e4005c4964b0096c3c7059f63bbf2293042351cf5ceeb7590fd1bedc64291ba556dfba96856dba8554f2f52a6cbaa3ad65012809c6
+EBUILD crm114-20100106-r1.ebuild 1962 BLAKE2B 09f24d7ed7fea796905f0c2bfe554864788c65a05685f9c6a7e690dad98669b3d49df6d55c00a2254f927cf3c99803e0315a4dc827bc387aaee57abda04c8570 SHA512 29a09f44a2f9ca1011e15d36060a57603e1fffe9c22fc7a61bf82f3b77ff4e747a96133724f5f8168bfb341626a1d7f5556ac562e94666f8e544c09cfc9a535c
+MISC metadata.xml 707 BLAKE2B f66efbf9497eb73a927c0cbbd87fa3da5617adae4102940135f983ebbf6ce18d3e2f2a3aa8721aa4395d54977fd0d3ff44387610906bcadcde869e46869ba932 SHA512 9009a38eaab5b49e3ec537785dc2e45601afd2ef0bd1c2f7a0ab7f8f24c80feb7bd99c2e47e6835d8bc4fffeeb8d6628df02c260ff5198905b209c6606c2352e
diff --git a/app-text/crm114/crm114-20100106-r1.ebuild b/app-text/crm114/crm114-20100106-r1.ebuild
new file mode 100644
index 000000000000..6c22e69d7c12
--- /dev/null
+++ b/app-text/crm114/crm114-20100106-r1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic toolchain-funcs
+
+MY_P="${P}-BlameMichelson.src"
+
+DESCRIPTION="A powerful text processing tool, mainly used for spam filtering"
+HOMEPAGE="http://crm114.sourceforge.net/"
+SRC_URI="http://crm114.sourceforge.net/tarballs/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+IUSE="examples mew mimencode nls normalizemime static test"
+
+RDEPEND="
+	static? ( dev-libs/tre[static-libs] )
+	!static? ( dev-libs/tre )
+	mew? ( app-emacs/mew )
+	mimencode? ( net-mail/metamail )
+	normalizemime? ( mail-filter/normalizemime )"
+DEPEND="${RDEPEND}
+	test? ( sys-apps/miscfiles )"
+
+S="${WORKDIR}"/${MY_P}
+
+PATCHES=( "${FILESDIR}"/${P}-fix-makefile.patch )
+
+src_prepare() {
+	default
+
+	if use mimencode; then
+		sed \
+			-e 's%#:mime_decoder: /mimencode -u/%:mime_decoder: /mimencode -u/%' \
+			-e 's%:mime_decoder: /mewdecode/%#:mime_decoder: /mewdecode/%' \
+			-i mailfilter.cf || die
+	elif use normalizemime; then
+		sed \
+			-e 's%#:mime_decoder: /normalizemime/%:mime_decoder: /normalizemime/%' \
+			-e 's%:mime_decoder: /mewdecode/%#:mime_decoder: /mewdecode/%' \
+			-i mailfilter.cf || die
+	fi
+}
+
+src_compile() {
+	# Restore GNU89 inline semantics to
+	# emit external symbols, bug 571062
+	append-cflags -std=gnu89
+
+	use static && append-ldflags -static -static-libgcc
+
+	emake CC="$(tc-getCC)"
+}
+
+src_test() {
+	emake megatest
+}
+
+src_install() {
+	dobin crm114 cssdiff cssmerge cssutil osbf-util
+
+	insinto /usr/share/${PN}
+	doins *.crm *.cf *.mfp
+
+	dodoc COLOPHON.txt CRM114_Mailfilter_HOWTO.txt FAQ.txt INTRO.txt QUICKREF.txt \
+		CLASSIFY_DETAILS.txt inoc_passwd.txt KNOWNBUGS.txt THINGS_TO_DO.txt README
+
+	if use examples; then
+		docinto examples
+		dodoc *.example
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
+
+pkg_postinst() {
+	elog "The spam-filter CRM files are installed in ${EROOT%/}/usr/share/${PN}."
+}
diff --git a/app-text/crm114/files/crm114-20100106-fix-makefile.patch b/app-text/crm114/files/crm114-20100106-fix-makefile.patch
new file mode 100644
index 000000000000..12ad4052002d
--- /dev/null
+++ b/app-text/crm114/files/crm114-20100106-fix-makefile.patch
@@ -0,0 +1,60 @@
+* Remove hardcoded variable
+* Respect user variables
+
+--- a/Makefile
++++ b/Makefile
+@@ -19,10 +19,6 @@
+ VER_SUFFIX ?=
+ 
+ #
+-#      The following forces the compiler to be GCC.  If you have trouble
+-#      with your default compiler, and you want to force GCC, uncomment it.
+-CC=gcc
+-#
+ #     What version is this software (PLEASE don't change this just
+ #     to mess with my brain. - wsy)
+ #
+@@ -82,7 +78,7 @@
+ #
+ #     Build our basic CFLAGS chunk
+ #
+-CFLAGS += -DVERSION='"$(VERSION)"'
++MY_CPPFLAGS += -DVERSION='"$(VERSION)"'
+ #
+ #  Known Neighbord On, only for debugging
+ # CFLAGS += -DKNN_ON
+@@ -104,7 +100,7 @@
+ #  certain functions to be inline (I added that to force gcc to inline functions
+ #  under high optimization but not under low so that debugging is possible - 
+ #  that's why DO_INLINES is defined at O3 but not O0 - JB):
+-CFLAGS += -O3 -Wall -DDO_INLINES
++MY_CPPFLAGS += -DDO_INLINES
+ #     turn this one on for no optimization, but debugging
+ #CFLAGS += -g -O0 -Wall
+ #
+@@ -119,7 +115,6 @@
+ #    BSD users - do NOT use -static-libgcc!!!
+ #    Also note that this keeps valgrind from running correctly so comment
+ #    it out for debugging.
+-LDFLAGS += -static -static-libgcc
+ #    use this one if you want program profiling.
+ #LDFLAGS += -static -static-libgcc -pg
+ #LDFLAGS += -pg
+@@ -306,7 +301,7 @@
+         #                               of with your mods built in.
+ 
+ crm114: $(OFILES)
+-	$(CC) $(LDFLAGS) $(LIBS) $(OFILES) \
++	$(CC) $(CFLAGS) $(LDFLAGS) $(LIBS) $(OFILES) \
+ 	  -ltre -lm \
+ 	  -o crm114
+ 	#
+@@ -315,7 +310,7 @@
+ 
+ *.o: $(HFILES)
+ .c.o:
+-	$(CC)  $(CFLAGS) -c $*.c
++	$(CC) $(CFLAGS) $(MY_CPPFLAGS) $(CPPFLAGS) -c $*.c
+ 
+ cssutil: cssutil.o crm_css_maintenance.o crm_util_errorhandlers.o crm_str_funcs.o $(HFILES)
+ 	$(CC)  $(CFLAGS) $(LDFLAGS) cssutil.o \
diff --git a/app-text/crm114/metadata.xml b/app-text/crm114/metadata.xml
new file mode 100644
index 000000000000..e7411c45f7bb
--- /dev/null
+++ b/app-text/crm114/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>shell-tools@gentoo.org</email>
+    <name>Gentoo Shell Tools Project</name>
+  </maintainer>
+  <use>
+    <flag name="mew">Add support for using the mewdecode mime decoder
+    (<pkg>app-emacs/mew</pkg>)</flag>
+    <flag name="mimencode">Add support for using the mimencode mime
+    (<pkg>net-mail/metamail</pkg>)</flag>
+    <flag name="normalizemime">Add support for using the normalizemime
+    (<pkg>mail-filter/normalizemime</pkg>)</flag>
+  </use>
+  <upstream>
+    <remote-id type="sourceforge">crm114</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-text/csvfix-1.6 b/app-text/csvfix-1.6
deleted file mode 100644
index b21467831b72..000000000000
--- a/app-text/csvfix-1.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DEPEND=dev-libs/expat doc? ( app-arch/unzip )
-DESCRIPTION=A stream editor for manipulating CSV files
-EAPI=6
-HOMEPAGE=https://neilb.bitbucket.org/csvfix/ https://bitbucket.org/neilb/csvfix/
-IUSE=doc
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-libs/expat
-SLOT=0
-SRC_URI=https://bitbucket.org/neilb/csvfix/get/version-1.6.tar.bz2 -> csvfix-1.6.tar.bz2 doc? ( https://bitbucket.org/neilb/csvfix/downloads/csvfix_man_html_160.zip )
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=a18480cc0c79c7c1efb5b79d9fe4644d
diff --git a/app-text/csvfix/Manifest b/app-text/csvfix/Manifest
new file mode 100644
index 000000000000..12c4e0edd392
--- /dev/null
+++ b/app-text/csvfix/Manifest
@@ -0,0 +1,6 @@
+AUX csvfix-1.10a-tests.patch 1004 BLAKE2B 3b7c1b133ccf4a38bd8be053498c61b0d34c699d9400d5100f07cebc17f235a3510dcde21caa42775681a0f47023d0ad51b9282ffb28a6fc798c71863ad19564 SHA512 3f2330d44872cb022f9f0d9ef9f3bf43d27da94d53ec306d84d56c6d5cf6bbd2afbfa710872cb7a144caeefcf90ce7837422fc421bee30a0af78bdef7d991383
+AUX csvfix-1.6-makefile.patch 1604 BLAKE2B d8f012a3f02c513f8b26e8fa5c7e805a0d333623a7018fadde5c6fea76bd2dd0582587e5aeedd990a71924dd2beba43e5d36c9332f2b257841536e4de8357433 SHA512 f1f5cf1e2d1b7d5d3031ff27fa570ec501af38e9340e8d00be62bee1a46afb9e2941de6d40644d7f5d1326abd8d94036bfc5b04d4fad0e5dba15faaaa22b66dc
+DIST csvfix-1.6.tar.bz2 322530 BLAKE2B 8bda635a5182b31efe2c5c6613baaea13fe2f5c32f97c2bcbdaf05447103507c46190557f0a07e46aa0f442a6ed6b63b0d46d9759e5ddb2b19f00a31a38ddcce SHA512 abd525cff11e6dc4e59f5b26d57b2327564327e27009bbf777a6d83a6f8e474415b4448408aa162c6fb20b9a5bbaf970bdca23d8a9d7e31c3b8aaa19cd878035
+DIST csvfix_man_html_160.zip 403468 BLAKE2B 8007ca95891a99926f6c2968a73ddc30211ff07017261583664dc44ac84a508d097cb4acb81529891caa2f98ca4f094565f46cfa9d79e0d99df92ffd5acc908e SHA512 868047ca4eef7bbbf3735f25489c72820465c414af2ffa11fd3e61fd45ca80661d73082a90b94c4503876bb2355a6b3751f8ede862744f0d7223e77ae770ccd5
+EBUILD csvfix-1.6.ebuild 1079 BLAKE2B b579923ad074ed361048e391a0c4674d139a7c63de347130e7b869d31f23b9964bba63e0652e493b733f2cf35b1de4584f6d925bcf588d6b8a2d22893f41b2a9 SHA512 c311b14e8465c49c44c58a8017107b05c76edc9b66a9519a50889041812c2d215d4b9c3b0c3f44bbe08126bd612a7bf90b4c09b2641eab2cb225f5ae653798b0
+MISC metadata.xml 336 BLAKE2B d48b98955a4ccd6b3c1dfab49fc5e7a18820c7f787fbb5dcf5833690b082efda24bdda2168fc90f58a4d571c71c6856c86e319596840fe669f0fd3208c44da4e SHA512 e2d5e85fd1ecca319a7fe32f7fcd1f897cc3ba4c5fb4200ca9be1a4ebbc1e26c7200fbdf8cf5df9850bc57b62c9ef227cb907c611d43c2e5f04de3639811caa1
diff --git a/app-text/csvfix/csvfix-1.6.ebuild b/app-text/csvfix/csvfix-1.6.ebuild
new file mode 100644
index 000000000000..e79e239ef7de
--- /dev/null
+++ b/app-text/csvfix/csvfix-1.6.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs versionator vcs-snapshot
+
+MY_PV="$(delete_all_version_separators)"
+DESCRIPTION="A stream editor for manipulating CSV files"
+HOMEPAGE="https://neilb.bitbucket.org/csvfix/ https://bitbucket.org/neilb/csvfix/"
+SRC_URI="https://bitbucket.org/neilb/csvfix/get/version-${PV}.tar.bz2 -> ${P}.tar.bz2
+	doc? ( https://bitbucket.org/neilb/csvfix/downloads/csvfix_man_html_${MY_PV}0.zip )"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RDEPEND="dev-libs/expat"
+DEPEND="${RDEPEND}
+	doc? ( app-arch/unzip )"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-makefile.patch
+	"${FILESDIR}"/${PN}-1.10a-tests.patch
+)
+
+src_prepare() {
+	default
+	edos2unix $(find csvfix/tests -type f)
+}
+
+src_compile() {
+	emake CC="$(tc-getCXX)" AR="$(tc-getAR)" lin
+}
+
+src_test() {
+	cd ${PN}/tests
+	chmod +x run1 runtests
+	./runtests || die "tests failed"
+}
+
+src_install() {
+	dobin csvfix/bin/csvfix
+	if use doc; then
+		docinto html
+		dodoc -r "${WORKDIR}"/${PN}${MY_PV}/*
+	fi
+}
diff --git a/app-text/csvfix/files/csvfix-1.10a-tests.patch b/app-text/csvfix/files/csvfix-1.10a-tests.patch
new file mode 100644
index 000000000000..8e4461d85a31
--- /dev/null
+++ b/app-text/csvfix/files/csvfix-1.10a-tests.patch
@@ -0,0 +1,51 @@
+--- csvfix-build.orig/csvfix/tests/run1
++++ csvfix-build/csvfix/tests/run1
+@@ -1,4 +1,4 @@
+-#!bash

++#!/bin/bash

+ # run1

+ # run single test

+ # copyright (C) 2008 Neil Butterworth

+@@ -49,7 +49,7 @@
+ fi

+ 

+ # exe to be tested - used in tests

+-CSVED=../bin/csvfix.exe

++CSVED=../bin/csvfix

+ export CSVED

+ 

+ if [ ! -f "$CSVED" ]

+@@ -64,7 +64,7 @@
+ fi

+ 

+ # where to find diff & where to put output

+-DIFF=/bin/diff

++DIFF=/usr/bin/diff

+ DIFFOUT=tmp/_diffout

+ WINDIFF="C:/Program Files/Microsoft Visual Studio/Common/Tools/WINDIFF.EXE"

+ TEST=`basename $TEST`

+@@ -133,5 +133,7 @@
+ 	fi

+ else

+ 	echo "Execution problem with $TEST - please correct"

++	color_red "FAILED $TEST"

++	exit 1

+ fi

+ 

+--- csvfix-build.orig/csvfix/tests/runtests
++++ csvfix-build/csvfix/tests/runtests
+@@ -1,4 +1,4 @@
+-#!bash

++#!/bin/bash

+ # runall.bash

+ # run all tests and report

+ 

+@@ -22,3 +22,8 @@
+ echo $FAILS failed, $PASSES passed

+ echo ""

+ 

++if [[ $FAILS -gt 0 ]]; then

++	exit 1

++else

++	exit 0

++fi

diff --git a/app-text/csvfix/files/csvfix-1.6-makefile.patch b/app-text/csvfix/files/csvfix-1.6-makefile.patch
new file mode 100644
index 000000000000..aaee2aa003f7
--- /dev/null
+++ b/app-text/csvfix/files/csvfix-1.6-makefile.patch
@@ -0,0 +1,69 @@
+--- neilb-csvfix-e804a794d175/alib/Makefile
++++ neilb-csvfix-e804a794d175/alib/Makefile
+@@ -2,12 +2,12 @@
+ # Copyright (C) 2009 Neil Butterworth

+ 

+ OUT = lib/alib.a

++AR = ar

+ CCTYPE = gcc

+ IDIR = inc

+ ODIR = obj

+-XDIR = expat

+ SDIR = src

+-INC = -Iinc -Iexpat

++INC = -Iinc

+ 

+ cc.gcc = g++

+ cc.clang = clang++ -std=c++11 -stdlib=libc++  

+@@ -26,9 +26,6 @@
+ _WINOBJS = a_db.o a_dir.o a_opsys.o a_winerr.o

+ WINOBJS = $(patsubst %,$(ODIR)/%,$(_WINOBJS))

+ 

+-_EXPAT = xmlparse.o  xmlrole.o  xmltok.o  xmltok_impl.o  xmltok_ns.o

+-EXPAT = $(patsubst %,$(ODIR)/%,$(_EXPAT))

+-

+ $(ODIR)/%.o: $(SDIR)/%.cpp $(IDIR)/%.h 

+ 	$(CC) -c $(INC) $(CFLAGS) -o $@ $< 

+ 

+@@ -36,10 +33,10 @@
+ 	$(CC) -c $(INC) $(CFLAGS) -o $@ $< 

+ 

+ win: $(OBJS) $(EXPAT) $(WINOBJS)

+-	ar rvs $(OUT) $^

++	$(AR) rvs $(OUT) $^

+ 

+ lin: $(OBJS) $(EXPAT) 

+-	ar rvs $(OUT) $^

++	$(AR) rvs $(OUT) $^

+ 

+ .PHONY: clean

+ clean:

+--- neilb-csvfix-e804a794d175/csvfix/Makefile
++++ neilb-csvfix-e804a794d175/csvfix/Makefile
+@@ -22,7 +22,7 @@
+ 

+ ALIB = ../alib/lib/alib.a

+ WINLIBS = ../alib/lib/alib.a -lodbc32 

+-LINLIBS = ../alib/lib/alib.a 

++LINLIBS = ../alib/lib/alib.a -lexpat

+ 

+ _OBJS = csved_atable.o \

+ 		csved_block.o \

+@@ -99,8 +99,7 @@
+ 	strip $(WINOUT)

+ 

+ $(LINOUT): $(OBJS) $(ALIB)

+-	$(CC) -o $@ $^ $(LINLIBS)

+-	strip $(LINOUT)

++	$(CC) $(LDFLAGS) -o $@ $^ $(LINLIBS)

+ 

+ .PHONY: win

+ win:

+--- neilb-csvfix-e804a794d175/Makefile
++++ neilb-csvfix-e804a794d175/Makefile
+@@ -1,3 +1,5 @@
++CFLAGS += -std=c++11

++

+ ifndef COMSPEC

+ 	CLEAN =	(cd alib; $(MAKE) clean) && (cd csvfix; $(MAKE) clean) 

+ else

diff --git a/app-text/csvfix/metadata.xml b/app-text/csvfix/metadata.xml
new file mode 100644
index 000000000000..8aaa5d2f6787
--- /dev/null
+++ b/app-text/csvfix/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>radhermit@gentoo.org</email>
+    <name>Tim Harder</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="bitbucket">neilb/csvfix</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-text/cuneiform-1.1.0-r2 b/app-text/cuneiform-1.1.0-r2
deleted file mode 100644
index 14ac5c9cd121..000000000000
--- a/app-text/cuneiform-1.1.0-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=!graphicsmagick? ( media-gfx/imagemagick:= ) graphicsmagick? ( media-gfx/graphicsmagick:= ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=An enterprise quality OCR engine by Cognitive Technologies
-EAPI=6
-HOMEPAGE=https://launchpad.net/cuneiform-linux
-IUSE=debug graphicsmagick
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=!graphicsmagick? ( media-gfx/imagemagick:= ) graphicsmagick? ( media-gfx/graphicsmagick:= )
-SLOT=0
-SRC_URI=https://launchpad.net/cuneiform-linux/1.1/1.1/+download/cuneiform-linux-1.1.0.tar.bz2
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b0f6cdb66c23f805c333b5cb7127ffd5
diff --git a/app-text/cuneiform/Manifest b/app-text/cuneiform/Manifest
new file mode 100644
index 000000000000..8ec921a20310
--- /dev/null
+++ b/app-text/cuneiform/Manifest
@@ -0,0 +1,7 @@
+AUX c-assert.diff 2053 BLAKE2B c5c4d36156534400ded8b4f665f822ba561d5eaddcb0d2b821d5eff52645b28e92422b18a012c83469104ddeab14909bf383ceac3ba77ba11a4c2e12340d5b40 SHA512 f330005441e0b9abefa97f0dfe46dcbf1c4471185417408e81b87c5b5332db49355fbeb2e5bb4d75f4f0ff79a0e8c60228de12776187c0fdb3bcc67370ec040f
+AUX cuneiform.1 2844 BLAKE2B ed7d68de70ebd50caf35bb22ebd23ef7ecf00633be22f237e19830456c1efe83a6c546dd27dcf776e91bdb9189236b48690cdf2b172602e2a0528c12de9b1532 SHA512 55dfaa6fd759a24c1a49ed1455a6f04e63c40f048872bc8309b770942747006bb5ed4704171a53490552c4170471934dcaeeb692921ebbc020f012f84afc6d77
+AUX graphicsmagick.diff 1547 BLAKE2B 5dad602a467a2b3f8c0a55f8a873e9d46cde7857b078009888cf965440ad9a863a5cf3cdb5a3df8c42cf4cc33a4ada7d029c4a80e741083fe54f9948ff837832 SHA512 1aec9b28b1fdde076a4eb3b9d03c448ed28dfdfe102d0fcb7dd9c75c3dd735854ca69d0334c0b1067fa897cfd96044cc49cdf7c8b90e464fa653b702a946fad6
+AUX libm.diff 634 BLAKE2B a1f3eaba778b5cb1a8322a3b3c048293af61eebfe1c3e43c880242a100b732d3f2252ea9bac3469218e0f6e97424fd13ba52655adaf1a43b8c8abf8d67652e16 SHA512 7b1f00e9644ef0762adb10d64835bd9f2e5b2d64729a75cd1afde62f6560afe4fb632e666a4f971686aabbc8a6d5d6364ab641787a01152667e25904fedfff62
+DIST cuneiform-linux-1.1.0.tar.bz2 26388511 BLAKE2B 9a9406d42b96d814b7342c48b384b7d46b529116e37f9946da6b1158bd223d2e4be0158bd0101f0b9821b7d63374758190e60232483779bdb6a4164d1b06034e SHA512 82395f43aae9f4b1301fb47b8d46613affb0ccb09c92d64ac3d77a593618cd56824225b0306176e4d8b90eb468abf6b9f534e97f28dabd4bba81cb7977b79b56
+EBUILD cuneiform-1.1.0-r2.ebuild 1327 BLAKE2B 82bd224768add6da597c5946874bf28ca36eb40f3603535c1d22f22bd218e85a82585164956a82b264ab10fd5b352008728e13e7aa43050b858c80837adf7704 SHA512 083eb8b48d059513e696de7c8eb340526817d577f1b51ee34833101d86583131f9d563e01222c7256bcf201edf1a6a3d0ef03f027b5d524f8a1087d9be6c706e
+MISC metadata.xml 344 BLAKE2B a004a26b6f3707acc98c356f79b3d9451b5fb596fb5ee3e2291ceda662539e2b90e82cfcc3f0c5f17febd315f5f8d921a39cfa212fab2253efa67edb87914e41 SHA512 7c8e545246470ac8e3928f698434403dfd4ccfacce041d623a1fbfdc26bf2a032b4df5604425292d5fc63570237c576630d61884f1ab03e7d2052b9d167a385e
diff --git a/app-text/cuneiform/cuneiform-1.1.0-r2.ebuild b/app-text/cuneiform/cuneiform-1.1.0-r2.ebuild
new file mode 100644
index 000000000000..6b1f082888d5
--- /dev/null
+++ b/app-text/cuneiform/cuneiform-1.1.0-r2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils versionator
+
+PV_MAJ=$(get_version_component_range 1-2)
+MY_P=${PN}-linux-${PV}
+
+DESCRIPTION="An enterprise quality OCR engine by Cognitive Technologies"
+HOMEPAGE="https://launchpad.net/cuneiform-linux"
+SRC_URI="https://launchpad.net/${PN}-linux/${PV_MAJ}/${PV_MAJ}/+download/${MY_P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="debug graphicsmagick"
+
+RDEPEND="
+	!graphicsmagick? ( media-gfx/imagemagick:= )
+	graphicsmagick? ( media-gfx/graphicsmagick:= )"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+DOCS=( readme.txt )
+PATCHES=(
+	"${FILESDIR}/c-assert.diff"
+	"${FILESDIR}/libm.diff"
+)
+
+src_prepare(){
+	use graphicsmagick && PATCHES+=( "${FILESDIR}/graphicsmagick.diff" )
+	cmake-utils_src_prepare
+
+	# respect LDFLAGS
+	sed -i 's:\(set[(]CMAKE_SHARED_LINKER_FLAGS "[^"]*\):\1 $ENV{LDFLAGS}:' \
+		cuneiform_src/CMakeLists.txt || die "failed to sed for LDFLAGS"
+
+	# Fix automagic dependencies / linking
+	if use graphicsmagick; then
+		sed -i "s:find_package(ImageMagick COMPONENTS Magick++):#DONOTFIND:" \
+			cuneiform_src/CMakeLists.txt \
+			|| die "Sed for ImageMagick automagic dependency failed."
+	fi
+}
+
+src_install() {
+	cmake-utils_src_install
+	doman "${FILESDIR}/${PN}.1"
+}
diff --git a/app-text/cuneiform/files/c-assert.diff b/app-text/cuneiform/files/c-assert.diff
new file mode 100644
index 000000000000..0abf1b117343
--- /dev/null
+++ b/app-text/cuneiform/files/c-assert.diff
@@ -0,0 +1,83 @@
+Description: Use the standard C assert() macro, rather than custom Cuneiform
+  one.
+Author: Jakub Wilk <jwilk@debian.org>
+Forwarded: no
+Last-Update: 2011-04-30
+
+--- a/cuneiform_src/Kern/lns32/src/myassert.h
++++ b/cuneiform_src/Kern/lns32/src/myassert.h
+@@ -60,6 +60,8 @@
+ 	 BC++, v3.1 was used as base
+ */
+ 
++#include <assert.h>
++
+ #ifdef __MYASSERT_H
+ #	Error: Do not specify MYASSERT.H directly - use SLANG.H. Postnikov.
+ #else
+@@ -73,45 +75,3 @@
+ #else
+ #  define WRONG() (assert(0),FALSE)
+ #endif
+-
+-#ifdef __cplusplus
+-extern "C" {
+-#endif
+-
+-#ifndef MY_DEBUG_LEVEL
+-   void   __assertfail( char  *__msg,
+-                                      char  *__cond,
+-                                      char  *__file,
+-         	                          int __line);
+-#else
+-   void   my_assert_fail(const char *cond, const char *__file, int __line);
+-#endif
+-
+-
+-#ifdef  __cplusplus
+-}
+-#endif
+-
+-#undef assert
+-
+-#ifdef NDEBUG
+-#  define assert(p)   ((void)0)
+-#else
+-#  ifdef _Windows
+-#    define _ENDL
+-#  else
+-#    define _ENDL "\n"
+-#  endif
+-	#ifdef MY_DEBUG_LEVEL
+-	#	define assert(p) 															\
+-				((p)) ?                                               \
+-					(void)0 :                                          \
+-					(void) my_assert_fail( #p, __FILE__, __LINE__)
+-	#else
+-	#  define assert(p) 															\
+-				((p) ?                                                \
+-					(void)0 :                                          \
+-					(void) __assertfail( "Assertion failed: %s, file %s, line %d" _ENDL, \
+-   	                 #p, __FILE__, __LINE__ ) )
+-	#endif
+-#endif
+--- a/cuneiform_src/Kern/std/CMakeLists.txt
++++ b/cuneiform_src/Kern/std/CMakeLists.txt
+@@ -3,7 +3,6 @@
+ add_library(std32 ${LIBTYPE}
+ src/std.cpp
+ #src/Std.rc
+-src/stdassrt.cpp
+ src/stdbits.cpp
+ src/stdconsl.cpp
+ src/stderror.cpp
+--- a/cuneiform_src/Kern/lns32/CMakeLists.txt
++++ b/cuneiform_src/Kern/lns32/CMakeLists.txt
+@@ -14,7 +14,6 @@
+ src/lns.cpp
+ src/lnscheck.cpp
+ src/lnsini.cpp
+-src/myassert.cpp
+ src/procline.cpp
+ src/puanso.cpp
+ src/rbambuk.cpp
diff --git a/app-text/cuneiform/files/cuneiform.1 b/app-text/cuneiform/files/cuneiform.1
new file mode 100644
index 000000000000..93fd25030a80
--- /dev/null
+++ b/app-text/cuneiform/files/cuneiform.1
@@ -0,0 +1,166 @@
+.TH CUNEIFORM 1 "2010-09-14" "1.0.0" "multi-language OCR system"
+
+.SH NAME
+cuneiform \- multi-language OCR system
+
+.SH SYNOPSIS
+\fBcuneiform\fR [\-\-dotmatrix] [\-\-fax] [\-\-singlecolumn] [\-f \fIformat\fR] [\-l \fIlanguage\fR] [\-o \fIoutput\fR] \fIinput\fR
+
+.SH DESCRIPTION
+Cuneiform is an OCR system. In addition to text recognition it also does layout analysis and text format recognition. Cuneiform supports several languages.
+
+.SH OPTIONS
+.IP "\fB\-\-dotmatrix\fR" 4
+Use recognition mode optimized for text printed with a dot matrix printer.
+.IP "\fB\-\-fax\fR" 4
+Use recognition mode optimized for text that has been faxed.
+.IP "\fB\-\-singlecolumn\fR" 4
+Disable page layout analysis and assumes that the image consists of only one column of text.
+.IP "\fB\-f\fR \fIformat\fR" 4
+Select output format. The following formats are available:
+\fBhtml\fR (HTML format),
+\fBhocr\fR (hOCR HTML format),
+\fBnative\fR (native Cuneiform 2000),
+\fBrtf\fR (RTF format),
+\fBsmarttext\fR (plain text with TeX paragraphs),
+\fBtext\fR (plain text). 
+The default is plain text.
+.IP "\fB\-l\fR \fIlanguage\fR" 4
+By default Cuneiform recognizes English text. To change the language use the command line switch \fB\-l\fR followed by a language code (typically an ISO 639-2 three-letter code). The following languages are supported:
+.TS
+ll.
+T{
+\fBbul\fR
+T}	T{
+Bulgarian
+T}
+T{
+\fBcze\fR
+T}	T{
+Czech
+T}
+T{
+\fBdan\fR
+T}	T{
+Danish
+T}
+T{
+\fBdut\fR
+T}	T{
+Dutch
+T}
+T{
+\fBeng\fR
+T}	T{
+English
+T}
+T{
+\fBest\fR
+T}	T{
+Estonian
+T}
+T{
+\fBfra\fR
+T}	T{
+French
+T}
+T{
+\fBger\fR
+T}	T{
+German
+T}
+T{
+\fBhrv\fR
+T}	T{
+Croatian
+T}
+T{
+\fBhun\fR
+T}	T{
+Hungarian
+T}
+T{
+\fBita\fR
+T}	T{
+Italian
+T}
+T{
+\fBlav\fR
+T}	T{
+Latvian
+T}
+T{
+\fBlit\fR
+T}	T{
+Lithuanian
+T}
+T{
+\fBpol\fR
+T}	T{
+Polish
+T}
+T{
+\fBpor\fR
+T}	T{
+Portugese
+T}
+T{
+\fBrum\fR
+T}	T{
+Romanian
+T}
+T{
+\fBrus\fR
+T}	T{
+Russian
+T}
+T{
+\fBruseng\fR
+T}	T{
+mixed Russian/English
+T}
+T{
+\fBslv\fR
+T}	T{
+Slovenian
+T}
+T{
+\fBspa\fR
+T}	T{
+Spanish
+T}
+T{
+\fBsrp\fR
+T}	T{
+Serbian
+T}
+T{
+\fBswe\fR
+T}	T{
+Swedish
+T}
+T{
+\fBtur\fR
+T}	T{
+Turkish
+T}
+T{
+\fBukr\fR
+T}	T{
+Ukrainian
+T}
+.TE
+.
+.IP "\fB\-o\fR \fIoutput\fR" 4
+If you do not define an output file with the \fB\-o\fR switch, Cuneiform writes the result to a file \[oq]cuneiform-out.\fIformat\fR\[cq]. The file extension depends on your output format.
+
+.SH INPUT FORMAT
+Cuneiform can process any single-page image that GraphicsMagick knows how to open. Please consult the \fBgm\fR(1) manual page for the comprehensive list of supported image formats.
+
+.SH HOMEPAGE
+More information about cuneiform can be found at <\fIhttp://launchpad.net/cuneiform-linux/\fR>.
+
+.SH AUTHOR
+cuneiform was written by Cognitive Technologies and Jussi Pakkanen <\fIjpakkane@gmail.com\fR>.
+.PP
+This manual page was written by Daniel Baumann <\fIdaniel@debian.org\fR>, for the Debian project (but may be used by others).
diff --git a/app-text/cuneiform/files/graphicsmagick.diff b/app-text/cuneiform/files/graphicsmagick.diff
new file mode 100644
index 000000000000..265190f40c8a
--- /dev/null
+++ b/app-text/cuneiform/files/graphicsmagick.diff
@@ -0,0 +1,43 @@
+Description: Use GraphicsMagick instead of ImageMagick.
+Author: Jakub Wilk <jwilk@debian.org>
+Forwarded: not-needed
+Last-Update: 2011-01-21
+
+--- a/cuneiform_src/cli/cuneiform-cli.cpp
++++ b/cuneiform_src/cli/cuneiform-cli.cpp
+@@ -341,6 +341,10 @@
+     Magick::InitializeMagick("");
+ #endif
+ 
++#ifdef USE_MAGICK
++    Magick::InitializeMagick("");
++#endif
++
+     dib = read_file(infilename);
+     if(!dib) // Error msg is already printed so just get out.
+         return 1;
+--- a/cuneiform_src/CMakeLists.txt
++++ b/cuneiform_src/CMakeLists.txt
+@@ -34,15 +34,16 @@
+ 
+ add_definitions(-D_USE_RVERLINE_)
+ 
+-find_package(ImageMagick COMPONENTS Magick++)
+-if(ImageMagick_Magick++_FOUND)
++include(FindPkgConfig)
++pkg_check_modules(GraphicsMagick QUIET GraphicsMagick++)
++if(GraphicsMagick_FOUND)
+     set(USE_MAGICK TRUE)
+-    include_directories(${ImageMagick_Magick++_INCLUDE_DIR})
+-    message(STATUS "ImageMagick++ found at ${ImageMagick_Magick++_INCLUDE_DIR}.")
+-    set(cli_ext_libs ${ImageMagick_Magick++_LIBRARY})
++    include_directories(${GraphicsMagick_INCLUDE_DIRS})
++    message(STATUS "GraphicsMagick++ found at ${GraphicsMagick_INCLUDE_DIRS}.")
++    set(cli_ext_libs ${GraphicsMagick_LIBRARIES})
+ else()
+     set(USE_MAGICK FALSE)
+-    message(STATUS "ImageMagick++ not found. Only uncompressed BMP images supported.")
++    message(STATUS "GraphicsMagick++ not found. Only uncompressed BMP images supported.")
+ endif()
+ 
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Kern/include/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/Kern/include/config.h)
diff --git a/app-text/cuneiform/files/libm.diff b/app-text/cuneiform/files/libm.diff
new file mode 100644
index 000000000000..0ab16d58274f
--- /dev/null
+++ b/app-text/cuneiform/files/libm.diff
@@ -0,0 +1,25 @@
+Description: Link the leo and r35 libraries with libm.
+Author: Dmitrijs Ledkovs <dmitrij.ledkov@ubuntu.com>, Jakub Wilk <jwilk@debian.org>
+Forwarded: no
+Last-Update: 2011-07-04
+
+--- a/cuneiform_src/Kern/leo/CMakeLists.txt
++++ b/cuneiform_src/Kern/leo/CMakeLists.txt
+@@ -23,6 +23,7 @@
+ msk32
+ r3532
+ std32
++m
+ )
+ 
+ library_hook(leo32)
+--- a/cuneiform_src/Kern/r35/CMakeLists.txt
++++ b/cuneiform_src/Kern/r35/CMakeLists.txt
+@@ -3,6 +3,6 @@
+ 
+ set_property(TARGET r3532 PROPERTY COMPILE_DEFINITIONS __R35__)
+ 
+-target_link_libraries(r3532 mmx32 std32 cfcompat)
++target_link_libraries(r3532 mmx32 std32 cfcompat m)
+ 
+ library_hook(r3532)
diff --git a/app-text/cuneiform/metadata.xml b/app-text/cuneiform/metadata.xml
new file mode 100644
index 000000000000..8797b4d858f4
--- /dev/null
+++ b/app-text/cuneiform/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<longdescription lang="en">
+		Cuneiform is an multi-language OCR system.
+	</longdescription>
+	<upstream>
+		<remote-id type="launchpad">cuneiform-linux</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/cutemarked-0.11.3 b/app-text/cutemarked-0.11.3
deleted file mode 100644
index 14f8fa7c6852..000000000000
--- a/app-text/cutemarked-0.11.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure prepare
-DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwebkit:5 dev-qt/linguist-tools:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qttest:5 app-text/discount app-text/hunspell
-DESCRIPTION=Qt5 markdown editor
-EAPI=5
-HOMEPAGE=https://github.com/cloose/CuteMarkEd
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwebkit:5 dev-qt/linguist-tools:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qttest:5 app-text/discount app-text/hunspell
-SLOT=0
-SRC_URI=https://github.com/cloose/cutemarked/archive/v0.11.3.tar.gz -> cutemarked-0.11.3.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a9008b5230c7e056d64c1be7b42a5fc3
diff --git a/app-text/cutemarked/Manifest b/app-text/cutemarked/Manifest
new file mode 100644
index 000000000000..910bc18ed645
--- /dev/null
+++ b/app-text/cutemarked/Manifest
@@ -0,0 +1,4 @@
+AUX cutemarked-0.11.1-respect-destdir.patch 992 BLAKE2B 17c10668ead3f212a6038d83881faaa09b9e4de0bc6e835236e21eda97581129ced3d3d607147729c942db243e8072c04cf9314cf4b40ebf6a84a812e9ad1dbf SHA512 dc6c48c7c0b9b4684b333d1f1aa000d95422b1cac4e71f16cb84eb8bcede63fcc653528005af17fb6757475c9c05c50bffe859d64d5c568e831de7e7769fc92d
+DIST cutemarked-0.11.3.tar.gz 772238 BLAKE2B 1acc7291d968f26f87a1b2fc1070ca3a61053b8bba04c57d91917ed3dea6a5893b9cab41004cef044ddb656e3d334d177d6765db7624d33f91f749d5787b23b2 SHA512 3b776f6453812ce4afa37532bf03adce01ad3ec2fb0d848e3a0e5f18ca30be6f1e9f6b3c815917a96c9637c722d53a5bc249d5f58b209000d7d794239626ca30
+EBUILD cutemarked-0.11.3.ebuild 730 BLAKE2B e00d9dd67ef4c3b9f19ec502c5f1fdac6efc476136bacdc26851a15ba6bd86f0239ba5b1d8f1e3b1628684da33b68d7501b8e83d6b233272604b4a4c4f7b4214 SHA512 b19d529d6b924a038375c8a4dc9a881fc865fd85b33cbf64b0035fe729d48b68a01e01c1738251b2fe6a1a2d903b71e1af0c161d144557c0c080f6224b517e7d
+MISC metadata.xml 342 BLAKE2B e03fde7a5232c8c6c2134ee0f9441d6f72440d942025655d5ee2c74f7069416057b315bbc5b3f9e468507ec1324f9d9f6abc4598e01590c7dae1efdbbbcfc56c SHA512 4568bb1fe2212d4dcde357798fb5e0c3ab4155e5ff388e6fd545a8a2c2ffad023eefc2e874bebd7005cee77266ee034f11dddf8f260cab0be396094db9e2f39a
diff --git a/app-text/cutemarked/cutemarked-0.11.3.ebuild b/app-text/cutemarked/cutemarked-0.11.3.ebuild
new file mode 100644
index 000000000000..a6afe6931aeb
--- /dev/null
+++ b/app-text/cutemarked/cutemarked-0.11.3.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit qmake-utils
+
+DESCRIPTION="Qt5 markdown editor"
+HOMEPAGE="https://github.com/cloose/CuteMarkEd"
+SRC_URI="https://github.com/cloose/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwebkit:5
+	dev-qt/linguist-tools:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qttest:5
+	app-text/discount
+	app-text/hunspell
+"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/CuteMarkEd-${PV}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}"-0.11.1-respect-destdir.patch
+}
+
+src_configure() {
+	eqmake5 ROOT="${D}" CuteMarkEd.pro
+}
diff --git a/app-text/cutemarked/files/cutemarked-0.11.1-respect-destdir.patch b/app-text/cutemarked/files/cutemarked-0.11.1-respect-destdir.patch
new file mode 100644
index 000000000000..2ce1469538f7
--- /dev/null
+++ b/app-text/cutemarked/files/cutemarked-0.11.1-respect-destdir.patch
@@ -0,0 +1,24 @@
+diff -ru CuteMarkEd-0.11.1/app/app.pro CuteMarkEd-0.11.1-sane/app/app.pro
+--- CuteMarkEd-0.11.1/app/app.pro	2015-07-06 12:02:22.000000000 +0200
++++ CuteMarkEd-0.11.1-sane/app/app.pro	2015-07-09 14:53:29.398899757 +0200
+@@ -243,7 +243,7 @@
+ ## INSTALLATION
+ 
+ unix {
+-   isEmpty(PREFIX): PREFIX = /usr
++   isEmpty(PREFIX): PREFIX = $${ROOT}/usr
+    DATADIR = $${PREFIX}/share
+ 
+    # install desktop file
+diff -ru CuteMarkEd-0.11.1/fontawesomeicon/fontawesomeicon.pro CuteMarkEd-0.11.1-sane/fontawesomeicon/fontawesomeicon.pro
+--- CuteMarkEd-0.11.1/fontawesomeicon/fontawesomeicon.pro	2015-07-06 12:02:22.000000000 +0200
++++ CuteMarkEd-0.11.1-sane/fontawesomeicon/fontawesomeicon.pro	2015-07-09 14:52:45.867901697 +0200
+@@ -39,7 +39,7 @@
+ 
+ unix {
+    # install plugin
+-   target.path = $$[QT_INSTALL_PLUGINS]/iconengines
++   target.path = $${ROOT}/$$[QT_INSTALL_PLUGINS]/iconengines
+    INSTALLS += target
+    message("The project will be installed in $$[QT_INSTALL_PLUGINS]/iconengines")
+ }
diff --git a/app-text/cutemarked/metadata.xml b/app-text/cutemarked/metadata.xml
new file mode 100644
index 000000000000..522f8101737d
--- /dev/null
+++ b/app-text/cutemarked/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>zx2c4@gentoo.org</email>
+    <name>Jason A. Donenfeld</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">cloose/cutemarked</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-text/cwtext-0.96 b/app-text/cwtext-0.96
deleted file mode 100644
index 10d0d091fd2b..000000000000
--- a/app-text/cwtext-0.96
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Text to Morse Code converter
-EAPI=0
-HOMEPAGE=http://cwtext.sourceforge.net
-KEYWORDS=amd64 ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://sourceforge/cwtext/cwtext-0.96.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d1cb50af41db44e4acd0d6a918f65426
diff --git a/app-text/cwtext/Manifest b/app-text/cwtext/Manifest
new file mode 100644
index 000000000000..a004718493cb
--- /dev/null
+++ b/app-text/cwtext/Manifest
@@ -0,0 +1,4 @@
+AUX cwtext-0.94-asneeded.patch 525 BLAKE2B 0e099345b40bd853420bd35289108bfd43ff02ccc253202786201a74607692015808ae6a3620212ea3879e93b53a10abd4daab81ecf77159982a8aebf5dab604 SHA512 e80d4705d71badb3a0c75a21b99cb2b8033272c609a9cfea769ec48825544f3972cdc505ad32842c34da4918e7dcfcff07900f3611a5a1ca0fdd4c48784d7067
+DIST cwtext-0.96.tar.gz 16596 BLAKE2B 0165b787fcb0e5c0ef803370d06eabbde4c014ac11dcd16a516579cf3d817e90c79db6ec15702643be710c9849765671bf676f41a0679443a87a6f4e555963d9 SHA512 6765c79b6feea2947974bf4654ed1edc83f6c9ddaae1bf37d5ed95dedc4ce9b45d5e41dff7ec50d6586f34901d8f93a3230f1a7e1cf4d52b8a84c851cfbdbd33
+EBUILD cwtext-0.96.ebuild 705 BLAKE2B 14f5b38878b22ac327898934337e0ea62b7ee94c8aa1ad9196111d8a9dc4b20aa3c76c229c68b2c5d88c6a68e8954f590e36af93005d158c47b130c622dc8be6 SHA512 3e937d89e7f7642839ec0a2acbe17006b1316c0dc31b3d284c31c2b8777905f6f1f47f804a77398e75782fbd24e0bd840611955957f5b61d197c4dff99dc8152
+MISC metadata.xml 325 BLAKE2B ff358d0bef47c35ccd68eb73a608e1e3f61cf6735aafcf4045c9b5a49f2e533b4ef2c305a0fa3fa1e23fb6920f4d589cd2274fbdd0073d0d0a8432ff5b911910 SHA512 e61b6497de3ea7dfbc4244c904bd2e3966bdfc3fb228836ffd21e7955da87da325af62b0f8cde180b75d0632dcacf77b46e2b56249b14b2dfa827cc082bd217f
diff --git a/app-text/cwtext/cwtext-0.96.ebuild b/app-text/cwtext/cwtext-0.96.ebuild
new file mode 100644
index 000000000000..41d44142ef18
--- /dev/null
+++ b/app-text/cwtext/cwtext-0.96.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Text to Morse Code converter"
+HOMEPAGE="http://cwtext.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE=""
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# change install directory to ${S}
+	sed -i -e "/^PREFIX/ s:=.*:=\"${S}\":" makefile || \
+		die "sed makefile failed"
+
+	epatch "${FILESDIR}"/${PN}-0.94-asneeded.patch
+	tc-export CC
+}
+
+src_install() {
+	dobin cwtext cwpcm cwmm || die "dobin failed"
+
+	dodoc Changes README TODO
+}
diff --git a/app-text/cwtext/files/cwtext-0.94-asneeded.patch b/app-text/cwtext/files/cwtext-0.94-asneeded.patch
new file mode 100644
index 000000000000..ab0f16ee75b3
--- /dev/null
+++ b/app-text/cwtext/files/cwtext-0.94-asneeded.patch
@@ -0,0 +1,19 @@
+--- makefile.orig	2009-01-04 16:00:44.467365615 +0100
++++ makefile	2009-01-04 16:02:16.338692800 +0100
+@@ -8,13 +8,13 @@
+ 	install -sc cwmm ${PREFIX}/bin
+ 
+ cwmm: cwmm.o morse.o
+-	${CC} ${CFLAGS} -o cwmm $^
++	${CC} ${CFLAGS} $(LDFLAGS) -o cwmm $^
+ 	
+ cwpcm: cwpcm.o morse.o pcm.o
+-	${CC} ${CFLAGS} -o cwpcm -lm $^
++	${CC} ${CFLAGS} $(LDFLAGS) -o cwpcm $^ -lm
+ 
+ cwtext: cwtext.o morse.o
+-	${CC} ${CFLAGS} -o cwtext  $^
++	${CC} ${CFLAGS} $(LDFLAGS) -o cwtext  $^
+ 
+ cwpcm.o: cwpcm.c morse.h pcm.h
+ 	${CC} ${CFLAGS} -c cwpcm.c
diff --git a/app-text/cwtext/metadata.xml b/app-text/cwtext/metadata.xml
new file mode 100644
index 000000000000..303a257b21e3
--- /dev/null
+++ b/app-text/cwtext/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>tomjbe@gentoo.org</email>
+		<name>Thomas Beierlein</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">cwtext</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/dbacl-1.14 b/app-text/dbacl-1.14
deleted file mode 100644
index 5d54c40bef51..000000000000
--- a/app-text/dbacl-1.14
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=prepare
-DEPEND=interactive? ( sys-libs/slang:= sys-libs/readline:= sys-libs/ncurses:= )
-DESCRIPTION=Digramic Bayesian text classifier
-EAPI=5
-HOMEPAGE=http://www.lbreyer.com/gpl.html
-IUSE=interactive
-KEYWORDS=amd64 s390 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=GPL-3
-RDEPEND=interactive? ( sys-libs/slang:= sys-libs/readline:= sys-libs/ncurses:= )
-SLOT=0
-SRC_URI=http://www.lbreyer.com/gpl/dbacl-1.14.tar.gz
-_md5_=f8541a9e469b0a1605c04191f4d74bea
diff --git a/app-text/dbacl/Manifest b/app-text/dbacl/Manifest
new file mode 100644
index 000000000000..6b5d02732fb4
--- /dev/null
+++ b/app-text/dbacl/Manifest
@@ -0,0 +1,3 @@
+DIST dbacl-1.14.tar.gz 922969 BLAKE2B 9d16c1736b9bc062135daa2fd810b527324abe1fa4cdab650bee45949c21f44fef4197a09d9059e89bdc36dc038f073e7d67b295f6a460fad5dd22d688bd464d SHA512 1cf0877c8bea9c47e055f9291efbb934b65cfd7d26d4ef375ee9fb154b557c691e760543254c5128eb1a04b0724462078f47477a91c4e396e7096ef88d2d77c9
+EBUILD dbacl-1.14.ebuild 704 BLAKE2B f8d17c5d13a347f9518d8ad6a2cbef0288ca4bdbffd8a70ce4dc1ce935dea057f932e77f3619ac0af41e2225c1a5c70553620dc8c97563834526161c8fbb5f23 SHA512 6c1e721db59b9f330ea0fab1491f0ab39cf801c628525b963a616da664c84175fe71633f492cf0e1650d37d955fac41695cc50970b9a6fe7ad5968538cc8727a
+MISC metadata.xml 610 BLAKE2B 1466caaf4d713d5f8352b846e2a1616c28a1f45ffedad98a3f7e35e602cf41b77a3b0bc74012b49c793609a8f88c3976d5573c79f9448816cd00991cc3cef97f SHA512 3151e9a89b575615aa7bc26fae4edbf84a53a24893c1c07f6d8f46fd1058f2270bf7a30697217e1326b733204ee38edd56a7ab8f9949ae2a5450b87828ae290b
diff --git a/app-text/dbacl/dbacl-1.14.ebuild b/app-text/dbacl/dbacl-1.14.ebuild
new file mode 100644
index 000000000000..1d92922bbae4
--- /dev/null
+++ b/app-text/dbacl/dbacl-1.14.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="Digramic Bayesian text classifier"
+HOMEPAGE="http://www.lbreyer.com/gpl.html"
+SRC_URI="http://www.lbreyer.com/gpl/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 s390 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="interactive"
+
+RDEPEND="interactive? (
+		sys-libs/slang:=
+		sys-libs/readline:=
+		sys-libs/ncurses:= )"
+
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	# See bug #352636 for reference
+	export ac_cv_lib_ncurses_initscr=$(usex interactive)
+	export ac_cv_lib_readline_readline=$(usex interactive)
+	export ac_cv_lib_slang_SLsmg_init_smg=$(usex interactive)
+}
diff --git a/app-text/dbacl/metadata.xml b/app-text/dbacl/metadata.xml
new file mode 100644
index 000000000000..505ddc59ff8b
--- /dev/null
+++ b/app-text/dbacl/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+<email>aidecoe@gentoo.org</email>
+<name>Amadeusz Żołnowski</name>
+</maintainer>
+<use>
+<flag name="interactive">Enable the interactive mailinspect ability</flag>
+</use>
+<longdescription>dbacl is a fast Bayesian text and email classifier. It builds a variety of language models using maximum entropy (minimum divergence) principles, and these can then be used to categorize input data automatically among multiple categories.</longdescription>
+</pkgmetadata>
diff --git a/app-text/dblatex-0.3.10-r1 b/app-text/dblatex-0.3.10-r1
deleted file mode 100644
index d8a2341f5d28..000000000000
--- a/app-text/dblatex-0.3.10-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-text/docbook-xml-dtd:4.5 dev-libs/kpathsea dev-libs/libxslt dev-libs/libxslt dev-texlive/texlive-fontutils dev-texlive/texlive-latex dev-texlive/texlive-latexextra dev-texlive/texlive-latexrecommended dev-texlive/texlive-mathscience dev-texlive/texlive-pictures dev-texlive/texlive-xetex gnome-base/librsvg media-gfx/imagemagick media-gfx/transfig inkscape? ( media-gfx/inkscape ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Transform DocBook using TeX macros
-EAPI=6
-HOMEPAGE=http://dblatex.sourceforge.net/
-IUSE=inkscape python_targets_python2_7
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=app-text/docbook-xml-dtd:4.5 dev-libs/kpathsea dev-libs/libxslt dev-libs/libxslt dev-texlive/texlive-fontutils dev-texlive/texlive-latex dev-texlive/texlive-latexextra dev-texlive/texlive-latexrecommended dev-texlive/texlive-mathscience dev-texlive/texlive-pictures dev-texlive/texlive-xetex gnome-base/librsvg media-gfx/imagemagick media-gfx/transfig inkscape? ( media-gfx/inkscape ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://sourceforge/dblatex/dblatex-0.3.10.tar.bz2
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=48149bbca12d4d1ba26d74b037f23d06
diff --git a/app-text/dblatex-0.3.7 b/app-text/dblatex-0.3.7
deleted file mode 100644
index 711ddcf3cffc..000000000000
--- a/app-text/dblatex-0.3.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-text/texlive dev-texlive/texlive-latexextra dev-texlive/texlive-latexrecommended dev-texlive/texlive-mathscience dev-texlive/texlive-pictures dev-texlive/texlive-xetex dev-libs/libxslt app-text/docbook-xml-dtd:4.5 gnome-base/librsvg python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Transform DocBook using TeX macros
-EAPI=5
-HOMEPAGE=http://dblatex.sourceforge.net/
-IUSE=python_targets_python2_7
-KEYWORDS=amd64 arm x86
-LICENSE=GPL-2
-RDEPEND=app-text/texlive dev-texlive/texlive-latexextra dev-texlive/texlive-latexrecommended dev-texlive/texlive-mathscience dev-texlive/texlive-pictures dev-texlive/texlive-xetex dev-libs/libxslt app-text/docbook-xml-dtd:4.5 gnome-base/librsvg python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://sourceforge/dblatex/dblatex-0.3.7.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c87ccdf82f2c4a9a0efa18f10b769639
diff --git a/app-text/dblatex/Manifest b/app-text/dblatex/Manifest
new file mode 100644
index 000000000000..b0360aa73431
--- /dev/null
+++ b/app-text/dblatex/Manifest
@@ -0,0 +1,9 @@
+AUX dblatex-0.3.10-no-inkscape-dependency.patch 682 BLAKE2B b9dd747b3e0440f9e255f09e0a5b80e9218066a09cceb63fad5b2ea4507d4d11975f610726db3efb0f14a1701a4c2f2afd89dacceba2ba6299805b6d21eb334a SHA512 e469066dad4dfeaa92ee0fc12e0fb0de0eda83f503a22227b9714b282f7b8ad697726d2c69f623b5c77c9f31d3d182f4c144a660521b8865808e6260fcd5f4da
+AUX dblatex-0.3.7-no-inkscape-dependency.patch 595 BLAKE2B 6937bc2cebd42193c5a1414330445162b09954e80db39b3221ca6fd6ba1320bd44e41e2f896a7b11e4334dd729b4167dbfd70c5d21b55719737ce9bb93e0d8fd SHA512 69cb27f3548a55ae2d34e1b9c05f963a05e5b810e5338e7adb5f4739c03f3bd6bb650e9a6a63edfc75554b45a835c1cb596681dd3e440ea1acb0d2b661d25c6c
+AUX dblatex-path-logging.patch 537 BLAKE2B 1ed23e355e64946ac0bd8839edd26688fbbfbbd56e090470c07ffb8b2cc91ebe32500002468c1f4333adcf786722b5af8623581ae4a4ca5af53be4a5e80959c3 SHA512 04a1f26e59a7c45eed758f8e8fa1f5e1469e3ea71fa65c836d038397c0d8bbc0ca658c05697dcb32371dde33cf3d20be3f987d7b68f194f2d254071cf2836213
+AUX dblatex-setup.patch 773 BLAKE2B d32b842e52caddd1587fe2fe0a005b148bb1a231b0b4bf4cc6c62cdced6a47048639ed9b5f98bc42a72f19a8e4e9dfd1bc4bf1eff62fb032bdb52bfe396335da SHA512 c9ca96db18f81ffd999d3b2fd274d2fbf29f869d199d954fac562938a8475510278f0d3bb7cb948414f13c84c6f94dbec196c7bd04f3abe3400c3fdfe36941fb
+DIST dblatex-0.3.10.tar.bz2 1668202 BLAKE2B 2cc7e33ddc1b4732ae880d3443e65e40b16fc21fa31dfc52ef2250433f4c99bb5b590961095e044b2972b1ac9b4e38358e356b7bdcfb607d6f863720feea7cf4 SHA512 33a5ee3d23d3b9a1576be248a312ca741ea7cb629334a98fb6cb49e0f0f932334506ea934312de04ec645c86ec52699687bd2574b1802d3c23815b44c8514b7b
+DIST dblatex-0.3.7.tar.bz2 1513975 BLAKE2B de523640eacc058eaffc2e53407d6faed0969b1485110dca7669c6fb2323d4ecb91c8d73d9a8fdf3ae9d0803f5e5a371af011c0a241f97f08ae4d73ee57e7d89 SHA512 7f7111dfe7d880a93679422a43700787755ebee7f17483b4bc5a8ce55c521d7fe0baeb4890a910b9007141d63a3e3b8f50347e68001ad7c1a14916920e11a40c
+EBUILD dblatex-0.3.10-r1.ebuild 1316 BLAKE2B 9771dfb0dac508f8b16bb6ae5e7f69e71e7d1449034451562d58eba884baf3a7dcf4230dcabe38c70c63ce22cf14c85fcf2b97491167534404fa5d4a3cd138e7 SHA512 c8b267c0e6ae576e2655d4cd9424a2692521ecfe8f847e851b8424670ead8e15f4a9200723656d49cefb118d2a4b31880ac7af054f49871c4cfbbed7d3bc2ca3
+EBUILD dblatex-0.3.7.ebuild 1120 BLAKE2B 1776f6e8414636dfb040fda86c7ed1a75cfe38fe80f337c57960ec6409e0e9973d7c55857609c935b96221c75f5e18190bd36e5e0d1ebb9c1ab4a018d5ced76e SHA512 ed640e2d8f4d92d3abfbe91cb6a328666fc33ffbbf9d67f72c3ca9710bff904cce7d4c6482eeccbaac6fe009591de80047c8791165846a49086ee255da3491cf
+MISC metadata.xml 866 BLAKE2B 3776cf07848836c14fd82031a49284f982b04b573fd28080c0fa9c7cbe6155fa63c89b897461dc996842a0d66be38fbde2326cdce8aeddebbfcfd777677e2011 SHA512 9806f0804fc5b14a222974a9e2c2cc8a13a7378b99deca9cd9ac5f7cbdb776b3c240b521a6077cb80d1685574ca47a372712526ec994c6bf228b2c784568cf93
diff --git a/app-text/dblatex/dblatex-0.3.10-r1.ebuild b/app-text/dblatex/dblatex-0.3.10-r1.ebuild
new file mode 100644
index 000000000000..0f9f0a65e4f1
--- /dev/null
+++ b/app-text/dblatex/dblatex-0.3.10-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Transform DocBook using TeX macros"
+HOMEPAGE="http://dblatex.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="inkscape"
+
+RDEPEND="
+	app-text/docbook-xml-dtd:4.5
+	dev-libs/kpathsea
+	dev-libs/libxslt
+	dev-libs/libxslt
+	dev-texlive/texlive-fontutils
+	dev-texlive/texlive-latex
+	dev-texlive/texlive-latexextra
+	dev-texlive/texlive-latexrecommended
+	dev-texlive/texlive-mathscience
+	dev-texlive/texlive-pictures
+	dev-texlive/texlive-xetex
+	gnome-base/librsvg
+	media-gfx/imagemagick
+	media-gfx/transfig
+	inkscape? ( media-gfx/inkscape )
+"
+DEPEND="${RDEPEND}"
+
+python_prepare_all() {
+	use inkscape || eapply "${FILESDIR}/${P}-no-inkscape-dependency.patch"
+	eapply "${FILESDIR}/${PN}-path-logging.patch"
+	eapply "${FILESDIR}/${PN}-setup.patch"
+	distutils-r1_python_prepare_all
+}
+
+python_install() {
+	distutils-r1_python_install
+	python_doscript "${S}"/scripts/dblatex
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	# move package documentation to a folder name containing version number
+	mv "${D%/}"/usr/share/doc/${PN} "${D%/}"/usr/share/doc/${PF} || die
+}
diff --git a/app-text/dblatex/dblatex-0.3.7.ebuild b/app-text/dblatex/dblatex-0.3.7.ebuild
new file mode 100644
index 000000000000..eecbe631b196
--- /dev/null
+++ b/app-text/dblatex/dblatex-0.3.7.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="Transform DocBook using TeX macros"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+HOMEPAGE="http://dblatex.sourceforge.net/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 arm x86"
+IUSE=""
+
+RDEPEND="
+	app-text/texlive
+	dev-texlive/texlive-latexextra
+	dev-texlive/texlive-latexrecommended
+	dev-texlive/texlive-mathscience
+	dev-texlive/texlive-pictures
+	dev-texlive/texlive-xetex
+	dev-libs/libxslt
+	app-text/docbook-xml-dtd:4.5
+	gnome-base/librsvg
+"
+DEPEND="${RDEPEND}"
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+	epatch "${FILESDIR}/${P}-no-inkscape-dependency.patch"
+	epatch "${FILESDIR}/${PN}-path-logging.patch"
+	epatch "${FILESDIR}/${PN}-setup.patch"
+}
+
+python_install_all() {
+	python_doscript "${S}"/scripts/dblatex
+	python_optimize
+	distutils-r1_python_install_all
+	# move package documentation to a folder name containing version number
+	mv "${D}"/usr/share/doc/${PN} "${D}"/usr/share/doc/${PF} || die "mv doc"
+}
diff --git a/app-text/dblatex/files/dblatex-0.3.10-no-inkscape-dependency.patch b/app-text/dblatex/files/dblatex-0.3.10-no-inkscape-dependency.patch
new file mode 100644
index 000000000000..c501cee63042
--- /dev/null
+++ b/app-text/dblatex/files/dblatex-0.3.10-no-inkscape-dependency.patch
@@ -0,0 +1,12 @@
+diff -Naur dblatex-0.3.10.orig/lib/dbtexmf/core/imagedata.py dblatex-0.3.10/lib/dbtexmf/core/imagedata.py
+--- dblatex-0.3.10.orig/lib/dbtexmf/core/imagedata.py	2018-02-16 17:00:42.658484437 +0200
++++ dblatex-0.3.10/lib/dbtexmf/core/imagedata.py	2018-02-16 16:52:56.339441569 +0200
+@@ -178,7 +178,7 @@
+ class SvgConverter(ImageConverter):
+     def __init__(self, imgsrc, imgdst="", docformat="", backend=""):
+         ImageConverter.__init__(self, imgsrc="svg", imgdst=imgdst)
+-        self.add_command(["inkscape", "-z", "-D", "--export-%(dst)s=%(output)s",
++        self.add_command(["rsvg-convert", "-f", "%(dst)s", "-o","%(output)s",
+                           "%(input)s"])
+ 
+ 
diff --git a/app-text/dblatex/files/dblatex-0.3.7-no-inkscape-dependency.patch b/app-text/dblatex/files/dblatex-0.3.7-no-inkscape-dependency.patch
new file mode 100644
index 000000000000..1d032f4ac26c
--- /dev/null
+++ b/app-text/dblatex/files/dblatex-0.3.7-no-inkscape-dependency.patch
@@ -0,0 +1,12 @@
+diff -Naur dblatex-0.3.7-orig/lib/dbtexmf/core/imagedata.py dblatex-0.3.7/lib/dbtexmf/core/imagedata.py
+--- dblatex-0.3.7-orig/lib/dbtexmf/core/imagedata.py	2015-08-07 10:47:53.000000000 +0100
++++ dblatex-0.3.7/lib/dbtexmf/core/imagedata.py	2015-11-08 22:36:41.771457222 +0000
+@@ -66,7 +66,7 @@
+ 
+ class SvgConverter(ImageConverter):
+     def convert(self, input, output, format, doexec=1):
+-        cmd = "inkscape -z -D --export-%s=%s \"%s\"" % (format, output, input)
++        cmd = "rsvg-convert -f %s -o \"%s\" \"%s\"" % (format, output, input)
+         return self.system(cmd, doexec)
+ 
+ 
diff --git a/app-text/dblatex/files/dblatex-path-logging.patch b/app-text/dblatex/files/dblatex-path-logging.patch
new file mode 100644
index 000000000000..7f0fdb6c52a6
--- /dev/null
+++ b/app-text/dblatex/files/dblatex-path-logging.patch
@@ -0,0 +1,15 @@
+diff -Naur dblatex-0.3.7-orig/scripts/dblatex dblatex-0.3.7/scripts/dblatex
+--- dblatex-0.3.7-orig/scripts/dblatex	2015-08-07 10:47:53.000000000 +0100
++++ dblatex-0.3.7/scripts/dblatex	2015-11-08 22:30:50.362571505 +0000
+@@ -1,8 +1,10 @@
+ #! /usr/bin/env python
+ import sys
+ import os
++import logging
+ 
+-package_base = os.path.join(os.path.dirname(sys.argv[0]), "..")
++logging.basicConfig()
++package_base = "/usr/share/dblatex"
+ sys.path.append(os.path.realpath(os.path.join(package_base, "lib")))
+ 
+ from dbtexmf.dblatex import dblatex
diff --git a/app-text/dblatex/files/dblatex-setup.patch b/app-text/dblatex/files/dblatex-setup.patch
new file mode 100644
index 000000000000..f6cf4a24283e
--- /dev/null
+++ b/app-text/dblatex/files/dblatex-setup.patch
@@ -0,0 +1,28 @@
+--- dblatex-0.3.7-orig/setup.py	2015-08-07 10:47:53.000000000 +0100
++++ dblatex-0.3.7/setup.py	2015-11-08 22:39:03.076213227 +0000
+@@ -23,7 +23,6 @@
+ from distutils import log
+ from subprocess import Popen, PIPE
+ sys.path.append("lib")
+-from contrib.debian.installer import DebianInstaller
+ 
+ #
+ # Build the command line script
+@@ -363,15 +362,12 @@
+                 status += "no"
+                 mis_stys.append(sty)
+             print status
+-            
++
+         if mis_stys:
+             raise OSError("not found: %s" % ", ".join(mis_stys))
+ 
+     def run(self):
+-        if self.install_layout == "deb":
+-            db = DebianInstaller(self)
+-        else:
+-            db = None
++        db = None
+ 
+         if not(db) and not(self.nodeps):
+             try:
diff --git a/app-text/dblatex/metadata.xml b/app-text/dblatex/metadata.xml
new file mode 100644
index 000000000000..609cf12fd1ec
--- /dev/null
+++ b/app-text/dblatex/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+    <maintainer type="person">
+        <email>zoltan@sinustrom.info</email>
+        <name>Zoltan Puskas</name>
+    </maintainer>
+    <maintainer type="project">
+        <email>proxy-maint@gentoo.org</email>
+        <name>Proxy Maintainers</name>
+    </maintainer>
+    <use>
+        <flag name="inkscape">Use inkscape to convert SVG. Disable to use gnome-base/librsvg instead.</flag>
+    </use>
+    <longdescription>
+               dbaltex is an opensource DocBook to LaTeX publishing software 
+               that originally started as DB2LaTeX clone, but now is more
+               feature rich and easier to use.
+    </longdescription>
+    <upstream>
+        <remote-id type="sourceforge">dblatex</remote-id>
+    </upstream>
+</pkgmetadata>
diff --git a/app-text/ddir-0_p20100323 b/app-text/ddir-0_p20100323
deleted file mode 100644
index 2e436e6b1f7d..000000000000
--- a/app-text/ddir-0_p20100323
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install
-DESCRIPTION=A perl implementation of the tree(1) program
-EAPI=0
-HOMEPAGE=http://freshmeat.net/projects/ddir
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl
-SLOT=0
-SRC_URI=mirror://gentoo/ddir-0_p20100323.tar.bz2
-_md5_=599523e4b088a31aaecfcc63cba195d0
diff --git a/app-text/ddir/Manifest b/app-text/ddir/Manifest
new file mode 100644
index 000000000000..63e9795510e1
--- /dev/null
+++ b/app-text/ddir/Manifest
@@ -0,0 +1,3 @@
+DIST ddir-0_p20100323.tar.bz2 15875 BLAKE2B 5e4a013d8e0c224c540514968b82c4818f5c737a74b13bcf257e19c7f8726a94d234bd138ad8efe777b45edfe7a471896855b37eec0d8adb4045912687cb25c5 SHA512 e2f367eef02c14a1d937db71fcd798990975581f6352ffad01894b40aea218f48a22d2aa96660cb1f8876b0720a8e76eacf9a5c87f0ecd2f58cafd5434acccad
+EBUILD ddir-0_p20100323.ebuild 500 BLAKE2B 0012595c8066e26100d52db3809f190036840ff4da180f7c1055a351f0c00c8e78f30546f80e8ecfa3cb01cda81ea8e183a46cf38780eb5ba1c8afee19c5ac91 SHA512 29810950bf04b3e156bb68631159e4b2001d43f380151ec847aa0362b1f54d41b7ee9e1ace6829870bb5c7bffd9d967d34bf23d655896e303a1bf933c3017c31
+MISC metadata.xml 239 BLAKE2B cae8f9ef0098f8c78fe8a8e585278e7dd949c753e52125db395f9914e0d93ccf6f16761c30bfe522d90c7b04a5fd1561f87cefc3fc20240f2700ef3772a90439 SHA512 146e1784395f9829562092d49772899fd84d99fa48d2f52c2f9359a8443973a4284d798d54453041fae44f64df806830d31a94f5b883c35579d5f574f7a8e798
diff --git a/app-text/ddir/ddir-0_p20100323.ebuild b/app-text/ddir/ddir-0_p20100323.ebuild
new file mode 100644
index 000000000000..dd207b08e59c
--- /dev/null
+++ b/app-text/ddir/ddir-0_p20100323.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+DESCRIPTION="A perl implementation of the tree(1) program"
+HOMEPAGE="http://freshmeat.net/projects/ddir"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-lang/perl"
+
+src_compile() { :; }
+
+src_install() {
+	newbin bin/ddir.pl ddir || die
+	doman bin/ddir.1
+	dodoc ChangeLog doc/manual/*.txt README
+	dohtml doc/manual/*.html
+}
diff --git a/app-text/ddir/metadata.xml b/app-text/ddir/metadata.xml
new file mode 100644
index 000000000000..eca282c06938
--- /dev/null
+++ b/app-text/ddir/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="freshmeat">ddir</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/delta-20060803 b/app-text/delta-20060803
deleted file mode 100644
index b5620b6c3903..000000000000
--- a/app-text/delta-20060803
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=dev-lang/perl
-DESCRIPTION=Heuristically minimizes interesting files
-EAPI=4
-HOMEPAGE=http://delta.tigris.org/
-KEYWORDS=alpha amd64 arm hppa ia64 m68k ppc ppc64 s390 sh sparc x86 ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=BSD
-SLOT=0
-SRC_URI=http://delta.tigris.org/files/documents/3103/33566/delta-2006.08.03.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=8837ac664bf7ba47db4198724de38b74
diff --git a/app-text/delta/Manifest b/app-text/delta/Manifest
new file mode 100644
index 000000000000..a54df42bcdbb
--- /dev/null
+++ b/app-text/delta/Manifest
@@ -0,0 +1,3 @@
+DIST delta-2006.08.03.tar.gz 32804 BLAKE2B 6e070aea4e9bb4ef849fb0e193cdef08771e74bcd46219bc380f58219d05d2c73ab0738a2d611e3c2bce72a92b82276ec4b8c741f33f092dc348acb153aaa6f4 SHA512 3720f164f3721ad06bf5a73e654c70a67d6e7a56d0ce574fb0e8571b33269e56611a909f915bd0ea46434d94206a9548fd99fdef98181efe41e7fb03de75c585
+EBUILD delta-20060803.ebuild 733 BLAKE2B af281539bd837c7b5457a03381cd2ce9118fa2e8517b50aad87b9980b8d8099f10135e6aa7739e22836b6fff69c8e60add2dc93bf82f190afe0bc1d9cf31525d SHA512 0341224ebe9e298fefddefba786bd686731d13c105b36ecd1cb9f7c37966b4813ae9bb154b286f3ad3a64a8812d012463feffeb58e76144438ad57126fe3d7fb
+MISC metadata.xml 553 BLAKE2B 9cda4f71d8e01943e664d2802e9c048a200cb7d6b171d99cfbf42fb9578b48600506130571b030bc4ef001d2c898727f2c69330049425d84a9e74b2634c7dd92 SHA512 c85367dc67630d0879e88dbc93b73f7283f1dd526a03a7c44eaba69556d69c5c60f5b0c187daf05f05a90d6ae644c1a72ce47ab5a6fe8ec46e92a827f0f1c9b4
diff --git a/app-text/delta/delta-20060803.ebuild b/app-text/delta/delta-20060803.ebuild
new file mode 100644
index 000000000000..59243222f2a5
--- /dev/null
+++ b/app-text/delta/delta-20060803.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+
+inherit toolchain-funcs
+
+MY_PV="${PV:0:4}.${PV:4:2}.${PV:6:2}"
+STUPID_NUM="33566"
+DESCRIPTION="Heuristically minimizes interesting files"
+HOMEPAGE="http://delta.tigris.org/"
+SRC_URI="http://delta.tigris.org/files/documents/3103/${STUPID_NUM}/${PN}-${MY_PV}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ppc ppc64 s390 sh sparc x86 ~ppc-macos ~x64-macos ~x86-macos"
+IUSE=""
+
+DEPEND="dev-lang/perl"
+RDEPEND=""
+
+S=${WORKDIR}/${PN}-${MY_PV}
+
+src_compile() {
+	rm -f Makefile
+	tc-export CC
+	emake topformflat
+}
+
+src_install() {
+	dobin delta multidelta topformflat
+	dodoc Readme
+	dohtml www/*
+}
diff --git a/app-text/delta/metadata.xml b/app-text/delta/metadata.xml
new file mode 100644
index 000000000000..493b7194651e
--- /dev/null
+++ b/app-text/delta/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>toolchain@gentoo.org</email>
+		<name>Gentoo Toolchain Project</name>
+	</maintainer>
+	<longdescription>
+		Delta assists you in minimizing "interesting" files
+		subject to a test of their interestingness. A common such situation
+		is when attempting to isolate a small failure-inducing substring of
+		a large input that causes your program to exhibit a bug.
+	</longdescription>
+</pkgmetadata>
diff --git a/app-text/dictd-1.12.1-r2 b/app-text/dictd-1.12.1-r2
deleted file mode 100644
index 4091fa6d77df..000000000000
--- a/app-text/dictd-1.12.1-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=sys-libs/zlib dev-libs/libmaa dbi? ( dev-db/libdbi ) judy? ( dev-libs/judy ) >=sys-apps/coreutils-6.10 >=sys-apps/gawk-3.1.6 virtual/yacc virtual/pkgconfig
-DESCRIPTION=Dictionary Client/Server for the DICT protocol
-EAPI=5
-HOMEPAGE=http://www.dict.org/ https://sourceforge.net/projects/dict/
-IUSE=dbi judy minimal
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
-LICENSE=GPL-2 ISOC-rfc
-RDEPEND=sys-libs/zlib dev-libs/libmaa dbi? ( dev-db/libdbi ) judy? ( dev-libs/judy ) >=sys-apps/coreutils-6.10
-SLOT=0
-SRC_URI=mirror://sourceforge/dict/dictd-1.12.1.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo	da528e0e6c88b426c83f9b3bce3df2ef	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2cc1d6ba083536ba218572a756fc7892
diff --git a/app-text/dictd/Manifest b/app-text/dictd/Manifest
new file mode 100644
index 000000000000..45f5dc94a3b7
--- /dev/null
+++ b/app-text/dictd/Manifest
@@ -0,0 +1,12 @@
+AUX 1.10.11/colorit.conf 848 BLAKE2B 2fd40b7c18973f3374d2e0b733939d9e8cc2fb4b834f9b4c2a14a98133657db795eaf2e37284c8bc849fd392d1db6a221a786f3299ea1ad86f874e370841b981 SHA512 d836de8a5a409bcbc3e6ee71e3b8fab20229b9937cb909f061cd8d2fd8cb841870d42ce9c4501c441a7825c642be76a7da3c242e9831b1caa30fa5b26e173813
+AUX 1.10.11/dict.conf 243 BLAKE2B 707e17e8373ded07ff36a304a17e33d22544a2b497118b649710cfeb2dcdfcb206990852606ec1392e7018d5e5c475ef823b741438fc22207f25fd7647bc02c7 SHA512 22fbfd3bf8c4f88801aab848e160f46bf17757086ffe8fe7a4cdb78f983e88f6c923cac8714f78d31ab311957aa860731f663324b742febd0a5039085672aeb5
+AUX 1.10.11/dictd.conf 781 BLAKE2B 1cb0a3548125923d2fabfa296863135472b93ca6c34cd4b2d8eebf7f9c0d6e7df9ec652eed4f3a2ee138834ada12a58cdc315d0607cd2bba05315a6dac6db6bf SHA512 60c7ade9e3c160c69b87405962b0e92f6beb3941fecdbbb90c2343f1db1cc800bd26f1a670435641859e6bc864aa8ace58749c07dd106c3afd7eea81601445c3
+AUX 1.10.11/dictd.confd 207 BLAKE2B f7d9815d41490f85a977d3dcfa9dc7330e48b76102f4cf90c18204f780287c7681ba9c7a4dc4e04d9007d18e89f2dbe6c29595ea9f685bb6a14c774f2485a85f SHA512 16e31e250bce84cfa25d5d187f736053773889afd248248fac61aac115df2938fbe6f30049c143f2c290b60652947125763adaffdfcd71260853d574c0434348
+AUX 1.10.11/dictd.initd 1982 BLAKE2B ea63cda1512c1e65a463193cb17a2610053909aebdfb5c572720572f9aa77a00adb632d22a8e775bd0fd8c397331b2f79dda43c214d44d0166b374a9f5dcdc7e SHA512 7b8907dbc9f40f81b8431e691506142954643e6539ca6bb486f629fb929f60da8a7e52066e46374478f805dc1b6e84931f3b4a6a2f8f7d34f56a8664c5f4a0ab
+AUX 1.10.11/site.info 235 BLAKE2B 561d838293b3894d6e7a34348d7181ce3f38a093441ec3029e97524d219bac315927a0ab67f6dff94150d03e851a15b578aee4141d2f3c8d68792ae8f7a794bd SHA512 74bb341f049acd7d502d9117ae1321bedc499958ba377c02a2591880cc45d451409fd99a76ec3ddcf1846f6d124ef5ae1da40c5c001b67e94c68a895c2dcfd79
+AUX dictd-1.10.11-colorit-nopp-fix.patch 323 BLAKE2B e99dea0a194532be7239fab52da9c1bae0557ed3d7a32c4ffa07d5c0298346bfb17b3d2711ac7a5d755f82493b3c4cbde60d1af7f6d4dc31fc9866dbf77a36a8 SHA512 af4a35954d4c38e7e33d23a05dccba4dc7ffb5b4905cb34487718a664f8c52c3cebb17296367fb9f8b203137bbc00fef62d2f452446fb589f914ff8862bbc1e7
+AUX dictd-1.12.0-build.patch 643 BLAKE2B e7f9ffbe56a15278a95537791af88a1866452742af218bac5e8a336c735d232775fafdd7338e7eb20cee2bf1ff45b4369d9c7932a6004d8733172732cdf2a6d4 SHA512 577a85b765a3a7e8e8510ea36567541073a79cd2f99a8efed69ee1fb1e7d32a864d872fe358c0692be56af0c94ea241cb4effb9623371f0eb8492d8c4d223433
+AUX dictd.service 181 BLAKE2B bf79654496f9ee30ca1c44a3c771927cd7bbf5bd7e97379cbd4d65c14ce3f8e4b90c4c50c706545b282e8260e0eed14469f42c9072e0c2be943979dfa88acf2c SHA512 e09f48b746977bfc118fe448bd41c33c6ad61fd94b42ce343ea087b858624498306d958203ec5e219dbdf94d54f8eb5a1feb7c48ad3b3ebc2eb1e9d3594828b9
+DIST dictd-1.12.1.tar.gz 423870 BLAKE2B 9a1522a9786fac732c5e8b481b2eaa36d75ab27d3388e40cdf80016a410123907c4b28b1ed32c1fa3b179b27a358447625de6c0c1e9ab9f35c6d5d3f16591b9f SHA512 51bceba36f9e34ffcbbf42a6235aab6097fe66ba8ed086ea60d0df8b7daf91c6449fdf7c5605150c77035d98029053233db106f9188786b30e02ecd61748209b
+EBUILD dictd-1.12.1-r2.ebuild 2804 BLAKE2B 02668dcd6d391f0605a48b6bec5fdbbf5ea51179e4663e56d71a7f7768a0307f4a130f5cebd38a7d1ff7b3b704ced5a6350094bd43e5d6147c243d4b511af08a SHA512 489ecd4f356e3d2631fb1bd783f861f26467695b66a06d9e97ce9407ec0fd27b6ba0607a5344a325995719248623e41ff8c3da4c13ae5a17589c7fa08c72f3c0
+MISC metadata.xml 484 BLAKE2B 8513944c0eaf7007a75c571dd29ad9e408db17a8e68f39424f361d19e488fa644a8467db234692bed15fd2d2425676c09f7187751b507a69967dcd598f9ab30e SHA512 b404b831fbea2146daf29f4bc81af88c5e226134950fa1eff68823bdf0b00208328936983d1e9c8c51e3420a27c0eca99e83d1178451b8e5df265b8623d3385e
diff --git a/app-text/dictd/dictd-1.12.1-r2.ebuild b/app-text/dictd/dictd-1.12.1-r2.ebuild
new file mode 100644
index 000000000000..442e9519dbed
--- /dev/null
+++ b/app-text/dictd/dictd-1.12.1-r2.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils readme.gentoo systemd user
+
+DESCRIPTION="Dictionary Client/Server for the DICT protocol"
+HOMEPAGE="http://www.dict.org/ https://sourceforge.net/projects/dict/"
+SRC_URI="mirror://sourceforge/dict/${P}.tar.gz"
+
+SLOT="0"
+# We install rfc so - ISOC-rfc
+LICENSE="GPL-2 ISOC-rfc"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+IUSE="dbi judy minimal"
+
+# <gawk-3.1.6 makes tests fail.
+RDEPEND="
+	sys-libs/zlib
+	dev-libs/libmaa
+	dbi? ( dev-db/libdbi )
+	judy? ( dev-libs/judy )
+	>=sys-apps/coreutils-6.10
+"
+DEPEND="${RDEPEND}
+	>=sys-apps/gawk-3.1.6
+	virtual/yacc
+"
+
+DOC_CONTENTS="
+	To start and use ${PN} you need to emerge at least one dictionary from
+	the app-dicts category with the package name starting with 'dictd-'.
+	To install all available dictionaries, emerge app-dicts/dictd-dicts.
+	${PN} will NOT start without at least one dictionary.\n
+	\nIf you are running systemd, you will need to review the instructions
+	explained in /etc/dict/dictd.conf comments.
+"
+
+pkg_setup() {
+	enewgroup dictd # used in src_test()
+	enewuser dictd -1 -1 -1 dictd
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/dictd-1.10.11-colorit-nopp-fix.patch
+	epatch "${FILESDIR}"/dictd-1.12.0-build.patch
+
+	[[ ${CHOST} == *-darwin* ]] && \
+		sed -i -e 's:libtool:glibtool:g' Makefile.in
+}
+
+src_configure() {
+	econf \
+		$(use_with dbi plugin-dbi) \
+		$(use_with judy plugin-judy) \
+		--sysconfdir="${EPREFIX}"/etc/dict
+}
+
+src_compile() {
+	if use minimal; then
+		emake dictfmt dictzip dictzip
+	else
+		emake
+	fi
+}
+
+src_test() {
+	use minimal && return 0 # All tests are for dictd which we don't build...
+	if [[ ${EUID} -eq 0 ]]; then
+		# If dictd is run as root user (-userpriv) it drops its privileges to
+		# dictd user and group. Give dictd group write access to test directory.
+		chown :dictd "${WORKDIR}" "${S}/test"
+		chmod 770 "${WORKDIR}" "${S}/test"
+	fi
+	emake test
+}
+
+src_install() {
+	if use minimal; then
+		emake DESTDIR="${D}" install.dictzip install.dict install.dictfmt
+	else
+		emake DESTDIR="${D}" install
+
+		dodoc doc/{dicf.ms,rfc.ms,rfc.sh,rfc2229.txt}
+		dodoc doc/{security.doc,toc.ms}
+		newdoc examples/dictd1.conf dictd.conf.example
+
+		# conf files. For dict.conf see below.
+		insinto /etc/dict
+		for f in dictd.conf site.info colorit.conf; do
+			doins "${FILESDIR}/1.10.11/${f}"
+		done
+
+		# startups for dictd
+		newinitd "${FILESDIR}/1.10.11/dictd.initd" dictd
+		newconfd "${FILESDIR}/1.10.11/dictd.confd" dictd
+		systemd_dounit "${FILESDIR}"/${PN}.service
+	fi
+
+	insinto /etc/dict
+	doins "${FILESDIR}/1.10.11/dict.conf"
+	# Install docs
+	dodoc README TODO ChangeLog ANNOUNCE NEWS
+
+	readme.gentoo_create_doc
+}
diff --git a/app-text/dictd/files/1.10.11/colorit.conf b/app-text/dictd/files/1.10.11/colorit.conf
new file mode 100644
index 000000000000..22b00e9ec07d
--- /dev/null
+++ b/app-text/dictd/files/1.10.11/colorit.conf
@@ -0,0 +1,32 @@
+dnl /etc/dictd/colorit.conf   vim:ft=m4
+dnl
+dnl Sample configuration file for colorit(1) program
+dnl
+divert(-1)
+dnl
+dnl Define some useful color variables
+dnl
+define(`black',   `0')
+define(`red', 	  `1')
+define(`green',   `2')
+define(`brown',   `3')
+define(`blue', 	  `4')
+define(`magenta', `5')
+define(`cyan',    `6')
+define(`white',   `7')
+dnl
+dnl Mark macro arguments: regexp foreground-color [background-color]
+dnl
+define(`mark', ``mark "$1"''  `ifelse(`$#', `3', ``"\033[3$2;4$3m"'', ``"\033[3$2m"'')' `"\033[m"')
+dnl
+divert
+mark(`^From.*$',red,cyan)
+mark(`^  [^ ]+',green)
+mark(`^ *Note:',red)
+mark(`{[^{]+}',green)
+mark(`^ *\[[^\[]+\]', cyan)
+mark(`^[ 	]*(adj|n|v|adv)? *[0-9]+[\.:]',cyan)  
+mark(`^ *\([a-z]+\)',cyan)  
+mark(`(Syn|Ant|syn|ant):', blue, white)  
+mark(` (t|i|a|adj|adv|n|v)\. ',cyan)  
+mark(` (t|i|a|adj|adv|n|v)\.$',cyan)  
diff --git a/app-text/dictd/files/1.10.11/dict.conf b/app-text/dictd/files/1.10.11/dict.conf
new file mode 100644
index 000000000000..e06c3d296ec3
--- /dev/null
+++ b/app-text/dictd/files/1.10.11/dict.conf
@@ -0,0 +1,6 @@
+# This is the configuration file for dict.
+# Usually all you will ever need here is the server keywords.
+# Refer to the dict manpage for other options.
+# It will only check the second server if the first fails
+server localhost
+server dict.org
diff --git a/app-text/dictd/files/1.10.11/dictd.conf b/app-text/dictd/files/1.10.11/dictd.conf
new file mode 100644
index 000000000000..0de4c201773a
--- /dev/null
+++ b/app-text/dictd/files/1.10.11/dictd.conf
@@ -0,0 +1,26 @@
+# dictd configuration file
+
+global {
+	# Informational message
+	site site.info
+}
+
+# who's allowed. You might want to change this.
+access {
+  allow *
+}
+
+# Dictionaries are listed below. During dictd startup the OpenRC init script will
+# scan ${DLIBDIR} (see /etc/conf.d/dictd) and adds all of the dictionaries it
+# finds here. 
+# 
+# On the other hand, if you are running systemd, you will need to look at
+# /usr/share/doc/dictd-${PV}/dictd.conf.example as reference to know the format
+# of the lines you will need to manually add below.
+#
+# NOTE: OpenRC init script will wipe everything below #LASTLINE and replace it with
+# what it finds. So add all of your things above. If this is a problem, report
+# bug at https://bugs.gentoo.org, please.
+#
+# Do not remove next line!
+#LASTLINE
diff --git a/app-text/dictd/files/1.10.11/dictd.confd b/app-text/dictd/files/1.10.11/dictd.confd
new file mode 100644
index 000000000000..06eb94973bfa
--- /dev/null
+++ b/app-text/dictd/files/1.10.11/dictd.confd
@@ -0,0 +1,5 @@
+# If you have problems starting dictd in a UTF-8 locale, add an appropriate
+# --locale switch to DICTD_OPTS, e. g. "--locale=en_US.utf8"
+DICTD_OPTS="-s "
+DICTDCONF=/etc/dict/dictd.conf
+DLIBDIR=/usr/lib/dict
diff --git a/app-text/dictd/files/1.10.11/dictd.initd b/app-text/dictd/files/1.10.11/dictd.initd
new file mode 100644
index 000000000000..ca4474043bcf
--- /dev/null
+++ b/app-text/dictd/files/1.10.11/dictd.initd
@@ -0,0 +1,77 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+DICTD_PID="/var/run/dictd.pid"
+
+prepconfig() {
+	local TMPCONF INDEXFILES CNT DNAME DICT SAVEDIR
+	if [ ! -e "${DICTDCONF}" ]; then
+		eerror "Config file ${DICTDCONF} not found."
+		return 1
+	fi
+
+	# if no dictionaries, skip startup.
+	# The new way of doing this is to scan /usr/lib/dict and tweek the conf
+	einfo "Scanning for dictionaries..."
+	if [ ! -d "${DLIBDIR}" ]; then
+		eerror "${DLIBDIR} doesn't exist, no dictionaries found."
+		return 1
+	fi
+
+	SAVEDIR=${PWD}
+	cd "${DLIBDIR}"
+	INDEXFILES=$(ls *.index)
+	if [ -z "${INDEXFILES}" ]; then
+		eerror "No dictionaries found at ${DLIBDIR}."
+		eerror "Please, emerge at least one of app-dicts/dictd-* dictionaries."
+		return 1
+	fi
+
+	TMPCONF=$(mktemp -t dictd.conf.XXXXXXXXXX)
+	cat ${DICTDCONF} | sed -e '/^#LASTLINE/,$d' > ${TMPCONF}
+	echo "#LASTLINE" >> ${TMPCONF}
+
+	CNT=0
+	for i in ${INDEXFILES}; do
+		DNAME=$(echo $i | sed -e 's/[.]index$//')
+		#two possible names for a matching dictionary, check which is there.
+		if [ -f ${DNAME}.dict.dz ]; then
+			DICT=${DNAME}.dict.dz
+		elif [ -f ${DNAME}.dict ];then
+			DICT=${DNAME}.dict
+		else
+			ewarn "Index $i has no matching dictionaray..."
+		fi
+
+		#ok, go an index, and a dixtionary, append.
+		echo "database ${DNAME} { data \"${DLIBDIR}/${DICT}\"" >> ${TMPCONF}
+		echo "         index \"${DLIBDIR}/$i\" }" >> ${TMPCONF}
+
+		CNT=$(expr ${CNT} + 1)
+	done
+
+	cd "${SAVEDIR}"
+	mv "${TMPCONF}" "${DICTDCONF}"
+	chown 0:dictd "${DICTDCONF}"
+	chmod g+r "${DICTDCONF}"
+	einfo "Done, ${CNT} dictionaries found."
+}
+
+depend() {
+	need localmount
+}
+
+start() {
+	prepconfig || return 1
+	ebegin "Starting dictd"
+	start-stop-daemon --start --quiet --pidfile ${DICTD_PID} --exec \
+			/usr/sbin/dictd -- --pid-file ${DICTD_PID} ${DICTD_OPTS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping dictd"
+	start-stop-daemon --stop --quiet --pidfile ${DICTD_PID} --exec /usr/sbin/dictd
+	eend $?
+}
diff --git a/app-text/dictd/files/1.10.11/site.info b/app-text/dictd/files/1.10.11/site.info
new file mode 100644
index 000000000000..23bfdeb61102
--- /dev/null
+++ b/app-text/dictd/files/1.10.11/site.info
@@ -0,0 +1,6 @@
+Welcome to your dictionary server dictd!
+
+This is an example site information file.  It should contain information
+about any restricted databases and how users can obtain access.  If may
+also contain other random data as you see fit.
+
diff --git a/app-text/dictd/files/dictd-1.10.11-colorit-nopp-fix.patch b/app-text/dictd/files/dictd-1.10.11-colorit-nopp-fix.patch
new file mode 100644
index 000000000000..4643a10d2de4
--- /dev/null
+++ b/app-text/dictd/files/dictd-1.10.11-colorit-nopp-fix.patch
@@ -0,0 +1,13 @@
+=== modified file 'colorit.in'
+--- colorit.in	2009-03-02 08:52:14 +0000
++++ colorit.in	2009-03-02 08:52:48 +0000
+@@ -167,7 +167,7 @@
+ 
+     function process_config (){
+ 	if (pp == ""){
+-	    while (0 < (ret = (pipe | getline))){
++	    while (0 < (ret = (getline < config_file))){
+ 		process_config_line()
+ 	    }
+ 	}else{
+
diff --git a/app-text/dictd/files/dictd-1.12.0-build.patch b/app-text/dictd/files/dictd-1.12.0-build.patch
new file mode 100644
index 000000000000..d192f8ccb961
--- /dev/null
+++ b/app-text/dictd/files/dictd-1.12.0-build.patch
@@ -0,0 +1,22 @@
+don't force -static so we get both pic and non-pic objects
+
+https://bugs.gentoo.org/342669
+
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -117,12 +117,12 @@
+ @SET_MAKE@
+ 
+ %.o: %.c
+-	$(LIBTOOL) --tag=CC --mode=compile $(CC) -c $(CFLAGS) $< -o $@
++	$(LIBTOOL) --tag=CC --mode=compile $(CC) -c $(CFLAGS) $< -o $@ -static
+ %.o: %.cpp
+-	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) -c $(CFLAGS) $< -o $@
++	$(LIBTOOL) --tag=CXX --mode=compile $(CXX) -c $(CFLAGS) $< -o $@ -static
+ 
+ %: %.o
+-	$(LIBTOOL) --tag=CC --mode=link $(CC) -o $@ -static \
++	$(LIBTOOL) --tag=CC --mode=link $(CC) -o $@ \
+ 		$^ $(OBJS) $(LDFLAGS) -lz ${LIBS}
+ 
+ include $(srcdir)/deps
diff --git a/app-text/dictd/files/dictd.service b/app-text/dictd/files/dictd.service
new file mode 100644
index 000000000000..f5efde6c6f1f
--- /dev/null
+++ b/app-text/dictd/files/dictd.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Dictd Dictionary Server Daemon
+After=network.target
+
+[Service]
+Type=forking
+ExecStart=/usr/sbin/dictd --listen-to 127.0.0.1
+
+[Install]
+WantedBy=multi-user.target
diff --git a/app-text/dictd/metadata.xml b/app-text/dictd/metadata.xml
new file mode 100644
index 000000000000..0ecc963168ae
--- /dev/null
+++ b/app-text/dictd/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<use>
+		<flag name="judy">Build Judy-based (<pkg>dev-libs/judy</pkg>) plugin implementing fast "exact" and especially "lev" strategies</flag>
+		<flag name="minimal">Don't build server but dict client, dictzip and dictfmt only.</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">dict</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/diction-1.13 b/app-text/diction-1.13
deleted file mode 100644
index 76773df6d85e..000000000000
--- a/app-text/diction-1.13
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=prepare
-DEPEND=sys-devel/gettext virtual/libintl
-DESCRIPTION=Diction and style checkers for english and german texts
-EAPI=5
-HOMEPAGE=https://www.gnu.org/software/diction/diction.html
-KEYWORDS=amd64 hppa ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
-LICENSE=GPL-3
-SLOT=0
-SRC_URI=http://www.moria.de/~michael/diction/diction-1.13.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=eb94a48a7ee990ca8d2f746645a4f9de
diff --git a/app-text/diction/Manifest b/app-text/diction/Manifest
new file mode 100644
index 000000000000..202f9205e4a8
--- /dev/null
+++ b/app-text/diction/Manifest
@@ -0,0 +1,4 @@
+AUX diction-1.13-make.patch 367 BLAKE2B 1b29ff3455dc455210dd1277281b175292ead12e3aebe3459d837597c2f4f37ab7608ee2819e284992f542f5a0bc5b699c671189e650810289adc25daa8393bd SHA512 ab317f3de37697a098dc9c50ef741417772ab66434a41b89381bf123b9e980263a1b6b488f7f1b1bfbe25a178b2d7acc793067e8eb26e34300e639765af818bc
+DIST diction-1.13.tar.gz 145971 BLAKE2B a70a198f356d9c92813d2b60b02e703a61dbefd5968314058a2538e77929f1fcdfb72d95a827ceb539770fdaf0f6d7a0f67e4318524463e24ae3eeeb31edf475 SHA512 f410f9992adcc362bc60f3e39e85cc07df5763623729c6d599538707aff0831e8cde59d80bcd384975d75229d6ce1cae9bebdf6eb3d4a7203b22d2a1773df039
+EBUILD diction-1.13.ebuild 560 BLAKE2B de58eee9a39d247850564a0699969c8ca6500338f2d047925d182dfb4b85f15c285f2782d3c0e1e497af333a3c314f707e0ef6a74c67d1df0d25b726d2f132e4 SHA512 62214b2d75940fd215871d7d3eefc0adc3198a178e1eb4e0376999f8dc484f5f9d3094495eb128140e3f7b333a5e39820ce665402f19fa25f4d9e884caf45f24
+MISC metadata.xml 1006 BLAKE2B eda482a025adacb54d70d937d88c1b2f88d3f1a48ba4c031a2abde7f70037b1b7150c1509a3b67f1421c25fb2fe299d31e11c900dfc48ee76f5502b7ce5bad66 SHA512 f8aa49a2b7cef19bd9658516a2ca5cbac77883c1e1c1615d00a886c46d2505999a383652e1fed8a6341d69b31a0fa4763ff2df7bb0ad2f03f65948982dee4675
diff --git a/app-text/diction/diction-1.13.ebuild b/app-text/diction/diction-1.13.ebuild
new file mode 100644
index 000000000000..dfe2b194b77d
--- /dev/null
+++ b/app-text/diction/diction-1.13.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils
+
+DESCRIPTION="Diction and style checkers for english and german texts"
+HOMEPAGE="https://www.gnu.org/software/diction/diction.html"
+SRC_URI="http://www.moria.de/~michael/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 hppa ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+
+DEPEND="
+	sys-devel/gettext
+	virtual/libintl
+"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-make.patch
+}
+
+DOCS=( NEWS README )
diff --git a/app-text/diction/files/diction-1.13-make.patch b/app-text/diction/files/diction-1.13-make.patch
new file mode 100644
index 000000000000..72a2f36728f0
--- /dev/null
+++ b/app-text/diction/files/diction-1.13-make.patch
@@ -0,0 +1,11 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -50,7 +50,7 @@
+ 		[ -d $(DESTDIR)@mandir@/man1 ] || @INSTALL@ -m 755 -d $(DESTDIR)@mandir@/man1
+ 		@INSTALL@ -m 644 diction.1 $(DESTDIR)@mandir@/man1/diction.1
+ 		@INSTALL@ -m 644 style.1 $(DESTDIR)@mandir@/man1/style.1
+-		make install-po-@USE_NLS@
++		$(MAKE) install-po-@USE_NLS@
+ 
+ install-po-no:
+ install-po-yes:	$(CATALOGS)
diff --git a/app-text/diction/metadata.xml b/app-text/diction/metadata.xml
new file mode 100644
index 000000000000..96ba50990142
--- /dev/null
+++ b/app-text/diction/metadata.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>jer@gentoo.org</email>
+		<name>Jeroen Roovers</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>jnrowe@gmail.com</email>
+		<name>James Rowe</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription lang="en">
+		GNU diction and style are free implementations of old standard unix
+		commands, that are not available on many modern systems, because they
+		have been unbundled. Diction prints wordy and commonly misused phrases.
+		Style analyses surface characteristics of a document, e.g. sentence
+		length and various readability measures, but unlike the original code,
+		it lacks sentence type, word usage and most sentence beginning
+		processing.
+
+		Both commands support English and German documents.
+	</longdescription>
+</pkgmetadata>
diff --git a/app-text/diffpdf-2.1.3-r2 b/app-text/diffpdf-2.1.3-r2
deleted file mode 100644
index 3968316dad30..000000000000
--- a/app-text/diffpdf-2.1.3-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=app-text/poppler[qt5] dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dev-qt/linguist-tools:5
-DESCRIPTION=Program that textually or visually compares two PDF files
-EAPI=6
-HOMEPAGE=https://www.qtrac.eu/diffpdf.html
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=app-text/poppler[qt5] dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5
-SLOT=0
-SRC_URI=http://www.qtrac.eu/diffpdf-2.1.3.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=013c51cc8e76e33acd2ecc0b389ac83c
diff --git a/app-text/diffpdf/Manifest b/app-text/diffpdf/Manifest
new file mode 100644
index 000000000000..9785718f9f68
--- /dev/null
+++ b/app-text/diffpdf/Manifest
@@ -0,0 +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-r2.ebuild 845 BLAKE2B e77919703d45560e33eb1787fbc13c6826da712f6aa45152f00a99b33b33677622ad82fec23ec20b639af1e0b736d525e410fdc2c6096b12a4593b1a0d5f5db6 SHA512 1eac75a40802fea068caa2ffd40f9107e022fab1e16fa44bd09571c8d8bbc13f36a3507aa144bb1ada4ad1a48e9ee4d47572b0243bef5eaf60ee2fc7ebf28657
+MISC metadata.xml 247 BLAKE2B 317f906045f70ecc77ab85491b683c74618c027d768a499226ea0c46d214b783ff308f6bcb79c1edfaf3c4a01821afd529786bf5ad2cf73e0570aac56177d36e SHA512 4ae39ceedf573357554a383ccfab1d716abb7265c3a1eb407d1dc4bf3b38fc91b5cdeec8ba0bad84efb2595aebb6d115ade1575e12812079e47797b7dcd3fa7a
diff --git a/app-text/diffpdf/diffpdf-2.1.3-r2.ebuild b/app-text/diffpdf/diffpdf-2.1.3-r2.ebuild
new file mode 100644
index 000000000000..379468357300
--- /dev/null
+++ b/app-text/diffpdf/diffpdf-2.1.3-r2.ebuild
@@ -0,0 +1,41 @@
+# 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="https://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
+	dev-qt/qtprintsupport:5
+	dev-qt/qtwidgets: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/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/diffpdf/metadata.xml b/app-text/diffpdf/metadata.xml
new file mode 100644
index 000000000000..62f8df43d2e1
--- /dev/null
+++ b/app-text/diffpdf/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>reavertm@gentoo.org</email>
+	<name>Maciej Mrozowski</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-text/ding-1.8.1 b/app-text/ding-1.8.1
deleted file mode 100644
index 11424812ae54..000000000000
--- a/app-text/ding-1.8.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Tk based dictionary (German-English) (incl. dictionary itself)
-EAPI=6
-HOMEPAGE=https://www-user.tu-chemnitz.de/~fri/ding/
-KEYWORDS=amd64 ppc ~sparc x86
-LICENSE=GPL-2
-RDEPEND=>=dev-lang/tk-8.3
-SLOT=0
-SRC_URI=http://wftp.tu-chemnitz.de/pub/Local/urz/ding/ding-1.8.1.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=637b45899d91ce7b76ee7afa4b78a1dd
diff --git a/app-text/ding/Manifest b/app-text/ding/Manifest
new file mode 100644
index 000000000000..b51f06ad6ba3
--- /dev/null
+++ b/app-text/ding/Manifest
@@ -0,0 +1,3 @@
+DIST ding-1.8.1.tar.gz 6543141 BLAKE2B 5393113bc8952553b3b5e5ee8dcd98b4cf6fec2d92069354e83b38808289053b0cc5a2c08968068f9b393b5a5e296541718c129ccbe23076ce591f6254c8293b SHA512 7d1b459d40e26482c3c16a79565cb897a492fa5807f44c5c3ed1022bcf65ba90bec9cb503cc67970742c2beeb34bd653c684e56ef5492f536254bf475d3f70a4
+EBUILD ding-1.8.1.ebuild 574 BLAKE2B 9bb23d1ea267414a09adcb74f0c1a1c9f169b2d8718e8f91f88151045a84a30a62955b5e7a7d27bcdebdefbf422affe45a949333c6171f7d0550314b3fb2aab2 SHA512 8ed18b6c2fd4bbf29b27f475453e0c87c5812f9aac5df180a3906d6c588d3e27b74db2c4d2da2083689d46e7155508186d808b9f76d911eeadd66b691aec5936
+MISC metadata.xml 251 BLAKE2B 2e2f0363feb3f8ad15ed8d2ef5130493f501acf64faf4fe567079d18a6066c0a1136f6c0cf53ba4ec854a38b5d4211e48e0a2ddac6677ca02266a3f993e36965 SHA512 0ccc4891c6c5de39cbe83d8391b0345611be252a2b1fedea6644ba1cfb283140a8250f32cd26b701db9c60d42782b214d03574592ef3b585bb15d2ffcb5f016e
diff --git a/app-text/ding/ding-1.8.1.ebuild b/app-text/ding/ding-1.8.1.ebuild
new file mode 100644
index 000000000000..c2318824efe3
--- /dev/null
+++ b/app-text/ding/ding-1.8.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils
+
+DESCRIPTION="Tk based dictionary (German-English) (incl. dictionary itself)"
+HOMEPAGE="https://www-user.tu-chemnitz.de/~fri/ding/"
+SRC_URI="http://wftp.tu-chemnitz.de/pub/Local/urz/ding/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ~sparc x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/tk-8.3"
+
+src_install() {
+	dobin ding
+	insinto /usr/share/dict
+	doins de-en.txt
+	doman ding.1
+	dodoc CHANGES README
+
+	doicon ding.png
+	domenu ding.desktop
+}
diff --git a/app-text/ding/metadata.xml b/app-text/ding/metadata.xml
new file mode 100644
index 000000000000..95aa13f6c5ef
--- /dev/null
+++ b/app-text/ding/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>polynomial-c@gentoo.org</email>
+		<name>Lars Wendler</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-text/discount-2.1.8a-r1 b/app-text/discount-2.1.8a-r1
deleted file mode 100644
index 27d83c4a2761..000000000000
--- a/app-text/discount-2.1.8a-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DESCRIPTION=An implementation of John Gruber's Markdown text to html language written in C
-EAPI=5
-HOMEPAGE=http://www.pell.portland.or.us/~orc/Code/discount/
-IUSE=minimal
-KEYWORDS=alpha amd64 arm ia64 ppc ppc64 sparc x86
-LICENSE=BSD
-SLOT=0
-SRC_URI=http://www.pell.portland.or.us/~orc/Code/discount/discount-2.1.8a.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=73386c671f5e2783ae4324fa0cfbf20d
diff --git a/app-text/discount-2.2.2 b/app-text/discount-2.2.2
deleted file mode 100644
index 8c75130231c6..000000000000
--- a/app-text/discount-2.2.2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DESCRIPTION=A Markdown-to HTML translator written in C
-EAPI=6
-HOMEPAGE=http://www.pell.portland.or.us/~orc/Code/discount/
-IUSE=minimal test
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=BSD
-SLOT=0
-SRC_URI=http://www.pell.portland.or.us/~orc/Code/discount/discount-2.2.2.tar.bz2
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=3499ee42a3e9750ca64cc5f8acdbee63
diff --git a/app-text/discount-2.2.3a b/app-text/discount-2.2.3a
deleted file mode 100644
index d83197a8d2d8..000000000000
--- a/app-text/discount-2.2.3a
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DESCRIPTION=A Markdown-to HTML translator written in C
-EAPI=6
-HOMEPAGE=http://www.pell.portland.or.us/~orc/Code/discount/
-IUSE=minimal test
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=BSD
-SLOT=0
-SRC_URI=http://www.pell.portland.or.us/~orc/Code/discount/discount-2.2.3a.tar.bz2
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=cdd4c379d7b7bcd1f5ed257e4d539a7a
diff --git a/app-text/discount/Manifest b/app-text/discount/Manifest
new file mode 100644
index 000000000000..0dd6def1b539
--- /dev/null
+++ b/app-text/discount/Manifest
@@ -0,0 +1,7 @@
+DIST discount-2.1.8a.tar.bz2 85161 BLAKE2B 15b2f3e935115e6b9f2c4ba1c11b1d6ea6f32123bd11c1e13dcab7fd9badac9a4f7d671c0cf04a6dd9564e40fbd6970f26c473c188444db75e0ee6b91a1ed1bc SHA512 a1eba7076a27da56136b8057189c5474a36bf11f8233cbae270c8a0cf9b070332b4dcdbbbecfbfbe1d8c19961ccaf87cee27ebe855c6bc6558d8ccc423553c96
+DIST discount-2.2.2.tar.bz2 89288 BLAKE2B 43950b3000f4d6e30603562694e965518be10107e534f48592f7f2d62959778244193fe5ab788f7f697bb099bb1ac940948ec92dabde1219a69bbe380eb5f66a SHA512 67d882c0a334592230332815c543458b3c916a950bf7983f8a468fbc9f61154b4023d4bf451b76639fcb3a076506b48118f192a8e21f2535b3f49c7f081bbdf3
+DIST discount-2.2.3a.tar.bz2 98325 BLAKE2B b566a6f4d5a1f3481a0a665f7820508784b2ce6ec60d0b4ff833bed46c01a9a6bf6a697fc528bcddd37232246982e861a89733bf6654cedecc95a09def729463 SHA512 cf995a46879f269f3e02f7d480303d229676bb36f71fe045d3a8eab7306fca9cce98496611b9fb9e0a14a9cf46ee66bd239dd9c946dff54ae09277fd66459c1f
+EBUILD discount-2.1.8a-r1.ebuild 2429 BLAKE2B 505a9c2e3d1ce65860a082d28564a9163cf8fa9edd9b9fbdade27e5a0c15bd66eab611296355f70623504636355f25ba83e997b05dfaa24667a26fc87742513e SHA512 065784f0effb3c1c24ba3b7897022480c956aa07a1288e047fb5e1a2fb51a347a7950f5ea09b4af2ef01222021297b4a8744fac70d07532651af978aebfe6118
+EBUILD discount-2.2.2.ebuild 1790 BLAKE2B fad3324fbb2c6894382d61f0bc36fdc2c058bacafebecb0c3f5e8b4383a8cb26258c2f31bf4ff4d22278bb1b6fe895ff3962214f18175b0adcfab3f71081a58c SHA512 a69861b85f1f2b30dfcbb08892ee4daa00fd4792536a9b90ff43e067d22f8f2716502d51e234e698eb09f4aa472bb68fb648083bfa1406abc29eba2f3239e989
+EBUILD discount-2.2.3a.ebuild 1796 BLAKE2B 537be30783469388cb353298bca0117956ad4916f7a613dbcf4d7466fea55e254cefeaf2abfe997715a267775f3d33f318389129997d474695d4ac58115312ae SHA512 be991bd13812130598e4231c5ca5ffdbe59a19baabf926f86adf571361e09f6d2e8da19690fb9b4b94315e7c997072ae31d6aa00f47cdcd7d8c7a13047d53f8b
+MISC metadata.xml 366 BLAKE2B 2e5fe0a3c428627cc1feb2aee974a537b8244ea9029ed6830b809c110d057a65535684032e830a42dff47852b632dc7c74473294f2eb2c7cd9789be3d27bd87f SHA512 39d05813a4efdcd14d0f5932efc63c25ae22b83088cb1bf020863e8ab9bdb348bcbd48901a2dff3c1184dc1483ae3868d2b4a2fd942dda91150944008773db3f
diff --git a/app-text/discount/discount-2.1.8a-r1.ebuild b/app-text/discount/discount-2.1.8a-r1.ebuild
new file mode 100644
index 000000000000..f913f6fad1fc
--- /dev/null
+++ b/app-text/discount/discount-2.1.8a-r1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils multilib
+
+DESCRIPTION="An implementation of John Gruber's Markdown text to html language written in C"
+HOMEPAGE="http://www.pell.portland.or.us/~orc/Code/discount/"
+SRC_URI="http://www.pell.portland.or.us/~orc/Code/${PN}/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86"
+IUSE="minimal"
+
+src_prepare() {
+	# for QA, we remove the Makefile’s usage of install -s.
+	# Drop ldconfig invocation.
+	# Force “librarian.sh� to respect LDFLAGS ($FLAGS should have CFLAGS
+	# at that point).
+	sed -i \
+		-e '/INSTALL_PROGRAM/s,-s ,,' \
+		-e 's/\(LDCONFIG=\).*/\1:/' \
+		-e 's/\(.\)\$FLAGS/& \1$LDFLAGS/' \
+		configure.inc || die "sed configure.inc failed"
+
+	# Add LDFLAGS and CPPFLAGS hackily.
+	sed -i \
+		-e 's/^CC[ \t]*=.*/& $(CPPFLAGS)/' \
+		-e 's/^LFLAGS[ \t]*=.*/& $(LDFLAGS)/' \
+		Makefile.in || die "Cannot fix LDFLAGS and CPPFLAGS"
+}
+
+src_configure() {
+	# How econf() handles quoted whitespace. This should go away next
+	# release of discount.
+	eval "local -a DISCOUNT_EXTRA_CONFIGURE_SH=(${DISCOUNT_EXTRA_CONFIGURE_SH})"
+
+	local configure_call=(
+		./configure.sh
+		--libdir="${EPREFIX}"usr/"$(get_libdir)"
+		--prefix="${EPREFIX}"usr
+		--mandir="${EPREFIX}"usr/share/man
+		--shared
+		$(usex minimal '' --enable-all-features)
+		# Because a lot of discount features are exposed through
+		# ./configure.sh flags that, in the future, won’t be, I will
+		# respect DISCOUNT_EXTRA_CONFIGURE_SH as a workaround pending
+		# upstream https://github.com/Orc/discount/issues/124 for bug
+		# #554520.
+		"${DISCOUNT_EXTRA_CONFIGURE_SH[@]}"
+		# Enable deterministic HTML generation behavior. Otherwise, will
+		# actually call rand() as parse of its serialization code…
+		--debian-glitch
+	)
+	einfo "Running ${configure_call[@]} || die"
+	"${configure_call[@]}" || die
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		$(usex minimal install install.everything) \
+		SAMPLE_PFX="${PN}-"
+}
+
+pkg_postinst() {
+	if ! use minimal; then
+		elog "Sample binaries with overly-generic names have been"
+		elog "prefixed with \"${PN}-\". Please see"
+		elog "https://github.com/Orc/discount/issues/81 for discussion."
+	fi
+	# This should also go away after 2.1.8a…
+	elog "To configure advanced options, use DISCOUNT_EXTRA_CONFIGURE_SH"
+	elog "and see https://bugs.gentoo.org/554520."
+}
diff --git a/app-text/discount/discount-2.2.2.ebuild b/app-text/discount/discount-2.2.2.ebuild
new file mode 100644
index 000000000000..bb4f809a591c
--- /dev/null
+++ b/app-text/discount/discount-2.2.2.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="A Markdown-to HTML translator written in C"
+HOMEPAGE="http://www.pell.portland.or.us/~orc/Code/discount/"
+SRC_URI="http://www.pell.portland.or.us/~orc/Code/${PN}/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="minimal test"
+
+src_prepare() {
+	default
+
+	# for QA, we remove the Makefile’s usage of install -s.
+	# Drop ldconfig invocation.
+	# Force “librarian.sh� to respect LDFLAGS ($FLAGS should have CFLAGS
+	# at that point).
+	sed -i \
+		-e '/INSTALL_PROGRAM/s,-s ,,' \
+		-e 's/\(LDCONFIG=\).*/\1:/' \
+		-e 's/\(.\)\$FLAGS/& \1$LDFLAGS/' \
+		configure.inc || die "sed configure.inc failed"
+
+	# Add LDFLAGS and CPPFLAGS hackily.
+	sed -i \
+		-e 's/^CC[ \t]*=.*/& $(CPPFLAGS)/' \
+		-e 's/^LFLAGS[ \t]*=.*/& $(LDFLAGS)/' \
+		Makefile.in || die "Cannot fix LDFLAGS and CPPFLAGS"
+}
+
+src_configure() {
+	local configure_call=(
+		./configure.sh
+		--libdir="${EPREFIX}"usr/"$(get_libdir)"
+		--prefix="${EPREFIX}"usr
+		--mandir="${EPREFIX}"usr/share/man
+		--shared
+		--pkg-config
+		$(usex minimal '' --enable-all-features)
+		# Enable deterministic HTML generation behavior. Otherwise, will
+		# actually call rand() as part of its serialization code...
+		--debian-glitch
+	)
+	einfo "Running ${configure_call[@]}"
+	CC="$(tc-getCC)" \
+	"${configure_call[@]}" || die
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		$(usex minimal install install.everything) \
+		SAMPLE_PFX="${PN}-"
+
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins libmarkdown.pc
+}
+
+pkg_postinst() {
+	if ! use minimal; then
+		elog 'Sample binaries with overly-generic names have been'
+		elog "prefixed with \"${PN}-\"."
+	fi
+}
diff --git a/app-text/discount/discount-2.2.3a.ebuild b/app-text/discount/discount-2.2.3a.ebuild
new file mode 100644
index 000000000000..8aa88de24c65
--- /dev/null
+++ b/app-text/discount/discount-2.2.3a.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="A Markdown-to HTML translator written in C"
+HOMEPAGE="http://www.pell.portland.or.us/~orc/Code/discount/"
+SRC_URI="http://www.pell.portland.or.us/~orc/Code/${PN}/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="minimal test"
+
+src_prepare() {
+	default
+
+	# for QA, we remove the Makefile’s usage of install -s.
+	# Drop ldconfig invocation.
+	# Force “librarian.sh� to respect LDFLAGS ($FLAGS should have CFLAGS
+	# at that point).
+	sed -i \
+		-e '/INSTALL_PROGRAM/s,\$_strip ,,' \
+		-e 's/\(LDCONFIG=\).*/\1:/' \
+		-e 's/\(.\)\$FLAGS/& \1$LDFLAGS/' \
+		configure.inc || die "sed configure.inc failed"
+
+	# Add LDFLAGS and CPPFLAGS hackily.
+	sed -i \
+		-e 's/^CC[ \t]*=.*/& $(CPPFLAGS)/' \
+		-e 's/^LFLAGS[ \t]*=.*/& $(LDFLAGS)/' \
+		Makefile.in || die "Cannot fix LDFLAGS and CPPFLAGS"
+}
+
+src_configure() {
+	local configure_call=(
+		./configure.sh
+		--libdir="${EPREFIX}"usr/"$(get_libdir)"
+		--prefix="${EPREFIX}"usr
+		--mandir="${EPREFIX}"usr/share/man
+		--shared
+		--pkg-config
+		$(usex minimal '' --enable-all-features)
+		# Enable deterministic HTML generation behavior. Otherwise, will
+		# actually call rand() as part of its serialization code...
+		--debian-glitch
+	)
+	einfo "Running ${configure_call[@]}"
+	CC="$(tc-getCC)" \
+	"${configure_call[@]}" || die
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		$(usex minimal install install.everything) \
+		SAMPLE_PFX="${PN}-"
+
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins libmarkdown.pc
+}
+
+pkg_postinst() {
+	if ! use minimal; then
+		elog 'Sample binaries with overly-generic names have been'
+		elog "prefixed with \"${PN}-\"."
+	fi
+}
diff --git a/app-text/discount/metadata.xml b/app-text/discount/metadata.xml
new file mode 100644
index 000000000000..f5a6787777d1
--- /dev/null
+++ b/app-text/discount/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>reagentoo@gmail.com</email>
+		<name>Dmitry Baranov</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-text/djview-4.10.6-r1 b/app-text/djview-4.10.6-r1
deleted file mode 100644
index 1c9c8a4a3ada..000000000000
--- a/app-text/djview-4.10.6-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare
-DEPEND=>=app-text/djvu-3.5.22-r1 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 >=sys-devel/autoconf-2.67 virtual/pkgconfig nsplugin? ( dev-libs/glib:2 ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 app-arch/unzip
-DESCRIPTION=Portable DjVu viewer using Qt
-EAPI=6
-HOMEPAGE=http://djvu.sourceforge.net/djview4.html
-IUSE=debug nsplugin
-KEYWORDS=amd64 ~hppa ppc ppc64 x86
-LICENSE=GPL-2
-RDEPEND=>=app-text/djvu-3.5.22-r1 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5
-SLOT=0
-SRC_URI=mirror://sourceforge/djvu/djview-4.10.6.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	mozextension	89a560beaf496e7cb89f3d79d4aef09e	multilib	97f470f374f2e94ccab04a2fb21d811e	nsplugins	2049586e425364a1c5bdb004205d1758	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=664119cafc3942de09fc7fafbe341a37
diff --git a/app-text/djview/Manifest b/app-text/djview/Manifest
new file mode 100644
index 000000000000..a5ac46a02235
--- /dev/null
+++ b/app-text/djview/Manifest
@@ -0,0 +1,4 @@
+AUX djview-4.10.6-hidpi.patch 2313 BLAKE2B 4d3356baa36cf830a8e01314f6fbf081c0b8fe8b6a43b2e14e4966fab2d07932088c66e1f68802282537d490503586a528c2a4b86eea26615fc8eefbf6b7d058 SHA512 922b0c321edaeed3a76ee206fa4353366e3d744dd30612d034070c251ecfca6bc18a2ddaf110cfbc811ea47426f2d9e370d5a58cce41b396b793ba27223bb881
+DIST djview-4.10.6.tar.gz 1113072 BLAKE2B db965ad7dc3b8191855e9c5f23af3cd963901ca649a937e6f85bad8f9f924e0636b30a9a5350c114dcfecea570f013ba395508eb6cf1d45afda674892bcd196e SHA512 c06b9c4c7addd9dededdc9d441094bca685c4d23744e3d1208eab33d9d341a85f120176bf9f1b879ac6620f591eefe05ac774870b1ba3215c43baf1eaf9d14f8
+EBUILD djview-4.10.6-r1.ebuild 2030 BLAKE2B 79d80ba1e21ce05edcd2462e56f1d61e6279fbce72f24c21142c4b0b3bf74326343d505d06f06d7e595ca7a688dbbc4fe3c3b58f63fb091bb5f85ff4a592a6da SHA512 6cbf7319de31e604e9e09915b98fe206403fbda2fb524889fefac97cfafca3aa9db36a328f8f4deeb62bf6303bc08c5f15a369c13ed46f91636b02f9f65cfc88
+MISC metadata.xml 323 BLAKE2B c8498cdd0e1820eb610a9e2ede4e10287977c2eb71dd1b6b9862e3d11a34760cf8dcb5e9e59535ab0ceed04f3be2b00aa4942657a25fffc87b23966c2b2c1caf SHA512 53a7a7290a2286fd31248db31160697a3b2693275013a1ea453258f9ac52fa3ea7111718ca35a5eb1652050699e5be1111c7ebb73b2a3c699383d8305509a5c4
diff --git a/app-text/djview/djview-4.10.6-r1.ebuild b/app-text/djview/djview-4.10.6-r1.ebuild
new file mode 100644
index 000000000000..fa5fe0ff6bd9
--- /dev/null
+++ b/app-text/djview/djview-4.10.6-r1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools gnome2-utils flag-o-matic nsplugins qmake-utils toolchain-funcs versionator xdg-utils
+
+DESCRIPTION="Portable DjVu viewer using Qt"
+HOMEPAGE="http://djvu.sourceforge.net/djview4.html"
+SRC_URI="mirror://sourceforge/djvu/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~hppa ppc ppc64 x86"
+IUSE="debug nsplugin"
+
+RDEPEND="
+	>=app-text/djvu-3.5.22-r1
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtopengl:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtwidgets:5"
+DEPEND="${RDEPEND}
+	>=sys-devel/autoconf-2.67
+	virtual/pkgconfig
+	nsplugin? ( dev-libs/glib:2 )"
+
+DOCS=( README NEWS )
+
+PATCHES=( "${FILESDIR}/${P}-hidpi.patch" )
+
+src_prepare() {
+	default
+
+	# Force XEmbed instead of Xt-based mainloop (disable Xt autodep)
+	sed -e 's:\(ac_xt=\)yes:\1no:' -i configure* || die
+	sed 's/AC_CXX_OPTIMIZE/OPTS=;AC_SUBST(OPTS)/' -i configure.ac || die #263688
+	rm aclocal.m4 config/{libtool.m4,install-sh,ltmain.sh,lt*.m4}
+	AT_M4DIR="config" eautoreconf
+}
+
+src_configure() {
+	# See config/acinclude.m4
+	use debug || append-cppflags "-DNDEBUG"
+
+	QTDIR=$(qt5_get_libdir)/qt5 \
+	econf \
+		--with-x \
+		--disable-desktopfiles \
+		$(use_enable nsplugin nsdejavu)
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)"
+}
+
+src_install() {
+	emake DESTDIR="${D}" \
+		plugindir=/usr/$(get_libdir)/${PLUGINS_DIR} \
+			install
+
+	einstalldocs
+
+	cd desktopfiles
+	insinto /usr/share/icons/hicolor/32x32/apps
+	newins prebuilt-hi32-djview4.png djvulibre-djview4.png
+	insinto /usr/share/icons/hicolor/64x64/apps
+	newins prebuilt-hi64-djview4.png djvulibre-djview4.png
+	insinto /usr/share/icons/hicolor/scalable/apps
+	newins djview.svg djvulibre-djview4.svg
+	sed -i -e 's/Exec=djview4/Exec=djview/' djvulibre-djview4.desktop
+	domenu djvulibre-djview4.desktop
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	gnome2_icon_cache_update
+}
diff --git a/app-text/djview/files/djview-4.10.6-hidpi.patch b/app-text/djview/files/djview-4.10.6-hidpi.patch
new file mode 100644
index 000000000000..1063b4c5b827
--- /dev/null
+++ b/app-text/djview/files/djview-4.10.6-hidpi.patch
@@ -0,0 +1,68 @@
+commit 090398d4181797d2284be16026f8e0573fd0579b
+Author: Leon Bottou <leon@bottou.org>
+Date:   Wed Mar 2 20:52:03 2016 -0500
+
+    High dpi support for page thumbnails
+
+diff --git a/src/djview.cpp b/src/djview.cpp
+index 2571c49..df14110 100644
+--- a/src/djview.cpp
++++ b/src/djview.cpp
+@@ -137,7 +137,12 @@ QDjViewApplication::QDjViewApplication(int &argc, char **argv)
+   extern void qt_mac_set_native_menubar(bool);
+   qt_mac_set_native_menubar(false);
+ #endif
+-
++  
++  // Enable highdpi pixmaps
++#if QT_VERSION >= 0x50200
++  setAttribute(Qt::AA_UseHighDpiPixmaps, true);
++#endif
++  
+   // Wire session management signals
+   connect(this, SIGNAL(saveStateRequest(QSessionManager&)),
+           this, SLOT(saveSessionState(QSessionManager&)) );
+diff --git a/src/qdjviewsidebar.cpp b/src/qdjviewsidebar.cpp
+index 38edf45..34e8c3c 100644
+--- a/src/qdjviewsidebar.cpp
++++ b/src/qdjviewsidebar.cpp
+@@ -603,9 +603,14 @@ QDjViewThumbnails::Model::makeIcon(int pageno) const
+   if (doc)
+     {
+       // render thumbnail
+-      int w = size;
+-      int h = size;
+-      QImage img(size, size, QImage::Format_RGB32);
++#if QT_VERSION >= 0x50200
++      int dpr = djview->devicePixelRatio();
++#else
++      int dpr = 1;
++#endif
++      int w = size * dpr;
++      int h = size * dpr;
++      QImage img(size*dpr, size*dpr, QImage::Format_RGB32);
+       int status = ddjvu_thumbnail_status(*doc, pageno, 0);
+       if (status == DDJVU_JOB_NOTSTARTED)
+         {
+@@ -614,9 +619,9 @@ QDjViewThumbnails::Model::makeIcon(int pageno) const
+       else if (ddjvu_thumbnail_render(*doc, pageno, &w, &h, format, 
+                                       img.bytesPerLine(), (char*)img.bits() ))
+         {
+-          QPixmap pixmap(size,size);
++          QPixmap pixmap(size*dpr,size*dpr);
+           pixmap.fill();
+-          QPoint dst((size-w)/2, (size-h)/2);
++          QPoint dst((size*dpr-w)/2, (size*dpr-h)/2);
+           QRect src(0,0,w,h);
+           QPainter painter;
+           painter.begin(&pixmap);
+@@ -625,6 +630,9 @@ QDjViewThumbnails::Model::makeIcon(int pageno) const
+           painter.setPen(Qt::darkGray);
+           painter.drawRect(dst.x(), dst.y(), w-1, h-1);
+           painter.end();
++#if QT_VERSION >= 0x50200
++          pixmap.setDevicePixelRatio(dpr);
++#endif
+           return QIcon(pixmap);
+         }
+     }
diff --git a/app-text/djview/metadata.xml b/app-text/djview/metadata.xml
new file mode 100644
index 000000000000..73ad11b1a6a5
--- /dev/null
+++ b/app-text/djview/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">djvu</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/djvu-3.5.25.3 b/app-text/djvu-3.5.25.3
deleted file mode 100644
index 65fbb9d177e7..000000000000
--- a/app-text/djvu-3.5.25.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm prepare
-DEPEND=jpeg? ( virtual/jpeg:0 ) tiff? ( media-libs/tiff:0= ) || ( gnome-base/librsvg media-gfx/inkscape ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=DjVu viewers, encoders and utilities
-EAPI=5
-HOMEPAGE=http://djvu.sourceforge.net/
-IUSE=debug doc jpeg tiff xml
-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-solaris
-LICENSE=GPL-2
-RDEPEND=jpeg? ( virtual/jpeg:0 ) tiff? ( media-libs/tiff:0= )
-SLOT=0
-SRC_URI=mirror://sourceforge/djvu/djvulibre-3.5.25.3.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9422ca5a0018fac60e48b5d4a0d115b5
diff --git a/app-text/djvu-3.5.27 b/app-text/djvu-3.5.27
deleted file mode 100644
index 53056a7d333e..000000000000
--- a/app-text/djvu-3.5.27
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm
-DEPEND=jpeg? ( virtual/jpeg:0 ) tiff? ( media-libs/tiff:0= ) || ( gnome-base/librsvg media-gfx/inkscape )
-DESCRIPTION=DjVu viewers, encoders and utilities
-EAPI=5
-HOMEPAGE=http://djvu.sourceforge.net/
-IUSE=debug doc jpeg tiff xml
-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-solaris
-LICENSE=GPL-2
-RDEPEND=jpeg? ( virtual/jpeg:0 ) tiff? ( media-libs/tiff:0= )
-SLOT=0
-SRC_URI=mirror://sourceforge/djvu/djvulibre-3.5.27.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=779681dc1ca440c2c2bb33ac3c82bf3f
diff --git a/app-text/djvu/Manifest b/app-text/djvu/Manifest
new file mode 100644
index 000000000000..c3dad1871688
--- /dev/null
+++ b/app-text/djvu/Manifest
@@ -0,0 +1,6 @@
+AUX djvu-3.5.24-gcc46.patch 859 BLAKE2B c11a240b930df4ddbf45272c2c2ba262b545d440cb6553107bac51894853b1ae28ca97620bef74bdde6ac674eee237cf14c63fa9313f9acf2afb70c8e6045f6e SHA512 8e27341bb994dca8ea27cf6da1141f06b5c96f1b853e7d4215214893c32a17fe3adc821c98ff8793d23cde458420f944b7f4d51e794fda9a061fea6f1eac08ca
+DIST djvulibre-3.5.25.3.tar.gz 2543949 BLAKE2B 8ae6004e74a7db0fa666a3cf15f5a3b335690984838e8d674ccd7fa7dda0728771f6fab5f61747b505646e3bb206effd0bbaf9c6035fb27993d587693ad1fa43 SHA512 0e38f56d77915ee6707dd19a36a8ca9167608c39449a5c73de9cd784d712852c07c068b79a794e25f6d3ded0f927d083413dde197c9fc8f7b68c03cffe68035b
+DIST djvulibre-3.5.27.tar.gz 3648522 BLAKE2B e1907b4b64c48304ceb24360cfd451e4690d38803f22231d4e136dbe754715527fa0300c623bb709fa05bba206348257137b2a755651bb51ca26259680e142d0 SHA512 62abcaa2fe7edab536477929ba38b882453dab1a06e119a3f838b38d5c61f5d8c252e4769e6534582b826e49bcfb490513179580fab9c3afa84aa92053ccebee
+EBUILD djvu-3.5.25.3.ebuild 1768 BLAKE2B 9e2806c9af331c5ec9f86a6908ba985d64cee22d64848bff5f80a0cf8163fad0ee2f5736d28260c15c672970b05f20fb1b5ed5f82feb193550186059d548adff SHA512 08d9199c719032df599b8e18022411adbc0ee6f9f5e09e0a8e73b62b13e5e3dc4be6b8baad13dfb4bed973423042c9c464ac714a614af2e771dae7955bf5f453
+EBUILD djvu-3.5.27.ebuild 1461 BLAKE2B 2d8e41aa8552fef138db4660b83ec949892c3254dc902d47d3555592becfbeeaa76cd8d7a5b48ac183a66f9c4a2c351edfe3dd2b2d30a8893bde24936a5a9c7c SHA512 532db3244d98404e095a0521e6ee09724bfe887f374a0b132efd0bae94ad063177562c3c81c0206979f38736a77a392e82ea96e9d0eb2abb62445807eec259cd
+MISC metadata.xml 948 BLAKE2B 1d15a217967f10397d747f2cc0844ea76d4f876ed0ee8cb56733b74a3b92f023e3eeff11bfcb4265766c14dad4b1e35a18f7d2fdd7442068bf82c4a8302690db SHA512 e5cfa3a2b2077a3f0dbfcc99165fb678e8c8759724790d520f1bed670fed5e753a47207bbbcd7d2ff2d55def5b34bf32201771918c9e7a16583d91553ac75e42
diff --git a/app-text/djvu/djvu-3.5.25.3.ebuild b/app-text/djvu/djvu-3.5.25.3.ebuild
new file mode 100644
index 000000000000..455ebfa772e0
--- /dev/null
+++ b/app-text/djvu/djvu-3.5.25.3.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools eutils flag-o-matic xdg-utils
+
+MY_P="${PN}libre-${PV#*_p}"
+
+DESCRIPTION="DjVu viewers, encoders and utilities"
+HOMEPAGE="http://djvu.sourceforge.net/"
+SRC_URI="mirror://sourceforge/djvu/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+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-solaris"
+IUSE="debug doc jpeg tiff xml"
+
+RDEPEND="jpeg? ( virtual/jpeg:0 )
+	tiff? ( media-libs/tiff:0= )"
+DEPEND="${RDEPEND}
+	|| ( gnome-base/librsvg media-gfx/inkscape )"
+
+S=${WORKDIR}/${MY_P%%.3}
+
+src_prepare() {
+	sed -i \
+		-e 's/AC_CXX_OPTIMIZE/OPTS=;AC_SUBST(OPTS)/' \
+		configure.ac || die #263688
+	rm aclocal.m4 config/{libtool.m4,ltmain.sh,install-sh,config.sub,config.guess,ltoptions.m4,ltversion.m4,lt~obsolete.m4}
+#	epatch "${FILESDIR}/${PN}-3.5.24-gcc46.patch"
+	AT_M4DIR="config" eautoreconf
+}
+
+src_configure() {
+	use debug && append-cppflags "-DRUNTIME_DEBUG_ONLY"
+
+	# We install all desktop files by hand.
+	econf \
+		$(use_enable xml xmltools) \
+		$(use_with jpeg) \
+		$(use_with tiff) \
+		--disable-desktopfiles
+}
+
+DOCS=( NEWS README )
+
+src_install() {
+	default
+	prune_libtool_files
+
+	use doc && dodoc -r doc
+
+	# Install desktop files.
+	cd desktopfiles
+	for i in {22,32,48,64}; do
+		insinto /usr/share/icons/hicolor/${i}x${i}/mimetypes
+		newins hi${i}-djvu.png image-vnd.djvu.png
+	done
+	insinto /usr/share/mime/packages
+	doins djvulibre-mime.xml
+}
+
+pkg_postinst() {
+	xdg_mimeinfo_database_update
+	has_version app-text/djview || \
+		optfeature "For djviewer or browser plugin" app-text/djview
+}
+
+pkg_postrm() {
+	xdg_mimeinfo_database_update
+}
diff --git a/app-text/djvu/djvu-3.5.27.ebuild b/app-text/djvu/djvu-3.5.27.ebuild
new file mode 100644
index 000000000000..7e1a7c1c755e
--- /dev/null
+++ b/app-text/djvu/djvu-3.5.27.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils flag-o-matic xdg-utils
+
+MY_P="${PN}libre-${PV#*_p}"
+
+DESCRIPTION="DjVu viewers, encoders and utilities"
+HOMEPAGE="http://djvu.sourceforge.net/"
+SRC_URI="mirror://sourceforge/djvu/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+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-solaris"
+IUSE="debug doc jpeg tiff xml"
+
+RDEPEND="jpeg? ( virtual/jpeg:0 )
+	tiff? ( media-libs/tiff:0= )"
+DEPEND="${RDEPEND}
+	|| ( gnome-base/librsvg media-gfx/inkscape )"
+
+S=${WORKDIR}/${MY_P%%.3}
+
+src_configure() {
+	use debug && append-cppflags "-DRUNTIME_DEBUG_ONLY"
+
+	# We install all desktop files by hand.
+	econf \
+		$(use_enable xml xmltools) \
+		$(use_with jpeg) \
+		$(use_with tiff) \
+		--disable-desktopfiles
+}
+
+DOCS=( NEWS README )
+
+src_install() {
+	default
+	prune_libtool_files
+
+	use doc && dodoc -r doc
+
+	# Install desktop files.
+	cd desktopfiles
+	for i in {22,32,48,64}; do
+		insinto /usr/share/icons/hicolor/${i}x${i}/mimetypes
+		newins prebuilt-hi${i}-djvu.png image-vnd.djvu.png
+	done
+	insinto /usr/share/mime/packages
+	doins djvulibre-mime.xml
+}
+
+pkg_postinst() {
+	xdg_mimeinfo_database_update
+	has_version app-text/djview || \
+		optfeature "For djviewer or browser plugin" app-text/djview
+}
+
+pkg_postrm() {
+	xdg_mimeinfo_database_update
+}
diff --git a/app-text/djvu/files/djvu-3.5.24-gcc46.patch b/app-text/djvu/files/djvu-3.5.24-gcc46.patch
new file mode 100644
index 000000000000..2d1d099bfbb9
--- /dev/null
+++ b/app-text/djvu/files/djvu-3.5.24-gcc46.patch
@@ -0,0 +1,40 @@
+http://bugs.gentoo.org/361057 for GSmartPointer.h change
+
+Then include stddef.h in the installed headers to fix building of reverse
+dependencies, such as app-text/zathura-djvu
+
+These are all in upstream GIT
+
+--- a/libdjvu/ddjvuapi.h
++++ b/libdjvu/ddjvuapi.h
+@@ -64,6 +64,7 @@
+ }
+ #endif
+ 
++#include <stddef.h>
+ #include <stdlib.h>
+ #include <stdio.h>
+ 
+--- a/libdjvu/GSmartPointer.h
++++ b/libdjvu/GSmartPointer.h
+@@ -62,6 +62,8 @@
+ # pragma interface
+ #endif
+ 
++#include <cstddef>
++
+ /** @name GSmartPointer.h
+ 
+     Files #"GSmartPointer.h"# and #"GSmartPointer.cpp"# define a smart-pointer
+--- a/libdjvu/miniexp.h
++++ b/libdjvu/miniexp.h
+@@ -38,7 +38,8 @@
+ #ifndef MINILISPAPI
+ # define MINILISPAPI /**/
+ #endif
+-  
++
++#include <stddef.h>
+ 
+ /* -------------------------------------------------- */
+ /* LISP EXPRESSIONS                                   */
diff --git a/app-text/djvu/metadata.xml b/app-text/djvu/metadata.xml
new file mode 100644
index 000000000000..775c1334667a
--- /dev/null
+++ b/app-text/djvu/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
+	<longdescription>
+DjVu is a web-centric format and software platform for distributing documents
+and images. DjVu can advantageously replace PDF, PS, TIFF, JPEG, and GIF for
+distributing scanned documents, digital documents, or high-resolution pictures.
+DjVu content downloads faster, displays and renders faster, looks nicer on a
+screen, and consume less client resources than competing formats. DjVu images
+display instantly and can be smoothly zoomed and panned with no lengthy
+re-rendering. DjVu is used by hundreds of academic, commercial, governmental,
+and non-commercial web sites around the world.
+</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">djvu</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/djvusmooth-0.2.18 b/app-text/djvusmooth-0.2.18
deleted file mode 100644
index 17fe55b669ad..000000000000
--- a/app-text/djvusmooth-0.2.18
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Graphical editor for DjVu documents
-EAPI=6
-HOMEPAGE=http://jwilk.net/software/djvusmooth
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-python/python-djvulibre[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/wxpython:3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] x11-themes/hicolor-icon-theme python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/jwilk/djvusmooth/releases/download/0.2.18/djvusmooth-0.2.18.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1a4aee1dcf8c2a6c4631046ecd6c5f10
diff --git a/app-text/djvusmooth/Manifest b/app-text/djvusmooth/Manifest
new file mode 100644
index 000000000000..cc4cc0fdf963
--- /dev/null
+++ b/app-text/djvusmooth/Manifest
@@ -0,0 +1,3 @@
+DIST djvusmooth-0.2.18.tar.gz 70548 BLAKE2B 1f4a14038ce4df4318ab8c7dbaac9c65c132ff184dec2a03b6c45e555170a50caad0003f0c766e82c0bf9b0200798763922e5f408d6892cb43663712d7142653 SHA512 786d7e9dc49f9a6923ebfaec7d4e68446e4bd72f7ff7cca9cd3a1513f3b1751485d6879dc59b51ce1d58390dbcf23b8992b42f9f2b5e6938d434d6966b7a4a72
+EBUILD djvusmooth-0.2.18.ebuild 562 BLAKE2B 8de1fbb14d56688fe2d73f3edbd8fed9e765ff9e7a2a6f67b0bd28358e498f9db8eb698e46c1a6bd85c83e6d910bb1ded61ee7472f6e866c1422a904c922da14 SHA512 c32ea14195c45e2eb805c7e7c5a2d26330c2a42c621586ced20872f2a3f43524e89752bd213caf914be686179dad5d3e47b765f49c8cda66fa36a83a5ffd1d48
+MISC metadata.xml 253 BLAKE2B 847e0c92e5271d87a2ebc2ce21743c22001528423da7ea6e2710b5496458e218ffbf5afa2fb87a80bcfff2e0d202f252abc1345055a6cfc82e39cb85805a1ed2 SHA512 ebdbe1749818e629dd679f454444046f355d35acc10ad66d0a110cd582cd68c42f9f2dd880bde858a99abd85d46cde7b293a65c8ca3510c6bd1674e40b5b0d0e
diff --git a/app-text/djvusmooth/djvusmooth-0.2.18.ebuild b/app-text/djvusmooth/djvusmooth-0.2.18.ebuild
new file mode 100644
index 000000000000..30d8056a0e72
--- /dev/null
+++ b/app-text/djvusmooth/djvusmooth-0.2.18.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Graphical editor for DjVu documents"
+HOMEPAGE="http://jwilk.net/software/djvusmooth"
+SRC_URI="https://github.com/jwilk/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/python-djvulibre[${PYTHON_USEDEP}]
+	dev-python/wxpython:3.0[${PYTHON_USEDEP}]
+	x11-themes/hicolor-icon-theme"
+
+DOCS=( doc/changelog doc/credits.txt )
diff --git a/app-text/djvusmooth/metadata.xml b/app-text/djvusmooth/metadata.xml
new file mode 100644
index 000000000000..ee4f72507d62
--- /dev/null
+++ b/app-text/djvusmooth/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <!-- maintainer-needed -->
+  <upstream>
+    <remote-id type="github">jwilk/djvusmooth</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-text/docbook-dsssl-stylesheets-1.79-r2 b/app-text/docbook-dsssl-stylesheets-1.79-r2
deleted file mode 100644
index 7db2d310f190..000000000000
--- a/app-text/docbook-dsssl-stylesheets-1.79-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare prerm unpack
-DEPEND=>=app-text/sgml-common-0.6.3-r2
-DESCRIPTION=DSSSL Stylesheets for DocBook
-EAPI=5
-HOMEPAGE=https://github.com/docbook/wiki/wiki
-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 ~x86-macos ~sparc-solaris ~x64-solaris
-LICENSE=MIT
-RDEPEND=app-text/sgml-common
-SLOT=0
-SRC_URI=mirror://sourceforge/docbook/docbook-dsssl-1.79.tar.bz2
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	sgml-catalog	1ca36a4ae32c67b390f310dd6d7b1189	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2c5627f6354a0d8d89296515238cd012
diff --git a/app-text/docbook-dsssl-stylesheets/Manifest b/app-text/docbook-dsssl-stylesheets/Manifest
new file mode 100644
index 000000000000..9731b7ea538e
--- /dev/null
+++ b/app-text/docbook-dsssl-stylesheets/Manifest
@@ -0,0 +1,4 @@
+AUX docbook-dsssl-stylesheets-1.77.Makefile 676 BLAKE2B e87e463a2fffd64e6633a2d1015660ebc341f089a2dd3cb5da9c743eaf9b98b8457a723040f871c350969445275a6eca705546e2d4ba7596c21994fc5069c540 SHA512 110c5dbed17a759179c08fe44410b7d098dc42c8a1d6ed1a4accb30d815ccbd0f2a65a65723b18747577c838106d5e9c193c466a7c2e7f69fe2aeb1a4637d2c3
+DIST docbook-dsssl-1.79.tar.bz2 277650 BLAKE2B 6a12f46965ee705096f679b672610395b24f151e3bf3cb05f7d920c052b7a3fdafb4f5ee4526dbf765bbab6b7d4ca9f021277c6f35926f47edc61d0f835afdbb SHA512 fad71e67227b54b0a7c31a351b4d5c0695517b3687714807d7b144d239dc6f7e0d556520e705eb75581c82e0deea4b32ccfde1eccad2718337b757eddd64843e
+EBUILD docbook-dsssl-stylesheets-1.79-r2.ebuild 1622 BLAKE2B 1d3a39700f1d767669319d7ecfff473ecd4849ae66918d070780f1e9bd327a82488a65a7744834a98572bc2685bbcb333dc5482316f232b6a1fbbe157f8a96bd SHA512 87e7ffd95e6e6ff0dd713f1246b80353a246736696fac03384ae906d1ed6a3438f9d74ac1526f7bd516e7d3110f2e76d76e90aa59fe9d17bbc7930ec9257124c
+MISC metadata.xml 244 BLAKE2B bb7b24c64c26a7f15cd94824d3dcced7f4680be7b408e344b8255ab4d2811a85e0b6941172dc28e10077d58c07d16788e8e42725526e51968fcb07f340af90f0 SHA512 bbbde89bd3a4d4e2071d840c10a83781a0950bf6e362bc4e69a24ac9da5ce216ec338a935519e8913df63db8b3ecd12f6ac3868519fd1b1378285c923fd234ec
diff --git a/app-text/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-1.79-r2.ebuild b/app-text/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-1.79-r2.ebuild
new file mode 100644
index 000000000000..215efe89a67f
--- /dev/null
+++ b/app-text/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-1.79-r2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit sgml-catalog
+
+MY_P=${P/-stylesheets/}
+S=${WORKDIR}/${MY_P}
+DESCRIPTION="DSSSL Stylesheets for DocBook"
+HOMEPAGE="https://github.com/docbook/wiki/wiki"
+SRC_URI="mirror://sourceforge/docbook/${MY_P}.tar.bz2"
+
+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 ~x86-macos ~sparc-solaris ~x64-solaris"
+IUSE=""
+
+RDEPEND="app-text/sgml-common"
+
+sgml-catalog_cat_include "/etc/sgml/dsssl-docbook-stylesheets.cat" \
+	"/usr/share/sgml/docbook/dsssl-stylesheets-${PV}/catalog"
+sgml-catalog_cat_include "/etc/sgml/sgml-docbook.cat" \
+	"/etc/sgml/dsssl-docbook-stylesheets.cat"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	cp "${FILESDIR}/${PN}-1.77.Makefile" Makefile
+}
+
+src_compile() {
+	return 0
+}
+
+src_install() {
+	make \
+		BINDIR="${ED}/usr/bin" \
+		DESTDIR="${ED}/usr/share/sgml/docbook/dsssl-stylesheets-${PV}" \
+		install || die
+
+	dodir /usr/share/sgml/stylesheets/dsssl/
+
+	if [ -d "${EPREFIX}"/usr/share/sgml/stylesheets/dsssl/docbook ] &&
+		[ ! -L "${EPREFIX}"/usr/share/sgml/stylesheets/dsssl/docbook ]
+	then
+		ewarn "Not linking /usr/share/sgml/stylesheets/dsssl/docbook to"
+		ewarn "/usr/share/sgml/docbook/dsssl-stylesheets-${PV}"
+		ewarn "as directory already exists there.  Will assume you know"
+		ewarn "what you're doing."
+	else
+		dosym ../../docbook/dsssl-stylesheets-${PV} \
+			/usr/share/sgml/stylesheets/dsssl/docbook
+	fi
+
+	dodoc BUGS ChangeLog README RELEASE-NOTES.txt WhatsNew
+}
diff --git a/app-text/docbook-dsssl-stylesheets/files/docbook-dsssl-stylesheets-1.77.Makefile b/app-text/docbook-dsssl-stylesheets/files/docbook-dsssl-stylesheets-1.77.Makefile
new file mode 100644
index 000000000000..5d73ff173c4e
--- /dev/null
+++ b/app-text/docbook-dsssl-stylesheets/files/docbook-dsssl-stylesheets-1.77.Makefile
@@ -0,0 +1,25 @@
+BINDIR = /usr/bin
+DESTDIR = /usr/share/sgml/docbook/dsssl-stylesheets-1.76
+
+all: install
+
+install:
+	mkdir -p $(BINDIR)
+	mkdir -p $(DESTDIR)/dtds/decls
+	mkdir -p $(DESTDIR)/lib
+	mkdir -p $(DESTDIR)/common
+	mkdir -p $(DESTDIR)/html
+	mkdir -p $(DESTDIR)/print
+	mkdir -p $(DESTDIR)/test
+	mkdir -p $(DESTDIR)/images
+	install bin/collateindex.pl $(BINDIR)
+	cp catalog $(DESTDIR)
+	cp VERSION $(DESTDIR)
+	cp dtds/decls/docbook.dcl $(DESTDIR)/dtds/decls
+	cp lib/dblib.dsl $(DESTDIR)/lib
+	cp common/*.dsl $(DESTDIR)/common
+	cp common/*.ent $(DESTDIR)/common
+	cp html/*.dsl $(DESTDIR)/html
+	cp lib/*.dsl $(DESTDIR)/lib
+	cp print/*.dsl $(DESTDIR)/print
+	cp images/*.gif $(DESTDIR)/images
diff --git a/app-text/docbook-dsssl-stylesheets/metadata.xml b/app-text/docbook-dsssl-stylesheets/metadata.xml
new file mode 100644
index 000000000000..4c2c3e9fe569
--- /dev/null
+++ b/app-text/docbook-dsssl-stylesheets/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="sourceforge">docbook</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/docbook-sgml-1.0 b/app-text/docbook-sgml-1.0
deleted file mode 100644
index 2ed13b11c404..000000000000
--- a/app-text/docbook-sgml-1.0
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=A helper package for sgml docbook
-EAPI=0
-HOMEPAGE=http://www.docbook.org/sgml/
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 sh sparc x86
-LICENSE=GPL-2
-RDEPEND=app-text/sgml-common app-text/openjade >=app-text/docbook-dsssl-stylesheets-1.64 >=app-text/docbook-sgml-utils-0.6.6 ~app-text/docbook-sgml-dtd-3.0 ~app-text/docbook-sgml-dtd-3.1 ~app-text/docbook-sgml-dtd-4.0 ~app-text/docbook-sgml-dtd-4.1
-SLOT=0
-_md5_=96c61cf16e693d1216f4667501dfdb77
diff --git a/app-text/docbook-sgml-dtd-3.0-r3 b/app-text/docbook-sgml-dtd-3.0-r3
deleted file mode 100644
index f172a071656e..000000000000
--- a/app-text/docbook-sgml-dtd-3.0-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare prerm unpack
-DEPEND=>=app-arch/unzip-5.41 >=app-text/sgml-common-0.6.3-r2
-DESCRIPTION=Docbook SGML DTD 3.0
-EAPI=5
-HOMEPAGE=https://docbook.org/sgml/
-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 ~x86-macos ~sparc-solaris ~x64-solaris
-LICENSE=docbook
-RDEPEND=app-text/sgml-common
-SLOT=3.0
-SRC_URI=https://www.oasis-open.org/docbook/sgml/3.0/docbk30.zip
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	sgml-catalog	1ca36a4ae32c67b390f310dd6d7b1189	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a18126a457996b6f1f5e6827d2be43dc
diff --git a/app-text/docbook-sgml-dtd-3.1-r3 b/app-text/docbook-sgml-dtd-3.1-r3
deleted file mode 100644
index 1ca483a2cd5d..000000000000
--- a/app-text/docbook-sgml-dtd-3.1-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare prerm unpack
-DEPEND=>=app-arch/unzip-5.41 >=app-text/sgml-common-0.6.3-r2
-DESCRIPTION=Docbook SGML DTD 3.1
-EAPI=5
-HOMEPAGE=https://docbook.org/sgml/
-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 ~x86-macos ~sparc-solaris ~x64-solaris
-LICENSE=docbook
-RDEPEND=app-text/sgml-common
-SLOT=3.1
-SRC_URI=https://www.oasis-open.org/docbook/sgml/3.1/docbk31.zip
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	sgml-catalog	1ca36a4ae32c67b390f310dd6d7b1189	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0927074b3cd0a70eb47655c2b22147b7
diff --git a/app-text/docbook-sgml-dtd-4.0-r3 b/app-text/docbook-sgml-dtd-4.0-r3
deleted file mode 100644
index 69907ff5f07e..000000000000
--- a/app-text/docbook-sgml-dtd-4.0-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare prerm unpack
-DEPEND=>=app-arch/unzip-5.41 >=app-text/sgml-common-0.6.3-r2
-DESCRIPTION=Docbook SGML DTD 4.0
-EAPI=5
-HOMEPAGE=https://docbook.org/sgml/
-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 ~x86-macos ~sparc-solaris ~x64-solaris
-LICENSE=docbook
-RDEPEND=app-text/sgml-common
-SLOT=4.0
-SRC_URI=https://www.oasis-open.org/docbook/sgml/4.0/docbk40.zip
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	sgml-catalog	1ca36a4ae32c67b390f310dd6d7b1189	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=080e5e4507cf17b7b3acfc94bcf0cf40
diff --git a/app-text/docbook-sgml-dtd-4.1-r3 b/app-text/docbook-sgml-dtd-4.1-r3
deleted file mode 100644
index 2bebc63bf961..000000000000
--- a/app-text/docbook-sgml-dtd-4.1-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare prerm unpack
-DEPEND=>=app-arch/unzip-5.41 >=app-text/sgml-common-0.6.3-r2
-DESCRIPTION=Docbook SGML DTD 4.1
-EAPI=5
-HOMEPAGE=https://docbook.org/sgml/
-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 ~x86-macos ~sparc-solaris ~x64-solaris
-LICENSE=docbook
-RDEPEND=app-text/sgml-common
-SLOT=4.1
-SRC_URI=https://www.oasis-open.org/docbook/sgml/4.1/docbk41.zip
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	sgml-catalog	1ca36a4ae32c67b390f310dd6d7b1189	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b4efabe7feab1ea2dee34c41df67e979
diff --git a/app-text/docbook-sgml-dtd-4.2-r2 b/app-text/docbook-sgml-dtd-4.2-r2
deleted file mode 100644
index f055b9f2b209..000000000000
--- a/app-text/docbook-sgml-dtd-4.2-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare prerm unpack
-DEPEND=>=app-arch/unzip-5.41 >=app-text/sgml-common-0.6.3-r2
-DESCRIPTION=Docbook SGML DTD 4.2
-EAPI=5
-HOMEPAGE=https://docbook.org/sgml/
-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 ~x86-macos ~sparc-solaris ~x64-solaris
-LICENSE=docbook
-RDEPEND=app-text/sgml-common
-SLOT=4.2
-SRC_URI=https://www.oasis-open.org/docbook/sgml/4.2/docbook-4.2.zip
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	sgml-catalog	1ca36a4ae32c67b390f310dd6d7b1189	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ad9e41dcb9268fbea0fd7960a5477df4
diff --git a/app-text/docbook-sgml-dtd-4.3-r2 b/app-text/docbook-sgml-dtd-4.3-r2
deleted file mode 100644
index 00f077ccf1d5..000000000000
--- a/app-text/docbook-sgml-dtd-4.3-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare prerm unpack
-DEPEND=>=app-arch/unzip-5.41 >=app-text/sgml-common-0.6.3-r2
-DESCRIPTION=Docbook SGML DTD 4.3
-EAPI=5
-HOMEPAGE=https://docbook.org/sgml/
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris
-LICENSE=docbook
-RDEPEND=app-text/sgml-common
-SLOT=4.3
-SRC_URI=https://www.docbook.org/sgml/4.3/docbook-4.3.zip
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	sgml-catalog	1ca36a4ae32c67b390f310dd6d7b1189	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a2304afdd03b957d2b53c2a30a3efadb
diff --git a/app-text/docbook-sgml-dtd-4.4 b/app-text/docbook-sgml-dtd-4.4
deleted file mode 100644
index b8c89f84542f..000000000000
--- a/app-text/docbook-sgml-dtd-4.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare prerm unpack
-DEPEND=>=app-arch/unzip-5.41 >=app-text/sgml-common-0.6.3-r2
-DESCRIPTION=Docbook SGML DTD 4.4
-EAPI=5
-HOMEPAGE=https://docbook.org/sgml/
-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 ~x86-macos ~sparc-solaris ~x64-solaris
-LICENSE=docbook
-RDEPEND=app-text/sgml-common
-SLOT=4.4
-SRC_URI=https://www.docbook.org/sgml/4.4/docbook-4.4.zip
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	sgml-catalog	1ca36a4ae32c67b390f310dd6d7b1189	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=650277961b2d8cfb743e4b913cc00ceb
diff --git a/app-text/docbook-sgml-dtd-4.5 b/app-text/docbook-sgml-dtd-4.5
deleted file mode 100644
index bbae651dbb4d..000000000000
--- a/app-text/docbook-sgml-dtd-4.5
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare prerm unpack
-DEPEND=>=app-arch/unzip-5.41 >=app-text/sgml-common-0.6.3-r2
-DESCRIPTION=Docbook SGML DTD 4.5
-EAPI=5
-HOMEPAGE=https://docbook.org/sgml/
-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 ~x86-macos ~sparc-solaris ~x64-solaris
-LICENSE=docbook
-RDEPEND=app-text/sgml-common
-SLOT=4.5
-SRC_URI=https://www.docbook.org/sgml/4.5/docbook-4.5.zip
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	sgml-catalog	1ca36a4ae32c67b390f310dd6d7b1189	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9c95715720881889325dba91ea13209c
diff --git a/app-text/docbook-sgml-dtd/Manifest b/app-text/docbook-sgml-dtd/Manifest
new file mode 100644
index 000000000000..a34d596ede0a
--- /dev/null
+++ b/app-text/docbook-sgml-dtd/Manifest
@@ -0,0 +1,25 @@
+AUX docbook-sgml-dtd-3.0-catalog.diff 2144 BLAKE2B 8d68e85da15d660058135348b901a30aee7b32dc832493ba5a12e5ce0d6a59ef30fe1186ef8f6658eef1532607e88e32d56f12720ccc09a2621996cc422a0fa1 SHA512 e0ae3b49da83fcbd95fd12ae268d414d12e72c16f5d4342f3d2268f378b9c57ccd1c4daf1ed739a3ffc4b36c2b2842bd2f18ff2d1081c65ccca2aae694613654
+AUX docbook-sgml-dtd-3.1-catalog.diff 2125 BLAKE2B c6eb346817455012b289e8b511ecd0eb1fb3394438d7a10760ebb5d73779b992344dd4cbfd9202354827ac7a4259e1ec638c396075f8bb30ce2a77f44a341888 SHA512 cf4162f0b318bfb0e2a95384eb7520a1cc07971637a07f97841515c7ab3c6eba3ab4e45a39c406f24a10a79069b506e5066c436c59e569347a798827db3b8ff4
+AUX docbook-sgml-dtd-4.0-catalog.diff 2096 BLAKE2B c94662c30aea2a20aace83712e47ad4f831fcdfeb5e7e15cad463c7850a00ab97a457e67763f0aafb68c3a81c30e4dba46964fdfa979ce99eca0b00cf7ddf5aa SHA512 933f0f6ed79f749b82bc265fee41b01e0c1272f5b45bc298b77636cc9e527e722061300dc9acb5e39ed9af92177c0df03746f761702dd42091c423d5147cf3ba
+AUX docbook-sgml-dtd-4.1-catalog.diff 2096 BLAKE2B 7f0a1fd57f1a6c846665d5648c6e884c9755f9cf9f8ec38441d323b11bcf6b32688051d5eb5c0f9ae57b5f27d888fc4033965f1b3fbbc6a4ee87005b7c19500a SHA512 fcbf05b86f4d2290160929049f3599b34a7c88f3fe92f36b539d8cce0ce9d3dea74acfff164a8176f5e28b50416abfc9057623013edd59e18ec6fa8e254fba6a
+AUX docbook-sgml-dtd-4.2-catalog.diff 2528 BLAKE2B edee561d2ee6cf8ddc0c7101b32462daf2ec4250708ba4c585c325515daf9d230eca1cb64a6acd9ebe8ab099f683a12577d38cb78aa3e037134cc7457928b026 SHA512 23a61f2cee28e997e16a33177212578dc6a99c84868fae338f3fb5d2ac7a01322d22824785009711fe70462169118c88d57a928849da8c94af847d423b6449d0
+AUX docbook-sgml-dtd-4.3-catalog.diff 2471 BLAKE2B 378ced1d5aa8a3124e1a790953bb81bc4b1085508f47514e0d6adeccd4348d29a110d74c6b02b7fedaaaf7a3ff4496605c0af7d4a961e3877601b3b79dbe11fb SHA512 8143551df2b88963e1acb29ca281ea30629e6fbc41d1966c9d967dd00e1411bb55b0847069c25403f15fd814bddbb7552589e9682ba30c74656c291dc4906f49
+AUX docbook-sgml-dtd-4.4-catalog.diff 2471 BLAKE2B 94ad3fe3d68c7c7670c76fe7ed1eb067f674eef81666acc91c768d0d9a1ccf26edcfe5aac6417a9562df6cf6ad87efa3cb852d06d65c224c2fdee3725ba2c8c8 SHA512 86f1db81e539e4e76d2f3f799b1c5e3297ede2fc2f448f6a2b69d1fbae3d2d4a2a444f66186b5b9525c171e32082f9e213ea31715456cc17d998e15c68fe14da
+AUX docbook-sgml-dtd-4.5-catalog.diff 2583 BLAKE2B b08550bdc040423adcfe5f7e3f34d5c66c9d8ca863a5d6cadc9fd7379e6b83e71994ffa850571162c3f87d525fb18c7f3cbcd014672e148f5e16f95a616a2c61 SHA512 a2c35b12043db3b0676d29b9525e669a13c7e892a7f4a2a47392fbe16febb7727508d75a45deaacca0af386930236c4889e86e4a17c727c98a9c600b28fd392f
+DIST docbk30.zip 43441 BLAKE2B e6711bc48f22fd9426f6c05b42270f03c2f5a2f0457df81bf7f4c930a432f55c288a07b834aeeaa21f91e0c258130f8f36fbbac55ce7af402c124793bd17acc8 SHA512 4e186c7b38bf70a3225bd9fca4edf99d3e7f316308b561aad9a0548f8e0ba941b54f20f6e653819de8a26db5eb54fc7442c3e2d740c2ba60311b3038a4bb9198
+DIST docbk31.zip 55952 BLAKE2B 6856fc7c15f3ae2b97251757df485deea8ffcd9f496284575ce290d4c336e1c45d7c5568acd1c93dcb6b0fcb91ca8011fc2bc90d2e78be76b75b3fc0c97cd875 SHA512 397c9df011007b71ddc9c052d28db7ab38ac2c05e7f575aaad41a6b4995b910cd147f9a822d162271bc073cbfca0788d7f323be381c900c3a32c352e658d37fe
+DIST docbk40.zip 55742 BLAKE2B e504c61b7c1402b5afa9036b9aec8fac89a39a0d2a24ec08044a84928c101a5abef17882e73704fd59fcdc7df0667e3ec1d9b97978a26b29489e2c027c61d1d4 SHA512 ae1078190bd34c2b7f0eab667a2502822eb80e17243c447849736ea8d7eeb65c71b571cc39106763c6c9f75c83f3b684a40a18e1dd6da5d235c63a107c931276
+DIST docbk41.zip 56654 BLAKE2B c54c61f039d9fb6594612de19731feeee436c962695374b9b63bb5b94995629a8042422c6aa52c478383456708b9e12ade9abe2a47987c6c57d054101abdeb0c SHA512 d1c76a381b37c599c127286be67939bd8348721339ed9dde6140c69a2d89568e290e7554e6763ab903e050edc505520497eb612865e2a07224e4907b51fb87d5
+DIST docbook-4.2.zip 61830 BLAKE2B f9a26e9aefe2da7c785f065374bb082f15e3f39dded7bccef558d4f33efdee51b12de16cf608f5ce79a13fe37486c8bc75c36d4518b18dd90249f45f98c12ef0 SHA512 d51e07310a1426a5fecb809ef1bc32aa7d72c673528b3ffda0b6d3c1e22baab89f94dd5160386d657d567eb225c9bd2cff1096cd07c7184f6e0b690692a5661d
+DIST docbook-4.3.zip 66117 BLAKE2B d92d69b6f94c85bc2e8ead87dfb31db331206ea3d014e7dc240b47d8b07f43f8c1053003f50c398c4723726980e553dee7b34db629f1eee19ef6ae95f06c6ae8 SHA512 18ead2e683a9e9bc39e1487ee06fb72542557fa0c76f0e899b566cb52207e3bbfcb415ed59163c6d59e8d58f92289e115416d56bc6ed8f182910f7a18565b227
+DIST docbook-4.4.zip 66879 BLAKE2B 7a21c99e934851bc7c6be77da2b65079b3b6b32365672b40b70b1819e7aa6987cb65f8725ed2b9cc804d8cd0fc7c17f02601466dcd48f5314439df626db6aa89 SHA512 561d6f68e293fb98d13010dc287c6ea59d9e6a033af3518ab4d735a374a7a603150ecf555a1126577dd00baa692a6c5d09afc4d3fed70f2fe8b5b86d6bb5ecd8
+DIST docbook-4.5.zip 71252 BLAKE2B 0bdb424ff47be140d4d18eeb5f3dce509d47577737b485d5bc34af1a02596d577eb7b48c3884acd04965014819e4a23a444c198134fec14f2c2e7c2d5bcac58d SHA512 cde483678562a18f67fa5fbe631fbdfcbef907b6b6fb63749125fdc883af2448d4a95aefb8fba8bcdd0417fb078063984fe8eb3c7050978f4f4b03d527c329df
+EBUILD docbook-sgml-dtd-3.0-r3.ebuild 1000 BLAKE2B ab544f870b642843cac5852c3bd1a13144bac23f757b35d4eeb9294fa20bf33b457dd262a2c9a99493f916ca52c9003fd1997fd612b94a6f0fa53046c6f5031d SHA512 4800ab46cd04af41a618a979b8890e235c83aeb6079f6644539bcaf703c776774e69a231137fda037257882e2de2eb7ca673ffeb0083c4f8dc364f4dd98cf57b
+EBUILD docbook-sgml-dtd-3.1-r3.ebuild 1000 BLAKE2B d8130fc975e1acf1d569960b3b74b6dcc3c4fb68624d9ea56834bd9f3c94ca3876ca8359ee090fca5049f4eb502a22c3632746a6441e35b1946944b416563cbf SHA512 6af8de74f63b01e446fd43a1be7c37494a773a6b4a62a23b020732071c06870e0631206964f911d6a15a4031a9158848b57362eae1a1d44937a6c11e70c02b28
+EBUILD docbook-sgml-dtd-4.0-r3.ebuild 1000 BLAKE2B bae479fa462beef6bc0ad59b46ee470ed71677356ff1e25f87777daa5d4fd1c2e98dde26b65e32ad5333d0be81c281f16cf94e335759ddf137ff36476f3d7f23 SHA512 f4b8f6b23055c21d3f36f059666413c8d488f314756b23fd411e0d5471409c458d7bc1012aac29b02b3c82eadee8f9c2c12c758a1c498e40cb09ff0fe519e5f2
+EBUILD docbook-sgml-dtd-4.1-r3.ebuild 1000 BLAKE2B dbb46cff1a33f8f0770588c18cf087fa75074a3ed26e7e56a2f569635cbda0b37ce2be28fbcfb4e989030b153862d05470d8c0b408e56389d0cc7c92b0bcff31 SHA512 4aafa37378a6315835af91a37aac7842b1d04745ef8f4f6c8543e21d1c4aae51593b391b71a624a5014deadac058eb619e1eca6c5f9179ae0fafe249b6402c8a
+EBUILD docbook-sgml-dtd-4.2-r2.ebuild 1015 BLAKE2B 1dd036ea95d19b8bdbc825c4bf60b30dbd26ddcb97c4cecd020ccbdbb57294d5841882ef39dca414bab1e33533d390dd8ba0aee4f663c0bf35e0c5e7b9048c32 SHA512 8ddd813944172d0f8a858029292d7b22318e6795b1338f07057472e7042912c0c642d18876caabdf0d83aceb60c1852256bd36249741616510fbbb9abe69eaec
+EBUILD docbook-sgml-dtd-4.3-r2.ebuild 996 BLAKE2B 0368e87e3debadf66d48791a0e5044dbf6b047aa7461ac2ef190e7df56e619ecaddf16942d34570fff853b358ad030d67ba195793e79c061016e2834bab2185c SHA512 a1b777d1620c54fc30fa1d8ba1bfbded15eeebdc6a5289b8c15b7bf91577e4809db10bedc5929d1ea134a94d398929d9241b989e146012ad12b8564d84b10217
+EBUILD docbook-sgml-dtd-4.4.ebuild 1006 BLAKE2B 895942f94fb5e43c0cec90080720378b675751ea55657c759a372642f960c9e58d8427d4d8270aa8624b25847cd7556320bf0f754b81b6e3501d6ee6746607b9 SHA512 bb0b2a4b95c8b9ef77bdafb2e9129415de1be53fcbff278811049964eb9e5ab6674fd7083edd1dd502ffac560b27ee4a4d0238cfac8901c04e3f0b34a5c8894f
+EBUILD docbook-sgml-dtd-4.5.ebuild 1015 BLAKE2B cb1a8ae6963b180b5b9a1a8d2a3307efa174fd56b52137bfc9a1a0546d98305fd202d49a8d74ef7a0a028370bde42c7133893db2f7d05184d81e6ec7cb397a56 SHA512 940f6d483b380ae709dc671d3615daa956a8923fde34493a4727b5997286271cc3a9f699d3afdca6071dfb0d3f3734446c3d205fbd6a1e8ef62c553adb2969e4
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r3.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r3.ebuild
new file mode 100644
index 000000000000..ba9da057ae5a
--- /dev/null
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r3.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit sgml-catalog eutils
+
+MY_P="docbk30"
+DESCRIPTION="Docbook SGML DTD 3.0"
+HOMEPAGE="https://docbook.org/sgml/"
+SRC_URI="https://www.oasis-open.org/docbook/sgml/${PV}/${MY_P}.zip"
+
+LICENSE="docbook"
+SLOT="3.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 ~x86-macos ~sparc-solaris ~x64-solaris"
+IUSE=""
+
+DEPEND=">=app-arch/unzip-5.41"
+RDEPEND="app-text/sgml-common"
+
+S="${WORKDIR}"
+
+sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
+	"/usr/share/sgml/docbook/sgml-dtd-${PV}/catalog"
+sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
+	"/etc/sgml/sgml-docbook.cat"
+
+src_prepare() {
+	default
+	epatch "${FILESDIR}"/${P}-catalog.diff
+}
+
+src_install() {
+	insinto /usr/share/sgml/docbook/sgml-dtd-${PV}
+	doins *.dcl *.dtd *.mod
+	newins docbook.cat catalog
+	dodoc *.txt
+}
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r3.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r3.ebuild
new file mode 100644
index 000000000000..88708e01acf1
--- /dev/null
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r3.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit sgml-catalog eutils
+
+MY_P="docbk31"
+DESCRIPTION="Docbook SGML DTD 3.1"
+HOMEPAGE="https://docbook.org/sgml/"
+SRC_URI="https://www.oasis-open.org/docbook/sgml/${PV}/${MY_P}.zip"
+
+LICENSE="docbook"
+SLOT="3.1"
+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 ~x86-macos ~sparc-solaris ~x64-solaris"
+IUSE=""
+
+DEPEND=">=app-arch/unzip-5.41"
+RDEPEND="app-text/sgml-common"
+
+S="${WORKDIR}"
+
+sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
+	"/usr/share/sgml/docbook/sgml-dtd-${PV}/catalog"
+sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
+	"/etc/sgml/sgml-docbook.cat"
+
+src_prepare() {
+	default
+	epatch "${FILESDIR}"/${P}-catalog.diff
+}
+
+src_install() {
+	insinto /usr/share/sgml/docbook/sgml-dtd-${PV}
+	doins *.dcl *.dtd *.mod
+	newins docbook.cat catalog
+	dodoc *.txt
+}
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.0-r3.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.0-r3.ebuild
new file mode 100644
index 000000000000..feda5792a75b
--- /dev/null
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.0-r3.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit sgml-catalog eutils
+
+MY_P="docbk40"
+DESCRIPTION="Docbook SGML DTD 4.0"
+HOMEPAGE="https://docbook.org/sgml/"
+SRC_URI="https://www.oasis-open.org/docbook/sgml/${PV}/${MY_P}.zip"
+
+LICENSE="docbook"
+SLOT="4.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 ~x86-macos ~sparc-solaris ~x64-solaris"
+IUSE=""
+
+DEPEND=">=app-arch/unzip-5.41"
+RDEPEND="app-text/sgml-common"
+
+S="${WORKDIR}"
+
+sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
+	"/usr/share/sgml/docbook/sgml-dtd-${PV}/catalog"
+sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
+	"/etc/sgml/sgml-docbook.cat"
+
+src_prepare() {
+	default
+	epatch "${FILESDIR}"/${P}-catalog.diff
+}
+
+src_install() {
+	insinto /usr/share/sgml/docbook/sgml-dtd-${PV}
+	doins *.dcl *.dtd *.mod
+	newins docbook.cat catalog
+	dodoc *.txt
+}
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1-r3.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1-r3.ebuild
new file mode 100644
index 000000000000..f0777f778ab8
--- /dev/null
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1-r3.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit sgml-catalog eutils
+
+MY_P="docbk41"
+DESCRIPTION="Docbook SGML DTD 4.1"
+HOMEPAGE="https://docbook.org/sgml/"
+SRC_URI="https://www.oasis-open.org/docbook/sgml/${PV}/${MY_P}.zip"
+
+LICENSE="docbook"
+SLOT="4.1"
+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 ~x86-macos ~sparc-solaris ~x64-solaris"
+IUSE=""
+
+DEPEND=">=app-arch/unzip-5.41"
+RDEPEND="app-text/sgml-common"
+
+S="${WORKDIR}"
+
+sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
+	"/usr/share/sgml/docbook/sgml-dtd-${PV}/catalog"
+sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
+	"/etc/sgml/sgml-docbook.cat"
+
+src_prepare() {
+	default
+	epatch "${FILESDIR}"/${P}-catalog.diff
+}
+
+src_install() {
+	insinto /usr/share/sgml/docbook/sgml-dtd-${PV}
+	doins *.dcl *.dtd *.mod
+	newins docbook.cat catalog
+	dodoc *.txt
+}
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.2-r2.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.2-r2.ebuild
new file mode 100644
index 000000000000..b4cacf0c675c
--- /dev/null
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.2-r2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit sgml-catalog eutils
+
+MY_P="docbook-4.2"
+DESCRIPTION="Docbook SGML DTD 4.2"
+HOMEPAGE="https://docbook.org/sgml/"
+SRC_URI="https://www.oasis-open.org/docbook/sgml/${PV}/${MY_P}.zip"
+
+LICENSE="docbook"
+SLOT="4.2"
+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 ~x86-macos ~sparc-solaris ~x64-solaris"
+IUSE=""
+
+DEPEND=">=app-arch/unzip-5.41"
+RDEPEND="app-text/sgml-common"
+
+S="${WORKDIR}"
+
+sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
+	"/usr/share/sgml/docbook/sgml-dtd-${PV}/catalog"
+sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
+	"/etc/sgml/sgml-docbook.cat"
+
+src_prepare() {
+	default
+	epatch "${FILESDIR}"/${P}-catalog.diff
+}
+
+src_install() {
+	insinto /usr/share/sgml/docbook/sgml-dtd-${PV}
+	doins *.dcl *.dtd *.mod
+	newins docbook.cat catalog
+	dodoc ChangeLog README
+}
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.3-r2.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.3-r2.ebuild
new file mode 100644
index 000000000000..75e8deae2c4c
--- /dev/null
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.3-r2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit sgml-catalog eutils
+
+MY_P="docbook-${PV}"
+DESCRIPTION="Docbook SGML DTD 4.3"
+HOMEPAGE="https://docbook.org/sgml/"
+SRC_URI="https://www.docbook.org/sgml/${PV}/${MY_P}.zip"
+
+LICENSE="docbook"
+SLOT="4.3"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+IUSE=""
+
+DEPEND=">=app-arch/unzip-5.41"
+RDEPEND="app-text/sgml-common"
+
+S="${WORKDIR}"
+
+sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
+	"/usr/share/sgml/docbook/sgml-dtd-${PV}/catalog"
+sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
+	"/etc/sgml/sgml-docbook.cat"
+
+src_prepare() {
+	default
+	epatch "${FILESDIR}"/${P}-catalog.diff
+}
+
+src_install() {
+	insinto /usr/share/sgml/docbook/sgml-dtd-${PV}
+	doins *.dcl *.dtd *.mod
+	newins docbook.cat catalog
+	dodoc ChangeLog README
+}
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.4.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.4.ebuild
new file mode 100644
index 000000000000..d207163ef213
--- /dev/null
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.4.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit sgml-catalog eutils
+
+MY_P="docbook-${PV}"
+DESCRIPTION="Docbook SGML DTD 4.4"
+HOMEPAGE="https://docbook.org/sgml/"
+SRC_URI="https://www.docbook.org/sgml/${PV}/${MY_P}.zip"
+
+LICENSE="docbook"
+SLOT="4.4"
+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 ~x86-macos ~sparc-solaris ~x64-solaris"
+IUSE=""
+
+DEPEND=">=app-arch/unzip-5.41"
+RDEPEND="app-text/sgml-common"
+
+S="${WORKDIR}"
+
+sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
+	"/usr/share/sgml/docbook/sgml-dtd-${PV}/catalog"
+sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
+	"/etc/sgml/sgml-docbook.cat"
+
+src_prepare() {
+	default
+	epatch "${FILESDIR}"/${P}-catalog.diff
+}
+
+src_install() {
+	insinto /usr/share/sgml/docbook/sgml-dtd-${PV}
+	doins *.dcl *.dtd *.mod
+	newins docbook.cat catalog
+	dodoc ChangeLog README
+}
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.5.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.5.ebuild
new file mode 100644
index 000000000000..cd0eeec3be5a
--- /dev/null
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.5.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils sgml-catalog
+
+MY_P="docbook-${PV}"
+DESCRIPTION="Docbook SGML DTD 4.5"
+HOMEPAGE="https://docbook.org/sgml/"
+SRC_URI="https://www.docbook.org/sgml/${PV}/${MY_P}.zip"
+
+LICENSE="docbook"
+SLOT="4.5"
+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 ~x86-macos ~sparc-solaris ~x64-solaris"
+IUSE=""
+
+DEPEND=">=app-arch/unzip-5.41"
+RDEPEND="app-text/sgml-common"
+
+S="${WORKDIR}"
+
+sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
+	"/usr/share/sgml/docbook/sgml-dtd-${PV}/catalog"
+sgml-catalog_cat_include "/etc/sgml/sgml-docbook-${PV}.cat" \
+	"/etc/sgml/sgml-docbook.cat"
+
+src_prepare() {
+	default
+	epatch "${FILESDIR}"/${P}-catalog.diff
+}
+
+src_install() {
+	insinto /usr/share/sgml/docbook/sgml-dtd-${PV}
+	doins *.dcl *.dtd *.mod *.xml
+	newins docbook.cat catalog
+	dodoc README
+}
diff --git a/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-3.0-catalog.diff b/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-3.0-catalog.diff
new file mode 100644
index 000000000000..224f98ca59c9
--- /dev/null
+++ b/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-3.0-catalog.diff
@@ -0,0 +1,32 @@
+--- docbook.cat	Tue Dec 10 16:35:22 1996
++++ catalog	Mon Jun  5 11:08:34 2000
+@@ -41,29 +41,6 @@
+ PUBLIC "-//Davenport//ELEMENTS DocBook Information Pool V3.0//EN" "dbpool.mod"

+ PUBLIC "-//Davenport//ELEMENTS DocBook Document Hierarchy V3.0//EN" "dbhier.mod"

+ PUBLIC "-//Davenport//ENTITIES DocBook Additional General Entities V3.0//EN" "dbgenent.mod"

+-

+-  -- ...................................................................... --

+-  -- ISO entity sets ...................................................... --

+-

+-PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN" "iso-dia.gml"

+-PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" "iso-num.gml"

+-PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN" "iso-pub.gml"

+-PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN" "iso-tech.gml"

+-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN" "iso-lat1.gml"

+-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN" "iso-lat2.gml"

+-PUBLIC "ISO 8879:1986//ENTITIES Greek Letters//EN" "iso-grk1.gml"

+-PUBLIC "ISO 8879:1986//ENTITIES Monotoniko Greek//EN" "iso-grk2.gml"

+-PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN" "iso-grk3.gml"

+-PUBLIC "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" "iso-grk4.gml"

+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN" "iso-amsa.gml"

+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN" "iso-amsb.gml"

+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" "iso-amsc.gml"

+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" "iso-amsn.gml"

+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" "iso-amso.gml"

+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" "iso-amsr.gml"

+-PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN" "iso-box.gml"

+-PUBLIC "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" "iso-cyr1.gml"

+-PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" "iso-cyr2.gml"

+ 

+   -- End of catalog data for DocBook V3.0 ................................. --

+   -- ...................................................................... --

diff --git a/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-3.1-catalog.diff b/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-3.1-catalog.diff
new file mode 100644
index 000000000000..51afa752ad2c
--- /dev/null
+++ b/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-3.1-catalog.diff
@@ -0,0 +1,32 @@
+--- docbook.cat	Tue Feb  2 06:53:32 1999
++++ catalog	Thu May 25 11:45:01 2000
+@@ -35,29 +35,6 @@
+ PUBLIC "-//OASIS//ENTITIES DocBook Additional General Entities V3.1//EN" "dbgenent.mod"

+ PUBLIC "-//OASIS//ENTITIES DocBook Notations V3.1//EN" "dbnotn.mod"

+ PUBLIC "-//OASIS//ENTITIES DocBook Character Entities V3.1//EN" "dbcent.mod"

+-

+-  -- ...................................................................... --

+-  -- ISO entity sets ...................................................... --

+-

+-PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN" "iso-dia.gml"

+-PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" "iso-num.gml"

+-PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN" "iso-pub.gml"

+-PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN" "iso-tech.gml"

+-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN" "iso-lat1.gml"

+-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN" "iso-lat2.gml"

+-PUBLIC "ISO 8879:1986//ENTITIES Greek Letters//EN" "iso-grk1.gml"

+-PUBLIC "ISO 8879:1986//ENTITIES Monotoniko Greek//EN" "iso-grk2.gml"

+-PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN" "iso-grk3.gml"

+-PUBLIC "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" "iso-grk4.gml"

+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN" "iso-amsa.gml"

+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN" "iso-amsb.gml"

+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" "iso-amsc.gml"

+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" "iso-amsn.gml"

+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" "iso-amso.gml"

+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" "iso-amsr.gml"

+-PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN" "iso-box.gml"

+-PUBLIC "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" "iso-cyr1.gml"

+-PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" "iso-cyr2.gml"

+ 

+   -- End of catalog data for DocBook V3.1 ................................. --

+   -- ...................................................................... --

diff --git a/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-4.0-catalog.diff b/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-4.0-catalog.diff
new file mode 100644
index 000000000000..dd83fdf12b52
--- /dev/null
+++ b/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-4.0-catalog.diff
@@ -0,0 +1,32 @@
+--- docbook.cat	Mon May 22 22:38:05 2000
++++ catalog	Mon May 22 22:12:36 2000
+@@ -35,29 +35,6 @@
+ PUBLIC "-//OASIS//ENTITIES DocBook Additional General Entities V4.0//EN" "dbgenent.mod"
+ PUBLIC "-//OASIS//ENTITIES DocBook Notations V4.0//EN" "dbnotn.mod"
+ PUBLIC "-//OASIS//ENTITIES DocBook Character Entities V4.0//EN" "dbcent.mod"
+-
+-  -- ...................................................................... --
+-  -- ISO entity sets ...................................................... --
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN" "iso-dia.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" "iso-num.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN" "iso-pub.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN" "iso-tech.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN" "iso-lat1.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN" "iso-lat2.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Greek Letters//EN" "iso-grk1.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Monotoniko Greek//EN" "iso-grk2.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN" "iso-grk3.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" "iso-grk4.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN" "iso-amsa.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN" "iso-amsb.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" "iso-amsc.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" "iso-amsn.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" "iso-amso.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" "iso-amsr.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN" "iso-box.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" "iso-cyr1.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" "iso-cyr2.gml"
+ 
+   -- End of catalog data for DocBook V4.0 ................................. --
+   -- ...................................................................... --
diff --git a/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-4.1-catalog.diff b/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-4.1-catalog.diff
new file mode 100644
index 000000000000..656ee333f45f
--- /dev/null
+++ b/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-4.1-catalog.diff
@@ -0,0 +1,32 @@
+--- docbook.cat	Mon May 22 22:38:05 2000
++++ catalog	Mon May 22 22:12:36 2000
+@@ -35,29 +35,6 @@
+ PUBLIC "-//OASIS//ENTITIES DocBook Additional General Entities V4.1//EN" "dbgenent.mod"
+ PUBLIC "-//OASIS//ENTITIES DocBook Notations V4.1//EN" "dbnotn.mod"
+ PUBLIC "-//OASIS//ENTITIES DocBook Character Entities V4.1//EN" "dbcent.mod"
+-
+-  -- ...................................................................... --
+-  -- ISO entity sets ...................................................... --
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN" "iso-dia.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" "iso-num.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN" "iso-pub.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN" "iso-tech.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN" "iso-lat1.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN" "iso-lat2.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Greek Letters//EN" "iso-grk1.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Monotoniko Greek//EN" "iso-grk2.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN" "iso-grk3.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" "iso-grk4.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN" "iso-amsa.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN" "iso-amsb.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" "iso-amsc.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" "iso-amsn.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" "iso-amso.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" "iso-amsr.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN" "iso-box.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" "iso-cyr1.gml"
+-PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" "iso-cyr2.gml"
+ 
+   -- End of catalog data for DocBook V4.1 ................................. --
+   -- ...................................................................... --
diff --git a/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-4.2-catalog.diff b/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-4.2-catalog.diff
new file mode 100644
index 000000000000..d9b232fd8115
--- /dev/null
+++ b/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-4.2-catalog.diff
@@ -0,0 +1,78 @@
+diff -uNr 4.2/docbook.cat 4.2-gentoo/docbook.cat
+--- 4.2/docbook.cat	2002-07-18 00:14:28.000000000 +0800
++++ 4.2-gentoo/docbook.cat	2003-01-18 22:25:05.000000000 +0800
+@@ -19,6 +19,8 @@
+   -- ...................................................................... --
+   -- DocBook driver file .................................................. --
+ 
++DTDDECL "-//OASIS//DTD DocBook V4.2//EN" "docbook.dcl"
++
+ PUBLIC "-//OASIS//DTD DocBook V4.2//EN"
+        "docbook.dtd"
+ 
+@@ -49,65 +51,5 @@
+ PUBLIC "-//OASIS//ENTITIES DocBook Character Entities V4.2//EN"
+        "dbcentx.mod"
+ 
+-  -- ...................................................................... --
+-  -- ISO entity sets ...................................................... --
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN"
+-       "iso-dia.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN"
+-       "iso-num.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN"
+-       "iso-pub.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN"
+-       "iso-tech.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN"
+-       "iso-lat1.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN"
+-       "iso-lat2.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Greek Letters//EN"
+-       "iso-grk1.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Monotoniko Greek//EN"
+-       "iso-grk2.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN"
+-       "iso-grk3.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN"
+-       "iso-grk4.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN"
+-       "iso-amsa.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN"
+-       "iso-amsb.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN"
+-       "iso-amsc.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN"
+-       "iso-amsn.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN"
+-       "iso-amso.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN"
+-       "iso-amsr.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN"
+-       "iso-box.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Russian Cyrillic//EN"
+-       "iso-cyr1.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN"
+-       "iso-cyr2.gml"
+-
+   -- End of catalog data for DocBook V4.2 ................................. --
+   -- ...................................................................... --
diff --git a/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-4.3-catalog.diff b/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-4.3-catalog.diff
new file mode 100644
index 000000000000..ce532355e4a7
--- /dev/null
+++ b/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-4.3-catalog.diff
@@ -0,0 +1,77 @@
+--- docbook.cat	2004-03-31 20:44:16.000000000 +0900
++++ docbook.cat-gentoo	2004-10-17 20:37:51.000000000 +0900
+@@ -19,6 +19,8 @@
+   -- ...................................................................... --
+   -- DocBook driver file .................................................. --
+ 
++DTDDECL "-//OASIS//DTD DocBook V4.3//EN" "docbook.dcl"
++
+ PUBLIC "-//OASIS//DTD DocBook V4.3//EN"
+        "docbook.dtd"
+ 
+@@ -49,65 +51,5 @@
+ PUBLIC "-//OASIS//ENTITIES DocBook Character Entities V4.3//EN"
+        "dbcentx.mod"
+ 
+-  -- ...................................................................... --
+-  -- ISO entity sets ...................................................... --
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN"
+-       "iso-dia.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN"
+-       "iso-num.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN"
+-       "iso-pub.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN"
+-       "iso-tech.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN"
+-       "iso-lat1.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN"
+-       "iso-lat2.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Greek Letters//EN"
+-       "iso-grk1.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Monotoniko Greek//EN"
+-       "iso-grk2.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN"
+-       "iso-grk3.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN"
+-       "iso-grk4.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN"
+-       "iso-amsa.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN"
+-       "iso-amsb.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN"
+-       "iso-amsc.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN"
+-       "iso-amsn.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN"
+-       "iso-amso.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN"
+-       "iso-amsr.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN"
+-       "iso-box.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Russian Cyrillic//EN"
+-       "iso-cyr1.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN"
+-       "iso-cyr2.gml"
+-
+   -- End of catalog data for DocBook V4.3 ................................. --
+   -- ...................................................................... --
diff --git a/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-4.4-catalog.diff b/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-4.4-catalog.diff
new file mode 100644
index 000000000000..5c16801a0902
--- /dev/null
+++ b/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-4.4-catalog.diff
@@ -0,0 +1,77 @@
+--- docbook.cat	2005-01-27 08:59:49.000000000 -0500
++++ docbook.cat-gentoo	2005-07-11 21:12:28.000000000 -0500
+@@ -19,6 +19,8 @@
+   -- ...................................................................... --
+   -- DocBook driver file .................................................. --
+ 
++DTDDECL "-//OASIS//DTD DocBook V4.4//EN" "docbook.dcl"
++
+ PUBLIC "-//OASIS//DTD DocBook V4.4//EN"
+        "docbook.dtd"
+ 
+@@ -52,65 +54,5 @@
+ PUBLIC "-//OASIS//ENTITIES DocBook Character Entities V4.4//EN"
+        "dbcentx.mod"
+ 
+-  -- ...................................................................... --
+-  -- ISO entity sets ...................................................... --
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN"
+-       "iso-dia.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN"
+-       "iso-num.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN"
+-       "iso-pub.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN"
+-       "iso-tech.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN"
+-       "iso-lat1.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN"
+-       "iso-lat2.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Greek Letters//EN"
+-       "iso-grk1.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Monotoniko Greek//EN"
+-       "iso-grk2.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN"
+-       "iso-grk3.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN"
+-       "iso-grk4.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN"
+-       "iso-amsa.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN"
+-       "iso-amsb.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN"
+-       "iso-amsc.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN"
+-       "iso-amsn.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN"
+-       "iso-amso.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN"
+-       "iso-amsr.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN"
+-       "iso-box.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Russian Cyrillic//EN"
+-       "iso-cyr1.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN"
+-       "iso-cyr2.gml"
+-
+   -- End of catalog data for DocBook V4.4 ................................. --
+   -- ...................................................................... --
diff --git a/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-4.5-catalog.diff b/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-4.5-catalog.diff
new file mode 100644
index 000000000000..b7405283f88a
--- /dev/null
+++ b/app-text/docbook-sgml-dtd/files/docbook-sgml-dtd-4.5-catalog.diff
@@ -0,0 +1,79 @@
+diff -NurdB docbook-sgml-dtd/docbook.cat docbook-sgml-dtd_patch/docbook.cat
+--- docbook-sgml-dtd/docbook.cat	2006-10-03 15:27:50.000000000 +0200
++++ docbook-sgml-dtd_patch/docbook.cat	2007-08-14 00:43:31.485987458 +0200
+@@ -19,6 +19,8 @@
+   -- ...................................................................... --
+   -- DocBook driver file .................................................. --
+ 
++DTDDECL "-//OASIS//DTD DocBook V4.5//EN" "docbook.dcl"
++
+ PUBLIC "-//OASIS//DTD DocBook V4.5//EN"
+        "docbook.dtd"
+ 
+@@ -52,65 +54,7 @@
+ PUBLIC "-//OASIS//ENTITIES DocBook Character Entities V4.5//EN"
+        "dbcentx.mod"
+ 
+-  -- ...................................................................... --
+-  -- ISO entity sets ...................................................... --
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN"
+-       "iso-dia.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN"
+-       "iso-num.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN"
+-       "iso-pub.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN"
+-       "iso-tech.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN"
+-       "iso-lat1.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN"
+-       "iso-lat2.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Greek Letters//EN"
+-       "iso-grk1.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Monotoniko Greek//EN"
+-       "iso-grk2.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN"
+-       "iso-grk3.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN"
+-       "iso-grk4.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN"
+-       "iso-amsa.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN"
+-       "iso-amsb.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN"
+-       "iso-amsc.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN"
+-       "iso-amsn.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN"
+-       "iso-amso.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN"
+-       "iso-amsr.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN"
+-       "iso-box.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Russian Cyrillic//EN"
+-       "iso-cyr1.gml"
+-
+-PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN"
+-       "iso-cyr2.gml"
+ 
++ 
+   -- End of catalog data for DocBook V4.5 ................................. --
+   -- ...................................................................... --
diff --git a/app-text/docbook-sgml-dtd/metadata.xml b/app-text/docbook-sgml-dtd/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-text/docbook-sgml-dtd/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/app-text/docbook-sgml-utils-0.6.14-r2 b/app-text/docbook-sgml-utils-0.6.14-r2
deleted file mode 100644
index 37d1ee6df183..000000000000
--- a/app-text/docbook-sgml-utils-0.6.14-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=>=dev-lang/perl-5 app-text/docbook-dsssl-stylesheets app-text/openjade dev-perl/SGMLSpm ~app-text/docbook-xml-simple-dtd-4.1.2.4 ~app-text/docbook-xml-simple-dtd-1.0 app-text/docbook-xml-dtd ~app-text/docbook-sgml-dtd-3.0 ~app-text/docbook-sgml-dtd-3.1 ~app-text/docbook-sgml-dtd-4.0 ~app-text/docbook-sgml-dtd-4.1 ~app-text/docbook-sgml-dtd-4.2 ~app-text/docbook-sgml-dtd-4.4 jadetex? ( app-text/jadetex ) userland_GNU? ( sys-apps/which ) || ( www-client/lynx www-client/links www-client/elinks virtual/w3m ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Shell scripts to manage DocBook documents
-EAPI=5
-HOMEPAGE=https://sourceware.org/docbook-tools/
-IUSE=jadetex
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
-LICENSE=GPL-2
-RDEPEND=>=dev-lang/perl-5 app-text/docbook-dsssl-stylesheets app-text/openjade dev-perl/SGMLSpm ~app-text/docbook-xml-simple-dtd-4.1.2.4 ~app-text/docbook-xml-simple-dtd-1.0 app-text/docbook-xml-dtd ~app-text/docbook-sgml-dtd-3.0 ~app-text/docbook-sgml-dtd-3.1 ~app-text/docbook-sgml-dtd-4.0 ~app-text/docbook-sgml-dtd-4.1 ~app-text/docbook-sgml-dtd-4.2 ~app-text/docbook-sgml-dtd-4.4 jadetex? ( app-text/jadetex ) userland_GNU? ( sys-apps/which ) || ( www-client/lynx www-client/links www-client/elinks virtual/w3m )
-SLOT=0
-SRC_URI=ftp://sourceware.org/pub/docbook-tools/new-trials/SOURCES/docbook-utils-0.6.14.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1643e3a027f12e8b828cdf56bc3f22fe
diff --git a/app-text/docbook-sgml-utils/Manifest b/app-text/docbook-sgml-utils/Manifest
new file mode 100644
index 000000000000..8b6ac28da3d5
--- /dev/null
+++ b/app-text/docbook-sgml-utils/Manifest
@@ -0,0 +1,6 @@
+AUX docbook-sgml-utils-0.6.14-grep-2.7.patch 603 BLAKE2B 9b7832675ae7776e25c2a7690d657418b9ed6075a3bea64a4ee75f199bbf7eb8224b49a18fd73b7335663170baef7867d667fb2a958bc72a126210562aecd309 SHA512 c574c31a746c016e10cfd7691486b5ddabaa66cfb2350db403b66c8e82e03be590ca12de5f64da5f0ffdde4355d652a7df53d912ad1d10ddbc147c301232176b
+AUX docbook-utils-0.6.14-elinks.patch 445 BLAKE2B e4e64e0cdc22dec01bc96ce5ae0b73c8e080f2d64bdd0cdecb86618bd6e46e2b00fc076570b26bb16490a47ed9d83ba28e630ecf95c00166ce12ab31b4b40f0b SHA512 67985be1ef2cea086a1029ebce17edbb9508e9b8498cdb304cde71ca3a58a48c461c9a1ff5ec83758864c67cdbc4fa7e414270a7783a41b8cfe95f0526e00f42
+AUX docbook-utils-0.6.14-prefix.patch 3055 BLAKE2B f8b7f5ffa47d0a1d18fcf9ef66dae9db74b30086bed3a6d3900e73f83dda660c6abedf697f71e51f9b5145751bae2d461ace626a7336f95e95b284468ed50857 SHA512 c4f95b8507070dda4ed102c45e6b8fe40172a2a5d8b041259903f46c3bedb351d85924810cb9bae3073b674ec8b39bd86d5f570c8c28c8100134f62abb59c1a8
+DIST docbook-utils-0.6.14.tar.gz 124998 BLAKE2B c0ae31adbbbf78732362638bdc73638cd67205b4ce2b2ac4e740334fd230c8cb031e5ba3ee9e34110c48ea42115f2f5f4dab4b4b6dd45d963976d2b48d7836a2 SHA512 8052316a643b5eaa6c0373a9ed7f2406e7c3cb3da9d3c955a271c89813a8f3196fcd9e6c8385c7b6b7ecb916515e3ec7897aece4473989f0e4dc52a2bc8bbfdf
+EBUILD docbook-sgml-utils-0.6.14-r2.ebuild 1909 BLAKE2B 75a5d7f4e6c773bd3c2cda8c6879f176df05d9818a3f0e3b3745a4531d42096148b705d80b0c375a67919c5cc0c72badf6f9fae901cc9d8d19a3a5d0a7f914a7 SHA512 3c7960d9d6a12ab50b0e735531b2ff4bdbc15a7a8548fb8b4c6a1e6a2f70a7533a4b65e6e83cb6a15196ef5490d6e763c562ecd7afd84ed599febf4025fdd6a7
+MISC metadata.xml 328 BLAKE2B 03a0d4494de5507fcbddbcaf14fd0da4002abe3ae6c00ec8afd922f0f8034eeb1c3918fa7662da1d3c2016b1ce22980dde08c59d74cbbf3489e6eba3ff434867 SHA512 258243842db06c12a0751afd612ada57c02433da50c419be86dea6ed655b11120e30b8299228bbb81b6efda1574915d69933c4cda8bc9b0ad79c506a6172bb06
diff --git a/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r2.ebuild b/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r2.ebuild
new file mode 100644
index 000000000000..71a101d90125
--- /dev/null
+++ b/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r2.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils autotools prefix
+
+MY_PN=${PN/-sgml/}
+MY_P=${MY_PN}-${PV}
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="Shell scripts to manage DocBook documents"
+HOMEPAGE="https://sourceware.org/docbook-tools/"
+SRC_URI="ftp://sourceware.org/pub/docbook-tools/new-trials/SOURCES/${MY_P}.tar.gz"
+
+LICENSE="GPL-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 ~x86-macos"
+IUSE="jadetex"
+
+DEPEND=">=dev-lang/perl-5
+	app-text/docbook-dsssl-stylesheets
+	app-text/openjade
+	dev-perl/SGMLSpm
+	~app-text/docbook-xml-simple-dtd-4.1.2.4
+	~app-text/docbook-xml-simple-dtd-1.0
+	app-text/docbook-xml-dtd
+	~app-text/docbook-sgml-dtd-3.0
+	~app-text/docbook-sgml-dtd-3.1
+	~app-text/docbook-sgml-dtd-4.0
+	~app-text/docbook-sgml-dtd-4.1
+	~app-text/docbook-sgml-dtd-4.2
+	~app-text/docbook-sgml-dtd-4.4
+	jadetex? ( app-text/jadetex )
+	userland_GNU? ( sys-apps/which )
+	|| (
+		www-client/lynx
+		www-client/links
+		www-client/elinks
+		virtual/w3m )"
+RDEPEND="${DEPEND}"
+
+# including both xml-simple-dtd 4.1.2.4 and 1.0, to ease
+# transition to simple-dtd 1.0, <obz@gentoo.org>
+
+src_prepare() {
+	epatch "${FILESDIR}"/${MY_P}-elinks.patch
+	epatch "${FILESDIR}"/${P}-grep-2.7.patch
+	if use prefix; then
+		epatch "${FILESDIR}"/${MY_P}-prefix.patch
+		eprefixify doc/{man,HTML}/Makefile.am bin/jw.in backends/txt configure.in
+		eautoreconf
+	fi
+}
+
+src_install() {
+	make DESTDIR="${D}" \
+		htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		install || die "Installation failed"
+
+	if ! use jadetex ; then
+		for i in dvi pdf ps ; do
+			rm "${ED}"/usr/bin/docbook2$i || die
+			rm "${ED}"/usr/share/sgml/docbook/utils-${PV}/backends/$i || die
+			rm "${ED}"/usr/share/man/man1/docbook2$i.1 || die
+		done
+	fi
+	dodoc AUTHORS ChangeLog NEWS README TODO
+}
diff --git a/app-text/docbook-sgml-utils/files/docbook-sgml-utils-0.6.14-grep-2.7.patch b/app-text/docbook-sgml-utils/files/docbook-sgml-utils-0.6.14-grep-2.7.patch
new file mode 100644
index 000000000000..490d65a0aa43
--- /dev/null
+++ b/app-text/docbook-sgml-utils/files/docbook-sgml-utils-0.6.14-grep-2.7.patch
@@ -0,0 +1,17 @@
+Fix wrong charakter classes no longer missinterpreted by grep-2.7
+Michael Weber <xmw@gentoo.org>
+
+--- docbook-utils-0.6.14/bin/jw.in
++++ docbook-utils-0.6.14/bin/jw.in
+@@ -80,9 +80,9 @@
+ SGML_CATALOGS_DIR="/etc/sgml"
+ if [ -f "$SGML_CONF" ]
+ then
+-  RE='^[:space:]*SGML_BASE_DIR[:space:]*=[:space:]*'
++  RE='^[[:space:]]*SGML_BASE_DIR[[:space:]]*=[[:space:]]*'
+   SGML_BASE_DIR=`grep $RE $SGML_CONF | sed "s/$RE//"`
+-  RE='^[:space:]*SGML_CATALOGS_DIR[:space:]*=[:space:]*'
++  RE='^[[:space:]]*SGML_CATALOGS_DIR[[:space:]]*=[[:space:]]*'
+   SGML_CATALOGS_DIR=`grep $RE $SGML_CONF | sed "s/$RE//"`
+ fi
+ 
diff --git a/app-text/docbook-sgml-utils/files/docbook-utils-0.6.14-elinks.patch b/app-text/docbook-sgml-utils/files/docbook-utils-0.6.14-elinks.patch
new file mode 100644
index 000000000000..5256570458af
--- /dev/null
+++ b/app-text/docbook-sgml-utils/files/docbook-utils-0.6.14-elinks.patch
@@ -0,0 +1,14 @@
+diff -NurdB docbook-utils-0.6.14/backends/txt docbook-utils-0.6.14-patched/backends/txt
+--- docbook-utils-0.6.14/backends/txt	2004-02-11 08:58:03.000000000 -0500
++++ docbook-utils-0.6.14-patched/backends/txt	2006-06-05 21:57:23.000000000 -0500
+@@ -10,6 +10,10 @@
+ then
+   CONVERT=/usr/bin/links
+   ARGS="-dump"
++elif [ -x /usr/bin/elinks ]
++then
++  CONVERT=/usr/bin/elinks
++  ARGS="-dump"
+ elif [ -x /usr/bin/w3m ]
+ then
+   CONVERT=/usr/bin/w3m
diff --git a/app-text/docbook-sgml-utils/files/docbook-utils-0.6.14-prefix.patch b/app-text/docbook-sgml-utils/files/docbook-utils-0.6.14-prefix.patch
new file mode 100644
index 000000000000..29906c2046ad
--- /dev/null
+++ b/app-text/docbook-sgml-utils/files/docbook-utils-0.6.14-prefix.patch
@@ -0,0 +1,90 @@
+--- doc/HTML/Makefile.am~	2007-10-08 04:13:04 +0200
++++ doc/HTML/Makefile.am	2007-10-08 04:13:34 +0200
+@@ -23,7 +23,7 @@
+ 		$(top_srcdir)/doc/refentry/docbook2texi-spec.pl.sgml \
+ 		$(top_srcdir)/doc/refentry/frontend-spec.sgml \
+ 		$(top_srcdir)/doc/refentry/sgmldiff.sgml
+-	SGML_CATALOG_FILES=/etc/sgml/catalog \
++	SGML_CATALOG_FILES=@GENTOO_PORTAGE_EPREFIX@/etc/sgml/catalog \
+ 	SGML_SEARCH_PATH=$(top_srcdir):$(top_srcdir)/doc:.. \
+ 		jade -t sgml -i html -d $(top_srcdir)/docbook-utils.dsl\#html \
+ 			-V '%use-id-as-filename%' $<
+--- doc/man/Makefile.am~	2007-10-08 04:14:16 +0200
++++ doc/man/Makefile.am	2007-10-08 04:14:29 +0200
+@@ -10,7 +10,7 @@
+ 
+ $(man1_MANS) $(man7_MANS): $(top_srcdir)/doc/docbook-utils.sgml \
+ 		$(top_srcdir)/helpers/docbook2man-spec.pl
+-	SGML_CATALOG_FILES=/etc/sgml/catalog \
++	SGML_CATALOG_FILES=@GENTOO_PORTAGE_EPREFIX@/etc/sgml/catalog \
+ 	SGML_SEARCH_PATH=$(top_srcdir)/doc:.. \
+ 		nsgmls $< | \
+ 		sgmlspl $(top_srcdir)/helpers/docbook2man-spec.pl
+--- bin/jw.in~	2007-10-08 04:27:18 +0200
++++ bin/jw.in	2007-10-08 04:28:40 +0200
+@@ -63,7 +63,7 @@
+ then
+   SGML_CONF=`sgmlwhich`
+ else
+-  SGML_CONF="/etc/sgml/sgml.conf"
++  SGML_CONF="@GENTOO_PORTAGE_EPREFIX@/etc/sgml/sgml.conf"
+ fi
+ 
+ # Set version message
+@@ -77,7 +77,7 @@
+ 
+ # Set SGML base directory and centralized catalogs directory
+ SGML_BASE_DIR="@prefix@/share/sgml"
+-SGML_CATALOGS_DIR="/etc/sgml"
++SGML_CATALOGS_DIR="@GENTOO_PORTAGE_EPREFIX@/etc/sgml"
+ if [ -f "$SGML_CONF" ]
+ then
+   RE='^[:space:]*SGML_BASE_DIR[:space:]*=[:space:]*'
+--- backends/txt~	2007-10-08 04:59:59 +0200
++++ backends/txt	2007-10-08 05:00:52 +0200
+@@ -2,21 +2,21 @@
+ # Send any comments to Eric Bischoff <eric@caldera.de>
+ # This program is under GPL license. See LICENSE file for details.
+ 
+-if [ -x /usr/bin/lynx ]
++if [ -x "@GENTOO_PORTAGE_EPREFIX@"/usr/bin/lynx ]
+ then
+-  CONVERT=/usr/bin/lynx
++  CONVERT="@GENTOO_PORTAGE_EPREFIX@"/usr/bin/lynx
+   ARGS="-force_html -dump -nolist -width=72"
+-elif [ -x /usr/bin/links ]
++elif [ -x "@GENTOO_PORTAGE_EPREFIX@"/usr/bin/links ]
+ then
+-  CONVERT=/usr/bin/links
++  CONVERT="@GENTOO_PORTAGE_EPREFIX@"/usr/bin/links
+   ARGS="-dump"
+-elif [ -x /usr/bin/elinks ]
++elif [ -x "@GENTOO_PORTAGE_EPREFIX@"/usr/bin/elinks ]
+ then
+-  CONVERT=/usr/bin/elinks
++  CONVERT="@GENTOO_PORTAGE_EPREFIX@"/usr/bin/elinks
+   ARGS="-dump"
+-elif [ -x /usr/bin/w3m ]
++elif [ -x "@GENTOO_PORTAGE_EPREFIX@"/usr/bin/w3m ]
+ then
+-  CONVERT=/usr/bin/w3m
++  CONVERT="@GENTOO_PORTAGE_EPREFIX@"/usr/bin/w3m
+   ARGS="-dump"
+ else
+   echo >&2 "No way to convert HTML to text found."
+--- configure.in~	2004-02-11 15:14:15 +0100
++++ configure.in	2007-10-14 10:40:51 +0200
+@@ -20,11 +20,11 @@
+ AC_SUBST(docdir)
+ 
+ dnl Checks for programs.
+-jade_bindirs="/usr/bin /usr/local/bin"
++jade_bindirs="@GENTOO_PORTAGE_EPREFIX@/usr/bin"
+ AC_FIND_PROGRAM(nsgmls, $jade_bindirs, jade_bindir)
+ AC_SUBST(jade_bindir)
+ 
+-perl_bindirs="/usr/bin /usr/local/bin"
++perl_bindirs="@GENTOO_PORTAGE_EPREFIX@/usr/bin"
+ AC_FIND_PROGRAM(perl, $perl_bindirs, perl_bindir)
+ AC_SUBST(perl_bindir)
+ 
diff --git a/app-text/docbook-sgml-utils/metadata.xml b/app-text/docbook-sgml-utils/metadata.xml
new file mode 100644
index 000000000000..b44d8c52bbfb
--- /dev/null
+++ b/app-text/docbook-sgml-utils/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+<use>
+    <flag name="jadetex">Add support for <pkg>app-text/jadetex</pkg>
+    (for processing tex files produced by the TeX backend of
+    Jade)</flag>
+  </use>
+</pkgmetadata>
diff --git a/app-text/docbook-sgml/Manifest b/app-text/docbook-sgml/Manifest
new file mode 100644
index 000000000000..e4d080ead1bc
--- /dev/null
+++ b/app-text/docbook-sgml/Manifest
@@ -0,0 +1,2 @@
+EBUILD docbook-sgml-1.0.ebuild 568 BLAKE2B 21830870bfdf71613c2b6e1597b93573dc4fd35a6eb072320c8981db54a350a06c6f99c3ec546b8ebc16b1d1ea3fb2af47fbba749c24d077f8d1656ce4f60dcb SHA512 be3ec3040ae17bc95db4f68cd3789d84f57ee22ea731a650de79ac961d3545c69ffbff4697886184bf68ee2ed98692bee2cdbde1df88cba5bdc7e1a6d7a8c2f1
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/docbook-sgml/docbook-sgml-1.0.ebuild b/app-text/docbook-sgml/docbook-sgml-1.0.ebuild
new file mode 100644
index 000000000000..88cf25ee6cbd
--- /dev/null
+++ b/app-text/docbook-sgml/docbook-sgml-1.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+DESCRIPTION="A helper package for sgml docbook"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 sh sparc x86"
+HOMEPAGE="http://www.docbook.org/sgml/"
+IUSE=""
+
+RDEPEND="app-text/sgml-common app-text/openjade
+	>=app-text/docbook-dsssl-stylesheets-1.64
+	>=app-text/docbook-sgml-utils-0.6.6
+	~app-text/docbook-sgml-dtd-3.0
+	~app-text/docbook-sgml-dtd-3.1
+	~app-text/docbook-sgml-dtd-4.0
+	~app-text/docbook-sgml-dtd-4.1"
diff --git a/app-text/docbook-sgml/metadata.xml b/app-text/docbook-sgml/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-text/docbook-sgml/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/app-text/docbook-xml-dtd-4.1.2-r6 b/app-text/docbook-xml-dtd-4.1.2-r6
deleted file mode 100644
index f9ffcc3de817..000000000000
--- a/app-text/docbook-xml-dtd-4.1.2-r6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prerm unpack
-DEPEND=>=app-arch/unzip-5.41 >=app-text/sgml-common-0.6.3-r2
-DESCRIPTION=Docbook DTD for XML
-EAPI=0
-HOMEPAGE=http://www.docbook.org/
-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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=docbook
-RDEPEND=>=app-text/docbook-xsl-stylesheets-1.65 >=app-text/build-docbook-catalog-1.2
-SLOT=4.1.2
-SRC_URI=http://www.docbook.org/xml/4.1.2/docbkx412.zip
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	sgml-catalog	1ca36a4ae32c67b390f310dd6d7b1189	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=af72d6a5377124583107205368340be9
diff --git a/app-text/docbook-xml-dtd-4.2-r2 b/app-text/docbook-xml-dtd-4.2-r2
deleted file mode 100644
index c2934edc045d..000000000000
--- a/app-text/docbook-xml-dtd-4.2-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prerm unpack
-DEPEND=>=app-arch/unzip-5.41 >=app-text/sgml-common-0.6.3-r2
-DESCRIPTION=Docbook DTD for XML
-EAPI=0
-HOMEPAGE=http://www.docbook.org/
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=docbook
-RDEPEND=>=app-text/docbook-xsl-stylesheets-1.65 >=app-text/build-docbook-catalog-1.2
-SLOT=4.2
-SRC_URI=http://www.docbook.org/xml/4.2/docbook-xml-4.2.zip
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	sgml-catalog	1ca36a4ae32c67b390f310dd6d7b1189	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3d9b13b79d32b5bdf6c0c3f039c602db
diff --git a/app-text/docbook-xml-dtd-4.3-r1 b/app-text/docbook-xml-dtd-4.3-r1
deleted file mode 100644
index d250a4f9fe91..000000000000
--- a/app-text/docbook-xml-dtd-4.3-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prerm unpack
-DEPEND=>=app-arch/unzip-5.41 >=app-text/sgml-common-0.6.3-r2
-DESCRIPTION=Docbook DTD for XML
-EAPI=0
-HOMEPAGE=http://www.docbook.org/
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=docbook
-RDEPEND=>=app-text/docbook-xsl-stylesheets-1.65 >=app-text/build-docbook-catalog-1.2
-SLOT=4.3
-SRC_URI=http://www.docbook.org/xml/4.3/docbook-xml-4.3.zip
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	sgml-catalog	1ca36a4ae32c67b390f310dd6d7b1189	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1917633f9409381bba25dbc650b03806
diff --git a/app-text/docbook-xml-dtd-4.4-r2 b/app-text/docbook-xml-dtd-4.4-r2
deleted file mode 100644
index f993ed7a1194..000000000000
--- a/app-text/docbook-xml-dtd-4.4-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prerm unpack
-DEPEND=>=app-arch/unzip-5.41 >=app-text/sgml-common-0.6.3-r2
-DESCRIPTION=Docbook DTD for XML
-EAPI=0
-HOMEPAGE=http://www.docbook.org/
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=docbook
-RDEPEND=>=app-text/docbook-xsl-stylesheets-1.65 >=app-text/build-docbook-catalog-1.2
-SLOT=4.4
-SRC_URI=http://www.docbook.org/xml/4.4/docbook-xml-4.4.zip
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	sgml-catalog	1ca36a4ae32c67b390f310dd6d7b1189	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6a7c1fe910b0b41dea38d2e87ba68a29
diff --git a/app-text/docbook-xml-dtd-4.5-r1 b/app-text/docbook-xml-dtd-4.5-r1
deleted file mode 100644
index 7f8697d6e9ab..000000000000
--- a/app-text/docbook-xml-dtd-4.5-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prerm unpack
-DEPEND=>=app-arch/unzip-5.41 >=dev-libs/libxml2-2.4 >=app-text/docbook-xsl-stylesheets-1.65 >=app-text/build-docbook-catalog-1.2 >=app-text/sgml-common-0.6.3-r2
-DESCRIPTION=Docbook DTD for XML
-EAPI=0
-HOMEPAGE=http://www.docbook.org/
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=docbook
-SLOT=4.5
-SRC_URI=http://www.docbook.org/xml/4.5/docbook-xml-4.5.zip
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	sgml-catalog	1ca36a4ae32c67b390f310dd6d7b1189	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=df9d4f2b4475cf3c7f2851c08f11afa5
diff --git a/app-text/docbook-xml-dtd/Manifest b/app-text/docbook-xml-dtd/Manifest
new file mode 100644
index 000000000000..01186e8ac2cc
--- /dev/null
+++ b/app-text/docbook-xml-dtd/Manifest
@@ -0,0 +1,11 @@
+DIST docbkx412.zip 75683 BLAKE2B 1304162d4f432e2f08990d0d3f58d873f7a8782fe5b4e3d6838ffed4ac85fd614a4dd64dca5d2b69f118dea91117d0da288f6db7c89180f730032ba140280d2e SHA512 f700591a671694ca0ac51f5b5b7e825df5c0b3604b20baa6afd3aaafa7ce99470ca1c261781b105b42bfa5485c23217cf3db821b3fcf2ebdae9df07bb8ae4063
+DIST docbook-xml-4.2.zip 78428 BLAKE2B 542a2b658a10e0eee4928666a2edbdbff12e96dbc02802ed2793a81bdb9c4cd0c61b0a11565d83fa42922c72f805ba35473bf98278b9112b93e42a61bc04aeeb SHA512 0c836346130d1e8f4e26e00959f6b4fd2c3c11269ba5cbf11cdc904724e189606f431c99cd5ab188877daa0eb44c58d0bc30556df3b51df480396818d61c4e0a
+DIST docbook-xml-4.3.zip 83865 BLAKE2B d231a6e6ba3d8023d83358080d136880a5d65b4b3b135b2f60e3a784d2f2231d12e1e9d1b5284a7d3fa1b9281466591e0438adbf6160d33732e3611f5c58f21b SHA512 f5090fb74884bae3d4fac8a3c5060bffff5d6a74272de183c181a7642e4b91f4ed32ad028537d198010782c3d98575ce679672f76a9749ed124432195886a7cb
+DIST docbook-xml-4.4.zip 96107 BLAKE2B 3616c20758de6c14e08f2a9b32682da33be741153d4586c8062d6ff895f0158decc188c5e1db4f0caafbea14afb139e39bd6805842f7bedc18f0770d22e0d2d3 SHA512 7df5af4df24e4618b09814e4e20c147c722962531f03a40c28cd60f1db16b4c330420adf96adb7d66ed6eda84046ee91b467fd6f6fbfac2201537e2080735d76
+DIST docbook-xml-4.5.zip 98497 BLAKE2B 3487f4488a9e3dbc3e366d63b61940727287a97f4e0ee2d2dda031cbba96cd4d85e5b729b7ee4d32e8a6842748fc688f85c94e1a0ab2f7ebc062dd8c7b800e20 SHA512 1ee282fe86c9282610ee72c0e1d1acfc03f1afb9dc67166f438f2703109046479edb6329313ecb2949db27993077e077d111501c10b8769ebb20719eb6213d27
+EBUILD docbook-xml-dtd-4.1.2-r6.ebuild 1360 BLAKE2B 1a788f3d9a0bbb2828dcdd8661d29845ca885bcc82b4de3715de6ef515e5861747e9aaf2a6942afc7182b1c8fba6c46ed36097ce583823babcac1a886a5ae1cf SHA512 292e22ee2c56ca3a19437774cee409ae6b1e4153a7d17902e9c12242768984dce1514ac3caa657298d49591a4bc88fd988463c01fed43ebf6ba7d7f19cac65c4
+EBUILD docbook-xml-dtd-4.2-r2.ebuild 1339 BLAKE2B 09d9e31aa0a859abc11aceeab5dea1806f8eba26cf52ad79a2355cb49b246e5d900799180d2e96b0b67c7a0f4f8e38064c4cf061f0db17bdefbc544dcf985abe SHA512 3a9304d3fad564f154a317641fc7173c16cc69572127a891a4d3c1c8465ff26cacedd3243d19eb329309252120610ed57c8154ce91d00b0791a5ec0a8778b398
+EBUILD docbook-xml-dtd-4.3-r1.ebuild 1356 BLAKE2B 366c732f8f42cf1b4601f7494ccdd632692e49f9995306eb0dd0827c146c8f820385107092030e99c91d773e999fa9be3a9bed13092f4f5c3128fdf3d2c3619c SHA512 c00cde0d71964d449563affaba36ec535343fa13d80b43578cd6362fe30afc9d1b49398e27ec1cba265c76eb4f556df2136870022c8fa97e6e8c470f6b7e4a0b
+EBUILD docbook-xml-dtd-4.4-r2.ebuild 1538 BLAKE2B d212965364a5b787f5c2b7087f1f1785776d1e6151e3cf6f7301b9b51c16656f7f99bce560f085c8b82ddb2b02b4476e8ec0c82cbe654bb84a5c25c7a59b3254 SHA512 80eb507425ea2109809d4353fdce2bc3386d73bf7ab7a6e4a227e381cbee41fee6857b1bc34d5900e5b3f6aab24aa91badc51ec5c09aaa923649372bd126c727
+EBUILD docbook-xml-dtd-4.5-r1.ebuild 1573 BLAKE2B 26913c0e0936b3fb8d2d4ef04544f0cae2764e68f63cb5be1bed08fa9ca25e255055f59b3cc19a73883dd3e88cac4d2e1fa98b9efaa0f0c5079b6ae7552f5a81 SHA512 9a82340165608df94d352c6802e90ee4d2a935b717aed27839064fe59c26ff8b2f4fc8e5ff21a478307676696c2d055488ffeb0a7833c1f329179330e471080d
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r6.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r6.ebuild
new file mode 100644
index 000000000000..17ce4acda401
--- /dev/null
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r6.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+inherit sgml-catalog
+
+MY_P="docbkx412"
+DESCRIPTION="Docbook DTD for XML"
+HOMEPAGE="http://www.docbook.org/"
+SRC_URI="http://www.docbook.org/xml/${PV}/${MY_P}.zip"
+
+LICENSE="docbook"
+SLOT="${PV}"
+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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND=">=app-text/docbook-xsl-stylesheets-1.65
+	>=app-text/build-docbook-catalog-1.2"
+DEPEND=">=app-arch/unzip-5.41"
+
+sgml-catalog_cat_include "/etc/sgml/xml-docbook-${PV}.cat" \
+	"/etc/sgml/sgml-docbook.cat"
+sgml-catalog_cat_include "/etc/sgml/xml-docbook-${PV}.cat" \
+	"/usr/share/sgml/docbook/xml-dtd-${PV}/docbook.cat"
+
+S=${WORKDIR}
+
+src_unpack() {
+	unpack ${A}
+
+	# Prepend OVERRIDE directive
+	sed -i -e '1i\\OVERRIDE YES' docbook.cat
+}
+
+src_install() {
+	keepdir /etc/xml
+
+	insinto /usr/share/sgml/docbook/xml-dtd-${PV}
+	doins *.cat *.dtd *.mod || die
+	insinto /usr/share/sgml/docbook/xml-dtd-${PV}/ent
+	doins ent/*.ent || die
+
+	dodoc ChangeLog *.txt
+}
+
+pkg_postinst() {
+	build-docbook-catalog
+	sgml-catalog_pkg_postinst
+}
+
+pkg_postrm() {
+	build-docbook-catalog
+	sgml-catalog_pkg_postrm
+}
diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r2.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r2.ebuild
new file mode 100644
index 000000000000..3671d422a054
--- /dev/null
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+inherit sgml-catalog
+
+MY_P=${P/-dtd/}
+DESCRIPTION="Docbook DTD for XML"
+HOMEPAGE="http://www.docbook.org/"
+SRC_URI="http://www.docbook.org/xml/${PV}/${MY_P}.zip"
+
+LICENSE="docbook"
+SLOT="${PV}"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND=">=app-text/docbook-xsl-stylesheets-1.65
+	>=app-text/build-docbook-catalog-1.2"
+DEPEND=">=app-arch/unzip-5.41"
+
+sgml-catalog_cat_include "/etc/sgml/xml-docbook-${PV}.cat" \
+	"/etc/sgml/sgml-docbook.cat"
+sgml-catalog_cat_include "/etc/sgml/xml-docbook-${PV}.cat" \
+	"/usr/share/sgml/docbook/xml-dtd-${PV}/docbook.cat"
+
+S=${WORKDIR}
+
+src_unpack() {
+	unpack ${A}
+
+	# Prepend OVERRIDE directive
+	sed -i -e '1i\\OVERRIDE YES' docbook.cat
+}
+
+src_install() {
+	keepdir /etc/xml
+
+	insinto /usr/share/sgml/docbook/xml-dtd-${PV}
+	doins *.cat *.dtd *.mod || die
+	insinto /usr/share/sgml/docbook/xml-dtd-${PV}/ent
+	doins ent/*.ent || die
+
+	dodoc ChangeLog README
+}
+
+pkg_postinst() {
+	build-docbook-catalog
+	sgml-catalog_pkg_postinst
+}
+
+pkg_postrm() {
+	build-docbook-catalog
+	sgml-catalog_pkg_postrm
+}
diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.3-r1.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.3-r1.ebuild
new file mode 100644
index 000000000000..7528a2e56d70
--- /dev/null
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.3-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+inherit sgml-catalog
+
+MY_P=${P/-dtd/}
+DESCRIPTION="Docbook DTD for XML"
+HOMEPAGE="http://www.docbook.org/"
+SRC_URI="http://www.docbook.org/xml/${PV}/${MY_P}.zip"
+
+LICENSE="docbook"
+SLOT="${PV}"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND=">=app-text/docbook-xsl-stylesheets-1.65
+	>=app-text/build-docbook-catalog-1.2"
+DEPEND=">=app-arch/unzip-5.41"
+
+sgml-catalog_cat_include "/etc/sgml/xml-docbook-${PV}.cat" \
+	"/etc/sgml/sgml-docbook.cat"
+sgml-catalog_cat_include "/etc/sgml/xml-docbook-${PV}.cat" \
+	"/usr/share/sgml/docbook/xml-dtd-${PV}/docbook.cat"
+
+S=${WORKDIR}
+
+src_unpack() {
+	unpack ${A}
+
+	# Prepend OVERRIDE directive
+	sed -i -e '1i\\OVERRIDE YES' docbook.cat
+}
+
+src_install() {
+	keepdir /etc/xml
+
+	insinto /usr/share/sgml/docbook/xml-dtd-${PV}
+	doins *.cat *.dtd *.mod || die
+	insinto /usr/share/sgml/docbook/xml-dtd-${PV}/ent
+	doins ent/*.ent || die
+
+	dodoc ChangeLog README
+}
+
+pkg_postinst() {
+	build-docbook-catalog
+	sgml-catalog_pkg_postinst
+}
+
+pkg_postrm() {
+	build-docbook-catalog
+	sgml-catalog_pkg_postrm
+}
diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r2.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r2.ebuild
new file mode 100644
index 000000000000..5e5d183af461
--- /dev/null
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+inherit sgml-catalog
+
+MY_P=${P/-dtd/}
+DESCRIPTION="Docbook DTD for XML"
+HOMEPAGE="http://www.docbook.org/"
+SRC_URI="http://www.docbook.org/xml/${PV}/${MY_P}.zip"
+
+LICENSE="docbook"
+SLOT="${PV}"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND=">=app-text/docbook-xsl-stylesheets-1.65
+	>=app-text/build-docbook-catalog-1.2"
+DEPEND=">=app-arch/unzip-5.41"
+
+sgml-catalog_cat_include "/etc/sgml/xml-docbook-${PV}.cat" \
+	"/etc/sgml/sgml-docbook.cat"
+sgml-catalog_cat_include "/etc/sgml/xml-docbook-${PV}.cat" \
+	"/usr/share/sgml/docbook/xml-dtd-${PV}/docbook.cat"
+
+S=${WORKDIR}
+
+src_unpack() {
+	unpack ${A}
+
+	# Prepend OVERRIDE directive
+	sed -i -e '1i\\OVERRIDE YES' docbook.cat
+}
+
+src_install() {
+	keepdir /etc/xml
+
+	insinto /usr/share/sgml/docbook/xml-dtd-${PV}
+	doins *.cat *.dtd *.mod *.xml || die
+	insinto /usr/share/sgml/docbook/xml-dtd-${PV}/ent
+	doins ent/*.ent || die
+
+	# work around unicode parser issues #238785
+	dosym ../../../xml-iso-entities-8879.1986/ISOgrk4.ent \
+		/usr/share/sgml/docbook/xml-dtd-${PV}/ent/isogrk4.ent || die
+
+	cp ent/README README.ent
+	dodoc ChangeLog README*
+}
+
+pkg_postinst() {
+	build-docbook-catalog
+	sgml-catalog_pkg_postinst
+}
+
+pkg_postrm() {
+	build-docbook-catalog
+	sgml-catalog_pkg_postrm
+}
diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.5-r1.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.5-r1.ebuild
new file mode 100644
index 000000000000..134c00d770df
--- /dev/null
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.5-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+inherit sgml-catalog
+
+MY_P=${P/-dtd/}
+DESCRIPTION="Docbook DTD for XML"
+HOMEPAGE="http://www.docbook.org/"
+SRC_URI="http://www.docbook.org/xml/${PV}/${MY_P}.zip"
+
+LICENSE="docbook"
+SLOT="${PV}"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND=""
+DEPEND=">=app-arch/unzip-5.41
+	>=dev-libs/libxml2-2.4
+	>=app-text/docbook-xsl-stylesheets-1.65
+	>=app-text/build-docbook-catalog-1.2"
+
+sgml-catalog_cat_include "/etc/sgml/xml-docbook-${PV}.cat" \
+	"/etc/sgml/sgml-docbook.cat"
+sgml-catalog_cat_include "/etc/sgml/xml-docbook-${PV}.cat" \
+	"/usr/share/sgml/docbook/xml-dtd-${PV}/docbook.cat"
+
+S=${WORKDIR}
+
+src_unpack() {
+	unpack ${A}
+
+	# Prepend OVERRIDE directive
+	sed -i -e '1i\\OVERRIDE YES' docbook.cat
+}
+
+src_install() {
+	keepdir /etc/xml
+
+	insinto /usr/share/sgml/docbook/xml-dtd-${PV}
+	doins *.cat *.dtd *.mod *.xml || die
+	insinto /usr/share/sgml/docbook/xml-dtd-${PV}/ent
+	doins ent/*.ent || die
+
+	# work around unicode parser issues #238785
+	dosym ../../../xml-iso-entities-8879.1986/ISOgrk4.ent \
+		/usr/share/sgml/docbook/xml-dtd-${PV}/ent/isogrk4.ent || die
+
+	cp ent/README README.ent
+	dodoc ChangeLog README*
+}
+
+pkg_postinst() {
+	build-docbook-catalog
+	sgml-catalog_pkg_postinst
+}
+
+pkg_postrm() {
+	build-docbook-catalog
+	sgml-catalog_pkg_postrm
+}
diff --git a/app-text/docbook-xml-dtd/metadata.xml b/app-text/docbook-xml-dtd/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-text/docbook-xml-dtd/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/app-text/docbook-xml-simple-dtd-1.0-r1 b/app-text/docbook-xml-simple-dtd-1.0-r1
deleted file mode 100644
index f89e2d72b382..000000000000
--- a/app-text/docbook-xml-simple-dtd-1.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prerm unpack
-DEPEND=>=app-arch/unzip-5.41 dev-libs/libxml2 >=app-text/sgml-common-0.6.3-r2
-DESCRIPTION=Simplified Docbook DTD for XML
-EAPI=0
-HOMEPAGE=http://www.oasis-open.org/docbook/
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris
-LICENSE=docbook
-RDEPEND=dev-libs/libxml2
-SLOT=1.0
-SRC_URI=http://www.oasis-open.org/docbook/xml/simple/1.0/docbook-simple-1.0.zip
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	sgml-catalog	1ca36a4ae32c67b390f310dd6d7b1189	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c3ae5a4d1d16fc460585e698e38344c6
diff --git a/app-text/docbook-xml-simple-dtd-1.0-r2 b/app-text/docbook-xml-simple-dtd-1.0-r2
deleted file mode 100644
index 0059a36e5a73..000000000000
--- a/app-text/docbook-xml-simple-dtd-1.0-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prerm unpack
-DEPEND=>=app-arch/unzip-5.41 >=app-text/sgml-common-0.6.3-r2
-DESCRIPTION=Simplified Docbook DTD for XML
-EAPI=0
-HOMEPAGE=http://www.oasis-open.org/docbook/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris
-LICENSE=docbook
-RDEPEND=>=app-text/build-docbook-catalog-1.6
-SLOT=1.0
-SRC_URI=http://www.oasis-open.org/docbook/xml/simple/1.0/docbook-simple-1.0.zip
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	sgml-catalog	1ca36a4ae32c67b390f310dd6d7b1189	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=224f25c99d4c4b3923228100bceb5106
diff --git a/app-text/docbook-xml-simple-dtd-4.1.2.4-r2 b/app-text/docbook-xml-simple-dtd-4.1.2.4-r2
deleted file mode 100644
index fa6724f20d7f..000000000000
--- a/app-text/docbook-xml-simple-dtd-4.1.2.4-r2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prerm unpack
-DEPEND=>=app-arch/unzip-5.41 >=app-text/sgml-common-0.6.3-r2
-DESCRIPTION=Docbook DTD for XML
-EAPI=0
-HOMEPAGE=http://www.oasis-open.org/docbook/
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris
-LICENSE=docbook
-SLOT=0
-SRC_URI=mirror://gentoo/sdb4124.zip
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	sgml-catalog	1ca36a4ae32c67b390f310dd6d7b1189	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2513edb93fe9544e484c01eba3fde704
diff --git a/app-text/docbook-xml-simple-dtd-4.1.2.4-r3 b/app-text/docbook-xml-simple-dtd-4.1.2.4-r3
deleted file mode 100644
index 0be7af97a4dc..000000000000
--- a/app-text/docbook-xml-simple-dtd-4.1.2.4-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prerm unpack
-DEPEND=>=app-arch/unzip-5.41 >=app-text/sgml-common-0.6.3-r2
-DESCRIPTION=Docbook DTD for XML
-EAPI=0
-HOMEPAGE=http://www.oasis-open.org/docbook/
-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 ~x86-macos ~sparc-solaris
-LICENSE=docbook
-RDEPEND=>=app-text/build-docbook-catalog-1.6
-SLOT=0
-SRC_URI=mirror://gentoo/sdb4124.zip
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	sgml-catalog	1ca36a4ae32c67b390f310dd6d7b1189	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c8ef99aac1d7ef71c9a19c1cd7dea8fb
diff --git a/app-text/docbook-xml-simple-dtd-4.1.2.5-r2 b/app-text/docbook-xml-simple-dtd-4.1.2.5-r2
deleted file mode 100644
index 1545a757ec27..000000000000
--- a/app-text/docbook-xml-simple-dtd-4.1.2.5-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prerm unpack
-DEPEND=>=app-arch/unzip-5.41 >=app-text/sgml-common-0.6.3-r2
-DESCRIPTION=Simplified Docbook DTD for XML
-EAPI=0
-HOMEPAGE=http://www.oasis-open.org/docbook/xml/simple/4.1.2.5/
-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 ~x86-macos ~sparc-solaris
-LICENSE=docbook
-RDEPEND=>=app-text/build-docbook-catalog-1.6
-SLOT=4.1.2.5
-SRC_URI=http://www.nwalsh.com/docbook/simple/4.1.2.5/simple4125.zip
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	sgml-catalog	1ca36a4ae32c67b390f310dd6d7b1189	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=cb04f0ca6f6b6ae4c706c619f27469f6
diff --git a/app-text/docbook-xml-simple-dtd/Manifest b/app-text/docbook-xml-simple-dtd/Manifest
new file mode 100644
index 000000000000..8d9228f845d8
--- /dev/null
+++ b/app-text/docbook-xml-simple-dtd/Manifest
@@ -0,0 +1,12 @@
+AUX docbook-xml-simple-dtd-1.0.cat 428 BLAKE2B ca3139b31f4f83727cb4a5c6927ae2ba7c0aa9731e4095ba67102a310fed93be697ceecb8f635217cc8fb7bb38371474670756e5d5c8cabe86b22caac4475fa1 SHA512 c03796d8ee68d024e9ab2cbbb87c3bc1d680555b410bbf0293bc6649bd433f961a490dbc3a27aaf984cc86df35e29e6752a67d2f589e8070fe0aa3c22b328436
+AUX docbook-xml-simple-dtd-4.1.2.4.catalog 1728 BLAKE2B 4b8bc8131bf064df1bd07e82acb8eecc4486330635e4c345692551ab01ac7bc96009ed142c38cf88dd7631ac1ef09a2d45c99de0418d1973af50b7a1ff3e28ac SHA512 a233642906efc9534a14abf9427c8d2b2726e84419f221091fd2cb939e33b9a4f405de7b3ae1d3bccd292eb11ccfb6b494e3d321bacabab41f50b6a3441e1d65
+AUX docbook-xml-simple-dtd-4.1.2.5.catalog 1728 BLAKE2B a5ba21fb9f622b7427adf1429345155a09387ef2c9db9f8f9d4d895ebaf168b9e773c830e18afae87a27cd2af38ac9b4bee36f43d7c5df905589bcd01796c1ad SHA512 b1c66124c982febb3f59d44e157d0f3affd15d069e7daa9a138f1e32aa4283024bc14831cda34b40ecc19242c80bc4d3b111fbfadf1659ea652d1e3d7b1e9085
+DIST docbook-simple-1.0.zip 31173 BLAKE2B b19054783553be68eaa2a689cb673bb4a270f546e7c45416b3176cf413bd3be46b1b7321ff9360018c93d7f2eb2db904c9d194dcb3b4de6eff4ea33dcbd228f1 SHA512 5be8a2fb48b95912412eb250d2dad6126c78f81155b7eb115d175d32831430ede285d5f4bbebd0d8a50a1a3159fe1b7d133adf84ff8447111ca88a441b415643
+DIST sdb4124.zip 35199 BLAKE2B bee2de887a662978b6f0bf8b9ae663d37c4da1859f07a09e869cff91943bd65946dfd493b9bbe9244ffb8794f3cc5c828c647ab00b183326b63e179540765664 SHA512 b5c158cfcaaa4150d5ee719d11f3fc2b5a207cace241a147b39ab4a9f721cae2a894a88cd3dd944ecd24feae850b387faa03c669747b02de839f5d6a3ff0821f
+DIST simple4125.zip 29839 BLAKE2B 83f2b65e5192334bf6a9b5b5388a77d8b566a924837d041329d16f0ab864d5e69b7ea0a60b70fec4affcf0161fb724c5ed99fe16dd230dc0984100e40642709c SHA512 21c8d411f5b37c82442283dadbde99352778efe90fcf7eab7cc6a74fe9b702f14ffa5bd39e058d8f29fada7dbcdb197d5c880c29b207e3509ba856c5d19cfef1
+EBUILD docbook-xml-simple-dtd-1.0-r1.ebuild 859 BLAKE2B d3b7e65c640b6b80f101e8ffeca18e87aed94ca3187e1482b539f9c32c38405f14942a27023b066aa352aa8bf14e41670c8f21e48872522c1b49898841ba904f SHA512 b9bd047f159c6f139dcccdae4d424094a9867854469dec8f1f6f5b9c1f8c64d1ef0eefea4e723cf993f4951af242fa22a4827221da0570eccac359804c3784f1
+EBUILD docbook-xml-simple-dtd-1.0-r2.ebuild 1029 BLAKE2B 92dcfe31ecf7a458d1a4066f6da11516b6f33f41583bd125760ec6aff85cf82f79340289f0c5abc5e79d78593ff003514ba7ec3f68a8d9b2442bbf55400887fa SHA512 cfef4e9193faa44952630eb7282e467d85bac96853b4b51489091e86f4b15ca52ac74b61fc283ec557bfab7990c7fbafadb4a1073f4d1c50153ac5e012648f2e
+EBUILD docbook-xml-simple-dtd-4.1.2.4-r2.ebuild 882 BLAKE2B 142b82f5e1babca573deeb03787c9cf8f36f037aa8a79317729b080550ccd626462dbbe3ed2cd3d8d64e716757511cafda68d37932aab5e27b22c90a3f45932c SHA512 752a60262080c00de1268ffb7b099fcd05537cc7e16e9ba74ffd3d863c18d4bf84a7a26105ae2081b691d6bac0c413abb1c687a2f3792ded17833a1d735e1b29
+EBUILD docbook-xml-simple-dtd-4.1.2.4-r3.ebuild 1079 BLAKE2B b903fe2ab81c8ae1d775725724e430246e0893788e1e49e6f21e7c270b171f3e2729ab15163d11ec8838f1bfb1e9dfc26015226a4431503aa01d381da9414efd SHA512 d8349e3da45a64c70b48f890d3c617ad6b48767701a6d322348cf4f2f18e7558d96ee4670c78cc5ded048f94b1f6cc4bfdc42e2e49b0309c488b33db8aca0f75
+EBUILD docbook-xml-simple-dtd-4.1.2.5-r2.ebuild 1005 BLAKE2B e0e590a732cff3961f31c47422fbb8474905270996b886395e21decd03bb792ccd1b74834598905b69ff70e36218291bb2de49ce222b8f9879b6b113af5adf5d SHA512 b48010392f3787199881e89e0db87289cf7764abd2cdab4025d9a011e96f14b58eb5c33646a48c4558d90dc94e5789624fde873e210834873dbe4b2c1e0fbdc6
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0-r1.ebuild b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0-r1.ebuild
new file mode 100644
index 000000000000..41e6db86cdfb
--- /dev/null
+++ b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+inherit sgml-catalog
+
+MY_PN="docbook-simple"
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Simplified Docbook DTD for XML"
+HOMEPAGE="http://www.oasis-open.org/docbook/"
+SRC_URI="http://www.oasis-open.org/docbook/xml/simple/${PV}/${MY_P}.zip"
+
+LICENSE="docbook"
+SLOT="1.0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris"
+IUSE=""
+
+RDEPEND="dev-libs/libxml2"
+DEPEND=">=app-arch/unzip-5.41
+	${RDEPEND}"
+
+S=${WORKDIR}
+
+sgml-catalog_cat_include "/etc/sgml/xml-simple-docbook-${PV}.cat" \
+	"/usr/share/sgml/docbook/${P#docbook-}/catalog"
+
+src_install() {
+	insinto /usr/share/sgml/docbook/${P#docbook-}
+	doins *.dtd *.mod *.css
+	newins "${FILESDIR}"/${P}.cat catalog
+}
diff --git a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0-r2.ebuild b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0-r2.ebuild
new file mode 100644
index 000000000000..f38bd82b4ac2
--- /dev/null
+++ b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0-r2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+inherit sgml-catalog
+
+MY_PN="docbook-simple"
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Simplified Docbook DTD for XML"
+HOMEPAGE="http://www.oasis-open.org/docbook/"
+SRC_URI="http://www.oasis-open.org/docbook/xml/simple/${PV}/${MY_P}.zip"
+
+LICENSE="docbook"
+SLOT="1.0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris"
+IUSE=""
+
+RDEPEND=">=app-text/build-docbook-catalog-1.6"
+DEPEND=">=app-arch/unzip-5.41"
+
+S=${WORKDIR}
+
+sgml-catalog_cat_include "/etc/sgml/xml-simple-docbook-${PV}.cat" \
+	"/usr/share/sgml/docbook/${P#docbook-}/catalog"
+
+src_install() {
+	insinto /usr/share/sgml/docbook/${P#docbook-}
+	doins *.dtd *.mod *.css
+
+	newins "${FILESDIR}"/${P}.cat catalog
+}
+
+pkg_postinst() {
+	build-docbook-catalog
+	sgml-catalog_pkg_postinst
+}
+
+pkg_postrm() {
+	build-docbook-catalog
+	sgml-catalog_pkg_postrm
+}
diff --git a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r2.ebuild b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r2.ebuild
new file mode 100644
index 000000000000..aa892f99c197
--- /dev/null
+++ b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+inherit sgml-catalog
+
+MY_P="sdb4124"
+DESCRIPTION="Docbook DTD for XML"
+HOMEPAGE="http://www.oasis-open.org/docbook/"
+SRC_URI="mirror://gentoo/${MY_P}.zip"
+
+LICENSE="docbook"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+IUSE=""
+
+DEPEND=">=app-arch/unzip-5.41"
+RDEPEND=""
+
+sgml-catalog_cat_include "/etc/sgml/xml-simple-docbook-${PV}.cat" \
+	"/usr/share/sgml/docbook/${P#docbook-}/catalog"
+
+S=${WORKDIR}
+
+src_install() {
+	insinto /usr/share/sgml/docbook/${P#docbook-}
+	doins *.dtd *.mod *.css
+
+	newins "${FILESDIR}"/${P}.catalog catalog
+
+	insinto /usr/share/sgml/docbook/${P#docbook-}/ent
+	doins ent/*.ent
+
+	dodoc README ChangeLog LostLog COPYRIGHT
+}
diff --git a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r3.ebuild b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r3.ebuild
new file mode 100644
index 000000000000..3cfb69bc22cf
--- /dev/null
+++ b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+inherit sgml-catalog
+
+MY_P="sdb4124"
+DESCRIPTION="Docbook DTD for XML"
+HOMEPAGE="http://www.oasis-open.org/docbook/"
+SRC_URI="mirror://gentoo/${MY_P}.zip"
+
+LICENSE="docbook"
+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 ~x86-macos ~sparc-solaris"
+IUSE=""
+
+RDEPEND=">=app-text/build-docbook-catalog-1.6"
+DEPEND=">=app-arch/unzip-5.41"
+
+sgml-catalog_cat_include "/etc/sgml/xml-simple-docbook-${PV}.cat" \
+	"/usr/share/sgml/docbook/${P#docbook-}/catalog"
+
+S=${WORKDIR}
+
+src_install() {
+	insinto /usr/share/sgml/docbook/${P#docbook-}
+	doins *.dtd *.mod *.css
+
+	newins "${FILESDIR}"/${P}.catalog catalog
+
+	insinto /usr/share/sgml/docbook/${P#docbook-}/ent
+	doins ent/*.ent
+
+	dodoc README ChangeLog LostLog COPYRIGHT
+}
+
+pkg_postinst() {
+	build-docbook-catalog
+	sgml-catalog_pkg_postinst
+}
+
+pkg_postrm() {
+	build-docbook-catalog
+	sgml-catalog_pkg_postrm
+}
diff --git a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.5-r2.ebuild b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.5-r2.ebuild
new file mode 100644
index 000000000000..6e2679e689de
--- /dev/null
+++ b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.5-r2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+inherit sgml-catalog
+
+DESCRIPTION="Simplified Docbook DTD for XML"
+HOMEPAGE="http://www.oasis-open.org/docbook/xml/simple/4.1.2.5/"
+SRC_URI="http://www.nwalsh.com/docbook/simple/${PV}/simple4125.zip"
+
+LICENSE="docbook"
+SLOT="4.1.2.5"
+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 ~x86-macos ~sparc-solaris"
+IUSE=""
+
+RDEPEND=">=app-text/build-docbook-catalog-1.6"
+DEPEND=">=app-arch/unzip-5.41"
+
+S=${WORKDIR}
+
+sgml-catalog_cat_include "/etc/sgml/xml-simple-docbook-${PV}.cat" \
+	"/usr/share/sgml/docbook/${P#docbook-}/catalog"
+
+src_install() {
+	insinto /usr/share/sgml/docbook/${P#docbook-}
+	doins *.dtd *.mod *.css
+
+	newins "${FILESDIR}"/${P}.catalog catalog
+}
+
+pkg_postinst() {
+	build-docbook-catalog
+	sgml-catalog_pkg_postinst
+}
+
+pkg_postrm() {
+	build-docbook-catalog
+	sgml-catalog_pkg_postrm
+}
diff --git a/app-text/docbook-xml-simple-dtd/files/docbook-xml-simple-dtd-1.0.cat b/app-text/docbook-xml-simple-dtd/files/docbook-xml-simple-dtd-1.0.cat
new file mode 100644
index 000000000000..ef89f9b7a7c6
--- /dev/null
+++ b/app-text/docbook-xml-simple-dtd/files/docbook-xml-simple-dtd-1.0.cat
@@ -0,0 +1,7 @@
+OVERRIDE YES
+
+DTDDECL "-//OASIS//DTD Simplified DocBook XML V1.0//EN" "/usr/share/sgml/xml.dcl"
+PUBLIC  "-//OASIS//DTD Simplified DocBook XML V1.0//EN" "/usr/share/sgml/docbook/xml-simple-dtd-1.0/sdocbook.dtd"
+
+DTDDECL "-//OASIS//DTD Simplified DocBook RefEntry XML V1.0//EN" "/usr/share/sgml/xml.dcl"
+PUBLIC  "-//OASIS//DTD Simplified DocBook RefEntry XML V1.0//EN" "/usr/share/sgml/docbook/xml-simple-dtd-1.0/sdocbookref.dtd"
diff --git a/app-text/docbook-xml-simple-dtd/files/docbook-xml-simple-dtd-4.1.2.4.catalog b/app-text/docbook-xml-simple-dtd/files/docbook-xml-simple-dtd-4.1.2.4.catalog
new file mode 100644
index 000000000000..5e935dd248a4
--- /dev/null
+++ b/app-text/docbook-xml-simple-dtd/files/docbook-xml-simple-dtd-4.1.2.4.catalog
@@ -0,0 +1,28 @@
+  -- ...................................................................... --
+  -- Catalog data for Simplified DocBook XML V4.1.2.4 .................................... --
+  -- File catalog ..................................................... --
+
+
+  -- ...................................................................... --
+  -- Simplified DocBook driver file .................................................. --
+
+PUBLIC "-//Norman Walsh//DTD Simplified DocBook XML V4.1.2.4//EN" "sdocbook.dtd"
+
+  -- ...................................................................... --
+  -- Simplified DocBook modules ...................................................... --
+
+PUBLIC "-//Norman Walsh//DTD Simplified DocBook XML RefEntry V4.1.2.4//EN" "sdocbookref.dtd"
+PUBLIC "-//Norman Walsh//ELEMENTS Simplified DocBook XML Document Hierarchy V4.1.2.4//EN" "sdbhier.mod"
+PUBLIC "-//Norman Walsh//ELEMENTS Simplified DocBook XML Information Pool V4.1.2.4//EN" "sdbpool.mod"
+PUBLIC "-//Norman Walsh//ENTITIES Simplified DocBook XML Inclusions V4.1.2.4//EN" "sinclist.mod"
+PUBLIC "-//Norman Walsh//ENTITIES Simplified DocBook XML Character Entity Sets V4.1.2.4//EN" "sdbcent.mod"
+
+  -- ...................................................................... --
+  -- ISO entity sets ...................................................... --
+
+PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" "ent/iso-num.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN" "ent/iso-pub.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN" "ent/iso-lat1.ent"
+
+  -- End of catalog data for Simplified DocBook XML V4.1.2.4 ............................. --
+  -- ...................................................................... --
diff --git a/app-text/docbook-xml-simple-dtd/files/docbook-xml-simple-dtd-4.1.2.5.catalog b/app-text/docbook-xml-simple-dtd/files/docbook-xml-simple-dtd-4.1.2.5.catalog
new file mode 100644
index 000000000000..dcd1cf4acb83
--- /dev/null
+++ b/app-text/docbook-xml-simple-dtd/files/docbook-xml-simple-dtd-4.1.2.5.catalog
@@ -0,0 +1,28 @@
+  -- ...................................................................... --
+  -- Catalog data for Simplified DocBook XML V4.1.2.5 .................................... --
+  -- File catalog ..................................................... --
+
+
+  -- ...................................................................... --
+  -- Simplified DocBook driver file .................................................. --
+
+PUBLIC "-//Norman Walsh//DTD Simplified DocBook XML V4.1.2.5//EN" "sdocbook.dtd"
+
+  -- ...................................................................... --
+  -- Simplified DocBook modules ...................................................... --
+
+PUBLIC "-//Norman Walsh//DTD Simplified DocBook XML RefEntry V4.1.2.5//EN" "sdocbookref.dtd"
+PUBLIC "-//Norman Walsh//ELEMENTS Simplified DocBook XML Document Hierarchy V4.1.2.5//EN" "sdbhier.mod"
+PUBLIC "-//Norman Walsh//ELEMENTS Simplified DocBook XML Information Pool V4.1.2.5//EN" "sdbpool.mod"
+PUBLIC "-//Norman Walsh//ENTITIES Simplified DocBook XML Inclusions V4.1.2.5//EN" "sinclist.mod"
+PUBLIC "-//Norman Walsh//ENTITIES Simplified DocBook XML Character Entity Sets V4.1.2.5//EN" "sdbcent.mod"
+
+  -- ...................................................................... --
+  -- ISO entity sets ...................................................... --
+
+PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" "ent/iso-num.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN" "ent/iso-pub.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN" "ent/iso-lat1.ent"
+
+  -- End of catalog data for Simplified DocBook XML V4.1.2.5 ............................. --
+  -- ...................................................................... --
diff --git a/app-text/docbook-xml-simple-dtd/metadata.xml b/app-text/docbook-xml-simple-dtd/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-text/docbook-xml-simple-dtd/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/app-text/docbook-xsl-ns-stylesheets-1.78.0 b/app-text/docbook-xsl-ns-stylesheets-1.78.0
deleted file mode 100644
index 0212dcf42494..000000000000
--- a/app-text/docbook-xsl-ns-stylesheets-1.78.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm test
-DESCRIPTION=XSL Stylesheets for Docbook
-EAPI=5
-HOMEPAGE=https://github.com/docbook/wiki/wiki
-IUSE=ruby
-KEYWORDS=alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd
-LICENSE=BSD
-RDEPEND=>=app-text/build-docbook-catalog-1.4 ruby? ( dev-lang/ruby )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://sourceforge/docbook/docbook-xsl-ns-1.78.0.tar.bz2
-_md5_=67dfed049de2d68162cb5ef42583a6fb
diff --git a/app-text/docbook-xsl-ns-stylesheets/Manifest b/app-text/docbook-xsl-ns-stylesheets/Manifest
new file mode 100644
index 000000000000..ff19dbf96ad9
--- /dev/null
+++ b/app-text/docbook-xsl-ns-stylesheets/Manifest
@@ -0,0 +1,3 @@
+DIST docbook-xsl-ns-1.78.0.tar.bz2 4992293 BLAKE2B 3bc93ca1dc45756121a4a3838093539957bba4ddffbbd7d27c5df6c63422a8694ea7d805cc9585ab1ce2d9092e35b91cd3bde97ee2fabb91c8c870eefa8ded1d SHA512 f3b9b52a4ba5670c17086cdf64674080ef82a9226f085887c23c53d2d102611d690895c71d14186cd84a25c7735b05d6c55207f4b2b9084d65889aaac7993cf3
+EBUILD docbook-xsl-ns-stylesheets-1.78.0.ebuild 1648 BLAKE2B caed04c4c7d135bb4e50c29c357bb7d5e87fb471ca050652cd0a8f58f807bc820e991835f6cc8dadcaa66a8598558e75265ee7a25e7d4105b1e8339a2d077921 SHA512 8ad0e0d62480762974c747edd80212a152c53a839309e6e6ec5fbd02487c8c9d1a823e8e3a59ddb37b74b14c745aa73a602c3bbc0820fd5e0bcc3e614bea6972
+MISC metadata.xml 385 BLAKE2B 048351fc482c44ecc4528ba7c66f61c2103594eb0ad75559aa4174cfba98c17e9f0355456aae62429b1eaf2f92b0f17067ddcf325e331023f57e642f917f3036 SHA512 779b06691df7d5e473f854558344f4c44b1af292f107e9208c5cd501108399451da4e4210feff60088f1ae8009665569b6f96794f36930938f13c5cb65005af4
diff --git a/app-text/docbook-xsl-ns-stylesheets/docbook-xsl-ns-stylesheets-1.78.0.ebuild b/app-text/docbook-xsl-ns-stylesheets/docbook-xsl-ns-stylesheets-1.78.0.ebuild
new file mode 100644
index 000000000000..a50b149c8f9c
--- /dev/null
+++ b/app-text/docbook-xsl-ns-stylesheets/docbook-xsl-ns-stylesheets-1.78.0.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DOCBOOKDIR="/usr/share/sgml/${PN/-//}"
+MY_PN="${PN%-stylesheets}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="XSL Stylesheets for Docbook"
+HOMEPAGE="https://github.com/docbook/wiki/wiki"
+SRC_URI="mirror://sourceforge/docbook/${MY_P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+IUSE="ruby"
+
+RDEPEND=">=app-text/build-docbook-catalog-1.4
+	ruby? ( dev-lang/ruby )"
+DEPEND=""
+
+S="${WORKDIR}/${MY_P}"
+
+# Makefile is broken since 1.76.0
+RESTRICT=test
+
+# The makefile runs tests, not builds.
+src_compile() { :; }
+
+src_test() {
+	emake check
+}
+
+src_install() {
+	# The changelog is now zipped, and copied as the RELEASE-NOTES, so we
+	# don't need to install it
+	dodoc AUTHORS BUGS NEWS README RELEASE-NOTES.txt TODO
+
+	insinto ${DOCBOOKDIR}
+	doins VERSION VERSION.xsl
+
+	local i
+	for i in $(find . -maxdepth 1 -mindepth 1 -type d -exec basename {} \;); do
+		[[ "$i" == "epub" ]] && ! use ruby && continue
+
+		cd "${S}"/${i}
+		for doc in ChangeLog README; do
+			if [ -e "$doc" ]; then
+				mv ${doc} ${doc}.${i}
+				dodoc ${doc}.${i}
+				rm ${doc}.${i}
+			fi
+		done
+
+		doins -r "${S}"/${i}
+	done
+
+	if use ruby; then
+		local cmd="dbtoepub${MY_PN#docbook-xsl}"
+
+		# we can't use a symlink or it'll look for the library in the
+		# wrong path.
+		dodir /usr/bin
+		cat - > "${D}"/usr/bin/${cmd} <<EOF
+#!/usr/bin/env ruby
+
+load "${DOCBOOKDIR}/epub/bin/dbtoepub"
+EOF
+		fperms 0755 /usr/bin/${cmd}
+	fi
+}
+
+pkg_postinst() {
+	build-docbook-catalog
+}
+
+pkg_postrm() {
+	build-docbook-catalog
+}
diff --git a/app-text/docbook-xsl-ns-stylesheets/metadata.xml b/app-text/docbook-xsl-ns-stylesheets/metadata.xml
new file mode 100644
index 000000000000..11db2d7f5b6c
--- /dev/null
+++ b/app-text/docbook-xsl-ns-stylesheets/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<use>
+		<flag name="ruby">
+			Install the Ruby-based dbtoepub script; requires an interpreter
+			compatible with <pkg>app-eselect/eselect-ruby</pkg>.
+		</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">docbook</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/docbook-xsl-stylesheets-1.79.1-r2 b/app-text/docbook-xsl-stylesheets-1.79.1-r2
deleted file mode 100644
index 1da593475271..000000000000
--- a/app-text/docbook-xsl-stylesheets-1.79.1-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare test
-DESCRIPTION=XSL Stylesheets for Docbook
-EAPI=6
-HOMEPAGE=https://github.com/docbook/wiki/wiki
-IUSE=ruby
-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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=BSD
-RDEPEND=>=app-text/build-docbook-catalog-1.1 ruby? ( || ( dev-lang/ruby:2.3 dev-lang/ruby:2.2 dev-lang/ruby:2.4 dev-lang/ruby:2.5 ) virtual/rubygems )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://sourceforge/docbook/docbook-xsl-1.79.1.tar.bz2
-_eclasses_=ruby-single	7435c1687c234eb8cf5b212756f6381e	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c
-_md5_=82650423a2a6f68e5c329784b9a416b1
diff --git a/app-text/docbook-xsl-stylesheets/Manifest b/app-text/docbook-xsl-stylesheets/Manifest
new file mode 100644
index 000000000000..b2a0d1a7cde9
--- /dev/null
+++ b/app-text/docbook-xsl-stylesheets/Manifest
@@ -0,0 +1,4 @@
+AUX nonrecursive-string-subst.patch 1205 BLAKE2B 0c7bb8e3ba646a137bc0b50722448c65437881672a4bbb3f3dc7a181e5074f667fca0fbcb4475b83f04ac63bdddbf3dae800b7a7094b5d9aea270faeb81d9e50 SHA512 6a26838078a3ce28273dddfa1af6a378cffc28b6d1ba48a4cfc839addd7bf58ce217d6584b735f9c75381954744ab2386c75fa3c593858b6e27882be55c00d04
+DIST docbook-xsl-1.79.1.tar.bz2 21967928 BLAKE2B 42b7e989616d16fa100c2dad713830ecedf6c7e26f56f99a9bf9330385c753f282cea1033e689196352bd41f9dca59a06ff09fc4638051cb478a630df9bfeb0b SHA512 83325cbaf1545da6b9b8b77f5f0e6fdece26e3c455164b300a1aa3d19e3bd29ae71fd563553a714a5394968d1a65684c6c7987c77524469358d18b8c227025c7
+EBUILD docbook-xsl-stylesheets-1.79.1-r2.ebuild 2171 BLAKE2B c7720c9f35b56c9302e364dbcd9b9e1d571aecdcf363e2260035bd202bf561b800e2ef7c5f6347c2c6de448ec8cb703b468e3c3b8e2207761156e4e0e2079617 SHA512 0e7a04f68a10a037c2784336c64edae12c6102d44bff00b2eaca64ac76ca4c7ce6a23c0fdcab31a7b65d5c3b3be2a6ded06301685aeac9f161ee7a695b1eff1c
+MISC metadata.xml 413 BLAKE2B c4ba1418a2d7499d953111afac5907a4dd53c183f8a2613218aa0f0f510f1b75d04c6839c5407f20703ebab963d505dc09e081cfb053970147b07001caea6920 SHA512 7c32b5261d0bfe9f552efd08854233b47958d04cab7b932ddb67cfe163319f8f8ea82d1b169203b9e2158d3a436862d7050dcc762d3b525ba806690640ad3892
diff --git a/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r2.ebuild b/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r2.ebuild
new file mode 100644
index 000000000000..25331a2f2de1
--- /dev/null
+++ b/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r2.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
+
+inherit ruby-single
+
+DOCBOOKDIR="/usr/share/sgml/${PN/-//}"
+MY_PN="${PN%-stylesheets}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="XSL Stylesheets for Docbook"
+HOMEPAGE="https://github.com/docbook/wiki/wiki"
+SRC_URI="mirror://sourceforge/docbook/${MY_P}.tar.bz2"
+
+LICENSE="BSD"
+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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="ruby"
+
+RDEPEND=">=app-text/build-docbook-catalog-1.1
+	ruby? ( ${RUBY_DEPS} )"
+
+S="${WORKDIR}/${MY_P}"
+
+# Makefile is broken since 1.76.0
+RESTRICT=test
+
+PATCHES=(
+	"${FILESDIR}"/nonrecursive-string-subst.patch
+)
+
+src_prepare() {
+	default
+
+	# Delete the unnecessary Java-related stuff and other tools as they
+	# bloat the stage3 tarballs massively. See bug #575818.
+	rm -rv extensions/ tools/ || die
+	find \( -name build.xml -o -name build.properties \) \
+		 -printf "removed %p\n" -delete || die
+
+	if ! use ruby; then
+	   rm -rv epub/ || die
+	fi
+}
+
+# The makefile runs tests, not builds.
+src_compile() { :; }
+
+src_test() {
+	emake check
+}
+
+src_install() {
+	# The changelog is now zipped, and copied as the RELEASE-NOTES, so we
+	# don't need to install it
+	dodoc AUTHORS BUGS NEWS README RELEASE-NOTES.txt TODO
+
+	insinto ${DOCBOOKDIR}
+	doins VERSION VERSION.xsl
+
+	local i
+	for i in */; do
+		i=${i%/}
+
+		cd "${S}"/${i}
+		for doc in ChangeLog README; do
+			if [ -e "$doc" ]; then
+				mv ${doc} ${doc}.${i}
+				dodoc ${doc}.${i}
+				rm ${doc}.${i}
+			fi
+		done
+
+		doins -r "${S}"/${i}
+	done
+
+	if use ruby; then
+		local cmd="dbtoepub${MY_PN#docbook-xsl}"
+
+		# we can't use a symlink or it'll look for the library in the
+		# wrong path.
+		dodir /usr/bin
+		cat - > "${D}"/usr/bin/${cmd} <<EOF
+#!/usr/bin/env ruby
+
+load "${DOCBOOKDIR}/epub/bin/dbtoepub"
+EOF
+		fperms 0755 /usr/bin/${cmd}
+	fi
+}
+
+pkg_postinst() {
+	build-docbook-catalog
+}
+
+pkg_postrm() {
+	build-docbook-catalog
+}
diff --git a/app-text/docbook-xsl-stylesheets/files/nonrecursive-string-subst.patch b/app-text/docbook-xsl-stylesheets/files/nonrecursive-string-subst.patch
new file mode 100644
index 000000000000..99ce9960d9e4
--- /dev/null
+++ b/app-text/docbook-xsl-stylesheets/files/nonrecursive-string-subst.patch
@@ -0,0 +1,30 @@
+Description: use EXSLT "replace" function when available
+ A recursive implementation  of string.subst is problematic,
+ long strings with many matches will cause stack overflows.
+Author: Peter De Wachter <pdewacht@gmail.com>
+Bug-Debian: https://bugs.debian.org/750593
+
+--- a/lib/lib.xsl
++++ b/lib/lib.xsl
+@@ -10,7 +10,10 @@
+      This module implements DTD-independent functions
+ 
+      ******************************************************************** -->
+-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
++<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
++                xmlns:str="http://exslt.org/strings"
++                exclude-result-prefixes="str"
++                version="1.0">
+ 
+ <xsl:template name="dot.count">
+   <!-- Returns the number of "." characters in a string -->
+@@ -56,6 +59,9 @@
+   <xsl:param name="replacement"/>
+ 
+   <xsl:choose>
++    <xsl:when test="function-available('str:replace')">
++      <xsl:value-of select="str:replace($string, string($target), string($replacement))"/>
++    </xsl:when>
+     <xsl:when test="contains($string, $target)">
+       <xsl:variable name="rest">
+         <xsl:call-template name="string.subst">
diff --git a/app-text/docbook-xsl-stylesheets/metadata.xml b/app-text/docbook-xsl-stylesheets/metadata.xml
new file mode 100644
index 000000000000..cef0d5fef5cf
--- /dev/null
+++ b/app-text/docbook-xsl-stylesheets/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<use>
+		<flag name="ruby">
+			Install the Ruby-based dbtoepub script; requires an interpreter
+			compatible with <pkg>app-eselect/eselect-ruby</pkg>.
+		</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">docbook</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/docbook2X-0.8.8-r4 b/app-text/docbook2X-0.8.8-r4
deleted file mode 100644
index a3151e875c44..000000000000
--- a/app-text/docbook2X-0.8.8-r4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-lang/perl dev-libs/libxslt dev-perl/XML-NamespaceSupport dev-perl/XML-SAX dev-perl/XML-LibXML app-text/docbook-xsl-stylesheets =app-text/docbook-xml-dtd-4.2* >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Tools to convert docbook to man and info
-EAPI=5
-HOMEPAGE=http://docbook2x.sourceforge.net/
-IUSE=test
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux ~x86-solaris
-LICENSE=MIT
-RDEPEND=dev-lang/perl dev-libs/libxslt dev-perl/XML-NamespaceSupport dev-perl/XML-SAX dev-perl/XML-LibXML app-text/docbook-xsl-stylesheets =app-text/docbook-xml-dtd-4.2*
-SLOT=0
-SRC_URI=mirror://sourceforge/docbook2x/docbook2X-0.8.8.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d326ef979338cabbce455c02fb3a7766
diff --git a/app-text/docbook2X/Manifest b/app-text/docbook2X/Manifest
new file mode 100644
index 000000000000..ef42c70bbe91
--- /dev/null
+++ b/app-text/docbook2X/Manifest
@@ -0,0 +1,7 @@
+AUX docbook2X-0.8.8-drop-htmldir.patch 327 BLAKE2B 052e6e19a639182c8fb04ddfbde371ec0e154ee9049d97827fa6b65db7e745aefc65c3a49f5c8e49f710abfdabc88784a256535d0f2c0c203990e4999b32a7a7 SHA512 c8e3cbbf1f18aeb5489d12f8fd661c38adae7e60ef3861135ff0aa3c515cc509ecc9ae19ace81e94cd181dac15b08bbb4783b39bd96674bdc83abc95aac5ddcc
+AUX docbook2X-0.8.8-error_on_missing_refentry.patch 1247 BLAKE2B 1afaf90f76030c63ce5828d5a2d450cafd9989af98f99e2aab89c940074105806d85156acadc1b3ea35aee159956da4e7d3d22c6e2bbc10f3bed899b76787db8 SHA512 ea9ed94190edb2ac2055694bb927457f94eeadf0eff340b9f5fdba6fad5b1dc0b9617829ce3470914cbe0ba0be145dfb000218d57f22ee767ebb8082d6c06bfb
+AUX docbook2X-0.8.8-filename_whitespace_handling.patch 2080 BLAKE2B ca60c0da237260893d9c4d75b95dafde605ac5ef0d01d311f52ca3a77817ce389a3f0bc7edde06f83593bc24ddc0170507898da4cfd57a7aa081884d3be7f503 SHA512 3a72979c03a1b5135662ad5cedefd0d508001994e727a0820d628ff5ad2476c09befeb921b9562230fdec3db547e5eec4b301aa08430dd6c2ce2632624a1c375
+AUX docbook2X-0.8.8-preprocessor_declaration_syntax.patch 3358 BLAKE2B e5c8c38c4504e03d7bb003929c3723cc0d15448258b8d0770571f94279e66d565f5c7cf2926cafc0a71f66e2976039401acd6b3486a9a177115b56b44437827c SHA512 af88626ca61847a25ef8c4cf8a09ea27cd1dce6510952e9629b704d3637097b10d85b9727e502dd7eecea1d2152a71cd26bf6abf4a8370eb8647258faa30be45
+DIST docbook2X-0.8.8.tar.gz 723909 BLAKE2B 17593d104a8b50a3ab56e5de464785d86d41c8a3fd04f76037c5482de867efa6dfa1ed4047e11814ed18275cd3b856440deafb637dcec17267a946d5cb1bd085 SHA512 cc336017ad734fc62d96d289105e8ea154c418a03a37f3e21b0b3520063f8b466b4aae5a5aec2e0b83f6324c6c79b5557247a93338d0a9882a94a44112f6b65c
+EBUILD docbook2X-0.8.8-r4.ebuild 1564 BLAKE2B 10d1dc9014784b6cf72037c1d139ef787a9fae9cc8dfa9057e04460b8bf7e96ad8c3bc8e619a548875846b5ab0102c79cd28d39a4eb49308b12fa5fbe67a9d21 SHA512 7718a0eadc029faa32d909e5374d9bd86fc3a61281dc03405064e8ed46de0129f0f26ce1b32270bd4e80b7fb92f3dcf134ae05e44f28e603b5e99d250e2b26ff
+MISC metadata.xml 246 BLAKE2B aa5c9c8df66314e0c3f156b1f79b96a87103809e228bff9935544e5b0d9e61165dc0bd0080ecb78595e6e93d0e06c1b8c979b47b8a29f6bdae22fc3abe7a3f95 SHA512 751233aacee2a81a9b2e02bf872dc788d2fe39fa6d6b3781146dbd19e4eebf5854620b2ae9d62e0d4dada2a64903ecf789e94b3eefecedd131808bc575617759
diff --git a/app-text/docbook2X/docbook2X-0.8.8-r4.ebuild b/app-text/docbook2X/docbook2X-0.8.8-r4.ebuild
new file mode 100644
index 000000000000..b91b8f23d5d9
--- /dev/null
+++ b/app-text/docbook2X/docbook2X-0.8.8-r4.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+AUTOTOOLS_AUTORECONF=1 #290284
+inherit autotools-utils
+
+DESCRIPTION="Tools to convert docbook to man and info"
+SRC_URI="mirror://sourceforge/docbook2x/${P}.tar.gz"
+HOMEPAGE="http://docbook2x.sourceforge.net/"
+
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux ~x86-solaris"
+IUSE="test"
+LICENSE="MIT"
+
+# dev-perl/XML-LibXML - although not mentioned upstream is required
+# for make check to complete.
+DEPEND="dev-lang/perl
+	dev-libs/libxslt
+	dev-perl/XML-NamespaceSupport
+	dev-perl/XML-SAX
+	dev-perl/XML-LibXML
+	app-text/docbook-xsl-stylesheets
+	=app-text/docbook-xml-dtd-4.2*"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	# Patches from debian, for description see patches itself.
+	"${FILESDIR}/${P}-filename_whitespace_handling.patch"
+	"${FILESDIR}/${P}-preprocessor_declaration_syntax.patch"
+	"${FILESDIR}/${P}-error_on_missing_refentry.patch"
+	# bug #296112
+	"${FILESDIR}/${P}-drop-htmldir.patch"
+)
+src_prepare() {
+	sed -i -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.ac || die 'sed on configure.ac failed'
+
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	local myeconfargs=(
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+		--with-xslt-processor=libxslt
+		--program-transform-name='/^docbook2/s,$,.pl,'
+	)
+	autotools-utils_src_configure
+}
+
+src_install() {
+	autotools-utils_src_install
+	dosym docbook2man.pl /usr/bin/docbook2x-man
+	dosym docbook2texi.pl /usr/bin/docbook2x-texi
+}
diff --git a/app-text/docbook2X/files/docbook2X-0.8.8-drop-htmldir.patch b/app-text/docbook2X/files/docbook2X-0.8.8-drop-htmldir.patch
new file mode 100644
index 000000000000..a7e11b2dfd7e
--- /dev/null
+++ b/app-text/docbook2X/files/docbook2X-0.8.8-drop-htmldir.patch
@@ -0,0 +1,14 @@
+Put HTML documentation in proper directory.
+Patch by Chris Mayo, https://bugs.gentoo.org/show_bug.cgi?id=296112
+
+--- doc/Makefile.am.orig
++++ doc/Makefile.am
+@@ -182,8 +182,6 @@
+ # Install (automake)
+ #
+ 
+-htmldir = $(datadir)/doc/docbook2X
+-
+ man_MANS = $(MAN_FILES)
+ html_DATA = $(HTML_FILES)
+ info_TEXINFOS = docbook2X.texi
diff --git a/app-text/docbook2X/files/docbook2X-0.8.8-error_on_missing_refentry.patch b/app-text/docbook2X/files/docbook2X-0.8.8-error_on_missing_refentry.patch
new file mode 100644
index 000000000000..b8a493be2f36
--- /dev/null
+++ b/app-text/docbook2X/files/docbook2X-0.8.8-error_on_missing_refentry.patch
@@ -0,0 +1,33 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 05_fix_439214_error_on_missing_refentry.dpatch by Daniel Leidert <daniel.leidert@wgdd.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: If there is no refentry element, the manpage stylesheets silently
+## DP:   "ignores" this. It has been requested to print at least a
+## DP:   warning.
+## DP:
+## DP: <URL:http://bugs.debian.org/439214>
+## DP: <URL:http://lists.gnu.org/archive/html/groff/2007-11/msg00023.html>
+
+@DPATCH@
+diff -urNad trunk~/xslt/man/docbook.xsl trunk/xslt/man/docbook.xsl
+--- trunk~/xslt/man/docbook.xsl	2006-04-11 21:00:19.000000000 +0200
++++ trunk/xslt/man/docbook.xsl	2008-02-05 03:31:48.000000000 +0100
+@@ -111,11 +111,15 @@
+     <xsl:when test="child::refentry">
+       <xsl:apply-templates />
+     </xsl:when>
+-
+-    <xsl:otherwise>
++    <xsl:when test="descendant-or-self::refentry">
+       <manpageset>
+         <xsl:apply-templates select="descendant-or-self::refentry" />
+       </manpageset>
++    </xsl:when>
++    <xsl:otherwise>
++      <xsl:message terminate="no">
++        <xsl:text>WARNING: Sorry, but I cannot find a refentry element in your source!</xsl:text>
++      </xsl:message>
+     </xsl:otherwise>
+   </xsl:choose>
+ </xsl:template>
diff --git a/app-text/docbook2X/files/docbook2X-0.8.8-filename_whitespace_handling.patch b/app-text/docbook2X/files/docbook2X-0.8.8-filename_whitespace_handling.patch
new file mode 100644
index 000000000000..26cdf8e1baea
--- /dev/null
+++ b/app-text/docbook2X/files/docbook2X-0.8.8-filename_whitespace_handling.patch
@@ -0,0 +1,43 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 03_fix_420153_filename_whitespace_handling.dpatch by
+##     Daniel Leidert (dale) <daniel.leidert@wgdd.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Peter Eisentraut reported a regression in the whitespace handling of
+## DP: refentrytitle content during filename creation:
+## DP: http://bugs.debian.org/420153. The problem is, that upstream first
+## DP: replaces all spaces (but not linebreaks btw) with underlines and then
+## DP: it tries to normalize the result. This means, that a linebreak with
+## DP: additional whitespaces results in manpage names like 'foo_ ____bar.9'.
+## DP: So what we basically do in this patch is, that we first normalize the
+## DP: refentrytitle and then replace any spaces left with underlines.
+
+@DPATCH@
+diff -urNad docbook2x-0.8.8~/xslt/man/manpage.xsl docbook2x-0.8.8/xslt/man/manpage.xsl
+--- docbook2x-0.8.8~/xslt/man/manpage.xsl	2006-04-20 15:45:55.000000000 +0200
++++ docbook2x-0.8.8/xslt/man/manpage.xsl	2007-04-20 16:19:28.000000000 +0200
+@@ -30,7 +30,7 @@
+ 
+ <xsl:template name="manpage-filename">
+   <xsl:param name="filename" />
+-  <xsl:value-of select="normalize-space(translate($filename, &quot; /&quot;, &quot;__&quot;))" />
++  <xsl:value-of select="translate(normalize-space($filename), ' /', '__')" />
+ </xsl:template>
+ 
+ 
+diff -urNad docbook2x-0.8.8~/xslt/man/refentry.xsl docbook2x-0.8.8/xslt/man/refentry.xsl
+--- docbook2x-0.8.8~/xslt/man/refentry.xsl	2006-04-21 04:39:55.000000000 +0200
++++ docbook2x-0.8.8/xslt/man/refentry.xsl	2007-04-20 16:21:53.000000000 +0200
+@@ -38,7 +38,11 @@
+ <xsl:template name="refentry-filename">
+   <xsl:param name="title" />
+ 
+-  <xsl:variable name="title2" select="translate($title, &quot; /&quot;, &quot;__&quot;)" />
++  <xsl:variable name="title2">
++    <xsl:call-template name="manpage-filename">
++      <xsl:with-param name="filename" select="$title" />
++    </xsl:call-template>
++  </xsl:variable>
+ 
+   <!-- not using gentext here since man page names tend not to have
+        accented chars / non-Latin chars ...
diff --git a/app-text/docbook2X/files/docbook2X-0.8.8-preprocessor_declaration_syntax.patch b/app-text/docbook2X/files/docbook2X-0.8.8-preprocessor_declaration_syntax.patch
new file mode 100644
index 000000000000..b6ddbfa2a0d3
--- /dev/null
+++ b/app-text/docbook2X/files/docbook2X-0.8.8-preprocessor_declaration_syntax.patch
@@ -0,0 +1,90 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 04_fix_442782_preprocessor_declaration_syntax.dpatch by Colin Watson <cjwatson@debian.org>.
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Conventionally, preprocessor declarations should start with
+## DP:       '\"
+## DP:   rather than
+## DP:       .\"
+## DP:   Current man-db only supports the first (and recommended) syntax. So
+## DP:   Colin Watson provided this patch to fix docbook2x.
+## DP:
+## DP: <URL:http://bugs.debian.org/442782>
+## DP: <URL:http://lists.gnu.org/archive/html/groff/2007-11/msg00023.html>
+
+@DPATCH@
+diff -urNad trunk~/perl/db2x_manxml.pl trunk/perl/db2x_manxml.pl
+--- trunk~/perl/db2x_manxml.pl	2006-04-22 17:21:32.000000000 +0200
++++ trunk/perl/db2x_manxml.pl	2007-11-24 01:27:37.000000000 +0100
+@@ -342,6 +342,25 @@
+     $self->{line_start} = 1;
+ }
+ 
++#
++# Print a comment in the output, without causing a break.
++# Params: comment - the comment text.  
++#                   May use any characters; they need not be escaped.
++#
++sub comment_nobreak
++{
++    my ($self, $comment) = @_;
++    $self->write("\n") unless $self->{line_start};
++
++    foreach my $line (split(/\n/, $comment)) {
++        $self->write('\'\" ');
++        $self->write($line);
++        $self->write("\n");
++    }
++
++    $self->{line_start} = 1;
++}
++
+ 
+ #
+ # Use a roff "escape" i.e. commands embedded in text starting with \
+@@ -510,16 +529,20 @@
+ 
+     $self->{'adjust-stack'} = [ 'b' ];
+ 
+-    $self->{rw}->comment($elem->attr('preprocessors'))
+-        if($elem->attr('preprocessors') ne '');
+-
++    my $preprocessors = $elem->attr('preprocessors');
+     # I've dug through the Internet to see if there was any
+     # standard way to specify encoding with man pages.
+     # The following seems to be a reasonable proposal:
+     # <URL:http://mail.nl.linux.org/linux-utf8/2001-04/msg00168.html>
+     my $encoding = $self->{options}->{'encoding'};
+     $encoding =~ s#//TRANSLIT$##i;
+-    $self->{rw}->comment("-*- coding: $encoding -*-");
++    $encoding = "-*- coding: $encoding -*-";
++    if ($preprocessors eq '') {
++        $preprocessors = $encoding;
++    } else {
++        $preprocessors = "$preprocessors $encoding";
++    }
++    $self->{rw}->comment_nobreak($preprocessors);
+     
+     # Define escapes for switching to and from monospace fonts (groff only)
+     $self->{rw}->request(qw{ .if \n(.g .ds T< \\\\FC});
+diff -urNad trunk~/xslt/backend/db2x_manxml.xsl trunk/xslt/backend/db2x_manxml.xsl
+--- trunk~/xslt/backend/db2x_manxml.xsl	2006-04-23 16:44:52.000000000 +0200
++++ trunk/xslt/backend/db2x_manxml.xsl	2007-11-24 01:27:37.000000000 +0100
+@@ -528,7 +528,7 @@
+       <exslt:document method="text" 
+                       encoding="{$encoding}" 
+                       href="{$path}">
+-        <xsl:text>.\" -*- coding: </xsl:text>
++        <xsl:text>'\" -*- coding: </xsl:text>
+         <xsl:value-of select="$encoding" />
+         <xsl:text> -*-&#10;</xsl:text>
+         <xsl:copy-of select="$content" />
+@@ -538,7 +538,7 @@
+       <saxon:output method="text" 
+                     encoding="{$encoding}" 
+                     href="{$path}">
+-        <xsl:text>.\" -*- coding: </xsl:text>
++        <xsl:text>'\" -*- coding: </xsl:text>
+         <xsl:value-of select="$encoding" />
+         <xsl:text> -*-&#10;</xsl:text>
+         <xsl:copy-of select="$content" />
diff --git a/app-text/docbook2X/metadata.xml b/app-text/docbook2X/metadata.xml
new file mode 100644
index 000000000000..f5186760fa4a
--- /dev/null
+++ b/app-text/docbook2X/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="sourceforge">docbook2x</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/doconce-1.3 b/app-text/doconce-1.3
deleted file mode 100644
index e169245c6e1b..000000000000
--- a/app-text/doconce-1.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/future python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=A markdown-like langauge to generate docs in html, LaTeX, and many other formats
-EAPI=5
-HOMEPAGE=https://github.com/hplgit/doconce/ https://pypi.org/project/doconce/
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-python/future python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~grozin/doconce-1.3.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=bead51ba34376af0feb7bda23c72d7e0
diff --git a/app-text/doconce-1.4.4 b/app-text/doconce-1.4.4
deleted file mode 100644
index 2597d08ced12..000000000000
--- a/app-text/doconce-1.4.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/future[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=A markdown-like langauge to generate docs in html, LaTeX, and many other formats
-EAPI=6
-HOMEPAGE=https://github.com/hplgit/doconce/ https://pypi.org/project/Doconce/
-IUSE=doc python_targets_python2_7 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=dev-python/future[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~grozin/doconce-1.4.4.tar.bz2
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8e766b931b073f355a712ab6dc5d0b96
diff --git a/app-text/doconce/Manifest b/app-text/doconce/Manifest
new file mode 100644
index 000000000000..e0bc64fbf8d7
--- /dev/null
+++ b/app-text/doconce/Manifest
@@ -0,0 +1,5 @@
+DIST doconce-1.3.tar.bz2 112034753 BLAKE2B 4ac826b09ca2dce93d8725868f6fa00a07b61835336a56b72f4d846cb81282cc6982ca25c7fc27d9e66aed5a22d3ef30badbc137748f7c6c3a2e078554b6715e SHA512 b59568e801f4cc5b7f01f3c3d344702ec80c65b5a065e2ece3b3ed8cb5f669739c9adf3caf96cd0b43c646ccae0f11325d5ca64ee1a325ac404ec6e5feb6148d
+DIST doconce-1.4.4.tar.bz2 112713371 BLAKE2B 65acba4d02095d616c5ca6a070bb4a80ae57b4f201d9810f7b88e212e1ea86bd211440213194c4d61a2eefd19dfa9de9f81376d3e535f032747a8102bfdc2160 SHA512 9b5caae789a395bcdbb4daeea57182f2ea21a2c3c4da0abae2c097351fece601da6901de8d89ab60a187c1bc0ba5f913bbee14a847c1f85020dc16e0cdffdf31
+EBUILD doconce-1.3.ebuild 509 BLAKE2B f05c8416ac6cf3963229007f51b538384181c6332a73ee4ed4cac73dcc2e88b0cfe76665fc26dba0ebbe5a52b6b3244bd4d4daa738de37f54fa19da8e0b82345 SHA512 c54d6797c6f8397c7b4de5f8d5036d20481000105a85d5e4ebf06246d76d084b5370b811d8bbdc88164c7366231ccf53666f7788309f871260b161091478653c
+EBUILD doconce-1.4.4.ebuild 781 BLAKE2B b0440491855d426fbb79fd529e639b3721737722ec4f27bc16fa97f5e5648890a8de411a60468efa9bf0492aa98032c449283acc4b24141830e868c28cb65741 SHA512 f144b7160e38817ef00c443f2083fe854775023db6df98f30bdb9943cde6705bb25aa04fb490084efbc1485da4d21ef4ac142d62cb85a7e8413ef2f5943eca0e
+MISC metadata.xml 886 BLAKE2B 0e17aef2ca8b68603b8d8b83d719d6224e3891594c07070acebfa25c22b7860e92dcc0cd856227626299c1d5f12d04f7e279afea75b7bb508854ea9ea15ecdf6 SHA512 51fd63b9e6ebef041891046676a22e11eb4addefa5730632f48843509fdfb7cb16d612b55941222d690a305ee50cf2d66557bdde64f6db35c71efe39019ca55b
diff --git a/app-text/doconce/doconce-1.3.ebuild b/app-text/doconce/doconce-1.3.ebuild
new file mode 100644
index 000000000000..065c118dc878
--- /dev/null
+++ b/app-text/doconce/doconce-1.3.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+inherit distutils-r1
+
+DESCRIPTION="A markdown-like langauge to generate docs in html, LaTeX, and many other formats"
+HOMEPAGE="https://github.com/hplgit/doconce/ https://pypi.org/project/doconce/"
+SRC_URI="https://dev.gentoo.org/~grozin/${P}.tar.bz2"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+KEYWORDS="~amd64 ~x86"
+DEPEND="dev-python/future"
+RDEPEND="${DEPEND}"
diff --git a/app-text/doconce/doconce-1.4.4.ebuild b/app-text/doconce/doconce-1.4.4.ebuild
new file mode 100644
index 000000000000..8752b80e9b24
--- /dev/null
+++ b/app-text/doconce/doconce-1.4.4.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
+inherit distutils-r1
+
+DESCRIPTION="A markdown-like langauge to generate docs in html, LaTeX, and many other formats"
+HOMEPAGE="https://github.com/hplgit/doconce/ https://pypi.org/project/Doconce/"
+SRC_URI="https://dev.gentoo.org/~grozin/${P}.tar.bz2"
+LICENSE="BSD"
+SLOT="0"
+IUSE="doc"
+KEYWORDS="~amd64 ~x86"
+RDEPEND="dev-python/future[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+src_install() {
+	default
+	if use doc; then
+		sed -e "s|http://hplgit.github.io/doconce/doc|file:///usr/share/doc/${PF}|g" -i doc/web/index.html
+		docompress -x /usr/share/doc
+		dodoc -r doc/web doc/pub
+	fi
+}
diff --git a/app-text/doconce/metadata.xml b/app-text/doconce/metadata.xml
new file mode 100644
index 000000000000..b9c4307747b0
--- /dev/null
+++ b/app-text/doconce/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>grozin@gentoo.org</email>
+    <name>Andrey Grozin</name>
+  </maintainer>
+  <longdescription lang="en">
+    DocOnce is a modestly tagged (Markdown-like) markup language targeting scientific reports,
+    software documentation, books, blog posts, and slides involving much math and code in the text.
+    From DocOnce source you can generate LaTeX, Sphinx, HTML, IPython notebooks, Markdown,
+    MediaWiki, and other formats.
+    This means that you from a single source can get the most up-to-date publishing technologies
+    for paper, tablets, and phones.
+  </longdescription>
+  <upstream>
+    <remote-id type="pypi">Doconce</remote-id>
+    <remote-id type="github">hplgit/doconce</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-text/docx2txt-1.2 b/app-text/docx2txt-1.2
deleted file mode 100644
index a713daf69381..000000000000
--- a/app-text/docx2txt-1.2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=Convert MS Office docx files to plain text
-EAPI=4
-HOMEPAGE=http://docx2txt.sourceforge.net/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=app-arch/unzip dev-lang/perl
-SLOT=0
-SRC_URI=mirror://sourceforge/docx2txt/docx2txt-1.2.tgz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=bc8263ef4eafc4f19a3864dd87f58ed0
diff --git a/app-text/docx2txt-1.3 b/app-text/docx2txt-1.3
deleted file mode 100644
index 39aab6adb0a9..000000000000
--- a/app-text/docx2txt-1.3
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=Convert MS Office docx files to plain text
-EAPI=5
-HOMEPAGE=http://docx2txt.sourceforge.net/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=app-arch/unzip dev-lang/perl
-SLOT=0
-SRC_URI=mirror://sourceforge/docx2txt/docx2txt-1.3.tgz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=00e9a2b9955371ef7dc09f4c06c6f10c
diff --git a/app-text/docx2txt-1.4 b/app-text/docx2txt-1.4
deleted file mode 100644
index 0c281f3a6691..000000000000
--- a/app-text/docx2txt-1.4
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=Convert MS Office docx files to plain text
-EAPI=5
-HOMEPAGE=http://docx2txt.sourceforge.net/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=app-arch/unzip dev-lang/perl
-SLOT=0
-SRC_URI=mirror://sourceforge/docx2txt/docx2txt-1.4.tgz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=00e9a2b9955371ef7dc09f4c06c6f10c
diff --git a/app-text/docx2txt/Manifest b/app-text/docx2txt/Manifest
new file mode 100644
index 000000000000..d8c37c163efb
--- /dev/null
+++ b/app-text/docx2txt/Manifest
@@ -0,0 +1,8 @@
+AUX docx2txt-1.1-paragraph-newline.patch 220 BLAKE2B 0eb924a1d303058952947daf449cc74969094a57b5c4c045ce991a48394543982595d0be3c72d9845893a5836af704b244a52a974bb676ae569fb3f8758cfa06 SHA512 07d8686e1bd1f5ad1b18a5a3559667243dd9e580dff52711090843d5814736a371c382c2ad12d2dd01bbd827acc9a6f420d34f3ff4d02f9fb5864c07e86ec39f
+DIST docx2txt-1.2.tgz 28483 BLAKE2B b6b8cdb1ef44821bcc828178037230b89324f404cb3199df4e3262541fed379f24bf3bfb4c707c378656387783f2be8724568e248615e0ee5e9e956c9f0a5a0a SHA512 ba5884c4d85e23aad26f74727b40e2d9d43cdf2e63f270486cbbfed5ef431f44f8f40a2583d3185fa3c16a97d9cd78e84feaf8f1f7be78ae9e1662e04a2013d6
+DIST docx2txt-1.3.tgz 29953 BLAKE2B 6bacf445aace71a0897f9e7541d3ca721b2be2b47bafb416a1627266ecd03e249752135673723c42b35341cc02083504ea6cc97e4b99263b67799243e7a9807d SHA512 9ad74558074cd3e72b0d2e6541dc56d7b74d59d6313fb0cde1b2f02a0e1cdb05d705a650c0dde02e5b3a683f8ee6ab2fb5b865301f4213cd3e8770cd9e4d0d97
+DIST docx2txt-1.4.tgz 31302 BLAKE2B 3f57b95e40eb92f5b16f38fab7122cd75b23be0f1489bc83ea68f6feb16c14ad524119468da44ac5bc3989a1d61336c436a862b58bc3d83a565bd61b031c8f4f SHA512 5e59cd4065f409c20e17b29d3935a2637147392e86a325b28b78748d3b3867ce91f14f3349621b3c95b2ce6a8e38e33cf0816d1f9dccbebfdde9ba29fbd7f5b3
+EBUILD docx2txt-1.2.ebuild 575 BLAKE2B 2454a9853dddd078578c233b6d0ed6f8b982f2858e14f5ec0dc33315b2aabdae72c860cea8926d05d8a00e7fb6cd87251dfaf84eecccfbed51a57c4590dfd7d2 SHA512 4bdfb666d79f5ebc7931dba558e51d856475b7dd2b7ba5880432cf6092c093e2292c24c2a0bb76009e4435b189beaf1c5a55e22edfb6c9df2835bebd562d9385
+EBUILD docx2txt-1.3.ebuild 567 BLAKE2B 07c52bae964229e9bd5bd0e697736700da5701271946b357de45c86d80bc3d1664a54ab12d4672fd7678851de16eae903222fc04f65cd36b1b262b116a3dd14d SHA512 ac564249b0c17e504c0ddf1c1c08ae08cf3efce67cda334b98bf12bff6e5ac43607dc070319bb074aae7567c4d69dee8819d4d414732a0df1ccfbb28f5dfdad0
+EBUILD docx2txt-1.4.ebuild 567 BLAKE2B 07c52bae964229e9bd5bd0e697736700da5701271946b357de45c86d80bc3d1664a54ab12d4672fd7678851de16eae903222fc04f65cd36b1b262b116a3dd14d SHA512 ac564249b0c17e504c0ddf1c1c08ae08cf3efce67cda334b98bf12bff6e5ac43607dc070319bb074aae7567c4d69dee8819d4d414732a0df1ccfbb28f5dfdad0
+MISC metadata.xml 324 BLAKE2B c21d58ffd0d6eed375048e4b645751ac3c52046bc52182a56e2a34215e732b3d78a044a5d36eca86fd403b1afc196b4202de8a4586627b9d9ddf9aafea4e4b6a SHA512 f350709b5ea69be8bf2912b0bac7d26d3cc0828f5674d4c4d0b19fc79e1d1a65a636a25165bcfdd93f998cc4fd0a27cc3f15ab3b8c5b9bdb7ab201ad639a32c4
diff --git a/app-text/docx2txt/docx2txt-1.2.ebuild b/app-text/docx2txt/docx2txt-1.2.ebuild
new file mode 100644
index 000000000000..e69c82daabf5
--- /dev/null
+++ b/app-text/docx2txt/docx2txt-1.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit eutils
+
+DESCRIPTION="Convert MS Office docx files to plain text"
+HOMEPAGE="http://docx2txt.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="app-arch/unzip
+	dev-lang/perl"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.1-paragraph-newline.patch
+}
+
+src_compile() { :; }
+
+src_install() {
+	newbin docx2txt.pl docx2txt
+	dodoc docx2txt.config README ChangeLog ToDo AUTHORS
+}
diff --git a/app-text/docx2txt/docx2txt-1.3.ebuild b/app-text/docx2txt/docx2txt-1.3.ebuild
new file mode 100644
index 000000000000..322943c0bd9e
--- /dev/null
+++ b/app-text/docx2txt/docx2txt-1.3.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="Convert MS Office docx files to plain text"
+HOMEPAGE="http://docx2txt.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="app-arch/unzip
+	dev-lang/perl"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.1-paragraph-newline.patch
+}
+
+src_compile() { :; }
+
+src_install() {
+	newbin docx2txt.pl docx2txt
+	dodoc docx2txt.config README ChangeLog ToDo AUTHORS
+}
diff --git a/app-text/docx2txt/docx2txt-1.4.ebuild b/app-text/docx2txt/docx2txt-1.4.ebuild
new file mode 100644
index 000000000000..322943c0bd9e
--- /dev/null
+++ b/app-text/docx2txt/docx2txt-1.4.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="Convert MS Office docx files to plain text"
+HOMEPAGE="http://docx2txt.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="app-arch/unzip
+	dev-lang/perl"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.1-paragraph-newline.patch
+}
+
+src_compile() { :; }
+
+src_install() {
+	newbin docx2txt.pl docx2txt
+	dodoc docx2txt.config README ChangeLog ToDo AUTHORS
+}
diff --git a/app-text/docx2txt/files/docx2txt-1.1-paragraph-newline.patch b/app-text/docx2txt/files/docx2txt-1.1-paragraph-newline.patch
new file mode 100644
index 000000000000..7c55b6f1fe42
--- /dev/null
+++ b/app-text/docx2txt/files/docx2txt-1.1-paragraph-newline.patch
@@ -0,0 +1,11 @@
+--- docx2txt-1.1/docx2txt.pl.orig
++++ docx2txt-1.1/docx2txt.pl
+@@ -312,7 +312,7 @@
+     $para =~ s/<.*?>//og;
+     return justify($align,$para) if $align;
+ 
+-    return $para;
++    return $para . $config_newLine;
+ }
+ 
+ 
diff --git a/app-text/docx2txt/metadata.xml b/app-text/docx2txt/metadata.xml
new file mode 100644
index 000000000000..53a9f8521314
--- /dev/null
+++ b/app-text/docx2txt/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>radhermit@gentoo.org</email>
+		<name>Tim Harder</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">docx2txt</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/dos2unix-7.3.5 b/app-text/dos2unix-7.3.5
deleted file mode 100644
index c592db445e9e..000000000000
--- a/app-text/dos2unix-7.3.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=!app-text/hd2u virtual/libintl nls? ( sys-devel/gettext ) test? ( virtual/perl-Test-Simple ) dev-lang/perl
-DESCRIPTION=Convert DOS or MAC text files to UNIX format or vice versa
-EAPI=6
-HOMEPAGE=http://www.xs4all.nl/~waterlan/dos2unix.html https://sourceforge.net/projects/dos2unix/
-IUSE=debug nls test
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris
-LICENSE=BSD-2
-RDEPEND=!app-text/hd2u virtual/libintl
-SLOT=0
-SRC_URI=http://www.xs4all.nl/~waterlan/dos2unix/dos2unix-7.3.5.tar.gz mirror://sourceforge/dos2unix/dos2unix-7.3.5.tar.gz
-_eclasses_=l10n	97f2753e3f1f3753d53d856c7c0bbb0b	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=75310ee0255116f7c96d08ddbbf4f543
diff --git a/app-text/dos2unix-7.4.0 b/app-text/dos2unix-7.4.0
deleted file mode 100644
index 83fa3e4852af..000000000000
--- a/app-text/dos2unix-7.4.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=!app-text/hd2u virtual/libintl nls? ( sys-devel/gettext ) test? ( virtual/perl-Test-Simple ) dev-lang/perl
-DESCRIPTION=Convert DOS or MAC text files to UNIX format or vice versa
-EAPI=6
-HOMEPAGE=http://www.xs4all.nl/~waterlan/dos2unix.html https://sourceforge.net/projects/dos2unix/
-IUSE=debug nls test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris
-LICENSE=BSD-2
-RDEPEND=!app-text/hd2u virtual/libintl
-SLOT=0
-SRC_URI=http://www.xs4all.nl/~waterlan/dos2unix/dos2unix-7.4.0.tar.gz mirror://sourceforge/dos2unix/dos2unix-7.4.0.tar.gz
-_eclasses_=l10n	97f2753e3f1f3753d53d856c7c0bbb0b	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=86cc43083509070faffe0aff2cf1c995
diff --git a/app-text/dos2unix/Manifest b/app-text/dos2unix/Manifest
new file mode 100644
index 000000000000..891e3e57a5fa
--- /dev/null
+++ b/app-text/dos2unix/Manifest
@@ -0,0 +1,5 @@
+DIST dos2unix-7.3.5.tar.gz 662133 BLAKE2B e24f77d92fe0c5931f9ca762b79a1713b14cc39b7566f78d55c4fd58bb7d3c0de1f2a8add8ffd6c3fa26a6bae73c412572fc71701e26b7b52f15b51b0de0d294 SHA512 beafefa715d894ec51bd808b18485bcf413f93b888203486e659f7e30b922b32b2f1da2305ef9ae85e54085ba3819bd512957bb872b529fe4728000cec7d3e58
+DIST dos2unix-7.4.0.tar.gz 710339 BLAKE2B 629c4a410f0cbb0b5b0fdb89c03fbec1965759a747309ad8a4459820bf2151d1861f4040d67ce6934ca27cfc3b6d0495eccd0966045803f065b10520808d9686 SHA512 41be6b0c747f4a8e316eccecd468c8250aa6791962485569eb9496def60818ae434d619b5cfb5f80f15f8d17800314f5aefe229dc5d37faaa34e1270575175e9
+EBUILD dos2unix-7.3.5.ebuild 2037 BLAKE2B edfc091f5ae520b92c58aa58b5273a1748c07741a64ad37fa9b06458c257b2e394fd43c56ae46c562f40a8331c9360e486f7d1e27957bff1f6e0c783b4f5a0f8 SHA512 be9ba30896b2e246b978ec3184c593c85e06e3b223fcdce599874645477f35c4161a6a1261379dbed08db2556eb9c472f6a89959a636887cfdd51ff924377dbe
+EBUILD dos2unix-7.4.0.ebuild 2046 BLAKE2B b76c15a3753bcfe22324fd3caafd4e4a1286d6d96bc379a3e23854dcc9bb7bb1344e7661cbdcc846caa1e740bee2a428f88408dea8ea6298735d15e2d8ffbfc5 SHA512 27fc2bd3e3e43512d4ab571ca5ddfb4f6ba8e0940eb8bd65c9d90f0c602822334f5789f3a2101311006fb614708ca32396ae8c3d24b8b313aa9248c8cd76d350
+MISC metadata.xml 343 BLAKE2B c4023a36777a79352885528afd87e7709255ccf7f02d9ba28e29eb11f6c67c2775eeeec4f2db95b427b94859e70e7cd276984bca828eb872116e7ec33751c31c SHA512 12f79ed9fdd8df3c05110ea2a31123ca92a855cdf9287910802cb4e68c384764cc84c29929376426b23bfe9699574dbbdc2105d82c6e2701aa9fe67079d867f3
diff --git a/app-text/dos2unix/dos2unix-7.3.5.ebuild b/app-text/dos2unix/dos2unix-7.3.5.ebuild
new file mode 100644
index 000000000000..d871ca54b250
--- /dev/null
+++ b/app-text/dos2unix/dos2unix-7.3.5.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="da de eo es fr hu ja nb nl pl pt_BR ru sr sv uk vi zh_CN zh_TW"
+
+inherit l10n toolchain-funcs
+
+DESCRIPTION="Convert DOS or MAC text files to UNIX format or vice versa"
+HOMEPAGE="http://www.xs4all.nl/~waterlan/dos2unix.html https://sourceforge.net/projects/dos2unix/"
+SRC_URI="
+	http://www.xs4all.nl/~waterlan/${PN}/${P}.tar.gz
+	mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
+IUSE="debug nls test"
+
+RDEPEND="
+	!app-text/hd2u
+	virtual/libintl"
+
+DEPEND="
+	${RDEPEND}
+	nls? ( sys-devel/gettext )
+	test? ( virtual/perl-Test-Simple )
+	dev-lang/perl"
+
+handle_locales() {
+	# Make sure locale list is kept up-to-date.
+	local detected sorted
+	detected=$(echo $(printf '%s\n' */*.po | sed -e 's:.*/::' -e 's:.po$::' | sort -u))
+	sorted=$(echo $(printf '%s\n' ${PLOCALES} | sort -u))
+	if [[ ${sorted} != "${detected}" ]] ; then
+		eerror "The ebuild needs to be kept in sync."
+		eerror "PLOCALES: ${sorted}"
+		eerror "po*/*.po: ${detected}"
+		die "sync PLOCALES"
+	fi
+
+	# Deal with selective install of locales.
+	rm_loc() { rm po*/$1.po || die; }
+	l10n_for_each_disabled_locale_do rm_loc
+}
+
+src_prepare() {
+	default
+
+	handle_locales
+
+	sed \
+		-e '/^LDFLAGS/s|=|+=|' \
+		-e '/CFLAGS_OS \+=/d' \
+		-e '/LDFLAGS_EXTRA \+=/d' \
+		-e "/^CFLAGS/s|-O2|${CFLAGS}|" \
+		-i Makefile || die
+
+	if use debug ; then
+		sed -e "/^DEBUG/s:0:1:" \
+			-e "/EXTRA_CFLAGS +=/s:-g::" \
+			-i Makefile || die
+	fi
+
+	tc-export CC
+}
+
+lintl() {
+	# same logic as from virtual/libintl
+	use !elibc_glibc && use !elibc_uclibc && use !elibc_musl && echo "-lintl"
+}
+
+src_compile() {
+	emake prefix="${EPREFIX}/usr" \
+		$(usex nls "LDFLAGS_EXTRA=$(lintl)" "ENABLE_NLS=")
+}
+
+src_install() {
+	emake DESTDIR="${D}" prefix="${EPREFIX}/usr" \
+		$(usex nls "" "ENABLE_NLS=") install
+}
diff --git a/app-text/dos2unix/dos2unix-7.4.0.ebuild b/app-text/dos2unix/dos2unix-7.4.0.ebuild
new file mode 100644
index 000000000000..7e09f7d15bea
--- /dev/null
+++ b/app-text/dos2unix/dos2unix-7.4.0.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="da de eo es fr hu ja nb nl pl pt_BR ru sr sv uk vi zh_CN zh_TW"
+
+inherit l10n toolchain-funcs
+
+DESCRIPTION="Convert DOS or MAC text files to UNIX format or vice versa"
+HOMEPAGE="http://www.xs4all.nl/~waterlan/dos2unix.html https://sourceforge.net/projects/dos2unix/"
+SRC_URI="
+	http://www.xs4all.nl/~waterlan/${PN}/${P}.tar.gz
+	mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
+IUSE="debug nls test"
+
+RDEPEND="
+	!app-text/hd2u
+	virtual/libintl"
+
+DEPEND="
+	${RDEPEND}
+	nls? ( sys-devel/gettext )
+	test? ( virtual/perl-Test-Simple )
+	dev-lang/perl"
+
+handle_locales() {
+	# Make sure locale list is kept up-to-date.
+	local detected sorted
+	detected=$(echo $(printf '%s\n' */*.po | sed -e 's:.*/::' -e 's:.po$::' | sort -u))
+	sorted=$(echo $(printf '%s\n' ${PLOCALES} | sort -u))
+	if [[ ${sorted} != "${detected}" ]] ; then
+		eerror "The ebuild needs to be kept in sync."
+		eerror "PLOCALES: ${sorted}"
+		eerror "po*/*.po: ${detected}"
+		die "sync PLOCALES"
+	fi
+
+	# Deal with selective install of locales.
+	rm_loc() { rm po*/$1.po || die; }
+	l10n_for_each_disabled_locale_do rm_loc
+}
+
+src_prepare() {
+	default
+
+	handle_locales
+
+	sed \
+		-e '/^LDFLAGS/s|=|+=|' \
+		-e '/CFLAGS_OS \+=/d' \
+		-e '/LDFLAGS_EXTRA \+=/d' \
+		-e "/^CFLAGS/s|-O2|${CFLAGS}|" \
+		-i Makefile || die
+
+	if use debug ; then
+		sed -e "/^DEBUG/s:0:1:" \
+			-e "/EXTRA_CFLAGS +=/s:-g::" \
+			-i Makefile || die
+	fi
+
+	tc-export CC
+}
+
+lintl() {
+	# same logic as from virtual/libintl
+	use !elibc_glibc && use !elibc_uclibc && use !elibc_musl && echo "-lintl"
+}
+
+src_compile() {
+	emake prefix="${EPREFIX}/usr" \
+		$(usex nls "LDFLAGS_EXTRA=$(lintl)" "ENABLE_NLS=")
+}
+
+src_install() {
+	emake DESTDIR="${D}" prefix="${EPREFIX}/usr" \
+		$(usex nls "" "ENABLE_NLS=") install
+}
diff --git a/app-text/dos2unix/metadata.xml b/app-text/dos2unix/metadata.xml
new file mode 100644
index 000000000000..963ee8fb3de7
--- /dev/null
+++ b/app-text/dos2unix/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>shell-tools@gentoo.org</email>
+		<name>Gentoo Shell Tools Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">dos2unix</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/duali-0.2.0-r1 b/app-text/duali-0.2.0-r1
deleted file mode 100644
index eb348e4f6aae..000000000000
--- a/app-text/duali-0.2.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=install setup
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[gdbm] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
-DESCRIPTION=Arabic dictionary based on the DICT protocol
-EAPI=6
-HOMEPAGE=https://www.arabeyes.org/Duali
-IUSE=python_targets_python2_7
-KEYWORDS=alpha amd64 ~hppa ~ia64 ~mips ~ppc ~sparc x86
-LICENSE=BSD
-PDEPEND=>=app-dicts/duali-data-0.1b-r1
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[gdbm] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=mirror://sourceforge/arabeyes/duali-0.2.0.tar.bz2
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=29aefd2543659c26ce8e83ed90d4a534
diff --git a/app-text/duali/Manifest b/app-text/duali/Manifest
new file mode 100644
index 000000000000..fc94bcfb9aaa
--- /dev/null
+++ b/app-text/duali/Manifest
@@ -0,0 +1,3 @@
+DIST duali-0.2.0.tar.bz2 13334 BLAKE2B 28366eedef3c37d40b88c1458cbc420be6dd44b252bd7b176939f1d794ef29659109d19bb7328388b6ef3e16ba8dc0c500fd962525b3e05c44900092687f5cd2 SHA512 9234647b722a54fce8f947f2f0eb8cc121e5bdd32bcf606bc8ff71854eaf68655474e374b3328b2a20af58484e5962dadf716bc220f7fd697a8cfbb99afb2d30
+EBUILD duali-0.2.0-r1.ebuild 946 BLAKE2B 78caa7e0559bdb52769781be9b23d1ae5632a1d7e281444b13a005ec26b744a78e128aeaf7791c01c751890af57dc70186a862e364d71632b7bd0bd96df7802c SHA512 76f7b3f2cef67e6e6c46c93e9f4fbac440a7fe0d4ff4d34e276d3ba918868d6c7c2750f6bb09226ee33950888b1853705daed2ef46f5c447c60163dd7fbd3762
+MISC metadata.xml 245 BLAKE2B 7dc5df660e9e3cc71fcd39abbcc77edc7890bd44fa6e2d68556b914e6a35c6e6526e281b6aa286a0f12893a527669c2fbf64d63c8ad555137e222832edaf2cc1 SHA512 5cf81ad67c841f8eb5a71ef18b6ae6c344d68fb63c80c21f4a9b9a0060de938264530276a152eb5451dd88a5955f04a48c8cd4d034be6bc7a1922b5e4f43539f
diff --git a/app-text/duali/duali-0.2.0-r1.ebuild b/app-text/duali/duali-0.2.0-r1.ebuild
new file mode 100644
index 000000000000..4eb15157f591
--- /dev/null
+++ b/app-text/duali/duali-0.2.0-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+# Duali uses "anydbm" which should even support a slow fallback;
+# however, due to implementation details it fails when the databases
+# aren't gdbm.
+PYTHON_REQ_USE="gdbm"
+
+inherit python-single-r1
+
+DESCRIPTION="Arabic dictionary based on the DICT protocol"
+HOMEPAGE="https://www.arabeyes.org/Duali"
+SRC_URI="mirror://sourceforge/arabeyes/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 ~hppa ~ia64 ~mips ~ppc ~sparc x86"
+IUSE=""
+
+DEPEND="${PYTHON_DEPS}"
+RDEPEND="${DEPEND}"
+PDEPEND=">=app-dicts/duali-data-0.1b-r1"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+src_install() {
+	python_fix_shebang duali dict2db trans2arabic arabic2trans
+	python_doexe duali dict2db trans2arabic arabic2trans
+
+	insinto /etc
+	doins duali.conf
+
+	doman doc/man/*.1
+	dodoc README ChangeLog
+
+	python_domodule pyduali
+}
diff --git a/app-text/duali/metadata.xml b/app-text/duali/metadata.xml
new file mode 100644
index 000000000000..c8c6479d60fe
--- /dev/null
+++ b/app-text/duali/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="sourceforge">arabeyes</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/dvipng-1.15 b/app-text/dvipng-1.15
deleted file mode 100644
index 4eaf73cf3ec0..000000000000
--- a/app-text/dvipng-1.15
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure
-DEPEND=dev-libs/kpathsea:= media-libs/gd:2=[jpeg,png] media-libs/libpng:0= virtual/latex-base sys-libs/zlib truetype? ( >=media-libs/freetype-2.1.5 ) virtual/texi2dvi virtual/pkgconfig test? ( dev-texlive/texlive-fontsrecommended )
-DESCRIPTION=Translate DVI files into PNG or GIF graphics
-EAPI=5
-HOMEPAGE=http://dvipng.sourceforge.net/
-IUSE=truetype test
-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 ~x86-solaris
-LICENSE=LGPL-3+ Texinfo-manual
-RDEPEND=dev-libs/kpathsea:= media-libs/gd:2=[jpeg,png] media-libs/libpng:0= virtual/latex-base sys-libs/zlib truetype? ( >=media-libs/freetype-2.1.5 )
-SLOT=0
-SRC_URI=mirror://sourceforge/dvipng/dvipng-1.15.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=239b90ec1952fd5c4924f803af716303
diff --git a/app-text/dvipng-1.15-r1 b/app-text/dvipng-1.15-r1
deleted file mode 100644
index e82a6adf9b73..000000000000
--- a/app-text/dvipng-1.15-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure prepare
-DEPEND=>=dev-libs/kpathsea-6.2.1:= media-libs/gd:2=[jpeg,png] media-libs/libpng:0= virtual/latex-base sys-libs/zlib truetype? ( >=media-libs/freetype-2.1.5 ) virtual/texi2dvi virtual/pkgconfig test? ( dev-texlive/texlive-fontsrecommended ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Translate DVI files into PNG or GIF graphics
-EAPI=6
-HOMEPAGE=http://dvipng.sourceforge.net/
-IUSE=truetype test
-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 ~x86-solaris
-LICENSE=LGPL-3+ Texinfo-manual
-RDEPEND=>=dev-libs/kpathsea-6.2.1:= media-libs/gd:2=[jpeg,png] media-libs/libpng:0= virtual/latex-base sys-libs/zlib truetype? ( >=media-libs/freetype-2.1.5 )
-SLOT=0
-SRC_URI=mirror://sourceforge/dvipng/dvipng-1.15.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1a36f53d62871113d301554e6ad6d07d
diff --git a/app-text/dvipng/Manifest b/app-text/dvipng/Manifest
new file mode 100644
index 000000000000..19cf5b581d39
--- /dev/null
+++ b/app-text/dvipng/Manifest
@@ -0,0 +1,5 @@
+AUX dvipng-1.15-freetype-config.patch 405 BLAKE2B cb60958773b1091026f4bd59cab2dbb51404a3696f61606a4394563b70e2d4a506664d91435b9485417fa8ef61a07051240b8d05861f4bf1e0196a93de69966e SHA512 65fb9900e0b929902713a0c61e5bd2cafd56828a0f294171852bd7d6a5ee44356a26e3f5a3bc57f5e0c532cc6e31a8111ca1daf52945909eecd7b7f1c74c3546
+DIST dvipng-1.15.tar.gz 171529 BLAKE2B 0653e1b6cace30cd510c0a4f7a5ac4c88d3e17a6283693b93202529b1453dcc1617ed5906112206bfb872af093d871163cc6a117be13575211712901ac541070 SHA512 54647526a9d3a26d2ba9c7ef17f285a426d9df06ffb1d5336a1da95cbf24cd17505ba7f6b1ffd14a0beb7f91ab3e519612ce3d3ea3f30c278733127dfbf07c5c
+EBUILD dvipng-1.15-r1.ebuild 1307 BLAKE2B 2619278b779ec4dc561243e6ae0b17681f6a300b4cf4dd85416c621fbaa41c043461fef86e564a0fab2846c7e151a545ef8ebaaa6ca71d9b25bcb0813a9b18c9 SHA512 652146959955e0d6be1dfddbbfe4690d9d990b94fee92aa6a443d3380a27bc14b1f7595ac7ffd216e6cf1e57fcb5aee166baefb6d9d371825e86cd956b2856c1
+EBUILD dvipng-1.15.ebuild 1121 BLAKE2B 3975d100ff1722886fc277ad7d37584bce315d6e3ced9e5cb62e86bab7430483cbf6bd6dba30fc2227097e9b6e247c7b65bf8590dad4c70476205f579b2b277d SHA512 95692a71c955e8d9ff08b32171831148aa455a60b765e2b1beea7687da1eeb1d8e7b9f0acd9c8da4a3f2173f26f1b77f6c2d67210d538eed25a88f80075eb82f
+MISC metadata.xml 1122 BLAKE2B fcfe5bf7616dd40ccaa74751ba1c653012de0f263ae8c4764363c4a5b1ce9546a335b7e2c0917a9d2a0a30cde98bcc5b8e3184619b83f1d6267d7172584144d2 SHA512 c2f663c6ae8113fc462e16ce50ef44172c8d5cffaf34e9095701df7e3ae568126bb782c8a02e3d735239ea7263e6cd9778bf21f4d7166c24799a9090ecd8bc26
diff --git a/app-text/dvipng/dvipng-1.15-r1.ebuild b/app-text/dvipng/dvipng-1.15-r1.ebuild
new file mode 100644
index 000000000000..14d8b025c605
--- /dev/null
+++ b/app-text/dvipng/dvipng-1.15-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools flag-o-matic toolchain-funcs
+
+DESCRIPTION="Translate DVI files into PNG or GIF graphics"
+HOMEPAGE="http://dvipng.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-3+ Texinfo-manual"
+SLOT="0"
+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 ~x86-solaris"
+IUSE="truetype test"
+
+RDEPEND="
+	>=dev-libs/kpathsea-6.2.1:=
+	media-libs/gd:2=[jpeg,png]
+	media-libs/libpng:0=
+	virtual/latex-base
+	sys-libs/zlib
+	truetype? ( >=media-libs/freetype-2.1.5 )"
+DEPEND="${RDEPEND}
+	virtual/texi2dvi
+	virtual/pkgconfig
+	test? ( dev-texlive/texlive-fontsrecommended )"
+
+DOCS="ChangeLog README RELEASE"
+
+src_prepare() {
+	eapply "${FILESDIR}"/${P}-freetype-config.patch
+	eapply_user
+
+	# save local macros, since we regenerate aclocal.m4 below
+	mv aclocal.m4 acinclude.m4 || die
+	eautoreconf
+}
+
+src_configure() {
+	append-cppflags "$($(tc-getPKG_CONFIG) --cflags kpathsea)"
+	if ! use truetype; then
+		sed -i -e 's/\(--exists.*\)freetype2/\1dIsAbLe/' configure \
+			|| die "sed failed"
+	fi
+
+	export VARTEXFONTS="${T}/fonts"
+	econf
+}
diff --git a/app-text/dvipng/dvipng-1.15.ebuild b/app-text/dvipng/dvipng-1.15.ebuild
new file mode 100644
index 000000000000..6b0df705d059
--- /dev/null
+++ b/app-text/dvipng/dvipng-1.15.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Translate DVI files into PNG or GIF graphics"
+HOMEPAGE="http://dvipng.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-3+ Texinfo-manual"
+SLOT="0"
+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 ~x86-solaris"
+IUSE="truetype test"
+
+RDEPEND="
+	dev-libs/kpathsea:=
+	media-libs/gd:2=[jpeg,png]
+	media-libs/libpng:0=
+	virtual/latex-base
+	sys-libs/zlib
+	truetype? ( >=media-libs/freetype-2.1.5 )"
+DEPEND="${RDEPEND}
+	virtual/texi2dvi
+	virtual/pkgconfig
+	test? ( dev-texlive/texlive-fontsrecommended )"
+
+DOCS="ChangeLog README RELEASE"
+
+src_configure() {
+	has_version '>=dev-libs/kpathsea-6.2.1' && append-cppflags "$($(tc-getPKG_CONFIG) --cflags kpathsea)"
+	if ! use truetype; then
+		sed -i -e 's/FT_Init_FreeType/dIsAbLe&/' configure || die "sed failed"
+	fi
+
+	export VARTEXFONTS="${T}/fonts"
+	econf
+}
diff --git a/app-text/dvipng/files/dvipng-1.15-freetype-config.patch b/app-text/dvipng/files/dvipng-1.15-freetype-config.patch
new file mode 100644
index 000000000000..20b7ebaf465c
--- /dev/null
+++ b/app-text/dvipng/files/dvipng-1.15-freetype-config.patch
@@ -0,0 +1,12 @@
+--- dvipng-1.15-orig/configure.ac
++++ dvipng-1.15/configure.ac
+@@ -78,7 +78,8 @@
+ AC_CHECK_HEADERS([libgen.h])
+ PSFONTS_O=""
+ AC_SUBST(PSFONTS_O)
+-AC_CHECK_FT2(,[CFLAGS="$FT2_CFLAGS $CFLAGS"
++PKG_CHECK_MODULES([FT2], [freetype2 >= 6.1.0],
++	[CFLAGS="$FT2_CFLAGS $CFLAGS"
+ 	LIBS="$FT2_LIBS $LIBS"
+ 	PSFONTS_O="sfd.o ft.o enc.o fontmap.o tfm.o"
+ 	AC_DEFINE(HAVE_FT2, 1, [Define to 1 if you have freetype2])
diff --git a/app-text/dvipng/metadata.xml b/app-text/dvipng/metadata.xml
new file mode 100644
index 000000000000..08df7bc3b39c
--- /dev/null
+++ b/app-text/dvipng/metadata.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+  <email>tex@gentoo.org</email>
+  <name>Gentoo TeX Project</name>
+</maintainer>
+<maintainer type="project">
+  <email>emacs@gentoo.org</email>
+  <name>Gentoo Emacs project</name>
+</maintainer>
+<longdescription>
+  This program makes PNG and/or GIF graphics from DVI files as obtained
+  from TeX and its relatives.
+
+  If GIF support is enabled, GIF output is chosen by using the ‘dvigif’
+  binary or with the ‘--gif’ option.
+
+  It is intended to produce anti-aliased screen-resolution images as fast
+  as is possible. The target audience is people who need to generate and
+  regenerate many images again and again. The primary target is the
+  preview-latex (X)Emacs package, a package to preview formulas from within
+  (X)Emacs. Yes, you get to see your formulas in the (X)Emacs buffer, see
+  &lt;https://www.gnu.org/software/auctex/preview-latex.html&gt;.
+</longdescription>
+<upstream>
+  <remote-id type="sourceforge">dvipng</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/app-text/dvipsk-5.995_p20150521 b/app-text/dvipsk-5.995_p20150521
deleted file mode 100644
index a87349e78f26..000000000000
--- a/app-text/dvipsk-5.995_p20150521
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm
-DEPEND=>=dev-libs/kpathsea-6.2.1 virtual/pkgconfig
-DESCRIPTION=DVI-to-PostScript translator
-EAPI=4
-HOMEPAGE=http://tug.org/texlive/
-IUSE=doc source
-KEYWORDS=alpha amd64 arm arm64 hppa ~mips ppc ppc64 ~s390 ~sh x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=!<app-text/texlive-core-2010 !<dev-texlive/texlive-basic-2009 !app-text/ptex >=dev-libs/kpathsea-6.2.1
-SLOT=0
-SRC_URI=mirror://gentoo/texlive-20150521-source.tar.xz mirror://gentoo/texlive-module-dvips-2015.tar.xz doc? ( mirror://gentoo/texlive-module-dvips.doc-2015.tar.xz )
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1ce140c5c5e9b2c9831aa764108aab23
diff --git a/app-text/dvipsk-5.996_p20160523 b/app-text/dvipsk-5.996_p20160523
deleted file mode 100644
index 1d5bb6923b9c..000000000000
--- a/app-text/dvipsk-5.996_p20160523
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm
-DEPEND=>=dev-libs/kpathsea-6.2.1 virtual/pkgconfig
-DESCRIPTION=DVI-to-PostScript translator
-EAPI=4
-HOMEPAGE=http://tug.org/texlive/
-IUSE=doc source
-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
-LICENSE=GPL-2
-RDEPEND=!<app-text/texlive-core-2010 !<dev-texlive/texlive-basic-2009 !app-text/ptex >=dev-libs/kpathsea-6.2.1
-SLOT=0
-SRC_URI=mirror://gentoo/texlive-20160523-source.tar.xz mirror://gentoo/texlive-module-dvips-2016.tar.xz doc? ( mirror://gentoo/texlive-module-dvips.doc-2016.tar.xz )
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=4fdfb33f7bb4e534fb0c0ab595afd02e
diff --git a/app-text/dvipsk-5.997_p20170524 b/app-text/dvipsk-5.997_p20170524
deleted file mode 100644
index 5ef21f93c129..000000000000
--- a/app-text/dvipsk-5.997_p20170524
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm
-DEPEND=>=dev-libs/kpathsea-6.2.1 virtual/pkgconfig
-DESCRIPTION=DVI-to-PostScript translator
-EAPI=4
-HOMEPAGE=http://tug.org/texlive/
-IUSE=doc source
-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
-LICENSE=GPL-2
-RDEPEND=!<app-text/texlive-core-2010 !<dev-texlive/texlive-basic-2009 !app-text/ptex >=dev-libs/kpathsea-6.2.1
-SLOT=0
-SRC_URI=mirror://gentoo/texlive-20170524-source.tar.xz mirror://gentoo/texlive-module-dvips-2017.tar.xz doc? ( mirror://gentoo/texlive-module-dvips.doc-2017.tar.xz )
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9f411d82f7f2a6176fb10546f309bb1c
diff --git a/app-text/dvipsk/Manifest b/app-text/dvipsk/Manifest
new file mode 100644
index 000000000000..f7864cfa2f87
--- /dev/null
+++ b/app-text/dvipsk/Manifest
@@ -0,0 +1,13 @@
+DIST texlive-20150521-source.tar.xz 45459552 BLAKE2B 639eaee7c9dd173e5ede9f157ccd9a9655ee55cabf232985915f10afa36dce618b8b78848e5d9853bf0f96f818d03d68fa17d8abcdc4d1a1349fe13dfe3a1ddc SHA512 9d06bb88c489715787ce619c4c6b5e2d4251e1db8d48ae7fe2d1a253634c76bc6d7282ef9c93c77847845cae01eafb58dfb37ba3fb83a6d223f0d7fe8f5d3855
+DIST texlive-20160523-source.tar.xz 45941100 BLAKE2B 8752212d41d6bbabc725d9b1dcc187dd4dbb34df4271c768e83c13a2dd4e7170aa162d01a15d87fa02bc1b5abee648a2d35e3aa1380569851cc21d6f33f2f109 SHA512 915fa2f5e2099dd385ef81033db7aafdf09558c0c200fed0748a8a42fd61f69d3eaac9decea334e30981af739dd81061a9b1d6853c7f6d00285fe0be40e26c3e
+DIST texlive-20170524-source.tar.xz 63483372 BLAKE2B 44669d1228f5be27e9d93672a4f4ead40f7f4c6cf386f2db6fef54d64f8b8a743a485fe1170904d8117b9745f71ec77db8434caa6cdd79359b1f3f387130a3b4 SHA512 18c18940992ab94ce22e22ccd4ad798253ea14ac2ab296a10ea5e9a8da9f33989f2e2641b42b564d1d5fb53bd371da3e68726b676d706b469016ad146cd19daa
+DIST texlive-module-dvips-2015.tar.xz 159316 BLAKE2B 1a47ae6e5f8ccbcbe98d318d3206eba62b421b0f1d8271c10a85a1e7a1f2d7a7ee3d8fc10c07f5d28a0a9b3da34c921cdebf4cd0818e189909ac95ff0e3d00a4 SHA512 1dc167b54b4e8e5d45867247347e62a6d3613fcb20db6ae145e259e591ad96693f29f2b5ef0eecc2cb625f418c54c082646e3c36a61fdb25ea9d6715f87e6ef4
+DIST texlive-module-dvips-2016.tar.xz 34372 BLAKE2B 445cf1c46b0adeb811ff0ded3ac940de6482d2061478f302e9ae2f1af06aab36ab0a05fae04d67ef9ba7af7cd08ee4b186e43eb8b570d59652a4e4a7e3496781 SHA512 e5fb9e65f0070d52b13b94d11c72247fac71bfe45d43daf8b6bebc3f8b06d63927832bd1fbf5f66464ff1d9ae001773c650ffdd9e9b30f26dee2087b3d3118a7
+DIST texlive-module-dvips-2017.tar.xz 34372 BLAKE2B 445cf1c46b0adeb811ff0ded3ac940de6482d2061478f302e9ae2f1af06aab36ab0a05fae04d67ef9ba7af7cd08ee4b186e43eb8b570d59652a4e4a7e3496781 SHA512 e5fb9e65f0070d52b13b94d11c72247fac71bfe45d43daf8b6bebc3f8b06d63927832bd1fbf5f66464ff1d9ae001773c650ffdd9e9b30f26dee2087b3d3118a7
+DIST texlive-module-dvips.doc-2015.tar.xz 481208 BLAKE2B 973d64db8edf7dd4720d13ef81033d59bab3d771a23c533c1a95770837028cc506b5c05cfcff68b0d15912f1a8245ddb4edc244606ed556ae65a3a706fd5566a SHA512 bbe2ff14b1f2f3cc3b5b2d7866cef64f33b7a8e1a5a71a9e6efd210748ab8fa5b6be94d0efe46d3b757b1c7db7713d9dfe56164c63488142eb790990a1d99f2c
+DIST texlive-module-dvips.doc-2016.tar.xz 513008 BLAKE2B b7a7675d213298aeafe9fabef465011c8c6412c265880fb2042f8652ae0d00299f587d3da65f031a4128cee1cacf2ee911c3975ac165c1c7127900aa695b623f SHA512 ada60c607ca2034663277a15b11c37c2d1b0350193e26934ee3a96adaf15ccd4ae76a35113c44d30d471732062dfe971a4a024f64e7e028518bd7bbc05b914de
+DIST texlive-module-dvips.doc-2017.tar.xz 481464 BLAKE2B 43a82ac2a058cfd10e8cc60459e42d312159fc62ac7d5aeb69ff6aff2494391894dbc0890e4b6781de9e4d6b26eb0b910980704323e353d436fb1ffba1fdfdb6 SHA512 87c2577ee4c0a82430b165fd7864ec266d00b9a621b8964f39f2adecc427dedf63d7354c0849bc1bc9c0f220b35f47b499de5255500208881abb5ea5e2012f18
+EBUILD dvipsk-5.995_p20150521.ebuild 1944 BLAKE2B f3f3c1655be30372750d06afb40367d22169ee2cada945995fa4f92dad409abab12d7a54b5d03814d79599680c897d061686db76451fa04e304267f226ea0ce0 SHA512 a4d3295a5d8fc8d11b0023d37e3f1df30c836fbcede3c2b131f550704f959678238720705dad182f325fd181bce032615afe242f1bbafd9d68cfa1a29984d680
+EBUILD dvipsk-5.996_p20160523.ebuild 1956 BLAKE2B be85abf0a4d4ff7ade60990a777b51e7d2f7b772f10088d1b434e5a5ac10a3bc4eeb46f8d84cf945e78ac6eae4613b3900525e2182c8526af797f26f3b33e8b2 SHA512 b4d84566fb3655cf8a38c28fae357485ed3ae936d569aedd7114200cd65c19e0ba651e2c7a6f0b1410f78c1d2d3132b92b0610953763914446f0d215849f5668
+EBUILD dvipsk-5.997_p20170524.ebuild 1955 BLAKE2B 82c8390b6a5ee49ee362eb217deb8b81c7a0e7f30a906eaa03e6bd8bb87c6b22c65d74f8454099d958ea5a727502ea24f2909c8febae3b19d1424cd893ff88ff SHA512 373b51522697daf2573cd2631920609986ae780084595ef04969d08353f8076cb96029a3d04f3721f757c032ff7820b99ce1cf0fe73ce8ef81eb97a93816ae6b
+MISC metadata.xml 358 BLAKE2B b5a2e9424ef1e5bb23c34e089d9204443dd5ad528b56db71d2fc2b3c5d428c14367805ca94a307f8856d21356abe76092c54ba0f0df204b5bce3665f9f3fd657 SHA512 51f6411780af5d7775f8f80d246d5f4e297abb1960a0b0c21c6dc5c03a9a407dad8cbc4977a679590cffb4523f1b72a0f7b15ab100c938391a5abfd3e17e8818
diff --git a/app-text/dvipsk/dvipsk-5.995_p20150521.ebuild b/app-text/dvipsk/dvipsk-5.995_p20150521.ebuild
new file mode 100644
index 000000000000..881a00844932
--- /dev/null
+++ b/app-text/dvipsk/dvipsk-5.995_p20150521.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+#TL_UPSTREAM_PATCHLEVEL="1"
+
+inherit texlive-common eutils
+
+DESCRIPTION="DVI-to-PostScript translator"
+HOMEPAGE="http://tug.org/texlive/"
+SRC_URI="mirror://gentoo/texlive-${PV#*_p}-source.tar.xz"
+#SRC_URI="${SRC_URI} mirror://gentoo/texlive-core-upstream-patches-${TL_UPSTREAM_PATCHLEVEL}.tar.xz"
+
+TL_VERSION=2015
+EXTRA_TL_MODULES="dvips"
+EXTRA_TL_DOC_MODULES="dvips.doc"
+
+for i in ${EXTRA_TL_MODULES} ; do
+	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${TL_VERSION}.tar.xz"
+done
+
+SRC_URI="${SRC_URI} doc? ( "
+for i in ${EXTRA_TL_DOC_MODULES} ; do
+	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${TL_VERSION}.tar.xz"
+done
+SRC_URI="${SRC_URI} ) "
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ~mips ppc ppc64 ~s390 ~sh x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc source"
+
+DEPEND=">=dev-libs/kpathsea-6.2.1"
+RDEPEND="
+	!<app-text/texlive-core-2010
+	!<dev-texlive/texlive-basic-2009
+	!app-text/ptex
+	${DEPEND}"
+DEPEND="${DEPEND} virtual/pkgconfig"
+
+S=${WORKDIR}/texlive-${PV#*_p}-source/texk/${PN}
+
+#src_prepare() {
+#	cd "${WORKDIR}/texlive-${PV#*_p}-source/"
+#	EPATCH_MULTI_MSG="Applying patches from upstream bugfix branch..." EPATCH_SUFFIX="patch" epatch "${WORKDIR}/gentoo_branch2011_patches"
+#}
+
+src_configure() {
+	econf --with-system-kpathsea
+}
+
+src_install() {
+	emake DESTDIR="${D}" prologdir="${EPREFIX}/usr/share/texmf-dist/dvips/base" install
+
+	dodir /usr/share # just in case
+	cp -pR "${WORKDIR}"/texmf-dist "${ED}/usr/share/" || die "failed to install texmf trees"
+	if use source ; then
+		cp -pR "${WORKDIR}"/tlpkg "${ED}/usr/share/" || die "failed to install tlpkg files"
+	fi
+
+	dodoc AUTHORS ChangeLog NEWS README TODO
+}
+
+pkg_postinst() {
+	etexmf-update
+}
+
+pkg_postrm() {
+	etexmf-update
+}
diff --git a/app-text/dvipsk/dvipsk-5.996_p20160523.ebuild b/app-text/dvipsk/dvipsk-5.996_p20160523.ebuild
new file mode 100644
index 000000000000..ca8383296e89
--- /dev/null
+++ b/app-text/dvipsk/dvipsk-5.996_p20160523.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+#TL_UPSTREAM_PATCHLEVEL="1"
+
+inherit texlive-common eutils
+
+DESCRIPTION="DVI-to-PostScript translator"
+HOMEPAGE="http://tug.org/texlive/"
+SRC_URI="mirror://gentoo/texlive-${PV#*_p}-source.tar.xz"
+#SRC_URI="${SRC_URI} mirror://gentoo/texlive-core-upstream-patches-${TL_UPSTREAM_PATCHLEVEL}.tar.xz"
+
+TL_VERSION=2016
+EXTRA_TL_MODULES="dvips"
+EXTRA_TL_DOC_MODULES="dvips.doc"
+
+for i in ${EXTRA_TL_MODULES} ; do
+	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${TL_VERSION}.tar.xz"
+done
+
+SRC_URI="${SRC_URI} doc? ( "
+for i in ${EXTRA_TL_DOC_MODULES} ; do
+	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${TL_VERSION}.tar.xz"
+done
+SRC_URI="${SRC_URI} ) "
+
+LICENSE="GPL-2"
+SLOT="0"
+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="doc source"
+
+DEPEND=">=dev-libs/kpathsea-6.2.1"
+RDEPEND="
+	!<app-text/texlive-core-2010
+	!<dev-texlive/texlive-basic-2009
+	!app-text/ptex
+	${DEPEND}"
+DEPEND="${DEPEND} virtual/pkgconfig"
+
+S=${WORKDIR}/texlive-${PV#*_p}-source/texk/${PN}
+
+#src_prepare() {
+#	cd "${WORKDIR}/texlive-${PV#*_p}-source/"
+#	EPATCH_MULTI_MSG="Applying patches from upstream bugfix branch..." EPATCH_SUFFIX="patch" epatch "${WORKDIR}/gentoo_branch2011_patches"
+#}
+
+src_configure() {
+	econf --with-system-kpathsea
+}
+
+src_install() {
+	emake DESTDIR="${D}" prologdir="${EPREFIX}/usr/share/texmf-dist/dvips/base" install
+
+	dodir /usr/share # just in case
+	cp -pR "${WORKDIR}"/texmf-dist "${ED}/usr/share/" || die "failed to install texmf trees"
+	if use source ; then
+		cp -pR "${WORKDIR}"/tlpkg "${ED}/usr/share/" || die "failed to install tlpkg files"
+	fi
+
+	dodoc AUTHORS ChangeLog NEWS README TODO
+}
+
+pkg_postinst() {
+	etexmf-update
+}
+
+pkg_postrm() {
+	etexmf-update
+}
diff --git a/app-text/dvipsk/dvipsk-5.997_p20170524.ebuild b/app-text/dvipsk/dvipsk-5.997_p20170524.ebuild
new file mode 100644
index 000000000000..d118eb1d1fbf
--- /dev/null
+++ b/app-text/dvipsk/dvipsk-5.997_p20170524.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+#TL_UPSTREAM_PATCHLEVEL="1"
+
+inherit texlive-common eutils
+
+DESCRIPTION="DVI-to-PostScript translator"
+HOMEPAGE="http://tug.org/texlive/"
+SRC_URI="mirror://gentoo/texlive-${PV#*_p}-source.tar.xz"
+#SRC_URI="${SRC_URI} mirror://gentoo/texlive-core-upstream-patches-${TL_UPSTREAM_PATCHLEVEL}.tar.xz"
+
+TL_VERSION=2017
+EXTRA_TL_MODULES="dvips"
+EXTRA_TL_DOC_MODULES="dvips.doc"
+
+for i in ${EXTRA_TL_MODULES} ; do
+	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${TL_VERSION}.tar.xz"
+done
+
+SRC_URI="${SRC_URI} doc? ( "
+for i in ${EXTRA_TL_DOC_MODULES} ; do
+	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${TL_VERSION}.tar.xz"
+done
+SRC_URI="${SRC_URI} ) "
+
+LICENSE="GPL-2"
+SLOT="0"
+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="doc source"
+
+DEPEND=">=dev-libs/kpathsea-6.2.1"
+RDEPEND="
+	!<app-text/texlive-core-2010
+	!<dev-texlive/texlive-basic-2009
+	!app-text/ptex
+	${DEPEND}"
+DEPEND="${DEPEND} virtual/pkgconfig"
+
+S=${WORKDIR}/texlive-${PV#*_p}-source/texk/${PN}
+
+#src_prepare() {
+#	cd "${WORKDIR}/texlive-${PV#*_p}-source/"
+#	EPATCH_MULTI_MSG="Applying patches from upstream bugfix branch..." EPATCH_SUFFIX="patch" epatch "${WORKDIR}/gentoo_branch2011_patches"
+#}
+
+src_configure() {
+	econf --with-system-kpathsea
+}
+
+src_install() {
+	emake DESTDIR="${D}" prologdir="${EPREFIX}/usr/share/texmf-dist/dvips/base" install
+
+	dodir /usr/share # just in case
+	cp -pR "${WORKDIR}"/texmf-dist "${ED}/usr/share/" || die "failed to install texmf trees"
+	if use source ; then
+		cp -pR "${WORKDIR}"/tlpkg "${ED}/usr/share/" || die "failed to install tlpkg files"
+	fi
+
+	dodoc AUTHORS ChangeLog NEWS README TODO
+}
+
+pkg_postinst() {
+	etexmf-update
+}
+
+pkg_postrm() {
+	etexmf-update
+}
diff --git a/app-text/dvipsk/metadata.xml b/app-text/dvipsk/metadata.xml
new file mode 100644
index 000000000000..c4b55593420b
--- /dev/null
+++ b/app-text/dvipsk/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>aballier@gentoo.org</email>
+		<name>Alexis Ballier</name>
+	</maintainer>
+<maintainer type="project">
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-text/dvisvgm-1.10 b/app-text/dvisvgm-1.10
deleted file mode 100644
index 9f3dee4bb479..000000000000
--- a/app-text/dvisvgm-1.10
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure
-DEPEND=virtual/tex-base app-text/ghostscript-gpl >=media-gfx/potrace-1.10-r1 media-libs/freetype:2 dev-libs/kpathsea sys-libs/zlib app-text/xmlto app-text/asciidoc virtual/pkgconfig test? ( dev-cpp/gtest )
-DESCRIPTION=Converts DVI files to SVG
-EAPI=5
-HOMEPAGE=http://dvisvgm.sourceforge.net/
-IUSE=test
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=GPL-3
-RDEPEND=virtual/tex-base app-text/ghostscript-gpl >=media-gfx/potrace-1.10-r1 media-libs/freetype:2 dev-libs/kpathsea sys-libs/zlib
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://sourceforge/dvisvgm/dvisvgm-1.10.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=eb8113c5bab2f1bf3e6755a58be031be
diff --git a/app-text/dvisvgm-2.1.3 b/app-text/dvisvgm-2.1.3
deleted file mode 100644
index 65ed4965d189..000000000000
--- a/app-text/dvisvgm-2.1.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure
-DEPEND=virtual/tex-base app-text/ghostscript-gpl >=media-gfx/potrace-1.10-r1 media-libs/freetype:2 dev-libs/kpathsea sys-libs/zlib app-text/xmlto app-text/asciidoc dev-libs/libxslt virtual/pkgconfig test? ( dev-cpp/gtest )
-DESCRIPTION=Converts DVI files to SVG
-EAPI=5
-HOMEPAGE=http://dvisvgm.bplaced.net/
-IUSE=test
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=GPL-3
-RDEPEND=virtual/tex-base app-text/ghostscript-gpl >=media-gfx/potrace-1.10-r1 media-libs/freetype:2 dev-libs/kpathsea sys-libs/zlib
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/mgieseki/dvisvgm/releases/download/2.1.3/dvisvgm-2.1.3.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=847752eac9fa5dbc6f18b3b0ba9fc5a1
diff --git a/app-text/dvisvgm-2.3.3 b/app-text/dvisvgm-2.3.3
deleted file mode 100644
index ceb1c2a3f277..000000000000
--- a/app-text/dvisvgm-2.3.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure
-DEPEND=virtual/tex-base app-text/ghostscript-gpl dev-libs/kpathsea:= >=media-gfx/potrace-1.10-r1 media-libs/freetype:2 dev-libs/kpathsea sys-libs/zlib app-text/xmlto app-text/asciidoc dev-libs/libxslt virtual/pkgconfig test? ( dev-cpp/gtest )
-DESCRIPTION=Converts DVI files to SVG
-EAPI=6
-HOMEPAGE=http://dvisvgm.bplaced.net/
-IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=GPL-3
-RDEPEND=virtual/tex-base app-text/ghostscript-gpl dev-libs/kpathsea:= >=media-gfx/potrace-1.10-r1 media-libs/freetype:2 dev-libs/kpathsea sys-libs/zlib
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/mgieseki/dvisvgm/releases/download/2.3.3/dvisvgm-2.3.3.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e8339358563ad9113d5d8980e4dacd37
diff --git a/app-text/dvisvgm-2.3.4 b/app-text/dvisvgm-2.3.4
deleted file mode 100644
index 9c2b1ccc8d7c..000000000000
--- a/app-text/dvisvgm-2.3.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure
-DEPEND=virtual/tex-base app-text/ghostscript-gpl dev-libs/kpathsea:= >=media-gfx/potrace-1.10-r1 media-libs/freetype:2 dev-libs/kpathsea sys-libs/zlib app-text/xmlto app-text/asciidoc dev-libs/libxslt virtual/pkgconfig test? ( dev-cpp/gtest )
-DESCRIPTION=Converts DVI files to SVG
-EAPI=6
-HOMEPAGE=http://dvisvgm.bplaced.net/
-IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=GPL-3
-RDEPEND=virtual/tex-base app-text/ghostscript-gpl dev-libs/kpathsea:= >=media-gfx/potrace-1.10-r1 media-libs/freetype:2 dev-libs/kpathsea sys-libs/zlib
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/mgieseki/dvisvgm/releases/download/2.3.4/dvisvgm-2.3.4.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e8339358563ad9113d5d8980e4dacd37
diff --git a/app-text/dvisvgm-2.3.5 b/app-text/dvisvgm-2.3.5
deleted file mode 100644
index 07af9d79ace5..000000000000
--- a/app-text/dvisvgm-2.3.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure
-DEPEND=virtual/tex-base app-text/ghostscript-gpl dev-libs/kpathsea:= >=media-gfx/potrace-1.10-r1 media-libs/freetype:2 dev-libs/kpathsea sys-libs/zlib app-text/xmlto app-text/asciidoc dev-libs/libxslt virtual/pkgconfig test? ( dev-cpp/gtest )
-DESCRIPTION=Converts DVI files to SVG
-EAPI=6
-HOMEPAGE=http://dvisvgm.bplaced.net/
-IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=GPL-3
-RDEPEND=virtual/tex-base app-text/ghostscript-gpl dev-libs/kpathsea:= >=media-gfx/potrace-1.10-r1 media-libs/freetype:2 dev-libs/kpathsea sys-libs/zlib
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/mgieseki/dvisvgm/releases/download/2.3.5/dvisvgm-2.3.5.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e8339358563ad9113d5d8980e4dacd37
diff --git a/app-text/dvisvgm-2.4 b/app-text/dvisvgm-2.4
deleted file mode 100644
index 61aa85cecb6a..000000000000
--- a/app-text/dvisvgm-2.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure
-DEPEND=virtual/tex-base app-text/ghostscript-gpl dev-libs/kpathsea:= >=media-gfx/potrace-1.10-r1 media-libs/freetype:2 dev-libs/kpathsea sys-libs/zlib app-text/xmlto app-text/asciidoc dev-libs/libxslt virtual/pkgconfig test? ( dev-cpp/gtest )
-DESCRIPTION=Converts DVI files to SVG
-EAPI=6
-HOMEPAGE=http://dvisvgm.bplaced.net/
-IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=GPL-3
-RDEPEND=virtual/tex-base app-text/ghostscript-gpl dev-libs/kpathsea:= >=media-gfx/potrace-1.10-r1 media-libs/freetype:2 dev-libs/kpathsea sys-libs/zlib
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/mgieseki/dvisvgm/releases/download/2.4/dvisvgm-2.4.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e8339358563ad9113d5d8980e4dacd37
diff --git a/app-text/dvisvgm/Manifest b/app-text/dvisvgm/Manifest
new file mode 100644
index 000000000000..ce71f4cfe6f0
--- /dev/null
+++ b/app-text/dvisvgm/Manifest
@@ -0,0 +1,13 @@
+DIST dvisvgm-1.10.tar.gz 831654 BLAKE2B 7da1032f2450cec4c166b622f488859069052a5792ead77bbadc425b24640f6c969887b22d07ec682f90b19e849668e89a3b2f8edd63ce39f0d80edcd32495e1 SHA512 2d3cb2e6b36d6a3b996347b6031f67bb89bc76d2bf0244347e512e66333536638caf855d9856771b10245387abae99a06d4c6fe33def814cae639810b4cfe906
+DIST dvisvgm-2.1.3.tar.gz 2802278 BLAKE2B 36e523d4b82a71f26ebc50428c56863a3729d1cf79c63660a5a3cecdd7c55c27e7ad811121e8a2ccdaa37f1ec2fb345d1d5d4f7b59011be7877500df5dba1f48 SHA512 dfd6e94b28dcdf2d1be236f3f29eaf4e3e5b7bb34544cdd55ae09de612b02561dd782b693a9a94eea07420c795d31ef210eba34cb663d7de98f438c089369ff2
+DIST dvisvgm-2.3.3.tar.gz 2805568 BLAKE2B 9823d2a8d3b736dfbbfbe0e5d51fb20bf61b4a8d236cc24fadd6e8a918f8f8305dedc23f6d7146574f9302a006a50e33621d350425e1b3c65d780d1354e7b239 SHA512 1b170b5979049f30aaaa5a85d8b5555e87a7af987298980d25c77aebd95b6be56a8518986b8a6eb2215b6dbd32dfbdfdcecb0c81f9d5ffa856370da1b324ed18
+DIST dvisvgm-2.3.4.tar.gz 2896641 BLAKE2B af434a418b5ebbb9acaccc4626b6278f3d0c76e4434b9ccec8a0454a109481527bc0a7ac3b242a64a68ca1d71233778d3a90b4c03946db9f1e94c625109f598c SHA512 53c1820dee70f8a017a950400538aa2fe111b762d2f7d3bdb6b8be17de6603395d6e083b73292e688241e6e3adccaaaa2f9d82d5fec7818c2f5779ff28914dd9
+DIST dvisvgm-2.3.5.tar.gz 2897194 BLAKE2B 7661d6f5ac097a6dc62cf873dee84ec47b55e4a87ec07597170d309ac4d8d06fa19e0e14dab3a6273f022c71112a00af4c0bf167e37687037f0c23d1ea74f20b SHA512 fcfbb8e53233383a61c0662951dc914d157eb64c89eb30f54afc36069d3ca6a347dae7e64febafee1ba9ea8d90b278da9cbe36b70169df48f12c42c077cd1038
+DIST dvisvgm-2.4.tar.gz 2850942 BLAKE2B c1cdb4aed954bcb5704b83deba087403f366f0139b053b599029d103bd85306e58c7bffb1228d3ace02fd3be91eff002e6d1e45105bb8ccaa85945ba7bbf5210 SHA512 84f51fa8cbf0a32efe667321102b1705c613cc697d86d00df2e044cd97b1f390e1552af7da2891792ccef634507bbc6922f92f194f5acb7d05a48e268e708396
+EBUILD dvisvgm-1.10.ebuild 1090 BLAKE2B b4c79de3986a2fba7881da8c2434f1678d7b367f8b13dea7bf7421dcf68f6250681562754100a081b42c9b7d9d3d02cbadc8e7658faf26b29b6c9d2c2a317843 SHA512 d8e598f3c9b47aa88aa5aa2ec38abdb543fdcf46b48be9fa7b967be3fbba15bb1fd995498f0e6743b54c802ee7c8149eb5ea0cfc5415fe3c3371c5b2f0180ccc
+EBUILD dvisvgm-2.1.3.ebuild 1144 BLAKE2B 905c8dd91653845c82e4ab1065eb69961b5a3fb4d0e0cd61f0174f9185d5cc376ede38becab539a8a60182a1f94fcfa871b1598ce269144fe133ec23a498b9b9 SHA512 d6e0f9fba9b8636e126ebf30c7eca4c14a9e31cb3e5e7bbc220a2f49c91e293e5cdaf23321be066dd38204e8abfa06d45a08577a78da589b28f1fccaf8fd8bea
+EBUILD dvisvgm-2.3.3.ebuild 1159 BLAKE2B 69efedec3789bc0d02775fd59a275f8cc2556d05ca71540b955eb8df113e94a2235482ec76a997dfdc10cac9ce7ce6c63e8708fe07bc4d03e6ebbd818c598a66 SHA512 61970d32ed3ffcbbc41a25b5bf4b83cfee9fbda3800dc905a907d7f4749036259cb7f00e05f1ca4eef32a643bc2f909151bd7bdb2186c0e2af2dae657684e8cb
+EBUILD dvisvgm-2.3.4.ebuild 1159 BLAKE2B 69efedec3789bc0d02775fd59a275f8cc2556d05ca71540b955eb8df113e94a2235482ec76a997dfdc10cac9ce7ce6c63e8708fe07bc4d03e6ebbd818c598a66 SHA512 61970d32ed3ffcbbc41a25b5bf4b83cfee9fbda3800dc905a907d7f4749036259cb7f00e05f1ca4eef32a643bc2f909151bd7bdb2186c0e2af2dae657684e8cb
+EBUILD dvisvgm-2.3.5.ebuild 1159 BLAKE2B 69efedec3789bc0d02775fd59a275f8cc2556d05ca71540b955eb8df113e94a2235482ec76a997dfdc10cac9ce7ce6c63e8708fe07bc4d03e6ebbd818c598a66 SHA512 61970d32ed3ffcbbc41a25b5bf4b83cfee9fbda3800dc905a907d7f4749036259cb7f00e05f1ca4eef32a643bc2f909151bd7bdb2186c0e2af2dae657684e8cb
+EBUILD dvisvgm-2.4.ebuild 1159 BLAKE2B 69efedec3789bc0d02775fd59a275f8cc2556d05ca71540b955eb8df113e94a2235482ec76a997dfdc10cac9ce7ce6c63e8708fe07bc4d03e6ebbd818c598a66 SHA512 61970d32ed3ffcbbc41a25b5bf4b83cfee9fbda3800dc905a907d7f4749036259cb7f00e05f1ca4eef32a643bc2f909151bd7bdb2186c0e2af2dae657684e8cb
+MISC metadata.xml 382 BLAKE2B ccc1e78101b4a4bcd72e8898d75270b38231df2e3563f9d0ad2beb826fdfcad0da3e0ef9ed39c4f0adcb79eef87b17bc639a2414eca0d9a5dbf88795b968bb82 SHA512 0d9a02bb1979574379451b38d790a58479fa438cbb5ee657058a7259b7e5cfa441854ce8bde11ed8cfedb06adb1e6361164d6bbb258466586cb5fa9cdff852c0
diff --git a/app-text/dvisvgm/dvisvgm-1.10.ebuild b/app-text/dvisvgm/dvisvgm-1.10.ebuild
new file mode 100644
index 000000000000..4440b796de58
--- /dev/null
+++ b/app-text/dvisvgm/dvisvgm-1.10.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit toolchain-funcs flag-o-matic
+
+DESCRIPTION="Converts DVI files to SVG"
+HOMEPAGE="http://dvisvgm.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="test"
+# Tests don't work from $WORKDIR: kpathsea tries to search in relative
+# directories from where the binary is executed.
+# We cannot really use absolute paths in the kpathsea configuration since that
+# would make it harder for prefix installs.
+RESTRICT="test"
+
+RDEPEND="virtual/tex-base
+	app-text/ghostscript-gpl
+	>=media-gfx/potrace-1.10-r1
+	media-libs/freetype:2
+	dev-libs/kpathsea
+	sys-libs/zlib"
+DEPEND="${RDEPEND}
+	app-text/xmlto
+	app-text/asciidoc
+	virtual/pkgconfig
+	test? ( dev-cpp/gtest )"
+
+src_configure() {
+	has_version '>=dev-libs/kpathsea-6.2.1' && append-cppflags "$($(tc-getPKG_CONFIG) --cflags kpathsea)"
+	default
+}
diff --git a/app-text/dvisvgm/dvisvgm-2.1.3.ebuild b/app-text/dvisvgm/dvisvgm-2.1.3.ebuild
new file mode 100644
index 000000000000..1352f686af2b
--- /dev/null
+++ b/app-text/dvisvgm/dvisvgm-2.1.3.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit toolchain-funcs flag-o-matic
+
+DESCRIPTION="Converts DVI files to SVG"
+HOMEPAGE="http://dvisvgm.bplaced.net/"
+SRC_URI="https://github.com/mgieseki/dvisvgm/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="test"
+# Tests don't work from $WORKDIR: kpathsea tries to search in relative
+# directories from where the binary is executed.
+# We cannot really use absolute paths in the kpathsea configuration since that
+# would make it harder for prefix installs.
+RESTRICT="test"
+
+RDEPEND="virtual/tex-base
+	app-text/ghostscript-gpl
+	>=media-gfx/potrace-1.10-r1
+	media-libs/freetype:2
+	dev-libs/kpathsea
+	sys-libs/zlib"
+DEPEND="${RDEPEND}
+	app-text/xmlto
+	app-text/asciidoc
+	dev-libs/libxslt
+	virtual/pkgconfig
+	test? ( dev-cpp/gtest )"
+
+src_configure() {
+	has_version '>=dev-libs/kpathsea-6.2.1' && append-cppflags "$($(tc-getPKG_CONFIG) --cflags kpathsea)"
+	default
+}
diff --git a/app-text/dvisvgm/dvisvgm-2.3.3.ebuild b/app-text/dvisvgm/dvisvgm-2.3.3.ebuild
new file mode 100644
index 000000000000..e2eec8fc99a8
--- /dev/null
+++ b/app-text/dvisvgm/dvisvgm-2.3.3.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs flag-o-matic
+
+DESCRIPTION="Converts DVI files to SVG"
+HOMEPAGE="http://dvisvgm.bplaced.net/"
+SRC_URI="https://github.com/mgieseki/dvisvgm/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="test"
+# Tests don't work from $WORKDIR: kpathsea tries to search in relative
+# directories from where the binary is executed.
+# We cannot really use absolute paths in the kpathsea configuration since that
+# would make it harder for prefix installs.
+RESTRICT="test"
+
+# TODO unbundle app-arch/brotli
+RDEPEND="virtual/tex-base
+	app-text/ghostscript-gpl
+	dev-libs/kpathsea:=
+	>=media-gfx/potrace-1.10-r1
+	media-libs/freetype:2
+	dev-libs/kpathsea
+	sys-libs/zlib"
+DEPEND="${RDEPEND}
+	app-text/xmlto
+	app-text/asciidoc
+	dev-libs/libxslt
+	virtual/pkgconfig
+	test? ( dev-cpp/gtest )"
+
+src_configure() {
+	local myargs=(
+		--without-ttfautohint
+	)
+	econf "${myargs[@]}"
+}
diff --git a/app-text/dvisvgm/dvisvgm-2.3.4.ebuild b/app-text/dvisvgm/dvisvgm-2.3.4.ebuild
new file mode 100644
index 000000000000..e2eec8fc99a8
--- /dev/null
+++ b/app-text/dvisvgm/dvisvgm-2.3.4.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs flag-o-matic
+
+DESCRIPTION="Converts DVI files to SVG"
+HOMEPAGE="http://dvisvgm.bplaced.net/"
+SRC_URI="https://github.com/mgieseki/dvisvgm/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="test"
+# Tests don't work from $WORKDIR: kpathsea tries to search in relative
+# directories from where the binary is executed.
+# We cannot really use absolute paths in the kpathsea configuration since that
+# would make it harder for prefix installs.
+RESTRICT="test"
+
+# TODO unbundle app-arch/brotli
+RDEPEND="virtual/tex-base
+	app-text/ghostscript-gpl
+	dev-libs/kpathsea:=
+	>=media-gfx/potrace-1.10-r1
+	media-libs/freetype:2
+	dev-libs/kpathsea
+	sys-libs/zlib"
+DEPEND="${RDEPEND}
+	app-text/xmlto
+	app-text/asciidoc
+	dev-libs/libxslt
+	virtual/pkgconfig
+	test? ( dev-cpp/gtest )"
+
+src_configure() {
+	local myargs=(
+		--without-ttfautohint
+	)
+	econf "${myargs[@]}"
+}
diff --git a/app-text/dvisvgm/dvisvgm-2.3.5.ebuild b/app-text/dvisvgm/dvisvgm-2.3.5.ebuild
new file mode 100644
index 000000000000..e2eec8fc99a8
--- /dev/null
+++ b/app-text/dvisvgm/dvisvgm-2.3.5.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs flag-o-matic
+
+DESCRIPTION="Converts DVI files to SVG"
+HOMEPAGE="http://dvisvgm.bplaced.net/"
+SRC_URI="https://github.com/mgieseki/dvisvgm/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="test"
+# Tests don't work from $WORKDIR: kpathsea tries to search in relative
+# directories from where the binary is executed.
+# We cannot really use absolute paths in the kpathsea configuration since that
+# would make it harder for prefix installs.
+RESTRICT="test"
+
+# TODO unbundle app-arch/brotli
+RDEPEND="virtual/tex-base
+	app-text/ghostscript-gpl
+	dev-libs/kpathsea:=
+	>=media-gfx/potrace-1.10-r1
+	media-libs/freetype:2
+	dev-libs/kpathsea
+	sys-libs/zlib"
+DEPEND="${RDEPEND}
+	app-text/xmlto
+	app-text/asciidoc
+	dev-libs/libxslt
+	virtual/pkgconfig
+	test? ( dev-cpp/gtest )"
+
+src_configure() {
+	local myargs=(
+		--without-ttfautohint
+	)
+	econf "${myargs[@]}"
+}
diff --git a/app-text/dvisvgm/dvisvgm-2.4.ebuild b/app-text/dvisvgm/dvisvgm-2.4.ebuild
new file mode 100644
index 000000000000..e2eec8fc99a8
--- /dev/null
+++ b/app-text/dvisvgm/dvisvgm-2.4.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs flag-o-matic
+
+DESCRIPTION="Converts DVI files to SVG"
+HOMEPAGE="http://dvisvgm.bplaced.net/"
+SRC_URI="https://github.com/mgieseki/dvisvgm/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="test"
+# Tests don't work from $WORKDIR: kpathsea tries to search in relative
+# directories from where the binary is executed.
+# We cannot really use absolute paths in the kpathsea configuration since that
+# would make it harder for prefix installs.
+RESTRICT="test"
+
+# TODO unbundle app-arch/brotli
+RDEPEND="virtual/tex-base
+	app-text/ghostscript-gpl
+	dev-libs/kpathsea:=
+	>=media-gfx/potrace-1.10-r1
+	media-libs/freetype:2
+	dev-libs/kpathsea
+	sys-libs/zlib"
+DEPEND="${RDEPEND}
+	app-text/xmlto
+	app-text/asciidoc
+	dev-libs/libxslt
+	virtual/pkgconfig
+	test? ( dev-cpp/gtest )"
+
+src_configure() {
+	local myargs=(
+		--without-ttfautohint
+	)
+	econf "${myargs[@]}"
+}
diff --git a/app-text/dvisvgm/metadata.xml b/app-text/dvisvgm/metadata.xml
new file mode 100644
index 000000000000..b0cac41f1f5b
--- /dev/null
+++ b/app-text/dvisvgm/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">dvisvgm</remote-id>
+		<remote-id type="github">mgieseki/dvisvgm</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/ebook-tools-0.2.2-r1 b/app-text/ebook-tools-0.2.2-r1
deleted file mode 100644
index cfd4fe4af239..000000000000
--- a/app-text/ebook-tools-0.2.2-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/libxml2 dev-libs/libzip:= sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Tools for accessing and converting various ebook file formats
-EAPI=6
-HOMEPAGE=https://sourceforge.net/projects/ebook-tools
-IUSE=+lit2epub
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 x86 ~amd64-fbsd
-LICENSE=MIT
-RDEPEND=dev-libs/libxml2 dev-libs/libzip:= lit2epub? ( app-text/convertlit )
-SLOT=0
-SRC_URI=mirror://sourceforge/ebook-tools/ebook-tools-0.2.2.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2ca5e18912aaecfcfc1b32ef93e25873
diff --git a/app-text/ebook-tools/Manifest b/app-text/ebook-tools/Manifest
new file mode 100644
index 000000000000..651f16bb2428
--- /dev/null
+++ b/app-text/ebook-tools/Manifest
@@ -0,0 +1,3 @@
+DIST ebook-tools-0.2.2.tar.gz 46889 BLAKE2B 20b6ff048e9e31d2e00db3a02b67e21f3031d74aedfc663331b08f626b1816adecad5039e124462f97ff2ff7dc43f002eb39dd625f031ae42fe2b46338e94fcf SHA512 b4518249835ed7cc672392bf2f8b1c62bc218e41c53663bb26ab34c9e43a99b6b7ae794babdb4bd775e467bb17918703a66ee57c8cf94cb7afc4ba2a7f74816a
+EBUILD ebook-tools-0.2.2-r1.ebuild 664 BLAKE2B 69992871106265b158efc70104eb88307666359f5f6cf022a6556e0a53387b742e4284ceb2406759a4140a30e9b0210f4bfaa0ba31dd0e47b3086c8f01ed826c SHA512 01fb340e3630a8ca9fef435155866513c9b025ce80aebb39b0f21bac11153982ec07e18ec80366e3e54bccc0512a300b8a116decb0aacd43c85cc5abe61d1667
+MISC metadata.xml 400 BLAKE2B c225e8514134fea3843975618d6bb5b6085785eb71a9b0413bf986d752eff783f973c10fb7e6af504a3efa1c0e05475b421ff4c1f4c24bf51d4a948d485ed103 SHA512 2ab30e14742c63fc54cc75068b57d1c9fa178d6f57fb03b8b15c5649d4bdf35c5068a132c6ee50fe855a2037af67b5c2fd2229cc97b4f3e89f4eecde6d21885b
diff --git a/app-text/ebook-tools/ebook-tools-0.2.2-r1.ebuild b/app-text/ebook-tools/ebook-tools-0.2.2-r1.ebuild
new file mode 100644
index 000000000000..5c913b002dc0
--- /dev/null
+++ b/app-text/ebook-tools/ebook-tools-0.2.2-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="Tools for accessing and converting various ebook file formats"
+HOMEPAGE="https://sourceforge.net/projects/ebook-tools"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 x86 ~amd64-fbsd"
+IUSE="+lit2epub"
+
+DEPEND="
+	dev-libs/libxml2
+	dev-libs/libzip:=
+"
+RDEPEND="${DEPEND}
+	lit2epub? ( app-text/convertlit	)
+"
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	use lit2epub || sed -i -e '\|lit2epub|d' -- 'src/tools/CMakeLists.txt' || die
+}
diff --git a/app-text/ebook-tools/metadata.xml b/app-text/ebook-tools/metadata.xml
new file mode 100644
index 000000000000..b2aa1c1313bd
--- /dev/null
+++ b/app-text/ebook-tools/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">ebook-tools</remote-id>
+	</upstream>
+	<use>
+		<flag name="lit2epub">Install lit2epub script</flag>
+	</use>
+</pkgmetadata>
diff --git a/app-text/editorconfig-core-c-0.12.1 b/app-text/editorconfig-core-c-0.12.1
deleted file mode 100644
index 29511e301294..000000000000
--- a/app-text/editorconfig-core-c-0.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/libpcre:= doc? ( app-doc/doxygen ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=EditorConfig core library written in C
-EAPI=6
-HOMEPAGE=https://github.com/editorconfig/editorconfig-core-c/
-IUSE=cli doc
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=BSD-2
-RDEPEND=dev-libs/libpcre:= cli? ( !dev-python/editorconfig-core-py[cli] )
-SLOT=0
-SRC_URI=https://github.com/editorconfig/editorconfig-core-c/archive/v0.12.1.tar.gz -> editorconfig-core-c-0.12.1.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=44e910141a78fcc28fcc6871eb262d5e
diff --git a/app-text/editorconfig-core-c-0.12.2 b/app-text/editorconfig-core-c-0.12.2
deleted file mode 100644
index ba4254f748e1..000000000000
--- a/app-text/editorconfig-core-c-0.12.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/libpcre:= doc? ( app-doc/doxygen ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=EditorConfig core library written in C
-EAPI=6
-HOMEPAGE=https://github.com/editorconfig/editorconfig-core-c/
-IUSE=cli doc
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=BSD-2
-RDEPEND=dev-libs/libpcre:= cli? ( !dev-python/editorconfig-core-py[cli] )
-SLOT=0
-SRC_URI=https://github.com/editorconfig/editorconfig-core-c/archive/v0.12.2.tar.gz -> editorconfig-core-c-0.12.2.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=deff12bc1f252aa0eb7da601ecbcba74
diff --git a/app-text/editorconfig-core-c/Manifest b/app-text/editorconfig-core-c/Manifest
new file mode 100644
index 000000000000..c523910632f9
--- /dev/null
+++ b/app-text/editorconfig-core-c/Manifest
@@ -0,0 +1,5 @@
+DIST editorconfig-core-c-0.12.1.tar.gz 65369 BLAKE2B 30296b64bd215a8b51d3b4d6146ce5eac13cb1a8ba8a25d0faabcc22989503d9d73bc138240b475eb7ea4eecd5f5bbbf347519b1696373daf55ffd27fc772f4c SHA512 3517f7db84d632615ba651eeafab6730739b7bf01f4ea34fbca65f58463fbbcbabc101587b289a7922b55708453262c65569077c51087424d47d0676dc1db686
+DIST editorconfig-core-c-0.12.2.tar.gz 67002 BLAKE2B 6b808366acc8d0a96fc47cb74d620a4028978d7114b4a64d6799527276442f1d39ba8d5611530f873c78b7c49893c5edecec84dcc6f2616ba2663cb36fa92d0d SHA512 6ab3e4f7f95c83c0781064ca15bb70394bb947f9d4cd1348224f02e25c65021d14439b913775d7cfafb93476158799c34438fa548adf3c7ec6dbfd6f1052a046
+EBUILD editorconfig-core-c-0.12.1.ebuild 905 BLAKE2B c775e5af2fd5c0833d528b791b2bcc100e3fb7ca1f41dd5196bfc7525c9d003b261763bb69bb2015c759f984ea468768912a20cfa967c7bcaa2a78a14a5d8585 SHA512 352392031c02ede3b966bae19b4ed60c3e9575e221ee40ff2e3162a5f41f981dae0629c8b62f13b90195de274983119e152fbd6f45b19a10532c69c64ae2a6b3
+EBUILD editorconfig-core-c-0.12.2.ebuild 907 BLAKE2B 5d210b84b242c0ef32d601bb34674a0583aa9e8fbc0fddb39b41dca08a2e80a5c62d92b86761ce63f49cdda6aaa8803a607a9404c4ab7fa83b4829433596f7a2 SHA512 eec1a6c04c3ae5c18fb54d37765ab947dc99c6e113c8a81bf3036bbb2209cbc07cbf0eb5cef274dcbcc766a39885c9293beb6dc626e63ac273e5af8fee716b59
+MISC metadata.xml 388 BLAKE2B d2a5f28be0aea3f3aefd1b8e82e337b87e67192b96bea1e2e0e5073e44f8c54d3f0380a089118d405c417d42ee6d978919dc8e0212a36ee0d3808b706846ad70 SHA512 fbaff22b9f648c2e94d68904cbb23de8ee0340641c626d5a533992837ec6405b65a96872bfdedce3a75351ac73e344d5faed1a51f63a4330f65e4aa8190ffed4
diff --git a/app-text/editorconfig-core-c/editorconfig-core-c-0.12.1.ebuild b/app-text/editorconfig-core-c/editorconfig-core-c-0.12.1.ebuild
new file mode 100644
index 000000000000..48e7e80a5aab
--- /dev/null
+++ b/app-text/editorconfig-core-c/editorconfig-core-c-0.12.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="EditorConfig core library written in C"
+HOMEPAGE="https://github.com/editorconfig/editorconfig-core-c/"
+SRC_URI="https://github.com/editorconfig/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 x86"
+IUSE="cli doc"
+CDEPEND="dev-libs/libpcre:="
+DEPEND="${CDEPEND}
+	doc? ( app-doc/doxygen )"
+RDEPEND="${CDEPEND}
+	cli? ( !dev-python/editorconfig-core-py[cli] )"
+
+src_prepare() {
+	sed -e 's:OUTPUT_NAME editorconfig_static:OUTPUT_NAME editorconfig:' \
+		-i src/lib/CMakeLists.txt || die
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=()
+	use doc && mycmakeargs+=(-DINSTALL_HTML_DOC=ON)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	use cli || rm -rf "${ED}usr/bin"
+}
diff --git a/app-text/editorconfig-core-c/editorconfig-core-c-0.12.2.ebuild b/app-text/editorconfig-core-c/editorconfig-core-c-0.12.2.ebuild
new file mode 100644
index 000000000000..1bfe84ca069f
--- /dev/null
+++ b/app-text/editorconfig-core-c/editorconfig-core-c-0.12.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="EditorConfig core library written in C"
+HOMEPAGE="https://github.com/editorconfig/editorconfig-core-c/"
+SRC_URI="https://github.com/editorconfig/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="cli doc"
+CDEPEND="dev-libs/libpcre:="
+DEPEND="${CDEPEND}
+	doc? ( app-doc/doxygen )"
+RDEPEND="${CDEPEND}
+	cli? ( !dev-python/editorconfig-core-py[cli] )"
+
+src_prepare() {
+	sed -e 's:OUTPUT_NAME editorconfig_static:OUTPUT_NAME editorconfig:' \
+		-i src/lib/CMakeLists.txt || die
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=()
+	use doc && mycmakeargs+=(-DINSTALL_HTML_DOC=ON)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	use cli || rm -rf "${ED}usr/bin"
+}
diff --git a/app-text/editorconfig-core-c/metadata.xml b/app-text/editorconfig-core-c/metadata.xml
new file mode 100644
index 000000000000..639c3f190602
--- /dev/null
+++ b/app-text/editorconfig-core-c/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<upstream>
+		<remote-id type="github">editorconfig/editorconfig-core-c</remote-id>
+	</upstream>
+	<maintainer type="person">
+		<email>zmedico@gentoo.org</email>
+	</maintainer>
+	<use>
+		<flag name="cli">Install command line interface.</flag>
+	</use>
+</pkgmetadata>
diff --git a/app-text/enchant-1.6.1 b/app-text/enchant-1.6.1
deleted file mode 100644
index 3c544f0effc1..000000000000
--- a/app-text/enchant-1.6.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-libs/glib-2.6:2 aspell? ( app-text/aspell ) hunspell? ( >=app-text/hunspell-1.2.1:0= ) virtual/pkgconfig
-DESCRIPTION=Spellchecker wrapping library
-EAPI=6
-HOMEPAGE=https://abiword.github.io/enchant/
-IUSE=aspell +hunspell static-libs test
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-libs/glib-2.6:2 aspell? ( app-text/aspell ) hunspell? ( >=app-text/hunspell-1.2.1:0= )
-REQUIRED_USE=|| ( hunspell aspell )
-SLOT=0
-SRC_URI=https://github.com/AbiWord/enchant/releases/download/enchant-1-6-1/enchant-1.6.1.tar.gz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=21e2d34b641ee119486d72651e83d038
diff --git a/app-text/enchant-2.1.0 b/app-text/enchant-2.1.0
deleted file mode 100644
index ac9cf80c1a11..000000000000
--- a/app-text/enchant-2.1.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=>=dev-libs/glib-2.6:2 aspell? ( app-text/aspell ) hunspell? ( >=app-text/hunspell-1.2.1:0= ) virtual/pkgconfig
-DESCRIPTION=Spellchecker wrapping library
-EAPI=6
-HOMEPAGE=https://abiword.github.io/enchant/
-IUSE=aspell +hunspell static-libs test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-libs/glib-2.6:2 aspell? ( app-text/aspell ) hunspell? ( >=app-text/hunspell-1.2.1:0= )
-REQUIRED_USE=|| ( hunspell aspell )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/AbiWord/enchant/releases/download/v2.1.0/enchant-2.1.0.tar.gz
-_md5_=cd35277c26d048ed7bed2e187af5b464
diff --git a/app-text/enchant-2.1.1 b/app-text/enchant-2.1.1
deleted file mode 100644
index dc181c80e711..000000000000
--- a/app-text/enchant-2.1.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=>=dev-libs/glib-2.6:2 aspell? ( app-text/aspell ) hunspell? ( >=app-text/hunspell-1.2.1:0= ) virtual/pkgconfig
-DESCRIPTION=Spellchecker wrapping library
-EAPI=6
-HOMEPAGE=https://abiword.github.io/enchant/
-IUSE=aspell +hunspell static-libs test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-libs/glib-2.6:2 aspell? ( app-text/aspell ) hunspell? ( >=app-text/hunspell-1.2.1:0= )
-REQUIRED_USE=|| ( hunspell aspell )
-RESTRICT=test
-SLOT=0/2
-SRC_URI=https://github.com/AbiWord/enchant/releases/download/v2.1.1/enchant-2.1.1.tar.gz
-_md5_=b8365a7af35e7adf5169ee1f84184d32
diff --git a/app-text/enchant-2.1.2 b/app-text/enchant-2.1.2
deleted file mode 100644
index 23df1b0d853e..000000000000
--- a/app-text/enchant-2.1.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=>=dev-libs/glib-2.6:2 aspell? ( app-text/aspell ) hunspell? ( >=app-text/hunspell-1.2.1:0= ) virtual/pkgconfig
-DESCRIPTION=Spellchecker wrapping library
-EAPI=6
-HOMEPAGE=https://abiword.github.io/enchant/
-IUSE=aspell +hunspell static-libs test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-libs/glib-2.6:2 aspell? ( app-text/aspell ) hunspell? ( >=app-text/hunspell-1.2.1:0= )
-REQUIRED_USE=|| ( hunspell aspell )
-RESTRICT=test
-SLOT=0/2
-SRC_URI=https://github.com/AbiWord/enchant/releases/download/v2.1.2/enchant-2.1.2.tar.gz
-_md5_=b8365a7af35e7adf5169ee1f84184d32
diff --git a/app-text/enchant/Manifest b/app-text/enchant/Manifest
new file mode 100644
index 000000000000..7c820c985b8a
--- /dev/null
+++ b/app-text/enchant/Manifest
@@ -0,0 +1,11 @@
+AUX enchant-1.6.0-hunspell150_fix.patch 577 BLAKE2B dc57f0fd5a90ba36abe174949060b20c709f920aa7ef29e1560f4a194d744064f59ae7c812cc27debe30c1082a9f76d3eac8723f850803c5eb06c213fe39e91d SHA512 893620f45a1dd7956aef9f3517186a9226c00e6b85df4770d6ea388fc08854e7884143fe3c7a064c7ec4f8353a9b9571d0c07da22df5c6ee41fc4c6bbce5874f
+AUX enchant-2.1.0-hunspell150_fix.patch 783 BLAKE2B 514f18e5c6138ef069e668c3af554ec64f2087b1226ea6fa9912bb68fe84c26cee47b46ababbd55da1e5a371d889620a886fffeb14a5d4fb87facb4b4d98c943 SHA512 a8406777511f458f47a97c2c8246445abd05d611413beb0c9ad6e756418e5930f8516857c58193a14b700f1f539feb5c819881ea97d71d07839ebca0d3576994
+DIST enchant-1.6.1.tar.gz 642124 BLAKE2B d41aa9b313e7fe8b0887728b55f3c5218e270c7359b4edcdc8d9180af68687230bcc9f7d1abb9f85ac673478530e5674366c9bc7d08b983e7226725b2cdd73d3 SHA512 26c62dfa89ee40150db502651a2f876fba00569b7015f205dae27a029557effacff335bbe36124dbe6686537da2305bcab02592179d03e95fdf9741d54b98036
+DIST enchant-2.1.0.tar.gz 962857 BLAKE2B f1ee729f20f06c14cbe81c27eeff5ff3bfe9e815bdf278c0c5e27ab48a78301e0731cfc2a55d065cfc702b5939623e352817a3fa6102636bca6779a8903ce537 SHA512 5dee7c5693ffc4ca0933e0881ca6e1f6bab1553af79cadf29733589790c6626db524cf33b0008b3de4c48e122ed93929478cce35608d9a52ab71edb51f598f27
+DIST enchant-2.1.1.tar.gz 961821 BLAKE2B 1aaedc16e2108a382390c9401233d6a77dcff8732fb0af1a35816993b8eb127f22f9e6f4359b997f6793f53dd37c50c1c69d2aa09cf53bb5c47baa47277e044e SHA512 5cb57198ea826da6d9ed9042edca87fcca9b811e8e75b382ed1568c5b1d8d4f8d6ba732a167c8d52261cfce540f23f84bd4d2889a4beafd2db1d8509c0b6bc15
+DIST enchant-2.1.2.tar.gz 963236 BLAKE2B 3adaf9d96c7e2d7c5e31fe31ac426230f2e88b1cd6f68157e11f13c30fc5c161723d5a5b40bbe158307ce7352e098cd22272f4a75786854f7d82a0c5694b0f2b SHA512 6cb2eeccc617c005998b16ebc33a84a05cec116b26fd679fc1416110821a85a16605c8564672e1168ac6c865cfcca6680005d1219aa615ca1c2393bd523ae0c4
+EBUILD enchant-1.6.1.ebuild 1497 BLAKE2B 0a9aefe2919ec376d33ac79e271014c065a26cfa4dd70e760efbbd3b76e6723127fb588f4365aec905215236ed407eccb25a9943067bd198ce67f6b7b41adc3c SHA512 ca846dd37eb5e9fabcb512dfb2c77dcecacf22018a3ba5e61528180c2c879f0a849236ad7799121f9f0839bd250078480c2c80f792756d301518e06bd3c7b01a
+EBUILD enchant-2.1.0.ebuild 1315 BLAKE2B 099906e37a942d542e7bf55a4f86e2def554890f131ebb2a717a270a1b7e1582200468f403eaeeb669d8e253ec437beaa8117f5ac8c05d757983caaa7158ba61 SHA512 6c6261e70abe20d1a4ad83b3b3d0cf68fa29543d3f676301ad16fbbd4d8477b3add24accdf94b9c14bcd970a27385c88bf1c8b516a4cdfa720e81bf9c6204515
+EBUILD enchant-2.1.1.ebuild 1174 BLAKE2B 0a132dc9992834a78b6553b0e0a377b393b3a8c2e4692962cb0931fe86c0b9b6a7a455657500e22e20c1dc15de7fb38866b0f8ba2c7a4db3869533a1ebf3de64 SHA512 889cc5ef82a0ab3393f3971655864ddc0a70093ac1c5cc67a9ce2605e2206e5534628f1383c24893b1d77db0367f0f9c66897942f4b7c6b844d0f44349f7b6e0
+EBUILD enchant-2.1.2.ebuild 1174 BLAKE2B 0a132dc9992834a78b6553b0e0a377b393b3a8c2e4692962cb0931fe86c0b9b6a7a455657500e22e20c1dc15de7fb38866b0f8ba2c7a4db3869533a1ebf3de64 SHA512 889cc5ef82a0ab3393f3971655864ddc0a70093ac1c5cc67a9ce2605e2206e5534628f1383c24893b1d77db0367f0f9c66897942f4b7c6b844d0f44349f7b6e0
+MISC metadata.xml 446 BLAKE2B 46f91a78cb6d8ae11b77da0f640e07fd3842e4ed162d0037b9620132f8ae9ac81e4b6353371d2350abd634bc693e8d64c8d94a5496cb28931863ce7a246ab209 SHA512 9e1bdbc66c53f055c8730a6ff7a833e2597f648067087e268495a3337e51fb3d806fbed698a69ac59599100eba90401679f6141c71dd9298030f4771230429ea
diff --git a/app-text/enchant/enchant-1.6.1.ebuild b/app-text/enchant/enchant-1.6.1.ebuild
new file mode 100644
index 000000000000..8a0c7ad3ef3f
--- /dev/null
+++ b/app-text/enchant/enchant-1.6.1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit versionator
+
+MY_PV="$(replace_all_version_separators '-')"
+DESCRIPTION="Spellchecker wrapping library"
+HOMEPAGE="https://abiword.github.io/enchant/"
+SRC_URI="https://github.com/AbiWord/enchant/releases/download/${PN}-${MY_PV}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+
+IUSE="aspell +hunspell static-libs test"
+REQUIRED_USE="|| ( hunspell aspell )"
+
+# FIXME: depends on unittest++ but through pkgconfig which is a Debian hack, bug #629742
+COMMON_DEPENDS="
+	>=dev-libs/glib-2.6:2
+	aspell? ( app-text/aspell )
+	hunspell? ( >=app-text/hunspell-1.2.1:0= )"
+RDEPEND="${COMMON_DEPENDS}"
+
+DEPEND="${COMMON_DEPENDS}
+	virtual/pkgconfig
+"
+#	test? ( dev-libs/unittest++ )
+
+DOCS="AUTHORS BUGS ChangeLog HACKING MAINTAINERS NEWS README TODO"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.6.0-hunspell150_fix.patch
+)
+
+src_prepare() {
+	default
+	sed -e "/SUBDIRS/ s/unittests//" -i "${S}"/Makefile.{am,in} || die
+}
+
+src_configure() {
+	econf \
+		$(use_enable aspell) \
+		$(use_enable hunspell myspell) \
+		$(use_enable static-libs static) \
+		--disable-hspell \
+		--disable-ispell \
+		--disable-uspell \
+		--disable-voikko \
+		--with-myspell-dir="${EPREFIX}"/usr/share/myspell/
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/app-text/enchant/enchant-2.1.0.ebuild b/app-text/enchant/enchant-2.1.0.ebuild
new file mode 100644
index 000000000000..03527fb94952
--- /dev/null
+++ b/app-text/enchant/enchant-2.1.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Spellchecker wrapping library"
+HOMEPAGE="https://abiword.github.io/enchant/"
+SRC_URI="https://github.com/AbiWord/enchant/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+
+IUSE="aspell +hunspell static-libs test"
+REQUIRED_USE="|| ( hunspell aspell )"
+
+# FIXME: depends on unittest++ but through pkgconfig which is a Debian hack, bug #629742
+COMMON_DEPENDS="
+	>=dev-libs/glib-2.6:2
+	aspell? ( app-text/aspell )
+	hunspell? ( >=app-text/hunspell-1.2.1:0= )"
+
+RDEPEND="${COMMON_DEPENDS}"
+
+DEPEND="${COMMON_DEPENDS}
+	virtual/pkgconfig
+"
+#	test? ( dev-libs/unittest++ )
+
+PATCHES=(
+	# Fix build with hunspell 1.5
+	# https://bugs.gentoo.org/show_bug.cgi?id=600952
+	"${FILESDIR}"/${PN}-2.1.0-hunspell150_fix.patch
+)
+
+RESTRICT="test"
+
+src_configure() {
+	econf \
+		$(use_with aspell) \
+		$(use_with hunspell) \
+		$(use_enable static-libs static) \
+		--without-hspell \
+		--without-voikko \
+		--with-hunspell-dir="${EPREFIX}"/usr/share/hunspell/
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/app-text/enchant/enchant-2.1.1.ebuild b/app-text/enchant/enchant-2.1.1.ebuild
new file mode 100644
index 000000000000..0780c2cc403d
--- /dev/null
+++ b/app-text/enchant/enchant-2.1.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Spellchecker wrapping library"
+HOMEPAGE="https://abiword.github.io/enchant/"
+SRC_URI="https://github.com/AbiWord/enchant/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+
+IUSE="aspell +hunspell static-libs test"
+REQUIRED_USE="|| ( hunspell aspell )"
+
+# FIXME: depends on unittest++ but through pkgconfig which is a Debian hack, bug #629742
+COMMON_DEPENDS="
+	>=dev-libs/glib-2.6:2
+	aspell? ( app-text/aspell )
+	hunspell? ( >=app-text/hunspell-1.2.1:0= )"
+
+RDEPEND="${COMMON_DEPENDS}"
+
+DEPEND="${COMMON_DEPENDS}
+	virtual/pkgconfig
+"
+#	test? ( dev-libs/unittest++ )
+
+RESTRICT="test"
+
+src_configure() {
+	econf \
+		$(use_with aspell) \
+		$(use_with hunspell) \
+		$(use_enable static-libs static) \
+		--without-hspell \
+		--without-voikko \
+		--with-hunspell-dir="${EPREFIX}"/usr/share/hunspell/
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/app-text/enchant/enchant-2.1.2.ebuild b/app-text/enchant/enchant-2.1.2.ebuild
new file mode 100644
index 000000000000..0780c2cc403d
--- /dev/null
+++ b/app-text/enchant/enchant-2.1.2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Spellchecker wrapping library"
+HOMEPAGE="https://abiword.github.io/enchant/"
+SRC_URI="https://github.com/AbiWord/enchant/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+
+IUSE="aspell +hunspell static-libs test"
+REQUIRED_USE="|| ( hunspell aspell )"
+
+# FIXME: depends on unittest++ but through pkgconfig which is a Debian hack, bug #629742
+COMMON_DEPENDS="
+	>=dev-libs/glib-2.6:2
+	aspell? ( app-text/aspell )
+	hunspell? ( >=app-text/hunspell-1.2.1:0= )"
+
+RDEPEND="${COMMON_DEPENDS}"
+
+DEPEND="${COMMON_DEPENDS}
+	virtual/pkgconfig
+"
+#	test? ( dev-libs/unittest++ )
+
+RESTRICT="test"
+
+src_configure() {
+	econf \
+		$(use_with aspell) \
+		$(use_with hunspell) \
+		$(use_enable static-libs static) \
+		--without-hspell \
+		--without-voikko \
+		--with-hunspell-dir="${EPREFIX}"/usr/share/hunspell/
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/app-text/enchant/files/enchant-1.6.0-hunspell150_fix.patch b/app-text/enchant/files/enchant-1.6.0-hunspell150_fix.patch
new file mode 100644
index 000000000000..bd40c81d3c03
--- /dev/null
+++ b/app-text/enchant/files/enchant-1.6.0-hunspell150_fix.patch
@@ -0,0 +1,12 @@
+diff -upr enchant-1.6.0.orig/src/myspell/myspell_checker.cpp enchant-1.6.0/src/myspell/myspell_checker.cpp
+--- enchant-1.6.0.orig/src/myspell/myspell_checker.cpp	2016-11-26 16:04:05.689051339 +0200
++++ enchant-1.6.0/src/myspell/myspell_checker.cpp	2016-11-26 16:05:11.380014568 +0200
+@@ -431,7 +431,7 @@ MySpellChecker::requestDictionary(const
+ 	if(myspell == NULL){
+ 		return false;
+ 	}
+-	char *enc = myspell->get_dic_encoding();
++	const char *enc = myspell->get_dic_encoding();
+ 
+ 	m_translate_in = g_iconv_open(enc, "UTF-8");
+ 	m_translate_out = g_iconv_open("UTF-8", enc);
diff --git a/app-text/enchant/files/enchant-2.1.0-hunspell150_fix.patch b/app-text/enchant/files/enchant-2.1.0-hunspell150_fix.patch
new file mode 100644
index 000000000000..1dac6c11ec5f
--- /dev/null
+++ b/app-text/enchant/files/enchant-2.1.0-hunspell150_fix.patch
@@ -0,0 +1,25 @@
+From 87b36fd87d8ecc894850d82eed33f48d6c429cad Mon Sep 17 00:00:00 2001
+From: Pacho Ramos <pacho@gentoo.org>
+Date: Sun, 3 Sep 2017 11:05:42 +0200
+Subject: [PATCH] Fix hunspell 1.5 support
+
+---
+ providers/enchant_hunspell.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/providers/enchant_hunspell.cpp b/providers/enchant_hunspell.cpp
+index 609f856..0bc360f 100644
+--- a/providers/enchant_hunspell.cpp
++++ b/providers/enchant_hunspell.cpp
+@@ -312,7 +312,7 @@ HunspellChecker::requestDictionary(const char *szLang)
+ 	if(hunspell == NULL){
+ 		return false;
+ 	}
+-	char *enc = hunspell->get_dic_encoding();
++	const char *enc = hunspell->get_dic_encoding();
+ 
+ 	m_translate_in = g_iconv_open(enc, "UTF-8");
+ 	m_translate_out = g_iconv_open("UTF-8", enc);
+-- 
+2.14.1
+
diff --git a/app-text/enchant/metadata.xml b/app-text/enchant/metadata.xml
new file mode 100644
index 000000000000..2b8b7cffbc12
--- /dev/null
+++ b/app-text/enchant/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
+	<use>
+		<flag name="aspell">Adds support for <pkg>app-text/aspell</pkg> spell checker</flag>
+		<flag name="hunspell">Adds support for <pkg>app-text/hunspell</pkg> spell checker</flag>
+	</use>
+</pkgmetadata>
diff --git a/app-text/enscript-1.6.6 b/app-text/enscript-1.6.6
deleted file mode 100644
index a2ea84f04756..000000000000
--- a/app-text/enscript-1.6.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=sys-devel/flex sys-devel/bison nls? ( sys-devel/gettext )
-DESCRIPTION=Powerful text-to-postscript converter
-EAPI=6
-HOMEPAGE=https://www.gnu.org/software/enscript/enscript.html
-IUSE=nls ruby
-KEYWORDS=alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=GPL-3
-RDEPEND=nls? ( virtual/libintl )
-SLOT=0
-SRC_URI=mirror://gnu/enscript/enscript-1.6.6.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=93710064c0b076d992bf8fac2a91d54a
diff --git a/app-text/enscript/Manifest b/app-text/enscript/Manifest
new file mode 100644
index 000000000000..09148ab871fc
--- /dev/null
+++ b/app-text/enscript/Manifest
@@ -0,0 +1,8 @@
+AUX ebuild.st 6047 BLAKE2B 661a427601920a448b829bbbeb8472199f4ba17cccf698eb206e0651247eb9a115afd50553116f542b31d7ce6436f4bfce3ceef3a894b40087ae7a7c5c6080cc SHA512 1c01943ec901dc4ea314715232fac279fa051b441b39e8cc5bca759b67dda87c4982eba23a37f3b60b041815c347ea85faf774e5574471232e4e941eb186caf5
+AUX enscript-1.6.2-ruby.patch 661 BLAKE2B 119c3b301f0a9811b65a509ced694b049796600e65b10fd29a200fabee37fa73e7ba6e78705329979f619c7515d14294003fd33b364cad62e058357f1d48a7bf SHA512 6ca804c1f9e1bc19eb896c88c4e710b5212e570d5e0d84b5b40100d4645bdb483c55ad902ae5db9a617268387d6b1d6db54f69e9ba3479f0f669dc1b2314d65c
+AUX enscript-1.6.4-ebuild.st.patch 332 BLAKE2B 88feff57f5dabfb09dce2c11c65e64005f667b6a98107fc4a608ccb4e0d7a16a3fbc1b15bdb64f8538b417387a0d82f4f3df87ef2564eb384498d3f1606617c6 SHA512 8e86a7b2966810852703a7f3636b0c92e940d3fba21a46be46086830799cfecd2870cd38679f009cb9d984bf3c475e843df67970619cf43ebf272c209b204fd9
+AUX enscript-1.6.5.2-php.st.patch 410 BLAKE2B 84e35ea8441b60bc5da3085b969f1b20334ed4f9632681b12cd50fbd95d144e40fcd1874aed99a08986432885efdeb70653b0ffed7e5a5b83d5bf1edbff60cbd SHA512 71bf65c91d6d362bbb700ef26b72137e524a969da0971b7f0c30ac409a7f002103769cc25c02222d0ccb1bf69919a419481af9ea479828e3df18ec7a2e1d29b0
+AUX ruby.st 3904 BLAKE2B 854c86166a43715e85e91802f2d82eae71773d9caabf604bd5edc0e53046ed0fa9944ec61c5ff7516e22740cc90ac73dc1d8edbdc0e9722ec876be3a129d2183 SHA512 43af0998ebe95530129aec126b9f91878bbbf7dd52530cb162b25f5779f9eb5b870f41727665e66dd5cf42a6d5e790899bf03c38c1a914adf2b0eecac83154e2
+DIST enscript-1.6.6.tar.gz 1330493 BLAKE2B 02e333271ac6716e049402d5904b0ad6926b31d4533c813a9e5bcf76045d4100def2476426b97c52585e8f5c0a741159fb3e78de79c817e75de81ebd464c0d61 SHA512 bf1c2b9ea7723518a1ef312145ddcd6ffdef0c6e8b5795ea84cb55d76fccc02f441d0c2dc6897e970368186e6a829ab74a090716624e0f7a8f575653fa495ebc
+EBUILD enscript-1.6.6.ebuild 1139 BLAKE2B 8d1245dd62f2654ab7e7d7ba0e040652322792d5e5c8f6e0cc980d5065338b2525ca634c702ba45afd8afcf205afb2fa752521470fa1ce33472d825bddf3a9bc SHA512 748b16650373e043a94de3422a547b599ccd24d915cf461c46b5d8e4ac81a35b3f690d15734d54377395bef9b4dcf1e8880ec420fda47eb62d8885fa0867d0c0
+MISC metadata.xml 255 BLAKE2B 06f078acf8e4416705c8bad8b4802a44592eb962c08c050e11332bfa97564fafdf08754ab056eb813f6baeaa6cdfaf5d71672455d77e74045f86098c221d5136 SHA512 c6c5f966cfbe396fde1b15334442de9e0004b44c4b48775588b0b25a058ad1751252761370c9c254280e97561fa6306f5aa0cc7959c675d4ee11f7f95d777a36
diff --git a/app-text/enscript/enscript-1.6.6.ebuild b/app-text/enscript/enscript-1.6.6.ebuild
new file mode 100644
index 000000000000..185ba15dbf84
--- /dev/null
+++ b/app-text/enscript/enscript-1.6.6.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Powerful text-to-postscript converter"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+HOMEPAGE="https://www.gnu.org/software/enscript/enscript.html"
+
+KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+SLOT="0"
+LICENSE="GPL-3"
+IUSE="nls ruby"
+
+DEPEND="
+	sys-devel/flex
+	sys-devel/bison
+	nls? ( sys-devel/gettext )
+"
+RDEPEND="nls? ( virtual/libintl )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/enscript-1.6.4-ebuild.st.patch
+	epatch "${FILESDIR}"/enscript-1.6.5.2-php.st.patch
+	use ruby && epatch "${FILESDIR}"/enscript-1.6.2-ruby.patch
+	sed -i src/tests/passthrough.test -e 's|tail +2|tail -n +2|g' || die
+	default
+}
+
+src_configure() {
+	econf $(use_enable nls)
+}
+
+src_compile() {
+	emake AR="$(tc-getAR)"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	dodoc AUTHORS ChangeLog NEWS README* THANKS TODO
+
+	insinto /usr/share/enscript/hl
+	doins "${FILESDIR}"/ebuild.st
+
+	if use ruby ; then
+		insinto /usr/share/enscript/hl
+		doins "${FILESDIR}"/ruby.st
+	fi
+}
diff --git a/app-text/enscript/files/ebuild.st b/app-text/enscript/files/ebuild.st
new file mode 100644
index 000000000000..d0eab41b5b8c
--- /dev/null
+++ b/app-text/enscript/files/ebuild.st
@@ -0,0 +1,133 @@
+/**
+ * Name: ebuild
+ * Description: Gentoo Portage ebuild
+ * Author: Ed Catmur <ed@catmur.co.uk>
+ *
+ * Based on gentoo.vim by Ciaran McCreesh <ciaranm@gentoo.org>
+ */
+
+state ebuild extends bash
+{
+    /* Variables */
+    /^([ \t]*)([0-9a-zA-Z_.-]+)(=)/ {
+		language_print ($1);
+        variable_name_face(true);
+		language_print ($2);
+		variable_name_face(false);
+		language_print ($3);
+	}
+    
+	/* Core keywords */
+	/\b(use|has_version|best_version|use_with|use_enable|check_KV\
+|keepdir|econf|die|einstall|einfo|ewarn|eerror|diropts\
+|dobin|docinto|dodoc|doexe|dohard|dohtml|doinfo|doins\
+|dolib|dolib|a|dolib|so|doman|dosbin|dosym|emake|exeinto\
+|exeopts|fowners|fperms|insinto|insopts|into|libopts|newbin\
+|newexe|newins|newman|newsbin|prepall|prepalldocs|prepallinfo\
+|prepallman|prepallstrip|has|unpack|dopython|dosed|into\
+|doinitd|doconfd|doenvd|dojar|domo|dodir|ebegin|eend\
+|newconfd|newdoc|newenvd|newinitd|newlib\.a|newlib\.so\
+|hasq|hasv|useq|usev\
+|addread|addwrite|adddeny|addpredict\
+|inherit\
+|EXPORT_FUNCTIONS)\b/ {
+		keyword_face(true);
+		language_print ($0);
+		keyword_face (false);
+	}
+
+	/* Recognised functions */
+	/\b(pkg_nofetch|pkg_setup|src_unpack|src_compile|src_test|src_install\
+|pkg_preinst|pkg_postinst|pkg_prerm|pkg_postrm|pkg_config)\b/ {
+		function_name_face(true);
+		language_print ($0);
+		function_name_face(false);
+	}
+
+	/* Other keywords */
+	/\b(gen_usr_ldscript|draw_line|epatch|have_NPTL|get_number_of_jobs|egetent\
+|emktemp|enewuser|enewgroup|edos2unix|make_desktop_entry|unpack_pdv\
+|unpack_makeself|check_license|cdrom_get_cds|cdrom_load_next\
+|cdrom_locate_file_on_cd|strip|linguas|epause|ebeep|built_with_use\
+|make_session_desktop|domenu|doicon|find_unpackable_file|unpack_pdv\
+|set_arch_to_kernel|set_arch_to_portage|preserve_old_lib\
+|preserve_old_lib_notify|built_with_use|epunt_cxx|dopamd|newpamd\
+|make_wrapper\
+|setup-allowed-flags|filter-flags|filter-lfs-flags|append-lfs-flags\
+|append-flags|replace-flags|replace-cpu-flags|is-flag|filter-mfpmath\
+|strip-flags|test_flag|test_version_info|strip-unsupported-flags|get-flag\
+|has_hardened|has_pic|has_pie|has_ssp_all|has_ssp|has_m64|has_m32\
+|replace-sparc64-flags|append-ldflags|filter-ldflags|fstack-flags|gcc2-flags\
+|gcc-getCC|gcc-getCXX|gcc-fullversion|gcc-version|gcc-major-version\
+|gcc-minor-version|gcc-micro-version|gcc-libpath|gcc-libstdcxx-version\
+|gcc-libstdcxx-major-version|gcc2-flags\
+|elibtoolize|uclibctoolize|darwintoolize\
+|ht_fix_file|ht_fix_all\
+|fdo-mime_desktop_database_update|fdo-mime_mime_database_update\
+|webapp_checkfileexists|webapp_import_config|webapp_strip_appdir\
+|webapp_strip_d|webapp_strip_cwd|webapp_configfile|webapp_hook_script\
+|webapp_postinst_txt|webapp_postupgrade_txt|webapp_runbycgibin\
+|webapp_serverowned|webapp_server_configfile|webapp_sqlscript\
+|webapp_src_install|webapp_pkg_postinst|webapp_pkg_setup\
+|webapp_getinstalltype|webapp_src_preinst|webapp_pkg_prerm\
+|get_all_version_components|version_is_at_least\
+|get_version_components|get_major_version\
+|get_version_component_range|get_after_major_version\
+|replace_version_separator|replace_all_version_separators\
+|delete_version_separator|delete_all_version_separators\
+|cvs_fetch|cvs_src_unpack\
+|dobashcompletion|bash-completion_pkg_postinst\
+|vim-plugin_src_install|vim-plugin_pkg_postinst|vim-plugin_pkg_postrm\
+|update_vim_afterscripts|display_vim_plugin_help\
+|update_vim_helptags\
+|has_multilib_profile|get_libdir|get_multilibdir|get_libdir_override\
+|get_abi_var|get_abi_CFLAGS|get_abi_LDFLAGS|get_abi_CHOST\
+|get_abi_FAKE_TARGETS|get_abi_CDEFINE|get_abi_LIBDIR|get_install_abis\
+|get_all_abis|get_all_libdirs|is_final_abi|number_abis|get_ml_incdir\
+|prep_ml_includes|create_ml_includes|create_ml_includes-absolute\
+|create_ml_includes-tidy_path|create_ml_includes-listdirs\
+|create_ml_includes-makedestdirs|create_ml_includes-allfiles\
+|create_ml_includes-sym_for_dir\
+|64-bit\
+|tc-getPROG|tc-getAR|tc-getAS|tc-getCC|tc-getCXX|tc-getLD|tc-getNM\
+|tc-getRANLIB|tc-getF77|tc-getGCJ|tc-getBUILD_CC|tc-export|ninj\
+|tc-is-cross-compiler|tc-ninja_magic_to_arch|tc-arch-kernel|tc-arch\
+|tc-endian|gcc-fullversion|gcc-version|gcc-major-version\
+|gcc-minor-version|gcc-micro-version\
+|docrondir|docron|docrontab|cron_pkg_postinst\
+|egamesconf|egamesinstall|gameswrapper|dogamesbin|dogamessbin|dogameslib\
+|dogameslib.a|dogameslib.so|newgamesbin|newgamessbin|gamesowners|gamesperms\
+|prepgamesdirs|gamesenv|games_pkg_setup|games_src_compile|games_pkg_postinst\
+|games_ut_unpack|games_umod_unpack|games_make_wrapper\
+|subversion_svn_fetch|subversion_bootstrap|subversion_src_unpack\
+|alternatives_auto_makesym|alternatives_makesym|alternatives_pkg_postinst\
+|alternatives_pkg_postrm\
+|rpm_unpack|rpm_src_unpack\
+|python_version|python_tkinter_exists|python_mod_exists|python_mod_compile\
+|python_mod_optimize|python_mod_cleanup|python_disable_pyc\
+|python_enable_pyc\
+|check_version_h|get_KV_info|is_2_4_kernel|is_2_5_kernel|is_2_6_kernel\
+|kernel_supports_modules\
+|perl-module_src_prep|perl-module_src_compile|perl-module_src_test\
+|perl-module_src_install\
+|perl-module_pkg_postinst|perl-module_pkg_postrm\
+|perl_set_version|perl_delete_localpod|updatepod\
+|distutils_src_compile|distutils_src_install|distutils_pkg_postrm\
+|distutils_pkg_postinst|distutils_python_version|disutils_python_tkinter\
+|need_apache|need_apache1|need_apache2\
+|apache-module_pkg_setup|apache-module_src_compile\
+|apache-module_src_install|apache-module_pkg_postinst|acache_cd_dir\
+|apache_mod_file|apache_doc_magic|apache1_src_compile|apache1_src_install\
+|apache1_pkg_postinst|apache2_pkg_setup|apache2_src_compile\
+|apache1_src_install|apache2_pkg_postinst\
+|dopamd|newpamd|dopamsecurity|newpamsecurity|getpam_mod_dir\
+|dopammod|newpammod|pamd_mimic_system\
+|virtualmake|Xmake|Xemake|Xeconf\
+|gnome2_src_configure|gnome2_src_compile|gnome2_src_install\
+|gnome2_gconf_install|gnome2_gconf_uninstal|gnome2_omf_fix\
+|gnome2_scrollkeeper_update|gnome2_pkg_postinst|gnome2_pkg_postrm)\b/ {
+		builtin_face(true);
+		language_print ($0);
+		builtin_face(false);
+	}
+}
diff --git a/app-text/enscript/files/enscript-1.6.2-ruby.patch b/app-text/enscript/files/enscript-1.6.2-ruby.patch
new file mode 100644
index 000000000000..b492ca4f44f7
--- /dev/null
+++ b/app-text/enscript/files/enscript-1.6.2-ruby.patch
@@ -0,0 +1,19 @@
+--- states/hl/enscript.st.orig	2006-12-17 02:10:37.000000000 +0100
++++ states/hl/enscript.st	2006-12-17 02:10:13.000000000 +0100
+@@ -489,6 +489,7 @@
+   /\.idl$/					idl;
+   /\.(hs|lhs|gs|lgs)$/				haskell;
+   /\.(pm|pl)$/					perl;
++  /\.(rb|rbw)$/					ruby;
+   /\.(eps|EPS|ps|PS)$/				postscript;
+   /\.py$/					python;
+   /\.pyx$/					pyrex;
+@@ -531,6 +532,8 @@
+   /-\*- [Ii][Dd][Ll] -\*-/				idl;
+   /-\*- [Pp][Ee][Rr][Ll] -\*-/				perl;
+   /^#![ \t]*\/.*\/perl/					perl;
++  /-\*- [Rr][Uu][Bb][Yy] -\*-/				ruby;
++  /^#![ \t]*\/.*\/ruby/					ruby;
+   /^From:/						mail;
+   /^#![ \t]*(\/usr)?\/bin\/[ngmt]?awk/			awk;
+   /^#![ \t]*(\/usr)?\/bin\/sh/				sh;
diff --git a/app-text/enscript/files/enscript-1.6.4-ebuild.st.patch b/app-text/enscript/files/enscript-1.6.4-ebuild.st.patch
new file mode 100644
index 000000000000..0741576226af
--- /dev/null
+++ b/app-text/enscript/files/enscript-1.6.4-ebuild.st.patch
@@ -0,0 +1,10 @@
+--- states/hl/enscript.st	2006/01/31 05:37:23	1.1
++++ states/hl/enscript.st	2006/01/31 06:48:32
+@@ -509,6 +509,7 @@ namerules
+   /\b(rfc.*\.txt|draft-.*\.txt)$/		rfc;
+   /\.inf$/i					inf;
+   /\.tex$/					tex;
++  /\.(ebuild|eclass)$/				ebuild;
+   /\.wmlscript$/				wmlscript;
+   /\.wmls$/					wmlscript;
+   /^.*$/					passthrough;
diff --git a/app-text/enscript/files/enscript-1.6.5.2-php.st.patch b/app-text/enscript/files/enscript-1.6.5.2-php.st.patch
new file mode 100644
index 000000000000..b146d998ee41
--- /dev/null
+++ b/app-text/enscript/files/enscript-1.6.5.2-php.st.patch
@@ -0,0 +1,11 @@
+diff -ruN enscript-1.6.5.2.orig/states/hl/enscript.st enscript-1.6.5.2/states/hl/enscript.st
+--- enscript-1.6.5.2.orig/states/hl/enscript.st	2010-06-02 00:17:49.000000000 +0200
++++ enscript-1.6.5.2/states/hl/enscript.st	2011-06-02 12:43:13.869855504 +0200
+@@ -510,6 +510,7 @@
+   /\.tex$/					tex;
+   /\.wmlscript$/				wmlscript;
+   /\.wmls$/					wmlscript;
++  /\.php$/					php;
+   /^.*$/					passthrough;
+ }
+ 
diff --git a/app-text/enscript/files/ruby.st b/app-text/enscript/files/ruby.st
new file mode 100644
index 000000000000..392c9c1390eb
--- /dev/null
+++ b/app-text/enscript/files/ruby.st
@@ -0,0 +1,212 @@
+/**
+ * Name: ruby
+ * Description: Ruby programming language.
+ * Author: Mike Wilson <m.v.wilson@home.com>
+ */
+
+state ruby_comment
+{
+  /\*\\\// {
+    language_print ($0);
+    return;
+  }
+  LANGUAGE_SPECIALS {
+   language_print ($0);
+  }
+}
+
+state ruby_dquot_string
+{
+  /\\\\./ {
+    language_print ($0);
+  }
+  /\"/ {
+    language_print ($0);
+    return;
+  }
+  LANGUAGE_SPECIALS {
+    language_print ($0);
+  }
+}
+
+state ruby_quot_string
+{
+  /\\\\./ {
+    language_print ($0);
+  }
+  /[\']/ {
+    language_print ($0);
+    return;
+  }
+  LANGUAGE_SPECIALS {
+    language_print ($0);
+  }
+}
+
+state ruby_bquot_string
+{
+  /\\\\./ {
+    language_print ($0);
+  }
+  /`/ {
+    language_print ($0);
+    return;
+  }
+  LANGUAGE_SPECIALS {
+    language_print ($0);
+  }
+}
+
+state ruby
+{
+  BEGIN {
+    header ();
+  }
+  END {
+    trailer ();
+  }
+
+  /* Comments. */
+  /#[^{].*$/ {
+    comment_face (true);
+    language_print ($0);
+    comment_face (false);
+  }
+
+  /* Ignore escaped quote marks */
+  /\\\"/ {
+    language_print ($0);
+  }
+  /\\\'/ {
+    language_print ($0);
+  }
+  /\\\`/ {
+    language_print ($0);
+  }
+
+  /* In cgi files, JavaScript might be imbedded, so we need to look out
+   * for the JavaScript comments, because they might contain something
+   * we don't like, like a contraction (don't, won't, etc.)
+   * We won't put them in comment face, because they are not ruby
+   * comments.
+   */
+  /\/\// {
+    language_print ($0);
+    call (eat_one_line);
+  }
+
+  /* String constants. */
+  /\"/ {
+    string_face (true);
+    language_print ($0);
+    call (ruby_dquot_string);
+    string_face (false);
+  }
+  /[\']/ {
+    string_face (true);
+    language_print ($0);
+    call (ruby_quot_string);
+    string_face (false);
+  }
+
+  /* Backquoted command string */
+  /`/ {
+    string_face (true);
+    language_print ($0);
+    call (ruby_bquot_string);
+    string_face (false);
+  }
+
+  /* Variables globals and instance */
+  /[$@]\w+/ {
+    variable_name_face (true);
+    language_print ($0);
+    variable_name_face (false);
+  }
+
+  /* Variables class variable */
+  /@@\w+/ {
+    variable_name_face (true);
+    language_print ($0);
+    variable_name_face (false);
+  }
+
+   /([ \t]*)(def)([ \t]+)([^(]*)/ {
+    /* indentation */
+    language_print ($1);
+
+    /* def */
+    keyword_face (true);
+    language_print ($2);
+    keyword_face (false);
+
+    /* middle */
+    language_print ($3);
+
+    /* Function name. */
+    function_name_face (true);
+    language_print ($4);
+    function_name_face (false);
+  }
+
+  /\$[!@&`'+~=\/\\,;.<>_*$?:"]/ {
+    variable_name_face (true);
+    language_print ($0);
+    variable_name_face (false);
+  }
+
+  /* Highlighting
+	--Type face
+ 	private protected public
+
+	--Builtin face (I consider these to be somewhat special)
+	alias alias_method attr attr_accessor attr_reader attr_writer 
+	module_alias module_function self super
+
+	--Reference face
+	require include
+
+	--Keyword face
+	and begin break case class def defined? do else elsif end 
+	ensure eval extend false for if in method module next nil not 
+	or redo rescue retry return then true undef unless until when
+	while yield
+   */
+/\\b(private|protected|public)\\b/ {
+    type_face (true);
+    language_print ($0);
+    type_face (false);
+  }
+
+/\\b(alias|alias_method|attr|attr_accessor|attr_reader|attr_writer\\
+|module_alias|module_function|self|super)\\b/ {
+    builtin_face (true);
+    language_print ($0);
+    builtin_face (false);
+  }
+
+/\\b(include|require)\\b/ {
+    reference_face (true);
+    language_print ($0);
+    reference_face (false);
+  }
+
+/\\b(and|begin|break|case|class|def|defined?|do|else|elsif|end|ensure|eval\\
+|extend|false|for|if|in|method|module|next|nil|not|or|raise|redo|rescue|retry\\
+|return|then|true|undef|unless|until|when|while|yield)\\b/ {
+    keyword_face (true);
+    language_print ($0);
+    keyword_face (false);
+  }
+
+  LANGUAGE_SPECIALS {
+    language_print ($0);
+  }
+}
+
+
+/*
+Local variables:
+mode: c
+End:
+*/
diff --git a/app-text/enscript/metadata.xml b/app-text/enscript/metadata.xml
new file mode 100644
index 000000000000..c439b06d8c84
--- /dev/null
+++ b/app-text/enscript/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>printing@gentoo.org</email>
+	<name>Gentoo Printing Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-text/epspdf-0.6.0 b/app-text/epspdf-0.6.0
deleted file mode 100644
index 16283a2cf906..000000000000
--- a/app-text/epspdf-0.6.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=GUI and command-line converter for [e]ps and pdf
-EAPI=4
-HOMEPAGE=http://tex.aanhet.net/epspdf/
-IUSE=doc tk
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=!<dev-texlive/texlive-pictures-2011-r1 >=dev-texlive/texlive-basic-2011 app-text/ghostscript-gpl tk? ( dev-lang/tk )
-SLOT=0
-SRC_URI=http://tex.aanhet.net/epspdf/epspdf.0.6.0.tgz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e99c715b1d1ca64c8cb1b522d2b84ff9
diff --git a/app-text/epspdf-0.6.3 b/app-text/epspdf-0.6.3
deleted file mode 100644
index b604b3dc214a..000000000000
--- a/app-text/epspdf-0.6.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=sys-apps/texinfo
-DESCRIPTION=GUI and command-line converter for [e]ps and pdf
-EAPI=4
-HOMEPAGE=http://tex.aanhet.net/epspdf/
-IUSE=doc tk
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=!<dev-texlive/texlive-pictures-2011-r1 >=dev-texlive/texlive-basic-2011 app-text/ghostscript-gpl tk? ( dev-lang/tk )
-SLOT=0
-SRC_URI=http://tex.aanhet.net/epspdf/epspdf.0.6.3.tgz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7dcea5f8acd8e448a7f0fbbc6f85955c
diff --git a/app-text/epspdf/Manifest b/app-text/epspdf/Manifest
new file mode 100644
index 000000000000..472414c1ba1e
--- /dev/null
+++ b/app-text/epspdf/Manifest
@@ -0,0 +1,5 @@
+DIST epspdf.0.6.0.tgz 352989 BLAKE2B 633e2ed29d8ec28f679b00095d335cea4bd1996cf6fdf3950b97084a73044eca9371ac6964ad48e98ea8ddba38d91acad2137ee8d3122ea03df3ce25f08196ce SHA512 44a7015fa0b7298429567e998068864419fd396f6b0781bf7877c6599d3bb2f254b7a0f976500655851a95d727880d106d9e1df9086306eef74db0b109a63506
+DIST epspdf.0.6.3.tgz 335975 BLAKE2B aacd6e222bfe74636dba796fd6e878fa9970f469d096eb77acf4a336a0ab5620629de7ba1c763afa62b181887724db55be57d1929a041a945c7d74ea3028d6de SHA512 ddb0d8c17b6b0bbb934312e6253a2b689d2545c892af989efac9782022c501109f2ff57bb2ea7c26d63d7747e2a510c18bd22a6076bb7137fe0252c38b2125ea
+EBUILD epspdf-0.6.0.ebuild 1294 BLAKE2B 04f03e10c525815194609721427dc383a94b29b4e56da2f3a843e5396bdd9595e2f02399935e90e5184f6777ccbddaead2f3b4640dcd6acd438320c7edb44010 SHA512 ac737cd99a6951e27dc297fab0dd8e5029a1e5140b31dfb3737781f58aaaf66560f4401933a282dc410d8f9e4437374d8d057b78557602e223301d2bfe8c086d
+EBUILD epspdf-0.6.3.ebuild 1390 BLAKE2B 4abe3db638678b963b668b28b97f71bc2b7a229c7143e40ad0f5aef488ca310fc6d9ca61f4a3f32de74acfff47c50dfdc939ca6d955d6e98dc94effd02ca59ae SHA512 cf7fe0118112f27651e500fd672d00308b17acb0852619bd94063011abb8b461f71fc8bebef91d2a4045b5e314c1e7f62114fbf5485e67b1e34674ae181b97b9
+MISC metadata.xml 245 BLAKE2B ee3a163cfe0a4bc59c0dfb46f9ddb580e2d259b4d0e33cb4e684eb9e6d4b901bf97c6edd891f3b75a613a782f1b89318d0ee3ec9bee4e34c4441d9e8f4267678 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690
diff --git a/app-text/epspdf/epspdf-0.6.0.ebuild b/app-text/epspdf/epspdf-0.6.0.ebuild
new file mode 100644
index 000000000000..25b3f41e6c1c
--- /dev/null
+++ b/app-text/epspdf/epspdf-0.6.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit texlive-common eutils
+
+DESCRIPTION="GUI and command-line converter for [e]ps and pdf"
+HOMEPAGE="http://tex.aanhet.net/epspdf/"
+SRC_URI="http://tex.aanhet.net/epspdf/${PN}.${PV}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc tk"
+
+DEPEND=""
+RDEPEND="!<dev-texlive/texlive-pictures-2011-r1
+	>=dev-texlive/texlive-basic-2011
+	app-text/ghostscript-gpl
+	tk? ( dev-lang/tk )"
+
+S=${WORKDIR}/${PN}
+INSTALLDIR=/usr/share/${PN}
+FILES="epspdf.tlu"
+TKFILES="epspdf.help epspdf.ico epspdftk.tcl"
+
+src_install() {
+	dodir ${INSTALLDIR}
+	cp -p ${FILES} "${ED}/${INSTALLDIR}" || die
+	if use tk ; then
+		cp -p ${TKFILES} "${ED}/${INSTALLDIR}" || die
+	fi
+	dobin_texmf_scripts "${PN}/epspdf.tlu"
+	use tk && dobin_texmf_scripts "${PN}/epspdftk.tcl"
+
+	doinfo doc/epspdf.info
+	dodoc doc/Changelog
+	if use doc ; then
+		dodoc doc/epspdf.pdf
+		dohtml -r doc
+	fi
+
+	# give it a .desktop
+	if use tk; then
+		make_desktop_entry epspdftk epspdftk "${INSTALLDIR}/epspdf.ico" "Graphics;ImageProcessing"
+	fi
+}
diff --git a/app-text/epspdf/epspdf-0.6.3.ebuild b/app-text/epspdf/epspdf-0.6.3.ebuild
new file mode 100644
index 000000000000..fd24f3b41c02
--- /dev/null
+++ b/app-text/epspdf/epspdf-0.6.3.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit texlive-common eutils
+
+DESCRIPTION="GUI and command-line converter for [e]ps and pdf"
+HOMEPAGE="http://tex.aanhet.net/epspdf/"
+SRC_URI="http://tex.aanhet.net/epspdf/${PN}.${PV}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc tk"
+
+DEPEND="sys-apps/texinfo"
+RDEPEND="!<dev-texlive/texlive-pictures-2011-r1
+	>=dev-texlive/texlive-basic-2011
+	app-text/ghostscript-gpl
+	tk? ( dev-lang/tk )"
+
+S=${WORKDIR}/${PN}
+INSTALLDIR=/usr/share/${PN}
+FILES="epspdf.tlu"
+TKFILES="epspdf.help doc/images/epspdf.png epspdftk.tcl"
+
+src_compile() {
+	cd doc
+	makeinfo epspdf || die
+}
+
+src_install() {
+	dodir ${INSTALLDIR}
+	cp -p ${FILES} "${ED}/${INSTALLDIR}" || die
+	if use tk ; then
+		cp -p ${TKFILES} "${ED}/${INSTALLDIR}" || die
+	fi
+	dobin_texmf_scripts "${PN}/epspdf.tlu"
+	use tk && dobin_texmf_scripts "${PN}/epspdftk.tcl"
+
+	doinfo doc/epspdf.info
+	dodoc doc/Changelog
+	if use doc ; then
+		dodoc doc/epspdf.pdf
+		dohtml -r doc
+	fi
+
+	# give it a .desktop
+	if use tk; then
+		make_desktop_entry epspdftk epspdftk "${INSTALLDIR}/epspdf.png" "Graphics;ImageProcessing"
+	fi
+}
diff --git a/app-text/epspdf/metadata.xml b/app-text/epspdf/metadata.xml
new file mode 100644
index 000000000000..13170c3184d8
--- /dev/null
+++ b/app-text/epspdf/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>tex@gentoo.org</email>
+	<name>Gentoo TeX Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-text/epstool-3.08-r1 b/app-text/epstool-3.08-r1
deleted file mode 100644
index 4b009073d145..000000000000
--- a/app-text/epstool-3.08-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=app-text/ghostscript-gpl
-DESCRIPTION=Creates or extracts preview images in EPS files, fixes bounding boxes
-EAPI=5
-HOMEPAGE=http://www.cs.wisc.edu/~ghost/gsview/epstool.htm
-KEYWORDS=amd64 ~arm hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=GPL-2
-RDEPEND=app-text/ghostscript-gpl
-SLOT=0
-SRC_URI=ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/ghostgum/epstool-3.08.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=76545bd48a667e915c1471445a79c44d
diff --git a/app-text/epstool/Manifest b/app-text/epstool/Manifest
new file mode 100644
index 000000000000..a8ad1f236da2
--- /dev/null
+++ b/app-text/epstool/Manifest
@@ -0,0 +1,4 @@
+AUX gcc43.patch 632 BLAKE2B 3f4537c7b4e20e50aafa3d8e07379eb8db2e68c1abbe6e096b2e5926b6a3ab539c6478dcff7d03f2c93888abf3dc8c64cd6531c855c9a145fe2c50c9a5a8c144 SHA512 a088a86e2c66469da955a4ba2309142cf54be9d88ca18c8c173d9a285a145c3432ec99d4c212f5f69caeeef17035a063f2ca55d57bf72325258555a0af8ca875
+DIST epstool-3.08.tar.gz 191567 BLAKE2B 6ef2912e10e65809f60444d09facc1ea3800e492e55e87a4f00c95f7dbabd45c4d48b447fd92879e97e9dc2fe9698c1ff7d4cb06bdf3724f16ed89f76a829a8d SHA512 d6d70825c7d08cca318503bd8c12b48408b6d6cd3a64f26df94890373a3e73b68dc09a4eb454b81893c7ee3c11da791cdfed7466eb1410414cd1b97d80e8abf1
+EBUILD epstool-3.08-r1.ebuild 903 BLAKE2B d142c8e851ef544dd098b41572a88afcdc70895a8f61538f70a8dcebce677524e509e51987b242f1ace9ae1ebd125b970819c863a787375d23faf100233f7dda SHA512 ec0b4d0c5282fcbc39c726b21809f4a7bbb41dacda97a94e2574574f2cc32d08fe768430710f7ac1e91f28a98a8492d74b9df7d430ec7da4aef0507aa2210d3b
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/epstool/epstool-3.08-r1.ebuild b/app-text/epstool/epstool-3.08-r1.ebuild
new file mode 100644
index 000000000000..04ef4ccd4060
--- /dev/null
+++ b/app-text/epstool/epstool-3.08-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Creates or extracts preview images in EPS files, fixes bounding boxes"
+HOMEPAGE="http://www.cs.wisc.edu/~ghost/gsview/epstool.htm"
+SRC_URI="ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/ghostgum/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+DEPEND="app-text/ghostscript-gpl"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/gcc43.patch
+
+	sed -i \
+		-e '/^CC/s/=/?=/' \
+		-e '/^CLINK/s/gcc/$(CC)/' \
+		src/unixcom.mak || die
+	tc-export CC
+
+	epatch_user
+
+	# parallel make issue (bug #506978)
+	mkdir bin || die
+	mkdir epsobj || die
+}
+
+src_compile() {
+	emake epstool
+}
+
+src_install() {
+	dobin bin/epstool
+	doman doc/epstool.1
+	dohtml doc/epstool.htm doc/gsview.css
+}
diff --git a/app-text/epstool/files/gcc43.patch b/app-text/epstool/files/gcc43.patch
new file mode 100644
index 000000000000..b50250a9af1a
--- /dev/null
+++ b/app-text/epstool/files/gcc43.patch
@@ -0,0 +1,20 @@
+--- a/src/epstool.c
++++ b/src/epstool.c
+@@ -2824,7 +2824,7 @@
+ 		code = -1;
+ 	}
+ 	if ((code==0) && stdout_name && (hChildStdoutWr == -1)) {
+-	    handle = open(stdout_name, O_WRONLY | O_CREAT);
++	    handle = open(stdout_name, O_WRONLY | O_CREAT, 0644);
+ 	    hChildStdoutWr = dup2(handle, 1);
+ 	    if (handle != -1)
+ 		close(handle);
+@@ -2832,7 +2832,7 @@
+ 		code = -1;
+ 	}
+ 	if ((code==0) && stderr_name && (hChildStderrWr == -1)) {
+-	    handle = open(stderr_name, O_WRONLY | O_CREAT);
++	    handle = open(stderr_name, O_WRONLY | O_CREAT, 0644);
+ 	    hChildStderrWr = dup2(handle, 2);
+ 	    if (handle != -1)
+ 		close(handle);
diff --git a/app-text/epstool/metadata.xml b/app-text/epstool/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-text/epstool/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/app-text/evince-3.24.2-r1 b/app-text/evince-3.24.2-r1
deleted file mode 100644
index 0d0317f9cd40..000000000000
--- a/app-text/evince-3.24.2-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=dev-libs/atk >=dev-libs/glib-2.36:2[dbus] >=dev-libs/libxml2-2.5:2 sys-libs/zlib:= x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.16.0:3[introspection?] gnome-base/gsettings-desktop-schemas >=x11-libs/cairo-1.10:= >=app-text/poppler-0.33[cairo] djvu? ( >=app-text/djvu-3.5.22:= ) dvi? ( virtual/tex-base dev-libs/kpathsea:= t1lib? ( >=media-libs/t1lib-5:= ) ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-good:1.0 ) gnome? ( gnome-base/gnome-desktop:3= ) gnome-keyring? ( >=app-crypt/libsecret-0.5 ) introspection? ( >=dev-libs/gobject-introspection-1:= ) nautilus? ( >=gnome-base/nautilus-2.91.4[introspection?] ) postscript? ( >=app-text/libspectre-0.2:= ) tiff? ( >=media-libs/tiff-3.6:0= ) xps? ( >=app-text/libgxps-0.2.1:= ) app-text/docbook-xml-dtd:4.3 app-text/yelp-tools dev-util/gdbus-codegen >=dev-util/gtk-doc-am-1.13 >=dev-util/intltool-0.35 dev-util/itstool sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info virtual/pkgconfig
-DESCRIPTION=Simple document viewer for GNOME
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Apps/Evince
-IUSE=djvu dvi gstreamer gnome gnome-keyring +introspection nautilus nsplugin +postscript t1lib tiff xps
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris
-LICENSE=GPL-2+ CC-BY-SA-3.0
-RDEPEND=dev-libs/atk >=dev-libs/glib-2.36:2[dbus] >=dev-libs/libxml2-2.5:2 sys-libs/zlib:= x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-3.16.0:3[introspection?] gnome-base/gsettings-desktop-schemas >=x11-libs/cairo-1.10:= >=app-text/poppler-0.33[cairo] djvu? ( >=app-text/djvu-3.5.22:= ) dvi? ( virtual/tex-base dev-libs/kpathsea:= t1lib? ( >=media-libs/t1lib-5:= ) ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-good:1.0 ) gnome? ( gnome-base/gnome-desktop:3= ) gnome-keyring? ( >=app-crypt/libsecret-0.5 ) introspection? ( >=dev-libs/gobject-introspection-1:= ) nautilus? ( >=gnome-base/nautilus-2.91.4[introspection?] ) postscript? ( >=app-text/libspectre-0.2:= ) tiff? ( >=media-libs/tiff-3.6:0= ) xps? ( >=app-text/libgxps-0.2.1:= ) gnome-base/gvfs gnome-base/librsvg || ( >=x11-themes/adwaita-icon-theme-2.17.1 >=x11-themes/hicolor-icon-theme-0.10 )
-SLOT=0/evd3.4-evv3.3
-SRC_URI=mirror://gnome/sources/evince/3.24/evince-3.24.2.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	04e50685fbf3d89e5c67ac6a385dd595	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6ef88ba0f87514c0d6f90d31dcf0f520
diff --git a/app-text/evince/Manifest b/app-text/evince/Manifest
new file mode 100644
index 000000000000..4ae7d2c2d2d2
--- /dev/null
+++ b/app-text/evince/Manifest
@@ -0,0 +1,4 @@
+AUX 3.24.2-CVE-2017-1000159.patch 1644 BLAKE2B dfb16a3fd8403d69212d0d20fa97dc06ad2b43d1c71894a0a2b366002b945110a73942446543276058ad5bb8ed867b68b3750eb9eed5bb23d2b130c14239f98e SHA512 a09d1e4a6f22c1b93ab322c1b7201bf4665bbc12b29dd9222db22b7d1b73f9ebc745c7e9b77e2bb54656916360757fd8007b6c38c004983b42f506bbaf4369ff
+DIST evince-3.24.2.tar.xz 3509216 BLAKE2B 3bcb9e15a6576650d17d6ea1df638c4b16759ddd2353ca47b425c1fec04f90b85ff7f338472e5e18defc01ab066ef241eff40e8f493fa2238814933703636e7b SHA512 77e099ff60188f982a49f5c8287eb2ed8d42402a15a54ccf8367b3814e7e16ba31354363d3f101117153792daa96f653f24bb06193b5e749d0ebfaac7d7c1e0f
+EBUILD evince-3.24.2-r1.ebuild 2874 BLAKE2B dba10da7fdf7adfc96c52ed4cde40c9793bec028e3c56043f9bd6a1acec62f1b9d3dd900bfee8281c19fbf7eb43bab8a6895ca3bad21fd49669f0ec106459612 SHA512 92527495b1f50a477458599f01c00c652bfd572d179130920c49ecde92878adb3a8bea317645a10ead7f04c963ee46a082629dc05e153aaa0ea47bd91ed92b0e
+MISC metadata.xml 612 BLAKE2B 2736a02dc43835f7db7b02a3ffcd2c2e25a81971a61a008f67497612ce8f9c78b6641e110a00dacf5f158cf5a87104171c5aea7f82be241ee0b966bb802e78eb SHA512 a9ce7d786d979e14c852b0fe3f722b346dce2f1f52b8f9ab272a1f2291ce88adba78c5d347e3e33a3bb0a58f46d77d20febc92516a4c12bc9f987cccd7aa977c
diff --git a/app-text/evince/evince-3.24.2-r1.ebuild b/app-text/evince/evince-3.24.2-r1.ebuild
new file mode 100644
index 000000000000..f8d23a5fc7bc
--- /dev/null
+++ b/app-text/evince/evince-3.24.2-r1.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2 systemd
+
+DESCRIPTION="Simple document viewer for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Evince"
+
+LICENSE="GPL-2+ CC-BY-SA-3.0"
+# subslot = evd3.(suffix of libevdocument3)-evv3.(suffix of libevview3)
+SLOT="0/evd3.4-evv3.3"
+IUSE="djvu dvi gstreamer gnome gnome-keyring +introspection nautilus nsplugin +postscript t1lib tiff xps"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
+
+# atk used in libview
+# gdk-pixbuf used all over the place
+COMMON_DEPEND="
+	dev-libs/atk
+	>=dev-libs/glib-2.36:2[dbus]
+	>=dev-libs/libxml2-2.5:2
+	sys-libs/zlib:=
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.16.0:3[introspection?]
+	gnome-base/gsettings-desktop-schemas
+	>=x11-libs/cairo-1.10:=
+	>=app-text/poppler-0.33[cairo]
+	djvu? ( >=app-text/djvu-3.5.22:= )
+	dvi? (
+		virtual/tex-base
+		dev-libs/kpathsea:=
+		t1lib? ( >=media-libs/t1lib-5:= ) )
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+		media-libs/gst-plugins-good:1.0 )
+	gnome? ( gnome-base/gnome-desktop:3= )
+	gnome-keyring? ( >=app-crypt/libsecret-0.5 )
+	introspection? ( >=dev-libs/gobject-introspection-1:= )
+	nautilus? ( >=gnome-base/nautilus-2.91.4[introspection?] )
+	postscript? ( >=app-text/libspectre-0.2:= )
+	tiff? ( >=media-libs/tiff-3.6:0= )
+	xps? ( >=app-text/libgxps-0.2.1:= )
+"
+RDEPEND="${COMMON_DEPEND}
+	gnome-base/gvfs
+	gnome-base/librsvg
+	|| (
+		>=x11-themes/adwaita-icon-theme-2.17.1
+		>=x11-themes/hicolor-icon-theme-0.10 )
+"
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xml-dtd:4.3
+	app-text/yelp-tools
+	dev-util/gdbus-codegen
+	>=dev-util/gtk-doc-am-1.13
+	>=dev-util/intltool-0.35
+	dev-util/itstool
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+# eautoreconf needs:
+#  app-text/yelp-tools
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-CVE-2017-1000159.patch
+)
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Do not depend on adwaita-icon-theme, bug #326855, #391859
+	# https://bugs.freedesktop.org/show_bug.cgi?id=29942
+	sed -e 's/adwaita-icon-theme >= $ADWAITA_ICON_THEME_REQUIRED//g' \
+		-i configure || die "sed failed"
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		--enable-pdf \
+		--enable-comics \
+		--enable-thumbnailer \
+		--with-platform=gnome \
+		--enable-dbus \
+		$(use_enable djvu) \
+		$(use_enable dvi) \
+		$(use_enable gstreamer multimedia) \
+		$(use_enable gnome libgnome-desktop) \
+		$(use_with gnome-keyring keyring) \
+		$(use_enable introspection) \
+		$(use_enable nautilus) \
+		$(use_enable nsplugin browser-plugin) \
+		$(use_enable postscript ps) \
+		$(use_enable t1lib) \
+		$(use_enable tiff) \
+		$(use_enable xps) \
+		BROWSER_PLUGIN_DIR="${EPREFIX}"/usr/$(get_libdir)/nsbrowser/plugins \
+		--with-systemduserunitdir="$(systemd_get_userunitdir)"
+}
diff --git a/app-text/evince/files/3.24.2-CVE-2017-1000159.patch b/app-text/evince/files/3.24.2-CVE-2017-1000159.patch
new file mode 100644
index 000000000000..80861fdc4dea
--- /dev/null
+++ b/app-text/evince/files/3.24.2-CVE-2017-1000159.patch
@@ -0,0 +1,42 @@
+From 350404c76dc8601e2cdd2636490e2afc83d3090e Mon Sep 17 00:00:00 2001
+From: Tobias Mueller <muelli@cryptobitch.de>
+Date: Fri, 14 Jul 2017 12:52:14 +0200
+Subject: [PATCH] dvi: Mitigate command injection attacks by quoting filename
+
+With commit 1fcca0b8041de0d6074d7e17fba174da36c65f99 came a DVI backend.
+It exports to PDF via the dvipdfm tool.
+It calls that tool with the filename of the currently loaded document.
+If that filename is cleverly crafted, it can escape the currently
+used manual quoting of the filename.  Instead of manually quoting the
+filename, we use g_shell_quote.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=784947
+---
+ backend/dvi/dvi-document.c | 8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/backend/dvi/dvi-document.c b/backend/dvi/dvi-document.c
+index 4a896e21..28877700 100644
+--- a/backend/dvi/dvi-document.c
++++ b/backend/dvi/dvi-document.c
+@@ -300,12 +300,14 @@ dvi_document_file_exporter_end (EvFileExporter *exporter)
+ 	gboolean success;
+ 	
+ 	DviDocument *dvi_document = DVI_DOCUMENT(exporter);
++	gchar* quoted_filename = g_shell_quote (dvi_document->context->filename);
+ 	
+-	command_line = g_strdup_printf ("dvipdfm %s -o %s \"%s\"", /* dvipdfm -s 1,2,.., -o exporter_filename dvi_filename */
++	command_line = g_strdup_printf ("dvipdfm %s -o %s %s", /* dvipdfm -s 1,2,.., -o exporter_filename dvi_filename */
+ 					dvi_document->exporter_opts->str,
+ 					dvi_document->exporter_filename,
+-					dvi_document->context->filename);
+-	
++					quoted_filename);
++	g_free (quoted_filename);
++
+ 	success = g_spawn_command_line_sync (command_line,
+ 					     NULL,
+ 					     NULL,
+-- 
+2.17.0
+
diff --git a/app-text/evince/metadata.xml b/app-text/evince/metadata.xml
new file mode 100644
index 000000000000..7601c5d749ed
--- /dev/null
+++ b/app-text/evince/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
+	<use>
+		<flag name="dvi">Enable the built-in DVI viewer</flag>
+		<flag name="nautilus">Enable property page extension in <pkg>gnome-base/nautilus</pkg></flag>
+		<flag name="t1lib">Enable the Type-1 fonts for the built-in DVI viewer
+			(<pkg>media-libs/t1lib</pkg>)</flag>
+		<flag name="xps">Enable XPS viewer using <pkg>app-text/libgxps</pkg></flag>
+	</use>
+</pkgmetadata>
diff --git a/app-text/expander-2.0.5-r2 b/app-text/expander-2.0.5-r2
deleted file mode 100644
index 01b35669dbec..000000000000
--- a/app-text/expander-2.0.5-r2
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare
-DESCRIPTION=Expander is a utility that acts as a filter for text editors
-EAPI=4
-HOMEPAGE=http://www.nedit.org
-KEYWORDS=~amd64 ~x86 ~x86-linux ~ppc-macos
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=ftp://ftp.nedit.org/pub/contrib/misc/nedit_expander_kit_2.05.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b11e421f50e1793b2993ccdbeab0193b
diff --git a/app-text/expander/Manifest b/app-text/expander/Manifest
new file mode 100644
index 000000000000..6e1bf1b59299
--- /dev/null
+++ b/app-text/expander/Manifest
@@ -0,0 +1,4 @@
+AUX expander-2.0.5-gentoo.patch 1971 BLAKE2B 16459adb991e28472c569ef77bd4f688110e0d2a99970ed65e5332736a1a90a82afa6a04aaec38ba53b16b3303efbe8706324ffe1a37d6b00637550802d23960 SHA512 f81577c3ee11d2e13b59258a59e02a3ec26b265ee2206fde5585f75c21db015907835ade2db88a19ab1afd778a3a7d146d99d1dfb891237d04b2e6a052f49f57
+DIST nedit_expander_kit_2.05.tar.gz 92571 BLAKE2B 0b77640b87372003e873a9e9146aeec82220dfc86b4f6d57220807443c007b6f4f99da8da505d7b6d2f1350150698deed84c8cb710297c6d8646ed192d3ee04a SHA512 a9d5e97db95eec9f98d71360c6af5a6908f31f59221ac1f509ae4f661b0614610b9591b9e2f58bba1175a6b609407d720369ba99cecb5496133d889bf93788ee
+EBUILD expander-2.0.5-r2.ebuild 1094 BLAKE2B a9b380f0fa99cdd32c32423fcfb2fc7a0684e0b92093f39dfe0169093d4eb8ca672cf890841903ad128593a592ed0e4258155c6e984bf0cf6b83297de4970c5e SHA512 1c95a0838980dd94d03257eae7c3c405d3236e0af0b828860a1e9d428788d77beb0add8bbcb8cabed07e7839c164ff44137a189965cd42a0ca1c32fa0620ae01
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/expander/expander-2.0.5-r2.ebuild b/app-text/expander/expander-2.0.5-r2.ebuild
new file mode 100644
index 000000000000..1c4a5c12ffbd
--- /dev/null
+++ b/app-text/expander/expander-2.0.5-r2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Expander is a utility that acts as a filter for text editors"
+HOMEPAGE="http://www.nedit.org"
+SRC_URI="ftp://ftp.nedit.org/pub/contrib/misc/nedit_expander_kit_2.05.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-linux ~ppc-macos"
+IUSE=""
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+}
+
+src_compile() {
+	emake -C src CC=$(tc-getCC)
+}
+
+src_install() {
+	cd src
+	dobin expander boxcomment align_columns align_comments where_is
+	dosym boxcomment /usr/bin/unboxcomment
+
+	insinto /usr/share/${P}
+	doins "${S}"/service
+	for x in defs macros misc templates ; do
+		insinto /usr/share/${P}/${x}
+		doins "${S}"/${x}/*
+	done
+
+	cd "${S}"/docs
+	doman *.1
+
+	cd "${S}"
+	dodoc ChangeLog INSTALL README USAGE
+}
+
+pkg_postinst() {
+	elog
+	elog "Instructions for using expander with NEdit are in /usr/share/doc/${PF}/INSTALL"
+	elog "Macro, definition and template files can be found in /usr/share/${P}"
+	elog
+}
diff --git a/app-text/expander/files/expander-2.0.5-gentoo.patch b/app-text/expander/files/expander-2.0.5-gentoo.patch
new file mode 100644
index 000000000000..460a8164cee5
--- /dev/null
+++ b/app-text/expander/files/expander-2.0.5-gentoo.patch
@@ -0,0 +1,58 @@
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -3,15 +3,14 @@
+ bindir = $(BINDIR)/
+ 
+ copy     = ln -fs
+-CFLAGS  += -v -g # -DNEED_GETOPT_PROTO_TYPE
+-compiler = cc $(CFLAGS)
++compiler = $(CC) $(CFLAGS)
+ 
+ executables = expander boxcomment align_columns align_comments where_is
+ 
+ #--------------
+ # Build Targets
+ #--------------
+-all: verify $(executables)
++all: $(executables)
+ 
+ verify:
+ 	@if [ "$(bindir)" = "/" ]; then \
+@@ -24,32 +23,31 @@
+ # Abbreviation expansion filter program (with NEdit, language sensitive)
+ #-----------------------------------------------------------------------
+ expander: expander.c             
+-	$(compiler) -o $(bindir)$@ $?  
++	$(compiler) $(LDFLAGS) -o $@ $?
+ 
+ #--------------------------------------------------------------------------
+ # Surround given text with open ended box. (with NEdit, language sensitive)
+ #--------------------------------------------------------------------------
+ boxcomment: boxcomment.c
+-	$(compiler) -o $(bindir)$@ $?
+-	@if [ ! -f $(bindir)un$@ ]; then $(copy) $(bindir)$@ $(bindir)un$@; fi
++	$(compiler) $(LDFLAGS) -o $@ $?
+ 
+ #-------------------------------------------------------------------------------
+ # Align ragged looking 'C' style comments (good substitute for align_equals too)
+ #-------------------------------------------------------------------------------
+ align_comments: align_comments.c
+-	$(compiler) -o $(bindir)$@ $?
++	$(compiler) $(LDFLAGS) -o $@ $?
+ 
+ #----------------------------
+ # Align given text in columns
+ #----------------------------
+ align_columns: align_columns.c
+-	$(compiler) -o $(bindir)$@ $?
++	$(compiler) $(LDFLAGS) -o $@ $?
+ 
+ #----------------------------------------------
+ # File locator (substitute for which, where...)
+ #----------------------------------------------
+ where_is: where_is.c
+-	$(compiler) -o $(bindir)$@ $?
++	$(compiler) $(LDFLAGS) -o $@ $?
+ 
+ #------------------------------------------------
+ # Here is how to uninstall the executables built.
diff --git a/app-text/expander/metadata.xml b/app-text/expander/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-text/expander/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/app-text/extract_url-1.6.2 b/app-text/extract_url-1.6.2
deleted file mode 100644
index 5ee99b934eed..000000000000
--- a/app-text/extract_url-1.6.2
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=extracts URLs from correctly-encoded MIME email messages or plain text
-EAPI=6
-HOMEPAGE=https://www.memoryhole.net/~kyle/extract_url/ https://github.com/m3m0ryh0l3/extracturl/
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2
-RDEPEND=dev-perl/MIME-tools dev-perl/HTML-Parser dev-perl/URI-Find dev-perl/Curses-UI dev-perl/TermReadKey
-SLOT=0
-SRC_URI=https://github.com/m3m0ryh0l3/extracturl/archive/v1.6.2.tar.gz -> extract_url-1.6.2.tar.gz
-_md5_=901e0465720ab3ba604c40af1a9f68bb
diff --git a/app-text/extract_url/Manifest b/app-text/extract_url/Manifest
new file mode 100644
index 000000000000..53746d216b15
--- /dev/null
+++ b/app-text/extract_url/Manifest
@@ -0,0 +1,3 @@
+DIST extract_url-1.6.2.tar.gz 16296 BLAKE2B 63771d63fe9a93e340fb02788e12596003d0d7242578d9d39255a5e8b22e8ab3040e2aeed505f6342181422194ee80611092d891146ba2c5d0ad9b8c7f9c249b SHA512 c95c52c096569d4fb24da95480c8c5262ee29bfce8ddc9cb70af45d17f4977edff6d95eda8aa7976f82fc75e7de262fab21a3498590e1c212cf9cf6435d2c4f1
+EBUILD extract_url-1.6.2.ebuild 640 BLAKE2B 3bc8f810cafdbb738204d431fd0bb4f5060861998777abb66988db2e7537dadaf0acef426a9fbd5d1fb0310d4553d901589f344910a9a8402b40129237f69a16 SHA512 ed7ce99f826c642f2bb92505c51d5d3fd8cff989a65dad5ea493d5d6f38cc9033c8eac2fe8a6a60d0afbd9d85d1c5da084f7e777098bb0d3f6479929f00478ff
+MISC metadata.xml 332 BLAKE2B 513790c352255ea4582ab74d35041b62aee7c4e8f9f7f70a7d3827ec9d3b746547ace7c09a0e262b330fa2d1e1af71213a890d1e01f8a0fdb9692a95df6287dc SHA512 f10d426e688c66c2ecc76c7d8a6bbb87cbb5fb0e3ce237a82a63c65fff1a4d6ab8d981c679ccf6a2e3049479fc679277829fae1e66071d6c8ccf6da22b2b0fb5
diff --git a/app-text/extract_url/extract_url-1.6.2.ebuild b/app-text/extract_url/extract_url-1.6.2.ebuild
new file mode 100644
index 000000000000..8ccadeb5e0f5
--- /dev/null
+++ b/app-text/extract_url/extract_url-1.6.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="extracts URLs from correctly-encoded MIME email messages or plain text"
+HOMEPAGE="https://www.memoryhole.net/~kyle/extract_url/ https://github.com/m3m0ryh0l3/extracturl/"
+SRC_URI="https://github.com/m3m0ryh0l3/${PN/_/}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-perl/MIME-tools
+	dev-perl/HTML-Parser
+	dev-perl/URI-Find
+	dev-perl/Curses-UI
+	dev-perl/TermReadKey
+"
+
+S=${WORKDIR}/${P/_/}
+
+src_install() {
+	default
+	dodoc extract_urlview.sample
+}
diff --git a/app-text/extract_url/metadata.xml b/app-text/extract_url/metadata.xml
new file mode 100644
index 000000000000..13884f66a233
--- /dev/null
+++ b/app-text/extract_url/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>radhermit@gentoo.org</email>
+		<name>Tim Harder</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">m3m0ryh0l3/extracturl</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/fbless-0.2.3 b/app-text/fbless-0.2.3
deleted file mode 100644
index 976861df9822..000000000000
--- a/app-text/fbless-0.2.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Python-based console fb2 reader with less-like interface
-EAPI=6
-HOMEPAGE=https://github.com/matimatik/fbless
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/matimatik/fbless/archive/0.2.3.tar.gz -> fbless-0.2.3.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c4bf01ff1a2e6856aa804f1c3993acd1
diff --git a/app-text/fbless/Manifest b/app-text/fbless/Manifest
new file mode 100644
index 000000000000..59daf1525994
--- /dev/null
+++ b/app-text/fbless/Manifest
@@ -0,0 +1,3 @@
+DIST fbless-0.2.3.tar.gz 115622 BLAKE2B c9ab9f9a4b5d5c4e6d2ec82318865b30d61674882efbf23c241516a8019cd99b9cc4e28e13f39877b85e485beab322aaf14e831268784fb208ec5efed7b36d76 SHA512 b5188b0b4c0654915487a49930987c02a3e9bc3ba47a830f744362b464235a502fb28e20bb8c91cea15a5bdbeea54775697bf57ca581f5ebbadb84134dfdbafd
+EBUILD fbless-0.2.3.ebuild 468 BLAKE2B 0505f8c48d61294f78bfe614c1b759322eea1379993e1d3eaf8f83f71d5a617e2ecd8549400aa5cc162f4da9f8327ded5707c077d28fc563c1dff2243b456577 SHA512 df77db59ba00eeb44af5357a454bf1ed5aeda2dd52967f1c735c81ccc8b2daee48972acf183ff66a9af1d1398aade49b91a16f0e8775b6315396b181408829cc
+MISC metadata.xml 338 BLAKE2B 9d50902d728bbec2247a688abd0be5b88bd5218d1d2ba75ce61c891f4b4f1aec60999bac027fb03a46d9acaf0cc137d116631a43de9dfd462c42656810798015 SHA512 e3b7de793ac97b5b39d855cdbe930df8575d24c55894ec03e789fb0090bba6d73fffe00a5b2cb84900da90e3240de722e784ac80e7ceebed8eead0b6ec705da0
diff --git a/app-text/fbless/fbless-0.2.3.ebuild b/app-text/fbless/fbless-0.2.3.ebuild
new file mode 100644
index 000000000000..9dcad0fd14eb
--- /dev/null
+++ b/app-text/fbless/fbless-0.2.3.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="ncurses,xml"
+inherit distutils-r1
+
+DESCRIPTION="Python-based console fb2 reader with less-like interface"
+HOMEPAGE="https://github.com/matimatik/fbless"
+SRC_URI="https://github.com/matimatik/fbless/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
diff --git a/app-text/fbless/metadata.xml b/app-text/fbless/metadata.xml
new file mode 100644
index 000000000000..d6c5780297ba
--- /dev/null
+++ b/app-text/fbless/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>pinkbyte@gentoo.org</email>
+    <name>Sergey Popov</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">matimatik/fbless</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-text/fbpdf-0_p20161202 b/app-text/fbpdf-0_p20161202
deleted file mode 100644
index 3aae25d27626..000000000000
--- a/app-text/fbpdf-0_p20161202
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=>=app-text/mupdf-1.10:0= app-text/djvu:0= dev-lang/mujs:0= dev-libs/openssl:0= !media-gfx/fbida[fbcon] media-libs/freetype:2= media-libs/jbig2dec:0= media-libs/openjpeg:0= virtual/jpeg:0=
-DESCRIPTION=framebuffer pdf and djvu viewer
-EAPI=6
-HOMEPAGE=http://repo.or.cz/fbpdf.git
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=>=app-text/mupdf-1.10:0= app-text/djvu:0= dev-lang/mujs:0= dev-libs/openssl:0= !media-gfx/fbida[fbcon] media-libs/freetype:2= media-libs/jbig2dec:0= media-libs/openjpeg:0= virtual/jpeg:0=
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~slyfox/distfiles/fbpdf-0_p20161202.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=0d75993ad87dee9a56e9f11b0915afd6
diff --git a/app-text/fbpdf/Manifest b/app-text/fbpdf/Manifest
new file mode 100644
index 000000000000..fcbc779bfe4e
--- /dev/null
+++ b/app-text/fbpdf/Manifest
@@ -0,0 +1,5 @@
+AUX fbpdf-0_p20161202-format.patch 410 BLAKE2B c028d4291e204f333624f85d986d57550694242dd62928d5ee453ec48f873d0315fb523eb6b2e5045ec00c2e98aab987b9a5ba2af82b5b50603a142a8074caef SHA512 d450d8afe3547a0837147daee207352f257d7009c39c64867e779ac8d099e2aba5ad6fa931d8139daa4a5a8cb1022fc8faa85adc9be8833aa3b8633f05f6292a
+AUX fbpdf-0_p20161202-mupdfthird.patch 262 BLAKE2B 1a3f01039aff3860665bdc7ab903747bf241b717598bc9423355d8ac875219736037f72c821465827dd62bcc5b948794e90a038ed8eab32b389153f55377ebc4 SHA512 aa469d088373ac79998642bc6d3c6ac8eb0138d5495eb95cf6cbd7e13ea1d346a59a72ea860fe7e6b6ba669ac50cdb120432fa9011677515b021ef3121a2a657
+DIST fbpdf-0_p20161202.tar.gz 7795 BLAKE2B 725fb49278ceee0e24bfbdaaa5f93cc78c448666e44ab426739be8db27ad3010911473af6766a45a569356fd322555962d9250f0d655e69594433b29c5d80325 SHA512 c122f12485b9e0055bd5b60d66a5034d20738c6a5a1a9f384ef8cb93e4c6b1275434eea884398590db2b06a746cc0ff00df29ecdc5faecc1730a022435164107
+EBUILD fbpdf-0_p20161202.ebuild 806 BLAKE2B e6b493ca23579e50345347452d32b3651aec9954aba1a521d8567f81502809a68ae34737e5a52d0edd41e4a2e85ea433784d7300178de78a680126c4ddc1d635 SHA512 b77b4ae4fd938832d4e3fb0018e46d143593467680e183d6755a3953a769e29a5f03744eb2c08fc2cd79f5ce25be2e2fe21d29eaf224b7a6f139533165617477
+MISC metadata.xml 251 BLAKE2B 9785c4729d0751280d104965bab25a268219a7fee217dcd8c01a5642a13f8abc471a3dff54ae0d34d3cf3dc8267fb483d93bd3b16aa3617e8fa8e9abd1703dfe SHA512 cc2bd3977894946ee4ea5b739cc3998bcd6017b9e7a52aa501409d0988954339a9a22fe751d0a5e967ddac9225d9b23f20b4fb1e2c62ee91d1d23c383d9776dd
diff --git a/app-text/fbpdf/fbpdf-0_p20161202.ebuild b/app-text/fbpdf/fbpdf-0_p20161202.ebuild
new file mode 100644
index 000000000000..a2fd7c2a1021
--- /dev/null
+++ b/app-text/fbpdf/fbpdf-0_p20161202.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="framebuffer pdf and djvu viewer"
+HOMEPAGE="http://repo.or.cz/fbpdf.git"
+SRC_URI="https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=app-text/mupdf-1.10:0=
+	app-text/djvu:0=
+	dev-lang/mujs:0=
+	dev-libs/openssl:0=
+	!media-gfx/fbida[fbcon]
+	media-libs/freetype:2=
+	media-libs/jbig2dec:0=
+	media-libs/openjpeg:0=
+	virtual/jpeg:0=
+"
+
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${PN}
+
+PATCHES=(
+	"${FILESDIR}"/${P}-format.patch
+	"${FILESDIR}"/${P}-mupdfthird.patch
+)
+
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	dobin fbpdf fbdjvu
+	dodoc README
+}
diff --git a/app-text/fbpdf/files/fbpdf-0_p20161202-format.patch b/app-text/fbpdf/files/fbpdf-0_p20161202-format.patch
new file mode 100644
index 000000000000..0b48d6bff020
--- /dev/null
+++ b/app-text/fbpdf/files/fbpdf-0_p20161202-format.patch
@@ -0,0 +1,14 @@
+diff --git a/fbpdf.c b/fbpdf.c
+index 6caa08f..48d12f5 100644
+--- a/fbpdf.c
++++ b/fbpdf.c
+@@ -343,3 +343,3 @@ static void mainloop(void)
+ static char *usage =
+-	"usage: fbpdf [-r rotation] [-z zoom x10] [-p page] filename\n";
++	"usage: fbpdf [-r rotation] [-z zoom x10] [-p page] filename";
+ 
+@@ -349,3 +349,3 @@ int main(int argc, char *argv[])
+ 	if (argc < 2) {
+-		printf(usage);
++		puts(usage);
+ 		return 1;
diff --git a/app-text/fbpdf/files/fbpdf-0_p20161202-mupdfthird.patch b/app-text/fbpdf/files/fbpdf-0_p20161202-mupdfthird.patch
new file mode 100644
index 000000000000..070b7c72ea26
--- /dev/null
+++ b/app-text/fbpdf/files/fbpdf-0_p20161202-mupdfthird.patch
@@ -0,0 +1,9 @@
+diff --git a/Makefile b/Makefile
+index f986689..374837f 100644
+--- a/Makefile
++++ b/Makefile
+@@ -13,3 +13,3 @@ clean:
+ fbpdf: fbpdf.o mupdf.o draw.o
+-	$(CC) -o $@ $^ $(LDFLAGS) -lmupdf -lmupdfthird -lcrypto -lm
++	$(CC) -o $@ $^ $(LDFLAGS) -lmupdf -lcrypto -lm
+ 
diff --git a/app-text/fbpdf/metadata.xml b/app-text/fbpdf/metadata.xml
new file mode 100644
index 000000000000..c5298995d2d4
--- /dev/null
+++ b/app-text/fbpdf/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>slyfox@gentoo.org</email>
+		<name>Sergei Trofimovich</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-text/fbreader-0.99.4-r3 b/app-text/fbreader-0.99.4-r3
deleted file mode 100644
index b0df1e9956fb..000000000000
--- a/app-text/fbreader-0.99.4-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=app-arch/bzip2 dev-libs/expat dev-libs/liblinebreak dev-libs/fribidi dev-db/sqlite net-misc/curl sys-libs/zlib dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtnetwork:5[ssl] virtual/pkgconfig
-DESCRIPTION=E-Book Reader. Supports many e-book formats
-EAPI=6
-HOMEPAGE=http://www.fbreader.org/
-IUSE=debug
-KEYWORDS=amd64 ~arm ~ppc x86
-LICENSE=GPL-2
-RDEPEND=app-arch/bzip2 dev-libs/expat dev-libs/liblinebreak dev-libs/fribidi dev-db/sqlite net-misc/curl sys-libs/zlib dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtnetwork:5[ssl]
-SLOT=0
-SRC_URI=http://www.fbreader.org/files/desktop/fbreader-sources-0.99.4.tgz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2e94e4396f5341963e193c87bb97a0bb
diff --git a/app-text/fbreader-0.99.4-r4 b/app-text/fbreader-0.99.4-r4
deleted file mode 100644
index 847e437dbbd4..000000000000
--- a/app-text/fbreader-0.99.4-r4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=app-arch/bzip2 dev-libs/expat dev-libs/libunibreak dev-libs/fribidi dev-db/sqlite net-misc/curl sys-libs/zlib dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtnetwork:5[ssl] virtual/pkgconfig
-DESCRIPTION=E-Book Reader. Supports many e-book formats
-EAPI=6
-HOMEPAGE=http://www.fbreader.org/
-IUSE=debug
-KEYWORDS=~amd64 ~arm ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=app-arch/bzip2 dev-libs/expat dev-libs/libunibreak dev-libs/fribidi dev-db/sqlite net-misc/curl sys-libs/zlib dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtnetwork:5[ssl]
-SLOT=0
-SRC_URI=http://www.fbreader.org/files/desktop/fbreader-sources-0.99.4.tgz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=117d238b7f4c3d7ce06b1ef56d38181e
diff --git a/app-text/fbreader-0.99.4-r5 b/app-text/fbreader-0.99.4-r5
deleted file mode 100644
index 0cf68eda069e..000000000000
--- a/app-text/fbreader-0.99.4-r5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=app-arch/bzip2 dev-libs/expat dev-libs/libunibreak dev-libs/fribidi dev-db/sqlite net-misc/curl sys-libs/zlib dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtnetwork:5[ssl] virtual/pkgconfig
-DESCRIPTION=E-Book Reader. Supports many e-book formats
-EAPI=6
-HOMEPAGE=http://www.fbreader.org/
-IUSE=debug
-KEYWORDS=amd64 ~arm ~ppc x86
-LICENSE=GPL-2
-RDEPEND=app-arch/bzip2 dev-libs/expat dev-libs/libunibreak dev-libs/fribidi dev-db/sqlite net-misc/curl sys-libs/zlib dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtnetwork:5[ssl]
-SLOT=0
-SRC_URI=http://www.fbreader.org/files/desktop/fbreader-sources-0.99.4.tgz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=79b4b6c5cd25f3e8139b48a3849707a0
diff --git a/app-text/fbreader/Manifest b/app-text/fbreader/Manifest
new file mode 100644
index 000000000000..87002ed81ac6
--- /dev/null
+++ b/app-text/fbreader/Manifest
@@ -0,0 +1,12 @@
+AUX fbreader-0.99.4-combined.patch 23589 BLAKE2B 81cb00abe9ba0f40723e6c1cac626916f90eede960d8b191bcb48c8186be8fc3d1fb18954f62e3ba5f15de159034a6060dc7efaf94f9531aabad9f76b6f53658 SHA512 c4dd5237113fa9d54ae3e63a19a06841570e5751108befe4d18ae7b4730628d3a4a5613dd302bc426b14c280f2b5abf9e394aedca821de995efb45ae7b32f632
+AUX fbreader-0.99.4-gcc6.patch 512 BLAKE2B 16e930b4594abbf48879fdbd6f46415a46e10a73c1660bfe44f05922269531c58b11a7c351a3f4fc9b338ce9a1ae2f319eb3750802ddbfac76b09ebcc5a70fee SHA512 79c64750c250e10fa6530ed397a77ed9ebb2b76d12a6c0967cf8739b24f8381c76961e72388d0116f514c71c3cecc04a4945781dc87db3a30a18e4a1afc0315d
+AUX fbreader-0.99.4-ld-bfd.patch 532 BLAKE2B 50a964b7cb79211302e3804f1eae2e54194114d8387f889e8707269d4bba8d9a5acd0718c49593564bcf397c8c0afdbc2773070195dbb28fd3c394057d781f00 SHA512 77c6a0454706f68f5065333c1bbf8456aaf405ae8532019f1d557d5f66d7d0b633d409b320c8ffba50a78d04f4d64c7d655c3b0ee6f87fdf146aa5f04332167d
+AUX fbreader-0.99.4-mimetypes.patch 505 BLAKE2B 6877f9750ed6d4b30b10a83aed47c0e75b76fdb8d6c02a1d70568d3b7b1e24e7d67602c83ef5e5df5c2c3aa462b5800431ba20b9256f9908be79d690cfe5ec55 SHA512 03fd64a802be53bf33c9582d5c2804e0c67809a43db02a2bfbc3e5a15592346cae9ba44333f2f547bcc623bc1d9785ca7a10c77d58a23152a1d3f59328e75d7b
+AUX fbreader-0.99.4-qreal-cast.patch 950 BLAKE2B ae354d03bf2e6efcdb9f16a0bf2272cfe11c62d44683a1d774085eb09c2213482ad747521b38a7d7e7c8167cbf7a5f4bdc86b11530ddb72fe98118fcc19c939d SHA512 260e1966eb5f0bfd42fc3c28fdcdd92d37314d93b31f44e1ec0f94e81ad0084caeaadb69cbd16eb4e8f8b9359534449604845e1b79e63b0dd2eff96b342286d1
+AUX fbreader-0.99.4-qt5.patch 18697 BLAKE2B 241f103b97b87f084c4f35ffb137cc9b6ea3368ddf6f0b4df2037856c5a3401d3687ed809abb0efc2e224bdb3a8d382930681f7896299421ebb7bd0300e0cbca SHA512 9eb8319308a36cada28d6036ee0537433cea03cb59e648c6ad1dd8f4d10a1b05fb879ebd38b1f9b1e149e6a6544aaafb93c52d6a97f4c9fd8905e89b8cf7ae86
+AUX fbreader-0.99.4.patch 472 BLAKE2B a34f27d9f53f3faed5889dcb7a841a1c045e7bd4080f2ae6ae6a949d76e1bc99e31953cd552a1aa8afbe26d64262aead7463432f407532050db1eda5da1517a9 SHA512 486dc74e3cfc6f94f1bf95269e35e866465095efee0cd31b586592fbd780613d4d5d243b809e494da14a69da8e0c5e47e6dd2ca35619616c4497eb0a053ba09d
+DIST fbreader-sources-0.99.4.tgz 2345664 BLAKE2B 29d921a953df98def51740d9b7fed5a7164f5df6410c70daf03f30ba8f77e9aa898d6f50038945155dc46243165860ffaf13abc81f662abccdeb6dc91652b3d5 SHA512 d4b11d7ab03df002ad4212db805b10b80a24ea4384e92122b12c25a3f817a0eb343509ae30e31d68417fd4ce27f77e043235436f0081ff2c785a2830d6211dc7
+EBUILD fbreader-0.99.4-r3.ebuild 2279 BLAKE2B 1e22f5cbdc916be2543a79ccc95c753726e946c56c85e9dcd53c89b643fea39edefda496de67bc603d8c885858802a89e7d09c5d1a4d635fd5a32ff0333e0e24 SHA512 f93ebe20622e94f54b68ecd62d76520d3455595e3433b875d76654479939f34ba21ed80b580c1b46824473e9f927b4349e8a5df37e4b2f350daf824cb07eb27e
+EBUILD fbreader-0.99.4-r4.ebuild 2111 BLAKE2B 955873c4d80c35e8579e97140bc4eab256cff750ef844a68de99418666bb93f61824486c48983ed366993d8496e1d7396d4e8e2c5ebeb11f1513a3ddefb5e8bc SHA512 28195b8b7d246fd7057ba9c30835e263b37932206d07a26fa3f01d240b44c19a58196e575ffaf8fb4e4cdf76d50682ecf97a4b5bca2dc4c18582fdfdea2eb1a2
+EBUILD fbreader-0.99.4-r5.ebuild 1934 BLAKE2B e12e5cdb9714e1f97e6a375c3e64dc65aedd93b9214417e7d3b3f2dfb4b39f53a8cb540cf2636bed5940b202f64ab7f8817d541d32b212ac5a1835656e923fe9 SHA512 48a634082045cdc346d06473db3ac1b17e1ff91451fae50900ef7b19e5a7529b82c683d8ff93435b9d0053f69ccee8e924ec82854b06f213895657cec26aaad6
+MISC metadata.xml 320 BLAKE2B b537c430018e9035438033df51325115040dc2468f03721c678a60c40654ed99be77a154ba34bb6cc1b7afd54191912906a007a50924cefddb2b6bba908eceb8 SHA512 d215791adfc4cb16e4c25d0dfea7dcf6439fa12916d0c0e51be65d62dd8d48bd63c7e983080027101c6cac1220f4e622c580f7ced4dc895e8b4898f14e921539
diff --git a/app-text/fbreader/fbreader-0.99.4-r3.ebuild b/app-text/fbreader/fbreader-0.99.4-r3.ebuild
new file mode 100644
index 000000000000..ab2f47419e79
--- /dev/null
+++ b/app-text/fbreader/fbreader-0.99.4-r3.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils multilib flag-o-matic
+
+DESCRIPTION="E-Book Reader. Supports many e-book formats"
+HOMEPAGE="http://www.fbreader.org/"
+SRC_URI="http://www.fbreader.org/files/desktop/${PN}-sources-${PV}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~ppc x86"
+IUSE="debug"
+
+RDEPEND="
+	app-arch/bzip2
+	dev-libs/expat
+	dev-libs/liblinebreak
+	dev-libs/fribidi
+	dev-db/sqlite
+	net-misc/curl
+	sys-libs/zlib
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtnetwork:5[ssl]
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	# Still use linebreak instead of new unibreak
+	sed -e "s:-lunibreak:-llinebreak:" \
+		-i makefiles/config.mk zlibrary/text/Makefile || die "fixing libunibreak failed"
+
+	# Let portage decide about the compiler
+	sed -e "/^CC = /d" \
+		-i makefiles/arch/desktop.mk || die "removing CC line failed"
+
+	# let portage strip the binary
+	sed -e '/@strip/d' \
+		-i fbreader/desktop/Makefile || die
+
+	# Respect *FLAGS
+	sed -e "s/^CFLAGS = -pipe/CFLAGS +=/" \
+		-i makefiles/arch/desktop.mk || die "CFLAGS sed failed"
+	sed -e "/^	CFLAGS +=/ d" \
+		-i makefiles/config.mk || die "CFLAGS sed failed"
+	sed -e "/^	LDFLAGS += -s$/ d" \
+		-i makefiles/config.mk || die "sed failed"
+	sed -e "/^LDFLAGS =$/ d" \
+		-i makefiles/arch/desktop.mk || die "sed failed"
+
+	echo "TARGET_ARCH = desktop" > makefiles/target.mk
+	echo "LIBDIR = /usr/$(get_libdir)" >> makefiles/target.mk
+
+	echo "UI_TYPE = qt4" >> makefiles/target.mk
+	sed -e 's:MOC = moc-qt4:MOC = /usr/bin/moc:' \
+		-i makefiles/arch/desktop.mk || die "updating desktop.mk failed"
+
+	if use debug; then
+		echo "TARGET_STATUS = debug" >> makefiles/target.mk
+	else
+		echo "TARGET_STATUS = release" >> makefiles/target.mk
+	fi
+
+	# bug #452636
+	eapply "${FILESDIR}"/${P}.patch
+	# bug #515698
+	eapply "${FILESDIR}"/${P}-qreal-cast.patch
+	# bug #516794
+	eapply "${FILESDIR}"/${P}-mimetypes.patch
+	# bug #437262
+	eapply "${FILESDIR}"/${P}-ld-bfd.patch
+	# bug #592588
+	eapply -p0 "${FILESDIR}"/${P}-gcc6.patch
+
+	eapply "${FILESDIR}"/${P}-qt5.patch
+	append-cflags -std=c++11
+
+	eapply_user
+}
+
+src_compile() {
+	# bug #484516
+	emake -j1
+}
+
+src_install() {
+	default
+	dosym FBReader /usr/bin/fbreader
+}
diff --git a/app-text/fbreader/fbreader-0.99.4-r4.ebuild b/app-text/fbreader/fbreader-0.99.4-r4.ebuild
new file mode 100644
index 000000000000..a828ea2670c9
--- /dev/null
+++ b/app-text/fbreader/fbreader-0.99.4-r4.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils multilib flag-o-matic
+
+DESCRIPTION="E-Book Reader. Supports many e-book formats"
+HOMEPAGE="http://www.fbreader.org/"
+SRC_URI="http://www.fbreader.org/files/desktop/${PN}-sources-${PV}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE="debug"
+
+RDEPEND="
+	app-arch/bzip2
+	dev-libs/expat
+	dev-libs/libunibreak
+	dev-libs/fribidi
+	dev-db/sqlite
+	net-misc/curl
+	sys-libs/zlib
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtnetwork:5[ssl]
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	# Let portage decide about the compiler
+	sed -e "/^CC = /d" \
+		-i makefiles/arch/desktop.mk || die "removing CC line failed"
+
+	# let portage strip the binary
+	sed -e '/@strip/d' \
+		-i fbreader/desktop/Makefile || die
+
+	# Respect *FLAGS
+	sed -e "s/^CFLAGS = -pipe/CFLAGS +=/" \
+		-i makefiles/arch/desktop.mk || die "CFLAGS sed failed"
+	sed -e "/^	CFLAGS +=/ d" \
+		-i makefiles/config.mk || die "CFLAGS sed failed"
+	sed -e "/^	LDFLAGS += -s$/ d" \
+		-i makefiles/config.mk || die "sed failed"
+	sed -e "/^LDFLAGS =$/ d" \
+		-i makefiles/arch/desktop.mk || die "sed failed"
+
+	echo "TARGET_ARCH = desktop" > makefiles/target.mk
+	echo "LIBDIR = /usr/$(get_libdir)" >> makefiles/target.mk
+
+	echo "UI_TYPE = qt4" >> makefiles/target.mk
+	sed -e 's:MOC = moc-qt4:MOC = /usr/bin/moc:' \
+		-i makefiles/arch/desktop.mk || die "updating desktop.mk failed"
+
+	if use debug; then
+		echo "TARGET_STATUS = debug" >> makefiles/target.mk
+	else
+		echo "TARGET_STATUS = release" >> makefiles/target.mk
+	fi
+
+	# bug #452636
+	eapply "${FILESDIR}"/${P}.patch
+	# bug #515698
+	eapply "${FILESDIR}"/${P}-qreal-cast.patch
+	# bug #516794
+	eapply "${FILESDIR}"/${P}-mimetypes.patch
+	# bug #437262
+	eapply "${FILESDIR}"/${P}-ld-bfd.patch
+	# bug #592588
+	eapply -p0 "${FILESDIR}"/${P}-gcc6.patch
+
+	eapply "${FILESDIR}"/${P}-qt5.patch
+	append-cflags -std=c++11
+
+	eapply_user
+}
+
+src_compile() {
+	# bug #484516
+	emake -j1
+}
+
+src_install() {
+	default
+	dosym FBReader /usr/bin/fbreader
+}
diff --git a/app-text/fbreader/fbreader-0.99.4-r5.ebuild b/app-text/fbreader/fbreader-0.99.4-r5.ebuild
new file mode 100644
index 000000000000..7c47fc4ac07a
--- /dev/null
+++ b/app-text/fbreader/fbreader-0.99.4-r5.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils multilib flag-o-matic qmake-utils
+
+DESCRIPTION="E-Book Reader. Supports many e-book formats"
+HOMEPAGE="http://www.fbreader.org/"
+SRC_URI="http://www.fbreader.org/files/desktop/${PN}-sources-${PV}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~ppc x86"
+IUSE="debug"
+
+RDEPEND="
+	app-arch/bzip2
+	dev-libs/expat
+	dev-libs/libunibreak
+	dev-libs/fribidi
+	dev-db/sqlite
+	net-misc/curl
+	sys-libs/zlib
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtnetwork:5[ssl]
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+# bugs #452636, #515698, #516794, #437262, #592588
+PATCHES=( "${FILESDIR}"/${P}-combined.patch )
+
+src_prepare() {
+	default
+
+	append-cflags -std=c++11
+
+	# Let portage decide about the compiler
+	sed -e "/^CC = /d" \
+		-i makefiles/arch/desktop.mk || die "removing CC line failed"
+
+	# let portage strip the binary
+	sed -e '/@strip/d' \
+		-i fbreader/desktop/Makefile || die
+
+	# Respect *FLAGS
+	sed -e "s/^CFLAGS = -pipe/CFLAGS +=/" \
+		-i makefiles/arch/desktop.mk || die "CFLAGS sed failed"
+	sed -e "/^	CFLAGS +=/d" \
+		-i makefiles/config.mk || die "CFLAGS sed failed"
+	sed -e "/^	LDFLAGS += -s$/d" \
+		-i makefiles/config.mk || die "LDFLAGS sed failed"
+	sed -e "/^LDFLAGS =$/d" \
+		-i makefiles/arch/desktop.mk || die "LDFLAGS sed failed"
+
+	# Qt5 moc
+	sed -e "s:MOC = moc-qt4:MOC = $(qt5_get_bindir)/moc:" \
+		-i makefiles/arch/desktop.mk || die "updating desktop.mk failed"
+
+	echo "TARGET_ARCH = desktop" > makefiles/target.mk
+	echo "LIBDIR = /usr/$(get_libdir)" >> makefiles/target.mk
+
+	echo "UI_TYPE = qt4" >> makefiles/target.mk
+
+	if use debug; then
+		echo "TARGET_STATUS = debug" >> makefiles/target.mk
+	else
+		echo "TARGET_STATUS = release" >> makefiles/target.mk
+	fi
+}
+
+src_compile() {
+	# bug #484516
+	emake -j1
+}
+
+src_install() {
+	default
+	dosym FBReader /usr/bin/fbreader
+}
diff --git a/app-text/fbreader/files/fbreader-0.99.4-combined.patch b/app-text/fbreader/files/fbreader-0.99.4-combined.patch
new file mode 100644
index 000000000000..f75c0fdf1e2c
--- /dev/null
+++ b/app-text/fbreader/files/fbreader-0.99.4-combined.patch
@@ -0,0 +1,535 @@
+diff -r -U2 fbreader-0.99.4.orig/fbreader/Makefile fbreader-0.99.4/fbreader/Makefile
+--- fbreader-0.99.4.orig/fbreader/Makefile	2012-11-30 19:41:25.000000000 +0700
++++ fbreader-0.99.4/fbreader/Makefile	2018-01-11 22:18:18.000208200 +0700
+@@ -23,5 +23,5 @@
+ 	done;
+ 	@echo -n 'Linking $(TARGET) ...'
+-	@$(LD) $(LDFLAGS) -o $(TARGET) `find src -name *.o` $(TEXT_LIBS) $(CORE_LIBS) $(ZLUI_LIB) -lsqlite3
++	@$(LD) -fuse-ld=bfd $(LDFLAGS) -o $(TARGET) `find src -name *.o` $(TEXT_LIBS) $(CORE_LIBS) $(ZLUI_LIB) -lsqlite3
+ 	@echo ' OK'
+ 
+diff -r -U2 fbreader-0.99.4.orig/fbreader/desktop/desktop fbreader-0.99.4/fbreader/desktop/desktop
+--- fbreader-0.99.4.orig/fbreader/desktop/desktop	2012-11-30 19:41:25.000000000 +0700
++++ fbreader-0.99.4/fbreader/desktop/desktop	2018-01-11 22:13:58.401219117 +0700
+@@ -22,2 +22,3 @@
+ Icon=FBReader
+ Categories=Office;Viewer;Literature;
++MimeType=application/epub+zip;application/rtf;application/x-fictionbook+xml;application/x-zip-compressed-fb2;application/x-mobipocket-ebook;application/xhtml+xml;text/html;text/plain;
+diff -r -U2 fbreader-0.99.4.orig/fbreader/src/formats/doc/OleStorage.cpp fbreader-0.99.4/fbreader/src/formats/doc/OleStorage.cpp
+--- fbreader-0.99.4.orig/fbreader/src/formats/doc/OleStorage.cpp	2012-11-30 19:41:25.000000000 +0700
++++ fbreader-0.99.4/fbreader/src/formats/doc/OleStorage.cpp	2018-01-11 22:18:33.000207569 +0700
+@@ -60,5 +60,5 @@
+ 		return false;
+ 	}
+-	static const char OLE_SIGN[] = {0xD0, 0xCF, 0x11, 0xE0, 0xA1, 0xB1, 0x1A, 0xE1, 0};
++	static const char OLE_SIGN[] = {(char)0xD0, (char)0xCF, (char)0x11, (char)0xE0, (char)0xA1, (char)0xB1, (char)0x1A, (char)0xE1, 0};
+ 	if (std::strncmp(oleBuf, OLE_SIGN, 8) != 0) {
+ 		clear();
+diff -r -U2 fbreader-0.99.4.orig/makefiles/arch/desktop.mk fbreader-0.99.4/makefiles/arch/desktop.mk
+--- fbreader-0.99.4.orig/makefiles/arch/desktop.mk	2012-11-30 19:41:25.000000000 +0700
++++ fbreader-0.99.4/makefiles/arch/desktop.mk	2018-01-11 22:18:40.119207269 +0700
+@@ -15,27 +15,9 @@
+ CFLAGS = -pipe -fno-exceptions -Wall -Wno-ctor-dtor-privacy -W -DLIBICONV_PLUG
+ LDFLAGS =
+-EXTERNAL_INCLUDE = $(shell pkg-config --cflags fribidi) 
++EXTERNAL_INCLUDE = $(shell pkg-config --cflags fribidi)
+ 
+-ifeq "$(UI_TYPE)" "qt"
+-  MOC = moc-qt3
+-  QTINCLUDE = -I /usr/include/qt3
+-else
+-  MOC = $(shell pkg-config QtCore --variable=moc_location)
+-  QTINCLUDE = -I $(shell pkg-config --cflags QtCore)
+-endif
+-
+-GTKINCLUDE = $(shell pkg-config --cflags gtk+-2.0 libpng xft)
+-
+-ifeq "$(UI_TYPE)" "qt"
+-  UILIBS = -lqt-mt
+-endif
+-
+-ifeq "$(UI_TYPE)" "qt4"
+-  UILIBS = $(shell pkg-config --libs QtCore QtGui QtNetwork)
+-endif
+-
+-ifeq "$(UI_TYPE)" "gtk"
+-  UILIBS = $(shell pkg-config --libs gtk+-2.0 gio-2.0) -lpng -ljpeg
+-endif
++MOC = "$(shell pkg-config --variable=host_bins Qt5Core)/moc"
++QTINCLUDE = $(shell pkg-config --cflags Qt5Gui Qt5Widgets Qt5Network)
++UILIBS = $(shell pkg-config --libs Qt5Gui Qt5Widgets Qt5Network)
+ 
+ RM = rm -rvf
+diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/application/LineEditParameter.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/application/LineEditParameter.cpp
+--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/application/LineEditParameter.cpp	2012-11-30 19:41:25.000000000 +0700
++++ fbreader-0.99.4/zlibrary/ui/src/qt4/application/LineEditParameter.cpp	2018-01-11 22:18:40.120207269 +0700
+@@ -18,7 +18,7 @@
+  */
+ 
+-#include <QtGui/QBoxLayout>
+-#include <QtGui/QLineEdit>
+-#include <QtGui/QToolBar>
++#include <QtWidgets/QBoxLayout>
++#include <QtWidgets/QLineEdit>
++#include <QtWidgets/QToolBar>
+ #include <QtGui/QKeyEvent>
+ 
+diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.cpp
+--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.cpp	2012-11-30 19:41:25.000000000 +0700
++++ fbreader-0.99.4/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.cpp	2018-01-11 22:18:40.120207269 +0700
+@@ -18,15 +18,15 @@
+  */
+ 
+-#include <QtGui/QApplication>
++#include <QtWidgets/QApplication>
+ #include <QtGui/QPixmap>
+ #include <QtGui/QImage>
+ #include <QtGui/QIcon>
+-#include <QtGui/QToolBar>
+-#include <QtGui/QMenuBar>
+-#include <QtGui/QMenu>
+-#include <QtGui/QToolButton>
+-#include <QtGui/QLayout>
++#include <QtWidgets/QToolBar>
++#include <QtWidgets/QMenuBar>
++#include <QtWidgets/QMenu>
++#include <QtWidgets/QToolButton>
++#include <QtWidgets/QLayout>
+ #include <QtGui/QWheelEvent>
+-#include <QtGui/QDockWidget>
++#include <QtWidgets/QDockWidget>
+ #include <QtCore/QObjectList>
+ 
+diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.h fbreader-0.99.4/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.h
+--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.h	2012-11-30 19:41:25.000000000 +0700
++++ fbreader-0.99.4/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.h	2018-01-11 22:18:40.120207269 +0700
+@@ -23,6 +23,6 @@
+ #include <map>
+ 
+-#include <QtGui/QMainWindow>
+-#include <QtGui/QAction>
++#include <QtWidgets/QMainWindow>
++#include <QtWidgets/QAction>
+ #include <QtGui/QCursor>
+ 
+diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.cpp
+--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.cpp	2012-11-30 19:41:25.000000000 +0700
++++ fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.cpp	2018-01-11 22:18:40.120207269 +0700
+@@ -18,6 +18,6 @@
+  */
+ 
+-#include <QtGui/QApplication>
+-#include <QtGui/QPushButton>
++#include <QtWidgets/QApplication>
++#include <QtWidgets/QPushButton>
+ 
+ #include <ZLDialogManager.h>
+diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.h fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.h
+--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.h	2012-11-30 19:41:25.000000000 +0700
++++ fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.h	2018-01-11 22:18:40.120207269 +0700
+@@ -21,6 +21,6 @@
+ #define __ZLQTDIALOG_H__
+ 
+-#include <QtGui/QDialog>
+-#include <QtGui/QLayout>
++#include <QtWidgets/QDialog>
++#include <QtWidgets/QLayout>
+ 
+ #include <ZLDialog.h>
+diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtDialogContent.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtDialogContent.cpp
+--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtDialogContent.cpp	2012-11-30 19:41:25.000000000 +0700
++++ fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtDialogContent.cpp	2018-01-11 22:18:40.120207269 +0700
+@@ -18,8 +18,8 @@
+  */
+ 
+-#include <QtGui/QApplication>
+-#include <QtGui/QDesktopWidget>
+-#include <QtGui/QWidget>
+-#include <QtGui/QLayout>
++#include <QtWidgets/QApplication>
++#include <QtWidgets/QDesktopWidget>
++#include <QtWidgets/QWidget>
++#include <QtWidgets/QLayout>
+ 
+ #include "ZLQtDialogContent.h"
+diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtDialogManager.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtDialogManager.cpp
+--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtDialogManager.cpp	2012-11-30 19:41:25.000000000 +0700
++++ fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtDialogManager.cpp	2018-01-11 22:18:40.120207269 +0700
+@@ -18,9 +18,9 @@
+  */
+ 
+-#include <QtGui/QApplication>
+-#include <QtGui/QMessageBox>
+-#include <QtGui/QFileDialog>
++#include <QtWidgets/QApplication>
++#include <QtWidgets/QMessageBox>
++#include <QtWidgets/QFileDialog>
+ #include <QtGui/QClipboard>
+-#include <QtGui/QDesktopWidget>
++#include <QtWidgets/QDesktopWidget>
+ 
+ #include "ZLQtDialogManager.h"
+diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtOpenFileDialog.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtOpenFileDialog.cpp
+--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtOpenFileDialog.cpp	2012-11-30 19:41:25.000000000 +0700
++++ fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtOpenFileDialog.cpp	2018-01-11 22:18:40.120207269 +0700
+@@ -18,5 +18,5 @@
+  */
+ 
+-#include <QtGui/QFileDialog>
++#include <QtWidgets/QFileDialog>
+ 
+ #include "ZLQtOpenFileDialog.h"
+diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtOptionView.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtOptionView.cpp
+--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtOptionView.cpp	2012-11-30 19:41:25.000000000 +0700
++++ fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtOptionView.cpp	2018-01-11 22:18:40.121207269 +0700
+@@ -20,14 +20,14 @@
+ #include <cctype>
+ 
+-#include <QtGui/QCheckBox>
+-#include <QtGui/QComboBox>
+-#include <QtGui/QLabel>
+-#include <QtGui/QGroupBox>
+-#include <QtGui/QRadioButton>
+-#include <QtGui/QPushButton>
+-#include <QtGui/QSpinBox>
+-#include <QtGui/QLineEdit>
+-#include <QtGui/QSlider>
+-#include <QtGui/QLayout>
++#include <QtWidgets/QCheckBox>
++#include <QtWidgets/QComboBox>
++#include <QtWidgets/QLabel>
++#include <QtWidgets/QGroupBox>
++#include <QtWidgets/QRadioButton>
++#include <QtWidgets/QPushButton>
++#include <QtWidgets/QSpinBox>
++#include <QtWidgets/QLineEdit>
++#include <QtWidgets/QSlider>
++#include <QtWidgets/QLayout>
+ 
+ #include <ZLStringUtil.h>
+diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.cpp
+--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.cpp	2012-11-30 19:41:25.000000000 +0700
++++ fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.cpp	2018-01-11 22:18:40.121207269 +0700
+@@ -18,9 +18,9 @@
+  */
+ 
+-#include <QtGui/QApplication>
+-#include <QtGui/QDesktopWidget>
+-#include <QtGui/QLayout>
+-#include <QtGui/QPushButton>
+-#include <QtGui/QButtonGroup>
++#include <QtWidgets/QApplication>
++#include <QtWidgets/QDesktopWidget>
++#include <QtWidgets/QLayout>
++#include <QtWidgets/QPushButton>
++#include <QtWidgets/QButtonGroup>
+ #include <QtGui/QResizeEvent>
+ 
+diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.h fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.h
+--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.h	2012-11-30 19:41:25.000000000 +0700
++++ fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.h	2018-01-11 22:18:40.121207269 +0700
+@@ -21,7 +21,7 @@
+ #define __ZLQTOPTIONSDIALOG_H__
+ 
+-#include <QtGui/QWidget>
+-#include <QtGui/QTabWidget>
+-#include <QtGui/QDialog>
++#include <QtWidgets/QWidget>
++#include <QtWidgets/QTabWidget>
++#include <QtWidgets/QDialog>
+ 
+ #include "../../../../core/src/desktop/dialogs/ZLDesktopOptionsDialog.h"
+diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.cpp
+--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.cpp	2012-11-30 19:41:25.000000000 +0700
++++ fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.cpp	2018-01-11 22:18:40.121207269 +0700
+@@ -20,9 +20,9 @@
+ #include <unistd.h>
+ 
+-#include <QtGui/QApplication>
+-#include <QtGui/QDesktopWidget>
+-#include <QtGui/QWidget>
+-#include <QtGui/QLabel>
+-#include <QtGui/QLayout>
++#include <QtWidgets/QApplication>
++#include <QtWidgets/QDesktopWidget>
++#include <QtWidgets/QWidget>
++#include <QtWidgets/QLabel>
++#include <QtWidgets/QLayout>
+ #include <QtCore/QThreadPool>
+ 
+diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.h fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.h
+--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.h	2012-11-30 19:41:25.000000000 +0700
++++ fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.h	2018-01-11 22:18:40.121207269 +0700
+@@ -23,9 +23,9 @@
+ #include <string>
+ 
+-#include <QtGui/QWidget>
++#include <QtWidgets/QWidget>
+ #include <QtGui/QCursor>
+-#include <QtGui/QDialog>
+-#include <QtGui/QProgressBar>
+-#include <QtGui/QLabel>
++#include <QtWidgets/QDialog>
++#include <QtWidgets/QProgressBar>
++#include <QtWidgets/QLabel>
+ #include <QtCore/QRunnable>
+ 
+diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.cpp
+--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.cpp	2012-11-30 19:41:25.000000000 +0700
++++ fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.cpp	2018-01-11 22:18:40.120207269 +0700
+@@ -20,10 +20,10 @@
+ #include <algorithm>
+ 
+-#include <QtGui/QSplitter>
+-#include <QtGui/QVBoxLayout>
+-#include <QtGui/QHBoxLayout>
+-#include <QtGui/QScrollBar>
+ #include <QtGui/QResizeEvent>
+ #include <QtCore/QDebug>
++#include <QtWidgets/QSplitter>
++#include <QtWidgets/QVBoxLayout>
++#include <QtWidgets/QHBoxLayout>
++#include <QtWidgets/QScrollBar>
+ 
+ #include <ZLFile.h>
+diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.h fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.h
+--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.h	2012-11-30 19:41:25.000000000 +0700
++++ fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.h	2018-01-11 22:18:40.121207269 +0700
+@@ -25,10 +25,10 @@
+ #include <QtCore/QMap>
+ 
+-#include <QtGui/QDialog>
+-#include <QtGui/QScrollArea>
+-#include <QtGui/QPushButton>
+-#include <QtGui/QLabel>
+-#include <QtGui/QLineEdit>
+-#include <QtGui/QWidget>
++#include <QtWidgets/QDialog>
++#include <QtWidgets/QScrollArea>
++#include <QtWidgets/QPushButton>
++#include <QtWidgets/QLabel>
++#include <QtWidgets/QLineEdit>
++#include <QtWidgets/QWidget>
+ 
+ #include <ZLTreeDialog.h>
+diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/filesystem/ZLQtFSManager.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/filesystem/ZLQtFSManager.cpp
+--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/filesystem/ZLQtFSManager.cpp	2012-11-30 19:41:25.000000000 +0700
++++ fbreader-0.99.4/zlibrary/ui/src/qt4/filesystem/ZLQtFSManager.cpp	2018-01-11 22:13:28.444220377 +0700
+@@ -49,3 +49,4 @@
+ 	  path = replacement + path.substr(1);
+ 	}
++	ZLUnixFSManager::normalizeRealPath(path);
+ }
+diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/library/ZLQApplication.h fbreader-0.99.4/zlibrary/ui/src/qt4/library/ZLQApplication.h
+--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/library/ZLQApplication.h	2012-11-30 19:41:25.000000000 +0700
++++ fbreader-0.99.4/zlibrary/ui/src/qt4/library/ZLQApplication.h	2018-01-11 22:18:40.121207269 +0700
+@@ -21,5 +21,5 @@
+ #define __ZLQAPPLICATION_H__
+ 
+-#include <QtGui/QApplication>
++#include <QtWidgets/QApplication>
+ 
+ class ZLQApplication : public QApplication {
+diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/library/ZLibrary.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/library/ZLibrary.cpp
+--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/library/ZLibrary.cpp	2012-11-30 19:41:25.000000000 +0700
++++ fbreader-0.99.4/zlibrary/ui/src/qt4/library/ZLibrary.cpp	2018-01-11 22:18:40.121207269 +0700
+@@ -20,5 +20,5 @@
+ #include <QtCore/QTextCodec>
+ #include <QtCore/QFile>
+-#include <QtGui/QApplication>
++#include <QtWidgets/QApplication>
+ #include <QtGui/QFileOpenEvent>
+ 
+@@ -73,5 +73,5 @@
+ 	new ZLQApplication(argc, argv);
+ 
+-	QTextCodec::setCodecForCStrings(QTextCodec::codecForName("utf-8"));
++	QTextCodec::setCodecForLocale(QTextCodec::codecForName("utf-8"));
+ 
+ 	ZLibrary::parseArguments(argc, argv);
+diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/network/ZLQtNetworkManager.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/network/ZLQtNetworkManager.cpp
+--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/network/ZLQtNetworkManager.cpp	2012-11-30 19:41:25.000000000 +0700
++++ fbreader-0.99.4/zlibrary/ui/src/qt4/network/ZLQtNetworkManager.cpp	2018-01-11 22:18:40.120207269 +0700
+@@ -25,5 +25,7 @@
+ #include <QtCore/QList>
+ #include <QtCore/QTimer>
++#include <QtCore/QUrlQuery>
+ 
++#include <QtNetwork/QNetworkCookie>
+ #include <QtNetwork/QNetworkRequest>
+ #include <QtNetwork/QNetworkReply>
+@@ -150,10 +152,10 @@
+ 	if (!scope.request->postParameters().empty()) {
+ 		QByteArray data;
+-		QUrl tmp;
++		QUrlQuery tmp;
+ 		typedef std::pair<std::string, std::string> string_pair;
+ 		foreach (const string_pair &pair, scope.request->postParameters()) {
+ 			tmp.addQueryItem(QString::fromStdString(pair.first), QString::fromStdString(pair.second));
+ 		}
+-		data = tmp.encodedQuery();
++		data = tmp.query(QUrl::FullyEncoded).toUtf8(); //encodedQuery();
+ 		reply = const_cast<QNetworkAccessManager&>(myManager).post(networkRequest, data);
+ 	} else {
+diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.cpp
+--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.cpp	2012-11-30 19:41:25.000000000 +0700
++++ fbreader-0.99.4/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.cpp	2018-01-11 22:13:39.639219906 +0700
+@@ -87,5 +87,5 @@
+ 
+ void QtWaitingSpinner::setRoundness(qreal roundness) {
+-	myRoundness = std::max(0.0, std::min(100.0, roundness));
++	myRoundness = std::max(static_cast<qreal>(0.0), std::min(static_cast<qreal>(100.0), roundness));
+ }
+ 
+@@ -149,5 +149,5 @@
+ 	qreal gradation = alphaDiff / (qreal)(distanceThreshold + 1);
+ 	qreal resultAlpha = color.alphaF() - gradation * distance;
+-	resultAlpha = std::min(1.0, std::max(0.0, resultAlpha)); //if alpha is out of bound, force it to bounds
++	resultAlpha = std::min(static_cast<qreal>(1.0), std::max(static_cast<qreal>(0.0), resultAlpha)); //if alpha is out of bound, force it to bounds
+ 	color.setAlphaF(resultAlpha);
+ 	return color;
+diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.h fbreader-0.99.4/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.h
+--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.h	2012-11-30 19:41:25.000000000 +0700
++++ fbreader-0.99.4/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.h	2018-01-11 22:18:40.121207269 +0700
+@@ -4,5 +4,5 @@
+ #include <QtCore/QTimer>
+ 
+-#include <QtGui/QWidget>
++#include <QtWidgets/QWidget>
+ #include <QtGui/QColor>
+ 
+diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.cpp
+--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.cpp	2012-11-30 19:41:25.000000000 +0700
++++ fbreader-0.99.4/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.cpp	2018-01-11 22:18:40.120207269 +0700
+@@ -18,12 +18,12 @@
+  */
+ 
+-#include <QtGui/QVBoxLayout>
+-#include <QtGui/QHBoxLayout>
+ #include <QtGui/QPixmap>
+ #include <QtGui/QPalette>
+ #include <QtGui/QPainter>
+ #include <QtGui/QPaintEvent>
+-#include <QtGui/QScrollBar>
+ #include <QtCore/QTimer>
++#include <QtWidgets/QVBoxLayout>
++#include <QtWidgets/QHBoxLayout>
++#include <QtWidgets/QScrollBar>
+ 
+ #include <QtCore/QDebug>
+diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.h fbreader-0.99.4/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.h
+--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.h	2012-11-30 19:41:25.000000000 +0700
++++ fbreader-0.99.4/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.h	2018-01-11 22:18:40.120207269 +0700
+@@ -21,10 +21,10 @@
+ #define __ZLQTITEMSLISTWIDGET_H__
+ 
+-#include <QtGui/QWidget>
+-#include <QtGui/QFrame>
+-#include <QtGui/QPushButton>
+-#include <QtGui/QLabel>
+-#include <QtGui/QVBoxLayout>
+-#include <QtGui/QScrollArea>
++#include <QtWidgets/QWidget>
++#include <QtWidgets/QFrame>
++#include <QtWidgets/QPushButton>
++#include <QtWidgets/QLabel>
++#include <QtWidgets/QVBoxLayout>
++#include <QtWidgets/QScrollArea>
+ 
+ #include <ZLTreeTitledNode.h>
+diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.cpp
+--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.cpp	2012-11-30 19:41:25.000000000 +0700
++++ fbreader-0.99.4/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.cpp	2018-01-11 22:18:40.120207269 +0700
+@@ -18,8 +18,8 @@
+  */
+ 
+-#include <QtGui/QVBoxLayout>
+-#include <QtGui/QHBoxLayout>
+-#include <QtGui/QScrollBar>
+-#include <QtGui/QGraphicsDropShadowEffect>
++#include <QtWidgets/QVBoxLayout>
++#include <QtWidgets/QHBoxLayout>
++#include <QtWidgets/QScrollBar>
++#include <QtWidgets/QGraphicsDropShadowEffect>
+ 
+ #include <QtCore/QDebug>
+diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.h fbreader-0.99.4/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.h
+--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.h	2012-11-30 19:41:25.000000000 +0700
++++ fbreader-0.99.4/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.h	2018-01-11 22:18:40.121207269 +0700
+@@ -21,9 +21,9 @@
+ #define __ZLQTPREVIEWWIDGET_H__
+ 
+-#include <QtGui/QWidget>
+-#include <QtGui/QPushButton>
+-#include <QtGui/QLabel>
+-#include <QtGui/QScrollArea>
+-#include <QtGui/QVBoxLayout>
++#include <QtWidgets/QWidget>
++#include <QtWidgets/QPushButton>
++#include <QtWidgets/QLabel>
++#include <QtWidgets/QScrollArea>
++#include <QtWidgets/QVBoxLayout>
+ #include <QtCore/QSet>
+ 
+diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/ZLQtSearchField.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/tree/ZLQtSearchField.cpp
+--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/ZLQtSearchField.cpp	2012-11-30 19:41:25.000000000 +0700
++++ fbreader-0.99.4/zlibrary/ui/src/qt4/tree/ZLQtSearchField.cpp	2018-01-11 22:18:40.120207269 +0700
+@@ -19,7 +19,7 @@
+ 
+ #include <QtCore/QDebug>
+-#include <QtGui/QStyle>
+-#include <QtGui/QCompleter>
+-#include <QtGui/QStringListModel>
++#include <QtCore/QStringListModel>
++#include <QtWidgets/QStyle>
++#include <QtWidgets/QCompleter>
+ 
+ #include <ZLibrary.h>
+diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/ZLQtSearchField.h fbreader-0.99.4/zlibrary/ui/src/qt4/tree/ZLQtSearchField.h
+--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/ZLQtSearchField.h	2012-11-30 19:41:25.000000000 +0700
++++ fbreader-0.99.4/zlibrary/ui/src/qt4/tree/ZLQtSearchField.h	2018-01-11 22:18:40.121207269 +0700
+@@ -22,6 +22,6 @@
+ 
+ #include <QtCore/QSet>
+-#include <QtGui/QLabel>
+-#include <QtGui/QLineEdit>
++#include <QtWidgets/QLabel>
++#include <QtWidgets/QLineEdit>
+ 
+ #include "QtWaitingSpinner.h"
+diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/view/ZLQtViewWidget.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/view/ZLQtViewWidget.cpp
+--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/view/ZLQtViewWidget.cpp	2012-11-30 19:41:25.000000000 +0700
++++ fbreader-0.99.4/zlibrary/ui/src/qt4/view/ZLQtViewWidget.cpp	2018-01-11 22:18:40.121207269 +0700
+@@ -20,6 +20,6 @@
+ #include <algorithm>
+ 
+-#include <QtGui/QLayout>
+-#include <QtGui/QScrollBar>
++#include <QtWidgets/QLayout>
++#include <QtWidgets/QScrollBar>
+ #include <QtGui/QPainter>
+ #include <QtGui/QPixmap>
+@@ -186,9 +186,9 @@
+ void ZLQtViewWidget::setScrollbarEnabled(ZLView::Direction direction, bool enabled) {
+ 	if (direction == ZLView::VERTICAL) {
+-		myRightScrollBar->setShown(enabled && myShowScrollBarAtRight);
+-		myLeftScrollBar->setShown(enabled && !myShowScrollBarAtRight);
++		myRightScrollBar->setVisible(enabled && myShowScrollBarAtRight);
++		myLeftScrollBar->setVisible(enabled && !myShowScrollBarAtRight);
+ 	} else {
+-		myBottomScrollBar->setShown(enabled && myShowScrollBarAtBottom);
+-		myTopScrollBar->setShown(enabled && !myShowScrollBarAtBottom);
++		myBottomScrollBar->setVisible(enabled && myShowScrollBarAtBottom);
++		myTopScrollBar->setVisible(enabled && !myShowScrollBarAtBottom);
+ 	}
+ }
+diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/view/ZLQtViewWidget.h fbreader-0.99.4/zlibrary/ui/src/qt4/view/ZLQtViewWidget.h
+--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/view/ZLQtViewWidget.h	2012-11-30 19:41:25.000000000 +0700
++++ fbreader-0.99.4/zlibrary/ui/src/qt4/view/ZLQtViewWidget.h	2018-01-11 22:18:40.121207269 +0700
+@@ -21,5 +21,5 @@
+ #define __ZLQTVIEWWIDGET_H__
+ 
+-#include <QtGui/QWidget>
++#include <QtWidgets/QWidget>
+ 
+ #include "../../../../core/src/view/ZLViewWidget.h"
diff --git a/app-text/fbreader/files/fbreader-0.99.4-gcc6.patch b/app-text/fbreader/files/fbreader-0.99.4-gcc6.patch
new file mode 100644
index 000000000000..c6f87a292697
--- /dev/null
+++ b/app-text/fbreader/files/fbreader-0.99.4-gcc6.patch
@@ -0,0 +1,11 @@
+--- fbreader/src/formats/doc/OleStorage.cpp	2012-11-30 13:41:25.000000000 +0100
++++ fbreader/src/formats/doc/OleStorage.cpp-new	2016-08-31 17:23:18.232536401 +0200
+@@ -59,7 +59,7 @@
+ 		clear();
+ 		return false;
+ 	}
+-	static const char OLE_SIGN[] = {0xD0, 0xCF, 0x11, 0xE0, 0xA1, 0xB1, 0x1A, 0xE1, 0};
++	static const char OLE_SIGN[] = {(char)0xD0, (char)0xCF, (char)0x11, (char)0xE0, (char)0xA1, (char)0xB1, (char)0x1A, (char)0xE1, 0};
+ 	if (std::strncmp(oleBuf, OLE_SIGN, 8) != 0) {
+ 		clear();
+ 		return false;
diff --git a/app-text/fbreader/files/fbreader-0.99.4-ld-bfd.patch b/app-text/fbreader/files/fbreader-0.99.4-ld-bfd.patch
new file mode 100644
index 000000000000..ab872edf17cd
--- /dev/null
+++ b/app-text/fbreader/files/fbreader-0.99.4-ld-bfd.patch
@@ -0,0 +1,10 @@
+diff -r -U2 fbreader-0.99.4.orig/fbreader/Makefile fbreader-0.99.4/fbreader/Makefile
+--- fbreader-0.99.4.orig/fbreader/Makefile	2012-11-30 19:41:25.000000000 +0700
++++ fbreader-0.99.4/fbreader/Makefile	2016-08-31 19:06:35.011708982 +0700
+@@ -23,5 +23,5 @@
+ 	done;
+ 	@echo -n 'Linking $(TARGET) ...'
+-	@$(LD) $(LDFLAGS) -o $(TARGET) `find src -name *.o` $(TEXT_LIBS) $(CORE_LIBS) $(ZLUI_LIB) -lsqlite3
++	@$(LD) -fuse-ld=bfd $(LDFLAGS) -o $(TARGET) `find src -name *.o` $(TEXT_LIBS) $(CORE_LIBS) $(ZLUI_LIB) -lsqlite3
+ 	@echo ' OK'
+ 
diff --git a/app-text/fbreader/files/fbreader-0.99.4-mimetypes.patch b/app-text/fbreader/files/fbreader-0.99.4-mimetypes.patch
new file mode 100644
index 000000000000..0e4a2935d442
--- /dev/null
+++ b/app-text/fbreader/files/fbreader-0.99.4-mimetypes.patch
@@ -0,0 +1,6 @@
+diff -r -U1 fbreader-0.99.4.orig/fbreader/desktop/desktop fbreader-0.99.4/fbreader/desktop/desktop
+--- fbreader-0.99.4.orig/fbreader/desktop/desktop	2012-11-30 19:41:25.000000000 +0700
++++ fbreader-0.99.4/fbreader/desktop/desktop	2014-07-10 20:56:33.527638562 +0700
+@@ -23 +23,2 @@
+ Categories=Office;Viewer;Literature;
++MimeType=application/epub+zip;application/rtf;application/x-fictionbook+xml;application/x-zip-compressed-fb2;application/x-mobipocket-ebook;application/xhtml+xml;text/html;text/plain;
diff --git a/app-text/fbreader/files/fbreader-0.99.4-qreal-cast.patch b/app-text/fbreader/files/fbreader-0.99.4-qreal-cast.patch
new file mode 100644
index 000000000000..ffd21b2924f7
--- /dev/null
+++ b/app-text/fbreader/files/fbreader-0.99.4-qreal-cast.patch
@@ -0,0 +1,13 @@
+diff -r -U1 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.cpp
+--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.cpp	2012-11-30 19:41:25.000000000 +0700
++++ fbreader-0.99.4/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.cpp	2014-07-10 19:18:17.002886537 +0700
+@@ -88,3 +88,3 @@
+ void QtWaitingSpinner::setRoundness(qreal roundness) {
+-	myRoundness = std::max(0.0, std::min(100.0, roundness));
++	myRoundness = std::max(static_cast<qreal>(0.0), std::min(static_cast<qreal>(100.0), roundness));
+ }
+@@ -150,3 +150,3 @@
+ 	qreal resultAlpha = color.alphaF() - gradation * distance;
+-	resultAlpha = std::min(1.0, std::max(0.0, resultAlpha)); //if alpha is out of bound, force it to bounds
++	resultAlpha = std::min(static_cast<qreal>(1.0), std::max(static_cast<qreal>(0.0), resultAlpha)); //if alpha is out of bound, force it to bounds
+ 	color.setAlphaF(resultAlpha);
diff --git a/app-text/fbreader/files/fbreader-0.99.4-qt5.patch b/app-text/fbreader/files/fbreader-0.99.4-qt5.patch
new file mode 100644
index 000000000000..c88e6db79d3d
--- /dev/null
+++ b/app-text/fbreader/files/fbreader-0.99.4-qt5.patch
@@ -0,0 +1,573 @@
+diff --git a/makefiles/arch/desktop.mk b/makefiles/arch/desktop.mk
+index 4267113..3b46102 100644
+--- a/makefiles/arch/desktop.mk
++++ b/makefiles/arch/desktop.mk
+@@ -12,29 +12,11 @@ AR = ar rsu
+ LD = g++
+
+ CFLAGS += -fno-exceptions -Wall -Wno-ctor-dtor-privacy -W -DLIBICONV_PLUG
+-EXTERNAL_INCLUDE = $(shell pkg-config --cflags fribidi) 
++EXTERNAL_INCLUDE = $(shell pkg-config --cflags fribidi)
+
+-ifeq "$(UI_TYPE)" "qt"
+-  MOC = moc-qt3
+-  QTINCLUDE = -I /usr/include/qt3
+-else
+-  MOC = $(shell pkg-config QtCore --variable=moc_location)
+-  QTINCLUDE = -I $(shell pkg-config --cflags QtCore)
+-endif
+-
+-GTKINCLUDE = $(shell pkg-config --cflags gtk+-2.0 libpng xft)
+-
+-ifeq "$(UI_TYPE)" "qt"
+-  UILIBS = -lqt-mt
+-endif
+-
+-ifeq "$(UI_TYPE)" "qt4"
+-  UILIBS = $(shell pkg-config --libs QtCore QtGui QtNetwork)
+-endif
+-
+-ifeq "$(UI_TYPE)" "gtk"
+-  UILIBS = $(shell pkg-config --libs gtk+-2.0 gio-2.0) -lpng -ljpeg
+-endif
++MOC = /usr/lib/qt5/bin/moc
++QTINCLUDE = $(shell pkg-config --cflags Qt5Gui Qt5Widgets Qt5Network)
++UILIBS = $(shell pkg-config --libs Qt5Gui Qt5Widgets Qt5Network)
+
+ RM = rm -rvf
+ RM_QUIET = rm -rf
+diff --git a/zlibrary/ui/src/qt4/network/ZLQtNetworkManager.cpp b/zlibrary/ui/src/qt4/network/ZLQtNetworkManager.cpp
+index 47067d3..119a5ee 100644
+--- a/zlibrary/ui/src/qt4/network/ZLQtNetworkManager.cpp
++++ b/zlibrary/ui/src/qt4/network/ZLQtNetworkManager.cpp
+@@ -24,7 +24,9 @@
+ #include <QtCore/QDir>
+ #include <QtCore/QList>
+ #include <QtCore/QTimer>
++#include <QtCore/QUrlQuery>
+
++#include <QtNetwork/QNetworkCookie>
+ #include <QtNetwork/QNetworkRequest>
+ #include <QtNetwork/QNetworkReply>
+ #include <QtNetwork/QNetworkProxy>
+@@ -149,12 +151,12 @@ void ZLQtNetworkManager::prepareReply(ZLQtNetworkReplyScope &scope, QNetworkRequ
+ 	QNetworkReply *reply = NULL;
+ 	if (!scope.request->postParameters().empty()) {
+ 		QByteArray data;
+-		QUrl tmp;
++		QUrlQuery tmp;
+ 		typedef std::pair<std::string, std::string> string_pair;
+ 		foreach (const string_pair &pair, scope.request->postParameters()) {
+ 			tmp.addQueryItem(QString::fromStdString(pair.first), QString::fromStdString(pair.second));
+ 		}
+-		data = tmp.encodedQuery();
++		data = tmp.query(QUrl::FullyEncoded).toUtf8(); //encodedQuery();
+ 		reply = const_cast<QNetworkAccessManager&>(myManager).post(networkRequest, data);
+ 	} else {
+ 		reply = const_cast<QNetworkAccessManager&>(myManager).get(networkRequest);
+diff --git a/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.cpp b/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.cpp
+index a3e5b35..ab41684 100644
+--- a/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.cpp
++++ b/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.cpp
+@@ -17,14 +17,14 @@
+  * 02110-1301, USA.
+  */
+
+-#include <QtGui/QVBoxLayout>
+-#include <QtGui/QHBoxLayout>
+ #include <QtGui/QPixmap>
+ #include <QtGui/QPalette>
+ #include <QtGui/QPainter>
+ #include <QtGui/QPaintEvent>
+-#include <QtGui/QScrollBar>
+ #include <QtCore/QTimer>
++#include <QtWidgets/QVBoxLayout>
++#include <QtWidgets/QHBoxLayout>
++#include <QtWidgets/QScrollBar>
+
+ #include <QtCore/QDebug>
+
+diff --git a/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.cpp b/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.cpp
+index 472f05f..b9809c8 100644
+--- a/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.cpp
++++ b/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.cpp
+@@ -17,10 +17,10 @@
+  * 02110-1301, USA.
+  */
+
+-#include <QtGui/QVBoxLayout>
+-#include <QtGui/QHBoxLayout>
+-#include <QtGui/QScrollBar>
+-#include <QtGui/QGraphicsDropShadowEffect>
++#include <QtWidgets/QVBoxLayout>
++#include <QtWidgets/QHBoxLayout>
++#include <QtWidgets/QScrollBar>
++#include <QtWidgets/QGraphicsDropShadowEffect>
+
+ #include <QtCore/QDebug>
+
+diff --git a/zlibrary/ui/src/qt4/tree/ZLQtSearchField.cpp b/zlibrary/ui/src/qt4/tree/ZLQtSearchField.cpp
+index 1cddaf9..2b65cc1 100644
+--- a/zlibrary/ui/src/qt4/tree/ZLQtSearchField.cpp
++++ b/zlibrary/ui/src/qt4/tree/ZLQtSearchField.cpp
+@@ -18,9 +18,9 @@
+  */
+
+ #include <QtCore/QDebug>
+-#include <QtGui/QStyle>
+-#include <QtGui/QCompleter>
+-#include <QtGui/QStringListModel>
++#include <QtCore/QStringListModel>
++#include <QtWidgets/QStyle>
++#include <QtWidgets/QCompleter>
+
+ #include <ZLibrary.h>
+ #include <ZLFile.h>
+diff --git a/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.cpp b/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.cpp
+index 6de2c72..d942d47 100644
+--- a/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.cpp
++++ b/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.cpp
+@@ -19,12 +19,12 @@
+ 
+ #include <algorithm>
+ 
+-#include <QtGui/QSplitter>
+-#include <QtGui/QVBoxLayout>
+-#include <QtGui/QHBoxLayout>
+-#include <QtGui/QScrollBar>
+ #include <QtGui/QResizeEvent>
+ #include <QtCore/QDebug>
++#include <QtWidgets/QSplitter>
++#include <QtWidgets/QVBoxLayout>
++#include <QtWidgets/QHBoxLayout>
++#include <QtWidgets/QScrollBar>
+ 
+ #include <ZLFile.h>
+ #include <ZLibrary.h>
+diff --git a/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.h b/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.h
+index 4f09cfc..51f1545 100644
+--- a/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.h
++++ b/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.h
+@@ -20,12 +20,12 @@
+ #ifndef __ZLQTITEMSLISTWIDGET_H__
+ #define __ZLQTITEMSLISTWIDGET_H__
+ 
+-#include <QtGui/QWidget>
+-#include <QtGui/QFrame>
+-#include <QtGui/QPushButton>
+-#include <QtGui/QLabel>
+-#include <QtGui/QVBoxLayout>
+-#include <QtGui/QScrollArea>
++#include <QtWidgets/QWidget>
++#include <QtWidgets/QFrame>
++#include <QtWidgets/QPushButton>
++#include <QtWidgets/QLabel>
++#include <QtWidgets/QVBoxLayout>
++#include <QtWidgets/QScrollArea>
+ 
+ #include <ZLTreeTitledNode.h>
+ 
+diff --git a/zlibrary/ui/src/qt4/application/LineEditParameter.cpp b/zlibrary/ui/src/qt4/application/LineEditParameter.cpp
+index dfcbc0b..bd2689e 100644
+--- a/zlibrary/ui/src/qt4/application/LineEditParameter.cpp
++++ b/zlibrary/ui/src/qt4/application/LineEditParameter.cpp
+@@ -17,9 +17,9 @@
+  * 02110-1301, USA.
+  */
+ 
+-#include <QtGui/QBoxLayout>
+-#include <QtGui/QLineEdit>
+-#include <QtGui/QToolBar>
++#include <QtWidgets/QBoxLayout>
++#include <QtWidgets/QLineEdit>
++#include <QtWidgets/QToolBar>
+ #include <QtGui/QKeyEvent>
+ 
+ #include "ZLQtApplicationWindow.h"
+diff --git a/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.cpp b/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.cpp
+index 6241514..e0b143b 100644
+--- a/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.cpp
++++ b/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.cpp
+@@ -17,17 +17,17 @@
+  * 02110-1301, USA.
+  */
+ 
+-#include <QtGui/QApplication>
++#include <QtWidgets/QApplication>
+ #include <QtGui/QPixmap>
+ #include <QtGui/QImage>
+ #include <QtGui/QIcon>
+-#include <QtGui/QToolBar>
+-#include <QtGui/QMenuBar>
+-#include <QtGui/QMenu>
+-#include <QtGui/QToolButton>
+-#include <QtGui/QLayout>
++#include <QtWidgets/QToolBar>
++#include <QtWidgets/QMenuBar>
++#include <QtWidgets/QMenu>
++#include <QtWidgets/QToolButton>
++#include <QtWidgets/QLayout>
+ #include <QtGui/QWheelEvent>
+-#include <QtGui/QDockWidget>
++#include <QtWidgets/QDockWidget>
+ #include <QtCore/QObjectList>
+ 
+ #include <ZLibrary.h>
+diff --git a/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.h b/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.h
+index 3b4fd3a..42ff2c8 100644
+--- a/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.h
++++ b/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.h
+@@ -22,8 +22,8 @@
+ 
+ #include <map>
+ 
+-#include <QtGui/QMainWindow>
+-#include <QtGui/QAction>
++#include <QtWidgets/QMainWindow>
++#include <QtWidgets/QAction>
+ #include <QtGui/QCursor>
+ 
+ class QDockWidget;
+diff --git a/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.cpp b/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.cpp
+index 24eb897..c17e86c 100644
+--- a/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.cpp
++++ b/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.cpp
+@@ -17,8 +17,8 @@
+  * 02110-1301, USA.
+  */
+ 
+-#include <QtGui/QApplication>
+-#include <QtGui/QPushButton>
++#include <QtWidgets/QApplication>
++#include <QtWidgets/QPushButton>
+ 
+ #include <ZLDialogManager.h>
+ 
+diff --git a/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.h b/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.h
+index 068039d..811cec8 100644
+--- a/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.h
++++ b/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.h
+@@ -20,8 +20,8 @@
+ #ifndef __ZLQTDIALOG_H__
+ #define __ZLQTDIALOG_H__
+ 
+-#include <QtGui/QDialog>
+-#include <QtGui/QLayout>
++#include <QtWidgets/QDialog>
++#include <QtWidgets/QLayout>
+ 
+ #include <ZLDialog.h>
+ 
+diff --git a/zlibrary/ui/src/qt4/dialogs/ZLQtDialogContent.cpp b/zlibrary/ui/src/qt4/dialogs/ZLQtDialogContent.cpp
+index e8ff422..352c350 100644
+--- a/zlibrary/ui/src/qt4/dialogs/ZLQtDialogContent.cpp
++++ b/zlibrary/ui/src/qt4/dialogs/ZLQtDialogContent.cpp
+@@ -17,10 +17,10 @@
+  * 02110-1301, USA.
+  */
+ 
+-#include <QtGui/QApplication>
+-#include <QtGui/QDesktopWidget>
+-#include <QtGui/QWidget>
+-#include <QtGui/QLayout>
++#include <QtWidgets/QApplication>
++#include <QtWidgets/QDesktopWidget>
++#include <QtWidgets/QWidget>
++#include <QtWidgets/QLayout>
+ 
+ #include "ZLQtDialogContent.h"
+ #include "ZLQtOptionView.h"
+diff --git a/zlibrary/ui/src/qt4/dialogs/ZLQtDialogManager.cpp b/zlibrary/ui/src/qt4/dialogs/ZLQtDialogManager.cpp
+index d5eb4d4..2fc769b 100644
+--- a/zlibrary/ui/src/qt4/dialogs/ZLQtDialogManager.cpp
++++ b/zlibrary/ui/src/qt4/dialogs/ZLQtDialogManager.cpp
+@@ -17,11 +17,11 @@
+  * 02110-1301, USA.
+  */
+ 
+-#include <QtGui/QApplication>
+-#include <QtGui/QMessageBox>
+-#include <QtGui/QFileDialog>
++#include <QtWidgets/QApplication>
++#include <QtWidgets/QMessageBox>
++#include <QtWidgets/QFileDialog>
+ #include <QtGui/QClipboard>
+-#include <QtGui/QDesktopWidget>
++#include <QtWidgets/QDesktopWidget>
+ 
+ #include "ZLQtDialogManager.h"
+ #include "ZLQtDialog.h"
+diff --git a/zlibrary/ui/src/qt4/dialogs/ZLQtOpenFileDialog.cpp b/zlibrary/ui/src/qt4/dialogs/ZLQtOpenFileDialog.cpp
+index ec9e73c..a50a40d 100644
+--- a/zlibrary/ui/src/qt4/dialogs/ZLQtOpenFileDialog.cpp
++++ b/zlibrary/ui/src/qt4/dialogs/ZLQtOpenFileDialog.cpp
+@@ -17,7 +17,7 @@
+  * 02110-1301, USA.
+  */
+ 
+-#include <QtGui/QFileDialog>
++#include <QtWidgets/QFileDialog>
+ 
+ #include "ZLQtOpenFileDialog.h"
+ 
+diff --git a/zlibrary/ui/src/qt4/dialogs/ZLQtOptionView.cpp b/zlibrary/ui/src/qt4/dialogs/ZLQtOptionView.cpp
+index 48a1b8f..90d50fb 100644
+--- a/zlibrary/ui/src/qt4/dialogs/ZLQtOptionView.cpp
++++ b/zlibrary/ui/src/qt4/dialogs/ZLQtOptionView.cpp
+@@ -19,16 +19,16 @@
+ 
+ #include <cctype>
+ 
+-#include <QtGui/QCheckBox>
+-#include <QtGui/QComboBox>
+-#include <QtGui/QLabel>
+-#include <QtGui/QGroupBox>
+-#include <QtGui/QRadioButton>
+-#include <QtGui/QPushButton>
+-#include <QtGui/QSpinBox>
+-#include <QtGui/QLineEdit>
+-#include <QtGui/QSlider>
+-#include <QtGui/QLayout>
++#include <QtWidgets/QCheckBox>
++#include <QtWidgets/QComboBox>
++#include <QtWidgets/QLabel>
++#include <QtWidgets/QGroupBox>
++#include <QtWidgets/QRadioButton>
++#include <QtWidgets/QPushButton>
++#include <QtWidgets/QSpinBox>
++#include <QtWidgets/QLineEdit>
++#include <QtWidgets/QSlider>
++#include <QtWidgets/QLayout>
+ 
+ #include <ZLStringUtil.h>
+ #include <ZLDialogManager.h>
+diff --git a/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.cpp b/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.cpp
+index f6c36fb..7fe855a 100644
+--- a/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.cpp
++++ b/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.cpp
+@@ -17,11 +17,11 @@
+  * 02110-1301, USA.
+  */
+ 
+-#include <QtGui/QApplication>
+-#include <QtGui/QDesktopWidget>
+-#include <QtGui/QLayout>
+-#include <QtGui/QPushButton>
+-#include <QtGui/QButtonGroup>
++#include <QtWidgets/QApplication>
++#include <QtWidgets/QDesktopWidget>
++#include <QtWidgets/QLayout>
++#include <QtWidgets/QPushButton>
++#include <QtWidgets/QButtonGroup>
+ #include <QtGui/QResizeEvent>
+ 
+ #include <ZLDialogManager.h>
+diff --git a/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.h b/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.h
+index e38b62a..ad26fba 100644
+--- a/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.h
++++ b/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.h
+@@ -20,9 +20,9 @@
+ #ifndef __ZLQTOPTIONSDIALOG_H__
+ #define __ZLQTOPTIONSDIALOG_H__
+ 
+-#include <QtGui/QWidget>
+-#include <QtGui/QTabWidget>
+-#include <QtGui/QDialog>
++#include <QtWidgets/QWidget>
++#include <QtWidgets/QTabWidget>
++#include <QtWidgets/QDialog>
+ 
+ #include "../../../../core/src/desktop/dialogs/ZLDesktopOptionsDialog.h"
+ 
+diff --git a/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.cpp b/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.cpp
+index 98e469e..5a1d574 100644
+--- a/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.cpp
++++ b/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.cpp
+@@ -19,11 +19,11 @@
+ 
+ #include <unistd.h>
+ 
+-#include <QtGui/QApplication>
+-#include <QtGui/QDesktopWidget>
+-#include <QtGui/QWidget>
+-#include <QtGui/QLabel>
+-#include <QtGui/QLayout>
++#include <QtWidgets/QApplication>
++#include <QtWidgets/QDesktopWidget>
++#include <QtWidgets/QWidget>
++#include <QtWidgets/QLabel>
++#include <QtWidgets/QLayout>
+ #include <QtCore/QThreadPool>
+ 
+ #include "../dialogs/ZLQtDialogManager.h"
+diff --git a/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.h b/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.h
+index df6c73b..837bce5 100644
+--- a/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.h
++++ b/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.h
+@@ -22,11 +22,11 @@
+ 
+ #include <string>
+ 
+-#include <QtGui/QWidget>
++#include <QtWidgets/QWidget>
+ #include <QtGui/QCursor>
+-#include <QtGui/QDialog>
+-#include <QtGui/QProgressBar>
+-#include <QtGui/QLabel>
++#include <QtWidgets/QDialog>
++#include <QtWidgets/QProgressBar>
++#include <QtWidgets/QLabel>
+ #include <QtCore/QRunnable>
+ 
+ #include <ZLProgressDialog.h>
+diff --git a/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.h b/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.h
+index 9cf7c47..03f1223 100644
+--- a/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.h
++++ b/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.h
+@@ -24,12 +24,12 @@
+ #include <QtCore/QSet>
+ #include <QtCore/QMap>
+ 
+-#include <QtGui/QDialog>
+-#include <QtGui/QScrollArea>
+-#include <QtGui/QPushButton>
+-#include <QtGui/QLabel>
+-#include <QtGui/QLineEdit>
+-#include <QtGui/QWidget>
++#include <QtWidgets/QDialog>
++#include <QtWidgets/QScrollArea>
++#include <QtWidgets/QPushButton>
++#include <QtWidgets/QLabel>
++#include <QtWidgets/QLineEdit>
++#include <QtWidgets/QWidget>
+ 
+ #include <ZLTreeDialog.h>
+ 
+diff --git a/zlibrary/ui/src/qt4/library/ZLQApplication.h b/zlibrary/ui/src/qt4/library/ZLQApplication.h
+index c08c536..a714fa9 100644
+--- a/zlibrary/ui/src/qt4/library/ZLQApplication.h
++++ b/zlibrary/ui/src/qt4/library/ZLQApplication.h
+@@ -20,7 +20,7 @@
+ #ifndef __ZLQAPPLICATION_H__
+ #define __ZLQAPPLICATION_H__
+ 
+-#include <QtGui/QApplication>
++#include <QtWidgets/QApplication>
+ 
+ class ZLQApplication : public QApplication {
+ 
+diff --git a/zlibrary/ui/src/qt4/library/ZLibrary.cpp b/zlibrary/ui/src/qt4/library/ZLibrary.cpp
+index 9648e95..a544031 100644
+--- a/zlibrary/ui/src/qt4/library/ZLibrary.cpp
++++ b/zlibrary/ui/src/qt4/library/ZLibrary.cpp
+@@ -19,7 +19,7 @@
+ 
+ #include <QtCore/QTextCodec>
+ #include <QtCore/QFile>
+-#include <QtGui/QApplication>
++#include <QtWidgets/QApplication>
+ #include <QtGui/QFileOpenEvent>
+ 
+ #include <ZLApplication.h>
+@@ -72,7 +72,7 @@ bool ZLQApplication::event(QEvent *e) {
+ void ZLQtLibraryImplementation::init(int &argc, char **&argv) {
+ 	new ZLQApplication(argc, argv);
+ 
+-	QTextCodec::setCodecForCStrings(QTextCodec::codecForName("utf-8"));
++	QTextCodec::setCodecForLocale(QTextCodec::codecForName("utf-8"));
+ 
+ 	ZLibrary::parseArguments(argc, argv);
+ 
+diff --git a/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.h b/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.h
+index cdaef01..a259c65 100644
+--- a/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.h
++++ b/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.h
+@@ -3,7 +3,7 @@
+ 
+ #include <QtCore/QTimer>
+ 
+-#include <QtGui/QWidget>
++#include <QtWidgets/QWidget>
+ #include <QtGui/QColor>
+ 
+ class QtWaitingSpinner : public QWidget {
+diff --git a/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.h b/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.h
+index 1b8ebcc..6f3b4e3 100644
+--- a/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.h
++++ b/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.h
+@@ -20,11 +20,11 @@
+ #ifndef __ZLQTPREVIEWWIDGET_H__
+ #define __ZLQTPREVIEWWIDGET_H__
+ 
+-#include <QtGui/QWidget>
+-#include <QtGui/QPushButton>
+-#include <QtGui/QLabel>
+-#include <QtGui/QScrollArea>
+-#include <QtGui/QVBoxLayout>
++#include <QtWidgets/QWidget>
++#include <QtWidgets/QPushButton>
++#include <QtWidgets/QLabel>
++#include <QtWidgets/QScrollArea>
++#include <QtWidgets/QVBoxLayout>
+ #include <QtCore/QSet>
+ 
+ #include <ZLTreePageNode.h>
+diff --git a/zlibrary/ui/src/qt4/tree/ZLQtSearchField.h b/zlibrary/ui/src/qt4/tree/ZLQtSearchField.h
+index f6e174c..c360965 100644
+--- a/zlibrary/ui/src/qt4/tree/ZLQtSearchField.h
++++ b/zlibrary/ui/src/qt4/tree/ZLQtSearchField.h
+@@ -21,8 +21,8 @@
+ #define __ZLQTSEARCHFIELD_H__
+ 
+ #include <QtCore/QSet>
+-#include <QtGui/QLabel>
+-#include <QtGui/QLineEdit>
++#include <QtWidgets/QLabel>
++#include <QtWidgets/QLineEdit>
+ 
+ #include "QtWaitingSpinner.h"
+ #include "ZLQtItemsListWidget.h"
+diff --git a/zlibrary/ui/src/qt4/view/ZLQtViewWidget.cpp b/zlibrary/ui/src/qt4/view/ZLQtViewWidget.cpp
+index 4f5d196..615050c 100644
+--- a/zlibrary/ui/src/qt4/view/ZLQtViewWidget.cpp
++++ b/zlibrary/ui/src/qt4/view/ZLQtViewWidget.cpp
+@@ -19,8 +19,8 @@
+ 
+ #include <algorithm>
+ 
+-#include <QtGui/QLayout>
+-#include <QtGui/QScrollBar>
++#include <QtWidgets/QLayout>
++#include <QtWidgets/QScrollBar>
+ #include <QtGui/QPainter>
+ #include <QtGui/QPixmap>
+ #include <QtGui/QMouseEvent>
+@@ -185,11 +185,11 @@ void ZLQtViewWidget::repaint()	{
+ 
+ void ZLQtViewWidget::setScrollbarEnabled(ZLView::Direction direction, bool enabled) {
+ 	if (direction == ZLView::VERTICAL) {
+-		myRightScrollBar->setShown(enabled && myShowScrollBarAtRight);
+-		myLeftScrollBar->setShown(enabled && !myShowScrollBarAtRight);
++		myRightScrollBar->setVisible(enabled && myShowScrollBarAtRight);
++		myLeftScrollBar->setVisible(enabled && !myShowScrollBarAtRight);
+ 	} else {
+-		myBottomScrollBar->setShown(enabled && myShowScrollBarAtBottom);
+-		myTopScrollBar->setShown(enabled && !myShowScrollBarAtBottom);
++		myBottomScrollBar->setVisible(enabled && myShowScrollBarAtBottom);
++		myTopScrollBar->setVisible(enabled && !myShowScrollBarAtBottom);
+ 	}
+ }
+ 
+diff --git a/zlibrary/ui/src/qt4/view/ZLQtViewWidget.h b/zlibrary/ui/src/qt4/view/ZLQtViewWidget.h
+index 6fabf00..ccec1e3 100644
+--- a/zlibrary/ui/src/qt4/view/ZLQtViewWidget.h
++++ b/zlibrary/ui/src/qt4/view/ZLQtViewWidget.h
+@@ -20,7 +20,7 @@
+ #ifndef __ZLQTVIEWWIDGET_H__
+ #define __ZLQTVIEWWIDGET_H__
+ 
+-#include <QtGui/QWidget>
++#include <QtWidgets/QWidget>
+ 
+ #include "../../../../core/src/view/ZLViewWidget.h"
+ #include <ZLApplication.h>
diff --git a/app-text/fbreader/files/fbreader-0.99.4.patch b/app-text/fbreader/files/fbreader-0.99.4.patch
new file mode 100644
index 000000000000..deb90228301d
--- /dev/null
+++ b/app-text/fbreader/files/fbreader-0.99.4.patch
@@ -0,0 +1,8 @@
+diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/filesystem/ZLQtFSManager.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/filesystem/ZLQtFSManager.cpp
+--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/filesystem/ZLQtFSManager.cpp	2012-11-30 19:41:25.000000000 +0700
++++ fbreader-0.99.4/zlibrary/ui/src/qt4/filesystem/ZLQtFSManager.cpp	2013-02-21 13:30:31.000000000 +0700
+@@ -49,3 +49,4 @@
+ 	  path = replacement + path.substr(1);
+ 	}
++	ZLUnixFSManager::normalizeRealPath(path);
+ }
diff --git a/app-text/fbreader/metadata.xml b/app-text/fbreader/metadata.xml
new file mode 100644
index 000000000000..6eb5f614141b
--- /dev/null
+++ b/app-text/fbreader/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>grozin@gentoo.org</email>
+	</maintainer>
+	<longdescription lang="en">
+		FBReader is an e-book reader for various platforms.
+	</longdescription>
+</pkgmetadata>
diff --git a/app-text/fdftk-6.0-r1 b/app-text/fdftk-6.0-r1
deleted file mode 100644
index d5f7e6ab6cee..000000000000
--- a/app-text/fdftk-6.0-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install nofetch unpack
-DESCRIPTION=Acrobat FDF Toolkit
-EAPI=0
-HOMEPAGE=http://www.adobe.com/devnet/acrobat/fdftoolkit.html
-KEYWORDS=-* x86
-LICENSE=Adobe
-RESTRICT=fetch strip mirror
-SLOT=0
-SRC_URI=FDFToolkitForUnix.tar.gz
-_md5_=debe7cf7cd39713cba8393f3c4cbef05
diff --git a/app-text/fdftk/Manifest b/app-text/fdftk/Manifest
new file mode 100644
index 000000000000..c1347b051beb
--- /dev/null
+++ b/app-text/fdftk/Manifest
@@ -0,0 +1,3 @@
+DIST FDFToolkitForUnix.tar.gz 5725906 BLAKE2B 800ff670744bcbb9673db6edbb1d35e0c530fed5374da26520152b257c83abda3588886d6bac787701e767c5ae0651341804468b2a744bb466b525338a7ae899 SHA512 835438c5031464c169543d42a512ad691824dcea6d7f38e746bbe778adc9511eaa15c49ac2d4b3a92e4f831275e16a409e9e1e275983fb70309559ecdf686a66
+EBUILD fdftk-6.0-r1.ebuild 1445 BLAKE2B 70c106f7da5f92e9409111cf481b10b96bb5b69917572248734a05f93ddd2dcdc89395f475f322591235d39974826ee5ab7c22bd176c2593eba1fd3c40abc540 SHA512 350db0434a6ab2fd239f3ace57426124570d9b2d8c16525512c2cff27ecce39553916980faecd416d43b03627eb11b1e22ebd1d9e850308a9d4be912e37419f5
+MISC metadata.xml 324 BLAKE2B d19168d873a621db4923cb020f10b8c7c52a0f4c336155a834921391dc7209b25ac89abdb16e49f1494deb8bc46d27c71922cd592b2d9aa924d0b4aeeb016c12 SHA512 73461851a2949c275eeb920052d972a17c5f687eeabc7453614289cc1fa05b4c2ae9a40a2bcf5b767b564c8ce93e24b7a619e71ab706424a9e0990a30ad28959
diff --git a/app-text/fdftk/fdftk-6.0-r1.ebuild b/app-text/fdftk/fdftk-6.0-r1.ebuild
new file mode 100644
index 000000000000..32124da0c9d0
--- /dev/null
+++ b/app-text/fdftk/fdftk-6.0-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+MY_P="FDFToolkitForUnix"
+At="${MY_P}.tar.gz"
+
+DESCRIPTION="Acrobat FDF Toolkit"
+HOMEPAGE="http://www.adobe.com/devnet/acrobat/fdftoolkit.html"
+SRC_URI="${At}"
+
+SLOT="0"
+LICENSE="Adobe"
+KEYWORDS="-* x86" # binaries for i386 type hardware ONLY
+RESTRICT="fetch strip mirror"
+
+#DEPEND="
+#		perl? ( dev-lang/perl )"
+IUSE=""
+
+S=${WORKDIR}/${MY_P}
+
+pkg_nofetch() {
+	einfo "1. Visit ${HOMEPAGE}"
+	einfo "2. Review EULA"
+	einfo "3. Download ${At}"
+	einfo "4. Move ${At} to ${DISTDIR}"
+}
+
+src_unpack() {
+	if [ ! -r ${DISTDIR}/${At} ]; then
+		eerror "cannot read ${At}. Please check the permission and try again."
+		die
+	fi
+	unpack ${At} || die
+}
+
+src_install () {
+	into /opt/${P}
+	dolib.so "Headers and Libraries/LINUX/libFdfTk.so" || die
+	insinto /opt/${P}/include
+	doins "Headers and Libraries/Headers/FdfTk.h" || die
+	# It doesn't support Perl 5.8.*
+	#if use perl; then
+	#	eval `perl '-V:package'`
+	#	eval `perl '-V:version'`
+	#	eval `perl '-V:archname'`
+	#	insinto /usr/lib/${package}/vendor_perl/${version}/Acrobat
+	#	exeinto /usr/lib/${package}/vendor_perl/${version}/${archname}/auto/Acrobat/FDF
+	#	doexe "Headers and Libraries/LINUX/FDF.so" || die
+	#	doins "Headers and Libraries/Headers/FDF.pm" || die
+	#fi
+
+	into /usr
+	dodoc ReadMe.txt Documentation/*.pdf
+
+	dodir /etc/env.d
+	echo "LDPATH=/opt/${P}/lib" >${D}/etc/env.d/55${P}
+}
diff --git a/app-text/fdftk/metadata.xml b/app-text/fdftk/metadata.xml
new file mode 100644
index 000000000000..f93818d4dfc6
--- /dev/null
+++ b/app-text/fdftk/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+  <email>robbat2@gentoo.org</email>
+</maintainer>
+<maintainer type="project">
+  <email>tex@gentoo.org</email>
+  <name>Gentoo TeX Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-text/fictionup-0.1 b/app-text/fictionup-0.1
deleted file mode 100644
index f1e9f560b1fd..000000000000
--- a/app-text/fictionup-0.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/libyaml sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=A command-line markdown to fb2 convertor
-EAPI=6
-HOMEPAGE=http://cdslow.org.ru/fictionup/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-libs/libyaml
-SLOT=0
-SRC_URI=http://cdslow.org.ru/files/fictionup/fictionup-0.1.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2b1b82ed1d38f6d6d386d7d8cb7b1f15
diff --git a/app-text/fictionup/Manifest b/app-text/fictionup/Manifest
new file mode 100644
index 000000000000..7bc77732f2ad
--- /dev/null
+++ b/app-text/fictionup/Manifest
@@ -0,0 +1,3 @@
+DIST fictionup-0.1.tar.gz 322407 BLAKE2B 73b464b73f58d725a1973450c2ecb79e140d2a2a4f6a563ea9d5fc1c25ff417a98f487fd26f1c578234007ccb52902390e6292fd3f1b3ec0331a31d00e25e9c3 SHA512 375dbfb27cab05693197b0774875ebbafdb5c4a1bc67db318e00712b821d37fc647b5047fbca083ad145847aa61b81486e4f5192524c233d3facdec3447beb6e
+EBUILD fictionup-0.1.ebuild 514 BLAKE2B 80f508bdee2c8308d840fca9ec476e0252c32c25d2a64bb6e19b8430e1ff580ae632c26ee1fbbd1a9a2f69195aea0e0a11caf5edc5ee6da8edf9af692f18751e SHA512 ca95b1d8b0553d899c3c86d77c7f5175888d74d5b734ad6b66f90d3cf6eb916c851897cdad07706adb3ed83c2398a468257197ffc9344a641ee5ae8346f724dc
+MISC metadata.xml 466 BLAKE2B 49d2b46c6b3bdc4d25b6373c363d22eba40437fc09f4302fb6f627fdd856802d1d9a5143f9129326516ed7ff4d1bc3fa8f2d2583bb070d71c6a8ba817a5e3a6f SHA512 bf13006956e97c9e3fbf1f0fe52acbc42e321b2fe39ac988cfc70f7e9b5ae4de83da1bc131dce9b69882c05c6205fc8630d6776a47e665231544c34a1bcba8dd
diff --git a/app-text/fictionup/fictionup-0.1.ebuild b/app-text/fictionup/fictionup-0.1.ebuild
new file mode 100644
index 000000000000..08b5f5315776
--- /dev/null
+++ b/app-text/fictionup/fictionup-0.1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit cmake-utils
+
+DESCRIPTION="A command-line markdown to fb2 convertor"
+HOMEPAGE="http://cdslow.org.ru/fictionup/"
+SRC_URI="http://cdslow.org.ru/files/${PN}/${P}.tar.gz"
+LICENSE="GPL-3"
+SLOT="0"
+IUSE=""
+KEYWORDS="~amd64 ~x86"
+DEPEND="dev-libs/libyaml"
+RDEPEND="${DEPEND}"
+
+src_install() {
+	cmake-utils_src_install
+	mv "${D}"usr/share/doc/${PN} "${D}"usr/share/doc/${PF} || die "doc mv failed"
+}
diff --git a/app-text/fictionup/metadata.xml b/app-text/fictionup/metadata.xml
new file mode 100644
index 000000000000..af04cd4a1e5f
--- /dev/null
+++ b/app-text/fictionup/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>grozin@gentoo.org</email>
+    <name>Andrey Grozin</name>
+  </maintainer>
+  <longdescription lang="en">
+    fictionup is a command-line markdown to fb2 convertor. Metadata can be
+    included in the input file as a yaml block or given by a command-line
+    argument.
+  </longdescription>
+</pkgmetadata>
diff --git a/app-text/flpsed-0.7.0 b/app-text/flpsed-0.7.0
deleted file mode 100644
index 20be4f381ec5..000000000000
--- a/app-text/flpsed-0.7.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXft >=x11-libs/fltk-1.3.0:1 app-text/ghostscript-gpl[X]
-DESCRIPTION=Pseudo PostScript editor
-EAPI=4
-HOMEPAGE=http://flpsed.org/flpsed.html
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXft >=x11-libs/fltk-1.3.0:1 app-text/ghostscript-gpl[X]
-SLOT=0
-SRC_URI=http://flpsed.org/flpsed-0.7.0.tar.gz
-_md5_=9938dd814a1e09a6c9b347d0f37273fb
diff --git a/app-text/flpsed-0.7.2 b/app-text/flpsed-0.7.2
deleted file mode 100644
index 88bbf053f1e7..000000000000
--- a/app-text/flpsed-0.7.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXft >=x11-libs/fltk-1.3.0:1 app-text/ghostscript-gpl[X]
-DESCRIPTION=Pseudo PostScript editor
-EAPI=5
-HOMEPAGE=http://flpsed.org/flpsed.html
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXft >=x11-libs/fltk-1.3.0:1 app-text/ghostscript-gpl[X]
-SLOT=0
-SRC_URI=http://flpsed.org/flpsed-0.7.2.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=4d74f48c4c98dbc582efce2805424e87
diff --git a/app-text/flpsed-0.7.3 b/app-text/flpsed-0.7.3
deleted file mode 100644
index 25c1f6052526..000000000000
--- a/app-text/flpsed-0.7.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXft >=x11-libs/fltk-1.3.0:1 app-text/ghostscript-gpl[X]
-DESCRIPTION=Pseudo PostScript editor
-EAPI=5
-HOMEPAGE=http://flpsed.org/flpsed.html
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/libX11 x11-libs/libXext x11-libs/libXft >=x11-libs/fltk-1.3.0:1 app-text/ghostscript-gpl[X]
-SLOT=0
-SRC_URI=http://flpsed.org/flpsed-0.7.3.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=11def3a5b7b55db65ce295d69f9887a2
diff --git a/app-text/flpsed/Manifest b/app-text/flpsed/Manifest
new file mode 100644
index 000000000000..307a6b64e6bb
--- /dev/null
+++ b/app-text/flpsed/Manifest
@@ -0,0 +1,8 @@
+AUX flpsed-0.7.2-desktop.patch 247 BLAKE2B 2b1269b3c3ca1fb451db11f0a0b310ccea40612226227574dd4eab020aff348fcfd8c82f3908b253148a5e5135cd3a29a8306ac480c53e3410f19701290b79ca SHA512 b632a6b4948a12910916ef71a4710dcbabf91fdfbc302e3242d9101310101377023e58a12b24b6139d26fa37261a779db21773a8329e3f74d2e74c5cd1c6190f
+DIST flpsed-0.7.0.tar.gz 119159 BLAKE2B 1a051651d3d4835abea7ef3237340140feba465d9d42009b10fa18ac5aa927efeced7418477e096a9a5722f0e9217ba0546e324402ef5b84892adbba3f258c32 SHA512 0d5112f4e4f4401a1942767d0de1b38cffbc37e0f798b59e9371c37892c6d2e2448146baff2737e416ab9ec5d96963728918d4a49fc059ac1119d8ac946db59e
+DIST flpsed-0.7.2.tar.gz 146678 BLAKE2B 0e42f1e5653e9b372047216119fb7fdaab98ad3710c0ef717352ce23443e38fb23bd86e4c39663cb0fa51f80393d2f956658f825f3926dd12b28521bc2d1a7ba SHA512 d0e2f7d34e48555d74f58e9df16fa6d29e8fda1fb4c6e58ccdda512f25d7f7ee0e3657e11564cdb9dec483c14f42078636430e5ec987165cc7c6c5de8990984d
+DIST flpsed-0.7.3.tar.gz 146788 BLAKE2B 5721d973b1efe02c8c014104d1ed4991dd630a8da86bc191b58df4a7ed469065e37b80248c7a7ab4946e636f869ecbfbfe457ed15a6cc7c4243642a48790ab67 SHA512 b0a8bf2ea08630d280f83f7c32b4574ba4cf7fd989943492e77d1b73c8d83c81a5df40e64bfff744b5518de845eba21119242ff752e16b20816b225ccb7c3321
+EBUILD flpsed-0.7.0.ebuild 428 BLAKE2B 12afd70897560f028048ed7574b37553abc36ddddb1e061b7adb3cb15c661224745ea8e64ae81cf8acc99f53c9659e8d41caa404fdd501c9e7264d638bbfb2c1 SHA512 eff4dfaba72d90281a42f0d1f327ab78024099dcba5713d0c6b6cd52483d1b867e08f2f2a5630aaa2872cfff7fca3d599a5a079be12b1024eb152afa155525d7
+EBUILD flpsed-0.7.2.ebuild 604 BLAKE2B a49ee79aae0237e5aae0a62859004557438eb723ff20c704ba645ddcb6e534f22c51d7e361c6ea212294d492fd0479ed719507fe37950b506965cb6a88b9f4f0 SHA512 a09b7cbf10d1c4b5aed3fba5467fb79d420f61bc779fbf61241492c33b7579fa693113dba336c5a2e8d8f5d2415d2958cb6333f06fbe41e8b51010fa9867b8d5
+EBUILD flpsed-0.7.3.ebuild 611 BLAKE2B 0516ad6f8c37f7076b8c42a22ef53a5ff8d1930ceec0cd29766281ed8cca47f78895d08c195bbbe0a1f77e6cff53c2c255a484d8c0e0160b85f01625b365534e SHA512 5feb11a89d61f3fbb4d273681ac4c0d7fbd4c2fdfc47d0c665e2fda38bbd6bda26e2a7a0b0aae950c7a103ce1d9bbde961749214e291b3c31ce51c0c92b8fbb5
+MISC metadata.xml 245 BLAKE2B ee3a163cfe0a4bc59c0dfb46f9ddb580e2d259b4d0e33cb4e684eb9e6d4b901bf97c6edd891f3b75a613a782f1b89318d0ee3ec9bee4e34c4441d9e8f4267678 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690
diff --git a/app-text/flpsed/files/flpsed-0.7.2-desktop.patch b/app-text/flpsed/files/flpsed-0.7.2-desktop.patch
new file mode 100644
index 000000000000..55a402bf142c
--- /dev/null
+++ b/app-text/flpsed/files/flpsed-0.7.2-desktop.patch
@@ -0,0 +1,8 @@
+--- flpsed-0.7.2/flpsed.desktop
++++ flpsed-0.7.2/flpsed.desktop
+@@ -11,4 +11,4 @@
+ StartupNotify=true
+ Categories=Graphics;
+ MimeType=application/postscript;application/pdf;
+-Keywords=flpsed;pdf annotator;fltk
++Keywords=flpsed;pdf annotator;fltk;
diff --git a/app-text/flpsed/flpsed-0.7.0.ebuild b/app-text/flpsed/flpsed-0.7.0.ebuild
new file mode 100644
index 000000000000..671e2fb01d23
--- /dev/null
+++ b/app-text/flpsed/flpsed-0.7.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+DESCRIPTION="Pseudo PostScript editor"
+HOMEPAGE="http://flpsed.org/flpsed.html"
+SRC_URI="http://flpsed.org/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXft
+	>=x11-libs/fltk-1.3.0:1
+	app-text/ghostscript-gpl[X]"
+
+DEPEND="${RDEPEND}"
diff --git a/app-text/flpsed/flpsed-0.7.2.ebuild b/app-text/flpsed/flpsed-0.7.2.ebuild
new file mode 100644
index 000000000000..5e75d7154621
--- /dev/null
+++ b/app-text/flpsed/flpsed-0.7.2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="Pseudo PostScript editor"
+HOMEPAGE="http://flpsed.org/flpsed.html"
+SRC_URI="http://flpsed.org/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXft
+	>=x11-libs/fltk-1.3.0:1
+	app-text/ghostscript-gpl[X]"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-desktop.patch
+}
+
+src_install() {
+	default
+
+	doicon ${PN}.png
+	doicon -s scalable ${PN}.svg
+	domenu ${PN}.desktop
+}
diff --git a/app-text/flpsed/flpsed-0.7.3.ebuild b/app-text/flpsed/flpsed-0.7.3.ebuild
new file mode 100644
index 000000000000..7e38407047ce
--- /dev/null
+++ b/app-text/flpsed/flpsed-0.7.3.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="Pseudo PostScript editor"
+HOMEPAGE="http://flpsed.org/flpsed.html"
+SRC_URI="http://flpsed.org/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXft
+	>=x11-libs/fltk-1.3.0:1
+	app-text/ghostscript-gpl[X]"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.7.2-desktop.patch
+}
+
+src_install() {
+	default
+
+	doicon ${PN}.png
+	doicon -s scalable ${PN}.svg
+	domenu ${PN}.desktop
+}
diff --git a/app-text/flpsed/metadata.xml b/app-text/flpsed/metadata.xml
new file mode 100644
index 000000000000..13170c3184d8
--- /dev/null
+++ b/app-text/flpsed/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>tex@gentoo.org</email>
+	<name>Gentoo TeX Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-text/freepwing-1.4.3 b/app-text/freepwing-1.4.3
deleted file mode 100644
index 7b9ca993b000..000000000000
--- a/app-text/freepwing-1.4.3
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-lang/perl
-DESCRIPTION=FreePWING is a free JIS X 4081 (subset of EPWING V1) formatter
-EAPI=0
-HOMEPAGE=http://www.sra.co.jp/people/m-kasahr/freepwing/
-KEYWORDS=x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl
-SLOT=0
-SRC_URI=ftp://ftp.sra.co.jp/pub/misc/freepwing/freepwing-1.4.3.tar.gz
-_md5_=af46b6c5b9e8e26d01557ff3c588d4a4
diff --git a/app-text/freepwing/Manifest b/app-text/freepwing/Manifest
new file mode 100644
index 000000000000..04962f61d613
--- /dev/null
+++ b/app-text/freepwing/Manifest
@@ -0,0 +1,3 @@
+DIST freepwing-1.4.3.tar.gz 129499 BLAKE2B d21e6a6e84fff368a6b483dfe68d46f0955ba234e924a7b7c1b50d4124404c3a274d9a6dbe439cc476e9eb146d1c9039ede7b47488b7a7e514a0ca0915f288a9 SHA512 e363d2751410d6e39e786920faf63c4efee74e5004594f95157f700eb3a68a92a9e98635978f21f5da60f7bd9e1a3b4049f90c7b9da0b4bb0374081ab6738734
+EBUILD freepwing-1.4.3.ebuild 574 BLAKE2B ee43c2269cdae54c4129b8df7e9d0d162a699273b79374c3b6988476891d6a4fc7469f4cfe246a70eae6ced27e8051b48927585b6ef3aa9abceb71abb4512370 SHA512 1fff03f46f665315ab53cc7b9657673c9481b54eed63adefc5f3a86e085561411b563c29ab10489ff99a51808ac492c7b326b6a992d1f8bac7098794f936e05c
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/freepwing/freepwing-1.4.3.ebuild b/app-text/freepwing/freepwing-1.4.3.ebuild
new file mode 100644
index 000000000000..4e5d4445ce6a
--- /dev/null
+++ b/app-text/freepwing/freepwing-1.4.3.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+IUSE=""
+
+DESCRIPTION="FreePWING is a free JIS X 4081 (subset of EPWING V1) formatter"
+HOMEPAGE="http://www.sra.co.jp/people/m-kasahr/freepwing/"
+SRC_URI="ftp://ftp.sra.co.jp/pub/misc/freepwing/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86"
+
+DEPEND="dev-lang/perl"
+
+src_install() {
+	emake install DESTDIR="${D}" \
+		perllibdir=`perl -V:vendorlib | cut -d\' -f2` \
+		pkgdocdir=/usr/share/doc/${PF} || die
+
+	dodoc AUTHORS ChangeLog INSTALL NEWS README
+}
diff --git a/app-text/freepwing/metadata.xml b/app-text/freepwing/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-text/freepwing/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/app-text/gentoo-guide-xml-dtd-2.1-r1 b/app-text/gentoo-guide-xml-dtd-2.1-r1
deleted file mode 100644
index a321983734ce..000000000000
--- a/app-text/gentoo-guide-xml-dtd-2.1-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prerm unpack
-DEPEND=>=app-text/sgml-common-0.6.1 >=app-text/sgml-common-0.6.3-r2
-DESCRIPTION=DTD for Gentoo-Guide Style XML Files
-EAPI=0
-HOMEPAGE=https://www.gentoo.org
-KEYWORDS=amd64 ppc s390 sparc x86
-LICENSE=GPL-2
-RDEPEND=>=app-text/sgml-common-0.6.1
-SLOT=0
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	sgml-catalog	1ca36a4ae32c67b390f310dd6d7b1189	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=494be87b4ff6bba7e5d926fa4cf2eddc
diff --git a/app-text/gentoo-guide-xml-dtd/Manifest b/app-text/gentoo-guide-xml-dtd/Manifest
new file mode 100644
index 000000000000..0166072379bf
--- /dev/null
+++ b/app-text/gentoo-guide-xml-dtd/Manifest
@@ -0,0 +1,8 @@
+AUX catalog 524 BLAKE2B 1d90d6e15d695f4d0f211126e04d9cdfacb833fceb229c54d38c44552e183cec0142959a7e4c382fe202563ceed1f20a4aa6feff243c55c1eaf957345616df63 SHA512 1a5ea6247d65553e823b853311a13eeed9c589e4c66203e152b516f636b8a39f53560715dbf6f421d653af2e78f63327f913894556645ae92a3d479d3f3b2c85
+AUX ent/iso-lat1.ent 4554 BLAKE2B 8104bd317a28f0f546711effbfbef779cc5a736ff541b91e55c0fcaf07cf477f1b164a1d45548d274bcf6cf4fc46eee15b614785344561c116946b239eaff00a SHA512 3e86258b3ac6849b82e6524d7701ed2ce1cafbb1697c3ce900572f55515a8fecfb1ea9e245939eaa58d6d99625719e258aab9f7660ca2d132cb9eb9deee055c4
+AUX ent/iso-num.ent 4085 BLAKE2B 62d1e659ae9a3720db491285b832b2b1f756fbc94fbccb6ab2e2205308a4a918343e3dd090f19b4952a9e834d70059fc727256490ae84f488675023b2976e2ff SHA512 2ba450e7b2f144425b373f04b17cf6724ceecfafca9e6bbdcbd67a0f945a078ad882d969f7509e0170bb2b532299d9b4b73c3bab735279029355344d8e411044
+AUX ent/iso-pub.ent 4590 BLAKE2B e038697bca47cb62bf6614f84eda55fa6726e7c08bbda757eb646977df6d91289daeafac1937de39a4dfbfc9fee273e81de9f7add6ac052c9a653867a12d211d SHA512 b18f51ee40d602d0e91e1b6472f81f7fe1222394d818443616deb174806db217093794291bf410372ceb558ba05d875834b0ebc263135d632cf9ed73ddf16fce
+AUX guide/guide-2.1.dtd 3806 BLAKE2B 08f1dddad2f7e576a639deb30801d5cb80e52982a1979fe753b57cea7878f6a098f6f58114bda71c04fbac0fcc13af6eba91d3aea9c3c0682bb4a479c85058d0 SHA512 b44e40196353446a3ad02e0288ce387b72cb35177ed9fbc3f4a1e046ccc54658ea94d48aa344508dc10b60d2096e4309e80db21381638d515a225976a9e65626
+AUX guide/guide.dtd 7026 BLAKE2B cb9c56253e6f80da38eb64908fe0a85555952e885eb155a6cf0f6126abb2c27f0a4c648b8a637bc51ba565fd01c2c9dd137114a09352c1c10ab83b5f25b090ba SHA512 088436a7e1d1c9d23f717b34fdef5ef80f04f64ce68edf1d98c430266e77c06b0857db1e028aa640ae5457ac7f0ba95cbc45f79e3bd7945a388f8403dd12e508
+EBUILD gentoo-guide-xml-dtd-2.1-r1.ebuild 702 BLAKE2B a0b782b7a4b0b653727cbf0b9edcc77f90c2f738f4acad61054fdcb5717f14a959c3baea05c69ce9616da9b5ea45f72271a43be9686220bbdca4d8f755bd9f80 SHA512 936b736a4b7193999901c1511891b5b96a85a118fdb851b5067e9847b5912e2dee099ffc20fc14bea968434668c41bdfb1fc20efe448c73d6faae4be90001470
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/gentoo-guide-xml-dtd/files/catalog b/app-text/gentoo-guide-xml-dtd/files/catalog
new file mode 100644
index 000000000000..48f011faf9c3
--- /dev/null
+++ b/app-text/gentoo-guide-xml-dtd/files/catalog
@@ -0,0 +1,14 @@
+
+  -- Catalog data for Gentoo Guide XML V2.1 --
+  -- File catalog  --
+
+  -- Gentoo Guide driver file .................................................. --
+
+PUBLIC "-//Gentoo//DTD Guide XML V2.1//EN" "xml-dtd-2.1/guide.dtd"
+
+  -- ISO entity sets ...................................................... --
+
+PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" "ent/iso-num.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN" "ent/iso-pub.ent"
+PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN" "ent/iso-lat1.ent"
+
diff --git a/app-text/gentoo-guide-xml-dtd/files/ent/iso-lat1.ent b/app-text/gentoo-guide-xml-dtd/files/ent/iso-lat1.ent
new file mode 100644
index 000000000000..2ec16fffff36
--- /dev/null
+++ b/app-text/gentoo-guide-xml-dtd/files/ent/iso-lat1.ent
@@ -0,0 +1,67 @@
+<!-- iso-lat1.ent (initially distributed with DocBook XML DTD V4.1.1beta1) -->
+
+<!-- Derived from the corresponding ISO 8879 standard entity set
+     and the Unicode character mappings provided by Sebastian Rahtz -->
+
+<!ENTITY aacute	"&#x00E1;"> <!-- LATIN SMALL LETTER A WITH ACUTE -->
+<!ENTITY Aacute	"&#x00C1;"> <!-- LATIN CAPITAL LETTER A WITH ACUTE -->
+<!ENTITY acirc	"&#x00E2;"> <!-- LATIN SMALL LETTER A WITH CIRCUMFLEX -->
+<!ENTITY Acirc	"&#x00C2;"> <!-- LATIN CAPITAL LETTER A WITH CIRCUMFLEX -->
+<!ENTITY agrave	"&#x00E0;"> <!-- LATIN SMALL LETTER A WITH GRAVE -->
+<!ENTITY Agrave	"&#x00C0;"> <!-- LATIN CAPITAL LETTER A WITH GRAVE -->
+<!ENTITY aring	"&#x00E5;"> <!-- LATIN SMALL LETTER A WITH RING ABOVE -->
+<!ENTITY Aring	"&#x00C5;"> <!-- LATIN CAPITAL LETTER A WITH RING ABOVE -->
+<!ENTITY atilde	"&#x00E3;"> <!-- LATIN SMALL LETTER A WITH TILDE -->
+<!ENTITY Atilde	"&#x00C3;"> <!-- LATIN CAPITAL LETTER A WITH TILDE -->
+<!ENTITY auml	"&#x00E4;"> <!-- LATIN SMALL LETTER A WITH DIAERESIS -->
+<!ENTITY Auml	"&#x00C4;"> <!-- LATIN CAPITAL LETTER A WITH DIAERESIS -->
+<!ENTITY aelig	"&#x00E6;"> <!-- LATIN SMALL LETTER AE -->
+<!ENTITY AElig	"&#x00C6;"> <!-- LATIN CAPITAL LETTER AE -->
+<!ENTITY ccedil	"&#x00E7;"> <!-- LATIN SMALL LETTER C WITH CEDILLA -->
+<!ENTITY Ccedil	"&#x00C7;"> <!-- LATIN CAPITAL LETTER C WITH CEDILLA -->
+<!ENTITY eth	"&#x00F0;"> <!-- LATIN SMALL LETTER ETH -->
+<!ENTITY ETH	"&#x00D0;"> <!-- LATIN CAPITAL LETTER ETH -->
+<!ENTITY eacute	"&#x00E9;"> <!-- LATIN SMALL LETTER E WITH ACUTE -->
+<!ENTITY Eacute	"&#x00C9;"> <!-- LATIN CAPITAL LETTER E WITH ACUTE -->
+<!ENTITY ecirc	"&#x00EA;"> <!-- LATIN SMALL LETTER E WITH CIRCUMFLEX -->
+<!ENTITY Ecirc	"&#x00CA;"> <!-- LATIN CAPITAL LETTER E WITH CIRCUMFLEX -->
+<!ENTITY egrave	"&#x00E8;"> <!-- LATIN SMALL LETTER E WITH GRAVE -->
+<!ENTITY Egrave	"&#x00C8;"> <!-- LATIN CAPITAL LETTER E WITH GRAVE -->
+<!ENTITY euml	"&#x00EB;"> <!-- LATIN SMALL LETTER E WITH DIAERESIS -->
+<!ENTITY Euml	"&#x00CB;"> <!-- LATIN CAPITAL LETTER E WITH DIAERESIS -->
+<!ENTITY iacute	"&#x00ED;"> <!-- LATIN SMALL LETTER I WITH ACUTE -->
+<!ENTITY Iacute	"&#x00CD;"> <!-- LATIN CAPITAL LETTER I WITH ACUTE -->
+<!ENTITY icirc	"&#x00EE;"> <!-- LATIN SMALL LETTER I WITH CIRCUMFLEX -->
+<!ENTITY Icirc	"&#x00CE;"> <!-- LATIN CAPITAL LETTER I WITH CIRCUMFLEX -->
+<!ENTITY igrave	"&#x00EC;"> <!-- LATIN SMALL LETTER I WITH GRAVE -->
+<!ENTITY Igrave	"&#x00CC;"> <!-- LATIN CAPITAL LETTER I WITH GRAVE -->
+<!ENTITY iuml	"&#x00EF;"> <!-- LATIN SMALL LETTER I WITH DIAERESIS -->
+<!ENTITY Iuml	"&#x00CF;"> <!-- LATIN CAPITAL LETTER I WITH DIAERESIS -->
+<!ENTITY ntilde	"&#x00F1;"> <!-- LATIN SMALL LETTER N WITH TILDE -->
+<!ENTITY Ntilde	"&#x00D1;"> <!-- LATIN CAPITAL LETTER N WITH TILDE -->
+<!ENTITY oacute	"&#x00F3;"> <!-- LATIN SMALL LETTER O WITH ACUTE -->
+<!ENTITY Oacute	"&#x00D3;"> <!-- LATIN CAPITAL LETTER O WITH ACUTE -->
+<!ENTITY ocirc	"&#x00F4;"> <!-- LATIN SMALL LETTER O WITH CIRCUMFLEX -->
+<!ENTITY Ocirc	"&#x00D4;"> <!-- LATIN CAPITAL LETTER O WITH CIRCUMFLEX -->
+<!ENTITY ograve	"&#x00F2;"> <!-- LATIN SMALL LETTER O WITH GRAVE -->
+<!ENTITY Ograve	"&#x00D2;"> <!-- LATIN CAPITAL LETTER O WITH GRAVE -->
+<!ENTITY oslash	"&#x00F8;"> <!-- CIRCLED DIVISION SLASH -->
+<!ENTITY Oslash	"&#x00D8;"> <!-- LATIN CAPITAL LETTER O WITH STROKE -->
+<!ENTITY otilde	"&#x00F5;"> <!-- LATIN SMALL LETTER O WITH TILDE -->
+<!ENTITY Otilde	"&#x00D5;"> <!-- LATIN CAPITAL LETTER O WITH TILDE -->
+<!ENTITY ouml	"&#x00F6;"> <!-- LATIN SMALL LETTER O WITH DIAERESIS -->
+<!ENTITY Ouml	"&#x00D6;"> <!-- LATIN CAPITAL LETTER O WITH DIAERESIS -->
+<!ENTITY szlig	"&#x00DF;"> <!-- LATIN SMALL LETTER SHARP S -->
+<!ENTITY thorn	"&#x00FE;"> <!-- LATIN SMALL LETTER THORN -->
+<!ENTITY THORN	"&#x00DE;"> <!-- LATIN CAPITAL LETTER THORN -->
+<!ENTITY uacute	"&#x00FA;"> <!-- LATIN SMALL LETTER U WITH ACUTE -->
+<!ENTITY Uacute	"&#x00DA;"> <!-- LATIN CAPITAL LETTER U WITH ACUTE -->
+<!ENTITY ucirc	"&#x00FB;"> <!-- LATIN SMALL LETTER U WITH CIRCUMFLEX -->
+<!ENTITY Ucirc	"&#x00DB;"> <!-- LATIN CAPITAL LETTER U WITH CIRCUMFLEX -->
+<!ENTITY ugrave	"&#x00F9;"> <!-- LATIN SMALL LETTER U WITH GRAVE -->
+<!ENTITY Ugrave	"&#x00D9;"> <!-- LATIN CAPITAL LETTER U WITH GRAVE -->
+<!ENTITY uuml	"&#x00FC;"> <!-- LATIN SMALL LETTER U WITH DIAERESIS -->
+<!ENTITY Uuml	"&#x00DC;"> <!-- LATIN CAPITAL LETTER U WITH DIAERESIS -->
+<!ENTITY yacute	"&#x00FD;"> <!-- LATIN SMALL LETTER Y WITH ACUTE -->
+<!ENTITY Yacute	"&#x00DD;"> <!-- LATIN CAPITAL LETTER Y WITH ACUTE -->
+<!ENTITY yuml	"&#x00FF;"> <!-- LATIN SMALL LETTER Y WITH DIAERESIS -->
diff --git a/app-text/gentoo-guide-xml-dtd/files/ent/iso-num.ent b/app-text/gentoo-guide-xml-dtd/files/ent/iso-num.ent
new file mode 100644
index 000000000000..7f4844c5e0ee
--- /dev/null
+++ b/app-text/gentoo-guide-xml-dtd/files/ent/iso-num.ent
@@ -0,0 +1,81 @@
+<!-- iso-num.ent (initially distributed with DocBook XML DTD V4.1.1beta1) -->
+
+<!-- Derived from the corresponding ISO 8879 standard entity set
+     and the Unicode character mappings provided by Sebastian Rahtz -->
+
+<!ENTITY half	"&#x00BD;"> <!-- VULGAR FRACTION ONE HALF -->
+<!ENTITY frac12	"&#x00BD;"> <!-- VULGAR FRACTION ONE HALF -->
+<!ENTITY frac14	"&#x00BC;"> <!-- VULGAR FRACTION ONE QUARTER -->
+<!ENTITY frac34	"&#x00BE;"> <!-- VULGAR FRACTION THREE QUARTERS -->
+<!ENTITY frac18	"&#x215B;"> <!--  -->
+<!ENTITY frac38	"&#x215C;"> <!--  -->
+<!ENTITY frac58	"&#x215D;"> <!--  -->
+<!ENTITY frac78	"&#x215E;"> <!--  -->
+<!ENTITY sup1	"&#x00B9;"> <!-- SUPERSCRIPT ONE -->
+<!ENTITY sup2	"&#x00B2;"> <!-- SUPERSCRIPT TWO -->
+<!ENTITY sup3	"&#x00B3;"> <!-- SUPERSCRIPT THREE -->
+<!ENTITY plus	"&#x002B;"> <!-- PLUS SIGN -->
+<!ENTITY plusmn	"&#x00B1;"> <!-- PLUS-MINUS SIGN -->
+<!ENTITY lt	"&#38;#60;"> <!-- LESS-THAN SIGN -->
+<!ENTITY equals	"&#x003D;"> <!-- EQUALS SIGN -->
+<!ENTITY gt	"&#x003E;"> <!-- GREATER-THAN SIGN -->
+<!ENTITY divide	"&#x00F7;"> <!-- DIVISION SIGN -->
+<!ENTITY times	"&#x00D7;"> <!-- MULTIPLICATION SIGN -->
+<!ENTITY curren	"&#x00A4;"> <!-- CURRENCY SIGN -->
+<!ENTITY pound	"&#x00A3;"> <!-- POUND SIGN -->
+<!ENTITY dollar	"&#x0024;"> <!-- DOLLAR SIGN -->
+<!ENTITY cent	"&#x00A2;"> <!-- CENT SIGN -->
+<!ENTITY yen	"&#x00A5;"> <!-- YEN SIGN -->
+<!ENTITY num	"&#x0023;"> <!-- NUMBER SIGN -->
+<!ENTITY percnt	"&#x0025;"> <!-- PERCENT SIGN -->
+<!ENTITY amp	"&#38;#38;"> <!-- AMPERSAND -->
+<!ENTITY ast	"&#x002A;"> <!-- ASTERISK OPERATOR -->
+<!ENTITY commat	"&#x0040;"> <!-- COMMERCIAL AT -->
+<!ENTITY lsqb	"&#x005B;"> <!-- LEFT SQUARE BRACKET -->
+<!ENTITY bsol	"&#x005C;"> <!-- REVERSE SOLIDUS -->
+<!ENTITY rsqb	"&#x005D;"> <!-- RIGHT SQUARE BRACKET -->
+<!ENTITY lcub	"&#x007B;"> <!-- LEFT CURLY BRACKET -->
+<!ENTITY horbar	"&#x2015;"> <!-- HORIZONTAL BAR -->
+<!ENTITY verbar	"&#x007C;"> <!-- VERTICAL LINE -->
+<!ENTITY rcub	"&#x007D;"> <!-- RIGHT CURLY BRACKET -->
+<!ENTITY micro	"&#x00B5;"> <!-- MICRO SIGN -->
+<!ENTITY ohm	"&#x2126;"> <!-- OHM SIGN -->
+<!ENTITY deg	"&#x00B0;"> <!-- DEGREE SIGN -->
+<!ENTITY ordm	"&#x00BA;"> <!-- MASCULINE ORDINAL INDICATOR -->
+<!ENTITY ordf	"&#x00AA;"> <!-- FEMININE ORDINAL INDICATOR -->
+<!ENTITY sect	"&#x00A7;"> <!-- SECTION SIGN -->
+<!ENTITY para	"&#x00B6;"> <!-- PILCROW SIGN -->
+<!ENTITY middot	"&#x00B7;"> <!-- MIDDLE DOT -->
+<!ENTITY larr	"&#x2190;"> <!-- LEFTWARDS DOUBLE ARROW -->
+<!ENTITY rarr	"&#x2192;"> <!-- RIGHTWARDS DOUBLE ARROW -->
+<!ENTITY uarr	"&#x2191;"> <!-- UPWARDS ARROW -->
+<!ENTITY darr	"&#x2193;"> <!-- DOWNWARDS ARROW -->
+<!ENTITY copy	"&#x00A9;"> <!-- COPYRIGHT SIGN -->
+<!ENTITY reg	"&#x00AE;"> <!-- REG TRADE MARK SIGN -->
+<!ENTITY trade	"&#x2122;"> <!-- TRADE MARK SIGN -->
+<!ENTITY brvbar	"&#x00A6;"> <!-- BROKEN BAR -->
+<!ENTITY not	"&#x00AC;"> <!-- NOT SIGN -->
+<!ENTITY sung	"&#x2669;"> <!--  -->
+<!ENTITY excl	"&#x0021;"> <!-- EXCLAMATION MARK -->
+<!ENTITY iexcl	"&#x00A1;"> <!-- INVERTED EXCLAMATION MARK -->
+<!ENTITY quot	"&#x0022;"> <!-- QUOTATION MARK -->
+<!ENTITY apos	"&#x0027;"> <!-- APOSTROPHE -->
+<!ENTITY lpar	"&#x0028;"> <!-- LEFT PARENTHESIS -->
+<!ENTITY rpar	"&#x0029;"> <!-- RIGHT PARENTHESIS -->
+<!ENTITY comma	"&#x002C;"> <!-- COMMA -->
+<!ENTITY lowbar	"&#x005F;"> <!-- LOW LINE -->
+<!ENTITY hyphen	"&#x002D;"> <!-- HYPHEN-MINUS -->
+<!ENTITY period	"&#x002E;"> <!-- FULL STOP -->
+<!ENTITY sol	"&#x002F;"> <!-- SOLIDUS -->
+<!ENTITY colon	"&#x003A;"> <!-- COLON -->
+<!ENTITY semi	"&#x003B;"> <!-- SEMICOLON -->
+<!ENTITY quest	"&#x003F;"> <!-- QUESTION MARK -->
+<!ENTITY iquest	"&#x00BF;"> <!-- INVERTED QUESTION MARK -->
+<!ENTITY laquo	"&#x00AB;"> <!-- LEFT-POINTING DOUBLE ANGLE QUOTATION MARK -->
+<!ENTITY raquo	"&#x00BB;"> <!-- RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK -->
+<!ENTITY lsquo	"&#x2018;"> <!--  -->
+<!ENTITY rsquo	"&#x2019;"> <!-- RIGHT SINGLE QUOTATION MARK -->
+<!ENTITY ldquo	"&#x201C;"> <!--  -->
+<!ENTITY rdquo	"&#x201D;"> <!-- RIGHT DOUBLE QUOTATION MARK -->
+<!ENTITY nbsp	"&#x00A0;"> <!-- NO-BREAK SPACE -->
+<!ENTITY shy	"&#x00AD;"> <!-- SOFT HYPHEN -->
diff --git a/app-text/gentoo-guide-xml-dtd/files/ent/iso-pub.ent b/app-text/gentoo-guide-xml-dtd/files/ent/iso-pub.ent
new file mode 100644
index 000000000000..56ede364e547
--- /dev/null
+++ b/app-text/gentoo-guide-xml-dtd/files/ent/iso-pub.ent
@@ -0,0 +1,90 @@
+<!-- iso-pub.ent (initially distributed with DocBook XML DTD V4.1.1beta1) -->
+
+<!-- Derived from the corresponding ISO 8879 standard entity set
+     and the Unicode character mappings provided by Sebastian Rahtz -->
+
+<!ENTITY emsp	"&#x2003;"> <!-- EM SPACE -->
+<!ENTITY ensp	"&#x2002;"> <!-- EN SPACE -->
+<!ENTITY emsp13	"&#x2004;"> <!-- THREE-PER-EM SPACE -->
+<!ENTITY emsp14	"&#x2005;"> <!-- FOUR-PER-EM SPACE -->
+<!ENTITY numsp	"&#x2007;"> <!-- FIGURE SPACE -->
+<!ENTITY puncsp	"&#x2008;"> <!-- PUNCTUATION SPACE -->
+<!ENTITY thinsp	"&#x2009;"> <!-- THIN SPACE -->
+<!ENTITY hairsp	"&#x200A;"> <!-- HAIR SPACE -->
+<!ENTITY mdash	"&#x2014;"> <!-- EM DASH -->
+<!ENTITY ndash	"&#x2013;"> <!-- EN DASH -->
+<!ENTITY dash	"&#x2010;"> <!-- HYPHEN -->
+<!ENTITY blank	"&#x2423;"> <!-- OPEN BOX -->
+<!ENTITY hellip	"&#x2026;"> <!-- HORIZONTAL ELLIPSIS -->
+<!ENTITY nldr	"&#x2025;"> <!-- TWO DOT LEADER -->
+<!ENTITY frac13	"&#x2153;"> <!-- VULGAR FRACTION ONE THIRD -->
+<!ENTITY frac23	"&#x2154;"> <!-- VULGAR FRACTION TWO THIRDS -->
+<!ENTITY frac15	"&#x2155;"> <!-- VULGAR FRACTION ONE FIFTH -->
+<!ENTITY frac25	"&#x2156;"> <!-- VULGAR FRACTION TWO FIFTHS -->
+<!ENTITY frac35	"&#x2157;"> <!-- VULGAR FRACTION THREE FIFTHS -->
+<!ENTITY frac45	"&#x2158;"> <!-- VULGAR FRACTION FOUR FIFTHS -->
+<!ENTITY frac16	"&#x2159;"> <!-- VULGAR FRACTION ONE SIXTH -->
+<!ENTITY frac56	"&#x215A;"> <!-- VULGAR FRACTION FIVE SIXTHS -->
+<!ENTITY incare	"&#x2105;"> <!-- CARE OF -->
+<!ENTITY block	"&#x2588;"> <!-- FULL BLOCK -->
+<!ENTITY uhblk	"&#x2580;"> <!-- UPPER HALF BLOCK -->
+<!ENTITY lhblk	"&#x2584;"> <!-- LOWER HALF BLOCK -->
+<!ENTITY blk14	"&#x2591;"> <!-- LIGHT SHADE -->
+<!ENTITY blk12	"&#x2592;"> <!-- MEDIUM SHADE -->
+<!ENTITY blk34	"&#x2593;"> <!-- DARK SHADE -->
+<!ENTITY marker	"&#x25AE;"> <!-- BLACK VERTICAL RECTANGLE -->
+<!ENTITY cir	"&#x25CB;"> <!-- WHITE CIRCLE -->
+<!ENTITY squ	"&#x25A1;"> <!-- WHITE SQUARE -->
+<!ENTITY rect	"&#x25AD;"> <!-- WHITE RECTANGLE -->
+<!ENTITY utri	"&#x25B5;"> <!-- WHITE UP-POINTING TRIANGLE -->
+<!ENTITY dtri	"&#x25BF;"> <!-- WHITE DOWN-POINTING TRIANGLE -->
+<!ENTITY star	"&#x22C6;"> <!-- STAR OPERATOR -->
+<!ENTITY bull	"&#x2022;"> <!-- BULLET -->
+<!ENTITY squf	"&#x25AA;"> <!--  -->
+<!ENTITY utrif	"&#x25B4;"> <!-- BLACK UP-POINTING TRIANGLE -->
+<!ENTITY dtrif	"&#x25BE;"> <!-- BLACK DOWN-POINTING TRIANGLE -->
+<!ENTITY ltrif	"&#x25C2;"> <!-- BLACK LEFT-POINTING TRIANGLE -->
+<!ENTITY rtrif	"&#x25B8;"> <!-- BLACK RIGHT-POINTING TRIANGLE -->
+<!ENTITY clubs	"&#x2663;"> <!-- BLACK CLUB SUIT -->
+<!ENTITY diams	"&#x2666;"> <!-- BLACK DIAMOND SUIT -->
+<!ENTITY hearts	"&#x2665;"> <!-- BLACK HEART SUIT -->
+<!ENTITY spades	"&#x2660;"> <!-- BLACK SPADE SUIT -->
+<!ENTITY malt	"&#x2720;"> <!-- MALTESE CROSS -->
+<!ENTITY dagger	"&#x2020;"> <!-- DAGGER -->
+<!ENTITY Dagger	"&#x2021;"> <!-- DOUBLE DAGGER -->
+<!ENTITY check	"&#x2713;"> <!-- CHECK MARK -->
+<!ENTITY cross	"&#x2717;"> <!-- BALLOT X -->
+<!ENTITY sharp	"&#x266F;"> <!-- MUSIC SHARP SIGN -->
+<!ENTITY flat	"&#x266D;"> <!-- MUSIC FLAT SIGN -->
+<!ENTITY male	"&#x2642;"> <!-- MALE SIGN -->
+<!ENTITY female	"&#x2640;"> <!--  -->
+<!ENTITY phone	"&#x260E;"> <!-- TELEPHONE SIGN -->
+<!ENTITY telrec	"&#x2315;"> <!-- TELEPHONE RECORDER -->
+<!ENTITY copysr	"&#x2117;"> <!-- SOUND RECORDING COPYRIGHT -->
+<!ENTITY caret	"&#x2041;"> <!-- CARET -->
+<!ENTITY lsquor	"&#x201A;"> <!-- SINGLE LOW-9 QUOTATION MARK -->
+<!ENTITY ldquor	"&#x201E;"> <!-- DOUBLE LOW-9 QUOTATION MARK -->
+<!ENTITY fflig	"&#xFB00;"> <!--  -->
+<!ENTITY filig	"&#xFB01;"> <!--  -->
+<!--     fjlig	Unknown unicode character -->
+<!ENTITY ffilig	"&#xFB03;"> <!--  -->
+<!ENTITY ffllig	"&#xFB04;"> <!--  -->
+<!ENTITY fllig	"&#xFB02;"> <!--  -->
+<!ENTITY mldr	"&#x2026;"> <!-- HORIZONTAL ELLIPSIS -->
+<!ENTITY rdquor	"&#x201C;"> <!--  -->
+<!ENTITY rsquor	"&#x2018;"> <!--  -->
+<!ENTITY vellip	"&#x22EE;"> <!--  -->
+<!ENTITY hybull	"&#x2043;"> <!-- HYPHEN BULLET -->
+<!ENTITY loz	"&#x25CA;"> <!-- LOZENGE -->
+<!ENTITY lozf	"&#x2726;"> <!--  -->
+<!ENTITY ltri	"&#x25C3;"> <!-- WHITE LEFT-POINTING TRIANGLE -->
+<!ENTITY rtri	"&#x25B9;"> <!-- WHITE RIGHT-POINTING TRIANGLE -->
+<!ENTITY starf	"&#x2605;"> <!-- BLACK STAR -->
+<!ENTITY natur	"&#x266E;"> <!-- MUSIC NATURAL SIGN -->
+<!ENTITY rx	"&#x211E;"> <!-- PRESCRIPTION TAKE -->
+<!ENTITY sext	"&#x2736;"> <!-- SIX POINTED BLACK STAR -->
+<!ENTITY target	"&#x2316;"> <!-- POSITION INDICATOR -->
+<!ENTITY dlcrop	"&#x230D;"> <!-- BOTTOM LEFT CROP -->
+<!ENTITY drcrop	"&#x230C;"> <!-- BOTTOM RIGHT CROP -->
+<!ENTITY ulcrop	"&#x230F;"> <!-- TOP LEFT CROP -->
+<!ENTITY urcrop	"&#x230E;"> <!-- TOP RIGHT CROP -->
diff --git a/app-text/gentoo-guide-xml-dtd/files/guide/guide-2.1.dtd b/app-text/gentoo-guide-xml-dtd/files/guide/guide-2.1.dtd
new file mode 100644
index 000000000000..eff2db9d8bc9
--- /dev/null
+++ b/app-text/gentoo-guide-xml-dtd/files/guide/guide-2.1.dtd
@@ -0,0 +1,163 @@
+<!-- This is a DTD, but will be read as -*- sgml -*-   -->
+<!-- ================================================= -->
+
+<!-- ==== Title Elements ====-->
+    <!ENTITY % guide.title "title">
+    <!ENTITY % chapter.title "title">
+    <!ENTITY % sect.title "title">
+
+<!-- ==== List Elements ==== -->
+
+    <!ENTITY % list.class "ul|ol">
+
+<!-- ==== Elements which are admonitions. ==== -->
+
+    <!ENTITY % admon.class "note|warn|impo">
+
+<!-- ==== Elements which are "line specific". Spaces and line breaks are significant in line specific elements. ==== -->
+
+    <!ENTITY % linespecific.class "pre">
+    <!ENTITY % linespecific.sub.class "i|codenote">
+
+<!-- ==== Paragraph Elements ==== -->
+
+    <!ENTITY % para.class "p">
+
+<!-- ==== Formal objects (objects with titles). ==== -->
+
+    <!ENTITY % formal.class "figure|table">
+
+<!-- ==== Elements which are descriptive in nature. ==== -->
+
+    <!ENTITY % descobj.class "abstract">
+
+<!-- ==== The class of general inline elements. ==== -->
+
+    <!ENTITY % gen.class "e">
+
+    <!ENTITY % link.class "mail|link">
+
+    <!ENTITY % tech.class "c|path">
+
+    <!ENTITY % guideinfo.class "author|version|date">
+
+
+<!-- ===== ATTRIBUTE ENTITIES =====-->
+
+    <!ENTITY % link.attributes
+            "link  CDATA   #IMPLIED">
+
+    <!ENTITY % figure.attributes
+            "link       CDATA   #REQUIRED
+             short      CDATA   #IMPLIED
+             caption    CDATA   #IMPLIED">
+
+    <!ENTITY % author.attributes
+            "title   CDATA   #IMPLIED">
+
+<!-- ==== Mix Objects ==== -->
+
+    <!ENTITY % admon.mix
+            "%list.class;
+            |%linespecific.class;
+            |%para.class;
+            |%formal.class;">
+
+    <!ENTITY % para.mix
+            "#PCDATA
+            |%list.class;
+            |%gen.class;
+            |%link.class;
+            |%tech.class;">
+
+    <!ENTITY % list.mix
+            "#PCDATA
+            |%gen.class;
+            |%link.class;
+            |%tech.class;">
+
+    <!ENTITY % pre.mix
+            "#PCDATA
+            |%linespecific.sub.class;
+            |%gen.class;
+            |%link.class;
+            |%tech.class;">
+
+    <!ENTITY % title.mix
+            "#PCDATA
+            |%gen.class;
+            |%link.class;	|%tech.class;">
+
+    <!ENTITY % cptr.mix
+            "#PCDATA
+            |%link.class;	|%tech.class;">
+
+    <!ENTITY % smallcptr.mix "#PCDATA">
+
+    <!ENTITY % docinfo.mix
+            "#PCDATA
+            |%link.class;
+            |e">
+
+    <!ENTITY % body.mix
+            "%admon.class;
+            |%linespecific.class;
+            |%para.class;
+            |%formal.class;">
+
+
+<!-- ==== Objects ==== -->
+
+    <!ELEMENT title (%title.mix;)*>
+
+    <!ELEMENT ul (li+)>
+    <!ELEMENT ol (li+)>
+    <!ELEMENT li (%list.mix;)*>
+
+    <!ELEMENT note (%para.mix;)*>
+    <!ELEMENT warn (%para.mix;)*>
+    <!ELEMENT impo (%para.mix;)*>
+
+    <!ELEMENT pre (%pre.mix;)*>
+    <!ELEMENT codenote (#PCDATA)>
+    <!ELEMENT i (#PCDATA)>
+
+    <!ELEMENT p (%para.mix;)*>
+
+    <!ELEMENT figure EMPTY>
+    <!ATTLIST figure %figure.attributes;>
+
+    <!ELEMENT table (tr*)>
+    <!ELEMENT tr ((ti|th)*)>
+    <!ELEMENT ti (%para.mix;)*>
+    <!ELEMENT th (%para.mix;)*>
+
+
+    <!ELEMENT e (%smallcptr.mix;)>
+
+    <!ELEMENT link (#PCDATA)>
+    <!ATTLIST link %link.attributes;>
+
+    <!ELEMENT mail (#PCDATA)>
+    <!ATTLIST mail %link.attributes;>
+
+    <!ELEMENT c (%smallcptr.mix;)>
+
+    <!ELEMENT abstract (%para.mix;)*>
+
+    <!ELEMENT author (%smallcptr.mix;)>
+    <!ATTLIST author %author.attributes;>
+    <!ELEMENT version (%smallcptr.mix;)>
+    <!ELEMENT date (%smallcptr.mix;)>
+
+    <!ELEMENT chapter (%chapter.title;,(section)+)>
+
+    <!ELEMENT section (%sect.title;,body)>
+
+    <!ELEMENT body (%body.mix;)+>
+
+<!-- ==== The ARTICLE element ==== -->
+
+    <!ELEMENT guide ((%guide.title;), (%guideinfo.class;)*, (chapter)+)>
+
+
diff --git a/app-text/gentoo-guide-xml-dtd/files/guide/guide.dtd b/app-text/gentoo-guide-xml-dtd/files/guide/guide.dtd
new file mode 100644
index 000000000000..eab05a0c6c58
--- /dev/null
+++ b/app-text/gentoo-guide-xml-dtd/files/guide/guide.dtd
@@ -0,0 +1,274 @@
+<!-- *********************************************************************
+     *** THIS IS THE FLATTENED DTD. DO NOT EDIT THIS DTD BY HAND, EDIT ***
+     *** THE CUSTOMIZATION LAYER AND REGNERATE THE FLATTENED DTD! ********
+     ********************************************************************* -->
+
+<!-- ====================================================================== -->
+
+<!-- Gentoo Guide XML V1.0 DTD
+     Copyright (C) 2001 Gentoo Foundation
+     http://www.gentoo.org/gentoo/guide
+
+     See COPYRIGHT for more information
+
+     Please direct all questions and comments about this DTD to
+     Achim Gottinger <achim@gentoo.org>.
+
+     Common declaration:
+
+     <?xml version="1.0"?>
+     <!DOCTYPE guide
+       PUBLIC "-//Gentoo//DTD Guide XML V1.0//EN"
+       "http://www.gentoo.org/gentoo/guide/guide.dtd">
+                                                                            -->
+<!-- ====================================================================== -->
+<!ENTITY lt	"&#60;">
+<!ENTITY gt	 "&#62;">
+
+<!--================== Imported Names ====================================-->
+
+<!ENTITY % URI "CDATA">
+<!ENTITY % Character "CDATA">
+<!ENTITY % Text "CDATA">
+
+<!--================== Imported Names ====================================-->
+
+<!-- Parameter Entities -->
+
+<!ENTITY % list "UL | OL">
+
+<!ENTITY % preformatted "PRE">
+
+<!-- a color using sRGB: #RRGGBB as Hex values -->
+<!ENTITY % Color "CDATA">
+
+<!-- There are also 16 widely known color names with their sRGB values:
+
+    Black  = #000000    Green  = #008000
+    Silver = #C0C0C0    Lime   = #00FF00
+    Gray   = #808080    Olive  = #808000
+    White  = #FFFFFF    Yellow = #FFFF00
+    Maroon = #800000    Navy   = #000080
+    Red    = #FF0000    Blue   = #0000FF
+    Purple = #800080    Teal   = #008080
+    Fuchsia= #FF00FF    Aqua   = #00FFFF
+ -->
+
+ <!--=================== Generic Attributes ===============================-->
+
+ <!ENTITY % coreattrs "id ID #IMPLIED">
+ <!ENTITY % attrs "%coreattrs;">
+
+ <!ENTITY % align "align (left|center|right|justify)  #IMPLIED">
+
+ <!--=================== Text Markup ======================================-->
+
+ <!ENTITY % fontstyle "I | B">
+ <!ENTITY % phrase "CODE">
+ <!ENTITY % special "A | IMG | BR | FONT">
+ <!ENTITY % inline "#PCDATA | %fontstyle; | %phrase; | %special;">
+<!ELEMENT I  (%inline;)*>
+<!ATTLIST I %attrs;>
+<!ELEMENT B  (%inline;)*>
+<!ATTLIST B %attrs;>
+<!ELEMENT CODE  (%inline;)*>
+<!ATTLIST CODE %attrs;>
+
+<!ELEMENT FONT (%inline;)*>
+<!ATTLIST FONT
+  %coreattrs;
+  size        CDATA          #IMPLIED
+  color       %Color;        #IMPLIED
+  face        CDATA          #IMPLIED
+  >
+
+<!ELEMENT BR EMPTY>
+
+<!--================== HTML content models ===============================-->
+
+<!ENTITY % block "P | %preformatted; | %list; | TABLE">
+<!ENTITY % flow "%inline; | %block;">
+
+<!--=================== Document Body ====================================-->
+
+<!ELEMENT BODY (%flow;)* >
+<!ATTLIST BODY
+  %attrs;
+>
+
+<!--================== The Anchor Element ================================-->
+
+<!ELEMENT A (%inline;)*>
+<!ATTLIST A
+    %attrs;
+    name  CDATA  #IMPLIED
+    href  %URI;  #IMPLIED
+  >
+
+<!--=================== Images ===========================================-->
+
+<!ENTITY % Length "CDATA">
+
+<!ENTITY % Pixels "CDATA">
+
+<!ENTITY % IAlign "(top|middle|bottom|left|right)">
+
+<!ELEMENT IMG EMPTY>
+<!ATTLIST IMG
+  %attrs;
+  src         %URI;          #REQUIRED
+  alt         %Text;         #IMPLIED
+  name    CDATA          #IMPLIED
+  height   %Length;       #IMPLIED
+  width     %Length;       #IMPLIED
+  align      %IAlign;       #IMPLIED
+  border      %Pixels;       #IMPLIED
+  hspace      %Pixels;       #IMPLIED
+  vspace      %Pixels;       #IMPLIED
+  >
+
+<!--=================== Paragraphs =======================================-->
+
+<!ELEMENT P (%inline;)*>
+<!ATTLIST P
+  %attrs;
+  %align;
+  >
+
+<!--=================== Preformatted Text ================================-->
+
+<!-- excludes markup for images and changes in font size -->
+<!ENTITY % pre.exclusion "IMG">
+
+<!ELEMENT PRE (#PCDATA | A | BR | FONT | %fontstyle; | %phrase;)*>
+<!ATTLIST PRE
+  %attrs;
+  >
+
+<!--=================== Lists ============================================-->
+
+<!-- definition lists - DT for term, DD for its definition -->
+
+<!ELEMENT DL  (DT|DD)+>
+<!ATTLIST DL
+  %attrs;
+  compact     (compact)      #IMPLIED
+  >
+
+<!ELEMENT DT (%inline;)*>
+<!ATTLIST DT
+  %attrs;
+  >
+
+<!ELEMENT DD (%flow;)*>
+<!ATTLIST DD
+  %attrs;
+  >
+
+<!-- Ordered lists (OL) Numbering style
+
+    1   arablic numbers     1, 2, 3, ...
+    a   lower alpha         a, b, c, ...
+    A   upper alpha         A, B, C, ...
+    i   lower roman         i, ii, iii, ...
+    I   upper roman         I, II, III, ...
+
+    The style is applied to the sequence number which by default
+    is reset to 1 for the first list item in an ordered list.
+
+    This can't be expressed directly in SGML due to case folding.
+-->
+
+<!ENTITY % OLStyle "CDATA">
+
+<!ELEMENT OL  (LI)+>
+<!ATTLIST OL
+  %attrs;
+  type        %OLStyle;      #IMPLIED
+  compact     (compact)      #IMPLIED
+  start       NMTOKEN         #IMPLIED
+  >
+
+<!-- Unordered Lists (UL) bullet styles -->
+<!ENTITY % ULStyle "(disc|square|circle)">
+
+<!ELEMENT UL (LI)+>
+<!ATTLIST UL
+  %attrs;
+  type        %ULStyle;      #IMPLIED
+  compact     (compact)      #IMPLIED
+  >
+
+<!ENTITY % LIStyle "CDATA">
+
+<!ELEMENT LI  (%flow;)*>
+<!ATTLIST LI
+  %attrs;
+  type        %LIStyle;      #IMPLIED
+  value       NMTOKEN     #IMPLIED
+  >
+
+<!--======================= Tables =======================================-->
+
+ <!-- horizontal alignment attributes for cell contents -->
+<!ENTITY % cellhalign  "align      (left|center|right|justify|char) #IMPLIED">
+
+<!-- vertical alignment attributes for cell contents -->
+<!ENTITY % cellvalign "valign (top|middle|bottom|baseline) #IMPLIED">
+
+<!ELEMENT TABLE (TR+)>
+<!ATTLIST TABLE
+  %attrs;
+  width       %Length;       #IMPLIED
+  border      %Pixels;       #IMPLIED
+  >
+
+<!ENTITY % CAlign "(top|bottom|left|right)">
+
+<!ELEMENT TR (TH|TD)+>
+<!ATTLIST TR
+  %attrs;
+  %cellhalign;
+  %cellvalign;
+  >
+
+<!-- TH is for headers, TD for data, but for cells acting as both use TD -->
+
+<!ELEMENT TH  (%flow;)*>
+<!ATTLIST TH
+  %attrs;
+  %cellhalign;
+  %cellvalign;
+  width       %Length;       #IMPLIED
+  height      %Length;       #IMPLIED
+  >
+
+<!ELEMENT TD  (%flow;)*>
+<!ATTLIST TD
+  %attrs;
+  rowspan    NMTOKEN #IMPLIED
+  colspan    NMTOKEN  #IMPLIED
+  %cellhalign;
+  %cellvalign;
+  width       %Length;       #IMPLIED
+  height      %Length;       #IMPLIED
+  >
+
+<!--===================== Gentoo Specific =================================-->
+
+<!ELEMENT TITLE (#PCDATA)>
+<!ELEMENT AUTHOR (#PCDATA)>
+<!ATTLIST AUTHOR
+    title %Text; #IMPLIED
+    email %Text; #IMPLIED
+>
+<!ELEMENT DATE (#PCDATA)>
+<!ELEMENT VERSION (#PCDATA)>
+<!ELEMENT ABSTRACT (#PCDATA)>
+<!ELEMENT CHAPTER (TITLE,SECTION+)>
+<!ATTLIST CHAPTER
+    link %Text; #IMPLIED
+    >
+
+<!ELEMENT SECTION (TITLE, BODY)>
+<!ELEMENT GUIDE (TITLE, (AUTHOR+ & DATE & VERSION? & ABSTRACT?),CHAPTER+)>
diff --git a/app-text/gentoo-guide-xml-dtd/gentoo-guide-xml-dtd-2.1-r1.ebuild b/app-text/gentoo-guide-xml-dtd/gentoo-guide-xml-dtd-2.1-r1.ebuild
new file mode 100644
index 000000000000..a9e995d76535
--- /dev/null
+++ b/app-text/gentoo-guide-xml-dtd/gentoo-guide-xml-dtd-2.1-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+inherit sgml-catalog
+
+S=${WORKDIR}
+DESCRIPTION="DTD for Gentoo-Guide Style XML Files"
+HOMEPAGE="https://www.gentoo.org"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="amd64 ppc s390 sparc x86"
+IUSE=""
+
+DEPEND=">=app-text/sgml-common-0.6.1"
+
+src_unpack() {
+	# Nothing to unpack
+	return 0
+}
+
+src_install () {
+
+	cd ${FILESDIR}
+
+	insinto /usr/share/sgml/guide
+	doins catalog
+	insinto /usr/share/sgml/guide/ent
+	doins ent/*.ent
+	insinto /usr/share/sgml/guide/xml-dtd-2.1
+	newins guide/guide-2.1.dtd guide.dtd
+
+}
+
+sgml-catalog_cat_include "/etc/sgml/gentoo-guide.cat" \
+	"/usr/share/sgml/guide/catalog"
diff --git a/app-text/gentoo-guide-xml-dtd/metadata.xml b/app-text/gentoo-guide-xml-dtd/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-text/gentoo-guide-xml-dtd/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/app-text/getxbook-1.0-r1 b/app-text/getxbook-1.0-r1
deleted file mode 100644
index 1d35b5cdb12b..000000000000
--- a/app-text/getxbook-1.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=Download books from google, amazon, barnes and noble
-EAPI=5
-HOMEPAGE=http://njw.me.uk/software/getxbook/
-IUSE=pdf djvu ocr tk
-KEYWORDS=~amd64 ~x86
-LICENSE=ISC
-RDEPEND=djvu? ( app-text/djvu ) pdf? ( media-gfx/imagemagick ) ocr? ( app-text/tesseract pdf? ( media-gfx/exact-image app-text/pdftk ) ) tk? ( dev-lang/tk:0= )
-SLOT=0
-SRC_URI=http://njw.me.uk/software/getxbook/getxbook-1.0.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=423ce76a97edcc11f8f8df64a5dadc14
diff --git a/app-text/getxbook-1.2 b/app-text/getxbook-1.2
deleted file mode 100644
index 0ce97d713a57..000000000000
--- a/app-text/getxbook-1.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=Download books from google, amazon, barnes and noble
-EAPI=6
-HOMEPAGE=http://njw.me.uk/software/getxbook/
-IUSE=pdf djvu ocr tk
-KEYWORDS=~amd64 ~x86
-LICENSE=ISC
-RDEPEND=djvu? ( app-text/djvu ) pdf? ( media-gfx/imagemagick ) ocr? ( app-text/tesseract pdf? ( media-gfx/exact-image app-text/pdftk ) ) tk? ( dev-lang/tk:0= )
-SLOT=0
-SRC_URI=http://njw.me.uk/software/getxbook/getxbook-1.2.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=127ac22853f524318872048d4075e4dc
diff --git a/app-text/getxbook/Manifest b/app-text/getxbook/Manifest
new file mode 100644
index 000000000000..2fff325e4660
--- /dev/null
+++ b/app-text/getxbook/Manifest
@@ -0,0 +1,7 @@
+AUX getxbook-1.0.patch 863 BLAKE2B 1ffbd7f11a195620ebda24e9da1aa4ea183efb0438797f0cbacce87dbbae2691f2fc0f8c61e965e86f4ed3066f2aa58c7dfef2d4828747839e773b6d8e51ecdd SHA512 3b953cafff23f01918eb910d06cc6bc81d8420fbbe18cfa3cab59458977c7a843ac62ef8789ce0883c225200593f657efce593afcd5bc9a8d87a8f30784ed0cc
+AUX getxbook-1.2.patch 853 BLAKE2B 03778bceed27f4582ffdf3fb2ac9de1fd2f6101d78e697126d86a829e5a13bf97f9ad2948feb274c10dd05ce611d7142bd9f624da19020ce891073402cbbf0d8 SHA512 04699a133cfba3d2a7d0f4eb9cb420abb93eec9b890f23130c23ea7b9e07b7a0da1b69f34aff0482acc79fe07c8abeb7de9de1163ae04d9c581d7a3f5af084a0
+DIST getxbook-1.0.tar.bz2 22314 BLAKE2B cc3b652d4c580c8a5f41a0fc58c2d7cfc9e783fe2c159fb871c0a89d8246f65f9601265e8a7b51c593ef27a726b07faa84a9d2333f2d448b1661d1dad2e48e0f SHA512 df912e67ddd823e4b1ce1539522ef0804f74758aa27baa0c568790859fac97d40dbc8f574be936fdf3ba8a1135bcc3d9af1bedf0205353d7a12f8993393fe941
+DIST getxbook-1.2.tar.xz 23776 BLAKE2B 327a35a73a5e29eefcf3f87cd8ba1237da5d045e3ef009d3ae708797fa78e6d844baa4cba2e8ff021d71951ca100e087d69a98dac3ddce953afa549b63e7e1f8 SHA512 fec397d4fd979421658f7ef9535f3c25369c8bd4ea2f9adcd719f760fd01265ed789f9eca34374b245c24acd485b951c91fa92a36d5b6401a0e0bf4db746788d
+EBUILD getxbook-1.0-r1.ebuild 935 BLAKE2B e9f6642fcda1362867dd44202c58eb0ee812bc9567d1fb97057bf8805d19e56c70e751150569b0c9cfeae0983671041c88eb9e76a137ca0d262155a947f77541 SHA512 bc0d6f4a98efbd087552ede80bef2c81645e559f2d18df1b606cf7de6379a6cf36acb7ff04ad708fdb4d01b54e65dbdf9198684289179f79a19ecbeb1c8d6bdb
+EBUILD getxbook-1.2.ebuild 936 BLAKE2B a4f057509fb8195718b53aa5491a57279eb5feeed587a3b896e7608b06db5c28ff2d15fc8f26841fd7675b211fb468741391545a8447c821a09cd04dcbd80e05 SHA512 33818a0e2e930c48d1a330691d60cabb3552b5a97d2ef692e0d1a39bf463a454e90703e0675ce7ca0e75ac59a171155425b07be3fe0b9a2cf867a62912fcb1d1
+MISC metadata.xml 635 BLAKE2B 73ed8df477413c663fd0821b3aa61301dcfeef8b3ccded5465d4903782572cde1ccef3da28f5804be740ae230a836139359f9c80cb97b70fca383a5bac8fe9a5 SHA512 297c1e817da165662e84bda74934d4493edf3cca336d48ac6e1cd7bf5bb599d9967e0fe38f0fffbafc526185b0bdbcd6244cf7c5b61fb303791e64dcfd80e504
diff --git a/app-text/getxbook/files/getxbook-1.0.patch b/app-text/getxbook/files/getxbook-1.0.patch
new file mode 100644
index 000000000000..50da6328bf8a
--- /dev/null
+++ b/app-text/getxbook/files/getxbook-1.0.patch
@@ -0,0 +1,42 @@
+ Makefile | 17 ++++++++++++-----
+ 1 file changed, 12 insertions(+), 5 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index f6507b5..d080f2b 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,5 +1,12 @@
+ # See COPYING file for copyright and license details.
+-include config.mk
++VERSION = 1.0
++RELDATE = 2012-08-19
++PREFIX = /usr
++MANPREFIX = $(PREFIX)/share/man
++CFLAGS += -std=c99 -pedantic -Wall -Wextra \
++          -D_POSIX_C_SOURCE=200112L -DVERSION=\"$(VERSION)\"
++CC ?= cc
++LD = $(CC)
+ 
+ NAME = getxbook
+ 
+@@ -20,16 +27,16 @@ $(BIN): util.a
+ 
+ .o:
+ 	@echo LD $@
+-	@$(LD) -o $@ $< util.a $(LDFLAGS)
++	$(LD) $(LDFLAGS) -o $@ $< util.a
+ 
+ .c.o:
+ 	@echo CC $<
+-	@$(CC) -c $(CFLAGS) $<
++	$(CC) -c $(CFLAGS) $<
+ 
+ util.a: $(LIB)
+ 	@echo AR $@
+-	@$(AR) -r -c $@ $(LIB)
+-	@ranlib $@
++	$(AR) -r -c $@ $(LIB)
++	$(RANLIB) $@
+ 
+ install: all
+ 	mkdir -p $(DESTDIR)$(PREFIX)/bin
diff --git a/app-text/getxbook/files/getxbook-1.2.patch b/app-text/getxbook/files/getxbook-1.2.patch
new file mode 100644
index 000000000000..da0ac83264e1
--- /dev/null
+++ b/app-text/getxbook/files/getxbook-1.2.patch
@@ -0,0 +1,35 @@
+diff -r -U2 getxbook-1.2.orig/Makefile getxbook-1.2/Makefile
+--- getxbook-1.2.orig/Makefile	2015-07-28 21:52:40.000000000 +0600
++++ getxbook-1.2/Makefile	2017-12-16 11:27:18.554822718 +0700
+@@ -1,4 +1,13 @@
+ # See COPYING file for copyright and license details.
+-include config.mk
++VERSION = 1.2
++RELDATE = 2015-07-28
++PREFIX = /usr
++MANPREFIX = $(PREFIX)/share/man
++CFLAGS += -std=c99 -pedantic -Wall -Wextra -Werror -g -D_POSIX_C_SOURCE=200112L \
++         -DVERSION=\"$(VERSION)\"
++CC ?= cc
++LD = $(CC)
++LIBS = -lssl -lcrypto
++LDFLAGS += $(LIBS)
+ 
+ NAME = getxbook
+@@ -21,13 +30,13 @@
+ .o:
+ 	@echo LD $@
+-	@$(LD) -o $@ $< util.a $(LDFLAGS)
++	$(LD) -o $@ $< util.a $(LDFLAGS)
+ 
+ .c.o:
+ 	@echo CC $<
+-	@$(CC) -c $(CFLAGS) $<
++	$(CC) -c $(CFLAGS) $<
+ 
+ util.a: $(LIB)
+ 	@echo AR $@
+-	@$(AR) -r -s -c $@ $(LIB)
++	$(AR) -r -s -c $@ $(LIB)
+ 
+ install: all
diff --git a/app-text/getxbook/getxbook-1.0-r1.ebuild b/app-text/getxbook/getxbook-1.0-r1.ebuild
new file mode 100644
index 000000000000..575f7242613f
--- /dev/null
+++ b/app-text/getxbook/getxbook-1.0-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Download books from google, amazon, barnes and noble"
+HOMEPAGE="http://njw.me.uk/software/getxbook/"
+SRC_URI="http://njw.me.uk/software/getxbook/${P}.tar.bz2"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="pdf djvu ocr tk"
+
+DEPEND=""
+RDEPEND="
+	djvu? ( app-text/djvu )
+	pdf? ( media-gfx/imagemagick )
+	ocr? (
+		app-text/tesseract
+		pdf? ( media-gfx/exact-image app-text/pdftk )
+		)
+	tk? ( dev-lang/tk:0= )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}.patch
+	tc-export CC AR RANLIB
+}
+
+src_install() {
+	DOCS=( README LEGAL )
+	default
+
+	use pdf  && dobin extras/mkpdf.sh
+	use djvu && dobin extras/mkdjvu.sh
+
+	if use ocr; then
+		dobin extras/mkocrtxt.sh
+		use pdf  && dobin extras/mkocrpdf.sh
+		use djvu && dobin extras/mkocrdjvu.sh
+	fi
+	use tk && dobin getxbookgui.tcl
+}
diff --git a/app-text/getxbook/getxbook-1.2.ebuild b/app-text/getxbook/getxbook-1.2.ebuild
new file mode 100644
index 000000000000..b1acfc5e944d
--- /dev/null
+++ b/app-text/getxbook/getxbook-1.2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Download books from google, amazon, barnes and noble"
+HOMEPAGE="http://njw.me.uk/software/getxbook/"
+SRC_URI="http://njw.me.uk/software/getxbook/${P}.tar.xz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="pdf djvu ocr tk"
+
+DEPEND=""
+RDEPEND="
+	djvu? ( app-text/djvu )
+	pdf? ( media-gfx/imagemagick )
+	ocr? (
+		app-text/tesseract
+		pdf? ( media-gfx/exact-image app-text/pdftk )
+		)
+	tk? ( dev-lang/tk:0= )"
+
+src_prepare() {
+	default
+	eapply "${FILESDIR}"/${P}.patch
+	tc-export CC AR
+}
+
+src_install() {
+	DOCS=( README LEGAL )
+	default
+
+	use pdf  && dobin extras/mkpdf.sh
+	use djvu && dobin extras/mkdjvu.sh
+
+	if use ocr; then
+		dobin extras/mkocrtxt.sh
+		use pdf  && dobin extras/mkocrpdf.sh
+		use djvu && dobin extras/mkocrdjvu.sh
+	fi
+	use tk && dobin getxbookgui.tcl
+}
diff --git a/app-text/getxbook/metadata.xml b/app-text/getxbook/metadata.xml
new file mode 100644
index 000000000000..3b5c78cf814d
--- /dev/null
+++ b/app-text/getxbook/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>grozin@gentoo.org</email>
+    <name>Andrey Grozin</name>
+  </maintainer>
+  <longdescription lang="en">
+    A collection of tools to download books from
+    google books' "book preview",
+    amazon's "look inside the book",
+    barnes and noble's "book viewer",
+    optionally using tesseract to produce OCRed pdf or djvu.
+  </longdescription>
+  <use>
+    <flag name="ocr">Use <pkg>app-text/tesseract</pkg> for optical character recognition</flag>
+  </use>
+</pkgmetadata>
diff --git a/app-text/ghostscript-gpl-9.21 b/app-text/ghostscript-gpl-9.21
deleted file mode 100644
index 2bd70f8f457f..000000000000
--- a/app-text/ghostscript-gpl-9.21
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=app-text/libpaper media-libs/fontconfig >=media-libs/freetype-2.4.9:2= media-libs/jbig2dec >=media-libs/lcms-2.6:2 >=media-libs/libpng-1.6.2:0= >=media-libs/openjpeg-2.1.0:2= >=sys-libs/zlib-1.2.7:= virtual/jpeg:0 cups? ( >=net-print/cups-1.3.8 ) dbus? ( sys-apps/dbus ) gtk? ( || ( x11-libs/gtk+:3 x11-libs/gtk+:2 ) ) unicode? ( net-dns/libidn:= ) tiff? ( >=media-libs/tiff-4.0.1:0= ) X? ( x11-libs/libXt x11-libs/libXext ) virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Ghostscript is an interpreter for the PostScript language and for PDF
-EAPI=6
-HOMEPAGE=https://ghostscript.com/
-IUSE=cups dbus gtk l10n_de static-libs tiff unicode X l10n_ja l10n_ko l10n_zh-CN l10n_zh-TW
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=AGPL-3 CPL-1.0
-RDEPEND=app-text/libpaper media-libs/fontconfig >=media-libs/freetype-2.4.9:2= media-libs/jbig2dec >=media-libs/lcms-2.6:2 >=media-libs/libpng-1.6.2:0= >=media-libs/openjpeg-2.1.0:2= >=sys-libs/zlib-1.2.7:= virtual/jpeg:0 cups? ( >=net-print/cups-1.3.8 ) dbus? ( sys-apps/dbus ) gtk? ( || ( x11-libs/gtk+:3 x11-libs/gtk+:2 ) ) unicode? ( net-dns/libidn:= ) tiff? ( >=media-libs/tiff-4.0.1:0= ) X? ( x11-libs/libXt x11-libs/libXext ) >=app-text/poppler-data-0.4.5-r1 >=media-fonts/urw-fonts-2.4.9 l10n_ja? ( media-fonts/kochi-substitute ) l10n_ko? ( media-fonts/baekmuk-fonts ) l10n_zh-CN? ( media-fonts/arphicfonts ) l10n_zh-TW? ( media-fonts/arphicfonts ) !!media-fonts/gnu-gs-fonts-std !!media-fonts/gnu-gs-fonts-other !<net-print/cups-filters-1.0.36-r2
-SLOT=0
-SRC_URI=https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs921/ghostscript-9.21.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/ghostscript-gpl-9.21-patchset-1.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=62961a11a2a1103583782c545baf3078
diff --git a/app-text/ghostscript-gpl/Manifest b/app-text/ghostscript-gpl/Manifest
new file mode 100644
index 000000000000..50aa4fd0ad01
--- /dev/null
+++ b/app-text/ghostscript-gpl/Manifest
@@ -0,0 +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 12dcddca96c1105b887ef804a1d7f6c6d5826691ee6e8ba525be77e65da82fa6f9910612ce84387ce9212c8ffffd3dacf4f10829256534582d7fb0bd09fc7cfb SHA512 b60cc50269906af827142897afb056d88a67e3ee10387d77a6b0b75d351bfb6239df41f9baa4e99d3d4f28ba38ea8849a282a0fc75e7aba25f2f707eee29f969
+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
new file mode 100644
index 000000000000..84707c85efab
--- /dev/null
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-9.21.ebuild
@@ -0,0 +1,206 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools multilib versionator flag-o-matic toolchain-funcs
+
+DESCRIPTION="Ghostscript is an interpreter for the PostScript language and for PDF"
+HOMEPAGE="https://ghostscript.com/"
+
+MY_P=${P/-gpl}
+PVM=$(get_version_component_range 1-2)
+PVM_S=$(replace_all_version_separators "" ${PVM})
+
+MY_PATCHSET=1
+
+SRC_URI="
+	https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${PVM_S}/${MY_P}.tar.xz
+	https://dev.gentoo.org/~dilfridge/distfiles/${P}-patchset-${MY_PATCHSET}.tar.xz
+"
+
+LICENSE="AGPL-3 CPL-1.0"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="cups dbus gtk l10n_de static-libs tiff unicode X"
+
+COMMON_DEPEND="
+	app-text/libpaper
+	media-libs/fontconfig
+	>=media-libs/freetype-2.4.9:2=
+	media-libs/jbig2dec
+	>=media-libs/lcms-2.6:2
+	>=media-libs/libpng-1.6.2:0=
+	>=media-libs/openjpeg-2.1.0:2=
+	>=sys-libs/zlib-1.2.7:=
+	virtual/jpeg:0
+	cups? ( >=net-print/cups-1.3.8 )
+	dbus? ( sys-apps/dbus )
+	gtk? ( || ( x11-libs/gtk+:3 x11-libs/gtk+:2 ) )
+	unicode? ( net-dns/libidn:= )
+	tiff? ( >=media-libs/tiff-4.0.1:0= )
+	X? ( x11-libs/libXt x11-libs/libXext )
+"
+
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+"
+
+RDEPEND="${COMMON_DEPEND}
+	>=app-text/poppler-data-0.4.5-r1
+	>=media-fonts/urw-fonts-2.4.9
+	l10n_ja? ( media-fonts/kochi-substitute )
+	l10n_ko? ( media-fonts/baekmuk-fonts )
+	l10n_zh-CN? ( media-fonts/arphicfonts )
+	l10n_zh-TW? ( media-fonts/arphicfonts )
+	!!media-fonts/gnu-gs-fonts-std
+	!!media-fonts/gnu-gs-fonts-other
+	!<net-print/cups-filters-1.0.36-r2
+"
+
+S="${WORKDIR}/${MY_P}"
+
+LANGS="ja ko zh-CN zh-TW"
+for X in ${LANGS} ; do
+	IUSE="${IUSE} l10n_${X}"
+done
+
+src_prepare() {
+	default
+
+	# remove internal copies of various libraries
+	rm -rf "${S}"/cups/libs || die
+	rm -rf "${S}"/expat || die
+	rm -rf "${S}"/freetype || die
+	rm -rf "${S}"/jbig2dec || die
+	rm -rf "${S}"/jpeg{,xr} || die
+	rm -rf "${S}"/lcms{,2} || die
+	rm -rf "${S}"/libpng || die
+	rm -rf "${S}"/tiff || die
+	rm -rf "${S}"/zlib || die
+	rm -rf "${S}"/openjpeg || die
+	# remove internal CMaps (CMaps from poppler-data are used instead)
+	rm -rf "${S}"/Resource/CMap || die
+
+	# apply various patches, many borrowed from Fedora
+	# http://pkgs.fedoraproject.org/cgit/ghostscript.git
+	eapply "${WORKDIR}/patches/"*.patch
+
+	if ! use gtk ; then
+		sed -i -e "s:\$(GSSOX)::" \
+			-e "s:.*\$(GSSOX_XENAME)$::" \
+			"${S}"/base/unix-dll.mak || die "sed failed"
+	fi
+
+	# Force the include dirs to a neutral location.
+	sed -i \
+		-e "/^ZLIBDIR=/s:=.*:=${T}:" \
+		configure.ac || die
+	# Some files depend on zlib.h directly.  Redirect them. #573248
+	# Also make sure to not define OPJ_STATIC to avoid linker errors due to
+	# hidden symbols (https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=203327#c1)
+	sed -i \
+		-e '/^zlib_h/s:=.*:=:' \
+		-e 's|-DOPJ_STATIC ||' \
+		base/lib.mak || die
+
+	# search path fix
+	# put LDFLAGS after BINDIR, bug #383447
+	sed -i -e "s:\$\(gsdatadir\)/lib:@datarootdir@/ghostscript/${PVM}/$(get_libdir):" \
+		-e "s:exdir=.*:exdir=@datarootdir@/doc/${PF}/examples:" \
+		-e "s:docdir=.*:docdir=@datarootdir@/doc/${PF}/html:" \
+		-e "s:GS_DOCDIR=.*:GS_DOCDIR=@datarootdir@/doc/${PF}/html:" \
+		-e 's:-L$(BINDIR):& $(LDFLAGS):g' \
+		"${S}"/Makefile.in "${S}"/base/*.mak || die "sed failed"
+
+	cd "${S}" || die
+	# remove incorrect symlink, bug 590384
+	rm -f ijs/ltmain.sh || die
+	eautoreconf
+
+	cd "${S}/ijs" || die
+	eautoreconf
+}
+
+src_configure() {
+	local FONTPATH
+	for path in \
+		"${EPREFIX}"/usr/share/fonts/urw-fonts \
+		"${EPREFIX}"/usr/share/fonts/Type1 \
+		"${EPREFIX}"/usr/share/fonts \
+		"${EPREFIX}"/usr/share/poppler/cMap/Adobe-CNS1 \
+		"${EPREFIX}"/usr/share/poppler/cMap/Adobe-GB1 \
+		"${EPREFIX}"/usr/share/poppler/cMap/Adobe-Japan1 \
+		"${EPREFIX}"/usr/share/poppler/cMap/Adobe-Japan2 \
+		"${EPREFIX}"/usr/share/poppler/cMap/Adobe-Korea1
+	do
+		FONTPATH="$FONTPATH${FONTPATH:+:}${EPREFIX}$path"
+	done
+
+	PKGCONFIG=$(type -P $(tc-getPKG_CONFIG)) \
+	econf \
+		--enable-dynamic \
+		--enable-freetype \
+		--enable-fontconfig \
+		--enable-openjpeg \
+		--disable-compile-inits \
+		--with-drivers=ALL \
+		--with-fontpath="$FONTPATH" \
+		--with-ijs \
+		--with-jbig2dec \
+		--with-libpaper \
+		--without-luratech \
+		$(use_enable cups) \
+		$(use_enable dbus) \
+		$(use_enable gtk) \
+		$(use_with cups pdftoraster) \
+		$(use_with unicode libidn) \
+		$(use_with tiff system-libtiff) \
+		$(use_with X x)
+
+	cd "${S}/ijs" || die
+	econf \
+		--enable-shared \
+		$(use_enable static-libs static)
+}
+
+src_compile() {
+	emake so all
+
+	cd "${S}/ijs" || die
+	emake
+}
+
+src_install() {
+	emake DESTDIR="${D}" install-so install
+
+	# move gsc to gs, bug #343447
+	# gsc collides with gambit, bug #253064
+	mv -f "${ED}"/usr/bin/{gsc,gs} || die
+
+	cd "${S}/ijs" || die
+	emake DESTDIR="${D}" install
+
+	# rename the original cidfmap to cidfmap.GS
+	mv "${ED}/usr/share/ghostscript/${PVM}/Resource/Init/cidfmap"{,.GS} || die
+
+	# install our own cidfmap to handle CJK fonts
+	insinto /usr/share/ghostscript/${PVM}/Resource/Init
+	doins \
+		"${WORKDIR}/fontmaps/CIDFnmap" \
+		"${WORKDIR}/fontmaps/cidfmap"
+	for X in ${LANGS} ; do
+		if use l10n_${X} ; then
+			doins "${WORKDIR}/fontmaps/cidfmap.${X/-/_}"
+		fi
+	done
+
+	# install the CMaps from poppler-data properly, bug #409361
+	dosym ../../../poppler/cMaps "/usr/share/ghostscript/${PVM}/Resource/CMap"
+
+	use static-libs || find "${ED}" -name '*.la' -delete
+
+	if ! use l10n_de; then
+		rm -r "${ED}"/usr/share/man/de || die
+	fi
+}
diff --git a/app-text/ghostscript-gpl/metadata.xml b/app-text/ghostscript-gpl/metadata.xml
new file mode 100644
index 000000000000..9f69512715cb
--- /dev/null
+++ b/app-text/ghostscript-gpl/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>printing@gentoo.org</email>
+		<name>Gentoo Printing Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">djvu</remote-id>
+		<remote-id type="github">ArtifexSoftware/ghostpdl-downloads</remote-id>
+	</upstream>
+	<use>
+		<flag name="unicode">Add support for unicode passwords via <pkg>net-dns/libidn</pkg></flag>
+	</use>
+</pkgmetadata>
diff --git a/app-text/glark-1.10.5-r1 b/app-text/glark-1.10.5-r1
deleted file mode 100644
index b57292aed0a7..000000000000
--- a/app-text/glark-1.10.5-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/logue-1.0.0[ruby_targets_ruby23] >=dev-ruby/ragol-1.0.0[ruby_targets_ruby23] >=dev-ruby/rainbow-2.0.0:2[ruby_targets_ruby23] >=dev-ruby/riel-1.2.0[ruby_targets_ruby23] zip? ( dev-ruby/rubyzip:1[ruby_targets_ruby23] ) ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rubyzip:1[ruby_targets_ruby23] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
-DESCRIPTION=File searcher similar to grep but with fancy output
-EAPI=5
-HOMEPAGE=https://github.com/jpace/glark
-IUSE=zip test elibc_FreeBSD ruby_targets_ruby23 doc test test
-KEYWORDS=amd64 ~hppa ~ppc ~sparc x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/logue-1.0.0[ruby_targets_ruby23] >=dev-ruby/ragol-1.0.0[ruby_targets_ruby23] >=dev-ruby/rainbow-2.0.0:2[ruby_targets_ruby23] >=dev-ruby/riel-1.2.0[ruby_targets_ruby23] zip? ( dev-ruby/rubyzip:1[ruby_targets_ruby23] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 )
-SLOT=0
-SRC_URI=https://github.com/jpace/glark/archive/v1.10.5.tar.gz -> glark-git-1.10.5.tgz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=c464e32ce809e44f79ac6117149f026c
diff --git a/app-text/glark/Manifest b/app-text/glark/Manifest
new file mode 100644
index 000000000000..7e0a602fb52b
--- /dev/null
+++ b/app-text/glark/Manifest
@@ -0,0 +1,3 @@
+DIST glark-git-1.10.5.tgz 196283 BLAKE2B 4c4dd08e28ff328789f6a355b95bf9d3cb2dd6a6516355ef0b8a902c4a4b88b8cf72b4cbaae73a325d578201e2223b2ef8d95924d0ababfee781d1bcd1fb9b1c SHA512 6dcad5567a10f1608925b690e86cb8c0f4be56cc4bce70410d3dd3568a191be2c3fbeaa00bea296de6d658b65b8bd081b1d5555e3e43c3f03a22d5e3d19d6c2c
+EBUILD glark-1.10.5-r1.ebuild 933 BLAKE2B 257d567e48ab6b283230cc3688894eb7b6091d6001a586ae216c5cf0dfb8c39e88eb90f7a74454a124610c33d5d4d33a0174eeb6a6fced6b923f143a58321b51 SHA512 c50d8e2436b627f2c49e97be79cdf7b1fa0e87f1051ecb96eaeace5b861a4efe2fb4f4f95e27c30a8c41f635f3f1e84ccd8c48e0d2615291f88580e21955c204
+MISC metadata.xml 452 BLAKE2B 9db99e19f53cfc3c45cc61add782d4dc302aee58adb4a153e0000047ff772429d78e2825e4ad89375b5d086bf1b1944a0bf34ed0ff059376ae97c0337c4c720d SHA512 4ad436340a3d16c7c141423ad827f585c3dc7a73db3602ac57ae3112941349f83c604a35d802ff2a3fe9efbf5614b57ec03291c07f394d84989535f24ef85a2e
diff --git a/app-text/glark/glark-1.10.5-r1.ebuild b/app-text/glark/glark-1.10.5-r1.ebuild
new file mode 100644
index 000000000000..08dedcb84c29
--- /dev/null
+++ b/app-text/glark/glark-1.10.5-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+USE_RUBY="ruby21 ruby22 ruby23"
+
+RUBY_FAKEGEM_TASK_TEST="test"
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="Features.txt History.txt README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="File searcher similar to grep but with fancy output"
+HOMEPAGE="https://github.com/jpace/glark"
+
+SRC_URI="https://github.com/jpace/glark/archive/v${PV}.tar.gz -> ${PN}-git-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~hppa ~ppc ~sparc x86"
+IUSE="zip"
+
+ruby_add_rdepend "
+	>=dev-ruby/logue-1.0.0
+	>=dev-ruby/ragol-1.0.0
+	>=dev-ruby/rainbow-2.0.0:2
+	>=dev-ruby/riel-1.2.0
+	zip? ( dev-ruby/rubyzip:1 )"
+
+ruby_add_bdepend "test? ( dev-ruby/rubyzip:1 )"
+
+all_ruby_prepare() {
+	rm -rf doc/ || die
+
+	# Fix broken links to test data.
+	sed -i -e 's:/proj/org/incava/glark/::g' $(find test -type f) || die
+}
diff --git a/app-text/glark/metadata.xml b/app-text/glark/metadata.xml
new file mode 100644
index 000000000000..f5d43635abcc
--- /dev/null
+++ b/app-text/glark/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>shell-tools@gentoo.org</email>
+    <name>Gentoo Shell Tools Project</name>
+  </maintainer>
+  <use>
+    <flag name="zip">Support for ZIP files using <pkg>dev-ruby/rubyzip</pkg></flag>
+  </use>
+  <upstream>
+    <remote-id type="github">jpace/glark</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-text/glosung-3.6.2-r1 b/app-text/glosung-3.6.2-r1
deleted file mode 100644
index eab365c57a42..000000000000
--- a/app-text/glosung-3.6.2-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=dev-libs/libxml2 >=gnome-base/gconf-2.0:2 >=gnome-base/libgnome-2 >=gnome-base/libgnomeui-2 net-misc/curl >=x11-libs/gtk+-2.10:2 >=dev-util/scons-0.93 >=dev-util/intltool-0.22 >=sys-devel/gettext-0.10 virtual/pkgconfig
-DESCRIPTION=Watch word program for the GNOME2 desktop (watch word (german): losung)
-EAPI=5
-HOMEPAGE=http://www.godehardt.org/losung.html
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+
-RDEPEND=dev-libs/libxml2 >=gnome-base/gconf-2.0:2 >=gnome-base/libgnome-2 >=gnome-base/libgnomeui-2 net-misc/curl >=x11-libs/gtk+-2.10:2
-SLOT=0
-SRC_URI=mirror://sourceforge/glosung/glosung-3.6.2.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=87c670bf33739850a6cecfddb5443bf6
diff --git a/app-text/glosung-3.6.4 b/app-text/glosung-3.6.4
deleted file mode 100644
index c0c9c3ee01a7..000000000000
--- a/app-text/glosung-3.6.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=dev-libs/libxml2 >=gnome-base/gconf-2.0:2 >=gnome-base/libgnome-2 >=gnome-base/libgnomeui-2 net-misc/curl >=x11-libs/gtk+-2.10:2 >=dev-util/scons-0.93 >=dev-util/intltool-0.22 >=sys-devel/gettext-0.10 virtual/pkgconfig
-DESCRIPTION=Watch word program for the GNOME2 desktop (watch word (german): losung)
-EAPI=6
-HOMEPAGE=http://www.godehardt.org/losung.html
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+
-RDEPEND=dev-libs/libxml2 >=gnome-base/gconf-2.0:2 >=gnome-base/libgnome-2 >=gnome-base/libgnomeui-2 net-misc/curl >=x11-libs/gtk+-2.10:2
-SLOT=0
-SRC_URI=mirror://sourceforge/glosung/glosung-3.6.4.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=eb6bdfcc0bd04720a11bbb5155d71d6b
diff --git a/app-text/glosung/Manifest b/app-text/glosung/Manifest
new file mode 100644
index 000000000000..c2e577dde849
--- /dev/null
+++ b/app-text/glosung/Manifest
@@ -0,0 +1,10 @@
+AUX glosung-3.6.2-glib-includes.patch 329 BLAKE2B 79feae4ab17b1647b57807db8ff8346620548c9498a0329d97e76a6aacbeb7aae0e8cfc3d234717f24d715d310c14909c0d0ceeef6d8be4090be93e5386bc929 SHA512 cceb87873bb1b617f0d550d0d1818e21705c9894015a6c8bbd6050365af580956fcf6f79289cc0ac619552ec170af3f42f5222c5733548f7eb5d3fd303733044
+AUX glosung-3.6.2-scons-2.3.2-respectflags.patch 1701 BLAKE2B 7bd71dfacfee19d6466fd4462c6e918dba46f362fdf2bb300128b1f651fe6e777514cd3d1225f752a375371841fc86317f222894e7b33be415d04d9f0402277d SHA512 6b2dfabc97cc87280a8078accd5d39bbae47b3d03db9efc85b820da135c6231683916cdae3a00dcd662d3c74332322997579370bf7b539f15ea033786d4fbb70
+AUX glosung-3.6.2-scons-respectflags.patch 1720 BLAKE2B eb83fc529227215002bd8029e6870ce4d8c5aaef8170d36c3ad25fc4a583f0d8e764b869180590ff6fa13bd52ab728979867b0b71a2f34038493abb022ece480 SHA512 e2ab10f723fa30e9aec8f10fe629711228ee4d08076095fdf3879bc23da1f15fe991367272d55c5490f96255100a6024c96f639613f6a402b3112fb68ae29520
+AUX glosung-3.6.4-scons-respectflags.patch 1785 BLAKE2B e9580d582a76c43345b133bcae6f3ed339e55f02e2c2037d80dd08592b87efafb65e63ec5224036199597b0973abdd3bf374b1cb66a03dcf9663cbaee3a26526 SHA512 7cedc550a6cc3902c38deac26016facf1383c581d03b2cbc4fc484c0ba0cd332bba5496904325a09c8416595fa14c92b1db320f902fd1acaa515e1e8d4da4b8c
+AUX glosung.desktop 374 BLAKE2B aca6f33d8f89df4878cb2ffc313c1187f551bf4814bc174370c0cb028b8ec51fa22ff76b95dd1ecbda5bf2687cf6e63040c2968a4e3d540f1e472f51fc72be50 SHA512 3afccd76f801b61690eda4e7902aa3abe048a241dbbe31dc17670611d0463acbf5f54536d59f8b6da2d55423b62bdb0b16c30c241cca27b0774908e067d280a2
+DIST glosung-3.6.2.tar.bz2 65089 BLAKE2B 247cca9079c361316f3f3648667ffe18e9bd8c62c30d2944f07840ffca2972d9cedadfef7da6a05944c141351805cf170248729a10b577aad0846f75e8e09454 SHA512 a9e16f9202092e6b73ca640787785fd6985ea1ba914260b783bf8f4b6ebbd6ed807cbdec5381059a2f905fae31b7aa844844ae2f9df0379c60e1251140760b11
+DIST glosung-3.6.4.tar.bz2 71887 BLAKE2B f5e2d2c54e4d66daf175961e78eadcd67dee04e0713e084de877068ea34cb63ff09f100195d1d902174c18b0842aaabb007dac4f67cd2d8d3ba7ecaacbd2c700 SHA512 c4f51d2569e0c74bddf6806551c314a337d573cd10ab1b6dc04c735c24e4e3e679af35b5d7340d7917e6f4c1fd2b4dec283205c5f744b8c020630ba428738349
+EBUILD glosung-3.6.2-r1.ebuild 1232 BLAKE2B e374c86fdc0e2ec8dce9b9bb28726722bab7ebdd35d2c354b15c0dfacefe811f445e16f0d587dcec8cd87d7547f00cf3acca181d9c99ad0b3031be8e90dbcff3 SHA512 5497faa310f62402217930b38b51cb4882abb839bac0f89403296c10604d2a5c5e6bc4cb800ad77c5facb1ae4454a49c4ff4a3a5dc2491842c16de27077babe8
+EBUILD glosung-3.6.4.ebuild 1040 BLAKE2B 1fe44bb3c3dc41aecd30dd769aa6c0bc1c30b7d4c9c2dfa3e51e7157600ed005b01cb6a035e3ea74fa48430ee83f03d355704ab7da67a36877417605fdb2d99e SHA512 d8250228f1941331ac9ff867affd2ea6a42041eeb03ba832dbeb0e63361955390503cb396e9dc031c5b21bd090e9f9d78dd95b97adc51ba151d782df73bef7ab
+MISC metadata.xml 297 BLAKE2B fc1d1b5292ad79937c9356f138153f5183994bc8a9a31d614d3540f91c07d8b6b64a251c53337ceeb7e42ed506822c2501f8d3bf43e7611d93e930b12839dd66 SHA512 4e9f59f67c171aa9fef3056f2231632fe454646bd45a1170d996f99ba5ab4ab08bc8194f7c1a345f405331dd5bd302d10e57379760eaf867dc69f200884dd8f8
diff --git a/app-text/glosung/files/glosung-3.6.2-glib-includes.patch b/app-text/glosung/files/glosung-3.6.2-glib-includes.patch
new file mode 100644
index 000000000000..715b201ca64f
--- /dev/null
+++ b/app-text/glosung/files/glosung-3.6.2-glib-includes.patch
@@ -0,0 +1,11 @@
+diff -ruN glosung-3.6.2/src/losung.c glosung-3.6.2-patched/src/losung.c
+--- glosung-3.6.2/src/losung.c	2010-01-04 15:28:38.000000000 -0500
++++ glosung-3.6.2-patched/src/losung.c	2013-01-21 14:34:14.318711560 -0500
+@@ -31,7 +31,6 @@
+ #endif /* WIN32 */
+ 
+ #include <glib/gi18n.h>
+-#include <glib/goption.h>
+ 
+ #include "util.h"
+ 
diff --git a/app-text/glosung/files/glosung-3.6.2-scons-2.3.2-respectflags.patch b/app-text/glosung/files/glosung-3.6.2-scons-2.3.2-respectflags.patch
new file mode 100644
index 000000000000..0f4ac73a06bd
--- /dev/null
+++ b/app-text/glosung/files/glosung-3.6.2-scons-2.3.2-respectflags.patch
@@ -0,0 +1,63 @@
+--- a/SConstruct
++++ b/SConstruct
+@@ -17,6 +17,7 @@
+ 
+ 
+ import os
++import SCons.Util
+ 
+ version = '3.6.2'
+ 
+@@ -32,14 +33,22 @@
+                               (this option is only for packaging)''')
+ 
+ env = Environment (
+-  LINK      = 'gcc',
+-  CC        = 'gcc',
+   CPPPATH   = '',
+   LINKFLAGS = '',
+   CCFLAGS   = '',
+   ENV       = os.environ,
+   TARFLAGS  = '-c -j')
+ 
++if os.environ.has_key('CC'):
++	env['CC'] = os.environ['CC']
++if os.environ.has_key('CFLAGS'):
++	env['CCFLAGS'] += SCons.Util.CLVar(os.environ['CFLAGS'])
++if os.environ.has_key('CXX'):
++	env['CXX'] = os.environ['CXX']
++if os.environ.has_key('CXXFLAGS'):
++	env['CXXFLAGS'] += SCons.Util.CLVar(os.environ['CXXFLAGS'])
++if os.environ.has_key('LDFLAGS'):
++	env['LINKFLAGS'] += SCons.Util.CLVar(os.environ['LDFLAGS'])
+ 
+ if env['PLATFORM'] == 'win32':
+ 	prefix      = ARGUMENTS.get ('PREFIX', '')
+@@ -58,7 +68,7 @@
+ BuildDir ('build', 'src')
+ 
+ cpppath = ['#', '#build']
+-ccflags   = ['-O2', '-std=c99', '-Wall', '-g', '-Wl,--export-dynamic',
++ccflags   = ['-std=c99',
+ #		'-DLIBXML_STATIC',
+ 		'-DVERSION=\\"' + version + '\\"',
+ 		'-DGLOSUNG_DATA_DIR=\\"' + data_dir + '\\"',
+@@ -74,7 +74,7 @@
+ 		'-DGLOSUNG_DATA_DIR=\\"' + data_dir + '\\"',
+ 		'-DPACKAGE_PIXMAPS_DIR=\\"' + pixmap_dir + '\\"']
+ 
+-linkflags = ['-Wl,--export-dynamic', '-L.']
++linkflags = []
+ #  -L/usr/lib'
+ #             `pkg-config --libs gtk+-2.0 libxml-2.0 gconf-2.0 libcurl`
+
+@@ -83,9 +83,6 @@
+     ccflags.append   ('-pg', '-fprofile-arcs')
+     linkflags.append ('-pg', '-fprofile-arcs')
+ 
+-if env['PLATFORM'] != 'win32':
+-        linkflags.append ('-Wl,--as-needed')
+-
+ #if not (ARGUMENTS.get ('dev')):
+ if (ARGUMENTS.get ('dev')):
+     ccflags   += [
diff --git a/app-text/glosung/files/glosung-3.6.2-scons-respectflags.patch b/app-text/glosung/files/glosung-3.6.2-scons-respectflags.patch
new file mode 100644
index 000000000000..15c12bf94888
--- /dev/null
+++ b/app-text/glosung/files/glosung-3.6.2-scons-respectflags.patch
@@ -0,0 +1,64 @@
+--- a/SConstruct
++++ b/SConstruct
+@@ -17,6 +17,7 @@
+ 
+ 
+ import os
++import SCons.Util
+ 
+ version = '3.6.2'
+ 
+@@ -32,14 +33,23 @@
+                               (this option is only for packaging)''')
+ 
+ env = Environment (
+-  LINK      = 'gcc',
+-  CC        = 'gcc',
++  CC        = '',
+   CPPPATH   = '',
+   LINKFLAGS = '',
+   CCFLAGS   = '',
+   ENV       = os.environ,
+   TARFLAGS  = '-c -j')
+ 
++if os.environ.has_key('CC'):
++	env['CC'] = os.environ['CC']
++if os.environ.has_key('CFLAGS'):
++	env['CCFLAGS'] += SCons.Util.CLVar(os.environ['CFLAGS'])
++if os.environ.has_key('CXX'):
++	env['CXX'] = os.environ['CXX']
++if os.environ.has_key('CXXFLAGS'):
++	env['CXXFLAGS'] += SCons.Util.CLVar(os.environ['CXXFLAGS'])
++if os.environ.has_key('LDFLAGS'):
++	env['LINKFLAGS'] += SCons.Util.CLVar(os.environ['LDFLAGS'])
+ 
+ if env['PLATFORM'] == 'win32':
+ 	prefix      = ARGUMENTS.get ('PREFIX', '')
+@@ -58,7 +68,7 @@
+ BuildDir ('build', 'src')
+ 
+ cpppath = ['#', '#build']
+-ccflags   = ['-O2', '-std=c99', '-Wall', '-g', '-Wl,--export-dynamic',
++ccflags   = ['-std=c99',
+ #		'-DLIBXML_STATIC',
+ 		'-DVERSION=\\"' + version + '\\"',
+ 		'-DGLOSUNG_DATA_DIR=\\"' + data_dir + '\\"',
+@@ -74,7 +74,7 @@
+ 		'-DGLOSUNG_DATA_DIR=\\"' + data_dir + '\\"',
+ 		'-DPACKAGE_PIXMAPS_DIR=\\"' + pixmap_dir + '\\"']
+ 
+-linkflags = ['-Wl,--export-dynamic', '-L.']
++linkflags = []
+ #  -L/usr/lib'
+ #             `pkg-config --libs gtk+-2.0 libxml-2.0 gconf-2.0 libcurl`
+
+@@ -83,9 +83,6 @@
+     ccflags.append   ('-pg', '-fprofile-arcs')
+     linkflags.append ('-pg', '-fprofile-arcs')
+ 
+-if env['PLATFORM'] != 'win32':
+-        linkflags.append ('-Wl,--as-needed')
+-
+ #if not (ARGUMENTS.get ('dev')):
+ if (ARGUMENTS.get ('dev')):
+     ccflags   += [
diff --git a/app-text/glosung/files/glosung-3.6.4-scons-respectflags.patch b/app-text/glosung/files/glosung-3.6.4-scons-respectflags.patch
new file mode 100644
index 000000000000..9adece925b19
--- /dev/null
+++ b/app-text/glosung/files/glosung-3.6.4-scons-respectflags.patch
@@ -0,0 +1,61 @@
+diff -ruN glosung-3.6.4-original/SConstruct glosung-3.6.4/SConstruct
+--- glosung-3.6.4-original/SConstruct	2016-01-22 22:11:00.785053522 -0500
++++ glosung-3.6.4/SConstruct	2016-01-22 22:14:04.434058592 -0500
+@@ -17,6 +17,7 @@
+ 
+ 
+ import os
++import SCons.Util
+ 
+ version = '3.6.4'
+ 
+@@ -32,14 +33,23 @@
+                               (this option is only for packaging)''')
+ 
+ env = Environment (
+-  LINK      = 'gcc',
+-  CC        = 'gcc',
+   CPPPATH   = '',
+   LINKFLAGS = '',
+   CCFLAGS   = '',
+   ENV       = os.environ,
+   TARFLAGS  = '-c -j')
+ 
++if os.environ.has_key('CC'):
++	env['CC'] = os.environ['CC']
++if os.environ.has_key('CFLAGS'):
++	env['CCFLAGS'] += SCons.Util.CLVar(os.environ['CFLAGS'])
++if os.environ.has_key('CXX'):
++	env['CXX'] = os.environ['CXX']
++if os.environ.has_key('CXXFLAGS'):
++	env['CXXFLAGS'] += SCons.Util.CLVar(os.environ['CXXFLAGS'])
++if os.environ.has_key('LDFLAGS'):
++	env['LINKFLAGS'] += SCons.Util.CLVar(os.environ['LDFLAGS'])
++
+ if env['PLATFORM'] == 'win32':
+ 	prefix      = ARGUMENTS.get ('PREFIX', '')
+ 	install_dir = ARGUMENTS.get ('DESTDIR', '')
+@@ -57,21 +67,18 @@
+ VariantDir('build', 'src')
+ 
+ cpppath = ['#', '#build']
+-ccflags   = ['-O2', '-std=c99', '-Wall', '-g',
++ccflags   = ['-std=c99',
+ #		'-DLIBXML_STATIC',
+ 		'-DVERSION=\\"' + version + '\\"',
+ 		'-DGLOSUNG_DATA_DIR=\\"' + data_dir + '\\"',
+ 		'-DPACKAGE_PIXMAPS_DIR=\\"' + pixmap_dir + '\\"']
+ 
+-linkflags = ['-L.']             
++linkflags = []             
+ 
+ if ARGUMENTS.get ('profile'):
+     ccflags.append   ('-pg', '-fprofile-arcs')
+     linkflags.append ('-pg', '-fprofile-arcs', '-Wl,--export-dynamic')
+ 
+-if env['PLATFORM'] != 'win32':
+-        linkflags.append ('-Wl,--as-needed')
+-
+ #if not (ARGUMENTS.get ('dev')):
+ if (ARGUMENTS.get ('dev')):
+     ccflags   += [
diff --git a/app-text/glosung/files/glosung.desktop b/app-text/glosung/files/glosung.desktop
new file mode 100644
index 000000000000..7372b0f47123
--- /dev/null
+++ b/app-text/glosung/files/glosung.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Name=GLosung - Herrnhut's Watchwords
+Name[de]=GLosung - Herrnhuter Losungen
+Name[hu]=GLosung - Herrnhuter-i Útmutató
+Comment=Gods Word for every day
+Comment[de]=Gottes Wort für jeden Tag
+Comment[hu]=Isten igéje minden napra
+Exec=glosung
+Icon=/usr/share/glosung/glosung.png
+Terminal=false
+Type=Application
+Categories=Utility;X-Red-Hat-Extra;Spirituality;
diff --git a/app-text/glosung/glosung-3.6.2-r1.ebuild b/app-text/glosung/glosung-3.6.2-r1.ebuild
new file mode 100644
index 000000000000..6bf0c06d72a6
--- /dev/null
+++ b/app-text/glosung/glosung-3.6.2-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+DESCRIPTION="Watch word program for the GNOME2 desktop (watch word (german): losung)"
+HOMEPAGE="http://www.godehardt.org/losung.html"
+SRC_URI="mirror://sourceforge/glosung/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="
+	dev-libs/libxml2
+	>=gnome-base/gconf-2.0:2
+	>=gnome-base/libgnome-2
+	>=gnome-base/libgnomeui-2
+	net-misc/curl
+	>=x11-libs/gtk+-2.10:2
+"
+
+DEPEND="${RDEPEND}
+	>=dev-util/scons-0.93
+	>=dev-util/intltool-0.22
+	>=sys-devel/gettext-0.10
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-3.6.2-glib-includes.patch"
+	if has_version '>=dev-util/scons-2.3.2'; then
+		epatch "${FILESDIR}/${PN}-3.6.2-scons-2.3.2-respectflags.patch"
+	else
+		epatch "${FILESDIR}/${PN}-3.6.2-scons-respectflags.patch"
+	fi
+}
+
+src_compile() {
+	tc-export CC
+	scons ${MAKEOPTS} || die "scons make died"
+}
+
+src_install() {
+	scons install DESTDIR="${D}" || die "scons install died"
+	#Ships with an ISO-8859 encoded .desktop file, which causes validation to fail, so ship a UTF-8 version
+	cp "${FILESDIR}/glosung.desktop" "${D}/usr/share/applications"
+}
diff --git a/app-text/glosung/glosung-3.6.4.ebuild b/app-text/glosung/glosung-3.6.4.ebuild
new file mode 100644
index 000000000000..581b7533a9f3
--- /dev/null
+++ b/app-text/glosung/glosung-3.6.4.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils toolchain-funcs
+DESCRIPTION="Watch word program for the GNOME2 desktop (watch word (german): losung)"
+HOMEPAGE="http://www.godehardt.org/losung.html"
+SRC_URI="mirror://sourceforge/glosung/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+PATCHES=("${FILESDIR}/${PN}-3.6.4-scons-respectflags.patch")
+
+RDEPEND="
+	dev-libs/libxml2
+	>=gnome-base/gconf-2.0:2
+	>=gnome-base/libgnome-2
+	>=gnome-base/libgnomeui-2
+	net-misc/curl
+	>=x11-libs/gtk+-2.10:2
+"
+
+DEPEND="${RDEPEND}
+	>=dev-util/scons-0.93
+	>=dev-util/intltool-0.22
+	>=sys-devel/gettext-0.10
+	virtual/pkgconfig
+"
+
+src_compile() {
+	tc-export CC
+	scons ${MAKEOPTS} || die "scons make died"
+}
+
+src_install() {
+	scons install DESTDIR="${D}" || die "scons install died"
+	#Ships with an ISO-8859 encoded .desktop file, which causes validation to fail, so ship a UTF-8 version
+	cp "${FILESDIR}/glosung.desktop" "${D}/usr/share/applications"
+}
diff --git a/app-text/glosung/metadata.xml b/app-text/glosung/metadata.xml
new file mode 100644
index 000000000000..88f24ae3103f
--- /dev/null
+++ b/app-text/glosung/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>theology@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">glosung</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/gnome-doc-utils-0.20.10-r1 b/app-text/gnome-doc-utils-0.20.10-r1
deleted file mode 100644
index 6b7303c9e8c5..000000000000
--- a/app-text/gnome-doc-utils-0.20.10-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-libs/libxml2-2.6.12:2[python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-libs/libxslt-1.1.8 app-text/docbook-xml-dtd:4.4 app-text/scrollkeeper-dtd >=dev-util/intltool-0.35 sys-devel/gettext virtual/awk virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A collection of documentation utilities for the Gnome project
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Projects/GnomeDocUtils
-IUSE=python_targets_python2_7
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-libs/libxml2-2.6.12:2[python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-libs/libxslt-1.1.8
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://gnome/sources/gnome-doc-utils/0.20/gnome-doc-utils-0.20.10.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5d6d1c055f754b5ea6d2be80c8edb32e
diff --git a/app-text/gnome-doc-utils/Manifest b/app-text/gnome-doc-utils/Manifest
new file mode 100644
index 000000000000..7dcb92ada6d6
--- /dev/null
+++ b/app-text/gnome-doc-utils/Manifest
@@ -0,0 +1,4 @@
+AUX gnome-doc-utils-0.20.10-fix-out-of-tree-build.patch 2101 BLAKE2B f1970ffe2cf1d369ffc3f3a5a6abea2f04fb32cfdc54dde9052ef468c2a274db2318495c80ec1ef0048fb65df8209bacb86392d9ff594fdc60ea92ebb85584ab SHA512 25cff56b05bf4ec0ca55a6fcab1700bd6bec9f60a923e14607fd894bd9b63cd669a4e3e9b7bacc0480e040e393370be05f237ea21074cb439a3cf176be0dd78c
+DIST gnome-doc-utils-0.20.10.tar.xz 526700 BLAKE2B 6019aa9b1d2c8153ddc1e6af589f79628ceafb6c14b0de5dc8f9ef518b5e626bbafdc2a4d93bfb70c6823ba0605a5abe899989e9f893c976d7a5fcd9c99a90dc SHA512 1cb5e3b9ca9e45e6c551801e9c9c4aac725c2ce85238c230a4c70b36c90419886b921d8dd464df0643fc3bbb877df075abaa83a36d1609c5664960c31e11d151
+EBUILD gnome-doc-utils-0.20.10-r1.ebuild 1767 BLAKE2B 235efe543fd6d785221578094b73f9a7aa2773e3833825141d6a68455bfb164c7005963563db4445833b3ee6b5ee9e3f0272e5411926b1cf5bd95f2f9453bb00 SHA512 0b968123c33ebdbf84d4b9966a12714ee8c2ce5a1b8b2da3b8135ba068505f24f52fea1e9f67a36fa6a730d94103d437e9a7c5fb8b86f6d459bb507d049b9824
+MISC metadata.xml 259 BLAKE2B 32f8c5208a55a1dda504b7df969127393a2c70e672aba383fcdc870de8fe778366d3dde3c3313bd043068d2e7831d1e18bad6fb428e82266fc2a630104e0a193 SHA512 fbef629394690b3a5608abc6344816f6acf1e8e2663f29949fd14a662c628f16fee77a1ec1641066806d143fb94c1571bc5b46b829dc53620af6956377fe15cc
diff --git a/app-text/gnome-doc-utils/files/gnome-doc-utils-0.20.10-fix-out-of-tree-build.patch b/app-text/gnome-doc-utils/files/gnome-doc-utils-0.20.10-fix-out-of-tree-build.patch
new file mode 100644
index 000000000000..eecc54560695
--- /dev/null
+++ b/app-text/gnome-doc-utils/files/gnome-doc-utils-0.20.10-fix-out-of-tree-build.patch
@@ -0,0 +1,30 @@
+--- a/bootstrap.make	2013-04-11 20:34:59.015015386 +0200
++++ b/bootstrap.make	2013-04-11 20:35:26.710082615 +0200
+@@ -1,4 +1,4 @@
+-_xml2po = PYTHONPATH="$(shell pwd)/$(top_builddir)/xml2po:$(shell pwd)/$(top_srcdir)/xml2po:$(PYTHONPATH)" "$(shell pwd)/$(top_builddir)/xml2po/xml2po/xml2po"
++_xml2po = PYTHONPATH="$(abs_top_builddir)/xml2po:$(abs_top_srcdir)/xml2po:$(PYTHONPATH)" "$(abs_top_builddir)/xml2po/xml2po/xml2po"
+ 
+ _db2html = $(top_srcdir)/xslt/docbook/html/db2html.xsl
+ _db2omf  = $(top_srcdir)/xslt/docbook/omf/db2omf.xsl
+--- a/doc/xslt/Makefile.in	2013-05-10 12:57:46.804104663 +0200
++++ b/doc/xslt/Makefile.in	2013-05-10 12:58:12.434908022 +0200
+@@ -340,7 +340,7 @@
+ _clean_lc = $(if $(_DOC_REAL_LINGUAS),clean-doc-lc)
+ _clean_dir = $(if $(DOC_MODULE)$(DOC_ID),clean-doc-dir)
+ _doc_install_dir = $(if $(DOC_ID),$(DOC_ID),$(DOC_MODULE))
+-_xml2po = PYTHONPATH="$(shell pwd)/$(top_builddir)/xml2po:$(shell pwd)/$(top_srcdir)/xml2po:$(PYTHONPATH)" "$(shell pwd)/$(top_builddir)/xml2po/xml2po/xml2po"
++_xml2po = PYTHONPATH="$(abs_top_builddir)/xml2po:$(abs_top_srcdir)/xml2po:$(PYTHONPATH)" "$(abs_top_builddir)/xml2po/xml2po/xml2po"
+ _db2html = $(top_srcdir)/xslt/docbook/html/db2html.xsl
+ _db2omf = $(top_srcdir)/xslt/docbook/omf/db2omf.xsl
+ _chunks = $(top_srcdir)/xslt/docbook/utils/chunks.xsl
+--- a/doc/gnome-doc-make/Makefile.in	2013-05-10 12:57:46.804104663 +0200
++++ b/doc/gnome-doc-make/Makefile.in	2013-05-10 12:58:12.434908022 +0200
+@@ -340,7 +340,7 @@
+ _clean_lc = $(if $(_DOC_REAL_LINGUAS),clean-doc-lc)
+ _clean_dir = $(if $(DOC_MODULE)$(DOC_ID),clean-doc-dir)
+ _doc_install_dir = $(if $(DOC_ID),$(DOC_ID),$(DOC_MODULE))
+-_xml2po = PYTHONPATH="$(shell pwd)/$(top_builddir)/xml2po:$(shell pwd)/$(top_srcdir)/xml2po:$(PYTHONPATH)" "$(shell pwd)/$(top_builddir)/xml2po/xml2po/xml2po"
++_xml2po = PYTHONPATH="$(abs_top_builddir)/xml2po:$(abs_top_srcdir)/xml2po:$(PYTHONPATH)" "$(abs_top_builddir)/xml2po/xml2po/xml2po"
+ _db2html = $(top_srcdir)/xslt/docbook/html/db2html.xsl
+ _db2omf = $(top_srcdir)/xslt/docbook/omf/db2omf.xsl
+ _chunks = $(top_srcdir)/xslt/docbook/utils/chunks.xsl
diff --git a/app-text/gnome-doc-utils/gnome-doc-utils-0.20.10-r1.ebuild b/app-text/gnome-doc-utils/gnome-doc-utils-0.20.10-r1.ebuild
new file mode 100644
index 000000000000..132d14159a00
--- /dev/null
+++ b/app-text/gnome-doc-utils/gnome-doc-utils-0.20.10-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit gnome2 multibuild python-r1
+
+DESCRIPTION="A collection of documentation utilities for the Gnome project"
+HOMEPAGE="https://wiki.gnome.org/Projects/GnomeDocUtils"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	>=dev-libs/libxml2-2.6.12:2[python,${PYTHON_USEDEP}]
+	>=dev-libs/libxslt-1.1.8
+"
+DEPEND="${RDEPEND}
+	app-text/docbook-xml-dtd:4.4
+	app-text/scrollkeeper-dtd
+	>=dev-util/intltool-0.35
+	sys-devel/gettext
+	virtual/awk
+	virtual/pkgconfig
+"
+# dev-libs/glib needed for eautofoo, bug #255114.
+
+# If there is a need to reintroduce eautomake or eautoreconf, make sure
+# to AT_M4DIR="tools m4", bug #224609 (m4 removes glib build time dep)
+
+src_prepare() {
+	# Stop build from relying on installed package
+	eapply "${FILESDIR}"/${P}-fix-out-of-tree-build.patch
+
+	gnome2_src_prepare
+
+	# Leave shebang alone
+	sed -e '/s+^#!.*python.*+#/d' \
+		-i xml2po/xml2po/Makefile.{am,in} || die
+
+	python_prepare() {
+		mkdir -p "${BUILD_DIR}"
+	}
+	python_foreach_impl python_prepare
+}
+
+src_configure() {
+	ECONF_SOURCE="${S}" python_foreach_impl run_in_build_dir gnome2_src_configure
+}
+
+src_compile() {
+	MAKEOPTS="${MAKEOPTS} -j1" python_foreach_impl run_in_build_dir gnome2_src_compile #574282
+}
+
+src_test() {
+	python_foreach_impl run_in_build_dir default
+}
+
+src_install() {
+	python_foreach_impl run_in_build_dir gnome2_src_install
+	python_replicate_script "${ED}"/usr/bin/xml2po
+}
diff --git a/app-text/gnome-doc-utils/metadata.xml b/app-text/gnome-doc-utils/metadata.xml
new file mode 100644
index 000000000000..4cbddcaa19ad
--- /dev/null
+++ b/app-text/gnome-doc-utils/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>gnome@gentoo.org</email>
+    <name>Gentoo GNOME Desktop</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-text/gnopaster-0.0.9 b/app-text/gnopaster-0.0.9
deleted file mode 100644
index 0ca9d5af5f93..000000000000
--- a/app-text/gnopaster-0.0.9
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-lang/perl dev-perl/libwww-perl dev-perl/Config-Simple
-DESCRIPTION=A submitter for gnopaste, a nopaste service like http://nopaste.info
-EAPI=0
-HOMEPAGE=http://gnopaste.sf.net
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl dev-perl/libwww-perl dev-perl/Config-Simple
-SLOT=0
-SRC_URI=mirror://sourceforge/gnopaste/gnopaster-0.0.9.pl.gz
-_md5_=79eb1b413e6dfe2335884f9ef85540c0
diff --git a/app-text/gnopaster/Manifest b/app-text/gnopaster/Manifest
new file mode 100644
index 000000000000..d173388bed74
--- /dev/null
+++ b/app-text/gnopaster/Manifest
@@ -0,0 +1,3 @@
+DIST gnopaster-0.0.9.pl.gz 2791 BLAKE2B e83b1163bfe520a33b7cf8e76eccd35051bab4bc816bba0ec24e2655e7f47fec2ddb8dbc6f0aaeb804feadf1ef4e41b4e8148d7b3f03a6e0c586c34bfea47791 SHA512 db7f6ffa7e0d4d9c4fcfaf830ee0b9aa40736ef8e67b12b8de4a4a0ad9e02964fa4c5b8521fed6299c336fb7ecd7cbfe8a9f7b2b0d5ed823545b5e67ff6c48cc
+EBUILD gnopaster-0.0.9.ebuild 488 BLAKE2B 69911181cef228c8a9b3d534a7750f257bcf872a28a8d4eda00fec6eedb3da79feee475a2712d87201d9980c760c06058457cf04a57936a01098862b8939139e SHA512 30ec23beeaa5b59f5b9ac3f5c2c8bc220bc26d5bab5dd66208065598e55c061d3859816be215346caf8fc1a37d8e904004d7f534bbbdd05d40c7ec3e25fe3317
+MISC metadata.xml 245 BLAKE2B 6f67aa02d51bd19681070c5991e15578c370a6a5e629814c6fe22f112dc18e571b47f4e38cef704f3d1c560fca9c3ea48c865880d5d4521f2e2415e7fa13db4e SHA512 09853ccf6aa61683ae8b490342245ae8d790a246a91c1ee165aa3f9905a7a002b974d8dff65381432a859682900ff02875b819afff856194d9c92ef0d99d70cf
diff --git a/app-text/gnopaster/gnopaster-0.0.9.ebuild b/app-text/gnopaster/gnopaster-0.0.9.ebuild
new file mode 100644
index 000000000000..d4ff316741bf
--- /dev/null
+++ b/app-text/gnopaster/gnopaster-0.0.9.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+DESCRIPTION="A submitter for gnopaste, a nopaste service like http://nopaste.info"
+HOMEPAGE="http://gnopaste.sf.net"
+SRC_URI="mirror://sourceforge/gnopaste/${P}.pl.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+DEPEND="dev-lang/perl
+	dev-perl/libwww-perl
+	dev-perl/Config-Simple"
+
+src_install() {
+	dobin ${WORKDIR}/${P}.pl
+	dosym ${P}.pl /usr/bin/${PN}
+}
diff --git a/app-text/gnopaster/metadata.xml b/app-text/gnopaster/metadata.xml
new file mode 100644
index 000000000000..bf00a5257491
--- /dev/null
+++ b/app-text/gnopaster/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="sourceforge">gnopaste</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/gocr-0.49 b/app-text/gocr-0.49
deleted file mode 100644
index 01fe981213b8..000000000000
--- a/app-text/gocr-0.49
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=>=media-libs/netpbm-9.12 doc? ( >=media-gfx/transfig-3.2 app-text/ghostscript-gpl ) tk? ( dev-lang/tk )
-DESCRIPTION=An OCR (Optical Character Recognition) reader
-EAPI=4
-HOMEPAGE=http://jocr.sourceforge.net
-IUSE=doc scanner tk
-KEYWORDS=alpha amd64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=GPL-2
-RDEPEND=>=media-libs/netpbm-9.12 doc? ( >=media-gfx/transfig-3.2 app-text/ghostscript-gpl ) tk? ( dev-lang/tk ) tk? ( media-gfx/xli scanner? ( media-gfx/xsane ) )
-SLOT=0
-SRC_URI=http://www-e.uni-magdeburg.de/jschulen/ocr/gocr-0.49.tar.gz
-_md5_=625b9c2ca1e903395999b0b489c732b9
diff --git a/app-text/gocr-0.50 b/app-text/gocr-0.50
deleted file mode 100644
index 6ef4efa99216..000000000000
--- a/app-text/gocr-0.50
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=>=media-libs/netpbm-9.12 doc? ( >=media-gfx/transfig-3.2 app-text/ghostscript-gpl ) tk? ( dev-lang/tk )
-DESCRIPTION=An OCR (Optical Character Recognition) reader
-EAPI=4
-HOMEPAGE=http://jocr.sourceforge.net
-IUSE=doc scanner tk
-KEYWORDS=alpha amd64 ~arm ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=GPL-2
-RDEPEND=>=media-libs/netpbm-9.12 doc? ( >=media-gfx/transfig-3.2 app-text/ghostscript-gpl ) tk? ( dev-lang/tk ) tk? ( media-gfx/xli scanner? ( media-gfx/xsane ) )
-SLOT=0
-SRC_URI=http://www-e.uni-magdeburg.de/jschulen/ocr/gocr-0.50.tar.gz
-_md5_=52f9e987cc8345199416ef7528731727
diff --git a/app-text/gocr/Manifest b/app-text/gocr/Manifest
new file mode 100644
index 000000000000..c578e6fb4122
--- /dev/null
+++ b/app-text/gocr/Manifest
@@ -0,0 +1,5 @@
+DIST gocr-0.49.tar.gz 392386 BLAKE2B 9e2661f33b321b60ca761a259db31fce58be80f2408f003c31cac5a4b4c30d7943b864b36c4c6044c2db2a71efcb6d0b5b22fb17dc33dd971920f6c0210664e6 SHA512 4559ab2cb05d67212da1857a9e7280abea0b4a172454d5145f04f7d23237d065c7b17ea110123ebbea5d62e589c507e73957e1b15e856b19f9bfc5efbecf467c
+DIST gocr-0.50.tar.gz 419209 BLAKE2B 232fe240d7a559cdd4408a3dba3768818aefbd8b2718c7ae40829d69ab79dd68293eb6adfc52e661f2f6cf1290ae9656c84d9d7a8fc20229c0942a8e18fb3b68 SHA512 36392516711d43f8561147684b6f4e22a450bc87f1cb30ceaab4a1821ac583ff5a3d25b3bbf1637f01bfb55366b45cc7d5086d1f29f006d615bb658d0e5faab9
+EBUILD gocr-0.49.ebuild 1194 BLAKE2B 17c24733407f842e9084c57164aa9eb93ebde88b5d2afeff1496bfa66923b5f5e1ad4c11269bffc4b38a922ec87a6f86d8bff942ca57423be6c20f15943b7351 SHA512 d6f044d7a983154b6298c95d8d86bde528c7374d8e6cff82967df4414df07252c81dc691dbb0e49d7ac8c4a5b528b336c4978cbc4ff185bc9e2d675d2733e06a
+EBUILD gocr-0.50.ebuild 1199 BLAKE2B ab0670e4b0c0af277050a2cf59cdcc5aedae968f061943bde4c6aeebfc161336c1e83f397f20cb37a1adabccdaa4fe36f27c9dc0cc90dd2b2ac96ccd96e75a53 SHA512 d73b4c9f4ed68f3c1f09ed7f2fe45d296c0a4fc74a29fb728e40090367be214e030e3615e50c91c9bc156d26ea9403624790ab9d71d3a0dcbf4c046c0f410cfe
+MISC metadata.xml 323 BLAKE2B bb09f6949d6fdefdb0ff856c96a0ab766e9ef11559aed7bc424b6da8eb226f4f9090b708da8b4ab62a123530201bfe721e5e6b505b5a6f3d5cd40f48941a86d9 SHA512 5b38ff42ca62ce001e5041406a24ccd8bc1c7f33d7a9e1f84ca0d5d48a3ad2f80e74732a846ffb6768709748bd2dca5868f76ab4c1b00f1e75a6f622597858e1
diff --git a/app-text/gocr/gocr-0.49.ebuild b/app-text/gocr/gocr-0.49.ebuild
new file mode 100644
index 000000000000..88b3005d5a37
--- /dev/null
+++ b/app-text/gocr/gocr-0.49.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+DESCRIPTION="An OCR (Optical Character Recognition) reader"
+HOMEPAGE="http://jocr.sourceforge.net"
+SRC_URI="http://www-e.uni-magdeburg.de/jschulen/ocr/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="doc scanner tk"
+
+DEPEND=">=media-libs/netpbm-9.12
+	doc? ( >=media-gfx/transfig-3.2 app-text/ghostscript-gpl )
+	tk? ( dev-lang/tk )"
+RDEPEND="${DEPEND}
+	tk? (
+		media-gfx/xli
+		scanner? ( media-gfx/xsane )
+	)"
+
+src_compile() {
+	local mymakes="src man"
+
+	use doc && mymakes="${mymakes} doc examples"
+
+	emake ${mymakes}
+}
+
+src_install() {
+	emake DESTDIR="${D}" prefix="${EPREFIX}/usr" exec_prefix="${EPREFIX}/usr" install
+	dodoc AUTHORS BUGS CREDITS HISTORY RE* TODO
+
+	# remove the tk frontend if tk is not selected
+	use tk || rm "${ED}"/usr/bin/gocr.tcl
+	# and install the documentation and examples
+	if use doc ; then
+		dodoc doc/gocr.html doc/examples.txt doc/unicode.txt
+		insinto /usr/share/doc/${PF}/examples
+		doins "${S}"/examples/*.{fig,tex,pcx}
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/app-text/gocr/gocr-0.50.ebuild b/app-text/gocr/gocr-0.50.ebuild
new file mode 100644
index 000000000000..d117bc57f841
--- /dev/null
+++ b/app-text/gocr/gocr-0.50.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+DESCRIPTION="An OCR (Optical Character Recognition) reader"
+HOMEPAGE="http://jocr.sourceforge.net"
+SRC_URI="http://www-e.uni-magdeburg.de/jschulen/ocr/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="doc scanner tk"
+
+DEPEND=">=media-libs/netpbm-9.12
+	doc? ( >=media-gfx/transfig-3.2 app-text/ghostscript-gpl )
+	tk? ( dev-lang/tk )"
+RDEPEND="${DEPEND}
+	tk? (
+		media-gfx/xli
+		scanner? ( media-gfx/xsane )
+	)"
+
+src_compile() {
+	local mymakes="src man"
+
+	use doc && mymakes="${mymakes} doc examples"
+
+	emake ${mymakes}
+}
+
+src_install() {
+	emake DESTDIR="${D}" prefix="${EPREFIX}/usr" exec_prefix="${EPREFIX}/usr" install
+	dodoc AUTHORS BUGS CREDITS HISTORY RE* TODO
+
+	# remove the tk frontend if tk is not selected
+	use tk || rm "${ED}"/usr/bin/gocr.tcl
+	# and install the documentation and examples
+	if use doc ; then
+		dodoc doc/gocr.html doc/examples.txt doc/unicode.txt
+		insinto /usr/share/doc/${PF}/examples
+		doins "${S}"/examples/*.{fig,tex,pcx}
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/app-text/gocr/metadata.xml b/app-text/gocr/metadata.xml
new file mode 100644
index 000000000000..822a31236591
--- /dev/null
+++ b/app-text/gocr/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">jocr</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/goldendict-1.5.0_rc2-r2 b/app-text/goldendict-1.5.0_rc2-r2
deleted file mode 100644
index c418fe457022..000000000000
--- a/app-text/goldendict-1.5.0_rc2-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=app-arch/bzip2 >=app-text/hunspell-1.2:= dev-libs/eb dev-libs/lzo dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsingleapplication[qt5(+)] dev-qt/qtsvg:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 media-libs/libvorbis media-libs/tiff:0 sys-libs/zlib x11-libs/libX11 x11-libs/libXtst ffmpeg? ( media-libs/libao libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) ) dev-qt/linguist-tools:5 virtual/pkgconfig
-DESCRIPTION=Feature-rich dictionary lookup program
-EAPI=6
-HOMEPAGE=http://goldendict.org/
-IUSE=debug ffmpeg libav
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=app-arch/bzip2 >=app-text/hunspell-1.2:= dev-libs/eb dev-libs/lzo dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtsingleapplication[qt5(+)] dev-qt/qtsvg:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 media-libs/libvorbis media-libs/tiff:0 sys-libs/zlib x11-libs/libX11 x11-libs/libXtst ffmpeg? ( media-libs/libao libav? ( media-video/libav:0= ) !libav? ( media-video/ffmpeg:0= ) )
-SLOT=0
-SRC_URI=https://github.com/goldendict/goldendict/archive/1.5.0-RC2.tar.gz -> goldendict-1.5.0_rc2.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b80e7340a010c63f7fe59c2875f82591
diff --git a/app-text/goldendict/Manifest b/app-text/goldendict/Manifest
new file mode 100644
index 000000000000..9767abf639c7
--- /dev/null
+++ b/app-text/goldendict/Manifest
@@ -0,0 +1,4 @@
+AUX goldendict-1.5.0-qtsingleapplication-unbundle.patch 341 BLAKE2B 7f5b2c715d41d50d358a8cca5f259f8b70266b9037dac9f5f6c9c0b1323b46cb42f68fd73725a6f25903e35a83582b32015b3401f1aa3a8f9c8bb1a05c54b531 SHA512 86a08b1333a61fee7559028f68779f45cf17da6f7e6f3ea9cae46184279469b91e38f825ad072e0557bcd4188b87fe8f0bd696c4819e3bc96874439d1290e5a3
+DIST goldendict-1.5.0_rc2.tar.gz 19413751 BLAKE2B 17fb0140e6ce392800a05d36a41f2a42c813990eaecabf55f765d5583118be694e66c5438b90e46853070a782086422b533b0f653461dd81cecd23f2deec40b7 SHA512 b88067a90df42b07d926231f624be8796f031b872443a45f9744ceeea27f39325bc665090f773528a26ad8391ae2423a29c602068bf2cc4ed5870a07646d2362
+EBUILD goldendict-1.5.0_rc2-r2.ebuild 1705 BLAKE2B 67763317939dc507c8328e99dd4cc1696172fe97fc51ccd1e00c6ebaa6e2fa317a8ef8c9888f26a81792f844c69ed9b99e5b7cff3641db80f428e6b469205e5f SHA512 e0b330c8b9576864dbfae1f2165f2a8048c327f145adc9d676251ea4aaebead035c4a8250d6a283f56beae4853bf0fc7bf7cc7bfcb86b3c98e4c7c17c4449998
+MISC metadata.xml 388 BLAKE2B 229d847f632fe3da3df10913551df5ee6ee386768c52aef7c436336476c7e837272decbe34a7e9322504e6d97e7319afb61815539494ef5faa8c93411ce7215d SHA512 c9be98ab768c3c13ff4b03336fc90314ec0e233d0860501d85b5c65250965d994a3f8ab4cf8f58cee3da27fdc37964c10854bc66b9cc16e5f558f0b7a4a39f42
diff --git a/app-text/goldendict/files/goldendict-1.5.0-qtsingleapplication-unbundle.patch b/app-text/goldendict/files/goldendict-1.5.0-qtsingleapplication-unbundle.patch
new file mode 100644
index 000000000000..01fdb3b2a297
--- /dev/null
+++ b/app-text/goldendict/files/goldendict-1.5.0-qtsingleapplication-unbundle.patch
@@ -0,0 +1,18 @@
+--- a/goldendict.pro
++++ b/goldendict.pro
+@@ -36,7 +36,8 @@
+ QT += sql
+ CONFIG += exceptions \
+     rtti \
+-    stl
++    stl \
++    qtsingleapplication
+ OBJECTS_DIR = build
+ UI_DIR = build
+ MOC_DIR = build
+@@ -632,5 +633,3 @@
+ TS_OUT ~= s/.ts/.qm/g
+ PRE_TARGETDEPS += $$TS_OUT
+ 
+-include( qtsingleapplication/src/qtsingleapplication.pri )
+-
diff --git a/app-text/goldendict/goldendict-1.5.0_rc2-r2.ebuild b/app-text/goldendict/goldendict-1.5.0_rc2-r2.ebuild
new file mode 100644
index 000000000000..47c7916defc8
--- /dev/null
+++ b/app-text/goldendict/goldendict-1.5.0_rc2-r2.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PV=${PV^^}
+MY_PV=${MY_PV/_/-}
+inherit eutils qmake-utils
+
+DESCRIPTION="Feature-rich dictionary lookup program"
+HOMEPAGE="http://goldendict.org/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="debug ffmpeg libav"
+
+RDEPEND="
+	app-arch/bzip2
+	>=app-text/hunspell-1.2:=
+	dev-libs/eb
+	dev-libs/lzo
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qthelp:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtsingleapplication[qt5(+)]
+	dev-qt/qtsvg:5
+	dev-qt/qtwebkit:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	dev-qt/qtxml:5
+	media-libs/libvorbis
+	media-libs/tiff:0
+	sys-libs/zlib
+	x11-libs/libX11
+	x11-libs/libXtst
+	ffmpeg? (
+		media-libs/libao
+		libav? ( media-video/libav:0= )
+		!libav? ( media-video/ffmpeg:0= )
+	)
+"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
+
+PATCHES=( "${FILESDIR}/${PN}-1.5.0-qtsingleapplication-unbundle.patch" )
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+src_prepare() {
+	default
+
+	# disable git
+	sed -i \
+		-e '/git describe/s/^/#/' \
+		${PN}.pro || die
+
+	# fix installation path
+	sed -i \
+		-e '/PREFIX = /s:/usr/local:/usr:' \
+		${PN}.pro || die
+
+	# add trailing semicolon
+	sed -i -e '/^Categories/s/$/;/' redist/${PN}.desktop || die
+}
+
+src_configure() {
+	local myconf=()
+
+	if ! use ffmpeg ; then
+		myconf+=( DISABLE_INTERNAL_PLAYER=1 )
+	fi
+
+	eqmake5 "${myconf[@]}"
+}
+
+src_install() {
+	dobin ${PN}
+	domenu redist/${PN}.desktop
+	doicon redist/icons/${PN}.png
+
+	insinto /usr/share/apps/${PN}/locale
+	doins locale/*.qm
+
+	insinto /usr/share/${PN}/help
+	doins help/*.qch
+}
diff --git a/app-text/goldendict/metadata.xml b/app-text/goldendict/metadata.xml
new file mode 100644
index 000000000000..54e5ea46ce69
--- /dev/null
+++ b/app-text/goldendict/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">goldendict/goldendict</remote-id>
+		<remote-id type="sourceforge">goldendict</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/grip-4.2.0 b/app-text/grip-4.2.0
deleted file mode 100644
index ecdcbfbe94d2..000000000000
--- a/app-text/grip-4.2.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Preview GitHub Markdown files like Readme locally before committing them
-EAPI=6
-HOMEPAGE=https://github.com/joeyespo/grip
-IUSE=python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=>=dev-python/docopt-0.6.2 >=dev-python/flask-0.10.1 >=dev-python/markdown-2.5.1 >=dev-python/path-and-address-1.0.0 >=dev-python/pygments-1.6 >=dev-python/requests-2.4.1 python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/g/grip/grip-4.2.0.zip
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3f4f80562746152c995a696790661bc2
diff --git a/app-text/grip/Manifest b/app-text/grip/Manifest
new file mode 100644
index 000000000000..5b097fa2ea44
--- /dev/null
+++ b/app-text/grip/Manifest
@@ -0,0 +1,3 @@
+DIST grip-4.2.0.zip 43079 BLAKE2B b7aa31c554d646fdedee88f54e2ad825d56eed26cb18ec364cc0e2638f3d002f2fb3192daa15085b2db5a9d608e37df8c74b19466042c57fa62b80f7bc259eef SHA512 2989a1cc2cb98254e932d5bf6679a205992e74802e68fe45d11cf087747d2379778df254bbf1cf980bb8993dc5568c5112707c645babbb32aae49f443319ff6b
+EBUILD grip-4.2.0.ebuild 604 BLAKE2B 8fe0d9f6d6c66a46207a688e4d98c666dbc3936e2709b5a1013d30ca59f29c8241ae2adbb23a17605496f80deb0c4ceb0fc95b169a853536c91a4c61a2fecc8e SHA512 1066cf711fde9c9dae1048cc60a13571de56023db83f7fb1976106f3874498f9618f05d4f65e4c4711470817890eee50a34881ca064854a8774b73bb927224a9
+MISC metadata.xml 287 BLAKE2B 97d6c8c5b9fa03b5b8435a9719b819a9e071d1310656d97e6a203a8cf86d2414034e8642de7f010aa8f64955bcdc849bc66ef64a1e0e80fd23e355af50c6bbc1 SHA512 047bdd78979d55e9e37b92f51b52190c6a5780d6b3475560ae8908fdc98274949372918e1ab150821f09bff97cc12f25097f4e89ee4431861b608be79bd942bc
diff --git a/app-text/grip/grip-4.2.0.ebuild b/app-text/grip/grip-4.2.0.ebuild
new file mode 100644
index 000000000000..26ce65a13626
--- /dev/null
+++ b/app-text/grip/grip-4.2.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 pypy{,3} python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Preview GitHub Markdown files like Readme locally before committing them"
+HOMEPAGE="https://github.com/joeyespo/grip"
+LICENSE="MIT"
+
+SLOT="0"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
+
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/docopt-0.6.2
+	>=dev-python/flask-0.10.1
+	>=dev-python/markdown-2.5.1
+	>=dev-python/path-and-address-1.0.0
+	>=dev-python/pygments-1.6
+	>=dev-python/requests-2.4.1
+"
diff --git a/app-text/grip/metadata.xml b/app-text/grip/metadata.xml
new file mode 100644
index 000000000000..2411725f8215
--- /dev/null
+++ b/app-text/grip/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="github">joeyespo/grip</remote-id>
+		<remote-id type="pypi">grip</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/groonga-5.0.3 b/app-text/groonga-5.0.3
deleted file mode 100644
index 635c2b25b046..000000000000
--- a/app-text/groonga-5.0.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare setup
-DEPEND=benchmark? ( >=dev-libs/glib-2.8 ) libedit? ( >=dev-libs/libedit-3 ) libevent? ( dev-libs/libevent ) lzo? ( dev-libs/lzo ) mecab? ( >=app-text/mecab-0.80 ) msgpack? ( dev-libs/msgpack ) sphinx? ( >=dev-python/sphinx-1.0.1 ) zeromq? ( net-libs/zeromq ) zlib? ( sys-libs/zlib ) virtual/pkgconfig sphinx? ( dev-python/sphinx ) >=app-portage/elt-patches-20170422
-DESCRIPTION=An Embeddable Fulltext Search Engine
-EAPI=5
-HOMEPAGE=http://groonga.org/
-IUSE=abort benchmark debug doc dynamic-malloc-change +exact-alloc-count examples fmalloc futex libedit libevent lzo mecab msgpack +nfkc sphinx static-libs uyield zeromq zlib
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=benchmark? ( >=dev-libs/glib-2.8 ) libedit? ( >=dev-libs/libedit-3 ) libevent? ( dev-libs/libevent ) lzo? ( dev-libs/lzo ) mecab? ( >=app-text/mecab-0.80 ) msgpack? ( dev-libs/msgpack ) sphinx? ( >=dev-python/sphinx-1.0.1 ) zeromq? ( net-libs/zeromq ) zlib? ( sys-libs/zlib )
-REQUIRED_USE=abort? ( dynamic-malloc-change ) fmalloc? ( dynamic-malloc-change ) sphinx? ( doc )
-SLOT=0
-SRC_URI=http://packages.groonga.org/source/groonga/groonga-5.0.3.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d3e4cf14cb4ab8c51c2b504a93b20ec5
diff --git a/app-text/groonga-5.0.9 b/app-text/groonga-5.0.9
deleted file mode 100644
index df0395401316..000000000000
--- a/app-text/groonga-5.0.9
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare setup
-DEPEND=benchmark? ( >=dev-libs/glib-2.8 ) libedit? ( >=dev-libs/libedit-3 ) libevent? ( dev-libs/libevent ) lzo? ( dev-libs/lzo ) mecab? ( >=app-text/mecab-0.80 ) msgpack? ( dev-libs/msgpack ) sphinx? ( >=dev-python/sphinx-1.0.1 ) zeromq? ( net-libs/zeromq ) zlib? ( sys-libs/zlib ) virtual/pkgconfig sphinx? ( dev-python/sphinx ) >=app-portage/elt-patches-20170422
-DESCRIPTION=An Embeddable Fulltext Search Engine
-EAPI=5
-HOMEPAGE=http://groonga.org/
-IUSE=abort benchmark debug doc dynamic-malloc-change +exact-alloc-count examples fmalloc futex libedit libevent lzo mecab msgpack +nfkc sphinx static-libs uyield zeromq zlib
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=benchmark? ( >=dev-libs/glib-2.8 ) libedit? ( >=dev-libs/libedit-3 ) libevent? ( dev-libs/libevent ) lzo? ( dev-libs/lzo ) mecab? ( >=app-text/mecab-0.80 ) msgpack? ( dev-libs/msgpack ) sphinx? ( >=dev-python/sphinx-1.0.1 ) zeromq? ( net-libs/zeromq ) zlib? ( sys-libs/zlib )
-REQUIRED_USE=abort? ( dynamic-malloc-change ) fmalloc? ( dynamic-malloc-change ) sphinx? ( doc )
-SLOT=0
-SRC_URI=http://packages.groonga.org/source/groonga/groonga-5.0.9.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d3e4cf14cb4ab8c51c2b504a93b20ec5
diff --git a/app-text/groonga-6.1.2 b/app-text/groonga-6.1.2
deleted file mode 100644
index be37b601e774..000000000000
--- a/app-text/groonga-6.1.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare setup
-DEPEND=benchmark? ( >=dev-libs/glib-2.8 ) libedit? ( >=dev-libs/libedit-3 ) libevent? ( dev-libs/libevent ) lzo? ( dev-libs/lzo ) mecab? ( >=app-text/mecab-0.80 ) msgpack? ( dev-libs/msgpack ) sphinx? ( >=dev-python/sphinx-1.0.1 ) zeromq? ( net-libs/zeromq ) zlib? ( sys-libs/zlib ) virtual/pkgconfig sphinx? ( dev-python/sphinx ) >=app-portage/elt-patches-20170422
-DESCRIPTION=An Embeddable Fulltext Search Engine
-EAPI=6
-HOMEPAGE=http://groonga.org/
-IUSE=abort benchmark debug doc dynamic-malloc-change +exact-alloc-count examples fmalloc futex libedit libevent lzo mecab msgpack +nfkc sphinx static-libs uyield zeromq zlib
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=benchmark? ( >=dev-libs/glib-2.8 ) libedit? ( >=dev-libs/libedit-3 ) libevent? ( dev-libs/libevent ) lzo? ( dev-libs/lzo ) mecab? ( >=app-text/mecab-0.80 ) msgpack? ( dev-libs/msgpack ) sphinx? ( >=dev-python/sphinx-1.0.1 ) zeromq? ( net-libs/zeromq ) zlib? ( sys-libs/zlib )
-REQUIRED_USE=abort? ( dynamic-malloc-change ) fmalloc? ( dynamic-malloc-change ) sphinx? ( doc )
-SLOT=0
-SRC_URI=http://packages.groonga.org/source/groonga/groonga-6.1.2.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d4755e6e251e4a64f63aa1b9b860f1f3
diff --git a/app-text/groonga-8.0.2 b/app-text/groonga-8.0.2
deleted file mode 100644
index d4fa0d6c74ef..000000000000
--- a/app-text/groonga-8.0.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare setup
-DEPEND=>=dev-libs/onigmo-6.1.1:0= benchmark? ( >=dev-libs/glib-2.8 ) jemalloc? ( dev-libs/jemalloc:0= ) libedit? ( >=dev-libs/libedit-3 ) libevent? ( dev-libs/libevent:0= ) lzo? ( dev-libs/lzo ) mecab? ( >=app-text/mecab-0.80 ) msgpack? ( dev-libs/msgpack ) sphinx? ( >=dev-python/sphinx-1.0.1 ) zeromq? ( net-libs/zeromq:0= ) zlib? ( sys-libs/zlib:0= ) zstd? ( app-arch/zstd:0= ) virtual/pkgconfig sphinx? ( dev-python/sphinx ) >=app-portage/elt-patches-20170422
-DESCRIPTION=An Embeddable Fulltext Search Engine
-EAPI=6
-HOMEPAGE=https://groonga.org/
-IUSE=abort benchmark debug doc dynamic-malloc-change +exact-alloc-count examples fmalloc futex jemalloc libedit libevent lzo +mecab msgpack +nfkc sphinx static-libs uyield zeromq zlib zstd
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-libs/onigmo-6.1.1:0= benchmark? ( >=dev-libs/glib-2.8 ) jemalloc? ( dev-libs/jemalloc:0= ) libedit? ( >=dev-libs/libedit-3 ) libevent? ( dev-libs/libevent:0= ) lzo? ( dev-libs/lzo ) mecab? ( >=app-text/mecab-0.80 ) msgpack? ( dev-libs/msgpack ) sphinx? ( >=dev-python/sphinx-1.0.1 ) zeromq? ( net-libs/zeromq:0= ) zlib? ( sys-libs/zlib:0= ) zstd? ( app-arch/zstd:0= )
-REQUIRED_USE=abort? ( dynamic-malloc-change ) fmalloc? ( dynamic-malloc-change ) sphinx? ( doc )
-SLOT=0
-SRC_URI=https://packages.groonga.org/source/groonga/groonga-8.0.2.tar.gz
-_eclasses_=libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=6fe3c64c8178576f7a55eb526128a9f0
diff --git a/app-text/groonga-normalizer-mysql-1.0.6 b/app-text/groonga-normalizer-mysql-1.0.6
deleted file mode 100644
index b40dd8c8f23a..000000000000
--- a/app-text/groonga-normalizer-mysql-1.0.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=app-text/groonga virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Groonga plugin that provides MySQL compatible normalizers
-EAPI=5
-HOMEPAGE=http://groonga.org/
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=app-text/groonga
-SLOT=0
-SRC_URI=http://packages.groonga.org/source/groonga-normalizer-mysql/groonga-normalizer-mysql-1.0.6.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=659dc0a30532d2c1defc64c36db7a49b
diff --git a/app-text/groonga-normalizer-mysql-1.0.9 b/app-text/groonga-normalizer-mysql-1.0.9
deleted file mode 100644
index 8d1cf9940b4b..000000000000
--- a/app-text/groonga-normalizer-mysql-1.0.9
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=app-text/groonga virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Groonga plugin that provides MySQL compatible normalizers
-EAPI=5
-HOMEPAGE=http://groonga.org/
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=app-text/groonga
-SLOT=0
-SRC_URI=http://packages.groonga.org/source/groonga-normalizer-mysql/groonga-normalizer-mysql-1.0.9.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f2a728dbb8b0955dd4a9f74832716281
diff --git a/app-text/groonga-normalizer-mysql-1.1.0 b/app-text/groonga-normalizer-mysql-1.1.0
deleted file mode 100644
index be5ba92f9f71..000000000000
--- a/app-text/groonga-normalizer-mysql-1.1.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=app-text/groonga virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Groonga plugin that provides MySQL compatible normalizers
-EAPI=5
-HOMEPAGE=http://groonga.org/
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=app-text/groonga
-SLOT=0
-SRC_URI=http://packages.groonga.org/source/groonga-normalizer-mysql/groonga-normalizer-mysql-1.1.0.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f2a728dbb8b0955dd4a9f74832716281
diff --git a/app-text/groonga-normalizer-mysql-1.1.1 b/app-text/groonga-normalizer-mysql-1.1.1
deleted file mode 100644
index 8a36518e805f..000000000000
--- a/app-text/groonga-normalizer-mysql-1.1.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=app-text/groonga virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Groonga plugin that provides MySQL compatible normalizers
-EAPI=6
-HOMEPAGE=http://groonga.org/
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=app-text/groonga
-SLOT=0
-SRC_URI=http://packages.groonga.org/source/groonga-normalizer-mysql/groonga-normalizer-mysql-1.1.1.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3a8c54ebab62d31fe0a37a16a13c2783
diff --git a/app-text/groonga-normalizer-mysql/Manifest b/app-text/groonga-normalizer-mysql/Manifest
new file mode 100644
index 000000000000..5a1320ce0383
--- /dev/null
+++ b/app-text/groonga-normalizer-mysql/Manifest
@@ -0,0 +1,9 @@
+DIST groonga-normalizer-mysql-1.0.6.tar.gz 430461 BLAKE2B f124608b13888f337fc35ed02b4757818d145943a13f645da73dbf0735a4a5627026ad995435b822f6022d61f6cf0a6821824a1272c389459adb16932bc06bcc SHA512 36ef0344ba73633669d12dd13b08cd336b2b77a7c76e11b52b5ce17fcf20b17a0ea8a3f68be1be91d07e3fe5a87b667664d7a503a54ba1cace3bd6c252286821
+DIST groonga-normalizer-mysql-1.0.9.tar.gz 527908 BLAKE2B 20112b60a2a9f5f5b1d805280cd5dc77e8d039a768410a3f2259aa60449c660eb6c3764d14edd3db819dd68a830ba38aebe5bc0d6014dcd04752a194b1da87dd SHA512 878d10dc6f7280c62e9563db19a61450a0181c19d47b2a5afe3bef4bfa157abfe3de726f0d61b6b7040b3b37abd78f63cd257f48fe779ff6a1ea0ed262b70a97
+DIST groonga-normalizer-mysql-1.1.0.tar.gz 529179 BLAKE2B 1092b6245eb60a2e54cadf6193a402ad085923224e05d35f80453505fb2f0a4e97822746907d1f9a8c0b95f82d0b1396b7ff81d133099def75b850e54a899725 SHA512 a607ea875a1500b408742f52c5a0e465db4fc45101cd6b433a5fede8631fdadd6d24571ec188f70e39906178d35ad46138848bd57aaac721da32c064f3506416
+DIST groonga-normalizer-mysql-1.1.1.tar.gz 548788 BLAKE2B c2f06ffa4aaf52266dabf1397d592b772a10a45fe8b9184ffb7fc5f30a8db3c81011c19a80d3d14a228ea47b4b6ba21b7ab7f81e283533beef4596065d0c4b6b SHA512 40686a50133149b614057907c58f5b37d596fcaf697b4a6f3e68b776ac8c728cdd4c8a6e7c5676fe92ff96a4358b623f2b3740f6b72d317f1650c006cfb34369
+EBUILD groonga-normalizer-mysql-1.0.6.ebuild 707 BLAKE2B 37b82f587d2c55cbe4810072b8b824449a179b4739cbf77b8edf842658765aa2e2a35edd108fe8559de91d3170f0634b6820128e08c3a5a50c7d8216f63f034d SHA512 4cb757f68205b8cb3f9dedb5a6081a8b81e6c1a4280a6f07c226792e063f1c90556208df0d3a8986c3a4d76d254de16abcade378e7c68d11b1567ce4faa12d77
+EBUILD groonga-normalizer-mysql-1.0.9.ebuild 695 BLAKE2B a4efff5b641b67ec3f6d65e656ac3b18c389c943e1302e0a8b52d748cc79fb3d71a4ba8ca8e32b665ecdb7a1896fcf9045e1365741fe747a63e0d1209a434c01 SHA512 4c540660c4dfb7591822ba57ffef29968aae07538b4b1f8dca8c1620f3468b311aa905a2ea7276d54ba2a4f317115e3fd44cb8cb298aa60c27d4d883a19823be
+EBUILD groonga-normalizer-mysql-1.1.0.ebuild 695 BLAKE2B a4efff5b641b67ec3f6d65e656ac3b18c389c943e1302e0a8b52d748cc79fb3d71a4ba8ca8e32b665ecdb7a1896fcf9045e1365741fe747a63e0d1209a434c01 SHA512 4c540660c4dfb7591822ba57ffef29968aae07538b4b1f8dca8c1620f3468b311aa905a2ea7276d54ba2a4f317115e3fd44cb8cb298aa60c27d4d883a19823be
+EBUILD groonga-normalizer-mysql-1.1.1.ebuild 716 BLAKE2B d7dccbce176690b4990e4474bd4bbffd487c0b6038195da3f0f515b7e661ddf6f2bb81b2f31f01c184dbf4c803300b36768a1419823a2419cfd14d68eb67523e SHA512 ddf60d07f9ab8387474bf4701f9b609d83f84c72354653606adfe0609b6224758c48bf1d73e6cfdb4e67e4ddb52e051a98bfffb53696c32e921ff788b7300f51
+MISC metadata.xml 215 BLAKE2B 4eba5c3c44bf788b64d8084a6276754dc99a606036638e96522f3680ce8e5c6f6e1075b2f975d31cf93faea7c5e9a1ad37b58ec4e29e3eacc6a064d035ad8d52 SHA512 b9dfac6d012a908a88f80298c5df82f8b093bcb8f6b523ac7d1897289d0e72d4a62baca343c1b784b1e3f37a94efe000d353b7ea74cbd9b4584698c890d5a7f0
diff --git a/app-text/groonga-normalizer-mysql/groonga-normalizer-mysql-1.0.6.ebuild b/app-text/groonga-normalizer-mysql/groonga-normalizer-mysql-1.0.6.ebuild
new file mode 100644
index 000000000000..982a5c7df90e
--- /dev/null
+++ b/app-text/groonga-normalizer-mysql/groonga-normalizer-mysql-1.0.6.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils autotools
+
+DESCRIPTION="Groonga plugin that provides MySQL compatible normalizers"
+HOMEPAGE="http://groonga.org/"
+SRC_URI="http://packages.groonga.org/source/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="app-text/groonga"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+DOCS=( README.md )
+
+src_prepare() {
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--without-ruby19 \
+		--docdir="${EROOT}usr/share/doc/${P}"
+}
+
+src_install() {
+	default
+
+	prune_libtool_files
+	# Dont install README twice nor license
+	rm -r "${D}usr/share/doc/${PN}" || die
+}
diff --git a/app-text/groonga-normalizer-mysql/groonga-normalizer-mysql-1.0.9.ebuild b/app-text/groonga-normalizer-mysql/groonga-normalizer-mysql-1.0.9.ebuild
new file mode 100644
index 000000000000..9fb120002304
--- /dev/null
+++ b/app-text/groonga-normalizer-mysql/groonga-normalizer-mysql-1.0.9.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils autotools
+
+DESCRIPTION="Groonga plugin that provides MySQL compatible normalizers"
+HOMEPAGE="http://groonga.org/"
+SRC_URI="http://packages.groonga.org/source/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="app-text/groonga"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+DOCS=( README.md )
+
+src_prepare() {
+	eautoreconf
+}
+
+src_configure() {
+	# ruby is only uses for tests
+	econf \
+		--without-ruby \
+		--docdir="${EROOT}usr/share/doc/${P}"
+}
+
+src_install() {
+	default
+
+	prune_libtool_files
+	rm -r "${D}usr/share/doc/${PN}" || die
+}
diff --git a/app-text/groonga-normalizer-mysql/groonga-normalizer-mysql-1.1.0.ebuild b/app-text/groonga-normalizer-mysql/groonga-normalizer-mysql-1.1.0.ebuild
new file mode 100644
index 000000000000..9fb120002304
--- /dev/null
+++ b/app-text/groonga-normalizer-mysql/groonga-normalizer-mysql-1.1.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils autotools
+
+DESCRIPTION="Groonga plugin that provides MySQL compatible normalizers"
+HOMEPAGE="http://groonga.org/"
+SRC_URI="http://packages.groonga.org/source/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="app-text/groonga"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+DOCS=( README.md )
+
+src_prepare() {
+	eautoreconf
+}
+
+src_configure() {
+	# ruby is only uses for tests
+	econf \
+		--without-ruby \
+		--docdir="${EROOT}usr/share/doc/${P}"
+}
+
+src_install() {
+	default
+
+	prune_libtool_files
+	rm -r "${D}usr/share/doc/${PN}" || die
+}
diff --git a/app-text/groonga-normalizer-mysql/groonga-normalizer-mysql-1.1.1.ebuild b/app-text/groonga-normalizer-mysql/groonga-normalizer-mysql-1.1.1.ebuild
new file mode 100644
index 000000000000..3b75ffe4aea8
--- /dev/null
+++ b/app-text/groonga-normalizer-mysql/groonga-normalizer-mysql-1.1.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils autotools
+
+DESCRIPTION="Groonga plugin that provides MySQL compatible normalizers"
+HOMEPAGE="http://groonga.org/"
+SRC_URI="http://packages.groonga.org/source/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="app-text/groonga"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+DOCS=( README.md )
+
+src_prepare() {
+	default_src_prepare
+	eautoreconf
+}
+
+src_configure() {
+	# ruby is only uses for tests
+	econf \
+		--without-ruby \
+		--docdir="${EROOT}usr/share/doc/${P}"
+}
+
+src_install() {
+	default
+
+	prune_libtool_files
+	rm -r "${D}usr/share/doc/${PN}" || die
+}
diff --git a/app-text/groonga-normalizer-mysql/metadata.xml b/app-text/groonga-normalizer-mysql/metadata.xml
new file mode 100644
index 000000000000..41debbe3ed13
--- /dev/null
+++ b/app-text/groonga-normalizer-mysql/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+<email>grknight@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/app-text/groonga/Manifest b/app-text/groonga/Manifest
new file mode 100644
index 000000000000..7e41b92a9fa8
--- /dev/null
+++ b/app-text/groonga/Manifest
@@ -0,0 +1,11 @@
+AUX groonga.confd 259 BLAKE2B 440b084d0e41da1b81e27ffa1e42963ce22d83027841039d488d516dce8beffce0e2ca03f5ca78a6aae02fa7bf238f0cf900e770ebfba04cfac581a13bd2381f SHA512 489feed6a4c22eb2ac02be070dd84ed3eb677b4f250b7eacd5619c1749b322b302bdff36fc3586e83125ac7ef02569054c4f267ddd7b26e5aa378af428cbc8ea
+AUX groonga.initd 715 BLAKE2B 0cf870704257490477a7a254a670ef5ce48141b8c9c4119446bcfab92972319857c77ebe41044c7d338b10bb720744788ce0313f8b2ee50277571513d0cfdb83 SHA512 7b4f789c9201f40fee0d99b94554bc33aebf024da02794143317215713cea3f2a9fda2e87d2a8bb864a7d0c8a2c44e824c65deecd4c95360423f7d3a4f04f8c2
+DIST groonga-5.0.3.tar.gz 12421501 BLAKE2B 22b695fca6c4d0859b7a9ed5b1bc46be48493faa513524634662b0d520d1159bc70b4dc34d82ba83e5c57681f01f01dbe47d5a957f110eab2db65cf8eefe878f SHA512 c4595054f46e150b0b95b3d1fb6a18098c93471ee0cdeefc54d266a710db57d6b68a6aceb1a61ede5ebb4e1b5518be64b9b96809bd85634b61c84c1923cbf158
+DIST groonga-5.0.9.tar.gz 12851324 BLAKE2B a58084146e5e8fbcbc56f9737a3623b4385123cc449fb63b136f3f312d31d5574620831a4fa6e759381950ee6aa035e4d6a4c277c26c7d8ebb1e99fe5bf02e75 SHA512 6e89be8894737616cfcbd0edd92c94a25fb8a2f9c97bd0aab10c2d628664aa328384d6b953516fe96cec5b58fd229c42262caad4785ca9574c759d6d7177fba6
+DIST groonga-6.1.2.tar.gz 14028916 BLAKE2B c05a1a5a73bce63655eb588b3021570d22a0016837810c12813bb4f208bf9b114fc514a8887e4f756fb0ec27ad2c991eea026bf57391e9234e49ee084656d26c SHA512 cd2dd667608fac856b36a824c5ea285da937cc11b6d4e5ad2f84581f6fbc714b4bb381515ec7b467ddccfad77c77c080000def653d9cdd8725c0f512c7b83f20
+DIST groonga-8.0.2.tar.gz 15095427 BLAKE2B fa83034a434edaa35dede08cb042e48f15e1e2edd78a121f9341f53f53a5eef863d02e2ea6384428c720c4ff9acf1083504046c8c11a1ea8d7bfc4b541db66b5 SHA512 bc5590604054c4adfbc80b39c7cf367e8a989c47d80c37c48feffb9a427b4b4e360289f3d732f6affa7d26a1c8559f23bda1c70b6736a06601398fce9a53acf1
+EBUILD groonga-5.0.3.ebuild 2418 BLAKE2B 03e1f4e2e34961339ac0df2568733b5c5bbdb4243037c9b32290d24873598fc2583a7c1419d11440719f45a02b27d611de89e93ddefc18dd28f8af8d5090b17b SHA512 52c3e67423eb88c7626b9b831c2058af4eeda069589b9ff315350c57eb8e4c151bbfaff5702c6c474204a5699ef2548932d389bf75edffb94b286c7a18d7f0f1
+EBUILD groonga-5.0.9.ebuild 2418 BLAKE2B 03e1f4e2e34961339ac0df2568733b5c5bbdb4243037c9b32290d24873598fc2583a7c1419d11440719f45a02b27d611de89e93ddefc18dd28f8af8d5090b17b SHA512 52c3e67423eb88c7626b9b831c2058af4eeda069589b9ff315350c57eb8e4c151bbfaff5702c6c474204a5699ef2548932d389bf75edffb94b286c7a18d7f0f1
+EBUILD groonga-6.1.2.ebuild 2447 BLAKE2B 0a21cc6f5012eeb06d3af52610a8ecd97731cae2ac7d66d81c4654af903033e37c2f5cea164db2e7224f5d8a1958a47824dcbc1e277c5f8e0bf7d8a101929300 SHA512 0770d4c27bee71d3fad3caf42b10ca0da006a1d20861c154e8f8b14edb19fb9f8e619b5f6b905a59eba8d3c17d982ec9b628b6d561b638df28da8fd3a9d48189
+EBUILD groonga-8.0.2.ebuild 2667 BLAKE2B a2f9ff65cf47440bbc8b28c7926b29cda03dc0b54acb82bb0c5492719513e1b529fb888b0ef943ac4f08c62890e5dc12da52a565304931e2fd76bcca7d2bc359 SHA512 5b298d025e26449d21877b3132f4a3886f9db42853a5ab53075b875b9fec91117e9f731519773d54a573e5e84625fdcebe7554700464e410d4f5191b6c930df4
+MISC metadata.xml 1382 BLAKE2B c6ba2a3a4ce9216fe21d22918ad7d332d769c031a85132e069874ab1e8ce6d66fdc7ddb225d31fb01001c7a6eb89f87da470c796cc8b2be8660098defb990749 SHA512 dd87cd905b0fb3f0c58805baf7c9be18de092c7c7375f79588f106bcab427ce28bc3376cd209e01dafec689a18e5bdcceb9ef6988ad123c66da2dd0a46bcb44b
diff --git a/app-text/groonga/files/groonga.confd b/app-text/groonga/files/groonga.confd
new file mode 100644
index 000000000000..f70b8e5b8342
--- /dev/null
+++ b/app-text/groonga/files/groonga.confd
@@ -0,0 +1,8 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+#GROONGA_USER=groonga
+#GROONGA_GROUP=groonga
+#GROONGA_PID=/run/groonga/groonga.pid
+#CONFIG_FILE=/etc/groonga/groonga.conf
+DATABASE=/var/lib/groonga/db
diff --git a/app-text/groonga/files/groonga.initd b/app-text/groonga/files/groonga.initd
new file mode 100644
index 000000000000..7d11ab6f7984
--- /dev/null
+++ b/app-text/groonga/files/groonga.initd
@@ -0,0 +1,20 @@
+#!/sbin/openrc-run
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+command=/usr/bin/groonga
+command_args="-d --pid-path ${GROONGA_PID:-/run/groonga/groonga.pid} --config-path=${CONFIG_FILE:-/etc/groonga/groonga.conf} ${DATABASE}"
+pidfile="${GROONGA_PID:-/run/groonga/groonga.pid}"
+start_stop_daemon_args="--quiet --user ${GROONGA_USER:-groonga}:${GROONGA_GROUP:-groonga}"
+
+depend() {
+	use net
+}
+
+start_pre() {
+	checkpath -d /run/groonga -o ${GROONGA_USER:-groonga}:${GROONGA_GROUP:-groonga}
+	if  [ ! -e "${DATABASE}" ] ; then
+		einfo "Creating database ${DATABASE}"
+		su -s /bin/sh -c "/usr/bin/groonga -n ${DATABASE} quit" ${GROONGA_USER:-groonga}
+	fi
+}
diff --git a/app-text/groonga/groonga-5.0.3.ebuild b/app-text/groonga/groonga-5.0.3.ebuild
new file mode 100644
index 000000000000..2663234e73a5
--- /dev/null
+++ b/app-text/groonga/groonga-5.0.3.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils libtool user
+
+DESCRIPTION="An Embeddable Fulltext Search Engine"
+HOMEPAGE="http://groonga.org/"
+SRC_URI="http://packages.groonga.org/source/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="abort benchmark debug doc dynamic-malloc-change +exact-alloc-count examples fmalloc futex libedit libevent lzo mecab msgpack +nfkc sphinx static-libs uyield zeromq zlib"
+
+RDEPEND="benchmark? ( >=dev-libs/glib-2.8 )
+	libedit? ( >=dev-libs/libedit-3 )
+	libevent? ( dev-libs/libevent )
+	lzo? ( dev-libs/lzo )
+	mecab? ( >=app-text/mecab-0.80 )
+	msgpack? ( dev-libs/msgpack )
+	sphinx? ( >=dev-python/sphinx-1.0.1 )
+	zeromq? ( net-libs/zeromq )
+	zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	sphinx? ( dev-python/sphinx )"
+
+REQUIRED_USE=" abort? ( dynamic-malloc-change ) fmalloc? ( dynamic-malloc-change ) sphinx? ( doc )"
+
+pkg_setup() {
+	enewgroup groonga
+	enewuser groonga -1 -1 -1 groonga
+}
+
+src_prepare() {
+	elibtoolize
+}
+
+src_configure() {
+	# httpd is a bundled copy of nginx; disabled for security reasons
+	# prce only is used with httpd
+	# kytea and libstemmer are not available in portage
+	# ruby is only used for an http test
+	econf \
+		--disable-groonga-httpd \
+		--without-pcre \
+		--without-kytea \
+		--without-libstemmer \
+		--with-log-path="${EROOT}var/log/${PN}.log" \
+		--docdir="${EROOT}usr/share/doc/${P}" \
+		--without-ruby \
+		$(use_enable abort) \
+		$(use_enable benchmark) \
+		$(use_enable debug memory-debug) \
+		$(use_enable doc document) \
+		$(use_enable dynamic-malloc-change) \
+		$(use_enable exact-alloc-count) \
+		$(use_enable fmalloc) \
+		$(use_enable futex) \
+		$(use_enable libedit) \
+		$(use_with libevent) \
+		$(use_with lzo) \
+		$(use_with mecab) \
+		$(use_with msgpack message-pack "${EROOT}usr") \
+		$(use_enable nfkc) \
+		$(use_with sphinx sphinx-build) \
+		$(use_enable static-libs static) \
+		$(use_enable uyield) \
+		$(use_enable zeromq) \
+		$(use_with zlib)
+}
+
+src_install() {
+	default
+
+	prune_libtool_files
+
+	newinitd "${FILESDIR}/${PN}.initd" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+
+	keepdir /var/{log,lib}/${PN}
+	fowners groonga:groonga /var/{log,lib}/${PN}
+
+	dodoc README.md
+
+	use examples || rm -r "${D}usr/share/${PN}" || die
+	# Extra init script
+	rm -r "${D}usr/sbin/groonga-httpd-restart" || die
+}
diff --git a/app-text/groonga/groonga-5.0.9.ebuild b/app-text/groonga/groonga-5.0.9.ebuild
new file mode 100644
index 000000000000..2663234e73a5
--- /dev/null
+++ b/app-text/groonga/groonga-5.0.9.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils libtool user
+
+DESCRIPTION="An Embeddable Fulltext Search Engine"
+HOMEPAGE="http://groonga.org/"
+SRC_URI="http://packages.groonga.org/source/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="abort benchmark debug doc dynamic-malloc-change +exact-alloc-count examples fmalloc futex libedit libevent lzo mecab msgpack +nfkc sphinx static-libs uyield zeromq zlib"
+
+RDEPEND="benchmark? ( >=dev-libs/glib-2.8 )
+	libedit? ( >=dev-libs/libedit-3 )
+	libevent? ( dev-libs/libevent )
+	lzo? ( dev-libs/lzo )
+	mecab? ( >=app-text/mecab-0.80 )
+	msgpack? ( dev-libs/msgpack )
+	sphinx? ( >=dev-python/sphinx-1.0.1 )
+	zeromq? ( net-libs/zeromq )
+	zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	sphinx? ( dev-python/sphinx )"
+
+REQUIRED_USE=" abort? ( dynamic-malloc-change ) fmalloc? ( dynamic-malloc-change ) sphinx? ( doc )"
+
+pkg_setup() {
+	enewgroup groonga
+	enewuser groonga -1 -1 -1 groonga
+}
+
+src_prepare() {
+	elibtoolize
+}
+
+src_configure() {
+	# httpd is a bundled copy of nginx; disabled for security reasons
+	# prce only is used with httpd
+	# kytea and libstemmer are not available in portage
+	# ruby is only used for an http test
+	econf \
+		--disable-groonga-httpd \
+		--without-pcre \
+		--without-kytea \
+		--without-libstemmer \
+		--with-log-path="${EROOT}var/log/${PN}.log" \
+		--docdir="${EROOT}usr/share/doc/${P}" \
+		--without-ruby \
+		$(use_enable abort) \
+		$(use_enable benchmark) \
+		$(use_enable debug memory-debug) \
+		$(use_enable doc document) \
+		$(use_enable dynamic-malloc-change) \
+		$(use_enable exact-alloc-count) \
+		$(use_enable fmalloc) \
+		$(use_enable futex) \
+		$(use_enable libedit) \
+		$(use_with libevent) \
+		$(use_with lzo) \
+		$(use_with mecab) \
+		$(use_with msgpack message-pack "${EROOT}usr") \
+		$(use_enable nfkc) \
+		$(use_with sphinx sphinx-build) \
+		$(use_enable static-libs static) \
+		$(use_enable uyield) \
+		$(use_enable zeromq) \
+		$(use_with zlib)
+}
+
+src_install() {
+	default
+
+	prune_libtool_files
+
+	newinitd "${FILESDIR}/${PN}.initd" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+
+	keepdir /var/{log,lib}/${PN}
+	fowners groonga:groonga /var/{log,lib}/${PN}
+
+	dodoc README.md
+
+	use examples || rm -r "${D}usr/share/${PN}" || die
+	# Extra init script
+	rm -r "${D}usr/sbin/groonga-httpd-restart" || die
+}
diff --git a/app-text/groonga/groonga-6.1.2.ebuild b/app-text/groonga/groonga-6.1.2.ebuild
new file mode 100644
index 000000000000..c2d0b8a7b0fa
--- /dev/null
+++ b/app-text/groonga/groonga-6.1.2.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils libtool user
+
+DESCRIPTION="An Embeddable Fulltext Search Engine"
+HOMEPAGE="http://groonga.org/"
+SRC_URI="http://packages.groonga.org/source/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="abort benchmark debug doc dynamic-malloc-change +exact-alloc-count examples fmalloc futex libedit libevent lzo mecab msgpack +nfkc sphinx static-libs uyield zeromq zlib"
+
+RDEPEND="benchmark? ( >=dev-libs/glib-2.8 )
+	libedit? ( >=dev-libs/libedit-3 )
+	libevent? ( dev-libs/libevent )
+	lzo? ( dev-libs/lzo )
+	mecab? ( >=app-text/mecab-0.80 )
+	msgpack? ( dev-libs/msgpack )
+	sphinx? ( >=dev-python/sphinx-1.0.1 )
+	zeromq? ( net-libs/zeromq )
+	zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	sphinx? ( dev-python/sphinx )"
+
+REQUIRED_USE=" abort? ( dynamic-malloc-change ) fmalloc? ( dynamic-malloc-change ) sphinx? ( doc )"
+
+pkg_setup() {
+	enewgroup groonga
+	enewuser groonga -1 -1 -1 groonga
+}
+
+src_prepare() {
+	default_src_prepare
+	elibtoolize
+}
+
+src_configure() {
+	# httpd is a bundled copy of nginx; disabled for security reasons
+	# prce only is used with httpd
+	# kytea and libstemmer are not available in portage
+	# ruby is only used for an http test
+	econf \
+		--disable-groonga-httpd \
+		--without-pcre \
+		--without-kytea \
+		--without-libstemmer \
+		--with-log-path="${EROOT}var/log/${PN}.log" \
+		--docdir="${EROOT}usr/share/doc/${P}" \
+		--without-ruby \
+		$(use_enable abort) \
+		$(use_enable benchmark) \
+		$(use_enable debug memory-debug) \
+		$(use_enable doc document) \
+		$(use_enable dynamic-malloc-change) \
+		$(use_enable exact-alloc-count) \
+		$(use_enable fmalloc) \
+		$(use_enable futex) \
+		$(use_enable libedit) \
+		$(use_with libevent) \
+		$(use_with lzo) \
+		$(use_with mecab) \
+		$(use_with msgpack message-pack "${EROOT}usr") \
+		$(use_enable nfkc) \
+		$(use_with sphinx sphinx-build) \
+		$(use_enable static-libs static) \
+		$(use_enable uyield) \
+		$(use_enable zeromq) \
+		$(use_with zlib)
+}
+
+src_install() {
+	local DOCS=( README.md )
+	default
+
+	prune_libtool_files
+
+	newinitd "${FILESDIR}/${PN}.initd" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+
+	keepdir /var/{log,lib}/${PN}
+	fowners groonga:groonga /var/{log,lib}/${PN}
+
+	use examples || rm -r "${D}usr/share/${PN}" || die
+	# Extra init script
+	rm -r "${D}usr/sbin/groonga-httpd-restart" || die
+}
diff --git a/app-text/groonga/groonga-8.0.2.ebuild b/app-text/groonga/groonga-8.0.2.ebuild
new file mode 100644
index 000000000000..c628d1b0675e
--- /dev/null
+++ b/app-text/groonga/groonga-8.0.2.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit libtool user
+
+DESCRIPTION="An Embeddable Fulltext Search Engine"
+HOMEPAGE="https://groonga.org/"
+SRC_URI="https://packages.groonga.org/source/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="abort benchmark debug doc dynamic-malloc-change +exact-alloc-count examples fmalloc futex jemalloc libedit libevent lzo +mecab msgpack +nfkc sphinx static-libs uyield zeromq zlib zstd"
+
+RDEPEND=">=dev-libs/onigmo-6.1.1:0=
+	benchmark? ( >=dev-libs/glib-2.8 )
+	jemalloc? ( dev-libs/jemalloc:0= )
+	libedit? ( >=dev-libs/libedit-3 )
+	libevent? ( dev-libs/libevent:0= )
+	lzo? ( dev-libs/lzo )
+	mecab? ( >=app-text/mecab-0.80 )
+	msgpack? ( dev-libs/msgpack )
+	sphinx? ( >=dev-python/sphinx-1.0.1 )
+	zeromq? ( net-libs/zeromq:0= )
+	zlib? ( sys-libs/zlib:0= )
+	zstd? ( app-arch/zstd:0= )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	sphinx? ( dev-python/sphinx )"
+
+REQUIRED_USE=" abort? ( dynamic-malloc-change ) fmalloc? ( dynamic-malloc-change ) sphinx? ( doc )"
+
+pkg_setup() {
+	enewgroup groonga
+	enewuser groonga -1 -1 -1 groonga
+}
+
+src_prepare() {
+	default_src_prepare
+	elibtoolize
+}
+
+src_configure() {
+	# httpd is a bundled copy of nginx; disabled for security reasons
+	# prce only is used with httpd
+	# Apache arrow, kytea and libstemmer are not available in Gentoo repo
+	# ruby is only used for an http test
+	local econfopts=(
+		--disable-groonga-httpd
+		--without-pcre
+		--without-kytea
+		--without-libstemmer
+		--disable-arrow
+		--with-log-path="${EROOT%/}/var/log/${PN}.log"
+		--docdir="${EROOT%/}/usr/share/doc/${P}"
+		--without-ruby
+		--with-shared-onigmo
+		--with-onigmo=system
+		$(use_enable abort)
+		$(use_enable benchmark)
+		$(use_enable debug memory-debug)
+		$(use_enable doc document)
+		$(use_enable dynamic-malloc-change)
+		$(use_enable exact-alloc-count)
+		$(use_enable fmalloc)
+		$(use_enable futex)
+		$(use_with jemalloc)
+		$(use_enable libedit)
+		$(use_with libevent)
+		$(use_with lzo)
+		$(use_with mecab)
+		$(use_enable msgpack message-pack)
+		$(use_with msgpack message-pack "${EROOT%/}/usr")
+		$(use_enable nfkc)
+		$(use_with sphinx sphinx-build)
+		$(use_enable static-libs static)
+		$(use_enable uyield)
+		$(use_enable zeromq)
+		$(use_with zlib)
+		$(use_with zstd)
+	)
+	econf "${econfopts[@]}"
+}
+
+src_install() {
+	local DOCS=( README.md )
+	default
+
+	find "${D}" -name '*.la' -delete || die
+
+	newinitd "${FILESDIR}/${PN}.initd" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd" ${PN}
+
+	keepdir /var/{log,lib}/${PN}
+	fowners groonga:groonga /var/{log,lib}/${PN}
+
+	use examples || rm -r "${D%/}/usr/share/${PN}" || die
+}
diff --git a/app-text/groonga/metadata.xml b/app-text/groonga/metadata.xml
new file mode 100644
index 000000000000..3bf71ce09a19
--- /dev/null
+++ b/app-text/groonga/metadata.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+<email>grknight@gentoo.org</email>
+</maintainer>
+<use>
+   <flag name="abort">Enable query abortion</flag>
+   <flag name="benchmark">Build benchmark programs</flag>
+   <flag name="dynamic-malloc-change">Allow dynamic memory allocation change for testing</flag>
+   <flag name="exact-alloc-count">Atomic counting for memory alloc count</flag>
+   <flag name="fmalloc">Make memory allocation failed in specified condition for debug</flag>
+   <flag name="futex">Use futex</flag>
+   <flag name="jemalloc">Enable <pkg>dev-libs/jemalloc</pkg> for memory management</flag>
+   <flag name="libevent">Enable <pkg>dev-libs/libevent</pkg> used for suggestion</flag>
+   <flag name="mecab">Use <pkg>app-text/mecab</pkg> for morphological analysis</flag>
+   <flag name="msgpack">Enable <pkg>dev-libs/msgpack</pkg> used for suggestion</flag>
+   <flag name="nfkc">Use nfkc based utf8 normalization</flag>
+   <flag name="sphinx">Enable document generation by <pkg>app-misc/sphinx</pkg></flag>
+   <flag name="uyield">Build for detecting race conditions</flag>
+   <flag name="zeromq">Enable <pkg>net-libs/zeromq</pkg> used for suggestion</flag>
+   <flag name="zstd">Utilize <pkg>app-arch/zstd</pkg> for Zstandard compression</flag>
+</use>
+</pkgmetadata>
diff --git a/app-text/grutatxt-2.0.16-r1 b/app-text/grutatxt-2.0.16-r1
deleted file mode 100644
index 879ff2b3518c..000000000000
--- a/app-text/grutatxt-2.0.16-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-lang/perl:=[-build(-)]
-DESCRIPTION=A converter from plain text to HTML and other markup languages
-EAPI=5
-HOMEPAGE=http://triptico.com/software/grutatxt.html
-KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-linux ~ppc-macos ~sparc-solaris
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=http://www.triptico.com/download/Grutatxt-2.0.16.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-app	4b65c2afee485a204b0b22518141ae47	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2715d1ffbc4e4ab33841d81923078fdc
diff --git a/app-text/grutatxt/Manifest b/app-text/grutatxt/Manifest
new file mode 100644
index 000000000000..34174bf9e891
--- /dev/null
+++ b/app-text/grutatxt/Manifest
@@ -0,0 +1,3 @@
+DIST Grutatxt-2.0.16.tar.gz 29929 BLAKE2B 11ed6a87884ed79e6f8705f6ed8ee94c2fa79e6867296eaf6255ed7f9473a99d5fce0dec0d29de16df2a15959b6593dcba7937b3f8cda88ee88072abefb0f01c SHA512 bf5203308d0fb4baea9b161ac3374116f7cd60de3d43e8699f90626aa3f67354d2ff304ab8d45ae6368add31777b4e56a7a4d944137aa5d3687dd457c71a8512
+EBUILD grutatxt-2.0.16-r1.ebuild 640 BLAKE2B 13f90c05ffa575e6e2264dfcdf3b01e6895f9d6256221e0b10b5d220adddbbdf3b91b16025a756b2c03d4b04fbc42937c09718af72164719643ce226e6db65f5 SHA512 4b97945428ebb6f093f437464a90471b49800c8c8048e4dd8401ba91c88ce80decc694dc647477d175ba80ebf00109acf2c5b2ed9d058331e78e96ec3c98a6aa
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/grutatxt/grutatxt-2.0.16-r1.ebuild b/app-text/grutatxt/grutatxt-2.0.16-r1.ebuild
new file mode 100644
index 000000000000..665c38e090d3
--- /dev/null
+++ b/app-text/grutatxt/grutatxt-2.0.16-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+GENTOO_DEPEND_ON_PERL_SUBSLOT=yes
+inherit perl-app
+
+MY_PN="Grutatxt"
+MY_P=${MY_PN}-${PV}
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="A converter from plain text to HTML and other markup languages"
+HOMEPAGE="http://triptico.com/software/grutatxt.html"
+SRC_URI="http://www.triptico.com/download/${MY_P}.tar.gz"
+LICENSE="GPL-2"
+
+IUSE=""
+SLOT="0"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-linux ~ppc-macos ~sparc-solaris"
+
+# set the script path to /usr/bin, rather than /usr/local/bin
+myconf="INSTALLSCRIPT=${EPREFIX}/usr/bin"
diff --git a/app-text/grutatxt/metadata.xml b/app-text/grutatxt/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-text/grutatxt/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/app-text/gspell-1.4.2 b/app-text/gspell-1.4.2
deleted file mode 100644
index c15d2e92c223..000000000000
--- a/app-text/gspell-1.4.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=app-text/iso-codes >=app-text/enchant-1.6.0 >=dev-libs/glib-2.44:2 >=x11-libs/gtk+-3.20:3[introspection?] introspection? ( >=dev-libs/gobject-introspection-1.42.0:= ) vala? ( || ( dev-lang/vala:0.36[vapigen(+)] dev-lang/vala:0.34[vapigen(+)] dev-lang/vala:0.32[vapigen(+)] ) ) >=dev-util/gtk-doc-am-1.25 >=sys-devel/gettext-0.19.4 virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Spell check library for GTK+ applications
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Projects/gspell
-IUSE=+introspection vala test
-KEYWORDS=~alpha amd64 ~arm ~ppc ~sparc x86 ~amd64-fbsd
-LICENSE=LGPL-2.1+
-RDEPEND=app-text/iso-codes >=app-text/enchant-1.6.0 >=dev-libs/glib-2.44:2 >=x11-libs/gtk+-3.20:3[introspection?] introspection? ( >=dev-libs/gobject-introspection-1.42.0:= ) vala? ( || ( dev-lang/vala:0.36[vapigen(+)] dev-lang/vala:0.34[vapigen(+)] dev-lang/vala:0.32[vapigen(+)] ) )
-REQUIRED_USE=vala? ( introspection )
-SLOT=0/1
-SRC_URI=mirror://gnome/sources/gspell/1.4/gspell-1.4.2.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4e169d6edf795eb50a6a3b3fe9f4c2a7
diff --git a/app-text/gspell/Manifest b/app-text/gspell/Manifest
new file mode 100644
index 000000000000..cdde5cca36b6
--- /dev/null
+++ b/app-text/gspell/Manifest
@@ -0,0 +1,3 @@
+DIST gspell-1.4.2.tar.xz 407356 BLAKE2B f2ee6ae43be55e8ad7253e10893868a8d7857bbe41e14d71103b27a0faf40b0ed247e9fa38ed7bc75039fe0f1f600fe739f538d50f69fb063d0932df6c0b1c27 SHA512 00f53d3ca47a4ba1af1e8b4983a41dc6df8a9788898b45ffdd161a3fc8de28024cc985f49fbb872912c0a94addbca3b28ce2edda70eeb206a794e2bcf65e4a5e
+EBUILD gspell-1.4.2.ebuild 984 BLAKE2B 34d49bf58ed3d59cbb94f95739fa8e03985f3e93be328251e5f1a080ea2e0eec734e9ab036e096f37c873da24c4fdea98c09b98bb010d9c9fc7b455e6ef7ad74 SHA512 43c47b3b112301aa1876e805999bb1631f6add794a7ab68d5ba162f7d12b741fadf2486458294f4b2b5bfd78f3143d9f9ca16631ba8020aad92ff1fbefc2cd92
+MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-text/gspell/gspell-1.4.2.ebuild b/app-text/gspell/gspell-1.4.2.ebuild
new file mode 100644
index 000000000000..25328fe7e66c
--- /dev/null
+++ b/app-text/gspell/gspell-1.4.2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome2 vala virtualx
+
+DESCRIPTION="Spell check library for GTK+ applications"
+HOMEPAGE="https://wiki.gnome.org/Projects/gspell"
+
+LICENSE="LGPL-2.1+"
+SLOT="0/1" # subslot = libgspell-1 soname version
+KEYWORDS="~alpha amd64 ~arm ~ppc ~sparc x86 ~amd64-fbsd"
+
+IUSE="+introspection vala"
+REQUIRED_USE="vala? ( introspection )"
+
+RDEPEND="
+	app-text/iso-codes
+	>=app-text/enchant-1.6.0
+	>=dev-libs/glib-2.44:2
+	>=x11-libs/gtk+-3.20:3[introspection?]
+	introspection? ( >=dev-libs/gobject-introspection-1.42.0:= )
+	vala? ( $(vala_depend) )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.25
+	>=sys-devel/gettext-0.19.4
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		$(use_enable introspection) \
+		$(use_enable vala)
+}
+
+src_test() {
+	virtx emake check
+}
diff --git a/app-text/gspell/metadata.xml b/app-text/gspell/metadata.xml
new file mode 100644
index 000000000000..39980802b1da
--- /dev/null
+++ b/app-text/gspell/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-text/gtkspell-2.0.16 b/app-text/gtkspell-2.0.16
deleted file mode 100644
index 5015ac077037..000000000000
--- a/app-text/gtkspell-2.0.16
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=x11-libs/gtk+:2 >=app-text/enchant-1.1.6 dev-util/gtk-doc-am >=dev-util/intltool-0.35.0 virtual/pkgconfig
-DESCRIPTION=Spell checking widget for GTK
-EAPI=4
-HOMEPAGE=http://gtkspell.sourceforge.net/
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris
-LICENSE=GPL-2+
-RDEPEND=x11-libs/gtk+:2 >=app-text/enchant-1.1.6
-SLOT=2
-SRC_URI=http://gtkspell.sourceforge.net/download/gtkspell-2.0.16.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=73ccb3b7b99fdad9520bff22af5ef760
diff --git a/app-text/gtkspell-3.0.9 b/app-text/gtkspell-3.0.9
deleted file mode 100644
index 58169f9d8c02..000000000000
--- a/app-text/gtkspell-3.0.9
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=app-text/enchant-1.1.6 app-text/iso-codes dev-libs/glib:2 x11-libs/gtk+:3[introspection?] >=x11-libs/pango-1.8.0[introspection?] introspection? ( >=dev-libs/gobject-introspection-1.30:= ) >=dev-util/gtk-doc-am-1.17 >=dev-util/intltool-0.35.0 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.36 dev-lang/vala:0.34 dev-lang/vala:0.32 ) ) >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Spell checking widget for GTK
-EAPI=6
-HOMEPAGE=http://gtkspell.sourceforge.net/
-IUSE=+introspection vala
-KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris
-LICENSE=GPL-2+
-RDEPEND=>=app-text/enchant-1.1.6 app-text/iso-codes dev-libs/glib:2 x11-libs/gtk+:3[introspection?] >=x11-libs/pango-1.8.0[introspection?] introspection? ( >=dev-libs/gobject-introspection-1.30:= )
-REQUIRED_USE=vala? ( introspection )
-SLOT=3/0
-SRC_URI=mirror://sourceforge/project/gtkspell/3.0.9/gtkspell3-3.0.9.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e5b173e163c84b808dbaf264e8bee285
diff --git a/app-text/gtkspell/Manifest b/app-text/gtkspell/Manifest
new file mode 100644
index 000000000000..18ad7b200507
--- /dev/null
+++ b/app-text/gtkspell/Manifest
@@ -0,0 +1,5 @@
+DIST gtkspell-2.0.16.tar.gz 351277 BLAKE2B ccb49b99c4f9059ed4461bb5ffda4dbeb691c5a062184ba7b51d8464d2461c5be0d648e4f69dbc36fe345be2addbc271af9701a0a387975265585dd3a7926e99 SHA512 7d3afb327c2e15608194e6ee6110107a0ce082e483788d831d636b2e579472304137373c09a966d8e5c0cd2f830bf2e0ee477c9b5fca7da6ee27fd1498915b9d
+DIST gtkspell3-3.0.9.tar.xz 298988 BLAKE2B 01a824ba91fff1739046134ef0025cf894ed3f524dcc96a11ba6b23def3b1d84ef66fc5dbf37c1a047d23b276b944b25e89ff6a84ebfe19a1189ccc59d230250 SHA512 de6cc24ca092067a101996142bf2b3cfb6a5af2170ea4b0185a997e5c88adead7ba53c5a297c3110b3a66dc87d37e429720f972895bb2931f9a033fc006e2eab
+EBUILD gtkspell-2.0.16.ebuild 942 BLAKE2B ef168b07393e46a98497b1fa3a7d0e999af3d0a943a72e7c1b07eea830745ea6f56c7b1d6f9da3c392ec76fb56fa9ceabcc01ea26d5880ead6d281a0b5088d63 SHA512 90460f1f223900b13fa54ffdf5e87ff2b810d540242691f3574079ed66dd061539cf0d0bd5668f3fde09b2a18297cea93afedffb2772ac3725cdb98a5270ef53
+EBUILD gtkspell-3.0.9.ebuild 1073 BLAKE2B 3ec89c21b8057ac6dc4db2e492b58044879f215611ee6c4dc5da55fe2ea5d5b4826d65ad3458b77029bb413426cad8c03e0cb46655f0493cd48b812b9fdcfbeb SHA512 39aaa3a31784ec025a8b6fd0a54cb7c05f7f5b346bb06062c8d467887977019dbe0131bf83c5e8e563a1c179977db821a03831df67d045d6ecf64ef734b406de
+MISC metadata.xml 331 BLAKE2B 09488ce0a015e7f7321a4a72cf8b046c63a5497694736ea7d9450455f447be0a328bb5d6f607d86032cf1fa77ce3d204373dea048a5b089f0eb7b38c4626ddc3 SHA512 51f55422f9e5a13f8cff5ae6ed6e00f2be248ccd4b472c0d8519c73fcda34d19129fc3183d4c570480198f14468fd8b208ddab0c70df05431ab8470399221514
diff --git a/app-text/gtkspell/gtkspell-2.0.16.ebuild b/app-text/gtkspell/gtkspell-2.0.16.ebuild
new file mode 100644
index 000000000000..fa7512b9378a
--- /dev/null
+++ b/app-text/gtkspell/gtkspell-2.0.16.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit eutils
+
+DESCRIPTION="Spell checking widget for GTK"
+HOMEPAGE="http://gtkspell.sourceforge.net/"
+# gtkspell doesn't use sourceforge mirroring system it seems.
+SRC_URI="http://${PN}.sourceforge.net/download/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="2"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
+IUSE=""
+
+RDEPEND="x11-libs/gtk+:2
+	>=app-text/enchant-1.1.6"
+DEPEND="${RDEPEND}
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.35.0
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS ChangeLog README ) # NEWS file is empty
+
+src_prepare() {
+	# Fix intltoolize broken file, see upstream #577133
+	sed -i -e "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" po/Makefile.in.in || die
+}
+
+src_configure() {
+	econf --disable-static
+}
+
+src_install() {
+	default
+	prune_libtool_files
+}
diff --git a/app-text/gtkspell/gtkspell-3.0.9.ebuild b/app-text/gtkspell/gtkspell-3.0.9.ebuild
new file mode 100644
index 000000000000..f41e0ea8e2fd
--- /dev/null
+++ b/app-text/gtkspell/gtkspell-3.0.9.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2 vala
+
+DESCRIPTION="Spell checking widget for GTK"
+HOMEPAGE="http://gtkspell.sourceforge.net/"
+MY_P="${PN}3-${PV}"
+SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${MY_P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="3/0"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
+IUSE="+introspection vala"
+REQUIRED_USE="vala? ( introspection )"
+
+RDEPEND="
+	>=app-text/enchant-1.1.6
+	app-text/iso-codes
+	dev-libs/glib:2
+	x11-libs/gtk+:3[introspection?]
+	>=x11-libs/pango-1.8.0[introspection?]
+	introspection? ( >=dev-libs/gobject-introspection-1.30:= )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.17
+	>=dev-util/intltool-0.35.0
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		$(use_enable introspection) \
+		$(use_enable vala)
+}
diff --git a/app-text/gtkspell/metadata.xml b/app-text/gtkspell/metadata.xml
new file mode 100644
index 000000000000..12e634dd9407
--- /dev/null
+++ b/app-text/gtkspell/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">gtkspell</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/gtranslator-2.91.7-r1 b/app-text/gtranslator-2.91.7-r1
deleted file mode 100644
index abb91b2125cd..000000000000
--- a/app-text/gtranslator-2.91.7-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=>=dev-libs/glib-2.32:2[dbus] >=x11-libs/gtk+-3.4.2:3[introspection?] >=x11-libs/gtksourceview-3.0.0:3.0[introspection?] >=dev-libs/gdl-3.6:3= >=dev-libs/libxml2-2.4.12:2 >=dev-libs/json-glib-0.12.0 >=dev-libs/libpeas-1.2[gtk] gnome-extra/libgda:5= >=app-text/iso-codes-0.35 gnome-base/gsettings-desktop-schemas gnome-dictionary? ( app-dicts/gnome-dictionary:= ) gucharmap? ( python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) introspection? ( >=dev-libs/gobject-introspection-0.9.3 ) spell? ( app-text/gtkspell:3= ) >=dev-util/gtk-doc-am-1 >=dev-util/intltool-0.50.1 >=sys-devel/gettext-0.17 virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=An enhanced gettext po file editor for GNOME
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Apps/Gtranslator
-IUSE=+introspection gnome-dictionary gucharmap spell python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=amd64 ~ppc x86
-LICENSE=GPL-3+ FDL-1.1+
-RDEPEND=>=dev-libs/glib-2.32:2[dbus] >=x11-libs/gtk+-3.4.2:3[introspection?] >=x11-libs/gtksourceview-3.0.0:3.0[introspection?] >=dev-libs/gdl-3.6:3= >=dev-libs/libxml2-2.4.12:2 >=dev-libs/json-glib-0.12.0 >=dev-libs/libpeas-1.2[gtk] gnome-extra/libgda:5= >=app-text/iso-codes-0.35 gnome-base/gsettings-desktop-schemas gnome-dictionary? ( app-dicts/gnome-dictionary:= ) gucharmap? ( python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) introspection? ( >=dev-libs/gobject-introspection-0.9.3 ) spell? ( app-text/gtkspell:3= ) x11-themes/gnome-icon-theme-symbolic gucharmap? ( >=dev-libs/libpeas-1.2[gtk,python,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pygobject:3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] gnome-extra/gucharmap:2.90[introspection] x11-libs/gtk+:3[introspection] )
-REQUIRED_USE=gucharmap? ( introspection ^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
-SLOT=0
-SRC_URI=mirror://gnome/sources/gtranslator/2.91/gtranslator-2.91.7.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=10916eeb2e9424f7c0642f9c39e3ed4c
diff --git a/app-text/gtranslator/Manifest b/app-text/gtranslator/Manifest
new file mode 100644
index 000000000000..03d4339c90bc
--- /dev/null
+++ b/app-text/gtranslator/Manifest
@@ -0,0 +1,5 @@
+AUX gtranslator-2.91.7-gi-silence.patch 869 BLAKE2B 9916f2b8b83ddf924b55d9839b6d0c48796b593227dd02494e25f652f9ec75fc3e439ce3809116a5dd8337c596acfed89b6baaccd5d053b78379860c4f4f646c SHA512 c23457f2267377aefda4842e2300b33ced326ca7933d5d060e9f4c2e419267f722589f7fc9d7793f5b73e1f3cba2a3f863501c44ddf4f50a2acc45ad3b2b862e
+AUX gtranslator-2.91.7-gucharmap-python3.patch 1851 BLAKE2B dd54f2cd05501e0cdaae7fb082c8731b80cf232886ebef70f86b082996ea3c68e67d1c5fbf737a6dbfed14a63727d6cf937f93800ec24859b2e1afda528ff650 SHA512 0a622e707018fcf27c8d29317d87ad967a98eafb6961c447c566a383b434b4c06d8544e7c8575bfe36b352d9e08b2e6570628b4bf41ac3c41af3e31905a7a1e8
+DIST gtranslator-2.91.7.tar.xz 2835836 BLAKE2B e6e1f7b512705152a520a47bdddd01336ddcecb9ca20409546d64caa124f1bca2985fd2a9cd7564983a8411c6a7227d37b55ce8b3e452ee7a0d5beba3460bd59 SHA512 8d2a582e06ab0fecb9c18bde372ca0cd02d426155d4b30b876bd8f2e177c88c79d410adb0297ab85f18a952eeef32c17352cde18eda3c4c4fe33833db25022b5
+EBUILD gtranslator-2.91.7-r1.ebuild 2155 BLAKE2B 6e1e52dabd1b6cf90485c489ff1fa80966f1586cd2e16bac7ea8cd23ac1d5fcefdc817b701bf5e42647ec7c0368899cefc2b551eca09bdd32da0e496c6c097e9 SHA512 9d09a607d270e4999fff278ac4acb7b8424acf96ae6951b05022a266f7a806313bf07831b9f47b5bd7184c4c87c8014900cf57e00a36cb867e32cd25582ee144
+MISC metadata.xml 586 BLAKE2B a88ed8865c080411d6730962274dc991abceca8927ae3d427892cfe633a985c88bd6db8b3f409c19f552678ab55ec9f29422a830a4b6c12fa1a8c89d60344e0e SHA512 9f1f582767da7fec99f0cebecc01775b4b76b5eba91015a1c987599ed37bf8f4b031004765dc4388f8094e34034d3cf3636f53f6ac3c7b8c15e8a2e7986fd76f
diff --git a/app-text/gtranslator/files/gtranslator-2.91.7-gi-silence.patch b/app-text/gtranslator/files/gtranslator-2.91.7-gi-silence.patch
new file mode 100644
index 000000000000..19a3a6d1e985
--- /dev/null
+++ b/app-text/gtranslator/files/gtranslator-2.91.7-gi-silence.patch
@@ -0,0 +1,26 @@
+From acc785dd63379f08f08b52fae9d7e5c5666495c8 Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Mon, 17 Apr 2017 00:15:58 +0200
+Subject: [PATCH] Silence gobject-introspection warning on version-less imports
+
+---
+ plugins/charmap/charmap/__init__.py | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/plugins/charmap/charmap/__init__.py b/plugins/charmap/charmap/__init__.py
+index b504cb61..6f8c2b61 100644
+--- a/plugins/charmap/charmap/__init__.py
++++ b/plugins/charmap/charmap/__init__.py
+@@ -16,6 +16,9 @@
+ # You should have received a copy of the GNU General Public License
+ # along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ 
++import gi
++gi.require_version('Gucharmap', '2.90')
++
+ from gi.repository import GObject, Gio, Pango, Gtk, Gtranslator, Gucharmap
+ from .panel import CharmapPanel
+ import sys
+-- 
+2.12.2
+
diff --git a/app-text/gtranslator/files/gtranslator-2.91.7-gucharmap-python3.patch b/app-text/gtranslator/files/gtranslator-2.91.7-gucharmap-python3.patch
new file mode 100644
index 000000000000..1ad491cf3c00
--- /dev/null
+++ b/app-text/gtranslator/files/gtranslator-2.91.7-gucharmap-python3.patch
@@ -0,0 +1,51 @@
+From 1e4d042f7e9b28a58bd09af5c97e4282441113d2 Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Sun, 16 Apr 2017 23:48:29 +0200
+Subject: [PATCH 1/2] Switch gucharmap plugin to python3 loader
+
+---
+ plugins/charmap/charmap/__init__.py           | 2 +-
+ plugins/charmap/gtr-charmap.plugin.desktop.in | 2 +-
+ src/gtr-plugins-engine.c                      | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/plugins/charmap/charmap/__init__.py b/plugins/charmap/charmap/__init__.py
+index 414157b1..b504cb61 100644
+--- a/plugins/charmap/charmap/__init__.py
++++ b/plugins/charmap/charmap/__init__.py
+@@ -17,7 +17,7 @@
+ # along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ 
+ from gi.repository import GObject, Gio, Pango, Gtk, Gtranslator, Gucharmap
+-from panel import CharmapPanel
++from .panel import CharmapPanel
+ import sys
+ import gettext
+ 
+diff --git a/plugins/charmap/gtr-charmap.plugin.desktop.in b/plugins/charmap/gtr-charmap.plugin.desktop.in
+index 3949c5f6..a872a545 100644
+--- a/plugins/charmap/gtr-charmap.plugin.desktop.in
++++ b/plugins/charmap/gtr-charmap.plugin.desktop.in
+@@ -1,5 +1,5 @@
+ [Plugin]
+-Loader=python
++Loader=python3
+ Module=charmap
+ IAge=3
+ _Name=Character Map
+diff --git a/src/gtr-plugins-engine.c b/src/gtr-plugins-engine.c
+index 903ea735..8e41010a 100644
+--- a/src/gtr-plugins-engine.c
++++ b/src/gtr-plugins-engine.c
+@@ -64,7 +64,7 @@ gtr_plugins_engine_init (GtrPluginsEngine * engine)
+                                               GTR_TYPE_PLUGINS_ENGINE,
+                                               GtrPluginsEnginePrivate);
+ 
+-  peas_engine_enable_loader (PEAS_ENGINE (engine), "python");
++  peas_engine_enable_loader (PEAS_ENGINE (engine), "python3");
+ 
+   engine->priv->plugin_settings = g_settings_new ("org.gnome.gtranslator.plugins");
+ 
+-- 
+2.12.2
+
diff --git a/app-text/gtranslator/gtranslator-2.91.7-r1.ebuild b/app-text/gtranslator/gtranslator-2.91.7-r1.ebuild
new file mode 100644
index 000000000000..7e68b60a02a3
--- /dev/null
+++ b/app-text/gtranslator/gtranslator-2.91.7-r1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python{3_4,3_5,3_6} )
+
+inherit gnome2 python-single-r1
+
+DESCRIPTION="An enhanced gettext po file editor for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Gtranslator"
+
+LICENSE="GPL-3+ FDL-1.1+"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE="+introspection gnome-dictionary gucharmap spell"
+REQUIRED_USE="gucharmap? ( introspection ${PYTHON_REQUIRED_USE} )"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.32:2[dbus]
+	>=x11-libs/gtk+-3.4.2:3[introspection?]
+	>=x11-libs/gtksourceview-3.0.0:3.0[introspection?]
+	>=dev-libs/gdl-3.6:3=
+	>=dev-libs/libxml2-2.4.12:2
+	>=dev-libs/json-glib-0.12.0
+	>=dev-libs/libpeas-1.2[gtk]
+	gnome-extra/libgda:5=
+	>=app-text/iso-codes-0.35
+
+	gnome-base/gsettings-desktop-schemas
+
+	gnome-dictionary? ( app-dicts/gnome-dictionary:= )
+	gucharmap? ( ${PYTHON_DEPS} )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.3 )
+	spell? ( app-text/gtkspell:3= )
+"
+RDEPEND="${COMMON_DEPEND}
+	x11-themes/gnome-icon-theme-symbolic
+	gucharmap? (
+		>=dev-libs/libpeas-1.2[gtk,python,${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		gnome-extra/gucharmap:2.90[introspection]
+		x11-libs/gtk+:3[introspection] )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/gtk-doc-am-1
+	>=dev-util/intltool-0.50.1
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+"
+# eautoreconf requires gnome-base/gnome-common, app-text/yelp-tools
+
+PATCHES=(
+	# Switch plugin to python3 loader
+	"${FILESDIR}"/${P}-gucharmap-python3.patch
+	# Silence g-i import warnings
+	"${FILESDIR}"/${P}-gi-silence.patch
+)
+
+pkg_setup() {
+	use gucharmap && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	DOCS="AUTHORS ChangeLog HACKING INSTALL NEWS README THANKS"
+
+	gnome2_src_prepare
+
+	if ! use gucharmap ; then
+		# don't install charmap plugin, it requires gnome-extra/gucharmap
+		sed -e 's:\scharmap\s: :g' -i plugins/Makefile.* ||
+			die "sed plugins/Makefile.* failed"
+	fi
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		$(use_enable introspection) \
+		$(use_with gnome-dictionary dictionary) \
+		$(use_with spell gtkspell)
+}
diff --git a/app-text/gtranslator/metadata.xml b/app-text/gtranslator/metadata.xml
new file mode 100644
index 000000000000..a6e15044678b
--- /dev/null
+++ b/app-text/gtranslator/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
+	<use>
+		<flag name="gnome-dictionary">Enable plugin for dictionary lookups using <pkg>app-dicts/gnome-dictionary</pkg>.</flag>
+		<flag name="gucharmap">Enable plugin for unicode symbols selection using <pkg>gnome-extra/gucharmap</pkg>.</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">gtranslator</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/gv-3.7.3-r1 b/app-text/gv-3.7.3-r1
deleted file mode 100644
index febf97d0001a..000000000000
--- a/app-text/gv-3.7.3-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=app-text/ghostscript-gpl x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libXaw3d-1.6-r1[unicode] x11-libs/libXext x11-libs/libXmu x11-libs/libXpm x11-libs/libXt xinerama? ( x11-libs/libXinerama ) virtual/pkgconfig x11-base/xorg-proto
-DESCRIPTION=Viewer for PostScript and PDF documents using Ghostscript
-EAPI=4
-HOMEPAGE=https://www.gnu.org/software/gv/
-IUSE=xinerama
-KEYWORDS=alpha amd64 ~arm hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=GPL-3
-RDEPEND=app-text/ghostscript-gpl x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libXaw3d-1.6-r1[unicode] x11-libs/libXext x11-libs/libXmu x11-libs/libXpm x11-libs/libXt xinerama? ( x11-libs/libXinerama )
-SLOT=0
-SRC_URI=mirror://gnu/gv/gv-3.7.3.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e084bbdfbf3d4cb2fbfc1c12a6b31901
diff --git a/app-text/gv-3.7.3.90 b/app-text/gv-3.7.3.90
deleted file mode 100644
index a198906a97ae..000000000000
--- a/app-text/gv-3.7.3.90
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=app-text/ghostscript-gpl x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libXaw3d-1.6-r1[unicode] x11-libs/libXext x11-libs/libXmu x11-libs/libXpm x11-libs/libXt xinerama? ( x11-libs/libXinerama ) virtual/pkgconfig x11-base/xorg-proto
-DESCRIPTION=Viewer for PostScript and PDF documents using Ghostscript
-EAPI=5
-HOMEPAGE=https://www.gnu.org/software/gv/
-IUSE=xinerama
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=GPL-3
-RDEPEND=app-text/ghostscript-gpl x11-libs/libICE x11-libs/libSM x11-libs/libX11 >=x11-libs/libXaw3d-1.6-r1[unicode] x11-libs/libXext x11-libs/libXmu x11-libs/libXpm x11-libs/libXt xinerama? ( x11-libs/libXinerama )
-SLOT=0
-SRC_URI=mirror://gnu-alpha/gv/gv-3.7.3.90.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1a0c771fd640dd00078be9d2710c63a6
diff --git a/app-text/gv/Manifest b/app-text/gv/Manifest
new file mode 100644
index 000000000000..2192325b307d
--- /dev/null
+++ b/app-text/gv/Manifest
@@ -0,0 +1,7 @@
+AUX gv-3.7.3-libXaw3d-1.6.patch 404 BLAKE2B c77340974dd82861d952ae91b6b75d51c987e043b7f420e8d0a60018cffb403344be2cfd23e2225127f73900d72fc5d40e454876fc2f5659939aeb2e9716ceff SHA512 3b047d34b03efeefe5f764ac02f32b9e1b7fe43f8a08eb49e54313ce42d2c6323573dfb90fd46d77eb81c3acc9dfbd98a5551f5cf49b48240a519eb57c4e1b19
+AUX gv_icon.xpm 2837 BLAKE2B d4e15bbf39e183b0093c7f9effa2725e558b6f0fad3d44fc3831c7c142081e668c727cc1688d0bd2b61e1702b50351f841f7390d1873cf27c21474549eed87d3 SHA512 6aae3a463fbf3484028f7ca8f50cb7a332f5566f3bb84dd5c17843b581e1b6013b4f99a1de8600e9d4a0ba5b9b7ce131ee37b0fd80b97e32ef018d272f756076
+DIST gv-3.7.3.90.tar.gz 757506 BLAKE2B f856d23d3b9b9164db414534dec4b9a1c441a88d644011a46429b29127364fe429fc72ed3ce76d4142106d10c6a5305b81ec22ed353716df1c1a824907f7b191 SHA512 a80ff303fda1d6f13d66847f4b20aee4b364a05ec750bdb08267aa46470b201edf9762e16ad39dfe9da03118658598697f411dc8c32ab8bbad05a1161e816c50
+DIST gv-3.7.3.tar.gz 754282 BLAKE2B cdc2133e9be41e420401d23ab7691ca27ccbcabbe5c4d2c892f5661b5c47afc1f5b90f9f240a735d33e66813dcdda0a7a5c78580719ad715048fcaf6a2991446 SHA512 0c0339f023896016212bb1b8ef0185689dd669855c060d0491e1ac59c76ca19f3006b1b00b421cb40bb0beba8e2d35dad1da7d856ac9d33440cfbb07ff1e33c3
+EBUILD gv-3.7.3-r1.ebuild 1183 BLAKE2B dbefcf30dd0b7410eface0373aa1864c0589cd6c2c9a4c4bf3e9dd24ff1043cd3ab14191a7ea2fd96c473b0e2f1e858f637c6ac09dcda5cb844e2b448e3dfc40 SHA512 261e7c286d25790b2a1e8076182f2c021aefeb05d42be9302913047a0de78af93d11e362fb3bde4c801cc87f59a47173a08927eaf0b2815577ec44ab731e8234
+EBUILD gv-3.7.3.90.ebuild 1052 BLAKE2B a5dad483860dc130a75211e8febd41522cb7f9a6b3a4dd56eabfc6231683822a7e8829bf1eb5200df3209ed6a2e52f64c5ac93d02f0937c864943ec1f12aba85 SHA512 8f7ae65364aa6a2fe32689a8389c94978da3c1ec7339a74214562ecbba0bbc531db57e9b30c0096a8428d205274c0953118f7b409a66c5e9894ce85628a25e0f
+MISC metadata.xml 255 BLAKE2B 06f078acf8e4416705c8bad8b4802a44592eb962c08c050e11332bfa97564fafdf08754ab056eb813f6baeaa6cdfaf5d71672455d77e74045f86098c221d5136 SHA512 c6c5f966cfbe396fde1b15334442de9e0004b44c4b48775588b0b25a058ad1751252761370c9c254280e97561fa6306f5aa0cc7959c675d4ee11f7f95d777a36
diff --git a/app-text/gv/files/gv-3.7.3-libXaw3d-1.6.patch b/app-text/gv/files/gv-3.7.3-libXaw3d-1.6.patch
new file mode 100644
index 000000000000..76c88b158b27
--- /dev/null
+++ b/app-text/gv/files/gv-3.7.3-libXaw3d-1.6.patch
@@ -0,0 +1,15 @@
+This piece of code is from libXaw3d-1.6/src/Scrollbar.c (Line 644)
+
+http://bugs.gentoo.org/399753
+
+--- src/Scrollbar.c
++++ src/Scrollbar.c
+@@ -1006,7 +1006,7 @@
+    TOPLOC = newtop;
+    SHOWNLENGTH = newbot-newtop+1;
+ 
+-   (*swclass->threeD_class.shadowdraw) (w, event, region, FALSE);
++   (*swclass->threeD_class.shadowdraw) (w, event, region, sbw->threeD.relief, FALSE);
+ 
+    ENDMESSAGE(Redisplay)
+ }
diff --git a/app-text/gv/files/gv_icon.xpm b/app-text/gv/files/gv_icon.xpm
new file mode 100644
index 000000000000..a4a8fb4693be
--- /dev/null
+++ b/app-text/gv/files/gv_icon.xpm
@@ -0,0 +1,58 @@
+/* XPM */
+static char *gv_icon[] = {
+/* columns rows colors chars-per-pixel */
+"50 50 2 1",
+"  c #FFFFFF",
+". c #000000",
+/* pixels */
+" . . . . . . . . . . . . . . . . . . . . . . . . .",
+". . . . . . . . . . . . . . . . . . . . . . . . . ",
+" . . . . . . . . . . . . . . . . . . . . . . . . .",
+". . . . . . . . . . . . . . . . . . . . . . . . . ",
+" . . . . . . .   .   . .     .   .   . . . . . . .",
+". . . . . . .  .   .  .  . .       .    . . . . . ",
+" . . . .    .     .            .       . .   . . .",
+". . . . . . . . .            .     . .  . . . . . ",
+" . . . . .    .                        .   . . . .",
+". . . . .   .        ......     .     . .   . . . ",
+" . . .   .    .     ..    ...     . .      . . . .",
+". . .  .   .       ..       ..          . . . . . ",
+" . . .    .  .    ..         .  .  . .  .  . . . .",
+". . . . .         ..          .             . . . ",
+" . . .    . .     ..          .   .    .   . . . .",
+". . .  .       .  ..         ..           . . . . ",
+" . . .            ...       ..        .  . . . . .",
+". . . .  ....      ..      ..             . . . . ",
+" . . .   .. ..     ...     .      ....     . . . .",
+". . . . ...  .      ..     .     ..  ..   . . . . ",
+" . . .  ...  ...    .      .    ..    .  . . . . .",
+". . .    ...   .....       ..  ..   ...   . . . . ",
+" . . .    ...               ....   ..    . . . . .",
+". . . .    ....                   ..      . . . . ",
+" . . .       ...                 ..      . . . . .",
+". . . . .. .  ...               ..        . . . . ",
+" . . .         ...             ..          . . . .",
+". . .  .        ..             ..    .  .   . . . ",
+" . . .  . . .   ...           ..          .  . . .",
+". . . . .       ...          ..     .   .   . . . ",
+" . . .    .      ..          .             . . . .",
+". . . .      .   ...        ..    .  .      . . . ",
+" . . .  .  .      ...       .        .   . . . . .",
+". . . .       .    ..       ..  .         . . . . ",
+" . . .  .  .       ...      ..    .      . . . . .",
+". . .               ...      .            . . . . ",
+" . . .  .  . .      ...      ..   ..   . . . . . .",
+". . . .         .    ...     .......      . . . . ",
+" . . .  . .    .     ...      .... .     . . . . .",
+". . . .         .     ...         ..   .  . . . . ",
+" . . . . .  . .        ....      ..        . . . .",
+". . . .    .      .     ..........    . . . . . . ",
+" . . . . .    .      .    .......          . . . .",
+". . . . .   .   .                   . . . . . . . ",
+" . . . . . . . .  .  . .    .    .       . . . . .",
+". . . . . . . . . . . . . . . .   . . . . . . . . ",
+" . . . . . . . . . . . . . . . . . . . . . . . . .",
+". . . . . . . . . . . . . . . . . . . . . . . . . ",
+" . . . . . . . . . . . . . . . . . . . . . . . . .",
+". . . . . . . . . . . . . . . . . . . . . . . . . "
+};
diff --git a/app-text/gv/gv-3.7.3-r1.ebuild b/app-text/gv/gv-3.7.3-r1.ebuild
new file mode 100644
index 000000000000..e93336e80634
--- /dev/null
+++ b/app-text/gv/gv-3.7.3-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+inherit eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="Viewer for PostScript and PDF documents using Ghostscript"
+HOMEPAGE="https://www.gnu.org/software/gv/"
+SRC_URI="mirror://gnu/gv/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="xinerama"
+
+RDEPEND="app-text/ghostscript-gpl
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	>=x11-libs/libXaw3d-1.6-r1[unicode]
+	x11-libs/libXext
+	x11-libs/libXmu
+	x11-libs/libXpm
+	x11-libs/libXt
+	xinerama? ( x11-libs/libXinerama )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	x11-base/xorg-proto"
+
+DOCS="AUTHORS ChangeLog NEWS README"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-3.7.3-libXaw3d-1.6.patch
+}
+
+src_configure() {
+	# Grab -DXAW_INTERNATIONALIZATION if needed
+	append-cppflags "$($(tc-getPKG_CONFIG) --cflags xaw3d)"
+
+	export ac_cv_lib_Xinerama_main=$(usex xinerama)
+	econf --enable-scrollbar-code
+}
+
+src_install() {
+	default
+	doicon "${FILESDIR}"/gv_icon.xpm
+	make_desktop_entry gv GhostView gv_icon 'Graphics;Viewer'
+}
diff --git a/app-text/gv/gv-3.7.3.90.ebuild b/app-text/gv/gv-3.7.3.90.ebuild
new file mode 100644
index 000000000000..95b3ac253ccb
--- /dev/null
+++ b/app-text/gv/gv-3.7.3.90.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils
+
+DESCRIPTION="Viewer for PostScript and PDF documents using Ghostscript"
+HOMEPAGE="https://www.gnu.org/software/gv/"
+# Change 'gnu-alpha' to 'gnu' for final release, like 3.7.4
+SRC_URI="mirror://gnu-alpha/gv/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="xinerama"
+
+RDEPEND="app-text/ghostscript-gpl
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	>=x11-libs/libXaw3d-1.6-r1[unicode]
+	x11-libs/libXext
+	x11-libs/libXmu
+	x11-libs/libXpm
+	x11-libs/libXt
+	xinerama? ( x11-libs/libXinerama )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	x11-base/xorg-proto"
+
+DOCS="AUTHORS ChangeLog NEWS README"
+
+src_configure() {
+	export ac_cv_lib_Xinerama_main=$(usex xinerama)
+	econf --enable-scrollbar-code
+}
+
+src_install() {
+	default
+	doicon "${FILESDIR}"/gv_icon.xpm
+	make_desktop_entry gv GhostView gv_icon 'Graphics;Viewer'
+}
diff --git a/app-text/gv/metadata.xml b/app-text/gv/metadata.xml
new file mode 100644
index 000000000000..c439b06d8c84
--- /dev/null
+++ b/app-text/gv/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>printing@gentoo.org</email>
+	<name>Gentoo Printing Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-text/hd2u-1.0.3 b/app-text/hd2u-1.0.3
deleted file mode 100644
index 91343f19ea7f..000000000000
--- a/app-text/hd2u-1.0.3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=prepare
-DEPEND=dev-libs/popt
-DESCRIPTION=Dos2Unix like text file converter
-EAPI=4
-HOMEPAGE=http://www.megaloman.com/~hany/software/hd2u/
-KEYWORDS=alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/popt !app-text/dos2unix
-SLOT=0
-SRC_URI=http://www.megaloman.com/~hany/_data/hd2u/hd2u-1.0.3.tgz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f959d82f39c5d5e60eae5134c2e71c55
diff --git a/app-text/hd2u/Manifest b/app-text/hd2u/Manifest
new file mode 100644
index 000000000000..f3e0e5d43aff
--- /dev/null
+++ b/app-text/hd2u/Manifest
@@ -0,0 +1,4 @@
+AUX hd2u-1.0.3-build.patch 666 BLAKE2B 14d1e7cbb7c7302ec0aa1354c4d0a493645f8bf4bf9e4c2e2fa2bd61b04e0e7e8f90477deb6a73a1777ff2f12ad13cdd97f604d889778759d7fe21222772eff6 SHA512 934fe3043aceeeee5df7ae5879198d385639f5b489581209c44e7ec91f5d05216424bf5652f557e154a1a442633848ebe1167b61af9c9e374cd30594744f4d7d
+DIST hd2u-1.0.3.tgz 60024 BLAKE2B 9dd57f2e15add3643aa92747836164b18c9c6554c435b718cea6b4e8d1455bbd775f9d4eda0f10a9bfe3ccb5dbd634a99b367ae849bce2145d9b1114400a2b1b SHA512 d354964f0ad5392315767b96438d843a5f1d6afe78da5b0c5ea65a3b0b2a61beabff3ecac89df81b9271a14ca443f23dfffeb51815e02b724ad287e42fc2d6cc
+EBUILD hd2u-1.0.3.ebuild 515 BLAKE2B 4e84e7cdb9f6626cc61397559942ba15505de1ae819ce032c548581a1f271c8015d3feef8fd0840cbe63273df6debd80fa6acfa1a044707824649d19763b9814 SHA512 d0a7153a1d1961c2a1cf31028f300362a5fbaa6959719404c8f5d8cffd0bfdecc2cff47946aacd2a57fad53635532519ae8d09929acf86a654fdd041c32f03b7
+MISC metadata.xml 265 BLAKE2B 75452ad720a31a08fc0dcd02eec704c18b11bc0660686f9a320b85fc879f55a564ce9c3b6a8c710781b74c5e8eb3d0544c02a042fb35a0b62a5e1491f675296a SHA512 176f814d8c555e8726f36e012367b698e8a19a0662982621029a7f9190beecc5e6798e43c51698dc149364966cdeff7061121e54fa9d4cf2a3559a6ce4904e25
diff --git a/app-text/hd2u/files/hd2u-1.0.3-build.patch b/app-text/hd2u/files/hd2u-1.0.3-build.patch
new file mode 100644
index 000000000000..de788e8aa774
--- /dev/null
+++ b/app-text/hd2u/files/hd2u-1.0.3-build.patch
@@ -0,0 +1,25 @@
+diff --git a/Makefile.in b/Makefile.in
+index 2a67b3c..651323d 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -42,7 +42,7 @@ LIBS= @LIBS@
+ all:	$(TARGET)
+ 
+ $(TARGET):	$(TARGET).c config.h
+-	$(CC) $(CFLAGS) -o $@ $(@:%=%.c) $(LIBS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(@:%=%.c) $(LIBS)
+ 
+ 
+ all-optimized:		$(TARGET)-optimized
+@@ -98,9 +98,10 @@ cleanall:	clean
+ mrproper:	cleanall
+ distclean:	cleanall
+ 
++BUILD_ROOT=$(DESTDIR)
+ install:
+ 	$(INSTALL) -d -m 755 $(BUILD_ROOT)$(BIN_DIR)
+-	$(INSTALL) -m 755 -s $(TARGET) $(BUILD_ROOT)$(BIN_DIR)
++	$(INSTALL) -m 755 $(TARGET) $(BUILD_ROOT)$(BIN_DIR)
+ 
+ tarball:
+ 	$(INSTALL) -d -m 755 ./$(PACKAGE_NAME)-$(PACKAGE_VERSION)
diff --git a/app-text/hd2u/hd2u-1.0.3.ebuild b/app-text/hd2u/hd2u-1.0.3.ebuild
new file mode 100644
index 000000000000..af0d97d7f58b
--- /dev/null
+++ b/app-text/hd2u/hd2u-1.0.3.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit eutils
+
+DESCRIPTION="Dos2Unix like text file converter"
+HOMEPAGE="http://www.megaloman.com/~hany/software/hd2u/"
+SRC_URI="http://www.megaloman.com/~hany/_data/hd2u/${P}.tgz"
+
+KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86"
+SLOT="0"
+LICENSE="GPL-2"
+IUSE=""
+
+DEPEND="
+	dev-libs/popt"
+RDEPEND="${DEPEND}
+	!app-text/dos2unix"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-build.patch
+}
diff --git a/app-text/hd2u/metadata.xml b/app-text/hd2u/metadata.xml
new file mode 100644
index 000000000000..3cf14bf74636
--- /dev/null
+++ b/app-text/hd2u/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>shell-tools@gentoo.org</email>
+		<name>Gentoo Shell Tools Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-text/highlight-3.42-r1 b/app-text/highlight-3.42-r1
deleted file mode 100644
index 839e86589073..000000000000
--- a/app-text/highlight-3.42-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=dev-lang/lua:0= qt5? ( dev-libs/double-conversion:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) dev-libs/boost virtual/pkgconfig qt5? ( dev-qt/linguist-tools:5 )
-DESCRIPTION=Converts source code to formatted text (HTML, LaTeX, etc.) with syntax highlight
-EAPI=6
-HOMEPAGE=http://www.andre-simon.de/
-IUSE=examples qt5
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=GPL-3
-RDEPEND=dev-lang/lua:0= qt5? ( dev-libs/double-conversion:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
-SLOT=0
-SRC_URI=http://www.andre-simon.de/zip/highlight-3.42.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ec34a2cb5b01c98cff6721beaba8c09d
diff --git a/app-text/highlight/Manifest b/app-text/highlight/Manifest
new file mode 100644
index 000000000000..57eb63d27cbd
--- /dev/null
+++ b/app-text/highlight/Manifest
@@ -0,0 +1,4 @@
+AUX highlight-3.42-qmake-fix.patch 1051 BLAKE2B ad9436c010cb1f9b8db5a21234ec6b80ae73bf49cd165f99638c93b251a53db4918bc1fd70260a5a9310f9d28b86b25190ec5b21cda09b7f4138c3f39dc6088d SHA512 5f74b45995b953c815c9e820fbb73693f3f28927b5785fbc86537f55d2f411f9a6b420e45a4834babda54fddf44c1640bc32cc2cd35d3ec22be07781f05108fc
+DIST highlight-3.42.tar.bz2 1294770 BLAKE2B 22c79258be6a665eda8ee17d1de6a97811f97dc4b4491c24b466dc5375d98d865e07ac4e462288d066613bef8bb5a469fa0bdb3065ecf098fc6c4f6090ecb63e SHA512 362150ee396d2b203f11ecc3d011e23b6f8c7d93ff9f8cb0e9e980be6da21e7b3b1ea1e347e3f09129ab0fb1a0aab19ff19f021e643b93a163a99d3882f9bf80
+EBUILD highlight-3.42-r1.ebuild 2229 BLAKE2B 5dfc0539fe776aa6d365d66f620942162dbd971c744b5dd24f453c0262166fe321c4832fb3affe66d4a3dcbead78eb28ddd6906f23b693410f55b48ed64eca5b SHA512 41e82019318923740c0e955bca11ec1e82882f16288da280726030edd2cf7c0236baca0f082e3727fd8d94f073f5a52a2ce7e5e49eed4a5e39a703a48d92a944
+MISC metadata.xml 249 BLAKE2B 1b34ce77c092c0664a18f32525d158d41bf36ab7ab7a4b9d01ed37e1e3dda3d58849d5b1375065c4e5591f6b09b2a93e88a624d399c495a0b1125edb30ec172f SHA512 895325641a176c848988fb5f36cdb567b584d22f6e778b3de674de480cbca30b7cf8f12ecbbe1173a63e3229889e1e0f5efd5afea4f0d4c429ac236598f80f1e
diff --git a/app-text/highlight/files/highlight-3.42-qmake-fix.patch b/app-text/highlight/files/highlight-3.42-qmake-fix.patch
new file mode 100644
index 000000000000..31970057d9a6
--- /dev/null
+++ b/app-text/highlight/files/highlight-3.42-qmake-fix.patch
@@ -0,0 +1,32 @@
+From 8464afed560fa1096d37aa82aef99c00819fec87 Mon Sep 17 00:00:00 2001
+From: Chris Mayo <aklhfex@gmail.com>
+Date: Fri, 2 Mar 2018 19:15:35 +0000
+Subject: [PATCH] fix directories passed to qmake being ignored
+
+contains() matches the whole value, add regular expressions for the path
+components.
+---
+ src/gui-qt/highlight.pro | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/gui-qt/highlight.pro b/src/gui-qt/highlight.pro
+index bae8d7c..0380a90 100644
+--- a/src/gui-qt/highlight.pro
++++ b/src/gui-qt/highlight.pro
+@@ -43,13 +43,13 @@ unix {
+     PKGCONFIG += lua
+ 
+     # to make it run within Qt Creator
+-    !contains(DEFINES, DATA_DIR) {
++    !contains(DEFINES, DATA_DIR.*) {
+         DEFINES+=DATA_DIR=\\\"/usr/share/highlight/\\\"
+     }
+-    !contains(DEFINES, CONFIG_DIR) {
++    !contains(DEFINES, CONFIG_DIR.*) {
+         DEFINES+=CONFIG_DIR=\\\"/etc/highlight/\\\"
+     }
+-    !contains(DEFINES, DOC_DIR) {
++    !contains(DEFINES, DOC_DIR.*) {
+         DEFINES+=DOC_DIR=\\\"/usr/share/doc/highlight/\\\"
+     }
+ }
diff --git a/app-text/highlight/highlight-3.42-r1.ebuild b/app-text/highlight/highlight-3.42-r1.ebuild
new file mode 100644
index 000000000000..0309f3970645
--- /dev/null
+++ b/app-text/highlight/highlight-3.42-r1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic qmake-utils toolchain-funcs
+
+DESCRIPTION="Converts source code to formatted text (HTML, LaTeX, etc.) with syntax highlight"
+HOMEPAGE="http://www.andre-simon.de/"
+SRC_URI="http://www.andre-simon.de/zip/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="examples qt5"
+
+RDEPEND="
+	dev-lang/lua:0=
+	qt5? (
+		dev-libs/double-conversion:=
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	)
+"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+	virtual/pkgconfig
+	qt5? ( dev-qt/linguist-tools:5 )
+"
+
+myhlopts=(
+	"CXX=$(tc-getCXX)"
+	"AR=$(tc-getAR)"
+	"LDFLAGS=${LDFLAGS}"
+	"CFLAGS=${CXXFLAGS} -DNDEBUG -std=c++11"
+	"DESTDIR=${D}"
+	"PREFIX=${EPREFIX}/usr"
+	"HL_CONFIG_DIR=${EPREFIX}/etc/highlight/"
+	"HL_DATA_DIR=${EPREFIX}/usr/share/highlight/"
+	"doc_dir=${EPREFIX}/usr/share/doc/${PF}/"
+	"conf_dir=${EPREFIX}/etc/highlight/"
+)
+
+PATCHES=( "${FILESDIR}"/${P}-qmake-fix.patch ) # bug 649398
+
+src_prepare() {
+	default
+
+	sed -e "/LSB_DOC_DIR/s:doc/${PN}:doc/${PF}:" \
+		-i src/core/datadir.cpp || die
+
+	if has_version "<dev-lang/lua-5.2"; then
+		sed -e "s/-DUSE_LUA52//" -i src/makefile || die
+	fi
+
+	# We set it via eqmake5, otherwise it forces clang...
+	sed -e "s/QMAKE_CC/#QMAKE_CC/g" \
+		-e "s/QMAKE_CXX /#QMAKE_CXX /g" \
+		-i src/gui-qt/highlight.pro || die
+}
+
+src_configure() {
+	if use qt5 ; then
+		pushd src/gui-qt > /dev/null || die
+		eqmake5 \
+			'DEFINES+=DATA_DIR=\\\"'"${EPREFIX}"'/usr/share/${PN}/\\\" CONFIG_DIR=\\\"'"${EPREFIX}"'/etc/${PN}/\\\" DOC_DIR=\\\"'"${EPREFIX}"'/usr/share/doc/${PF}/\\\"'
+		popd > /dev/null || die
+	fi
+}
+
+src_compile() {
+	emake -f makefile "${myhlopts[@]}"
+	if use qt5 ; then
+		pushd src/gui-qt > /dev/null || die
+		emake
+		popd > /dev/null || die
+	fi
+}
+
+src_install() {
+	emake -f makefile "${myhlopts[@]}" install
+	if use qt5; then
+		emake -f makefile "${myhlopts[@]}" install-gui
+		docompress -x /usr/share/doc/${PF}/{ChangeLog,COPYING,README,README_PLUGINS}
+	fi
+
+	if ! use examples ; then
+		rm -r "${ED}"/usr/share/doc/${PF}/extras || die
+	fi
+}
diff --git a/app-text/highlight/metadata.xml b/app-text/highlight/metadata.xml
new file mode 100644
index 000000000000..7b4a61aab741
--- /dev/null
+++ b/app-text/highlight/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-text/hnb-1.9.18-r1 b/app-text/hnb-1.9.18-r1
deleted file mode 100644
index 447a27cd51e4..000000000000
--- a/app-text/hnb-1.9.18-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=sys-libs/ncurses virtual/pkgconfig
-DESCRIPTION=A program to organize many kinds of data in one place
-EAPI=5
-HOMEPAGE=http://hnb.sourceforge.net/
-KEYWORDS=amd64 ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=GPL-2
-RDEPEND=sys-libs/ncurses
-SLOT=0
-SRC_URI=http://hnb.sourceforge.net/.files/hnb-1.9.18.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=44eb74ede6c81d87b0e507e62993efd3
diff --git a/app-text/hnb/Manifest b/app-text/hnb/Manifest
new file mode 100644
index 000000000000..2e4e83202df6
--- /dev/null
+++ b/app-text/hnb/Manifest
@@ -0,0 +1,6 @@
+AUX hnb-1.9.18-flags.patch 2527 BLAKE2B cdfd66a4907d3431bb704f4f4b922543b2793cf6a1156e54ec363279a8771ab819340c6537522004f362371a7e410a4d68eff8dd1cb9881d0996969b9abc705f SHA512 672e8836a0766d0b922359572aff8319aa701a10863fb618bcd74c52980303d0e3158f3de7ca50cb05367296c7121c510a4e900d60721dee33b4e657a8a07e5a
+AUX hnb-1.9.18-include.patch 244 BLAKE2B 68ca79ccfd2f3b282d0d0f2ab7f633caf82b1a7e7c67b403a766db7a45365dd3f3ff0d25dd4d2ab496eebef4044688045f54e0e1f723b721616b34a59968c775 SHA512 5fa1b46221068885d9d2e2bde2f647c9f6756173af2f6568e4f32a00f64d6d753ed2aa2b841f7c1206afbd3d6af849bc374e8a29e84d2140c68cfa6627f4cb62
+AUX hnb-1.9.18-printf.patch 216 BLAKE2B 446e1d5338509fd67726c663c68ee5dda70d20777ebc6344224377acf36edfc6b57e60c7490a059991a7fa08e3c0e4b928f55f012e0b3e580bf14686cde50490 SHA512 2638a268020ca55619be92921698e82d540b1f7bf75af3014339ae7e5f674e9f28e3618bd195f0e946f5276c0c2464e2336883db90af2036d2b356f1c9680e53
+DIST hnb-1.9.18.tar.gz 166043 BLAKE2B 9d4257a4b76fb1458ed5df2743997bdfa416faad9ac328693a636250c0f3c8bf9fe6244436c36a4c5efaec254da1d89afb5e5d1afc8c438309851091530a43cc SHA512 9919a5d6512b6da3d19cc8efbed21d4452a2f6a343a38758c36728f73415b6e8ad57e24ff3eec17eb4e1e53b458d579c165ae1ad906f5b75f2fd42897159a30f
+EBUILD hnb-1.9.18-r1.ebuild 794 BLAKE2B 3b834f83848265dd3137dfc8c0c2ece75f9c5c734a6bf6242d7ff2285f5d11ca1ecb5b550066dd392b3399fc04137eb4f40997f48f8241727496743f67f83ee0 SHA512 642fde554203fa300e8b883a8580a85207d0ad34e4c5382f90ca5f79f9152a8c8bdcfb376b7211ecf6f0618fb7eb0b79e277cb04c75ca9c39054b927afa8a833
+MISC metadata.xml 521 BLAKE2B 763dfba52975b9c55ad9b91ff304dc5555d60e4d425f0349fdb8ca475368956b941ab0a771019943628836fc2a7c68ffc63b329922b6249c04891084fb5bd53f SHA512 109d368df00aef9bb47380f20afb9695a877425a557ff188d16c37037160c6342cd6533f858ca224d197ce1b4c21e7b456584753de264e412d0b22a3cb16d903
diff --git a/app-text/hnb/files/hnb-1.9.18-flags.patch b/app-text/hnb/files/hnb-1.9.18-flags.patch
new file mode 100644
index 000000000000..4111b7078d70
--- /dev/null
+++ b/app-text/hnb/files/hnb-1.9.18-flags.patch
@@ -0,0 +1,83 @@
+--- a/Makefile
++++ b/Makefile
+@@ -1,19 +1,19 @@
+ 
+ src/hnb: src/*.c src/*.h src/*.inc src/hnbrc.inc
+-	(cd src;make)
++	(cd src;$(MAKE))
+ install: src/hnb
+ 	install -D src/hnb /usr/local/bin/hnb
+ 	install -D -m444 doc/hnb.1 /usr/local/man/man1/hnb.1
+ clean:
+-	(cd src;make clean)
+-	(cd util;make clean)
++	(cd src;$(MAKE) clean)
++	(cd util;$(MAKE) clean)
+ 	rm -f *~
+ 
+ rcupdate: updaterc
+ updaterc: src/hnbrc.inc
+ 
+ src/hnbrc.inc: doc/hnbrc
+-	(cd util;make)
++	(cd util;$(MAKE))
+ 	echo -n "\"">src/hnbrc.inc
+ 	cat doc/hnbrc | util/asc2c >> src/hnbrc.inc
+ 	echo "\"">>src/hnbrc.inc
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -1,5 +1,6 @@
+-LIBS=-lncurses libcli/libcli.a
+-CFLAGS=-I.. -Ilibcli -DHAVE_CONFIG_H -Wall -pedantic -g
++LIBS=$(shell ${PKG_CONFIG} --libs ncurses) libcli/libcli.a
++CFLAGS+=-Wall -pedantic
++CPPFLAGS+=-I.. -Ilibcli -DHAVE_CONFIG_H
+ 
+ CFILES=$(wildcard *.c)
+ OBJS=$(patsubst %.c,%.o,$(CFILES))
+@@ -8,22 +9,22 @@
+ 	$(CC) -c $(CFLAGS) $(CPPFLAGS) -o $@ $<
+ 
+ hnb: libcli/libcli.a Makefile $(OBJS) init_subsystems.c *.h *.inc
+-	$(CC) -o hnb $(OBJS) $(LIBS) $(CFLAGS)
++	$(CC) -o hnb $(OBJS) $(LIBS) $(CFLAGS) $(LDFLAGS)
+ #	strip hnb
+ libcli/libcli.a: libcli/*.c
+-	(cd libcli;make libcli.a)
++	(cd libcli;$(MAKE) libcli.a)
+ libcli/libcli_p.a: libcli/*.c
+-	(cd libcli;make libcli_p.a)
+-init_subsystems.c: *.c
++	(cd libcli;$(MAKE) libcli_p.a)
++init_subsystems.c: $(CFILES)
+ 	echo "/* this file is autogenerated, do not edit */">init_subsystems.c
+-	cat *.c | grep "^\!init_" | sort | sed -e "s/^\!/void /g">>init_subsystems.c
++	cat $(CFILES) | grep "^\!init_" | sort | sed -e "s/^\!/void /g">>init_subsystems.c
+ 	echo "">>init_subsystems.c
+ 	echo "void init_subsystems(){">>init_subsystems.c
+-	cat *.c | grep "^\!init_" | sort | sed -e "s/^\!/ /g">>init_subsystems.c
++	cat $(CFILES) | grep "^\!init_" | sort | sed -e "s/^\!/ /g">>init_subsystems.c
+ 	echo "}">>init_subsystems.c
+ clean:
+ 	rm -f xml_debug hnb $(OBJS) *~ cli_*.inc
+-	(cd libcli;make clean)
++	(cd libcli;$(MAKE) clean)
+ hnb_p: *.c libcli/libcli_p.a init_subsystems.c
+ 	$(CC) -o hnb_p *.c -pg -lncurses_p libcli/libcli_p.a -I.. -Ilibcli -DHAVE_CONFIG_H
+ 
+--- a/src/libcli/Makefile
++++ b/src/libcli/Makefile
+@@ -7,11 +7,11 @@
+ clean:
+ 	rm -f *.o *.a *.so test-s* *~
+ libcli.a: $(OBJS)
+-	ar rc libcli.a cli*.o
++	$(AR) rc libcli.a cli*.o
+ libcli_p.a: 
+ 	$(CC) -pg -c cli.c
+ 	$(CC) -pg -c cli_history.c
+-	ar rcs libcli_p.a cli*.o
++	$(AR) rcs libcli_p.a cli*.o
+ libcli.so: $(OBJS)
+ 	$(CC) -shared cli*.o -o libcli.so $(CFLAGS) $(LIBS)
+ test-static: test.o libcli.a
diff --git a/app-text/hnb/files/hnb-1.9.18-include.patch b/app-text/hnb/files/hnb-1.9.18-include.patch
new file mode 100644
index 000000000000..9ee57a351d51
--- /dev/null
+++ b/app-text/hnb/files/hnb-1.9.18-include.patch
@@ -0,0 +1,13 @@
+--- a/src/expanded.c
++++ b/src/expanded.c
+@@ -18,9 +18,9 @@
+  * Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+  */
+ 
++#include <string.h>
+ #include "tree.h"
+ #include "cli.h"
+-#define NULL 0
+ 
+ #include "evilloop.h"
+ #include "ctype.h"
diff --git a/app-text/hnb/files/hnb-1.9.18-printf.patch b/app-text/hnb/files/hnb-1.9.18-printf.patch
new file mode 100644
index 000000000000..d8ac27efb643
--- /dev/null
+++ b/app-text/hnb/files/hnb-1.9.18-printf.patch
@@ -0,0 +1,11 @@
+--- a/src/libcli/cli.c
++++ b/src/libcli/cli.c
+@@ -57,7 +57,7 @@
+ 				wp=word;
+ 				*wp='\0';
+ 			} else {
+-				printf(tbuf);printf("\n");
++				printf("%s\n", tbuf);
+ 				bp=tbuf;
+ 				*bp='\0';
+ 				strcpy(bp,word);
diff --git a/app-text/hnb/hnb-1.9.18-r1.ebuild b/app-text/hnb/hnb-1.9.18-r1.ebuild
new file mode 100644
index 000000000000..a38796bc73be
--- /dev/null
+++ b/app-text/hnb/hnb-1.9.18-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A program to organize many kinds of data in one place"
+HOMEPAGE="http://hnb.sourceforge.net/"
+SRC_URI="http://hnb.sourceforge.net/.files/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="amd64 ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+RDEPEND="sys-libs/ncurses"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	rm -r ${P} || die
+	rm src/cli_history.o || die
+
+	epatch \
+		"${FILESDIR}"/${P}-flags.patch \
+		"${FILESDIR}"/${P}-include.patch \
+		"${FILESDIR}"/${P}-printf.patch
+
+	tc-export AR CC PKG_CONFIG
+
+	# bug #532552
+	export LC_ALL=C
+}
+
+src_install() {
+	dodoc README doc/hnbrc
+	doman doc/hnb.1
+	dobin src/hnb
+}
diff --git a/app-text/hnb/metadata.xml b/app-text/hnb/metadata.xml
new file mode 100644
index 000000000000..b426f3b5f745
--- /dev/null
+++ b/app-text/hnb/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<longdescription>
+		hnb is a program to organize many kinds of data in one place, including
+		addresses, TODO lists, ideas, book reviews, brainstorming, speech
+		outlines, etc. It stores data in XML format, and is capable of native
+		export to ASCII and HTML.
+	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">hnb</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/htag-0.0.24-r1 b/app-text/htag-0.0.24-r1
deleted file mode 100644
index f20876d526eb..000000000000
--- a/app-text/htag-0.0.24-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-lang/perl:=[-build(-)]
-DESCRIPTION=random signature maker
-EAPI=5
-HOMEPAGE=http://www.earth.li/projectpurple/progs/htag.html
-KEYWORDS=amd64 ~mips ppc ~sparc x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl:=[-build(-)]
-SLOT=0
-SRC_URI=http://www.earth.li/projectpurple/files/htag-0.0.24.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7ce376dbdb9966fdafe4638e04ff97e6
diff --git a/app-text/htag/Manifest b/app-text/htag/Manifest
new file mode 100644
index 000000000000..a0c8ec2e6446
--- /dev/null
+++ b/app-text/htag/Manifest
@@ -0,0 +1,3 @@
+DIST htag-0.0.24.tar.gz 33602 BLAKE2B a391660b27a2821374225748df5063ed9e29be5d9c5b97429094b95f75872eb3675cd73de75a30a83b99f9245a83cb032f7899a11d59eda1d6ae7ad70bb142eb SHA512 28f3cae3bbaaecc2f61ca1d50b4d2e56e4bcddf2644aa37566019bd116ab653b019a5b048aac2b8a07faf6b906ac94164c81ac082c675602bd921dff62bf4858
+EBUILD htag-0.0.24-r1.ebuild 724 BLAKE2B 39ceee1dcaaf72869bdfbcc0a48d93405fd093bffa4fdf7e81e906eb87d3f5f022f5675146817620e287ec5285df1d298e978177769e5413f384c74bffe51285 SHA512 6e8121b3dbe900e4e48ce514811a1498baf96c3f64cf5af83873f5db78c78b85ba199cf9422a6aa9e0aade448393a64e366a2b42007954c6dd470eefba212202
+MISC metadata.xml 271 BLAKE2B 46146f4bf13e9f4d33435225ec1012dd9bb89b20812963dc50368cab2a60a3c542052cb72f8963cc72074b2c13a5b054c77152de1d108027752601a349bc4ef8 SHA512 3e98f5382cf789992bdfc0f32e6e36eba31944be654c03f2ed9bd00baf56c8b768c256c4f8778d5775d6df38da4afcf8e32b6e6495a1ecfc8e7982c7c8943b1b
diff --git a/app-text/htag/htag-0.0.24-r1.ebuild b/app-text/htag/htag-0.0.24-r1.ebuild
new file mode 100644
index 000000000000..a326995bb2ee
--- /dev/null
+++ b/app-text/htag/htag-0.0.24-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit perl-module
+
+DESCRIPTION="random signature maker"
+HOMEPAGE="http://www.earth.li/projectpurple/progs/htag.html"
+SRC_URI="http://www.earth.li/projectpurple/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~mips ppc ~sparc x86"
+IUSE=""
+
+src_install() {
+	newbin htag.pl htag
+	# establish "${D}"usr/share/doc/${PF}, mv 2 folders in 1 line
+	perl-module_src_install
+	mv ./{example-scripts,docs/sample-config/} "${ED}"usr/share/doc/${PF}/ || die
+	dodoc docs/{MACRO_DESCRIPTION,README}
+
+	insinto /usr/share/htag/plugins
+	doins plugins/*
+
+	insinto "${VENDOR_LIB}"
+	doins HtagPlugin/HtagPlugin.pm
+}
diff --git a/app-text/htag/metadata.xml b/app-text/htag/metadata.xml
new file mode 100644
index 000000000000..3e927f8d7480
--- /dev/null
+++ b/app-text/htag/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>shell-tools@gentoo.org</email>
+    <name>Gentoo Shell Tools Project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-text/html-xml-utils-7.1 b/app-text/html-xml-utils-7.1
deleted file mode 100644
index d4c5297bc91b..000000000000
--- a/app-text/html-xml-utils-7.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=net-misc/curl
-DESCRIPTION=A number of simple utilities for manipulating HTML and XML files
-EAPI=6
-HOMEPAGE=http://www.w3.org/Tools/HTML-XML-utils/
-IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 ppc ppc64 x86 ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=W3C
-RDEPEND=net-misc/curl
-RESTRICT=test
-SLOT=0
-SRC_URI=http://www.w3.org/Tools/HTML-XML-utils/html-xml-utils-7.1.tar.gz
-_eclasses_=multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=ec179df928bcbed5095f891938e03388
diff --git a/app-text/html-xml-utils-7.4 b/app-text/html-xml-utils-7.4
deleted file mode 100644
index 611926aec7a3..000000000000
--- a/app-text/html-xml-utils-7.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=net-misc/curl
-DESCRIPTION=A number of simple utilities for manipulating HTML and XML files
-EAPI=6
-HOMEPAGE=http://www.w3.org/Tools/HTML-XML-utils/
-IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=W3C
-RDEPEND=net-misc/curl
-RESTRICT=test
-SLOT=0
-SRC_URI=http://www.w3.org/Tools/HTML-XML-utils/html-xml-utils-7.4.tar.gz
-_eclasses_=multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=37709920a13508af319168901899930e
diff --git a/app-text/html-xml-utils-7.5 b/app-text/html-xml-utils-7.5
deleted file mode 100644
index f989b9d3c341..000000000000
--- a/app-text/html-xml-utils-7.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=net-misc/curl
-DESCRIPTION=A number of simple utilities for manipulating HTML and XML files
-EAPI=6
-HOMEPAGE=http://www.w3.org/Tools/HTML-XML-utils/
-IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=W3C
-RDEPEND=net-misc/curl
-RESTRICT=test
-SLOT=0
-SRC_URI=http://www.w3.org/Tools/HTML-XML-utils/html-xml-utils-7.5.tar.gz
-_eclasses_=multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=fa36113b951abc71bd0f5b546080ee6c
diff --git a/app-text/html-xml-utils-7.6 b/app-text/html-xml-utils-7.6
deleted file mode 100644
index 696d540b626f..000000000000
--- a/app-text/html-xml-utils-7.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=net-misc/curl
-DESCRIPTION=A number of simple utilities for manipulating HTML and XML files
-EAPI=6
-HOMEPAGE=http://www.w3.org/Tools/HTML-XML-utils/
-IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=W3C
-RDEPEND=net-misc/curl
-RESTRICT=test
-SLOT=0
-SRC_URI=http://www.w3.org/Tools/HTML-XML-utils/html-xml-utils-7.6.tar.gz
-_eclasses_=multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=fa36113b951abc71bd0f5b546080ee6c
diff --git a/app-text/html-xml-utils-7.7 b/app-text/html-xml-utils-7.7
deleted file mode 100644
index 41b5176f61ab..000000000000
--- a/app-text/html-xml-utils-7.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=net-misc/curl
-DESCRIPTION=A number of simple utilities for manipulating HTML and XML files
-EAPI=6
-HOMEPAGE=http://www.w3.org/Tools/HTML-XML-utils/
-IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=W3C
-RDEPEND=net-misc/curl
-RESTRICT=test
-SLOT=0
-SRC_URI=http://www.w3.org/Tools/HTML-XML-utils/html-xml-utils-7.7.tar.gz
-_eclasses_=multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=fa36113b951abc71bd0f5b546080ee6c
diff --git a/app-text/html-xml-utils/Manifest b/app-text/html-xml-utils/Manifest
new file mode 100644
index 000000000000..b80661c5aef0
--- /dev/null
+++ b/app-text/html-xml-utils/Manifest
@@ -0,0 +1,11 @@
+DIST html-xml-utils-7.1.tar.gz 319559 BLAKE2B 4c07a13a6b59c9d336a5620f2c9b1109fc5289339348d287136ac91f5dd508780a97dc9e30ae361c1c8237ecfa16996a6cd79cb4eaf6d9b6ba9bd97806009fd2 SHA512 a17328500552ad28136a08d0c7dd992d53afbc853ffd8930b516b3218915f4f159234f27af66d135a51dc25eb6c35e6f14d6f0006bdfc2abf351ac8298334d48
+DIST html-xml-utils-7.4.tar.gz 343008 BLAKE2B 29c8e437afabd04fd511d3498c94cfe8ef027478b7bd4d0390635a5dd18be20971413217ba083e7fb7b82d9b10a9d943b8a90f761cd6ab192829ee64a11a0952 SHA512 88a527c29ef23b34ecb778085aafd399943764a18a3e4b39ff27b3e2cc3effa84b9ffe7c2a0df80fb27a38a7e4d4ceef6db91da46cbb2b4f9fd59903d4868a20
+DIST html-xml-utils-7.5.tar.gz 342037 BLAKE2B 0398c35593438fc3f46c459a6aba5f2c8814aed70087f27b3205a864fc349159691d282f6636073a8c8c0e8a711cd4efd070ba83f04348315f6b657b7495150c SHA512 32d9d36189a0f1a2f72578f7a449faa1ae85077de697e9021499981ee1a26e002d0a79a96ebe7f9e914b4a32320e098413a59a059c1541789599602e8be39d86
+DIST html-xml-utils-7.6.tar.gz 343469 BLAKE2B 8273aee01df43df43e9a3b6d384061d4ef6065c60829a225e088a8e24c9c7d5cf91bce2a7624a88a9821c5fdce327754d93dfa3ddd583e27de21b714cea9f91d SHA512 ea9faec48b9f8a8e4c2ce4b4f504bf1641d83f624366a162ffd8cba1b4a3cb5ae019f82c472986dc8cfb97454b8a469b2e8e11852b6ed93ed5bce84528a07baa
+DIST html-xml-utils-7.7.tar.gz 403664 BLAKE2B cdb97003bb6fb0138910f8f00b9612db3eb8ed4fa0ee81f27260e8907c088e14ac010f2862839355a4a6c0eca49508ad47c4e26f1c1c62e178c3b0e880ed124d SHA512 72b71982717de11b3b5f601a157a04bb6ecc235db6810a0dd830ad7682ed16cd6a928730013cfc918f722e1e5f03c357cd2545806288986797230f9d04175460
+EBUILD html-xml-utils-7.1.ebuild 720 BLAKE2B 713315b969084c59ce214f5a47ac4226f388ed9c3a46567d159efde9c6d16d330928fc28714c678d10eda8c36bd346ef2b50400c006247111550edf2f2b78ab1 SHA512 990a5c37f41781133dcc916e22ffd5fca9e1570411df9552552ea547cd8847683b6c4f9c3d80989e44643533777e861da96d7d33e4621e59ab12722216547b01
+EBUILD html-xml-utils-7.4.ebuild 724 BLAKE2B b848b468185c966cf1df0ae6bd23620687afeeaff4cc6daaa334015ed5a4cf9f5458193c96598004a1ea31d2e5f578ab749eff7b2f6547f9d9600c3c91f1139e SHA512 7ceedb6d8ce7288edf2582f37af8e6bf4d48421dcb740578c8666fadd0b4dd0dfbc1f3ab1e340c5bbb4825549fb87ecae7feb09672ab60f7acbd805e3242d15a
+EBUILD html-xml-utils-7.5.ebuild 724 BLAKE2B 9d8dfdf491584b8cdce68db8deacfb70c397b5a9139eb2aa39c4cbade121282b3ac74509a3e1777306b1f543be762588b9606cf18c880cdd258e99a3eb578b67 SHA512 5217f1139325cb12729b7ef4c6fdf28bbfa4fb9bc58b57e72c6196b6c84c28bfb58caff20c2381b221215fc3782851a87b7452c1bf17dd158c0f945f27e141c9
+EBUILD html-xml-utils-7.6.ebuild 724 BLAKE2B 9d8dfdf491584b8cdce68db8deacfb70c397b5a9139eb2aa39c4cbade121282b3ac74509a3e1777306b1f543be762588b9606cf18c880cdd258e99a3eb578b67 SHA512 5217f1139325cb12729b7ef4c6fdf28bbfa4fb9bc58b57e72c6196b6c84c28bfb58caff20c2381b221215fc3782851a87b7452c1bf17dd158c0f945f27e141c9
+EBUILD html-xml-utils-7.7.ebuild 724 BLAKE2B 9d8dfdf491584b8cdce68db8deacfb70c397b5a9139eb2aa39c4cbade121282b3ac74509a3e1777306b1f543be762588b9606cf18c880cdd258e99a3eb578b67 SHA512 5217f1139325cb12729b7ef4c6fdf28bbfa4fb9bc58b57e72c6196b6c84c28bfb58caff20c2381b221215fc3782851a87b7452c1bf17dd158c0f945f27e141c9
+MISC metadata.xml 220 BLAKE2B eabf3517ba7e5b67320254eeb2b07adf1dbe0c3432b693973bc25a3e3dc8ed160b7313f9f8ae64d994ac272487b785f33202d9640bb5a7ace9f56ceb42978a19 SHA512 1db105eebacb6c7d44fd17746981e6e24badb2e81327410aa935a7603379cfcc8f3cf27dcf4e9d870cea2f73f6a15cf052e3e785205095ea9a93d72980ff71cc
diff --git a/app-text/html-xml-utils/html-xml-utils-7.1.ebuild b/app-text/html-xml-utils/html-xml-utils-7.1.ebuild
new file mode 100644
index 000000000000..a55cccd45c2e
--- /dev/null
+++ b/app-text/html-xml-utils/html-xml-utils-7.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multilib-minimal
+
+DESCRIPTION="A number of simple utilities for manipulating HTML and XML files"
+SRC_URI="http://www.w3.org/Tools/HTML-XML-utils/${P}.tar.gz"
+HOMEPAGE="http://www.w3.org/Tools/HTML-XML-utils/"
+
+LICENSE="W3C"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86 ~x86-linux ~ppc-macos ~x86-macos"
+
+RESTRICT="test"
+
+RDEPEND="net-misc/curl"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+	sed -e "/doc_DATA = COPYING/d" -i Makefile.in || die
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf
+}
+
+src_compile() {
+	multilib-minimal_src_compile
+}
+
+src_install() {
+	multilib-minimal_src_install
+}
diff --git a/app-text/html-xml-utils/html-xml-utils-7.4.ebuild b/app-text/html-xml-utils/html-xml-utils-7.4.ebuild
new file mode 100644
index 000000000000..080b0bdc12c5
--- /dev/null
+++ b/app-text/html-xml-utils/html-xml-utils-7.4.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multilib-minimal
+
+DESCRIPTION="A number of simple utilities for manipulating HTML and XML files"
+SRC_URI="http://www.w3.org/Tools/HTML-XML-utils/${P}.tar.gz"
+HOMEPAGE="http://www.w3.org/Tools/HTML-XML-utils/"
+
+LICENSE="W3C"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-linux ~ppc-macos ~x86-macos"
+
+RESTRICT="test"
+
+RDEPEND="net-misc/curl"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+	sed -e "/doc_DATA = COPYING/d" -i Makefile.in || die
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf
+}
+
+src_compile() {
+	multilib-minimal_src_compile
+}
+
+src_install() {
+	multilib-minimal_src_install
+}
diff --git a/app-text/html-xml-utils/html-xml-utils-7.5.ebuild b/app-text/html-xml-utils/html-xml-utils-7.5.ebuild
new file mode 100644
index 000000000000..882068c2edf7
--- /dev/null
+++ b/app-text/html-xml-utils/html-xml-utils-7.5.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multilib-minimal
+
+DESCRIPTION="A number of simple utilities for manipulating HTML and XML files"
+SRC_URI="http://www.w3.org/Tools/HTML-XML-utils/${P}.tar.gz"
+HOMEPAGE="http://www.w3.org/Tools/HTML-XML-utils/"
+
+LICENSE="W3C"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-linux ~ppc-macos ~x86-macos"
+
+RESTRICT="test"
+
+RDEPEND="net-misc/curl"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+	sed -e "/doc_DATA = COPYING/d" -i Makefile.in || die
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf
+}
+
+src_compile() {
+	multilib-minimal_src_compile
+}
+
+src_install() {
+	multilib-minimal_src_install
+}
diff --git a/app-text/html-xml-utils/html-xml-utils-7.6.ebuild b/app-text/html-xml-utils/html-xml-utils-7.6.ebuild
new file mode 100644
index 000000000000..882068c2edf7
--- /dev/null
+++ b/app-text/html-xml-utils/html-xml-utils-7.6.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multilib-minimal
+
+DESCRIPTION="A number of simple utilities for manipulating HTML and XML files"
+SRC_URI="http://www.w3.org/Tools/HTML-XML-utils/${P}.tar.gz"
+HOMEPAGE="http://www.w3.org/Tools/HTML-XML-utils/"
+
+LICENSE="W3C"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-linux ~ppc-macos ~x86-macos"
+
+RESTRICT="test"
+
+RDEPEND="net-misc/curl"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+	sed -e "/doc_DATA = COPYING/d" -i Makefile.in || die
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf
+}
+
+src_compile() {
+	multilib-minimal_src_compile
+}
+
+src_install() {
+	multilib-minimal_src_install
+}
diff --git a/app-text/html-xml-utils/html-xml-utils-7.7.ebuild b/app-text/html-xml-utils/html-xml-utils-7.7.ebuild
new file mode 100644
index 000000000000..882068c2edf7
--- /dev/null
+++ b/app-text/html-xml-utils/html-xml-utils-7.7.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multilib-minimal
+
+DESCRIPTION="A number of simple utilities for manipulating HTML and XML files"
+SRC_URI="http://www.w3.org/Tools/HTML-XML-utils/${P}.tar.gz"
+HOMEPAGE="http://www.w3.org/Tools/HTML-XML-utils/"
+
+LICENSE="W3C"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-linux ~ppc-macos ~x86-macos"
+
+RESTRICT="test"
+
+RDEPEND="net-misc/curl"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+	sed -e "/doc_DATA = COPYING/d" -i Makefile.in || die
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf
+}
+
+src_compile() {
+	multilib-minimal_src_compile
+}
+
+src_install() {
+	multilib-minimal_src_install
+}
diff --git a/app-text/html-xml-utils/metadata.xml b/app-text/html-xml-utils/metadata.xml
new file mode 100644
index 000000000000..294c350c6960
--- /dev/null
+++ b/app-text/html-xml-utils/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>monsieurp@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-text/html2text-1.3.2a b/app-text/html2text-1.3.2a
deleted file mode 100644
index e34ea5bd9b87..000000000000
--- a/app-text/html2text-1.3.2a
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DESCRIPTION=A HTML to text converter
-EAPI=4
-HOMEPAGE=http://www.mbayer.de/html2text/
-KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://www.mbayer.de/html2text/downloads/html2text-1.3.2a.tar.gz http://www.mbayer.de/html2text/downloads/patch-utf8-html2text-1.3.2a.diff
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8e1aed815f49e6669ff616f4e12eea1f
diff --git a/app-text/html2text-1.3.2a-r1 b/app-text/html2text-1.3.2a-r1
deleted file mode 100644
index c25285a99936..000000000000
--- a/app-text/html2text-1.3.2a-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install prepare unpack
-DESCRIPTION=A HTML to text converter
-EAPI=5
-HOMEPAGE=http://www.mbayer.de/html2text/
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://www.mbayer.de/html2text/downloads/html2text-1.3.2a.tar.gz http://www.mbayer.de/html2text/downloads/patch-utf8-html2text-1.3.2a.diff http://www.mbayer.de/html2text/downloads/patch-amd64-html2text-1.3.2a.diff
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2497610c87ef214f6d8392167189d81a
diff --git a/app-text/html2text/Manifest b/app-text/html2text/Manifest
new file mode 100644
index 000000000000..929605561a04
--- /dev/null
+++ b/app-text/html2text/Manifest
@@ -0,0 +1,8 @@
+AUX html2text-1.3.2a-compiler.patch 247 BLAKE2B 83c719d6dbbc18e347ca45e6e0df8958a615fb2c1d1f27119978d6efd15aeec6a32fa83e0d9524e4b5863dfec88787427e7c5f2757f8c5eafb0ee4d88fb96860 SHA512 f7c2192e65fe6976ac9d21d45fcb3eb9cd460314945fd9e8f62ada1189935c3799aea43b6ebb15a86b6f313fb95e4115d6aa67a148f11d1b8774d9ca115b538e
+AUX html2text-1.3.2a-urlistream-get.patch 186 BLAKE2B 600aac564090a318cd600858360b16e4cedc0005981d8c392ca450b7182fd0497cdbed6388d9429406756734ba2a204baaf314b73a2f69978574698e631289c2 SHA512 388c30725c72e3d7b372544b4a4fec871d3069fe050aec3212b047d8bdb0c31575e2703e46374b3b7d0422ca8cf2ce2f2d3960d56c32977d85a93d4d94b41659
+DIST html2text-1.3.2a.tar.gz 130088 BLAKE2B 97ca951ae7c501cefca78378683de7fb3c329905298de9e9675303485f3f4a83c5de39c90c8f9c0fe20b73d1e2b70897ee47cdabade9b3791a46f02625bbef05 SHA512 8ec2c17849615b8b78b6f7e9066e5bcfb419b293ffe98323ed0942e891993e205ef37ddfd2839eb12b6bad561989027aea0ba2d57eb7193d424715f93ded90e5
+DIST patch-amd64-html2text-1.3.2a.diff 2230 BLAKE2B 332adeeceed512a2c5bfc01985efbaa4db5ea64b3e4ef8be8b880754524771de2e11b3a2efc55bce154bedc9e598231a1b5bcfe10e915b833d6dbcbcd9e46dc9 SHA512 2a421a20aec8a547bbdf54b81e30a6a1d4cf093e7ad67b27158f0c7248ca0abadd8d96ce0a27adcdd375012db6fd21f61f42a8343bfd910cd8a9720c0a043be1
+DIST patch-utf8-html2text-1.3.2a.diff 29499 BLAKE2B ffc0ea8d89d9e9c9dfa89c2369016685a6af1403a6e71787df2724b72c74c8f774d8d92278a1aaeb90f47d34c8de4c889a7bf4edc02a00e3c97955ea624cfa71 SHA512 be31251471b221a38d291420d5f23e01d5017c20d953064c33ca3dd148543ae877ab584c16fcb01df1341abdb02494b05d08fdcf94bf70bad6b510ee8fac3376
+EBUILD html2text-1.3.2a-r1.ebuild 994 BLAKE2B a6ecf556040564c64bba93dc0dd4d9fcf5060df5a6b9a487ea91f4b2b1fac6da4f4783910a86a98cc2e2c02c9f2ee19bc7ab9f7e40d0441f56c07f28b2979a45 SHA512 94ad8a3df67dc20c080bab7a5eabe3ed2f38c39df6f454f6425b0033774b5aa0f393afe16d69e01f499ee69c2f31316a979cc0326e19737550d5bfa57603e0fb
+EBUILD html2text-1.3.2a.ebuild 933 BLAKE2B 79617efc95c443681009563030126da8aadc589ae081b7162a700622367647112fae06271797923f0de4ed462aa4b89d17f2ab36084dae3edfbf67784cdb0797 SHA512 ab234c98f3998db61cb17dad4fc72dbfa184a93511d7a4482bee1dd0f1a350ef59645b5ffbd427fb0d4107135d19a95cb3cf8e36760377309e63076a56158e4a
+MISC metadata.xml 373 BLAKE2B a4ea5de91e4a5f5a7653f4c9d86262c999e72c69863f0185700bd4fab6c27cf87d3e392aa013dd4b60a84b1ea0ddc42d811c4131c8db3ba427df86df7fa4abb8 SHA512 ae24dd6abb85c0abb4085f15c9c140d2dc3bb0c201ee22f1762e1eadc37899e8b5aa5cb794f9cd12bc26857195c9b9ba8cfa46d05628cdf765ddfc0639dd6bd4
diff --git a/app-text/html2text/files/html2text-1.3.2a-compiler.patch b/app-text/html2text/files/html2text-1.3.2a-compiler.patch
new file mode 100644
index 000000000000..19a1341209d4
--- /dev/null
+++ b/app-text/html2text/files/html2text-1.3.2a-compiler.patch
@@ -0,0 +1,13 @@
+--- a/configure
++++ b/configure
+@@ -38,8 +38,8 @@
+   return 0;
+ }
+ EOF
+-CXX=unknown;
+-for i in "CC" "g++" "cc" "$CC"; do
++CXX=${CXX-unknown}
++for i in "$CXX" "CC" "g++" "cc"; do
+   if $i -c $tmp_file.C 2>/dev/null; then
+     CXX="$i";
+     break;
diff --git a/app-text/html2text/files/html2text-1.3.2a-urlistream-get.patch b/app-text/html2text/files/html2text-1.3.2a-urlistream-get.patch
new file mode 100644
index 000000000000..949d8958a449
--- /dev/null
+++ b/app-text/html2text/files/html2text-1.3.2a-urlistream-get.patch
@@ -0,0 +1,11 @@
+--- a/urlistream.C
++++ b/urlistream.C
+@@ -362,7 +362,7 @@
+ int
+ urlistream::get()
+ {
+-  char ch;
++  unsigned char ch;
+   int ret = ::read(fd_, &ch, 1);
+   return (ret > 0 ? ch : -1);
+ }
diff --git a/app-text/html2text/html2text-1.3.2a-r1.ebuild b/app-text/html2text/html2text-1.3.2a-r1.ebuild
new file mode 100644
index 000000000000..8b1dad0a9b36
--- /dev/null
+++ b/app-text/html2text/html2text-1.3.2a-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A HTML to text converter"
+HOMEPAGE="http://www.mbayer.de/html2text/"
+SRC_URI="http://www.mbayer.de/html2text/downloads/${P}.tar.gz
+	http://www.mbayer.de/html2text/downloads/patch-utf8-${P}.diff
+	http://www.mbayer.de/html2text/downloads/patch-amd64-${P}.diff
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+
+src_unpack() {
+	unpack ${P}.tar.gz
+}
+
+src_prepare() {
+	tc-export CXX
+	epatch \
+		"${FILESDIR}/${P}-compiler.patch" \
+		"${FILESDIR}/${P}-urlistream-get.patch" \
+		"${DISTDIR}/patch-utf8-${P}.diff" \
+		"${DISTDIR}/patch-amd64-${P}.diff"
+	epatch_user
+}
+
+src_compile() {
+	emake LDFLAGS="${LDFLAGS}" DEBUG="${CXXFLAGS}"
+}
+
+src_install() {
+	dobin html2text
+	doman html2text.1.gz html2textrc.5.gz
+	dodoc CHANGES CREDITS KNOWN_BUGS README TODO
+}
diff --git a/app-text/html2text/html2text-1.3.2a.ebuild b/app-text/html2text/html2text-1.3.2a.ebuild
new file mode 100644
index 000000000000..f3ffc7c1a0a7
--- /dev/null
+++ b/app-text/html2text/html2text-1.3.2a.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A HTML to text converter"
+HOMEPAGE="http://www.mbayer.de/html2text/"
+SRC_URI="http://www.mbayer.de/html2text/downloads/${P}.tar.gz
+	http://www.mbayer.de/html2text/downloads/patch-utf8-${P}.diff"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+src_unpack() {
+	unpack ${P}.tar.gz
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-compiler.patch
+	epatch "${FILESDIR}"/${P}-urlistream-get.patch
+	epatch "${DISTDIR}"/patch-utf8-${P}.diff
+}
+
+src_configure() {
+	tc-export CXX
+	default
+}
+
+src_compile() {
+	emake LDFLAGS="${LDFLAGS}" DEBUG="${CXXFLAGS}"
+}
+
+src_install() {
+	dobin html2text
+	doman html2text.1.gz html2textrc.5.gz
+	dodoc CHANGES CREDITS KNOWN_BUGS README TODO
+}
diff --git a/app-text/html2text/metadata.xml b/app-text/html2text/metadata.xml
new file mode 100644
index 000000000000..cd4b982119ec
--- /dev/null
+++ b/app-text/html2text/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>jazzoslav@gmail.com</email>
+		<name>Jaroslav Rakhmatoullin</name>
+	</maintainer>
+<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-text/html401-19991224-r3 b/app-text/html401-19991224-r3
deleted file mode 100644
index 964959496fa8..000000000000
--- a/app-text/html401-19991224-r3
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare prerm unpack
-DEPEND=app-text/sgml-common >=app-text/sgml-common-0.6.3-r2
-DESCRIPTION=DTDs for the HyperText Markup Language 4.01
-EAPI=5
-HOMEPAGE=http://www.w3.org/TR/html401/
-KEYWORDS=amd64 ppc ~s390 x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=W3C
-SLOT=0
-SRC_URI=http://www.w3.org/TR/html401/html40.tgz
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	sgml-catalog	1ca36a4ae32c67b390f310dd6d7b1189	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=37d3e785c879a44c7f756b0730b28d7d
diff --git a/app-text/html401/Manifest b/app-text/html401/Manifest
new file mode 100644
index 000000000000..ab5253bddb28
--- /dev/null
+++ b/app-text/html401/Manifest
@@ -0,0 +1,4 @@
+AUX html401-decl.diff 469 BLAKE2B 7b7e98352b9650b06fa7c9e792e1538873827ffd8d7c043d45a3035c1c1099be9c2aed632717f959a92b2b5f0dc646104c81f13fe612cbcabb3531afcf3d4b9a SHA512 066d1c3672e2b8fd86a696c511c4eab92c8772f147503a986f6c89d1c33720325d15c22157c81d7f121ee441328b89f73a194d5e7e40af4408b0f9b8e0cc65d2
+DIST html40.tgz 369830 BLAKE2B c6fc0f65a9c65df34f534ce1db3cc53ba6ded4481df78f168c1b05b7e3b81fad7ddf3ee519ff1a901f0256af89285eefb39400ebc5b4089c1a16dfe935c6cf21 SHA512 f7423b55f8a5ad2806555700f450e1f46ba4370d1e47f1332e18b01ecd5a41217fc4426ad29c852b6e17100dc4c0a7add9961df35e87660df0e087ad03e4918e
+EBUILD html401-19991224-r3.ebuild 767 BLAKE2B fb6c509178154e010191683b1b3a26449b3136e6e662b9033134314b7587ba69c2583046366e1d7b0cead226dd2e6e3f24e1ba97eb4270a15080d4fa3086164f SHA512 f1669367c90b57b5d53e296736e511fc84561532d61f58caf6b7d76064ec178dcda9b0b02f6f27467c2e0f50059e0cfa37ba78edd6fd0841dbd4eb5d4d296e4b
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/html401/files/html401-decl.diff b/app-text/html401/files/html401-decl.diff
new file mode 100644
index 000000000000..27819a8afd17
--- /dev/null
+++ b/app-text/html401/files/html401-decl.diff
@@ -0,0 +1,12 @@
+--- HTML4.cat.orig	2004-11-06 20:25:39.000000000 +0900
++++ HTML4.cat	2004-11-06 21:16:08.543377286 +0900
+@@ -1,5 +1,9 @@
+ OVERRIDE YES
+ 
++DTDDECL "-//W3C//DTD HTML 4.01//EN" HTML4.decl
++DTDDECL "-//W3C//DTD HTML 4.01 Transitional//EN" HTML4.decl
++DTDDECL "-//W3C//DTD HTML 4.01 Frameset//EN" HTML4.decl
++
+ PUBLIC "-//W3C//DTD HTML 4.01//EN" strict.dtd
+ PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" loose.dtd
+ PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" frameset.dtd
diff --git a/app-text/html401/html401-19991224-r3.ebuild b/app-text/html401/html401-19991224-r3.ebuild
new file mode 100644
index 000000000000..777837fcc2f2
--- /dev/null
+++ b/app-text/html401/html401-19991224-r3.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit sgml-catalog eutils
+
+DESCRIPTION="DTDs for the HyperText Markup Language 4.01"
+HOMEPAGE="http://www.w3.org/TR/html401/"
+SRC_URI="http://www.w3.org/TR/html401/html40.tgz"
+
+LICENSE="W3C"
+SLOT="0"
+KEYWORDS="amd64 ppc ~s390 x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE=""
+DEPEND="app-text/sgml-common"
+RDEPEND=""
+
+S=${WORKDIR}
+
+src_prepare() {
+	sgml-catalog_cat_include "/etc/sgml/${PN}.cat" \
+		"/usr/share/sgml/${PN}/HTML4.cat"
+	epatch "${FILESDIR}"/${PN}-decl.diff
+}
+
+src_install() {
+	insinto /usr/share/sgml/${PN}
+	doins HTML4.cat HTML4.decl *.dtd *.ent
+	insinto /usr/share/doc/${PF}/html
+	doins -r *.html $(ls -p | fgrep "/" | sed "s#/##")
+}
diff --git a/app-text/html401/metadata.xml b/app-text/html401/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-text/html401/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/app-text/htmlc-2.40.0 b/app-text/htmlc-2.40.0
deleted file mode 100644
index fd5f075fad2f..000000000000
--- a/app-text/htmlc-2.40.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install
-DEPEND=>=dev-lang/ocaml-3.11.2:=[ocamlopt?]
-DESCRIPTION=HTML template files expander
-EAPI=5
-HOMEPAGE=http://htmlc.inria.fr/
-IUSE=+ocamlopt
-KEYWORDS=~amd64 ~ppc x86
-LICENSE=htmlc
-RDEPEND=>=dev-lang/ocaml-3.11.2:=[ocamlopt?]
-SLOT=0
-SRC_URI=http://htmlc.inria.fr/htmlc-2.4.0.tgz
-_md5_=df7b6bb858c039860e4deb87a939fec0
diff --git a/app-text/htmlc-2.60.0 b/app-text/htmlc-2.60.0
deleted file mode 100644
index 37a0e5971c50..000000000000
--- a/app-text/htmlc-2.60.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=>=dev-lang/ocaml-3.11.2:=[ocamlopt?]
-DESCRIPTION=HTML template files expander
-EAPI=5
-HOMEPAGE=http://htmlc.inria.fr/
-IUSE=+ocamlopt
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=htmlc
-RDEPEND=>=dev-lang/ocaml-3.11.2:=[ocamlopt?]
-SLOT=0
-SRC_URI=http://htmlc.inria.fr/htmlc-2.6.tgz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8b23b978921e1afa773c3533cdce714d
diff --git a/app-text/htmlc/Manifest b/app-text/htmlc/Manifest
new file mode 100644
index 000000000000..7a551297debd
--- /dev/null
+++ b/app-text/htmlc/Manifest
@@ -0,0 +1,6 @@
+AUX werror.patch 791 BLAKE2B 0a456ddfac9f5d20c9eb2734c2d1f7c154e0cf96f3e831ca62c47e395aa850ce39c7c6d3c0b6e27146de639c13a573e2b6233d85517c057a0ee64769b419ea81 SHA512 fe62de854558ad673e8d88b42d6c71543e32f846afaca1e5062d365b18b4613216e0021ffb4b59e923c4aaba1db6c621c65744de2ac3c864e17e61384022b4bd
+DIST htmlc-2.4.0.tgz 132584 BLAKE2B 42f0948e7f896130b539d8d0f0936ddfa21986d3eeab2b30598572eca12952a0010edb1044b259ed13242534a66351c9855e43bbac613028d926370f6221e0d2 SHA512 8de81041cea0c6d07188cb0d8cd553c1d20ea37d01a8d7425d23a10c7fd3d93dc1f7c1e3de473cb624720dc7588a3d891432d5945a23d1f253d2109cdafc15dc
+DIST htmlc-2.6.tgz 286727 BLAKE2B 47e5460c08f7ce5010615e0dec99bc60b2e0f6857d0347c50357837930ca68b369a66001846ef3855cd54cdf6f1dac73ab45546be659a05b1e202438e4914865 SHA512 fa268cf547d60babcbf1aee73f75d3516b08e83158dc0bee36f724abfe2f46ad4b571c09d9d14f97315c70f88d3ea29000fe2d838042242325adce201d60a8f4
+EBUILD htmlc-2.40.0.ebuild 877 BLAKE2B 9feb912ac666df0925693b585e5f71ec10acd0f9b42c7f6fc842824e1cf8d5cefa94c6a066be449a5614e1125221c9e246fff27acba0c86f181909099c8ccc8d SHA512 f97c54930c582ef4a1f9d969ac3d8bf2a5f1af368af8f90a2b4214468cfb51e3841c19eacd47b1e0fec1f666d7c21fb5c699261950715d26feeaac9bbc67c9f2
+EBUILD htmlc-2.60.0.ebuild 951 BLAKE2B 7c2a307ee8d6216d168f1cfc22b396bebefc8a4cff350e6870b3e34c2228bff307c4a8c64a73a547d18e9561fc94ec652c3c5e832700ec7e163498bde7e53e04 SHA512 180a18c3586dc3d7a0fa9ede3c1083c3d70c54454faeb24d8ad1f64746d3586cbbbb0cfbe4a7627f474edeeace6998c11cc0ae79fe15b50a2c31916969fe3a7b
+MISC metadata.xml 247 BLAKE2B a49ba320a43edd431ae39eb274b77ddf0db171a7b06f4f0f0b8f75ee8e3b7f840dead108aa9c63fba75c609a44f7418268cd65c65877f3305d2a6d3ed3c678f6 SHA512 0f7ebd1264695f56fe6ab78e4e82c07866376f03ebfa12b22b60d0b2df819aa818832cb0d9eb2d77ab642a786b44cd127f579c348f0b2f57bc22e26b3b51c42b
diff --git a/app-text/htmlc/files/werror.patch b/app-text/htmlc/files/werror.patch
new file mode 100644
index 000000000000..4576b47b80a4
--- /dev/null
+++ b/app-text/htmlc/files/werror.patch
@@ -0,0 +1,18 @@
+Dont build with -Werror like switches.
+Need to patch Makefile and *NOT* Makefile.in since otherwise this triggers a
+rebuild of the Makefile which needs htmlc to be installed first.
+https://bugs.gentoo.org/show_bug.cgi?id=553172
+
+Index: htmlc-2.6.0/config/Makefile
+===================================================================
+--- htmlc-2.6.0.orig/config/Makefile
++++ htmlc-2.6.0/config/Makefile
+@@ -40,7 +40,7 @@ MANDIR = $(PREFIXINSTALLDIR)/man/man$(MA
+ 
+ # The Caml compilers (those defaults should be OK)
+ CAMLDEP = $(OCAML_COMMAND_SEARCH_PATH)ocamldep
+-CAML_FLAGS = -w A -warn-error A #-safe-string
++CAML_FLAGS = -w A #-safe-string
+ CAMLBYT_FLAGS = $(CAML_FLAGS) -g -annot
+ CAMLBYT = $(OCAML_COMMAND_SEARCH_PATH)ocamlc $(CAMLBYT_FLAGS)
+ CAMLBIN_FLAGS = $(CAML_FLAGS) -inline 10000
diff --git a/app-text/htmlc/htmlc-2.40.0.ebuild b/app-text/htmlc/htmlc-2.40.0.ebuild
new file mode 100644
index 000000000000..8f9c4893199b
--- /dev/null
+++ b/app-text/htmlc/htmlc-2.40.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+# Override version: 2.4.0 > 2.21.0 so we name it 2.40.0
+MY_P="${P/0[.]/.}"
+
+DESCRIPTION="HTML template files expander"
+HOMEPAGE="http://htmlc.inria.fr/"
+SRC_URI="http://htmlc.inria.fr/${MY_P}.tgz"
+
+LICENSE="htmlc"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc x86"
+IUSE="+ocamlopt"
+# Files for the tests are missing...
+#RESTRICT="test"
+
+DEPEND=">=dev-lang/ocaml-3.11.2:=[ocamlopt?]"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	./configure \
+		--install-root-dir "${ED}usr" \
+		|| die
+}
+
+src_compile() {
+	if use ocamlopt ; then
+		emake bin
+	else
+		emake byt
+	fi
+}
+
+src_install() {
+	if use ocamlopt ; then
+		emake installbin
+	else
+		emake installbyt
+	fi
+	emake MANDIR='$(PREFIXINSTALLDIR)/share/man/man$(MANEXT)' installman
+	dodoc README Announce* CHANGES
+}
diff --git a/app-text/htmlc/htmlc-2.60.0.ebuild b/app-text/htmlc/htmlc-2.60.0.ebuild
new file mode 100644
index 000000000000..b10f6905b522
--- /dev/null
+++ b/app-text/htmlc/htmlc-2.60.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils
+
+# Override version: 2.4.0 > 2.21.0 so we name it 2.40.0
+MY_P="${P/0[.]/.}"
+
+DESCRIPTION="HTML template files expander"
+HOMEPAGE="http://htmlc.inria.fr/"
+SRC_URI="http://htmlc.inria.fr/${MY_P%.0}.tgz"
+
+LICENSE="htmlc"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="+ocamlopt"
+# Files for the tests are missing...
+#RESTRICT="test"
+
+DEPEND=">=dev-lang/ocaml-3.11.2:=[ocamlopt?]"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	epatch "${FILESDIR}/werror.patch"
+}
+
+src_configure() {
+	./configure \
+		--install-root-dir "${ED}usr" \
+		|| die
+}
+
+src_compile() {
+	if use ocamlopt ; then
+		emake bin
+	else
+		emake byt
+	fi
+}
+
+src_install() {
+	if use ocamlopt ; then
+		emake installbin
+	else
+		emake installbyt
+	fi
+	emake MANDIR='$(PREFIXINSTALLDIR)/share/man/man$(MANEXT)' installman
+	dodoc README Announce* CHANGES
+}
diff --git a/app-text/htmlc/metadata.xml b/app-text/htmlc/metadata.xml
new file mode 100644
index 000000000000..75c9ea74812d
--- /dev/null
+++ b/app-text/htmlc/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>ml@gentoo.org</email>
+		<name>Gentoo ML Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-text/htmldoc-1.8.30 b/app-text/htmldoc-1.8.30
deleted file mode 100644
index 33572ecb1226..000000000000
--- a/app-text/htmldoc-1.8.30
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=media-libs/libpng-1.4:0= virtual/jpeg:0 fltk? ( x11-libs/fltk:1 )
-DESCRIPTION=Convert HTML pages into a PDF document
-EAPI=6
-HOMEPAGE=http://www.msweet.org/projects.php?Z1
-IUSE=fltk
-KEYWORDS=alpha amd64 ~arm ~hppa ia64 ppc ppc64 sparc x86
-LICENSE=GPL-2
-RDEPEND=>=media-libs/libpng-1.4:0= virtual/jpeg:0 fltk? ( x11-libs/fltk:1 )
-SLOT=0
-SRC_URI=https://github.com/michaelrsweet/htmldoc/releases/download/v1.8.30/htmldoc-1.8.30-source.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=92ec80ff54c375a7a1227e3d8045e1f6
diff --git a/app-text/htmldoc/Manifest b/app-text/htmldoc/Manifest
new file mode 100644
index 000000000000..6579633cfb00
--- /dev/null
+++ b/app-text/htmldoc/Manifest
@@ -0,0 +1,3 @@
+DIST htmldoc-1.8.30-source.tar.gz 3901592 BLAKE2B 1aad75973ce485fdbe15d6db99701f88a0fd48a075014c401cc8fdb1f9031214a148748e6731542ca8df7bfa5e5f4c50ec772dac4231fdd71e70f6b092bd20ac SHA512 713dc67622533dae896745ac8809e43a7f91696715aeb77df2628bd04c0d3e16c8402891499e8e0c10cab793b44114e600d5935b3c76a3cfa303c10897456804
+EBUILD htmldoc-1.8.30.ebuild 1113 BLAKE2B e4749513e062adf119f68acfa3ff0864ee035643791ded81316032196366fa74bb60a5b56ffe57b48481d458e973e7b406aa11f0b27d3dfa306b721d25991ef4 SHA512 535e27ae7e6ac09315b0f3b0290b0963320e0335ed91fd82cac323dcf431a99a2146f97a2cbbdf187dbd5401b8833594a84d912ae9ff832534848bcb7d35c94f
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/htmldoc/htmldoc-1.8.30.ebuild b/app-text/htmldoc/htmldoc-1.8.30.ebuild
new file mode 100644
index 000000000000..9fd2fd29c494
--- /dev/null
+++ b/app-text/htmldoc/htmldoc-1.8.30.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit toolchain-funcs
+
+DESCRIPTION="Convert HTML pages into a PDF document"
+HOMEPAGE="http://www.msweet.org/projects.php?Z1"
+SRC_URI="https://github.com/michaelrsweet/${PN}/releases/download/v${PV}/${P}-source.tar.gz"
+IUSE="fltk"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="alpha amd64 ~arm ~hppa ia64 ppc ppc64 sparc x86"
+
+DEPEND=">=media-libs/libpng-1.4:0=
+	virtual/jpeg:0
+	fltk? ( x11-libs/fltk:1 )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"
+
+src_prepare() {
+	default
+
+	# make sure not to use the libs htmldoc ships with
+	rm -r jpeg png zlib || die 'failed to unbundle jpeg, png, and zlib'
+
+	# Fix the documentation path in a few places. Some Makefiles aren't
+	# autotoolized =(
+	for file in configure doc/Makefile doc/htmldoc.man; do
+		sed -i "${file}" \
+			-e "s:/doc/htmldoc:/doc/${PF}/html:g" \
+			|| die "failed to fix documentation path in ${file}"
+	done
+}
+
+src_configure() {
+	CC=$(tc-getCC) CXX=$(tc-getCXX)	DSTROOT="${D}" econf $(use_with fltk gui)
+}
+
+src_install() {
+	emake DSTROOT="${D}" install
+}
diff --git a/app-text/htmldoc/metadata.xml b/app-text/htmldoc/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-text/htmldoc/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/app-text/htmlinc-1.0_beta1 b/app-text/htmlinc-1.0_beta1
deleted file mode 100644
index 6ce7b80d84dc..000000000000
--- a/app-text/htmlinc-1.0_beta1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DESCRIPTION=HTML Include System by Ulli Meybohm
-EAPI=0
-HOMEPAGE=http://www.meybohm.de/
-KEYWORDS=~ppc sparc x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://meybohm.de/files/htmlinc.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=209009be0f27c174bf8ce283cee46b01
diff --git a/app-text/htmlinc-1.0_beta1-r2 b/app-text/htmlinc-1.0_beta1-r2
deleted file mode 100644
index 6c6916c2b93b..000000000000
--- a/app-text/htmlinc-1.0_beta1-r2
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=HTML Include System by Ulli Meybohm
-EAPI=5
-HOMEPAGE=http://www.meybohm.de/
-KEYWORDS=~amd64 ~ppc ~sparc ~x86 ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://meybohm.de/files/htmlinc.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5e3773e6816b556665653f132187c06d
diff --git a/app-text/htmlinc/Manifest b/app-text/htmlinc/Manifest
new file mode 100644
index 000000000000..fe31c1db50ea
--- /dev/null
+++ b/app-text/htmlinc/Manifest
@@ -0,0 +1,5 @@
+AUX htmlinc-gcc3-gentoo.patch 3601 BLAKE2B d268406b773c21cd2885d3f9b5e66ad0121493152a454811b5af1bb20e8ee857777374f2424d68ae9634c74d30d6e24a8d09779059c8fe4440db390259108e23 SHA512 f29d5c823fae27ef027002a8e075e105f028c8a4892d142c64d69af7bca52a63de4ca19aa0cf86acc67f772349472d2b04003c71257cf1b7464c9dee56d95afd
+DIST htmlinc.tar.gz 17042 BLAKE2B 07c9333599876c17846dec8d40c0eba31f1f9321cfa463e4c5dd2698a120c878c6b2d0e6593eb78d22a15fa5333e0fb26ed064a9cccf6b95641cd9a7e3a13a53 SHA512 2bdb7a5df4a8152d9a23f7b740995bd565e92998ef199cfb7d08b1f5e8ae4390c5179f78da71dfa4b7ce18a2a0bfe6002d465b0fa8d860a25afdec5eb4f3ee4c
+EBUILD htmlinc-1.0_beta1-r2.ebuild 722 BLAKE2B f41a4bfbc8f66da2208c4c3a85fdbb0e64b399688cfc43980f2dd7ac0eec1fb932a999674c25dc4938a797d4ead42cf5f875b39726cc8b01b0120a295c12b70d SHA512 f2514266fa029136b0ea9561033624aafd61a89ff51e9d512bb2046663495e2ee281d4390826f724184527c48e4a571a3a5c700c103b987f2a6f460edb68f60e
+EBUILD htmlinc-1.0_beta1.ebuild 528 BLAKE2B 34f15f9f94bfa769fbf258cc81b2878acc4c0c9c29b71de890291127c73b8cb1ae7e95973be9a6a46987b0c91aeab948829588afe17b6b1ee28e1bb76ca8684e SHA512 5cfd9473e10c5b0676c59376070438f8c2c21f5e8a9659ce19ac9ab951575262664f7a1fe3754743afe8f171b0dd7a03c1cd3f75e9eaa55a13edd8be47ed2d03
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/htmlinc/files/htmlinc-gcc3-gentoo.patch b/app-text/htmlinc/files/htmlinc-gcc3-gentoo.patch
new file mode 100644
index 000000000000..eb92c07ff51b
--- /dev/null
+++ b/app-text/htmlinc/files/htmlinc-gcc3-gentoo.patch
@@ -0,0 +1,129 @@
+diff -u htmlinc/bytevector.cc htmlinc-1/bytevector.cc
+--- htmlinc/bytevector.cc	2000-08-07 10:56:23.000000000 +0200
++++ htmlinc-1/bytevector.cc	2002-09-11 13:55:25.000000000 +0200
+@@ -119,7 +119,7 @@
+ 	}
+ 
+ 	bool Bytevector::freadln(int file,char seperator){
+-		vector<Bytevector*>	v;
++		std::vector<Bytevector*>	v;
+ 		Bytevector *b;
+ 		int index=0;
+ 		int status;
+@@ -152,7 +152,7 @@
+ 	
+ 	
+ 	void Bytevector::freadeof(int file){
+-		vector<Bytevector*>	v;
++		std::vector<Bytevector*>	v;
+ 		Bytevector *b;
+ 		int index=0;
+ 		int status;
+diff -u htmlinc/bytevector.h htmlinc-1/bytevector.h
+--- htmlinc/bytevector.h	2000-08-07 10:56:23.000000000 +0200
++++ htmlinc-1/bytevector.h	2002-09-11 13:54:50.000000000 +0200
+@@ -54,7 +54,7 @@
+ 
+ 
+ 
+-class VectorIndexList : public vector<int> {
++class VectorIndexList : public std::vector<int> {
+ };
+ 
+ 
+diff -u htmlinc/stringlist.cc htmlinc-1/stringlist.cc
+--- htmlinc/stringlist.cc	2000-08-07 10:56:23.000000000 +0200
++++ htmlinc-1/stringlist.cc	2002-09-11 13:57:47.000000000 +0200
+@@ -283,7 +283,7 @@
+ 	for (Stringlist::iterator i=begin(); i!=end(); i++){
+ 		delete *i;
+ 	}
+-	vector<Bytevector *>::clear();
++	std::vector<Bytevector *>::clear();
+ }
+ 
+ 
+@@ -373,7 +373,7 @@
+ 
+ void Stringlist::insert(Bytevector *b, int pos){
+ 	iterator i=begin()+pos;
+-	vector<Bytevector *>::insert(i,b);
++	std::vector<Bytevector *>::insert(i,b);
+ }
+ 
+ void Stringlist::insert(Bytevector &b, int pos){
+@@ -417,7 +417,7 @@
+ 
+ 
+ Bytevector& Stringlist::operator[](int i){
+-	return *(vector<Bytevector *>::operator[](i));
++	return *(std::vector<Bytevector *>::operator[](i));
+ }
+ 
+ 
+diff -u htmlinc/stringlist.h htmlinc-1/stringlist.h
+--- htmlinc/stringlist.h	2000-08-07 10:56:23.000000000 +0200
++++ htmlinc-1/stringlist.h	2002-09-11 13:56:32.000000000 +0200
+@@ -57,12 +57,12 @@
+ 	}
+ };
+ 
+-class MatrixIndexList: public vector<MatrixIndex> {
++class MatrixIndexList: public std::vector<MatrixIndex> {
+ };
+ 
+ 
+ 
+-class Stringlist : public vector<Bytevector*> {
++class Stringlist : public std::vector<Bytevector*> {
+ private:
+     Stringlist::iterator getID(Bytevector id);
+ 	
+diff -Naur htmlinc-old/help.h htmlinc/help.h
+--- htmlinc/help.h	2000-08-08 09:04:28.000000000 -0400
++++ htmlinc-1/help.h	2004-03-01 19:43:43.770233421 -0500
+@@ -4,25 +4,25 @@
+ 
+ char * helpV[]=
+ {
+-{"HTML INCLUDE SYSTEM Version 1.0 beta1 - Compatible to Phase 5"},
+-{"Copyright (C) 2000 , Ulli Meybohm, www.meybohm.de (GNU General Public License)"},
+-{""},
+-{"Start:    "},
+-{"          htmlinc <include_dir> <htmlfile_1> <htmlfile_2> ... <htmlfile_n>"},
+-{""},
+-{"Options:"},
+-{"          <include_dir> = Directory of the Includefiles"},
+-{"	  <htmlfile_i>  = HTML-Files in which the includes should be updated"},
+-{""},
+-{"Examples:"},
+-{"          1:   htmlinc ~/www/inc/ *.html"},
+-{""},
+-{"          2:   cd ~/www"},
+-{"	       htmlinc inc/ `find * | grep \"\\\\.\"html`      (recursive)"},
+-{"	      "},
+-{""},
+-{"Report bugs to ulli@meybohm.de."},
+-{""}
++"HTML INCLUDE SYSTEM Version 1.0 beta1 - Compatible to Phase 5",
++"Copyright (C) 2000 , Ulli Meybohm, www.meybohm.de (GNU General Public License)",
++"",
++"Start:    ",
++"          htmlinc <include_dir> <htmlfile_1> <htmlfile_2> ... <htmlfile_n>",
++"",
++"Options:",
++"          <include_dir> = Directory of the Includefiles",
++"	  <htmlfile_i>  = HTML-Files in which the includes should be updated",
++"",
++"Examples:",
++"          1:   htmlinc ~/www/inc/ *.html",
++"",
++"          2:   cd ~/www",
++"	       htmlinc inc/ `find * | grep \"\\\\.\"html`      (recursive)",
++"	      ",
++"",
++"Report bugs to ulli@meybohm.de.",
++""
+ };
+ 
+ int helpC=18;
diff --git a/app-text/htmlinc/htmlinc-1.0_beta1-r2.ebuild b/app-text/htmlinc/htmlinc-1.0_beta1-r2.ebuild
new file mode 100644
index 000000000000..3a6d05570bbb
--- /dev/null
+++ b/app-text/htmlinc/htmlinc-1.0_beta1-r2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="HTML Include System by Ulli Meybohm"
+HOMEPAGE="http://www.meybohm.de/"
+SRC_URI="http://meybohm.de/files/${PN}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-linux ~ppc-macos ~x86-macos"
+IUSE=""
+
+S=${WORKDIR}/htmlinc
+
+src_prepare() {
+	epatch "${FILESDIR}"/htmlinc-gcc3-gentoo.patch
+	sed -i Makefile \
+		-e 's| -o | $(LDFLAGS)&|g' \
+		|| die "sed Makefile"
+}
+
+src_compile() {
+	# This is C++ not C source
+	emake \
+		CC=$(tc-getCXX) \
+		CFLAGS="${CXXFLAGS} -Wall" \
+		LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	dobin htmlinc
+	dodoc README
+}
diff --git a/app-text/htmlinc/htmlinc-1.0_beta1.ebuild b/app-text/htmlinc/htmlinc-1.0_beta1.ebuild
new file mode 100644
index 000000000000..a11b46cd4146
--- /dev/null
+++ b/app-text/htmlinc/htmlinc-1.0_beta1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+inherit eutils
+
+DESCRIPTION="HTML Include System by Ulli Meybohm"
+HOMEPAGE="http://www.meybohm.de/"
+SRC_URI="http://meybohm.de/files/${PN}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~ppc sparc x86"
+IUSE=""
+
+DEPEND=""
+S=${WORKDIR}/htmlinc
+
+src_unpack() {
+	unpack ${A}
+	epatch "${FILESDIR}"/htmlinc-gcc3-gentoo.patch
+}
+
+src_compile() {
+	emake CFLAGS="${CXXFLAGS} -Wall" || die
+}
+
+src_install() {
+	dobin htmlinc
+}
diff --git a/app-text/htmlinc/metadata.xml b/app-text/htmlinc/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-text/htmlinc/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/app-text/htmlmin-0.1.11_pre20170909 b/app-text/htmlmin-0.1.11_pre20170909
deleted file mode 100644
index b714496910f1..000000000000
--- a/app-text/htmlmin-0.1.11_pre20170909
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=A configurable HTML Minifier with safety features
-EAPI=6
-HOMEPAGE=https://github.com/mankyd/htmlmin
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/mankyd/htmlmin/archive/7bcbb995778fc07e427872dc74af9646fd0c907d.tar.gz -> htmlmin-0.1.11_pre20170909.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ae67d295b4e051291815ce07b41744d0
diff --git a/app-text/htmlmin-0.1.12 b/app-text/htmlmin-0.1.12
deleted file mode 100644
index d4e631c617be..000000000000
--- a/app-text/htmlmin-0.1.12
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=A configurable HTML Minifier with safety features
-EAPI=6
-HOMEPAGE=https://github.com/mankyd/htmlmin
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/h/htmlmin/htmlmin-0.1.12.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1ece3ddddb1e046a4863a9bb38aab249
diff --git a/app-text/htmlmin/Manifest b/app-text/htmlmin/Manifest
new file mode 100644
index 000000000000..3d4987d3b593
--- /dev/null
+++ b/app-text/htmlmin/Manifest
@@ -0,0 +1,5 @@
+DIST htmlmin-0.1.11_pre20170909.tar.gz 123229 BLAKE2B 7cc22370afa045ac13bf05082d396534e08a454f13f6bf321bc45c4743c33813bc32c31b655c21d731f091f11d13aeef405bc82c8e2b0ed0d0a12a25e4e7f3ad SHA512 85b29bca8f40680574fa21e2720a6b573ba69b94c239cdbcea80cdb1d0032bbf0d735f596f2a3beb3b3691b2366cdfd6051dd2499eaeb6b4b7618c7b59ebd7ec
+DIST htmlmin-0.1.12.tar.gz 19940 BLAKE2B 66e9596f687b70fa44362078075cb5f70553e65a7a1a6c55a4abac6adc5d0821b8936507cbb56f4e8ea96575a8801ec341416fead54b18ff9e10d199ed506529 SHA512 5669327dc64d8d28accdfe0d9a222e723fccdc12b52e7f0315fb9caf958a734a0cf0514ad476cbd0b7d0f2d83514a207867127f135f5e51cfda9b15dbfe24b78
+EBUILD htmlmin-0.1.11_pre20170909.ebuild 634 BLAKE2B 9a55a43ee6ffaa3e5a363df3f776164e9671ff0c43d121bf575ef43a5e8d6de35368cc187e8af782f14a993966f8f141dc93df7eaf89d72422d757a6f881e0ab SHA512 c39a88b40626f7e8e943d8ef05fc355d523d13b65577c6e535139e8fa958489a83490bbff47a9cef2595f1e3c871512e4083bc3b115864f2d6644662e7a2b608
+EBUILD htmlmin-0.1.12.ebuild 508 BLAKE2B 57fa9adb75cea920eb9ef209a31f8c329315f22c269c75f714a149d8e1c07b4fba41b6a6c8fd9e170058555c1e455b05ab5d718c8a7d027e46b2792efb4ee34c SHA512 97feee6c9be7a7d96cf9a0acf2b70b2580c6e240d9de77c5487e1df260fa4327c1a365bd1d182a50fffde330b82411673514d40c9da546476fb648af13037593
+MISC metadata.xml 424 BLAKE2B 1026b0d3b470845caf9f575527f76c10b691c855426e5fe48972943ca067e9c4211f3e5af025b85f3881c321614c174f6c2f751c2f3f0764aedf04abb2dfe125 SHA512 53ae65ab7e6dd530f398c228e7ad38242a367efdd398a5bd321704e42f33b997c4fc5bfb942a90722b164ff29b35c1f6e3d3e15414241995bd371c3090c250e0
diff --git a/app-text/htmlmin/htmlmin-0.1.11_pre20170909.ebuild b/app-text/htmlmin/htmlmin-0.1.11_pre20170909.ebuild
new file mode 100644
index 000000000000..162bd42974d4
--- /dev/null
+++ b/app-text/htmlmin/htmlmin-0.1.11_pre20170909.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1 vcs-snapshot
+
+HTMLMIN_GIT_REVISION="7bcbb995778fc07e427872dc74af9646fd0c907d"
+
+DESCRIPTION="A configurable HTML Minifier with safety features"
+HOMEPAGE="https://github.com/mankyd/htmlmin"
+SRC_URI="https://github.com/mankyd/${PN}/archive/${HTMLMIN_GIT_REVISION}.tar.gz
+			 -> ${P}.tar.gz"
+
+LICENSE="BSD"
+
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+src_prepare() {
+	sed '/prune/d' -i MANIFEST.in
+	default
+}
diff --git a/app-text/htmlmin/htmlmin-0.1.12.ebuild b/app-text/htmlmin/htmlmin-0.1.12.ebuild
new file mode 100644
index 000000000000..cdddc86d92a3
--- /dev/null
+++ b/app-text/htmlmin/htmlmin-0.1.12.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="A configurable HTML Minifier with safety features"
+HOMEPAGE="https://github.com/mankyd/htmlmin"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+src_prepare() {
+	sed '/prune/d' -i MANIFEST.in
+	default
+}
diff --git a/app-text/htmlmin/metadata.xml b/app-text/htmlmin/metadata.xml
new file mode 100644
index 000000000000..2b2dd5ca9914
--- /dev/null
+++ b/app-text/htmlmin/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>titanofold@gentoo.org</email>
+		<name>Aaron W. Swenson</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">htmlmin</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/htmlrecode-1.3.1 b/app-text/htmlrecode-1.3.1
deleted file mode 100644
index c3048cc2ab07..000000000000
--- a/app-text/htmlrecode-1.3.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=>=sys-apps/sed-4
-DESCRIPTION=Recodes HTML file using a new character set
-EAPI=4
-HOMEPAGE=https://bisqwit.iki.fi/source/htmlrecode.html
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=https://bisqwit.iki.fi/src/arch/htmlrecode-1.3.1.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=05e8a55f9d019640a1249e1cd4c91584
diff --git a/app-text/htmlrecode-1.3.1-r1 b/app-text/htmlrecode-1.3.1-r1
deleted file mode 100644
index 59df3b592de1..000000000000
--- a/app-text/htmlrecode-1.3.1-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DESCRIPTION=Recodes HTML file using a new character set
-EAPI=7
-HOMEPAGE=https://bisqwit.iki.fi/source/htmlrecode.html
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=https://bisqwit.iki.fi/src/arch/htmlrecode-1.3.1.tar.bz2
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=557d4b8bef59093983249f080abefc12
diff --git a/app-text/htmlrecode/Manifest b/app-text/htmlrecode/Manifest
new file mode 100644
index 000000000000..80d944afacbb
--- /dev/null
+++ b/app-text/htmlrecode/Manifest
@@ -0,0 +1,5 @@
+AUX htmlrecode-1.3.1-ar.patch 187 BLAKE2B 2931aec68270d9c9bd91c494eea1598915713eb5d80433e95f12a1fa4f432bc0238eb02f77361090ea8525aaab9027b753b62bb6b44109e4f83659de5efc8d10 SHA512 a49a858d317a8eaaf5ac5079763e04f043c5471519dd7f362ccb621ec43b13841c31a24436d255f5386982bd78ae6182ad7c5bf990e4c4164ec800ac616a9df8
+DIST htmlrecode-1.3.1.tar.bz2 51387 BLAKE2B 7aee0e5c6c5c3c599ccaff76c7bd2e36b63857e96429c582eeda5f16cce6c1ceeb1bff929c4ea03f8bb6ad0154b92a90e53132334c7e59f365e5541b87c65e97 SHA512 180b9c2a1214007bd3163d5df7bcf15c299f452b78f0383a01d85d48212d8ae32c2b5598f44c40ce54b332c26f3ee5c448c614fbae383ec9a326e44f69b0ad10
+EBUILD htmlrecode-1.3.1-r1.ebuild 774 BLAKE2B f3f4931263c7c6e64c6657b80082a9efbec307311974c4ae536d52791f622a8982ce1107b5b359c3666125adbb35d4c37979a4f404494774f774ad4ef1a087d5 SHA512 43618c5df87e122fdcecbf85c29c56b14c781e105a5fe54e2179aa553391845fdbecd5826ccef749892507c0b6792977387f66ebc7f514d8b3310ee79d650351
+EBUILD htmlrecode-1.3.1.ebuild 799 BLAKE2B 692d9396916f975c3e1640785c61a518dddcd90e1811024762000f94b22a92d8e565a2fa6b15b531b04f0acf1bf1bb462f15c9581127288a4f1ff16d31b97ee2 SHA512 5bac586cc6a9255fa8bcc18faa9f2cae07a8a1511b7cba695fb187f1196a92aed95021bab696edeec1501089bc1323be1785da6c61a732feaf6798b8652a867a
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/htmlrecode/files/htmlrecode-1.3.1-ar.patch b/app-text/htmlrecode/files/htmlrecode-1.3.1-ar.patch
new file mode 100644
index 000000000000..57e080c8a378
--- /dev/null
+++ b/app-text/htmlrecode/files/htmlrecode-1.3.1-ar.patch
@@ -0,0 +1,11 @@
+--- a/argh/Makefile
++++ b/argh/Makefile
+@@ -21,7 +21,7 @@
+ 	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -fpic -o $@ -c $<
+ 
+ libargh.a: argh.o
+-	ar -rc $@ $^
++	$(AR) -rc $@ $^
+ 
+ include depfun.mak
+ 
diff --git a/app-text/htmlrecode/htmlrecode-1.3.1-r1.ebuild b/app-text/htmlrecode/htmlrecode-1.3.1-r1.ebuild
new file mode 100644
index 000000000000..4b9258115b94
--- /dev/null
+++ b/app-text/htmlrecode/htmlrecode-1.3.1-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Recodes HTML file using a new character set"
+HOMEPAGE="https://bisqwit.iki.fi/source/htmlrecode.html"
+SRC_URI="https://bisqwit.iki.fi/src/arch/${P}.tar.bz2"
+
+KEYWORDS="~amd64 ~ppc ~x86"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+PATCHES=( "${FILESDIR}/${P}-ar.patch" )
+
+src_prepare() {
+	touch .depend argh/.depend || die
+	default
+}
+
+src_configure() { :; }
+
+src_compile() {
+	local makeopts=(
+		AR="$(tc-getAR)"
+		CPPDEBUG=
+		CXX="$(tc-getCXX)"
+		CXXFLAGS="${CXXFLAGS}"
+		LDFLAGS="${LDFLAGS}"
+	)
+	emake "${makeopts[@]}" -C argh libargh.a
+	emake "${makeopts[@]}" htmlrecode
+}
+
+src_install() {
+	dobin htmlrecode
+	dodoc README.html
+}
diff --git a/app-text/htmlrecode/htmlrecode-1.3.1.ebuild b/app-text/htmlrecode/htmlrecode-1.3.1.ebuild
new file mode 100644
index 000000000000..1174c57d9c79
--- /dev/null
+++ b/app-text/htmlrecode/htmlrecode-1.3.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Recodes HTML file using a new character set"
+HOMEPAGE="https://bisqwit.iki.fi/source/htmlrecode.html"
+SRC_URI="https://bisqwit.iki.fi/src/arch/${P}.tar.bz2"
+
+KEYWORDS="~amd64 ~ppc ~x86"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+DEPEND=">=sys-apps/sed-4"
+RDEPEND=""
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-ar.patch"
+	touch .depend argh/.depend
+}
+
+src_configure() {
+	:
+}
+
+src_compile() {
+	local makeopts=(
+		AR="$(tc-getAR)"
+		CPPDEBUG=
+		CXX="$(tc-getCXX)"
+		CXXFLAGS="${CXXFLAGS}"
+		LDFLAGS="${LDFLAGS}"
+	)
+	emake "${makeopts[@]}" -C argh libargh.a
+	emake "${makeopts[@]}" htmlrecode
+}
+
+src_install() {
+	dobin htmlrecode
+	dohtml README.html
+}
diff --git a/app-text/htmlrecode/metadata.xml b/app-text/htmlrecode/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-text/htmlrecode/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/app-text/htmltidy-20090325-r2 b/app-text/htmltidy-20090325-r2
deleted file mode 100644
index 6fba12397a12..000000000000
--- a/app-text/htmltidy-20090325-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=doc? ( app-doc/doxygen ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Tidy the layout and correct errors in HTML and XML documents
-EAPI=5
-HOMEPAGE=http://tidy.sourceforge.net/
-IUSE=debug doc static-libs
-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
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://gentoo/tidy-20090325.tar.bz2 mirror://gentoo/tidy-20090325-doc.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=dea2dc6a07edaade91158c47727c10e2
diff --git a/app-text/htmltidy/Manifest b/app-text/htmltidy/Manifest
new file mode 100644
index 000000000000..0b2f4463931c
--- /dev/null
+++ b/app-text/htmltidy/Manifest
@@ -0,0 +1,7 @@
+AUX 11CVE-2015-5522.patch 1387 BLAKE2B 0a33769a37f78693025a3fb7e2bdcb6d02634df7c7cb417bad760ddc6318a51d1def3dc318a06b4182a916e664a0b47e2e3b8e40dfaff3616745c668b5b81a56 SHA512 d543dcf963fca7eaf644033a6f0252ec16b628984e1acd86fdb6d4657f01a2b3010c4c5f41b48126ce91cd38b5902349289ae4e11376cdc827813aac84b83f2c
+AUX htmltidy-20090325-tidyrc.patch 923 BLAKE2B 1ce5800a8991d37edb48d652c03525ce68cc97488dd0fda0214b4437b6f9bc29e0e29f046328bd1df4eb0143757d7b866df06fd302d2b2c367817e0deec5202a SHA512 2acef36a990196c4c995a4678988f5f4bc51b87c17a01843b1f7cefc4ff1062425d366b29ace0839ea8b6b64a8923c5f56ac4048106825b946059eae8951e326
+AUX htmltidy-5.10.26-strip-O2-flag.patch 370 BLAKE2B 7c2a58a6a8c00460871278f59676d3b8b8077a7cf2fc1f65dc9ae2987e06d760c73177baa37a197eb0f45f3a5c09bc2030f556948cfd2470fabe2bd734527e3d SHA512 671a0ef17388fb39d5623e0dd2b8aa6c55c22d9f3ba8eea093ddea1234a2786ef983cbe9dd7002fe04b2986ae888458f4f44120c47aa34dc145d34d9db2f81d7
+DIST tidy-20090325-doc.tar.bz2 13319 BLAKE2B c55c5e10cdfbf0eb62685955cad24f628c21e612bd12c41018c139b3b93db95cc201888f6766d7f68f2d1c4d4cfb2cab25b668eff0d2d241462f4cf9b65e79e1 SHA512 0224d1f839f3829a9c879eba8a98ceee3b0c9f8bfe1721076859714428d534f492acd11e49992fccc2e45afd64d79067793c90f7af06d623ef89e7c16dfee35b
+DIST tidy-20090325.tar.bz2 382016 BLAKE2B 3373e94d54cfef866e701e2e258be821b8749dbbbc37b10e4e4e4ba6d7f5995676161ac11bc6a2497f5e02c3907f680fabe9ac6dec2f2365aeb39c03b9697e0a SHA512 daeab2c3dd7f1248a5dbc1585267a8fdb0be09a940b79c3e53c97051f692cf85ea9f0a267f37e1c877054b77efb836d422a1e7ff61b22b383a2d2ac08939b970
+EBUILD htmltidy-20090325-r2.ebuild 2003 BLAKE2B 43116843d4c9eaacdb91822247b6a96868654c87ee92f180fb7112e87644ab66a09d4e105c1e4f983e700708b46aafe3bec67168698e890a42a90042ca68ed80 SHA512 c16aa9a70389e21ba8260fc2118bc36889350d95fc53ea7350279f8fb70252182156cb21efdcd8c2b31181ef18e0e53a499859064cc73149cb6d60ed328ef09a
+MISC metadata.xml 241 BLAKE2B bd724ebe3c99c206e2e78f9bdab811083ca54eafaf1e283f4913af473e6e9710f380021fcb71cc863bfc3cc0984475adff5d5f5e938b55c533ebc7460c597ee1 SHA512 3f74e1d47cf7af59d7255fbb4e6f04fc372447cc101a524779ac59bdc4acba08d53756350575e377f2ccf0ebf309f499ec81fda9d7cd93d234e53dd06cf504ba
diff --git a/app-text/htmltidy/files/11CVE-2015-5522.patch b/app-text/htmltidy/files/11CVE-2015-5522.patch
new file mode 100644
index 000000000000..b4d6158ea04a
--- /dev/null
+++ b/app-text/htmltidy/files/11CVE-2015-5522.patch
@@ -0,0 +1,34 @@
+From c18f27a58792f7fbd0b30a0ff50d6b40a82f940d Mon Sep 17 00:00:00 2001
+From: Geoff McLane <ubuntu@geoffair.info>
+Date: Wed, 3 Jun 2015 20:26:03 +0200
+Subject: [PATCH] Issue #217 - avoid len going negative, ever...
+
+---
+ src/lexer.c | 8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/src/lexer.c b/src/lexer.c
+index 376a3d8..664f806 100644
+--- a/src/lexer.c
++++ b/src/lexer.c
+@@ -3739,16 +3740,17 @@ static tmbstr ParseValue( TidyDocImpl* doc, ctmbstr name,
+         /* and prompts attributes unless --literal-attributes is set to yes      */
+         /* #994841 - Whitespace is removed from value attributes                 */
+ 
+-        if (munge &&
++        /* Issue #217 - Also only if/while (len > 0) - MUST NEVER GO NEGATIVE! */
++        if ((len > 0) && munge &&
+             TY_(tmbstrcasecmp)(name, "alt") &&
+             TY_(tmbstrcasecmp)(name, "title") &&
+             TY_(tmbstrcasecmp)(name, "value") &&
+             TY_(tmbstrcasecmp)(name, "prompt"))
+         {
+-            while (TY_(IsWhite)(lexer->lexbuf[start+len-1]))
++            while (TY_(IsWhite)(lexer->lexbuf[start+len-1]) && (len > 0))
+                 --len;
+ 
+-            while (TY_(IsWhite)(lexer->lexbuf[start]) && start < len)
++            while (TY_(IsWhite)(lexer->lexbuf[start]) && (start < len) && (len > 0))
+             {
+                 ++start;
+                 --len;
diff --git a/app-text/htmltidy/files/htmltidy-20090325-tidyrc.patch b/app-text/htmltidy/files/htmltidy-20090325-tidyrc.patch
new file mode 100644
index 000000000000..942a61e1464c
--- /dev/null
+++ b/app-text/htmltidy/files/htmltidy-20090325-tidyrc.patch
@@ -0,0 +1,31 @@
+Index: tidy-20090325/include/platform.h
+===================================================================
+--- tidy-20090325.orig/include/platform.h
++++ tidy-20090325/include/platform.h
+@@ -24,7 +24,7 @@ extern "C" {
+ */
+ 
+ /* #define TIDY_CONFIG_FILE "/etc/tidy_config.txt" */ /* original */
+-/* #define TIDY_CONFIG_FILE "/etc/tidyrc" */
++#define TIDY_CONFIG_FILE "/etc/tidyrc"
+ /* #define TIDY_CONFIG_FILE "/etc/tidy.conf" */
+ 
+ /*
+@@ -33,7 +33,7 @@ extern "C" {
+   It enables tidy to find config files named ~/.tidyrc if 
+   the HTML_TIDY environment variable is not set.
+ */
+-/* #define TIDY_USER_CONFIG_FILE "~/.tidyrc" */
++#define TIDY_USER_CONFIG_FILE "~/.tidyrc"
+ 
+ /*
+   Uncomment the following #define if your
+@@ -48,7 +48,7 @@ extern "C" {
+   Contributed by Todd Lewis.
+ */
+ 
+-/* #define SUPPORT_GETPWNAM */
++#define SUPPORT_GETPWNAM
+ 
+ 
+ /* Enable/disable support for Big5 and Shift_JIS character encodings */
diff --git a/app-text/htmltidy/files/htmltidy-5.10.26-strip-O2-flag.patch b/app-text/htmltidy/files/htmltidy-5.10.26-strip-O2-flag.patch
new file mode 100644
index 000000000000..4c805cf2226f
--- /dev/null
+++ b/app-text/htmltidy/files/htmltidy-5.10.26-strip-O2-flag.patch
@@ -0,0 +1,12 @@
+diff -urN tidy.old/configure.in tidy-26/configure.in
+--- tidy.old/configure.in	2006-02-13 17:17:49.000000000 +0100
++++ tidy-26/configure.in	2006-02-13 17:17:20.000000000 +0100
+@@ -72,7 +72,7 @@
+ if test $debug_build = yes; then
+ 	CFLAGS="$save_cflags -g"
+ else
+-	CFLAGS="-O2 $save_cflags"
++	CFLAGS="$save_cflags"
+ fi
+ # 
+ # =============================================
diff --git a/app-text/htmltidy/htmltidy-20090325-r2.ebuild b/app-text/htmltidy/htmltidy-20090325-r2.ebuild
new file mode 100644
index 000000000000..d3a18bca8cce
--- /dev/null
+++ b/app-text/htmltidy/htmltidy-20090325-r2.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+MY_PN="tidy"
+MY_P="${MY_PN}-${PV}"
+
+inherit eutils autotools
+
+DESCRIPTION="Tidy the layout and correct errors in HTML and XML documents"
+HOMEPAGE="http://tidy.sourceforge.net/"
+SRC_URI="mirror://gentoo/${MY_P}.tar.bz2
+	mirror://gentoo/${MY_P}-doc.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+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"
+IUSE="debug doc static-libs"
+
+DEPEND="doc? ( app-doc/doxygen )"
+RDEPEND=""
+
+S="${WORKDIR}"/${MY_P}
+
+src_prepare() {
+	# Required to setup the source dist for autotools
+	einfo "Setting up autotools for source build"
+	cp -R  ./build/gnuauto/* . || die "could not prepare autotools environment"
+
+	# Stop tidy from appending -O2 to our CFLAGS
+	epatch "${FILESDIR}"/htmltidy-5.10.26-strip-O2-flag.patch
+
+	# Define /etc/tidyrc for system wide config, bug 154834
+	epatch "${FILESDIR}"/htmltidy-20090325-tidyrc.patch
+
+	# Fix security bug 561452
+	epatch "${FILESDIR}"/11CVE-2015-5522.patch
+
+	eautoreconf
+}
+
+src_compile() {
+	default
+
+	if use doc ; then
+		doxygen htmldoc/doxygen.cfg  || die "error making apidocs"
+	fi
+}
+
+src_configure() {
+	econf \
+		$(use_enable debug) \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name '*.la' -exec rm -f {} +
+
+	# Now the man page is provided as an xsl file, which
+	# we can't use until htmltidy is merged.
+	# I have generated the man page and quickref which is on
+	# the mirrors. (bug #132429)
+	doman "${WORKDIR}"/"${MY_P}"-doc/tidy.1
+
+	# Fix name before installing
+	mv "${WORKDIR}"/"${MY_P}"-doc/quickref-html \
+		"${WORKDIR}"/"${MY_P}"-doc/quickref.html
+
+	cd "${S}"/htmldoc
+	# Install basic html documentation
+	dohtml *.html *.css *.gif "${WORKDIR}"/"${MY_P}"-doc/quickref.html
+
+	# If use 'doc' is set, then we also want to install the
+	# api documentation
+	use doc && dohtml -r api
+}
diff --git a/app-text/htmltidy/metadata.xml b/app-text/htmltidy/metadata.xml
new file mode 100644
index 000000000000..3fbef354e7d1
--- /dev/null
+++ b/app-text/htmltidy/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="sourceforge">tidy</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/htp-1.16-r1 b/app-text/htp-1.16-r1
deleted file mode 100644
index b13f2a15ad84..000000000000
--- a/app-text/htp-1.16-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install prepare test
-DESCRIPTION=An HTML preprocessor
-EAPI=5
-HOMEPAGE=http://htp.sourceforge.net/
-KEYWORDS=~alpha ~ppc ~sparc ~x86
-LICENSE=Clarified-Artistic
-SLOT=0
-SRC_URI=mirror://sourceforge/htp/htp-1.16.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d7d7840b91b88a62719119499c319975
diff --git a/app-text/htp/Manifest b/app-text/htp/Manifest
new file mode 100644
index 000000000000..26c2ba9332e4
--- /dev/null
+++ b/app-text/htp/Manifest
@@ -0,0 +1,4 @@
+AUX strip.patch 261 BLAKE2B 760a04284f2b79e942fbee21d7b075d41c047f8f7f5eca563f6754e4a9fec1c372986dbcc965f2a1009ac26f8347868f7c0cb4bb767ac98c3be8b2895c49677f SHA512 2f2a9afb828e9de08fa97ca2798a0d2dc6f65cbf192cbc749c3790ed542f75c49c5fbb4644fb8017f93dc24a42c584914d5659841a211c1fe74a3aa43be633e4
+DIST htp-1.16.tar.gz 141133 BLAKE2B 58f0ab7df1400d561ec1994a98ce4fa3acaa3299b51d9382f9baaecbd95a623795d72204617c153fd4e165910fdabd0328e737cccb242be2075edd2573af55c1 SHA512 f33a9497fc3a1d0b95d8e3ee2747583d58626b565644e7c8cc054570458907aac9db42c6fa816b176b0e10db98ec7d1cedb521406035a8e7173e1abd991533a0
+EBUILD htp-1.16-r1.ebuild 1254 BLAKE2B a2c8cce1c8d85d069dfc094dea5e60be6ad9adce7e31c5d692fcfec411a3bc1b0f79967a14f7b5f0682abcfa3998bf4cbde25f8572292f998a1d42c499eb8703 SHA512 0217b514defbe8cbf8bfee84c53287a3bd93b1841b4ae3c2bbd8927833174321c77e4b67c26d0587cfc0d855e76497af42cf04b179eb39a0cd2a218042a3b897
+MISC metadata.xml 323 BLAKE2B 815632fb1a839f62a7e2201270b77e1cb16955e5bcc978bebd09d0501eb2df6f56bf20a8ed6a7c2ed6d7a5fcb5d0900a06c38f22dc649c731ada0d36478f3aa1 SHA512 f5c0a7720bd23aa0c604e0ffa07e2925afe69f9af09c9364818e16197fdf55c1decac5839234cdb08e483be1bfb4d0a88279e57c2b48c0002d3de27e90616f26
diff --git a/app-text/htp/files/strip.patch b/app-text/htp/files/strip.patch
new file mode 100644
index 000000000000..9c92e757bc9e
--- /dev/null
+++ b/app-text/htp/files/strip.patch
@@ -0,0 +1,15 @@
+don't strip
+
+http://bugs.gentoo.org/240110
+
+--- src/Makefile
++++ src/Makefile
+@@ -33,7 +33,7 @@
+ 
+ install-bin: $(MAINEXE)
+ 	mkdir -p $(bindir)
+-	$(INSTALL) -s $(MAINEXE) $(bindir)
++	$(INSTALL) $(MAINEXE) $(bindir)
+ 
+ #
+ # explicit dependency: final executable
diff --git a/app-text/htp/htp-1.16-r1.ebuild b/app-text/htp/htp-1.16-r1.ebuild
new file mode 100644
index 000000000000..f3fd15c02c87
--- /dev/null
+++ b/app-text/htp/htp-1.16-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="An HTML preprocessor"
+HOMEPAGE="http://htp.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="Clarified-Artistic"
+SLOT="0"
+KEYWORDS="~alpha ~ppc ~sparc ~x86"
+IUSE=""
+
+# HTP does not use autoconf, have to set options defined in Makefile.config
+
+src_prepare() {
+	epatch "${FILESDIR}"/strip.patch #240110
+	# let src_test take care of testing
+	sed -i -e '/SUBDIRS /s:tests::' Makefile || die
+	# don't install doc files with +x perms
+	sed -i -e '$aINSTALL += -m644' homepage/ref/{*/,}Makefile || die
+	# make src_test abort on failure
+	sed -i -e '/DIFF.*FAILED/s/echo/exit 1; :/' tests/Makefile || die
+	# the png file in this test isn't fetchable
+	sed -i -e 's: width="630" height="331"::' tests/png.html.exp || die
+}
+
+src_compile() {
+	emake \
+		CCOPT="-c ${CFLAGS} ${CPPFLAGS} -DHAVE_SNPRINTF -DHAVE_VASPRINTF -DHAVE_ASPRINTF" \
+		CC="$(tc-getCC)" \
+		LINK='$(CC) $(LDFLAGS)' \
+		|| die
+}
+
+src_test() {
+	emake -C tests || die
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		prefix='$(DESTDIR)/usr' \
+		pkgdocdir='$(DESTDIR)/usr/share/doc/${PF}/html' \
+		install || die
+}
diff --git a/app-text/htp/metadata.xml b/app-text/htp/metadata.xml
new file mode 100644
index 000000000000..ae333307c43c
--- /dev/null
+++ b/app-text/htp/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>web-apps@gentoo.org</email>
+		<name>Gentoo Webapps</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">htp</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/hunspell-1.6.1-r1 b/app-text/hunspell-1.6.1-r1
deleted file mode 100644
index 54e7408b9825..000000000000
--- a/app-text/hunspell-1.6.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=ncurses? ( sys-libs/ncurses:0= ) readline? ( sys-libs/readline:= ) sys-devel/gettext >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Hunspell spell checker - an improved replacement for myspell in OOo
-EAPI=6
-HOMEPAGE=https://github.com/hunspell
-IUSE=ncurses nls readline static-libs l10n_af l10n_bg l10n_ca l10n_cs l10n_cy l10n_da l10n_de l10n_de-1901 l10n_el l10n_en l10n_eo l10n_es l10n_et l10n_fo l10n_fr l10n_ga l10n_gl l10n_he l10n_hr l10n_hu l10n_ia l10n_id l10n_is l10n_it l10n_kk l10n_km l10n_ku l10n_lt l10n_lv l10n_mi l10n_mk l10n_ms l10n_nb l10n_nl l10n_nn l10n_pl l10n_pt l10n_pt-BR l10n_ro l10n_ru l10n_sk l10n_sl l10n_sq l10n_sv l10n_sw l10n_tn l10n_uk l10n_zu
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=MPL-1.1 GPL-2 LGPL-2.1
-PDEPEND=app-dicts/myspell-en l10n_af? ( app-dicts/myspell-af ) l10n_bg? ( app-dicts/myspell-bg ) l10n_ca? ( app-dicts/myspell-ca ) l10n_cs? ( app-dicts/myspell-cs ) l10n_cy? ( app-dicts/myspell-cy ) l10n_da? ( app-dicts/myspell-da ) l10n_de? ( app-dicts/myspell-de ) l10n_de-1901? ( app-dicts/myspell-de_1901 ) l10n_el? ( app-dicts/myspell-el ) l10n_en? ( app-dicts/myspell-en ) l10n_eo? ( app-dicts/myspell-eo ) l10n_es? ( app-dicts/myspell-es ) l10n_et? ( app-dicts/myspell-et ) l10n_fo? ( app-dicts/myspell-fo ) l10n_fr? ( app-dicts/myspell-fr ) l10n_ga? ( app-dicts/myspell-ga ) l10n_gl? ( app-dicts/myspell-gl ) l10n_he? ( app-dicts/myspell-he ) l10n_hr? ( app-dicts/myspell-hr ) l10n_hu? ( app-dicts/myspell-hu ) l10n_ia? ( app-dicts/myspell-ia ) l10n_id? ( app-dicts/myspell-id ) l10n_is? ( app-dicts/myspell-is ) l10n_it? ( app-dicts/myspell-it ) l10n_kk? ( app-dicts/myspell-kk ) l10n_km? ( app-dicts/myspell-km ) l10n_ku? ( app-dicts/myspell-ku ) l10n_lt? ( app-dicts/myspell-lt ) l10n_lv? ( app-dicts/myspell-lv ) l10n_mi? ( app-dicts/myspell-mi ) l10n_mk? ( app-dicts/myspell-mk ) l10n_ms? ( app-dicts/myspell-ms ) l10n_nb? ( app-dicts/myspell-nb ) l10n_nl? ( app-dicts/myspell-nl ) l10n_nn? ( app-dicts/myspell-nn ) l10n_pl? ( app-dicts/myspell-pl ) l10n_pt? ( app-dicts/myspell-pt ) l10n_pt-BR? ( app-dicts/myspell-pt-br ) l10n_ro? ( app-dicts/myspell-ro ) l10n_ru? ( app-dicts/myspell-ru ) l10n_sk? ( app-dicts/myspell-sk ) l10n_sl? ( app-dicts/myspell-sl ) l10n_sq? ( app-dicts/myspell-sq ) l10n_sv? ( app-dicts/myspell-sv ) l10n_sw? ( app-dicts/myspell-sw ) l10n_tn? ( app-dicts/myspell-tn ) l10n_uk? ( app-dicts/myspell-uk ) l10n_zu? ( app-dicts/myspell-zu )
-RDEPEND=ncurses? ( sys-libs/ncurses:0= ) readline? ( sys-libs/readline:= )
-SLOT=0/1.6
-SRC_URI=https://github.com/hunspell/hunspell/archive/v1.6.1.tar.gz -> hunspell-1.6.1.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=09907cee53ea82a55bd00f346fc0895a
diff --git a/app-text/hunspell-1.6.2-r1 b/app-text/hunspell-1.6.2-r1
deleted file mode 100644
index 09dfd3cf04c0..000000000000
--- a/app-text/hunspell-1.6.2-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=ncurses? ( sys-libs/ncurses:0= ) readline? ( sys-libs/readline:= ) sys-devel/gettext >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Hunspell spell checker - an improved replacement for myspell in OOo
-EAPI=6
-HOMEPAGE=https://github.com/hunspell
-IUSE=ncurses nls readline static-libs l10n_af l10n_bg l10n_ca l10n_cs l10n_cy l10n_da l10n_de l10n_de-1901 l10n_el l10n_en l10n_eo l10n_es l10n_et l10n_fo l10n_fr l10n_ga l10n_gl l10n_he l10n_hr l10n_hu l10n_ia l10n_id l10n_is l10n_it l10n_kk l10n_km l10n_ku l10n_lt l10n_lv l10n_mi l10n_mk l10n_ms l10n_nb l10n_nl l10n_nn l10n_pl l10n_pt l10n_pt-BR l10n_ro l10n_ru l10n_sk l10n_sl l10n_sq l10n_sv l10n_sw l10n_tn l10n_uk l10n_zu
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=MPL-1.1 GPL-2 LGPL-2.1
-PDEPEND=l10n_af? ( app-dicts/myspell-af ) l10n_bg? ( app-dicts/myspell-bg ) l10n_ca? ( app-dicts/myspell-ca ) l10n_cs? ( app-dicts/myspell-cs ) l10n_cy? ( app-dicts/myspell-cy ) l10n_da? ( app-dicts/myspell-da ) l10n_de? ( app-dicts/myspell-de ) l10n_de-1901? ( app-dicts/myspell-de_1901 ) l10n_el? ( app-dicts/myspell-el ) l10n_en? ( app-dicts/myspell-en ) l10n_eo? ( app-dicts/myspell-eo ) l10n_es? ( app-dicts/myspell-es ) l10n_et? ( app-dicts/myspell-et ) l10n_fo? ( app-dicts/myspell-fo ) l10n_fr? ( app-dicts/myspell-fr ) l10n_ga? ( app-dicts/myspell-ga ) l10n_gl? ( app-dicts/myspell-gl ) l10n_he? ( app-dicts/myspell-he ) l10n_hr? ( app-dicts/myspell-hr ) l10n_hu? ( app-dicts/myspell-hu ) l10n_ia? ( app-dicts/myspell-ia ) l10n_id? ( app-dicts/myspell-id ) l10n_is? ( app-dicts/myspell-is ) l10n_it? ( app-dicts/myspell-it ) l10n_kk? ( app-dicts/myspell-kk ) l10n_km? ( app-dicts/myspell-km ) l10n_ku? ( app-dicts/myspell-ku ) l10n_lt? ( app-dicts/myspell-lt ) l10n_lv? ( app-dicts/myspell-lv ) l10n_mi? ( app-dicts/myspell-mi ) l10n_mk? ( app-dicts/myspell-mk ) l10n_ms? ( app-dicts/myspell-ms ) l10n_nb? ( app-dicts/myspell-nb ) l10n_nl? ( app-dicts/myspell-nl ) l10n_nn? ( app-dicts/myspell-nn ) l10n_pl? ( app-dicts/myspell-pl ) l10n_pt? ( app-dicts/myspell-pt ) l10n_pt-BR? ( app-dicts/myspell-pt-br ) l10n_ro? ( app-dicts/myspell-ro ) l10n_ru? ( app-dicts/myspell-ru ) l10n_sk? ( app-dicts/myspell-sk ) l10n_sl? ( app-dicts/myspell-sl ) l10n_sq? ( app-dicts/myspell-sq ) l10n_sv? ( app-dicts/myspell-sv ) l10n_sw? ( app-dicts/myspell-sw ) l10n_tn? ( app-dicts/myspell-tn ) l10n_uk? ( app-dicts/myspell-uk ) l10n_zu? ( app-dicts/myspell-zu )
-RDEPEND=ncurses? ( sys-libs/ncurses:0= ) readline? ( sys-libs/readline:= )
-SLOT=0/1.6
-SRC_URI=https://github.com/hunspell/hunspell/archive/v1.6.2.tar.gz -> hunspell-1.6.2.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=43945cf3dcb1cb844fe9ea3047d23246
diff --git a/app-text/hunspell/Manifest b/app-text/hunspell/Manifest
new file mode 100644
index 000000000000..da85aff6a078
--- /dev/null
+++ b/app-text/hunspell/Manifest
@@ -0,0 +1,7 @@
+AUX hunspell-1.6.0-renameexes.patch 5005 BLAKE2B 1bce704276c65e67077312d3a056072a52370d5465d2ea9e91046dd21f1368579950ecdbc37c403641cace770873865464cef855c836a54e95d1d5f2496c5b6a SHA512 a39225e25c76c6a6f3b92cc932efcc952c8559de2967d7a1c962b3f8a6ab39430fa82cf17ae51f15490f58297ecdfb9154c3ce7a8b058a717bfd1d694cf83245
+AUX hunspell-1.6.2-renameexes.patch 5104 BLAKE2B 83ea0ec81fdd5e8934c954bb2f2d07e9c47f725f8b63360aca7cd611348106a1e3f13ab08609ff4877272ec6b116927c382c5b47731945656ddb7927aca22c50 SHA512 0d1871eda31b83851bf153746e0f4957599e889a536e9c0994d1cb988bc4a887788c1fafe4dccccaa94e68a69e6fa4ff1e201678fa8d1afdcb9608b83211b0ae
+DIST hunspell-1.6.1.tar.gz 706893 BLAKE2B 5e5047aceb7510c2cfaa05d540f8faad2fb844b51bf2d8e48793d588e3b9d31628ddac5d7f9c87078a3b2b8aadf64cd8d93fd4ef881b13451d52f10a1960e2fb SHA512 39b096ec1f5226f13eaf241647fc9b49a6dad04945ae0bcdc61ba845d66d67d64a72ba4287b6f376b5ad053b5d0e1d42a42415c30521c50693f0544718029458
+DIST hunspell-1.6.2.tar.gz 721165 BLAKE2B f377596d2031e89ad902a0f5da85e77948bd5d582bb4c558cc7c379d803a00787237d2feed9d26e037cebb77958709f41fb01d5f8bfed6ae21047a2da83c8f51 SHA512 a23127f1271da95ac06a1fb2f57b659485e959567b61da05b2bb350684003a0fb7e882b5e524c465fd890f79f513ed03174f38611989a1c09081147c47d6da11
+EBUILD hunspell-1.6.1-r1.ebuild 2366 BLAKE2B d566bfed5c322566fdb30ff31f266020b1eb4ce9a0dd6920c5e340b2b922cb5bb3eba4a44dc458c0516c425b4c309cd13b6bf3225ef24b604b5c6d72245a2bc6 SHA512 c4e793a89c9ec4aad6bc2f7fb2036f5c251b329ec597976d07d607364df0de3c22a80903bbca5bfe03416b84bf3416a16691f78524cfc8f90c4519ecc3a89bb9
+EBUILD hunspell-1.6.2-r1.ebuild 2395 BLAKE2B 49772d94f2806f8e6cdda15f68aa89e2dc2eefa307d363a05f5e16c6fcac8118587119c4142b87c467eec51e1a7b43e3731e942b8f03f9a8e55c2dda62e5debc SHA512 79637a9c568b35a50e218254e1a3531fb27b05e694c0cb42bf2470810698010709e31101f1f6da02c60dfb08356808109ab1505175ad193350de6284a33c3d9b
+MISC metadata.xml 274 BLAKE2B 6631c0f576279afaf4cd444df14acd118e393977058e957bd3e41103554a756c43860f75f7550346815f6d8a4320d3d86fb069c9451fbad268bedbde18ed5ec0 SHA512 09ac7c3282788aae9fe48dc86a3bec7d2a5b651b22d6ea06108f9ca5a86e96dddf9ab80433d0f16549649665d9a582d6c44217b73a000ee83995aad922f3caa8
diff --git a/app-text/hunspell/files/hunspell-1.6.0-renameexes.patch b/app-text/hunspell/files/hunspell-1.6.0-renameexes.patch
new file mode 100644
index 000000000000..6a75ce3fb8c0
--- /dev/null
+++ b/app-text/hunspell/files/hunspell-1.6.0-renameexes.patch
@@ -0,0 +1,124 @@
+--- hunspell-1.6.0/src/tools/chmorph.cxx
++++ hunspell-1.6.0/src/tools/chmorph.cxx
+@@ -58,11 +58,11 @@
+     if (!argv[i]) {
+       fprintf(
+           stderr,
+-          "chmorph - change affixes by morphological analysis and generation\n"
+-          "correct syntax is:\nchmorph affix_file "
++          "hunspell-chmorph - change affixes by morphological analysis and generation\n"
++          "correct syntax is:\nhunspell-chmorph affix_file "
+           "dictionary_file file_to_convert STRING1 STRING2\n"
+           "STRINGS may be arbitrary parts of the morphological descriptions\n"
+-          "example: chmorph hu.aff hu.dic hu.txt SG_2 SG_3 "
++          "example: hunspell-chmorph hu.aff hu.dic hu.txt SG_2 SG_3 "
+           " (convert informal Hungarian second person texts to formal third "
+           "person texts)\n");
+       exit(1);
+--- hunspell-1.6.0/src/tools/example.cxx
++++ hunspell-1.6.0/src/tools/example.cxx
+@@ -53,9 +53,9 @@
+   /* first parse the command line options */
+ 
+   if (argc < 4) {
+-    fprintf(stderr, "example (now it works with more dictionary files):\n");
++    fprintf(stderr, "hunspell-example (now it works with more dictionary files):\n");
+     fprintf(stderr,
+-            "example affix_file dictionary_file(s) file_of_words_to_check\n");
++            "hunspell-example affix_file dictionary_file(s) file_of_words_to_check\n");
+     exit(1);
+   }
+ 
+--- hunspell-1.6.0/src/tools/Makefile.am
++++ hunspell-1.6.0/src/tools/Makefile.am
+@@ -1,4 +1,4 @@
+-bin_PROGRAMS=analyze chmorph hunspell munch unmunch hzip hunzip
++bin_PROGRAMS=hunspell-analyze hunspell-chmorph hunspell hunspell-munch hunspell-unmunch hzip hunzip
+ 
+ INCLUDES=-I${top_builddir}/src/hunspell -I${top_srcdir}/src/hunspell -I${top_srcdir}/src/parsers
+ 
+@@ -6,8 +6,8 @@
+ hunzip_SOURCES=hunzip.cxx
+ hunzip_LDADD = ../hunspell/libhunspell-1.6.la
+ 
+-munch_SOURCES=munch.cxx munch.h
+-unmunch_SOURCES=unmunch.cxx unmunch.h
++hunspell_munch_SOURCES=munch.cxx munch.h
++hunspell_unmunch_SOURCES=unmunch.cxx unmunch.h
+ 
+ example_SOURCES=example.cxx
+ example_LDADD = ../hunspell/libhunspell-1.6.la
+@@ -16,11 +16,11 @@
+ hunspell_LDADD = @LIBINTL@ @LIBICONV@ ../parsers/libparsers.a \
+ 	../hunspell/libhunspell-1.6.la @CURSESLIB@ @READLINELIB@
+ 
+-analyze_SOURCES=analyze.cxx
+-analyze_LDADD = ../hunspell/libhunspell-1.6.la
++hunspell_analyze_SOURCES=analyze.cxx
++hunspell_analyze_LDADD = ../hunspell/libhunspell-1.6.la
+ 
+-chmorph_SOURCES=chmorph.cxx
+-chmorph_LDADD = ../parsers/libparsers.a ../hunspell/libhunspell-1.6.la
++hunspell_chmorph_SOURCES=chmorph.cxx
++hunspell_chmorph_LDADD = ../parsers/libparsers.a ../hunspell/libhunspell-1.6.la
+ 
+ noinst_PROGRAMS=example
+ 
+--- hunspell-1.6.0/src/tools/munch.cxx
++++ hunspell-1.6.0/src/tools/munch.cxx
+@@ -81,14 +81,14 @@
+     wf = mystrdup(argv[1]);
+   } else {
+     fprintf(stderr, "correct syntax is:\n");
+-    fprintf(stderr, "munch word_list_file affix_file\n");
++    fprintf(stderr, "hunspell-munch word_list_file affix_file\n");
+     exit(1);
+   }
+   if (argv[2]) {
+     af = mystrdup(argv[2]);
+   } else {
+     fprintf(stderr, "correct syntax is:\n");
+-    fprintf(stderr, "munch word_list_file affix_file\n");
++    fprintf(stderr, "hunspell-munch word_list_file affix_file\n");
+     exit(1);
+   }
+ 
+--- hunspell-1.6.0/src/tools/unmunch.cxx
++++ hunspell-1.6.0/src/tools/unmunch.cxx
+@@ -76,14 +76,14 @@
+     wf = mystrdup(argv[1]);
+   } else {
+     fprintf(stderr, "correct syntax is:\n");
+-    fprintf(stderr, "unmunch dic_file affix_file\n");
++    fprintf(stderr, "hunspell-unmunch dic_file affix_file\n");
+     exit(1);
+   }
+   if (argv[2]) {
+     af = mystrdup(argv[2]);
+   } else {
+     fprintf(stderr, "correct syntax is:\n");
+-    fprintf(stderr, "unmunch dic_file affix_file\n");
++    fprintf(stderr, "hunspell-unmunch dic_file affix_file\n");
+     exit(1);
+   }
+ 
+--- hunspell-1.6.0/tests/test.sh
++++ hunspell-1.6.0/tests/test.sh
+@@ -74,7 +74,7 @@
+ shopt -s expand_aliases
+ 
+ alias hunspell='../libtool --mode=execute -dlopen ../src/hunspell/.libs/libhunspell*.la ../src/tools/hunspell'
+-alias analyze='../libtool --mode=execute -dlopen ../src/hunspell/.libs/libhunspell*.la ../src/tools/analyze'
++alias analyze='../libtool --mode=execute -dlopen ../src/hunspell/.libs/libhunspell*.la ../src/tools/hunspell-analyze'
+ 
+ if [ "$VALGRIND" != "" ]; then
+   rm -f $TEMPDIR/test.pid*
+@@ -83,7 +83,7 @@
+   fi
+ 
+   alias hunspell='../libtool --mode=execute -dlopen ../src/hunspell/.libs/libhunspell*.la valgrind --tool=$VALGRIND --leak-check=yes --show-reachable=yes --log-file=$TEMPDIR/test.pid ../src/tools/hunspell'
+-  alias analyze='../libtool --mode=execute -dlopen ../src/hunspell/.libs/libhunspell*.la valgrind --tool=$VALGRIND --leak-check=yes --show-reachable=yes --log-file=$TEMPDIR/test.pid ../src/tools/analyze'
++  alias analyze='../libtool --mode=execute -dlopen ../src/hunspell/.libs/libhunspell*.la valgrind --tool=$VALGRIND --leak-check=yes --show-reachable=yes --log-file=$TEMPDIR/test.pid ../src/tools/hunspell-analyze'
+ fi
+ 
+ # Tests good words
diff --git a/app-text/hunspell/files/hunspell-1.6.2-renameexes.patch b/app-text/hunspell/files/hunspell-1.6.2-renameexes.patch
new file mode 100644
index 000000000000..be56cabc50bc
--- /dev/null
+++ b/app-text/hunspell/files/hunspell-1.6.2-renameexes.patch
@@ -0,0 +1,127 @@
+--- hunspell-1.6.2/src/tools/chmorph.cxx
++++ hunspell-1.6.2/src/tools/chmorph.cxx
+@@ -55,11 +55,11 @@
+     if (!argv[i]) {
+       fprintf(
+           stderr,
+-          "chmorph - change affixes by morphological analysis and generation\n"
+-          "correct syntax is:\nchmorph affix_file "
++          "hunspell-chmorph - change affixes by morphological analysis and generation\n"
++          "correct syntax is:\nhunspell-chmorph affix_file "
+           "dictionary_file file_to_convert STRING1 STRING2\n"
+           "STRINGS may be arbitrary parts of the morphological descriptions\n"
+-          "example: chmorph hu.aff hu.dic hu.txt SG_2 SG_3 "
++          "example: hunspell-chmorph hu.aff hu.dic hu.txt SG_2 SG_3 "
+           " (convert informal Hungarian second person texts to formal third "
+           "person texts)\n");
+       exit(1);
+--- hunspell-1.6.2/src/tools/example.cxx
++++ hunspell-1.6.2/src/tools/example.cxx
+@@ -48,9 +48,9 @@
+   /* first parse the command line options */
+ 
+   if (argc < 4) {
+-    fprintf(stderr, "example (now it works with more dictionary files):\n");
++    fprintf(stderr, "hunspell-example (now it works with more dictionary files):\n");
+     fprintf(stderr,
+-            "example affix_file dictionary_file(s) file_of_words_to_check\n");
++            "hunspell-example affix_file dictionary_file(s) file_of_words_to_check\n");
+     exit(1);
+   }
+ 
+--- hunspell-1.6.2/src/tools/Makefile.am
++++ hunspell-1.6.2/src/tools/Makefile.am
+@@ -1,4 +1,4 @@
+-bin_PROGRAMS=analyze chmorph hunspell munch unmunch hzip hunzip
++bin_PROGRAMS=hunspell-analyze hunspell-chmorph hunspell hunspell-munch hunspell-unmunch hzip hunzip
+ 
+ AM_CPPFLAGS=-I${top_builddir}/src/hunspell -I${top_srcdir}/src/hunspell -I${top_srcdir}/src/parsers
+ 
+@@ -6,8 +6,8 @@
+ hunzip_SOURCES=hunzip.cxx
+ hunzip_LDADD = ../hunspell/libhunspell-1.6.la
+ 
+-munch_SOURCES=munch.cxx munch.h
+-unmunch_SOURCES=unmunch.cxx unmunch.h
++hunspell_munch_SOURCES=munch.cxx munch.h
++hunspell_unmunch_SOURCES=unmunch.cxx unmunch.h
+ 
+ example_SOURCES=example.cxx
+ example_LDADD = ../hunspell/libhunspell-1.6.la
+@@ -16,14 +16,14 @@
+ hunspell_LDADD = @LIBINTL@ @LIBICONV@ ../parsers/libparsers.a \
+ 	../hunspell/libhunspell-1.6.la @CURSESLIB@ @READLINELIB@
+ 
+-analyze_SOURCES=analyze.cxx
+-analyze_LDADD = ../hunspell/libhunspell-1.6.la
++hunspell_analyze_SOURCES=analyze.cxx
++hunspell_analyze_LDADD = ../hunspell/libhunspell-1.6.la
+ 
+ bulkcheck_SOURCES=bulkcheck.cxx
+ bulkcheck_LDADD = ../hunspell/libhunspell-1.6.la
+ 
+-chmorph_SOURCES=chmorph.cxx
+-chmorph_LDADD = ../parsers/libparsers.a ../hunspell/libhunspell-1.6.la
++hunspell_chmorph_SOURCES=chmorph.cxx
++hunspell_chmorph_LDADD = ../parsers/libparsers.a ../hunspell/libhunspell-1.6.la
+ 
+ noinst_PROGRAMS=example bulkcheck 
+ 
+--- hunspell-1.6.2/src/tools/munch.cxx
++++ hunspell-1.6.2/src/tools/munch.cxx
+@@ -78,14 +78,14 @@
+     wf = mystrdup(argv[1]);
+   } else {
+     fprintf(stderr, "correct syntax is:\n");
+-    fprintf(stderr, "munch word_list_file affix_file\n");
++    fprintf(stderr, "hunspell-munch word_list_file affix_file\n");
+     exit(1);
+   }
+   if (argv[2]) {
+     af = mystrdup(argv[2]);
+   } else {
+     fprintf(stderr, "correct syntax is:\n");
+-    fprintf(stderr, "munch word_list_file affix_file\n");
++    fprintf(stderr, "hunspell-munch word_list_file affix_file\n");
+     exit(1);
+   }
+ 
+--- hunspell-1.6.2/src/tools/unmunch.cxx
++++ hunspell-1.6.2/src/tools/unmunch.cxx
+@@ -73,14 +73,14 @@
+     wf = mystrdup(argv[1]);
+   } else {
+     fprintf(stderr, "correct syntax is:\n");
+-    fprintf(stderr, "unmunch dic_file affix_file\n");
++    fprintf(stderr, "hunspell-unmunch dic_file affix_file\n");
+     exit(1);
+   }
+   if (argv[2]) {
+     af = mystrdup(argv[2]);
+   } else {
+     fprintf(stderr, "correct syntax is:\n");
+-    fprintf(stderr, "unmunch dic_file affix_file\n");
++    fprintf(stderr, "hunspell-unmunch dic_file affix_file\n");
+     exit(1);
+   }
+ 
+--- hunspell-1.6.2/tests/test.sh
++++ hunspell-1.6.2/tests/test.sh
+@@ -74,7 +74,7 @@
+ shopt -s expand_aliases
+ 
+ alias hunspell='../libtool --mode=execute -dlopen ../src/hunspell/.libs/libhunspell*.la ../src/tools/hunspell'
+-alias analyze='../libtool --mode=execute -dlopen ../src/hunspell/.libs/libhunspell*.la ../src/tools/analyze'
++alias analyze='../libtool --mode=execute -dlopen ../src/hunspell/.libs/libhunspell*.la ../src/tools/hunspell-analyze'
+ 
+ if [ "$VALGRIND" != "" ]; then
+   rm -f $TEMPDIR/test.pid*
+@@ -83,7 +83,7 @@
+   fi
+ 
+   alias hunspell='../libtool --mode=execute -dlopen ../src/hunspell/.libs/libhunspell*.la valgrind --tool=$VALGRIND --leak-check=yes --show-reachable=yes --log-file=$TEMPDIR/test.pid ../src/tools/hunspell'
+-  alias analyze='../libtool --mode=execute -dlopen ../src/hunspell/.libs/libhunspell*.la valgrind --tool=$VALGRIND --leak-check=yes --show-reachable=yes --log-file=$TEMPDIR/test.pid ../src/tools/analyze'
++  alias analyze='../libtool --mode=execute -dlopen ../src/hunspell/.libs/libhunspell*.la valgrind --tool=$VALGRIND --leak-check=yes --show-reachable=yes --log-file=$TEMPDIR/test.pid ../src/tools/hunspell-analyze'
+ fi
+ 
+ # Tests good words
diff --git a/app-text/hunspell/hunspell-1.6.1-r1.ebuild b/app-text/hunspell/hunspell-1.6.1-r1.ebuild
new file mode 100644
index 000000000000..2788a1246fa9
--- /dev/null
+++ b/app-text/hunspell/hunspell-1.6.1-r1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils multilib autotools flag-o-matic versionator
+
+MY_P=${PN}-${PV/_beta/b}
+
+DESCRIPTION="Hunspell spell checker - an improved replacement for myspell in OOo"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/hunspell"
+
+SLOT="0/$(get_version_component_range 1-2)"
+LICENSE="MPL-1.1 GPL-2 LGPL-2.1"
+IUSE="ncurses nls readline static-libs"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="
+	ncurses? ( sys-libs/ncurses:0= )
+	readline? ( sys-libs/readline:= )"
+DEPEND="${RDEPEND}
+	sys-devel/gettext"
+
+LANGS="af bg ca cs cy da de de-1901 el en eo es et fo fr ga gl he hr hu ia id
+is it kk km ku lt lv mi mk ms nb nl nn pl pt pt-BR ro ru sk sl sq sv sw tn uk
+zu"
+
+PDEPEND="app-dicts/myspell-en"
+for lang in ${LANGS}; do
+	IUSE+=" l10n_${lang}"
+	case ${lang} in
+		de-1901) dict="de_1901" ;;
+		pt-BR)   dict="pt-br"   ;;
+		*)       dict="${lang}" ;;
+	esac
+	PDEPEND+=" l10n_${lang}? ( app-dicts/myspell-${dict} )"
+done
+unset dict lang LANGS
+
+S=${WORKDIR}/${MY_P}
+
+DOCS=(
+	AUTHORS ChangeLog NEWS README THANKS TODO license.hunspell
+	AUTHORS.myspell README.myspell license.myspell README.md
+)
+
+PATCHES=(
+	# Upstream package creates some executables which names are too generic
+	# to be placed in /usr/bin - this patch prefixes them with 'hunspell-'.
+	# It modifies a Makefile.am file, hence eautoreconf.
+	"${FILESDIR}/${PN}-1.6.0-renameexes.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# missing somehow, and I am too lazy to fix it properly
+	[[ ${CHOST} == *-darwin* ]] && append-libs -liconv
+
+	# I wanted to put the include files in /usr/include/hunspell.
+	# You can do that, libreoffice can find them anywhere, just
+	# ping me when you do so ; -- scarabeus
+	econf \
+		$(use_enable nls) \
+		$(use_with ncurses ui) \
+		$(use_with readline readline) \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	default
+
+	einstalldocs
+
+	prune_libtool_files --all
+
+	#342449
+	pushd "${ED}"/usr/$(get_libdir)/ >/dev/null
+	ln -s lib${PN}{-$(get_major_version).$(get_version_component_range 2).so.0.0.1,.so}
+	popd >/dev/null
+}
diff --git a/app-text/hunspell/hunspell-1.6.2-r1.ebuild b/app-text/hunspell/hunspell-1.6.2-r1.ebuild
new file mode 100644
index 000000000000..257fddabc455
--- /dev/null
+++ b/app-text/hunspell/hunspell-1.6.2-r1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools flag-o-matic versionator
+
+MY_P="${PN}-${PV/_beta/b}"
+
+DESCRIPTION="Hunspell spell checker - an improved replacement for myspell in OOo"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://github.com/hunspell"
+
+SLOT="0/$(get_version_component_range 1-2)"
+LICENSE="MPL-1.1 GPL-2 LGPL-2.1"
+IUSE="ncurses nls readline static-libs"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="
+	ncurses? ( sys-libs/ncurses:0= )
+	readline? ( sys-libs/readline:= )
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+"
+
+LANGS="af bg ca cs cy da de de-1901 el en eo es et fo fr ga gl he hr hu ia id
+is it kk km ku lt lv mi mk ms nb nl nn pl pt pt-BR ro ru sk sl sq sv sw tn uk
+zu"
+
+PDEPEND=""
+for lang in ${LANGS}; do
+	IUSE+=" l10n_${lang}"
+	case ${lang} in
+		de-1901) dict="de_1901" ;;
+		pt-BR)   dict="pt-br"   ;;
+		*)       dict="${lang}" ;;
+	esac
+	PDEPEND+=" l10n_${lang}? ( app-dicts/myspell-${dict} )"
+done
+unset dict lang LANGS
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=(
+	AUTHORS ChangeLog NEWS README THANKS TODO license.hunspell
+	AUTHORS.myspell README.myspell license.myspell README.md
+)
+
+PATCHES=(
+	# Upstream package creates some executables which names are too generic
+	# to be placed in /usr/bin - this patch prefixes them with 'hunspell-'.
+	# It modifies a Makefile.am file, hence eautoreconf.
+	"${FILESDIR}/${PN}-1.6.2-renameexes.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# missing somehow, and I am too lazy to fix it properly
+	[[ ${CHOST} == *-darwin* ]] && append-libs -liconv
+
+	# I wanted to put the include files in /usr/include/hunspell.
+	# You can do that, libreoffice can find them anywhere, just
+	# ping me when you do so ; -- scarabeus
+	local myeconfargs=(
+		$(use_enable nls)
+		$(use_with ncurses ui)
+		$(use_with readline readline)
+		$(use_enable static-libs static)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	einstalldocs
+	find "${D}" -name '*.la' -delete || die
+
+	#342449
+	pushd "${ED%/}"/usr/$(get_libdir)/ >/dev/null
+	ln -s lib${PN}{-$(get_major_version).$(get_version_component_range 2).so.0.0.1,.so}
+	popd >/dev/null
+}
diff --git a/app-text/hunspell/metadata.xml b/app-text/hunspell/metadata.xml
new file mode 100644
index 000000000000..4f167feeebde
--- /dev/null
+++ b/app-text/hunspell/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<upstream>
+		<remote-id type="sourceforge">hunspell</remote-id>
+		<remote-id type="github">hunspell/hunspell</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/hyperestraier-1.4.13 b/app-text/hyperestraier-1.4.13
deleted file mode 100644
index 4f9774142d6d..000000000000
--- a/app-text/hyperestraier-1.4.13
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test unpack
-DEPEND=dev-db/qdbm bzip2? ( app-arch/bzip2 ) java? ( >=virtual/jre-1.4:* ) lzo? ( dev-libs/lzo ) mecab? ( app-text/mecab ) perl? ( dev-lang/perl ) ruby? ( ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ) zlib? ( sys-libs/zlib ) virtual/pkgconfig java? ( >=virtual/jdk-1.4:* ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=a full-text search system for communities
-EAPI=6
-HOMEPAGE=http://fallabs.com/hyperestraier/
-IUSE=bzip2 debug java lzo mecab perl ruby +zlib elibc_FreeBSD java elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24
-KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=LGPL-2.1
-RDEPEND=dev-db/qdbm bzip2? ( app-arch/bzip2 ) java? ( >=virtual/jre-1.4:* ) lzo? ( dev-libs/lzo ) mecab? ( app-text/mecab ) perl? ( dev-lang/perl ) ruby? ( ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ) zlib? ( sys-libs/zlib ) java? ( >=dev-java/java-config-2.2.0-r3 )
-SLOT=0
-SRC_URI=http://fallabs.com/hyperestraier/hyperestraier-1.4.13.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=76e15e82538576d06e91a8ed9b99dc8e
diff --git a/app-text/hyperestraier/Manifest b/app-text/hyperestraier/Manifest
new file mode 100644
index 000000000000..9b846c4bc9f1
--- /dev/null
+++ b/app-text/hyperestraier/Manifest
@@ -0,0 +1,6 @@
+AUX hyperestraier-configure.patch 11535 BLAKE2B 970d53c28c1dcc1bbd2f2354542e80e2c926b8b4a5178f9755b619cb3b6664c568e769778db463e1efd1102879248dc5fc5ca7f5b5d85553c1e27b61bb871e2b SHA512 79f7179c7bae4da8b2c728b29ad3e0abd16a4af1decbd36862fc1a58c3a000fa1d9726bcb230eaeb2ce2597cf39c35ab321856f2fb3dc0a0183257afe087a26f
+AUX hyperestraier-perl.patch 844 BLAKE2B fd221a027e47ed7582e697a8104d1ef82d66b87919f20c82f185b9167ad03ae6b9f0b6996b47a99e58fb42443f1c1b1c9f53a6badab935361b26f8693b680694 SHA512 73c7bd659d80464baf1d28a0eed69c9fdb3052a62aa46dc0b56f2ba6f75d458531dc6023684bd92b22b7fc4b79869ccd82e835827096b163faee0f94b0615465
+AUX hyperestraier-ruby19.patch 5143 BLAKE2B c9ea3c9e045583dee3ca119ebea07946522c50b00aba4d94fc40f7172925b9aedb8cbdc88e087a87590422566b12269641511c2c1c0a484390b1c2fa8bd1fecc SHA512 fcae611f594eeb35b6aca6eb1139304538793afc6b794e8dee1a59243d5da216f364165c90e7cf7691ed9a7f38a610ba27f37c2eef2baa4042c4a993cbfefb2a
+DIST hyperestraier-1.4.13.tar.gz 1014600 BLAKE2B 02be7cd374c47094dedd239e967dbbe5045a77302125861541dbf4d5fc60d488968718fd6b9ca57b88aac96cf2cfe73397af6bbc3d53ff6e983063ed98748e70 SHA512 ec97f487bb0e085f74222106fc5fab227c8c02ee8d736c0b4adef57ec0e4310f829ac59fff5a1c92321786e89bbc2a059a0acff6ab0e5844b83627567bb265fc
+EBUILD hyperestraier-1.4.13.ebuild 3545 BLAKE2B 537419fa747d6fe5d668c127c3a90ea3dbd065491bf3d2947451ea9cfa18b346cac6c36b62e9ac41e7a1df84bd4b785a20e5c007526b382b19126f134378237f SHA512 b6d977c697ff32183fe9eaec5df12d35f6f4f72198e8787d564de3700a03c79fb48d412c96c3b99ad733619e3c1d94a20fe90bbaede32ec0bf6cef50e4dbac93
+MISC metadata.xml 423 BLAKE2B 188de835ec6f287d3a72451770f6b7f8c93758c6579b31182bd918127b9dd3c91c13813451d611d4cf24e4dd29eee21f9b214b8545250ac23e26cc696ffee719 SHA512 60323531c2e899eed9db9635ecc0cf11d1482738006e86bbcdfb74e931b1e0ce1cc7741619d3b473d504c35d4a73f4542e2e6904e75208a4beb818fcf7d06723
diff --git a/app-text/hyperestraier/files/hyperestraier-configure.patch b/app-text/hyperestraier/files/hyperestraier-configure.patch
new file mode 100644
index 000000000000..4e747d9c754b
--- /dev/null
+++ b/app-text/hyperestraier/files/hyperestraier-configure.patch
@@ -0,0 +1,294 @@
+--- a/configure.in
++++ b/configure.in
+@@ -24,24 +24,6 @@
+ MYRUNPATH=""
+ MYPOSTCMD="true"
+ 
+-# Building paths
+-pathtmp="$PATH"
+-PATH="$HOME/bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin"
+-PATH="$PATH:/usr/ccs/bin:/usr/ucb:/usr/xpg4/bin:/usr/xpg6/bin:$pathtmp"
+-LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LIBRARY_PATH"
+-LD_LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LD_LIBRARY_PATH"
+-CPATH="$HOME/include:/usr/local/include:$CPATH"
+-PKG_CONFIG_PATH="$HOME/lib/pkgconfig:/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH"
+-export PATH LIBRARY_PATH LD_LIBRARY_PATH CPATH PKG_CONFIG_PATH
+-if type pkg-config > /dev/null 2>&1
+-then
+-  PATH="$PATH:`pkg-config --variable=bindir qdbm`"
+-  LIBRARY_PATH="$LIBRARY_PATH:`pkg-config --variable=libdir qdbm`"
+-  LD_LIBRARY_PATH="$LD_LIBRARY_PATH:`pkg-config --variable=libdir qdbm`"
+-  CPATH="$CPATH:`pkg-config --variable=includedir qdbm`"
+-  export PATH LIBRARY_PATH LD_LIBRARY_PATH CPATH PKG_CONFIG_PATH
+-fi
+-
+ 
+ 
+ #================================================================
+@@ -60,7 +42,6 @@
+ then
+   MYCFLAGS="-Wall -ansi -pedantic -fPIC -fsigned-char -g"
+   MYDEFS=""
+-  MYLDOPTS="-static"
+   enables="$enables (debug)"
+   stable="yes"
+ fi
+@@ -187,19 +169,20 @@
+ fi
+ 
+ # Underlying libraries
++PKG_PROG_PKG_CONFIG
+ AC_CHECK_LIB(c, main)
+ AC_CHECK_LIB(m, main)
+ AC_CHECK_LIB(regex, main)
+ AC_CHECK_LIB(iconv, main)
+-if test "$enable_zlib" != "no" || pkg-config --libs qdbm 2>&1 | grep '\-lz' > /dev/null 2>&1
++if test "$enable_zlib" != "no" || $PKG_CONFIG --libs qdbm 2>&1 | grep '\-lz' > /dev/null 2>&1
+ then
+   AC_CHECK_LIB(z, main)
+ fi
+-if test "$enable_lzo" = "yes" || pkg-config --libs qdbm 2>&1 | grep '\-llzo2' > /dev/null 2>&1
++if test "$enable_lzo" = "yes" || $PKG_CONFIG --libs qdbm 2>&1 | grep '\-llzo2' > /dev/null 2>&1
+ then
+   AC_CHECK_LIB(lzo2, main)
+ fi
+-if test "$enable_bzip" = "yes" || pkg-config --libs qdbm 2>&1 | grep '\-lbz2' > /dev/null 2>&1
++if test "$enable_bzip" = "yes" || $PKG_CONFIG --libs qdbm 2>&1 | grep '\-lbz2' > /dev/null 2>&1
+ then
+   AC_CHECK_LIB(bz2, main)
+ fi
+@@ -227,15 +210,15 @@
+ fi
+ 
+ # Checking the version of QDBM with pkg-config
+-if type pkg-config > /dev/null 2>&1
++if true
+ then
+   printf 'checking the version of QDBM ... '
+-  if pkg-config --atleast-version=1.8.75 qdbm
++  if $PKG_CONFIG --atleast-version=1.8.75 qdbm
+   then
+-    printf 'ok (%s)\n' `pkg-config --modversion qdbm`
+-    MYCPPOPTS="$MYCPPOPTS -I`pkg-config --variable=includedir qdbm`"
+-    MYLDOPTS="$MYLDOPTS -L`pkg-config --variable=libdir qdbm`"
+-    MYRUNPATH="$MYRUNPATH:`pkg-config --variable=libdir qdbm`"
++    printf 'ok (%s)\n' `$PKG_CONFIG --modversion qdbm`
++    MYCPPOPTS="$MYCPPOPTS -I`$PKG_CONFIG --variable=includedir qdbm`"
++    MYLDOPTS="$MYLDOPTS -L`$PKG_CONFIG --variable=libdir qdbm`"
++    MYRUNPATH="$MYRUNPATH:`$PKG_CONFIG --variable=libdir qdbm`"
+   else
+     printf 'no (maybe not installed or too old)\n'
+   fi
+--- a/javanative/configure.in
++++ b/javanative/configure.in
+@@ -27,28 +27,6 @@
+ MYSKLIBS=""
+ MYRUNPATH=""
+ 
+-# Building paths
+-pathtmp="$PATH"
+-PATH="..:$HOME/bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin"
+-PATH="$PATH:/usr/ccs/bin:/usr/ucb:/usr/xpg4/bin:/usr/xpg6/bin:$pathtmp"
+-LIBRARY_PATH="..:$HOME/lib:/usr/local/lib:$LIBRARY_PATH"
+-LD_LIBRARY_PATH="..:$HOME/lib:/usr/local/lib:$LD_LIBRARY_PATH"
+-CPATH="..:$HOME/include:/usr/local/include:$CPATH"
+-PKG_CONFIG_PATH="..:$HOME/lib/pkgconfig:/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH"
+-export PATH LIBRARY_PATH LD_LIBRARY_PATH CPATH PKG_CONFIG_PATH
+-if type pkg-config > /dev/null 2>&1
+-then
+-  PATH="$PATH:`pkg-config --variable=bindir qdbm`"
+-  PATH="$PATH:`pkg-config --variable=bindir hyperestraier`"
+-  LIBRARY_PATH="$LIBRARY_PATH:`pkg-config --variable=libdir qdbm`"
+-  LIBRARY_PATH="$LIBRARY_PATH:`pkg-config --variable=libdir hyperestraier`"
+-  LD_LIBRARY_PATH="$LD_LIBRARY_PATH:`pkg-config --variable=libdir qdbm`"
+-  LD_LIBRARY_PATH="$LD_LIBRARY_PATH:`pkg-config --variable=libdir hyperestraier`"
+-  CPATH="$CPATH:`pkg-config --variable=includedir qdbm`"
+-  CPATH="$CPATH:`pkg-config --variable=includedir hyperestraier`"
+-  export PATH LIBRARY_PATH LD_LIBRARY_PATH CPATH PKG_CONFIG_PATH
+-fi
+-
+ 
+ 
+ #================================================================
+@@ -158,7 +136,7 @@
+ AC_CHECK_LIB(lzo2, main)
+ AC_CHECK_LIB(bz2, main)
+ AC_CHECK_LIB(qdbm, main)
+-AC_CHECK_LIB(estraier, main)
++LIBS="$LIBS -lestraier"
+ 
+ # For libraries of pthreads
+ AC_CHECK_LIB(pthread, main, MYMTLIBS="-lpthread $MYMTLIBS",
+@@ -170,11 +148,12 @@
+ AC_CHECK_LIB(resolv, main, MYSKLIBS="-lresolv $MYSKLIBS")
+ 
+ # Checking the version of QDBM with pkg-config
+-if type pkg-config > /dev/null 2>&1 && pkg-config --atleast-version=1.0.0 qdbm
++PKG_PROG_PKG_CONFIG
++if $PKG_CONFIG --atleast-version=1.0.0 qdbm
+ then
+-  MYCPPOPTS="$MYCPPOPTS -I`pkg-config --variable=includedir qdbm`"
+-  MYLDOPTS="$MYLDOPTS -L`pkg-config --variable=libdir qdbm`"
+-  MYRUNPATH="$MYRUNPATH:`pkg-config --variable=libdir qdbm`"
++  MYCPPOPTS="$MYCPPOPTS -I`$PKG_CONFIG --variable=includedir qdbm`"
++  MYLDOPTS="$MYLDOPTS -L`$PKG_CONFIG --variable=libdir qdbm`"
++  MYRUNPATH="$MYRUNPATH:`$PKG_CONFIG --variable=libdir qdbm`"
+ fi
+ 
+ 
+--- a/javapure/configure.in
++++ b/javapure/configure.in
+@@ -21,28 +21,6 @@
+ JAVADOC="javadoc"
+ JAVARUN="java"
+ 
+-# Building paths
+-pathtmp="$PATH"
+-PATH="..:$HOME/bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin"
+-PATH="$PATH:/usr/ccs/bin:/usr/ucb:/usr/xpg4/bin:/usr/xpg6/bin:$pathtmp"
+-LIBRARY_PATH="..:$HOME/lib:/usr/local/lib:$LIBRARY_PATH"
+-LD_LIBRARY_PATH="..:$HOME/lib:/usr/local/lib:$LD_LIBRARY_PATH"
+-CPATH="..:$HOME/include:/usr/local/include:$CPATH"
+-PKG_CONFIG_PATH="..:$HOME/lib/pkgconfig:/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH"
+-export PATH LIBRARY_PATH LD_LIBRARY_PATH CPATH PKG_CONFIG_PATH
+-if type pkg-config > /dev/null 2>&1
+-then
+-  PATH="$PATH:`pkg-config --variable=bindir qdbm`"
+-  PATH="$PATH:`pkg-config --variable=bindir hyperestraier`"
+-  LIBRARY_PATH="$LIBRARY_PATH:`pkg-config --variable=libdir qdbm`"
+-  LIBRARY_PATH="$LIBRARY_PATH:`pkg-config --variable=libdir hyperestraier`"
+-  LD_LIBRARY_PATH="$LD_LIBRARY_PATH:`pkg-config --variable=libdir qdbm`"
+-  LD_LIBRARY_PATH="$LD_LIBRARY_PATH:`pkg-config --variable=libdir hyperestraier`"
+-  CPATH="$CPATH:`pkg-config --variable=includedir qdbm`"
+-  CPATH="$CPATH:`pkg-config --variable=includedir hyperestraier`"
+-  export PATH LIBRARY_PATH LD_LIBRARY_PATH CPATH PKG_CONFIG_PATH
+-fi
+-
+ 
+ 
+ #================================================================
+--- a/perlnative/configure.in
++++ b/perlnative/configure.in
+@@ -17,28 +17,6 @@
+ MYPLLIBDIR=/usr/lib/perl5/site_perl
+ MYRUNPATH=""
+ 
+-# Building paths
+-pathtmp="$PATH"
+-PATH="..:$HOME/bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin"
+-PATH="$PATH:/usr/ccs/bin:/usr/ucb:/usr/xpg4/bin:/usr/xpg6/bin:$pathtmp"
+-LIBRARY_PATH="..:$HOME/lib:/usr/local/lib:$LIBRARY_PATH"
+-LD_LIBRARY_PATH="..:$HOME/lib:/usr/local/lib:$LD_LIBRARY_PATH"
+-CPATH="..:$HOME/include:/usr/local/include:$CPATH"
+-PKG_CONFIG_PATH="..:$HOME/lib/pkgconfig:/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH"
+-export PATH LIBRARY_PATH LD_LIBRARY_PATH CPATH PKG_CONFIG_PATH
+-if type pkg-config > /dev/null 2>&1
+-then
+-  PATH="$PATH:`pkg-config --variable=bindir qdbm`"
+-  PATH="$PATH:`pkg-config --variable=bindir hyperestraier`"
+-  LIBRARY_PATH="$LIBRARY_PATH:`pkg-config --variable=libdir qdbm`"
+-  LIBRARY_PATH="$LIBRARY_PATH:`pkg-config --variable=libdir hyperestraier`"
+-  LD_LIBRARY_PATH="$LD_LIBRARY_PATH:`pkg-config --variable=libdir qdbm`"
+-  LD_LIBRARY_PATH="$LD_LIBRARY_PATH:`pkg-config --variable=libdir hyperestraier`"
+-  CPATH="$CPATH:`pkg-config --variable=includedir qdbm`"
+-  CPATH="$CPATH:`pkg-config --variable=includedir hyperestraier`"
+-  export PATH LIBRARY_PATH LD_LIBRARY_PATH CPATH PKG_CONFIG_PATH
+-fi
+-
+ # Setting the default prefix
+ if test "$prefix" = NONE
+ then
+@@ -100,12 +78,13 @@
+ AC_CHECK_LIB(lzo2, main)
+ AC_CHECK_LIB(bz2, main)
+ AC_CHECK_LIB(qdbm, main)
+-AC_CHECK_LIB(estraier, main)
++LIBS="$LIBS -lestraier"
+ 
+ # Checking the version of QDBM with pkg-config
+-if type pkg-config > /dev/null 2>&1 && pkg-config --atleast-version=1.0.0 qdbm
++PKG_PROG_PKG_CONFIG
++if $PKG_CONFIG --atleast-version=1.0.0 qdbm
+ then
+-  MYRUNPATH="$MYRUNPATH:`pkg-config --variable=libdir qdbm`"
++  MYRUNPATH="$MYRUNPATH:`$PKG_CONFIG --variable=libdir qdbm`"
+ fi
+ 
+ 
+--- a/rubynative/configure.in
++++ b/rubynative/configure.in
+@@ -16,28 +16,6 @@
+ MYRBLIBDIR=/usr/local/lib/ruby/site_ruby
+ MYRUNPATH=""
+ 
+-# Building paths
+-pathtmp="$PATH"
+-PATH="..:$HOME/bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin"
+-PATH="$PATH:/usr/ccs/bin:/usr/ucb:/usr/xpg4/bin:/usr/xpg6/bin:$pathtmp"
+-LIBRARY_PATH="..:$HOME/lib:/usr/local/lib:$LIBRARY_PATH"
+-LD_LIBRARY_PATH="..:$HOME/lib:/usr/local/lib:$LD_LIBRARY_PATH"
+-CPATH="..:$HOME/include:/usr/local/include:$CPATH"
+-PKG_CONFIG_PATH="..:$HOME/lib/pkgconfig:/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH"
+-export PATH LIBRARY_PATH LD_LIBRARY_PATH CPATH PKG_CONFIG_PATH
+-if type pkg-config > /dev/null 2>&1
+-then
+-  PATH="$PATH:`pkg-config --variable=bindir qdbm`"
+-  PATH="$PATH:`pkg-config --variable=bindir hyperestraier`"
+-  LIBRARY_PATH="$LIBRARY_PATH:`pkg-config --variable=libdir qdbm`"
+-  LIBRARY_PATH="$LIBRARY_PATH:`pkg-config --variable=libdir hyperestraier`"
+-  LD_LIBRARY_PATH="$LD_LIBRARY_PATH:`pkg-config --variable=libdir qdbm`"
+-  LD_LIBRARY_PATH="$LD_LIBRARY_PATH:`pkg-config --variable=libdir hyperestraier`"
+-  CPATH="$CPATH:`pkg-config --variable=includedir qdbm`"
+-  CPATH="$CPATH:`pkg-config --variable=includedir hyperestraier`"
+-  export PATH LIBRARY_PATH LD_LIBRARY_PATH CPATH PKG_CONFIG_PATH
+-fi
+-
+ # Setting the default prefix
+ if test "$prefix" = NONE
+ then
+@@ -74,10 +52,11 @@
+   MYRBLIBDIR="$myrblibdir"
+ fi
+ 
+-# Checking the version of QDBM with pkg-config
+-if type pkg-config > /dev/null 2>&1 && pkg-config --atleast-version=1.0.0 qdbm
++# Checking the version of QDBM with $PKG_CONFIG
++PKG_PROG_PKG_CONFIG
++if $PKG_CONFIG --atleast-version=1.0.0 qdbm
+ then
+-  MYRUNPATH="$MYRUNPATH:`pkg-config --variable=libdir qdbm`"
++  MYRUNPATH="$MYRUNPATH:`$PKG_CONFIG --variable=libdir qdbm`"
+ fi
+ 
+ 
+--- a/rubypure/configure.in
++++ b/rubypure/configure.in
+@@ -15,28 +15,6 @@
+ RDOC="rdoc"
+ MYRBLIBDIR=/usr/local/lib/ruby/site_ruby
+ 
+-# Building paths
+-pathtmp="$PATH"
+-PATH="..:$HOME/bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin"
+-PATH="$PATH:/usr/ccs/bin:/usr/ucb:/usr/xpg4/bin:/usr/xpg6/bin:$pathtmp"
+-LIBRARY_PATH="..:$HOME/lib:/usr/local/lib:$LIBRARY_PATH"
+-LD_LIBRARY_PATH="..:$HOME/lib:/usr/local/lib:$LD_LIBRARY_PATH"
+-CPATH="..:$HOME/include:/usr/local/include:$CPATH"
+-PKG_CONFIG_PATH="..:$HOME/lib/pkgconfig:/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH"
+-export PATH LIBRARY_PATH LD_LIBRARY_PATH CPATH PKG_CONFIG_PATH
+-if type pkg-config > /dev/null 2>&1
+-then
+-  PATH="$PATH:`pkg-config --variable=bindir qdbm`"
+-  PATH="$PATH:`pkg-config --variable=bindir hyperestraier`"
+-  LIBRARY_PATH="$LIBRARY_PATH:`pkg-config --variable=libdir qdbm`"
+-  LIBRARY_PATH="$LIBRARY_PATH:`pkg-config --variable=libdir hyperestraier`"
+-  LD_LIBRARY_PATH="$LD_LIBRARY_PATH:`pkg-config --variable=libdir qdbm`"
+-  LD_LIBRARY_PATH="$LD_LIBRARY_PATH:`pkg-config --variable=libdir hyperestraier`"
+-  CPATH="$CPATH:`pkg-config --variable=includedir qdbm`"
+-  CPATH="$CPATH:`pkg-config --variable=includedir hyperestraier`"
+-  export PATH LIBRARY_PATH LD_LIBRARY_PATH CPATH PKG_CONFIG_PATH
+-fi
+-
+ # Setting the default prefix
+ if test "$prefix" = NONE
+ then
diff --git a/app-text/hyperestraier/files/hyperestraier-perl.patch b/app-text/hyperestraier/files/hyperestraier-perl.patch
new file mode 100644
index 000000000000..dbafd483d926
--- /dev/null
+++ b/app-text/hyperestraier/files/hyperestraier-perl.patch
@@ -0,0 +1,24 @@
+--- a/perlnative/Makefile.in
++++ b/perlnative/Makefile.in
+@@ -29,10 +29,10 @@
+ # Building binaries
+ PERL = @PERL@
+ POD2HTML = @POD2HTML@
+-CC = gcc
++CC = @CC@
+ INC = -I. -I../.. -I$(MYHEADDIR) -I$(HOME)/include -I/usr/local/include
+ OPTIMIZE = @MYOPTIMIZE@
+-LD = gcc
++LD = @CC@
+ LIBS = -L../.. -L$(MYLIBDIR) -L$(HOME)/lib -L/usr/local/lib @LIBS@
+ RUNENV = LD_LIBRARY_PATH=.:..:/lib:/usr/lib:$(MYLIBDIR):$(HOME)/lib:/usr/local/lib:@MYRUNPATH@
+ 
+@@ -46,7 +46,7 @@
+ all :
+ 	( cd src && if ! [ -f Makefile ] ; \
+ 	  then $(RUNENV) $(PERL) Makefile.PL CC="$(CC)" INC="$(INC)" OPTIMIZE="$(OPTIMIZE)" \
+-	  LD="$(LD)" LIBS="$(LIBS)" PREFIX="$(prefix)" ; fi )
++	  LD="$(LD)" LIBS="$(LIBS)" PREFIX="$(prefix)" INSTALLDIRS="vendor" ; fi )
+ 	( cd src && make )
+ 	@printf '\n'
+ 	@printf '#================================================================\n'
diff --git a/app-text/hyperestraier/files/hyperestraier-ruby19.patch b/app-text/hyperestraier/files/hyperestraier-ruby19.patch
new file mode 100644
index 000000000000..25d8ffad7daa
--- /dev/null
+++ b/app-text/hyperestraier/files/hyperestraier-ruby19.patch
@@ -0,0 +1,146 @@
+--- a/rubynative/Makefile.in
++++ b/rubynative/Makefile.in
+@@ -82,21 +82,21 @@
+ 
+ check :
+ 	rm -rf casket
+-	$(RUNENV) $(RUBY) -I./src -w -d estcmd.rb put casket ../misc/test001.est
+-	$(RUNENV) $(RUBY) -I./src -w -d estcmd.rb put casket ../misc/test002.est
+-	$(RUNENV) $(RUBY) -I./src -w -d estcmd.rb put casket ../misc/test003.est
+-	$(RUNENV) $(RUBY) -I./src -w -d estcmd.rb put casket ../misc/test004.est
+-	$(RUNENV) $(RUBY) -I./src -w -d estcmd.rb put casket ../misc/test005.est
+-	$(RUNENV) $(RUBY) -I./src -w -d estcmd.rb put casket ../misc/test006.est
+-	$(RUNENV) $(RUBY) -I./src -w -d estcmd.rb edit casket 1 "@title" "java"
+-	$(RUNENV) $(RUBY) -I./src -w -d estcmd.rb get casket 1
+-	$(RUNENV) $(RUBY) -I./src -w -d estcmd.rb get casket 1 "@title"
+-	$(RUNENV) $(RUBY) -I./src -w -d estcmd.rb out casket 1
+-	$(RUNENV) $(RUBY) -I./src -w -d estcmd.rb inform casket
+-	$(RUNENV) $(RUBY) -I./src -w -d estcmd.rb optimize casket
+-	$(RUNENV) $(RUBY) -I./src -w -d estcmd.rb search \
++	$(RUNENV) $(RUBY) -I./src -I. -w -d estcmd.rb put casket ../misc/test001.est
++	$(RUNENV) $(RUBY) -I./src -I. -w -d estcmd.rb put casket ../misc/test002.est
++	$(RUNENV) $(RUBY) -I./src -I. -w -d estcmd.rb put casket ../misc/test003.est
++	$(RUNENV) $(RUBY) -I./src -I. -w -d estcmd.rb put casket ../misc/test004.est
++	$(RUNENV) $(RUBY) -I./src -I. -w -d estcmd.rb put casket ../misc/test005.est
++	$(RUNENV) $(RUBY) -I./src -I. -w -d estcmd.rb put casket ../misc/test006.est
++	$(RUNENV) $(RUBY) -I./src -I. -w -d estcmd.rb edit casket 1 "@title" "java"
++	$(RUNENV) $(RUBY) -I./src -I. -w -d estcmd.rb get casket 1
++	$(RUNENV) $(RUBY) -I./src -I. -w -d estcmd.rb get casket 1 "@title"
++	$(RUNENV) $(RUBY) -I./src -I. -w -d estcmd.rb out casket 1
++	$(RUNENV) $(RUBY) -I./src -I. -w -d estcmd.rb inform casket
++	$(RUNENV) $(RUBY) -I./src -I. -w -d estcmd.rb optimize casket
++	$(RUNENV) $(RUBY) -I./src -I. -w -d estcmd.rb search \
+ 	  -vf -cd casket "estraier" > check.out
+-	$(RUNENV) $(RUBY) -I./src -w -d estcmd.rb search \
++	$(RUNENV) $(RUBY) -I./src -I. -w -d estcmd.rb search \
+ 	  -vs -gs -attr "@uri" -ord "@mdate NUMD" -max 1 casket "estraier OR mikio" > check.out
+ 	rm -rf casket
+ 
+--- a/rubynative/configure.in
++++ b/rubynative/configure.in
+@@ -41,7 +41,7 @@
+ # Setting the default prefix
+ if test "$prefix" = NONE
+ then
+-  prefix=`ruby -rrbconfig -e 'puts(Config::CONFIG.fetch("prefix"))'`
++  prefix=`ruby -rrbconfig -e 'puts(RbConfig::CONFIG.fetch("prefix"))'`
+ fi
+ 
+ 
+@@ -68,7 +68,7 @@
+ printf '%s\n' "$RDOC"
+ 
+ # Librarh path
+-myrblibdir=`ruby -rrbconfig -e 'puts(Config::CONFIG.fetch("sitelibdir"))'`
++myrblibdir=`ruby -rrbconfig -e 'puts(RbConfig::CONFIG.fetch("sitelibdir"))'`
+ if test -n "$myrblibdir"
+ then
+   MYRBLIBDIR="$myrblibdir"
+--- a/rubynative/src/estraier.c
++++ b/rubynative/src/estraier.c
+@@ -24,6 +24,16 @@
+ #define VNINFO         "@informer"
+ #define VNCOND         "@cond"
+ 
++#ifndef RSTRING_PTR
++# define RSTRING_PTR(s) (RSTRING(s)->ptr)
++#endif
++#ifndef RSTRING_LEN
++# define RSTRING_LEN(s) (RSTRING(s)->len)
++#endif
++#ifndef RARRAY_LEN
++# define RARRAY_LEN(a) (RARRAY(a)->len)
++#endif
++
+ typedef struct {
+   int *ids;
+   int *dbidxs;
+@@ -351,7 +361,7 @@
+   vdoc = rb_iv_get(vself, VNDATA);
+   Data_Get_Struct(vdoc, ESTDOC, doc);
+   Check_Type(vwords, T_ARRAY);
+-  len = RARRAY(vwords)->len;
++  len = RARRAY_LEN(vwords);
+   for(i = 0; i < len; i++){
+     Check_Type(rb_ary_entry(vwords, i), T_STRING);
+   }
+@@ -764,7 +774,7 @@
+   CBMAP *hints;
+   int i, dnum, *res, rnum;
+   Check_Type(vdbs, T_ARRAY);
+-  dnum = RARRAY(vdbs)->len;
++  dnum = RARRAY_LEN(vdbs);
+   dbs = cbmalloc(dnum * sizeof(ESTMTDB *) + 1);
+   for(i = 0; i < dnum; i++){
+     vdb = rb_ary_entry(vdbs, i);
+@@ -1189,10 +1199,10 @@
+   VALUE str;
+   int i, len;
+   list = cblistopen();
+-  len = RARRAY(obj)->len;
++  len = RARRAY_LEN(obj);
+   for(i = 0; i < len; i++){
+     str = rb_ary_entry(obj, i);
+-    cblistpush(list, RSTRING(str)->ptr, RSTRING(str)->len);
++    cblistpush(list, RSTRING_PTR(str), RSTRING_LEN(str));
+   }
+   return list;
+ }
+@@ -1218,14 +1228,14 @@
+   int i, len;
+   map = cbmapopenex(31);
+   keys = rb_funcall(obj, rb_intern("keys"), 0);
+-  len = RARRAY(keys)->len;
++  len = RARRAY_LEN(keys);
+   for(i = 0; i < len; i++){
+     key = rb_ary_entry(keys, i);
+     val = rb_hash_aref(obj, key);
+     key = rb_String(key);
+     val = rb_String(val);
+-    cbmapput(map, RSTRING(key)->ptr, RSTRING(key)->len,
+-             RSTRING(val)->ptr, RSTRING(val)->len, 0);
++    cbmapput(map, RSTRING_PTR(key), RSTRING_LEN(key),
++             RSTRING_PTR(val), RSTRING_LEN(val), 0);
+   }
+   return map;
+ }
+--- a/rubypure/configure.in
++++ b/rubypure/configure.in
+@@ -40,7 +40,7 @@
+ # Setting the default prefix
+ if test "$prefix" = NONE
+ then
+-  prefix=`ruby -rrbconfig -e 'puts(Config::CONFIG.fetch("prefix"))'`
++  prefix=`ruby -rrbconfig -e 'puts(RbConfig::CONFIG.fetch("prefix"))'`
+ fi
+ 
+ 
+@@ -67,7 +67,7 @@
+ printf '%s\n' "$RDOC"
+ 
+ # Librarh path
+-myrblibdir=`ruby -rrbconfig -e 'puts(Config::CONFIG.fetch("sitelibdir"))'`
++myrblibdir=`ruby -rrbconfig -e 'puts(RbConfig::CONFIG.fetch("sitelibdir"))'`
+ if test -n "$myrblibdir"
+ then
+   MYRBLIBDIR="$myrblibdir"
diff --git a/app-text/hyperestraier/hyperestraier-1.4.13.ebuild b/app-text/hyperestraier/hyperestraier-1.4.13.ebuild
new file mode 100644
index 000000000000..a31998f22220
--- /dev/null
+++ b/app-text/hyperestraier/hyperestraier-1.4.13.ebuild
@@ -0,0 +1,200 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+RUBY_OPTIONAL="yes"
+
+inherit autotools java-pkg-opt-2 perl-functions ruby-ng
+
+IUSE="bzip2 debug java lzo mecab perl ruby +zlib"
+
+DESCRIPTION="a full-text search system for communities"
+HOMEPAGE="http://fallabs.com/hyperestraier/"
+SRC_URI="http://fallabs.com/hyperestraier/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+SLOT="0"
+
+RDEPEND="dev-db/qdbm
+	bzip2? ( app-arch/bzip2 )
+	java? ( >=virtual/jre-1.4:* )
+	lzo? ( dev-libs/lzo )
+	mecab? ( app-text/mecab )
+	perl? ( dev-lang/perl )
+	ruby? ( $(ruby_implementations_depend) )
+	zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	java? ( >=virtual/jdk-1.4:* )"
+S="${WORKDIR}/all/${P}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-configure.patch
+	"${FILESDIR}"/${PN}-perl.patch
+	"${FILESDIR}"/${PN}-ruby19.patch
+)
+HTML_DOCS=( doc/. )
+
+AT_NOELIBTOOLIZE="yes"
+
+pkg_setup() {
+	java-pkg-opt-2_pkg_setup
+	use ruby && ruby-ng_pkg_setup
+}
+
+he_foreach_api() {
+	local u d
+	for u in java perl ruby; do
+		if ! use "${u}"; then
+			continue
+		fi
+		if [[ "${u}" != "ruby" ]]; then
+			for d in ${u}native ${u}pure; do
+				if [[ ! -d "${d}" ]]; then
+					continue
+				fi
+				einfo "${EBUILD_PHASE} ${d}"
+				cd "${d}"
+				case "${EBUILD_PHASE}" in
+				prepare)
+					mv configure.{in,ac}
+					eautoreconf
+					;;
+				configure)
+					econf
+					;;
+				compile)
+					emake
+					;;
+				test)
+					if [[ "${d}" == "${u}native" ]]; then
+						emake check
+					fi
+					;;
+				install)
+					if [[ "${u}" != "java" ]]; then
+						emake DESTDIR="${D}" install
+					else
+						java-pkg_dojar *.jar
+						if [[ "${d}" == "${u}native" ]]; then
+							dolib.so lib*.so*
+						fi
+					fi
+					;;
+				esac
+				cd - >/dev/null
+			done
+		else
+			PATCHES= ruby-ng_src_${EBUILD_PHASE}
+		fi
+	done
+}
+
+he_foreach_ruby_api() {
+	local d
+	for d in rubynative rubypure; do
+		cd "${d}"
+		case "${EBUILD_PHASE}" in
+		prepare)
+			sed -i \
+				-e "/RUBY=/cRUBY=\"${RUBY}\"" \
+				-e "/=\`.*ruby/s|ruby|${RUBY}|" \
+				configure.in
+
+			mv configure.{in,ac}
+			eautoreconf
+			;;
+		configure)
+			econf
+			;;
+		compile)
+			emake
+			;;
+		test)
+			if [[ "${d}" == "${u}native" ]]; then
+				emake check
+			fi
+			;;
+		install)
+			emake DESTDIR="${D}" install
+			;;
+		esac
+		cd - >/dev/null
+	done
+}
+
+src_prepare() {
+	default
+	java-pkg-opt-2_src_prepare
+
+	sed -i \
+		-e "/^CFLAGS/s|$| ${CFLAGS}|" \
+		-e "/^JAVACFLAGS/s|$| ${JAVACFLAGS}|" \
+		-e '/^LDENV/d' \
+		-e 's/make\( \|$\)/$(MAKE)\1/g' \
+		Makefile.in {java,perl,ruby}*/Makefile.in
+
+	mv configure.{in,ac}
+	eautoreconf
+	he_foreach_api # prepare
+}
+
+all_ruby_prepare() {
+	sed -i "/^RUNENV /s|\.\.|${WORKDIR}/all/${P}|" ruby*/Makefile.in
+	sed -i "s|\.\./\.\.|${WORKDIR}/all/${P}|" rubynative/src/extconf.rb
+}
+
+each_ruby_prepare() {
+	he_foreach_ruby_api
+}
+
+src_configure() {
+	econf \
+		$(use_enable bzip2 bzip) \
+		$(use_enable debug) \
+		$(use_enable lzo) \
+		$(use_enable mecab) \
+		$(use_enable zlib)
+	he_foreach_api
+}
+
+each_ruby_configure() {
+	he_foreach_ruby_api
+}
+
+src_compile() {
+	default
+	he_foreach_api
+}
+
+each_ruby_compile() {
+	he_foreach_ruby_api
+}
+
+src_test() {
+	default
+	he_foreach_api
+}
+
+each_ruby_test() {
+	he_foreach_ruby_api
+}
+
+src_install() {
+	emake DESTDIR="${D}" MYDOCS= install
+	einstalldocs
+	he_foreach_api
+
+	if use perl; then
+		perl_delete_module_manpages
+		perl_fix_packlist
+	fi
+
+	rm -f "${D}"/usr/bin/*test
+}
+
+each_ruby_install() {
+	he_foreach_ruby_api
+}
diff --git a/app-text/hyperestraier/metadata.xml b/app-text/hyperestraier/metadata.xml
new file mode 100644
index 000000000000..63e7b3c8bb44
--- /dev/null
+++ b/app-text/hyperestraier/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>hattya@gentoo.org</email>
+  </maintainer>
+  <maintainer type="project">
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
+  <use>
+    <flag name="mecab">Enable <pkg>app-text/mecab</pkg> support for Estraier</flag>
+  </use>
+</pkgmetadata>
diff --git a/app-text/info2html-2.0 b/app-text/info2html-2.0
deleted file mode 100644
index 7091adaa8247..000000000000
--- a/app-text/info2html-2.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst prerm setup unpack
-DEPEND=>=app-admin/webapp-config-1.50.15
-DESCRIPTION=Converts GNU .info files to HTML
-EAPI=0
-HOMEPAGE=http://info2html.sourceforge.net/
-IUSE=vhosts
-KEYWORDS=alpha amd64 hppa sparc x86
-LICENSE=freedist
-RDEPEND=dev-lang/perl >=app-admin/webapp-config-1.50.15
-SLOT=2.0
-SRC_URI=mirror://sourceforge/info2html/info2html-2.0.tar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	webapp	6ae2395d7f341093c36057cb4f69101a
-_md5_=ec040d614580297a1cacdaa3704245eb
diff --git a/app-text/info2html/Manifest b/app-text/info2html/Manifest
new file mode 100644
index 000000000000..bc2b233e21ea
--- /dev/null
+++ b/app-text/info2html/Manifest
@@ -0,0 +1,4 @@
+AUX info2html-2.0-xss.patch 2206 BLAKE2B 12daf13818b6c6a32932185f543bdfdfbb318d91f80ede4fe2495f9fe5d0dfc3183ad10b8e66d529530ea853834be2f029d94a81e7eebde5e8cfa67c06508797 SHA512 9ffdd82d6cd0f53473fa8eedd5372c09b3a0a2f2b59bea229320fb77bf07d9f9a9f6892585250cd9fa5034213b2b08a346e739ae931c6a42bbdc73487348b947
+DIST info2html-2.0.tar 51200 BLAKE2B 0209e7792689f68c8f596dcb0771395014963240f2071aa970f50611f752e9b9cf524ba2083a72a9b0f4346f8e14e23aedfde4497b05c02dae90b223ebcf6311 SHA512 1b9ebc8bdd4101d24116fe22df9e5d3124300b2ac11585d8c7fff9652f7984983480442af9d9f86300f9684335d85b96f276a775c56c95e7fac85ebc46235e06
+EBUILD info2html-2.0.ebuild 1936 BLAKE2B 35ad17ff213a187eb6a9b91e85c4e6e4c4cc9428cabf004d071aa0af4a9f6517dcaa06b76860523552250a0cb682982d587764b00238d47de080f63d14fb92e3 SHA512 e6064454cea807c4bd187f00796231ca53dbf1290aa7bca05eb56a048e0cce9c86b9ca857d5e18ad4e1ab036029acddbd74ba7aaf0592d8b5da58d1cf5f8b700
+MISC metadata.xml 329 BLAKE2B 9d0be1049ee8b84a11cf0b216e1e05263409f28ec1169978454df89f9726bdcdf1b63ba824f534606bdcd2163dd7b8e1aa9bf9497dfcb6410c0eb3b63958311a SHA512 18e0083cb85393d3d92abda8016dcdebe9f84fcd176557cb433b858ed9b6087ce7e5b53022d689e3861526d10440a9fe7fd6a1d86782a76d8f0756c3046bae23
diff --git a/app-text/info2html/files/info2html-2.0-xss.patch b/app-text/info2html/files/info2html-2.0-xss.patch
new file mode 100644
index 000000000000..a2254bdbbe2b
--- /dev/null
+++ b/app-text/info2html/files/info2html-2.0-xss.patch
@@ -0,0 +1,61 @@
+diff -u info2html-2.0-orig/info2html info2html-2.0/info2html
+--- info2html-2.0-orig/info2html	2006-09-01 14:55:13.000000000 +0200
++++ info2html-2.0/info2html	2006-09-01 15:05:41.000000000 +0200
+@@ -42,7 +42,7 @@
+ 
+ use CGI;
+ $ENV{'REQUEST_METHOD'} or
+- print "Note: I'm really supposed to be run as a CGI!\n";
++ print "Note: I'm really supposed to be run as a CGI\!\n";
+ 
+ #-- patterns
+ $NODEBORDER    = '\037\014?';      #-- delimiter of an info node
+@@ -62,7 +62,7 @@
+ #---------------------------------------------------------
+ # Don't reveal where we're looking... --jonh 5/20/97 (and reapplied 5/4/1998)
+ sub DieFileNotFound{
+-  local($FileName) = @_;
++  local($FileName) = &XssEscape(@_);
+   #-- TEXT : error message if a file could not be opened
+   print <<"EOF";
+ <html><head><title>Info Files  - Error Message</title>
+@@ -104,6 +104,28 @@
+ }
+ 
+ #----------------------------------------------------------
++#                   XssEscape
++#----------------------------------------------------------
++sub XssEscape {
++  local($Tag) = @_;
++  #-- output escaping is required to protect browser
++  #   against `cross site' and `cross frame scripting'
++
++  $Tag =~ s/&/&amp;/gs;		# ampersand
++  $Tag =~ s/#/&#35;/gs;
++  $Tag =~ s/;/&#59;/gs;
++  $Tag =~ s/[\000-\037\177-\237]/&iquest;/gs; # "ctrl" codes 0-31 and 127-159
++  $Tag =~ s/</&lt;/gs;		# less-than symbol
++  $Tag =~ s/>/&gt;/gs;		# greater-than symbol
++  $Tag =~ s/"/&quot;/gs;	# double quote
++  $Tag =~ s/\240/&nbsp;/gs;	# non-breaking space
++  $Tag =~ s/\255/&shy;/gs;	# soft hyphen
++				# the rest is interpreted
++				# as ISO 8859-1
++  $Tag;
++}
++
++#----------------------------------------------------------
+ #                   ParsHeaderToken
+ #----------------------------------------------------------
+ # Parses the heaer line of an info node for a specific 
+@@ -493,6 +515,8 @@
+ #----------------------------------------------------------
+ sub ReplyNotFoundMessage{
+   local($FileName,$Tag) = @_;
++  $FileName = &XssEscape($FileName);
++  $Tag      = &XssEscape($Tag);
+   print <<"EOF";
+ <html><head><title>Info Files  -  Error Message</title>
+ $BOTS_STAY_AWAY
+Only in info2html-2.0: info2html.orig
+Only in info2html-2.0: info2html.rej
diff --git a/app-text/info2html/info2html-2.0.ebuild b/app-text/info2html/info2html-2.0.ebuild
new file mode 100644
index 000000000000..dde163431903
--- /dev/null
+++ b/app-text/info2html/info2html-2.0.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+inherit eutils webapp
+
+DESCRIPTION="Converts GNU .info files to HTML"
+HOMEPAGE="http://info2html.sourceforge.net/"
+SRC_URI="mirror://sourceforge/info2html/${P}.tar"
+
+LICENSE="freedist"
+# webapp.eclass deals with SLOTting
+#SLOT="0"
+IUSE=""
+KEYWORDS="alpha amd64 hppa sparc x86"
+
+RDEPEND="dev-lang/perl"
+
+src_unpack() {
+	local infos state line i
+	unpack ${A}
+	cd ${S}
+
+	# filter user-provided data to prevent cross-frame/site scripting attacks
+	# bug #91354 (fix from Werner Fink)
+	epatch "${FILESDIR}"/info2html-2.0-xss.patch
+
+	# Fixup INFODIR for paths in /etc/profile.env INFOPATH
+	infos=$(grep "^export INFOPATH=" /etc/profile.env | tail -n 1 |\
+				sed -e "s:^export INFOPATH=:INFOPATH=:;s:'::g")
+	# Default path to /usr/share/info and /usr/local/share/info
+	[[ -z ${infos} ]] && export infos="/usr/share/info"
+	infos=( ${INFOPATH//:/ } )
+	mv ${S}/info2html.conf ${S}/info2html.conf.orig
+	touch ${S}/info2html.conf
+	state="copy"
+	inserted="no"
+	while read line; do
+		[[ ${line} == "@INFODIR = (" ]] && state="insert"
+		[[ ${line} == ");" ]] && state="copy"
+		case ${state} in
+			"copy")
+				echo ${line} >> ${S}/info2html.conf
+				;;
+			"insert")
+				echo ${line} >> ${S}/info2html.conf
+				for info in "${infos[@]}"; do
+					echo "	'${info}'," >> ${S}/info2html.conf
+				done
+				echo "	'/usr/local/share/info'" >> ${S}/info2html.conf
+				state="skip"
+				inserted="yes"
+				;;
+			"skip")
+				;;
+		esac
+	done < ${S}/info2html.conf.orig
+	[[ ${state} == "copy" && ${inserted} == "yes" ]] ||
+		die "Setting up info2html.conf failed"
+}
+
+src_install() {
+	webapp_src_preinst
+
+	exeinto ${MY_CGIBINDIR}
+	cp info2html infocat info2html.css info2html.conf ${D}/${MY_CGIBINDIR}
+	# README zapped by info2html-gentoo.patch; it only listed
+	# the homepage so it doesn't add anything useful.
+	# dodoc README
+
+	webapp_src_install
+}
diff --git a/app-text/info2html/metadata.xml b/app-text/info2html/metadata.xml
new file mode 100644
index 000000000000..5020ed8cb0fc
--- /dev/null
+++ b/app-text/info2html/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>web-apps@gentoo.org</email>
+		<name>Gentoo Webapps</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">info2html</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/iso-codes-3.75 b/app-text/iso-codes-3.75
deleted file mode 100644
index 90b279b4cfa4..000000000000
--- a/app-text/iso-codes-3.75
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=prepare setup
-DEPEND=|| ( dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 ) app-arch/xz-utils sys-devel/gettext
-DESCRIPTION=ISO language, territory, currency, script codes and their translations
-EAPI=6
-HOMEPAGE=http://pkg-isocodes.alioth.debian.org/
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
-LICENSE=LGPL-2.1+
-RESTRICT=binchecks strip
-SLOT=0
-SRC_URI=http://pkg-isocodes.alioth.debian.org/downloads/iso-codes-3.75.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e4005809fd8442dedf4f94474ebfd752
diff --git a/app-text/iso-codes-3.76 b/app-text/iso-codes-3.76
deleted file mode 100644
index 5026f93a031b..000000000000
--- a/app-text/iso-codes-3.76
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=prepare setup
-DEPEND=|| ( dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 ) app-arch/xz-utils sys-devel/gettext
-DESCRIPTION=ISO language, territory, currency, script codes and their translations
-EAPI=6
-HOMEPAGE=http://pkg-isocodes.alioth.debian.org/
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
-LICENSE=LGPL-2.1+
-RESTRICT=binchecks strip
-SLOT=0
-SRC_URI=http://pkg-isocodes.alioth.debian.org/downloads/iso-codes-3.76.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=764645633b204867d3561e0da5b1cef9
diff --git a/app-text/iso-codes/Manifest b/app-text/iso-codes/Manifest
new file mode 100644
index 000000000000..2d9bd08504a4
--- /dev/null
+++ b/app-text/iso-codes/Manifest
@@ -0,0 +1,5 @@
+DIST iso-codes-3.75.tar.xz 3461424 BLAKE2B 5548307415b45d2a149fa3868521a464522c9a34e19607faea64aec3e2ff68d331872ff7de3c5807f7ae431a489fede42b6b59f068c5f22132aad4a0f1de8f87 SHA512 157899048cec091864ad8a7723314e28a0ccc4a0e1a5c2101bb630baf1a034bf117e38263e3c95e0135ba9d3a4d76635c8201c50a54e25f6af24c87253b8b40e
+DIST iso-codes-3.76.tar.xz 3474728 BLAKE2B b418b7b80d1926e765b65aad4edbd74ad8d37251fda14e3ab0e222095762d54e358de6f8d4a08fde8ae14460fd975a2a541ca6a5a4cf8ef1d777719462b0f991 SHA512 a0f6714a79a52b5dab82a268e85cb2d019ff5255744b88d088dcd7d5a15eb9710876a338a0a5d0f5659b4146bc6cc53d6d3474d621b3dcca7c47afabfc7e0dfa
+EBUILD iso-codes-3.75.ebuild 2426 BLAKE2B e95562582a1d3db51a6d395ab95dd0c3ce2b41f1792b94554ca5aea406e5d44a0dc5e963e5b1b44f4f7e11fa1ec305f5d5337491458c39902599df675b798181 SHA512 51bae9c45a1aa31d5b94326a69f0391825ef558236589122725260e2d61b89bc8a72ebfb512d297bb0e8dca1af44a2aec3597d7ed86ed284d03b291d14aa6858
+EBUILD iso-codes-3.76.ebuild 2427 BLAKE2B c7f21f1e7f5f39dfb674baf5d5323873cdf04bb862f1467791da98de4daf373ff1ddd4d38af7bf8cf4b1ee79dc1b323b9a999d3ee6d0cc28aa3bda41e081b5af SHA512 363630a9ceff8cfd91882fd88e8e88083ff0be0fbace18a8b623421889b6763c364e2174fd27c581df265ddb5a6579d7fb780983248cde6bbd36e06e2c092480
+MISC metadata.xml 480 BLAKE2B 3aefef945cb111095839e8fa8b84757e7f51a9aa8848806911d8c01763ab2d2f1d0c5b31c042f6ee307756e007893f6559c54d74a104caa612c9a6d39b2eea7e SHA512 5729ca31911ea7dad748e9f3afdd1f45f9034d783b56a75609101bfdb0a204bda8a078e7d251e89731091726062c4ac962e000ec7a898cb66ff787c8f2308d4c
diff --git a/app-text/iso-codes/iso-codes-3.75.ebuild b/app-text/iso-codes/iso-codes-3.75.ebuild
new file mode 100644
index 000000000000..b5a8f0e064c3
--- /dev/null
+++ b/app-text/iso-codes/iso-codes-3.75.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{4,5,6} )
+PLOCALES="af am ar as ast az be bg bn bn_IN br bs byn ca crh cs cy da de dz el en eo es et eu fa fi fo fr ga gez gl gu haw he hi hr hu hy ia id is it ja ka kk km kn ko kok ku lt lv mi mk ml mn mr ms mt nb ne nl nn nso oc or pa pl ps pt pt_BR ro ru rw si sk sl so sq sr sr@latin sv sw ta te th ti tig tk tl tr tt tt@iqtelif ug uk ve vi wa wal wo xh zh_CN zh_HK zh_TW zu"
+
+inherit eutils l10n python-any-r1
+
+DESCRIPTION="ISO language, territory, currency, script codes and their translations"
+HOMEPAGE="http://pkg-isocodes.alioth.debian.org/"
+SRC_URI="http://pkg-isocodes.alioth.debian.org/downloads/${P}.tar.xz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${PYTHON_DEPS}
+	app-arch/xz-utils
+	sys-devel/gettext
+"
+
+# This ebuild does not install any binaries.
+RESTRICT="binchecks strip"
+
+# l10n_find_plocales_changes doesn't support multiple directories,
+# so need to do the update scan ourselves.
+check_existing_locales() {
+	local std loc all_locales=()
+
+	ebegin "Looking for new locales"
+	for std in "${all_stds[@]}"; do
+		pushd "${std}" >/dev/null || die
+		for loc in *.po; do
+			all_locales+=( "${loc%.po}" )
+		done
+		popd >/dev/null
+	done
+
+	all_locales=$(echo $(printf '%s\n' "${all_locales[@]}" | LC_COLLATE=C sort -u))
+	if [[ ${PLOCALES} != "${all_locales}" ]]; then
+		eend 1
+		eerror "There are changes in locales! This ebuild should be updated to:"
+		eerror "PLOCALES=\"${all_locales}\""
+		die "Update PLOCALES in the ebuild"
+	else
+		eend 0
+	fi
+}
+
+src_prepare() {
+	default
+
+	local std loc mylinguas
+	local all_stds=( iso_15924 iso_3166-{1,2,3} iso_4217 iso_639-{2,3,5} )
+
+	check_existing_locales
+
+	# Modify the Makefiles so they only install requested locales.
+	for std in "${all_stds[@]}"; do
+		einfo "Preparing ${std} ..."
+		pushd "${std}" >/dev/null || die
+		mylinguas=()
+		for loc in *.po; do
+			if has ${loc%.po} ${LINGUAS-${loc%.po}}; then
+				mylinguas+=( "${loc}" )
+			fi
+		done
+
+		sed \
+			-e "/^pofiles =/s:=.*:= ${mylinguas[*]}:" \
+			-e "/^mofiles =/s:=.*:= ${mylinguas[*]/%.po/.mo}:" \
+			-i Makefile.am Makefile.in || die "sed in ${std} folder failed"
+		popd >/dev/null
+	done
+}
diff --git a/app-text/iso-codes/iso-codes-3.76.ebuild b/app-text/iso-codes/iso-codes-3.76.ebuild
new file mode 100644
index 000000000000..e445ec26b7f1
--- /dev/null
+++ b/app-text/iso-codes/iso-codes-3.76.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{4,5,6} )
+PLOCALES="af am ar as ast az be bg bn bn_IN br bs byn ca crh cs cy da de dz el en eo es et eu fa fi fo fr ga gez gl gu haw he hi hr hu hy ia id is it ja ka kk km kn ko kok ku lt lv mi mk ml mn mr ms mt nb ne nl nn nso oc or pa pl ps pt pt_BR ro ru rw si sk sl so sq sr sr@latin sv sw ta te th ti tig tk tl tr tt tt@iqtelif ug uk ve vi wa wal wo xh zh_CN zh_HK zh_TW zu"
+
+inherit eutils l10n python-any-r1
+
+DESCRIPTION="ISO language, territory, currency, script codes and their translations"
+HOMEPAGE="http://pkg-isocodes.alioth.debian.org/"
+SRC_URI="http://pkg-isocodes.alioth.debian.org/downloads/${P}.tar.xz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${PYTHON_DEPS}
+	app-arch/xz-utils
+	sys-devel/gettext
+"
+
+# This ebuild does not install any binaries.
+RESTRICT="binchecks strip"
+
+# l10n_find_plocales_changes doesn't support multiple directories,
+# so need to do the update scan ourselves.
+check_existing_locales() {
+	local std loc all_locales=()
+
+	ebegin "Looking for new locales"
+	for std in "${all_stds[@]}"; do
+		pushd "${std}" >/dev/null || die
+		for loc in *.po; do
+			all_locales+=( "${loc%.po}" )
+		done
+		popd >/dev/null
+	done
+
+	all_locales=$(echo $(printf '%s\n' "${all_locales[@]}" | LC_COLLATE=C sort -u))
+	if [[ ${PLOCALES} != "${all_locales}" ]]; then
+		eend 1
+		eerror "There are changes in locales! This ebuild should be updated to:"
+		eerror "PLOCALES=\"${all_locales}\""
+		die "Update PLOCALES in the ebuild"
+	else
+		eend 0
+	fi
+}
+
+src_prepare() {
+	default
+
+	local std loc mylinguas
+	local all_stds=( iso_15924 iso_3166-{1,2,3} iso_4217 iso_639-{2,3,5} )
+
+	check_existing_locales
+
+	# Modify the Makefiles so they only install requested locales.
+	for std in "${all_stds[@]}"; do
+		einfo "Preparing ${std} ..."
+		pushd "${std}" >/dev/null || die
+		mylinguas=()
+		for loc in *.po; do
+			if has ${loc%.po} ${LINGUAS-${loc%.po}}; then
+				mylinguas+=( "${loc}" )
+			fi
+		done
+
+		sed \
+			-e "/^pofiles =/s:=.*:= ${mylinguas[*]}:" \
+			-e "/^mofiles =/s:=.*:= ${mylinguas[*]/%.po/.mo}:" \
+			-i Makefile.am Makefile.in || die "sed in ${std} folder failed"
+		popd >/dev/null
+	done
+}
diff --git a/app-text/iso-codes/metadata.xml b/app-text/iso-codes/metadata.xml
new file mode 100644
index 000000000000..c5fcc42a3a25
--- /dev/null
+++ b/app-text/iso-codes/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
+	<longdescription lang="en">
+		This package provides the ISO-639 Language code list, the ISO-3166
+		Territory code list, and ISO-3166-2 sub-territory lists, and all their
+		translations in gettext .po form.
+	</longdescription>
+</pkgmetadata>
diff --git a/app-text/itex2mml-1.5.5 b/app-text/itex2mml-1.5.5
deleted file mode 100644
index f6dd9f49db43..000000000000
--- a/app-text/itex2mml-1.5.5
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install
-DESCRIPTION=A LaTeX into XHTML/MathML converter
-EAPI=5
-HOMEPAGE=https://golem.ph.utexas.edu/~distler/blog/itex2MML.html
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
-LICENSE=|| ( GPL-2+ MPL-1.1 LGPL-2+ )
-SLOT=0
-SRC_URI=https://golem.ph.utexas.edu/~distler/blog/files/itexToMML-1.5.5.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=03146fbbe4f4f112732afd922540bfd4
diff --git a/app-text/itex2mml-1.5.6 b/app-text/itex2mml-1.5.6
deleted file mode 100644
index 926d166051cb..000000000000
--- a/app-text/itex2mml-1.5.6
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install
-DESCRIPTION=A LaTeX into XHTML/MathML converter
-EAPI=6
-HOMEPAGE=https://golem.ph.utexas.edu/~distler/blog/itex2MML.html
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=|| ( GPL-2+ MPL-1.1 LGPL-2+ )
-SLOT=0
-SRC_URI=https://golem.ph.utexas.edu/~distler/blog/files/itexToMML-1.5.6.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=2292b121efaea40317620ae67757e4c2
diff --git a/app-text/itex2mml/Manifest b/app-text/itex2mml/Manifest
new file mode 100644
index 000000000000..8e5a0b7cb594
--- /dev/null
+++ b/app-text/itex2mml/Manifest
@@ -0,0 +1,5 @@
+DIST itexToMML-1.5.5.tar.gz 155205 BLAKE2B 46edba14bc30ee06109433f3aff1d2449a0f9ff31d3c1c8a2541e0b6ec7d6f426cd230bcd3957eea758517972515a13daf21ba229ea382966a36dccf2612784a SHA512 452436fe6f72d2c99c2bf3aec0d5d74d0bd754b6f54948428e45f50b037927a64ae3148386c387d3065d35392c3744ec6467d3e6fb8c25d46a3872d92d35ce2d
+DIST itexToMML-1.5.6.tar.gz 155394 BLAKE2B be83c2de3a7ffd0a60fa45c38bb7fb224afbbfe3e715d09813137886ab0274fad4670a6156066e2f4f15ea1e3ff63f9f5cb4a30fc64256801af45455ea3d498b SHA512 2f4ebcaccbef71ba1728909bdc60abf06606cfe267481835315fb1ecaa365641e45dfad370cffb758153379e721bde48e71ff660b0cba511f8d8db8a4aec0171
+EBUILD itex2mml-1.5.5.ebuild 605 BLAKE2B d47ae666c119872d55730afb01a57b617aca32325bd0dbc2dcd4327498e06984ab8b2bc65a3de4ec3873b5fa346f4bcc68035b8bf5d38f4a6bc704f29c82b4de SHA512 8965086d25edbb6072494f70330010c19bbb0989c958c4efe9169daf8ac3fd4842189e6eb41c9ffb5345dd927f9134b967c0fc23d78587668484d019c3568863
+EBUILD itex2mml-1.5.6.ebuild 612 BLAKE2B 689cf14ca4d3a0f1fbd5eee37a42aafd7f50b2d1564e55fe00147ab594e06c9a9bba4326527a35d805b06c5d59c6648072dcaadea0c76232d8fa354fb306051a SHA512 15492c37242bef67fd24739c8b846aab0e45f3706ce3cec8d4f3c171f1747fa31c00fb5edc215a14e54126e403b17d6e4c25c3ef99617eeaa5c7f0c08e35a430
+MISC metadata.xml 168 BLAKE2B 5f277cc66dbafa7e7985433f84b0f9a656a176a9b901862e2a8353ca2d4526797dded9696e835b9696c7f72324e94959cfb5a22de49a7e3e61604153886037ab SHA512 00eec08786156434460f5ed77b647579546cf1a86341a4f2c9c9c84326468c2c21dc5101c4277103b19266bb6f788823f4ddf3b9d044da26326d79bf2ac9a274
diff --git a/app-text/itex2mml/itex2mml-1.5.5.ebuild b/app-text/itex2mml/itex2mml-1.5.5.ebuild
new file mode 100644
index 000000000000..205585e9b93a
--- /dev/null
+++ b/app-text/itex2mml/itex2mml-1.5.5.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit toolchain-funcs
+
+DESCRIPTION="A LaTeX into XHTML/MathML converter"
+HOMEPAGE="https://golem.ph.utexas.edu/~distler/blog/itex2MML.html"
+SRC_URI="https://golem.ph.utexas.edu/~distler/blog/files/itexToMML-${PV}.tar.gz"
+LICENSE="|| ( GPL-2+ MPL-1.1 LGPL-2+ )"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE=""
+
+S="${WORKDIR}/itexToMML/itex-src"
+
+src_compile() {
+	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	dobin itex2MML
+	dodoc ../README
+}
diff --git a/app-text/itex2mml/itex2mml-1.5.6.ebuild b/app-text/itex2mml/itex2mml-1.5.6.ebuild
new file mode 100644
index 000000000000..16120ff44755
--- /dev/null
+++ b/app-text/itex2mml/itex2mml-1.5.6.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="A LaTeX into XHTML/MathML converter"
+HOMEPAGE="https://golem.ph.utexas.edu/~distler/blog/itex2MML.html"
+SRC_URI="https://golem.ph.utexas.edu/~distler/blog/files/itexToMML-${PV}.tar.gz"
+LICENSE="|| ( GPL-2+ MPL-1.1 LGPL-2+ )"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+S="${WORKDIR}/itexToMML/itex-src"
+
+src_compile() {
+	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	dobin itex2MML
+	dodoc ../README
+}
diff --git a/app-text/itex2mml/metadata.xml b/app-text/itex2mml/metadata.xml
new file mode 100644
index 000000000000..1b2becffa26c
--- /dev/null
+++ b/app-text/itex2mml/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/app-text/jabref-2.10-r2 b/app-text/jabref-2.10-r2
deleted file mode 100644
index c078221a17f2..000000000000
--- a/app-text/jabref-2.10-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 dev-java/antlr:3 dev-java/fontbox:1.7 dev-java/jempbox:1.7 dev-java/log4j:0 dev-java/spin:0 dev-java/microba:0 >=dev-java/glazedlists-1.8.0:0 >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Java GUI for managing BibTeX and other bibliographies
-EAPI=5
-HOMEPAGE=http://jabref.sourceforge.net/
-IUSE=doc elibc_FreeBSD elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=>=virtual/jre-1.6 dev-java/antlr:3 dev-java/fontbox:1.7 dev-java/jempbox:1.7 dev-java/log4j:0 dev-java/spin:0 dev-java/microba:0 >=dev-java/glazedlists-1.8.0:0 >=dev-java/java-config-2.2.0-r3
-SLOT=0
-SRC_URI=mirror://sourceforge/jabref/JabRef-2.10-src.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=947cdef8f2e53d58a688a98ea9669b0e
diff --git a/app-text/jabref-2.10-r4 b/app-text/jabref-2.10-r4
deleted file mode 100644
index 088c3411b705..000000000000
--- a/app-text/jabref-2.10-r4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.6 dev-java/antlr:0 dev-java/antlr:3 dev-java/fontbox:1.7 dev-java/jempbox:1.7 dev-java/log4j:0 dev-java/spin:0 dev-java/microba:0 >=dev-java/glazedlists-1.8.0:0 >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Java GUI for managing BibTeX and other bibliographies
-EAPI=5
-HOMEPAGE=http://jabref.sourceforge.net/
-IUSE=doc elibc_FreeBSD elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=>=virtual/jre-1.6 dev-java/antlr:0 dev-java/antlr:3 dev-java/fontbox:1.7 dev-java/jempbox:1.7 dev-java/log4j:0 dev-java/spin:0 dev-java/microba:0 >=dev-java/glazedlists-1.8.0:0 >=dev-java/java-config-2.2.0-r3
-SLOT=0
-SRC_URI=mirror://sourceforge/jabref/JabRef-2.10-src.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=3d1bf63525c5ba06eafadb253959c5e9
diff --git a/app-text/jabref-bin-3.7 b/app-text/jabref-bin-3.7
deleted file mode 100644
index 8c534f27cd11..000000000000
--- a/app-text/jabref-bin-3.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup unpack
-DEPEND=app-arch/unzip >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=Java GUI for managing BibTeX and other bibliographies
-EAPI=6
-HOMEPAGE=http://www.jabref.org/
-IUSE=elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3
-SLOT=0
-SRC_URI=mirror://sourceforge/jabref/JabRef-3.7.jar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=dd900944c80c1a88b5c69b6b37f380ca
diff --git a/app-text/jabref-bin-3.8 b/app-text/jabref-bin-3.8
deleted file mode 100644
index b04ab10e1bdc..000000000000
--- a/app-text/jabref-bin-3.8
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup unpack
-DEPEND=app-arch/unzip >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=Java GUI for managing BibTeX and other bibliographies
-EAPI=6
-HOMEPAGE=http://www.jabref.org/
-IUSE=elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3
-SLOT=0
-SRC_URI=https://github.com/JabRef/jabref/releases/download/v3.8/JabRef-3.8.jar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=c9defcbeee9242b55773155810cbb42d
diff --git a/app-text/jabref-bin-3.8.1 b/app-text/jabref-bin-3.8.1
deleted file mode 100644
index 095846dc0de3..000000000000
--- a/app-text/jabref-bin-3.8.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup unpack
-DEPEND=app-arch/unzip >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=Java GUI for managing BibTeX and other bibliographies
-EAPI=6
-HOMEPAGE=http://www.jabref.org/
-IUSE=elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3
-SLOT=0
-SRC_URI=https://github.com/JabRef/jabref/releases/download/v3.8.1/JabRef-3.8.1.jar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=3fbc81b2ff3b490d1765e58bc4c96b2e
diff --git a/app-text/jabref-bin-3.8.2 b/app-text/jabref-bin-3.8.2
deleted file mode 100644
index 87d72cf487ad..000000000000
--- a/app-text/jabref-bin-3.8.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup unpack
-DEPEND=app-arch/unzip >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=Java GUI for managing BibTeX and other bibliographies
-EAPI=6
-HOMEPAGE=http://www.jabref.org/
-IUSE=elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3
-SLOT=0
-SRC_URI=https://github.com/JabRef/jabref/releases/download/v3.8.2/JabRef-3.8.2.jar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=7e51556774ee1c03b14e4d19fc41003e
diff --git a/app-text/jabref-bin-4.0 b/app-text/jabref-bin-4.0
deleted file mode 100644
index 8a39a4678a43..000000000000
--- a/app-text/jabref-bin-4.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup unpack
-DEPEND=app-arch/unzip >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=Java GUI for managing BibTeX and other bibliographies
-EAPI=6
-HOMEPAGE=http://www.jabref.org/
-IUSE=elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=|| ( dev-java/oracle-jre-bin:1.8[javafx] dev-java/oracle-jdk-bin:1.8[javafx] ) >=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3
-SLOT=0
-SRC_URI=https://github.com/JabRef/jabref/releases/download/v4.0/JabRef-4.0.jar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=0a8e2ac94b9649dd5e7353872ce5da42
diff --git a/app-text/jabref-bin-4.1 b/app-text/jabref-bin-4.1
deleted file mode 100644
index d72591f5e5b8..000000000000
--- a/app-text/jabref-bin-4.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup unpack
-DEPEND=app-arch/unzip >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=Java GUI for managing BibTeX and other bibliographies
-EAPI=6
-HOMEPAGE=http://www.jabref.org/
-IUSE=elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=|| ( dev-java/oracle-jre-bin:1.8[javafx] dev-java/oracle-jdk-bin:1.8[javafx] ) >=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3
-SLOT=0
-SRC_URI=https://github.com/JabRef/jabref/releases/download/v4.1/JabRef-4.1.jar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=0a8e2ac94b9649dd5e7353872ce5da42
diff --git a/app-text/jabref-bin-4.3.1 b/app-text/jabref-bin-4.3.1
deleted file mode 100644
index 4e6608711937..000000000000
--- a/app-text/jabref-bin-4.3.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup unpack
-DEPEND=app-arch/unzip >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=Java GUI for managing BibTeX and other bibliographies
-EAPI=6
-HOMEPAGE=http://www.jabref.org/
-IUSE=elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=|| ( dev-java/oracle-jre-bin:1.8[javafx] dev-java/oracle-jdk-bin:1.8[javafx] ) >=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3
-SLOT=0
-SRC_URI=https://github.com/JabRef/jabref/releases/download/v4.3.1/JabRef-4.3.1.jar
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=0a8e2ac94b9649dd5e7353872ce5da42
diff --git a/app-text/jabref-bin-4.9999 b/app-text/jabref-bin-4.9999
deleted file mode 100644
index 735150eaaccd..000000000000
--- a/app-text/jabref-bin-4.9999
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup unpack
-DEPEND=app-arch/unzip >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=Java GUI manages bibliographies in a BibTeX database
-EAPI=6
-HOMEPAGE=http://www.jabref.org/
-IUSE=elibc_FreeBSD
-LICENSE=MIT
-RDEPEND=|| ( dev-java/oracle-jre-bin:1.8[javafx] dev-java/oracle-jdk-bin:1.8[javafx] ) >=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3
-SLOT=0
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=4075b6ec544a45c4f4c0233edfaa4348
diff --git a/app-text/jabref-bin/Manifest b/app-text/jabref-bin/Manifest
new file mode 100644
index 000000000000..9ee77e90340e
--- /dev/null
+++ b/app-text/jabref-bin/Manifest
@@ -0,0 +1,16 @@
+DIST JabRef-3.7.jar 36702576 BLAKE2B a06dd79792f47cb202573a1e620da3f15c9b29705bac5e712e1c95d4df0c21c4c52d2ea30704b9e7427af11cd52ec01fd83017cb343e728ab1d073a7f2513690 SHA512 74ed9fcfa3e6e4a3facf588d8fa2d73374137d9796ba79aa9c97df6807348af5f5ca9b8670e8909d06847f8501c9a344e300172be444be9b2bd773cd4d6314c4
+DIST JabRef-3.8.1.jar 36739725 BLAKE2B edee679afcbcf3745a251e372608ac24fefc29bec9e99e41fcbbb296255edfb2ea8df38f187efe7d6345855af62e0bee82a835f781418a3202cde19abc00fff0 SHA512 9241fb586da7bc6047dc6eb6e5b31800003bf31d6262033b54629e0c81856b56234a5c671ce7ab87d3b7332a70551c81c2275354e97607ad9f513686c5826780
+DIST JabRef-3.8.2.jar 37003442 BLAKE2B 7414128603c8a3c41c0f88003b504636fa64865fbdc0ed82b23b54855750d56631f55e371382209f331579f47ac4b3d3b1ed1d389f50f168dcc2468dff3a411c SHA512 84546987ffdef106643b3aba3216041809ac42464ff37fb63dbe806e282c19c25139d8532b695a4f5ca8ad638eb23860b32bd3806e82409e2d38425d5a42e830
+DIST JabRef-3.8.jar 36714920 BLAKE2B 4a26b40168a66dd8872ff194ce687589bb5b0c679d24c1f3acb133ead2d7fde4ce305b3ef27e1cab99045657701b83054d42c17a7bc6e25e0afba13e1d6ec0e6 SHA512 15805d06c7a566b60c28035e0f9a1d525b68774395a618e43ed7fdcc053d21e61f5930c658155d2e4ff739821789f2f988ce6e9a5502bd5536ce0a672ee19854
+DIST JabRef-4.0.jar 56583311 BLAKE2B cb45bad15d507ddfa9320b7805c9c8fee4be888eb2e209a1e9447d0923e729683ebac4dc91df29172da062946c9aca816200034106238de573e7c34a31ff601b SHA512 a3e27ae895c77c6d9e6a9bd2312c7b590fe7d9c45a5d42ecc5ebb75a7be9bce27bcfb7d17e06409c05e7fe490b3ff0e6776c3f12b205acb5e95bceeef6823af2
+DIST JabRef-4.1.jar 56793908 BLAKE2B 12d046efbdd9e7d4397f889c8be2ceb495e6c2e66039705088e6459355367f9b5b776a5f3649fdcccd7f74223832cf1dd9adc2ffa6a95f9c48451857b40656df SHA512 8de74dce519d28fafffab2b57aa6d15641f0862ba562de2b0642d1836d16fe30f732707a9582dd8a98cca508f26054d585640bf992be0abc4c9368ca46c6fc7d
+DIST JabRef-4.3.1.jar 56868438 BLAKE2B d970599f6bfd4fef7ceda656fafeea77b5c2860ece1b5086bf895cbf212c49bb5e573f5573c483a7fc62431266899dbac7a9bd8e20308d51f5ba2d0c8814319f SHA512 6ff466e91d827254271e5728a9af9c46ac811c2e4fe01c01a2ec6ef9cc75d20978803f18e49365c8a695b0d2db7009ecf05f69f446b9e9136dad5526d5e83f19
+EBUILD jabref-bin-3.7.ebuild 864 BLAKE2B 2bb3f6d6c210c50bb737e7929283236c8771f0192b3b8a11a139ff317e375ff02d88716bacbee0be107a8038805f5acee025931eba47d21c1e4858fadcb36123 SHA512 243e44d36c417ed77c809aab63a5eb527e525874b786cd3d75ab487894e0cc27fd190f942a763aef4e3878524c7330da2dfeb43ce198cabb42ea44a73d377131
+EBUILD jabref-bin-3.8.1.ebuild 951 BLAKE2B 486b75b0dae55f9245cad51e5f5c750097adea5341e922ac0e2032e7dbbeaee56ba17a9f4c54e6e44e36bb4d189607cd752270f885893ab95c77d8a759cc48e6 SHA512 31e3af881a254bd9acc969e2ba538dc35206c360abe879827acaf80914ea557ff6e7e2c3f432a939314f37f7b3492e7beae5e2e722dc34b66fe66a7e64a90321
+EBUILD jabref-bin-3.8.2.ebuild 947 BLAKE2B 2b18c663846b348253c37a8c2adbdc22efbe1b6ab77b476f14617f4f5322dd7889f1921a19b0d1226d63dbb7597011fc7663f0f44ef9eaa39af3e0117181e782 SHA512 d7693a07bec915d348e3585defb30093bfd6574e023c16ed7d266c88972f08e7b87d145428d2ca789cda26702997b82365663c709dd3a38b9823f3ce1993a38f
+EBUILD jabref-bin-3.8.ebuild 956 BLAKE2B 1f2efdc7390090f0542a1bee2546f644fd0ae37ee6a598cabd9e4fc953adfbda423681bcdbf8a6dfc2348abe3bcea221348f97798c7c7229708c2a2c15b242d7 SHA512 4b0bd398d248eacf573dad7ab6fa70e5f49d3efb942a461bf4297801838031651aebcc786a9d0335d799d5c029f2ae2691ab5fad6d37a5d867b2e8e3e8a6f2d4
+EBUILD jabref-bin-4.0.ebuild 1237 BLAKE2B d040db22d73c7ca3629accf0fa7f7eb466d14903ef5e72a1e3359095142ebb19fffca51161c8887a62936ee08eed9251c09d0343ab32c58f755bb3ea3b8aeee4 SHA512 cf0a53545fae8b5787e363e24fa1f3debb7dea1e20bd1a5dd611f59248031c92f8ad6d846317c982652d817835314c85057833ed7a178953bf18d81806880a5d
+EBUILD jabref-bin-4.1.ebuild 1237 BLAKE2B d040db22d73c7ca3629accf0fa7f7eb466d14903ef5e72a1e3359095142ebb19fffca51161c8887a62936ee08eed9251c09d0343ab32c58f755bb3ea3b8aeee4 SHA512 cf0a53545fae8b5787e363e24fa1f3debb7dea1e20bd1a5dd611f59248031c92f8ad6d846317c982652d817835314c85057833ed7a178953bf18d81806880a5d
+EBUILD jabref-bin-4.3.1.ebuild 1237 BLAKE2B d040db22d73c7ca3629accf0fa7f7eb466d14903ef5e72a1e3359095142ebb19fffca51161c8887a62936ee08eed9251c09d0343ab32c58f755bb3ea3b8aeee4 SHA512 cf0a53545fae8b5787e363e24fa1f3debb7dea1e20bd1a5dd611f59248031c92f8ad6d846317c982652d817835314c85057833ed7a178953bf18d81806880a5d
+EBUILD jabref-bin-4.9999.ebuild 1209 BLAKE2B 4acf2b1a219c94010c74edc7eb15780c553978faf148d18b57df1cbb0e5dd018be7007cea6bd04e442b10e5fcbeb30960721eeada97a78866df6d3b9e06834a3 SHA512 141ee714ea516d86b8a303c18e6e20176bb47f33cd737ae0229094076be67b1329ce5d6b9f8ce6fc48fe6c4281631e87f9c44553c8e72cb1065107798c2f4509
+MISC metadata.xml 911 BLAKE2B 126cffb014bca2a1ac056adcbfd52140c8adf76547aea45de34a9d98a4e7c77d1e175e302e7f1cd3677181dda238bf4f75754f9f9a2dfb981196fc8b974d0fd3 SHA512 7a3e7ab167709c28857aed83ffd4e3ec5b202b9d444b4fc7a07c33d2415316e4aa8f22b80cc2bd281a1625e02503bbb5b517c01efe6a70558b2b9815b3b7f2b3
diff --git a/app-text/jabref-bin/jabref-bin-3.7.ebuild b/app-text/jabref-bin/jabref-bin-3.7.ebuild
new file mode 100644
index 000000000000..1e671d607b1b
--- /dev/null
+++ b/app-text/jabref-bin/jabref-bin-3.7.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils java-pkg-2
+
+MY_PV_1="${PV/_beta/b}"
+MY_PV="${MY_PV_1/_rc/}"
+MY_URI_PV_1="${PV/rc/}"
+MY_URI_PV="${MY_URI_PV_1//_/%20}"
+
+DESCRIPTION="Java GUI for managing BibTeX and other bibliographies"
+HOMEPAGE="http://www.jabref.org/"
+SRC_URI="mirror://sourceforge/jabref/JabRef-${MY_PV}.jar"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+DEPEND="
+	app-arch/unzip
+"
+RDEPEND="
+	>=virtual/jre-1.8
+"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	cp -v "${DISTDIR}/${A}" . || die
+	unzip  ${A} images/icons/JabRef-icon-48.png || die
+}
+
+src_install() {
+	java-pkg_newjar "JabRef-${MY_PV}.jar"
+	java-pkg_dolauncher "${PN}" --jar "${PN}.jar"
+	newicon images/icons/JabRef-icon-48.png JabRef-bin-icon.png
+	make_desktop_entry "${PN}" JabRef-bin JabRef-bin-icon Office
+}
diff --git a/app-text/jabref-bin/jabref-bin-3.8.1.ebuild b/app-text/jabref-bin/jabref-bin-3.8.1.ebuild
new file mode 100644
index 000000000000..c69c8a61c6e9
--- /dev/null
+++ b/app-text/jabref-bin/jabref-bin-3.8.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils java-pkg-2
+
+MY_PV_1="${PV/_beta/b}"
+MY_PV="${MY_PV_1/_rc/}"
+MY_URI_PV_1="${PV/rc/}"
+MY_URI_PV="${MY_URI_PV_1//_/%20}"
+
+DESCRIPTION="Java GUI for managing BibTeX and other bibliographies"
+HOMEPAGE="http://www.jabref.org/"
+# SRC_URI="mirror://sourceforge/jabref/JabRef-${MY_PV}.jar"
+SRC_URI="https://github.com/JabRef/jabref/releases/download/v${PV}/JabRef-${MY_PV}.jar"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="app-arch/unzip"
+
+RDEPEND=">=virtual/jre-1.8"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	cp -v "${DISTDIR}/${A}" . || die
+	unzip  ${A} images/icons/JabRef-icon-48.png || die
+}
+
+src_install() {
+	java-pkg_newjar "JabRef-${MY_PV}.jar"
+	java-pkg_dolauncher "${PN}" --jar "${PN}.jar"
+	newicon images/icons/JabRef-icon-48.png JabRef-bin-icon.png
+	make_desktop_entry "${PN}" JabRef-bin JabRef-bin-icon Office
+}
diff --git a/app-text/jabref-bin/jabref-bin-3.8.2.ebuild b/app-text/jabref-bin/jabref-bin-3.8.2.ebuild
new file mode 100644
index 000000000000..a0ff6dfe94b0
--- /dev/null
+++ b/app-text/jabref-bin/jabref-bin-3.8.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils java-pkg-2
+
+MY_PV_1="${PV/_beta/b}"
+MY_PV="${MY_PV_1/_rc/}"
+MY_URI_PV_1="${PV/rc/}"
+MY_URI_PV="${MY_URI_PV_1//_/%20}"
+
+DESCRIPTION="Java GUI for managing BibTeX and other bibliographies"
+HOMEPAGE="http://www.jabref.org/"
+# SRC_URI="mirror://sourceforge/jabref/JabRef-${MY_PV}.jar"
+SRC_URI="https://github.com/JabRef/jabref/releases/download/v${PV}/JabRef-${MY_PV}.jar"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+DEPEND="app-arch/unzip"
+
+RDEPEND=">=virtual/jre-1.8"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	cp -v "${DISTDIR}/${A}" . || die
+	unzip  ${A} images/icons/JabRef-icon-48.png || die
+}
+
+src_install() {
+	java-pkg_newjar "JabRef-${MY_PV}.jar"
+	java-pkg_dolauncher "${PN}" --jar "${PN}.jar"
+	newicon images/icons/JabRef-icon-48.png JabRef-bin-icon.png
+	make_desktop_entry "${PN}" JabRef-bin JabRef-bin-icon Office
+}
diff --git a/app-text/jabref-bin/jabref-bin-3.8.ebuild b/app-text/jabref-bin/jabref-bin-3.8.ebuild
new file mode 100644
index 000000000000..9bd260099483
--- /dev/null
+++ b/app-text/jabref-bin/jabref-bin-3.8.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils java-pkg-2
+
+MY_PV_1="${PV/_beta/b}"
+MY_PV="${MY_PV_1/_rc/}"
+MY_URI_PV_1="${PV/rc/}"
+MY_URI_PV="${MY_URI_PV_1//_/%20}"
+
+DESCRIPTION="Java GUI for managing BibTeX and other bibliographies"
+HOMEPAGE="http://www.jabref.org/"
+# SRC_URI="mirror://sourceforge/jabref/JabRef-${MY_PV}.jar"
+SRC_URI="https://github.com/JabRef/jabref/releases/download/v${PV}/JabRef-${MY_PV}.jar"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	app-arch/unzip
+"
+RDEPEND="
+	>=virtual/jre-1.8
+"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	cp -v "${DISTDIR}/${A}" . || die
+	unzip  ${A} images/icons/JabRef-icon-48.png || die
+}
+
+src_install() {
+	java-pkg_newjar "JabRef-${MY_PV}.jar"
+	java-pkg_dolauncher "${PN}" --jar "${PN}.jar"
+	newicon images/icons/JabRef-icon-48.png JabRef-bin-icon.png
+	make_desktop_entry "${PN}" JabRef-bin JabRef-bin-icon Office
+}
diff --git a/app-text/jabref-bin/jabref-bin-4.0.ebuild b/app-text/jabref-bin/jabref-bin-4.0.ebuild
new file mode 100644
index 000000000000..a4bf511e4d47
--- /dev/null
+++ b/app-text/jabref-bin/jabref-bin-4.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_WANT_TARGET=1.8
+
+inherit eutils java-pkg-2
+
+MY_PV_1="${PV/_beta/b}"
+MY_PV="${MY_PV_1/_rc/}"
+MY_URI_PV_1="${PV/rc/}"
+MY_URI_PV="${MY_URI_PV_1//_/%20}"
+
+DESCRIPTION="Java GUI for managing BibTeX and other bibliographies"
+HOMEPAGE="http://www.jabref.org/"
+SRC_URI="https://github.com/JabRef/jabref/releases/download/v${PV}/JabRef-${MY_PV}.jar"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="app-arch/unzip"
+
+RDEPEND="
+	|| (
+	dev-java/oracle-jre-bin:1.8[javafx]
+	dev-java/oracle-jdk-bin:1.8[javafx]
+	)
+	>=virtual/jre-1.8
+"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	cp -v "${DISTDIR}/${A}" . || die
+	unzip ${A} images/external/JabRef-icon-128.png || die
+}
+
+src_install() {
+	java-pkg_newjar "JabRef-${MY_PV}.jar"
+	java-pkg_dolauncher "${PN}" --jar "${PN}.jar"
+	newicon images/external/JabRef-icon-128.png JabRef-bin-icon.png
+	make_desktop_entry "${PN}" JabRef-bin JabRef-bin-icon Office
+	ewarn "Jabref 4.x will convert old 3.x format .bib databases to a new format."
+	ewarn "The conversion is irreversible, backup .bib files before starting Jabref."
+	ewarn "Jabref 4.x is under heavy development and very unstable."
+}
diff --git a/app-text/jabref-bin/jabref-bin-4.1.ebuild b/app-text/jabref-bin/jabref-bin-4.1.ebuild
new file mode 100644
index 000000000000..a4bf511e4d47
--- /dev/null
+++ b/app-text/jabref-bin/jabref-bin-4.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_WANT_TARGET=1.8
+
+inherit eutils java-pkg-2
+
+MY_PV_1="${PV/_beta/b}"
+MY_PV="${MY_PV_1/_rc/}"
+MY_URI_PV_1="${PV/rc/}"
+MY_URI_PV="${MY_URI_PV_1//_/%20}"
+
+DESCRIPTION="Java GUI for managing BibTeX and other bibliographies"
+HOMEPAGE="http://www.jabref.org/"
+SRC_URI="https://github.com/JabRef/jabref/releases/download/v${PV}/JabRef-${MY_PV}.jar"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="app-arch/unzip"
+
+RDEPEND="
+	|| (
+	dev-java/oracle-jre-bin:1.8[javafx]
+	dev-java/oracle-jdk-bin:1.8[javafx]
+	)
+	>=virtual/jre-1.8
+"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	cp -v "${DISTDIR}/${A}" . || die
+	unzip ${A} images/external/JabRef-icon-128.png || die
+}
+
+src_install() {
+	java-pkg_newjar "JabRef-${MY_PV}.jar"
+	java-pkg_dolauncher "${PN}" --jar "${PN}.jar"
+	newicon images/external/JabRef-icon-128.png JabRef-bin-icon.png
+	make_desktop_entry "${PN}" JabRef-bin JabRef-bin-icon Office
+	ewarn "Jabref 4.x will convert old 3.x format .bib databases to a new format."
+	ewarn "The conversion is irreversible, backup .bib files before starting Jabref."
+	ewarn "Jabref 4.x is under heavy development and very unstable."
+}
diff --git a/app-text/jabref-bin/jabref-bin-4.3.1.ebuild b/app-text/jabref-bin/jabref-bin-4.3.1.ebuild
new file mode 100644
index 000000000000..a4bf511e4d47
--- /dev/null
+++ b/app-text/jabref-bin/jabref-bin-4.3.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_WANT_TARGET=1.8
+
+inherit eutils java-pkg-2
+
+MY_PV_1="${PV/_beta/b}"
+MY_PV="${MY_PV_1/_rc/}"
+MY_URI_PV_1="${PV/rc/}"
+MY_URI_PV="${MY_URI_PV_1//_/%20}"
+
+DESCRIPTION="Java GUI for managing BibTeX and other bibliographies"
+HOMEPAGE="http://www.jabref.org/"
+SRC_URI="https://github.com/JabRef/jabref/releases/download/v${PV}/JabRef-${MY_PV}.jar"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="app-arch/unzip"
+
+RDEPEND="
+	|| (
+	dev-java/oracle-jre-bin:1.8[javafx]
+	dev-java/oracle-jdk-bin:1.8[javafx]
+	)
+	>=virtual/jre-1.8
+"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	cp -v "${DISTDIR}/${A}" . || die
+	unzip ${A} images/external/JabRef-icon-128.png || die
+}
+
+src_install() {
+	java-pkg_newjar "JabRef-${MY_PV}.jar"
+	java-pkg_dolauncher "${PN}" --jar "${PN}.jar"
+	newicon images/external/JabRef-icon-128.png JabRef-bin-icon.png
+	make_desktop_entry "${PN}" JabRef-bin JabRef-bin-icon Office
+	ewarn "Jabref 4.x will convert old 3.x format .bib databases to a new format."
+	ewarn "The conversion is irreversible, backup .bib files before starting Jabref."
+	ewarn "Jabref 4.x is under heavy development and very unstable."
+}
diff --git a/app-text/jabref-bin/jabref-bin-4.9999.ebuild b/app-text/jabref-bin/jabref-bin-4.9999.ebuild
new file mode 100644
index 000000000000..9c54f3b9b7e9
--- /dev/null
+++ b/app-text/jabref-bin/jabref-bin-4.9999.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils java-pkg-2
+
+DESCRIPTION="Java GUI manages bibliographies in a BibTeX database"
+HOMEPAGE="http://www.jabref.org/"
+KEYWORDS=""
+
+LICENSE="MIT"
+SLOT="0"
+
+DEPEND="app-arch/unzip"
+
+RDEPEND="
+		|| (
+		dev-java/oracle-jre-bin:1.8[javafx]
+		dev-java/oracle-jdk-bin:1.8[javafx]
+		)
+		>=virtual/jre-1.8
+		"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	einfo "Downloading the latest Jabref development snapshot."
+	einfo "Upstream updates these a few times per day."
+	wget "https://builds.jabref.org/master/JabRef--master--latest.jar" -O ${P}.jar || die "wget failed"
+	unzip  ${P}.jar images/external/JabRef-icon-48.png || die "icon extraction failed"
+}
+
+src_install() {
+	java-pkg_newjar "${P}.jar"
+	java-pkg_dolauncher "${PN}" --jar "${PN}.jar"
+	newicon images/external/JabRef-icon-48.png JabRef-bin-icon.png
+	make_desktop_entry "${PN}" JabRef-bin JabRef-bin-icon Office
+	ewarn "Jabref 4.x will convert old 3.x format .bib databases to a new format."
+	ewarn "The conversion is irreversible, backup .bib files before starting Jabref."
+	ewarn "Jabref 4.x is under heavy development and very unstable."
+}
diff --git a/app-text/jabref-bin/metadata.xml b/app-text/jabref-bin/metadata.xml
new file mode 100644
index 000000000000..e2170f6bc5a1
--- /dev/null
+++ b/app-text/jabref-bin/metadata.xml
@@ -0,0 +1,27 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>nicolasbock@gentoo.org</email>
+		<name>Nicolas Bock</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
+	<longdescription lang="en">
+		JabRef is an open source bibliography reference manager. The native
+		file format used by JabRef is BibTeX, the standard LaTeX bibliography
+		format.
+	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">jabref</remote-id>
+		<changelog>https://github.com/JabRef/jabref/blob/master/CHANGELOG.md</changelog>
+		<doc>http://help.jabref.org/</doc>
+		<remote-id type="github">JabRef/jabref</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/jabref/Manifest b/app-text/jabref/Manifest
new file mode 100644
index 000000000000..2d5895202a13
--- /dev/null
+++ b/app-text/jabref/Manifest
@@ -0,0 +1,4 @@
+DIST JabRef-2.10-src.tar.bz2 16769469 BLAKE2B adb0acabd1872d5b9b054e8c4c7e85a0cf0425ad748408e248a66dceef7ba3eca0af8a8d2cc1ef0828bc930cab7e48e8f1800c8e55902af19b4827ae4480fe16 SHA512 72eee8fb08040fc7bfd395729d3c74f0a8841c90d5aa6e6e8d8e68ddcc1ffe1f6659a045aa951d51deffe266ee0b1ff844c4fdf36537d5463de6b361803bb942
+EBUILD jabref-2.10-r2.ebuild 1818 BLAKE2B 9fd1b25bb773e29e924cefce7e7b85046f1c84c88727c8009785af90dfe65475454962f5e3c0b88d3788cc37ea674374500b8d14fd1163df06c498a407417479 SHA512 4c685bce3c6d9cf4dae811548d7f230647049c728669bbb5816ddf1de43c226efe1002d7e2d42cce7008a4aaaf920e5136913b1f0072d49953f808ce44e2e050
+EBUILD jabref-2.10-r4.ebuild 1844 BLAKE2B 7682bf48b6abed07a42dfa404c4b4be27d5d73d381e8738f35cca9a522e2f3554552ce73a5d471a9b3dbd9d8a23139ebe4423f487e334c3987cbbe90f78069ad SHA512 e246388881e6e8b1d3290ae7bbeedad21b0af60ee4647df53b953f2b390f6cb255e66b2ef9e5f8b042e552522f784e208fbc9e1b7b9ce9a5aa43f8d9c52303e3
+MISC metadata.xml 537 BLAKE2B 1aa32da69c977641a51f05b3e615d4cfb15d21912ab649b0db7f6a4b35daf5428225431533e97eca895253e4370dfd03baa60beaee4ee333a225df8942e715d4 SHA512 8478bf7312a365c4fce15051b0cedb465e92a274e215bcf989e744434ed93f568217f953cbaa07e9adfc5e620187d4ed4076d3201806bfe2df55ae8743bfaaa2
diff --git a/app-text/jabref/jabref-2.10-r2.ebuild b/app-text/jabref/jabref-2.10-r2.ebuild
new file mode 100644
index 000000000000..731fc02ac090
--- /dev/null
+++ b/app-text/jabref/jabref-2.10-r2.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+inherit eutils java-pkg-2 java-ant-2 java-utils-2
+
+MY_PV="${PV/_beta/b}"
+
+DESCRIPTION="Java GUI for managing BibTeX and other bibliographies"
+HOMEPAGE="http://jabref.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/JabRef-${MY_PV}-src.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+IUSE="doc"
+
+COMMON_DEP="
+	dev-java/antlr:3
+	dev-java/fontbox:1.7
+	dev-java/jempbox:1.7
+	dev-java/log4j:0
+	dev-java/spin:0
+	dev-java/microba:0
+	>=dev-java/glazedlists-1.8.0:0
+	"
+
+DEPEND="
+	>=virtual/jdk-1.6
+	${COMMON_DEP}"
+
+RDEPEND="
+	>=virtual/jre-1.6
+	${COMMON_DEP}"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+java_prepare() {
+	# Remove bundled dependencies.
+	rm lib/antlr*.jar || die
+	rm lib/fontbox*.jar || die
+	rm lib/jempbox*.jar || die
+	rm lib/spin.jar || die
+	rm lib/microba.jar || die
+	rm lib/glazedlists*.jar || die
+
+	# Remove unjarlib target (do this only once we have removed all
+	# bundled dependencies in lib).
+	#sed -i -e 's:depends="build, unjarlib":depends="build":' build.xml
+
+	# Fix license file copy operation for microba bundled lib.
+	sed -i -e 's:^.*microba-license.*::' build.xml
+}
+
+src_compile() {
+	local EXTERNAL_JARS="antlr-3,fontbox-1.7,jempbox-1.7,log4j,spin,microba,glazedlists"
+	local CLASSPATH="$(java-pkg_getjars --with-dependencies ${EXTERNAL_JARS})"
+	eant \
+		-Dgentoo.classpath=${CLASSPATH} \
+		jars \
+		$(usex doc docs "")
+}
+
+src_install() {
+	java-pkg_newjar build/lib/JabRef-${MY_PV}.jar
+
+	use doc && java-pkg_dojavadoc build/docs/API
+	dodoc src/txt/README
+
+	java-pkg_dolauncher ${PN} --main net.sf.jabref.JabRef
+	newicon src/images/JabRef-icon-48.png JabRef-icon.png
+	make_desktop_entry ${PN} JabRef JabRef-icon Office
+}
diff --git a/app-text/jabref/jabref-2.10-r4.ebuild b/app-text/jabref/jabref-2.10-r4.ebuild
new file mode 100644
index 000000000000..3574c04c59cd
--- /dev/null
+++ b/app-text/jabref/jabref-2.10-r4.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+inherit eutils java-pkg-2 java-ant-2 java-utils-2
+
+MY_PV="${PV/_beta/b}"
+
+DESCRIPTION="Java GUI for managing BibTeX and other bibliographies"
+HOMEPAGE="http://jabref.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/JabRef-${MY_PV}-src.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc"
+
+COMMON_DEP="
+	dev-java/antlr:0
+	dev-java/antlr:3
+	dev-java/fontbox:1.7
+	dev-java/jempbox:1.7
+	dev-java/log4j:0
+	dev-java/spin:0
+	dev-java/microba:0
+	>=dev-java/glazedlists-1.8.0:0
+	"
+
+DEPEND="
+	>=virtual/jdk-1.6
+	${COMMON_DEP}"
+
+RDEPEND="
+	>=virtual/jre-1.6
+	${COMMON_DEP}"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+java_prepare() {
+	# Remove bundled dependencies.
+	rm lib/antlr*.jar || die
+	rm lib/fontbox*.jar || die
+	rm lib/jempbox*.jar || die
+	rm lib/spin.jar || die
+	rm lib/microba.jar || die
+	rm lib/glazedlists*.jar || die
+
+	# Remove unjarlib target (do this only once we have removed all
+	# bundled dependencies in lib).
+	#sed -i -e 's:depends="build, unjarlib":depends="build":' build.xml
+
+	# Fix license file copy operation for microba bundled lib.
+	sed -i -e 's:^.*microba-license.*::' build.xml
+}
+
+src_compile() {
+	local EXTERNAL_JARS="antlr,antlr-3,fontbox-1.7,jempbox-1.7,log4j,spin,microba,glazedlists"
+	local CLASSPATH="$(java-pkg_getjars --with-dependencies ${EXTERNAL_JARS})"
+	eant \
+		-Dgentoo.classpath=${CLASSPATH} \
+		jars \
+		$(usex doc docs "")
+}
+
+src_install() {
+	java-pkg_newjar build/lib/JabRef-${MY_PV}.jar
+
+	use doc && java-pkg_dojavadoc build/docs/API
+	dodoc src/txt/README
+
+	java-pkg_dolauncher ${PN} --main net.sf.jabref.JabRef
+	newicon src/images/JabRef-icon-48.png JabRef-icon.png
+	make_desktop_entry ${PN} JabRef JabRef-icon Office
+}
diff --git a/app-text/jabref/metadata.xml b/app-text/jabref/metadata.xml
new file mode 100644
index 000000000000..9bbc4a0655f8
--- /dev/null
+++ b/app-text/jabref/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>nicolasbock@gentoo.org</email>
+		<name>Nicolas Bock</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">jabref</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/jadetex-3.13-r7 b/app-text/jadetex-3.13-r7
deleted file mode 100644
index af018d9645f7..000000000000
--- a/app-text/jadetex-3.13-r7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare unpack
-DEPEND=>=app-text/openjade-1.3.1 dev-texlive/texlive-fontsrecommended || ( dev-texlive/texlive-plaingeneric dev-texlive/texlive-genericrecommended ) virtual/latex-base >=sys-apps/texinfo-4.2-r5
-DESCRIPTION=TeX macros used by Jade TeX output
-EAPI=5
-HOMEPAGE=http://jadetex.sourceforge.net/
-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 ~x86-macos
-LICENSE=MIT
-RDEPEND=virtual/latex-base
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://sourceforge/jadetex/jadetex-3.13.tar.gz
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	latex-package	773c51c2ef26eaff025998531e7c6731	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=12ee567a4e9ec5610fec2e3c2ff7968e
diff --git a/app-text/jadetex/Manifest b/app-text/jadetex/Manifest
new file mode 100644
index 000000000000..c42f64630a84
--- /dev/null
+++ b/app-text/jadetex/Manifest
@@ -0,0 +1,5 @@
+AUX 80jadetex.cnf 995 BLAKE2B 1316aa328e42553d13ba377512bb1c7301a62ee60b8351a9209dbdf7ebd306f092e9b3e35c6b605c9847a1fd931cda3ccfb042a30ec3415b59f1c88537ebe55d SHA512 b1e940b79bbb76b3ad02c82e25120651ab64259be104849fc39aee94fcedaea091220b6896217faa84f93a45cbafca5b1855396b47210952723148b69d9727f9
+AUX format.jadetex.cnf 170 BLAKE2B f6f923eb38263e054ef470f0e9bb8f4beae75a9ea5f5df380077e1661e22fed024e1f77f56f8419127bfb831b7409f486cd53bfbf2aa81bb80a2c47ec674cf2a SHA512 8d5d6ed30c45e1d79f108268e045acb763fa6815ca90a8f246daff51350ab2c19c7d38237aff3ced94f10bb9de06e3021c11138d3f038f4beaff25c5cade391b
+DIST jadetex-3.13.tar.gz 103137 BLAKE2B f1b94f62a6a9c0a33acba4e8c757bcfaf26660a2d0b4ac338cf5afe8d03476a8744652244218d056678a59507ce3c8de7066314f5559469a60be5287a8c0ab37 SHA512 188fb83b50fbe82856a32ef95088d5c801750114810e3cdf7e1758f78b6a94b331b7ae7d81feb1c08b7bb31ac52f8435503911933350baa3068ad373e11dbba1
+EBUILD jadetex-3.13-r7.ebuild 1620 BLAKE2B 63469fe5dea37a4bbfbe46ee9697de5e4b9b7b7be6afd388d31b6bedb7a2c6c92c7b4bf2439961e27850ab9da23a5ce2452d3004c6be17ba6c731a0337f70fc9 SHA512 bc4e327e12f928cd4adb1c841362950d6e78e8b68f40077f89703d55123d9423be096289f6f691427a7e5fbe14d35d4effb1ca4f496f7cfcf59e9067e74b6ad3
+MISC metadata.xml 326 BLAKE2B 43480e556a9ce9c52fc46d18765664881cbb16ea08954b18d357df0a956d335815e9a0c3093504bd68a5b2249bee307ca05030fbe7fb4324beb8fdd7ff8b2e53 SHA512 eb50eeb89f113a376963fe314c979d5e399f43b0ab85fcecc923618c717e30c90f8f70fe22ba7a02b39b14c57861efebfdb785f607a2e7830578aee20c2bd915
diff --git a/app-text/jadetex/files/80jadetex.cnf b/app-text/jadetex/files/80jadetex.cnf
new file mode 100644
index 000000000000..a5976a74e09e
--- /dev/null
+++ b/app-text/jadetex/files/80jadetex.cnf
@@ -0,0 +1,37 @@
+% -- jadetex configuration params added by texmf-update --
+% latex settings
+main_memory.latex = 1100000
+param_size.latex = 1500
+stack_size.latex = 1500
+hash_extra.latex = 15000
+string_vacancies.latex = 45000
+pool_free.latex = 47500
+nest_size.latex = 500
+save_size.latex = 5000
+pool_size.latex = 500000
+max_strings.latex = 55000
+font_mem_size.latex= 400000
+
+% jadetex & pdfjadetex
+main_memory.jadetex = 1500000
+param_size.jadetex = 1500
+stack_size.jadetex = 1500
+hash_extra.jadetex = 50000
+string_vacancies.jadetex = 45000
+pool_free.jadetex = 47500
+nest_size.jadetex = 500
+save_size.jadetex = 5000
+pool_size.jadetex = 500000
+max_strings.jadetex = 55000
+
+main_memory.pdfjadetex = 2500000
+param_size.pdfjadetex = 1500
+stack_size.pdfjadetex = 1500
+hash_extra.pdfjadetex = 50000
+string_vacancies.pdfjadetex = 45000
+pool_free.pdfjadetex = 47500
+nest_size.pdfjadetex = 500
+save_size.pdfjadetex = 5000
+pool_size.pdfjadetex = 500000
+max_strings.pdfjadetex = 55000
+% -- jadetex configuration ends here --
diff --git a/app-text/jadetex/files/format.jadetex.cnf b/app-text/jadetex/files/format.jadetex.cnf
new file mode 100644
index 000000000000..d88f7eb0bff8
--- /dev/null
+++ b/app-text/jadetex/files/format.jadetex.cnf
@@ -0,0 +1,3 @@
+# JadeTeX
+jadetex		pdftex		language.dat	-translate-file=cp227.tcx \&latex jadetex.ini
+pdfjadetex	pdftex		language.dat	-translate-file=cp227.tcx \&pdflatex pdfjadetex.ini
diff --git a/app-text/jadetex/jadetex-3.13-r7.ebuild b/app-text/jadetex/jadetex-3.13-r7.ebuild
new file mode 100644
index 000000000000..01c408053fa0
--- /dev/null
+++ b/app-text/jadetex/jadetex-3.13-r7.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit latex-package texlive-common
+
+DESCRIPTION="TeX macros used by Jade TeX output"
+HOMEPAGE="http://jadetex.sourceforge.net/"
+SRC_URI="mirror://sourceforge/jadetex/${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 ~x86-macos"
+IUSE=""
+RESTRICT="test"
+
+DEPEND=">=app-text/openjade-1.3.1
+	dev-texlive/texlive-fontsrecommended
+	|| ( dev-texlive/texlive-plaingeneric dev-texlive/texlive-genericrecommended )"
+
+src_compile() {
+	VARTEXFONTS="${T}/fonts" emake
+	VARTEXFONTS="${T}/fonts" TEXMFHOME="${S}" env -u TEXINPUTS \
+		fmtutil --cnffile "${FILESDIR}/format.jadetex.cnf" --fmtdir "${S}/texmf-var/web2c" --all\
+				|| die "failed to build format"
+}
+
+src_install() {
+	# Runtime files
+	insinto /usr/share/texmf-site/tex/jadetex
+	doins dsssl.def jadetex.ltx jadetex.cfg {pdf,}jadetex.ini *.sty
+
+	insinto /var/lib/texmf
+	doins -r texmf-var/*
+
+	etexlinks "${FILESDIR}/format.jadetex.cnf"
+
+	# Doc/manpages
+	dodoc ChangeLog*
+	doman *.1
+	dohtml -r .
+
+	# Support for our latex setup
+	insinto /etc/texmf/texmf.d
+	doins "${FILESDIR}/80jadetex.cnf"
+	insinto /etc/texmf/fmtutil.d
+	doins "${FILESDIR}/format.jadetex.cnf"
+}
+
+pkg_postinst() {
+	etexmf-update
+	elog
+	elog "If jadetex fails with \"TeX capacity exceeded, sorry [save size=5000]\","
+	elog "increase save_size in /etc/texmf/texmf.d/80jadetex.cnf and."
+	elog "remerge jadetex. See bug #21501."
+	elog
+}
+
+pkg_postrm() {
+	etexmf-update
+}
diff --git a/app-text/jadetex/metadata.xml b/app-text/jadetex/metadata.xml
new file mode 100644
index 000000000000..964ad3bf6d73
--- /dev/null
+++ b/app-text/jadetex/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">jadetex</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/jist-1.5.1-r1 b/app-text/jist-1.5.1-r1
deleted file mode 100644
index e9c1d190bd44..000000000000
--- a/app-text/jist-1.5.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( dev-ruby/json:*[ruby_targets_ruby23] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/webmock:0[ruby_targets_ruby23] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
-DESCRIPTION=A ruby gem to publish a gist
-EAPI=5
-HOMEPAGE=https://github.com/ConradIrwin/jist
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 test test
-KEYWORDS=amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( dev-ruby/json:*[ruby_targets_ruby23] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 )
-SLOT=0
-SRC_URI=mirror://rubygems/jist-1.5.1.gem
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=05fc01ad24083a1d6608c4153051f3e1
diff --git a/app-text/jist/Manifest b/app-text/jist/Manifest
new file mode 100644
index 000000000000..c1d323996620
--- /dev/null
+++ b/app-text/jist/Manifest
@@ -0,0 +1,3 @@
+DIST jist-1.5.1.gem 13824 BLAKE2B dfa4fce7601969fa74158b8cc4ae3542a1e60e241dc430f920d4f2fb9c963ee281d8c2c2cf355547422228dd91d3809ee4fe9cb0df8cbdea32c793308b63639b SHA512 e59a0c5a5b0439a5cc3b847de3cbb0b9991685c1403fd8482ffd5564a77c8812587a7384ac19bb77cb812d0ece63df8ccd029c8757a242dc50a44da3e66b9936
+EBUILD jist-1.5.1-r1.ebuild 700 BLAKE2B 7d26f7921890ec69ec2051ed42cecd48a7b05abaf81d7c70ebb04334b569cc0023995ec71495390ab215abf9b874420ac9712f80f31742cda488a42dd6d40fec SHA512 bfb364afb3287d941434a5143d1df1a330208bc3570a33dee3adf55aef74af0f78a17d18660bf55a36afef6c282e8cb8abd33fd4c2defc59843e13abba4bb6b0
+MISC metadata.xml 342 BLAKE2B 1145b976b479197ca2824fd96b37de71d0efc6579bebe7e539a90465399225402b76d32e9f763d05ea05bfe6e3dd22b66575691b8b1c3248ddc50755194d6490 SHA512 dd94324def89cb3c5745995b21180e8ddcc785f81d53352c0b920f64a3e007f4edaf216116debb65686d5c43cd17291e0fc98edfc7ac5dc8f8d916c467a2f6cd
diff --git a/app-text/jist/jist-1.5.1-r1.ebuild b/app-text/jist/jist-1.5.1-r1.ebuild
new file mode 100644
index 000000000000..10cdc385353f
--- /dev/null
+++ b/app-text/jist/jist-1.5.1-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+USE_RUBY="ruby21 ruby22 ruby23"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A ruby gem to publish a gist"
+HOMEPAGE="https://github.com/ConradIrwin/jist"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64"
+IUSE=""
+
+ruby_add_rdepend "dev-ruby/json:*"
+
+ruby_add_bdepend "test? ( dev-ruby/webmock:0 )"
+
+all_ruby_prepare() {
+	# Avoid failing test (due to webmock version?)
+	# We did not run any tests previously
+	rm -f spec/shorten_spec.rb || die
+
+	sed -i -e '1igem "webmock", "~>1.0"' spec/spec_helper.rb || die
+}
diff --git a/app-text/jist/metadata.xml b/app-text/jist/metadata.xml
new file mode 100644
index 000000000000..b5befd6d272f
--- /dev/null
+++ b/app-text/jist/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">ConradIrwin/jist</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-text/jo-1.1 b/app-text/jo-1.1
deleted file mode 100644
index 49628930a957..000000000000
--- a/app-text/jo-1.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=prepare
-DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=JSON output from a shell
-EAPI=6
-HOMEPAGE=https://github.com/jpmens/jo
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-SLOT=0
-SRC_URI=https://github.com/jpmens/jo/archive/v1.1.tar.gz -> jo-1.1.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=66467e3c07e011680c5ac7b7b5ad3984
diff --git a/app-text/jo/Manifest b/app-text/jo/Manifest
new file mode 100644
index 000000000000..747bdf161dd5
--- /dev/null
+++ b/app-text/jo/Manifest
@@ -0,0 +1,4 @@
+AUX jo-1.1-version.patch 217 BLAKE2B 366b69d941f5f324de39e31de160e0a296dd65259a2051f4adcefde4b8253b514e44c0d4c52413379b33567d7a744a8beef0cc324bd098b7d017ec6318d2f5f2 SHA512 c70e5993069229143f75f2360bf7b4756a988f71d321a0f26c821d0258d523fc2c9d754692b498ece20ff452444ee817af609435160409f1ebe4033287ef89a3
+DIST jo-1.1.tar.gz 50395 BLAKE2B 753e65e5b483cee357bcfc1fb95d93fae008acc8a1eeee75e6e68da6d0ed8c9636cd489278c466ffbd179ceaec7121b4fe3f64fe2e9bf70b81febbe15144c0f2 SHA512 fd220acf53d554cb9e9920510dba2f4a01337b126dca89882e02ba96cdd84bf7a5e935a4c06dddb5200cd808f0609fd697e51a56161dc99b1638e33181494242
+EBUILD jo-1.1.ebuild 412 BLAKE2B a5d07980550f418a4022f3a36c74f49ee5fdf21a56ebb28e20a91c3dc4b75e1ce6898a1c36e89adb9b530741056ed04fb7e96a6fd2b256b35cda4598ef8432e6 SHA512 4914cdbb6a5f71e58da34c82f188901400c5afda7abe58ecece89e175b984f16333529a986baba15513ad6b08f6559b0f8f5d6b0276fbc14aecddae344192246
+MISC metadata.xml 288 BLAKE2B 8b66970135ed40287f00f96188b1679d936f9f58d59d2991aa36f2641e0a5ae48bdf3f36556be0b0296190a1c8bf59c88e6900de93e32c102b3adb880e524dcf SHA512 c8e9c740f13a6d2e94d28748750b51c44d9291d4fdc8823dc11647e0ae058866c06d49656011398d48fed78192bfe89f50a5fd05d36054974e3e65bdc82c55cb
diff --git a/app-text/jo/files/jo-1.1-version.patch b/app-text/jo/files/jo-1.1-version.patch
new file mode 100644
index 000000000000..446df4aa9211
--- /dev/null
+++ b/app-text/jo/files/jo-1.1-version.patch
@@ -0,0 +1,9 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -1,5 +1,5 @@
+ AC_PREREQ([2.64])
+-AC_INIT([jo], [1.0], [jpmens@gmail.com])
++AC_INIT([jo], [1.1], [jpmens@gmail.com])
+ AC_CONFIG_AUX_DIR([build-aux])
+ AC_CONFIG_SRCDIR([jo.c])
+ 
diff --git a/app-text/jo/jo-1.1.ebuild b/app-text/jo/jo-1.1.ebuild
new file mode 100644
index 000000000000..704769988141
--- /dev/null
+++ b/app-text/jo/jo-1.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools
+
+DESCRIPTION="JSON output from a shell"
+HOMEPAGE="https://github.com/jpmens/jo"
+SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.1-version.patch
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
diff --git a/app-text/jo/metadata.xml b/app-text/jo/metadata.xml
new file mode 100644
index 000000000000..aa1c918e2462
--- /dev/null
+++ b/app-text/jo/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>jer@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">jpmens/jo</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/jpdftweak-0.9-r1 b/app-text/jpdftweak-0.9-r1
deleted file mode 100644
index e3e16cd111ec..000000000000
--- a/app-text/jpdftweak-0.9-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.5 app-arch/unzip:0 dev-java/itext:0 dev-java/jgoodies-forms:0 >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Swiss Army Knife for PDF files
-EAPI=5
-HOMEPAGE=http://jpdftweak.sourceforge.net
-IUSE=elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=virtual/jre-1.5 dev-java/itext:0 dev-java/jgoodies-forms:0 >=dev-java/java-config-2.2.0-r3
-SLOT=0
-SRC_URI=mirror://sourceforge/jpdftweak/jpdftweak-src-0.9.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=3b5bec4f4fcfc019714763ffc2ff10df
diff --git a/app-text/jpdftweak/Manifest b/app-text/jpdftweak/Manifest
new file mode 100644
index 000000000000..be6d37b363ae
--- /dev/null
+++ b/app-text/jpdftweak/Manifest
@@ -0,0 +1,3 @@
+DIST jpdftweak-src-0.9.zip 129611 BLAKE2B 182e81323144cf543ff50c2f95acd009ae53eedf838a00cd8596a2db0c53858fc56ed424e3719a0eedd653be3492a2e4e3af6971ab30a77dbab878f74892c342 SHA512 55e68ba13876f2ac24b635af955d3054fed00135f05532625f40a245cc39176398bf6c0bf4a393e9e475604933727a7fdb270b94b38390b8ca9a41447d6652f7
+EBUILD jpdftweak-0.9-r1.ebuild 783 BLAKE2B a0569ac22d99b4f52edb80d4f398090761a95a3ffb668f371d46e8f35ea6c0c41029aec2ecebbb3d41c5093aa3f0bdd43f565e124b08dc6e12dc2d5968ccd0b6 SHA512 e7397a887b2ae55c0c78313a9e7c7477bd6e4358e1bd26bba91f5d25badab1c5bc42e177fae9e04461d3b8b5723f76d88d33c574135e2f337477acf46669a865
+MISC metadata.xml 824 BLAKE2B 80220af06b55e48ee184270ede7ba40bba306983d625ddfcd78f0c4aa3e772166c2f3550439c0c2910420d0d55f859f0e51a03651eda5dc4412c678cedc96494 SHA512 7b6006308a845e6180404f16a24c1075a7a5ac27b2f2aa861ddfd2fa367d172817853dd531808e8d4e1fcdfe017d9af3d62f9670e7f96494c60c85dae9de7d1a
diff --git a/app-text/jpdftweak/jpdftweak-0.9-r1.ebuild b/app-text/jpdftweak/jpdftweak-0.9-r1.ebuild
new file mode 100644
index 000000000000..d7923408a8da
--- /dev/null
+++ b/app-text/jpdftweak/jpdftweak-0.9-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Swiss Army Knife for PDF files"
+HOMEPAGE="http://jpdftweak.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${PN}-src-${PV}.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+COMMON_DEPEND="dev-java/itext:0
+	dev-java/jgoodies-forms:0"
+
+RDEPEND=">=virtual/jre-1.5
+	${COMMON_DEPEND}"
+
+DEPEND=">=virtual/jdk-1.5
+	app-arch/unzip:0
+	${COMMON_DEPEND}"
+
+S="${WORKDIR}"
+
+java_prepare() {
+	cd lib || die
+
+	java-pkg_jar-from jgoodies-forms forms.jar
+	java-pkg_jar-from itext iText.jar itext.jar
+}
+
+src_install() {
+	java-pkg_dojar ${PN}.jar
+	java-pkg_dolauncher ${PN} --main ${PN}.Main
+
+	dodoc README.txt
+	dohtml manual/*
+}
diff --git a/app-text/jpdftweak/metadata.xml b/app-text/jpdftweak/metadata.xml
new file mode 100644
index 000000000000..6909e49b5a32
--- /dev/null
+++ b/app-text/jpdftweak/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<longdescription>
+		jPDF Tweak is a Java Swing application that can combine, split, rotate, 
+		reorder, watermark, encrypt, sign, and otherwise tweak PDF files.
+
+		You can use it to make printable booklets from your PDFs, to add PDF 
+		bookmarks, effects (page transitions), to combine multiple PDF files, 
+		to watermark them, to rotate pages that do not fit, to attach files to 
+		your PDF, to encrypt and sign your PDFs, to change metadata (like 
+		author or keywords), and much more.
+	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">jpdftweak</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/kbibtex-0.8.1 b/app-text/kbibtex-0.8.1
deleted file mode 100644
index 3de6b0f6d7b6..000000000000
--- a/app-text/kbibtex-0.8.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kitemviews-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwallet-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=dev-qt/qtxmlpatterns-5.9.4:5 app-text/poppler[qt5] dev-libs/icu:= virtual/tex-base webengine? ( >=dev-qt/qtwebengine-5.9.4:5[widgets] ) webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) zotero? ( app-crypt/qca[qt5(+)] dev-libs/qoauth:5 ) sys-devel/make >=dev-util/cmake-3.9.6 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.46.0:5 handbook? ( >=kde-frameworks/kdoctools-5.46.0:5 ) test? ( >=dev-qt/qttest-5.9.4:5 ) >=dev-qt/qtcore-5.9.4:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=BibTeX editor to edit bibliographies used with LaTeX
-EAPI=6
-HOMEPAGE=https://userbase.kde.org/KBibTeX
-IUSE=webengine webkit zotero test debug +handbook test
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.46.0:5 >=kde-frameworks/kconfig-5.46.0:5 >=kde-frameworks/kconfigwidgets-5.46.0:5 >=kde-frameworks/kcoreaddons-5.46.0:5 >=kde-frameworks/kcrash-5.46.0:5 >=kde-frameworks/ki18n-5.46.0:5 >=kde-frameworks/kiconthemes-5.46.0:5 >=kde-frameworks/kio-5.46.0:5 >=kde-frameworks/kitemviews-5.46.0:5 >=kde-frameworks/kjobwidgets-5.46.0:5 >=kde-frameworks/kparts-5.46.0:5 >=kde-frameworks/kservice-5.46.0:5 >=kde-frameworks/ktextwidgets-5.46.0:5 >=kde-frameworks/kwallet-5.46.0:5 >=kde-frameworks/kwidgetsaddons-5.46.0:5 >=kde-frameworks/kxmlgui-5.46.0:5 >=dev-qt/qtdbus-5.9.4:5 >=dev-qt/qtgui-5.9.4:5 >=dev-qt/qtnetwork-5.9.4:5 >=dev-qt/qtwidgets-5.9.4:5 >=dev-qt/qtxml-5.9.4:5 >=dev-qt/qtxmlpatterns-5.9.4:5 app-text/poppler[qt5] dev-libs/icu:= virtual/tex-base webengine? ( >=dev-qt/qtwebengine-5.9.4:5[widgets] ) webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) zotero? ( app-crypt/qca[qt5(+)] dev-libs/qoauth:5 ) !app-text/kbibtex:4 dev-tex/bibtex2html x11-misc/shared-mime-info >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.46.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.9.4:5
-REQUIRED_USE=?? ( webengine webkit )
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/KBibTeX/0.8.1/kbibtex-0.8.1.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	kde5	5656d5465214c16946f295475046ea21	kde5-functions	475002208a2233f4ab555934b2b0ed0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5e7220f431cd892d071f14a8af5650f5
diff --git a/app-text/kbibtex/Manifest b/app-text/kbibtex/Manifest
new file mode 100644
index 000000000000..dbbe03ff611f
--- /dev/null
+++ b/app-text/kbibtex/Manifest
@@ -0,0 +1,3 @@
+DIST kbibtex-0.8.1.tar.xz 4060484 BLAKE2B 1dd100b0c469955f273907d79765268fdefdd4ae05faa851f4c1823c41f312810f2992113cda97c1f8e19c4c3bf35e7e79c6a0bc12cde60995edbd903a9b5ae3 SHA512 73c318b1d29de98761f43de9828a48e943528f413c6c2489e916f88ef4ba1424a300bd9eddd10fa763985322248ef863cad1b8cfc681f083eb9acdabd6c6dfea
+EBUILD kbibtex-0.8.1.ebuild 1939 BLAKE2B 391e01cd97909347fd764878562f327754be35dda6ca3f9d1e6e657638f75bb477bc583747dad0dff3d940842d1806dcf6e3937c4c5eb34b4b0b355f2ba299b8 SHA512 59844f3d031fdac85f1bbfbbb352fe693dd7b4030bb938fcb26543a4a81787ca54e36aff184dfb2ad9d881cd2054e95a4d3857f9d10197a3dec44521cba44356
+MISC metadata.xml 518 BLAKE2B e10a5e38918c43315c3804c787f80c6df00f7a37da896784a1ee932a90c7f6c15d8a1fc69313314dadaf01461b65e6be78b189226ccae9fda5422950a86edb63 SHA512 be7be6b52a067ed23384344706adaa13cd06667e768a9b5adc2d93b2edeb5feec426dc83395a226219a469bb5fbe99d378b5e1c87ea82e17a05c9751f03e12bb
diff --git a/app-text/kbibtex/kbibtex-0.8.1.ebuild b/app-text/kbibtex/kbibtex-0.8.1.ebuild
new file mode 100644
index 000000000000..498364c65ead
--- /dev/null
+++ b/app-text/kbibtex/kbibtex-0.8.1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="optional"
+KDE_TEST="true"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="BibTeX editor to edit bibliographies used with LaTeX"
+HOMEPAGE="https://userbase.kde.org/KBibTeX"
+if [[ ${KDE_BUILD_TYPE} != live ]]; then
+	SRC_URI="mirror://kde/stable/KBibTeX/${PV}/${P}.tar.xz"
+	KEYWORDS="amd64 x86"
+fi
+
+LICENSE="GPL-2"
+IUSE="webengine webkit zotero"
+
+REQUIRED_USE="?? ( webengine webkit )"
+
+DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	$(add_qt_dep qtxmlpatterns)
+	app-text/poppler[qt5]
+	dev-libs/icu:=
+	virtual/tex-base
+	webengine? ( $(add_qt_dep qtwebengine 'widgets') )
+	webkit? ( $(add_qt_dep qtwebkit) )
+	zotero? (
+		app-crypt/qca[qt5(+)]
+		dev-libs/qoauth:5
+	)
+"
+RDEPEND="${DEPEND}
+	!app-text/kbibtex:4
+	dev-tex/bibtex2html
+	x11-misc/shared-mime-info
+"
+
+RESTRICT+=" test"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package webengine Qt5WebEngineWidgets)
+		$(cmake-utils_use_find_package webkit Qt5WebKitWidgets)
+		$(cmake-utils_use_find_package zotero Qca-qt5)
+	)
+
+	kde5_src_configure
+}
+
+pkg_postinst() {
+	kde5_pkg_postinst
+
+	if ! has_version "kde-apps/okular:${SLOT}" ; then
+		elog "For PDF or PostScript document preview support, please install kde-apps/okular:${SLOT}"
+	fi
+}
diff --git a/app-text/kbibtex/metadata.xml b/app-text/kbibtex/metadata.xml
new file mode 100644
index 000000000000..d2af51c141e2
--- /dev/null
+++ b/app-text/kbibtex/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+	<use>
+		<flag name="webengine">Use <pkg>dev-qt/qtwebengine</pkg> for HTML previews</flag>
+		<flag name="webkit">Use <pkg>dev-qt/qtwebkit</pkg> for HTML previews</flag>
+		<flag name="zotero">Enable support for synchronisation with zotero.org web service</flag>
+	</use>
+</pkgmetadata>
diff --git a/app-text/kchmviewer-7.7-r1 b/app-text/kchmviewer-7.7-r1
deleted file mode 100644
index 8a7307cd56e7..000000000000
--- a/app-text/kchmviewer-7.7-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm
-DEPEND=dev-libs/chmlib dev-libs/libzip:= dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5
-DESCRIPTION=Feature rich chm file viewer, based on Qt
-EAPI=6
-HOMEPAGE=https://www.ulduzsoft.com/kchmviewer/
-KEYWORDS=amd64 x86
-LICENSE=GPL-3+
-RDEPEND=dev-libs/chmlib dev-libs/libzip:= dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtprintsupport:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5
-SLOT=0
-SRC_URI=mirror://sourceforge/kchmviewer/kchmviewer-7.7.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=01c758910f04bae6463036e9edf3c5a2
diff --git a/app-text/kchmviewer/Manifest b/app-text/kchmviewer/Manifest
new file mode 100644
index 000000000000..366f626ec757
--- /dev/null
+++ b/app-text/kchmviewer/Manifest
@@ -0,0 +1,5 @@
+AUX kchmviewer-7.7-force-qtwebkit.patch 960 BLAKE2B da573cf4eb4a2668b7d37356df270f002cda5f1ca54055fbed36dc9f95bd8373934d8befa2b635f23074e0ce69cb9707cfd41cfab223c6254cb68c4fdade8a3b SHA512 bb93256211bc7390acb52b142da5cd12dc4c8220fdf745c6b5dcc93bfba8880272ad0134c868409afe5fe6ea3bcae47cebe1aaab13cdead6556bf15bd838b549
+AUX kchmviewer-7.7-underlinking.patch 300 BLAKE2B 02d86fad61fe727e5bebdd8b340bd9a70ccde78d04ef65b2dcbc517a76304b5788412d16ba727bc7575087a9c0229c814550c25f80edba6ca6332a9dfd366f8d SHA512 004056e7ba232a80f76fe7a8955a2ef621d8148f7c594c78ae3136dca7ca8d3c39e8ab3081f75b3181bef3c9a720601cc7e65ba371b95853faa4bf845e80d0ec
+DIST kchmviewer-7.7.tar.gz 345952 BLAKE2B 7c42f3d05c7a46163d4e63af271ba73932dc2f7eb20e4e0c2c5dc2b335f488593288e4dd5b0a03b75ee7a008836a16b86ec8f47aa6d076b6351d48290a23bdef SHA512 e217db388f99142114e4de6735916d46c9d89f144390b58dffd739ed7246048c23af75c2eb9effba3e942a21564f9205265155a93a21d6343bea83a26fd99070
+EBUILD kchmviewer-7.7-r1.ebuild 958 BLAKE2B f0eb5ffbe23d8bebab285411619f6cb7347461558a1bde4d1b487eb3408349d2012a0c73d31e2026269ca33371304ee417125d3accd040862ade78edac84d04d SHA512 960de65730bdd95a7db91a6d77f90f3b547050ec9f74246053d6fbf6daf57ef885b8d85c20d6bf7fe5276b94fca6254706fad64cca29e229b0f4b9bf87a29b8b
+MISC metadata.xml 979 BLAKE2B 0b17a5a299dbe5f72ee4a1bfd7262447325ca4276400e0bd159af969e4f9590a47c20d777121b31496e5c2b51e4d8684662dd79c4ee6bc116c71453cd7639834 SHA512 e7786881fccd93bebb9ee1e0904d18b9eb1c6604f36aecd44673f3cd59c09955a9bde08bf765efee3422bc9c514d59040375e770f960163640acc0577642d399
diff --git a/app-text/kchmviewer/files/kchmviewer-7.7-force-qtwebkit.patch b/app-text/kchmviewer/files/kchmviewer-7.7-force-qtwebkit.patch
new file mode 100644
index 000000000000..897c62a998c2
--- /dev/null
+++ b/app-text/kchmviewer/files/kchmviewer-7.7-force-qtwebkit.patch
@@ -0,0 +1,26 @@
+Gentoo still ships QtWebKit in 5.6 and later, so don't try and fail to use QtWebEngine.
+
+--- a/src/src.pro
++++ b/src/src.pro
+@@ -113,21 +113,11 @@
+ }

+ 

+ greaterThan(QT_MAJOR_VERSION, 4) {

+-    # Qt 5

+-    greaterThan(QT_MINOR_VERSION, 5) {

+-        # Qt 5.6+

+-        error("You use Qt5.6+ - QWebEngine is not yet suitable for kchmviewer and is not supported")

+-        QT += webengine webenginewidgets

+-        DEFINES += USE_WEBENGINE

+-        SOURCES += viewwindow_webengine.cpp dataprovider_qwebengine.cpp

+-        HEADERS += dataprovider_qwebengine.h viewwindow_webengine.h

+-    } else {

+         # Qt 5.0-5.5

+         QT += webkit webkitwidgets

+         DEFINES += USE_WEBKIT

+         SOURCES += viewwindow_webkit.cpp dataprovider_qwebkit.cpp

+         HEADERS += dataprovider_qwebkit.h viewwindow_webkit.h

+-    }

+ } else {

+     message("Qt4 is not supported anymore, please do not report any errors")

+     QT += webkit webkitwidgets

diff --git a/app-text/kchmviewer/files/kchmviewer-7.7-underlinking.patch b/app-text/kchmviewer/files/kchmviewer-7.7-underlinking.patch
new file mode 100644
index 000000000000..75bfed89cbdd
--- /dev/null
+++ b/app-text/kchmviewer/files/kchmviewer-7.7-underlinking.patch
@@ -0,0 +1,11 @@
+--- a/src/src.pro
++++ b/src/src.pro
+@@ -108,7 +108,7 @@
+     HEADERS += dbus_interface.h

+     SOURCES += dbus_interface.cpp

+     CONFIG += dbus

+-    LIBS += ../lib/libebook/libebook.a

++    LIBS += ../lib/libebook/libebook.a -lchm -lzip

+     POST_TARGETDEPS += ../lib/libebook/libebook.a

+ }

+ 

diff --git a/app-text/kchmviewer/kchmviewer-7.7-r1.ebuild b/app-text/kchmviewer/kchmviewer-7.7-r1.ebuild
new file mode 100644
index 000000000000..f9d3ca256aad
--- /dev/null
+++ b/app-text/kchmviewer/kchmviewer-7.7-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils qmake-utils xdg-utils
+
+DESCRIPTION="Feature rich chm file viewer, based on Qt"
+HOMEPAGE="https://www.ulduzsoft.com/kchmviewer/"
+SRC_URI="mirror://sourceforge/kchmviewer/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="
+	dev-libs/chmlib
+	dev-libs/libzip:=
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtwebkit:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-force-qtwebkit.patch"
+	"${FILESDIR}/${P}-underlinking.patch"
+)
+
+src_configure() {
+	eqmake5
+}
+
+src_install() {
+	dodoc ChangeLog DBUS-bindings FAQ README
+	doicon packages/kchmviewer.png
+	dobin bin/kchmviewer
+	domenu packages/kchmviewer.desktop
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/app-text/kchmviewer/metadata.xml b/app-text/kchmviewer/metadata.xml
new file mode 100644
index 000000000000..2c14212dc2e8
--- /dev/null
+++ b/app-text/kchmviewer/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+	<longdescription lang="en">
+		KchmViewer is a chm (MS HTML help file format) viewer It uses Trolltech Qt
+		widget library with optional KDE libraries. It does not require KDE, but may
+		be compiled with full KDE support, including KDE widgets and KIO/KHTML. The
+		main advantage of KchmViewer is extra support for non-English languages.
+		Unlike other viewers, KchmViewer in most cases is able to detect help file
+		encoding, correctly shows tables of context of Russian, Korean, Chinese and
+		Japanese help files, and does correct search in non-English help files
+		(search for MBCS languages - ja/ko/ch is still in progress). 
+	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">kchmviewer</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/keepnote-0.7.9-r2 b/app-text/keepnote-0.7.9-r2
deleted file mode 100644
index 81d72bfd56b4..000000000000
--- a/app-text/keepnote-0.7.9-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=sys-apps/sed-4 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=A note taking application
-EAPI=5
-HOMEPAGE=http://keepnote.org/
-IUSE=python_targets_python2_7
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-python/pygobject:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] x11-misc/xdg-utils python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite,xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://keepnote.org/download-test/keepnote-0.7.9.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=874902d0957236962e0ef10b0b546e4e
diff --git a/app-text/keepnote/Manifest b/app-text/keepnote/Manifest
new file mode 100644
index 000000000000..2ac485a2e3e9
--- /dev/null
+++ b/app-text/keepnote/Manifest
@@ -0,0 +1,4 @@
+AUX keepnote-0.7.8-desktopfile.patch 1195 BLAKE2B 4dd5dd1eaa5893b7aae496215fb7c6206632b431025fbf86354391baefc3cdf64a4852e0aaf7cfc538be6dc56d2d89336b465491c129b77aaae4893858e4cb00 SHA512 f2b59d656573bd052fe2b26687338939ace7cfbbf71a0ef051c45b829662ccd601f08a406de87cbd37391dfe2743cda13b58bced26fa2186688289a008f8d1be
+DIST keepnote-0.7.9.tar.gz 786634 BLAKE2B e14b41f6d5e983ef4ef27e10a2b39f8972cfd47c34a15f7efd97c1c809a29c50554d5edd5fcd0ff8624861fc0a33662c6f00eef675519fdab11d8cef9b67da1d SHA512 1d818fab1fea69b6369209dbaad403b2431352ba359d4f233ab412fd56a57e970b6b6adf63201811ce45faee471cf3521c6b4ccecc67f3befc727b2e77189ac5
+EBUILD keepnote-0.7.9-r2.ebuild 854 BLAKE2B 950323f0c34cd0dc4511b215db9e7ff5906f37105dfa168568dfccd1d13c6ffdd347eefdcfd4cf7d907c5272af045d51c0518b1551f49044c093c7377848d680 SHA512 f3c26859af94cae7c6dda7255f2d03d105dba5493e3a468b65617c062dbb9d5c23f651b11b0b6e68aba0b59da4a0b18edeae23b5f54e37d76db273fff48286ca
+MISC metadata.xml 785 BLAKE2B 03dfc70d07b076f7769481f33bc2df9c1cb6458579486495c49f43f670fcc31b7f246b5555366b2f0f01e16d44b507929c04400d41b9bcd89beea9df1a34b1e8 SHA512 7d04a216120b8d52d73e4a4a1f8972b59d63c50c23f398be9ff7a8b0d5d37d793b5c7269579d05fd517da7c813ed68eb3381613604b1057c39358700419c072e
diff --git a/app-text/keepnote/files/keepnote-0.7.8-desktopfile.patch b/app-text/keepnote/files/keepnote-0.7.8-desktopfile.patch
new file mode 100644
index 000000000000..7c06aab2c91d
--- /dev/null
+++ b/app-text/keepnote/files/keepnote-0.7.8-desktopfile.patch
@@ -0,0 +1,30 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Tue Aug 14 07:08:05 UTC 2012
+Subject: desktop file
+
+respect fd.o desktop entry spec
+
+# desktop-file-validate keepnote.desktop
+keepnote.desktop: warning: key "Encoding" in group "Desktop Entry" is deprecated
+keepnote.desktop: warning: value "Note-taking Application" for key "Comment" in group "Desktop Entry" looks redundant with value "Note-taking Application" of key "GenericName"
+keepnote.desktop: warning: value "Program na spr?vu pozn?mok" for key "Comment[sk]" in group "Desktop Entry" looks redundant with value "Program na spr?vu pozn?mok" of key "GenericName[sk]"
+keepnote.desktop: error: value "Office" for string list key "Categories" in group "Desktop Entry" does not have a semicolon (';') as trailing character
+
+--- desktop/keepnote.desktop
++++ desktop/keepnote.desktop
+@@ -1,14 +1,11 @@
+ [Desktop Entry]
+-Encoding=UTF-8
+ Type=Application
+ Name=KeepNote
+ GenericName=Note-taking Application
+ GenericName[sk]=Program na správu poznámok
+-Comment=Note-taking Application
+-Comment[sk]=Program na správu poznámok
+ Icon=keepnote
+ Exec=keepnote %f
+-Categories=Office
++Categories=Office;
+ #MimeType=
+ Terminal=false
+ StartupNotify=false
diff --git a/app-text/keepnote/keepnote-0.7.9-r2.ebuild b/app-text/keepnote/keepnote-0.7.9-r2.ebuild
new file mode 100644
index 000000000000..d991974ffc3d
--- /dev/null
+++ b/app-text/keepnote/keepnote-0.7.9-r2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite,xml"
+
+inherit gnome2-utils distutils-r1
+
+DESCRIPTION="A note taking application"
+HOMEPAGE="http://keepnote.org/"
+SRC_URI="http://keepnote.org/download-test/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="amd64 x86"
+SLOT="0"
+IUSE=""
+
+RDEPEND="dev-python/pygobject:2[${PYTHON_USEDEP}]
+	dev-python/pygtk:2[${PYTHON_USEDEP}]
+	x11-misc/xdg-utils"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.7.8-desktopfile.patch )
+DOCS=( CHANGES )
+
+python_test() {
+	"${PYTHON}" test/testing.py || die
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+
+	einfo
+	elog "optional dependencies:"
+	elog "  app-text/gtkspell:2 (spell checking)"
+	einfo
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/app-text/keepnote/metadata.xml b/app-text/keepnote/metadata.xml
new file mode 100644
index 000000000000..406d1cd53480
--- /dev/null
+++ b/app-text/keepnote/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<upstream>
+		<maintainer status="active">
+			<email>rasmus@alum.mit.edu</email>
+			<name>Matt Rasmussen</name>
+		</maintainer>
+		<doc lang="en">http://keepnote.org/manual/</doc>
+		<bugs-to>https://code.google.com/p/keepnote/issues/list</bugs-to>
+	</upstream>
+	<longdescription lang="en">
+		KeepNote is a note taking application . With KeepNote, you can
+		store your class notes, TODO lists, research notes, journal entries,
+		paper outlines, etc in a simple notebook hierarchy with rich-text
+		formatting, images, and more. Using full-text search, you can
+		retrieve any note for later reference.
+	</longdescription>
+</pkgmetadata>
diff --git a/app-text/krop-0.4.13.5 b/app-text/krop-0.4.13.5
deleted file mode 100644
index ddf670de4ba2..000000000000
--- a/app-text/krop-0.4.13.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=A tool to crop PDF files
-EAPI=6
-HOMEPAGE=http://arminstraub.com/software/krop
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-python/python-poppler-qt5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/PyPDF2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/PyQt5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~dilfridge/distfiles/krop-0.4.13.5.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=13fa8abc2c94ce29bbe0626a9ceed2d3
diff --git a/app-text/krop/Manifest b/app-text/krop/Manifest
new file mode 100644
index 000000000000..6ea56233a7a3
--- /dev/null
+++ b/app-text/krop/Manifest
@@ -0,0 +1,3 @@
+DIST krop-0.4.13.5.tar.gz 40079 BLAKE2B 9d3505f7d9cbf0eef4ec7a28928f14940e6c0a2fd4499b6c5896fde7b3f7b8a0b84ddc4f9c7735ee348f89e9924a7b8f69a3d4dbfaa4668ac770a0fe8404d469 SHA512 218eb3e256dabcacc53af62b2e704031bd21bedacf2599c4aed7ee3b3847b35741c921a08137b7b6e7295ddfc7f87f4ffbf9d3fec3fb137d1ce36e3945dc6129
+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
new file mode 100644
index 000000000000..108c5f32c840
--- /dev/null
+++ b/app-text/krop/krop-0.4.13.5.ebuild
@@ -0,0 +1,37 @@
+# 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 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/~dilfridge/distfiles/${P}.tar.gz"
+# this is a snapshot of the qt5 branch
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-python/python-poppler-qt5[${PYTHON_USEDEP}]
+	dev-python/PyPDF2[${PYTHON_USEDEP}]
+	dev-python/PyQt5[${PYTHON_USEDEP}]"
+
+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/metadata.xml b/app-text/krop/metadata.xml
new file mode 100644
index 000000000000..49bbc63e4ae6
--- /dev/null
+++ b/app-text/krop/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>dilfridge@gentoo.org</email>
+</maintainer>
+<maintainer type="project">
+	<email>printing@gentoo.org</email>
+	<name>Gentoo Printing Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-text/landslide-1.1.3 b/app-text/landslide-1.1.3
deleted file mode 100644
index 418e0e4fbc22..000000000000
--- a/app-text/landslide-1.1.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Generates a slideshow using the slides that power the html5-slides presentation
-EAPI=5
-HOMEPAGE=https://github.com/adamzap/landslide
-IUSE=examples python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=dev-python/docutils[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/markdown[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygments[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/adamzap/landslide/tarball/v1.1.3 -> landslide-1.1.3.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c3e744c893017b0d325c1049d517a86b
diff --git a/app-text/landslide/Manifest b/app-text/landslide/Manifest
new file mode 100644
index 000000000000..741e25f52065
--- /dev/null
+++ b/app-text/landslide/Manifest
@@ -0,0 +1,3 @@
+DIST landslide-1.1.3.tar.gz 151003 BLAKE2B 471cc83cbfc1c7ddc437b88514fb48632016e0915fc27c65d502a71b94f83a1184de8a7dbfaf2af8b75963e687c1af903add48e5ac8893308d9cfa07fdcc4c61 SHA512 2b29c416f8af04c0bf048060e0fe67b0b6a5e293485c5e3f68b9d1ce9d63ef66ca3bc58a96f65705c6918542932ef0a2fa6072b17c4c01cfc1975d283b417152
+EBUILD landslide-1.1.3.ebuild 819 BLAKE2B ce8070f581d056ca6a7e2b58dd3eaf2681f789b8bfb230594ad3ae4a4334580253d275512a66297ebeb2c62148bc7eaaedeaa2568ab927011db6cc3f90d6bbb9 SHA512 0821de505a6fd2b0e68ae3ac30faff81e71293af4097bc2c952e91a0f9e52dd02b93cbfcb68d116027436c4769422b2fcb5d4d395566f94a2c98973825f8dddb
+MISC metadata.xml 298 BLAKE2B 15316fb3bd0eb0be967bec08510269e31406e72c3cc7623d21cc2334bfb36b8031bf304c4627b085fa64cfec15964cf9a6a486ba29bf312facf1589f36cd9819 SHA512 19a5bf1f42b94a00856b856fc0120024df40a4394a17e61fdacc817d1b355b601595a27cc0f814d3f6b436775799b44aa4f5090daa91452b55d4760e8c89b8d0
diff --git a/app-text/landslide/landslide-1.1.3.ebuild b/app-text/landslide/landslide-1.1.3.ebuild
new file mode 100644
index 000000000000..9d41221f1cf3
--- /dev/null
+++ b/app-text/landslide/landslide-1.1.3.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1 vcs-snapshot
+
+DESCRIPTION="Generates a slideshow using the slides that power the html5-slides presentation"
+HOMEPAGE="https://github.com/adamzap/landslide"
+SRC_URI="https://github.com/adamzap/landslide/tarball/v${PV} -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples"
+
+DEPEND=""
+RDEPEND="
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/markdown[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	"
+
+python_install_all() {
+	use examples && EXAMPLES=( examples/. )
+	distutils-r1_python_install_all
+}
diff --git a/app-text/landslide/metadata.xml b/app-text/landslide/metadata.xml
new file mode 100644
index 000000000000..3304ab920105
--- /dev/null
+++ b/app-text/landslide/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>naota@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">adamzap/landslide</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/languagetool-3.5-r1 b/app-text/languagetool-3.5-r1
deleted file mode 100644
index 029d3bb4b6b3..000000000000
--- a/app-text/languagetool-3.5-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=app-arch/unzip >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=A proof-reading tool for many languages
-EAPI=6
-HOMEPAGE=https://www.languagetool.org/
-IUSE=elibc_FreeBSD
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=virtual/jre-1.8 dev-java/commons-cli:1 dev-java/commons-collections:4 dev-java/commons-io:1 dev-java/commons-lang:2.1 dev-java/commons-logging:0 dev-java/guava:20 dev-java/hamcrest-core:1.3 dev-java/jackson:2 dev-java/jackson-databind:2 dev-java/jcommander:0 dev-java/jna:4 dev-java/slf4j-api:0 dev-java/slf4j-nop:0 >=dev-java/java-config-2.2.0-r3
-SLOT=0
-SRC_URI=https://www.languagetool.org/download/LanguageTool-3.5.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=b3817ac7edb3677c95666e3e2ff94c60
diff --git a/app-text/languagetool/Manifest b/app-text/languagetool/Manifest
new file mode 100644
index 000000000000..6fd45fe2f895
--- /dev/null
+++ b/app-text/languagetool/Manifest
@@ -0,0 +1,3 @@
+DIST LanguageTool-3.5.zip 93540212 BLAKE2B 166be74df8424692d637d1f23f2044492741984feb8c863aa363aca07ca9903c1e5934e4026a4e8c7b135320053808f1735ae5800a3964e9d75381368a8c5b7b SHA512 ad49dd292ca6841e1ef439b2dbe55748f621333b418bd6a596534cd5b2cb7019170c98046c8e2c68c3d75a9e5d132cf329de6481eaaccb8f78aae2233bdb8e45
+EBUILD languagetool-3.5-r1.ebuild 1403 BLAKE2B 1fff1dbc72a71536804c645cdbf64e21ebe7ab3c160b29f93474bd32c2a5ef8ff375fe27d45252b530218f029348204696dd326109f4e1898875c577cae7ef1f SHA512 96db2123e9d72b3017fcae610aa53ac8fafff57c0f72ac5240a44890842fca9dba5cca9cfcd9cfe4a522d80311f6e3aaefe8d2c1bb9be045444a9e7b01be7e23
+MISC metadata.xml 255 BLAKE2B c3c51ff357cdf3ea565d7f4bf7cb236342061e471b67eacc0a436c26d52532ce7499657a76fc92a845321318a65f9eb877573104341ddae66dc3a554a35f7362 SHA512 305ae93d2bb3da79ee181cf36bb0ca2bbac016c20555967d7281cd5c0edfc26c1450dacd7a7de57078650dab0e815be9169c0b25a24d71488185f71ae8834167
diff --git a/app-text/languagetool/languagetool-3.5-r1.ebuild b/app-text/languagetool/languagetool-3.5-r1.ebuild
new file mode 100644
index 000000000000..bcf5c6bfd5d4
--- /dev/null
+++ b/app-text/languagetool/languagetool-3.5-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit java-pkg-2
+
+MY_PN=LanguageTool
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="A proof-reading tool for many languages"
+HOMEPAGE="https://www.languagetool.org/"
+SRC_URI="https://www.languagetool.org/download/${MY_P}.zip"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+CP_DEPEND="
+	dev-java/commons-cli:1
+	dev-java/commons-collections:4
+	dev-java/commons-io:1
+	dev-java/commons-lang:2.1
+	dev-java/commons-logging:0
+	dev-java/guava:20
+	dev-java/hamcrest-core:1.3
+	dev-java/jackson:2
+	dev-java/jackson-databind:2
+	dev-java/jcommander:0
+	dev-java/jna:4
+	dev-java/slf4j-api:0
+	dev-java/slf4j-nop:0
+"
+
+RDEPEND=">=virtual/jre-1.8
+	${CP_DEPEND}"
+
+DEPEND="app-arch/unzip"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	default
+	rm -v libs/{commons,hamcrest,guava,jackson,jcommander,jna,junit,slf4j}*.jar || die
+
+	# Loads of bundled stuff :(
+	#java-pkg-2_src_prepare
+}
+
+src_compile() { :; }
+
+src_install() {
+	java-pkg_dojar *.jar libs/*.jar
+
+	local DIR=/usr/share/${PN}/lib/language-modules
+	java-pkg_addcp "${EPREFIX}${DIR}"
+	insinto ${DIR}
+	doins -r org META-INF
+
+	java-pkg_dolauncher ${PN} --main org.${PN}.commandline.Main
+	java-pkg_dolauncher ${PN}-gui --main org.${PN}.gui.Main
+
+	dodoc CHANGES.md README.md
+
+	unset MY_DEPEND
+	java-pkg_gen-cp MY_DEPEND
+	java-pkg_register-dependency "${MY_DEPEND}"
+}
diff --git a/app-text/languagetool/metadata.xml b/app-text/languagetool/metadata.xml
new file mode 100644
index 000000000000..84f8f1cf6bcb
--- /dev/null
+++ b/app-text/languagetool/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>vim@gentoo.org</email>
+    <name>Gentoo Vim Project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-text/lcdf-typetools-2.106 b/app-text/lcdf-typetools-2.106
deleted file mode 100644
index 239d063a905b..000000000000
--- a/app-text/lcdf-typetools-2.106
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=kpathsea? ( virtual/tex-base dev-libs/kpathsea ) virtual/pkgconfig
-DESCRIPTION=Font utilities for eg manipulating OTF
-EAPI=5
-HOMEPAGE=http://www.lcdf.org/type/#typetools
-IUSE=+kpathsea
-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
-LICENSE=GPL-2
-RDEPEND=kpathsea? ( virtual/tex-base dev-libs/kpathsea )
-SLOT=0
-SRC_URI=http://www.lcdf.org/type/lcdf-typetools-2.106.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ce3e1afca2e1c440eccfc152beee8fa7
diff --git a/app-text/lcdf-typetools-2.107 b/app-text/lcdf-typetools-2.107
deleted file mode 100644
index eb3102246307..000000000000
--- a/app-text/lcdf-typetools-2.107
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=kpathsea? ( virtual/tex-base dev-libs/kpathsea ) virtual/pkgconfig
-DESCRIPTION=Font utilities for eg manipulating OTF
-EAPI=5
-HOMEPAGE=http://www.lcdf.org/type/#typetools
-IUSE=+kpathsea
-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
-LICENSE=GPL-2
-RDEPEND=kpathsea? ( virtual/tex-base dev-libs/kpathsea )
-SLOT=0
-SRC_URI=http://www.lcdf.org/type/lcdf-typetools-2.107.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=fbeca622c1dd8e26645da8a791bac274
diff --git a/app-text/lcdf-typetools/Manifest b/app-text/lcdf-typetools/Manifest
new file mode 100644
index 000000000000..51e8468a761e
--- /dev/null
+++ b/app-text/lcdf-typetools/Manifest
@@ -0,0 +1,5 @@
+DIST lcdf-typetools-2.106.tar.gz 643503 BLAKE2B cb016da74dfbad92808292842de653badec4dd3b703fee5e177016856a795e1383ceeed68de668846cce167b7b9c74bd7e0b17ea3a60b2f9b9caa0b73444e02d SHA512 039215132585214e6518864161885f7a06f08f8b36b002a961b1d83182e388b31eb034eaa4466ba56a2af52e1cfb202e88f004be17c22df1343f94481e3114cf
+DIST lcdf-typetools-2.107.tar.gz 652445 BLAKE2B bbbc428673c8e036f8d3be8ec80dbcf8892f60976fee7f11d622af8442c4d3eda0e118d47b364f55fe0dc8b53062ece0926be1d67e6627500a787bce810c074c SHA512 be54d4346d567c640b260dc513854085901af96b82701fccb8f0feae4b373ac69962c568a648515eb9ebfcabc828359ab2d742947ccdf9422643b0d889961ff3
+EBUILD lcdf-typetools-2.106.ebuild 890 BLAKE2B 9094d210f3bd6576fbd2810906252a3353b40b52ededad56b6e8ba49e0c48790e6b9dd4749137c681349f6125b7e6b4b94407daed968b7eeaeec4e8998c3a3bb SHA512 7775bda480cbbcb9a19575a10fd5b5e9081ccb3aa0e4a9419782662caf4926e2c4ff3498671232c6fd476c2d5a1f4cbdacd33b8626358700e9316b951d2fbe23
+EBUILD lcdf-typetools-2.107.ebuild 899 BLAKE2B 4d6c782a7fa16fd91b831d2b20aa691d05cb220af20dc66969bbb2f25b93fe5f20ec96c53de0d9b98590d5f14ff4ee3ec128427af31d26cb18d523ff4962c258 SHA512 f98c7da549aefa9cf75b4dd9b6d7129fbafb954756995af8e2628558a120205071d2bbff8de92cdb3e274b8501c11ae73f4ba7fed5cce2bb0fb0b3d30869977e
+MISC metadata.xml 794 BLAKE2B c611036ee3c2daf88b72b026f0d8bec0e05595db2f73df051fb37793eda6304e1a32137e7759028ef4eb75bc56426d6ee2649d5384bbcc41c2da56d32a647b8e SHA512 9ae4e29814e34012d731aacc0a8b4a38649c95a988049f3fc10c7f260cb6ebcc57caa0a93d21eb8e66e64207673842ab7ab2fb71792ed3d537b7eca891609cba
diff --git a/app-text/lcdf-typetools/lcdf-typetools-2.106.ebuild b/app-text/lcdf-typetools/lcdf-typetools-2.106.ebuild
new file mode 100644
index 000000000000..7b13fdda8e33
--- /dev/null
+++ b/app-text/lcdf-typetools/lcdf-typetools-2.106.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit toolchain-funcs flag-o-matic
+
+DESCRIPTION="Font utilities for eg manipulating OTF"
+SRC_URI="http://www.lcdf.org/type/${P}.tar.gz"
+HOMEPAGE="http://www.lcdf.org/type/#typetools"
+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="GPL-2"
+IUSE="+kpathsea"
+
+RDEPEND="kpathsea? ( virtual/tex-base dev-libs/kpathsea )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_configure() {
+	use kpathsea && has_version '>=dev-libs/kpathsea-6.2.1' && append-cppflags "$($(tc-getPKG_CONFIG) --cflags kpathsea)"
+	econf $(use_with kpathsea)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc NEWS.md README.md ONEWS
+}
diff --git a/app-text/lcdf-typetools/lcdf-typetools-2.107.ebuild b/app-text/lcdf-typetools/lcdf-typetools-2.107.ebuild
new file mode 100644
index 000000000000..d538c2e96354
--- /dev/null
+++ b/app-text/lcdf-typetools/lcdf-typetools-2.107.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit toolchain-funcs flag-o-matic
+
+DESCRIPTION="Font utilities for eg manipulating OTF"
+SRC_URI="http://www.lcdf.org/type/${P}.tar.gz"
+HOMEPAGE="http://www.lcdf.org/type/#typetools"
+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="GPL-2"
+IUSE="+kpathsea"
+
+RDEPEND="kpathsea? ( virtual/tex-base dev-libs/kpathsea )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_configure() {
+	use kpathsea && has_version '>=dev-libs/kpathsea-6.2.1' && append-cppflags "$($(tc-getPKG_CONFIG) --cflags kpathsea)"
+	econf $(use_with kpathsea)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc NEWS.md README.md ONEWS
+}
diff --git a/app-text/lcdf-typetools/metadata.xml b/app-text/lcdf-typetools/metadata.xml
new file mode 100644
index 000000000000..37d6794d875f
--- /dev/null
+++ b/app-text/lcdf-typetools/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+  <email>aballier@gentoo.org</email>
+  <name>Alexis Ballier</name>
+</maintainer>
+<maintainer type="project">
+  <email>fonts@gentoo.org</email>
+  <name>Fonts</name>
+</maintainer>
+<longdescription lang="en">
+  The LCDF Typetools package contains several programs for manipulating
+  PostScript Type 1, Type 1 multiple master, and PostScript-flavored OpenType
+  fonts.  LCDF Typetools includes the mmafm and mmpfb programs, which were
+  formerly distributed as part of a different package (mminstance).
+</longdescription>
+<use>
+  <flag name="kpathsea">Enable integration with kpathsea search library
+    (TeX related)</flag>
+</use>
+</pkgmetadata>
diff --git a/app-text/lesspipe-1.83 b/app-text/lesspipe-1.83
deleted file mode 100644
index 685cea9a052f..000000000000
--- a/app-text/lesspipe-1.83
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install preinst
-DEPEND=dev-lang/perl
-DESCRIPTION=a preprocessor for less
-EAPI=5
-HOMEPAGE=https://github.com/wofr06/lesspipe
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl !<sys-apps/less-483-r1
-SLOT=0
-SRC_URI=https://www-zeuthen.desy.de/~friebel/unix/less/lesspipe-1.83.tar.gz
-_md5_=b1416f1c4a59010ef8b3b85f933b47ac
diff --git a/app-text/lesspipe-1.83-r1 b/app-text/lesspipe-1.83-r1
deleted file mode 100644
index 26add895d83e..000000000000
--- a/app-text/lesspipe-1.83-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install preinst
-DEPEND=dev-lang/perl
-DESCRIPTION=a preprocessor for less
-EAPI=6
-HOMEPAGE=https://github.com/wofr06/lesspipe
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl !<sys-apps/less-483-r1
-SLOT=0
-SRC_URI=https://www-zeuthen.desy.de/~friebel/unix/less/lesspipe-1.83.tar.gz
-_md5_=aed87fc4543477648eb626ac967d59f2
diff --git a/app-text/lesspipe/Manifest b/app-text/lesspipe/Manifest
new file mode 100644
index 000000000000..e8ae572deaf6
--- /dev/null
+++ b/app-text/lesspipe/Manifest
@@ -0,0 +1,4 @@
+DIST lesspipe-1.83.tar.gz 115129 BLAKE2B 24d9e4a226537a44c01c316528e085c6d2d7889b2ae5166d70b85e12c5f0b34e825e039a70071d7e75947e1c63d527decb21973631e910de42c75ec3ee17436c SHA512 c6418ac2bfc2dee9d32d56b0ea4a94954b1431db54fef8b67a9cf7d961cf4a23d87b2f41b2a4560d2333029c6d4ed5c6f399cb635f857bd43f1603993b5cb55d
+EBUILD lesspipe-1.83-r1.ebuild 1134 BLAKE2B 0593da935bf18e040e0d9859e051d867fde05644ba39b7c71bf8ac6a60e9a5581deb74fcb3884c0370e7947f23a6b8802bb6c53685dd2c772139bda286252d49 SHA512 dd9ef9aab18b1b1b3ce69436963ccd577fba41c9e6dedbf69aabf7c61093bb04c0b2ea3bf9e62e25304f8008ea81730407fe410c208a85aece54e6d4a05c400c
+EBUILD lesspipe-1.83.ebuild 1147 BLAKE2B a6d4741acd7713b6231dbaedaacef655a2ac1cb0bf1df903dc771318e42cecb5e6001d3aff9c8d46c344514e9d00112d469aa65e785b7f474be520e671acff67 SHA512 a20258832d481689afaae1a9ac9234ce407e6d5746617a159bb49452bf82965f25039cfd5e65c79175039808a08de30aef7d3c8898ac9a5ca548d838b2489085
+MISC metadata.xml 303 BLAKE2B 57a0ab69188055eec0a29d4f2e331dd027d87b12623099013f889cd4954574772f3279c7fdce85c0fe627083db59a89a6d3daed8266c867b17bbdf84d1fef4a5 SHA512 efdd1963073db285de7f83ff804fdc98876846cb011fa0c8aa65f9b3c1dd6b7cdb039ca6a7a03018edfdff930f817208bb29601bb0c5571fc16d637615e0c7b7
diff --git a/app-text/lesspipe/lesspipe-1.83-r1.ebuild b/app-text/lesspipe/lesspipe-1.83-r1.ebuild
new file mode 100644
index 000000000000..92d625cc3641
--- /dev/null
+++ b/app-text/lesspipe/lesspipe-1.83-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+DESCRIPTION="a preprocessor for less"
+HOMEPAGE="https://github.com/wofr06/lesspipe"
+SRC_URI="https://www-zeuthen.desy.de/~friebel/unix/less/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND="dev-lang/perl"
+RDEPEND="${DEPEND}
+	!<sys-apps/less-483-r1"
+
+src_configure() {
+	# Not an autoconf script.
+	./configure --fixed || die
+}
+
+src_compile() {
+	# Nothing to build.
+	:
+}
+
+src_install() {
+	emake PREFIX="${EPREFIX}/usr" DESTDIR="${D}" install
+	einstalldocs
+}
+
+pkg_preinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		elog "This package installs 'lesspipe.sh' which is distinct from 'lesspipe'."
+		elog "The latter is the Gentoo-specific version.  Make sure to update your"
+		elog "LESSOPEN environment variable if you wish to use this copy."
+	fi
+}
diff --git a/app-text/lesspipe/lesspipe-1.83.ebuild b/app-text/lesspipe/lesspipe-1.83.ebuild
new file mode 100644
index 000000000000..0340429979d4
--- /dev/null
+++ b/app-text/lesspipe/lesspipe-1.83.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+DESCRIPTION="a preprocessor for less"
+HOMEPAGE="https://github.com/wofr06/lesspipe"
+SRC_URI="https://www-zeuthen.desy.de/~friebel/unix/less/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND="dev-lang/perl"
+RDEPEND="${DEPEND}
+	!<sys-apps/less-483-r1"
+
+src_configure() {
+	# Not an autoconf script.
+	./configure --fixed || die
+}
+
+src_compile() {
+	# Nothing to build.
+	:
+}
+
+src_install() {
+	emake PREFIX="${EPREFIX}/usr" DESTDIR="${D}" install
+	dodoc ChangeLog README TODO
+}
+
+pkg_preinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		elog "This package installs 'lesspipe.sh' which is distinct from 'lesspipe'."
+		elog "The latter is the Gentoo-specific version.  Make sure to update your"
+		elog "LESSOPEN environment variable if you wish to use this copy."
+	fi
+}
diff --git a/app-text/lesspipe/metadata.xml b/app-text/lesspipe/metadata.xml
new file mode 100644
index 000000000000..0ad8b1ed80c7
--- /dev/null
+++ b/app-text/lesspipe/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>base-system@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">wofr06/lesspipe</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/letterize-1.3 b/app-text/letterize-1.3
deleted file mode 100644
index 58e6cbe959af..000000000000
--- a/app-text/letterize-1.3
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=Generate English-plausible alphabetic mnemonics for a phone number
-EAPI=4
-HOMEPAGE=http://www.catb.org/~esr/letterize/
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-SLOT=0
-SRC_URI=http://www.catb.org/~esr/letterize/letterize-1.3.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=6aa94c0cefe06b6c6a786ab78d3bf8c9
diff --git a/app-text/letterize-1.4 b/app-text/letterize-1.4
deleted file mode 100644
index d1909dbc77b6..000000000000
--- a/app-text/letterize-1.4
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=Generate English-plausible alphabetic mnemonics for a phone number
-EAPI=5
-HOMEPAGE=http://www.catb.org/~esr/letterize/
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-SLOT=0
-SRC_URI=http://www.catb.org/~esr/letterize/letterize-1.4.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=891cd7ceef0f87363ce1e398aca164ea
diff --git a/app-text/letterize/Manifest b/app-text/letterize/Manifest
new file mode 100644
index 000000000000..f5d0b4d9a538
--- /dev/null
+++ b/app-text/letterize/Manifest
@@ -0,0 +1,5 @@
+DIST letterize-1.3.tar.gz 7772 BLAKE2B 5daabb1de19affb5857c4a64c92b15744b3a8f79a8df127195a843a452868f4c810d83b186e12b09279aaaf99871aa75718d9cb5e90f2cb9ec2e0761b0899623 SHA512 481caa2ecd487e7950faa87e1468887fbc4b3964d02ea86394489834bc6368bad590c54744d08cfa00b34b05ebab094f24a0b84ea91af4ab8e56455c6615bdb8
+DIST letterize-1.4.tar.gz 7464 BLAKE2B 2739388697a462884826e4b0ac2f1d48bd12f903cc9cc11302104c3e27f56479b1494609c3dee5671bf5464a034a0e5cf6da7255f2ad265590054111022cd1b7 SHA512 7e57c6ebe8c5a1bfa16e6cf3f1b01f7e27127c32a1ea373a5221d807d5926b7064153c16c0081a83fec64bdb72379fc18540dedb639d7ec3cf318747438e414a
+EBUILD letterize-1.3.ebuild 475 BLAKE2B 9453cae484a95ff73f226d6f1082e94579ed7fd862971f8a2c4c1e15ef73a383c4484d54ca8bd324a8ec6ef93cb3bc0124ebb6acbcd919d4fcb04dce2f529c0e SHA512 6213b60190c5fe89e1eef50963a521bf072ea4cf3d48dab8dfe8c27dede1237118c83dffb37e610153a8c17d2337b2082d22eeb4d76810f82ff45531be35533f
+EBUILD letterize-1.4.ebuild 475 BLAKE2B f7059a573ac12c8a1cbc89e04795a9f3ed42f9c84c6f4f78a17e279737770fe320a616a4c105917622302ca7b488cdf6a2ac082d5d4b6c99fe17a7b353386bc3 SHA512 7a39848329399dbaec5ebabf56dd70b227fd9d4ec39b9927f913ca44895a8c392c6632f2a0a66fb49090ffee8c8368fe298e0fa1c65d2a280ff1ba310921e9e9
+MISC metadata.xml 245 BLAKE2B ee3a163cfe0a4bc59c0dfb46f9ddb580e2d259b4d0e33cb4e684eb9e6d4b901bf97c6edd891f3b75a613a782f1b89318d0ee3ec9bee4e34c4441d9e8f4267678 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690
diff --git a/app-text/letterize/letterize-1.3.ebuild b/app-text/letterize/letterize-1.3.ebuild
new file mode 100644
index 000000000000..62c2e3ba59b5
--- /dev/null
+++ b/app-text/letterize/letterize-1.3.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit toolchain-funcs
+
+DESCRIPTION="Generate English-plausible alphabetic mnemonics for a phone number"
+HOMEPAGE="http://www.catb.org/~esr/letterize/"
+SRC_URI="http://www.catb.org/~esr/letterize/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+src_prepare() {
+	tc-export CC
+}
+
+src_install() {
+	dobin ${PN}
+	doman ${PN}.1
+	dodoc README
+}
diff --git a/app-text/letterize/letterize-1.4.ebuild b/app-text/letterize/letterize-1.4.ebuild
new file mode 100644
index 000000000000..ef254475f276
--- /dev/null
+++ b/app-text/letterize/letterize-1.4.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit toolchain-funcs
+
+DESCRIPTION="Generate English-plausible alphabetic mnemonics for a phone number"
+HOMEPAGE="http://www.catb.org/~esr/letterize/"
+SRC_URI="http://www.catb.org/~esr/letterize/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+src_prepare() {
+	tc-export CC
+}
+
+src_install() {
+	dobin ${PN}
+	doman ${PN}.1
+	dodoc README
+}
diff --git a/app-text/letterize/metadata.xml b/app-text/letterize/metadata.xml
new file mode 100644
index 000000000000..13170c3184d8
--- /dev/null
+++ b/app-text/letterize/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>tex@gentoo.org</email>
+	<name>Gentoo TeX Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-text/libabw-0.1.2 b/app-text/libabw-0.1.2
deleted file mode 100644
index 0bb0ad721ed5..000000000000
--- a/app-text/libabw-0.1.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=dev-libs/librevenge dev-libs/libxml2 sys-libs/zlib >=dev-libs/boost-1.46 sys-devel/libtool virtual/pkgconfig doc? ( app-doc/doxygen ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Library parsing abiword documents
-EAPI=6
-HOMEPAGE=https://wiki.documentfoundation.org/DLP/Libraries/libabw
-IUSE=doc static-libs
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=MPL-2.0
-RDEPEND=dev-libs/librevenge dev-libs/libxml2 sys-libs/zlib
-SLOT=0
-SRC_URI=https://dev-www.libreoffice.org/src/libabw/libabw-0.1.2.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3ba34be1d43339f990bb32437edfdc3f
diff --git a/app-text/libabw/Manifest b/app-text/libabw/Manifest
new file mode 100644
index 000000000000..d0e8fa52bd3c
--- /dev/null
+++ b/app-text/libabw/Manifest
@@ -0,0 +1,3 @@
+DIST libabw-0.1.2.tar.xz 318400 BLAKE2B ba25542da0d6568530241892dbdba72d2b0dcf667b50e0c1a4e656e0facf82bf77ca8eff8db4d6e57ab699f12d8dad511d32aee291541ffe6460b2ee98590b68 SHA512 a365c1aa047a97a86eee6bce8463646bdf248a51013139ee288402a832fd545586e072d7c7fc11a56f42e3637de9e922197be20d0587e53c51fd80ced409a6cd
+EBUILD libabw-0.1.2.ebuild 851 BLAKE2B fd94404dcfcdc39a0427bd7e79b5bf2fb97e7bb3e784b38077ad6293cffaebf1c7f16d1f87a2a2c9f6e0300ff4bc12e00d98d6ef80e301d4797427375935bda0 SHA512 4b12c64971db94eb5bb43d7f55e84e4b1c250beeb0bf2da92baf43f81843ad58dd4eeac3d7d292f88c6c0f7ddf3c86296cd24f6c04bbe3c15badc04261d25bc2
+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..9bc7f96f1b3a
--- /dev/null
+++ b/app-text/libabw/libabw-0.1.2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools flag-o-matic
+
+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() {
+	# bug 619470
+	append-cxxflags -std=c++14
+
+	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/libabw/metadata.xml b/app-text/libabw/metadata.xml
new file mode 100644
index 000000000000..13ce236ee519
--- /dev/null
+++ b/app-text/libabw/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>office@gentoo.org</email>
+		<name>Gentoo Office project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-text/libebook-0.1.2-r1 b/app-text/libebook-0.1.2-r1
deleted file mode 100644
index 9401d4419758..000000000000
--- a/app-text/libebook-0.1.2-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=dev-libs/icu:= dev-libs/librevenge dev-libs/libxml2 sys-libs/zlib dev-libs/boost dev-util/gperf virtual/pkgconfig doc? ( app-doc/doxygen ) test? ( dev-util/cppunit ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Library parsing various ebook formats
-EAPI=6
-HOMEPAGE=https://www.sourceforge.net/projects/libebook/
-IUSE=doc test tools
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=MPL-2.0
-RDEPEND=dev-libs/icu:= dev-libs/librevenge dev-libs/libxml2 sys-libs/zlib
-SLOT=0
-SRC_URI=mirror://sourceforge/libebook/libe-book-0.1.2.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3462e0be0112f8f486bb79fbb2da211e
diff --git a/app-text/libebook-0.1.3 b/app-text/libebook-0.1.3
deleted file mode 100644
index b0b907e03972..000000000000
--- a/app-text/libebook-0.1.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=app-text/liblangtag dev-libs/icu:= dev-libs/librevenge dev-libs/libxml2 sys-libs/zlib dev-libs/boost dev-util/gperf virtual/pkgconfig doc? ( app-doc/doxygen ) test? ( dev-util/cppunit ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Library parsing various ebook formats
-EAPI=6
-HOMEPAGE=https://www.sourceforge.net/projects/libebook/
-IUSE=doc test tools
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=MPL-2.0
-RDEPEND=app-text/liblangtag dev-libs/icu:= dev-libs/librevenge dev-libs/libxml2 sys-libs/zlib
-SLOT=0
-SRC_URI=mirror://sourceforge/libebook/libe-book-0.1.3.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1213f1ca71637981a25bc8b86274c867
diff --git a/app-text/libebook/Manifest b/app-text/libebook/Manifest
new file mode 100644
index 000000000000..a8da783c4d10
--- /dev/null
+++ b/app-text/libebook/Manifest
@@ -0,0 +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 1079 BLAKE2B 8f7c519b161b6fdb8d6f0c55294fc2de890ad0d16086146b1316ad3794422d69117994359a4b669d2388eb905531f62cd7b89337f7a256b36b4dcb2d0d00f4a3 SHA512 2ec5e9b00df55ba2c20c901f2512fabf5b3aa5a4ec8812f24fa83a162dbc164f7f86c658e07b850c8ce9f58410c5ec227e45c51400fcc04a7ad4ac5830cd310f
+EBUILD libebook-0.1.3.ebuild 1011 BLAKE2B 657012ef4e1833134322c0ea33aa9209788eb66d0d47a58a84dec199e2565dbd2023b17c8bccfd1a76c43b3b4a8de075ea353b2fd9d5a47457a595a487757dee SHA512 30dd8d31108744cbd2ea71b863a3789124d47680cca93fc83c7bc27bdeb92de20f4934f277eff50c233b339d77c125a7550c61856e059242b4d1234e4bc7efa9
+MISC metadata.xml 404 BLAKE2B 69f06dd52ba8be857d504941c4aeb6778381d87d61f1c9a889a6c1ad16a9d7014dabf76c707db2ed6a160be300a010e6d15c2162d35e59ddd038181a4aa7fae8 SHA512 8e0679b60d1fd56fcb165fd7b5a8e1367f4ee472d7a58e157e6bb1445b502b1fee56b18d099837dcabaa35f7b18f52515cbb51f7bfe9c4c2a824210e4003a275
diff --git a/app-text/libebook/files/libebook-0.1.2-boost-1.59-makefile.patch b/app-text/libebook/files/libebook-0.1.2-boost-1.59-makefile.patch
new file mode 100644
index 000000000000..9869b308c73c
--- /dev/null
+++ b/app-text/libebook/files/libebook-0.1.2-boost-1.59-makefile.patch
@@ -0,0 +1,10 @@
+--- a/src/lib/Makefile.am
++++ b/src/lib/Makefile.am
+@@ -64,6 +64,7 @@
+ libe_book_@EBOOK_MAJOR_VERSION@_@EBOOK_MINOR_VERSION@_la_SOURCES = \
+ 	EBOOKDocument.cpp
+ 
++libe_book_internal_la_CPPFLAGS = -DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED
+ libe_book_internal_la_SOURCES = \
+ 	EBOOKBitStream.cpp \
+ 	EBOOKBitStream.h \
diff --git a/app-text/libebook/files/libebook-0.1.2-tests.patch b/app-text/libebook/files/libebook-0.1.2-tests.patch
new file mode 100644
index 000000000000..624051a757aa
--- /dev/null
+++ b/app-text/libebook/files/libebook-0.1.2-tests.patch
@@ -0,0 +1,27 @@
+From 263d95ce191421a51d4b2d088297700032a8987b Mon Sep 17 00:00:00 2001
+From: eroen <eroen@occam.eroen.eu>
+Date: Mon, 19 Dec 2016 19:53:15 +0100
+Subject: [PATCH] Check for librevenge-stream if tests are enabled
+
+X-Gentoo-Bug: 603098
+X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=603098
+---
+ configure.ac | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index 6e00ed5..ecbd14b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -357,6 +357,8 @@ AS_IF([test "x$with_tools" = "xyes"],[
+     PKG_CHECK_MODULES([REVENGE_GENERATORS],[
+         librevenge-generators-0.0
+     ])
++])
++AS_IF([test "x$with_tools" = "xyes" || test "x$enable_tests" = "xyes"],[
+     PKG_CHECK_MODULES([REVENGE_STREAM],[
+         librevenge-stream-0.0
+     ])
+-- 
+2.11.0
+
diff --git a/app-text/libebook/libebook-0.1.2-r1.ebuild b/app-text/libebook/libebook-0.1.2-r1.ebuild
new file mode 100644
index 000000000000..e30d1ced7b2e
--- /dev/null
+++ b/app-text/libebook/libebook-0.1.2-r1.ebuild
@@ -0,0 +1,62 @@
+# 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 flag-o-matic
+
+DESCRIPTION="Library parsing various ebook formats"
+HOMEPAGE="https://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="
+	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}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-boost-1.59-makefile.patch"
+	"${FILESDIR}/${P}-tests.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# bug 618854
+	append-cxxflags -std=c++14
+
+	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/libebook/libebook-0.1.3.ebuild b/app-text/libebook/libebook-0.1.3.ebuild
new file mode 100644
index 000000000000..ecfbde86e9f2
--- /dev/null
+++ b/app-text/libebook/libebook-0.1.3.ebuild
@@ -0,0 +1,58 @@
+# 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 flag-o-matic
+
+DESCRIPTION="Library parsing various ebook formats"
+HOMEPAGE="https://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() {
+	# bug 618854
+	append-cxxflags -std=c++14
+
+	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/libebook/metadata.xml b/app-text/libebook/metadata.xml
new file mode 100644
index 000000000000..70dbb606d4c5
--- /dev/null
+++ b/app-text/libebook/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>office@gentoo.org</email>
+		<name>Gentoo Office project</name>
+	</maintainer>
+	<use>
+		<flag name="tools">Build file conversion tools</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">libebook</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/libepubgen-0.1.0 b/app-text/libepubgen-0.1.0
deleted file mode 100644
index a5cd94e8d5f0..000000000000
--- a/app-text/libepubgen-0.1.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=dev-libs/librevenge dev-libs/boost virtual/pkgconfig doc? ( app-doc/doxygen ) test? ( dev-util/cppunit dev-libs/libxml2:2 )
-DESCRIPTION=EPUB generator for librevenge
-EAPI=6
-HOMEPAGE=https://sourceforge.net/projects/libepubgen/
-IUSE=debug doc test
-KEYWORDS=amd64 ~arm x86
-LICENSE=MPL-2.0
-RDEPEND=dev-libs/librevenge
-SLOT=0
-SRC_URI=mirror://sourceforge/libepubgen/libepubgen-0.1.0.tar.xz
-_md5_=18d5ce6fe7fb5b61d310c83b341f3aaa
diff --git a/app-text/libepubgen-0.1.1 b/app-text/libepubgen-0.1.1
deleted file mode 100644
index 6aa5001bdcd1..000000000000
--- a/app-text/libepubgen-0.1.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=dev-libs/librevenge dev-libs/boost virtual/pkgconfig doc? ( app-doc/doxygen ) test? ( dev-util/cppunit dev-libs/libxml2:2 )
-DESCRIPTION=EPUB generator for librevenge
-EAPI=6
-HOMEPAGE=https://sourceforge.net/projects/libepubgen/
-IUSE=debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=MPL-2.0
-RDEPEND=dev-libs/librevenge
-SLOT=0
-SRC_URI=mirror://sourceforge/libepubgen/libepubgen-0.1.1.tar.xz
-_md5_=7ab5c0aae9e2284a1a9bd0f47e9b3a8a
diff --git a/app-text/libepubgen/Manifest b/app-text/libepubgen/Manifest
new file mode 100644
index 000000000000..e197d4d5107c
--- /dev/null
+++ b/app-text/libepubgen/Manifest
@@ -0,0 +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 713 BLAKE2B 57119868a143aa90b78c9e82339fa108e2cdf988220626a759459bbfa084d3ac9dca2a93af3488d9f2409a79e4876e75bc1cd0ac075df00c8aa291ad26c965a4 SHA512 7372214a9bd3f0576c5a23cde82b528dbcd9d16e2d2a3cfcf439052282da13b8e9eb03e7aea97b514c2fcd013a8574ae53c38ee0828d39c8a386642cedd319c7
+MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/app-text/libepubgen/libepubgen-0.1.0.ebuild b/app-text/libepubgen/libepubgen-0.1.0.ebuild
new file mode 100644
index 000000000000..300033a02b9b
--- /dev/null
+++ b/app-text/libepubgen/libepubgen-0.1.0.ebuild
@@ -0,0 +1,40 @@
+# 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 \
+		--disable-werror \
+		$(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/libepubgen/libepubgen-0.1.1.ebuild b/app-text/libepubgen/libepubgen-0.1.1.ebuild
new file mode 100644
index 000000000000..80387cdb8ac9
--- /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 ~arm64 ~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/libepubgen/metadata.xml b/app-text/libepubgen/metadata.xml
new file mode 100644
index 000000000000..13ce236ee519
--- /dev/null
+++ b/app-text/libepubgen/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>office@gentoo.org</email>
+		<name>Gentoo Office project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-text/libetonyek-0.1.7 b/app-text/libetonyek-0.1.7
deleted file mode 100644
index d5ada535aee5..000000000000
--- a/app-text/libetonyek-0.1.7
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=app-text/liblangtag dev-libs/librevenge dev-libs/libxml2 sys-libs/zlib dev-libs/boost >=dev-util/mdds-1.2.2:1 media-libs/glm sys-devel/libtool virtual/pkgconfig doc? ( app-doc/doxygen ) test? ( dev-util/cppunit )
-DESCRIPTION=Library parsing Apple Keynote presentations
-EAPI=6
-HOMEPAGE=https://wiki.documentfoundation.org/DLP/Libraries/libetonyek
-IUSE=doc static-libs test
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=|| ( GPL-2+ LGPL-2.1 MPL-1.1 )
-RDEPEND=app-text/liblangtag dev-libs/librevenge dev-libs/libxml2 sys-libs/zlib
-SLOT=0
-SRC_URI=https://dev-www.libreoffice.org/src/libetonyek/libetonyek-0.1.7.tar.xz
-_md5_=983d4a834ac088bccf35e74a22598365
diff --git a/app-text/libetonyek-0.1.8 b/app-text/libetonyek-0.1.8
deleted file mode 100644
index b5dc2adbca36..000000000000
--- a/app-text/libetonyek-0.1.8
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=app-text/liblangtag dev-libs/librevenge dev-libs/libxml2 sys-libs/zlib:= dev-libs/boost >=dev-util/mdds-1.2.2:1 media-libs/glm sys-devel/libtool virtual/pkgconfig doc? ( app-doc/doxygen ) test? ( dev-util/cppunit ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Library parsing Apple Keynote presentations
-EAPI=6
-HOMEPAGE=https://wiki.documentfoundation.org/DLP/Libraries/libetonyek
-IUSE=doc static-libs test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=|| ( GPL-2+ LGPL-2.1 MPL-1.1 )
-RDEPEND=app-text/liblangtag dev-libs/librevenge dev-libs/libxml2 sys-libs/zlib:=
-SLOT=0
-SRC_URI=https://dev-www.libreoffice.org/src/libetonyek/libetonyek-0.1.8.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=0570f65de04c5452e0b7e7b1a48eb936
diff --git a/app-text/libetonyek-9999 b/app-text/libetonyek-9999
deleted file mode 100644
index ad5f5833b5f5..000000000000
--- a/app-text/libetonyek-9999
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure install prepare unpack
-DEPEND=app-text/liblangtag dev-libs/librevenge dev-libs/libxml2 sys-libs/zlib dev-libs/boost >=dev-util/mdds-1.2.2:1 media-libs/glm sys-devel/libtool virtual/pkgconfig doc? ( app-doc/doxygen ) test? ( dev-util/cppunit ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=Library parsing Apple Keynote presentations
-EAPI=6
-HOMEPAGE=https://wiki.documentfoundation.org/DLP/Libraries/libetonyek
-IUSE=doc static-libs test
-LICENSE=|| ( GPL-2+ LGPL-2.1 MPL-1.1 )
-RDEPEND=app-text/liblangtag dev-libs/librevenge dev-libs/libxml2 sys-libs/zlib
-SLOT=0
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	git-r3	8f6de46b0aa318aea0e8cac62ece098b	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=1249abec8caf6698fa36a9f4969e6268
diff --git a/app-text/libetonyek/Manifest b/app-text/libetonyek/Manifest
new file mode 100644
index 000000000000..b6ae26a14c21
--- /dev/null
+++ b/app-text/libetonyek/Manifest
@@ -0,0 +1,7 @@
+AUX libetonyek-0.1.8-glm-0.9.9.patch 409 BLAKE2B b0731eba3a65ea4e88bd24a633875157acbb4c1e727bc7bcf2a4f1af67197c1d9762a7aa6265e31357eead2baff13c28126d6f4bbc698a997f442bc58771b5b2 SHA512 edc407a4958befee95b53733b0c73bc8281575b53b8d2c65491eee6aafc63d775d3ce9d0a0578ce51cf8bc8f047a683bb0dbd8b79f2b1914dc5df6de64b835fa
+DIST libetonyek-0.1.7.tar.xz 1256232 BLAKE2B ef2abcc427014d515a75ff75d90a78da0b5b28d54b5de3793540e8448f163da0b6d3ff4026373ffc3a4973d3e0e4fee280e75a77407620b3ba0e833bd7d8c82a SHA512 bec4819e161f68b7315567464bfe9e0259a59822a7926c54208cceb04061664a1220716539816a24a6f259eac6f7063c72750aaaf8d8886e3bfb0c4d5f1e0b0f
+DIST libetonyek-0.1.8.tar.xz 1324868 BLAKE2B 2088349df75011f54f5822ffd69336a7942a148ff829111c02efbfb99c705a9e00105147942f3e9e81278be3b1f2be4d63aba8cbf6a54127f04fc547df6b7b1d SHA512 c8c08100b0c75e0420bbcd796f7cb9285e77ce1be34757df5b237d114a428a4a6094f12e442f81769a2fac5be45ea4376ff9e1d90448e18b3443bfe7c645a865
+EBUILD libetonyek-0.1.7.ebuild 1181 BLAKE2B cc869861947ebb3b5a3e117999f2f2aea14e012f9412f07d610af7c4c5df02ede968557b821d2c88252742796fbe2010f2749d6d0df5631054f6276722f0cc7d SHA512 d5e73167601b6fcd21568f4f9f45254d4b8098a1d503aaa6794b6c5af4de497bb607613eced94d4adbd9c93ccb15b1a6fbc115ced80c0db2c041989ba5b2b85c
+EBUILD libetonyek-0.1.8.ebuild 1218 BLAKE2B 27d32c5df3acc0abbfbd33ed52dc5893ca124bfe77d2e8dfe8176aad2b0f78d0e8b2fb418006b5d8c3d4d62ef94faf19f34dba6b06d3e3d4a8dbc5e0433b6bf6 SHA512 95166c5ede3f644277b2b5efa36ce212a288916b8bd690bb24107b35008005dce89e92bec7d52419d9ede991301b4144f9603d7d75bd5270b86fb0e374575d50
+EBUILD libetonyek-9999.ebuild 1183 BLAKE2B 326e3f725846dbda6102ccf8a4ef4a1b63c723c80c36cdc927243482c38cf2d745d032149246bd6b3d083b455042e6eda60d4212c36f8239c621ccbaeb0e9ef8 SHA512 3993f39d97f9e53ce01237e2eb94ce458538903b1a66b8462c4fe9135b3101b0fe534e61d36ae79de939df2988cfd061463ffed06dc08172a289284661fd4ad3
+MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/app-text/libetonyek/files/libetonyek-0.1.8-glm-0.9.9.patch b/app-text/libetonyek/files/libetonyek-0.1.8-glm-0.9.9.patch
new file mode 100644
index 000000000000..db78fa81d471
--- /dev/null
+++ b/app-text/libetonyek/files/libetonyek-0.1.8-glm-0.9.9.patch
@@ -0,0 +1,12 @@
+Gentoo-bug: https://bugs.gentoo.org/657820
+
+--- a/configure.ac	2018-03-18 14:51:31.000000000 +0100
++++ b/configure.ac	2018-07-11 23:13:14.901127036 +0200
+@@ -119,7 +119,6 @@
+ saved_CPPFLAGS="${CPPFLAGS}"
+ CPPFLAGS="${GLM_CFLAGS} ${CPPFLAGS}"
+ GLM_headers="glm/glm.hpp"
+-AS_IF([test "x$enable_tests" == "xyes"], [GLM_headers="$GLM_headers glm/gtx/io.hpp"], [])
+ AC_CHECK_HEADERS(
+     [$GLM_headers],
+     [],
diff --git a/app-text/libetonyek/libetonyek-0.1.7.ebuild b/app-text/libetonyek/libetonyek-0.1.7.ebuild
new file mode 100644
index 000000000000..d618f8eb3ce0
--- /dev/null
+++ b/app-text/libetonyek/libetonyek-0.1.7.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGIT_REPO_URI="https://anongit.freedesktop.org/git/libreoffice/libetonyek.git"
+[[ ${PV} == 9999 ]] && inherit autotools git-r3
+
+DESCRIPTION="Library parsing Apple Keynote presentations"
+HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libetonyek"
+[[ ${PV} == 9999 ]] || SRC_URI="https://dev-www.libreoffice.org/src/libetonyek/${P}.tar.xz"
+
+LICENSE="|| ( GPL-2+ LGPL-2.1 MPL-1.1 )"
+SLOT="0"
+[[ ${PV} == 9999 ]] || \
+KEYWORDS="amd64 ~arm ~arm64 x86"
+IUSE="doc static-libs test"
+
+RDEPEND="
+	app-text/liblangtag
+	dev-libs/librevenge
+	dev-libs/libxml2
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+	>=dev-util/mdds-1.2.2:1
+	media-libs/glm
+	sys-devel/libtool
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	test? ( dev-util/cppunit )
+"
+
+src_prepare() {
+	default
+	[[ -d m4 ]] || mkdir "m4"
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-werror \
+		$(use_with doc docs) \
+		$(use_enable static-libs static) \
+		$(use_enable test tests) \
+		--with-mdds=1.2
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/app-text/libetonyek/libetonyek-0.1.8.ebuild b/app-text/libetonyek/libetonyek-0.1.8.ebuild
new file mode 100644
index 000000000000..7e445ac2171a
--- /dev/null
+++ b/app-text/libetonyek/libetonyek-0.1.8.ebuild
@@ -0,0 +1,56 @@
+# 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/libetonyek.git"
+[[ ${PV} == 9999 ]] && inherit git-r3
+inherit autotools
+
+DESCRIPTION="Library parsing Apple Keynote presentations"
+HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libetonyek"
+[[ ${PV} == 9999 ]] || SRC_URI="https://dev-www.libreoffice.org/src/libetonyek/${P}.tar.xz"
+
+LICENSE="|| ( GPL-2+ LGPL-2.1 MPL-1.1 )"
+SLOT="0"
+[[ ${PV} == 9999 ]] || \
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="doc static-libs test"
+
+RDEPEND="
+	app-text/liblangtag
+	dev-libs/librevenge
+	dev-libs/libxml2
+	sys-libs/zlib:=
+"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+	>=dev-util/mdds-1.2.2:1
+	media-libs/glm
+	sys-devel/libtool
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	test? ( dev-util/cppunit )
+"
+
+PATCHES=( "${FILESDIR}/${P}-glm-0.9.9.patch" )
+
+src_prepare() {
+	default
+	[[ -d m4 ]] || mkdir "m4"
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-werror \
+		$(use_with doc docs) \
+		$(use_enable static-libs static) \
+		$(use_enable test tests) \
+		--with-mdds=1.2
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/app-text/libetonyek/libetonyek-9999.ebuild b/app-text/libetonyek/libetonyek-9999.ebuild
new file mode 100644
index 000000000000..39b6f10a69f8
--- /dev/null
+++ b/app-text/libetonyek/libetonyek-9999.ebuild
@@ -0,0 +1,53 @@
+# 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/libetonyek.git"
+[[ ${PV} == 9999 ]] && inherit autotools git-r3
+
+DESCRIPTION="Library parsing Apple Keynote presentations"
+HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libetonyek"
+[[ ${PV} == 9999 ]] || SRC_URI="https://dev-www.libreoffice.org/src/libetonyek/${P}.tar.xz"
+
+LICENSE="|| ( GPL-2+ LGPL-2.1 MPL-1.1 )"
+SLOT="0"
+[[ ${PV} == 9999 ]] || \
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="doc static-libs test"
+
+RDEPEND="
+	app-text/liblangtag
+	dev-libs/librevenge
+	dev-libs/libxml2
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+	>=dev-util/mdds-1.2.2:1
+	media-libs/glm
+	sys-devel/libtool
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	test? ( dev-util/cppunit )
+"
+
+src_prepare() {
+	default
+	[[ -d m4 ]] || mkdir "m4"
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-werror \
+		$(use_with doc docs) \
+		$(use_enable static-libs static) \
+		$(use_enable test tests) \
+		--with-mdds=1.2
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/app-text/libetonyek/metadata.xml b/app-text/libetonyek/metadata.xml
new file mode 100644
index 000000000000..13ce236ee519
--- /dev/null
+++ b/app-text/libetonyek/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>office@gentoo.org</email>
+		<name>Gentoo Office project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-text/libexttextcat-3.4.5 b/app-text/libexttextcat-3.4.5
deleted file mode 100644
index f0a97bcb806c..000000000000
--- a/app-text/libexttextcat-3.4.5
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=configure install
-DESCRIPTION=Library implementing N-gram-based text categorization
-EAPI=6
-HOMEPAGE=http://software.wise-guys.nl/libtextcat/
-IUSE=static-libs
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux
-LICENSE=BSD-2
-SLOT=0
-SRC_URI=http://dev-www.libreoffice.org/src/libexttextcat/libexttextcat-3.4.5.tar.xz
-_md5_=7a20a30dd14f98900de6d002c27fd588
diff --git a/app-text/libexttextcat/Manifest b/app-text/libexttextcat/Manifest
new file mode 100644
index 000000000000..33dd8daacbc9
--- /dev/null
+++ b/app-text/libexttextcat/Manifest
@@ -0,0 +1,3 @@
+DIST libexttextcat-3.4.5.tar.xz 1041268 BLAKE2B 2686345b90fd4a4345dac3cab5a801b7eabfb380f7d298c32fbb86bdb36939f6b873ccdfc6d7ef976655b0cfc8ab457e110e966ed4fc586f53023e7cb47e810e SHA512 f05a9f08c2f2f335d0e483c024321b96fee7424bc1398d4c6acbd9c501f92e22f881bc3d6ec2c0434f9bf4604f3c4b0e880e37d3d0de410eac1a20ea6669baa6
+EBUILD libexttextcat-3.4.5.ebuild 632 BLAKE2B 29e4ad81b9dacc08ceda14a310d26c1bed9eca187ef3c762ca9bd9291f9b3df71a6941796f4076e8019986ec3437e4b49ef2b9bc071cd7b21ed1d87e4ff2b2ee SHA512 87ba12fc0290302300ae8c9bba6f4f59a4730a84a2151739ead32a6837ce3949b9f6de8330e43109d8bdc3230492a1efdf97ff2dcdd95a1c63c4a772c7260e85
+MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/app-text/libexttextcat/libexttextcat-3.4.5.ebuild b/app-text/libexttextcat/libexttextcat-3.4.5.ebuild
new file mode 100644
index 000000000000..e48b3a9a6156
--- /dev/null
+++ b/app-text/libexttextcat/libexttextcat-3.4.5.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Library implementing N-gram-based text categorization"
+HOMEPAGE="http://software.wise-guys.nl/libtextcat/"
+SRC_URI="http://dev-www.libreoffice.org/src/${PN}/${P}.tar.xz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+IUSE="static-libs"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	econf \
+		--disable-werror \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/app-text/libexttextcat/metadata.xml b/app-text/libexttextcat/metadata.xml
new file mode 100644
index 000000000000..13ce236ee519
--- /dev/null
+++ b/app-text/libexttextcat/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>office@gentoo.org</email>
+		<name>Gentoo Office project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-text/libgepub-0.4 b/app-text/libgepub-0.4
deleted file mode 100644
index 7c68538d9d0d..000000000000
--- a/app-text/libgepub-0.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=app-arch/libarchive dev-libs/glib:2 dev-libs/libxml2 net-libs/libsoup:2.4 net-libs/webkit-gtk:4 x11-libs/gtk+:3 introspection? ( >=dev-libs/gobject-introspection-1.30:= ) gnome-base/gnome-common virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=GObject based library for handling and rendering epub documents
-EAPI=6
-HOMEPAGE=https://git.gnome.org/browse/libgepub
-IUSE=+introspection
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2
-RDEPEND=app-arch/libarchive dev-libs/glib:2 dev-libs/libxml2 net-libs/libsoup:2.4 net-libs/webkit-gtk:4 x11-libs/gtk+:3 introspection? ( >=dev-libs/gobject-introspection-1.30:= )
-SLOT=0
-SRC_URI=mirror://gnome/sources/libgepub/0.4/libgepub-0.4.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e2c413c6a2fb8892068c4a232e4dfe55
diff --git a/app-text/libgepub-0.5.2 b/app-text/libgepub-0.5.2
deleted file mode 100644
index 0af222974d76..000000000000
--- a/app-text/libgepub-0.5.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install test
-DEPEND=app-arch/libarchive dev-libs/glib:2 dev-libs/libxml2 net-libs/libsoup:2.4 net-libs/webkit-gtk:4 x11-libs/gtk+:3 introspection? ( >=dev-libs/gobject-introspection-1.30:= ) virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.40.0 >=dev-util/ninja-1.7.2
-DESCRIPTION=GObject based library for handling and rendering epub documents
-EAPI=6
-HOMEPAGE=https://git.gnome.org/browse/libgepub
-IUSE=+introspection
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2
-RDEPEND=app-arch/libarchive dev-libs/glib:2 dev-libs/libxml2 net-libs/libsoup:2.4 net-libs/webkit-gtk:4 x11-libs/gtk+:3 introspection? ( >=dev-libs/gobject-introspection-1.30:= )
-SLOT=0
-SRC_URI=mirror://gnome/sources/libgepub/0.5/libgepub-0.5.2.tar.xz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	meson	eb124b9e9d7a5f1ebc89589fe73c816f	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=8a946f07e3e3273d190d06c65c1d8768
diff --git a/app-text/libgepub/Manifest b/app-text/libgepub/Manifest
new file mode 100644
index 000000000000..5e0976bfce99
--- /dev/null
+++ b/app-text/libgepub/Manifest
@@ -0,0 +1,5 @@
+DIST libgepub-0.4.tar.xz 246016 BLAKE2B d51f55064d2dd0c9d6cb33884d9dae967b6a9ea971624fce333e9692abfaddf12c6ee4fb11cad97dc0fcc0b6a5d42ff71fc842eb205326ce8181af8e3ad46d2e SHA512 dd3e9837ba2c5896319918bda19eec8ea790d54f7893ddca46774f96f8e09ac1962ae6cbfc0bcd23c15059c63683ef4a6673e05f8416b024591677fddfa3ca15
+DIST libgepub-0.5.2.tar.xz 27076 BLAKE2B 8934e7cbd3b2e4056220c560111fb1cbaca1b16541519da3c3c1b28784900c14b84b9a7497d59d4895b74075c2f94bf8dc540e19d2e5bcc686429d216ec3d2f5 SHA512 9e8ba3acc717fe5d1957935b154776720fcdb90ab566e0888203bce4ea2281b84f9fe44d554f6b5cadb1bba3aeae8b5b9a759001f404c43fa46b0ba16b959e69
+EBUILD libgepub-0.4.ebuild 681 BLAKE2B 92fc88552bda9ef7e5fbe0699496679c8b2f7cc589627e62071987c175a005633924a6026ec84c82a6829cf36dd0730bfc7b4aa62b612996f3e5f9056572fdd6 SHA512 0071795abfdc4915fc7eb8ef88fb1d0ba6883e2010f5ff4836b9119ac02da6364ff223e0c32a00dac23ba404054fcdbc3dbee0e113a91ffb88eb3dba2882edba
+EBUILD libgepub-0.5.2.ebuild 673 BLAKE2B 8fcdcea9bd667816508d9328e83ada057ff44eacaf35fab8d0a11fe30b45ee257037ca91ae7ba68dab3a2c755c64ba4b35f6b9e3a000401e3e1583727dc8e957 SHA512 cda432b08898fd45911231fd83c7c009792df6b43ae4398bb3a9adeef9226d49a030bd2b2447da0815741fbb1ee4f20393987ed59eb5114352324829f3607527
+MISC metadata.xml 259 BLAKE2B 32f8c5208a55a1dda504b7df969127393a2c70e672aba383fcdc870de8fe778366d3dde3c3313bd043068d2e7831d1e18bad6fb428e82266fc2a630104e0a193 SHA512 fbef629394690b3a5608abc6344816f6acf1e8e2663f29949fd14a662c628f16fee77a1ec1641066806d143fb94c1571bc5b46b829dc53620af6956377fe15cc
diff --git a/app-text/libgepub/libgepub-0.4.ebuild b/app-text/libgepub/libgepub-0.4.ebuild
new file mode 100644
index 000000000000..816748d46117
--- /dev/null
+++ b/app-text/libgepub/libgepub-0.4.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2
+
+DESCRIPTION="GObject based library for handling and rendering epub documents"
+HOMEPAGE="https://git.gnome.org/browse/libgepub"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="+introspection"
+
+RDEPEND="
+	app-arch/libarchive
+	dev-libs/glib:2
+	dev-libs/libxml2
+	net-libs/libsoup:2.4
+	net-libs/webkit-gtk:4
+	x11-libs/gtk+:3
+	introspection? ( >=dev-libs/gobject-introspection-1.30:= )
+"
+DEPEND="${RDEPEND}
+	gnome-base/gnome-common
+	virtual/pkgconfig
+"
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		$(use_enable introspection)
+}
diff --git a/app-text/libgepub/libgepub-0.5.2.ebuild b/app-text/libgepub/libgepub-0.5.2.ebuild
new file mode 100644
index 000000000000..37ff044fb87c
--- /dev/null
+++ b/app-text/libgepub/libgepub-0.5.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome.org meson
+
+DESCRIPTION="GObject based library for handling and rendering epub documents"
+HOMEPAGE="https://git.gnome.org/browse/libgepub"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+introspection"
+
+RDEPEND="
+	app-arch/libarchive
+	dev-libs/glib:2
+	dev-libs/libxml2
+	net-libs/libsoup:2.4
+	net-libs/webkit-gtk:4
+	x11-libs/gtk+:3
+	introspection? ( >=dev-libs/gobject-introspection-1.30:= )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+src_configure() {
+	meson_src_configure \
+		-Denable-introspection=$(usex introspection true false)
+}
diff --git a/app-text/libgepub/metadata.xml b/app-text/libgepub/metadata.xml
new file mode 100644
index 000000000000..4cbddcaa19ad
--- /dev/null
+++ b/app-text/libgepub/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>gnome@gentoo.org</email>
+    <name>Gentoo GNOME Desktop</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-text/libgxps-0.3.0 b/app-text/libgxps-0.3.0
deleted file mode 100644
index edda787a2365..000000000000
--- a/app-text/libgxps-0.3.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install test
-DEPEND=>=app-arch/libarchive-2.8 >=dev-libs/glib-2.36:2 media-libs/freetype:2 media-libs/libpng:0 >=x11-libs/cairo-1.10[svg] introspection? ( >=dev-libs/gobject-introspection-0.10.1:= ) jpeg? ( virtual/jpeg:0 ) lcms? ( media-libs/lcms:2 ) tiff? ( media-libs/tiff:0[zlib] ) app-text/docbook-xsl-stylesheets dev-libs/libxslt dev-util/gtk-doc-am virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.40.0 >=dev-util/ninja-1.7.2
-DESCRIPTION=Library for handling and rendering XPS documents
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Projects/libgxps
-IUSE=+introspection jpeg lcms tiff
-KEYWORDS=alpha amd64 arm ~arm64 ia64 ppc ppc64 sparc x86
-LICENSE=LGPL-2.1
-RDEPEND=>=app-arch/libarchive-2.8 >=dev-libs/glib-2.36:2 media-libs/freetype:2 media-libs/libpng:0 >=x11-libs/cairo-1.10[svg] introspection? ( >=dev-libs/gobject-introspection-0.10.1:= ) jpeg? ( virtual/jpeg:0 ) lcms? ( media-libs/lcms:2 ) tiff? ( media-libs/tiff:0[zlib] )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://gnome/sources/libgxps/0.3/libgxps-0.3.0.tar.xz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	meson	eb124b9e9d7a5f1ebc89589fe73c816f	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4113e566613036100fbb60914d9a6f8b
diff --git a/app-text/libgxps/Manifest b/app-text/libgxps/Manifest
new file mode 100644
index 000000000000..e7d695b680b5
--- /dev/null
+++ b/app-text/libgxps/Manifest
@@ -0,0 +1,3 @@
+DIST libgxps-0.3.0.tar.xz 93000 BLAKE2B 8e04ae281aa8ee637d597265992a5bf6df3592b7d251d657dae3833c8cca848f7142f926964d96586f50ce9987dee94841be15554a733816a3b4f0acef282f12 SHA512 283ce3041f0238ef1dcae30ce2adbc3f843677e00ae22f20ed3459828f3edaab6d05d87c20dddb613925ab248ed0b29855a94198b982606c3dcb2e59f800b013
+EBUILD libgxps-0.3.0.ebuild 1220 BLAKE2B 5a253905c2e9c7cfac0362a25f77e7d43bf204a07756ac12efd10b3a6b07331dca27a027aa125b4390557eba939dd8623433b06087989c78b67a0c4cb2aa1efc SHA512 a03b58d526fe52b849ffc7aaab979e18ba4af390e3a887732c7f3aab4a96f6abc01e141a6127c38fd2f8fb1bbff412abf596600a11e5c29b3e70cd220fac01bf
+MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-text/libgxps/libgxps-0.3.0.ebuild b/app-text/libgxps/libgxps-0.3.0.ebuild
new file mode 100644
index 000000000000..53b633dea4b7
--- /dev/null
+++ b/app-text/libgxps/libgxps-0.3.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome.org meson xdg-utils
+
+DESCRIPTION="Library for handling and rendering XPS documents"
+HOMEPAGE="https://wiki.gnome.org/Projects/libgxps"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 ia64 ppc ppc64 sparc x86"
+IUSE="+introspection jpeg lcms tiff"
+
+RDEPEND="
+	>=app-arch/libarchive-2.8
+	>=dev-libs/glib-2.36:2
+	media-libs/freetype:2
+	media-libs/libpng:0
+	>=x11-libs/cairo-1.10[svg]
+	introspection? ( >=dev-libs/gobject-introspection-0.10.1:= )
+	jpeg? ( virtual/jpeg:0 )
+	lcms? ( media-libs/lcms:2 )
+	tiff? ( media-libs/tiff:0[zlib] )
+"
+DEPEND="${RDEPEND}
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	dev-util/gtk-doc-am
+	virtual/pkgconfig
+"
+
+# There is no automatic test suite, only an interactive test application
+RESTRICT="test"
+
+src_configure() {
+	local emesonargs=(
+		-Denable-test=false
+		-Denable-gtk-doc=false
+		-Denable-man=true
+		-Ddisable-introspection=$(usex introspection false true)
+		-Dwith-liblcms2=$(usex lcms true false)
+		-Dwith-libjpeg=$(usex jpeg true false)
+		-Dwith-libtiff=$(usex tiff true false)
+	)
+
+	xdg_environment_reset
+	meson_src_configure
+}
diff --git a/app-text/libgxps/metadata.xml b/app-text/libgxps/metadata.xml
new file mode 100644
index 000000000000..39980802b1da
--- /dev/null
+++ b/app-text/libgxps/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-text/liblangtag-0.6.2 b/app-text/liblangtag-0.6.2
deleted file mode 100644
index b42588045680..000000000000
--- a/app-text/liblangtag-0.6.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=dev-libs/libxml2 introspection? ( dev-libs/gobject-introspection ) sys-devel/gettext doc? ( dev-util/gtk-doc ) introspection? ( dev-libs/gobject-introspection-common ) test? ( dev-libs/check )
-DESCRIPTION=An interface library to access tags for identifying languages
-EAPI=6
-HOMEPAGE=https://tagoh.bitbucket.org/liblangtag/
-IUSE=debug doc introspection static-libs test
-KEYWORDS=amd64 ~arm ~arm64 ~ppc x86
-LICENSE=|| ( LGPL-3 MPL-2.0 )
-RDEPEND=dev-libs/libxml2 introspection? ( dev-libs/gobject-introspection )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://bitbucket.org/tagoh/liblangtag/downloads/liblangtag-0.6.2.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=cd76889d9897b5c141ae8544f6f6de8e
diff --git a/app-text/liblangtag/Manifest b/app-text/liblangtag/Manifest
new file mode 100644
index 000000000000..e2dfa50042a1
--- /dev/null
+++ b/app-text/liblangtag/Manifest
@@ -0,0 +1,3 @@
+DIST liblangtag-0.6.2.tar.bz2 766080 BLAKE2B e19599cb6445e40d21d4aec394ab3bcfe447badf096e8efd6e13caa48ce5cec832cb853f4924ce0204a747949506b49b05c175c2726fa3904424cc25b8dc9869 SHA512 812e00d0a26eedc1fa9bee6d0b9da53b8faca8d1fc5f93a0423106b5b777c7b1ec5854da7d02606c215ad1a1248de93016559c7a55288a4b427857fb1ed1ad8f
+EBUILD liblangtag-0.6.2.ebuild 1156 BLAKE2B 77c6134d5dbcd2eb2fdd67c624a021a1ec55c64e51756d68467547a37c42946c01b96fc81add00281fc873d91873734c96546847ad77d2fd3e6650c0da02ca20 SHA512 e300c2810e739298e2700297e69bf3abaa795f85a7b580c466f90f5c9df6825e1ce43210520df1e98913671ee94d6567f3335d2cf39a5f19b76bb4853dbaca08
+MISC metadata.xml 349 BLAKE2B 3be7ff388f2fa95c460c034408fb159d9f7f2b17b4634027f73870018e672f330b3b0f9cc96fa372170bf2daa314cb087a9cd5794ab1e373449b4cc0762bda87 SHA512 dc4a715ede23108572522e1e6c7afd36b3c3359fe4145e5a02b45e7fc094f1633fbfcdf0d9c75955f75acb1487e438bb437a85766d7a06e628674447d5cf3d96
diff --git a/app-text/liblangtag/liblangtag-0.6.2.ebuild b/app-text/liblangtag/liblangtag-0.6.2.ebuild
new file mode 100644
index 000000000000..b55dd05299d0
--- /dev/null
+++ b/app-text/liblangtag/liblangtag-0.6.2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils xdg-utils
+
+DESCRIPTION="An interface library to access tags for identifying languages"
+HOMEPAGE="https://tagoh.bitbucket.org/liblangtag/"
+SRC_URI="https://bitbucket.org/tagoh/${PN}/downloads/${P}.tar.bz2"
+
+LICENSE="|| ( LGPL-3 MPL-2.0 )"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc x86"
+IUSE="debug doc introspection static-libs test"
+
+RDEPEND="
+	dev-libs/libxml2
+	introspection? ( dev-libs/gobject-introspection )
+"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	doc? ( dev-util/gtk-doc )
+	introspection? ( dev-libs/gobject-introspection-common )
+	test? ( dev-libs/check )
+"
+
+# Upstream expect liblangtag to be installed when one runs tests...
+RESTRICT="test"
+
+src_prepare() {
+	default
+	xdg_environment_reset
+	if [[ -d docs/html ]]; then
+		rm -r docs/html || die "Failed to remove existing gtk-doc"
+	fi
+}
+
+src_configure() {
+	econf \
+		$(use_enable debug) \
+		$(use_enable doc gtk-doc) \
+		$(use_enable introspection) \
+		$(use_enable static-libs static) \
+		$(use_enable test)
+}
+
+src_install() {
+	default
+	prune_libtool_files --all
+}
diff --git a/app-text/liblangtag/metadata.xml b/app-text/liblangtag/metadata.xml
new file mode 100644
index 000000000000..eb7dc90a5e65
--- /dev/null
+++ b/app-text/liblangtag/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>office@gentoo.org</email>
+    <name>Gentoo Office project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="bitbucket">tagoh/liblangtag</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-text/libmspub-0.1.2 b/app-text/libmspub-0.1.2
deleted file mode 100644
index 486b2a0c47a0..000000000000
--- a/app-text/libmspub-0.1.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=dev-libs/icu:= dev-libs/librevenge sys-libs/zlib dev-libs/boost sys-devel/libtool virtual/pkgconfig doc? ( app-doc/doxygen )
-DESCRIPTION=Library parsing Microsoft Publisher documents
-EAPI=6
-HOMEPAGE=https://wiki.documentfoundation.org/DLP/Libraries/libmspub
-IUSE=doc static-libs
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ppc ppc64 x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-libs/icu:= dev-libs/librevenge sys-libs/zlib
-SLOT=0
-SRC_URI=https://dev-www.libreoffice.org/src/libmspub/libmspub-0.1.2.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0cf73c7eb8ecba3dc14b7335d3db256e
diff --git a/app-text/libmspub-0.1.4 b/app-text/libmspub-0.1.4
deleted file mode 100644
index a5a4382d8962..000000000000
--- a/app-text/libmspub-0.1.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=dev-libs/icu:= dev-libs/librevenge sys-libs/zlib dev-libs/boost sys-devel/libtool virtual/pkgconfig doc? ( app-doc/doxygen )
-DESCRIPTION=Library parsing Microsoft Publisher documents
-EAPI=6
-HOMEPAGE=https://wiki.documentfoundation.org/DLP/Libraries/libmspub
-IUSE=doc static-libs
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ppc64 x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-libs/icu:= dev-libs/librevenge sys-libs/zlib
-SLOT=0
-SRC_URI=https://dev-www.libreoffice.org/src/libmspub/libmspub-0.1.4.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=59681bb959c21276a5605faa1ec445cd
diff --git a/app-text/libmspub-9999 b/app-text/libmspub-9999
deleted file mode 100644
index acb5b0a4c6dd..000000000000
--- a/app-text/libmspub-9999
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure install prepare unpack
-DEPEND=dev-libs/icu:= dev-libs/librevenge sys-libs/zlib dev-libs/boost sys-devel/libtool virtual/pkgconfig doc? ( app-doc/doxygen ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=Library parsing Microsoft Publisher documents
-EAPI=6
-HOMEPAGE=https://wiki.documentfoundation.org/DLP/Libraries/libmspub
-IUSE=doc static-libs
-LICENSE=LGPL-2.1
-RDEPEND=dev-libs/icu:= dev-libs/librevenge sys-libs/zlib
-SLOT=0
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f768d04b7b670fe09646c4075942d275
diff --git a/app-text/libmspub/Manifest b/app-text/libmspub/Manifest
new file mode 100644
index 000000000000..1254005f5a46
--- /dev/null
+++ b/app-text/libmspub/Manifest
@@ -0,0 +1,6 @@
+DIST libmspub-0.1.2.tar.xz 345556 BLAKE2B a3b47fb188fc859abf54e3375514d31a1fafa21fb57fe0ac4a20013741a223a7011adf8ce7784b61346b49e9f4c0b6c353138dc12a5035f7bcc24576a508aa50 SHA512 c19025a2b887c33f5966b0972204ab2a8ae841b82df38eaf53c0cdc8f99d93cccab5e1c78143a79d5aef9c7a7387bd6f2cf34833a00861058e0e4687f48be714
+DIST libmspub-0.1.4.tar.xz 377472 BLAKE2B 89bd994a5aa2b3a22681dfe78fcea19561ea6057210e61630fa904ded12cca4694d715dd8f2fe8f687a91951bfa2f7aec1ff11d0b978a517476545bb07f654dd SHA512 7275f890645961b3fd56df4584788962e8c064fe3f99f5834c6ba6177ce76d00d544fbe9a25b7ab2f4180d2f3a90c609fe0bb68d61ea24e95b086190390fff31
+EBUILD libmspub-0.1.2.ebuild 1167 BLAKE2B 41b323d700a9a2096a7b5f265df9d6511605b8bc0940f0ef47380a27125ae07f32deac57dad92ace14beebe211cea81b1350e5a74d866fe9ef826dda69d8552e SHA512 523d3d1660341335b2b5e6995c84e794bff2920f18ba2cd36400ffdeb69c83718c42296422527e225cef9e6b86ad6dea1f613947936c7601aaee429d0bb8252f
+EBUILD libmspub-0.1.4.ebuild 1168 BLAKE2B fff7ee4af9526add5ef82bb18ff471b0914737760f0bd93f3642c5f636ca9ce3196ae3084f1f3e85b13f71b8beeb592bd425b89a755f633c39be9e168315302e SHA512 1ca54c51d7e88b9f65a615cc2c25e52ca62711e09f297c7fe11021c1ee37380a790d2f04af01b6ee9b19dab3d216e6ec876553a4a68d57fecb5170924abd9328
+EBUILD libmspub-9999.ebuild 1171 BLAKE2B b9df1f08071dfb36cd24e62e3e6e120b47c7f3a252a5921533357706a5eda7139e3f6e8720d6401c3259bd941ba326ac044de2772cb8a5bd86c86453d1f110ee SHA512 c6b9f035c794632f6e4ba273ea8ec31d23dc3067ba531bb4365ec6b945039b7ea59ab1f3e89934f3d2600b2b9147d6cc4889a858561e350accab32219e9afad3
+MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/app-text/libmspub/libmspub-0.1.2.ebuild b/app-text/libmspub/libmspub-0.1.2.ebuild
new file mode 100644
index 000000000000..16c01c8e0026
--- /dev/null
+++ b/app-text/libmspub/libmspub-0.1.2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic
+
+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() {
+	# bug 619044
+	append-cxxflags -std=c++14
+
+	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-0.1.4.ebuild b/app-text/libmspub/libmspub-0.1.4.ebuild
new file mode 100644
index 000000000000..f881fb03dafb
--- /dev/null
+++ b/app-text/libmspub/libmspub-0.1.4.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic
+
+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() {
+	# bug 619044
+	append-cxxflags -std=c++14
+
+	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
new file mode 100644
index 000000000000..c627cd0bee6f
--- /dev/null
+++ b/app-text/libmspub/libmspub-9999.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic
+
+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() {
+	# bug 619044
+	append-cxxflags -std=c++14
+
+	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/metadata.xml b/app-text/libmspub/metadata.xml
new file mode 100644
index 000000000000..13ce236ee519
--- /dev/null
+++ b/app-text/libmspub/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>office@gentoo.org</email>
+		<name>Gentoo Office project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-text/libmwaw-0.3.13 b/app-text/libmwaw-0.3.13
deleted file mode 100644
index 48697e5ec2a1..000000000000
--- a/app-text/libmwaw-0.3.13
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=dev-libs/librevenge sys-libs/zlib sys-devel/libtool virtual/pkgconfig doc? ( app-doc/doxygen )
-DESCRIPTION=Library parsing many pre-OSX MAC text formats
-EAPI=6
-HOMEPAGE=https://sourceforge.net/p/libmwaw/wiki/Home/
-IUSE=doc static-libs tools
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-libs/librevenge sys-libs/zlib
-SLOT=0
-SRC_URI=mirror://sourceforge/libmwaw/libmwaw-0.3.13.tar.xz
-_md5_=af12fddd186cca795e4f254c6d6e1c01
diff --git a/app-text/libmwaw-0.3.14 b/app-text/libmwaw-0.3.14
deleted file mode 100644
index 35a72e269870..000000000000
--- a/app-text/libmwaw-0.3.14
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=dev-libs/librevenge sys-libs/zlib sys-devel/libtool virtual/pkgconfig doc? ( app-doc/doxygen )
-DESCRIPTION=Library parsing many pre-OSX MAC text formats
-EAPI=6
-HOMEPAGE=https://sourceforge.net/p/libmwaw/wiki/Home/
-IUSE=doc static-libs tools
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-libs/librevenge sys-libs/zlib
-SLOT=0
-SRC_URI=mirror://sourceforge/libmwaw/libmwaw-0.3.14.tar.xz
-_md5_=63f310924a8e292f1df26e4d4a88d3bc
diff --git a/app-text/libmwaw-9999 b/app-text/libmwaw-9999
deleted file mode 100644
index c06bedbde89d..000000000000
--- a/app-text/libmwaw-9999
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure install prepare unpack
-DEPEND=dev-libs/librevenge sys-libs/zlib sys-devel/libtool virtual/pkgconfig doc? ( app-doc/doxygen ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=Library parsing many pre-OSX MAC text formats
-EAPI=6
-HOMEPAGE=https://sourceforge.net/p/libmwaw/wiki/Home/
-IUSE=doc static-libs tools
-LICENSE=LGPL-2.1
-RDEPEND=dev-libs/librevenge sys-libs/zlib
-SLOT=0
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	git-r3	8f6de46b0aa318aea0e8cac62ece098b	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=63f310924a8e292f1df26e4d4a88d3bc
diff --git a/app-text/libmwaw/Manifest b/app-text/libmwaw/Manifest
new file mode 100644
index 000000000000..69f1a6755029
--- /dev/null
+++ b/app-text/libmwaw/Manifest
@@ -0,0 +1,7 @@
+AUX libmwaw-0.3.13-buildfix.patch 562 BLAKE2B 4ec40a613a1ebb88ab5d3d790ec68789ecadc9852339a661beace56b56ad1201d33ae3ae046823f61219b159f732e7fb08ae79f9fd59fa8832d34d9fdfd60c6e SHA512 c7a87b316308f4448988d70e07184bcad462b7286e3f690eec8f377dd63ba95653e010bac8c1e00aba821fbab72d9c22d67a859f3b6e9c1bc88b5ca56e3756f7
+DIST libmwaw-0.3.13.tar.xz 1258220 BLAKE2B 79cb4d8a91d361ceae70fa7a0145fa9f5e230bbafba1b0a586b10a1375e34511769d2a5d6b8ba9b6b9676a3cffc9ae6d22529a1920ed4bf932ef7e88ca7bae0c SHA512 3d6a5142cc45f6519ac29f935c01418278ed4cc1bdcb0ecb1a190309c43d3f7ee06deab519d29a3e2aec01ef091cb4f4c17809662640b54a8e4fe8d4bd8db5f3
+DIST libmwaw-0.3.14.tar.xz 1276240 BLAKE2B 34a5b118064dcac37834c83b2b5a61303f3e2eb70e41322845ff7661a5494c0b85db0bb07c6bf1f357c2027cab1c515eade58bb6b4fdf845a81d4d079a414b98 SHA512 6893a7a8a72765a66973a94bc7de8b3b6061aa85fd9cca5e73cb2a4024cbe81f0c030df0b6383f24835643259c361efda5527813bb84a1b08d0089d509215888
+EBUILD libmwaw-0.3.13.ebuild 1055 BLAKE2B e11ebd9eeba3c2ae91dbf71e413eb2366a91b788e7394c34200ec1134bc7602adba37996699daa09de18711a9a00eedd96dfd1ee1c488e42c4c0ac1266e6eeae SHA512 13f090f1610613958c5f37070f41378636cd5b25f5a2f0899a6c464a61bc316a9429a0652c154945ae14fcb0c8905aef8eddadccd41419dd80dd025e9ce22a9e
+EBUILD libmwaw-0.3.14.ebuild 1010 BLAKE2B caf4e52dadd33b6348da5ae194d1d9364fb972dfbd4ed05b97a639f835958857b023c3a0afa658288e616e7500d3ae62fa6ee7de213b656b3084cb96633dd4d7 SHA512 313ac932f39b04df8668fddc72004ab421bb6415ca90569cde318345c40512cea7fca01f546ff044e92d373b11f5441a90be178ca6e1bac12be6743a0e6faf46
+EBUILD libmwaw-9999.ebuild 1010 BLAKE2B caf4e52dadd33b6348da5ae194d1d9364fb972dfbd4ed05b97a639f835958857b023c3a0afa658288e616e7500d3ae62fa6ee7de213b656b3084cb96633dd4d7 SHA512 313ac932f39b04df8668fddc72004ab421bb6415ca90569cde318345c40512cea7fca01f546ff044e92d373b11f5441a90be178ca6e1bac12be6743a0e6faf46
+MISC metadata.xml 403 BLAKE2B cbddacc98e4f22e521d739150ee4044b93c297dbd6d220a445192a3d1a6316491d6ed72ada8bd138c287133fcaf1b3d5ce580e68dd3ec071d36abbc1b05b4b6d SHA512 12cebd7bdaff6a793598f40cb11f4ae6681dcb29b18ecb7db92681abf1f6d4ce0281ae292c84106a143c0ff5ff3395e37604b3576c6a479001fc351dba10c7ed
diff --git a/app-text/libmwaw/files/libmwaw-0.3.13-buildfix.patch b/app-text/libmwaw/files/libmwaw-0.3.13-buildfix.patch
new file mode 100644
index 000000000000..5c9940e8860d
--- /dev/null
+++ b/app-text/libmwaw/files/libmwaw-0.3.13-buildfix.patch
@@ -0,0 +1,19 @@
+commit 4bc8ec0481f89b989b0c34236c9d5d9b8038d4a9
+Author: David Tardon <dtardon@redhat.com>
+Date:   Wed Nov 15 13:15:44 2017 +0100
+
+    fix call of explicit ctor
+
+diff --git a/src/lib/libmwaw_internal.hxx b/src/lib/libmwaw_internal.hxx
+index 2875a0fb..b844a9d5 100644
+--- a/src/lib/libmwaw_internal.hxx
++++ b/src/lib/libmwaw_internal.hxx
+@@ -1027,7 +1027,7 @@ public:
+   }
+   //! generic constructor
+   template <class U> explicit MWAWBox2(MWAWBox2<U> const &p)
+-    : m_data(p.min(), p.max())
++    : m_data(MWAWVec2<T>(p.min()), MWAWVec2<T>(p.max()))
+   {
+   }
+ 
diff --git a/app-text/libmwaw/libmwaw-0.3.13.ebuild b/app-text/libmwaw/libmwaw-0.3.13.ebuild
new file mode 100644
index 000000000000..7fe40d2eb2bb
--- /dev/null
+++ b/app-text/libmwaw/libmwaw-0.3.13.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGIT_REPO_URI="git://git.code.sf.net/p/libmwaw/libmwaw"
+[[ ${PV} == 9999 ]] && inherit autotools git-r3
+
+DESCRIPTION="Library parsing many pre-OSX MAC text formats"
+HOMEPAGE="https://sourceforge.net/p/libmwaw/wiki/Home/"
+[[ ${PV} == 9999 ]] || SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+
+[[ ${PV} == 9999 ]] || \
+KEYWORDS="amd64 ~arm ~arm64 x86"
+
+IUSE="doc static-libs tools"
+
+RDEPEND="
+	dev-libs/librevenge
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}
+	sys-devel/libtool
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+
+PATCHES=( "${FILESDIR}/${P}-buildfix.patch" )
+
+src_prepare() {
+	default
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
+src_configure() {
+	# zip is hard enabled as the zlib is dep on the rdeps anyway
+	econf \
+		--enable-zip \
+		--disable-werror \
+		$(use_with doc docs) \
+		$(use_enable static-libs static) \
+		$(use_enable tools)
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/app-text/libmwaw/libmwaw-0.3.14.ebuild b/app-text/libmwaw/libmwaw-0.3.14.ebuild
new file mode 100644
index 000000000000..7dde090fa754
--- /dev/null
+++ b/app-text/libmwaw/libmwaw-0.3.14.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGIT_REPO_URI="git://git.code.sf.net/p/libmwaw/libmwaw"
+[[ ${PV} == 9999 ]] && inherit autotools git-r3
+
+DESCRIPTION="Library parsing many pre-OSX MAC text formats"
+HOMEPAGE="https://sourceforge.net/p/libmwaw/wiki/Home/"
+[[ ${PV} == 9999 ]] || SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+
+[[ ${PV} == 9999 ]] || \
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+IUSE="doc static-libs tools"
+
+RDEPEND="
+	dev-libs/librevenge
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}
+	sys-devel/libtool
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+
+src_prepare() {
+	default
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
+src_configure() {
+	# zip is hard enabled as the zlib is dep on the rdeps anyway
+	econf \
+		--enable-zip \
+		--disable-werror \
+		$(use_with doc docs) \
+		$(use_enable static-libs static) \
+		$(use_enable tools)
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/app-text/libmwaw/libmwaw-9999.ebuild b/app-text/libmwaw/libmwaw-9999.ebuild
new file mode 100644
index 000000000000..7dde090fa754
--- /dev/null
+++ b/app-text/libmwaw/libmwaw-9999.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGIT_REPO_URI="git://git.code.sf.net/p/libmwaw/libmwaw"
+[[ ${PV} == 9999 ]] && inherit autotools git-r3
+
+DESCRIPTION="Library parsing many pre-OSX MAC text formats"
+HOMEPAGE="https://sourceforge.net/p/libmwaw/wiki/Home/"
+[[ ${PV} == 9999 ]] || SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+
+[[ ${PV} == 9999 ]] || \
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+IUSE="doc static-libs tools"
+
+RDEPEND="
+	dev-libs/librevenge
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}
+	sys-devel/libtool
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+
+src_prepare() {
+	default
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
+src_configure() {
+	# zip is hard enabled as the zlib is dep on the rdeps anyway
+	econf \
+		--enable-zip \
+		--disable-werror \
+		$(use_with doc docs) \
+		$(use_enable static-libs static) \
+		$(use_enable tools)
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/app-text/libmwaw/metadata.xml b/app-text/libmwaw/metadata.xml
new file mode 100644
index 000000000000..09f5b872fd22
--- /dev/null
+++ b/app-text/libmwaw/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>office@gentoo.org</email>
+		<name>Gentoo Office project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">libmwaw</remote-id>
+	</upstream>
+	<use>
+		<flag name="tools">Build file conversion tools</flag>
+	</use>
+</pkgmetadata>
diff --git a/app-text/libnumbertext-1.0 b/app-text/libnumbertext-1.0
deleted file mode 100644
index 08c8dd69affe..000000000000
--- a/app-text/libnumbertext-1.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Number to number name and money text conversion libraries
-EAPI=7
-HOMEPAGE=https://github.com/Numbertext/libnumbertext
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-3+
-SLOT=0
-SRC_URI=https://github.com/Numbertext/libnumbertext/archive/1.0.tar.gz -> libnumbertext-1.0.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=4556c04b3896801a02c27defa245a524
diff --git a/app-text/libnumbertext/Manifest b/app-text/libnumbertext/Manifest
new file mode 100644
index 000000000000..8a632499dd54
--- /dev/null
+++ b/app-text/libnumbertext/Manifest
@@ -0,0 +1,3 @@
+DIST libnumbertext-1.0.tar.gz 408181 BLAKE2B ceeba0a98c0d6fbfa92ad37347f7b7cb9887ea516126e35212d61e572a382a56c520406409e08024d53f1520219ec7e986324893b1c2b53330a217319d35ffc7 SHA512 b30f3650ba8cbaa771415026f40b7fc2cf5d9cd956a365d6654b1e2996fe61f714adfda845432e41f61f0fa474b1b60d99cc46cd6b7e42e1dccfd53f5017ae63
+EBUILD libnumbertext-1.0.ebuild 594 BLAKE2B dcdd03a0af68ce2e8c3965e189d25d8ee4aec77495169dff79d70dc284db7eb5369820caa707705b2c25728940d004dc14d2fa5e1f889701aff19cc056a73b0d SHA512 1fb69bce0a78b4eaccba9d706b6deee4fdf1ea8cfd690a35102bf78d5a9caf44ea03cadfa5301fcc4ae21dc4664227c5f6371ebb5fa73a555fa1ad63d90b7eb3
+MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/app-text/libnumbertext/libnumbertext-1.0.ebuild b/app-text/libnumbertext/libnumbertext-1.0.ebuild
new file mode 100644
index 000000000000..ad6d58d47ebb
--- /dev/null
+++ b/app-text/libnumbertext/libnumbertext-1.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Number to number name and money text conversion libraries"
+HOMEPAGE="https://github.com/Numbertext/libnumbertext"
+SRC_URI="https://github.com/Numbertext/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-werror
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/app-text/libnumbertext/metadata.xml b/app-text/libnumbertext/metadata.xml
new file mode 100644
index 000000000000..13ce236ee519
--- /dev/null
+++ b/app-text/libnumbertext/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>office@gentoo.org</email>
+		<name>Gentoo Office project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-text/libodfgen-0.1.6 b/app-text/libodfgen-0.1.6
deleted file mode 100644
index 897ac075d7ec..000000000000
--- a/app-text/libodfgen-0.1.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=dev-libs/librevenge virtual/pkgconfig doc? ( app-doc/doxygen )
-DESCRIPTION=Library to generate ODF documents from libwpd and libwpg
-EAPI=6
-HOMEPAGE=http://libwpd.sf.net
-IUSE=doc
-KEYWORDS=amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux
-LICENSE=|| ( LGPL-2.1 MPL-2.0 )
-RDEPEND=dev-libs/librevenge
-SLOT=0
-SRC_URI=mirror://sourceforge/libwpd/libodfgen-0.1.6.tar.xz
-_md5_=a735c02c876fddd51c41f3ca96749777
diff --git a/app-text/libodfgen-9999 b/app-text/libodfgen-9999
deleted file mode 100644
index bb07815adaa2..000000000000
--- a/app-text/libodfgen-9999
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure install prepare unpack
-DEPEND=dev-libs/librevenge virtual/pkgconfig doc? ( app-doc/doxygen ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=Library to generate ODF documents from libwpd and libwpg
-EAPI=6
-HOMEPAGE=http://libwpd.sf.net
-IUSE=doc
-LICENSE=|| ( LGPL-2.1 MPL-2.0 )
-RDEPEND=dev-libs/librevenge
-SLOT=0
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	git-r3	8f6de46b0aa318aea0e8cac62ece098b	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=78070eb076a79417df9a8060c1cb8e39
diff --git a/app-text/libodfgen/Manifest b/app-text/libodfgen/Manifest
new file mode 100644
index 000000000000..966db7bca6fd
--- /dev/null
+++ b/app-text/libodfgen/Manifest
@@ -0,0 +1,4 @@
+DIST libodfgen-0.1.6.tar.xz 359988 BLAKE2B 89ef70762780efa70ea044758d3c5e677024897bcd1f031c15544dc2e5cc0115bd286ca21051b8223768a2253eb681bdea534230c517de9c00a0a1f5b320eaf3 SHA512 bc5e6908ee14c576adececdf8a94ae01f2ed487e6f2490e41aab787e1e8f72a3fb2a786f51ceeefa327710af215741ce13bcf4bb3d99d2aaf403f568c5db75a5
+EBUILD libodfgen-0.1.6.ebuild 892 BLAKE2B 885e578968e244219c331f469725dc87bf9050dc803820292f8341089d8c37c70a43eb940b315abf1d20b8845e8b63e9e7026b7f5fe833e36b359201154e4b8f SHA512 2d1465998ba5e568fa4f79b86833936a67640dc2844d3fcd865879f1e9c5006345a5143827dab71fa30a3341fc82783798d2dd335165d13e3b55e18080dd233d
+EBUILD libodfgen-9999.ebuild 887 BLAKE2B bc6f0f5f96b318c45b51928dc79faf3184b7079ed310fcdf8ad53bb3d00c3f68e2634a218366f403664e60d5fe973ddc8b511c6fe39bba9415cc1627cb9bccb8 SHA512 801ff64c3f1fc23dcd53500a8cff20434bf4f9416d968df681961e82a72e0b8e96b97a2a10fbbd2fb7838e9437c61f24a218822d876b2df68d5a6e9d98f63ad6
+MISC metadata.xml 331 BLAKE2B 4bb9537b8eacb393e4dd38a4199d954aa12aa917f626ffd125cecb49c2fe4b4e866bc33c941323eae45c2b804fdadc1e7200a1dfe6f57472a5e1a7881bf68bc1 SHA512 f96053e0336bf862446e0ca96ca743a1b7fac4977e6d5d4b9781424ac33a3d89c3e4c334eb27a427d3f83c2c437e8fe4b0eaf4ed87513c3eeaae39a72db8767d
diff --git a/app-text/libodfgen/libodfgen-0.1.6.ebuild b/app-text/libodfgen/libodfgen-0.1.6.ebuild
new file mode 100644
index 000000000000..c966282b7ed2
--- /dev/null
+++ b/app-text/libodfgen/libodfgen-0.1.6.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGIT_REPO_URI="git://git.code.sf.net/p/libwpd/libodfgen"
+[[ ${PV} == 9999 ]] && inherit autotools git-r3
+
+DESCRIPTION="Library to generate ODF documents from libwpd and libwpg"
+HOMEPAGE="http://libwpd.sf.net"
+[[ ${PV} == 9999 ]] || SRC_URI="mirror://sourceforge/libwpd/${P}.tar.xz"
+
+LICENSE="|| ( LGPL-2.1 MPL-2.0 )"
+SLOT="0"
+
+[[ ${PV} == 9999 ]] || \
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
+
+IUSE="doc"
+
+RDEPEND="
+	dev-libs/librevenge
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+
+src_prepare() {
+	default
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-static \
+		--disable-werror \
+		--with-sharedptr=c++11 \
+		$(use_with doc docs)
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/app-text/libodfgen/libodfgen-9999.ebuild b/app-text/libodfgen/libodfgen-9999.ebuild
new file mode 100644
index 000000000000..3e7137661d27
--- /dev/null
+++ b/app-text/libodfgen/libodfgen-9999.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGIT_REPO_URI="git://git.code.sf.net/p/libwpd/libodfgen"
+[[ ${PV} == 9999 ]] && inherit autotools git-r3
+
+DESCRIPTION="Library to generate ODF documents from libwpd and libwpg"
+HOMEPAGE="http://libwpd.sf.net"
+[[ ${PV} == 9999 ]] || SRC_URI="mirror://sourceforge/libwpd/${P}.tar.xz"
+
+LICENSE="|| ( LGPL-2.1 MPL-2.0 )"
+SLOT="0"
+
+[[ ${PV} == 9999 ]] || \
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+
+IUSE="doc"
+
+RDEPEND="
+	dev-libs/librevenge
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+
+src_prepare() {
+	default
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-static \
+		--disable-werror \
+		--with-sharedptr=c++11 \
+		$(use_with doc docs)
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/app-text/libodfgen/metadata.xml b/app-text/libodfgen/metadata.xml
new file mode 100644
index 000000000000..d7faa3c71f7a
--- /dev/null
+++ b/app-text/libodfgen/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>office@gentoo.org</email>
+		<name>Gentoo Office project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">libwpd</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/libpaper-1.1.24-r2 b/app-text/libpaper-1.1.24-r2
deleted file mode 100644
index ff5ecbc713f6..000000000000
--- a/app-text/libpaper-1.1.24-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Library for handling paper characteristics
-EAPI=4
-HOMEPAGE=http://packages.debian.org/unstable/source/libpaper
-IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-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
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://debian/pool/main/libp/libpaper/libpaper_1.1.24.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d5cb10f9f941547e4539cc640ac898ec
diff --git a/app-text/libpaper-1.1.24_p5 b/app-text/libpaper-1.1.24_p5
deleted file mode 100644
index e4530fd7a830..000000000000
--- a/app-text/libpaper-1.1.24_p5
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Library for handling paper characteristics
-EAPI=6
-HOMEPAGE=http://packages.debian.org/unstable/source/libpaper
-IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://debian/pool/main/libp/libpaper/libpaper_1.1.24+nmu5.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=65fbd1b103c26019800888a3f18e4c99
diff --git a/app-text/libpaper/Manifest b/app-text/libpaper/Manifest
new file mode 100644
index 000000000000..e4456ed6e3c8
--- /dev/null
+++ b/app-text/libpaper/Manifest
@@ -0,0 +1,5 @@
+DIST libpaper_1.1.24+nmu5.tar.gz 49032 BLAKE2B 27a684dc02d5d25c84a92161e7178d1f369444d50c316e7303579a2f8ede8590d4a19637b7066fcc8909f7942fa965d8421d468b28e99b8e963f4b2b170f2ab3 SHA512 4d20d454dd7d09dd7e84b9ccc3b0ff8d65d95e0ae3874ec41462f812882e7ead032310396801a47a32bfff112c4a9adaf2d8d3e6235a1fa6fbb853196a363c56
+DIST libpaper_1.1.24.tar.gz 355272 BLAKE2B 28617744c7361a5d51bad3eda876b3a2c03e5aad0b381aeae037a7280c88dde7cf3c3a457e7aed2dbd86b116ae6ce2469f65edc0eedbb0c2df68451813a5a579 SHA512 f90816723dafa9ce0aef652e027b13174d2430208003d3715d6f96226130bc66cfc36465f1a5a3f855697708c389f219b964a5534a64a8c98ac53662040df67b
+EBUILD libpaper-1.1.24-r2.ebuild 1171 BLAKE2B fdac1481068b67658044f6cfc463e83159f0019092c1894edd48bee69dac07456f48fe7a3fa80205222b8199b0f962210f71130d9b8767f181faa6604f81a2d0 SHA512 994e5f082733408c99452d5fa19073be84eef45d51ff651adea2fd1963f6c8af78f4266d88a1326497f807c35437c09fbcac17fb761c90c3c9ab21967b3add51
+EBUILD libpaper-1.1.24_p5.ebuild 1216 BLAKE2B cd5eb27d8b4caa1d11b7de1d4ad5492bfa715769618b610b9ab8b7afd3d7e915aec59e7e620e4741c4af8be2ce004817e128a9c6f733f7f3c5135230cf9574a8 SHA512 782e9a3ddfbfa463c09b4d2f4054d38d6be75dfb4aa558893e37e9db84b7ccfda260e2b36e39787989dc20f3f386d349e4d4877ba4d4720ff2b770664777dabe
+MISC metadata.xml 255 BLAKE2B 06f078acf8e4416705c8bad8b4802a44592eb962c08c050e11332bfa97564fafdf08754ab056eb813f6baeaa6cdfaf5d71672455d77e74045f86098c221d5136 SHA512 c6c5f966cfbe396fde1b15334442de9e0004b44c4b48775588b0b25a058ad1751252761370c9c254280e97561fa6306f5aa0cc7959c675d4ee11f7f95d777a36
diff --git a/app-text/libpaper/libpaper-1.1.24-r2.ebuild b/app-text/libpaper/libpaper-1.1.24-r2.ebuild
new file mode 100644
index 000000000000..0dbca3f2a9e2
--- /dev/null
+++ b/app-text/libpaper/libpaper-1.1.24-r2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit eutils autotools multilib-minimal
+
+MY_PV=${PV/_p/+nmu}
+DESCRIPTION="Library for handling paper characteristics"
+HOMEPAGE="http://packages.debian.org/unstable/source/libpaper"
+SRC_URI="mirror://debian/pool/main/libp/libpaper/${PN}_${MY_PV}.tar.gz"
+
+LICENSE="GPL-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"
+IUSE=""
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+DOCS=( README ChangeLog debian/changelog )
+
+src_prepare() {
+	sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.ac || die
+	eautoreconf
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}"	econf \
+		--disable-static
+}
+
+multilib_src_install_all() {
+	prune_libtool_files --all
+	einstalldocs
+
+	dodir /etc
+	(paperconf 2>/dev/null || echo a4) > "${ED}"/etc/papersize \
+		|| die "papersize config failed"
+
+	if ! has_version app-text/libpaper ; then
+		echo
+		elog "run e.g. \"paperconfig -p letter\" as root to use letter-pagesizes"
+		echo
+	fi
+}
diff --git a/app-text/libpaper/libpaper-1.1.24_p5.ebuild b/app-text/libpaper/libpaper-1.1.24_p5.ebuild
new file mode 100644
index 000000000000..33ec218e9811
--- /dev/null
+++ b/app-text/libpaper/libpaper-1.1.24_p5.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools multilib-minimal
+
+MY_PV=${PV/_p/+nmu}
+DESCRIPTION="Library for handling paper characteristics"
+HOMEPAGE="http://packages.debian.org/unstable/source/libpaper"
+SRC_URI="mirror://debian/pool/main/libp/libpaper/${PN}_${MY_PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+DOCS=( README ChangeLog debian/changelog )
+
+src_prepare() {
+	sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.ac || die
+	eautoreconf
+	default
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}"	econf \
+		--disable-static
+}
+
+multilib_src_install_all() {
+	find "${ED}" -name '*.la' -exec rm -f {} +
+
+	einstalldocs
+
+	dodir /etc
+	(paperconf 2>/dev/null || echo a4) > "${ED}"/etc/papersize \
+		|| die "papersize config failed"
+
+	if ! has_version app-text/libpaper ; then
+		echo
+		elog "run e.g. \"paperconfig -p letter\" as root to use letter-pagesizes"
+		echo
+	fi
+}
diff --git a/app-text/libpaper/metadata.xml b/app-text/libpaper/metadata.xml
new file mode 100644
index 000000000000..c439b06d8c84
--- /dev/null
+++ b/app-text/libpaper/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>printing@gentoo.org</email>
+	<name>Gentoo Printing Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-text/libqxp-0.0.1 b/app-text/libqxp-0.0.1
deleted file mode 100644
index 5f0447dbb5b8..000000000000
--- a/app-text/libqxp-0.0.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=dev-libs/librevenge dev-libs/icu:= dev-libs/boost virtual/pkgconfig doc? ( app-doc/doxygen )
-DESCRIPTION=Library parsing QuarkXpress documents
-EAPI=6
-HOMEPAGE=https://wiki.documentfoundation.org/DLP/Libraries/libqxp
-IUSE=debug doc test tools
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=MPL-2.0
-RDEPEND=dev-libs/librevenge dev-libs/icu:=
-SLOT=0
-SRC_URI=https://dev-www.libreoffice.org/src/libqxp/libqxp-0.0.1.tar.xz
-_md5_=6b162727d2f6559ce963d9c9a7409bed
diff --git a/app-text/libqxp/Manifest b/app-text/libqxp/Manifest
new file mode 100644
index 000000000000..4bd817aead09
--- /dev/null
+++ b/app-text/libqxp/Manifest
@@ -0,0 +1,3 @@
+DIST libqxp-0.0.1.tar.xz 340184 BLAKE2B 759e5d0fb5886485f4ebe4a6caa34d1d98dc623c0ae124c6666a1be5ce7fb73686fc83360712d59d020e4788b39aa57d32149b7641d71b73dde917df46617f17 SHA512 a03a9ada658a92f4d985cad91d467b3916334c74dc26c1e4de89e3929e0135ca0e9c7e7e18ce616ef56a67863ec19c2638494400785849017f9a4776df07c607
+EBUILD libqxp-0.0.1.ebuild 739 BLAKE2B d4430fe59ef2c7a64a2d96a87354ae15cdb26849ae752927d87fc6c9aefd77a957c6104862fbb6689bc4b1b543e988068eedac682583c6cf34e5f14f80402a3d SHA512 42479a0ea9e024af42a40469a773c2830692dfa0b13b791f28cb29f5abaecab4766ce9debfae41ab6b41e21fc3464822618d09bc1c801ce1958bab0f39189fdf
+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..bfa4a9fb2255
--- /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 ~arm ~arm64 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/libqxp/metadata.xml b/app-text/libqxp/metadata.xml
new file mode 100644
index 000000000000..e99ec98e14f8
--- /dev/null
+++ b/app-text/libqxp/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>office@gentoo.org</email>
+		<name>Gentoo Office project</name>
+	</maintainer>
+	<use>
+		<flag name="tools">Build file conversion tools</flag>
+	</use>
+</pkgmetadata>
diff --git a/app-text/libspectre-0.2.7 b/app-text/libspectre-0.2.7
deleted file mode 100644
index 22d1bd2a206d..000000000000
--- a/app-text/libspectre-0.2.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=>=app-text/ghostscript-gpl-8.62 virtual/pkgconfig doc? ( app-doc/doxygen ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A library for rendering Postscript documents
-EAPI=4
-HOMEPAGE=https://www.freedesktop.org/wiki/Software/libspectre
-IUSE=debug doc static-libs
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris
-LICENSE=GPL-2
-RDEPEND=>=app-text/ghostscript-gpl-8.62
-RESTRICT=test
-SLOT=0
-SRC_URI=https://libspectre.freedesktop.org/releases/libspectre-0.2.7.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=65a0cbbdea21ee1b66a04a9a3e505df5
diff --git a/app-text/libspectre-0.2.8 b/app-text/libspectre-0.2.8
deleted file mode 100644
index 9284b4511470..000000000000
--- a/app-text/libspectre-0.2.8
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=>=app-text/ghostscript-gpl-8.62 virtual/pkgconfig doc? ( app-doc/doxygen ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A library for rendering Postscript documents
-EAPI=6
-HOMEPAGE=https://www.freedesktop.org/wiki/Software/libspectre
-IUSE=debug doc static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris
-LICENSE=GPL-2
-RDEPEND=>=app-text/ghostscript-gpl-8.62
-RESTRICT=test
-SLOT=0
-SRC_URI=https://libspectre.freedesktop.org/releases/libspectre-0.2.8.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=734d75d527cb49557bed1021d0609f93
diff --git a/app-text/libspectre/Manifest b/app-text/libspectre/Manifest
new file mode 100644
index 000000000000..eecc1d39eb29
--- /dev/null
+++ b/app-text/libspectre/Manifest
@@ -0,0 +1,7 @@
+AUX libspectre-0.2.0-interix.patch 728 BLAKE2B 5954fa18e92c33f086e3cd45b1d837aa1dcebdef21f595ddaa7f3485bd02f563eafdfd8c0e541cf782875de2818aa91d07e2c1d377457197760095da0e69a7c2 SHA512 d5b35ea095175a3f51553e3bed6e0e02bf7396b036923660d2ea6cd73241ef6d84a8dac977c9ce38078d41b99aadc203e13853d7087624a43f2a3eae35fedb8c
+AUX libspectre-0.2.7-gs918.patch 1272 BLAKE2B 37f9b02992e622754c271d6c2d4921a3ee55d657f66d810b27498cc908c332ed735a177a1594fa625c135c13a9cc0809b1fbbba9e66ea7bcaa3e69df0aa5fdfd SHA512 50c307ffd6fbd1de92239670afa61a68a32b788e3664a1d4d5b86a074102596e678492c91f6ff9fb8ca58bbe00b5a5fc01034a0d04e5cee3149932ce0337b401
+DIST libspectre-0.2.7.tar.gz 387947 BLAKE2B 1d8c5ce045e90cb10a159615d3b011dafd24fa07c8bbd79349663880d077b53944495cba7f5a77e8e32735123762d0f6fcd2feb382258b8d35107284f72243b8 SHA512 2e60905f7eeed9ac6ec3b5f8b47a7dad85178c8c35a63ba097ef6088dd334f7fde5797ecb05cf67532b759d07a65006427914d2cd6b09107ecc90620c9541794
+DIST libspectre-0.2.8.tar.gz 421791 BLAKE2B bbefa06cf80ecb91f0f780493e1829eadc34061b6f2b3004f9ae01e06fc4609edd440df290be9ff1c9f43e580b53791aae033feb4115743a0f03f703bc18e0c7 SHA512 ebbe7f6adcbc7f7d6af61f24e23b114116c878755dbe90f1163546c1284a005b4d539be01986c1f940611e84141ca19768b8effc2abf1013606da7c93547da86
+EBUILD libspectre-0.2.7.ebuild 1232 BLAKE2B d77eb5e11d74f44972efd3a04252e44a8b0d37734957ad7ecad6f847be51a78f37cf0617f49a62c77211ea1d3b03216ef1a725832c698c06e9fe5bacd0f6a4dd SHA512 b3e700400305328d680e5e1a62aa696990cdff6ac55e3fe5079549ffb3c53e30559ff69b5d05090c6929d4511d2c13a28b82ba50ab0adcc412546da52b7b4992
+EBUILD libspectre-0.2.8.ebuild 1113 BLAKE2B e9871eff6710bca21e8d19332c9d0d494a55d13109ba306e15e320dad874a61516a32d62ede683d3adc6b4bc25ddeed72dc6528962d025bc4017d134a337574b SHA512 605ad231744d73a078ce1f4532dab61966117311796597b146906becdbc83a3ceaf2c388442e0f809fb4a662bb07cad29a4ede41af66442deee9b2489f73e61d
+MISC metadata.xml 232 BLAKE2B b8ca675b002ba96d45a3afe7b6dd9f0e74d21db87eb002f72bae4e23fd49602115a18b372084596fdc09c3dccef80ae95ab540dad93fdf5dab0c9fb34f5d28db SHA512 21ba416ac701f1c9deb55d07f8afbf9da930fb04d274d84c5cf0df5e549554059959228ee6a4b8523d985fe0762af1a7c36aaefcb0e5b3c7baa5866e2841cfb4
diff --git a/app-text/libspectre/files/libspectre-0.2.0-interix.patch b/app-text/libspectre/files/libspectre-0.2.0-interix.patch
new file mode 100644
index 000000000000..7b607542dfad
--- /dev/null
+++ b/app-text/libspectre/files/libspectre-0.2.0-interix.patch
@@ -0,0 +1,29 @@
+diff -ru libspectre-0.2.0.orig/libspectre/spectre-utils.c libspectre-0.2.0/libspectre/spectre-utils.c
+--- libspectre-0.2.0.orig/libspectre/spectre-utils.c	2008-05-06 08:35:07 +0200
++++ libspectre-0.2.0/libspectre/spectre-utils.c	2008-05-06 08:49:51 +0200
+@@ -148,6 +148,17 @@
+ spectre_strdup_vprintf (const char *format,
+ 			va_list     args)
+ {
++#ifdef __INTERIX
++	/* no [v]asprintf here, so we need to do something else. */
++	char * string = NULL;
++	char buf[524288];
++
++	if(vsprintf(buf, format, args) < 0)
++		return NULL;
++	
++	string = strdup(buf);
++	return string;
++#else
+ 	char *string = NULL;
+ 	int len = vasprintf (&string, format, args);
+ 	
+@@ -155,6 +166,7 @@
+ 		string = NULL;
+ 
+ 	return string;
++#endif
+ }
+ 
+ char *
diff --git a/app-text/libspectre/files/libspectre-0.2.7-gs918.patch b/app-text/libspectre/files/libspectre-0.2.7-gs918.patch
new file mode 100644
index 000000000000..e9a4eda192ba
--- /dev/null
+++ b/app-text/libspectre/files/libspectre-0.2.7-gs918.patch
@@ -0,0 +1,42 @@
+Fixed error namespace for >=ghostscript-gpl-9.18
+
+https://bugs.gentoo.org/563540
+
+--- libspectre-0.2.7/libspectre/spectre-gs.c
++++ libspectre-0.2.7/libspectre/spectre-gs.c
+@@ -43,12 +43,12 @@
+ 	
+ 	if (code <= -100) {
+ 		switch (code) {
+-			case e_Fatal:
++			case gs_error_Fatal:
+ 				fprintf (stderr, "fatal internal error %d", code);
+ 				return TRUE;
+ 				break;
+ 
+-			case e_ExecStackUnderflow:
++			case gs_error_ExecStackUnderflow:
+ 				fprintf (stderr, "stack overflow %d", code);
+ 				return TRUE;
+ 				break;
+@@ -109,9 +109,9 @@
+ 		set = _spectre_strdup_printf ("%d %d translate\n", -x, -y);
+ 		error = gsapi_run_string_continue (ghostscript_instance, set, strlen (set),
+ 						   0, &exit_code);
+-		error = error == e_NeedInput ? 0 : error;
++		error = error == gs_error_NeedInput ? 0 : error;
+ 		free (set);
+-		if (error != e_NeedInput && critic_error_code (error)) {
++		if (error != gs_error_NeedInput && critic_error_code (error)) {
+ 			fclose (fd);
+ 			return FALSE;
+ 		}
+@@ -126,7 +126,7 @@
+ 		read = fread (buf, sizeof (char), to_read, fd);
+ 		error = gsapi_run_string_continue (ghostscript_instance,
+ 						   buf, read, 0, &exit_code);
+-		error = error == e_NeedInput ? 0 : error;
++		error = error == gs_error_NeedInput ? 0 : error;
+ 		left -= read;
+ 	}
+ 	
diff --git a/app-text/libspectre/libspectre-0.2.7.ebuild b/app-text/libspectre/libspectre-0.2.7.ebuild
new file mode 100644
index 000000000000..7fbb9e521c29
--- /dev/null
+++ b/app-text/libspectre/libspectre-0.2.7.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+inherit autotools eutils
+
+DESCRIPTION="A library for rendering Postscript documents"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/libspectre"
+SRC_URI="https://libspectre.freedesktop.org/releases/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
+IUSE="debug doc static-libs"
+
+RDEPEND=">=app-text/ghostscript-gpl-8.62"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )"
+
+# does not actually test anything, see bug 362557
+RESTRICT="test"
+
+DOCS="NEWS README TODO"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.2.0-interix.patch
+	has_version \>=app-text/ghostscript-gpl-9.18 \
+		&& epatch "${FILESDIR}"/${PN}-0.2.7-gs918.patch
+	eautoreconf # need new libtool for interix
+}
+
+src_configure() {
+	econf \
+		$(use_enable debug asserts) \
+		$(use_enable debug checks) \
+		$(use_enable static-libs static) \
+		--disable-test
+}
+
+src_compile() {
+	emake
+	if use doc; then
+		doxygen || die
+	fi
+}
+
+src_install() {
+	default
+	use doc && dohtml -r doc/html/*
+	find "${D}" -name '*.la' -exec rm -f {} +
+}
diff --git a/app-text/libspectre/libspectre-0.2.8.ebuild b/app-text/libspectre/libspectre-0.2.8.ebuild
new file mode 100644
index 000000000000..18588796b3f4
--- /dev/null
+++ b/app-text/libspectre/libspectre-0.2.8.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils
+
+DESCRIPTION="A library for rendering Postscript documents"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/libspectre"
+SRC_URI="https://libspectre.freedesktop.org/releases/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
+IUSE="debug doc static-libs"
+
+RDEPEND=">=app-text/ghostscript-gpl-8.62"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+
+# does not actually test anything, see bug 362557
+RESTRICT="test"
+
+src_prepare() {
+	default
+	eapply "${FILESDIR}"/${PN}-0.2.0-interix.patch
+	eautoreconf # need new libtool for interix
+}
+
+src_configure() {
+	econf \
+		$(use_enable debug asserts) \
+		$(use_enable debug checks) \
+		$(use_enable static-libs static) \
+		--disable-test
+}
+
+src_compile() {
+	emake
+	if use doc; then
+		doxygen || die
+	fi
+}
+
+src_install() {
+	default
+	use doc && dohtml -r doc/html/*
+	prune_libtool_files
+}
diff --git a/app-text/libspectre/metadata.xml b/app-text/libspectre/metadata.xml
new file mode 100644
index 000000000000..f3cab85cf603
--- /dev/null
+++ b/app-text/libspectre/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>freedesktop-bugs@gentoo.org</email>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-text/libstaroffice-0.0.5 b/app-text/libstaroffice-0.0.5
deleted file mode 100644
index 1c8c00746a70..000000000000
--- a/app-text/libstaroffice-0.0.5
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=dev-libs/librevenge zlib? ( sys-libs/zlib ) doc? ( app-doc/doxygen )
-DESCRIPTION=Import filter for old StarOffice documents
-EAPI=6
-HOMEPAGE=https://github.com/fosnola/libstaroffice
-IUSE=debug doc tools +zlib
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=|| ( LGPL-2.1+ MPL-2.0 )
-RDEPEND=dev-libs/librevenge zlib? ( sys-libs/zlib )
-SLOT=0
-SRC_URI=http://dev-www.libreoffice.org/src/libstaroffice-0.0.5.tar.xz
-_md5_=595a0b9067174ff44e19c2de5cdee1eb
diff --git a/app-text/libstaroffice-0.0.6 b/app-text/libstaroffice-0.0.6
deleted file mode 100644
index 18a1c5857f19..000000000000
--- a/app-text/libstaroffice-0.0.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=dev-libs/librevenge zlib? ( sys-libs/zlib ) doc? ( app-doc/doxygen )
-DESCRIPTION=Import filter for old StarOffice documents
-EAPI=6
-HOMEPAGE=https://github.com/fosnola/libstaroffice
-IUSE=debug doc tools +zlib
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=|| ( LGPL-2.1+ MPL-2.0 )
-RDEPEND=dev-libs/librevenge zlib? ( sys-libs/zlib )
-SLOT=0
-SRC_URI=http://dev-www.libreoffice.org/src/libstaroffice-0.0.6.tar.xz
-_md5_=5e2a1ad97118c1c6f2ffec74ece1f3aa
diff --git a/app-text/libstaroffice-9999 b/app-text/libstaroffice-9999
deleted file mode 100644
index ef4e2c26afdb..000000000000
--- a/app-text/libstaroffice-9999
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure install prepare unpack
-DEPEND=dev-libs/librevenge zlib? ( sys-libs/zlib ) doc? ( app-doc/doxygen ) >=dev-vcs/git-1.8.2.1[curl] >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Import filter for old StarOffice documents
-EAPI=6
-HOMEPAGE=https://github.com/fosnola/libstaroffice
-IUSE=debug doc tools +zlib
-LICENSE=|| ( LGPL-2.1+ MPL-2.0 )
-RDEPEND=dev-libs/librevenge zlib? ( sys-libs/zlib )
-SLOT=0
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	git-r3	8f6de46b0aa318aea0e8cac62ece098b	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=5e2a1ad97118c1c6f2ffec74ece1f3aa
diff --git a/app-text/libstaroffice/Manifest b/app-text/libstaroffice/Manifest
new file mode 100644
index 000000000000..934b46a0e3f3
--- /dev/null
+++ b/app-text/libstaroffice/Manifest
@@ -0,0 +1,6 @@
+DIST libstaroffice-0.0.5.tar.xz 682380 BLAKE2B 1f514873a7dcaf210fae77f32e88ce7e3e8652474f51616865cb95ff81e7ceb86d784aab0efc301b86b416264fd0eb59c9be717039fb6a4fb086c9d09ec124ae SHA512 937fc618bef79c9e25957f25f39bc829621b0a2da0213cbfb1b56c2b00d44f61bcd9db67d3e6329a4bd700a2c88fc743088381f58a96a87712b040c0ffc17fde
+DIST libstaroffice-0.0.6.tar.xz 706324 BLAKE2B 5ff692c85bb48a7cd4c1e05e0afcc3ab26d627254dcf0b4ba10314c6ec654d69e2910f031ec7b88c9d28c48fe6a7267cd2434d224dc980ad9e266273cbc65bfa SHA512 9b5313a069e29265875f2e744b6b39c261f578d72f67fdefe1454c092aaa28399e1b3dfcb3a2f881f9a60674e0115a29350fba3ee37fb442f0a837982077f324
+EBUILD libstaroffice-0.0.5.ebuild 936 BLAKE2B 679e15b1ff60c00f82b0e2e847d3dae87877136aad694d07cdebc30b7cf2b7ea9f2b2011d019469b43bbe4c65f256225b1eb25e870d61adb9d7212e62fcb059a SHA512 fd6bdf21f011c4c47ef75a43e2e76305f2e57efcb67c713a23bb67b9422a4b1690b34048910c5e3b9576c03db934dc643312f19c9a638534979b12540538a087
+EBUILD libstaroffice-0.0.6.ebuild 938 BLAKE2B 11fc9d72cf695d1f5a5d113e1ffa1dbb93a9fe2e1d58ea560951566f80d604e3900d24c67c5ed02c54c5b6b8ecc1356b5fffeab9e5c3ba7408892146ca73e7ef SHA512 12a9e7e4a9555134c2a6950c80ee093f1fff810daaa3bff64880b04ece88d226e8e00eb55e2f76712bbc0a050b42ad03bf7a57ea60ed0e25345a37c85d968ac9
+EBUILD libstaroffice-9999.ebuild 938 BLAKE2B 11fc9d72cf695d1f5a5d113e1ffa1dbb93a9fe2e1d58ea560951566f80d604e3900d24c67c5ed02c54c5b6b8ecc1356b5fffeab9e5c3ba7408892146ca73e7ef SHA512 12a9e7e4a9555134c2a6950c80ee093f1fff810daaa3bff64880b04ece88d226e8e00eb55e2f76712bbc0a050b42ad03bf7a57ea60ed0e25345a37c85d968ac9
+MISC metadata.xml 469 BLAKE2B a9dad122953621001465506893edb9b72c1b1e7a213f0cfbf155a985595d7d319041d95030ea80411a6c21c97aea0a2aa891538f26f31f46cfc4ac6ceb75d183 SHA512 2f352e3b818123c53c188dd2d31b7ea3acc1bdbe9dc127d44697512eeb2a7cf2e138b306c69c619cf7fb24d8424305ff4b3d5637fd945c2832a2dfb9ef7743c8
diff --git a/app-text/libstaroffice/libstaroffice-0.0.5.ebuild b/app-text/libstaroffice/libstaroffice-0.0.5.ebuild
new file mode 100644
index 000000000000..1a1f5ef759ea
--- /dev/null
+++ b/app-text/libstaroffice/libstaroffice-0.0.5.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGIT_REPO_URI="https://github.com/fosnola/libstaroffice.git"
+[[ ${PV} == 9999 ]] && inherit git-r3 autotools
+
+DESCRIPTION="Import filter for old StarOffice documents"
+HOMEPAGE="https://github.com/fosnola/libstaroffice"
+[[ ${PV} == 9999 ]] || SRC_URI="http://dev-www.libreoffice.org/src/${P}.tar.xz"
+
+LICENSE="|| ( LGPL-2.1+ MPL-2.0 )"
+SLOT="0"
+[[ ${PV} == 9999 ]] || \
+KEYWORDS="amd64 ~arm ~arm64 x86"
+
+IUSE="debug doc tools +zlib"
+
+RDEPEND="
+	dev-libs/librevenge
+	zlib? ( sys-libs/zlib )
+"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )
+"
+
+src_prepare() {
+	default
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-werror \
+		$(use_enable debug) \
+		$(use_with doc docs) \
+		$(use_enable tools) \
+		$(use_enable zlib zip)
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/app-text/libstaroffice/libstaroffice-0.0.6.ebuild b/app-text/libstaroffice/libstaroffice-0.0.6.ebuild
new file mode 100644
index 000000000000..7578276aed40
--- /dev/null
+++ b/app-text/libstaroffice/libstaroffice-0.0.6.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGIT_REPO_URI="https://github.com/fosnola/libstaroffice.git"
+[[ ${PV} == 9999 ]] && inherit git-r3 autotools
+
+DESCRIPTION="Import filter for old StarOffice documents"
+HOMEPAGE="https://github.com/fosnola/libstaroffice"
+[[ ${PV} == 9999 ]] || SRC_URI="http://dev-www.libreoffice.org/src/${P}.tar.xz"
+
+LICENSE="|| ( LGPL-2.1+ MPL-2.0 )"
+SLOT="0"
+[[ ${PV} == 9999 ]] || \
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+IUSE="debug doc tools +zlib"
+
+RDEPEND="
+	dev-libs/librevenge
+	zlib? ( sys-libs/zlib )
+"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )
+"
+
+src_prepare() {
+	default
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-werror \
+		$(use_enable debug) \
+		$(use_with doc docs) \
+		$(use_enable tools) \
+		$(use_enable zlib zip)
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/app-text/libstaroffice/libstaroffice-9999.ebuild b/app-text/libstaroffice/libstaroffice-9999.ebuild
new file mode 100644
index 000000000000..7578276aed40
--- /dev/null
+++ b/app-text/libstaroffice/libstaroffice-9999.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGIT_REPO_URI="https://github.com/fosnola/libstaroffice.git"
+[[ ${PV} == 9999 ]] && inherit git-r3 autotools
+
+DESCRIPTION="Import filter for old StarOffice documents"
+HOMEPAGE="https://github.com/fosnola/libstaroffice"
+[[ ${PV} == 9999 ]] || SRC_URI="http://dev-www.libreoffice.org/src/${P}.tar.xz"
+
+LICENSE="|| ( LGPL-2.1+ MPL-2.0 )"
+SLOT="0"
+[[ ${PV} == 9999 ]] || \
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+IUSE="debug doc tools +zlib"
+
+RDEPEND="
+	dev-libs/librevenge
+	zlib? ( sys-libs/zlib )
+"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )
+"
+
+src_prepare() {
+	default
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-werror \
+		$(use_enable debug) \
+		$(use_with doc docs) \
+		$(use_enable tools) \
+		$(use_enable zlib zip)
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/app-text/libstaroffice/metadata.xml b/app-text/libstaroffice/metadata.xml
new file mode 100644
index 000000000000..27a1e937c80d
--- /dev/null
+++ b/app-text/libstaroffice/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>office@gentoo.org</email>
+		<name>Gentoo Office project</name>
+	</maintainer>
+	<use>
+		<flag name="tools">Build conversion tools</flag>
+		<flag name="zlib">Enable support for compressed data</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">fosnola/libstaroffice</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/libwpd-0.10.2 b/app-text/libwpd-0.10.2
deleted file mode 100644
index 2050f2224b57..000000000000
--- a/app-text/libwpd-0.10.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm
-DEPEND=dev-libs/librevenge virtual/pkgconfig doc? ( app-doc/doxygen )
-DESCRIPTION=WordPerfect Document import/export library
-EAPI=6
-HOMEPAGE=http://libwpd.sf.net
-IUSE=doc +tools
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips x86 ~x86-fbsd
-LICENSE=|| ( LGPL-2.1 MPL-2.0 )
-RDEPEND=dev-libs/librevenge
-SLOT=0.10
-SRC_URI=mirror://sourceforge/libwpd/libwpd-0.10.2.tar.xz
-_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9
-_md5_=c392c09f0b1f1b6a7e6dd7578b27d64c
diff --git a/app-text/libwpd/Manifest b/app-text/libwpd/Manifest
new file mode 100644
index 000000000000..7d252cf491a2
--- /dev/null
+++ b/app-text/libwpd/Manifest
@@ -0,0 +1,3 @@
+DIST libwpd-0.10.2.tar.xz 536400 BLAKE2B a4ed9b8c790898436e08afd0f571c4a4b31615228248116b24bad38d07df7837982df1ffa98b0ad442cfec417fc90eb089642b32e3a094323e75fb8fc7cb8da7 SHA512 821dbc0535ebd4fa41bcf984e344e11176862676c66abebe45cf4284f8de6e6cc7629f8a605b169d034a5c2f3e2461513d61e11e549ca73b8328eb66ac3bdd79
+EBUILD libwpd-0.10.2.ebuild 1304 BLAKE2B 667017fe4e55c22281724f6bcb6971d10f135f4a28c1599388d72fcffb1a6cc49d9941120f86d9f84c83a96dc26cb6d332ea0fc61b1032e46078eb5ac70d0bbb SHA512 3c2aef394fc4ddaeb66a437697c4cd5cc37f04d989f4e2a7d654b602b2c9ee13e2f3ce413ad61cac53567f8983326ae209323e989421977ae60b035182a0f48e
+MISC metadata.xml 402 BLAKE2B 449d3fa4ee2b0be84bca5eca7708b2e318060e7d85c84369ab16923edfa4bd3a19eed80b11d3cbd7c4d9a12e2d3d07df6b0aad95f011d1ce100fd9a6fd22206c SHA512 af33c7d44f5766cadb1955928210dc6f28171eef00cfbdd96a0257226bb7eee560fb05cf58673dfbbef932600ec3e8fafa666db3f9c3ddd2bcfa5a2a90cd77f2
diff --git a/app-text/libwpd/libwpd-0.10.2.ebuild b/app-text/libwpd/libwpd-0.10.2.ebuild
new file mode 100644
index 000000000000..72fe00dc568c
--- /dev/null
+++ b/app-text/libwpd/libwpd-0.10.2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit alternatives
+
+DESCRIPTION="WordPerfect Document import/export library"
+HOMEPAGE="http://libwpd.sf.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+
+LICENSE="|| ( LGPL-2.1 MPL-2.0 )"
+SLOT="0.10"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips x86 ~x86-fbsd"
+IUSE="doc +tools"
+
+RDEPEND="dev-libs/librevenge"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+
+src_configure() {
+	econf \
+		--disable-static \
+		--disable-werror \
+		$(use_with doc docs) \
+		$(use_enable tools) \
+		--program-suffix=-${SLOT}
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	if use tools; then
+		alternatives_auto_makesym /usr/bin/wpd2html "/usr/bin/wpd2html-[0-9].[0-9][0-9]"
+		alternatives_auto_makesym /usr/bin/wpd2raw "/usr/bin/wpd2raw-[0-9].[0-9][0-9]"
+		alternatives_auto_makesym /usr/bin/wpd2text "/usr/bin/wpd2text-[0-9].[0-9][0-9]"
+	fi
+}
+
+pkg_postrm() {
+	if use tools; then
+		alternatives_auto_makesym /usr/bin/wpd2html "/usr/bin/wpd2html-[0-9].[0-9][0-9]"
+		alternatives_auto_makesym /usr/bin/wpd2raw "/usr/bin/wpd2raw-[0-9].[0-9][0-9]"
+		alternatives_auto_makesym /usr/bin/wpd2text "/usr/bin/wpd2text-[0-9].[0-9][0-9]"
+	fi
+}
diff --git a/app-text/libwpd/metadata.xml b/app-text/libwpd/metadata.xml
new file mode 100644
index 000000000000..19419ec1fa6e
--- /dev/null
+++ b/app-text/libwpd/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>office@gentoo.org</email>
+		<name>Gentoo Office project</name>
+	</maintainer>
+	<use>
+		<flag name="tools">Build file conversion tools</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">libwpd</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/libwpg-0.3.2 b/app-text/libwpg-0.3.2
deleted file mode 100644
index 9c60905a0fb3..000000000000
--- a/app-text/libwpg-0.3.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm
-DEPEND=app-text/libwpd:0.10[tools] dev-libs/librevenge virtual/pkgconfig doc? ( app-doc/doxygen )
-DESCRIPTION=C++ library to read and parse graphics in WPG
-EAPI=6
-HOMEPAGE=http://libwpg.sourceforge.net/libwpg.htm
-IUSE=doc static-libs
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips x86
-LICENSE=|| ( LGPL-2.1 MPL-2.0 )
-RDEPEND=app-text/libwpd:0.10[tools] dev-libs/librevenge
-SLOT=0.3
-SRC_URI=mirror://sourceforge/libwpg/libwpg-0.3.2.tar.xz
-_eclasses_=alternatives	6c575717515f030736d1b718d507d2f9
-_md5_=f931f49b3fc4786629c1978fa468cc87
diff --git a/app-text/libwpg/Manifest b/app-text/libwpg/Manifest
new file mode 100644
index 000000000000..401d5d3e7ba2
--- /dev/null
+++ b/app-text/libwpg/Manifest
@@ -0,0 +1,3 @@
+DIST libwpg-0.3.2.tar.xz 326840 BLAKE2B a32668671bf0f6a69555dea39a522fac65f7522d7fda5cc29b8d2588fa268f1923e959bb6aa75c6ed1d4c40dde5cf458577098e4662dcee769a449ae36f13229 SHA512 f3f76a17056274b2dfd11ce4eb451411d8458b00b3f7be4fae0a932a382f247adbaae1f4f8f6005e7b84f063e415ef5ab609015ba32f779c6ab2f0404b275f3f
+EBUILD libwpg-0.3.2.ebuild 1284 BLAKE2B d2a1421146f2b0151f4ef066dc56a0afa022199f7fdcac024eb80c4b2315902a0cee1981eb9e471937fe295c4ffcf90cd54cc1d748eed19775ebfc27873ac41a SHA512 10c37c3bc9046758d110594f43182c5b0a95ea63febce3a5aac282940d8c26bc698dba5c08bfba5d7b18b2aa26291d44bd3707a1b60671a25c07d90912248d5b
+MISC metadata.xml 441 BLAKE2B c04d84af2f7d50d0c2ccf2b134b90de33ecd52a1be37e018c2c4ae071f0a54628b16c3da82398bddc4b9d53adff5f0b5da0356d12b9138b19cd4bcc7433a1255 SHA512 9725ace7bfceff2309f836bf01ab5da588f24da56d85e1130c098353e617945b820b7763cf0932e15e2b5d7ed339929fed26e8defc6a19bcad17235fe01bfc3c
diff --git a/app-text/libwpg/libwpg-0.3.2.ebuild b/app-text/libwpg/libwpg-0.3.2.ebuild
new file mode 100644
index 000000000000..46042da23141
--- /dev/null
+++ b/app-text/libwpg/libwpg-0.3.2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit alternatives
+
+DESCRIPTION="C++ library to read and parse graphics in WPG"
+HOMEPAGE="http://libwpg.sourceforge.net/libwpg.htm"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+
+LICENSE="|| ( LGPL-2.1 MPL-2.0 )"
+SLOT="0.3"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips x86"
+IUSE="doc static-libs"
+
+RDEPEND="
+	app-text/libwpd:0.10[tools]
+	dev-libs/librevenge
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )"
+
+src_configure() {
+	econf \
+		--disable-werror \
+		--program-suffix=-${SLOT} \
+		$(use_with doc docs) \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	alternatives_auto_makesym /usr/bin/wpg2svgbatch.pl "/usr/bin/wpg2svgbatch.pl-[0-9].[0-9]"
+	alternatives_auto_makesym /usr/bin/wpg2svg "/usr/bin/wpg2svg-[0-9].[0-9]"
+	alternatives_auto_makesym /usr/bin/wpg2raw "/usr/bin/wpg2raw-[0-9].[0-9]"
+}
+
+pkg_postrm() {
+	alternatives_auto_makesym /usr/bin/wpg2svgbatch.pl "/usr/bin/wpg2svgbatch.pl-[0-9].[0-9]"
+	alternatives_auto_makesym /usr/bin/wpg2svg "/usr/bin/wpg2svg-[0-9].[0-9]"
+	alternatives_auto_makesym /usr/bin/wpg2raw "/usr/bin/wpg2raw-[0-9].[0-9]"
+}
diff --git a/app-text/libwpg/metadata.xml b/app-text/libwpg/metadata.xml
new file mode 100644
index 000000000000..f341402a4a4e
--- /dev/null
+++ b/app-text/libwpg/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>office@gentoo.org</email>
+		<name>Gentoo Office project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">libwpg</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/libwps-0.4.8 b/app-text/libwps-0.4.8
deleted file mode 100644
index c3d467a3ae64..000000000000
--- a/app-text/libwps-0.4.8
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=dev-libs/librevenge virtual/pkgconfig doc? ( app-doc/doxygen )
-DESCRIPTION=Microsoft Works file word processor format import filter library
-EAPI=6
-HOMEPAGE=https://sourceforge.net/p/libwps/wiki/Home/
-IUSE=doc debug static-libs tools
-KEYWORDS=~alpha amd64 ~arm ~arm64 x86
-LICENSE=|| ( LGPL-2.1 MPL-2.0 )
-RDEPEND=dev-libs/librevenge
-SLOT=0
-SRC_URI=mirror://sourceforge/libwps/libwps-0.4.8.tar.xz
-_md5_=81e8e396cf0bfda44f3fed567167b23c
diff --git a/app-text/libwps-0.4.9 b/app-text/libwps-0.4.9
deleted file mode 100644
index 41fc10418bf9..000000000000
--- a/app-text/libwps-0.4.9
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=dev-libs/librevenge virtual/pkgconfig doc? ( app-doc/doxygen )
-DESCRIPTION=Microsoft Works file word processor format import filter library
-EAPI=6
-HOMEPAGE=https://sourceforge.net/p/libwps/wiki/Home/
-IUSE=doc debug static-libs tools
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~x86
-LICENSE=|| ( LGPL-2.1 MPL-2.0 )
-RDEPEND=dev-libs/librevenge
-SLOT=0
-SRC_URI=mirror://sourceforge/libwps/libwps-0.4.9.tar.xz
-_md5_=8708f4b17c450a925aa74c33762ec069
diff --git a/app-text/libwps/Manifest b/app-text/libwps/Manifest
new file mode 100644
index 000000000000..50ee4a24b218
--- /dev/null
+++ b/app-text/libwps/Manifest
@@ -0,0 +1,5 @@
+DIST libwps-0.4.8.tar.xz 648512 BLAKE2B b446c9999ff0e760569daa52fd24e42af8cdda78f2c0bc77d26cc25957381456f045dde1eb4ec8bd7999de29f658d67b2a493fdeacde4faa12a00aa28725603f SHA512 bf5d7aeb6f06e87f15ec8e911fb6436fb4e14839123db71488638f0e658034ad4ea8849ed83926af2fab9b50a7ef7410199d4a1102abc63c83d37bf1966a4afb
+DIST libwps-0.4.9.tar.xz 673784 BLAKE2B 7843de719d6c2ff3152b216e808fc06798ae77e582a644fccd34667e409ec8a34764f302c484bf991e653cd1bb8eaca48f68861aa50e5c41ae41373b5b0c531d SHA512 8703e60837c525ab24e40bb3e2e25244e9f4d2231699373b28d86430f6d7f818a5ba32de08f19febdb4f917f1a90e3b27f95e7d3200ca2d4a9101c262b37a30d
+EBUILD libwps-0.4.8.ebuild 746 BLAKE2B 60cfafa10653cb4911a6c8bc88fd54fbb36de63ba2a8d60a845155eb0e62018f78d7232711be572b1954cf8c763b1eb589b6e4650fcf35e7750ec3fc8ebac981 SHA512 45c309260c9aac532a096bd5f91dfbba32ed7fa79172958c4004f3073e56fcdbf1c32885391ca81cccc7871efca207580a50a97d7be0eaf24574d9fb9f2a9fbb
+EBUILD libwps-0.4.9.ebuild 748 BLAKE2B b524b053e2cd0e7bddf6e1be0f7c0a6aae415834cc182deec8a1181131cae204d15bc696f3617069a91d989d00a4ab15b9da07dba5ac9a76189e1811cf7b2f41 SHA512 05c507aaf579f55a194f9e066d0e99373aa7f199c1041ef96c3cc24bb5b231ea651f75b24cc6fa23898b68460fc87e7d1f0866ab67b85a8e1841860e80e8d104
+MISC metadata.xml 512 BLAKE2B e2125277139c062748282be37319771c209ba9b9c6f68e0ab9b8e9b5d10c4dfda9f6369aca792be2f21db8c1dcf3e840f78f159190162114458ed9279bf46270 SHA512 971b6f541825d73b66f09bc6b6ab677c2b1f1430a6cdd469dfe57162528d13b048681c8e00de061aa8ef5f98914b36b8bce7e13a35044937e65298469241bc1e
diff --git a/app-text/libwps/libwps-0.4.8.ebuild b/app-text/libwps/libwps-0.4.8.ebuild
new file mode 100644
index 000000000000..2e18f207c814
--- /dev/null
+++ b/app-text/libwps/libwps-0.4.8.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Microsoft Works file word processor format import filter library"
+HOMEPAGE="https://sourceforge.net/p/libwps/wiki/Home/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+
+LICENSE="|| ( LGPL-2.1 MPL-2.0 )"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~arm64 x86"
+IUSE="doc debug static-libs tools"
+
+RDEPEND="
+	dev-libs/librevenge
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+
+src_configure() {
+	econf \
+		--disable-werror \
+		$(use_enable debug) \
+		$(use_with doc docs) \
+		$(use_enable static-libs static) \
+		$(use_enable tools)
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/app-text/libwps/libwps-0.4.9.ebuild b/app-text/libwps/libwps-0.4.9.ebuild
new file mode 100644
index 000000000000..9cf94d783aa8
--- /dev/null
+++ b/app-text/libwps/libwps-0.4.9.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Microsoft Works file word processor format import filter library"
+HOMEPAGE="https://sourceforge.net/p/libwps/wiki/Home/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+
+LICENSE="|| ( LGPL-2.1 MPL-2.0 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~x86"
+IUSE="doc debug static-libs tools"
+
+RDEPEND="
+	dev-libs/librevenge
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+
+src_configure() {
+	econf \
+		--disable-werror \
+		$(use_enable debug) \
+		$(use_with doc docs) \
+		$(use_enable static-libs static) \
+		$(use_enable tools)
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/app-text/libwps/metadata.xml b/app-text/libwps/metadata.xml
new file mode 100644
index 000000000000..e942043e4489
--- /dev/null
+++ b/app-text/libwps/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>office@gentoo.org</email>
+		<name>Gentoo Office project</name>
+	</maintainer>
+	<use>
+		<flag name="tools">Build file conversion tools</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">libwps</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/libxmlpatch-0.3.3 b/app-text/libxmlpatch-0.3.3
deleted file mode 100644
index 9b174bfe81d7..000000000000
--- a/app-text/libxmlpatch-0.3.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=dev-libs/glib:2 dev-libs/libxml2 test? ( dev-libs/check ) virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A set of tools to create and apply patch to XML files using XPath
-EAPI=4
-HOMEPAGE=http://xmlpatch.sourceforge.net/
-IUSE=test static-libs
-KEYWORDS=~amd64
-LICENSE=LGPL-2.1
-RDEPEND=dev-libs/glib:2 dev-libs/libxml2
-SLOT=0
-SRC_URI=mirror://sourceforge/xmlpatch/libxmlpatch-0.3.3.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8464f6d558a54b9ffa44a988a23f4f98
diff --git a/app-text/libxmlpatch/Manifest b/app-text/libxmlpatch/Manifest
new file mode 100644
index 000000000000..ee72e7d6b6a7
--- /dev/null
+++ b/app-text/libxmlpatch/Manifest
@@ -0,0 +1,4 @@
+AUX libxmlpatch-0.3.3-gentoo.patch 2029 BLAKE2B a2cced2f4a6e8c7ad53420e1c8a6d244cfc808ae398ecd4106b59c0c80c6d3b708a9bd7c6ccddd21f15b5a000faeba4d00d9510ed1eb3b4a44a34cf79e52905d SHA512 076f5ce303fa410ed48828bfd4c9544d4606511597bf39676a899fb577bc4670db83706ef05928d9e49a665089864d6fb2e22321c19217ed341265d57d2c4052
+DIST libxmlpatch-0.3.3.tar.gz 405496 BLAKE2B 57333f62b95be3acc058593ccdb935148217f84acd7b5d431043cf08bc217d04abe650be099a849790400f0153523cea46905e9a12e6a33e80f0e20edc2fd9f3 SHA512 2eb305ddd6aa1778bc9c9e7b8cae5f82ee05c0ed0a47bbb651209c496fff68f4e527b7d6ad1808bc8bf1f72aaa0172a12ddb140622ce87e3cd150a0ec4d35571
+EBUILD libxmlpatch-0.3.3.ebuild 772 BLAKE2B cdc29331635b6f5e8c227343b510d4ae94bcffdf6d70f0e8894710b11a9e53a630990c49cef28a37eb4b0c5524d61baf6a199733366828b1828e77ea7842dac8 SHA512 9087aa0c074e6c7b11b58bd02a6f8c19ba8d8c6730712a3157808de30b4064956caa862bdf31a7127b7772b6b7deef46597aa3d63cd197a0579bd9694a283f02
+MISC metadata.xml 245 BLAKE2B e5b503817d886ea642301a8fb76459f31236d1496ba03cb467126419460106072424b6da1e1957ffaf977ac05f4c4baacef448cdf86ea4cbd93fdba026d5e8af SHA512 f884111cb1a85bb4e909b8bc6a70ca00e8d69e066fc9ef79ddbf0b3fc277bc8a47ce13bc1b7bd03a4be9bc0a54704440552394f1d1a8c68d0bf9704b8f05769f
diff --git a/app-text/libxmlpatch/files/libxmlpatch-0.3.3-gentoo.patch b/app-text/libxmlpatch/files/libxmlpatch-0.3.3-gentoo.patch
new file mode 100644
index 000000000000..a18104fb12b5
--- /dev/null
+++ b/app-text/libxmlpatch/files/libxmlpatch-0.3.3-gentoo.patch
@@ -0,0 +1,56 @@
+Index: libxmlpatch-0.3.3/tests/check_diff.c
+===================================================================
+--- libxmlpatch-0.3.3.orig/tests/check_diff.c
++++ libxmlpatch-0.3.3/tests/check_diff.c
+@@ -259,7 +259,13 @@ static struct {
+ static void
+ add_test (TCase *tc, int i)
+ {
+-    _tcase_add_test (tc, arr_tests[i].fn, arr_tests[i].name, 0, 0, 1);
++    _tcase_add_test (tc, arr_tests[i].fn, arr_tests[i].name,
++#if CHECK_MAJOR_VERSION > 0 || \
++  (CHECK_MAJOR_VERSION == 0 && CHECK_MINOR_VERSION > 9) || \
++  (CHECK_MAJOR_VERSION == 0 && CHECK_MINOR_VERSION == 9 && CHECK_MICRO_VERSION >= 7)
++                     0,
++#endif
++                     0, 0, 1);
+ }
+ 
+ static void
+Index: libxmlpatch-0.3.3/configure.in
+===================================================================
+--- libxmlpatch-0.3.3.orig/configure.in
++++ libxmlpatch-0.3.3/configure.in
+@@ -74,7 +74,13 @@ fi
+ 
+ PKG_CHECK_MODULES(DEPS_XML, libxml-2.0)
+ PKG_CHECK_MODULES(DEPS_GLIB, glib-2.0)
+-PKG_CHECK_MODULES([CHECK], [check >= 0.9.4])
++
++AC_ARG_WITH([check],
++  AS_HELP_STRING([--without-check], [Do not build tests based on check package @<:@default=auto@:>@]))
++AS_IF([test "x$with_check" != "xno"], [
++PKG_CHECK_MODULES([CHECK], [check >= 0.9.4], , [with_check=no])
++])
++AM_CONDITIONAL([TESTS], [test "x$with_check" != "xno"])
+ 
+ AC_SUBST(DEPS_XML_CFLAGS)
+ AC_SUBST(DEPS_XML_LIBS)
+Index: libxmlpatch-0.3.3/tests/Makefile.am
+===================================================================
+--- libxmlpatch-0.3.3.orig/tests/Makefile.am
++++ libxmlpatch-0.3.3/tests/Makefile.am
+@@ -1,10 +1,11 @@
++if TESTS
+ TESTS = test-diff
++check_PROGRAMS = test-diff
++endif
+ 
+-test_PROGRAMS = test-diff
+ test_diff_SOURCES = check_diff.c
+ test_diff_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/diff @CHECK_CFLAGS@ $(DEPS_XML_CFLAGS) $(DEPS_GLIB_CFLAGS)
+ test_diff_LDADD = @CHECK_LIBS@ $(top_builddir)/src/libxmlpatch.la $(top_builddir)/diff/libxmldiff.la $(DEPS_XML_LIBS) $(DEPS_GLIB_LIBS)
+-testdir = $(libdir)/tests/xml_diff
+ 
+ bin_PROGRAMS = xml_patch xml_diff
+ 
diff --git a/app-text/libxmlpatch/libxmlpatch-0.3.3.ebuild b/app-text/libxmlpatch/libxmlpatch-0.3.3.ebuild
new file mode 100644
index 000000000000..f5697fc876de
--- /dev/null
+++ b/app-text/libxmlpatch/libxmlpatch-0.3.3.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit eutils autotools
+
+DESCRIPTION="A set of tools to create and apply patch to XML files using XPath"
+HOMEPAGE="http://xmlpatch.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN/lib}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test static-libs"
+
+RDEPEND="dev-libs/glib:2
+	dev-libs/libxml2"
+DEPEND="${RDEPEND}
+	test? ( dev-libs/check )
+	virtual/pkgconfig"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable static-libs static) \
+		$(use_with test check)
+}
+
+DOCS=( LEGAL_NOTICE README TODO ChangeLog )
+
+src_install() {
+	default
+
+	find "${D}" -name '*.la' -delete
+}
diff --git a/app-text/libxmlpatch/metadata.xml b/app-text/libxmlpatch/metadata.xml
new file mode 100644
index 000000000000..ddc9bcf76f3d
--- /dev/null
+++ b/app-text/libxmlpatch/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="sourceforge">xmlpatch</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/linuxdoc-tools-0.9.72 b/app-text/linuxdoc-tools-0.9.72
deleted file mode 100644
index 695b8b0c2d60..000000000000
--- a/app-text/linuxdoc-tools-0.9.72
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare prerm unpack
-DEPEND=|| ( app-text/openjade app-text/opensp ) app-text/sgml-common dev-lang/perl:= || ( sys-apps/gawk sys-apps/mawk ) sys-apps/groff sys-devel/flex doc? ( dev-texlive/texlive-fontsrecommended virtual/latex-base ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/latex-base >=sys-apps/texinfo-4.2-r5 >=app-text/sgml-common-0.6.3-r2
-DESCRIPTION=A toolset for processing LinuxDoc DTD SGML files
-EAPI=5
-HOMEPAGE=https://gitlab.com/agmartin/linuxdoc-tools
-IUSE=doc
-KEYWORDS=amd64 ~ia64 ppc x86 ~x86-fbsd
-LICENSE=GPL-3+ MIT SGMLUG
-RDEPEND=|| ( app-text/openjade app-text/opensp ) app-text/sgml-common dev-lang/perl:= || ( sys-apps/gawk sys-apps/mawk ) sys-apps/groff virtual/latex-base
-SLOT=0
-SRC_URI=https://gitlab.com/agmartin/linuxdoc-tools/repository/archive.tar.gz?ref=v0.9.72 -> linuxdoc-tools-0.9.72.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	latex-package	773c51c2ef26eaff025998531e7c6731	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	preserve-libs	ef207dc62baddfddfd39a164d9797648	sgml-catalog	1ca36a4ae32c67b390f310dd6d7b1189	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b
-_md5_=07aeb45b87ac181fece5ae9c5cd64182
diff --git a/app-text/linuxdoc-tools/Manifest b/app-text/linuxdoc-tools/Manifest
new file mode 100644
index 000000000000..721e445382bb
--- /dev/null
+++ b/app-text/linuxdoc-tools/Manifest
@@ -0,0 +1,3 @@
+DIST linuxdoc-tools-0.9.72.tar.gz 614429 BLAKE2B 404b311c0560780bd81f021760d32e47cd6ebe8abc9aa64a181b8ce727dd0edbbd88d286cdfdcc97a51981bd0bd299563d7b1b2945e06f83ff32c7d3e56abb19 SHA512 2d522a99212dab2535786b64e0b404a9bb023d1612d8e57a628de21b5e77b104285713a98591c61a2fb2196e687b34180198ab0dfeda2b44fbbce051e9919408
+EBUILD linuxdoc-tools-0.9.72.ebuild 1777 BLAKE2B b61585eaf79a55b9acc1f4711cbaec19d421db998f091a4fb5827292bb30c5720de9ba5a300ad0cf248b509a8ec4d1a0415a4ee498edb18f49279cf673ff35cb SHA512 40632a82dc9252a4bac966174c4e87f6f1adf075fb2ef125ea07ccc5796b98e74d8823d1afff11f98e042ded4eb5b7da82a8b8c5ab052e4f7d53357b84cbf649
+MISC metadata.xml 911 BLAKE2B a78b50af9faf588a872f75b94f1278ce1ef5e16edb8c6f6c953dcc29b466be53f70a63275e5df54bd46f58d726e80f07b8cd8ae051d93f7c6ee11f0c8e63b8fe SHA512 6afd802552b700006b38a5eee516e5e1f59d0af0dff294bc2807804f8a85823ca2c5a928c0cfe2d5ef74d8c34521ecdd2a54d4ff5a1d322f17d42a6e5e6ad0f4
diff --git a/app-text/linuxdoc-tools/linuxdoc-tools-0.9.72.ebuild b/app-text/linuxdoc-tools/linuxdoc-tools-0.9.72.ebuild
new file mode 100644
index 000000000000..808897c2186f
--- /dev/null
+++ b/app-text/linuxdoc-tools/linuxdoc-tools-0.9.72.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# EAPI=6 is blocked by Gentoo bugs 497038, 497052.
+EAPI=5
+
+inherit autotools epatch latex-package perl-functions sgml-catalog toolchain-funcs vcs-snapshot
+
+DESCRIPTION="A toolset for processing LinuxDoc DTD SGML files"
+HOMEPAGE="https://gitlab.com/agmartin/linuxdoc-tools"
+SRC_URI="https://gitlab.com/agmartin/${PN}/repository/archive.tar.gz?ref=v${PV} -> ${P}.tar.gz"
+
+LICENSE="GPL-3+ MIT SGMLUG"
+SLOT="0"
+KEYWORDS="amd64 ~ia64 ppc x86 ~x86-fbsd"
+IUSE="doc"
+
+RDEPEND="
+	|| ( app-text/openjade app-text/opensp )
+	app-text/sgml-common
+	dev-lang/perl:=
+	|| ( sys-apps/gawk sys-apps/mawk )
+	sys-apps/groff
+"
+DEPEND="${RDEPEND}
+	sys-devel/flex
+	doc? (
+		dev-texlive/texlive-fontsrecommended
+		virtual/latex-base
+	)
+"
+
+src_prepare() {
+	[[ ${PATCHES} ]] && epatch -p1 "${PATCHES[@]}"
+	epatch_user
+
+	# Update the build system with Gentoo paths.
+	sed -i \
+		-e "s|share/doc/${PN}|share/doc/${PF}|g" \
+		Makefile.in || die
+
+	eautoreconf
+}
+
+src_configure() {
+	perl_set_version
+	tc-export CC
+	local myeconfargs=(
+		--disable-docs
+		--with-texdir="${TEXMF}/tex/latex/${PN}"
+		--with-perllibdir="${VENDOR_ARCH}"
+		--with-installed-iso-entities
+	)
+	use doc && myeconfargs+=(--enable-docs="txt pdf html")
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	# Prevent access violations from bitmap font files generation.
+	use doc && export VARTEXFONTS="${T}/fonts"
+	default_src_compile
+}
+
+src_install() {
+	# Override latex-package.eclass
+	default_src_install
+}
+
+sgml-catalog_cat_include "/etc/sgml/linuxdoc.cat" "/usr/share/${PN}/${PN}.catalog"
+
+pkg_postinst() {
+	latex-package_pkg_postinst
+	sgml-catalog_pkg_postinst
+}
+
+pkg_postrm() {
+	latex-package_pkg_postrm
+	sgml-catalog_pkg_postrm
+}
diff --git a/app-text/linuxdoc-tools/metadata.xml b/app-text/linuxdoc-tools/metadata.xml
new file mode 100644
index 000000000000..c7c7ce7d220b
--- /dev/null
+++ b/app-text/linuxdoc-tools/metadata.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>itumaykin+gentoo@gmail.com</email>
+		<name>Coacher</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription>
+		Linuxdoc-Tools is a small bug-fix version of SGML-Tools 1.0.9,
+		and is a toolset for processing LinuxDoc DTD SGML files.
+		This system is tailored for LinuxDoc DTD sgml files, and other DTDs
+		are not supported. If you need the tool for DocBook DTD (which is
+		now a more popular DTD than LinuxDoc in writing technical software
+		documentation), then you should check SGMLTools-Lite, OpenJade,
+		and docbook-tools.
+	</longdescription>
+	<upstream>
+		<remote-id type="gitlab">agmartin/linuxdoc-tools</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/llpp-26b b/app-text/llpp-26b
deleted file mode 100644
index 7868db1c0428..000000000000
--- a/app-text/llpp-26b
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=x11-misc/xsel !static? ( >=app-text/mupdf-1.11:0= <app-text/mupdf-1.12:0= media-libs/openjpeg:2 media-libs/fontconfig:1.0 media-libs/freetype:2 media-libs/jbig2dec sys-libs/zlib virtual/jpeg:0 x11-libs/libX11 ) static? ( >=app-text/mupdf-1.11:0=[static-libs] <app-text/mupdf-1.12:0=[static-libs] media-libs/openjpeg:2[static-libs] media-libs/fontconfig:1.0[static-libs] media-libs/freetype:2[static-libs] media-libs/jbig2dec[static-libs] sys-libs/zlib[static-libs] virtual/jpeg:0[static-libs] x11-libs/libX11[static-libs] app-arch/bzip2[static-libs] media-libs/libXcm[static-libs] x11-libs/libXau[static-libs] x11-libs/libXdmcp[static-libs] x11-libs/libXmu[static-libs] ) >=dev-lang/ocaml-4.02[ocamlopt?] dev-ml/lablgl[glut,ocamlopt?]
-DESCRIPTION=graphical PDF viewer which aims to superficially resemble less(1)
-EAPI=6
-HOMEPAGE=http://repo.or.cz/w/llpp.git
-IUSE=+ocamlopt static
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-3
-RDEPEND=x11-misc/xsel !static? ( >=app-text/mupdf-1.11:0= <app-text/mupdf-1.12:0= media-libs/openjpeg:2 media-libs/fontconfig:1.0 media-libs/freetype:2 media-libs/jbig2dec sys-libs/zlib virtual/jpeg:0 x11-libs/libX11 )
-RESTRICT=!ocamlopt? ( strip )
-SLOT=0
-SRC_URI=http://repo.or.cz/llpp.git/snapshot/606ca0f5b7d9c1f031e558c17d66591daa04e3a4.tar.gz -> llpp-26b.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b
-_md5_=f96c09f24e1f087f3453609673340247
diff --git a/app-text/llpp-26b_p20180114 b/app-text/llpp-26b_p20180114
deleted file mode 100644
index 6d0b69413774..000000000000
--- a/app-text/llpp-26b_p20180114
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=x11-misc/xsel !static? ( >=app-text/mupdf-1.12.0:0= media-libs/openjpeg:2 media-libs/fontconfig:1.0 media-libs/freetype:2 media-libs/jbig2dec sys-libs/zlib virtual/jpeg:0 x11-libs/libX11 ) static? ( >=app-text/mupdf-1.12.0:0=[static-libs] media-libs/openjpeg:2[static-libs] media-libs/fontconfig:1.0[static-libs] media-libs/freetype:2[static-libs] media-libs/jbig2dec[static-libs] sys-libs/zlib[static-libs] virtual/jpeg:0[static-libs] x11-libs/libX11[static-libs] app-arch/bzip2[static-libs] media-libs/libXcm[static-libs] x11-libs/libXau[static-libs] x11-libs/libXdmcp[static-libs] x11-libs/libXmu[static-libs] ) >=dev-lang/ocaml-4.02[ocamlopt?] dev-ml/lablgl[glut,ocamlopt?]
-DESCRIPTION=graphical PDF viewer which aims to superficially resemble less(1)
-EAPI=6
-HOMEPAGE=http://repo.or.cz/w/llpp.git
-IUSE=+ocamlopt static
-KEYWORDS=amd64 ~ppc x86
-LICENSE=GPL-3
-RDEPEND=x11-misc/xsel !static? ( >=app-text/mupdf-1.12.0:0= media-libs/openjpeg:2 media-libs/fontconfig:1.0 media-libs/freetype:2 media-libs/jbig2dec sys-libs/zlib virtual/jpeg:0 x11-libs/libX11 )
-RESTRICT=!ocamlopt? ( strip )
-SLOT=0
-SRC_URI=https://distfiles.gentoo.org/distfiles/llpp-26b_p20180114.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	vcs-snapshot	3be1ab44131e8c0bbdaa75823008444b
-_md5_=46a028aa234855343131142d39eb752a
diff --git a/app-text/llpp/Manifest b/app-text/llpp/Manifest
new file mode 100644
index 000000000000..24878bb8ee8c
--- /dev/null
+++ b/app-text/llpp/Manifest
@@ -0,0 +1,6 @@
+AUX llpp-26b-WM_CLASS.patch 860 BLAKE2B adcd60863d72d5328d6918c7904c58f160651a911c9b3f8f891ff884aae54b4327ca4b21fabf95a63025a7d76799a74d47dfb60a2ab55981aabf026be3afc2ca SHA512 42973fa329ab7fc900b1a5e86fee70918c5e78486cfc6fcf4802d9dc3e5a8a902d866a1ad23f3a6febf1dcd2d18f90389369d89024e3e1727a19fce456cf8604
+DIST llpp-26b.tar.gz 169385 BLAKE2B 9a80c22d013af063e3908bda69108ce6a4e0f72efb1c0b930308591d2b8a0f94f7b71a5f1057543e102b95b01440d567e6648d1ed77f1e85728f5ea31718ea28 SHA512 ce7d743d8ec998a93cf272083dc5926ce6a250aee6ac768814f511ecb309ffe94fb0e2561ca1778e1c7fbd5824545477937618c8e66d32fd273f9b5e5e3fd143
+DIST llpp-26b_p20180114.tar.gz 170204 BLAKE2B c7f46491d69350e8e94b444f0be4d7375f5658cccded792ecce2a246c907ae98bcca45d73e3b6c15765bd926d559327491559b5e5eec63bf2645cba84f6ee0d3 SHA512 1bc544f4bae268f573c2c111b69f7129bd3d1c1c8cc635c06f76e12670ad9476b4c2a2776e3959203ab6e53ea8ad1c68be290619298f7ebc1ae8203875f88314
+EBUILD llpp-26b.ebuild 3115 BLAKE2B 03813d97d89259ddb09a0b7fc5f90ce7bfbb99464573aab532f8af232d33432b5a2406b8c455d34d2f2f87d0d6a1c095dd563ea7d419088ed83b1c594c77c9a0 SHA512 f7afd8b79aece96846f5bf5cedf3f4f3a92aa34aa9974f0243729da72f4470a942239af21c6697969b2401f4eb10743d498e425bdaacc0101775cc21cd348196
+EBUILD llpp-26b_p20180114.ebuild 3032 BLAKE2B d6cc8bf1fac0cd932c298d4816221137e47df136283fc752be62886a1111de02803e92230319ccffc1864dbaf81b318c0400a34454a4f1019d8825d76f353e5b SHA512 f4b0da1be74c63c71ae02e1b6dfb7067ead203a9e1203e2c88e1eb4302364205bb92c2e4e841d861124f99781e6bb7214bf5e536dbab51a0e20c178b54afec11
+MISC metadata.xml 237 BLAKE2B f22c3926ba75c18fce7667217807f3710a315b12b1341622c949e7bc0056cd1cb403ea6c66d838675f3cb5dcd53d2fc4ec71425ec3f96aaffb94b70b73e99320 SHA512 ae2360aa6b1b00c67e0acea4935c02b64585b9a15e126fec9d5d99637021c542c0a495e5116205f3da287def46fa5b19cb1a7f3042c12c5f7a78d66d92fcb03f
diff --git a/app-text/llpp/files/llpp-26b-WM_CLASS.patch b/app-text/llpp/files/llpp-26b-WM_CLASS.patch
new file mode 100644
index 000000000000..e99d9a4e4e5a
--- /dev/null
+++ b/app-text/llpp/files/llpp-26b-WM_CLASS.patch
@@ -0,0 +1,41 @@
+--- llpp-26b/link.c
++++ llpp-26b/link.c
+@@ -4392,6 +4392,31 @@
+     return caml_copy_string (FZ_VERSION);
+ }
+ 
++#if !defined (_WIN32) && !defined (__APPLE__)
++#undef pixel
++#include <X11/X.h>
++#include <X11/Xlib.h>
++#include <X11/Xutil.h>
++#include <GL/glx.h>
++
++static void set_wm_class (void)
++{
++    Display *dpy;
++    Window win;
++    XClassHint hint;
++
++    dpy = XOpenDisplay (getenv ("DISPLAY"));
++    DefaultScreen (dpy);
++    hint.res_name = "llpp";
++    hint.res_class = "llpp";
++    win = glXGetCurrentDrawable ();
++    XSetClassHint (dpy, win, &hint);
++    XCloseDisplay (dpy);
++}
++#else
++#define set_wm_class()
++#endif
++
+ CAMLprim void ml_init (value csock_v, value params_v)
+ {
+     CAMLparam2 (csock_v, params_v);
+@@ -4460,5 +4485,6 @@
+         errx (1, "pthread_create: %s", strerror (ret));
+     }
+ 
++    set_wm_class ();
+     CAMLreturn0;
+ }
diff --git a/app-text/llpp/llpp-26b.ebuild b/app-text/llpp/llpp-26b.ebuild
new file mode 100644
index 000000000000..607103b2b3e5
--- /dev/null
+++ b/app-text/llpp/llpp-26b.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils multilib toolchain-funcs vcs-snapshot
+
+DESCRIPTION="graphical PDF viewer which aims to superficially resemble less(1)"
+HOMEPAGE="http://repo.or.cz/w/llpp.git"
+SRC_URI="http://repo.or.cz/llpp.git/snapshot/606ca0f5b7d9c1f031e558c17d66591daa04e3a4.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="+ocamlopt static"
+
+LIB_DEPEND=">=app-text/mupdf-1.11:0=[static-libs]
+	<app-text/mupdf-1.12:0=[static-libs]
+	media-libs/openjpeg:2[static-libs]
+	media-libs/fontconfig:1.0[static-libs]
+	media-libs/freetype:2[static-libs]
+	media-libs/jbig2dec[static-libs]
+	sys-libs/zlib[static-libs]
+	virtual/jpeg:0[static-libs]
+	x11-libs/libX11[static-libs]"
+RDEPEND="x11-misc/xsel
+	!static? ( ${LIB_DEPEND//\[static-libs]} )"
+DEPEND="${RDEPEND}
+	static? ( ${LIB_DEPEND}
+		app-arch/bzip2[static-libs]
+		media-libs/libXcm[static-libs]
+		x11-libs/libXau[static-libs]
+		x11-libs/libXdmcp[static-libs]
+		x11-libs/libXmu[static-libs] )
+	>=dev-lang/ocaml-4.02[ocamlopt?]
+	dev-ml/lablgl[glut,ocamlopt?]"
+
+RESTRICT="!ocamlopt? ( strip )"
+
+PATCHES=( "${FILESDIR}"/${PN}-26b-WM_CLASS.patch )
+
+src_compile() {
+	local ocaml=$(usex ocamlopt ocamlopt.opt ocamlc.opt)
+	local cmo=$(usex ocamlopt cmx cmo)
+	local cma=$(usex ocamlopt cmxa cma)
+	local ccopt="$(freetype-config --cflags ) -O -include ft2build.h -D_GNU_SOURCE -DUSE_FONTCONFIG -std=c99 -Wextra -Wall -pedantic-errors -Wunused-parameter -Wsign-compare -Wshadow"
+	if use static ; then
+		local cclib=""
+		local slib=""
+		local spath=( ${EROOT}usr/$(get_libdir) $($(tc-getPKG_CONFIG) --libs-only-L --static mupdf x11 ${egl} | sed 's:-L::g') )
+		for slib in $($(tc-getPKG_CONFIG) --libs-only-l --static mupdf x11 ${egl} fontconfig) -ljpeg -ljbig2dec ; do
+			case ${slib} in
+				-lm|-ldl|-lpthread)
+					einfo "${slib}: shared"
+					cclib+="${slib} " ;;
+				*)
+					local ccnew=$(find ${spath} -name "lib${slib/-l}.a")
+					einfo "${slib}: use ${ccnew}"
+					cclib+="${ccnew} " ;;
+			esac
+		done
+	else
+		local cclib="$($(tc-getPKG_CONFIG) --libs mupdf x11 ${egl} fontconfig) -lpthread"
+	fi
+
+	verbose() { echo "$@" >&2 ; "$@" || die ; }
+	verbose sh mkhelp.sh KEYS ${PV} > help.ml
+	verbose printf 'let version ="%s";;\n' ${PV} >> help.ml
+	verbose ${ocaml} -c -o link.o -ccopt "${ccopt}" link.c
+	verbose ${ocaml} -c -o keys.${cmo} keys.ml
+	verbose ${ocaml} -c -o help.${cmo} help.ml
+	verbose ${ocaml} -c -o utils.${cmo} utils.ml
+	verbose ${ocaml} -c -o wsi/x11/wsi.cmi wsi/x11/wsi.mli
+	verbose ${ocaml} -c -o wsi/x11/wsi.${cmo} -I wsi/x11 wsi/x11/wsi.ml
+	verbose ${ocaml} -c -o parser.${cmo} parser.ml
+	verbose ${ocaml} -c -o config.${cmo} -I +lablGL -I wsi/x11 config.ml
+	verbose ${ocaml} -c -o main.${cmo} -I +lablGL -I wsi/x11 main.ml
+	verbose ${ocaml} $(usex ocamlopt "" -custom) -o llpp -I +lablGL -I wsi/x11 \
+		str.${cma} unix.${cma} lablgl.${cma} link.o \
+	    -cclib "${cclib}" \
+		help.${cmo} utils.${cmo} parser.${cmo} wsi.${cmo} config.${cmo} main.${cmo}
+}
+
+src_install() {
+	dobin ${PN} misc/${PN}ac
+	dodoc KEYS README Thanks
+}
diff --git a/app-text/llpp/llpp-26b_p20180114.ebuild b/app-text/llpp/llpp-26b_p20180114.ebuild
new file mode 100644
index 000000000000..4c83f9fd324e
--- /dev/null
+++ b/app-text/llpp/llpp-26b_p20180114.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils multilib toolchain-funcs vcs-snapshot
+
+DESCRIPTION="graphical PDF viewer which aims to superficially resemble less(1)"
+HOMEPAGE="http://repo.or.cz/w/llpp.git"
+SRC_URI="https://distfiles.gentoo.org/distfiles/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE="+ocamlopt static"
+
+LIB_DEPEND=">=app-text/mupdf-1.12.0:0=[static-libs]
+	media-libs/openjpeg:2[static-libs]
+	media-libs/fontconfig:1.0[static-libs]
+	media-libs/freetype:2[static-libs]
+	media-libs/jbig2dec[static-libs]
+	sys-libs/zlib[static-libs]
+	virtual/jpeg:0[static-libs]
+	x11-libs/libX11[static-libs]"
+RDEPEND="x11-misc/xsel
+	!static? ( ${LIB_DEPEND//\[static-libs]} )"
+DEPEND="${RDEPEND}
+	static? ( ${LIB_DEPEND}
+		app-arch/bzip2[static-libs]
+		media-libs/libXcm[static-libs]
+		x11-libs/libXau[static-libs]
+		x11-libs/libXdmcp[static-libs]
+		x11-libs/libXmu[static-libs] )
+	>=dev-lang/ocaml-4.02[ocamlopt?]
+	dev-ml/lablgl[glut,ocamlopt?]"
+
+RESTRICT="!ocamlopt? ( strip )"
+
+PATCHES=( "${FILESDIR}"/${PN}-26b-WM_CLASS.patch )
+
+src_compile() {
+	local ocaml=$(usex ocamlopt ocamlopt.opt ocamlc.opt)
+	local cmo=$(usex ocamlopt cmx cmo)
+	local cma=$(usex ocamlopt cmxa cma)
+	local ccopt="$(freetype-config --cflags ) -O -include ft2build.h -D_GNU_SOURCE -DUSE_FONTCONFIG -std=c99 -Wextra -Wall -pedantic-errors -Wunused-parameter -Wsign-compare -Wshadow"
+	if use static ; then
+		local cclib=""
+		local slib=""
+		local spath=( ${EROOT}usr/$(get_libdir) $($(tc-getPKG_CONFIG) --libs-only-L --static mupdf x11 ${egl} | sed 's:-L::g') )
+		for slib in $($(tc-getPKG_CONFIG) --libs-only-l --static mupdf x11 ${egl} fontconfig) -ljpeg -ljbig2dec ; do
+			case ${slib} in
+				-lm|-ldl|-lpthread)
+					einfo "${slib}: shared"
+					cclib+="${slib} " ;;
+				*)
+					local ccnew=$(find ${spath} -name "lib${slib/-l}.a")
+					einfo "${slib}: use ${ccnew}"
+					cclib+="${ccnew} " ;;
+			esac
+		done
+	else
+		local cclib="$($(tc-getPKG_CONFIG) --libs mupdf x11 ${egl} fontconfig) -lpthread"
+	fi
+
+	verbose() { echo "$@" >&2 ; "$@" || die ; }
+	verbose sh mkhelp.sh KEYS ${PV} > help.ml
+	verbose printf 'let version ="%s";;\n' ${PV} >> help.ml
+	verbose ${ocaml} -c -o link.o -ccopt "${ccopt}" link.c
+	verbose ${ocaml} -c -o keys.${cmo} keys.ml
+	verbose ${ocaml} -c -o help.${cmo} help.ml
+	verbose ${ocaml} -c -o utils.${cmo} utils.ml
+	verbose ${ocaml} -c -o wsi/x11/wsi.cmi wsi/x11/wsi.mli
+	verbose ${ocaml} -c -o wsi/x11/wsi.${cmo} -I wsi/x11 wsi/x11/wsi.ml
+	verbose ${ocaml} -c -o parser.${cmo} parser.ml
+	verbose ${ocaml} -c -o config.${cmo} -I +lablGL -I wsi/x11 config.ml
+	verbose ${ocaml} -c -o main.${cmo} -I +lablGL -I wsi/x11 main.ml
+	verbose ${ocaml} $(usex ocamlopt "" -custom) -o llpp -I +lablGL -I wsi/x11 \
+		str.${cma} unix.${cma} lablgl.${cma} link.o \
+	    -cclib "${cclib}" \
+		help.${cmo} utils.${cmo} parser.${cmo} wsi.${cmo} config.${cmo} main.${cmo}
+}
+
+src_install() {
+	dobin ${PN} misc/${PN}ac
+	dodoc KEYS README Thanks
+}
diff --git a/app-text/llpp/metadata.xml b/app-text/llpp/metadata.xml
new file mode 100644
index 000000000000..a535b8852829
--- /dev/null
+++ b/app-text/llpp/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+<email>xmw@gentoo.org</email>
+<name>Michael Weber</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-text/logmerge-0.5.2b b/app-text/logmerge-0.5.2b
deleted file mode 100644
index 3bdd952b7d4a..000000000000
--- a/app-text/logmerge-0.5.2b
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Small and powerful script to merge two or more logfiles
-EAPI=6
-HOMEPAGE=https://github.com/ildar-shaimordanov/logmerge
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=dev-lang/perl
-SLOT=0
-SRC_URI=https://github.com/ildar-shaimordanov/logmerge/archive/v0.5.2b.tar.gz -> logmerge-0.5.2b.tar.gz
-_md5_=cb7bbe18c816e4ff396ba1dd1c0f34af
diff --git a/app-text/logmerge/Manifest b/app-text/logmerge/Manifest
new file mode 100644
index 000000000000..cd4bdfa8767c
--- /dev/null
+++ b/app-text/logmerge/Manifest
@@ -0,0 +1,3 @@
+DIST logmerge-0.5.2b.tar.gz 3407 BLAKE2B 5bc6f46693a9a6e087f8b18441659a06387410bcc66c789120644e088bf1971ef161bead4494b2a509850d8031bad43052bc76d3a8afc13de836119b32dab8ee SHA512 9185d52c62d2ea68fee0e1c6fa798cda60b4a2b621436f5060d7c9b3e5b15363fdb1c9fb40351f66dc48173498f3b18035c46fcf58fa3063bad0008b9bb5946f
+EBUILD logmerge-0.5.2b.ebuild 450 BLAKE2B c445d8e44efa541af85debe1e41bea8b0223546dfe84323454a822e9eb2d9c6250c7e034dc9b1c8d99e3e58409323c47ba91ba0e16b0411ed209a1b64b16cce0 SHA512 a542512742a0597691407e8d6f1a4756f8cc5c98fc30d2210701ed36f2675b57187969e38a576feaa26efa2f476f338d7f9fc15e7a299b931cfbca60eecb8604
+MISC metadata.xml 404 BLAKE2B 3014fae65f8b3116420d4bd39bf0268ba334cc65546833f0a216df8f8b65ae53a179d73151740d4b51489c5629e0d6b760ca423f30a0279a4552443b359b941f SHA512 f35a08d3fc5d52a61e91ec28c1b15cb1fbaec77f1a5652b4cc44d7f12b675526111349f3b96519d705b42d2198ab545d81fbfc8c4fdd56e4a3ee11346dd85d24
diff --git a/app-text/logmerge/logmerge-0.5.2b.ebuild b/app-text/logmerge/logmerge-0.5.2b.ebuild
new file mode 100644
index 000000000000..a7f24d5fd1f8
--- /dev/null
+++ b/app-text/logmerge/logmerge-0.5.2b.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+DESCRIPTION="Small and powerful script to merge two or more logfiles"
+HOMEPAGE="https://github.com/ildar-shaimordanov/logmerge"
+SRC_URI="https://github.com/ildar-shaimordanov/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-lang/perl"
+
+src_install() {
+	default
+	dobin ${PN}
+}
diff --git a/app-text/logmerge/metadata.xml b/app-text/logmerge/metadata.xml
new file mode 100644
index 000000000000..d0b9b2fdc5d0
--- /dev/null
+++ b/app-text/logmerge/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <!-- maintainer-needed -->
+  <longdescription>
+    Merge multiple logs such that multilined entries appear in chronological order without breaks.
+  </longdescription>
+  <upstream>
+    <remote-id type="github">ildar-shaimordanov/logmerge</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-text/lout-3.40 b/app-text/lout-3.40
deleted file mode 100644
index 5a556ed21a21..000000000000
--- a/app-text/lout-3.40
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=zlib? ( >=sys-libs/zlib-1.1.4 )
-DESCRIPTION=High-level language for document formatting
-EAPI=6
-HOMEPAGE=http://savannah.nongnu.org/projects/lout
-IUSE=zlib doc
-KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=GPL-3+
-RDEPEND=zlib? ( >=sys-libs/zlib-1.1.4 )
-SLOT=0
-SRC_URI=mirror://nongnu/lout/lout-3.40.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=6c3fccf23539419d0446f52ff2935a8f
diff --git a/app-text/lout/Manifest b/app-text/lout/Manifest
new file mode 100644
index 000000000000..3749840175eb
--- /dev/null
+++ b/app-text/lout/Manifest
@@ -0,0 +1,4 @@
+AUX lout-3.38-makefile.patch 715 BLAKE2B d2d72e707691a5fe09e152de7c113a821e524c2f67a37e1b6ad1d064e8ab499bc32004967bf226a225ce7fc41e808f4758f9f50dcfd6254b51c0500a53d9d1bd SHA512 17fbc465143bec59ca1bb410aa3b4e376ce2fc4e65a15747f72104db9387ba9429ce21f83e2b64224ed8b856c42b68df4bf27e2c9df9ed4d9bae872b126967bc
+DIST lout-3.40.tar.gz 2172651 BLAKE2B 0bf2ee498d6fbb91e353d46fe1f7f0f44053be174df901b08ee630f0b4935e19c056a50e2eda4d07ab69aac6d7bf738b42277bb37060e967db73ace6a51029af SHA512 adffbb44b9328f0d64b1c8f08fe0217307b1cca870827ca54e0aaae5a2258f519e3e6f0adc715ba6d192dd731ab26c2cc86aa8611d991d5665503842e599c061
+EBUILD lout-3.40.ebuild 2046 BLAKE2B 24a403a7b363bf9a43a91a1cf1696467131eca94fd6371cd13ba534b326af7e8b11b03ccea54031b48fddf5b5beeddaf8abad6d7a84d9831c64afb14ccb542ee SHA512 31ffe212dfa3f64156ad8376c862eedf4ea568c2b3649ce92d62789820cc8bbc7f2c9778e08fc29d5bf0dea76064e6ae6caac62f7692153109fccf9dd83ffeea
+MISC metadata.xml 241 BLAKE2B e0a2a0802fa3cdf63e76215187d14bf8f7dce89bfa0a518034c19f8efc658f8c1264e0c8d27647dcb08be031828619220f457168941be3dc067a4092fbf9ff88 SHA512 a51c29d1e99be12f982724f0d4e738b509cbf9bdfa71461320386fcbd9f44431c09e78487ea246540285b39cb271d5e75da04512ef89fca87729161388aaf8e9
diff --git a/app-text/lout/files/lout-3.38-makefile.patch b/app-text/lout/files/lout-3.38-makefile.patch
new file mode 100644
index 000000000000..cb7fc66bf432
--- /dev/null
+++ b/app-text/lout/files/lout-3.38-makefile.patch
@@ -0,0 +1,33 @@
+--- lout-3.38/makefile.orig	2008-10-13 23:35:17.000000000 +0200
++++ lout-3.38/makefile	2009-09-04 16:40:00.000000000 +0200
+@@ -295,11 +295,9 @@
+ ZLIB		=
+ ZLIBPATH	=
+ 
+-CC	= gcc
+-
+ RCOPY	= cp -r
+ 
+-COPTS	= -ansi -pedantic -Wall -O3
++COPTS	+= -ansi -pedantic -Wall
+ 
+ CFLAGS	= -DOS_UNIX=$(OSUNIX)					\
+ 	  -DOS_DOS=$(OSDOS)					\
+@@ -333,7 +331,7 @@
+ 	  z49.o z50.o z51.o z52.o
+ 
+ lout:	$(OBJS)
+-	$(CC) -o lout $(OBJS) $(ZLIB) -lm
++	$(CC) $(COPTS) $(LDFLAGS) -o lout $(OBJS) $(ZLIB) -lm
+ 	chmod a+x lout
+ 
+ $(OBJS): externs.h
+@@ -341,7 +339,7 @@
+ externs.h:
+ 
+ prg2lout:	prg2lout.c
+-	$(CC) $(COPTS) -o prg2lout prg2lout.c
++	$(CC) $(COPTS) $(LDFLAGS) -o prg2lout prg2lout.c
+ 	chmod a+x prg2lout
+ 
+ all:	lout prg2lout
diff --git a/app-text/lout/lout-3.40.ebuild b/app-text/lout/lout-3.40.ebuild
new file mode 100644
index 000000000000..e6d0cc7f1f25
--- /dev/null
+++ b/app-text/lout/lout-3.40.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+IUSE="zlib doc"
+
+DESCRIPTION="High-level language for document formatting"
+HOMEPAGE="http://savannah.nongnu.org/projects/lout"
+SRC_URI="mirror://nongnu/lout/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+DEPEND="zlib? ( >=sys-libs/zlib-1.1.4 )"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.38-makefile.patch"
+)
+
+src_compile() {
+	tc-export CC
+	local myconf
+	use zlib && myconf="$myconf PDF_COMPRESSION=1 ZLIB=-lz"
+	emake COPTS="${CFLAGS}" BINDIR="${EPREFIX}"/usr/bin \
+		LOUTLIBDIR="${EPREFIX}"/usr/share/lout \
+		LOUTDOCDIR="${EPREFIX}"/usr/share/doc/${PF} \
+		MANDIR="${EPREFIX}"/usr/share/man/man1 \
+		${myconf} lout prg2lout || die "emake prg2lout lout failed"
+}
+
+compile_doc() {
+	#
+	# SYNOPSIS:  compile_doc file times
+	#
+
+	einfo "${1}:"
+	# yes, it *is* necessary to run this 6 times...
+	for i in $(seq 1 $(expr $2 - 1)) ; do
+		einfo " pass $i"
+		lout all -o ${docdir}/$1 -e /dev/null
+	done
+	# in the last one, let errors be reported
+	einfo " final pass"
+	lout all -o ${docdir}/$1 || die "final pass failed"
+}
+
+src_install() {
+	local bindir libdir docdir mandir
+	bindir=${ED}usr/bin
+	libdir=${ED}usr/share/lout
+	docdir=${ED}usr/share/doc/${PF}
+	mandir=${ED}usr/share/man/man1
+	export LOUTLIB=${libdir}
+	export PATH="${bindir}:${PATH}"
+
+	mkdir -p ${bindir} ${docdir} ${mandir}
+
+	make BINDIR=${bindir} \
+		LOUTLIBDIR=${libdir} \
+		LOUTDOCDIR=${docdir} \
+		MANDIR=${mandir} \
+		install installdoc installman || die "make install failed"
+
+	lout -x -s "${ED}"usr/share/lout/include/init || die "lout init failed"
+
+	mv ${docdir}/README{,.docs}
+	dodoc README READMEPDF blurb blurb.short whatsnew
+
+	if use doc ; then
+		einfo "building postscript documentation (may take a while)"
+		cd doc/user
+		compile_doc user.ps 6
+		cd ../design
+		compile_doc design.ps 3
+		cd ../expert
+		compile_doc expert.ps 4
+		cd ../slides
+		compile_doc slides.ps 2
+	fi
+}
diff --git a/app-text/lout/metadata.xml b/app-text/lout/metadata.xml
new file mode 100644
index 000000000000..d87f47dba103
--- /dev/null
+++ b/app-text/lout/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="sourceforge">lout</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/lv-4.51-r3 b/app-text/lv-4.51-r3
deleted file mode 100644
index 1bf8a9880505..000000000000
--- a/app-text/lv-4.51-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=!app-editors/levee sys-libs/ncurses dev-lang/perl >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Powerful Multilingual File Viewer
-EAPI=4
-HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-KEYWORDS=alpha amd64 ~arm ia64 ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=GPL-2
-RDEPEND=!app-editors/levee sys-libs/ncurses
-SLOT=0
-SRC_URI=mirror://gentoo/lv451.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7300ce34a98281be47a83416dd847a09
diff --git a/app-text/lv-4.51-r4 b/app-text/lv-4.51-r4
deleted file mode 100644
index 9169eb800e7c..000000000000
--- a/app-text/lv-4.51-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure prepare
-DEPEND=!app-editors/levee sys-libs/ncurses:0= dev-lang/perl >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Powerful Multilingual File Viewer
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=GPL-2
-RDEPEND=!app-editors/levee sys-libs/ncurses:0=
-SLOT=0
-SRC_URI=mirror://gentoo/lv451.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=76c668083c84ed557e79375d14597a67
diff --git a/app-text/lv/Manifest b/app-text/lv/Manifest
new file mode 100644
index 000000000000..bb24098a3e97
--- /dev/null
+++ b/app-text/lv/Manifest
@@ -0,0 +1,8 @@
+AUX lv-gentoo.patch 1240 BLAKE2B 76955ff7694332d448283f9dbe6e91e8c84824d6913cbbc3cb008871d1c1e5330eb07f8c5ede4966b6567b6a03f59e159c4e1aa4600f44e47b520d7edffad7b6 SHA512 6b98404792b01be3940d45a3fa89f0c0e490edee4ae76f70c3f2dfee36265a77761f878b398b71278829193211d0370af29e2e6bbc293c46fa84db9e90fe2e8d
+AUX lv-headers.patch 725 BLAKE2B 64a570d256aae0e5d3c13c2c6a51c2311da1dff3057219f4b48639f77cdbfe27da1e6c35dc16f79c26b48ce17fa2160f966d4337efea594bb6303649637e53e0 SHA512 f349f8096eb5fa2c35a1606ace275e2e66e6fec188daac6b54f57a1cb57cc1eeadf620355090840c2f6bbd791ab888f11c0f170acd1db03cd4010b4a0d0a6ebc
+AUX lv-tinfo.patch 629 BLAKE2B 1923de4cb256d6752561f2489d1633a01987e4ad073bd28fcafcd2ab81c68a2ea8a4a278a0c4a8c1c09df581f0391fb2c469c65144ddf5d7975ba1b8b9ae5555 SHA512 3a33edf5ad11d77cd23bd27fbe071aacf83ec5367b100103954159a0dc4ba2856f3978d3b8c7f41c52006dc99097bdd9d127419f700d75cbb88b745ffe4694e0
+AUX lv-xz.patch 1415 BLAKE2B e4a9cbd5bb2ca71eb3c6eea8e132caf2f1bbfda84e8055654eac86948b7f0e57397af96beca2eeacf259f9258aafa5d03303a202ab5562236ba05f0adf22cfa7 SHA512 eb791a2e392070a01e372bbc6d0d4bc113fbb57394e50fb7a55e46ee4b0896177fdb1698db750b43e78b6aa120d0fef34ad4859fee5d4a1749c062a7afb6ec84
+DIST lv451.tar.gz 605082 BLAKE2B cbfdf1c4c90dc746de631e55e3d1e88335f22342991ca7d5bd4b3661803af4efc0c6dcd821ea58be6024fa7ce773ffaa0aa3844350b6f67dd61be09e2475cb70 SHA512 88c05cb06ddc56e7f16f30b38218ec3bf9c8ef6c3c2b08d5a3f950b6870b82417368ada3f14f183b0feb6ed32d144d71901ad8134e5f88ddec11fc7b9520e810
+EBUILD lv-4.51-r3.ebuild 1067 BLAKE2B 22d15f031dc2edc33fd93e80e8bc9b596eb78cad3532307ba7bbe092f186f6cab722219441ff21aeb02a8aa8ac9b6c272951540e113440a9274af469a0dbbb5d SHA512 31a2d9bc82822582c2e68f746385b0e623a3aa05117f84c996023d4a9bfc575e281ebf7a15f71bc4d52b0297054b8e1bdb9e76202e911c7987aa388c8805fcec
+EBUILD lv-4.51-r4.ebuild 1017 BLAKE2B df902d931c531f3e510c5528a2dc7387a0472cb2f6ef081833a5d31ed0c72d6f2b549865b1ce068c6207ccadc946ea7942dee424eec0ff05f8b555b62c7889a5 SHA512 7a740ca5ae20ebd82610dc64fcc5714999525a1ab10fa325ae7b16f438864de8a53ed14b415670643ada5d005630774548d3d7b3291e2df27544f6d94a053a25
+MISC metadata.xml 358 BLAKE2B 56858cc481cec55add44dce0a02d0955fa787248b0a6861914fc450957d9b18ae256a698613d94479aca810cae4c264e0a91bf3ff89b52183c4945ce32a5dec5 SHA512 7b250d5ddc092d7ecd4e6f48175e1f57f1671af4f8529368f368071b777fd773e363e83bcd3cfee3c9352ee93c9c0bc205f940c4cb6601dac3164ad34766e6a1
diff --git a/app-text/lv/files/lv-gentoo.patch b/app-text/lv/files/lv-gentoo.patch
new file mode 100644
index 000000000000..99724ef9c69e
--- /dev/null
+++ b/app-text/lv/files/lv-gentoo.patch
@@ -0,0 +1,39 @@
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -25,6 +25,7 @@
+ LDFLAGS=@LDFLAGS@
+ INSTALL=@INSTALL@
+ PERL=	@PERL@
++DESTDIR=
+ 
+ OBJS=	itable.o ctable.o uty.o istr.o stream.o file.o guess.o decode.o \
+ 	encode.o escape.o iso2022.o iso8859.o iso2cn.o iso2jp.o iso2kr.o \
+@@ -64,18 +65,19 @@
+ #
+ 
+ install::
+-	$(INSTALL) -s -m 555 lv $(bindir)
+-	if test -f $(bindir)/lgrep; then \
+-		/bin/rm -f $(bindir)/lgrep; \
++	if test ! -d $(DESTDIR)$(bindir); then \
++		mkdir -p $(DESTDIR)$(bindir); \
+ 	fi
+-	(cd $(bindir); ln lv lgrep)
+-	if test ! -d $(lvlibdir); then \
+-		mkdir -p $(lvlibdir); \
++	$(INSTALL) -m 555 lv $(DESTDIR)$(bindir)
++	(cd $(DESTDIR)$(bindir); ln -s lv lgrep)
++	if test ! -d $(DESTDIR)$(lvlibdir); then \
++		mkdir -p $(DESTDIR)$(lvlibdir); \
+ 	fi
+-	$(INSTALL) -m 444 $(srcdir)/../lv.hlp $(lvlibdir)
+-	if test -d $(mandir) -a -d $(mandir)/man1; then \
+-		$(INSTALL) -m 444 $(srcdir)/../lv.1 $(mandir)/man1; \
++	$(INSTALL) -m 444 $(srcdir)/../lv.hlp $(DESTDIR)$(lvlibdir)
++	if test ! -d $(DESTDIR)$(mandir)/man1; then \
++		mkdir -p $(DESTDIR)$(mandir)/man1; \
+ 	fi
++	$(INSTALL) -m 444 $(srcdir)/../lv.1 $(DESTDIR)$(mandir)/man1; \
+ 
+ uninstall::
+ 	for i in $(bindir)/lv $(bindir)/lgrep $(lvlibdir)/lv.hlp $(mandir)/man1/lv.1; do \
diff --git a/app-text/lv/files/lv-headers.patch b/app-text/lv/files/lv-headers.patch
new file mode 100644
index 000000000000..5207ec07cbee
--- /dev/null
+++ b/app-text/lv/files/lv-headers.patch
@@ -0,0 +1,26 @@
+Add missing string protos.
+
+ * src/guess.c:150:12: warning: implicit declaration of function ‘strncmp’ [-Wimplicit-function-declaration]
+ * src/guess.c:218:22: warning: implicit declaration of function ‘strcmp’ [-Wimplicit-function-declaration]
+ * src/guesslocale.c:42:9: warning: implicit declaration of function ‘toupper’ [-Wimplicit-function-declaration]
+
+--- a/src/guess.c
++++ b/src/guess.c
+@@ -21,6 +21,7 @@
+  */
+ 
+ #include <stdio.h>
++#include <string.h> /* strcmp */
+ 
+ #include <import.h>
+ #include <decode.h>
+--- a/src/guesslocale.c
++++ b/src/guesslocale.c
+@@ -29,6 +29,7 @@
+ #include <langinfo.h>
+ #endif
+ 
++#include <ctype.h> /* toupper */
+ #include <import.h>
+ #include <ctable.h>
+ #include <begin.h>
diff --git a/app-text/lv/files/lv-tinfo.patch b/app-text/lv/files/lv-tinfo.patch
new file mode 100644
index 000000000000..7da23d474951
--- /dev/null
+++ b/app-text/lv/files/lv-tinfo.patch
@@ -0,0 +1,20 @@
+--- a/src/configure.in
++++ b/src/configure.in
+@@ -24,7 +24,16 @@ AC_ARG_ENABLE(purify,
+ dnl Checks for libraries.
+ AC_DEFINE(UNIX)
+ AC_DEFINE(TERMCAP)
+-AC_CHECK_LIB(terminfo, tgetstr,, [AC_CHECK_LIB(termcap, tgetstr,, [AC_CHECK_LIB(ncurses, tgetstr,, [AC_CHECK_LIB(curses, tgetstr)])])])
++PKG_CHECK_MODULES(
++   CURSES,
++   ncurses,
++   [
++       CPPFLAGS="$CURSES_CFLAGS $CPPFLAGS"
++       LIBS="$CURSES_LIBS $LIBS"
++   ],
++   [
++       AC_CHECK_LIB(terminfo, tgetstr,, [AC_CHECK_LIB(termcap, tgetstr,, [AC_CHECK_LIB(ncurses, tgetstr,, [AC_CHECK_LIB(curses, tgetstr)])])])
++   ])
+ 
+ dnl Checks for header files.
+ AC_HEADER_STDC
diff --git a/app-text/lv/files/lv-xz.patch b/app-text/lv/files/lv-xz.patch
new file mode 100644
index 000000000000..1b6ad8a91659
--- /dev/null
+++ b/app-text/lv/files/lv-xz.patch
@@ -0,0 +1,43 @@
+--- a/index.html
++++ b/index.html
+@@ -301,8 +301,11 @@
+ 	<P>
+ 	Compressed files that have suffix ``gz'', ``z'', or ``GZ'', ``Z'' are
+ 	extracted by lv using <I>zcat</I> (1),
+-	and ``bz2'' or ``BZ2'' with <I>bzcat</I> (1).
+-	Please install <I>zcat</I> and <I>bzcat</I> that can expand all of them.
++	``bz2'' or ``BZ2'' with <I>bzcat</I> (1).
++	``lzma'' or ``LZMA'' with <I>lzcat</I> (1).
++	and ``xz'' or ``XZ'' with <I>xzcat</I> (1).
++	Please install <I>zcat</I>, <I>bzcat</I>, <I>lzcat</I> and <I>xzcat</I>
++	that can expand all of them.
+ 	<P>
+ 	In case that standard output is not connected to an ordinal terminal
+ 	but to redirect or pipe-line,
+--- a/src/stream.c
++++ b/src/stream.c
+@@ -43,6 +43,8 @@
+ 
+ private byte *gz_filter = "zcat";
+ private byte *bz2_filter = "bzcat";
++private byte *lzma_filter = "lzcat";
++private byte *xz_filter = "xzcat";
+ 
+ private stream_t *StreamAlloc()
+ {
+@@ -75,10 +77,14 @@
+       filter = gz_filter;
+     else if( !strcmp( "bz2", exts ) || !strcmp( "BZ2", exts ) )
+       filter = bz2_filter;
++    else if( !strcmp( "lzma", exts ) || !strcmp( "LZMA", exts ) )
++      filter = lzma_filter;
++    else if( !strcmp( "xz", exts ) || !strcmp( "XZ", exts ) )
++      filter = xz_filter;
+   }
+   if( NULL != filter ){
+     /*
+-     * zcat or bzcat
++     * zcat, bzcat, lzcat or xzcat
+      */
+     if( NULL == (st->fp = (FILE *)tmpfile()) )
+       perror( "temporary file" ), exit( -1 );
diff --git a/app-text/lv/lv-4.51-r3.ebuild b/app-text/lv/lv-4.51-r3.ebuild
new file mode 100644
index 000000000000..f5f4561fe2c9
--- /dev/null
+++ b/app-text/lv/lv-4.51-r3.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+
+inherit autotools eutils toolchain-funcs
+
+MY_P="${PN}${PV//./}"
+
+DESCRIPTION="Powerful Multilingual File Viewer"
+#HOMEPAGE="http://www.ff.iij4u.or.jp/~nrt/lv/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm ia64 ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE=""
+
+RDEPEND="!app-editors/levee
+	sys-libs/ncurses"
+DEPEND="${RDEPEND}
+	dev-lang/perl"
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-gentoo.patch
+	epatch "${FILESDIR}"/${PN}-headers.patch
+	epatch "${FILESDIR}"/${PN}-tinfo.patch
+	epatch "${FILESDIR}"/${PN}-xz.patch
+
+	cd "${S}"/src
+	mv configure.{in,ac}
+	eautoreconf
+}
+
+src_configure() {
+	ECONF_SOURCE=src econf
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc README hello.sample
+	dohtml index.html relnote.html hello.sample.gif
+}
diff --git a/app-text/lv/lv-4.51-r4.ebuild b/app-text/lv/lv-4.51-r4.ebuild
new file mode 100644
index 000000000000..2518014787f3
--- /dev/null
+++ b/app-text/lv/lv-4.51-r4.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit autotools toolchain-funcs
+
+MY_P="${PN}${PV//./}"
+
+DESCRIPTION="Powerful Multilingual File Viewer"
+#HOMEPAGE="http://www.ff.iij4u.or.jp/~nrt/lv/"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE=""
+
+RDEPEND="!app-editors/levee
+	sys-libs/ncurses:0="
+DEPEND="${RDEPEND}
+	dev-lang/perl"
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-gentoo.patch
+	"${FILESDIR}"/${PN}-headers.patch
+	"${FILESDIR}"/${PN}-tinfo.patch
+	"${FILESDIR}"/${PN}-xz.patch
+)
+DOCS=( README hello.sample )
+HTML_DOCS=( index.html relnote.html hello.sample.gif )
+
+src_prepare() {
+	default
+
+	cd src
+	mv configure.{in,ac}
+	eautoreconf
+}
+
+src_configure() {
+	ECONF_SOURCE=src econf
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
diff --git a/app-text/lv/metadata.xml b/app-text/lv/metadata.xml
new file mode 100644
index 000000000000..44629a6d665c
--- /dev/null
+++ b/app-text/lv/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>slyfox@gentoo.org</email>
+    <name>Sergei Trofimovich</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-text/mandoc-1.14.1-r1 b/app-text/mandoc-1.14.1-r1
deleted file mode 100644
index fd21923f1e4e..000000000000
--- a/app-text/mandoc-1.14.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=prepare
-DEPEND=!static? ( sys-libs/zlib ) static? ( sys-libs/zlib[static-libs(+)] )
-DESCRIPTION=Suite of tools compiling mdoc and man
-EAPI=6
-HOMEPAGE=http://mdocml.bsd.lv/
-IUSE=static
-KEYWORDS=~amd64 ~x86
-LICENSE=ISC
-RDEPEND=!static? ( sys-libs/zlib )
-SLOT=0
-SRC_URI=http://mdocml.bsd.lv/snapshots/mdocml-1.14.1.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=810203f528b13109a945d5ed0a4be14d
diff --git a/app-text/mandoc-1.14.3 b/app-text/mandoc-1.14.3
deleted file mode 100644
index b918d99893dd..000000000000
--- a/app-text/mandoc-1.14.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=prepare
-DEPEND=!static? ( sys-libs/zlib ) static? ( sys-libs/zlib[static-libs(+)] )
-DESCRIPTION=Suite of tools compiling mdoc and man
-EAPI=6
-HOMEPAGE=http://mdocml.bsd.lv/
-IUSE=static
-KEYWORDS=~amd64 ~x86
-LICENSE=ISC
-RDEPEND=!static? ( sys-libs/zlib )
-SLOT=0
-SRC_URI=http://mdocml.bsd.lv/snapshots/mandoc-1.14.3.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=d3c5505829b79e90d0a9a59ca7702b72
diff --git a/app-text/mandoc/Manifest b/app-text/mandoc/Manifest
new file mode 100644
index 000000000000..fcf1e23a1276
--- /dev/null
+++ b/app-text/mandoc/Manifest
@@ -0,0 +1,5 @@
+DIST mandoc-1.14.3.tar.gz 617202 BLAKE2B f534c200d450ad526946afe3ffd0a6c21831080312220452aba400f97d11a01ec2e7e31ae64cd9f4e40c00487769b2ad4a9fe132adbe1419b96e7a5995ef746b SHA512 cd638fbacb068fcd6191f2a4e941effc010e3ebf06a3e32847b892c2e561771d03d5bca8fbdf8434d6491f4b68df3f443e2568b79193b7342044fba476fcd30b
+DIST mdocml-1.14.1.tar.gz 549302 BLAKE2B 160d75b187223dde21bf861487f6aeef7b48b39432a6c8c3ab8cb7b3a1d48c4757ccadd3261cca74df47c52df0c6eab2393f65512874f43ff554315762069ffe SHA512 90f00297d162faa404fe4e530f95422c210b8d23a0be5a115c2c8c17255d366e224444901842affb06ed8aaf8febd3e5c79966ff713fa7daf00e8c48b7a857c6
+EBUILD mandoc-1.14.1-r1.ebuild 1549 BLAKE2B f5f18a11aae7375dff00e43ebf93d647e435c88f715e92880b0fcd775eca285dd479878dd5d5239764c01ed59ad30ed532fee4a9f33f583d4befab4a1dea260d SHA512 10a594d1da10cd7e55bf0aad3ee788b46a533c8b0c0b47f75f1143ac349371c337ab57fabf6166aa6e3a26d6dd2f382cdca6aeb60f0390f40cf6e25e66302758
+EBUILD mandoc-1.14.3.ebuild 1536 BLAKE2B 96d5d1977bdf98a28d26053cd162a050ba8450014ab828486e2621378e8fb2e5b467acb22f93d52be87f7537cb3e9bdee44bb3e6892aae7c851c2e5463db020b SHA512 ba3e9775ce7566f2a7ba9cfd6d8f5e2b86aa3197a9bee35749323b55385d88d7ed8bd29126bca3061e7dc569411483e39952bcca713324e675b0f67f72d09551
+MISC metadata.xml 220 BLAKE2B 8ead86e7c2e2a8ecb0068c4ebcf5322f3ccce91c48fb2bc0b62bc6400609f57b3d5c37f92351f748da0e603129fe3e7be8dfcdb6294e003bf33e3ac0ca30eb48 SHA512 c262561324e85dc1fe18ceede654af3ae9f494b36233a807944dbbc7ac9764c93654d1faf958ef4c98c1fb370c71f5073443294289f43ddee0c76e606a703d32
diff --git a/app-text/mandoc/mandoc-1.14.1-r1.ebuild b/app-text/mandoc/mandoc-1.14.1-r1.ebuild
new file mode 100644
index 000000000000..1f7bd01b6fab
--- /dev/null
+++ b/app-text/mandoc/mandoc-1.14.1-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+MY_PN="mdocml"
+MY_P="${MY_PN}-${PV}"
+
+inherit multilib toolchain-funcs
+
+DESCRIPTION="Suite of tools compiling mdoc and man"
+HOMEPAGE="http://mdocml.bsd.lv/"
+SRC_URI="http://mdocml.bsd.lv/snapshots/${MY_P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static"
+
+LIB_DEPEND="sys-libs/zlib[static-libs(+)]"
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
+DEPEND="${RDEPEND}
+	static? ( ${LIB_DEPEND} )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+
+	# The db-install change is to support parallel installs.
+	sed -i \
+		-e '/ar rs/s:ar:$(AR):' \
+		-e '/^db-install:/s:$: base-install:' \
+		Makefile || die
+
+	cat <<EOF > "configure.local"
+PREFIX="${EPREFIX}/usr"
+BINDIR="${EPREFIX}/usr/bin"
+SBINDIR="${EPREFIX}/usr/sbin"
+LIBDIR="${EPREFIX}/usr/$(get_libdir)"
+MANDIR="${EPREFIX}/usr/share/man"
+INCLUDEDIR="${EPREFIX}/usr/include/mandoc"
+EXAMPLEDIR="${EPREFIX}/usr/share/examples/mandoc"
+MANPATH_DEFAULT="${EPREFIX}/usr/man:${EPREFIX}/usr/share/man:${EPREFIX}/usr/local/man:${EPREFIX}/usr/local/share/man"
+
+BINM_MAN=mman
+BINM_SOELIM=msoelim
+BINM_APROPOS=mapropos
+BINM_WHATIS=mwhatis
+BINM_MAKEWHATIS=mmakewhatis
+MANM_MAN=mandoc_man
+MANM_MDOC=mandoc_mdoc
+MANM_ROFF=mandoc_roff
+MANM_EQN=mandoc_eqn
+MANM_TBL=mandoc_tbl
+MANM_MANCONF=mman.conf
+
+CFLAGS="${CFLAGS} ${CPPFLAGS}"
+LDFLAGS="${LDFLAGS} $(usex static -static '')"
+AR="$(tc-getAR)"
+CC="$(tc-getCC)"
+# The STATIC variable is only used by man.cgi.
+STATIC=
+EOF
+}
diff --git a/app-text/mandoc/mandoc-1.14.3.ebuild b/app-text/mandoc/mandoc-1.14.3.ebuild
new file mode 100644
index 000000000000..927d26c15a00
--- /dev/null
+++ b/app-text/mandoc/mandoc-1.14.3.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit multilib toolchain-funcs
+
+DESCRIPTION="Suite of tools compiling mdoc and man"
+HOMEPAGE="http://mdocml.bsd.lv/"
+SRC_URI="http://mdocml.bsd.lv/snapshots/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static"
+
+LIB_DEPEND="sys-libs/zlib[static-libs(+)]"
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
+DEPEND="${RDEPEND}
+	static? ( ${LIB_DEPEND} )"
+
+src_prepare() {
+	default
+
+	# The db-install change is to support parallel installs.
+	sed -i \
+		-e '/ar rs/s:ar:$(AR):' \
+		-e '/^db-install:/s:$: base-install:' \
+		Makefile || die
+
+	cat <<-EOF > "configure.local"
+		PREFIX="${EPREFIX}/usr"
+		BINDIR="${EPREFIX}/usr/bin"
+		SBINDIR="${EPREFIX}/usr/sbin"
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)"
+		MANDIR="${EPREFIX}/usr/share/man"
+		INCLUDEDIR="${EPREFIX}/usr/include/mandoc"
+		EXAMPLEDIR="${EPREFIX}/usr/share/examples/mandoc"
+		MANPATH_DEFAULT="${EPREFIX}/usr/man:${EPREFIX}/usr/share/man:${EPREFIX}/usr/local/man:${EPREFIX}/usr/local/share/man"
+
+		BINM_MAN=mman
+		BINM_SOELIM=msoelim
+		BINM_APROPOS=mapropos
+		BINM_WHATIS=mwhatis
+		BINM_MAKEWHATIS=mmakewhatis
+		MANM_MAN=mandoc_man
+		MANM_MDOC=mandoc_mdoc
+		MANM_ROFF=mandoc_roff
+		MANM_EQN=mandoc_eqn
+		MANM_TBL=mandoc_tbl
+		MANM_MANCONF=mman.conf
+
+		CFLAGS="${CFLAGS} ${CPPFLAGS}"
+		LDFLAGS="${LDFLAGS} $(usex static -static '')"
+		AR="$(tc-getAR)"
+		CC="$(tc-getCC)"
+		# The STATIC variable is only used by man.cgi.
+		STATIC=
+	EOF
+}
diff --git a/app-text/mandoc/metadata.xml b/app-text/mandoc/metadata.xml
new file mode 100644
index 000000000000..aebca33be179
--- /dev/null
+++ b/app-text/mandoc/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>base-system@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/app-text/manpager-1 b/app-text/manpager-1
deleted file mode 100644
index 78e00742e7e2..000000000000
--- a/app-text/manpager-1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=compile install
-DESCRIPTION=Enable colorization of man pages
-EAPI=5
-HOMEPAGE=https://www.gentoo.org/
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux
-LICENSE=GPL-2
-SLOT=0
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=53c338de81998a80426c5c53c1edad49
diff --git a/app-text/manpager/Manifest b/app-text/manpager/Manifest
new file mode 100644
index 000000000000..703828218c64
--- /dev/null
+++ b/app-text/manpager/Manifest
@@ -0,0 +1,3 @@
+AUX manpager.c 1809 BLAKE2B 3f17501b90ca4af07e2bdebdc02b0dfd9aafe4dafe878852deeba30219593b1dc4310bd4a152ebf8bc4a58df61cf40fd3fe341cf0fd69e9cccfa43568a7ec67e SHA512 4f827429dc46993010d0096cb352920dfdcaf2cc97bf10e2155dfea3fda601c011467be65ca3f2e3f5c44cb26de0fd9eb58f7d875f75fd5f1db4b2c6cdabdca2
+EBUILD manpager-1.ebuild 646 BLAKE2B bfb4bd847f6a94f6db1cf5b7536ce4984ac82c8feb12cecdec09a01196a93fd95512717a262532721e2095bff5d043889dcffbb7c47f75495b3920386a4e9e6e SHA512 7e4582eefc9acfc019b6bf4e9601d3efce10c70bc512af5e806b899bc1d7c9d08b5af4e0ae06d791e110b0a1803b53d1248890ede0f625578b7c2139ab3ad74c
+MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/app-text/manpager/files/manpager.c b/app-text/manpager/files/manpager.c
new file mode 100644
index 000000000000..99b0680a1d83
--- /dev/null
+++ b/app-text/manpager/files/manpager.c
@@ -0,0 +1,74 @@
+/*
+ * Wrapper to help enable colorized man page output.
+ * Only works with PAGER=less
+ *
+ * https://bugs.gentoo.org/184604
+ * https://unix.stackexchange.com/questions/108699/documentation-on-less-termcap-variables
+ *
+ * Copyright 2003-2015 Gentoo Foundation
+ * Distributed under the terms of the GNU General Public License v2
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#define COLOR(c, b) "\e[" #c ";" #b "m"
+
+#define _SE(termcap, col) setenv("LESS_TERMCAP_" #termcap, col, 0)
+#define SE(termcap, c, b) _SE(termcap, COLOR(c, b))
+
+static int usage(void)
+{
+	puts(
+		"manpager: display man pages with color!\n"
+		"\n"
+		"Usage:\n"
+		"\texport MANPAGER=manpager\n"
+		"\tman man\n"
+		"\n"
+		"To control the colorization, set these env vars:\n"
+		"\tLESS_TERMCAP_mb - start blinking\n"
+		"\tLESS_TERMCAP_md - start bolding\n"
+		"\tLESS_TERMCAP_me - stop bolding\n"
+		"\tLESS_TERMCAP_us - start underlining\n"
+		"\tLESS_TERMCAP_ue - stop underlining\n"
+		"\tLESS_TERMCAP_so - start standout (reverse video)\n"
+		"\tLESS_TERMCAP_se - stop standout (reverse video)\n"
+		"\n"
+		"You can do so by doing:\n"
+		"\texport LESS_TERMCAP_md=\"$(printf '\\e[1;36m')\"\n"
+		"\n"
+		"Run 'less --help' or 'man less' for more info"
+	);
+	return 0;
+}
+
+int main(int argc, char *argv[])
+{
+	if (argc == 2 && (!strcmp(argv[1], "-h") || !strcmp(argv[1], "--help")))
+		return usage();
+
+	/* Blinking. */
+	SE(mb, 5, 31);	/* Start. */
+
+	/* Bolding. */
+	SE(md, 1, 34);	/* Start. */
+	SE(me, 0, 0);	/* Stop. */
+
+	/* Underlining. */
+	SE(us, 4, 36);	/* Start. */
+	SE(ue, 0, 0);	/* Stop. */
+
+#if 0
+	/* Standout (reverse video). */
+	SE(so, 1, 32);	/* Start. */
+	SE(se, 0, 0);	/* Stop. */
+#endif
+
+	argv[0] = getenv("PAGER") ? : "less";
+	execvp(argv[0], argv);
+	perror("could not launch PAGER");
+	return 1;
+}
diff --git a/app-text/manpager/manpager-1.ebuild b/app-text/manpager/manpager-1.ebuild
new file mode 100644
index 000000000000..39b1214d8e0d
--- /dev/null
+++ b/app-text/manpager/manpager-1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit toolchain-funcs
+
+DESCRIPTION="Enable colorization of man pages"
+HOMEPAGE="https://www.gentoo.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
+IUSE=""
+
+S=${WORKDIR}
+
+src_compile() {
+	local cmd=(
+		$(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}
+		"${FILESDIR}"/manpager.c -o ${PN}
+	)
+	echo "${cmd[@]}"
+	"${cmd[@]}" || die
+}
+
+src_install() {
+	dobin ${PN}
+	insinto /etc/env.d
+	echo "MANPAGER=manpager" | newins - 00manpager
+}
diff --git a/app-text/manpager/metadata.xml b/app-text/manpager/metadata.xml
new file mode 100644
index 000000000000..56c124413057
--- /dev/null
+++ b/app-text/manpager/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>base-system@gentoo.org</email>
+	<name>Gentoo Base System</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-text/master-pdf-editor-4.3.61 b/app-text/master-pdf-editor-4.3.61
deleted file mode 100644
index 798e7b7946a2..000000000000
--- a/app-text/master-pdf-editor-4.3.61
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DESCRIPTION=Master PDF Editor is a complete solution for viewing and editing PDF files
-EAPI=6
-HOMEPAGE=https://code-industry.net/free-pdf-editor/
-KEYWORDS=~amd64
-LICENSE=master-pdf-editor
-RDEPEND=app-arch/bzip2 dev-libs/double-conversion dev-libs/glib dev-libs/icu dev-libs/openssl media-gfx/graphite2 media-gfx/sane-backends media-libs/freetype media-libs/harfbuzz media-libs/libjpeg-turbo media-libs/libpng media-libs/tiff x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXdmcp x11-libs/libXext >=dev-qt/qtsvg-5.4:5 >=dev-qt/qtnetwork-5.4:5 >=dev-qt/qtgui-5.4:5 >=dev-qt/qtprintsupport-5.4:5
-RESTRICT=mirror
-SLOT=0
-SRC_URI=http://get.code-industry.net/public/master-pdf-editor-4.3.61_qt5.amd64.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=bfc83461c95605b36797433ff812f8c4
diff --git a/app-text/master-pdf-editor-4.3.82 b/app-text/master-pdf-editor-4.3.82
deleted file mode 100644
index 5bb301971013..000000000000
--- a/app-text/master-pdf-editor-4.3.82
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DESCRIPTION=Master PDF Editor is a complete solution for viewing and editing PDF files
-EAPI=6
-HOMEPAGE=https://code-industry.net/free-pdf-editor/
-KEYWORDS=~amd64
-LICENSE=master-pdf-editor
-RDEPEND=app-arch/bzip2 dev-libs/double-conversion dev-libs/glib dev-libs/icu dev-libs/openssl media-gfx/graphite2 media-gfx/sane-backends media-libs/freetype media-libs/harfbuzz media-libs/libjpeg-turbo media-libs/libpng media-libs/tiff x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXdmcp x11-libs/libXext >=dev-qt/qtsvg-5.4:5 >=dev-qt/qtnetwork-5.4:5 >=dev-qt/qtgui-5.4:5 >=dev-qt/qtprintsupport-5.4:5
-RESTRICT=mirror
-SLOT=0
-SRC_URI=http://get.code-industry.net/public/master-pdf-editor-4.3.82_qt5.amd64.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0491a6959b432ce7072f5c2d60b53d38
diff --git a/app-text/master-pdf-editor-5.0.15 b/app-text/master-pdf-editor-5.0.15
deleted file mode 100644
index a824084b0108..000000000000
--- a/app-text/master-pdf-editor-5.0.15
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm
-DESCRIPTION=Master PDF Editor is a complete solution for viewing and editing PDF files
-EAPI=6
-HOMEPAGE=https://code-industry.net/free-pdf-editor/
-KEYWORDS=~amd64
-LICENSE=master-pdf-editor
-RDEPEND=>=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
-RESTRICT=mirror
-SLOT=0
-SRC_URI=http://code-industry.net/public/master-pdf-editor-5.0.15_qt5.amd64.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5e49e752aac76a25e1ca62a3d5b81ec7
diff --git a/app-text/master-pdf-editor/Manifest b/app-text/master-pdf-editor/Manifest
new file mode 100644
index 000000000000..789fb821d54d
--- /dev/null
+++ b/app-text/master-pdf-editor/Manifest
@@ -0,0 +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-4.3.61.ebuild b/app-text/master-pdf-editor/master-pdf-editor-4.3.61.ebuild
new file mode 100644
index 000000000000..7f5e919d6361
--- /dev/null
+++ b/app-text/master-pdf-editor/master-pdf-editor-4.3.61.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit xdg-utils eutils versionator
+
+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://get.code-industry.net/public/${P}_qt5.amd64.tar.gz"
+
+LICENSE="master-pdf-editor"
+SLOT="0"
+KEYWORDS="~amd64"
+RESTRICT="mirror"
+
+COMMON_DEPEND="
+	app-arch/bzip2
+	dev-libs/double-conversion
+	dev-libs/glib
+	dev-libs/icu
+	dev-libs/openssl
+	media-gfx/graphite2
+	media-gfx/sane-backends
+	media-libs/freetype
+	media-libs/harfbuzz
+	media-libs/libjpeg-turbo
+	media-libs/libpng
+	media-libs/tiff
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libxcb
+	x11-libs/libXdmcp
+	x11-libs/libXext
+	>=dev-qt/qtsvg-5.4:5
+	>=dev-qt/qtnetwork-5.4:5
+	>=dev-qt/qtgui-5.4:5
+	>=dev-qt/qtprintsupport-5.4:5
+"
+
+RDEPEND="${COMMON_DEPEND}"
+
+S="${WORKDIR}/${PN}-$(get_major_version ${PV})"
+
+src_install() {
+	local dest=/opt/${PN}
+	local bin_name=masterpdfeditor4
+
+	insinto ${dest}
+	doins -r fonts lang stamps templates ${bin_name}.png
+
+	exeinto ${dest}
+	doexe ${bin_name}
+
+	dosym ${dest}/${bin_name} /opt/bin/${bin_name}
+	make_desktop_entry ${bin_name} \
+		"Master PDF Editor ${PV}" ${dest}/${bin_name}.png \
+		"Office;Graphics;Viewer" \
+		"MimeType=application/pdf;application/x-bzpdf;application/x-gzpdf;\nTerminal=false"
+}
+
+pkg_postinst() {
+	sed -i -e \
+		'/^Exec=/s/masterpdfeditor4/masterpdfeditor4 %f/' \
+		/usr/share/applications/masterpdfeditor4-${PN}.desktop || die
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/app-text/master-pdf-editor/master-pdf-editor-4.3.82.ebuild b/app-text/master-pdf-editor/master-pdf-editor-4.3.82.ebuild
new file mode 100644
index 000000000000..2af6159261c6
--- /dev/null
+++ b/app-text/master-pdf-editor/master-pdf-editor-4.3.82.ebuild
@@ -0,0 +1,65 @@
+# 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://get.code-industry.net/public/${P}_qt5.amd64.tar.gz"
+
+LICENSE="master-pdf-editor"
+SLOT="0"
+KEYWORDS="~amd64"
+RESTRICT="mirror"
+
+COMMON_DEPEND="
+	app-arch/bzip2
+	dev-libs/double-conversion
+	dev-libs/glib
+	dev-libs/icu
+	dev-libs/openssl
+	media-gfx/graphite2
+	media-gfx/sane-backends
+	media-libs/freetype
+	media-libs/harfbuzz
+	media-libs/libjpeg-turbo
+	media-libs/libpng
+	media-libs/tiff
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libxcb
+	x11-libs/libXdmcp
+	x11-libs/libXext
+	>=dev-qt/qtsvg-5.4:5
+	>=dev-qt/qtnetwork-5.4:5
+	>=dev-qt/qtgui-5.4:5
+	>=dev-qt/qtprintsupport-5.4:5
+"
+
+RDEPEND="${COMMON_DEPEND}"
+
+S="${WORKDIR}/${PN}-${PV%%.*}"
+
+src_install() {
+	insinto /opt/${PN}
+	doins -r fonts lang stamps templates masterpdfeditor4.png
+
+	exeinto /opt/${PN}
+	doexe masterpdfeditor4
+
+	dosym ../${PN}/masterpdfeditor4 /opt/bin/masterpdfeditor4
+	make_desktop_entry "masterpdfeditor4 %f" \
+		"Master PDF Editor ${PV}" /opt/${PN}/masterpdfeditor4.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/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/master-pdf-editor/metadata.xml b/app-text/master-pdf-editor/metadata.xml
new file mode 100644
index 000000000000..82340dc648a0
--- /dev/null
+++ b/app-text/master-pdf-editor/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>joaompssantos@gmail.com</email>
+		<name>Joao Santos</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-text/mathtex-1.04 b/app-text/mathtex-1.04
deleted file mode 100644
index a6b512b28e02..000000000000
--- a/app-text/mathtex-1.04
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst
-DESCRIPTION=Lets you easily embed LaTeX math in your own html pages, blogs, wikis, etc
-EAPI=5
-HOMEPAGE=http://www.forkosh.com/mathtex.html
-IUSE=png
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=app-text/dvipng virtual/latex-base
-SLOT=0
-SRC_URI=mirror://gentoo/mathtex-1.04.zip
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=281b388871719a289bde5719351fe907
diff --git a/app-text/mathtex/Manifest b/app-text/mathtex/Manifest
new file mode 100644
index 000000000000..857c008d9281
--- /dev/null
+++ b/app-text/mathtex/Manifest
@@ -0,0 +1,3 @@
+DIST mathtex-1.04.zip 148443 BLAKE2B 6632d30536428f6f33fc13a2b5b38651f2ab7a938381166b79c009ab3d95788fc69e8ed824dae64dca00d32bb79ccd00a73b772f9aebc813d54fd6e0f18839f4 SHA512 4b299a6dc503a01d6be3182ad982e38c0b6d926f09a09bd5169f8ad2c947c020ad532b15146379b4bc2158cfceec4cb4a0b7bf902423e0a8ad9b0b0190a99601
+EBUILD mathtex-1.04.ebuild 885 BLAKE2B 1167a1ef2a7187932ff06b98d9966284a7aa8125c66d1bfc5bffffe40a661f44ec6c4869b9aa2368a932f74484c3390ec57a732b0e42cfb39f92a5275d57a54b SHA512 1c74aaa03a53c5ce6639ab5e4e960f1556aeaf3978df76eb17a9f5d9c69cfa876ef18a68b86113c518927d5239b0fa88b6a0aa9eb3300bc0cbcf48f7b296865f
+MISC metadata.xml 633 BLAKE2B 0b7f70957a2eacffe8148ad27186334c9f6a0bb4f2f0142a132eccdbbc6c1a4f96a7cb40f927c29109e2046c5bef23af4c64b1991f9fb2984f4e76ecf96f8264 SHA512 9086dbde5cbad1aebf2b0ffdf011db515befe5bff5c40e37726a0fce358f12875469d0afa70f410e273f3ec1f80a4980c77acb888b7aa5c83cd7ecb28afbb21a
diff --git a/app-text/mathtex/mathtex-1.04.ebuild b/app-text/mathtex/mathtex-1.04.ebuild
new file mode 100644
index 000000000000..c04f8dc4dfea
--- /dev/null
+++ b/app-text/mathtex/mathtex-1.04.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit toolchain-funcs
+
+DESCRIPTION="Lets you easily embed LaTeX math in your own html pages, blogs, wikis, etc"
+HOMEPAGE="http://www.forkosh.com/mathtex.html"
+SRC_URI="mirror://gentoo/${P}.zip"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="png"
+
+RDEPEND="app-text/dvipng
+	virtual/latex-base"
+DEPEND=""
+
+S=${WORKDIR}
+
+einfo_run_command() {
+	einfo "${@}"
+	${@} || die
+}
+
+src_compile() {
+	einfo_run_command $(tc-getCC) \
+		${CFLAGS} ${LDFLAGS} \
+		-DLATEX=\"/usr/bin/latex\" \
+		-DDVIPNG=\"/usr/bin/dvipng\" \
+		$(use png && echo "-DPNG") \
+		 mathtex.c -o mathtex
+}
+
+src_install() {
+	dobin mathtex
+	dodoc README
+	dohtml mathtex.html
+}
+
+pkg_postinst() {
+	elog "To use mathtex in your web-pages, just link /usr/bin/mathtex"
+	elog "to your cgi-bin subdirectory!"
+}
diff --git a/app-text/mathtex/metadata.xml b/app-text/mathtex/metadata.xml
new file mode 100644
index 000000000000..c3330bb45b70
--- /dev/null
+++ b/app-text/mathtex/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<use>
+		<flag name="png">Generate png images by default instead of gif</flag>
+	</use>
+	<longdescription>MathTeX parses a LaTeX math expression and immediately emits 
+	the corresponding gif (or png) image.  It can be used as cgi program to embed
+	LaTeX math in your own html pages, blogs, wikis, etc. Just place an html img
+	tag in your document wherever you want to see the corresponding LaTeX
+	expression. Take a look at homepage for examples.
+	</longdescription>
+</pkgmetadata>
diff --git a/app-text/mecab-0.996 b/app-text/mecab-0.996
deleted file mode 100644
index 71ec1ac447fd..000000000000
--- a/app-text/mecab-0.996
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=dev-lang/perl virtual/libiconv >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Yet Another Part-of-Speech and Morphological Analyzer
-EAPI=5
-HOMEPAGE=http://mecab.sourceforge.net/
-IUSE=static-libs unicode
-KEYWORDS=amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=|| ( BSD LGPL-2.1 GPL-2 )
-PDEPEND=|| ( app-dicts/mecab-ipadic[unicode=] app-dicts/mecab-naist-jdic[unicode=] )
-SLOT=0
-SRC_URI=https://mecab.googlecode.com/files/mecab-0.996.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=41c3391ee04493fc7ba318df2432f4fd
diff --git a/app-text/mecab/Manifest b/app-text/mecab/Manifest
new file mode 100644
index 000000000000..26686167ae55
--- /dev/null
+++ b/app-text/mecab/Manifest
@@ -0,0 +1,4 @@
+AUX mecab-0.98-iconv.patch 396 BLAKE2B 6a67c8c337b24aff11c4d650054c7321702c8ca6c8499068b1a542b4f52c11e29ca4b0fcf0bcb3cdaf7b86e491fcc3d8cc00960ce33bf3255412fa87a47ad77f SHA512 00ff7e2e716ed2617506824af4887a5d3dd088aba8d93b2c07ad8b834b4526678381903db95055aa798223886e10378c0b26ce28757123d5a8e3651fc873260a
+DIST mecab-0.996.tar.gz 1398663 BLAKE2B 97ea18a00c6f2284c994681631b84a572d244b741c8e30b5fdf5404b2bf80fdd4c724c803999955e36ee252e59e6644716dbdca55a6ffb2e4de52193d7f777bd SHA512 aca6d16f411b9ba9b6687242246aeb28ede6d6c6a9122d4a32da9d8e76e79b5f4af2c8e3b13ad9462b34e9d2994cbd9bbbedebac45609684db9b703da999577f
+EBUILD mecab-0.996.ebuild 1008 BLAKE2B af6c1abef5615d3f1f1714fb869f8b22a30a8d31802fffd8e8134f2ee0401b1a7b03e138d09748c45496ab608a355af8de17a5c6194481a080b795cd94629f7d SHA512 745dde54ddcb6c12699050d63a060ad33565d7ae94817b14cc38cbac5516eb61922980287fba40c42e39c05b031d67b39c1701e7998bfa8eea81e63e299d8fc7
+MISC metadata.xml 359 BLAKE2B de31f469c45b9e95fd1cb0ae1d255977d78a8c96ca3bdea624eac82653e390f89972f2e680ea27a46d49909e185da8f70b51f7471974c7ad3f2947a425481da7 SHA512 26564a01d9ab28904670979d1961ab53dff53842e73ddb00f7d28f40c63ee0550daa6d48e44ea7e8a9ba04fe6852f61fae99612f111c0aef96d7422b21818c87
diff --git a/app-text/mecab/files/mecab-0.98-iconv.patch b/app-text/mecab/files/mecab-0.98-iconv.patch
new file mode 100644
index 000000000000..76ead6c38f99
--- /dev/null
+++ b/app-text/mecab/files/mecab-0.98-iconv.patch
@@ -0,0 +1,10 @@
+--- mecab-0.98/src/Makefile.am.old	2010-05-02 12:39:07.000000000 +0200
++++ mecab-0.98/src/Makefile.am	2010-05-02 12:39:28.000000000 +0200
+@@ -17,6 +17,7 @@
+ 			feature_index.cpp  feature_index.h  lbfgs.cpp \
+ 			lbfgs.h  learner_tagger.cpp  learner_tagger.h  learner.cpp  \
+ 			learner_node.h libmecab.cpp
++libmecab_la_LIBADD = $(LTLIBICONV)
+ 
+ include_HEADERS = mecab.h
+ bin_PROGRAMS    = mecab
diff --git a/app-text/mecab/mecab-0.996.ebuild b/app-text/mecab/mecab-0.996.ebuild
new file mode 100644
index 000000000000..8485aa6743a1
--- /dev/null
+++ b/app-text/mecab/mecab-0.996.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit autotools eutils
+
+DESCRIPTION="Yet Another Part-of-Speech and Morphological Analyzer"
+HOMEPAGE="http://mecab.sourceforge.net/"
+SRC_URI="https://mecab.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="|| ( BSD LGPL-2.1 GPL-2 )"
+KEYWORDS="amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
+SLOT="0"
+IUSE="static-libs unicode"
+
+DEPEND="dev-lang/perl
+	virtual/libiconv"
+RDEPEND=""
+PDEPEND="|| (
+		app-dicts/mecab-ipadic[unicode=]
+		app-dicts/mecab-naist-jdic[unicode=]
+	)"
+
+src_prepare() {
+	sed -i \
+		-e "/CFLAGS/s/-O3/${CFLAGS}/" \
+		-e "/CXXFLAGS/s/-O3/${CXXFLAGS}/" \
+		configure.in || die
+	epatch "${FILESDIR}/${PN}-0.98-iconv.patch"
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable static-libs static) \
+		$(use_with unicode charset UTF-8)
+}
+
+src_install() {
+	default
+	dodoc AUTHORS README
+	dohtml -r doc/*
+
+	use static-libs || find "${ED}" -name '*.la' -delete
+}
diff --git a/app-text/mecab/metadata.xml b/app-text/mecab/metadata.xml
new file mode 100644
index 000000000000..367494a8fef2
--- /dev/null
+++ b/app-text/mecab/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="google-code">mecab</remote-id>
+		<remote-id type="sourceforge">mecab</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/metadata.xml b/app-text/metadata.xml
new file mode 100644
index 000000000000..fcbc7cd873ba
--- /dev/null
+++ b/app-text/metadata.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<catmetadata>
+	<longdescription lang="en">
+		The app-text category contains tools for working with human-language
+		text files.
+	</longdescription>
+	<longdescription lang="de">
+		Die Kategorie app-text enhält Werkzeuge für das Arbeiten mit menschenlesbaren
+		Textdokumenten.
+	</longdescription>
+	<longdescription lang="es">
+		La categoría app-text contiene herramientas para trabajar con archivos
+		de texto en lenguaje humano.
+	</longdescription>
+	<longdescription lang="nl">
+		De app-text categorie bevat applicaties voor het werken met door mensen geschreven teksten.
+	</longdescription>
+	<longdescription lang="vi">
+		Nhóm app-text chứa các công cụ để làm việc với các tập
+		tin văn bản có thể đ�c hiểu.
+	</longdescription>
+	<longdescription lang="it">
+		La categoria app-text contiene utilità per lavorare con file di testo.
+	</longdescription>
+	<longdescription lang="pt">
+		A categoria app-text contém ferramentas para trabalhar com
+		arquivos de texto em linguagens humanas.
+	</longdescription>
+	<longdescription lang="pl">
+		Kategoria app-text zawiera narzędzia do pracy ze zwykłymi plikami tekstowymi.
+	</longdescription>
+</catmetadata>
+
diff --git a/app-text/mftrace-1.2.18-r3 b/app-text/mftrace-1.2.18-r3
deleted file mode 100644
index 08bbff01b981..000000000000
--- a/app-text/mftrace-1.2.18-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install setup
-DEPEND=>=app-text/t1utils-1.25 media-gfx/potrace truetype? ( media-gfx/fontforge ) virtual/latex-base python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] test? ( media-gfx/fontforge )
-DESCRIPTION=Traces TeX fonts to PFA or PFB fonts (formerly pktrace)
-EAPI=6
-HOMEPAGE=http://lilypond.org/mftrace/
-IUSE=test truetype python_targets_python2_7
-KEYWORDS=amd64 ~hppa ppc x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=>=app-text/t1utils-1.25 media-gfx/potrace truetype? ( media-gfx/fontforge ) virtual/latex-base python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
-REQUIRED_USE=python_targets_python2_7
-SLOT=1
-SRC_URI=http://lilypond.org/downloads/sources/mftrace/mftrace-1.2.18.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=424000d3920eed4a820609b6e8644a7a
diff --git a/app-text/mftrace-1.2.19-r1 b/app-text/mftrace-1.2.19-r1
deleted file mode 100644
index 77e4131976b7..000000000000
--- a/app-text/mftrace-1.2.19-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install setup
-DEPEND=>=app-text/t1utils-1.25 media-gfx/potrace truetype? ( media-gfx/fontforge ) virtual/latex-base python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] test? ( media-gfx/fontforge )
-DESCRIPTION=Traces TeX fonts to PFA or PFB fonts (formerly pktrace)
-EAPI=6
-HOMEPAGE=http://lilypond.org/mftrace/
-IUSE=test truetype python_targets_python2_7
-KEYWORDS=~amd64 ~hppa ~ppc ~x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=>=app-text/t1utils-1.25 media-gfx/potrace truetype? ( media-gfx/fontforge ) virtual/latex-base python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
-REQUIRED_USE=python_targets_python2_7
-SLOT=1
-SRC_URI=http://lilypond.org/downloads/sources/mftrace/mftrace-1.2.19.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=bbdd44aba811481a7847535843316ca0
diff --git a/app-text/mftrace/Manifest b/app-text/mftrace/Manifest
new file mode 100644
index 000000000000..8bb762a95b19
--- /dev/null
+++ b/app-text/mftrace/Manifest
@@ -0,0 +1,5 @@
+DIST mftrace-1.2.18.tar.gz 79112 BLAKE2B 8c3be27985766690782338dec33955cbac80e7d8f4334ed7b62d3c52d7ea5784c14b12c87afd13099cdae226033ca3324b9e7c6e876badb75a8fb634f68a75f6 SHA512 db26a643a92cfcbb150c5f80af65b1ce6030a266023b4433ea760c3601092c42602617f52a49ce467cd3a4804aa6779e72ee38dc557dc03e1e1c86a36dbd54db
+DIST mftrace-1.2.19.tar.gz 78907 BLAKE2B 894ec3c428020cad8f2e408e141b58d7f1e0969c59e65ccb5379e346d735845f8922be4e046ca8fbd18cfd7c3b8e2179ed7af4756ddb4416b6ad42bdbff27f09 SHA512 410739ced17c5e5bb82c286b6b935c9d8d46299f9c04f0ba4c97df9ada5d7e9c778c720fb8a2377eb6df3c629a6e7264836fe7675733cf60197a817477dc49ee
+EBUILD mftrace-1.2.18-r3.ebuild 880 BLAKE2B 8acb91b62b98111984b27ee23b7a55840ac5b931a885bceed004851bcdc770f4c7a7a843bf503d4e19b7b0d9bd0c78cfca9490e5febe9799fcb387bc01b60b03 SHA512 f98ca43a58e9a15945772880dddb0c82df88469b02913c1b95f5e8b748619a189b8a7b98fa5e90ca6049f3a7213056bc1e97cb4cf9575b209a9e3c40e6dba651
+EBUILD mftrace-1.2.19-r1.ebuild 883 BLAKE2B 68fe01bcfcac4e4e38c6cb40546c55316323990d50f6baf4ab0440d105659ef57c4fdb9aed4773bd9a2554e82c96293b3f74dae35cfb8c512e3073ce948ea4e4 SHA512 7641184886ca69f49686a4bff64445660d73109ba0dd1a88bf869b398413d54ef795254cb06e06c73a87346734d8b7c704e0b843d10e74fe2678dfafc4430689
+MISC metadata.xml 340 BLAKE2B c05678e707d8559ee9e192a80e8911ed8caf3279f8b240e2554bf2e60a6f10c0c1597d12ee3d236fdcf4e9b10aea677972c1a443eabf507d37f6adf9cc7fbcff SHA512 f8317a47d8515f79517a74e966aa31a05c9900a5a4aa52d9aac86b92d15553d03e6d82051312eb689d62381be05ab0f2fe9234bd520e86faf8226aba0cc9ba21
diff --git a/app-text/mftrace/metadata.xml b/app-text/mftrace/metadata.xml
new file mode 100644
index 000000000000..db4b1471479e
--- /dev/null
+++ b/app-text/mftrace/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>fonts@gentoo.org</email>
+	<name>Fonts</name>
+</maintainer>
+<maintainer type="project">
+	<email>tex@gentoo.org</email>
+	<name>Gentoo TeX Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-text/mftrace/mftrace-1.2.18-r3.ebuild b/app-text/mftrace/mftrace-1.2.18-r3.ebuild
new file mode 100644
index 000000000000..059796f95a34
--- /dev/null
+++ b/app-text/mftrace/mftrace-1.2.18-r3.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-single-r1 toolchain-funcs
+
+DESCRIPTION="Traces TeX fonts to PFA or PFB fonts (formerly pktrace)"
+HOMEPAGE="http://lilypond.org/mftrace/"
+SRC_URI="http://lilypond.org/downloads/sources/mftrace/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="amd64 ~hppa ppc x86 ~x86-fbsd"
+# SLOT 1 was used in pktrace ebuild
+SLOT="1"
+IUSE="test truetype"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND=">=app-text/t1utils-1.25
+	media-gfx/potrace
+	truetype? ( media-gfx/fontforge )
+	virtual/latex-base
+	${PYTHON_DEPS}"
+DEPEND="${RDEPEND}
+	test? ( media-gfx/fontforge )"
+
+src_configure() {
+	tc-export CC
+	econf \
+		--datadir="$(python_get_sitedir)"
+}
+
+src_compile() {
+	emake CFLAGS="-Wall ${CFLAGS}"
+}
+
+src_install () {
+	default
+	python_optimize
+}
diff --git a/app-text/mftrace/mftrace-1.2.19-r1.ebuild b/app-text/mftrace/mftrace-1.2.19-r1.ebuild
new file mode 100644
index 000000000000..fedb8709080c
--- /dev/null
+++ b/app-text/mftrace/mftrace-1.2.19-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-single-r1 toolchain-funcs
+
+DESCRIPTION="Traces TeX fonts to PFA or PFB fonts (formerly pktrace)"
+HOMEPAGE="http://lilypond.org/mftrace/"
+SRC_URI="http://lilypond.org/downloads/sources/mftrace/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~hppa ~ppc ~x86 ~x86-fbsd"
+# SLOT 1 was used in pktrace ebuild
+SLOT="1"
+IUSE="test truetype"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND=">=app-text/t1utils-1.25
+	media-gfx/potrace
+	truetype? ( media-gfx/fontforge )
+	virtual/latex-base
+	${PYTHON_DEPS}"
+DEPEND="${RDEPEND}
+	test? ( media-gfx/fontforge )"
+
+src_configure() {
+	tc-export CC
+	econf \
+		--datadir="$(python_get_sitedir)"
+}
+
+src_compile() {
+	emake CFLAGS="-Wall ${CFLAGS}"
+}
+
+src_install () {
+	default
+	python_optimize
+}
diff --git a/app-text/mht-rip-0.8 b/app-text/mht-rip-0.8
deleted file mode 100644
index 9d2631ffe624..000000000000
--- a/app-text/mht-rip-0.8
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DESCRIPTION=convert mht/mhtml files to something usable
-EAPI=0
-HOMEPAGE=http://www.loganowen.com/mht-rip/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://www.loganowen.com/mht-rip/mht-rip-0.8.c
-_md5_=803fc476a9706cff7d1cea9a7582b398
diff --git a/app-text/mht-rip/Manifest b/app-text/mht-rip/Manifest
new file mode 100644
index 000000000000..89109fc79ecf
--- /dev/null
+++ b/app-text/mht-rip/Manifest
@@ -0,0 +1,3 @@
+DIST mht-rip-0.8.c 9105 BLAKE2B f8b7566b5c875b10992f4b8bd4746f0be6b75cddc2d07f17db9113254ea2354f65d77ddc13f6e930051e8f0bbe564c4f37baf4355be999c2a524f05597d5cf30 SHA512 377643c75e621dfa88f426db8e0f8e0959aaa841d1950ab1cc4d514de1a4120cbd20e9f18aa58607b6012a9417095489de968002bd8d91fd89f71dcc0b90357e
+EBUILD mht-rip-0.8.ebuild 473 BLAKE2B adccc048fd29ccd8f680581f910647467b01ec9a4ef2c3b66cfd56228e8818eb3302ea59d387d9f27a3a8a41907474a7aca99fa919ac717f890aec490b21cd05 SHA512 7543b8eb5e6adf03f9efe7f184e57a3244af528ada3eefc7f3424605b99c8ca26b715670fbf21892feb9b791aff2840a4987f8c148e9e99d4fcc2b2f9f308fd4
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/mht-rip/metadata.xml b/app-text/mht-rip/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-text/mht-rip/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/app-text/mht-rip/mht-rip-0.8.ebuild b/app-text/mht-rip/mht-rip-0.8.ebuild
new file mode 100644
index 000000000000..f911329069fb
--- /dev/null
+++ b/app-text/mht-rip/mht-rip-0.8.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+DESCRIPTION="convert mht/mhtml files to something usable"
+HOMEPAGE="http://www.loganowen.com/mht-rip/"
+SRC_URI="http://www.loganowen.com/mht-rip/${P}.c"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+S=${WORKDIR}
+
+src_unpack() {
+	cp "${DISTDIR}"/${A} ${PN}.c || die
+}
+
+src_compile() {
+	emake ${PN} || die
+}
+
+src_install() {
+	dobin ${PN} || die
+}
diff --git a/app-text/mpage-2.5.6-r1 b/app-text/mpage-2.5.6-r1
deleted file mode 100644
index e59d428163ee..000000000000
--- a/app-text/mpage-2.5.6-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=Many to one page printing utility
-EAPI=4
-HOMEPAGE=http://www.mesa.nl/
-KEYWORDS=amd64 ppc x86
-LICENSE=freedist
-SLOT=0
-SRC_URI=http://www.mesa.nl/pub/mpage/mpage-2.5.6.tgz https://dev.gentoo.org/~mgorny/dist/mpage-2.5.6-gentoo-patchset.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2a68ede7c86c0c5c61bbae8d1dcfd72a
diff --git a/app-text/mpage/Manifest b/app-text/mpage/Manifest
new file mode 100644
index 000000000000..a9f6d764cad7
--- /dev/null
+++ b/app-text/mpage/Manifest
@@ -0,0 +1,4 @@
+DIST mpage-2.5.6-gentoo-patchset.tar.bz2 12853 BLAKE2B 69adf941b43fdd7c4e43f3c793063f8d4c1d7f5eeed4b4e01cee7c7a7f5b70554cf1d2e4f73278231d5d95b99de7925ca6f355b8933bb5b7ea2d850d802b567c SHA512 2bfbe4689e02fb76af58a6db3415227df38e71b45fcc3d563a12f505fab8ea78de0415c9ac6d7c9b873f23a9f65e1c8f708f902965ab10e18b2a217b67cc5f0d
+DIST mpage-2.5.6.tgz 86748 BLAKE2B 44558be1272c90a83de37bf9854c96dd1f5b9b38d8588bae66adcfdaa938da351f606424f4d9049231bddae2d03ebc632570a7c80a0037ba1536147aa33df872 SHA512 79a51d0fa08848b22f758e8bc3f57680d33492d261a0061c6cce002c3cb5f129a78221d2af1749c79d4e46385136d9996294499531e60e8fc501f9fd61f8077d
+EBUILD mpage-2.5.6-r1.ebuild 970 BLAKE2B 17de01d5e612540093fc011c37ba8d9944ee321c11cdba31ecadaeecd6ede3ba3ad18bf51e3f0c8b9ddf956c14dda4f276a14b132c823b047c5db480380dd64b SHA512 312066f12c7fbfbcf68ec5c3b595a4ce5fa41cb7328be95291aadfa58a0a13e555cb727bc800192be9457ba46bbb55130533b41dadfa0253856ad604aa22f4da
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/mpage/metadata.xml b/app-text/mpage/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-text/mpage/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/app-text/mpage/mpage-2.5.6-r1.ebuild b/app-text/mpage/mpage-2.5.6-r1.ebuild
new file mode 100644
index 000000000000..0b6a0146109e
--- /dev/null
+++ b/app-text/mpage/mpage-2.5.6-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Many to one page printing utility"
+HOMEPAGE="http://www.mesa.nl/"
+SRC_URI="http://www.mesa.nl/pub/${PN}/${P}.tgz
+	https://dev.gentoo.org/~mgorny/dist/${P}-gentoo-patchset.tar.bz2"
+
+KEYWORDS="amd64 ppc x86"
+LICENSE="freedist"
+SLOT="0"
+IUSE=""
+
+src_prepare() {
+	sed -i Makefile \
+		-e '/^CFLAGS/s|=.*| += $(DEFS)|g' \
+		-e 's|$(CFLAGS) -o|$(LDFLAGS) &|g' \
+		|| die "sed Makefile"
+	EPATCH_SOURCE="${WORKDIR}/${P}-gentoo-patchset" epatch \
+		01_previous_changes.patch 10_bts354935_fix_fontdefs.patch \
+		20_bts416573_manpage_fixes.patch 30_bts443280_libdir_manpage.patch
+}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		PREFIX=/usr \
+		MANDIR=/usr/share/man/man1
+}
+
+src_install () {
+	emake \
+		PREFIX="${D}/usr" \
+		MANDIR="${D}/usr/share/man/man1" install
+	dodoc CHANGES Encoding.format FAQ NEWS README TODO
+}
diff --git a/app-text/multitail-6.4.1 b/app-text/multitail-6.4.1
deleted file mode 100644
index da8f06447490..000000000000
--- a/app-text/multitail-6.4.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare
-DEPEND=sys-libs/ncurses:0=[unicode?] virtual/pkgconfig
-DESCRIPTION=Tail with multiple windows
-EAPI=5
-HOMEPAGE=http://www.vanheusden.com/multitail/
-IUSE=debug examples unicode
-KEYWORDS=amd64 hppa ia64 ppc sparc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=sys-libs/ncurses:0=[unicode?]
-RESTRICT=test
-SLOT=0
-SRC_URI=http://www.vanheusden.com/multitail/multitail-6.4.1.tgz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=53e1c29321ea04578c9f3dab53050cf6
diff --git a/app-text/multitail-6.4.2 b/app-text/multitail-6.4.2
deleted file mode 100644
index e70d1a45aafe..000000000000
--- a/app-text/multitail-6.4.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst prepare
-DEPEND=sys-libs/ncurses:0=[unicode?] virtual/pkgconfig
-DESCRIPTION=Tail with multiple windows
-EAPI=5
-HOMEPAGE=http://www.vanheusden.com/multitail/
-IUSE=debug examples unicode
-KEYWORDS=~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=sys-libs/ncurses:0=[unicode?]
-RESTRICT=test
-SLOT=0
-SRC_URI=http://www.vanheusden.com/multitail/multitail-6.4.2.tgz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=087206e46e2733ec1fd81dd8e2270f40
diff --git a/app-text/multitail/Manifest b/app-text/multitail/Manifest
new file mode 100644
index 000000000000..073dea29c67f
--- /dev/null
+++ b/app-text/multitail/Manifest
@@ -0,0 +1,6 @@
+AUX multitail-6.4.1-gentoo.patch 1440 BLAKE2B 968afe0a5f78e328c16019df6330cef6abc03999d919e4f761c4cf97d1a465a9aa085452538f48f6f1f0357d1b9a7a69f48dfc47fa2c09703595f896dcc97fdb SHA512 eb53834c68dc46c22a2d900cf5e8835a98ff9c9b001ae15eb778bb6348bd48b17dea8a1605bfcc9ddad4324300a81013a0a3710e559c00e369ae42cdfb38b6a7
+DIST multitail-6.4.1.tgz 155717 BLAKE2B 621e511c74f774681de95c7ad85bac12d528ffac1808ff22b5824c3b97c64397db2d084697a2d4f11a87eab3d4ff29715632d51afa7f7338178a9e89ccdf6e1c SHA512 14d4785df257aaac8b3c1a5de8aa48a0b6c3e7829867e1fbc8d458636ecafcf506e09b12581cf562e1f503218b1729e47e9197f541bede90dc0a4d5e916b1c8b
+DIST multitail-6.4.2.tgz 155757 BLAKE2B aba6fea993e0d91071bddcf6d06767773ad6ea6054436dbd8a7163553b1cdfc03040362b87e9b2d31f8fe2165f213c718904f9295d3ab2076707cabf423ae681 SHA512 668c453372ba1e4013aa5191c697bdcaad82c84732841c120a506bee063d2134941e93aed63f96e5aeeb6045829a13aba012f9514dbd9520ab4f1b9b75b42dbd
+EBUILD multitail-6.4.1.ebuild 1282 BLAKE2B 40ee08c9d5083ee80fd15f23fded9ca0dc18041f217c50bd160194467b241e0a5715ad0ed38329aebe9c0ecc7c0058267d4715fd0b04b0c6ba55c4a3e13080c9 SHA512 4f74993f6fa90cdec97da72db2ec18f680095d479211233eaa619eed64db54247a3a763c8980858f9177d72a543b273d75304529c2ceca013414140d6ba6f633
+EBUILD multitail-6.4.2.ebuild 1288 BLAKE2B d09fdcf2461d1886539a19fefb88e5315d23248cb58d9499df77fad1e0ede7f4d7234d1f66d7d51da21ff434541030077dd8efc7fe7330cf83def7cee98f57b2 SHA512 4beadf5564ff8827c0360236bfc882a5522ce926281b7633110a24c81beeb1a6fd102c2ab0b51b73e9713b66a5b1d2f6f3e63cb0f23297b7dc9dca148c0a1429
+MISC metadata.xml 272 BLAKE2B 609c633a45e8ff00773488f8866b7db5928c91bb7d81172a893fee6ac47f1125ddad1c15a59e3c337d57612112ab6c4731669e31ea4690c8097e6a4602019d5b SHA512 d36a244fa048a320eecd4da6ab2b4a65287a32ef24a253e028b5f95d4abeb7fd935b466cbe02f29a8e83d4c0cd3d1109de7c8d9b0799fa45273b0fb695bc37f7
diff --git a/app-text/multitail/files/multitail-6.4.1-gentoo.patch b/app-text/multitail/files/multitail-6.4.1-gentoo.patch
new file mode 100644
index 000000000000..080417b6b302
--- /dev/null
+++ b/app-text/multitail/files/multitail-6.4.1-gentoo.patch
@@ -0,0 +1,31 @@
+--- a/Makefile
++++ b/Makefile
+@@ -8,11 +8,11 @@
+ CC?=gcc
+ DEBUG+=-g -Wall # -D_DEBUG # -pg #  -D_DEBUG  #-pg -W -pedantic # -pg #-fprofile-arcs
+ ifeq ($(UTF8_SUPPORT),yes)
+-LDFLAGS+=-lpanelw -lncursesw -lutil -lm
+-CFLAGS+=-funsigned-char -D`uname` -DVERSION=\"$(VERSION)\" -DCONFIG_FILE=\"$(CONFIG_FILE)\" -DUTF8_SUPPORT -D_FORTIFY_SOURCE=2 -O3
++LIBS+=$(shell $(PKG_CONFIG) --libs ncursesw panelw) -lutil -lm
++CFLAGS+=-funsigned-char -D`uname` -DVERSION=\"$(VERSION)\" -DCONFIG_FILE=\"$(CONFIG_FILE)\" -DUTF8_SUPPORT
+ else
+-LDFLAGS+=-lpanel -lncurses -lutil -lm
+-CFLAGS+=-funsigned-char -D`uname` -DVERSION=\"$(VERSION)\" -DCONFIG_FILE=\"$(CONFIG_FILE)\" -D_FORTIFY_SOURCE=2 -O3
++LIBS+=$(shell $(PKG_CONFIG) --libs ncurses panel) -lutil -lm
++CFLAGS+=-funsigned-char -D`uname` -DVERSION=\"$(VERSION)\" -DCONFIG_FILE=\"$(CONFIG_FILE)\"
+ endif
+ 
+ OBJS=utils.o mt.o error.o my_pty.o term.o scrollback.o help.o mem.o cv.o selbox.o stripstring.o color.o misc.o ui.o exec.o diff.o config.o cmdline.o globals.o history.o xclip.o
+@@ -20,10 +20,10 @@
+ all: multitail
+ 
+ multitail: $(OBJS)
+-	$(CC) $(OBJS) $(LDFLAGS) -o multitail
++	$(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) -o multitail $(LIBS)
+ 
+ multitail_ccmalloc: $(OBJS)
+-	ccmalloc --no-wrapper $(CC) -Wall -W $(OBJS) $(LDFLAGS) -o ccmultitail
++	ccmalloc --no-wrapper $(CC) $(CFLAGS) $(LDFLAGS) -Wall -W $(OBJS) $(LDFLAGS) -o ccmultitail $(LIBS)
+ 
+ install: multitail
+ 	mkdir -p $(DESTDIR)$(PREFIX)/bin
diff --git a/app-text/multitail/metadata.xml b/app-text/multitail/metadata.xml
new file mode 100644
index 000000000000..183cf910aa3f
--- /dev/null
+++ b/app-text/multitail/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>shell-tools@gentoo.org</email>
+    <name>Gentoo Shell Tools Project</name>
+  </maintainer>
+</pkgmetadata>
+
diff --git a/app-text/multitail/multitail-6.4.1.ebuild b/app-text/multitail/multitail-6.4.1.ebuild
new file mode 100644
index 000000000000..38b011b1d39f
--- /dev/null
+++ b/app-text/multitail/multitail-6.4.1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="Tail with multiple windows"
+HOMEPAGE="http://www.vanheusden.com/multitail/"
+SRC_URI="http://www.vanheusden.com/multitail/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 hppa ia64 ppc sparc x86 ~amd64-linux ~x86-linux"
+IUSE="debug examples unicode"
+
+RDEPEND="
+	sys-libs/ncurses:0=[unicode?]
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+RESTRICT="test" # bug #492270
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-6.4.1-gentoo.patch
+
+	sed \
+		-e "/^DESTDIR/s:=.*$:=${EROOT}:g" \
+		-i Makefile || die
+
+	sed \
+		-e "s:/usr/bin/xclip:${EPREFIX}/usr/bin/xclip:g" \
+		-i xclip.c ${PN}.conf || die
+
+	tc-export CC PKG_CONFIG
+
+	use debug && append-flags "-D_DEBUG"
+}
+
+src_compile() {
+	emake UTF8_SUPPORT=$(usex unicode)
+}
+
+src_install () {
+	dobin multitail
+
+	insinto /etc
+	doins multitail.conf
+
+	DOCS=( readme.txt thanks.txt )
+	HTML_DOCS=( manual.html )
+	einstalldocs
+
+	doman multitail.1
+
+	if use examples; then
+		docinto examples
+		dodoc conversion-scripts/colors-example.{pl,sh} conversion-scripts/convert-{geoip,simple}.pl
+	fi
+}
+
+pkg_postinst() {
+	optfeature "send a buffer to the X clipboard" x11-misc/xclip
+}
diff --git a/app-text/multitail/multitail-6.4.2.ebuild b/app-text/multitail/multitail-6.4.2.ebuild
new file mode 100644
index 000000000000..dbb81bb22436
--- /dev/null
+++ b/app-text/multitail/multitail-6.4.2.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="Tail with multiple windows"
+HOMEPAGE="http://www.vanheusden.com/multitail/"
+SRC_URI="http://www.vanheusden.com/multitail/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug examples unicode"
+
+RDEPEND="
+	sys-libs/ncurses:0=[unicode?]
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+RESTRICT="test" # bug #492270
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-6.4.1-gentoo.patch
+
+	sed \
+		-e "/^DESTDIR/s:=.*$:=${EROOT}:g" \
+		-i Makefile || die
+
+	sed \
+		-e "s:/usr/bin/xclip:${EPREFIX}/usr/bin/xclip:g" \
+		-i xclip.c ${PN}.conf || die
+
+	tc-export CC PKG_CONFIG
+
+	use debug && append-flags "-D_DEBUG"
+}
+
+src_compile() {
+	emake UTF8_SUPPORT=$(usex unicode)
+}
+
+src_install () {
+	dobin multitail
+
+	insinto /etc
+	doins multitail.conf
+
+	DOCS=( readme.txt thanks.txt )
+	HTML_DOCS=( manual.html )
+	einstalldocs
+
+	doman multitail.1
+
+	if use examples; then
+		docinto examples
+		dodoc conversion-scripts/colors-example.{pl,sh} conversion-scripts/convert-{geoip,simple}.pl
+	fi
+}
+
+pkg_postinst() {
+	optfeature "send a buffer to the X clipboard" x11-misc/xclip
+}
diff --git a/app-text/mupdf-1.11-r1 b/app-text/mupdf-1.11-r1
deleted file mode 100644
index ed9d5e586880..000000000000
--- a/app-text/mupdf-1.11-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=!libressl? ( dev-libs/openssl:0[static-libs?] ) libressl? ( dev-libs/libressl[static-libs?] ) javascript? ( >=dev-lang/mujs-0_p20160504 ) media-libs/freetype:2[static-libs?] media-libs/harfbuzz[static-libs?] media-libs/jbig2dec[static-libs?] media-libs/libpng:0[static-libs?] >=media-libs/openjpeg-2.1:2[static-libs?] net-misc/curl[static-libs?] virtual/jpeg[static-libs?] X? ( x11-libs/libX11[static-libs?] x11-libs/libXext[static-libs?] ) opengl? ( >=media-libs/glfw-3.2 ) virtual/pkgconfig static-libs? ( !libressl? ( dev-libs/openssl:0[static-libs?] ) libressl? ( dev-libs/libressl[static-libs?] ) javascript? ( >=dev-lang/mujs-0_p20160504 ) media-libs/freetype:2[static-libs?] media-libs/harfbuzz[static-libs?] media-libs/jbig2dec[static-libs?] media-libs/libpng:0[static-libs?] >=media-libs/openjpeg-2.1:2[static-libs?] net-misc/curl[static-libs?] virtual/jpeg[static-libs?] X? ( x11-libs/libX11[static-libs?] x11-libs/libXext[static-libs?] ) opengl? ( >=media-libs/glfw-3.2 ) ) static? ( app-arch/bzip2[static-libs] x11-libs/libXau[static-libs] x11-libs/libXdmcp[static-libs] x11-libs/libxcb[static-libs] )
-DESCRIPTION=a lightweight PDF viewer and toolkit written in portable C
-EAPI=6
-HOMEPAGE=https://mupdf.com/
-IUSE=X +curl javascript libressl opengl +openssl static static-libs vanilla
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=AGPL-3
-RDEPEND=!libressl? ( dev-libs/openssl:0[static-libs?] ) libressl? ( dev-libs/libressl[static-libs?] ) javascript? ( >=dev-lang/mujs-0_p20160504 ) media-libs/freetype:2[static-libs?] media-libs/harfbuzz[static-libs?] media-libs/jbig2dec[static-libs?] media-libs/libpng:0[static-libs?] >=media-libs/openjpeg-2.1:2[static-libs?] net-misc/curl[static-libs?] virtual/jpeg[static-libs?] X? ( x11-libs/libX11[static-libs?] x11-libs/libXext[static-libs?] ) opengl? ( >=media-libs/glfw-3.2 )
-REQUIRED_USE=opengl? ( X !static !static-libs )
-SLOT=0/1.11
-SRC_URI=https://mupdf.com/downloads/mupdf-1.11-source.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8598fc436ac76c5fcc2b3afc536e79e6
diff --git a/app-text/mupdf-1.11-r2 b/app-text/mupdf-1.11-r2
deleted file mode 100644
index 09d6d6515464..000000000000
--- a/app-text/mupdf-1.11-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=!libressl? ( dev-libs/openssl:0[static-libs?] ) libressl? ( dev-libs/libressl[static-libs?] ) javascript? ( >=dev-lang/mujs-0_p20160504 ) media-libs/freetype:2[static-libs?] media-libs/harfbuzz[static-libs?] media-libs/jbig2dec[static-libs?] media-libs/libpng:0[static-libs?] >=media-libs/openjpeg-2.1:2[static-libs?] net-misc/curl[static-libs?] virtual/jpeg[static-libs?] X? ( x11-libs/libX11[static-libs?] x11-libs/libXext[static-libs?] ) opengl? ( >=media-libs/glfw-3.2 ) virtual/pkgconfig static-libs? ( !libressl? ( dev-libs/openssl:0[static-libs?] ) libressl? ( dev-libs/libressl[static-libs?] ) javascript? ( >=dev-lang/mujs-0_p20160504 ) media-libs/freetype:2[static-libs?] media-libs/harfbuzz[static-libs?] media-libs/jbig2dec[static-libs?] media-libs/libpng:0[static-libs?] >=media-libs/openjpeg-2.1:2[static-libs?] net-misc/curl[static-libs?] virtual/jpeg[static-libs?] X? ( x11-libs/libX11[static-libs?] x11-libs/libXext[static-libs?] ) opengl? ( >=media-libs/glfw-3.2 ) ) static? ( app-arch/bzip2[static-libs] x11-libs/libXau[static-libs] x11-libs/libXdmcp[static-libs] x11-libs/libxcb[static-libs] )
-DESCRIPTION=a lightweight PDF viewer and toolkit written in portable C
-EAPI=6
-HOMEPAGE=https://mupdf.com/
-IUSE=X +curl javascript libressl opengl +openssl static static-libs vanilla
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=AGPL-3
-RDEPEND=!libressl? ( dev-libs/openssl:0[static-libs?] ) libressl? ( dev-libs/libressl[static-libs?] ) javascript? ( >=dev-lang/mujs-0_p20160504 ) media-libs/freetype:2[static-libs?] media-libs/harfbuzz[static-libs?] media-libs/jbig2dec[static-libs?] media-libs/libpng:0[static-libs?] >=media-libs/openjpeg-2.1:2[static-libs?] net-misc/curl[static-libs?] virtual/jpeg[static-libs?] X? ( x11-libs/libX11[static-libs?] x11-libs/libXext[static-libs?] ) opengl? ( >=media-libs/glfw-3.2 )
-REQUIRED_USE=opengl? ( !static !static-libs )
-SLOT=0/1.11
-SRC_URI=https://mupdf.com/downloads/mupdf-1.11-source.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=fd00e60324e6f59cffe5e2edaf35b4cb
diff --git a/app-text/mupdf-1.12.0 b/app-text/mupdf-1.12.0
deleted file mode 100644
index 96784feb3703..000000000000
--- a/app-text/mupdf-1.12.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare
-DEPEND=!libressl? ( dev-libs/openssl:0[static-libs?] ) libressl? ( dev-libs/libressl[static-libs?] ) javascript? ( >=dev-lang/mujs-0_p20160504 ) media-libs/freetype:2[static-libs?] media-libs/harfbuzz[static-libs?] media-libs/jbig2dec[static-libs?] media-libs/libpng:0[static-libs?] >=media-libs/openjpeg-2.1:2[static-libs?] net-misc/curl[static-libs?] virtual/jpeg[static-libs?] X? ( x11-libs/libX11[static-libs?] x11-libs/libXext[static-libs?] ) opengl? ( >=media-libs/glfw-3.2 ) virtual/pkgconfig static-libs? ( !libressl? ( dev-libs/openssl:0[static-libs?] ) libressl? ( dev-libs/libressl[static-libs?] ) javascript? ( >=dev-lang/mujs-0_p20160504 ) media-libs/freetype:2[static-libs?] media-libs/harfbuzz[static-libs?] media-libs/jbig2dec[static-libs?] media-libs/libpng:0[static-libs?] >=media-libs/openjpeg-2.1:2[static-libs?] net-misc/curl[static-libs?] virtual/jpeg[static-libs?] X? ( x11-libs/libX11[static-libs?] x11-libs/libXext[static-libs?] ) opengl? ( >=media-libs/glfw-3.2 ) ) static? ( app-arch/bzip2[static-libs] x11-libs/libXau[static-libs] x11-libs/libXdmcp[static-libs] x11-libs/libxcb[static-libs] ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=a lightweight PDF viewer and toolkit written in portable C
-EAPI=6
-HOMEPAGE=https://mupdf.com/
-IUSE=X +curl javascript lcms libressl opengl +openssl static static-libs vanilla
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=AGPL-3
-RDEPEND=!libressl? ( dev-libs/openssl:0[static-libs?] ) libressl? ( dev-libs/libressl[static-libs?] ) javascript? ( >=dev-lang/mujs-0_p20160504 ) media-libs/freetype:2[static-libs?] media-libs/harfbuzz[static-libs?] media-libs/jbig2dec[static-libs?] media-libs/libpng:0[static-libs?] >=media-libs/openjpeg-2.1:2[static-libs?] net-misc/curl[static-libs?] virtual/jpeg[static-libs?] X? ( x11-libs/libX11[static-libs?] x11-libs/libXext[static-libs?] ) opengl? ( >=media-libs/glfw-3.2 )
-REQUIRED_USE=opengl? ( !static !static-libs )
-SLOT=0/1.12.0
-SRC_URI=https://mupdf.com/downloads/mupdf-1.12.0-source.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ab85357dda8776a1e5303a0c9bb9c8cd
diff --git a/app-text/mupdf-1.12.0-r2 b/app-text/mupdf-1.12.0-r2
deleted file mode 100644
index 7ad76cc20505..000000000000
--- a/app-text/mupdf-1.12.0-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst prepare
-DEPEND=!libressl? ( dev-libs/openssl:0=[static-libs?] ) libressl? ( dev-libs/libressl:0=[static-libs?] ) javascript? ( >=dev-lang/mujs-0_p20160504 ) media-libs/freetype:2=[static-libs?] media-libs/harfbuzz:=[static-libs?] media-libs/jbig2dec:=[static-libs?] media-libs/libpng:0=[static-libs?] >=media-libs/openjpeg-2.1:2=[static-libs?] net-misc/curl[static-libs?] virtual/jpeg[static-libs?] X? ( x11-libs/libX11[static-libs?] x11-libs/libXext[static-libs?] ) opengl? ( >=media-libs/freeglut-3.0.0:= ) virtual/pkgconfig static-libs? ( !libressl? ( dev-libs/openssl:0=[static-libs?] ) libressl? ( dev-libs/libressl:0=[static-libs?] ) javascript? ( >=dev-lang/mujs-0_p20160504 ) media-libs/freetype:2=[static-libs?] media-libs/harfbuzz:=[static-libs?] media-libs/jbig2dec:=[static-libs?] media-libs/libpng:0=[static-libs?] >=media-libs/openjpeg-2.1:2=[static-libs?] net-misc/curl[static-libs?] virtual/jpeg[static-libs?] X? ( x11-libs/libX11[static-libs?] x11-libs/libXext[static-libs?] ) opengl? ( >=media-libs/freeglut-3.0.0:= ) ) static? ( app-arch/bzip2[static-libs] x11-libs/libXau[static-libs] x11-libs/libXdmcp[static-libs] x11-libs/libxcb[static-libs] ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=a lightweight PDF viewer and toolkit written in portable C
-EAPI=6
-HOMEPAGE=https://mupdf.com/
-IUSE=X +curl javascript lcms libressl opengl +openssl static static-libs vanilla
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=AGPL-3
-RDEPEND=!libressl? ( dev-libs/openssl:0=[static-libs?] ) libressl? ( dev-libs/libressl:0=[static-libs?] ) javascript? ( >=dev-lang/mujs-0_p20160504 ) media-libs/freetype:2=[static-libs?] media-libs/harfbuzz:=[static-libs?] media-libs/jbig2dec:=[static-libs?] media-libs/libpng:0=[static-libs?] >=media-libs/openjpeg-2.1:2=[static-libs?] net-misc/curl[static-libs?] virtual/jpeg[static-libs?] X? ( x11-libs/libX11[static-libs?] x11-libs/libXext[static-libs?] ) opengl? ( >=media-libs/freeglut-3.0.0:= )
-REQUIRED_USE=opengl? ( !static !static-libs )
-SLOT=0/1.12.0
-SRC_URI=https://mupdf.com/downloads/mupdf-1.12.0-source.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=83b9097a797fa7e3e25bcae90ccea546
diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest
new file mode 100644
index 000000000000..ccd80455eaa7
--- /dev/null
+++ b/app-text/mupdf/Manifest
@@ -0,0 +1,17 @@
+AUX mupdf-1.10a-add-desktop-pc-xpm-files.patch 13387 BLAKE2B e0100380b328cfd8ce6099c35886a6f2e9508f6d08c678dbc1386e88998d01bdacd160020dc6ceefffbe09f4cf2b64d08acfb76f8535ffcc0dc93c65a3a2da78 SHA512 1d6ccfccf785cca01b1a607e94f90a5e31c748154e9fa7664b9863c7b26951f17a584ffc7cd23dd83d1e547498e22c902067e9695006824017e69d33dbf25a5b
+AUX mupdf-1.11-CFLAGS.patch 234 BLAKE2B d1ee80c2315101b3210ad13a78eb920edec9e524809fb5aff43e5db045f63fdd881f2993184a0181f60118aacb5cfab41bd1f8daa13bec362fbca6cbb18bc4d2 SHA512 8c0ae23e14842cf089434c716733f26738def189fbbb44341b772c9993b9f73b269f4d7744d2ef90a285cd1b02d7f67e18f1146e91851fc4d8c118c49ef0dea2
+AUX mupdf-1.11-CVE-2017-6060.patch 675 BLAKE2B 525ddceb2c853df02418a2cfbd6ac27c5b79a405b18c8d847d5c4f7a75fcffe9dcb5600e4758a9f681d5b8cf7db25ef253f9586714be666093b804d16d47515a SHA512 1ff64fb7f8a527d643cb57b472bbc48b73769eb826acdb511a5f77877d748ee165bb0e072ad27b62af5e3b7fcb075595ff53812824c5b03e686f758d0d270bd3
+AUX mupdf-1.11-drop-libmupdfthird.patch 579 BLAKE2B a0a1ee93832135663c14a91bb181ddfdbb315b1f0a9864c834e4c69f52c0c16ed960705baa4c0067526a23d52dc0c681ed6308b1efb34d29242303d023109b48 SHA512 a51588eae9cd97f1d6abc6c41cf5daed7b3e43fe33a5aab756567effa1bbe24cea3b05cdb3a8d027820b13eb2f54e6121a1fafefbcbe1a7768b0ba1e83bf7aeb
+AUX mupdf-1.11-openssl-curl-x11-r1.patch 1087 BLAKE2B 919a3fd6e955f8aee13e0bbce1db634ad5a32ed5f3a37508be18f182e54bf0550725dc94903bf9d33545e6fd20fc4084cfc62968f9b425efca4c14b4d9c9a7f6 SHA512 d82cfa7adfe2f6853f9fb08ee4c952919b2eb829fd3da2e015cca6dfd7924d2c494f229f461a0e33db2e69ffea90385ab04394fef856668b7ccc338e3fb60f29
+AUX mupdf-1.11-openssl-curl-x11.patch 1087 BLAKE2B b56dde0f5f150d1697562b96e3bfdc1a004ba6fbb50ce2fd3561c3d1f1c5c9ec5b10ec789eaed7d0b73ed1c24a4025c7e99b3ed056513be0fc31607abd9a9f33 SHA512 f3441a4ef5548e11adda6984ed84c6fe6d337a9ac3b17456b8b1b620e51f134fd39f5cef969ffe43b1a3025b3b6026b7cfc6d7fcdccc464859e3bf931d253c82
+AUX mupdf-1.11-system-glfw.patch 288 BLAKE2B 809aaed6098f59f555b14b80cb7576bd77b6cc781f07b387f720d8a74446fc44d74f5fc87f252b12cfa07495e7cbbc872bb20250290896d798d7b792c1ed6e3f SHA512 8331c72323011be2905383af3e0d76653d2a8551da3b815730aa8287494d6f867cc82bc8e2ba9ca2f5bdbb301ca3aba775c946019567957246bab1a852cda75f
+AUX mupdf-1.12-CFLAGS.patch 276 BLAKE2B 20a2440cbd5a8b2cbd17204939d876c8e6df3329c54ad477257ce875a9a5483e859be58cc2b4c6b93f7491aa1cbf4ae1444e8c43af161076feefbd570412b09c SHA512 834481f055df4ca8edc2991acade0295e753d72d1f973e4250ce25f81d33ea08bc4c5fafcef203efe686abd313b78512a36b2ce7c4b5b835206136793ab0e9d7
+AUX mupdf-1.3-zoom-2.patch 214 BLAKE2B b9d15ecf6978c4f5c865be0b913448a25852b4a768f8be99b8feb68b1511b203cd22cb7020ccb6447d31082d02a9f3ee80e3ac0153408f3b36db2bdfb68c9f6b SHA512 95bb2d68246dc22eb0fb6e8a312c0f02476f356ee219c417dfa06473b5944d9e63ae6778cd967c70e60fb933eee1aac337efd2476b0bc791df1c69f7b7b822b3
+AUX mupdf-1.9a-debug-build.patch 159 BLAKE2B da7e5294cb9e348d057d1436d68c6d3ce62aff7d7e0923c1b3c492c8dbaa459f26894c9c0c3c83e6885b7607c42f8c3da68e646f0dee3f83a168c7caab236f39 SHA512 5337c7dc2c5b29200378082651b81f5483475fe5cba997b2c55f60143e3f00901b19fc51216413151be87cef80e8fe452cde81006bfc552bdb6b1e9d6c0309cb
+DIST mupdf-1.11-source.tar.gz 40156070 BLAKE2B 2a9991a11355a449b91955bd897b5da175d3a89943277345779ea52c74f57c58226ee4087b23e3f434c0a45ae7a39df95c81c26c55d959f362bd1a0d0216716d SHA512 501670f540e298a8126806ebbd9db8b29866f663b7bbf26c9ade1933e42f0c00ad410b9d93f3ddbfb3e45c38722869095de28d832fe3fb3703c55cc9a01dbf63
+DIST mupdf-1.12.0-source.tar.gz 51508917 BLAKE2B c34df17f0df7a200897d678514ff4012e02b1cef71189fe48740948c88cb544c6ce80f52a5dc335d70002806a7b413e5f79a1edee88865e42daf76e49416d9bf SHA512 11ae620e55e9ebd5844abd7decacc0dafc90dd1f4907ba6ed12f5c725d3920187fc730a7fc33979bf3ff9451da7dbb51f34480a878083e2064f3455555f47d96
+EBUILD mupdf-1.11-r1.ebuild 4650 BLAKE2B f68c39d06fae959cc37de3a6eb03758f3b146eda42253a795b48ba56ddb887f76eb79d901745fe4b6ff16924436f3fd4699b4065ed7d1a33bf605dd8f4265173 SHA512 4c2b3d4c568b42335177ccd975b11e044a0887d6541c2b78f7b3d43b1bc9030dd35f1ff4d8c3c2d4278c3e06b78ee2acab975eeff2dc5c00516575dfad436b6e
+EBUILD mupdf-1.11-r2.ebuild 4773 BLAKE2B d30970c3d275a44ff46a971b707cba9f17d2d4da24e1699cac848be97fc82fb5433a8a09166239b67a3764d13843b91683f93ff0e604fffde27e18d9bb500e7e SHA512 af89cdf6f3a595b424c67225cfa57b9c6811b4cbd9d1cb032bcadf98468aacbce00a78d4479592477bcdc3f6ad6f14703b4ea3aeda3820be7d8893ce506e2214
+EBUILD mupdf-1.12.0-r2.ebuild 5150 BLAKE2B b259c4eac6cc8e9e8aece1409227eedb8c57121a4e67b007ddaf8d952cede3cc078b125a13abbe1b90243075e71259344a032ade0259f07e9435966b8391995a SHA512 9bfce240ca26490e268b2e9076f12cdd5dce2cbc85e943a423e24c0adb5485bf32e0de9ba28bf62e8b43da04953819baea2fdd0e8814c6de4eee1b9cd6ef1eda
+EBUILD mupdf-1.12.0.ebuild 5060 BLAKE2B d68da2df2e328e4f96560d28dc8a79b7cdcbc5be7761513cac5dce3f9cc01a09083c11dea7ced2b8ab4cf41a788eb4a80b890e683e2178b6caed48dd758273c3 SHA512 42bf1fec67bbee0aa84a20614d322640f4c92c54eb947f35957886111834031d4a45994aaf39ba4ea08c709823475bede42c9dc4b49099929414ce587e8eb020
+MISC metadata.xml 315 BLAKE2B b143559c33bb6e3b81fe4dd7df802d48470f9080987e6c888b96bfb3f17e51dd3beaeb5501941dbbc47e1a525900a4719dc42d3d457d391d725670ff201e0c5b SHA512 1f3d23236f716a9e02a4f320105a8cd36e0dc84e25e35764677b66f7ae42039e0ae6f82ef06635cb0fe53fbb2e27ab854e54d45280275b8235f186328daa2b4e
diff --git a/app-text/mupdf/files/mupdf-1.10a-add-desktop-pc-xpm-files.patch b/app-text/mupdf/files/mupdf-1.10a-add-desktop-pc-xpm-files.patch
new file mode 100644
index 000000000000..decab5015bf5
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-1.10a-add-desktop-pc-xpm-files.patch
@@ -0,0 +1,533 @@
+--- /dev/null
++++ ./platform/debian/mupdf.desktop
+@@ -0,0 +1,15 @@
++[Desktop Entry]
++Name=MuPDF
++GenericName=PDF file viewer
++Exec=mupdf %f
++TryExec=mupdf
++Icon=mupdf
++Terminal=false
++Type=Application
++MimeType=application/pdf;application/x-pdf;application/x-cbz;application/oxps;application/vnd.ms-xpsdocument;image/jpeg;image/pjpeg;image/png;image/tiff;image/x-tiff;
++Categories=Viewer;Graphics;
++Actions=View;
++
++[Desktop Action View]
++Name=View with mupdf
++Exec=mupdf %f
+--- /dev/null
++++ ./platform/debian/mupdf.pc
+@@ -0,0 +1,12 @@
++prefix=/usr
++exec_prefix=${prefix}
++libdir=${exec_prefix}/lib
++includedir=${prefix}/include
++
++Name: mupdf
++Description: Library for rendering PDF documents
++Requires: freetype2 libopenjp2 libcrypto
++Version: 0.5.0
++Libs: -L${libdir} -lmupdf
++Libs.private: -lmupdf-js-none
++Cflags: -I${includedir}
+--- /dev/null
++++ ./platform/debian/mupdf.xpm
+@@ -0,0 +1,497 @@
++/* XPM */
++static char *mupdf[] = {
++/* width height ncolors chars_per_pixel */
++"48 48 442 2",
++/* colors */
++"   c #000000",
++" . c #2E4558",
++" X c #252121",
++" o c #AFAFAF",
++" O c #28313B",
++" + c #231F1F",
++" @ c #686666",
++" # c #98BDD7",
++" $ c #201B1C",
++" % c #7CABCC",
++" & c #4487B6",
++" * c #DFDEDE",
++" = c #4285B4",
++" - c #615E5F",
++" ; c #605E5E",
++" : c #23262C",
++" > c #D9D8D8",
++" , c #F7FAFC",
++" < c #D7D6D6",
++" 1 c #BFD6E6",
++" 2 c #6BA0C5",
++" 3 c #232122",
++" 4 c #555253",
++" 5 c #CDCCCC",
++" 6 c #E7EFF6",
++" 7 c #4786B2",
++" 8 c #CADDEA",
++" 9 c #4085B5",
++" 0 c #AECBDF",
++" q c #CBCACA",
++" w c #92B9D4",
++" e c #365F7D",
++" r c #5A95BE",
++" t c #3E83B3",
++" y c #304B60",
++" u c #C7C6C6",
++" i c #4D8EBB",
++" p c #F1F6F9",
++" a c #C1C0C0",
++" s c #454243",
++" d c #669CC3",
++" f c #81AECD",
++" g c #7A7777",
++" h c #434041",
++" j c #3E779F",
++" k c #272E36",
++" l c #413E3F",
++" z c #3F3C3D",
++" x c #5895BF",
++" c c #3D3A3B",
++" v c #C6DBE9",
++" b c #B8B6B7",
++" n c #4282B0",
++" m c #FDFDFE",
++" M c #B7B6B6",
++" N c #8DB5D2",
++" B c #242529",
++" V c #B3B2B2",
++" C c #222327",
++" Z c #B0AEAF",
++" A c #EDF4F8",
++" S c #686565",
++" D c #488AB9",
++" F c #9ABED8",
++" G c #7EACCD",
++" H c #ECF2F7",
++" J c #211C1C",
++" K c #666363",
++" L c #F1F1F2",
++" P c #ABAAAA",
++" I c #4588B6",
++" U c #A9A8A8",
++" Y c #2D2A2B",
++" T c #A7A6A6",
++" R c #615D5E",
++" E c #2B2829",
++" W c #8DB7D5",
++" Q c #F9FBFD",
++" ! c #DDE9F2",
++" ~ c #F8FBFC",
++" ^ c #DCE9F1",
++" / c #A5C5DC",
++" ( c #89B3D1",
++" ) c #5C5959",
++" _ c #A4C5DB",
++" ` c #335A76",
++" ' c #518FBB",
++" ] c #E6E7E7",
++" [ c #5A5757",
++" { c #232021",
++" } c #33536C",
++" | c #98BED9",
++".  c #E0E1E1",
++".. c #7CACCE",
++".X c #4488B8",
++".o c #2D3F4F",
++".O c #999898",
++".+ c #4388B7",
++".@ c #5E98C1",
++".# c #CDCDCB",
++".$ c #524F4F",
++".% c #B0CCE0",
++".& c #979696",
++".* c #78A8CA",
++".= c #5C96BF",
++".- c #969495",
++".; c #4084B4",
++".: c #252930",
++".> c #949293",
++"., c #929091",
++".< c #417FAB",
++".1 c #4F8FBC",
++".2 c #F3F7FA",
++".3 c #D3D3D4",
++".4 c #D7E5EF",
++".5 c #222023",
++".6 c #9FC1D9",
++".7 c #679DC3",
++".8 c #37678A",
++".9 c #4B8BB8",
++".0 c #3E769E",
++".q c #3C749C",
++".w c #403D3D",
++".e c #92BAD6",
++".r c #C8DCEA",
++".t c #FEFEFE",
++".y c #3D393A",
++".u c #3B3738",
++".i c #355974",
++".p c #353132",
++".a c #7A7879",
++".s c #498BB9",
++".d c #9BBFD8",
++".f c #4E8AB4",
++".g c #787677",
++".h c #F2F2F2",
++".j c #F0F0F0",
++".k c #2F2B2C",
++".l c #EEEEEE",
++".z c #727071",
++".x c #26282D",
++".c c #ECECEC",
++".v c #2B2728",
++".b c #FAFCFD",
++".n c #EAEAEA",
++".m c #DEEAF2",
++".M c #E9EAE9",
++".N c #C2D8E7",
++".B c #6E6C6D",
++".V c #5390BC",
++".C c #E8E8E8",
++".Z c #6EA2C6",
++".A c #272324",
++".S c #E7E6E7",
++".D c #E6E6E6",
++".F c #252122",
++".G c #29333D",
++".H c #E4E4E4",
++".J c #3F7AA5",
++".K c #231F20",
++".L c #E2E2E2",
++".P c #211D1E",
++".I c #E0E0E0",
++".U c #EAF1F7",
++".Y c #6099C2",
++".T c #1F1B1C",
++".R c #E9F1F6",
++".E c #CDDFEB",
++".W c #4387B6",
++".Q c #96BBD6",
++".! c #B1CDE0",
++".~ c #DEDEDE",
++".^ c #79A9CA",
++"./ c #4285B5",
++".( c #272A31",
++".) c #5D97BF",
++"._ c #4185B4",
++".` c #DCDCDC",
++".' c #959393",
++".] c #DADADA",
++".[ c #314B5F",
++".{ c #D8D8D8",
++".} c #D7D8D7",
++".| c #D6D6D6",
++"X  c #F5F8FB",
++"X. c #D4D4D4",
++"XX c #6AA0C5",
++"Xo c #BDD4E5",
++"XO c #3A6A8C",
++"X+ c #232123",
++"X@ c #D3D4D3",
++"X# c #D2D2D2",
++"X$ c #D0D0D0",
++"X% c #CECECE",
++"X& c #CCCCCC",
++"X* c #CADDEB",
++"X= c #37617F",
++"X- c #242A31",
++"X; c #CACACA",
++"X: c #C8DBE9",
++"X> c #90B7D3",
++"X, c #817F7F",
++"X< c #3F7EAB",
++"X1 c #548FB9",
++"X2 c #355873",
++"X3 c #7D7B7B",
++"X4 c #C2C2C2",
++"X5 c #4B8CBA",
++"X6 c #C0C0C0",
++"X7 c #D4E4EE",
++"X8 c #81AECE",
++"X9 c #659CC3",
++"X0 c #787576",
++"Xq c #4788B6",
++"Xw c #252C35",
++"Xe c #757373",
++"Xr c #BABABA",
++"Xt c #FCFDFE",
++"Xy c #B6B6B6",
++"Xu c #C4D9E8",
++"Xi c #706D6E",
++"Xp c #8CB5D2",
++"Xa c #70A3C7",
++"Xs c #8BB5D1",
++"Xd c #5491BC",
++"Xf c #5391BB",
++"Xg c #282424",
++"Xh c #272223",
++"Xj c #6C696A",
++"Xk c #2F4659",
++"Xl c #6B6969",
++"Xz c #407BA5",
++"Xx c #6A6768",
++"Xc c #E4E3E3",
++"Xv c #3E79A3",
++"Xb c #231E1F",
++"Xn c #221E1E",
++"Xm c #E2E1E1",
++"XM c #211C1D",
++"XN c #EBF2F7",
++"XB c #201C1C",
++"XV c #CFE0EC",
++"XC c #4588B7",
++"XZ c #B3CEE1",
++"XA c #366384",
++"XS c #5F98C0",
++"XD c #4386B5",
++"XF c #DEDDDD",
++"XG c #2B3D4B",
++"XH c #615F5F",
++"XJ c #5F5D5D",
++"XK c #5E5B5C",
++"XL c #DCE9F2",
++"XP c #407DA8",
++"XI c #86B1CF",
++"XU c #D4D3D3",
++"XY c #3A698B",
++"XT c #3E7BA6",
++"XR c #232022",
++"XE c #545152",
++"XW c #999899",
++"XQ c #79AACC",
++"X! c #524F50",
++"X~ c #CCCDCB",
++"X^ c #3D749B",
++"X/ c #93BAD5",
++"X( c #77A8CA",
++"X) c #37607E",
++"X_ c #5B96BF",
++"X` c #3F84B4",
++"X' c #CAC9C9",
++"X] c #C6C5C5",
++"X[ c #3F7DAA",
++"X{ c #F2F7FA",
++"X} c #C2C1C1",
++"X| c #212023",
++"o  c #9EC1D9",
++"o. c #444142",
++"oX c #3F78A0",
++"oo c #90B8D5",
++"oO c #FEFEFF",
++"o+ c #E2ECF4",
++"o@ c #2B3A47",
++"o# c #25262A",
++"o$ c #B1AFB0",
++"o% c #28313A",
++"o& c #221D1D",
++"o* c #262F38",
++"o= c #629BC2",
++"o- c #302D2E",
++"o; c #6199C1",
++"o: c #201B1B",
++"o> c #4587B6",
++"o, c #F0F0F1",
++"o< c #2D3E4C",
++"o1 c #2E2B2C",
++"o2 c #4385B4",
++"o3 c #A8A7A7",
++"o4 c #A7A5A6",
++"o5 c #3D7197",
++"o6 c #4183B2",
++"o7 c #4083B1",
++"o8 c #A5A3A4",
++"o9 c #3B6F95",
++"o0 c #5290BC",
++"oq c #A4C4DB",
++"ow c #E9F1F7",
++"oe c #4387B7",
++"or c #E7EFF5",
++"ot c #CBDDEA",
++"oy c #4185B5",
++"ou c #5B95BE",
++"oi c #3F83B3",
++"op c #939192",
++"oa c #929191",
++"os c #2B3743",
++"od c #4C4849",
++"of c #2A3742",
++"og c #F4F8FB",
++"oh c #D8E6F0",
++"oj c #4C8CB9",
++"ok c #211F22",
++"ol c #CFD0D0",
++"oz c #444041",
++"ox c #262C34",
++"oc c #413E3E",
++"ov c #403C3D",
++"ob c #3B739B",
++"on c #858384",
++"om c #FFFFFF",
++"oM c #E3EDF4",
++"oN c #5995BF",
++"oB c #3E3A3B",
++"oV c #C7DBE9",
++"oC c #2F4B61",
++"oZ c #5793BD",
++"oA c #3C3839",
++"oS c #2A3945",
++"oD c #7E7D7D",
++"oF c #345873",
++"oG c #363233",
++"oH c #7B797A",
++"oJ c #EFF4F9",
++"oK c #EEF4F8",
++"oL c #F3F3F3",
++"oP c #9ABED7",
++"oI c #4788B7",
++"oU c #629AC1",
++"oY c #ACAAAA",
++"oT c #F1F1F1",
++"oR c #EFEFEF",
++"oE c #737172",
++"oW c #EDEDED",
++"oQ c #A9C9DF",
++"o! c #FBFDFE",
++"o~ c #EBEBEB",
++"o^ c #DFEBF3",
++"o/ c #4581AB",
++"o( c #6F6D6E",
++"o) c #EAE9EA",
++"o_ c #E9E9E9",
++"o` c #C1D7E6",
++"o' c #E7E7E7",
++"o] c #E6E7E6",
++"o[ c #E5E5E5",
++"o{ c #3F7BA5",
++"o} c #242021",
++"o| c #E3E3E3",
++"O  c #3E79A4",
++"O. c #221E1F",
++"OX c #26303A",
++"Oo c #9C9A9A",
++"OO c #E1E1E1",
++"O+ c #201C1D",
++"O@ c #4488B7",
++"O# c #DFDFDF",
++"O$ c #7BAACC",
++"O% c #356384",
++"O& c #1E1A1B",
++"O* c #4386B6",
++"O= c #4286B5",
++"O- c #95BAD5",
++"O; c #DDDDDD",
++"O: c #1C1819",
++"O> c #DBDBDB",
++"O, c #D9D9D9",
++"O< c #D7D7D7",
++"O1 c #417FAA",
++"O2 c #DAE7F1",
++"O3 c #F5F9FB",
++"O4 c #D5D5D5",
++"O5 c #242224",
++"O6 c #D4D3D4",
++"O7 c #85B1CF",
++"O8 c #D3D3D3",
++"O9 c #699FC4",
++"O0 c #4D8DB9",
++"Oq c #222022",
++"Ow c #34556F",
++"Oe c #D1D1D1",
++"Or c #D0CFD0",
++"Ot c #8A8888",
++"Oy c #CFCFCF",
++"Ou c #CDCDCD",
++"Oi c #CCCDCC",
++"Op c #CADEEB",
++"Oa c #E5EEF5",
++"Os c #C9DCEA",
++"Od c #ADCADF",
++"Of c #C8DCE9",
++"Og c #91B8D4",
++"Oh c #5994BE",
++"Oj c #3D82B3",
++"Ok c #5894BD",
++"Ol c #3C82B2",
++"Oz c #4181AD",
++"Ox c #3B3737",
++"Oc c #C5C5C5",
++"Ov c #293643",
++"Ob c #3E7DAA",
++"On c #C1C1C1",
++"Om c #353131",
++"OM c #D4E3EE",
++"ON c #B8D1E3",
++"OB c #BFBFBF",
++"OV c #9CBFD8",
++"OC c #80ADCD",
++"OZ c #649BC2",
++"OA c #4889B7",
++"OS c #BDBDBD",
++"OD c #2E292A",
++"OF c #4283B1",
++"OG c #B7B7B7",
++"OH c #4183B0",
++"OJ c #5794BF",
++"OK c #A7C6DC",
++"OL c #365B77",
++"OP c #8BB4D1",
++"OI c #282324",
++"OU c #272323",
++"OY c #6C6A6A",
++"OT c None",
++/* pixels */
++"  oToToToT L.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h.h LoToToToT  ",
++"o,.joToToToToToToToToToToToToToToToToToToToT.h.h.h.hoToToToToToToToToToToToToToToToToToToToT.j.j",
++".j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.joToLoLoR.D.~ > >.~.DoRoLoLoT.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j.j",
++"oRoRoRoRoRoRoRoRoRoRoRoRoRoRoRoT.hXcOBoaXjX!oz c cozX!XjoaOBXc.hoToRoRoRoRoRoRoRoRoRoRoRoRoRoRoR",
++".l.l.l.l.l.l.l.l.l.l.l.l.loR.j <.'X! Y.P.To: $ J J $o:.T.P YX!.' <.joR.l.l.l.l.l.l.l.l.l.l.l.l.l",
++".l.l.l.l.l.l.l.l.l.l.l.l.jXm.&oz + $o& 3.x OoSXGXGoS O.x 3o& $ +oz.&Xm.j.l.l.l.l.l.l.l.l.l.l.l.l",
++"oWoWoWoWoWoWoWoWoWoWoWoR uXK X $XRo% yXA.qo/.fX1X1.fo/.qXA yo%XR $ XXK uoRoWoWoWoWoWoWoWoWoWoWoW",
++".c.c.c.c.c.c.c.c.c.coW Z z $ {os eXTo0..oQX*XLoMoMXLOpoQ..o0XT eos { $ z ZoW.c.c.c.c.c.c.c.c.c.c",
++"o~o~o~o~o~o~o~o~o~.co3.p $.(X2X[OJ FOM !Of 0.d wOg.d 0Os.mOM FOJObX2.( $.po3.co~o~o~o~o~o~o~o~o~",
++".n.n.n.n.n.n.n.noW VoGXMoso9XC G.N.!.^XfXD tOjOlOlOj tXDXd.^.% 1O$O@o9osXMoG VoW.n.n.n.n.n.n.n.n",
++".n.n.n.n.n.n.n.c qo.XBo<XvX5 No oUO0 fOPXpXpXpXpXpXpXpXpOP ( NOdo^OV.sXvo<XBo. q.c.n.n.n.n.n.n.n",
++"o_o_o_o_o_o_.M.L @ $o@o{.s.^.Z & t.* ~omomomomomomomomomomomom.toO.b _ D.Jo@ $ @.Lo)o_o_o_o_o_o_",
++".C.C.C.C.C.Co~o8Xg kX^oeoZXf._XDXD 0omomomomomomomomomomomomomomomom.b #XCX^ kXgo8o~.C.C.C.C.C.C",
++"o'o'o'o'o'.CO>.$okX=oeXDo>O=XD./Xd.momomomomomomomomomomomomomom pX7.NOK 'oeX=ok.$O>.Co'o'o'o'o'",
++" ]o'o'o'.So_ TXh.o nXDXDXDXDXD.; %.bomomomomomomomomomomomomoOo`O9ojo>XDXDXD n.oXh To_ ]o'o'o'.S",
++".D.D.D.D.Do| SX|XY.+XDXDXDXDXDXDXZomomomomomomomomomomomomom.4Xd.;O=XDXDXDXD.+XYX| So|.D.D.D.D.D",
++"o[o[o[o[.D 5OxOvOzO*XDXDXDXD =oZo+omomomomomomomomomomomomomoP.;XDXDXDXDXDXDO*OzOvOx 5o]o[o[o[o[",
++".H.H.H.Ho' POU }oeXDXDXDXDXD.;X8o!omomomomomomomomomomomom.bX(.;XDXDXDXDXDXDXDoe }OU Po'.H.H.H.H",
++"o|o|o|o|.DOt.5XO.+XDXDXDXDXD &ONomomomomomomomomomomomomom.2.7._XDXDXDXDXDXDXD.+XO.5Ot.Do|o|o|o|",
++"o|o|o|o|o|Xi : j.WXDXDXDXD = rOaomomomomomomomomomomomomom AXS._XDXDXDXDXDXDXD.W j :Xio|o|o|o|o|",
++".L.L.L.L.I RXwXP.WXDXDXDXD.;XI momomomomomomomomomomomomomXN.=._XDXDXDXDXDXDXD.WXPXw R.I.L.L.L.L",
++"OOOOOOOOO; [OX.<O*XDXDXDXD IXoomomomomomomomomomomomomomom.UX_._XDXDXDXDXDXDXDO*.<OX [O;OOOOOOOO",
++".I.I.I.IO; )o*O1O*XDXDXD._.).Romomomomomog ~omomomomomomom.UX_._XDXDXDXDXDXDXDO*O1o* )O;.I.I.I.I",
++"O#O#O#O#O# KX-Xz.WXDXDXD.;XsoOomomomomom vowomomomomomomom.UX_._XDXDXDXDXDXDXD.WXzX- KO#O#O#O#O#",
++"O#O#O#O#.  g Co5oeXDXDXDXq.Nomomomomom ,X>oromomomomomomom.UX_._XDXDXDXDXDXDXDoeo5 C gOOO#O#O#O#",
++".~.~.~.~OO.- {X).XXDXD._o; HomomomomomohO9.Romomomomomomom.UX_._XDXDXDXDXDXDXD.XX) {.-OO.~.~.~.~",
++"O;O;O;O;O#XyOD .o2XDXD.;Ogomomomomomom / r.Uomomomomomomom.UX_._XDXDXDXDXDXDXDo2 .ODXyO#O;O;O;O;",
++".`.`.`.`O;Oeod.:oX.WXDOAoVomomomomomO3XaOk.Uomomomomomomom.UX_._XDXDXDXDXDXD.WoX.:odOeO;.`.`.`.`",
++"O>O>O>O>O>O;X,.POw.W._ doJomomomomomOMoj r.Uomomomomomomom.UX_._XDXDXDXDXDXD.WOw.PX,O;O>O>O>O>O>",
++"O>O>O>O>O>O;XrOmox.0 9X8Xtomomomomom.6X`ou.Uomomomomomomom.UX_._XDXDXDXDXDoe.0oxOmXrO;O>O>O>O>O>",
++".].].].].].]O,.z JXkOH.VotomomomomX{ 2oiou.Uomomomomomomom.UX_._XDO= &O0 &OFXk J.zO,.].].].].].]",
++"O,O,O,O,O,O,O>OS.yOq.i._OZ ^omomom.E.9._ou.Uomomomomomomom.UX_._._.9.ZXdO=.iOq.yOSO>O,O,O,O,O,O,",
++".{.{.{.{.{.{.{.].,.A BX)oyXXO2omom.Q.;._ou.Uomomomomomomom.UOh._ dO-X9O=X) BOI.,.].{.{.{.{.{.{.{",
++"O<O<O<O<O<O<O<.{O8o(Xno#OLo7.YXuX O7oIoiOk.Romomomomomomom HOCoqOdo=o6OLo#Xno(O8.{O<O<O<O<O<O<O<",
++"O<O<O<O<O<O<O<O<.{X'XJ.PO5.[O  iOgXVX:OVXsoKomomomomomomom.bOMX/.1O .[O5.PXJX'.{O<O<O<O<O<O<O<O<",
++".|.|.|.|.|.|.|.|.|.}X]XH.KXn.G eX<oN.e 8 6 Qomomomom.bXN.roo xX< e.GXn.KXHX].}.|.|.|.|.|.|.|.|.|",
++"O4O4O4O4O4O4O4O4O4O4O<X;Xe.vXBX+ofoFob 7.@XQ W | | WXQ.@ 7oboFofX+XB.vXeX;O<O4O4O4O4O4O4O4O4O4O4",
++"X.X.X.X.X.X.X.X.X.X.X.O4X#XW sO. J.K.xo@oC `O%.8.8O% `oCo@.x.K JO. sXWX#O4X.X.X.X.X.X.X.X.X.X.X.",
++"O8O8O8O6O8XUXUO8O8XUXUO8X..|OnX,oc.F $ Jo&XbXRO5O5XRXbo& J $.FocX,On.|X.O8XUX@X@O8.3O8O8O8O8O8X@",
++"O8O8O8O8O8O8O8O8O8O8O8O8O8O8X.X. aop ; c Eo}.PXMXM.Po} E c ;op aX.X.O8O8O8O8O8O8O8O8O8O8O8O8O8O8",
++"X#X#X#X#X#X#X#X#X#X#X#X#X#X#X#X#O8O4X$X6 P.-onX3X3on.- PX6X$O4O8X#X#X#X#X#X#X#X#X#X#X#X#X#X#X#X#",
++"OeOeOeOeOeOeOeOeOeOeOeOeOeOeOeOeOeOeOeO8X4OGOnOcOcX} MOSX#OeOeOeOeOeOeOeOeOeOeOeOeOeOeOeOeOeOeOe",
++"X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$O8ono-oAov.w.u.koEX#X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$X$",
++"X$X$X$X$X$X$X$X$X$olX$X$X$X$X$X$X$X$X$X#oD l.>o1O+.P.T.BOeX$X$X$X$X$X$X$OrOrX$X$X$X$X$X$X$X$X$X$",
++"OyOyOyOyOyOyOyOyOyOyOyOyOyOyOyOyOyOyOyX#oHXEXFoBO&.TO:OYX$OyOyOyOyOyOyOyOyOyOyOyOyOyOyOyOyOyOyOy",
++"X%X%X%X%X%X%X%X%X%X%X%X%X%X%X%X%X%X%X%Oy POo.CX0 -Xx.g TOyX%X%X%X%X%X%X%X%X%X%X%X%X%X%X%X%X%X%X%",
++"X%X%OuOuOuOuOuOuOuOuOuOuOuOuOuOuOuOuOuX% oo$.h boYo4.O UX%OuOuOuOuOuOuOuOuOuOuOuOuOuOuOuOuOuX%X%",
++"  Ou.#OuOuOiX&X&X&X&X&X&X&X&X&X&X&X&X&Oy.a 4 * h.K.KO&XlX%X&X&X&X&X&X&X&X&X&X&X&X&X&X&OuOuX~Ou  "
++};
diff --git a/app-text/mupdf/files/mupdf-1.11-CFLAGS.patch b/app-text/mupdf/files/mupdf-1.11-CFLAGS.patch
new file mode 100644
index 000000000000..2ffd326e5e46
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-1.11-CFLAGS.patch
@@ -0,0 +1,10 @@
+--- mupdf-1.11-source/Makerules
++++ mupdf-1.11-source/Makerules
+@@ -23,7 +23,6 @@
+ endif
+ 
+ ifeq "$(build)" "debug"
+-CFLAGS += -pipe -g
+ LDFLAGS += -g
+ else ifeq "$(build)" "release"
+ CFLAGS += -pipe -O2 -DNDEBUG -fomit-frame-pointer
diff --git a/app-text/mupdf/files/mupdf-1.11-CVE-2017-6060.patch b/app-text/mupdf/files/mupdf-1.11-CVE-2017-6060.patch
new file mode 100644
index 000000000000..a595253e8649
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-1.11-CVE-2017-6060.patch
@@ -0,0 +1,15 @@
+X-Git-Url: http://git.ghostscript.com/?p=user%2Fsebras%2Fmupdf.git;a=blobdiff_plain;f=platform%2Fx11%2Fjstest_main.c;h=f158d9628ed0c0a84e37fe128277679e8334422a;hp=13c3a0a3ba3ff4aae29f6882d23740833c1d842f;hb=06a012a42c9884e3cd653e7826cff1ddec04eb6e;hpb=34e18d127a02146e3415b33c4b67389ce1ddb614
+
+diff --git a/platform/x11/jstest_main.c b/platform/x11/jstest_main.c
+index 13c3a0a..f158d96 100644
+--- a/platform/x11/jstest_main.c
++++ b/platform/x11/jstest_main.c
+@@ -346,7 +346,7 @@ main(int argc, char *argv[])
+ 				}
+ 				else if (match(&line, "OPEN"))
+ 				{
+-					char path[1024];
++					char path[LONGLINE];
+ 					if (file_open)
+ 						pdfapp_close(&gapp);
+ 					if (prefix)
diff --git a/app-text/mupdf/files/mupdf-1.11-drop-libmupdfthird.patch b/app-text/mupdf/files/mupdf-1.11-drop-libmupdfthird.patch
new file mode 100644
index 000000000000..e5600c00cd83
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-1.11-drop-libmupdfthird.patch
@@ -0,0 +1,22 @@
+--- mupdf-1.11-source/Makefile
++++ mupdf-1.11-source/Makefile
+@@ -301,7 +301,7 @@
+ # --- Library ---
+ 
+ MUPDF_LIB = $(OUT)/libmupdf.a
+-THIRD_LIB = $(OUT)/libmupdfthird.a
++THIRD_LIB =
+ THREAD_LIB = $(OUT)/libmuthreads.a
+ 
+ MUPDF_OBJ := $(FITZ_OBJ) $(FONT_OBJ) $(PDF_OBJ) $(XPS_OBJ) $(SVG_OBJ) $(CBZ_OBJ) $(HTML_OBJ) $(GPRF_OBJ)
+--- mupdf-1.12.0-source/Makefile
++++ mupdf-1.12.0-source/Makefile
+@@ -343,7 +343,7 @@
+ 
+ THREAD_OBJ := $(THREAD_OBJ)
+ 
+-$(MUPDF_LIB) : $(MUPDF_OBJ)
++$(MUPDF_LIB) : $(MUPDF_OBJ) $(THIRD_OBJ)
+ $(THIRD_LIB) : $(THIRD_OBJ)
+ $(THREAD_LIB) : $(THREAD_OBJ)
+ 
diff --git a/app-text/mupdf/files/mupdf-1.11-openssl-curl-x11-r1.patch b/app-text/mupdf/files/mupdf-1.11-openssl-curl-x11-r1.patch
new file mode 100644
index 000000000000..92845a0eef2f
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-1.11-openssl-curl-x11-r1.patch
@@ -0,0 +1,37 @@
+--- mupdf-1.11-source/Makerules
++++ mupdf-1.11-source/Makerules
+@@ -116,12 +116,17 @@
+ SYS_PTHREAD_CFLAGS :=
+ SYS_PTHREAD_LIBS := -lpthread
+ 
++WANT_OPENSSL ?= yes
++ifeq "$(WANT_OPENSSL)" "yes"
+ ifeq "$(shell pkg-config --exists 'libcrypto <= 1.0.1t' && echo yes)" "yes"
+ HAVE_LIBCRYPTO := yes
+ SYS_LIBCRYPTO_CFLAGS := -DHAVE_LIBCRYPTO $(shell pkg-config --cflags libcrypto)
+ SYS_LIBCRYPTO_LIBS := $(shell pkg-config --libs libcrypto)
+ endif
++endif
+ 
++WANT_CURL ?= yes
++ifeq "$(WANT_CURL)" "yes"
+ ifeq "$(shell pkg-config --exists libcurl && echo yes)" "yes"
+ HAVE_CURL := yes
+ SYS_CURL_CFLAGS := $(shell pkg-config --cflags libcurl)
+@@ -133,12 +138,16 @@
+ endif
+ endif
+ SYS_CURL_DEPS += -lpthread -lrt
++endif
+ 
++WANT_X11 ?= yes
++ifeq "$(WANT_X11)" "yes"
+ ifeq "$(shell pkg-config --exists x11 xext && echo yes)" "yes"
+ HAVE_X11 := yes
+ SYS_X11_CFLAGS := $(shell pkg-config --cflags x11 xext)
+ SYS_X11_LIBS := $(shell pkg-config --libs x11 xext)
+ endif
++endif
+ 
+ ifeq "$(shell pkg-config --exists harfbuzz && echo yes)" "yes"
+ SYS_HARFBUZZ_CFLAGS := $(shell pkg-config --cflags harfbuzz)
diff --git a/app-text/mupdf/files/mupdf-1.11-openssl-curl-x11.patch b/app-text/mupdf/files/mupdf-1.11-openssl-curl-x11.patch
new file mode 100644
index 000000000000..91fd9f6485dc
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-1.11-openssl-curl-x11.patch
@@ -0,0 +1,37 @@
+--- mupdf-1.11-source/Makerules
++++ mupdf-1.11-source/Makerules
+@@ -116,12 +116,17 @@
+ SYS_PTHREAD_CFLAGS :=
+ SYS_PTHREAD_LIBS := -lpthread
+ 
++WANT_OPENSSL ?= yes
++ifeq "$(WANT_OPENSSL)" "yes"
+ ifeq "$(shell pkg-config --exists 'libcrypto <= 1.0.1t' && echo yes)" "yes"
+ HAVE_LIBCRYPTO := yes
+ SYS_LIBCRYPTO_CFLAGS := -DHAVE_LIBCRYPTO $(shell pkg-config --cflags libcrypto)
+ SYS_LIBCRYPTO_LIBS := $(shell pkg-config --libs libcrypto)
+ endif
++endif
+ 
++WANT_CURL ?= yes
++ifeq "$(WANT_CURL)" "yes"
+ ifeq "$(shell pkg-config --exists libcurl && echo yes)" "yes"
+ HAVE_CURL := yes
+ SYS_CURL_CFLAGS := $(shell pkg-config --cflags libcurl)
+@@ -133,12 +138,16 @@
+ endif
+ endif
+ SYS_CURL_DEPS += -lpthread -lrt
++endif
+ 
++WANT_X!! ?= yes
++ifeq "$(WANT_X11)" "yes"
+ ifeq "$(shell pkg-config --exists x11 xext && echo yes)" "yes"
+ HAVE_X11 := yes
+ SYS_X11_CFLAGS := $(shell pkg-config --cflags x11 xext)
+ SYS_X11_LIBS := $(shell pkg-config --libs x11 xext)
+ endif
++endif
+ 
+ ifeq "$(shell pkg-config --exists harfbuzz && echo yes)" "yes"
+ SYS_HARFBUZZ_CFLAGS := $(shell pkg-config --cflags harfbuzz)
diff --git a/app-text/mupdf/files/mupdf-1.11-system-glfw.patch b/app-text/mupdf/files/mupdf-1.11-system-glfw.patch
new file mode 100644
index 000000000000..90189f9400b0
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-1.11-system-glfw.patch
@@ -0,0 +1,11 @@
+--- mupdf-1.11-source/Makerules
++++ mupdf-1.11-source/Makerules
+@@ -158,6 +158,8 @@
+ SYS_JBIG2DEC_LIBS := -ljbig2dec
+ SYS_LIBJPEG_LIBS := -ljpeg
+ SYS_ZLIB_LIBS := -lz
++SYS_GLFW_CFLAGS = $(shell pkg-config --cflags glfw3 gl)
++SYS_GLFW_LIBS = $(shell pkg-config --libs glfw3 gl)
+ 
+ endif
+ 
diff --git a/app-text/mupdf/files/mupdf-1.12-CFLAGS.patch b/app-text/mupdf/files/mupdf-1.12-CFLAGS.patch
new file mode 100644
index 000000000000..796d127263ae
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-1.12-CFLAGS.patch
@@ -0,0 +1,11 @@
+--- mupdf-1.12.0-source/Makerules
++++ mupdf-1.12.0-source/Makerules
+@@ -22,8 +22,6 @@
+ endif
+ 
+ ifeq "$(build)" "debug"
+-CFLAGS += -pipe -g
+-LDFLAGS += -g
+ else ifeq "$(build)" "release"
+ CFLAGS += -pipe -O2 -DNDEBUG -fomit-frame-pointer
+ LDFLAGS += $(LDREMOVEUNREACH) -Wl,-s
diff --git a/app-text/mupdf/files/mupdf-1.3-zoom-2.patch b/app-text/mupdf/files/mupdf-1.3-zoom-2.patch
new file mode 100644
index 000000000000..353912450236
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-1.3-zoom-2.patch
@@ -0,0 +1,10 @@
+--- mupdf-1.3/platform/x11/pdfapp.c
++++ mupdf-1.3/platform/x11/pdfapp.c
+@@ -866,6 +867,7 @@
+ 		break;
+ 
+ 	case ' ':
++	case 'F':
+ 		panto = DONT_PAN;
+ 		if (app->numberlen > 0)
+ 			app->pageno += atoi(app->number);
diff --git a/app-text/mupdf/files/mupdf-1.9a-debug-build.patch b/app-text/mupdf/files/mupdf-1.9a-debug-build.patch
new file mode 100644
index 000000000000..93c52f5c5f8b
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-1.9a-debug-build.patch
@@ -0,0 +1,10 @@
+--- mupdf-1.9a/Makefile
++++ mupdf-1.9a/Makefile
+@@ -1,6 +1,6 @@
+ # GNU Makefile
+ 
+-build ?= release
++build ?= debug
+ 
+ OUT := build/$(build)
+ GEN := generated
diff --git a/app-text/mupdf/metadata.xml b/app-text/mupdf/metadata.xml
new file mode 100644
index 000000000000..96d29f2af06a
--- /dev/null
+++ b/app-text/mupdf/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+<email>xmw@gentoo.org</email>
+<name>Michael Weber</name>
+</maintainer>
+<use>
+	<flag name="openssl">Use dev-libs/openssl crypto backend</flag>
+</use>
+</pkgmetadata>
diff --git a/app-text/mupdf/mupdf-1.11-r1.ebuild b/app-text/mupdf/mupdf-1.11-r1.ebuild
new file mode 100644
index 000000000000..0b2990cc8b25
--- /dev/null
+++ b/app-text/mupdf/mupdf-1.11-r1.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="a lightweight PDF viewer and toolkit written in portable C"
+HOMEPAGE="https://mupdf.com/"
+SRC_URI="https://mupdf.com/downloads/${P}-source.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0/${PV}"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="X +curl javascript libressl opengl +openssl static static-libs vanilla"
+
+LIB_DEPEND="
+	!libressl? ( dev-libs/openssl:0[static-libs?] )
+	libressl? ( dev-libs/libressl[static-libs?] )
+	javascript? ( >=dev-lang/mujs-0_p20160504 )
+	media-libs/freetype:2[static-libs?]
+	media-libs/harfbuzz[static-libs?]
+	media-libs/jbig2dec[static-libs?]
+	media-libs/libpng:0[static-libs?]
+	>=media-libs/openjpeg-2.1:2[static-libs?]
+	net-misc/curl[static-libs?]
+	virtual/jpeg[static-libs?]
+	X? ( x11-libs/libX11[static-libs?]
+		x11-libs/libXext[static-libs?] )
+	opengl? ( >=media-libs/glfw-3.2 )"
+RDEPEND="${LIB_DEPEND}"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	static-libs? ( ${LIB_DEPEND} )
+	static? ( ${LIB_DEPEND//?}
+		app-arch/bzip2[static-libs]
+		x11-libs/libXau[static-libs]
+		x11-libs/libXdmcp[static-libs]
+		x11-libs/libxcb[static-libs] )"
+
+REQUIRED_USE="opengl? ( X !static !static-libs )"
+
+S=${WORKDIR}/${P}-source
+
+PATCHES=(
+		"${FILESDIR}"/${PN}-1.11-CFLAGS.patch
+		"${FILESDIR}"/${PN}-1.9a-debug-build.patch
+		"${FILESDIR}"/${PN}-1.10a-add-desktop-pc-xpm-files.patch
+		"${FILESDIR}"/${PN}-1.11-openssl-curl-x11.patch
+		"${FILESDIR}"/${PN}-1.11-system-glfw.patch
+		"${FILESDIR}"/${PN}-1.11-CVE-2017-6060.patch
+)
+
+src_prepare() {
+	default
+	use hppa && append-cflags -ffunction-sections
+
+	rm -rf thirdparty || die
+
+	if has_version ">=media-libs/openjpeg-2.1:2" ; then
+		# Remove a switch, which prevents using shared libraries for openjpeg2.
+		# See http://www.linuxfromscratch.org/blfs/view/cvs/pst/mupdf.html
+		sed '/OPJ_STATIC$/d' -i source/fitz/load-jpx.c
+	fi
+
+	use javascript || \
+		sed -e '/* #define FZ_ENABLE_JS/ a\#define FZ_ENABLE_JS 0' \
+			-i include/mupdf/fitz/config.h
+
+	sed -e "/^libdir=/s:/lib:/$(get_libdir):" \
+		-e "/^prefix=/s:=.*:=${EROOT}/usr:" \
+		-i platform/debian/${PN}.pc || die
+
+	use vanilla || eapply \
+		"${FILESDIR}"/${PN}-1.3-zoom-2.patch
+
+	sed -e "1iOS = Linux" \
+		-e "1iCC = $(tc-getCC)" \
+		-e "1iLD = $(tc-getCC)" \
+		-e "1iAR = $(tc-getAR)" \
+		-e "1iverbose = yes" \
+		-e "1ibuild = debug" \
+		-e "1iprefix = ${ED}usr" \
+		-e "1ilibdir = ${ED}usr/$(get_libdir)" \
+		-e "1idocdir = ${ED}usr/share/doc/${PF}" \
+		-e "1iWANT_X11 = $(usex X)" \
+		-e "1iWANT_OPENSSL = $(usex openssl)" \
+		-e "1iWANT_CURL = $(usex curl)" \
+		-e "1iHAVE_MUJS = $(usex javascript)" \
+		-e "1iMUJS_LIBS = $(usex javascript -lmujs '')" \
+		-e "1iMUJS_CFLAGS =" \
+		-e "1iHAVE_GLFW = $(usex opengl yes no)" \
+		-i Makerules || die
+
+	if use static-libs || use static ; then
+		cp -a "${S}" "${S}"-static || die
+		#add missing Libs.private for xcb and freetype
+		sed -e 's:\(pkg-config --libs\):\1 --static:' \
+			-e '/^SYS_X11_LIBS = /s:\(.*\):\1 -lpthread:' \
+			-e '/^SYS_FREETYPE_LIBS = /s:\(.*\):\1 -lbz2:' \
+			-i "${S}"-static/Makerules || die
+	fi
+
+	my_soname=libmupdf.so.${PV}
+	my_soname_js_none=libmupdf-js-none.so.${PV}
+	sed -e "\$a\$(MUPDF_LIB): \$(MUPDF_JS_NONE_LIB)" \
+		-e "\$a\\\t\$(QUIET_LINK) \$(CC) \$(LDFLAGS) --shared -Wl,-soname -Wl,${my_soname} -Wl,--no-undefined -o \$@ \$^ \$(MUPDF_JS_NONE_LIB) \$(LIBS)" \
+		-e "/^MUPDF_LIB =/s:=.*:= \$(OUT)/${my_soname}:" \
+		-e "\$a\$(MUPDF_JS_NONE_LIB):" \
+		-e "\$a\\\t\$(QUIET_LINK) \$(CC) \$(LDFLAGS) --shared -Wl,-soname -Wl,${my_soname_js_none} -Wl,--no-undefined -o \$@ \$^ \$(LIBS)" \
+		-e "/install/s: COPYING : :" \
+		-i Makefile || die
+}
+
+src_compile() {
+	emake XCFLAGS="-fpic"
+	use static-libs && \
+		emake -C "${S}"-static build/debug/lib${PN}{,-js-none}.a
+	use static && \
+		emake -C "${S}"-static XLIBS="-static"
+}
+
+src_install() {
+	if use X ; then
+		domenu platform/debian/${PN}.desktop
+		doicon platform/debian/${PN}.xpm
+	else
+		rm docs/man/${PN}.1
+	fi
+
+	emake install
+	dosym ${my_soname} /usr/$(get_libdir)/lib${PN}.so
+
+	use static-libs && \
+		dolib.a "${S}"-static/build/debug/lib${PN}{,-js-none}.a
+	if use static ; then
+		dobin "${S}"-static/build/debug/mu{tool,draw}
+		use X && dobin "${S}"-static/build/debug/${PN}-x11
+	fi
+	if use X ; then
+		if use opengl ; then
+			dosym ${PN}-gl /usr/bin/${PN}
+			einfo "mupdf symlink points to mupdf-gl (bug 616654)"
+		else
+			dosym ${PN}-x11 /usr/bin/${PN}
+		fi
+	fi
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins platform/debian/${PN}.pc
+
+	dodoc README docs/*.{txt,c}
+}
diff --git a/app-text/mupdf/mupdf-1.11-r2.ebuild b/app-text/mupdf/mupdf-1.11-r2.ebuild
new file mode 100644
index 000000000000..da582f3a2918
--- /dev/null
+++ b/app-text/mupdf/mupdf-1.11-r2.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="a lightweight PDF viewer and toolkit written in portable C"
+HOMEPAGE="https://mupdf.com/"
+SRC_URI="https://mupdf.com/downloads/${P}-source.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="X +curl javascript libressl opengl +openssl static static-libs vanilla"
+
+LIB_DEPEND="
+	!libressl? ( dev-libs/openssl:0[static-libs?] )
+	libressl? ( dev-libs/libressl[static-libs?] )
+	javascript? ( >=dev-lang/mujs-0_p20160504 )
+	media-libs/freetype:2[static-libs?]
+	media-libs/harfbuzz[static-libs?]
+	media-libs/jbig2dec[static-libs?]
+	media-libs/libpng:0[static-libs?]
+	>=media-libs/openjpeg-2.1:2[static-libs?]
+	net-misc/curl[static-libs?]
+	virtual/jpeg[static-libs?]
+	X? ( x11-libs/libX11[static-libs?]
+		x11-libs/libXext[static-libs?] )
+	opengl? ( >=media-libs/glfw-3.2 )"
+RDEPEND="${LIB_DEPEND}"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	static-libs? ( ${LIB_DEPEND} )
+	static? ( ${LIB_DEPEND//?}
+		app-arch/bzip2[static-libs]
+		x11-libs/libXau[static-libs]
+		x11-libs/libXdmcp[static-libs]
+		x11-libs/libxcb[static-libs] )"
+
+REQUIRED_USE="opengl? ( !static !static-libs )"
+
+S=${WORKDIR}/${P}-source
+
+PATCHES=(
+		"${FILESDIR}"/${PN}-1.11-CFLAGS.patch
+		"${FILESDIR}"/${PN}-1.9a-debug-build.patch
+		"${FILESDIR}"/${PN}-1.10a-add-desktop-pc-xpm-files.patch
+		"${FILESDIR}"/${PN}-1.11-openssl-curl-x11.patch
+		"${FILESDIR}"/${PN}-1.11-system-glfw.patch
+		"${FILESDIR}"/${PN}-1.11-CVE-2017-6060.patch
+		"${FILESDIR}"/${PN}-1.11-drop-libmupdfthird.patch
+)
+
+src_prepare() {
+	default
+	use hppa && append-cflags -ffunction-sections
+
+	rm -rf thirdparty || die
+
+	if has_version ">=media-libs/openjpeg-2.1:2" ; then
+		# Remove a switch, which prevents using shared libraries for openjpeg2.
+		# See http://www.linuxfromscratch.org/blfs/view/cvs/pst/mupdf.html
+		sed '/OPJ_STATIC$/d' -i source/fitz/load-jpx.c
+	fi
+
+	use javascript || \
+		sed -e '/* #define FZ_ENABLE_JS/ a\#define FZ_ENABLE_JS 0' \
+			-i include/mupdf/fitz/config.h
+
+	sed -e "/^libdir=/s:/lib:/$(get_libdir):" \
+		-e "/^prefix=/s:=.*:=${EROOT}/usr:" \
+		-i platform/debian/${PN}.pc || die
+
+	use vanilla || eapply \
+		"${FILESDIR}"/${PN}-1.3-zoom-2.patch
+
+	sed -e "1iOS = Linux" \
+		-e "1iCC = $(tc-getCC)" \
+		-e "1iLD = $(tc-getCC)" \
+		-e "1iAR = $(tc-getAR)" \
+		-e "1iverbose = yes" \
+		-e "1ibuild = debug" \
+		-e "1iprefix = ${ED}usr" \
+		-e "1ilibdir = ${ED}usr/$(get_libdir)" \
+		-e "1idocdir = ${ED}usr/share/doc/${PF}" \
+		-e "1iWANT_X11 = $(usex X)" \
+		-e "1iWANT_OPENSSL = $(usex openssl)" \
+		-e "1iWANT_CURL = $(usex curl)" \
+		-e "1iHAVE_MUJS = $(usex javascript)" \
+		-e "1iMUJS_LIBS = $(usex javascript -lmujs '')" \
+		-e "1iMUJS_CFLAGS =" \
+		-e "1iHAVE_GLFW = $(usex opengl yes no)" \
+		-i Makerules || die
+
+	if use static-libs || use static ; then
+		cp -a "${S}" "${S}"-static || die
+		#add missing Libs.private for xcb and freetype
+		sed -e 's:\(pkg-config --libs\):\1 --static:' \
+			-e '/^SYS_X11_LIBS = /s:\(.*\):\1 -lpthread:' \
+			-e '/^SYS_FREETYPE_LIBS = /s:\(.*\):\1 -lbz2:' \
+			-i "${S}"-static/Makerules || die
+	fi
+
+	my_soname=libmupdf.so.${PV}
+	my_soname_js_none=libmupdf-js-none.so.${PV}
+	sed -e "\$a\$(MUPDF_LIB): \$(MUPDF_JS_NONE_LIB)" \
+		-e "\$a\\\t\$(QUIET_LINK) \$(CC) \$(LDFLAGS) --shared -Wl,-soname -Wl,${my_soname} -Wl,--no-undefined -o \$@ \$^ \$(MUPDF_JS_NONE_LIB) \$(LIBS)" \
+		-e "/^MUPDF_LIB =/s:=.*:= \$(OUT)/${my_soname}:" \
+		-e "\$a\$(MUPDF_JS_NONE_LIB):" \
+		-e "\$a\\\t\$(QUIET_LINK) \$(CC) \$(LDFLAGS) --shared -Wl,-soname -Wl,${my_soname_js_none} -Wl,--no-undefined -o \$@ \$^ \$(LIBS)" \
+		-e "/install/s: COPYING : :" \
+		-i Makefile || die
+}
+
+src_compile() {
+	emake XCFLAGS="-fpic"
+	use static-libs && \
+		emake -C "${S}"-static build/debug/lib${PN}{,-js-none}.a
+	use static && \
+		emake -C "${S}"-static XLIBS="-static"
+}
+
+src_install() {
+	if use X || use opengl ; then
+		domenu platform/debian/${PN}.desktop
+		doicon platform/debian/${PN}.xpm
+	else
+		rm docs/man/${PN}.1
+	fi
+
+	emake install
+	dosym ${my_soname} /usr/$(get_libdir)/lib${PN}.so
+
+	use static-libs && \
+		dolib.a "${S}"-static/build/debug/lib${PN}{,-js-none}.a
+	if use static ; then
+		dobin "${S}"-static/build/debug/mu{tool,draw}
+		use X && dobin "${S}"-static/build/debug/${PN}-x11
+	fi
+	if use opengl ; then
+		einfo "mupdf symlink points to mupdf-gl (bug 616654)"
+		dosym ${PN}-gl /usr/bin/${PN}
+	elif use X ; then
+		einfo "mupdf symlink points to mupdf-x11 (bug 616654)"
+		dosym ${PN}-x11 /usr/bin/${PN}
+	fi
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins platform/debian/${PN}.pc
+
+	dodoc README CHANGES docs/*.{txt,c}
+}
diff --git a/app-text/mupdf/mupdf-1.12.0-r2.ebuild b/app-text/mupdf/mupdf-1.12.0-r2.ebuild
new file mode 100644
index 000000000000..8810e2deaf06
--- /dev/null
+++ b/app-text/mupdf/mupdf-1.12.0-r2.ebuild
@@ -0,0 +1,166 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic toolchain-funcs xdg
+
+DESCRIPTION="a lightweight PDF viewer and toolkit written in portable C"
+HOMEPAGE="https://mupdf.com/"
+SRC_URI="https://mupdf.com/downloads/${P}-source.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0/${PV}"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="X +curl javascript lcms libressl opengl +openssl static static-libs vanilla"
+
+LIB_DEPEND="
+	!libressl? ( dev-libs/openssl:0=[static-libs?] )
+	libressl? ( dev-libs/libressl:0=[static-libs?] )
+	javascript? ( >=dev-lang/mujs-0_p20160504 )
+	media-libs/freetype:2=[static-libs?]
+	media-libs/harfbuzz:=[static-libs?]
+	media-libs/jbig2dec:=[static-libs?]
+	media-libs/libpng:0=[static-libs?]
+	>=media-libs/openjpeg-2.1:2=[static-libs?]
+	net-misc/curl[static-libs?]
+	virtual/jpeg[static-libs?]
+	X? ( x11-libs/libX11[static-libs?]
+		x11-libs/libXext[static-libs?] )
+	opengl? ( >=media-libs/freeglut-3.0.0:= )"
+RDEPEND="${LIB_DEPEND}"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	static-libs? ( ${LIB_DEPEND} )
+	static? ( ${LIB_DEPEND//?}
+		app-arch/bzip2[static-libs]
+		x11-libs/libXau[static-libs]
+		x11-libs/libXdmcp[static-libs]
+		x11-libs/libxcb[static-libs] )"
+
+REQUIRED_USE="opengl? ( !static !static-libs )"
+
+S=${WORKDIR}/${P}-source
+
+PATCHES=(
+		"${FILESDIR}"/${PN}-1.12-CFLAGS.patch
+		"${FILESDIR}"/${PN}-1.9a-debug-build.patch
+		"${FILESDIR}"/${PN}-1.10a-add-desktop-pc-xpm-files.patch
+		"${FILESDIR}"/${PN}-1.11-openssl-curl-x11-r1.patch
+		"${FILESDIR}"/${PN}-1.11-drop-libmupdfthird.patch
+)
+
+src_prepare() {
+	xdg_src_prepare
+	use hppa && append-cflags -ffunction-sections
+
+	# specialized lcms2, keep it if wanted inside lubmupdfthird
+	if ! use lcms ; then
+		rm -rf thirdparty/lcms2
+	fi
+
+	rm -rf thirdparty/{README,curl,freeglut,freetype,harfbuzz,jbig2dec,libjpeg,mujs,openjpeg,zlib} || die
+	for my_third in thirdparty/* ; do
+		ewarn "Bundled thirdparty lib: ${my_third}"
+	done
+
+	if has_version ">=media-libs/openjpeg-2.1:2" ; then
+		# Remove a switch, which prevents using shared libraries for openjpeg2.
+		# See http://www.linuxfromscratch.org/blfs/view/cvs/pst/mupdf.html
+		sed '/OPJ_STATIC$/d' -i source/fitz/load-jpx.c
+	fi
+
+	use javascript || \
+		sed -e '/* #define FZ_ENABLE_JS/ a\#define FZ_ENABLE_JS 0' \
+			-i include/mupdf/fitz/config.h
+
+	sed -e "/^libdir=/s:/lib:/$(get_libdir):" \
+		-e "/^prefix=/s:=.*:=${EROOT}/usr:" \
+		-i platform/debian/${PN}.pc || die
+
+	use vanilla || eapply \
+		"${FILESDIR}"/${PN}-1.3-zoom-2.patch
+
+	sed -e "1iOS = Linux" \
+		-e "1iCC = $(tc-getCC)" \
+		-e "1iLD = $(tc-getCC)" \
+		-e "1iAR = $(tc-getAR)" \
+		-e "1iverbose = yes" \
+		-e "1ibuild = debug" \
+		-e "1iprefix = ${ED}usr" \
+		-e "1ilibdir = ${ED}usr/$(get_libdir)" \
+		-e "1idocdir = ${ED}usr/share/doc/${PF}" \
+		-i Makerules || die
+
+	if use static-libs || use static ; then
+		cp -a "${S}" "${S}"-static || die
+		#add missing Libs.private for xcb and freetype
+		sed -e 's:\(pkg-config --libs\):\1 --static:' \
+			-e '/^SYS_X11_LIBS = /s:\(.*\):\1 -lpthread:' \
+			-e '/^SYS_FREETYPE_LIBS = /s:\(.*\):\1 -lbz2:' \
+			-i "${S}"-static/Makerules || die
+	fi
+
+	my_soname=libmupdf.so.${PV}
+	my_soname_js_none=libmupdf-js-none.so.${PV}
+	sed -e "\$a\$(MUPDF_LIB): \$(MUPDF_JS_NONE_LIB)" \
+		-e "\$a\\\t\$(QUIET_LINK) \$(CC) \$(LDFLAGS) --shared -Wl,-soname -Wl,${my_soname} -Wl,--no-undefined -o \$@ \$^ \$(MUPDF_JS_NONE_LIB) \$(LIBS)" \
+		-e "/^MUPDF_LIB =/s:=.*:= \$(OUT)/${my_soname}:" \
+		-e "\$a\$(MUPDF_JS_NONE_LIB):" \
+		-e "\$a\\\t\$(QUIET_LINK) \$(CC) \$(LDFLAGS) --shared -Wl,-soname -Wl,${my_soname_js_none} -Wl,--no-undefined -o \$@ \$^ \$(LIBS)" \
+		-e "/install/s: COPYING : :" \
+		-i Makefile || die
+}
+
+src_compile() {
+	use lcms && emake XCFLAGS="-fpic" third
+	emake XCFLAGS="-fpic" \
+		HAVE_GLUT=$(usex opengl yes no) \
+		HAVE_MUJS=$(usex javascript) \
+		MUJS_LIBS=$(usex javascript -lmujs '') \
+		WANT_CURL=$(usex curl) \
+		WANT_OPENSSL=$(usex openssl) \
+		WANT_X11=$(usex X)
+
+	use static-libs && \
+		emake -C "${S}"-static build/debug/lib${PN}{,-js-none}.a
+	use static && \
+		emake -C "${S}"-static XLIBS="-static"
+}
+
+src_install() {
+	if use X || use opengl ; then
+		domenu platform/debian/${PN}.desktop
+		doicon platform/debian/${PN}.xpm
+	else
+		rm docs/man/${PN}.1
+	fi
+
+	emake install \
+		HAVE_GLUT=$(usex opengl yes no) \
+		HAVE_MUJS=$(usex javascript) \
+		MUJS_LIBS=$(usex javascript -lmujs '') \
+		WANT_CURL=$(usex curl) \
+		WANT_OPENSSL=$(usex openssl) \
+		WANT_X11=$(usex X)
+
+	dosym ${my_soname} /usr/$(get_libdir)/lib${PN}.so
+
+	use static-libs && \
+		dolib.a "${S}"-static/build/debug/lib${PN}{,-js-none}.a
+	if use static ; then
+		dobin "${S}"-static/build/debug/mu{tool,draw}
+		use X && dobin "${S}"-static/build/debug/${PN}-x11
+	fi
+	if use opengl ; then
+		einfo "mupdf symlink points to mupdf-gl (bug 616654)"
+		dosym ${PN}-gl /usr/bin/${PN}
+	elif use X ; then
+		einfo "mupdf symlink points to mupdf-x11 (bug 616654)"
+		dosym ${PN}-x11 /usr/bin/${PN}
+	fi
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins platform/debian/${PN}.pc
+
+	dodoc README CHANGES CONTRIBUTORS
+}
diff --git a/app-text/mupdf/mupdf-1.12.0.ebuild b/app-text/mupdf/mupdf-1.12.0.ebuild
new file mode 100644
index 000000000000..9f1100e51cb3
--- /dev/null
+++ b/app-text/mupdf/mupdf-1.12.0.ebuild
@@ -0,0 +1,160 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic toolchain-funcs xdg
+
+DESCRIPTION="a lightweight PDF viewer and toolkit written in portable C"
+HOMEPAGE="https://mupdf.com/"
+SRC_URI="https://mupdf.com/downloads/${P}-source.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="X +curl javascript lcms libressl opengl +openssl static static-libs vanilla"
+
+LIB_DEPEND="
+	!libressl? ( dev-libs/openssl:0[static-libs?] )
+	libressl? ( dev-libs/libressl[static-libs?] )
+	javascript? ( >=dev-lang/mujs-0_p20160504 )
+	media-libs/freetype:2[static-libs?]
+	media-libs/harfbuzz[static-libs?]
+	media-libs/jbig2dec[static-libs?]
+	media-libs/libpng:0[static-libs?]
+	>=media-libs/openjpeg-2.1:2[static-libs?]
+	net-misc/curl[static-libs?]
+	virtual/jpeg[static-libs?]
+	X? ( x11-libs/libX11[static-libs?]
+		x11-libs/libXext[static-libs?] )
+	opengl? ( >=media-libs/glfw-3.2 )"
+RDEPEND="${LIB_DEPEND}"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	static-libs? ( ${LIB_DEPEND} )
+	static? ( ${LIB_DEPEND//?}
+		app-arch/bzip2[static-libs]
+		x11-libs/libXau[static-libs]
+		x11-libs/libXdmcp[static-libs]
+		x11-libs/libxcb[static-libs] )"
+
+REQUIRED_USE="opengl? ( !static !static-libs )"
+
+S=${WORKDIR}/${P}-source
+
+PATCHES=(
+		"${FILESDIR}"/${PN}-1.12-CFLAGS.patch
+		"${FILESDIR}"/${PN}-1.9a-debug-build.patch
+		"${FILESDIR}"/${PN}-1.10a-add-desktop-pc-xpm-files.patch
+		"${FILESDIR}"/${PN}-1.11-openssl-curl-x11.patch
+		"${FILESDIR}"/${PN}-1.11-system-glfw.patch
+		"${FILESDIR}"/${PN}-1.11-drop-libmupdfthird.patch
+)
+
+src_prepare() {
+	xdg_src_prepare
+	use hppa && append-cflags -ffunction-sections
+
+	# specialized lcms2, keep it if wanted inside lubmupdfthird
+	if ! use lcms ; then
+		rm -rf thirdparty/lcms2
+	fi
+
+	rm -rf thirdparty/{README,curl,freeglut,freetype,harfbuzz,jbig2dec,libjpeg,mujs,openjpeg,zlib} || die
+	for my_third in thirdparty/* ; do
+		ewarn "Bundled thirdparty lib: ${my_third}"
+	done
+
+	if has_version ">=media-libs/openjpeg-2.1:2" ; then
+		# Remove a switch, which prevents using shared libraries for openjpeg2.
+		# See http://www.linuxfromscratch.org/blfs/view/cvs/pst/mupdf.html
+		sed '/OPJ_STATIC$/d' -i source/fitz/load-jpx.c
+	fi
+
+	use javascript || \
+		sed -e '/* #define FZ_ENABLE_JS/ a\#define FZ_ENABLE_JS 0' \
+			-i include/mupdf/fitz/config.h
+
+	sed -e "/^libdir=/s:/lib:/$(get_libdir):" \
+		-e "/^prefix=/s:=.*:=${EROOT}/usr:" \
+		-i platform/debian/${PN}.pc || die
+
+	use vanilla || eapply \
+		"${FILESDIR}"/${PN}-1.3-zoom-2.patch
+
+	sed -e "1iOS = Linux" \
+		-e "1iCC = $(tc-getCC)" \
+		-e "1iLD = $(tc-getCC)" \
+		-e "1iAR = $(tc-getAR)" \
+		-e "1iverbose = yes" \
+		-e "1ibuild = debug" \
+		-e "1iprefix = ${ED}usr" \
+		-e "1ilibdir = ${ED}usr/$(get_libdir)" \
+		-e "1idocdir = ${ED}usr/share/doc/${PF}" \
+		-e "1iWANT_X11 = $(usex X)" \
+		-e "1iWANT_OPENSSL = $(usex openssl)" \
+		-e "1iWANT_CURL = $(usex curl)" \
+		-e "1iHAVE_MUJS = $(usex javascript)" \
+		-e "1iMUJS_LIBS = $(usex javascript -lmujs '')" \
+		-e "1iMUJS_CFLAGS =" \
+		-e "1iHAVE_GLFW = $(usex opengl yes no)" \
+		-i Makerules || die
+
+	if use static-libs || use static ; then
+		cp -a "${S}" "${S}"-static || die
+		#add missing Libs.private for xcb and freetype
+		sed -e 's:\(pkg-config --libs\):\1 --static:' \
+			-e '/^SYS_X11_LIBS = /s:\(.*\):\1 -lpthread:' \
+			-e '/^SYS_FREETYPE_LIBS = /s:\(.*\):\1 -lbz2:' \
+			-i "${S}"-static/Makerules || die
+	fi
+
+	my_soname=libmupdf.so.${PV}
+	my_soname_js_none=libmupdf-js-none.so.${PV}
+	sed -e "\$a\$(MUPDF_LIB): \$(MUPDF_JS_NONE_LIB)" \
+		-e "\$a\\\t\$(QUIET_LINK) \$(CC) \$(LDFLAGS) --shared -Wl,-soname -Wl,${my_soname} -Wl,--no-undefined -o \$@ \$^ \$(MUPDF_JS_NONE_LIB) \$(LIBS)" \
+		-e "/^MUPDF_LIB =/s:=.*:= \$(OUT)/${my_soname}:" \
+		-e "\$a\$(MUPDF_JS_NONE_LIB):" \
+		-e "\$a\\\t\$(QUIET_LINK) \$(CC) \$(LDFLAGS) --shared -Wl,-soname -Wl,${my_soname_js_none} -Wl,--no-undefined -o \$@ \$^ \$(LIBS)" \
+		-e "/install/s: COPYING : :" \
+		-i Makefile || die
+}
+
+src_compile() {
+	use lcms && emake XCFLAGS="-fpic" third
+	emake XCFLAGS="-fpic"
+	use static-libs && \
+		emake -C "${S}"-static build/debug/lib${PN}{,-js-none}.a
+	use static && \
+		emake -C "${S}"-static XLIBS="-static"
+}
+
+src_install() {
+	if use X || use opengl ; then
+		domenu platform/debian/${PN}.desktop
+		doicon platform/debian/${PN}.xpm
+	else
+		rm docs/man/${PN}.1
+	fi
+
+	emake install
+	dosym ${my_soname} /usr/$(get_libdir)/lib${PN}.so
+
+	use static-libs && \
+		dolib.a "${S}"-static/build/debug/lib${PN}{,-js-none}.a
+	if use static ; then
+		dobin "${S}"-static/build/debug/mu{tool,draw}
+		use X && dobin "${S}"-static/build/debug/${PN}-x11
+	fi
+	if use opengl ; then
+		einfo "mupdf symlink points to mupdf-gl (bug 616654)"
+		dosym ${PN}-gl /usr/bin/${PN}
+	elif use X ; then
+		einfo "mupdf symlink points to mupdf-x11 (bug 616654)"
+		dosym ${PN}-x11 /usr/bin/${PN}
+	fi
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins platform/debian/${PN}.pc
+
+	dodoc README CHANGES CONTRIBUTORS
+}
diff --git a/app-text/mythes-1.2.4 b/app-text/mythes-1.2.4
deleted file mode 100644
index 5d2a087f52d7..000000000000
--- a/app-text/mythes-1.2.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=virtual/pkgconfig
-DESCRIPTION=A simple thesaurus for Libreoffice
-EAPI=5
-HOMEPAGE=http://hunspell.sourceforge.net/
-IUSE=static-libs
-KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=app-text/hunspell
-SLOT=0
-SRC_URI=mirror://sourceforge/hunspell/MyThes/1.2.4/mythes-1.2.4.tar.gz
-_md5_=0b5b800b853e0aae8098805a26a83170
diff --git a/app-text/mythes/Manifest b/app-text/mythes/Manifest
new file mode 100644
index 000000000000..1e009e02e022
--- /dev/null
+++ b/app-text/mythes/Manifest
@@ -0,0 +1,3 @@
+DIST mythes-1.2.4.tar.gz 4910303 BLAKE2B aa091344aebd117618d90aa574ec5e68594782511e1aa85a2d46740ecc4ff2cdf1d9f9f6de9dfd454cc0056076bdb9a21ad14d2935e39e4fdbd7753930fda605 SHA512 a04da39812bcfb1391a2cba7de73e955eafe141679ec03ed6657d03bebf360b432480d0037dff9ed72a1dfda5a70d77d44ac2bb14cdb109fd8e2a38376feee21
+EBUILD mythes-1.2.4.ebuild 590 BLAKE2B b36239f6e550883fb4ba3dcef1eef3b3da6e1fd13470f20ea42b4169a341c8fca65e0d5a9fd1eb1bbae8165b1943e4a982d64fd6ff4a35214039c8f82ffb7b26 SHA512 499fe11088df9d7209b5d07960d62b0999724dcaff9f31ff297b427b009b1761794028588981c30b1b78930d8723f1658b6d0832032b0a64b37f6fa617162443
+MISC metadata.xml 333 BLAKE2B 989788782df7e4531d2ad8a12b49eb19f8651468467ef9c2894163c9089679622ed1bc597336afb881ca85bf0523e7e8077c8060d46b6237e4ff5dfe16bc1c1a SHA512 1c2849146c40fcf9b1c352d57e9580ea7d9c2fbdc71c5cf601343e3beb9580876b6dc1d42d41abe01163d92c0eb7837fedf85fc3e7408801f0d966ccc8e78ba2
diff --git a/app-text/mythes/metadata.xml b/app-text/mythes/metadata.xml
new file mode 100644
index 000000000000..99d138c6b1a0
--- /dev/null
+++ b/app-text/mythes/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>office@gentoo.org</email>
+		<name>Gentoo Office project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">hunspell</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/mythes/mythes-1.2.4.ebuild b/app-text/mythes/mythes-1.2.4.ebuild
new file mode 100644
index 000000000000..81f68e81f551
--- /dev/null
+++ b/app-text/mythes/mythes-1.2.4.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="A simple thesaurus for Libreoffice"
+HOMEPAGE="http://hunspell.sourceforge.net/"
+SRC_URI="mirror://sourceforge/hunspell/MyThes/${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+IUSE="static-libs"
+
+RDEPEND="app-text/hunspell"
+DEPEND="${DEPEND}
+	virtual/pkgconfig"
+
+src_configure() {
+	econf \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -exec rm -f {} +
+}
diff --git a/app-text/namazu-2.0.21 b/app-text/namazu-2.0.21
deleted file mode 100644
index f7ed4d9e508e..000000000000
--- a/app-text/namazu-2.0.21
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=dev-perl/File-MMagic emacs? ( virtual/emacs ) l10n_ja? ( app-i18n/nkf || ( dev-perl/Text-Kakasi app-i18n/kakasi app-text/chasen app-text/mecab ) ) nls? ( virtual/libintl ) tk? ( dev-lang/tk:0 www-client/lynx ) nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Namazu is a full-text search engine
-EAPI=6
-HOMEPAGE=http://www.namazu.org/
-IUSE=emacs l10n_ja nls static-libs tk
-KEYWORDS=amd64 ~ppc ~ppc64 x86
-LICENSE=GPL-2
-RDEPEND=dev-perl/File-MMagic emacs? ( virtual/emacs ) l10n_ja? ( app-i18n/nkf || ( dev-perl/Text-Kakasi app-i18n/kakasi app-text/chasen app-text/mecab ) ) nls? ( virtual/libintl ) tk? ( dev-lang/tk:0 www-client/lynx )
-SLOT=0
-SRC_URI=http://www.namazu.org/stable/namazu-2.0.21.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	elisp-common	23f47b2e1de7abf387105eddd1318738	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=b618afaebe92b7f8e53e5394b67356bb
diff --git a/app-text/namazu-2.0.22_pre7 b/app-text/namazu-2.0.22_pre7
deleted file mode 100644
index 773ee744aef3..000000000000
--- a/app-text/namazu-2.0.22_pre7
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=dev-perl/File-MMagic emacs? ( virtual/emacs ) l10n_ja? ( app-i18n/nkf || ( dev-perl/Text-Kakasi app-i18n/kakasi app-text/chasen app-text/mecab ) ) nls? ( virtual/libintl ) tk? ( dev-lang/tk:0 www-client/lynx ) nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Namazu is a full-text search engine
-EAPI=6
-HOMEPAGE=http://www.namazu.org/
-IUSE=emacs l10n_ja nls static-libs tk
-LICENSE=GPL-2
-RDEPEND=dev-perl/File-MMagic emacs? ( virtual/emacs ) l10n_ja? ( app-i18n/nkf || ( dev-perl/Text-Kakasi app-i18n/kakasi app-text/chasen app-text/mecab ) ) nls? ( virtual/libintl ) tk? ( dev-lang/tk:0 www-client/lynx )
-SLOT=0
-SRC_URI=http://www.namazu.org/test/namazu-2.0.22pre7.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	elisp-common	23f47b2e1de7abf387105eddd1318738	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=c238522295de8ce1b6a7c978b329d7c7
diff --git a/app-text/namazu/Manifest b/app-text/namazu/Manifest
new file mode 100644
index 000000000000..27c989fcdac6
--- /dev/null
+++ b/app-text/namazu/Manifest
@@ -0,0 +1,10 @@
+AUX 50namazu-gentoo.el 72 BLAKE2B 1047f37bcd89dd27714342af9e88ef186860efe6de8be767f37a81164b8d6b821bba292a1785617b1da249f76171d449485b107a315ea4ef0342173d0ec74a65 SHA512 8e316add3dbe93049fd879bc93829b2c141a752133d065c2ee724e180b38f171f5b11dfa72b8651d7721e825e3ff35439c6afc33c6043ce42738739ff4988e8c
+AUX namazu-2.0.21-memmove.patch 2050 BLAKE2B d5a12989489c4db9a6a7c6288ce29ecbe654731bfd84e3baa40c02ad802aa975704dbab2b05dc8f496e30cc76a1cb7bfaf9f2d8a2f0484160465fbb1f41af9c9 SHA512 d445d77c45a30d4e71dd9129ebf7938f48058f89627e4130e0f921ca719918fdd654f8369d0ae24edcbfb5d3801d68eeeaee4b55c887b9d208e0d8df00effae5
+AUX namazu-gentoo.patch 1471 BLAKE2B 949429187d765e37a3fcfbcb9c455d4b92e5d1af11a4b0550a40240523b3862de8cf3b2cbab85c15be9848d1614cdccbeb0df346a006f445eea35aad35a05bc1 SHA512 bdc4946197f48fe87fe1e2eacbefaaf775458e28a96f2c5af70c1264e883f29c89673feaffd71afff9d9744bb7b81c3b3ede3258f585dab3b7f117c8fa77f93e
+AUX namazu-perl-5.18.patch 1761 BLAKE2B 38941d15556c229de19592ba2660b9a79782588a79811d0a651599b0e4d22ff4a8a515aca2047684e988d6a434025aca40d744c2aabe310f20ebbbb4ff43af72 SHA512 4a5faf2a889f9eb02a57db80c834a60560bbe2df718f541a24fbfc137145121336055c157458b5d3c4d9c5f573cf3964329adc1ae1e2448c254531df4fee8267
+AUX namazu-perl-5.26.patch 632 BLAKE2B f6b4a0838d6ca529adb9330f7221ebb014e50f289be144920a24a6656fb3abc604a0dc39f6f618a02b25c1cbf2065331f57f80d4120fba69042692a3dcb8a673 SHA512 78c655dfb0bfee51e339a142e71685b0599a58786899a151279834b7e9523dcff8359df8addb2a1e40a162f2a412cbd10e178a8215f3a178527392c2a8fa7be7
+DIST namazu-2.0.21.tar.gz 1394048 BLAKE2B 86755fe2433bee1a1c7bf8239b38b3d9500eb20f720b031f349d968f173384f172d81eb0926265343b2c749fca527e6cd6c2940fbaa2be333830b41f8b7853a2 SHA512 c0ce1b8c8b8ce30ee7d28cfed790a9c8585d1b468eefe2ba4ac70976e09329ae04a3a3bbf0b86b9673cfdf206f2b103896daca2f053062f451884fa659b31ea6
+DIST namazu-2.0.22pre7.tar.gz 1841999 BLAKE2B 4728b83ebca2bf3313cfffa5831a357281ee210e9ecab26506297022307d54a6818b9167bc3a41b66d14b682310d4533b26dab1e2a6f4f805a45d018350bdc76 SHA512 e530e0cb5219995a1b9193a8755a5a30eb09bec2f6e0b100a2423e7df1eb3a7b5f83c7f2eecdcbfd370301dab29857a3ac4d417653ed391f77ce131c340a9989
+EBUILD namazu-2.0.21.ebuild 1701 BLAKE2B eb2b1e6bf30958ded4787682c081fdb8c80c1251fd6d9d3bed29adbedf8681f5c33150bba62269bd018a4ad3d6a1174e46e1528f49e80e26c4b3bcc0e948ebe6 SHA512 5789736e5c0d0e855db5a16ef08dbd1b65fc50e8d2cc188850a02c6810b5a88f478bb1258a981d32bb4f83de4d8e9a2417ec2253493876d9966b57a452586264
+EBUILD namazu-2.0.22_pre7.ebuild 1617 BLAKE2B 277f90e3c9129d46c87503bea0f8d39c866716aec8f20bbb21ebd1efbc7065939213c3aed9d935601cab6dafb1af46bfa01efb93ef7942c6f1c38795d715a2b1 SHA512 a5adc472b8382d1267915410bd055335a45588aa9f6851f869e67783998be338a4f3a587f428cc19d2cf98f2bcf7666bdcc6c51e9ecd4bff9ab184bc27f74c5a
+MISC metadata.xml 240 BLAKE2B 3e01f599fdbafa5c02b594007c673bcfcccb41559bd2f42d7ea60a1f13932335cecf353c1216e8feba4bb091385b57f05c4c8b3c62eed6c7bea41e308fc6115c SHA512 12aaa73d9b690de68a5c7b20e214ceb099efa87884b784eafd994f26032b44dcb66e7feac8a5b1df7f349ac05c5a198a7593dff2cc686de158cb21e4c54f38dd
diff --git a/app-text/namazu/files/50namazu-gentoo.el b/app-text/namazu/files/50namazu-gentoo.el
new file mode 100644
index 000000000000..e2f6e501241c
--- /dev/null
+++ b/app-text/namazu/files/50namazu-gentoo.el
@@ -0,0 +1,2 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'namazu "namazu" nil t)
diff --git a/app-text/namazu/files/namazu-2.0.21-memmove.patch b/app-text/namazu/files/namazu-2.0.21-memmove.patch
new file mode 100644
index 000000000000..30ad490e44fa
--- /dev/null
+++ b/app-text/namazu/files/namazu-2.0.21-memmove.patch
@@ -0,0 +1,56 @@
+--- a/nmz/search.c
++++ b/nmz/search.c
+@@ -572,7 +572,7 @@
+ {
+     if (*expr == '*' && expr[strlen(expr) - 1] != '*') {
+         /* If suffix match such as '*bar', enforce it into regex */
+-        strcpy(expr, expr + 1);
++        memmove(expr, expr + 1, strlen(expr));
+         escape_meta_characters(expr, BUFSIZE * 2);
+         strncat(expr, "$", BUFSIZE * 2 - strlen(expr) - 1);
+         expr[BUFSIZE * 2 - 1] = '\0';
+@@ -584,7 +584,7 @@
+         expr[BUFSIZE * 2 - 1] = '\0';
+     } else if (*expr == '*' && expr[strlen(expr) - 1] == '*') {
+         /* If internal match such as '*foo*', enforce it into regex */
+-        strcpy(expr, expr + 1);
++        memmove(expr, expr + 1, strlen(expr));
+         expr[strlen(expr) - 1] = '\0';
+         escape_meta_characters(expr, BUFSIZE * 2);
+     } else if (*expr == '/' && expr[strlen(expr) - 1] == '/') {
+@@ -592,7 +592,7 @@
+             nmz_debug_printf("do REGEX search\n");
+             /* Genuine regex */
+             /* Remove the both of '/' chars at begging and end of string */
+-            strcpy(expr, expr + 1);
++            memmove(expr, expr + 1, strlen(expr));
+             expr[strlen(expr) - 1]= '\0';
+         } else {
+             nmz_debug_printf("disabled REGEX search\n");
+@@ -605,7 +605,7 @@
+             || (*expr == '{' && expr[strlen(expr) - 1] == '}')) 
+         {
+             /* Delimiters of field search */
+-            strcpy(expr, expr + 1); 
++            memmove(expr, expr + 1, strlen(expr)); 
+             expr[strlen(expr) - 1] = '\0';
+         }
+         escape_meta_characters(expr, BUFSIZE * 2);
+@@ -695,7 +695,7 @@
+ delete_beginning_backslash(char *str)
+ {
+     if (*str == '\\') {
+-        strcpy(str, str + 1);
++        memmove(str, str + 1, strlen(str));
+     }
+ }
+ 
+@@ -935,7 +935,7 @@
+     if ((strlen(str) >= 3 && (*str == '"' && str[strlen(str) - 1] == '"'))
+         || (*str == '{' && str[strlen(str) - 1] == '}')) 
+     {
+-        strcpy(str, str + 1); 
++        memmove(str , str + 1, strlen(str)); 
+         str[strlen(str) - 1]= '\0';
+     } 
+ }
diff --git a/app-text/namazu/files/namazu-gentoo.patch b/app-text/namazu/files/namazu-gentoo.patch
new file mode 100644
index 000000000000..8f0275ba27c5
--- /dev/null
+++ b/app-text/namazu/files/namazu-gentoo.patch
@@ -0,0 +1,54 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -19,9 +19,9 @@
+ 
+ bin_SCRIPTS = nmz-config
+ 
+-etcdir     = $(pkgdatadir)/etc
+-etc_DATA   = AUTHORS ChangeLog ChangeLog.1 CREDITS COPYING INSTALL \
+-	     INSTALL-ja README README-es README-ja NEWS THANKS TODO \
++etcdir     = $(docdir)
++etc_DATA   = AUTHORS ChangeLog ChangeLog.1 CREDITS \
++	     README README-es README-ja NEWS THANKS TODO \
+ 	     HACKING HACKING-ja
+ 
+ EXTRA_DIST = $(etc_DATA) maintMakefile namazu.spec namazu.spec.in \
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -2,7 +2,7 @@
+ AUTOMAKE_OPTIONS = 1.4 no-dependencies
+ SUBDIRS = en ja
+ 
+-cssdir = $(pkgdatadir)/doc
++cssdir = $(htmldir)
+ 
+ css_DATA   = namazu.css
+ EXTRA_DIST = $(css_DATA)
+--- a/doc/en/Makefile.am
++++ b/doc/en/Makefile.am
+@@ -1,4 +1,4 @@
+-htmldir = $(pkgdatadir)/doc/en
++htmldir = @htmldir@/en
+ 
+ html_DATA = manual.html nmz.html tutorial.html tips.html
+ EXTRA_DIST = $(html_DATA)
+--- a/doc/ja/Makefile.am
++++ b/doc/ja/Makefile.am
+@@ -1,4 +1,4 @@
+-htmldir = $(pkgdatadir)/doc/ja
++htmldir = @htmldir@/ja
+ 
+ html_DATA  = manual.html nmz.html tips.html tutorial.html
+ EXTRA_DIST = $(html_DATA)
+--- a/filter/Makefile.am
++++ b/filter/Makefile.am
+@@ -51,9 +51,3 @@
+ 
+ ETAGS_ARGS = $(filter_DATA) --lang=perl
+ TAGS_DEPENDENCIES = $(filter_DATA)
+-
+-# To remove Windows specific files installed by Namazu 2.0 and/or 2.0.1
+-# and old gfilter.pl (Namazu 2.0.7 or earlier).
+-install-data-local:
+-	rm -f $(filterdir)/ole*.pl
+-	rm -f $(filterdir)/gfilter.pl
diff --git a/app-text/namazu/files/namazu-perl-5.18.patch b/app-text/namazu/files/namazu-perl-5.18.patch
new file mode 100644
index 000000000000..8674982312d4
--- /dev/null
+++ b/app-text/namazu/files/namazu-perl-5.18.patch
@@ -0,0 +1,48 @@
+2013-12-15  Tadamasa Teranishi  <yw3t-trns@asahi-net.or.jp>
+
+        * scripts/mknmz.in, filter/mhonarc.pl: support random HASH
+          for Perl 5.8.1, 5.18.X.
+
+--- a/filter/mhonarc.pl	2008/05/09 07:52:21	1.23.8.8
++++ b/filter/mhonarc.pl	2013/12/15 04:01:53	1.23.8.9
+@@ -1,10 +1,10 @@
+ #
+ # -*- Perl -*-
+-# $Id: mhonarc.pl,v 1.23.8.8 2008-05-09 07:52:21 opengl2772 Exp $
++# $Id: mhonarc.pl,v 1.23.8.9 2013-12-15 04:01:53 opengl2772 Exp $
+ # Copyright (C) 1997-2000 Satoru Takabayashi ,
+ #               1999 NOKUBI Takatsugu ,
+ #               2002 Earl Hood ,
+-#               2000-2008 Namazu Project All rights reserved.
++#               2000-2013 Namazu Project All rights reserved.
+ #     This is free software with ABSOLUTELY NO WARRANTY.
+ #
+ #  This program is free software; you can redistribute it and/or modify
+@@ -141,9 +141,8 @@
+ 
+     # Format MHonArc X comment extracted headers as regular headers
+     my $mha_header = "";
+-    my($fld_name, $fld_value);
+-    while (($fld_name, $fld_value) = each %$mha_fields) {
+-	$mha_header .= join('', $fld_name, ': ', $fld_value, "\n");
++    for my $key (sort keys %$mha_fields) {
++	$mha_header .= join('', $key, ': ', $mha_fields->{$key}, "\n");
+     }
+ 
+     # Added header back to content string.
+--- a/scripts/mknmz.in	2011/07/23 23:50:59	1.85.4.102
++++ b/scripts/mknmz.in	2013/12/15 04:01:53	1.85.4.103
+@@ -77,13 +77,6 @@
+ sub main {
+     my $start_time = time;
+ 
+-    if ($English::PERL_VERSION == 5.008001) {
+-        unless (defined $ENV{PERL_HASH_SEED} && $ENV{PERL_HASH_SEED} eq 0) {
+-            print "Run mknmz with the environment variable PERL_HASH_SEED=0\n";
+-            exit 1;
+-        }
+-    }
+-
+     init();
+ 
+     # At first, loading pl/conf.pl to prevent overriding some variables.
diff --git a/app-text/namazu/files/namazu-perl-5.26.patch b/app-text/namazu/files/namazu-perl-5.26.patch
new file mode 100644
index 000000000000..1b3a4e40bd10
--- /dev/null
+++ b/app-text/namazu/files/namazu-perl-5.26.patch
@@ -0,0 +1,22 @@
+--- a/filter/hnf.pl
++++ b/filter/hnf.pl
+@@ -244,7 +244,7 @@
+         $uri = '?%year%month%hiday#%year%month%day0'; # for hns-1.x
+       }
+       $uri =~ s/%%/\34/g;
+-      $uri =~ s/%{?([a-z]+)}?/$param{$1}/g;
++      $uri =~ s/%\{?([a-z]+)}?/$param{$1}/g;
+       $uri =~ s/\34/%/g;
+       $uri = $hnf::diary_uri . $uri;
+       $uri =~ s/%7E/~/i;
+--- a/filter/mp3.pl
++++ b/filter/mp3.pl
+@@ -152,7 +152,7 @@
+     mp3::get_title($$contref, $weighted_str, $fields);
+     mp3::get_author($$contref, $fields);
+     mp3::get_album($$contref, $fields);
+-    $$contref =~ s/^\w+:{1,1}?//gm;
++    $$contref =~ s/^\w+:?//gm;
+ 
+     return;
+ }
diff --git a/app-text/namazu/metadata.xml b/app-text/namazu/metadata.xml
new file mode 100644
index 000000000000..e1a49f498885
--- /dev/null
+++ b/app-text/namazu/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-text/namazu/namazu-2.0.21.ebuild b/app-text/namazu/namazu-2.0.21.ebuild
new file mode 100644
index 000000000000..92d9023d9ae1
--- /dev/null
+++ b/app-text/namazu/namazu-2.0.21.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit autotools elisp-common ltprune
+
+DESCRIPTION="Namazu is a full-text search engine"
+HOMEPAGE="http://www.namazu.org/"
+SRC_URI="http://www.namazu.org/stable/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
+IUSE="emacs l10n_ja nls static-libs tk"
+
+RDEPEND="dev-perl/File-MMagic
+	emacs? ( virtual/emacs )
+	l10n_ja? (
+		app-i18n/nkf
+		|| (
+			dev-perl/Text-Kakasi
+			app-i18n/kakasi
+			app-text/chasen
+			app-text/mecab
+		)
+	)
+	nls? ( virtual/libintl )
+	tk? (
+		dev-lang/tk:0
+		www-client/lynx
+	)"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-gentoo.patch
+	"${FILESDIR}"/${PN}-perl-5.18.patch
+	"${FILESDIR}"/${PN}-perl-5.26.patch
+	"${FILESDIR}"/${P}-memmove.patch
+)
+
+src_prepare() {
+	default
+
+	mv configure.{in,ac}
+	mv tk${PN}/configure.{in,ac}
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		$(use_enable nls)
+		$(use_enable static-libs static)
+		$(use_enable tk tk${PN})
+	)
+	use tk && myconf+=(
+		--with-${PN}="${EPREFIX}"/usr/bin/${PN}
+		--with-mknmz="${EPREFIX}"/usr/bin/mknmz
+		--with-indexdir="${EPREFIX}"/var/lib/${PN}/index
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	emake
+
+	if use emacs; then
+		cd lisp
+		rm -f browse*
+		elisp-compile *.el
+	fi
+}
+
+src_test() {
+	emake -j1 check
+}
+
+src_install () {
+	emake DESTDIR="${D}" install
+
+	if use emacs; then
+		elisp-install ${PN} lisp/*.el*
+		elisp-site-file-install "${FILESDIR}"/50${PN}-gentoo.el
+
+		docinto lisp
+		dodoc lisp/ChangeLog*
+	fi
+
+	prune_libtool_files
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/app-text/namazu/namazu-2.0.22_pre7.ebuild b/app-text/namazu/namazu-2.0.22_pre7.ebuild
new file mode 100644
index 000000000000..92c919dbac58
--- /dev/null
+++ b/app-text/namazu/namazu-2.0.22_pre7.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit autotools elisp-common ltprune
+
+MY_P="${P/_pre/pre}"
+
+DESCRIPTION="Namazu is a full-text search engine"
+HOMEPAGE="http://www.namazu.org/"
+SRC_URI="http://www.namazu.org/test/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="emacs l10n_ja nls static-libs tk"
+
+RDEPEND="dev-perl/File-MMagic
+	emacs? ( virtual/emacs )
+	l10n_ja? (
+		app-i18n/nkf
+		|| (
+			dev-perl/Text-Kakasi
+			app-i18n/kakasi
+			app-text/chasen
+			app-text/mecab
+		)
+	)
+	nls? ( virtual/libintl )
+	tk? (
+		dev-lang/tk:0
+		www-client/lynx
+	)"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
+S="${WORKDIR}"/${MY_P}
+
+PATCHES=( "${FILESDIR}"/${PN}-gentoo.patch )
+
+src_prepare() {
+	default
+
+	mv configure.{in,ac}
+	mv tk${PN}/configure.{in,ac}
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		$(use_enable nls)
+		$(use_enable static-libs static)
+		$(use_enable tk tk${PN})
+	)
+	use tk && myconf+=(
+		--with-${PN}="${EPREFIX}"/usr/bin/${PN}
+		--with-mknmz="${EPREFIX}"/usr/bin/mknmz
+		--with-indexdir="${EPREFIX}"/var/lib/${PN}/index
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	emake
+
+	if use emacs; then
+		cd lisp
+		rm -f browse*
+		elisp-compile *.el
+	fi
+}
+
+src_test() {
+	emake -j1 check
+}
+
+src_install () {
+	emake DESTDIR="${D}" install
+
+	if use emacs; then
+		elisp-install ${PN} lisp/*.el*
+		elisp-site-file-install "${FILESDIR}"/50${PN}-gentoo.el
+
+		docinto lisp
+		dodoc lisp/ChangeLog*
+	fi
+
+	prune_libtool_files
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/app-text/nfoview-1.23 b/app-text/nfoview-1.23
deleted file mode 100644
index 938e9a2712d4..000000000000
--- a/app-text/nfoview-1.23
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=dev-python/pygobject:3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=sys-apps/sed-4
-DESCRIPTION=simple viewer for NFO files, which are ASCII art in the CP437 codepage
-EAPI=6
-HOMEPAGE=https://otsaloma.io/nfoview/
-IUSE=python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-python/pygobject:3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] media-fonts/terminus-font python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/otsaloma/nfoview/archive/1.23.tar.gz -> nfoview-1.23.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5c4e62f85edb8eb0248f6d8c24ed93fa
diff --git a/app-text/nfoview-1.24 b/app-text/nfoview-1.24
deleted file mode 100644
index 0987eae4283e..000000000000
--- a/app-text/nfoview-1.24
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=dev-python/pygobject:3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=sys-apps/sed-4
-DESCRIPTION=simple viewer for NFO files, which are ASCII art in the CP437 codepage
-EAPI=6
-HOMEPAGE=https://otsaloma.io/nfoview/
-IUSE=python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-python/pygobject:3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] media-fonts/terminus-font python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/otsaloma/nfoview/archive/1.24.tar.gz -> nfoview-1.24.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5c4e62f85edb8eb0248f6d8c24ed93fa
diff --git a/app-text/nfoview-9999 b/app-text/nfoview-9999
deleted file mode 100644
index d09ab1092354..000000000000
--- a/app-text/nfoview-9999
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=dev-python/pygobject:3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=sys-apps/sed-4 >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=simple viewer for NFO files, which are ASCII art in the CP437 codepage
-EAPI=6
-HOMEPAGE=https://otsaloma.io/nfoview/
-IUSE=python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-LICENSE=GPL-3
-RDEPEND=dev-python/pygobject:3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] media-fonts/terminus-font python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	git-r3	8f6de46b0aa318aea0e8cac62ece098b	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5c4e62f85edb8eb0248f6d8c24ed93fa
diff --git a/app-text/nfoview/Manifest b/app-text/nfoview/Manifest
new file mode 100644
index 000000000000..007442666dd7
--- /dev/null
+++ b/app-text/nfoview/Manifest
@@ -0,0 +1,6 @@
+DIST nfoview-1.23.tar.gz 83337 BLAKE2B d73cd6987bf7929c57e8acf0a24278272ea199bf980756ddb5da9a5eddf7760a8c05f0e48a287ee760d4bf4d2594fb08b43a77cef46d371a746629bf76955e91 SHA512 b94724e130cdf58b911634496c52361d008ebfafab3ac40a76612c4891737d4145596a6badc15fe4228c90c1cd7261e5a892e3e462070ebb55f71332b36345d7
+DIST nfoview-1.24.tar.gz 86037 BLAKE2B 5d565680864f1a73a64d9557e69eda0771dc164f12018ac8964fb1c2225005c1bb881c7b9035c7baed2021838e3a291e52fb5af84cf9c271c046cfddd684270c SHA512 91ad1f9f972b7681655b429c0910475012bd2231e51c6db5659b19fb869779d1de10dadc1d6461fa7d577c051af9b74f1d463543a429e1dca438a4ff17ac2293
+EBUILD nfoview-1.23.ebuild 862 BLAKE2B da322567922a6ac0ec9c9a968d7dc78c4ffed6c3dd1122de7039008f322784339686edeef48fb902e3eabaca3b7427b753e4a30266e064f569bc6fda3dd9b367 SHA512 1babd9f4ed2ef92cdd94872253a0f3fe70cbd205bea360f1f8341d7ec5341adb940b97248ec8fbfeaffe067864a880fbcf8f45211b1022292b1b5b024671cdb1
+EBUILD nfoview-1.24.ebuild 862 BLAKE2B da322567922a6ac0ec9c9a968d7dc78c4ffed6c3dd1122de7039008f322784339686edeef48fb902e3eabaca3b7427b753e4a30266e064f569bc6fda3dd9b367 SHA512 1babd9f4ed2ef92cdd94872253a0f3fe70cbd205bea360f1f8341d7ec5341adb940b97248ec8fbfeaffe067864a880fbcf8f45211b1022292b1b5b024671cdb1
+EBUILD nfoview-9999.ebuild 862 BLAKE2B da322567922a6ac0ec9c9a968d7dc78c4ffed6c3dd1122de7039008f322784339686edeef48fb902e3eabaca3b7427b753e4a30266e064f569bc6fda3dd9b367 SHA512 1babd9f4ed2ef92cdd94872253a0f3fe70cbd205bea360f1f8341d7ec5341adb940b97248ec8fbfeaffe067864a880fbcf8f45211b1022292b1b5b024671cdb1
+MISC metadata.xml 457 BLAKE2B fc1b77e74af5461b5ff1e772f60ef2c222f95860b1afb21828aa39d26342c241658e731d80bb937e694ff1195b0a079fb4134e60207539fa799ffdb6cd601c52 SHA512 65cd8b6021811a13d3a319b930afd8a090c5d15fe232e10d403c3ca8258685f6e118a224bdda7e6cbcff17bf72a409f5213a919554d20525c75efca06b1fcfc1
diff --git a/app-text/nfoview/metadata.xml b/app-text/nfoview/metadata.xml
new file mode 100644
index 000000000000..f49632fab59f
--- /dev/null
+++ b/app-text/nfoview/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>till2.schaefer@uni-dortmund.de</email>
+		<name>Till Schäfer</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">otsaloma/nfoview</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/nfoview/nfoview-1.23.ebuild b/app-text/nfoview/nfoview-1.23.ebuild
new file mode 100644
index 000000000000..5b1cf0483c63
--- /dev/null
+++ b/app-text/nfoview/nfoview-1.23.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit distutils-r1 gnome2-utils xdg-utils
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/otsaloma/nfoview.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/otsaloma/nfoview/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="simple viewer for NFO files, which are ASCII art in the CP437 codepage"
+HOMEPAGE="https://otsaloma.io/nfoview/"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE=""
+
+DEPEND="dev-python/pygobject:3[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}
+	media-fonts/terminus-font"
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/app-text/nfoview/nfoview-1.24.ebuild b/app-text/nfoview/nfoview-1.24.ebuild
new file mode 100644
index 000000000000..5b1cf0483c63
--- /dev/null
+++ b/app-text/nfoview/nfoview-1.24.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit distutils-r1 gnome2-utils xdg-utils
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/otsaloma/nfoview.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/otsaloma/nfoview/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="simple viewer for NFO files, which are ASCII art in the CP437 codepage"
+HOMEPAGE="https://otsaloma.io/nfoview/"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE=""
+
+DEPEND="dev-python/pygobject:3[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}
+	media-fonts/terminus-font"
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/app-text/nfoview/nfoview-9999.ebuild b/app-text/nfoview/nfoview-9999.ebuild
new file mode 100644
index 000000000000..5b1cf0483c63
--- /dev/null
+++ b/app-text/nfoview/nfoview-9999.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit distutils-r1 gnome2-utils xdg-utils
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/otsaloma/nfoview.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/otsaloma/nfoview/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="simple viewer for NFO files, which are ASCII art in the CP437 codepage"
+HOMEPAGE="https://otsaloma.io/nfoview/"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE=""
+
+DEPEND="dev-python/pygobject:3[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}
+	media-fonts/terminus-font"
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/app-text/o3read-0.0.4 b/app-text/o3read-0.0.4
deleted file mode 100644
index b5dac807b9b1..000000000000
--- a/app-text/o3read-0.0.4
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=Converts OpenOffice formats to text or HTML
-EAPI=4
-HOMEPAGE=http://siag.nu/o3read/
-KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=GPL-2
-RESTRICT=test
-SLOT=0
-SRC_URI=http://siag.nu/pub/o3read/o3read-0.0.4.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=950a214f01fbbd3e0f1beb1d55be712d
diff --git a/app-text/o3read/Manifest b/app-text/o3read/Manifest
new file mode 100644
index 000000000000..b156d3661c29
--- /dev/null
+++ b/app-text/o3read/Manifest
@@ -0,0 +1,3 @@
+DIST o3read-0.0.4.tar.gz 21075 BLAKE2B 35a7cdb3b8242179372c08428691ff0d7ef6df14777b2559847df0a3b15396a8eb28746cdefa99109e6b2544d4ed7997934b50b620d847c3ad150404b8b3252e SHA512 5287a9d58a77cba47397265de9decac1d4327f0a6065cbf7303451d48126a173ad2763157355c9a41237feac6b467ddff5d7e5ad4b4d6c3870f1d09ae0035879
+EBUILD o3read-0.0.4.ebuild 631 BLAKE2B cd93bd95c82f589cb0deb26a0b1a8a6bac7e0a6d55f8617553b21725606d9a0fa2a8f380a5010fe7ff416289c07b38b6c9737b296d0578254c1cf28442046fd2 SHA512 de72f26f1d09390eb361b1f9f9071da5ba204ea2a1ce1a4ed15cd487c06f849cfa4c6363ca6b5b4a50df48a5588e35e2add166d5584a60d50a50f7f84fcc518f
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/o3read/metadata.xml b/app-text/o3read/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-text/o3read/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/app-text/o3read/o3read-0.0.4.ebuild b/app-text/o3read/o3read-0.0.4.ebuild
new file mode 100644
index 000000000000..9b39421c0634
--- /dev/null
+++ b/app-text/o3read/o3read-0.0.4.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit toolchain-funcs
+
+DESCRIPTION="Converts OpenOffice formats to text or HTML"
+HOMEPAGE="http://siag.nu/o3read/"
+SRC_URI="http://siag.nu/pub/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE=""
+
+RESTRICT=test
+
+src_prepare() {
+	sed \
+		-e 's:-o:$(LDFLAGS) -o:g' \
+		-e '/^CC/d' \
+		-e '/^CFLAGS/g' \
+		-i Makefile || die
+	tc-export CC
+}
+
+src_install() {
+	dobin o3read o3totxt o3tohtml utf8tolatin1
+	doman o3read.1 o3tohtml.1 o3totxt.1 utf8tolatin1.1
+}
diff --git a/app-text/ocrad-0.22 b/app-text/ocrad-0.22
deleted file mode 100644
index 3d3ff9fd338e..000000000000
--- a/app-text/ocrad-0.22
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure install unpack
-DEPEND=|| ( app-arch/plzip app-arch/pdlzip app-arch/lzip )
-DESCRIPTION=GNU Ocrad is an OCR (Optical Character Recognition) program
-EAPI=5
-HOMEPAGE=https://www.gnu.org/software/ocrad/ocrad.html
-KEYWORDS=~alpha amd64 ppc ~ppc64 sparc x86
-LICENSE=GPL-3
-SLOT=0
-SRC_URI=mirror://nongnu/ocrad/ocrad-0.22.tar.lz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44
-_md5_=f65b6472027d674f349f3c8c5bd2e406
diff --git a/app-text/ocrad-0.23 b/app-text/ocrad-0.23
deleted file mode 100644
index 9ac4a87c607c..000000000000
--- a/app-text/ocrad-0.23
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure install unpack
-DEPEND=|| ( app-arch/plzip app-arch/pdlzip app-arch/lzip )
-DESCRIPTION=GNU Ocrad is an OCR (Optical Character Recognition) program
-EAPI=5
-HOMEPAGE=https://www.gnu.org/software/ocrad/ocrad.html
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-3
-SLOT=0
-SRC_URI=mirror://nongnu/ocrad/ocrad-0.23.tar.lz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44
-_md5_=6952713f22ec78099cc00d03f1132cc3
diff --git a/app-text/ocrad-0.24 b/app-text/ocrad-0.24
deleted file mode 100644
index 6455ad585a96..000000000000
--- a/app-text/ocrad-0.24
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure install unpack
-DEPEND=|| ( app-arch/plzip app-arch/pdlzip app-arch/lzip )
-DESCRIPTION=GNU Ocrad is an OCR (Optical Character Recognition) program
-EAPI=5
-HOMEPAGE=https://www.gnu.org/software/ocrad/ocrad.html
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://nongnu/ocrad/ocrad-0.24.tar.lz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44
-_md5_=6b54fceaeb62ad15ee8cd63ada988287
diff --git a/app-text/ocrad-0.25 b/app-text/ocrad-0.25
deleted file mode 100644
index f39be8a0a5ae..000000000000
--- a/app-text/ocrad-0.25
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure install unpack
-DEPEND=|| ( app-arch/plzip app-arch/pdlzip app-arch/lzip )
-DESCRIPTION=GNU Ocrad is an OCR (Optical Character Recognition) program
-EAPI=5
-HOMEPAGE=https://www.gnu.org/software/ocrad/ocrad.html
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://nongnu/ocrad/ocrad-0.25.tar.lz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44
-_md5_=a8f600f17f80c984837fe732b0fb0077
diff --git a/app-text/ocrad-0.26 b/app-text/ocrad-0.26
deleted file mode 100644
index 8a31f5efdb25..000000000000
--- a/app-text/ocrad-0.26
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure install unpack
-DEPEND=|| ( app-arch/plzip app-arch/pdlzip app-arch/lzip )
-DESCRIPTION=GNU Ocrad is an OCR (Optical Character Recognition) program
-EAPI=5
-HOMEPAGE=https://www.gnu.org/software/ocrad/ocrad.html
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://nongnu/ocrad/ocrad-0.26.tar.lz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44
-_md5_=fcc9ba8423caaa9bf3dcc4d68d488e8a
diff --git a/app-text/ocrad/Manifest b/app-text/ocrad/Manifest
new file mode 100644
index 000000000000..765e49bc0c68
--- /dev/null
+++ b/app-text/ocrad/Manifest
@@ -0,0 +1,11 @@
+DIST ocrad-0.22.tar.lz 87698 BLAKE2B 90bc7a5fb94476819501a2026e4b55c0d8631acf40926c2840e614066786078235edbd44d6bc47877cf106244bcb90b0291c2fb45a34f7d3a99ca676271e5df7 SHA512 45c7934776d96b6868a0109bf40b6814503c03bf63cb797e6a727599aa79e700a253b4eb3ec8ec8ec7abc3417601dacafc7560b147395171348cdae1b6951254
+DIST ocrad-0.23.tar.lz 87385 BLAKE2B 9f6ece19f815e1e6011aef5c2c90f1772bdc9621586744ddb9c7fde16762ccba42ca887792a9958c3a7ff1d43f8cbab985a2196de1f1a7ada01ad79d30f308b1 SHA512 db3c282dd121b5138d7e0e8d52fe88a3d392aa5ba2a5b821c74a84b1f66f0bfb8f3b9f08a276b6814c6bb6c31b1a51f5bcaf0c6e66e1a4d659ea72f60b383d13
+DIST ocrad-0.24.tar.lz 84506 BLAKE2B 814604ffb04cc3b4e40a7c3a07d90c9d07e4b64afd4d97bc5043e1019eeb347dd1105481dbaa721951efe4aaea729dd87f3510f3ee7dd9b277d96f9d6cb33ea2 SHA512 c43cb4dc678e9588e7061af6ea83a0514181e56201fe5ab68b50b8a1c8e1ae7c7fbf959cdf172b7200b89d9e6b1f42261ead4fbf3a6d0123860feff7954e532d
+DIST ocrad-0.25.tar.lz 91464 BLAKE2B 424d2a67eee85bb2d66568c4869761f2ef63c7c274b3a5a0a1c82920bc23becb97553b76dd4a7af5ca4400e806a05e927581060420f70483eaf8a77bf865e05f SHA512 48a0753d699af909d4d0295005e12ec626dad8772a5212c0d579df3b24cf01f6e457ec61edc708a0f6eebace75f37ce0544e8b19c11c9a25166aafedc92c258f
+DIST ocrad-0.26.tar.lz 91450 BLAKE2B 9ce2324c30ce3236689236ff2f7079d89078c61c4c78efef8c7c34fad2351fdc59a67a1ef995b3ec1b64620f7262563126c0305e3ffda3c5ec04ee5cf4c39a05 SHA512 6cf4c97c4dbbc3a623192de2da261e4854dc3082a26d9731fd00feb8ed371cb18d41f5a8ed992f98e2a00aed68d60f1f3aa90b05f8472431fcf5bc5e3d10e70c
+EBUILD ocrad-0.22.ebuild 755 BLAKE2B 62d679bb3aaabc86bd3eb8203f75066c35c7ea2b8ea6e6ec559c0b3425ebe7216bc3eef63b7b35d10ab3dcded6a7c9cdb582f5dc8ca7a2250580b97a21ce7db1 SHA512 e02df78e5516f824beb87e565c5116a7c66d19e7593831bc389148c14c85c399297ca545c2f62bfe6fbbc21bf47f4a5b82b9761a37c52babb0e46aa30abb2bc9
+EBUILD ocrad-0.23.ebuild 759 BLAKE2B 9952240e1dc307457daba5636f128127f479fd32427e59d96f23f91beb7fd27b0dd5f3e2c2b3a54e1fe0afb0ef2545e8903e34d2f2634073ae7fc7a27799b374 SHA512 ec14af5534f218db1fdb7943b65f69abc376709adcf8d8f00603f1969e60476fdd189dbc5fd413cec8ea43eb443f4d833b120bfa7cfc2d04a42fe28414c135bb
+EBUILD ocrad-0.24.ebuild 759 BLAKE2B 18751b6660fb528bf1eca49184864a1099f0b52acd5bed3465e5e9baed6c671bb7f8ea467286f9a871232e36203e345c2e537f00f19084fb8911cca034397399 SHA512 65ce48702e9f29b5b6d1184c0a4aa807c1226c2d54d710fdcea6365f3fad0c2ae22a1f528a74e04452297efb337904ad5462825be8dbc8bd46bfb208bd762838
+EBUILD ocrad-0.25.ebuild 759 BLAKE2B 4b2c75d5dcef0c50916a20488bbad6b7e6795d4149f7b2dbd6ebf8c2bbe8f9364082be5922b112c4ab3849b5d5adc586d530960abe20e694a57c858d7a0ab439 SHA512 ba8a7d8c05290255a59954645050cc93e991657e38fa0e02f9f7929420226edf4fa95eec01f8736c6cad5707b0a89ed27e439e559173f34c22ea89bbc68c66c0
+EBUILD ocrad-0.26.ebuild 759 BLAKE2B fd4da36e30b933bc7993e9bd01671238c2a1beffe522286f5e7ffad2a37363c1249a2751a2dcf9ecec7c82676114d5d105277a7237091815eea5b26070659ab7 SHA512 1680e6b2f64cb164596bd89339da1ec86f4facb4c6944f2374b883318ca4da8f9037aa0f26c01086cc5b15b9ca7f8e89d5d15f1640405e249613121832a1abfd
+MISC metadata.xml 496 BLAKE2B 08ddfa7a7988624d9d48b627c5f29205a0615b73e956d9520f53ac0be56bf64303474fffbe02236c8c18a8cd3e0b5573d08c1f42a37d09a7f57e69f043867e17 SHA512 702db4a3d253c553bb6ca651e80da98099fa6bb275e3b166eb43f7324a9165a6d2db397b9339ad2909d6c276029a8dbfab63bb7d8087dfe2c78345b7ed8088c0
diff --git a/app-text/ocrad/metadata.xml b/app-text/ocrad/metadata.xml
new file mode 100644
index 000000000000..40249c58ed5b
--- /dev/null
+++ b/app-text/ocrad/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>tex@gentoo.org</email>
+	<name>Gentoo TeX Project</name>
+</maintainer>
+<longdescription>GNU Ocrad is an OCR (Optical Character Recognition)
+program impleme nted as a filter and based on a feature extraction
+method. It reads a bitmap ima ge in pbm format and outputs text in
+ISO-8859-1 (Latin-1) charset.</longdescription>
+</pkgmetadata>
diff --git a/app-text/ocrad/ocrad-0.22.ebuild b/app-text/ocrad/ocrad-0.22.ebuild
new file mode 100644
index 000000000000..289635030861
--- /dev/null
+++ b/app-text/ocrad/ocrad-0.22.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit unpacker toolchain-funcs
+
+DESCRIPTION="GNU Ocrad is an OCR (Optical Character Recognition) program"
+HOMEPAGE="https://www.gnu.org/software/ocrad/ocrad.html"
+SRC_URI="mirror://nongnu/${PN}/${P}.tar.lz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha amd64 ppc ~ppc64 sparc x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="$(unpacker_src_uri_depends)"
+
+DOCS="AUTHORS ChangeLog NEWS README"
+
+src_configure() {
+	# ./configure is not based on autotools
+	./configure \
+		CPPFLAGS="${CPPFLAGS}" \
+		CXX="$(tc-getCXX)" \
+		CXXFLAGS="${CXXFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
+		--prefix=/usr
+}
+
+src_install() {
+	default
+	doman doc/${PN}.1
+	doinfo doc/${PN}.info
+}
diff --git a/app-text/ocrad/ocrad-0.23.ebuild b/app-text/ocrad/ocrad-0.23.ebuild
new file mode 100644
index 000000000000..2f4bea7172dc
--- /dev/null
+++ b/app-text/ocrad/ocrad-0.23.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit unpacker toolchain-funcs
+
+DESCRIPTION="GNU Ocrad is an OCR (Optical Character Recognition) program"
+HOMEPAGE="https://www.gnu.org/software/ocrad/ocrad.html"
+SRC_URI="mirror://nongnu/${PN}/${P}.tar.lz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="$(unpacker_src_uri_depends)"
+
+DOCS="AUTHORS ChangeLog NEWS README"
+
+src_configure() {
+	# ./configure is not based on autotools
+	./configure \
+		CPPFLAGS="${CPPFLAGS}" \
+		CXX="$(tc-getCXX)" \
+		CXXFLAGS="${CXXFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
+		--prefix=/usr
+}
+
+src_install() {
+	default
+	doman doc/${PN}.1
+	doinfo doc/${PN}.info
+}
diff --git a/app-text/ocrad/ocrad-0.24.ebuild b/app-text/ocrad/ocrad-0.24.ebuild
new file mode 100644
index 000000000000..2ccbc7b1dfe4
--- /dev/null
+++ b/app-text/ocrad/ocrad-0.24.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit unpacker toolchain-funcs
+
+DESCRIPTION="GNU Ocrad is an OCR (Optical Character Recognition) program"
+HOMEPAGE="https://www.gnu.org/software/ocrad/ocrad.html"
+SRC_URI="mirror://nongnu/${PN}/${P}.tar.lz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="$(unpacker_src_uri_depends)"
+
+DOCS="AUTHORS ChangeLog NEWS README"
+
+src_configure() {
+	# ./configure is not based on autotools
+	./configure \
+		CPPFLAGS="${CPPFLAGS}" \
+		CXX="$(tc-getCXX)" \
+		CXXFLAGS="${CXXFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
+		--prefix=/usr
+}
+
+src_install() {
+	default
+	doman doc/${PN}.1
+	doinfo doc/${PN}.info
+}
diff --git a/app-text/ocrad/ocrad-0.25.ebuild b/app-text/ocrad/ocrad-0.25.ebuild
new file mode 100644
index 000000000000..84c6fa87268e
--- /dev/null
+++ b/app-text/ocrad/ocrad-0.25.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit unpacker toolchain-funcs
+
+DESCRIPTION="GNU Ocrad is an OCR (Optical Character Recognition) program"
+HOMEPAGE="https://www.gnu.org/software/ocrad/ocrad.html"
+SRC_URI="mirror://nongnu/${PN}/${P}.tar.lz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="$(unpacker_src_uri_depends)"
+
+DOCS="AUTHORS ChangeLog NEWS README"
+
+src_configure() {
+	# ./configure is not based on autotools
+	./configure \
+		CPPFLAGS="${CPPFLAGS}" \
+		CXX="$(tc-getCXX)" \
+		CXXFLAGS="${CXXFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
+		--prefix=/usr
+}
+
+src_install() {
+	default
+	doman doc/${PN}.1
+	doinfo doc/${PN}.info
+}
diff --git a/app-text/ocrad/ocrad-0.26.ebuild b/app-text/ocrad/ocrad-0.26.ebuild
new file mode 100644
index 000000000000..1dc0d0045405
--- /dev/null
+++ b/app-text/ocrad/ocrad-0.26.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit unpacker toolchain-funcs
+
+DESCRIPTION="GNU Ocrad is an OCR (Optical Character Recognition) program"
+HOMEPAGE="https://www.gnu.org/software/ocrad/ocrad.html"
+SRC_URI="mirror://nongnu/${PN}/${P}.tar.lz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="$(unpacker_src_uri_depends)"
+
+DOCS="AUTHORS ChangeLog NEWS README"
+
+src_configure() {
+	# ./configure is not based on autotools
+	./configure \
+		CPPFLAGS="${CPPFLAGS}" \
+		CXX="$(tc-getCXX)" \
+		CXXFLAGS="${CXXFLAGS}" \
+		LDFLAGS="${LDFLAGS}" \
+		--prefix=/usr
+}
+
+src_install() {
+	default
+	doman doc/${PN}.1
+	doinfo doc/${PN}.info
+}
diff --git a/app-text/odt2txt-0.4-r1 b/app-text/odt2txt-0.4-r1
deleted file mode 100644
index cda34e2c18ae..000000000000
--- a/app-text/odt2txt-0.4-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=!app-office/unoconv sys-libs/zlib virtual/libiconv sys-apps/groff
-DESCRIPTION=A simple converter from OpenDocument Text to plain text
-EAPI=4
-HOMEPAGE=http://stosberg.net/odt2txt/
-KEYWORDS=alpha amd64 ia64 ~ppc64 sparc x86 ~x86-macos
-LICENSE=GPL-2
-RDEPEND=!app-office/unoconv sys-libs/zlib virtual/libiconv
-SLOT=0
-SRC_URI=http://stosberg.net/odt2txt/odt2txt-0.4.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=fdd7d3f8631a782a0a256a55900ec233
diff --git a/app-text/odt2txt-0.5 b/app-text/odt2txt-0.5
deleted file mode 100644
index 16bf53daca0e..000000000000
--- a/app-text/odt2txt-0.5
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=!app-office/unoconv sys-libs/zlib virtual/libiconv sys-apps/groff
-DESCRIPTION=A simple converter from OpenDocument Text to plain text
-EAPI=6
-HOMEPAGE=http://stosberg.net/odt2txt/
-KEYWORDS=alpha amd64 ia64 ppc64 ~sparc x86 ~x86-macos
-LICENSE=GPL-2
-RDEPEND=!app-office/unoconv sys-libs/zlib virtual/libiconv
-SLOT=0
-SRC_URI=https://github.com/dstosberg/odt2txt/archive/v0.5.tar.gz -> odt2txt-0.5.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=43618080135a5bfea5ad599de1b048ac
diff --git a/app-text/odt2txt/Manifest b/app-text/odt2txt/Manifest
new file mode 100644
index 000000000000..6c38c805d78c
--- /dev/null
+++ b/app-text/odt2txt/Manifest
@@ -0,0 +1,7 @@
+AUX odt2txt-0.4-darwin_iconv.patch 366 BLAKE2B 37fa3b5710de1df1760960ffc4b4e00773464bcb63408f3bc03968ad4e758420f508165f6d450bc25bb034f85317dd3a001e13d3694fa9fa3ad77606579c9d20 SHA512 0341c6d4d06b96766e35f55358f26ed52d8eb456f853cd83b098fb3e2adae690bc47090dfd8a1a66f9d24c77586a9fb7151cbe9695dcbdc3f9eef8f5d81b5762
+AUX odt2txt-0.5-darwin_iconv.patch 366 BLAKE2B 37fa3b5710de1df1760960ffc4b4e00773464bcb63408f3bc03968ad4e758420f508165f6d450bc25bb034f85317dd3a001e13d3694fa9fa3ad77606579c9d20 SHA512 0341c6d4d06b96766e35f55358f26ed52d8eb456f853cd83b098fb3e2adae690bc47090dfd8a1a66f9d24c77586a9fb7151cbe9695dcbdc3f9eef8f5d81b5762
+DIST odt2txt-0.4.tar.gz 23997 BLAKE2B ffa2ac915c1c239cfa7a498fa1597a2462bc7ecd2fb08a90ab50f21a60dbde8abffa52f4b4c40591732f7d497f08774555b36d880214a7708f2c05b692a18908 SHA512 65642dccdb08408e34d484d78be9777aa374cdabbcadd2ab54f43df29db506b136f13e5af720b9b6b6cfdb8508e4fab44159302d35fc002a22979efabf69bfc4
+DIST odt2txt-0.5.tar.gz 24460 BLAKE2B 703dd48447aa38a9a8bc0989231adf6f3dcf2796cb730feef6649cd14bff0265b12d6dba258a2779911f908a8ec322c5543b43222676e78ff12246daa3753b40 SHA512 95d782a088908518191dd0dcd294676fff25c95a2f23a2b8577b8e3adcce2f9d6d5ccaa2a02c7d36be19d05687a4d7a43bed36056c044af0934af810363c7ce0
+EBUILD odt2txt-0.4-r1.ebuild 726 BLAKE2B 03a906d6431d1dda4f291c6be4d961dd235bebda7cc72885292d74eb3ef6897ac68408709c0ac818668d5ce53c3a3a28833a150be5a7d05154644bed7c3f6e21 SHA512 832fffdd8c1f62f71215d804541fe0e041726acc8a1964f3733afad1ad30d08f7fc7075c28ea8d7764225c1dea7cd086343e1b40e345040b9d45594d1911d877
+EBUILD odt2txt-0.5.ebuild 734 BLAKE2B ced2ae39bbf6a14ac6a03fcd04c319ccf818fda352f10a08fdd73e5a56b1e4708bbe1a1deb710eeecba8383e9d830e7798efe26354786d0c0d7988f3ecdf5f69 SHA512 11bd6caddec71145458b7b28198677fc3617224dcd67ea2d675db3ba368fd670155deb0ff36e366fc63c6d951ce6eb9ab88c9d534db0361a5d7f07e39325e1b2
+MISC metadata.xml 167 BLAKE2B ee34aa7c86910531f97e3ba5ec71670012761b3523ddf4e0e1fccb2134b6ddaabdc9329c3b45d697b4f745a707dd513f6b71a8cd32fb840a6b0b5af774ac0015 SHA512 bb251ebe24a6b0c9ff8ee0298e1aa3653443fc97bf44ff71ff56b88b82c36696a5db75c19cb345a1852e6a455874c603efff97b15799d7e8a224124a312df8b8
diff --git a/app-text/odt2txt/files/odt2txt-0.4-darwin_iconv.patch b/app-text/odt2txt/files/odt2txt-0.4-darwin_iconv.patch
new file mode 100644
index 000000000000..05957269888e
--- /dev/null
+++ b/app-text/odt2txt/files/odt2txt-0.4-darwin_iconv.patch
@@ -0,0 +1,14 @@
+diff -ur odt2txt-0.4/Makefile odt2txt-0.4/Makefile
+--- odt2txt-0.4/Makefile	2008-06-23 23:32:28 +0400
++++ odt2txt-0.4/Makefile	2010-05-24 15:39:16 +0400
+@@ -56,6 +56,9 @@
+ 	CFLAGS += -I$(ZLIB_DIR)
+ 	LIBS = $(ZLIB_DIR)/libz.a
+ endif
++ifeq ($(UNAME_S),Darwin)
++	LIBS += -liconv
++endif
+ ifeq ($(UNAME_O),Cygwin)
+ 	CFLAGS += -DICONV_CHAR="const char"
+ 	LIBS += -liconv
+
diff --git a/app-text/odt2txt/files/odt2txt-0.5-darwin_iconv.patch b/app-text/odt2txt/files/odt2txt-0.5-darwin_iconv.patch
new file mode 100644
index 000000000000..05957269888e
--- /dev/null
+++ b/app-text/odt2txt/files/odt2txt-0.5-darwin_iconv.patch
@@ -0,0 +1,14 @@
+diff -ur odt2txt-0.4/Makefile odt2txt-0.4/Makefile
+--- odt2txt-0.4/Makefile	2008-06-23 23:32:28 +0400
++++ odt2txt-0.4/Makefile	2010-05-24 15:39:16 +0400
+@@ -56,6 +56,9 @@
+ 	CFLAGS += -I$(ZLIB_DIR)
+ 	LIBS = $(ZLIB_DIR)/libz.a
+ endif
++ifeq ($(UNAME_S),Darwin)
++	LIBS += -liconv
++endif
+ ifeq ($(UNAME_O),Cygwin)
+ 	CFLAGS += -DICONV_CHAR="const char"
+ 	LIBS += -liconv
+
diff --git a/app-text/odt2txt/metadata.xml b/app-text/odt2txt/metadata.xml
new file mode 100644
index 000000000000..684b678e70f5
--- /dev/null
+++ b/app-text/odt2txt/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
+
diff --git a/app-text/odt2txt/odt2txt-0.4-r1.ebuild b/app-text/odt2txt/odt2txt-0.4-r1.ebuild
new file mode 100644
index 000000000000..180584feabd5
--- /dev/null
+++ b/app-text/odt2txt/odt2txt-0.4-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="A simple converter from OpenDocument Text to plain text"
+HOMEPAGE="http://stosberg.net/odt2txt/"
+SRC_URI="http://stosberg.net/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ia64 ~ppc64 sparc x86 ~x86-macos"
+IUSE=""
+
+RDEPEND="
+	!app-office/unoconv
+	sys-libs/zlib
+	virtual/libiconv
+"
+DEPEND="${RDEPEND}
+	sys-apps/groff
+"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-darwin_iconv.patch
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	emake install DESTDIR="${D}" PREFIX=/usr
+	doman odt2txt.1
+}
diff --git a/app-text/odt2txt/odt2txt-0.5.ebuild b/app-text/odt2txt/odt2txt-0.5.ebuild
new file mode 100644
index 000000000000..1931fab8e2e6
--- /dev/null
+++ b/app-text/odt2txt/odt2txt-0.5.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="A simple converter from OpenDocument Text to plain text"
+HOMEPAGE="http://stosberg.net/odt2txt/"
+SRC_URI="https://github.com/dstosberg/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ia64 ppc64 ~sparc x86 ~x86-macos"
+IUSE=""
+
+RDEPEND="
+	!app-office/unoconv
+	sys-libs/zlib
+	virtual/libiconv
+"
+DEPEND="${RDEPEND}
+	sys-apps/groff
+"
+PATCHES="${FILESDIR}/${P}-darwin_iconv.patch"
+
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	emake install DESTDIR="${D}" PREFIX=/usr
+	doman odt2txt.1
+}
diff --git a/app-text/openjade-1.3.2-r7 b/app-text/openjade-1.3.2-r7
deleted file mode 100644
index 8c80dce43b35..000000000000
--- a/app-text/openjade-1.3.2-r7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare prerm unpack
-DEPEND=dev-lang/perl app-text/sgml-common >=app-text/opensp-1.5.1 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=app-text/sgml-common-0.6.3-r2
-DESCRIPTION=Jade is an implementation of DSSSL for formatting SGML and XML documents
-EAPI=5
-HOMEPAGE=http://openjade.sourceforge.net
-IUSE=static-libs
-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
-LICENSE=MIT
-RDEPEND=app-text/sgml-common >=app-text/opensp-1.5.1
-SLOT=0
-SRC_URI=mirror://sourceforge/openjade/openjade-1.3.2.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	sgml-catalog	1ca36a4ae32c67b390f310dd6d7b1189	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=10483a1c964acfa0518908e1dc4d128a
diff --git a/app-text/openjade/Manifest b/app-text/openjade/Manifest
new file mode 100644
index 000000000000..59cfd3f7d1db
--- /dev/null
+++ b/app-text/openjade/Manifest
@@ -0,0 +1,13 @@
+AUX openjade-1.3.2-acinclude.m4 1922 BLAKE2B 1fe4500e45ffa14774b1c20257907732b9ff593c2a31146929859bc16cd9ac66619093a725bc60e1e7c1af812d4d1f87ab2742c737a424f95b43c3fd4e15aaca SHA512 76915d34e746f85eb15d2c79cc7a030070e5d266e3b2520d2321195f19c13aebc9a28fc4298006ab90a73148baebda568b3dc29517505224b78a8c244c2c0fdb
+AUX openjade-1.3.2-deplibs.patch 1506 BLAKE2B 44b81cd550202a21489bf14a1ddf6be2f27f3675671e644ddbec8580394d956a76f5d6d82cc4be7bd7bbf8d180c278675c0274cc79431553e7123b9448db3e07 SHA512 4a7df423c8b8ad15a1a39900c1bb6882157534c981a9c0679b2c6d71a435b6bf3adf27052799a9eb1dd4f6ecd7e19be72889d9a55c7511ffde9dd11f4c558d9e
+AUX openjade-1.3.2-gcc46.patch 2164 BLAKE2B 08d9ac31c20e3b2a27c92a0b14141404d7508a9cc269ca28e4af6405e7be560866df51e34270a98603b363aefc7ee1b0c7a3d6f882f0ec2f246bef4ab3a0b623 SHA512 df222938e4a04d27618540592e61b8d71fe42caaa4d8aeb90bfcd338efb1ff7903ea860dc460b65a69adf1ccf300a7d67459ff4950a35d9a35569fb8b3ed1438
+AUX openjade-1.3.2-ldflags.patch 819 BLAKE2B 8ac32c3d629c57439336830c58421463cd628d9cb13e43db7b734c83d26d35e8d18bd2f736ef620816f359d15955dade6ffca42a1fa583b67670f733cf0516cf SHA512 6112fbc474f0f2c3c024040b42b13290ba2763381b7f99071d7d9d4f8d11bf1087a2c319eba9f0006e2cc067a14a52cedde98444338b180f9566172b52c044ec
+AUX openjade-1.3.2-libosp-la.patch 1725 BLAKE2B 14521987d8c20c1276d72136c4ec046e35e1fc23b758d44e105c92cd31346c7bc53ca956b0f1f0385c8deaa6aaf6231ece753250560d117ca9c5d330e51bbdb1 SHA512 9b73b95ce3ac1d0042641eb0ddbb5ce753d2fd639dab026b9eab0f45bb3231515c69670f02c2a0793d950b6a6276f94e838d273f01e43694e97525af65903a0e
+AUX openjade-1.3.2-msggen.pl.patch 748 BLAKE2B 2329df5658b10bcd2e2e8986b7313b3c5256b4415e084ff3c189b4e0788430c138f76a5329446a78315acd4d6ab4582fcfd05792100d7a71d241c40353665825 SHA512 31f25e96bb3df3d8c0850a6ca2c2f0e59c19d23aa62a697ea475c9d2a5a36f5e1fcf807878ca7be5b57538b96d3295591466f1035edd9a885e035525f445b410
+AUX openjade-1.3.2-no-undefined.patch 434 BLAKE2B 69bf4b67166ef4253c88303ee0f682af0f09ccf4f3e3494f03119e1b17cfca9d37ca555ccac17a5b51946e2560fa43fecc408080aef812f4e0e20b5e3f645ff0 SHA512 fcabb03a649150a05b847fe9f367dffb8b2df4b8635bea8f50a433afb43bab4d6bc58c0bad705b84421d4c5e1d19e2df03065d89544d023c225c0f529f168656
+AUX openjade-1.3.2-respect-ldflags.patch 500 BLAKE2B 65c8a9a71b7141e6fa8d47220e4814b91c5cefeac551f028cbbedeaf773ae7597b100785a5f53d0a428e95b6b2d1d6e235ac2c52ee53bd16b6fecdd394f3234b SHA512 bca7e9550329bc033a1df4ca78bc1ae75b12f27fdecc6aafff136fd81c93f88045ca675dd03e711b4d428a3de832f3bfa703d639319a2b348a2f8268091658d8
+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 3678 BLAKE2B 477ff1defb0270a6e61b449c896d22b519acbf77f128b53fc45b09a07624cdbec1629e0e79844b9ee732d291323ed2faa772ab66d4e883a63aa5409a6a4e12bd SHA512 5e3678fa85225737b6880bcab51dd64160431cfc6603722a0112735a7cc2220cd98e5c10d05bd1fa9c3967fd8a3a5eb255f0ae20f4671e1b3ac7244f08fc4a34
+MISC metadata.xml 245 BLAKE2B f01e184cc74cf4d5924bc0d9eaf955adf9797f656ddc41a13443a9c2dbf158ee403dc6f0f39970aa736d87111017b593c93750542a2f2ad539d1a644c96f664e SHA512 5d2a537b74c248094a700b0eeed29425d8d62c36ae30fca3ea8381daf41f74284333344775a108ff374b94b9f334516aa41892a983c825efa855b35a0f110c40
diff --git a/app-text/openjade/files/openjade-1.3.2-acinclude.m4 b/app-text/openjade/files/openjade-1.3.2-acinclude.m4
new file mode 100644
index 000000000000..7bb6d2cb1f81
--- /dev/null
+++ b/app-text/openjade/files/openjade-1.3.2-acinclude.m4
@@ -0,0 +1,61 @@
+dnl Configure-time switch with default
+dnl
+dnl Each switch defines an --enable-FOO and --disable-FOO option in
+dnl the resulting configure script.
+dnl
+dnl Usage:
+dnl smr_SWITCH(name, description, default, pos-def, neg-def)
+dnl
+dnl where:
+dnl
+dnl name        name of switch; generates --enable-name & --disable-name
+dnl             options
+dnl description help string is set to this prefixed by "enable" or
+dnl             "disable", whichever is the non-default value
+dnl default     either "on" or "off"; specifies default if neither
+dnl             --enable-name nor --disable-name is specified
+dnl pos-def     a symbol to AC_DEFINE if switch is on (optional)
+dnl neg-def     a symbol to AC_DEFINE if switch is off (optional)
+dnl
+AC_DEFUN(smr_SWITCH, [
+    AC_MSG_CHECKING(whether to enable $2)
+    AC_ARG_ENABLE(
+        $1,
+        ifelse($3, on,
+            [  --disable-[$1]    disable [$2]],
+            [  --enable-[$1]     enable [$2]]),
+        [ if test "$enableval" = yes; then
+            AC_MSG_RESULT(yes)
+            ifelse($4, , , AC_DEFINE($4))
+        else
+            AC_MSG_RESULT(no)
+            ifelse($5, , , AC_DEFINE($5))
+        fi ],
+        ifelse($3, on,
+           [ AC_MSG_RESULT(yes)
+             ifelse($4, , , AC_DEFINE($4)) ],
+           [ AC_MSG_RESULT(no)
+            ifelse($5, , , AC_DEFINE($5))]))])
+
+dnl
+dnl Examine size_t and define SIZE_T_IS_UINT, if size_t is an unsigned int
+dnl
+AC_DEFUN(OJ_SIZE_T_IS_UINT,[
+	AC_REQUIRE([AC_TYPE_SIZE_T])
+	AC_MSG_CHECKING(whether size_t is unsigned int)
+	ac_cv_size_t_is_uint=no
+	AC_LANG_SAVE
+	AC_LANG_CPLUSPLUS
+	AC_TRY_COMPILE([#include <unistd.h>
+
+                       template<class T> class foo { };
+
+                        ], [
+			foo<size_t> x;
+			foo<unsigned int> y;
+			x = y;
+		],ac_cv_size_t_is_uint=yes)
+	AC_LANG_RESTORE
+	AC_MSG_RESULT($ac_cv_size_t_is_uint)
+	test "$ac_cv_size_t_is_uint" = "yes" && AC_DEFINE(SIZE_T_IS_UINT)
+])
diff --git a/app-text/openjade/files/openjade-1.3.2-deplibs.patch b/app-text/openjade/files/openjade-1.3.2-deplibs.patch
new file mode 100644
index 000000000000..3466ad7d85e3
--- /dev/null
+++ b/app-text/openjade/files/openjade-1.3.2-deplibs.patch
@@ -0,0 +1,40 @@
+diff -urNp openjade-1.3.2/grove/Makefile.sub devel/grove/Makefile.sub
+--- openjade-1.3.2/grove/Makefile.sub	2002-10-20 23:47:24.000000000 +0200
++++ devel/grove/Makefile.sub	2007-07-23 15:39:23.000000000 +0200
+@@ -1,4 +1,4 @@
+ LTVERSION=0:1:0
+ LIB=ogrove
+-DEPLIBS=-lm
++DEPLIBS=-lm -lstdc++
+ OBJS=Node.o LocNode.o
+diff -urNp openjade-1.3.2/spgrove/Makefile.sub devel/spgrove/Makefile.sub
+--- openjade-1.3.2/spgrove/Makefile.sub	2002-11-15 23:46:50.000000000 +0100
++++ devel/spgrove/Makefile.sub	2007-07-23 16:06:13.000000000 +0200
+@@ -1,9 +1,10 @@
+ LTVERSION=0:1:0
+ LIB=ospgrove
+ INCLUDE=-I$(srcdir)/../grove
+-DEPLIBS=-lm -L$(TOP)/grove -L$(TOP)/grove/.libs \
++DEPLIBS=$(TOP)/grove/libogrove.la \
++       -lm -losp -L$(TOP)/grove/.libs \
+ 	-L$(TOP)/lib -L$(TOP)/lib/.libs \
+-	$(LIB_THREADS)
++	$(LIB_THREADS) -lstdc++
+ OBJS=GroveApp.o GroveBuilder.o SdNode.o
+ GENSRCS=grove_inst.cxx
+ 
+diff -urNp openjade-1.3.2/style/Makefile.sub devel/style/Makefile.sub
+--- openjade-1.3.2/style/Makefile.sub	2003-04-18 19:18:10.000000000 +0200
++++ devel/style/Makefile.sub	2007-07-23 16:08:26.000000000 +0200
+@@ -1,8 +1,8 @@
+ LTVERSION=0:1:0
+ LIB=ostyle
+-DEPLIBS=-lm -L$(TOP)/grove -L$(TOP)/grove/.libs \
+-  -L$(TOP)/lib -L$(TOP)/lib/.libs \
+-  -L$(TOP)/spgrove -L$(TOP)/spgrove/.libs 
++DEPLIBS=$(TOP)/grove/libogrove.la $(TOP)/spgrove/libospgrove.la \
++  -lm -losp -L$(TOP)/lib -L$(TOP)/lib/.libs -L$(TOP)/grove/.libs \
++  -L$(TOP)/spgrove -L$(TOP)/spgrove/.libs -lstdc++
+ OBJS=LangObj.o \
+   Collector.o \
+   DssslApp.o \
diff --git a/app-text/openjade/files/openjade-1.3.2-gcc46.patch b/app-text/openjade/files/openjade-1.3.2-gcc46.patch
new file mode 100644
index 000000000000..e947ffe12f7f
--- /dev/null
+++ b/app-text/openjade/files/openjade-1.3.2-gcc46.patch
@@ -0,0 +1,74 @@
+--- openjade-1.3.2-orig//jade/TeXFOTBuilder.cxx	2011-05-02 22:08:49.274006803 +0000
++++ openjade-1.3.2-orig//jade/TeXFOTBuilder.cxx	2011-05-02 22:14:09.849006939 +0000
+@@ -88,6 +88,8 @@ 
+       value.convertString(nic_.placement);
+       }
+     ExtensionFlowObj *copy() const { return new PageFloatFlowObj(*this); }
++  public:
++    PageFloatFlowObj() {}
+   private:
+     PageFloatNIC nic_;
+     StringC name_;
+@@ -101,6 +103,8 @@ 
+       fotb.endPageFootnote();
+     }
+     ExtensionFlowObj *copy() const { return new PageFootnoteFlowObj(*this); }
++  public:
++    PageFootnoteFlowObj() {}
+   private:
+   };
+   //////////////////////////////////////////////////////////////////////
+--- openjade-1.3.2-orig//jade/TransformFOTBuilder.cxx	2011-05-02 22:08:49.275006803 +0000
++++ openjade-1.3.2-orig//jade/TransformFOTBuilder.cxx	2011-05-02 22:18:31.614007052 +0000
+@@ -41,6 +41,7 @@ 
+   };
+   class EntityRefFlowObj : public TransformExtensionFlowObj {
+   public:
++    EntityRefFlowObj() {}
+     void atomic(TransformFOTBuilder &fotb, const NodePtr &) const {
+       fotb.entityRef(name_);
+     }
+@@ -56,6 +57,7 @@ 
+   };
+   class ProcessingInstructionFlowObj : public TransformExtensionFlowObj {
+   public:
++    ProcessingInstructionFlowObj() {}
+     void atomic(TransformFOTBuilder &fotb, const NodePtr &) const {
+       fotb.processingInstruction(data_);
+     }
+@@ -98,6 +100,8 @@ 
+       }
+     }
+     ExtensionFlowObj *copy() const { return new EmptyElementFlowObj(*this); }
++  public:
++    EmptyElementFlowObj() {}
+   private:
+     ElementNIC nic_;
+   };
+@@ -133,6 +137,8 @@ 
+       }
+     }
+     ExtensionFlowObj *copy() const { return new ElementFlowObj(*this); }
++  public:
++    ElementFlowObj() {}
+   private:
+     ElementNIC nic_;
+   };
+@@ -150,6 +156,8 @@ 
+       value.convertString(systemId_);
+     }
+     ExtensionFlowObj *copy() const { return new EntityFlowObj(*this); }
++  public:
++    EntityFlowObj() {};
+   private:
+     StringC systemId_;
+   };
+@@ -174,6 +182,8 @@ 
+       }
+     }
+     ExtensionFlowObj *copy() const { return new DocumentTypeFlowObj(*this); }
++  public:
++    DocumentTypeFlowObj() {}
+   private:
+     DocumentTypeNIC nic_;
+   };
diff --git a/app-text/openjade/files/openjade-1.3.2-ldflags.patch b/app-text/openjade/files/openjade-1.3.2-ldflags.patch
new file mode 100644
index 000000000000..4ddd4d414854
--- /dev/null
+++ b/app-text/openjade/files/openjade-1.3.2-ldflags.patch
@@ -0,0 +1,13 @@
+Index: openjade-1.3.2/jade/Makefile.sub
+===================================================================
+--- openjade-1.3.2.orig/jade/Makefile.sub
++++ openjade-1.3.2/jade/Makefile.sub
+@@ -4,7 +4,7 @@ OBJS=jade.o SgmlFOTBuilder.o RtfFOTBuild
+ INCLUDE=-I$(srcdir)/../grove -I$(srcdir)/../spgrove -I$(srcdir)/../style
+ # XLIBS=../style/libostyle.a ../spgrove/libospgrove.a ../grove/libogrove.a \
+ #   ../lib/libosp.a
+-XLIBS=../style/libostyle.a ../spgrove/libospgrove.a ../grove/libogrove.a $(splibdir)/libosp.a
++XLIBS=../style/libostyle.a ../grove/libogrove.a ../spgrove/libospgrove.a $(splibdir)/libosp.a
+ GENSRCS=JadeMessages.h HtmlMessages.h RtfMessages.h TeXMessages.h \
+  HtmlFOTBuilder_inst.cxx RtfFOTBuilder_inst.cxx  TeXFOTBuilder_inst.cxx \
+  TransformFOTBuilder_inst.cxx MifMessages.h MifFOTBuilder_inst.cxx
diff --git a/app-text/openjade/files/openjade-1.3.2-libosp-la.patch b/app-text/openjade/files/openjade-1.3.2-libosp-la.patch
new file mode 100644
index 000000000000..d106771b599d
--- /dev/null
+++ b/app-text/openjade/files/openjade-1.3.2-libosp-la.patch
@@ -0,0 +1,38 @@
+diff -u /var/tmp/portage/app-text/openjade-1.3.2-r1/work/openjade-1.3.2/jade/Makefile.sub /tmp/buffer-content-5978gFR
+--- a/jade/Makefile.sub	2009-11-19 17:21:46.000000000 -0500
++++ b/jade/Makefile.sub	2009-11-19 17:23:24.000000000 -0500
+@@ -4,7 +4,8 @@
+ INCLUDE=-I$(srcdir)/../grove -I$(srcdir)/../spgrove -I$(srcdir)/../style
+ # XLIBS=../style/libostyle.a ../spgrove/libospgrove.a ../grove/libogrove.a \
+ #   ../lib/libosp.a
+-XLIBS=../style/libostyle.a ../grove/libogrove.a ../spgrove/libospgrove.a $(splibdir)/libosp.a
++XLIBS=../style/libostyle.a ../grove/libogrove.a ../spgrove/libospgrove.a -losp
++EXT_LIBS=-L$(splibdir) -losp $(LIBS)
+ GENSRCS=JadeMessages.h HtmlMessages.h RtfMessages.h TeXMessages.h \
+  HtmlFOTBuilder_inst.cxx RtfFOTBuilder_inst.cxx  TeXFOTBuilder_inst.cxx \
+  TransformFOTBuilder_inst.cxx MifMessages.h MifFOTBuilder_inst.cxx
+
+
+diff -u /var/tmp/portage/app-text/openjade-1.3.2-r1/work/openjade-1.3.2/Makefile.prog.in /tmp/buffer-content-5978T7K
+--- a/Makefile.prog.in	2002-01-22 06:57:53.000000000 -0500
++++ b/Makefile.prog.in	2009-11-19 17:23:05.000000000 -0500
+@@ -10,16 +10,15 @@
+ top_builddir=@TOP@
+ LINKFLAGS = @LINKFLAGS@
+ 
+-ALL_LIBS = $(XLIBS) $(LIBS)
+ Makefile.lt:
+-	echo 'LT_LIBS='`echo $(ALL_LIBS)|sed 's/\.a/.la/g'` >Makefile.lt
++	echo 'LT_LIBS='`echo $(XLIBS)|sed 's/\.a/.la/g'` >Makefile.lt
+ 
+ PROG:=$(shell echo "$(PROG)" | sed '@program_transform_name@')
+ 
+ all: $(PROG)
+ 
+ $(PROG): $(OBJS) $(COBJS) $(LT_LIBS)
+-	$(LIBTOOL) --mode=link $(CXX) $(LINKFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(COBJS) $(LT_LIBS)
++	$(LIBTOOL) --mode=link $(CXX) $(LINKFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(COBJS) $(LT_LIBS) $(EXT_LIBS)
+ 
+ install: $(PROG)
+ 	-test -d $(DESTDIR)$(bindir) || \
+
diff --git a/app-text/openjade/files/openjade-1.3.2-msggen.pl.patch b/app-text/openjade/files/openjade-1.3.2-msggen.pl.patch
new file mode 100644
index 000000000000..1afe68b800e9
--- /dev/null
+++ b/app-text/openjade/files/openjade-1.3.2-msggen.pl.patch
@@ -0,0 +1,32 @@
+Use Getopt::Std in place of getopts.pl.
+https://bugs.gentoo.org/show_bug.cgi?id=420083
+
+--- a/msggen.pl
++++ b/msggen.pl
+@@ -4,6 +4,7 @@
+ # See the file COPYING for copying permission.
+ 
+ use POSIX;
++use Getopt::Std;
+ 
+ # Package and version.
+ $package = 'openjade';
+@@ -18,8 +19,7 @@
+ undef $opt_l;
+ undef $opt_p;
+ undef $opt_t;
+-do 'getopts.pl';
+-&Getopts('l:p:t:');
++getopts('l:p:t:');
+ $module = $opt_l;
+ $pot_file = $opt_p;
+ 
+@@ -72,7 +72,7 @@
+     else {
+ 	$field[0] =~ /^[IWQXE][0-9]$/ || &error("invalid first field");;
+ 	$type[$num] = substr($field[0], 0, 1);
+-	$argc = int(substr($field[0], 1, 1));
++	$argc = substr($field[0], 1, 1);
+     }
+     $nargs[$num] = $argc;
+     $field[1] =~ /^[a-zA-Z_][a-zA-Z0-9_]+$/ || &error("invalid tag");
diff --git a/app-text/openjade/files/openjade-1.3.2-no-undefined.patch b/app-text/openjade/files/openjade-1.3.2-no-undefined.patch
new file mode 100644
index 000000000000..1b298f88a6f8
--- /dev/null
+++ b/app-text/openjade/files/openjade-1.3.2-no-undefined.patch
@@ -0,0 +1,11 @@
+--- Makefile.lib.in.orig	2016-05-19 17:20:25.164931700 +0200
++++ Makefile.lib.in	2016-05-19 17:20:56.539989400 +0200
+@@ -24,7 +24,7 @@
+ 
+ lib$(LIB).la: $(LT_OBJS)
+ 	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) $(LINKFLAGS) -o lib$(LIB).la $(LT_OBJS) \
+-	    -rpath $(libdir) -version-info $(LTVERSION) $(DEPLIBS)
++	    -no-undefined -rpath $(libdir) -version-info $(LTVERSION) $(DEPLIBS)
+ 
+ install:
+ 	$(mkinstalldirs) $(DESTDIR)$(libdir)
diff --git a/app-text/openjade/files/openjade-1.3.2-respect-ldflags.patch b/app-text/openjade/files/openjade-1.3.2-respect-ldflags.patch
new file mode 100644
index 000000000000..51bd0b27dd42
--- /dev/null
+++ b/app-text/openjade/files/openjade-1.3.2-respect-ldflags.patch
@@ -0,0 +1,12 @@
+diff -ru a/Makefile.lib.in b/Makefile.lib.in
+--- a/Makefile.lib.in	2002-01-22 05:57:53.000000000 -0600
++++ b/Makefile.lib.in	2009-01-04 16:15:41.000000000 -0600
+@@ -23,7 +23,7 @@
+ 	echo 'LT_OBJS='`echo $(OBJS)|sed 's/\.o/.lo/g'` >Makefile.lt
+ 
+ lib$(LIB).la: $(LT_OBJS)
+-	$(LIBTOOL) --mode=link $(CC) $(LINKFLAGS) -o lib$(LIB).la $(LT_OBJS) \
++	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) $(LINKFLAGS) -o lib$(LIB).la $(LT_OBJS) \
+ 	    -rpath $(libdir) -version-info $(LTVERSION) $(DEPLIBS)
+ 
+ install:
diff --git a/app-text/openjade/files/openjade-1.3.2-wchar_t-uint.patch b/app-text/openjade/files/openjade-1.3.2-wchar_t-uint.patch
new file mode 100644
index 000000000000..62dcb02cd2ec
--- /dev/null
+++ b/app-text/openjade/files/openjade-1.3.2-wchar_t-uint.patch
@@ -0,0 +1,26 @@
+This fixes Cygwin, where wchar_t is ushort.
+
+--- grove/Node.h
++++ grove/Node.h
+@@ -8,6 +8,7 @@
+ #endif
+ 
+ #include <stddef.h>
++#include <limits.h>
+ #include "IList.h"
+ 
+ #ifdef SP_USE_DLL
+@@ -34,10 +35,10 @@
+ #endif
+ 
+ #ifdef SP_MULTI_BYTE
+-#ifdef SP_WCHAR_T_USHORT
+-typedef wchar_t GroveChar;
+-#else
++#if UINT_MAX >= 0xffffffffL /* 2^32 - 1 */
+ typedef unsigned int GroveChar;
++#else
++typedef unsigned long GroveChar;
+ #endif
+ #else /* not SP_MULTI_BYTE */
+ typedef unsigned char GroveChar;
diff --git a/app-text/openjade/files/openjade-1.3.2.dsssl-catalog b/app-text/openjade/files/openjade-1.3.2.dsssl-catalog
new file mode 100644
index 000000000000..11bc0425afe0
--- /dev/null
+++ b/app-text/openjade/files/openjade-1.3.2.dsssl-catalog
@@ -0,0 +1,4 @@
+PUBLIC "-//James Clark//DTD DSSSL Flow Object Tree//EN" "fot.dtd"
+PUBLIC "ISO/IEC 10179:1996//DTD DSSSL Architecture//EN" "dsssl.dtd"
+PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" "style-sheet.dtd"
+PUBLIC "-//OpenJade//DTD DSSSL Style Sheet//EN" "style-sheet.dtd"
diff --git a/app-text/openjade/metadata.xml b/app-text/openjade/metadata.xml
new file mode 100644
index 000000000000..a4a5fdce9de1
--- /dev/null
+++ b/app-text/openjade/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="sourceforge">openjade</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/openjade/openjade-1.3.2-r7.ebuild b/app-text/openjade/openjade-1.3.2-r7.ebuild
new file mode 100644
index 000000000000..15297e079041
--- /dev/null
+++ b/app-text/openjade/openjade-1.3.2-r7.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5  # sgml-catalog inherits base, banned in 6
+
+inherit autotools sgml-catalog eutils flag-o-matic multilib toolchain-funcs
+
+DESCRIPTION="Jade is an implementation of DSSSL for formatting SGML and XML documents"
+HOMEPAGE="http://openjade.sourceforge.net"
+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"
+IUSE="static-libs"
+
+RDEPEND="app-text/sgml-common
+	>=app-text/opensp-1.5.1"
+DEPEND="dev-lang/perl
+	${RDEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-deplibs.patch
+	epatch "${FILESDIR}"/${P}-ldflags.patch
+	epatch "${FILESDIR}"/${P}-msggen.pl.patch
+	epatch "${FILESDIR}"/${P}-respect-ldflags.patch
+	epatch "${FILESDIR}"/${P}-libosp-la.patch
+	epatch "${FILESDIR}"/${P}-gcc46.patch
+	epatch "${FILESDIR}"/${P}-no-undefined.patch
+	epatch "${FILESDIR}"/${P}-wchar_t-uint.patch
+
+	# Please note!  Opts are disabled.  If you know what you're doing
+	# feel free to remove this line.  It may cause problems with
+	# docbook-sgml-utils among other things.
+	#ALLOWED_FLAGS="-O -O1 -O2 -pipe -g -march"
+	strip-flags
+
+	# Default CFLAGS and CXXFLAGS is -O2 but this make openjade segfault
+	# on hppa. Using -O1 works fine. So I force it here.
+	use hppa && replace-flags -O2 -O1
+
+	ln -s config/configure.in configure.ac || die
+	cp "${FILESDIR}"/${P}-acinclude.m4 acinclude.m4 || die
+	rm config/missing || die
+
+	AT_NOEAUTOMAKE=yes
+	eautoreconf
+
+	SGML_PREFIX="${EPREFIX}"/usr/share/sgml
+}
+
+src_configure() {
+	# avoids dead-store elimination optimization
+	# leading to segfaults on GCC 6
+	# bug #592590 #596506
+	tc-is-clang || append-cxxflags $(test-flags-CXX -fno-lifetime-dse)
+
+	# We need Prefix env, bug #287358
+	export CONFIG_SHELL="${CONFIG_SHELL:-${BASH}}"
+	econf \
+		--enable-http \
+		--enable-default-catalog="${EPREFIX}"/etc/sgml/catalog \
+		--enable-default-search-path="${EPREFIX}"/usr/share/sgml \
+		--enable-splibdir="${EPREFIX}"/usr/$(get_libdir) \
+		--libdir="${EPREFIX}"/usr/$(get_libdir) \
+		--datadir="${EPREFIX}"/usr/share/sgml/${P} \
+		$(use_enable static-libs static)
+}
+
+src_compile() {
+	# Bug 412725.
+	unset INCLUDE
+
+	emake -j1 SHELL="${BASH}"
+}
+
+src_install() {
+	insinto /usr/$(get_libdir)
+
+	make DESTDIR="${D}" \
+		SHELL="${BASH}" \
+		libdir="${EPREFIX}"/usr/$(get_libdir) \
+		install install-man
+
+	prune_libtool_files
+
+	dosym openjade  /usr/bin/jade
+	dosym onsgmls   /usr/bin/nsgmls
+	dosym osgmlnorm /usr/bin/sgmlnorm
+	dosym ospam     /usr/bin/spam
+	dosym ospent    /usr/bin/spent
+	dosym osx       /usr/bin/sgml2xml
+
+	insinto /usr/share/sgml/${P}/
+	doins dsssl/builtins.dsl
+
+	echo 'SYSTEM "builtins.dsl" "builtins.dsl"' > ${ED}/usr/share/sgml/${P}/catalog
+	insinto /usr/share/sgml/${P}/dsssl
+	doins dsssl/{dsssl.dtd,style-sheet.dtd,fot.dtd}
+	newins "${FILESDIR}"/${P}.dsssl-catalog catalog
+# Breaks sgml2xml among other things
+#	insinto /usr/share/sgml/${P}/unicode
+#	doins unicode/{catalog,unicode.sd,unicode.syn,gensyntax.pl}
+	insinto /usr/share/sgml/${P}/pubtext
+	doins pubtext/*
+
+	dodoc NEWS README VERSION
+	dohtml doc/*.htm
+
+	insinto /usr/share/doc/${PF}/jadedoc
+	doins jadedoc/*.htm
+	insinto /usr/share/doc/${PF}/jadedoc/images
+	doins jadedoc/images/*
+}
+
+sgml-catalog_cat_include "/etc/sgml/${P}.cat" \
+	"/usr/share/sgml/openjade-${PV}/catalog"
+sgml-catalog_cat_include "/etc/sgml/${P}.cat" \
+	"/usr/share/sgml/openjade-${PV}/dsssl/catalog"
+sgml-catalog_cat_include "/etc/sgml/sgml-docbook.cat" \
+	"/etc/sgml/${P}.cat"
diff --git a/app-text/openlp-2.4.6 b/app-text/openlp-2.4.6
deleted file mode 100644
index f8cafe4c032e..000000000000
--- a/app-text/openlp-2.4.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/alembic[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/beautifulsoup:4[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/chardet[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/lxml[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mako[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyenchant-1.3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyodbc dev-python/PyQt5[multimedia,gui,network,svg,webkit,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sip[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sqlalchemy-0.5[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sqlalchemy-migrate[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_4? ( dev-lang/python:3.4[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Free church presentation software
-EAPI=6
-HOMEPAGE=https://openlp.org/
-IUSE=python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=dev-python/alembic[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/beautifulsoup:4[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/chardet[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/lxml[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mako[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyenchant-1.3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyodbc dev-python/PyQt5[multimedia,gui,network,svg,webkit,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sip[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sqlalchemy-0.5[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sqlalchemy-migrate[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_4? ( dev-lang/python:3.4[sqlite] ) python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://get.openlp.org/2.4.6/OpenLP-2.4.6.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=82e2875d95be94ff95ce87e082b05666
diff --git a/app-text/openlp/Manifest b/app-text/openlp/Manifest
new file mode 100644
index 000000000000..1c8a4f6bc5cd
--- /dev/null
+++ b/app-text/openlp/Manifest
@@ -0,0 +1,4 @@
+AUX OpenLP-2.4.2-disable-tests.patch 795 BLAKE2B 0741116f289c1ec368e401d66a798f87124971c069921813f71518155e78f04b6fa097686899c809f8cab84084ab1fde2141d30ba74e4f940c2bd2647069c939 SHA512 ac67c675a4793be0194ccdc522737de0fd2b7b008707c19cfb5dd4fd1c17e88a59c0d38cdfebb02272774da81dbf06ca8b897504abe3d37b5eeaf40b8d0c63f9
+DIST OpenLP-2.4.6.tar.gz 7303683 BLAKE2B 4e5b1a60c8eb8772cdecf453e8277a69cfb1cdd51ab6478425332b58c52319713dd411027a108113485ee7fdc4c770cb6f94a626b23c6cca82231311a62df08a SHA512 071ca83c6969c5281213dea5efe6dfc60a3d22b56534b93e2fd1f8e43760ba5cab851b6f4dca485a31254d2090e26ce640359cb9f9797d84b9509426061dfb7a
+EBUILD openlp-2.4.6.ebuild 1194 BLAKE2B 424025d14382ea8d10ef848ef18a50742a32e61c8d0c73a5535833693a984b7c7ef0318c59cf9c860c232e79e7ab4a23f12ae00ae9188a54945c479b43baac2e SHA512 e2ecde641044717dfa88c142385999cca20ab24faa888f8703fbd2583170f340545041bd359eb57aeca8f659e62986e486e74e9daada2547b3fc27144b47362b
+MISC metadata.xml 294 BLAKE2B f31b24e7a16fb99a7d3952c69a2d4f4a75afc12fb5e91954b20b07d9e1a43acf08bba842e5e08c73272be9db317bc2e52c5bc5c5e4e8e2d4c95acc787ef3387c SHA512 c8a3971d0143dec3196e52b3bf877b4b3e29041ec6c3c78cc20415cc9fb9640bd0762a651c3f7fd8c12b27b60d0fcf99eb8f0761c10337a9cbcf84e7e78c37e6
diff --git a/app-text/openlp/files/OpenLP-2.4.2-disable-tests.patch b/app-text/openlp/files/OpenLP-2.4.2-disable-tests.patch
new file mode 100644
index 000000000000..0b1de65e85af
--- /dev/null
+++ b/app-text/openlp/files/OpenLP-2.4.2-disable-tests.patch
@@ -0,0 +1,22 @@
+diff -urN a/setup.cfg b/setup.cfg
+--- a/setup.cfg	2016-06-25 13:20:56.000000000 -0500
++++ b/setup.cfg	2016-09-08 22:30:54.606413547 -0500
+@@ -2,3 +2,5 @@
+ exclude=resources.py,vlc.py
+ max-line-length = 120
+ ignore = E402
++[install] 
++install_scripts=/usr/bin
+\ No newline at end of file
+diff -urN a/setup.py b/setup.py
+--- a/setup.py	2016-06-25 13:20:56.000000000 -0500
++++ b/setup.py	2016-09-08 22:30:50.523413394 -0500
+@@ -157,7 +157,7 @@
+     author_email='raoulsnyman@openlp.org',
+     url='http://openlp.org/',
+     license='GNU General Public License',
+-    packages=find_packages(exclude=['ez_setup', 'examples', 'tests']),
++    packages=find_packages(exclude=['ez_setup', 'examples', 'tests', 'tests.*']),
+     scripts=['openlp.py'],
+     include_package_data=True,
+     zip_safe=False,
diff --git a/app-text/openlp/metadata.xml b/app-text/openlp/metadata.xml
new file mode 100644
index 000000000000..c14282681213
--- /dev/null
+++ b/app-text/openlp/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>anarchy@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">openlp</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/openlp/openlp-2.4.6.ebuild b/app-text/openlp/openlp-2.4.6.ebuild
new file mode 100644
index 000000000000..2e89fb61736a
--- /dev/null
+++ b/app-text/openlp/openlp-2.4.6.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_REQ_USE='sqlite'
+
+inherit distutils-r1
+
+DESCRIPTION="Free church presentation software"
+HOMEPAGE="https://openlp.org/"
+SRC_URI="https://get.openlp.org/"${PV}"/OpenLP-"${PV}".tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-python/alembic[${PYTHON_USEDEP}]
+	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
+	dev-python/chardet[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/mako[${PYTHON_USEDEP}]
+	>=dev-python/pyenchant-1.3[${PYTHON_USEDEP}]
+	dev-python/pyodbc
+	dev-python/PyQt5[multimedia,gui,network,svg,webkit,${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/sip[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-0.5[${PYTHON_USEDEP}]
+	dev-python/sqlalchemy-migrate[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/OpenLP-${PV}
+
+PATCHES=( "${FILESDIR}"/OpenLP-2.4.2-disable-tests.patch )
+
+python_install_all() {
+	distutils-r1_python_install_all
+	domenu  resources/openlp.desktop
+	mv   "${D}"/usr/bin/openlp.py "${D}"/usr/bin/openlp
+	doicon -s scalable resources/images/openlp.svg
+}
diff --git a/app-text/opensp-1.5.2-r3 b/app-text/opensp-1.5.2-r3
deleted file mode 100644
index 211ee15d414a..000000000000
--- a/app-text/opensp-1.5.2-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=net-libs/libnsl:0= nls? ( sys-devel/gettext ) doc? ( app-text/xmlto app-text/docbook-xml-dtd:4.1.2 ) test? ( app-text/docbook-xml-dtd:4.5 app-text/openjade app-text/sgml-common )
-DESCRIPTION=A free, object-oriented toolkit for SGML parsing and entity management
-EAPI=5
-HOMEPAGE=http://openjade.sourceforge.net/
-IUSE=doc nls static-libs test
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=net-libs/libnsl:0=
-SLOT=0
-SRC_URI=mirror://sourceforge/openjade/OpenSP-1.5.2.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=52493b5e20ee96a09c2764f6dde1760d
diff --git a/app-text/opensp-1.5.2-r6 b/app-text/opensp-1.5.2-r6
deleted file mode 100644
index ece1052ab972..000000000000
--- a/app-text/opensp-1.5.2-r6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=elibc_glibc? ( net-libs/libnsl:0= ) nls? ( sys-devel/gettext ) doc? ( app-text/xmlto app-text/docbook-xml-dtd:4.1.2 ) test? ( app-text/docbook-xml-dtd:4.5 app-text/openjade app-text/sgml-common ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A free, object-oriented toolkit for SGML parsing and entity management
-EAPI=5
-HOMEPAGE=http://openjade.sourceforge.net/
-IUSE=doc elibc_glibc nls static-libs test
-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
-LICENSE=MIT
-RDEPEND=elibc_glibc? ( net-libs/libnsl:0= )
-SLOT=0
-SRC_URI=mirror://sourceforge/openjade/OpenSP-1.5.2.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=bd7ccfacfce47893831c905389e75c24
diff --git a/app-text/opensp/Manifest b/app-text/opensp/Manifest
new file mode 100644
index 000000000000..c381cd071df4
--- /dev/null
+++ b/app-text/opensp/Manifest
@@ -0,0 +1,7 @@
+AUX opensp-1.5-gcc34.patch 263 BLAKE2B f881932f2d35c87a13b28608efe853c54e3dd46086aa7000947055b800ee5955390ae4aca0d86d49646ffb965f653e4286e1e7c34a1aed6511576831d41813f9 SHA512 bafb4149026e19ef3e4ba34f84510cdc5a5cb6621e58114d06b5979f74a21f4093f141dccd4166a1e83eaeb6310187efbc9a4cadae0c1d55a1929eebac3caa63
+AUX opensp-1.5.2-c11-using.patch 2626 BLAKE2B 16ff8ba1701831fa0c87e0788f8b420f1d96bf5b2f645d2d6706e82ae1767a99fed8f6ca4bd4f1abbc24bf80c4fa00d848f03056b01ac98f5b8a74d3a78c4467 SHA512 dea5fe17ea2662150b201ab6011bb01ba0f0c07689d267ec4086a914cefef3e91967f8db4be0258bac87d3cd73a9b05eb1f879415860552d9853e66e98e16e11
+AUX opensp-1.5.2-fix-segfault.patch 747 BLAKE2B 544dbb8a638d2fc8fed5c7426e828d1524f4756e6882ac837b4cf3deab4e039a0b66564431b1849d9067f6071955f82b8057cde5168094da70b1419844b000fe SHA512 e0c72df8e8b191c6cecabcac550cc52918bbff7c2fddf8099ff4403de0fe817c1f3f5deb44b4c33e9d135a97a4fd8978c4090f6740c99dbadc6f9b06e24c41cf
+DIST OpenSP-1.5.2.tar.gz 1521390 BLAKE2B 2c6f8dfc721c77ab223aa67e90c8dfb45855b74fdd382ac98303c6fb23af08019ca96b5430bcdb87b9e86fc333114bd8b2e5f243c87f2cf84ee04c880c8c309b SHA512 a7dcc246ba7f58969ecd6d107c7b82dede811e65f375b7aa3e683621f2c6ff3e7dccefdd79098fcadad6cca8bb94c2933c63f4701be2c002f9a56f1bbe6b047e
+EBUILD opensp-1.5.2-r3.ebuild 1975 BLAKE2B 2e33accb3db11106c812195cb854bba0f814e3da5422a0e18278d373c73f03b7d9eb3ee31d231189ebfbe374b62bfc1927c47e85ce16942f006063f5f4b871be SHA512 6234b977e1d16e2de5271663800b86dc2b018d365e805e510e704d5d6f8085da1ce5a0d141735bb45fadab1ee9b792f3e8a2e9c1b8c0fc959fd12457d29ee039
+EBUILD opensp-1.5.2-r6.ebuild 2070 BLAKE2B 726d5bb0da39595aeaaa64dcc42b30a980c96f4efddf88c7a0d38702b7d45cf18661874f995b2256d8a3d9da4553d499a17d98d35fd91b3738606897394d4734 SHA512 0da113ed7e63336c4239cba894d715a829f2b7df01befb145b3e84a42cdc5de4ac9509394a8fe879008a626f338f96f5d832424ef6e67a3e6dbe5b034686c23b
+MISC metadata.xml 418 BLAKE2B 2650036a138376fceac69b4ca2ec3c7f2acdc958760902387592c5c5953fa37bbb41e643ed1133975aa8ec48306aa2cd654b7754272e06805f5f134b7dd2f63a SHA512 d69bb957dd6b4af7a13527a7c6fb15b7df9ae62cddafb561557654d4076c3e455b28ed16c081fe6c8843c0ed9ec26bef4d26035ac6389d6d95523953bd940008
diff --git a/app-text/opensp/files/opensp-1.5-gcc34.patch b/app-text/opensp/files/opensp-1.5-gcc34.patch
new file mode 100644
index 000000000000..60ee56085315
--- /dev/null
+++ b/app-text/opensp/files/opensp-1.5-gcc34.patch
@@ -0,0 +1,10 @@
+--- include/RangeMap.h~	2004-04-22 20:34:13.729541096 +0300
++++ include/RangeMap.h	2004-04-22 20:31:48.473049702 +0300
+@@ -8,6 +8,7 @@
+ #include "Boolean.h"
+ #include "ISet.h"
+ #include "types.h"
++#include "constant.h"
+ #include <stddef.h>
+ 
+ #ifdef SP_NAMESPACE
diff --git a/app-text/opensp/files/opensp-1.5.2-c11-using.patch b/app-text/opensp/files/opensp-1.5.2-c11-using.patch
new file mode 100644
index 000000000000..a12bf9a9b55d
--- /dev/null
+++ b/app-text/opensp/files/opensp-1.5.2-c11-using.patch
@@ -0,0 +1,77 @@
+Fix build issues due to access declarations: https://crbug.com/806958
+  ISO C++11 does not allow access declarations; use using declarations instead.
+
+The link to "Bug Tracker" on http://openjade.sourceforge.net/bugs.html
+is not working. Sent a mail containing bug report to the Openjade-devel@
+address on that page.
+
+Patch by Rahul Chaudhry <rahulchaudhry@chromium.org>
+
+--- a/include/IList.h
++++ b/include/IList.h
+@@ -26,8 +26,8 @@ public:
+   void swap(IList<T> &list) { IListBase::swap(list); }
+   T *head() const { return (T *)IListBase::head(); }
+   T *get() { return (T *)IListBase::get(); }
+-  IListBase::clear;
+-  IListBase::empty;
++  using IListBase::clear;
++  using IListBase::empty;
+ friend class IListIter<T>;
+ private:
+   IList(const IList<T> &);	// undefined
+--- a/include/IListIter.h
++++ b/include/IListIter.h
+@@ -17,8 +17,8 @@ public:
+   IListIter(const IList<T> &list) : IListIterBase(list) { }
+   T *cur() const { return (T *)IListIterBase::cur(); }
+   
+-  IListIterBase::next;
+-  IListIterBase::done;
++  using IListIterBase::next;
++  using IListIterBase::done;
+ };
+ 
+ #ifdef SP_NAMESPACE
+--- a/include/Ptr.h
++++ b/include/Ptr.h
+@@ -69,8 +69,8 @@ public:
+   const T *operator->() const { return Ptr<T>::pointer(); }
+   const T &operator*() const { return *Ptr<T>::pointer(); }
+   void swap(ConstPtr<T> &p) { Ptr<T>::swap(p); }
+-  Ptr<T>::isNull;
+-  Ptr<T>::clear;
++  using Ptr<T>::isNull;
++  using Ptr<T>::clear;
+   Boolean operator==(const Ptr<T> &p) const { return Ptr<T>::operator==(p); }
+   Boolean operator!=(const Ptr<T> &p) const { return Ptr<T>::operator!=(p); }
+   Boolean operator==(const ConstPtr<T> &p) const {
+--- a/lib/Parser.h
++++ b/lib/Parser.h
+@@ -62,16 +62,16 @@ public:
+   Parser(const SgmlParser::Params &);
+   Event *nextEvent();
+   void parseAll(EventHandler &, const volatile sig_atomic_t *cancelPtr);
+-  ParserState::sdPointer;
+-  ParserState::instanceSyntaxPointer;
+-  ParserState::prologSyntaxPointer;
+-  ParserState::activateLinkType;
+-  ParserState::allLinkTypesActivated;
+-  ParserState::entityManager;
+-  ParserState::entityCatalog;
+-  ParserState::baseDtd;
+-  ParserState::options;
+-  ParserState::instantiateDtd;
++  using ParserState::sdPointer;
++  using ParserState::instanceSyntaxPointer;
++  using ParserState::prologSyntaxPointer;
++  using ParserState::activateLinkType;
++  using ParserState::allLinkTypesActivated;
++  using ParserState::entityManager;
++  using ParserState::entityCatalog;
++  using ParserState::baseDtd;
++  using ParserState::options;
++  using ParserState::instantiateDtd;
+   friend class PiAttspecParser;
+ private:
+   Parser(const Parser &);	// undefined
diff --git a/app-text/opensp/files/opensp-1.5.2-fix-segfault.patch b/app-text/opensp/files/opensp-1.5.2-fix-segfault.patch
new file mode 100644
index 000000000000..5a9d328da915
--- /dev/null
+++ b/app-text/opensp/files/opensp-1.5.2-fix-segfault.patch
@@ -0,0 +1,23 @@
+Resolve segfault in OpenSP::ParsedSystemId::unparse.
+Patch taken from Debian.
+https://bugs.gentoo.org/show_bug.cgi?id=196230
+--- a/lib/ExtendEntityManager.cxx
++++ b/lib/ExtendEntityManager.cxx
+@@ -1238,7 +1238,8 @@
+ }
+ 
+ StorageObjectSpec::StorageObjectSpec(const StorageObjectSpec& x)
+-: codingSystemName(x.codingSystemName),
++: storageManager(x.storageManager),
++  codingSystemName(x.codingSystemName),
+   codingSystem(x.codingSystem),
+   specId(x.specId),
+   baseId(x.baseId),
+@@ -1253,6 +1254,7 @@
+ StorageObjectSpec& StorageObjectSpec::operator=(const StorageObjectSpec& x)
+ {
+   if (this != &x) {
++    storageManager = x.storageManager;
+     codingSystemName = x.codingSystemName;
+     codingSystem = x.codingSystem;
+     specId = x.specId;
diff --git a/app-text/opensp/metadata.xml b/app-text/opensp/metadata.xml
new file mode 100644
index 000000000000..84b1ddacc397
--- /dev/null
+++ b/app-text/opensp/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>heroxbd@gentoo.org</email>
+		<name>Benda Xu</name>
+	</maintainer>
+	<longdescription>An SGML System Conforming to International Standard ISO 8879.</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">openjade</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/opensp/opensp-1.5.2-r3.ebuild b/app-text/opensp/opensp-1.5.2-r3.ebuild
new file mode 100644
index 000000000000..655afe2945f7
--- /dev/null
+++ b/app-text/opensp/opensp-1.5.2-r3.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils flag-o-matic
+
+MY_P=${P/opensp/OpenSP}
+
+DESCRIPTION="A free, object-oriented toolkit for SGML parsing and entity management"
+HOMEPAGE="http://openjade.sourceforge.net/"
+SRC_URI="mirror://sourceforge/openjade/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc nls static-libs test"
+
+DEPEND="net-libs/libnsl:0=
+	nls? ( sys-devel/gettext )
+	doc? (
+		app-text/xmlto
+		app-text/docbook-xml-dtd:4.1.2
+	)
+	test? (
+		app-text/docbook-xml-dtd:4.5
+		app-text/openjade
+		app-text/sgml-common
+	)"
+RDEPEND="net-libs/libnsl:0="
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-1.5-gcc34.patch \
+		"${FILESDIR}"/${P}-fix-segfault.patch
+}
+
+src_configure() {
+	export CONFIG_SHELL=${BASH}  # configure needs bash
+
+	# The following filters are taken from openjade's ebuild. See bug #100828.
+	# Please note!  Opts are disabled.  If you know what you're doing
+	# feel free to remove this line.  It may cause problems with
+	# docbook-sgml-utils among other things.
+	#ALLOWED_FLAGS="-O -O1 -O2 -pipe -g -march"
+	strip-flags
+
+	econf \
+		--enable-http \
+		--enable-default-catalog="${EPREFIX}"/etc/sgml/catalog \
+		--enable-default-search-path="${EPREFIX}"/usr/share/sgml \
+		--datadir="${EPREFIX}"/usr/share/sgml/${P} \
+		$(use_enable nls) \
+		$(use_enable doc doc-build) \
+		$(use_enable static-libs static)
+}
+
+src_compile() {
+	emake pkgdocdir="${EPREFIX}"/usr/share/doc/${PF}
+}
+
+src_test() {
+	# Skipping tests known not to work
+	emake SHOWSTOPPERS= check
+	SANDBOX_PREDICT="${SANDBOX_PREDICT%:/}"
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		pkgdocdir="${EPREFIX}"/usr/share/doc/${PF} \
+		install
+
+	prune_libtool_files
+
+	dodoc AUTHORS BUGS ChangeLog NEWS README
+}
diff --git a/app-text/opensp/opensp-1.5.2-r6.ebuild b/app-text/opensp/opensp-1.5.2-r6.ebuild
new file mode 100644
index 000000000000..6aa0bed6331c
--- /dev/null
+++ b/app-text/opensp/opensp-1.5.2-r6.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils flag-o-matic autotools
+
+MY_P=${P/opensp/OpenSP}
+
+DESCRIPTION="A free, object-oriented toolkit for SGML parsing and entity management"
+HOMEPAGE="http://openjade.sourceforge.net/"
+SRC_URI="mirror://sourceforge/openjade/${MY_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"
+IUSE="doc elibc_glibc nls static-libs test"
+
+RDEPEND="
+	elibc_glibc? ( net-libs/libnsl:0= )
+"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )
+	doc? (
+		app-text/xmlto
+		app-text/docbook-xml-dtd:4.1.2
+	)
+	test? (
+		app-text/docbook-xml-dtd:4.5
+		app-text/openjade
+		app-text/sgml-common
+	)"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-fix-segfault.patch
+	epatch "${FILESDIR}"/${P}-c11-using.patch
+	use prefix && eautoreconf
+}
+
+src_configure() {
+	export CONFIG_SHELL=${BASH}  # configure needs bash
+
+	# The following filters are taken from openjade's ebuild. See bug #100828.
+	# Please note!  Opts are disabled.  If you know what you're doing
+	# feel free to remove this line.  It may cause problems with
+	# docbook-sgml-utils among other things.
+	#ALLOWED_FLAGS="-O -O1 -O2 -pipe -g -march"
+	strip-flags
+
+	econf \
+		--enable-http \
+		--enable-default-catalog="${EPREFIX}"/etc/sgml/catalog \
+		--enable-default-search-path="${EPREFIX}"/usr/share/sgml \
+		--datadir="${EPREFIX}"/usr/share/sgml/${P} \
+		$(use_enable nls) \
+		$(use_enable doc doc-build) \
+		$(use_enable static-libs static)
+}
+
+src_compile() {
+	emake pkgdocdir="${EPREFIX}"/usr/share/doc/${PF}
+}
+
+src_test() {
+	# Skipping tests known not to work
+	emake SHOWSTOPPERS= check
+	SANDBOX_PREDICT="${SANDBOX_PREDICT%:/}"
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		pkgdocdir="${EPREFIX}"/usr/share/doc/${PF} \
+		install
+
+	prune_libtool_files
+
+	dodoc AUTHORS BUGS ChangeLog NEWS README
+}
diff --git a/app-text/ots-0.5.0-r1 b/app-text/ots-0.5.0-r1
deleted file mode 100644
index e1ca69964918..000000000000
--- a/app-text/ots-0.5.0-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=dev-libs/glib:2 >=dev-libs/libxml2-2.4.23 >=dev-libs/popt-1.5 virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Open source Text Summarizer, as used in newer releases of abiword and kword
-EAPI=5
-HOMEPAGE=http://libots.sourceforge.net/
-KEYWORDS=alpha amd64 ~arm hppa ~mips ppc ppc64 ~sparc x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2 >=dev-libs/libxml2-2.4.23 >=dev-libs/popt-1.5
-SLOT=0
-SRC_URI=mirror://sourceforge/libots/ots-0.5.0.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=66a26e89c15293a6d7917b4dbf78b4f1
diff --git a/app-text/ots/Manifest b/app-text/ots/Manifest
new file mode 100644
index 000000000000..4a6643e14f26
--- /dev/null
+++ b/app-text/ots/Manifest
@@ -0,0 +1,7 @@
+AUX ots-0.5.0-automake-1.13.patch 435 BLAKE2B a4ea226fa489a0d42f73c1f2bc936b10dd875067190f0f1f2c824209ad38511beb7baf471438408564e5e66af7980714e64a1345fc5b7b27bfe7df9394860c63 SHA512 9ff7d9117ea12917b967c386054afbc25c2c9a9e85d9930fa7ecdf9e0c230a64a6f3689d22c94a796f00d13cd652fd6d7bcfe21c7ccc1649ee58f68ca5f89a11
+AUX ots-0.5.0-fix-installation.patch 514 BLAKE2B 932a241591dcc23b9a57070e23422f9ae8077061f812ab262d63ed069bac1d7984a66169d47640359dfbb41ed779928470d81b604b6695b9a8fbf5c6291c2104 SHA512 490974d43f3001220505fe9b77830b57f0ffc8faf0ab262c3de8f50c4ada75df64588441f20810e6958ed78de5a2e898c889cb686eddeeccfe497f42cbfa4664
+AUX ots-0.5.0-fix-underlinking.patch 863 BLAKE2B a85d3c6d4c004a3105935e013705e10e26159500f7dd95c2edf6fcccf1af9bfd1a1f8854feba37ed7b8473e8c272d355367eb795486cc65b820c264a4dd32ed6 SHA512 34f189afbba9d1c8936142f27e5ab6ed4ab2eac8271a58e9295e46b993b0be7d48fa771cd62b3a8374da15b07deaa12eefcc01b0dd34643947cb43cd64f5d0a6
+AUX ots-0.5.0-math.patch 402 BLAKE2B 647dd793323f1eb6a470015053c066593a6fc4da95c3b36f3e0c7926e38ebd75997fd3482dffa3bda850f70fac5a8a65ad19cb6e725fd514d4e9d4b366d9fec1 SHA512 4ba250e3c51eb621bba6e8ee1d291719c86d04ecb2dc20cbd1bf7bae27ea22ffbe54376d690c24c84a0af0da9907dcf40d01c0aa53e9b610737930a442cf6918
+DIST ots-0.5.0.tar.gz 371126 BLAKE2B 05785a4d4ec5feba421762ba58a7dab649f3fadcf83a3f809a73b8027c6668263a29305766aba1bba4ce9447e115a89a59788026d567b5b82f9e1c1f7a934d97 SHA512 736a672e16b741f2948e6874b88d4ade8e0450941915e65285f2fe661194a6d384a6abb267b15c3254c638750c644b4b2cf4279d7bda163b02336fcd8da9cfbe
+EBUILD ots-0.5.0-r1.ebuild 1124 BLAKE2B 1f3213172db8d4c7e23170c887fc34e85611f22a5908e949545d8721af069100374b9b890d3d33ef6e33bb8894b157f2a24679c389ff3eac538869190e2eb66f SHA512 288c8c5dcb109b05dd0f36ed24a2419778e01da987b14c4f0d478f229979a7f01290f24a6aa1d2983c6fe23ba3b7eb2d4999e8a9ecdd27846050edab4f5c2d28
+MISC metadata.xml 243 BLAKE2B aa2c4e92961faa40826e16a92582bb02cacbe1a10bd1e6e8d169560472923ce521ec642b1b0175ad5beac315e575d65c9a23466b08cc95eb9605ed2376af50d1 SHA512 354efb009da3999e18811a3e91f53628d4ce26aa103544be6b5d42caf9c5d9881097e81777665f96c7828a15a7e38f1e4a118579a865eb4c740e580527b42774
diff --git a/app-text/ots/files/ots-0.5.0-automake-1.13.patch b/app-text/ots/files/ots-0.5.0-automake-1.13.patch
new file mode 100644
index 000000000000..074eb0e53a83
--- /dev/null
+++ b/app-text/ots/files/ots-0.5.0-automake-1.13.patch
@@ -0,0 +1,12 @@
+diff -up ots-0.5.0/configure.in.automake-1_13 ots-0.5.0/configure.in
+--- ots-0.5.0/configure.in.automake-1_13	2007-04-08 20:12:42.000000000 +0200
++++ ots-0.5.0/configure.in	2013-01-09 02:31:52.690211708 +0100
+@@ -34,7 +34,7 @@ PACKAGE=ots
+ 
+ dnl Specify a configuration file
+ dnl Initialize automake stuff
+-AM_CONFIG_HEADER(ots-config.h)
++AC_CONFIG_HEADERS(ots-config.h)
+ AM_INIT_AUTOMAKE($PACKAGE, $OTS_VERSION)
+ AM_MAINTAINER_MODE
+ 
diff --git a/app-text/ots/files/ots-0.5.0-fix-installation.patch b/app-text/ots/files/ots-0.5.0-fix-installation.patch
new file mode 100644
index 000000000000..757f4f86b80b
--- /dev/null
+++ b/app-text/ots/files/ots-0.5.0-fix-installation.patch
@@ -0,0 +1,11 @@
+--- dic/Makefile.am~	2003-07-22 16:56:03.000000000 +0200
++++ dic/Makefile.am	2009-06-01 00:40:17.000000000 +0200
+@@ -1,7 +1,7 @@
+ DICTS=bg.xml ca.xml cs.xml cy.xml da.xml de.xml el.xml en.xml eo.xml es.xml \
+       et.xml eu.xml fi.xml fr.xml ga.xml gl.xml he.xml hu.xml ia.xml id.xml \
+       is.xml it.xml lv.xml mi.xml ms.xml mt.xml nl.xml nn.xml pl.xml pt.xml \
+-      ro.xml ru.xml sv.xml tl.xml tr.xml uk.xml yi.xml en.xml
++      ro.xml ru.xml sv.xml tl.xml tr.xml uk.xml yi.xml
+ 
+ pkgdata_DATA = $(DICTS)
+ 
diff --git a/app-text/ots/files/ots-0.5.0-fix-underlinking.patch b/app-text/ots/files/ots-0.5.0-fix-underlinking.patch
new file mode 100644
index 000000000000..dd9295930c33
--- /dev/null
+++ b/app-text/ots/files/ots-0.5.0-fix-underlinking.patch
@@ -0,0 +1,22 @@
+--- src/Makefile.in.orig	2007-04-08 20:17:23.000000000 +0200
++++ src/Makefile.in	2008-07-05 02:16:42.000000000 +0200
+@@ -108,7 +108,7 @@
+ 
+ lib_LTLIBRARIES = libots-1.la
+ 
+-libots_1_la_LIBADD = $(OTS_LIBS)
++libots_1_la_LIBADD = $(OTS_LIBS) -lm
+ libots_1_la_LDFLAGS = -version-info @VERSION_INFO@ $(no_undefined)
+ libots_1_la_SOURCES =  	libots.h			article.c			dictionary.c			grader.c			grader-tf.c			grader-tc.c			grader-tc.h			html.c				parser.c 			text.c				stemmer.c			highlighter.c			wordlist.c			relations.c
+ 
+--- src/Makefile.am~	2007-04-08 18:21:51.000000000 +0200
++++ src/Makefile.am	2009-06-01 00:28:53.000000000 +0200
+@@ -20,7 +20,7 @@
+ 
+ lib_LTLIBRARIES = libots-1.la
+ 
+-libots_1_la_LIBADD  = $(OTS_LIBS)
++libots_1_la_LIBADD  = $(OTS_LIBS) -lm
+ libots_1_la_LDFLAGS = -version-info @VERSION_INFO@ $(no_undefined)
+ libots_1_la_SOURCES =		\
+ 	libots.h		\
diff --git a/app-text/ots/files/ots-0.5.0-math.patch b/app-text/ots/files/ots-0.5.0-math.patch
new file mode 100644
index 000000000000..da964c25f612
--- /dev/null
+++ b/app-text/ots/files/ots-0.5.0-math.patch
@@ -0,0 +1,11 @@
+diff --exclude='*~' -Naur ots-0.5.0.orig/src/grader-tf.c ots-0.5.0/src/grader-tf.c
+--- ots-0.5.0.orig/src/grader-tf.c	2008-05-17 12:17:23.000000000 +0000
++++ ots-0.5.0/src/grader-tf.c	2008-05-17 12:17:37.000000000 +0000
+@@ -22,6 +22,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include "libots.h"
++#include <math.h>
+ 
+ /*Grader - using the Term frequency algorithm. Will give each line a score*/
+ 
diff --git a/app-text/ots/metadata.xml b/app-text/ots/metadata.xml
new file mode 100644
index 000000000000..88f5ac008b4a
--- /dev/null
+++ b/app-text/ots/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="sourceforge">libots</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/ots/ots-0.5.0-r1.ebuild b/app-text/ots/ots-0.5.0-r1.ebuild
new file mode 100644
index 000000000000..9df04cf45067
--- /dev/null
+++ b/app-text/ots/ots-0.5.0-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools eutils
+
+DESCRIPTION="Open source Text Summarizer, as used in newer releases of abiword and kword"
+HOMEPAGE="http://libots.sourceforge.net/"
+SRC_URI="mirror://sourceforge/libots/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm hppa ~mips ppc ppc64 ~sparc x86"
+IUSE=""
+
+RDEPEND="
+	dev-libs/glib:2
+	>=dev-libs/libxml2-2.4.23
+	>=dev-libs/popt-1.5
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+DOCS="AUTHORS BUGS ChangeLog HACKING NEWS README TODO"
+
+src_prepare() {
+	# ugly ugly hack, kick upstream to fix its packaging
+	touch "${S}"/gtk-doc.make
+
+	epatch "${FILESDIR}"/${P}-math.patch
+	epatch "${FILESDIR}"/${P}-automake-1.13.patch
+	epatch "${FILESDIR}"/${P}-fix-installation.patch
+	epatch "${FILESDIR}"/${P}-fix-underlinking.patch
+	eautoreconf
+}
+
+src_configure() {
+	# bug 97448
+	econf \
+		--disable-gtk-doc \
+		--disable-static
+}
+
+src_compile() {
+	# parallel make fails, bug 112932
+	emake -j1
+}
+
+src_install() {
+	default
+	prune_libtool_files
+	rm -rf "${D}"/usr/share/doc/libots
+}
diff --git a/app-text/pandoc-1.12.4.2-r1 b/app-text/pandoc-1.12.4.2-r1
deleted file mode 100644
index 51a55382d0e2..000000000000
--- a/app-text/pandoc-1.12.4.2-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/aeson-0.7:=[profile?] <dev-haskell/aeson-0.8:=[profile?] >=dev-haskell/attoparsec-0.10:=[profile?] <dev-haskell/attoparsec-0.13:=[profile?] >=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?] >=dev-haskell/binary-0.5:=[profile?] <dev-haskell/binary-0.8:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.8:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] <dev-haskell/blaze-markup-0.7:=[profile?] >=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.6:=[profile?] >=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?] >=dev-haskell/highlighting-kate-0.5.8:=[profile?] <dev-haskell/highlighting-kate-0.6:=[profile?] >=dev-haskell/hslua-0.3:=[profile?] <dev-haskell/hslua-0.4:=[profile?] >=dev-haskell/http-4000.0.5:=[profile?] <dev-haskell/http-4000.3:=[profile?] >=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/network-2:=[profile?] <dev-haskell/network-2.6:=[profile?] >=dev-haskell/pandoc-types-1.12.3.3:=[profile?] <dev-haskell/pandoc-types-1.13:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.1:=[profile?] >=dev-haskell/scientific-0.2:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.5:=[profile?] >=dev-haskell/tagsoup-0.13.1:=[profile?] <dev-haskell/tagsoup-0.14:=[profile?] >=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.3:=[profile?] >=dev-haskell/texmath-0.6.6.1:=[profile?] <dev-haskell/texmath-0.7:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.2:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.11:=[profile?] >=dev-haskell/xml-1.3.12:=[profile?] <dev-haskell/xml-1.4:=[profile?] >=dev-haskell/yaml-0.8.8.2:=[profile?] <dev-haskell/yaml-0.9:=[profile?] >=dev-haskell/zip-archive-0.1.3.3:=[profile?] <dev-haskell/zip-archive-0.3:=[profile?] >=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.6:=[profile?] >=dev-lang/ghc-7.4.1:= embed_data_files? ( dev-haskell/hsb2hs ) http-conduit? ( >=dev-haskell/http-conduit-1.9:=[profile?] <dev-haskell/http-conduit-2.2:=[profile?] >=dev-haskell/http-types-0.8:=[profile?] <dev-haskell/http-types-0.9:=[profile?] ) dev-haskell/alex >=dev-haskell/cabal-1.10 dev-haskell/happy test? ( >=dev-haskell/ansi-terminal-0.5 <dev-haskell/ansi-terminal-0.7 >=dev-haskell/diff-0.2 <dev-haskell/diff-0.4 >=dev-haskell/highlighting-kate-0.5.8 <dev-haskell/highlighting-kate-0.6 >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.3 >=dev-haskell/pandoc-types-1.12.3.3 <dev-haskell/pandoc-types-1.13 >=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.8 >=dev-haskell/syb-0.1 <dev-haskell/syb-0.5 >=dev-haskell/test-framework-0.3 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-hunit-0.2 <dev-haskell/test-framework-hunit-0.4 >=dev-haskell/test-framework-quickcheck2-0.2.9 <dev-haskell/test-framework-quickcheck2-0.4 >=dev-haskell/text-0.11 <dev-haskell/text-1.2 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Conversion between markup formats
-EAPI=5
-HOMEPAGE=http://johnmacfarlane.net/pandoc
-IUSE=embed_data_files +http-conduit doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-haskell/aeson-0.7:=[profile?] <dev-haskell/aeson-0.8:=[profile?] >=dev-haskell/attoparsec-0.10:=[profile?] <dev-haskell/attoparsec-0.13:=[profile?] >=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?] >=dev-haskell/binary-0.5:=[profile?] <dev-haskell/binary-0.8:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.8:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] <dev-haskell/blaze-markup-0.7:=[profile?] >=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.6:=[profile?] >=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?] >=dev-haskell/highlighting-kate-0.5.8:=[profile?] <dev-haskell/highlighting-kate-0.6:=[profile?] >=dev-haskell/hslua-0.3:=[profile?] <dev-haskell/hslua-0.4:=[profile?] >=dev-haskell/http-4000.0.5:=[profile?] <dev-haskell/http-4000.3:=[profile?] >=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/network-2:=[profile?] <dev-haskell/network-2.6:=[profile?] >=dev-haskell/pandoc-types-1.12.3.3:=[profile?] <dev-haskell/pandoc-types-1.13:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.1:=[profile?] >=dev-haskell/scientific-0.2:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.5:=[profile?] >=dev-haskell/tagsoup-0.13.1:=[profile?] <dev-haskell/tagsoup-0.14:=[profile?] >=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.3:=[profile?] >=dev-haskell/texmath-0.6.6.1:=[profile?] <dev-haskell/texmath-0.7:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.2:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.11:=[profile?] >=dev-haskell/xml-1.3.12:=[profile?] <dev-haskell/xml-1.4:=[profile?] >=dev-haskell/yaml-0.8.8.2:=[profile?] <dev-haskell/yaml-0.9:=[profile?] >=dev-haskell/zip-archive-0.1.3.3:=[profile?] <dev-haskell/zip-archive-0.3:=[profile?] >=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.6:=[profile?] >=dev-lang/ghc-7.4.1:= embed_data_files? ( dev-haskell/hsb2hs ) http-conduit? ( >=dev-haskell/http-conduit-1.9:=[profile?] <dev-haskell/http-conduit-2.2:=[profile?] >=dev-haskell/http-types-0.8:=[profile?] <dev-haskell/http-types-0.9:=[profile?] )
-RESTRICT=test
-SLOT=0/1.12.4.2
-SRC_URI=mirror://hackage/packages/archive/pandoc/1.12.4.2/pandoc-1.12.4.2.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=86efb73ec0ac6dcab49e64721d192f97
diff --git a/app-text/pandoc-1.13.2.1 b/app-text/pandoc-1.13.2.1
deleted file mode 100644
index e0dbce61d782..000000000000
--- a/app-text/pandoc-1.13.2.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/aeson-0.7.0.5:=[profile?] >=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?] >=dev-haskell/binary-0.5:=[profile?] <dev-haskell/binary-0.8:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.9:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] <dev-haskell/blaze-markup-0.8:=[profile?] >=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.6:=[profile?] >=dev-haskell/deepseq-generics-0.1:=[profile?] <dev-haskell/deepseq-generics-0.2:=[profile?] >=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?] >=dev-haskell/haddock-library-1.1:=[profile?] <dev-haskell/haddock-library-1.3:=[profile?] >=dev-haskell/highlighting-kate-0.5.11.1:=[profile?] >=dev-haskell/hslua-0.3:=[profile?] <dev-haskell/hslua-0.4:=[profile?] >=dev-haskell/http-4000.0.5:=[profile?] <dev-haskell/http-4000.3:=[profile?] >=dev-haskell/juicypixels-3.1.6.1:=[profile?] <dev-haskell/juicypixels-3.3:=[profile?] >=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/old-locale-1:=[profile?] <dev-haskell/old-locale-1.1:=[profile?] >=dev-haskell/old-time-1.0:=[profile?] <dev-haskell/old-time-1.2:=[profile?] >=dev-haskell/pandoc-types-1.12.4:=[profile?] <dev-haskell/pandoc-types-1.13:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.2:=[profile?] >=dev-haskell/scientific-0.2:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-haskell/sha-1.6:=[profile?] <dev-haskell/sha-1.7:=[profile?] >=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.5:=[profile?] >=dev-haskell/tagsoup-0.13.1:=[profile?] <dev-haskell/tagsoup-0.14:=[profile?] >=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.3:=[profile?] >=dev-haskell/texmath-0.8.0.1:=[profile?] <dev-haskell/texmath-0.9:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.11:=[profile?] >=dev-haskell/xml-1.3.12:=[profile?] <dev-haskell/xml-1.4:=[profile?] >=dev-haskell/yaml-0.8.8.2:=[profile?] <dev-haskell/yaml-0.9:=[profile?] >=dev-haskell/zip-archive-0.2.3.4:=[profile?] <dev-haskell/zip-archive-0.3:=[profile?] >=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.6:=[profile?] >=dev-lang/ghc-7.4.1:= embed_data_files? ( dev-haskell/hsb2hs ) https? ( >=dev-haskell/http-client-0.3.2:=[profile?] <dev-haskell/http-client-0.5:=[profile?] >=dev-haskell/http-client-tls-0.2:=[profile?] <dev-haskell/http-client-tls-0.3:=[profile?] >=dev-haskell/http-types-0.8:=[profile?] <dev-haskell/http-types-0.9:=[profile?] ) network-uri? ( >=dev-haskell/network-2.6:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] ) !network-uri? ( >=dev-haskell/network-2:=[profile?] <dev-haskell/network-2.6:=[profile?] ) trypandoc? ( >=dev-haskell/wai-0.3:=[profile?] dev-haskell/wai-extra:=[profile?] !https? ( dev-haskell/http-types:=[profile?] ) ) >=dev-haskell/cabal-1.10 test? ( >=dev-haskell/ansi-terminal-0.5 <dev-haskell/ansi-terminal-0.7 >=dev-haskell/diff-0.2 <dev-haskell/diff-0.4 >=dev-haskell/executable-path-0.0 <dev-haskell/executable-path-0.1 >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.3 >=dev-haskell/quickcheck-2.4:2 >=dev-haskell/test-framework-0.3 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-hunit-0.2 <dev-haskell/test-framework-hunit-0.4 >=dev-haskell/test-framework-quickcheck2-0.2.9 <dev-haskell/test-framework-quickcheck2-0.4 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Conversion between markup formats
-EAPI=5
-HOMEPAGE=http://johnmacfarlane.net/pandoc
-IUSE=embed_data_files +https make-pandoc-man-pages +network-uri trypandoc doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-haskell/aeson-0.7.0.5:=[profile?] >=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?] >=dev-haskell/binary-0.5:=[profile?] <dev-haskell/binary-0.8:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.9:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] <dev-haskell/blaze-markup-0.8:=[profile?] >=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.6:=[profile?] >=dev-haskell/deepseq-generics-0.1:=[profile?] <dev-haskell/deepseq-generics-0.2:=[profile?] >=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?] >=dev-haskell/haddock-library-1.1:=[profile?] <dev-haskell/haddock-library-1.3:=[profile?] >=dev-haskell/highlighting-kate-0.5.11.1:=[profile?] >=dev-haskell/hslua-0.3:=[profile?] <dev-haskell/hslua-0.4:=[profile?] >=dev-haskell/http-4000.0.5:=[profile?] <dev-haskell/http-4000.3:=[profile?] >=dev-haskell/juicypixels-3.1.6.1:=[profile?] <dev-haskell/juicypixels-3.3:=[profile?] >=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/old-locale-1:=[profile?] <dev-haskell/old-locale-1.1:=[profile?] >=dev-haskell/old-time-1.0:=[profile?] <dev-haskell/old-time-1.2:=[profile?] >=dev-haskell/pandoc-types-1.12.4:=[profile?] <dev-haskell/pandoc-types-1.13:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.2:=[profile?] >=dev-haskell/scientific-0.2:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-haskell/sha-1.6:=[profile?] <dev-haskell/sha-1.7:=[profile?] >=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.5:=[profile?] >=dev-haskell/tagsoup-0.13.1:=[profile?] <dev-haskell/tagsoup-0.14:=[profile?] >=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.3:=[profile?] >=dev-haskell/texmath-0.8.0.1:=[profile?] <dev-haskell/texmath-0.9:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.11:=[profile?] >=dev-haskell/xml-1.3.12:=[profile?] <dev-haskell/xml-1.4:=[profile?] >=dev-haskell/yaml-0.8.8.2:=[profile?] <dev-haskell/yaml-0.9:=[profile?] >=dev-haskell/zip-archive-0.2.3.4:=[profile?] <dev-haskell/zip-archive-0.3:=[profile?] >=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.6:=[profile?] >=dev-lang/ghc-7.4.1:= embed_data_files? ( dev-haskell/hsb2hs ) https? ( >=dev-haskell/http-client-0.3.2:=[profile?] <dev-haskell/http-client-0.5:=[profile?] >=dev-haskell/http-client-tls-0.2:=[profile?] <dev-haskell/http-client-tls-0.3:=[profile?] >=dev-haskell/http-types-0.8:=[profile?] <dev-haskell/http-types-0.9:=[profile?] ) network-uri? ( >=dev-haskell/network-2.6:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] ) !network-uri? ( >=dev-haskell/network-2:=[profile?] <dev-haskell/network-2.6:=[profile?] ) trypandoc? ( >=dev-haskell/wai-0.3:=[profile?] dev-haskell/wai-extra:=[profile?] !https? ( dev-haskell/http-types:=[profile?] ) )
-RESTRICT=test
-SLOT=0/1.13.2.1
-SRC_URI=mirror://hackage/packages/archive/pandoc/1.13.2.1/pandoc-1.13.2.1.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=5a83ebb50cf9ea28c52f536ca06161bf
diff --git a/app-text/pandoc-1.14.0.4 b/app-text/pandoc-1.14.0.4
deleted file mode 100644
index 7e66ee247ef9..000000000000
--- a/app-text/pandoc-1.14.0.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/aeson-0.7.0.5:=[profile?] <dev-haskell/aeson-0.10:=[profile?] >=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?] >=dev-haskell/binary-0.5:=[profile?] <dev-haskell/binary-0.8:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.9:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] <dev-haskell/blaze-markup-0.8:=[profile?] >=dev-haskell/cmark-0.3.3:=[profile?] <dev-haskell/cmark-0.4:=[profile?] >=dev-haskell/css-text-0.1.2:=[profile?] <dev-haskell/css-text-0.3:=[profile?] >=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.6:=[profile?] >=dev-haskell/deepseq-generics-0.1:=[profile?] <dev-haskell/deepseq-generics-0.2:=[profile?] >=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?] >=dev-haskell/filemanip-0.3:=[profile?] <dev-haskell/filemanip-0.4:=[profile?] >=dev-haskell/haddock-library-1.1:=[profile?] <dev-haskell/haddock-library-1.3:=[profile?] >=dev-haskell/highlighting-kate-0.6:=[profile?] <dev-haskell/highlighting-kate-0.7:=[profile?] >=dev-haskell/hslua-0.3:=[profile?] <dev-haskell/hslua-0.5:=[profile?] >=dev-haskell/http-4000.0.5:=[profile?] <dev-haskell/http-4000.3:=[profile?] >=dev-haskell/juicypixels-3.1.6.1:=[profile?] <dev-haskell/juicypixels-3.3:=[profile?] >=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/old-locale-1:=[profile?] <dev-haskell/old-locale-1.1:=[profile?] >=dev-haskell/old-time-1.0:=[profile?] <dev-haskell/old-time-1.2:=[profile?] >=dev-haskell/pandoc-types-1.12.4:=[profile?] <dev-haskell/pandoc-types-1.13:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.2:=[profile?] >=dev-haskell/scientific-0.2:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-haskell/sha-1.6:=[profile?] <dev-haskell/sha-1.7:=[profile?] >=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.6:=[profile?] >=dev-haskell/tagsoup-0.13.1:=[profile?] <dev-haskell/tagsoup-0.14:=[profile?] >=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.3:=[profile?] >=dev-haskell/texmath-0.8.1:=[profile?] <dev-haskell/texmath-0.9:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.11:=[profile?] >=dev-haskell/xml-1.3.12:=[profile?] <dev-haskell/xml-1.4:=[profile?] >=dev-haskell/yaml-0.8.8.2:=[profile?] <dev-haskell/yaml-0.9:=[profile?] >=dev-haskell/zip-archive-0.2.3.4:=[profile?] <dev-haskell/zip-archive-0.3:=[profile?] >=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.7:=[profile?] >=dev-lang/ghc-7.4.1:= https? ( >=dev-haskell/http-client-0.3.2:=[profile?] <dev-haskell/http-client-0.5:=[profile?] >=dev-haskell/http-client-tls-0.2:=[profile?] <dev-haskell/http-client-tls-0.3:=[profile?] >=dev-haskell/http-types-0.8:=[profile?] <dev-haskell/http-types-0.9:=[profile?] ) network-uri? ( >=dev-haskell/network-2.6:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] ) !network-uri? ( >=dev-haskell/network-2:=[profile?] <dev-haskell/network-2.6:=[profile?] ) trypandoc? ( >=dev-haskell/wai-0.3:=[profile?] dev-haskell/wai-extra:=[profile?] !https? ( dev-haskell/http-types:=[profile?] ) ) >=dev-haskell/cabal-1.10 test? ( >=dev-haskell/ansi-terminal-0.5 <dev-haskell/ansi-terminal-0.7 >=dev-haskell/diff-0.2 <dev-haskell/diff-0.4 >=dev-haskell/executable-path-0.0 <dev-haskell/executable-path-0.1 >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.3 >=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.9 >=dev-haskell/test-framework-0.3 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-hunit-0.2 <dev-haskell/test-framework-hunit-0.4 >=dev-haskell/test-framework-quickcheck2-0.2.9 <dev-haskell/test-framework-quickcheck2-0.4 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Conversion between markup formats
-EAPI=5
-HOMEPAGE=http://johnmacfarlane.net/pandoc
-IUSE=embed_data_files +https make-pandoc-man-pages +network-uri trypandoc doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-haskell/aeson-0.7.0.5:=[profile?] <dev-haskell/aeson-0.10:=[profile?] >=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?] >=dev-haskell/binary-0.5:=[profile?] <dev-haskell/binary-0.8:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.9:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] <dev-haskell/blaze-markup-0.8:=[profile?] >=dev-haskell/cmark-0.3.3:=[profile?] <dev-haskell/cmark-0.4:=[profile?] >=dev-haskell/css-text-0.1.2:=[profile?] <dev-haskell/css-text-0.3:=[profile?] >=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.6:=[profile?] >=dev-haskell/deepseq-generics-0.1:=[profile?] <dev-haskell/deepseq-generics-0.2:=[profile?] >=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?] >=dev-haskell/filemanip-0.3:=[profile?] <dev-haskell/filemanip-0.4:=[profile?] >=dev-haskell/haddock-library-1.1:=[profile?] <dev-haskell/haddock-library-1.3:=[profile?] >=dev-haskell/highlighting-kate-0.6:=[profile?] <dev-haskell/highlighting-kate-0.7:=[profile?] >=dev-haskell/hslua-0.3:=[profile?] <dev-haskell/hslua-0.5:=[profile?] >=dev-haskell/http-4000.0.5:=[profile?] <dev-haskell/http-4000.3:=[profile?] >=dev-haskell/juicypixels-3.1.6.1:=[profile?] <dev-haskell/juicypixels-3.3:=[profile?] >=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/old-locale-1:=[profile?] <dev-haskell/old-locale-1.1:=[profile?] >=dev-haskell/old-time-1.0:=[profile?] <dev-haskell/old-time-1.2:=[profile?] >=dev-haskell/pandoc-types-1.12.4:=[profile?] <dev-haskell/pandoc-types-1.13:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.2:=[profile?] >=dev-haskell/scientific-0.2:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-haskell/sha-1.6:=[profile?] <dev-haskell/sha-1.7:=[profile?] >=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.6:=[profile?] >=dev-haskell/tagsoup-0.13.1:=[profile?] <dev-haskell/tagsoup-0.14:=[profile?] >=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.3:=[profile?] >=dev-haskell/texmath-0.8.1:=[profile?] <dev-haskell/texmath-0.9:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.11:=[profile?] >=dev-haskell/xml-1.3.12:=[profile?] <dev-haskell/xml-1.4:=[profile?] >=dev-haskell/yaml-0.8.8.2:=[profile?] <dev-haskell/yaml-0.9:=[profile?] >=dev-haskell/zip-archive-0.2.3.4:=[profile?] <dev-haskell/zip-archive-0.3:=[profile?] >=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.7:=[profile?] >=dev-lang/ghc-7.4.1:= https? ( >=dev-haskell/http-client-0.3.2:=[profile?] <dev-haskell/http-client-0.5:=[profile?] >=dev-haskell/http-client-tls-0.2:=[profile?] <dev-haskell/http-client-tls-0.3:=[profile?] >=dev-haskell/http-types-0.8:=[profile?] <dev-haskell/http-types-0.9:=[profile?] ) network-uri? ( >=dev-haskell/network-2.6:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] ) !network-uri? ( >=dev-haskell/network-2:=[profile?] <dev-haskell/network-2.6:=[profile?] ) trypandoc? ( >=dev-haskell/wai-0.3:=[profile?] dev-haskell/wai-extra:=[profile?] !https? ( dev-haskell/http-types:=[profile?] ) )
-RESTRICT=test
-SLOT=0/1.14.0.4
-SRC_URI=mirror://hackage/packages/archive/pandoc/1.14.0.4/pandoc-1.14.0.4.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=946bbaca50c0dddaed7fa99ff1a2e07c
diff --git a/app-text/pandoc-1.15.0.6 b/app-text/pandoc-1.15.0.6
deleted file mode 100644
index f67913163734..000000000000
--- a/app-text/pandoc-1.15.0.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/aeson-0.7.0.5:=[profile?] <dev-haskell/aeson-0.10:=[profile?] >=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?] >=dev-haskell/binary-0.5:=[profile?] <dev-haskell/binary-0.8:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.9:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] <dev-haskell/blaze-markup-0.8:=[profile?] >=dev-haskell/cmark-0.4.0.1:=[profile?] <dev-haskell/cmark-0.5:=[profile?] >=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.6:=[profile?] >=dev-haskell/deepseq-generics-0.1:=[profile?] <dev-haskell/deepseq-generics-0.2:=[profile?] >=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?] >=dev-haskell/filemanip-0.3:=[profile?] <dev-haskell/filemanip-0.4:=[profile?] >=dev-haskell/haddock-library-1.1:=[profile?] <dev-haskell/haddock-library-1.3:=[profile?] >=dev-haskell/highlighting-kate-0.6:=[profile?] <dev-haskell/highlighting-kate-0.7:=[profile?] >=dev-haskell/hslua-0.3:=[profile?] <dev-haskell/hslua-0.5:=[profile?] >=dev-haskell/http-4000.0.5:=[profile?] <dev-haskell/http-4000.3:=[profile?] >=dev-haskell/juicypixels-3.1.6.1:=[profile?] <dev-haskell/juicypixels-3.3:=[profile?] >=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/old-locale-1:=[profile?] <dev-haskell/old-locale-1.1:=[profile?] dev-haskell/old-time:=[profile?] >=dev-haskell/pandoc-types-1.12.4:=[profile?] <dev-haskell/pandoc-types-1.13:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.2:=[profile?] >=dev-haskell/scientific-0.2:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-haskell/sha-1.6:=[profile?] <dev-haskell/sha-1.7:=[profile?] >=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.6:=[profile?] >=dev-haskell/tagsoup-0.13.1:=[profile?] <dev-haskell/tagsoup-0.14:=[profile?] >=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.3:=[profile?] >=dev-haskell/texmath-0.8.1:=[profile?] <dev-haskell/texmath-0.9:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.12:=[profile?] >=dev-haskell/xml-1.3.12:=[profile?] <dev-haskell/xml-1.4:=[profile?] >=dev-haskell/yaml-0.8.8.2:=[profile?] <dev-haskell/yaml-0.9:=[profile?] >=dev-haskell/zip-archive-0.2.3.4:=[profile?] <dev-haskell/zip-archive-0.3:=[profile?] >=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.7:=[profile?] >=dev-lang/ghc-7.4.1:= https? ( >=dev-haskell/http-client-0.3.2:=[profile?] <dev-haskell/http-client-0.5:=[profile?] >=dev-haskell/http-client-tls-0.2:=[profile?] <dev-haskell/http-client-tls-0.3:=[profile?] >=dev-haskell/http-types-0.8:=[profile?] <dev-haskell/http-types-0.9:=[profile?] ) network-uri? ( >=dev-haskell/network-2.6:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] ) !network-uri? ( >=dev-haskell/network-2:=[profile?] <dev-haskell/network-2.6:=[profile?] ) trypandoc? ( >=dev-haskell/wai-0.3:=[profile?] dev-haskell/wai-extra:=[profile?] !https? ( dev-haskell/http-types:=[profile?] ) ) >=dev-haskell/cabal-1.10 test? ( >=dev-haskell/ansi-terminal-0.5 <dev-haskell/ansi-terminal-0.7 >=dev-haskell/diff-0.2 <dev-haskell/diff-0.4 >=dev-haskell/executable-path-0.0 <dev-haskell/executable-path-0.1 >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.3 >=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.9 >=dev-haskell/test-framework-0.3 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-hunit-0.2 <dev-haskell/test-framework-hunit-0.4 >=dev-haskell/test-framework-quickcheck2-0.2.9 <dev-haskell/test-framework-quickcheck2-0.4 ) embed_data_files? ( dev-haskell/hsb2hs ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Conversion between markup formats
-EAPI=5
-HOMEPAGE=http://pandoc.org
-IUSE=embed_data_files +https +network-uri trypandoc doc hscolour profile test
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=dev-haskell/aeson-0.7.0.5:=[profile?] <dev-haskell/aeson-0.10:=[profile?] >=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?] >=dev-haskell/binary-0.5:=[profile?] <dev-haskell/binary-0.8:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.9:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] <dev-haskell/blaze-markup-0.8:=[profile?] >=dev-haskell/cmark-0.4.0.1:=[profile?] <dev-haskell/cmark-0.5:=[profile?] >=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.6:=[profile?] >=dev-haskell/deepseq-generics-0.1:=[profile?] <dev-haskell/deepseq-generics-0.2:=[profile?] >=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?] >=dev-haskell/filemanip-0.3:=[profile?] <dev-haskell/filemanip-0.4:=[profile?] >=dev-haskell/haddock-library-1.1:=[profile?] <dev-haskell/haddock-library-1.3:=[profile?] >=dev-haskell/highlighting-kate-0.6:=[profile?] <dev-haskell/highlighting-kate-0.7:=[profile?] >=dev-haskell/hslua-0.3:=[profile?] <dev-haskell/hslua-0.5:=[profile?] >=dev-haskell/http-4000.0.5:=[profile?] <dev-haskell/http-4000.3:=[profile?] >=dev-haskell/juicypixels-3.1.6.1:=[profile?] <dev-haskell/juicypixels-3.3:=[profile?] >=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/old-locale-1:=[profile?] <dev-haskell/old-locale-1.1:=[profile?] dev-haskell/old-time:=[profile?] >=dev-haskell/pandoc-types-1.12.4:=[profile?] <dev-haskell/pandoc-types-1.13:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.2:=[profile?] >=dev-haskell/scientific-0.2:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-haskell/sha-1.6:=[profile?] <dev-haskell/sha-1.7:=[profile?] >=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.6:=[profile?] >=dev-haskell/tagsoup-0.13.1:=[profile?] <dev-haskell/tagsoup-0.14:=[profile?] >=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.3:=[profile?] >=dev-haskell/texmath-0.8.1:=[profile?] <dev-haskell/texmath-0.9:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.12:=[profile?] >=dev-haskell/xml-1.3.12:=[profile?] <dev-haskell/xml-1.4:=[profile?] >=dev-haskell/yaml-0.8.8.2:=[profile?] <dev-haskell/yaml-0.9:=[profile?] >=dev-haskell/zip-archive-0.2.3.4:=[profile?] <dev-haskell/zip-archive-0.3:=[profile?] >=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.7:=[profile?] >=dev-lang/ghc-7.4.1:= https? ( >=dev-haskell/http-client-0.3.2:=[profile?] <dev-haskell/http-client-0.5:=[profile?] >=dev-haskell/http-client-tls-0.2:=[profile?] <dev-haskell/http-client-tls-0.3:=[profile?] >=dev-haskell/http-types-0.8:=[profile?] <dev-haskell/http-types-0.9:=[profile?] ) network-uri? ( >=dev-haskell/network-2.6:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] ) !network-uri? ( >=dev-haskell/network-2:=[profile?] <dev-haskell/network-2.6:=[profile?] ) trypandoc? ( >=dev-haskell/wai-0.3:=[profile?] dev-haskell/wai-extra:=[profile?] !https? ( dev-haskell/http-types:=[profile?] ) )
-RESTRICT=test
-SLOT=0/1.15.0.6
-SRC_URI=mirror://hackage/packages/archive/pandoc/1.15.0.6/pandoc-1.15.0.6.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=5b3283d4038ca5c2505f46c611b650bc
diff --git a/app-text/pandoc-1.18 b/app-text/pandoc-1.18
deleted file mode 100644
index 399945bc3a19..000000000000
--- a/app-text/pandoc-1.18
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/aeson-0.7.0.5:=[profile?] <dev-haskell/aeson-1.1:=[profile?] >=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.9:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] <dev-haskell/blaze-markup-0.8:=[profile?] >=dev-haskell/cmark-0.5:=[profile?] <dev-haskell/cmark-0.6:=[profile?] >=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.8:=[profile?] >=dev-haskell/doctemplates-0.1:=[profile?] <dev-haskell/doctemplates-0.2:=[profile?] >=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?] >=dev-haskell/filemanip-0.3:=[profile?] <dev-haskell/filemanip-0.4:=[profile?] >=dev-haskell/haddock-library-1.1:=[profile?] <dev-haskell/haddock-library-1.5:=[profile?] >=dev-haskell/highlighting-kate-0.6.2:=[profile?] <dev-haskell/highlighting-kate-0.7:=[profile?] >=dev-haskell/hslua-0.3:=[profile?] <dev-haskell/hslua-0.5:=[profile?] >=dev-haskell/http-4000.0.5:=[profile?] <dev-haskell/http-4000.4:=[profile?] >=dev-haskell/juicypixels-3.1.6.1:=[profile?] <dev-haskell/juicypixels-3.3:=[profile?] >=dev-haskell/mtl-2.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/old-locale-1:=[profile?] <dev-haskell/old-locale-1.1:=[profile?] dev-haskell/old-time:=[profile?] >=dev-haskell/pandoc-types-1.17:=[profile?] <dev-haskell/pandoc-types-1.18:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.2:=[profile?] >=dev-haskell/scientific-0.2:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-haskell/sha-1.6:=[profile?] <dev-haskell/sha-1.7:=[profile?] >=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.7:=[profile?] >=dev-haskell/tagsoup-0.13.7:=[profile?] <dev-haskell/tagsoup-0.15:=[profile?] >=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.3:=[profile?] >=dev-haskell/texmath-0.8.6.5:=[profile?] <dev-haskell/texmath-0.9:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.12:=[profile?] >=dev-haskell/xml-1.3.12:=[profile?] <dev-haskell/xml-1.4:=[profile?] >=dev-haskell/yaml-0.8.8.2:=[profile?] <dev-haskell/yaml-0.9:=[profile?] >=dev-haskell/zip-archive-0.2.3.4:=[profile?] <dev-haskell/zip-archive-0.4:=[profile?] >=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.7:=[profile?] >=dev-lang/ghc-7.8.2:= https? ( >=dev-haskell/http-client-0.4.30:=[profile?] <dev-haskell/http-client-0.6:=[profile?] >=dev-haskell/http-client-tls-0.2.4:=[profile?] <dev-haskell/http-client-tls-0.4:=[profile?] >=dev-haskell/http-types-0.8:=[profile?] <dev-haskell/http-types-0.10:=[profile?] ) network-uri? ( >=dev-haskell/network-2.6:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] ) !network-uri? ( >=dev-haskell/network-2:=[profile?] <dev-haskell/network-2.6:=[profile?] ) trypandoc? ( >=dev-haskell/wai-0.3:=[profile?] dev-haskell/wai-extra:=[profile?] !https? ( dev-haskell/http-types:=[profile?] ) ) >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/ansi-terminal-0.5 <dev-haskell/ansi-terminal-0.7 >=dev-haskell/diff-0.2 <dev-haskell/diff-0.4 >=dev-haskell/executable-path-0.0 <dev-haskell/executable-path-0.1 >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.6 >=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.10 >=dev-haskell/test-framework-0.3 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-hunit-0.2 <dev-haskell/test-framework-hunit-0.4 >=dev-haskell/test-framework-quickcheck2-0.2.9 <dev-haskell/test-framework-quickcheck2-0.4 ) embed_data_files? ( dev-haskell/hsb2hs ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Conversion between markup formats
-EAPI=6
-HOMEPAGE=http://pandoc.org
-IUSE=embed_data_files +https +network-uri trypandoc doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-haskell/aeson-0.7.0.5:=[profile?] <dev-haskell/aeson-1.1:=[profile?] >=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.9:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] <dev-haskell/blaze-markup-0.8:=[profile?] >=dev-haskell/cmark-0.5:=[profile?] <dev-haskell/cmark-0.6:=[profile?] >=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.8:=[profile?] >=dev-haskell/doctemplates-0.1:=[profile?] <dev-haskell/doctemplates-0.2:=[profile?] >=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?] >=dev-haskell/filemanip-0.3:=[profile?] <dev-haskell/filemanip-0.4:=[profile?] >=dev-haskell/haddock-library-1.1:=[profile?] <dev-haskell/haddock-library-1.5:=[profile?] >=dev-haskell/highlighting-kate-0.6.2:=[profile?] <dev-haskell/highlighting-kate-0.7:=[profile?] >=dev-haskell/hslua-0.3:=[profile?] <dev-haskell/hslua-0.5:=[profile?] >=dev-haskell/http-4000.0.5:=[profile?] <dev-haskell/http-4000.4:=[profile?] >=dev-haskell/juicypixels-3.1.6.1:=[profile?] <dev-haskell/juicypixels-3.3:=[profile?] >=dev-haskell/mtl-2.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/old-locale-1:=[profile?] <dev-haskell/old-locale-1.1:=[profile?] dev-haskell/old-time:=[profile?] >=dev-haskell/pandoc-types-1.17:=[profile?] <dev-haskell/pandoc-types-1.18:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.2:=[profile?] >=dev-haskell/scientific-0.2:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-haskell/sha-1.6:=[profile?] <dev-haskell/sha-1.7:=[profile?] >=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.7:=[profile?] >=dev-haskell/tagsoup-0.13.7:=[profile?] <dev-haskell/tagsoup-0.15:=[profile?] >=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.3:=[profile?] >=dev-haskell/texmath-0.8.6.5:=[profile?] <dev-haskell/texmath-0.9:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.12:=[profile?] >=dev-haskell/xml-1.3.12:=[profile?] <dev-haskell/xml-1.4:=[profile?] >=dev-haskell/yaml-0.8.8.2:=[profile?] <dev-haskell/yaml-0.9:=[profile?] >=dev-haskell/zip-archive-0.2.3.4:=[profile?] <dev-haskell/zip-archive-0.4:=[profile?] >=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.7:=[profile?] >=dev-lang/ghc-7.8.2:= https? ( >=dev-haskell/http-client-0.4.30:=[profile?] <dev-haskell/http-client-0.6:=[profile?] >=dev-haskell/http-client-tls-0.2.4:=[profile?] <dev-haskell/http-client-tls-0.4:=[profile?] >=dev-haskell/http-types-0.8:=[profile?] <dev-haskell/http-types-0.10:=[profile?] ) network-uri? ( >=dev-haskell/network-2.6:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] ) !network-uri? ( >=dev-haskell/network-2:=[profile?] <dev-haskell/network-2.6:=[profile?] ) trypandoc? ( >=dev-haskell/wai-0.3:=[profile?] dev-haskell/wai-extra:=[profile?] !https? ( dev-haskell/http-types:=[profile?] ) )
-RESTRICT=test
-SLOT=0/1.18
-SRC_URI=mirror://hackage/packages/archive/pandoc/1.18/pandoc-1.18.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=fe98fd18acff8a303ac8583d60f41718
diff --git a/app-text/pandoc-1.19.2.1 b/app-text/pandoc-1.19.2.1
deleted file mode 100644
index 63d5a42581da..000000000000
--- a/app-text/pandoc-1.19.2.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=dev-haskell/aeson-0.7.0.5:=[profile?] <dev-haskell/aeson-1.2:=[profile?] >=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.10:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] <dev-haskell/blaze-markup-0.9:=[profile?] >=dev-haskell/cmark-0.5:=[profile?] <dev-haskell/cmark-0.6:=[profile?] >=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.8:=[profile?] >=dev-haskell/doctemplates-0.1:=[profile?] <dev-haskell/doctemplates-0.2:=[profile?] >=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?] >=dev-haskell/filemanip-0.3:=[profile?] <dev-haskell/filemanip-0.4:=[profile?] >=dev-haskell/haddock-library-1.1:=[profile?] <dev-haskell/haddock-library-1.5:=[profile?] >=dev-haskell/hslua-0.3:=[profile?] <dev-haskell/hslua-0.5:=[profile?] >=dev-haskell/http-4000.0.5:=[profile?] <dev-haskell/http-4000.4:=[profile?] >=dev-haskell/juicypixels-3.1.6.1:=[profile?] <dev-haskell/juicypixels-3.3:=[profile?] >=dev-haskell/mtl-2.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/old-locale-1:=[profile?] <dev-haskell/old-locale-1.1:=[profile?] dev-haskell/old-time:=[profile?] >=dev-haskell/pandoc-types-1.17:=[profile?] <dev-haskell/pandoc-types-1.18:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.2:=[profile?] >=dev-haskell/scientific-0.2:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-haskell/sha-1.6:=[profile?] <dev-haskell/sha-1.7:=[profile?] >=dev-haskell/skylighting-0.1.1.4:=[profile?] <dev-haskell/skylighting-0.2:=[profile?] >=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.7:=[profile?] >=dev-haskell/tagsoup-0.13.7:=[profile?] <dev-haskell/tagsoup-0.15:=[profile?] >=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.3:=[profile?] >=dev-haskell/texmath-0.9:=[profile?] <dev-haskell/texmath-0.10:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-haskell/xml-1.3.12:=[profile?] <dev-haskell/xml-1.4:=[profile?] >=dev-haskell/yaml-0.8.8.2:=[profile?] <dev-haskell/yaml-0.9:=[profile?] >=dev-haskell/zip-archive-0.2.3.4:=[profile?] <dev-haskell/zip-archive-0.4:=[profile?] >=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.7:=[profile?] >=dev-lang/ghc-7.8.2:= https? ( >=dev-haskell/http-client-0.4.30:=[profile?] <dev-haskell/http-client-0.6:=[profile?] >=dev-haskell/http-client-tls-0.2.4:=[profile?] <dev-haskell/http-client-tls-0.4:=[profile?] >=dev-haskell/http-types-0.8:=[profile?] <dev-haskell/http-types-0.10:=[profile?] ) network-uri? ( >=dev-haskell/network-2.6:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] ) !network-uri? ( >=dev-haskell/network-2:=[profile?] <dev-haskell/network-2.6:=[profile?] ) trypandoc? ( >=dev-haskell/wai-0.3:=[profile?] dev-haskell/wai-extra:=[profile?] !https? ( dev-haskell/http-types:=[profile?] ) ) weigh-pandoc? ( >=dev-haskell/weigh-0.0:=[profile?] <dev-haskell/weigh-0.1:=[profile?] ) >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/ansi-terminal-0.5 <dev-haskell/ansi-terminal-0.7 >=dev-haskell/diff-0.2 <dev-haskell/diff-0.4 >=dev-haskell/executable-path-0.0 <dev-haskell/executable-path-0.1 >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.6 >=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.10 >=dev-haskell/test-framework-0.3 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-hunit-0.2 <dev-haskell/test-framework-hunit-0.4 >=dev-haskell/test-framework-quickcheck2-0.2.9 <dev-haskell/test-framework-quickcheck2-0.4 ) embed_data_files? ( dev-haskell/hsb2hs ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Conversion between markup formats
-EAPI=6
-HOMEPAGE=http://pandoc.org
-IUSE=embed_data_files +https +network-uri trypandoc weigh-pandoc doc hscolour profile test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-haskell/aeson-0.7.0.5:=[profile?] <dev-haskell/aeson-1.2:=[profile?] >=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.10:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] <dev-haskell/blaze-markup-0.9:=[profile?] >=dev-haskell/cmark-0.5:=[profile?] <dev-haskell/cmark-0.6:=[profile?] >=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.8:=[profile?] >=dev-haskell/doctemplates-0.1:=[profile?] <dev-haskell/doctemplates-0.2:=[profile?] >=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?] >=dev-haskell/filemanip-0.3:=[profile?] <dev-haskell/filemanip-0.4:=[profile?] >=dev-haskell/haddock-library-1.1:=[profile?] <dev-haskell/haddock-library-1.5:=[profile?] >=dev-haskell/hslua-0.3:=[profile?] <dev-haskell/hslua-0.5:=[profile?] >=dev-haskell/http-4000.0.5:=[profile?] <dev-haskell/http-4000.4:=[profile?] >=dev-haskell/juicypixels-3.1.6.1:=[profile?] <dev-haskell/juicypixels-3.3:=[profile?] >=dev-haskell/mtl-2.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/old-locale-1:=[profile?] <dev-haskell/old-locale-1.1:=[profile?] dev-haskell/old-time:=[profile?] >=dev-haskell/pandoc-types-1.17:=[profile?] <dev-haskell/pandoc-types-1.18:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.2:=[profile?] >=dev-haskell/scientific-0.2:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-haskell/sha-1.6:=[profile?] <dev-haskell/sha-1.7:=[profile?] >=dev-haskell/skylighting-0.1.1.4:=[profile?] <dev-haskell/skylighting-0.2:=[profile?] >=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.7:=[profile?] >=dev-haskell/tagsoup-0.13.7:=[profile?] <dev-haskell/tagsoup-0.15:=[profile?] >=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.3:=[profile?] >=dev-haskell/texmath-0.9:=[profile?] <dev-haskell/texmath-0.10:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-haskell/xml-1.3.12:=[profile?] <dev-haskell/xml-1.4:=[profile?] >=dev-haskell/yaml-0.8.8.2:=[profile?] <dev-haskell/yaml-0.9:=[profile?] >=dev-haskell/zip-archive-0.2.3.4:=[profile?] <dev-haskell/zip-archive-0.4:=[profile?] >=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.7:=[profile?] >=dev-lang/ghc-7.8.2:= https? ( >=dev-haskell/http-client-0.4.30:=[profile?] <dev-haskell/http-client-0.6:=[profile?] >=dev-haskell/http-client-tls-0.2.4:=[profile?] <dev-haskell/http-client-tls-0.4:=[profile?] >=dev-haskell/http-types-0.8:=[profile?] <dev-haskell/http-types-0.10:=[profile?] ) network-uri? ( >=dev-haskell/network-2.6:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] ) !network-uri? ( >=dev-haskell/network-2:=[profile?] <dev-haskell/network-2.6:=[profile?] ) trypandoc? ( >=dev-haskell/wai-0.3:=[profile?] dev-haskell/wai-extra:=[profile?] !https? ( dev-haskell/http-types:=[profile?] ) ) weigh-pandoc? ( >=dev-haskell/weigh-0.0:=[profile?] <dev-haskell/weigh-0.1:=[profile?] )
-SLOT=0/1.19.2.1
-SRC_URI=mirror://hackage/packages/archive/pandoc/1.19.2.1/pandoc-1.19.2.1.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=b742f5d202e83036987cf46e828b0ca4
diff --git a/app-text/pandoc-1.19.2.1-r1 b/app-text/pandoc-1.19.2.1-r1
deleted file mode 100644
index b5cf4b7be3aa..000000000000
--- a/app-text/pandoc-1.19.2.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=dev-haskell/aeson-0.7.0.5:=[profile?] <dev-haskell/aeson-1.2:=[profile?] >=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.10:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] <dev-haskell/blaze-markup-0.9:=[profile?] >=dev-haskell/cmark-0.5:=[profile?] <dev-haskell/cmark-0.6:=[profile?] >=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.8:=[profile?] >=dev-haskell/doctemplates-0.1:=[profile?] <dev-haskell/doctemplates-0.2:=[profile?] >=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?] >=dev-haskell/filemanip-0.3:=[profile?] <dev-haskell/filemanip-0.4:=[profile?] >=dev-haskell/haddock-library-1.1:=[profile?] <dev-haskell/haddock-library-1.5:=[profile?] >=dev-haskell/hslua-0.3:=[profile?] <dev-haskell/hslua-0.5:=[profile?] >=dev-haskell/http-4000.0.5:=[profile?] <dev-haskell/http-4000.4:=[profile?] >=dev-haskell/juicypixels-3.1.6.1:=[profile?] <dev-haskell/juicypixels-3.3:=[profile?] >=dev-haskell/mtl-2.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/old-locale-1:=[profile?] <dev-haskell/old-locale-1.1:=[profile?] dev-haskell/old-time:=[profile?] >=dev-haskell/pandoc-types-1.17:=[profile?] <dev-haskell/pandoc-types-1.18:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.2:=[profile?] >=dev-haskell/scientific-0.2:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-haskell/sha-1.6:=[profile?] <dev-haskell/sha-1.7:=[profile?] >=dev-haskell/skylighting-0.1.1.4:=[profile?] >=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.7:=[profile?] >=dev-haskell/tagsoup-0.13.7:=[profile?] <dev-haskell/tagsoup-0.15:=[profile?] >=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.3:=[profile?] >=dev-haskell/texmath-0.9:=[profile?] <dev-haskell/texmath-0.10:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-haskell/xml-1.3.12:=[profile?] <dev-haskell/xml-1.4:=[profile?] >=dev-haskell/yaml-0.8.8.2:=[profile?] <dev-haskell/yaml-0.9:=[profile?] >=dev-haskell/zip-archive-0.2.3.4:=[profile?] <dev-haskell/zip-archive-0.4:=[profile?] >=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.7:=[profile?] >=dev-lang/ghc-7.8.2:= https? ( >=dev-haskell/http-client-0.4.30:=[profile?] <dev-haskell/http-client-0.6:=[profile?] >=dev-haskell/http-client-tls-0.2.4:=[profile?] <dev-haskell/http-client-tls-0.4:=[profile?] >=dev-haskell/http-types-0.8:=[profile?] <dev-haskell/http-types-0.10:=[profile?] ) network-uri? ( >=dev-haskell/network-2.6:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] ) !network-uri? ( >=dev-haskell/network-2:=[profile?] <dev-haskell/network-2.6:=[profile?] ) trypandoc? ( >=dev-haskell/wai-0.3:=[profile?] dev-haskell/wai-extra:=[profile?] !https? ( dev-haskell/http-types:=[profile?] ) ) weigh-pandoc? ( >=dev-haskell/weigh-0.0:=[profile?] <dev-haskell/weigh-0.1:=[profile?] ) >=dev-haskell/cabal-1.18.1.3 test? ( >=dev-haskell/ansi-terminal-0.5 <dev-haskell/ansi-terminal-0.7 >=dev-haskell/diff-0.2 <dev-haskell/diff-0.4 >=dev-haskell/executable-path-0.0 <dev-haskell/executable-path-0.1 >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.6 >=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.10 >=dev-haskell/test-framework-0.3 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-hunit-0.2 <dev-haskell/test-framework-hunit-0.4 >=dev-haskell/test-framework-quickcheck2-0.2.9 <dev-haskell/test-framework-quickcheck2-0.4 ) embed_data_files? ( dev-haskell/hsb2hs ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
-DESCRIPTION=Conversion between markup formats
-EAPI=6
-HOMEPAGE=http://pandoc.org
-IUSE=embed_data_files +https +network-uri trypandoc weigh-pandoc doc hscolour profile test
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=dev-haskell/aeson-0.7.0.5:=[profile?] <dev-haskell/aeson-1.2:=[profile?] >=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.10:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] <dev-haskell/blaze-markup-0.9:=[profile?] >=dev-haskell/cmark-0.5:=[profile?] <dev-haskell/cmark-0.6:=[profile?] >=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.8:=[profile?] >=dev-haskell/doctemplates-0.1:=[profile?] <dev-haskell/doctemplates-0.2:=[profile?] >=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?] >=dev-haskell/filemanip-0.3:=[profile?] <dev-haskell/filemanip-0.4:=[profile?] >=dev-haskell/haddock-library-1.1:=[profile?] <dev-haskell/haddock-library-1.5:=[profile?] >=dev-haskell/hslua-0.3:=[profile?] <dev-haskell/hslua-0.5:=[profile?] >=dev-haskell/http-4000.0.5:=[profile?] <dev-haskell/http-4000.4:=[profile?] >=dev-haskell/juicypixels-3.1.6.1:=[profile?] <dev-haskell/juicypixels-3.3:=[profile?] >=dev-haskell/mtl-2.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?] >=dev-haskell/old-locale-1:=[profile?] <dev-haskell/old-locale-1.1:=[profile?] dev-haskell/old-time:=[profile?] >=dev-haskell/pandoc-types-1.17:=[profile?] <dev-haskell/pandoc-types-1.18:=[profile?] >=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?] >=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.2:=[profile?] >=dev-haskell/scientific-0.2:=[profile?] <dev-haskell/scientific-0.4:=[profile?] >=dev-haskell/sha-1.6:=[profile?] <dev-haskell/sha-1.7:=[profile?] >=dev-haskell/skylighting-0.1.1.4:=[profile?] >=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.7:=[profile?] >=dev-haskell/tagsoup-0.13.7:=[profile?] <dev-haskell/tagsoup-0.15:=[profile?] >=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.3:=[profile?] >=dev-haskell/texmath-0.9:=[profile?] <dev-haskell/texmath-0.10:=[profile?] >=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.13:=[profile?] >=dev-haskell/xml-1.3.12:=[profile?] <dev-haskell/xml-1.4:=[profile?] >=dev-haskell/yaml-0.8.8.2:=[profile?] <dev-haskell/yaml-0.9:=[profile?] >=dev-haskell/zip-archive-0.2.3.4:=[profile?] <dev-haskell/zip-archive-0.4:=[profile?] >=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.7:=[profile?] >=dev-lang/ghc-7.8.2:= https? ( >=dev-haskell/http-client-0.4.30:=[profile?] <dev-haskell/http-client-0.6:=[profile?] >=dev-haskell/http-client-tls-0.2.4:=[profile?] <dev-haskell/http-client-tls-0.4:=[profile?] >=dev-haskell/http-types-0.8:=[profile?] <dev-haskell/http-types-0.10:=[profile?] ) network-uri? ( >=dev-haskell/network-2.6:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] ) !network-uri? ( >=dev-haskell/network-2:=[profile?] <dev-haskell/network-2.6:=[profile?] ) trypandoc? ( >=dev-haskell/wai-0.3:=[profile?] dev-haskell/wai-extra:=[profile?] !https? ( dev-haskell/http-types:=[profile?] ) ) weigh-pandoc? ( >=dev-haskell/weigh-0.0:=[profile?] <dev-haskell/weigh-0.1:=[profile?] )
-SLOT=0/1.19.2.1
-SRC_URI=mirror://hackage/packages/archive/pandoc/1.19.2.1/pandoc-1.19.2.1.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ghc-package	a0d34e2f5f204f01c404ae1ce539542a	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=24d56ca5d5cc465ef9194a01ed0cee94
diff --git a/app-text/pandoc/Manifest b/app-text/pandoc/Manifest
new file mode 100644
index 000000000000..9010226dba0b
--- /dev/null
+++ b/app-text/pandoc/Manifest
@@ -0,0 +1,15 @@
+AUX pandoc-1.15.0.6-no-https.patch 407 BLAKE2B f884a11a29b111f2b7ba278aa3aa3b5a8a5b9ad0ee47b1881c4d163ca2266bcb1d311da81d66be93cb379704e6b7b365b335f8d6248626b40fd048a796db2b78 SHA512 3c8901649fdedd56bd6ae65af5667c563a04aff8f282194cfb70ae343408d82a6842e9e2e46be73f1938db889773fe946ae8da46bca45acbc882f5eabbf747e1
+DIST pandoc-1.12.4.2.tar.gz 1048263 BLAKE2B 0caef0e612dc45be1a4fec59143ea4640229fdf10f55074afb0e986c3384a0a9c71936b2ee4a981fa0a095fcf79b2c946eb1c8798e43693c8fcf9c886855ba9e SHA512 fd9f056350bb8b4981eaa0960f841a3e8b40956cc3ee1593a3e2eaef4256d494c5d1c6fd537419e95498ccc9115408e5cb56ce1d6783a33824dc67af059a3743
+DIST pandoc-1.13.2.1.tar.gz 1999641 BLAKE2B bbf0f4bdb42a86a72995e3b3bcae7c3b452d6efa5bc68011c1eb87f2e0b024ef6a0df09011a8428f0ff67d6bbc8b53612baafc1312e8557e1c1fea46c4b32391 SHA512 3505e456705da7a370ebd9628959475a9dabaede5cf50b24a780783a814ac9e1efc84dfce37215dbc472af3cacbf05d13e8f447b6602700b2648fd13d170808d
+DIST pandoc-1.14.0.4.tar.gz 2052114 BLAKE2B 12de5d3ab457718708f3181e78879b511c90ebbdb1c8c3477f45e277ce88b4f8c37d93fbf0040f287675010010f7cfe2ce9f10b206e8094683b8b781ebaa9718 SHA512 57d5e43179ae499ec95ec09fbdbf22ad1d7406fcb7151e9c608d9c0ac69e3b5f7eea6b50fd5d2526d52e9227e7fb05c5bda9da13a21537c582f1c2d4b9779443
+DIST pandoc-1.15.0.6.tar.gz 2049870 BLAKE2B d1495abd3451ec6e14fa13ca022051813bf736b9c15ff6106987c00bd53672fe027ad87d43d81faa15d50694fa1735a5ec31472738ff2b9a496e78d27c7656c9 SHA512 4c9bfea7440d6bdb72fb10a9a99b69c018db0ef0f1028d86b032e6c4df215c86566b93fd55c5cba7772d713d4ce3f764891de079dfa24de8ca21f818b7729211
+DIST pandoc-1.18.tar.gz 2711663 BLAKE2B 3c324917285eb0bff314ff04add75aa6dfa381d1bb8dcc99078284be8c93cb8f5f9bacd9e557be1f07b2e6a4137b74d10e769b42e08f27bdfa0c6bd71aca4b12 SHA512 52bc68e9586366433e522a867946adf2e03219dfa4ca63cd6ff318ebb251f77ab16aa18f0350605fa31f8e085bb6cac9055f9661a0ef3cb5693faba9e124d049
+DIST pandoc-1.19.2.1.tar.gz 2755101 BLAKE2B 1314ebe4084dd39521fed89c1d14b8365f2bfb40c6f8ff581ab6b2566bf5e5ef43c4014e383c2e17ac10bc66cbb159ae60a718d399873084b68c7fcd5fb90f2b SHA512 bb814c162b68efd00f249899ebb2cffa07c69bf0ac73838191de8da38dbc9a37b9edb0c24473c7ac8f816c0105d340ca7387c5f5c6f07a908e1537f4d35ef2f9
+EBUILD pandoc-1.12.4.2-r1.ebuild 4149 BLAKE2B 2bcc691e16ba0d762b3d55e4c8e78efa6abdd18d067cede51ff559953dc71ce0a74180ae1089ef94ed96448458b283c2af5432830a94c33cb170d25bc51b705b SHA512 2eae02132cfa1c375614427c5396478579eb028bf4aca572c1dac71762a71f8c9ecf716c3282747b041c5132344732cf94b018a0450ee4398f2e502dcbc9899d
+EBUILD pandoc-1.13.2.1.ebuild 5041 BLAKE2B de2eb89a53e038f4a8fb2c888e95de399c116894091a48afed8d0e8555400e9f26cdd995e6ef198c45770f20c2dc0ccf3ce908986e840600e6b24db0ad3d99bd SHA512 b7c0f5e5a9a90e02ff91424829d49a7917de7ac561fa9b848c88fa8e9e064049c284f22d34e1380b3ce059730aa77a09a94f68481f40978d427922a5a4c4ad60
+EBUILD pandoc-1.14.0.4.ebuild 5340 BLAKE2B 0ae7446510153b74ddb2ea366edde8b13fc1b0c2f1231d5fa36f7914a03db6ac41d0e42f5c712bacbd0c0f24f5483eab70b468492236427a4acd2f27540dd538 SHA512 23a41dc824605ee67f99d0ce1b3aec123e9389baed04e56c16f534d1ed469c673a7d764d157e12b037a1d29a8ead4ebeb84defc7ac6a1368618c0a42cb4a44f0
+EBUILD pandoc-1.15.0.6.ebuild 4925 BLAKE2B ffd8c3846c7487b1ef3a42145b5ca6f543ea18a3aa95e23504cf891c2bd26a428b57aea4e1191c768ee4afea32dfcd11ec4fdebb3f55d3173bf29b344c247d6c SHA512 8f54615ba43f4ad98d8bf4f683a43a0be1a04f4eb1fb85958585752291e7713879475c0e325fcd6f89df18c0a2fa3a8b06cee7a19f78f75bd2b43686cecb61ce
+EBUILD pandoc-1.18.ebuild 4837 BLAKE2B e37424db0529ae3939b7c2e0e38a238e80410b7c0858bfdffd9d4b48865e53d60f02aee1194fc1ba1718662b27c6eaa387ff39fe966b7b8c4b88a353df03d32b SHA512 569cc13dbe08ba3863f911e1c9c31644e518f73a695c5f0aa84f23c73ee6b5c3f4cc0cebc3167e942c074c67318efff5a6be11ec3d6ba93c54f4c3d5dca7d056
+EBUILD pandoc-1.19.2.1-r1.ebuild 4913 BLAKE2B dd906885a6fd2dd907f1eeac91d58033616a1960cb6866f178b6fbf7569a99222fdbf6123429e430ec79c1f4b1f952c15c76d83148bb3edb7bc527eb8f86a288 SHA512 77b9a05d6ebe40673a5792074e022d8b97fd47531bf434c461b45c69d92f7b3267147205c6da1004e89a1bea03b93848fdeb604f175fd0072bc2fd6784aa2df0
+EBUILD pandoc-1.19.2.1.ebuild 4787 BLAKE2B c9b552131459c444255d3b1151ec702f8b39f0ed29c9dc8e7c96618524bb50b76b28176187f54719150b57f531f97292f707e99bf4dff994ec2cd6deb254fe29 SHA512 bb8b15ff611e70b0ef51972e73147cd768e154e44e6cfb7f09bbfdd8c5583dcb113c00d31c1df8d2b7aa5c4cc29e6f44db5af75dec2dc8d3415ab7b1e1b792a7
+MISC metadata.xml 1284 BLAKE2B 2870b0a838dde25aa218b69ca351aa95eadcc13ddba2953be9442bdeee56b9bba39e561bfdea019b1d1a2db8bca7ff99f5da37ba5b8836df5beb5c05ba3ceb44 SHA512 eb48931a43b32e6fdbd1d0abfbebd7b40ceae184705e95442cfe9e84ada734a98e72fc1c93dca165edeb4304e9f7e25271e667a85d0370066b2bc7fd0b4e4841
diff --git a/app-text/pandoc/files/pandoc-1.15.0.6-no-https.patch b/app-text/pandoc/files/pandoc-1.15.0.6-no-https.patch
new file mode 100644
index 000000000000..7e0f4d375a71
--- /dev/null
+++ b/app-text/pandoc/files/pandoc-1.15.0.6-no-https.patch
@@ -0,0 +1,12 @@
+diff --git a/src/Text/Pandoc/Shared.hs b/src/Text/Pandoc/Shared.hs
+index ef9f66a..50b0ec4 100644
+--- a/src/Text/Pandoc/Shared.hs
++++ b/src/Text/Pandoc/Shared.hs
+@@ -143,2 +143,3 @@ import Paths_pandoc (getDataFileName)
+ #endif
++import Codec.Archive.Zip
+ #ifdef HTTP_CLIENT
+@@ -152,3 +153,2 @@ import Network.HTTP.Types.Header ( hContentType)
+ import Network (withSocketsDo)
+-import Codec.Archive.Zip
+ #else
diff --git a/app-text/pandoc/metadata.xml b/app-text/pandoc/metadata.xml
new file mode 100644
index 000000000000..f0713d9bef06
--- /dev/null
+++ b/app-text/pandoc/metadata.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+	</maintainer>
+	<longdescription>
+		Pandoc is a Haskell library for converting from one markup
+		format to another, and a command-line tool that uses
+		this library. It can read markdown and (subsets of)
+		reStructuredText, HTML, LaTeX and Textile, and it can write
+		markdown, reStructuredText, HTML, LaTeX, ConTeXt, Docbook,
+		OpenDocument, ODT, RTF, MediaWiki, Textile, groff man pages,
+		plain text, Emacs Org-Mode, EPUB, and S5 and Slidy HTML
+		slide shows.
+	</longdescription>
+	<use>
+		<flag name="embed_data_files">Embed data files in binary for relocatable executable.</flag>
+		<flag name="http-conduit">Enable downloading of resources over https.</flag>
+		<flag name="trypandoc">Build trypandoc cgi executable.</flag>
+		<flag name="https">Enable support for downloading of resources over https.</flag>
+		<flag name="make-pandoc-man-pages">Build program to regenerate pandoc man pages from README.</flag>
+		<flag name="network-uri">Get Network.URI from the network-uri package.</flag>
+		<flag name="weigh-pandoc">Build weigh-pandoc to measure memory usage.</flag>
+	</use>
+</pkgmetadata>
diff --git a/app-text/pandoc/pandoc-1.12.4.2-r1.ebuild b/app-text/pandoc/pandoc-1.12.4.2-r1.ebuild
new file mode 100644
index 000000000000..65d34c37daf1
--- /dev/null
+++ b/app-text/pandoc/pandoc-1.12.4.2-r1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.9999
+
+CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Conversion between markup formats"
+HOMEPAGE="http://johnmacfarlane.net/pandoc"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="embed_data_files +http-conduit"
+
+RESTRICT=test # missing files
+
+RDEPEND=">=dev-haskell/aeson-0.7:=[profile?] <dev-haskell/aeson-0.8:=[profile?]
+	>=dev-haskell/attoparsec-0.10:=[profile?] <dev-haskell/attoparsec-0.13:=[profile?]
+	>=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?]
+	>=dev-haskell/binary-0.5:=[profile?] <dev-haskell/binary-0.8:=[profile?]
+	>=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.8:=[profile?]
+	>=dev-haskell/blaze-markup-0.5.1:=[profile?] <dev-haskell/blaze-markup-0.7:=[profile?]
+	>=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.6:=[profile?]
+	>=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?]
+	>=dev-haskell/highlighting-kate-0.5.8:=[profile?] <dev-haskell/highlighting-kate-0.6:=[profile?]
+	>=dev-haskell/hslua-0.3:=[profile?] <dev-haskell/hslua-0.4:=[profile?]
+	>=dev-haskell/http-4000.0.5:=[profile?] <dev-haskell/http-4000.3:=[profile?]
+	>=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
+	>=dev-haskell/network-2:=[profile?] <dev-haskell/network-2.6:=[profile?]
+	>=dev-haskell/pandoc-types-1.12.3.3:=[profile?] <dev-haskell/pandoc-types-1.13:=[profile?]
+	>=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
+	>=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.1:=[profile?]
+	>=dev-haskell/scientific-0.2:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
+	>=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.5:=[profile?]
+	>=dev-haskell/tagsoup-0.13.1:=[profile?] <dev-haskell/tagsoup-0.14:=[profile?]
+	>=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.3:=[profile?]
+	>=dev-haskell/texmath-0.6.6.1:=[profile?] <dev-haskell/texmath-0.7:=[profile?]
+	>=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.2:=[profile?]
+	>=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
+	>=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.11:=[profile?]
+	>=dev-haskell/xml-1.3.12:=[profile?] <dev-haskell/xml-1.4:=[profile?]
+	>=dev-haskell/yaml-0.8.8.2:=[profile?] <dev-haskell/yaml-0.9:=[profile?]
+	>=dev-haskell/zip-archive-0.1.3.3:=[profile?] <dev-haskell/zip-archive-0.3:=[profile?]
+	>=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.6:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+	embed_data_files? ( dev-haskell/hsb2hs )
+	http-conduit? ( >=dev-haskell/http-conduit-1.9:=[profile?] <dev-haskell/http-conduit-2.2:=[profile?]
+			>=dev-haskell/http-types-0.8:=[profile?] <dev-haskell/http-types-0.9:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	dev-haskell/alex
+	>=dev-haskell/cabal-1.10
+	dev-haskell/happy
+	test? ( >=dev-haskell/ansi-terminal-0.5 <dev-haskell/ansi-terminal-0.7
+		>=dev-haskell/diff-0.2 <dev-haskell/diff-0.4
+		>=dev-haskell/highlighting-kate-0.5.8 <dev-haskell/highlighting-kate-0.6
+		>=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.3
+		>=dev-haskell/pandoc-types-1.12.3.3 <dev-haskell/pandoc-types-1.13
+		>=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.8
+		>=dev-haskell/syb-0.1 <dev-haskell/syb-0.5
+		>=dev-haskell/test-framework-0.3 <dev-haskell/test-framework-0.9
+		>=dev-haskell/test-framework-hunit-0.2 <dev-haskell/test-framework-hunit-0.4
+		>=dev-haskell/test-framework-quickcheck2-0.2.9 <dev-haskell/test-framework-quickcheck2-0.4
+		>=dev-haskell/text-0.11 <dev-haskell/text-1.2 )
+"
+
+src_prepare() {
+	cabal_chdeps \
+		'scientific >= 0.2 && < 0.3' 'scientific >= 0.2 && < 0.4' \
+		'attoparsec >= 0.10 && < 0.12' 'attoparsec >= 0.10 && < 0.13'
+}
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag embed_data_files embed_data_files) \
+		$(cabal_flag http-conduit http-conduit)
+}
diff --git a/app-text/pandoc/pandoc-1.13.2.1.ebuild b/app-text/pandoc/pandoc-1.13.2.1.ebuild
new file mode 100644
index 000000000000..bf83cd46d3c9
--- /dev/null
+++ b/app-text/pandoc/pandoc-1.13.2.1.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.5.9999
+
+CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Conversion between markup formats"
+HOMEPAGE="http://johnmacfarlane.net/pandoc"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="embed_data_files +https make-pandoc-man-pages +network-uri trypandoc"
+
+RESTRICT=test # likes to break on highlighting-kate update
+
+RDEPEND=">=dev-haskell/aeson-0.7.0.5:=[profile?]
+	>=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?]
+	>=dev-haskell/binary-0.5:=[profile?] <dev-haskell/binary-0.8:=[profile?]
+	>=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.9:=[profile?]
+	>=dev-haskell/blaze-markup-0.5.1:=[profile?] <dev-haskell/blaze-markup-0.8:=[profile?]
+	>=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.6:=[profile?]
+	>=dev-haskell/deepseq-generics-0.1:=[profile?] <dev-haskell/deepseq-generics-0.2:=[profile?]
+	>=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?]
+	>=dev-haskell/haddock-library-1.1:=[profile?] <dev-haskell/haddock-library-1.3:=[profile?]
+	>=dev-haskell/highlighting-kate-0.5.11.1:=[profile?]
+	>=dev-haskell/hslua-0.3:=[profile?] <dev-haskell/hslua-0.4:=[profile?]
+	>=dev-haskell/http-4000.0.5:=[profile?] <dev-haskell/http-4000.3:=[profile?]
+	>=dev-haskell/juicypixels-3.1.6.1:=[profile?] <dev-haskell/juicypixels-3.3:=[profile?]
+	>=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
+	>=dev-haskell/old-locale-1:=[profile?] <dev-haskell/old-locale-1.1:=[profile?]
+	>=dev-haskell/old-time-1.0:=[profile?] <dev-haskell/old-time-1.2:=[profile?]
+	>=dev-haskell/pandoc-types-1.12.4:=[profile?] <dev-haskell/pandoc-types-1.13:=[profile?]
+	>=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
+	>=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.2:=[profile?]
+	>=dev-haskell/scientific-0.2:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
+	>=dev-haskell/sha-1.6:=[profile?] <dev-haskell/sha-1.7:=[profile?]
+	>=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.5:=[profile?]
+	>=dev-haskell/tagsoup-0.13.1:=[profile?] <dev-haskell/tagsoup-0.14:=[profile?]
+	>=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.3:=[profile?]
+	>=dev-haskell/texmath-0.8.0.1:=[profile?] <dev-haskell/texmath-0.9:=[profile?]
+	>=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?]
+	>=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
+	>=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.11:=[profile?]
+	>=dev-haskell/xml-1.3.12:=[profile?] <dev-haskell/xml-1.4:=[profile?]
+	>=dev-haskell/yaml-0.8.8.2:=[profile?] <dev-haskell/yaml-0.9:=[profile?]
+	>=dev-haskell/zip-archive-0.2.3.4:=[profile?] <dev-haskell/zip-archive-0.3:=[profile?]
+	>=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.6:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+	embed_data_files? ( dev-haskell/hsb2hs )
+	https? ( >=dev-haskell/http-client-0.3.2:=[profile?] <dev-haskell/http-client-0.5:=[profile?]
+			>=dev-haskell/http-client-tls-0.2:=[profile?] <dev-haskell/http-client-tls-0.3:=[profile?]
+			>=dev-haskell/http-types-0.8:=[profile?] <dev-haskell/http-types-0.9:=[profile?] )
+	network-uri? ( >=dev-haskell/network-2.6:=[profile?]
+			>=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] )
+	!network-uri? ( >=dev-haskell/network-2:=[profile?] <dev-haskell/network-2.6:=[profile?] )
+	trypandoc? ( >=dev-haskell/wai-0.3:=[profile?]
+			dev-haskell/wai-extra:=[profile?]
+			!https? ( dev-haskell/http-types:=[profile?] ) )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+	test? ( >=dev-haskell/ansi-terminal-0.5 <dev-haskell/ansi-terminal-0.7
+		>=dev-haskell/diff-0.2 <dev-haskell/diff-0.4
+		>=dev-haskell/executable-path-0.0 <dev-haskell/executable-path-0.1
+		>=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.3
+		>=dev-haskell/quickcheck-2.4:2
+		>=dev-haskell/test-framework-0.3 <dev-haskell/test-framework-0.9
+		>=dev-haskell/test-framework-hunit-0.2 <dev-haskell/test-framework-hunit-0.4
+		>=dev-haskell/test-framework-quickcheck2-0.2.9 <dev-haskell/test-framework-quickcheck2-0.4 )
+"
+
+src_prepare() {
+	cabal_chdeps \
+		'QuickCheck >= 2.4 && < 2.8' 'QuickCheck >= 2.4' \
+		'aeson >= 0.7 && < 0.9'  'aeson >= 0.7' \
+		'aeson >= 0.7.0.5 && < 0.9' 'aeson >= 0.7.0.5' \
+		'highlighting-kate >= 0.5.11.1 && < 0.6' 'highlighting-kate >= 0.5.11.1'
+}
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag embed_data_files embed_data_files) \
+		$(cabal_flag https https) \
+		$(cabal_flag make-pandoc-man-pages make-pandoc-man-pages) \
+		$(cabal_flag network-uri network-uri) \
+		$(cabal_flag trypandoc trypandoc)
+}
+
+src_install() {
+	haskell-cabal_src_install
+
+	doman man/man1/pandoc.1
+	doman man/man5/pandoc_markdown.5
+}
diff --git a/app-text/pandoc/pandoc-1.14.0.4.ebuild b/app-text/pandoc/pandoc-1.14.0.4.ebuild
new file mode 100644
index 000000000000..360b86c14045
--- /dev/null
+++ b/app-text/pandoc/pandoc-1.14.0.4.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.5.9999
+
+CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Conversion between markup formats"
+HOMEPAGE="http://johnmacfarlane.net/pandoc"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="embed_data_files +https make-pandoc-man-pages +network-uri trypandoc"
+
+RESTRICT=test # likes to break on highlighting-kate update
+
+RDEPEND=">=dev-haskell/aeson-0.7.0.5:=[profile?] <dev-haskell/aeson-0.10:=[profile?]
+	>=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?]
+	>=dev-haskell/binary-0.5:=[profile?] <dev-haskell/binary-0.8:=[profile?]
+	>=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.9:=[profile?]
+	>=dev-haskell/blaze-markup-0.5.1:=[profile?] <dev-haskell/blaze-markup-0.8:=[profile?]
+	>=dev-haskell/cmark-0.3.3:=[profile?] <dev-haskell/cmark-0.4:=[profile?]
+	>=dev-haskell/css-text-0.1.2:=[profile?] <dev-haskell/css-text-0.3:=[profile?]
+	>=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.6:=[profile?]
+	>=dev-haskell/deepseq-generics-0.1:=[profile?] <dev-haskell/deepseq-generics-0.2:=[profile?]
+	>=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?]
+	>=dev-haskell/filemanip-0.3:=[profile?] <dev-haskell/filemanip-0.4:=[profile?]
+	>=dev-haskell/haddock-library-1.1:=[profile?] <dev-haskell/haddock-library-1.3:=[profile?]
+	>=dev-haskell/highlighting-kate-0.6:=[profile?] <dev-haskell/highlighting-kate-0.7:=[profile?]
+	>=dev-haskell/hslua-0.3:=[profile?] <dev-haskell/hslua-0.5:=[profile?]
+	>=dev-haskell/http-4000.0.5:=[profile?] <dev-haskell/http-4000.3:=[profile?]
+	>=dev-haskell/juicypixels-3.1.6.1:=[profile?] <dev-haskell/juicypixels-3.3:=[profile?]
+	>=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
+	>=dev-haskell/old-locale-1:=[profile?] <dev-haskell/old-locale-1.1:=[profile?]
+	>=dev-haskell/old-time-1.0:=[profile?] <dev-haskell/old-time-1.2:=[profile?]
+	>=dev-haskell/pandoc-types-1.12.4:=[profile?] <dev-haskell/pandoc-types-1.13:=[profile?]
+	>=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
+	>=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.2:=[profile?]
+	>=dev-haskell/scientific-0.2:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
+	>=dev-haskell/sha-1.6:=[profile?] <dev-haskell/sha-1.7:=[profile?]
+	>=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.6:=[profile?]
+	>=dev-haskell/tagsoup-0.13.1:=[profile?] <dev-haskell/tagsoup-0.14:=[profile?]
+	>=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.3:=[profile?]
+	>=dev-haskell/texmath-0.8.1:=[profile?] <dev-haskell/texmath-0.9:=[profile?]
+	>=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?]
+	>=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
+	>=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.11:=[profile?]
+	>=dev-haskell/xml-1.3.12:=[profile?] <dev-haskell/xml-1.4:=[profile?]
+	>=dev-haskell/yaml-0.8.8.2:=[profile?] <dev-haskell/yaml-0.9:=[profile?]
+	>=dev-haskell/zip-archive-0.2.3.4:=[profile?] <dev-haskell/zip-archive-0.3:=[profile?]
+	>=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.7:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+	https? ( >=dev-haskell/http-client-0.3.2:=[profile?] <dev-haskell/http-client-0.5:=[profile?]
+			>=dev-haskell/http-client-tls-0.2:=[profile?] <dev-haskell/http-client-tls-0.3:=[profile?]
+			>=dev-haskell/http-types-0.8:=[profile?] <dev-haskell/http-types-0.9:=[profile?] )
+	network-uri? ( >=dev-haskell/network-2.6:=[profile?]
+			>=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] )
+	!network-uri? ( >=dev-haskell/network-2:=[profile?] <dev-haskell/network-2.6:=[profile?] )
+	trypandoc? ( >=dev-haskell/wai-0.3:=[profile?]
+			dev-haskell/wai-extra:=[profile?]
+			!https? ( dev-haskell/http-types:=[profile?] ) )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+	test? ( >=dev-haskell/ansi-terminal-0.5 <dev-haskell/ansi-terminal-0.7
+		>=dev-haskell/diff-0.2 <dev-haskell/diff-0.4
+		>=dev-haskell/executable-path-0.0 <dev-haskell/executable-path-0.1
+		>=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.3
+		>=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.9
+		>=dev-haskell/test-framework-0.3 <dev-haskell/test-framework-0.9
+		>=dev-haskell/test-framework-hunit-0.2 <dev-haskell/test-framework-hunit-0.4
+		>=dev-haskell/test-framework-quickcheck2-0.2.9 <dev-haskell/test-framework-quickcheck2-0.4 )
+"
+
+src_prepare() {
+	if ! use make-pandoc-man-pages; then
+		sed -e '/Executable make-pandoc-man-pages/,/Buildable:   True/d' \
+			-i "${S}/${PN}.cabal" \
+				|| die "Could not disable build of Executable make-pandoc-man-pages in ${S}/${PN}.cabal"
+		sed -e '/, postBuild = /,/makeManPages args bf pkgdescr lbi/d' \
+			-i "${S}/Setup.hs" \
+				|| die "Could not disable build of Executable make-pandoc-man-pages in ${S}/Setup.hs"
+	fi
+}
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag embed_data_files embed_data_files) \
+		$(cabal_flag https https) \
+		$(cabal_flag network-uri network-uri) \
+		$(cabal_flag trypandoc trypandoc)
+}
diff --git a/app-text/pandoc/pandoc-1.15.0.6.ebuild b/app-text/pandoc/pandoc-1.15.0.6.ebuild
new file mode 100644
index 000000000000..7a70c85e7bf8
--- /dev/null
+++ b/app-text/pandoc/pandoc-1.15.0.6.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.5.9999
+
+CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
+inherit eutils haskell-cabal
+
+DESCRIPTION="Conversion between markup formats"
+HOMEPAGE="http://pandoc.org"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+KEYWORDS="amd64 x86"
+IUSE="embed_data_files +https +network-uri trypandoc"
+
+RESTRICT=test # likes to break on highlighting-kate update
+
+RDEPEND=">=dev-haskell/aeson-0.7.0.5:=[profile?] <dev-haskell/aeson-0.10:=[profile?]
+	>=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?]
+	>=dev-haskell/binary-0.5:=[profile?] <dev-haskell/binary-0.8:=[profile?]
+	>=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.9:=[profile?]
+	>=dev-haskell/blaze-markup-0.5.1:=[profile?] <dev-haskell/blaze-markup-0.8:=[profile?]
+	>=dev-haskell/cmark-0.4.0.1:=[profile?] <dev-haskell/cmark-0.5:=[profile?]
+	>=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.6:=[profile?]
+	>=dev-haskell/deepseq-generics-0.1:=[profile?] <dev-haskell/deepseq-generics-0.2:=[profile?]
+	>=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?]
+	>=dev-haskell/filemanip-0.3:=[profile?] <dev-haskell/filemanip-0.4:=[profile?]
+	>=dev-haskell/haddock-library-1.1:=[profile?] <dev-haskell/haddock-library-1.3:=[profile?]
+	>=dev-haskell/highlighting-kate-0.6:=[profile?] <dev-haskell/highlighting-kate-0.7:=[profile?]
+	>=dev-haskell/hslua-0.3:=[profile?] <dev-haskell/hslua-0.5:=[profile?]
+	>=dev-haskell/http-4000.0.5:=[profile?] <dev-haskell/http-4000.3:=[profile?]
+	>=dev-haskell/juicypixels-3.1.6.1:=[profile?] <dev-haskell/juicypixels-3.3:=[profile?]
+	>=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
+	>=dev-haskell/old-locale-1:=[profile?] <dev-haskell/old-locale-1.1:=[profile?]
+	dev-haskell/old-time:=[profile?]
+	>=dev-haskell/pandoc-types-1.12.4:=[profile?] <dev-haskell/pandoc-types-1.13:=[profile?]
+	>=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
+	>=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.2:=[profile?]
+	>=dev-haskell/scientific-0.2:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
+	>=dev-haskell/sha-1.6:=[profile?] <dev-haskell/sha-1.7:=[profile?]
+	>=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.6:=[profile?]
+	>=dev-haskell/tagsoup-0.13.1:=[profile?] <dev-haskell/tagsoup-0.14:=[profile?]
+	>=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.3:=[profile?]
+	>=dev-haskell/texmath-0.8.1:=[profile?] <dev-haskell/texmath-0.9:=[profile?]
+	>=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?]
+	>=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
+	>=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.12:=[profile?]
+	>=dev-haskell/xml-1.3.12:=[profile?] <dev-haskell/xml-1.4:=[profile?]
+	>=dev-haskell/yaml-0.8.8.2:=[profile?] <dev-haskell/yaml-0.9:=[profile?]
+	>=dev-haskell/zip-archive-0.2.3.4:=[profile?] <dev-haskell/zip-archive-0.3:=[profile?]
+	>=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.7:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+	https? ( >=dev-haskell/http-client-0.3.2:=[profile?] <dev-haskell/http-client-0.5:=[profile?]
+			>=dev-haskell/http-client-tls-0.2:=[profile?] <dev-haskell/http-client-tls-0.3:=[profile?]
+			>=dev-haskell/http-types-0.8:=[profile?] <dev-haskell/http-types-0.9:=[profile?] )
+	network-uri? ( >=dev-haskell/network-2.6:=[profile?]
+			>=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] )
+	!network-uri? ( >=dev-haskell/network-2:=[profile?] <dev-haskell/network-2.6:=[profile?] )
+	trypandoc? ( >=dev-haskell/wai-0.3:=[profile?]
+			dev-haskell/wai-extra:=[profile?]
+			!https? ( dev-haskell/http-types:=[profile?] ) )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.10
+	test? ( >=dev-haskell/ansi-terminal-0.5 <dev-haskell/ansi-terminal-0.7
+		>=dev-haskell/diff-0.2 <dev-haskell/diff-0.4
+		>=dev-haskell/executable-path-0.0 <dev-haskell/executable-path-0.1
+		>=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.3
+		>=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.9
+		>=dev-haskell/test-framework-0.3 <dev-haskell/test-framework-0.9
+		>=dev-haskell/test-framework-hunit-0.2 <dev-haskell/test-framework-hunit-0.4
+		>=dev-haskell/test-framework-quickcheck2-0.2.9 <dev-haskell/test-framework-quickcheck2-0.4 )
+	embed_data_files? ( dev-haskell/hsb2hs )
+"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-no-https.patch
+}
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag embed_data_files embed_data_files) \
+		$(cabal_flag https https) \
+		$(cabal_flag network-uri network-uri) \
+		$(cabal_flag trypandoc trypandoc)
+}
+
+src_install() {
+	haskell-cabal_src_install
+
+	doman man/pandoc.1
+}
diff --git a/app-text/pandoc/pandoc-1.18.ebuild b/app-text/pandoc/pandoc-1.18.ebuild
new file mode 100644
index 000000000000..6cb3e32e2e75
--- /dev/null
+++ b/app-text/pandoc/pandoc-1.18.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.1
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Conversion between markup formats"
+HOMEPAGE="http://pandoc.org"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="embed_data_files +https +network-uri trypandoc"
+
+RESTRICT=test # fails to load dynamic libraries
+
+RDEPEND=">=dev-haskell/aeson-0.7.0.5:=[profile?] <dev-haskell/aeson-1.1:=[profile?]
+	>=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?]
+	>=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.9:=[profile?]
+	>=dev-haskell/blaze-markup-0.5.1:=[profile?] <dev-haskell/blaze-markup-0.8:=[profile?]
+	>=dev-haskell/cmark-0.5:=[profile?] <dev-haskell/cmark-0.6:=[profile?]
+	>=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.8:=[profile?]
+	>=dev-haskell/doctemplates-0.1:=[profile?] <dev-haskell/doctemplates-0.2:=[profile?]
+	>=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?]
+	>=dev-haskell/filemanip-0.3:=[profile?] <dev-haskell/filemanip-0.4:=[profile?]
+	>=dev-haskell/haddock-library-1.1:=[profile?] <dev-haskell/haddock-library-1.5:=[profile?]
+	>=dev-haskell/highlighting-kate-0.6.2:=[profile?] <dev-haskell/highlighting-kate-0.7:=[profile?]
+	>=dev-haskell/hslua-0.3:=[profile?] <dev-haskell/hslua-0.5:=[profile?]
+	>=dev-haskell/http-4000.0.5:=[profile?] <dev-haskell/http-4000.4:=[profile?]
+	>=dev-haskell/juicypixels-3.1.6.1:=[profile?] <dev-haskell/juicypixels-3.3:=[profile?]
+	>=dev-haskell/mtl-2.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
+	>=dev-haskell/old-locale-1:=[profile?] <dev-haskell/old-locale-1.1:=[profile?]
+	dev-haskell/old-time:=[profile?]
+	>=dev-haskell/pandoc-types-1.17:=[profile?] <dev-haskell/pandoc-types-1.18:=[profile?]
+	>=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
+	>=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.2:=[profile?]
+	>=dev-haskell/scientific-0.2:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
+	>=dev-haskell/sha-1.6:=[profile?] <dev-haskell/sha-1.7:=[profile?]
+	>=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.7:=[profile?]
+	>=dev-haskell/tagsoup-0.13.7:=[profile?] <dev-haskell/tagsoup-0.15:=[profile?]
+	>=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.3:=[profile?]
+	>=dev-haskell/texmath-0.8.6.5:=[profile?] <dev-haskell/texmath-0.9:=[profile?]
+	>=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?]
+	>=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
+	>=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.12:=[profile?]
+	>=dev-haskell/xml-1.3.12:=[profile?] <dev-haskell/xml-1.4:=[profile?]
+	>=dev-haskell/yaml-0.8.8.2:=[profile?] <dev-haskell/yaml-0.9:=[profile?]
+	>=dev-haskell/zip-archive-0.2.3.4:=[profile?] <dev-haskell/zip-archive-0.4:=[profile?]
+	>=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.7:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+	https? ( >=dev-haskell/http-client-0.4.30:=[profile?] <dev-haskell/http-client-0.6:=[profile?]
+			>=dev-haskell/http-client-tls-0.2.4:=[profile?] <dev-haskell/http-client-tls-0.4:=[profile?]
+			>=dev-haskell/http-types-0.8:=[profile?] <dev-haskell/http-types-0.10:=[profile?] )
+	network-uri? ( >=dev-haskell/network-2.6:=[profile?]
+			>=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] )
+	!network-uri? ( >=dev-haskell/network-2:=[profile?] <dev-haskell/network-2.6:=[profile?] )
+	trypandoc? ( >=dev-haskell/wai-0.3:=[profile?]
+			dev-haskell/wai-extra:=[profile?]
+			!https? ( dev-haskell/http-types:=[profile?] ) )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+	test? ( >=dev-haskell/ansi-terminal-0.5 <dev-haskell/ansi-terminal-0.7
+		>=dev-haskell/diff-0.2 <dev-haskell/diff-0.4
+		>=dev-haskell/executable-path-0.0 <dev-haskell/executable-path-0.1
+		>=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.6
+		>=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.10
+		>=dev-haskell/test-framework-0.3 <dev-haskell/test-framework-0.9
+		>=dev-haskell/test-framework-hunit-0.2 <dev-haskell/test-framework-hunit-0.4
+		>=dev-haskell/test-framework-quickcheck2-0.2.9 <dev-haskell/test-framework-quickcheck2-0.4 )
+	embed_data_files? ( dev-haskell/hsb2hs )
+"
+
+src_prepare() {
+	default
+
+	cabal_chdeps \
+		'directory >= 1 && < 1.3' 'directory >= 1' \
+		'directory >= 1.2 && < 1.3' 'directory >= 1.2'
+}
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag embed_data_files embed_data_files) \
+		$(cabal_flag https https) \
+		$(cabal_flag network-uri network-uri) \
+		$(cabal_flag trypandoc trypandoc)
+}
diff --git a/app-text/pandoc/pandoc-1.19.2.1-r1.ebuild b/app-text/pandoc/pandoc-1.19.2.1-r1.ebuild
new file mode 100644
index 000000000000..ba14b58cdc40
--- /dev/null
+++ b/app-text/pandoc/pandoc-1.19.2.1-r1.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.1.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Conversion between markup formats"
+HOMEPAGE="http://pandoc.org"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+KEYWORDS="amd64 x86"
+IUSE="embed_data_files +https +network-uri trypandoc weigh-pandoc"
+
+RDEPEND=">=dev-haskell/aeson-0.7.0.5:=[profile?] <dev-haskell/aeson-1.2:=[profile?]
+	>=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?]
+	>=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.10:=[profile?]
+	>=dev-haskell/blaze-markup-0.5.1:=[profile?] <dev-haskell/blaze-markup-0.9:=[profile?]
+	>=dev-haskell/cmark-0.5:=[profile?] <dev-haskell/cmark-0.6:=[profile?]
+	>=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.8:=[profile?]
+	>=dev-haskell/doctemplates-0.1:=[profile?] <dev-haskell/doctemplates-0.2:=[profile?]
+	>=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?]
+	>=dev-haskell/filemanip-0.3:=[profile?] <dev-haskell/filemanip-0.4:=[profile?]
+	>=dev-haskell/haddock-library-1.1:=[profile?] <dev-haskell/haddock-library-1.5:=[profile?]
+	>=dev-haskell/hslua-0.3:=[profile?] <dev-haskell/hslua-0.5:=[profile?]
+	>=dev-haskell/http-4000.0.5:=[profile?] <dev-haskell/http-4000.4:=[profile?]
+	>=dev-haskell/juicypixels-3.1.6.1:=[profile?] <dev-haskell/juicypixels-3.3:=[profile?]
+	>=dev-haskell/mtl-2.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
+	>=dev-haskell/old-locale-1:=[profile?] <dev-haskell/old-locale-1.1:=[profile?]
+	dev-haskell/old-time:=[profile?]
+	>=dev-haskell/pandoc-types-1.17:=[profile?] <dev-haskell/pandoc-types-1.18:=[profile?]
+	>=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
+	>=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.2:=[profile?]
+	>=dev-haskell/scientific-0.2:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
+	>=dev-haskell/sha-1.6:=[profile?] <dev-haskell/sha-1.7:=[profile?]
+	>=dev-haskell/skylighting-0.1.1.4:=[profile?]
+	>=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.7:=[profile?]
+	>=dev-haskell/tagsoup-0.13.7:=[profile?] <dev-haskell/tagsoup-0.15:=[profile?]
+	>=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.3:=[profile?]
+	>=dev-haskell/texmath-0.9:=[profile?] <dev-haskell/texmath-0.10:=[profile?]
+	>=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?]
+	>=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
+	>=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.13:=[profile?]
+	>=dev-haskell/xml-1.3.12:=[profile?] <dev-haskell/xml-1.4:=[profile?]
+	>=dev-haskell/yaml-0.8.8.2:=[profile?] <dev-haskell/yaml-0.9:=[profile?]
+	>=dev-haskell/zip-archive-0.2.3.4:=[profile?] <dev-haskell/zip-archive-0.4:=[profile?]
+	>=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.7:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+	https? ( >=dev-haskell/http-client-0.4.30:=[profile?] <dev-haskell/http-client-0.6:=[profile?]
+			>=dev-haskell/http-client-tls-0.2.4:=[profile?] <dev-haskell/http-client-tls-0.4:=[profile?]
+			>=dev-haskell/http-types-0.8:=[profile?] <dev-haskell/http-types-0.10:=[profile?] )
+	network-uri? ( >=dev-haskell/network-2.6:=[profile?]
+			>=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] )
+	!network-uri? ( >=dev-haskell/network-2:=[profile?] <dev-haskell/network-2.6:=[profile?] )
+	trypandoc? ( >=dev-haskell/wai-0.3:=[profile?]
+			dev-haskell/wai-extra:=[profile?]
+			!https? ( dev-haskell/http-types:=[profile?] ) )
+	weigh-pandoc? ( >=dev-haskell/weigh-0.0:=[profile?] <dev-haskell/weigh-0.1:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+	test? ( >=dev-haskell/ansi-terminal-0.5 <dev-haskell/ansi-terminal-0.7
+		>=dev-haskell/diff-0.2 <dev-haskell/diff-0.4
+		>=dev-haskell/executable-path-0.0 <dev-haskell/executable-path-0.1
+		>=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.6
+		>=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.10
+		>=dev-haskell/test-framework-0.3 <dev-haskell/test-framework-0.9
+		>=dev-haskell/test-framework-hunit-0.2 <dev-haskell/test-framework-hunit-0.4
+		>=dev-haskell/test-framework-quickcheck2-0.2.9 <dev-haskell/test-framework-quickcheck2-0.4 )
+	embed_data_files? ( dev-haskell/hsb2hs )
+"
+
+src_prepare() {
+	default
+
+	cabal_chdeps \
+		'skylighting >= 0.1.1.4 && < 0.2' 'skylighting >= 0.1.1.4' \
+		'skylighting >= 0.1.1.3 && < 0.2' 'skylighting >= 0.1.1.3'
+}
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag embed_data_files embed_data_files) \
+		$(cabal_flag https https) \
+		$(cabal_flag network-uri network-uri) \
+		$(cabal_flag trypandoc trypandoc) \
+		$(cabal_flag weigh-pandoc weigh-pandoc)
+}
diff --git a/app-text/pandoc/pandoc-1.19.2.1.ebuild b/app-text/pandoc/pandoc-1.19.2.1.ebuild
new file mode 100644
index 000000000000..8aa7bd5a81f5
--- /dev/null
+++ b/app-text/pandoc/pandoc-1.19.2.1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.1.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Conversion between markup formats"
+HOMEPAGE="http://pandoc.org"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="embed_data_files +https +network-uri trypandoc weigh-pandoc"
+
+RDEPEND=">=dev-haskell/aeson-0.7.0.5:=[profile?] <dev-haskell/aeson-1.2:=[profile?]
+	>=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?]
+	>=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.10:=[profile?]
+	>=dev-haskell/blaze-markup-0.5.1:=[profile?] <dev-haskell/blaze-markup-0.9:=[profile?]
+	>=dev-haskell/cmark-0.5:=[profile?] <dev-haskell/cmark-0.6:=[profile?]
+	>=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.8:=[profile?]
+	>=dev-haskell/doctemplates-0.1:=[profile?] <dev-haskell/doctemplates-0.2:=[profile?]
+	>=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?]
+	>=dev-haskell/filemanip-0.3:=[profile?] <dev-haskell/filemanip-0.4:=[profile?]
+	>=dev-haskell/haddock-library-1.1:=[profile?] <dev-haskell/haddock-library-1.5:=[profile?]
+	>=dev-haskell/hslua-0.3:=[profile?] <dev-haskell/hslua-0.5:=[profile?]
+	>=dev-haskell/http-4000.0.5:=[profile?] <dev-haskell/http-4000.4:=[profile?]
+	>=dev-haskell/juicypixels-3.1.6.1:=[profile?] <dev-haskell/juicypixels-3.3:=[profile?]
+	>=dev-haskell/mtl-2.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
+	>=dev-haskell/old-locale-1:=[profile?] <dev-haskell/old-locale-1.1:=[profile?]
+	dev-haskell/old-time:=[profile?]
+	>=dev-haskell/pandoc-types-1.17:=[profile?] <dev-haskell/pandoc-types-1.18:=[profile?]
+	>=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
+	>=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.2:=[profile?]
+	>=dev-haskell/scientific-0.2:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
+	>=dev-haskell/sha-1.6:=[profile?] <dev-haskell/sha-1.7:=[profile?]
+	>=dev-haskell/skylighting-0.1.1.4:=[profile?] <dev-haskell/skylighting-0.2:=[profile?]
+	>=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.7:=[profile?]
+	>=dev-haskell/tagsoup-0.13.7:=[profile?] <dev-haskell/tagsoup-0.15:=[profile?]
+	>=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.3:=[profile?]
+	>=dev-haskell/texmath-0.9:=[profile?] <dev-haskell/texmath-0.10:=[profile?]
+	>=dev-haskell/text-0.11:=[profile?] <dev-haskell/text-1.3:=[profile?]
+	>=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
+	>=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.13:=[profile?]
+	>=dev-haskell/xml-1.3.12:=[profile?] <dev-haskell/xml-1.4:=[profile?]
+	>=dev-haskell/yaml-0.8.8.2:=[profile?] <dev-haskell/yaml-0.9:=[profile?]
+	>=dev-haskell/zip-archive-0.2.3.4:=[profile?] <dev-haskell/zip-archive-0.4:=[profile?]
+	>=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.7:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+	https? ( >=dev-haskell/http-client-0.4.30:=[profile?] <dev-haskell/http-client-0.6:=[profile?]
+			>=dev-haskell/http-client-tls-0.2.4:=[profile?] <dev-haskell/http-client-tls-0.4:=[profile?]
+			>=dev-haskell/http-types-0.8:=[profile?] <dev-haskell/http-types-0.10:=[profile?] )
+	network-uri? ( >=dev-haskell/network-2.6:=[profile?]
+			>=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] )
+	!network-uri? ( >=dev-haskell/network-2:=[profile?] <dev-haskell/network-2.6:=[profile?] )
+	trypandoc? ( >=dev-haskell/wai-0.3:=[profile?]
+			dev-haskell/wai-extra:=[profile?]
+			!https? ( dev-haskell/http-types:=[profile?] ) )
+	weigh-pandoc? ( >=dev-haskell/weigh-0.0:=[profile?] <dev-haskell/weigh-0.1:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+	test? ( >=dev-haskell/ansi-terminal-0.5 <dev-haskell/ansi-terminal-0.7
+		>=dev-haskell/diff-0.2 <dev-haskell/diff-0.4
+		>=dev-haskell/executable-path-0.0 <dev-haskell/executable-path-0.1
+		>=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.6
+		>=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.10
+		>=dev-haskell/test-framework-0.3 <dev-haskell/test-framework-0.9
+		>=dev-haskell/test-framework-hunit-0.2 <dev-haskell/test-framework-hunit-0.4
+		>=dev-haskell/test-framework-quickcheck2-0.2.9 <dev-haskell/test-framework-quickcheck2-0.4 )
+	embed_data_files? ( dev-haskell/hsb2hs )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag embed_data_files embed_data_files) \
+		$(cabal_flag https https) \
+		$(cabal_flag network-uri network-uri) \
+		$(cabal_flag trypandoc trypandoc) \
+		$(cabal_flag weigh-pandoc weigh-pandoc)
+}
diff --git a/app-text/paperwork-1.2.2 b/app-text/paperwork-1.2.2
deleted file mode 100644
index cb9da6576f00..000000000000
--- a/app-text/paperwork-1.2.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=~app-text/paperwork-backend-1.2.2[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/libpillowfight[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pillow[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pycairo[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pycrypto[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyenchant[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygobject:3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyinsane:2[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyocr-0.3.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyxdg[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/simplebayes[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] x11-libs/gtk+:3[introspection] x11-libs/libnotify[introspection] python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=a personal document manager for scanned documents (and PDFs)
-EAPI=6
-HOMEPAGE=https://github.com/openpaperwork/paperwork
-IUSE=python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=~app-text/paperwork-backend-1.2.2[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/libpillowfight[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pillow[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pycairo[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pycrypto[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyenchant[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygobject:3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyinsane:2[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyocr-0.3.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyxdg[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/simplebayes[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] x11-libs/gtk+:3[introspection] x11-libs/libnotify[introspection] python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/openpaperwork/paperwork/archive/1.2.2.tar.gz -> paperwork-1.2.2.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ac022acf76ce2d72413afc8620b51042
diff --git a/app-text/paperwork-1.2.3 b/app-text/paperwork-1.2.3
deleted file mode 100644
index b210545d5010..000000000000
--- a/app-text/paperwork-1.2.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=~app-text/paperwork-backend-1.2.3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/libpillowfight[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pillow[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pycairo[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pycrypto[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyenchant[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygobject:3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyinsane:2[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyocr-0.3.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyxdg[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/simplebayes[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] x11-libs/gtk+:3[introspection] x11-libs/libnotify[introspection] python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=a personal document manager for scanned documents (and PDFs)
-EAPI=6
-HOMEPAGE=https://github.com/openpaperwork/paperwork
-IUSE=python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=~app-text/paperwork-backend-1.2.3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/libpillowfight[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pillow[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pycairo[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pycrypto[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyenchant[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygobject:3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyinsane:2[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyocr-0.3.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyxdg[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/simplebayes[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] x11-libs/gtk+:3[introspection] x11-libs/libnotify[introspection] python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/openpaperwork/paperwork/archive/1.2.3.tar.gz -> paperwork-1.2.3.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ac022acf76ce2d72413afc8620b51042
diff --git a/app-text/paperwork-1.2.4 b/app-text/paperwork-1.2.4
deleted file mode 100644
index eabdfd0f4236..000000000000
--- a/app-text/paperwork-1.2.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=~app-text/paperwork-backend-1.2.4[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/libpillowfight[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pillow[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pycairo[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pycrypto[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyenchant[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygobject:3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyinsane:2[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyocr-0.3.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyxdg[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/simplebayes[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] x11-libs/gtk+:3[introspection] x11-libs/libnotify[introspection] python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=a personal document manager for scanned documents (and PDFs)
-EAPI=6
-HOMEPAGE=https://github.com/openpaperwork/paperwork
-IUSE=python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=~app-text/paperwork-backend-1.2.4[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/libpillowfight[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pillow[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pycairo[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pycrypto[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyenchant[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygobject:3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyinsane:2[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pyocr-0.3.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyxdg[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/simplebayes[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] x11-libs/gtk+:3[introspection] x11-libs/libnotify[introspection] python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/p/paperwork/paperwork-1.2.4.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b575658ca8aa60084be78e077c683bc0
diff --git a/app-text/paperwork-backend-1.2.2 b/app-text/paperwork-backend-1.2.2
deleted file mode 100644
index 43fd03eaea51..000000000000
--- a/app-text/paperwork-backend-1.2.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-text/poppler[introspection] dev-python/natsort[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pillow[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pycairo[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pycountry[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyenchant[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygobject:3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/python-levenshtein[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/simplebayes[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/termcolor[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/whoosh[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Backend part of Paperwork (Python API, no UI)
-EAPI=6
-HOMEPAGE=https://github.com/openpaperwork/paperwork-backend
-IUSE=python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=app-text/poppler[introspection] dev-python/natsort[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pillow[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pycairo[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pycountry[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyenchant[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygobject:3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/python-levenshtein[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/simplebayes[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/termcolor[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/whoosh[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/openpaperwork/paperwork-backend/archive/1.2.2.tar.gz -> paperwork-backend-1.2.2.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=36ed11e8c48a44d7cae98ba4cc0285ec
diff --git a/app-text/paperwork-backend-1.2.3 b/app-text/paperwork-backend-1.2.3
deleted file mode 100644
index f51ec060fd04..000000000000
--- a/app-text/paperwork-backend-1.2.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-text/poppler[introspection] dev-python/natsort[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pillow[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pycairo[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pycountry[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyenchant[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygobject:3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/python-levenshtein[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/simplebayes[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/termcolor[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/whoosh[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Backend part of Paperwork (Python API, no UI)
-EAPI=6
-HOMEPAGE=https://github.com/openpaperwork/paperwork-backend
-IUSE=python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=app-text/poppler[introspection] dev-python/natsort[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pillow[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pycairo[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pycountry[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyenchant[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygobject:3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/python-levenshtein[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/simplebayes[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/termcolor[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/whoosh[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/openpaperwork/paperwork-backend/archive/1.2.3.tar.gz -> paperwork-backend-1.2.3.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=de0519f4d2cf0b311e08e74de0cf1529
diff --git a/app-text/paperwork-backend-1.2.4 b/app-text/paperwork-backend-1.2.4
deleted file mode 100644
index 0ce14694d42e..000000000000
--- a/app-text/paperwork-backend-1.2.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-text/poppler[introspection] dev-python/natsort[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pillow[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pycairo[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pycountry[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyenchant[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygobject:3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/python-levenshtein[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/simplebayes[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/termcolor[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/whoosh[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Backend part of Paperwork (Python API, no UI)
-EAPI=6
-HOMEPAGE=https://github.com/openpaperwork/paperwork-backend
-IUSE=python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=app-text/poppler[introspection] dev-python/natsort[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pillow[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pycairo[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pycountry[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyenchant[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygobject:3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/python-levenshtein[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/simplebayes[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/termcolor[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/whoosh[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/p/paperwork-backend/paperwork-backend-1.2.4.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d3ec1d25d4e7dab4500dfbc3ff289582
diff --git a/app-text/paperwork-backend/Manifest b/app-text/paperwork-backend/Manifest
new file mode 100644
index 000000000000..61b121ce6e40
--- /dev/null
+++ b/app-text/paperwork-backend/Manifest
@@ -0,0 +1,7 @@
+DIST paperwork-backend-1.2.2.tar.gz 64271 BLAKE2B 8261f64585d113a0a06a556e93c06cb528c60e1a906e2926aa55a39d363988ba9949ee7c51ab83efb683aa9beb986883e12e0895063e1a350a4ecdc23bb71cf6 SHA512 6fbf00f657134f1aeae0850f58adce0cef4dc292898db3fde725d404bea5d2fc73c386ce8c1f37ae7980997c23ba9489c13e02e3e9d056cca8014cf5691e5ef8
+DIST paperwork-backend-1.2.3.tar.gz 64676 BLAKE2B 9d6b43b7fea5a246e78d6cb250cbe94dc33dd0afea086933819d3392242c02c47789465e710313fd00b3e1731d936fa52d3086f00ba51a5c7cbaa4a9dfb2870a SHA512 1d79fa258c9e08d582797444257877e87bd8bb8413cea48419c6fea76d4b023b18fcb4d5831e09eca1561bea852e27f105841b04a44c319a0f9d7fc102c2c4d5
+DIST paperwork-backend-1.2.4.tar.gz 59998 BLAKE2B e92bfbc311a38563fcb38511e8961c081b7c5d3a445ae9b18a80cb6848edbca2460a37b3f0c81d284a04974954cecbced0122a0bc66b3bbf10dc1bc1784b9969 SHA512 aba8cfd7abe9058e3433c64a96c1f79b451d8bdc661fa16ed7eb19f1b7e15efef024c94557082ec4d71c5adbaf268254af34f1eef8a35bad5e322409821ed5c4
+EBUILD paperwork-backend-1.2.2.ebuild 902 BLAKE2B 94903cbe8f24b3a4fa40e110f41b898511b33e78790e768c00b1e170dfbf8393788ed15dc1076cb448178cea6e0ad7669584dad6bf98dfe036d2f1a8d90d91d0 SHA512 6aa20f76e3ce2c17efbd16fbdff34db4a02a43b56ea5bccf4c4e28325c1e3bf27baedc21ae5bdcae335e4c136d8e26d392d5d647759642b72df9a26c798c2e43
+EBUILD paperwork-backend-1.2.3.ebuild 902 BLAKE2B e2cf019b547508a2810721634981f06e0a2e6fc6bd927e24a8d88cf9c0a886380a90252c7c89524c095259de7edc807c5a82ebdb33dbea8f1909d37e8acc268e SHA512 4bb4b41413b663425ffed140f57dd21764c06bb9a66befdb4eb3de0436307bdd29d83232f0fc188f9011b60dada4b7fb9f1c97d6548bf728bf6a57ca97e85f9c
+EBUILD paperwork-backend-1.2.4.ebuild 869 BLAKE2B c53a020afcbfc0219dabd1366998a279088f5e3e73ab15a970e2b7c136c55a2c11bb1e99806686eb3740eec5d8a8ae886bf5871efb5ead97a1278318616f6d11 SHA512 bfa7995265d8a05949628103a4e7d71f6a8882ca207803dbf3ff509b6f704c0175911731f8b020139f0253873129ea1060cc6f6df34d5340932b91928548009a
+MISC metadata.xml 415 BLAKE2B 3d7bb0d432b982a1c482119ffedbff65e938944bb771729e1c56cb801fd5c26286eba701eb7dbf54d682b2fc975bb8bcad32f38b27f93d8ed3dd403469a416c5 SHA512 aeff8f2d4565711d077d1d2a5105f6c87cb99fd37eb1daf7dd1e919e51b5a1309c974a9e7459b35c3334041ad9776b1ae291fc08b7f2fc0bffe8bb360e2f74c6
diff --git a/app-text/paperwork-backend/metadata.xml b/app-text/paperwork-backend/metadata.xml
new file mode 100644
index 000000000000..a6369c9ecae4
--- /dev/null
+++ b/app-text/paperwork-backend/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>voyageur@gentoo.org</email>
+    <name>Bernard Cafarelli</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">paperwork-backend</remote-id>
+    <remote-id type="github">openpaperwork/paperwork-backend</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-text/paperwork-backend/paperwork-backend-1.2.2.ebuild b/app-text/paperwork-backend/paperwork-backend-1.2.2.ebuild
new file mode 100644
index 000000000000..da6daad02406
--- /dev/null
+++ b/app-text/paperwork-backend/paperwork-backend-1.2.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Backend part of Paperwork (Python API, no UI)"
+HOMEPAGE="https://github.com/openpaperwork/paperwork-backend"
+SRC_URI="https://github.com/openpaperwork/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="app-text/poppler[introspection]
+	dev-python/natsort[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/pycairo[${PYTHON_USEDEP}]
+	dev-python/pycountry[${PYTHON_USEDEP}]
+	dev-python/pyenchant[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	dev-python/python-levenshtein[${PYTHON_USEDEP}]
+	dev-python/simplebayes[${PYTHON_USEDEP}]
+	dev-python/termcolor[${PYTHON_USEDEP}]
+	dev-python/whoosh[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/app-text/paperwork-backend/paperwork-backend-1.2.3.ebuild b/app-text/paperwork-backend/paperwork-backend-1.2.3.ebuild
new file mode 100644
index 000000000000..f0f34d215f9d
--- /dev/null
+++ b/app-text/paperwork-backend/paperwork-backend-1.2.3.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Backend part of Paperwork (Python API, no UI)"
+HOMEPAGE="https://github.com/openpaperwork/paperwork-backend"
+SRC_URI="https://github.com/openpaperwork/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="app-text/poppler[introspection]
+	dev-python/natsort[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/pycairo[${PYTHON_USEDEP}]
+	dev-python/pycountry[${PYTHON_USEDEP}]
+	dev-python/pyenchant[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	dev-python/python-levenshtein[${PYTHON_USEDEP}]
+	dev-python/simplebayes[${PYTHON_USEDEP}]
+	dev-python/termcolor[${PYTHON_USEDEP}]
+	dev-python/whoosh[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/app-text/paperwork-backend/paperwork-backend-1.2.4.ebuild b/app-text/paperwork-backend/paperwork-backend-1.2.4.ebuild
new file mode 100644
index 000000000000..5eb5f6caeeb6
--- /dev/null
+++ b/app-text/paperwork-backend/paperwork-backend-1.2.4.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Backend part of Paperwork (Python API, no UI)"
+HOMEPAGE="https://github.com/openpaperwork/paperwork-backend"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="app-text/poppler[introspection]
+	dev-python/natsort[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/pycairo[${PYTHON_USEDEP}]
+	dev-python/pycountry[${PYTHON_USEDEP}]
+	dev-python/pyenchant[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	dev-python/python-levenshtein[${PYTHON_USEDEP}]
+	dev-python/simplebayes[${PYTHON_USEDEP}]
+	dev-python/termcolor[${PYTHON_USEDEP}]
+	dev-python/whoosh[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/app-text/paperwork/Manifest b/app-text/paperwork/Manifest
new file mode 100644
index 000000000000..0873acb9ccd2
--- /dev/null
+++ b/app-text/paperwork/Manifest
@@ -0,0 +1,7 @@
+DIST paperwork-1.2.2.tar.gz 8124352 BLAKE2B b88d03f0ab5f2512a2fb87a614c61458c3bb771b7803316feae526299e8823aaec73133a96e501f44d10f0c540c9697ddff32de557f060f289a2c7245d808b27 SHA512 e38d269e03f77bc3ffc75f9b77c960e69b8c3f67aac26a38f39b324118ecdcb5a293de8f50226da07f913f3c849b7602b3250304bc348fb2f6d6816d09b17257
+DIST paperwork-1.2.3.tar.gz 8120802 BLAKE2B 8af1b9ff1f7049b0be04186a9b658804283cffcd94aa795e53fbce92e54abef8f6e63416aebbb3fdd54fd462c4ab057214283b4267a42d5cabc33cd2b84f0d2f SHA512 95e0909253e942917825b3475f5c8a0ea81dfc311c90f17f9141326ef58e82e4bcbb8235223cc2ce15bf491895de93810caaacc90cc7bcbe8a65aeafdf1eb9f9
+DIST paperwork-1.2.4.tar.gz 4379567 BLAKE2B 19d9c00ba678ef4c2236379311d4b9f0d01bbf908ca26c0dfebf53894f4a89539ddff9ac4065f703a981e723d0573b417b8ac39c3a2a94c75f94401fa537d688 SHA512 33292b0cc16046a10a49f5df4a1750b395e95fb898637c81e980ee10cc1525a5783878451ad84a70b62c1c1de73f3701bf40452779490171966decd9b896f4d9
+EBUILD paperwork-1.2.2.ebuild 997 BLAKE2B 8044936edb300a6dea4e528c9a7d21dff8872632688273d3f279329c81bac66a3272ccdad7b151f5f0746eb78eb8daa8c56fcad6a25180c147dd096443d08ac2 SHA512 d47bca00b13577226bc511fb0e0b97f58bf240283b1827199364131249ee6df892955b68c4c8752bc72e4765fa69ca885f19afa2d4a1d0b2a8290bd18bf39288
+EBUILD paperwork-1.2.3.ebuild 997 BLAKE2B 8044936edb300a6dea4e528c9a7d21dff8872632688273d3f279329c81bac66a3272ccdad7b151f5f0746eb78eb8daa8c56fcad6a25180c147dd096443d08ac2 SHA512 d47bca00b13577226bc511fb0e0b97f58bf240283b1827199364131249ee6df892955b68c4c8752bc72e4765fa69ca885f19afa2d4a1d0b2a8290bd18bf39288
+EBUILD paperwork-1.2.4.ebuild 964 BLAKE2B 3bc143a98fdf0962e620d97fa129d73a8a9207536961532b394c1a31fdb0c29c42e4a1b7ea99a325bb8ecdb6fdfcd92874e54aa8813c78054280f09495f2d77d SHA512 d93c4389df13158f99780d085211c9e18fde0f57ee9ee54c94c87f79537ecf1f907016546b4023e1395f4a9851ba431252f4d7068c32442d105950963ee2fe33
+MISC metadata.xml 784 BLAKE2B 3da20318f2e16ddb08ca7d5920ef57112986fdd0e0c4bfd4acdecb2aedc35123746533b391be47629985d38b2eeef75dae4eb08874526254316bd240ccee5117 SHA512 dad2a904fa5374ae34f4364bc1140d2b550783bdad137269748f614c20803f938ff51cf2cd3154f1bcd6247c3b38a54afda985811881b17515768095987c7950
diff --git a/app-text/paperwork/metadata.xml b/app-text/paperwork/metadata.xml
new file mode 100644
index 000000000000..e2d2240fe2ca
--- /dev/null
+++ b/app-text/paperwork/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>voyageur@gentoo.org</email>
+    <name>Bernard Cafarelli</name>
+  </maintainer>
+  <longdescription lang="en">
+Paperwork is a personal document manager for scanned documents (and PDFs).
+
+It's designed to be easy and fast to use. The idea behind Paperwork is "scan and forget": You should be able to just scan a new document and forget about it until the day you need it again.
+
+In other words, let the machine do most of the work for you.
+</longdescription>
+  <upstream>
+    <remote-id type="pypi">paperwork-backend</remote-id>
+    <remote-id type="github">openpaperwork/paperwork</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-text/paperwork/paperwork-1.2.2.ebuild b/app-text/paperwork/paperwork-1.2.2.ebuild
new file mode 100644
index 000000000000..ca20baeb28fe
--- /dev/null
+++ b/app-text/paperwork/paperwork-1.2.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="a personal document manager for scanned documents (and PDFs)"
+HOMEPAGE="https://github.com/openpaperwork/paperwork"
+SRC_URI="https://github.com/openpaperwork/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="~app-text/paperwork-backend-${PV}[${PYTHON_USEDEP}]
+	dev-python/libpillowfight[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/pycairo[${PYTHON_USEDEP}]
+	dev-python/pycrypto[${PYTHON_USEDEP}]
+	dev-python/pyenchant[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	dev-python/pyinsane:2[${PYTHON_USEDEP}]
+	>=dev-python/pyocr-0.3.0[${PYTHON_USEDEP}]
+	dev-python/pyxdg[${PYTHON_USEDEP}]
+	dev-python/simplebayes[${PYTHON_USEDEP}]
+	x11-libs/gtk+:3[introspection]
+	x11-libs/libnotify[introspection]"
+DEPEND="${RDEPEND}"
diff --git a/app-text/paperwork/paperwork-1.2.3.ebuild b/app-text/paperwork/paperwork-1.2.3.ebuild
new file mode 100644
index 000000000000..ca20baeb28fe
--- /dev/null
+++ b/app-text/paperwork/paperwork-1.2.3.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="a personal document manager for scanned documents (and PDFs)"
+HOMEPAGE="https://github.com/openpaperwork/paperwork"
+SRC_URI="https://github.com/openpaperwork/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="~app-text/paperwork-backend-${PV}[${PYTHON_USEDEP}]
+	dev-python/libpillowfight[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/pycairo[${PYTHON_USEDEP}]
+	dev-python/pycrypto[${PYTHON_USEDEP}]
+	dev-python/pyenchant[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	dev-python/pyinsane:2[${PYTHON_USEDEP}]
+	>=dev-python/pyocr-0.3.0[${PYTHON_USEDEP}]
+	dev-python/pyxdg[${PYTHON_USEDEP}]
+	dev-python/simplebayes[${PYTHON_USEDEP}]
+	x11-libs/gtk+:3[introspection]
+	x11-libs/libnotify[introspection]"
+DEPEND="${RDEPEND}"
diff --git a/app-text/paperwork/paperwork-1.2.4.ebuild b/app-text/paperwork/paperwork-1.2.4.ebuild
new file mode 100644
index 000000000000..2c75a8c54b21
--- /dev/null
+++ b/app-text/paperwork/paperwork-1.2.4.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="a personal document manager for scanned documents (and PDFs)"
+HOMEPAGE="https://github.com/openpaperwork/paperwork"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="~app-text/paperwork-backend-${PV}[${PYTHON_USEDEP}]
+	dev-python/libpillowfight[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/pycairo[${PYTHON_USEDEP}]
+	dev-python/pycrypto[${PYTHON_USEDEP}]
+	dev-python/pyenchant[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	dev-python/pyinsane:2[${PYTHON_USEDEP}]
+	>=dev-python/pyocr-0.3.0[${PYTHON_USEDEP}]
+	dev-python/pyxdg[${PYTHON_USEDEP}]
+	dev-python/simplebayes[${PYTHON_USEDEP}]
+	x11-libs/gtk+:3[introspection]
+	x11-libs/libnotify[introspection]"
+DEPEND="${RDEPEND}"
diff --git a/app-text/paps-0.6.8-r2 b/app-text/paps-0.6.8-r2
deleted file mode 100644
index b41a1e7e7729..000000000000
--- a/app-text/paps-0.6.8-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=x11-libs/pango virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Unicode-aware text to PostScript converter
-EAPI=5
-HOMEPAGE=http://paps.sourceforge.net/
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2
-RDEPEND=x11-libs/pango
-SLOT=0
-SRC_URI=mirror://sourceforge/paps/paps-0.6.8.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6dc28524d1b3ac393955f178a90cb688
diff --git a/app-text/paps/Manifest b/app-text/paps/Manifest
new file mode 100644
index 000000000000..8038aeeee242
--- /dev/null
+++ b/app-text/paps/Manifest
@@ -0,0 +1,7 @@
+AUX paps-0.6.8-fix-as-needed-build.patch 1051 BLAKE2B 5e610295f72421e1a0c31388a5f49897c74abd0dcf9ab1345579b37b085543ab09c7fa88b2240d78c8a3d7db77fa170c24899dce5c2f30385458b00cf6bb265d SHA512 943a2e2d267cf339cc3958ae5622fb4f8c3cd25fca63fa6c91c5b37c34e833dbdaf3a11e038d00b23a44fc590a268729941fee790f9f513f0532f9c339141695
+AUX paps-0.6.8-fix-doxygen-acinclude.patch 699 BLAKE2B c0aa64dfd7eec7e909debd8444c8ad2490d606e3922fc1be141d3b30d314310236f886f79032a987a7cc149c50c558471c61480f33b0ed2787474eb740930267 SHA512 b3c0949e7b6579cd3c3f82692ca2e0e9479bf435cc99b8c9c71e1842e32bccd9a79c2c199541ced21812ebf5cfc0887304511aa7cd1d4eba4bb2d476c4710b7b
+AUX paps-0.6.8-fix-empty-file.patch 558 BLAKE2B 10b0726c8f788ec6e21172ec7529b2aa9e7b4412166b4b9f4b4ded5b1833045f9753c3606a4348cd529ec4317cdf6bb702429e6e0cf7a5a98f87aa7cc2cb7711 SHA512 19d28f75664a7a626564176c223df77445710d7a941d145046dfdc5697dbacab25b60329e3ddda4f7ef6dcb5c1b4f14ad5641d190d83b8a17ddfa76bfb934a01
+AUX paps-0.6.8-fix-freetype-include.patch 323 BLAKE2B 75d4030616e2efee60d1928404bb67fa9cb6ff42d9183d3c6785d1ce18c110000195962a1f5514c0d7678855a5ac179cd7d505888ae5bcfc637aa9faf3919c45 SHA512 1ace4c661972853390feaf3f4a123416a6847b5d969017884df75561255a487c0c1e0adf37a1904f17c6855996a2edb0a5e388c996d31224f713bdba9425b287
+DIST paps-0.6.8.tar.gz 460062 BLAKE2B 8ca34cd217a5ed26de80a1e35f5cb05d75c291a966923ddcf73fb8a6db1a3823075c480c876cff932757feb3a4767057d269bac0863236df0b513e246726b01b SHA512 db657d90179e11fe42bbcdbebe09a84f1927c99d0b539c9e29b66b3cb8ffcf33ff500c9d81835ae5a0880382bf8f24801f04742517b76b8e005b125a139d8bba
+EBUILD paps-0.6.8-r2.ebuild 777 BLAKE2B 9f025ffddc995a851fb48ca6ec2e3f72845df836cb6757f2074ad35ef7d03129b9088c1618c372331894595e1eadd72c8dbab7f719aeaba573dcfec2e6edc74d SHA512 bfccabf0ecdea578b095022acd26280ff4d2ed9cdcc342787169dbc6d6040dc13221ee4d6c36ccc756645de785b75b48307437db5aab2d28f7445d6fba0f754c
+MISC metadata.xml 317 BLAKE2B 8632806f00d6f0736b3c75830059175eac776a0aead44584cdc3d8d449c684f430e9500c83e7f81c0ffef1fe11219bf4897c6e90dc4ded8a8b8e6f9f554791cc SHA512 8f35f01381203ad3dc040eaad87a286b1c8ded91eb9f0d6d77f98168a49dafed6e6c4c7235cf4eee163981178d5c967c819625008cac700202378f717f90421a
diff --git a/app-text/paps/files/paps-0.6.8-fix-as-needed-build.patch b/app-text/paps/files/paps-0.6.8-fix-as-needed-build.patch
new file mode 100644
index 000000000000..ec4ba8b2b180
--- /dev/null
+++ b/app-text/paps/files/paps-0.6.8-fix-as-needed-build.patch
@@ -0,0 +1,36 @@
+--- paps-0.6.8/configure.in
++++ paps-0.6.8/configure.in
+@@ -18,4 +18,6 @@
+ 
+ DX_INIT_DOXYGEN(libpaps, doxygen.cfg, doxygen-doc)
+ 
++PKG_CHECK_MODULES([PANGO], [pangoft2])
++
+ AC_OUTPUT(Makefile src/Makefile)
+--- paps-0.6.8/src/Makefile.am
++++ paps-0.6.8/src/Makefile.am
+@@ -7,21 +7,19 @@
+ bin_PROGRAMS = paps
+ paps_CFLAGS  = -Wall 
+ paps_SOURCES = paps.c
+-paps_LDADD = $(lib_LIBRARIES) $(all_libraries)
+-paps_LDFLAGS = `pkg-config --libs pangoft2`
++paps_LDADD = $(lib_LIBRARIES) $(all_libraries) $(PANGO_LIBS)
+ paps_DEPENDENCIES = $(lib_LIBRARIES)
+ 
+ EXTRA_DIST = test_libpaps.c paps.1
+ 
+ # set the include path found by configure
+-INCLUDES= $(all_includes) `pkg-config --cflags pangoft2`
++INCLUDES= $(all_includes) $(PANGO_CFLAGS)
+ 
+ # Test program
+ noinst_PROGRAMS = test_libpaps
+ 
+ 
+ test_libpaps_SOURCES = test_libpaps.c
+-test_libpaps_LDADD = $(lib_LIBRARIES) $(all_libraries)
+-test_libpaps_LDFLAGS = `pkg-config --libs pangoft2`
++test_libpaps_LDADD = $(lib_LIBRARIES) $(all_libraries) $(PANGO_LIBS)
+ test_libpaps_DEPENDENCIES = $(lib_LIBRARIES) 
+ 
diff --git a/app-text/paps/files/paps-0.6.8-fix-doxygen-acinclude.patch b/app-text/paps/files/paps-0.6.8-fix-doxygen-acinclude.patch
new file mode 100644
index 000000000000..baba74b4b8bb
--- /dev/null
+++ b/app-text/paps/files/paps-0.6.8-fix-doxygen-acinclude.patch
@@ -0,0 +1,20 @@
+--- paps-0.6.8/acinclude.m4
++++ paps-0.6.8/acinclude.m4
+@@ -78,7 +78,7 @@
+ AC_PATH_TOOL([$1], [$2])
+ if test "$DX_FLAG_[]DX_CURRENT_FEATURE$$1" = 1; then
+     AC_MSG_WARN([$2 not found - will not DX_CURRENT_DESCRIPTION])
+-    AC_SUBST([DX_FLAG_[]DX_CURRENT_FEATURE], 0)
++    AC_SUBST([DX_FLAG_]DX_CURRENT_FEATURE, 0)
+ fi
+ ])
+ 
+@@ -101,7 +101,7 @@
+ # ----------------------------------------------------------
+ # Turn off the DX_CURRENT_FEATURE if the required feature is off.
+ AC_DEFUN([DX_CLEAR_DEPEND], [
+-test "$DX_FLAG_$1" = "$2" || AC_SUBST([DX_FLAG_[]DX_CURRENT_FEATURE], 0)
++test "$DX_FLAG_$1" = "$2" || AC_SUBST([DX_FLAG_]DX_CURRENT_FEATURE, 0)
+ ])
+ 
+ # DX_FEATURE_ARG(FEATURE, DESCRIPTION,
diff --git a/app-text/paps/files/paps-0.6.8-fix-empty-file.patch b/app-text/paps/files/paps-0.6.8-fix-empty-file.patch
new file mode 100644
index 000000000000..ae334d1d28c0
--- /dev/null
+++ b/app-text/paps/files/paps-0.6.8-fix-empty-file.patch
@@ -0,0 +1,23 @@
+https://bugs.gentoo.org/show_bug.cgi?id=566050#c2
+
+--- paps-0.6.8/src/paps.c
++++ paps-0.6.8/src/paps.c
+@@ -569,11 +569,14 @@
+ 
+   fclose (file);
+ 
+-  /* Add a trailing new line if it is missing */
+-  if (inbuf->str[inbuf->len-1] != '\n')
+-    g_string_append(inbuf, "\n");
++  if (inbuf->len) {
++	  /* Add a trailing new line if it is missing */
++	  if (inbuf->str[inbuf->len-1] != '\n')
++	    g_string_append(inbuf, "\n");
+ 
+-  text = inbuf->str;
++	  text = inbuf->str;
++  } else
++  	text = g_strdup("\n");
+   g_string_free (inbuf, FALSE);
+ 
+   return text;
diff --git a/app-text/paps/files/paps-0.6.8-fix-freetype-include.patch b/app-text/paps/files/paps-0.6.8-fix-freetype-include.patch
new file mode 100644
index 000000000000..ab97d22a2957
--- /dev/null
+++ b/app-text/paps/files/paps-0.6.8-fix-freetype-include.patch
@@ -0,0 +1,14 @@
+--- paps-0.6.8/src/libpaps.c
++++ paps-0.6.8/src/libpaps.c
+@@ -25,8 +25,9 @@
+ 
+ #include <pango/pango.h>
+ #include <pango/pangoft2.h>
+-#include <freetype/ftglyph.h>
+-#include <freetype/ftoutln.h>
++#include <ft2build.h>
++#include FT_GLYPH_H
++#include FT_OUTLINE_H
+ #include <errno.h>
+ #include <stdlib.h>
+ #include <stdio.h>
diff --git a/app-text/paps/metadata.xml b/app-text/paps/metadata.xml
new file mode 100644
index 000000000000..3258972788e0
--- /dev/null
+++ b/app-text/paps/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>xmw@gentoo.org</email>
+		<name>Michael Weber</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">paps</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/paps/paps-0.6.8-r2.ebuild b/app-text/paps/paps-0.6.8-r2.ebuild
new file mode 100644
index 000000000000..3b8795277278
--- /dev/null
+++ b/app-text/paps/paps-0.6.8-r2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools eutils
+
+DESCRIPTION="Unicode-aware text to PostScript converter"
+HOMEPAGE="http://paps.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="x11-libs/pango"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-fix-as-needed-build.patch \
+		"${FILESDIR}"/${P}-fix-doxygen-acinclude.patch \
+		"${FILESDIR}"/${P}-fix-freetype-include.patch \
+		"${FILESDIR}"/${P}-fix-empty-file.patch
+
+	mv configure.in configure.ac || die
+
+	eautoreconf
+}
+
+src_install() {
+	dobin src/paps
+	doman src/paps.1
+	dodoc AUTHORS ChangeLog NEWS README TODO
+}
diff --git a/app-text/par-1.52-r1 b/app-text/par-1.52-r1
deleted file mode 100644
index 06225f887a7c..000000000000
--- a/app-text/par-1.52-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=!dev-util/par !app-arch/par
-DESCRIPTION=a paragraph reformatter, vaguely similar to fmt, but better
-EAPI=6
-HOMEPAGE=http://www.nicemice.net/par/
-KEYWORDS=~amd64 ~mips ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=freedist
-SLOT=0
-SRC_URI=http://www.nicemice.net/par/Par152.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=4b8242268fe8e39d4254dbb0d4f947b8
diff --git a/app-text/par/Manifest b/app-text/par/Manifest
new file mode 100644
index 000000000000..949db588c8bb
--- /dev/null
+++ b/app-text/par/Manifest
@@ -0,0 +1,3 @@
+DIST Par152.tar.gz 47999 BLAKE2B 0f76abde64d00d0511d9b0b0ce2a97b13917e08fe3bd1c69fa98ca19dff75a2b55a21f5eaa8bfd0660b6523336de6c29b2a58647196ff6af8c24ec156a426bb0 SHA512 f5a46da4b693e6a3d15ccd57e24ee9b0332ebfbcfc88da9ef0731e18932ba6f0adde7691a233264d6361e8903ff7e2263f71885a415c896dc4c45a0d05b1978e
+EBUILD par-1.52-r1.ebuild 730 BLAKE2B 45044dd56d7f12ca96a55209141a10abedaaffc0776e3bb7d68cbe90635771821e5f2df2da1aff67f3888f7032ee0e2af7ff7f02aaf79510094bfe948499439d SHA512 b72c83f06eba360ea9df2275775cf960f5ec718ccc9e59a9546d6db959479ab6e6d07424dba3998193673aa1ec73870d3997b12b1416e40b91ee04c6af66f082
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/par/metadata.xml b/app-text/par/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-text/par/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/app-text/par/par-1.52-r1.ebuild b/app-text/par/par-1.52-r1.ebuild
new file mode 100644
index 000000000000..7e6f9b7dcf6e
--- /dev/null
+++ b/app-text/par/par-1.52-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+MY_P="Par${PV/./}"
+DESCRIPTION="a paragraph reformatter, vaguely similar to fmt, but better"
+HOMEPAGE="http://www.nicemice.net/par/"
+SRC_URI="http://www.nicemice.net/par/${MY_P/./}.tar.gz"
+
+LICENSE="freedist"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE=""
+
+DEPEND="!dev-util/par
+	!app-arch/par"
+
+S="${WORKDIR}/${MY_P}"
+
+src_compile() {
+	make -f protoMakefile CC="$(tc-getCC) -c $CFLAGS" \
+		LINK1="$(tc-getCC) $LDFLAGS" || die 'make failed'
+}
+
+src_install() {
+	newbin par par-format
+	doman par.1
+	dodoc releasenotes par.doc
+}
diff --git a/app-text/passivetex-1.25 b/app-text/passivetex-1.25
deleted file mode 100644
index 9d0dda7b3ca6..000000000000
--- a/app-text/passivetex-1.25
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm unpack
-DEPEND=virtual/latex-base >=dev-tex/xmltex-1.9 app-arch/unzip virtual/latex-base >=sys-apps/texinfo-4.2-r5
-DESCRIPTION=A namespace-aware XML parser written in Tex
-EAPI=0
-HOMEPAGE=http://www.tei-c.org.uk/Software/passivetex/
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris
-LICENSE=MIT
-RDEPEND=virtual/latex-base >=dev-tex/xmltex-1.9 virtual/latex-base
-SLOT=0
-SRC_URI=mirror://gentoo/passivetex-1.25.zip
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	latex-package	773c51c2ef26eaff025998531e7c6731	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=4dff414aa7ff35da141a099b37a4b150
diff --git a/app-text/passivetex/Manifest b/app-text/passivetex/Manifest
new file mode 100644
index 000000000000..7023e210d5f8
--- /dev/null
+++ b/app-text/passivetex/Manifest
@@ -0,0 +1,3 @@
+DIST passivetex-1.25.zip 1190258 BLAKE2B bc82a0414c5df9b5619b099899ac3970943672fc3b76fa60549ba36dd60861b591c62174f1f55b58b0f51458bc961ce47fee9b991795e2d321daf3ae4b328e9d SHA512 083ba4fab9fee327ed3fef5bdc48b415138951432dcb53b1478d1ba16a92bebc1cfc4b8590e2aa647a32c7658124f2aca8160230176c623bbf531e996c43622b
+EBUILD passivetex-1.25.ebuild 807 BLAKE2B e6ef022eb7890d2fdb21b6c74d529a913d2328023c9a2291cdf002dab8791664bc8cf647cfad966b3e45abefcec01a56369eef5475c598d75e0e457b98709a73 SHA512 2d28d89c1c635c2a858ca2da99b7394b1509bd417be4f66991e58d9fb6a782a3a1ebb2eae107c84d5a17fa3ab250f7b5251e9fe3b2af79fec5c1c4199521faea
+MISC metadata.xml 245 BLAKE2B ee3a163cfe0a4bc59c0dfb46f9ddb580e2d259b4d0e33cb4e684eb9e6d4b901bf97c6edd891f3b75a613a782f1b89318d0ee3ec9bee4e34c4441d9e8f4267678 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690
diff --git a/app-text/passivetex/metadata.xml b/app-text/passivetex/metadata.xml
new file mode 100644
index 000000000000..13170c3184d8
--- /dev/null
+++ b/app-text/passivetex/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>tex@gentoo.org</email>
+	<name>Gentoo TeX Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-text/passivetex/passivetex-1.25.ebuild b/app-text/passivetex/passivetex-1.25.ebuild
new file mode 100644
index 000000000000..618cb7a179a3
--- /dev/null
+++ b/app-text/passivetex/passivetex-1.25.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+inherit latex-package
+
+S=${WORKDIR}/${PN}
+DESCRIPTION="A namespace-aware XML parser written in Tex"
+# Taken from: http://www.tei-c.org.uk/Software/passivetex/${PN}.zip
+SRC_URI="mirror://gentoo/${P}.zip"
+HOMEPAGE="http://www.tei-c.org.uk/Software/passivetex/"
+LICENSE="MIT"
+
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+SLOT="0"
+IUSE=""
+
+RDEPEND="virtual/latex-base
+	>=dev-tex/xmltex-1.9"
+
+DEPEND="${RDEPEND}
+	app-arch/unzip"
+
+TEXMF=/usr/share/texmf-site
+
+src_install() {
+
+	insinto ${TEXMF}/tex/xmltex/passivetex
+	doins *.sty *.xmt
+
+	dodoc README.passivetex index.xml
+	dohtml index.html
+}
diff --git a/app-text/pastebinit-1.5 b/app-text/pastebinit-1.5
deleted file mode 100644
index 2165b211beaa..000000000000
--- a/app-text/pastebinit-1.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install prepare setup
-DEPEND=app-text/docbook-xsl-stylesheets
-DESCRIPTION=A software that lets you send anything you want directly to a pastebin
-EAPI=5
-HOMEPAGE=https://launchpad.net/pastebinit
-IUSE=crypt python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_single_target_python3_4? ( dev-lang/python:3.4[xml] ) python_single_target_python3_5? ( dev-lang/python:3.5[xml] ) python_single_target_python3_6? ( dev-lang/python:3.6[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/configobj[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] crypt? ( app-crypt/gnupg )
-REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://launchpad.net/pastebinit/trunk/1.5/+download/pastebinit-1.5.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=e537b4da2e30506105fb958428e406c2
diff --git a/app-text/pastebinit/Manifest b/app-text/pastebinit/Manifest
new file mode 100644
index 000000000000..d03c5e64a64c
--- /dev/null
+++ b/app-text/pastebinit/Manifest
@@ -0,0 +1,3 @@
+DIST pastebinit-1.5.tar.bz2 42941 BLAKE2B 678df7f2e77cc832fc9e152fb451538284033d181d9165b1a1194b254ad08ca1ac3e4612dddf7db6c62c1c3c59265ad94a78cc6df9457565264864ab06bff00b SHA512 cc4b7c46ab7932be3a1064ce7a1d91da3ebf4b132ad44b0090c8d431bfc68e945357344e59ac1239e37b3178de124930c5c8dc552b42f16c39c0452ac9ab8099
+EBUILD pastebinit-1.5.ebuild 1340 BLAKE2B f179103c378e9ce18a2d015864780200f4822fd890d4f0b260089932f2a6a99061b07a2c58385fa0017d452bae2996d74c4fc0fa09dd7f62743922e82d22c862 SHA512 7f2cab15367a685f65881271f6860d5569d6d021fe18d66f190dbb9005bd0fb288fa68932586052443ab5457121b7759040d1ee390d52b7616e828c0bdd673e5
+MISC metadata.xml 300 BLAKE2B 57c8bc28049b8b085b6e522604afabd2b2c8d35fd60bbdafff35b0c4a577c283c8b5491e44f8bea37cbf7b0431b57b058cbbba840caf7b665b5e865b192df6d0 SHA512 7dc26c0febbda314bdcba49514f0222c0cca81d0fc20a0576061b406c1ba388a0d190888b98f61291b4b3e251115c0417ea6a6e2aebae1d32678d182741fb39f
diff --git a/app-text/pastebinit/metadata.xml b/app-text/pastebinit/metadata.xml
new file mode 100644
index 000000000000..eaf351ef1efe
--- /dev/null
+++ b/app-text/pastebinit/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<use>
+		<flag name="crypt">Install pbputs for gpg-encrypted pastes</flag>
+	</use>
+	<upstream>
+		<remote-id type="launchpad">pastebinit</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/pastebinit/pastebinit-1.5.ebuild b/app-text/pastebinit/pastebinit-1.5.ebuild
new file mode 100644
index 000000000000..9e79db0da019
--- /dev/null
+++ b/app-text/pastebinit/pastebinit-1.5.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_REQ_USE="xml"
+
+inherit python-single-r1
+
+DESCRIPTION="A software that lets you send anything you want directly to a pastebin"
+HOMEPAGE="https://launchpad.net/pastebinit"
+SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="crypt"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-python/configobj[${PYTHON_USEDEP}]
+	crypt? ( app-crypt/gnupg )"
+DEPEND="app-text/docbook-xsl-stylesheets"
+
+src_prepare() {
+	local mo=""
+
+	for lang in ${LINGUAS}; do
+		if [ -f po/${lang}.po ]; then
+			mo="${mo} ${lang}.mo"
+		fi
+	done
+
+	sed -i -e "/^build-mo/s/:.*/:${mo}/" po/Makefile || die
+	sed -i -e "/#!/s/python3/python/" pastebinit || die
+}
+
+src_compile() {
+	emake -C po
+	xsltproc --nonet \
+		"${EROOT}"usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl \
+		pastebinit.xml || die
+}
+
+src_install() {
+	dobin pastebinit utils/pbput
+	python_fix_shebang "${ED}usr/bin/${PN}"
+	dosym pbput /usr/bin/pbget
+	use crypt && dosym pbput /usr/bin/pbputs
+	dodoc README
+	doman pastebinit.1 utils/*.1
+	insinto /usr/share/locale
+	[[ -d po/mo ]] && doins -r po/mo/*
+	insinto /usr/share
+	doins -r pastebin.d
+}
diff --git a/app-text/pdf2djvu-0.9.8 b/app-text/pdf2djvu-0.9.8
deleted file mode 100644
index 84e95c077c5e..000000000000
--- a/app-text/pdf2djvu-0.9.8
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure prepare setup
-DEPEND=>=app-text/djvu-3.5.21:= >=app-text/poppler-0.16.7:= dev-libs/libxml2:= dev-libs/libxslt:= graphicsmagick? ( media-gfx/graphicsmagick:= ) dev-cpp/pstreams virtual/pkgconfig nls? ( sys-devel/gettext ) test? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/nose[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) )
-DESCRIPTION=A tool to create DjVu files from PDF files
-EAPI=6
-HOMEPAGE=http://jwilk.net/software/pdf2djvu
-IUSE=+graphicsmagick nls openmp test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=app-text/djvu-3.5.21:= >=app-text/poppler-0.16.7:= dev-libs/libxml2:= dev-libs/libxslt:= graphicsmagick? ( media-gfx/graphicsmagick:= )
-REQUIRED_USE=test? ( graphicsmagick )
-SLOT=0
-SRC_URI=https://github.com/jwilk/pdf2djvu/releases/download/0.9.8/pdf2djvu-0.9.8.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	6faea633ae2f79f6d55dcfd431b79fbf	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2d6603569eeef0e04f486fe708c35c31
diff --git a/app-text/pdf2djvu/Manifest b/app-text/pdf2djvu/Manifest
new file mode 100644
index 000000000000..b03c057458f0
--- /dev/null
+++ b/app-text/pdf2djvu/Manifest
@@ -0,0 +1,3 @@
+DIST pdf2djvu-0.9.8.tar.xz 268976 BLAKE2B 318ef4fd5677056d2404d769bf54911c9474d6f0f839ef472e121375ee268db31ddaaad2b8ed791ef093d6cb1c665f6431619918ee852e479b4a11a3d7ae0e23 SHA512 5f5330d3d15808b5b6233a15a984d0ebf28619cfb50807a20c8992fed68d17f73d1edd62b1ad7cd3a09d526f6c9f0827e2c5e03d6d7c8ad92c1f106755025f5e
+EBUILD pdf2djvu-0.9.8.ebuild 1251 BLAKE2B 6a3487ef4e2195daf5c78447960874a504bcb4a2f5187b49e058df35ed7482f820058aec8d719a52aca3a558ce86cef5705c006d422ef516db9de69632767404 SHA512 b2a2ed2d2f9ebe91f15f2da833b5e5a638bc9a82b7a2562eb4548909bfca18d519f9d76f5f2e843115e73af8c7a232ad4b5f5de419ac08371114762ef2d42013
+MISC metadata.xml 351 BLAKE2B 68816123c075f603535faa42307dfc58066cc7c9db272b1f6004a9e0bba5d71d0a798b5b2fed9d4af704ed5145264b400f406c5b1185e3b759c97c0ccccc05d1 SHA512 98cfb584785e967dfd11dc82da694ccde0031609c28faca492d2384d6257020ebf8ac264dcb512129f5a681455ce3228b9f443aa2aa99197134ed7957901eb06
diff --git a/app-text/pdf2djvu/metadata.xml b/app-text/pdf2djvu/metadata.xml
new file mode 100644
index 000000000000..7ae0b54679c3
--- /dev/null
+++ b/app-text/pdf2djvu/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>printing@gentoo.org</email>
+    <name>Gentoo Printing Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="bitbucket">jwilk/pdf2djvu</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-text/pdf2djvu/pdf2djvu-0.9.8.ebuild b/app-text/pdf2djvu/pdf2djvu-0.9.8.ebuild
new file mode 100644
index 000000000000..d59dccb4f538
--- /dev/null
+++ b/app-text/pdf2djvu/pdf2djvu-0.9.8.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-any-r1 toolchain-funcs flag-o-matic
+
+DESCRIPTION="A tool to create DjVu files from PDF files"
+HOMEPAGE="http://jwilk.net/software/pdf2djvu"
+SRC_URI="https://github.com/jwilk/${PN}/releases/download/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+graphicsmagick nls openmp test"
+
+RDEPEND="
+	>=app-text/djvu-3.5.21:=
+	>=app-text/poppler-0.16.7:=
+	dev-libs/libxml2:=
+	dev-libs/libxslt:=
+	graphicsmagick? ( media-gfx/graphicsmagick:= )
+"
+DEPEND="${RDEPEND}
+	dev-cpp/pstreams
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	test? (
+		${PYTHON_DEPS}
+		$(python_gen_any_dep 'dev-python/nose[${PYTHON_USEDEP}]')
+	)
+"
+
+REQUIRED_USE="test? ( graphicsmagick ${PYTHON_REQUIRED_USE} )"
+
+DOCS=(
+	doc/{changelog,credits,djvudigital,README}
+)
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	# bug 626874, poppler headers require C++11
+	append-cxxflags -std=c++11
+	default
+}
+
+src_configure() {
+	local openmp=--disable-openmp
+	use openmp && tc-has-openmp && openmp=--enable-openmp
+
+	econf \
+		${openmp} \
+		$(use_enable nls) \
+		$(use_with graphicsmagick)
+}
diff --git a/app-text/pdf2html-1.4 b/app-text/pdf2html-1.4
deleted file mode 100644
index 1c8591871d34..000000000000
--- a/app-text/pdf2html-1.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=>=media-libs/libpng-1.4 sys-libs/zlib
-DESCRIPTION=Converts pdf files to html files
-EAPI=4
-HOMEPAGE=http://atrey.karlin.mff.cuni.cz/~clock/twibright/pdf2html/
-KEYWORDS=alpha amd64 ~ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=GPL-2
-RDEPEND=>=media-libs/libpng-1.4 sys-libs/zlib app-text/ghostscript-gpl >=media-gfx/imagemagick-6
-SLOT=0
-SRC_URI=ftp://atrey.karlin.mff.cuni.cz/pub/local/clock/pdf2html/pdf2html-1.4.tgz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=257700e706d4a1ae5907496d41c3f1db
diff --git a/app-text/pdf2html/Manifest b/app-text/pdf2html/Manifest
new file mode 100644
index 000000000000..8d292e720d86
--- /dev/null
+++ b/app-text/pdf2html/Manifest
@@ -0,0 +1,5 @@
+AUX pdf2html-1.4-gentoo.patch 2277 BLAKE2B 4f1698da379021fc9e10cb8d04644cdc15ee45550cad0a2cc84a6f129d65d1887235206ffec4704c27a28b39f73eeae003a268a82a99dde9fc41eb40a5887224 SHA512 5639f201a04d14347e13e4ff13d3b88c534f614dfaa0dac6494420e71a0c29ccfef83984fbfe4b130d91fa21c97b32f615abb2c875a2b447e48f542ce976ced1
+AUX pdf2html-1.4-libpng15.patch 218 BLAKE2B b81712c66f6e2f90aa378861306e5184f791f6cc148b4ca7f574f48edee0b316e60a7b3b31da2ca5ac1bf5875965369e4892556f94a95f802f45174f7a215d47 SHA512 2a0a80a639432cfdb067872d12c9c6ab9e5239a2f945d0fe362d1abfa4e8d203b377981807c686fccc53ed1afaee0b651345c8cd959f8cf268b5728c4145cb56
+DIST pdf2html-1.4.tgz 22976 BLAKE2B d0177c34065dda391204813bc0c05b16ad8a711ca3d8f9ced060e2ee2c2f276fd7f0a713c5dfec934f7f95dd37641ef6aada9bab010ed9f457698c23554906a4 SHA512 00488c5e6303e1609294e7873c892866d19f3ee820f22f2d75436de22037bf3e4e1a565b7db29df5f6b20a76c5e2df4786e39e1d803cd7cca88274da65c7bbbb
+EBUILD pdf2html-1.4.ebuild 1083 BLAKE2B e8242e5b921e921a2ab8e737f2bc89d935c28f7d8d7d4823fa1353531cfd8e6fb7da3e354ec7af10e88e2811e363ae17ad693a7123356eac374354cb0d962b6a SHA512 0de389bd8d2c32a4daef3a433a9f336b3f22d0e6c1b1d8c485605b22a251dd99732db0b3994a75a32ac5272ed28b57db099e4b9a5879062b087069a4b907694d
+MISC metadata.xml 245 BLAKE2B ee3a163cfe0a4bc59c0dfb46f9ddb580e2d259b4d0e33cb4e684eb9e6d4b901bf97c6edd891f3b75a613a782f1b89318d0ee3ec9bee4e34c4441d9e8f4267678 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690
diff --git a/app-text/pdf2html/files/pdf2html-1.4-gentoo.patch b/app-text/pdf2html/files/pdf2html-1.4-gentoo.patch
new file mode 100644
index 000000000000..715b829b1c2a
--- /dev/null
+++ b/app-text/pdf2html/files/pdf2html-1.4-gentoo.patch
@@ -0,0 +1,54 @@
+--- pbm2png.c.orig	2003-09-16 20:12:55.000000000 +0900
++++ pbm2png.c	2004-02-21 22:09:57.415786664 +0900
+@@ -145,15 +145,13 @@
+  sprintf(string,"%s%d.html",basename,index);
+  f=fopen(string,"w");
+ 
+- fprintf(f,"<html><head><title>%s</title></head><body bgcolor=\"#000000\" text=\"#00ff00\" link=\"#ffff00\" vlink=\"#00ffff\"
+-alink=\"#ffff00\">\n",titlestring);
++ fprintf(f,"<html><head><title>%s</title></head><body bgcolor=\"#000000\" text=\"#00ff00\" link=\"#ffff00\" vlink=\"#00ffff\" alink=\"#ffff00\">\n",titlestring);
+  fprintf(f,"<h1>%s, Page %d</h1>\n",titlestring,index+pageoffset);
+  fprintf(f,"<p><table border=0 cellspacing=0 cellpadding=2><tr>");
+  fprintf(f,"<td valign=\"top\"><table border=0 cellpadding=0 cellspacing=0><tr><td>");
+  if (index)
+  {
+-  fprintf(f,"<a href=\"%s%d.html\"><img src=\"left.png\" border=0
+-></a>\n",basename,index-1);
++  fprintf(f,"<a href=\"%s%d.html\"><img src=\"left.png\" border=0></a>\n",basename,index-1);
+  }
+  else
+  {
+@@ -162,18 +160,15 @@
+  fprintf(f,"</td><td>");
+  if (index<filenumber-1)
+  {
+-  fprintf(f,"<a href=\"%s%d.html\">
+-<img src=\"right.png\" border=0></a>\n",basename,index+1);
++  fprintf(f,"<a href=\"%s%d.html\"> <img src=\"right.png\" border=0></a>\n",basename,index+1);
+  }
+  else
+  {
+   fprintf(f,"<img src=\"right.png\" border=0>\n");
+  }
+- fprintf(f,"</td></tr><tr><td colspan=2><a href=\"index.html\">
+-<img src=\"idx.png\" border=0 ></a></td>");
++ fprintf(f,"</td></tr><tr><td colspan=2><a href=\"index.html\"><img src=\"idx.png\" border=0 ></a></td>");
+  fprintf(f,"</tr></table>");
+- fprintf(f,"</td><td><img src=\"%s%d.png\" border=\"0\"
+-></td>\n</tr></table>",basename,index);
++ fprintf(f,"</td><td><img src=\"%s%d.png\" border=\"0\"></td>\n</tr></table>",basename,index);
+  fprintf(f,"</body></html>");
+  fclose(f);
+ }
+@@ -438,9 +433,8 @@
+         int a,z;
+  
+         if (argc<7){
+-                fprintf(stderr,"Usage: pbm2png <dpi> <basename> <titlestring>
+-<bottom_html_code> <pageoffset> <ifname> [starting_filenumber [invert]]\n");
+-        return 0;
++                fprintf(stderr,"Usage: pbm2png <dpi> <basename> <titlestring> <bottom_html_code> <pageoffset> <ifname> [starting_filenumber [invert]]\n");
++		return 0;
+         }
+         dpi=atol(argv[1]);
+         ppm=dpi*1000/25.4;
diff --git a/app-text/pdf2html/files/pdf2html-1.4-libpng15.patch b/app-text/pdf2html/files/pdf2html-1.4-libpng15.patch
new file mode 100644
index 000000000000..72a0e1b65af9
--- /dev/null
+++ b/app-text/pdf2html/files/pdf2html-1.4-libpng15.patch
@@ -0,0 +1,10 @@
+--- pbm2png.c
++++ pbm2png.c
+@@ -23,6 +23,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <unistd.h>
++#include <zlib.h> /* Z_BEST_COMPRESSION */
+ #include <png.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
diff --git a/app-text/pdf2html/metadata.xml b/app-text/pdf2html/metadata.xml
new file mode 100644
index 000000000000..13170c3184d8
--- /dev/null
+++ b/app-text/pdf2html/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>tex@gentoo.org</email>
+	<name>Gentoo TeX Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-text/pdf2html/pdf2html-1.4.ebuild b/app-text/pdf2html/pdf2html-1.4.ebuild
new file mode 100644
index 000000000000..6447a075494d
--- /dev/null
+++ b/app-text/pdf2html/pdf2html-1.4.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Converts pdf files to html files"
+HOMEPAGE="http://atrey.karlin.mff.cuni.cz/~clock/twibright/pdf2html/"
+SRC_URI="ftp://atrey.karlin.mff.cuni.cz/pub/local/clock/pdf2html/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ~ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE=""
+
+DEPEND=">=media-libs/libpng-1.4
+	sys-libs/zlib"
+RDEPEND="${DEPEND}
+	app-text/ghostscript-gpl
+	>=media-gfx/imagemagick-6"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-gentoo.patch \
+		"${FILESDIR}"/${P}-libpng15.patch
+}
+
+src_compile() {
+	tc-export CC
+	# Rewrite the Makefile as that's simpler
+	echo "LDLIBS=-lpng" > Makefile
+	echo "all: pbm2png" >> Makefile
+	emake
+	echo "pbm2eps9: pbm2eps9.o printer.o" > Makefile
+	emake pbm2eps9
+
+	echo "cp \"${EPREFIX}\"/usr/share/${P}/*.png ." >> pdf2html
+}
+
+src_install() {
+	dobin pbm2png pbm2eps9 pdf2html ps2eps9
+
+	insinto /usr/share/${P}
+	doins *.png *.html
+
+	dodoc CHANGELOG README VERSION
+}
diff --git a/app-text/pdf2htmlEX-0.14.6.2 b/app-text/pdf2htmlEX-0.14.6.2
deleted file mode 100644
index 57967475d6d3..000000000000
--- a/app-text/pdf2htmlEX-0.14.6.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare pretend test
-DEPEND=>=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 x11-libs/cairo[svg] virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=A precise PDF to HTML converter
-EAPI=6
-HOMEPAGE=http://coolwanglu.github.io/pdf2htmlEX/
-KEYWORDS=~amd64
-LICENSE=GPL-3+
-RDEPEND=>=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 x11-libs/cairo[svg]
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~dilfridge/distfiles/pdf2htmlEX-0.14.6.2.tgz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5d88509f1a2d8af0fd1e0c8fa5477579
diff --git a/app-text/pdf2htmlEX-9999 b/app-text/pdf2htmlEX-9999
deleted file mode 100644
index fb06f22bf05e..000000000000
--- a/app-text/pdf2htmlEX-9999
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile configure install prepare pretend test unpack
-DEPEND=>=app-text/poppler-0.61.1:=[jpeg,png] app-text/poppler-data ~media-gfx/fontforge-20170731[cairo,png] media-libs/freetype x11-libs/cairo[svg] virtual/pkgconfig virtual/jre sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=A precise PDF to HTML converter (dilfridge fork)
-EAPI=6
-HOMEPAGE=https://github.com/akhuettel/pdf2htmlEX
-LICENSE=GPL-3+
-RDEPEND=>=app-text/poppler-0.61.1:=[jpeg,png] app-text/poppler-data ~media-gfx/fontforge-20170731[cairo,png] media-libs/freetype x11-libs/cairo[svg]
-SLOT=0
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9001b18a6bf82a854b03219f024c6b45
diff --git a/app-text/pdf2htmlEX/Manifest b/app-text/pdf2htmlEX/Manifest
new file mode 100644
index 000000000000..89ca6ee317ec
--- /dev/null
+++ b/app-text/pdf2htmlEX/Manifest
@@ -0,0 +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 1089 BLAKE2B 15e152292caa0565fd01ffd29f8d6340ed7cbb8b9f84f1bffbe87c757a502348822385531248e90f2e76a61d99a76a56d038017f1e521e928ecdf74aa2fa47b7 SHA512 473670a7611a2b3c1d7c6de1c8c418e38a226dacf5cdc26d77cbdb8ff19470c336cae24f511b204150717f0a96df58666cfe5d3cac454998b6d2ff96976bcb23
+MISC metadata.xml 355 BLAKE2B da386c9bf8cf6684e23a3bf7638d341b7f8872ecc7d733b946ae697e9e13096df65398f6d4b2d4594b47eba7ec1e482dc8ab14a69395ed1a32c00cdc7d91c2b5 SHA512 c416fe8d4c3edf1055170e0c4cd84fa9da19437c6eab58fde5198561048018ae6b9387d52017dfbc38db717ef370fc70a1dcc0eb37c8843b4e65cfa7e80314ff
diff --git a/app-text/pdf2htmlEX/metadata.xml b/app-text/pdf2htmlEX/metadata.xml
new file mode 100644
index 000000000000..988c82300ec0
--- /dev/null
+++ b/app-text/pdf2htmlEX/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>printing@gentoo.org</email>
+    <name>Gentoo Printing Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">coolwanglu/pdf2htmlEX</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-text/pdf2htmlEX/pdf2htmlEX-0.14.6.2.ebuild b/app-text/pdf2htmlEX/pdf2htmlEX-0.14.6.2.ebuild
new file mode 100644
index 000000000000..823ecdd6c0f9
--- /dev/null
+++ b/app-text/pdf2htmlEX/pdf2htmlEX-0.14.6.2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils toolchain-funcs flag-o-matic versionator
+
+DESCRIPTION="A precise PDF to HTML converter"
+HOMEPAGE="http://coolwanglu.github.io/pdf2htmlEX/"
+SRC_URI="
+	https://dev.gentoo.org/~dilfridge/distfiles/${P}.tgz
+"
+#	https://github.com/coolwanglu/${PN}/archive/v${PV}.tar.gz -> ${P}.tgz
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+
+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
+	x11-libs/cairo[svg]
+"
+RDEPEND="${CDEPEND}
+"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+"
+
+pkg_pretend() {
+	local ver=6.4.0
+	local msg="${P} needs at least GCC ${ver} set to compile."
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		if ! version_is_at_least ${ver} $(gcc-fullversion); then
+			die ${msg}
+		fi
+	fi
+}
+
+src_configure() {
+	append-cflags -no-pie
+	append-cxxflags -no-pie
+	cmake-utils_src_configure
+}
diff --git a/app-text/pdf2htmlEX/pdf2htmlEX-9999.ebuild b/app-text/pdf2htmlEX/pdf2htmlEX-9999.ebuild
new file mode 100644
index 000000000000..f62c2e1f03ae
--- /dev/null
+++ b/app-text/pdf2htmlEX/pdf2htmlEX-9999.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils toolchain-funcs flag-o-matic versionator
+
+DESCRIPTION="A precise PDF to HTML converter (dilfridge fork)"
+HOMEPAGE="https://github.com/akhuettel/pdf2htmlEX"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/akhuettel/pdf2htmlEX.git"
+else
+	SRC_URI="https://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.xz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE=""
+
+CDEPEND="
+	>=app-text/poppler-0.61.1:=[jpeg,png]
+	app-text/poppler-data
+	~media-gfx/fontforge-20170731[cairo,png]
+	media-libs/freetype
+	x11-libs/cairo[svg]
+"
+RDEPEND="${CDEPEND}
+"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+	virtual/jre
+"
+
+pkg_pretend() {
+	local ver=6.4.0
+	local msg="${P} needs at least GCC ${ver} set to compile."
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		if ! version_is_at_least ${ver} $(gcc-fullversion); then
+			die ${msg}
+		fi
+	fi
+}
+
+src_configure() {
+	append-cflags -no-pie
+	append-cxxflags -no-pie -fpermissive
+	cmake-utils_src_configure
+}
diff --git a/app-text/pdf2oo-20090715-r1 b/app-text/pdf2oo-20090715-r1
deleted file mode 100644
index 5cf88b0f0035..000000000000
--- a/app-text/pdf2oo-20090715-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Converts pdf files to odf
-EAPI=5
-HOMEPAGE=https://sourceforge.net/projects/pdf2oo/
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=app-arch/zip >=app-text/poppler-0.12.3-r3[utils] virtual/imagemagick-tools
-SLOT=0
-SRC_URI=mirror://sourceforge/pdf2oo/pdf2oo-20090715.tar.gz
-_md5_=c68aac0d7df874c72b85bdda73287556
diff --git a/app-text/pdf2oo/Manifest b/app-text/pdf2oo/Manifest
new file mode 100644
index 000000000000..50fde91da3ad
--- /dev/null
+++ b/app-text/pdf2oo/Manifest
@@ -0,0 +1,3 @@
+DIST pdf2oo-20090715.tar.gz 14765 BLAKE2B b84b34f4c932468d26ca6f53b596f762ec098fedfee22f1dc568e27a41c7ea9df32cc645a1f2ffd1469441ef579a11f31840fd9ed536853aacdef1f1593f4aeb SHA512 44a933e55f9137d8b02f8deedd3e0af2bbaf7a5d8ba94b3ab3ee32cf2ee331576a871fadb902fbf32ff231200d1e54b2bf8d31cd15005dee7deb5810a804bff5
+EBUILD pdf2oo-20090715-r1.ebuild 467 BLAKE2B 940d5d9e76dac181efd80c0075a1c8b18ce1a3a084b1ca683563598e826063d421d1612e92de17f8ea67139a59a4348b73d6be6e2de98b9b7e87b5d7f6da12a8 SHA512 e23740f08207b911ab2ba0f4d0c5677d8891f9fb0f73da24a8fc97eec68233bd123e0318f20067cc63cc4aead803b6efa94ed27a531b064cdc68d9262b677228
+MISC metadata.xml 243 BLAKE2B e428aaf0c9ec910fddb6782c383ac08028143186144f925e611772329f74a48b23d092d11adbe553de6184e3c19042337acbc75c3031c42d191e8c5164eade00 SHA512 291aee3a56aec25ed0cdd95310748d5ba4e45213128dcda8510b9b1803ddb0fedf0764b79240a095eee1679f74b4875da4718210303cf2b6fed6af3d682d8ad3
diff --git a/app-text/pdf2oo/metadata.xml b/app-text/pdf2oo/metadata.xml
new file mode 100644
index 000000000000..9c4c3c2f8dec
--- /dev/null
+++ b/app-text/pdf2oo/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="sourceforge">pdf2oo</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/pdf2oo/pdf2oo-20090715-r1.ebuild b/app-text/pdf2oo/pdf2oo-20090715-r1.ebuild
new file mode 100644
index 000000000000..9db50ba4886a
--- /dev/null
+++ b/app-text/pdf2oo/pdf2oo-20090715-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="Converts pdf files to odf"
+HOMEPAGE="https://sourceforge.net/projects/pdf2oo/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="app-arch/zip
+	>=app-text/poppler-0.12.3-r3[utils]
+	virtual/imagemagick-tools"
+
+S=${WORKDIR}/${PN}
+
+src_install() {
+	dobin pdf2oo
+	dodoc README
+}
diff --git a/app-text/pdfgrep-1.4.1-r1 b/app-text/pdfgrep-1.4.1-r1
deleted file mode 100644
index 88aeddd22ae4..000000000000
--- a/app-text/pdfgrep-1.4.1-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure
-DEPEND=app-text/poppler:=[cxx] pcre? ( dev-libs/libpcre[cxx] ) unac? ( app-text/unac ) virtual/pkgconfig test? ( dev-texlive/texlive-latex dev-util/dejagnu )
-DESCRIPTION=A tool similar to grep which searches text in PDFs
-EAPI=5
-HOMEPAGE=http://pdfgrep.org/
-IUSE=+pcre test unac
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=app-text/poppler:=[cxx] pcre? ( dev-libs/libpcre[cxx] ) unac? ( app-text/unac )
-SLOT=0
-SRC_URI=https://pdfgrep.org/download/pdfgrep-1.4.1.tar.gz
-_md5_=daa1f29455f9774e8d3d29fcd56de49e
diff --git a/app-text/pdfgrep-2.0.1 b/app-text/pdfgrep-2.0.1
deleted file mode 100644
index b53215e95c57..000000000000
--- a/app-text/pdfgrep-2.0.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure
-DEPEND=app-text/poppler:=[cxx] dev-libs/libgcrypt:0= pcre? ( dev-libs/libpcre[cxx] ) unac? ( app-text/unac ) virtual/pkgconfig test? ( dev-texlive/texlive-latex dev-util/dejagnu )
-DESCRIPTION=A tool similar to grep which searches text in PDFs
-EAPI=6
-HOMEPAGE=http://www.pdfgrep.org/
-IUSE=+pcre test unac
-KEYWORDS=amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=app-text/poppler:=[cxx] dev-libs/libgcrypt:0= pcre? ( dev-libs/libpcre[cxx] ) unac? ( app-text/unac )
-SLOT=0
-SRC_URI=http://www.pdfgrep.org/download/pdfgrep-2.0.1.tar.gz
-_md5_=ef7adf072f90578b03924aad1c13b98f
diff --git a/app-text/pdfgrep/Manifest b/app-text/pdfgrep/Manifest
new file mode 100644
index 000000000000..87bfc97d0135
--- /dev/null
+++ b/app-text/pdfgrep/Manifest
@@ -0,0 +1,5 @@
+DIST pdfgrep-1.4.1.tar.gz 151926 BLAKE2B 68b846b26c28e8209fa3ac7a7e6fe3d0c4c6a298e9bea2e3929fd82a44482ec914bd3594f3e07da8c56766e94ca3d4c3c2d6997364393e95b3741b1bf9685ec5 SHA512 27ce23c25a5f284b3eba92a0f8dbf02600248548967c1e71dfb41e43528824d9add587ea0ac23899ff07d2ffc6c74c2e6e4c2e7240e69494b8d31b7a4afc3735
+DIST pdfgrep-2.0.1.tar.gz 187217 BLAKE2B f498158e63e2f8419829df0d1801a31d3dff02627ccf0efee7239650203300233d1a19a5c72c57eb24495f2b5403e0e2c6a479b0f28a8d053aa578c732866b1a SHA512 4285f8cb514975a0040cdd6b82133090e27ba5c2f95ca880dccc3dd4fa3427260a5fc73d807df9124a79fa36ac6ed8c11380cde11e00599ed7134d92c50df4a0
+EBUILD pdfgrep-1.4.1-r1.ebuild 607 BLAKE2B a47cbf6264079ace41df672bbd62cb0585aa9ec7b683f42dca5c4f157ac2c461dab5cbe84acfbafaab58fcaf4e3b40aee6a97743c37a983017a009081df36cd1 SHA512 452781a1574939f7ba9e47b601c67a0897ed7f2f422615cc1bc9bfd98e7d1d90700b2de0132134aba9ea930aded068ad7cb4298b88b4d21da33b2bb5078af91b
+EBUILD pdfgrep-2.0.1.ebuild 638 BLAKE2B 36037efbe53f9981088d18203265353cbc0bc3761faf5c931bbcc3138b42d7efe326ba2f7e33619093cd51313698c7a861f3339cbd4b639469b2ba3f9a9bb3d5 SHA512 06b890603bd08c50e0d870881db47555fa927f976010dbd2bcbfd008cac608d7612b9dddedfeb2f6fa044b79ad645bb55bf0db403f06c236d70a271dc3a67188
+MISC metadata.xml 573 BLAKE2B 1d00ee8770804161567e271e2c983e331788ad5374e8f0b06a31a797051f43e4e7e8ed6d54f9c4a26347267f9b17332939ae0aeffa8389880ef1820dbc2272b9 SHA512 4a346cf15b881da8b56dfaa9899134163e4792ca563934c69d0c58591a8dcd12a96c2b4e0d2487957fbd5498e85af501603a312f0db39994050e610011e683ed
diff --git a/app-text/pdfgrep/metadata.xml b/app-text/pdfgrep/metadata.xml
new file mode 100644
index 000000000000..2b82d0ff6208
--- /dev/null
+++ b/app-text/pdfgrep/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>jlec@gentoo.org</email>
+	</maintainer>
+	<maintainer type="person">
+		<email>flo@geekplace.eu</email>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<use>
+		<flag name="unac">Removing accents and ligatures before search</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">pdfgrep</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/pdfgrep/pdfgrep-1.4.1-r1.ebuild b/app-text/pdfgrep/pdfgrep-1.4.1-r1.ebuild
new file mode 100644
index 000000000000..b3ac59a28b3d
--- /dev/null
+++ b/app-text/pdfgrep/pdfgrep-1.4.1-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="A tool similar to grep which searches text in PDFs"
+HOMEPAGE="http://pdfgrep.org/"
+SRC_URI="https://pdfgrep.org/download/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="amd64 x86"
+IUSE="+pcre test unac"
+
+RDEPEND="
+	app-text/poppler:=[cxx]
+	pcre? ( dev-libs/libpcre[cxx] )
+	unac? ( app-text/unac )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	test? (
+			dev-texlive/texlive-latex
+			dev-util/dejagnu
+		)"
+
+src_configure() {
+	econf \
+		$(use_with pcre libpcre) \
+		$(use_with unac)
+}
diff --git a/app-text/pdfgrep/pdfgrep-2.0.1.ebuild b/app-text/pdfgrep/pdfgrep-2.0.1.ebuild
new file mode 100644
index 000000000000..bc4a71cddff0
--- /dev/null
+++ b/app-text/pdfgrep/pdfgrep-2.0.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A tool similar to grep which searches text in PDFs"
+HOMEPAGE="http://www.pdfgrep.org/"
+SRC_URI="http://www.pdfgrep.org/download/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="amd64 ~x86"
+IUSE="+pcre test unac"
+
+RDEPEND="
+	app-text/poppler:=[cxx]
+	dev-libs/libgcrypt:0=
+	pcre? ( dev-libs/libpcre[cxx] )
+	unac? ( app-text/unac )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	test? (
+			dev-texlive/texlive-latex
+			dev-util/dejagnu
+		)"
+
+src_configure() {
+	econf \
+		$(use_with pcre libpcre) \
+		$(use_with unac)
+}
diff --git a/app-text/pdfjam-2.08 b/app-text/pdfjam-2.08
deleted file mode 100644
index b80623d279a6..000000000000
--- a/app-text/pdfjam-2.08
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=virtual/latex-base
-DESCRIPTION=pdfnup, pdfjoin and pdf90
-EAPI=0
-HOMEPAGE=http://www.warwick.ac.uk/go/pdfjam
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=GPL-2
-RDEPEND=virtual/latex-base
-SLOT=0
-SRC_URI=http://www.warwick.ac.uk/go/pdfjam/pdfjam_208.tgz
-_md5_=59aa8aed5757607eb8d6d177e08e5a1b
diff --git a/app-text/pdfjam/Manifest b/app-text/pdfjam/Manifest
new file mode 100644
index 000000000000..bf6426cee8f1
--- /dev/null
+++ b/app-text/pdfjam/Manifest
@@ -0,0 +1,3 @@
+DIST pdfjam_208.tgz 180725 BLAKE2B 903ce4f0874c9fc9ad23f3db37b882596589d6470dfe9289f65a72fb66ff843bbd49b52086d7b2d2cbbfb1b6406cbbda64d46b933a853d5d681ef88d4033372c SHA512 728c8d304c6d2af773980d20ef4a4be6e0a5dad286ad8cd00be9b1687f5024e00032a750c10c74dcd24431f081368d02b76f03cc5bb1c8725a060cd70be0fd8c
+EBUILD pdfjam-2.08.ebuild 627 BLAKE2B 6e60296a7fd5e950879b068461f3f686d245eb62ecff42e2a5184ac35ea4d228acbd008c91e4a12fbf8fa1183d332b51c8e51eec315c656595356b49a30b549a SHA512 4bca91908dad28c739f8c461c407c270803b018887a9a4942f0541303ec3bc487aa0a4e84b56bd949b8e15b63df2eb27fe686817b8b24075969c28f3e7c66e89
+MISC metadata.xml 249 BLAKE2B 1b34ce77c092c0664a18f32525d158d41bf36ab7ab7a4b9d01ed37e1e3dda3d58849d5b1375065c4e5591f6b09b2a93e88a624d399c495a0b1125edb30ec172f SHA512 895325641a176c848988fb5f36cdb567b584d22f6e778b3de674de480cbca30b7cf8f12ecbbe1173a63e3229889e1e0f5efd5afea4f0d4c429ac236598f80f1e
diff --git a/app-text/pdfjam/metadata.xml b/app-text/pdfjam/metadata.xml
new file mode 100644
index 000000000000..7b4a61aab741
--- /dev/null
+++ b/app-text/pdfjam/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-text/pdfjam/pdfjam-2.08.ebuild b/app-text/pdfjam/pdfjam-2.08.ebuild
new file mode 100644
index 000000000000..02f5c07608c9
--- /dev/null
+++ b/app-text/pdfjam/pdfjam-2.08.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+MY_PV=${PV/./}
+DESCRIPTION="pdfnup, pdfjoin and pdf90"
+HOMEPAGE="http://www.warwick.ac.uk/go/pdfjam"
+SRC_URI="http://www.warwick.ac.uk/go/pdfjam/${PN}_${MY_PV}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE=""
+S=${WORKDIR}/${PN}
+
+DEPEND="virtual/latex-base"
+RDEPEND="${DEPEND}"
+
+src_install() {
+	dobin bin/* || die
+	dodoc PDFjam-README.html || die
+	doman man1/* || die
+}
diff --git a/app-text/pdfminer-20131113 b/app-text/pdfminer-20131113
deleted file mode 100644
index 9dba1df322cf..000000000000
--- a/app-text/pdfminer-20131113
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Python tool for extracting information from PDF documents
-EAPI=5
-HOMEPAGE=http://www.unixuser.org/~euske/python/pdfminer/ https://pypi.org/project/pdfminer/
-IUSE=doc examples python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://pypi/p/pdfminer/pdfminer-20131113.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8be43602fb5611dc7c19d512870f366b
diff --git a/app-text/pdfminer-20140328 b/app-text/pdfminer-20140328
deleted file mode 100644
index c472060688ef..000000000000
--- a/app-text/pdfminer-20140328
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)]
-DESCRIPTION=Python tool for extracting information from PDF documents
-EAPI=5
-HOMEPAGE=http://www.unixuser.org/~euske/python/pdfminer/ https://pypi.org/project/pdfminer/
-IUSE=doc examples python_targets_pypy python_targets_python2_7
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://pypi/p/pdfminer/pdfminer-20140328.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5fd5d19364c084d66c3d509563938d78
diff --git a/app-text/pdfminer-20140328-r1 b/app-text/pdfminer-20140328-r1
deleted file mode 100644
index e65b25c6e2bf..000000000000
--- a/app-text/pdfminer-20140328-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)]
-DESCRIPTION=Python tool for extracting information from PDF documents
-EAPI=5
-HOMEPAGE=http://www.unixuser.org/~euske/python/pdfminer/ https://pypi.org/project/pdfminer/
-IUSE=doc examples test python_targets_pypy python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://pypi/p/pdfminer/pdfminer-20140328.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=24a09b3fef06f4619420327b3996a8a9
diff --git a/app-text/pdfminer/Manifest b/app-text/pdfminer/Manifest
new file mode 100644
index 000000000000..665351e01594
--- /dev/null
+++ b/app-text/pdfminer/Manifest
@@ -0,0 +1,6 @@
+DIST pdfminer-20131113.tar.gz 4080763 BLAKE2B 6cfe2c48f3294c6d491f47620fe0bd3b54daa5211c95b32db39c574485482254b7d6e61e461994706d364a8bfbcfa7776aa0a9dc2cd27fc26cf902ce794cac05 SHA512 be598f9ca5cb87fcde91190f72ee77209a6f8ca9db93588c914e6ec666b2a3cc69abedd92ca73a53e714c3660065b7f2c1e9c770e46c838f6d3d489dd637203e
+DIST pdfminer-20140328.tar.gz 4081233 BLAKE2B 60e8c8409269c158feda0f02b1dbf46d4bcd58e2f0a2ef0102e3c3c691d599eda9164b8e5dde4278522d9cfcca4e6962b31919b08f66053fb986ad3ded7da498 SHA512 8abb2328f7824ee980df0ce42d758c15534e97379ea9213b4aa1d29864d24d73c9e2d6020964e9ab734c0c6f7d1ae70bccbd6605168eaadf83923718a1f4849a
+EBUILD pdfminer-20131113.ebuild 650 BLAKE2B 7b8c71aa5a5f04c69d9d060f8e44ab7064c8545cc27b4f73d04ff9b5cc58187e933194aface3eac2e070345759ff3eec021cd64d220382cb772e4b617a41ec8a SHA512 14618d50ba8a7eefc9845b7efbe38ea178354f3d8b1775236e529795414ac799debbe32727ea9423bf196044d703add87f7f7afb7eb3e24089c046d3b9cfd1a0
+EBUILD pdfminer-20140328-r1.ebuild 691 BLAKE2B 3b663daca3079290a88be838dd6381dcd029f3209eefad30881b89e10f0c37169ccc84372b464333accd467885e2e8dec4dc164647648a9d6a1e8e98dca19441 SHA512 8d4a9ba66c8ea67faa802709c799971262c08cfafe72c12d8e2549aa4c5da81f56dc9b7510c354f3c77b33eb6c225ce5122c2f1aaa8c376c7e53fcf9626d4963
+EBUILD pdfminer-20140328.ebuild 653 BLAKE2B 1d63ce17c37449a24b22705b0cf347f1b4306bd41b9c6a1d73060d55d75fdf577f9306fb043160a41dee1e7a65c9a561a56b0675d9ab0c492313b9093925ee30 SHA512 b5add0e6d898864ec0ee5ddbe8e73675bb044db37528bbaff1bd37d095b424280f76127f340f9462cf7e708b40cc70dbfada2c91660a51f327179494481ddfe0
+MISC metadata.xml 238 BLAKE2B 436e60128ac8083524cc8290bfe2eb3eff4af4bafe7a13320972438a85d29da40ada392d2295001add6aed88c9407529e0975a7ae7eefc976655216def9bb36f SHA512 899f64c55b53cf0a2d38498f0b0070d4707a6eb0289d8138c6757f703909dc2b6a009fee9fe640e5c16adca6f2f953cf445ba6e6b8f5f43d9185ef836a611297
diff --git a/app-text/pdfminer/metadata.xml b/app-text/pdfminer/metadata.xml
new file mode 100644
index 000000000000..c67c1ba87596
--- /dev/null
+++ b/app-text/pdfminer/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="pypi">pdfminer</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/pdfminer/pdfminer-20131113.ebuild b/app-text/pdfminer/pdfminer-20131113.ebuild
new file mode 100644
index 000000000000..737235045c34
--- /dev/null
+++ b/app-text/pdfminer/pdfminer-20131113.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python tool for extracting information from PDF documents"
+HOMEPAGE="http://www.unixuser.org/~euske/python/pdfminer/ https://pypi.org/project/pdfminer/"
+SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples"
+
+python_compile_all(){
+	use examples && emake -C samples all
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/. )
+	use examples && local EXAMPLES=( samples/. )
+	distutils-r1_python_install_all
+}
diff --git a/app-text/pdfminer/pdfminer-20140328-r1.ebuild b/app-text/pdfminer/pdfminer-20140328-r1.ebuild
new file mode 100644
index 000000000000..2fc3e5eeaed6
--- /dev/null
+++ b/app-text/pdfminer/pdfminer-20140328-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Python tool for extracting information from PDF documents"
+HOMEPAGE="http://www.unixuser.org/~euske/python/pdfminer/ https://pypi.org/project/pdfminer/"
+SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples test"
+
+python_compile_all(){
+	use examples && emake -C samples all
+}
+
+python_test() {
+	emake test
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/. )
+	use examples && local EXAMPLES=( samples/. )
+	distutils-r1_python_install_all
+}
diff --git a/app-text/pdfminer/pdfminer-20140328.ebuild b/app-text/pdfminer/pdfminer-20140328.ebuild
new file mode 100644
index 000000000000..3f0dbf03188c
--- /dev/null
+++ b/app-text/pdfminer/pdfminer-20140328.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Python tool for extracting information from PDF documents"
+HOMEPAGE="http://www.unixuser.org/~euske/python/pdfminer/ https://pypi.org/project/pdfminer/"
+SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc examples"
+
+python_compile_all(){
+	use examples && emake -C samples all
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/. )
+	use examples && local EXAMPLES=( samples/. )
+	distutils-r1_python_install_all
+}
diff --git a/app-text/pdfsandwich-0.1.4-r1 b/app-text/pdfsandwich-0.1.4-r1
deleted file mode 100644
index 69b46a3e05b5..000000000000
--- a/app-text/pdfsandwich-0.1.4-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst prepare
-DEPEND=sys-apps/gawk >=dev-lang/ocaml-3.10[ocamlopt]
-DESCRIPTION=generator of sandwich OCR pdf files
-EAPI=5
-HOMEPAGE=http://www.tobias-elze.de/pdfsandwich
-IUSE=png
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=app-text/tesseract-3.00 media-gfx/exact-image app-text/unpaper app-text/ghostscript-gpl virtual/imagemagick-tools[png?]
-SLOT=0
-SRC_URI=mirror://sourceforge/pdfsandwich/pdfsandwich-0.1.4.tar.bz2
-_md5_=612b9991776cd3ec3383e92aca642c42
diff --git a/app-text/pdfsandwich/Manifest b/app-text/pdfsandwich/Manifest
new file mode 100644
index 000000000000..d49131d2bca4
--- /dev/null
+++ b/app-text/pdfsandwich/Manifest
@@ -0,0 +1,3 @@
+DIST pdfsandwich-0.1.4.tar.bz2 16401 BLAKE2B cb431f35b199e3e6290c60a3f6c7b2621dd3652a29346092869d8e5f86f5664079de1ef431f9b5e8b9f7cc044d64006295a8176d6a28b2ea5fb820db8c952000 SHA512 ee03aea13c72cc5a02136b5d16d2425f685f0b7a9d6fa6cff6c792bd24e6316720dff321b5e8237b949c98c713f39cb8b08b855b76e2a77350927b1ee7943171
+EBUILD pdfsandwich-0.1.4-r1.ebuild 970 BLAKE2B 416b43bc2a95175aabde4379e23207fa524bb882e4b40c7c61c1fff87fb6b016721bff23720b2bf7712892b4eb7d5786edf7c5500dadb9a5ec1646eb7612c8b7 SHA512 3505739fec5f3d76a7d51c0c9f4f4cf992faa59e23779dfd0ebf677246da0a794ca18af304a5631e7fc0984bd698bfe69f6c3a012389cdc943a543ac0fe4b263
+MISC metadata.xml 937 BLAKE2B 7e13ea95d5add452b52f7223411d798148e6bac03aa636237ad3e5c0677d0bdedf4a5f5a2c63caf0e84ab92626e0f8de5b1dc3df0f5d8747163d626dbe632f00 SHA512 595e3fdd841667046ae3064ee12aa288586cb1db3f8cd902aaf5c7c1bfb1c1776c641c400593b273dad83bf4f3a4c98f1f031125b8d65af3e836d6c2abdbc531
diff --git a/app-text/pdfsandwich/metadata.xml b/app-text/pdfsandwich/metadata.xml
new file mode 100644
index 000000000000..0fb15c19e847
--- /dev/null
+++ b/app-text/pdfsandwich/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<longdescription>
+pdfsandwich generates "sandwich" OCR pdf files, i.e. pdf files which
+contain only images (no text) will be processed by optical character
+recognition (OCR) and the text will be added to each page invisibly
+"behind" the images.
+
+pdfsandwich is a command line tool which is supposed to be useful to
+OCR scanned books or journals. It is able to recognize the page layout
+even for multicolumn text.
+
+Essentially, pdfsandwich is a wrapper script which calls the following
+binaries: convert, cuneiform, gs, and hocr2pdf. It is known to run on
+Unix systems and has been tested on Linux and MacOS X. It supports
+parallel processing on multiprocessor systems.
+</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">pdfsandwich</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/pdfsandwich/pdfsandwich-0.1.4-r1.ebuild b/app-text/pdfsandwich/pdfsandwich-0.1.4-r1.ebuild
new file mode 100644
index 000000000000..21bf32dcc96f
--- /dev/null
+++ b/app-text/pdfsandwich/pdfsandwich-0.1.4-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="generator of sandwich OCR pdf files"
+HOMEPAGE="http://www.tobias-elze.de/pdfsandwich"
+SRC_URI="mirror://sourceforge/pdfsandwich/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE="png"
+
+RDEPEND=">=app-text/tesseract-3.00
+	media-gfx/exact-image
+	app-text/unpaper
+	app-text/ghostscript-gpl
+	virtual/imagemagick-tools[png?]"
+DEPEND="sys-apps/gawk
+	>=dev-lang/ocaml-3.10[ocamlopt]"
+
+src_prepare() {
+	sed -i "/^OCAMLOPTFLAGS/s/$/ -ccopt \"\$(CFLAGS) \$(LDFLAGS)\"/" Makefile || die
+	sed -i "s/install -s/install/" Makefile || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+}
+
+pkg_postinst() {
+	elog "pdfsandwich relies on the tesseract library for OCR."
+	elog "Consequently language support is determined by tesseract's"
+	elog "language support which in turn is controlled via the LINGUAS"
+	elog "variable in make.conf."
+}
diff --git a/app-text/pdfshuffler-0.6.0-r1 b/app-text/pdfshuffler-0.6.0-r1
deleted file mode 100644
index 75fce739769b..000000000000
--- a/app-text/pdfshuffler-0.6.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=|| ( dev-python/PyPDF2 dev-python/pyPdf ) dev-python/python-poppler python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=sys-apps/sed-4
-DESCRIPTION=GUI app that can merge or split pdfs and rotate, crop and rearrange their pages
-EAPI=5
-HOMEPAGE=https://sourceforge.net/projects/pdfshuffler/
-IUSE=python_targets_python2_7
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=|| ( dev-python/PyPDF2 dev-python/pyPdf ) dev-python/python-poppler python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://sourceforge/pdfshuffler/pdfshuffler-0.6.0.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f50c6edc11f980085eca16051e345a68
diff --git a/app-text/pdfshuffler/Manifest b/app-text/pdfshuffler/Manifest
new file mode 100644
index 000000000000..65e71e7937cd
--- /dev/null
+++ b/app-text/pdfshuffler/Manifest
@@ -0,0 +1,4 @@
+AUX pdfshuffler-PyPDF2.patch 701 BLAKE2B a8ee95b415f121bf7c450a80e9d01c3349ed685146fd375d6aa10bcc7cc3684e1b75ad9986504aeb10d039e897750e7f304f32af8ebe12aaf24b5236f79fe62c SHA512 8496ebb9656e1f9e5ee99184a5d8cf0493ebacedc9f936804aedd784930457d39390b577683e77b6b5264ba50f7e2b202404c40ae426ba42b6f612d7ca193433
+DIST pdfshuffler-0.6.0.tar.gz 48071 BLAKE2B 8bcb513f1dd18cf9d6e17315a7a2ec5bbf5240176acd6deb6ec803900174a39927998210ab5e4aab9a7330821ce7d1ab266e1ae677e03fd51df305ceec9f5836 SHA512 e2563e9b5faf3ebac56f3840017ad9279a5e8e096c9f44ec053c617894910b1d0531457bc37d8fb9bc1db13ae25b94d55ca0b4ec26fbddeb9e51e6b4d75293fe
+EBUILD pdfshuffler-0.6.0-r1.ebuild 877 BLAKE2B cb8ecf84a7cd7895b9f13e044bace9c094cd8ff4cc650a116c5b87862b465f30aba38cd5babba1bcc86a6a6b1b86a6f16169fa366dd5d28b39200046d6c019fe SHA512 0b508ebc13b85bbdab0c74a212f06128755bbcbf9f8969f5dc7f7a81defe3fa428af5f1b891adc8a84f6fdcf6235f8cd31b8114733e4379bf952d5d289f2e01b
+MISC metadata.xml 317 BLAKE2B 1fe689819b8e7ec92564b27c15595add2e7e52bd5c04b8ce3d24ac933461d50fe468e630a65c6525e2afcd42f9019b7e7198a7bf64b9ace99ee0c31ddc47ac6f SHA512 1e710aa1ddf91651f987d6fdf7ae15bb4ad58190c374b72bb9198e19262a4c3e1e4faedc8647a50060e113a32f38994bc0ac8393455b4ceeedf2973e310b7992
diff --git a/app-text/pdfshuffler/files/pdfshuffler-PyPDF2.patch b/app-text/pdfshuffler/files/pdfshuffler-PyPDF2.patch
new file mode 100644
index 000000000000..8228c1765143
--- /dev/null
+++ b/app-text/pdfshuffler/files/pdfshuffler-PyPDF2.patch
@@ -0,0 +1,18 @@
+diff -r -U2 pdfshuffler-0.6.0.orig/pdfshuffler/pdfshuffler.py pdfshuffler-0.6.0/pdfshuffler/pdfshuffler.py
+--- pdfshuffler-0.6.0.orig/pdfshuffler/pdfshuffler.py	2012-04-28 21:15:17.000000000 +0700
++++ pdfshuffler-0.6.0/pdfshuffler/pdfshuffler.py	2015-01-11 02:10:02.952809411 +0600
+@@ -72,5 +72,13 @@
+ 
+ import poppler      #for the rendering of pdf pages
+-from pyPdf import PdfFileWriter, PdfFileReader
++
++try:
++    from PyPDF2 import PdfFileWriter, PdfFileReader
++except ImportError:
++    try:
++        from pyPdf import PdfFileWriter, PdfFileReader
++    except ImportError:
++        print('Neither PyPDF2 nor pyPdf found')
++        sys.exit(1)
+ 
+ from pdfshuffler_iconview import CellRendererImage
diff --git a/app-text/pdfshuffler/metadata.xml b/app-text/pdfshuffler/metadata.xml
new file mode 100644
index 000000000000..1449934ed1ee
--- /dev/null
+++ b/app-text/pdfshuffler/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>xmw@gentoo.org</email>
+	<name>Michael Weber</name>
+</maintainer>
+<upstream>
+	<remote-id type="sourceforge">pdfshuffler</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/app-text/pdfshuffler/pdfshuffler-0.6.0-r1.ebuild b/app-text/pdfshuffler/pdfshuffler-0.6.0-r1.ebuild
new file mode 100644
index 000000000000..1f2948029b4f
--- /dev/null
+++ b/app-text/pdfshuffler/pdfshuffler-0.6.0-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 gnome2-utils xdg-utils
+
+DESCRIPTION="GUI app that can merge or split pdfs and rotate, crop and rearrange their pages"
+HOMEPAGE="https://sourceforge.net/projects/pdfshuffler/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND="|| ( dev-python/PyPDF2 dev-python/pyPdf )
+	dev-python/python-poppler"
+RDEPEND="${DEPEND}"
+
+DOCS="ChangeLog README TODO AUTHORS"
+PATCHES=( "${FILESDIR}"/${PN}-PyPDF2.patch )
+
+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/pdftk-2.02 b/app-text/pdftk-2.02
deleted file mode 100644
index 22552d7dff0d..000000000000
--- a/app-text/pdftk-2.02
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=sys-devel/gcc:5.4.0[gcj] sys-devel/gcc-config
-DESCRIPTION=A tool for manipulating PDF documents
-EAPI=5
-HOMEPAGE=https://www.pdflabs.com/tools/pdftk-the-pdf-toolkit/
-KEYWORDS=amd64 ~arm ppc x86 ~amd64-linux
-LICENSE=GPL-2
-RDEPEND=sys-devel/gcc:5.4.0[gcj]
-SLOT=0
-SRC_URI=https://www.pdflabs.com/tools/pdftk-the-pdf-toolkit/pdftk-2.02-src.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c5b17f8823dfdc1120c55a57c06bb314
diff --git a/app-text/pdftk-9999 b/app-text/pdftk-9999
deleted file mode 100644
index dd6714720df9..000000000000
--- a/app-text/pdftk-9999
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup unpack
-DEPEND=dev-java/bcprov:0 dev-java/commons-lang:3.6 >=virtual/jdk-1.7 >=dev-vcs/git-1.8.2.1[curl] >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=gcj-free version of pdftk written in Java
-EAPI=6
-HOMEPAGE=https://gitlab.com/marcvinyals/pdftk
-IUSE=elibc_FreeBSD elibc_FreeBSD
-LICENSE=GPL-2
-RDEPEND=dev-java/bcprov:0 dev-java/commons-lang:3.6 >=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3
-SLOT=0
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	git-r3	8f6de46b0aa318aea0e8cac62ece098b	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=2025481ebd29eddae841c7fa027098f7
diff --git a/app-text/pdftk/Manifest b/app-text/pdftk/Manifest
new file mode 100644
index 000000000000..245a3873ba30
--- /dev/null
+++ b/app-text/pdftk/Manifest
@@ -0,0 +1,5 @@
+AUX pdftk-2.02-flags.patch 1922 BLAKE2B fc8be4321b7f39d3814a4da73986d4d81fd9d0eb52941e77f2ebcf85443c418b618584a5d9632979b3c6ed121e2fb4a42d7d694832119ee215a97454139e3d51 SHA512 96d2aceda2c98704ee70e55f84bd831ee131153d21a2b6f094ec111a1475cdc5da01434566d1c9aff2de403e55a81b0ae6baeb5d3017cb979662de895ebbf768
+DIST pdftk-2.02-src.zip 2239008 BLAKE2B 9bb55fb687b85de2ee0f9bec4ff16772646613b1519afb6d432985ad452cd09d04636788cb2deedb9924833cc10a802057c0e8ff146789da29cd4969cd614c39 SHA512 5c73ab3b7b12cfc24a17c2737d224fdde2ae684e1712031a968b83f5b8d91c521d477e932fc47f8b4a8c0ff0ba183678aaa13a1e7b29107c5c47ded8d960ef54
+EBUILD pdftk-2.02.ebuild 958 BLAKE2B b67ae137dcd28f2bfef9ca0fb5b2b718fd14a8d51628995f24090e3c5cf5db69155ffa75f8788137f46669f0d625e544e9fc1f9188ac21589048ac51c55039ce SHA512 25565e5ea0c59b9af269419acab47d7a4d452800494697238a1e9b48d11617a4f46024357a91bf3b25c080a22960177b4249275f571d2bf38d9a492d70d650eb
+EBUILD pdftk-9999.ebuild 665 BLAKE2B 23c444ed411e75e8a8c00f080ef67533d7a75fce5553705f386dc13ae457976383e5601566f81991c29b1a0a27b07be32f7ad848bff52d50d29d5f6a16eaf263 SHA512 44edc70c6b6948a240a131d4b58c439dc7f68809f3f0d74bd082d172084bd4be6526b75c1074f823e0d4cfa1b222fcdd7e1dd65fa3194b2c248a9bd576a86686
+MISC metadata.xml 348 BLAKE2B ef51c768c6964646b5e264d379b5c259134b37df3c9d4368b92c44855ee21fa40005fcf1514e95fba43fb683fbf49c35dc251521d1b63f91449c73ecb527a749 SHA512 f7031388d3d15f091e5e477bbcc7291b1e2362cc41fb485875e8a4ec81c9b86ee4a8b9ee640eeffe7e2bc17cc90ab417945bd6aca52cf13c85d979774e8a3572
diff --git a/app-text/pdftk/files/pdftk-2.02-flags.patch b/app-text/pdftk/files/pdftk-2.02-flags.patch
new file mode 100644
index 000000000000..5b20c9701cc0
--- /dev/null
+++ b/app-text/pdftk/files/pdftk-2.02-flags.patch
@@ -0,0 +1,43 @@
+Based on Debian patch, see http://patch-tracker.debian.org/patch/series/view/pdftk/2.01-1/customise_build_parameters
+
+diff -ruN pdftk-2.01-dist/pdftk/Makefile.Base pdftk-2.01-dist/pdftk/Makefile.Base
+--- pdftk-2.01-dist/pdftk/Makefile.Base	2012-12-06 19:57:36.000000000 +0100
++++ pdftk-2.01-dist/pdftk/Makefile.Base	2013-03-24 18:32:52.669492230 +0100
+@@ -43,7 +43,7 @@
+ 	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -I$(JAVALIBPATH) pdftk.cc -c
+ 
+ pdftk : pdftk.o attachments.o report.o passwords.o $(JAVALIB) $(LIBGCJ_SUPPLEMENT_FULL_O)
+-	$(CXX) $(CXXFLAGS) attachments.o report.o passwords.o pdftk.o $(JAVALIB) $(LIBGCJ_SUPPLEMENT_FULL_O) $(LDLIBS) -o pdftk
++	$(CXX) $(LDFLAGS) $(CXXFLAGS) attachments.o report.o passwords.o pdftk.o $(JAVALIB) $(LIBGCJ_SUPPLEMENT_FULL_O) $(LDLIBS) -o pdftk
+ 
+ install:
+ 	/usr/bin/install pdftk /usr/local/bin 
+diff -ruN pdftk-2.01-dist/pdftk/Makefile.Debian pdftk-2.01-dist/pdftk/Makefile.Debian
+--- pdftk-2.01-dist/pdftk/Makefile.Debian	2012-12-06 19:58:44.000000000 +0100
++++ pdftk-2.01-dist/pdftk/Makefile.Debian	2013-03-24 18:34:39.034540850 +0100
+@@ -21,7 +21,7 @@
+ # tools
+ # need direct path to libgcj for gcjh (starting in gcj 4.1.2 per Aurélien GÉRÔME)
+ TOOLPATH=
+-export VERSUFF=-4.6
++export VERSUFF=
+ export CPP= $(TOOLPATH)cpp$(VERSUFF)
+ export CXX= $(TOOLPATH)g++$(VERSUFF)
+ export GCJ= $(TOOLPATH)gcj$(VERSUFF)
+@@ -64,13 +64,12 @@
+ # only effects libraries following option on the command line
+ #
+ #  
+-export CPPFLAGS= -DPATH_DELIM=0x2f -DASK_ABOUT_WARNINGS=false -DUNBLOCK_SIGNALS -fdollars-in-identifiers
+-export CXXFLAGS= -Wall -Wextra -Weffc++ -O2
+-export GCJFLAGS= -fsource=1.3 -O2
+-export GCJHFLAGS= -force
++export CPPFLAGS+= -DPATH_DELIM=0x2f -DASK_ABOUT_WARNINGS=false -DUNBLOCK_SIGNALS -fdollars-in-identifiers
++export GCJFLAGS+= -fsource=1.3
++export GCJHFLAGS+= -force
+ export LDLIBS= -lgcj
+ 
+ include Makefile.Base
+ 
+ # required packages (xubuntu 12.04)
+ # gcj-jdk, g++
diff --git a/app-text/pdftk/metadata.xml b/app-text/pdftk/metadata.xml
new file mode 100644
index 000000000000..03c3390d2bb3
--- /dev/null
+++ b/app-text/pdftk/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>printing@gentoo.org</email>
+	<name>Gentoo Printing Project</name>
+</maintainer>
+<maintainer type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-text/pdftk/pdftk-2.02.ebuild b/app-text/pdftk/pdftk-2.02.ebuild
new file mode 100644
index 000000000000..cd88040b5245
--- /dev/null
+++ b/app-text/pdftk/pdftk-2.02.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils
+
+DESCRIPTION="A tool for manipulating PDF documents"
+HOMEPAGE="https://www.pdflabs.com/tools/pdftk-the-pdf-toolkit/"
+SRC_URI="https://www.pdflabs.com/tools/pdftk-the-pdf-toolkit/${P}-src.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux"
+
+RDEPEND="sys-devel/gcc:5.4.0[gcj]"
+DEPEND="${RDEPEND}
+	sys-devel/gcc-config
+"
+
+S="${WORKDIR}/${P}-dist/${PN}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-flags.patch
+}
+
+src_compile() {
+	# Settings by java-config break compilation by gcj.
+	unset CLASSPATH
+	unset JAVA_HOME
+
+	# We need gcc-5 because of Java
+	export PATH="$(gcc-config -B 5.4.0):${PATH}"
+
+	# Parallel make fails; confirmed, still not fixed in version 2.02.
+	emake -j1 -f "${S}"/Makefile.Debian || die "Compilation failed."
+}
+
+src_install() {
+	dobin pdftk
+	doman ../pdftk.1
+	dohtml ../pdftk.1.html
+}
diff --git a/app-text/pdftk/pdftk-9999.ebuild b/app-text/pdftk/pdftk-9999.ebuild
new file mode 100644
index 000000000000..38734756ceba
--- /dev/null
+++ b/app-text/pdftk/pdftk-9999.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit git-r3 java-pkg-2 java-ant-2
+
+DESCRIPTION="gcj-free version of pdftk written in Java"
+HOMEPAGE="https://gitlab.com/marcvinyals/pdftk"
+EGIT_REPO_URI="https://gitlab.com/marcvinyals/pdftk/"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+JAVA_PKG_STRICT="yes"
+EANT_GENTOO_CLASSPATH="bcprov,commons-lang-3.6"
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+CDEPEND="
+	dev-java/bcprov:0
+	dev-java/commons-lang:3.6"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.7"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.7"
+
+src_install() {
+	java-pkg_newjar "build/jar/pdftk.jar"
+	java-pkg_dolauncher
+}
diff --git a/app-text/peg-markdown-0.4.14 b/app-text/peg-markdown-0.4.14
deleted file mode 100644
index fae10f6e4534..000000000000
--- a/app-text/peg-markdown-0.4.14
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=dev-libs/glib:2 dev-util/peg test? ( dev-lang/perl virtual/perl-Getopt-Long app-text/htmltidy )
-DESCRIPTION=Implementation of markdown in C, using a PEG grammar
-EAPI=5
-HOMEPAGE=https://github.com/jgm/peg-markdown
-IUSE=test
-KEYWORDS=~amd64
-LICENSE=|| ( GPL-2 MIT )
-RDEPEND=dev-libs/glib:2
-SLOT=0
-SRC_URI=https://github.com/jgm/peg-markdown/archive/0.4.14.tar.gz -> peg-markdown-0.4.14.tar.gz
-_md5_=86709aa218ce602faef44de69a5d84b0
diff --git a/app-text/peg-markdown/Manifest b/app-text/peg-markdown/Manifest
new file mode 100644
index 000000000000..503b7059764d
--- /dev/null
+++ b/app-text/peg-markdown/Manifest
@@ -0,0 +1,3 @@
+DIST peg-markdown-0.4.14.tar.gz 85692 BLAKE2B a52b894a03921595850d460ced20257096b5a4afb00fca5849c64f7506fd2f39946f2ad13bec50f5032610669bdb14d4f789ceb509b533040a90f228fc443879 SHA512 38e43b548b2cedf04fae87baf91c9e0767914bdb617ee4b6a3cbe950f8cbb0717c457cafabcff606501e889ac196a0aef94317f3bf85f5b88a2285f686b6dd5e
+EBUILD peg-markdown-0.4.14.ebuild 922 BLAKE2B 7ecf5dd892051f8b51b049c852018143caddf3aefbf429bd8e18ce16a22aa83add778ad7d1cfa789b8b416931bf06b1703bf2660e43a759b6e31e5e921f6d89a SHA512 8a75ea5bc64564d25c0e5ed8ff82c361c5b418b40562aca67352396d004754224c83db88ea9d3065aa52abc19f91a84232e540421eca418b326c5d824ba2c1dc
+MISC metadata.xml 338 BLAKE2B 2287ec19d83b0cfe1bb293855f47a6107fd7c1a0f076f2e405f6b07ca1c1ca42ef31f1047bc159e20996cdbbf682a46a3684b2a1fb0e63875638fe77d38bc02e SHA512 d95bbb5ca89e46c57e21d2bbebedbdbf9a103db6ee3f5ba01155d69c4d4e091a918fc9cd6dc6787918ad11075cb0160a9490a551475fe0100be57a08c8aea838
diff --git a/app-text/peg-markdown/metadata.xml b/app-text/peg-markdown/metadata.xml
new file mode 100644
index 000000000000..e8f120ba5018
--- /dev/null
+++ b/app-text/peg-markdown/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>rafaelmartins@gentoo.org</email>
+		<name>Rafael G. Martins</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">jgm/peg-markdown</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/peg-markdown/peg-markdown-0.4.14.ebuild b/app-text/peg-markdown/peg-markdown-0.4.14.ebuild
new file mode 100644
index 000000000000..10e5d2c0581c
--- /dev/null
+++ b/app-text/peg-markdown/peg-markdown-0.4.14.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="Implementation of markdown in C, using a PEG grammar"
+HOMEPAGE="https://github.com/jgm/peg-markdown"
+SRC_URI="https://github.com/jgm/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( GPL-2 MIT )"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+RDEPEND="dev-libs/glib:2"
+DEPEND="${RDEPEND}
+	dev-util/peg
+	test? (
+		dev-lang/perl
+		virtual/perl-Getopt-Long
+		app-text/htmltidy )"
+
+src_prepare() {
+	rm -rf peg-* || die "rm failed"
+	sed -i \
+		-e 's/^PROGRAM=markdown/PROGRAM=peg-markdown/' \
+		-e 's/$(CC) `/$(CC) $(LDFLAGS) `/g' \
+		-e 's/^\t$(LEG)/\tleg/' \
+		-e 's/^$(PEGDIR):/dummy:/' \
+		-e '/$(PEGDIR)/d' \
+		-e 's/$(LEG) //g' \
+			Makefile || die 'sed failed'
+	sed -i \
+		-e '/strdup/d' markdown_peg.h || die 'sed .h failed'
+}
+
+src_install() {
+	dobin peg-markdown
+	dodoc README.markdown
+}
diff --git a/app-text/pelican-3.6.0 b/app-text/pelican-3.6.0
deleted file mode 100644
index 6a50552bb889..000000000000
--- a/app-text/pelican-3.6.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/feedgenerator-1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/jinja-2.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/docutils[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/pygments[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/unidecode[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/blinker[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/six-1.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/python-dateutil[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] markdown? ( dev-python/markdown[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-DESCRIPTION=A tool to generate a static blog, with restructured text or markdown input files
-EAPI=5
-HOMEPAGE=https://blog.getpelican.com/ https://pypi.org/project/pelican/
-IUSE=examples markdown python_targets_python2_7 python_targets_python3_4
-KEYWORDS=amd64 x86
-LICENSE=AGPL-3
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
-SLOT=0
-SRC_URI=https://github.com/getpelican/pelican/archive/3.6.0.tar.gz -> pelican-3.6.0.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=21ab1f1211c8dcef6baba6d75d20a1eb
diff --git a/app-text/pelican-3.6.3 b/app-text/pelican-3.6.3
deleted file mode 100644
index cf9637870d16..000000000000
--- a/app-text/pelican-3.6.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/feedgenerator-1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/jinja-2.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/docutils[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pygments[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/unidecode[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/blinker[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/six-1.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/python-dateutil[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) markdown? ( dev-python/markdown[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/markdown[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=A tool to generate a static blog, with restructured text or markdown input files
-EAPI=6
-HOMEPAGE=https://blog.getpelican.com/ https://pypi.org/project/pelican/
-IUSE=doc examples markdown test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~x86
-LICENSE=AGPL-3
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/getpelican/pelican/archive/3.6.3.tar.gz -> pelican-3.6.3.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=496bba3fd88d91f2e7fb8a39345f7f51
diff --git a/app-text/pelican-3.7.0 b/app-text/pelican-3.7.0
deleted file mode 100644
index 01b66fbef1c0..000000000000
--- a/app-text/pelican-3.7.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/feedgenerator-1.9[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/jinja-2.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/docutils[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pygments[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/unidecode[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/blinker[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/six-1.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/python-dateutil[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) markdown? ( dev-python/markdown[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/markdown[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=A tool to generate a static blog, with restructured text or markdown input files
-EAPI=6
-HOMEPAGE=https://blog.getpelican.com/ https://pypi.org/project/pelican/
-IUSE=doc examples markdown test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=amd64 x86
-LICENSE=AGPL-3
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=https://github.com/getpelican/pelican/archive/3.7.0.tar.gz -> pelican-3.7.0.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=687c7028dcb3a2d2fc6e96031b354590
diff --git a/app-text/pelican-3.7.1 b/app-text/pelican-3.7.1
deleted file mode 100644
index 34cf7985335f..000000000000
--- a/app-text/pelican-3.7.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/feedgenerator-1.9[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jinja-2.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/docutils[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygments[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/unidecode[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/blinker[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/python-dateutil[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) markdown? ( dev-python/markdown[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/markdown[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=A tool to generate a static blog, with restructured text or markdown input files
-EAPI=6
-HOMEPAGE=https://blog.getpelican.com/ https://pypi.org/project/pelican/
-IUSE=doc examples markdown test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 x86
-LICENSE=AGPL-3
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/getpelican/pelican/archive/3.7.1.tar.gz -> pelican-3.7.1.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=344f781f5d1f69df92ea25685c708641
diff --git a/app-text/pelican-9999 b/app-text/pelican-9999
deleted file mode 100644
index 7d5623522aba..000000000000
--- a/app-text/pelican-9999
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-python/feedgenerator-1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jinja-2.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/docutils[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygments[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/unidecode[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/blinker[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/python-dateutil[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) markdown? ( dev-python/markdown[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/markdown[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=A tool to generate a static blog, with restructured text or markdown input files
-EAPI=6
-HOMEPAGE=https://blog.getpelican.com/ https://pypi.org/project/pelican/
-IUSE=doc examples markdown test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-LICENSE=AGPL-3
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-RESTRICT=test
-SLOT=0
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	git-r3	8f6de46b0aa318aea0e8cac62ece098b	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4e71112de5873c5ac2031a958fc095dc
diff --git a/app-text/pelican/Manifest b/app-text/pelican/Manifest
new file mode 100644
index 000000000000..e52175872e56
--- /dev/null
+++ b/app-text/pelican/Manifest
@@ -0,0 +1,10 @@
+DIST pelican-3.6.0.tar.gz 773887 BLAKE2B 9e0827a13fc1668a718c69604c29832062d69db36753f248c03572b46490a57abb2cdcab84881b308792c7c9f1716665b12be7bdcaf878afd0f5d5d049c9d385 SHA512 7c4bcda6155b363d9e0d31d1763f20f9e3a3e9c5cd250ef4ce02305504e910c3ad61b3ae4ab909d1bca51a46102fe59583a6700f5a32a14d0c1cde47507db3d0
+DIST pelican-3.6.3.tar.gz 775060 BLAKE2B b4e2ab53f312f4a6f0a3398dd07512e9e51f3f780dae47a7a2405f36ac81149eb336e8a97a7898dfdec9d27938acd57ebaa19b4d9f928f7c714cb9b85108dda6 SHA512 8bd8fcb72e67955d9c267731f74905417174d0767ec159d9b141e74aaa3cd8ee095270a7cc30847c413c702944df0c0b974ff8e98c55aa5004c00dbc55eadb16
+DIST pelican-3.7.0.tar.gz 784432 BLAKE2B 34aac3c79fb4f9417132209ba2decb75b52aab80efa7a1770650422e283fe1801aedc68a84f2ec8ee36e3b3df67b0582ceb2062bf3dca2ba109bf76a8f462e06 SHA512 e4b8a771737a8f6fab109b0f4544229f09141f38210b502f605ae449be7ba12bb43db6637592d2e9060255e923f092c6cfe8dc7bbeec1431d5b625f3a9b8222d
+DIST pelican-3.7.1.tar.gz 784605 BLAKE2B 42adef016f54a931e4fef225af9a4c5c880b66c96660c2a34137a425f879688822ddc8bbc19805444bf2b49369c3dccf8a5303748ff9e7cbde3910d6ba501652 SHA512 9e04e6a2009cc134f74410d8c8349831467192e7524287e23cad0b68232f2b5dd04f5d98505222d71eb3441e466bccec1cafc7f6e3c6bfcb4c5e57e4ab0fadda
+EBUILD pelican-3.6.0.ebuild 1219 BLAKE2B e21a02d18a47ee5d46409e35e09ae7f76fc969264560e856b165a25f6322bc3625e393b9df834c8d294e333dba60c6a45fc9500abd7d9838790620148abe12e1 SHA512 ed51abdea2e38145275804b672b34f5f1dca3b9675b84976b120ddaa6b2b150b06bbc0f5e7be15210d8d656089c7a5d23dbed0fb666d17c1affe839f3c4aab28
+EBUILD pelican-3.6.3.ebuild 1542 BLAKE2B ff3c6bb148c000677a9d322e23cc4a94d192598e7cfdac029a88a7b43a0a33fd75da616f7ed1887494eb48a434e5201884034d97bd756b88699707cbc9701764 SHA512 f52d04c4d7c1660d034fe4ebeef6bb99dc0853463afc812cae53ef755ac1f7eae35404a852570fd82685c865bf63eb2a8e6ad896e4bb6ccd7471b5020bf7f401
+EBUILD pelican-3.7.0.ebuild 1471 BLAKE2B 3c456e5348ec3e8de5b4cd0cf08266f525cabc42c98fcc206550c7f11d1f7a950daed077fda5f5cb2a25d87bbc78a93da01cd2563a3a0189e48e7609f0e8d9d7 SHA512 03823597ac2356e0c2946c15c18ab5dc544bc6f789797c6044d7c2b0aafea03954ca5f6697274b31df1e5c7020f2bf95e6a7217025a5da1a23622e7e72e827f7
+EBUILD pelican-3.7.1.ebuild 1475 BLAKE2B 9d2de4c9d95c66c4f58fec74ef8b8ed5d804539edf66684c53c00a2b668316fb0752ff612eea3dca024f7192a91d6d99a4ffa4b99b2dd00f532e7bab133d898c SHA512 4df5e139aec385af52f994e83ea8250eb73625b24fcf17a7dc344c0a57f87733d15cd0e5ae53fd1c8ce62e28e84c1e2c0960537cd524780382e17d9b5179f268
+EBUILD pelican-9999.ebuild 1552 BLAKE2B e2ef90c3d6eb63e1e7e11f62b0605ed4d93a4d654a1ba3c0fe7a8a07134dac21e60f11059802346512419188e013cd141d887f08150166d55f6e4132270d5e42 SHA512 666fad2f7b97bbb8ec69b1b56cc1d5d1da1113af11588696e9ef35b1a375341c7bf89e49c1a01ca640d3ffd54fcaf60040c2372b4eb7f6f4346680b9eca7d7db
+MISC metadata.xml 520 BLAKE2B bcf1bbb92ce3d045a3dde410f9566322f5605796b3fdc1947b1ae08967f2af21319922001d1942ccbb46dda2a911c3ea4efacf95ae67af32f8a3183c734ab2e1 SHA512 1a10d48a737dd95edb40e5190e45bddd30fdbe50db08394d21834d1ebd4f7e5b267477a52f90934b9ba92252b5a2b1d60e208399ab96559d169f550055c3e65c
diff --git a/app-text/pelican/metadata.xml b/app-text/pelican/metadata.xml
new file mode 100644
index 000000000000..74329b5b96e9
--- /dev/null
+++ b/app-text/pelican/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>djc@gentoo.org</email>
+    <name>Dirkjan Ochtman</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">pelican</remote-id>
+    <remote-id type="github">getpelican/pelican</remote-id>
+    <bugs-to>https://github.com/getpelican/pelican/issues</bugs-to>
+  </upstream>
+  <use>
+    <flag name="markdown">Markdown support</flag>
+  </use>
+</pkgmetadata>
diff --git a/app-text/pelican/pelican-3.6.0.ebuild b/app-text/pelican/pelican-3.6.0.ebuild
new file mode 100644
index 000000000000..f6c4eac0245c
--- /dev/null
+++ b/app-text/pelican/pelican-3.6.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4} )
+
+inherit distutils-r1
+
+DESCRIPTION="A tool to generate a static blog, with restructured text or markdown input files"
+HOMEPAGE="https://blog.getpelican.com/ https://pypi.org/project/pelican/"
+SRC_URI="https://github.com/getpelican/pelican/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="examples markdown"
+
+DEPEND=">=dev-python/feedgenerator-1.6[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.7[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/unidecode[${PYTHON_USEDEP}]
+	dev-python/blinker[${PYTHON_USEDEP}]
+	>=dev-python/six-1.4[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	markdown? ( dev-python/markdown[${PYTHON_USEDEP}] )"
+RDEPEND=""
+
+DOCS=( README.rst )
+
+python_install_all() {
+	use examples && local EXAMPLES=( samples/. )
+	distutils-r1_python_install_all
+}
+
+# no tests: tests/content not in tarball for 2.8.1
+# for 3.0, should be based on tox (refer to virtualenvwrapper)
+
+#python_test() {
+#	esetup.py test
+#}
diff --git a/app-text/pelican/pelican-3.6.3.ebuild b/app-text/pelican/pelican-3.6.3.ebuild
new file mode 100644
index 000000000000..306df4f67c47
--- /dev/null
+++ b/app-text/pelican/pelican-3.6.3.ebuild
@@ -0,0 +1,55 @@
+# 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} )
+
+inherit distutils-r1
+
+DESCRIPTION="A tool to generate a static blog, with restructured text or markdown input files"
+HOMEPAGE="https://blog.getpelican.com/ https://pypi.org/project/pelican/"
+SRC_URI="https://github.com/getpelican/pelican/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples markdown test"
+# Tests fail for this release but are fixed upstream
+RESTRICT="test"
+
+DEPEND=">=dev-python/feedgenerator-1.6[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.7[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/unidecode[${PYTHON_USEDEP}]
+	dev-python/blinker[${PYTHON_USEDEP}]
+	>=dev-python/six-1.4[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	markdown? ( dev-python/markdown[${PYTHON_USEDEP}] )
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/markdown[${PYTHON_USEDEP}]
+	)"
+RDEPEND=""
+
+DOCS=( README.rst )
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	if use examples; then
+		insinto "/usr/share/doc/${PF}"
+		docompress -x "/usr/share/doc/${PF}/samples"
+		doins -r samples
+	fi
+	distutils-r1_python_install_all
+}
+
+python_test() {
+	nosetests || die "Testing failed with ${EPYTHON}"
+}
diff --git a/app-text/pelican/pelican-3.7.0.ebuild b/app-text/pelican/pelican-3.7.0.ebuild
new file mode 100644
index 000000000000..826b9d76db6f
--- /dev/null
+++ b/app-text/pelican/pelican-3.7.0.ebuild
@@ -0,0 +1,53 @@
+# 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} )
+
+inherit distutils-r1
+
+DESCRIPTION="A tool to generate a static blog, with restructured text or markdown input files"
+HOMEPAGE="https://blog.getpelican.com/ https://pypi.org/project/pelican/"
+SRC_URI="https://github.com/getpelican/pelican/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc examples markdown test"
+
+DEPEND=">=dev-python/feedgenerator-1.9[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.7[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/unidecode[${PYTHON_USEDEP}]
+	dev-python/blinker[${PYTHON_USEDEP}]
+	>=dev-python/six-1.4[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	markdown? ( dev-python/markdown[${PYTHON_USEDEP}] )
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/markdown[${PYTHON_USEDEP}]
+	)"
+RDEPEND=""
+
+DOCS=( README.rst )
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	if use examples; then
+		insinto "/usr/share/doc/${PF}"
+		docompress -x "/usr/share/doc/${PF}/samples"
+		doins -r samples
+	fi
+	distutils-r1_python_install_all
+}
+
+python_test() {
+	nosetests || die "Testing failed with ${EPYTHON}"
+}
diff --git a/app-text/pelican/pelican-3.7.1.ebuild b/app-text/pelican/pelican-3.7.1.ebuild
new file mode 100644
index 000000000000..2ef91da11647
--- /dev/null
+++ b/app-text/pelican/pelican-3.7.1.ebuild
@@ -0,0 +1,53 @@
+# 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 distutils-r1
+
+DESCRIPTION="A tool to generate a static blog, with restructured text or markdown input files"
+HOMEPAGE="https://blog.getpelican.com/ https://pypi.org/project/pelican/"
+SRC_URI="https://github.com/getpelican/pelican/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc examples markdown test"
+
+DEPEND=">=dev-python/feedgenerator-1.9[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.7[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/unidecode[${PYTHON_USEDEP}]
+	dev-python/blinker[${PYTHON_USEDEP}]
+	>=dev-python/six-1.4[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	markdown? ( dev-python/markdown[${PYTHON_USEDEP}] )
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/markdown[${PYTHON_USEDEP}]
+	)"
+RDEPEND=""
+
+DOCS=( README.rst )
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	if use examples; then
+		insinto "/usr/share/doc/${PF}"
+		docompress -x "/usr/share/doc/${PF}/samples"
+		doins -r samples
+	fi
+	distutils-r1_python_install_all
+}
+
+python_test() {
+	nosetests || die "Testing failed with ${EPYTHON}"
+}
diff --git a/app-text/pelican/pelican-9999.ebuild b/app-text/pelican/pelican-9999.ebuild
new file mode 100644
index 000000000000..e2ca3d7b95b5
--- /dev/null
+++ b/app-text/pelican/pelican-9999.ebuild
@@ -0,0 +1,56 @@
+# 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 distutils-r1 git-r3
+
+DESCRIPTION="A tool to generate a static blog, with restructured text or markdown input files"
+HOMEPAGE="https://blog.getpelican.com/ https://pypi.org/project/pelican/"
+EGIT_REPO_URI="https://github.com/getpelican/pelican.git"
+EGIT_CHECKOUT_DIR="${WORKDIR}/${P}"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS=""
+IUSE="doc examples markdown test"
+# Tests fail for this release but are fixed upstream
+RESTRICT="test"
+
+DEPEND=">=dev-python/feedgenerator-1.6[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.7[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/unidecode[${PYTHON_USEDEP}]
+	dev-python/blinker[${PYTHON_USEDEP}]
+	>=dev-python/six-1.4[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	markdown? ( dev-python/markdown[${PYTHON_USEDEP}] )
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/markdown[${PYTHON_USEDEP}]
+	)"
+RDEPEND=""
+
+DOCS=( README.rst )
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/_build/html/. )
+	if use examples; then
+		insinto "/usr/share/doc/${PF}"
+		docompress -x "/usr/share/doc/${PF}/samples"
+		doins -r samples
+	fi
+	distutils-r1_python_install_all
+}
+
+python_test() {
+	nosetests || die "Testing failed with ${EPYTHON}"
+}
diff --git a/app-text/pep-2.8-r1 b/app-text/pep-2.8-r1
deleted file mode 100644
index 7d453b574e80..000000000000
--- a/app-text/pep-2.8-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=app-arch/unzip
-DESCRIPTION=General purpose filter and file cleaning program
-EAPI=2
-HOMEPAGE=http://hannemyr.com/enjoy/pep.html
-KEYWORDS=~amd64 ~mips ppc x86 ~x86-linux ~ppc-macos
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://hannemyr.com/enjoy/pep28.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=db5788d0caad28651944b4d8e852996f
diff --git a/app-text/pep/Manifest b/app-text/pep/Manifest
new file mode 100644
index 000000000000..338d78f49f02
--- /dev/null
+++ b/app-text/pep/Manifest
@@ -0,0 +1,5 @@
+AUX pep-2.8-gentoo.patch 494 BLAKE2B 62beadd57cf83f21f92dc9597265f7ef672aa19e743fd256dc30afe84d57accb741dfde47d1a87dc4b14242432fdcb08fa169db7cace74524458f4ed4b900239 SHA512 5c214a7d6d86ff59f2edf9e77d480414d7a2dbc0ce5f9a96012c6e642f6c0918772558f46c0c2c5e3f6898c7e751438859bae5bb89a900e64e33f1dd53f390e7
+AUX pep-2.8-include.patch 239 BLAKE2B fd411d4e3753314ae93634bd24093524f364b1603671149722d31fb42e70977e3c97a76a2902a891aebd4e0f69632c5cd6da7996732195cf4a2d5005f5996fd4 SHA512 980ac8e710b2c0213c9ab6cb298274ca3eef21fdf9cd980e62530b98e913784cb5346fc13613b9723eaa6352383d31079d74749e21ac322edde86863344eff80
+DIST pep28.zip 83969 BLAKE2B 76dd8867b04299a7d616a1487a4b7812349a076f51b2828e01b45ef4790d890436eed147b51c2591dec8936b339a19fad3bb41eeafca8cda8c9904afbd2107e0 SHA512 c987b8f23409475e1882e06a87366a1692a7d859af907b4154715a4caf4475d6c266162ede019b29d65400fe72e115948d26e9c9396d628ea5f35ca472548ec8
+EBUILD pep-2.8-r1.ebuild 1149 BLAKE2B cc4ab4bd998e1762e9c474af66ca3c578b425fffd4e5166f3840a57a26d6c9831fa1ec0263886493e04dadf515e7a8589fade40b1dfb815abed5083fe503df50 SHA512 b4f5ca5770d0127f20b4b2c6145fa68703c5751df0dfac7739046e823dfd3f5193ecef150804bf59282c1286903d113727f3f30460258d3fea1d9d1116caafe6
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/pep/files/pep-2.8-gentoo.patch b/app-text/pep/files/pep-2.8-gentoo.patch
new file mode 100644
index 000000000000..8d5c13624d65
--- /dev/null
+++ b/app-text/pep/files/pep-2.8-gentoo.patch
@@ -0,0 +1,25 @@
+--- a/Makefile	1995-08-11 02:00:00.000000000 +0200
++++ b/Makefile	2010-08-26 23:54:34.000000000 +0200
+@@ -66,7 +66,7 @@
+ 
+ # Unix
+ CC	= gcc
+-LFLAGS	= -o pep
++LFLAGS	= -o pep $(LDFLAGS)
+ SRC	= src
+ XXX	= c
+ OBJ	= o
+@@ -78,10 +78,10 @@
+ UNZIP	= unzip
+ 
+ # directories, etc.
+-BINDIR	= /local/bin
+-LIBDIR	= /local/share/lib/pep
++BINDIR	= /usr/bin
++LIBDIR	= /usr/share/pep
+ MANEXT	= 1
+-MANDIR	= /local/man/man$(MANEXT)
++MANDIR	= /usr/share/man/man$(MANEXT)
+ TODAY	= 19950811
+ CLOCK	= 0200
+ VER	= 28
diff --git a/app-text/pep/files/pep-2.8-include.patch b/app-text/pep/files/pep-2.8-include.patch
new file mode 100644
index 000000000000..d70c8dfe35cf
--- /dev/null
+++ b/app-text/pep/files/pep-2.8-include.patch
@@ -0,0 +1,10 @@
+--- a/main.c	1995-08-11 02:00:00.000000000 +0200
++++ b/main.c	2010-08-26 23:57:03.000000000 +0200
+@@ -91,6 +91,7 @@
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <unistd.h>
+ #include <string.h>
+ #include <ctype.h>
+ #include "pep.h"
diff --git a/app-text/pep/metadata.xml b/app-text/pep/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-text/pep/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/app-text/pep/pep-2.8-r1.ebuild b/app-text/pep/pep-2.8-r1.ebuild
new file mode 100644
index 000000000000..59b13dc23d46
--- /dev/null
+++ b/app-text/pep/pep-2.8-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="2"
+
+inherit eutils toolchain-funcs flag-o-matic
+
+DESCRIPTION="General purpose filter and file cleaning program"
+HOMEPAGE="http://hannemyr.com/enjoy/pep.html"
+SRC_URI="http://hannemyr.com/enjoy/${PN}${PV//./}.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ppc x86 ~x86-linux ~ppc-macos"
+IUSE=""
+
+DEPEND="app-arch/unzip"
+RDEPEND=""
+
+S=${WORKDIR}
+
+src_prepare() {
+	# pep does not come with autconf so here's a patch to configure
+	# Makefile with the correct path
+	epatch \
+		"${FILESDIR}"/${P}-gentoo.patch \
+		"${FILESDIR}"/${P}-include.patch
+	# Darwin lacks stricmp and DIRCHAR
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		sed -i -e '/^OBJS/s/^\(.*\)$/\1 bdmg.o/' Makefile
+		append-flags "-Dunix" -DSTRICMP
+	fi
+}
+
+src_compile() {
+	# make man page too
+	make Doc/pep.1 || die "make man page failed"
+	emake CC="$(tc-getCC)" || die "emake failed"
+}
+
+src_install() {
+	dobin pep || die "dobin failed"
+	doman Doc/pep.1 || die "doman failed"
+
+	insinto /usr/share/pep
+	doins Filters/* || die "doins failed"
+
+	dodoc aareadme.txt file_id.diz
+}
diff --git a/app-text/pinfo-0.6.10-r5 b/app-text/pinfo-0.6.10-r5
deleted file mode 100644
index b5450ae92718..000000000000
--- a/app-text/pinfo-0.6.10-r5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=sys-libs/ncurses:0= sys-libs/readline:0= nls? ( virtual/libintl ) sys-devel/bison virtual/pkgconfig nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Hypertext info and man viewer based on (n)curses
-EAPI=5
-HOMEPAGE=http://pinfo.alioth.debian.org/
-IUSE=nls readline
-KEYWORDS=alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=sys-libs/ncurses:0= sys-libs/readline:0= nls? ( virtual/libintl )
-SLOT=0
-SRC_URI=https://alioth.debian.org/frs/download.php/3351/pinfo-0.6.10.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b278142b07f2cb88c7753f8285ad99c6
diff --git a/app-text/pinfo-0.6.10-r6 b/app-text/pinfo-0.6.10-r6
deleted file mode 100644
index 894451c85cd3..000000000000
--- a/app-text/pinfo-0.6.10-r6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=sys-libs/ncurses:0= sys-libs/readline:0= nls? ( virtual/libintl ) sys-devel/bison virtual/pkgconfig nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Hypertext info and man viewer based on (n)curses
-EAPI=6
-HOMEPAGE=http://pinfo.alioth.debian.org/
-IUSE=nls readline
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=sys-libs/ncurses:0= sys-libs/readline:0= nls? ( virtual/libintl )
-SLOT=0
-SRC_URI=https://alioth.debian.org/frs/download.php/3351/pinfo-0.6.10.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a055495ff4cd53916062c62656506dc4
diff --git a/app-text/pinfo/Manifest b/app-text/pinfo/Manifest
new file mode 100644
index 000000000000..9cb8f4f0f1a0
--- /dev/null
+++ b/app-text/pinfo/Manifest
@@ -0,0 +1,16 @@
+AUX pinfo-0.6.10-clearfilenameprefix.patch 278 BLAKE2B 678ebf0333898651407e36315a38f6ca1e0ca8b3e7f1597496796de0d8a55d37ccfe94c77740e9b92e6f708fadc2511ce3d4c8a098d91ed2211a56e048d1e7c1 SHA512 6d4b0e19c94011eacdaca85e6a566f296d8e41e89c7687d25e5aa6c3e155f0a51112d59fe9bebafa83144469a1bce85400559812adc7d7ad8990b80712b45906
+AUX pinfo-0.6.10-dir-file.patch 280 BLAKE2B 32b728969d23902dde2aed942cf5c21dc87fb5c1bff11c90dcece36fe67698b242a74b8ab74f91a172b28d3c548afd46404e0d956f4673980f8abfe0944932e4 SHA512 bcc16752f2c98b7c013ec1dae84ada89f44d6c00298ed5069b2098674bedcb31bf9e29d3e5c821398518fd59e0fbd84e9141dad2885c55d5a3c76ef728a24b50
+AUX pinfo-0.6.10-gcc-7-inline.patch 835 BLAKE2B 41c2bfe79b6b2afc86ba20718d6cbfa414ef0045c8d64262639e7731ebfd2e340d6f7217bd25020f6dbd333f6a994c5fde368bd882a5417b2cb695c5405d9e16 SHA512 1f4d458917966367333027e1cc5c6e8a376da31f62b2d5be37a4ea287a1a340c55f64f1653b3afa7c0a13bcad8309aae16ca12e91c12ca409eedef7de5cd7049
+AUX pinfo-0.6.10-gettext-0.19.patch 3622 BLAKE2B ebffa03b6df06a4ea96f628ff1ff009aae43b637ee2089b2ac622eefcd745894eff9d94cc648bec4b53b6a9e6aece0ed3e002320c10f615acf2cd7405b5dd051 SHA512 52e4aaebe829e1d10846dadb96b03d973d8b5fe0c40b5c3c2ee8d107b020dc8efff175018cca81c42cecc2631a4e4efe74c6655c38d2d819db0224d16b15babf
+AUX pinfo-0.6.10-info-suffix.patch 968 BLAKE2B 86e442f381c6523e374259db9903426e4f6db769099ff2fffb56af23500aa394a63739f1d8681c550282e122a495a9de99b63242e7743349028e7dce63c14078 SHA512 882c80eb6d36f264e20cc532aa1cb00f3a1982b887bd199e4879e4e5845d18cd7a5e01c023ef723290c174a8534bc60060758f31ad7d1dd995f1441a4c496ada
+AUX pinfo-0.6.10-libc-basename.patch 736 BLAKE2B 3e7a83dc07aff65003dc45ccbdfb69818102aafa4debb80916784acef724396d6c7305939896b6dc85dd00de4dd28208f745305c2c5e9acef57d2b3cad44eb02 SHA512 b415aeebca3dc4a4d064781b70908ec70af522928428214e090f23e9ea82cbfde2bab2a08a88ebca88b30daf702b06a934157674bfd8d5f56ee4f973a2732e6e
+AUX pinfo-0.6.10-ncurses-check.patch 408 BLAKE2B a100e5e31424a1f846eb053c601b52969c4b8e190ed7dedab2583e1da6651600dbd604b0f735854e4d2407628a4c41055a6206c0f605d99936a861da978bfab6 SHA512 c7ed7036b5e629882129b559cbdeec3ebe1a8f6f72ad91db4b743bbce45ea7f55d49fd4c8884fb424a6df048f52f680d880fb2cba2125367cdbf993222203d30
+AUX pinfo-0.6.10-tinfo.patch 944 BLAKE2B 240107160cb76fef695fe826400dd4986d21c6c2707c50dbfe90f92d15663c915f7e2d22a709d8d25efd0161c2328d4b3a716dfa7def13006734e456bd9633d8 SHA512 9a4ff5fdc9a461c205f46e71cd43873270cfa1b4e5d897145bf30e51a0a0ffd350add33ff812a8870272f5e30bb8173c0a30af9fadd9f09ee9916512c106e42c
+AUX pinfo-0.6.10-version.patch 264 BLAKE2B 65bcfcdc4f49cdc011b5db956bc296e4b3ed25900fc25c8df667a8f221c5454b0b369e59df07b61604004ef2d0df1b9e98caaf7dc0597daf4ba294655e4ebc7d SHA512 aa998d5b63d50c844dcfdc6e6419dafab3d31c32e6e6a2e67101d124a5badf0968eb0e52fb46aea8ca2e8ac7e8eed7c4aabbdadffe9e99165d7525d89990625d
+AUX pinfo-0.6.9-GROFF_NO_SGR.patch 259 BLAKE2B a49a7addbf822436bc5cb8cf2da9964eca3b354274de1fb5f64cf4d634164fbe55e634c99282f87b3cbda5ac9f334b25d9123237b4cc64e7e5286b57ddf2a057 SHA512 373eea0e8feca230c14bf658ca5e73698ea16d35b5ca790c46b5bf02a83aaf1d55628183f89666913dfea96ef0f3653789255f8dfd616fe5b3a19be195d46ce6
+AUX pinfo-0.6.9-as-needed.patch 457 BLAKE2B 5e104b202a66c377cad570d3427043fe8273e6c907738283ed596185852cfb5713d430250d2ae83b11d7708139fa7f2dd962add064c3e3c96fe6112359faee26 SHA512 c4b23c4f273b35d2594af81ee4bf9aca60cd5208f1c3ab4a084805a63fdecc8bb7f2a7ee6118130ba691e3fa17e79f2671a90b7bc0af7e3cccaf12d2baecfe7f
+AUX pinfo-0.6.9-lzma-xz.patch 614 BLAKE2B 0b84247de91a42f75d0664f4ccab23e3d57bc66f6af2444e8b9dee2c0e6edb5afad1d467725507c9618947463cdd2f221024c7feb387282ebafcb6bc62741c89 SHA512 8e3ec8a98347c061826cc913c09fd2177d0f8625947c319b527e85d5ae3dcbf7dafb34b5f4a5e2fc9639bcc4db45afdea7dda6db6a88001e1c6a3994b4847ae4
+DIST pinfo-0.6.10.tar.bz2 133059 BLAKE2B aaac23583510f42ac8a0c71a380f2bc76c4db6d78518bb4d5399c100bf0aec291c869576b18313e00f8572610cb967c3acb5f8d643c48f1295fd2efa8e16e3e6 SHA512 d3aeb93a668b939a2be7dd397ef5c918a8d108a1a7613ce39d4ef2faafbd549582a35d95c74c1dc74f4c86c9f2bf09b7bca7b5006c5a79302403dd906e8d376e
+EBUILD pinfo-0.6.10-r5.ebuild 1327 BLAKE2B fa65a2d59989d50982921aaf64b2f7e98fb3c4ea82e2c1537656d30159d44a29df0ffb0c8034dbabcfb4b82386bf15b7f4ccf86f5fcfb577eaa667cab7ee22b2 SHA512 f5132c2d41aba6c9cc41076571d70266db613f28ce63c1c3d3b3902c011d3860004cd910280527090b72c97a7735928ae2c3e8f85f96139134bf847d6ec624ba
+EBUILD pinfo-0.6.10-r6.ebuild 1420 BLAKE2B 3f262260f2def1fec675c3176f906ed911642e5145968abf7e25b0b5bc1f8ea2b60a0076202d1dc57ae9717b485fd6a3b0ffc26d51ab8e2a43b393dcb8bf47fd SHA512 ba6224108807b0bcd71edc86a0ec073319490453d14d278d9fe39c5d67abe6e1f15abd5b7d12f578e08a8febc506a33ed537f6d93e94b98fb47e83c135d94c91
+MISC metadata.xml 214 BLAKE2B 2714d2d15a382508ac07f9e3cf3c042bbba715d1a3f679a37d45fb68cbb7931bffe3479e8a9c3ef61c0f76d1b5822f9696d203ed0153a2e713865cce16ed2403 SHA512 6bd18312d33fe28edbaf93fa559dab76a4eb813f37bf3accccd113e111507617827f4423e81f6448edc51245f86c73a5b1d65c0a9310c3aa1d1b910597303fc1
diff --git a/app-text/pinfo/files/pinfo-0.6.10-clearfilenameprefix.patch b/app-text/pinfo/files/pinfo-0.6.10-clearfilenameprefix.patch
new file mode 100644
index 000000000000..0835d166932e
--- /dev/null
+++ b/app-text/pinfo/files/pinfo-0.6.10-clearfilenameprefix.patch
@@ -0,0 +1,10 @@
+--- a/src/filehandling_functions.c
++++ b/src/filehandling_functions.c
+@@ -758,6 +758,7 @@
+ 		tmpfilename = tmpfilename2;	/* later we will refere only to tmp2 */
+ 	}
+ 
++	clearfilenameprefix();
+ 	for (i = -1; i < infopathcount; i++)	/* go through all paths */
+ 	{
+ 		if (i == -1)
diff --git a/app-text/pinfo/files/pinfo-0.6.10-dir-file.patch b/app-text/pinfo/files/pinfo-0.6.10-dir-file.patch
new file mode 100644
index 000000000000..7a282f354baa
--- /dev/null
+++ b/app-text/pinfo/files/pinfo-0.6.10-dir-file.patch
@@ -0,0 +1,11 @@
+--- a/src/filehandling_functions.c
++++ b/src/filehandling_functions.c
+@@ -742,7 +742,7 @@
+ 	int i, j;
+ 	char *tmpfilename;
+ 
+-	if (strncmp(filename, "dir", 3) == 0)
++	if (strncmp(filename, "dir", 3) == 0 && !isalnum(filename[3]))
+ 	{
+ 		xfree(buf);
+ 		return opendirfile(number);
diff --git a/app-text/pinfo/files/pinfo-0.6.10-gcc-7-inline.patch b/app-text/pinfo/files/pinfo-0.6.10-gcc-7-inline.patch
new file mode 100644
index 000000000000..d73ad947c7df
--- /dev/null
+++ b/app-text/pinfo/files/pinfo-0.6.10-gcc-7-inline.patch
@@ -0,0 +1,42 @@
+--- a/src/initializelinks.c
++++ b/src/initializelinks.c
+@@ -75,7 +75,7 @@
+  * checks if an item belongs to tag table. returns 1 on success and 0 on
+  * failure.  It should be optimised...
+  */
+-inline int
++int
+ exists_in_tag_table(char *item)
+ {
+ 	if (gettagtablepos(item) != -1)
+--- a/src/filehandling_functions.c
++++ b/src/filehandling_functions.c
+@@ -554,7 +554,7 @@
+ 	return 1;
+ }
+ 
+-inline void
++void
+ buildcommand(char *dest, char *command, char *filename, const char *tmpfilename)
+ {
+ 	strcpy(dest, command);
+@@ -564,7 +564,7 @@
+ 	strcat(dest, tmpfilename);
+ }
+ 
+-inline void
++void
+ builddircommand(char *dest, char *command, char *filename, const char *tmpfilename)
+ {
+ 	strcpy(dest, command);
+--- a/src/utils.c
++++ b/src/utils.c
+@@ -193,7 +193,7 @@
+ 	return value;
+ }
+ 
+-inline void
++void
+ initlocale()
+ {
+ #ifdef ___DEBUG___
diff --git a/app-text/pinfo/files/pinfo-0.6.10-gettext-0.19.patch b/app-text/pinfo/files/pinfo-0.6.10-gettext-0.19.patch
new file mode 100644
index 000000000000..6679e51acb20
--- /dev/null
+++ b/app-text/pinfo/files/pinfo-0.6.10-gettext-0.19.patch
@@ -0,0 +1,110 @@
+--- a/po/cs.po
++++ b/po/cs.po
+@@ -9,6 +9,7 @@
+ "PO-Revision-Date: 2005-10-11 16:59+0200\n"
+ "Last-Translator: Katarina Machalkova <bubli@bubli.org>\n"
+ "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
++"Language: cs\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=ISO-8859-2\n"
+ "Content-Transfer-Encoding: 8bit\n"
+--- a/po/de.po
++++ b/po/de.po
+@@ -10,6 +10,7 @@
+ "PO-Revision-Date: 1999-04-21 01:50+0200\n"
+ "Last-Translator: René van Bevern <rvb@pro-linux.de>\n"
+ "Language-Team: German <de@li.org>\n"
++"Language: de\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=ISO-8859-1\n"
+ "Content-Transfer-Encoding: 8bit\n"
+--- a/po/eu.po
++++ b/po/eu.po
+@@ -12,6 +12,7 @@
+ "PO-Revision-Date: 2005-09-28 23:14+0200\n"
+ "Last-Translator: Piarres Beobide <pi@beobide.net>\n"
+ "Language-Team: librezale.org <librezale@librezale.org>\n"
++"Language: eu\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
+--- a/po/ja.po
++++ b/po/ja.po
+@@ -10,6 +10,7 @@
+ "PO-Revision-Date: 2001-11-21 17:42+0900\n"
+ "Last-Translator: Masayuki Hatta <mhatta@gnu.org>\n"
+ "Language-Team: Japanese <ja@li.org>\n"
++"Language: ja\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=euc-jp\n"
+ "Content-Transfer-Encoding: 8bit\n"
+--- a/po/nl.po
++++ b/po/nl.po
+@@ -11,6 +11,7 @@
+ "PO-Revision-Date: 2005-09-01 21:21+0200\n"
+ "Last-Translator: Bas Zoetekouw <bas@debian.org>\n"
+ "Language-Team: Dutch <nl@li.org>\n"
++"Language: nl\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=ISO-8859-15\n"
+ "Content-Transfer-Encoding: 8bit\n"
+--- a/po/pl.po
++++ b/po/pl.po
+@@ -10,6 +10,7 @@
+ "PO-Revision-Date: 2005-09-29 21:59+0200\n"
+ "Last-Translator: Krzysztof Krzy¿aniak (eloy) <eloy@debian.org>\n"
+ "Language-Team:\n"
++"Language: pl\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=ISO-8859-2\n"
+ "Content-Transfer-Encoding: 8bit\n"
+--- a/po/pt_BR.po
++++ b/po/pt_BR.po
+@@ -13,6 +13,7 @@
+ "Last-Translator: Felipe Augusto van de Wiel (faw) <felipe@cathedrallabs."
+ "org>\n"
+ "Language-Team: l10n portuguese <debian-l10n-portuguese@lists.debian.org>\n"
++"Language: pt_BR\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=utf-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
+--- a/po/ro.po
++++ b/po/ro.po
+@@ -11,6 +11,7 @@
+ "PO-Revision-Date: 2005-09-30 03:42+0300\n"
+ "Last-Translator: Eddy Petrisor <eddy.petrisor@gmail.com>\n"
+ "Language-Team: Romanian <debian-l10n-romanian@lists.debian.org>\n"
++"Language: ro\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
+--- a/po/ru.po
++++ b/po/ru.po
+@@ -11,6 +11,7 @@
+ "PO-Revision-Date: 2005-10-01 10:47+0400\n"
+ "Last-Translator: Yuri Kozlov <kozlov.y@gmail.com>\n"
+ "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
++"Language: ru\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
+--- a/po/sv.po
++++ b/po/sv.po
+@@ -11,6 +11,7 @@
+ "PO-Revision-Date: 2005-10-06 12:00+0200\n"
+ "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
+ "Language-Team: Swedish <sv@li.org>\n"
++"Language: sv\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=iso-8859-1\n"
+ "Content-Transfer-Encoding: 8bit\n"
+--- a/po/vi.po
++++ b/po/vi.po
+@@ -11,6 +11,7 @@
+ "PO-Revision-Date: 2005-12-21 15:11+1030\n"
+ "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
+ "Language-Team: Vietnamese <gnomevi-list@lists.sourceforge.net>\n"
++"Language: vi\n"
+ "MIME-Version: 1.0\n"
+ "Content-Type: text/plain; charset=UTF-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
diff --git a/app-text/pinfo/files/pinfo-0.6.10-info-suffix.patch b/app-text/pinfo/files/pinfo-0.6.10-info-suffix.patch
new file mode 100644
index 000000000000..45be53cd1bf6
--- /dev/null
+++ b/app-text/pinfo/files/pinfo-0.6.10-info-suffix.patch
@@ -0,0 +1,28 @@
+--- a/src/filehandling_functions.c
++++ b/src/filehandling_functions.c
+@@ -96,11 +96,14 @@ matchfile(char **buf, char *name)
+ 	{
+ 		/* use strcat rather than strdup, because xmalloc handles all 
+ 		 * malloc errors */
+-		char *thisfile = xmalloc(strlen(dp->d_name)+1);
++		int len = strlen(dp->d_name)+1;
++		char *thisfile = xmalloc(len * 2);
++		char *thisfile_info = thisfile + len;
+ 		strcat(thisfile, dp->d_name);
+ 
+ 		/* strip suffixes (so "gcc.info.gz" -> "gcc") */
+ 		strip_compression_suffix(thisfile);
++		strcat(thisfile_info, thisfile);
+ 		strip_info_suffix(thisfile);
+ 
+ 		/* compare this file with the file we're looking for */
+@@ -109,8 +112,7 @@ matchfile(char **buf, char *name)
+ 			/* we found a match! */
+ 			matched++;
+ 			/* put it in the buffer */
+-			strncat(Buf, thisfile, 1023-strlen(Buf));
+-			strncat(Buf, ".info", 1023-strlen(Buf));
++			strncat(Buf, thisfile_info, 1023-strlen(Buf));
+ 
+ 			/* clean up, and exit the loop */
+ 			xfree(thisfile);
diff --git a/app-text/pinfo/files/pinfo-0.6.10-libc-basename.patch b/app-text/pinfo/files/pinfo-0.6.10-libc-basename.patch
new file mode 100644
index 000000000000..6e9d4954792a
--- /dev/null
+++ b/app-text/pinfo/files/pinfo-0.6.10-libc-basename.patch
@@ -0,0 +1,33 @@
+do not redefine the basename that the C library provides
+
+--- a/src/filehandling_functions.c
++++ b/src/filehandling_functions.c
+@@ -31,7 +31,6 @@ typedef struct
+ }
+ Suffixes;
+ 
+-char * basename(char *filename);
+ 
+ 
+ /******************************************************************************
+@@ -713,20 +712,6 @@ opendirfile(int number)
+ 	return NULL;
+ }
+ 
+-char *
+-basename(char *filename)
+-{
+-	int len = strlen(filename);
+-	char *a = filename + len;
+-	while (a > filename)
+-	{
+-		a--;
+-		if (*a == '/')
+-			return a + 1;
+-	}
+-	return filename;		/* when it was a basename */
+-}
+-
+ /*
+  * Note: openinfo is a function for reading info files, and putting
+  * uncompressed content into a temporary filename.  For a flexibility, there
diff --git a/app-text/pinfo/files/pinfo-0.6.10-ncurses-check.patch b/app-text/pinfo/files/pinfo-0.6.10-ncurses-check.patch
new file mode 100644
index 000000000000..a5f14c593f44
--- /dev/null
+++ b/app-text/pinfo/files/pinfo-0.6.10-ncurses-check.patch
@@ -0,0 +1,14 @@
+curses_wchar is set to true/false, so trying to assign it to the compiler
+flags variable makes no sense.  it's already been set up the right value
+at this point, so delete the assignment.
+
+--- a/macros/curses.m4
++++ b/macros/curses.m4
+@@ -130,7 +130,6 @@ AC_DEFUN([AC_CHECK_CURSES],[
+ 		else
+ 			AC_DEFINE(CURSES_WCHAR)
+ 			CURSES_WCHAR=true
+-			CURSES_FLAGS=$curses_wchar
+ 			AC_SUBST(CURSES_FLAGS)
+ 		fi
+ 
diff --git a/app-text/pinfo/files/pinfo-0.6.10-tinfo.patch b/app-text/pinfo/files/pinfo-0.6.10-tinfo.patch
new file mode 100644
index 000000000000..bbb6ecfe421d
--- /dev/null
+++ b/app-text/pinfo/files/pinfo-0.6.10-tinfo.patch
@@ -0,0 +1,40 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -118,7 +118,24 @@
+ 					
+ 
+ # curses
++PKG_CHECK_MODULES(ncursesw,ncursesw,[
++	curses_includes="$ncursesw_CFLAGS"
++	curses_libs="$ncursesw_LIBS"
++	curses_h=ncurses.h
++	stop_searching=true
++	found_curses_h=true
++	USE_CURSES=true],[
++	PKG_CHECK_MODULES(ncurses,ncurses,[
++		curses_includes="$ncurses_CFLAGS"
++		curses_libs="$ncurses_LIBS"
++		curses_h=ncurses.h
++		stop_searching=true
++		found_curses_h=true
++		USE_CURSES=true],
++		[])])
++
+ AC_CHECK_CURSES
++
+ if ! test "x$USE_CURSES" = "xtrue"; then
+ 	AC_MSG_ERROR([Curses not found. You need curses to compile pinfo])
+ fi
+--- a/macros/curses.m4
++++ b/macros/curses.m4
+@@ -175,8 +175,8 @@
+ AC_DEFUN([AC_SEARCH_CURSES_H], [
+ 	AC_MSG_CHECKING([location of curses.h file])
+ 
+-	stop_searching=false
+-	found_curses_h=false
++#	stop_searching=false
++#	found_curses_h=false
+ 
+ 	dnl  if a particular location was specified
+ 	if test "x$curses_location" != "xfalse"
diff --git a/app-text/pinfo/files/pinfo-0.6.10-version.patch b/app-text/pinfo/files/pinfo-0.6.10-version.patch
new file mode 100644
index 000000000000..8038fe0879e8
--- /dev/null
+++ b/app-text/pinfo/files/pinfo-0.6.10-version.patch
@@ -0,0 +1,11 @@
+--- a/doc/pinfo.texi	2006-03-16 16:40:41.000000000 +0100
++++ b/doc/pinfo.texi	2010-06-18 16:20:24.000000000 +0200
+@@ -5,7 +5,7 @@
+ @c %**end of header
+ 
+ @set EDITION 0.2.1
+-@set VERSION 0.6.4
++@set VERSION 0.6.10
+ @set DATE 1 Dec 2001
+ @set DATEMAN 21 Mar 1999
+ 
diff --git a/app-text/pinfo/files/pinfo-0.6.9-GROFF_NO_SGR.patch b/app-text/pinfo/files/pinfo-0.6.9-GROFF_NO_SGR.patch
new file mode 100644
index 000000000000..dc902c0cae0a
--- /dev/null
+++ b/app-text/pinfo/files/pinfo-0.6.9-GROFF_NO_SGR.patch
@@ -0,0 +1,10 @@
+--- a/src/manual.c	2006-03-16 15:14:30.000000000 +0100
++++ b/src/manual.c	2010-06-03 19:47:11.000000000 +0200
+@@ -261,6 +261,7 @@
+ 		xfree(tmpfilename1);
+ 	}
+ 	tmpfilename1 = make_tempfile();
++	putenv("GROFF_NO_SGR=true");
+ 
+ #ifdef getmaxyx
+ 	init_curses();
diff --git a/app-text/pinfo/files/pinfo-0.6.9-as-needed.patch b/app-text/pinfo/files/pinfo-0.6.9-as-needed.patch
new file mode 100644
index 000000000000..85a80e6f2602
--- /dev/null
+++ b/app-text/pinfo/files/pinfo-0.6.9-as-needed.patch
@@ -0,0 +1,22 @@
+--- a/macros/curses.m4
++++ b/macros/curses.m4
+@@ -257,8 +257,8 @@
+ 	dnl save CFLAGS and LDFLAGS and set new ones
+ 	CFLAGS_OLD=$CFLAGS
+ 	CFLAGS="$CFLAGS $curses_includes"
+-	LDFLAGS_OLD=$LDFLAGS
+-	LDFLAGS="$LDFLAGS $curses_libs"
++	LIBS_OLD=$LIBS
++	LIBS="$LIBS $curses_libs"
+ 
+ 	dnl do the compile test 
+ 	AC_MSG_CHECKING([if curses is usable])
+@@ -288,7 +288,7 @@
+ 
+ 	dnl restore variables
+ 	CFLAGS=$CFLAGS_OLD
+-	LDFLAGS=$LDFLAGS_OLD
++	LIBS=$LIBS_OLD
+ 
+ ])
+ 
diff --git a/app-text/pinfo/files/pinfo-0.6.9-lzma-xz.patch b/app-text/pinfo/files/pinfo-0.6.9-lzma-xz.patch
new file mode 100644
index 000000000000..6ae0766fb803
--- /dev/null
+++ b/app-text/pinfo/files/pinfo-0.6.9-lzma-xz.patch
@@ -0,0 +1,21 @@
+--- a/src/filehandling_functions.c
++++ b/src/filehandling_functions.c
+@@ -41,14 +41,16 @@
+  * you dump the file through `gunzip -d -c', etc.                              *
+  ******************************************************************************/
+ 
+-#define SuffixesNumber 4
++#define SuffixesNumber 6
+ 
+ Suffixes suffixes[SuffixesNumber] =
+ {
+ 	{"", 		"cat"},
+ 	{".gz",		"gzip -d -q -c"},
+ 	{".Z",		"gzip -d -q -c"},
+-	{".bz2",	"bzip2 -d -c"}
++	{".bz2",	"bzip2 -d -c"},
++	{".lzma",	"lzma -d -c"},
++	{".xz",		"xz -d -c"}
+ };
+ 
+ /*****************************************************************************/
diff --git a/app-text/pinfo/metadata.xml b/app-text/pinfo/metadata.xml
new file mode 100644
index 000000000000..ece6b81bfbdf
--- /dev/null
+++ b/app-text/pinfo/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>jer@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-text/pinfo/pinfo-0.6.10-r5.ebuild b/app-text/pinfo/pinfo-0.6.10-r5.ebuild
new file mode 100644
index 000000000000..ddab3ae23eab
--- /dev/null
+++ b/app-text/pinfo/pinfo-0.6.10-r5.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools eutils flag-o-matic
+
+DESCRIPTION="Hypertext info and man viewer based on (n)curses"
+HOMEPAGE="http://pinfo.alioth.debian.org/"
+SRC_URI="https://alioth.debian.org/frs/download.php/3351/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
+IUSE="nls readline"
+
+RDEPEND="sys-libs/ncurses:0=
+	sys-libs/readline:0=
+	nls? ( virtual/libintl )
+"
+
+DEPEND="
+	${RDEPEND}
+	sys-devel/bison
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-0.6.9-as-needed.patch \
+		"${FILESDIR}"/${PN}-0.6.9-GROFF_NO_SGR.patch \
+		"${FILESDIR}"/${PN}-0.6.9-lzma-xz.patch \
+		"${FILESDIR}"/${PN}-0.6.10-version.patch \
+		"${FILESDIR}"/${PN}-0.6.10-info-suffix.patch \
+		"${FILESDIR}"/${PN}-0.6.10-dir-file.patch \
+		"${FILESDIR}"/${PN}-0.6.10-tinfo.patch \
+		"${FILESDIR}"/${PN}-0.6.10-gettext-0.19.patch \
+		"${FILESDIR}"/${PN}-0.6.10-ncurses-check.patch \
+		"${FILESDIR}"/${PN}-0.6.10-libc-basename.patch
+
+	eautoreconf
+
+	append-cflags -D_BSD_SOURCE -D_DEFAULT_SOURCE # sbrk()
+}
+
+src_configure() {
+	econf \
+		$(use_with readline) \
+		$(use_enable nls)
+}
+
+src_install() {
+	emake DESTDIR="${D}" sysconfdir=/etc install
+}
diff --git a/app-text/pinfo/pinfo-0.6.10-r6.ebuild b/app-text/pinfo/pinfo-0.6.10-r6.ebuild
new file mode 100644
index 000000000000..633f0825ca01
--- /dev/null
+++ b/app-text/pinfo/pinfo-0.6.10-r6.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils flag-o-matic
+
+DESCRIPTION="Hypertext info and man viewer based on (n)curses"
+HOMEPAGE="http://pinfo.alioth.debian.org/"
+SRC_URI="https://alioth.debian.org/frs/download.php/3351/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="nls readline"
+
+RDEPEND="
+	sys-libs/ncurses:0=
+	sys-libs/readline:0=
+	nls? ( virtual/libintl )
+"
+
+DEPEND="
+	${RDEPEND}
+	sys-devel/bison
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.6.9-as-needed.patch
+	"${FILESDIR}"/${PN}-0.6.9-GROFF_NO_SGR.patch
+	"${FILESDIR}"/${PN}-0.6.9-lzma-xz.patch
+	"${FILESDIR}"/${PN}-0.6.10-version.patch
+	"${FILESDIR}"/${PN}-0.6.10-info-suffix.patch
+	"${FILESDIR}"/${PN}-0.6.10-dir-file.patch
+	"${FILESDIR}"/${PN}-0.6.10-tinfo.patch
+	"${FILESDIR}"/${PN}-0.6.10-gettext-0.19.patch
+	"${FILESDIR}"/${PN}-0.6.10-ncurses-check.patch
+	"${FILESDIR}"/${PN}-0.6.10-libc-basename.patch
+	"${FILESDIR}"/${PN}-0.6.10-clearfilenameprefix.patch
+	"${FILESDIR}"/${PN}-0.6.10-gcc-7-inline.patch
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+
+	append-cflags -D_BSD_SOURCE -D_DEFAULT_SOURCE # sbrk()
+}
+
+src_configure() {
+	econf \
+		$(use_with readline) \
+		$(use_enable nls)
+}
+
+src_install() {
+	emake DESTDIR="${D}" sysconfdir=/etc install
+}
diff --git a/app-text/po4a-0.47-r1 b/app-text/po4a-0.47-r1
deleted file mode 100644
index a0a528455aae..000000000000
--- a/app-text/po4a-0.47-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-perl/SGMLSpm >=sys-devel/gettext-0.13 app-text/openjade dev-libs/libxslt dev-perl/Locale-gettext dev-perl/TermReadKey dev-perl/Text-WrapI18N >=dev-perl/Module-Build-0.380.0 app-text/docbook-xsl-stylesheets app-text/docbook-xml-dtd:4.1.2 test? ( app-text/docbook-sgml-dtd app-text/docbook-sgml-utils virtual/tex-base ) dev-lang/perl:=
-DESCRIPTION=Tools for helping translation of documentation
-EAPI=6
-HOMEPAGE=https://po4a.org/
-IUSE=test
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=dev-perl/SGMLSpm >=sys-devel/gettext-0.13 app-text/openjade dev-libs/libxslt dev-perl/Locale-gettext dev-perl/TermReadKey dev-perl/Text-WrapI18N dev-lang/perl:=
-SLOT=0
-SRC_URI=mirror://debian/pool/main/p/po4a/po4a_0.47.orig.tar.gz
-_eclasses_=l10n	97f2753e3f1f3753d53d856c7c0bbb0b	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=3777d2a6ea9d9bfb027ae6334ca04909
diff --git a/app-text/po4a/Manifest b/app-text/po4a/Manifest
new file mode 100644
index 000000000000..3f57fb454ab6
--- /dev/null
+++ b/app-text/po4a/Manifest
@@ -0,0 +1,4 @@
+AUX po4a-0.45-614122-no-dot-inc.patch 473 BLAKE2B 1ff10a5637d25c57500b6cb953442bf8e9ddd57f778e8772ffbed27e9d5a98be6d55f77e7665b0ab7fd975d886bd2893a432c6c9c9713a090a37727cecf0f3f7 SHA512 0a651b9de200b3ca08b3c849f24eba6cfbac93dd5f35911c9bf2aade174cbec27ad2c5a061a628db1b308dc9c576e2dad3db71da9a507d6337bed9ce620ad042
+DIST po4a_0.47.orig.tar.gz 2389750 BLAKE2B 72cd81e10f638a660e201b0c733b08c316aa75dd29b054bbc4c645c265b9e7745ce762305a8296f8cc37d2f182755dfa1394861f6c471cff1c7c398d13ac28cc SHA512 9c459a9795977a39aacc09cfb6ddbdc7dd2174e22896fa7bde90510a43ea833054aef558f7ca798991addc052a2c7f91ee11e5d49658a5c80a9ecb9c135ff97a
+EBUILD po4a-0.47-r1.ebuild 1650 BLAKE2B cd8722f1395fa346d5caeea4d93f589c52ac3f2090cd0aa7d8793fb859cb7527108daef206d4e9220cd41a0a3a44c59d606fd5f2a918e7b96ce42c52aef31b5b SHA512 28763203b7bd298066eeb6a5ce4d26b740a4a4012a22e3558c5d24896afc3ed001208dcfecc00e82417a55aa6b2827df695365b847cfc361f4d4722cbe2f3748
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/po4a/files/po4a-0.45-614122-no-dot-inc.patch b/app-text/po4a/files/po4a-0.45-614122-no-dot-inc.patch
new file mode 100644
index 000000000000..226fa0e9b6e2
--- /dev/null
+++ b/app-text/po4a/files/po4a-0.45-614122-no-dot-inc.patch
@@ -0,0 +1,26 @@
+From: Kent Fredric <kentfredric@gmail.com>
+Date: Tue, 13 Jun 2017 21:10:34 +1200
+Subject: [PATCH] Fix broken use of lib '.'
+
+   "'.'" is not "."
+
+Bug: https://bugs.gentoo.org/614122
+---
+ Build.PL | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Build.PL b/Build.PL
+index 43c6f80..9ee443b 100644
+--- a/Build.PL
++++ b/Build.PL
+@@ -1,6 +1,6 @@
+ #!/usr/bin/perl
+ 
+-use lib q('.');
++use lib q(.);
+ use Po4aBuilder;
+ 
+ my $build = Po4aBuilder->new
+-- 
+2.13.1
+
diff --git a/app-text/po4a/metadata.xml b/app-text/po4a/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-text/po4a/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/app-text/po4a/po4a-0.47-r1.ebuild b/app-text/po4a/po4a-0.47-r1.ebuild
new file mode 100644
index 000000000000..94311ba3d578
--- /dev/null
+++ b/app-text/po4a/po4a-0.47-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="af ca cs da de eo es et eu fr hr id it ja kn ko nb nl pl pt_BR pt ru sl sv uk vi zh_CN zh_HK"
+PLOCALES_BACKUP="en"
+
+inherit perl-module l10n
+
+DESCRIPTION="Tools for helping translation of documentation"
+HOMEPAGE="https://po4a.org/"
+SRC_URI="mirror://debian/pool/main/p/po4a/${PN}_${PV}.orig.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+IUSE="test"
+
+RDEPEND="dev-perl/SGMLSpm
+	>=sys-devel/gettext-0.13
+	app-text/openjade
+	dev-libs/libxslt
+	dev-perl/Locale-gettext
+	dev-perl/TermReadKey
+	dev-perl/Text-WrapI18N"
+DEPEND="${RDEPEND}
+	>=dev-perl/Module-Build-0.380.0
+	app-text/docbook-xsl-stylesheets
+	app-text/docbook-xml-dtd:4.1.2
+	test? ( app-text/docbook-sgml-dtd
+		app-text/docbook-sgml-utils
+		virtual/tex-base )"
+
+# Running tests in parallel fails
+DIST_TEST="do"
+
+PATCHES=(
+	# Fix bad escaping of '.' in @INC modification
+	"${FILESDIR}/${PN}-0.45-614122-no-dot-inc.patch"
+)
+src_prepare() {
+	# Check against locale files in ${S}/pod/bin for mismatches
+	# with languages listed in PLOCALES
+	local locales_path="${S}/po/bin"
+	l10n_find_plocales_changes "${locales_path}" "" ".po"
+
+	# Get rid of disabled locales
+	my_get_disabled_locales() {
+		PERL_RM_FILES=( "${PERL_RM_FILES[@]}" "po/bin/${1}.po" "po/pod/${1}.po" )
+	}
+
+	l10n_for_each_disabled_locale_do my_get_disabled_locales
+
+	einfo "Your LINGUAS lists the following languages: ${LINGUAS}"
+
+	perl-module_src_prepare
+}
diff --git a/app-text/podofo-0.9.6_pre20170508-r1 b/app-text/podofo-0.9.6_pre20170508-r1
deleted file mode 100644
index 127b082bcf7b..000000000000
--- a/app-text/podofo-0.9.6_pre20170508-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-lang/lua:= idn? ( net-dns/libidn:= ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) media-libs/fontconfig:= media-libs/freetype:2= virtual/jpeg:0= media-libs/libpng:0= media-libs/tiff:0= sys-libs/zlib:= virtual/pkgconfig boost? ( dev-util/boost-build ) test? ( dev-util/cppunit ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=PoDoFo is a C++ library to work with the PDF file format
-EAPI=6
-HOMEPAGE=https://sourceforge.net/projects/podofo/
-IUSE=+boost idn libressl debug test +tools
-KEYWORDS=amd64 ~arm hppa ppc ppc64 ~sparc x86
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=dev-lang/lua:= idn? ( net-dns/libidn:= ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) media-libs/fontconfig:= media-libs/freetype:2= virtual/jpeg:0= media-libs/libpng:0= media-libs/tiff:0= sys-libs/zlib:=
-REQUIRED_USE=test? ( tools )
-SLOT=0/0.9.6_pre20170508-r1
-SRC_URI=mirror://gentoo/podofo-0.9.6_pre20170508.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e5b8ed096f81153167380cfab067d2b7
diff --git a/app-text/podofo-0.9.6_pre20171027 b/app-text/podofo-0.9.6_pre20171027
deleted file mode 100644
index c20a297b68ee..000000000000
--- a/app-text/podofo-0.9.6_pre20171027
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-lang/lua:= idn? ( net-dns/libidn:= ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) media-libs/fontconfig:= media-libs/freetype:2= virtual/jpeg:0= media-libs/libpng:0= media-libs/tiff:0= sys-libs/zlib:= virtual/pkgconfig boost? ( dev-util/boost-build ) test? ( dev-util/cppunit ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=PoDoFo is a C++ library to work with the PDF file format
-EAPI=6
-HOMEPAGE=https://sourceforge.net/projects/podofo/
-IUSE=+boost idn libressl debug test +tools
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=dev-lang/lua:= idn? ( net-dns/libidn:= ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) media-libs/fontconfig:= media-libs/freetype:2= virtual/jpeg:0= media-libs/libpng:0= media-libs/tiff:0= sys-libs/zlib:=
-REQUIRED_USE=test? ( tools )
-SLOT=0/0.9.6_pre20171027
-SRC_URI=mirror://gentoo/podofo-0.9.6_pre20171027.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=05e0bd4aa9c5b7809e8a05492508febb
diff --git a/app-text/podofo/Manifest b/app-text/podofo/Manifest
new file mode 100644
index 000000000000..9ed6a6b11d79
--- /dev/null
+++ b/app-text/podofo/Manifest
@@ -0,0 +1,6 @@
+AUX podofo-0.9.6_pre20171027-libressl-bug-635890.patch 840 BLAKE2B f4bca9474abacf43ddaa42e80345f3b4646ab8a60cf8d05861601047b9e962b4b289735d6b8ca59308c4de205fd145e5d17b5052b4ecf94cd78e9483dfdda1ec SHA512 cbe44430c0a4511afaa43d41e1c0e5d02cb7f805a6ca4d8f8f9adada26e01bb2bb43c327c0b78ccdc26103dd4abfa7d9c8b5ed2c61401d4c587cb12c1ad5d3bb
+DIST podofo-0.9.6_pre20170508.tar.xz 919876 BLAKE2B 39be46db0e36755c828373659f681aa6334ec6be01cdcc62616d8ce4e59a2ab916cbfc4aa58d4bf8ab95843a40b7b536cb1b2ccfa14beacf629ff1fbcb699613 SHA512 37d8e844ba5763d06d467e316871436e1a63795d66675677d9775cd1bd311f43b241d58e82213a0342ab69a0f5cd80261aad48c4af29c82f7bcc0c14bd242f10
+DIST podofo-0.9.6_pre20171027.tar.xz 919504 BLAKE2B d03852a25e50085ed2108e90c293600e0515c06918276888e63917ca00a9fe3b392cd9ec9aeb6f651fd7e0b45a5e3c08e3f4d6df6f4a04d8fb224fbdd0599342 SHA512 db1ac836abd7be0d2cc3c27114c7134de9de8ba931a6a8265514fedefe3c6f06a24371f7a5425c8b7251fe7166bc27f07733cba878ad24c12651c8c051cac8be
+EBUILD podofo-0.9.6_pre20170508-r1.ebuild 4581 BLAKE2B 7ae073e6e68192232440f925b0bef5cd9a5193ab7cea1d76bf303a2f01ccc3fbba42907408904da4043da0b38532134cff9c9deef868ec8c9d94e70d1360e80d SHA512 abc3b61b00606184996b904475ad9d41d61bbf6e9c301216df47a8c93b8c42f1f03fcd8c200c06e2c9c630105c39546097dc02df153f825aeecc4638a0ae65f3
+EBUILD podofo-0.9.6_pre20171027.ebuild 4643 BLAKE2B 38214968a021b0412e5a52b5d72f3a308a4d5c8fd0d47cef955c352a0f465b3e86e56917e46022cb4aa58767e8f7f4e2c131daefe06dd534d83fa63aaeb4a53b SHA512 5d333d71840298a02ac3bb209ca93946f760e1c443b943fad95ef9fcb726e56f7547979394818061b0fe826490888f39cb7ca53d99dd5b87f4670acc9983ad92
+MISC metadata.xml 509 BLAKE2B 5bcba752f845dba107a60068a4be60776e8fba516b42a2434bed1173786117054eb77e933b667604c96c10bbc5ced810b8590c77626d13a575857ec1ba253dbb SHA512 ad2bbc4598d80be1fcd4fdbfe0a08bec65795f23e768762dc02be766d82cf1549b6861bd8e96bd72b468674ab1e36ebbead3464dc647378b72a8679fcf422236
diff --git a/app-text/podofo/files/podofo-0.9.6_pre20171027-libressl-bug-635890.patch b/app-text/podofo/files/podofo-0.9.6_pre20171027-libressl-bug-635890.patch
new file mode 100644
index 000000000000..2b25dc7b6856
--- /dev/null
+++ b/app-text/podofo/files/podofo-0.9.6_pre20171027-libressl-bug-635890.patch
@@ -0,0 +1,26 @@
+From 85e66b066de98f38e0430428906d5cf5396876a0 Mon Sep 17 00:00:00 2001
+From: Michelangelo Scopelliti <kernelpanic@gmx.it>
+Date: Thu, 23 Nov 2017 12:29:36 +0000
+Subject: [PATCH] Fix to compile with libressl (does not have OPENSSL_init_ssl)
+
+Bug: https://bugs.gentoo.org/635890
+---
+ tools/podofosign/podofosign.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tools/podofosign/podofosign.cpp b/tools/podofosign/podofosign.cpp
+index a7be1e5..5c9d146 100644
+--- a/tools/podofosign/podofosign.cpp
++++ b/tools/podofosign/podofosign.cpp
+@@ -875,7 +875,7 @@ int main( int argc, char* argv[] )
+         outputfile = NULL;
+     }
+ 
+-#ifdef PODOFO_HAVE_OPENSSL_1_1
++#if defined (PODOFO_HAVE_OPENSSL_1_1) && !defined (LIBRESSL_VERSION_NUMBER)
+     OPENSSL_init_ssl(0, NULL);
+ #else
+     OpenSSL_add_all_algorithms();
+-- 
+2.13.6
+
diff --git a/app-text/podofo/metadata.xml b/app-text/podofo/metadata.xml
new file mode 100644
index 000000000000..0a2bfbe2da96
--- /dev/null
+++ b/app-text/podofo/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>zmedico@gentoo.org</email>
+	</maintainer>
+	<use>
+		<flag name="boost">Add support for boost</flag>
+		<flag name="tools">
+			Build and install commandline tools.
+		</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">podofo</remote-id>
+		<changelog>https://sourceforge.net/p/podofo/code/commit_browser</changelog>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/podofo/podofo-0.9.6_pre20170508-r1.ebuild b/app-text/podofo/podofo-0.9.6_pre20170508-r1.ebuild
new file mode 100644
index 000000000000..a75c43638425
--- /dev/null
+++ b/app-text/podofo/podofo-0.9.6_pre20170508-r1.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit cmake-utils flag-o-matic multilib toolchain-funcs
+
+DESCRIPTION="PoDoFo is a C++ library to work with the PDF file format"
+HOMEPAGE="https://sourceforge.net/projects/podofo/"
+SRC_URI="mirror://gentoo/${P}.tar.xz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0/${PVR}"
+KEYWORDS="amd64 ~arm hppa ppc ppc64 ~sparc x86"
+IUSE="+boost idn libressl debug test +tools"
+REQUIRED_USE="test? ( tools )"
+
+RDEPEND="dev-lang/lua:=
+	idn? ( net-dns/libidn:= )
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	media-libs/fontconfig:=
+	media-libs/freetype:2=
+	virtual/jpeg:0=
+	media-libs/libpng:0=
+	media-libs/tiff:0=
+	sys-libs/zlib:="
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	boost? ( dev-util/boost-build )
+	test? ( dev-util/cppunit )"
+
+DOCS="AUTHORS ChangeLog TODO"
+
+src_prepare() {
+	local x sed_args
+
+	# The 0.9.6 ABI is not necessarily stable, so make PODOFO_SOVERSION
+	# equal to ${PV}.
+	sed -e 's|${PODOFO_VERSION_PATCH}|\0_'${PV##*_}'|' -i CMakeLists.txt || die
+
+	# bug 620934 - Disable linking with cppunit when possible, since it
+	# triggers errors with some older compilers.
+	use test || sed -e 's:^FIND_PACKAGE(CppUnit):#\0:' -i CMakeLists.txt || die
+
+	# bug 556962
+	sed -i -e 's|Decrypt( pEncryptedBuffer, nOutputLen, pDecryptedBuffer, m_lLen );|Decrypt( pEncryptedBuffer, (pdf_long)nOutputLen, pDecryptedBuffer, (pdf_long\&)m_lLen );|' \
+		test/unit/EncryptTest.cpp || die
+
+	sed -i \
+		-e "s:LIBDIRNAME \"lib\":LIBDIRNAME \"$(get_libdir)\":" \
+		-e "s:LIBIDN_FOUND:HAVE_LIBIDN:g" \
+		CMakeLists.txt || die
+
+	# Use pkg-config to find headers for bug #459404.
+	sed_args=
+	for x in $($(tc-getPKG_CONFIG) --cflags freetype2) ; do
+		[[ ${x} == -I* ]] || continue
+		x=${x#-I}
+		if [[ -f ${x}/ft2build.h ]] ; then
+			sed_args+=" -e s:/usr/include/\\r\$:${x}:"
+		elif [[ -f ${x}/freetype/config/ftheader.h ]] ; then
+			sed_args+=" -e s:/usr/include/freetype2\\r\$:${x}:"
+		fi
+	done
+	[[ -n ${sed_args} ]] && \
+		{ sed -i ${sed_args} cmake/modules/FindFREETYPE.cmake || die; }
+
+	# Bug #439784: Add missing unistd include for close() and unlink().
+	sed -i 's:^#include <stdio.h>$:#include <unistd.h>\n\0:' -i \
+		test/unit/TestUtils.cpp || die
+
+	# TODO: fix these test cases
+	# ColorTest.cpp:62:Assertion
+	# Test name: ColorTest::testDefaultConstructor
+	# expected exception not thrown
+	# - Expected: PdfError
+	sed -e 's:CPPUNIT_TEST( testDefaultConstructor ://\0:' \
+		-e 's:CPPUNIT_TEST( testGreyConstructor ://\0:' \
+		-e 's:CPPUNIT_TEST( testRGBConstructor ://\0:' \
+		-e 's:CPPUNIT_TEST( testCMYKConstructor ://\0:' \
+		-e 's:CPPUNIT_TEST( testColorSeparationAllConstructor ://\0:' \
+		-e 's:CPPUNIT_TEST( testColorSeparationNoneConstructor ://\0:' \
+		-e 's:CPPUNIT_TEST( testColorSeparationConstructor ://\0:' \
+		-e 's:CPPUNIT_TEST( testColorCieLabConstructor ://\0:' \
+		-i test/unit/ColorTest.h || die
+
+	# ColorTest.cpp:42:Assertion
+	# Test name: ColorTest::testHexNames
+	# assertion failed
+	# - Expression: static_cast<int>(rgb.GetGreen() * 255.0) == 0x0A
+	sed -e 's:CPPUNIT_TEST( testHexNames ://\0:' \
+		-i test/unit/ColorTest.h || die
+
+	# Bug #352125: test failure, depending on installed fonts
+	# ##Failure Location unknown## : Error
+	# Test name: FontTest::testFonts
+	# uncaught exception of type PoDoFo::PdfError
+	# - ePdfError_UnsupportedFontFormat
+	sed -e 's:CPPUNIT_TEST( testFonts ://\0:' \
+		-i test/unit/FontTest.h || die
+
+	# Test name: EncodingTest::testDifferencesEncoding
+	# equality assertion failed
+	# - Expected: 1
+	# - Actual  : 0
+	sed -e 's:CPPUNIT_TEST( testDifferencesEncoding ://\0:' \
+		-i test/unit/EncodingTest.h || die
+
+	# Bug #407015: fix to compile with Lua 5.2
+	if has_version '>=dev-lang/lua-5.2' ; then
+		sed -e 's: lua_open(: luaL_newstate(:' \
+			-e 's: luaL_getn(: lua_rawlen(:' -i \
+			tools/podofocolor/luaconverter.cpp \
+			tools/podofoimpose/planreader_lua.cpp || die
+	fi
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+
+	# Bug #381359: undefined reference to `PoDoFo::PdfVariant::DelayedLoadImpl()'
+	filter-flags -fvisibility-inlines-hidden
+
+	mycmakeargs+=(
+		"-DPODOFO_BUILD_SHARED=1"
+		"-DPODOFO_HAVE_JPEG_LIB=1"
+		"-DPODOFO_HAVE_PNG_LIB=1"
+		"-DPODOFO_HAVE_TIFF_LIB=1"
+		"-DWANT_FONTCONFIG=1"
+		"-DUSE_STLPORT=0"
+		-DWANT_BOOST=$(usex boost ON OFF)
+		-DHAVE_LIBIDN=$(usex idn ON OFF)
+		-DPODOFO_HAVE_CPPUNIT=$(usex test ON OFF)
+		-DPODOFO_BUILD_LIB_ONLY=$(usex tools OFF ON)
+		)
+
+	cmake-utils_src_configure
+}
+
+src_test() {
+	cd "${CMAKE_BUILD_DIR}"/test/unit
+	./podofo-test --selftest || die "self test failed"
+}
diff --git a/app-text/podofo/podofo-0.9.6_pre20171027.ebuild b/app-text/podofo/podofo-0.9.6_pre20171027.ebuild
new file mode 100644
index 000000000000..b7e200e657a7
--- /dev/null
+++ b/app-text/podofo/podofo-0.9.6_pre20171027.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit cmake-utils flag-o-matic multilib toolchain-funcs
+
+DESCRIPTION="PoDoFo is a C++ library to work with the PDF file format"
+HOMEPAGE="https://sourceforge.net/projects/podofo/"
+SRC_URI="mirror://gentoo/${P}.tar.xz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+boost idn libressl debug test +tools"
+REQUIRED_USE="test? ( tools )"
+
+RDEPEND="dev-lang/lua:=
+	idn? ( net-dns/libidn:= )
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	media-libs/fontconfig:=
+	media-libs/freetype:2=
+	virtual/jpeg:0=
+	media-libs/libpng:0=
+	media-libs/tiff:0=
+	sys-libs/zlib:="
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	boost? ( dev-util/boost-build )
+	test? ( dev-util/cppunit )"
+
+PATCHES=(
+	"${FILESDIR}/${P}-libressl-bug-635890.patch"
+)
+
+DOCS="AUTHORS ChangeLog TODO"
+
+src_prepare() {
+	cmake-utils_src_prepare
+	local x sed_args
+
+	# The 0.9.6 ABI is not necessarily stable, so make PODOFO_SOVERSION
+	# equal to ${PV}.
+	sed -e 's|${PODOFO_VERSION_PATCH}|\0_'${PV##*_}'|' -i CMakeLists.txt || die
+
+	# bug 620934 - Disable linking with cppunit when possible, since it
+	# triggers errors with some older compilers.
+	use test || sed -e 's:^FIND_PACKAGE(CppUnit):#\0:' -i CMakeLists.txt || die
+
+	# bug 556962
+	sed -i -e 's|Decrypt( pEncryptedBuffer, nOutputLen, pDecryptedBuffer, m_lLen );|Decrypt( pEncryptedBuffer, (pdf_long)nOutputLen, pDecryptedBuffer, (pdf_long\&)m_lLen );|' \
+		test/unit/EncryptTest.cpp || die
+
+	sed -i \
+		-e "s:LIBDIRNAME \"lib\":LIBDIRNAME \"$(get_libdir)\":" \
+		-e "s:LIBIDN_FOUND:HAVE_LIBIDN:g" \
+		CMakeLists.txt || die
+
+	# Use pkg-config to find headers for bug #459404.
+	sed_args=
+	for x in $($(tc-getPKG_CONFIG) --cflags freetype2) ; do
+		[[ ${x} == -I* ]] || continue
+		x=${x#-I}
+		if [[ -f ${x}/ft2build.h ]] ; then
+			sed_args+=" -e s:/usr/include/\\r\$:${x}:"
+		elif [[ -f ${x}/freetype/config/ftheader.h ]] ; then
+			sed_args+=" -e s:/usr/include/freetype2\\r\$:${x}:"
+		fi
+	done
+	[[ -n ${sed_args} ]] && \
+		{ sed -i ${sed_args} cmake/modules/FindFREETYPE.cmake || die; }
+
+	# Bug #439784: Add missing unistd include for close() and unlink().
+	sed -i 's:^#include <stdio.h>$:#include <unistd.h>\n\0:' -i \
+		test/unit/TestUtils.cpp || die
+
+	# TODO: fix these test cases
+	# ColorTest.cpp:62:Assertion
+	# Test name: ColorTest::testDefaultConstructor
+	# expected exception not thrown
+	# - Expected: PdfError
+	sed -e 's:CPPUNIT_TEST( testDefaultConstructor ://\0:' \
+		-e 's:CPPUNIT_TEST( testGreyConstructor ://\0:' \
+		-e 's:CPPUNIT_TEST( testRGBConstructor ://\0:' \
+		-e 's:CPPUNIT_TEST( testCMYKConstructor ://\0:' \
+		-e 's:CPPUNIT_TEST( testColorSeparationAllConstructor ://\0:' \
+		-e 's:CPPUNIT_TEST( testColorSeparationNoneConstructor ://\0:' \
+		-e 's:CPPUNIT_TEST( testColorSeparationConstructor ://\0:' \
+		-e 's:CPPUNIT_TEST( testColorCieLabConstructor ://\0:' \
+		-i test/unit/ColorTest.h || die
+
+	# ColorTest.cpp:42:Assertion
+	# Test name: ColorTest::testHexNames
+	# assertion failed
+	# - Expression: static_cast<int>(rgb.GetGreen() * 255.0) == 0x0A
+	sed -e 's:CPPUNIT_TEST( testHexNames ://\0:' \
+		-i test/unit/ColorTest.h || die
+
+	# Bug #352125: test failure, depending on installed fonts
+	# ##Failure Location unknown## : Error
+	# Test name: FontTest::testFonts
+	# uncaught exception of type PoDoFo::PdfError
+	# - ePdfError_UnsupportedFontFormat
+	sed -e 's:CPPUNIT_TEST( testFonts ://\0:' \
+		-i test/unit/FontTest.h || die
+
+	# Test name: EncodingTest::testDifferencesEncoding
+	# equality assertion failed
+	# - Expected: 1
+	# - Actual  : 0
+	sed -e 's:CPPUNIT_TEST( testDifferencesEncoding ://\0:' \
+		-i test/unit/EncodingTest.h || die
+
+	# Bug #407015: fix to compile with Lua 5.2
+	if has_version '>=dev-lang/lua-5.2' ; then
+		sed -e 's: lua_open(: luaL_newstate(:' \
+			-e 's: luaL_getn(: lua_rawlen(:' -i \
+			tools/podofocolor/luaconverter.cpp \
+			tools/podofoimpose/planreader_lua.cpp || die
+	fi
+}
+
+src_configure() {
+
+	# Bug #381359: undefined reference to `PoDoFo::PdfVariant::DelayedLoadImpl()'
+	filter-flags -fvisibility-inlines-hidden
+
+	mycmakeargs+=(
+		"-DPODOFO_BUILD_SHARED=1"
+		"-DPODOFO_HAVE_JPEG_LIB=1"
+		"-DPODOFO_HAVE_PNG_LIB=1"
+		"-DPODOFO_HAVE_TIFF_LIB=1"
+		"-DWANT_FONTCONFIG=1"
+		"-DUSE_STLPORT=0"
+		-DWANT_BOOST=$(usex boost ON OFF)
+		-DHAVE_LIBIDN=$(usex idn ON OFF)
+		-DPODOFO_HAVE_CPPUNIT=$(usex test ON OFF)
+		-DPODOFO_BUILD_LIB_ONLY=$(usex tools OFF ON)
+		)
+
+	cmake-utils_src_configure
+}
+
+src_test() {
+	cd "${CMAKE_BUILD_DIR}"/test/unit
+	./podofo-test --selftest || die "self test failed"
+}
diff --git a/app-text/poppler-0.62.0-r1 b/app-text/poppler-0.62.0-r1
deleted file mode 100644
index 06163912a916..000000000000
--- a/app-text/poppler-0.62.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=media-libs/fontconfig-2.6.0 >=media-libs/freetype-2.3.9 sys-libs/zlib cairo? ( dev-libs/glib:2 >=x11-libs/cairo-1.10.0 introspection? ( >=dev-libs/gobject-introspection-1.32.1:= ) ) curl? ( net-misc/curl ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/openjpeg:2= ) lcms? ( media-libs/lcms:2 ) nss? ( >=dev-libs/nss-3.19:0 ) png? ( media-libs/libpng:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtxml:5 ) tiff? ( media-libs/tiff:0 ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=PDF rendering library based on the xpdf-3.0 code base
-EAPI=6
-HOMEPAGE=https://poppler.freedesktop.org/
-IUSE=cairo cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils
-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 ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=>=media-libs/fontconfig-2.6.0 >=media-libs/freetype-2.3.9 sys-libs/zlib cairo? ( dev-libs/glib:2 >=x11-libs/cairo-1.10.0 introspection? ( >=dev-libs/gobject-introspection-1.32.1:= ) ) curl? ( net-misc/curl ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/openjpeg:2= ) lcms? ( media-libs/lcms:2 ) nss? ( >=dev-libs/nss-3.19:0 ) png? ( media-libs/libpng:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtxml:5 ) tiff? ( media-libs/tiff:0 ) cjk? ( >=app-text/poppler-data-0.4.7 )
-RESTRICT=test
-SLOT=0/73
-SRC_URI=https://poppler.freedesktop.org/poppler-0.62.0.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3dd7049092d54e4015ad7a98fa2b7734
diff --git a/app-text/poppler-0.63.0 b/app-text/poppler-0.63.0
deleted file mode 100644
index e2ed89799a1b..000000000000
--- a/app-text/poppler-0.63.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=media-libs/fontconfig-2.6.0 >=media-libs/freetype-2.3.9 sys-libs/zlib cairo? ( dev-libs/glib:2 >=x11-libs/cairo-1.10.0 introspection? ( >=dev-libs/gobject-introspection-1.32.1:= ) ) curl? ( net-misc/curl ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/openjpeg:2= ) lcms? ( media-libs/lcms:2 ) nss? ( >=dev-libs/nss-3.19:0 ) png? ( media-libs/libpng:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtxml:5 ) tiff? ( media-libs/tiff:0 ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=PDF rendering library based on the xpdf-3.0 code base
-EAPI=6
-HOMEPAGE=https://poppler.freedesktop.org/
-IUSE=cairo cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils
-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 ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=>=media-libs/fontconfig-2.6.0 >=media-libs/freetype-2.3.9 sys-libs/zlib cairo? ( dev-libs/glib:2 >=x11-libs/cairo-1.10.0 introspection? ( >=dev-libs/gobject-introspection-1.32.1:= ) ) curl? ( net-misc/curl ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/openjpeg:2= ) lcms? ( media-libs/lcms:2 ) nss? ( >=dev-libs/nss-3.19:0 ) png? ( media-libs/libpng:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtxml:5 ) tiff? ( media-libs/tiff:0 ) cjk? ( >=app-text/poppler-data-0.4.7 )
-RESTRICT=test
-SLOT=0/74
-SRC_URI=https://poppler.freedesktop.org/poppler-0.63.0.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8a0bf16e4c24c18006080aec437ef04d
diff --git a/app-text/poppler-0.64.0 b/app-text/poppler-0.64.0
deleted file mode 100644
index 7c3b6c1d6061..000000000000
--- a/app-text/poppler-0.64.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=media-libs/fontconfig-2.6.0 >=media-libs/freetype-2.3.9 sys-libs/zlib cairo? ( dev-libs/glib:2 >=x11-libs/cairo-1.10.0 introspection? ( >=dev-libs/gobject-introspection-1.32.1:= ) ) curl? ( net-misc/curl ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/openjpeg:2= ) lcms? ( media-libs/lcms:2 ) nss? ( >=dev-libs/nss-3.19:0 ) png? ( media-libs/libpng:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtxml:5 ) tiff? ( media-libs/tiff:0 ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=PDF rendering library based on the xpdf-3.0 code base
-EAPI=6
-HOMEPAGE=https://poppler.freedesktop.org/
-IUSE=cairo cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils
-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 ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=>=media-libs/fontconfig-2.6.0 >=media-libs/freetype-2.3.9 sys-libs/zlib cairo? ( dev-libs/glib:2 >=x11-libs/cairo-1.10.0 introspection? ( >=dev-libs/gobject-introspection-1.32.1:= ) ) curl? ( net-misc/curl ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/openjpeg:2= ) lcms? ( media-libs/lcms:2 ) nss? ( >=dev-libs/nss-3.19:0 ) png? ( media-libs/libpng:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtxml:5 ) tiff? ( media-libs/tiff:0 ) cjk? ( >=app-text/poppler-data-0.4.7 )
-RESTRICT=test
-SLOT=0/75
-SRC_URI=https://poppler.freedesktop.org/poppler-0.64.0.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5716ad2fcca8dc87b98cba3e5b7eea7d
diff --git a/app-text/poppler-0.65.0 b/app-text/poppler-0.65.0
deleted file mode 100644
index e2b0f211ded7..000000000000
--- a/app-text/poppler-0.65.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=media-libs/fontconfig-2.6.0 >=media-libs/freetype-2.3.9 sys-libs/zlib cairo? ( dev-libs/glib:2 >=x11-libs/cairo-1.10.0 introspection? ( >=dev-libs/gobject-introspection-1.32.1:= ) ) curl? ( net-misc/curl ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/openjpeg:2= ) lcms? ( media-libs/lcms:2 ) nss? ( >=dev-libs/nss-3.19:0 ) png? ( media-libs/libpng:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtxml:5 ) tiff? ( media-libs/tiff:0 ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=PDF rendering library based on the xpdf-3.0 code base
-EAPI=6
-HOMEPAGE=https://poppler.freedesktop.org/
-IUSE=cairo cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils
-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 ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=>=media-libs/fontconfig-2.6.0 >=media-libs/freetype-2.3.9 sys-libs/zlib cairo? ( dev-libs/glib:2 >=x11-libs/cairo-1.10.0 introspection? ( >=dev-libs/gobject-introspection-1.32.1:= ) ) curl? ( net-misc/curl ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/openjpeg:2= ) lcms? ( media-libs/lcms:2 ) nss? ( >=dev-libs/nss-3.19:0 ) png? ( media-libs/libpng:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtxml:5 ) tiff? ( media-libs/tiff:0 ) cjk? ( >=app-text/poppler-data-0.4.7 )
-RESTRICT=test
-SLOT=0/76
-SRC_URI=https://poppler.freedesktop.org/poppler-0.65.0.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5f449182824275c9882fe6b8d6c9475e
diff --git a/app-text/poppler-0.66.0 b/app-text/poppler-0.66.0
deleted file mode 100644
index 4940a34dc4cc..000000000000
--- a/app-text/poppler-0.66.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=media-libs/fontconfig-2.6.0 >=media-libs/freetype-2.3.9 sys-libs/zlib cairo? ( dev-libs/glib:2 >=x11-libs/cairo-1.10.0 introspection? ( >=dev-libs/gobject-introspection-1.32.1:= ) ) curl? ( net-misc/curl ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/openjpeg:2= ) lcms? ( media-libs/lcms:2 ) nss? ( >=dev-libs/nss-3.19:0 ) png? ( media-libs/libpng:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtxml:5 ) tiff? ( media-libs/tiff:0 ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=PDF rendering library based on the xpdf-3.0 code base
-EAPI=6
-HOMEPAGE=https://poppler.freedesktop.org/
-IUSE=cairo cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils
-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 ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=>=media-libs/fontconfig-2.6.0 >=media-libs/freetype-2.3.9 sys-libs/zlib cairo? ( dev-libs/glib:2 >=x11-libs/cairo-1.10.0 introspection? ( >=dev-libs/gobject-introspection-1.32.1:= ) ) curl? ( net-misc/curl ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/openjpeg:2= ) lcms? ( media-libs/lcms:2 ) nss? ( >=dev-libs/nss-3.19:0 ) png? ( media-libs/libpng:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtxml:5 ) tiff? ( media-libs/tiff:0 ) cjk? ( >=app-text/poppler-data-0.4.7 )
-RESTRICT=test
-SLOT=0/77
-SRC_URI=https://poppler.freedesktop.org/poppler-0.66.0.tar.xz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4caef0578b6719f08560d0b14278460f
diff --git a/app-text/poppler-9999 b/app-text/poppler-9999
deleted file mode 100644
index b96c5a2905b2..000000000000
--- a/app-text/poppler-9999
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=media-libs/fontconfig-2.6.0 >=media-libs/freetype-2.3.9 sys-libs/zlib cairo? ( dev-libs/glib:2 >=x11-libs/cairo-1.10.0 introspection? ( >=dev-libs/gobject-introspection-1.32.1:= ) ) curl? ( net-misc/curl ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/openjpeg:2= ) lcms? ( media-libs/lcms:2 ) nss? ( >=dev-libs/nss-3.19:0 ) png? ( media-libs/libpng:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtxml:5 ) tiff? ( media-libs/tiff:0 ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=PDF rendering library based on the xpdf-3.0 code base
-EAPI=6
-HOMEPAGE=https://poppler.freedesktop.org/
-IUSE=cairo cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils
-LICENSE=GPL-2
-RDEPEND=>=media-libs/fontconfig-2.6.0 >=media-libs/freetype-2.3.9 sys-libs/zlib cairo? ( dev-libs/glib:2 >=x11-libs/cairo-1.10.0 introspection? ( >=dev-libs/gobject-introspection-1.32.1:= ) ) curl? ( net-misc/curl ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/openjpeg:2= ) lcms? ( media-libs/lcms:2 ) nss? ( >=dev-libs/nss-3.19:0 ) png? ( media-libs/libpng:0= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtxml:5 ) tiff? ( media-libs/tiff:0 ) cjk? ( >=app-text/poppler-data-0.4.7 )
-RESTRICT=test
-SLOT=0/9999
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	git-r3	8f6de46b0aa318aea0e8cac62ece098b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4caef0578b6719f08560d0b14278460f
diff --git a/app-text/poppler-data-0.4.7 b/app-text/poppler-data-0.4.7
deleted file mode 100644
index d1a356890a28..000000000000
--- a/app-text/poppler-data-0.4.7
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Data files for poppler to support uncommon encodings without xpdfrc
-EAPI=5
-HOMEPAGE=https://poppler.freedesktop.org/
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=BSD GPL-2 MIT
-SLOT=0
-SRC_URI=https://poppler.freedesktop.org/poppler-data-0.4.7.tar.gz
-_md5_=74c3021c99e5405a333bd557625f5219
diff --git a/app-text/poppler-data-0.4.8 b/app-text/poppler-data-0.4.8
deleted file mode 100644
index b36d5a8a0c33..000000000000
--- a/app-text/poppler-data-0.4.8
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Data files for poppler to support uncommon encodings without xpdfrc
-EAPI=6
-HOMEPAGE=https://poppler.freedesktop.org/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=BSD GPL-2 MIT
-SLOT=0
-SRC_URI=https://poppler.freedesktop.org/poppler-data-0.4.8.tar.gz
-_md5_=45f818afea0f6796a868d155dc0747d3
diff --git a/app-text/poppler-data-0.4.9 b/app-text/poppler-data-0.4.9
deleted file mode 100644
index 656fcf9ef3f0..000000000000
--- a/app-text/poppler-data-0.4.9
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Data files for poppler to support uncommon encodings without xpdfrc
-EAPI=6
-HOMEPAGE=https://poppler.freedesktop.org/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=BSD GPL-2 MIT
-SLOT=0
-SRC_URI=https://poppler.freedesktop.org/poppler-data-0.4.9.tar.gz
-_md5_=45f818afea0f6796a868d155dc0747d3
diff --git a/app-text/poppler-data/Manifest b/app-text/poppler-data/Manifest
new file mode 100644
index 000000000000..6282cf198539
--- /dev/null
+++ b/app-text/poppler-data/Manifest
@@ -0,0 +1,7 @@
+DIST poppler-data-0.4.7.tar.gz 4182339 BLAKE2B 85a731e738cce9b6adc7c236ee5183b6494b641a20e4c823900314bfec5bc3c327ae49e35511936c0f3a6f13e25be098b24bd6a91ae04815be6a02149a636563 SHA512 9a865f077f8760a106c6b28302357253c6d63a8f4f10a9506724d1f0ba42e3481bd790ca07e7ee245c63de3650a33c12e80e20e94415a0e37b05225cfe0efce2
+DIST poppler-data-0.4.8.tar.gz 4209901 BLAKE2B ed4dc809044240141db3ec483b7fb272d976eb61febf13b3f1297b27146f8597eb6d817a799da4729192f39873226f6eae6374b86bcf4dad8cde7d0bc9388b94 SHA512 c9435f557ca696fb1e94b6a0b42d401cc911a08f995e3494a7352b47bde5091226f2bb99792ff2b1ee02dfebee66f50f736daca72020a19217ce1c27bde92d54
+DIST poppler-data-0.4.9.tar.gz 4196919 BLAKE2B a986dcff2c2295eeb952adbb4bfc59ccbc53c27668ecc44fcf862bbe3d65062ccdb9302ebdd9b530d9d0ed155666922086b368c81c0772bdab284e323e6ac436 SHA512 45afd378d0bb415c5e1bc9718025328058712c0bde6d529d2c7a4813b12f600be46ecd2ed2454b3f83fb9f8cad157b75d11d8c5d1ca849f347c310b58132ff7a
+EBUILD poppler-data-0.4.7.ebuild 787 BLAKE2B bff0b033eb916cd9a7b19f77f3b888047842cb9130a42e5f94e2cc6df42d3d4f5ac31338b427b1b8bf155d0f4de9b448b6f641d92978632df5aa317c28ed584f SHA512 57558ab6909cb93d40ac4193580c03a959949f27ad559f9200506af6f8e36ffb0e8c50bed1e8deefa548cd02391bd5097cbdcbcd42e6f30610a4536dd8fea485
+EBUILD poppler-data-0.4.8.ebuild 798 BLAKE2B 00a4ab43ff8962444ee45435eed5e578599083915867b0d29d7cb978319cab5e441179d405a07dd97d161c45ac7fbba08b1c06e4a69ca1ac036314eb2196bcb9 SHA512 9ff80bc42f0004e01901ded0db13c115282758692f48c6626ed1c4228f8be2ef20ca34552819f1ea80bf967e96147b59f09c7a0e504747b2ca77fcf729c5776f
+EBUILD poppler-data-0.4.9.ebuild 798 BLAKE2B 00a4ab43ff8962444ee45435eed5e578599083915867b0d29d7cb978319cab5e441179d405a07dd97d161c45ac7fbba08b1c06e4a69ca1ac036314eb2196bcb9 SHA512 9ff80bc42f0004e01901ded0db13c115282758692f48c6626ed1c4228f8be2ef20ca34552819f1ea80bf967e96147b59f09c7a0e504747b2ca77fcf729c5776f
+MISC metadata.xml 255 BLAKE2B 06f078acf8e4416705c8bad8b4802a44592eb962c08c050e11332bfa97564fafdf08754ab056eb813f6baeaa6cdfaf5d71672455d77e74045f86098c221d5136 SHA512 c6c5f966cfbe396fde1b15334442de9e0004b44c4b48775588b0b25a058ad1751252761370c9c254280e97561fa6306f5aa0cc7959c675d4ee11f7f95d777a36
diff --git a/app-text/poppler-data/metadata.xml b/app-text/poppler-data/metadata.xml
new file mode 100644
index 000000000000..c439b06d8c84
--- /dev/null
+++ b/app-text/poppler-data/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>printing@gentoo.org</email>
+	<name>Gentoo Printing Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-text/poppler-data/poppler-data-0.4.7.ebuild b/app-text/poppler-data/poppler-data-0.4.7.ebuild
new file mode 100644
index 000000000000..8583800548d5
--- /dev/null
+++ b/app-text/poppler-data/poppler-data-0.4.7.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="Data files for poppler to support uncommon encodings without xpdfrc"
+HOMEPAGE="https://poppler.freedesktop.org/"
+SRC_URI="https://poppler.freedesktop.org/${P}.tar.gz"
+
+LICENSE="BSD GPL-2 MIT"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+SLOT="0"
+IUSE=""
+
+src_install() {
+	emake prefix="${EPREFIX}"/usr DESTDIR="${D}" install
+
+	# bug 409361
+	dodir /usr/share/poppler/cMaps
+	cd "${D}/${EPREFIX}"/usr/share/poppler/cMaps || die
+	find ../cMap -type f -exec ln -s {} . \; || die
+}
diff --git a/app-text/poppler-data/poppler-data-0.4.8.ebuild b/app-text/poppler-data/poppler-data-0.4.8.ebuild
new file mode 100644
index 000000000000..ecc3bd95ac2f
--- /dev/null
+++ b/app-text/poppler-data/poppler-data-0.4.8.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Data files for poppler to support uncommon encodings without xpdfrc"
+HOMEPAGE="https://poppler.freedesktop.org/"
+SRC_URI="https://poppler.freedesktop.org/${P}.tar.gz"
+
+LICENSE="BSD GPL-2 MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+SLOT="0"
+IUSE=""
+
+src_install() {
+	emake prefix="${EPREFIX}"/usr DESTDIR="${D}" install
+
+	# bug 409361
+	dodir /usr/share/poppler/cMaps
+	cd "${D}/${EPREFIX}"/usr/share/poppler/cMaps || die
+	find ../cMap -type f -exec ln -s {} . \; || die
+}
diff --git a/app-text/poppler-data/poppler-data-0.4.9.ebuild b/app-text/poppler-data/poppler-data-0.4.9.ebuild
new file mode 100644
index 000000000000..ecc3bd95ac2f
--- /dev/null
+++ b/app-text/poppler-data/poppler-data-0.4.9.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Data files for poppler to support uncommon encodings without xpdfrc"
+HOMEPAGE="https://poppler.freedesktop.org/"
+SRC_URI="https://poppler.freedesktop.org/${P}.tar.gz"
+
+LICENSE="BSD GPL-2 MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+SLOT="0"
+IUSE=""
+
+src_install() {
+	emake prefix="${EPREFIX}"/usr DESTDIR="${D}" install
+
+	# bug 409361
+	dodir /usr/share/poppler/cMaps
+	cd "${D}/${EPREFIX}"/usr/share/poppler/cMaps || die
+	find ../cMap -type f -exec ln -s {} . \; || die
+}
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
new file mode 100644
index 000000000000..111e058825e4
--- /dev/null
+++ b/app-text/poppler/Manifest
@@ -0,0 +1,18 @@
+AUX poppler-0.28.1-fix-multilib-configuration.patch 813 BLAKE2B 74133e82a1969d80d4839f61beb22ba8ede9d594d4978c1311219268c3c97f8f9b6e939e2d0870acf6406a01ceafcbd982dcf93ee738a6451b86f7f48d270ec9 SHA512 fc12ae5a484bd231a10bd31860f07d773899ba034cb43f55bc53da7701dc8a3d8ce86885330cdad1a4d32fd8ce712105d3c8b984855857fabd4d4e92bb54dfed
+AUX poppler-0.57.0-disable-internal-jpx.patch 892 BLAKE2B 811ce3bbeb3b3c0720902a2a57463d352d102a2d6faef209723558eb93d638f35108f83674e29314632ebcf5fae521bcd8893eb1f77b931c7348b9d7446dae76 SHA512 aca1738fa33fcb5efcc8b0f5062abca2f32d329d3e2e1609386f15cce33d2e7aeae3e36b41dae292d3dceea7bde62210d2527b2552047d33d57ea4f44dabc1ee
+AUX poppler-0.60.1-qt5-dependencies.patch 934 BLAKE2B 5af7f7adfb802905737abc22003d00dda6f25bc992d73c01570a560938e5aef166905c519ea7e4968f8e637b2dc47c61bb1c49cd5ab14fb2076e2a1e38545499 SHA512 fc2e3297da9dbbb6ba9377958c08626db44790ec6ba3acdbc1c348d3e909bd7b061fa64995d584d89a42d1bc9cb278827590b303bd1ff57c0557f2bae450b81c
+AUX poppler-0.61.0-respect-cflags.patch 3012 BLAKE2B 24ac0b8067f1f8aea6e1b328b27ff9a5be0fa457354a251bb5066e6a63ffbf953c2d761e53e5d78e1b8593dbd5740420cffaa7f4a01f1366b712b12fbfad2cf9 SHA512 b680ac77711d845a93586084d1a4523860af33c2d494cbf16ea42f799612548b96fbdaadf53100dc74e933e0d09ba98ce3aa49b7ba6655907aad01e09561fa6d
+AUX poppler-0.62.0-glibc.patch 1119 BLAKE2B 680425520a9ea1e7d24639ea3a05ed5a857c09ea6ec48bf60a8a4b37bf725d5f7359fb5dc2708584e5a27fae862fd3ef6b0aabb7b4f0f63e1f4fc0c6c80f2c7f SHA512 4f6f8270513163b09a1861ebe7e83ed1a6150d523773daacbf039c660853bbde17bbdd502135eb56aba1e4812cb5adb7dc39294764b282f0b34aa43b04410fde
+AUX poppler-0.62.0-openjpeg2.patch 599 BLAKE2B 6227946829d8b04d3c12505f5a9878d78f44925b405c2871c6b69a36b02ec8f411ff3cfe397870606be3d2af1cc5e14f23e42744810a095de8d3788092af3521 SHA512 35539dacc3e40b966c94ab73f3ae9228229472e3729f45844224d65ecc215480386e3e14cfb659a9de59277ca5928b81a9502cd48af91e7bb20e259bc5681170
+DIST poppler-0.62.0.tar.xz 1423372 BLAKE2B 01c8745d0c1fa5b412ec92295a8784f5c1deff8b9fa709d09a3236d630f78fecc6af23fe3302964478d6356562712726db422ef51fe59a8b42e13e08370a77ac SHA512 91f7eae7b05965ae97a34e658bed2a676be8a6e4d34f82148ece6eb58932632dcf9a34d50c66412f93f560ce575abf5c608ed6b1e5184604b96024801886c706
+DIST poppler-0.63.0.tar.xz 1439552 BLAKE2B 9bf5cff7f5fec93ec7d49d1745aadb2b03a68d38216003e4bff54a5d264c9dda10265da79a755af1f31b582602d034cfefb16b807185d674a2cfe0d20e5de277 SHA512 a151d08480e9940a02191355ef5e7499d6494cff05f22f49de2bb8223512f5e5c9bb9b33651943ded30b4cd7096a2423fb7a01fa62228fbcd1d3a221b885cfe9
+DIST poppler-0.64.0.tar.xz 1449904 BLAKE2B 260bcc9c1b109b58b66057665d11c0685b525803206497ad0516998d93c132befd6b0ae28f187afd77dace6b35af6c08b8210ad05143d6d068109dc57caf5a4a SHA512 2799c3f628e63803eb11a25e54798a136aad91ea843d4bc1fb284af478f4a8cde87b7f95fc28cf23baf25975fbde6ca93f6ac91befb87af42e642c7650053f1c
+DIST poppler-0.65.0.tar.xz 1451720 BLAKE2B 8d8d785a2d2b9b501e2db0736e5256236eecd72e4cd4659d198db45b8a3f219e4949f6fe460bf2429cd5ea0a5ea26e1d5d5640d1e75b1443c38f43de9b17efc4 SHA512 4a2c31307ab703bd25e1b5ac1185a897e1c96de13daa4fc4849974f6ea6cec8066e8cd9ea061f65620c71ea56a09b2cd355c4e42e9a4eb9a674a11648e3ec977
+DIST poppler-0.66.0.tar.xz 1457420 BLAKE2B 55e2b6046920b7212b53adde309c9a2e1c10412b1278371b51679f4d20ae0cc4bfc359cef4865fa337a6f844c87533b9dcd13e8da0e6dce1514c0e2dacb95d47 SHA512 cf0ce3855d7cc28021685731308bfdeca0a7a764345432242887852d67fb4119b149ab7ba692e7031e2f0e79b9982e71446efbd75bb7886450d13ea6c5035b51
+EBUILD poppler-0.62.0-r1.ebuild 3537 BLAKE2B 9c5ade9d12bba01198417d35e63ae454cd0a5a2d2e68ccda8fcf90bcae83fab248b46e8178e651661b25385b6863bb250461d6995afa38dee88c5c0084da0541 SHA512 4075ffbe26bd13100e9d43f8b0d3768d9ab9d2f287364654f1b223b91e6ede835268b7ff7226c1e65c4ff27e9be43bf355d377d4de8d2f2a7eab27ad908a3e3d
+EBUILD poppler-0.63.0.ebuild 3517 BLAKE2B 1cde03a02078d671d3e8005ce3c38570ee118827360899bb6c4d972e242f4daad5c311580bc08db71318166f09134ce119d7bc772b0e56b31d16cefef4098b31 SHA512 050b9465a3382aff8188c9f9e30bbe3199d3b3abd5f9bb29e68cb19324a6015d66176eba4904f5b211916eb4e862a3c6ba962e176794b836981ee11776c4830a
+EBUILD poppler-0.64.0.ebuild 3517 BLAKE2B 6800d6285471d99283e8edcedcfa537eb2661403515707356fcdaa7b98835429c94d6c018ab1447c6cf6e6b571e157c5babb9f3a6203430e92893cc23082addf SHA512 0f5f33e19f6f309217992f27470eb4e93d7867dc299de6db68fa0cf4d2afb0923bdb31e160611b33458bf229194afc52483698d425184afd80034f769aa66cfe
+EBUILD poppler-0.65.0.ebuild 3517 BLAKE2B b50f15e427e79492d6101dbc6b71704236d1330e27a5e756d0637ddfee2d0f955b1147c1525624820be7faee3a0dc09f006f1fc533e7aebd4b5f7229b09ab34c SHA512 51c8e5db741b927c8ac68618f58cf306571185d33166cc87b615bbcb852590527cc0d06f1e1c86e65026bf9d7536a0949e9118d5729f63d2f4815a1e37badc8f
+EBUILD poppler-0.66.0.ebuild 3546 BLAKE2B 06b268276b36fb0b8c91293f51e31b0840234958eb40e0505f9b944df08cc515222e5151fe0a5d63fea992ddec08dddacdf5b598ff01e46b97416c8de087aefc SHA512 e0c5f8985df997aedac113ea75404616bf29979377bb58b9381a25faa47cc1718d0261a3f222a5d492a7e0ff1c5911e38b2f3aabce12e19686e584042a146086
+EBUILD poppler-9999.ebuild 3546 BLAKE2B 06b268276b36fb0b8c91293f51e31b0840234958eb40e0505f9b944df08cc515222e5151fe0a5d63fea992ddec08dddacdf5b598ff01e46b97416c8de087aefc SHA512 e0c5f8985df997aedac113ea75404616bf29979377bb58b9381a25faa47cc1718d0261a3f222a5d492a7e0ff1c5911e38b2f3aabce12e19686e584042a146086
+MISC metadata.xml 910 BLAKE2B 163a59e6d3a7b5cb610928d57a4a0db99a5ce9277bbdcb74e7589cb0f6276d0d8d9cec0c9ca53f1e1c1f6ea2eb539c05c6cec8a701c710d08d5105c73a526f16 SHA512 a6c4a161d32c008cc5a439e48d18dcf7a6d0501106652bbc33ae1735e986c91dad759660bc8408f047ed0f13b15a66d2068a5dcaa30f4620ede01973c1048bfa
diff --git a/app-text/poppler/files/poppler-0.28.1-fix-multilib-configuration.patch b/app-text/poppler/files/poppler-0.28.1-fix-multilib-configuration.patch
new file mode 100644
index 000000000000..f0a8d3c7eb4a
--- /dev/null
+++ b/app-text/poppler/files/poppler-0.28.1-fix-multilib-configuration.patch
@@ -0,0 +1,23 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 7178d25..934f38f 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -119,6 +119,18 @@ else(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION} VERSIO
+   message("-- CMake >= 2.8.8 is needed to enable Qt5")
+ endif(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION} VERSION_GREATER 2.8.7)
+ 
++#
++# Ugly workaround: Manually patch library paths for Qt4 and Qt5:
++#
++IF( "${CMAKE_CXX_FLAGS}" MATCHES "-m32")
++  GET_CMAKE_PROPERTY(_res VARIABLES)
++  FOREACH(_var ${_res})
++    IF(_var MATCHES "^QT" AND ${_var} MATCHES "lib64")
++      STRING(REPLACE "lib64" "lib32" ${_var} "${${_var}}")
++    ENDIF()
++  ENDFOREACH()
++ENDIF()
++
+ macro_optional_find_package(Cairo ${CAIRO_VERSION})
+ if(CAIRO_FOUND)
+   set(HAVE_CAIRO ${CAIRO_FOUND})
diff --git a/app-text/poppler/files/poppler-0.57.0-disable-internal-jpx.patch b/app-text/poppler/files/poppler-0.57.0-disable-internal-jpx.patch
new file mode 100644
index 000000000000..faf632128ff7
--- /dev/null
+++ b/app-text/poppler/files/poppler-0.57.0-disable-internal-jpx.patch
@@ -0,0 +1,25 @@
+Fix security issue [internal unmaintained JPX decoder] that is caused
+by building without system-jpeg libs. Fedora does not care because they
+always build with system-jpeg, however in Gentoo we allow the user to
+disable both options and poppler's buildsystem is making us believe
+there would be no JPX decoder built in that case, when in reality
+JPXStream.cc is built (even if it may not be used by the code).
+
+
+--- a/CMakeLists.txt	2017-11-24 23:12:41.953450442 +0100
++++ b/CMakeLists.txt	2017-11-24 23:16:09.441030669 +0100
+@@ -506,9 +508,11 @@
+   add_definitions(-DUSE_OPENJPEG2)
+   set(poppler_LIBS ${poppler_LIBS} ${LIBOPENJPEG2_LIBRARIES})
+ else ()
+-  set(poppler_SRCS ${poppler_SRCS}
+-    poppler/JPXStream.cc
+-  )
++  if(NOT WITH_OPENJPEG AND HAVE_JPX_DECODER)
++    set(poppler_SRCS ${poppler_SRCS}
++      poppler/JPXStream.cc
++    )
++  endif()
+ endif()
+ if(USE_CMS)
+   if(LCMS_FOUND)
diff --git a/app-text/poppler/files/poppler-0.60.1-qt5-dependencies.patch b/app-text/poppler/files/poppler-0.60.1-qt5-dependencies.patch
new file mode 100644
index 000000000000..259be15c6631
--- /dev/null
+++ b/app-text/poppler/files/poppler-0.60.1-qt5-dependencies.patch
@@ -0,0 +1,29 @@
+From af70882d85999b1912f9909f506ee7d22cc58ca7 Mon Sep 17 00:00:00 2001
+From: Johannes Huber <johu@gentoo.org>
+Date: Fri, 6 Oct 2017 08:52:10 +0200
+Subject: [PATCH] [Qt5] Drop unused dependencies
+
+---
+ CMakeLists.txt | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 7485b2ad..04327568 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -147,10 +147,8 @@ if (ENABLE_QT5)
+   find_package(Qt5Core)
+   find_package(Qt5Gui)
+   find_package(Qt5Xml)
+-  find_package(Qt5Widgets)
+-  find_package(Qt5Test)
+-  if (NOT (Qt5Core_FOUND AND Qt5Gui_FOUND AND Qt5Xml_FOUND AND Qt5Widgets_FOUND AND Qt5Test_FOUND))
+-    message("-- Package Qt5Core or Qt5Gui or Qt5Xml or Qt5Widgets or Qt5Test not found")
++  if (NOT (Qt5Core_FOUND AND Qt5Gui_FOUND AND Qt5Xml_FOUND))
++    message("-- Package Qt5Core or Qt5Gui or Qt5Xml not found")
+     set(ENABLE_QT5 OFF)
+   endif()
+ endif()
+-- 
+2.14.2
+
diff --git a/app-text/poppler/files/poppler-0.61.0-respect-cflags.patch b/app-text/poppler/files/poppler-0.61.0-respect-cflags.patch
new file mode 100644
index 000000000000..a75b84b482f5
--- /dev/null
+++ b/app-text/poppler/files/poppler-0.61.0-respect-cflags.patch
@@ -0,0 +1,55 @@
+--- poppler-0.61.0/cmake/modules/PopplerMacros.cmake
++++ poppler-0.61.0/cmake/modules/PopplerMacros.cmake
+@@ -98,8 +98,6 @@
+   set(CMAKE_BUILD_TYPE RelWithDebInfo)
+ endif(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
+ 
+-if(CMAKE_COMPILER_IS_GNUCXX)
+-  # set the default compile warnings
+   set(_warn "-Wall -Wextra -Wpedantic")
+   set(_warn "${_warn} -Wno-unused-parameter -Wno-missing-field-initializers")
+   set(_warn "${_warn} -Wcast-align")
+@@ -124,39 +122,6 @@
+   set(DEFAULT_COMPILE_WARNINGS "${_warn}")
+   set(DEFAULT_COMPILE_WARNINGS_EXTRA "${_warn} ${_warnx}")
+ 
+-  set(_save_cxxflags "${CMAKE_CXX_FLAGS}")
+-  set(CMAKE_CXX_FLAGS                "-fno-exceptions -fno-check-new -fno-common -D_DEFAULT_SOURCE")
+-  set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cxxflags}")
+-  set(CMAKE_CXX_FLAGS_RELEASE        "-O2 -DNDEBUG ${_save_cxxflags}")
+-  set(CMAKE_CXX_FLAGS_DEBUG          "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline ${_save_cxxflags}")
+-  set(CMAKE_CXX_FLAGS_DEBUGFULL      "-g3 -fno-inline ${_save_cxxflags}")
+-  set(CMAKE_CXX_FLAGS_PROFILE        "-g3 -fno-inline -ftest-coverage -fprofile-arcs ${_save_cxxflags}")
+-  set(_save_cflags "${CMAKE_C_FLAGS}")
+-  set(CMAKE_C_FLAGS                  "-std=c99 -D_DEFAULT_SOURCE")
+-  set(CMAKE_C_FLAGS_RELWITHDEBINFO   "-O2 -g ${_save_cflags}")
+-  set(CMAKE_C_FLAGS_RELEASE          "-O2 -DNDEBUG ${_save_cflags}")
+-  set(CMAKE_C_FLAGS_DEBUG            "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline ${_save_cflags}")
+-  set(CMAKE_C_FLAGS_DEBUGFULL        "-g3 -fno-inline ${_save_cflags}")
+-  set(CMAKE_C_FLAGS_PROFILE          "-g3 -fno-inline -ftest-coverage -fprofile-arcs ${_save_cflags}")
+-
+-  poppler_check_link_flag("-Wl,--as-needed" GCC_HAS_AS_NEEDED)
+-  if(GCC_HAS_AS_NEEDED)
+-    set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--as-needed")
+-    set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--as-needed")
+-    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--as-needed")
+-  endif(GCC_HAS_AS_NEEDED)
+-endif (CMAKE_COMPILER_IS_GNUCXX)
+-
+-if(CMAKE_C_COMPILER MATCHES "icc")
+-  set(_save_cxxflags "${CMAKE_CXX_FLAGS}")
+-  set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cxxflags}")
+-  set(CMAKE_CXX_FLAGS_RELEASE        "-O2 -DNDEBUG ${_save_cxxflags}")
+-  set(CMAKE_CXX_FLAGS_DEBUG          "-O2 -g -0b0 -noalign ${_save_cxxflags}")
+-  set(CMAKE_CXX_FLAGS_DEBUGFULL      "-g -Ob0 -noalign ${_save_cxxflags}")
+-  set(_save_cflags "${CMAKE_C_FLAGS}")
+-  set(CMAKE_C_FLAGS_RELWITHDEBINFO   "-O2 -g ${_save_cflags}")
+-  set(CMAKE_C_FLAGS_RELEASE          "-O2 -DNDEBUG ${_save_cflags}")
+-  set(CMAKE_C_FLAGS_DEBUG            "-O2 -g -Ob0 -noalign ${_save_cflags}")
+-  set(CMAKE_C_FLAGS_DEBUGFULL        "-g -Ob0 -noalign ${_save_cflags}")
+-endif(CMAKE_C_COMPILER MATCHES "icc")
+-
++  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Woverloaded-virtual")
++  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99")
++ 
+\ Kein Zeilenumbruch am Dateiende.
diff --git a/app-text/poppler/files/poppler-0.62.0-glibc.patch b/app-text/poppler/files/poppler-0.62.0-glibc.patch
new file mode 100644
index 000000000000..6808e91601dc
--- /dev/null
+++ b/app-text/poppler/files/poppler-0.62.0-glibc.patch
@@ -0,0 +1,34 @@
+From 7b434a7ad9333a3b2250d636a517c58d9a12bca2 Mon Sep 17 00:00:00 2001
+From: Pekka Vuorela <pekka.vuorela@jollamobile.com>
+Date: Fri, 15 Dec 2017 16:56:20 +0200
+Subject: Honor configuration for building glibc copy of strtok_r
+
+config.h didn't get included and HAVE_STRTOK_R was never defined.
+Now getting via glibc.h.
+---
+ goo/glibc_strtok_r.cc | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/goo/glibc_strtok_r.cc b/goo/glibc_strtok_r.cc
+index e779bf5..e323bc2 100644
+--- a/goo/glibc_strtok_r.cc
++++ b/goo/glibc_strtok_r.cc
+@@ -50,12 +50,15 @@
+ // Copyright (C) 2012 Alexey Pavlov <alexpux@gmail.com>
+ // Copyright (C) 2012 Albert Astals Cid <aacid@kde.org>
+ // Copyright (C) 2017 Adrian Johnson <ajohnson@redneon.com>
++// Copyright (C) 2017 Pekka Vuorela <pekka.vuorela@jollamobile.com>
+ //
+ // To see a description of the changes please see the Changelog file that
+ // came with your tarball or type make ChangeLog if you are building from git
+ //
+ //========================================================================
+ 
++#include "glibc.h"
++
+ #ifndef HAVE_STRTOK_R
+ 
+ #include <string.h>
+-- 
+cgit v1.1
+
diff --git a/app-text/poppler/files/poppler-0.62.0-openjpeg2.patch b/app-text/poppler/files/poppler-0.62.0-openjpeg2.patch
new file mode 100644
index 000000000000..789090cc9b22
--- /dev/null
+++ b/app-text/poppler/files/poppler-0.62.0-openjpeg2.patch
@@ -0,0 +1,14 @@
+Sadly the CMake side of openjpeg slotting in Gentoo is broken.
+To reliably find openjpeg:2 we need to use pkg-config.
+
+--- poppler-0.62.0/CMakeLists.txt
++++ poppler-0.62.0/CMakeLists.txt
+@@ -193,7 +193,7 @@
+ endif()
+ set(WITH_OPENJPEG FALSE)
+ if(ENABLE_LIBOPENJPEG STREQUAL "openjpeg2")
+-  find_package(LIBOPENJPEG2)
++  pkg_check_modules(LIBOPENJPEG2 libopenjp2)
+   set(WITH_OPENJPEG ${LIBOPENJPEG2_FOUND})
+   if(NOT LIBOPENJPEG2_FOUND)
+     message(FATAL_ERROR "Install libopenjpeg2 before trying to build poppler. You can also decide to use the internal unmaintained JPX decoder or none at all.")
diff --git a/app-text/poppler/metadata.xml b/app-text/poppler/metadata.xml
new file mode 100644
index 000000000000..3f8d6be9f980
--- /dev/null
+++ b/app-text/poppler/metadata.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>reavertm@gentoo.org</email>
+	<name>Maciej Mrozowski</name>
+</maintainer>
+<maintainer type="project">
+	<email>kde@gentoo.org</email>
+	<name>Gentoo KDE Project</name>
+</maintainer>
+<maintainer type="project">
+	<email>printing@gentoo.org</email>
+	<name>Gentoo Printing Project</name>
+</maintainer>
+<maintainer type="project">
+	<email>office@gentoo.org</email>
+	<description>Please CC on stabilisation bugs</description>
+</maintainer>
+<use>
+	<flag name="nss">Enable signatures handling with <pkg>dev-libs/nss</pkg></flag>
+	<flag name="utils">Install command-line PDF converters and various utilities.</flag>
+</use>
+<slots>
+	<subslots>Reflects ABI compatibility of libpoppler.so only,
+		NOT libpoppler-{glib,qt4,cpp}.so!</subslots>
+</slots>
+</pkgmetadata>
diff --git a/app-text/poppler/poppler-0.62.0-r1.ebuild b/app-text/poppler/poppler-0.62.0-r1.ebuild
new file mode 100644
index 000000000000..568a800956bf
--- /dev/null
+++ b/app-text/poppler/poppler-0.62.0-r1.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils flag-o-matic toolchain-funcs xdg-utils
+
+if [[ "${PV}" == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="git://git.freedesktop.org/git/${PN}/${PN}"
+	SLOT="0/9999"
+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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	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"
+HOMEPAGE="https://poppler.freedesktop.org/"
+
+LICENSE="GPL-2"
+IUSE="cairo cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils"
+
+# No test data provided
+RESTRICT="test"
+
+COMMON_DEPEND="
+	>=media-libs/fontconfig-2.6.0
+	>=media-libs/freetype-2.3.9
+	sys-libs/zlib
+	cairo? (
+		dev-libs/glib:2
+		>=x11-libs/cairo-1.10.0
+		introspection? ( >=dev-libs/gobject-introspection-1.32.1:= )
+	)
+	curl? ( net-misc/curl )
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( media-libs/openjpeg:2= )
+	lcms? ( media-libs/lcms:2 )
+	nss? ( >=dev-libs/nss-3.19:0 )
+	png? ( media-libs/libpng:0= )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtxml:5
+	)
+	tiff? ( media-libs/tiff:0 )
+"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+"
+RDEPEND="${COMMON_DEPEND}
+	cjk? ( >=app-text/poppler-data-0.4.7 )
+"
+
+DOCS=(AUTHORS NEWS README README-XPDF)
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.60.1-qt5-dependencies.patch"
+	"${FILESDIR}/${PN}-0.28.1-fix-multilib-configuration.patch"
+	"${FILESDIR}/${PN}-0.61.0-respect-cflags.patch"
+	"${FILESDIR}/${PN}-0.62.0-openjpeg2.patch"
+	"${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch"
+	"${FILESDIR}/${P}-glibc.patch" # bug 643858
+)
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# Clang doesn't grok this flag, the configure nicely tests that, but
+	# cmake just uses it, so remove it if we use clang
+	if [[ ${CC} == clang ]] ; then
+		sed -i -e 's/-fno-check-new//' cmake/modules/PopplerMacros.cmake || die
+	fi
+
+	if ! grep -Fq 'cmake_policy(SET CMP0002 OLD)' CMakeLists.txt ; then
+		sed '/^cmake_minimum_required/acmake_policy(SET CMP0002 OLD)' \
+			-i CMakeLists.txt || die
+	else
+		einfo "policy(SET CMP0002 OLD) - workaround can be removed"
+	fi
+
+	# we need to up the C++ version, bug #622526, #643278
+	append-cxxflags -std=c++11
+}
+
+src_configure() {
+	xdg_environment_reset
+	local mycmakeargs=(
+		-DBUILD_GTK_TESTS=OFF
+		-DBUILD_QT5_TESTS=OFF
+		-DBUILD_CPP_TESTS=OFF
+		-DENABLE_SPLASH=ON
+		-DENABLE_ZLIB=ON
+		-DENABLE_ZLIB_UNCOMPRESS=OFF
+		-DENABLE_XPDF_HEADERS=ON
+		-DSPLASH_CMYK=OFF
+		-DUSE_FIXEDPOINT=OFF
+		-DUSE_FLOAT=OFF
+		-DWITH_Cairo=$(usex cairo)
+		-DENABLE_LIBCURL=$(usex curl)
+		-DENABLE_CPP=$(usex cxx)
+		-DWITH_GObjectIntrospection=$(usex introspection)
+		-DWITH_JPEG=$(usex jpeg)
+		-DENABLE_DCTDECODER=$(usex jpeg libjpeg none)
+		-DENABLE_LIBOPENJPEG=$(usex jpeg2k openjpeg2 none)
+		-DENABLE_CMS=$(usex lcms lcms2 none)
+		-DWITH_NSS3=$(usex nss)
+		-DWITH_PNG=$(usex png)
+		$(cmake-utils_use_find_package qt5 Qt5Core)
+		-DWITH_TIFF=$(usex tiff)
+		-DENABLE_UTILS=$(usex utils)
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# live version doesn't provide html documentation
+	if use cairo && use doc && [[ ${PV} != 9999 ]]; then
+		# For now install gtk-doc there
+		insinto /usr/share/gtk-doc/html/poppler
+		doins -r "${S}"/glib/reference/html/*
+	fi
+}
diff --git a/app-text/poppler/poppler-0.63.0.ebuild b/app-text/poppler/poppler-0.63.0.ebuild
new file mode 100644
index 000000000000..d49411753d4e
--- /dev/null
+++ b/app-text/poppler/poppler-0.63.0.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils flag-o-matic toolchain-funcs xdg-utils
+
+if [[ "${PV}" == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/poppler/poppler.git"
+	SLOT="0/9999"
+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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	SLOT="0/74"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+fi
+
+DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
+HOMEPAGE="https://poppler.freedesktop.org/"
+
+LICENSE="GPL-2"
+IUSE="cairo cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils"
+
+# No test data provided
+RESTRICT="test"
+
+COMMON_DEPEND="
+	>=media-libs/fontconfig-2.6.0
+	>=media-libs/freetype-2.3.9
+	sys-libs/zlib
+	cairo? (
+		dev-libs/glib:2
+		>=x11-libs/cairo-1.10.0
+		introspection? ( >=dev-libs/gobject-introspection-1.32.1:= )
+	)
+	curl? ( net-misc/curl )
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( media-libs/openjpeg:2= )
+	lcms? ( media-libs/lcms:2 )
+	nss? ( >=dev-libs/nss-3.19:0 )
+	png? ( media-libs/libpng:0= )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtxml:5
+	)
+	tiff? ( media-libs/tiff:0 )
+"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+"
+RDEPEND="${COMMON_DEPEND}
+	cjk? ( >=app-text/poppler-data-0.4.7 )
+"
+
+DOCS=(AUTHORS NEWS README README-XPDF)
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.60.1-qt5-dependencies.patch"
+	"${FILESDIR}/${PN}-0.28.1-fix-multilib-configuration.patch"
+	"${FILESDIR}/${PN}-0.61.0-respect-cflags.patch"
+	"${FILESDIR}/${PN}-0.62.0-openjpeg2.patch"
+	"${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch"
+)
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# Clang doesn't grok this flag, the configure nicely tests that, but
+	# cmake just uses it, so remove it if we use clang
+	if [[ ${CC} == clang ]] ; then
+		sed -i -e 's/-fno-check-new//' cmake/modules/PopplerMacros.cmake || die
+	fi
+
+	if ! grep -Fq 'cmake_policy(SET CMP0002 OLD)' CMakeLists.txt ; then
+		sed '/^cmake_minimum_required/acmake_policy(SET CMP0002 OLD)' \
+			-i CMakeLists.txt || die
+	else
+		einfo "policy(SET CMP0002 OLD) - workaround can be removed"
+	fi
+
+	# we need to up the C++ version, bug #622526, #643278
+	append-cxxflags -std=c++11
+}
+
+src_configure() {
+	xdg_environment_reset
+	local mycmakeargs=(
+		-DBUILD_GTK_TESTS=OFF
+		-DBUILD_QT5_TESTS=OFF
+		-DBUILD_CPP_TESTS=OFF
+		-DENABLE_SPLASH=ON
+		-DENABLE_ZLIB=ON
+		-DENABLE_ZLIB_UNCOMPRESS=OFF
+		-DENABLE_XPDF_HEADERS=ON
+		-DSPLASH_CMYK=OFF
+		-DUSE_FIXEDPOINT=OFF
+		-DUSE_FLOAT=OFF
+		-DWITH_Cairo=$(usex cairo)
+		-DENABLE_LIBCURL=$(usex curl)
+		-DENABLE_CPP=$(usex cxx)
+		-DWITH_GObjectIntrospection=$(usex introspection)
+		-DWITH_JPEG=$(usex jpeg)
+		-DENABLE_DCTDECODER=$(usex jpeg libjpeg none)
+		-DENABLE_LIBOPENJPEG=$(usex jpeg2k openjpeg2 none)
+		-DENABLE_CMS=$(usex lcms lcms2 none)
+		-DWITH_NSS3=$(usex nss)
+		-DWITH_PNG=$(usex png)
+		$(cmake-utils_use_find_package qt5 Qt5Core)
+		-DWITH_TIFF=$(usex tiff)
+		-DENABLE_UTILS=$(usex utils)
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# live version doesn't provide html documentation
+	if use cairo && use doc && [[ ${PV} != 9999 ]]; then
+		# For now install gtk-doc there
+		insinto /usr/share/gtk-doc/html/poppler
+		doins -r "${S}"/glib/reference/html/*
+	fi
+}
diff --git a/app-text/poppler/poppler-0.64.0.ebuild b/app-text/poppler/poppler-0.64.0.ebuild
new file mode 100644
index 000000000000..13fd0a3103db
--- /dev/null
+++ b/app-text/poppler/poppler-0.64.0.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils flag-o-matic toolchain-funcs xdg-utils
+
+if [[ "${PV}" == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/poppler/poppler.git"
+	SLOT="0/9999"
+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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	SLOT="0/75"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+fi
+
+DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
+HOMEPAGE="https://poppler.freedesktop.org/"
+
+LICENSE="GPL-2"
+IUSE="cairo cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils"
+
+# No test data provided
+RESTRICT="test"
+
+COMMON_DEPEND="
+	>=media-libs/fontconfig-2.6.0
+	>=media-libs/freetype-2.3.9
+	sys-libs/zlib
+	cairo? (
+		dev-libs/glib:2
+		>=x11-libs/cairo-1.10.0
+		introspection? ( >=dev-libs/gobject-introspection-1.32.1:= )
+	)
+	curl? ( net-misc/curl )
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( media-libs/openjpeg:2= )
+	lcms? ( media-libs/lcms:2 )
+	nss? ( >=dev-libs/nss-3.19:0 )
+	png? ( media-libs/libpng:0= )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtxml:5
+	)
+	tiff? ( media-libs/tiff:0 )
+"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+"
+RDEPEND="${COMMON_DEPEND}
+	cjk? ( >=app-text/poppler-data-0.4.7 )
+"
+
+DOCS=(AUTHORS NEWS README README-XPDF)
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.60.1-qt5-dependencies.patch"
+	"${FILESDIR}/${PN}-0.28.1-fix-multilib-configuration.patch"
+	"${FILESDIR}/${PN}-0.61.0-respect-cflags.patch"
+	"${FILESDIR}/${PN}-0.62.0-openjpeg2.patch"
+	"${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch"
+)
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# Clang doesn't grok this flag, the configure nicely tests that, but
+	# cmake just uses it, so remove it if we use clang
+	if [[ ${CC} == clang ]] ; then
+		sed -i -e 's/-fno-check-new//' cmake/modules/PopplerMacros.cmake || die
+	fi
+
+	if ! grep -Fq 'cmake_policy(SET CMP0002 OLD)' CMakeLists.txt ; then
+		sed '/^cmake_minimum_required/acmake_policy(SET CMP0002 OLD)' \
+			-i CMakeLists.txt || die
+	else
+		einfo "policy(SET CMP0002 OLD) - workaround can be removed"
+	fi
+
+	# we need to up the C++ version, bug #622526, #643278
+	append-cxxflags -std=c++11
+}
+
+src_configure() {
+	xdg_environment_reset
+	local mycmakeargs=(
+		-DBUILD_GTK_TESTS=OFF
+		-DBUILD_QT5_TESTS=OFF
+		-DBUILD_CPP_TESTS=OFF
+		-DENABLE_SPLASH=ON
+		-DENABLE_ZLIB=ON
+		-DENABLE_ZLIB_UNCOMPRESS=OFF
+		-DENABLE_XPDF_HEADERS=ON
+		-DSPLASH_CMYK=OFF
+		-DUSE_FIXEDPOINT=OFF
+		-DUSE_FLOAT=OFF
+		-DWITH_Cairo=$(usex cairo)
+		-DENABLE_LIBCURL=$(usex curl)
+		-DENABLE_CPP=$(usex cxx)
+		-DWITH_GObjectIntrospection=$(usex introspection)
+		-DWITH_JPEG=$(usex jpeg)
+		-DENABLE_DCTDECODER=$(usex jpeg libjpeg none)
+		-DENABLE_LIBOPENJPEG=$(usex jpeg2k openjpeg2 none)
+		-DENABLE_CMS=$(usex lcms lcms2 none)
+		-DWITH_NSS3=$(usex nss)
+		-DWITH_PNG=$(usex png)
+		$(cmake-utils_use_find_package qt5 Qt5Core)
+		-DWITH_TIFF=$(usex tiff)
+		-DENABLE_UTILS=$(usex utils)
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# live version doesn't provide html documentation
+	if use cairo && use doc && [[ ${PV} != 9999 ]]; then
+		# For now install gtk-doc there
+		insinto /usr/share/gtk-doc/html/poppler
+		doins -r "${S}"/glib/reference/html/*
+	fi
+}
diff --git a/app-text/poppler/poppler-0.65.0.ebuild b/app-text/poppler/poppler-0.65.0.ebuild
new file mode 100644
index 000000000000..b15fbe7973ae
--- /dev/null
+++ b/app-text/poppler/poppler-0.65.0.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils flag-o-matic toolchain-funcs xdg-utils
+
+if [[ "${PV}" == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/poppler/poppler.git"
+	SLOT="0/9999"
+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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	SLOT="0/76"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+fi
+
+DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
+HOMEPAGE="https://poppler.freedesktop.org/"
+
+LICENSE="GPL-2"
+IUSE="cairo cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils"
+
+# No test data provided
+RESTRICT="test"
+
+COMMON_DEPEND="
+	>=media-libs/fontconfig-2.6.0
+	>=media-libs/freetype-2.3.9
+	sys-libs/zlib
+	cairo? (
+		dev-libs/glib:2
+		>=x11-libs/cairo-1.10.0
+		introspection? ( >=dev-libs/gobject-introspection-1.32.1:= )
+	)
+	curl? ( net-misc/curl )
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( media-libs/openjpeg:2= )
+	lcms? ( media-libs/lcms:2 )
+	nss? ( >=dev-libs/nss-3.19:0 )
+	png? ( media-libs/libpng:0= )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtxml:5
+	)
+	tiff? ( media-libs/tiff:0 )
+"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+"
+RDEPEND="${COMMON_DEPEND}
+	cjk? ( >=app-text/poppler-data-0.4.7 )
+"
+
+DOCS=(AUTHORS NEWS README README-XPDF)
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.60.1-qt5-dependencies.patch"
+	"${FILESDIR}/${PN}-0.28.1-fix-multilib-configuration.patch"
+	"${FILESDIR}/${PN}-0.61.0-respect-cflags.patch"
+	"${FILESDIR}/${PN}-0.62.0-openjpeg2.patch"
+	"${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch"
+)
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# Clang doesn't grok this flag, the configure nicely tests that, but
+	# cmake just uses it, so remove it if we use clang
+	if [[ ${CC} == clang ]] ; then
+		sed -i -e 's/-fno-check-new//' cmake/modules/PopplerMacros.cmake || die
+	fi
+
+	if ! grep -Fq 'cmake_policy(SET CMP0002 OLD)' CMakeLists.txt ; then
+		sed '/^cmake_minimum_required/acmake_policy(SET CMP0002 OLD)' \
+			-i CMakeLists.txt || die
+	else
+		einfo "policy(SET CMP0002 OLD) - workaround can be removed"
+	fi
+
+	# we need to up the C++ version, bug #622526, #643278
+	append-cxxflags -std=c++11
+}
+
+src_configure() {
+	xdg_environment_reset
+	local mycmakeargs=(
+		-DBUILD_GTK_TESTS=OFF
+		-DBUILD_QT5_TESTS=OFF
+		-DBUILD_CPP_TESTS=OFF
+		-DENABLE_SPLASH=ON
+		-DENABLE_ZLIB=ON
+		-DENABLE_ZLIB_UNCOMPRESS=OFF
+		-DENABLE_XPDF_HEADERS=ON
+		-DSPLASH_CMYK=OFF
+		-DUSE_FIXEDPOINT=OFF
+		-DUSE_FLOAT=OFF
+		-DWITH_Cairo=$(usex cairo)
+		-DENABLE_LIBCURL=$(usex curl)
+		-DENABLE_CPP=$(usex cxx)
+		-DWITH_GObjectIntrospection=$(usex introspection)
+		-DWITH_JPEG=$(usex jpeg)
+		-DENABLE_DCTDECODER=$(usex jpeg libjpeg none)
+		-DENABLE_LIBOPENJPEG=$(usex jpeg2k openjpeg2 none)
+		-DENABLE_CMS=$(usex lcms lcms2 none)
+		-DWITH_NSS3=$(usex nss)
+		-DWITH_PNG=$(usex png)
+		$(cmake-utils_use_find_package qt5 Qt5Core)
+		-DWITH_TIFF=$(usex tiff)
+		-DENABLE_UTILS=$(usex utils)
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# live version doesn't provide html documentation
+	if use cairo && use doc && [[ ${PV} != 9999 ]]; then
+		# For now install gtk-doc there
+		insinto /usr/share/gtk-doc/html/poppler
+		doins -r "${S}"/glib/reference/html/*
+	fi
+}
diff --git a/app-text/poppler/poppler-0.66.0.ebuild b/app-text/poppler/poppler-0.66.0.ebuild
new file mode 100644
index 000000000000..893cc9f7e682
--- /dev/null
+++ b/app-text/poppler/poppler-0.66.0.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils flag-o-matic toolchain-funcs xdg-utils
+
+if [[ "${PV}" == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/poppler/poppler.git"
+	SLOT="0/9999"
+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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	SLOT="0/77"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+fi
+
+DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
+HOMEPAGE="https://poppler.freedesktop.org/"
+
+LICENSE="GPL-2"
+IUSE="cairo cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils"
+
+# No test data provided
+RESTRICT="test"
+
+COMMON_DEPEND="
+	>=media-libs/fontconfig-2.6.0
+	>=media-libs/freetype-2.3.9
+	sys-libs/zlib
+	cairo? (
+		dev-libs/glib:2
+		>=x11-libs/cairo-1.10.0
+		introspection? ( >=dev-libs/gobject-introspection-1.32.1:= )
+	)
+	curl? ( net-misc/curl )
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( media-libs/openjpeg:2= )
+	lcms? ( media-libs/lcms:2 )
+	nss? ( >=dev-libs/nss-3.19:0 )
+	png? ( media-libs/libpng:0= )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtxml:5
+	)
+	tiff? ( media-libs/tiff:0 )
+"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+"
+RDEPEND="${COMMON_DEPEND}
+	cjk? ( >=app-text/poppler-data-0.4.7 )
+"
+
+DOCS=(AUTHORS NEWS README README-XPDF)
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.60.1-qt5-dependencies.patch"
+	"${FILESDIR}/${PN}-0.28.1-fix-multilib-configuration.patch"
+	"${FILESDIR}/${PN}-0.61.0-respect-cflags.patch"
+	"${FILESDIR}/${PN}-0.62.0-openjpeg2.patch"
+	"${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch"
+)
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# Clang doesn't grok this flag, the configure nicely tests that, but
+	# cmake just uses it, so remove it if we use clang
+	if [[ ${CC} == clang ]] ; then
+		sed -i -e 's/-fno-check-new//' cmake/modules/PopplerMacros.cmake || die
+	fi
+
+	if ! grep -Fq 'cmake_policy(SET CMP0002 OLD)' CMakeLists.txt ; then
+		sed '/^cmake_minimum_required/acmake_policy(SET CMP0002 OLD)' \
+			-i CMakeLists.txt || die
+	else
+		einfo "policy(SET CMP0002 OLD) - workaround can be removed"
+	fi
+
+	# we need to up the C++ version, bug #622526, #643278
+	append-cxxflags -std=c++11
+}
+
+src_configure() {
+	xdg_environment_reset
+	local mycmakeargs=(
+		-DBUILD_GTK_TESTS=OFF
+		-DBUILD_QT5_TESTS=OFF
+		-DBUILD_CPP_TESTS=OFF
+		-DENABLE_SPLASH=ON
+		-DENABLE_ZLIB=ON
+		-DENABLE_ZLIB_UNCOMPRESS=OFF
+		-DENABLE_XPDF_HEADERS=ON
+		-DSPLASH_CMYK=OFF
+		-DUSE_FIXEDPOINT=OFF
+		-DUSE_FLOAT=OFF
+		-DWITH_Cairo=$(usex cairo)
+		-DENABLE_LIBCURL=$(usex curl)
+		-DENABLE_CPP=$(usex cxx)
+		-DWITH_JPEG=$(usex jpeg)
+		-DENABLE_DCTDECODER=$(usex jpeg libjpeg none)
+		-DENABLE_LIBOPENJPEG=$(usex jpeg2k openjpeg2 none)
+		-DENABLE_CMS=$(usex lcms lcms2 none)
+		-DWITH_NSS3=$(usex nss)
+		-DWITH_PNG=$(usex png)
+		$(cmake-utils_use_find_package qt5 Qt5Core)
+		-DWITH_TIFF=$(usex tiff)
+		-DENABLE_UTILS=$(usex utils)
+	)
+	use cairo && mycmakeargs+=( -DWITH_GObjectIntrospection=$(usex introspection) )
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# live version doesn't provide html documentation
+	if use cairo && use doc && [[ ${PV} != 9999 ]]; then
+		# For now install gtk-doc there
+		insinto /usr/share/gtk-doc/html/poppler
+		doins -r "${S}"/glib/reference/html/*
+	fi
+}
diff --git a/app-text/poppler/poppler-9999.ebuild b/app-text/poppler/poppler-9999.ebuild
new file mode 100644
index 000000000000..893cc9f7e682
--- /dev/null
+++ b/app-text/poppler/poppler-9999.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils flag-o-matic toolchain-funcs xdg-utils
+
+if [[ "${PV}" == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/poppler/poppler.git"
+	SLOT="0/9999"
+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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	SLOT="0/77"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+fi
+
+DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
+HOMEPAGE="https://poppler.freedesktop.org/"
+
+LICENSE="GPL-2"
+IUSE="cairo cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils"
+
+# No test data provided
+RESTRICT="test"
+
+COMMON_DEPEND="
+	>=media-libs/fontconfig-2.6.0
+	>=media-libs/freetype-2.3.9
+	sys-libs/zlib
+	cairo? (
+		dev-libs/glib:2
+		>=x11-libs/cairo-1.10.0
+		introspection? ( >=dev-libs/gobject-introspection-1.32.1:= )
+	)
+	curl? ( net-misc/curl )
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( media-libs/openjpeg:2= )
+	lcms? ( media-libs/lcms:2 )
+	nss? ( >=dev-libs/nss-3.19:0 )
+	png? ( media-libs/libpng:0= )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtxml:5
+	)
+	tiff? ( media-libs/tiff:0 )
+"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+"
+RDEPEND="${COMMON_DEPEND}
+	cjk? ( >=app-text/poppler-data-0.4.7 )
+"
+
+DOCS=(AUTHORS NEWS README README-XPDF)
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.60.1-qt5-dependencies.patch"
+	"${FILESDIR}/${PN}-0.28.1-fix-multilib-configuration.patch"
+	"${FILESDIR}/${PN}-0.61.0-respect-cflags.patch"
+	"${FILESDIR}/${PN}-0.62.0-openjpeg2.patch"
+	"${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch"
+)
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# Clang doesn't grok this flag, the configure nicely tests that, but
+	# cmake just uses it, so remove it if we use clang
+	if [[ ${CC} == clang ]] ; then
+		sed -i -e 's/-fno-check-new//' cmake/modules/PopplerMacros.cmake || die
+	fi
+
+	if ! grep -Fq 'cmake_policy(SET CMP0002 OLD)' CMakeLists.txt ; then
+		sed '/^cmake_minimum_required/acmake_policy(SET CMP0002 OLD)' \
+			-i CMakeLists.txt || die
+	else
+		einfo "policy(SET CMP0002 OLD) - workaround can be removed"
+	fi
+
+	# we need to up the C++ version, bug #622526, #643278
+	append-cxxflags -std=c++11
+}
+
+src_configure() {
+	xdg_environment_reset
+	local mycmakeargs=(
+		-DBUILD_GTK_TESTS=OFF
+		-DBUILD_QT5_TESTS=OFF
+		-DBUILD_CPP_TESTS=OFF
+		-DENABLE_SPLASH=ON
+		-DENABLE_ZLIB=ON
+		-DENABLE_ZLIB_UNCOMPRESS=OFF
+		-DENABLE_XPDF_HEADERS=ON
+		-DSPLASH_CMYK=OFF
+		-DUSE_FIXEDPOINT=OFF
+		-DUSE_FLOAT=OFF
+		-DWITH_Cairo=$(usex cairo)
+		-DENABLE_LIBCURL=$(usex curl)
+		-DENABLE_CPP=$(usex cxx)
+		-DWITH_JPEG=$(usex jpeg)
+		-DENABLE_DCTDECODER=$(usex jpeg libjpeg none)
+		-DENABLE_LIBOPENJPEG=$(usex jpeg2k openjpeg2 none)
+		-DENABLE_CMS=$(usex lcms lcms2 none)
+		-DWITH_NSS3=$(usex nss)
+		-DWITH_PNG=$(usex png)
+		$(cmake-utils_use_find_package qt5 Qt5Core)
+		-DWITH_TIFF=$(usex tiff)
+		-DENABLE_UTILS=$(usex utils)
+	)
+	use cairo && mycmakeargs+=( -DWITH_GObjectIntrospection=$(usex introspection) )
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# live version doesn't provide html documentation
+	if use cairo && use doc && [[ ${PV} != 9999 ]]; then
+		# For now install gtk-doc there
+		insinto /usr/share/gtk-doc/html/poppler
+		doins -r "${S}"/glib/reference/html/*
+	fi
+}
diff --git a/app-text/ps2eps-1.68 b/app-text/ps2eps-1.68
deleted file mode 100644
index a88ab543c4b5..000000000000
--- a/app-text/ps2eps-1.68
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install
-DESCRIPTION=Generate Encapsulated Postscript Format files from one-page Postscript documents
-EAPI=0
-HOMEPAGE=http://www.tm.uka.de/~bless/ps2eps
-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
-LICENSE=GPL-2
-RDEPEND=app-text/ghostscript-gpl !<app-text/texlive-core-2007-r7
-SLOT=0
-SRC_URI=http://www.tm.uka.de/~bless/ps2eps-1.68.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=91247f7cee351b01b66773c6e19624f9
diff --git a/app-text/ps2eps/Manifest b/app-text/ps2eps/Manifest
new file mode 100644
index 000000000000..dec07e12b0e8
--- /dev/null
+++ b/app-text/ps2eps/Manifest
@@ -0,0 +1,3 @@
+DIST ps2eps-1.68.tar.gz 97304 BLAKE2B 594b894b2d81f64c8c6a7461d1df96d7b6e3ce3ef8f7eaf58161eb6a05ebca7b2d304a531be954898f1a9ad53cccd84536b64127b080afbc3902265d2e4e1108 SHA512 7fc84da5da00d5b1169d6e337b1db232adf80d9d957e48bfdd9272946151adca3e44f712587387ef557488cd15f44210b3fbd8c545488ec0071641d9d25a9c2b
+EBUILD ps2eps-1.68.ebuild 1012 BLAKE2B bec16c67b3a3f7c4e78cac7e8e0315f8895a61114cef16f99bed067c6fd8ab44d0546d090c29e323304b84f9c0dba568f4f17b2240d8fcb96952e58478d833f2 SHA512 b34bfac3b3857a0ef6d6059806053ee37b109c35179e392d4198d44bd323976167f2415754f9990ab1b2162eabf47bbf77f4072ae03de993cedf03f3a0f07219
+MISC metadata.xml 525 BLAKE2B d27db1f0104b7ac6fb9e61c95da58ce62a7dddb28eb7c160507efc87b9b6930df11f889e8a8f5ec1e606209d942254294933313581a2e5dcb0f56c578e4d4080 SHA512 0d250fa2b43ab06f9d214116054bd21dc43f130c5518b430c2bdaaf4a4038fee52d61c6a82b1fe0736b966634e24d7fd99c6a88e171a05e7b5d9cb83a45ca24a
diff --git a/app-text/ps2eps/metadata.xml b/app-text/ps2eps/metadata.xml
new file mode 100644
index 000000000000..67cbd0ec0e3d
--- /dev/null
+++ b/app-text/ps2eps/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>aballier@gentoo.org</email>
+		<name>Alexis Ballier</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>printing@gentoo.org</email>
+		<name>Gentoo Printing Project</name>
+	</maintainer>
+	<longdescription lang="en">
+		Tool for generating Encapsulated Postscript Format (EPS,EPSF) files
+		from one-page Postscript documents
+	</longdescription>
+</pkgmetadata>
diff --git a/app-text/ps2eps/ps2eps-1.68.ebuild b/app-text/ps2eps/ps2eps-1.68.ebuild
new file mode 100644
index 000000000000..407dde790949
--- /dev/null
+++ b/app-text/ps2eps/ps2eps-1.68.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+inherit toolchain-funcs
+
+DESCRIPTION="Generate Encapsulated Postscript Format files from one-page Postscript documents"
+HOMEPAGE="http://www.tm.uka.de/~bless/ps2eps"
+SRC_URI="http://www.tm.uka.de/~bless/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+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=""
+
+DEPEND=""
+RDEPEND="app-text/ghostscript-gpl
+	!<app-text/texlive-core-2007-r7"
+
+S="${WORKDIR}/${PN}"
+
+src_compile() {
+	tc-export CC
+	cd "${S}/src/C"
+	echo "all: bbox" > Makefile
+	emake || die "making bbox failed"
+}
+
+src_install() {
+	dobin "${S}/src/C/bbox"
+	dobin "${S}/bin/ps2eps"
+	doman "${S}/doc/man/man1/bbox.1"
+	doman "${S}/doc/man/man1/ps2eps.1"
+
+	dodoc Changes.txt README.txt
+	dohtml "${S}/doc/html/"*
+	docinto pdf
+	dodoc "${S}/doc/pdf/"*
+}
diff --git a/app-text/ps2pkm-1.7_p20150521 b/app-text/ps2pkm-1.7_p20150521
deleted file mode 100644
index 627262d4d422..000000000000
--- a/app-text/ps2pkm-1.7_p20150521
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure
-DEPEND=>=dev-libs/kpathsea-6.2.1 virtual/pkgconfig
-DESCRIPTION=Tool that converts a PostScript type1 font into a corresponding TeX PK font
-EAPI=5
-HOMEPAGE=http://tug.org/texlive/
-KEYWORDS=alpha amd64 arm arm64 hppa ~mips ppc ppc64 ~s390 ~sh x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=!<app-text/texlive-core-2010 !app-text/ptex >=dev-libs/kpathsea-6.2.1
-SLOT=0
-SRC_URI=mirror://gentoo/texlive-20150521-source.tar.xz
-_md5_=0810a4ddcb6ffcef4f0290d2c721ddf4
diff --git a/app-text/ps2pkm-1.8_p20160523 b/app-text/ps2pkm-1.8_p20160523
deleted file mode 100644
index 923dc82d1ed9..000000000000
--- a/app-text/ps2pkm-1.8_p20160523
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure
-DEPEND=>=dev-libs/kpathsea-6.2.1 virtual/pkgconfig
-DESCRIPTION=Tool that converts a PostScript type1 font into a corresponding TeX PK font
-EAPI=5
-HOMEPAGE=http://tug.org/texlive/
-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
-LICENSE=MIT
-RDEPEND=!<app-text/texlive-core-2010 !app-text/ptex >=dev-libs/kpathsea-6.2.1
-SLOT=0
-SRC_URI=mirror://gentoo/texlive-20160523-source.tar.xz
-_md5_=c07f4fba92f2f4f8dfed96d373bc8005
diff --git a/app-text/ps2pkm-1.8_p20170524 b/app-text/ps2pkm-1.8_p20170524
deleted file mode 100644
index 5b9e0df33d00..000000000000
--- a/app-text/ps2pkm-1.8_p20170524
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure
-DEPEND=>=dev-libs/kpathsea-6.2.1 virtual/pkgconfig
-DESCRIPTION=Tool that converts a PostScript type1 font into a corresponding TeX PK font
-EAPI=5
-HOMEPAGE=http://tug.org/texlive/
-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
-LICENSE=MIT
-RDEPEND=!<app-text/texlive-core-2010 !app-text/ptex >=dev-libs/kpathsea-6.2.1
-SLOT=0
-SRC_URI=mirror://gentoo/texlive-20170524-source.tar.xz
-_md5_=355e1fe44a765bb4df23678aebd6848c
diff --git a/app-text/ps2pkm/Manifest b/app-text/ps2pkm/Manifest
new file mode 100644
index 000000000000..a37c652f4a52
--- /dev/null
+++ b/app-text/ps2pkm/Manifest
@@ -0,0 +1,7 @@
+DIST texlive-20150521-source.tar.xz 45459552 BLAKE2B 639eaee7c9dd173e5ede9f157ccd9a9655ee55cabf232985915f10afa36dce618b8b78848e5d9853bf0f96f818d03d68fa17d8abcdc4d1a1349fe13dfe3a1ddc SHA512 9d06bb88c489715787ce619c4c6b5e2d4251e1db8d48ae7fe2d1a253634c76bc6d7282ef9c93c77847845cae01eafb58dfb37ba3fb83a6d223f0d7fe8f5d3855
+DIST texlive-20160523-source.tar.xz 45941100 BLAKE2B 8752212d41d6bbabc725d9b1dcc187dd4dbb34df4271c768e83c13a2dd4e7170aa162d01a15d87fa02bc1b5abee648a2d35e3aa1380569851cc21d6f33f2f109 SHA512 915fa2f5e2099dd385ef81033db7aafdf09558c0c200fed0748a8a42fd61f69d3eaac9decea334e30981af739dd81061a9b1d6853c7f6d00285fe0be40e26c3e
+DIST texlive-20170524-source.tar.xz 63483372 BLAKE2B 44669d1228f5be27e9d93672a4f4ead40f7f4c6cf386f2db6fef54d64f8b8a743a485fe1170904d8117b9745f71ec77db8434caa6cdd79359b1f3f387130a3b4 SHA512 18c18940992ab94ce22e22ccd4ad798253ea14ac2ab296a10ea5e9a8da9f33989f2e2641b42b564d1d5fb53bd371da3e68726b676d706b469016ad146cd19daa
+EBUILD ps2pkm-1.7_p20150521.ebuild 836 BLAKE2B 10e2fa2b739ab555770328f5e5cc25d9bd092b2a8efc7a519256eda0e056fe84d76a4a9d5f642e04e230639c0161b5f5814b524ecdc990f01fd3863ac6dfbbac SHA512 5007f586c9941ae159cbfdc49ebbd0da23f11b81731f5954ff79dcdff700764d15c555173c17b9d4bcfe82727eada7a0d07c98e19a62ce3e2933707c8557cb24
+EBUILD ps2pkm-1.8_p20160523.ebuild 848 BLAKE2B 7b28623873b847d71ff2f5f2f5bca7d68ab82b5cfd62e39c2f040cfd38b7895f3c6729b0544f6872d882539598aaffb233306bbcefe6dccd78897200d36b89f5 SHA512 829b0fa2979bc26a1198bc265b8e5977ccbf6edc2b9834f60ef504318d54c288bc54621f646e5f01313d12fbeee9d4223e9d8d7aae75635e24e3069f422a7659
+EBUILD ps2pkm-1.8_p20170524.ebuild 847 BLAKE2B 7cabd8c5204d7b19ec8ca22b6a421b7c62eeaf2798680c7460de26383c3bf469d71aef8701b5dd783081a09e8382bbc2d38cc150eb6b7fdba4585c5ae4d7b51f SHA512 e26e5f6f248f5efcb27fb6eba9b07274671448c3f9e3806e2b09fccf9165005fef8a8c18eb98a260081a263aec2cceb6ec2feeb6b209f647890bcab6d343491b
+MISC metadata.xml 358 BLAKE2B b5a2e9424ef1e5bb23c34e089d9204443dd5ad528b56db71d2fc2b3c5d428c14367805ca94a307f8856d21356abe76092c54ba0f0df204b5bce3665f9f3fd657 SHA512 51f6411780af5d7775f8f80d246d5f4e297abb1960a0b0c21c6dc5c03a9a407dad8cbc4977a679590cffb4523f1b72a0f7b15ab100c938391a5abfd3e17e8818
diff --git a/app-text/ps2pkm/metadata.xml b/app-text/ps2pkm/metadata.xml
new file mode 100644
index 000000000000..c4b55593420b
--- /dev/null
+++ b/app-text/ps2pkm/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>aballier@gentoo.org</email>
+		<name>Alexis Ballier</name>
+	</maintainer>
+<maintainer type="project">
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-text/ps2pkm/ps2pkm-1.7_p20150521.ebuild b/app-text/ps2pkm/ps2pkm-1.7_p20150521.ebuild
new file mode 100644
index 000000000000..7843327c3e7a
--- /dev/null
+++ b/app-text/ps2pkm/ps2pkm-1.7_p20150521.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="Tool that converts a PostScript type1 font into a corresponding TeX PK font"
+HOMEPAGE="http://tug.org/texlive/"
+SRC_URI="mirror://gentoo/texlive-${PV#*_p}-source.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ~mips ppc ppc64 ~s390 ~sh x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=">=dev-libs/kpathsea-6.2.1"
+RDEPEND="
+	!<app-text/texlive-core-2010
+	!app-text/ptex
+	${DEPEND}"
+DEPEND="${DEPEND}
+	virtual/pkgconfig"
+
+S=${WORKDIR}/texlive-${PV#*_p}-source/texk/ps2pk
+DOCS=( "ChangeLog" "CHANGES.type1" "README" "README.14m" "README.type1" )
+
+src_configure() {
+	econf --with-system-kpathsea
+}
diff --git a/app-text/ps2pkm/ps2pkm-1.8_p20160523.ebuild b/app-text/ps2pkm/ps2pkm-1.8_p20160523.ebuild
new file mode 100644
index 000000000000..b545997a4690
--- /dev/null
+++ b/app-text/ps2pkm/ps2pkm-1.8_p20160523.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="Tool that converts a PostScript type1 font into a corresponding TeX PK font"
+HOMEPAGE="http://tug.org/texlive/"
+SRC_URI="mirror://gentoo/texlive-${PV#*_p}-source.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+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=""
+
+DEPEND=">=dev-libs/kpathsea-6.2.1"
+RDEPEND="
+	!<app-text/texlive-core-2010
+	!app-text/ptex
+	${DEPEND}"
+DEPEND="${DEPEND}
+	virtual/pkgconfig"
+
+S=${WORKDIR}/texlive-${PV#*_p}-source/texk/ps2pk
+DOCS=( "ChangeLog" "CHANGES.type1" "README" "README.14m" "README.type1" )
+
+src_configure() {
+	econf --with-system-kpathsea
+}
diff --git a/app-text/ps2pkm/ps2pkm-1.8_p20170524.ebuild b/app-text/ps2pkm/ps2pkm-1.8_p20170524.ebuild
new file mode 100644
index 000000000000..4f7fe338493a
--- /dev/null
+++ b/app-text/ps2pkm/ps2pkm-1.8_p20170524.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="Tool that converts a PostScript type1 font into a corresponding TeX PK font"
+HOMEPAGE="http://tug.org/texlive/"
+SRC_URI="mirror://gentoo/texlive-${PV#*_p}-source.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+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=""
+
+DEPEND=">=dev-libs/kpathsea-6.2.1"
+RDEPEND="
+	!<app-text/texlive-core-2010
+	!app-text/ptex
+	${DEPEND}"
+DEPEND="${DEPEND}
+	virtual/pkgconfig"
+
+S=${WORKDIR}/texlive-${PV#*_p}-source/texk/ps2pk
+DOCS=( "ChangeLog" "CHANGES.type1" "README" "README.14m" "README.type1" )
+
+src_configure() {
+	econf --with-system-kpathsea
+}
diff --git a/app-text/psiconv-0.8.3-r1 b/app-text/psiconv-0.8.3-r1
deleted file mode 100644
index f296936b3ef8..000000000000
--- a/app-text/psiconv-0.8.3-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DESCRIPTION=An interpreter for Psion 5(MX) file formats
-EAPI=5
-HOMEPAGE=http://huizen.dds.nl/~frodol/psiconv
-IUSE=static-libs
-KEYWORDS=~alpha ~amd64 ~hppa ~mips ~ppc ~sparc ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://huizen.dds.nl/~frodol/psiconv/psiconv-0.8.3.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=0b0b8c87768a003448617090a5345a6b
diff --git a/app-text/psiconv/Manifest b/app-text/psiconv/Manifest
new file mode 100644
index 000000000000..dc6d3a193f5f
--- /dev/null
+++ b/app-text/psiconv/Manifest
@@ -0,0 +1,3 @@
+DIST psiconv-0.8.3.tar.gz 326460 BLAKE2B add1a863c706dfe00ddace65e7083924cd37766a7e17339d1626c6a65ba00bb72e6687a6e1409febf81efd5fb1f7937b60f83e8afcca67f3a47c40611118c82c SHA512 a48814f64fd2c3dda0dfa13c331d2d60ff8674ab7a56f51efcad29d3dd6874f4b94dc0a21ef3066b0fa605b18635ee151fbb4e3eeb06dab3854a329ed70348a9
+EBUILD psiconv-0.8.3-r1.ebuild 579 BLAKE2B 3975ca13de7d3483b84bda156d4af4e882d9e9027331ac2f5efc375ae5922b40809ce0e54077aae030d21ad9dedfa50201fb94265c5fad5fabea041eb1369d14 SHA512 9a03f74797245f144f8a1b81c463bca6a151132c349699bd95527524190eaaa0256fa8b105bec8914d0c2fb80cee8e2652b0c8971447678e78133f0f4a141b92
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/psiconv/metadata.xml b/app-text/psiconv/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-text/psiconv/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/app-text/psiconv/psiconv-0.8.3-r1.ebuild b/app-text/psiconv/psiconv-0.8.3-r1.ebuild
new file mode 100644
index 000000000000..004004aee641
--- /dev/null
+++ b/app-text/psiconv/psiconv-0.8.3-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit toolchain-funcs
+
+DESCRIPTION="An interpreter for Psion 5(MX) file formats"
+HOMEPAGE="http://huizen.dds.nl/~frodol/psiconv"
+SRC_URI="http://huizen.dds.nl/~frodol/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+IUSE="static-libs"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~sparc ~x86"
+
+src_prepare() {
+	tc-export AR
+}
+
+src_configure() {
+	econf $(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	use static-libs || rm -fr "${D}"usr/lib*/lib${PN}.la
+}
diff --git a/app-text/pspdftool-0.03 b/app-text/pspdftool-0.03
deleted file mode 100644
index b1a29d9bbe42..000000000000
--- a/app-text/pspdftool-0.03
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=zlib? ( sys-libs/zlib ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Tool for prepress preparation of PDF and PostScript documents
-EAPI=4
-HOMEPAGE=https://sourceforge.net/projects/pspdftool
-IUSE=zlib
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=zlib? ( sys-libs/zlib )
-SLOT=0
-SRC_URI=mirror://sourceforge/pspdftool/pspdftool-0.03.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=3fe7fe18102d637fead080f262946721
diff --git a/app-text/pspdftool-9999 b/app-text/pspdftool-9999
deleted file mode 100644
index fb314bf084e5..000000000000
--- a/app-text/pspdftool-9999
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure install preinst prepare unpack
-DEPEND=zlib? ( sys-libs/zlib ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 || ( dev-vcs/subversion[http] dev-vcs/subversion[webdav-neon] dev-vcs/subversion[webdav-serf] ) net-misc/rsync
-DESCRIPTION=Tool for prepress preparation of PDF and PostScript documents
-EAPI=4
-HOMEPAGE=https://sourceforge.net/projects/pspdftool
-IUSE=zlib
-LICENSE=GPL-2
-RDEPEND=zlib? ( sys-libs/zlib )
-SLOT=0
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	subversion	a5d5826a85609611f098c0553eb24cc1	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6dc198e9bcf423588ceb0ac9b289eb41
diff --git a/app-text/pspdftool/Manifest b/app-text/pspdftool/Manifest
new file mode 100644
index 000000000000..2e9763625b46
--- /dev/null
+++ b/app-text/pspdftool/Manifest
@@ -0,0 +1,4 @@
+DIST pspdftool-0.03.tar.bz2 129936 BLAKE2B 100ae29a9d929475d90c0acd6c5e50b61c65d690489ef223238bd19f567757635e0b0e774ff4561aa8e41476dd9a270ef8abafb307ad354e4f919b5ce578cf9c SHA512 8e621719c59f79f7201e8221a851e85d11573fa1895a64ab5e77382fa1103004f70a38f98928a8ce4b5795ce89ac3e4a7a5eade772959e26e49d6db9cc7fe7ea
+EBUILD pspdftool-0.03.ebuild 882 BLAKE2B 0e0793ed9090b7a2218ef8bdd9d1fc50aec0a8b062eb608e2a2742c81f967129d060bbb1eb4972ef64f894c8525c1204480e03a6bd56c3626382ecaadc8a4e92 SHA512 2555568da3e8feb2a0bf29384b67f5204eeb61dcf176d976f2c5f66718a1ab9c0f377d3ad0a89169fe8fb7cfec13864a02fb48a275e9a50299932f87dc52e28c
+EBUILD pspdftool-9999.ebuild 806 BLAKE2B 83accfdbff4beacbbebbf52f22749868028d38b75641dc3171059b025c35ad0ce3bfb613cf90b4dacbe38a5464e1980acfe712cdbb7eb76d2333e27a3892f9b2 SHA512 a0a04775997d3cd9cd460ceb49f96d34cd225590a6d9f39ad65a80d0c04212e31641d621ffffad3742bba70bc1bddabe9e9adbdabaec2ac45ef90718481e227a
+MISC metadata.xml 472 BLAKE2B 4d992ab0dcf156856d6db38578317e7ea01a23d092cbf67bf14095c52c7db59399ad652f868e4ae941ecb389d8ff78e43f0408e7929c56f36aa62f4cbae471a8 SHA512 1e2c1073495d42708c1f46a3698a55e3de6362fc1ed3ab2a5c76050733b14b0bb4cbedfbc8e12b4f283896587dae1f9c818f52e56a560e5c91a39a362ddbe813
diff --git a/app-text/pspdftool/metadata.xml b/app-text/pspdftool/metadata.xml
new file mode 100644
index 000000000000..fadc3f11108f
--- /dev/null
+++ b/app-text/pspdftool/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<longdescription lang="en">
+Pspdftool is a tool for preprinting preparation of documents. It supports PostScript and PDF files and allows users do several transformations (for example rotation, scale, miror ...) and pages selections.
+</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">pspdftool</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/pspdftool/pspdftool-0.03.ebuild b/app-text/pspdftool/pspdftool-0.03.ebuild
new file mode 100644
index 000000000000..5b6cbb7e2ecf
--- /dev/null
+++ b/app-text/pspdftool/pspdftool-0.03.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+ESVN_REPO_URI="https://svn.code.sf.net/p/pspdftool/code/trunk"
+ESVN_PROJECT="pspdftool"
+
+[[ "${PV}" == "9999" ]] && EXTRA_ECLASS="subversion"
+inherit autotools ${EXTRA_ECLASS}
+unset EXTRA_ECLASS
+
+DESCRIPTION="Tool for prepress preparation of PDF and PostScript documents"
+HOMEPAGE="https://sourceforge.net/projects/pspdftool"
+[[ "${PV}" == "9999" ]] || SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
+[[ "${PV}" == "9999" ]] || \
+KEYWORDS="~amd64 ~x86"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="zlib"
+
+DEPEND="zlib? ( sys-libs/zlib ) "
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_with zlib)
+}
+
+src_install() {
+	default
+	rm -rf "${ED}"/usr/share/doc/${PN}*
+}
diff --git a/app-text/pspdftool/pspdftool-9999.ebuild b/app-text/pspdftool/pspdftool-9999.ebuild
new file mode 100644
index 000000000000..96932275aac6
--- /dev/null
+++ b/app-text/pspdftool/pspdftool-9999.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+ESVN_REPO_URI="https://svn.code.sf.net/p/pspdftool/code/trunk"
+ESVN_PROJECT="pspdftool"
+
+[[ "${PV}" == "9999" ]] && EXTRA_ECLASS="subversion"
+inherit autotools ${EXTRA_ECLASS}
+unset EXTRA_ECLASS
+
+DESCRIPTION="Tool for prepress preparation of PDF and PostScript documents"
+HOMEPAGE="https://sourceforge.net/projects/pspdftool"
+[[ "${PV}" == "9999" ]] || SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+[[ "${PV}" == "9999" ]] || \
+KEYWORDS="~amd64 ~x86"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="zlib"
+
+DEPEND="zlib? ( sys-libs/zlib ) "
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_with zlib)
+}
+
+src_install() {
+	default
+	rm -rf "${ED}"/usr/share/doc/${PN}*
+}
diff --git a/app-text/pspresent-1.3-r1 b/app-text/pspresent-1.3-r1
deleted file mode 100644
index 82770ef21199..000000000000
--- a/app-text/pspresent-1.3-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=x11-libs/libX11 xinerama? ( x11-libs/libXinerama ) app-text/ghostscript-gpl x11-base/xorg-proto
-DESCRIPTION=A tool to display full-screen PostScript presentations
-EAPI=6
-HOMEPAGE=http://www.cse.unsw.edu.au/~matthewc/pspresent/
-IUSE=xinerama
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/libX11 xinerama? ( x11-libs/libXinerama ) app-text/ghostscript-gpl
-SLOT=0
-SRC_URI=http://www.cse.unsw.edu.au/~matthewc/pspresent/pspresent-1.3.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=fc0353b614822ca0409c1274193ae1b2
diff --git a/app-text/pspresent/Manifest b/app-text/pspresent/Manifest
new file mode 100644
index 000000000000..c69f5cef37c9
--- /dev/null
+++ b/app-text/pspresent/Manifest
@@ -0,0 +1,3 @@
+DIST pspresent-1.3.tar.gz 14357 BLAKE2B b15f288f2446ef0a9a00bcf454d9e55fc60a0547c534f0015695c6d2b23c5bd779acd2b423b01f6cd019cff419cdc79da8f8575804440c3f70bbeb29e5fa1b32 SHA512 cfca0b4758d03051cea95d077a45239103f6fd24dada775c3b7fb0b7f78863f6628b530a21834546546dc935596b6d93dbe45048a661fcc41152a4b97b8f21f3
+EBUILD pspresent-1.3-r1.ebuild 861 BLAKE2B b0cd66024af91d76c1862eb7bf99afb7c7eff7115e6c2394aa51d48b905db07ef3d640d0085a74f37518f96a27975154f3f55f424105d06eb55d4a75454f4073 SHA512 fe62aa87d4b7acf113991fed91a39c12a2192c1e0d2dcaffe06b3d64ae546be7dbdcb4b71f72bea89e76cf38e78dad2111163eae7b2bf6df020ca770a31899bb
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/pspresent/metadata.xml b/app-text/pspresent/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-text/pspresent/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/app-text/pspresent/pspresent-1.3-r1.ebuild b/app-text/pspresent/pspresent-1.3-r1.ebuild
new file mode 100644
index 000000000000..20931af5b1d4
--- /dev/null
+++ b/app-text/pspresent/pspresent-1.3-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="A tool to display full-screen PostScript presentations"
+SRC_URI="http://www.cse.unsw.edu.au/~matthewc/pspresent/${P}.tar.gz"
+HOMEPAGE="http://www.cse.unsw.edu.au/~matthewc/pspresent/"
+SLOT="0"
+LICENSE="GPL-2"
+
+IUSE="xinerama"
+KEYWORDS="amd64 ppc x86"
+
+RDEPEND="x11-libs/libX11
+	xinerama? ( x11-libs/libXinerama )
+	app-text/ghostscript-gpl"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+
+src_prepare() {
+	default
+	if ! use xinerama ; then
+		sed -i -e "/^XINERAMA/s/^/#/g" Makefile || die "sed Makefile"
+	fi
+	sed -i Makefile \
+		-e 's|= -Wall -O2|+= -Wall|g' \
+		-e 's| -o | $(LDFLAGS)&|g' \
+		|| die "sed Makefile"
+}
+
+src_compile() {
+	emake CC=$(tc-getCC)
+}
+
+src_install() {
+	dobin pspresent
+	doman pspresent.1
+}
diff --git a/app-text/pstotext-1.9-r4 b/app-text/pstotext-1.9-r4
deleted file mode 100644
index 1c9e6d0bf7b6..000000000000
--- a/app-text/pstotext-1.9-r4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=app-arch/ncompress
-DESCRIPTION=Extract ASCII text from a PostScript or PDF file
-EAPI=6
-HOMEPAGE=http://www.cs.wisc.edu/~ghost/doc/pstotext.htm
-KEYWORDS=amd64 hppa ppc ppc64 x86
-LICENSE=PSTT
-RDEPEND=app-text/ghostscript-gpl
-SLOT=0
-SRC_URI=ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/contrib/pstotext-1.9.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=328cc778953523ea56c9627e0ec9be60
diff --git a/app-text/pstotext/Manifest b/app-text/pstotext/Manifest
new file mode 100644
index 000000000000..81162f9b85bd
--- /dev/null
+++ b/app-text/pstotext/Manifest
@@ -0,0 +1,5 @@
+AUX 1.9-flags.patch 775 BLAKE2B 32634da1338504c985a71dd58a6c5a09e03f07063c4540647e155a3d9f4b17fdc2a2d2a6db39f698c9bb7442b525ba876e7a951ad95e908e6a457699847f583f SHA512 4933522482e76eb9a220da6baf74722318e1b3c818515560f58a2d448b66a5236450c96171e89c8fa899c4e4904fcbde8457e87accbde0b6275c7154e1e9e462
+AUX pstotext-1.9-quote-chars-fix.patch 3491 BLAKE2B 81f284386683222fb8c95f0b2677d05134e578486932b09511ba9fd685ade1b02db1a6c1e60dd90502e558f5ff5bc3a8eefa577c8cc620a89f5a97215e9aaea2 SHA512 c6ffabaf5b5f7261e79e43d0083543b0428cde0d62c1b9e9513905d03dd5174a1ee1a537dfa8d906b7422cc6c9e5606fc7dc6f177d11441fd028355e99c2c4a6
+DIST pstotext-1.9.tar.gz 37461 BLAKE2B ff0c816ff0f57882e6fb36df9a2ba02049526cc0d5a0996e47c32f98a3d3208ca35f59c84605e75c787b80b3a0d8db498afbd4d28e2095be8abd979ecaa6bc22 SHA512 a8148e94d635544a7dfa8c96ff6071717388e4dc6c3db36f2c50939dce96c1f824ee423b1622af9111fffc60cb298215a6ee85d956c81873d71ceac804ee48ca
+EBUILD pstotext-1.9-r4.ebuild 659 BLAKE2B 0d75710e224caeb41c97a6a3fcd43c1c11e768a801f152b83742f3e80097e2eb37ce3007afba5938775c8a8e95d174c34d94d93f0f446fed9400d55f8e3b91c2 SHA512 a4654692a85c847ae918547e22ea2837b8ca78a156528fdf485ade26c9d8ce84c7a04a07fac1b4b018955126f3dc514a4590ad00d5d897bb62708ff1002234db
+MISC metadata.xml 249 BLAKE2B 1b34ce77c092c0664a18f32525d158d41bf36ab7ab7a4b9d01ed37e1e3dda3d58849d5b1375065c4e5591f6b09b2a93e88a624d399c495a0b1125edb30ec172f SHA512 895325641a176c848988fb5f36cdb567b584d22f6e778b3de674de480cbca30b7cf8f12ecbbe1173a63e3229889e1e0f5efd5afea4f0d4c429ac236598f80f1e
diff --git a/app-text/pstotext/files/1.9-flags.patch b/app-text/pstotext/files/1.9-flags.patch
new file mode 100644
index 000000000000..6f3c9b68d82c
--- /dev/null
+++ b/app-text/pstotext/files/1.9-flags.patch
@@ -0,0 +1,36 @@
+diff --git a/Makefile b/Makefile
+index 551e3b8..1d55ebe 100644
+--- a/Makefile
++++ b/Makefile
+@@ -9,7 +9,7 @@
+ # commenting out the includes of ptotdll.h in ptotdll.c and main.c.
+ # PMcJ 6 Sep 96
+ 
+-CC=gcc
++CC ?= gcc
+ #CC=cc -std
+ 
+ BUNDLE = ocr.h rot270.h rot90.h
+@@ -17,18 +17,18 @@ BUNDLE = ocr.h rot270.h rot90.h
+ all:	pstotext
+ 
+ main.o: main.c ptotdll.h bundle.h ocr.h rot270.h rot90.h
+-	$(CC) -c $*.c
++	$(CC) $(CFLAGS) -c $*.c
+ 
+ ptotdll.o: ptotdll.c ptotdll.h
+-	$(CC) -c $*.c
++	$(CC) $(CFLAGS) -c $*.c
+ 
+ pstotext: bundle.o main.o ptotdll.o
+-	$(CC) -o pstotext main.o bundle.o ptotdll.o -lm
++	$(CC) $(CFLAGS) $(LDFLAGS) -o pstotext main.o bundle.o ptotdll.o -lm
+ 
+ .SUFFIXES: .ps
+ 
+ .c.o:
+-	$(CC) -c $*.c
++	$(CC) $(CFLAGS) -c $*.c
+ 
+ # "Bundle" an Ascii file.
+ .ps.h:
diff --git a/app-text/pstotext/files/pstotext-1.9-quote-chars-fix.patch b/app-text/pstotext/files/pstotext-1.9-quote-chars-fix.patch
new file mode 100644
index 000000000000..177d3726e659
--- /dev/null
+++ b/app-text/pstotext/files/pstotext-1.9-quote-chars-fix.patch
@@ -0,0 +1,136 @@
+diff -urN pstotext-1.9.orig/main.c pstotext-1.9/main.c
+--- pstotext-1.9.orig/main.c	2004-01-09 11:17:38.000000000 +0100
++++ pstotext-1.9/main.c	2006-05-19 11:43:52.000000000 +0200
+@@ -126,12 +126,14 @@
+ static int cleanup(void) {
+   int gsstatus, status = 0;
+   pstotextExit(instance);
+-  if (gs!=NULL) {
+ #ifdef VMS
++  if (gs!=NULL) {
+     gsstatus = fclose(gs);
++  }
+ #else
+-    gsstatus = pclose(gs);
++  waitpid(-1, &gsstatus, 0);
+ #endif
++  if (gsstatus) {
+     if (WIFEXITED(gsstatus)) {
+       if (WEXITSTATUS(gsstatus)!=0) status = 3;
+       else if (WIFSIGNALED(gsstatus)) status = 4;
+@@ -166,8 +168,13 @@
+ 
+ static int do_it(char *path) {
+   /* If "path" is NULL, then "stdin" should be processed. */
+-  char *gs_cmdline;
+-  char *input;
++  char *gs_argv[32];
++  int gs_argc=0;
++#ifdef DEBUG
++  int i;
++#endif
++  int fd[2];
++  pid_t p;
+   int status;
+   char norotate[] = "";
+   FILE *fileout;
+@@ -201,47 +208,31 @@
+     exit(1);
+   }
+ 
+-  if (path==NULL) {
+-    input = (char*)malloc(2);
+-    if (input == NULL) {
+-      fprintf(stderr,"No memory available\n");
+-      cleanup();
+-      exit(1);
+-    }
+-    strcpy(input, "-");
+-  } else {
+-    input = (char*)malloc(strlen(path) + 6);
+-    if (input == NULL) {
+-      fprintf(stderr,"No memory available\n");
+-      cleanup();
+-      exit(1);
+-    }
+-    strcpy(input, "-- '"); strcat(input, path); strcat(input, "'");
++  gs_argv[gs_argc++] = "gs";
++  gs_argv[gs_argc++] = "-r72";
++  gs_argv[gs_argc++] = "-dNODISPLAY";
++  gs_argv[gs_argc++] = "-dFIXEDMEDIA";
++  gs_argv[gs_argc++] = "-dDELAYBIND";
++  gs_argv[gs_argc++] = "-dWRITESYSTEMDICT";
++  if (!debug) {
++    gs_argv[gs_argc++] = "-q";
++  }
++  gs_argv[gs_argc++] = "-dNOPAUSE";
++  gs_argv[gs_argc++] = "-dSAFER";
++  if (rotate_path && strcmp(rotate_path, "")) {
++    gs_argv[gs_argc++] = rotate_path;
++  }
++  if (ocr_path && strcmp(ocr_path, "")) {
++    gs_argv[gs_argc++] = ocr_path;
++  }
++  if (path == NULL ) {
++    gs_argv[gs_argc++] = "-";
++  }
++  else {
++    gs_argv[gs_argc++] = "--";
++    gs_argv[gs_argc++] = path;
+   }
+-
+-  gs_cmdline = (char*)malloc(strlen(gs_cmd)+strlen(rotate_path)+
+-	strlen(ocr_path) + strlen(input) + 128);
+-
+-  if (gs_cmdline == NULL) {
+-    fprintf(stderr, "No memory available\n");
+-    cleanup();
+-    exit(1);
+-  }
+-
+-  sprintf(
+-    gs_cmdline,
+-#ifdef VMS
+-    "%s -r72 \"-dNODISPLAY\" \"-dFIXEDMEDIA\" \"-dDELAYBIND\" \"-dWRITESYSTEMDICT\" %s \"-dNOPAUSE\" %s %s %s",
+-#else
+-    "%s -r72 -dNODISPLAY -dFIXEDMEDIA -dDELAYBIND -dWRITESYSTEMDICT %s -dNOPAUSE %s %s %s",
+-#endif
+-    gs_cmd,
+-    (debug ? "" : "-q"),
+-    rotate_path,
+-    ocr_path,
+-    input
+-    );
+-  if (debug) fprintf(stderr, "%s\n", gs_cmdline);
++  gs_argv[gs_argc++] = NULL;
+ #ifdef VMS
+   cmdfile = tempnam("SYS$SCRATCH:","PS2TGS");
+   gsoutfile = tempnam("SYS$SCRATCH:","GSRES");
+@@ -259,8 +250,25 @@
+ 	exit(1);
+   }
+ #else
+-  gs = popen(gs_cmdline, "r");
+-  if (gs==0) {perror(cmd); exit(1);}
++  if (pipe(fd)) {
++	perror("pipe failed: "); exit(1);
++  };
++  p = fork();
++  if (p == -1) {
++	perror("fork failed: "); exit(1);
++  }
++  if (p == 0) { /* child */
++    close(fd[0]);
++    dup2(fd[1], 1); /* Redirect stdout into pipe to parent */
++    execvp("/usr/bin/gs", gs_argv);
++    perror("execvp: "); status=cleanup(); exit(1);
++  } else { /* parent */
++    close(fd[1]);
++    gs = fdopen(fd[0], "r");
++    if (gs == NULL) {
++      perror("fdopen: "); status=cleanup(); exit(1);
++    }
++  }
+ #endif
+   status = pstotextInit(&instance);
+   if (status!=0) {
diff --git a/app-text/pstotext/metadata.xml b/app-text/pstotext/metadata.xml
new file mode 100644
index 000000000000..7b4a61aab741
--- /dev/null
+++ b/app-text/pstotext/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-text/pstotext/pstotext-1.9-r4.ebuild b/app-text/pstotext/pstotext-1.9-r4.ebuild
new file mode 100644
index 000000000000..f08483acb74d
--- /dev/null
+++ b/app-text/pstotext/pstotext-1.9-r4.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Extract ASCII text from a PostScript or PDF file"
+HOMEPAGE="http://www.cs.wisc.edu/~ghost/doc/pstotext.htm"
+SRC_URI="ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/contrib/${P}.tar.gz"
+
+LICENSE="PSTT"
+SLOT="0"
+KEYWORDS="amd64 hppa ppc ppc64 x86"
+IUSE=""
+
+DEPEND="app-arch/ncompress"
+RDEPEND="app-text/ghostscript-gpl"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-quote-chars-fix.patch
+	"${FILESDIR}"/${PV}-flags.patch
+)
+
+src_prepare() {
+	default
+	tc-export CC
+}
+
+src_install () {
+	dobin pstotext
+	doman pstotext.1
+}
diff --git a/app-text/psutils-1.17-r3 b/app-text/psutils-1.17-r3
deleted file mode 100644
index c715486e6f23..000000000000
--- a/app-text/psutils-1.17-r3
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=dev-lang/perl
-DESCRIPTION=PostScript Utilities
-EAPI=6
-HOMEPAGE=http://web.archive.org/web/20110722005140/http://www.tardis.ed.ac.uk/~ajcd/psutils/
-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
-LICENSE=psutils
-SLOT=0
-SRC_URI=mirror://debian/pool/main/p/psutils/psutils_1.17.dfsg.orig.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=576ca65d9a1d6d3c0c21adbdec04eba0
diff --git a/app-text/psutils/Manifest b/app-text/psutils/Manifest
new file mode 100644
index 000000000000..b017afac520d
--- /dev/null
+++ b/app-text/psutils/Manifest
@@ -0,0 +1,5 @@
+AUX psutils-1.17-ldflags.patch 1417 BLAKE2B fa54e0f8cab31336dbe95db96313e345e9cd3a03f2c92855c5bc5fbc4054e89193ade6b346f52edf61f58f20330dacc8d7df32a5ec1769ed7ff62b4eacb36368 SHA512 179b1551516a8acc9f4f9859b4bbe06a6d6e2ba0ddfe20c147a143e6795d61d9cb4f55107866d7a891f0be0dbebaf11d836f4c129205da44ba561a133d69ab08
+AUX psutils-1.17-no-fixmacps.patch 1176 BLAKE2B fdf9653e881e05340445560ba5cb3303bc42e46a1605ee19d675023174aa7bf73d9b4cc37ba3bbafee9b3829974981ff58284acf7079f9b2a3fedbac9d28b2af SHA512 707ebb4594b341044e27cd3fb35402b4d3144eb52f9baffcc633dbde69b53717da148b6c03074411cb95dcf50b48ba87df4ad6c2ec3b24f37b0951c40012efdc
+DIST psutils_1.17.dfsg.orig.tar.gz 40296 BLAKE2B c74cde600e841e876892f3c0cfd20ab5d1ed87135e0bc952b19baf90315b95f89bf177b66deeeb91862fc2c620f688ba49972673bf9f4b4ff250590f0b2fc848 SHA512 a4ee49ecea9a948c0cfb8b51d10471409ec461a07bb94c1158c64e433f02ede4770fcb961d6ec79088bf247176db9757389d3e1cf5b64246b3b90b5584b59ff3
+EBUILD psutils-1.17-r3.ebuild 999 BLAKE2B 283c673f8eed7948d71baa0a16af860cbb93c97bebf63519a44f9c8aee340a14b8153718aa91f60d5d02f64c1d9971c61af718b93e2939f56b7154c11ee14d87 SHA512 78143446eabfdfb5400e80ad6576086918259a68987627f036d6f557208369746087020ce5d1ccd613f17060045fd57bf10e11626e34364dc6835380cb75dca9
+MISC metadata.xml 245 BLAKE2B ee3a163cfe0a4bc59c0dfb46f9ddb580e2d259b4d0e33cb4e684eb9e6d4b901bf97c6edd891f3b75a613a782f1b89318d0ee3ec9bee4e34c4441d9e8f4267678 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690
diff --git a/app-text/psutils/files/psutils-1.17-ldflags.patch b/app-text/psutils/files/psutils-1.17-ldflags.patch
new file mode 100644
index 000000000000..124768062a43
--- /dev/null
+++ b/app-text/psutils/files/psutils-1.17-ldflags.patch
@@ -0,0 +1,44 @@
+Index: psutils/Makefile.unix
+===================================================================
+--- psutils.orig/Makefile.unix
++++ psutils/Makefile.unix
+@@ -39,7 +39,7 @@ MANEXT = 1
+ MANDIR = /usr/local/share/man/man$(MANEXT)
+ 
+ CC = gcc
+-CFLAGS = -DPAPER=\"$(PAPER)\" -DUNIX -O -Wall
++CFLAGS += -DPAPER=\"$(PAPER)\" -DUNIX -Wall
+ 
+ BIN = psbook psselect pstops epsffit psnup \
+ 	psresize
+@@ -65,30 +65,24 @@ pserror.o: psutil.h patchlev.h pserror.h
+ epsffit.o: epsffit.c pserror.h patchlev.h
+ 
+ epsffit: epsffit.o pserror.o
+-	$(CC) $(CCFLAGS) -o epsffit pserror.o epsffit.o
+ 
+ psnup: psnup.o psutil.o psspec.o pserror.o
+-	$(CC) $(CCFLAGS) -o psnup psutil.o psspec.o pserror.o psnup.o
+ 
+ psnup.o: psutil.h patchlev.h psspec.h pserror.h psnup.c
+ 
+ psresize: psresize.o psutil.o pserror.o psspec.o
+-	$(CC) $(CCFLAGS) -o psresize psutil.o psspec.o pserror.o psresize.o
+ 
+ psresize.o: psutil.h patchlev.h psspec.h pserror.h psresize.c
+ 
+ psbook: psbook.o psutil.o pserror.o
+-	$(CC) $(CCFLAGS) -o psbook psutil.o pserror.o psbook.o
+ 
+ psbook.o: psutil.h patchlev.h pserror.h psbook.c
+ 
+ psselect: psselect.o psutil.o pserror.o
+-	$(CC) $(CCFLAGS) -o psselect psutil.o pserror.o psselect.o
+ 
+ psselect.o: psutil.h patchlev.h pserror.h psselect.c
+ 
+ pstops: pstops.o psutil.o psspec.o pserror.o
+-	$(CC) $(CCFLAGS) -o pstops psutil.o psspec.o pserror.o pstops.o
+ 
+ pstops.o: psutil.h patchlev.h psspec.h pserror.h pstops.c
+ 
diff --git a/app-text/psutils/files/psutils-1.17-no-fixmacps.patch b/app-text/psutils/files/psutils-1.17-no-fixmacps.patch
new file mode 100644
index 000000000000..16a3c13484a2
--- /dev/null
+++ b/app-text/psutils/files/psutils-1.17-no-fixmacps.patch
@@ -0,0 +1,26 @@
+Files md68_0.ps md71_0.ps have unknown copyright and license and are
+therefore not included in the "DFSG" tarball. Suppress these files
+(and the fixmacps program that references them) in Makefile.
+https://bugs.gentoo.org/show_bug.cgi?id=440938
+
+--- psutils-1.17.orig/Makefile.unix
++++ psutils/Makefile.unix
+@@ -44,15 +44,15 @@
+ BIN = psbook psselect pstops epsffit psnup \
+ 	psresize
+ SHELLSCRIPTS = getafm showchar
+-PERLSCRIPTS = fixfmps fixmacps fixpsditps fixpspps \
++PERLSCRIPTS = fixfmps fixpsditps fixpspps \
+ 	fixtpps fixwfwps fixwpps fixscribeps fixwwps \
+ 	fixdlsrps extractres includeres psmerge
+ MANPAGES = psbook.$(MANEXT) psselect.$(MANEXT) pstops.$(MANEXT) epsffit.$(MANEXT) psnup.$(MANEXT) \
+ 	psresize.$(MANEXT) psmerge.$(MANEXT) fixscribeps.$(MANEXT) getafm.$(MANEXT) \
+-	fixdlsrps.$(MANEXT) fixfmps.$(MANEXT) fixmacps.$(MANEXT) fixpsditps.$(MANEXT) \
++	fixdlsrps.$(MANEXT) fixfmps.$(MANEXT) fixpsditps.$(MANEXT) \
+ 	fixpspps.$(MANEXT) fixtpps.$(MANEXT) fixwfwps.$(MANEXT) fixwpps.$(MANEXT) \
+ 	fixwwps.$(MANEXT) extractres.$(MANEXT) includeres.$(MANEXT)
+-INCLUDES = md68_0.ps md71_0.ps
++INCLUDES =
+ 
+ all: $(BIN) $(PERLSCRIPTS) $(MANPAGES) $(SHELLSCRIPTS)
+ 
diff --git a/app-text/psutils/metadata.xml b/app-text/psutils/metadata.xml
new file mode 100644
index 000000000000..13170c3184d8
--- /dev/null
+++ b/app-text/psutils/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>tex@gentoo.org</email>
+	<name>Gentoo TeX Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-text/psutils/psutils-1.17-r3.ebuild b/app-text/psutils/psutils-1.17-r3.ebuild
new file mode 100644
index 000000000000..551a8ecd7021
--- /dev/null
+++ b/app-text/psutils/psutils-1.17-r3.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="PostScript Utilities"
+HOMEPAGE="http://web.archive.org/web/20110722005140/http://www.tardis.ed.ac.uk/~ajcd/psutils/"
+SRC_URI="mirror://debian/pool/main/p/${PN}/${PN}_${PV}.dfsg.orig.tar.gz"
+
+LICENSE="psutils"
+SLOT="0"
+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=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-lang/perl"
+
+S="${WORKDIR}/${P}.orig"
+
+src_prepare() {
+	eapply "${FILESDIR}/${P}-ldflags.patch"
+	eapply "${FILESDIR}/${P}-no-fixmacps.patch"
+	sed \
+		-e "s:/usr/local:\$(DESTDIR)${EPREFIX}/usr:" \
+		"${S}/Makefile.unix" > "${S}/Makefile"
+	default
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
+
+src_install () {
+	dodir /usr/{bin,share/man}
+	emake DESTDIR="${D}" install
+	dodoc README
+}
diff --git a/app-text/pybookreader-0.5.0-r1 b/app-text/pybookreader-0.5.0-r1
deleted file mode 100644
index 39c2851222f9..000000000000
--- a/app-text/pybookreader-0.5.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/libxml2[python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=A book reader for .fb2 .html and plain text (possibly gzipped)
-EAPI=5
-HOMEPAGE=http://pybookreader.narod.ru/
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/libxml2[python,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://sourceforge/pybookreader/PyBookReader-0.5.0.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ad0cc85134f542c95594c827f66201e7
diff --git a/app-text/pybookreader/Manifest b/app-text/pybookreader/Manifest
new file mode 100644
index 000000000000..18147158a7e9
--- /dev/null
+++ b/app-text/pybookreader/Manifest
@@ -0,0 +1,3 @@
+DIST PyBookReader-0.5.0.tar.gz 285488 BLAKE2B 70f2a5c52e2310fa87c9a1e07d0ef4877ec6448ee288162994b037c4373c269206505d2b2f49b61727650ea251283dcac62bb53ca659cf2fd1c0b9374b534124 SHA512 0eb3b71b58c62706ac6cca70150d28071a0a24e02ae2949a8a26c02f5d060effec941d97ad3c5e4fc5a47fb222c315a91258ef31360e2f164f85b6728e6e239d
+EBUILD pybookreader-0.5.0-r1.ebuild 554 BLAKE2B 0fc67237388ae6ec5c6d356021e655ee37ffaa7b6f7b595ed09fa03f9fa8b66f984f91caa99446ca70a65a8dde555899f284950062cc6c512cb21b0aa6206169 SHA512 0f4e01a5c5aa89f29b171fc13a45047f541204cebcb8bf06066eba16a6cc875e95c3dcb2af2a7c7680f83b3a87ffe3b315a544785c6bc526191125e18618a017
+MISC metadata.xml 427 BLAKE2B e3495bd873b17e863a2b55c6a45b9e316c1e39c90a5923f9718c05105f2e0997ac0935d4ff5a54d53e7c65ea9ad77752fda7e808a119023d222c009391bb9efb SHA512 39174d33ba3c17a9599c8c57d70690c4dece94eb56eb2ff70462a00990af31714c43210286a8058019fe5e8c854d7cf690eb71c2970f9b8b3e60eaaed5e31fdb
diff --git a/app-text/pybookreader/metadata.xml b/app-text/pybookreader/metadata.xml
new file mode 100644
index 000000000000..87f48c530938
--- /dev/null
+++ b/app-text/pybookreader/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>grozin@gentoo.org</email>
+		<name>Andrey Grozin</name>
+	</maintainer>
+	<longdescription>A book reader for .fb2 .html and plain text (possibly gzipped)</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">pybookreader</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/pybookreader/pybookreader-0.5.0-r1.ebuild b/app-text/pybookreader/pybookreader-0.5.0-r1.ebuild
new file mode 100644
index 000000000000..0164ae4eb511
--- /dev/null
+++ b/app-text/pybookreader/pybookreader-0.5.0-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+MY_P="PyBookReader-${PV}"
+
+DESCRIPTION="A book reader for .fb2 .html and plain text (possibly gzipped)"
+HOMEPAGE="http://pybookreader.narod.ru/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/pygtk[${PYTHON_USEDEP}]
+	dev-libs/libxml2[python,${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/app-text/pylize-1.3b-r1 b/app-text/pylize-1.3b-r1
deleted file mode 100644
index 8e08364e032d..000000000000
--- a/app-text/pylize-1.3b-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-python/empy[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
-DESCRIPTION=Python HTML Slideshow Generator using HTML and CSS
-EAPI=5
-HOMEPAGE=http://www.chrisarndt.de/en/software/pylize/
-IUSE=doc python_targets_python2_7
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=dev-python/empy[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)]
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=http://www.chrisarndt.de/en/software/pylize/download/pylize-1.3b.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=02671d1deab59d8a88e5c9767cf72494
diff --git a/app-text/pylize/Manifest b/app-text/pylize/Manifest
new file mode 100644
index 000000000000..a7b90d4c96f6
--- /dev/null
+++ b/app-text/pylize/Manifest
@@ -0,0 +1,4 @@
+AUX pylize-pillow.patch 375 BLAKE2B 9aaf388fc67d03d9af957a1aee350891ded225b0f0def122120d23e7cb1981fe70a8ba7169806a94de913ddea4d8019687ac3088b2e0b318451dc423e6eb75e6 SHA512 5e6beeb1a0192328039d581eeaf568e606a1fa002f8d91ddb397e27d873e23834fda67cd88a5afb24563a515cb37c234ed2d8c913472ce9fccd431249be852dc
+DIST pylize-1.3b.tar.bz2 70979 BLAKE2B 3b90d60ef7c314e6f7683ebdfa4d518b64ebbfe3bbe39148409d50c41577c7850304eb11e588f99e9c22d550548cf81f5f93265624200395e7abe7557d738a0e SHA512 271be57bdebb605566a7ee0340d34247f8ede4df7ba729c85c23f6df1ca24cadb25c870cce5b1ac35544205d90e716742cd31e150b9a8f98b2dcfae441a76454
+EBUILD pylize-1.3b-r1.ebuild 1029 BLAKE2B e664ef860482affaa8dbc45dd862263a090ce90fbf133bc30436ad1c173c045383761fe4c007cae861b79a313ab8538c6e2bf05e937686e8e71e6bcee10afecd SHA512 dada782c5b6a0f6d146d20ad26ddbaef46cd7476c8c5fa5143904855178676fbe028a22ef01c213af2ae052c7c8b6e227ed506a49dbb8f4e3931708264346fe2
+MISC metadata.xml 547 BLAKE2B d6d76c0357be91f51c01a0d0031c2a221e27dcdb65b300bd63bd614bd5fd29ea000903ed7206167ef3055b1da85297319a4d5517a0f80077ae2a0d072124afd1 SHA512 bf43543c0b0c4f90940d0a5b40c342d9151673418994e074421e723ed8242fa742cc06b93cf846bf8b860b997faa68b4f0f978d274434bb33b77c3e9cddec435
diff --git a/app-text/pylize/files/pylize-pillow.patch b/app-text/pylize/files/pylize-pillow.patch
new file mode 100644
index 000000000000..0b454b0b1712
--- /dev/null
+++ b/app-text/pylize/files/pylize-pillow.patch
@@ -0,0 +1,13 @@
+Change PIL imports for Pillow compat
+https://bugs.gentoo.org/show_bug.cgi?id=471502
+--- a/pylize.in
++++ b/pylize.in
+@@ -113,7 +113,7 @@
+ def mkLogoLink(meta):
+     if meta.has_key('logo'):
+         try:
+-            import Image
++            from PIL import Image
+             if os.path.exists(meta['logo']):
+                 i = Image.open(meta['logo'])
+             else:
diff --git a/app-text/pylize/metadata.xml b/app-text/pylize/metadata.xml
new file mode 100644
index 000000000000..cd617926fcf3
--- /dev/null
+++ b/app-text/pylize/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <!-- maintainer-needed -->
+  <longdescription>
+pylize is a Python script that generates a set of HTML files that
+make up an on-screen presentation from a master file. The HTML files
+can be viewed with any CSS-aware browser. The master file contains
+the text for all the slides and some additional information like
+title, author etc. pylize can also create a template master file for
+you
+</longdescription>
+</pkgmetadata>
diff --git a/app-text/pylize/pylize-1.3b-r1.ebuild b/app-text/pylize/pylize-1.3b-r1.ebuild
new file mode 100644
index 000000000000..a82f173bad45
--- /dev/null
+++ b/app-text/pylize/pylize-1.3b-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit distutils-r1
+
+DESCRIPTION="Python HTML Slideshow Generator using HTML and CSS"
+HOMEPAGE="http://www.chrisarndt.de/en/software/pylize/"
+SRC_URI="http://www.chrisarndt.de/en/software/pylize/download/${P}.tar.bz2"
+
+IUSE="doc"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+
+DEPEND="dev-python/empy[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-pillow.patch" )
+
+python_configure() {
+	set -- "${PYTHON}" configure.py
+	echo "$@"
+	"$@" || die
+}
+
+python_compile_all() {
+	if use doc; then
+		emake -C doc PYTHON="${PYTHON}" PYLIZE="../pylize" || die
+	fi
+}
+
+python_install() {
+	distutils-r1_python_install
+	python_optimize "${ED%/}/usr/share/pylize"
+}
+
+python_install_all() {
+	local DOCS=( Changelog README README.empy TODO )
+	use doc && local HTML_DOCS=( doc/. )
+	distutils-r1_python_install_all
+}
diff --git a/app-text/pytextile-2.1.8 b/app-text/pytextile-2.1.8
deleted file mode 100644
index 3e15a5c76e9e..000000000000
--- a/app-text/pytextile-2.1.8
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] test? ( dev-python/nose[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-DESCRIPTION=A Python port of Textile, A humane web text generator
-EAPI=5
-HOMEPAGE=https://github.com/ikirudennis/python-textile
-IUSE=test python_targets_pypy python_targets_python2_7 python_targets_python3_4
-KEYWORDS=amd64 ppc ppc64 sparc x86 ~x86-fbsd
-LICENSE=BSD
-RDEPEND=python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 )
-SLOT=0
-SRC_URI=mirror://pypi/t/textile/textile-2.1.8.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9708e32e671759a49dc8a192478564b5
diff --git a/app-text/pytextile-2.3.3 b/app-text/pytextile-2.3.3
deleted file mode 100644
index b8e973a45daa..000000000000
--- a/app-text/pytextile-2.3.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest-runner[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/pytest[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pytest-cov[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=A Python port of Textile, A humane web text generator
-EAPI=5
-HOMEPAGE=https://github.com/textile/python-textile
-IUSE=test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 ppc ppc64 sparc x86
-LICENSE=BSD
-RDEPEND=dev-python/regex[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/textile/python-textile/archive/2.3.3.tar.gz -> pytextile-2.3.3.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5d24c26c94fc16f127cf9ffe79badbdf
diff --git a/app-text/pytextile/Manifest b/app-text/pytextile/Manifest
new file mode 100644
index 000000000000..2325414669df
--- /dev/null
+++ b/app-text/pytextile/Manifest
@@ -0,0 +1,6 @@
+AUX pytextile-2.1.8-sanitizer.patch 606 BLAKE2B c916c46156ae5f01b7d6714b7c9acd078119a561fee2159cd54ae4db6859ef2be0664b8cc7ae4c3034302b9edd57244e31a2506ecbf0c9d81c7497f393279157 SHA512 3c7a568e64cd28cc0666f06e6b2022454126a654f4ae0d0c82edada69ca7ec1ebce1582961ac84667b3a0c932c5e9d98521c100e1d62df100d276ae33417ba13
+DIST pytextile-2.3.3.tar.gz 42277 BLAKE2B a6e6e1d96695f3ada03f5da9bd8bd19b99da345d83c62b1d4f2e765303dfbbbee072da4611f1b29b46d28ed334373c809117940ff0c1238dea3b12fb9076656c SHA512 980c872bfdc056753fa5b344cbc828dbdc9ddfc2656f3cfb5c15b3351cfd9e4016f57af14b60af2f2764e556865301d7923a8f0687c5857fc2201bf10f56ab60
+DIST textile-2.1.8.tar.gz 34002 BLAKE2B 0f4643da3cf47cd9b27e7b3237c6eac8b951caab9f6f36da929e159d582ae9e8ac04b835bd9006d7392ed935a875e169eef276caa52e25d618cdeafa27cef626 SHA512 b1675a131b482f4926efb45312b16c722ff158d9296704918b56316d470056f986ce18d495525a8e9f236bdd62e09ca6a17b443a7db8c8c36e5d05fcffce67da
+EBUILD pytextile-2.1.8.ebuild 924 BLAKE2B f30969b7afc0102a049e25f6943e37adead616a6d579f07754e351826d347320034895264457bfdaccb7ba388a370ea3c24bf11903c39562fba6df1cb0ad13bf SHA512 7a38a87b3459aeaf5af5c07db276d5b2bfa931d8fbd340b45d27e80aabbaab096e6dfdf2702c18416ae978015b2787b62ea4d1133234b842c40c8144ee389e73
+EBUILD pytextile-2.3.3.ebuild 1010 BLAKE2B 51a8857dacb5589ef8a296c8682acc1aea131e7f8f3d46b42c471c4348aa8cf3328f126c4e8dd6e1c35d2cc861e3601463b3f518dff1ae4104962e022755d533 SHA512 81bf94b7819e48bed1128e71c73b2e16cdedc339ed3ec8ee9f37fd33dfafe9ee152a995799d84cbc33002f10f0a062eac710819577e44ee3af25a2fe6f14dcdf
+MISC metadata.xml 554 BLAKE2B 014b0bb6fd9f0405aca39429a804bf9b3c2ff7dfcbcf55aab6678298c1ce37093c2c0005c315467cbec5c19b1f7da020c8eaabc1d912fd7b5d93567f62c94fff SHA512 6d4de4859070958c55f816ee8692a33f1a7b70de38549e9a6242044ccfdfffc590da29c79c450862537185fe2803bb0e09b2bb46ea76cf5548a2ded01a26434f
diff --git a/app-text/pytextile/files/pytextile-2.1.8-sanitizer.patch b/app-text/pytextile/files/pytextile-2.1.8-sanitizer.patch
new file mode 100644
index 000000000000..1a9e696f21e9
--- /dev/null
+++ b/app-text/pytextile/files/pytextile-2.1.8-sanitizer.patch
@@ -0,0 +1,15 @@
+https://github.com/textile/python-textile/commit/83c81db387fa5f0c5ca25c27b8bc36d105bce599
+diff --git a/textile/tools/sanitizer.py b/textile/tools/sanitizer.py
+index 83b6799..4fc8fb2 100644
+--- a/textile/tools/sanitizer.py
++++ b/textile/tools/sanitizer.py
+@@ -12,7 +12,7 @@ def sanitize(string):
+     p = html5lib.HTMLParser(tokenizer=sanitizer.HTMLSanitizer)
+     tree = p.parseFragment(string)
+ 
+-    walker = treewalkers.getTreeWalker("simpletree")
++    walker = treewalkers.getTreeWalker("etree")
+     stream = walker(tree)
+ 
+     s = serializer.htmlserializer.HTMLSerializer(omit_optional_tags=False,
+
diff --git a/app-text/pytextile/metadata.xml b/app-text/pytextile/metadata.xml
new file mode 100644
index 000000000000..c752a82be216
--- /dev/null
+++ b/app-text/pytextile/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <longdescription lang="en">A Python implementation of Textile, Dean Allen's Human Text Generator. 
+  Textile simplifies the work of creating (X)HTML.</longdescription>
+  <upstream>
+    <remote-id type="pypi">textile</remote-id>
+    <remote-id type="github">textile/python-textile</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-text/pytextile/pytextile-2.1.8.ebuild b/app-text/pytextile/pytextile-2.1.8.ebuild
new file mode 100644
index 000000000000..583464ba033b
--- /dev/null
+++ b/app-text/pytextile/pytextile-2.1.8.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4} pypy )
+
+inherit distutils-r1
+
+MY_PN="textile"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A Python port of Textile, A humane web text generator"
+HOMEPAGE="https://github.com/ikirudennis/python-textile"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 sparc x86 ~x86-fbsd"
+IUSE="test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+RDEPEND=""
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=( "${FILESDIR}"/${P}-sanitizer.patch )
+
+python_prepare_all() {
+	# This resolves a nasty race condition noted and observed by Arfrever
+	sed -e 's:with-id = 1::' -i setup.cfg || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests textile/tests/ || die "Tests failed under ${EPYTHON}"
+}
diff --git a/app-text/pytextile/pytextile-2.3.3.ebuild b/app-text/pytextile/pytextile-2.3.3.ebuild
new file mode 100644
index 000000000000..3a17b6c192d4
--- /dev/null
+++ b/app-text/pytextile/pytextile-2.3.3.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+
+inherit distutils-r1
+
+MY_PN="python-textile"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A Python port of Textile, A humane web text generator"
+HOMEPAGE="https://github.com/textile/python-textile"
+SRC_URI="https://github.com/textile/python-textile/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
+IUSE="test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/pytest-runner[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-cov[${PYTHON_USEDEP}]
+	)
+	"
+RDEPEND="
+	dev-python/regex[${PYTHON_USEDEP}]
+	"
+
+S="${WORKDIR}/${MY_P}"
+
+python_prepare_all() {
+	# This resolves a nasty race condition, courtesy of Arfrever
+	sed -e 's:with-id = 1::' -i setup.cfg || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	py.test || die "Testsuite failed under ${EPYTHON}"
+}
diff --git a/app-text/q-text-as-data-1.5.0 b/app-text/q-text-as-data-1.5.0
deleted file mode 100644
index d224cc4ecf33..000000000000
--- a/app-text/q-text-as-data-1.5.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst
-DESCRIPTION=A CLI tool that allows direct execution of SQL-like queries on text
-EAPI=5
-HOMEPAGE=http://harelba.github.io/q/
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/harelba/q/archive/1.5.0.tar.gz -> q-1.5.0.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=80b836c63cd682eaa68a27470e3a25a6
diff --git a/app-text/q-text-as-data/Manifest b/app-text/q-text-as-data/Manifest
new file mode 100644
index 000000000000..86a4ef761ea6
--- /dev/null
+++ b/app-text/q-text-as-data/Manifest
@@ -0,0 +1,3 @@
+DIST q-1.5.0.tar.gz 58746 BLAKE2B a35f7ea605a42e81be1ee4899ed9e8c2b4e81e896b6e4c1eb6045b64cc7fa3ffdf6f754be168b3ebe25faa4c8b80f63e2ffff3174231357260263acf335b8d5c SHA512 d21dd16a31629e36f0dee72ebc574283c7937821cb2da7ccaacb8484a35b53193dad05fe9857d1498434a0c1083514ea5b9e5d8a636bcd51d4c5924cb7bb1b55
+EBUILD q-text-as-data-1.5.0.ebuild 989 BLAKE2B 75751694983c2558990cfb4e3cb595185f1093f81e173e60a39c6c6eee2ab5831d037ea31436afb52004d11d138b5ff190079e2170561e6271b5669d0f708095 SHA512 0061a746a1432124970ff40722fd756938f9e50b63ed916d21a814aea7beaece049df2c5ccb9308824972928f4c9ac5fdaf31497731acf9609c8d5453809a7f4
+MISC metadata.xml 300 BLAKE2B 57b125311f9ec6ca94d329e91209e85c77c3c739c2e2ca885dbe4a8c3d9a13627fcd4b64c79c9c672d30c0265eab241fb57114e0c23b46e01c60fb969d7d6f9c SHA512 3b90282d1ba8092665a1421e81e53a82dadcdf3c70ecdcc0c71e97e00d0ad2f7ba1e970d507ab9d354721cd13e08582ae21c482955372c5d8bc0caeb3d4505aa
diff --git a/app-text/q-text-as-data/metadata.xml b/app-text/q-text-as-data/metadata.xml
new file mode 100644
index 000000000000..5405551a7a2a
--- /dev/null
+++ b/app-text/q-text-as-data/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>robbat2@gentoo.org</email>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">harelba/q</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-text/q-text-as-data/q-text-as-data-1.5.0.ebuild b/app-text/q-text-as-data/q-text-as-data-1.5.0.ebuild
new file mode 100644
index 000000000000..3441091a9944
--- /dev/null
+++ b/app-text/q-text-as-data/q-text-as-data-1.5.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+# Does not yet support py3
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite"
+
+inherit python-r1
+
+DESCRIPTION="A CLI tool that allows direct execution of SQL-like queries on text"
+HOMEPAGE="http://harelba.github.io/q/"
+MY_P="q-${PV}"
+SRC_URI="https://github.com/harelba/q/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# No dependencies other than python >= 2.5
+# http://harelba.github.io/q/requirements.html
+RDEPEND="${PYTHON_DEPS}"
+DEPEND=""
+
+S="${WORKDIR}/${MY_P}"
+
+q_install() {
+	python_newexe bin/q q-text-as-data
+}
+
+src_install() {
+	python_foreach_impl q_install
+	newdoc bin/.qrc dot-qrc
+	dodoc doc/*
+}
+
+pkg_postinst() {
+	einfo "On Gentoo, the 'q' binary is most often provided by app-portage/portage-utils;"
+	einfo "Thus, this tool is install as 'q-text-as-data' rather than 'q'."
+}
diff --git a/app-text/qpdf-7.0.0 b/app-text/qpdf-7.0.0
deleted file mode 100644
index 7b059e12a33e..000000000000
--- a/app-text/qpdf-7.0.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=sys-libs/zlib virtual/jpeg:0= test? ( sys-apps/diffutils media-libs/tiff app-text/ghostscript-gpl[tiff] )
-DESCRIPTION=Command-line tool for structural, content-preserving transformation of PDF files
-EAPI=6
-HOMEPAGE=http://qpdf.sourceforge.net/
-IUSE=doc examples perl static-libs test
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint ~sparc-solaris
-LICENSE=|| ( Apache-2.0 Artistic-2 )
-RDEPEND=sys-libs/zlib virtual/jpeg:0= perl? ( >=dev-lang/perl-5.8 )
-SLOT=0/18
-SRC_URI=mirror://sourceforge/qpdf/qpdf-7.0.0.tar.gz
-_md5_=8f1b0c5b0d81400b04ba733f1d570ec1
diff --git a/app-text/qpdf-7.1.1 b/app-text/qpdf-7.1.1
deleted file mode 100644
index 3baf5bc67662..000000000000
--- a/app-text/qpdf-7.1.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=sys-libs/zlib virtual/jpeg:0= test? ( sys-apps/diffutils media-libs/tiff app-text/ghostscript-gpl[tiff] )
-DESCRIPTION=Command-line tool for structural, content-preserving transformation of PDF files
-EAPI=6
-HOMEPAGE=http://qpdf.sourceforge.net/
-IUSE=doc examples perl static-libs test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint ~sparc-solaris
-LICENSE=|| ( Apache-2.0 Artistic-2 )
-RDEPEND=sys-libs/zlib virtual/jpeg:0= perl? ( >=dev-lang/perl-5.8 )
-SLOT=0/18
-SRC_URI=mirror://sourceforge/qpdf/qpdf-7.1.1.tar.gz
-_md5_=8bfad828538f35b500d673a15e600e6a
diff --git a/app-text/qpdf-8.0.2 b/app-text/qpdf-8.0.2
deleted file mode 100644
index 70cde3d9a293..000000000000
--- a/app-text/qpdf-8.0.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=sys-libs/zlib virtual/jpeg:0= test? ( sys-apps/diffutils media-libs/tiff app-text/ghostscript-gpl[tiff] )
-DESCRIPTION=Command-line tool for structural, content-preserving transformation of PDF files
-EAPI=6
-HOMEPAGE=http://qpdf.sourceforge.net/
-IUSE=doc examples perl static-libs test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint ~sparc-solaris
-LICENSE=|| ( Apache-2.0 Artistic-2 )
-RDEPEND=sys-libs/zlib virtual/jpeg:0= perl? ( >=dev-lang/perl-5.8 )
-SLOT=0/21
-SRC_URI=mirror://sourceforge/qpdf/qpdf-8.0.2.tar.gz
-_md5_=9f60e82da171218d5057675b60f8e7a9
diff --git a/app-text/qpdf-8.1.0 b/app-text/qpdf-8.1.0
deleted file mode 100644
index 2b6a014d840e..000000000000
--- a/app-text/qpdf-8.1.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=sys-libs/zlib virtual/jpeg:0= test? ( sys-apps/diffutils media-libs/tiff app-text/ghostscript-gpl[tiff] )
-DESCRIPTION=Command-line tool for structural, content-preserving transformation of PDF files
-EAPI=6
-HOMEPAGE=http://qpdf.sourceforge.net/
-IUSE=doc examples perl static-libs test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint ~sparc-solaris
-LICENSE=|| ( Apache-2.0 Artistic-2 )
-RDEPEND=sys-libs/zlib virtual/jpeg:0= perl? ( >=dev-lang/perl-5.8 )
-SLOT=0/21
-SRC_URI=mirror://sourceforge/qpdf/qpdf-8.1.0.tar.gz
-_md5_=9f60e82da171218d5057675b60f8e7a9
diff --git a/app-text/qpdf/Manifest b/app-text/qpdf/Manifest
new file mode 100644
index 000000000000..bdea7352f715
--- /dev/null
+++ b/app-text/qpdf/Manifest
@@ -0,0 +1,9 @@
+DIST qpdf-7.0.0.tar.gz 7053781 BLAKE2B 1abd54a3cdc24c3e56ac81cabaa56be8d2217961abfc026cbd0c0141aea3efb6c75b9daf2fe9f6fc0f09efd224d241fa859bd37bcd972df4e4837318497d774e SHA512 7b52d67b4d2c428a7b0c1cd03b03a23f05d38d7e3c81041079a137919019ea5158f12bf95fdcfcff6b43ffdefe93a85127ced2a363a6b4b380cbaa02a3840256
+DIST qpdf-7.1.1.tar.gz 7099282 BLAKE2B 9658dd1cc6f8d0e3dd13137db147e0f954f747b5bb6b1577f70a236b1f67c5513713889dca77181a9b25f1a2054a8ec5cbfda60866e97b2d43e60b494752c9fd SHA512 a75f988c7dd7ac174bdc981cd3696ca8b539ac6c581e3afecf601dc67277014cb4fe3f0e5cb75a67412cafa4eb645b2fc2d8a0ec203834464baf0c7e80baa0b4
+DIST qpdf-8.0.2.tar.gz 7952979 BLAKE2B a9c81f41d6b5e3e9f80dab8325fffbedb8740ae500efbf4f4d2c27aca1778b1e2c438b7aba7846bd62874e2ff4265bb50b3b3d3d32302fb3e4583ba0251bf8f4 SHA512 f6d062f011d87f3f1df44e96e5dec0cd4b1b5f800dc6c088bf1313b2c96922d2f3c1b6eb1109a6ef00c558144b85dc20aeb85f937b73a3b594633aa67104f5e3
+DIST qpdf-8.1.0.tar.gz 8243624 BLAKE2B 6db64282353bedca91225f2f5a9bc2a568872209d9c6b392374412e561bcb37d8e17223ecb34b332ebc7a83aa826bf2e85fbb0b3eeee3f055b24f343a26eed9d SHA512 1831bcaaed87dae268db5d61805d1483ec5c101f6ce594be660664c119597ae67cf011c2b50092964d785a814d5f6c780935127a89401fe37a1026ae4d3af15c
+EBUILD qpdf-7.0.0.ebuild 1234 BLAKE2B 303e3943f8429ab560cfef1d62b1c35f2dbec6c2e27fd6436fd8cba9eec5d8247bf4df27b2093f5a5936295452c171b81a7e07f3b888b98fff428ad7b566d109 SHA512 bc0f824517bf3d7837243162e11cd7a1b973fc27f984f2486cfea23047a7df185f5d4adcdbc82fa7c7b39a9aa6a31c80624e76fb5bda9d92aa2bff4dc457efb1
+EBUILD qpdf-7.1.1.ebuild 1243 BLAKE2B 99023977c552d4fb2b6d2177f60664d01867a5f5309a79c9e192ac4b8f6c6394649f2bc58717114bcbce15c91031ad00dac38364353c1121901722b7f4240b6a SHA512 5f9e78903502e37430b8b2dda10507fb5527b47dd76aaa1afd56dbf3453ed5a209720c0bed72e0f5c2a8aa055b27403c340b1eeb8c870274e450b9bb055e347c
+EBUILD qpdf-8.0.2.ebuild 1247 BLAKE2B 764bccbf564caebf07f28c24bdc84fc9b14dd8a494aa529d27c32ad473443cfce21ef062cc74a2b5e0a44c6e61f40f123611140298cfe9051fd7e68604a555e9 SHA512 7370df6aa8c3ac1609488169d6aed641fbcdcf7130ccee68a1f24ddaf153cf9564fa02b2476851c4141d81b0dad39481f5db77ac836aa1a950744a6961a1e447
+EBUILD qpdf-8.1.0.ebuild 1247 BLAKE2B 764bccbf564caebf07f28c24bdc84fc9b14dd8a494aa529d27c32ad473443cfce21ef062cc74a2b5e0a44c6e61f40f123611140298cfe9051fd7e68604a555e9 SHA512 7370df6aa8c3ac1609488169d6aed641fbcdcf7130ccee68a1f24ddaf153cf9564fa02b2476851c4141d81b0dad39481f5db77ac836aa1a950744a6961a1e447
+MISC metadata.xml 438 BLAKE2B ccb3c4e7dace8650c11418fecc8c5fdd7062692f83c99f60d3b73fd698f1fea19dd429a92014267388d04ea57e00652499768c88aaffd7e0e3f66e53c84f6449 SHA512 4c1aa514207b18e7b4de0585545d1c7b5def7f42be9d43726801f9a9ae7b129b91802dedf4e3eb9f2595a26e3863918c029b927ab42b6aab7ab0130c000ff843
diff --git a/app-text/qpdf/metadata.xml b/app-text/qpdf/metadata.xml
new file mode 100644
index 000000000000..ce823e597ac8
--- /dev/null
+++ b/app-text/qpdf/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>printing@gentoo.org</email>
+		<name>Gentoo Printing Project</name>
+	</maintainer>
+	<use>
+		<flag name="perl">Install fix-qdf tool (for reverting PDF edits) written in perl</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">qpdf</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/qpdf/qpdf-7.0.0.ebuild b/app-text/qpdf/qpdf-7.0.0.ebuild
new file mode 100644
index 000000000000..90ccfa2f8961
--- /dev/null
+++ b/app-text/qpdf/qpdf-7.0.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Command-line tool for structural, content-preserving transformation of PDF files"
+HOMEPAGE="http://qpdf.sourceforge.net/"
+SRC_URI="mirror://sourceforge/qpdf/${P}.tar.gz"
+
+LICENSE="|| ( Apache-2.0 Artistic-2 )"
+
+# subslot = libqpdf soname version
+SLOT="0/18"
+
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint ~sparc-solaris"
+IUSE="doc examples perl static-libs test"
+
+CDEPEND="
+	sys-libs/zlib
+	virtual/jpeg:0=
+"
+DEPEND="${CDEPEND}
+	test? (
+		sys-apps/diffutils
+		media-libs/tiff
+		app-text/ghostscript-gpl[tiff]
+	)
+"
+# Only need perl for the installed tools.
+RDEPEND="${CDEPEND}
+	perl? ( >=dev-lang/perl-5.8 )
+"
+
+DOCS=( ChangeLog README.md TODO )
+
+src_configure() {
+	CONFIG_SHELL=/bin/bash econf \
+		$(use_enable static-libs static) \
+		$(use_enable test test-compare-images)
+}
+
+src_install() {
+	default
+
+	if ! use perl ; then
+		rm "${ED}"/usr/bin/fix-qdf || die
+		rm "${ED}"/usr/share/man/man1/fix-qdf.1 || die
+	fi
+
+	if use examples ; then
+		dobin examples/build/.libs/*
+	fi
+
+	find "${ED}" -name '*.la' -exec rm -f {} +
+}
diff --git a/app-text/qpdf/qpdf-7.1.1.ebuild b/app-text/qpdf/qpdf-7.1.1.ebuild
new file mode 100644
index 000000000000..df045305bb67
--- /dev/null
+++ b/app-text/qpdf/qpdf-7.1.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Command-line tool for structural, content-preserving transformation of PDF files"
+HOMEPAGE="http://qpdf.sourceforge.net/"
+SRC_URI="mirror://sourceforge/qpdf/${P}.tar.gz"
+
+LICENSE="|| ( Apache-2.0 Artistic-2 )"
+
+# subslot = libqpdf soname version
+SLOT="0/18"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint ~sparc-solaris"
+IUSE="doc examples perl static-libs test"
+
+CDEPEND="
+	sys-libs/zlib
+	virtual/jpeg:0=
+"
+DEPEND="${CDEPEND}
+	test? (
+		sys-apps/diffutils
+		media-libs/tiff
+		app-text/ghostscript-gpl[tiff]
+	)
+"
+# Only need perl for the installed tools.
+RDEPEND="${CDEPEND}
+	perl? ( >=dev-lang/perl-5.8 )
+"
+
+DOCS=( ChangeLog README.md TODO )
+
+src_configure() {
+	CONFIG_SHELL=/bin/bash econf \
+		$(use_enable static-libs static) \
+		$(use_enable test test-compare-images)
+}
+
+src_install() {
+	default
+
+	if ! use perl ; then
+		rm "${ED}"/usr/bin/fix-qdf || die
+		rm "${ED}"/usr/share/man/man1/fix-qdf.1 || die
+	fi
+
+	if use examples ; then
+		dobin examples/build/.libs/*
+	fi
+
+	find "${ED}" -name '*.la' -exec rm -f {} +
+}
diff --git a/app-text/qpdf/qpdf-8.0.2.ebuild b/app-text/qpdf/qpdf-8.0.2.ebuild
new file mode 100644
index 000000000000..4458411fa22f
--- /dev/null
+++ b/app-text/qpdf/qpdf-8.0.2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Command-line tool for structural, content-preserving transformation of PDF files"
+HOMEPAGE="http://qpdf.sourceforge.net/"
+SRC_URI="mirror://sourceforge/qpdf/${P}.tar.gz"
+
+LICENSE="|| ( Apache-2.0 Artistic-2 )"
+
+# subslot = libqpdf soname version
+SLOT="0/21"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint ~sparc-solaris"
+IUSE="doc examples perl static-libs test"
+
+CDEPEND="
+	sys-libs/zlib
+	virtual/jpeg:0=
+"
+DEPEND="${CDEPEND}
+	test? (
+		sys-apps/diffutils
+		media-libs/tiff
+		app-text/ghostscript-gpl[tiff]
+	)
+"
+# Only need perl for the installed tools.
+RDEPEND="${CDEPEND}
+	perl? ( >=dev-lang/perl-5.8 )
+"
+
+DOCS=( ChangeLog README.md TODO )
+
+src_configure() {
+	CONFIG_SHELL=/bin/bash econf \
+		$(use_enable static-libs static) \
+		$(use_enable test test-compare-images)
+}
+
+src_install() {
+	default
+
+	if ! use perl ; then
+		rm "${ED%/}"/usr/bin/fix-qdf || die
+		rm "${ED%/}"/usr/share/man/man1/fix-qdf.1 || die
+	fi
+
+	if use examples ; then
+		dobin examples/build/.libs/*
+	fi
+
+	find "${ED}" -name '*.la' -exec rm -f {} +
+}
diff --git a/app-text/qpdf/qpdf-8.1.0.ebuild b/app-text/qpdf/qpdf-8.1.0.ebuild
new file mode 100644
index 000000000000..4458411fa22f
--- /dev/null
+++ b/app-text/qpdf/qpdf-8.1.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Command-line tool for structural, content-preserving transformation of PDF files"
+HOMEPAGE="http://qpdf.sourceforge.net/"
+SRC_URI="mirror://sourceforge/qpdf/${P}.tar.gz"
+
+LICENSE="|| ( Apache-2.0 Artistic-2 )"
+
+# subslot = libqpdf soname version
+SLOT="0/21"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint ~sparc-solaris"
+IUSE="doc examples perl static-libs test"
+
+CDEPEND="
+	sys-libs/zlib
+	virtual/jpeg:0=
+"
+DEPEND="${CDEPEND}
+	test? (
+		sys-apps/diffutils
+		media-libs/tiff
+		app-text/ghostscript-gpl[tiff]
+	)
+"
+# Only need perl for the installed tools.
+RDEPEND="${CDEPEND}
+	perl? ( >=dev-lang/perl-5.8 )
+"
+
+DOCS=( ChangeLog README.md TODO )
+
+src_configure() {
+	CONFIG_SHELL=/bin/bash econf \
+		$(use_enable static-libs static) \
+		$(use_enable test test-compare-images)
+}
+
+src_install() {
+	default
+
+	if ! use perl ; then
+		rm "${ED%/}"/usr/bin/fix-qdf || die
+		rm "${ED%/}"/usr/share/man/man1/fix-qdf.1 || die
+	fi
+
+	if use examples ; then
+		dobin examples/build/.libs/*
+	fi
+
+	find "${ED}" -name '*.la' -exec rm -f {} +
+}
diff --git a/app-text/qpdfview-0.4.16 b/app-text/qpdfview-0.4.16
deleted file mode 100644
index 63fb462cbe2f..000000000000
--- a/app-text/qpdfview-0.4.16
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 cups? ( net-print/cups ) dbus? ( dev-qt/qtdbus:5 ) djvu? ( app-text/djvu ) fitz? ( >=app-text/mupdf-1.7:= ) pdf? ( >=app-text/poppler-0.35[qt5] dev-qt/qtxml:5 ) postscript? ( app-text/libspectre ) sqlite? ( dev-qt/qtsql:5[sqlite] ) svg? ( dev-qt/qtsvg:5 ) !svg? ( virtual/freedesktop-icon-theme ) synctex? ( app-text/texlive-core ) dev-qt/linguist-tools:5 virtual/pkgconfig
-DESCRIPTION=A tabbed document viewer
-EAPI=6
-HOMEPAGE=https://launchpad.net/qpdfview
-IUSE=cups +dbus djvu fitz +pdf postscript +sqlite +svg synctex
-KEYWORDS=amd64 ~arm x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2+
-RDEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 cups? ( net-print/cups ) dbus? ( dev-qt/qtdbus:5 ) djvu? ( app-text/djvu ) fitz? ( >=app-text/mupdf-1.7:= ) pdf? ( >=app-text/poppler-0.35[qt5] dev-qt/qtxml:5 ) postscript? ( app-text/libspectre ) sqlite? ( dev-qt/qtsql:5[sqlite] ) svg? ( dev-qt/qtsvg:5 ) !svg? ( virtual/freedesktop-icon-theme ) synctex? ( app-text/texlive-core )
-REQUIRED_USE=?? ( fitz pdf )
-SLOT=0
-SRC_URI=https://launchpad.net/qpdfview/trunk/0.4.16/+download/qpdfview-0.4.16.tar.gz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=fa78ec2ada0d50b996b4696bc47b4560
diff --git a/app-text/qpdfview-0.4.17_beta1 b/app-text/qpdfview-0.4.17_beta1
deleted file mode 100644
index 5fc4bec6c015..000000000000
--- a/app-text/qpdfview-0.4.17_beta1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 cups? ( net-print/cups ) dbus? ( dev-qt/qtdbus:5 ) djvu? ( app-text/djvu ) fitz? ( >=app-text/mupdf-1.7:= ) pdf? ( >=app-text/poppler-0.35[qt5] dev-qt/qtxml:5 ) postscript? ( app-text/libspectre ) sqlite? ( dev-qt/qtsql:5[sqlite] ) svg? ( dev-qt/qtsvg:5 ) !svg? ( virtual/freedesktop-icon-theme ) synctex? ( app-text/texlive-core ) dev-qt/linguist-tools:5 virtual/pkgconfig
-DESCRIPTION=A tabbed document viewer
-EAPI=6
-HOMEPAGE=https://launchpad.net/qpdfview
-IUSE=cups +dbus djvu fitz +pdf postscript +sqlite +svg synctex
-KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2+
-RDEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 cups? ( net-print/cups ) dbus? ( dev-qt/qtdbus:5 ) djvu? ( app-text/djvu ) fitz? ( >=app-text/mupdf-1.7:= ) pdf? ( >=app-text/poppler-0.35[qt5] dev-qt/qtxml:5 ) postscript? ( app-text/libspectre ) sqlite? ( dev-qt/qtsql:5[sqlite] ) svg? ( dev-qt/qtsvg:5 ) !svg? ( virtual/freedesktop-icon-theme ) synctex? ( app-text/texlive-core )
-REQUIRED_USE=?? ( fitz pdf )
-SLOT=0
-SRC_URI=https://launchpad.net/qpdfview/trunk/0.4.17beta1/+download/qpdfview-0.4.17beta1.tar.gz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=27da5a7a6d7ea9095b104ccba1d1cd23
diff --git a/app-text/qpdfview-0.4.18_pre b/app-text/qpdfview-0.4.18_pre
deleted file mode 100644
index 518f8fb6463a..000000000000
--- a/app-text/qpdfview-0.4.18_pre
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm prepare
-DEPEND=cups? ( net-print/cups ) djvu? ( app-text/djvu ) fitz? ( >=app-text/mupdf-1.7:= ) postscript? ( app-text/libspectre ) dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dbus? ( dev-qt/qtdbus:5 ) pdf? ( >=app-text/poppler-0.35[qt5] dev-qt/qtxml:5 ) sqlite? ( dev-qt/qtsql:5[sqlite] ) svg? ( dev-qt/qtsvg:5 ) !svg? ( virtual/freedesktop-icon-theme ) synctex? ( app-text/texlive-core ) dev-qt/linguist-tools:5 virtual/pkgconfig >=sys-apps/sed-4
-DESCRIPTION=A tabbed document viewer
-EAPI=6
-HOMEPAGE=https://launchpad.net/qpdfview
-IUSE=cups +dbus djvu fitz +pdf postscript +sqlite +svg synctex
-KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2+
-RDEPEND=cups? ( net-print/cups ) djvu? ( app-text/djvu ) fitz? ( >=app-text/mupdf-1.7:= ) postscript? ( app-text/libspectre ) dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dbus? ( dev-qt/qtdbus:5 ) pdf? ( >=app-text/poppler-0.35[qt5] dev-qt/qtxml:5 ) sqlite? ( dev-qt/qtsql:5[sqlite] ) svg? ( dev-qt/qtsvg:5 ) !svg? ( virtual/freedesktop-icon-theme ) synctex? ( app-text/texlive-core )
-REQUIRED_USE=?? ( fitz pdf )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~grozin/qpdfview-0.4.18_pre.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2bebf23a8f9606ec9e07418e53d417fd
diff --git a/app-text/qpdfview-0.4.18_pre2 b/app-text/qpdfview-0.4.18_pre2
deleted file mode 100644
index f13d7439ca17..000000000000
--- a/app-text/qpdfview-0.4.18_pre2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm prepare
-DEPEND=cups? ( net-print/cups ) djvu? ( app-text/djvu ) fitz? ( >=app-text/mupdf-1.7:= ) postscript? ( app-text/libspectre ) dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dbus? ( dev-qt/qtdbus:5 ) pdf? ( >=app-text/poppler-0.35[qt5] dev-qt/qtxml:5 ) sqlite? ( dev-qt/qtsql:5[sqlite] ) svg? ( dev-qt/qtsvg:5 ) !svg? ( virtual/freedesktop-icon-theme ) synctex? ( app-text/texlive-core ) dev-qt/linguist-tools:5 virtual/pkgconfig >=sys-apps/sed-4
-DESCRIPTION=A tabbed document viewer
-EAPI=6
-HOMEPAGE=https://launchpad.net/qpdfview
-IUSE=cups +dbus djvu fitz +pdf postscript +sqlite +svg synctex
-KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2+
-RDEPEND=cups? ( net-print/cups ) djvu? ( app-text/djvu ) fitz? ( >=app-text/mupdf-1.7:= ) postscript? ( app-text/libspectre ) dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 dbus? ( dev-qt/qtdbus:5 ) pdf? ( >=app-text/poppler-0.35[qt5] dev-qt/qtxml:5 ) sqlite? ( dev-qt/qtsql:5[sqlite] ) svg? ( dev-qt/qtsvg:5 ) !svg? ( virtual/freedesktop-icon-theme ) synctex? ( app-text/texlive-core )
-REQUIRED_USE=?? ( fitz pdf )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~grozin/qpdfview-0.4.18_pre2.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	bdf97e69a34b864d6d545f4ec3143ff7	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ca051361bc4aa1d77bbec3fe74f10b5a
diff --git a/app-text/qpdfview/Manifest b/app-text/qpdfview/Manifest
new file mode 100644
index 000000000000..98b0b884d426
--- /dev/null
+++ b/app-text/qpdfview/Manifest
@@ -0,0 +1,9 @@
+DIST qpdfview-0.4.16.tar.gz 636095 BLAKE2B b25da3ed1b4bacc02701f6cd2c4e282fd1c7b1fcac8faa1687c5089baefa328854c520ba803a333ea107e7b423a004f6476eb9a7adf67287d4d0807146094fed SHA512 d3ac05fc51d48533e44e58cd19e5d222a8bfbc9da4df02ece6a405d2fdd3346eb4614816ae91e89facf28e107b920ff3ce7b2ccc8c9b7832ae2595ef70d65584
+DIST qpdfview-0.4.17beta1.tar.gz 658978 BLAKE2B 7f0ba945cf7903cae7bb11ac1d3baa08fc5f70e9e5a20a9f265cf8de4f0ce0f847f34852b2ce4374e2736542c8fc1e07c15e6bd4ae54d5147d14524e076f312f SHA512 803bd9a1165fc84302fb3c7734127eaab754bd2bf23083a1bcf340810fa617800f3d0069eae7b1f43fb528ebe17a6a32a652efbb902d525a95efc31efeb1e10a
+DIST qpdfview-0.4.18_pre.tar.gz 667869 BLAKE2B ed729b6aa1104ca1525877242bc3f2c630d8ee563005ab35854d775197c24352f0a39be13bf4808e4544c50072619da9cd5c36cdbdcbae33fa2fc2016b80ce18 SHA512 3a7a2cc474078dc742fccba2c87710c1e05cec76f0bd66650fa6cb4d6d8e2103241474689d4798da28ae1aeb2caa6e09dd8d1e9d0433c2eba21b202166aa3051
+DIST qpdfview-0.4.18_pre2.tar.gz 668677 BLAKE2B 1c79a7f9f9d67c533660457ca74d27c1cb389224910d0c8482c2e1d6a0843787e588a40ae7f4e02268392c15aa19b54b6383c2422cc60b20e521d26133c10a3e SHA512 ad19dd6a2bfeb3c5f26488619688ad96653ed50821203b7e5cb2817a4f9957510ce238804b48bf3b21d965ceed25ad1b0386e0bb5e9d0bc5e5c95e6fe10ef811
+EBUILD qpdfview-0.4.16.ebuild 2137 BLAKE2B d0ce86840680b56afd8b925b820d0641a0754776d4054b469c691f5da10db072febd5b04b34b80394bc08f47d6b5b7b58390332c30d445116528cbc238fe2144 SHA512 2d89740ee569287794935eb369c8a035a3ceeceb3e428e740f0b0adbe808f532a336dae9739c789bd4ee71b1a7f87af222ce91c19028bb179275184607489549
+EBUILD qpdfview-0.4.17_beta1.ebuild 2169 BLAKE2B 61d969d7af89373d0d657c00049c7a86a6cb67d2cea7d436f1052e21c0a02ebe7d06024851a6e956b8227d41b90df2cfb862804a09a7f817307f5b2185a88d33 SHA512 14fe234d15e1f6a38a8ba2c744c5f9061c21969f43bab039227636eb69f25fea5f1a91ffb15afe84c3eb92de25ef1c0db693b02a074f365e9069af5ae145ad24
+EBUILD qpdfview-0.4.18_pre.ebuild 2351 BLAKE2B 64beca033eb45d715185360ff9ea653de2f444e0fdfa5bc58e5e37f46fa2e8f03e5674837121e2c61b2f5781281de70bc960d85ff10e763a0467c292f88bd4cc SHA512 560b54fc310413fc34e24f441eb438db5221d211cb57fc318018e27b7913588e3361b056f4102cf922d6f79d955993ab40182158e6ce00ac5394bd82d98f56f0
+EBUILD qpdfview-0.4.18_pre2.ebuild 2351 BLAKE2B aa38b631649b7d03be1a6e1df550cce81f44fe721d8b874b225ce6414a749a96dedc585b4d4482224d23c56cb2176c530e02bd47dc74ebdc45718642c8c39f28 SHA512 1c49e2ce7d9fedbbed5ea45b550403a11c68035d5943361d901b9df33c357c730d1b46ab66de6783576bcb562f64eeee61a9ca3857a93aa9759d4c756d98dbf6
+MISC metadata.xml 534 BLAKE2B db66db041dd0875c8d4e36e3223d7f82263555f2d6a1dcc5270279b3fc8bc77499712253d43b56e278187f163af0495ca9e7e6aa0ba0dc8e9a5fe9cf7f2daf99 SHA512 e086f5e92c5ad9058f13c23c814a5cdc988a09cdbebecb1018b59d32a756dc2766b13ee1c3e09966cc7e221cc1c4ee26f9bf11c50610f94b28c20a34c316f133
diff --git a/app-text/qpdfview/metadata.xml b/app-text/qpdfview/metadata.xml
new file mode 100644
index 000000000000..481838d89529
--- /dev/null
+++ b/app-text/qpdfview/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
+	<use>
+		<flag name="fitz">
+			Use experimental fitz rendering, provided by <pkg>app-text/mupdf</pkg>,
+			instead of poppler
+		</flag>
+		<flag name="synctex">Add support for searching TeX sources</flag>
+	</use>
+	<upstream>
+		<remote-id type="launchpad">qpdfview</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/qpdfview/qpdfview-0.4.16.ebuild b/app-text/qpdfview/qpdfview-0.4.16.ebuild
new file mode 100644
index 000000000000..8ae9621ec5dc
--- /dev/null
+++ b/app-text/qpdfview/qpdfview-0.4.16.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PLOCALES="ast az be bg bs ca cs da de el en_GB eo es eu fi fr gl he hr hu id it kk ko ky lt ms my pl pt pt_BR ro ru sk sv th tr ug uk vi zh_CN"
+
+inherit l10n qmake-utils
+
+DESCRIPTION="A tabbed document viewer"
+HOMEPAGE="https://launchpad.net/qpdfview"
+SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
+IUSE="cups +dbus djvu fitz +pdf postscript +sqlite +svg synctex"
+
+REQUIRED_USE="?? ( fitz pdf )"
+
+RDEPEND="
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtwidgets:5
+	cups? ( net-print/cups )
+	dbus? ( dev-qt/qtdbus:5 )
+	djvu? ( app-text/djvu )
+	fitz? ( >=app-text/mupdf-1.7:= )
+	pdf? (
+		>=app-text/poppler-0.35[qt5]
+		dev-qt/qtxml:5
+	)
+	postscript? ( app-text/libspectre )
+	sqlite? ( dev-qt/qtsql:5[sqlite] )
+	svg? ( dev-qt/qtsvg:5 )
+	!svg? ( virtual/freedesktop-icon-theme )
+	synctex? ( app-text/texlive-core )"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig"
+
+DOCS=( CHANGES CONTRIBUTORS README TODO )
+
+src_prepare() {
+	local mylrelease="$(qt5_get_bindir)"/lrelease
+
+	prepare_locale() {
+		"${mylrelease}" "translations/${PN}_${1}.ts" || die "preparing ${1} locale failed"
+	}
+
+	rm_help() {
+		rm -f "help/help_${1}.html" || die "removing ${1} help file failed"
+	}
+
+	l10n_find_plocales_changes translations ${PN}_ .ts
+	l10n_for_each_locale_do prepare_locale
+	l10n_for_each_disabled_locale_do rm_help
+
+	# adapt for prefix
+	sed -i -e "s:/usr:${EPREFIX}/usr:g" qpdfview.pri || die
+
+	default
+}
+
+src_configure() {
+	local myconfig=() i=
+	for i in cups dbus djvu pdf svg synctex; do
+		use ${i} || myconfig+=(without_${i})
+	done
+	use fitz && myconfig+=(with_fitz)
+	use postscript || myconfig+=(without_ps)
+	use sqlite || myconfig+=(without_sql)
+
+	local myqmakeargs=(
+		qpdfview.pro
+		CONFIG+="${myconfig[@]}"
+		PLUGIN_INSTALL_PATH="${EPREFIX}/usr/$(get_libdir)/${PN}"
+	)
+	eqmake5 "${myqmakeargs[@]}"
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+	einstalldocs
+}
diff --git a/app-text/qpdfview/qpdfview-0.4.17_beta1.ebuild b/app-text/qpdfview/qpdfview-0.4.17_beta1.ebuild
new file mode 100644
index 000000000000..0002d29b3a05
--- /dev/null
+++ b/app-text/qpdfview/qpdfview-0.4.17_beta1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PLOCALES="ast az be bg bs ca cs da de el en_GB eo es eu fi fr gl he hr hu id it kk ko ky lt ms my pl pt pt_BR ro ru sk sv th tr ug uk vi zh_CN"
+
+inherit l10n qmake-utils
+
+DESCRIPTION="A tabbed document viewer"
+HOMEPAGE="https://launchpad.net/qpdfview"
+SRC_URI="https://launchpad.net/${PN}/trunk/${PV/_/}/+download/${P/_/}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+IUSE="cups +dbus djvu fitz +pdf postscript +sqlite +svg synctex"
+
+REQUIRED_USE="?? ( fitz pdf )"
+
+RDEPEND="
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtwidgets:5
+	cups? ( net-print/cups )
+	dbus? ( dev-qt/qtdbus:5 )
+	djvu? ( app-text/djvu )
+	fitz? ( >=app-text/mupdf-1.7:= )
+	pdf? (
+		>=app-text/poppler-0.35[qt5]
+		dev-qt/qtxml:5
+	)
+	postscript? ( app-text/libspectre )
+	sqlite? ( dev-qt/qtsql:5[sqlite] )
+	svg? ( dev-qt/qtsvg:5 )
+	!svg? ( virtual/freedesktop-icon-theme )
+	synctex? ( app-text/texlive-core )"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig"
+
+DOCS=( CHANGES CONTRIBUTORS README TODO )
+
+S="${WORKDIR}/${P/_/}"
+
+src_prepare() {
+	local mylrelease="$(qt5_get_bindir)"/lrelease
+
+	prepare_locale() {
+		"${mylrelease}" "translations/${PN}_${1}.ts" || die "preparing ${1} locale failed"
+	}
+
+	rm_help() {
+		rm -f "help/help_${1}.html" || die "removing ${1} help file failed"
+	}
+
+	l10n_find_plocales_changes translations ${PN}_ .ts
+	l10n_for_each_locale_do prepare_locale
+	l10n_for_each_disabled_locale_do rm_help
+
+	# adapt for prefix
+	sed -i -e "s:/usr:${EPREFIX}/usr:g" qpdfview.pri || die
+
+	default
+}
+
+src_configure() {
+	local myconfig=() i=
+	for i in cups dbus djvu pdf svg synctex; do
+		use ${i} || myconfig+=(without_${i})
+	done
+	use fitz && myconfig+=(with_fitz)
+	use postscript || myconfig+=(without_ps)
+	use sqlite || myconfig+=(without_sql)
+
+	local myqmakeargs=(
+		qpdfview.pro
+		CONFIG+="${myconfig[@]}"
+		PLUGIN_INSTALL_PATH="${EPREFIX}/usr/$(get_libdir)/${PN}"
+	)
+	eqmake5 "${myqmakeargs[@]}"
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+	einstalldocs
+}
diff --git a/app-text/qpdfview/qpdfview-0.4.18_pre.ebuild b/app-text/qpdfview/qpdfview-0.4.18_pre.ebuild
new file mode 100644
index 000000000000..13bcc7b4241f
--- /dev/null
+++ b/app-text/qpdfview/qpdfview-0.4.18_pre.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PLOCALES="ast az be bg bs ca cs da de el en_GB eo es eu fi fr gl he hr hu id it ja kk ko ky lt ms my pl pt pt_BR ro ru sk sv th tr ug uk vi zh_CN"
+
+inherit l10n qmake-utils xdg-utils gnome2-utils
+
+DESCRIPTION="A tabbed document viewer"
+HOMEPAGE="https://launchpad.net/qpdfview"
+SRC_URI="https://dev.gentoo.org/~grozin/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+IUSE="cups +dbus djvu fitz +pdf postscript +sqlite +svg synctex"
+
+REQUIRED_USE="?? ( fitz pdf )"
+
+RDEPEND="
+	cups? ( net-print/cups )
+	djvu? ( app-text/djvu )
+	fitz? ( >=app-text/mupdf-1.7:= )
+	postscript? ( app-text/libspectre )
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtwidgets:5
+	dbus? ( dev-qt/qtdbus:5 )
+	pdf? ( >=app-text/poppler-0.35[qt5]
+		dev-qt/qtxml:5 )
+	sqlite? ( dev-qt/qtsql:5[sqlite] )
+	svg? ( dev-qt/qtsvg:5 )
+	!svg? ( virtual/freedesktop-icon-theme )
+	synctex? ( app-text/texlive-core )"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig"
+
+DOCS=( CHANGES CONTRIBUTORS README TODO )
+
+src_prepare() {
+	local mylrelease="$(qt5_get_bindir)"/lrelease
+
+	prepare_locale() {
+		"${mylrelease}" "translations/${PN}_${1}.ts" || die "preparing ${1} locale failed"
+	}
+
+	rm_help() {
+		rm -f "help/help_${1}.html" || die "removing ${1} help file failed"
+	}
+
+	l10n_find_plocales_changes translations ${PN}_ .ts
+	l10n_for_each_locale_do prepare_locale
+	l10n_for_each_disabled_locale_do rm_help
+
+	# adapt for prefix
+	sed -i -e "s:/usr:${EPREFIX}/usr:g" qpdfview.pri || die
+
+	default
+}
+
+src_configure() {
+	local myconfig=() i=
+	for i in cups dbus djvu pdf svg synctex; do
+		use ${i} || myconfig+=(without_${i})
+	done
+	use fitz && myconfig+=(with_fitz)
+	use postscript || myconfig+=(without_ps)
+	use sqlite || myconfig+=(without_sql)
+
+	local myqmakeargs=(
+		qpdfview.pro
+		CONFIG+="${myconfig[@]}"
+		PLUGIN_INSTALL_PATH="${EPREFIX}/usr/$(get_libdir)/${PN}"
+	)
+	eqmake5 "${myqmakeargs[@]}"
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+	einstalldocs
+}
+
+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/qpdfview/qpdfview-0.4.18_pre2.ebuild b/app-text/qpdfview/qpdfview-0.4.18_pre2.ebuild
new file mode 100644
index 000000000000..b9dbaeb26ae5
--- /dev/null
+++ b/app-text/qpdfview/qpdfview-0.4.18_pre2.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PLOCALES="ast az be bg bs ca cs da de el en_GB eo es eu fi fr gl he hr hu id it ja kk ko ky lt ms my pl pt pt_BR ro ru sk sv th tr ug uk vi zh_CN"
+
+inherit l10n qmake-utils xdg-utils gnome2-utils
+
+DESCRIPTION="A tabbed document viewer"
+HOMEPAGE="https://launchpad.net/qpdfview"
+SRC_URI="https://dev.gentoo.org/~grozin/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+IUSE="cups +dbus djvu fitz +pdf postscript +sqlite +svg synctex"
+
+REQUIRED_USE="?? ( fitz pdf )"
+
+RDEPEND="
+	cups? ( net-print/cups )
+	djvu? ( app-text/djvu )
+	fitz? ( >=app-text/mupdf-1.7:= )
+	postscript? ( app-text/libspectre )
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtwidgets:5
+	dbus? ( dev-qt/qtdbus:5 )
+	pdf? ( >=app-text/poppler-0.35[qt5]
+		dev-qt/qtxml:5 )
+	sqlite? ( dev-qt/qtsql:5[sqlite] )
+	svg? ( dev-qt/qtsvg:5 )
+	!svg? ( virtual/freedesktop-icon-theme )
+	synctex? ( app-text/texlive-core )"
+DEPEND="${RDEPEND}
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig"
+
+DOCS=( CHANGES CONTRIBUTORS README TODO )
+
+src_prepare() {
+	local mylrelease="$(qt5_get_bindir)"/lrelease
+
+	prepare_locale() {
+		"${mylrelease}" "translations/${PN}_${1}.ts" || die "preparing ${1} locale failed"
+	}
+
+	rm_help() {
+		rm -f "help/help_${1}.html" || die "removing ${1} help file failed"
+	}
+
+	l10n_find_plocales_changes translations ${PN}_ .ts
+	l10n_for_each_locale_do prepare_locale
+	l10n_for_each_disabled_locale_do rm_help
+
+	# adapt for prefix
+	sed -i -e "s:/usr:${EPREFIX}/usr:g" qpdfview.pri || die
+
+	default
+}
+
+src_configure() {
+	local myconfig=() i=
+	for i in cups dbus djvu pdf svg synctex; do
+		use ${i} || myconfig+=(without_${i})
+	done
+	use fitz && myconfig+=(with_fitz)
+	use postscript || myconfig+=(without_ps)
+	use sqlite || myconfig+=(without_sql)
+
+	local myqmakeargs=(
+		qpdfview.pro
+		CONFIG+="${myconfig[@]}"
+		PLUGIN_INSTALL_PATH="${EPREFIX}/usr/$(get_libdir)/${PN}"
+	)
+	eqmake5 "${myqmakeargs[@]}"
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+	einstalldocs
+}
+
+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/queequeg-0.91-r2 b/app-text/queequeg-0.91-r2
deleted file mode 100644
index 9c0e625ab123..000000000000
--- a/app-text/queequeg-0.91-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install setup
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] app-dicts/wordnet
-DESCRIPTION=A checker for English grammar, for people who are not native English
-EAPI=6
-HOMEPAGE=http://queequeg.sourceforge.net/
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] app-dicts/wordnet
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=mirror://sourceforge/queequeg/queequeg-0.91.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=8296002c637e83456b70f887e5f67aa9
diff --git a/app-text/queequeg/Manifest b/app-text/queequeg/Manifest
new file mode 100644
index 000000000000..890ace178d77
--- /dev/null
+++ b/app-text/queequeg/Manifest
@@ -0,0 +1,3 @@
+DIST queequeg-0.91.tar.gz 69449 BLAKE2B bd9db4bc6be37e8ee327fa5f6072cc4b2bc4b48fbfae194ef2466ebc26478c3ab3aadef212a69bf816ebdcd020c57af2b953eb9ef6a4c6d5be6516255c51666c SHA512 e5366577e587fd3f286c917135cd043ef599ef6ee673757f3538668f749ce6a57c2a257f31f1e9d38724cb6ee4680b4401800c23f84ae27deac75392ab6c5e34
+EBUILD queequeg-0.91-r2.ebuild 1002 BLAKE2B 25c2e40a01c1f60461c9f26fc16faa6354b64f254f68d9363af1e33d18604c1deb4e6d9fa40c44a3ccdf00f52051f49e8502957797307a25e9c560c7d5604fc8 SHA512 dd8b83be480c467dc5a49cff67898d3787afc0aa738f661009e9a6fbaedc0bbc53c1b7dfb71e3fe7ce36660746417c8805a5f6b320755f6881b909d204719494
+MISC metadata.xml 390 BLAKE2B 7f62f2991408f9fd4b9e860311f1e2d50f4007d8870da3464683150077eaa371ecb192720ab088464f3829f6df65985e6e9bd742672708cef8f55e060abab17c SHA512 5a750294043ee99964070d290dd178659f8587c5fc9e13d73f78c9a73bd880b55ebe48eeabb66181cb24595a566c5767c8cd01f7f6874d279156b746f306e1a6
diff --git a/app-text/queequeg/metadata.xml b/app-text/queequeg/metadata.xml
new file mode 100644
index 000000000000..e7804710f371
--- /dev/null
+++ b/app-text/queequeg/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>hattya@gentoo.org</email>
+	</maintainer>
+	<maintainer type="project">
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">queequeg</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/queequeg/queequeg-0.91-r2.ebuild b/app-text/queequeg/queequeg-0.91-r2.ebuild
new file mode 100644
index 000000000000..bd13a71a2779
--- /dev/null
+++ b/app-text/queequeg/queequeg-0.91-r2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-single-r1
+
+DESCRIPTION="A checker for English grammar, for people who are not native English"
+HOMEPAGE="http://queequeg.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="${PYTHON_DEPS}
+	app-dicts/wordnet"
+RDEPEND="${DEPEND}"
+
+src_compile() {
+	local dictdir=/usr/dict
+
+	if has_version ">=app-dicts/wordnet-2.0"; then
+		dictdir=/usr/share/wordnet/dict
+	fi
+
+	emake dict WORDNETDICT=${dictdir}
+
+	python_fix_shebang qq
+}
+
+src_install() {
+	local prefix=/usr/lib/queequeg
+
+	python_moduleinto "${prefix}"
+	python_domodule *.py
+	insinto "${prefix}"
+	[[ -f "dict.txt" ]] && doins dict.txt || doins dict.cdb
+
+	exeinto "${prefix}"
+	doexe qq
+	dodir /usr/bin
+	dosym ../lib/queequeg/qq /usr/bin/qq
+
+	dodoc README TODO
+	dodoc htdocs/*
+}
diff --git a/app-text/rarian-0.8.1-r3 b/app-text/rarian-0.8.1-r3
deleted file mode 100644
index 9a9549fb08f3..000000000000
--- a/app-text/rarian-0.8.1-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=dev-libs/libxslt dev-libs/tinyxml || ( sys-apps/util-linux app-misc/getopt ) !<app-text/scrollkeeper-9999 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A documentation metadata library
-EAPI=6
-HOMEPAGE=https://rarian.freedesktop.org/
-IUSE=static-libs
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris
-LICENSE=LGPL-2.1
-RDEPEND=dev-libs/libxslt dev-libs/tinyxml || ( sys-apps/util-linux app-misc/getopt )
-SLOT=0
-SRC_URI=https://rarian.freedesktop.org/Releases/rarian-0.8.1.tar.gz https://dev.gentoo.org/~eva/distfiles/rarian/rarian-0.8.1-r3-patches.tar.xz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=eb913fe249f3db3c02de8c95cdeeefa7
diff --git a/app-text/rarian/Manifest b/app-text/rarian/Manifest
new file mode 100644
index 000000000000..c7894901a087
--- /dev/null
+++ b/app-text/rarian/Manifest
@@ -0,0 +1,4 @@
+DIST rarian-0.8.1-r3-patches.tar.xz 33508 BLAKE2B 772f2e2ff45b707e45da16103da665c54655dae0b904db5240964a25591f5871fb28c37e42a99cb98c760a214e6b039af12015bffb9b51ccb50e6bb054d3effa SHA512 a6a258803ce165854047aacd1ffef32d8d5c271cad3e6b74fb3c694ca6a0de9a8f253c89f9ff53279e7228ae401fad06721f10a6374a03a51bad76b2ef969000
+DIST rarian-0.8.1.tar.gz 459461 BLAKE2B 7589633a3abc188a7e83adede964b4d293984ad9c896e5c8116775905dfc3acc3b0cfbbee574b26d1c3966501f8b42e61df9910c840c58bfcd0b41d065a30c26 SHA512 ddc640e1ac210e9dc3fcdde6bbff6e21dabe97b160b531cac68d47d1b831dec71b7c4aced9819cfafd8f89f290920c4e33550b8e29d9872a1c1a202d6fe8e3eb
+EBUILD rarian-0.8.1-r3.ebuild 1837 BLAKE2B 9469bc44dc063490380b3ca8ae45e5182890f83336ad1f75e4605d87b2f1c9bc048709a88597e5acdc99663894fc87746c7bcf0cad35f073fbb5c8fbe0f0975c SHA512 d07b0d20dcc2b17f8b24e60692f9fcb096287b1b086d22dbdf412de02883688de6054b2940cce4ba1a37bfb20b9259531b3dc7f50e524f081b5a2a058c773781
+MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-text/rarian/metadata.xml b/app-text/rarian/metadata.xml
new file mode 100644
index 000000000000..39980802b1da
--- /dev/null
+++ b/app-text/rarian/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-text/rarian/rarian-0.8.1-r3.ebuild b/app-text/rarian/rarian-0.8.1-r3.ebuild
new file mode 100644
index 000000000000..f620a54c2025
--- /dev/null
+++ b/app-text/rarian/rarian-0.8.1-r3.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools eutils
+
+DESCRIPTION="A documentation metadata library"
+HOMEPAGE="https://rarian.freedesktop.org/"
+SRC_URI="https://${PN}.freedesktop.org/Releases/${P}.tar.gz
+	https://dev.gentoo.org/~eva/distfiles/${PN}/${P}-r3-patches.tar.xz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="static-libs"
+
+RDEPEND="
+	dev-libs/libxslt
+	dev-libs/tinyxml
+	|| (
+		sys-apps/util-linux
+		app-misc/getopt )
+"
+DEPEND="${RDEPEND}
+	!<app-text/scrollkeeper-9999
+"
+
+DOCS=( ChangeLog NEWS README )
+
+PATCHES=(
+	"${WORKDIR}"/0001-Fix-uri-of-omf-files-produced-by-rarian-sk-preinstal.patch
+	"${WORKDIR}"/0002-Allow-building-against-system-copy-of-tinyxml.patch
+	"${WORKDIR}"/0003-Allow-to-specify-only-the-prefix-of-an-info-page-e.g.patch
+	"${WORKDIR}"/0004-Fix-a-crash-when-opening-files-without-dots-in-their.patch
+	"${WORKDIR}"/0005-Make-librarian-obey-to-LC_MESSAGES.patch
+	"${WORKDIR}"/0006-Fix-m4-syntax-so-that-autoreconf-doesn-t-break.patch
+	"${WORKDIR}"/0007-Remove-the-nonexistent-dist-gzip-Automake-option.patch
+	"${WORKDIR}"/0008-Fix-OMF-category-parsing.patch
+	"${WORKDIR}"/0009-Allow-the-getopt-command-to-be-customized-at-configu.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=()
+	# https://bugs.gentoo.org/show_bug.cgi?id=409811
+	# https://bugs.freedesktop.org/show_bug.cgi?id=53264
+	if ! has_version sys-apps/util-linux; then
+		myconf=( --with-getopt=getopt-long )
+	fi
+
+	econf \
+		--localstatedir="${EPREFIX}"/var \
+		$(use_enable static-libs static) \
+		${myconf[@]}
+}
+
+src_install() {
+	default
+	prune_libtool_files --all
+}
diff --git a/app-text/recode-3.6_p20-r1 b/app-text/recode-3.6_p20-r1
deleted file mode 100644
index 4d000f004118..000000000000
--- a/app-text/recode-3.6_p20-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/flex nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 =sys-devel/automake-1.11* >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Convert files between various character sets
-EAPI=5
-HOMEPAGE=https://github.com/rrthomas/recode
-IUSE=nls static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-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
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://gnu/recode/recode-3.6.tar.gz mirror://debian/pool/main/r/recode/recode_3.6-20.debian.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	45f0e78dba7de5c77988265229b4402a	multilib-minimal	bfa1226d0f1fa0093d10b84acd029633	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8864d85540404fb62d76e58a7deff17e
diff --git a/app-text/recode-3.7_pre20140303 b/app-text/recode-3.7_pre20140303
deleted file mode 100644
index 62a8538b26b2..000000000000
--- a/app-text/recode-3.7_pre20140303
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=sys-devel/flex nls? ( sys-devel/gettext ) >=app-portage/elt-patches-20170422
-DESCRIPTION=Convert files between various character sets
-EAPI=6
-HOMEPAGE=https://github.com/rrthomas/recode
-IUSE=nls static-libs
-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
-LICENSE=GPL-2
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/pinard/Recode/archive/2d7092a9999194fc0e9449717a8048c8d8e26c18.zip -> recode-3.7_pre20140303.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=177a9b2843de74457ca31f60b70dd878
diff --git a/app-text/recode/Manifest b/app-text/recode/Manifest
new file mode 100644
index 000000000000..2b49cecfac06
--- /dev/null
+++ b/app-text/recode/Manifest
@@ -0,0 +1,8 @@
+AUX recode-3.6-as-if.patch 472 BLAKE2B b42518eea02219eae014faea4eea71e475b778de61c8645e21d86fd97bcae8f86accd5063370fdec40054263ede74842491841db48688c85d1796c93c311eff1 SHA512 5209779be9d03b770f679c2be736bc68a710e1c064b1f4a2fbb9963a8ca59a258a22b5d34ed6ac19e7a40ca83c64995f37aa9f466e49841ba2662b89d0789763
+AUX recode-3.6-gettextfix.diff 514 BLAKE2B cbe2dc00927ce9215d1719f78eb78bdea0cc8c5b6b72bc46f43ed14d658396c977053aad83df25a666739e8a431a512ffe4f7d6da9a36b0a5eb90d1c634c8380 SHA512 71408313ed269aeb8b015c171a6d16663e2bc7a3fe5ad4e0dc16ae0ec0e1f769605d92d7e32aec908a42a5ee148cd1f00ad2c069e947c0c4f64fb3b9f7dfb1b3
+DIST recode-3.6.tar.gz 1751886 BLAKE2B 94436343969da0ee6d16ed69a211d4f36b7a9cb59ce931ef71cfc1e0f11e5709e67ee1e0bb24f5320e6c7d6d01920a6c4d9edce87ff2c6aaaa8c80e30f3b536d SHA512 68de277ac8cd5f6023bb077b959ab5778a78edac1299d507bab906824080b6f86e9bfcd89169aa474197c2faa9af2ceb1ed272c8dd4d50caef373afa05daed1b
+DIST recode-3.7_pre20140303.zip 1902903 BLAKE2B fb85ef7710b6b4ad1bfe34f066d8a51252c40fbc4f958940eaaba142ad51982c8ee3d2da97d52a1e40e23617bbcf6450c9b45be99067efee7c1149735ea81cb6 SHA512 256d79d6f9de18bbf53cb322f0467411ef2ff8e4f242d073d7302fbd05e4942373023514d0a88e33701280c1cb4e0235d76efb9220729cd1f91f9ad8fd2407de
+DIST recode_3.6-20.debian.tar.gz 341117 BLAKE2B 748ee36b68f1d1501edde23e8afcbd58df70a86745e7c366a27a33496e539dcae11b746fb46767e95ae99b68a18684e3e85c1ea961692ac57ad1a01a895734a7 SHA512 bc586534e77b49da7d387187a8ddb042a12871f87f4f32c818ce7218b7254ac5ba6eccb14aaaf0312579f27958883f2da620016a7049c3af24c8bfba81acc3ef
+EBUILD recode-3.6_p20-r1.ebuild 1667 BLAKE2B 7fde7a6da18f666a3711a13235b118c0f9e4962acfcbfd130dec412af8610eab9c6350378dbd6bac32c45c0d133761be4b08ae171b0d96a253cd0fa0b55d2583 SHA512 73b11ba7aa86643856d0b2cef8ddcae846108bbd38ab59e3eb779b7846b7afd5552370a653965f1d25ca32d97ba6461b37ece56b4d92b4c45e97fd6b5d6879b4
+EBUILD recode-3.7_pre20140303.ebuild 1114 BLAKE2B 04c89e3e73d3cf4cd961d4e024d0e141898bd037402d563871981afb2536bdde7faff2cbe32895f145131c47c750faa741b39d8b67a1eaa653ff1513580a067f SHA512 24e1156be1209ccd38cda16c665007203afb5effe7934652d48832afcbe8319aeb88bd337cded810fe2650c38ae20468fce23983ddbe5ca50e565af51265668c
+MISC metadata.xml 271 BLAKE2B 46146f4bf13e9f4d33435225ec1012dd9bb89b20812963dc50368cab2a60a3c542052cb72f8963cc72074b2c13a5b054c77152de1d108027752601a349bc4ef8 SHA512 3e98f5382cf789992bdfc0f32e6e36eba31944be654c03f2ed9bd00baf56c8b768c256c4f8778d5775d6df38da4afcf8e32b6e6495a1ecfc8e7982c7c8943b1b
diff --git a/app-text/recode/files/recode-3.6-as-if.patch b/app-text/recode/files/recode-3.6-as-if.patch
new file mode 100644
index 000000000000..c7bcc27c8750
--- /dev/null
+++ b/app-text/recode/files/recode-3.6-as-if.patch
@@ -0,0 +1,19 @@
+http://bugs.gentoo.org/283029
+
+--- a/m4/flex.m4
++++ b/m4/flex.m4
+@@ -8,11 +8,11 @@ dnl ad_AC_PROG_FLEX
+ dnl Look for flex or missing, then run AC_PROG_LEX and AC_DECL_YYTEXT
+ AC_DEFUN(ad_AC_PROG_FLEX,
+ [AC_CHECK_PROGS(LEX, flex, missing)
+-if test "$LEX" = missing; then
++AS_IF([test "$LEX" = missing], [dnl
+   LEX="\$(top_srcdir)/$ac_aux_dir/missing flex"
+   LEX_OUTPUT_ROOT=lex.yy
+   AC_SUBST(LEX_OUTPUT_ROOT)dnl
+-else
++], [:
+   AC_PROG_LEX
+   AC_DECL_YYTEXT
+-fi])
++])])
diff --git a/app-text/recode/files/recode-3.6-gettextfix.diff b/app-text/recode/files/recode-3.6-gettextfix.diff
new file mode 100644
index 000000000000..3b7eb8ba20e6
--- /dev/null
+++ b/app-text/recode/files/recode-3.6-gettextfix.diff
@@ -0,0 +1,23 @@
+http://bugs.gentoo.org/239372
+
+patch by Dmitry Karasik
+
+--- recode-3.6/m4/gettext.m4
++++ recode-3.6/m4/gettext.m4
+@@ -109,12 +109,12 @@
+     else
+       ac_items="$LINGUAS"
+       for ac_item in $ac_items; do
+-	case "$ALL_LINGUAS" in
+-	  *$ac_item*)
++        for supported_item in $ALL_LINGUAS; do
++          if test "$ac_item" = "$supported_item"; then
+ 	    ac_print="$ac_print $ac_item"
+ 	    MOFILES="$MOFILES $ac_item.mo"
+-	    ;;
+-	esac
++          fi
++        done
+       done
+     fi
+     AC_SUBST(MOFILES)
diff --git a/app-text/recode/metadata.xml b/app-text/recode/metadata.xml
new file mode 100644
index 000000000000..3e927f8d7480
--- /dev/null
+++ b/app-text/recode/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>shell-tools@gentoo.org</email>
+    <name>Gentoo Shell Tools Project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-text/recode/recode-3.6_p20-r1.ebuild b/app-text/recode/recode-3.6_p20-r1.ebuild
new file mode 100644
index 000000000000..9444428a270b
--- /dev/null
+++ b/app-text/recode/recode-3.6_p20-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+WANT_AUTOMAKE="1.11" # bug 419455
+
+inherit autotools eutils flag-o-matic libtool toolchain-funcs multilib-minimal
+
+MY_P=${P%_*}
+MY_PV=${PV%_*}
+DEB_PATCH=${PV#*p}
+
+DESCRIPTION="Convert files between various character sets"
+HOMEPAGE="https://github.com/rrthomas/recode"
+SRC_URI="
+	mirror://gnu/${PN}/${MY_P}.tar.gz
+	mirror://debian/pool/main/r/${PN}/${PN}_${MY_PV}-${DEB_PATCH}.debian.tar.gz"
+
+LICENSE="GPL-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"
+IUSE="nls static-libs"
+
+DEPEND="
+	sys-devel/flex
+	nls? ( sys-devel/gettext )"
+RDEPEND=""
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	# fix #571106 by restoring pre-GCC5 inline semantics
+	append-cflags -std=gnu89
+
+	rm "${WORKDIR}"/debian/patches/series || die
+	epatch \
+		"${FILESDIR}/${MY_P}-gettextfix.diff" \
+		"${FILESDIR}"/${MY_P}-as-if.patch \
+		"${WORKDIR}"/debian/patches/*
+	sed -i '1i#include <stdlib.h>' src/argmatch.c || die
+
+	# Remove old libtool macros
+	rm "${S}"/acinclude.m4 || die
+
+	eautoreconf
+	elibtoolize
+}
+
+multilib_src_configure() {
+	# on solaris -lintl is needed to compile
+	[[ ${CHOST} == *-solaris* ]] && append-libs "-lintl"
+	# --without-included-gettext means we always use system headers
+	# and library
+	ECONF_SOURCE="${S}" econf \
+		--without-included-gettext \
+		$(use_enable nls) \
+		$(use_enable static-libs static)
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -name '*.la' -exec rm -v {} + || die
+}
diff --git a/app-text/recode/recode-3.7_pre20140303.ebuild b/app-text/recode/recode-3.7_pre20140303.ebuild
new file mode 100644
index 000000000000..a6c2e5b129fe
--- /dev/null
+++ b/app-text/recode/recode-3.7_pre20140303.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic libtool toolchain-funcs
+
+DESCRIPTION="Convert files between various character sets"
+HOMEPAGE="https://github.com/rrthomas/recode"
+REV="2d7092a9999194fc0e9449717a8048c8d8e26c18"
+SRC_URI="https://github.com/pinard/Recode/archive/${REV}.zip -> ${P}.zip"
+
+LICENSE="GPL-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"
+IUSE="nls static-libs"
+
+DEPEND="
+	sys-devel/flex
+	nls? ( sys-devel/gettext )"
+
+S="${WORKDIR}/Recode-${REV}"
+
+# tests fail.
+RESTRICT="test"
+
+src_configure() {
+	tc-export CC LD
+	# on solaris -lintl is needed to compile
+	[[ ${CHOST} == *-solaris* ]] && append-libs "-lintl"
+	# --without-included-gettext means we always use system headers
+	# and library
+	econf \
+		$(use_enable nls) \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -exec rm -v {} + || die
+}
diff --git a/app-text/reed-5.4 b/app-text/reed-5.4
deleted file mode 100644
index 74132b2d45a5..000000000000
--- a/app-text/reed-5.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure prepare
-DEPEND=sys-libs/ncurses
-DESCRIPTION=This is a text pager (text file viewer), used to display etexts
-EAPI=5
-HOMEPAGE=http://web.archive.org/web/20040217010815/www.sacredchao.net/software/reed/
-KEYWORDS=~amd64 x86
-LICENSE=GPL-2
-RDEPEND=sys-libs/ncurses
-SLOT=0
-SRC_URI=http://www.sacredchao.net/software/reed/reed-5.4.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6913eaa429c5e991d4b7ae6c01b719bc
diff --git a/app-text/reed/Manifest b/app-text/reed/Manifest
new file mode 100644
index 000000000000..b955c8bff28b
--- /dev/null
+++ b/app-text/reed/Manifest
@@ -0,0 +1,3 @@
+DIST reed-5.4.tar.gz 32414 BLAKE2B 3a74b5d3501a37671247f8f2eb2baa674e6418669ad59825733faeff100ae7920ee43cd5506ecde9a8d733ec8462266166b59b525cf1a74edd1eea9182127ac1 SHA512 47216c6444ff2a53a0f6ad0e598761d078fb19099507e5687d15be7f875664d3cb9b74f2a4af8c450d179032e46785d96abc66c2bf9cd264db2f87aa089512f7
+EBUILD reed-5.4.ebuild 904 BLAKE2B 5879d481a5cbe6b8501e2a9b2877a0739119283e81be1e0233d2427f3e8c294246d2c66343a0429e79b3fe1ebd013f65f6b0eec2fa89294540505c0ddc8c5feb SHA512 192c30fc19c4c0ad2af92eca1864f956572e43b722d381ac6a84e5c2814e30f3e750159eae4a2a181b71b73d5b4a1811aa6e96a3d4de65eb26b3a11b94023666
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/reed/metadata.xml b/app-text/reed/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-text/reed/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/app-text/reed/reed-5.4.ebuild b/app-text/reed/reed-5.4.ebuild
new file mode 100644
index 000000000000..10999a62f908
--- /dev/null
+++ b/app-text/reed/reed-5.4.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils toolchain-funcs
+
+DESCRIPTION="This is a text pager (text file viewer), used to display etexts"
+# Homepage http://www.sacredchao.net/software/reed/index.shtml does not exist.
+HOMEPAGE="http://web.archive.org/web/20040217010815/www.sacredchao.net/software/reed/"
+SRC_URI="http://www.sacredchao.net/software/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 x86"
+
+DEPEND="sys-libs/ncurses"
+RDEPEND="${DEPEND}"
+
+DOCS=( AUTHORS BUGS NEWS README )
+
+src_prepare() {
+	sed -e 's:-O2:$(CFLAGS) $(LDFLAGS):' \
+		-e 's: wrap::' \
+		-e 's:-s reed:reed:' \
+		-e 's:-lcurses:$(shell ${PKG_CONFIG} --libs ncurses):g' \
+		-i Makefile.in || die
+	rm wrap.1 #Collision with talkfilters, bug #247396
+	tc-export CC PKG_CONFIG
+}
+
+src_configure() {
+	./configures --prefix=/usr || die
+}
diff --git a/app-text/refbase-0.9.5 b/app-text/refbase-0.9.5
deleted file mode 100644
index c4934636f4e4..000000000000
--- a/app-text/refbase-0.9.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst prerm setup
-DEPEND=|| ( <dev-lang/php-5.3[pcre] >=dev-lang/php-5.3 ) dev-lang/php[mysql,session] app-admin/webapp-config app-text/bibutils =www-servers/apache-2* >=app-admin/webapp-config-1.50.15
-DESCRIPTION=Web-based solution for managing scientific literature, references and citations
-EAPI=2
-HOMEPAGE=http://www.refbase.net/
-IUSE=vhosts
-KEYWORDS=~x86 ~amd64
-LICENSE=GPL-2
-RDEPEND=|| ( <dev-lang/php-5.3[pcre] >=dev-lang/php-5.3 ) dev-lang/php[mysql,session] app-admin/webapp-config app-text/bibutils =www-servers/apache-2* >=app-admin/webapp-config-1.50.15
-SLOT=0.9.5
-SRC_URI=mirror://sourceforge/refbase/refbase-0.9.5.tar.gz
-_eclasses_=depend.apache	0917334d570e07f9743a04ff85b3bf1b	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	webapp	6ae2395d7f341093c36057cb4f69101a
-_md5_=313fa6a9637c0ebcb09c076baab59166
diff --git a/app-text/refbase/Manifest b/app-text/refbase/Manifest
new file mode 100644
index 000000000000..fbebeb59fdfc
--- /dev/null
+++ b/app-text/refbase/Manifest
@@ -0,0 +1,4 @@
+AUX postinstall-en.txt 837 BLAKE2B 306f387521e1a4004434e5eba01b1254d6c893515ab0164f96f1bf26c07dbb9d8216d0a2a59173096637f9279d23128d123ae21fe1c8c86c07d7f3dd8d069a30 SHA512 fab28207a5d3bff1c8cb499ced404d5ecf2dfcd27493c0ba8b4cedd14518a0d2fdee16e61c28c6d14daa486de80ef33725cc66b48f4fe1ec9e150e5b037f9f3b
+DIST refbase-0.9.5.tar.gz 1395726 BLAKE2B d39b2ac6dc30e068e1f0f4ba22ca03bc4741c337a32a6e47675bd43d135c018018d2f7097ca8d0e21f72f3dbe51cdd111ba8b9cc855cabb6d3855a52e48625e9 SHA512 68022eee0c15a4e733a8eef8cd5ca15d6e29a4f3559539657c4a38733a4338b51ef4b716cfd964bdd5eb94dda3c7f012b6e01deb59879f3dbfd79d4d8ce11305
+EBUILD refbase-0.9.5.ebuild 904 BLAKE2B f6f0d2db8ccdaf0071caf6cc60e89424e3f4c1d2923668c73e6d1d43c45995ceda51b8c795ec1d63bfe29bb879254a73b09ae4bb03f6d9d0ff1ed45dbb8b2a5a SHA512 42234f423b8e9c3a6f8d3c878d7974d7f672689cf9a6fa61d01978296d6faada55c4c5fc66c1338384ab7481128f19fe01b6cce8d2b9bbd910b6071fd94f4d4b
+MISC metadata.xml 330 BLAKE2B 9e35fe6ced389ecb38ec836735c1d1482efcc1c606f438f433a34543a726d317d903beb94e3fc4c24b6297f4e209e7f8a02bbf046d34fbf3b4fa2813b4c12e89 SHA512 0fbcf620763f7e60e102335842267a1b934695c96b50055e5d338b5504592990c8817afe416cc3b48f9da72aa3365b83ec448165d07446c20fcd4bdd6e5ddb77
diff --git a/app-text/refbase/files/postinstall-en.txt b/app-text/refbase/files/postinstall-en.txt
new file mode 100644
index 000000000000..1b28143032f9
--- /dev/null
+++ b/app-text/refbase/files/postinstall-en.txt
@@ -0,0 +1,22 @@
+You are almost done!
+
+  1. Restart your webserver
+
+  2. Open the file '${MY_INSTALLDIR}/initialize/db.inc.php'
+     in a text editor and edit the values of the variables '\$databaseName', 
+	 '\$username' and '\$password' to fit your needs.
+	 (Note that you'll be able to use the refbase package without modifying
+	 these variables, but we highly recommend not to use the default
+	 values!)
+
+  3. Now, open a web browser and access the 'install.php' script by typing:
+
+     <http://${VHOST_HOSTNAME}/${VHOST_APPDIR}/install.php>
+
+     This should bring up the install form.  Edit the contents of all text 
+	 entry fields to match your server setup and supply the MySQL admin
+     password, then click the 'Install' button to install the database.
+
+  4. For further instructions, see /usr/share/doc/refbase-0.8.0/INSTALL.gz
+				 
+  Enjoy!
diff --git a/app-text/refbase/metadata.xml b/app-text/refbase/metadata.xml
new file mode 100644
index 000000000000..4652275b5605
--- /dev/null
+++ b/app-text/refbase/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">refbase</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/refbase/refbase-0.9.5.ebuild b/app-text/refbase/refbase-0.9.5.ebuild
new file mode 100644
index 000000000000..f2828b542eed
--- /dev/null
+++ b/app-text/refbase/refbase-0.9.5.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="2"
+inherit depend.apache webapp
+
+DESCRIPTION="Web-based solution for managing scientific literature, references and citations"
+HOMEPAGE="http://www.refbase.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~amd64"
+IUSE=""
+DEPEND="|| ( <dev-lang/php-5.3[pcre] >=dev-lang/php-5.3 )
+	dev-lang/php[mysql,session]
+	app-admin/webapp-config
+	app-text/bibutils"
+RDEPEND="${DEPEND}"
+
+need_apache
+
+pkg_setup() {
+	webapp_pkg_setup
+}
+
+src_install () {
+	webapp_src_preinst
+
+	DOCS="AUTHORS BUGS ChangeLog NEWS README TODO UPDATE"
+	dodoc ${DOCS}
+	# Don't install docs to webroot
+	rm -f ${DOCS} COPYING INSTALL
+
+	cp -R * "${D}"${MY_HTDOCSDIR}
+
+	webapp_configfile ${MY_HTDOCSDIR}/initialize
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+
+	webapp_src_install
+}
diff --git a/app-text/referencer-1.2.2 b/app-text/referencer-1.2.2
deleted file mode 100644
index 2e9910d88582..000000000000
--- a/app-text/referencer-1.2.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure postinst postrm prepare setup
-DEPEND=>=app-text/poppler-0.12.3-r3[cairo] >=dev-cpp/gtkmm-2.8:* >=dev-cpp/libglademm-2.6.0 >=dev-cpp/gconfmm-2.14.0 >=dev-libs/boost-1.52.0-r4 >=app-text/gnome-doc-utils-0.3.2 virtual/pkgconfig >=dev-lang/perl-5.8.1 dev-perl/libxml-perl dev-util/intltool app-text/rarian
-DESCRIPTION=Application to organise documents or references, and to generate BibTeX files
-EAPI=6
-HOMEPAGE=https://launchpad.net/referencer
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=app-text/poppler-0.12.3-r3[cairo] >=dev-cpp/gtkmm-2.8:* >=dev-cpp/libglademm-2.6.0 >=dev-cpp/gconfmm-2.14.0 >=dev-libs/boost-1.52.0-r4
-SLOT=0
-SRC_URI=https://launchpad.net/referencer/1./1.2.2/+download/referencer-1.2.2.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8c2aa25b6f0eb2020c8a5a8f3e61474c
diff --git a/app-text/referencer/Manifest b/app-text/referencer/Manifest
new file mode 100644
index 000000000000..2cc56a60cc98
--- /dev/null
+++ b/app-text/referencer/Manifest
@@ -0,0 +1,4 @@
+AUX referencer-1.2.2-lib_path.patch 809 BLAKE2B 2cb37ce577ab7b877353489dcaedf32fb135b7970ed70c031de843e0db50d619c8b83d451945dfe9c5d88f60fd21e5243c026c6cf10b0f113fc375bae7f766e0 SHA512 4857eaf468aaba555e7a74b23f91049c68746a6bc1a80d4df287a3363f92871ccb879bdf7f0f8dfb6f18a6f0443fc61f743cbe23b164de4fa0f8a076f59a839b
+DIST referencer-1.2.2.tar.gz 694421 BLAKE2B 2b48b71610d0cb79feaaeae7af203dedd1dc53d194b1b93306c5f022954a5e50f5db1dd693da76b7d4f33045d3174ed82a0764a9dfee6b6bfe98f352575cf59b SHA512 de8d759890f283e7863e6174334bcb051edf70f87a6fb06f724ffa1699be60c83d0191bde0324b571fab0801752a5b92fb507a3cd337fa9adb5ea7d22b280907
+EBUILD referencer-1.2.2.ebuild 1154 BLAKE2B 3d21875ff3ad618dc50b59cc1ca149d5222a5c449827703fabef5318f1559c7ae7f81af552c818312dcd354907407d15f8c6d442526d18c7968f5c9e94ed8c10 SHA512 216e116d7f0c610645c40c4c668a2b5bd98e31d7304e258983a992c4db69cee053c1331bc7a1cd37079cd8fca87c676c387d955e4a2346d57f530e6c3194087d
+MISC metadata.xml 453 BLAKE2B 8422bf3441f4a64d469ed5d1f3935f93d6ef0a9b04dda823d3ab6cd03f53de8794fcc30732d9c5ba7414f925a346d96ba70fbfe52c628b1ba473b4c4c3180cdd SHA512 966bf89a47f9afee99af80214048a21d332e810ec1013ca8c9d7edb9e7038575c7a86fd1603dd9cf34ffe90f2a93ff55f7f1d1c229d66055872123f7b6f20649
diff --git a/app-text/referencer/files/referencer-1.2.2-lib_path.patch b/app-text/referencer/files/referencer-1.2.2-lib_path.patch
new file mode 100644
index 000000000000..220b47d8b488
--- /dev/null
+++ b/app-text/referencer/files/referencer-1.2.2-lib_path.patch
@@ -0,0 +1,21 @@
+From: Dominik Kriegner <dominik.kriegner@gmail.com>
+Date: Tue, 29 Nov 2016 09:56:00 +0000
+Subject: [PATCH] fix build issue
+Patch's original author is Askhat Bakarov on arch
+https://aur.archlinux.org/cgit/aur.git/commit/?h=referencer&id=961f2b5e4b286f27f610e5267465c63021b8a50f
+
+Project-Bug-URL: https://bugs.launchpad.net/referencer/+bug/1645639
+Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=601174
+merged upstream: http://bazaar.launchpad.net/~referencer-devs/referencer/trunk/revision/939
+
+--- a/src/Document.C	2014-01-27 03:43:00.000000000 +0700
++++ b/src/Document.C	2016-11-03 16:25:00.698676538 +0700
+@@ -297,7 +297,7 @@
+ 
+ 			lib_path = lib_path->get_parent();
+ 			up_dir_level += "../";
+-			if (lib_path == 0) {
++			if (!lib_path) {
+ 				doc_is_relative_to_library = false;
+ 				break;
+ 			}
diff --git a/app-text/referencer/metadata.xml b/app-text/referencer/metadata.xml
new file mode 100644
index 000000000000..8b254b7dbc9a
--- /dev/null
+++ b/app-text/referencer/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>dominik.kriegner@gmail.com</email>
+		<name>Dominik Kriegner</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="launchpad">referencer</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/referencer/referencer-1.2.2.ebuild b/app-text/referencer/referencer-1.2.2.ebuild
new file mode 100644
index 000000000000..06a5922851df
--- /dev/null
+++ b/app-text/referencer/referencer-1.2.2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit xdg-utils eutils python-single-r1 flag-o-matic
+
+DESCRIPTION="Application to organise documents or references, and to generate BibTeX files"
+HOMEPAGE="https://launchpad.net/referencer"
+SRC_URI="https://launchpad.net/${PN}/1./${PV}/+download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=app-text/poppler-0.12.3-r3[cairo]
+	>=dev-cpp/gtkmm-2.8:*
+	>=dev-cpp/libglademm-2.6.0
+	>=dev-cpp/gconfmm-2.14.0
+	>=dev-libs/boost-1.52.0-r4"
+
+DEPEND="
+	${RDEPEND}
+	>=app-text/gnome-doc-utils-0.3.2
+	virtual/pkgconfig
+	>=dev-lang/perl-5.8.1
+	dev-perl/libxml-perl
+	dev-util/intltool
+	app-text/rarian"
+
+PATCHES=( ${FILESDIR}/${PN}-${PV}-lib_path.patch )
+
+src_prepare () {
+	default
+	python_fix_shebang plugins
+}
+
+src_configure() {
+	append-cxxflags -std=gnu++11
+	econf \
+		--disable-update-mime-database \
+		--enable-python
+}
+
+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/restview-2.7.0 b/app-text/restview-2.7.0
deleted file mode 100644
index 34d8c2750e27..000000000000
--- a/app-text/restview-2.7.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/docutils[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygments[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/readme_renderer[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/mock[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=reStructuredText viewer
-EAPI=6
-HOMEPAGE=https://mg.pov.lt/restview/ https://pypi.org/project/restview/
-IUSE=test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/docutils[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygments[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/readme_renderer[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/r/restview/restview-2.7.0.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=25b0003131ddeb095a8aa0f20c2f0ad6
diff --git a/app-text/restview-2.8.0 b/app-text/restview-2.8.0
deleted file mode 100644
index c8221a3580a0..000000000000
--- a/app-text/restview-2.8.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/docutils[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygments[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/readme_renderer[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/mock[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=reStructuredText viewer
-EAPI=6
-HOMEPAGE=https://mg.pov.lt/restview/ https://pypi.org/project/restview/
-IUSE=test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/docutils[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygments[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/readme_renderer[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/r/restview/restview-2.8.0.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=25b0003131ddeb095a8aa0f20c2f0ad6
diff --git a/app-text/restview-2.8.1 b/app-text/restview-2.8.1
deleted file mode 100644
index e86f6cdaf69f..000000000000
--- a/app-text/restview-2.8.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/docutils[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygments[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/readme_renderer[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/mock[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=reStructuredText viewer
-EAPI=6
-HOMEPAGE=https://mg.pov.lt/restview/ https://pypi.org/project/restview/
-IUSE=test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/docutils[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pygments[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/readme_renderer[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/r/restview/restview-2.8.1.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2c896dcf97708da6ed2f60f8045016a3
diff --git a/app-text/restview/Manifest b/app-text/restview/Manifest
new file mode 100644
index 000000000000..809e30bfdda1
--- /dev/null
+++ b/app-text/restview/Manifest
@@ -0,0 +1,7 @@
+DIST restview-2.7.0.tar.gz 29448 BLAKE2B 0cf90599fb9b5c98e674f690ce3082f61f6ab83c46ae90934bafe5d9b62eff70f943a18aef91cfb61e234e04a4fb12d39c2e3a01faec688574ecf6c2d0b22f89 SHA512 fccfed505832b85bd4fad964f78b0de371ea0a42ac5cc700a8604e413743a236b70f0160edc115d1e9cdef03f2aa7fc461893f40e01203a048756887f655f65c
+DIST restview-2.8.0.tar.gz 44577 BLAKE2B 03fb6d6200b9b9c82abd2fc5f81cf7afd2ade0067b0e657b7d19a3abd12d72046633217ef57143f3f45c8360721acc65d499cc8c9bd31a461318699368ff7d7f SHA512 99bee763493d2a5fdf17b228c62eb9fe6adfbb6e0f3e09c758ceaeabc6dece892dbd750d043d722c6df456b27bdeeecfe1cf4187a53c2a0333a05b1e147e71b5
+DIST restview-2.8.1.tar.gz 46103 BLAKE2B 3f5b8852b1d174736333461181e9cad06c16ea8ac40e5041c5bf8246360e161609d99ac26a7a32f1dec518c017a30ecf1ac46eea80569b0d213ae62bee8ecc5d SHA512 cbc6057df06a108ced9bfbc7442730c8bbe3bbe334eb6f708dd54e899ed6630bfb05e532c403a9a1a36b170dbe933a5829ada3b014147a3834c492456ca65363
+EBUILD restview-2.7.0.ebuild 722 BLAKE2B 20d65f181d143b3ca98c733e81546ca82cc92536e31c8380ccd74ac6ec9deb4c33fbbb7e845308314fc10e683d3404c30bdd7bf8031c1bf47a126d70f64f2530 SHA512 5d6dfc20a515bc4be4df12ac7ed8a670dbea571762c170f7723604141b82d160b0a41a6e352ada16f61f0f73f24921241d080bb771c1e7aac09ee08b1e4b0b49
+EBUILD restview-2.8.0.ebuild 722 BLAKE2B 20d65f181d143b3ca98c733e81546ca82cc92536e31c8380ccd74ac6ec9deb4c33fbbb7e845308314fc10e683d3404c30bdd7bf8031c1bf47a126d70f64f2530 SHA512 5d6dfc20a515bc4be4df12ac7ed8a670dbea571762c170f7723604141b82d160b0a41a6e352ada16f61f0f73f24921241d080bb771c1e7aac09ee08b1e4b0b49
+EBUILD restview-2.8.1.ebuild 722 BLAKE2B d3e5a2c8c0c1f0e18df5b66c75475c93a79942b3185e67ad9da0347098e53367c20be7d6261a1bb4fa51acfa09de69cca6a0a9d679bff9f80125a6293657227b SHA512 30b04b0bd3ec1f495f4d8e09740b654dc777732fa579468a72ee36d17e057f9d0691ce6f65a39fd912ab2497ce1ffd169c007322a4798fec237b9c37d36e645f
+MISC metadata.xml 327 BLAKE2B c839b763e0975489978f878c5ae32c89e3596cf5cdb2061cbada9a698b7985779abf6645b50f772d5924fcca664766cc31b186c9bf4fba9e76cd099c6559e78e SHA512 f4fcd47d4f411bbae5e9a29055a34a0e4a0367750ac10ce57bec7d4c32dbce43679e041b444eab258e616b571936de251fa22fd06aa8e3258cc2c882f913d3b9
diff --git a/app-text/restview/metadata.xml b/app-text/restview/metadata.xml
new file mode 100644
index 000000000000..573ddfb8edd2
--- /dev/null
+++ b/app-text/restview/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>radhermit@gentoo.org</email>
+    <name>Tim Harder</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">restview</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-text/restview/restview-2.7.0.ebuild b/app-text/restview/restview-2.7.0.ebuild
new file mode 100644
index 000000000000..72050adfa23f
--- /dev/null
+++ b/app-text/restview/restview-2.7.0.ebuild
@@ -0,0 +1,32 @@
+# 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} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="reStructuredText viewer"
+HOMEPAGE="https://mg.pov.lt/restview/ https://pypi.org/project/restview/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/readme_renderer[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? ( dev-python/mock[${PYTHON_USEDEP}] )
+"
+
+DOCS=( README.rst CHANGES.rst )
+
+python_test() {
+	esetup.py test
+}
diff --git a/app-text/restview/restview-2.8.0.ebuild b/app-text/restview/restview-2.8.0.ebuild
new file mode 100644
index 000000000000..72050adfa23f
--- /dev/null
+++ b/app-text/restview/restview-2.8.0.ebuild
@@ -0,0 +1,32 @@
+# 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} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="reStructuredText viewer"
+HOMEPAGE="https://mg.pov.lt/restview/ https://pypi.org/project/restview/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/readme_renderer[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? ( dev-python/mock[${PYTHON_USEDEP}] )
+"
+
+DOCS=( README.rst CHANGES.rst )
+
+python_test() {
+	esetup.py test
+}
diff --git a/app-text/restview/restview-2.8.1.ebuild b/app-text/restview/restview-2.8.1.ebuild
new file mode 100644
index 000000000000..4a48d1c8d80c
--- /dev/null
+++ b/app-text/restview/restview-2.8.1.ebuild
@@ -0,0 +1,32 @@
+# 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} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="reStructuredText viewer"
+HOMEPAGE="https://mg.pov.lt/restview/ https://pypi.org/project/restview/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/readme_renderer[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? ( dev-python/mock[${PYTHON_USEDEP}] )
+"
+
+DOCS=( README.rst CHANGES.rst )
+
+python_test() {
+	esetup.py test
+}
diff --git a/app-text/rfcutil-3.2.3-r2 b/app-text/rfcutil-3.2.3-r2
deleted file mode 100644
index 74c68f834719..000000000000
--- a/app-text/rfcutil-3.2.3-r2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst prepare prerm
-DESCRIPTION=return all related RFCs based upon a number or a search string
-EAPI=4
-HOMEPAGE=http://www.dewn.com/rfc/
-KEYWORDS=amd64 ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=freedist
-RDEPEND=dev-lang/perl || ( www-client/lynx virtual/w3m )
-SLOT=0
-SRC_URI=http://www.dewn.com/rfc/rfc-3.2.3.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=bebf750080169430340170c479caf6a3
diff --git a/app-text/rfcutil/Manifest b/app-text/rfcutil/Manifest
new file mode 100644
index 000000000000..1b2fc35136f4
--- /dev/null
+++ b/app-text/rfcutil/Manifest
@@ -0,0 +1,5 @@
+AUX rfc-3.2.3-index.patch 998 BLAKE2B 03681e23c38abb48d31f1b163ac4086b90a535ec1e27ea7a9dd8d9ed7fe3d6dfeb215a0199525677b0e648aac7ab5abf269c9bda2c8631b580d14c97e2123b68 SHA512 cbf0dd87e6879e2510da0cbb43a62ac1e772afda178d8c9d6a8817c93b8edfa2dda98bda0b57c6bd3abdc06e558b8656ef9dd7467cd4efdba391a01a1f47180a
+AUX rfc-3.2.3-paths.patch 839 BLAKE2B 64a0dcd84fe6405e6f1f03c5be3bf4de7dc4d1f1fc9fbf393d7ddded35b20bbc2669a1e5c35fa1ae75d8950f89ce10ef4ebda4e1ded729c6a00da039ee9ed85a SHA512 be0897633ed1a56ccd5f44b018af030a9eeb6c02cd792dfe5cc0f3280f9a9319f5c48a2f71a6928b64c6ec7360c3f7c18ec74d9cea4039cfd68e35147eea1d79
+DIST rfc-3.2.3.tar.gz 10469 BLAKE2B 8158a707c216a88b0ed41b60146f1ef53bdd060ed88cef18e38c9fe69c638fec38df1c83d4bce281d85446f11e2035086c7d2f19b8bd60c8fa4349f0e9f35bfa SHA512 b16ff2ee0c7a1213369dd4d5d1033c6daf95f283b170ffc46c02b65cd125d4bf2b5dd8b25e8b6a9153330f8fc624454589ecb6d77f2d47e9e34ae18ccbdaf095
+EBUILD rfcutil-3.2.3-r2.ebuild 951 BLAKE2B bc581f684a5cb4d812606152295e7dcecdde81c33f468226f0adbdefb568f3f338886964e2818095415e2d33ae49a74028039f0427e8a3d15b1402bd958ad27f SHA512 5d86444d8656d6c1aa725868a8aac33b040da5e5c6b5aefac542cc40b186e3d05ac17b99d936bec1077bcbbbac17f2194fde08528493d91d3a725734842f4788
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/rfcutil/files/rfc-3.2.3-index.patch b/app-text/rfcutil/files/rfc-3.2.3-index.patch
new file mode 100644
index 000000000000..6b4deb607d6a
--- /dev/null
+++ b/app-text/rfcutil/files/rfc-3.2.3-index.patch
@@ -0,0 +1,17 @@
+--- a/rfc-3.2.3/rfc-3.2.3
++++ b/rfc-3.2.3/rfc-3.2.3
+@@ -103,11 +103,12 @@
+     ."It may be desirable to change the\n\$indexpath to a location you can write to.";
+     close (INDEXPATH);
+     $indexlength=numlines($indexpath);
+-    print "Modem users one moment, it's about 400k \(doesn't need to be updated often\)\n";
++    print "Modem users one moment, it's about 1024k \(doesn't need to be updated often\)\n";
+     print "original lines \t= $indexlength\t$indexpath\n";
+     #system ("$viewer -dump http://www.faqs.org/rfc/rfc-index.txt > $indexpath");
+     #system ("$viewer -dump http://www.dewn.com/rfc/rfc-index.txt > $indexpath");
+-    system ("$viewer -dump http://ftp.isi.edu/in-notes/rfc-index.txt > $indexpath");
++    #system ("$viewer -dump http://ftp.isi.edu/in-notes/rfc-index.txt > $indexpath");
++    system ("$viewer -dump http://www.ietf.org/rfc/rfc-index.txt > $indexpath");
+     $indexlength=numlines($indexpath); print "new lines \t= $indexlength\t$indexpath\n";
+     exit }
+ 
diff --git a/app-text/rfcutil/files/rfc-3.2.3-paths.patch b/app-text/rfcutil/files/rfc-3.2.3-paths.patch
new file mode 100644
index 000000000000..8d61bdbf3889
--- /dev/null
+++ b/app-text/rfcutil/files/rfc-3.2.3-paths.patch
@@ -0,0 +1,22 @@
+--- a/rfc-3.2.3/rfc-3.2.3
++++ b/rfc-3.2.3/rfc-3.2.3
+@@ -36,8 +36,8 @@
+ 
+ # These make it avail for all users if you can't 
+ # run it as root. (full path, not ~/ )
+-$indexpath="/usr/local/etc/rfc-index";
+-$servpath="/usr/local/etc/nmap-services";
++$indexpath="@GENTOO_PORTAGE_EPREFIX@/var/cache/rfc/rfc-index";
++$servpath="@GENTOO_PORTAGE_EPREFIX@/etc/nmap-services";
+ 
+ ####################################
+ ## add as many urls as you please ##
+@@ -46,7 +46,7 @@
+ 	    !http://www.faqs.org/rfcs/
+ 	    http://www.isi.edu/in-notes/
+ 	    http://www.cis.ohio-state.edu/htbin/rfc/
+-	    /local/path/to/rfcs/);   #MAKE SURE you have the trailing slashes
++	    @GENTOO_PORTAGE_EPREFIX@/var/cache/rfc/rfcs/);   #MAKE SURE you have the trailing slashes
+ 	    # URLs beginning with an ! are treated as HTML and not text
+ 
+ #######################
diff --git a/app-text/rfcutil/metadata.xml b/app-text/rfcutil/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-text/rfcutil/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/app-text/rfcutil/rfcutil-3.2.3-r2.ebuild b/app-text/rfcutil/rfcutil-3.2.3-r2.ebuild
new file mode 100644
index 000000000000..2706c02ec2ab
--- /dev/null
+++ b/app-text/rfcutil/rfcutil-3.2.3-r2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit eutils prefix
+
+MY_PN="rfc"
+MY_P="${MY_PN}-${PV}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="return all related RFCs based upon a number or a search string"
+HOMEPAGE="http://www.dewn.com/rfc/"
+SRC_URI="http://www.dewn.com/rfc/${MY_P}.tar.gz"
+
+LICENSE="freedist"
+SLOT="0"
+KEYWORDS="amd64 ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE=""
+
+RDEPEND="dev-lang/perl
+	|| ( www-client/lynx virtual/w3m )"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${MY_P}-paths.patch \
+		"${FILESDIR}"/${MY_P}-index.patch
+	eprefixify ${MY_P}
+}
+
+src_install() {
+	newbin ${MY_P} ${MY_PN}
+	doman ${MY_PN}.1
+	dodoc CHANGELOG KNOWN_BUGS README
+	keepdir /var/cache/rfc
+}
+
+pkg_postinst() {
+	elog "Gaarde suggests you make a cron.monthly to run the following:"
+	elog "   ${EPREFIX}/usr/bin/rfc -i"
+}
+
+pkg_prerm() {
+	rm -f "${EROOT}"/var/cache/rfc/*
+}
diff --git a/app-text/rhyme-0.9-r1 b/app-text/rhyme-0.9-r1
deleted file mode 100644
index c9060dd57291..000000000000
--- a/app-text/rhyme-0.9-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=>=sys-libs/readline-4.3 >=sys-libs/gdbm-1.8.0
-DESCRIPTION=Console based Rhyming Dictionary
-EAPI=2
-HOMEPAGE=http://rhyme.sourceforge.net/
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=sys-libs/readline-4.3 >=sys-libs/gdbm-1.8.0
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://sourceforge/rhyme/rhyme-0.9.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=428d953de7eb80e54fbc82190c5be3c7
diff --git a/app-text/rhyme/Manifest b/app-text/rhyme/Manifest
new file mode 100644
index 000000000000..c754e7726e2b
--- /dev/null
+++ b/app-text/rhyme/Manifest
@@ -0,0 +1,3 @@
+DIST rhyme-0.9.tar.gz 896013 BLAKE2B d163013a0507fae2c2094076fe77f3ff6be252968e38adb97734ae7ada16407ef2f47ebdded9e7a0c06207514923e0bd881968c9a5088d715e1ecb4b1fc03c09 SHA512 a769313c4790eae94eca1ecf8c00459b9d74e6437d339f8dc9f6642eea51258a0fc2541877a68eeb3a897c29877b673be17826450c1da5a2352a61266784d0fb
+EBUILD rhyme-0.9-r1.ebuild 971 BLAKE2B 3948b8e3087b94ff3a640f61288354dde7edccddec5c971633c07bf2536146a460c0a1b8de3022927454a1de5524068624234fcff93e01280c3b079375c85901 SHA512 7d5bdad5eff4b3a4d31cfbab65e38971b6cc41756cfaf2f7d210a89a7c98b78569c59db670f8de5dcc23aa2bf254a9b280b365efbe3f3ec83259b011f6a45f9c
+MISC metadata.xml 667 BLAKE2B 0a3c441145a0dbdfdbba7fbce7bc3fa8f1bba7abfa5a50b1edf26fed70535812be42deff9f38641f8f59779f025f0d2c37c115fe5ce9238a50c6635363ac386d SHA512 c63a131298491268402524a8efed010e464393ccc19343cc966d5c2b39d3e69b890264902614f3a2ba18eeb253faf7624b9fe488b3b501e04122d8841e7caac6
diff --git a/app-text/rhyme/metadata.xml b/app-text/rhyme/metadata.xml
new file mode 100644
index 000000000000..aa21005d2367
--- /dev/null
+++ b/app-text/rhyme/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<longdescription lang="en">
+		What is this thing? Why it's a rhyming dictionary, of course! But more
+		specifically, it's a command-line program that takes a word and returns
+		to you a formatted list of all words that rhyme with it. The default
+		response is a perfect rhyme (which is probably what you want). Or you
+		can get a syllable count of a certain word ("whitening" has 2-3
+		syllables, etc.).
+	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">rhyme</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/rhyme/rhyme-0.9-r1.ebuild b/app-text/rhyme/rhyme-0.9-r1.ebuild
new file mode 100644
index 000000000000..660464e5c6ba
--- /dev/null
+++ b/app-text/rhyme/rhyme-0.9-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="2"
+
+inherit toolchain-funcs
+
+# missing files ...
+RESTRICT="test"
+
+DESCRIPTION="Console based Rhyming Dictionary"
+HOMEPAGE="http://rhyme.sourceforge.net/"
+SRC_URI="mirror://sourceforge/rhyme/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND=">=sys-libs/readline-4.3
+	>=sys-libs/gdbm-1.8.0"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	# termcap is used by default, switch to ncurses
+	sed -i Makefile \
+		-e 's|-ltermcap||g' \
+		-e 's|-o rhyme|$(LDFLAGS) &|g' \
+		|| die "sed Makefile"
+}
+
+src_compile() {
+	# Disable parallell building wrt bug #125967
+	emake -j1 CC="$(tc-getCC)" FLAGS="${CFLAGS}" || die "emake failed"
+}
+
+src_install() {
+	# author doesnt use -D for install
+	dodir /usr/share/rhyme /usr/bin /usr/share/man/man1
+
+	einstall BINPATH="${D}"/usr/bin \
+			MANPATH="${D}"/usr/share/man/man1 \
+			RHYMEPATH="${D}"/usr/share/rhyme
+}
diff --git a/app-text/rman-3.2-r1 b/app-text/rman-3.2-r1
deleted file mode 100644
index 8b542995684e..000000000000
--- a/app-text/rman-3.2-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=PolyGlotMan man page translator AKA RosettaMan
-EAPI=5
-HOMEPAGE=https://sourceforge.net/projects/polyglotman/
-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
-LICENSE=Artistic
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://sourceforge/polyglotman/rman-3.2.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7efa898b36cdf0691065528e9761182f
diff --git a/app-text/rman/Manifest b/app-text/rman/Manifest
new file mode 100644
index 000000000000..3d66d947d52b
--- /dev/null
+++ b/app-text/rman/Manifest
@@ -0,0 +1,6 @@
+AUX rman-3.2-format-security.patch 458 BLAKE2B 85807cbc0ffa292c56794f61f371333813283abce2eceee7485849ac60bed91c6c5e336c27a53049ec891bbaeb0cfc2253002fba487a79b713f91ec983519ceb SHA512 1994555d399656f9d22586464f1ee46f67d279c1d93184b69e551b87d9fb393ba24ad7dc6ea62dda1288fe605dedca1e4bdc20eb333acedc535f1063e2f62aab
+AUX rman-3.2-gentoo.diff 560 BLAKE2B 7f63625d37971f537c44667a05ec5b65c7c2216c05b5cc447fc802be3a35df365def1c8a95aebd5ed2f462eeced80cd1c106fb2708c231568a7666d1fa7335d4 SHA512 528b2e7385882620ecaa0374a65579e0fe56803aa6991277ea1279d18d65a4331ebbfc2374a711bda2f5722a5fcc236681f9c4dfb3c0abed1e931ff986cbf74e
+AUX rman-3.2-ldflags.patch 451 BLAKE2B ee44bfca1a15b8a52a42c703ca749722257f8ded019fa3119687f0808ad85ae696096bc29d5a7b04c4527382ad1f3f9d8d2d3e3bfb72005a167be3e95693a4b3 SHA512 936c9fb92e3f018ec0006370ea61f010b61469171a22a9f52a6773f32ef3ab01764b726573aa30548b1c9ea6db3893302a45d20c06bc19f7e272b5e531bec433
+DIST rman-3.2.tar.gz 79397 BLAKE2B 2be1c60f77c3b2c4fa73a59c5a8965da1c8b1f3b569e7e4d5716a372228bacb81c5421f4bbf330781aa231835393c915ed14057c717cb1e8ed57101f7febb37d SHA512 a70aea0af1510088fd88a736e63a6dab9200040be5eb89912ede4f50e3de97d423574841bbb66e90fb12934f3834dac0acefe78ff1c73a78a79c95c3dd6fa5ae
+EBUILD rman-3.2-r1.ebuild 827 BLAKE2B c8009479031369a6fcbed5b82a19754d69cb580b3a6527c055bc7c611d377bf47bed9af2b5d4a37b8b6e532240ef8fa20c76a7d8c890025edb2381d8359fed01 SHA512 4d7b4a492185ae4924efda0d98816059468af14285891f609956ed6e7cbcc5d013d4d8172e96d7f1b9892fc8991aaa4d259aa807c730435716610bd90e76efac
+MISC metadata.xml 334 BLAKE2B f3759592bab3b3f8426acb5a0fff5d5d7efb5618c951e2c0a26dcc119f609702f45327dcc47de6132befee7064536413006e77a09ab67415c041b0697129df6c SHA512 29d5b70060964469ce308fed8bc01e09bb74b3d2ac0605760d88f7dbd19a1cdd6517cdbab76f4269188454112837e0d27b32bbf3c5b9ecd5bb4d3ea4f862188c
diff --git a/app-text/rman/files/rman-3.2-format-security.patch b/app-text/rman/files/rman-3.2-format-security.patch
new file mode 100644
index 000000000000..77070026bdb9
--- /dev/null
+++ b/app-text/rman/files/rman-3.2-format-security.patch
@@ -0,0 +1,16 @@
+ rman.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/rman.c b/rman.c
+index d09e547..e5fc88d 100644
+--- a/rman.c
++++ b/rman.c
+@@ -1372,7 +1372,7 @@ HTML(enum command cmd) {
+ 		break;
+ 	   case BEGINSECTION:	break;
+ 	   case ENDSECTION:
+-		if (sectheadid==NAME && message!=NULL) printf(message);
++		if (sectheadid==NAME && message!=NULL) printf("%s", message);
+ 		break;
+ 	   case BEGINSUBSECTION:	break;
+ 	   case ENDSUBSECTION:	break;
diff --git a/app-text/rman/files/rman-3.2-gentoo.diff b/app-text/rman/files/rman-3.2-gentoo.diff
new file mode 100644
index 000000000000..ece1e3807e66
--- /dev/null
+++ b/app-text/rman/files/rman-3.2-gentoo.diff
@@ -0,0 +1,19 @@
+diff -urN rman-3.2.orig/Makefile rman-3.2/Makefile
+--- rman-3.2.orig/Makefile	2003-07-26 12:15:00.000000000 -0700
++++ rman-3.2/Makefile	2005-07-12 01:01:37.000000000 -0700
+@@ -15,13 +15,8 @@
+ #    this must be a directory that's in your bin PATH.
+ # MANDIR holds the man page.
+ 
+-BINDIR = /opt/local/bin
+-#BINDIR = /usr/local/bin
+-#BINDIR = //C/bin
+-MANDIR = /usr/local/man/man1
+-# popular alternative
+-#BINDIR = /opt/local/bin
+-#MANDIR = /opt/local/man/man1
++BINDIR = /usr/bin
++MANDIR = /usr/share/man/man1
+ 
+ 
+ ### if you have GNU gcc, use these definitions
diff --git a/app-text/rman/files/rman-3.2-ldflags.patch b/app-text/rman/files/rman-3.2-ldflags.patch
new file mode 100644
index 000000000000..4a6f5f5d9eab
--- /dev/null
+++ b/app-text/rman/files/rman-3.2-ldflags.patch
@@ -0,0 +1,13 @@
+Index: rman-3.2/Makefile
+===================================================================
+--- rman-3.2.orig/Makefile
++++ rman-3.2/Makefile
+@@ -102,7 +102,7 @@ all:  rman
+ 
+ # everyone but me zaps assertions with the -DNDEBUG flag
+ rman: rman.c Makefile
+-	$(CC) -DNDEBUG $(defs) -DPOLYGLOTMANVERSION=\"$(version)\" $(CFLAGS) -o rman rman.c
++	$(CC) $(LDFLAGS) -DNDEBUG $(defs) -DPOLYGLOTMANVERSION=\"$(version)\" $(CFLAGS) -o rman rman.c
+ 
+ 
+ debug:
diff --git a/app-text/rman/metadata.xml b/app-text/rman/metadata.xml
new file mode 100644
index 000000000000..142b07948920
--- /dev/null
+++ b/app-text/rman/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">polyglotman</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/rman/rman-3.2-r1.ebuild b/app-text/rman/rman-3.2-r1.ebuild
new file mode 100644
index 000000000000..a7c1c12e39bd
--- /dev/null
+++ b/app-text/rman/rman-3.2-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="PolyGlotMan man page translator AKA RosettaMan"
+HOMEPAGE="https://sourceforge.net/projects/polyglotman/"
+SRC_URI="mirror://sourceforge/polyglotman/${P}.tar.gz"
+
+LICENSE="Artistic"
+SLOT="0"
+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=""
+
+RESTRICT="test"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-gentoo.diff \
+		"${FILESDIR}"/${P}-ldflags.patch \
+		"${FILESDIR}"/${P}-format-security.patch
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	dobin ${PN}
+	doman ${PN}.1
+}
diff --git a/app-text/rnv-1.7.11-r1 b/app-text/rnv-1.7.11-r1
deleted file mode 100644
index 50d3b3def081..000000000000
--- a/app-text/rnv-1.7.11-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare unpack
-DEPEND=dev-libs/expat dev-scheme/scm[libscm]
-DESCRIPTION=A lightweight Relax NG Compact Syntax validator
-EAPI=6
-HOMEPAGE=http://www.davidashen.net/rnv.html
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=dev-libs/expat dev-scheme/scm[libscm]
-SLOT=0
-SRC_URI=mirror://sourceforge/rnv/rnv-1.7.11.tar.xz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	unpacker	87633b2194cdb56adaa1f5a5c8862c44
-_md5_=7300efb2c06eb0abeecce9f659cad466
diff --git a/app-text/rnv/Manifest b/app-text/rnv/Manifest
new file mode 100644
index 000000000000..9404d1a8d19e
--- /dev/null
+++ b/app-text/rnv/Manifest
@@ -0,0 +1,3 @@
+DIST rnv-1.7.11.tar.xz 140904 BLAKE2B 01b4400cb5bcfbc850f58d5b59ab8259532926f436ddfa20c63ab35cab30a30ae8429b82be0c589b694a12a9558436a1a3c445a42734af84ca6b66e5f6cf6796 SHA512 e706ae6cc9b55032b23c0ce4ce728f426727c20d0291f9ea4369221c5b3d59f29ad477c6da4992a9bda7c583078498faabc06a9865081517aeac81b2d2fec212
+EBUILD rnv-1.7.11-r1.ebuild 655 BLAKE2B 2a8928f2bc8e0de300bd5f1145f647edd4915dcf2952204915790b61468dff6aca45200747995851e0a89d932ed07b28e6021811e5071aff44b2ec6a10f71ae9 SHA512 bb16825fd60d75691432910e5fbaa732b7bf9186e06c1ac9c0353df55a7bfa4ecb6cd5e36ed4603a973567df5ad9372fc5da73830213a1ccc2bac9e81185d7ff
+MISC metadata.xml 239 BLAKE2B 8d54adc4713f80a925ad0590e17bb5d790690254160804e1d05bd2d257843af2a9f7793f041c140e76727f9bfea187a41933b9e4fb6b76bc889ff8bcdfc443b8 SHA512 7eb6bf1beffa771eee5c4de5dcf2ba3966398fcf6ea009eaeaa1d73cbdfc3d38907b8fd3c711144089b2ae506bcfa394f76ffd66238fd7df8e2f95589bb2f5f9
diff --git a/app-text/rnv/metadata.xml b/app-text/rnv/metadata.xml
new file mode 100644
index 000000000000..453784645d4c
--- /dev/null
+++ b/app-text/rnv/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="sourceforge">rnv</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/rnv/rnv-1.7.11-r1.ebuild b/app-text/rnv/rnv-1.7.11-r1.ebuild
new file mode 100644
index 000000000000..1ca31dcce3d1
--- /dev/null
+++ b/app-text/rnv/rnv-1.7.11-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit unpacker toolchain-funcs
+
+DESCRIPTION="A lightweight Relax NG Compact Syntax validator"
+HOMEPAGE="http://www.davidashen.net/rnv.html"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="
+	dev-libs/expat
+	dev-scheme/scm[libscm]
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+	sed -i -e "/^AR/s/ar/$(tc-getAR)/" Makefile.in || die 'sed on Makefile.in failed'
+}
+
+src_configure() {
+	LIBS="-ldl -lm" \
+		econf --with-scm="/usr"
+}
+
+src_install() {
+	default
+	dodoc readme.txt
+}
diff --git a/app-text/robodoc-4.99.36 b/app-text/robodoc-4.99.36
deleted file mode 100644
index a64bd0469753..000000000000
--- a/app-text/robodoc-4.99.36
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=>=dev-util/ctags-5.3.1
-DESCRIPTION=Automating Software Documentation
-EAPI=5
-HOMEPAGE=http://www.xs4all.nl/~rfsber/Robo/robodoc.html
-IUSE=examples
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=>=dev-util/ctags-5.3.1
-SLOT=0
-SRC_URI=http://www.xs4all.nl/~rfsber/Robo/DistSource/robodoc-4.99.36.tar.gz
-_md5_=bb699e385c20968c8d7c8b6cb10b1329
diff --git a/app-text/robodoc/Manifest b/app-text/robodoc/Manifest
new file mode 100644
index 000000000000..54d2ed50db1b
--- /dev/null
+++ b/app-text/robodoc/Manifest
@@ -0,0 +1,3 @@
+DIST robodoc-4.99.36.tar.gz 280680 BLAKE2B 94662733945f6bbed5a5b6207423c175b1ce0c700f3488cc55bbd79d864c0ee10d49ac27ab8869c09a06708d31e6d1f9e7600bb0fdd7e0477559e19b21ec0a30 SHA512 6643cb1419c58195f26899e629a4a7470014b425e05b7615e523f972b67eb0e39421c373b8c80b53a4dd0d121d61481a7a0e66f7fca7fe82422d56b8ff048b9b
+EBUILD robodoc-4.99.36.ebuild 817 BLAKE2B cec294e613cafeaf434dec1ac1fe110051ece61e3363df629f5f1895fb97540875140e18827299f1bdde8a7cba2b0b4e3b393b82d365d59cec99b6fe9df113c2 SHA512 58ac7ff9c1cd30fadb077cece95dc1d2dd1933acc0f7e56e5045431cc6f03b6569fb565c64693063f9928d1c54c121a3440ccb2a3d75027a15d0d49851ee5cef
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/robodoc/metadata.xml b/app-text/robodoc/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-text/robodoc/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/app-text/robodoc/robodoc-4.99.36.ebuild b/app-text/robodoc/robodoc-4.99.36.ebuild
new file mode 100644
index 000000000000..bc373d944a6e
--- /dev/null
+++ b/app-text/robodoc/robodoc-4.99.36.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="Automating Software Documentation"
+HOMEPAGE="http://www.xs4all.nl/~rfsber/Robo/robodoc.html"
+SRC_URI="http://www.xs4all.nl/~rfsber/Robo/DistSource/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+RDEPEND=">=dev-util/ctags-5.3.1"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	econf \
+		--docdir=/usr/share/doc/${PF} \
+		--disable-dependency-tracking
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	insinto /usr/share/${PN}
+	doins Contributions/* || die "doins failed"
+
+	rm -f "${D}"/usr/share/doc/${PF}/{COPYING,INSTALL}
+
+	if use examples; then
+		insinto /usr/share/${PN}
+		doins -r Examples/PerlExample || die "doins failed"
+	fi
+}
diff --git a/app-text/ronn-0.7.3-r3 b/app-text/ronn-0.7.3-r3
deleted file mode 100644
index 172b1d11c10e..000000000000
--- a/app-text/ronn-0.7.3-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby23? ( >=dev-ruby/hpricot-0.8.2[ruby_targets_ruby23] >=dev-ruby/mustache-0.7.0[ruby_targets_ruby23] >=dev-ruby/rdiscount-1.5.8[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/hpricot-0.8.2[ruby_targets_ruby24] >=dev-ruby/mustache-0.7.0[ruby_targets_ruby24] >=dev-ruby/rdiscount-1.5.8[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/hpricot-0.8.2[ruby_targets_ruby25] >=dev-ruby/mustache-0.7.0[ruby_targets_ruby25] >=dev-ruby/rdiscount-1.5.8[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( >=dev-ruby/hpricot-0.8.2[ruby_targets_ruby23] >=dev-ruby/mustache-0.7.0[ruby_targets_ruby23] >=dev-ruby/rdiscount-1.5.8[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/hpricot-0.8.2[ruby_targets_ruby24] >=dev-ruby/mustache-0.7.0[ruby_targets_ruby24] >=dev-ruby/rdiscount-1.5.8[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/hpricot-0.8.2[ruby_targets_ruby25] >=dev-ruby/mustache-0.7.0[ruby_targets_ruby25] >=dev-ruby/rdiscount-1.5.8[ruby_targets_ruby25] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
-DESCRIPTION=Converts simple, human readable textfiles to roff for terminal display, and HTML
-EAPI=5
-HOMEPAGE=https://github.com/rtomayko/ronn/
-IUSE=test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test test
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x64-macos ~x64-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/hpricot-0.8.2[ruby_targets_ruby23] >=dev-ruby/mustache-0.7.0[ruby_targets_ruby23] >=dev-ruby/rdiscount-1.5.8[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/hpricot-0.8.2[ruby_targets_ruby24] >=dev-ruby/mustache-0.7.0[ruby_targets_ruby24] >=dev-ruby/rdiscount-1.5.8[ruby_targets_ruby24] ) ruby_targets_ruby25? ( >=dev-ruby/hpricot-0.8.2[ruby_targets_ruby25] >=dev-ruby/mustache-0.7.0[ruby_targets_ruby25] >=dev-ruby/rdiscount-1.5.8[ruby_targets_ruby25] ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
-SLOT=0
-SRC_URI=mirror://rubygems/ronn-0.7.3.gem
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=f808f326a7b8cd46580d81854f4b3ea2
diff --git a/app-text/ronn/Manifest b/app-text/ronn/Manifest
new file mode 100644
index 000000000000..9a77d46246c8
--- /dev/null
+++ b/app-text/ronn/Manifest
@@ -0,0 +1,3 @@
+DIST ronn-0.7.3.gem 61440 BLAKE2B 3ff0a1752d7a972b7d8319cac2b1287e7d21207e22b9eb288694172eb9b30b2198e4378eb02df8418585a44d3d2c89b4695675933dc5ef5d9ba63c78e71f4e7c SHA512 885418c88d5a1073f9457ea11e29d82d3bb40ad12506589ccfab83ad447445e41282c9688aba5646082ae5ecc6a047fa9439ffae14561152fc61a136474f611c
+EBUILD ronn-0.7.3-r3.ebuild 1156 BLAKE2B 191a39e5280862710e76e123412cb79f5f352405b41036e80af4a97dd7c0950a9cc3e9c9fe206926b440065cfabb4795c1700e34a3b50afa76ea796b886f7406 SHA512 a4becef0bf262b271e4357bec8378430ae7f2896375339165d4ef2a3b8fb2855bb33c2e33bd6c359cb1941fd9bb0382de2887597b1344656335410e46b4ce187
+MISC metadata.xml 339 BLAKE2B 2a1722a0531a1ccaba0d29a1ace114b95789ba4b0c692e8efcf38605f81de4dd1210671331fcdb5baa6536cf38fbf63f11b85fb13bd6a067be56f22a372fc5b6 SHA512 0be4072cf3514eba60569138ed409362b318616ad4514e319d9b4add120e74fd7655e2fc5c3ab8d7b5d813cfcf8e1054fb98395a1a89d9fb90e447a825ee9439
diff --git a/app-text/ronn/metadata.xml b/app-text/ronn/metadata.xml
new file mode 100644
index 000000000000..dfaa4cf0e494
--- /dev/null
+++ b/app-text/ronn/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">rtomayko/ronn</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-text/ronn/ronn-0.7.3-r3.ebuild b/app-text/ronn/ronn-0.7.3-r3.ebuild
new file mode 100644
index 000000000000..abeb36ab502b
--- /dev/null
+++ b/app-text/ronn/ronn-0.7.3-r3.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="AUTHORS CHANGES README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Converts simple, human readable textfiles to roff for terminal display, and HTML"
+HOMEPAGE="https://github.com/rtomayko/ronn/"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x64-macos ~x64-solaris"
+
+IUSE=""
+
+DEPS="
+	>=dev-ruby/hpricot-0.8.2
+	>=dev-ruby/mustache-0.7.0
+	>=dev-ruby/rdiscount-1.5.8"
+
+ruby_add_rdepend "${DEPS}"
+
+ruby_add_bdepend "${DEPS}"
+
+all_ruby_prepare() {
+	# Avoid test failing due to changes in hash handling in ruby 1.8.7:
+	# https://github.com/rtomayko/ronn/issues/56
+	sed -i -e '81 s:^:#:' test/test_ronn.rb || die
+}
+
+each_ruby_prepare() {
+	# Make sure that we always use the right interpreter during tests.
+	sed -i -e "/output/ s:ronn:${RUBY} bin/ronn:" test/test_ronn.rb
+}
+
+all_ruby_compile() {
+	PATH="${S}/bin:${PATH}" rake man || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	doman man/ronn.1 man/ronn-format.7
+}
diff --git a/app-text/rpl-1.5.5-r1 b/app-text/rpl-1.5.5-r1
deleted file mode 100644
index 6fe3b0afb8fb..000000000000
--- a/app-text/rpl-1.5.5-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Intelligent recursive search/replace utility
-EAPI=5
-HOMEPAGE=http://rpl.sourceforge.net/
-IUSE=python_targets_python2_7
-KEYWORDS=amd64 ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://sourceforge/rpl/rpl-1.5.5.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=38ea701415ced81ad9b831f8827873a3
diff --git a/app-text/rpl/Manifest b/app-text/rpl/Manifest
new file mode 100644
index 000000000000..858965ef43a7
--- /dev/null
+++ b/app-text/rpl/Manifest
@@ -0,0 +1,3 @@
+DIST rpl-1.5.5.tar.gz 11397 BLAKE2B 29511d894a7b3e67cfdf4378902219acedb0a0b85c4a9c8aa879f9cede8ad57aeefd91b21ee79ac01b924a64b2f48248896f31ffb6934a4f79dda135114ebca9 SHA512 f43af366b8fc34b6c4578841f50046170810187119eb0730405a082f64d5c095fd9d28fabf1f0fda1dad85f24e98047df4d695b39b7ea5b99d32efc18634000f
+EBUILD rpl-1.5.5-r1.ebuild 654 BLAKE2B 8942acb6231835355b71561ed36b7a8dfc0104ac25276b152e72dded58d7cdfdd8a1683164ce3676e0783b43664086f87157ed559edf53414aa6fd8515ba12c0 SHA512 c9b61a885c1bcca000002df4dc9b114444c1a490072b080b7318880517227d5929a05df26b172cec3a95c83e5d3c8d49cadd41a3c7263e095ad62451b84c12a8
+MISC metadata.xml 338 BLAKE2B 64a9c58a45097871d3d71b78a46857234cb27a5db16cd80b1dc9e7d9f4dfe650f605d1e8f1ba8a645d50d67b4e2ba21b56308e06aaae3cd264920705e5c4a8c3 SHA512 e8231d1fb1b810948ec4ff31afceaaffa7b6d3f0ed565118f8555cb0721de20dad9a845e213162b3b1619e2b20610e4df0843293df049e17f8e4e1977957104a
diff --git a/app-text/rpl/metadata.xml b/app-text/rpl/metadata.xml
new file mode 100644
index 000000000000..4962fc76aac4
--- /dev/null
+++ b/app-text/rpl/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>shell-tools@gentoo.org</email>
+		<name>Gentoo Shell Tools Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">rpl</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/rpl/rpl-1.5.5-r1.ebuild b/app-text/rpl/rpl-1.5.5-r1.ebuild
new file mode 100644
index 000000000000..11c7d47074cb
--- /dev/null
+++ b/app-text/rpl/rpl-1.5.5-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Intelligent recursive search/replace utility"
+HOMEPAGE="http://rpl.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE=""
+
+python_prepare_all() {
+	iconv -f latin1 -t utf8 -o setup.py.new setup.py || die
+	mv setup.py.new setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	doman ${PN}.1
+}
diff --git a/app-text/rtf2html-0.2.0-r1 b/app-text/rtf2html-0.2.0-r1
deleted file mode 100644
index b95d9a649dde..000000000000
--- a/app-text/rtf2html-0.2.0-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DESCRIPTION=RTF to HTML converter
-EAPI=4
-HOMEPAGE=http://rtf2html.sourceforge.net/
-IUSE=debug
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-SLOT=0
-SRC_URI=mirror://sourceforge/rtf2html/rtf2html-0.2.0.tar.bz2
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d03f2933975e1b5216723ec5f744af0b
diff --git a/app-text/rtf2html/Manifest b/app-text/rtf2html/Manifest
new file mode 100644
index 000000000000..b3ebb225c4d8
--- /dev/null
+++ b/app-text/rtf2html/Manifest
@@ -0,0 +1,4 @@
+AUX rtf2html-0.2.0-gcc43.patch 693 BLAKE2B fac12178580d8114b7429e3da6552c31bd82f5aac174d08276346cfd1e5ccc1181d31d2db524aa78eee83b1d2aff2a27f74adcc3f52f36b8f8300295c06777fa SHA512 e8f4ad4f30ef8b317786a9c6b864245254c9127d5967ffc61c9934a55f0223c2f15ad388b1047ca3aaef11fcf1bad372f515df24c32a52a3abdbb6aaa5afe2d6
+DIST rtf2html-0.2.0.tar.bz2 75292 BLAKE2B 18cc67ff3642f68ae262aa6e3368be93defe19ceeab07f9e55fcd2390e4c374c7ab315c0c5f8b7644a458e4100a4be3812767b080842d862266083856f5376aa SHA512 7399c98adb4dc0f45e420cd6836c36720d6b19ccbba062d2102b2693a6812642d6193000172ef7eeef5b8a84dcb2d35c1eb99fbf3bffaf8dad43e8ca06c6fe75
+EBUILD rtf2html-0.2.0-r1.ebuild 700 BLAKE2B d9b7e446a395f8c4273c1d968d09d40c07b0d45a0a6ccc335b8429ee02ff0bbdfc3800e133e85199073fb8e26f41ddfb1be8621ca8d1a909ad118a9b4f896a0c SHA512 5b48e0bbd927f43a759cb5d345a728721321734523d41a57415cdfd3ca37b906b5f7c5704547db96b81b5ed573fefbbf3ae5858d504abb16ed33bf34fc1b8081
+MISC metadata.xml 318 BLAKE2B 8456d5d447f556d9e6d5039fce7ea1437214b68c04aafe1a56d7a6dd51286ffb62ccbd6b0c42857dd5dcb0e42c4856b84beef6c4ccd80506153af42cfb0229c0 SHA512 f9fce83b4df04e11ddd34a60cc7bb32e9ab12cc5eed26352de20186660ab8173d910b6cdae63e1562f83bd1ed89f6210aca1cd5401ae93f31296dbac6f3256d4
diff --git a/app-text/rtf2html/files/rtf2html-0.2.0-gcc43.patch b/app-text/rtf2html/files/rtf2html-0.2.0-gcc43.patch
new file mode 100644
index 000000000000..f87661fd3796
--- /dev/null
+++ b/app-text/rtf2html/files/rtf2html-0.2.0-gcc43.patch
@@ -0,0 +1,22 @@
+diff -ur rtf2html-0.2.0-orig/rtf_keyword.h rtf2html-0.2.0/rtf_keyword.h
+--- rtf2html-0.2.0-orig/rtf_keyword.h	2007-08-03 04:50:45.000000000 -0400
++++ rtf2html-0.2.0/rtf_keyword.h	2009-01-03 17:45:14.000000000 -0500
+@@ -2,6 +2,7 @@
+ 
+ 
#include "config.h"
+ #include <string>
++#include <cstdlib>
+ #include <map>
+ #include <ctype.h>
+ 
+diff -ur rtf2html-0.2.0-orig/rtf_table.cpp rtf2html-0.2.0/rtf_table.cpp
+--- rtf2html-0.2.0-orig/rtf_table.cpp	2007-07-31 11:16:52.000000000 -0400
++++ rtf2html-0.2.0/rtf_table.cpp	2009-01-03 17:45:14.000000000 -0500
+@@ -4,6 +4,7 @@
+ #include <iostream>

+ #include <stdexcept>

+ #include <functional>

++#include <algorithm>

+ 

+ typedef std::set<int> intset;

+ 

diff --git a/app-text/rtf2html/metadata.xml b/app-text/rtf2html/metadata.xml
new file mode 100644
index 000000000000..9de0fd52d0e2
--- /dev/null
+++ b/app-text/rtf2html/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>dlan@gentoo.org</email>
+		<name>Yixun Lan</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">rtf2html</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/rtf2html/rtf2html-0.2.0-r1.ebuild b/app-text/rtf2html/rtf2html-0.2.0-r1.ebuild
new file mode 100644
index 000000000000..d5f0c353c4c1
--- /dev/null
+++ b/app-text/rtf2html/rtf2html-0.2.0-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+
+inherit base flag-o-matic
+
+DESCRIPTION="RTF to HTML converter"
+HOMEPAGE="http://rtf2html.sourceforge.net/"
+SRC_URI="mirror://sourceforge/rtf2html/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+DOCS=( ChangeLog README )
+
+PATCHES=( "${FILESDIR}/${P}-gcc43.patch" )
+
+src_prepare() {
+	# CFLAGS are incorrectly parsed, so handle this here
+	sed -i -e '/CFLAGS=$(echo $CFLAGS/d' configure || die 'sed on configure failed'
+	use !debug && filter-flags "-g*"
+
+	base_src_prepare
+}
+
+src_configure() {
+	econf $(use_enable debug)
+}
diff --git a/app-text/sablotron-1.0.3-r1 b/app-text/sablotron-1.0.3-r1
deleted file mode 100644
index c112654e3e28..000000000000
--- a/app-text/sablotron-1.0.3-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-libs/expat-1.95.6-r1 >=dev-perl/XML-Parser-2.3 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=An XSLT Parser in C++
-EAPI=6
-HOMEPAGE=http://www.gingerall.org/sablotron.html
-IUSE=perl
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=MPL-1.1
-RDEPEND=>=dev-libs/expat-1.95.6-r1
-SLOT=0
-SRC_URI=http://download-1.gingerall.cz/download/sablot/Sablot-1.0.3.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=d1e08ef1a88de4c51aecb885eed451dd
diff --git a/app-text/sablotron/Manifest b/app-text/sablotron/Manifest
new file mode 100644
index 000000000000..789082e576a1
--- /dev/null
+++ b/app-text/sablotron/Manifest
@@ -0,0 +1,4 @@
+AUX 1.0.3-libsablot-expat.patch 286 BLAKE2B 07728a2d174343133946519934a0b10aa0ea0d2c7e5ba73401b8c16ead71f059f78b24236bc96e17baf2467a5765ce0d82e67e97bb48225a9ba0fc5ac8a163d0 SHA512 29b7ae2798696439d3b181196677a7e7beacecac39abae631c73aff2d77e608bbf0088100953db78feb82cba37f89350da238cf8053e694c8ff0b3d8e8837040
+DIST Sablot-1.0.3.tar.gz 607597 BLAKE2B 429df09361d233b290e1179d5a3fbe7b421b834c23ff32d72466f007fd4ce19e810d68483b1b0314e943f2ff0f3713a3f28a357a71c69722883f5c85499cb582 SHA512 836c1a9d09317194333619461b0e5ea312277cadb6df5ae5ed327bdfee4090970bd3056ec0b3bd6aa8a3e3289af1bc5c1461c9fe15b53a944f1042190c485031
+EBUILD sablotron-1.0.3-r1.ebuild 1053 BLAKE2B e969fcfc506eaf71ca7534edb4e2bfdf7fec8c2813fb156511d61e99dcc860e0f5c3e0ae574dc50bb885cd8f03cc24530fa06f0179549815b0a6f98510d62225 SHA512 a3145154f2be9d371e1cbf33589f6da3723ef3106c38a6f278c3840043f58137bd7d072af0602c065665773ebf471a711fdc81dbadf400f8619aecd5e0aa21eb
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/sablotron/files/1.0.3-libsablot-expat.patch b/app-text/sablotron/files/1.0.3-libsablot-expat.patch
new file mode 100644
index 000000000000..328c9e906856
--- /dev/null
+++ b/app-text/sablotron/files/1.0.3-libsablot-expat.patch
@@ -0,0 +1,10 @@
+diff --git a/src/engine/Makefile.am b/src/engine/Makefile.am
+index abd2041..1307b1c 100644
+--- a/src/engine/Makefile.am
++++ b/src/engine/Makefile.am
+@@ -76,4 +76,5 @@ include_HEADERS = \
+ 	sabcfg.h
+ 
+ libsablot_la_LDFLAGS = -version-info 100:3:100
++libsablot_la_LIBADD = @EXPAT_LIBS@
+ 
diff --git a/app-text/sablotron/metadata.xml b/app-text/sablotron/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-text/sablotron/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/app-text/sablotron/sablotron-1.0.3-r1.ebuild b/app-text/sablotron/sablotron-1.0.3-r1.ebuild
new file mode 100644
index 000000000000..622e9320de00
--- /dev/null
+++ b/app-text/sablotron/sablotron-1.0.3-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+MY_PN="Sablot"
+MY_P="${MY_PN}-${PV}"
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="An XSLT Parser in C++"
+HOMEPAGE="http://www.gingerall.org/sablotron.html"
+SRC_URI="http://download-1.gingerall.cz/download/sablot/${MY_P}.tar.gz"
+
+# Sablotron can optionally be built under GPL, using MPL for now
+LICENSE="MPL-1.1"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="perl"
+
+RDEPEND=">=dev-libs/expat-1.95.6-r1"
+DEPEND="${RDEPEND}
+	>=dev-perl/XML-Parser-2.3"
+
+PATCHES=( "${FILESDIR}/1.0.3-libsablot-expat.patch" )
+
+src_prepare() {
+	default
+	sed -i configure.in -e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' || die
+	eautoreconf
+	elibtoolize
+}
+
+src_configure() {
+	econf \
+		$(use_enable perl perlconnect) \
+		--with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc README README_JS RELEASE src/TODO
+}
diff --git a/app-text/sary-1.2.0-r1 b/app-text/sary-1.2.0-r1
deleted file mode 100644
index fc79437da1de..000000000000
--- a/app-text/sary-1.2.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=dev-libs/glib:2 virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Sary: suffix array library and tools
-EAPI=4
-HOMEPAGE=http://sary.sourceforge.net/
-IUSE=static-libs
-KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=LGPL-2.1
-RDEPEND=dev-libs/glib:2
-RESTRICT=test
-SLOT=0
-SRC_URI=http://sary.sourceforge.net/sary-1.2.0.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=b7dd8e4ec485dc12b993a222049de9b5
diff --git a/app-text/sary/Manifest b/app-text/sary/Manifest
new file mode 100644
index 000000000000..5f71863507c9
--- /dev/null
+++ b/app-text/sary/Manifest
@@ -0,0 +1,3 @@
+DIST sary-1.2.0.tar.gz 393787 BLAKE2B bcfb393dbae4b5edd51b35a9bb542a1988a4293a321a72f9e3fbce48abbd034bcb96bac915fb330166c5d8adcb2f2b572e808b76508c0411521aef722422c074 SHA512 0eeae82a384970b4d96f7a0ca3929e74d17b8b3ebc61459ec9fc7172e61c3835ffe2de8aaab7ebd64f54be24d39f6734949ebc98758c28cec299b3bd25020632
+EBUILD sary-1.2.0-r1.ebuild 950 BLAKE2B d34edd5b708c68cc1494b7f41167446f6db9945ea239fcc0d87939e733d83b41b3632aeeea01b996b00a475a45006ad1e81045fee4ea8f2e49eedd3242f4f94d SHA512 74713f39515aec6da7df7664755243d28c339313c1de070824d2ef05a1deb50309ead443bdad9e490da891b92ed0daaa181f9cadb6337a38c9192c6772a7c83c
+MISC metadata.xml 614 BLAKE2B dbab63bef60f0c15430f90761b9660a90cc05561104ee73eb3848ba30fae5d8bd888e091afd6709d9796cc9fa087c350903e5c83077bd014fdfd9cb7d92dca3e SHA512 ef381dbe030d43e46f5b8aaf13c0783cb1a215bb2961793d75500712fd491983e2df30eb838eb504432d2cc844b7e064d0f96c0efd67d190295496b8cc082a15
diff --git a/app-text/sary/metadata.xml b/app-text/sary/metadata.xml
new file mode 100644
index 000000000000..c7ef82c510d5
--- /dev/null
+++ b/app-text/sary/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
+	<longdescription>Sary is a suffix array library and tools. It provides
+fast full-text search facilities for text files on the order of 10 to
+100 MB using a data structure called a suffix array. It can also
+search specific fields in a text file by assigning index points to
+those fields.</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">sary</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/sary/sary-1.2.0-r1.ebuild b/app-text/sary/sary-1.2.0-r1.ebuild
new file mode 100644
index 000000000000..1155888702a7
--- /dev/null
+++ b/app-text/sary/sary-1.2.0-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+inherit autotools
+
+DESCRIPTION="Sary: suffix array library and tools"
+HOMEPAGE="http://sary.sourceforge.net/"
+SRC_URI="http://sary.sourceforge.net/${P}.tar.gz"
+IUSE="static-libs"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+SLOT="0"
+RESTRICT="test"
+
+RDEPEND="dev-libs/glib:2"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	echo "libsary_la_LIBADD = @GLIB_LIBS@" >> sary/Makefile.am || die
+	sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.in || die
+	eautoreconf
+}
+src_configure() {
+	econf $(use_enable static-libs static)
+}
+
+src_install() {
+	emake DESTDIR="${D}" \
+		docsdir="${EPREFIX}"/usr/share/doc/${PF}/html \
+		install
+
+	dodoc AUTHORS ChangeLog NEWS README TODO
+
+	if ! use static-libs ; then
+		find "${ED}" -name '*.la' -delete
+	fi
+
+}
diff --git a/app-text/scdoc-1.3.1 b/app-text/scdoc-1.3.1
deleted file mode 100644
index 749b2783e977..000000000000
--- a/app-text/scdoc-1.3.1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=Standalone tool for generating man pages with a simple syntax
-EAPI=6
-HOMEPAGE=https://git.sr.ht/~sircmpwn/scdoc
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-SLOT=0
-SRC_URI=https://git.sr.ht/~sircmpwn/scdoc/snapshot/scdoc-1.3.1.tar.xz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=c670bb880e63a51e4488f59d11df7676
diff --git a/app-text/scdoc/Manifest b/app-text/scdoc/Manifest
new file mode 100644
index 000000000000..4a07350a15aa
--- /dev/null
+++ b/app-text/scdoc/Manifest
@@ -0,0 +1,3 @@
+DIST scdoc-1.3.1.tar.xz 8776 BLAKE2B 1d11423abde7ec3e7b03ddc4f9698b7b78cac6972066c57886160974bd885225dc42793d19942c11ffd215f5dddd6453f66cbd083be03132b437b6f6f8a93c8a SHA512 a404df2e2eef76cc02c69f32eb131eaa4d4ed51e96dc6ea39400662f767648538fc27c618cf34c064004918a92940ae5400e91b7b628e431132cb9619d3e94eb
+EBUILD scdoc-1.3.1.ebuild 986 BLAKE2B 109e6dba273fe028e2965a23b995acaa3fa20ef3d528add4f0149d83f6ca18e2bf9c2b9f2686b34b6cdc056a8dea34ebfe616592d7513bbb7e7bdf3a43b24c86 SHA512 4d4b3162fec5e7b07adbd2fc712e3c8c324c771cf4bd7a9d78d064477e39ef64a71f56b4ab2253bc4c186aa50ad8563e7c91228b5970398df86e69308819691c
+MISC metadata.xml 444 BLAKE2B fe48dd13d534bacc09205bd073b4052e2f5afca50eedea53236f7d2d2f31f4f876fe0b4dcb57eb8a87b4090fffb5f924ed57b9a636453be7c2bb586cc4d1a142 SHA512 3a172b03f1768baf0bb940bd842f7e6c05762e79bb1d8632bdbf86276e79cda7f1b334750a3650cc86106154a8b2e2e426c7ab99d41cc5bf5119ac1e81e7b5fc
diff --git a/app-text/scdoc/metadata.xml b/app-text/scdoc/metadata.xml
new file mode 100644
index 000000000000..442a873c810e
--- /dev/null
+++ b/app-text/scdoc/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>hilobakho@gmail.com</email>
+		<name>Mykyta Holubakha</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">swaywm/sway</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/scdoc/scdoc-1.3.1.ebuild b/app-text/scdoc/scdoc-1.3.1.ebuild
new file mode 100644
index 000000000000..b1e8b927020a
--- /dev/null
+++ b/app-text/scdoc/scdoc-1.3.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="Standalone tool for generating man pages with a simple syntax"
+HOMEPAGE="https://git.sr.ht/~sircmpwn/scdoc"
+SRC_URI="https://git.sr.ht/~sircmpwn/scdoc/snapshot/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+src_prepare() {
+	default
+
+	sed -e 's/-Werror//' \
+		-e 's/CFLAGS=/CFLAGS+=/' \
+		-e '/^PREFIX/s@=.*$@=/usr@' \
+		-i Makefile || die 'Failed to patch Makefile'
+}
+
+src_compile() {
+	MY_HS="./scdoc"
+	if tc-is-cross-compiler; then
+		tc-export_build_env
+		MY_HS="./hostscdoc"
+		MAKEOPTS+=" HOST_SCDOC=./hostscdoc"
+		emake scdoc OUTDIR="${S}/.build.host" CC=$(tc-getBUILD_CC) \
+			CFLAGS="${BUILD_CFLAGS}" LDFLAGS="${BUILD_LDFLAGS}"
+		mv scdoc hostscdoc || die 'Failed to rename host scdoc'
+	fi
+	emake LDFLAGS="${LDFLAGS}" HOST_SCDOC="${MY_HS}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" HOST_SCDOC="${MY_HS}" install
+}
diff --git a/app-text/scrollkeeper-9999-r2 b/app-text/scrollkeeper-9999-r2
deleted file mode 100644
index 12e28c389072..000000000000
--- a/app-text/scrollkeeper-9999-r2
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DEPEND=~app-text/scrollkeeper-dtd-1.0
-DESCRIPTION=Dummy scrollkeeper for testing rarian
-EAPI=0
-HOMEPAGE=https://gnome.gentoo.org
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=metapackage
-PDEPEND=app-text/rarian
-SLOT=0
-_md5_=eb2a73020d7527a63276749e58ba977c
diff --git a/app-text/scrollkeeper-dtd-1.0-r1 b/app-text/scrollkeeper-dtd-1.0-r1
deleted file mode 100644
index 57a5f64c02a2..000000000000
--- a/app-text/scrollkeeper-dtd-1.0-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm unpack
-DEPEND=>=dev-libs/libxml2-2.4.19 !<app-text/scrollkeeper-9999-r1
-DESCRIPTION=DTD from the Scrollkeeper package
-EAPI=6
-HOMEPAGE=http://scrollkeeper.sourceforge.net/
-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 ~x86-macos ~x64-solaris ~x86-solaris
-LICENSE=FDL-1.1
-RDEPEND=>=dev-libs/libxml2-2.4.19
-SLOT=1.0
-SRC_URI=http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd
-_md5_=72e3560ec49460385a0089b2347bd6aa
diff --git a/app-text/scrollkeeper-dtd/Manifest b/app-text/scrollkeeper-dtd/Manifest
new file mode 100644
index 000000000000..10e254a94150
--- /dev/null
+++ b/app-text/scrollkeeper-dtd/Manifest
@@ -0,0 +1,3 @@
+DIST scrollkeeper-omf.dtd 11031 BLAKE2B 47a52f587447f30c1c93ebdb4d1339d714260c7bcf16711591edb0b0f8a41d6694a1f64f0306d0c296c032869176b884adb50762eaa445f50684820effcb9399 SHA512 edb38d85352d0ed4a4fd1eea108cd88696d2f0759bc4402d4b7f85aa56b5647ca5a518de14deb3a429344ede474d42a64b90100e5d3c772ae6e5e47a47d86ff0
+EBUILD scrollkeeper-dtd-1.0-r1.ebuild 1538 BLAKE2B 1b75e066575e75c8c565b8185b6c870afbd164d809707fe2dcace671f598bbea01af6f7e2d8ff16c4a9b4e2e162d2fed46a24caaa75ec06c38485a767ae1c037 SHA512 28b31ab7494ba0a733c8ece1cd030d57d7b7d8c75b1aae43d046d4ca0eb2a249f00e16201526567581333b917489cb51143c6dbf113b8225b60553080dee4846
+MISC metadata.xml 335 BLAKE2B 5557a7230bee25bc8e1340443746da2d41568635c68904549b2ac2f6227a70444cf2753e6656de56c290c1a96e18dbe882401bcba68e271259cafaa44402a1f1 SHA512 c0180e1504b25daba0b5f2a6556793cf721eca12a4c488a57e7960b9b096129e5f535a24e1da1ffa6b1d9e8b646325edcebd00e5f7e908ace3d81d818e49f8e3
diff --git a/app-text/scrollkeeper-dtd/metadata.xml b/app-text/scrollkeeper-dtd/metadata.xml
new file mode 100644
index 000000000000..d23324a6570b
--- /dev/null
+++ b/app-text/scrollkeeper-dtd/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">scrollkeeper</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/scrollkeeper-dtd/scrollkeeper-dtd-1.0-r1.ebuild b/app-text/scrollkeeper-dtd/scrollkeeper-dtd-1.0-r1.ebuild
new file mode 100644
index 000000000000..581c5f9bd798
--- /dev/null
+++ b/app-text/scrollkeeper-dtd/scrollkeeper-dtd-1.0-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DTD_FILE="scrollkeeper-omf.dtd"
+
+DESCRIPTION="DTD from the Scrollkeeper package"
+HOMEPAGE="http://scrollkeeper.sourceforge.net/"
+SRC_URI="http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/${DTD_FILE}"
+
+LICENSE="FDL-1.1"
+SLOT="1.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 ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND=">=dev-libs/libxml2-2.4.19"
+DEPEND="${RDEPEND}
+	!<app-text/scrollkeeper-9999-r1"
+
+S="${WORKDIR}"
+
+src_unpack() { :; }
+
+src_configure() { :; }
+
+src_compile() { :; }
+
+src_install() {
+	insinto /usr/share/xml/scrollkeeper/dtds
+	doins "${DISTDIR}/${DTD_FILE}"
+}
+
+pkg_postinst() {
+	einfo "Installing catalog..."
+
+	# Install regular DOCTYPE catalog entry
+	"${EROOT}"usr/bin/xmlcatalog --noout --add "public" \
+		"-//OMF//DTD Scrollkeeper OMF Variant V1.0//EN" \
+		"${EROOT}"usr/share/xml/scrollkeeper/dtds/${DTD_FILE} \
+		"${EROOT}"etc/xml/catalog
+
+	# Install catalog entry for calls like: xmllint --dtdvalid URL ...
+	"${EROOT}"usr/bin/xmlcatalog --noout --add "system" \
+		"${SRC_URI}" \
+		"${EROOT}"usr/share/xml/scrollkeeper/dtds/${DTD_FILE} \
+		"${EROOT}"etc/xml/catalog
+}
+
+pkg_postrm() {
+	# Remove all sk-dtd from the cache
+	einfo "Cleaning catalog..."
+
+	"${EROOT}"usr/bin/xmlcatalog --noout --del \
+		"${EROOT}"usr/share/xml/scrollkeeper/dtds/${DTD_FILE} \
+		"${EROOT}"etc/xml/catalog
+}
diff --git a/app-text/scrollkeeper/Manifest b/app-text/scrollkeeper/Manifest
new file mode 100644
index 000000000000..da0eb8752512
--- /dev/null
+++ b/app-text/scrollkeeper/Manifest
@@ -0,0 +1,2 @@
+EBUILD scrollkeeper-9999-r2.ebuild 508 BLAKE2B dac0791d87b250de0ca1d238e7723ec241e5794b9afac06ac52003299d1c95020b583c5391a1666eba4a0ca5756aab488b2edee9a4320fb6c4e1d2f0c295ea56 SHA512 4175a3ed7c2f6855af4a0f0a345a9a87ee6842d8ab7810063ee531595f6e924bc0955241c5a454aed994bb0e5fc28720cfe7d49c87065db75573d1eea788e46a
+MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-text/scrollkeeper/metadata.xml b/app-text/scrollkeeper/metadata.xml
new file mode 100644
index 000000000000..39980802b1da
--- /dev/null
+++ b/app-text/scrollkeeper/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-text/scrollkeeper/scrollkeeper-9999-r2.ebuild b/app-text/scrollkeeper/scrollkeeper-9999-r2.ebuild
new file mode 100644
index 000000000000..bb8c99747484
--- /dev/null
+++ b/app-text/scrollkeeper/scrollkeeper-9999-r2.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+DESCRIPTION="Dummy scrollkeeper for testing rarian"
+HOMEPAGE="https://gnome.gentoo.org"
+
+LICENSE="metapackage"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND="~app-text/scrollkeeper-dtd-1.0"
+RDEPEND=""
+PDEPEND="app-text/rarian"
diff --git a/app-text/sdcv-0.5.0_beta2-r1 b/app-text/sdcv-0.5.0_beta2-r1
deleted file mode 100644
index 83f938a70a56..000000000000
--- a/app-text/sdcv-0.5.0_beta2-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-libs/zlib sys-libs/readline:= >=dev-libs/glib-2.6.1 nls? ( >=sys-devel/gettext-0.14.1 ) dev-util/ninja >=dev-util/cmake-3.9.6
-DESCRIPTION=Console version of Stardict program
-EAPI=6
-HOMEPAGE=http://sdcv.sourceforge.net
-IUSE=darkterm nls
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=sys-libs/zlib sys-libs/readline:= >=dev-libs/glib-2.6.1
-SLOT=0
-SRC_URI=mirror://sourceforge/sdcv/sdcv-0.5.0-beta2-Source.tar.bz2
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=eb8b900f374b01ba321441ec3b52b934
diff --git a/app-text/sdcv/Manifest b/app-text/sdcv/Manifest
new file mode 100644
index 000000000000..c7a8a4b4fc11
--- /dev/null
+++ b/app-text/sdcv/Manifest
@@ -0,0 +1,3 @@
+DIST sdcv-0.5.0-beta2-Source.tar.bz2 51508 BLAKE2B f2cca4dea35df82015607c88b225da593780d027978f5cd9c03d6f31b03d7ca134e0f2be3bd7ad6c4ed71f7c4ce8fab1bdd546914867b247e6c814ca669e7da5 SHA512 e00ce45042ddd289bdf41f8907c9b8ece983bb6c24356f4905c4b017741d664d590c8f9a159aff600e96d8c3edf792a568d6afdf01865484d1cd5d94f7786570
+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/metadata.xml b/app-text/sdcv/metadata.xml
new file mode 100644
index 000000000000..ef1706e494f2
--- /dev/null
+++ b/app-text/sdcv/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>bircoph@gentoo.org</email>
+		<name>Andrew Savchenko</name>
+	</maintainer>
+	<longdescription>sdcv - console version of StarDict program.</longdescription>
+	<use>
+		<flag name="darkterm">Improve readability of color output on terminals with
+		dark background.</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">sdcv</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/sdcv/sdcv-0.5.0_beta2-r1.ebuild b/app-text/sdcv/sdcv-0.5.0_beta2-r1.ebuild
new file mode 100644
index 000000000000..f521e22ff60e
--- /dev/null
+++ b/app-text/sdcv/sdcv-0.5.0_beta2-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="cs fr ru sk uk zh_CN zh_TW"
+: ${CMAKE_MAKEFILE_GENERATOR:="ninja"}
+
+inherit cmake-utils l10n
+
+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="darkterm nls"
+
+RDEPEND="sys-libs/zlib
+	sys-libs/readline:=
+	>=dev-libs/glib-2.6.1"
+DEPEND="${RDEPEND}
+	nls? ( >=sys-devel/gettext-0.14.1 )"
+
+src_prepare() {
+	if use darkterm; then
+		sed -i 's/;34m/;36m/' src/libwrapper.cpp || die
+	fi
+
+	rm_loc() {
+		rm "po/${1}.po" || die
+	}
+	l10n_for_each_disabled_locale_do rm_loc
+
+	# do not install locale-specific man pages unless asked to
+	if ! has uk ${LINGUAS-uk}; then
+		sed -ni '/share\/man\/uk/!p' CMakeLists.txt || die
+	fi
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_NLS="$(usex nls)"
+	)
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	use nls && cmake-utils_src_compile lang
+}
+
+src_install() {
+	# with USE=nls, but empty intersection of LINGUAS and list of
+	# supported translations, this directory is required, see bug 583386
+	# failure is ok here (e.g. if dir exists)
+	mkdir "${BUILD_DIR}/locale"
+	cmake-utils_src_install
+}
diff --git a/app-text/sgml-common-0.6.3-r6 b/app-text/sgml-common-0.6.3-r6
deleted file mode 100644
index 236ece6fd92f..000000000000
--- a/app-text/sgml-common-0.6.3-r6
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=postinst postrm prepare prerm
-DESCRIPTION=Base ISO character entities and utilities for SGML
-EAPI=6
-HOMEPAGE=https://www.iso.org/standard/16387.html
-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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~floppym/dist/sgml-common/sgml-common-0.6.3-gentoo.tar.gz
-_eclasses_=prefix	e51c7882b7b721e54e684f7eb143cbfe
-_md5_=8b0ff48572a0c746f939abbcbb938bc2
diff --git a/app-text/sgml-common/Manifest b/app-text/sgml-common/Manifest
new file mode 100644
index 000000000000..8a5e70d5df70
--- /dev/null
+++ b/app-text/sgml-common/Manifest
@@ -0,0 +1,5 @@
+AUX sgml-common-0.6.3-install-catalog.in 5064 BLAKE2B 2400dd32a80a64c89ded54d898a2331b649a35269bd3389e6c71c9f161b5b02b857230a6c7f4807cb975ff4c7d6a99a5576d2bb79190e5914c9faf9488e1d11a SHA512 85fbcdd7aceb28256e08ca1a5b6472247d81499e604d6a45edabf662bc32b72a22326db907e2a408b1a6da02deccd89606749e3fc8e42594ad6402ab29d501b9
+AUX sgml-common-0.6.3-prefix.patch 664 BLAKE2B 5b82b66824547c0cbae10f12c94eaccaa0789c1ff68a20c3ace00cc1620dc0e2d7c81cf906db8fac82104b9d1c5ea29af42746b200f1c1a5a9e9728052f5859c SHA512 62758c7ccb4e86e91292757546e6a1f932cf8282abfc2d9ccfe2e68008bbcc995d0a4eeac3f0c8584c4dfae552a42000b438defe38dc911b770a9e8e72b310ef
+DIST sgml-common-0.6.3-gentoo.tar.gz 128903 BLAKE2B 3b374179fe85cf6f098649d2014f9d34349ddccd17ae0ac4c5502414507601c545eaf27f7c76fafd63c36041068205d3b82309a204989f3b106c04c7adf14875 SHA512 c8de573d707ccf524407c9be9a6e7740341eb88ecb6bee69d6d11a2658ef74e6acfb7495afa33c9983ab015c3c925aac98278a4e01ee217892a9fb99e60798ce
+EBUILD sgml-common-0.6.3-r6.ebuild 2481 BLAKE2B b4b4945c34f62854ef6db9c1bdaee90ad0814f44e705875a6da1b80956aeff8829d087dfc34939f5dc8edd60d184d8d6d9247a1d4754aec30ad82c7661962b98 SHA512 15d48f36f85740b8fd4c5a056b6483ced6fbe8919b43942928b32fae2c9367a5f07f29eb507918c7d50afb9e403f339e969de16fda5c447e19181a50c461809d
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/sgml-common/files/sgml-common-0.6.3-install-catalog.in b/app-text/sgml-common/files/sgml-common-0.6.3-install-catalog.in
new file mode 100644
index 000000000000..bd261669064e
--- /dev/null
+++ b/app-text/sgml-common/files/sgml-common-0.6.3-install-catalog.in
@@ -0,0 +1,182 @@
+#!@GENTOO_PORTAGE_EPREFIX@/bin/bash
+# Script to install a catalog in the centralized SGML catalog
+# Send any comments to Eric Bischoff <eric@caldera.de>
+# This program is under GPL license. See LICENSE file for details.
+
+# Modified by Gentoo developers to better integrate it to portage.
+# <text-markup@gentoo.org>
+
+# Set help message
+SGML_HELP_MESSAGE="Usage: `basename $0` [<option>] <action>\n\
+where <option> is:\n\
+\040 -d|--delegate: \t\t\t Use DELEGATE instead of CATALOG\n\
+and where <action> is:\n\
+\040 -a|--add <centralized> <ordinary>: \t Declare ordinary catalog in the centralized catalog\n\
+\040 -r|--remove <centralized> <ordinary>:\t Remove ordinary catalog from the centralized catalog\n\
+\040 -h, --help: \t\t\t\t Print this help message and exit\n\
+\040 -v, --version: \t\t\t Print the version number and exit\n"
+
+# Set version message
+SGML_VERSION_MESSAGE="sgml-common version @VERSION@ (install-catalog version 1.0)"
+
+# Set type of pointer
+SGML_POINTER="CATALOG"
+
+# Set action to be performed
+SGML_ACTION=""
+
+# Set catalogs
+SGML_CENTRALIZED=""
+SGML_ORDINARY=""
+
+# Default ROOT value (usually defined by portage)
+[ -z "$ROOT" ] && ROOT="/"
+[[ $ROOT == */ ]] || ROOT="${ROOT}/"
+EPREFIX="@GENTOO_PORTAGE_EPREFIX@"
+EROOT=${ROOT%/}${EPREFIX}/
+
+
+# Process options
+case $1 in
+   -d|--delegate) SGML_POINTER="DELEGATE"
+                shift 1
+                ;;
+esac
+
+# Process actions
+case $1 in
+   -a|--add)    SGML_ACTION="addition"
+		SGML_CENTRALIZED=$2
+		SGML_ORDINARY=$3
+		;;
+   -r|--remove)	if [ -z "$3" -o "$3" = "--version" ]
+		then
+		  echo "install-catalog: Old syntax; doing nothing"
+		  exit 0
+		fi
+   		SGML_ACTION="removal"
+		SGML_CENTRALIZED=$2
+		SGML_ORDINARY=$3
+		;;
+   -h|--help)	echo -e $SGML_HELP_MESSAGE
+		exit 0
+		;;
+   -v|--version) echo -e $SGML_VERSION_MESSAGE
+	 	exit 0
+		;;
+   --install)   echo "install-catalog: Old syntax; doing nothing"
+		exit 0
+		;;
+   *)		echo -e $SGML_HELP_MESSAGE >&2
+		exit 1
+		;;
+esac
+
+
+# The arguments to this program should always be relative to $ROOT. Here we
+# declare some extra variables to distingish between the absolute and
+# relative paths.
+SGML_ROOT_CENTRALIZED="${ROOT%/}${SGML_CENTRALIZED}"
+SGML_ROOT_ORDINARY="${ROOT%/}${SGML_ORDINARY}"
+
+
+# Check that the super catalog can be created and changed and deleted
+if [ ! -w "${EROOT}etc/sgml" ]
+then
+  echo "`basename $0`: unable to write in ${EROOT}etc/sgml." >&2
+  exit 2
+fi
+case $SGML_ACTION in
+   addition)
+	if [ -e "${EROOT}etc/sgml/catalog" -a ! -w "${EROOT}etc/sgml/catalog" ]
+	then
+	  echo "`basename $0`: can not modify \"${EROOT}etc/sgml/catalog\"." >&2
+	  exit 2
+	fi
+	;;
+   removal)
+	if [ ! -w "${EROOT}etc/sgml/catalog" ]
+	then
+	  echo "`basename $0`: can not modify \"${EROOT}etc/sgml/catalog\"." >&2
+	  exit 2
+	fi
+	;;
+esac
+
+# Check that the centralized catalog can be created, changed and deleted
+if [ -z "$SGML_ROOT_CENTRALIZED" ]
+then
+  echo -e $SGML_HELP_MESSAGE >&2
+  exit 1
+fi
+case $SGML_ACTION in
+   addition)
+	if [ -e "$SGML_ROOT_CENTRALIZED" -a ! -w "$SGML_ROOT_CENTRALIZED" ]
+	then
+	  echo "`basename $0`: can not modify \"$SGML_ROOT_CENTRALIZED\"." >&2
+	  exit 2
+	fi
+	;;
+   removal)
+	if [ ! -w "$SGML_ROOT_CENTRALIZED" ]
+	then
+	  echo "`basename $0`: can not modify \"$SGML_ROOT_CENTRALIZED\"." >&2
+	  exit 2
+	fi
+	;;
+esac
+
+# Check that we have at least one ordinary package to process
+if [ -z "$SGML_ROOT_ORDINARY" ]
+then
+  echo -e $SGML_HELP_MESSAGE >&2
+  exit 1
+fi
+case $SGML_ACTION in
+   addition)
+	if [ ! -s "$SGML_ROOT_ORDINARY" ]
+	then
+	  echo "`basename $0`: \"$SGML_ROOT_ORDINARY\" does not exist or is empty." >&2
+	  exit 2
+	fi
+	;;
+esac
+
+# Installation or removal of pointers
+case $SGML_ACTION in
+    addition)
+	echo "`basename $0`: addition of $SGML_ORDINARY in $SGML_CENTRALIZED"
+	if grep -q "$SGML_ORDINARY" "$SGML_ROOT_CENTRALIZED" 2>/dev/null
+	then
+	  echo "Warning: $SGML_ORDINARY is already installed in the centralized catalog $SGML_CENTRALIZED" >&2
+	else
+	  echo "$SGML_POINTER \"$SGML_ORDINARY\"" >> "$SGML_ROOT_CENTRALIZED"
+	fi
+	grep -q "$SGML_CENTRALIZED" "${EROOT}etc/sgml/catalog" 2>/dev/null
+	if [ $? -ne 0 ]
+	then
+		echo "`basename $0`: addition of $SGML_CENTRALIZED in ${EROOT}etc/sgml/catalog"
+		echo "$SGML_POINTER \"$SGML_CENTRALIZED\"" >> "${EROOT}etc/sgml/catalog"
+	fi
+	;;
+   removal)
+	echo "`basename $0`: removal of $SGML_ORDINARY from $SGML_CENTRALIZED"
+	if grep -q "$SGML_ORDINARY" "$SGML_ROOT_CENTRALIZED" 2>/dev/null
+	then
+		sed -e "\:$SGML_POINTER \"$SGML_ORDINARY\":d" < \
+			"$SGML_ROOT_CENTRALIZED" > "${SGML_ROOT_CENTRALIZED}.new"
+		mv "${SGML_ROOT_CENTRALIZED}.new" "$SGML_ROOT_CENTRALIZED"
+	else
+	  echo "Warning: $SGML_ORDINARY was not found in the centralized catalog $SGML_CENTRALIZED" >&2
+	fi
+	if [ ! -s "$SGML_ROOT_CENTRALIZED" ]
+	then
+	  rm "$SGML_ROOT_CENTRALIZED"
+	  echo "`basename $0`: removal of $SGML_CENTRALIZED from ${EROOT}etc/sgml/catalog"
+          sed -e "\:$SGML_POINTER \"$SGML_CENTRALIZED\":d" < "${EROOT}etc/sgml/catalog" > "${EROOT}etc/sgml/catalog.new"
+          mv "${EROOT}etc/sgml/catalog.new" "${EROOT}etc/sgml/catalog"
+	fi
+	;;
+esac
+
+exit 0
diff --git a/app-text/sgml-common/files/sgml-common-0.6.3-prefix.patch b/app-text/sgml-common/files/sgml-common-0.6.3-prefix.patch
new file mode 100644
index 000000000000..a116039a8d62
--- /dev/null
+++ b/app-text/sgml-common/files/sgml-common-0.6.3-prefix.patch
@@ -0,0 +1,17 @@
+--- a/bin/sgmlwhich	2007-10-08 04:21:25 +0200
++++ b/bin/sgmlwhich	2007-10-08 04:21:36 +0200
+@@ -3,5 +3,5 @@
+ # Send any comments to Eric Bischoff <eric@caldera.de>
+ # This program is under GPL license. See LICENSE file for details.
+ 
+-echo "/etc/sgml/sgml.conf"
++echo "@GENTOO_PORTAGE_EPREFIX@/etc/sgml/sgml.conf"
+ # Simple, isn't it? ;-)
+--- a/config/sgml.conf	2000-11-17 09:36:11 +0100
++++ b/config/sgml.conf	2007-10-08 04:42:52 +0200
+@@ -1,3 +1,3 @@
+ # /etc/sgml/sgml.conf conformant with LSB
+-SGML_BASE_DIR=/usr/share/sgml
+-SGML_CATALOGS_DIR=/etc/sgml
++SGML_BASE_DIR=@GENTOO_PORTAGE_EPREFIX@/usr/share/sgml
++SGML_CATALOGS_DIR=@GENTOO_PORTAGE_EPREFIX@/etc/sgml
diff --git a/app-text/sgml-common/metadata.xml b/app-text/sgml-common/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-text/sgml-common/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/app-text/sgml-common/sgml-common-0.6.3-r6.ebuild b/app-text/sgml-common/sgml-common-0.6.3-r6.ebuild
new file mode 100644
index 000000000000..2926cea5963c
--- /dev/null
+++ b/app-text/sgml-common/sgml-common-0.6.3-r6.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit prefix
+
+DESCRIPTION="Base ISO character entities and utilities for SGML"
+HOMEPAGE="https://www.iso.org/standard/16387.html"
+SRC_URI="https://dev.gentoo.org/~floppym/dist/${PN}/${P}-gentoo.tar.gz"
+
+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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+PATCHES=( "${FILESDIR}"/${P}-prefix.patch )
+
+src_prepare() {
+	# We use a hacked version of install-catalog that supports the ROOT
+	# variable, puts quotes around the CATALOG files, and can be prefixed.
+	cp "${FILESDIR}/${P}-install-catalog.in" "${S}/bin/install-catalog.in" \
+		|| die "Copy of install-catalog.in failed"
+
+	default
+	eprefixify bin/install-catalog.in bin/sgmlwhich config/sgml.conf
+}
+
+pkg_postinst() {
+	local installer="${EROOT%/}/usr/bin/install-catalog"
+	if [[ ! -x ${installer} ]]; then
+		eerror "install-catalog not found! Something went wrong!"
+		die "install-catalog not found! Something went wrong!"
+	fi
+
+	einfo "Installing Catalogs..."
+	"$installer" --add \
+		"${EROOT%/}"/etc/sgml/sgml-ent.cat \
+		"${EROOT%/}"/usr/share/sgml/sgml-iso-entities-8879.1986/catalog
+	"$installer" --add \
+		"${EROOT%/}"/etc/sgml/sgml-docbook.cat \
+		"${EROOT%/}"/etc/sgml/sgml-ent.cat
+
+	local file
+	while IFS="" read -d $'\0' -r file; do
+		einfo "Fixing ${file}"
+		awk '/"$/ { print $1 " " $2 }
+			! /"$/ { print $1 " \"" $2 "\"" }' ${file} > ${file}.new || die "awk failed"
+		mv ${file}.new ${file} || die "mv failed"
+	done < <(find "${EROOT%/}/etc/sgml/" -name "*.cat" -o -name "catalog" -print0)
+}
+
+pkg_prerm() {
+	cp "${EROOT%/}/usr/bin/install-catalog" "${T}" || die "cp failed"
+}
+
+pkg_postrm() {
+	if [[ ! -x ${T}/install-catalog ]]; then
+		return
+	fi
+
+	einfo "Removing Catalogs..."
+	if [[ -e ${EROOT%/}/etc/sgml/sgml-ent.cat ]]; then
+		"${T}"/install-catalog --remove \
+			"${EROOT%/}"/etc/sgml/sgml-ent.cat \
+			"${EROOT%/}"/usr/share/sgml/sgml-iso-entities-8879.1986/catalog \
+		|| die "install-catalog failed"
+	fi
+
+	if [[ -e ${EROOT%/}/etc/sgml/sgml-docbook.cat ]]; then
+		"${T}"/install-catalog --remove \
+			"${EROOT%/}"/etc/sgml/sgml-docbook.cat \
+			"${EROOT%/}"/etc/sgml/sgml-ent.cat \
+		|| die "install-catalog failed"
+	fi
+}
diff --git a/app-text/sgmltools-lite-3.0.3-r14 b/app-text/sgmltools-lite-3.0.3-r14
deleted file mode 100644
index e0bb92fcee58..000000000000
--- a/app-text/sgmltools-lite-3.0.3-r14
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare prerm setup unpack
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] app-text/sgml-common app-text/docbook-sgml-dtd:3.1 app-text/docbook-dsssl-stylesheets app-text/openjade jadetex? ( app-text/jadetex ) || ( www-client/w3m www-client/lynx ) >=app-text/sgml-common-0.6.3-r2
-DESCRIPTION=Python interface to SGML software in a DocBook/OpenJade env
-EAPI=5
-HOMEPAGE=http://sgmltools-lite.sourceforge.net/
-IUSE=jadetex python_targets_python2_7
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86
-LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] app-text/sgml-common app-text/docbook-sgml-dtd:3.1 app-text/docbook-dsssl-stylesheets app-text/openjade jadetex? ( app-text/jadetex ) || ( www-client/w3m www-client/lynx )
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=mirror://sourceforge/sgmltools-lite/sgmltools-lite-3.0.3.tar.gz mirror://sourceforge/sgmltools-lite/nw-eps-icons-0.0.1.tar.gz
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	sgml-catalog	1ca36a4ae32c67b390f310dd6d7b1189	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=51b39d397641c59955eb502e1bd5b752
diff --git a/app-text/sgmltools-lite/Manifest b/app-text/sgmltools-lite/Manifest
new file mode 100644
index 000000000000..f82107d6af3d
--- /dev/null
+++ b/app-text/sgmltools-lite/Manifest
@@ -0,0 +1,4 @@
+DIST nw-eps-icons-0.0.1.tar.gz 8733 BLAKE2B 467fa3f341c1d6ea20af059cfa88529a0b3bc729cefac72d5b3c264d3a224e8bfb05a89b5f491a22aaf4c194b72cd27ac103a381adb671d9867ef8fceb41f030 SHA512 597062e9882bb9bb73144bbdb056c3ccc2a6d99efc7da836f483ccd6f3799705bcbb897099cb1a580c8e22d936d281d95c3a875694f8e15b6989faf437f6cc7a
+DIST sgmltools-lite-3.0.3.tar.gz 61342 BLAKE2B 8fcac5b48fcdbb8fbbfdbf8ad055ab00cb3fb6a8447a27bf5b14faef968845554a86f04b4984c1ccc1e26d9c64dc5654d5831896bbc44bd3dee0ef3fc28109e5 SHA512 36709ba726859b734a7402c533ba7d2abc0546007bc97dba76ac824bc42f6f8ac7ef263b3740d0be51749cbc0982d010ba938646fca2006fa2c5094a296b3c81
+EBUILD sgmltools-lite-3.0.3-r14.ebuild 2205 BLAKE2B 030bdf9b6258b0768b3098c17d4cc820110cfff79ce9a2d6becf6d1c28c18977d2cbceb083cec512cb64380bd5cf8ef012a773357d328a08f4cef607229fd237 SHA512 f1cf3035547d1626ace249218a75399e7ad9374f60de3203003393418324628dce27f28cd608f4a4c310306d36043a6856db273307c8ec5a9a3642307e1cb351
+MISC metadata.xml 413 BLAKE2B b4a1d8afb18583b1b8a16bcfb3f29f547a233ba6742ec4998a101f0e97344554f7e404f51673a646f9200bbda586df213dc33fd21fa3120f4fc4394c9174bcb2 SHA512 e5b3ccaf5308d1509e4921035d83396d3357e4845798689ff03fbe4898d7b02da344e5ab21847d84c99f40371ab4c9ac04b57d7d060fc62c59a800e22e71611a
diff --git a/app-text/sgmltools-lite/metadata.xml b/app-text/sgmltools-lite/metadata.xml
new file mode 100644
index 000000000000..465570abcce8
--- /dev/null
+++ b/app-text/sgmltools-lite/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<use>
+		<flag name="jadetex">
+			Add support for <pkg>app-text/jadetex</pkg> (for processing
+			tex files produced by the TeX backend of Jade)
+		</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">sgmltools-lite</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/sgmltools-lite/sgmltools-lite-3.0.3-r14.ebuild b/app-text/sgmltools-lite/sgmltools-lite-3.0.3-r14.ebuild
new file mode 100644
index 000000000000..533ea51065bf
--- /dev/null
+++ b/app-text/sgmltools-lite/sgmltools-lite-3.0.3-r14.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-single-r1 sgml-catalog
+
+DESCRIPTION="Python interface to SGML software in a DocBook/OpenJade env"
+HOMEPAGE="http://sgmltools-lite.sourceforge.net/"
+SRC_URI="
+	mirror://sourceforge/sgmltools-lite/${P}.tar.gz
+	mirror://sourceforge/sgmltools-lite/nw-eps-icons-0.0.1.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+IUSE="jadetex"
+
+RDEPEND="${PYTHON_DEPS}
+	app-text/sgml-common
+	app-text/docbook-sgml-dtd:3.1
+	app-text/docbook-dsssl-stylesheets
+	app-text/openjade
+	jadetex? ( app-text/jadetex )
+	|| (
+		www-client/w3m
+		www-client/lynx
+		)"
+DEPEND=${RDEPEND}
+
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+sgml-catalog_cat_include "/etc/sgml/sgml-lite.cat" \
+	"/usr/share/sgml/stylesheets/sgmltools/sgmltools.cat"
+
+src_prepare() {
+	ecvs_clean
+}
+
+src_compile() {
+	default
+}
+
+src_install() {
+	einstall etcdir="${D}"/etc/sgml
+
+	dodoc ChangeLog POSTINSTALL README*
+	dohtml -r .
+
+	insinto /usr/share/sgml/docbook/dsssl-stylesheets/
+	doins -r "${WORKDIR}"/nw-eps-icons-0.0.1/images
+
+	rm "${ED}"/etc/sgml/catalog.{suse,rh62} || die
+
+	# Remove file provided by sgml-common
+	rm "${ED}"/usr/bin/sgmlwhich || die
+
+	# List of backends to alias with sgml2*
+	# Do not provide sgml2{txt,rtf,html} anymore, they are part of
+	# linuxdoc-tools
+	local BACKENDS=""
+	if use jadetex; then
+		BACKENDS="ps dvi pdf"
+	else
+		# Remove the backends that require jadetex
+		rm "${D}"/usr/share/sgml/misc/sgmltools/python/backends/{Dvi,Ps,Pdf,JadeTeX}.py || die
+	fi
+
+	# Create simple alias scripts that people are used to
+	# And make the manpages for those link to the sgmltools-lite manpage
+	mandir="${D}"/usr/share/man/man1
+	ScripTEXT="#!/bin/sh\n/usr/bin/sgmltools --backend="
+	for back in ${BACKENDS}; do
+		echo -e ${ScripTEXT}${back} '$*' > sgml2${back}
+		dobin sgml2${back}
+
+		ln -sf sgmltools-lite.1 "${mandir}/sgml2${back}.1" || die
+	done
+
+	python_fix_shebang "${D}"
+	python_optimize "${ED%/}/usr/share/sgml/misc/sgmltools/python"
+}
+
+pkg_postinst() {
+	sgml-catalog_pkg_postinst
+}
+
+pkg_postrm() {
+	sgml-catalog_pkg_postrm
+}
diff --git a/app-text/sgrep-1.94a b/app-text/sgrep-1.94a
deleted file mode 100644
index 86559d1083c2..000000000000
--- a/app-text/sgrep-1.94a
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DESCRIPTION=Use structural criteria to grep and index text, SGML, XML and HTML and filter
-EAPI=6
-HOMEPAGE=https://www.cs.helsinki.fi/u/jjaakkol/sgrep.html
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=ftp://ftp.cs.helsinki.fi/pub/Software/Local/Sgrep/sgrep-1.94a.tar.gz
-_md5_=1aec8e2828150450b9e91ddc4012114a
diff --git a/app-text/sgrep/Manifest b/app-text/sgrep/Manifest
new file mode 100644
index 000000000000..c44668845b5c
--- /dev/null
+++ b/app-text/sgrep/Manifest
@@ -0,0 +1,3 @@
+DIST sgrep-1.94a.tar.gz 193267 BLAKE2B fe37f62e2cb5c2ccad88df8ee3000d937357b5801ac6c55938a575f77735db7f94c0475e2eaa2521dfbae194132dcda4efe009db32e23b50c13acbc359b9abaf SHA512 8d2571a738c6a87cc34aea3a0692d15aea1d4a0439401b97368da2a021992ef8d0754e91e10409c1c059712bfe69ac4188e3be856211e48f8e6d528b5684283a
+EBUILD sgrep-1.94a.ebuild 721 BLAKE2B 18ece2417c18c5f3578222d2a2aa5cce21307213c46e9fdb06170b70148b6679d3ee34bd80a22c84ac89c47141eaa7c3888a1af9512d825560a59f4a3a999265 SHA512 64fa85b4e830e83694a516c1760f612078e0fe6d5ac5c256ebddc20f2a0cafa24220d1929b6e3561c8d52cfe3abcc7a57a11ec97b4eea0b67e25d8b654e2fa87
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/sgrep/metadata.xml b/app-text/sgrep/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-text/sgrep/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/app-text/sgrep/sgrep-1.94a.ebuild b/app-text/sgrep/sgrep-1.94a.ebuild
new file mode 100644
index 000000000000..2f7bae2fad40
--- /dev/null
+++ b/app-text/sgrep/sgrep-1.94a.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Use structural criteria to grep and index text, SGML, XML and HTML and filter"
+SRC_URI="ftp://ftp.cs.helsinki.fi/pub/Software/Local/Sgrep/${P}.tar.gz"
+HOMEPAGE="https://www.cs.helsinki.fi/u/jjaakkol/sgrep.html"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE=""
+
+src_prepare() {
+	default
+	sed -i -e "s:/usr/lib:/etc:g" sgrep.1 || die
+}
+
+src_configure() {
+	econf --datadir="${EPREFIX}"/etc
+}
+
+src_install() {
+	dobin sgrep
+	doman sgrep.1
+	dodoc AUTHORS ChangeLog NEWS README sample.sgreprc
+	insinto /etc
+	newins sample.sgreprc sgreprc
+}
diff --git a/app-text/sigil-0.9.8 b/app-text/sigil-0.9.8
deleted file mode 100644
index be673db808c9..000000000000
--- a/app-text/sigil-0.9.8
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] app-text/hunspell dev-libs/boost[threads] dev-libs/libpcre[pcre16] dev-libs/xerces-c[icu] dev-python/chardet[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/cssselect[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/cssutils[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/html5lib[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/lxml[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pillow[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/regex[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/six[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=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] >=sys-devel/gcc-4.8 virtual/pkgconfig >=dev-qt/linguist-tools-5.4:5 app-arch/unzip sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Sigil is a multi-platform WYSIWYG ebook editor for ePub format
-EAPI=6
-HOMEPAGE=https://sigil-ebook.com/
-IUSE=python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+
-RDEPEND=python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] app-text/hunspell dev-libs/boost[threads] dev-libs/libpcre[pcre16] dev-libs/xerces-c[icu] dev-python/chardet[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/cssselect[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/cssutils[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/html5lib[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/lxml[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pillow[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/regex[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/six[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=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]
-REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/Sigil-Ebook/Sigil/releases/download/0.9.8/Sigil-0.9.8-Code.zip
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a292c047029a9c08ce14a721959311c3
diff --git a/app-text/sigil/Manifest b/app-text/sigil/Manifest
new file mode 100644
index 000000000000..acac51261cfb
--- /dev/null
+++ b/app-text/sigil/Manifest
@@ -0,0 +1,4 @@
+AUX sigil-0.9.8-proper-gumbo-install.patch 1351 BLAKE2B d24d6e0be9b7c56c944aad2d97528ef38b3f96b4d81504b1169095112cc939a662101754ccc9f4d8e9303cd0e9d2ad084e8c86c32d73d43720d1a1736ec572d3 SHA512 743250a34b257ca7619b53f4373efed48867f9a059db378ee3d8192e4cc73861ba8eb490b7a72a96ee923b034922eb0224a0ef963d455bdbc1cf6f4425881f89
+DIST Sigil-0.9.8-Code.zip 19807795 BLAKE2B 002626842b2619b94889780a66e4de1f6d6fc9f07e36069608d2edae1078516d7c0fbedad6d4966f2cff64ccd21730719a04c144b3c3c1740ad727448aff8af2 SHA512 18cd137ead965bc97626499ec73dddb8db82b4d538c30f70e62546bd1eeb6e2e76ce7587d572354d973363a07e93ec33b60024bbef7914a22cbfc28a76af2a00
+EBUILD sigil-0.9.8.ebuild 2239 BLAKE2B cdd30741e8baedcc5a3beafb84bdfdea692aa9ae149188c3142ff78b85cd694c3fc6335ba7552d4652b0fae92d4b787cee518c832fbe272aeef7854e8dc1e5eb SHA512 1363e6b342a3944559016cddfa52de131a2b7600a0f2699cbbf4e077683d48ba87ab0a0a222c9d279bf8bbbc7779327c048cd54e61fc1459f6997ec54551bf2b
+MISC metadata.xml 389 BLAKE2B 8f9988168470e8545fa0fa47e520d7019cb9cf1ba8af0c502fa0b66a8a6a4567feea882d0ddc44864aac2193b411010eee2bd7d5905c68b34a32550ba4f6e223 SHA512 0728fc5f14cceb331ea75a6231d176ecbd22defa77b6d90a6859ec6e001feb3cd1f9c57c779bdcf83f81a4f7dca06e120964d6c93e372e39584293addacb5929
diff --git a/app-text/sigil/files/sigil-0.9.8-proper-gumbo-install.patch b/app-text/sigil/files/sigil-0.9.8-proper-gumbo-install.patch
new file mode 100644
index 000000000000..375f2e0ab6ca
--- /dev/null
+++ b/app-text/sigil/files/sigil-0.9.8-proper-gumbo-install.patch
@@ -0,0 +1,24 @@
+--- a/src/CMakeLists.txt	2017-10-17 14:22:57.780297490 +0200
++++ b/src/CMakeLists.txt	2017-10-17 14:24:21.754150453 +0200
+@@ -962,12 +962,8 @@
+     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/ )
+     if( BUILD_PATCHED_LIBXML2 )
+         install( PROGRAMS ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libsigilxml2.so.2.9.4 DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/sigil/ )
+         install( FILES ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libxml2.so.2 DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/sigil/ )
+--- a/internal/gumbo/CMakeLists.txt	2017-10-17 14:25:02.539107666 +0200
++++ b/internal/gumbo/CMakeLists.txt	2017-10-17 14:25:27.985457056 +0200
+@@ -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 --git a/app-text/sigil/metadata.xml b/app-text/sigil/metadata.xml
new file mode 100644
index 000000000000..53f4fedf5f1d
--- /dev/null
+++ b/app-text/sigil/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+	<longdescription lang="en">Sigil is a multi-platform WYSIWYG ebook editor.
+		It is designed to edit books in ePub format.</longdescription>
+	<upstream>
+		<remote-id type="github">Sigil-Ebook/Sigil</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/sigil/sigil-0.9.8.ebuild b/app-text/sigil/sigil-0.9.8.ebuild
new file mode 100644
index 000000000000..c033f4ff46fb
--- /dev/null
+++ b/app-text/sigil/sigil-0.9.8.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+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.8-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/silvercity-0.9.7-r1 b/app-text/silvercity-0.9.7-r1
deleted file mode 100644
index f9e41b90f17e..000000000000
--- a/app-text/silvercity-0.9.7-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=A lexical analyser for many languages
-EAPI=5
-HOMEPAGE=http://silvercity.sourceforge.net/
-IUSE=python_targets_python2_7
-KEYWORDS=~alpha amd64 ~ia64 ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=BSD
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://sourceforge/silvercity/SilverCity-0.9.7.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8da9982aa53c345a6b931a28008f9a42
diff --git a/app-text/silvercity/Manifest b/app-text/silvercity/Manifest
new file mode 100644
index 000000000000..c7b6d616dc87
--- /dev/null
+++ b/app-text/silvercity/Manifest
@@ -0,0 +1,3 @@
+DIST SilverCity-0.9.7.tar.gz 278396 BLAKE2B 30419ee4d2cafe56cbfc1b73a3b188214c58e29a154810bed9b837d9fdc6709f7691c1662cc1da0a5eb1b326a430f958d66bb5629ae2f3a3afe2442f2e11957d SHA512 230c4ce61a0dfef36ba63dfa2d290c2368ae0a1055445b1e17cd12ff436ec80ec91e5a8ff47870c19a3f7a50f958ce59bbe5be06aa07dd0bf0a70038ca3150b0
+EBUILD silvercity-0.9.7-r1.ebuild 923 BLAKE2B e5891e786498ac428ed3970f4d40fdaf22ba8fe1ac9377a728ea321ca463157b371e6186cc4af1a4e90ebaa36dcb28a5e726dd070c46853e523b838a621b02d1 SHA512 6a224815f39ff8ef107fc62c23f0ca63fde672c792ec666816eca19ca1fd0aab2e6616c7b7873d18dfdd4d426b5cf88040ce292dd9ed6e07d6f5dde39b47ef62
+MISC metadata.xml 330 BLAKE2B dc1e089aa92ecf442d42c3a1dce93b9735a2c58a5fb6488c6825110125e2292c94e6bc0fa6471a56b58e72e6a130162dc77dff3f548f70e470ba628d21b6ff07 SHA512 6ae025cf1a3a56a19a6fbf436c293fe57365e87d11386797f94fd680bd0d044c8c13860670e070af9c1cad7c0a5f6bd4c29468ac5177456d20196844482676bd
diff --git a/app-text/silvercity/metadata.xml b/app-text/silvercity/metadata.xml
new file mode 100644
index 000000000000..624b33e3a10e
--- /dev/null
+++ b/app-text/silvercity/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>web-apps@gentoo.org</email>
+		<name>Gentoo Webapps</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">silvercity</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/silvercity/silvercity-0.9.7-r1.ebuild b/app-text/silvercity/silvercity-0.9.7-r1.ebuild
new file mode 100644
index 000000000000..36a16f780317
--- /dev/null
+++ b/app-text/silvercity/silvercity-0.9.7-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 eutils
+
+MY_PN="SilverCity"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A lexical analyser for many languages"
+HOMEPAGE="http://silvercity.sourceforge.net/"
+SRC_URI="mirror://sourceforge/silvercity/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~ia64 ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+S="${WORKDIR}/${MY_P}"
+
+python_prepare_all() {
+	# Fix line endings.
+	find -type f -exec sed -e 's/\r$//' -i {} + || die "sed failed"
+
+	# Fix permissions.
+	chmod -x CSS/default.css || die "chmod failed"
+
+	# Fix shebang.
+	sed -e 's:#!/usr/home/sweetapp/bin/python:#!/usr/bin/env python:' \
+		-i PySilverCity/Scripts/cgi-styler-form.py || die "sed failed"
+
+	distutils-r1_python_prepare_all
+}
diff --git a/app-text/sloccount-2.26-r3 b/app-text/sloccount-2.26-r3
deleted file mode 100644
index 067c333005cd..000000000000
--- a/app-text/sloccount-2.26-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare test
-DEPEND=dev-lang/perl >=sys-apps/sed-4 app-shells/bash
-DESCRIPTION=Tools for counting Source Lines of Code (SLOC) for a large number of languages
-EAPI=4
-HOMEPAGE=http://www.dwheeler.com/sloccount/
-KEYWORDS=~alpha amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl >=sys-apps/sed-4 app-shells/bash
-SLOT=0
-SRC_URI=http://www.dwheeler.com/sloccount/sloccount-2.26.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=14907117129dc5f41e1d878a455a3ef5
diff --git a/app-text/sloccount/Manifest b/app-text/sloccount/Manifest
new file mode 100644
index 000000000000..343ab7d1103b
--- /dev/null
+++ b/app-text/sloccount/Manifest
@@ -0,0 +1,6 @@
+AUX sloccount-2.26-coreutils-tail-n-fix.patch 468 BLAKE2B 81f7e84e738ef592c9863590b8648e1bb3446b8556b2562fe20f42af060719bb639fd93c25a1350ee738b095aff6943fb77b7498aaa6d5b2c6d405affacfbfea SHA512 200ccf47b4ca21a17cbe06ccf7b9a8022c794d1b5c0e0f59477b74a37704a6d5a106d4a7791ab84f6387032c938c132ffc1971e4db6532b21d5a0f2fef6df03e
+AUX sloccount-2.26-gentoo.patch 852 BLAKE2B 5e41be564f2aedb7d5094453148e9a9048894473316f77d50570f94dfcf973aa84f362533b4ceaf617fb8f1eb24db03e42a3562c6ba4da2716e652101acb1b86 SHA512 226a28d6ce4bc42f3074dc4390379e0d4539d9e2d9dabe3ec7b60fd41a9b3d9d882d4c4b0dce6803eb137230b67cc622d2b3ab6c4ead0cb90a410efe4b5b18af
+AUX sloccount-2.26-libexec.patch 2293 BLAKE2B 7e2dbbf27535e8a2c6ebba2eca790b67b84cd102a0b000a45bf2b56434138891de72906b42170a488f1a1ef6df4a848f0d72137662b835d5f002350b747f1b33 SHA512 87101dc6c6632d38ff25b842b3342ee7caae0a926ce7c62f07360691a1494f8fefb8a039743d6cc49e3ca53a2eb179a06a97763ff5cf6224056a0916317afa35
+DIST sloccount-2.26.tar.gz 190948 BLAKE2B 060cba3796ba4edc5f64ca3cc16de6f7dd8d1d18e45f9ccc0abe7a27e37daa6c02dd7a3f31b124b5e9ccc81ab59a7c4c6405b86ebb17ca9853c1ac1dafcba095 SHA512 ed6ab315a56dbdc86c654b94e790c9ea9e2dcad0db26b63c0973c33eb7fa634b4ade0a1f3c6ccfd5172ea95f648c1dd3b0ae2575b0aa44b3fec708c24a6aca54
+EBUILD sloccount-2.26-r3.ebuild 1267 BLAKE2B 5f1d76f99046efe81cf597fae62e50078078a68d25eea23e20a5eeba8b605976c8656c722a616772b7feaf919bd751ff44fc6b4f7953a1f3c2a2eb3aecb2645c SHA512 c6bedf3aaaafa0fcd5b3145fbf46034a60081ab9deb8f6168258574581a085afc22cafcb36a70ab24680286cbfc670a08099f0d677a1da0961707b7ff6a11782
+MISC metadata.xml 216 BLAKE2B 20531789dc11e43feee7ec315a0c1c7249fdf73764e29cb7d6db439826e9ff72f24a5cdb8eb7f1ab99bbb41fb6e4226874a1d1fa4185de52598602bb3b0479a3 SHA512 e881b59fe49746eb25ad66c258b41aba501e4eb563129093a3898ea970a20506e7898f7c355cfcf99605234962bf2c77c1309c258b9a2b84ee4302ccb71c9dbd
diff --git a/app-text/sloccount/files/sloccount-2.26-coreutils-tail-n-fix.patch b/app-text/sloccount/files/sloccount-2.26-coreutils-tail-n-fix.patch
new file mode 100644
index 000000000000..caf30cf894de
--- /dev/null
+++ b/app-text/sloccount/files/sloccount-2.26-coreutils-tail-n-fix.patch
@@ -0,0 +1,12 @@
+diff -Nur sloccount-2.22/compute_sloc_lang sloccount-2.22-new/compute_sloc_lang
+--- sloccount-2.22/compute_sloc_lang	2002-02-28 13:34:09.000000000 +0100
++++ sloccount-2.22-new/compute_sloc_lang	2004-10-23 12:36:56.295312577 +0200
+@@ -30,7 +30,7 @@
+      *) ${language}_count -f ${language}_list.dat > ${language}_outfile.dat
+         ;;
+    esac
+-   tail -1 < ${language}_outfile.dat
++   tail -n 1 < ${language}_outfile.dat
+ 
+   else
+    rm -f ${language}_outfile.dat
diff --git a/app-text/sloccount/files/sloccount-2.26-gentoo.patch b/app-text/sloccount/files/sloccount-2.26-gentoo.patch
new file mode 100644
index 000000000000..c3a031190a36
--- /dev/null
+++ b/app-text/sloccount/files/sloccount-2.26-gentoo.patch
@@ -0,0 +1,20 @@
+--- break_filelist.old	2013-10-14 17:23:01.523330534 +0800
++++ break_filelist	2004-08-01 12:17:28.000000000 +0800
+@@ -177,7 +177,7 @@
+   "p" => "pascal", "pas" => "pascal", "pp" => "pascal", "dpr" => "pascal",
+   "py" => "python",
+   "s" => "asm", "S" => "asm", "asm" => "asm",
++  "sh" => "sh", "bash" => "sh", "ebuild" => "sh",
+-  "sh" => "sh", "bash" => "sh",
+   "csh" => "csh", "tcsh" => "csh", 
+   "java" => "java",
+   "lisp" => "lisp", "el" => "lisp", "scm" => "lisp", "sc" => "lisp", 
+@@ -879,7 +879,7 @@
+   $command = $2;
+  }
+ 
++ if ( ($command =~ m/^(bash|ksh|zsh|pdksh|sh|runscript)[0-9\.]*(\.exe)?$/i) ||
+- if ( ($command =~ m/^(bash|ksh|zsh|pdksh|sh)[0-9\.]*(\.exe)?$/i) ||
+      ($firstline =~
+           m~^#!\s*\@_?(SCRIPT_)?(PATH_)?(BA|K)?SH(ELL)?(\d+)?\@?(\s|\Z)~)) {
+     # Note: wish(1) uses a funny trick; see wish(1) for more info.
diff --git a/app-text/sloccount/files/sloccount-2.26-libexec.patch b/app-text/sloccount/files/sloccount-2.26-libexec.patch
new file mode 100644
index 000000000000..cb8250f68cf6
--- /dev/null
+++ b/app-text/sloccount/files/sloccount-2.26-libexec.patch
@@ -0,0 +1,81 @@
+Files sloccount-2.26.orig/.makefile.swp and sloccount-2.26/.makefile.swp differ
+Files sloccount-2.26.orig/.sloccount.swp and sloccount-2.26/.sloccount.swp differ
+diff -ruN sloccount-2.26.orig/makefile sloccount-2.26/makefile
+--- sloccount-2.26.orig/makefile	2005-02-20 21:26:00.000000000 +0100
++++ sloccount-2.26/makefile	2005-02-20 21:32:58.000000000 +0100
+@@ -70,6 +70,7 @@
+ ARCH=i386
+ VERSIONEDNAME=$(NAME)-$(VERSION)
+ INSTALL_DIR=$(PREFIX)/bin
++LIBEXEC_DIR=$(PREFIX)/libexec/$(NAME)
+ MAN_DIR=$(PREFIX)/share/man
+ MAN_DIR_MAN1=$(MAN_DIR)/man1
+ DOC_DIR=$(PREFIX)/share/doc/$(VERSIONEDNAME)-$(RPM_VERSION)
+@@ -115,11 +116,12 @@
+    sed_count \
+    sh_count \
+    show_filecount \
+-   sloccount \
+    sql_count \
+    tcl_count \
+    $(COMPILED_EXECUTABLES)
+ 
++MAIN_EXECUTABLE=sloccount
++
+ MANPAGES=sloccount.1.gz
+ 
+ MYDOCS=sloccount.html README TODO ChangeLog
+@@ -162,12 +164,24 @@
+ c_lines: C_LINES.C
+ 	$(CC) C_LINES.C -o c_lines$(EXE_SUFFIX)
+ 
++install_prefix:
++	$(INSTALL_A_DIR) $(PREFIX)
+ 
+-install_programs: all
+-	$(INSTALL) $(EXECUTABLES) $(INSTALL_DIR)
++install_program:
++	$(INSTALL_A_DIR) $(INSTALL_DIR)
++	$(INSTALL) $(MAIN_EXECUTABLE) $(INSTALL_DIR)
++
++uninstall_program:
++	cd $(INSTALL_DIR) && rm -f $(MAIN_EXECUTABLE)
++
++install_libexec: all
++	$(INSTALL_A_DIR) $(LIBEXEC_DIR)
++	$(INSTALL) $(EXECUTABLES) $(LIBEXEC_DIR)
++
++uninstall_libexec:
++	cd $(LIBEXEC_DIR) && rm -f $(EXECUTABLES)
++	rmdir $(LIBEXEC_DIR)
+ 
+-uninstall_programs:
+-	cd $(INSTALL_DIR) && rm -f $(EXECUTABLES)
+ 
+ install_man: $(MANPAGES)
+ 	$(INSTALL_A_DIR) $(MAN_DIR_MAN1)
+@@ -184,9 +198,9 @@
+ 	rm -fr $(DOC_DIR)
+ 
+ 
+-install: install_programs install_man install_docs
++install: install_prefix install_program install_libexec install_man install_docs
+ 
+-uninstall: uninstall_programs uninstall_docs uninstall_man
++uninstall: uninstall_program uninstall_libexec uninstall_docs uninstall_man
+ 
+ 
+ clean:
+diff -ruN sloccount-2.26.orig/sloccount sloccount-2.26/sloccount
+--- sloccount-2.26.orig/sloccount	2005-02-20 21:26:00.000000000 +0100
++++ sloccount-2.26/sloccount	2005-02-20 21:33:25.000000000 +0100
+@@ -39,6 +39,9 @@
+ 
+ startingdir=`pwd`
+ 
++libexec_dir=/usr/libexec/sloccount
++export PATH=$PATH:$libexec_dir
++
+ 
+ # "datadir" is some suitable safe place for the data; here's the default:
+ datadir=${HOME}/.slocdata
diff --git a/app-text/sloccount/metadata.xml b/app-text/sloccount/metadata.xml
new file mode 100644
index 000000000000..79d462e85571
--- /dev/null
+++ b/app-text/sloccount/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+  <email>robbat2@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/app-text/sloccount/sloccount-2.26-r3.ebuild b/app-text/sloccount/sloccount-2.26-r3.ebuild
new file mode 100644
index 000000000000..0c1bc3de2f75
--- /dev/null
+++ b/app-text/sloccount/sloccount-2.26-r3.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Tools for counting Source Lines of Code (SLOC) for a large number of languages"
+HOMEPAGE="http://www.dwheeler.com/sloccount/"
+SRC_URI="http://www.dwheeler.com/sloccount/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+RDEPEND="dev-lang/perl
+		>=sys-apps/sed-4
+		app-shells/bash"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-libexec.patch
+	epatch "${FILESDIR}"/${P}-coreutils-tail-n-fix.patch
+	# support for .ebuild and #!/sbin/openrc-run:
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+
+	sed -i \
+		-e 's|^CC=gcc|CFLAGS+=|g' \
+		-e 's|$(CC)|& $(CFLAGS) $(LDFLAGS)|g' \
+		-e '/^DOC_DIR/ { s/-$(RPM_VERSION)//g }' \
+		-e '/^MYDOCS/ { s/[^    =]\+\.html//g }' \
+		makefile || die "sed makefile failed"
+
+	#fixed hard-codes libexec_dir in sloccount
+	sed -i "s|libexec_dir=|&\"${EPREFIX}\"|" sloccount || die
+}
+
+src_compile() {
+	emake CC=$(tc-getCC)
+}
+
+src_test() {
+	PATH+=":${S}"
+	emake test
+}
+
+src_install() {
+	emake PREFIX="${ED}/usr" DOC_DIR="${ED}/usr/share/doc/${PF}/" install
+	dohtml *html
+}
diff --git a/app-text/spellutils-0.7 b/app-text/spellutils-0.7
deleted file mode 100644
index 009dcc6d7221..000000000000
--- a/app-text/spellutils-0.7
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure prepare
-DEPEND=nls? ( virtual/libintl )
-DESCRIPTION=spellutils includes 'newsbody' (useful for spellchecking in mails, etc.)
-EAPI=5
-HOMEPAGE=http://home.worldonline.dk/byrial/spellutils/
-IUSE=nls
-KEYWORDS=x86 ppc ~sparc alpha ~mips ~hppa amd64
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://home.worldonline.dk/byrial/spellutils/spellutils-0.7.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=fdb7a8ace7fd5cc03bd6677aa19290ce
diff --git a/app-text/spellutils/Manifest b/app-text/spellutils/Manifest
new file mode 100644
index 000000000000..dd0a7f433cd2
--- /dev/null
+++ b/app-text/spellutils/Manifest
@@ -0,0 +1,4 @@
+AUX spellutils-0.7-nls.patch 506 BLAKE2B 686d2f97567d9e3521738307adf4622be83fb726f1a64057eef76d01b2ffafe5a2fdb3cc4d43d05a54ecaa5119c906dc18c1455db434b1ead644d97dccc80a05 SHA512 1d329b8cb27f6f50c3b0c7572352ca57420da12553143269c691f4998d62d6b7f730c42f2cbae324debddbda1729be3ea775c90ee3894d75e64d5f685f764723
+DIST spellutils-0.7.tar.bz2 110421 BLAKE2B b415a8be96962b88c4ba64270b43e90e42a3ebe23d765ef970cf55a22ada842f269878c4b3a72e6284864d1d1c3e4ade1e84aaf28d4fa39f86f0280db4f27e4d SHA512 030b06038c587e668fcbef95afc64e28db48a25f2b247b829155c1a5b66d3b3012650cb4c13e5de41a70a1665b05fbfb44a4cd0b1295868e611a21d855f02f9e
+EBUILD spellutils-0.7.ebuild 690 BLAKE2B 3c6b2dbf43d3118e1cdb600cd1361036185d789d001c44d9663354e460e27a9e59198cfb3db2ef57d0e3c63c3225535f2ca6face5446630fe6cbc3d55ba052e1 SHA512 e6be857d650496a3beea4bf6270baca2742b665ffc86cd68d423fe3aad1e3da84a6d3ddc9302f275e2258fa5c61bd0f73835c9dd3fb74807c542cfd7ad2e2829
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/spellutils/files/spellutils-0.7-nls.patch b/app-text/spellutils/files/spellutils-0.7-nls.patch
new file mode 100644
index 000000000000..ff36f67a9823
--- /dev/null
+++ b/app-text/spellutils/files/spellutils-0.7-nls.patch
@@ -0,0 +1,13 @@
+--- po/Makefile.in.in.orig	2000-04-16 12:04:50.000000000 +0200
++++ po/Makefile.in.in	2013-07-24 04:14:20.698869858 +0200
+@@ -119,8 +119,8 @@
+ 	for cat in $$catalogs; do \
+ 	  cat=`basename $$cat`; \
+ 	  case "$$cat" in \
+-	    *.gmo) destdir=$(gnulocaledir);; \
+-	    *)     destdir=$(localedir);; \
++	    *.gmo) destdir=$(DESTDIR)/$(gnulocaledir);; \
++	    *)     destdir=$(DESTDIR)/$(localedir);; \
+ 	  esac; \
+ 	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
+ 	  dir=$$destdir/$$lang/LC_MESSAGES; \
diff --git a/app-text/spellutils/metadata.xml b/app-text/spellutils/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-text/spellutils/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/app-text/spellutils/spellutils-0.7.ebuild b/app-text/spellutils/spellutils-0.7.ebuild
new file mode 100644
index 000000000000..2f4a49cf772a
--- /dev/null
+++ b/app-text/spellutils/spellutils-0.7.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils toolchain-funcs
+
+DESCRIPTION="spellutils includes 'newsbody' (useful for spellchecking in mails, etc.)"
+HOMEPAGE="http://home.worldonline.dk/byrial/spellutils/"
+SRC_URI="http://home.worldonline.dk/byrial/spellutils/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="x86 ppc ~sparc alpha ~mips ~hppa amd64"
+IUSE="nls"
+
+DEPEND="
+	nls? ( sys-devel/gettext )
+"
+DEPEND="
+	nls? ( virtual/libintl )
+"
+
+DOCS=( NEWS README )
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-nls.patch
+}
+
+src_configure() {
+	econf $(use_enable nls)
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+}
diff --git a/app-text/stardict-3.0.6-r3 b/app-text/stardict-3.0.6-r3
deleted file mode 100644
index 43fc54a566f1..000000000000
--- a/app-text/stardict-3.0.6-r3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=>=dev-libs/glib-2.16:2 dev-libs/libsigc++:2= sys-libs/zlib:= x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.20:2 x11-libs/libX11 x11-libs/pango gucharmap? ( gnome-extra/gucharmap:0= ) spell? ( >=app-text/enchant-1.2 ) tools? ( dev-libs/libpcre:= dev-libs/libxml2:= virtual/mysql python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) ) app-text/docbook-xml-dtd:4.3 app-text/gnome-doc-utils dev-libs/libxslt dev-util/intltool sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A international dictionary supporting fuzzy and glob style matching
-EAPI=6
-HOMEPAGE=http://stardict-4.sourceforge.net/
-IUSE=advertisement debug dictdotcn espeak examples +gucharmap +htmlparse man perl +powerwordparse pronounce python qqwry spell tools updateinfo +wikiparse +wordnet +xdxfparse python_targets_python2_7
-KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 sparc x86
-LICENSE=CPL-1.0 GPL-3 LGPL-2
-RDEPEND=>=dev-libs/glib-2.16:2 dev-libs/libsigc++:2= sys-libs/zlib:= x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.20:2 x11-libs/libX11 x11-libs/pango gucharmap? ( gnome-extra/gucharmap:0= ) spell? ( >=app-text/enchant-1.2 ) tools? ( dev-libs/libpcre:= dev-libs/libxml2:= virtual/mysql python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) ) espeak? ( >=app-accessibility/espeak-1.29 ) perl? ( dev-lang/perl )
-REQUIRED_USE=tools? ( python? ( python_targets_python2_7 ) )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://sourceforge/stardict-4/stardict-3.0.6.tar.bz2 pronounce? ( https://stardict-3.googlecode.com/files/WyabdcRealPeopleTTS.tar.bz2 ) qqwry? ( mirror://gentoo/QQWry.Dat.bz2 )
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=80929ce97abb93a801290987f73d9461
diff --git a/app-text/stardict-4.0.0_pre20160518-r1 b/app-text/stardict-4.0.0_pre20160518-r1
deleted file mode 100644
index 320cd5b151d0..000000000000
--- a/app-text/stardict-4.0.0_pre20160518-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=>=dev-libs/glib-2.32:2 dev-libs/libsigc++:2= media-libs/libcanberra[gtk3] sys-libs/zlib:= x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libX11 x11-libs/pango espeak? ( >=app-accessibility/espeak-1.29 ) flite? ( app-accessibility/flite ) gnome? ( gnome-base/gconf:2 gnome-base/libbonobo gnome-base/libgnome gnome-base/orbit:2 ) gucharmap? ( gnome-extra/gucharmap:0= ) spell? ( >=app-text/enchant-1.2 ) tools? ( dev-libs/expat dev-libs/libpcre:= dev-libs/libxml2:= virtual/mysql python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) ) app-text/docbook-xml-dtd:4.3 app-text/gnome-doc-utils dev-libs/libxslt dev-util/intltool sys-devel/gettext virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=A international dictionary supporting fuzzy and glob style matching
-EAPI=6
-HOMEPAGE=http://stardict-4.sourceforge.net/ https://github.com/huzheng001/stardict-3
-IUSE=advertisement cal debug dictdotcn espeak examples flite fortune gnome gucharmap +htmlparse info man perl +powerwordparse pronounce python qqwry spell tools updateinfo +wikiparse +wordnet +xdxfparse youdaodict python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=CPL-1.0 GPL-3 LGPL-2
-RDEPEND=>=dev-libs/glib-2.32:2 dev-libs/libsigc++:2= media-libs/libcanberra[gtk3] sys-libs/zlib:= x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libX11 x11-libs/pango espeak? ( >=app-accessibility/espeak-1.29 ) flite? ( app-accessibility/flite ) gnome? ( gnome-base/gconf:2 gnome-base/libbonobo gnome-base/libgnome gnome-base/orbit:2 ) gucharmap? ( gnome-extra/gucharmap:0= ) spell? ( >=app-text/enchant-1.2 ) tools? ( dev-libs/expat dev-libs/libpcre:= dev-libs/libxml2:= virtual/mysql python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ) ) info? ( sys-apps/texinfo ) fortune? ( games-misc/fortune-mod ) perl? ( dev-lang/perl )
-REQUIRED_USE=tools? ( python? ( python_targets_python2_7 ) )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~bircoph/distfiles/stardict-4.0.0_pre20160518.tar.xz pronounce? ( https://stardict-3.googlecode.com/files/WyabdcRealPeopleTTS.tar.bz2 ) qqwry? ( mirror://gentoo/QQWry.Dat.bz2 )
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d4f78bb06d3494f2f55f601b7d53610d
diff --git a/app-text/stardict/Manifest b/app-text/stardict/Manifest
new file mode 100644
index 000000000000..5e0d13996738
--- /dev/null
+++ b/app-text/stardict/Manifest
@@ -0,0 +1,8 @@
+AUX stardict-4.0.0_pre20160518-tabfile.patch 1144 BLAKE2B 0a846a6ce002c53adbb170907500a7663e8d7871fc1ed6490cd1d5297ce2876a71da48bc3d9ff8715144824cdfca2c18bd92ccf7d905901b8107b7b6209da098 SHA512 532f70556fcf64cfd9e7e00fc226533754089f3091402c402943fbda296755aae9e0466d4972f6e94d34e9644d34ee94b253a1b460d4d3915a6e2afae59c67ae
+DIST QQWry.Dat.bz2 4114875 BLAKE2B 3fb1a3b223b799645fcc7adc3d8158c80551bd1d35689a44d4e24978ef3535def3c8c45c37f066ea3969d141aef0c34c6040dcdaf6b3f337b178bbffaf52d86f SHA512 46fd677359a2144429eb9d16131ca6b19db1c086fa93e275aa3d702d3024a65d54064df931d1ed2ba5b0c1f7d9595a284f2a8995d9cd5aac96a45216422dc9ae
+DIST WyabdcRealPeopleTTS.tar.bz2 84329208 BLAKE2B 1dd9c00e4e914b0d747876aa566db59a4b973b3ec61fa1ed7a55f885d7f415f573f2f8783eca46c565bc52df4ba3576b3a0f4e863b4f7ba688007f6d6b375209 SHA512 1553e62c139ecb005bb04163147d94aa58e4ba7f9ee3172b760c6e4776587c12bf816c42e0131c82195b7c738ec9ee5082f39b974790f5cacd522367919beaa0
+DIST stardict-3.0.6.tar.bz2 9341740 BLAKE2B df0ccfbd485dfb514bdcf4edaf92b2faf3c11016b025ca09596adcc12738027395a049d9d27420427acdf5c46923cb43ba521d334f875070f5451b7ff147e36f SHA512 81d93324b6e8954af7c20ea6d2a3054bb564d786a21b1cb541c728da7a18a6e7ddb23e595055ccc77e6866bbb8c89fb4f17023e33664761dbe1ee8cd55768658
+DIST stardict-4.0.0_pre20160518.tar.xz 3605324 BLAKE2B bd160edddef547c72f3002e8a6c290a1538ea25335c8eb66b77d0bc261fe7666019b6e746b1a7d47d3098d5b35fdd091f47132a511cfa118dc3c44dea8361dbe SHA512 5fb04d7870019f17038e0750a2250a0dca44c427f427cd987542eea2bdfab91223e2c01bae844c43f7d8991d51c0420bd4d77ad6d3f7d86cf6f9c50dae7ca50e
+EBUILD stardict-3.0.6-r3.ebuild 6048 BLAKE2B e890c61ceb6b5fd7c16ce93e9dba30de59fe5ffc8599b725cd14d03c2d3395d07b4317ef8c14af496d5c10a2cad441197e88e9d8c836e4221ed7c50c7fe91e60 SHA512 6ceb6977ddd47a167d2d037c987171cdcb9b4fe21fc89f11b2b0df421c1f9960f442b108723976f1417f3d02f8d08c09079a05bc709e79afa055298c287accb8
+EBUILD stardict-4.0.0_pre20160518-r1.ebuild 6779 BLAKE2B b67b33a26266101c5c58233bbf596d1fe3ce693b98b72717a8057c2e049afe09008e9458d1bf0e4d0f8023b13b213ded3c3174939760c8f120b61647a6442c72 SHA512 b7b0b93bffb2200aa97076ea8de54395a6db668c79d5b489d91759399b645c0941372480607819fe3c80162940f244a279c8db6b5ffc6a89a8cd75e41fad8021
+MISC metadata.xml 2668 BLAKE2B f5d9f4b43187c2140f84addb9bf1c2d209d7ef0de7a5081fae594c27b439ef77686ac9fd8b555bc95b76bdef041dab75fbdbe1bf5451bd754b4cfd1dd5d7771d SHA512 caae150f5dd42c45ee5f17659df5700b52ed38c9005c37316df9c4828dcfbbeed1dd585c8c9b44acfe16f1f68f745354ac40e4dc5695df183cbf5c64e82826d7
diff --git a/app-text/stardict/files/stardict-4.0.0_pre20160518-tabfile.patch b/app-text/stardict/files/stardict-4.0.0_pre20160518-tabfile.patch
new file mode 100644
index 000000000000..49cb284253af
--- /dev/null
+++ b/app-text/stardict/files/stardict-4.0.0_pre20160518-tabfile.patch
@@ -0,0 +1,38 @@
+From adb01aafd94b6bd5b5cc49889f4f09d483ee5ac4 Mon Sep 17 00:00:00 2001
+From: Nikolay Korotkiy <sikmir@gmail.com>
+Date: Thu, 1 Sep 2016 14:11:41 +0300
+Subject: [PATCH] tabfile: incorrectly handles whitespace in file name
+
+Signed-off-by: Andrew Savchenko <bircoph@gmail.com>
+---
+ tools/src/libtabfile.cpp | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/tools/src/libtabfile.cpp b/tools/src/libtabfile.cpp
+index dda256a..2ee9dfd 100644
+--- a/tools/src/libtabfile.cpp
++++ b/tools/src/libtabfile.cpp
+@@ -22,6 +22,7 @@
+ #include <cstring>
+ #include <cstdlib>
+ #include <string>
++#include <sstream>
+ #include <glib/gstdio.h>
+ #include <glib.h>
+ 
+@@ -228,9 +229,10 @@ static bool write_dictionary(const char *filename, GArray *array)
+ 	g_message("%s wordcount: %d.", get_impl(basefilename), array->len);
+ 
+ #ifndef _WIN32
+-	std::string command(std::string("dictzip ") + dicfilename);
++	std::stringstream command;
++	command << "dictzip \"" << dicfilename << "\"";
+ 	int result;
+-	result = system(command.c_str());
++	result = system(command.str().c_str());
+ 	if (result == -1) {
+ 		g_print("system() error!\n");
+ 	}
+-- 
+2.10.2
+
diff --git a/app-text/stardict/metadata.xml b/app-text/stardict/metadata.xml
new file mode 100644
index 000000000000..6f654ddb7429
--- /dev/null
+++ b/app-text/stardict/metadata.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>bircoph@gentoo.org</email>
+		<name>Andrew Savchenko</name>
+	</maintainer>
+	<longdescription>
+		StarDict is an international dictionary Software. It has powerful features
+		such as "Glob-style pattern matching", "Scan selection word," "Fuzzy
+		query," etc. Stardict Version3.0 has developed a lot of new functions, such
+		as Full-text translation, Net Dict.
+	</longdescription>
+	<use>
+		<flag name="advertisement">Enable stardict advertisements plugin</flag>
+		<flag name="cal">Enable calendar support using cal program</flag>
+		<flag name="dictdotcn">Enable dict.cn network plugin (for Chinese language)</flag>
+		<flag name="espeak">Enable text to speech synthesizer plugin using <pkg>app-accessibility/espeak</pkg> engine</flag>
+		<flag name="flite">Enable text to speech synthesizer plugin using <pkg>app-accessibility/flite</pkg> engine</flag>
+		<flag name="fortune">Enable plugin to read fortune messages using <pkg>games-misc/fortune-mod</pkg>. You may consider installing <pkg>games-misc/fortune-mod-all</pkg> to get all fortune messages.</flag>
+		<flag name="gucharmap">Enable plugin for unicode symbols description using <pkg>gnome-extra/gucharmap</pkg></flag>
+		<flag name="htmlparse">Enable plugin to parse dictionaries with html content</flag>
+		<flag name="info">Enable plugin to read info pages</flag>
+		<flag name="man">Enable plugin to read manual pages</flag>
+		<flag name="powerwordparse">Enable plugin to parse powerword dictionaries</flag>
+		<flag name="pronounce">Install WyabdcRealPeopleTTS package (it is just many .wav files) to make StarDict pronounce English words</flag>
+		<flag name="qqwry">Enable QQWry plugin, which provides information (in Chinese language) about geographical positions, owner, etc. for IP addresses</flag>
+		<flag name="tools">Build and install dictionary management tools and converters from various dictionary formats</flag>
+		<flag name="updateinfo">Enable plugin to check for stardict updates</flag>
+		<flag name="wikiparse">Enable plugin to parse dictionaries in wikimedia format</flag>
+		<flag name="wordnet">Enable wordnet plugin to find similar English words using lexical database</flag>
+		<flag name="xdxfparse">Enable plugin to parse dictionaries in xdxf (XML Dictionary eXchange Format)</flag>
+		<flag name="youdaodict">Enable youdao.com network plugin (for Chinese language)</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">stardict-4</remote-id>
+		<remote-id type="github">huzheng001/stardict-3</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/stardict/stardict-3.0.6-r3.ebuild b/app-text/stardict/stardict-3.0.6-r3.ebuild
new file mode 100644
index 000000000000..677af8811503
--- /dev/null
+++ b/app-text/stardict/stardict-3.0.6-r3.ebuild
@@ -0,0 +1,204 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# NOTE: Even though the *.dict.dz are the same as dictd/freedict's files,
+#       their indexes seem to be in a different format. So we'll keep them
+#       seperate for now.
+
+GNOME2_LA_PUNT=yes
+PYTHON_COMPAT=( python2_7 )
+
+inherit flag-o-matic gnome2 python-single-r1
+
+DESCRIPTION="A international dictionary supporting fuzzy and glob style matching"
+HOMEPAGE="http://stardict-4.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}-4/${P}.tar.bz2
+	pronounce? ( https://${PN}-3.googlecode.com/files/WyabdcRealPeopleTTS.tar.bz2 )
+	qqwry? ( mirror://gentoo/QQWry.Dat.bz2 )"
+
+LICENSE="CPL-1.0 GPL-3 LGPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 sparc x86"
+IUSE="advertisement debug dictdotcn espeak examples +gucharmap
++htmlparse man perl +powerwordparse pronounce python qqwry spell
+tools updateinfo +wikiparse +wordnet +xdxfparse"
+
+RESTRICT="test"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.16:2
+	dev-libs/libsigc++:2=
+	sys-libs/zlib:=
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-2.20:2
+	x11-libs/libX11
+	x11-libs/pango
+	gucharmap? ( gnome-extra/gucharmap:0= )
+	spell? ( >=app-text/enchant-1.2 )
+	tools? (
+		dev-libs/libpcre:=
+		dev-libs/libxml2:=
+		virtual/mysql
+		python? ( ${PYTHON_DEPS} )
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	espeak? ( >=app-accessibility/espeak-1.29 )
+	perl? ( dev-lang/perl )
+"
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xml-dtd:4.3
+	app-text/gnome-doc-utils
+	dev-libs/libxslt
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+REQUIRED_USE="tools? ( python? ( ${PYTHON_REQUIRED_USE} ) )"
+
+# docs are messy, installed manually below
+DOCS=""
+
+src_prepare() {
+	# From Fedora
+	# Remove unneeded sigc++ header files to make it sure
+	# that we are using system-wide libsigc++
+	# (and these does not work on gcc43)
+	find dict/src/sigc++* -name \*.h -or -name \*.cc | xargs rm -f || die
+
+	# libsigc++ started to require c++11 support
+	append-cxxflags "-std=c++11"
+
+	if use python; then
+		local f
+		# force python shebangs handlable by python_doscript
+		for f in tools/src/*.py; do
+			[[ $(head -n1 "${f}") =~ ^#! ]] || continue
+			sed -i '1 s|.*|#!/usr/bin/python|' tools/src/*.py || die
+		done
+		# script contains UTF-8 symbols, but has no ecoding set
+		sed -i '1 a # -*- coding: utf-8 -*-' tools/src/uyghur2dict.py || die
+	fi
+
+	eapply_user
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Hint: EXTRA_ECONF="--enable-gnome-support" and manual install of
+	# libbonobo-2, libgnome-2, libgnomeui-2, gconf-2 and orbit-2 will
+	# give you GNOME 2.x support, that is otherwise considered deprecated
+	# because of the deep GNOME 2.x core library dependencies
+
+	# Festival plugin crashes, bug 188684. Disable for now.
+	gnome2_src_configure \
+		--disable-festival \
+		--disable-gnome-support \
+		--disable-gpe-support \
+		--disable-schemas-install \
+		--disable-scrollkeeper \
+		$(use_enable advertisement) \
+		$(use_enable debug) \
+		$(use_enable dictdotcn) \
+		$(use_enable espeak) \
+		$(use_enable gucharmap) \
+		$(use_enable htmlparse) \
+		$(use_enable man) \
+		$(use_enable powerwordparse) \
+		$(use_enable qqwry) \
+		$(use_enable spell) \
+		$(use_enable tools) \
+		$(use_enable updateinfo) \
+		$(use_enable wikiparse) \
+		$(use_enable wordnet) \
+		$(use_enable xdxfparse)
+}
+
+src_install() {
+	gnome2_src_install
+
+	dodoc AUTHORS ChangeLog README
+
+	docinto dict
+	dodoc dict/{AUTHORS,ChangeLog,README,TODO}
+	dodoc dict/doc/{Documentation,FAQ,HowToCreateDictionary,Skins,StarDictFileFormat,TextualDictionaryFileFormat,Translation}
+
+	docinto lib
+	dodoc lib/{AUTHORS,ChangeLog,README}
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/dict
+		doins dict/doc/stardict-textual-dict*
+	fi
+
+	if use qqwry; then
+		insinto /usr/share/${PN}/data
+		doins ../QQWry.Dat
+	fi
+
+	if use pronounce; then
+		docinto WyabdcRealPeopleTTS
+		dodoc ../WyabdcRealPeopleTTS/{README,readme.txt}
+		rm -f ../WyabdcRealPeopleTTS/{README,readme.txt}
+		insinto /usr/share
+		doins -r ../WyabdcRealPeopleTTS
+	fi
+
+	# noinst_PROGRAMS with ${PN}_ prefix from tools/src/Makefile.am wrt #292773
+	# and additional scripts from tools dir
+	if use tools; then
+		local app
+		local apps="${PN}-editor pydict2dic olddic2newdic oxford2dic directory2dic
+			dictd2dic wquick2dic ec50 directory2treedic treedict2dir jdictionary mova
+			xmlinout soothill kanjidic2 powerword kdic 21tech 21shiji buddhist
+			tabfile cedict edict duden ${PN}-dict-update degb2utf frgb2utf
+			jpgb2utf gmx2utf rucn kingsoft wikipedia wikipediaImage babylon
+			${PN}2txt ${PN}-verify fest2dict i2e2dict downloadwiki
+			ooo2dict myspell2dic exc2i2e dictbuilder tabfile2sql KangXi Unihan
+			xiaoxuetang-ja wubi ydp2dict wordnet lingvosound2resdb
+			resdatabase2dir dir2resdatabase ${PN}-index sd2foldoc ${PN}-text2bin
+			${PN}-bin2text ${PN}-repair"
+
+		use perl && apps+=" dicts-dump.pl ncce2stardict.pl parse-oxford.perl"
+		use python && apps+=" hanzim2dict.py jm2stardict.py lingea-trd-decoder.py
+			makevietdict.py uyghur2dict.py"
+
+		for app in ${apps}; do
+			if [[ "${app}" =~ ^${PN} ]]; then
+				dobin "tools/src/${app}"
+			else
+				newbin "tools/src/${app}" "${PN}_${app}"
+			fi
+		done
+		use python && python_doscript "${ED}"usr/bin/*.py
+
+		docinto tools
+		dodoc tools/{AUTHORS,ChangeLog,README}
+
+		if use examples; then
+			insinto /usr/share/doc/${PF}/tools
+			doins tools/src/{dictbuilder.{example,readme},example.ifo,example_treedict.tar.bz2}
+		fi
+	fi
+}
+
+pkg_postinst() {
+	elog
+	elog "Note: festival text to speech (TTS) plugin is not built. To use festival"
+	elog 'TTS plugin, please, emerge festival and enable "Use TTS program." at:'
+	elog '"Preferences -> Dictionary -> Sound" and fill in "Commandline" with:'
+	elog '"echo %s | festival --tts"'
+	elog
+	elog "You will now need to install ${PN} dictionary files. If"
+	elog "you have not, execute the below to get a list of dictionaries:"
+	elog "  emerge -s ${PN}-"
+	elog
+	elog "Additionally you may install any stardict dictionary from the net"
+	elog "by unpacking it to:"
+	elog "  /usr/share/stardict/dic"
+	elog
+
+	gnome2_pkg_postinst
+}
diff --git a/app-text/stardict/stardict-4.0.0_pre20160518-r1.ebuild b/app-text/stardict/stardict-4.0.0_pre20160518-r1.ebuild
new file mode 100644
index 000000000000..554d2eb7bce3
--- /dev/null
+++ b/app-text/stardict/stardict-4.0.0_pre20160518-r1.ebuild
@@ -0,0 +1,233 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# NOTE: Even though the *.dict.dz are the same as dictd/freedict's files,
+#       their indexes seem to be in a different format. So we'll keep them
+#       seperate for now.
+
+GNOME2_LA_PUNT=yes
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools flag-o-matic gnome2 python-single-r1
+
+DESCRIPTION="A international dictionary supporting fuzzy and glob style matching"
+HOMEPAGE="http://stardict-4.sourceforge.net/
+	https://github.com/huzheng001/stardict-3"
+SRC_URI="https://dev.gentoo.org/~bircoph/distfiles/${P}.tar.xz
+	pronounce? ( https://${PN}-3.googlecode.com/files/WyabdcRealPeopleTTS.tar.bz2 )
+	qqwry? ( mirror://gentoo/QQWry.Dat.bz2 )"
+
+LICENSE="CPL-1.0 GPL-3 LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="advertisement cal debug dictdotcn espeak examples flite
+fortune gnome gucharmap +htmlparse info man perl +powerwordparse
+pronounce python qqwry spell tools updateinfo +wikiparse +wordnet
++xdxfparse youdaodict"
+
+RESTRICT="test"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.32:2
+	dev-libs/libsigc++:2=
+	media-libs/libcanberra[gtk3]
+	sys-libs/zlib:=
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3
+	x11-libs/libX11
+	x11-libs/pango
+	espeak? ( >=app-accessibility/espeak-1.29 )
+	flite? ( app-accessibility/flite )
+	gnome? (
+		gnome-base/gconf:2
+		gnome-base/libbonobo
+		gnome-base/libgnome
+		gnome-base/orbit:2
+	)
+	gucharmap? ( gnome-extra/gucharmap:0= )
+	spell? ( >=app-text/enchant-1.2 )
+	tools? (
+		dev-libs/expat
+		dev-libs/libpcre:=
+		dev-libs/libxml2:=
+		virtual/mysql
+		python? ( ${PYTHON_DEPS} )
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	info? ( sys-apps/texinfo )
+	fortune? ( games-misc/fortune-mod )
+	perl? ( dev-lang/perl )
+"
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xml-dtd:4.3
+	app-text/gnome-doc-utils
+	dev-libs/libxslt
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+REQUIRED_USE="tools? ( python? ( ${PYTHON_REQUIRED_USE} ) )"
+
+# docs are messy, installed manually below
+DOCS=""
+
+PATCHES=( "${FILESDIR}/${P}-tabfile.patch" )
+
+src_prepare() {
+	# From Fedora
+	# Remove unneeded sigc++ header files to make it sure
+	# that we are using system-wide libsigc++
+	# (and these does not work on gcc43)
+	find dict/src/sigc++* -name \*.h -or -name \*.cc | xargs rm -f || die
+
+	# libsigc++ started to require c++11 support
+	append-cxxflags "-std=c++11"
+
+	if use python; then
+		local f
+		# force python shebangs handlable by python_doscript
+		for f in tools/src/*.py; do
+			[[ $(head -n1 "${f}") =~ ^#! ]] || continue
+			sed -i '1 s|.*|#!/usr/bin/python|' tools/src/*.py || die
+		done
+		# script contains UTF-8 symbols, but has no ecoding set
+		sed -i '1 a # -*- coding: utf-8 -*-' tools/src/uyghur2dict.py || die
+	fi
+
+	# bug 604318
+	if ! use gnome; then
+		sed -i '/AM_GCONF_SOURCE_2/d' dict/configure.ac || die
+	fi
+
+	eapply_user
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Hint: EXTRA_ECONF="--enable-gnome-support" and manual install of
+	# libbonobo-2, libgnome-2, libgnomeui-2, gconf-2 and orbit-2 will
+	# give you GNOME 2.x support, that is otherwise considered deprecated
+	# because of the deep GNOME 2.x core library dependencies
+
+	# Festival plugin crashes, bug 188684. Disable for now.
+	gnome2_src_configure \
+		--disable-darwin-support \
+		--disable-festival \
+		--disable-gpe-support \
+		--disable-maemo-support \
+		--disable-schemas-install \
+		--disable-scrollkeeper \
+		$(use_enable advertisement) \
+		$(use_enable cal) \
+		$(use_enable debug) \
+		$(use_enable dictdotcn) \
+		$(use_enable espeak) \
+		$(use_enable flite) \
+		$(use_enable fortune) \
+		$(use_enable gnome gnome-support) \
+		$(use_enable gucharmap) \
+		$(use_enable htmlparse) \
+		$(use_enable info) \
+		$(use_enable man) \
+		$(use_enable powerwordparse) \
+		$(use_enable qqwry) \
+		$(use_enable spell) \
+		$(use_enable tools) \
+		$(use_enable updateinfo) \
+		$(use_enable wikiparse) \
+		$(use_enable wordnet) \
+		$(use_enable xdxfparse) \
+		$(use_enable youdaodict)
+}
+
+src_install() {
+	gnome2_src_install
+
+	dodoc AUTHORS ChangeLog README
+
+	docinto dict
+	dodoc dict/{AUTHORS,ChangeLog,README,TODO}
+	dodoc dict/doc/{Documentation,FAQ,HowToCreateDictionary,Skins,StarDictFileFormat,TextualDictionaryFileFormat,Translation}
+	dodoc -r dict/doc/wiki
+
+	docinto lib
+	dodoc lib/{AUTHORS,ChangeLog,README}
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/dict
+		doins dict/doc/stardict-textual-dict*
+	fi
+
+	if use qqwry; then
+		insinto /usr/share/${PN}/data
+		doins ../QQWry.Dat
+	fi
+
+	if use pronounce; then
+		docinto WyabdcRealPeopleTTS
+		dodoc ../WyabdcRealPeopleTTS/{README,readme.txt}
+		rm -f ../WyabdcRealPeopleTTS/{README,readme.txt}
+		insinto /usr/share
+		doins -r ../WyabdcRealPeopleTTS
+	fi
+
+	# noinst_PROGRAMS with ${PN}_ prefix from tools/src/Makefile.am wrt #292773
+	# and additional scripts from tools dir
+	if use tools; then
+		local app
+		local apps="${PN}-editor pydict2dic olddic2newdic oxford2dic directory2dic dictd2dic
+			wquick2dic ec50 directory2treedic treedict2dir jdictionary mova xmlinout
+			soothill kanjidic2 powerword kdic 21tech 21shiji buddhist tabfile
+			cedict edict duden ${PN}-dict-update degb2utf frgb2utf jpgb2utf gmx2utf
+			rucn kingsoft kingsoft2 wikipedia wikipediaImage babylon ${PN}2txt ${PN}-verify
+			fest2dict i2e2dict downloadwiki ooo2dict myspell2dic exc2i2e
+			dictbuilder tabfile2sql KangXi Unihan xiaoxuetang-ja wubi ydp2dict
+			wordnet lingvosound2resdb resdatabase2dir dir2resdatabase ${PN}-index
+			sd2foldoc
+			${PN}-text2bin ${PN}-bin2text ${PN}-repair"
+
+		use perl && apps+=" dicts-dump.pl ncce2stardict.pl parse-oxford.perl"
+		use python && apps+=" hanzim2dict.py jm2stardict.py lingea-trd-decoder.py
+			makevietdict.py uyghur2dict.py"
+
+		for app in ${apps}; do
+			if [[ "${app}" =~ ^${PN} ]]; then
+				dobin "tools/src/${app}"
+			else
+				newbin "tools/src/${app}" "${PN}_${app}"
+			fi
+		done
+		use python && python_doscript "${ED}"usr/bin/*.py
+
+		docinto tools
+		dodoc tools/{AUTHORS,ChangeLog,README}
+
+		if use examples; then
+			insinto /usr/share/doc/${PF}/tools
+			doins tools/src/{dictbuilder.{example,readme},example.ifo,example_treedict.tar.bz2}
+		fi
+	fi
+}
+
+pkg_postinst() {
+	elog
+	elog "Note: festival text to speech (TTS) plugin is not built. To use festival"
+	elog 'TTS plugin, please, emerge festival and enable "Use TTS program." at:'
+	elog '"Preferences -> Dictionary -> Sound" and fill in "Commandline" with:'
+	elog '"echo %s | festival --tts"'
+	elog
+	elog "You will now need to install ${PN} dictionary files. If"
+	elog "you have not, execute the below to get a list of dictionaries:"
+	elog "  emerge -s ${PN}-"
+	elog
+	elog "Additionally you may install any stardict dictionary from the net"
+	elog "by unpacking it to:"
+	elog "  /usr/share/stardict/dic"
+	elog
+
+	gnome2_pkg_postinst
+}
diff --git a/app-text/sword-1.7.4-r1 b/app-text/sword-1.7.4-r1
deleted file mode 100644
index f69281061a96..000000000000
--- a/app-text/sword-1.7.4-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=sys-libs/zlib curl? ( net-misc/curl ) icu? ( dev-libs/icu:= ) clucene? ( dev-cpp/clucene ) virtual/pkgconfig
-DESCRIPTION=Library for Bible reading software
-EAPI=6
-HOMEPAGE=http://www.crosswire.org/sword/
-IUSE=clucene curl debug doc icu static-libs
-KEYWORDS=amd64 ~ppc x86 ~x86-fbsd ~ppc-macos
-LICENSE=GPL-2
-RDEPEND=sys-libs/zlib curl? ( net-misc/curl ) icu? ( dev-libs/icu:= ) clucene? ( dev-cpp/clucene )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://www.crosswire.org/ftpmirror/pub/sword/source/v1.7/sword-1.7.4.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1941dce964dab55d8524caacfd1c08e2
diff --git a/app-text/sword-1.8.0 b/app-text/sword-1.8.0
deleted file mode 100644
index 69b1271f5865..000000000000
--- a/app-text/sword-1.8.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=sys-libs/zlib curl? ( net-misc/curl ) icu? ( dev-libs/icu:= ) clucene? ( dev-cpp/clucene ) virtual/pkgconfig
-DESCRIPTION=Library for Bible reading software
-EAPI=7
-HOMEPAGE=http://www.crosswire.org/sword/
-IUSE=clucene curl debug doc icu static-libs
-KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd ~ppc-macos
-LICENSE=GPL-2
-RDEPEND=sys-libs/zlib curl? ( net-misc/curl ) icu? ( dev-libs/icu:= ) clucene? ( dev-cpp/clucene )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://www.crosswire.org/ftpmirror/pub/sword/source/v1.8/sword-1.8.0.tar.gz
-_eclasses_=eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=10e8bdb05503552c697cf19d30b26f2d
diff --git a/app-text/sword-modules-1 b/app-text/sword-modules-1
deleted file mode 100644
index 04963a178d5e..000000000000
--- a/app-text/sword-modules-1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=A collection of modules for the SWORD project
-EAPI=5
-HOMEPAGE=http://www.crosswire.org/sword/
-KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
-LICENSE=metapackage
-RDEPEND=app-dicts/sword-ab app-dicts/sword-abbott app-dicts/sword-abs_essay_goodsam_swb app-dicts/sword-acv app-dicts/sword-afr1953 app-dicts/sword-akjv app-dicts/sword-alb app-dicts/sword-aleppo app-dicts/sword-amtract app-dicts/sword-arasvd app-dicts/sword-asv app-dicts/sword-barnes app-dicts/sword-bbe app-dicts/sword-br_en app-dicts/sword-bulcarigradnt app-dicts/sword-bulveren app-dicts/sword-bwe app-dicts/sword-byz app-dicts/sword-cbc app-dicts/sword-chamorro app-dicts/sword-chincvs app-dicts/sword-chincvt app-dicts/sword-chiun app-dicts/sword-chiuns app-dicts/sword-clarke app-dicts/sword-common app-dicts/sword-cro app-dicts/sword-czebkr app-dicts/sword-czecep app-dicts/sword-czekms app-dicts/sword-czenkb app-dicts/sword-daily app-dicts/sword-dan app-dicts/sword-darby app-dicts/sword-diaglott app-dicts/sword-drc app-dicts/sword-dtn app-dicts/sword-dutkant app-dicts/sword-dutsvv app-dicts/sword-easton app-dicts/sword-esperanto app-dicts/sword-est app-dicts/sword-farsiopv app-dicts/sword-finbiblia app-dicts/sword-finney app-dicts/sword-finpr app-dicts/sword-frecrl app-dicts/sword-frelsg app-dicts/sword-geneva1599 app-dicts/sword-gerelb1871 app-dicts/sword-gerelb1905 app-dicts/sword-gerlut1545 app-dicts/sword-gersch app-dicts/sword-greekhebrew app-dicts/sword-hebmodern app-dicts/sword-hebrewgreek app-dicts/sword-heretics app-dicts/sword-hitchcock app-dicts/sword-hnv app-dicts/sword-hunkar app-dicts/sword-hunuj app-dicts/sword-icelandic app-dicts/sword-institutes app-dicts/sword-isbe app-dicts/sword-isv app-dicts/sword-itadio app-dicts/sword-itarive app-dicts/sword-jfb app-dicts/sword-josephus app-dicts/sword-jps app-dicts/sword-jst app-dicts/sword-jubilee2000 app-dicts/sword-kekchi app-dicts/sword-kjv app-dicts/sword-kjvd app-dicts/sword-klv app-dicts/sword-klven_iklingon app-dicts/sword-klviklingon_en app-dicts/sword-korean app-dicts/sword-la_en app-dicts/sword-latvian app-dicts/sword-lightfoot app-dicts/sword-litv app-dicts/sword-luther app-dicts/sword-mak app-dicts/sword-manxgaelic app-dicts/sword-maori app-dicts/sword-mhc app-dicts/sword-mhcc app-dicts/sword-mkjv app-dicts/sword-montgomery app-dicts/sword-murdock app-dicts/sword-nave app-dicts/sword-norsk app-dicts/sword-orthodoxy app-dicts/sword-packard app-dicts/sword-personal app-dicts/sword-peshitta app-dicts/sword-pilgrim app-dicts/sword-pnt app-dicts/sword-practice app-dicts/sword-rkjnt app-dicts/sword-rnkjv app-dicts/sword-robinson app-dicts/sword-romcor app-dicts/sword-rotherham app-dicts/sword-rst app-dicts/sword-rusmakarij app-dicts/sword-rwebster app-dicts/sword-rwp app-dicts/sword-saoa app-dicts/sword-scofield app-dicts/sword-scotsgaelic app-dicts/sword-sme app-dicts/sword-smith app-dicts/sword-sparv app-dicts/sword-sparvg2004 app-dicts/sword-spasev app-dicts/sword-spavnt app-dicts/sword-spurious app-dicts/sword-strongsgreek app-dicts/sword-strongshebrew app-dicts/sword-swahili app-dicts/sword-tagalog app-dicts/sword-tcr app-dicts/sword-tdavid app-dicts/sword-tfg app-dicts/sword-tisch app-dicts/sword-torrey app-dicts/sword-tr app-dicts/sword-tsk app-dicts/sword-twenty app-dicts/sword-tyndale app-dicts/sword-ukjv app-dicts/sword-ukrainian app-dicts/sword-uma app-dicts/sword-umgreek app-dicts/sword-vulgate app-dicts/sword-vulgate_hebps app-dicts/sword-web app-dicts/sword-webster app-dicts/sword-webstersdict app-dicts/sword-wesley app-dicts/sword-weymouth app-dicts/sword-whnu app-dicts/sword-wlc app-dicts/sword-wulfila app-dicts/sword-wycliffe app-dicts/sword-xhosa app-dicts/sword-ylt
-SLOT=0
-_md5_=25cbb3994da72223aa058913e39dfdd1
diff --git a/app-text/sword-modules/Manifest b/app-text/sword-modules/Manifest
new file mode 100644
index 000000000000..294a8f2ee4a1
--- /dev/null
+++ b/app-text/sword-modules/Manifest
@@ -0,0 +1,2 @@
+EBUILD sword-modules-1.ebuild 3971 BLAKE2B 54f8e9aedf19414c75ba00174a269b999033534f29db13956369fccbebe40c08a9986d8c133e5c2da7e3d35894190d3128c00605eb11a6415c2ba5b0c879dc81 SHA512 900b7506d16f487f397af1cd3d8188fbb73ea1637cb3686d0f78d21f3abacaa7fd1a95ea02b034d0739bb6b666e65b48e9c508e0a93569ab7d24fde6827a1504
+MISC metadata.xml 378 BLAKE2B 94f101a56061c2386d02786a9f8f023bd97e33629ed7d660f5f62395c8b18a95c5ee6facbdc54b0f4dddc530fa7e07802dd470067087226859e9de9df0f83441 SHA512 066849ccc8fbb9e87e694a0c6e3de55b9d4d685eace107a70287d2aab827231dbb7d2eba8fb5e92dec30de93cb4d8749332a7cdc838d971e298b8c0818ad026d
diff --git a/app-text/sword-modules/metadata.xml b/app-text/sword-modules/metadata.xml
new file mode 100644
index 000000000000..ff3976de5780
--- /dev/null
+++ b/app-text/sword-modules/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+  <email>theology@gentoo.org</email>
+</maintainer>
+<longdescription>
+These are some of the more popular modules for the SWORD Project.
+They provide a large number of tools for personal study.
+</longdescription>
+</pkgmetadata>
diff --git a/app-text/sword-modules/sword-modules-1.ebuild b/app-text/sword-modules/sword-modules-1.ebuild
new file mode 100644
index 000000000000..0c3387a34929
--- /dev/null
+++ b/app-text/sword-modules/sword-modules-1.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+DESCRIPTION="A collection of modules for the SWORD project"
+HOMEPAGE="http://www.crosswire.org/sword/"
+
+LICENSE="metapackage"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND=""
+RDEPEND="app-dicts/sword-ab
+	app-dicts/sword-abbott
+	app-dicts/sword-abs_essay_goodsam_swb
+	app-dicts/sword-acv
+	app-dicts/sword-afr1953
+	app-dicts/sword-akjv
+	app-dicts/sword-alb
+	app-dicts/sword-aleppo
+	app-dicts/sword-amtract
+	app-dicts/sword-arasvd
+	app-dicts/sword-asv
+	app-dicts/sword-barnes
+	app-dicts/sword-bbe
+	app-dicts/sword-br_en
+	app-dicts/sword-bulcarigradnt
+	app-dicts/sword-bulveren
+	app-dicts/sword-bwe
+	app-dicts/sword-byz
+	app-dicts/sword-cbc
+	app-dicts/sword-chamorro
+	app-dicts/sword-chincvs
+	app-dicts/sword-chincvt
+	app-dicts/sword-chiun
+	app-dicts/sword-chiuns
+	app-dicts/sword-clarke
+	app-dicts/sword-common
+	app-dicts/sword-cro
+	app-dicts/sword-czebkr
+	app-dicts/sword-czecep
+	app-dicts/sword-czekms
+	app-dicts/sword-czenkb
+	app-dicts/sword-daily
+	app-dicts/sword-dan
+	app-dicts/sword-darby
+	app-dicts/sword-diaglott
+	app-dicts/sword-drc
+	app-dicts/sword-dtn
+	app-dicts/sword-dutkant
+	app-dicts/sword-dutsvv
+	app-dicts/sword-easton
+	app-dicts/sword-esperanto
+	app-dicts/sword-est
+	app-dicts/sword-farsiopv
+	app-dicts/sword-finbiblia
+	app-dicts/sword-finney
+	app-dicts/sword-finpr
+	app-dicts/sword-frecrl
+	app-dicts/sword-frelsg
+	app-dicts/sword-geneva1599
+	app-dicts/sword-gerelb1871
+	app-dicts/sword-gerelb1905
+	app-dicts/sword-gerlut1545
+	app-dicts/sword-gersch
+	app-dicts/sword-greekhebrew
+	app-dicts/sword-hebmodern
+	app-dicts/sword-hebrewgreek
+	app-dicts/sword-heretics
+	app-dicts/sword-hitchcock
+	app-dicts/sword-hnv
+	app-dicts/sword-hunkar
+	app-dicts/sword-hunuj
+	app-dicts/sword-icelandic
+	app-dicts/sword-institutes
+	app-dicts/sword-isbe
+	app-dicts/sword-isv
+	app-dicts/sword-itadio
+	app-dicts/sword-itarive
+	app-dicts/sword-jfb
+	app-dicts/sword-josephus
+	app-dicts/sword-jps
+	app-dicts/sword-jst
+	app-dicts/sword-jubilee2000
+	app-dicts/sword-kekchi
+	app-dicts/sword-kjv
+	app-dicts/sword-kjvd
+	app-dicts/sword-klv
+	app-dicts/sword-klven_iklingon
+	app-dicts/sword-klviklingon_en
+	app-dicts/sword-korean
+	app-dicts/sword-la_en
+	app-dicts/sword-latvian
+	app-dicts/sword-lightfoot
+	app-dicts/sword-litv
+	app-dicts/sword-luther
+	app-dicts/sword-mak
+	app-dicts/sword-manxgaelic
+	app-dicts/sword-maori
+	app-dicts/sword-mhc
+	app-dicts/sword-mhcc
+	app-dicts/sword-mkjv
+	app-dicts/sword-montgomery
+	app-dicts/sword-murdock
+	app-dicts/sword-nave
+	app-dicts/sword-norsk
+	app-dicts/sword-orthodoxy
+	app-dicts/sword-packard
+	app-dicts/sword-personal
+	app-dicts/sword-peshitta
+	app-dicts/sword-pilgrim
+	app-dicts/sword-pnt
+	app-dicts/sword-practice
+	app-dicts/sword-rkjnt
+	app-dicts/sword-rnkjv
+	app-dicts/sword-robinson
+	app-dicts/sword-romcor
+	app-dicts/sword-rotherham
+	app-dicts/sword-rst
+	app-dicts/sword-rusmakarij
+	app-dicts/sword-rwebster
+	app-dicts/sword-rwp
+	app-dicts/sword-saoa
+	app-dicts/sword-scofield
+	app-dicts/sword-scotsgaelic
+	app-dicts/sword-sme
+	app-dicts/sword-smith
+	app-dicts/sword-sparv
+	app-dicts/sword-sparvg2004
+	app-dicts/sword-spasev
+	app-dicts/sword-spavnt
+	app-dicts/sword-spurious
+	app-dicts/sword-strongsgreek
+	app-dicts/sword-strongshebrew
+	app-dicts/sword-swahili
+	app-dicts/sword-tagalog
+	app-dicts/sword-tcr
+	app-dicts/sword-tdavid
+	app-dicts/sword-tfg
+	app-dicts/sword-tisch
+	app-dicts/sword-torrey
+	app-dicts/sword-tr
+	app-dicts/sword-tsk
+	app-dicts/sword-twenty
+	app-dicts/sword-tyndale
+	app-dicts/sword-ukjv
+	app-dicts/sword-ukrainian
+	app-dicts/sword-uma
+	app-dicts/sword-umgreek
+	app-dicts/sword-vulgate
+	app-dicts/sword-vulgate_hebps
+	app-dicts/sword-web
+	app-dicts/sword-webster
+	app-dicts/sword-webstersdict
+	app-dicts/sword-wesley
+	app-dicts/sword-weymouth
+	app-dicts/sword-whnu
+	app-dicts/sword-wlc
+	app-dicts/sword-wulfila
+	app-dicts/sword-wycliffe
+	app-dicts/sword-xhosa
+	app-dicts/sword-ylt"
diff --git a/app-text/sword/Manifest b/app-text/sword/Manifest
new file mode 100644
index 000000000000..4c4556e39168
--- /dev/null
+++ b/app-text/sword/Manifest
@@ -0,0 +1,7 @@
+AUX sword-1.7.4-configure.patch 816 BLAKE2B 6b1dc70d5146178be9e2e650b6a46f9a64dfbab2edfddeea7c4f3825c00ccf1af7fe328b86be90c3730ecb928ae9fe1c4558f3a0bcb6acfba6a207a48c32b3f6 SHA512 b6209e3a01a3408ca7d338ada40f3e9e2db93167b74274f29ea4a790a22b21d9e871037eb71875ec6d84f14477a78944a9ef2296fb623dbedfdfd3a849e44186
+AUX sword-1.7.4-gcc6.patch 626 BLAKE2B 69b56ed6152d07962d5941868925ac35825256e4db22cc435c7580694925694902eb6c322d143af7148ea4a60828e059409625e9415cbb5f8905d98b4a1d85c5 SHA512 8084f3ce8be27879a5b038c5c55ed6c0071e02c2f19ee390cdbc6eaf822fb5268c0f5f9450ba22dfc944b5a1d46f5e4feeebd81f3810532edc9f905921b95f04
+DIST sword-1.7.4.tar.gz 2157882 BLAKE2B 7ed50430500ec428a125e24550a1f7d0437a0253cf4fabad4c8af452d2aa82c71c11e4a6c334ef1a95d82f14ce1cc092f3774210113e9668ba207875b3a11b20 SHA512 4c8b183e613367364439cc7a8a842012f75180fccc8eb775b9af2dc4c10f39c152261d35f0aadaaa91a11df36ab1a4057c2edc50ea4b0b3bb0ab0a847ff68f75
+DIST sword-1.8.0.tar.gz 2444386 BLAKE2B dd74ca409cdc3e4563ec5f0ed225556cfc3d1c89e63b41df8335b4abdd4f36b1423a2953a86105d2efe8d57c0e57065f74e74629309bab93f2a0222b9a8fcc86 SHA512 c45f3135255322a77e955297997db2529f31b397c42cc4b9474dc6ec8d329b2233b292078979de5fbf33cad4a1a607aabb66f86501072a729d68e9fc840c8c8e
+EBUILD sword-1.7.4-r1.ebuild 1974 BLAKE2B cdccfbf2bc8cc2f6a22b1bf88a929faf3a6305f271956acf83f0e9d4383b02a6e74201bc0accb28becc05b5e979f4032dcd48d9addab74ca5563c0bcb4d008c4 SHA512 b9c272643badb68f6af83bdf7a50f070f3a0fa56ed21ecf9c1b1ae941e5bee671cc9674fc8fba3b6042bc111f19576fa3d731700b7a9c91fbc637558e74886f0
+EBUILD sword-1.8.0.ebuild 1924 BLAKE2B aeb08e11551a7a8e81acf4da0aa69530772a49334c75a14f74b63109c73d89115d4abc0e1c815a892182edbc907a3689e8387c2c045f3230763c71f7c39bfaa8 SHA512 7c880515213d6fb58091177351f799ea49d8633e7f3bd8da5e396555c456dc4796d3b8798b21c56ae8d44b4ebd5543bf2116786cce2065a651572431dbc54475
+MISC metadata.xml 564 BLAKE2B b7ed0b7e3e245079c82d4ebcb446a1e864e0f72610ac9c60d98fbfc73c7d078f12ddb7d1650fbc3816ac292c8c6b122990a71b0e99056eb21bdb4f3a8dc8b3ec SHA512 74ff38bf540aa48eb0195c7999adcf1226ede7ca4a6848a45b73913011f95e2bb7d84e0ca0534d2ee2610efee78234a52ae69f507704bb0ec80e4876a5d4aadc
diff --git a/app-text/sword/files/sword-1.7.4-configure.patch b/app-text/sword/files/sword-1.7.4-configure.patch
new file mode 100644
index 000000000000..a098addcd0d2
--- /dev/null
+++ b/app-text/sword/files/sword-1.7.4-configure.patch
@@ -0,0 +1,23 @@
+--- a/configure
++++ b/configure
+@@ -16893,7 +16895,7 @@
+ # ---------------------------------------------------------------------
+ 
+ # NOTE the $libdir hack at the end of the c[xx]flags.  Apparently F16 finds that clucene is not multilib-save and places some include files in /usr/lib[64]/
++if test "x$with_clucene" != "xno"; then
+-with_clucene=no
+ if test "x$CLUCENE2_LIBS" != x; then
+    echo "clucene 2.x found - lucene searching options available"
+    AM_CXXFLAGS="$AM_CXXFLAGS $CLUCENE2_CFLAGS -DUSELUCENE -DCLUCENE2 -I$libdir"
+@@ -16914,6 +16912,11 @@
+    echo "lucene searching options not available"
+ fi
+ fi
++else
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: excluding support" >&5
++$as_echo "clucene manually disabled - excluding support" >&6; }
++with_clucene="no"
++fi
+ 
+ for ac_func in vsnprintf
+ do :
diff --git a/app-text/sword/files/sword-1.7.4-gcc6.patch b/app-text/sword/files/sword-1.7.4-gcc6.patch
new file mode 100644
index 000000000000..54c79671235e
--- /dev/null
+++ b/app-text/sword/files/sword-1.7.4-gcc6.patch
@@ -0,0 +1,22 @@
+--- sword-1.7.4/configure.ac.old	2016-09-21 18:04:55.029088352 -0400
++++ sword-1.7.4/configure.ac	2016-09-21 18:05:37.870349308 -0400
+@@ -197,7 +197,7 @@
+ fi
+ 
+ 
+-AM_CXXFLAGS="$AM_CXXFLAGS -ftemplate-depth-25"
++AM_CXXFLAGS="$AM_CXXFLAGS"
+ 
+ if test x$enable_warnings = xyes; then
+   AM_CFLAGS="$AM_CFLAGS -Werror"
+--- sword-1.7.4/configure.old	2016-09-21 18:05:05.900008373 -0400
++++ sword-1.7.4/configure	2016-09-21 18:06:03.822112657 -0400
+@@ -16793,7 +16793,7 @@
+ fi
+ 
+ 
+-AM_CXXFLAGS="$AM_CXXFLAGS -ftemplate-depth-25"
++AM_CXXFLAGS="$AM_CXXFLAGS"
+ 
+ if test x$enable_warnings = xyes; then
+   AM_CFLAGS="$AM_CFLAGS -Werror"
diff --git a/app-text/sword/metadata.xml b/app-text/sword/metadata.xml
new file mode 100644
index 000000000000..fb9230654d3a
--- /dev/null
+++ b/app-text/sword/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+  <email>theology@gentoo.org</email>
+</maintainer>
+<longdescription>
+The SWORD Project is the CrossWire Bible Society's free Bible software
+project. Its purpose is to create tools that allow programmers and Bible
+societies to write new Bible software more quickly and easily.
+</longdescription>
+<use>
+    <flag name="clucene">Use <pkg>dev-cpp/clucene</pkg> for lucene search support</flag>
+</use>
+</pkgmetadata>
diff --git a/app-text/sword/sword-1.7.4-r1.ebuild b/app-text/sword/sword-1.7.4-r1.ebuild
new file mode 100644
index 000000000000..72b16688cc81
--- /dev/null
+++ b/app-text/sword/sword-1.7.4-r1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils flag-o-matic
+
+DESCRIPTION="Library for Bible reading software"
+HOMEPAGE="http://www.crosswire.org/sword/"
+SRC_URI="http://www.crosswire.org/ftpmirror/pub/${PN}/source/v${PV%.*}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86 ~x86-fbsd ~ppc-macos"
+IUSE="clucene curl debug doc icu static-libs"
+
+RDEPEND="sys-libs/zlib
+	curl? ( net-misc/curl )
+	icu? ( dev-libs/icu:= )
+	clucene? ( dev-cpp/clucene )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+DOCS="AUTHORS CODINGSTYLE ChangeLog README"
+
+RESTRICT="test"	#Restricting for now, see bug 313207
+
+src_prepare() {
+	sed -i \
+		-e '/FLAGS/s:-g3::' -e '/FLAGS/s:-O0::' \
+		-e '/FLAGS/s:-O2::' -e '/FLAGS/s:-O3::' \
+		configure || die
+
+	sed -i -e '/FLAGS/s:-Werror::' configure || die #408289
+	sed -i -e '/^#inc.*curl.*types/d' src/mgr/curl*.cpp || die #378055
+
+	cat <<-EOF > "${T}"/${PN}.conf
+	[Install]
+	DataPath=${EPREFIX}/usr/share/${PN}/
+	EOF
+	epatch "${FILESDIR}/${PN}-1.7.4-gcc6.patch"
+	epatch "${FILESDIR}/${PN}-1.7.4-configure.patch"
+	eapply_user
+}
+
+src_configure() {
+	# TODO: Why is this here and can we remove it?
+	strip-flags
+
+	# bug 618776
+	append-cxxflags -std=c++14
+
+	econf \
+		$(use_enable static-libs static) \
+		$(use_enable debug) \
+		--with-zlib \
+		$(use_with icu) \
+		--with-conf \
+		$(use_with curl) \
+		$(use_with clucene)
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name '*.la' -exec rm -f {} +
+
+	if use doc; then
+		rm -rf examples/.cvsignore
+		rm -rf examples/cmdline/.cvsignore
+		rm -rf examples/cmdline/.deps
+		cp -R samples examples "${ED}"/usr/share/doc/${PF}/
+	fi
+
+	insinto /etc
+	doins "${T}"/${PN}.conf
+}
+
+pkg_postinst() {
+	elog "Check out http://www.crosswire.org/sword/modules/"
+	elog "to download modules that you would like to use with SWORD."
+	elog "Follow module installation instructions found on"
+	elog "the web or in ${EROOT}/usr/share/doc/${PF}/"
+}
diff --git a/app-text/sword/sword-1.8.0.ebuild b/app-text/sword/sword-1.8.0.ebuild
new file mode 100644
index 000000000000..bb6ed4a2b108
--- /dev/null
+++ b/app-text/sword/sword-1.8.0.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit flag-o-matic
+
+DESCRIPTION="Library for Bible reading software"
+HOMEPAGE="http://www.crosswire.org/sword/"
+SRC_URI="http://www.crosswire.org/ftpmirror/pub/${PN}/source/v${PV%.*}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~ppc-macos"
+IUSE="clucene curl debug doc icu static-libs"
+
+RDEPEND="sys-libs/zlib
+	curl? ( net-misc/curl )
+	icu? ( dev-libs/icu:= )
+	clucene? ( dev-cpp/clucene )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+DOCS="AUTHORS CODINGSTYLE ChangeLog README"
+
+RESTRICT="test"	#Restricting for now, see bug 313207
+
+src_prepare() {
+	sed -i \
+		-e '/FLAGS/s:-g3::' -e '/FLAGS/s:-O0::' \
+		-e '/FLAGS/s:-O2::' -e '/FLAGS/s:-O3::' \
+		configure || die
+
+	sed -i -e '/FLAGS/s:-Werror::' configure || die #408289
+	sed -i -e '/^#inc.*curl.*types/d' src/mgr/curl*.cpp || die #378055
+
+	cat <<-EOF > "${T}"/${PN}.conf
+	[Install]
+	DataPath=${EPREFIX}/usr/share/${PN}/
+	EOF
+	eapply "${FILESDIR}/${PN}-1.7.4-configure.patch"
+	eapply_user
+}
+
+src_configure() {
+	# TODO: Why is this here and can we remove it?
+	strip-flags
+
+	# bug 618776
+	append-cxxflags -std=c++14
+
+	econf \
+		$(use_enable static-libs static) \
+		$(use_enable debug) \
+		--with-zlib \
+		$(use_with icu) \
+		--with-conf \
+		$(use_with curl) \
+		$(use_with clucene)
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name '*.la' -exec rm -f {} +
+
+	if use doc; then
+		rm -rf examples/.cvsignore
+		rm -rf examples/cmdline/.cvsignore
+		rm -rf examples/cmdline/.deps
+		cp -R samples examples "${ED}"/usr/share/doc/${PF}/
+	fi
+
+	insinto /etc
+	doins "${T}"/${PN}.conf
+}
+
+pkg_postinst() {
+	elog "Check out http://www.crosswire.org/sword/modules/"
+	elog "to download modules that you would like to use with SWORD."
+	elog "Follow module installation instructions found on"
+	elog "the web or in ${EROOT}/usr/share/doc/${PF}/"
+}
diff --git a/app-text/t1utils-1.39 b/app-text/t1utils-1.39
deleted file mode 100644
index bd9f7f30b61c..000000000000
--- a/app-text/t1utils-1.39
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Type 1 Font utilities
-EAPI=0
-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
-LICENSE=BSD
-RDEPEND=!<media-libs/freetype-1.4_pre20080316
-SLOT=0
-SRC_URI=http://www.lcdf.org/type/t1utils-1.39.tar.gz
-_md5_=cf840609a5260d4be6d3ece293845941
diff --git a/app-text/t1utils-1.41-r1 b/app-text/t1utils-1.41-r1
deleted file mode 100644
index f5c71339750e..000000000000
--- a/app-text/t1utils-1.41-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Type 1 Font utilities
-EAPI=6
-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
-LICENSE=BSD
-RDEPEND=!<media-libs/freetype-1.4_pre20080316
-SLOT=0
-SRC_URI=http://www.lcdf.org/type/t1utils-1.41.tar.gz
-_md5_=1cdc17b79a9d6f2cd3966f55c001152c
diff --git a/app-text/t1utils-1.41-r2 b/app-text/t1utils-1.41-r2
deleted file mode 100644
index 1dc34d38f32d..000000000000
--- a/app-text/t1utils-1.41-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=prepare
-DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Type 1 Font utilities
-EAPI=6
-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
-LICENSE=BSD
-RDEPEND=!<media-libs/freetype-1.4_pre20080316
-SLOT=0
-SRC_URI=http://www.lcdf.org/type/t1utils-1.41.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=1574f626a56cacf24dbfd6a7414726cc
diff --git a/app-text/t1utils/Manifest b/app-text/t1utils/Manifest
new file mode 100644
index 000000000000..a38c7d215d72
--- /dev/null
+++ b/app-text/t1utils/Manifest
@@ -0,0 +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.41.tar.gz 176552 BLAKE2B 69ccc07a3b98de18355b09532129f80e4188d64817a1ad4e8439b3a0e37917a63b9e187a25fedfc5aba486b2e60279586a425992e9f25a111ba9c77ed3863f6e SHA512 b532d3af38a73903a512eb1297ba7510747dcbe8362acc4a0f20f2a3c786d82d8f5b22997ed3867114f33153a34cdd71c4c8e6a093db3cecc3825b6e4725a00b
+EBUILD t1utils-1.39.ebuild 644 BLAKE2B 9c15a7a5374adb05e68cd58074357208f53aa1d8e77aefc156577442879097696f939aebf22f745917c3cda777859e35eed43f2d646dfe65d6f64ab5ba5ada9b SHA512 b3a01745789d41b50a4ae48bfc020cc8d85da4c4b72e43976b45ff8b6cd8a542cc461afedac3452d7b39f23417d59acecc886a4c87e3ee3515693f63c9230e2d
+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/metadata.xml b/app-text/t1utils/metadata.xml
new file mode 100644
index 000000000000..1375a4fcfd29
--- /dev/null
+++ b/app-text/t1utils/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>aballier@gentoo.org</email>
+		<name>Alexis Ballier</name>
+	</maintainer>
+<maintainer type="project">
+		<email>fonts@gentoo.org</email>
+		<name>Fonts</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-text/t1utils/t1utils-1.39.ebuild b/app-text/t1utils/t1utils-1.39.ebuild
new file mode 100644
index 000000000000..a7af218b8f28
--- /dev/null
+++ b/app-text/t1utils/t1utils-1.39.ebuild
@@ -0,0 +1,22 @@
+# 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/t1utils/t1utils-1.41-r1.ebuild b/app-text/t1utils/t1utils-1.41-r1.ebuild
new file mode 100644
index 000000000000..810aff2d6510
--- /dev/null
+++ b/app-text/t1utils/t1utils-1.41-r1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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"
+
+DOCS=( NEWS.md README.md )
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/tabler-2-r1 b/app-text/tabler-2-r1
deleted file mode 100644
index 6cdfcfab0eae..000000000000
--- a/app-text/tabler-2-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=A utility to create text art tables from delimited input
-EAPI=6
-HOMEPAGE=https://sourceforge.net/projects/tabler/
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://sourceforge/tabler/tabler-2.tar.gz
-_md5_=74dd93626b9a7d2d0eccd396e1847ee3
diff --git a/app-text/tabler/Manifest b/app-text/tabler/Manifest
new file mode 100644
index 000000000000..dd5de87930c3
--- /dev/null
+++ b/app-text/tabler/Manifest
@@ -0,0 +1,3 @@
+DIST tabler-2.tar.gz 87706 BLAKE2B 32b259cd84a9cb8c1475ef6da6815f96e5eb947d392fdd5150570ce639a7fcbc251baa9204e1c25bf471be025ae920b203fc0f89cdef46360b0af4d9f52122af SHA512 6f01796b4cadae22f9ae0029ee8a7bb224d04faae1793b13c9d8473e6a902543a5bd6da86e806f9c50c8b39ad7f5d44525c2a701920cd6c62c27995409d0b1d8
+EBUILD tabler-2-r1.ebuild 428 BLAKE2B 8a8584a6e0bb6923b2c32a4131befdaced5935643ace6971f7953113f37b2d297678226b8e37f2172bb6273d5bc24942042edb1588f77687bb836a0e6060a316 SHA512 9b234538b56fce6332a580243f27387e21d34d35f9790cdf6de8d12a5debdc2a0bf6a93213e9a7c7df5f2131577d4aa88c87f70f3b3d01e0ec2255a4306dd5fe
+MISC metadata.xml 243 BLAKE2B d1a92b4f94bf011a4e2e185cc73d1ba11312a451e3d03437ca809bdd8df91be0f8280839eea56fb9dfb2cf711c1d2021f11ddec24833df077e2da061353df255 SHA512 c0d977a25c38fe6c32745c0b18520aa510c617922f267a468b2b788480104214bb5db37564d6ae52c45298e98da2764595734c827ab01abcce1270ed241e3bf7
diff --git a/app-text/tabler/metadata.xml b/app-text/tabler/metadata.xml
new file mode 100644
index 000000000000..254ba3093fdb
--- /dev/null
+++ b/app-text/tabler/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="sourceforge">tabler</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/tabler/tabler-2-r1.ebuild b/app-text/tabler/tabler-2-r1.ebuild
new file mode 100644
index 000000000000..f727d216278f
--- /dev/null
+++ b/app-text/tabler/tabler-2-r1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A utility to create text art tables from delimited input"
+HOMEPAGE="https://sourceforge.net/projects/tabler/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS ChangeLog README
+}
diff --git a/app-text/talkfilters-2.3.8-r1 b/app-text/talkfilters-2.3.8-r1
deleted file mode 100644
index ce8bd15fcaae..000000000000
--- a/app-text/talkfilters-2.3.8-r1
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=prepare
-DESCRIPTION=Convert ordinary English text into text that mimics a stereotyped dialect
-EAPI=5
-HOMEPAGE=http://www.hyperrealm.com/talkfilters/talkfilters.html
-KEYWORDS=amd64 hppa ~mips ppc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://www.hyperrealm.com/talkfilters/talkfilters-2.3.8.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=ee8890bac13b306eaf86a38edd846e9c
diff --git a/app-text/talkfilters/Manifest b/app-text/talkfilters/Manifest
new file mode 100644
index 000000000000..11a1aa49dddb
--- /dev/null
+++ b/app-text/talkfilters/Manifest
@@ -0,0 +1,4 @@
+AUX talkfilters-2.3.8-format-security.patch 862 BLAKE2B f8050b5527c9777a2a500611989ee0eaa90fc1360ddb76a659ef334ec97cb3904f5051605bcf6b10dcad8b1b571d0a0001613358f1aa9c1b617a75ee893e6af6 SHA512 b210777c038878cdd06365a13591c723151356864c08bee700005e509b2f0f6aec4819730ca631d401e4cbb9d3dbd3a4a6551f0920819fa6097585ae43f6c8f4
+DIST talkfilters-2.3.8.tar.gz 821338 BLAKE2B 1ed5904829380858e5599458d54d3e7a339c10f057a94ce17f38b330d89ad5aba972cf234c10aa2ed7ffbf67c8b4c01a9bba0ebe73b4ba2bf32230e9e36eda3d SHA512 3fb317c572e95756fea9dcbaeac01e9576b05f5b0710e64513ecd05ec219f8050dec3bc5bc5d0d5f00c642487925765843da03525cfcb23925cab3c321272b28
+EBUILD talkfilters-2.3.8-r1.ebuild 554 BLAKE2B 509e68e57a16fd01615767817a2a9cb029eff39b2da481ea3c8ca9789945aab5c4662f9d662da91c39ef97f00e6ad5cbbcc57135c55ff127824d9122cba63262 SHA512 5cf58ccc9abd312c0c70204331ee564a96e4c651ab9139b1816dc225a96aebec34a6021b2dae283351c76919cac640ded3c47c8d9ee5887c0b137f8a9ee28de1
+MISC metadata.xml 957 BLAKE2B 2f66b167131788d1df1195fd9f4d372cfe2ada94c10ad6ce6d0a1bcd28582f3249344ef5733e39838453dca5b54456066ae93e976437e239a4a556982b436426 SHA512 d1b664bff6db93a8289a01b6ef00df35a06207722360ca753853fde6cd667abd739acbbadc9eacb16d46536326c61d6b1673ab50940f778c7ed7c228a082b52e
diff --git a/app-text/talkfilters/files/talkfilters-2.3.8-format-security.patch b/app-text/talkfilters/files/talkfilters-2.3.8-format-security.patch
new file mode 100644
index 000000000000..cf59574694a6
--- /dev/null
+++ b/app-text/talkfilters/files/talkfilters-2.3.8-format-security.patch
@@ -0,0 +1,43 @@
+ wrap.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/wrap.c b/wrap.c
+index 7c89dc8..745d1ec 100644
+--- a/wrap.c
++++ b/wrap.c
+@@ -105,7 +105,7 @@ int main(int argc, char **argv)
+ 	{
+ 	*wp = 0;
+ 	putchar('\n');
+-	printf(wbuf);
++	printf("%s", wbuf);
+ 	putchar(c);
+ 	putchar('\n');
+ 	wp = wbuf, ll = wl = 0;
+@@ -123,7 +123,7 @@ int main(int argc, char **argv)
+ 	{
+ 	*wp = 0;
+ 	if(ll) putchar(' '), ll++;
+-	printf(wbuf);
++	printf("%s", wbuf);
+ 	ll += wl;
+ 	wl = 0,	wp = wbuf;
+ 	}
+@@ -131,7 +131,7 @@ int main(int argc, char **argv)
+ 	{
+ 	*wp = 0;
+ 	putchar('\n');
+-	printf(wbuf);
++	printf("%s", wbuf);
+ 	ll = wl;
+ 	wl = 0, wp = wbuf;
+ 	}
+@@ -148,7 +148,7 @@ int main(int argc, char **argv)
+       if(ll) putchar(' ');
+       }
+     else putchar('\n');
+-    printf(wbuf);
++    printf("%s", wbuf);
+     }
+   putchar('\n');
+   free(wbuf);
diff --git a/app-text/talkfilters/metadata.xml b/app-text/talkfilters/metadata.xml
new file mode 100644
index 000000000000..feef11aea0b9
--- /dev/null
+++ b/app-text/talkfilters/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>shell-tools@gentoo.org</email>
+    <name>Gentoo Shell Tools Project</name>
+  </maintainer>
+  <longdescription lang="en">
+  The GNU Talk Filters are filter programs that convert ordinary English text
+  into text that mimics a stereotyped or otherwise humorous dialect. These
+  filters have been in the public domain for many years, but now for the first
+  time they are provided as a single integrated package. The filters include
+  austro, b1ff, brooklyn, chef, cockney, drawl, dubya, fudd, funetak, jethro,
+  jive, kraut, pansy, pirate, postmodern, redneck, valspeak, and warez. Each
+  program reads from standard input and writes to standard output. The package
+  also provides the filters as a C library, so they can be easily used by other
+  programs.
+  </longdescription>
+</pkgmetadata>
diff --git a/app-text/talkfilters/talkfilters-2.3.8-r1.ebuild b/app-text/talkfilters/talkfilters-2.3.8-r1.ebuild
new file mode 100644
index 000000000000..791828fabbc1
--- /dev/null
+++ b/app-text/talkfilters/talkfilters-2.3.8-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="Convert ordinary English text into text that mimics a stereotyped dialect"
+HOMEPAGE="http://www.hyperrealm.com/talkfilters/talkfilters.html"
+SRC_URI="http://www.hyperrealm.com/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 hppa ~mips ppc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE=""
+
+PATCHES=(
+	"${FILESDIR}"/${P}-format-security.patch
+	)
+
+src_prepare() {
+	epatch "${PATCHES[@]}"
+}
diff --git a/app-text/teckit-2.5.6 b/app-text/teckit-2.5.6
deleted file mode 100644
index 19795085e63e..000000000000
--- a/app-text/teckit-2.5.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare test
-DEPEND=sys-libs/zlib dev-libs/expat >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Text Encoding Conversion toolkit
-EAPI=5
-HOMEPAGE=http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&cat_id=TECkit
-IUSE=static-libs
-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 ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=|| ( CPL-0.5 LGPL-2.1 )
-RDEPEND=sys-libs/zlib dev-libs/expat
-SLOT=0
-SRC_URI=https://github.com/silnrsi/teckit/archive/2.5.6.tar.gz -> teckit-2.5.6.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d76d2eb09eced8489800fad119b52b83
diff --git a/app-text/teckit/Manifest b/app-text/teckit/Manifest
new file mode 100644
index 000000000000..561648f3ef2e
--- /dev/null
+++ b/app-text/teckit/Manifest
@@ -0,0 +1,4 @@
+AUX teckit-2.5.1-mixcflagscxxflags.patch 534 BLAKE2B 98c7ec0325821d6fc8ed4952cce4ec38233302c25e0b6e4157c357693c16ee756c553347cf70aa1381315e0bb1c721e3e423ec6855a5c80fd2a5a298eaeb62d2 SHA512 7b76d3ebc6ecba24a7cd6469b47b35245e73d5c02a32c67a6205434f8c4b73ab6f1a77d0f8cf95081c4b441e876a2d62a1c276f69171d4f9f4679ccccbfd1c87
+DIST teckit-2.5.6.tar.gz 2500800 BLAKE2B a41c51e80b558d9735be782ed655fe36ec673180e559a3063c3b78ece14e470e194740f2039863a6e7a12e006c2314c3b73eff5de4d289c8eca1b6c9744f1e0d SHA512 d3462dbf22658de85fd718c43229259c460730d907226435195742f1ab65accc4ec83f7b6cb32a0e99fa12ddb7f2b7b5f2598c8853636aa5b31c8592ed9b4745
+EBUILD teckit-2.5.6.ebuild 1143 BLAKE2B d2baeade44a8f6d86f546f6936f6d31643e7309d1df69fe38a0b054b32a845b68eadab935afd0bf8b255296c474ce12880ea1a740bb493d5d426f325aca54caa SHA512 90f8c074eb690fce1a80a3ad51dd29c2a39bfde540958cb7be05521e139ba3dbb0e6a2f1dffb363a9c13b10747c063b21b363d3519c4f8f8e43778c3f7b14973
+MISC metadata.xml 328 BLAKE2B 55a9af22d43fe5270c143f0bdd0fdaa5bf58665a47c6386b83611071a25c8e41e0116bd48c3b6ff051b51e28f9f0bbbb1d09a97939f03df5e367a352c99b6f09 SHA512 f4ee21269605eb831d9a6cbe639da9f2bf63aa14ffb69bf41b7fa4304e4680f5e11ff9efaf30b63cbe0f3708468af19c5412353dab4af8d9a49e6f845a2b7f67
diff --git a/app-text/teckit/files/teckit-2.5.1-mixcflagscxxflags.patch b/app-text/teckit/files/teckit-2.5.1-mixcflagscxxflags.patch
new file mode 100644
index 000000000000..5a290f45133b
--- /dev/null
+++ b/app-text/teckit/files/teckit-2.5.1-mixcflagscxxflags.patch
@@ -0,0 +1,16 @@
+No need to pass CFLAGS twice, esp. if they are used to feed g++
+Bug #338110
+
+Index: TECkit_2_5_1/configure.ac
+===================================================================
+--- TECkit_2_5_1.orig/configure.ac
++++ TECkit_2_5_1/configure.ac
+@@ -76,7 +76,7 @@ noexpat_CFLAGS="$CFLAGS"
+ noexpat_LIBS="$LIBS"
+ AC_CHECK_LIB(expat, XML_ExpatVersion)
+ AM_CONDITIONAL(SYSTEM_EXPAT, test x$ac_cv_lib_expat_XML_ExpatVersion = xyes)
+-expat_CFLAGS="$CFLAGS"
++expat_CFLAGS=""
+ expat_LIBS="$LIBS"
+ CFLAGS="$noexpat_CFLAGS"
+ LIBS="$noexpat_LIBS"
diff --git a/app-text/teckit/metadata.xml b/app-text/teckit/metadata.xml
new file mode 100644
index 000000000000..480b5571f79a
--- /dev/null
+++ b/app-text/teckit/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">silnrsi/teckit</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/teckit/teckit-2.5.6.ebuild b/app-text/teckit/teckit-2.5.6.ebuild
new file mode 100644
index 000000000000..045beae1707b
--- /dev/null
+++ b/app-text/teckit/teckit-2.5.6.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools eutils
+
+DESCRIPTION="Text Encoding Conversion toolkit"
+HOMEPAGE="http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&cat_id=TECkit"
+SRC_URI="https://github.com/silnrsi/teckit/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( CPL-0.5 LGPL-2.1 )"
+SLOT="0"
+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 ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="static-libs"
+
+RDEPEND="sys-libs/zlib
+	dev-libs/expat"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-2.5.1-mixcflagscxxflags.patch"
+	rm -f configure
+	sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.ac || die
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable static-libs static)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS README NEWS
+	find "${ED}" -name '*.la' -delete || die
+}
+
+src_test() {
+	cd "${S}/test"
+	chmod +x dotests.pl
+	./dotests.pl || die "tests failed"
+}
diff --git a/app-text/teseq-1.1.1 b/app-text/teseq-1.1.1
deleted file mode 100644
index f9f64ee630c8..000000000000
--- a/app-text/teseq-1.1.1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=A tool for analyzing files that contain control characters and sequences
-EAPI=5
-HOMEPAGE=https://www.gnu.org/software/teseq/
-KEYWORDS=~amd64
-LICENSE=GPL-3
-SLOT=0
-SRC_URI=mirror://gnu/teseq/teseq-1.1.1.tar.xz
-_md5_=d47823c253f6b831abfd24a3443f8a8b
diff --git a/app-text/teseq/Manifest b/app-text/teseq/Manifest
new file mode 100644
index 000000000000..786bdb8d49d6
--- /dev/null
+++ b/app-text/teseq/Manifest
@@ -0,0 +1,3 @@
+DIST teseq-1.1.1.tar.xz 240256 BLAKE2B 657579ba89c2e7cd4cd2e54234d3ae79d9f8d999475a33ba78945da223457a065a631baa397ab06a137cfdfac360d83992a5f39d5bd3b97fd8cd96cf29c68ac2 SHA512 c7747c734e640f7cc607389e001ab2cb9e368b504bd41406eea4dd7ba8bfead79659c68b148e33e797b843e9a46de38d104172303329b88e3fde0266aa1ffd7c
+EBUILD teseq-1.1.1.ebuild 335 BLAKE2B d8ec644e842fd8fd288f83e214497534cbce055654e63c998ece6dcf8f6b2690bf4433be5b8940439c2a7aa3fc7dadf1e0aae3138865f316f022d2062ba22e53 SHA512 25033bf62d9ec10a6078fa383fffb86bad4a4bb2bd2a8feaf7f05c1ac3ef435e26b47b568e69514254185ba69e2c755e6a05a248c28f7c3b0578feb7ef885af2
+MISC metadata.xml 210 BLAKE2B bb9591af5406abbf589664053ab6e5cb38933fe6ef97c11609405392b050b26cff8e94e04e85e5798124abd46283bee67b2a74923a5041616df15aaa9cff6da9 SHA512 f7cbe57a24b67a28696f91061ad8bd61d7d4cf3d59d20c3dcc6a4921e29672d00ecf3ece70a8813399d2467ebd626f8f829300e81fc722e9aaa527e213a5fb54
diff --git a/app-text/teseq/metadata.xml b/app-text/teseq/metadata.xml
new file mode 100644
index 000000000000..5ba62861f1c4
--- /dev/null
+++ b/app-text/teseq/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+<email>jer@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/app-text/teseq/teseq-1.1.1.ebuild b/app-text/teseq/teseq-1.1.1.ebuild
new file mode 100644
index 000000000000..360d7d34a80d
--- /dev/null
+++ b/app-text/teseq/teseq-1.1.1.ebuild
@@ -0,0 +1,12 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="A tool for analyzing files that contain control characters and sequences"
+HOMEPAGE="https://www.gnu.org/software/teseq/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
diff --git a/app-text/tesseract-3.05.01 b/app-text/tesseract-3.05.01
deleted file mode 100644
index d4622c66e24d..000000000000
--- a/app-text/tesseract-3.05.01
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup unpack
-DEPEND=>=media-libs/leptonica-1.71:=[zlib,tiff?,jpeg?,png?,webp?] opencl? ( virtual/opencl media-libs/tiff:0= media-libs/leptonica:=[tiff] ) scrollview? ( >=dev-java/piccolo2d-3.0:0 ) training? ( dev-libs/icu:= x11-libs/pango:= x11-libs/cairo:= ) doc? ( app-doc/doxygen ) scrollview? ( >=virtual/jdk-1.7 ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 scrollview? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=An OCR Engine, orginally developed at HP, now open source.
-EAPI=6
-HOMEPAGE=https://github.com/tesseract-ocr
-IUSE=doc examples jpeg math opencl osd png scrollview static-libs tiff training webp l10n_ar l10n_bg l10n_ca l10n_chr l10n_cs l10n_de l10n_da l10n_el l10n_es l10n_fi l10n_fr l10n_he l10n_hi l10n_hu l10n_id l10n_it l10n_ja l10n_ko l10n_lt l10n_lv l10n_nl l10n_no l10n_pl l10n_pt l10n_ro l10n_ru l10n_sk l10n_sl l10n_sr l10n_sv l10n_th l10n_tl l10n_tr l10n_uk l10n_vi l10n_zh-CN l10n_zh-TW elibc_FreeBSD scrollview
-KEYWORDS=alpha amd64 ~arm ~arm64 ~mips ppc ppc64 ~sparc x86
-LICENSE=Apache-2.0
-RDEPEND=>=media-libs/leptonica-1.71:=[zlib,tiff?,jpeg?,png?,webp?] opencl? ( virtual/opencl media-libs/tiff:0= media-libs/leptonica:=[tiff] ) scrollview? ( >=dev-java/piccolo2d-3.0:0 ) training? ( dev-libs/icu:= x11-libs/pango:= x11-libs/cairo:= ) scrollview? ( >=virtual/jre-1.7 ) scrollview? ( >=dev-java/java-config-2.2.0-r3 )
-SLOT=0
-SRC_URI=https://github.com/tesseract-ocr/tesseract/archive/3.05.01.tar.gz -> tesseract-3.05.01.tar.gz https://github.com/tesseract-ocr/tessdata/raw/3.04.00/eng.traineddata -> eng.traineddata-3.04.00 math? ( https://github.com/tesseract-ocr/tessdata/raw/3.04.00/equ.traineddata -> equ.traineddata-3.04.00 ) l10n_ar? ( https://github.com/tesseract-ocr/tessdata/raw/3.04.00/ara.traineddata -> ara.traineddata-3.04.00 ) l10n_bg? ( https://github.com/tesseract-ocr/tessdata/raw/3.04.00/bul.traineddata -> bul.traineddata-3.04.00 ) l10n_ca? ( https://github.com/tesseract-ocr/tessdata/raw/3.04.00/cat.traineddata -> cat.traineddata-3.04.00 ) l10n_chr? ( https://github.com/tesseract-ocr/tessdata/raw/3.04.00/chr.traineddata -> chr.traineddata-3.04.00 ) l10n_cs? ( https://github.com/tesseract-ocr/tessdata/raw/3.04.00/ces.traineddata -> ces.traineddata-3.04.00 ) l10n_de? ( https://github.com/tesseract-ocr/tessdata/raw/3.04.00/deu.traineddata -> deu.traineddata-3.04.00 https://github.com/tesseract-ocr/tessdata/raw/3.04.00/deu_frak.traineddata -> deu_frak.traineddata-3.04.00 ) l10n_da? ( https://github.com/tesseract-ocr/tessdata/raw/3.04.00/dan.traineddata -> dan.traineddata-3.04.00 https://github.com/tesseract-ocr/tessdata/raw/3.04.00/dan_frak.traineddata -> dan_frak.traineddata-3.04.00 ) l10n_el? ( https://github.com/tesseract-ocr/tessdata/raw/3.04.00/ell.traineddata -> ell.traineddata-3.04.00 ) l10n_es? ( https://github.com/tesseract-ocr/tessdata/raw/3.04.00/spa.traineddata -> spa.traineddata-3.04.00 ) l10n_fi? ( https://github.com/tesseract-ocr/tessdata/raw/3.04.00/fin.traineddata -> fin.traineddata-3.04.00 ) l10n_fr? ( https://github.com/tesseract-ocr/tessdata/raw/3.04.00/fra.traineddata -> fra.traineddata-3.04.00 ) l10n_he? ( https://github.com/tesseract-ocr/tessdata/raw/3.04.00/heb.traineddata -> heb.traineddata-3.04.00 ) l10n_hi? ( https://github.com/tesseract-ocr/tessdata/raw/3.04.00/hin.traineddata -> hin.traineddata-3.04.00 ) l10n_hu? ( https://github.com/tesseract-ocr/tessdata/raw/3.04.00/hun.traineddata -> hun.traineddata-3.04.00 ) l10n_id? ( https://github.com/tesseract-ocr/tessdata/raw/3.04.00/ind.traineddata -> ind.traineddata-3.04.00 ) l10n_it? ( https://github.com/tesseract-ocr/tessdata/raw/3.04.00/ita.traineddata -> ita.traineddata-3.04.00 ) l10n_ja? ( https://github.com/tesseract-ocr/tessdata/raw/3.04.00/jpn.traineddata -> jpn.traineddata-3.04.00 ) l10n_ko? ( https://github.com/tesseract-ocr/tessdata/raw/3.04.00/kor.traineddata -> kor.traineddata-3.04.00 ) l10n_lt? ( https://github.com/tesseract-ocr/tessdata/raw/3.04.00/lit.traineddata -> lit.traineddata-3.04.00 ) l10n_lv? ( https://github.com/tesseract-ocr/tessdata/raw/3.04.00/lav.traineddata -> lav.traineddata-3.04.00 ) l10n_nl? ( https://github.com/tesseract-ocr/tessdata/raw/3.04.00/nld.traineddata -> nld.traineddata-3.04.00 ) l10n_no? ( https://github.com/tesseract-ocr/tessdata/raw/3.04.00/nor.traineddata -> nor.traineddata-3.04.00 ) l10n_pl? ( https://github.com/tesseract-ocr/tessdata/raw/3.04.00/pol.traineddata -> pol.traineddata-3.04.00 ) l10n_pt? ( https://github.com/tesseract-ocr/tessdata/raw/3.04.00/por.traineddata -> por.traineddata-3.04.00 ) l10n_ro? ( https://github.com/tesseract-ocr/tessdata/raw/3.04.00/ron.traineddata -> ron.traineddata-3.04.00 ) l10n_ru? ( https://github.com/tesseract-ocr/tessdata/raw/3.04.00/rus.traineddata -> rus.traineddata-3.04.00 ) l10n_sk? ( https://github.com/tesseract-ocr/tessdata/raw/3.04.00/slk.traineddata -> slk.traineddata-3.04.00 https://github.com/tesseract-ocr/tessdata/raw/3.04.00/slk_frak.traineddata -> slk_frak.traineddata-3.04.00 ) l10n_sl? ( https://github.com/tesseract-ocr/tessdata/raw/3.04.00/slv.traineddata -> slv.traineddata-3.04.00 ) l10n_sr? ( https://github.com/tesseract-ocr/tessdata/raw/3.04.00/srp.traineddata -> srp.traineddata-3.04.00 ) l10n_sv? ( https://github.com/tesseract-ocr/tessdata/raw/3.04.00/swe.traineddata -> swe.traineddata-3.04.00 ) l10n_th? ( https://github.com/tesseract-ocr/tessdata/raw/3.04.00/tha.traineddata -> tha.traineddata-3.04.00 ) l10n_tl? ( https://github.com/tesseract-ocr/tessdata/raw/3.04.00/tgl.traineddata -> tgl.traineddata-3.04.00 ) l10n_tr? ( https://github.com/tesseract-ocr/tessdata/raw/3.04.00/tur.traineddata -> tur.traineddata-3.04.00 ) l10n_uk? ( https://github.com/tesseract-ocr/tessdata/raw/3.04.00/ukr.traineddata -> ukr.traineddata-3.04.00 ) l10n_vi? ( https://github.com/tesseract-ocr/tessdata/raw/3.04.00/vie.traineddata -> vie.traineddata-3.04.00 ) l10n_zh-CN? ( https://github.com/tesseract-ocr/tessdata/raw/3.04.00/chi_sim.traineddata -> chi_sim.traineddata-3.04.00 ) l10n_zh-TW? ( https://github.com/tesseract-ocr/tessdata/raw/3.04.00/chi_tra.traineddata -> chi_tra.traineddata-3.04.00 ) osd? ( https://github.com/tesseract-ocr/tessdata/raw/3.04.00/osd.traineddata -> osd.traineddata-3.04.00 )
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=1e38662d2816ff62ce005710fcba031b
diff --git a/app-text/tesseract-4.00.00_alpha b/app-text/tesseract-4.00.00_alpha
deleted file mode 100644
index 6136f54a17fc..000000000000
--- a/app-text/tesseract-4.00.00_alpha
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare pretend setup unpack
-DEPEND=>=media-libs/leptonica-1.74:=[zlib,tiff?,jpeg?,png?,webp?] opencl? ( virtual/opencl media-libs/tiff:0= media-libs/leptonica:=[tiff] ) scrollview? ( >=dev-java/piccolo2d-3.0:0 ) training? ( dev-libs/icu:= x11-libs/pango:= x11-libs/cairo:= ) doc? ( app-doc/doxygen ) scrollview? ( >=virtual/jdk-1.7 ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 scrollview? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=An OCR Engine, orginally developed at HP, now open source.
-EAPI=6
-HOMEPAGE=https://github.com/tesseract-ocr
-IUSE=doc examples jpeg math opencl openmp osd png scrollview static-libs tiff training webp l10n_af l10n_am l10n_ar l10n_as l10n_az l10n_be l10n_bn l10n_bo l10n_bs l10n_bg l10n_ca l10n_cs l10n_zh l10n_cy l10n_da l10n_de l10n_dz l10n_el l10n_en l10n_eo l10n_et l10n_eu l10n_fa l10n_fi l10n_fr l10n_ga l10n_gl l10n_gu l10n_he l10n_hi l10n_hr l10n_hu l10n_id l10n_is l10n_it l10n_ja l10n_kn l10n_ka l10n_kk l10n_km l10n_ky l10n_ko l10n_ku l10n_lo l10n_la l10n_lv l10n_lt l10n_ml l10n_mr l10n_mk l10n_ms l10n_my l10n_ne l10n_nl l10n_no l10n_or l10n_pa l10n_pl l10n_pt l10n_ro l10n_ru l10n_sa l10n_si l10n_sk l10n_sl l10n_es l10n_sq l10n_sr l10n_sw l10n_sv l10n_syc l10n_ta l10n_te l10n_tg l10n_tl l10n_th l10n_tr l10n_ug l10n_uk l10n_uz l10n_vi elibc_FreeBSD scrollview
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=media-libs/leptonica-1.74:=[zlib,tiff?,jpeg?,png?,webp?] opencl? ( virtual/opencl media-libs/tiff:0= media-libs/leptonica:=[tiff] ) scrollview? ( >=dev-java/piccolo2d-3.0:0 ) training? ( dev-libs/icu:= x11-libs/pango:= x11-libs/cairo:= ) scrollview? ( >=virtual/jre-1.7 ) scrollview? ( >=dev-java/java-config-2.2.0-r3 )
-SLOT=0
-SRC_URI=https://github.com/tesseract-ocr/tesseract/archive/4.00.00alpha.tar.gz -> tesseract-4.00.00_alpha.tar.gz https://github.com/tesseract-ocr/tessdata/raw/4.00/eng.traineddata -> eng.traineddata-4.00 math? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/equ.traineddata -> equ.traineddata-4.00 ) osd? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/osd.traineddata -> osd.traineddata-4.00 ) l10n_af? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/afr.traineddata -> afr.traineddata-4.00 ) l10n_am? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/amh.traineddata -> amh.traineddata-4.00 ) l10n_ar? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/ara.traineddata -> ara.traineddata-4.00 ) l10n_as? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/asm.traineddata -> asm.traineddata-4.00 ) l10n_az? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/aze.traineddata -> aze.traineddata-4.00 ) l10n_az? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/aze_cyrl.traineddata -> aze_cyrl.traineddata-4.00 ) l10n_be? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/bel.traineddata -> bel.traineddata-4.00 ) l10n_bn? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/ben.traineddata -> ben.traineddata-4.00 ) l10n_bo? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/bod.traineddata -> bod.traineddata-4.00 ) l10n_bs? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/bos.traineddata -> bos.traineddata-4.00 ) l10n_bg? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/bul.traineddata -> bul.traineddata-4.00 ) l10n_ca? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/cat.traineddata -> cat.traineddata-4.00 ) l10n_cs? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/ces.traineddata -> ces.traineddata-4.00 ) l10n_zh? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/chi_sim.traineddata -> chi_sim.traineddata-4.00 ) l10n_zh? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/chi_tra.traineddata -> chi_tra.traineddata-4.00 ) l10n_cy? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/cym.traineddata -> cym.traineddata-4.00 ) l10n_da? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/dan.traineddata -> dan.traineddata-4.00 ) l10n_de? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/deu.traineddata -> deu.traineddata-4.00 ) l10n_de? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/frk.traineddata -> frk.traineddata-4.00 ) l10n_dz? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/dzo.traineddata -> dzo.traineddata-4.00 ) l10n_el? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/ell.traineddata -> ell.traineddata-4.00 ) l10n_el? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/grc.traineddata -> grc.traineddata-4.00 ) l10n_en? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/enm.traineddata -> enm.traineddata-4.00 ) l10n_eo? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/epo.traineddata -> epo.traineddata-4.00 ) l10n_et? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/est.traineddata -> est.traineddata-4.00 ) l10n_eu? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/eus.traineddata -> eus.traineddata-4.00 ) l10n_fa? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/fas.traineddata -> fas.traineddata-4.00 ) l10n_fi? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/fin.traineddata -> fin.traineddata-4.00 ) l10n_fr? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/fra.traineddata -> fra.traineddata-4.00 ) l10n_fr? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/frm.traineddata -> frm.traineddata-4.00 ) l10n_ga? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/gle.traineddata -> gle.traineddata-4.00 ) l10n_gl? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/glg.traineddata -> glg.traineddata-4.00 ) l10n_gu? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/guj.traineddata -> guj.traineddata-4.00 ) l10n_he? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/heb.traineddata -> heb.traineddata-4.00 ) l10n_hi? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/hin.traineddata -> hin.traineddata-4.00 ) l10n_hr? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/hrv.traineddata -> hrv.traineddata-4.00 ) l10n_hu? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/hun.traineddata -> hun.traineddata-4.00 ) l10n_id? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/ind.traineddata -> ind.traineddata-4.00 ) l10n_is? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/isl.traineddata -> isl.traineddata-4.00 ) l10n_it? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/ita.traineddata -> ita.traineddata-4.00 ) l10n_it? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/ita_old.traineddata -> ita_old.traineddata-4.00 ) l10n_ja? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/jpn.traineddata -> jpn.traineddata-4.00 ) l10n_kn? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/kan.traineddata -> kan.traineddata-4.00 ) l10n_ka? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/kat.traineddata -> kat.traineddata-4.00 ) l10n_ka? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/kat_old.traineddata -> kat_old.traineddata-4.00 ) l10n_kk? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/kaz.traineddata -> kaz.traineddata-4.00 ) l10n_km? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/khm.traineddata -> khm.traineddata-4.00 ) l10n_ky? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/kir.traineddata -> kir.traineddata-4.00 ) l10n_ko? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/kor.traineddata -> kor.traineddata-4.00 ) l10n_ku? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/kur.traineddata -> kur.traineddata-4.00 ) l10n_lo? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/lao.traineddata -> lao.traineddata-4.00 ) l10n_la? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/lat.traineddata -> lat.traineddata-4.00 ) l10n_lv? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/lav.traineddata -> lav.traineddata-4.00 ) l10n_lt? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/lit.traineddata -> lit.traineddata-4.00 ) l10n_ml? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/mal.traineddata -> mal.traineddata-4.00 ) l10n_mr? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/mar.traineddata -> mar.traineddata-4.00 ) l10n_mk? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/mkd.traineddata -> mkd.traineddata-4.00 ) l10n_ms? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/msa.traineddata -> msa.traineddata-4.00 ) l10n_my? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/mya.traineddata -> mya.traineddata-4.00 ) l10n_ne? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/nep.traineddata -> nep.traineddata-4.00 ) l10n_nl? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/nld.traineddata -> nld.traineddata-4.00 ) l10n_no? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/nor.traineddata -> nor.traineddata-4.00 ) l10n_or? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/ori.traineddata -> ori.traineddata-4.00 ) l10n_pa? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/pan.traineddata -> pan.traineddata-4.00 ) l10n_pl? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/pol.traineddata -> pol.traineddata-4.00 ) l10n_pt? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/por.traineddata -> por.traineddata-4.00 ) l10n_ro? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/ron.traineddata -> ron.traineddata-4.00 ) l10n_ru? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/rus.traineddata -> rus.traineddata-4.00 ) l10n_sa? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/san.traineddata -> san.traineddata-4.00 ) l10n_si? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/sin.traineddata -> sin.traineddata-4.00 ) l10n_sk? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/slk.traineddata -> slk.traineddata-4.00 ) l10n_sl? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/slv.traineddata -> slv.traineddata-4.00 ) l10n_es? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/spa.traineddata -> spa.traineddata-4.00 ) l10n_es? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/spa_old.traineddata -> spa_old.traineddata-4.00 ) l10n_sq? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/sqi.traineddata -> sqi.traineddata-4.00 ) l10n_sr? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/srp.traineddata -> srp.traineddata-4.00 ) l10n_sr? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/srp_latn.traineddata -> srp_latn.traineddata-4.00 ) l10n_sw? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/swa.traineddata -> swa.traineddata-4.00 ) l10n_sv? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/swe.traineddata -> swe.traineddata-4.00 ) l10n_syc? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/syr.traineddata -> syr.traineddata-4.00 ) l10n_ta? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/tam.traineddata -> tam.traineddata-4.00 ) l10n_te? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/tel.traineddata -> tel.traineddata-4.00 ) l10n_tg? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/tgk.traineddata -> tgk.traineddata-4.00 ) l10n_tl? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/tgl.traineddata -> tgl.traineddata-4.00 ) l10n_th? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/tha.traineddata -> tha.traineddata-4.00 ) l10n_tr? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/tur.traineddata -> tur.traineddata-4.00 ) l10n_ug? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/uig.traineddata -> uig.traineddata-4.00 ) l10n_uk? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/ukr.traineddata -> ukr.traineddata-4.00 ) l10n_uz? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/uzb.traineddata -> uzb.traineddata-4.00 ) l10n_uz? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/uzb_cyrl.traineddata -> uzb_cyrl.traineddata-4.00 ) l10n_vi? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/vie.traineddata -> vie.traineddata-4.00 )
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=7bb494e942c1ebded5764aa93e3b9742
diff --git a/app-text/tesseract-9999 b/app-text/tesseract-9999
deleted file mode 100644
index 81d198049eb1..000000000000
--- a/app-text/tesseract-9999
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare pretend setup unpack
-DEPEND=>=media-libs/leptonica-1.74:=[zlib,tiff?,jpeg?,png?,webp?] opencl? ( virtual/opencl media-libs/tiff:0= media-libs/leptonica:=[tiff] ) scrollview? ( >=dev-java/piccolo2d-3.0:0 ) training? ( dev-libs/icu:= x11-libs/pango:= x11-libs/cairo:= ) doc? ( app-doc/doxygen ) scrollview? ( >=virtual/jdk-1.7 ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl] scrollview? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=An OCR Engine, orginally developed at HP, now open source.
-EAPI=6
-HOMEPAGE=https://github.com/tesseract-ocr
-IUSE=doc examples jpeg math opencl openmp osd png scrollview static-libs tiff training webp l10n_af l10n_am l10n_ar l10n_as l10n_az l10n_be l10n_bn l10n_bo l10n_bs l10n_bg l10n_ca l10n_cs l10n_zh l10n_cy l10n_da l10n_de l10n_dz l10n_el l10n_en l10n_eo l10n_et l10n_eu l10n_fa l10n_fi l10n_fr l10n_ga l10n_gl l10n_gu l10n_he l10n_hi l10n_hr l10n_hu l10n_id l10n_is l10n_it l10n_ja l10n_kn l10n_ka l10n_kk l10n_km l10n_ky l10n_ko l10n_ku l10n_lo l10n_la l10n_lv l10n_lt l10n_ml l10n_mr l10n_mk l10n_ms l10n_my l10n_ne l10n_nl l10n_no l10n_or l10n_pa l10n_pl l10n_pt l10n_ro l10n_ru l10n_sa l10n_si l10n_sk l10n_sl l10n_es l10n_sq l10n_sr l10n_sw l10n_sv l10n_syc l10n_ta l10n_te l10n_tg l10n_tl l10n_th l10n_tr l10n_ug l10n_uk l10n_uz l10n_vi elibc_FreeBSD scrollview
-LICENSE=Apache-2.0
-RDEPEND=>=media-libs/leptonica-1.74:=[zlib,tiff?,jpeg?,png?,webp?] opencl? ( virtual/opencl media-libs/tiff:0= media-libs/leptonica:=[tiff] ) scrollview? ( >=dev-java/piccolo2d-3.0:0 ) training? ( dev-libs/icu:= x11-libs/pango:= x11-libs/cairo:= ) scrollview? ( >=virtual/jre-1.7 ) scrollview? ( >=dev-java/java-config-2.2.0-r3 )
-SLOT=0
-SRC_URI=https://github.com/tesseract-ocr/tessdata/raw/4.00/eng.traineddata -> eng.traineddata-4.00 math? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/equ.traineddata -> equ.traineddata-4.00 ) osd? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/osd.traineddata -> osd.traineddata-4.00 ) l10n_af? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/afr.traineddata -> afr.traineddata-4.00 ) l10n_am? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/amh.traineddata -> amh.traineddata-4.00 ) l10n_ar? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/ara.traineddata -> ara.traineddata-4.00 ) l10n_as? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/asm.traineddata -> asm.traineddata-4.00 ) l10n_az? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/aze.traineddata -> aze.traineddata-4.00 ) l10n_az? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/aze_cyrl.traineddata -> aze_cyrl.traineddata-4.00 ) l10n_be? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/bel.traineddata -> bel.traineddata-4.00 ) l10n_bn? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/ben.traineddata -> ben.traineddata-4.00 ) l10n_bo? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/bod.traineddata -> bod.traineddata-4.00 ) l10n_bs? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/bos.traineddata -> bos.traineddata-4.00 ) l10n_bg? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/bul.traineddata -> bul.traineddata-4.00 ) l10n_ca? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/cat.traineddata -> cat.traineddata-4.00 ) l10n_cs? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/ces.traineddata -> ces.traineddata-4.00 ) l10n_zh? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/chi_sim.traineddata -> chi_sim.traineddata-4.00 ) l10n_zh? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/chi_tra.traineddata -> chi_tra.traineddata-4.00 ) l10n_cy? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/cym.traineddata -> cym.traineddata-4.00 ) l10n_da? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/dan.traineddata -> dan.traineddata-4.00 ) l10n_de? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/deu.traineddata -> deu.traineddata-4.00 ) l10n_de? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/frk.traineddata -> frk.traineddata-4.00 ) l10n_dz? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/dzo.traineddata -> dzo.traineddata-4.00 ) l10n_el? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/ell.traineddata -> ell.traineddata-4.00 ) l10n_el? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/grc.traineddata -> grc.traineddata-4.00 ) l10n_en? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/enm.traineddata -> enm.traineddata-4.00 ) l10n_eo? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/epo.traineddata -> epo.traineddata-4.00 ) l10n_et? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/est.traineddata -> est.traineddata-4.00 ) l10n_eu? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/eus.traineddata -> eus.traineddata-4.00 ) l10n_fa? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/fas.traineddata -> fas.traineddata-4.00 ) l10n_fi? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/fin.traineddata -> fin.traineddata-4.00 ) l10n_fr? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/fra.traineddata -> fra.traineddata-4.00 ) l10n_fr? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/frm.traineddata -> frm.traineddata-4.00 ) l10n_ga? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/gle.traineddata -> gle.traineddata-4.00 ) l10n_gl? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/glg.traineddata -> glg.traineddata-4.00 ) l10n_gu? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/guj.traineddata -> guj.traineddata-4.00 ) l10n_he? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/heb.traineddata -> heb.traineddata-4.00 ) l10n_hi? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/hin.traineddata -> hin.traineddata-4.00 ) l10n_hr? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/hrv.traineddata -> hrv.traineddata-4.00 ) l10n_hu? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/hun.traineddata -> hun.traineddata-4.00 ) l10n_id? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/ind.traineddata -> ind.traineddata-4.00 ) l10n_is? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/isl.traineddata -> isl.traineddata-4.00 ) l10n_it? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/ita.traineddata -> ita.traineddata-4.00 ) l10n_it? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/ita_old.traineddata -> ita_old.traineddata-4.00 ) l10n_ja? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/jpn.traineddata -> jpn.traineddata-4.00 ) l10n_kn? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/kan.traineddata -> kan.traineddata-4.00 ) l10n_ka? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/kat.traineddata -> kat.traineddata-4.00 ) l10n_ka? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/kat_old.traineddata -> kat_old.traineddata-4.00 ) l10n_kk? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/kaz.traineddata -> kaz.traineddata-4.00 ) l10n_km? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/khm.traineddata -> khm.traineddata-4.00 ) l10n_ky? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/kir.traineddata -> kir.traineddata-4.00 ) l10n_ko? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/kor.traineddata -> kor.traineddata-4.00 ) l10n_ku? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/kur.traineddata -> kur.traineddata-4.00 ) l10n_lo? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/lao.traineddata -> lao.traineddata-4.00 ) l10n_la? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/lat.traineddata -> lat.traineddata-4.00 ) l10n_lv? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/lav.traineddata -> lav.traineddata-4.00 ) l10n_lt? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/lit.traineddata -> lit.traineddata-4.00 ) l10n_ml? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/mal.traineddata -> mal.traineddata-4.00 ) l10n_mr? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/mar.traineddata -> mar.traineddata-4.00 ) l10n_mk? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/mkd.traineddata -> mkd.traineddata-4.00 ) l10n_ms? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/msa.traineddata -> msa.traineddata-4.00 ) l10n_my? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/mya.traineddata -> mya.traineddata-4.00 ) l10n_ne? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/nep.traineddata -> nep.traineddata-4.00 ) l10n_nl? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/nld.traineddata -> nld.traineddata-4.00 ) l10n_no? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/nor.traineddata -> nor.traineddata-4.00 ) l10n_or? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/ori.traineddata -> ori.traineddata-4.00 ) l10n_pa? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/pan.traineddata -> pan.traineddata-4.00 ) l10n_pl? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/pol.traineddata -> pol.traineddata-4.00 ) l10n_pt? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/por.traineddata -> por.traineddata-4.00 ) l10n_ro? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/ron.traineddata -> ron.traineddata-4.00 ) l10n_ru? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/rus.traineddata -> rus.traineddata-4.00 ) l10n_sa? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/san.traineddata -> san.traineddata-4.00 ) l10n_si? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/sin.traineddata -> sin.traineddata-4.00 ) l10n_sk? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/slk.traineddata -> slk.traineddata-4.00 ) l10n_sl? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/slv.traineddata -> slv.traineddata-4.00 ) l10n_es? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/spa.traineddata -> spa.traineddata-4.00 ) l10n_es? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/spa_old.traineddata -> spa_old.traineddata-4.00 ) l10n_sq? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/sqi.traineddata -> sqi.traineddata-4.00 ) l10n_sr? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/srp.traineddata -> srp.traineddata-4.00 ) l10n_sr? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/srp_latn.traineddata -> srp_latn.traineddata-4.00 ) l10n_sw? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/swa.traineddata -> swa.traineddata-4.00 ) l10n_sv? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/swe.traineddata -> swe.traineddata-4.00 ) l10n_syc? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/syr.traineddata -> syr.traineddata-4.00 ) l10n_ta? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/tam.traineddata -> tam.traineddata-4.00 ) l10n_te? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/tel.traineddata -> tel.traineddata-4.00 ) l10n_tg? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/tgk.traineddata -> tgk.traineddata-4.00 ) l10n_tl? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/tgl.traineddata -> tgl.traineddata-4.00 ) l10n_th? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/tha.traineddata -> tha.traineddata-4.00 ) l10n_tr? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/tur.traineddata -> tur.traineddata-4.00 ) l10n_ug? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/uig.traineddata -> uig.traineddata-4.00 ) l10n_uk? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/ukr.traineddata -> ukr.traineddata-4.00 ) l10n_uz? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/uzb.traineddata -> uzb.traineddata-4.00 ) l10n_uz? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/uzb_cyrl.traineddata -> uzb_cyrl.traineddata-4.00 ) l10n_vi? ( https://github.com/tesseract-ocr/tessdata/raw/4.00/vie.traineddata -> vie.traineddata-4.00 )
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	git-r3	8f6de46b0aa318aea0e8cac62ece098b	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=bb3ff31b821f6cba754040cc5f41c653
diff --git a/app-text/tesseract/Manifest b/app-text/tesseract/Manifest
new file mode 100644
index 000000000000..77bad3c430e9
--- /dev/null
+++ b/app-text/tesseract/Manifest
@@ -0,0 +1,149 @@
+AUX tesseract-3.04.01-use-system-piccolo2d.patch 1158 BLAKE2B f12d99977644dfdb7078ebab18ab02c1979922b94fbff4cde568e1496e572671465dd849cc38d86d0d32c986d054092eaa6e78c3423de0bdeef7c7d501a80a24 SHA512 635276f604238c0aace8be06ee6d0e7ec5fcb61a6cbe2504721ce41407a9799289f4917e4fecbe2155072e324c3ae3246238ec12abd23700a9311532657e678b
+AUX tesseract-3.05.00-no_graphics.patch 2199 BLAKE2B 0ed987995a7686dfb6e420c1e79eb1374df5d1c2c69177f858f962c1216f54daeb4b0e10e9c6cbfeda931f44a359b75fa266266c0807321479a4275b8ab7fdb4 SHA512 136b4f298e52517a801a19847ceb85cbb77ee0de42a43dc5a82faa7039f0b9c0bde965453ac5cd6c25f4578351217319a0ceb719fa42f207a38b3efe0c210388
+AUX tesseract-4.00.00-use-system-piccolo2d.patch 1030 BLAKE2B ce4e080e7d192df3ee7f9579d40cc30dcde63cf17ad85d06beb939ef26cddc013b4be5e2a8c0a0556576c01a57ad2c8a6281709a0d902e02e096b6a5688438c5 SHA512 df203ab3933a59f1f2f689ce8dcf266200c705837b5b97dab5f7b1684903523ffa7b88c374c2e7c0b106c1726ef54fdcda47ab44bf75cf51e7dc4308dac6a810
+AUX tesseract-4.00.00_alpha-isnan.patch 1027 BLAKE2B 7123c50da551abfe12e74e2dcb5c7b63dae7c6c35fad577b123acd341ce49ebb9c844033ee33a4c3bfe0751c4443e765311393b51c59513f5002ecb2c35bf2f9 SHA512 c2fa33a385b7fa0da525abf80ac39f846bb89df89a80c71c076355e98ac1d16a01d69c9ba748462f02e8f94b0049e6706ad77406ed0cc230fcac20b00fc917d8
+AUX tesseract-4.00.00_alpha-no_graphics.patch 4485 BLAKE2B a904e8c781c46f4173dafb86a665a8f736c97d37cf23a70bff2930d73c5794e888b44a6bbb33aedb9e89f9d383fd30d4a944b72f3feffcb08f53e60ba3ada091 SHA512 d64592d0236fdadde005020e3afe3839029b2090d052c8034f1f16c401a6df99bbd11750dd9e0013367afae04e770c8166e984531be05822f8cc134c2ff9b1d4
+AUX tesseract-4.00.00_alpha-openmp.patch 3817 BLAKE2B 31d0534d8006e91f25e78d4e2ffa132f3b46a764acd32726a1c3ea3ca98466b07a53f1716dd82d4b497670a933dbc3f6d67b038cf0b3a74a0538c9d47872fc52 SHA512 6e685f0b8da173714139bf48c2406bfb365081f8723c7b58c9feeb140ad0abf6875b871fd95c521f3e26421869c84409a0b8f405ea3179847a1052899148d4ca
+DIST afr.traineddata-4.00 12213914 BLAKE2B e06516788c09f6a9538ffe3c4378eef4e88eaec0c8e14a7f3ddfd6db0820839a90a27f8519dcf6872dc8c08f47229d4ee8bd6aa41e383cbf51a5584bcda6f7f8 SHA512 1c00ef71a0e846bf5d0d57c7c3a3a8b5af47dfa8f429dbc02fdb560731923c0d0ab3273b3b975a570ffe7bfed2c7b284ef28ef4f830f8d4a0f33d84692cc655b
+DIST amh.traineddata-4.00 9771502 BLAKE2B 3a905487136efd099aacd0a979bfda1edcd30c8eb14fe2b304ba1f5355f570520b864c992b63a1fd1f683baa91186de7cd7c89e6057dfebb896f2d6f905b6d6a SHA512 0b449936c350eff717aa5bba502d3df86632746de9b3a7320252cb69707d18596b0bbd4a27caa3cb5bb560add8991bfbe7b56dac6f7e0a9f91202924fcb694de
+DIST ara.traineddata-3.04.00 6315068 BLAKE2B 30af9442d0180c9288c6e8ae03e7ede7e4a1a18743733bc00b63c28f405ee1f0221a64e01c19dde3f808efe6b4547bceeee36690d9bf44288dfe57211b7acc90 SHA512 7fba780ec9061148c01dafee1227f8e338c1cf199a5c2869d58703123ea89f2279551e15159ab37038ec8ebc755076ede6ef049cc8a6e6764aa66d81c72a259b
+DIST ara.traineddata-4.00 12537236 BLAKE2B 461b521d70609593f51df2e93d0ad74b289cdf42cc421f1445e70b63b7e56fde31f23ca9ef5b9584683fdb53d98e6057e090be890229a22a315a16863e60174e SHA512 a3dfc8604aba6efccb0cdd39488ea978d324ec953c5e74892cbfb7506f1b4276e5e335cba56301272779d7a0ec69c55187db01bcd01de06a524ecb92820b7348
+DIST asm.traineddata-4.00 23520270 BLAKE2B 81705edbbb1d4d467945b533a1789ed41dd6218a61621713dfba6c41a40545c99f8f7e112ce897de09cab242a06c0a493b46673630749a925111b808fbf02b9d SHA512 9413806ba55d101cf2c88c0c0cf408a8b4010c4a4b4ecfb315f98527865a1ddd052f1590326500f4c583628171d203a2a5530ef406b583a8b9f5451da91bb42a
+DIST aze.traineddata-4.00 15168011 BLAKE2B 65da3a20717a574338c2a371f3832477a0f06d6619042f53987b7932e18d0bd1ee49ae722d6199b9c84543d77f00a398a387c3eb739105d0551670a3670efe97 SHA512 372241fa9f1d060d47a1ffd4830cbca4c9a319a014631545ca8f2c043609afe4427d4342e522d383778f0448ad853fccb632ef3eaa6dc09192ba06f1693102cf
+DIST aze_cyrl.traineddata-4.00 10530787 BLAKE2B 9643274e5d89ec18655d5552a59eb96e2732bb1163e0d1c5a9a49d05e6271b0b4170a566fe5f69f8eea73fa4e8a1890bd4950cd7f65516ef4ff6effe92993a43 SHA512 8cba80fd1201ad89eaaf31bf256924257fb45e192b139abcd9a7cefe43e4e30fd35dd4e08588d593a062b2668f0715804f66566479dd0a0beb688bb2c1ce7291
+DIST bel.traineddata-4.00 16325127 BLAKE2B 8c97ac476fc7baa333b173494a004a134cdedbd3237fb73f2257c4126a0ca964eff6f8504966251a133e0ec1a23f85011fcbb3a2e2e1b690ecf225b72fe78fe8 SHA512 b6c7eccda420fc6c9cb30d3cd2e38b8f2d09766a77f701f3daae38fde198e2314a9a050841f2fec2fe49551e8334d9d5b820303b2d19285a942b423c66a71538
+DIST ben.traineddata-4.00 23447857 BLAKE2B 34c02e9a95706893045fccbc2e6728c89b4e5acf34262a7bea5beac91f1585b02a09192f20efcbfacdf0099ec5f1649edeb651112af98af590a0494c8eae8951 SHA512 6e59864bb499e048d8f8ce575f280f897b14bc626cad1970bb70d267f982be96ce2dacde847d060520288389bcbf2bd4a39d6abd9269a51d3d7970ffa19f4a17
+DIST bod.traineddata-4.00 35497681 BLAKE2B 53486538158ebd3946c49539a3f5bdfe72a1f22aedd84d3fffa3ff4b4676d3a9a2ed8c0da44ffc33e5634218185d963b5fc58f1a0490c5b97182f06a6b81331d SHA512 3b57c9d71b0914f274a6dc34e3d60fdb94f487e67e2fbddc92dafdb3bdc6e90766aa5b780449d367a6ac4d02b2c6634ee43efe74cbe52f71b11358e4d1c74339
+DIST bos.traineddata-4.00 13859186 BLAKE2B 04485ff70535292d3befa748955e831ff0fdc229629280c2469629a45ea34499efc382946edc3303e2f9ab02c2f463efd54353c5bed928a5c5a40fcb9b81cbfa SHA512 21d9c6c4bbc042b1ee473d2f67fbd875cfa6f7fd9652abf914f8a0c526b5833ebb9602ee942f72642b00db4d632647beb531da37db712f0acdb86410024ebb01
+DIST bul.traineddata-3.04.00 6026234 BLAKE2B a39a5757ec6bbb77ed6fe9a263e11b9d83eb64653f62f96dec68c102aa199348eefb8f99642f9824af9e41c537573f06af45f393271145fdcfbfff71bd07e1fd SHA512 5115b4f92359344a17ee43b298c5c012569d77325e440bbe079ce7734ed087cbbe7ffb2b2dcb831e522fde2cde556e5de630f9ca85c141e9282e951e008e156c
+DIST bul.traineddata-4.00 13677970 BLAKE2B 8c3e790138bea9def6d21ec26bd7755ea5604acfce3c4f60602fc8ab7145dfcfb29132277d00b8cff6b7497e29bd266dc9a8c84614c0cc2f5c29db5e690f113e SHA512 26a010581fc65673d48b30fdd69308cee47c12531bb260c93a0b22429b2c342e78ee3d7ccae1590e71ea2fb1c9f33110a3bbbaebf8e7c4fbaab207a4bf9cea48
+DIST cat.traineddata-3.04.00 5356190 BLAKE2B 64c7677812342474a7182c4e7907e068231511e09403c7122004e7720ab023f98c2d157ba5d417582d6323d3aa3ce5eb9914ce10506663f70749a1290c553747 SHA512 d3b1f2ff0d7d57fdbddbf9a2cd44fd1fcec08d13b82c6fd77a21fe45ef8e33dd809332b59d8bec0600f2596e0bf163605811539aca154eb11f7d8238e6df9630
+DIST cat.traineddata-4.00 12704811 BLAKE2B 5a775d9cb85238ee3c1ae965601c0855b497ddfcc665f540569e90f29aab9e819edda1b99344ec048917ebe3228a52961393e55b402af85b6b4220b862e5bfce SHA512 d743b2515081d2121f294ba179c81a96f632b9ffec539777a3f1f1f54516a02d068377fed05ee7008fd6268e754645aec7d338043fda1340a4da432358248db1
+DIST ces.traineddata-3.04.00 11896327 BLAKE2B 253795339231d377d3b033f348cc3413ba3bf9520bae44d318b459271608501db7958dcd216f44deabc7755008cb66c5b20625ad3a00a3ea8fca2258aef3c8af SHA512 de65b88d76fd50115099dfaac8ac80b7c6581eb0aa6186fa0c91c9cf12e90632a96de341b2faf94a8de1c5ed7b71c196571c914792b6aa7de42a3b7542ed625d
+DIST ces.traineddata-4.00 22727966 BLAKE2B 51793a4202b0a5a24d0e82e0403f42eeec61fa01efb5cb0376ec9f016911201534ae5133429eaa24d2bb97a4623ddc3b19d9fc4f4163af5cf2f19b7d924febf7 SHA512 48513c3c653aee6c6d7b22cd364331ee4ce5daeae6291b0f3eeac7cbfec8603ada5c64ae10f084ac12151d659ccc8957d040df36e68e605b34c56293491f0d6a
+DIST chi_sim.traineddata-3.04.00 42089623 BLAKE2B d7ac25d5a43ab36fe54035e78c34aa9b7fd4fee06fb32da6ec8173d0c0a40ea727d0c529f0d02ec949642c81c81a4d180c6c68557709d3561d169c9e7c3a29f8 SHA512 e3427c17988e777447262bd3f5704f84d1296a8c02d10f343fc6f698ed23b8577670bdc76f3e0ea53284a233de1e6d0f25224d984bed75bfd52f73e6a6945673
+DIST chi_sim.traineddata-4.00 52662579 BLAKE2B 96dae9feca0e7cff822d850dbe23f6ff3b5aaba18f7053521f8e7a8adf04c7669879fe602d6f73a933147ac62c6291ef8e3f9960fbd90a23cde23da638f99fd7 SHA512 18c6307c2f1d7f498df58a198b4bd61fb434651a1cdaf2abfea259f01d0064edaad69421c744ef3485134b49868ff3a5c75cb53db87d68bb1b746e29f9356440
+DIST chi_tra.traineddata-3.04.00 56692327 BLAKE2B 83ef6e067107b14cacb208ec5885d3db6a9fc6be85eae90f27eb4c70ae723cec6fa17912068f46078d8a03541a51ee2aa7b1eea007211b5fa9f7282142fd8ffb SHA512 149795758dd51beeea3b9739395b599c9b6fac35862ef50fd663273709f00bab72840a6983d09289d05269f808a6af25b588d9740f54736beaf2452da1c735d1
+DIST chi_tra.traineddata-4.00 67377986 BLAKE2B cb06673cf33cafbb4eca7ba98a14736925a55f7d7a7badb06cef66a8e91072b631036f455a68fe0a4f5a21e8c9c25691286819d265d859b092fc1e71c456c832 SHA512 a8300b785ae367b94059ea8519512474088c2202410aa74d9621fc5aaeb552125f257daccad1294456f8dd7ae07071e73151847b296b971c8c18d48ae519201f
+DIST chr.traineddata-3.04.00 1083194 BLAKE2B 86a4c64f3df108d92f0b1d68743fb0a7c6e6aef328751c770968d946a476b1123141beb99730d67af8a4a321220be2a82cb3d96920352fd21709bfd15507a284 SHA512 e0982f5069a9cab4ad274babcd00a7199e2e76ae02167101a24c0074a91db5faf55f921159da724391860c9187423b14b5aab096f90eccc604a32b2d30376455
+DIST cym.traineddata-4.00 10333739 BLAKE2B 496296881fd98c77cbdcac413ad85ecbfe8c088de8326ef84c3e8d6c492f486a21be0982b9374f07310b85b25ad6bf646ae57a42ceba2be5f5190306cef01e3d SHA512 8f845d557be62195689ecf17b43c229bd33e85cac4cadf90b176e9a6d9f184411465be5b3534344b562bfa14b10cad6b0f47cb7dcece3f3d7192b13db7fd2e23
+DIST dan.traineddata-3.04.00 7340575 BLAKE2B 8437979bd4a01534e7a2c1c82c88232707ba10043c3bb824f71f8c365fed1353ce438dd08205286c1e2053adbe96211f34a5199648679f7c147806083d659a26 SHA512 ed320c5a3b93b5416ad1941a3e8a331a2f60570ba74b4bc2285e687472e7222556379c0ef261ae06970e3b9710c5fa89a26da5d509be325c2e627ed6e9f48bff
+DIST dan.traineddata-4.00 16011554 BLAKE2B b57f7e30f4449f648aff92a6258a109e7f43dd84fa0406f44dd5b81937e7504c786c2aa75f791f47e0565afa6c872b06e4609e3849087a73a5f52bd501f7623b SHA512 3b678b28d4d5c67c4781251974dc36fb8d430440a1409b67e5c7124ee3c04fb39fe545af8a7e8fd0e14a24ccde55a9dc32bae127eb48ad7c8eab16cc374fde48
+DIST dan_frak.traineddata-3.04.00 1622710 BLAKE2B 458935c2176a74ef0090574be0ead1d65a0ede29fee48215a674643bb3a38f7a4fb40c940480e1e490edab8758f49010c6c2304ad9490ea22f60d8a8602317e1 SHA512 8bb21f7ee21f99e0eb8fb55bdcd60b006bb1dbb42946f1f7dce1c53bcbef46f5f6cca7aaf069b1b3c43b13eee2c7dee752fea8c38003ee266999752a9b466b01
+DIST deu.traineddata-3.04.00 13367187 BLAKE2B 3ead7f065fc4284f1dbdb83180d5f87e717fe39971d2bcf248f22125b5ac5fa9ed0f53491b955c9e0063a419dfd23a6696841ad0d12d7f6de13411f81254c416 SHA512 fd4eab9e9203ea3a2f009c5feb337449b4ec2acb67b42c5420ccf69b342ca9afa655093d7e9b07d3ad435a80e9f59eeaf3ca578608a9136ca13ee234444d6995
+DIST deu.traineddata-4.00 20193615 BLAKE2B b554b66edd074844f607700af1855581b73a251693b666a4091105a21093b27adedeedc97540b0bb739af48ee4cd289874b366e64b0c8701cded25a84df6f8d4 SHA512 23326861284f096e40834bac31ef4e9344507b9332c8bbdc10dced0c60743bb2fbeae79d888c80c56e796661a2232998f1f7ba64ff1e0c9bc79ff13bd0a2663c
+DIST deu_frak.traineddata-3.04.00 1978593 BLAKE2B 7a9bf16949baa3167d162f5075a254fac7699cd6ce2766423a1d0ef652daa0174ae6a36c6dd0d0e6f45bf961b4a0d13a7f55a0de3bfa2afe023816dff0f54ed2 SHA512 6d458b657c5b88671e0932da24fe91051b7191105b710b18331620347407c5f91338ae951ee9e0464af2d93dca552d77b1e40d372dda1aed12bc209baf00d4b7
+DIST dzo.traineddata-4.00 8771208 BLAKE2B 4651c08d7d7fced6c86dc7c41b14a205b85fdb5a98a5db392be0769ca35868e061ad39947d80aadaff38cf8651da10dcbdfdfb089192672eab9d3ea5e4d3ebcc SHA512 b9801388c1e2e6355846be86ec61b8eb0bdec0c2907b787c5ee5cfd042a3889b8b4a9baea27775088a1e18597c024012263830ee238b4d8f7c58d31c607f47e6
+DIST ell.traineddata-3.04.00 5422512 BLAKE2B cec340bb25a6f60fdf17dff46c06440ee2be62bf4b8dc8055dae1d77ec4a06a43862052399a3ece1c3d860cb1d88a1511a3b58a8b9f61bde3371736b0d686c01 SHA512 b542f4cad465332b7d9742ce64951289a22f31c2196335b09037e047c9fe2966689426d9e973173147aa7c0ca73cddb337c9ec7b485b13b80eea3e44ad31bb48
+DIST ell.traineddata-4.00 12594922 BLAKE2B 297198e6e4341123c88ce6d92442618797b0ad2f7b8c4f47051855c8186468d843071567a8b3b26b6693bc09a927f49694995e5f335baafdc7749ad87bf2664b SHA512 ba49067c8eed46992615013a09f58c457bf333afa4f152f3b1f837e934c71d04564bf1e9a1a8d80cd4aeac95639c19124aa586f3043737c556d28e2bc478fbae
+DIST eng.traineddata-3.04.00 21876550 BLAKE2B 983f91e54b334ee533d5689ac8ce768922e348ef89a284c47d93ba91fcad6de8614998c8a5b17c2406c5c30c1228530077aad84929da6d8bc983c89c1d3a2234 SHA512 e03d205900e3f6b866b2342eb8f32fb35dad28c7f58b7bdc3c0bec0de570f87578168d8d64b1f0bedac7bbcf462dd949b00701943a55ba3f42842ad1629e230a
+DIST eng.traineddata-4.00 31873501 BLAKE2B d055774978588376c69fac2c4010971a37480f493ed3d6371236d0ab14c51428f328b1be658606bdc4658e36deebe744a3ddd132c7ba3bcf275c4222cf4b2e62 SHA512 dec017b60c7ee7c8dfe1c4cef562a02c8699c2856d6562641a7077c1a0b5493a26085fa81e7dfff97323054276f24eb51f64833bc2fe7bbe91b1955c6f719618
+DIST enm.traineddata-4.00 10479188 BLAKE2B a6ef01ccd91699b506d02c5c558923040afb65df7612477345d498b2798f5d04d09c6778773adba3fa0999caba6f56aecd54f2cd622434dee830c0f3d22535f7 SHA512 fe78e53eaaedee66e688291d684c221673b787dd3f020736f60ecdf4dd1257f3d2ccfcc10408a6ef50c711b538a4a3933c84d1ebfded82c2adc1685e7a9712ed
+DIST epo.traineddata-4.00 15408492 BLAKE2B 88f7ca7d97f6ce5443819c94eb5c31badfb7e00f7880a4d8167e53a204ca05b548669214a50c2765372f6df6b726797682141332d7dc6fdd964ade92dbac9bd7 SHA512 44230babdbe3ff366c0141f49ee524cc7eb1226be767e865b4ddd5afc1c1f99b67ccdc68ddc1ad0c8b3a368937508d9edbeeef099cb23815b506f1e08910427f
+DIST equ.traineddata-3.04.00 2251826 BLAKE2B b7ad09d1d57dd5af088496e0f6524a7bea869f61c8f4be45eee1f84d83eab5b5f724e736055bc5226abc704f90afe2726210e5eed1fcd2936c65010457c4b8b3 SHA512 2c5e5f9f85e956e0ebdbb25aa4e92bc163808ba9944c8d1ec9a76e4c70727c3657c6e56c86266a2e769e48c6f6d9aea72bf2080f723f3d90c089f775c3dae9d8
+DIST equ.traineddata-4.00 2251826 BLAKE2B b7ad09d1d57dd5af088496e0f6524a7bea869f61c8f4be45eee1f84d83eab5b5f724e736055bc5226abc704f90afe2726210e5eed1fcd2936c65010457c4b8b3 SHA512 2c5e5f9f85e956e0ebdbb25aa4e92bc163808ba9944c8d1ec9a76e4c70727c3657c6e56c86266a2e769e48c6f6d9aea72bf2080f723f3d90c089f775c3dae9d8
+DIST est.traineddata-4.00 21175883 BLAKE2B 82a9927d7d7ff5d79ab7fd6518b12e53a5e24931be17d83e07feacb96ba34d022148c7b20e8651ef05c6e85e1d44dac60b10ecb70d8ec7acf1f392c63fdf58ac SHA512 733200cfb2e963e93d12666b28f7993af4a84737cf4c9a4c68946fa70076d4fc649bde93e68d701d1970fb7ac3adb2c1fcf89f54b0a35dfa56c257f8a30ab6f8
+DIST eus.traineddata-4.00 12542297 BLAKE2B 7dbee88a1813893986bec9b5564d0e5169497734fedc13ccef05ea091d200d2021c2e65533bec2fdb990491767e5a4ca84031b8ad102e3385a1fc979b797675a SHA512 bbdab8f049a42cbe9e84d9695c6d209613ac35549147f000301954f8275b2683bbb2787df772f084e2f7887b2de9c0567fb424e80f0e82f95a14bbdac66c266e
+DIST fas.traineddata-4.00 10579225 BLAKE2B e0d68b0d0713f0042bd18bc52c41bd6af3501b4aec54f16b18229f4f9fba1f115825add6f270e8e020345c25f337c2066ca7d9894119a678257d8ee76511139a SHA512 8423479acc7ed52156a0a4f3c574de4555e51979a98f60a760c86b5726a767bdab7a787069574cbe2f9dd11f9ad9a723b9b9f03b656e2b0e0192cccaeef0c3b8
+DIST fin.traineddata-3.04.00 13274908 BLAKE2B 7fd89de5435619600523106184aea5e7c87720b1d5796508b4953d6d8c19e2e2bee96b7a36c887ab0f456a0322c30f17e37d91e3afaa1e0733c110f3324aa784 SHA512 036e5e383ec4ffc0e06fb5a93d288f21360660d10c6daf8459edd3fb94f611ed49ffcfb9bc1fdd1d8476690f53950ca31963ccdb36a35d3330fe2ffef0a81789
+DIST fin.traineddata-4.00 28467692 BLAKE2B 9de412dd406915f2c55b5ecebe1bbbb15620c9d3f84f58d215a20a7cf3103e3e20c05177822f9b7fdb488c67fceee892c50fb3ffcd4f1e73314b8e4670d3688d SHA512 a077a853ab89d2d03d5bd7ccb60af51544c7ef3afd230ab0e12dc616f28130c860701af314f6e73f24ccdca4fd8d4c611126df525fbded4b7f023a135ab3a094
+DIST fra.traineddata-3.04.00 14044118 BLAKE2B 9acb6f5d6710632178aba4b95db27390d0100d9dec6ca3648c518dbc221b2cc03ecaaf33aafa363265863b9032e2ab7a327beafb8a6e29ae1a3345ba80455aed SHA512 c41223608625491fdbf2d4fbe526da472bb5c269958e776b2058d4a782ebeffff9749e30c7db34adcdbd30669d82be97ee58d303027d5a67ae61b87b65c2e561
+DIST fra.traineddata-4.00 20908386 BLAKE2B ef52ff763733c5a957e34aa9cf280c9a90ad70039183ded321750c35321c399e131b03717180e89fbfde8bc121762dacc46dff54c7b0cc69f727053aa392b1e4 SHA512 ecf1ded66b3e5c903161377903b5a693ea8221b155ac61fa88b0e2ba1fdb34cce8d8e6d0270a45ed822baa012d7d24ee15c6032a31b62d9b773106e39bd18603
+DIST frk.traineddata-4.00 29861799 BLAKE2B 13336a3715221fbabde3b6d57ba08802b33faf21aee4c55401099f3667b0173469a051b845667f1d9269387dd7c0433e88c3cf778da3c34d855cdf8cced0e9c3 SHA512 1d70263862960fd55e51bf906dfc2092cb9acbab94e46f57c9dc83180585604a12072c977f820b2bbbe2b7a26bc63ca4e24900ac95d4f8a0e6d45f0a485dc186
+DIST frm.traineddata-4.00 24482384 BLAKE2B f2ee9f87a983b43a2b2513f3c2247558649fabf6561e805fe758f074bb3f22426cefcf9994b3eafaf5fbb83761ed11d0b903579f71958b4fbf427c5d3a6a089b SHA512 946587cbbde6d4fa537312bb9cbb1952f5c30cd404b2cec4f2bc6282e3b190bddc4f2450e0f1904a1b5e8523c5651a5592fa892aaed2d2da7b0f1cc6f35f3e2d
+DIST gle.traineddata-4.00 10190010 BLAKE2B 60a4c16012e61cd2c32010ab4c2f6848c2c493c1e7857ed4391989f7f4e67371018bd8935684f484c4d7e236c6276eb2aacd8ac2fdaf1661c52cf8f3d4d7c415 SHA512 b8ac110cd62185aaf4336080e9e08df83f9bca2418aacb440345c5a00b2b938613ef1b13788dd4484791b3728e9b88fd739ed1cd042b82ca61341f541b4403d3
+DIST glg.traineddata-4.00 12746027 BLAKE2B 06147539764f2f3433df4fbf92807bd5da888faf91c3da51813855c125d67631e85e2215ae135136449817ef8afa1c6fb5bfc74d11e2443689d00dbbe7ba99e6 SHA512 3c0e34d0b2fc50e21bd1d08ec2862fe3839f84206669127b5a902cf9d61ffb38faa25d68154619053677ca2682cc70260d2ca443bc3ea4d319ce0ee4b21e649b
+DIST grc.traineddata-4.00 12838816 BLAKE2B f1cf709876d26a8136cc12b1f1d87771cb9fbe71d58e76dbd524812dd3d2724250104c2861694ab42eeaadcf43df676940119f0cdf429f2929cb69e17ed25056 SHA512 121aa44fd9f6b1841bcc50407c483aa7c94dc63217cedf655c393907e32d24e5dadc34f9c40c044153329f01010128c58a3ae8b6e30b8fa1419c1b66617b9202
+DIST guj.traineddata-4.00 22879598 BLAKE2B a4c062855e68a95c69c7849d2169fd3167a60bd6c473c87c0c16a809b23fbe49d935b242d15295e7d3dc50d9eac752214309998c459d1084b48375ef978d7973 SHA512 47cd56dbd2cce5bc1dd1947440f03ca3879df8526256bd4f8973fc670046f68eb4b5529f13402af9e1580c4af272f976a1a95efae1126d09208f18c7aa9d7b6f
+DIST heb.traineddata-3.04.00 4339016 BLAKE2B cbc22428f18602f7d9af02465e5e8c1088a86db812c37e113ea6a52a914710377d480366c190c852e466b7861172b964b705e328ba9cd3de5364c992e2c6e938 SHA512 9528f3b0d63bb2bc4f90c33808208846df2e9806085f134d4d6d6cd4ff96fe30ba3ae58db222245a7320646319526185ddc29cfb728d6db5038988bcf14a7727
+DIST heb.traineddata-4.00 10992421 BLAKE2B d7ac5d0863627073c9191d45afaf6cd2c76391309f58ded90231a3fca10e3e50ec81a0c51ce19a0dc0db9b4c395a3f6e49cb1beb20908331f841b53823b6b413 SHA512 b86ae5cc2ba7a1d9b3e178e9eb9153f2de38906de5054f494f0e4d35fb22af0c479ad9400ed8d1e625e648a7769778966eeae8a4064b1c9c85c3b78a7235155c
+DIST hin.traineddata-3.04.00 14152165 BLAKE2B 1efd29d700d9baaf2a6865caebca5b6375fe5e459cf0dc075396062233f54a1ea136787a975e3b0701956200fa79c539de5ff2e615ac83862b229c74b172c85f SHA512 3ac300090fc39564079aa3ba70dc09841d0fcf3181ff2f25e50fc5687c17ec9e8a5f5343879a87f7362235bafe074025de5eb02391fc68f0637f8bef1c16c3ed
+DIST hin.traineddata-4.00 25757980 BLAKE2B 018a1eecfd3ae63afec77678512b2c23a9343be330e3d0e242a2531dde7dd4686450db8598eb8a20f57463350da9fd28cfc16835b0436673d517b93915120094 SHA512 53c55f22b3d52a852e7b1a699eddf4567e1b72897c4f5ca2cb13e0968c1e40d0a9d80ca84986c35e9b478868e1dc2d86b65873960d21f8d3671980a796dae2fc
+DIST hrv.traineddata-4.00 19582927 BLAKE2B 2f8e7662a82f90373a6ef763f3878ca6a35861d91c03ccb72833008f7b430dd839e9e8d1633e2834b251de2f5299ee6fd42ecb1954208b8222b5848d359074b0 SHA512 35bbe4c202993d421a29f63390b2b5e774d348e15c9bfbe88b8e910f949fc84e3c9edee13fe47a3e8629a55384ee880f815d74eabe85fcb775c9d4bdb16e4321
+DIST hun.traineddata-3.04.00 12213770 BLAKE2B 70f39e1e9b370c186cdffc2532810542e4655dd46274ea8e2ba9249383b991be4d82793edbab2edf7ad400eb54e0c7be032a20fa3fe851d5c6e9b5f4be12f139 SHA512 cdd6957f83a50850b30d66de5063db83d0612bbbf3a582aacf35f011b8b595ba5dd03f4ffea784c337ce568bdd1cc3cdbdf96f5fc80783bad634a785f12f147e
+DIST hun.traineddata-4.00 21667149 BLAKE2B bd0e3cb3d515eab4e0d22d69d09ca5d3d372ebd65f7e9cc6f81887a208ff932f70df36f491b4288d635cd26bcca7f2947f5e64d8da0d12aa37fba8d5773bdea0 SHA512 f59a5b2291fd5588b4107936bd813209df174e5a6494af6b3101f7f426501c00d78c3c2e02a9e3277f2b802ebd6e1c1b95825f8e08a9bf7eac12bd149d9fa4e5
+DIST ind.traineddata-3.04.00 6503178 BLAKE2B 183221318212ff8c121f07541dc0d2855f12a0f5020b71d9e91a0c03c3938b7908debbcbe55e2df6d9f4f04066d513925d000cf1662aa084691f52532a4ae6a9 SHA512 997b0acbfac262d8889b47e8ad3c9ddea7893b89fe5edcbdb9a7fafe68ab4ac9e93e67cc1806bc6f4b1e1fa669da034687fae982318f9e05ad4716da0f276c77
+DIST ind.traineddata-4.00 14281790 BLAKE2B 668b8cc8d034a36c0c84a7109c92c547d42ef539103ddec41c996c5de71e71284d88253724d386bb190cbceb82432c0dc6fc25eb6b324e2e4a1d6a2297be2b04 SHA512 1835d1992975214c3a85a436e78cf732c8f8a1464e8c24109f6d1dab65764f4a1b0757e32166620637074ef02d0749eb494e66f4932d1e0af11ecf00fa7bb28d
+DIST isl.traineddata-4.00 14374305 BLAKE2B 46bc653a93095a93da74d73d93decea657c80ba14777bed7efab0d5fa504bd7fb16dc741d3a1bbc9782bfd92e043b8ff0ac9ce967f5f0f0a384bf638a265bc57 SHA512 598e827226edeb843d03848edcf95cf41a8adec2aacb79c2be47411876a2fd5650bffc1e6a252f3eae4b148667dc0a7e02b4130bcea898c6ade9ed99af8e9299
+DIST ita.traineddata-3.04.00 14210569 BLAKE2B 2bfe588757c1f4765d5f6323cd7a72a80ba37c2796dcfd58b8dc00d9a3ad94f1e8710690b75542758be01fbe7b966d29e19054affc27d473e43448be0b2f327c SHA512 97566bb89803656cca14d3559a46734b74f7859fa651399705de8a22259828e76aca2ef8d27f486e3ae7779005772966155ef190ba666ea31b7bf8c1d2fe53ef
+DIST ita.traineddata-4.00 23586689 BLAKE2B 288bfe546f3bf0f7183214d08b8f655482c22676fd50ed43556a2772a9ba4c8739011faa2c49f4d06646088dd232c5ea5beb34d5049bf5cecffe39ec3c5dc647 SHA512 0e32802292edb6bde1300a28af43e720e8cd6ea28e236865b01f8f5ff7b2e04b88d5d1ff2c32bf4fe20691c01aee4e524411c4cabb612e881e7573dc836ed0e6
+DIST ita_old.traineddata-4.00 23437150 BLAKE2B 3c949a6f67210f5a5d81240f4530915990ba1f4e5eed7dae32d33b3c7db7a3ca401dab887f5327a86f7dc5b20795f8ebfc0537f894a3a054c35ab5d1b5ab5fd0 SHA512 d0e98445f637422dc24350c7d29c8e3a3403a75b8a28322706b5dc7c8588e9a74796edbc39036ee44bfe68964e7aa60f430682ac2385501a4fd8653c54d01c5f
+DIST jpn.traineddata-3.04.00 33072615 BLAKE2B 39fc312a431c2fa8a82a4fd81cb2ed27bc29b92daba71307db484c34ca0cb616e816ce7404214e562b822251862ba79f256108320ff8fbb1cf942e3facd571f2 SHA512 23d2880f19e53739bff456a2e656924ea811872f16aa6bd52c87afdf2d7f639896d9b732ad0eea1966acb3ac76e2ed17dd6786cbbfabd9602f4af229580bf567
+DIST jpn.traineddata-4.00 44380238 BLAKE2B 0fd8222725cdecd00f8c70bab75c9634d1dbfe7b8ba11a274d199459d237dc3ab3b0e4a838576ae6522e4d503bc1987a574a98fd4d4610a8e420f8eb630d9a04 SHA512 ff49dd391d718152232b1db45ddd909441c9b6e753d56ce66ff637421db0e3876d7f2e66901bb67f8ca42c34d009d519e6814cb38fbc4403f63791754fe2aaf2
+DIST kan.traineddata-4.00 49079291 BLAKE2B 3d0e8dd6448ae51506a35b724e960d4d8e6a04c58d81ae1af6ba45b12a7ccdcd265812619898bbbf4684c7a7809e884950e55421d7e70ced19cc4d163b9c3334 SHA512 b407ac1d48f7d60d1e2ad67dffc0a7d0756466bf4f687089f62bbac44d787804048c95ddf83565726fcf5638f9986e11fce163c008bce92b51d42b4016444a9f
+DIST kat.traineddata-4.00 15490959 BLAKE2B 0eeda0f9c317d84dcebb9015792de6e01b140144fc718ff9c01780902a5ace770b0b4b1a7361b96e8246fc04adee087e3c46699fab0781f7a2f87f727286a3bb SHA512 9af3cdfcc0be350a9a2952a478bd5f12cae0a688486dfb391b5eae9a44c28b24a05209b08feb36fd7b27dde86a300bde32b569596854370ec5e08bedcb39efa9
+DIST kat_old.traineddata-4.00 5981988 BLAKE2B ecc8044ef090da97e12da3855ecdd5a01972c2d30544a57ce2835e8142e55e73bfb214a56c899916dc5438351d08ae3706f10c40fe4cf493ef3ace3036ff0ed0 SHA512 d98c6ad4a345726b20178eb018fe521c5e811eaeb79f7eb3c6c2abe4e984bc9bd03cb4644942ea24aa88e01a5972c8e1e3df9374b4f0e5e6464c8f5eb131b74b
+DIST kaz.traineddata-4.00 12616561 BLAKE2B db8f8166bbf8bb90be8295b7a80fbd8b4a3ae89cd4a46bd2caaeeb055dc56b41432aef32679d71c09c22384d60f2d34ce0b9b12b94d70ac3494d1587fa04a7ac SHA512 742bfd1ecd6cc06b1f4c89aecd64439b981d5194933fae7a8fc428b3b761b99f9cf54151c3ab2950a9e3630ffd28ce973e82c4cf3fa6b035a1fb60562c038912
+DIST khm.traineddata-4.00 54152200 BLAKE2B 7ca00baff0eb2b1efe749f823a85f74a72b58364de8e2c58bc85105e5911d28910b6778e86ba48ed0ca25c3895120d9c8d7594023284994ad6b94318c7ea4ba0 SHA512 3d9d096880e75ca6df0fc47548fd31f1035b2527edcfcfc6df926f358fdffc9ef8b8347cf7d58bfe76ed1b0bc8906ec02a0e493bdcdca14a78c251aadca56b42
+DIST kir.traineddata-4.00 13994013 BLAKE2B 20a8dd1c73a599e3cd79e0f9e0ecbf824eb465beaa56728cfd7a7583976e9371a247f0ad8083c1f6645166e1a15c625798158ba2d9c6a113614326efeb0a9217 SHA512 399c4f53a1a6ac8c3895231d15fdd2e564e2fc81b900dacbc1d39fde019f2f881be83ed79c2a7637b5ad7a11be0139275929f4cccaab388583ad107666776582
+DIST kor.traineddata-3.04.00 13309831 BLAKE2B 6a2ebbe51f8c1b5dd426a62b982acaa1b1a7c32f1a9282ccdb9561846d36a77660c8911065a72f80fb353d757b34958292b76dcc25656441e30c68f648df5cf8 SHA512 83d44cc7a870aa3efa6858f09ed1ee50d810e29711b706d6417d2aa79125da13bcd8f50e107dceef93849446a0506d122bfb8ce649f7e1e7181cdf75a6e0e4ee
+DIST kor.traineddata-4.00 19342144 BLAKE2B 3fd755cdfa8d3e73d6c19f4fcc637edf3816f24d36e23ce0a25fa319e85daa4512ce6420a06fadae6e4522f7ab5d57af3a6ca4905bbd0036e92867576a363e25 SHA512 1f932f25b60ec8a1f375bf03b9e51f3457d0259340bb4bed21bcaae44768c5dbfeb3b2dca98b88de89d8b52cc6e38dddee61315d4a286833186e5fdea1e7f773
+DIST kur.traineddata-4.00 2020502 BLAKE2B a2bf3775f976330c9b566ab77d210dbe97b15142ad26883c64d2156cd79322c8cd92368c827f524cecc2732e2b82e45586d161e2f0f9a95efdac5a93e07db835 SHA512 49e0661a2517632543eaeebd8c6468231f811bfca513731c7e5b1b0f6c0f1f1c86e3e8d757bb0cea1af077db46517cbce72cd8d9d71cb006c1ed6a51c9b8d24d
+DIST lao.traineddata-4.00 28962138 BLAKE2B 7c1e71dd68bf206152155a3efabf58e1fda09c8e43131d71d7f004bafd162fb67df433f1647eccbfc6f275271f7ee62c2402c8c3651e48111e4799848b9e6c29 SHA512 75e56e234e544de5c683801be0e0c5b41cec7553f441c302c4ca1936c73afe2a0f467118e5b773d574495d925f54d5607675056674c0908362735c6a1b777a9f
+DIST lat.traineddata-4.00 15241172 BLAKE2B 3711fbc71fb29adfaf5a1037c45550c7fc62a99f281018d20a0a396ae614d58411f6aae15b2de2b2aad44cfa51aec22d0a32be0acc3fe7df2a5ff69a8db0d010 SHA512 fef165eaada48f0c423177674061e05f569a3973e10423a78c2ce8fda21848e421150a9ce47f4185d70a72a344239715b2199d82dc5f609a29681cd85ac53234
+DIST lav.traineddata-3.04.00 7802105 BLAKE2B 40b90aadcab68a1787c77ebc3bceeb120fd4407cad3b7a33ca176cf1741d3b32ce1c4e81b3b793872caff756ec9651bfe7fc99e9721747eca7681024eb4b4726 SHA512 f45f3c722994c627a681bc38b66f64eb7d33563654f35ad838acdc11f66d7290eba3af3cb41aed633af981316f71fe44cc6fc20a0229b6ae20f3a96a1744a16b
+DIST lav.traineddata-4.00 16963807 BLAKE2B 1998b9b2995f81069733292cff42919eba5ef35f61359ede5a339d2667f708038a2ecd3a66e66cab33b07c43e0cabeb00db2b75f87d535f312119954e1e1c084 SHA512 c8ab21a9de64b13fd2e96c8300e77d81bbbc8037ee8cf38cc5ab98f3b81b2cdf969dd4a0b893cb3d545eaa24dd3fface55b3da3cc8350e6e3c8ed71134ae7018
+DIST lit.traineddata-3.04.00 8916163 BLAKE2B 7530938920b957b5affabc2e73deeb5e1c44a1005c5fddb3e5981db3c9b4c42fae45eb5ff88b1b41a9da9fa888ea4679ac2bb36f458c5da81d0251c85874ccc0 SHA512 cebd5fdd1387b919c6327fb8a6337c44787bfcde283e56dd71bd96b22ac4435c2a55418f57c4dbcf11f7174eb4feb736370d2b8f5ed2184a3c8503e13fc404d0
+DIST lit.traineddata-4.00 19560399 BLAKE2B 9d7beb73c7552cee0dcc3d9d3f88d1f4f00890d2f0831d310fd0cac7fb02cd5eedcdca625e998f4fd3c113229443a907d0279ab0c9ec33305d1f71fca9125faf SHA512 e8c7f23bfa87b23a80c15929e0697f6a9a2fee62b298555bcae61aed80f9cb4528e54c92733c844a69f656e98e302a2415cbc4ee54f3c5f2743ffd653fa78e37
+DIST mal.traineddata-4.00 21778761 BLAKE2B 8c61958db17d2cd5b688e4978552a8959b14944e972b221fbb9864f73bf2b9d35fab8a090bdaf83ea16fae2da7900dece202accdd34c0156058bcd95ee5e2f35 SHA512 2b0cb5ea506a91206f3e33c5c7db7e48369cca240aad57e78c9a8b642826a3fdde5b0b1f5d83f8745db4d9ee66f96e6ae8d321cd41ae93f6759c83927c235bea
+DIST mar.traineddata-4.00 26199347 BLAKE2B 726dc5dd7370038b9eadaa1facabdbae2ebff0ded6833e461cda004f7a33dfbb5b4deff6eb59332a27929058bf71ebf6dd458a8e3d3e9661171c09e457432883 SHA512 60fb8db91831476a7bdb70d64f16811a1d244286fd92c2db65b7d53e177aa0141149325d8eb87c29a1935a7942d74ecca36e7153c656c47366a2eba4f35c815d
+DIST mkd.traineddata-4.00 10485081 BLAKE2B ef57817f9aeff720af2f10418b3244e8dc83988ca580b726d9b628c45eafd4e9347d7aa68e8aacf9cda1e5ee6c2fa27a8302b01775c88252a7b1838e79975f0d SHA512 2bd8220e6133c7e60980da687fd8fa25ef227de76326bff70f7e285ffa7d30c05bbc0ae57af346fc17dd37f5c1cf408b976d8983be264687517c292056daf75e
+DIST msa.traineddata-4.00 14604064 BLAKE2B 3367afa1e8d9084a767ecdaf36c0441ad35c1437f95ac480e1b186c5e6706fcdd0a580a386d7bcd80dc2109c2e5dbf76b19a7eb144bc04377fd4549a93901210 SHA512 deb9fba173fd967ea6e92b68f79417c126c3b2d25b67eeb4390a6d27d04e585e27761c1c81ae8c03119a223570bb1bddfe31b13cb5450666253cc1a8fe83b9f8
+DIST mya.traineddata-4.00 75085274 BLAKE2B a1334f89300c2189770812e281d7dbf5e8586a5b87f223f85e90c789345ae881ec012fff94a0a15f3786cb99922cb56c5d76b77804cf0069949de1b1cbf6dfc7 SHA512 681d641eefb389636e59ddd9c3bf23153d0bc0aaf4a6bebeb15af4cda6a9069c78f64e1eea75abcb06aa563ff074ba7b3688d54025c71a073c0e88133bc1d7ca
+DIST nep.traineddata-4.00 24248362 BLAKE2B cb033b55609b9bdc18ae96cfee5315de3ac440f4e40240a692e9025f36106dda67c77bad7fe1e70f04ba8a596dd988a0c455112f56c8f6d753b4f2ee73322601 SHA512 f289a240f2d9c442b8c4cb678d849547dd3c8c187ad4d4e5829c98c925fe07e0763679e04c8a2360a4a0a77644dd191ac31728398a807731ead879896e4f5509
+DIST nld.traineddata-3.04.00 17098919 BLAKE2B dcf0641a78f1c8c6493e504229a08e1d4838d6c808446693b354ea822c7e2afc5fd9c9a1a2b970543c92fd7d4b3e9090dd8a6cd2461d6ac91aade1e1cf150aef SHA512 adffd81fe6fdbc94f790a102940dcbf913d51ab1a75b7ced9818f88df5c9444f2f3eb6363523084f1dd474c98a558e02ccfc32d83ae73af2af180334c1c39a1c
+DIST nld.traineddata-4.00 33075399 BLAKE2B 5fee9b7d29184501f98b490085717f26a626a26e00a133fdaa87e7374c17283b8de2c706f40ab43b1aa9278f6c588c33ca894f374514649dcae5903a24b7a0a5 SHA512 248ac4048b8909e325bd3ca4edbe48f9853eb8fdd8ad9d1950a557706fe45832ada8dac9dbbf033d33fe676101fa81f96de1c691465b77ad84e29f1307eb2846
+DIST nor.traineddata-3.04.00 8262167 BLAKE2B 5ee6362a945e0ba56da6da95fd9a7958ff90fbbb20b978975092410f9d8da7f600f8eafd8587f32065b669b8399a228ccea14db94c9e74f32b1c8b683facc36b SHA512 4e943a2e19b10b3c8c862e23e78c70f6a02d3c2ebcd01a90b7f25a677f92b19bde052a6fa48f640c0d8b7d74769fc7fc45ab1c412339cb0e9e108926be439ce2
+DIST nor.traineddata-4.00 17444731 BLAKE2B 1f8ed7ce296e27226ea12bcca9da0121859ebfded6780222993233d4c1b6346fb9a799efebeb9540ac1bda0ea1cbb80eec49e989005d8d7c81dbdf2199cd6ac3 SHA512 9f439a99e7316796c9d1fe3a562ea056459897d1cb195fe20ede546fe09b46dff9ffcff497b6db1ba1d9e82a914724f7645ef33263fdf9d7a86e5102802ff1f4
+DIST ori.traineddata-4.00 14655225 BLAKE2B f89441e97134a20c6324d07c58b3eabb130228e6fc4e123273b3e496c9862699acc21afd01bab3619d96447329c296d1b545206a72c69210296733f2106ce953 SHA512 532f3b0466675fb15f22888323bdb4bef983204169333b46387820add7f7d9e2d79bda3b65cb7a0825d20da13ca721c1233066592de0145555ccce2da7e0ec6a
+DIST osd.traineddata-3.04.00 10562727 BLAKE2B ddf38d17e76104216495c798827c024c9d68375f60e2ecc264a495986eac502a9f0159b87adaff96b22b562d774036f0a832d520248842ca1a6550b7ec8c9b4d SHA512 c54f481903187bed19cf14c69b24c44044b540f50814de66dff8d35e6987eea71ef4464492a8fae9242fcb22cccbe59e009f3a4dab6c36ad63f78c52ebe9628f
+DIST osd.traineddata-4.00 10562727 BLAKE2B ddf38d17e76104216495c798827c024c9d68375f60e2ecc264a495986eac502a9f0159b87adaff96b22b562d774036f0a832d520248842ca1a6550b7ec8c9b4d SHA512 c54f481903187bed19cf14c69b24c44044b540f50814de66dff8d35e6987eea71ef4464492a8fae9242fcb22cccbe59e009f3a4dab6c36ad63f78c52ebe9628f
+DIST pan.traineddata-4.00 20032828 BLAKE2B cc8d3a24e11dca32e183b5decc7fef04ab54b553d21f045a638391598e7f055b2ca4f15bed6dfe4200b567740e7f3e5211d13fc0c1e95e2d77bc4f9898d8ab26 SHA512 c86547b2ae1dedd259237acd59417cc1a181dcb2960791974dea2dc7cfeaf1d7604988c892ae40b5d51b63573d3fcbfc24aa87e2e068f532ecca730cd3395872
+DIST pol.traineddata-3.04.00 13918058 BLAKE2B 5531bcda6cbe2a27655f3448b5093fc1cbd1167e91fe3bb410a260062a7163790667d43954d880b20df23d68d73f2aa2933d425a8651b2c3ca7c8387486b876a SHA512 e1730d8bdbb296d223000747aea0dfd9561401e17f37518f4f7ae6c1b13cf500f5f359df465013112e126fc426e3e940b5dc98f84bdfc6517a73a1f8e8fc4c10
+DIST pol.traineddata-4.00 25941386 BLAKE2B e32f7bd871463ef49804195300dbd5abbe2f0b57b42061b7f5a727087bc452358620a775ef66a6b8f1924ff47382e228b18e18b81a0ca7593e537d61efdb1ae9 SHA512 42442d52aa1afa52274b307994a1470bd643b017ab3effde0a61e44a22463fd17cbc516cfe2bcd3bb9964782315b08a95d1dd7b40d3f31c04fec8109fad224ba
+DIST por.traineddata-3.04.00 12914622 BLAKE2B ed0edc8440ebd3f2e9df7dac9ed399df79ca803d16a1396434cb058424637b123af54b0f970120b54d21c00d8a0b1fd387a12bbd200d5a85ed1d49bfea297026 SHA512 cf771fb86aad468d73c879049382b4c88b978eb9ac450472b1729f2cc86e713e5ffe5bdd3f226e3f6e6340e38e115d201046849428b05c2a3bd406eed240ea03
+DIST por.traineddata-4.00 21457953 BLAKE2B 48968b2680ad161f20a6e51bbd6da47c9b9e60657702250348900e27ddcd39f2a9482bc0bb331570e1db3c5aea9190194287938c4f249025bd73409f54c46009 SHA512 5bc95002bda1fd0cf15d3be6d417fcda952417c5a9e08c46f3bcce859e89be2359ec4bb15199bee0cc72b407251b7b4ee655d67d46f8738bf29bf2b12bf3b29d
+DIST ron.traineddata-3.04.00 7957608 BLAKE2B f17e0e139bb0c5b12de89b82b62fa3014ed6129c60278a751994fd107a4ee310f991ef425296e3f3e3f44387ec8fa22da4e6b29127d7a7f5b31140240b79cc9c SHA512 921aec7e0e91d7bcb3b85e2b0c5544b105cb01516c100eac21caedfcf27da678c392574c3dfedc81ff52571a8702c91ee76529ecea2b6bc3e155f6e2c56b951a
+DIST ron.traineddata-4.00 16545516 BLAKE2B 805a76320f74ba0047c726226115b056ac99334376883a2d5b824ff406d87da5334d9e0fe523aa6c22a04404c45bbfdfd3e250ad6a881b437e35697bb787f260 SHA512 045eb12025bb4e85edd7f82407287e451432411303a17bfe2ae13327a99f568903fa6b105d3fdd6ab066161821106485dbd8d44931b2eb357cd6145adbcd3d65
+DIST rus.traineddata-3.04.00 16152507 BLAKE2B 329619a15cfb48c04d1d4e4bf902e090aac9ffaa1998a26a8861dc24ddb8d9727d473024dae44a43b7ff29f0079cb87dd60dc1a49d2e310249eb05999daea839 SHA512 e5053d8b53a676d800f490276172f16f2754e009408164958ad2f61071906042c299b23fdd3dde4a10026e42b19d03f8a8ab7de2fc29d8b9843d30de5c36a335
+DIST rus.traineddata-4.00 28115168 BLAKE2B 331d490fdd50f77c3c02ed01780af28431e531f6bc4b45ce889e9be2c63a8de02c45d9b503871dbf4a2eabbaedb9d8b448f6a4764bd4601ad2033ef4dc229acc SHA512 4a4524a4759b52e7936518c37aa3e60032537a5a2e11fc8ad5e48bf92a2f8efc54cab3962db5e980b9d894dcbf791ad796c55b875eb95b7f03444eb75c1cedee
+DIST san.traineddata-4.00 44276691 BLAKE2B 0da566cb2b5f576e601610b6532f0661c88efcb2d1570dd754b41a9abb4f5e3ea75bce3f34a8631b13cce6c1369698dbfe79e397d6cd99f1072d81004b60eb5d SHA512 97c266b3dd7b557575004d432ed7ea09ee44cf168d8f00a0dc544ebcc4df736c175a88f9c0b45a600d99eb7b3616bd2ceb96ebd2eae67b43f9d38bc35736d006
+DIST sin.traineddata-4.00 13528944 BLAKE2B a7d7be01e740373946069aaf2d8f8695aa6a9c958c09ca0de7d904d915f6dc803d734702a279fd630cdf3e3f6cc35977938a05fa298f1e2d5cbc7d3a6e3677b9 SHA512 1dc149d2c9e1c394d2945a6c41a9885ba05a82b6b629f87157d8439932066fa54b5316aba0430c4f861703a8aabc3cacc1577992d68869a988b11d4b93c71140
+DIST slk.traineddata-3.04.00 9126966 BLAKE2B fba32bf08f14a2e354b298e01b900f7e7b0aa6082c78214a19b2a11a9b2cc73a0ab9f70453888860b3e1db5b450c1934099375c258d363b32ea497c2833335c6 SHA512 33fbb9ee9881eb68b1e75cf9c7cacc31f306bb4371139894271e34e201740325ea26fb9622e4cf980a6c3a162568927a4085c5f63d483146fa2b2fe3d4b85a96
+DIST slk.traineddata-4.00 19335882 BLAKE2B 2b7f901a4530c79bf790bc0f5e79671b48cb6e919a87d16ddca29e6229a2b36d7b7b8793e5e13c8affc18f49969b09ac4074a354c56b7b2c78ce04b5d6cb3729 SHA512 f72db1f57ffab113424d872ad97f8b1381c2be1ad2b8f09f6b4a5a75eb59d5f53e3319160b451fd6313ee8cb0606afd089f4051580d4af4dfa7706814d89bf7b
+DIST slk_frak.traineddata-3.04.00 845250 BLAKE2B 623c43315b4fc842811d4f165d19f82b1141c22d78e1ae98ec31b5b05df31f7c05702f30a37043c7bfe6bb29b8f7648f50445e7a2f4b1de666599b211c1de6b6 SHA512 89b794f06772982ec63e317e95ba1c6b611881b8363b645ebfbb4e7c29f914545162401d4766d1b3247ada6df1fa1d7cc02ea539a746fd6839c45124e9e68ae5
+DIST slv.traineddata-3.04.00 6824064 BLAKE2B b9e804194e82b3f7358cb794ca0eea0766e9166e76d0d48f6be57b431c8ea4d88884adb4dc68dda24e07d06ced018992cb9e4690d5778ae192fa9aa533ccd8b2 SHA512 26634af8d9585f293d4af38c0bd6bd7c552edeaa59e3f2ab1e170431f40ba172ca455ede49df90a0b97b4da253b3a96394f4729f6a349361c3e954f2f59e2bbe
+DIST slv.traineddata-4.00 15472904 BLAKE2B e701dc8e30147cf3779414bcf95e30344e661f0eee929a419d9f30892fe7ebd39ed87b5a2be6073f06be06b03cdbe25e74bf987e23290d353d3ad4d6ee2c947d SHA512 975542196c706e98430e5e8fd9673d03ada91a829c0b0744bacb6fbbbe93d22f3fd36de4993766fdbb76f3902e4e7bdcf59a4b51a0c452130b3a368d0e645208
+DIST spa.traineddata-3.04.00 15953087 BLAKE2B 9eba61ca27a8697b4e671d8f0d1626500da4c18f046b51fdd692576e5b9068898a75663d2745cd21345a6f3df5108b358624b7b7a264e3c3d4baa34cf0631771 SHA512 e1356c0948c9245fecd335b1b7dd3c84c56b09210e84c5d211d9ddfb2bd3aa232c97f8e8d03f2a6639120c5196aa4222a8385da64528261c7cf137cd64b214a8
+DIST spa.traineddata-4.00 25107848 BLAKE2B 6ac79f12ae4a06b1843e6df713b61abfd4933f17e61e783e57c2049cbb8cbf82962eea6e1280d975004d9efec4be463ffba4be2416204d63587d25321c698f26 SHA512 5d009401faa71d3a8e9c4ff32dd1efc5e38c02b8c4170653ebb33874e6c489f7556c67ce6ca7cee27500496f657cf4361314563576176ff5e545b8079722bb8f
+DIST spa_old.traineddata-4.00 26019934 BLAKE2B f7c7383ea812fef6ea9bc15083a78880df71d19dc9ea092102e78bad9a7cdea4fc88d8a96201d8f403757c366a6368ee0c59b8af0163b9ff33486672a19a24c9 SHA512 b50c9785e6962defd3c9373272581eefd476405e8b0f20d4f692a99137af01319ec92af0c51207d724d4f83852c789c2f5109cc6f47a1a79080d5024926ffc7c
+DIST sqi.traineddata-4.00 14827880 BLAKE2B 6af1b9033aec450f44a4cc37e9df71970a60a60d1b53151182ea39da2c85e7e638a5174b45256fd04aec05c174d13b4dbe7861767c0ae186f787df2c776aff0a SHA512 56a2e2486f05498f6fd136f27406eafc218e2c9328274c60c4bacc5f51289d3b99810c305da76e5ab3ded05ac1c33bc822b367394bb030dc7f2f6bda3092a4fa
+DIST srp.traineddata-3.04.00 4611681 BLAKE2B 08c3814a6463a279fa4111d9c94161ec43c84e6479436734e067ae5aa9b17d09ed02a74ea814ffe389e625253599a757b2bb5b866d1ca0e8991308658f57585a SHA512 41925f957f9b30617746072216dbfb642d55caebdf95f8c322fbc78cf6040b85ed3bb91e81c3114830504189fb8e9f33a3150878a571ce714345e9d87263ac2a
+DIST srp.traineddata-4.00 12189572 BLAKE2B a3ad3417703807dc4f74b4ba79af8038a96b3dcb1cc56d1370a9c41d1508d6981a146c6dcac833e0d88c690de8a488fc9c2bfaca97035baa048e3c993d9c73b1 SHA512 69f7703d48cc3e6cd1d2d40d1012ead58a3905beba6787cf0276c0268d142f64bc7116ab43c6339eb8704ebb293ec25c2041093b4eca8cc76d64cf432a95f26d
+DIST srp_latn.traineddata-4.00 14395288 BLAKE2B 08fc69718d64df4d785f3943482c7cd1e09345a18312c1de8661a0d1db0e926322854e0b02c3c44e516b00b42e19153268849de6d41de494d5ebd2e715221d4d SHA512 65644d3f7e01cc77038a438d438707f48f5dda1827f729e793fc478a997afe84388d51993e18b31833f5b1a3f37b183112ec1459bdc3184ccce3f6dd361c232b
+DIST swa.traineddata-4.00 10931654 BLAKE2B 6d3861b636c06dd7e03a04c50c48a8b736afc91187ec4bfa44a58563f20207af2472da7832955c02681d53d12384ccac65058f0b2fca6ba5b0a027e99f0cad05 SHA512 bb865197fe1558ea8b63a83d68906a7f2a12aadcdba2904f1f01f15db4576e96d942b8a2c684ee3a049f2cdc3997b9e6ca49faf531b1d885abe7228a50af2d2b
+DIST swe.traineddata-3.04.00 9460295 BLAKE2B 766bcd64e506eea7014975de1ddf6cffcf8610d23e38ddee77ac00125eed6c3db9c434c9f1d111a9fbfa64543b230743e1cce141b19201c7c94c96967bc35141 SHA512 d69c916daa5946d11129e5401f0b8d9b8965df7fa2223e78c8e607e2bcc102a91c875a86e6a737612b61823ebd7f331c3d4c5db28ee35d1fb830beb9414bd167
+DIST swe.traineddata-4.00 19062525 BLAKE2B bcdd4b24e671c47d7c4e2bc88c19c9257651214b8eb4d7714e3c7fe8744ed0949a31a195e2daac6eef6e94439bff9a644bb794c386e7c32eced96b9aa1771694 SHA512 634c75641d27026afa84e4179889673bcc1dd6eb56459894612e0148a3e70862c82e5e92832ea83e066c128cb5646eec90a0b36f3cb4c789128b43cc27117450
+DIST syr.traineddata-4.00 8056121 BLAKE2B bacf6ee42b8a9dac7042ca2608ec72b6db1a760f505e3325105141a24395d7e4e35fed3fe737785e92232bf89584822b46af05e97308f76edad0c7bd28a048e7 SHA512 c79acc0bde79d7f38b5ddd34683615886d7c284040273849e4b31dd988c4c0ac1617c0f6ef9d246b47eaade5ad5fdfdc4bf99dbb29e2d33c3827927135ea6f06
+DIST tam.traineddata-4.00 17333471 BLAKE2B 67e4b10d8e9fab5df8455b35483972d5543ccf76d7440e7b1c9c8fe89a3cc4e19359a8695b1410004e202b138b8524c000487fdf2ee26247c0a2d4190b7184ed SHA512 9ad90eb8c291712e4cd874d41ed9bcd4169427a50509a353f5549382909458b46a7e4a092dec0d475c548e681426a81597c577f2f821978405a94f965fd4d05f
+DIST tel.traineddata-4.00 54446537 BLAKE2B 0ecb044b58017e36a6d9e28927242ecb6ac8975f079c42c78a661faa87ac1ed7f9d38fd59383d3ca1b484fbf371aeb5e872765921d4b79066a938b88671a3d9f SHA512 5e5c2ca84f095ec4dd3184d6cb75702482c699b5cd04f8750ab8958f578f7b24cf3253a83d19a4a1f3716466b95a81737d473339e3593538e46372c4588febb6
+DIST tesseract-3.05.01.tar.gz 3574810 BLAKE2B 0af97d0a58c05ce4d6f8fb3f76302344f75b5894b036adc327ecc79f90f2b41da58c8145509dc131706e806e291355e221482980294e2c9caff4be93d9b448b6 SHA512 a49c20c98386684cd89582e57b772811204fad8e5ff18214fb0da109f73629c70845054985e31e8deeb49107fbcf56e546aff661f08eb5dd60fbf83dbe976e81
+DIST tesseract-4.00.00_alpha.tar.gz 3706567 BLAKE2B e3790c95ca7f219a3e1a90de09b9464bc54210d6f553132d4fa9e39f0afe56e458e16424a10a1a6e6461e8e98a84fbea826542a32d3432533165a9d400a416c4 SHA512 282ec941233ceb80fe1008e585a6069fe8ecd6bf2dd1d0f56e2e79b772a0b83bca918d5da892a6cab194a7828607e41a7fd873acec33181b8b86c3c37e434103
+DIST tgk.traineddata-4.00 6555909 BLAKE2B a3023ec0fa10e3f52e5059b20da48a81eaa90b6665b55b50ac74d7f1f4acea3d7b6eae9f00f2a0a1f58798eb15d976367145d72976db1dd019fe249cae36a1b2 SHA512 abc5f2c4ac91b17a250f2f4847c9528a7673d51230415b7a069dc7243e2c210564400d34d5c38da6b727c8c24af26cbde3e7ef8a9674fa1605da001b4b1b60bb
+DIST tgl.traineddata-3.04.00 4114554 BLAKE2B 1cbd5e20fcf5fa7ea183daa76e1d09d7bd4427ce2456de49f23e374af8ae48219a32f71a25d0a98c26c79ac87dc4f8f68621c76fad85b6105561f5285d635c8d SHA512 8c205fd0d4b2fc774e5b6a19cb56dcdb91b7d001acd881e34363e437d5eeae8615b853ae09f93c4957328d3a423300b9a20a443ca971a14ede1867de6194a2bb
+DIST tgl.traineddata-4.00 11991699 BLAKE2B d888013c0416c1e057522ec828e2c2b4470d50b55b6de580ecf20090771cd6726167ca1dc66f02afab1f7c369035db1ea84cb0c7ddcc36d37820c0c065648986 SHA512 fda51303a8963432fa541510287aec32ea9ee7342e0ca7dfba4f40c5d352aec74bf7982bc469e12196d51a8906dd224df01aead0d14859102267e7ffd19f0380
+DIST tha.traineddata-3.04.00 13565168 BLAKE2B 1fe254a7ace923a88579c46111a0be81ad7cac9d60d59189e26fef6c11469da26e86ca867ff97cbf1b83fc501d6e48fee0e729f6e73e7f5a512e7b89998475c2 SHA512 1f8750ee148a6dc5677441bdf8b41d09594b591c34c7fc0af1923a89acf9db76f12ab3ed136819b6900b70ff393fd586054fd383a427ca70b4cf9aecb6db029a
+DIST tha.traineddata-4.00 22477903 BLAKE2B d7c63754511c3769d12b424b7fd30c700f184d470dc4d1e12a861beca1f2574023f76ac7f308e4c6f1f0d289b3f428d6a677b65cb1d4b3fb1217a348f5ff59e7 SHA512 b4349650ca1f2a5317cd2691a9fa97afde1c22872147829a71b0c49cdffe7b8a732c9aafcb87fe12431e0bc897a82e48204e5d2369e8441a654aa3baa4d41096
+DIST tur.traineddata-3.04.00 14069931 BLAKE2B 385714a9fb0efa7a8299de7152729a7f7e12a29d4c33cc4df6c5592bd1ddca145acb056caaf93f077279489c3a12e2d95285d0790979cbb036206ecdab910080 SHA512 822b51bf9836f0d2b5923fc8ea14690a16d6e1831dc8828d0aad7cb4bda2bcec06ba7cdc79187d48b93e3541dfd46f1f50dc44dae504af9dd7a788052a05b51e
+DIST tur.traineddata-4.00 26503738 BLAKE2B ad1b7eec15dfe5176e0ee607b8eee5dd2e860601b8c838374a7bf85c890bc4013789144508aa78b3f613bdaa534a5c24a1b3b1330fd47c5747aba04a49050ad3 SHA512 03b58b9757a975a2b6101ce62cf12a13ae1b167bb3f8c8fb9384802ae6427af5f2182600972412c942d706a37b624ea49cd7ef3bab7244e7dd7bd765e011a558
+DIST uig.traineddata-4.00 7657636 BLAKE2B c1ff74721c689f5e8db24d3dd68f55c0e3cf4d3650f1764b65596e404a82ff25fd4fbc90b5a8cc504639fae005ba943999a35ab7811b8274777bd40dcba28128 SHA512 fc53338b875bd8d104f196e59b66e070fd789d8a58c54f04cf5b788bb83b4b83c5c9b6f1b1f468619358e833e436e1bd64c2b6b52e8499f5cd6189ebbdee3ddd
+DIST ukr.traineddata-3.04.00 8043189 BLAKE2B 3435bdbdac2e4f343479515632f54345c96b9d626db6cdd8dfc190c4b8dd0919e6955db8ccea45dba2877b4959f3146cbdc5472a1fb813093232de8ea4d97a20 SHA512 16117151debf90d79eb9f84c0b215b1d9d72d5b61bbf0004330b34b1502388f7d81051ce5ce296720dd10f53ba08f1e15cebaf4030330b5a071810612f78e0ef
+DIST ukr.traineddata-4.00 17775376 BLAKE2B 9d9b2edcd76e858f041edb3f04c29fb1c630fd9b250f982f6445baab8c256262f9f444eab69226ba50a8e647d2aede24d4478bb44c86c67deaeafaddcd5eb826 SHA512 26f02bd7d4c392beb3ec174041685d6eed0b6a2f0d7102d6dea271e94bfc8bbbbcb4d74bb34e72357cb3de7bd72f7e5da2d7fa576b98374f9a0938b2b52c9c81
+DIST uzb.traineddata-4.00 12505562 BLAKE2B e0fb586d07d70e13c03e2ae0ce7a9749528196ab6348cfc87f9cbb203d6ab1fded029549f6aef014e4d5a171feff4b41bd38190340c7e84582f621f5cff1cd21 SHA512 dd7579e62d5564d22945447d471bc288abceab99b21e224ec9adafc20899cf708e7fecc5c2c0133171f6a6841d56c04743a0b7762ee021e6b5d5f678e4cdc05c
+DIST uzb_cyrl.traineddata-4.00 10390622 BLAKE2B 055ad7b767d5e919cf386f3a1b2902bdf21918b7e7604d83b4e002f248c3ae209326c1cc78541bbdf58a12c96e7e072f5d935c76053bd7b65090191f9b0956af SHA512 d2e82371312bdeb3e4db73bb74270553165df2f4d2b62ae7de474286c8c02e27f7c5401c3857c60d0d1de3d02b9106e396de7cfa167b82bb8a874101498be0e7
+DIST vie.traineddata-3.04.00 6096118 BLAKE2B 2314880eef055eade892e788cc1458ca1b4b3ee3a8ce7c8657ab7d36c2f57556d21045094f055961ab0ecca38300d4c986162ee79d437e706a8e54c35b552feb SHA512 51087e2141051906a1815798175ff8b9f214ae36c7d87cb60999489ccc684307ea7ef65c5ae4024f95c51b89084ab9f0e8dde0a4d480eaf78dceebfba87350cf
+DIST vie.traineddata-4.00 12209616 BLAKE2B cd1eb9de7a319240b5279f7a7190244fa0c4ce4cbd40493d9b56b13ecc42e9e2b9030fd8ad80e44e8c784f344b0eabbdec65373135bffadf36cd79b25f19bd4d SHA512 6f73647d8fc4df104eb8a8b9444bb46e0ee7560dfff3c33055a791a17a9ffb78a857dac2aa0219c628469eea636f89eb1551151fd79d7ac8c2d4a09c68765560
+EBUILD tesseract-3.05.01.ebuild 5839 BLAKE2B 601d39333d3b9f48116991182b43b9bdcd8d4e0075ca2f0615c42c3591dc1e8ca2aebc9047b658698a406784e145d42285c371155d7e2d35668827ee7fd6ab8d SHA512 bb8df48c8865a06bcc79cf8fe32744761faff9a57ccb0e304a0dd09ee386ad4d9eddbe2e1ebc2fa815f1b62369c758ded77e9b45b69573e49a95579f554ccd57
+EBUILD tesseract-4.00.00_alpha.ebuild 4167 BLAKE2B e638b8eb2a49dede24bc822a28da5d5e0671859eb707f28e8fd8de02b9f7e6db4d370d94b9a651f0072632d9f5cf4da809c128eb2a58636a7cdb6cff3eb35172 SHA512 1fbd99257210baee6791dc8fc4b3faa39b86bcbf786ed9c1a4da521c7b5b4a0c48a9c74596d589fcbe07767cd104490ef1b5c72beaa7226bdcfac373f30eed03
+EBUILD tesseract-9999.ebuild 3975 BLAKE2B 7aec6a728d49f1c50a7f12c15c17c37280c7cf38495fe375b37f5203da998c7fd1967fff4b1326d9cbc3ca8edbcb03e5ec16d63aaa2ed1129eddbffd9dd13bba SHA512 f1c5f75693a6eaff06a193113266020cde1bdbba7ba291ae7e6aad94fd7a94401fa03ac3f8ea2fdcd27417438045fac83a242027fb34ae836d6bfb0e77ad1f13
+MISC metadata.xml 1271 BLAKE2B e2f8b18ee6fa20f2c059c5fc99e242743cc30153e783874e3b43ef7185b0f5827d611884dfa98242ec442edd8adf278fdc389731d61e9114d7549df934b6f7d9 SHA512 7ea459bc822290be824fc07b7abe26e13ad537e932b5cf71925e654f191fdee4d8681fabdd9a7fb246e87a9a365a8c0d6f933e34217aff24eb8bf3d741369656
diff --git a/app-text/tesseract/files/tesseract-3.04.01-use-system-piccolo2d.patch b/app-text/tesseract/files/tesseract-3.04.01-use-system-piccolo2d.patch
new file mode 100644
index 000000000000..a9dd00419347
--- /dev/null
+++ b/app-text/tesseract/files/tesseract-3.04.01-use-system-piccolo2d.patch
@@ -0,0 +1,27 @@
+diff -U 3 -dHrN tesseract-3.04.01/java/Makefile.am tesseract-3.04.01-scrollview/java/Makefile.am
+--- tesseract-3.04.01/java/Makefile.am	2016-02-16 22:27:01.000000000 +0100
++++ tesseract-3.04.01-scrollview/java/Makefile.am	2016-08-09 13:18:12.810503862 +0200
+@@ -36,10 +36,9 @@
+ 	com/google/scrollview/ScrollView.class
+ 
+ SCROLLVIEW_LIBS = \
+-	$(srcdir)/piccolo2d-core-3.0.jar \
+-	$(srcdir)/piccolo2d-extras-3.0.jar
++	/usr/share/piccolo2d/lib/piccolo2d.jar
+ 
+-CLASSPATH = $(srcdir)/piccolo2d-core-3.0.jar:$(srcdir)/piccolo2d-extras-3.0.jar
++CLASSPATH = /usr/share/piccolo2d/lib/piccolo2d.jar
+ 
+ ScrollView.jar : $(SCROLLVIEW_CLASSES)
+ 	$(JAR) cfm $@ Manifest.txt com/google/scrollview/*.class \
+diff -U 3 -dHrN tesseract-3.04.01/viewer/Makefile.am tesseract-3.04.01-scrollview/viewer/Makefile.am
+--- tesseract-3.04.01/viewer/Makefile.am	2016-02-16 22:27:01.000000000 +0100
++++ tesseract-3.04.01-scrollview/viewer/Makefile.am	2016-08-09 13:20:57.788318147 +0200
+@@ -17,3 +17,7 @@
+ 
+ libtesseract_viewer_la_SOURCES = \
+     scrollview.cpp svmnode.cpp svutil.cpp svpaint.cpp
++
++if !GRAPHICS_DISABLED
++AM_CPPFLAGS += -DSCROLLVIEW_PATH=/usr/share/tessdata/
++endif
diff --git a/app-text/tesseract/files/tesseract-3.05.00-no_graphics.patch b/app-text/tesseract/files/tesseract-3.05.00-no_graphics.patch
new file mode 100644
index 000000000000..d6250d66c056
--- /dev/null
+++ b/app-text/tesseract/files/tesseract-3.05.00-no_graphics.patch
@@ -0,0 +1,74 @@
+From 4141de7f8ddb5ac3c39fd9c1fc77ed911c768c3d Mon Sep 17 00:00:00 2001
+From: Bernard Cafarelli <bernard.cafarelli@gmail.com>
+Date: Fri, 27 Jan 2017 12:02:54 +0100
+Subject: [PATCH] Provide SVSync::StartThread() with GRAPHICS_DISABLED
+
+---
+ viewer/svutil.cpp | 44 +++++++++++++++++++++-----------------------
+ 1 file changed, 21 insertions(+), 23 deletions(-)
+
+diff --git a/viewer/svutil.cpp b/viewer/svutil.cpp
+index 34a2286..84a4b94 100644
+--- a/viewer/svutil.cpp
++++ b/viewer/svutil.cpp
+@@ -83,6 +83,27 @@ void SVMutex::Unlock() {
+ #endif
+ }
+ 
++// Create new thread.
++void SVSync::StartThread(void *(*func)(void*), void* arg) {
++#ifdef _WIN32
++  LPTHREAD_START_ROUTINE f = (LPTHREAD_START_ROUTINE) func;
++  DWORD threadid;
++  HANDLE newthread = CreateThread(
++  NULL,          // default security attributes
++  0,             // use default stack size
++  f,             // thread function
++  arg,           // argument to thread function
++  0,             // use default creation flags
++  &threadid);    // returns the thread identifier
++#else
++  pthread_t helper;
++  pthread_attr_t attr;
++  pthread_attr_init(&attr);
++  pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
++  pthread_create(&helper, &attr, func, arg);
++#endif
++}
++
+ #ifndef GRAPHICS_DISABLED
+ 
+ const int kMaxMsgSize = 4096;
+@@ -186,29 +207,6 @@ void SVSemaphore::Wait() {
+ #endif
+ }
+ 
+-
+-// Create new thread.
+-
+-void SVSync::StartThread(void *(*func)(void*), void* arg) {
+-#ifdef _WIN32
+-  LPTHREAD_START_ROUTINE f = (LPTHREAD_START_ROUTINE) func;
+-  DWORD threadid;
+-  HANDLE newthread = CreateThread(
+-  NULL,          // default security attributes
+-  0,             // use default stack size
+-  f,             // thread function
+-  arg,           // argument to thread function
+-  0,             // use default creation flags
+-  &threadid);    // returns the thread identifier
+-#else
+-  pthread_t helper;
+-  pthread_attr_t attr;
+-  pthread_attr_init(&attr);
+-  pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
+-  pthread_create(&helper, &attr, func, arg);
+-#endif
+-}
+-
+ // Place a message in the message buffer (and flush it).
+ void SVNetwork::Send(const char* msg) {
+   mutex_send_->Lock();
+-- 
+2.12.0
+
diff --git a/app-text/tesseract/files/tesseract-4.00.00-use-system-piccolo2d.patch b/app-text/tesseract/files/tesseract-4.00.00-use-system-piccolo2d.patch
new file mode 100644
index 000000000000..ad1f0f3df208
--- /dev/null
+++ b/app-text/tesseract/files/tesseract-4.00.00-use-system-piccolo2d.patch
@@ -0,0 +1,27 @@
+diff -Naur tesseract.orig/java/Makefile.am tesseract/java/Makefile.am
+--- tesseract.orig/java/Makefile.am	2017-01-30 17:20:23.135458366 +0100
++++ tesseract/java/Makefile.am	2017-01-30 17:21:29.834462557 +0100
+@@ -36,10 +36,9 @@
+ 	com/google/scrollview/ScrollView.class
+ 
+ SCROLLVIEW_LIBS = \
+-	piccolo2d-core-3.0.jar \
+-	piccolo2d-extras-3.0.jar
++	/usr/share/piccolo2d/lib/piccolo2d.jar
+ 
+-CLASSPATH = piccolo2d-core-3.0.jar:piccolo2d-extras-3.0.jar
++CLASSPATH = /usr/share/piccolo2d/lib/piccolo2d.jar
+ 
+ ScrollView.jar : $(SCROLLVIEW_CLASSES)
+ 	$(JAR) cfm $@ $(srcdir)/Manifest.txt com/google/scrollview/*.class \
+diff -Naur tesseract.orig/viewer/Makefile.am tesseract/viewer/Makefile.am
+--- tesseract.orig/viewer/Makefile.am	2017-01-30 17:20:23.176458368 +0100
++++ tesseract/viewer/Makefile.am	2017-01-30 17:22:39.281467163 +0100
+@@ -17,3 +17,7 @@
+ 
+ libtesseract_viewer_la_SOURCES = \
+     scrollview.cpp svmnode.cpp svutil.cpp svpaint.cpp
++
++if !GRAPHICS_DISABLED
++AM_CPPFLAGS += -DSCROLLVIEW_PATH=/usr/share/tessdata/
++endif
diff --git a/app-text/tesseract/files/tesseract-4.00.00_alpha-isnan.patch b/app-text/tesseract/files/tesseract-4.00.00_alpha-isnan.patch
new file mode 100644
index 000000000000..4ae4c8150a61
--- /dev/null
+++ b/app-text/tesseract/files/tesseract-4.00.00_alpha-isnan.patch
@@ -0,0 +1,28 @@
+From beb564df82204078563bcbde4e569caac2f7a2ac Mon Sep 17 00:00:00 2001
+From: Stefan Weil <sw@weilnetz.de>
+Date: Tue, 22 Nov 2016 11:31:01 +0100
+Subject: [PATCH] lstm: Fix compilation (undeclared 'isnan')
+
+gcc report:
+
+lstm/lstmrecognizer.cpp:608:47: error: 'isnan' was not declared in this scope
+     ASSERT_HOST(!isnan(output.f(t)[null_char_]));
+
+Signed-off-by: Stefan Weil <sw@weilnetz.de>
+---
+ lstm/lstmrecognizer.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lstm/lstmrecognizer.cpp b/lstm/lstmrecognizer.cpp
+index f648e16..babfe50 100644
+--- a/lstm/lstmrecognizer.cpp
++++ b/lstm/lstmrecognizer.cpp
+@@ -600,7 +600,7 @@ void LSTMRecognizer::LabelsViaThreshold(const NetworkIO& output,
+     ++t;
+   }
+   while (t < width) {
+-    ASSERT_HOST(!isnan(output.f(t)[null_char_]));
++    ASSERT_HOST(!std::isnan(output.f(t)[null_char_]));
+     int label = output.BestLabel(t, null_char_, null_char_, NULL);
+     int char_start = t++;
+     while (t < width && !NullIsBest(output, null_thr, null_char_, t) &&
diff --git a/app-text/tesseract/files/tesseract-4.00.00_alpha-no_graphics.patch b/app-text/tesseract/files/tesseract-4.00.00_alpha-no_graphics.patch
new file mode 100644
index 000000000000..6707ff093644
--- /dev/null
+++ b/app-text/tesseract/files/tesseract-4.00.00_alpha-no_graphics.patch
@@ -0,0 +1,143 @@
+diff --git a/lstm/lstmrecognizer.cpp b/lstm/lstmrecognizer.cpp
+index 1d4f0f3..7192ba7 100644
+--- a/lstm/lstmrecognizer.cpp
++++ b/lstm/lstmrecognizer.cpp
+@@ -16,6 +16,11 @@
+ // limitations under the License.
+ ///////////////////////////////////////////////////////////////////////
+ 
++// Include automatically generated configuration file if running autoconf.
++#ifdef HAVE_CONFIG_H
++#include "config_auto.h"
++#endif
++
+ #include "lstmrecognizer.h"
+ 
+ #include "allheaders.h"
+diff --git a/lstm/lstmtrainer.cpp b/lstm/lstmtrainer.cpp
+index ab66702..fd3f247 100644
+--- a/lstm/lstmtrainer.cpp
++++ b/lstm/lstmtrainer.cpp
+@@ -16,6 +16,11 @@
+ // limitations under the License.
+ ///////////////////////////////////////////////////////////////////////
+ 
++// Include automatically generated configuration file if running autoconf.
++#ifdef HAVE_CONFIG_H
++#include "config_auto.h"
++#endif
++
+ #include "lstmtrainer.h"
+ #include <string>
+ 
+diff --git a/lstm/network.cpp b/lstm/network.cpp
+index 795d4a5..791848a 100644
+--- a/lstm/network.cpp
++++ b/lstm/network.cpp
+@@ -16,6 +16,11 @@
+ // limitations under the License.
+ ///////////////////////////////////////////////////////////////////////
+ 
++// Include automatically generated configuration file if running autoconf.
++#ifdef HAVE_CONFIG_H
++#include "config_auto.h"
++#endif
++
+ #include "network.h"
+ 
+ #include <stdlib.h>
+@@ -277,27 +282,31 @@ double Network::Random(double range) {
+   return randomizer_->SignedRand(range);
+ }
+ 
+-#ifndef GRAPHICS_DISABLED
+ // === Debug image display methods. ===
+ // Displays the image of the matrix to the forward window.
+ void Network::DisplayForward(const NetworkIO& matrix) {
++#ifndef GRAPHICS_DISABLED  // do nothing if there's no graphics
+   Pix* image = matrix.ToPix();
+   ClearWindow(false, name_.string(), pixGetWidth(image),
+               pixGetHeight(image), &forward_win_);
+   DisplayImage(image, forward_win_);
+   forward_win_->Update();
++#endif  // GRAPHICS_DISABLED
+ }
+ 
+ // Displays the image of the matrix to the backward window.
+ void Network::DisplayBackward(const NetworkIO& matrix) {
++#ifndef GRAPHICS_DISABLED  // do nothing if there's no graphics
+   Pix* image = matrix.ToPix();
+   STRING window_name = name_ + "-back";
+   ClearWindow(false, window_name.string(), pixGetWidth(image),
+               pixGetHeight(image), &backward_win_);
+   DisplayImage(image, backward_win_);
+   backward_win_->Update();
++#endif  // GRAPHICS_DISABLED
+ }
+ 
++#ifndef GRAPHICS_DISABLED
+ // Creates the window if needed, otherwise clears it.
+ void Network::ClearWindow(bool tess_coords, const char* window_name,
+                           int width, int height, ScrollView** window) {
+diff --git a/viewer/svutil.cpp b/viewer/svutil.cpp
+index 34a2286..84a4b94 100644
+--- a/viewer/svutil.cpp
++++ b/viewer/svutil.cpp
+@@ -83,6 +83,27 @@ void SVMutex::Unlock() {
+ #endif
+ }
+ 
++// Create new thread.
++void SVSync::StartThread(void *(*func)(void*), void* arg) {
++#ifdef _WIN32
++  LPTHREAD_START_ROUTINE f = (LPTHREAD_START_ROUTINE) func;
++  DWORD threadid;
++  HANDLE newthread = CreateThread(
++  NULL,          // default security attributes
++  0,             // use default stack size
++  f,             // thread function
++  arg,           // argument to thread function
++  0,             // use default creation flags
++  &threadid);    // returns the thread identifier
++#else
++  pthread_t helper;
++  pthread_attr_t attr;
++  pthread_attr_init(&attr);
++  pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
++  pthread_create(&helper, &attr, func, arg);
++#endif
++}
++
+ #ifndef GRAPHICS_DISABLED
+ 
+ const int kMaxMsgSize = 4096;
+@@ -186,29 +207,6 @@ void SVSemaphore::Wait() {
+ #endif
+ }
+ 
+-
+-// Create new thread.
+-
+-void SVSync::StartThread(void *(*func)(void*), void* arg) {
+-#ifdef _WIN32
+-  LPTHREAD_START_ROUTINE f = (LPTHREAD_START_ROUTINE) func;
+-  DWORD threadid;
+-  HANDLE newthread = CreateThread(
+-  NULL,          // default security attributes
+-  0,             // use default stack size
+-  f,             // thread function
+-  arg,           // argument to thread function
+-  0,             // use default creation flags
+-  &threadid);    // returns the thread identifier
+-#else
+-  pthread_t helper;
+-  pthread_attr_t attr;
+-  pthread_attr_init(&attr);
+-  pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
+-  pthread_create(&helper, &attr, func, arg);
+-#endif
+-}
+-
+ // Place a message in the message buffer (and flush it).
+ void SVNetwork::Send(const char* msg) {
+   mutex_send_->Lock();
diff --git a/app-text/tesseract/files/tesseract-4.00.00_alpha-openmp.patch b/app-text/tesseract/files/tesseract-4.00.00_alpha-openmp.patch
new file mode 100644
index 000000000000..d07fb58157fe
--- /dev/null
+++ b/app-text/tesseract/files/tesseract-4.00.00_alpha-openmp.patch
@@ -0,0 +1,111 @@
+Backport from upstream 6140be6a5575e9159e3678adf4ee9e673b3ff2cc
+
+diff -Naur tesseract-4.00.00alpha.orig/api/Makefile.am tesseract-4.00.00alpha/api/Makefile.am
+--- tesseract-4.00.00alpha.orig/api/Makefile.am	2016-11-08 00:38:07.000000000 +0100
++++ tesseract-4.00.00alpha/api/Makefile.am	2017-01-26 10:27:59.269712914 +0100
+@@ -88,9 +88,7 @@
+ 
+ tesseract_LDFLAGS = $(OPENCL_LDFLAGS)
+ 
+-if OPENMP
+ tesseract_LDADD += $(OPENMP_CFLAGS)
+-endif
+ 
+ if T_WIN
+ tesseract_LDADD += -lws2_32
+@@ -99,4 +97,3 @@
+ if ADD_RT
+ tesseract_LDADD += -lrt
+ endif
+-
+diff -Naur tesseract-4.00.00alpha.orig/ccmain/Makefile.am tesseract-4.00.00alpha/ccmain/Makefile.am
+--- tesseract-4.00.00alpha.orig/ccmain/Makefile.am	2016-11-08 00:38:07.000000000 +0100
++++ tesseract-4.00.00alpha/ccmain/Makefile.am	2017-01-26 10:27:59.269712914 +0100
+@@ -8,6 +8,7 @@
+     -I$(top_srcdir)/textord -I$(top_srcdir)/opencl
+ 
+ AM_CPPFLAGS += $(OPENCL_CPPFLAGS)
++AM_CPPFLAGS += $(OPENMP_CXXFLAGS)
+ 
+ if VISIBILITY
+ AM_CPPFLAGS += -DTESS_EXPORTS \
+diff -Naur tesseract-4.00.00alpha.orig/ccmain/par_control.cpp tesseract-4.00.00alpha/ccmain/par_control.cpp
+--- tesseract-4.00.00alpha.orig/ccmain/par_control.cpp	2016-11-08 00:38:07.000000000 +0100
++++ tesseract-4.00.00alpha/ccmain/par_control.cpp	2017-01-26 10:27:59.269712914 +0100
+@@ -18,9 +18,9 @@
+ ///////////////////////////////////////////////////////////////////////
+ 
+ #include "tesseractclass.h"
+-#ifdef OPENMP
++#ifdef _OPENMP
+ #include <omp.h>
+-#endif  // OPENMP
++#endif // _OPENMP
+ 
+ namespace tesseract {
+ 
+@@ -53,7 +53,9 @@
+   }
+   // Pre-classify all the blobs.
+   if (tessedit_parallelize > 1) {
++#ifdef _OPENMP
+     #pragma omp parallel for num_threads(10)
++#endif // _OPENMP
+     for (int b = 0; b < blobs.size(); ++b) {
+       *blobs[b].choices =
+           blobs[b].tesseract->classify_blob(blobs[b].blob, "par", White, NULL);
+diff -Naur tesseract-4.00.00alpha.orig/configure.ac tesseract-4.00.00alpha/configure.ac
+--- tesseract-4.00.00alpha.orig/configure.ac	2016-11-08 00:38:07.000000000 +0100
++++ tesseract-4.00.00alpha/configure.ac	2017-01-26 10:28:45.636688839 +0100
+@@ -170,14 +170,7 @@
+ fi
+ 
+ # check whether to build OpenMP support
+-AM_CONDITIONAL([OPENMP], false)
+ AC_OPENMP
+-AS_IF([test "x$OPENMP_CFLAGS" != "x"],
+-  [AM_CONDITIONAL([OPENMP], true)
+-   AC_SUBST([AM_CPPFLAGS], ["$OPENMP_CXXFLAGS"])
+-   AC_DEFINE([OPENMP], [], [Defined when compiled with OpenMP support])]
+-)
+-
+ 
+ # check whether to build opencl version
+ AC_MSG_CHECKING([--enable-opencl argument])
+diff -Naur tesseract-4.00.00alpha.orig/lstm/lstm.cpp tesseract-4.00.00alpha/lstm/lstm.cpp
+--- tesseract-4.00.00alpha.orig/lstm/lstm.cpp	2016-11-08 00:38:07.000000000 +0100
++++ tesseract-4.00.00alpha/lstm/lstm.cpp	2017-01-26 10:27:59.269712914 +0100
+@@ -18,7 +18,7 @@
+ 
+ #include "lstm.h"
+ 
+-#ifndef ANDROID_BUILD
++#ifdef _OPENMP
+ #include <omp.h>
+ #endif
+ #include <stdio.h>
+diff -Naur tesseract-4.00.00alpha.orig/lstm/Makefile.am tesseract-4.00.00alpha/lstm/Makefile.am
+--- tesseract-4.00.00alpha.orig/lstm/Makefile.am	2016-11-08 00:38:07.000000000 +0100
++++ tesseract-4.00.00alpha/lstm/Makefile.am	2017-01-26 10:27:59.269712914 +0100
+@@ -4,7 +4,7 @@
+     -I$(top_srcdir)/dict -I$(top_srcdir)/lstm
+ AUTOMAKE_OPTIONS = subdir-objects
+ SUBDIRS =
+-AM_CXXFLAGS = -fopenmp
++AM_CXXFLAGS = $(OPENMP_CXXFLAGS)
+ 
+ if !NO_TESSDATA_PREFIX
+ AM_CXXFLAGS += -DTESSDATA_PREFIX=@datadir@/
+diff -Naur tesseract-4.00.00alpha.orig/lstm/parallel.cpp tesseract-4.00.00alpha/lstm/parallel.cpp
+--- tesseract-4.00.00alpha.orig/lstm/parallel.cpp	2016-11-08 00:38:07.000000000 +0100
++++ tesseract-4.00.00alpha/lstm/parallel.cpp	2017-01-26 10:27:59.269712914 +0100
+@@ -18,7 +18,9 @@
+ 
+ #include "parallel.h"
+ 
++#ifdef _OPENMP
+ #include <omp.h>
++#endif
+ 
+ #include "functions.h"  // For conditional undef of _OPENMP.
+ #include "networkscratch.h"
diff --git a/app-text/tesseract/metadata.xml b/app-text/tesseract/metadata.xml
new file mode 100644
index 000000000000..5d6b217bc6dd
--- /dev/null
+++ b/app-text/tesseract/metadata.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>voyageur@gentoo.org</email>
+    <name>Bernard Cafarelli</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>chutzpah@gentoo.org</email>
+    <name>Patrick McLean</name>
+  </maintainer>
+  <longdescription lang="en">A commercial quality OCR engine originally developed at HP between 1985 and
+  1995. In 1995, this engine was among the top 3 evaluated by UNLV. It was
+  open-sourced by HP and UNLV in 2005.</longdescription>
+  <upstream>
+    <remote-id type="google-code">tesseract-ocr</remote-id>
+    <remote-id type="github">tesseract-ocr/tessdata</remote-id>
+  </upstream>
+  <use>
+    <flag name="webp"> Enable support for webp image format.</flag>
+    <flag name="math"> Enable support for recognition of equations.</flag>
+    <flag name="scrollview"> Install viewer to debug recognition (ScrollView).</flag>
+    <flag name="osd"> Enable support orientation and script detection.</flag>
+    <flag name="opencl">Enable opencl support for speedup using GPU computation.</flag>
+    <flag name="training">Install training applications to add support for new languages.</flag>
+  </use>
+</pkgmetadata>
diff --git a/app-text/tesseract/tesseract-3.05.01.ebuild b/app-text/tesseract/tesseract-3.05.01.ebuild
new file mode 100644
index 000000000000..b75cd450b347
--- /dev/null
+++ b/app-text/tesseract/tesseract-3.05.01.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN="tesseract-ocr"
+LANGPACKV="3.04.00"
+URI_PREFIX="https://github.com/${MY_PN}/tessdata/raw/${LANGPACKV}/"
+JAVA_PKG_OPT_USE="scrollview"
+
+inherit autotools java-pkg-opt-2 toolchain-funcs
+
+DESCRIPTION="An OCR Engine, orginally developed at HP, now open source."
+HOMEPAGE="https://github.com/tesseract-ocr"
+SRC_URI="https://github.com/${MY_PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+	${URI_PREFIX}eng.traineddata -> eng.traineddata-${LANGPACKV}
+	math? ( ${URI_PREFIX}equ.traineddata -> equ.traineddata-${LANGPACKV} )
+	l10n_ar? ( ${URI_PREFIX}ara.traineddata -> ara.traineddata-${LANGPACKV} )
+	l10n_bg? ( ${URI_PREFIX}bul.traineddata -> bul.traineddata-${LANGPACKV} )
+	l10n_ca? ( ${URI_PREFIX}cat.traineddata -> cat.traineddata-${LANGPACKV} )
+	l10n_chr? ( ${URI_PREFIX}chr.traineddata -> chr.traineddata-${LANGPACKV} )
+	l10n_cs? ( ${URI_PREFIX}ces.traineddata -> ces.traineddata-${LANGPACKV} )
+	l10n_de? ( ${URI_PREFIX}deu.traineddata -> deu.traineddata-${LANGPACKV}
+				  ${URI_PREFIX}deu_frak.traineddata -> deu_frak.traineddata-${LANGPACKV} )
+	l10n_da? ( ${URI_PREFIX}dan.traineddata -> dan.traineddata-${LANGPACKV}
+				  ${URI_PREFIX}dan_frak.traineddata -> dan_frak.traineddata-${LANGPACKV} )
+	l10n_el? ( ${URI_PREFIX}ell.traineddata -> ell.traineddata-${LANGPACKV} )
+	l10n_es? ( ${URI_PREFIX}spa.traineddata -> spa.traineddata-${LANGPACKV} )
+	l10n_fi? ( ${URI_PREFIX}fin.traineddata -> fin.traineddata-${LANGPACKV} )
+	l10n_fr? ( ${URI_PREFIX}fra.traineddata -> fra.traineddata-${LANGPACKV} )
+	l10n_he? ( ${URI_PREFIX}heb.traineddata -> heb.traineddata-${LANGPACKV} )
+	l10n_hi? ( ${URI_PREFIX}hin.traineddata -> hin.traineddata-${LANGPACKV} )
+	l10n_hu? ( ${URI_PREFIX}hun.traineddata -> hun.traineddata-${LANGPACKV} )
+	l10n_id? ( ${URI_PREFIX}ind.traineddata -> ind.traineddata-${LANGPACKV} )
+	l10n_it? ( ${URI_PREFIX}ita.traineddata -> ita.traineddata-${LANGPACKV} )
+	l10n_ja? ( ${URI_PREFIX}jpn.traineddata -> jpn.traineddata-${LANGPACKV} )
+	l10n_ko? ( ${URI_PREFIX}kor.traineddata -> kor.traineddata-${LANGPACKV} )
+	l10n_lt? ( ${URI_PREFIX}lit.traineddata -> lit.traineddata-${LANGPACKV} )
+	l10n_lv? ( ${URI_PREFIX}lav.traineddata -> lav.traineddata-${LANGPACKV} )
+	l10n_nl? ( ${URI_PREFIX}nld.traineddata -> nld.traineddata-${LANGPACKV} )
+	l10n_no? ( ${URI_PREFIX}nor.traineddata -> nor.traineddata-${LANGPACKV} )
+	l10n_pl? ( ${URI_PREFIX}pol.traineddata -> pol.traineddata-${LANGPACKV} )
+	l10n_pt? ( ${URI_PREFIX}por.traineddata -> por.traineddata-${LANGPACKV} )
+	l10n_ro? ( ${URI_PREFIX}ron.traineddata -> ron.traineddata-${LANGPACKV} )
+	l10n_ru? ( ${URI_PREFIX}rus.traineddata -> rus.traineddata-${LANGPACKV} )
+	l10n_sk? ( ${URI_PREFIX}slk.traineddata -> slk.traineddata-${LANGPACKV}
+				  ${URI_PREFIX}slk_frak.traineddata -> slk_frak.traineddata-${LANGPACKV} )
+	l10n_sl? ( ${URI_PREFIX}slv.traineddata -> slv.traineddata-${LANGPACKV} )
+	l10n_sr? ( ${URI_PREFIX}srp.traineddata -> srp.traineddata-${LANGPACKV} )
+	l10n_sv? ( ${URI_PREFIX}swe.traineddata -> swe.traineddata-${LANGPACKV} )
+	l10n_th? ( ${URI_PREFIX}tha.traineddata -> tha.traineddata-${LANGPACKV} )
+	l10n_tl? ( ${URI_PREFIX}tgl.traineddata -> tgl.traineddata-${LANGPACKV} )
+	l10n_tr? ( ${URI_PREFIX}tur.traineddata -> tur.traineddata-${LANGPACKV} )
+	l10n_uk? ( ${URI_PREFIX}ukr.traineddata -> ukr.traineddata-${LANGPACKV} )
+	l10n_vi? ( ${URI_PREFIX}vie.traineddata -> vie.traineddata-${LANGPACKV} )
+	l10n_zh-CN? ( ${URI_PREFIX}chi_sim.traineddata -> chi_sim.traineddata-${LANGPACKV} )
+	l10n_zh-TW? ( ${URI_PREFIX}chi_tra.traineddata -> chi_tra.traineddata-${LANGPACKV} )
+	osd? ( ${URI_PREFIX}osd.traineddata -> osd.traineddata-${LANGPACKV} )
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~mips ppc ppc64 ~sparc x86"
+
+IUSE="doc examples jpeg math opencl osd png scrollview static-libs tiff training webp l10n_ar l10n_bg l10n_ca l10n_chr l10n_cs l10n_de l10n_da l10n_el l10n_es l10n_fi l10n_fr l10n_he l10n_hi l10n_hu l10n_id l10n_it l10n_ja l10n_ko l10n_lt l10n_lv l10n_nl l10n_no l10n_pl l10n_pt l10n_ro l10n_ru l10n_sk l10n_sl l10n_sr l10n_sv l10n_th l10n_tl l10n_tr l10n_uk l10n_vi l10n_zh-CN l10n_zh-TW"
+
+# With opencl USE=tiff is necessary in leptonica
+CDEPEND=">=media-libs/leptonica-1.71:=[zlib,tiff?,jpeg?,png?,webp?]
+	opencl? (
+		virtual/opencl
+		media-libs/tiff:0=
+		media-libs/leptonica:=[tiff]
+	)
+	scrollview? (
+		>=dev-java/piccolo2d-3.0:0
+	)
+	training? (
+		dev-libs/icu:=
+		x11-libs/pango:=
+		x11-libs/cairo:=
+	)"
+
+DEPEND="${CDEPEND}
+	doc? ( app-doc/doxygen )
+	scrollview? ( >=virtual/jdk-1.7 )"
+
+RDEPEND="${CDEPEND}
+	scrollview? ( >=virtual/jre-1.7 )"
+
+DOCS=( AUTHORS ChangeLog NEWS README.md )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.05.00-no_graphics.patch"
+	"${FILESDIR}/${PN}-4.00.00-use-system-piccolo2d.patch"
+)
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	for file in ${A}; do
+		if [[ "${file}" == *traineddata* ]]; then
+			cp "${DISTDIR}/${file}" "${S}/tessdata/${file%-*}" || die
+		fi
+	done
+}
+
+src_prepare() {
+	default
+	eautoreconf
+
+	java-pkg-opt-2_src_prepare
+}
+
+src_configure() {
+	local myeconfargs=(
+		--enable-shared
+		$(use_enable opencl)
+		$(use_enable scrollview graphics)
+		$(use_enable static-libs static)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	default
+	use doc && emake doc
+	use scrollview && emake ScrollView.jar JAVAC="javac $(java-pkg_javac-args)"
+	use training && emake training
+}
+
+src_install() {
+	use doc && HTML_DOCS=( doc/html/. )
+	default
+	prune_libtool_files
+
+	if use training; then
+		emake DESTDIR="${D}" training-install
+	fi
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins testing/eurotext.tif testing/phototest.tif
+	fi
+
+	insinto /usr/share/tessdata
+	doins tessdata/*traineddata* # language files
+	use scrollview && doins java/ScrollView.jar # scrollview
+}
diff --git a/app-text/tesseract/tesseract-4.00.00_alpha.ebuild b/app-text/tesseract/tesseract-4.00.00_alpha.ebuild
new file mode 100644
index 000000000000..b936e99c917f
--- /dev/null
+++ b/app-text/tesseract/tesseract-4.00.00_alpha.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN="tesseract-ocr"
+LANGPACKV="4.00"
+URI_PREFIX="https://github.com/${MY_PN}/tessdata/raw/${LANGPACKV}/"
+JAVA_PKG_OPT_USE="scrollview"
+
+inherit autotools java-pkg-opt-2 toolchain-funcs
+
+DESCRIPTION="An OCR Engine, orginally developed at HP, now open source."
+HOMEPAGE="https://github.com/tesseract-ocr"
+SRC_URI="https://github.com/${MY_PN}/${PN}/archive/${PV/_}.tar.gz -> ${P}.tar.gz
+	${URI_PREFIX}eng.traineddata -> eng.traineddata-${LANGPACKV}
+	math? ( ${URI_PREFIX}equ.traineddata -> equ.traineddata-${LANGPACKV} )
+	osd? ( ${URI_PREFIX}osd.traineddata -> osd.traineddata-${LANGPACKV} )"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc examples jpeg math opencl openmp osd png scrollview static-libs tiff training webp"
+
+# List of supported Gentoo linguas and their upstream mapping
+# https://github.com/tesseract-ocr/tesseract/wiki/Data-Files
+# "old" variants were regrouped in the matching modern locale
+LANGUAGES="af:afr am:amh ar:ara as:asm az:aze,aze_cyrl be:bel bn:ben bo:bod bs:bos bg:bul ca:cat cs:ces zh:chi_sim,chi_tra cy:cym da:dan de:deu,frk dz:dzo el:ell,grc en:enm eo:epo et:est eu:eus fa:fas fi:fin fr:fra,frm ga:gle gl:glg gu:guj he:heb hi:hin hr:hrv hu:hun id:ind is:isl it:ita,ita_old ja:jpn kn:kan ka:kat,kat_old kk:kaz km:khm ky:kir ko:kor ku:kur lo:lao la:lat lv:lav lt:lit ml:mal mr:mar mk:mkd ms:msa my:mya ne:nep nl:nld no:nor or:ori pa:pan pl:pol pt:por ro:ron ru:rus sa:san si:sin sk:slk sl:slv es:spa,spa_old sq:sqi sr:srp,srp_latn sw:swa sv:swe syc:syr ta:tam te:tel tg:tgk tl:tgl th:tha tr:tur ug:uig uk:ukr uz:uzb,uzb_cyrl vi:vie"
+# Missing matches:
+#	ceb 	Cebuano
+#	chr 	Cherokee
+#	hat 	Haitian; Haitian Creole
+#	iku 	Inuktitut
+#	jav 	Javanese
+#	mlt 	Maltese
+#	pus 	Pushto; Pashto
+#	tir 	Tigrinya
+#	urd 	Urdu
+#	yid 	Yiddish
+# l10n_en provides the additional data:
+#	enm 	English, Middle (1100-1500)
+
+for lang in ${LANGUAGES}; do
+	gentoo_lang=${lang%:*}
+	tess_langs=${lang#*:}
+	for tess_lang in ${tess_langs//,/ }; do
+		SRC_URI+=" l10n_${gentoo_lang}? ( ${URI_PREFIX}${tess_lang}.traineddata -> ${tess_lang}.traineddata-${LANGPACKV} )"
+	done
+	IUSE+=" l10n_${gentoo_lang}"
+done
+
+# With opencl USE=tiff is necessary in leptonica
+CDEPEND=">=media-libs/leptonica-1.74:=[zlib,tiff?,jpeg?,png?,webp?]
+	opencl? (
+		virtual/opencl
+		media-libs/tiff:0=
+		media-libs/leptonica:=[tiff]
+	)
+	scrollview? (
+		>=dev-java/piccolo2d-3.0:0
+	)
+	training? (
+		dev-libs/icu:=
+		x11-libs/pango:=
+		x11-libs/cairo:=
+	)"
+
+DEPEND="${CDEPEND}
+	doc? ( app-doc/doxygen )
+	scrollview? ( >=virtual/jdk-1.7 )"
+
+RDEPEND="${CDEPEND}
+	scrollview? ( >=virtual/jre-1.7 )"
+
+DOCS=( AUTHORS ChangeLog NEWS README.md )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.04.01-use-system-piccolo2d.patch"
+	"${FILESDIR}/${P}-isnan.patch"
+	"${FILESDIR}/${P}-openmp.patch"
+	"${FILESDIR}/${P}-no_graphics.patch"
+)
+
+S=${WORKDIR}/${P/_}
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	for file in ${A}; do
+		if [[ "${file}" == *traineddata* ]]; then
+			cp "${DISTDIR}/${file}" "${S}/tessdata/${file%-*}" || die
+		fi
+	done
+}
+
+src_prepare() {
+	default
+	eautoreconf
+
+	java-pkg-opt-2_src_prepare
+}
+
+src_configure() {
+	local myeconfargs=(
+		--enable-shared
+		$(use_enable opencl)
+		$(use_enable openmp)
+		$(use_enable scrollview graphics)
+		$(use_enable static-libs static)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	default
+	use doc && emake doc
+	use scrollview && emake ScrollView.jar JAVAC="javac $(java-pkg_javac-args)"
+	use training && emake training
+}
+
+src_install() {
+	use doc && HTML_DOCS=( doc/html/. )
+	default
+	prune_libtool_files
+
+	if use training; then
+		emake DESTDIR="${D}" training-install
+	fi
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins testing/eurotext.tif testing/phototest.tif
+	fi
+
+	insinto /usr/share/tessdata
+	doins tessdata/*traineddata* # language files
+	use scrollview && doins java/ScrollView.jar # scrollview
+}
diff --git a/app-text/tesseract/tesseract-9999.ebuild b/app-text/tesseract/tesseract-9999.ebuild
new file mode 100644
index 000000000000..d7b815358586
--- /dev/null
+++ b/app-text/tesseract/tesseract-9999.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN="tesseract-ocr"
+LANGPACKV="4.00"
+URI_PREFIX="https://github.com/${MY_PN}/tessdata/raw/${LANGPACKV}/"
+JAVA_PKG_OPT_USE="scrollview"
+
+inherit autotools git-r3 java-pkg-opt-2 toolchain-funcs
+
+DESCRIPTION="An OCR Engine, orginally developed at HP, now open source."
+HOMEPAGE="https://github.com/tesseract-ocr"
+SRC_URI="${URI_PREFIX}eng.traineddata -> eng.traineddata-${LANGPACKV}
+	math? ( ${URI_PREFIX}equ.traineddata -> equ.traineddata-${LANGPACKV} )
+	osd? ( ${URI_PREFIX}osd.traineddata -> osd.traineddata-${LANGPACKV} )"
+EGIT_REPO_URI="https://github.com/${MY_PN}/${PN}.git"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS=""
+IUSE="doc examples jpeg math opencl openmp osd png scrollview static-libs tiff training webp"
+
+# List of supported Gentoo linguas and their upstream mapping
+# https://github.com/tesseract-ocr/tesseract/wiki/Data-Files
+# "old" variants were regrouped in the matching modern locale
+LANGUAGES="af:afr am:amh ar:ara as:asm az:aze,aze_cyrl be:bel bn:ben bo:bod bs:bos bg:bul ca:cat cs:ces zh:chi_sim,chi_tra cy:cym da:dan de:deu,frk dz:dzo el:ell,grc en:enm eo:epo et:est eu:eus fa:fas fi:fin fr:fra,frm ga:gle gl:glg gu:guj he:heb hi:hin hr:hrv hu:hun id:ind is:isl it:ita,ita_old ja:jpn kn:kan ka:kat,kat_old kk:kaz km:khm ky:kir ko:kor ku:kur lo:lao la:lat lv:lav lt:lit ml:mal mr:mar mk:mkd ms:msa my:mya ne:nep nl:nld no:nor or:ori pa:pan pl:pol pt:por ro:ron ru:rus sa:san si:sin sk:slk sl:slv es:spa,spa_old sq:sqi sr:srp,srp_latn sw:swa sv:swe syc:syr ta:tam te:tel tg:tgk tl:tgl th:tha tr:tur ug:uig uk:ukr uz:uzb,uzb_cyrl vi:vie"
+# Missing matches:
+#	ceb 	Cebuano
+#	chr 	Cherokee
+#	hat 	Haitian; Haitian Creole
+#	iku 	Inuktitut
+#	jav 	Javanese
+#	mlt 	Maltese
+#	pus 	Pushto; Pashto
+#	tir 	Tigrinya
+#	urd 	Urdu
+#	yid 	Yiddish
+# l10n_en provides the additional data:
+#	enm 	English, Middle (1100-1500)
+
+for lang in ${LANGUAGES}; do
+	gentoo_lang=${lang%:*}
+	tess_langs=${lang#*:}
+	for tess_lang in ${tess_langs//,/ }; do
+		SRC_URI+=" l10n_${gentoo_lang}? ( ${URI_PREFIX}${tess_lang}.traineddata -> ${tess_lang}.traineddata-${LANGPACKV} )"
+	done
+	IUSE+=" l10n_${gentoo_lang}"
+done
+
+# With opencl USE=tiff is necessary in leptonica
+CDEPEND=">=media-libs/leptonica-1.74:=[zlib,tiff?,jpeg?,png?,webp?]
+	opencl? (
+		virtual/opencl
+		media-libs/tiff:0=
+		media-libs/leptonica:=[tiff]
+	)
+	scrollview? (
+		>=dev-java/piccolo2d-3.0:0
+	)
+	training? (
+		dev-libs/icu:=
+		x11-libs/pango:=
+		x11-libs/cairo:=
+	)"
+
+DEPEND="${CDEPEND}
+	doc? ( app-doc/doxygen )
+	scrollview? ( >=virtual/jdk-1.7 )"
+
+RDEPEND="${CDEPEND}
+	scrollview? ( >=virtual/jre-1.7 )"
+
+DOCS=( AUTHORS ChangeLog NEWS README.md )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.00.00-use-system-piccolo2d.patch"
+)
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_unpack() {
+	git-r3_src_unpack
+	for file in ${A}; do
+		if [[ "${file}" == *traineddata* ]]; then
+			cp "${DISTDIR}/${file}" "${S}/tessdata/${file%-*}" || die
+		fi
+	done
+}
+
+src_prepare() {
+	default
+	eautoreconf
+
+	java-pkg-opt-2_src_prepare
+}
+
+src_configure() {
+	local myeconfargs=(
+		--enable-shared
+		$(use_enable opencl)
+		$(use_enable openmp)
+		$(use_enable scrollview graphics)
+		$(use_enable static-libs static)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	default
+	use doc && emake doc
+	use scrollview && emake ScrollView.jar JAVAC="javac $(java-pkg_javac-args)"
+	use training && emake training
+}
+
+src_install() {
+	use doc && HTML_DOCS=( doc/html/. )
+	default
+	prune_libtool_files
+
+	if use training; then
+		emake DESTDIR="${D}" training-install
+	fi
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins testing/eurotext.tif testing/phototest.tif
+	fi
+
+	insinto /usr/share/tessdata
+	doins tessdata/*traineddata* # language files
+	use scrollview && doins java/ScrollView.jar # scrollview
+}
diff --git a/app-text/texi2html-5.0-r1 b/app-text/texi2html-5.0-r1
deleted file mode 100644
index a6e34c8bb8ae..000000000000
--- a/app-text/texi2html-5.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install preinst prepare
-DEPEND=>=dev-lang/perl-5.10.1 >=dev-perl/libintl-perl-1.200 unicode? ( dev-perl/Text-Unidecode dev-perl/Unicode-EastAsianWidth )
-DESCRIPTION=Perl script that converts Texinfo to HTML
-EAPI=4
-HOMEPAGE=http://www.nongnu.org/texi2html/
-IUSE=unicode
-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
-LICENSE=CC-SA-1.0 FDL-1.3 GPL-2
-RDEPEND=>=dev-lang/perl-5.10.1 >=dev-perl/libintl-perl-1.200 unicode? ( dev-perl/Text-Unidecode dev-perl/Unicode-EastAsianWidth )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://nongnu/texi2html/texi2html-5.0.tar.bz2
-_eclasses_=prefix	e51c7882b7b721e54e684f7eb143cbfe
-_md5_=c3be64cafa2291cac50a58f3c06e36cb
diff --git a/app-text/texi2html/Manifest b/app-text/texi2html/Manifest
new file mode 100644
index 000000000000..c4498e81029c
--- /dev/null
+++ b/app-text/texi2html/Manifest
@@ -0,0 +1,3 @@
+DIST texi2html-5.0.tar.bz2 15397249 BLAKE2B 3e502d9424c2936a922488aab7a66140c0a8369253a5500beeebcea0942ffa7b97fb7021b23212264e110d4bdab4850f263269aacf61de23ac6e052dfcf10d67 SHA512 50afc2f1f8875d3e62a51cc0339bd4c4f058041f42a9fda9cd5b02960f0d5c72838e4f010702ba716dbd256946f64520ce1e5b86539b6f7b8b7ce24a43c98e9d
+EBUILD texi2html-5.0-r1.ebuild 1321 BLAKE2B b9c038b1a7317b6b2a74acc21414f0a687fdcc7688cf7e2cd30026e3f11641a78e06acd5fd5fcd1973a90d84aa13d65cafe29a48f0a9a1313bd84b70b2f2fb17 SHA512 587ef4af50303b8a1dd1bd4f41a79a23110a88081b61686322798cd6e78a03a68f46eca409779712d453599cb830bc24258963ec00d6a88d1224e70cf3f93e54
+MISC metadata.xml 245 BLAKE2B ee3a163cfe0a4bc59c0dfb46f9ddb580e2d259b4d0e33cb4e684eb9e6d4b901bf97c6edd891f3b75a613a782f1b89318d0ee3ec9bee4e34c4441d9e8f4267678 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690
diff --git a/app-text/texi2html/metadata.xml b/app-text/texi2html/metadata.xml
new file mode 100644
index 000000000000..13170c3184d8
--- /dev/null
+++ b/app-text/texi2html/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>tex@gentoo.org</email>
+	<name>Gentoo TeX Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-text/texi2html/texi2html-5.0-r1.ebuild b/app-text/texi2html/texi2html-5.0-r1.ebuild
new file mode 100644
index 000000000000..3c4b85e12fc2
--- /dev/null
+++ b/app-text/texi2html/texi2html-5.0-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit prefix
+
+DESCRIPTION="Perl script that converts Texinfo to HTML"
+HOMEPAGE="http://www.nongnu.org/texi2html/"
+SRC_URI="mirror://nongnu/${PN}/${P}.tar.bz2"
+
+LICENSE="CC-SA-1.0 FDL-1.3 GPL-2"
+SLOT="0"
+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="unicode"
+
+RDEPEND=">=dev-lang/perl-5.10.1
+	>=dev-perl/libintl-perl-1.200
+	unicode? (
+		dev-perl/Text-Unidecode
+		dev-perl/Unicode-EastAsianWidth
+		)"
+DEPEND="${RDEPEND}"
+
+DOCS="AUTHORS ChangeLog NEWS README TODO"
+
+RESTRICT="test" #411523
+
+src_prepare() {
+	# On FreeBSD this script is used instead of GNU install but it comes without
+	# executable pemissions... Fix it!
+	chmod +x install-sh || die
+
+	if use prefix; then
+		hprefixify $(find . -name '*.pl' | xargs)
+	fi
+}
+
+src_configure() {
+	local myconf
+	use unicode && myconf='--with-external-Unicode-EastAsianWidth'
+
+	econf \
+		--with-external-libintl-perl \
+		$(use_with unicode unidecode) \
+		${myconf}
+}
+
+src_install() {
+	default
+	rm -f "${ED}"/usr/share/${PN}/images/{COPYING*,GPL,README}
+}
+
+pkg_preinst() {
+	rm -f "${EROOT}"/usr/bin/${PN}
+}
diff --git a/app-text/texlive-2017 b/app-text/texlive-2017
deleted file mode 100644
index 419d399d6980..000000000000
--- a/app-text/texlive-2017
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DEPEND=>=app-text/texlive-core-2017
-DESCRIPTION=A complete TeX distribution
-EAPI=5
-HOMEPAGE=http://tug.org/texlive/
-IUSE=cjk context detex dvi2tty extra epspdf games graphics humanities jadetex luatex metapost music pdfannotextractor png pstricks publishers science tex4ht texi2html truetype xetex xindy xml X l10n_af l10n_ar l10n_as l10n_bg l10n_bn l10n_br l10n_ca l10n_cs l10n_cy l10n_da l10n_de l10n_el l10n_en l10n_eo l10n_es l10n_et l10n_eu l10n_fa l10n_fi l10n_fr l10n_ga l10n_gl l10n_gu l10n_he l10n_hi l10n_hr l10n_hsb l10n_hu l10n_hy l10n_ia l10n_id l10n_is l10n_it l10n_ja l10n_ko l10n_kn l10n_la l10n_lo l10n_lt l10n_lv l10n_ml l10n_mn l10n_mr l10n_nb l10n_nl l10n_nn l10n_no l10n_or l10n_pa l10n_pl l10n_pt l10n_rm l10n_ro l10n_ru l10n_sa l10n_sco l10n_sk l10n_sl l10n_sq l10n_sr l10n_sv l10n_ta l10n_te l10n_th l10n_tk l10n_tr l10n_uk l10n_vi l10n_zh
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=metapackage
-RDEPEND=>=app-text/texlive-core-2017 app-text/psutils >=dev-texlive/texlive-fontutils-2017 media-gfx/sam2p texi2html? ( app-text/texi2html ) sys-apps/texinfo app-text/t1utils >=app-text/lcdf-typetools-2.92[kpathsea] truetype? ( >=app-text/ttf2pk2-2.0_p20150521 ) detex? ( dev-tex/detex ) app-text/ps2eps dvi2tty? ( dev-tex/dvi2tty ) png? ( app-text/dvipng ) X? ( >=app-text/xdvik-22.87 ) >=dev-texlive/texlive-basic-2017 >=dev-texlive/texlive-fontsrecommended-2017 >=dev-texlive/texlive-latex-2017 luatex? ( >=dev-texlive/texlive-luatex-2017 ) >=dev-texlive/texlive-latexrecommended-2017 >=dev-tex/xcolor-2.11 >=dev-tex/latex-beamer-3.36 metapost? ( >=dev-texlive/texlive-metapost-2017 dev-tex/feynmf ) >=dev-texlive/texlive-plaingeneric-2017 pdfannotextractor? ( dev-tex/pdfannotextractor ) extra? ( dev-tex/chktex app-text/dvisvgm dev-tex/latexdiff >=dev-tex/latexmk-418 >=app-text/pdfjam-2.02 >=dev-texlive/texlive-bibtexextra-2017 >=dev-texlive/texlive-fontsextra-2017 >=dev-texlive/texlive-formatsextra-2017 >=dev-texlive/texlive-latexextra-2017 >=dev-tex/glossaries-2.07 >=dev-tex/leaflet-20041222 >=dev-tex/currvita-0.9i-r1 >=dev-tex/g-brief-4.0.2 >=dev-tex/envlab-1.2-r1 >=dev-tex/europecv-20060424-r1 >=dev-tex/svninfo-0.7.3-r1 ) xetex? ( >=dev-texlive/texlive-xetex-2017 ) graphics? ( >=dev-texlive/texlive-pictures-2017 dev-tex/dot2texi ) epspdf? ( app-text/epspdf ) science? ( >=dev-texlive/texlive-mathscience-2017 ) publishers? ( >=dev-texlive/texlive-publishers-2017 ) music? ( >=dev-texlive/texlive-music-2017 ) pstricks? ( >=dev-texlive/texlive-pstricks-2017 ) context? ( >=dev-texlive/texlive-context-2017 ) games? ( >=dev-texlive/texlive-games-2017 ) humanities? ( >=dev-texlive/texlive-humanities-2017 ) tex4ht? ( >=dev-tex/tex4ht-20090611_p1038-r3 ) xml? ( >=dev-tex/xmltex-1.9-r2 app-text/passivetex ) jadetex? ( >=app-text/jadetex-3.13-r2 ) l10n_af? ( >=dev-texlive/texlive-langother-2017 ) l10n_ar? ( >=dev-texlive/texlive-langarabic-2017 ) l10n_fa? ( >=dev-texlive/texlive-langarabic-2017 ) l10n_hy? ( >=dev-texlive/texlive-langeuropean-2017 ) cjk? ( >=dev-texlive/texlive-langcjk-2017 >=dev-tex/cjk-latex-4.8.4 ) l10n_hr? ( >=dev-texlive/texlive-langeuropean-2017 ) l10n_bg? ( >=dev-texlive/texlive-langcyrillic-2017 ) l10n_br? ( >=dev-texlive/texlive-langeuropean-2017 ) l10n_ru? ( >=dev-texlive/texlive-langcyrillic-2017 ) l10n_uk? ( >=dev-texlive/texlive-langcyrillic-2017 ) l10n_cs? ( >=dev-texlive/texlive-langczechslovak-2017 >=app-text/vlna-1.3 ) l10n_sk? ( >=dev-texlive/texlive-langczechslovak-2017 ) l10n_da? ( >=dev-texlive/texlive-langeuropean-2017 ) l10n_nl? ( >=dev-texlive/texlive-langeuropean-2017 ) l10n_en? ( >=dev-texlive/texlive-langenglish-2017 ) l10n_fi? ( >=dev-texlive/texlive-langeuropean-2017 ) l10n_eu? ( >=dev-texlive/texlive-langfrench-2017 ) l10n_fr? ( >=dev-texlive/texlive-langfrench-2017 ) l10n_de? ( >=dev-texlive/texlive-langgerman-2017 ) l10n_el? ( >=dev-texlive/texlive-langgreek-2017 ) l10n_he? ( >=dev-texlive/texlive-langother-2017 ) l10n_hu? ( >=dev-texlive/texlive-langeuropean-2017 ) l10n_as? ( >=dev-texlive/texlive-langother-2017 ) l10n_bn? ( >=dev-texlive/texlive-langother-2017 ) l10n_gu? ( >=dev-texlive/texlive-langother-2017 ) l10n_hi? ( >=dev-texlive/texlive-langother-2017 ) l10n_kn? ( >=dev-texlive/texlive-langother-2017 ) l10n_ml? ( >=dev-texlive/texlive-langother-2017 ) l10n_mr? ( >=dev-texlive/texlive-langother-2017 ) l10n_or? ( >=dev-texlive/texlive-langother-2017 ) l10n_pa? ( >=dev-texlive/texlive-langother-2017 ) l10n_sa? ( >=dev-texlive/texlive-langother-2017 ) l10n_ta? ( >=dev-texlive/texlive-langother-2017 ) l10n_te? ( >=dev-texlive/texlive-langother-2017 ) l10n_it? ( >=dev-texlive/texlive-langitalian-2017 ) l10n_ja? ( >=dev-texlive/texlive-langjapanese-2017 ) l10n_ko? ( >=dev-texlive/texlive-langkorean-2017 ) l10n_la? ( >=dev-texlive/texlive-langeuropean-2017 ) l10n_lt? ( >=dev-texlive/texlive-langeuropean-2017 ) l10n_lv? ( >=dev-texlive/texlive-langeuropean-2017 ) l10n_mn? ( >=dev-texlive/texlive-langcyrillic-2017 ) l10n_nb? ( >=dev-texlive/texlive-langeuropean-2017 ) l10n_nn? ( >=dev-texlive/texlive-langeuropean-2017 ) l10n_no? ( >=dev-texlive/texlive-langeuropean-2017 ) l10n_cy? ( >=dev-texlive/texlive-langeuropean-2017 ) l10n_eo? ( >=dev-texlive/texlive-langother-2017 ) l10n_et? ( >=dev-texlive/texlive-langeuropean-2017 ) l10n_ga? ( >=dev-texlive/texlive-langeuropean-2017 ) l10n_rm? ( >=dev-texlive/texlive-langeuropean-2017 ) l10n_hsb? ( >=dev-texlive/texlive-langother-2017 ) l10n_ia? ( >=dev-texlive/texlive-langother-2017 ) l10n_id? ( >=dev-texlive/texlive-langother-2017 ) l10n_is? ( >=dev-texlive/texlive-langeuropean-2017 ) l10n_lo? ( >=dev-texlive/texlive-langother-2017 ) l10n_ro? ( >=dev-texlive/texlive-langeuropean-2017 ) l10n_sq? ( >=dev-texlive/texlive-langeuropean-2017 ) l10n_sr? ( >=dev-texlive/texlive-langeuropean-2017 >=dev-texlive/texlive-langcyrillic-2017 ) l10n_sl? ( >=dev-texlive/texlive-langeuropean-2017 ) l10n_tr? ( >=dev-texlive/texlive-langeuropean-2017 ) l10n_pl? ( >=dev-texlive/texlive-langpolish-2017 ) l10n_pt? ( >=dev-texlive/texlive-langportuguese-2017 ) l10n_ca? ( >=dev-texlive/texlive-langspanish-2017 ) l10n_gl? ( >=dev-texlive/texlive-langspanish-2017 ) l10n_es? ( >=dev-texlive/texlive-langspanish-2017 ) l10n_sco? ( >=dev-texlive/texlive-langeuropean-2017 ) l10n_sv? ( >=dev-texlive/texlive-langeuropean-2017 ) l10n_tk? ( >=dev-texlive/texlive-langeuropean-2017 ) l10n_vi? ( >=dev-texlive/texlive-langother-2017 ) l10n_zh? ( >=dev-texlive/texlive-langchinese-2017 ) xindy? ( app-text/xindy )
-SLOT=0
-_md5_=a92fdeee6313bbfb756b750f27121286
diff --git a/app-text/texlive-core-2016-r6 b/app-text/texlive-core-2016-r6
deleted file mode 100644
index 66507f311571..000000000000
--- a/app-text/texlive-core-2016-r6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare unpack
-DEPEND=X? ( x11-libs/libX11 x11-libs/libXmu ) !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.58.0:= >=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 ) virtual/pkgconfig sys-apps/ed sys-devel/flex app-arch/xz-utils >=app-portage/elt-patches-20170422
-DESCRIPTION=A complete TeX distribution
-EAPI=5
-HOMEPAGE=https://tug.org/texlive/
-IUSE=cjk X doc source tk +luajittex xetex
-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
-LICENSE=GPL-2 LPPL-1.3c TeX
-RDEPEND=X? ( x11-libs/libX11 x11-libs/libXmu ) !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.58.0:= >=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 ) >=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 )
-SLOT=0
-SRC_URI=mirror://gentoo/texlive-20160523-source.tar.xz mirror://gentoo/texlive-core-patches-65.1.tar.xz mirror://gentoo/texlive-module-tetex-2016.tar.xz mirror://gentoo/texlive-module-hyphen-base-2016.tar.xz mirror://gentoo/texlive-module-texconfig-2016.tar.xz mirror://gentoo/texlive-module-gsftopk-2016.tar.xz mirror://gentoo/texlive-module-texlive.infra-2016.tar.xz mirror://gentoo/texlive-module-a2ping-2016.tar.xz mirror://gentoo/texlive-module-adhocfilelist-2016.tar.xz mirror://gentoo/texlive-module-arara-2016.tar.xz mirror://gentoo/texlive-module-asymptote-2016.tar.xz mirror://gentoo/texlive-module-bundledoc-2016.tar.xz mirror://gentoo/texlive-module-checklistings-2016.tar.xz mirror://gentoo/texlive-module-ctan_chk-2016.tar.xz mirror://gentoo/texlive-module-ctanify-2016.tar.xz mirror://gentoo/texlive-module-ctanupload-2016.tar.xz mirror://gentoo/texlive-module-ctie-2016.tar.xz mirror://gentoo/texlive-module-cweb-2016.tar.xz mirror://gentoo/texlive-module-de-macro-2016.tar.xz mirror://gentoo/texlive-module-dtl-2016.tar.xz mirror://gentoo/texlive-module-dtxgen-2016.tar.xz mirror://gentoo/texlive-module-dvi2tty-2016.tar.xz mirror://gentoo/texlive-module-dviasm-2016.tar.xz mirror://gentoo/texlive-module-dvicopy-2016.tar.xz mirror://gentoo/texlive-module-dvidvi-2016.tar.xz mirror://gentoo/texlive-module-dviljk-2016.tar.xz mirror://gentoo/texlive-module-dvipos-2016.tar.xz mirror://gentoo/texlive-module-findhyph-2016.tar.xz mirror://gentoo/texlive-module-fragmaster-2016.tar.xz mirror://gentoo/texlive-module-hook-pre-commit-pkg-2016.tar.xz mirror://gentoo/texlive-module-hyphenex-2016.tar.xz mirror://gentoo/texlive-module-installfont-2016.tar.xz mirror://gentoo/texlive-module-lacheck-2016.tar.xz mirror://gentoo/texlive-module-latex-git-log-2016.tar.xz mirror://gentoo/texlive-module-latex-papersize-2016.tar.xz mirror://gentoo/texlive-module-latex2man-2016.tar.xz mirror://gentoo/texlive-module-latex2nemeth-2016.tar.xz mirror://gentoo/texlive-module-latexfileversion-2016.tar.xz mirror://gentoo/texlive-module-latexpand-2016.tar.xz mirror://gentoo/texlive-module-latexindent-2016.tar.xz mirror://gentoo/texlive-module-ltxfileinfo-2016.tar.xz mirror://gentoo/texlive-module-ltximg-2016.tar.xz mirror://gentoo/texlive-module-listings-ext-2016.tar.xz mirror://gentoo/texlive-module-make4ht-2016.tar.xz mirror://gentoo/texlive-module-match_parens-2016.tar.xz mirror://gentoo/texlive-module-mflua-2016.tar.xz mirror://gentoo/texlive-module-mkjobtexmf-2016.tar.xz mirror://gentoo/texlive-module-patgen-2016.tar.xz mirror://gentoo/texlive-module-pdfbook2-2016.tar.xz mirror://gentoo/texlive-module-pdfcrop-2016.tar.xz mirror://gentoo/texlive-module-pdflatexpicscale-2016.tar.xz mirror://gentoo/texlive-module-pdftools-2016.tar.xz mirror://gentoo/texlive-module-pdfxup-2016.tar.xz mirror://gentoo/texlive-module-pfarrei-2016.tar.xz mirror://gentoo/texlive-module-pkfix-2016.tar.xz mirror://gentoo/texlive-module-pkfix-helper-2016.tar.xz mirror://gentoo/texlive-module-purifyeps-2016.tar.xz mirror://gentoo/texlive-module-seetexk-2016.tar.xz mirror://gentoo/texlive-module-srcredact-2016.tar.xz mirror://gentoo/texlive-module-sty2dtx-2016.tar.xz mirror://gentoo/texlive-module-synctex-2016.tar.xz mirror://gentoo/texlive-module-tex4ebook-2016.tar.xz mirror://gentoo/texlive-module-texcount-2016.tar.xz mirror://gentoo/texlive-module-texdef-2016.tar.xz mirror://gentoo/texlive-module-texdiff-2016.tar.xz mirror://gentoo/texlive-module-texdirflatten-2016.tar.xz mirror://gentoo/texlive-module-texdoc-2016.tar.xz mirror://gentoo/texlive-module-texfot-2016.tar.xz mirror://gentoo/texlive-module-texliveonfly-2016.tar.xz mirror://gentoo/texlive-module-texloganalyser-2016.tar.xz mirror://gentoo/texlive-module-texosquery-2016.tar.xz mirror://gentoo/texlive-module-texware-2016.tar.xz mirror://gentoo/texlive-module-tie-2016.tar.xz mirror://gentoo/texlive-module-tpic2pdftex-2016.tar.xz mirror://gentoo/texlive-module-typeoutfileinfo-2016.tar.xz mirror://gentoo/texlive-module-web-2016.tar.xz mirror://gentoo/texlive-module-collection-binextra-2016.tar.xz doc? ( mirror://gentoo/texlive-module-tetex.doc-2016.tar.xz mirror://gentoo/texlive-module-texconfig.doc-2016.tar.xz mirror://gentoo/texlive-module-gsftopk.doc-2016.tar.xz mirror://gentoo/texlive-module-texlive.infra.doc-2016.tar.xz mirror://gentoo/texlive-module-a2ping.doc-2016.tar.xz mirror://gentoo/texlive-module-adhocfilelist.doc-2016.tar.xz mirror://gentoo/texlive-module-arara.doc-2016.tar.xz mirror://gentoo/texlive-module-asymptote.doc-2016.tar.xz mirror://gentoo/texlive-module-bundledoc.doc-2016.tar.xz mirror://gentoo/texlive-module-checklistings.doc-2016.tar.xz mirror://gentoo/texlive-module-ctan_chk.doc-2016.tar.xz mirror://gentoo/texlive-module-ctanify.doc-2016.tar.xz mirror://gentoo/texlive-module-ctanupload.doc-2016.tar.xz mirror://gentoo/texlive-module-ctie.doc-2016.tar.xz mirror://gentoo/texlive-module-cweb.doc-2016.tar.xz mirror://gentoo/texlive-module-de-macro.doc-2016.tar.xz mirror://gentoo/texlive-module-dtl.doc-2016.tar.xz mirror://gentoo/texlive-module-dtxgen.doc-2016.tar.xz mirror://gentoo/texlive-module-dvi2tty.doc-2016.tar.xz mirror://gentoo/texlive-module-dviasm.doc-2016.tar.xz mirror://gentoo/texlive-module-dvicopy.doc-2016.tar.xz mirror://gentoo/texlive-module-dvidvi.doc-2016.tar.xz mirror://gentoo/texlive-module-dviljk.doc-2016.tar.xz mirror://gentoo/texlive-module-dvipos.doc-2016.tar.xz mirror://gentoo/texlive-module-findhyph.doc-2016.tar.xz mirror://gentoo/texlive-module-fragmaster.doc-2016.tar.xz mirror://gentoo/texlive-module-hook-pre-commit-pkg.doc-2016.tar.xz mirror://gentoo/texlive-module-installfont.doc-2016.tar.xz mirror://gentoo/texlive-module-lacheck.doc-2016.tar.xz mirror://gentoo/texlive-module-latex-git-log.doc-2016.tar.xz mirror://gentoo/texlive-module-latex-papersize.doc-2016.tar.xz mirror://gentoo/texlive-module-latex2man.doc-2016.tar.xz mirror://gentoo/texlive-module-latex2nemeth.doc-2016.tar.xz mirror://gentoo/texlive-module-latexfileversion.doc-2016.tar.xz mirror://gentoo/texlive-module-latexpand.doc-2016.tar.xz mirror://gentoo/texlive-module-latexindent.doc-2016.tar.xz mirror://gentoo/texlive-module-ltxfileinfo.doc-2016.tar.xz mirror://gentoo/texlive-module-ltximg.doc-2016.tar.xz mirror://gentoo/texlive-module-listings-ext.doc-2016.tar.xz mirror://gentoo/texlive-module-make4ht.doc-2016.tar.xz mirror://gentoo/texlive-module-match_parens.doc-2016.tar.xz mirror://gentoo/texlive-module-mkjobtexmf.doc-2016.tar.xz mirror://gentoo/texlive-module-patgen.doc-2016.tar.xz mirror://gentoo/texlive-module-pdfbook2.doc-2016.tar.xz mirror://gentoo/texlive-module-pdfcrop.doc-2016.tar.xz mirror://gentoo/texlive-module-pdflatexpicscale.doc-2016.tar.xz mirror://gentoo/texlive-module-pdftools.doc-2016.tar.xz mirror://gentoo/texlive-module-pdfxup.doc-2016.tar.xz mirror://gentoo/texlive-module-pfarrei.doc-2016.tar.xz mirror://gentoo/texlive-module-pkfix.doc-2016.tar.xz mirror://gentoo/texlive-module-pkfix-helper.doc-2016.tar.xz mirror://gentoo/texlive-module-purifyeps.doc-2016.tar.xz mirror://gentoo/texlive-module-pythontex.doc-2016.tar.xz mirror://gentoo/texlive-module-seetexk.doc-2016.tar.xz mirror://gentoo/texlive-module-srcredact.doc-2016.tar.xz mirror://gentoo/texlive-module-sty2dtx.doc-2016.tar.xz mirror://gentoo/texlive-module-synctex.doc-2016.tar.xz mirror://gentoo/texlive-module-tex4ebook.doc-2016.tar.xz mirror://gentoo/texlive-module-texcount.doc-2016.tar.xz mirror://gentoo/texlive-module-texdef.doc-2016.tar.xz mirror://gentoo/texlive-module-texdiff.doc-2016.tar.xz mirror://gentoo/texlive-module-texdirflatten.doc-2016.tar.xz mirror://gentoo/texlive-module-texdoc.doc-2016.tar.xz mirror://gentoo/texlive-module-texfot.doc-2016.tar.xz mirror://gentoo/texlive-module-texliveonfly.doc-2016.tar.xz mirror://gentoo/texlive-module-texloganalyser.doc-2016.tar.xz mirror://gentoo/texlive-module-texosquery.doc-2016.tar.xz mirror://gentoo/texlive-module-texware.doc-2016.tar.xz mirror://gentoo/texlive-module-tie.doc-2016.tar.xz mirror://gentoo/texlive-module-tpic2pdftex.doc-2016.tar.xz mirror://gentoo/texlive-module-typeoutfileinfo.doc-2016.tar.xz mirror://gentoo/texlive-module-web.doc-2016.tar.xz ) source? ( mirror://gentoo/texlive-module-adhocfilelist.source-2016.tar.xz mirror://gentoo/texlive-module-arara.source-2016.tar.xz mirror://gentoo/texlive-module-checklistings.source-2016.tar.xz mirror://gentoo/texlive-module-hyphenex.source-2016.tar.xz mirror://gentoo/texlive-module-listings-ext.source-2016.tar.xz mirror://gentoo/texlive-module-mkjobtexmf.source-2016.tar.xz mirror://gentoo/texlive-module-pfarrei.source-2016.tar.xz mirror://gentoo/texlive-module-pythontex.source-2016.tar.xz mirror://gentoo/texlive-module-texdef.source-2016.tar.xz mirror://gentoo/texlive-module-texosquery.source-2016.tar.xz )
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=aad20181827b4becf9f9f21dec125e42
diff --git a/app-text/texlive-core-2017-r3 b/app-text/texlive-core-2017-r3
deleted file mode 100644
index 1187d228c276..000000000000
--- a/app-text/texlive-core-2017-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare unpack
-DEPEND=X? ( x11-libs/libX11 x11-libs/libXmu ) !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.58.0:= <app-text/poppler-0.64.0 >=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 ) <media-libs/freetype-2.9.1-r3 virtual/pkgconfig sys-apps/ed sys-devel/flex app-arch/xz-utils >=app-portage/elt-patches-20170422
-DESCRIPTION=A complete TeX distribution
-EAPI=5
-HOMEPAGE=https://tug.org/texlive/
-IUSE=cjk X doc source tk +luajittex xetex
-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
-LICENSE=GPL-2 LPPL-1.3c TeX
-RDEPEND=X? ( x11-libs/libX11 x11-libs/libXmu ) !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.58.0:= <app-text/poppler-0.64.0 >=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 ) >=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 )
-SLOT=0
-SRC_URI=mirror://gentoo/texlive-20170524-source.tar.xz mirror://gentoo/texlive-core-patches-70.tar.xz mirror://gentoo/texlive-module-tetex-2017.tar.xz mirror://gentoo/texlive-module-hyphen-base-2017.tar.xz mirror://gentoo/texlive-module-texconfig-2017.tar.xz mirror://gentoo/texlive-module-gsftopk-2017.tar.xz mirror://gentoo/texlive-module-texlive.infra-2017.tar.xz mirror://gentoo/texlive-module-a2ping-2017.tar.xz mirror://gentoo/texlive-module-adhocfilelist-2017.tar.xz mirror://gentoo/texlive-module-arara-2017.tar.xz mirror://gentoo/texlive-module-asymptote-2017.tar.xz mirror://gentoo/texlive-module-bundledoc-2017.tar.xz mirror://gentoo/texlive-module-checklistings-2017.tar.xz mirror://gentoo/texlive-module-ctan_chk-2017.tar.xz mirror://gentoo/texlive-module-ctanify-2017.tar.xz mirror://gentoo/texlive-module-ctanupload-2017.tar.xz mirror://gentoo/texlive-module-ctie-2017.tar.xz mirror://gentoo/texlive-module-cweb-2017.tar.xz mirror://gentoo/texlive-module-de-macro-2017.tar.xz mirror://gentoo/texlive-module-dtl-2017.tar.xz mirror://gentoo/texlive-module-dtxgen-2017.tar.xz mirror://gentoo/texlive-module-dvi2tty-2017.tar.xz mirror://gentoo/texlive-module-dviasm-2017.tar.xz mirror://gentoo/texlive-module-dvicopy-2017.tar.xz mirror://gentoo/texlive-module-dvidvi-2017.tar.xz mirror://gentoo/texlive-module-dviljk-2017.tar.xz mirror://gentoo/texlive-module-dvipos-2017.tar.xz mirror://gentoo/texlive-module-findhyph-2017.tar.xz mirror://gentoo/texlive-module-fragmaster-2017.tar.xz mirror://gentoo/texlive-module-hook-pre-commit-pkg-2017.tar.xz mirror://gentoo/texlive-module-hyphenex-2017.tar.xz mirror://gentoo/texlive-module-installfont-2017.tar.xz mirror://gentoo/texlive-module-lacheck-2017.tar.xz mirror://gentoo/texlive-module-latex-git-log-2017.tar.xz mirror://gentoo/texlive-module-latex-papersize-2017.tar.xz mirror://gentoo/texlive-module-latex2man-2017.tar.xz mirror://gentoo/texlive-module-latex2nemeth-2017.tar.xz mirror://gentoo/texlive-module-latexfileversion-2017.tar.xz mirror://gentoo/texlive-module-latexpand-2017.tar.xz mirror://gentoo/texlive-module-latexindent-2017.tar.xz mirror://gentoo/texlive-module-ltxfileinfo-2017.tar.xz mirror://gentoo/texlive-module-ltximg-2017.tar.xz mirror://gentoo/texlive-module-listings-ext-2017.tar.xz mirror://gentoo/texlive-module-make4ht-2017.tar.xz mirror://gentoo/texlive-module-match_parens-2017.tar.xz mirror://gentoo/texlive-module-mflua-2017.tar.xz mirror://gentoo/texlive-module-mkjobtexmf-2017.tar.xz mirror://gentoo/texlive-module-patgen-2017.tar.xz mirror://gentoo/texlive-module-pdfbook2-2017.tar.xz mirror://gentoo/texlive-module-pdfcrop-2017.tar.xz mirror://gentoo/texlive-module-pdflatexpicscale-2017.tar.xz mirror://gentoo/texlive-module-pdftools-2017.tar.xz mirror://gentoo/texlive-module-pdfxup-2017.tar.xz mirror://gentoo/texlive-module-pfarrei-2017.tar.xz mirror://gentoo/texlive-module-pkfix-2017.tar.xz mirror://gentoo/texlive-module-pkfix-helper-2017.tar.xz mirror://gentoo/texlive-module-purifyeps-2017.tar.xz mirror://gentoo/texlive-module-seetexk-2017.tar.xz mirror://gentoo/texlive-module-srcredact-2017.tar.xz mirror://gentoo/texlive-module-sty2dtx-2017.tar.xz mirror://gentoo/texlive-module-synctex-2017.tar.xz mirror://gentoo/texlive-module-tex4ebook-2017.tar.xz mirror://gentoo/texlive-module-texcount-2017.tar.xz mirror://gentoo/texlive-module-texdef-2017.tar.xz mirror://gentoo/texlive-module-texdiff-2017.tar.xz mirror://gentoo/texlive-module-texdirflatten-2017.tar.xz mirror://gentoo/texlive-module-texdoc-2017.tar.xz mirror://gentoo/texlive-module-texfot-2017.tar.xz mirror://gentoo/texlive-module-texliveonfly-2017.tar.xz mirror://gentoo/texlive-module-texloganalyser-2017.tar.xz mirror://gentoo/texlive-module-texosquery-2017.tar.xz mirror://gentoo/texlive-module-texware-2017.tar.xz mirror://gentoo/texlive-module-tie-2017.tar.xz mirror://gentoo/texlive-module-tpic2pdftex-2017.tar.xz mirror://gentoo/texlive-module-typeoutfileinfo-2017.tar.xz mirror://gentoo/texlive-module-web-2017.tar.xz mirror://gentoo/texlive-module-collection-binextra-2017.tar.xz doc? ( mirror://gentoo/texlive-module-tetex.doc-2017.tar.xz mirror://gentoo/texlive-module-texconfig.doc-2017.tar.xz mirror://gentoo/texlive-module-gsftopk.doc-2017.tar.xz mirror://gentoo/texlive-module-texlive.infra.doc-2017.tar.xz mirror://gentoo/texlive-module-a2ping.doc-2017.tar.xz mirror://gentoo/texlive-module-adhocfilelist.doc-2017.tar.xz mirror://gentoo/texlive-module-arara.doc-2017.tar.xz mirror://gentoo/texlive-module-asymptote.doc-2017.tar.xz mirror://gentoo/texlive-module-bundledoc.doc-2017.tar.xz mirror://gentoo/texlive-module-checklistings.doc-2017.tar.xz mirror://gentoo/texlive-module-ctan_chk.doc-2017.tar.xz mirror://gentoo/texlive-module-ctanify.doc-2017.tar.xz mirror://gentoo/texlive-module-ctanupload.doc-2017.tar.xz mirror://gentoo/texlive-module-ctie.doc-2017.tar.xz mirror://gentoo/texlive-module-cweb.doc-2017.tar.xz mirror://gentoo/texlive-module-de-macro.doc-2017.tar.xz mirror://gentoo/texlive-module-dtl.doc-2017.tar.xz mirror://gentoo/texlive-module-dtxgen.doc-2017.tar.xz mirror://gentoo/texlive-module-dvi2tty.doc-2017.tar.xz mirror://gentoo/texlive-module-dviasm.doc-2017.tar.xz mirror://gentoo/texlive-module-dvicopy.doc-2017.tar.xz mirror://gentoo/texlive-module-dvidvi.doc-2017.tar.xz mirror://gentoo/texlive-module-dviljk.doc-2017.tar.xz mirror://gentoo/texlive-module-dvipos.doc-2017.tar.xz mirror://gentoo/texlive-module-findhyph.doc-2017.tar.xz mirror://gentoo/texlive-module-fragmaster.doc-2017.tar.xz mirror://gentoo/texlive-module-hook-pre-commit-pkg.doc-2017.tar.xz mirror://gentoo/texlive-module-installfont.doc-2017.tar.xz mirror://gentoo/texlive-module-lacheck.doc-2017.tar.xz mirror://gentoo/texlive-module-latex-git-log.doc-2017.tar.xz mirror://gentoo/texlive-module-latex-papersize.doc-2017.tar.xz mirror://gentoo/texlive-module-latex2man.doc-2017.tar.xz mirror://gentoo/texlive-module-latex2nemeth.doc-2017.tar.xz mirror://gentoo/texlive-module-latexfileversion.doc-2017.tar.xz mirror://gentoo/texlive-module-latexpand.doc-2017.tar.xz mirror://gentoo/texlive-module-latexindent.doc-2017.tar.xz mirror://gentoo/texlive-module-ltxfileinfo.doc-2017.tar.xz mirror://gentoo/texlive-module-ltximg.doc-2017.tar.xz mirror://gentoo/texlive-module-listings-ext.doc-2017.tar.xz mirror://gentoo/texlive-module-make4ht.doc-2017.tar.xz mirror://gentoo/texlive-module-match_parens.doc-2017.tar.xz mirror://gentoo/texlive-module-mkjobtexmf.doc-2017.tar.xz mirror://gentoo/texlive-module-patgen.doc-2017.tar.xz mirror://gentoo/texlive-module-pdfbook2.doc-2017.tar.xz mirror://gentoo/texlive-module-pdfcrop.doc-2017.tar.xz mirror://gentoo/texlive-module-pdflatexpicscale.doc-2017.tar.xz mirror://gentoo/texlive-module-pdftools.doc-2017.tar.xz mirror://gentoo/texlive-module-pdfxup.doc-2017.tar.xz mirror://gentoo/texlive-module-pfarrei.doc-2017.tar.xz mirror://gentoo/texlive-module-pkfix.doc-2017.tar.xz mirror://gentoo/texlive-module-pkfix-helper.doc-2017.tar.xz mirror://gentoo/texlive-module-purifyeps.doc-2017.tar.xz mirror://gentoo/texlive-module-pythontex.doc-2017.tar.xz mirror://gentoo/texlive-module-seetexk.doc-2017.tar.xz mirror://gentoo/texlive-module-srcredact.doc-2017.tar.xz mirror://gentoo/texlive-module-sty2dtx.doc-2017.tar.xz mirror://gentoo/texlive-module-synctex.doc-2017.tar.xz mirror://gentoo/texlive-module-tex4ebook.doc-2017.tar.xz mirror://gentoo/texlive-module-texcount.doc-2017.tar.xz mirror://gentoo/texlive-module-texdef.doc-2017.tar.xz mirror://gentoo/texlive-module-texdiff.doc-2017.tar.xz mirror://gentoo/texlive-module-texdirflatten.doc-2017.tar.xz mirror://gentoo/texlive-module-texdoc.doc-2017.tar.xz mirror://gentoo/texlive-module-texfot.doc-2017.tar.xz mirror://gentoo/texlive-module-texliveonfly.doc-2017.tar.xz mirror://gentoo/texlive-module-texloganalyser.doc-2017.tar.xz mirror://gentoo/texlive-module-texosquery.doc-2017.tar.xz mirror://gentoo/texlive-module-texware.doc-2017.tar.xz mirror://gentoo/texlive-module-tie.doc-2017.tar.xz mirror://gentoo/texlive-module-tpic2pdftex.doc-2017.tar.xz mirror://gentoo/texlive-module-typeoutfileinfo.doc-2017.tar.xz mirror://gentoo/texlive-module-web.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-adhocfilelist.source-2017.tar.xz mirror://gentoo/texlive-module-arara.source-2017.tar.xz mirror://gentoo/texlive-module-checklistings.source-2017.tar.xz mirror://gentoo/texlive-module-hyphenex.source-2017.tar.xz mirror://gentoo/texlive-module-listings-ext.source-2017.tar.xz mirror://gentoo/texlive-module-mkjobtexmf.source-2017.tar.xz mirror://gentoo/texlive-module-pfarrei.source-2017.tar.xz mirror://gentoo/texlive-module-pythontex.source-2017.tar.xz mirror://gentoo/texlive-module-texdef.source-2017.tar.xz mirror://gentoo/texlive-module-texosquery.source-2017.tar.xz )
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=c6442251859c778eb676e4db3c5de0a0
diff --git a/app-text/texlive-core-2017-r4 b/app-text/texlive-core-2017-r4
deleted file mode 100644
index ef7af506d24f..000000000000
--- a/app-text/texlive-core-2017-r4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare unpack
-DEPEND=X? ( x11-libs/libX11 x11-libs/libXmu ) !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.58.0:= >=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 ) virtual/pkgconfig sys-apps/ed sys-devel/flex app-arch/xz-utils >=app-portage/elt-patches-20170422
-DESCRIPTION=A complete TeX distribution
-EAPI=5
-HOMEPAGE=https://tug.org/texlive/
-IUSE=cjk X doc source tk +luajittex xetex
-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
-LICENSE=GPL-2 LPPL-1.3c TeX
-RDEPEND=X? ( x11-libs/libX11 x11-libs/libXmu ) !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.58.0:= >=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 ) >=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 )
-SLOT=0
-SRC_URI=mirror://gentoo/texlive-20170524-source.tar.xz mirror://gentoo/texlive-core-patches-70.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/texlive-20170524-source-freetype.patch.xz mirror://gentoo/texlive-module-tetex-2017.tar.xz mirror://gentoo/texlive-module-hyphen-base-2017.tar.xz mirror://gentoo/texlive-module-texconfig-2017.tar.xz mirror://gentoo/texlive-module-gsftopk-2017.tar.xz mirror://gentoo/texlive-module-texlive.infra-2017.tar.xz mirror://gentoo/texlive-module-a2ping-2017.tar.xz mirror://gentoo/texlive-module-adhocfilelist-2017.tar.xz mirror://gentoo/texlive-module-arara-2017.tar.xz mirror://gentoo/texlive-module-asymptote-2017.tar.xz mirror://gentoo/texlive-module-bundledoc-2017.tar.xz mirror://gentoo/texlive-module-checklistings-2017.tar.xz mirror://gentoo/texlive-module-ctan_chk-2017.tar.xz mirror://gentoo/texlive-module-ctanify-2017.tar.xz mirror://gentoo/texlive-module-ctanupload-2017.tar.xz mirror://gentoo/texlive-module-ctie-2017.tar.xz mirror://gentoo/texlive-module-cweb-2017.tar.xz mirror://gentoo/texlive-module-de-macro-2017.tar.xz mirror://gentoo/texlive-module-dtl-2017.tar.xz mirror://gentoo/texlive-module-dtxgen-2017.tar.xz mirror://gentoo/texlive-module-dvi2tty-2017.tar.xz mirror://gentoo/texlive-module-dviasm-2017.tar.xz mirror://gentoo/texlive-module-dvicopy-2017.tar.xz mirror://gentoo/texlive-module-dvidvi-2017.tar.xz mirror://gentoo/texlive-module-dviljk-2017.tar.xz mirror://gentoo/texlive-module-dvipos-2017.tar.xz mirror://gentoo/texlive-module-findhyph-2017.tar.xz mirror://gentoo/texlive-module-fragmaster-2017.tar.xz mirror://gentoo/texlive-module-hook-pre-commit-pkg-2017.tar.xz mirror://gentoo/texlive-module-hyphenex-2017.tar.xz mirror://gentoo/texlive-module-installfont-2017.tar.xz mirror://gentoo/texlive-module-lacheck-2017.tar.xz mirror://gentoo/texlive-module-latex-git-log-2017.tar.xz mirror://gentoo/texlive-module-latex-papersize-2017.tar.xz mirror://gentoo/texlive-module-latex2man-2017.tar.xz mirror://gentoo/texlive-module-latex2nemeth-2017.tar.xz mirror://gentoo/texlive-module-latexfileversion-2017.tar.xz mirror://gentoo/texlive-module-latexpand-2017.tar.xz mirror://gentoo/texlive-module-latexindent-2017.tar.xz mirror://gentoo/texlive-module-ltxfileinfo-2017.tar.xz mirror://gentoo/texlive-module-ltximg-2017.tar.xz mirror://gentoo/texlive-module-listings-ext-2017.tar.xz mirror://gentoo/texlive-module-make4ht-2017.tar.xz mirror://gentoo/texlive-module-match_parens-2017.tar.xz mirror://gentoo/texlive-module-mflua-2017.tar.xz mirror://gentoo/texlive-module-mkjobtexmf-2017.tar.xz mirror://gentoo/texlive-module-patgen-2017.tar.xz mirror://gentoo/texlive-module-pdfbook2-2017.tar.xz mirror://gentoo/texlive-module-pdfcrop-2017.tar.xz mirror://gentoo/texlive-module-pdflatexpicscale-2017.tar.xz mirror://gentoo/texlive-module-pdftools-2017.tar.xz mirror://gentoo/texlive-module-pdfxup-2017.tar.xz mirror://gentoo/texlive-module-pfarrei-2017.tar.xz mirror://gentoo/texlive-module-pkfix-2017.tar.xz mirror://gentoo/texlive-module-pkfix-helper-2017.tar.xz mirror://gentoo/texlive-module-purifyeps-2017.tar.xz mirror://gentoo/texlive-module-seetexk-2017.tar.xz mirror://gentoo/texlive-module-srcredact-2017.tar.xz mirror://gentoo/texlive-module-sty2dtx-2017.tar.xz mirror://gentoo/texlive-module-synctex-2017.tar.xz mirror://gentoo/texlive-module-tex4ebook-2017.tar.xz mirror://gentoo/texlive-module-texcount-2017.tar.xz mirror://gentoo/texlive-module-texdef-2017.tar.xz mirror://gentoo/texlive-module-texdiff-2017.tar.xz mirror://gentoo/texlive-module-texdirflatten-2017.tar.xz mirror://gentoo/texlive-module-texdoc-2017.tar.xz mirror://gentoo/texlive-module-texfot-2017.tar.xz mirror://gentoo/texlive-module-texliveonfly-2017.tar.xz mirror://gentoo/texlive-module-texloganalyser-2017.tar.xz mirror://gentoo/texlive-module-texosquery-2017.tar.xz mirror://gentoo/texlive-module-texware-2017.tar.xz mirror://gentoo/texlive-module-tie-2017.tar.xz mirror://gentoo/texlive-module-tpic2pdftex-2017.tar.xz mirror://gentoo/texlive-module-typeoutfileinfo-2017.tar.xz mirror://gentoo/texlive-module-web-2017.tar.xz mirror://gentoo/texlive-module-collection-binextra-2017.tar.xz doc? ( mirror://gentoo/texlive-module-tetex.doc-2017.tar.xz mirror://gentoo/texlive-module-texconfig.doc-2017.tar.xz mirror://gentoo/texlive-module-gsftopk.doc-2017.tar.xz mirror://gentoo/texlive-module-texlive.infra.doc-2017.tar.xz mirror://gentoo/texlive-module-a2ping.doc-2017.tar.xz mirror://gentoo/texlive-module-adhocfilelist.doc-2017.tar.xz mirror://gentoo/texlive-module-arara.doc-2017.tar.xz mirror://gentoo/texlive-module-asymptote.doc-2017.tar.xz mirror://gentoo/texlive-module-bundledoc.doc-2017.tar.xz mirror://gentoo/texlive-module-checklistings.doc-2017.tar.xz mirror://gentoo/texlive-module-ctan_chk.doc-2017.tar.xz mirror://gentoo/texlive-module-ctanify.doc-2017.tar.xz mirror://gentoo/texlive-module-ctanupload.doc-2017.tar.xz mirror://gentoo/texlive-module-ctie.doc-2017.tar.xz mirror://gentoo/texlive-module-cweb.doc-2017.tar.xz mirror://gentoo/texlive-module-de-macro.doc-2017.tar.xz mirror://gentoo/texlive-module-dtl.doc-2017.tar.xz mirror://gentoo/texlive-module-dtxgen.doc-2017.tar.xz mirror://gentoo/texlive-module-dvi2tty.doc-2017.tar.xz mirror://gentoo/texlive-module-dviasm.doc-2017.tar.xz mirror://gentoo/texlive-module-dvicopy.doc-2017.tar.xz mirror://gentoo/texlive-module-dvidvi.doc-2017.tar.xz mirror://gentoo/texlive-module-dviljk.doc-2017.tar.xz mirror://gentoo/texlive-module-dvipos.doc-2017.tar.xz mirror://gentoo/texlive-module-findhyph.doc-2017.tar.xz mirror://gentoo/texlive-module-fragmaster.doc-2017.tar.xz mirror://gentoo/texlive-module-hook-pre-commit-pkg.doc-2017.tar.xz mirror://gentoo/texlive-module-installfont.doc-2017.tar.xz mirror://gentoo/texlive-module-lacheck.doc-2017.tar.xz mirror://gentoo/texlive-module-latex-git-log.doc-2017.tar.xz mirror://gentoo/texlive-module-latex-papersize.doc-2017.tar.xz mirror://gentoo/texlive-module-latex2man.doc-2017.tar.xz mirror://gentoo/texlive-module-latex2nemeth.doc-2017.tar.xz mirror://gentoo/texlive-module-latexfileversion.doc-2017.tar.xz mirror://gentoo/texlive-module-latexpand.doc-2017.tar.xz mirror://gentoo/texlive-module-latexindent.doc-2017.tar.xz mirror://gentoo/texlive-module-ltxfileinfo.doc-2017.tar.xz mirror://gentoo/texlive-module-ltximg.doc-2017.tar.xz mirror://gentoo/texlive-module-listings-ext.doc-2017.tar.xz mirror://gentoo/texlive-module-make4ht.doc-2017.tar.xz mirror://gentoo/texlive-module-match_parens.doc-2017.tar.xz mirror://gentoo/texlive-module-mkjobtexmf.doc-2017.tar.xz mirror://gentoo/texlive-module-patgen.doc-2017.tar.xz mirror://gentoo/texlive-module-pdfbook2.doc-2017.tar.xz mirror://gentoo/texlive-module-pdfcrop.doc-2017.tar.xz mirror://gentoo/texlive-module-pdflatexpicscale.doc-2017.tar.xz mirror://gentoo/texlive-module-pdftools.doc-2017.tar.xz mirror://gentoo/texlive-module-pdfxup.doc-2017.tar.xz mirror://gentoo/texlive-module-pfarrei.doc-2017.tar.xz mirror://gentoo/texlive-module-pkfix.doc-2017.tar.xz mirror://gentoo/texlive-module-pkfix-helper.doc-2017.tar.xz mirror://gentoo/texlive-module-purifyeps.doc-2017.tar.xz mirror://gentoo/texlive-module-pythontex.doc-2017.tar.xz mirror://gentoo/texlive-module-seetexk.doc-2017.tar.xz mirror://gentoo/texlive-module-srcredact.doc-2017.tar.xz mirror://gentoo/texlive-module-sty2dtx.doc-2017.tar.xz mirror://gentoo/texlive-module-synctex.doc-2017.tar.xz mirror://gentoo/texlive-module-tex4ebook.doc-2017.tar.xz mirror://gentoo/texlive-module-texcount.doc-2017.tar.xz mirror://gentoo/texlive-module-texdef.doc-2017.tar.xz mirror://gentoo/texlive-module-texdiff.doc-2017.tar.xz mirror://gentoo/texlive-module-texdirflatten.doc-2017.tar.xz mirror://gentoo/texlive-module-texdoc.doc-2017.tar.xz mirror://gentoo/texlive-module-texfot.doc-2017.tar.xz mirror://gentoo/texlive-module-texliveonfly.doc-2017.tar.xz mirror://gentoo/texlive-module-texloganalyser.doc-2017.tar.xz mirror://gentoo/texlive-module-texosquery.doc-2017.tar.xz mirror://gentoo/texlive-module-texware.doc-2017.tar.xz mirror://gentoo/texlive-module-tie.doc-2017.tar.xz mirror://gentoo/texlive-module-tpic2pdftex.doc-2017.tar.xz mirror://gentoo/texlive-module-typeoutfileinfo.doc-2017.tar.xz mirror://gentoo/texlive-module-web.doc-2017.tar.xz ) source? ( mirror://gentoo/texlive-module-adhocfilelist.source-2017.tar.xz mirror://gentoo/texlive-module-arara.source-2017.tar.xz mirror://gentoo/texlive-module-checklistings.source-2017.tar.xz mirror://gentoo/texlive-module-hyphenex.source-2017.tar.xz mirror://gentoo/texlive-module-listings-ext.source-2017.tar.xz mirror://gentoo/texlive-module-mkjobtexmf.source-2017.tar.xz mirror://gentoo/texlive-module-pfarrei.source-2017.tar.xz mirror://gentoo/texlive-module-pythontex.source-2017.tar.xz mirror://gentoo/texlive-module-texdef.source-2017.tar.xz mirror://gentoo/texlive-module-texosquery.source-2017.tar.xz )
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	texlive-common	f68a634c367f10b9fbb8fb02195ba411	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=958e907b7397e73ebfb390e7fe603c48
diff --git a/app-text/texlive-core/Manifest b/app-text/texlive-core/Manifest
new file mode 100644
index 000000000000..cc68115fc764
--- /dev/null
+++ b/app-text/texlive-core/Manifest
@@ -0,0 +1,324 @@
+AUX texlive-core-2017-poppler064.patch 5491 BLAKE2B 2028747fba8ecf08a47d3f4348fef40095ca1cd7127eb0f332c0bcd68f396070cbd1c8a8daa1aa52315ec7a14fbbc5e10c82d5cdbfc3ed2db31f6c43a23a7678 SHA512 d05e79ba223f22d73c2bdb83020ab61b8eb0e7d2c963635afe6badbfcd5c8654bb93eb9aba8add9e49e5866563ac8e8ee54ce231f88526423cb915eeb08c9c0d
+DIST texlive-20160523-source.tar.xz 45941100 BLAKE2B 8752212d41d6bbabc725d9b1dcc187dd4dbb34df4271c768e83c13a2dd4e7170aa162d01a15d87fa02bc1b5abee648a2d35e3aa1380569851cc21d6f33f2f109 SHA512 915fa2f5e2099dd385ef81033db7aafdf09558c0c200fed0748a8a42fd61f69d3eaac9decea334e30981af739dd81061a9b1d6853c7f6d00285fe0be40e26c3e
+DIST texlive-20170524-source-freetype.patch.xz 625056 BLAKE2B 70bcd15da1edfe5422f6dc0e736bc842f93787d45a81f823c8ddc5a420eff65f176ccce20cb17ac1dbc3b4eef3081de7dfbe34eb390f1baaa925e17f3d55c6c1 SHA512 daa0ff9306b39e6d5058c53572fdc741adad17cec9a874785005aacd0e57b75ce59f21d0d12260f4178d47b7b0e6509e49c44e2ab524613fe962ac1199a9120b
+DIST texlive-20170524-source.tar.xz 63483372 BLAKE2B 44669d1228f5be27e9d93672a4f4ead40f7f4c6cf386f2db6fef54d64f8b8a743a485fe1170904d8117b9745f71ec77db8434caa6cdd79359b1f3f387130a3b4 SHA512 18c18940992ab94ce22e22ccd4ad798253ea14ac2ab296a10ea5e9a8da9f33989f2e2641b42b564d1d5fb53bd371da3e68726b676d706b469016ad146cd19daa
+DIST texlive-core-patches-65.1.tar.xz 12080 BLAKE2B b6a51d733198e42c06bc896bb55786166b9b034ae3025c3a9a5c3e81e3aafac4732515088248c0e195bf0b9fb88e67b2a0d4a94e4173aecdaf307fedb0d269d9 SHA512 fa4de81cb694050728146ad7ca9a2a0247af7b1aef16efcfccebf9d0beac11ddcc334f333e1e1267658743b16b666a285dab902c3e75aa3b21c60946a82871f5
+DIST texlive-core-patches-70.tar.xz 13068 BLAKE2B 011cf51af10d28ac9df7c9b9d7aea2cac3e562d393dcf09d57b3c2832fe6816cf926458417577f7c9d9414639a291c09240444145bdbb3d132170f51a8a16980 SHA512 fd26b92a03cd0446007728d0c16a8c7301e254515b997e6a0bd9b325db162bf3f2a2e96be0cb185f042038205c4b4dacf1785a216c8326328682f1c42da9079e
+DIST texlive-module-a2ping-2016.tar.xz 31136 BLAKE2B cc0d99992cb780711a2a423fa26135845fa1f2cbbac76485d64a0b3184e338e7a60cdcfeaca129e6251f72110b0069c32164f9c4904d7f7c9c2edc6306f50411 SHA512 4711f184222fd95498a6d3ee94db19209c7836e6b775303926766d97921f2e8324b0aa2252a958fb619dbeca50729d2be4851a2add5503e7e8f4e713fc993e41
+DIST texlive-module-a2ping-2017.tar.xz 31136 BLAKE2B cc0d99992cb780711a2a423fa26135845fa1f2cbbac76485d64a0b3184e338e7a60cdcfeaca129e6251f72110b0069c32164f9c4904d7f7c9c2edc6306f50411 SHA512 4711f184222fd95498a6d3ee94db19209c7836e6b775303926766d97921f2e8324b0aa2252a958fb619dbeca50729d2be4851a2add5503e7e8f4e713fc993e41
+DIST texlive-module-a2ping.doc-2016.tar.xz 17524 BLAKE2B dea1db9fb3650c56161190823e4015d3e6399be3612f7e54702264a5187e72c7be987abb2cf8465d82711c9894d604fa03d79dc770bbf93b3404f18a633fbfa0 SHA512 8cfcc3b2a5dc462895a2bbd82f3a21537ae5d3fe81217b0b664b2008d6d18259f18de10e6eb3e3ac2655f96067b0f9bc6e30f69d068d9335598eb0b075eb4cea
+DIST texlive-module-a2ping.doc-2017.tar.xz 17524 BLAKE2B dea1db9fb3650c56161190823e4015d3e6399be3612f7e54702264a5187e72c7be987abb2cf8465d82711c9894d604fa03d79dc770bbf93b3404f18a633fbfa0 SHA512 8cfcc3b2a5dc462895a2bbd82f3a21537ae5d3fe81217b0b664b2008d6d18259f18de10e6eb3e3ac2655f96067b0f9bc6e30f69d068d9335598eb0b075eb4cea
+DIST texlive-module-adhocfilelist-2016.tar.xz 3568 BLAKE2B c472d7a318d1dc36d1bc4c9fff821c527b6f0dbfe6fd7ee945c209cc48e97c179bbc1ff244845f287df6dd5398640d2ba73415a7e228b5aeea7ef121950800e0 SHA512 637cd01a30bf9808b7cff6a0024230f20d0bd68911beddbd4ef64072855d28ac57d1df0f7cf4b78e376aba1f06f979f03c135bc65b58ef1beb9a0c8128b2c2c5
+DIST texlive-module-adhocfilelist-2017.tar.xz 3568 BLAKE2B c472d7a318d1dc36d1bc4c9fff821c527b6f0dbfe6fd7ee945c209cc48e97c179bbc1ff244845f287df6dd5398640d2ba73415a7e228b5aeea7ef121950800e0 SHA512 637cd01a30bf9808b7cff6a0024230f20d0bd68911beddbd4ef64072855d28ac57d1df0f7cf4b78e376aba1f06f979f03c135bc65b58ef1beb9a0c8128b2c2c5
+DIST texlive-module-adhocfilelist.doc-2016.tar.xz 9876 BLAKE2B 91dd2728d567450d55a6e1503d9f10fa1bde452af9876cfcae164269c0ceeef3aeb834689d4aee2295327ea6244eb15fb96f5d4f5ce05986022fa1e193b8cd78 SHA512 db69dca80f163a9c8d1eb7d911b5c030341ee3d93a383e0dc4b4d60715c736c80192e61b665310bdc9c819b8fe702f6a28049cb5e08bf87d880fcf27069c9beb
+DIST texlive-module-adhocfilelist.doc-2017.tar.xz 9876 BLAKE2B 91dd2728d567450d55a6e1503d9f10fa1bde452af9876cfcae164269c0ceeef3aeb834689d4aee2295327ea6244eb15fb96f5d4f5ce05986022fa1e193b8cd78 SHA512 db69dca80f163a9c8d1eb7d911b5c030341ee3d93a383e0dc4b4d60715c736c80192e61b665310bdc9c819b8fe702f6a28049cb5e08bf87d880fcf27069c9beb
+DIST texlive-module-adhocfilelist.source-2016.tar.xz 16408 BLAKE2B f3d72e2c9abbc6594b34eebf2f1ecc18b6adbca55f7c14fd5d87a9da5642665ccd55f61e4204b540f5ddb639e062283462ad4136718a1cf5e2c191b6ab9f431b SHA512 1e74ead0f3cc61b6985e530d884702867c2cb9af1e545b697adf7ef1fcaa49cf01ac768cd1c5161900feccfcb3accbe96b3da7b62219e9dac5cad89cb04a35f0
+DIST texlive-module-adhocfilelist.source-2017.tar.xz 16408 BLAKE2B f3d72e2c9abbc6594b34eebf2f1ecc18b6adbca55f7c14fd5d87a9da5642665ccd55f61e4204b540f5ddb639e062283462ad4136718a1cf5e2c191b6ab9f431b SHA512 1e74ead0f3cc61b6985e530d884702867c2cb9af1e545b697adf7ef1fcaa49cf01ac768cd1c5161900feccfcb3accbe96b3da7b62219e9dac5cad89cb04a35f0
+DIST texlive-module-arara-2016.tar.xz 2333636 BLAKE2B 4422d6171af16f51c67bf6f48c5d981f85d3b45b7a3f051c6272db2525e6d0fadd6a0a276780339d15f9726019dab585eb41a0bbe4978d8dfcab52bc0586a4ec SHA512 3acfdc5872c866f8c883bb5e0ab97bc15e67c8afb799a633905493c82e20bb1183a50786d4d39b41a21e2b0fa51a8d373e645379774249ddfca5a851526bff21
+DIST texlive-module-arara-2017.tar.xz 2333636 BLAKE2B 4422d6171af16f51c67bf6f48c5d981f85d3b45b7a3f051c6272db2525e6d0fadd6a0a276780339d15f9726019dab585eb41a0bbe4978d8dfcab52bc0586a4ec SHA512 3acfdc5872c866f8c883bb5e0ab97bc15e67c8afb799a633905493c82e20bb1183a50786d4d39b41a21e2b0fa51a8d373e645379774249ddfca5a851526bff21
+DIST texlive-module-arara.doc-2016.tar.xz 2748360 BLAKE2B 91c82f7578454a60019208da4e4825441ffcd1bff226cb1d8bddc2f59cff5a9e02207967bc3bda54f2fe36a6650cce172422a9b43993fed0e1843a1491eeec27 SHA512 26cce9f3563aa76863f62090dba9bceea01ceb27c48f3e4ce6f7ed260b99916d8b48337a40b9bc8cc23edf38be738054ad7b00aaa15ea58a57433481484d5b45
+DIST texlive-module-arara.doc-2017.tar.xz 2748360 BLAKE2B cf0233cb8c5bbf3b871889f189092a7334c6a17ed6dfb6dee29997031eecfb2921b389c65dbfa5ad546f18941ef927f96be04de79bcbd200aa415df55bac8560 SHA512 5e917d8f326d1c9dc4568ed9a9c27c9aa31513c5188c66986056138ee4144b79b9fd8111a8638b0c42ae5c0fde62ba89bfa2f98cf9d2238a7ed929ae917625c9
+DIST texlive-module-arara.source-2016.tar.xz 22508 BLAKE2B 911b0cd932bfc99772de4742b476012cc285d08e8c601c3cfe7468c1e136f16b48e513867c2551ef33073c2aeec13dd4212f538d853fe139e8f7835bef43d0a7 SHA512 fff9a37c9a3c8ddf835552c9ee5b87234a2db96b699a5324cf880bdf68bbece8ed2329f57c4c646859ccdfc065e3fde7e413014727a607eb70bce8aaea48e536
+DIST texlive-module-arara.source-2017.tar.xz 22508 BLAKE2B 911b0cd932bfc99772de4742b476012cc285d08e8c601c3cfe7468c1e136f16b48e513867c2551ef33073c2aeec13dd4212f538d853fe139e8f7835bef43d0a7 SHA512 fff9a37c9a3c8ddf835552c9ee5b87234a2db96b699a5324cf880bdf68bbece8ed2329f57c4c646859ccdfc065e3fde7e413014727a607eb70bce8aaea48e536
+DIST texlive-module-asymptote-2016.tar.xz 277476 BLAKE2B edb91ad96cc568a71db392d1d732b2b1a6f436e375db9a2889e8de81a458696e62967e18d397a55695961070e022273da00d10cbe281f38a0695d65ab5e6833f SHA512 cc806e6c201cc9a360b621f292eee69473ad6d29beb1a9e68180cc908de7c42617bc167a568189af39b1e6482ef88799bf36afe179a118ac25b47f4858da9e49
+DIST texlive-module-asymptote-2017.tar.xz 277568 BLAKE2B dc7d046c5aaa1f7d51cbe930085a295b913123764064141c6fee171b80516a4ffc64236540248889558c5527e891e882abecb0f4b4cd12bb9396838e21672d3d SHA512 184cdd0ae495ce695309453458b8a6db2e29950e192a45c86f7b553823ce978eacc506e5e9454de1b1b4a2ed4c12450b0b59a006dff954d008311437aefeb3f9
+DIST texlive-module-asymptote.doc-2016.tar.xz 1809720 BLAKE2B 9910bd40fa00aa9f8b6b9cc0a77f74500987043ab1b0315aa213aaa74b29c2fed286d6fe8ee9545210dbc9def2b148b7e19d0aa783868e28217ca78686028a04 SHA512 35e657b556a7f5c867893bd0cb1a708064b64b86eb292a22123a69e0153c5c9820f68ec3209a7af2ee1cf813726afea1c59c30fde00974fe62458622834f67fc
+DIST texlive-module-asymptote.doc-2017.tar.xz 1791956 BLAKE2B de5bc12e4ca274bc7575a6b7184b2c1f602c128c37a389eae2c2aa2580018fcb1408d1543a5dae03fd9fca8a8f47fc9d96a6814afa3868aa5260a8320e282f82 SHA512 50a12a697b9b9c45a4137af23d88d7dbbe2cbfcb091655feed4511418a559863193236ff8a2c0c5730052d6984a03aef3ceddf1d96fc9ff838b57459fc288dca
+DIST texlive-module-bundledoc-2016.tar.xz 12208 BLAKE2B e00d4920dc2cfc558d2eee7463814638e90db6b549a83baa8f793d8a4e79ce1cfb3ce06be9d66fc5b5d9e178a4e4c5c7ec1bbb37eab443c6029ba4374277bbb2 SHA512 0f1ac0081ef20f4154534211dba7addfab6e252a12a1f023b8f1e21184e738694bf9f66e045181b83ec348c0add209ed3ee987603cadb3fef75760a288524ec0
+DIST texlive-module-bundledoc-2017.tar.xz 12208 BLAKE2B 54be93937a61573bc64522651dbe23e6e72336dd8170e6c9b226e30f6641d32f47475c7b2f8ccb67f6d13bf45551d45a61e6f908413e8cad53fa3555ac094c84 SHA512 075193471d65e6b7eb61a1cd18b1380054467b346bd66f82a02b060f259e0fd1b49f510ae088579f555360effd40ae3a6e3a35dde0e956b8271845b445507ed1
+DIST texlive-module-bundledoc.doc-2016.tar.xz 37392 BLAKE2B 642564e479ee5312a9c38beb70967ae1915659ac5cfa7d00fb2478d90f754ee2fa26c2f8b55f3bfc68c2003ac724b5e0488d90dc713bc3d52c2b2f75a2841621 SHA512 f765ad03ec75b1a0f7d577ac8c3cd03e196e6dea569836eb3a02d6aa50a7cd0084d8a41eabdc4207423291eb8e7f4002340c32e6d04c07968a8533cef80a6b97
+DIST texlive-module-bundledoc.doc-2017.tar.xz 37392 BLAKE2B 642564e479ee5312a9c38beb70967ae1915659ac5cfa7d00fb2478d90f754ee2fa26c2f8b55f3bfc68c2003ac724b5e0488d90dc713bc3d52c2b2f75a2841621 SHA512 f765ad03ec75b1a0f7d577ac8c3cd03e196e6dea569836eb3a02d6aa50a7cd0084d8a41eabdc4207423291eb8e7f4002340c32e6d04c07968a8533cef80a6b97
+DIST texlive-module-checklistings-2016.tar.xz 6464 BLAKE2B 6dca6d2144f55419f2441e3a8bdfd9eb80e28cafa28ac826a4a03f786d3bea10ba98807d77de82e2218026ebaae5818780fca1adbf9fc2c4f648bd6e2c64bafb SHA512 07ad9be070c095e9342c74e737c2fac92bfceffb00aac267df94c90b03b1c88d9df5774fe29827c40f9ad8442f28c4bda53d3e2df21fa9fc18b497b01b106c56
+DIST texlive-module-checklistings-2017.tar.xz 6476 BLAKE2B 709a4935942eaacd2cbf694f2c06a7e6ccb9866577e2dc0df8bee3a47e471f0db71b5e47007f02f6c78f26d08f308b5afa3e4e4f06b7bd0d71deb75b5c2041cc SHA512 c58753601d1af48ec2bae629b5671fdf1de8f055058763a9328a1fea9829960a86df836358fef16985747b31f4e1a569d78d4acf167cdece2d34eb57ab738548
+DIST texlive-module-checklistings.doc-2016.tar.xz 364456 BLAKE2B f58c381f7236c4f4341b7fc732e27a03b7705c23a9f33c66f30da663e65dab3bd087a4738890dcd57ef5384eefd92cb2b4881738f87695016c1eb4209b4231ca SHA512 02e261ed793694a9ef339bfdbf66dbd8810619ff1a76606b9f989393963cce273f9c9014d9acd7f040e8341f9c3bf750a2c9e660441257d72a03363bbc55fcf8
+DIST texlive-module-checklistings.doc-2017.tar.xz 364452 BLAKE2B d9e5855dae2195c2d085277abfd1c6253c2d46c49bdce4548d5720cc0e21104cfff618e8f30a1048d73c7e02d8922cb62280de21f2366f637ae8bbba1d5ae344 SHA512 771246b9ccc70cb337a3f55e0d04e406c338217298f091c9372533bb55c5c98f0947287b2f0340bda049f5f0acbd33d2ab9e706426c5b487e0a31460863d5e40
+DIST texlive-module-checklistings.source-2016.tar.xz 10952 BLAKE2B 3136309f37c10c938c67fe2cfb7286d8275bbe801074e65c3ae138c35e751cafc9ea8acc511cea318661187a9910676a4f7060525063fb657f0f7cb40558bb9c SHA512 f77af99ecd80e10aa43d6d232252acd02ba5d62599348d6d55b4ab90d10575cba33dd1eaae460ad93e1d17447d454309d5525bc8fbfa2b6839585f43b5c97090
+DIST texlive-module-checklistings.source-2017.tar.xz 10948 BLAKE2B 6ddd87b790a5ecb35382218452f787a0fcc43bfb59455f3660b1b5a2176eed033b72aecd7da0d2f1ad0efd21085f4cb468c1487ae7609eba9f2321e2dc722f92 SHA512 8fd158560f0bbdc7ea996b510ca69cf30dce26decd6c963533ea80a6eba7d6543c72e12175fc568725fbd8e4c8226503cabc607b52d68d51901bc8f32146e818
+DIST texlive-module-collection-binextra-2016.tar.xz 848 BLAKE2B 2a417424ea3cbd4333d7dd0bc42d8a50a56fa61ac40f276759576d71c2d94969a44806fb57a3d6d795cfd71846fe332f352fc64b47b62fef262ab7569c352fd2 SHA512 ab5459f4a6431f22b88255e3b2114ecc2cf34e58e5d450da7ef70904511a6596061250c27b23fcae74f955b8e040f1820e444f504a71ae3f41d0784c67aaecdb
+DIST texlive-module-collection-binextra-2017.tar.xz 848 BLAKE2B 2a417424ea3cbd4333d7dd0bc42d8a50a56fa61ac40f276759576d71c2d94969a44806fb57a3d6d795cfd71846fe332f352fc64b47b62fef262ab7569c352fd2 SHA512 ab5459f4a6431f22b88255e3b2114ecc2cf34e58e5d450da7ef70904511a6596061250c27b23fcae74f955b8e040f1820e444f504a71ae3f41d0784c67aaecdb
+DIST texlive-module-ctan_chk-2016.tar.xz 512 BLAKE2B 2757ec920c4c058246157553950036229bd4a685193c19faa9b9d548d09c93ed7348dab350549939b53ee65572c5c93448b59243e855099ab43aa8f3bc672106 SHA512 b1a15b0ad26055dff982bcb30d8798ac0dbc021f1265239118a97b0fe0fd53accb3d2c215365f998c317d25eab1bfc8b1b52f481b166e8fc88dcf37931abbc85
+DIST texlive-module-ctan_chk-2017.tar.xz 512 BLAKE2B 2757ec920c4c058246157553950036229bd4a685193c19faa9b9d548d09c93ed7348dab350549939b53ee65572c5c93448b59243e855099ab43aa8f3bc672106 SHA512 b1a15b0ad26055dff982bcb30d8798ac0dbc021f1265239118a97b0fe0fd53accb3d2c215365f998c317d25eab1bfc8b1b52f481b166e8fc88dcf37931abbc85
+DIST texlive-module-ctan_chk.doc-2016.tar.xz 222000 BLAKE2B 4cbecc35465c0d3ba0c4067fd1f9e50c03d76e1f14b6097ab32ea6d8268191ce7500e4d53f90752c37c9a1271f7baa21da63895583129fe7f36a8906ccf4f2bd SHA512 b19b54aa1d651eb83f102c0798feffc97c973a3836dd2ee37eef13e2e83d7e1d2a089a73504a514bb2868e3c838fe94f6d94c85a19183666cfa4d35b470cc243
+DIST texlive-module-ctan_chk.doc-2017.tar.xz 222000 BLAKE2B a5c92248896a0160e8a81e110bd8e93355769fa264453c7720e7312f94edea56557c1f8d1c23f4afb47e78b6f8d85b5a5f46cd612105aca9098c504c39e7df0d SHA512 cb3c694bb7b2f361b9e05e8dbd8d4594aac84886d1138e55b45dc2cb102620d2ec904f4e061e931d1ed57b410efb3d6b7fb699fc7f714d049337f285e531ab6a
+DIST texlive-module-ctanify-2016.tar.xz 8140 BLAKE2B ea6329c257256c572bcedde069eb8306cf752dc95dbd90a2113ffa5a18c670cd443be4945af7e43a5dbb37a7d6a8657b97b97515750ee0cdb1dd016dc3fcadbe SHA512 e9239e70b17f109dde7bc7d5475fd3bc16153591f8c703ed91ee4086d2cc5c0d188a49a877691866f2bc1fe2d92e72af1533de581827cb1e79ef59e10006e31e
+DIST texlive-module-ctanify-2017.tar.xz 8228 BLAKE2B 73d304f42f0f88cfb15ec6d60f375582276c96a846b061602e5b80fb9ff5b052244db74fb975638d6782ab25baab2cec45fb1a9e1d2b7109130945bf2ae3697d SHA512 335cfca62d46fd278f3c9b80dad62ca7a10310a5101c53fbd3060a4025b388eb962f9f41b4b7dd9bc896f4b7c32e127ac0b901ebd1f7a9e8a16a6ce749cbe92c
+DIST texlive-module-ctanify.doc-2016.tar.xz 58036 BLAKE2B d2b822d4b0834cc90ba7836952b1734b274ae2693788d25af36e5202bf6d36e709a0434fcc375804518db2f635ffcda7779eddcee690a86443c0b2c242234330 SHA512 3e0270263d6685be7ebb26df5b420fe696fd818db630fa0b7f8d839192b5204dc3886ed53e7e494858b08a136b477b24d5c90b7d5271917a66c2f63ba96c433d
+DIST texlive-module-ctanify.doc-2017.tar.xz 57964 BLAKE2B 973b48b1f35faea3ffea7ad260cfaacbb11e44047aa5eec4671e664da5578d3fd96873ef8524e0fc89b71783ebcac38310ee70c167b41d04650f59ec6f95bc52 SHA512 c845fe36bb7c388e07a254938796181dc19d36a5947cbd9d571ce983ef2148bcad275f6f593386ef18ac26490b743b6db3a337cead46e20cc952946a7f3fb89e
+DIST texlive-module-ctanupload-2016.tar.xz 5108 BLAKE2B 889704ff7e23c84c31785b0a14c310e35d94d45aae4671efed4495a4667c9ae16aec75869c9e164d4988adf56e38fc607503760290b8c8ee80772c47a17ce3f3 SHA512 814d68f2870afc8c22d411dc8a2c55fe00851258c315b0be0db28122c939d4b3dd5a446579a0da3c66b807c288eb38dfabc855af9cbcf4fad3905b5cb7ecc1fd
+DIST texlive-module-ctanupload-2017.tar.xz 5108 BLAKE2B 889704ff7e23c84c31785b0a14c310e35d94d45aae4671efed4495a4667c9ae16aec75869c9e164d4988adf56e38fc607503760290b8c8ee80772c47a17ce3f3 SHA512 814d68f2870afc8c22d411dc8a2c55fe00851258c315b0be0db28122c939d4b3dd5a446579a0da3c66b807c288eb38dfabc855af9cbcf4fad3905b5cb7ecc1fd
+DIST texlive-module-ctanupload.doc-2016.tar.xz 174964 BLAKE2B 9443af045cbf6a6aa160300ae40843eed0590eafe73537ae5cb2d16269ee62addb06fc9e40d8b0ea0245786dc31e4fa0ec34079f980b8b5b424be03da7d84028 SHA512 e0a50984563a0ce6ad326a12f2095017fe16708c869dd3913ad3b9003f450a812879eb095c8c73e698e34d088b607282a0538eae540104c4a7b8ed24e675b8f9
+DIST texlive-module-ctanupload.doc-2017.tar.xz 174944 BLAKE2B a8a104a280d4dfa84ac35a277501db71dfbed72f15fa9916f057aa896e461d456f491c427d17485fac3136b9677c9b2819ed3b9be75b969d1dcd44e7243c2bd9 SHA512 29f8c0649a249c02f05b153590de221eab0147e093c241e78521d0264045c5de3f9f26a5f008294ba10622f4fe7c7cb00217025282faef22cca2d4d6a87a347e
+DIST texlive-module-ctie-2016.tar.xz 408 BLAKE2B f484d888de85d18e88818cd39e38a62d33c0eaf9f708e06ab87a34d753058faac30f9c5dfa3979e1bb3729a99a11a05d9cafb8e40d39ac7900d8effcc4f751e6 SHA512 686e4d1682f73e6e881ee560a03cd757c6acd443c182487ca6c76fdc2247e673a9b0b1b1b2abb191b52f1a53bbbc493bed561bcd915fa27d5c565b60d6ee08b6
+DIST texlive-module-ctie-2017.tar.xz 408 BLAKE2B 73f6a6343b78fb7b1b6ff2d60e2a6cd39d7549853ceb2ecf33e632d1d4aba72452c97437be06d04ef32587f3e21c8cff74fb50c0c154f929c6e92d2f6636ae91 SHA512 b881e721bebd88dfe7de6163f76c424ef85d480cb09e52d9b2b02c6224578fc2a416e1afd3ef803e5cfb7428fea53879029f1ff5c52d7377149cb4fb9ffa0722
+DIST texlive-module-ctie.doc-2016.tar.xz 16580 BLAKE2B 2ab872f2b201ad432e60dd81ee3e788d808a2948cc09155766de3a0d721ef27d3b64ff90d18e753a3d85e5a838e1c126aecada33dfa00502b8b569a8154f1a39 SHA512 311931484aedb2c217acb7760de9406bfd6e5922c3fc1a9590514ac27087b27268b22e4ec7d8be2b704aba9ee55803ee52ceb6431c6aeb27b23ab8a45c613afc
+DIST texlive-module-ctie.doc-2017.tar.xz 16580 BLAKE2B 2ab872f2b201ad432e60dd81ee3e788d808a2948cc09155766de3a0d721ef27d3b64ff90d18e753a3d85e5a838e1c126aecada33dfa00502b8b569a8154f1a39 SHA512 311931484aedb2c217acb7760de9406bfd6e5922c3fc1a9590514ac27087b27268b22e4ec7d8be2b704aba9ee55803ee52ceb6431c6aeb27b23ab8a45c613afc
+DIST texlive-module-cweb-2016.tar.xz 12824 BLAKE2B ef4d1153b371df9b2f5f2241bfd40a6012bb1ef6fa4460418f679daac24adaa52576748c53167b1ce4a273746f721567e3251b88e660c77964b061f00c54ca23 SHA512 935dc109708e6eaad5c5dfd8d8867f44b96f2855513901739da418decaa4bb4ae536a0b6a546c28fd8600172ba57af42a1ee0cd23bd76ac17ca229734ea98d7f
+DIST texlive-module-cweb-2017.tar.xz 12900 BLAKE2B 703d65399507ea73329a1f69605ac97c8abd102ed5b57cf1505c48417385d2befa0784fce6c255145f1915fc49adfd75f90c9a058ae4f7710353d5fa437a1514 SHA512 6e8bea28c9e8288d186f46afdd30b864ecd0abc20fd687f0a8a35aaa9b1ceab0d208af6d0bb5eb5fd0d47a57d0d3826610dcaaba5e95c1821590ade62207548a
+DIST texlive-module-cweb.doc-2016.tar.xz 81176 BLAKE2B 1f90cc11b5ce84d8c91e0c76368a0da5c182240395833072711a8e7cd6e836bb2ffa8e56039822a6f850e78ba858253f3ce753cbf4d3688804e8a1fcf99f136e SHA512 b06d50363037d34ea51460f636c57aaa6d9dd6aa4906a78bb96b0b79e1363423ccfa2c050aca1a995ba48ad36593aa79a8be4b1fc64191a9651421bd50147897
+DIST texlive-module-cweb.doc-2017.tar.xz 60908 BLAKE2B 426ae54d4e0d2d46c8e62b7283463d0ef126befcb2e7460cd15c44a5471e93ac8606110e050d2da594950c5b714bff42f3dff20003c3e75c690bfe0b99ec1bda SHA512 10db26820e6d3998fc0be20f73088fe7a2aa06cedde32aff51a539d71ad49e8e7f51a25950e1db578770dff78a8f5a486f28590ffc0a655a72cc04b4072d0221
+DIST texlive-module-de-macro-2016.tar.xz 7848 BLAKE2B 6216e361fface98b0cfb93d842136f6f82f61c013df0dfb6cfa6c3302a63fe0325f00aef42fc73ca8f57abf9edb5de4c7cbc81e685f0a2a2a779cd350cf1a6f3 SHA512 c1ca050042c263b80b64ca744be2f3153f94fecba7680e007f5be64c9df1a140343205a764ff7bed8a561ecccaf522fb7e89423faf4e665725716ad0f3a26a1d
+DIST texlive-module-de-macro-2017.tar.xz 7840 BLAKE2B 4d50cb8d5213d652c7eb493e32eaad381310b385a766ee43a27377c39e02c4d8b8338149cbf66883e779f5fd94f097c578e9690d7ad89af50e0977cd843cbc06 SHA512 759f9146b37d485bae92cd6ecfc4291ece42017ce6be601669d989e52229270e04d6e8e26a2a8db46cc9f6f1eed3c5babe57bcf7c080afe828e2320510a3aed3
+DIST texlive-module-de-macro.doc-2016.tar.xz 49768 BLAKE2B 769ab00ef89e8aa5e3b8c02ecd5815f33af18e795be259554b099eb29d6710680d97102c17cad6735f1bfbaa7b0f8d386b9d8914f54acfea844ebbf015239bce SHA512 5807f590961fd581f4a30068d613345af89e7f21858cdebf70f48cf714e105026e6b7806ba65b9a1ca0ecf138f02b1798cd4e9cd91756d6bcbf925f7b5a63915
+DIST texlive-module-de-macro.doc-2017.tar.xz 49764 BLAKE2B 935293c1dd2f509b49320f0f91e61cfee825e3025cdb63e7cbf4cefb7cc8b6f3c30b26f84bd08cb80ad6177e224e37973eaf7da9780365176fb9929211ba3e88 SHA512 00784c0670b5f11ed715f76745acc3ebc098b318ca2b00c294dae3ebf162af0f47b4192d993f7b1f5d443eadf0f7a2644cfc2bfb71956eb680cad2c593a29cee
+DIST texlive-module-dtl-2016.tar.xz 580 BLAKE2B a69a36d545938321e86fdd20083f0ea3d1fd691115a5a45e4e04c290c3694c27d483a90cae7b082acda1266e03dfc473af69bacdb6f356bce70aab5ac0769f85 SHA512 a10e239f20462a47c8ca0955dbfac1c8d3fd6a73ccaeacca07afe4dc5b7fcb70768cb9c61cbe245b306cae045e8179772c69cfcbd866f6b0f9388c6da54b483f
+DIST texlive-module-dtl-2017.tar.xz 580 BLAKE2B a69a36d545938321e86fdd20083f0ea3d1fd691115a5a45e4e04c290c3694c27d483a90cae7b082acda1266e03dfc473af69bacdb6f356bce70aab5ac0769f85 SHA512 a10e239f20462a47c8ca0955dbfac1c8d3fd6a73ccaeacca07afe4dc5b7fcb70768cb9c61cbe245b306cae045e8179772c69cfcbd866f6b0f9388c6da54b483f
+DIST texlive-module-dtl.doc-2016.tar.xz 52976 BLAKE2B 9a8830db846e3297c8bf5e0c3c4a9ccf98546dfcbdce8379b84a29056e9f441117e8e7ec3647e606c346911be5490dcc2d3a33760d08b4b9d4b3c26ee0e57a48 SHA512 665c3913285843b7ac6d4571d94eb70a29b64bdefcb55bcfc9e21e2fd5f290840f66d83c58c35945dd9cf5b53c5da08c45bf6082f444e948efc2547580f7a192
+DIST texlive-module-dtl.doc-2017.tar.xz 19580 BLAKE2B b4bb591348ddddec9ea975f2ad10fbe5db5fe786c900b236d811490710c0eb92a5804f2347f7bc478780fce54fd3451b81b328269346c24513e197d7a5d764be SHA512 a340bf2a2af68edca51f4c6a7cede18faa8da5fbddb26a134bfc28e4d79dfb33631a8ee562fc1598596453e4030fa6ec343dae588223adadfae5dcc6953b3169
+DIST texlive-module-dtxgen-2016.tar.xz 5696 BLAKE2B ce115766217747652f48d09bad97ca3cbe2fbd3e5899abd5443cdfa9bf930b8b9075a8082306f8f4583bb9869d25f0a67070849b5dc6cd2d35d59c468709e2e5 SHA512 969342405ac223c212038e241b2396c4300b7d15c65f66d87a32a7fa7332fca25256e3aaed6ed9a23639b1b6e8acad20779b238b2ba8a75a8baf5002926a6f77
+DIST texlive-module-dtxgen-2017.tar.xz 5700 BLAKE2B 5dffbe3fa2894984f1d1b6458c7260439497d6a7ea64a2967ddee9fe59c719c11fd2e32c1c0f27c7a37347bc9ea2332dd82f8dac1cdc64110969bc0194e6dd72 SHA512 faaf12b7897a2d9f2d647096770e0f65bc44fd36b84a6587672c9551cb79627c71bd6cbf251bfe3ebc407d7537f9e8d42f5b301df7760afca7269cf2e6699915
+DIST texlive-module-dtxgen.doc-2016.tar.xz 46204 BLAKE2B dc54283d3f0f04ff79215a0031d2948d392419905ba87d52f5de5d3956b8b8c98a0a9a942bf9543a7c12e60d49d5c84e6999bbb248eea50a6e0f79f16362302e SHA512 25ad47b247cc8b53b388f776b803959d0c3a532f8fc3092696aec1a6bd08d13373963cc9708173d946af696aba172de7e2853eab4ee6c4e70ca7ad106b437834
+DIST texlive-module-dtxgen.doc-2017.tar.xz 46204 BLAKE2B 0ec76f5e6713dcbb748ba94b14f753c3e9695eb1f0668444bda605bb55ee72b13482b5e5f1ce2547a84fc37d60f592ed7970233c48dde9c794a64f45249f75ed SHA512 e53316cab21fd5c9902c566dff44d4f16da6d666040185df3962c8119726fa135acdfe1f08b5a011a3e2287d157b3ea98091db46a5dfdea68994edfedc04a90c
+DIST texlive-module-dvi2tty-2016.tar.xz 472 BLAKE2B 40093df21490c2aa136b2971255f1040e198bc13ad74afbac64f7064845a29418fc8fc94f7befbf63cfa242b10b5579b3c2098e910c76771cc6accbe9d144357 SHA512 94b16b7f07d0a2b80b4a356d76f8dd38ebf948be85f691fa132ae971a6ef29b09ba0f89d2633d1109eb8ca6fab1842919a83144763b5a4774ce41b130f42fee3
+DIST texlive-module-dvi2tty-2017.tar.xz 472 BLAKE2B 77de3968ff65aa8b98e86487a77e2bf06f886ec476619f8e92324112b6095775603e6f495d5fa3d096b1d59a2315d57c19e0521f20879c0d046611a74cf44ad4 SHA512 21a8e5e9f077ce1fb1e6b5b249d8eed4a75d007bbff65c58edb83fe07932440568d8d8ad19ac714e12e57d0aef56ca2d5e6276e51c249c172498ca404cba55fa
+DIST texlive-module-dvi2tty.doc-2016.tar.xz 36292 BLAKE2B c4f66660f4468a9824381a9e562da325f8e48362ed8b72b0bb9dededd6645d854c70934f0807b8455b9ecbb52b1d1759125fbc284fa2ce4f0a4d7726de2e209c SHA512 3a3b1b1d38b16525b1275c356b156b1223f00343e7646dcfadc699d010bef8a968aa8a2c9dc43a81650282f90fd3de7f3a1fe7ec01218833c24cc7be75b0ceef
+DIST texlive-module-dvi2tty.doc-2017.tar.xz 10964 BLAKE2B 799fff8a088c6614e9cd99bbb4c2590b0a4595490fd4797d9099f1b349fd0d84b6e995f2c2c1049cd3dbb08eb17fc667fbe415b9fdcea29a356718f9dcf3d92e SHA512 5384f60e4b72858c10503f458a50f0d554bcb081cbf3614bbef77aa351855bc70b69a59268b8a3dc1bcc2a26ecfbbe06d424a888806fa7a3d05df1b31c1b1532
+DIST texlive-module-dviasm-2016.tar.xz 9516 BLAKE2B cdcaee4e5fd57e17e39a267190a48f02cf5f96ad5f62fb74d0c608629f3d36d10f992ab9a0941d189126725801753cb368a1cd375cf27125fb0b388a3c63a5eb SHA512 25bbe1b0a90886a025cd1b64e63669baa382e1ac4517211edb8d01dc7876cfacc3dd13358727c4a5f3cf171aa90f8af7c822c31c8dbe3bb55512eab97ec1e4c9
+DIST texlive-module-dviasm-2017.tar.xz 9516 BLAKE2B cdcaee4e5fd57e17e39a267190a48f02cf5f96ad5f62fb74d0c608629f3d36d10f992ab9a0941d189126725801753cb368a1cd375cf27125fb0b388a3c63a5eb SHA512 25bbe1b0a90886a025cd1b64e63669baa382e1ac4517211edb8d01dc7876cfacc3dd13358727c4a5f3cf171aa90f8af7c822c31c8dbe3bb55512eab97ec1e4c9
+DIST texlive-module-dviasm.doc-2016.tar.xz 664 BLAKE2B 9700ff1c82d4363424a731a7edcb9cada39c46b7b22f89dc8358637741aa8dc19575e09ceda4ebab152e916793417726fb0f9b9a85c59c3a074e28948c99b5fb SHA512 88e2ade06aa8f4effc61e52d3cef76bdb3e2ac51b16e73f3a50f6183e3f11b144faf98bfede4d8a49627c247740f5eef9b06f76bc6d2838f65bd1592d65e1991
+DIST texlive-module-dviasm.doc-2017.tar.xz 664 BLAKE2B 26782dff43ab32f90d1d74ca7cb5af8250fd6d7019e3e99762a50177d068f796976308749ff64602b11e86734a90d2e2bb11e976d1c6fb274161bd101987ffae SHA512 13b9b6fe891fe6c0e5c7819c74225b2b943811452562a684c1f71fae7628ba167acb48178187a5a6d56625744ab840aac90cff15010e64e36c3a4eeb1ed84ceb
+DIST texlive-module-dvicopy-2016.tar.xz 524 BLAKE2B 088d69167909c33a373c581d01b1dbd7b0312d7cb79438fd95c6657dd3f35af59aa68630ecf5be688f9a03ae899cec346a3d31a43a621d1c45e1fbd4d387454f SHA512 537444d1baa72d23c09c42a53c39bf111a363ad683fa94851baa186b856730e37c01ea5aa60076a3da5475503fb134c44f8b32bc8bceed3d63e809d1e4161c0a
+DIST texlive-module-dvicopy-2017.tar.xz 524 BLAKE2B 088d69167909c33a373c581d01b1dbd7b0312d7cb79438fd95c6657dd3f35af59aa68630ecf5be688f9a03ae899cec346a3d31a43a621d1c45e1fbd4d387454f SHA512 537444d1baa72d23c09c42a53c39bf111a363ad683fa94851baa186b856730e37c01ea5aa60076a3da5475503fb134c44f8b32bc8bceed3d63e809d1e4161c0a
+DIST texlive-module-dvicopy.doc-2016.tar.xz 18332 BLAKE2B 521dd2c316381f531a2694396ecba92b440fcf49b3b2084433e4ae3900891cfa3600f8fd37a124195b7ea377f8d85fde2de6841ade4f18ca789956f8f23fe3e2 SHA512 d5795057b51f3744a415b155340fda499b1e2712f55782f330732140981d3cd74f9126d882b08064d2a98b972912959975b89f18da5f763273db66ea149e0ba2
+DIST texlive-module-dvicopy.doc-2017.tar.xz 3592 BLAKE2B 1f610dd0d92f39b993cc393107aa55e921819fe04930fb8855215f36646e0f30e2d7af6571c7ec5ae72890881cbe5be164ec18bd3390e1a7ddc4457be64bc563 SHA512 c308ffafbdfdf152abd842918c73aa55689a514a1de6cdc53595ea988bc7aebacb022efc77bc5b7eb0469e619f1fb6916e2a3515ba5dfc6e4744a22b64dfaee8
+DIST texlive-module-dvidvi-2016.tar.xz 468 BLAKE2B 0e301f188aca041dac510018e4da638194cfac151b9229f4ab766ce021bbcbc153dfa39558cc2be696859eb153175044ba0a8aae3447ef49d47f0e512c419b02 SHA512 29ccf47b7a4d81999daa3a16b774783d582df2b9af1dd814ba09329b5fdcda4af8a9183af31e2f9c4c416cf26425c2443571c9249f992dde98058824a64bdb31
+DIST texlive-module-dvidvi-2017.tar.xz 468 BLAKE2B 0e301f188aca041dac510018e4da638194cfac151b9229f4ab766ce021bbcbc153dfa39558cc2be696859eb153175044ba0a8aae3447ef49d47f0e512c419b02 SHA512 29ccf47b7a4d81999daa3a16b774783d582df2b9af1dd814ba09329b5fdcda4af8a9183af31e2f9c4c416cf26425c2443571c9249f992dde98058824a64bdb31
+DIST texlive-module-dvidvi.doc-2016.tar.xz 19728 BLAKE2B 7a6f2626a4e59f89966f2b789e8140f2f3ded61c2ae025dccefa6e42e11b878b6b470dbd87e03c202e696d5064d1c22efa78c8fbaa213d1e721cf5e21eabb67b SHA512 811d193f05e643ae69956b0c700dba40b6002df585b8cd3642e7ba89187ee7159a4eb03940f1762eb20d8359d88731651cad59d67b6a4f1b3f70d34d91f413f9
+DIST texlive-module-dvidvi.doc-2017.tar.xz 7880 BLAKE2B 58d04f3df26776118c4684b8d3eab3badf304c7987f006e8c1e9330e949a4bf34f978747dc162147092ac1ee9f588d5055ea11217c55a92b61a102dc6be0ca30 SHA512 72685126bffcdb0adf0aff770d17eabb1da16e999b24a40c4f5a0925e8eee1e168f88abca69a6d803dc91a8871beac954feca4d22b08542e5887d8f4226f7cda
+DIST texlive-module-dviljk-2016.tar.xz 532 BLAKE2B 692aa25033a35e776a79e829e1d202c8609b1bf6d74a3940568d41e289132c42c4e195b895efed633732896b7fbb8c235840ea4a492ba8244ec8f0e67127b199 SHA512 2fc2bd385e0952e1f1a348040de644aa98c63ddf436e7cdf30366f779203d55632b96e2a8e167413887a6eb1f5a86e37b3c49b067de582db553ffcec51c046d2
+DIST texlive-module-dviljk-2017.tar.xz 532 BLAKE2B 692aa25033a35e776a79e829e1d202c8609b1bf6d74a3940568d41e289132c42c4e195b895efed633732896b7fbb8c235840ea4a492ba8244ec8f0e67127b199 SHA512 2fc2bd385e0952e1f1a348040de644aa98c63ddf436e7cdf30366f779203d55632b96e2a8e167413887a6eb1f5a86e37b3c49b067de582db553ffcec51c046d2
+DIST texlive-module-dviljk.doc-2016.tar.xz 76064 BLAKE2B 05bfc84acc2cca4bed36c83daa979884033bb1d276d4d59fa9487f403fd93ce77e60fac29ffd527aa82bddcfb89578008a9770140f37ac6228ab97da44f7f16e SHA512 0fcf4d1a1253444408f0dd885a54186c44b757aef9313940234147ac0ab8c67f93b031be4c6f2df5a7dc841559e10c94c3da3f46abbf9470c0c88445d1b82e88
+DIST texlive-module-dviljk.doc-2017.tar.xz 42128 BLAKE2B 41d9409a8ea851316f9321a951f2fc84107f3cfefbacb68ab6680f80a3ab024ceeeb4c0afe4d027b453e1caaed59b4bfe371bcc5c04fd072c747f4fe75e25926 SHA512 4140bf5492da8d3e4566d7dcfbb3c45f722fc1b924b429d1b4b8a32acae424b4485d0810390182527c6400ace88c4b45b6da06bb4838141e12142ec5c87f05f0
+DIST texlive-module-dvipos-2016.tar.xz 244 BLAKE2B efb5315785a706b48ba696bc15dcc708955e2995e3309376ff481ef941e0056019a37819359710a5fcf1ff06697df93b6681a3df59ddbaf3947db5a7beec6524 SHA512 a18ef80cc04b075e36bd04d160e3b324df1b00cadf796de633e687d1ddc099da85202ec10cc5b41e4e686adbddaf10bd265a7b17a928dcfc428a20dfe1940c38
+DIST texlive-module-dvipos-2017.tar.xz 244 BLAKE2B b6ed5118a94f06e170d34150fbe43c96da3ec8d1c1e305092caa06cdda497b662c91b2752eea7049fc37187e031103e84c9ccf305f71cf4b98847a1d4af16ed9 SHA512 ea01dc9fa33eb847010fc4f13b023d8ef0e87a9da1e9cb7b8f15f51ac6c428952ea5d8406184c0807ba4eeec255933637122155ebe08fbcd8fc5d3df5fa1fbd4
+DIST texlive-module-dvipos.doc-2016.tar.xz 28584 BLAKE2B 114c4eb3e5fc9ba3c17f617762197e2602120777f11078fdadf01207badfaf593e30531d9ae48b31cbd6c8129a0e25a4cd71e5b714784d2beeb64ebb63d9d5bd SHA512 d1793c7a43d11473a96478321a15b84b8bf753156a570401bf0fdd559028168094318ee2243266424405cc17b2ae1f7c4f8aed97fa2ce09f6114928e6a92f4a0
+DIST texlive-module-dvipos.doc-2017.tar.xz 11144 BLAKE2B ca5a8d9f604cee30f57e01b94733599a6c72feccbf20e7ae3d080138a02db87afb0169b7738717dd56cef3f95d8f8882ca6428b7731a6803b861671ab9bc4d2d SHA512 e1720314341e7063baf34dc5ce7086dddf282a82c5723df8b67547b9ac868e336657a88b0243b1dd20762c4371e2b5a8341314af558c55a7462534bb35c2a965
+DIST texlive-module-findhyph-2016.tar.xz 3900 BLAKE2B 4f8fb5a50e52ebd33410c7f795d218836060414c98261f51311de19fdae4cc9cbd51742834dd0033f24e94a84b8d1bacff829c8fe50046a452a271e6420c3da3 SHA512 42ec175d04baae17699218d2a1d12598f303dd8cfa1ba8ee6ceef6493d7ba001e54de4140ddf5ba9f1ccc3fa913c33725f862b1e70de6a40824f98791eceb6e1
+DIST texlive-module-findhyph-2017.tar.xz 3904 BLAKE2B 8ed8db21800eaea0afce6ee4c0ec4e61441537c43f79c82506de3ce9558f74e8b29a9067d8d4e453acb88a84a9633165150ba206181302f72999aaf5770042f0 SHA512 f6f117fd97f3c5cc7833da907b49783925704a43580b980d67a6bde4c501ab0d48b6d662bef3c11d1c802559a120ebaf3673c7a69f4d636133fd1e46629fee26
+DIST texlive-module-findhyph.doc-2016.tar.xz 12020 BLAKE2B 5a9d1831d8ae7bc11abe3c05a2f69109098b097ca5afa05656c8809d7cc8c561eab704eae9888f8e0d0ea68c88257a92f6c96e3e073a1cb7d41d3761277e04b3 SHA512 3b66812d082b3edb6f46b94992d555b0deb532cc258244bb6c2454826af41fdcbdd1d40f2f8ad9f885772925ca4cf738de8255b510b59afccc721424f249e1d7
+DIST texlive-module-findhyph.doc-2017.tar.xz 12024 BLAKE2B 1036486064c040454e1c4fdd8d1ab95ed28847ddc8811b279529346ad148d2039ea86f24f01fbbd9389358fcf6396624e66cc006f6b3ddb644e21be2682e80b2 SHA512 fe8f33cf13a69b43b80464e3799a090e0a0eb0bbc3420b5b9500ceb490582f79defa4b2ad29d406dccc4b2ddb5d5b83fbf644eaa99ea0565cb258706d1acc0f5
+DIST texlive-module-fragmaster-2016.tar.xz 6872 BLAKE2B 8a9c992dd9fcd84658e5349793b25c69c89ce1fffe742cf706c04c38d7291db6fec691c9338a6252536859dad44602e9bf71edee577fb4d16b221adfd7f164e0 SHA512 65387d934a6e9f1a505a9d594d4457721425421a9cbb011d993bdc161a528db70bfe67484560b9ac2145fe302c50e2bd8e3218a4e09dc7d419686d56229da6e3
+DIST texlive-module-fragmaster-2017.tar.xz 6872 BLAKE2B 574cf41226398f1f0ebe3a46c515449b95ce39c5639d00e21822753c560f3236cb37c1f410a33e1cd52ae59a5fe8ed72fd6c2ba3e7ccdfb1e77ac5148a82c330 SHA512 a7e6fccbd850e7b3ee942a3d5af379e79a946fa9b037ed47d8de50b250eff15d0e6250ce2ddfbf8f7535a1b7c1bf39d80d5a352e1b77fe9bbe0bfd25da434bdc
+DIST texlive-module-fragmaster.doc-2016.tar.xz 80316 BLAKE2B bb3f697e7c472989d9885381fddd3f7e93047a8cd3578a4cc40f6a538df5e9bcd7abf70eea0118f8629bd1cc1bb94d2578e2581702311020eb5aa9447bbe9aab SHA512 7fabd07830227e309d046069c9edf681c0641d73285cf239a3035287455a4120f7d6b6ec8f4e4537069c7f3e57562799adbffce6ed202eed0fc1551b87e29884
+DIST texlive-module-fragmaster.doc-2017.tar.xz 80256 BLAKE2B fabb4875633e49d260fbb6dc263ba1412d022fca85a3811183933ad19605c69c8c11a7b2b4b1e32295afeaf43c566c91cd137ac15263176eafb5b34ad7c95f0d SHA512 cab8ac6247875ed48f86f16a67cf3ba8b320aeabd61cf95a6c43a6cabea9ae11ee0cd9e2bee0b577ebbb414216cd4015a36161c83627647371418ef61d28c8b2
+DIST texlive-module-gsftopk-2016.tar.xz 3428 BLAKE2B 6fe752bb34ac8e0373405d223624efe464a623a1a191a4b99396cec5d6cef8bbe7cd0da10ed2637e5916e1781ca953d270a5548d7dba2556b1dbb6b78e3db26f SHA512 750872ad83d230743dd4a5d929f54c11c42bfe3454b6547a96c09afebf81ebac4502e906f2b9ca4c2f613220f778d5a137fd72841b07355d6df6874b09779572
+DIST texlive-module-gsftopk-2017.tar.xz 3428 BLAKE2B 348791efea69f8ad6a37480770d1cde59c8e3a0791f16bafbfa94955fb200e8285b086d95ffab90d08d631010f053f5a03ac7509592f0a455a004c0e19dcccf0 SHA512 9f3cf2841b1f275c13991ca07483bb47e9e833bf5d2d137af2660d7e01127f878b26cf0bab98668504edbf0d87e4e17fdeb8c7c654de01048298298771d289ce
+DIST texlive-module-gsftopk.doc-2016.tar.xz 28032 BLAKE2B 89d37f6c1f961d6e83516a78ce2f1d8588f099a6529688928af79401b817697b6c46dee28ffafd8d4c95cd6a6f45e7aa5209e6547de3a0cf40d939e4d685260a SHA512 6a5be7daa5cac154a8980495a031bf9d254cb9e773ef8915d44169d7c049e1bc3edca2a51ea2e0ad4c2df810230602af019f951303a4bb851d69078832e0ac73
+DIST texlive-module-gsftopk.doc-2017.tar.xz 11764 BLAKE2B ef3ae2f15809430ce3db9090ebceb9395a1a66bf31045de689207cf52b9744a1435d29f32787b73dfb77ba951109633ab09972216d3a999960d0d94d97f149b6 SHA512 6114d30883da80d9ca222c7191f57c613d28871d737df506f977442484ece94934c2c72e0c78c8ed619622c4d0a2c4a174d917ea9408f976ee0e14f3db7cd55b
+DIST texlive-module-hook-pre-commit-pkg-2016.tar.xz 772 BLAKE2B f7ac51b07a8829ac6e91e3cf4f2f3efaf8548845bf0af33a88e87791f79415dff57f92ea2e50af093b70cfe751d7f83bc7437f5589d1193815948d2134110f7e SHA512 931966fc66b06841d5d2db93a5e259036ebc4a64d080f3d021386ded16717c7f88be34201f2d7b44bbbcc0688b5a67231ad7d5a844b290dd66d96f97390cac2b
+DIST texlive-module-hook-pre-commit-pkg-2017.tar.xz 776 BLAKE2B 34892ff70e1b4ad25ab9356f26cae2ae183f403afdc729d9a1e107d161eaab0aa78f22ba2d0c27d7b90f0a30d1e83d29805e1000bb81c50a629888cefc96afa4 SHA512 8db15c4d2347289caf9cbe967e4bc7ee819868d11d6723afbc9ff045247fccf52694e0533f441ad8b69ffbcffcc98e52f17ad901b47a7a9fa2c19cfdcc693dc1
+DIST texlive-module-hook-pre-commit-pkg.doc-2016.tar.xz 2784 BLAKE2B 290480e643130dedf245b25741141ae910e094ddab5b3a169e9f9999c794afb6f8c1a999a0d2df5b0eafbf414a6c15bc11841a29552a5c9bc2b78aa93b5277d4 SHA512 727cce2647d203c3a8c8c918ade775af08da1edcea7bc57f55b566caaba5ca42310b6c0a90b089f3ca10718a5c1dbd16c95549930b0d4b33c68b0a3367dbb172
+DIST texlive-module-hook-pre-commit-pkg.doc-2017.tar.xz 2784 BLAKE2B 290480e643130dedf245b25741141ae910e094ddab5b3a169e9f9999c794afb6f8c1a999a0d2df5b0eafbf414a6c15bc11841a29552a5c9bc2b78aa93b5277d4 SHA512 727cce2647d203c3a8c8c918ade775af08da1edcea7bc57f55b566caaba5ca42310b6c0a90b089f3ca10718a5c1dbd16c95549930b0d4b33c68b0a3367dbb172
+DIST texlive-module-hyphen-base-2016.tar.xz 22244 BLAKE2B d979efe4fc452d8d3725b751f20d294d25873df14ceaf8093d3249aa20e57d3a70ffb339686bec9aed6cde1cfbcc5fec4fc801b4deea41fe90a66bb5312e0ffa SHA512 19c83740cc23cc73f2600384e3f9edf777a7a21fc2146d7187fae78f7c44733658ffeb8f6f549468a15309229015570b470aeb4770b70678e52011cc06bf546a
+DIST texlive-module-hyphen-base-2017.tar.xz 22296 BLAKE2B 8de6b540c4df5a4a51136b96e33fbf9e5fed9a4e63517edeacd0c978a9890abd8721dacf011ee3f49b86252e3112e938b775f627eeb74f3bc868a4f4f7c5e72c SHA512 6a6ccb73d2e56233956460ab6ec1e1585f9ff4d88cf14e91186429f7fee78bdf58c78d96f25e0e8208d8824ab907b49f2d61119e4d7d17c1b79aed2fd2b3e834
+DIST texlive-module-hyphenex-2016.tar.xz 7512 BLAKE2B 77e2016ad16e11ece80b11cfa803fa74aacb41d1bf54ac98ec7a685e152cf6a98ff071b6134a493648ab333cf4a32235566c1bebdd543fec8ac17b33ddad8fd2 SHA512 d92236780a8e22c2430bc656fb4d4f630665d7be084a796a11508ed102592dd4de940f99e6a3501577c093cbb0cbd861eb8d41d92fba09a6cd0f5e5d2dab9f22
+DIST texlive-module-hyphenex-2017.tar.xz 7512 BLAKE2B 77e2016ad16e11ece80b11cfa803fa74aacb41d1bf54ac98ec7a685e152cf6a98ff071b6134a493648ab333cf4a32235566c1bebdd543fec8ac17b33ddad8fd2 SHA512 d92236780a8e22c2430bc656fb4d4f630665d7be084a796a11508ed102592dd4de940f99e6a3501577c093cbb0cbd861eb8d41d92fba09a6cd0f5e5d2dab9f22
+DIST texlive-module-hyphenex.source-2016.tar.xz 183840 BLAKE2B 9123337f2ca79b38b5dca08f9b2a53acea4502ce4a5d4aa702b82efdd1ac2918c80d1f0cb03186173cd60ea3ef25219a4e9e326d55fb1cbb357d86cecaacc9e5 SHA512 370235797f5754994efb735b8c1691d3be19dcce9e112969323e16502cc5cf695bd63ac5265ce90a7312415a6acc106999dd290a22e9865a03b0ce952ee62f56
+DIST texlive-module-hyphenex.source-2017.tar.xz 183840 BLAKE2B 9123337f2ca79b38b5dca08f9b2a53acea4502ce4a5d4aa702b82efdd1ac2918c80d1f0cb03186173cd60ea3ef25219a4e9e326d55fb1cbb357d86cecaacc9e5 SHA512 370235797f5754994efb735b8c1691d3be19dcce9e112969323e16502cc5cf695bd63ac5265ce90a7312415a6acc106999dd290a22e9865a03b0ce952ee62f56
+DIST texlive-module-installfont-2016.tar.xz 4800 BLAKE2B 58cbd621052ee3d8443ec94489b3b64f661fc475b81a6c577c15ea92e73dc158739e9bcb952bc8d3e42a7b7eb5280fc1f97a492d35d4fc6b41eaafe773e06a83 SHA512 b7fb4ae448a386338bebb2d77179f8c407c30ea97f91dfb25023408a4ccd932fc8c887ada7f932a8eb60da4d309f34d5c219bc9133cfa9a18fe9ff0ca2412767
+DIST texlive-module-installfont-2017.tar.xz 4796 BLAKE2B 05d37b0526c314d3416aa48ce80c843e2bb7b7e6b239931689ed2eb02e413d9ac2d1a3bcae98b865234449e5496e5f5363c75dc87fde7bca7d6d62c6fab54209 SHA512 f15bf4b91feaf5af8466db0492aee40c3570494a9ad503b62badf319b2aa20371eac883f714b60e015fa3ff15d8cddff65da373de653a6780fe2709de8fe8071
+DIST texlive-module-installfont.doc-2016.tar.xz 56040 BLAKE2B 408b1bdc82986194881342bb82fa9ec6fab674f868bbff1c607be02c978bb4153bb5c1fa8c35b89d4824e0dd69daaf4e892116b31877ff2d08eefb20e60f17e1 SHA512 601fe2974f002ede756a16fa7edec7b930ecd4cdaab7398afc9b0df33cd5d3193894d674d139468916ec52cfa9dd139b2783f4c99e37349785c3007709b558fa
+DIST texlive-module-installfont.doc-2017.tar.xz 56028 BLAKE2B 91169625c57838433c30f8b4e9830d9a949d9adb13b0dc811f68f4de516e05f9ca119634d769ac5fd630728ffc5ca7ee53c1a363d8699e374ac9bbdac9007eca SHA512 cad711520909fabcb44a551c3d3b4ac12682ffa5ac5986d168fe0e0c0e5ca0cf8135d2a3964f7d4f15f8891ec5d44fc88d0f00a458308b82e31dd1bb52dcdcce
+DIST texlive-module-lacheck-2016.tar.xz 464 BLAKE2B 146752ce092c9fbb8e22647690c47d623217bab6fb95b004a761e003aaa3440d74e95b75889219e576978f6914ca4cfe4d789bb030de4b82fb51e6a3171871f1 SHA512 b27fda27d39f1f20450f72cd5ccc7bc59590d16d6ef0a79d80563586b3013ce5701e9a6045c53539390028a1372f99386c00158a5fe104060e59eeea6e75aed7
+DIST texlive-module-lacheck-2017.tar.xz 464 BLAKE2B 8657aa4ce38ff1d433a1fd37347c362169f12a3af8e2127e462565f8f7444e53d103c0a44acf38c45aa3b222a40ad5699093c6e9556c2f3f254d5728a29cb293 SHA512 16a3bcff6278cbc0b8237590951b6e5c5cb4f13402d2991db8f69ed4ba7c95a4cc2caf6563a2e38a386caeb68af11452d26a3a18a8bab3576255ba88128a8eac
+DIST texlive-module-lacheck.doc-2016.tar.xz 21412 BLAKE2B fbd9afe0ac1c08ba73c43b71561def4e6f4a8425c9c82ed1e9f7c92d0c4702e5cdddff2666213b463abcbfb37e4afa8e6b4b8817dd828df92ff20c52a0cdd351 SHA512 a993938c00147d2859544ae266ef7a0e9c57d74095c6c0ababcd36a14a36e22d7ad2856a960278b81331566ba6af80735d644b4493e3ee44b3dfe96194d633ab
+DIST texlive-module-lacheck.doc-2017.tar.xz 7404 BLAKE2B 73eaeb32befa917817aeee5cd5c345654dfc565e82e8276ec19cec4684bea321ce66e63bbf92f80b88866dbec1a6b0e3e2016611bcb104fc459392b2b9d8bda1 SHA512 dccade3cb114fcaed052b8474e6d4e3884023cfffd34ba8e4895452dd84f114270f3cd20a731b52d5443953154d6d0c112b27bbad536ff1cdef463f66f1e9fa2
+DIST texlive-module-latex-git-log-2016.tar.xz 4840 BLAKE2B 4cb644f2c70bb5b9ac69a27951482da2fad6aebd848611c2ef96c713c369533fac38be783eb1ae77667c5034ec265d82c0fb2aeb3d735bd0af3d242316312887 SHA512 bb65f8d8198ce06c527e2c766b0f80d4cae7391fb223a883a3d843823c49064a62dd6402c0881eed0d01f4eaa55b703f2cb354e205e3ff44c83fc7fc56323b22
+DIST texlive-module-latex-git-log-2017.tar.xz 4840 BLAKE2B da03a5d25ba505e0f545056c9558abf7a0482bdd783d9cfa7484b07345bbd1781c9c06ac9db8c1ffa9a6981432515857eec74ba3ee590e6b34a4c7bfdda1c626 SHA512 01a823d96ea3cb193617ad26405768231a1ba3f22165b008f0a4898e3db14da424cdcdd12fc353e0c89b42e6cd80e3b1531d772f663ea9487f8fb02c763a1c03
+DIST texlive-module-latex-git-log.doc-2016.tar.xz 91528 BLAKE2B 1fd46609e1e87d5d55bf61c61141ce7467da6a45d6fd36a350dd74924b9c67619843d7ca7bc11cca3eab62801f444fe0761ba1224db9f2085231cee4514ecc14 SHA512 0e08eb2ca6a0c933a82b66058d463c781b0313e5631ed4e35312d0f612dc2c627dfa5ad5d4b520a457975f31266c6ce132f2318fa2fd1a66f4860fc14dfd334d
+DIST texlive-module-latex-git-log.doc-2017.tar.xz 91528 BLAKE2B 1fd46609e1e87d5d55bf61c61141ce7467da6a45d6fd36a350dd74924b9c67619843d7ca7bc11cca3eab62801f444fe0761ba1224db9f2085231cee4514ecc14 SHA512 0e08eb2ca6a0c933a82b66058d463c781b0313e5631ed4e35312d0f612dc2c627dfa5ad5d4b520a457975f31266c6ce132f2318fa2fd1a66f4860fc14dfd334d
+DIST texlive-module-latex-papersize-2016.tar.xz 4608 BLAKE2B 702216f90287e9a05883c7c50dc28c1c12be11dff0d0f97c9a6fd4ba7dbfa0e7b19151af47e25ef4d2c60316db2f634e8feaeaad54c016fce8a082e53ec406de SHA512 84f4af6e54673015a85ac1bc7e16a93b1fc9c57df4251ca56fd3af5a90bbb750a9d4aef4fc5ab769bd3ccf965ee1bc31704de90d0f2c88d23d696b866c8a2fa5
+DIST texlive-module-latex-papersize-2017.tar.xz 4608 BLAKE2B 702216f90287e9a05883c7c50dc28c1c12be11dff0d0f97c9a6fd4ba7dbfa0e7b19151af47e25ef4d2c60316db2f634e8feaeaad54c016fce8a082e53ec406de SHA512 84f4af6e54673015a85ac1bc7e16a93b1fc9c57df4251ca56fd3af5a90bbb750a9d4aef4fc5ab769bd3ccf965ee1bc31704de90d0f2c88d23d696b866c8a2fa5
+DIST texlive-module-latex-papersize.doc-2016.tar.xz 596 BLAKE2B 2865ad352870d02771d289a068e42faf384d1df87e026a921b281c6cd1392f8a9422f1ac420397d1765fa23fab77da7844b2d27e05cdf1976a1163e2bd646525 SHA512 c4360a451e9a21ea60dc10631a97782aaf6ece934b0bedadf5d0328ae689ef599c914b4ae2579d3c0ff5bd833f93c0efbb4085589df56a7dc93c895b6a519a35
+DIST texlive-module-latex-papersize.doc-2017.tar.xz 600 BLAKE2B 5dd6592c5680266f071539d861b4d5acaef86743b2643267b40c8a25dd21454f608a593dc804291ce241000af96b9206ca2bdff5322c88a351fd80459363bf01 SHA512 e3aa2050c9fab9c806f0df66bc2d34b97a8b67e6e1bb41b13e524054731419145003305117ecf515dc47c98ae365c78784a5f09f823145e01ea08aa54ebb024b
+DIST texlive-module-latex2man-2016.tar.xz 13628 BLAKE2B 06d050c5efddf1904bb45e0f9b2acf27cdfe781c215521b2e335c0abfa2487f965b93ec439d1305e1d081a5e42ba4ab8e4d65f3781ea50f320ff795add16b1ae SHA512 5b5403b76d5f2ef5b9ec01ef925c6adcd4b5f17fb17d7afc6bc3663e553d6845c4db3551e2150943a9af5853ccb47642cfc49a1abe5c7c068d5d59e02a2f5b8b
+DIST texlive-module-latex2man-2017.tar.xz 13940 BLAKE2B 1289010000370b5b88ab4baa6d26b299c2f67d385efcee8c5387658b5fbd1b8033463cba4c664365dae9ae0eed84dbf0831559f81286ad46bb6ba08aa5df6a41 SHA512 e3579403dc9e984cb51f8854436968abf69a29ae6984cdbd0fb2fe0141b1ff2af65d2100011fb6355580b7f8a73a3c0bdcd3b225c8f7e13a828c6b2c5ee602af
+DIST texlive-module-latex2man.doc-2016.tar.xz 231868 BLAKE2B afe10490e59643f33da181340db5a3eb94394477a6d946c1aa5d639e7f854cbef2b4774b673a53f424e2947f760e97c4c50c3b12ffbc3ba0960dc5760e176325 SHA512 829c4b3393ad9a1cc50e71cd9aceb1ee457540eadf11941dee58ac5741b93c70c8c19c08c12b10d8ef7ef1667937899ab25e2d3b451ce961154885d69cfb1070
+DIST texlive-module-latex2man.doc-2017.tar.xz 344456 BLAKE2B 39e69f1301796e5b3561075496b3f46b7d464296dfe4db2f55e7230cb788efc23dfb399838e6245cf64602dbdb865ecf725ddec214824913974f1c88a6882ac5 SHA512 88f4b0fc6a12355b0defe1c1ee10aba1d06cd498556ddf043ab12d480ed5f1946cbceb58de7beef452afeb24e416261eed8aff8c21c330909f6cc6a8cce9d5c8
+DIST texlive-module-latex2nemeth-2016.tar.xz 7082664 BLAKE2B ece6a898180446590b092deeb1f1c8dcd96f3692d2dfaaf24ff8981a25fea8080b10d8fa74dfffb3f0bdc899ec63aab4033a39fa4f672b543ac5c4357828c588 SHA512 f65a25838d5feb6c90eefec17e13561241359db663dc1c109a1a0fc6a4d8dbf48919ef068db1284c8e117d22566230ecae405c69813fb7e95d26cc1e5da1f403
+DIST texlive-module-latex2nemeth-2017.tar.xz 7082664 BLAKE2B ece6a898180446590b092deeb1f1c8dcd96f3692d2dfaaf24ff8981a25fea8080b10d8fa74dfffb3f0bdc899ec63aab4033a39fa4f672b543ac5c4357828c588 SHA512 f65a25838d5feb6c90eefec17e13561241359db663dc1c109a1a0fc6a4d8dbf48919ef068db1284c8e117d22566230ecae405c69813fb7e95d26cc1e5da1f403
+DIST texlive-module-latex2nemeth.doc-2016.tar.xz 23852 BLAKE2B 31d0b1210d73757fac48756e80be61e4383701acaaf5d80f56053b41db17e64ce5eb007f1dc352dc93929b416f12b6f3f11b93e9f8b7585613a02dd83b7c3036 SHA512 611ccb9252914e28d8008abbebc02b1d540d151978cd306635aaaa181a2cb42c41a573b10c2fcaa1c805b66545cfa0329301e3bda6b87d5b7e01af3df3491a2a
+DIST texlive-module-latex2nemeth.doc-2017.tar.xz 23852 BLAKE2B 6636c3c0fe7628d8ba8c600ae4ff84add3bc9f7702f596fcc3bf2d24f5a2b85e87e9ff8cf301adf5354504033ab0c3ef0d5bbc3ed5c52c6bb9dd36e39e445dd8 SHA512 c55505f0b00e4d600ef9a40461f6e3888f4c820ca1462a2c2edbd5c9f9ca75e08e543cb9fb25ce56313a6eb80747a710134ec5933f71a172e5a675ea9a0d76ee
+DIST texlive-module-latexfileversion-2016.tar.xz 1648 BLAKE2B da6f711a7296f96ae6de7469c4e90deb4aa2adfd018e6f99c60e49ed80f134dbe243c182aa8d9d7503541f6068f2aa10b1d5a5e679da38d86d3e7980071b0b1c SHA512 20c1596ddb6d554b521e2e67529d4eca94391616ef41bc52ac504d11f991e5416a2edf42d1792a5081f551b2d60c29353b3ef562efb77b98f30590600e26c2f7
+DIST texlive-module-latexfileversion-2017.tar.xz 1652 BLAKE2B 5552ae1828ec81909956d20d68bc35c1d6e09a10b7a7439c633ccc8612553340d4b7afcc7000a8db1e4793d618fe0f31116e993bde0bd907ce644d1e2b929e7e SHA512 7b2c2ef5ae64d2921da0fa553f7fb745dc7c8f9c5675f5c018e29a4745f2333c0f51d00eaeac6474a35a382d9286896b0c9a7a105424ec680f53f8a93faa5b2e
+DIST texlive-module-latexfileversion.doc-2016.tar.xz 928 BLAKE2B 9dcee77e57b6936b7c145a9ed8eade232db14018d0167877d829d4ebba8a10cae2758bda4138d648d5161b3a57b6e135b4878e59b5f9e9efaec22561bb3d25a7 SHA512 93e172bdd159dee0608c7c9b0454dc24c0457b1ff6060b5a09295fdc3927bf564486ecaff87d25f346c245cd8d83b2c53032fe0fac4432dac3187a6a8e9a2ad8
+DIST texlive-module-latexfileversion.doc-2017.tar.xz 928 BLAKE2B c5654e989d5c5edb203cf77493edaf588cbd125f49eeda6513eb0f335ec1c98d11a53df98c0e5233503e985aa89fd9c6239a250d85e6eb15d26c23082ac6d305 SHA512 46a5495320ead028664b1c02c872147cf350f05f1f9a18291fd47a266a06a66449bbdc0d9d4818cad30f75f29a2ea3611fd6c88379aaf3a703e76e6df9f6b679
+DIST texlive-module-latexindent-2016.tar.xz 19736 BLAKE2B bfebe9b8aa886fb8947fdf0138313703f2d53e92067f2cd420733923972e9fea13e457bd5111c5bb20a83377d7de062f9c740c6bb11032ccbc7d3fb79040531b SHA512 97667beda33dbc772906e845671902ed7cae0b276b3e9db3701a32f2c32c4aa2fa0f04cfa22d5cb3b9e29084e23af86fc7a261ffd09f5ad67ca3e4f5e0258265
+DIST texlive-module-latexindent-2017.tar.xz 38844 BLAKE2B 3ee9541872df5fc37587c563ad6879f7c9d151b19838b71b79c8a17a252c233a581ed7333e0317e4c152b5789e6a67c01de9f3157851c48e14599cb9b55a13d7 SHA512 f8797cf236d783536bd208abfbd7bda3fe05f5101e3ff2cdf546179a526029ab47fc25eadce6f54cd8f0ab29ea155d412163726cc2119395ced80507d8597f69
+DIST texlive-module-latexindent.doc-2016.tar.xz 343636 BLAKE2B b83c3a9146e018bbb6a9142628359f300e552a153dd264a6950cd8fab38edb89211e36710a30d90bcc253a5b9cae090c135b5e6ae5b0b5fcb5030561d399f47e SHA512 4bb97f2ef234200173827c44f23ba49d709e0d0b5934671a0a14eb9e9932f139136dee534390a898e1a3ee0cf0fd3c07e90c2eb77c4a09d2b5b0431ba3d9f79e
+DIST texlive-module-latexindent.doc-2017.tar.xz 541996 BLAKE2B 7b239ebbbbcd0904a2ed31ba6f092918bf75703cfaa032001aafac18dfb1f10f312ff8edcc919ee389c2242ff6622bf5ac6b1ab859cd4a75f2ec163109bb079d SHA512 53d8e5566272f7dbfca899687a4981e142d9e801d6f9c6c9a33e5fa6adb0bf22828edc130f7320a3719b93001125066ec48a497743490ae5f7872747317b6f2d
+DIST texlive-module-latexpand-2016.tar.xz 4664 BLAKE2B b59b326a7f1c45299847de2879ab30bab8969f14c04feb485956ca81cbd2eef52843b9185c8dde610990291e744065b1abac17018b18712ff1947fa13e54ebf8 SHA512 6ee6d23920539c540a67516a7f7a07a454878e61424e9e40328e5562872e1a555ffd75a12482a09593b8ee906845ecfad8633a931ee2e05b9d4918a07aa67ff6
+DIST texlive-module-latexpand-2017.tar.xz 4664 BLAKE2B 3ab8f981d0b2c6fe62610c84c436738aeb16b05be8a38634ead040050272585593a5a8cb701af329e923e3b6ca1759f7b7dc3d7f37bcdfc88b6f417345ce1e00 SHA512 e74ed2886e781740d77c18303fd98eab17e431812f033b0e7734e4aec966ef3476605ffbdefb960f7be511ac5c2e4e01586f3ba3b3b1708e02b0656a02e4b6d1
+DIST texlive-module-latexpand.doc-2016.tar.xz 3000 BLAKE2B f407e0ca494b9a33dbf5bb889903f2e40c5bbbc9b29b7810ae7853adcb3fe93dc1eec8ebb661ad532ed698888532008b127fb6aeb294114ac162ec0d5b7ec4cc SHA512 be05689f140ef29ab04c86c60f61dd178100c914fd57dd7da1425b94cf27f1d8bae6e34d2ca8e2060045335aab98607d1bd53d4cc6753a6675827a97ecf3d786
+DIST texlive-module-latexpand.doc-2017.tar.xz 3000 BLAKE2B b37e0a3af2f1c77fa3399034966d758374555b87381b614b92eea44ea031f0f3d535adb1f845fbad57b6e8f022e3fe650e656399f171b9ccf95081a52ba3c8e8 SHA512 ab847d512042ea1079621f9492001ee09c278b130a7c61412d883fb3687bb85d52dc53c3133d54acd444c38d21d42d5ad1b95f918ccf38bd9575f9fb19bd6ede
+DIST texlive-module-listings-ext-2016.tar.xz 4860 BLAKE2B 91f6f5009ea75aead667cd32427783a5f2b4092c0e14a0cf58841dbbca0839c5ab085436d61db8f40b8ca9752c03696c98fb1cd7184e78e73450e24999399f6b SHA512 bf41e0d10a17cc6e555ea793dddd532e8815c17d67c7522220fd755690487cc452d39326e139fe0462210151a18cb90860026ba69d2f23e24af57de4ce9317b6
+DIST texlive-module-listings-ext-2017.tar.xz 4852 BLAKE2B 5cec8bb40972739e36b6f2e18b0d0b85ab0d719e8b752c1184fcd84da3c8bbb7687794b256e4581bc94718e97400ca1c1d2a0abbba171cc85531381dd608a6d4 SHA512 a40ef2786fe5624c233f846995903ebe19fe6fb9525899f23e73818eb8f87dcb296d6bf0c23366741f6a8eb8655c21ae7337a4b80d90949961b007ccdc67f461
+DIST texlive-module-listings-ext.doc-2016.tar.xz 103704 BLAKE2B 1f8e18910ff3b723ef34c954c07759d0dd914cd60bb3aac7c4bf3ae55e1d0f57561d8708c039ea0147701442b09cdd6b4561caf0dd4528235f5b1c910ca4992f SHA512 a7f07219739d4d27c5be405968eef6dbc7f86b10928d65f9267d117008daf25678ab013134894a69688315800c8046fb28c5357285f2c32c5ea3be4553b1b14c
+DIST texlive-module-listings-ext.doc-2017.tar.xz 103660 BLAKE2B 6160b391e62ab03455f226c7db98518a4735c630b7599bc88a868ac760d602bf07bd05e846d7586791b7ada2c666de73bf860c222e2d1d9b7d4616ea0dc063d3 SHA512 edd67257cb74020f36a11a95e6f53dca80b376d73ccf75a87d689ec606019ba35f5b836f012c1817764da8c3b2947ef47ae707f22c47c4096dd31c4bfa58a327
+DIST texlive-module-listings-ext.source-2016.tar.xz 22652 BLAKE2B ee91aea155b85220ff2dbd9623f01a1a4737badca0375dbf56be4ff344c1efdceb6f248169fc90e27fdbc0802b0ef77558e5bce505e77fada94f959e8e522a84 SHA512 c6fd772d878aea20c002bd10aa7f99c89f912d447fabe3742845f90c8a9b5708a3b933177b3cefa8deff4e287f0ffa3b78e516fc5b43b3ef1f84b4bbeee45dbb
+DIST texlive-module-listings-ext.source-2017.tar.xz 22640 BLAKE2B ced7c27da8c445870a22c02575adcf3749f6f04fa0db23016e9712fa95087a75ffb8c4129d3eb4bad28c0d780502289ac7f5016a0bfe28db16eb81a1a31f2943 SHA512 4bde1dbcd6c5dcd258682314cbde29ce93c4c765158798b27fa17a23fe77c3e4ef73f86578716da6233039f864bb44a1450206bfa7c12b7500d650c16930784a
+DIST texlive-module-ltxfileinfo-2016.tar.xz 5172 BLAKE2B 612f8b21a4ec4c2571cc0fdc9776ab5c5faa5bf865b7946a1b8e2d4354c70a2d7825565016da339c8f89e2899e49dce841460660913fb959fee70d14ff434ed5 SHA512 f441ef14def62f9ff9a6dd80574f0a526748810b17a5993f2880f464eeb30997578406112179103fd614afe91d2f6bf8ca19448e83ef455d630623980eee67f5
+DIST texlive-module-ltxfileinfo-2017.tar.xz 5172 BLAKE2B 612f8b21a4ec4c2571cc0fdc9776ab5c5faa5bf865b7946a1b8e2d4354c70a2d7825565016da339c8f89e2899e49dce841460660913fb959fee70d14ff434ed5 SHA512 f441ef14def62f9ff9a6dd80574f0a526748810b17a5993f2880f464eeb30997578406112179103fd614afe91d2f6bf8ca19448e83ef455d630623980eee67f5
+DIST texlive-module-ltxfileinfo.doc-2016.tar.xz 37612 BLAKE2B 8ccc068240c79661e402c79312025e28c19a79dddde6fe1984aee2d2bf305180bb7e389c2d23d611e94198d229a067cc0bee421514b94ef6d4b03e0f53bae204 SHA512 13fb8954668cbb7f3e08719c4512aaaf3d9f9798d387ca8eb42d8601a38b37243d2085a6c22814233011fafd6d7f4d0d38c06ed5e8584e37f2e863cc3fb9ab4c
+DIST texlive-module-ltxfileinfo.doc-2017.tar.xz 37604 BLAKE2B d36e08a057af2bfb964901caa20b79ff84013f80fbc9ed19545027c104e007110dbda9ceb62f8d5091f50947624533d45393a9d7cc0bc1b470a768fcb390adb8 SHA512 44e7b6664fd865a78ef23379cfd39c720ddf9040d3ffe63c4ea922e2825a14f49926782e1e3ae4cba347c26b8bbbd15e630d94dfc36c68dbe813fcaaeb11da88
+DIST texlive-module-ltximg-2016.tar.xz 10352 BLAKE2B a16c2be4855eaf69e527bf91a152c1e677688340f56c3c31ed4453c4e3700e104df42d03b761bb18a8a65fd1ee9a26c27b202ffe460aa38c76ff129b13ef8e1c SHA512 ddae4ed4afc9c4e18b0cb7a49cf7a0f3aadcbe75bff0c0962b40aab505ebd5c2a8b60f523d9cfaa9235beeb75601126b5621b3a84437ce21c3fd4d651ead2783
+DIST texlive-module-ltximg-2017.tar.xz 10352 BLAKE2B a16c2be4855eaf69e527bf91a152c1e677688340f56c3c31ed4453c4e3700e104df42d03b761bb18a8a65fd1ee9a26c27b202ffe460aa38c76ff129b13ef8e1c SHA512 ddae4ed4afc9c4e18b0cb7a49cf7a0f3aadcbe75bff0c0962b40aab505ebd5c2a8b60f523d9cfaa9235beeb75601126b5621b3a84437ce21c3fd4d651ead2783
+DIST texlive-module-ltximg.doc-2016.tar.xz 350876 BLAKE2B b833ad0de044661199eb4e887a496b19f1defe8dee2a058c9cde06032a74a178af4594a62012ca5ae05535cd29d5711dfddd2968392102f3882ae549373b211a SHA512 6c6a563586c706bfb547e69b26821a09a4818a9e4d4f611bdbba2f60f6fb7bd2687b7eb62e0f121e920d4653954453b2e2f27c5f1ea03c0658d53dd4418eeb55
+DIST texlive-module-ltximg.doc-2017.tar.xz 350876 BLAKE2B d4e2fb1c140120aae6c89d347005a6c385c7c2fce1cc69ab6dd32d5456df90871b8ec3f251e035332e5b3359ba6804924b622257a1b510878412f2337059e8df SHA512 a761b23a9873912e677f042378b7598750480d527c7fd58b5c36be638265138033e4a6aec411e879a9ada801aed85694898b4da9459c52040e9d33408ae485a8
+DIST texlive-module-make4ht-2016.tar.xz 10880 BLAKE2B 9bd56da29d126a8b2d80b47587fd737ec39647b92e1106fc34ba0713f1c76d1fa36f139c3e1bf3fe1f5017028c463c92895f8e37a9ad9d1ae1f25ee9fd96427b SHA512 3e9da602606c3766ccde30014a406a4898a9a416cb7a73643553ab4f793826a418339fff8e4fe8e62297c4c02cf325137922f1c5f7f97799c25d4f4785eec3a4
+DIST texlive-module-make4ht-2017.tar.xz 15268 BLAKE2B 8ce45523d313cd72676027b072c2bd19094b5017dcb92eeb35d82ac7973d5d7ec111d7cfccdeb5f254ca3abd82f4db2e696ccbe8b1284790c65a274234d7743a SHA512 06d90bcc80409a9f18024bf730f956d126bb5745f43e30cf159ca8a94487fb0dbc347b1b30b2d954e8e3d79160ee0c13c94f4ffbfefae332bf39f94823da599f
+DIST texlive-module-make4ht.doc-2016.tar.xz 67372 BLAKE2B 722199fb7ed3bf6413b2417e106bef66aab450fe1c4acbcdabc6c1afd181641f35957ab846be0f82c5b8da111a4d6e6fcc32cc51c566a99e8d62c6b8da1eb60d SHA512 836d44b74469dfde682ab6e3475f555faa93301f6f1928a41b24c592895f6770a25e4128f6ddb89edc91fef693cd875aac41993903d8f5f2a5e0f8e2427eab55
+DIST texlive-module-make4ht.doc-2017.tar.xz 72112 BLAKE2B 24a227bf3025db627785580ddeb2a4dd894b4e3b41bc95d53e8f98ca0b319cdb1237b93cbf59a0d15398ff31f303800cfe1f68e1c2e9514fb36905b5bc993d25 SHA512 05dceee32a5488df1bc889e2ebd006cc2c901e8445a7f7e3ddde51afa24dab59fabca9b2df963febb7018b4e840f0107f7aded5653ac9046b7625d3a5852fbe9
+DIST texlive-module-match_parens-2016.tar.xz 3328 BLAKE2B 22441bf4709086eb73afc83e46525059825457a0e28ac4a345fa2a20de92563353c5dab5e794b884dda66a596f89ba79a485ade65e1d65f78211c918238093a0 SHA512 a604521dd72736f3f5ac703734218e534f4690d59fedfda06576f6ae402306e94a810da9ef8c7739dcbb7537df04f7d09bf5d08b2b58e0df90710a3394eab03e
+DIST texlive-module-match_parens-2017.tar.xz 3328 BLAKE2B 22441bf4709086eb73afc83e46525059825457a0e28ac4a345fa2a20de92563353c5dab5e794b884dda66a596f89ba79a485ade65e1d65f78211c918238093a0 SHA512 a604521dd72736f3f5ac703734218e534f4690d59fedfda06576f6ae402306e94a810da9ef8c7739dcbb7537df04f7d09bf5d08b2b58e0df90710a3394eab03e
+DIST texlive-module-match_parens.doc-2016.tar.xz 57272 BLAKE2B 2c16ee1f69f41f05befe5bb02e527fc8ac56ee5aa432e5830264400e2a4ed6f6908f31766fe6472f61c5bd81ecafc56139e6870f0fa5c2d32fd58770d4abafe2 SHA512 6f33b5bf2440b9d65933b1d01461bfc63b96aea89c0f04b010e9cb15a52745042852d3818a7b41be7d6d6a39dbcce3056b06807140a5c89608252288edce4c8e
+DIST texlive-module-match_parens.doc-2017.tar.xz 57280 BLAKE2B 0fd6b2c6f7ac7eebe6b7d1bd975181dea960284dfbf98866557dfa45c29202129bffe587c3bdba50217790e0d97aeef98f5467ef7dcb0fd0b0d7084bdfc657da SHA512 d92fa529b9cd6cbdee2d8e6f178fa8395c08540d044d0522d1da2a68c78654666d0f7ec05960c9b9f8b2530b4c54bc695887da13a1ba383d6c3bfcc49ebd64b1
+DIST texlive-module-mflua-2016.tar.xz 1060 BLAKE2B 154ec2466bf6e8f7a4b25631791a2ba78fe34a71e69ea14647a269d2ca52d06ebd38d386c9cc95195f14f0377a14eb730b403b86b285d3b45f42c6ef4b60c901 SHA512 ca42bd7f4efcc05477bea946809fba14df8dcca7e57325cad15b11836d1cabbb1aa089e6c7f17b23fb96131f99f1da678194e97e67269296c0a2694863ea11dc
+DIST texlive-module-mflua-2017.tar.xz 27848 BLAKE2B c2f2be68f0072b49a94e535bd7fb948e24d6f6e4e711aa067efc7643ad599c26dd66f9635e3aa9ed4cf876f4bfededd1f8a24b06328db042f06fa11e45212e5a SHA512 83d84e3cb1291c2af4067df2fce91e14bc30d11843c5aae36aefce4e0e1fe5cf6896ecff8791c2888abb16d13933cdcaacec11421d534b71dc3b6cf8c1c02bd6
+DIST texlive-module-mkjobtexmf-2016.tar.xz 7444 BLAKE2B bab2adf54d9d8ce726825dd0293f024d97bf3b3883500e698c6d5011ef3a9b6a47ca65480d2f4390b2f5c74161229f3ca141d979cae0bd05577652ff4dad5238 SHA512 956521aa85102211193116a04798aabbefe52457eee714d7f2a3bae843335c932af987a9c3e7364c6ebba561836d479b2bcba81ce6ef5c8010929a3f6ded090b
+DIST texlive-module-mkjobtexmf-2017.tar.xz 7444 BLAKE2B 20a80de587212d1a89610b378c50ed8802cd8ebfa7c3b80529add90a8f737f7a6b87d3614e77e3a820292bb8145ef369b2c4f393efa41eabfef65336a5bcedce SHA512 b87432ef1fcface11e93e541595fdf74de1539d9f2ce0dbbe3e35c73064230812628745aec782b8026cc60f9797aeaca9057c534ac852b22bf44d24d5cf1b960
+DIST texlive-module-mkjobtexmf.doc-2016.tar.xz 80280 BLAKE2B 544e06e537fcdd223a37d39926e5ff0a9f734ba4ec42fdcc8ec9e51fa0c9141675f63d7d3ad0c3c0cde4ae24b07b440f9d2ccc83c761c19bb6fed4c7f5d58f00 SHA512 695508d18d0ce39fe014dbca4444aeb821dbda6752c4e41f760d8cd1f2dacd7bbac8df50ea2f62f5b7808cbece17e68cc194c40766fff79456b6104dfff6d4bb
+DIST texlive-module-mkjobtexmf.doc-2017.tar.xz 80276 BLAKE2B 206017cc2c54a2f1dce32d7b4ff2670a5fc0e3f3afc0c5c013b849aa1309af8ebeeaccc9aafd59ed2336d226b53afd6d07895177bbc5b62329b10754b81592c4 SHA512 4df1df676df7f1a1c1bf0d1c0a51df8e4839558b79fd410446b522ce218f499960420af351c195c61fb66f9eeaea869762f3ca8091f76c662aeec333fcfd0f80
+DIST texlive-module-mkjobtexmf.source-2016.tar.xz 19828 BLAKE2B c24717c1a1581e637e832fde56a32cfb1944e573b349a5f7dd30e8fb993d87493d74f6bb34392596809c0ff911c3133ef42e88237cf060da4660cdfe97075ed3 SHA512 ea1ae4540023f21a35fd82207752ededbdfb07883894baccf2f6def17c51c7aa821b5f3b5411384e986717ee797b9589cf0ade8dbed6c57653ebd6e5028e0506
+DIST texlive-module-mkjobtexmf.source-2017.tar.xz 19820 BLAKE2B bb68f6151bd777e677ef75ffaef1338a9995e37308cbaf4307378b5d7291c52950be369c66539e322dbde11bb8951b3e0fd6b227e47de9238027081f359cba5f SHA512 2ff63f05ec1d4b09842a20b93a1ecab09245dfdb3cfbd3e37f1e1cd9d25760c161948433c10ef05373d84cc44b56714f86073afb48053a8f965c64490da0b3ed
+DIST texlive-module-patgen-2016.tar.xz 532 BLAKE2B 21f5b2ba902932c026e6f8d395031510625424341b494063010384aabb4d5c1c4bedad0223e738dcf57a7656e0bf13996e9662ada35933ae328ebcd42ebb70a8 SHA512 129087787df6ff3f450ba9b4af53eec8c5349bef186825ade2d2831139c2c4d2de5b8d2a354052a06f86f1fca251047cddea3bae2d9dbdbcb469d0dd0877786e
+DIST texlive-module-patgen-2017.tar.xz 532 BLAKE2B 21f5b2ba902932c026e6f8d395031510625424341b494063010384aabb4d5c1c4bedad0223e738dcf57a7656e0bf13996e9662ada35933ae328ebcd42ebb70a8 SHA512 129087787df6ff3f450ba9b4af53eec8c5349bef186825ade2d2831139c2c4d2de5b8d2a354052a06f86f1fca251047cddea3bae2d9dbdbcb469d0dd0877786e
+DIST texlive-module-patgen.doc-2016.tar.xz 29108 BLAKE2B adfc3a474f810876ce9ac5d6daef2ce5a607c9007f2f8a5810a47134799c168e4bf2523ce635a5170afed07fcfc338b284747addf4275f446ceea970f3b0023f SHA512 3f9ac07a886933bd980006bc083fbc95f5e103d2bac330b2f4f2af8eed76c6fb0191ebd58af1d84cc84c51824dfe11fbc8d32d9099b9f0144dc010764769379c
+DIST texlive-module-patgen.doc-2017.tar.xz 10960 BLAKE2B 08b89c5a01af4e9f14bffbb17561e2591753e853395b29476fd98ec3c5fe18120e223ca96fe6a4c7a2f5220bc8a0f07707e4ffe0b7a7fe914ff8246db9231226 SHA512 b1b69e00f32402f3bf2012f25840e63e3e1ebb00a5224efe7c7425d54a4c37945dfa097a1f41e89b360e4d0d769ae003774503fed41e4e1076004d296be27117
+DIST texlive-module-pdfbook2-2016.tar.xz 3496 BLAKE2B 303d892fbcd954fccbd47e15410720a5d643826b19f5cd1dfcf9b209dcdeda018889ae596196026bcb01944d6daac08ea9411b9d24b6fb79e899d6f55d629c3c SHA512 f47fef10250135fdaccf4b44a6c62cf1a648b3ca8762b241b9390fa890a17e946f4e750f121c985d133af4289c15ce7e576011de3dfc4fcca4c3bdae52c4c508
+DIST texlive-module-pdfbook2-2017.tar.xz 3492 BLAKE2B 8f20b8b924d72575b0685fc9b2f4478e78e99bf8a2cf820188db9f5dcf2c4b761794cbcebd3785a5cd084ba77e39528a422b8290a2c226718c25a97f29e15253 SHA512 62aa520c215830d8145bb0fd7af60915245be4b246bf42eb912124e61c9a388da67f3ca7efad560f98701c5b32be0b87ec9e78078b9900f44f0095c9c069ab1d
+DIST texlive-module-pdfbook2.doc-2016.tar.xz 7552 BLAKE2B 0a3bc6517dcaea4bf554fb50b6cc25df19bc7322e3f51cfad49f63980e3ea28df0d0dff3a8f645f0b29792ad9becc7c6dc38c3b31279e2c23c146961c5d30784 SHA512 bd882c85cebb5ae9ada4c6bc0e69f92d96f57a6efec212851b3420dec6f3dd7db91fd1b0fa357ded5613fe4f46da3b1c4ce44d2fe1c85eb1f1c15514fe0a29ed
+DIST texlive-module-pdfbook2.doc-2017.tar.xz 7552 BLAKE2B 086bf910bc66166a2a441465094d95d13fa8c39b4840c9ef19d9595ab2aaa14eb4251de5cd2b4ff2589768259ac3048e4057bf3bcd7bbef4b86d6c82b6bc3746 SHA512 7620a797dcae68e7bf093c119b06f377ea2665b228125bedae11ce129d8053df066e771df2053fb8d90473cd7d00a75ec5235a0ac5221b0171605d145a18321d
+DIST texlive-module-pdfcrop-2016.tar.xz 10724 BLAKE2B 381a4df389465fece3e4cdb230ad39348a3174946e9b32bef8bc9ad745a0e22c8683a5bd5dd9c2b03d6bfe7e8da1ed0f520cbdfbb24bed633c10665587015f4f SHA512 0fa7b15f22e5dd80581e8398aa3fc9f58568572338e1c2c137c3db2514ef0297b2d29a14485d64e1602cfb75bfdd27d584ec2e9eecd35d6027a57cdba2727673
+DIST texlive-module-pdfcrop-2017.tar.xz 10720 BLAKE2B 0287ee170ff11967df2932d9dd7ba947abbff12045b059c906b9dc399a56596915b9aa06d4c924db84cd9d5b2d04e42637f5ec1291d4657730ad5225de002cc6 SHA512 11d2e8e911e8cfcabd5a4f6555715e08cd6ca51868c1a0dd7d9332fea5fe7fc4b571669058a99ca518f7dbafdf45a517231ea8a654ad39ad9169a789b3346a00
+DIST texlive-module-pdfcrop.doc-2016.tar.xz 4300 BLAKE2B 4e4ddf2a7b9c301a54b5d63f6398cae7c689b3241d8cf0d765ec00b56a0f7ba39dfda5f8e9d980a0ce00e3555a35376a501b3999c5d83e553937c092a53304a5 SHA512 13260483069da8cfe84da41e6a3011883e7ec2b1bc900b011893eb1cc0927ef01ed98d36048c454a911a144ba967a94521030c94b2f2e5d4588b717984ccd519
+DIST texlive-module-pdfcrop.doc-2017.tar.xz 4300 BLAKE2B 7d5a70a0f8ef86b1bd9c60e534a20e95571d0808d6219e0cfb011def705427b843c1492b2021611d2b27b79324c764d249b852499e9dca5fa9e71aee1f7343e5 SHA512 fc9537872e8a7234d80e76709d69ea7c3e17e02321b26477a96186e9b190d6c093a62caef83bebc76d4aa4134273e28e74d456ddaeb9e53fd073f9838ecb6110
+DIST texlive-module-pdflatexpicscale-2016.tar.xz 2928 BLAKE2B 581e70cfc5f84fe993988705d9aaf27c40fd05324afbc28723263f38d8537679504b88a477743d4c42aeb8a80aebe3c169f6dddda57a4fe89ef60bc6f5fe6daf SHA512 86f3b2368d6c7b3a2e4493fee13ec59b905b80d00416363da38efb11dd7de85f723e97e830aeb45a03a0183173e65bba9a80018ea7324fe4e674464544154d51
+DIST texlive-module-pdflatexpicscale-2017.tar.xz 3120 BLAKE2B 9b4630ba97d27258bcdf58f9abbcfb2a3c14f846b575c365462c46775685728443290488108af99161f164b16714a7bca6717ccba0c9d5878cef8ff1baea6ff6 SHA512 2e6c4baababe8b656e12eecdbe73d8410c060c3d4aca5dcfc626728126481a5a86b8b7d031a35c85a26e2cb79ed1e7bba7e143b449b0118b5a11d9bd9bd135b3
+DIST texlive-module-pdflatexpicscale.doc-2016.tar.xz 193112 BLAKE2B b675010af99f137e51ebca7327e8f03dec565c0fb0f9933999302856eb2f349dab24646437ade314333718f5d835ba5b3d6d65e12e4f3c35551a802021b6206b SHA512 870a82d51c3d33c00443aba797e23b6aab8d11b33e254f86c0e5d934f595947803706d1dbc9559714c7a49879ca8cbbd9e8a2a0152b707a84073a6df0e912bfb
+DIST texlive-module-pdflatexpicscale.doc-2017.tar.xz 86448 BLAKE2B 45de64a373368a72acd8511a46ca37b6a0fe10a2b4c0d3f7c65a32799f1a25fc22b2fa9f22a9a0b0abaaf372a1b29ab26a1dbefc37cfc7a4569a8ca2f43b4ff1 SHA512 6a19f1366879369ccebfb53663ab565e3a635bdde413fa7c1d8d6a58faaab745cf213b35e183ca1bbca4c90dc3a8c60f1ff0e472817d703ce015852d0028122f
+DIST texlive-module-pdftools-2016.tar.xz 1872 BLAKE2B 4c5f69571bc750342ad16601ddb55ecb13d88628754763b654265c782dc5bdf5b8b0f4ac26a52e05299a32b001c4d7c72e9d9b4f9a9da194e5d9447c53a00a7c SHA512 04c1f532d360bd2865392b40dffc9b81b29e6940832ad36522f184d8da32ebd47f268a67f6ac75239de46e37911f60ad4dd644335312e3e6d2d7722c08103b1e
+DIST texlive-module-pdftools-2017.tar.xz 1872 BLAKE2B 57670c928b435abae7bbd86d7a0f9160ca194e8e4dc07ee9a077fb6061b4895da02cb5c71db7011ac90d9c0ddc6f27177769b9f0e39d079dce7191a9a9683050 SHA512 9f6684fa61f3bf757fc970214065b76523e9f0bf324024fe90268034a2322646cbd10f3a005135cc176e7ea17c434fd9e727337d45929ef24f024b0ee7edfb10
+DIST texlive-module-pdftools.doc-2016.tar.xz 73680 BLAKE2B 039106802e0eb4b7c26c857194a3906f553c038723f42ca4c1f7f575e5e703506c49f731b03b4a8f302d1bc230a6c38140664f9f7be301e35584886be15f9682 SHA512 e89610bc333017173d5e3f81826a244daa5e7a9ea779f580e06ea54ee2e1a456b7d83ca8fae39a38270d14bfcda4a8c8d9520e0903ab9e91cafcb1aae0207bcc
+DIST texlive-module-pdftools.doc-2017.tar.xz 73680 BLAKE2B 039106802e0eb4b7c26c857194a3906f553c038723f42ca4c1f7f575e5e703506c49f731b03b4a8f302d1bc230a6c38140664f9f7be301e35584886be15f9682 SHA512 e89610bc333017173d5e3f81826a244daa5e7a9ea779f580e06ea54ee2e1a456b7d83ca8fae39a38270d14bfcda4a8c8d9520e0903ab9e91cafcb1aae0207bcc
+DIST texlive-module-pdfxup-2016.tar.xz 7260 BLAKE2B 30bdcb82091edf920b31a0ff9c3b4e4ff16e3c2cb1e91584766319f1ccb9f3211d9d064aca5636f4181b9eac47e3202aee0ab8474e198dabbe63ac63c6503368 SHA512 598107c336f9ace01c160c107da09e6a43d0d508b1e8b9f5304d6ab099b924ef97726d925031c5643b179e647d7d66638028cf006d9afc7898ccbb6830b87a68
+DIST texlive-module-pdfxup-2017.tar.xz 7260 BLAKE2B 30bdcb82091edf920b31a0ff9c3b4e4ff16e3c2cb1e91584766319f1ccb9f3211d9d064aca5636f4181b9eac47e3202aee0ab8474e198dabbe63ac63c6503368 SHA512 598107c336f9ace01c160c107da09e6a43d0d508b1e8b9f5304d6ab099b924ef97726d925031c5643b179e647d7d66638028cf006d9afc7898ccbb6830b87a68
+DIST texlive-module-pdfxup.doc-2016.tar.xz 21260 BLAKE2B 5256bfb3c4439855976f940e5a220372349cbe355fd95cce1c90e60840f71634410fe9551cc476e457c19516627c7099c788ab092d72ad8f365440eeae6fa261 SHA512 934aef9a1ddfe0e1f6cab6078e4bb4c1e4c4d428ca3f249f32ebfa72f9148af342c080164cf291b4e1cedec5fed1d596026427e9c7253c4e151778ccaa399b2f
+DIST texlive-module-pdfxup.doc-2017.tar.xz 21260 BLAKE2B 5256bfb3c4439855976f940e5a220372349cbe355fd95cce1c90e60840f71634410fe9551cc476e457c19516627c7099c788ab092d72ad8f365440eeae6fa261 SHA512 934aef9a1ddfe0e1f6cab6078e4bb4c1e4c4d428ca3f249f32ebfa72f9148af342c080164cf291b4e1cedec5fed1d596026427e9c7253c4e151778ccaa399b2f
+DIST texlive-module-pfarrei-2016.tar.xz 4636 BLAKE2B 825320b8a56dd3f07051a6adfb46f3293fd0b3cf5670b812545d60f2ee9e7028828f265c28270d62730fd768474b96faa26996cd56f4b602c40b6b0aa2a68140 SHA512 39373904f213647029a282fd86940dbdf097828f3b47b1d0c6bd9bc99baee20665df6e5e5af3d2221a661fd71f91884470e5b7d540368dd968955b438c5f0753
+DIST texlive-module-pfarrei-2017.tar.xz 4640 BLAKE2B 04bf192c53a5f9828f96f6ccced8fe77e562279c99e039a793a2da6a7a346cb7c9ae5439723ab8c50ba95155befccc90d2979543a9d836de23ffd323949a5b10 SHA512 3fd11229796b4958fe8b8a3e2c4a4f0556063328ecb83cd9f4273c9bfa7b0d81dac776fc5d79f5b96b7366e0dd259d27af1747752e1fe4bcf7396519020a6d95
+DIST texlive-module-pfarrei.doc-2016.tar.xz 499400 BLAKE2B 4553271b95f9d295ec870681ebfe9431c84d7314fd69cffb96555b132095715738fb101184cf66002ffba91078b97b33b4e88326d73aee77163114f120afb4e2 SHA512 66ce3c9aa05bee674cc1966f52968edef3b0da97225457f5bc723e3f800c5f14200c75597fc67b82b167ad8aed92a28235d53b9030f08e5a29fcaaf2be3f5324
+DIST texlive-module-pfarrei.doc-2017.tar.xz 499400 BLAKE2B 4553271b95f9d295ec870681ebfe9431c84d7314fd69cffb96555b132095715738fb101184cf66002ffba91078b97b33b4e88326d73aee77163114f120afb4e2 SHA512 66ce3c9aa05bee674cc1966f52968edef3b0da97225457f5bc723e3f800c5f14200c75597fc67b82b167ad8aed92a28235d53b9030f08e5a29fcaaf2be3f5324
+DIST texlive-module-pfarrei.source-2016.tar.xz 13448 BLAKE2B 218f64d2aec4faa455874517c825cd0b23489d52f7d1b9048e14fbd670e98d3c5a7e6682830030380b98d58e1054253e2a2d249ab807667dffbe6e5504f60981 SHA512 c823b44f6edfce892d2a6a14687d0d7cd8eb1b2eea267040d1ad2d0bbb18a0218dbe665f9d0fb43e10ba85879fb71ff26f779207a1067b4cb027c0354e136e5e
+DIST texlive-module-pfarrei.source-2017.tar.xz 13448 BLAKE2B 3e01dbdeb61416eb45b83f077452b694b1243b132941f2aa8329c3b544e3c9527008b44d2755ea7e54a113382e00b344c6c393d8a1a5dceb19c232e80ba6fdbb SHA512 2a00bb71000bce7cdba9648d51cc5a7943e2b11ffe1a9bf68dea4d4a320a337f73aef4152b7d5ef10b8a406329b0979eac82e84c21bbeb89421bf0785cb085b0
+DIST texlive-module-pkfix-2016.tar.xz 7568 BLAKE2B 71c9013e0df2ee318881abafa1c292c45ca5ed272c83d87b4a49ac5b75309ab2159bab60af5bcfcf1a40db762065076a6353887d88926c4c73e92e0460c0a778 SHA512 bbe8ed77042f82fc0c261f470e1d560a17d33d64bb83af62cfcac635bdac7716908d95064c3691ccf4803e30c77ba0e4defe88d6ef56acfea01bbf7a302b44e1
+DIST texlive-module-pkfix-2017.tar.xz 7572 BLAKE2B d4036a5922fb8ff9e4ec2e6644c29f5799dacdfa97195cb21d998f327e6aff8441aa4570e62464f1d36c04019f35f91546c2e26c8e02642eb75fd15bf4b0cc28 SHA512 5ec75f9a8760dc9d159a003738e700938aed4312b76c3b32feeae1e3736bfb7e0ec61bc6627753ba2c035c93a47f21176ed8588f73510e1deb76dd8d159b3691
+DIST texlive-module-pkfix-helper-2016.tar.xz 16716 BLAKE2B 954f041f4cc1d2b3abb126952000497ed98f49abe4e84304244b828db0ce5d18ed379591ce8d2037d0165996cf055be6f0c82de711e2c76bb4b1cf7c54d5c45f SHA512 14de8aed71eee67bb1b5f7989c18e16dc35191aa762a4e30ffe916161b81c1397f284d6cd8a497ca9e639302b663c388d0ddf3bd7110bd512021232e63e84086
+DIST texlive-module-pkfix-helper-2017.tar.xz 16716 BLAKE2B 954f041f4cc1d2b3abb126952000497ed98f49abe4e84304244b828db0ce5d18ed379591ce8d2037d0165996cf055be6f0c82de711e2c76bb4b1cf7c54d5c45f SHA512 14de8aed71eee67bb1b5f7989c18e16dc35191aa762a4e30ffe916161b81c1397f284d6cd8a497ca9e639302b663c388d0ddf3bd7110bd512021232e63e84086
+DIST texlive-module-pkfix-helper.doc-2016.tar.xz 640356 BLAKE2B a8bcc2a704ccd0d1151fa705d79864dcb657f30efd21b1f40c494a2202114e901e1fbb596dc2f8c57baf28fc8075da206be3f1acfe6d7b6261eccbb2d9950d2c SHA512 18ae4f4ba80d9c547105f8491fd4d4c70b10f76d28ac36f4a7fcaa6c5c1af4663a20c61a0ada156e21203d269902814ddd8bba1d6439847f2f76d29593da0eeb
+DIST texlive-module-pkfix-helper.doc-2017.tar.xz 640356 BLAKE2B 47f4671dbf99a20a2458073c39ce4aee1257db7c975095fd16132b8af23e3cd3aa25d68e4bd354edf3b9555f0c8619b794d80be377091de602060a53e6e59e6a SHA512 9bd23f5fbad0899936b27d91de75a248b304ace9314e28e9e4278d482545bb7cbc027b7f4933c2f868ce2c19ac3eb74527e176c4f648146613717de36488f7b5
+DIST texlive-module-pkfix.doc-2016.tar.xz 4376 BLAKE2B a550f55ff869a06be90fed27ffd46dfbb6039736e9fcf87117774ce6706d1d7bd3d615f42e79dbb7bc5d7d0850f4e9d5758fea0bebcd0a9fd8ece64f330126b2 SHA512 209405747fd8faa6fa5b5c109bfadfb3dc8c764ecfbef044a4bef219f1a31d06efa6da205e1b45bdbc35e36f283430cdc0610f5a7fb9692ce1fbab0307e4e4e6
+DIST texlive-module-pkfix.doc-2017.tar.xz 4376 BLAKE2B a550f55ff869a06be90fed27ffd46dfbb6039736e9fcf87117774ce6706d1d7bd3d615f42e79dbb7bc5d7d0850f4e9d5758fea0bebcd0a9fd8ece64f330126b2 SHA512 209405747fd8faa6fa5b5c109bfadfb3dc8c764ecfbef044a4bef219f1a31d06efa6da205e1b45bdbc35e36f283430cdc0610f5a7fb9692ce1fbab0307e4e4e6
+DIST texlive-module-purifyeps-2016.tar.xz 6212 BLAKE2B f9bfcbc6c2e4d119165f9466d241152959d972c104dc11790a312958c3cd0cc10845d33a9e166edcac617e973c32c8d7a30f94f33ee6feda8df7a7ff94bee37a SHA512 7bdbbab789f3cc29fecde72949602efb5a3e3bbb530db6efaf653e44560b8a2b2ab839e50f7e8f96eff3f9bb9d210749814452ab589f1fc44c814d9911573b33
+DIST texlive-module-purifyeps-2017.tar.xz 6212 BLAKE2B cee315c9eb13aecb59eee53c58190aa0775f7e1b5297b02faabee2268b036d9006cdceb704df6e7cbee7da68547227a89b5ac43a9dae50f79f4e9adae0bbe700 SHA512 28561a89dbfb895180d0112fb39920c0da0f52830c6a1389afcc080d381c70ccdb217192b2b154f0f31611c67b16603f33c69eaed9d8e5d0571f3886e1481817
+DIST texlive-module-purifyeps.doc-2016.tar.xz 15060 BLAKE2B c95b330ed449078ded03951a5f3c3394414a09756b45e8583ef24fb251bcd121f3860081c2e5339263b97008a0c4b6362658b81e46fcbeef3921c9365a98a93d SHA512 a169abfa97666fc166d6b15151f7dcc9c0ec82d25ba0bce15cf21abb4bc818a52ceb29f31b2516fdbeaafd69d4fb1b729aa76a5f92eb1f4a9adf0903d724ab47
+DIST texlive-module-purifyeps.doc-2017.tar.xz 15060 BLAKE2B 2d9872bd873b6d149d84a8c9075b1aa4119c1ea54fc17e5d519db5a7ec06493e095e12d308c2b315f18933f492b92fddb4604cf235fdbc91d4ffd305bc7305fc SHA512 666846fdd403a143a1756c271c02561576c1ba314fa02400156914baf694d90d461c621bd2d9eb1491e498bb92a4d68e1d69bc20e35d9aaa7440bdc4b76b9b07
+DIST texlive-module-pythontex.doc-2016.tar.xz 1525440 BLAKE2B e6570a3db95a96500923c8fe075b60c9758847e92abe5d5f02b557714ba8e8dcd558cdb633b8538094a3477048201838fcd05859a0572a46eafb213417ebfd20 SHA512 e8043aabf1136484b95acc125545e7c90e08d130392916e0be1af226f8dc2c91a1a5a956961bd1f2717c7f0ea20068ad6567fbd854bad40f21fbd0512d46cc33
+DIST texlive-module-pythontex.doc-2017.tar.xz 1525440 BLAKE2B 4dc91d1b2ae4199094af30fbb0718a966eb51be23d4f28986888761d200a4b8f6f83471299587523d58a44db6327a52f33fc52e29aebcd8a2ad6a2a93f0e7888 SHA512 8ddd52bb6fdd93510120343222234a3f8dff4497037a6529017437353c5d409572f122f5b1cf78088d554986f1694d8674cb7d8991d90683c197a4b08c5bb844
+DIST texlive-module-pythontex.source-2016.tar.xz 81912 BLAKE2B e03c55197feac72727de49c5ffbbc49238f9e6740e0ab2bbdaf838d180c82255bd9a57f776f473fc388d84dafc45ecac6eea7a2cc512cc8e47f9a71350bfa999 SHA512 0ccf641e1e6e831723657d41b52655211a58908337e55487e02920ef1b80d8eb99dd2d21cb9d2b094fec64acaeeb35d94fe3c24bcd92785b61a23804a755fa5a
+DIST texlive-module-pythontex.source-2017.tar.xz 81880 BLAKE2B 59576a4d07721caf2a13b2b25c26c9ebd537e7b5eb119a42ff9038c054cf05ea0b82f9f79c120cea3f1a68afebbc57040e301a76759bde1b7529df2838125e2b SHA512 4e05da64a7dc831a169d891aae6202cd1e9c72812838552a23dd3d43b961fc39f2db30080a61056b950df730c2144ea82526255aea213c8793a4e629c6b4c4fb
+DIST texlive-module-seetexk-2016.tar.xz 644 BLAKE2B 166c8fcc2e86774aa56fb6bd4ad3fbd2f05692ccaabc5a0dc2ad3288c1c3670b018eaae790e2665bdab4af914cae882fa1d09a8f1d94a481096224ca67ba3b89 SHA512 35e63104ef1b9358620a9b18db3eb3aefc84c26e26ee3cdaed3ba9bf818592fede2f18cc7cafa55866a7faa98d358132941245587f993b0d25246ab68b9a0a6e
+DIST texlive-module-seetexk-2017.tar.xz 644 BLAKE2B 9347aee58780cfd2ca45b4178cef3eb312686cba1239f83c34cbf515bc558b1610410d26569fe5f33483729c296fafa24feba60466637d544b9b7b7cf02255fc SHA512 f18b647cd991c862a1e27a0d172d294918cab89d91a00f6de33858b67f07a2d1279d3b343a711b20a2067b631fbe7908a60b613f22a475e95bcb90c0ef1604b5
+DIST texlive-module-seetexk.doc-2016.tar.xz 69192 BLAKE2B 0f21ee155a13f0c7c34748b2918dbdef1a8dca008a6b97845344a21ffac307f58251c0ad7a877658ace56e32f0b265cd9af6dcfe1fdb5fc98e9b73ed6eb457f5 SHA512 db06fe4c45a4f6402c383430d94b7833221fa45e149d6abcfc0ef7d362fda9f816738b37d9f1871e51de9ed214f062c75ff1f272d699614699c5e1c36c1d2cad
+DIST texlive-module-seetexk.doc-2017.tar.xz 16780 BLAKE2B 4724e3475aadbc2bc2d1fa70a52ad7a4e57acf1f906852e8e35fd9102811acb3ad10ea14215af6a52bb02a0d1ce7c5bf7ababc6be8450b3311853e610afd0eda SHA512 8d0f79f6d4528d234c264752ce27944f70291d299f6d7e1a254537b0acf1a296894d8f961efb8ddea6130a1faea0e400f99456bf15464e5b08a26a652ec9df94
+DIST texlive-module-srcredact-2016.tar.xz 4236 BLAKE2B 67eb56cdfb84688a69fb5f1bca4e5e5ab67687174736501b72f4d7caed65286fb6f291a216d4192413aae98d6e57cf4a17cf15cbc58c1490579525ec733d9e80 SHA512 f192de24c480a97a17784b567ad29d592da33a0e2b1dd56800b17144dc2e23bc7f6ee51d0f36eaeea037eb30113e7c7df1f2ed430c06fadec6957a6c9f54470b
+DIST texlive-module-srcredact-2017.tar.xz 4236 BLAKE2B 67eb56cdfb84688a69fb5f1bca4e5e5ab67687174736501b72f4d7caed65286fb6f291a216d4192413aae98d6e57cf4a17cf15cbc58c1490579525ec733d9e80 SHA512 f192de24c480a97a17784b567ad29d592da33a0e2b1dd56800b17144dc2e23bc7f6ee51d0f36eaeea037eb30113e7c7df1f2ed430c06fadec6957a6c9f54470b
+DIST texlive-module-srcredact.doc-2016.tar.xz 384384 BLAKE2B 629589148fb665a167d7a46f26f5e80ea086ff281c52c884f4231bef1aea2c55528b24086802f5fba60505040cb9b4fb1074ffaad6f525e35a3d78de234a314c SHA512 4e923a6fe601698931ce1e6e858555c87aa3b7f9d8ef5f71482a0fdf498c6b0d15d68c4aa61765cd6ebbc747290a087dd807e0f5cadd2855505f230c0c192a50
+DIST texlive-module-srcredact.doc-2017.tar.xz 384372 BLAKE2B 74fcccb38f2a598f6ddd5139f3c903910b3cdbe555f062ee2d5a7043764bd3d56d917cc4ce0d6eb6dfbdc4fd707d30e69a8891f49f0c5b3af027be7c084cab40 SHA512 fbd5c700002f3d7c72bb127b24f13b4017a17b69eba9897e1a84d65fbb5123f36c56c06a8ab35fcdde7e4c13731cc5d92f2f3a92734bf9c4e77fb6af14622a16
+DIST texlive-module-sty2dtx-2016.tar.xz 8672 BLAKE2B a0da05e670dc8b998bb1642a6fbe32940ac5cbc038aefd62db9ff37456691d5d329cf8aecd3f5fd2c0a17c9755d9c8090ea11725c7c0ba578daf19878f0c0f7c SHA512 28858f261898d682760a3eb6f381f4b4d56c604d7bd471ce1217a229131110a7e7c99b22808d48999b86d68c801354018e75e56c763d629e0aa8c574da2d164d
+DIST texlive-module-sty2dtx-2017.tar.xz 8672 BLAKE2B a0da05e670dc8b998bb1642a6fbe32940ac5cbc038aefd62db9ff37456691d5d329cf8aecd3f5fd2c0a17c9755d9c8090ea11725c7c0ba578daf19878f0c0f7c SHA512 28858f261898d682760a3eb6f381f4b4d56c604d7bd471ce1217a229131110a7e7c99b22808d48999b86d68c801354018e75e56c763d629e0aa8c574da2d164d
+DIST texlive-module-sty2dtx.doc-2016.tar.xz 151548 BLAKE2B c808d87c2d1d573233811bee3dbd1ee446338c751fbc19cc2c61ea7a3a8c6caed438ff8225615ec5770586ab4a55faad543174fa5bd47b2f32d7817c22faf500 SHA512 f472e1b64d68164aa966a1ce885824c2f9369a48bf54a660271ffbd669f73ad9c1b21ab1db69ce706815275db31ea427eadaed245c510a96ce162b89830658c9
+DIST texlive-module-sty2dtx.doc-2017.tar.xz 151552 BLAKE2B 69e10ca9ba5aa92c5bbe575381e966d6c149b4ff391eedebb925be298535396991eb82943b5de681b9bea29b4830c8a9cf8d0719ad66ac3afb5813b9ba2c5eda SHA512 0323a7d039fdd1a3f623418c5294a5e1193da458b5a3d955c0a20551fe8928fa81461d76de1c9b0c1b5020156bc1e56a571439fcb83241e1f5ffeba741988b10
+DIST texlive-module-synctex-2016.tar.xz 244 BLAKE2B 86c14efc8163ad3f0240cc2680cb21fab85551f91d3f981e2dfafc1ac53c421172b16f9e2dc71af967e95e0317abee3b021165e6bc82f19d7311a95725eefa27 SHA512 f6c0b41e5691dbec92aabdfb1e84716766cfd0aecaa260d66014f3bd7e08da57800978b3bf6b892cdb88ac5c960f898fa836488883a7a533fd98d48dba58ade8
+DIST texlive-module-synctex-2017.tar.xz 244 BLAKE2B 86c14efc8163ad3f0240cc2680cb21fab85551f91d3f981e2dfafc1ac53c421172b16f9e2dc71af967e95e0317abee3b021165e6bc82f19d7311a95725eefa27 SHA512 f6c0b41e5691dbec92aabdfb1e84716766cfd0aecaa260d66014f3bd7e08da57800978b3bf6b892cdb88ac5c960f898fa836488883a7a533fd98d48dba58ade8
+DIST texlive-module-synctex.doc-2016.tar.xz 36924 BLAKE2B 9b6aa906c4f232578d7c966a5db750394c794d5fb163fc16bbf969e25358a396039d8e63e44cf1693d53d7e4d62b30570318cb1fca458e2b0b3ea189d70ccb73 SHA512 7e4439d19f2724ecbe1c7d1e0f1d04199047ae29ef10beabe614e3689af35ed0503af736be3d65045079495173c651dad5e50d0e9a6f8ba9baf86836fc678a8a
+DIST texlive-module-synctex.doc-2017.tar.xz 21220 BLAKE2B 59aaac4a0b21fe9407aa0b07de94f9ef64dc61aa19ed70b751485fe6c0a9e081cb1587faec7079836dd77feb2f562cc18a523b74d5d8d6fd65275ce073eee998 SHA512 1a2ae03662a4104f1b2923c9ddb5f63c3040f2f646128cf4987865ff72d367852580a15d01b179a14e9dce4efbab946ef78ee7766ca98d99021d0adc7cbc36be
+DIST texlive-module-tetex-2016.tar.xz 59904 BLAKE2B 944de9c1bf39cb4a6c4d23efbed191d8f216100a860cb1e5c390a1071b0040865eff7fbf1217bae890639021345579d0d1bbb2bfc7af70b9052d183a84eb5731 SHA512 4f142ca15e3db93f6366f8529ab7f1d6778b20df41aa6b64eab37888b6cee7f8ae41a5667969bc42bd0f73c312ce6bdcaa1f07917bb3fa897bca3c2f3bfbb22e
+DIST texlive-module-tetex-2017.tar.xz 60072 BLAKE2B 0b46ea74e06218517620aa2a9b13485807f8e1032c30417e32ba712e3728505a2e4e1f1e0ff0e4d437082a1a7887cc96bdcc146b9dfc265a959704999497f3c3 SHA512 22eade74858326f76f6ea22f2eeedcabc313e2e59a36a1a079cfafe7c9351953fb8e381fe9097110336dbbbea9c123a437fbd5e4fb9d7efe395ebdfe0c7d453a
+DIST texlive-module-tetex.doc-2016.tar.xz 521384 BLAKE2B 56628c403a6178f1ef9a06d6d597f1ec63eb71ad92a1bd6d7cab6008933e9b4b69425a5b902e59ae0c80e5a3416572166de9f614dec9888f5ab4cda7eef9ae76 SHA512 9db573e4216fbe026f1c2eaa678df718f6951fb7ebba71ff3eddc353fe4ce88332035a6ea678c4bfeb2a496d35d2cdbb10ae33915d4f3f91f52c83cab20a211d
+DIST texlive-module-tetex.doc-2017.tar.xz 348764 BLAKE2B ce1f98e48be94453dfee368dd8a90f66bdb83b4595eb04155fd4bc965f1813aee62b5ad18151da7beb14a723761a76764c412e3ef8b9a9ed9cdaed2a996fadc2 SHA512 d0e83b87f9a844c9961bda9875f8812dd507e8edb9664fe0edb19a775f34cfdd3f096295f5d0c209ecd3c7ef4a11416601c61f0d4db4bef0297ee96d9ae430f2
+DIST texlive-module-tex4ebook-2016.tar.xz 13352 BLAKE2B 392661a4b57691baeddc5a1885222256712744d3346011aa33ffd3c948c744fe6895a6a396b76839f30f37a86007038bc57536c23bec33c1b52e757d5d4769fc SHA512 06f7b0af006fff3d3d583967066bf2b7320e7e8d1aeefb0776fb5cf30f5fa49c956a47f677f115b680f50db6b6486a11d1a00e7a687a49a6870761e7c90bea42
+DIST texlive-module-tex4ebook-2017.tar.xz 13352 BLAKE2B 392661a4b57691baeddc5a1885222256712744d3346011aa33ffd3c948c744fe6895a6a396b76839f30f37a86007038bc57536c23bec33c1b52e757d5d4769fc SHA512 06f7b0af006fff3d3d583967066bf2b7320e7e8d1aeefb0776fb5cf30f5fa49c956a47f677f115b680f50db6b6486a11d1a00e7a687a49a6870761e7c90bea42
+DIST texlive-module-tex4ebook.doc-2016.tar.xz 72536 BLAKE2B 3109ec747de67cb46ddf6b522e00537ec1239a3c28fb3992827ca0028b33539a25c734d15d1d8df7469256d8f765c5e6df8b64b61bf4f1cd58b00c83893489ac SHA512 2da50214c0612614b539eb2db68e30cd73edd024b14073cf6ceceddbfffe29aa4eb8ba5c0c6f002856e097574a16045aebe7fcb2c7e04ddb218181c5ab64c3e8
+DIST texlive-module-tex4ebook.doc-2017.tar.xz 72536 BLAKE2B 3109ec747de67cb46ddf6b522e00537ec1239a3c28fb3992827ca0028b33539a25c734d15d1d8df7469256d8f765c5e6df8b64b61bf4f1cd58b00c83893489ac SHA512 2da50214c0612614b539eb2db68e30cd73edd024b14073cf6ceceddbfffe29aa4eb8ba5c0c6f002856e097574a16045aebe7fcb2c7e04ddb218181c5ab64c3e8
+DIST texlive-module-texconfig-2016.tar.xz 12428 BLAKE2B 4158d846cc8f3d73e3222d8572ae6ecb38d1b64164de8bf522569d01b92d9ea02626820f8f8b169d644227a0ab108d8fd79a3e192c5d72985f62c0c11bad36a9 SHA512 5565d51ffd81e3618de5c4d1e6f1026e6d3ef7bf4a7d41981547ccb5fbae7a9ac26d1864dc260c77800b6fb9cab186201d389b38cca4edc8f99aa61374069d81
+DIST texlive-module-texconfig-2017.tar.xz 12492 BLAKE2B 432779d8f44ce00e5a3551ac9271c510f1575770d99ab8b32d98afa9e36a78c77878ac63075f08a553bcfd94f34f9eb64c56b316e86bebbad03e53a7ea3fcd02 SHA512 5473622487ae5b5f6bd430bc3b75ee7c1fdd646f74442fbcb9d4a943f27e013a21bb05a35a724efe4dd330bca3572dc6024be031072aa2d9ab8c9d4e75ea065c
+DIST texlive-module-texconfig.doc-2016.tar.xz 28132 BLAKE2B 737d716a4be9e86e3805af4d92a94d25b2e9ebcfdcac797dd0bb0f20e4529e6a209afe9820d91406f0a7df76d1723e2e65f8a4e1e15aeb85cae39ef5ab99f5d2 SHA512 3467b34fee7dc7bda25a85d759ab150d113effb27d64c632d69bea332114372299accf749e112709a39104afeb2c562a1f189c9bbbe41325b27827e515545b79
+DIST texlive-module-texconfig.doc-2017.tar.xz 28132 BLAKE2B 737d716a4be9e86e3805af4d92a94d25b2e9ebcfdcac797dd0bb0f20e4529e6a209afe9820d91406f0a7df76d1723e2e65f8a4e1e15aeb85cae39ef5ab99f5d2 SHA512 3467b34fee7dc7bda25a85d759ab150d113effb27d64c632d69bea332114372299accf749e112709a39104afeb2c562a1f189c9bbbe41325b27827e515545b79
+DIST texlive-module-texcount-2016.tar.xz 33976 BLAKE2B e88e6c3b3173a00e0537642a3b3dbdf381455bbfd51958633502029f4d58e5605e530ebdf1c8772e3b755ba91c553b77addcd90edc8295662fb30ba07b4c1026 SHA512 1283f3554ad91423c5244c74670821a098ae8aa10c06b0a409b1852ca86c0c90b24ef3a1d76e894dda6636a95784fb8820aaba6442efdda566b8674a8faeffaf
+DIST texlive-module-texcount-2017.tar.xz 33976 BLAKE2B e88e6c3b3173a00e0537642a3b3dbdf381455bbfd51958633502029f4d58e5605e530ebdf1c8772e3b755ba91c553b77addcd90edc8295662fb30ba07b4c1026 SHA512 1283f3554ad91423c5244c74670821a098ae8aa10c06b0a409b1852ca86c0c90b24ef3a1d76e894dda6636a95784fb8820aaba6442efdda566b8674a8faeffaf
+DIST texlive-module-texcount.doc-2016.tar.xz 554820 BLAKE2B 6b8e2e11b9e347c3082348006fe083dce75425b78be40ed245213afd7a22a0a3c93a087f77958eba9f6644ab2ee6f93ec93cce10a65f659a378a314fbfca870d SHA512 92de144ab0406a3c30565d1bd3320933f9ea1696fc22d41103975677adeaa844faa69571160e303f70b266bb3c079c20cb24c74502f51409eab8800a6e46d9b7
+DIST texlive-module-texcount.doc-2017.tar.xz 554756 BLAKE2B fc8aeeedfdeb7a88dba8e23cde6ebfddac01f0ba379d90acd88ffabf6e069039aa88f6402c932eae63076f9d577e08fa0f32f8efe894bdce63f9ed743acb0e85 SHA512 f87c36f1d46552d258156d36764c6d96839576e30510257f72d24b4eddba1c624b12ff4405be3e39e1aa9d3f70c02e272a3affd513f2dc9ca3671568279ed6ca
+DIST texlive-module-texdef-2016.tar.xz 9280 BLAKE2B 736d66b8bddf7315b6891d7b5e17473afe7390f9fc9bfaaea323fefca59e59af8a96f7724aa07e168c1a6fed077f7fcd2011c9fd5e8e9d170a78378a9765845c SHA512 79527a3b020f5fa3ce69f3436ef71f0f17d388b61b53e133dc8558ff26ab9a600d06233c41aeef6e4935d98c3b2d1c2b1ebb6f8265f0750bbfde847fcaddac6d
+DIST texlive-module-texdef-2017.tar.xz 9280 BLAKE2B 736d66b8bddf7315b6891d7b5e17473afe7390f9fc9bfaaea323fefca59e59af8a96f7724aa07e168c1a6fed077f7fcd2011c9fd5e8e9d170a78378a9765845c SHA512 79527a3b020f5fa3ce69f3436ef71f0f17d388b61b53e133dc8558ff26ab9a600d06233c41aeef6e4935d98c3b2d1c2b1ebb6f8265f0750bbfde847fcaddac6d
+DIST texlive-module-texdef.doc-2016.tar.xz 249880 BLAKE2B 4f59d8be3fb1701e492bbba01f50d152f4ede04de7a57c6edd266c86859b23d17187c4579eebb7d6e91b08fe6e587a041d716ed1a0dba419c4cf3950d484295a SHA512 9a927c1ed062d3e0de77c7f690d7a247fda1c10b00f0323f09e9818f672fa47f39cf70b96701c1547fcad3966e0aae2aa2f6ae512ef0c62987c8568868ab8b58
+DIST texlive-module-texdef.doc-2017.tar.xz 249876 BLAKE2B 5752e8cf7f2cc497748267a822c19972e5adc223b54e829e9431a1540ecf73c33e3e1f38d26b5e29ed0bd1c09c7af02e58c7c76f3689a5a270423fbff51e7a63 SHA512 9ad1743eb54c5d32dddda440294595f512b9eb64d45d4041ff2edb44a99cc689df17b5384bb5ef7150202a7d1f5c2cd08cfc81abcc2c1fea5e9098c7ef74877a
+DIST texlive-module-texdef.source-2016.tar.xz 3896 BLAKE2B da018b768f6f4e86d2622ec4c76137d4601c6ef15fecac0bd30569b23bbf828173b836d139c1b6de966c986e36d8b134fe1e6fa3e0c78276a9ecea54c9017c04 SHA512 92000293637f81fe1fd78a4402ca0a9bf9591f337149a4efd72d2f49609f0c69751bb323262c012574a50aa24a1d0f786928fba9e8999853856cb9514e345d45
+DIST texlive-module-texdef.source-2017.tar.xz 3888 BLAKE2B 1e724963bef41f950df0f86ff25015a5e43e80c84b2de6ea35df36505b075d8cbc90413dd634452edbe0cb0226c7b9507bb1fbc993d9a84f088e499d85c57486 SHA512 41c19aea1b9141542a6b5262decf3aea1d241c41d1aa0225eac028b564facead789c637e9d580b65ed68db7698dbe6d9fc7572b045259571b802860c7b455d68
+DIST texlive-module-texdiff-2016.tar.xz 7152 BLAKE2B f35399766adb4c0ec92d1642d3148a10c66d51e350f7e7b9c52117a78155b87dcf54d73d638d15c339839269360b13103ab06223684b08037a0600defe92b13c SHA512 8e300ab38c698a33ba6fce3416e6e1c57e53929dd5ccd7cf6c64b17e8c79f5eae0faaa9fd54f9bc909dcc1d3b961b3b799a98fce219503a7add53c0bc306a150
+DIST texlive-module-texdiff-2017.tar.xz 7152 BLAKE2B f35399766adb4c0ec92d1642d3148a10c66d51e350f7e7b9c52117a78155b87dcf54d73d638d15c339839269360b13103ab06223684b08037a0600defe92b13c SHA512 8e300ab38c698a33ba6fce3416e6e1c57e53929dd5ccd7cf6c64b17e8c79f5eae0faaa9fd54f9bc909dcc1d3b961b3b799a98fce219503a7add53c0bc306a150
+DIST texlive-module-texdiff.doc-2016.tar.xz 10300 BLAKE2B a6c11347315fb8035fd73720d0766a1c2843fe36487cb6837cc6adb9b939a50629bd72d596c105fe028a45ffc833ca43c499e581fdd6eee68241a5ff9b753f10 SHA512 d5c5c12dc2d6186f5e196bba31216986166b7efa9f6d44599d43446278d00576f94b858fe91ca5911811c5daa2d409411722e7d29543973641c78036aac15bd1
+DIST texlive-module-texdiff.doc-2017.tar.xz 10300 BLAKE2B a6c11347315fb8035fd73720d0766a1c2843fe36487cb6837cc6adb9b939a50629bd72d596c105fe028a45ffc833ca43c499e581fdd6eee68241a5ff9b753f10 SHA512 d5c5c12dc2d6186f5e196bba31216986166b7efa9f6d44599d43446278d00576f94b858fe91ca5911811c5daa2d409411722e7d29543973641c78036aac15bd1
+DIST texlive-module-texdirflatten-2016.tar.xz 3088 BLAKE2B 702094bd9c0c655139d5b57138f1c0a94a50dc17ccd6c7a528b64aa70c6a8efc03495add1aba38daa98044a53576f3f0e4191c5d7356d3cd9ebd92290668c59a SHA512 6497fb734576083784449ea29f8f7f59ac8a82b8caa44e8a96cfed3e8ff65735d66d09d8c147348b92dd2817679eadd9c8dddcdcab74bc29efaf8edc940a19fb
+DIST texlive-module-texdirflatten-2017.tar.xz 3084 BLAKE2B 4f9c3aafc996be5990596850fceacd4b825f6422a3f94d092d342ea27c65294045860ed7e70e1df871128a63bea9f482c605a2c40f250837d50e558b25df044d SHA512 73404f73d3c7ee569ef019ed4ce621512b6cb2d6f6c85bafc362759b1e1bbc4f56048d17e98b481099d7a0c4348594ec5a514752ff8888c153f4239f3e6d2322
+DIST texlive-module-texdirflatten.doc-2016.tar.xz 5620 BLAKE2B 23eeb5958155d2a83dcf86dc31bd00e226abd1791fa55a2f4eadf287f01bb8dec88837e1e287d3c760baaafe02989129369a46e32b315e294e95db136c035d9e SHA512 da1973e711c102e4ae62d668013d1ee3d12e7300db081466148ff80352b24e75b2990ceb6b1afbf363707bbf833529450925bf33c0bdf9b3458d4ccfac9ae697
+DIST texlive-module-texdirflatten.doc-2017.tar.xz 5608 BLAKE2B 13f2c288e526c827c4759ed26938b8203f204415c4e6bd8f0852b4b09e82caf8c370e4db4752ddbb99673734095ff304f3c0a0009a7fa61a29ff00c642c9ab38 SHA512 a3e00dff899ca3bb7033eb8c8608d44cc3319f73afe6fa0d00c25e330ee13827df9556857f75b9000b4716ad1ab9d8b648f20509cc3ea4b10d2991bd6b3f9ea7
+DIST texlive-module-texdoc-2016.tar.xz 167368 BLAKE2B 957d05d3c4bd7f5972b241ecc53907b8f6cf50c3623cc4c5123490638e2f0f84dbc1fbae3382c0ed52763e5271b0678e16088dc9fdbdd76995ecf87f59c0ca49 SHA512 dc3dfdb7b480a837eeca239e8289b075d5ef7900a92345b8dfc3546a3c63bb378527b2084476fd86a526f4591b2a2e943c3300db10e2d333e1d57ab870d59c08
+DIST texlive-module-texdoc-2017.tar.xz 214216 BLAKE2B 7dc8381f2617b5e03587604fb5cd5c162a35f03b3a28c521349c529e20fe87b2aa33167116c2bde1f0e5fb4437da7dbf79783a75a45561e7b200d75dfd76b892 SHA512 f20124d5e65956d568b96efa1c58214d6ff664477e9525610f07b48898d2a09d55c39276571a7d2954c09bb6732abf5a0067c430d4f0f3ff9355f2d57fab22cd
+DIST texlive-module-texdoc.doc-2016.tar.xz 157712 BLAKE2B 17e17f662af4a0be8a2f576528a2b2ac205141d971a684171033a5b9c68000deea6fb290b129e2ce2b79bc99e0ef003a6ed20068631362776f7bfc94b0d6c9c5 SHA512 ce82834e0ed4b5698f957059548e86bcb3e4348cd58e220b824bc9aad72cefd63c775fb371c03eba4c27811ce8083f2eb147db560ae28c60744f4bb7cf3c20ba
+DIST texlive-module-texdoc.doc-2017.tar.xz 157676 BLAKE2B 5c11d2a3d6a8fae9d6d2c277582366e46601a22a499a447e27291a97246c5a27c6191e2f664f805c5fec118a7a546a3aaa32fe3ac7a6783aa19c8bd91486982b SHA512 52ac9f9406c18856aa1f1570fa52e7ba4dd29b84b10a9c877dd88561248d48b8aa954ac4260d07018e2873dd5a43cf3c02bca02a87db2470d72c6becb115fbe6
+DIST texlive-module-texfot-2016.tar.xz 6148 BLAKE2B 4631014160a90292d30c1c22af88aed44d3260a4600cf0186676ff0ed8ef27cf67a10bbe674db23c71a37fad248838919ae914c9ce24408414c18ee688e756a9 SHA512 40b6db87dc624e9fde0c134b982920fd59b29d771b9a8016870f9c161befbf1d0f3a6f122c20363285e7e71b2aa8464cd1fe4afff2c9ea96b850da4a0841e6dc
+DIST texlive-module-texfot-2017.tar.xz 6148 BLAKE2B 4631014160a90292d30c1c22af88aed44d3260a4600cf0186676ff0ed8ef27cf67a10bbe674db23c71a37fad248838919ae914c9ce24408414c18ee688e756a9 SHA512 40b6db87dc624e9fde0c134b982920fd59b29d771b9a8016870f9c161befbf1d0f3a6f122c20363285e7e71b2aa8464cd1fe4afff2c9ea96b850da4a0841e6dc
+DIST texlive-module-texfot.doc-2016.tar.xz 31680 BLAKE2B c93ab467401c57826e4a16878112b5239724036dc96146e24101cd6912b29d8a3d5063cdf85a53c9aa4c500c058ea8ddbeae52745e51386d3a44a01e6f92a92b SHA512 ea12297d42d3ee6166aefc6a08507a9c1840c162ac837d1a3705c0e4cb7c4bed57c483ad6ae8ca01f487e492a88c2c0d9fdf7f07833553aabd07112a0aaeb786
+DIST texlive-module-texfot.doc-2017.tar.xz 31680 BLAKE2B c93ab467401c57826e4a16878112b5239724036dc96146e24101cd6912b29d8a3d5063cdf85a53c9aa4c500c058ea8ddbeae52745e51386d3a44a01e6f92a92b SHA512 ea12297d42d3ee6166aefc6a08507a9c1840c162ac837d1a3705c0e4cb7c4bed57c483ad6ae8ca01f487e492a88c2c0d9fdf7f07833553aabd07112a0aaeb786
+DIST texlive-module-texlive.infra-2016.tar.xz 194264 BLAKE2B dcc22281c1409b9c09da043e7dddbffe7a73c91da1d2c1f308490393c3d6668601a16840a1401bcbca62ba559b7d31a4aebad9e558fc01d3c0952e12f98b6b40 SHA512 583a28fd7a23a68f7a3dee0060d98d60e89e16a32d054604beefd73d1db951ba81e4ae8142fc60deb35bf8ab8b6449a36e99393fe1a5eee086a50b3af431f1c3
+DIST texlive-module-texlive.infra-2017.tar.xz 200472 BLAKE2B 4163baabb72bca39c34a77edf7a56ab6c93b1ed8a128ff71e4efb5309ea4465ae9fe427777e02b42ae685064fd32a7008864fe1a62656d25b5e6e9a12a358eea SHA512 13b73020baaf358a4812a10ac17fc22250fb9383ba1f1d535b7f25f2354e9f4fceb5cd6f479f38c8951d4894ff6315315fa058ef415ab11d4eea03601308ad53
+DIST texlive-module-texlive.infra.doc-2016.tar.xz 168904 BLAKE2B c78a14af1befd93c18055302d02f2cc51d36acb1e671319f37e5cf5d3bda7775af3dc1f6f3a7891c20d0d3458cb251c9bbd9f9dbe6b55f98111e0fac4ddb1abf SHA512 dd7c466ca4c94c81a0b7bd0d3ce5938c82f38c878a5b1e6ea68317f064ceecb43f02616c303265998f92bb486f3eddbbc3d6d16cea8c92a57e01f1591219c710
+DIST texlive-module-texlive.infra.doc-2017.tar.xz 168904 BLAKE2B c78a14af1befd93c18055302d02f2cc51d36acb1e671319f37e5cf5d3bda7775af3dc1f6f3a7891c20d0d3458cb251c9bbd9f9dbe6b55f98111e0fac4ddb1abf SHA512 dd7c466ca4c94c81a0b7bd0d3ce5938c82f38c878a5b1e6ea68317f064ceecb43f02616c303265998f92bb486f3eddbbc3d6d16cea8c92a57e01f1591219c710
+DIST texlive-module-texliveonfly-2016.tar.xz 6148 BLAKE2B 1da5e5090e1c6726d895f42e3a6dcfdde226c622e0388d95abec625bf454f4aea30782e8cbbdb60c8ef758e170aed02e8ecab62a322d4cd9607aec777b51c2ad SHA512 76a4b3efbd55ca1ec655fb72afc6074186357d672a586926eeb893726f77e3f5cfde10d5698952e079bf953ea1a8821e76b6f06ff46229516433aa9d6f27e440
+DIST texlive-module-texliveonfly-2017.tar.xz 6148 BLAKE2B b96e747db7175367f8d7b21e834b102b4ea83310b26cd502dfff0e75e81bf2bcd14a504f598b56a82529fd3328ad6f87edd76d9cf366d3937f865f8cbf17143a SHA512 dd18460601a387dc43587a81e6e2f1b3282c84340a1c1e89644eb22718f4d911f9fe651707645237cf74b07d9b05b8c5cb54741698141e0f3cffd6d184289612
+DIST texlive-module-texliveonfly.doc-2016.tar.xz 700 BLAKE2B c21187393153d4122ae169e79d8c22ced1e8e076e049cdca68f2f637eb67a6fdeb4cb59be1217c90509ee0b16566ba2c04f517f50f3f1e282d7ab1923a5e3a72 SHA512 e84543231522b62de362760cec32e57321470382b6eedc944b5f02200d9454f10a743397d48acef3e5f926f378830607f9fea20208d5aaca0884cbc4bf6988ce
+DIST texlive-module-texliveonfly.doc-2017.tar.xz 700 BLAKE2B c21187393153d4122ae169e79d8c22ced1e8e076e049cdca68f2f637eb67a6fdeb4cb59be1217c90509ee0b16566ba2c04f517f50f3f1e282d7ab1923a5e3a72 SHA512 e84543231522b62de362760cec32e57321470382b6eedc944b5f02200d9454f10a743397d48acef3e5f926f378830607f9fea20208d5aaca0884cbc4bf6988ce
+DIST texlive-module-texloganalyser-2016.tar.xz 3844 BLAKE2B 965f18c9f1e885df90853cdbb552b75d24673b54d2eb260c22738e3600bfa47982dab68f9cfbb2ba974d75baf3a134b075f557c0fd91fa1cc3a9b3071da8056f SHA512 4ad74a418469bca56eeac138830d4e4020b3a0c3db36b0fbd25b89bd14367219590ef5d948cab79f22f1acccedf4b0073a2ace78447075242a66b40a1b6faf93
+DIST texlive-module-texloganalyser-2017.tar.xz 3844 BLAKE2B 965f18c9f1e885df90853cdbb552b75d24673b54d2eb260c22738e3600bfa47982dab68f9cfbb2ba974d75baf3a134b075f557c0fd91fa1cc3a9b3071da8056f SHA512 4ad74a418469bca56eeac138830d4e4020b3a0c3db36b0fbd25b89bd14367219590ef5d948cab79f22f1acccedf4b0073a2ace78447075242a66b40a1b6faf93
+DIST texlive-module-texloganalyser.doc-2016.tar.xz 512 BLAKE2B d17b13738fcf6995b87ed85cc7afbc38e6b5f62734fb5f3aab5b58a50aa6836501088f3959ba0cecb9b420f95b34095fbbc3a0d09574808950c73e8bd68579cc SHA512 4d570f8377ec751aacf39876c2fa0235c0aa4a348c8716cea24c740516bbc2e9132318bf11d003bf15566c825ff059893ce35a1bc32564e670c29932cd2c1769
+DIST texlive-module-texloganalyser.doc-2017.tar.xz 512 BLAKE2B ba1e799f3e68af8b38a74bf1531704385ee23ead7fa83ac1d3514a19497265954a50e59dccafb99824e6a688f14ed5c4fb02e2a728df272e3a020c1db460e3aa SHA512 922b73d9948fb8a0c79d553d7ff96389172fc924ec03f400a9bdccaa288bb59163778b01cec5ac74df700bfafcaba3d961a22bfb9b025f47440ec4b718bd81e6
+DIST texlive-module-texosquery-2016.tar.xz 9128 BLAKE2B cf836bf5a15e6e4d4f84457cd230abdb34668e52ce58a5ab263a006e2a54525cdd10af15454e484ad937577c3340d129101a841a86139938c1ee52b8d585eeea SHA512 556c649291fbb33ce2e18ddb30d5d5206055f8d656adf4d2d956eb8f0815e28f644dc07e293e4e98088ca0dadd9db396e38effe04e6ea978de0b68c3ca845dd9
+DIST texlive-module-texosquery-2017.tar.xz 163988 BLAKE2B 2599645600750ef77ddb3811b7a2ac82ebedca438b9e488a17f281aa047f977ab0922e8a2b94590dc9cdf33cb4f298d15ab0300748efd2cdf479238f7fbd13b5 SHA512 3a34bbdf928908993cdbf0287680b0136ca3a43e4bf7ac245ac4c15cc2f55cfc9f0e80d4e8a443619d8ecea259d7541790ee1cfbcc8dc8094295b22c77dbb8b7
+DIST texlive-module-texosquery.doc-2016.tar.xz 253000 BLAKE2B 977e6ac7656adc40e138bfc8e7e7107b2002f36ce45296888b44c3fa3bb51d2455d4575ff1e7e699423dde025cd807a9dd5e7d35571c844a6ca918a69d910fec SHA512 c0c9076b9a7d5cf2a7c81bc9a90cc75f41798e7b67eb76bdd8047bbcb542b67034b42edbcb8d0c7b6858204af375473f2bb29eb137f36a93329f008dd55e6850
+DIST texlive-module-texosquery.doc-2017.tar.xz 496380 BLAKE2B e3378dd5b925defd800530270c997154a927fb6ca07aef013c138d333eb88c83b4b9d06d2b0940afb7803d7b129059176fa5aef33b985ba9475fbd0611076a0f SHA512 b57a8c02deed662b5437cc1d739994f69542ed307ea5b37ea6d1f7dec45e441e6d05458e8cacd6837d76598f0a83f6c912152514e62791e82b403a27534cf7d3
+DIST texlive-module-texosquery.source-2016.tar.xz 11556 BLAKE2B e4be700882c0c5ed566ca0f450e101576e7cff9bddba5447b71727df9e216aca71890845fc185103e6335a73914e4d23da8dfc8ce9a4752900a4a8e6882bcdfe SHA512 8b7f75ae1cab5f2821b57b0ac38fd60175d44f3582f52791d505ad27718d8e9b38bfb0383a3cad35f4ce0c39d53932a689a64d6135ce06a5e04530eb09de3a8a
+DIST texlive-module-texosquery.source-2017.tar.xz 69084 BLAKE2B 653a547c1d0221c5744dbd205de5065b495ff6ebd172dd10092b8029bfbdde9d36486a26a3381d07800b8cfc0a1d6ef406f5c57a83aa4a59d166c3318a538f8d SHA512 d16795a95e298913d0bc5a3f41453a523278259b4c211890609635d7445d0a6eb0367d8c842a6e7df4a9ae9cf0b9ba2b9a804aa8b2ce5abd380c59958a60b27a
+DIST texlive-module-texware-2016.tar.xz 588 BLAKE2B 5df9d8533b76baa402549aec5050c71b01601326685f8dbdd752583006d354ecacb3c377b3f56821ff1121bca643b12380cc10f87a1af13790005ab5ec456dd5 SHA512 5e06b23f2f5f74ada7025f5922828e38e22732f6be5234f7f464d880fa1ff6cf0300afa94c8bb17b1e3b55a4b158c36b937992f9d25d55696d81e2dce345ce3d
+DIST texlive-module-texware-2017.tar.xz 588 BLAKE2B d41d855b39779785b0ba8b9fa32ba271ac33e8c832077f6e40f773a289762d29557c2e7dbe5ce45c7a088d99132b245e654a28351147329b8e6774bbfd6c6e9b SHA512 b210ba9c3492631bb63fd230b5c719e604724a66064a4fdd1cafbaa6a66e3727aa7634d856bf3c10fd8d49155a62c447d261e0181a46ae7d067ef8ebf39f2a7c
+DIST texlive-module-texware.doc-2016.tar.xz 34412 BLAKE2B e0e92cfa8b2e6dfd50fe0a03f62271779c6f9528ec1666686aa2cd44627f83fbb86027f58d44a83055bf819ea9b20322eb9df7ec6f17b38d44d9cdba25b8ab44 SHA512 63decbabef250daf9ac5ac6ce97e447333dc7724a56850d63067dbb929b1840fa5467f8db6a310d3992e93d4dad93d6e41f1dabaeaeaf811ce2608b3bc5b7987
+DIST texlive-module-texware.doc-2017.tar.xz 34412 BLAKE2B e0e92cfa8b2e6dfd50fe0a03f62271779c6f9528ec1666686aa2cd44627f83fbb86027f58d44a83055bf819ea9b20322eb9df7ec6f17b38d44d9cdba25b8ab44 SHA512 63decbabef250daf9ac5ac6ce97e447333dc7724a56850d63067dbb929b1840fa5467f8db6a310d3992e93d4dad93d6e41f1dabaeaeaf811ce2608b3bc5b7987
+DIST texlive-module-tie-2016.tar.xz 504 BLAKE2B 6e8c10de0bd2cd808db4c57ea468fbbc7c26ff066f8b3453f7953cac7a16689b292d4cc09d2721540de675602b85bca64887cd90cd193beab340954be04a78e9 SHA512 40643ce881e2eb1de29e5c12eda0d6b93596a5160da4a83dabc5676969d41a9c04f6adec7f1d92821f6736b8cd7a5119bb45f23343e6bcc49e3b6a7564c1a272
+DIST texlive-module-tie-2017.tar.xz 504 BLAKE2B 7ff539b26566f25795a748e3bf76d0fec6611d2f37796c56ce4af587757be0f8ccad6d1ab797dfdeba42cd1894aab628d1052d57bdfe9a62f07b77856b0b1a2e SHA512 91d008e9f9734c4b0eefd7d016395cf095602e3efad281c01ee502790b40ce357673dac432bdc2869f917e7a71e007df871524e993cbcbb581390b85a8287b24
+DIST texlive-module-tie.doc-2016.tar.xz 14984 BLAKE2B a0b24055c843dd454900b82b821ed3a8114ff7e00d3e529105d0bf47b6d06d6f6c897445492b11bc5420b97cf8caf2f09254988c5ae98e238a901680b7571c50 SHA512 93d9eaaa217c1504852ad52ca04851616d5b7ea5c5d3521538ca29f16f03b28fa0ce22275f4d22026192826259ab6e80547f80dbfaa3117eb7e44517c22c01e8
+DIST texlive-module-tie.doc-2017.tar.xz 14984 BLAKE2B a0b24055c843dd454900b82b821ed3a8114ff7e00d3e529105d0bf47b6d06d6f6c897445492b11bc5420b97cf8caf2f09254988c5ae98e238a901680b7571c50 SHA512 93d9eaaa217c1504852ad52ca04851616d5b7ea5c5d3521538ca29f16f03b28fa0ce22275f4d22026192826259ab6e80547f80dbfaa3117eb7e44517c22c01e8
+DIST texlive-module-tpic2pdftex-2016.tar.xz 440 BLAKE2B dd877f98fa143a7daeebea3128e438b5a3b12a38035d3787e84e8b6b12eb871aa05bbe9e6c8788217147652aaab2271c92998633818ebcb37584962c01981c03 SHA512 e12d1448a5e543f8add38ff8a573a8a4d0cd26088bb5282eed4d9fbf59451b20c120d2572e81511dfa49e5751feca2ad9f099338410f84bbda8ed927b40d3057
+DIST texlive-module-tpic2pdftex-2017.tar.xz 440 BLAKE2B dbe8d3012f351853db1c2019b650f5c1c2d24d4ed9f39e3b891062f8946ecd42315069e833c4500e06b8213c8f5c40a7b58f6edc5e86180f360bd226de74d55b SHA512 ff542fc31ae85d199a72d5f6913c482ee9441b31d95a109a6a9a3dcfeae41aef85e80911b9e755f11cc700765f9b40527406bc36991a2280c4b09ec63d0e9bc5
+DIST texlive-module-tpic2pdftex.doc-2016.tar.xz 54424 BLAKE2B ed1a934f64c962bd7357cc1b58e73a91fefe4beedb3dc7b8236a65e71b7316faab1af866755ff857cb2884df9aae1e8e50389b5c9f1677b3bfd9d8cb9ef76426 SHA512 b0dccc2270471354823aa0987dc14da80a71a8a6a4491e88b695718cce84fba64accc5066737c72c033b8e5ab6945e063d40ee6e08c72e2808e3fdedec89a4e3
+DIST texlive-module-tpic2pdftex.doc-2017.tar.xz 41848 BLAKE2B 2e0cb6a73fdadfbe2cf85c8f241e650905ca1e94520ade6482bbb8e0362c07fa41295e0557b92df4d8b529eccc326f930ee079a47683565ddd9cd6688773d053 SHA512 e08e33a9c04f32bf4dd5d1f3f9be95cd36cec5998c8dc1dba2799ee9ca9ac1e9326550ecc53500c98506c03cea4fb08a766eea88ba85482ed2bd6dc03b306708
+DIST texlive-module-typeoutfileinfo-2016.tar.xz 1596 BLAKE2B 3c20d6daebac40630f491876917686e83572b57f043000825d0600f3f3329926243e88151ec087c7384e366c244960d96705939eb6afce60f3ff5a56c13d5158 SHA512 d287e4c728d33ba67e8c907c8c28f06d5b75660d0f5b996c917c127c903b0a6f5d292c9a97e5ed34a23d953ce62ff5b9bd357ef7674f87a60ffd71eda3d0d7fb
+DIST texlive-module-typeoutfileinfo-2017.tar.xz 1596 BLAKE2B 3c20d6daebac40630f491876917686e83572b57f043000825d0600f3f3329926243e88151ec087c7384e366c244960d96705939eb6afce60f3ff5a56c13d5158 SHA512 d287e4c728d33ba67e8c907c8c28f06d5b75660d0f5b996c917c127c903b0a6f5d292c9a97e5ed34a23d953ce62ff5b9bd357ef7674f87a60ffd71eda3d0d7fb
+DIST texlive-module-typeoutfileinfo.doc-2016.tar.xz 760 BLAKE2B 69d62a5162ad6e6cc7bdf1f4aab22521000ba6e44edc0e9804ba3bee869e921139a1d089d878ccbfad342bed4c20f37d12e04ce06ff858af9bafd253a76110f1 SHA512 0e7849574a7d41f4937c51090f01644cea1ae2cc39c15fd9a146fe40a7fb7b5f9548d1e1d6f45f7099f65f54a1455bb573ac62e4debb49f529dcc08627357b81
+DIST texlive-module-typeoutfileinfo.doc-2017.tar.xz 760 BLAKE2B d6ae70e4c4baf44728d0fc474cd1a39036997366b9f4565f6a1648a27ec904fc24100ab0109d35825b171f9d094a165cf72f7fbcf53ce766c5cd6acd336f2ac0 SHA512 277b08d5cdf7d6ebef2d03644c635c0a3ead2d18e037264a3505dd1c6a7c9c7bea60a7e81fd99648efa486158d573ebd58b10b62014b5194c84386f4ab6788de
+DIST texlive-module-web-2016.tar.xz 524 BLAKE2B 264e7fdff3293d66b4793974995f35225cc9bd041706b3b755f231def9959a092fc78746c48c6a1b954679fffbe3cc03f0a4ce8dbb49059ead58826045e08868 SHA512 8dcab0b976bf1976ca40c925182248ed9d5ff06843540eedb720fc5ff89f44594befbc084270adbb3fd3c6c96c437f248236e82252b2e4a7f48d761470c7d15e
+DIST texlive-module-web-2017.tar.xz 524 BLAKE2B 264e7fdff3293d66b4793974995f35225cc9bd041706b3b755f231def9959a092fc78746c48c6a1b954679fffbe3cc03f0a4ce8dbb49059ead58826045e08868 SHA512 8dcab0b976bf1976ca40c925182248ed9d5ff06843540eedb720fc5ff89f44594befbc084270adbb3fd3c6c96c437f248236e82252b2e4a7f48d761470c7d15e
+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 11616 BLAKE2B 1285fa47a8f24b7f055728e71e83208e21687491063b3edba33fbc254f92f5d5c20e899ded68ec8b4fd9200025bb4c88ab3c24e3e3c5a3bfc68dcdb33fc42af2 SHA512 0f2f0d97ff0933bb680a5a591d34b63b9c898dda27e908e7404ab0ffe7190d620b70a9900945c556cd5269944f46986681bdb94ebef8ece7dede2679651eae73
+EBUILD texlive-core-2017-r4.ebuild 11812 BLAKE2B 86f9ac4f8494198b2a999e649f7e3939a2b80a890d6c2e6b8d8f2305f7265db0513ce642b1bac009b0c890d27e8b896d2188331521789c4aee08cd4fa85d1900 SHA512 98237d49c07281b4b0b64961a8ef18fcab3cc813ddcd8fbeba86e8091134409cfe9d32db195e670216f3535bf2c5fadccc68d63b26c9b0cbdafe6a1eb4f13cf5
+MISC metadata.xml 661 BLAKE2B 23fd3817c5a9861b9adec9a78b6dcae0a23743cf685560a86a991896ed8f102fe66aa15a416939829c0c085cdfee24668f7a07631b3f4aeee469002f35b481e6 SHA512 c00ae9537fced06990a4ffff5fbe5101670ce1d84c879c0e9eeaf5c979107dd6a1f92f8f8271731b6c4818abead15b759fc9958ece317e554effbd3cb23fd2b9
diff --git a/app-text/texlive-core/files/texlive-core-2017-poppler064.patch b/app-text/texlive-core/files/texlive-core-2017-poppler064.patch
new file mode 100644
index 000000000000..9e4c7044975d
--- /dev/null
+++ b/app-text/texlive-core/files/texlive-core-2017-poppler064.patch
@@ -0,0 +1,118 @@
+Source: https://github.com/TeX-Live/texlive-source/commit/ea9e7b25c6566505fe6d994aa5263bd736593be1
+Backport: dilfridge@gentoo.org
+
+diff -ruN texlive-20170524-source.orig/texk/web2c/luatexdir/image/pdftoepdf.w texlive-20170524-source/texk/web2c/luatexdir/image/pdftoepdf.w
+--- texlive-20170524-source.orig/texk/web2c/luatexdir/image/pdftoepdf.w	2018-05-20 22:11:35.787633516 +0200
++++ texlive-20170524-source/texk/web2c/luatexdir/image/pdftoepdf.w	2018-05-20 22:12:26.607265149 +0200
+@@ -472,10 +472,10 @@
+         break;
+     */
+     case objString:
+-        copyString(pdf, obj->getString());
++        copyString(pdf, (GooString *)obj->getString());
+         break;
+     case objName:
+-        copyName(pdf, obj->getName());
++        copyName(pdf, (char *)obj->getName());
+         break;
+     case objNull:
+         pdf_add_null(pdf);
+diff -ruN texlive-20170524-source.orig/texk/web2c/luatexdir/lua/lepdflib.cc texlive-20170524-source/texk/web2c/luatexdir/lua/lepdflib.cc
+--- texlive-20170524-source.orig/texk/web2c/luatexdir/lua/lepdflib.cc	2018-05-20 22:11:35.788633528 +0200
++++ texlive-20170524-source/texk/web2c/luatexdir/lua/lepdflib.cc	2018-05-20 22:12:26.608265161 +0200
+@@ -521,7 +521,7 @@
+     uin = (udstruct *) luaL_checkudata(L, 1, M_##in);          \
+     if (uin->pd != NULL && uin->pd->pc != uin->pc)             \
+         pdfdoc_changed_error(L);                               \
+-    gs = ((in *) uin->d)->function();                          \
++    gs = (GooString *)((in *) uin->d)->function();             \
+     if (gs != NULL)                                            \
+         lua_pushlstring(L, gs->getCString(), gs->getLength()); \
+     else                                                       \
+@@ -1656,7 +1656,7 @@
+     if (uin->pd != NULL && uin->pd->pc != uin->pc)
+         pdfdoc_changed_error(L);
+     if (((Object *) uin->d)->isString()) {
+-        gs = ((Object *) uin->d)->getString();
++        gs = (GooString *)((Object *) uin->d)->getString();
+         lua_pushlstring(L, gs->getCString(), gs->getLength());
+     } else
+         lua_pushnil(L);
+diff -ruN texlive-20170524-source.orig/texk/web2c/pdftexdir/pdftoepdf.cc texlive-20170524-source/texk/web2c/pdftexdir/pdftoepdf.cc
+--- texlive-20170524-source.orig/texk/web2c/pdftexdir/pdftoepdf.cc	2018-05-20 22:11:35.788633528 +0200
++++ texlive-20170524-source/texk/web2c/pdftexdir/pdftoepdf.cc	2018-05-20 22:12:34.398361984 +0200
+@@ -284,7 +284,7 @@
+ static void copyDictEntry(Object * obj, int i)
+ {
+     Object obj1;
+-    copyName(obj->dictGetKey(i));
++    copyName((char *)obj->dictGetKey(i));
+     pdf_puts(" ");
+     obj1 = obj->dictGetValNF(i);
+     copyObject(&obj1);
+@@ -349,7 +349,7 @@
+         if (!procset.isName())
+             pdftex_fail("PDF inclusion: invalid ProcSet entry type <%s>",
+                         procset.getTypeName());
+-        copyName(procset.getName());
++        copyName((char *)procset.getName());
+         pdf_puts(" ");
+     }
+     pdf_puts("]\n");
+@@ -412,7 +412,7 @@
+         && fontdescRef.isRef()
+         && fontdesc.isDict()
+         && embeddableFont(&fontdesc)
+-        && (fontmap = lookup_fontmap(basefont.getName())) != NULL) {
++        && (fontmap = lookup_fontmap((char *)basefont.getName())) != NULL) {
+         // round /StemV value, since the PDF input is a float
+         // (see Font Descriptors in PDF reference), but we only store an
+         // integer, since we don't want to change the struct.
+@@ -421,7 +421,7 @@
+         charset = fontdesc.dictLookup("CharSet");
+         if (!charset.isNull() &&
+             charset.isString() && is_subsetable(fontmap))
+-            epdf_mark_glyphs(fd, charset.getString()->getCString());
++            epdf_mark_glyphs(fd, (char *)charset.getString()->getCString());
+         else
+             embed_whole_font(fd);
+         addFontDesc(fontdescRef.getRef(), fd);
+@@ -450,7 +450,7 @@
+         if (fontRef.isRef())
+             copyFont(obj->dictGetKey(i), &fontRef);
+         else if (fontRef.isDict()) {   // some programs generate pdf with embedded font object
+-            copyName(obj->dictGetKey(i));
++            copyName((char *)obj->dictGetKey(i));
+             pdf_puts(" ");
+             copyObject(&fontRef);
+         }
+@@ -559,7 +559,7 @@
+     } else if (obj->isNum()) {
+         pdf_printf("%s", convertNumToPDF(obj->getNum()));
+     } else if (obj->isString()) {
+-        s = obj->getString();
++        s = (GooString *)obj->getString();
+         p = s->getCString();
+         l = s->getLength();
+         if (strlen(p) == (unsigned int) l) {
+@@ -583,7 +583,7 @@
+             pdf_puts(">");
+         }
+     } else if (obj->isName()) {
+-        copyName(obj->getName());
++        copyName((char *)obj->getName());
+     } else if (obj->isNull()) {
+         pdf_puts("null");
+     } else if (obj->isArray()) {
+diff -ruN texlive-20170524-source.orig/texk/web2c/pdftexdir/pdftosrc.cc texlive-20170524-source/texk/web2c/pdftexdir/pdftosrc.cc
+--- texlive-20170524-source.orig/texk/web2c/pdftexdir/pdftosrc.cc	2018-05-20 22:11:35.788633528 +0200
++++ texlive-20170524-source/texk/web2c/pdftexdir/pdftosrc.cc	2018-05-20 22:12:31.369324336 +0200
+@@ -104,7 +104,7 @@
+             fprintf(stderr, "No SourceName found\n");
+             exit(1);
+         }
+-        outname = srcName.getString()->getCString();
++        outname = (char *)srcName.getString()->getCString();
+         // We cannot free srcName, as objname shares its string.
+         // srcName.free();
+     } else if (objnum > 0) {
diff --git a/app-text/texlive-core/metadata.xml b/app-text/texlive-core/metadata.xml
new file mode 100644
index 000000000000..9d35168b92c0
--- /dev/null
+++ b/app-text/texlive-core/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>aballier@gentoo.org</email>
+		<name>Alexis Ballier</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
+	<longdescription lang="en">
+		TeXLive core binaries
+	</longdescription>
+	<use>
+		<flag name="luajittex">Add support for LuaJitTeX: LuaTeX based on LuaJIT which is usually faster.</flag>
+		<flag name="xetex">Add support for XeTeX: a TeX system with Unicode and modern font technologies.</flag>
+	</use>
+</pkgmetadata>
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..307aaf24b7a7
--- /dev/null
+++ b/app-text/texlive-core/texlive-core-2016-r6.ebuild
@@ -0,0 +1,354 @@
+# 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="https://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/libX11
+				x11-libs/libXmu
+	)"
+
+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.58.0:=
+	>=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..29ea8dc071dd
--- /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="https://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/libX11
+				x11-libs/libXmu
+	)"
+
+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.58.0:=
+	<app-text/poppler-0.64.0
+	>=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}
+	<media-libs/freetype-2.9.1-r3
+	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
+}
diff --git a/app-text/texlive-core/texlive-core-2017-r4.ebuild b/app-text/texlive-core/texlive-core-2017-r4.ebuild
new file mode 100644
index 000000000000..91c57eca22d6
--- /dev/null
+++ b/app-text/texlive-core/texlive-core-2017-r4.ebuild
@@ -0,0 +1,366 @@
+# 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="https://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
+	https://dev.gentoo.org/~dilfridge/distfiles/${PN%-core}-${TL_SOURCE_VERSION}-source-freetype.patch.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/libX11
+				x11-libs/libXmu
+	)"
+
+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.58.0:=
+	>=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}"
+
+	# bug 655052
+	epatch "${WORKDIR}/${PN%-core}-${TL_SOURCE_VERSION}-source-freetype.patch"
+
+	#EPATCH_MULTI_MSG="Applying patches from upstream bugfix branch..." EPATCH_SUFFIX="patch" epatch "${WORKDIR}/gentoo_branch2011_patches"
+	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
+
+	# bug ?
+	epatch "${FILESDIR}/${P}-poppler064.patch"
+
+	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
+}
diff --git a/app-text/texlive/Manifest b/app-text/texlive/Manifest
new file mode 100644
index 000000000000..8abeb14fe89e
--- /dev/null
+++ b/app-text/texlive/Manifest
@@ -0,0 +1,2 @@
+EBUILD texlive-2017.ebuild 7276 BLAKE2B 4bb6c9de41736664687aa1ba4318aef71d43e3823c64807755743ac1f30c8a0441b330bd98bcb265c118676953b406e2a138a376a1a14e17397aa6db838d8e66 SHA512 08a2ffabfb4b5732391a20afaab0615ac5c3a3ff5caba16c90430fff6eb144f00280969753b405a57167606cd40501287130cee059495287e8b7b8281d62ee07
+MISC metadata.xml 2419 BLAKE2B 2627379a58f80fd304b4c77ac3f3466520d8237458e4236d88ffc2b33a062d50e33a0f2cb07c6120abbbd27d0dd7d4aa79eaa44790280f719eb10fcfc230664d SHA512 e20c3f1c67f6250209b381aa21d827ee27006d6ba5558e913ce01ac704ba0d04f16b1c5b4666ed8833e6c744b7045276d98e777f3e3e1289dc33e861bc745941
diff --git a/app-text/texlive/metadata.xml b/app-text/texlive/metadata.xml
new file mode 100644
index 000000000000..e06f43835505
--- /dev/null
+++ b/app-text/texlive/metadata.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
+	<use>
+		<flag name="context">Add support for the ConTeXt format (<pkg>dev-texlive/texlive-context</pkg>)</flag>
+		<flag name="detex">Add support for <pkg>dev-tex/detex</pkg>, a filter program that removes the LaTeX (or TeX) control sequences</flag>
+		<flag name="dvi2tty">Add support for <pkg>dev-tex/dvi2tty</pkg> to preview dvi-files on text-only devices</flag>
+		<flag name="epspdf">Add support for <pkg>app-text/epspdf</pkg>, a tool for converting [e]ps files to pdf</flag>
+		<flag name="extra">Add support for extra TeXLive packages</flag>
+		<flag name="games">Add typesetting support for games (chess, etc.) (<pkg>dev-texlive/texlive-games</pkg>)</flag>
+		<flag name="graphics">Add support for several graphics packages (pgf, tikz,...)</flag>
+		<flag name="humanities">Add LaTeX support for the humanities (<pkg>dev-texlive/texlive-humanities</pkg>)</flag>
+		<flag name="jadetex">Add support for <pkg>app-text/jadetex</pkg> (for processing tex files produced by the TeX backend of Jade)</flag>
+		<flag name="luatex">Add extra support for luatex</flag>
+		<flag name="metapost">Add support for metapost: A tool for creating graphics in scalable PostScript</flag>
+		<flag name="music">Add support for music typesetting (<pkg>dev-texlive/texlive-music</pkg>)</flag>
+		<flag name="pdfannotextractor">Add <pkg>dev-tex/pdfannotextractor</pkg> support, for extracting annotations from PDF files</flag>
+		<flag name="pstricks">Add pstricks packages (<pkg>dev-texlive/texlive-pstricks</pkg>)</flag>
+		<flag name="publishers">Add support for publishers (<pkg>dev-texlive/texlive-publishers</pkg>)</flag>
+		<flag name="science">Add typesetting support for natural and computer sciences (<pkg>dev-texlive/texlive-mathscience</pkg>)</flag>
+		<flag name="tex4ht">Add support for <pkg>dev-tex/tex4ht</pkg> (for converting (La)TeX to (X)HTML, XML and OO.org)</flag>
+		<flag name="texi2html">Add support for <pkg>app-text/texi2html</pkg> which converts texi files to HTML</flag>
+		<flag name="xetex">Add support for XeTeX macros (<pkg>dev-texlive/texlive-xetex</pkg>)</flag>
+		<flag name="xindy">Add support for <pkg>app-text/xindy</pkg>, a flexible indexing system</flag>
+	</use>
+</pkgmetadata>
diff --git a/app-text/texlive/texlive-2017.ebuild b/app-text/texlive/texlive-2017.ebuild
new file mode 100644
index 000000000000..e05547b4564a
--- /dev/null
+++ b/app-text/texlive/texlive-2017.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+DESCRIPTION="A complete TeX distribution"
+HOMEPAGE="http://tug.org/texlive/"
+SRC_URI=""
+
+LICENSE="metapackage"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="cjk context detex dvi2tty extra epspdf games graphics
+humanities jadetex luatex metapost music pdfannotextractor png pstricks publishers
+science tex4ht texi2html truetype xetex xindy xml X"
+
+LANGS="af ar as bg bn br ca cs cy da de el en eo es et eu fa fi fr ga gl gu he
+	hi hr hsb hu hy ia id is it ja ko kn la lo lt lv ml mn mr nb nl nn no or pa
+	pl pt rm ro ru sa sco sk sl sq sr sv ta te th tk tr uk vi zh"
+
+for X in ${LANGS}; do
+	IUSE="${IUSE} l10n_${X}"
+done
+
+TEXLIVE_CAT="dev-texlive"
+
+DEPEND=">=app-text/texlive-core-${PV}"
+RDEPEND="${DEPEND}
+	app-text/psutils
+	>=${TEXLIVE_CAT}/texlive-fontutils-${PV}
+	media-gfx/sam2p
+	texi2html? ( app-text/texi2html )
+	sys-apps/texinfo
+	app-text/t1utils
+	>=app-text/lcdf-typetools-2.92[kpathsea]
+	truetype? ( >=app-text/ttf2pk2-2.0_p20150521 )
+	detex? ( dev-tex/detex )
+	app-text/ps2eps
+	dvi2tty? ( dev-tex/dvi2tty )
+	png? ( app-text/dvipng )
+	X? ( >=app-text/xdvik-22.87 )
+	>=${TEXLIVE_CAT}/texlive-basic-${PV}
+	>=${TEXLIVE_CAT}/texlive-fontsrecommended-${PV}
+	>=${TEXLIVE_CAT}/texlive-latex-${PV}
+	luatex? ( >=${TEXLIVE_CAT}/texlive-luatex-${PV} )
+	>=${TEXLIVE_CAT}/texlive-latexrecommended-${PV}
+	>=dev-tex/xcolor-2.11
+	>=dev-tex/latex-beamer-3.36
+	metapost? (
+		>=${TEXLIVE_CAT}/texlive-metapost-${PV}
+			dev-tex/feynmf
+	)
+	>=${TEXLIVE_CAT}/texlive-plaingeneric-${PV}
+	pdfannotextractor? ( dev-tex/pdfannotextractor )
+	extra? (
+		dev-tex/chktex
+		app-text/dvisvgm
+		dev-tex/latexdiff
+		>=dev-tex/latexmk-418
+		>=app-text/pdfjam-2.02
+		>=${TEXLIVE_CAT}/texlive-bibtexextra-${PV}
+		>=${TEXLIVE_CAT}/texlive-fontsextra-${PV}
+		>=${TEXLIVE_CAT}/texlive-formatsextra-${PV}
+		>=${TEXLIVE_CAT}/texlive-latexextra-${PV}
+			>=dev-tex/glossaries-2.07
+			>=dev-tex/leaflet-20041222
+			>=dev-tex/currvita-0.9i-r1
+			>=dev-tex/g-brief-4.0.2
+			>=dev-tex/envlab-1.2-r1
+			>=dev-tex/europecv-20060424-r1
+			>=dev-tex/svninfo-0.7.3-r1
+	)
+	xetex? ( >=${TEXLIVE_CAT}/texlive-xetex-${PV} )
+	graphics? ( >=${TEXLIVE_CAT}/texlive-pictures-${PV}
+		dev-tex/dot2texi )
+	epspdf? ( app-text/epspdf )
+	science? ( >=${TEXLIVE_CAT}/texlive-mathscience-${PV} )
+	publishers? ( >=${TEXLIVE_CAT}/texlive-publishers-${PV} )
+	music? ( >=${TEXLIVE_CAT}/texlive-music-${PV} )
+	pstricks? ( >=${TEXLIVE_CAT}/texlive-pstricks-${PV} )
+	context? ( >=${TEXLIVE_CAT}/texlive-context-${PV} )
+	games? ( >=${TEXLIVE_CAT}/texlive-games-${PV} )
+	humanities? ( >=${TEXLIVE_CAT}/texlive-humanities-${PV} )
+	tex4ht? ( >=dev-tex/tex4ht-20090611_p1038-r3 )
+	xml? (
+		>=dev-tex/xmltex-1.9-r2
+		app-text/passivetex
+	)
+	jadetex? ( >=app-text/jadetex-3.13-r2 )
+	l10n_af?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_ar?    ( >=${TEXLIVE_CAT}/texlive-langarabic-${PV} )
+	l10n_fa?    ( >=${TEXLIVE_CAT}/texlive-langarabic-${PV} )
+	l10n_hy?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	cjk? ( >=${TEXLIVE_CAT}/texlive-langcjk-${PV}
+		   >=dev-tex/cjk-latex-4.8.4 )
+	l10n_hr?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_bg?    ( >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
+	l10n_br?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_ru?    ( >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
+	l10n_uk?    ( >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
+	l10n_cs?    ( >=${TEXLIVE_CAT}/texlive-langczechslovak-${PV}
+	              >=app-text/vlna-1.3 )
+	l10n_sk?    ( >=${TEXLIVE_CAT}/texlive-langczechslovak-${PV} )
+	l10n_da?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_nl?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_en?    ( >=${TEXLIVE_CAT}/texlive-langenglish-${PV} )
+	l10n_fi?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_eu?    ( >=${TEXLIVE_CAT}/texlive-langfrench-${PV} )
+	l10n_fr?    ( >=${TEXLIVE_CAT}/texlive-langfrench-${PV} )
+	l10n_de?    ( >=${TEXLIVE_CAT}/texlive-langgerman-${PV} )
+	l10n_el?    ( >=${TEXLIVE_CAT}/texlive-langgreek-${PV} )
+	l10n_he?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_hu?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_as?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_bn?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_gu?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_hi?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_kn?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_ml?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_mr?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_or?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_pa?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_sa?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_ta?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_te?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_it?    ( >=${TEXLIVE_CAT}/texlive-langitalian-${PV} )
+	l10n_ja?    ( >=${TEXLIVE_CAT}/texlive-langjapanese-${PV} )
+	l10n_ko?    ( >=${TEXLIVE_CAT}/texlive-langkorean-${PV} )
+	l10n_la?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_lt?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_lv?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_mn?    ( >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
+	l10n_nb?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_nn?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_no?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_cy?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_eo?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_et?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_ga?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_rm?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_hsb?   ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_ia?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_id?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_is?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_lo?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_ro?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_sq?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_sr?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV}
+	              >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
+	l10n_sl?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_tr?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_pl?    ( >=${TEXLIVE_CAT}/texlive-langpolish-${PV} )
+	l10n_pt?    ( >=${TEXLIVE_CAT}/texlive-langportuguese-${PV} )
+	l10n_ca?    ( >=${TEXLIVE_CAT}/texlive-langspanish-${PV} )
+	l10n_gl?    ( >=${TEXLIVE_CAT}/texlive-langspanish-${PV} )
+	l10n_es?    ( >=${TEXLIVE_CAT}/texlive-langspanish-${PV} )
+	l10n_sco?   ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_sv?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_tk?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_vi?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_zh?    ( >=${TEXLIVE_CAT}/texlive-langchinese-${PV} )
+	xindy? ( app-text/xindy )
+"
diff --git a/app-text/tidy-html5-5.6.0 b/app-text/tidy-html5-5.6.0
deleted file mode 100644
index 906ab2e10576..000000000000
--- a/app-text/tidy-html5-5.6.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Tidy the layout and correct errors in HTML, HTML5 and XML documents
-EAPI=6
-HOMEPAGE=http://www.html-tidy.org/
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86
-LICENSE=GPL-2
-RDEPEND=!app-text/htmltidy
-SLOT=0
-SRC_URI=https://github.com/htacg/tidy-html5/archive/5.6.0.tar.gz -> tidy-html5-5.6.0.tar.gz
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=52f843d001b9e01cfc70dc0ebf366684
diff --git a/app-text/tidy-html5/Manifest b/app-text/tidy-html5/Manifest
new file mode 100644
index 000000000000..0546e1cb29bb
--- /dev/null
+++ b/app-text/tidy-html5/Manifest
@@ -0,0 +1,3 @@
+DIST tidy-html5-5.6.0.tar.gz 665438 BLAKE2B 3e362c8a22a5de827ec14110bad08985ff326c061043cd3cb0ffefd6b3af9a178197fca6a97bbb42b94760e530ec44646f13f6429736f7989effe52515580f21 SHA512 179088a6dbd29bb0e4f0219222f755b186145495f7414f6d0e178803ab67140391283d35352d946f9790c6b1b5b462ee6e24f1cc84f19391cb9b65e73979ffd1
+EBUILD tidy-html5-5.6.0.ebuild 631 BLAKE2B 7763ed4411960c0e4d9754c438e1edd383bafe56fb4735186d469a983b86e4c9a171938092870e31de67f77c871f3cfffbedc3f95514b0eb5450b39e4ca95741 SHA512 573cc8785983baf6fa9afcb8d3cfb3f5badb494c2d4c772f1e28bd3a198db3365ad69baa1a720ede45035cdcb38fc652f284bf2a1e00dbe2d7d03913061db9f8
+MISC metadata.xml 333 BLAKE2B 92aabf92af24245465d0e5b1f99faabf41cdb71fffd31b7fb1e8268c5d91977b44d3998ede7789f280031c80d70deb726ed201b896007d63fd0710ffbf8b120e SHA512 aedfa31a9188be8d3ad9ea8b278acf1b3e90f9b0c91dd63b00c19a90c6a74d16ee57d80810f39392564fbc1b782b35b6231a9b453f91e765296e5ec45d5c087b
diff --git a/app-text/tidy-html5/metadata.xml b/app-text/tidy-html5/metadata.xml
new file mode 100644
index 000000000000..d15ff3d4d284
--- /dev/null
+++ b/app-text/tidy-html5/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>monsieurp@gentoo.org</email>
+		<name>Patrice Clement</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">nhatminhle/cofoja</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/tidy-html5/tidy-html5-5.6.0.ebuild b/app-text/tidy-html5/tidy-html5-5.6.0.ebuild
new file mode 100644
index 000000000000..57460fad43e4
--- /dev/null
+++ b/app-text/tidy-html5/tidy-html5-5.6.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="Tidy the layout and correct errors in HTML, HTML5 and XML documents"
+HOMEPAGE="http://www.html-tidy.org/"
+SRC_URI="https://github.com/htacg/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+
+RDEPEND="!app-text/htmltidy"
+
+DOCS=( README/{CODESTYLE,CONTRIBUTING,LICENSE,VERSION}.md )
+
+src_configure() {
+	local mycmakeargs=(
+		-DLIB_INSTALL_DIR="$(get_libdir)"
+	)
+	cmake-utils_src_configure
+}
diff --git a/app-text/tkinfo-2.8-r1 b/app-text/tkinfo-2.8-r1
deleted file mode 100644
index ae04f9018a6f..000000000000
--- a/app-text/tkinfo-2.8-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=sys-apps/sed
-DESCRIPTION=Info Browser in TK
-EAPI=6
-HOMEPAGE=http://math-www.uni-paderborn.de/~axel/tkinfo/
-KEYWORDS=alpha amd64 hppa ia64 ppc sparc x86
-LICENSE=freedist
-RDEPEND=dev-lang/tk
-SLOT=0
-SRC_URI=http://math-www.uni-paderborn.de/~axel/tkinfo/tkinfo-2.8.tar.gz
-_md5_=1e203ce4ae032579e9c4ebf14bd2e44f
diff --git a/app-text/tkinfo/Manifest b/app-text/tkinfo/Manifest
new file mode 100644
index 000000000000..8b50b895fa06
--- /dev/null
+++ b/app-text/tkinfo/Manifest
@@ -0,0 +1,3 @@
+DIST tkinfo-2.8.tar.gz 56234 BLAKE2B 6351a8c3ee46092a5c46db147006cb462882cc9abec11f49f07f4f4b50888be6537625a0756a8f05837c21d769345e39837f650ad3a6488713adc304880a3674 SHA512 dfce278a1b33eebcebe3f6f9b5885a8c247f3181d154bc35d8b6d894f1f33043e9e40dd4c8dc336fa100700883295e8a648bece6f04ee556d4fa2f69adaecb76
+EBUILD tkinfo-2.8-r1.ebuild 581 BLAKE2B 74ec00b423d73ce6140478228c1377850a345696580acba2dddf5b0250eac222b874d61bb2bcf8a7f3fc4ac9066c369afe6fc2e5ae0ec1f4afe3fa82bbd3ace0 SHA512 eec40f40b689952b707230a1278594eefac0624e3aa4727f86b5607f082daa598c72f09735fbf92b8915c33efc897b253fc1f7305cf1a400584d218439996faf
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/tkinfo/metadata.xml b/app-text/tkinfo/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-text/tkinfo/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/app-text/tkinfo/tkinfo-2.8-r1.ebuild b/app-text/tkinfo/tkinfo-2.8-r1.ebuild
new file mode 100644
index 000000000000..517f9ae82166
--- /dev/null
+++ b/app-text/tkinfo/tkinfo-2.8-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Info Browser in TK"
+HOMEPAGE="http://math-www.uni-paderborn.de/~axel/tkinfo/"
+SRC_URI="http://math-www.uni-paderborn.de/~axel/${PN}/${P}.tar.gz"
+
+KEYWORDS="alpha amd64 hppa ia64 ppc sparc x86"
+IUSE=""
+LICENSE="freedist"
+SLOT="0"
+
+RDEPEND="dev-lang/tk"
+DEPEND="sys-apps/sed"
+
+DOCS=( README )
+
+src_prepare() {
+	default
+	sed -i \
+		-e "1 s:^.*:#!/usr/bin/wish:" tkinfo || \
+			die "sed tkinfo failed"
+}
+
+src_install () {
+	dobin "${PN}"
+	doman "${PN}.1"
+}
diff --git a/app-text/tkman-2.2-r1 b/app-text/tkman-2.2-r1
deleted file mode 100644
index 2a8423a83b07..000000000000
--- a/app-text/tkman-2.2-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=>=app-text/rman-3.1 >=dev-lang/tcl-8.4:0 >=dev-lang/tk-8.4:0
-DESCRIPTION=TkMan man and info page browser
-EAPI=5
-HOMEPAGE=http://tkman.sourceforge.net/
-KEYWORDS=~amd64 ppc sparc x86
-LICENSE=Artistic
-RDEPEND=>=app-text/rman-3.1 >=dev-lang/tcl-8.4:0 >=dev-lang/tk-8.4:0
-SLOT=0
-SRC_URI=mirror://sourceforge/tkman/tkman-2.2.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=70402333ec7a581bd5d883a17834e070
diff --git a/app-text/tkman/Manifest b/app-text/tkman/Manifest
new file mode 100644
index 000000000000..05502062101f
--- /dev/null
+++ b/app-text/tkman/Manifest
@@ -0,0 +1,6 @@
+AUX tkman-2.2-gentoo.diff 2321 BLAKE2B 5ea163cd50fbf1f2b30aa9e009a350d3c6df4fc0ab51868c6abab95d04786f21e7195cae163a17218e8179d48689c096c89059950469807dd7be6d5bc9adcd2a SHA512 9f7329e2ed8267dfed31417a41a3d512571920ba6391d9fc23ef40ff5a18e0c74cf07d810ffc9de27ea88f560dc985d985b0cfe43e7d47b7fcd48af9d109eef7
+AUX tkman-CVE-2008-5137.diff 11645 BLAKE2B 4d628679de1bfad459badbe4fa610c316871b801e01438f52e6c1c3906e325b752dc3de8f5556fb6f9cab7ed83908aee7bc341ccf6700d29f81fdf334be31012 SHA512 60c65badeaa93d5e032117152905bd3c06985d7694fdec8c9ef9d0816446a865c45a1a4e7ac2dffc8eaf76163514de30663b2185fe6ba8e27a2cf9276aa09f4f
+AUX tkman.desktop 149 BLAKE2B 20e07ce0d89b6887329c47cf1d134466855118a24e6fe2f800ec678a0823824ab9a9f55c4d13d349d7f178654de8449463cc641b243e1ac56536b9b03f92b1e8 SHA512 d73c6ca978f0538c1b02f321cc4f45eec496c3e978229fc7eb373190d447c4d0c7639d0eaf8a3b7cc22d569e6a9088dd8371799874b41b13bb758c75369e572b
+DIST tkman-2.2.tar.gz 229273 BLAKE2B 3015ce0ecb224f1c01e1513cff1a55d3a95362753436a981630f7133c56a8b8f03030d5d368cb4a5a631ecfb2f0f9afbdec37a2d5b0e9fe74add82142172ca06 SHA512 31adaa4017282a6e6fba18a5f72c07c7d7d3bc63ef043b214bf68ec4837c73d4e0679d8b7513b0bae3984e1737e797ca886e15150b2e1a9cd288bbd7491a8777
+EBUILD tkman-2.2-r1.ebuild 754 BLAKE2B 466249d3920b969b1f20ef39d47dcd97e611f448428c60804a68ceb630a5b95e69bc544f8450092f1bcf59230456780b188af9fbcb613c6a3295dac983c2ef38 SHA512 71702d9f1da8d8261da90ca67f42bd21acb1844b21c331fb5d3decc923f0a66c8b70811782b40a1768fdc9e2b0a6b38c81bc5f0392f583cdeb93e949a1ce604f
+MISC metadata.xml 242 BLAKE2B a92759fbcee1ad71d9ab4b2a414f3e08bfa0427599bbe7d3d7216293a01417d2d972fbf295d8ba257b23d6ba7c5f107e9e07108027db6718675577faaac74ac6 SHA512 5fb21614caacb9cac921de0acb6fb5dffbc5c3f9666cea2f1a357234e88c4f990d4a55eafd60f0ccfb29060576b955a4710bf75890a7ea4343131d28696dd4ed
diff --git a/app-text/tkman/files/tkman-2.2-gentoo.diff b/app-text/tkman/files/tkman-2.2-gentoo.diff
new file mode 100644
index 000000000000..92a275361c8f
--- /dev/null
+++ b/app-text/tkman/files/tkman-2.2-gentoo.diff
@@ -0,0 +1,62 @@
+--- tkman-2.2/Makefile.org	2003-12-07 13:26:37.642164439 +0100
++++ tkman-2.2/Makefile	2003-12-07 13:30:39.135540314 +0100
+@@ -25,13 +25,13 @@
+ 

+ ### you need to localize the paths on these lines

+ 

+-WISH = /usr/local/bin/wish8.4

++WISH = /usr/bin/wish

+ #WISH = /usr/sww/tcl-8.4/bin/wish

+ #WISH = /private/share/bin/wish8.4

+ 

+ # the executable `tkman' is placed in BINDIR

+ # this should be a directory that's in your bin PATH

+-BINDIR = /usr/local/bin

++BINDIR = ${DESTDIR}/usr/bin

+ #BINDIR = /private/share/bin

+ 

+ 

+@@ -80,7 +80,7 @@
+ # will examine for matches if a search in the usual locations fails while searching

+ # for a man pages and displaying its associated binaries (if any).

+ # Use this feature carefully as a large number of directories can slow down startup.

+-mastermen = "/usr/man /usr/local/man"

++mastermen = "/usr/share/man /usr/local/man"

+ #mastermen = "/usr/man /usr/local/man /usr/sww/man /usr/share/man /usr/kerberos/man"

+ masterbin = "/usr/bin /usr/local/bin"

+ #masterbin = "/usr/bin /usr/local/bin /usr/sww/bin /usr/sww/share/bin /usr/sww/share/X11R5/bin"

+@@ -203,7 +203,7 @@
+ # BY DEFAULT OFF

+ glimpse = ""

+ # Glimpse on, with Boolean scope set to entire file

+-glimpse = "glimpse -W"

++#glimpse = "glimpse -W"

+ # give the full path, if you'd like

+ #glimpse = /usr/sww/bin/glimpse

+ # variations (refer to the Glimpse manual page)

+@@ -228,11 +228,11 @@
+ #glimpseindex = "glimpseindex -o -B"

+ # To shorten most index build times by incrementally building index when possible.

+ # For me, this drops indexing time from ~25 minutes to ~3 minutes, depending

+-glimpseindex = "glimpseindex -o -B -f"

++#glimpseindex = "glimpseindex -o -B -f"

+ # -M 8 gives 8MB of main memory instead of default 2, which speeds up indexing, maybe

+ #glimpseindex = "glimpseindex -o -B -f -M 8"

+ # if you don't want give the power to index, disable glimpseindex here

+-#glimpseindex = ""

++glimpseindex = ""

+ #glimpseindex = "/usr/sww/bin/glimpseindex -o -B"

+ # compressed manual pages are handled automatically; don't add -z to above

+ 

+@@ -289,9 +289,9 @@
+ rman = rman

+ #rman = /usr/local/bin/rman

+ 

+-apropos = {man -k}

++#apropos = {man -k}

+ # Linux uses a shell script instead:

+-#apropos = apropos

++apropos = apropos

+ # if don't have apropos (maybe on Windoze)

+ #apropos = ""

+ 

diff --git a/app-text/tkman/files/tkman-CVE-2008-5137.diff b/app-text/tkman/files/tkman-CVE-2008-5137.diff
new file mode 100644
index 000000000000..2e9bcc2828d6
--- /dev/null
+++ b/app-text/tkman/files/tkman-CVE-2008-5137.diff
@@ -0,0 +1,278 @@
+diff -urN tkman-2.2~/Makefile tkman-2.2/Makefile
+--- tkman-2.2~/Makefile	2003-04-01 17:31:38.000000000 -0600
++++ tkman-2.2/Makefile	2008-12-05 17:37:55.000000000 -0600
+@@ -97,7 +97,7 @@
+ # at the closest DPI in this list

+ dpis = "75 100"

+ 

+-

++manxlongtmp = [exec mktemp -p /tmp tkman.XXXXXXXXXX]

+ # # # MACHINE DEPENDENCIES # # #

+ 

+ #manformat = {tbl | neqn | nroff -man }

+@@ -113,7 +113,7 @@
+ # Lines are cached in .../man/cat<n>@<line-length>; 

+ #   that is, the line length is appended to the usual cache directory names

+ #manformat = {groff -te -Tascii -man /tmp/ll -}

+-manformat = {groff -te -Tlatin1 -man /tmp/ll -}

++manformat = "groff -te -Tlatin1 -mandoc $$manx(longtmp) -"

+ # Ultrix users should uncomment the following line (you don't have eqn)

+ #manformat = {tbl | nroff -man }

+ # HP-UX uses a number of macros that groff doesn't define, so use the builtin nroff

+@@ -362,6 +362,7 @@
+ 	echo 'set man(texinfodir) $(texinfodir)' >> tkman

+ 	echo 'set man(gzgrep) $(gzgrep)' >> tkman

+ 	echo 'set man(rfcdir) $(rfcdir)' >> tkman

++	echo 'set manx(longtmp) $(manxlongtmp)' >> tkman

+ 	echo 'set man(format) $(manformat)' >> tkman

+ 	echo 'set man(printers) $(printers)' >> tkman

+ 	echo 'set manx(dpis) $(dpis)' >> tkman

+diff -urN tkman-2.2~/contrib/outline.tcl tkman-2.2/contrib/outline.tcl
+--- tkman-2.2~/contrib/outline.tcl	2003-04-01 17:31:38.000000000 -0600
++++ tkman-2.2/contrib/outline.tcl	2008-12-05 17:37:55.000000000 -0600
+@@ -71,7 +71,7 @@
+ 

+ 	text [set t .inv] -font {Times 12 {}} -wrap word -borderwidth 3 -padx 5 -pady 5 -yscrollcommand "[set v .v] set"

+ 	set finv [expr 1-[catch {$t tag configure invis -elide 1}]]

+-	if !$finv { puts "you must apply the elided text patches first"; exit 0 }

++	if !$finv { puts "you must apply the elided text patches first"; CLEANUP; exit 0 }

+ 

+ 	scrollbar $v -orient vertical -command "$t yview"

+ 

+diff -urN tkman-2.2~/contrib/remote.tcl tkman-2.2/contrib/remote.tcl
+--- tkman-2.2~/contrib/remote.tcl	2003-04-01 17:31:38.000000000 -0600
++++ tkman-2.2/contrib/remote.tcl	2008-12-05 17:37:55.000000000 -0600
+@@ -26,6 +26,7 @@
+ 				if {$res=="1"} {set ready 1}
+ 			} elseif {[string match "*insecure*" info]} {
+ 				puts stderr "can't talk to an insecure server -- see send(n)"
++				CLEANUP
+ 				exit 1
+ 			}
+ 		}
+diff -urN tkman-2.2~/contrib/tkmanclient tkman-2.2/contrib/tkmanclient
+--- tkman-2.2~/contrib/tkmanclient	2003-04-01 17:31:38.000000000 -0600
++++ tkman-2.2/contrib/tkmanclient	2008-12-05 17:37:55.000000000 -0600
+@@ -60,7 +60,7 @@
+ }
+ 
+ set tkman [ check_for_tkman ]
+-if { $tkman == 0 } { puts stderr "couldnt start tkman!"; exit 1; }
++if { $tkman == 0 } { puts stderr "couldnt start tkman!"; CLEANUP; exit 1; }
+ 
+ set apropos 0
+ set instNew 0
+diff -urN tkman-2.2~/database.tcl tkman-2.2/database.tcl
+--- tkman-2.2~/database.tcl	2003-04-01 17:31:38.000000000 -0600
++++ tkman-2.2/database.tcl	2008-12-05 17:37:55.000000000 -0600
+@@ -41,6 +41,7 @@
+ 	if {![llength $manx(manList)]} {

+ 		puts stderr "Can't find any man pages!"

+ 		puts stderr "MANPATH = $env(MANPATH)"

++		CLEANUP

+ 		exit 1

+ 	}

+ 

+diff -urN tkman-2.2~/gui.tcl tkman-2.2/gui.tcl
+--- tkman-2.2~/gui.tcl	2003-04-01 17:31:38.000000000 -0600
++++ tkman-2.2/gui.tcl	2008-12-05 17:37:55.000000000 -0600
+@@ -66,7 +66,7 @@
+ 		wm protocol $w WM_SAVE_YOURSELF "manSave"

+ 		wm command $w [concat $argv0 $argv]

+ 		# aborts without saving .tkman

+-		wm protocol $w WM_DELETE_WINDOW {exit 0}

++		wm protocol $w WM_DELETE_WINDOW {CLEANUP; exit 0}

+ 

+ 		# some braindead window managers ignore iconposition requests after window is iconified, so special setting here

+ 		if {[regexp $manx(posnregexp) $manx(iconposition) all x y]} {wm iconposition $w $x $y}

+@@ -221,7 +221,7 @@
+ 		-command "incr stat(checkpoint); manSave; manWinstdout \$curwin {[bolg $manx(startup) ~] updated}"

+ #	if {!$dup} { ... but menu shared!

+ 		$m add separator

+-		$m add command -label "Quit, don't update $manx(startup-short)" -command "exit 0"

++		$m add command -label "Quit, don't update $manx(startup-short)" -command "CLEANUP; exit 0"

+ #	}

+ 	}

+ 

+@@ -537,8 +537,8 @@
+ 		"

+ 

+ 	### quit

+-	button $w.quit -text "Quit" -command "manSave; exit 0" -padx 4

+-	if {!$manx(quit)} {$w.quit configure -command "exit 0"}

++	button $w.quit -text "Quit" -command "manSave; CLEANUP; exit 0" -padx 4

++	if {!$manx(quit)} {$w.quit configure -command "CLEANUP; exit 0"}

+ 	if {$dup} {

+ 		$w.quit configure -text "Close" -command "

+ 			destroy $w; incr manx(outcnt) -1; manOutput

+diff -urN tkman-2.2~/manpath.tcl tkman-2.2/manpath.tcl
+--- tkman-2.2~/manpath.tcl	2003-04-01 17:31:38.000000000 -0600
++++ tkman-2.2/manpath.tcl	2008-12-05 17:37:55.000000000 -0600
+@@ -138,6 +138,7 @@
+ 	if {![llength $manx(paths)]} {

+ 		if {$manx(manpath-warnings) ne ""} {puts stderr $manx(manpath-warnings)}

+ 		puts stderr "NO VALID DIRECTORIES IN MANPATH!\a"

++		CLEANUP

+ 		exit 1

+ 	}

+ }

+diff -urN tkman-2.2~/prefs.tcl tkman-2.2/prefs.tcl
+--- tkman-2.2~/prefs.tcl	2003-04-01 17:31:38.000000000 -0600
++++ tkman-2.2/prefs.tcl	2008-12-05 17:37:55.000000000 -0600
+@@ -365,7 +365,7 @@
+ 	pack $g.nroffsave $g.columns $g.fsstnd-always $g.texinfodir $g.recentdays $g.preferTexinfo $g.tryfuzzy $g.preferGNU \

+ 		$g.maxglimpse $g.maxglimpseexcerpt $g.indexglimpse $g.glimpsestrays $g.indexalso \

+ 		-fill x -pady 3 -padx 4

+-	if {![string match "*groff*/tmp/ll -*" $man(format)]} {pack forget $g.columns}

++	if {![string match "*groff*$manx(longtmp) -*" $man(format)]} {pack forget $g.columns}

+ 

+ 

+ 

+@@ -791,7 +791,7 @@
+ 		bold {set weight "bold"}

+ 		italics {set slant "italic"}

+ 		bold-italics {set weight "bold"; set slant "italic"}

+-		default {puts stderr "nonexistent style: $style"; exit 1}

++		default {puts stderr "nonexistent style: $style"; CLEANUP; exit 1}

+ 	}

+ 

+ 	# specify s,m,l within small,medium,large; or set absolute point size

+diff -urN tkman-2.2~/taputils.tcl tkman-2.2/taputils.tcl
+--- tkman-2.2~/taputils.tcl	2003-04-01 17:31:38.000000000 -0600
++++ tkman-2.2/taputils.tcl	2008-12-05 17:37:55.000000000 -0600
+@@ -98,7 +98,7 @@
+ proc assert {bool msg {boom 0}} {
+ 	if {!$bool} {
+ 		puts stderr $msg
+-		if {$boom} {exit 1}
++		if {$boom} {CLEANUP; exit 1}
+ 	}
+ }
+ 
+diff -urN tkman-2.2~/tkman.tcl tkman-2.2/tkman.tcl
+--- tkman-2.2~/tkman.tcl	2003-04-01 17:31:38.000000000 -0600
++++ tkman-2.2/tkman.tcl	2008-12-05 17:37:55.000000000 -0600
+@@ -539,7 +539,7 @@
+ proc manMenuFit {m} {

+ 	global man manx

+ 

+-	if {[winfo class $m]!="Menu"} {puts stderr "$m not of Menu class"; exit 1}

++	if {[winfo class $m]!="Menu"} {puts stderr "$m not of Menu class"; CLEANUP; exit 1}

+ 	if {[$m index last] eq "none"} return

+ 

+ 	set sh [winfo screenheight $m]

+@@ -1827,7 +1827,7 @@
+ 	if {$inx<[llength $manx(binvars)]} {

+ 		after 1000 manBinCheck $inx $err

+ 	} else {

+-		if {$err} {exit 1}

++		if {$err} {CLEANUP; exit 1}

+ 		.occ entryconfigure "Statistics*" -state normal

+ 	}

+ 

+@@ -1850,6 +1850,7 @@
+ 				}

+ 				puts -nonewline "tkman"

+ 				foreach line [split [textmanip::linebreak $helptxt 70] "\n"] { puts "\t$line" }

++				CLEANUP

+ 				exit 0

+ 			}

+ 			-M {set env(MANPATH) $val; incr i}

+@@ -1868,11 +1869,11 @@
+ 			-start* {set manx(startup) $val; incr i}

+ 			-data* {puts stderr "-database option obsolete: database kept in memory"; incr i}

+ 			--v* -

+-			-v* {puts stdout "TkMan v$manx(version) of $manx(date)"; exit 0}

++			-v* {puts stdout "TkMan v$manx(version) of $manx(date)"; CLEANUP; exit 0}

+ 			-t* {set manx(title) $val; incr i}

+ 			-d* {set manx(debug) 1; set manx(quit) 0; set manx(iconify) 0}

+ 			-nod* {set manx(debug) 0}

+-			-* {puts stdout "[file tail $argv0]: unrecognized option: $arg"; exit 1}

++			-* {puts stdout "[file tail $argv0]: unrecognized option: $arg"; CLEANUP; exit 1}

+ 			default {

+ 				after 2000 manShowMan $arg {{}} .man

+ 				# permit several???  add extras to History?

+@@ -1888,6 +1889,7 @@
+ proc ASSERT {args} {

+ 	if {![uplevel 1 eval $args]} {

+ 		puts "ASSERTION VIOLATED: $args"

++		CLEANUP

+ 		exit 1

+ 	}

+ }

+@@ -1906,7 +1908,10 @@
+ 	set manx(lastclick) $clicknow

+ }

+ 

+-

++proc CLEANUP {} {

++	global manx

++	if { [file exists $manx(longtmp)] == 1 } { file delete $manx(longtmp) }

++}

+ 

+ 

+ ##################################################

+@@ -1919,6 +1924,7 @@
+ if {[package vcompare [info tclversion] $manx(mintcl)]==-1 || [package vcompare $tk_version $manx(mintk)]==-1} {

+ 	puts -nonewline stderr "Tcl $manx(mintcl)/Tk $manx(mintk) minimum versions required.  "

+ 	puts stderr "You have Tcl [info tclversion]/Tk $tk_version"

++	CLEANUP

+ 	exit 1

+ } elseif {int([info tclversion])-int($manx(mintcl))>=1 || int($tk_version)-int($manx(mintk))>=1} {

+ 	puts stderr "New major versions of Tcl and/or Tk may have introduced\nincompatibilies in TkMan.\nCheck the TkMan home site for a possible new version.\n"

+@@ -2111,7 +2117,6 @@
+ set manx(line-scale) 1; set manx(screen-scale) 45; set manx(page-scale) [expr int(60*1.5)]

+ set man(error-effect) "bell & flash"; set manx(error-effect-v) [set manx(error-effect-t) {"bell & flash" "bell" "flash" "none"}]

+ set man(columns) 65; set manx(columns-v) {65 90 130 5000}; set manx(columns-t) {"65 (most compatible)" 90 130 "wrap to screen width"}; # no one would want shorter lines

+-set manx(longtmp) /tmp/ll

+ set man(volcol) 4.0c; set manx(volcol-v) {0 1.5c 2.0c 2.5c 3.0c 3.5c 4.0c 4.5c 5.0c 7.5c 10.0c}; set manx(volcol-t) {"no columns" "1.5 cm" "2 cm" "2.5 cm/~1 inch" "3 cm" "3.5 cm" "4 cm" "4.5 cm" "5.0 cm/~2 inches" "7.5 cm" "10 cm"}

+ set man(apropostab) "4.5c"; set manx(apropostab-v) {0 3.0c 4.0c 4.5c 5.0c 5.5c 6.0c 7.5c 10.0c}; set manx(apropostab-t) {"none" "3 cm" "4 cm" "4.5 cm" "5 cm" "5.5 cm" "6 cm" "7.5 cm" "10 cm"}

+ #set man(showoutsub) ""

+@@ -2258,7 +2263,7 @@
+ regexp {(\d\d\d\d)/(\d\d)/(\d\d)} {$Date: 2003/04/01 23:02:52 $} manx(date) y m d

+ set manx(mtime) [clock scan "$m/$d/$y"]

+ set manx(stray-warnings) ""

+-if {[catch {set default(manList) 0}]} {puts "\aBLT conflicts with TkMan."; exit 1}

++if {[catch {set default(manList) 0}]} {puts "\aBLT conflicts with TkMan."; CLEANUP; exit 1}

+ set manx(manList) $man(manList)

+ set manx(manTitleList) $man(manTitleList)

+ set manx(userconfig) "### your additions go below"

+@@ -2385,6 +2390,7 @@
+ 	if {[string match "#!*" [gets $fid line]]} {

+ 		puts stderr "$manx(startup) looks like an executable."

+ 		puts stderr "You should delete it, probably."

++		CLEANUP

+ 		exit 1

+ 	}

+ 

+@@ -2613,6 +2619,7 @@
+ 

+ if {[llength $man(manList)]!=[llength $man(manTitleList)]} {

+ 	puts stderr "Length of section abbreviations differs from length of section titles:\n\nlength [llength $man(manList)]:\t$man(manList)\n\nlength [llength $man(manTitleList)]:\t$man(manTitleList)"

++	CLEANUP

+ 	exit 1

+ }

+ 

+diff -urN tkman-2.2~/tkmandesc.tcl tkman-2.2/tkmandesc.tcl
+--- tkman-2.2~/tkmandesc.tcl	2003-04-01 17:31:38.000000000 -0600
++++ tkman-2.2/tkmandesc.tcl	2008-12-05 17:37:55.000000000 -0600
+@@ -152,6 +152,7 @@
+ 	foreach n [concat $from $to] {

+ 		if {[lsearch $mani(manList) $n]==-1} {

+ 			puts stderr "$cmd: Section letter `$n' doesn't exist."

++			CLEANUP

+ 			exit 1

+ 		}

+ 	}

+diff -urN tkman-2.2~/version.tcl tkman-2.2/version.tcl
+--- tkman-2.2~/version.tcl	2003-04-01 17:31:38.000000000 -0600
++++ tkman-2.2/version.tcl	2008-12-05 17:37:55.000000000 -0600
+@@ -80,7 +80,7 @@
+ 

+ 		### collect diffs

+ 		# diff needs at least one of them to be a real file.  want text of previous version around anyhow

+-		set tmpf /tmp/tkman[pid]

++		set tmpf [exec mktemp -p /tmp tkman.XXXXXXXXXX]

+ # $man(changeleft) $man(zaphy) -- obsolete options

+ 		set format "$man(format) | $manx(rman) -f ASCII -N"

+ #puts "creating $tmpf (old)"

diff --git a/app-text/tkman/files/tkman.desktop b/app-text/tkman/files/tkman.desktop
new file mode 100644
index 000000000000..25a2cdcbf790
--- /dev/null
+++ b/app-text/tkman/files/tkman.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=TkMan
+Comment=Graphical man page and info viewer
+Exec=tkman
+Icon=TkMan.gif
+Terminal=false
+Type=Application
+Categories=Utility;
+
diff --git a/app-text/tkman/metadata.xml b/app-text/tkman/metadata.xml
new file mode 100644
index 000000000000..1300475e7aa1
--- /dev/null
+++ b/app-text/tkman/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="sourceforge">tkman</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/tkman/tkman-2.2-r1.ebuild b/app-text/tkman/tkman-2.2-r1.ebuild
new file mode 100644
index 000000000000..4e21e88ebb46
--- /dev/null
+++ b/app-text/tkman/tkman-2.2-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="TkMan man and info page browser"
+HOMEPAGE="http://tkman.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="Artistic"
+SLOT="0"
+KEYWORDS="~amd64 ppc sparc x86"
+IUSE=""
+
+DEPEND="
+	>=app-text/rman-3.1
+	>=dev-lang/tcl-8.4:0
+	>=dev-lang/tk-8.4:0
+	"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-2.2-gentoo.diff \
+		"${FILESDIR}"/${PN}-CVE-2008-5137.diff #bug 247540
+}
+
+src_install() {
+	local DOCS=( ANNOUNCE-tkman.txt CHANGES README-tkman )
+	local HTML_DOCS=( manual.html )
+
+	dodir /usr/bin
+	default
+
+	doicon contrib/TkMan.gif
+
+	domenu "${FILESDIR}"/tkman.desktop
+}
diff --git a/app-text/tofrodos-1.7.12a b/app-text/tofrodos-1.7.12a
deleted file mode 100644
index dc1813daee66..000000000000
--- a/app-text/tofrodos-1.7.12a
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=Utility that converts ASCII files between the MSDOS and the Unix format
-EAPI=5
-HOMEPAGE=http://tofrodos.sourceforge.net/
-KEYWORDS=~amd64 ~arm ~hppa ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://tofrodos.sourceforge.net/download/tofrodos-1.7.12a.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0f8280f435a3f0863ec7178b35ec1265
diff --git a/app-text/tofrodos/Manifest b/app-text/tofrodos/Manifest
new file mode 100644
index 000000000000..d72d2c7961e4
--- /dev/null
+++ b/app-text/tofrodos/Manifest
@@ -0,0 +1,4 @@
+AUX tofrodos-1.7.8-CFLAGS.patch 306 BLAKE2B 4e3b3ec28cb47d758d053394c4a0c806f27bc2bb97f0b715e85c21c6c3646924fcdb0b520dd819460f84c787a5852e0aab3ff67479c16dd959aa202b3c04711d SHA512 d96573638ba4cc4c3413ad42b903a08ac84286571317097aabcba7dfc69f794e53601154b5faf3e19ca0833377a742df745209ae3958ec9e7d2895e13bce5b2d
+DIST tofrodos-1.7.12a.tar.gz 97588 BLAKE2B ca8794df5b58e0e88d23a52287ec3f9c58918baa6590b6e2d571782c4c2ff1625e208648cce8346b2f63b52031da5dd3aff0e66522e670525cdc09bdfd8744b0 SHA512 45a03203ccd053ec02a420fe4a63b427ee74dfa2c30e914836621a1cd7836ce81800e8bd5f1cccdb93233780ce79bc74d4ad49dca6192899b3039cf559baa8a2
+EBUILD tofrodos-1.7.12a.ebuild 699 BLAKE2B 6cb65a781ef4ea7b86b8bd62a4ea6714140663dac58aeb24d349eef8856f3fc7e5cc46e3f0d7926d11a897d4208b845b86886bd5c4e50ee5dc6073a21492746a SHA512 8c4e88d3082d5c597f18fcf45c092ac86d291236ab9cd2e78cdae2a62cb6c85bec5adbee83007c9a64cf8dfe85401db3ace18e45561ac13ea7d92284943462ad
+MISC metadata.xml 325 BLAKE2B 89b80fe9769278e73ae9aaeea66f6037a6321f25725f6645a0b02220d1ba06a18213bdf71a2d7676150d75f58ba67ad79a4f4f5fe8c8ba7e5dd4d95054c0e45f SHA512 d32c6a8e3e9bd397896145130afc1328ed86f507af35e2ab5b0a9b385462624542728178a06530af5cda863aee10e961bf3d189fbe3d1cf64619ba3d0a8f0b8b
diff --git a/app-text/tofrodos/files/tofrodos-1.7.8-CFLAGS.patch b/app-text/tofrodos/files/tofrodos-1.7.8-CFLAGS.patch
new file mode 100644
index 000000000000..5aa0e8358565
--- /dev/null
+++ b/app-text/tofrodos/files/tofrodos-1.7.8-CFLAGS.patch
@@ -0,0 +1,17 @@
+--- Makefile.original	2009-04-11 22:46:08.000000000 -0600
++++ Makefile	2009-04-12 14:30:55.000000000 -0600
+@@ -92,14 +92,10 @@
+ OBJS =	emsg.o \
+ 	init.o \
+ 	tofrodos.o \
+ 	utility.o
+ 
+-# implicit rules
+-.c.o:
+-	$(CC) $(CFLAGS) $<
+-
+ # user visible rules
+ all: $(FROMDOS) $(TODOS)
+ 
+ clean:
+ 	$(RM) $(OBJS)
diff --git a/app-text/tofrodos/metadata.xml b/app-text/tofrodos/metadata.xml
new file mode 100644
index 000000000000..a8e3b2aeed3c
--- /dev/null
+++ b/app-text/tofrodos/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>patrick@gentoo.org</email>
+		<name>Patrick Lauer</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">tofrodos</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/tofrodos/tofrodos-1.7.12a.ebuild b/app-text/tofrodos/tofrodos-1.7.12a.ebuild
new file mode 100644
index 000000000000..cc6d10bee44b
--- /dev/null
+++ b/app-text/tofrodos/tofrodos-1.7.12a.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Utility that converts ASCII files between the MSDOS and the Unix format"
+HOMEPAGE="http://tofrodos.sourceforge.net/"
+SRC_URI="http://tofrodos.sourceforge.net/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+S="${WORKDIR}/${PN}/src"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.7.8-CFLAGS.patch
+}
+
+src_compile() {
+	emake DEBUG=1 CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
+		CC="$(tc-getCC)"
+}
+
+src_install() {
+	dobin fromdos
+	dosym fromdos /usr/bin/todos
+	doman fromdos.1
+}
diff --git a/app-text/tokyodystopia-0.9.15 b/app-text/tokyodystopia-0.9.15
deleted file mode 100644
index f712fec06392..000000000000
--- a/app-text/tokyodystopia-0.9.15
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install test
-DEPEND=dev-db/tokyocabinet
-DESCRIPTION=A fulltext search engine for Tokyo Cabinet
-EAPI=7
-HOMEPAGE=http://fallabs.com/tokyodystopia/
-IUSE=examples
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-db/tokyocabinet
-SLOT=0
-SRC_URI=http://fallabs.com/tokyodystopia/tokyodystopia-0.9.15.tar.gz
-_md5_=3bd0d48820a38f026f0a2dc926767012
diff --git a/app-text/tokyodystopia/Manifest b/app-text/tokyodystopia/Manifest
new file mode 100644
index 000000000000..feda57cc18f4
--- /dev/null
+++ b/app-text/tokyodystopia/Manifest
@@ -0,0 +1,6 @@
+AUX fix_ldconfig.patch 439 BLAKE2B fa9c4b1cf06b2ea8e0a2ff6546e09040e92718558e824adeae14f21af67d905c9ff391d1561788e5eac364efee3728a457d3ed226490f394c4fdff2a4fa895c4 SHA512 1b7c2c1bf8331069cdc74ad60c0ea346050118755c1502a3b1ee0786518d578a322ab1b8eda77d9699a6a4bd2eb9396a32407c5dc64238c1f28f3873957fc0cd
+AUX fix_rpath.patch 2631 BLAKE2B abc4903f98c2399f9514322cc93e9ead3452f09fd5fc88f8ac096613ed676eec517f9eb3fd3412f438a047e9c0305535589bb8ef263f55721dc02c503cfeb87f SHA512 cc4a357c5dbdc95e0b557e2a9578b5e4c6595b19c9b8c061b9882f77f25a5f2b710c1fc83aed1bb1ec8df6ca22ab20b822f1d134743c7ccdd94f68a30bc199b1
+AUX remove_docinst.patch 456 BLAKE2B 768890c4f85a391eac2e436db6b457042a8bf6b28c1c370d19be67a85c194b5a4be06b1f5f1541ad0552228145c7e44587c9c39fa553a5866d8886220e8d2847 SHA512 cb052f09c37e0b84e9e236cf7722974b29e0a2d537bd1268cbb8de0db9ba35292836c82b1d21b35f04b753d58c908f32bb42ceeaba03ae086888aeb278dd6a29
+DIST tokyodystopia-0.9.15.tar.gz 158522 BLAKE2B 624efe5ab587b8fcb63c6365862851ec8f3e596a9d75b48a273e008fadc0919004c6163ca54600b741289ed9f16f9e6d003766a4562f3df6214d48e3ff647ada SHA512 14e956ea6d84c3e00f1af5b8fd7e7ded8e886d585d80f492119521594826e21dd556b875b9552203c9d2f9e2830b15078d635a62975162436a7c2a13387086dd
+EBUILD tokyodystopia-0.9.15.ebuild 719 BLAKE2B a2aa45d98aff6d418ec949d1aa1b3802537a01db7bd29a0f6ca253420c5d7bc9ce62383294629d7376c843fc41a521b7f7cbe0f36447e58a28979d48fb7bf518 SHA512 ac94b786b140e5c682aec0ca1ef7dbd465372cc449242138a8573638ee7431d3d60f0a1e081bfb8f6296206723db9d4e43b85eaf50e172696e1e0fc4abf0b270
+MISC metadata.xml 247 BLAKE2B 5a20af3c9732ef7dba68131a08988652f5c93a6d186a82c4deb1bb9c06dc3ae73152a0d241cc346637f7b11caf4676da43301ba596c67b66669535e71db0b03e SHA512 29cf52c16b0cce69899d9c2da8acd9144b7d760442aa323b854dceadb42459e009545193b1df7911ac2241b59f4819b4a6bb1d206d6f57953f770031433bb6b7
diff --git a/app-text/tokyodystopia/files/fix_ldconfig.patch b/app-text/tokyodystopia/files/fix_ldconfig.patch
new file mode 100644
index 000000000000..a75da590ee38
--- /dev/null
+++ b/app-text/tokyodystopia/files/fix_ldconfig.patch
@@ -0,0 +1,12 @@
+diff --git a/Makefile.in b/Makefile.in
+index 60b1036..12f02b0 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -125,7 +125,6 @@ install :
+ 	cd man && cp -Rf $(MAN3FILES) $(DESTDIR)$(MAN3DIR)
+ 	mkdir -p $(DESTDIR)$(PCDIR)
+ 	cp -Rf $(PCFILES) $(DESTDIR)$(PCDIR)
+-	[ "$$UID" == 0 ] && ldconfig || true
+ 	@printf '\n'
+ 	@printf '#================================================================\n'
+ 	@printf '# Thanks for using Tokyo Cabinet.\n'
diff --git a/app-text/tokyodystopia/files/fix_rpath.patch b/app-text/tokyodystopia/files/fix_rpath.patch
new file mode 100644
index 000000000000..68c0b6e03510
--- /dev/null
+++ b/app-text/tokyodystopia/files/fix_rpath.patch
@@ -0,0 +1,61 @@
+diff -ur tokyodystopia-0.9.13/Makefile.in tokyodystopia-0.9.13-new/Makefile.in
+--- tokyodystopia-0.9.13/Makefile.in	2009-07-05 04:06:06.000000000 +0200
++++ tokyodystopia-0.9.13-new/Makefile.in	2009-10-20 22:39:18.000000000 +0200
+@@ -55,8 +55,8 @@
+ LDFLAGS = @MYLDFLAGS@
+ CMDLDFLAGS = @MYCMDLDFLAGS@
+ LIBS = @LIBS@
+-LDENV = LD_RUN_PATH=/lib:/usr/lib:$(LIBDIR):$(HOME)/lib:/usr/local/lib:@MYRUNPATH@:.
+-RUNENV = @MYLDLIBPATHENV@=.:/lib:/usr/lib:$(LIBDIR):$(HOME)/lib:/usr/local/lib:@MYRUNPATH@
++LDENV = 
++RUNENV = @MYLDLIBPATHENV@=.:$(LIBDIR)
+ POSTCMD = @MYPOSTCMD@
+ 
+ 
+diff -ur tokyodystopia-0.9.13/configure.in tokyodystopia-0.9.13-new/configure.in
+--- tokyodystopia-0.9.13/configure.in	2009-06-14 05:44:54.000000000 +0200
++++ tokyodystopia-0.9.13-new/configure.in	2009-10-20 22:40:00.000000000 +0200
+@@ -26,31 +26,14 @@
+ MYPCFILES="tokyodystopia.pc"
+ 
+ # Building flags
+-MYCFLAGS="-std=c99 -Wall -fPIC -fsigned-char -O2"
++MYCFLAGS="-std=c99 -Wall -fPIC -fsigned-char"
+ MYCPPFLAGS="-I. -I\$(INCLUDEDIR) -I$HOME/include -I/usr/local/include -DNDEBUG -D_GNU_SOURCE=1"
+-MYLDFLAGS="-L. -L\$(LIBDIR) -L$HOME/lib -L/usr/local/lib"
++MYLDFLAGS="-L. -L\$(LIBDIR)"
+ MYCMDLDFLAGS=""
+ MYRUNPATH="\$(LIBDIR)"
+ MYLDLIBPATHENV="LD_LIBRARY_PATH"
+ MYPOSTCMD="true"
+ 
+-# Building paths
+-PATH="$PATH:$HOME/bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin"
+-PATH="$PATH:/opt/SUNWspro/bin:/usr/ccs/bin:/usr/xpg4/bin:/usr/xpg6/bin:/usr/ucb"
+-CPATH="$HOME/include:/usr/local/include:$CPATH"
+-LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LIBRARY_PATH"
+-LD_LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LD_LIBRARY_PATH"
+-PKG_CONFIG_PATH="$HOME/lib/pkgconfig:/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH"
+-export PATH CPATH LIBRARY_PATH LD_LIBRARY_PATH PKG_CONFIG_PATH
+-if type pkg-config > /dev/null 2>&1
+-then
+-  PATH="$PATH:`pkg-config --variable=bindir tokyocabinet`"
+-  CPATH="$CPATH:`pkg-config --variable=includedir tokyocabinet`"
+-  LIBRARY_PATH="$LIBRARY_PATH:`pkg-config --variable=libdir tokyocabinet`"
+-  LD_LIBRARY_PATH="$LD_LIBRARY_PATH:`pkg-config --variable=libdir tokyocabinet`"
+-fi
+-
+-
+ 
+ #================================================================
+ # Options
+diff -ur tokyodystopia-0.9.13/tokyodystopia.pc.in tokyodystopia-0.9.13-new/tokyodystopia.pc.in
+--- tokyodystopia-0.9.13/tokyodystopia.pc.in	2008-02-21 10:45:01.000000000 +0100
++++ tokyodystopia-0.9.13-new/tokyodystopia.pc.in	2009-10-20 22:40:17.000000000 +0200
+@@ -10,5 +10,5 @@
+ Name: Tokyo Dystopia
+ Description: a full-text search system
+ Version: @PACKAGE_VERSION@
+-Libs: -L${libdir} -ltokyodystopia @LIBS@
++Libs: -L${libdir} -ltokyodystopia
+ Cflags: -I${includedir}
diff --git a/app-text/tokyodystopia/files/remove_docinst.patch b/app-text/tokyodystopia/files/remove_docinst.patch
new file mode 100644
index 000000000000..d513f54b753c
--- /dev/null
+++ b/app-text/tokyodystopia/files/remove_docinst.patch
@@ -0,0 +1,13 @@
+diff --git a/Makefile.in b/Makefile.in
+index 8846c38..29ac11e 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -117,8 +117,6 @@ install :
+ 	cp -Rf $(COMMANDFILES) $(DESTDIR)$(BINDIR)
+ 	mkdir -p $(DESTDIR)$(LIBEXECDIR)
+ 	cp -Rf $(CGIFILES) $(DESTDIR)$(LIBEXECDIR)
+-	mkdir -p $(DESTDIR)$(DATADIR)
+-	cp -Rf $(DOCUMENTFILES) $(DESTDIR)$(DATADIR)
+ 	mkdir -p $(DESTDIR)$(MAN1DIR)
+ 	cd man && cp -Rf $(MAN1FILES) $(DESTDIR)$(MAN1DIR)
+ 	mkdir -p $(DESTDIR)$(MAN3DIR)
diff --git a/app-text/tokyodystopia/metadata.xml b/app-text/tokyodystopia/metadata.xml
new file mode 100644
index 000000000000..40aa45df2b01
--- /dev/null
+++ b/app-text/tokyodystopia/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>patrick@gentoo.org</email>
+		<name>Patrick Lauer</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-text/tokyodystopia/tokyodystopia-0.9.15.ebuild b/app-text/tokyodystopia/tokyodystopia-0.9.15.ebuild
new file mode 100644
index 000000000000..853fc3b700e1
--- /dev/null
+++ b/app-text/tokyodystopia/tokyodystopia-0.9.15.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A fulltext search engine for Tokyo Cabinet"
+HOMEPAGE="http://fallabs.com/tokyodystopia/"
+SRC_URI="${HOMEPAGE}${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+DEPEND="dev-db/tokyocabinet"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/fix_rpath.patch"
+	"${FILESDIR}/fix_ldconfig.patch"
+	"${FILESDIR}/remove_docinst.patch"
+)
+
+src_configure() {
+	econf --libexecdir="${EPREFIX}"/usr/libexec/${PN}
+}
+
+src_install() {
+	HTML_DOCS=( doc/. )
+
+	default
+
+	if use examples; then
+		insinto /usr/share/${PF}/example
+		doins example/.
+	fi
+}
+
+src_test() {
+	emake -j1 check
+}
diff --git a/app-text/trang-20151127 b/app-text/trang-20151127
deleted file mode 100644
index b212d061a166..000000000000
--- a/app-text/trang-20151127
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.7 dev-java/javacc:0 dev-java/saxon:6.5 dev-java/testng:0 dev-java/xerces:2 dev-java/xml-commons-resolver:0 >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Multi-format schema converter based on RELAX NG
-EAPI=5
-HOMEPAGE=http://thaiopensource.com/relaxng/trang.html
-IUSE=elibc_FreeBSD elibc_FreeBSD
-KEYWORDS=amd64 x86
-LICENSE=BSD
-RDEPEND=>=virtual/jre-1.7 dev-java/xerces:2 dev-java/xml-commons-resolver:0 >=dev-java/java-config-2.2.0-r3
-SLOT=0
-SRC_URI=https://github.com/relaxng/jing-trang/archive/1e74846999bbd14ce5248acbd2be9f1e624a9846.tar.gz -> trang-20151127.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=c2f70e2d566e205c1e7fe4332f024f25
diff --git a/app-text/trang/Manifest b/app-text/trang/Manifest
new file mode 100644
index 000000000000..2b4a31f85599
--- /dev/null
+++ b/app-text/trang/Manifest
@@ -0,0 +1,4 @@
+AUX test.xml 3053 BLAKE2B f9837b05c4ac00fa63ce75f04318f3378c2cc0c99680c21520d7d75a74e0e9ad00a9fcdf4857655ac32a3eea935208dc86e51d2bbef3e2349cd78d65ed74ac30 SHA512 11b4faef6fce89d72e8cdcc25cc1dc6c89ea7bc44252e0521a9a5ff47f686e78c46eac6b606e47f51b0bdb8175e583d5c1c56bdcb8bea105c70a63b65f20ea67
+DIST trang-20151127.tar.gz 13746141 BLAKE2B 8895fefa8be62a524a2bfb603a64bcf641f13cd500dbe51b9efdaed7d5147dd6478963d356aec81c5c5b6af12a59edcb908d203b6b8edaf093fe29f76db80b7c SHA512 f5c6973791e8caa8dcce6bbf92cbd58491f55edd7819523947ad718ea3973eb81afc6b21d4e830949c2f183b485915dab98dbb5b90e01324677cfa41f5746e26
+EBUILD trang-20151127.ebuild 2070 BLAKE2B d9355cb752161614485ca3911cfe293117f08b78ec359d3296604f0018bdfd39d3bc578efda8d1abe00ed4dbff57315460ba204ab41200b4e7bfea7e986f2a3d SHA512 b0d9aa8adb56abbe566ccf37e6e2764127d2e752df1b02670175a653187add219a74433bdb6cad7a691a14effc59c25d7d18c08f0721c4f20fa34b4778dfb9a4
+MISC metadata.xml 374 BLAKE2B e8d7e9fafb80a0b972bce7a3c8a02abacec08b11bee39dcf2b927cffe59931daf6cfcc3372f2a0549a1de4310332a072e3f154ce0e8241cf9f4e616884819dae SHA512 884f58def744deb8a44d8d60a178d7409bb67afcb3b88c224608ecf902a00602e6aeb0da8683fd6edc20d07bf739492196067c4b2821a129255e510b6991bc90
diff --git a/app-text/trang/files/test.xml b/app-text/trang/files/test.xml
new file mode 100644
index 000000000000..747972587821
--- /dev/null
+++ b/app-text/trang/files/test.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright (C) 2001-2004 Bart Massey, Jamey Sharp, and Josh Triplett.
+All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the names of the authors or their
+institutions shall not be used in advertising or otherwise to promote the
+sale, use or other dealings in this Software without prior written
+authorization from the authors.
+-->
+<xcb header="dpms" extension-xname="DPMS" extension-name="DPMS"
+    major-version="0" minor-version="0">
+  <request name="GetVersion" opcode="0">
+    <field type="CARD16" name="client_major_version" />
+    <field type="CARD16" name="client_minor_version" />
+    <reply>
+      <pad bytes="1" />
+      <field type="CARD16" name="server_major_version" />
+      <field type="CARD16" name="server_minor_version" />
+    </reply>
+  </request>
+
+  <request name="Capable" opcode="1">
+    <reply>
+      <pad bytes="1" />
+      <field type="BOOL" name="capable" />
+      <pad bytes="23" />
+    </reply>
+  </request>
+
+  <request name="GetTimeouts" opcode="2">
+    <reply>
+      <pad bytes="1" />
+      <field type="CARD16" name="standby_timeout" />
+      <field type="CARD16" name="suspend_timeout" />
+      <field type="CARD16" name="off_timeout" />
+      <pad bytes="18" />
+    </reply>
+  </request>
+
+  <request name="SetTimeouts" opcode="3">
+    <field type="CARD16" name="standby_timeout" />
+    <field type="CARD16" name="suspend_timeout" />
+    <field type="CARD16" name="off_timeout" />
+  </request>
+
+  <request name="Enable" opcode="4" />
+
+  <request name="Disable" opcode="5" />
+
+  <enum name="DPMSMode">
+    <item name="On" />
+    <item name="Standby" />
+    <item name="Suspend" />
+    <item name="Off" />
+  </enum>
+
+  <request name="ForceLevel" opcode="6">
+    <field type="CARD16" name="power_level" enum="DPMSMode" />
+  </request>
+
+  <request name="Info" opcode="7">
+    <reply>
+      <pad bytes="1" />
+      <field type="CARD16" name="power_level" enum="DPMSMode" />
+      <field type="BOOL" name="state" />
+      <pad bytes="21" />
+    </reply>
+  </request>
+</xcb>
\ No newline at end of file
diff --git a/app-text/trang/metadata.xml b/app-text/trang/metadata.xml
new file mode 100644
index 000000000000..04751195a354
--- /dev/null
+++ b/app-text/trang/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">relaxng/jing-trang</remote-id>
+		<remote-id type="google-code">jing-trang</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/trang/trang-20151127.ebuild b/app-text/trang/trang-20151127.ebuild
new file mode 100644
index 000000000000..fa287c480746
--- /dev/null
+++ b/app-text/trang/trang-20151127.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+COMMIT="1e74846999bbd14ce5248acbd2be9f1e624a9846"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Multi-format schema converter based on RELAX NG"
+HOMEPAGE="http://thaiopensource.com/relaxng/trang.html"
+SRC_URI="https://github.com/relaxng/jing-trang/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+COMMON_DEP="
+	dev-java/xerces:2
+	dev-java/xml-commons-resolver:0"
+
+RDEPEND="
+	>=virtual/jre-1.7
+	${COMMON_DEP}"
+
+DEPEND="
+	>=virtual/jdk-1.7
+	dev-java/javacc:0
+	dev-java/saxon:6.5
+	dev-java/testng:0
+	${COMMON_DEP}"
+
+S="${WORKDIR}/jing-${PN}-${COMMIT}"
+
+EANT_ANT_TASKS="testng"
+EANT_GENTOO_CLASSPATH="xerces-2,xml-commons-resolver"
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+JAVA_PKG_BSFIX_NAME="build.xsl"
+
+java_prepare() {
+	java-pkg_clean
+	echo "<version>${PV}</version>" > version.xml || die
+}
+
+src_configure() {
+	java-ant-2_src_configure
+
+	# Because this crazy package uses XSLT, we need to escape this.
+	sed -i 's:\${gentoo\.classpath}:${{gentoo.classpath}}:g' build.xsl || die
+
+	EANT_EXTRA_ARGS="-Djavacc.dir=${EROOT}usr/share/javacc/lib"
+	export LOCALCLASSPATH=$(java-pkg_getjars --build-only --with-dependencies saxon-6.5)
+}
+
+src_compile() {
+	EANT_BUILD_TARGET="modbuild trang-doc" java-pkg-2_src_compile
+	EANT_BUILD_TARGET="mod.trang.jar" EANT_BUILD_XML="modbuild.xml" java-pkg-2_src_compile
+}
+
+src_install() {
+	java-pkg_dojar build/${PN}.jar
+	java-pkg_dolauncher ${PN} \
+		--main com.thaiopensource.relaxng.translate.Driver
+
+	docinto html
+	dodoc build/*.html
+}
+
+src_test() {
+	java -jar build/${PN}.jar "${FILESDIR}/test.xml" test/test.xsd
+	java -jar build/${PN}.jar "${FILESDIR}/test.xml" test/test.dtd
+	java -jar build/${PN}.jar test/test.dtd test/test.dtd.xsd
+
+	md5sum -c <<EOF || die "Failed to verify md5sum"
+4bcb454ade46c0188f809d2e8ce15315  ${FILESDIR}/test.xml
+d096c1fb462902e10a3440a604a21664  test/test.xsd
+3fb46bdb16dc75a2a1e36e421b13e51d  test/test.dtd
+fce355ca962cb063d7baa5d7fd571bcf  test/test.dtd.xsd
+EOF
+}
diff --git a/app-text/tree-1.7.0 b/app-text/tree-1.7.0
deleted file mode 100644
index d932a8cf74ed..000000000000
--- a/app-text/tree-1.7.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=Lists directories recursively, and produces an indented listing of files
-EAPI=5
-HOMEPAGE=http://mama.indstate.edu/users/ice/tree/
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
-LICENSE=GPL-2
-RDEPEND=!=sci-biology/meme-4.8.1
-SLOT=0
-SRC_URI=ftp://mama.indstate.edu/linux/tree/tree-1.7.0.tgz
-_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=41166dc0a500c1708ba59623f8a8116d
diff --git a/app-text/tree-1.7.0-r1 b/app-text/tree-1.7.0-r1
deleted file mode 100644
index 2540145e6331..000000000000
--- a/app-text/tree-1.7.0-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=Lists directories recursively, and produces an indented listing of files
-EAPI=6
-HOMEPAGE=http://mama.indstate.edu/users/ice/tree/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
-LICENSE=GPL-2
-RDEPEND=!=sci-biology/meme-4.8.1
-SLOT=0
-SRC_URI=ftp://mama.indstate.edu/linux/tree/tree-1.7.0.tgz
-_eclasses_=bash-completion-r1	6af26c1ffe65d92d3f525cb715f6250c	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=fcbdcca0aec1331aad2a7325c43a1c0d
diff --git a/app-text/tree/Manifest b/app-text/tree/Manifest
new file mode 100644
index 000000000000..a919f3dbb453
--- /dev/null
+++ b/app-text/tree/Manifest
@@ -0,0 +1,5 @@
+AUX tree.bashcomp 847 BLAKE2B de05dacd7b54426e89e4afbbb6fba74376212a8f02995ff9babec369244bdb57fcb46989a437a100bf1415f7ecb8b0e142d729bae27f7fef6319de9e4cb06d54 SHA512 8df777721a7974015b5e717d89a4ff8701a2598e227d6cf71077fe498a5bb2a578c96c4667ab80e34b1064e109d38665fb6a4de8f52bb6401445088d5cdca922
+DIST tree-1.7.0.tgz 47082 BLAKE2B 07449f50a44f857733679ae92a54a9dd61fe19b282f9244534393527d5f344835864e2acff3b2c43ed406d65657568b21440044af21fed2c4ab623e88d2e396c SHA512 b234fb1428ba75da72d7e4aeb24bf961e123332342593e441b29a0baa2270d12bb187d889c179d6463c940c8dce9fe9dffeb4ad3f06cf11f057b83234d7b4b4a
+EBUILD tree-1.7.0-r1.ebuild 1073 BLAKE2B 2a915944b3ac6e140591f3dfed56afc3689b64301411f89d9dfb65ce2ea1c24786354e28eb5008f3d01cc9989c598da1f3fce92e32e6043c080db80b97c831ac SHA512 7d895b58b606c9ae4f87efcc111e363afbdba7a1eea3f6feafdc12d3c676e3458c2f120ae955196c0e6b7f46829efc0fe0d7572210ca8e13712652e24b6da0e6
+EBUILD tree-1.7.0.ebuild 1060 BLAKE2B f5eeeafe7a06591a692a8b7f8dafbcea1cf0e10c6f073227bdad412fcd9bb6295a946787d003a50b9e12645a2c135e3601a887851e8777bf0b3a1ee528445692 SHA512 b0ac7ae78f15da79c9fb9a7b622e4715ece42f6767cd1ba4ae4f4f4c46b059956e62cc1442b8eccaa090d5a8096620056a989d7b333af1c1c10e089d9a44449d
+MISC metadata.xml 581 BLAKE2B c8ec671fdf6834012120004fc69b9957364d6c43d6b6dcdd78d1c0a850976d669c4044109c6c08d818a4167be2582cf6b0d20fd634843924a86e031d5d0a8f2c SHA512 ca6717181a7ad2535be2384b4abb986c4daf7d4defc2b4e7d7487fe62b5209c31e81f86843168681debda99dabb6d2c0165b0ca0b154464f5eada572bdc1fe42
diff --git a/app-text/tree/files/tree.bashcomp b/app-text/tree/files/tree.bashcomp
new file mode 100644
index 000000000000..fed493575ea2
--- /dev/null
+++ b/app-text/tree/files/tree.bashcomp
@@ -0,0 +1,34 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# bash command-line completion for tree
+# Author: Aaron Walker <ka0ttic@gentoo.org>
+
+_tree() {
+    local cur prev opts
+    COMPREPLY=()
+    cur="${COMP_WORDS[COMP_CWORD]}"
+    prev="${COMP_WORDS[COMP_CWORD-1]}"
+    opts="-a -d -l -f -i -q -N -p -u -g -s -D -F -r -t -x -L -A
+    -S -n -C -P -I -H -T -R -o --inodes --device --noreport --nolinks
+    --dirsfirst --charset --help"
+
+    if [[ ${cur} == -* ]] ; then
+        COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
+        return 0
+    fi
+
+    case "${prev}" in
+        -L|-P|-I|-H|-T|--charset|--help)
+            ;;
+        -o)
+	    _filedir
+            ;;
+        *)
+	    _filedir -d
+            ;;
+    esac
+}
+complete -o filenames -F _tree tree
+
+# vim: set ft=sh tw=80 sw=4 et :
diff --git a/app-text/tree/metadata.xml b/app-text/tree/metadata.xml
new file mode 100644
index 000000000000..c30fee716df8
--- /dev/null
+++ b/app-text/tree/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>jstein@gentoo.org</email>
+		<name>Jonas Stein</name>
+	</maintainer>
+	<upstream>
+		<changelog>http://mama.indstate.edu/users/ice/tree/changes.html</changelog>
+	</upstream>
+	<longdescription>Tree is a recursive directory listing command that
+produces a depth indented listing of files, which is colorized ala 
+dircolors if the LS_COLORS environment variable is set and output is to tty.
+	</longdescription>
+</pkgmetadata>
diff --git a/app-text/tree/tree-1.7.0-r1.ebuild b/app-text/tree/tree-1.7.0-r1.ebuild
new file mode 100644
index 000000000000..254228739351
--- /dev/null
+++ b/app-text/tree/tree-1.7.0-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit toolchain-funcs flag-o-matic bash-completion-r1
+
+DESCRIPTION="Lists directories recursively, and produces an indented listing of files"
+HOMEPAGE="http://mama.indstate.edu/users/ice/tree/"
+SRC_URI="ftp://mama.indstate.edu/linux/tree/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE=""
+
+RDEPEND="!=sci-biology/meme-4.8.1"
+DEPEND=""
+
+src_prepare() {
+	sed -i -e 's:LINUX:__linux__:' tree.c || die
+	mv doc/tree.1.fr doc/tree.fr.1
+	if use !elibc_glibc ; then
+		# 433972, also previously done only for elibc_uclibc
+		sed -i -e '/^OBJS=/s/$/ strverscmp.o/' Makefile || die
+	fi
+	default
+}
+
+src_compile() {
+	append-lfs-flags
+	emake \
+		CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS} ${CPPFLAGS}" \
+		LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	dobin tree
+	doman doc/tree*.1
+	einstalldocs
+	newbashcomp "${FILESDIR}"/${PN}.bashcomp ${PN}
+}
diff --git a/app-text/tree/tree-1.7.0.ebuild b/app-text/tree/tree-1.7.0.ebuild
new file mode 100644
index 000000000000..403081c551cc
--- /dev/null
+++ b/app-text/tree/tree-1.7.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit toolchain-funcs flag-o-matic bash-completion-r1
+
+DESCRIPTION="Lists directories recursively, and produces an indented listing of files"
+HOMEPAGE="http://mama.indstate.edu/users/ice/tree/"
+SRC_URI="ftp://mama.indstate.edu/linux/tree/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE=""
+
+RDEPEND="!=sci-biology/meme-4.8.1"
+DEPEND=""
+
+src_prepare() {
+	sed -i -e 's:LINUX:__linux__:' tree.c || die
+	mv doc/tree.1.fr doc/tree.fr.1
+	if use !elibc_glibc ; then
+		# 433972, also previously done only for elibc_uclibc
+		sed -i -e '/^OBJS=/s/$/ strverscmp.o/' Makefile || die
+	fi
+}
+
+src_compile() {
+	append-lfs-flags
+	emake \
+		CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS} ${CPPFLAGS}" \
+		LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	dobin tree
+	doman doc/tree*.1
+	dodoc CHANGES README*
+	newbashcomp "${FILESDIR}"/${PN}.bashcomp ${PN}
+}
diff --git a/app-text/ttf2pk2-2.0_p20150521 b/app-text/ttf2pk2-2.0_p20150521
deleted file mode 100644
index 1f2d94fdcedf..000000000000
--- a/app-text/ttf2pk2-2.0_p20150521
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=>=dev-libs/kpathsea-6.2.1 media-libs/freetype:2 sys-libs/zlib !media-libs/freetype:1 !=dev-texlive/texlive-langcjk-2011*[source] app-arch/xz-utils virtual/pkgconfig
-DESCRIPTION=Freetype 2 based TrueType font to TeX's PK format converter
-EAPI=5
-HOMEPAGE=http://tug.org/texlive/
-KEYWORDS=alpha amd64 arm hppa ~mips ppc ppc64 ~s390 ~sh x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/kpathsea-6.2.1 media-libs/freetype:2 sys-libs/zlib !media-libs/freetype:1 !=dev-texlive/texlive-langcjk-2011*[source]
-SLOT=0
-SRC_URI=mirror://gentoo/texlive-20150521-source.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=47e34eeffeeec838cc481a10316c1ea2
diff --git a/app-text/ttf2pk2-2.0_p20160523 b/app-text/ttf2pk2-2.0_p20160523
deleted file mode 100644
index be4e7d9aa26c..000000000000
--- a/app-text/ttf2pk2-2.0_p20160523
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=>=dev-libs/kpathsea-6.2.1 media-libs/freetype:2 sys-libs/zlib !media-libs/freetype:1 !=dev-texlive/texlive-langcjk-2011*[source] app-arch/xz-utils virtual/pkgconfig
-DESCRIPTION=Freetype 2 based TrueType font to TeX's PK format converter
-EAPI=5
-HOMEPAGE=http://tug.org/texlive/
-KEYWORDS=alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/kpathsea-6.2.1 media-libs/freetype:2 sys-libs/zlib !media-libs/freetype:1 !=dev-texlive/texlive-langcjk-2011*[source]
-SLOT=0
-SRC_URI=mirror://gentoo/texlive-20160523-source.tar.xz
-_md5_=28bbd0e0dbd57847f12440e7ce4a0008
diff --git a/app-text/ttf2pk2-2.0_p20170524 b/app-text/ttf2pk2-2.0_p20170524
deleted file mode 100644
index 3bf54bc8e564..000000000000
--- a/app-text/ttf2pk2-2.0_p20170524
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=>=dev-libs/kpathsea-6.2.1 media-libs/freetype:2 sys-libs/zlib !media-libs/freetype:1 !=dev-texlive/texlive-langcjk-2011*[source] app-arch/xz-utils virtual/pkgconfig
-DESCRIPTION=Freetype 2 based TrueType font to TeX's PK format converter
-EAPI=5
-HOMEPAGE=http://tug.org/texlive/
-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 ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/kpathsea-6.2.1 media-libs/freetype:2 sys-libs/zlib !media-libs/freetype:1 !=dev-texlive/texlive-langcjk-2011*[source]
-SLOT=0
-SRC_URI=mirror://gentoo/texlive-20170524-source.tar.xz
-_md5_=53d86c0c537bba7cafd5eff00d4e0c3e
diff --git a/app-text/ttf2pk2/Manifest b/app-text/ttf2pk2/Manifest
new file mode 100644
index 000000000000..a4df2cea042f
--- /dev/null
+++ b/app-text/ttf2pk2/Manifest
@@ -0,0 +1,7 @@
+DIST texlive-20150521-source.tar.xz 45459552 BLAKE2B 639eaee7c9dd173e5ede9f157ccd9a9655ee55cabf232985915f10afa36dce618b8b78848e5d9853bf0f96f818d03d68fa17d8abcdc4d1a1349fe13dfe3a1ddc SHA512 9d06bb88c489715787ce619c4c6b5e2d4251e1db8d48ae7fe2d1a253634c76bc6d7282ef9c93c77847845cae01eafb58dfb37ba3fb83a6d223f0d7fe8f5d3855
+DIST texlive-20160523-source.tar.xz 45941100 BLAKE2B 8752212d41d6bbabc725d9b1dcc187dd4dbb34df4271c768e83c13a2dd4e7170aa162d01a15d87fa02bc1b5abee648a2d35e3aa1380569851cc21d6f33f2f109 SHA512 915fa2f5e2099dd385ef81033db7aafdf09558c0c200fed0748a8a42fd61f69d3eaac9decea334e30981af739dd81061a9b1d6853c7f6d00285fe0be40e26c3e
+DIST texlive-20170524-source.tar.xz 63483372 BLAKE2B 44669d1228f5be27e9d93672a4f4ead40f7f4c6cf386f2db6fef54d64f8b8a743a485fe1170904d8117b9745f71ec77db8434caa6cdd79359b1f3f387130a3b4 SHA512 18c18940992ab94ce22e22ccd4ad798253ea14ac2ab296a10ea5e9a8da9f33989f2e2641b42b564d1d5fb53bd371da3e68726b676d706b469016ad146cd19daa
+EBUILD ttf2pk2-2.0_p20150521.ebuild 1380 BLAKE2B 8a332fc015d1e328b342328096e173d90b4652b3e29ee5f235661741e350404edc9eebd919dbc7fb8d2607da798e333eec8b4dd714967296f96dbd51b2896872 SHA512 86c034a1d85d74894efb55ad7b6aca38606f8291d58d993dbe17c124e44cd71bce7b8aed5e4264e45ce4d8b43ce8e8e6108f42820d86e23448f62f7576219065
+EBUILD ttf2pk2-2.0_p20160523.ebuild 1251 BLAKE2B eb840feed846e552a3202b42db5872d26c19949be4444ec538470e02ce1da85a2a3e2f3cd03e0d1e81f0282978cb86b3282310ca8865b576c6be4eadb393e0b9 SHA512 aa1cfe98ed451aaa6066e4815698113ea0e925b4361eb50ebb51935089f26ac438e511eb06d74dc7c7737981422718a4e4fe67b5aaa839594d617f0c488296d8
+EBUILD ttf2pk2-2.0_p20170524.ebuild 1258 BLAKE2B 0b9a5df0cf464b4cbed18f288838f6336da5b97e1782cddb8f08033f5563b91a85a9dd5c9086731c7d0487f007e6ba4a14d9b8c59f851914c1046aa3ae54ff6b SHA512 f7835f1824b8a9550482e6a2d3ea59c7baa400067c68584a7e42b78ea06e4feb32884d634ed3416a28faf5ecf7cbc49704ed7b169d399d621ced3b3907ba2588
+MISC metadata.xml 245 BLAKE2B ee3a163cfe0a4bc59c0dfb46f9ddb580e2d259b4d0e33cb4e684eb9e6d4b901bf97c6edd891f3b75a613a782f1b89318d0ee3ec9bee4e34c4441d9e8f4267678 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690
diff --git a/app-text/ttf2pk2/metadata.xml b/app-text/ttf2pk2/metadata.xml
new file mode 100644
index 000000000000..13170c3184d8
--- /dev/null
+++ b/app-text/ttf2pk2/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>tex@gentoo.org</email>
+	<name>Gentoo TeX Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-text/ttf2pk2/ttf2pk2-2.0_p20150521.ebuild b/app-text/ttf2pk2/ttf2pk2-2.0_p20150521.ebuild
new file mode 100644
index 000000000000..c9c06857c63c
--- /dev/null
+++ b/app-text/ttf2pk2/ttf2pk2-2.0_p20150521.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Freetype 2 based TrueType font to TeX's PK format converter"
+HOMEPAGE="http://tug.org/texlive/"
+SRC_URI="mirror://gentoo/texlive-${PV#*_p}-source.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ~mips ppc ppc64 ~s390 ~sh x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+# Note about blockers: it is a freetype2 based replacement for ttf2pk and
+# ttf2tfm from freetype1, so block freetype1.
+# It installs some data that collides with
+# dev-texlive/texlive-langcjk-2011[source]. Hope it'd be fixed with 2012,
+# meanwhile we can start dropping freetype1.
+RDEPEND=">=dev-libs/kpathsea-6.2.1
+		media-libs/freetype:2
+		sys-libs/zlib
+		!media-libs/freetype:1
+		!=dev-texlive/texlive-langcjk-2011*[source]"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	virtual/pkgconfig"
+
+S=${WORKDIR}/texlive-${PV#*_p}-source/texk/${PN}
+
+src_configure() {
+	has_version '>=dev-libs/kpathsea-6.2.1' && append-cppflags "$($(tc-getPKG_CONFIG) --cflags kpathsea)"
+	econf --with-system-kpathsea \
+		--with-system-freetype2 \
+		--with-system-zlib
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc BUGS README TODO ChangeLog
+}
diff --git a/app-text/ttf2pk2/ttf2pk2-2.0_p20160523.ebuild b/app-text/ttf2pk2/ttf2pk2-2.0_p20160523.ebuild
new file mode 100644
index 000000000000..11ba85c82e21
--- /dev/null
+++ b/app-text/ttf2pk2/ttf2pk2-2.0_p20160523.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="Freetype 2 based TrueType font to TeX's PK format converter"
+HOMEPAGE="http://tug.org/texlive/"
+SRC_URI="mirror://gentoo/texlive-${PV#*_p}-source.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+# Note about blockers: it is a freetype2 based replacement for ttf2pk and
+# ttf2tfm from freetype1, so block freetype1.
+# It installs some data that collides with
+# dev-texlive/texlive-langcjk-2011[source]. Hope it'd be fixed with 2012,
+# meanwhile we can start dropping freetype1.
+RDEPEND=">=dev-libs/kpathsea-6.2.1
+		media-libs/freetype:2
+		sys-libs/zlib
+		!media-libs/freetype:1
+		!=dev-texlive/texlive-langcjk-2011*[source]"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	virtual/pkgconfig"
+
+S=${WORKDIR}/texlive-${PV#*_p}-source/texk/${PN}
+
+src_configure() {
+	econf --with-system-kpathsea \
+		--with-system-freetype2 \
+		--with-system-zlib
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc BUGS README TODO ChangeLog
+}
diff --git a/app-text/ttf2pk2/ttf2pk2-2.0_p20170524.ebuild b/app-text/ttf2pk2/ttf2pk2-2.0_p20170524.ebuild
new file mode 100644
index 000000000000..fd53f7c7ce9f
--- /dev/null
+++ b/app-text/ttf2pk2/ttf2pk2-2.0_p20170524.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="Freetype 2 based TrueType font to TeX's PK format converter"
+HOMEPAGE="http://tug.org/texlive/"
+SRC_URI="mirror://gentoo/texlive-${PV#*_p}-source.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+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 ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+# Note about blockers: it is a freetype2 based replacement for ttf2pk and
+# ttf2tfm from freetype1, so block freetype1.
+# It installs some data that collides with
+# dev-texlive/texlive-langcjk-2011[source]. Hope it'd be fixed with 2012,
+# meanwhile we can start dropping freetype1.
+RDEPEND=">=dev-libs/kpathsea-6.2.1
+		media-libs/freetype:2
+		sys-libs/zlib
+		!media-libs/freetype:1
+		!=dev-texlive/texlive-langcjk-2011*[source]"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	virtual/pkgconfig"
+
+S=${WORKDIR}/texlive-${PV#*_p}-source/texk/${PN}
+
+src_configure() {
+	econf --with-system-kpathsea \
+		--with-system-freetype2 \
+		--with-system-zlib
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc BUGS README TODO ChangeLog
+}
diff --git a/app-text/ttf2pt1-3.4.4-r1 b/app-text/ttf2pt1-3.4.4-r1
deleted file mode 100644
index bb1a2608ea8b..000000000000
--- a/app-text/ttf2pt1-3.4.4-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=>=media-libs/freetype-2.5.1:2
-DESCRIPTION=True Type Font to Postscript Type 1 Converter
-EAPI=5
-HOMEPAGE=http://ttf2pt1.sourceforge.net/
-KEYWORDS=amd64 ppc sparc x86
-LICENSE=ttf2pt1
-RDEPEND=>=media-libs/freetype-2.5.1:2
-SLOT=0
-SRC_URI=mirror://sourceforge/ttf2pt1/ttf2pt1-3.4.4.tgz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9b08c56327fb9591fcda117b79f7e899
diff --git a/app-text/ttf2pt1/Manifest b/app-text/ttf2pt1/Manifest
new file mode 100644
index 000000000000..e8d08ed13ade
--- /dev/null
+++ b/app-text/ttf2pt1/Manifest
@@ -0,0 +1,7 @@
+AUX ttf2pt1-3.4.0-man-pages.diff 1441 BLAKE2B 20257cf4dc9499641378ed32494577eb0a09dfe485acd7ff92d6e1f620651f07b5ad6fc928158a1bd9935fbae470f673b0acefb1ced83f29911982ddd32109e2 SHA512 af4d6a11db15fc7113bcd3872682899400de01cc97169d0027fe4457c8c9abf02c8b7f93c0ae5783ab05964c4816087118686f3e8195a0ff4d6b5eae41df3b0f
+AUX ttf2pt1-3.4.4-LDFLAGS.patch 933 BLAKE2B 278e8baf471727bb191b4cea97691982f454e978dc1d8533ba35d10cb979c107bba8665f21123a3cd8ab75db0e7efd76032ce60045dc05abcc4219569608d0d5 SHA512 b0d292828a71a3f4668e7ce3d177b45030fd7739b9a10fc37ab6788f2a34e4bfdcb2730086592ca5b17071c34b1b3e448642e6fcdc721e5f6e8c0b67511859bf
+AUX ttf2pt1-3.4.4-Makefile.patch 2911 BLAKE2B f155d19c1a60a524c18f33b09a0c1c73b2cf7b0d2ded90eaa8b23cbc861cb7eb888f77ee6a1217ae2f6043835ebb3bdaab7bc67238d5d6504e6c412738340891 SHA512 a1bb5f9f2b7517d09bf093b12ac99bfcc517546568fce395aad430de06128b3f3d62e153bdcef249738392676bc21a3e26cbdd1a42203093c56ce8ee035757eb
+AUX ttf2pt1-3.4.4-freetype.patch 378 BLAKE2B 03adca507ae8b2556c20dd32c73a302bcb7d5793cb040c706a1e6d86de9f3eb55e8df85a578a2a9fa4cbb3216d50129d33548a7b3472bd7df5417e6a0f6b9b8c SHA512 93cdd2cb660a9416d30189e0ef1e14c97ca686efa2902d8617aec585040ff74b7bea6354296a99600096d1c73acda085217264d5d07e716f2d90a457ea4e9669
+DIST ttf2pt1-3.4.4.tgz 230547 BLAKE2B 58904765afad396692263d9f50017d299828ae847a254bf6a580a0a259dcd03da3d9a97fe370a53a936e70188dab3c96cf0f0ab9069474eef92b9fd31862e455 SHA512 ff2b41b0d54c2feb8565c4bcf9fbc2ce799aa6228815c2787e26127f6c0ca380114b3ab7a12fa50a52279a3452bcb91dbad5c661e83078f25036f69a4d1cf014
+EBUILD ttf2pt1-3.4.4-r1.ebuild 1062 BLAKE2B 77f768d23a2b22649425a746d2b993a28951090569566a298fbd0b37bfaa0a1ea18c7ca2b540c0636f40fab385db85b8babb334ddedaae4521801643c38c640d SHA512 b57372e8fde2440219d85eae0898775c2f73115788a7f0e168dc4907b5aa97b45e10a88d80d1c1c883fff989b071fbe90b506d078d9546b9874ddb046ff77088
+MISC metadata.xml 315 BLAKE2B e2eecb62a8d7f8a509b9b09a251e32bf3129a9c5205ea5574271fb6660226d14f4a1870481b053690d9794cef6e239051a05075586ec7e38ff6bd5219e9d537b SHA512 2061dd88c2b81b9ac8c6f55bf10f39908f457741f14b4e949563b9195a3e5a09724ed585569acd5426bf0f95d740abdd1a4a61301f970814c7cf6e45f960a9e3
diff --git a/app-text/ttf2pt1/files/ttf2pt1-3.4.0-man-pages.diff b/app-text/ttf2pt1/files/ttf2pt1-3.4.0-man-pages.diff
new file mode 100644
index 000000000000..2d301244272c
--- /dev/null
+++ b/app-text/ttf2pt1/files/ttf2pt1-3.4.0-man-pages.diff
@@ -0,0 +1,39 @@
+diff -ur ttf2pt1-3.4.0.orig/ttf2pt1.1 ttf2pt1-3.4.0/ttf2pt1.1
+--- ttf2pt1-3.4.0.orig/ttf2pt1.1	2001-11-25 00:58:11.000000000 +0000
++++ ttf2pt1-3.4.0/ttf2pt1.1	2006-08-15 19:15:37.129672839 +0000
+@@ -109,7 +109,8 @@
+ ..
+ .\" @(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2
+ .	\" AM - accent mark definitions
+-.bd B 3
++''' Next line commented because it garbles bold font when viewed with man-1.6
++'''.bd B 3
+ .	\" fudge factors for nroff and troff
+ .if n \{\
+ .	ds #H 0
+diff -ur ttf2pt1-3.4.0.orig/ttf2pt1_convert.1 ttf2pt1-3.4.0/ttf2pt1_convert.1
+--- ttf2pt1-3.4.0.orig/ttf2pt1_convert.1	2001-11-25 00:58:13.000000000 +0000
++++ ttf2pt1-3.4.0/ttf2pt1_convert.1	2006-08-15 19:16:14.369517359 +0000
+@@ -109,7 +109,8 @@
+ ..
+ .\" @(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2
+ .	\" AM - accent mark definitions
+-.bd B 3
++''' Next line commented because it garbles bold font when viewed with man-1.6
++'''.bd B 3
+ .	\" fudge factors for nroff and troff
+ .if n \{\
+ .	ds #H 0
+diff -ur ttf2pt1-3.4.0.orig/ttf2pt1_x2gs.1 ttf2pt1-3.4.0/ttf2pt1_x2gs.1
+--- ttf2pt1-3.4.0.orig/ttf2pt1_x2gs.1	2001-11-25 00:58:13.000000000 +0000
++++ ttf2pt1-3.4.0/ttf2pt1_x2gs.1	2006-08-15 19:16:30.770568473 +0000
+@@ -109,7 +109,8 @@
+ ..
+ .\" @(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2
+ .	\" AM - accent mark definitions
+-.bd B 3
++''' Next line commented because it garbles bold font when viewed with man-1.6
++'''.bd B 3
+ .	\" fudge factors for nroff and troff
+ .if n \{\
+ .	ds #H 0
diff --git a/app-text/ttf2pt1/files/ttf2pt1-3.4.4-LDFLAGS.patch b/app-text/ttf2pt1/files/ttf2pt1-3.4.4-LDFLAGS.patch
new file mode 100644
index 000000000000..3d03e03e14ca
--- /dev/null
+++ b/app-text/ttf2pt1/files/ttf2pt1-3.4.4-LDFLAGS.patch
@@ -0,0 +1,22 @@
+diff --git a/Makefile b/Makefile
+index 2616d46..cf72cba 100644
+--- a/Makefile
++++ b/Makefile
+@@ -179,7 +179,7 @@ app/RPM/ttf2pt1.spec: app/RPM/ttf2pt1.spec.src version.h
+ 	sed 's/^Version:.*/Version: '`grep TTF2PT1_VERSION version.h| cut -d\" -f2`'/' <app/RPM/ttf2pt1.spec.src  >$@
+ 
+ t1asm: t1asm.c
+-	$(CC) $(CFLAGS) -o t1asm -DSTANDALONE t1asm.c $(LIBS)
++	$(CC) $(CFLAGS) -o t1asm -DSTANDALONE t1asm.c $(LDFLAGS) $(LIBS)
+ 
+ ttf2pt1.o: ttf2pt1.c ttf.h pt1.h global.h version.h
+ 	$(CC) $(CFLAGS) -c ttf2pt1.c
+@@ -203,7 +203,7 @@ runt1asm.o: runt1asm.c global.h
+ 	$(CC) $(CFLAGS) $(CFLAGS_EXTT1ASM) -c runt1asm.c
+ 
+ ttf2pt1:	ttf2pt1.o pt1.o runt1asm.o ttf.o ft.o bdf.o bitmap.o
+-	$(CC) $(CFLAGS) -o ttf2pt1 ttf2pt1.o pt1.o runt1asm.o ttf.o ft.o bdf.o bitmap.o $(LIBS)
++	$(CC) $(CFLAGS) -o ttf2pt1 ttf2pt1.o pt1.o runt1asm.o ttf.o ft.o bdf.o bitmap.o $(LDFLAGS) $(LIBS)
+ 
+ CHANGES: CHANGES.html
+ 	scripts/unhtml <CHANGES.html >CHANGES
diff --git a/app-text/ttf2pt1/files/ttf2pt1-3.4.4-Makefile.patch b/app-text/ttf2pt1/files/ttf2pt1-3.4.4-Makefile.patch
new file mode 100644
index 000000000000..6c760f43dd21
--- /dev/null
+++ b/app-text/ttf2pt1/files/ttf2pt1-3.4.4-Makefile.patch
@@ -0,0 +1,82 @@
+diff -Naur ttf2pt1-3.4.4-orig/Makefile ttf2pt1-3.4.4/Makefile
+--- ttf2pt1-3.4.4-orig/Makefile	2007-07-15 20:06:50.000000000 -0600
++++ ttf2pt1-3.4.4/Makefile	2007-07-15 20:12:40.000000000 -0600
+@@ -9,7 +9,7 @@
+ #
+ # Use GNU C even if it's not the default compiler
+ #
+-#CC=gcc
++CC=gcc
+ #
+ # Use the standard ANSI C compiler on HP-UX even if it's not default
+ #
+@@ -60,18 +60,18 @@
+ # (if the include and lib directory do not match your installation,
+ # modify them), also uncomment LIBS_FT
+ #
+-#CFLAGS_FT = -DUSE_FREETYPE -I/usr/local/include/freetype2 -I/usr/local/include
++CFLAGS_FT = -DUSE_FREETYPE -I/usr/include/freetype2 -I/usr/include
+ 
+ # 
+ # The FreeType-2 library flags (disabled by default)
+ 
+-LIBS_FT=
++#LIBS_FT=
+ 
+ # To enable use of the FreeType-2 library
+ # (if the include and lib directory do not match your installation,
+ # modify them), also uncomment CFLAGS_FT
+ #
+-#LIBS_FT= -L/usr/local/lib -lfreetype
++LIBS_FT= -L/usr/lib -lfreetype
+ 
+ #
+ # The flags for C compiler for the Autotrace library (disabled by default). 
+@@ -120,18 +120,18 @@
+ # Installation-related stuff
+ # 
+ # The base dir for installation and subdirs in it
+-INSTDIR = /usr/local
++INSTDIR = /usr
+ # for binaries
+ BINDIR = $(INSTDIR)/bin
+ # for binaries of little general interest
+ LIBXDIR = $(INSTDIR)/libexec/ttf2pt1
+ # for scripts, maps/encodings etc.
+ SHAREDIR = $(INSTDIR)/share/ttf2pt1
+-MANDIR = $(INSTDIR)/man
++MANDIR = $(INSTDIR)/share/man
+ 
+ # owner and group of installed files
+ OWNER = root
+-GROUP = bin
++GROUP = root
+ 
+ # After you have configured the Makefile, comment out the following
+ # definition:
+@@ -244,17 +244,19 @@
+ 	chmod -R go-w $(SHAREDIR)
+ 	scripts/inst_file ttf2pt1 $(BINDIR)/ttf2pt1 $(OWNER) $(GROUP) 0755
+ 	[ -f $(BINDIR)/t1asm ] || scripts/inst_file t1asm $(LIBXDIR)/t1asm $(OWNER) $(GROUP) 0755
+-	sed 's|^TTF2PT1_BINDIR=$$|TTF2PT1_BINDIR=$(BINDIR)|;\
+-		s|^TTF2PT1_LIBXDIR=$$|TTF2PT1_LIBXDIR=$(LIBXDIR)|;\
+-		s|^TTF2PT1_SHAREDIR=$$|TTF2PT1_SHAREDIR=$(SHAREDIR)|;' <scripts/convert >cvt.tmp
++	sed -e 's|^TTF2PT1_BINDIR=$$|TTF2PT1_BINDIR=$(BINDIR)|' \
++		-e 's|^TTF2PT1_LIBXDIR=$$|TTF2PT1_LIBXDIR=$(LIBXDIR)|' \
++		-e 's|^TTF2PT1_SHAREDIR=$$|TTF2PT1_SHAREDIR=$(SHAREDIR)|' \
++		<scripts/convert >cvt.tmp
+ 	scripts/inst_file cvt.tmp $(BINDIR)/ttf2pt1_convert $(OWNER) $(GROUP) 0755
+ 	scripts/inst_file cvt.tmp $(SHAREDIR)/scripts/convert $(OWNER) $(GROUP) 0755
+ 	rm cvt.tmp
+ 	scripts/inst_file scripts/x2gs $(BINDIR)/ttf2pt1_x2gs $(OWNER) $(GROUP) 0755
+ 	for i in $(MANS1); do { \
+-		sed 's|TTF2PT1_BINDIR|$(BINDIR)|;\
+-			s|TTF2PT1_LIBXDIR|$(LIBXDIR)|;\
+-			s|TTF2PT1_SHAREDIR|$(SHAREDIR)|;' <$$i >$(MANDIR)/man1/$$i \
++		sed -e 's|TTF2PT1_BINDIR|$(BINDIR)|' \
++			-e 's|TTF2PT1_LIBXDIR|$(LIBXDIR)|' \
++			-e 's|TTF2PT1_SHAREDIR|$(SHAREDIR)|' \
++			<$$i >$(MANDIR)/man1/$$i \
+ 		&& chown $(OWNER) $(MANDIR)/man1/$$i \
+ 		&& chgrp $(GROUP) $(MANDIR)/man1/$$i \
+ 		&& chmod 0644 $(MANDIR)/man1/$$i \
diff --git a/app-text/ttf2pt1/files/ttf2pt1-3.4.4-freetype.patch b/app-text/ttf2pt1/files/ttf2pt1-3.4.4-freetype.patch
new file mode 100644
index 000000000000..8257742ebe59
--- /dev/null
+++ b/app-text/ttf2pt1/files/ttf2pt1-3.4.4-freetype.patch
@@ -0,0 +1,11 @@
+diff -Naur ttf2pt1-3.4.4-orig/ft.c ttf2pt1-3.4.4/ft.c
+--- ttf2pt1-3.4.4-orig/ft.c	2007-07-15 20:23:43.000000000 -0600
++++ ttf2pt1-3.4.4/ft.c	2007-07-15 20:24:02.000000000 -0600
+@@ -12,6 +12,7 @@
+ #include <stdlib.h>
+ #include <ctype.h>
+ #include <sys/types.h>
++#include <ft2build.h>
+ #include <freetype/freetype.h>
+ #include <freetype/ftglyph.h>
+ #include <freetype/ftsnames.h>
diff --git a/app-text/ttf2pt1/metadata.xml b/app-text/ttf2pt1/metadata.xml
new file mode 100644
index 000000000000..7c608c9e66b9
--- /dev/null
+++ b/app-text/ttf2pt1/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>fonts@gentoo.org</email>
+		<name>Fonts</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">ttf2pt1</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/ttf2pt1/ttf2pt1-3.4.4-r1.ebuild b/app-text/ttf2pt1/ttf2pt1-3.4.4-r1.ebuild
new file mode 100644
index 000000000000..ed543c6808a4
--- /dev/null
+++ b/app-text/ttf2pt1/ttf2pt1-3.4.4-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="True Type Font to Postscript Type 1 Converter"
+HOMEPAGE="http://ttf2pt1.sourceforge.net/"
+SRC_URI="mirror://sourceforge/ttf2pt1/${P}.tgz"
+
+LICENSE="ttf2pt1"
+SLOT="0"
+KEYWORDS="amd64 ppc sparc x86"
+IUSE=""
+
+DEPEND=">=media-libs/freetype-2.5.1:2"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-Makefile.patch
+	epatch "${FILESDIR}"/${P}-LDFLAGS.patch
+	epatch "${FILESDIR}"/${PN}-3.4.0-man-pages.diff
+	epatch "${FILESDIR}"/${P}-freetype.patch
+
+	sed -i -e "/^CC=/ { s:gcc:$(tc-getCC): }" Makefile
+	sed -i -e "/^CFLAGS_SYS=/ { s:-O.*$:${CFLAGS}: }" Makefile
+	sed -i -e "/^LIBS_FT=/ { s:-L/usr/lib:-L/usr/$(get_libdir): }" Makefile
+	sed -i -e "/^LIBXDIR =/ { s:libexec:$(get_libdir): }" Makefile
+}
+
+src_install() {
+	emake INSTDIR="${D}"/usr install
+	dodir /usr/share/doc/${PF}
+	pushd "${D}"/usr/share/ttf2pt1 > /dev/null
+	rm -r app other
+	mv [A-Z]* ../doc/${PF}
+	popd > /dev/null
+}
diff --git a/app-text/txt2man-1.5.6 b/app-text/txt2man-1.5.6
deleted file mode 100644
index adaf5e7e44ac..000000000000
--- a/app-text/txt2man-1.5.6
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install
-DESCRIPTION=Scripts to convert regular ASCII text to man pages
-EAPI=4
-HOMEPAGE=http://mvertes.free.fr/
-KEYWORDS=alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
-LICENSE=GPL-2
-RDEPEND=app-shells/bash sys-apps/gawk
-SLOT=0
-SRC_URI=http://mvertes.free.fr/download/txt2man-1.5.6.tar.gz
-_md5_=7b247571a07cab841857635760b41673
diff --git a/app-text/txt2man-1.6.0 b/app-text/txt2man-1.6.0
deleted file mode 100644
index 7a3b5be7c279..000000000000
--- a/app-text/txt2man-1.6.0
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install
-DESCRIPTION=Scripts to convert regular ASCII text to man pages
-EAPI=6
-HOMEPAGE=https://github.com/mvertes/txt2man
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
-LICENSE=GPL-2
-RDEPEND=app-shells/bash sys-apps/gawk
-SLOT=0
-SRC_URI=https://github.com/mvertes/txt2man/archive/txt2man-1.6.0.tar.gz
-_md5_=520093bf5c0396b9e6377bd756684a61
diff --git a/app-text/txt2man/Manifest b/app-text/txt2man/Manifest
new file mode 100644
index 000000000000..1e618ef96b2a
--- /dev/null
+++ b/app-text/txt2man/Manifest
@@ -0,0 +1,5 @@
+DIST txt2man-1.5.6.tar.gz 16293 BLAKE2B f62836aae1d7c1539ca896ce10a404965ba1794bbf06448693b2f138a28e74c69912cd1e693fa1e6cf9402f703decdd6b76cffd8d63276ce313d075a26cb3fb3 SHA512 dd1cb5a6385d75b459fb61c49e0b73e5cafa5af8b11d9b89e5c206a9c5b65e4daac4d0e768c28963aacde772b715cb11ed0e843e42397b2df894a1f68c70ca65
+DIST txt2man-1.6.0.tar.gz 16941 BLAKE2B 4ca7d13bb61b0b65ff47a6a6f37c5035910804cff71f0c6d848105d7ee9b8285fd6433fe019fc075a5b28769df5044a462296ad63514d44a75abc1fa552b64ba SHA512 7ec2cc0bb685d890cf06504d4faacf7a02c5a321963effb71ff63b7310f64f092e666c055c1dbdb699958a62272fe4dc0f31f3947ca6895aa425753a11b75379
+EBUILD txt2man-1.5.6.ebuild 563 BLAKE2B 0d6cfdc51527745c1ca52eb32d144a222e743f298557d25e2926009a9e05c884f3734b9a5a32b1d1d43c2f9eef184fcda4a875c5f2c2cf51b55b2ba8cf02b419 SHA512 c8336a6c3b8843ce7f56c3ca0b434ca754c79c0a86b401493b0635bc664dd51456078a426e45f5de542064b8c7a58faa1c1020694dce4351ca2020b09ec26837
+EBUILD txt2man-1.6.0.ebuild 618 BLAKE2B 5747acfab2f06b2fc9c112421d1edb3b9e9f562f68369e0e0d2a0cd851cf35c54a43a7d556d32a4a98242c139d28b5d30da8297243a4133c93be0da2c151c2a7 SHA512 3e5a7f816554589b1f05afa45952ece830f712dcd0f2ba65fc82c03e9d35def46bd3f7b575930487e84881829bb20ae8f89ca1155e09cd15912a75f629dbdd94
+MISC metadata.xml 387 BLAKE2B 4b40a10bef86f0779b89adf52c3af32f4a1901f94e39e0598c5ef2545d2d8d54ab84c4ae69c3f719d6b52a98ab518f6ff24030cd258bf14d27e5f5fa75f51748 SHA512 818ff43d816da3698c92f6b67ecd02544172ce89b7d5b34219754ddbddb618387813bd10460aab2cacd797e7ad3c03c7f13360bb41d6f190f850bd8e7c0421c4
diff --git a/app-text/txt2man/metadata.xml b/app-text/txt2man/metadata.xml
new file mode 100644
index 000000000000..68e9a0a0461c
--- /dev/null
+++ b/app-text/txt2man/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>radhermit@gentoo.org</email>
+		<name>Tim Harder</name>
+	</maintainer>
+	<longdescription lang="en">
+		Simple shell script that creates a manpage starting from a simple
+		structured text file.
+	</longdescription>
+</pkgmetadata>
diff --git a/app-text/txt2man/txt2man-1.5.6.ebuild b/app-text/txt2man/txt2man-1.5.6.ebuild
new file mode 100644
index 000000000000..5f29e5cbf37f
--- /dev/null
+++ b/app-text/txt2man/txt2man-1.5.6.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+
+DESCRIPTION="Scripts to convert regular ASCII text to man pages"
+HOMEPAGE="http://mvertes.free.fr/"
+SRC_URI="http://mvertes.free.fr/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+IUSE=""
+
+RDEPEND="app-shells/bash
+	sys-apps/gawk"
+
+src_compile() { :; }
+
+src_install() {
+	dobin bookman src2man txt2man
+	doman *.1
+	dodoc Changelog README
+}
diff --git a/app-text/txt2man/txt2man-1.6.0.ebuild b/app-text/txt2man/txt2man-1.6.0.ebuild
new file mode 100644
index 000000000000..52ff0bcf6dc6
--- /dev/null
+++ b/app-text/txt2man/txt2man-1.6.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+DESCRIPTION="Scripts to convert regular ASCII text to man pages"
+HOMEPAGE="https://github.com/mvertes/txt2man"
+SRC_URI="https://github.com/mvertes/txt2man/archive/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+IUSE=""
+
+RDEPEND="app-shells/bash
+	sys-apps/gawk"
+
+S=${WORKDIR}/${PN}-${P}
+
+src_compile() { :; }
+
+src_install() {
+	dobin bookman src2man txt2man
+	doman *.1
+	dodoc Changelog README
+}
diff --git a/app-text/txt2pdbdoc-1.4.4 b/app-text/txt2pdbdoc-1.4.4
deleted file mode 100644
index da7b37a15053..000000000000
--- a/app-text/txt2pdbdoc-1.4.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=prepare
-DEPEND=dev-lang/perl >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Text/HTML to Doc file converter for the Palm Pilot
-EAPI=5
-HOMEPAGE=http://homepage.mac.com/pauljlucas/software/txt2pdbdoc/
-KEYWORDS=amd64 ppc sparc x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl
-SLOT=0
-SRC_URI=http://homepage.mac.com/pauljlucas/software/txt2pdbdoc-1.4.4.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=4aa1f19dd6ee904894807db41c06d037
diff --git a/app-text/txt2pdbdoc/Manifest b/app-text/txt2pdbdoc/Manifest
new file mode 100644
index 000000000000..64ca7fc82dbd
--- /dev/null
+++ b/app-text/txt2pdbdoc/Manifest
@@ -0,0 +1,3 @@
+DIST txt2pdbdoc-1.4.4.tar.gz 77486 BLAKE2B 4c626352863113958815b5d7d2e4ddf25806510bc12a295acaf7064c14c0a33caab2448df349cc177b5073accb7097e88ebfcded8110ab8a7b560ea1ea91d65e SHA512 db3f89b30a99afff79ad54ee600ff661ea750ffd39f0b2dfdb94dade42df930f5890839cd157fc77666887604ce5abc866d127176d2a9a36b4305cf0a30c6c93
+EBUILD txt2pdbdoc-1.4.4.ebuild 546 BLAKE2B e64d9c2aa34fbcf53f1fc7f231551a1eaf67a98d90ccf58ab42752e1127de7e8377eb9227f52a3803ceb0d4347ad9c9119196254fdccaec5fd75056e5ca6a721 SHA512 83c271c644e9c57ecd9bcf983d55b505dee38f3c9fe1c0fdf644c0236140727210ff74665c319060d32d4638a739f732e8db1b5a407d8733f71baaa6387ceb37
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/txt2pdbdoc/metadata.xml b/app-text/txt2pdbdoc/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-text/txt2pdbdoc/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/app-text/txt2pdbdoc/txt2pdbdoc-1.4.4.ebuild b/app-text/txt2pdbdoc/txt2pdbdoc-1.4.4.ebuild
new file mode 100644
index 000000000000..5b2215cf8c73
--- /dev/null
+++ b/app-text/txt2pdbdoc/txt2pdbdoc-1.4.4.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools
+
+DESCRIPTION="Text/HTML to Doc file converter for the Palm Pilot"
+HOMEPAGE="http://homepage.mac.com/pauljlucas/software/txt2pdbdoc/"
+SRC_URI="http://homepage.mac.com/pauljlucas/software/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc sparc x86"
+IUSE=""
+
+DEPEND="dev-lang/perl"
+RDEPEND="${DEPEND}"
+
+DOCS=( AUTHORS README ChangeLog )
+
+src_prepare() {
+	sed -i -e "/^CFLAGS/d" configure.in
+	eautoreconf
+}
diff --git a/app-text/txt2tags-2.6-r1 b/app-text/txt2tags-2.6-r1
deleted file mode 100644
index b7a09301f213..000000000000
--- a/app-text/txt2tags-2.6-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm setup
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk?] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] tk? ( dev-lang/tk ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) emacs? ( virtual/emacs )
-DESCRIPTION=Generate marked up documents (HTML, etc.)from a plain text file with markup
-EAPI=5
-HOMEPAGE=https://txt2tags.org
-IUSE=emacs tk vim-syntax python_targets_python2_7
-KEYWORDS=amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris
-LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[tk?] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] tk? ( dev-lang/tk ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) emacs? ( virtual/emacs )
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=https://txt2tags.googlecode.com/files/txt2tags-2.6.tgz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=321e075b5af2892b47c41ce39d330c04
diff --git a/app-text/txt2tags/Manifest b/app-text/txt2tags/Manifest
new file mode 100644
index 000000000000..22dd79de3f09
--- /dev/null
+++ b/app-text/txt2tags/Manifest
@@ -0,0 +1,4 @@
+AUX 51txt2tags-gentoo.el 214 BLAKE2B f5c5aad466fbc7eaf1ec36dcd4a52a914f1710f10fdce35640391ea4d9599903574967c1a7ab63c66f84ade4443f256d1bc197ec8179a6c3af75f1ec79cdd404 SHA512 e2a76d355c2fb163fc5c9b8013e04240206c8301fe2351fbdbc53d711625121e22cdeb2336488e6bffc355258a6d5dacbd48a2cec2d618dc4db17eebf0496feb
+DIST txt2tags-2.6.tgz 544724 BLAKE2B 9c8c37c6e003c7252276b32bacd373fe9143fdd93fdbc2bf0c23a83e2123c2a9636be5f106d248f2f0ecccd71eb9bc68cf8343557f10a7e6f8deacd8ade975ee SHA512 716e975f45dd304b6fd7d4e5aa8bd12e57c54120d892ae9abe11f1f3b5aeb747d8df0a9ffd34b8b5e6c8d422aac8830477f9a332c9e94040e1aa9946ebfe051e
+EBUILD txt2tags-2.6-r1.ebuild 1674 BLAKE2B 1fd20e256fe9de78c6b5c22e4a29687f7d22d80d25fa528a8f8bd75963144ccf82cf17ecc297e9e56b4f1053ba05b0ca3b6e4c56275694e3e9036a501e7abcea SHA512 a7d13cc9c8ea534b6c1b805051cfa937a379c9f916207be3dad7d86e508afbccf881cf2e5f464652e86d73d59aae3f1150b73fa7f9531c34f6912b3d5694fd69
+MISC metadata.xml 335 BLAKE2B 1852f3f02279c2d959ef2b886fa75f51c98771cf190057de977b730aae4c23941efa4b409b15ff3b859892484bcc559d8467e2b53a815b346b1165ac8af8621c SHA512 257cc7e9d2137e94fdc9d133133ca92b688ac2475a59dd30e1e0b4d548ce399cbf73cbe986f0f816c4be1f84668104e4e90f1257914512987aebb06697282b87
diff --git a/app-text/txt2tags/files/51txt2tags-gentoo.el b/app-text/txt2tags/files/51txt2tags-gentoo.el
new file mode 100644
index 000000000000..0b98bd66b8b2
--- /dev/null
+++ b/app-text/txt2tags/files/51txt2tags-gentoo.el
@@ -0,0 +1,6 @@
+
+;;; txt2tags site-lisp configuration
+
+(add-to-list 'load-path "@SITELISP@")
+(autoload  't2t-mode "txt2tags-mode" "Major mode for editing Txt2Tags files" t)
+(add-to-list 'auto-mode-alist '("\\.t2t\\'" . t2t-mode))
diff --git a/app-text/txt2tags/metadata.xml b/app-text/txt2tags/metadata.xml
new file mode 100644
index 000000000000..f96fe67ab4db
--- /dev/null
+++ b/app-text/txt2tags/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>rafaelmartins@gentoo.org</email>
+		<name>Rafael G. Martins</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="google-code">txt2tags</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/txt2tags/txt2tags-2.6-r1.ebuild b/app-text/txt2tags/txt2tags-2.6-r1.ebuild
new file mode 100644
index 000000000000..701f24a7853a
--- /dev/null
+++ b/app-text/txt2tags/txt2tags-2.6-r1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="tk?"
+
+inherit eutils elisp-common python-single-r1
+
+DESCRIPTION="Generate marked up documents (HTML, etc.)from a plain text file with markup"
+HOMEPAGE="https://txt2tags.org"
+SRC_URI="https://${PN}.googlecode.com/files/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+IUSE="emacs tk vim-syntax"
+
+DEPEND="${PYTHON_DEPS}
+	tk? ( dev-lang/tk )
+	vim-syntax? (
+		|| (
+			app-editors/vim
+			app-editors/gvim
+		)
+	)
+	emacs? ( virtual/emacs )"
+
+RDEPEND="${DEPEND}"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+SITEFILE="51${PN}-gentoo.el"
+
+src_compile() {
+	if use emacs; then
+		elisp-compile extras/txt2tags-mode.el || die "elisp-compile failed"
+	fi
+}
+
+src_install() {
+	dobin txt2tags
+
+	dodoc README ChangeLog*
+	dodoc doc/*.{pdf,t2t}
+	dodoc -r samples extras
+	newman doc/manpage.man txt2tags.1
+
+	# make .po files
+	for pofile in "${S}"/po/*.po; do
+		msgfmt -o ${pofile%%.po}.mo ${pofile}
+	done
+	domo po/*.mo
+
+	# emacs support
+	if use emacs; then
+		elisp-install ${PN} extras/txt2tags-mode.{el,elc}
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/syntax/
+		doins extras/txt2tags.vim || die
+
+		echo 'au BufNewFile,BufRead *.t2t set ft=txt2tags' > "${T}/${PN}.vim"
+		insinto /usr/share/vim/vimfiles/ftdetect
+		doins "${T}/${PN}.vim" || die
+	fi
+
+	python_fix_shebang "${D}"
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/app-text/u2ps-0.8.4 b/app-text/u2ps-0.8.4
deleted file mode 100644
index 026a7361edd8..000000000000
--- a/app-text/u2ps-0.8.4
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install
-DEPEND=>=dev-lang/perl-5.6 dev-perl/Text-CharWidth app-text/ghostscript-gpl
-DESCRIPTION=A text to PostScript converter like a2ps, but supports UTF-8
-EAPI=5
-HOMEPAGE=https://sourceforge.net/projects/u2ps.berlios/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3 GPL-3-with-font-exception free-noncomm
-RDEPEND=>=dev-lang/perl-5.6 dev-perl/Text-CharWidth app-text/ghostscript-gpl
-SLOT=0
-SRC_URI=mirror://sourceforge/project/u2ps.berlios/u2ps-full-0.8.4.tar.gz
-_md5_=d6da2ceb7da098d769e5fedbc43fb797
diff --git a/app-text/u2ps/Manifest b/app-text/u2ps/Manifest
new file mode 100644
index 000000000000..36aaad0abcca
--- /dev/null
+++ b/app-text/u2ps/Manifest
@@ -0,0 +1,3 @@
+DIST u2ps-full-0.8.4.tar.gz 5496922 BLAKE2B 416a206b768328cf1a268b4706578610e6bed45ee7475d52de515e112e51bbfcc777b2f21603826d52da42b9c6a3bd10dd4e95920e77c14e957ad4a6d0888984 SHA512 31e5c22163a934a3e153ec95e2e5dd94ce79f71a72278a386a6446b1dd053161c896344c51b696c37d838eb3f06fa6fe1db6b5daa55812a06467b2525266363e
+EBUILD u2ps-0.8.4.ebuild 875 BLAKE2B 5fc21b3f72b6dd9be481a7d765664e036efd4c61fb9fd22572b11f5926054fe378f10d69dff92a6775d2781180b13f63c8b6d96a7e981a88c111107e6862d26f SHA512 0206ca5f09c6a13d7c222eed5a291a2c79d8b00a1ad27256bdc4db230bae36e5e92708589e70258e7e50e0b52f429cba4e82eff8cbc2e1a7748b4b14a9761797
+MISC metadata.xml 332 BLAKE2B 654f859fb3c02a7f6391f8082b29be0dc37c17bbfa15bf78ae0853194d870c88441e9a834e1f94187336108419664b1454cfa40278845a8b313e050336b74bf5 SHA512 2433cce56c8cbbafd553283de92d91c6bab7224f11543d0a775eeaef116f7f21ff55d822035a7ba06051fe0ebcf90859bcd4e72eb45db0a69116f351e0cd4fe5
diff --git a/app-text/u2ps/metadata.xml b/app-text/u2ps/metadata.xml
new file mode 100644
index 000000000000..5dea58e37729
--- /dev/null
+++ b/app-text/u2ps/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>hwoarang@gentoo.org</email>
+		<name>Markos Chandras</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">u2ps.berlios</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/u2ps/u2ps-0.8.4.ebuild b/app-text/u2ps/u2ps-0.8.4.ebuild
new file mode 100644
index 000000000000..9ba7a301cae0
--- /dev/null
+++ b/app-text/u2ps/u2ps-0.8.4.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="A text to PostScript converter like a2ps, but supports UTF-8"
+HOMEPAGE="https://sourceforge.net/projects/u2ps.berlios/"
+SRC_URI="mirror://sourceforge/project/${PN}.berlios/${PN}-full-${PV}.tar.gz"
+
+LICENSE="GPL-3 GPL-3-with-font-exception free-noncomm"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	>=dev-lang/perl-5.6
+	dev-perl/Text-CharWidth
+	app-text/ghostscript-gpl
+"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"/${PN}-full-${PV}
+
+src_configure() {
+	./configure \
+		--prefix=/usr \
+		--datadir=/usr/share \
+		--mandir=/usr/share/man \
+		--with-perl=/usr/bin/perl \
+		--with-gs=/usr/bin/gs \
+		|| die 'configure failed'
+}
+
+src_compile() {
+	emake
+	emake man
+}
+
+src_install() {
+	emake install DESTDIR="${D}"
+	dodoc README DESIGN
+	doman man/u2ps.1
+}
diff --git a/app-text/unac-1.8.0 b/app-text/unac-1.8.0
deleted file mode 100644
index 44c81958ac37..000000000000
--- a/app-text/unac-1.8.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=virtual/libiconv test? ( dev-lang/perl ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Library and command-line tool for removing accents from characters
-EAPI=5
-HOMEPAGE=http://www.nongnu.org/unac/
-IUSE=static-libs test
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+
-RDEPEND=virtual/libiconv
-SLOT=0
-SRC_URI=mirror://debian/pool/main/u/unac/unac_1.8.0.orig.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=bbd524763bd50603a3c3839c4f45e326
diff --git a/app-text/unac/Manifest b/app-text/unac/Manifest
new file mode 100644
index 000000000000..806f826a4096
--- /dev/null
+++ b/app-text/unac/Manifest
@@ -0,0 +1,5 @@
+AUX unac-1.8.0-automake-1.13.1.patch 950 BLAKE2B 41be5811b494475d0927f6dc8a3581a4f39d15c6bd315921674e8653c0c87bf07b85e9d72c6ef3cae6463852a78b5f084b4a193ec1412369a818b04737f57f2e SHA512 f6f29885b937b4e3dc21379e1e5d81229de9f1a400d24f3ea83a8cd06db822b0dc7bb8fb1dbfce27aac6d2b83834fe7fe15cdbfabfb6d82ee6311079fe7807f5
+AUX unac-1.8.0-debian-gcc-4.4-bug-556379.patch 1454 BLAKE2B af02bd996b41651305b7f958adf87a0901be40b39312951ddfec4b0c973fa95626de115ed33d0ac609a3ef8b1f97e8673fad3c5d6ef09ac5f2744ef415c8609b SHA512 40294181f611a047c25900235d35b231e4026ff0a2759f90e3b74b0b93c97f64162803bcdfa4041652fe39421291248d189046f7e993d0a88606f4e240d04b7e
+DIST unac_1.8.0.orig.tar.gz 281807 BLAKE2B 1c566d75eef70b37cc6e8d4840d5712783ec01e2cf6ed5dc39a10b5da2af2c35928b62a1e6592bae1bb21682c3a0410582158661b4989f0ecbea80220bd256d9 SHA512 770508daabe7f1cf2fdd2c7cb0f88ed6363a091320547e1f5cafc32db6506c18548be98f6c5780757f3dc914c372a27a336865a0cd92c0a5503245fbb25ca3c8
+EBUILD unac-1.8.0.ebuild 1147 BLAKE2B b5c373eff732bd4533b6067caccf6ed1a47cf6e8b3a5af1d46a80ae983c30364ffdadbf5e4798a3d9953963faf2c6f8ab502e4635a1c3495c5853d524ed5caa4 SHA512 43c2ee5eb87b078d087b5f711ad5d8e4265b5dabd28f67ec47c727cfe292c5501d7f0bd2c548d8346bd5a8f52ca9a3ee34b6aa6a7f33103301130dd7d1bbf3b4
+MISC metadata.xml 252 BLAKE2B baab35383a82c344682e5dea4a051cfa3bae507232a5db1ea982f775b85375ce854c0c647c93072eb24d23f5f592405c33c8ea233726fba9f0611aff20b93863 SHA512 4f60eeb0614b560f69085d664d02d29833e1d7a9d0975b3d6b09945df857b97b9a827b73808b1ac354b77367f22035765949ea8bc696193cb08f9bf71176a032
diff --git a/app-text/unac/files/unac-1.8.0-automake-1.13.1.patch b/app-text/unac/files/unac-1.8.0-automake-1.13.1.patch
new file mode 100644
index 000000000000..eaad52a53f14
--- /dev/null
+++ b/app-text/unac/files/unac-1.8.0-automake-1.13.1.patch
@@ -0,0 +1,40 @@
+From 43e4c8788491c378862654933cc6d59d46f571c6 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Mon, 22 Jul 2013 23:07:04 -0400
+Subject: [PATCH] build: modernize for automake-1.14
+
+https://bugs.gentoo.org/show_bug.cgi?id=467618
+---
+ Makefile.am  | 2 +-
+ configure.ac | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index b4c658c..b40192e 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -20,7 +20,7 @@
+ # Documentation
+ #
+ man_MANS = unaccent.1 unac.3
+-INCLUDES = -DUNAC_VERSION=\"$(VERSION)\"
++AM_CPPFLAGS = -DUNAC_VERSION=\"$(VERSION)\"
+ 
+ #
+ # Support programs
+diff --git a/configure.ac b/configure.ac
+index 4a4eab6..444a9d5 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -26,7 +26,7 @@ AC_SUBST(MICRO_VERSION)
+ AM_INIT_AUTOMAKE([unac], $VERSION, nosubst)
+ AC_PREREQ(2.50)
+ 
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS([config.h])
+ 
+ AC_PROG_MAKE_SET
+ 
+-- 
+1.8.3.2
+
diff --git a/app-text/unac/files/unac-1.8.0-debian-gcc-4.4-bug-556379.patch b/app-text/unac/files/unac-1.8.0-debian-gcc-4.4-bug-556379.patch
new file mode 100644
index 000000000000..ca1d50274da6
--- /dev/null
+++ b/app-text/unac/files/unac-1.8.0-debian-gcc-4.4-bug-556379.patch
@@ -0,0 +1,47 @@
+See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=556379
+
+diff -r fd7eb0d70970 unac-1.8.0/unac.c
+--- a/unac-1.8.0/unac.c	Fri Sep 17 10:35:14 2010 +0200
++++ b/unac-1.8.0/unac.c	Fri Sep 17 10:36:07 2010 +0200
+@@ -13873,9 +13873,9 @@
+     *out_lengthp = 0;
+   } else {
+     char* utf16 = 0;
+-    int utf16_length = 0;
++    size_t utf16_length = 0;
+     char* utf16_unaccented = 0;
+-    int utf16_unaccented_length = 0;
++    size_t utf16_unaccented_length = 0;
+   
+     if(convert(charset, utf16be(), in, in_length, &utf16, &utf16_length) < 0) {
+       return -1;
+diff -r fd7eb0d70970 unac-1.8.0/unaccent.c
+--- a/unac-1.8.0/unaccent.c	Fri Sep 17 10:35:14 2010 +0200
++++ b/unac-1.8.0/unaccent.c	Fri Sep 17 10:40:34 2010 +0200
+@@ -90,7 +90,7 @@
+     const char* charset = argv[optind++];
+ 
+     char* unaccented = 0;
+-    int unaccented_length = 0;
++    size_t unaccented_length = 0;
+ 
+     if(optind >= argc) {
+ #define BUFFER_SIZE 10240
+@@ -101,7 +101,7 @@
+ 	  perror("");
+ 	  exit(1);
+ 	}
+-	printf("%.*s", unaccented_length, unaccented);
++	printf("%.*s", (int)unaccented_length, unaccented);
+       }
+     } else {
+       const char* string = argv[optind++];
+@@ -114,7 +114,7 @@
+ 
+       if(debug_level > UNAC_DEBUG_NONE)
+ 	fprintf(stderr, "unaccented version is ");
+-      printf("%.*s\n", unaccented_length, unaccented);
++      printf("%.*s\n", (int)unaccented_length, unaccented);
+ 
+       if(optind < argc) {
+ 	const char* expected = argv[optind++];
diff --git a/app-text/unac/metadata.xml b/app-text/unac/metadata.xml
new file mode 100644
index 000000000000..477cc0e0a286
--- /dev/null
+++ b/app-text/unac/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>tetromino@gentoo.org</email>
+	<name>Alexandre Rostovtsev</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-text/unac/unac-1.8.0.ebuild b/app-text/unac/unac-1.8.0.ebuild
new file mode 100644
index 000000000000..f5dfcb76a2fb
--- /dev/null
+++ b/app-text/unac/unac-1.8.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit autotools eutils
+
+DESCRIPTION="Library and command-line tool for removing accents from characters"
+HOMEPAGE="http://www.nongnu.org/unac/"
+SRC_URI="mirror://debian/pool/main/u/unac/${P/-/_}.orig.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="static-libs test"
+
+RDEPEND="virtual/libiconv"
+DEPEND="${RDEPEND}
+	test? ( dev-lang/perl )"
+
+S="${WORKDIR}/${P}.orig"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-debian-gcc-4.4-bug-556379.patch"
+	epatch "${FILESDIR}/${P}-automake-1.13.1.patch"
+	# otherwise automake will fail
+	touch config.rpath
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable static-libs static)
+}
+
+src_install() {
+	DOCS="AUTHORS ChangeLog NEWS README THANKS"
+	default
+	prune_libtool_files
+}
+
+pkg_postinst() {
+	einfo "Examples of using unaccent from the command line:"
+	einfo "unaccent utf8 été"
+	einfo "echo -e '\\\\0303\\\\0251t\\\\0303\\\\0251' | unaccent utf8"
+	einfo "unaccent ISO-8859-1 < myfile > myfile.unaccent"
+	einfo
+	einfo "See man unaccent and man unac for more information."
+}
diff --git a/app-text/unpaper-6.1-r1 b/app-text/unpaper-6.1-r1
deleted file mode 100644
index bbe8beb65053..000000000000
--- a/app-text/unpaper-6.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=prepare
-DEPEND=dev-libs/libxslt app-text/docbook-xsl-ns-stylesheets virtual/pkgconfig libav? ( >=media-video/libav-10:0=[encode] ) !libav? ( >=media-video/ffmpeg-2:0=[encode] )
-DESCRIPTION=Post-processor for scanned and photocopied book pages
-EAPI=6
-HOMEPAGE=https://www.flameeyes.eu/projects/unpaper
-IUSE=libav test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=libav? ( >=media-video/libav-10:0=[encode] ) !libav? ( >=media-video/ffmpeg-2:0=[encode] )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://www.flameeyes.eu/files/unpaper-6.1.tar.xz
-_md5_=162096926b6ce7f5e2a72f16c739cfd9
diff --git a/app-text/unpaper-9999 b/app-text/unpaper-9999
deleted file mode 100644
index 196da8865758..000000000000
--- a/app-text/unpaper-9999
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=prepare unpack
-DEPEND=dev-libs/libxslt app-text/docbook-xsl-ns-stylesheets virtual/pkgconfig libav? ( >=media-video/libav-10:0=[encode] ) !libav? ( >=media-video/ffmpeg-2:0=[encode] ) >=dev-vcs/git-1.8.2.1[curl] >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Post-processor for scanned and photocopied book pages
-EAPI=6
-HOMEPAGE=https://www.flameeyes.eu/projects/unpaper
-IUSE=libav test
-LICENSE=GPL-2
-RDEPEND=libav? ( >=media-video/libav-10:0=[encode] ) !libav? ( >=media-video/ffmpeg-2:0=[encode] )
-RESTRICT=test
-SLOT=0
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	git-r3	8f6de46b0aa318aea0e8cac62ece098b	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=162096926b6ce7f5e2a72f16c739cfd9
diff --git a/app-text/unpaper/Manifest b/app-text/unpaper/Manifest
new file mode 100644
index 000000000000..491977063db9
--- /dev/null
+++ b/app-text/unpaper/Manifest
@@ -0,0 +1,4 @@
+DIST unpaper-6.1.tar.xz 2655724 BLAKE2B df16261d37d5d493aa640cd940b63f55e90ba091e6028dc11dd0c685ec880a7be202d4056756ef0fa54b48b89f1845b9cf23aceeb87945a1b6a25eec4b7c0915 SHA512 afef705985d3c265672c9e42130acc34befc080c361f3169e299b5110c662d0b9845a9d0ca4fc3aad468f49967ded36fb60ffed296373569dd7337c3cb81e79c
+EBUILD unpaper-6.1-r1.ebuild 887 BLAKE2B 2e03001a8f2f169b862f825b8c044974b061fd72f760b7fd40dcadf64d2d93b10b86a71dda21b70cc00ca4abe6c86173d3a6e27425d6b7ab4fbb99002e808ac0 SHA512 ddf900c742cb27a56e61647d55ba6f16a5167c69cd4ef934934a3c1b3900df82d019d84b434894e970e91164aad77b0c2d92d8c1a861108169fb618d61ee328b
+EBUILD unpaper-9999.ebuild 887 BLAKE2B 2e03001a8f2f169b862f825b8c044974b061fd72f760b7fd40dcadf64d2d93b10b86a71dda21b70cc00ca4abe6c86173d3a6e27425d6b7ab4fbb99002e808ac0 SHA512 ddf900c742cb27a56e61647d55ba6f16a5167c69cd4ef934934a3c1b3900df82d019d84b434894e970e91164aad77b0c2d92d8c1a861108169fb618d61ee328b
+MISC metadata.xml 292 BLAKE2B 5a4427170ed656c135d0cd81f46c3d472e306760c322c95f85e6183eeac77be6036d154791c2ce04ac28473c77974ebd2f26b302e5fa825a6c1db2437b1e6ee0 SHA512 67a23847327391a27c4acbb895e63063fa541de6fdf062887b1aa25a731bf2096e26f26c6cd62720bdc84fcbde256dbe6c9cc44687a7931d5e1a657ea684348a
diff --git a/app-text/unpaper/metadata.xml b/app-text/unpaper/metadata.xml
new file mode 100644
index 000000000000..5c69cff947ef
--- /dev/null
+++ b/app-text/unpaper/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <upstream>
+    <remote-id type="github">Flameeyes/unpaper</remote-id>
+    <bugs-to>https://github.com/Flameeyes/unpaper/issues</bugs-to>
+  </upstream>
+</pkgmetadata>
diff --git a/app-text/unpaper/unpaper-6.1-r1.ebuild b/app-text/unpaper/unpaper-6.1-r1.ebuild
new file mode 100644
index 000000000000..e2d4212348de
--- /dev/null
+++ b/app-text/unpaper/unpaper-6.1-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == *9999 ]]; then
+	EGIT_REPO_URI="https://github.com/Flameeyes/unpaper.git"
+	inherit git-r3 autotools
+else
+	SRC_URI="https://www.flameeyes.eu/files/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Post-processor for scanned and photocopied book pages"
+HOMEPAGE="https://www.flameeyes.eu/projects/unpaper"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="libav test"
+
+RDEPEND="
+	libav? ( >=media-video/libav-10:0=[encode] )
+	!libav? ( >=media-video/ffmpeg-2:0=[encode] )"
+DEPEND="dev-libs/libxslt
+	app-text/docbook-xsl-ns-stylesheets
+	virtual/pkgconfig
+	${RDEPEND}"
+
+# gcc can generate slightly different code that leads to slightly different
+# images. Wait until we get a better testsuite.
+RESTRICT="test"
+
+src_prepare() {
+	default
+	[[ ${PV} == *9999 ]] && eautoreconf
+}
diff --git a/app-text/unpaper/unpaper-9999.ebuild b/app-text/unpaper/unpaper-9999.ebuild
new file mode 100644
index 000000000000..e2d4212348de
--- /dev/null
+++ b/app-text/unpaper/unpaper-9999.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == *9999 ]]; then
+	EGIT_REPO_URI="https://github.com/Flameeyes/unpaper.git"
+	inherit git-r3 autotools
+else
+	SRC_URI="https://www.flameeyes.eu/files/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Post-processor for scanned and photocopied book pages"
+HOMEPAGE="https://www.flameeyes.eu/projects/unpaper"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="libav test"
+
+RDEPEND="
+	libav? ( >=media-video/libav-10:0=[encode] )
+	!libav? ( >=media-video/ffmpeg-2:0=[encode] )"
+DEPEND="dev-libs/libxslt
+	app-text/docbook-xsl-ns-stylesheets
+	virtual/pkgconfig
+	${RDEPEND}"
+
+# gcc can generate slightly different code that leads to slightly different
+# images. Wait until we get a better testsuite.
+RESTRICT="test"
+
+src_prepare() {
+	default
+	[[ ${PV} == *9999 ]] && eautoreconf
+}
diff --git a/app-text/unrtf-0.21.9 b/app-text/unrtf-0.21.9
deleted file mode 100644
index 6bdc4aae2404..000000000000
--- a/app-text/unrtf-0.21.9
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=prepare
-DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Converts RTF files to various formats
-EAPI=5
-HOMEPAGE=https://www.gnu.org/software/unrtf/unrtf.html
-KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris
-LICENSE=GPL-3
-SLOT=0
-SRC_URI=mirror://gnu/unrtf/unrtf-0.21.9.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0c2385ec30143afd322ecf5e50877e8c
diff --git a/app-text/unrtf/Manifest b/app-text/unrtf/Manifest
new file mode 100644
index 000000000000..f43d82d4e09d
--- /dev/null
+++ b/app-text/unrtf/Manifest
@@ -0,0 +1,5 @@
+AUX unrtf-0.21.8-automake-fix.patch 191 BLAKE2B ca81dbbebd8ab2ae786e6291018ecae848ee79a0193c0c176e15052712363f196776b2014a83a2f294d718528588251087c896c87f24335dc4f1fcaf76b926a3 SHA512 7df52c8bc5a6955096fdb3a0e2c151ecec8226c4f703a7d6095f9ca4e4507084b0b0a97b10d853b5da0e27b01bb4e73a6080aec35e5fef14fb015c36bed222ad
+AUX unrtf-0.21.8-iconv-detection.patch 301 BLAKE2B 53d3125d59e44da9c539a13f76d99828be94261e61e367c3582da17cb8625caa75accdd38bfb59b6a7e15a3879ed8ecaf62df3ff26d5e757a86f963ef6c3094f SHA512 57d51baa1160b772896a7fa2ce88c5ea70110d2d7edf6cac121d86849e7352e34ff0cb684161ef9a68e96e886beb6072323c9a66517691e42dce852e04035ca0
+DIST unrtf-0.21.9.tar.gz 828590 BLAKE2B 832ab672265efa8f1ed5dfdcc73e310ef920199db57cc2be5303c7d0c502a15e7027cb9539ee5a27df66e2589d9dce88aac40d465f87d39770de9c4b5d886b8f SHA512 56d279ba8c8c20b8e39705dd4313c2b1607273d02ca2cdaeca5771bdbb3d99c338b816671dba1037961879be8ac6efddcd1af4cecb5c337f899575cae2989c03
+EBUILD unrtf-0.21.9.ebuild 735 BLAKE2B bccc2ee4512c901399b519aea8ebdf0d6de2a5dc6999d15ce2110715d5322b614d804d1815919827b56aeae1737604e848e92f71ca23329ecb788757734ae1e8 SHA512 00130f5ad9a8ea05bd87c1ae43cefe47a5842215dd69d3195fe33af033ffdef6e719b9945e8523189acebe78d2eaddacc1d56f5b441ff730048cf5274c656a8f
+MISC metadata.xml 216 BLAKE2B 20531789dc11e43feee7ec315a0c1c7249fdf73764e29cb7d6db439826e9ff72f24a5cdb8eb7f1ab99bbb41fb6e4226874a1d1fa4185de52598602bb3b0479a3 SHA512 e881b59fe49746eb25ad66c258b41aba501e4eb563129093a3898ea970a20506e7898f7c355cfcf99605234962bf2c77c1309c258b9a2b84ee4302ccb71c9dbd
diff --git a/app-text/unrtf/files/unrtf-0.21.8-automake-fix.patch b/app-text/unrtf/files/unrtf-0.21.8-automake-fix.patch
new file mode 100644
index 000000000000..fdfb52a4637b
--- /dev/null
+++ b/app-text/unrtf/files/unrtf-0.21.8-automake-fix.patch
@@ -0,0 +1,6 @@
+--- unrtf-0.21.8/charmaps/Makefile.am
++++ unrtf-0.21.8/charmaps/Makefile.am
+@@ -1,2 +1,2 @@
+-outputsdir = ${libdir}/${PACKAGE}
++outputsdir = ${pkgdatadir}
+ dist_outputs_DATA = SYMBOL.charmap
diff --git a/app-text/unrtf/files/unrtf-0.21.8-iconv-detection.patch b/app-text/unrtf/files/unrtf-0.21.8-iconv-detection.patch
new file mode 100644
index 000000000000..d5bb142ce558
--- /dev/null
+++ b/app-text/unrtf/files/unrtf-0.21.8-iconv-detection.patch
@@ -0,0 +1,10 @@
+--- unrtf-0.21.8/configure.ac
++++ unrtf-0.21.8/configure.ac
+@@ -46,6 +46,7 @@
+     *-*-cygwin*)	AC_SUBST(LIBS, ["-liconv"]);;
+     *aix*)		AC_SUBST(LIBS, ["-liconv"]);;
+     *-*-darwin*)	AC_SUBST(LIBS, ["-liconv"]);;
++    *-*-solaris*)	AC_SUBST(LIBS, ["-liconv"]);;
+ esac
+ 
+ AC_CONFIG_FILES([Makefile
diff --git a/app-text/unrtf/metadata.xml b/app-text/unrtf/metadata.xml
new file mode 100644
index 000000000000..79d462e85571
--- /dev/null
+++ b/app-text/unrtf/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+  <email>robbat2@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/app-text/unrtf/unrtf-0.21.9.ebuild b/app-text/unrtf/unrtf-0.21.9.ebuild
new file mode 100644
index 000000000000..39b505eb8e6d
--- /dev/null
+++ b/app-text/unrtf/unrtf-0.21.9.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools eutils
+
+DESCRIPTION="Converts RTF files to various formats"
+HOMEPAGE="https://www.gnu.org/software/unrtf/unrtf.html"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
+IUSE=""
+
+src_prepare() {
+	# eautoreconf fails when automake-1.14* is installed. Please check with
+	# next version bump if we still need this workaround.
+	rm aclocal.m4 || die
+
+	epatch "${FILESDIR}"/unrtf-0.21.8-automake-fix.patch
+	epatch "${FILESDIR}"/${PN}-0.21.8-iconv-detection.patch
+	eautoreconf
+}
diff --git a/app-text/uudeview-0.5.20-r2 b/app-text/uudeview-0.5.20-r2
deleted file mode 100644
index 095a4351f62d..000000000000
--- a/app-text/uudeview-0.5.20-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure prepare
-DEPEND=tk? ( dev-lang/tk:0 ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=uu, xx, base64, binhex decoder
-EAPI=5
-HOMEPAGE=http://www.fpx.de/fp/Software/UUDeview/
-IUSE=tk
-KEYWORDS=alpha amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=GPL-2
-RDEPEND=tk? ( dev-lang/tk:0 )
-SLOT=0
-SRC_URI=http://www.fpx.de/fp/Software/UUDeview/download/uudeview-0.5.20.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0538ef15ce6045c8d9a1ad128bf4d01d
diff --git a/app-text/uudeview/Manifest b/app-text/uudeview/Manifest
new file mode 100644
index 000000000000..ee1746422a86
--- /dev/null
+++ b/app-text/uudeview/Manifest
@@ -0,0 +1,9 @@
+AUX uudeview-0.5.20-CVE-2004-2265.patch 1788 BLAKE2B 6ee4cc768f3bab3cb4116c465d10324668e3d885a73359ff1919263843396475524f146fd747fe5748b1bf5bb52c45993c89ba8c4f8718213eb6f63d0c8efab0 SHA512 63ca3c7d98924df1a2a2c08188291cfc24870c8464bc2bb98d47315f2e28ef876cf732598b6410b2875d9875c2463fda51da959b9e1340c32baa2ec64875f46c
+AUX uudeview-0.5.20-CVE-2008-2266.patch 4595 BLAKE2B dd2ba71e43941812472729575f1481be9d93641f1868952385f7d5f69d6c63991b6856becc967d92c1ced93f0b5a68349af43b011de4ab92adacb93232b226c4 SHA512 fe6ffaf4d55f8a367cf8661ee4599f1224b2bdbf1d3659558c024e7c0d9a6ad043d7eb9631f28e4762b39a5b5e2a417b66be9e98efc7e5caeb9a286e239e486e
+AUX uudeview-0.5.20-bugfixes.patch 3575 BLAKE2B 8778f0f08fa8d8c5faabf2721c195505a53369f30d93c494080025e491121a75135f321fe5c0c117e5bfd538a7cb2d82fc64cb5584822dc9f353cd31b168bdf0 SHA512 c5e4126e9457cb94d6f014ba20e2497969a50b84d917bd31529a2a75ae5b1e9990ec946e8f8de7a83ced71e32aea7d62210416d94b765dc860902825ca6b34a3
+AUX uudeview-0.5.20-makefile.patch 895 BLAKE2B b9f2d027b71667ea78bcc9de05b3f20dfe5d04cb037f06633d7846b2f5ecfb5154736d2ff7faab01104039e9ce4b0e8b5f7c89a42f75db670d7ce2b719ed5336 SHA512 65f223af7f06a854746328354bee5f2703b0603b085a5a52a2a49f09528cffe4a4756a5bd63e86fadf266c2cf1d30691dc75661bca79cc7d122329cdf9bb71f0
+AUX uudeview-0.5.20-man.patch 3246 BLAKE2B 390d89a13080798b1ef0f902d92c82df59c10c6bb5b34eb8655ceadade0e31b0e81c100fc3e8908edf6c482c51c2560b90aaff8156b7ca805908036aa8342b77 SHA512 a940d6663563e7a91b35f5350e05b6cb7939f06d7db8767a8a5483dc82477c796a351cc03be9de49bd55513ca0b2e3203cd82c4b834caa54da9c8aae5750136b
+AUX uudeview-0.5.20-rename.patch 1736 BLAKE2B 820e32f9d2fd248ee2748e3f6173994b02074720814ec8adc6a896b72defc29ce24a356626c7bab414c516555547fe04cbaf304a52c9f141b80a836593c8638f SHA512 afb5b72bca70eb7c156584df1b44fa3cbb6cf07da97a79ff6330acb52ff102584b7a382ce779f2f695c9384d017984cabc670d31b243c0e5d916df19c6846439
+DIST uudeview-0.5.20.tar.gz 261574 BLAKE2B bd345144a87e2322c89e185d0fe5f31f1cd1ff8f73a5c5b6e585b79a0b319fcf349f2bb51f814a6d6a81e0e18271b5c37db827ba414007785b1743c64e5efe46 SHA512 d080e9c3940bad7bacd28457f21133056384a01e33ba014de42502d23f81f2c7f5fa7f6c472ce9f37bec2edb8e18d27135bf18426cf2f23188a3683558e1721c
+EBUILD uudeview-0.5.20-r2.ebuild 912 BLAKE2B 9d997326962bb763ab127d3ff492ecd408d956fedc9a2c12dfdca6924273299204da74495f1c5c96d92a77b1403443796d9fb18a40895771d28081eb500c4c37 SHA512 9466c4e4c67a71fb7e05bb4f55684c3646f8ec16c86548ab4735b9088e968db497c077099bf67a812316587a66aa57f734b8007c7f51ee72660b0332905b8f4a
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/uudeview/files/uudeview-0.5.20-CVE-2004-2265.patch b/app-text/uudeview/files/uudeview-0.5.20-CVE-2004-2265.patch
new file mode 100644
index 000000000000..ac1f39410e4b
--- /dev/null
+++ b/app-text/uudeview/files/uudeview-0.5.20-CVE-2004-2265.patch
@@ -0,0 +1,47 @@
++uudeview (0.5.20-2.1) unstable; urgency=low
++
++  * Fix possible (but highly unlikely) race in temporary file generation
++    (CAN-2004-2265), by passing the "x" (O_EXCL) flag to fopen when opening
++    such files. (Closes: #320541)
++
++ -- Steinar H. Gunderson <sesse@debian.org>  Wed, 14 Jun 2006 18:44:05 +0200
++
+
+Index: uudeview-0.5.20/unix/uudeview.c
+===================================================================
+--- uudeview-0.5.20.orig/unix/uudeview.c
++++ uudeview-0.5.20/unix/uudeview.c
+@@ -454,7 +454,7 @@ proc_stdin (void)
+     return 0;
+   }
+ 
+-  if ((target = fopen (stdfile, "wb")) == NULL) {
++  if ((target = fopen (stdfile, "wbx")) == NULL) {
+     fprintf (stderr, "proc_stdin: cannot open temp file %s for writing: %s\n",
+ 	     stdfile, strerror (errno));
+     _FP_free (stdfile);
+Index: uudeview-0.5.20/uulib/uunconc.c
+===================================================================
+--- uudeview-0.5.20.orig/uulib/uunconc.c
++++ uudeview-0.5.20/uulib/uunconc.c
+@@ -1325,9 +1325,9 @@ UUDecode (uulist *data)
+     return UURET_NODATA;
+ 
+   if (data->uudet == PT_ENCODED)
+-    mode = "wt";	/* open text files in text mode */
++    mode = "wtx";	/* open text files in text mode */
+   else
+-    mode = "wb";	/* otherwise in binary          */
++    mode = "wbx";	/* otherwise in binary          */
+ 
+   if ((data->binfile = tempnam (NULL, "uu")) == NULL) {
+     UUMessage (uunconc_id, __LINE__, UUMSG_ERROR,
+@@ -1502,7 +1502,7 @@ UUDecode (uulist *data)
+       progress.action = 0;
+       return UURET_NOMEM;
+     }
+-    if ((datain = fopen (data->binfile, "rb")) == NULL) {
++    if ((datain = fopen (data->binfile, "rbx")) == NULL) {
+       UUMessage (uunconc_id, __LINE__, UUMSG_ERROR,
+ 		 uustring (S_NOT_OPEN_FILE),
+ 		 data->binfile, strerror (uu_errno = errno));
diff --git a/app-text/uudeview/files/uudeview-0.5.20-CVE-2008-2266.patch b/app-text/uudeview/files/uudeview-0.5.20-CVE-2008-2266.patch
new file mode 100644
index 000000000000..ba0de28dcacc
--- /dev/null
+++ b/app-text/uudeview/files/uudeview-0.5.20-CVE-2008-2266.patch
@@ -0,0 +1,166 @@
++uudeview (0.5.20-3.1) unstable; urgency=high
+...
++  * Fixed a classical tempfile symlink attack vulnerability in libuu.
++    Thanks to Nico Golde for the patch. (Closes: #480972)
+...
++ -- Marco d'Itri <md@linux.it>  Wed, 21 May 2008 01:34:35 +0200
+
+Index: uudeview-0.5.20/unix/uudeview.c
+===================================================================
+--- uudeview-0.5.20.orig/unix/uudeview.c
++++ uudeview-0.5.20/unix/uudeview.c
+@@ -443,18 +443,46 @@ proc_stdin (void)
+   FILE *target;
+   size_t bytes;
+   int res;
++#define HAVE_MKSTEMP
++#ifdef HAVE_MKSTEMP
++  int tmpfd;
++  const char *tmpprefix = "uuXXXXXX";
++  char *tmpdir = NULL;
++#endif /* HAVE_MKSTEMP */
+ 
+   if (stdinput) {
+     fprintf (stderr, "proc_stdin: cannot process stdin twice\n");
+     return 0;
+   }
+ 
++#ifdef HAVE_MKSTEMP
++  if ((getuid()==geteuid()) && (getgid()==getegid())) {
++	tmpdir=getenv("TMPDIR");
++  }
++
++  if (!tmpdir) {
++	tmpdir = "/tmp";
++  }
++  stdfile = malloc(strlen(tmpdir)+strlen(tmpprefix)+2);
++
++  if (!stdfile) {
++#else
+   if ((stdfile = tempnam (NULL, "uu")) == NULL) {
++#endif
+     fprintf (stderr, "proc_stdin: cannot get temporary file\n");
+     return 0;
+   }
+ 
++#ifdef HAVE_MKSTEMP
++  strcpy(stdfile, tmpdir);
++  strcat(stdfile, "/");
++  strcat(stdfile, tmpprefix);
++
++  if ((tmpfd = mkstemp(stdfile)) == -1 ||
++	  (target = fdopen(tmpfd, "wbx")) == NULL) {
++#else
+   if ((target = fopen (stdfile, "wbx")) == NULL) {
++#endif
+     fprintf (stderr, "proc_stdin: cannot open temp file %s for writing: %s\n",
+ 	     stdfile, strerror (errno));
+     _FP_free (stdfile);
+Index: uudeview-0.5.20/uulib/uunconc.c
+===================================================================
+--- uudeview-0.5.20.orig/uulib/uunconc.c
++++ uudeview-0.5.20/uulib/uunconc.c
+@@ -1311,6 +1311,12 @@ UUDecode (uulist *data)
+   char *mode, *ntmp;
+   uufile *iter;
+   size_t bytes;
++#define HAVE_MKSTEMP
++#ifdef HAVE_MKSTEMP
++  int tmpfd;
++  const char *tmpprefix = "uuXXXXXX";
++  char *tmpdir = NULL;
++#endif /* HAVE_MKSTEMP */
+ 
+   if (data == NULL || data->thisfile == NULL)
+     return UURET_ILLVAL;
+@@ -1329,13 +1335,35 @@ UUDecode (uulist *data)
+   else
+     mode = "wbx";	/* otherwise in binary          */
+ 
++#ifdef HAVE_MKSTEMP
++  if ((getuid()==geteuid()) && (getgid()==getegid())) {
++	  tmpdir=getenv("TMPDIR");
++  }
++
++  if (!tmpdir) {
++	  tmpdir = "/tmp";
++  }
++  data->binfile = malloc(strlen(tmpdir)+strlen(tmpprefix)+2);
++
++  if (!data->binfile) {
++#else
+   if ((data->binfile = tempnam (NULL, "uu")) == NULL) {
++#endif /* HAVE_MKSTEMP */
+     UUMessage (uunconc_id, __LINE__, UUMSG_ERROR,
+ 	       uustring (S_NO_TEMP_NAME));
+     return UURET_NOMEM;
+   }
+ 
++#ifdef HAVE_MKSTEMP
++  strcpy(data->binfile, tmpdir);
++  strcat(data->binfile, "/");
++  strcat(data->binfile, tmpprefix);
++
++  if ((tmpfd = mkstemp(data->binfile)) == -1 ||
++	  (dataout = fdopen(tmpfd, mode)) == NULL) {
++#else
+   if ((dataout = fopen (data->binfile, mode)) == NULL) {
++#endif /* HAVE_MKSTEMP */
+     /*
+      * we couldn't create a temporary file. Usually this means that TMP
+      * and TEMP aren't set
+@@ -1343,6 +1371,12 @@ UUDecode (uulist *data)
+     UUMessage (uunconc_id, __LINE__, UUMSG_ERROR,
+ 	       uustring (S_WR_ERR_TARGET),
+ 	       data->binfile, strerror (uu_errno = errno));
++#ifdef HAVE_MKSTEMP
++	if (tmpfd != -1) {
++		unlink(data->binfile);
++		close(tmpfd);
++    }
++#endif /* HAVE_MKSTEMP */
+     _FP_free (data->binfile);
+     data->binfile = NULL;
+     uu_errno = errno;
+@@ -1499,7 +1533,13 @@ UUDecode (uulist *data)
+    */
+ 
+   if (data->uudet == BH_ENCODED && data->binfile) {
++#ifdef HAVE_MKSTEMP
++	  ntmp = malloc(strlen(tmpdir)+strlen(tmpprefix)+2);
++
++	  if (ntmp == NULL) {
++#else
+     if ((ntmp = tempnam (NULL, "uu")) == NULL) {
++#endif /* HAVE_MKSTEMP */
+       UUMessage (uunconc_id, __LINE__, UUMSG_ERROR,
+ 		 uustring (S_NO_TEMP_NAME));
+       progress.action = 0;
+@@ -1513,12 +1553,27 @@ UUDecode (uulist *data)
+       free (ntmp);
+       return UURET_IOERR;
+     }
++
++#ifdef HAVE_MKSTEMP
++    strcpy(ntmp, tmpdir);
++    strcat(ntmp, "/");
++    strcat(ntmp, tmpprefix);
++    if ((tmpfd = mkstemp(ntmp)) == -1 ||
++		(dataout = fdopen(tmpfd, "wb")) == NULL) {
++#else
+     if ((dataout = fopen (ntmp, "wb")) == NULL) {
++#endif /* HAVE_MKSTEMP */
+       UUMessage (uunconc_id, __LINE__, UUMSG_ERROR,
+ 		 uustring (S_NOT_OPEN_TARGET),
+ 		 ntmp, strerror (uu_errno = errno));
+       progress.action = 0;
+       fclose (datain);
++#ifdef HAVE_MKSTEMP
++	  if (tmpfd != -1) {
++		  unlink(ntmp);
++		  close(tmpfd);
++	  }
++#endif /* HAVE_MKSTEMP */
+       free   (ntmp);
+       return UURET_IOERR;
+     }
diff --git a/app-text/uudeview/files/uudeview-0.5.20-bugfixes.patch b/app-text/uudeview/files/uudeview-0.5.20-bugfixes.patch
new file mode 100644
index 000000000000..3056dd2af59b
--- /dev/null
+++ b/app-text/uudeview/files/uudeview-0.5.20-bugfixes.patch
@@ -0,0 +1,100 @@
++uudeview (0.5.20-3) unstable; urgency=low
++
++  * Ack NMU.  (closes: Bug#373630)
++  * Don't force overwrite mode if auto-rename enabled.  (closes: Bug#378076)
++  * Don't ignore special chars when parsing MIME.  (closes: Bug#341440)
++  * Fix for #320541 also fixes #242999.  (closes: Bug#242999)
++  * Incorporate suspicious-file patch from Peter Muir.  (closes: Bug#166077)
+...
+
++ -- Chris Hanson <cph@debian.org>  Tue, 15 Aug 2006 00:40:50 -0400
+
+Index: uudeview-0.5.20/unix/uudeview.c
+===================================================================
+--- uudeview-0.5.20.orig/unix/uudeview.c
++++ uudeview-0.5.20/unix/uudeview.c
+@@ -657,9 +657,6 @@ work_comline (int argc, char *argv[])
+     else switch (*(argv[number] + 1)) {
+     case '\0':
+       interact = 0;
+-      if (overwrite == 0) {
+-	overwrite = 1;
+-      }
+       proc_stdin ();
+       break;
+     case 'a':
+@@ -699,10 +696,7 @@ work_comline (int argc, char *argv[])
+ 	fprintf (stderr, "WARNING: cannot interact when reading from stdin\n");
+       }
+       else {
+-	interact  = (*argv[number] == '+') ? 1 : 0;
+-	if (overwrite == 0 && *argv[number] == '-') {
+-	  overwrite = 1;
+-	}
++	interact = (*argv[number] == '+') ? 1 : 0;
+       }
+       break;
+     case 'm':
+@@ -773,6 +767,8 @@ work_comline (int argc, char *argv[])
+       break;
+     }
+   }
++  if (overwrite == 0 && interact == 0 && autoren == 0)
++    overwrite = 1;
+ 
+   return 1;
+ }
+Index: uudeview-0.5.20/uulib/uunconc.c
+===================================================================
+--- uudeview-0.5.20.orig/uulib/uunconc.c
++++ uudeview-0.5.20/uulib/uunconc.c
+@@ -1437,6 +1437,9 @@ UUDecode (uulist *data)
+ 	res = UURET_IOERR;
+ 	break;
+       }
++      UUMessage (uunconc_id, __LINE__, UUMSG_MESSAGE,
++		uustring (S_OPEN_FILE),
++		iter->data->sfname);
+       _FP_strncpy (uugen_fnbuffer, iter->data->sfname, 1024);
+     }
+ 
+Index: uudeview-0.5.20/uulib/uuscan.c
+===================================================================
+--- uudeview-0.5.20.orig/uulib/uuscan.c
++++ uudeview-0.5.20/uulib/uuscan.c
+@@ -387,10 +387,10 @@ ParseValue (char *attribute)
+ 	   *attribute != '(' && *attribute != ')' &&
+ 	   *attribute != '<' && *attribute != '>' &&
+ 	   *attribute != '@' && *attribute != ',' &&
+-	   /* *attribute != ';' && */ *attribute != ':' &&
+-	   *attribute != '\\' &&*attribute != '"' &&
+-	   *attribute != '/' && /* *attribute != '[' &&
+-	   *attribute != ']' && */ *attribute != '?' &&
++	   *attribute != ';' && *attribute != ':' &&
++	   *attribute != '\\' && *attribute != '"' &&
++	   *attribute != '/' && *attribute != '[' &&
++	   *attribute != ']' && *attribute != '?' &&
+ 	   *attribute != '=' && length < 255) {
+       *ptr++ = *attribute++;
+       length++;
+Index: uudeview-0.5.20/uulib/uustring.c
+===================================================================
+--- uudeview-0.5.20.orig/uulib/uustring.c
++++ uudeview-0.5.20/uulib/uustring.c
+@@ -107,6 +107,7 @@ static stringmap messages[] = {
+   { S_MIME_B_NOT_FOUND, "Boundary expected on Multipart message but found EOF" },
+   { S_MIME_MULTI_DEPTH, "Multipart message nested too deep" },
+   { S_MIME_PART_MULTI,  "Handling partial multipart message as plain text" },
++  { S_OPEN_FILE,        "Opened file %s" },
+ 
+   { 0, "" }
+ };
+Index: uudeview-0.5.20/uulib/uustring.h
+===================================================================
+--- uudeview-0.5.20.orig/uulib/uustring.h
++++ uudeview-0.5.20/uulib/uustring.h
+@@ -36,3 +36,4 @@
+ #define S_MIME_B_NOT_FOUND    35
+ #define S_MIME_MULTI_DEPTH    36
+ #define S_MIME_PART_MULTI     37
++#define S_OPEN_FILE           38
diff --git a/app-text/uudeview/files/uudeview-0.5.20-makefile.patch b/app-text/uudeview/files/uudeview-0.5.20-makefile.patch
new file mode 100644
index 000000000000..ed3cdf66374a
--- /dev/null
+++ b/app-text/uudeview/files/uudeview-0.5.20-makefile.patch
@@ -0,0 +1,29 @@
+--- Makefile.in.orig	2015-11-18 13:52:44.173432349 +0300
++++ Makefile.in	2015-11-18 13:53:39.244429093 +0300
+@@ -183,22 +183,22 @@
+ 
+ install: 		$(DOINST)
+ 	-for d in $(MPAGES) ; do \
+-		$(INSTALL_DATA) $(srcdir)/man/$$d $(MANDIR)/man1/$$d ; \
++		$(INSTALL_DATA) $(srcdir)/man/$$d $(DESTDIR)$(MANDIR)/man1/$$d ; \
+ 	done
+ 
+ install-uudeview:	uudeview
+ 	for d in uudeview uuenview ; do \
+-		$(INSTALL_PROGRAM) unix/$$d $(BINDIR)/$$d ; \
++		$(INSTALL_PROGRAM) unix/$$d $(DESTDIR)$(BINDIR)/$$d ; \
+ 	done
+ 
+ install-tcl:		xdeview
+ 	for d in xdeview uuwish ; do \
+-		$(INSTALL_PROGRAM) tcl/$$d $(BINDIR)/$$d ; \
++		$(INSTALL_PROGRAM) tcl/$$d $(DESTDIR)$(BINDIR)/$$d ; \
+ 	done
+ 
+ install-minews:		minews
+ 	for d in minews ; do \
+-		$(INSTALL_PROGRAM) inews/$$d $(BINDIR)/$$d ; \
++		$(INSTALL_PROGRAM) inews/$$d $(DESTDIR)$(BINDIR)/$$d ; \
+ 	done
+ 
+ links:		tcl/config.h unix/config.h uulib/config.h
diff --git a/app-text/uudeview/files/uudeview-0.5.20-man.patch b/app-text/uudeview/files/uudeview-0.5.20-man.patch
new file mode 100644
index 000000000000..b03e15a5a5f2
--- /dev/null
+++ b/app-text/uudeview/files/uudeview-0.5.20-man.patch
@@ -0,0 +1,95 @@
++uudeview (0.5.13-2.1) unstable; urgency=low
+...
++  * Added man page for uuwish(1).
+...
++ -- Roland Rosenfeld <roland@debian.org>  Thu, 16 Sep 1999 18:48:47 +0200
+
+
++Thu Oct 24 22:12:01 1996  Martin Schulze  <joey@finlandia.infodrom.north.de>
+...
++	* Corrected some manpages
+
+Index: uudeview-0.5.20/man/uudeview.1
+===================================================================
+--- uudeview-0.5.20.orig/man/uudeview.1
++++ uudeview-0.5.20/man/uudeview.1
+@@ -164,6 +164,16 @@ delivered in have different subject line
+ verbosity. Normally, the program prints some status messages
+ while reading the input files, which can be very helpful if something
+ should go wrong. Use if these messages disturb you.
++Disables progress bars. See
++.B -n
++option.
++.TP
++.B -v
++(disables Verbosity) Disables verbose messages, i.e. notes are not
++displayed, but does not remove warnings and errors. Is not as quiet as
++the
++.B -q
++(Quiet) option.
+ .TP
+ .B -n
+ No progress bars. Normally, UUDeview prints ASCII bars crawling up
+Index: uudeview-0.5.20/man/uuwish.1
+===================================================================
+--- /dev/null
++++ uudeview-0.5.20/man/uuwish.1
+@@ -0,0 +1,45 @@
++.\" Copyright (c) 1999  Roland Rosenfeld <roland@spinnaker.de>
++.\" changes Copyright (c) 2001  Chris Hanson <cph@debian.org>
++.\"
++.\" This program is free software; you can redistribute it and/or modify
++.\" it under the terms of the GNU General Public License as published by
++.\" the Free Software Foundation; either version 2 of the License, or
++.\" (at your option) any later version.
++.\"
++.\" This program is distributed in the hope that it will be useful,
++.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
++.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++.\" GNU General Public License for more details.
++.\"
++.\" You should have received a copy of the GNU General Public License
++.\" along with this program; if not, write to the Free Software
++.\" Foundation, Inc.,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++.\"
++.\" This manual page is written especially for Debian Linux.
++.\"
++.TH UUWISH 1 "February 2001" "Debian Project" "Debian GNU/Linux"
++.SH NAME
++uuwish \- A minimal wish extended by the UU commands
++.SH SYNOPSIS
++.B uuwish
++is a minimal
++.BR wish (1)
++extended by the UU commands that are available in
++.BR uudeview (1)
++and
++.BR uuenview (1).
++.B uuwish
++isn't meant to be called directly; it is a Tcl/Tk script interpreter,
++which is meant to be used by
++.BR xdeview (1).
++.SH "SEE ALSO"
++.BR xdeview (1),
++.BR uudeview (1),
++.BR uuenview (1),
++.BR wish (1).
++.SH AUTHOR
++.B uuwish
++was written by Frank Pilhofer <fp@informatik.uni-frankfurt.de>.
++.PP
++This manual page was written by Roland Rosenfeld <roland@debian.org>,
++for the Debian GNU/Linux system (but may be used by others).
+Index: uudeview-0.5.20/configure.in
+===================================================================
+--- uudeview-0.5.20.orig/configure.in
++++ uudeview-0.5.20/configure.in
+@@ -607,7 +607,7 @@ if test "x$have_minews" = "xyes" ; then
+ fi
+ if test "x$have_tk" != "xno" ; then
+ 	PROGS="$PROGS xdeview"
+-	MPAGES="$MPAGES xdeview.1"
++	MPAGES="$MPAGES xdeview.1 uuwish.1"
+ 	DOINST="$DOINST install-tcl"
+ fi
+ 
diff --git a/app-text/uudeview/files/uudeview-0.5.20-rename.patch b/app-text/uudeview/files/uudeview-0.5.20-rename.patch
new file mode 100644
index 000000000000..c62c64c70eb3
--- /dev/null
+++ b/app-text/uudeview/files/uudeview-0.5.20-rename.patch
@@ -0,0 +1,57 @@
++uudeview (0.5.19+beta20030413-1) unstable; urgency=low
+...
++  * Use rename() in preference to copy if possible.
++    (closes: Bug#166040)
+...
++ -- Chris Hanson <cph@debian.org>  Sun, 7 Sep 2003 01:05:07 -0400
+
+Index: uudeview-0.5.20/uulib/uulib.c
+===================================================================
+--- uudeview-0.5.20.orig/uulib/uulib.c
++++ uudeview-0.5.20/uulib/uulib.c
+@@ -872,7 +872,10 @@ UUDecodeToTemp (uulist *thefile)
+ }
+ 
+ /*
+- * decode file first to temp file, then copy it to a final location
++ * Decode file first to temp file, then copy it to a final location.
++ * A move is preferable to a copy.  If the file is on the same
++ * partition, no copy is performed.  This is important for large
++ * files.
+  */
+ 
+ int UUEXPORT
+@@ -978,6 +981,12 @@ UUDecodeFile (uulist *thefile, char *des
+     return UURET_IOERR;
+   }
+ 
++  if (rename(thefile->binfile, uugen_fnbuffer) == 0) {
++    fclose(source);
++    close(fildes);
++    goto finish_ok;
++  }
++
+   if ((target = fdopen (fildes, "wb")) == NULL) {
+     progress.action = 0;
+     UUMessage (uulib_id, __LINE__, UUMSG_ERROR,
+@@ -1042,6 +1051,8 @@ UUDecodeFile (uulist *thefile, char *des
+ 	       thefile->binfile,
+ 	       strerror (uu_errno = errno));
+   }
++
++ finish_ok:
+   _FP_free (thefile->binfile);
+   thefile->binfile = NULL;
+   thefile->state  &= ~UUFILE_TMPFILE;
+@@ -1103,9 +1114,9 @@ UUInfoFile (uulist *thefile, void *opaqu
+ 
+   while (!feof (inpfile) && 
+ 	 (uu_fast_scanning || ftell(inpfile) < maxpos)) {
+-    if (_FP_fgets (uugen_inbuffer, 511, inpfile) == NULL)
++    if (_FP_fgets (uugen_inbuffer, 1023, inpfile) == NULL)
+       break;
+-    uugen_inbuffer[511] = '\0';
++    uugen_inbuffer[1023] = '\0';
+ 
+     if (ferror (inpfile))
+       break;
diff --git a/app-text/uudeview/metadata.xml b/app-text/uudeview/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-text/uudeview/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/app-text/uudeview/uudeview-0.5.20-r2.ebuild b/app-text/uudeview/uudeview-0.5.20-r2.ebuild
new file mode 100644
index 000000000000..17446a4e771f
--- /dev/null
+++ b/app-text/uudeview/uudeview-0.5.20-r2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils autotools
+
+DESCRIPTION="uu, xx, base64, binhex decoder"
+HOMEPAGE="http://www.fpx.de/fp/Software/UUDeview/"
+SRC_URI="http://www.fpx.de/fp/Software/UUDeview/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="tk"
+
+RDEPEND="tk? ( dev-lang/tk:0 )"
+DEPEND="${RDEPEND}"
+
+DOCS=( HISTORY INSTALL README )
+
+PATCHES=(
+	"${FILESDIR}/${P}-bugfixes.patch"
+	"${FILESDIR}/${P}-CVE-2004-2265.patch"
+	"${FILESDIR}/${P}-CVE-2008-2266.patch"
+	"${FILESDIR}/${P}-man.patch"
+	"${FILESDIR}/${P}-rename.patch"
+	"${FILESDIR}/${P}-makefile.patch"
+)
+
+src_prepare() {
+	epatch "${PATCHES[@]}"
+
+	mv configure.in configure.ac || die
+
+	epatch_user
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable tk tcl) \
+		$(use_enable tk)
+}
diff --git a/app-text/vilistextum-2.6.9-r1 b/app-text/vilistextum-2.6.9-r1
deleted file mode 100644
index 55e529936e0c..000000000000
--- a/app-text/vilistextum-2.6.9-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare test
-DEPEND=virtual/libiconv >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Html to ascii converter specifically programmed to handle incorrect html
-EAPI=5
-HOMEPAGE=http://bhaak.dyndns.org/vilistextum/
-IUSE=unicode
-KEYWORDS=amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://bhaak.dyndns.org/vilistextum/vilistextum-2.6.9.tar.bz2
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7e9b2702ff3e539491d13ace07be14f2
diff --git a/app-text/vilistextum/Manifest b/app-text/vilistextum/Manifest
new file mode 100644
index 000000000000..d2b23abdc0e0
--- /dev/null
+++ b/app-text/vilistextum/Manifest
@@ -0,0 +1,7 @@
+AUX vilistextum-2.6.9-blockquote.patch 4541 BLAKE2B 231ea3348a4519c5f24160bd17559f1b899f1de853c8649e035824c7055fe39d470572e3fa2fd1009fbc4f798e623afd2b7b69efdbdfd009616a4d32b6300209 SHA512 e5c13e5a500cc893ffbcdacb98e4433b88bc9bf73866e1acd080c83e8927ef647a83aa207e617838f7f3a3bb6783d5fc76ae74924297df2d3fc5b61c24bd97a3
+AUX vilistextum-2.6.9-darwin11.patch 615 BLAKE2B 0bfefb47961cf1752c8251a484d04b20c55196d2c64c2e98bc50caf6842b02960257ff22d7d6f7b04c4a7e97e5c66a6a2f122db24faaae4c7fe326833e57c7c6 SHA512 35aeec20cb7e6ba1668d97f041bbd5b98712589eaaf0ab70a59d3a7df74e0d2e67abbab3a27c7c5ee5f6fe9d61f11610686df3459f0cb401cca03f3f671309ac
+AUX vilistextum-2.6.9-gentoo.diff 763 BLAKE2B bb145aa629084c370281fdb2bd31e763d0c0106bb8aa5c7fc1ee030e837cc0062b9f46ad9d626b88a199c12e6163acc2ab28978eb5cb236c3a212b341a7ad9b9 SHA512 b4c49ff27598cedeb06058d3237ea8ebc59a4df9031818f98b5fb22225733d94b820b892541dbddc38c28c08a62ff6f52ef8278c016522b1db95352653178b21
+AUX vilistextum-2.6.9-prefix.patch 837 BLAKE2B 65aec718915942919f371453af12cbfa74437f999d7c25a49186ed5c02e975c4c10ebf629bc54a8a6fb69b9acc9723a32d4d82b0ee09c039afdc5f0fa8d9370c SHA512 6f913d283542bfea02d062f872dc2471e7ea2bc4c29ddb8893aecb9abeb36e6cc821c393217a92421e6888f7c25aa072bfc16c56a69a40593ed504245d8cd187
+DIST vilistextum-2.6.9.tar.bz2 147743 BLAKE2B 1cf6f187cb277271ddd9946984afb4d59336ea0cd446e62df3593070ccc63b3510a107e2b7e7b8dc757c63e4f5caf3790c7d998b6be325f4d22d2a6b9fea3432 SHA512 ce76a4061b766e4544d1a86986333314a3b6959439ba6995a2977c10b01b0142c524d4b215c3272a1dcfcc4f5b6fda03210de95d65cedecfc6a1c940cedf487d
+EBUILD vilistextum-2.6.9-r1.ebuild 1834 BLAKE2B 393ebec6b3a0dca18b66ce9782232e2d0a83fa15107040096e58d1e54b58c9fcdd6c18f28e5cdb4699e869361c6725ec6e36ff7be0834d0a70b2ea913af7b12a SHA512 7ff7b37ef26ea0cb2d421e8e26091431cedec2808e5bd75844930c5714b00d370fb17e5eab30ab312644b8aed9c0003dacdd5cd1b6f7ac17c5921df94f69f8f7
+MISC metadata.xml 271 BLAKE2B 46146f4bf13e9f4d33435225ec1012dd9bb89b20812963dc50368cab2a60a3c542052cb72f8963cc72074b2c13a5b054c77152de1d108027752601a349bc4ef8 SHA512 3e98f5382cf789992bdfc0f32e6e36eba31944be654c03f2ed9bd00baf56c8b768c256c4f8778d5775d6df38da4afcf8e32b6e6495a1ecfc8e7982c7c8943b1b
diff --git a/app-text/vilistextum/files/vilistextum-2.6.9-blockquote.patch b/app-text/vilistextum/files/vilistextum-2.6.9-blockquote.patch
new file mode 100644
index 000000000000..395d03a7456f
--- /dev/null
+++ b/app-text/vilistextum/files/vilistextum-2.6.9-blockquote.patch
@@ -0,0 +1,113 @@
+Many clients seem to use blockquote tags to flag quotes these days, so
+write them out as quotes, so they remain readable.
+
+--- vilistextum-2.6.9/src/html_tag.c
++++ vilistextum-2.6.9/src/html_tag.c
+@@ -87,8 +87,8 @@
+ 
+ 		else if CMP("P", str)  { start_p(); }
+ 		else if CMP("/P", str) { paragraphen_ende(); }
+-		else if CMP("BLOCKQUOTE", str)  { start_p(); }
+-		else if CMP("/BLOCKQUOTE", str) { paragraphen_ende(); }
++		else if CMP("BLOCKQUOTE", str)  { start_p(); quote++; }
++		else if CMP("/BLOCKQUOTE", str) { paragraphen_ende(); if (quote>0) quote--;}
+ 		else if CMP("Q", str)  { wort_plus_ch('"'); }
+ 		else if CMP("/Q", str) { wort_plus_ch('"'); }
+ 
+--- vilistextum-2.6.9/src/multibyte.h
++++ vilistextum-2.6.9/src/multibyte.h
+@@ -16,6 +16,7 @@
+  #define ATOI(n) wcstoi(n)
+ 
+  #define ONESPACE L" "
++ #define QUOTE L">"
+  #define WORT_PLUS_STRING(str) wort_plus_string(L##str)
+ 
+  #define STRSTR(haystack, needle) wcsstr(haystack, L##needle)
+@@ -40,6 +41,7 @@
+  #define ATOI(n) atoi(n)
+ 
+  #define ONESPACE " "
++ #define QUOTE ">"
+  #define WORT_PLUS_STRING(str) wort_plus_string(str)
+ 
+  #define STRSTR(haystack, needle) strstr(haystack, needle)
+--- vilistextum-2.6.9/src/text.h
++++ vilistextum-2.6.9/src/text.h
+@@ -26,6 +26,7 @@
+ 
+ int tab;
+ int spaces;  
++int quote;
+ 
+ void print_zeile();
+ int is_zeile_empty();
+--- vilistextum-2.6.9/src/text.c
++++ vilistextum-2.6.9/src/text.c
+@@ -28,6 +28,7 @@
+ int breite=76,
+ 	hr_breite=76,
+ 	paragraph=0,
++	quote=0,
+ 
+ 	tab=4,         /* tabulator */
+ 	spaces=0,      /* spaces at beginning of line */
+@@ -325,6 +326,12 @@
+       printf(" z0: zeilen_pos: %d\n",zeilen_pos);
+ #endif
+       print_zeile();
++      if (quote > 0)
++      {
++        i=0;
++        while (i<quote) { zeile_plus_wort(QUOTE,1,1); i++; }
++        zeile_plus_wort(ONESPACE,1,1);
++      }
+       i=0;
+       while (i<spaces) { zeile_plus_wort(ONESPACE,1,1); i++; }
+ 			if (orderedlist>0) { zeile_plus_wort(ONESPACE,1,1); }
+@@ -345,6 +352,12 @@
+       printf(" z2: zeilen_len: %d\n",zeilen_len);
+       printf(" z2: zeilen_pos: %d\n",zeilen_pos);
+ #endif
++      if (quote > 0)
++      {
++        i=0;
++        while (i<quote) { zeile_plus_wort(QUOTE,1,1); i++; }
++        zeile_plus_wort(ONESPACE,1,1);
++      }
+       i=0;
+       while (i<spaces) { zeile_plus_wort(ONESPACE,1,1); i++; }
+ 			if (orderedlist>0) { zeile_plus_wort(ONESPACE,1,1); }
+--- vilistextum-2.6.9/tests/check_utf8
++++ vilistextum-2.6.9/tests/check_utf8
+@@ -9,5 +9,6 @@
+ rm -f utf-8-sampler.output.test
+ ../src/vilistextum utf-8-sampler.html utf-8-sampler.output.test
+ 
+-diff >/dev/null utf-8-sampler.output utf-8-sampler.output.test
++sed 's/^> //' utf-8-sampler.output.test | \
++diff >/dev/null utf-8-sampler.output -
+ 
+--- vilistextum-2.6.9/tests/utf-8-sampler.output
++++ vilistextum-2.6.9/tests/utf-8-sampler.output
+@@ -100,8 +100,8 @@
+ ვეპხის ტყ��ს�ნი შ�თ� რუსთ�ველი
+ 
+ ღმერთსი შემვედრე, ნუთუ კვლ� დ�მხსნ�ს ს�ფლის� შრ�მ�ს�, ცეცხლს, წყ�ლს� დ�
+-მიწ�ს�, ჰ�ერთ� თ�ნ� მრ�მ�ს�; მ�მცნეს ფრთენი დ� �ღვფრინდე, მივჰხვდე მ�ს ჩემს�
+-ნდ�მ�ს�, დღისით დ� ღ�მით ვჰხედვიდე მზის� ელვ�თ� კრთ�მ��ს�.
++მიწ�ს�, ჰ�ერთ� თ�ნ� მრ�მ�ს�; მ�მცნეს ფრთენი დ� �ღვფრინდე, მივჰხვდე მ�ს
++ჩემს� ნდ�მ�ს�, დღისით დ� ღ�მით ვჰხედვიდე მზის� ელვ�თ� კრთ�მ��ს�.
+ 
+ Tamil poetry of Cupiramaniya Paarathiyar: ச�ப�ரமணிய பாரதியார� (1882-1921)
+ 
+@@ -446,7 +446,8 @@
+ д, п, and/or т:
+ 
+  Bulgarian:    [ бгдпт ]    [ бгдпт ]     Мога да �м �тъкло и не ме боли.
+- Russian:  [ бгдпт ]    [ бгдпт ]    Я могу е�ть �текло, �то мне не вредит.
++ Russian:  [ бгдпт ]    [ бгдпт ]    Я могу е�ть �текло, �то мне не
++вредит.
+  Serbian:  [ бгдпт ]    [ бгдпт ]     Могу је�ти �такло а да ми не шкоди.
+ 
+   ------------------------------------------------------------------------
diff --git a/app-text/vilistextum/files/vilistextum-2.6.9-darwin11.patch b/app-text/vilistextum/files/vilistextum-2.6.9-darwin11.patch
new file mode 100644
index 000000000000..bda9f5d39c3e
--- /dev/null
+++ b/app-text/vilistextum/files/vilistextum-2.6.9-darwin11.patch
@@ -0,0 +1,23 @@
+OSX Lion has wcscasecmp, but is not GNU
+
+--- configure.in
++++ configure.in
+@@ -67,6 +67,7 @@
+ dnl Checks for library functions.
+ AC_CHECK_FUNCS(strstr)
+ AC_CHECK_FUNCS(strcasecmp)
++AC_CHECK_FUNCS(wcscasecmp)
+ 
+ dnl create testsuite
+ dnl AC_CONFIG_TESTDIR([tests])
+--- src/html.c
++++ src/html.c
+@@ -40,7 +40,7 @@
+ 	link_inline[DEF_STR_LEN]; /* Link of a HTML-Tag */
+ 
+ /* ------------------------------------------------ */
+-#if defined(MULTIBYTE) && ! defined(__GNU_LIBRARY__)
++#if defined(MULTIBYTE) && ! defined(HAVE_WCSCASECMP)
+ #include <wchar.h>
+ static int wcscasecmp(const wchar_t *s1, const wchar_t *s2)
+ {
diff --git a/app-text/vilistextum/files/vilistextum-2.6.9-gentoo.diff b/app-text/vilistextum/files/vilistextum-2.6.9-gentoo.diff
new file mode 100644
index 000000000000..42db519b080a
--- /dev/null
+++ b/app-text/vilistextum/files/vilistextum-2.6.9-gentoo.diff
@@ -0,0 +1,22 @@
+diff -ur vilistextum-2.6.9/src/Makefile.am vilistextum-2.6.9.new/src/Makefile.am
+--- vilistextum-2.6.9/src/Makefile.am	2006-10-24 01:48:54.000000000 +0700
++++ vilistextum-2.6.9.new/src/Makefile.am	2006-11-20 09:51:24.000000000 +0700
+@@ -6,7 +6,7 @@
+ 											main.c main.h util.c util.h \
+ 											multibyte.h unicode_entities.c unicode_entities.h
+ 
+-AM_CFLAGS = -Wall -O2 -ansi
++AM_CFLAGS = -Wall -ansi
+ AM_LDFLAGS = $(STATIC)
+ 
+ EXTRA_DIST = kilistextum.kaptn
+diff -ur vilistextum-2.6.9/tests/Makefile.am vilistextum-2.6.9.new/tests/Makefile.am
+--- vilistextum-2.6.9/tests/Makefile.am	2004-07-06 19:06:20.000000000 +0700
++++ vilistextum-2.6.9.new/tests/Makefile.am	2006-11-20 09:51:05.000000000 +0700
+@@ -16,5 +16,5 @@
+ 
+ test: check
+ 
+-all: check
++all:
+ 
diff --git a/app-text/vilistextum/files/vilistextum-2.6.9-prefix.patch b/app-text/vilistextum/files/vilistextum-2.6.9-prefix.patch
new file mode 100644
index 000000000000..1ff76250db13
--- /dev/null
+++ b/app-text/vilistextum/files/vilistextum-2.6.9-prefix.patch
@@ -0,0 +1,27 @@
+* don't look in /usr/local
+* try to hack around not being able to use AM_ICONV
+
+--- configure.in.orig	2006-10-23 22:20:19 +0200
++++ configure.in	2010-03-18 19:32:13 +0100
+@@ -21,10 +21,6 @@
+ AC_HEADER_STDC
+ AC_CHECK_HEADERS(getopt.h) 	
+ 
+-dnl add /usr/local
+-CFLAGS="$CFLAGS -I/usr/local/include"
+-LDFLAGS="$LDFLAGS -L/usr/local/lib"
+-
+ dnl checking for options
+ AC_MSG_CHECKING(if --enable-multibyte specified)
+ AC_ARG_ENABLE(multibyte,
+@@ -41,7 +37,9 @@
+ AC_CHECK_HEADERS(iconv.h,,
+ 			AC_MSG_ERROR(Need libiconv or iconv.h for multibyte support))
+ 
+-AC_CHECK_LIB(iconv, iconv,,
++dnl iconv_open_into is implemented only in GNU libiconv and not in other
++dnl iconv implementations
++AC_CHECK_LIB(iconv, libiconv_open_into,,
+ 			AC_MSG_WARN([Generic iconv found but not libiconv. See INSTALL for details]))
+ 
+ dnl setting INTERNAL_LOCALE
diff --git a/app-text/vilistextum/metadata.xml b/app-text/vilistextum/metadata.xml
new file mode 100644
index 000000000000..3e927f8d7480
--- /dev/null
+++ b/app-text/vilistextum/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>shell-tools@gentoo.org</email>
+    <name>Gentoo Shell Tools Project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-text/vilistextum/vilistextum-2.6.9-r1.ebuild b/app-text/vilistextum/vilistextum-2.6.9-r1.ebuild
new file mode 100644
index 000000000000..0f4ac8e6f2e0
--- /dev/null
+++ b/app-text/vilistextum/vilistextum-2.6.9-r1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils autotools
+
+DESCRIPTION="Html to ascii converter specifically programmed to handle incorrect html"
+HOMEPAGE="http://bhaak.dyndns.org/vilistextum/"
+SRC_URI="http://bhaak.dyndns.org/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+#IUSE="unicode kde"
+IUSE="unicode"
+
+DEPEND="virtual/libiconv"
+RDEPEND=""
+# KDE support will be available once a version of kaptain in stable
+#	 kde? ( kde-misc/kaptain )"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}/${P}-gentoo.diff" \
+		"${FILESDIR}/${P}-prefix.patch" \
+		"${FILESDIR}/${P}-darwin11.patch" \
+		"${FILESDIR}/${P}-blockquote.patch"
+	eautoreconf
+}
+
+get_locale() {
+	locale -a | grep -i "$1\.utf.*8\$"
+}
+
+find_locale() {
+	local l t
+
+	# we basically prefer to find en_US.UTF-8, but it may not always be
+	# available, in which case it is better not to hardcode to use it
+	l=$(get_locale en_US)
+	if [[ -z ${l} ]] ; then
+		for t in "en_GB" "en_.*" ".*" ; do
+			l=$(get_locale ${t})
+			if [[ -n ${l} ]] ; then
+				l=${l%%$'\n'*}
+				break;
+			fi
+		done
+	fi
+	[[ -z ${l} ]] && die "Failed to find a unicode locale"
+	echo "${l}"
+}
+
+src_configure() {
+	# need hardwired locale simply because locale -a | grep -i utf-8 | head -n1
+	# isn't always returning the most sensical (and working) locale
+	econf \
+		$(use_enable unicode multibyte) \
+		$(use_with unicode unicode-locale $(find_locale))
+}
+
+src_test() {
+	if $(locale -a | grep -iq "en_US\.utf.*8"); then
+		emake -j1 check
+	else
+		ewarn "If you like to run the test,"
+		ewarn "please make sure en_US.UTF-8 is installed."
+		die "en_US.UTF-8 locale is missing"
+	fi
+}
+
+src_install() {
+	default
+	dohtml doc/*.html
+}
diff --git a/app-text/vlna-1.5 b/app-text/vlna-1.5
deleted file mode 100644
index 32c001f53738..000000000000
--- a/app-text/vlna-1.5
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=Add nonbreakable spaces after some prepositions in Czech texts
-EAPI=0
-HOMEPAGE=http://math.feld.cvut.cz/olsak/cstex/
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=Artistic
-SLOT=0
-SRC_URI=ftp://math.feld.cvut.cz/pub/olsak/vlna/vlna-1.5.tar.gz
-_md5_=e62f43af5b5829d3597a60454f08a3de
diff --git a/app-text/vlna/Manifest b/app-text/vlna/Manifest
new file mode 100644
index 000000000000..8fc87e9f09d1
--- /dev/null
+++ b/app-text/vlna/Manifest
@@ -0,0 +1,3 @@
+DIST vlna-1.5.tar.gz 146670 BLAKE2B a72cae3b276bb0673dca940d15df4ec0af8c292bb08b0a0ed55680d6893a3fbf80de9588bad4698c8c12f056a9a66650a63c100ea3021d7809f57cd2b9b09d19 SHA512 2416fd4183a5be495fa538d05bd8a7514265c4cb68d78aff6f2dfdd4b3c9abc34b6eb829e5adb6fecd20aa5d110ad77d9e0f56f260ac8ced3ea2218cb6cadee2
+EBUILD vlna-1.5.ebuild 668 BLAKE2B 5dfee4328418884380b678baec4e3e9f520ab77a3899d4e68088d87962cdcc13701056231a61d8d1e213515fbbaecb69c3faba479ba21073d09aad641722e0da SHA512 3bc9fb255d1bce5dd58e7663d89eda495bf4ac736b305ec3f481d8d52523618283657129d72cde0b3e14dc1d724a72cc7924838afdb8e2b5786911a111aa17e2
+MISC metadata.xml 245 BLAKE2B ee3a163cfe0a4bc59c0dfb46f9ddb580e2d259b4d0e33cb4e684eb9e6d4b901bf97c6edd891f3b75a613a782f1b89318d0ee3ec9bee4e34c4441d9e8f4267678 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690
diff --git a/app-text/vlna/metadata.xml b/app-text/vlna/metadata.xml
new file mode 100644
index 000000000000..13170c3184d8
--- /dev/null
+++ b/app-text/vlna/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>tex@gentoo.org</email>
+	<name>Gentoo TeX Project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-text/vlna/vlna-1.5.ebuild b/app-text/vlna/vlna-1.5.ebuild
new file mode 100644
index 000000000000..1d3fe39b4857
--- /dev/null
+++ b/app-text/vlna/vlna-1.5.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=0
+
+DESCRIPTION="Add nonbreakable spaces after some prepositions in Czech texts"
+HOMEPAGE="http://math.feld.cvut.cz/olsak/cstex/"
+SRC_URI="ftp://math.feld.cvut.cz/pub/olsak/vlna/${P}.tar.gz"
+
+LICENSE="Artistic"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+
+	dodoc README README.en ChangeLog vlna.txt || die
+	insinto /usr/share/doc/${PF}
+	doins vlna.dvi || die
+}
diff --git a/app-text/wdiff-1.2.2 b/app-text/wdiff-1.2.2
deleted file mode 100644
index 40b3fab8e0f0..000000000000
--- a/app-text/wdiff-1.2.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure test
-DEPEND=sys-apps/diffutils sys-apps/less sys-libs/ncurses test? ( app-misc/screen )
-DESCRIPTION=Create a diff disregarding formatting
-EAPI=5
-HOMEPAGE=https://www.gnu.org/software/wdiff/
-IUSE=experimental test
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris
-LICENSE=GPL-3
-RDEPEND=sys-apps/diffutils sys-apps/less sys-libs/ncurses
-SLOT=0
-SRC_URI=mirror://gnu/wdiff/wdiff-1.2.2.tar.gz
-_md5_=f4a6819db1829db7910a83b97218c4ea
diff --git a/app-text/wdiff-1.2.2-r1 b/app-text/wdiff-1.2.2-r1
deleted file mode 100644
index e2d24faf6c37..000000000000
--- a/app-text/wdiff-1.2.2-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure test
-DEPEND=sys-apps/diffutils sys-apps/less sys-libs/ncurses:0= sys-apps/texinfo test? ( app-misc/screen )
-DESCRIPTION=Create a diff disregarding formatting
-EAPI=6
-HOMEPAGE=https://www.gnu.org/software/wdiff/
-IUSE=experimental test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris
-LICENSE=GPL-3
-RDEPEND=sys-apps/diffutils sys-apps/less sys-libs/ncurses:0=
-SLOT=0
-SRC_URI=mirror://gnu/wdiff/wdiff-1.2.2.tar.gz
-_md5_=d24c4b861ee1c5521c87d0784ef0d3c9
diff --git a/app-text/wdiff/Manifest b/app-text/wdiff/Manifest
new file mode 100644
index 000000000000..6ea27bf836aa
--- /dev/null
+++ b/app-text/wdiff/Manifest
@@ -0,0 +1,4 @@
+DIST wdiff-1.2.2.tar.gz 1478567 BLAKE2B 80de7ecdd8fef1a4c9e6e0830e1af52d5087abc235dbe2bcf7542c0f017c1a21036243162fa6f70e714f3544d74e9a1add70dc22e69f306a17ce9bdd49c5bc15 SHA512 9272c225f4f61612197fe151cf8c913107169ac9fcd6c9f8472a0f56d9124d78a060944cea1b51489ca34311220f23638d043d43c733a3252cdbb7cceb1085ed
+EBUILD wdiff-1.2.2-r1.ebuild 869 BLAKE2B 302d6f9d26eb12219fe1748d0f9a6501d6f3d8a0245c587f0eec8e4843930afca88dd82e29e4767b882e1fb5821f66bf876a11da39e2052581adf8062047bda7 SHA512 88f9319cd22c1da88b666389659dc5b4d22fa40ffbc672961276a58df13a925e5ffe6044b523682a34083dc1882543b01841e2a5feb9b806c3c64d105f9739f7
+EBUILD wdiff-1.2.2.ebuild 839 BLAKE2B 05f9a12ffccb81d5f5aa8a99f604975255b76c95324068a7cf5fbce3411213689bac7becc3f9c6d110a53b81ee65f966272435b4e7559f8a51e14f5d7fb17c71 SHA512 bd6430c5c7ee706d37adc6489ba72d9021b5887e2864f45edfd23cc051340586fac6f79daef740bae11c16ad9b9ce6a54d980a0738bd6cf1965d85248fa91dae
+MISC metadata.xml 377 BLAKE2B ddada9afaa9d6031b4493ad27870959d71c7ad7852399b36468f41c0c11dbd591e0809101927d82a4f80520562b1fb8b65d577086218cc922a7b0e03b761005a SHA512 675191d217533506137aa85c390cbcf2c9683157b451c862701b5ab59d3ca437266243af0cb458f7ee5150fadb444a7eda648091eaa8b4f7e211e0bd98d92c7a
diff --git a/app-text/wdiff/metadata.xml b/app-text/wdiff/metadata.xml
new file mode 100644
index 000000000000..640511937e2f
--- /dev/null
+++ b/app-text/wdiff/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>shell-tools@gentoo.org</email>
+    <name>Gentoo Shell Tools Project</name>
+  </maintainer>
+  <use>
+    <flag name="experimental">Build experimental utilities (mdiff, unify, wdiff2)</flag>
+  </use>
+</pkgmetadata>
diff --git a/app-text/wdiff/wdiff-1.2.2-r1.ebuild b/app-text/wdiff/wdiff-1.2.2-r1.ebuild
new file mode 100644
index 000000000000..88b88f79755c
--- /dev/null
+++ b/app-text/wdiff/wdiff-1.2.2-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Create a diff disregarding formatting"
+HOMEPAGE="https://www.gnu.org/software/wdiff/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+IUSE="experimental test"
+
+RDEPEND="
+	sys-apps/diffutils
+	sys-apps/less
+	sys-libs/ncurses:0="
+DEPEND="${RDEPEND}
+	sys-apps/texinfo
+	test? ( app-misc/screen )"
+
+src_configure() {
+	econf \
+		$(use_enable experimental)
+}
+
+src_test() {
+	# The test suite hangs in the '3: use pager' test
+	# when an incompatible screenrc is found
+	touch tests/screenrc || die
+	export SYSSCREENRC=tests/screenrc SCREENRC=tests/screenrc
+	default
+}
diff --git a/app-text/wdiff/wdiff-1.2.2.ebuild b/app-text/wdiff/wdiff-1.2.2.ebuild
new file mode 100644
index 000000000000..f423a37982c4
--- /dev/null
+++ b/app-text/wdiff/wdiff-1.2.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="Create a diff disregarding formatting"
+HOMEPAGE="https://www.gnu.org/software/wdiff/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+IUSE="experimental test"
+
+RDEPEND="
+	sys-apps/diffutils
+	sys-apps/less
+	sys-libs/ncurses"
+DEPEND="${RDEPEND}
+	test? ( app-misc/screen )"
+
+src_configure() {
+	econf \
+		$(use_enable experimental)
+}
+
+src_test() {
+	# The test suite hangs in the '3: use pager' test
+	# when an incompatible screenrc is found
+	touch tests/screenrc || die
+	export SYSSCREENRC=tests/screenrc SCREENRC=tests/screenrc
+	default
+}
diff --git a/app-text/webgen-1.4.1 b/app-text/webgen-1.4.1
deleted file mode 100644
index 0880445f52c9..000000000000
--- a/app-text/webgen-1.4.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) test? ( dev-ruby/kramdown[ruby_targets_ruby23] dev-ruby/minitest:5[ruby_targets_ruby23] dev-ruby/rdiscount[ruby_targets_ruby23] >=dev-ruby/sass-3.2:*[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) test? ( dev-ruby/kramdown[ruby_targets_ruby24] dev-ruby/minitest:5[ruby_targets_ruby24] dev-ruby/rdiscount[ruby_targets_ruby24] >=dev-ruby/sass-3.2:*[ruby_targets_ruby24] ) ) test? ( ruby_targets_ruby23? ( >=dev-ruby/cmdparse-3.0.1:3[ruby_targets_ruby23] >=dev-ruby/systemu-2.5[ruby_targets_ruby23] >=dev-ruby/kramdown-1.3[ruby_targets_ruby23] builder? ( >=dev-ruby/builder-2.1.0:*[ruby_targets_ruby23] ) highlight? ( >=dev-ruby/coderay-1.0[ruby_targets_ruby23] ) markdown? ( dev-ruby/maruku[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( >=dev-ruby/cmdparse-3.0.1:3[ruby_targets_ruby24] >=dev-ruby/systemu-2.5[ruby_targets_ruby24] >=dev-ruby/kramdown-1.3[ruby_targets_ruby24] builder? ( >=dev-ruby/builder-2.1.0:*[ruby_targets_ruby24] ) highlight? ( >=dev-ruby/coderay-1.0[ruby_targets_ruby24] ) markdown? ( dev-ruby/maruku[ruby_targets_ruby24] ) ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( doc? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
-DESCRIPTION=A template-based static website generator
-EAPI=6
-HOMEPAGE=https://webgen.gettalong.org
-IUSE=builder highlight markdown test elibc_FreeBSD ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~amd64
-LICENSE=GPL-3
-RDEPEND=ruby_targets_ruby23? ( >=dev-ruby/cmdparse-3.0.1:3[ruby_targets_ruby23] >=dev-ruby/systemu-2.5[ruby_targets_ruby23] >=dev-ruby/kramdown-1.3[ruby_targets_ruby23] builder? ( >=dev-ruby/builder-2.1.0:*[ruby_targets_ruby23] ) highlight? ( >=dev-ruby/coderay-1.0[ruby_targets_ruby23] ) markdown? ( dev-ruby/maruku[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( >=dev-ruby/cmdparse-3.0.1:3[ruby_targets_ruby24] >=dev-ruby/systemu-2.5[ruby_targets_ruby24] >=dev-ruby/kramdown-1.3[ruby_targets_ruby24] builder? ( >=dev-ruby/builder-2.1.0:*[ruby_targets_ruby24] ) highlight? ( >=dev-ruby/coderay-1.0[ruby_targets_ruby24] ) markdown? ( dev-ruby/maruku[ruby_targets_ruby24] ) ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby23 ruby_targets_ruby24 )
-SLOT=0
-SRC_URI=mirror://rubygems/webgen-1.4.1.gem
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	28631ba8ae1b3218596c0eb3e38c438e	ruby-ng	c1f44e746d7656dd6e02d8815ff9518a	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72
-_md5_=0cb7ea35037e104188c5a6a2fec3d2ca
diff --git a/app-text/webgen/Manifest b/app-text/webgen/Manifest
new file mode 100644
index 000000000000..08e847ad5567
--- /dev/null
+++ b/app-text/webgen/Manifest
@@ -0,0 +1,3 @@
+DIST webgen-1.4.1.gem 200192 BLAKE2B b52e8bf55fa93776fcd41a35ab495c03e775bb0fb9cfa0f4882ced4556d65403724de09531f80f3b3c51809295fc1abb692b9d709bd3ac65885a22066db83736 SHA512 ee21edbaa6592496101bff5b20b4b3041ac9a313e3ce5a00118f2011797330c5e274d468d2793ca29133d4f7301eda741e25a6f135dc6e2153c04780c2f5332b
+EBUILD webgen-1.4.1.ebuild 1045 BLAKE2B 118cc61a68b0fa5606e9ba1425bd97dc87b12f3eed1247b802e76e7aabd28647fb67e68dd56d3f3511b5b3e45a2b07dbdc0d4a88938fac5bcad75126a9f12fdf SHA512 dec87296386cf1dcd4e57a613c79e166105adb4cfaf315b005bc75ae4873cea5fbf3e37e857d246f34dee4bdb11dc13c505ea98c97340de02f298458ddcbf6ae
+MISC metadata.xml 477 BLAKE2B c8293490729904a1a67e6c0861f6fc01b00190322213b566de36e6a56d474118c32a81a9573bb8e43f433d5eba8d5f111878cda00866a5f1b5fb36e052b779d1 SHA512 d872a0fb051b79b34541fafe549c2283a4a92edd7bad4a97adb1c3124e82820a67c286d04a004cdd2fe132a44ea4f0ec8cc3b335f3a1d91aa8877533a1c278bb
diff --git a/app-text/webgen/metadata.xml b/app-text/webgen/metadata.xml
new file mode 100644
index 000000000000..352da8e8c75e
--- /dev/null
+++ b/app-text/webgen/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
+  <use>
+    <flag name="builder">Enable programmatic HTML/XML generation</flag>
+    <flag name="highlight">Enable syntax highlighting for certain plugins</flag>
+    <flag name="markdown">Markdown support</flag>
+  </use>
+</pkgmetadata>
diff --git a/app-text/webgen/webgen-1.4.1.ebuild b/app-text/webgen/webgen-1.4.1.ebuild
new file mode 100644
index 000000000000..3647485b4e75
--- /dev/null
+++ b/app-text/webgen/webgen-1.4.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby22 ruby23 ruby24"
+
+RUBY_FAKEGEM_DOCDIR="htmldoc/rdoc"
+RUBY_FAKEGEM_EXTRADOC="AUTHORS THANKS"
+RUBY_FAKEGEM_EXTRAINSTALL="data"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A template-based static website generator"
+HOMEPAGE="https://webgen.gettalong.org"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="builder highlight markdown"
+
+ruby_add_bdepend "doc? ( dev-ruby/rdoc )
+	test? ( dev-ruby/kramdown
+		dev-ruby/minitest:5
+		dev-ruby/rdiscount
+		>=dev-ruby/sass-3.2:* )"
+
+ruby_add_rdepend ">=dev-ruby/cmdparse-3.0.1:3
+	>=dev-ruby/systemu-2.5
+	>=dev-ruby/kramdown-1.3
+	builder? ( >=dev-ruby/builder-2.1.0:* )
+	highlight? ( >=dev-ruby/coderay-1.0 )
+	markdown? ( dev-ruby/maruku )"
+
+all_ruby_prepare() {
+	# Avoid a test fragile for sass version differences
+	sed -i -e '/test_static_call/,/^  end/ s:^:#:' test/webgen/content_processor/test_sass.rb || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	doman man/man1/webgen.1
+}
diff --git a/app-text/wgetpaste-2.25-r3 b/app-text/wgetpaste-2.25-r3
deleted file mode 100644
index 750dd3b746e6..000000000000
--- a/app-text/wgetpaste-2.25-r3
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=Command-line interface to various pastebins
-EAPI=5
-HOMEPAGE=http://wgetpaste.zlin.dk/
-KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
-LICENSE=public-domain
-RDEPEND=net-misc/wget
-SLOT=0
-SRC_URI=http://wgetpaste.zlin.dk/wgetpaste-2.25.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f592d6e0b71394295cfeaaa1484a96f4
diff --git a/app-text/wgetpaste-2.28 b/app-text/wgetpaste-2.28
deleted file mode 100644
index 5355935bb885..000000000000
--- a/app-text/wgetpaste-2.28
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=Command-line interface to various pastebins
-EAPI=5
-HOMEPAGE=http://wgetpaste.zlin.dk/
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
-LICENSE=public-domain
-RDEPEND=net-misc/wget
-SLOT=0
-SRC_URI=http://wgetpaste.zlin.dk/wgetpaste-2.28.tar.bz2
-_md5_=eb2ad07fcae794e35d783c57151fef03
diff --git a/app-text/wgetpaste-2.28-r1 b/app-text/wgetpaste-2.28-r1
deleted file mode 100644
index e060173e6787..000000000000
--- a/app-text/wgetpaste-2.28-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=Command-line interface to various pastebins
-EAPI=6
-HOMEPAGE=http://wgetpaste.zlin.dk/
-IUSE=+ssl
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
-LICENSE=public-domain
-RDEPEND=net-misc/wget[ssl?]
-SLOT=0
-SRC_URI=http://wgetpaste.zlin.dk/wgetpaste-2.28.tar.bz2
-_md5_=39dc1907fa8c8f4164efc82c56238105
diff --git a/app-text/wgetpaste/Manifest b/app-text/wgetpaste/Manifest
new file mode 100644
index 000000000000..d6b08bb7742a
--- /dev/null
+++ b/app-text/wgetpaste/Manifest
@@ -0,0 +1,9 @@
+AUX wgetpaste-2.25-pinnwand-raw.patch 463 BLAKE2B 245c70767e886b7dae22fce03695897ef2b3dbde98f72c312488ef04e5be375fc618514cab98ee50fd87d5d8fc347837423aad93a7a197dde372822f1bd3428f SHA512 96add7303eae8c51a6d218fe3ed5de9bae7989d2771ddef0f4569c73c4bb1c61fc8451620e50eb26a749dd1c74c892cef503c170101561f4c4f00efd97ce688c
+AUX wgetpaste-2.25-pinnwand.patch 6240 BLAKE2B c46f6683159f91fa0d3c1775d533f1a0d43cccd1a1291f405a8270f547e5255c546974b532aade11baf3500111005544ebbfd6c43a1a75a1ebbd3a844cb1b713 SHA512 28885bd7ed1e6ad7e6eba5283435fc9a40264cefd9bf021ad1873596866fb438f24113610fee55787e92bc8db688f9a7dd1b38e4382ceeefa4dddb981b9ce129
+AUX wgetpaste-config-services 105 BLAKE2B b2ee82eb523622a46b7b9922276703a3afa15fdb52589d4430f56e59d24445e5ca8280d1aa16e1ec13c6b51bcb0af540c0390c82c2d7d77f83d9ca020ad27774 SHA512 7b1e519461b7357139d0a0541f9f80fc95e0b24daa620de980703621a9ece261a2c05e93ec6b1100761cf2ecbb4ea5f73fc424c6d670d0a70b721026b8f236e3
+DIST wgetpaste-2.25.tar.bz2 11107 BLAKE2B 1ed46ada9045326583900a78bbbd66ea7776ae7ae7191b14f258ef417ef65c344d6ff7e6c5ac0592d93c2936bc189ea0a33c18a8f2e6a0eb9e4e1d9d3b67701b SHA512 c3cd56f32311c77ce5ac970f0cd6b2e8285cac3caaf61669237ac707ed3b9aab285fbe9dee6260ea13b8df41a22acfaa3b8439298560ab68c3a568d60557d82e
+DIST wgetpaste-2.28.tar.bz2 12448 BLAKE2B 231b6d00ecf9c355f45683d56537c0fe6a5d6561e42edee680b228f5a76e7e1b202669e429f7941b6daaf14682e5a8469521713930bb42387e168965acfccca2 SHA512 b3b9ee4bfbc52da6762b06c2640385eeedab7910ad1bc4e92ff9304371ec2442e2d30b69ebc0f1407a00a9c8afde398e00dc3d3c048452d730517227a68e6b97
+EBUILD wgetpaste-2.25-r3.ebuild 919 BLAKE2B a6b04fa999c708d990d074e5e40465e6bf518b6728423a1ee2c125911d7124fd466696f9c048b1c55ffc521c50767a95145f102a97ceb4eefdc8b8fc08bfd387 SHA512 749f899f89c0f1ba27b2fd937297fb2b27e4d749a7c232b8274fe89d530aa03082da70019bb120a8fb58fa74ee8180f437c0dcab4f427d487d3b16eb8408ffe6
+EBUILD wgetpaste-2.28-r1.ebuild 734 BLAKE2B 9728c2dbbe50713b394897d292e42e5971e3070ec229bd8612438a0b9656ab03f7c0db071b15cb8d7e3420e88adb0c787b554c9ef6bb6f8094a606fea98dae18 SHA512 c67fbd0e5dbf8963525af996e74f9b2f17d3aaeef741c5e924a5f319d217b86cac61ef3f9b1098912bb5fbc8ea1c3c968aaabfc2e135877aad843ef2bdb4c05f
+EBUILD wgetpaste-2.28.ebuild 706 BLAKE2B 69fce5b98143b44c27536b84e2d09f71d742dd39394cc57d0d4f40250cce44506326edc5f93c603fdbd09460147e953e38afecc31f6ae0afa0f4be7d50b9f124 SHA512 8eebb90528664d16898c6161ec38a5b10e09e81b4531693fc50b5af5265014fe8917f13b96f9b39eb3eaee2bac45337dc8af6536ec740840a6168a27a127fb41
+MISC metadata.xml 355 BLAKE2B cfb82b6309e5508319685ccad6757d701ad60ca2c9b015bf04cd500348a1c43e951876917d60e118e4008088a40761cd57b0f08a220cf1e97b9f638a4efe086a SHA512 04699e3fb3122aa304bcb525a1130732c949473086ed946ae9051928e7e84edd5347cab006e6a31f0ad854c7d8f51f07c3e77f6e3a7dac450619f4decb52f2f5
diff --git a/app-text/wgetpaste/files/wgetpaste-2.25-pinnwand-raw.patch b/app-text/wgetpaste/files/wgetpaste-2.25-pinnwand-raw.patch
new file mode 100644
index 000000000000..1b4cd12b5dd1
--- /dev/null
+++ b/app-text/wgetpaste/files/wgetpaste-2.25-pinnwand-raw.patch
@@ -0,0 +1,11 @@
+--- /usr/bin/wgetpaste	2014-09-25 22:20:39.097103971 +0300

++++ wgetpaste	2014-10-09 10:06:41.765195553 +0300

+@@ -200,7 +200,7 @@

+ xml+velocity xml xquery xslt xtend yaml"

+ EXPIRATIONS_pinnwand="1day 1week 1month never"

+ POST_pinnwand="submit=Paste! % % lexer expiry % code"

+-REGEX_RAW_pinnwand='s|^\(http://[^/]*/\)show\(/[[:alnum:]]*/\)$|\1raw\2|'

++REGEX_RAW_pinnwand='s|^\(https\?://[^/]*/\)show\(/[[:alnum:]]*/\?\)$|\1raw\2|'

+ 

+ ### errors

+ die() {

diff --git a/app-text/wgetpaste/files/wgetpaste-2.25-pinnwand.patch b/app-text/wgetpaste/files/wgetpaste-2.25-pinnwand.patch
new file mode 100644
index 000000000000..64a23e4fd944
--- /dev/null
+++ b/app-text/wgetpaste/files/wgetpaste-2.25-pinnwand.patch
@@ -0,0 +1,87 @@
+--- /var/tmp/portage/app-text/wgetpaste-2.25-r1/work/wgetpaste-2.25/wgetpaste	2014-05-23 20:51:44.000000000 +0400
++++ /usr/bin/wgetpaste	2014-09-14 16:46:21.345261294 +0400
+@@ -16,8 +16,10 @@
+ ### services
+ SERVICES="bpaste ca codepad dpaste gists poundpython"
+ # bpaste
+-ENGINE_bpaste=lodgeit
+-URL_bpaste="http://bpaste.net/"
++ENGINE_bpaste=pinnwand
++URL_bpaste="https://bpaste.net/"
++DEFAULT_EXPIRATION_bpaste="1week"
++DEFAULT_LANGUAGE_bpaste="text"
+ # ca
+ ENGINE_ca=ca
+ URL_ca="http://pastebin.ca/"
+@@ -143,6 +145,62 @@
+ vim xml xml+cheetah xml+django xml+evoque xml+mako xml+myghty xml+php xml+erb xml+smarty xslt yaml"
+ POST_lodgeit="submit=Paste! % % language % % code"
+ REGEX_RAW_lodgeit='s|^\(http://[^/]*/\)show\(/[[:alnum:]]*/\)$|\1raw\2|'
++# pinnwand
++LANGUAGES_pinnwand="ABAP ActionScript%3 ActionScript Ada ANTLR ANTLR%With%ActionScript%Target \
++ANTLR%With%CPP%Target ANTLR%With%C#%Target ANTLR%With%Java%Target ANTLR%With%ObjectiveC%Target \
++ANTLR%With%Perl%Target ANTLR%With%Python%Target ANTLR%With%Ruby%Target ApacheConf AppleScript \
++AspectJ aspx-cs aspx-vb Asymptote autohotkey AutoIt Awk Base%Makefile Bash Bash%Session Batchfile \
++BBCode Befunge BlitzMax Boo Brainfuck Bro BUGS ca65 CBM%BASIC%V2 C C++ C# Ceylon CFEngine3 \
++cfstatement Cheetah Clojure CMake c-objdump COBOL COBOLFree CoffeeScript Coldfusion%HTML Common%Lisp \
++Coq cpp-objdump Croc CSS CSS+Django/Jinja CSS+Genshi%Text CSS+Lasso CSS+Mako CSS+Myghty CSS+PHP \
++CSS+Ruby CSS+Smarty CUDA Cython Darcs%Patch Dart D Debian%Control%file Debian%Sourcelist Delphi dg \
++Diff Django/Jinja d-objdump DTD Duel Dylan DylanLID Dylan%session eC ECL Elixir Elixir%iex%session \
++Embedded%Ragel ERB Erlang Erlang%erl%session Evoque Factor Fancy Fantom Felix Fortran FoxPro FSharp \
++GAS Genshi Genshi%Text Gettext%Catalog Gherkin GLSL Gnuplot Go GoodData-CL Gosu Gosu%Template Groff \
++Groovy Haml Haskell haXe HTML+Cheetah HTML+Django/Jinja HTML+Evoque HTML+Genshi HTML HTML+Lasso \
++HTML+Mako HTML+Myghty HTML+PHP HTML+Smarty HTML+Velocity HTTP Hxml Hybris IDL INI Io Ioke IRC%logs \
++Jade JAGS Java JavaScript+Cheetah JavaScript+Django/Jinja JavaScript+Genshi%Text JavaScript \
++JavaScript+Lasso JavaScript+Mako JavaScript+Myghty JavaScript+PHP JavaScript+Ruby JavaScript+Smarty \
++Java%Server%Page JSON Julia%console Julia Kconfig Koka Kotlin Lasso Lighttpd%configuration%file \
++Literate%Haskell LiveScript LLVM Logos Logtalk Lua Makefile Mako MAQL Mason Matlab Matlab%session \
++MiniD Modelica Modula-2 MoinMoin/Trac%Wiki%markup Monkey MOOCode MoonScript Mscgen MuPAD MXML Myghty \
++MySQL NASM Nemerle NewLisp Newspeak Nginx%configuration%file Nimrod NSIS NumPy objdump Objective-C++ \
++Objective-C Objective-J OCaml Octave Ooc Opa OpenEdge%ABL Perl PHP PL/pgSQL \
++PostgreSQL%console%(psql) PostgreSQL%SQL%dialect PostScript POVRay PowerShell Prolog Properties \
++Protocol%Buffer Puppet PyPy%Log Python%3.0%Traceback Python%3 Python%console%session Python \
++Python%Traceback QML Racket Ragel%in%C%Host Ragel%in%CPP%Host Ragel%in%D%Host Ragel%in%Java%Host \
++Ragel%in%Objective%C%Host Ragel%in%Ruby%Host Ragel Raw%token%data RConsole Rd REBOL Redcode reg \
++reStructuredText RHTML RobotFramework RPMSpec Ruby%irb%session Ruby Rust Sass Scala \
++Scalate%Server%Page Scaml Scheme Scilab SCSS Shell%Session Smali Smalltalk Smarty Snobol SourcePawn \
++sqlite3con SQL SquidConf S Standard%ML Stan systemverilog Tcl Tcsh Tea TeX Text%only Text Treetop \
++TypeScript UrbiScript Vala VB.net Velocity verilog VGL vhdl VimL XML+Cheetah XML+Django/Jinja \
++XML+Evoque XML+Lasso XML+Mako XML+Myghty XML+PHP XML+Ruby XML+Smarty XML+Velocity XML XQuery XSLT \
++Xtend YAML"
++LANGUAGE_VALUES_pinnwand="abap as3 as ada antlr antlr-as antlr-cpp antlr-csharp antlr-java \
++antlr-objc antlr-perl antlr-python antlr-ruby apacheconf applescript aspectj aspx-cs aspx-vb asy ahk \
++autoit awk basemake bash console bat bbcode befunge blitzmax boo brainfuck bro bugs ca65 cbmbas c \
++cpp csharp ceylon cfengine3 cfs cheetah clojure cmake c-objdump cobol cobolfree coffee-script cfm \
++common-lisp coq cpp-objdump croc css css+django css+genshitext css+lasso css+mako css+myghty css+php \
++css+erb css+smarty cuda cython dpatch dart d control sourceslist delphi dg diff django d-objdump dtd \
++duel dylan dylan-lid dylan-console ec ecl elixir iex ragel-em erb erlang erl evoque factor fancy fan \
++felix fortran Clipper fsharp gas genshi genshitext pot Cucumber glsl gnuplot go gooddata-cl gosu gst \
++groff groovy haml haskell hx html+cheetah html+django html+evoque html+genshi html html+lasso \
++html+mako html+myghty html+php html+smarty html+velocity http haxeml hybris idl ini io ioke irc jade \
++jags java js+cheetah js+django js+genshitext js js+lasso js+mako js+myghty js+php js+erb js+smarty \
++jsp json jlcon julia kconfig koka kotlin lasso lighty lhs live-script llvm logos logtalk lua make \
++mako maql mason matlab matlabsession minid modelica modula2 trac-wiki monkey moocode moon mscgen \
++mupad mxml myghty mysql nasm nemerle newlisp newspeak nginx nimrod nsis numpy objdump objective-c++ \
++objective-c objective-j ocaml octave ooc opa openedge perl php plpgsql psql postgresql postscript \
++pov powershell prolog properties protobuf puppet pypylog py3tb python3 pycon python pytb qml racket \
++ragel-c ragel-cpp ragel-d ragel-java ragel-objc ragel-ruby ragel raw rconsole rd rebol redcode \
++registry rst rhtml RobotFramework spec rbcon rb rust sass scala ssp scaml scheme scilab scss \
++shell-session smali smalltalk smarty snobol sp sqlite3 sql squidconf splus sml stan systemverilog \
++tcl tcsh tea tex text text treetop ts urbiscript vala vb.net velocity verilog vgl vhdl vim \
++xml+cheetah xml+django xml+evoque xml+lasso xml+mako xml+myghty xml+php xml+erb xml+smarty \
++xml+velocity xml xquery xslt xtend yaml"
++EXPIRATIONS_pinnwand="1day 1week 1month never"
++POST_pinnwand="submit=Paste! % % lexer expiry % code"
++REGEX_RAW_pinnwand='s|^\(http://[^/]*/\)show\(/[[:alnum:]]*/\)$|\1raw\2|'
+ 
+ ### errors
+ die() {
+@@ -514,7 +572,7 @@
+ 		sed -n -e "${!regex}" <<< "$*"
+ 	else
+ 		[[ needstdout = $1 ]] && return 1
+-		sed -n -e 's|^.*Location: \(http://[^ ]*\).*$|\1|p' <<< "$*"
++		sed -n -e 's|^.*Location: \(https\{0,1\}://[^ ]*\).*$|\1|p' <<< "$*"
+ 	fi
+ }
+ 
diff --git a/app-text/wgetpaste/files/wgetpaste-config-services b/app-text/wgetpaste/files/wgetpaste-config-services
new file mode 100644
index 000000000000..0f7014b17220
--- /dev/null
+++ b/app-text/wgetpaste/files/wgetpaste-config-services
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+SERVICES="${SERVICES} lugons"
+
+ENGINE_lugons=lodgeit
+URL_lugons="https://paste.lugons.org/"
diff --git a/app-text/wgetpaste/metadata.xml b/app-text/wgetpaste/metadata.xml
new file mode 100644
index 000000000000..23d91c3c4034
--- /dev/null
+++ b/app-text/wgetpaste/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>maksbotan@gentoo.org</email>
+		<name>Maxim Koltsov</name>
+	</maintainer>
+	<maintainer type="person">
+	<email>zlogene@gentoo.org</email>
+	<name>Mikle Kolyada</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-text/wgetpaste/wgetpaste-2.25-r3.ebuild b/app-text/wgetpaste/wgetpaste-2.25-r3.ebuild
new file mode 100644
index 000000000000..b159d3d8f938
--- /dev/null
+++ b/app-text/wgetpaste/wgetpaste-2.25-r3.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils
+
+DESCRIPTION="Command-line interface to various pastebins"
+HOMEPAGE="http://wgetpaste.zlin.dk/"
+SRC_URI="http://wgetpaste.zlin.dk/${P}.tar.bz2"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=""
+RDEPEND="net-misc/wget"
+
+src_prepare() {
+	sed -i -e "s:/etc:\"${EPREFIX}\"/etc:g" wgetpaste || die
+	epatch "${FILESDIR}"/wgetpaste-2.25-pinnwand.patch
+	epatch "${FILESDIR}"/wgetpaste-2.25-pinnwand-raw.patch
+}
+
+src_install() {
+	dobin ${PN}
+	insinto /etc/wgetpaste.d
+	newins "${FILESDIR}"/wgetpaste-config-services services.conf
+	insinto /usr/share/zsh/site-functions
+	doins _wgetpaste
+}
diff --git a/app-text/wgetpaste/wgetpaste-2.28-r1.ebuild b/app-text/wgetpaste/wgetpaste-2.28-r1.ebuild
new file mode 100644
index 000000000000..179987690480
--- /dev/null
+++ b/app-text/wgetpaste/wgetpaste-2.28-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+DESCRIPTION="Command-line interface to various pastebins"
+HOMEPAGE="http://wgetpaste.zlin.dk/"
+SRC_URI="http://wgetpaste.zlin.dk/${P}.tar.bz2"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="+ssl"
+
+DEPEND=""
+RDEPEND="net-misc/wget[ssl?]"
+
+src_prepare() {
+	sed -i -e "s:/etc:\"${EPREFIX}\"/etc:g" wgetpaste || die
+	default
+}
+
+src_install() {
+	dobin ${PN}
+	insinto /usr/share/zsh/site-functions
+	doins _wgetpaste
+}
diff --git a/app-text/wgetpaste/wgetpaste-2.28.ebuild b/app-text/wgetpaste/wgetpaste-2.28.ebuild
new file mode 100644
index 000000000000..92c22cb8573b
--- /dev/null
+++ b/app-text/wgetpaste/wgetpaste-2.28.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+DESCRIPTION="Command-line interface to various pastebins"
+HOMEPAGE="http://wgetpaste.zlin.dk/"
+SRC_URI="http://wgetpaste.zlin.dk/${P}.tar.bz2"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+DEPEND=""
+RDEPEND="net-misc/wget"
+
+src_prepare() {
+	sed -i -e "s:/etc:\"${EPREFIX}\"/etc:g" wgetpaste || die
+}
+
+src_install() {
+	dobin ${PN}
+	insinto /usr/share/zsh/site-functions
+	doins _wgetpaste
+}
diff --git a/app-text/wiki2beamer-0.9.5-r1 b/app-text/wiki2beamer-0.9.5-r1
deleted file mode 100644
index 43509e7efbc0..000000000000
--- a/app-text/wiki2beamer-0.9.5-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install setup
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] app-arch/unzip
-DESCRIPTION=Tool to produce LaTeX Beamer code from wiki-like input
-EAPI=5
-HOMEPAGE=http://wiki2beamer.sourceforge.net/
-IUSE=+examples python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( GPL-2 GPL-3 ) FDL-1.3
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?]
-REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://sourceforge/wiki2beamer/wiki2beamer-0.9.5.zip
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=759ffc186cc2a172cd915da79c5335a0
diff --git a/app-text/wiki2beamer/Manifest b/app-text/wiki2beamer/Manifest
new file mode 100644
index 000000000000..002d815dd987
--- /dev/null
+++ b/app-text/wiki2beamer/Manifest
@@ -0,0 +1,3 @@
+DIST wiki2beamer-0.9.5.zip 443288 BLAKE2B a0263ba7044966ff45c892e9f0f78f6916346c051bf57cc8445f4127019cc4cd031719b1b5b61fc7d41a85b42439fa20cdf8fc35fbed43feb28d6d9797c781c7 SHA512 0cad0458c293c335cfb0b2181822652b12662877a2ed66d743e5f258d9983ee91fb34664c032357995606bcf17bebbb7409b6100ba2340b06cc6f253e8c6b0f7
+EBUILD wiki2beamer-0.9.5-r1.ebuild 801 BLAKE2B bc3fe07c1ed3f1a94abd81f9cb47f49c5db7fc2e998ff6bb5998d247b68a8b275549b3bf988c1a344d252efa0fd711878c012243c56f33d32e332c3f620129bb SHA512 05d00595fda2c119f3c5be98d9a15b7dc9359a7155d0f57bb120e8814a88ef16d489effc61e0c7d4db74687904dfe22ed0b64ffab1b81eac68c0a9cd117df505
+MISC metadata.xml 330 BLAKE2B 27059ed0cbe2bf10ad3b028d1f0e12b0617c0e2146432e375ccae5d570d8b1c1860bb9b9f36021a588ce859b7b30dfc04fb1f841890c549093687f3b6ad8addb SHA512 27c93b4ed84b734c1d8b6a7dc86a4d25f18694c0c096351afd35acf378e823dca63d692e853571e9d98e1e7dade682eb3802add4a7088f432279dbf890636cc1
diff --git a/app-text/wiki2beamer/metadata.xml b/app-text/wiki2beamer/metadata.xml
new file mode 100644
index 000000000000..2d21a5ac6b1c
--- /dev/null
+++ b/app-text/wiki2beamer/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>sping@gentoo.org</email>
+		<name>Sebastian Pipping</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">wiki2beamer</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/wiki2beamer/wiki2beamer-0.9.5-r1.ebuild b/app-text/wiki2beamer/wiki2beamer-0.9.5-r1.ebuild
new file mode 100644
index 000000000000..1b54b904be80
--- /dev/null
+++ b/app-text/wiki2beamer/wiki2beamer-0.9.5-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit python-single-r1
+
+DESCRIPTION="Tool to produce LaTeX Beamer code from wiki-like input"
+
+HOMEPAGE="http://wiki2beamer.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
+
+LICENSE="|| ( GPL-2 GPL-3 ) FDL-1.3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+examples"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}"
+DEPEND="${RDEPEND}
+	app-arch/unzip"
+
+src_install() {
+	if use examples; then
+		# Patch example Makefile
+		sed -e 's|../../code/wiki2beamer|wiki2beamer|' \
+				-i doc/example/Makefile \
+				|| die
+
+		dodoc -r doc/example
+	fi
+
+	doman doc/man/${PN}.1
+	dodoc ChangeLog README
+
+	python_doscript code/${PN}
+}
diff --git a/app-text/winefish-1.3.3-r2 b/app-text/winefish-1.3.3-r2
deleted file mode 100644
index 6e62d3e10680..000000000000
--- a/app-text/winefish-1.3.3-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=>=dev-libs/libpcre-6.3 >=x11-libs/gtk+-2.4:2 spell? ( app-text/aspell ) virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=LaTeX editor based on Bluefish
-EAPI=6
-HOMEPAGE=https://github.com/viettug/winefish
-IUSE=spell
-KEYWORDS=~amd64 ~ppc ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/libpcre-6.3 >=x11-libs/gtk+-2.4:2 spell? ( app-text/aspell )
-SLOT=0
-SRC_URI=https://github.com/viettug/winefish/archive/1.3.3.tar.gz -> winefish-1.3.3.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0fcc927597b8f1acc397ae3dccb53df5
diff --git a/app-text/winefish/Manifest b/app-text/winefish/Manifest
new file mode 100644
index 000000000000..f4a7546c3100
--- /dev/null
+++ b/app-text/winefish/Manifest
@@ -0,0 +1,8 @@
+AUX winefish-1.3.3-desktop.patch 355 BLAKE2B f99870a04c8d0de075bf6c4c169e2eabcbec212817a1ab6b1dd0aaf1bc29b0fcc063c834083b7ee9fd832600245f8e3650576b5f42ea53ffbc8e95d095f643db SHA512 12606e0e49bfe9e6de7fe5f7a3b17c55653a4465fb85376929f664afb8d25acad862c8004b9fdfed56e289f7d7ba9fa0618dd551663a9361e4acc174b51e6785
+AUX winefish-1.3.3-doc.patch 518 BLAKE2B e682e07326c44708ac8ee4e8fddd4a07145288f7fcac86e21e37a1cf97cc373d5340661855d896003539ae98b84d147da649a3909f49c02c7b26076cb47b412a SHA512 3a49d0035d580ec8a3daae606a3b1c287ce64cf355de899174fddc9610520ee987823d4fe84e82a25f8bcbf7d8a7c11043b373ab4865a4f7dd654e5520a5eb3b
+AUX winefish-1.3.3-memset.patch 364 BLAKE2B 5eeb23216a11845e2e5adff2fc869aae647a97f8ee6ab2ed1b1d90eb420125fe245b56332eb5a25d510d4bcafce88f4eda3a131d3463206635ee89c851150928 SHA512 282743d8eb64035c2f21a3b037004e17d4b14f15db1877baf7524d90b3a5b8c46a279ca00e9617f79be70c503611884de5859ae910406bf027fa61f70c0404fd
+AUX winefish-1.3.3-nostrip.patch 384 BLAKE2B 3f395994f6c4d214680b6c954ffc9973f3686f0dd29361e708b4e576e6043d9ebf349873ced4f53a782fd7649b6cc27b14560b5fe13c68860b32e81c16b99ba4 SHA512 4090358771013fffed32487eff4cd74c7545b4d7dea97aac6638c9b1bf1d3add2d2f5ab4ad2cc3d0626a3fed336203221528f8efe21802e0f72dd891b65e7bb9
+AUX winefish-1.3.3-version.patch 217 BLAKE2B 4830bcd33b1acc99732dc32bcaa3dd0950dc28c139286b152ba0a250833d39a1f92674900c1cf003ebc2218796aacdda1a509034b1693f7c77342f4f748d9e92 SHA512 c3da51e0a1140fbd0c2c811e16da19af0c9d8817b7d00a1d5fb97901234d8e2c8e1ad27b20a5cc79accac9d1c96239e942fd3ce5de87f5664f3769e6393f2600
+DIST winefish-1.3.3.tar.gz 485772 BLAKE2B 344059c9bc15ec693e66d5d901d2e620ff223dd48de64d32b385cc1e06f6782dc2a2ec965ab8f5ce26bbf518df8edc60a1640b7ed7b576939bf45bbc424f7900 SHA512 216196694979093f5152eb7e3ccaa1e342b44bde4a054c2b6a72c38451d08cd03c3209f5becab8ce3f3c8aace089253a60dff8d8c2f679bb297b34d0fa1ff19c
+EBUILD winefish-1.3.3-r2.ebuild 1017 BLAKE2B 015b366f7ed84feb3e3243315fc90e8e55f6c81b84a33aa1ec962cba205b3ce74725326fe5e17835e286330705563c5a238665c06017e7bf4174eb0aadd8ee5e SHA512 4897589831fb8ff3637fa79b763122edd16a9ef59487599bb418a616939de6a3dc0dab12dde544e5faa3ed4736a6ab76e4f8d4e6190da265b1dc6e260ad52ade
+MISC metadata.xml 330 BLAKE2B 28aec1129c0c006de502806221b22ef857fd367d9fa88dd34d2a4324845cf103e0446b45cf78877df1cf8038c8a569fe456126da51a5b7e7000cb7382797fa5b SHA512 000a6237daf47d5b798b4b0845582741df60e0b9c2d2bdb87e014c96d48a7c8697c03b0de38fd11a2e243c84683bf7ececad0853fbea06e8065ed4ea055cbfb6
diff --git a/app-text/winefish/files/winefish-1.3.3-desktop.patch b/app-text/winefish/files/winefish-1.3.3-desktop.patch
new file mode 100644
index 000000000000..eaa66eca7dd0
--- /dev/null
+++ b/app-text/winefish/files/winefish-1.3.3-desktop.patch
@@ -0,0 +1,11 @@
+--- a/data/winefish.desktop.in
++++ b/data/winefish.desktop.in
+@@ -7,7 +7,7 @@
+ Icon=ICONDIR/winefish-icon.png
+ Terminal=false
+ Type=Application
+-Categories=GTK;GNOME;Application;Editors;Office;Development;
++Categories=GTK;GNOME;TextEditor;Office;Development;
+ Encoding=UTF-8
+ StartupNotify=true
+ MimeType=text/x-tex;application/winefish-project;text/xml;
diff --git a/app-text/winefish/files/winefish-1.3.3-doc.patch b/app-text/winefish/files/winefish-1.3.3-doc.patch
new file mode 100644
index 000000000000..9e02510e35a8
--- /dev/null
+++ b/app-text/winefish/files/winefish-1.3.3-doc.patch
@@ -0,0 +1,13 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -89,8 +89,8 @@
+ 	$(INSTALL_DIR) $(DESTDIR)$(pkgdatadir)
+ 	$(INSTALL_DATA) images/winefish_splash.png $(DESTDIR)$(pkgdatadir)
+ 	$(INSTALL_DIR) $(DESTDIR)$(docdir)
+-	$(INSTALL_DATA) doc/winefish.html $(DESTDIR)$(docdir)
+-#	$(INSTALL_DATA) doc/winefish.txt $(DESTDIR)$(docdir)
++#	$(INSTALL_DATA) doc/winefish.html $(DESTDIR)$(docdir)
++	$(INSTALL_DATA) doc/winefish.txt $(DESTDIR)$(docdir)
+ 	@cd icons/ && $(MAKE) install
+ 	@cd src/ && $(MAKE) install
+ 	@cd data/ && $(MAKE) install
diff --git a/app-text/winefish/files/winefish-1.3.3-memset.patch b/app-text/winefish/files/winefish-1.3.3-memset.patch
new file mode 100644
index 000000000000..7390642bb690
--- /dev/null
+++ b/app-text/winefish/files/winefish-1.3.3-memset.patch
@@ -0,0 +1,11 @@
+--- a/src/highlight.c
++++ b/src/highlight.c
+@@ -731,7 +731,7 @@
+ 	GList *tmplist = g_list_first(level);
+ 	while (tmplist) {
+ 		Tpattern * pat = (Tpattern *)tmplist->data;
+-		memset(pat->ovector,0,sizeof(pat->ovector));
++		memset(pat->ovector,0,sizeof(&pat->ovector));
+ 		pat->is_match = FALSE;
+ 		patmatch_init_run(pat->childs);
+ 		tmplist = g_list_next(tmplist);
diff --git a/app-text/winefish/files/winefish-1.3.3-nostrip.patch b/app-text/winefish/files/winefish-1.3.3-nostrip.patch
new file mode 100644
index 000000000000..24f21e49d307
--- /dev/null
+++ b/app-text/winefish/files/winefish-1.3.3-nostrip.patch
@@ -0,0 +1,11 @@
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -37,7 +37,7 @@ LDFLAGS = @LDFLAGS@
+ LIBS = @LIBS@
+ INSTALL = @INSTALL@
+ INSTALL_DIR = $(INSTALL) -d -m 755 
+-INSTALL_PROGRAM = $(INSTALL) -s -m 755
++INSTALL_PROGRAM = $(INSTALL) -m 755
+ DEFS = -DLOCALEDIR=\"$(localedir)\" -DGNULOCALEDIR=\"$(gnulocaledir)\" \
+ -DLOCALE_ALIAS_PATH=\"$(aliaspath)\" -DPKGDATADIR=\"$(pkgdatadir)\" @DEFS@
+ 
diff --git a/app-text/winefish/files/winefish-1.3.3-version.patch b/app-text/winefish/files/winefish-1.3.3-version.patch
new file mode 100644
index 000000000000..a586608719d9
--- /dev/null
+++ b/app-text/winefish/files/winefish-1.3.3-version.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -23,7 +23,7 @@
+ AC_CONFIG_HEADER(src/config.h)
+ 
+ PACKAGE=winefish
+-VERSION=1.3.2
++VERSION=1.3.3
+ AC_SUBST(PACKAGE)
+ AC_SUBST(VERSION)
+ AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
diff --git a/app-text/winefish/metadata.xml b/app-text/winefish/metadata.xml
new file mode 100644
index 000000000000..bb345a547d2f
--- /dev/null
+++ b/app-text/winefish/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">viettug/winefish</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/winefish/winefish-1.3.3-r2.ebuild b/app-text/winefish/winefish-1.3.3-r2.ebuild
new file mode 100644
index 000000000000..2c873d65af7f
--- /dev/null
+++ b/app-text/winefish/winefish-1.3.3-r2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils xdg-utils
+
+MY_PV=${PV/%[[:alpha:]]/}
+
+DESCRIPTION="LaTeX editor based on Bluefish"
+HOMEPAGE="https://github.com/viettug/winefish"
+SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="spell"
+
+RDEPEND="
+	>=dev-libs/libpcre-6.3
+	>=x11-libs/gtk+-2.4:2
+	spell? ( app-text/aspell )
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-desktop.patch
+	"${FILESDIR}"/${P}-doc.patch
+	"${FILESDIR}"/${P}-memset.patch
+	"${FILESDIR}"/${P}-nostrip.patch
+	"${FILESDIR}"/${P}-version.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf --disable-update-databases
+}
+
+src_install() {
+	emake install DESTDIR="${D}" docdir=/usr/share/doc/${PF}/html
+	dodoc AUTHORS CHANGES README ROADMAP THANKS TODO
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/app-text/wklej-0.2.1-r1 b/app-text/wklej-0.2.1-r1
deleted file mode 100644
index fb0c4b546271..000000000000
--- a/app-text/wklej-0.2.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install setup
-DEPEND=python_single_target_pypy? ( >=virtual/pypy-5:0= ) python_single_target_pypy3? ( >=virtual/pypy3-5:0= ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_python3_7(-),python_single_target_pypy(+)?,python_single_target_pypy3(+)?,python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?]
-DESCRIPTION=A wklej.org submitter
-EAPI=5
-HOMEPAGE=http://wklej.org
-IUSE=+vim python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_pypy python_single_target_pypy3 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=amd64 x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=python_single_target_pypy? ( >=virtual/pypy-5:0= ) python_single_target_pypy3? ( >=virtual/pypy3-5:0= ) python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_python3_7(-),python_single_target_pypy(+)?,python_single_target_pypy3(+)?,python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] vim? ( app-editors/vim[python,python_targets_python2_7(-)?,python_single_target_python2_7(+)?] )
-REQUIRED_USE=^^ ( python_single_target_pypy python_single_target_pypy3 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_pypy? ( python_targets_pypy ) python_single_target_pypy3? ( python_targets_pypy3 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) vim? ( ^^ ( python_single_target_python2_7 ) )
-SLOT=0
-SRC_URI=http://wklej.org/m/apps/wklej-0.2.1.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=be238682224854c65b59db28e76bd04c
diff --git a/app-text/wklej/Manifest b/app-text/wklej/Manifest
new file mode 100644
index 000000000000..3ca98f549b10
--- /dev/null
+++ b/app-text/wklej/Manifest
@@ -0,0 +1,3 @@
+DIST wklej-0.2.1.tar.gz 4370 BLAKE2B 616126936c37f8f727167745eecca27b7f1ba844b7396bbd2c205c804c90c2632dddb1b74bd9d66cd040c7eaa9a8e179281372b96eeb6d3d8f09ae27250563c7 SHA512 3799a1570f0cc7f1005f69484ceb1c6c88c8a24933beb3e32c0acd758ce29a5a1b6599baeea2b6405ec2da1e4fcb25b2d218b8295c68fa811fa4d53ada96cf0c
+EBUILD wklej-0.2.1-r1.ebuild 778 BLAKE2B 00f596b86a6c8986a5dc6553e624a4bde56783db13803ea78712775e7972b6c03e27a3a7062819486a1411463c570e8802c4a5e8d208e228271a6217bc3f3278 SHA512 1023f7da5c6345ef41da61152fe593fa772aa8326b23738423725d02eb2c4edeca6eb2974ffc7f529091570bb781d54a04f4d6640107ab6fb5dc69639968705b
+MISC metadata.xml 349 BLAKE2B 9abac59717642921e8f8e3c38865b6fb76d96a1a98a60f5947602d6b66719785eda7629d01f3fe5aea22e8ad3a4af8829e53861c5cff3140acd94a055adfee10 SHA512 b65a626f1a38f94be7617bd3b46819425724097af5536d5378372574ace10d96fc33f96c9ac52b480b4d9e3a33ab63b9b127737d6d0d2e9e02013fd3d0d826b0
diff --git a/app-text/wklej/metadata.xml b/app-text/wklej/metadata.xml
new file mode 100644
index 000000000000..a6ba9840e60b
--- /dev/null
+++ b/app-text/wklej/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>aidecoe@gentoo.org</email>
+	<name>Amadeusz Żołnowski</name>
+</maintainer>
+<use>
+	<flag name="vim">Install the vim plugin allowing to paste
+		through ':Wklej'.</flag>
+</use>
+</pkgmetadata>
diff --git a/app-text/wklej/wklej-0.2.1-r1.ebuild b/app-text/wklej/wklej-0.2.1-r1.ebuild
new file mode 100644
index 000000000000..0196b8485f75
--- /dev/null
+++ b/app-text/wklej/wklej-0.2.1-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy pypy3 )
+
+inherit python-single-r1
+
+DESCRIPTION="A wklej.org submitter"
+HOMEPAGE="http://wklej.org"
+SRC_URI="http://wklej.org/m/apps/wklej-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86 ~x86-fbsd"
+IUSE="+vim"
+# the vim script is python2-only...
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	vim? ( ^^ ( $(python_gen_useflags 'python2*') ) )"
+
+DEPEND="${PYTHON_DEPS}"
+RDEPEND="${DEPEND}
+	vim? ( app-editors/vim[python,$(python_gen_usedep 'python2*')] )"
+
+S=${WORKDIR}
+
+src_install() {
+	if use vim; then
+		insinto /usr/share/vim/vimfiles/plugin
+		doins ${PN}.vim
+	fi
+
+	python_doscript ${PN}
+	dodoc README wklejrc
+}
diff --git a/app-text/writerperfect-0.9.5 b/app-text/writerperfect-0.9.5
deleted file mode 100644
index c2f4bbb283d6..000000000000
--- a/app-text/writerperfect-0.9.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure
-DEPEND==app-text/libodfgen-0.1* >=dev-libs/librevenge-0.0.1 media-libs/libeot abiword? ( =app-text/libabw-0.1* ) cdr? ( =media-libs/libcdr-0.1* ) ebook? ( =app-text/libebook-0.1* ) freehand? ( =media-libs/libfreehand-0.1* ) gsf? ( gnome-extra/libgsf ) keynote? ( =app-text/libetonyek-0.1* ) mspub? ( =app-text/libmspub-0.1* ) mwaw? ( =app-text/libmwaw-0.3* ) pagemaker? ( media-libs/libpagemaker ) visio? ( =media-libs/libvisio-0.1* ) wpd? ( app-text/libwpd:0.10 ) wpg? ( =app-text/libwpg-0.3* ) wps? ( =app-text/libwps-0.4* ) virtual/pkgconfig
-DESCRIPTION=Various formats to Open document format converter
-EAPI=6
-HOMEPAGE=http://libwpd.sf.net
-IUSE=abiword +cdr debug ebook freehand gsf keynote +mspub +mwaw pagemaker +visio +wpd +wpg +wps
-KEYWORDS=amd64 x86 ~x86-linux ~x86-solaris
-LICENSE=|| ( LGPL-2.1 MPL-2.0 )
-RDEPEND==app-text/libodfgen-0.1* >=dev-libs/librevenge-0.0.1 media-libs/libeot abiword? ( =app-text/libabw-0.1* ) cdr? ( =media-libs/libcdr-0.1* ) ebook? ( =app-text/libebook-0.1* ) freehand? ( =media-libs/libfreehand-0.1* ) gsf? ( gnome-extra/libgsf ) keynote? ( =app-text/libetonyek-0.1* ) mspub? ( =app-text/libmspub-0.1* ) mwaw? ( =app-text/libmwaw-0.3* ) pagemaker? ( media-libs/libpagemaker ) visio? ( =media-libs/libvisio-0.1* ) wpd? ( app-text/libwpd:0.10 ) wpg? ( =app-text/libwpg-0.3* ) wps? ( =app-text/libwps-0.4* )
-REQUIRED_USE=|| ( abiword cdr ebook freehand keynote mspub mwaw pagemaker visio wpd wpg wps )
-SLOT=0
-SRC_URI=mirror://sourceforge/libwpd/writerperfect-0.9.5.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=32c0025ccfd7091acc81e2858a070c23
diff --git a/app-text/writerperfect/Manifest b/app-text/writerperfect/Manifest
new file mode 100644
index 000000000000..3ec38d46ddae
--- /dev/null
+++ b/app-text/writerperfect/Manifest
@@ -0,0 +1,3 @@
+DIST writerperfect-0.9.5.tar.xz 302176 BLAKE2B 4ef8fd72f01e3c208a59c520440975f38dcf1edc353134721b7f06d042752adad9c825503f5756a74bede2307f7317c28e054dbcb6c5c1000a606822e97d2c8b SHA512 7467a798da362883101780b598e9a673c10f86f29c01ece1438ea524a0413a00928274f87895f3a8ae26f6784cdcc34e0e84039ca591dc3f75b2e25c53744ccc
+EBUILD writerperfect-0.9.5.ebuild 1761 BLAKE2B ef4e87d22c7ab182cb1f3e9677bbfa12498f2fade4c353bf1ba0093a4c00ae4cb90d2926b99e799e2dc0304e60102f593126cb0da0f3ee2b4746ef43a6fc1e1b SHA512 95591cec04441b34a37e60460eab58ea69641c9876e7074bcdb1dcd25aa1b7fd438dc52c98f61674b151b82eacdc18cc42c6c844390c6f78ccbd299c07b04fd6
+MISC metadata.xml 1475 BLAKE2B 930b7d6e8f9204281ca5a01d55a66fa635b3ea7680405a16a55ef85dbe572fc82a6ea00dc9a0ba2b98ce2c854b738bff02dd4e99d62e923b42bce9069fce1070 SHA512 759c262d939b9d6aa57d7de21447492d3771f6af011de6a5de83dd81cc115df14a25e20b71ba5643d0089e2b62953312fcf17ca91d67f4b5c046ecd145747450
diff --git a/app-text/writerperfect/metadata.xml b/app-text/writerperfect/metadata.xml
new file mode 100644
index 000000000000..7fa1a1d665d1
--- /dev/null
+++ b/app-text/writerperfect/metadata.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>office@gentoo.org</email>
+		<name>Gentoo Office project</name>
+	</maintainer>
+	<use>
+		<flag name="abiword">Add support for abiword format using <pkg>app-text/libabw</pkg></flag>
+		<flag name="ebook">Add support for various ebook formats using <pkg>app-text/libebook</pkg></flag>
+		<flag name="freehand">Add support for freehand format using <pkg>media-libs/libfreehand</pkg></flag>
+		<flag name="gsf">Add support for structured files using <pkg>gnome-extra/libgsf</pkg></flag>
+		<flag name="keynote">Add support for keynote format using <pkg>app-text/libetonyek</pkg></flag>
+		<flag name="mspub">Add support to mspub format using <pkg>app-text/libmspub</pkg></flag>
+		<flag name="mwaw">Add support to mwaw formats using <pkg>app-text/libmwaw</pkg></flag>
+		<flag name="pagemaker">Add support to pagemaker formats using <pkg>media-libs/libpagemaker</pkg></flag>
+		<flag name="visio">Add support for visio format using <pkg>media-libs/libvisio</pkg></flag>
+		<flag name="wpd">Add support for wpd format using <pkg>app-text/libwpd</pkg></flag>
+		<flag name="wpg">Add support for wpg format using <pkg>app-text/libwpg</pkg></flag>
+		<flag name="wps">Add support for wps format using <pkg>app-text/libwps</pkg></flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">libwpd</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/writerperfect/writerperfect-0.9.5.ebuild b/app-text/writerperfect/writerperfect-0.9.5.ebuild
new file mode 100644
index 000000000000..ebcd8a970359
--- /dev/null
+++ b/app-text/writerperfect/writerperfect-0.9.5.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic
+
+DESCRIPTION="Various formats to Open document format converter"
+HOMEPAGE="http://libwpd.sf.net"
+SRC_URI="mirror://sourceforge/libwpd/${P}.tar.xz"
+
+LICENSE="|| ( LGPL-2.1 MPL-2.0 )"
+SLOT="0"
+KEYWORDS="amd64 x86 ~x86-linux ~x86-solaris"
+IUSE="abiword +cdr debug ebook freehand gsf keynote +mspub +mwaw pagemaker +visio +wpd +wpg +wps"
+
+# FIXME: libepubgen, librvngabw
+RDEPEND="
+	=app-text/libodfgen-0.1*
+	>=dev-libs/librevenge-0.0.1
+	media-libs/libeot
+	abiword? ( =app-text/libabw-0.1* )
+	cdr? ( =media-libs/libcdr-0.1* )
+	ebook? ( =app-text/libebook-0.1* )
+	freehand? ( =media-libs/libfreehand-0.1* )
+	gsf? ( gnome-extra/libgsf )
+	keynote? ( =app-text/libetonyek-0.1* )
+	mspub? ( =app-text/libmspub-0.1* )
+	mwaw? ( =app-text/libmwaw-0.3* )
+	pagemaker? ( media-libs/libpagemaker )
+	visio? ( =media-libs/libvisio-0.1* )
+	wpd? ( app-text/libwpd:0.10 )
+	wpg? ( =app-text/libwpg-0.3* )
+	wps? ( =app-text/libwps-0.4* )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+REQUIRED_USE="
+	|| ( abiword cdr ebook freehand keynote mspub mwaw pagemaker visio wpd wpg wps )
+"
+# configure fails if no import library is selected...
+
+src_configure() {
+	# bug 651620
+	append-cxxflags -std=c++11
+
+	econf \
+		--disable-werror \
+		$(use_enable debug) \
+		$(use_with abiword libabw) \
+		$(use_with cdr libcdr) \
+		$(use_with ebook libebook) \
+		$(use_with freehand libfreehand) \
+		$(use_with gsf libgsf) \
+		$(use_with keynote libetonyek) \
+		$(use_with mspub libmspub) \
+		$(use_with mwaw libmwaw) \
+		$(use_with pagemaker libpagemaker) \
+		$(use_with visio libvisio) \
+		$(use_with wpd libwpd) \
+		$(use_with wpg libwpg) \
+		$(use_with wps libwps)
+}
diff --git a/app-text/wscr-1.2-r1 b/app-text/wscr-1.2-r1
deleted file mode 100644
index ffc075ef23cd..000000000000
--- a/app-text/wscr-1.2-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DESCRIPTION=A Lightweight and Fast Anagram Solver
-EAPI=5
-HOMEPAGE=https://www.gentoo.org/
-KEYWORDS=amd64 ~mips ppc x86
-LICENSE=public-domain
-RDEPEND=sys-apps/miscfiles
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~jer/wscr-1.2.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=e10c8d20d44b6793c47dc10f53caea70
diff --git a/app-text/wscr/Manifest b/app-text/wscr/Manifest
new file mode 100644
index 000000000000..9af57eac226c
--- /dev/null
+++ b/app-text/wscr/Manifest
@@ -0,0 +1,3 @@
+DIST wscr-1.2.tar.gz 3502 BLAKE2B 4a6684dd6d9eb9c23caa92f9ddf62332f59b20eb4aba0f475015ddc7e66c592177b0d15ec25249fed86e2302a53463f59d608bd727d97bc33a42d903ecd04281 SHA512 8a26c7fb190f830f6436240fc00dcf61405b1818ff311999e02c64b3506fa6abf13a6f212dbb9b15794ecae4f122def563f9301eebdd7e8d09f22cd647467ee3
+EBUILD wscr-1.2-r1.ebuild 600 BLAKE2B d2dcd3d6d7a2d575c06560c70b48ab81e43bb2c2b74e467d8aab63cb486a2e21b14d412e0aa2b63277be18e1caa9d13e556afae25d0a188db75bb8e1c3c7117a SHA512 40793d93f075829e9533a6f534fe3118c5b3849439ccc7a238d43fefbd450f170fb6ab729db63c713dbc7cb061e97fce157f558ce062d80cab9bd04311c779ae
+MISC metadata.xml 421 BLAKE2B dd48a7b914e790db0db06781519466d05de32f96ff8399e9fcb24ff040119dcec5380677910d9155c611c28203ac1ee7bf5d9602faeed69d4bff35a8cb1d6b3d SHA512 70722daa9c12a7e783b5fb3651f207c057648287e104739043f96c726820268ceb8e4ec211af9a3e2f8fcf7a5e03c9346cea7a25a70478dfdb60f333112b70e7
diff --git a/app-text/wscr/metadata.xml b/app-text/wscr/metadata.xml
new file mode 100644
index 000000000000..d5f156b045c3
--- /dev/null
+++ b/app-text/wscr/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+<email>jer@gentoo.org</email>
+</maintainer>
+<longdescription lang="en">WSCR is a program to solve word jumbles, print all
+permutations of a string, and print pseudo-anagrams. It will use /usr/dict/words
+or a user-specified wordlist file</longdescription>
+</pkgmetadata>
diff --git a/app-text/wscr/wscr-1.2-r1.ebuild b/app-text/wscr/wscr-1.2-r1.ebuild
new file mode 100644
index 000000000000..70eae73fb6be
--- /dev/null
+++ b/app-text/wscr/wscr-1.2-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit toolchain-funcs
+
+DESCRIPTION="A Lightweight and Fast Anagram Solver"
+HOMEPAGE="https://www.gentoo.org/"
+SRC_URI="https://dev.gentoo.org/~jer/${P}.tar.gz"
+LICENSE="public-domain"
+SLOT="0"
+
+KEYWORDS="amd64 ~mips ppc x86"
+IUSE=""
+RDEPEND="sys-apps/miscfiles"
+
+src_prepare() {
+	sed -i 's#"/usr/dict/words";#"/usr/share/dict/words";#' wscr.h || die
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" FLAGS="${CFLAGS} ${LDFLAGS}"
+}
+
+src_install() {
+	dobin wscr
+	doman wscr.6
+	dodoc README
+}
diff --git a/app-text/wv-1.2.9-r2 b/app-text/wv-1.2.9-r2
deleted file mode 100644
index a778b0aba66e..000000000000
--- a/app-text/wv-1.2.9-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-libs/glib-2:2 >=gnome-extra/libgsf-1.13:= sys-libs/zlib media-libs/libpng:0= dev-libs/libxml2:2 tools? ( app-text/texlive-core dev-texlive/texlive-latex ) wmf? ( >=media-libs/libwmf-0.2.2 ) virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Tool for conversion of MSWord doc and rtf files to something readable
-EAPI=6
-HOMEPAGE=http://wvware.sourceforge.net/
-IUSE=tools wmf
-KEYWORDS=alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2:2 >=gnome-extra/libgsf-1.13:= sys-libs/zlib media-libs/libpng:0= dev-libs/libxml2:2 tools? ( app-text/texlive-core dev-texlive/texlive-latex ) wmf? ( >=media-libs/libwmf-0.2.2 )
-SLOT=0
-SRC_URI=http://abiword.org/downloads/wv/1.2.9/wv-1.2.9.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9cfd5ef3ec0923d117aad46bd2e75e39
diff --git a/app-text/wv/Manifest b/app-text/wv/Manifest
new file mode 100644
index 000000000000..07ae28b83ef0
--- /dev/null
+++ b/app-text/wv/Manifest
@@ -0,0 +1,4 @@
+AUX wv-1.2.9-format-security.patch 336 BLAKE2B 18641a15c75a32250012771bd8ca8b0739f503ef8d1d2eebe23f2d378996aa3f6e2f0cfa72f8077add3db33f8ece86c57e80cc5b868719472b45ba1bed10a7d0 SHA512 99fef3bec0f129ae2d138c50d1e3e9288d5309db87a72d9b1970d1d230e20be3469b423f0b74c5083a0a5cdca8fed0b2ca32ec1fefdca22f213e4a02a6bbd405
+DIST wv-1.2.9.tar.gz 616256 BLAKE2B 6a6aa6b5f87a934c703c8a74d85af3d7aa84dcd2bc613a3af7fb8d69a9339e71ba2618ae8f725b90c3fe0b0199f4b224bdb32a50c2b6b6614f84b6a14437633f SHA512 ae5c762012595ce8922bfda8749ad3e9cb055edab30152c3a5feaaf3ca6601f357d1e301b179e9a5860cd99452dd6e63e5f44f5bcc12f8db148bdd334e0200a5
+EBUILD wv-1.2.9-r2.ebuild 1454 BLAKE2B a83fc6db9afd3a98697eb1b5f74ac1e9823428b67d2483875e4387717c8b02a2a97093f511490c2006ddaf5813db070ef1514fdd4046e7b1add3b4b66870482a SHA512 db9304515079b91cb54de90d84fafe963dd81e2d37e6fb70a5598448e05958e7ddff037dbbcee8c3337e412f37d92cc26865c3760277ab03ea518ab6b394a610
+MISC metadata.xml 448 BLAKE2B 2ad03c8351da9b74d3420841cbb63aa4a5f8723bdd698ded80bfbc91f0d7bda75b0f2d671a74882e32f7f7e1b1e3d6bc4f1ff491132af931e5914b853b3ff854 SHA512 f6ed1d52b212ac06af826dea4218cdc3017d2d7e417f943bd14f2f223221da1d8a4401852e4fd8375195a77f4f10465d93b8ce62e3981c41570220b5699e4a55
diff --git a/app-text/wv/files/wv-1.2.9-format-security.patch b/app-text/wv/files/wv-1.2.9-format-security.patch
new file mode 100644
index 000000000000..0bb7ac21f2c1
--- /dev/null
+++ b/app-text/wv/files/wv-1.2.9-format-security.patch
@@ -0,0 +1,11 @@
+--- wv-1.2.9/wvRTF.c.orig	2013-12-12 17:03:41.635612853 -0500
++++ wv-1.2.9/wvRTF.c	2013-12-12 17:04:05.528003832 -0500
+@@ -192,7 +192,7 @@
+     rtf_output_char ('{');
+ 
+     /* font color */
+-    rtf_output (rtfColors[ud->cCol]);
++    rtf_output ("%s", rtfColors[ud->cCol]);
+ 
+     /* font face */
+     rtf_output ("\\f%d", ud->cFont);
diff --git a/app-text/wv/metadata.xml b/app-text/wv/metadata.xml
new file mode 100644
index 000000000000..cd50be096520
--- /dev/null
+++ b/app-text/wv/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
+	<use>
+		<flag name="tools">Install optional utilities considered deprecated in favor of using AbiWord.</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">wvware</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/wv/wv-1.2.9-r2.ebuild b/app-text/wv/wv-1.2.9-r2.ebuild
new file mode 100644
index 000000000000..e80da09ffb16
--- /dev/null
+++ b/app-text/wv/wv-1.2.9-r2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils autotools
+
+DESCRIPTION="Tool for conversion of MSWord doc and rtf files to something readable"
+SRC_URI="http://abiword.org/downloads/${PN}/${PV}/${P}.tar.gz"
+HOMEPAGE="http://wvware.sourceforge.net/"
+
+IUSE="tools wmf"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
+SLOT="0"
+LICENSE="GPL-2"
+
+RDEPEND="
+	>=dev-libs/glib-2:2
+	>=gnome-extra/libgsf-1.13:=
+	sys-libs/zlib
+	media-libs/libpng:0=
+	dev-libs/libxml2:2
+	tools? ( app-text/texlive-core
+		 dev-texlive/texlive-latex )
+	wmf? ( >=media-libs/libwmf-0.2.2 )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+PATCHES=( "${FILESDIR}/${P}-format-security.patch" )
+
+src_prepare() {
+	default
+
+	if ! use tools; then
+		sed -i -e '/bin_/d' GNUmakefile.am || die
+		sed -i -e '/SUBDIRS/d' GNUmakefile.am || die
+		sed -i -e '/\/GNUmakefile/d' configure.ac || die
+		sed -i -e '/wv[[:upper:]]/d' configure.ac || die
+
+		# automake-1.13 fix, bug #467620
+		sed -i -e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' configure.ac || die
+
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	econf \
+		--disable-static \
+		$(use_with wmf libwmf)
+}
+
+src_install () {
+	default
+	prune_libtool_files
+
+	rm -f "${ED}"/usr/share/man/man1/wvConvert.1
+	if use tools; then
+		dosym  /usr/share/man/man1/wvWare.1 /usr/share/man/man1/wvConvert.1 || die
+	fi
+}
diff --git a/app-text/wv2-0.4.2-r2 b/app-text/wv2-0.4.2-r2
deleted file mode 100644
index e5708e659bc8..000000000000
--- a/app-text/wv2-0.4.2-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/glib >=gnome-extra/libgsf-1.8:= virtual/libiconv zlib? ( sys-libs/zlib ) sys-devel/make >=dev-util/cmake-3.9.6
-DESCRIPTION=Excellent MS Word filter lib, used in most Office suites
-EAPI=6
-HOMEPAGE=http://wvware.sourceforge.net
-IUSE=zlib
-KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd
-LICENSE=LGPL-2
-RDEPEND=dev-libs/glib >=gnome-extra/libgsf-1.8:= virtual/libiconv zlib? ( sys-libs/zlib )
-SLOT=0
-SRC_URI=mirror://sourceforge/wvware/wv2-0.4.2.tar.bz2
-_eclasses_=cmake-utils	57384a259cf0c7985ce651b2c0865405	desktop	1b286a7e7143d8c4ec89cd0d2743a097	eapi7-ver	d97a56a62c7df8614afddcb25f5ff00f	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	d2e7e7d290428bb25c56dcf2502badc1	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=be670ae54a5cac317c973333bda347ad
diff --git a/app-text/wv2/Manifest b/app-text/wv2/Manifest
new file mode 100644
index 000000000000..4cacd3eedbf9
--- /dev/null
+++ b/app-text/wv2/Manifest
@@ -0,0 +1,5 @@
+AUX wv2-0.4.2-glib.patch 312 BLAKE2B 7c68aff28688cf4ad7ee99c73d4509197e958bf05fc6dc8a556e2c2376cd586942778dcb8cbb1aa1a80cf24b1ab94415224b5af122756eeae02a316464eb6323 SHA512 0dfa6f75d9c117869eff3c4c5aadaf6096af8b2239626fc249a3df3ddb5437c417c3265a0a5d956af2241c9d7b3cc137b6c79598c38506fedd2964e85bcf54ea
+AUX wv2-0.4.2-libgsf.patch 425 BLAKE2B 417d6b340c34dffee0301308ee5a04f4468a5627670638399535f7336cca7515927392e66dd723e8a13742e71ccb1bf850c7b91608b7f280b545a707d6425a2d SHA512 634b1a336506777f8976b81cd906f8a896e2b777a3f04c5791277ed5ca2856dacb71adab807efecdf29d07c02e4c95b5d6fe143b1660be77e37ed9d7bd177143
+DIST wv2-0.4.2.tar.bz2 452759 BLAKE2B 6134739459617189f9d4e11a660dac25114b5d329b43d02fffe773d25bf62f2eb9f4ccb2712016e670c72f089a6d48f764e99b0ce5d44554d3e9d69ea9e14762 SHA512 7b4fb1dc6aa05da52ea169bf13f3bb544a7a896cf9127b6d67a08e991d798e81e2bf65724cf9396a9b89902f7856007006d8b123fcaaccce77e2a4668a9c9d5b
+EBUILD wv2-0.4.2-r2.ebuild 831 BLAKE2B a8829c7340d953d9b6329837956f2639936a5bf33c6f88b4937fda6bc0f115c24bf8ad96de3046a41b40db3bea124a2ea436944f07e504d352afc605536f6dd1 SHA512 ee2dc6db1c3302a6938157bccb9bddf3d77ef571a5e10907a2832af93fb6452d8668489c648a7d9b26705b01936f63113b52a69629c44ae4d03159ca70f2ae21
+MISC metadata.xml 394 BLAKE2B 33e5bd22439c91b6c6ae5f1cd67ed2419fd44f90a6f4dad26247d3b57ad3f46ff85a7dde13ecd1d4f859fdd08c87a8a836add617f05a8fe586579189c6df1c1f SHA512 abdccf92962c57c2c206a32eab8e855467874b3e17e8f1fc5db8d84b4c368fd005d3cee9e4bac28bd775aff4e9bd9319d61dc1c0e47492c2c531b41b33a4e4f2
diff --git a/app-text/wv2/files/wv2-0.4.2-glib.patch b/app-text/wv2/files/wv2-0.4.2-glib.patch
new file mode 100644
index 000000000000..eaa2a61fc66a
--- /dev/null
+++ b/app-text/wv2/files/wv2-0.4.2-glib.patch
@@ -0,0 +1,12 @@
+From: https://sourceforge.net/tracker/?func=detail&aid=3544851&group_id=10501&atid=110501
+--- a/src/olestream.h
++++ b/src/olestream.h
+@@ -23,7 +23,7 @@
+ #include "global.h"  // U8,... typedefs
+ #include <stack>
+ 
+-#include <glib/giochannel.h> // GSeekType
++#include <glib.h> // GSeekType
+ 
+ namespace wvWare {
+ 
diff --git a/app-text/wv2/files/wv2-0.4.2-libgsf.patch b/app-text/wv2/files/wv2-0.4.2-libgsf.patch
new file mode 100644
index 000000000000..efbf02f57525
--- /dev/null
+++ b/app-text/wv2/files/wv2-0.4.2-libgsf.patch
@@ -0,0 +1,13 @@
+http://bugs.gentoo.org/show_bug.cgi?id=465882
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -34,7 +34,7 @@
+   FIND_PACKAGE( ZLIB REQUIRED )
+ ENDIF( WITH_ZLIB )
+ 
+-INCLUDE_DIRECTORIES( ${GLIB2_INCLUDE_DIR} ${LIBGSF_INCLUDE_DIR} ${ICONV_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} )
++INCLUDE_DIRECTORIES( ${GLIB2_INCLUDE_DIR} ${LIBGSF_INCLUDE_DIR} ${PC_LIBGSF_INCLUDE_DIRS} ${ICONV_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} )
+ 
+ #
+ # Iconv checks
diff --git a/app-text/wv2/metadata.xml b/app-text/wv2/metadata.xml
new file mode 100644
index 000000000000..4102994d89ca
--- /dev/null
+++ b/app-text/wv2/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">wvware</remote-id>
+		<bugs-to>https://sourceforge.net/tracker/?group_id=10501</bugs-to>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/wv2/wv2-0.4.2-r2.ebuild b/app-text/wv2/wv2-0.4.2-r2.ebuild
new file mode 100644
index 000000000000..5f5d76cee7ef
--- /dev/null
+++ b/app-text/wv2/wv2-0.4.2-r2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils flag-o-matic
+
+DESCRIPTION="Excellent MS Word filter lib, used in most Office suites"
+HOMEPAGE="http://wvware.sourceforge.net"
+SRC_URI="mirror://sourceforge/wvware/${P}.tar.bz2"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+IUSE="zlib"
+
+RDEPEND="
+	dev-libs/glib
+	>=gnome-extra/libgsf-1.8:=
+	virtual/libiconv
+	zlib? ( sys-libs/zlib )"
+DEPEND="
+	${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-glib.patch
+	"${FILESDIR}"/${P}-libgsf.patch
+)
+DOCS=( AUTHORS ChangeLog README RELEASE THANKS TODO )
+
+src_configure() {
+	# due to ICU 59 requiring C++11 now
+	append-cxxflags -std=c++11
+
+	local mycmakeargs=(
+		-DWITH_ZLIB=$(usex zlib)
+	)
+	cmake-utils_src_configure
+}
diff --git a/app-text/xapian-omega-1.2.24 b/app-text/xapian-omega-1.2.24
deleted file mode 100644
index 5f5919b91c3a..000000000000
--- a/app-text/xapian-omega-1.2.24
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-libs/xapian:0/1.2.22 dev-lang/perl dev-libs/libpcre sys-libs/zlib
-DESCRIPTION=An application built on Xapian, consisting of indexers and a CGI search frontend
-EAPI=5
-HOMEPAGE=https://xapian.org/
-KEYWORDS=alpha amd64 arm ia64 ~mips ppc ppc64 sparc x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/xapian:0/1.2.22 dev-lang/perl dev-libs/libpcre sys-libs/zlib
-SLOT=0
-SRC_URI=http://www.oligarchy.co.uk/xapian/1.2.24/xapian-omega-1.2.24.tar.xz
-_md5_=1f73ae03444be08250a478cd4524e8d7
diff --git a/app-text/xapian-omega-1.2.25 b/app-text/xapian-omega-1.2.25
deleted file mode 100644
index 6be25134dabf..000000000000
--- a/app-text/xapian-omega-1.2.25
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-libs/xapian:0/1.2.22 dev-lang/perl dev-libs/libpcre sys-libs/zlib
-DESCRIPTION=An application built on Xapian, consisting of indexers and a CGI search frontend
-EAPI=5
-HOMEPAGE=https://xapian.org/
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/xapian:0/1.2.22 dev-lang/perl dev-libs/libpcre sys-libs/zlib
-SLOT=0
-SRC_URI=http://www.oligarchy.co.uk/xapian/1.2.25/xapian-omega-1.2.25.tar.xz
-_md5_=53d801fcee3275682b212bd09d8b6670
diff --git a/app-text/xapian-omega-1.4.4 b/app-text/xapian-omega-1.4.4
deleted file mode 100644
index dbec0758033e..000000000000
--- a/app-text/xapian-omega-1.4.4
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-libs/xapian:0/30 dev-lang/perl dev-libs/libpcre sys-libs/zlib
-DESCRIPTION=An application built on Xapian, consisting of indexers and a CGI search frontend
-EAPI=6
-HOMEPAGE=https://xapian.org/
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/xapian:0/30 dev-lang/perl dev-libs/libpcre sys-libs/zlib
-SLOT=0
-SRC_URI=http://www.oligarchy.co.uk/xapian/1.4.4/xapian-omega-1.4.4.tar.xz
-_md5_=f4962aed272024efbe6cab67ba510647
diff --git a/app-text/xapian-omega-1.4.5 b/app-text/xapian-omega-1.4.5
deleted file mode 100644
index 9e0da1fbcb52..000000000000
--- a/app-text/xapian-omega-1.4.5
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-libs/xapian:0/30 dev-lang/perl dev-libs/libpcre sys-libs/zlib
-DESCRIPTION=An application built on Xapian, consisting of indexers and a CGI search frontend
-EAPI=6
-HOMEPAGE=https://xapian.org/
-KEYWORDS=~alpha amd64 ~arm ia64 ~mips ppc ppc64 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/xapian:0/30 dev-lang/perl dev-libs/libpcre sys-libs/zlib
-SLOT=0
-SRC_URI=http://www.oligarchy.co.uk/xapian/1.4.5/xapian-omega-1.4.5.tar.xz
-_md5_=305235ffb7513cd9009ff7d262e61278
diff --git a/app-text/xapian-omega-1.4.6 b/app-text/xapian-omega-1.4.6
deleted file mode 100644
index 1287c3a7d380..000000000000
--- a/app-text/xapian-omega-1.4.6
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-libs/xapian:0/30 dev-lang/perl dev-libs/libpcre sys-libs/zlib
-DESCRIPTION=An application built on Xapian, consisting of indexers and a CGI search frontend
-EAPI=6
-HOMEPAGE=https://xapian.org/
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/xapian:0/30 dev-lang/perl dev-libs/libpcre sys-libs/zlib
-SLOT=0
-SRC_URI=http://www.oligarchy.co.uk/xapian/1.4.6/xapian-omega-1.4.6.tar.xz
-_md5_=86440555ea64bb10f680b41fc68345ea
diff --git a/app-text/xapian-omega/Manifest b/app-text/xapian-omega/Manifest
new file mode 100644
index 000000000000..b5c831771805
--- /dev/null
+++ b/app-text/xapian-omega/Manifest
@@ -0,0 +1,11 @@
+DIST xapian-omega-1.2.24.tar.xz 438104 BLAKE2B d2b26ad007849ac7a0a8daea919fb215cda31734176d6e4821d6131f4ee50ead09b4874302e2c8222f7d5f995b53e870cbee0fb61176d594895519c1cb6d5029 SHA512 df483ed1410ca04df3b1ec4248442c91b03bd407737d022e494ffe3e14d62a41ee73b27114a979f59825e0ea2f2d16e0eea3c518a8db0094d697f0093e21f6a7
+DIST xapian-omega-1.2.25.tar.xz 440224 BLAKE2B 1e67cff0ed1796349df5da7d33c07febba2d8c79906fd98c66becd59d7d387174728551785ca42db1f69662cc157bbfc35c0e29f96958ddb76670797d9a4bcf7 SHA512 f412538cd50c82d7af28f2620c1e377afd3f03186259a145f9a37cd64d05837b7cc6f205627a3c8e4c25ec19efc2a81a6fe3a415d00b7a6f4df847d6ff2d453c
+DIST xapian-omega-1.4.4.tar.xz 501712 BLAKE2B d46a463c323bf75db6d426e0ac2057f4cd6ad16ea097eeb189f00356df484af52ba0c8b09d81a0262fe833b784d2bce9df20dd3d36b6f74c17c0e7337a30e2af SHA512 927c6afe24f8a13018fcc233e874c71c0912cb6200094f7246c12b4175bc48d752312e57128a314e7674a948a50ef092dd7f2dc8910db7df8f3ccf9c44f38533
+DIST xapian-omega-1.4.5.tar.xz 502820 BLAKE2B 3077a9a4fd177daa7f8470bea0b8dde25402235fee280118a90930888543b2da7821ad7d30143d04d35dccfb0de6c375231f2db4a4f4dcbaeeaf5d4e54045cfc SHA512 895da1e1a3ddf2e5e8576fd41853cc5cb7c6e4f0223a0d25f6303fd01ca26f64c8e41616d6d66b2309a4ca5763b2b20b208dbf6054f0498411f2678422c07893
+DIST xapian-omega-1.4.6.tar.xz 510012 BLAKE2B 2c6d3479fe02eb3b44ef0995b0dfc2ce47012104bc860532967f234ccb7bb2a3357337419fbf5b79b42d0f598608fe9a071edca2195e4f025fb69760091c78ec SHA512 9376145c9c7c728bf444f5891777fe946bc574a4c91ef65779aae4cd2f40c76b33cde1231f654f23de32df8a4eea4aa0c69868d269ec79fba3abad2567ffb80d
+EBUILD xapian-omega-1.2.24.ebuild 1265 BLAKE2B 3208b0fbbacfe32abde89176a4f4615a9cc848e7f37a9f23333309da9804b457713a9a7b774d62d97043701813996ce53abb689bf944ca1cec1262510f61156d SHA512 8f8902b4d7843bb2a70e1c673b6aa78e5fa17f248709a9c62d03ff65c3a47784b98110ac8c3f73dfc8772f58094b96ceea41b11c7ddac17744714fbde6c55674
+EBUILD xapian-omega-1.2.25.ebuild 1273 BLAKE2B f57b3917eb6e9f37879b55d1e759e529c84901b237c673a5093acd2ef5d5117ed279d310995f2709e066f2e6f03e9a3cd6b4cccb2bea2faaa5adcfd03da93277 SHA512 b9a29ac4b8bfdacc219d171a088e1a05e3b092744317d33f197ef77415007ee589d89ee3512a937b4a0c63c781d3a319e05cc3ea7ae89aa5770d6a258784bc38
+EBUILD xapian-omega-1.4.4.ebuild 1156 BLAKE2B 04daef4ad0d3cdac10fc657b54cb5d21c5fa445561a51b1add18db624ec97ad43531597ffce51648ec978fc39f57760c61e1b120cf660a1e8b452470311f2a97 SHA512 006fdcf2159d49895786895245f7236dda96d81fea5e6b80d707083a7cc17153aec1969c1a30a6677a0b67e39ee53376eb507a9a7efacc12057b8dba070fcb66
+EBUILD xapian-omega-1.4.5.ebuild 1155 BLAKE2B 6671be7b3f0b290a0576ed0818db81e3533d87f1cbc7a9329d9bb093e842f41a028d72157315ae040b8d118f5d3b2396ea1b670266a16319a1c09ee1253ff8a3 SHA512 d1f6125975790b2ef9f80f9b0e942c915444bd92fb08ac98858e30fd25eb973f618771dd35f62e792f75bdaa7fb127b47e0a08443d53ae4202cb1a135f6f4ae2
+EBUILD xapian-omega-1.4.6.ebuild 1159 BLAKE2B 20e6767964ec6e986b48c02758c2acabee7ad2d6ef27308f92fa2098d02a07b4a7266b217b46b746e37c210c5514d2541350c4fb813e7ae3f228ff6f6ea21aae SHA512 0c152b80fa9f8495290e8869888f93866de076498e0ac33471b10e520bec2b6a0149d0c6d4418ec25d450c4f815721291e08e090619feb1ae809bb4f1dbee732
+MISC metadata.xml 252 BLAKE2B f6282e2a99df668246ea8570c72345463f06d282b6adc6d9de2a08ef0827cf4572332c580caa594aad5ba8e200870d8d25494549ee4413798025f0d885b61a68 SHA512 cbda7bf9832872764ae776ce16b2966c37a2ba3a1982d9817006fd6b82d7b17146434cde428bf114062a483e9053d2acdcdd004695e6ebf428d19cdc09937c65
diff --git a/app-text/xapian-omega/metadata.xml b/app-text/xapian-omega/metadata.xml
new file mode 100644
index 000000000000..d920e3ba3e56
--- /dev/null
+++ b/app-text/xapian-omega/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>blueness@gentoo.org</email>
+		<name>Anthony G. Basile</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-text/xapian-omega/xapian-omega-1.2.24.ebuild b/app-text/xapian-omega/xapian-omega-1.2.24.ebuild
new file mode 100644
index 000000000000..461cf699baeb
--- /dev/null
+++ b/app-text/xapian-omega/xapian-omega-1.2.24.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+DESCRIPTION="An application built on Xapian, consisting of indexers and a CGI search frontend"
+SRC_URI="http://www.oligarchy.co.uk/xapian/${PV}/xapian-omega-${PV}.tar.xz"
+HOMEPAGE="https://xapian.org/"
+S="${WORKDIR}/xapian-omega-${PV}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sparc x86"
+IUSE=""
+
+DEPEND="dev-libs/xapian:0/1.2.22
+	dev-lang/perl
+	dev-libs/libpcre
+	sys-libs/zlib"
+RDEPEND="${DEPEND}"
+
+src_install () {
+	emake DESTDIR="${D}" install
+
+	# Protect /etc/omega.conf
+	echo "CONFIG_PROTECT=\"/etc/omega.conf\"" > "${T}"/20xapian-omega
+	doenvd "${T}"/20xapian-omega
+	dodoc AUTHORS ChangeLog INSTALL NEWS README TODO
+
+	#move docs to /usr/share/doc/${PF}.
+	mv "${D}/usr/share/doc/xapian-omega" "${D}/usr/share/doc/${PF}" || die
+
+	# Directory containing Xapian databases:
+	keepdir /var/lib/omega/data
+
+	# Directory containing OmegaScript templates:
+	keepdir /var/lib/omega/templates
+	mv "${S}"/templates/* "${D}"/var/lib/omega/templates || die
+
+	# Directory to write Omega logs to:
+	keepdir /var/log/omega
+
+	# Directory containing any cdb files for the $lookup OmegaScript command:
+	keepdir /var/lib/omega/cdb
+}
diff --git a/app-text/xapian-omega/xapian-omega-1.2.25.ebuild b/app-text/xapian-omega/xapian-omega-1.2.25.ebuild
new file mode 100644
index 000000000000..b7f2da1d327f
--- /dev/null
+++ b/app-text/xapian-omega/xapian-omega-1.2.25.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+DESCRIPTION="An application built on Xapian, consisting of indexers and a CGI search frontend"
+SRC_URI="http://www.oligarchy.co.uk/xapian/${PV}/xapian-omega-${PV}.tar.xz"
+HOMEPAGE="https://xapian.org/"
+S="${WORKDIR}/xapian-omega-${PV}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DEPEND="dev-libs/xapian:0/1.2.22
+	dev-lang/perl
+	dev-libs/libpcre
+	sys-libs/zlib"
+RDEPEND="${DEPEND}"
+
+src_install () {
+	emake DESTDIR="${D}" install
+
+	# Protect /etc/omega.conf
+	echo "CONFIG_PROTECT=\"/etc/omega.conf\"" > "${T}"/20xapian-omega
+	doenvd "${T}"/20xapian-omega
+	dodoc AUTHORS ChangeLog INSTALL NEWS README TODO
+
+	#move docs to /usr/share/doc/${PF}.
+	mv "${D}/usr/share/doc/xapian-omega" "${D}/usr/share/doc/${PF}" || die
+
+	# Directory containing Xapian databases:
+	keepdir /var/lib/omega/data
+
+	# Directory containing OmegaScript templates:
+	keepdir /var/lib/omega/templates
+	mv "${S}"/templates/* "${D}"/var/lib/omega/templates || die
+
+	# Directory to write Omega logs to:
+	keepdir /var/log/omega
+
+	# Directory containing any cdb files for the $lookup OmegaScript command:
+	keepdir /var/lib/omega/cdb
+}
diff --git a/app-text/xapian-omega/xapian-omega-1.4.4.ebuild b/app-text/xapian-omega/xapian-omega-1.4.4.ebuild
new file mode 100644
index 000000000000..00a7af4ec641
--- /dev/null
+++ b/app-text/xapian-omega/xapian-omega-1.4.4.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+DESCRIPTION="An application built on Xapian, consisting of indexers and a CGI search frontend"
+SRC_URI="http://www.oligarchy.co.uk/xapian/${PV}/xapian-omega-${PV}.tar.xz"
+HOMEPAGE="https://xapian.org/"
+S="${WORKDIR}/xapian-omega-${PV}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86"
+IUSE=""
+
+DEPEND="dev-libs/xapian:0/30
+	dev-lang/perl
+	dev-libs/libpcre
+	sys-libs/zlib"
+RDEPEND="${DEPEND}"
+
+src_install () {
+	emake DESTDIR="${D}" install
+
+	# Protect /etc/omega.conf
+	echo "CONFIG_PROTECT=\"/etc/omega.conf\"" > "${T}"/20xapian-omega
+	doenvd "${T}"/20xapian-omega
+	dodoc AUTHORS ChangeLog INSTALL NEWS README TODO
+
+	# Directory containing Xapian databases:
+	keepdir /var/lib/omega/data
+
+	# Directory containing OmegaScript templates:
+	keepdir /var/lib/omega/templates
+	mv "${S}"/templates/* "${D}"/var/lib/omega/templates || die
+
+	# Directory to write Omega logs to:
+	keepdir /var/log/omega
+
+	# Directory containing any cdb files for the $lookup OmegaScript command:
+	keepdir /var/lib/omega/cdb
+}
diff --git a/app-text/xapian-omega/xapian-omega-1.4.5.ebuild b/app-text/xapian-omega/xapian-omega-1.4.5.ebuild
new file mode 100644
index 000000000000..47d14797d720
--- /dev/null
+++ b/app-text/xapian-omega/xapian-omega-1.4.5.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+DESCRIPTION="An application built on Xapian, consisting of indexers and a CGI search frontend"
+SRC_URI="http://www.oligarchy.co.uk/xapian/${PV}/xapian-omega-${PV}.tar.xz"
+HOMEPAGE="https://xapian.org/"
+S="${WORKDIR}/xapian-omega-${PV}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ia64 ~mips ppc ppc64 ~sparc ~x86"
+IUSE=""
+
+DEPEND="dev-libs/xapian:0/30
+	dev-lang/perl
+	dev-libs/libpcre
+	sys-libs/zlib"
+RDEPEND="${DEPEND}"
+
+src_install () {
+	emake DESTDIR="${D}" install
+
+	# Protect /etc/omega.conf
+	echo "CONFIG_PROTECT=\"/etc/omega.conf\"" > "${T}"/20xapian-omega
+	doenvd "${T}"/20xapian-omega
+	dodoc AUTHORS ChangeLog INSTALL NEWS README TODO
+
+	# Directory containing Xapian databases:
+	keepdir /var/lib/omega/data
+
+	# Directory containing OmegaScript templates:
+	keepdir /var/lib/omega/templates
+	mv "${S}"/templates/* "${D}"/var/lib/omega/templates || die
+
+	# Directory to write Omega logs to:
+	keepdir /var/log/omega
+
+	# Directory containing any cdb files for the $lookup OmegaScript command:
+	keepdir /var/lib/omega/cdb
+}
diff --git a/app-text/xapian-omega/xapian-omega-1.4.6.ebuild b/app-text/xapian-omega/xapian-omega-1.4.6.ebuild
new file mode 100644
index 000000000000..69bb116aaa81
--- /dev/null
+++ b/app-text/xapian-omega/xapian-omega-1.4.6.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+DESCRIPTION="An application built on Xapian, consisting of indexers and a CGI search frontend"
+SRC_URI="http://www.oligarchy.co.uk/xapian/${PV}/xapian-omega-${PV}.tar.xz"
+HOMEPAGE="https://xapian.org/"
+S="${WORKDIR}/xapian-omega-${PV}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DEPEND="dev-libs/xapian:0/30
+	dev-lang/perl
+	dev-libs/libpcre
+	sys-libs/zlib"
+RDEPEND="${DEPEND}"
+
+src_install () {
+	emake DESTDIR="${D}" install
+
+	# Protect /etc/omega.conf
+	echo "CONFIG_PROTECT=\"/etc/omega.conf\"" > "${T}"/20xapian-omega
+	doenvd "${T}"/20xapian-omega
+	dodoc AUTHORS ChangeLog INSTALL NEWS README TODO
+
+	# Directory containing Xapian databases:
+	keepdir /var/lib/omega/data
+
+	# Directory containing OmegaScript templates:
+	keepdir /var/lib/omega/templates
+	mv "${S}"/templates/* "${D}"/var/lib/omega/templates || die
+
+	# Directory to write Omega logs to:
+	keepdir /var/log/omega
+
+	# Directory containing any cdb files for the $lookup OmegaScript command:
+	keepdir /var/lib/omega/cdb
+}
diff --git a/app-text/xchm-1.23-r1 b/app-text/xchm-1.23-r1
deleted file mode 100644
index bc0eef25a8cc..000000000000
--- a/app-text/xchm-1.23-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare
-DEPEND=>=dev-libs/chmlib-0.36 x11-libs/wxGTK:3.0[X]
-DESCRIPTION=Utility for viewing Compiled HTML Help (CHM) files
-EAPI=5
-HOMEPAGE=http://xchm.sourceforge.net/
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/chmlib-0.36 x11-libs/wxGTK:3.0[X]
-SLOT=0
-SRC_URI=mirror://sourceforge/xchm/xchm-1.23.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	04e063b0eff26daaea83d859dd9d6e05	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2bd5c575d9f2d7ab7902568158114bf1
diff --git a/app-text/xchm-1.23-r2 b/app-text/xchm-1.23-r2
deleted file mode 100644
index 52a60a31c38d..000000000000
--- a/app-text/xchm-1.23-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare
-DEPEND=>=dev-libs/chmlib-0.36 x11-libs/wxGTK:3.0-gtk3[X]
-DESCRIPTION=Utility for viewing Compiled HTML Help (CHM) files
-EAPI=6
-HOMEPAGE=http://xchm.sourceforge.net/
-KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/chmlib-0.36 x11-libs/wxGTK:3.0-gtk3[X]
-SLOT=0
-SRC_URI=mirror://sourceforge/xchm/xchm-1.23.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wxwidgets	04e063b0eff26daaea83d859dd9d6e05	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a2f0543d73179a5c86e347b6a65d6d64
diff --git a/app-text/xchm/Manifest b/app-text/xchm/Manifest
new file mode 100644
index 000000000000..345cb03d164d
--- /dev/null
+++ b/app-text/xchm/Manifest
@@ -0,0 +1,7 @@
+AUX xchm-1.23-wx3.0-compat.patch 929 BLAKE2B 87f22da40033007e071ff3c1ca49724702731decff28cbe46ee6722da86ce03e5e569419cb077fdbc00132d19288c5794e09a2a43a6748da58a9fb899d85128d SHA512 7813bb885d9a62dd9da8484875cac5436b68cf1fbcc0212089c9cc10b104ffb05ea7af768a3a182c72f660c1be49a1f990700532416a7b7c028b282ecd83fca4
+AUX xchm.desktop 251 BLAKE2B 69b8a13fbf6129aedb89f558541728bdce055a585387d1cec49c08f86b6a5d972287b63fe2ba719b83bcab9270e07c1c0d50ccaeff36bc8cd291fa7602a67863 SHA512 c17e6e3957d4c0720e43dd64b169daf221e26652fd6487d2838a4c4aa86cd9640e651d55e6bc28dd4c4cc7b37624baf83df55061583f65eeecc592bd2c9a5e54
+AUX xchm.xml 257 BLAKE2B 0b32e654afe5af057c219830f61989e2266d55c726b90cc73795ab260034e162d16af2ecce463d74feb136b5b7bfd6e8544a56d883c349bf3158f750aba05212 SHA512 c2dc02da01dce9be31c92d95c28d8ada8c9532499d4f5d8875b41a42bd1f070f6f938e7f4cafdb8d42b13298d81eb03c3347e19c70b395f872888fac5a658533
+DIST xchm-1.23.tar.gz 474274 BLAKE2B de73c04e68b876edefb1d45d9e982bcce6fd3afa06f8704d05fa5cae710d9724ed20ca50be9022570832da9954ba2af141a66e5b3ab02554441c84bac1d6ffed SHA512 c0df4362ff6db8136b20f62a76e7e93185375f6ef9eeeb1001e27ead9806d486332573ba8c3ca1863a70ce6b1d3bcc6d3af48d42add719312774dccfd7d18c90
+EBUILD xchm-1.23-r1.ebuild 1089 BLAKE2B 58c42b1eb68d2f84a421e511504b476eaf20e4033c54c032c438ec91a01ea3dc5afdc401ee0b15d650c8df1fcedd07a0a146c172f1d5cffcd4d8074575c561be SHA512 1e2ea33bb90588ba970930ccd7ab8f4fc696e03e1088dec1f65da5be8f139627cac104d9b53a6131a2c0ad2efca0747e0d17d77a684762967a688fba98016ace
+EBUILD xchm-1.23-r2.ebuild 1066 BLAKE2B a195970c160cc7216b1b4eacf079e33f8ed4391ac630eadd49fe60953858804dfe3003af5f4b493d9863bb1ec9750d05be2c30ffdbd8eae5900ab00011b094b7 SHA512 25d23d01ea964f0a924544d90b422dfba200ffb528c4ef0c1f2ef866df857936bc324969711b6de2ec5c609709b26c8b4ca9c9da94be84d7cd85127ca8f35cfb
+MISC metadata.xml 350 BLAKE2B f6872e04718f72ae186772afc32f65a55ed55f078f53c6b3a8448bffcf006eb65ef1923e98d369af3e9c6fda5977bd148ae13a2d8e32ab2e2a6680a4ec5fe2c6 SHA512 956319a7ec2b136c5a1b38a51ab1fb61f81274dc2898eff1441393ddc4d0c204854093800210b9e44ef214427e4664f61d0ba1c3a8c43d8f21812b55371e3e66
diff --git a/app-text/xchm/files/xchm-1.23-wx3.0-compat.patch b/app-text/xchm/files/xchm-1.23-wx3.0-compat.patch
new file mode 100644
index 000000000000..a9545cf5b568
--- /dev/null
+++ b/app-text/xchm/files/xchm-1.23-wx3.0-compat.patch
@@ -0,0 +1,32 @@
+Description: Fix code to compile with wxwidgets 3.0
+ Drops support for wx < 2.7, which is just not relevant now.  And in fact
+ configure.ac checks for at least 2.8.0.
+Author: Olly Betts <olly@survex.com>
+Last-Update: 2014-03-07
+
+--- xchm-1.23.orig/src/chmframe.cpp
++++ xchm-1.23/src/chmframe.cpp
+@@ -265,11 +265,7 @@ void CHMFrame::OnChangeFonts(wxCommandEv
+ 		enu.EnumerateFacenames();
+ 		_normalFonts = new wxArrayString;
+ 
+-#if wxMAJOR_VERSION == 2 && wxMINOR_VERSION >= 7
+ 		*_normalFonts = enu.GetFacenames();
+-#else
+-		*_normalFonts = *enu.GetFacenames();
+-#endif
+ 		_normalFonts->Sort();
+ 	}
+ 
+@@ -278,11 +274,7 @@ void CHMFrame::OnChangeFonts(wxCommandEv
+ 		enu.EnumerateFacenames(wxFONTENCODING_SYSTEM, TRUE);
+ 		_fixedFonts = new wxArrayString;
+ 
+-#if wxMAJOR_VERSION == 2 && wxMINOR_VERSION >= 7
+ 		*_fixedFonts = enu.GetFacenames();
+-#else
+-		*_fixedFonts = *enu.GetFacenames();
+-#endif
+ 		_fixedFonts->Sort();
+ 	}
+ 
diff --git a/app-text/xchm/files/xchm.desktop b/app-text/xchm/files/xchm.desktop
new file mode 100644
index 000000000000..a8842132a170
--- /dev/null
+++ b/app-text/xchm/files/xchm.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Type=Application
+Version=1.0
+Name=xCHM
+Comment=Compiled HTML Help (CHM) file viewer
+Comment[fr]=Visionneuse de fichiers Compiled HTML Help (CHM)
+Icon=xchm
+TryExec=xchm
+Exec=xchm %f
+MimeType=application/x-chm;
+Categories=Office;Viewer;
diff --git a/app-text/xchm/files/xchm.xml b/app-text/xchm/files/xchm.xml
new file mode 100644
index 000000000000..08cb9ca3f4b8
--- /dev/null
+++ b/app-text/xchm/files/xchm.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
+  <mime-type type="application/x-chm">
+    <comment>Compiled HTML Help Format</comment>
+    <glob pattern="*.chm"/>
+  </mime-type>
+</mime-info>
diff --git a/app-text/xchm/metadata.xml b/app-text/xchm/metadata.xml
new file mode 100644
index 000000000000..e0b21d3488e8
--- /dev/null
+++ b/app-text/xchm/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>desktop-misc@gentoo.org</email>
+		<name>Gentoo Desktop Miscellaneous Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">xchm</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/xchm/xchm-1.23-r1.ebuild b/app-text/xchm/xchm-1.23-r1.ebuild
new file mode 100644
index 000000000000..26b4e3e15f86
--- /dev/null
+++ b/app-text/xchm/xchm-1.23-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+WX_GTK_VER="3.0"
+
+inherit eutils flag-o-matic wxwidgets xdg-utils
+
+DESCRIPTION="Utility for viewing Compiled HTML Help (CHM) files"
+HOMEPAGE="http://xchm.sourceforge.net/"
+SRC_URI="mirror://sourceforge/xchm/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+
+IUSE=""
+DEPEND=">=dev-libs/chmlib-0.36
+	x11-libs/wxGTK:${WX_GTK_VER}[X]"
+RDEPEND=${DEPEND}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-wx3.0-compat.patch
+
+	append-flags -Wno-unused-local-typedefs
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	dodoc AUTHORS README ChangeLog
+
+	cp "${D}"/usr/share/pixmaps/xchm-32.xpm "${D}"/usr/share/pixmaps/xchm.xpm
+	rm -f "${D}"/usr/share/pixmaps/xchm-*.xpm
+	rm -f "${D}"/usr/share/pixmaps/xchmdoc*.xpm
+
+	domenu "${FILESDIR}"/xchm.desktop
+	insinto /usr/share/mime/packages
+	doins "${FILESDIR}"/xchm.xml
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/app-text/xchm/xchm-1.23-r2.ebuild b/app-text/xchm/xchm-1.23-r2.ebuild
new file mode 100644
index 000000000000..f7ee063880c7
--- /dev/null
+++ b/app-text/xchm/xchm-1.23-r2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+WX_GTK_VER="3.0-gtk3"
+
+inherit wxwidgets xdg-utils
+
+DESCRIPTION="Utility for viewing Compiled HTML Help (CHM) files"
+HOMEPAGE="http://xchm.sourceforge.net/"
+SRC_URI="mirror://sourceforge/xchm/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+IUSE=""
+DEPEND=">=dev-libs/chmlib-0.36
+	x11-libs/wxGTK:${WX_GTK_VER}[X]"
+RDEPEND=${DEPEND}
+
+PATCHES=( "${FILESDIR}"/${P}-wx3.0-compat.patch )
+
+src_prepare() {
+	setup-wxwidgets
+	default
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	dodoc AUTHORS README ChangeLog
+
+	cp "${D}"/usr/share/pixmaps/xchm-32.xpm "${D}"/usr/share/pixmaps/xchm.xpm
+	rm -f "${D}"/usr/share/pixmaps/xchm-*.xpm
+	rm -f "${D}"/usr/share/pixmaps/xchmdoc*.xpm
+
+	domenu "${FILESDIR}"/xchm.desktop
+	insinto /usr/share/mime/packages
+	doins "${FILESDIR}"/xchm.xml
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/app-text/xdvik-22.87.03-r1 b/app-text/xdvik-22.87.03-r1
deleted file mode 100644
index 2a56c70fa016..000000000000
--- a/app-text/xdvik-22.87.03-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare
-DEPEND=sys-devel/flex virtual/yacc virtual/pkgconfig media-libs/freetype:2 x11-libs/libX11 x11-libs/libXi x11-libs/libXmu x11-libs/libXpm x11-libs/libXt motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( neXt? ( x11-libs/neXtaw ) !neXt? ( Xaw3d? ( x11-libs/libXaw3d ) !Xaw3d? ( x11-libs/libXaw ) ) ) dev-libs/kpathsea
-DESCRIPTION=DVI previewer for X Window System
-EAPI=5
-HOMEPAGE=http://xdvi.sourceforge.net/
-IUSE=motif neXt Xaw3d emacs
-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 ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=media-libs/freetype:2 x11-libs/libX11 x11-libs/libXi x11-libs/libXmu x11-libs/libXpm x11-libs/libXt motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( neXt? ( x11-libs/neXtaw ) !neXt? ( Xaw3d? ( x11-libs/libXaw3d ) !Xaw3d? ( x11-libs/libXaw ) ) ) dev-libs/kpathsea virtual/latex-base !<app-text/texlive-2007
-SLOT=0
-SRC_URI=mirror://sourceforge/xdvi/xdvik-22.87.03.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a571386384a537f42b1d2dc85a2b139a
diff --git a/app-text/xdvik/Manifest b/app-text/xdvik/Manifest
new file mode 100644
index 000000000000..f3b9b45b3cbc
--- /dev/null
+++ b/app-text/xdvik/Manifest
@@ -0,0 +1,4 @@
+AUX xdvik.xpm 3125 BLAKE2B 97990fbd5b22e51319c3f55bfe16808b01f215a92185a170620c8c0ef1dc44906e38af48ad056d4fb40a1777f92a88afaa0f80c0b36e7dd770954f7009d261a3 SHA512 697c888c481d7cbe7b42980d2ae93a8d25d781f926970d9040f8fbc6a37545349fbdbe2e8c98fb686e5a5ebe9a7a5ff661793d3a264fd8641182b0397365517d
+DIST xdvik-22.87.03.tar.gz 4760306 BLAKE2B d242696fadf2980cd307d4a172d2af06d98d07b090279440117f869c9a623bcade8745d7a4d3c108c4eafbdeaadefb8d5ba1ea00bdf77d350cbf83c49c2ca0fb SHA512 d4d418d78658f16d4d278e387ed484b291afc8623b00acaf4110e9f123ed76568714ad50f80588373657f412e8fff36f3e76b3e43f69756d46f031c0f2269a88
+EBUILD xdvik-22.87.03-r1.ebuild 2759 BLAKE2B 94d4d96f58185f1a9a09b3049d2c20f9512a3e40944dfda58cfa15d5f17c5be3d9db0f3b7a5269edecf5ef0a2a023b72435aa069d16fc3fcc73e4e72e7c9a114 SHA512 1ab69335e01a7e8d5d4620015028041404c77ee8f56cbe0365f2f0b9c33aaaf434ced8999c86708a86f212ec8b6bf7370914fb3208bfb8f95f7cd2aaa4368037
+MISC metadata.xml 594 BLAKE2B 338b1aedaaf7426ed8bc2b9ae08e03f9fd6170b0714f938fc97a0f4555e8daa385635200bcbea4d0959604fad44db3212bd7436ac70b2e49ba353dd48713e7c6 SHA512 b1563a6578aec4be3df4b47c9914de3ad80a8859e60bce3a9b3e48f1b8bff3c38dd266523c913ab97bafa2c0804ab5003b5a449858582ef934044d80065c5cdd
diff --git a/app-text/xdvik/files/xdvik.xpm b/app-text/xdvik/files/xdvik.xpm
new file mode 100644
index 000000000000..456335ec52e1
--- /dev/null
+++ b/app-text/xdvik/files/xdvik.xpm
@@ -0,0 +1,89 @@
+/* XPM */
+static char *xdvik[] = {
+/* columns rows colors chars-per-pixel */
+"48 48 35 1 ",
+"  c #080808",
+". c #2F261C",
+"X c #343434",
+"o c #3C3B3C",
+"O c #493415",
+"+ c #523611",
+"@ c #64471A",
+"# c #6D4E1E",
+"$ c #65513A",
+"% c #444444",
+"& c #4C4C4C",
+"* c #505050",
+"= c #665641",
+"- c #696159",
+"; c #626262",
+": c #7D7D7D",
+"> c #946924",
+", c #8D7757",
+"< c #8F7C5A",
+"1 c #B78833",
+"2 c #D59E39",
+"3 c #D7A03A",
+"4 c #9F896C",
+"5 c #E9B345",
+"6 c #EBB345",
+"7 c #FDC54E",
+"8 c #808080",
+"9 c #848484",
+"0 c #9C9C9B",
+"q c #A9A5A2",
+"w c #C7BFB5",
+"e c #DAD6D1",
+"r c #EFEEEE",
+"t c #FEFEFE",
+"y c None",
+/* pixels */
+"9           XyyyyyyyyyyyyyyyyyyyyyyyyyyyyyX  Xyy",
+"y8            yyyyyyyyyyyyyyyyyyyyyyyyyyy   oyyy",
+"yyo           XyyyyyyyyyyyyyyyyyyyyyyyyyX   yyyy",
+"yyyX           :yyyyy     yy  yyy  yyyy*   yyyyy",
+"yyyy            yyyy >777 y 77 y 77 y+9   9yyyyy",
+"yyyyy           Xyyy 77.#7 777 y 77      =yyyyyy",
+"yyyyy8           *yyy 6#.77 777 77 7 77 7 y  yyy",
+"yyyyyyX           yyyy 6>#7 77 77 77 7 6   66 yy",
+"yyyyyyy            yyy4 77777777 77 777+66 66 yy",
+"yyyyyyyy           Xyy++++177777777 777+7 66 6 y",
+"yyyyyyyyX           ;+qtte+73777777771+7    76 y",
+"yyyyyyyyy           +qtttt+4+++17777771 166>  yy",
+"yyyyyyyyyy          +t4.tw+wtte+177771 77777 +yy",
+"yyyyyyyyyyy     .++#+t..4+etttte+7773 77>+>7 7 y",
+"yyyyyyyyyy>+O@137776+ew++etttttt+777 71#  37 6 y",
+"yyyyyyyy>>77777777771+++,ttteetw+77777   17 66 y",
+"yyyyyyy>777777777777773>-tte..r+37773 +177 1  >y",
+"yyyyyy>77>>3777777777773+ete..-+777777777 1666+y",
+"yyyyy> 7>7777777777777771+etee+777777    17 676+",
+"yyyyy76 777>37777777777773++++77777777777777   y",
+"yyyyy1>++7>7777 >3777777777777777777777    777 -",
+"yyyyy66# #777  377777777777777777777777777  777 ",
+"yyyyy666    #77777777777777777777777  77777 7  y",
+"yyyyyy6>+> 66  7777777777777777777777   7777 yyy",
+"yyyyyy 6>77  66 17777777777777777777777   777 yy",
+"yyyyyy7. 7777 1777777777777+77777777777777  7  y",
+"yyyyyy377 7777777777777777+ 77777   77777777 7#y",
+"yyyyyyy177 77777777777777+ 77777777   7777777  -",
+"yyyyyyyy777 +37777777777+ 777777 7777   777777 y",
+"yyyyyyyy1777#  >777777+ +7777777+ 777777    7 yy",
+"yyyyyyyyy177777        77777+77777   777777  7yy",
+"yyyyyyyyyyy177777777777777777 777777  777777  +y",
+"yyyyyyyyyyyyy<37777777777777 +7777 77   777777 y",
+"yyyyyyyyyyyyy9  37737777        77 7777 77+77 $y",
+"yyyyyyyyyyyy9   X#7#7+7+yyX    6+77 777 777+7 yy",
+"yyyyyyyyyyyyX   0,#+#2+yyyyX    6+7 777 777+7 yy",
+"yyyyyyyyyyy;   9yyyyyyyyyyyy     777  77 777+7 y",
+"yyyyyyyyyy9   8yyyyyyyyyyyyyy      77    777+ yy",
+"yyyyyyyyyy   %yyyyyyyyyyyyyyy8               yyy",
+"yyyyyyyyyX   9yyyyyyyyyyyyyyyyX          +yyyyyy",
+"yyyyyyyy&   yyyyyyyyyyyyyyyyyyy           *yyyyy",
+"yyyyyyy9   8yyyyyyyyyyyyyyyyyyyy           9yyyy",
+"yyyyyyy   8yyyyyyyyyyyyyyyyyyyyyX           yyyy",
+"yyyyyy   %yyyyyyyyyyyyyyyyyyyyyyy           Xyyy",
+"yyyyyX   9yyyyyyyyyyyyyyyyyyyyyyyy           ;yy",
+"yyyy&   9yyyyyyyyyyyyyyyyyyyyyyyyyy           8y",
+"yyy8   8yyyyyyyyyyyyyyyyyyyyyyyyyyy           *y",
+"yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy           9"
+};
diff --git a/app-text/xdvik/metadata.xml b/app-text/xdvik/metadata.xml
new file mode 100644
index 000000000000..c04b182d3bd8
--- /dev/null
+++ b/app-text/xdvik/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
+	<longdescription lang="en">
+		XDVIK is a dvi previewer on X with kpathsea support.  It also supports
+		multibyte character rendering via Xft2 (or VFlib2).
+	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">xdvi</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/xdvik/xdvik-22.87.03-r1.ebuild b/app-text/xdvik/xdvik-22.87.03-r1.ebuild
new file mode 100644
index 000000000000..9c61d7036507
--- /dev/null
+++ b/app-text/xdvik/xdvik-22.87.03-r1.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit elisp-common eutils flag-o-matic multilib toolchain-funcs xdg-utils
+
+DESCRIPTION="DVI previewer for X Window System"
+HOMEPAGE="http://xdvi.sourceforge.net/"
+SRC_URI="mirror://sourceforge/xdvi/${P}.tar.gz"
+
+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 ~sparc-solaris ~x64-solaris ~x86-solaris"
+SLOT="0"
+LICENSE="GPL-2"
+IUSE="motif neXt Xaw3d emacs"
+
+RDEPEND="media-libs/freetype:2
+	x11-libs/libX11
+	x11-libs/libXi
+	x11-libs/libXmu
+	x11-libs/libXpm
+	x11-libs/libXt
+	motif? ( >=x11-libs/motif-2.3:0 )
+	!motif? (
+		neXt? ( x11-libs/neXtaw )
+		!neXt? (
+			Xaw3d? ( x11-libs/libXaw3d )
+			!Xaw3d? ( x11-libs/libXaw )
+		)
+	)
+	dev-libs/kpathsea"
+DEPEND="sys-devel/flex
+	virtual/yacc
+	virtual/pkgconfig
+	${RDEPEND}"
+RDEPEND="${RDEPEND}
+	virtual/latex-base
+	!<app-text/texlive-2007"
+S=${WORKDIR}/${P}/texk/xdvik
+
+src_prepare() {
+	local i
+	# Make sure system kpathsea headers are used
+	cd "${WORKDIR}/${P}/texk/kpathsea"
+	for i in *.h ; do echo "#include_next \"$i\"" > $i; done
+}
+
+src_configure() {
+	has_version '>=dev-libs/kpathsea-6.2.1' && append-cppflags "$($(tc-getPKG_CONFIG) --cflags kpathsea)"
+
+	local toolkit
+
+	if use motif ; then
+		toolkit="motif"
+		use neXt && ewarn "neXt USE flag ignored (superseded by motif)"
+		use Xaw3d && ewarn "Xaw3d USE flag ignored (superseded by motif)"
+	elif use neXt ; then
+		toolkit="neXtaw"
+		use Xaw3d && ewarn "Xaw3d USE flag ignored (superseded by neXt)"
+	elif use Xaw3d ; then
+		toolkit="xaw3d"
+	else
+		toolkit="xaw"
+	fi
+
+	econf \
+		--with-system-freetype2 \
+		--with-system-kpathsea \
+		--with-kpathsea-include="${EPREFIX}"/usr/include/kpathsea \
+		--with-xdvi-x-toolkit="${toolkit}" \
+		--x-includes="${SYSROOT}${EPREFIX}"/usr/include \
+		--x-libraries="${SYSROOT}${EPREFIX}"/usr/$(get_libdir)
+}
+
+src_compile() {
+	emake kpathsea_dir="${EPREFIX}/usr/include/kpathsea"
+	use emacs && elisp-compile xdvi-search.el
+}
+
+src_install() {
+	dodir /usr/share/texmf-dist/dvips/config
+
+	emake DESTDIR="${D}" install
+
+	dosym ../../texmf-dist/xdvi/XDvi /usr/share/X11/app-defaults/XDvi
+
+	dodoc BUGS FAQ README.*
+
+	use emacs && elisp-install tex-utils *.el *.elc
+
+	doicon "${FILESDIR}"/${PN}.xpm
+	make_desktop_entry xdvi "XDVI" xdvik "Graphics;Viewer"
+	echo "MimeType=application/x-dvi;" >> "${ED}"usr/share/applications/xdvi-"${PN}".desktop
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+
+	if use emacs; then
+		elog "Add"
+		elog "	(add-to-list 'load-path \"${EPREFIX}${SITELISP}/tex-utils\")"
+		elog "	(require 'xdvi-search)"
+		elog "to your ~/.emacs file"
+	fi
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/app-text/xfbib-0.0.2-r2 b/app-text/xfbib-0.0.2-r2
deleted file mode 100644
index a54ddb866817..000000000000
--- a/app-text/xfbib-0.0.2-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=postinst postrm prepare
-DEPEND=>=dev-libs/glib-2.12 >=x11-libs/gtk+-2.10:2 >=xfce-base/libxfcegui4-4.2 >=xfce-base/libxfce4ui-4.8 >=xfce-base/libxfce4util-4.8 dev-util/intltool sys-devel/gettext virtual/pkgconfig >=sys-apps/sed-4
-DESCRIPTION=a lightweight BibTeX editor
-EAPI=6
-HOMEPAGE=https://goodies.xfce.org/projects/applications/xfbib
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.12 >=x11-libs/gtk+-2.10:2 >=xfce-base/libxfcegui4-4.2 >=xfce-base/libxfce4ui-4.8 >=xfce-base/libxfce4util-4.8
-SLOT=0
-SRC_URI=https://goodies.xfce.org/releases/xfbib/xfbib-0.0.2.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=53b5d03ce264a97be4d0669c50d77cf7
diff --git a/app-text/xfbib/Manifest b/app-text/xfbib/Manifest
new file mode 100644
index 000000000000..9bafc32ea749
--- /dev/null
+++ b/app-text/xfbib/Manifest
@@ -0,0 +1,4 @@
+AUX xfbib-0.0.2-validate.patch 349 BLAKE2B 282c326fe8f80039a10930777a063bd556447617c74dcd7ccee8ab0572169521029246e4ac2728b8188c19dff41d5c4df0027d338f454fdf0f66f625f819d1de SHA512 fffd683dc018889793dc9371c756ec89c89d7de0a1c863aba9bac3fad8660baf16688b02831f83c07642de401c134ed86b62e34c95018c8836c714ad2fe89035
+DIST xfbib-0.0.2.tar.bz2 340703 BLAKE2B 4f15fb39fc55e06b5cde8961db27661f3f2f2e954e52e809105fb7f3326f54c63e63acb6fa21585da8a5aa340eafd4bc33df73822fe9f6ac7a04e67d95db6e0a SHA512 7f6f812bfdb6b95574f66b63e51fb1a70ce20fd795b6070b055cdc8e753656a266237be92a7e60865d9f1e5fa750be0af3404ecf219a8a5d89dde505c759aebc
+EBUILD xfbib-0.0.2-r2.ebuild 859 BLAKE2B ac797067144696fbb734d69018fdd6aafbe93c108ab7c084a4bc72166d154e2ca0ee5ba2681e4ef348ba6a179b21ba06d9ca1f4499a76004d70fbb9df14b3cfa SHA512 117d12c679e6fa9e6b1f9c730deafdcbf81d210e2d82f104f116f141016527239b7b387d45b0bcb66742a4f63a2adf916fb497e3f7a26e8226a9961813010f66
+MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/app-text/xfbib/files/xfbib-0.0.2-validate.patch b/app-text/xfbib/files/xfbib-0.0.2-validate.patch
new file mode 100644
index 000000000000..a072b730c3a6
--- /dev/null
+++ b/app-text/xfbib/files/xfbib-0.0.2-validate.patch
@@ -0,0 +1,19 @@
+--- xfbib.desktop
++++ xfbib.desktop
+@@ -1,13 +1,11 @@
+-
+ [Desktop Entry]
+-Encoding=UTF-8
+ Name=Xfbib
+ Exec=xfbib
+ Icon=xfbib
+ Type=Application
+ Comment=A BibTeX editor for Xfce
+-Terminal=0
+-MimeType=text/x-bibtex
+-Categories=Application;Office;GTK;
++Terminal=false
++MimeType=text/x-bibtex;
++Categories=Office;GTK;
+ GenericName=
+ StartupNotify=false
diff --git a/app-text/xfbib/metadata.xml b/app-text/xfbib/metadata.xml
new file mode 100644
index 000000000000..359901b31db4
--- /dev/null
+++ b/app-text/xfbib/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>xfce@gentoo.org</email>
+    <name>XFCE Team</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-text/xfbib/xfbib-0.0.2-r2.ebuild b/app-text/xfbib/xfbib-0.0.2-r2.ebuild
new file mode 100644
index 000000000000..2a24e6eae3ee
--- /dev/null
+++ b/app-text/xfbib/xfbib-0.0.2-r2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils xdg-utils
+
+DESCRIPTION="a lightweight BibTeX editor"
+HOMEPAGE="https://goodies.xfce.org/projects/applications/xfbib"
+SRC_URI="https://goodies.xfce.org/releases/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND=">=dev-libs/glib-2.12
+	>=x11-libs/gtk+-2.10:2
+	>=xfce-base/libxfcegui4-4.2
+	>=xfce-base/libxfce4ui-4.8
+	>=xfce-base/libxfce4util-4.8"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS ChangeLog NEWS README TODO )
+
+src_prepare() {
+	eapply -p0 "${FILESDIR}"/${P}-validate.patch
+	default
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
diff --git a/app-text/xhtml1-20020801-r5 b/app-text/xhtml1-20020801-r5
deleted file mode 100644
index 58471c4a3c9f..000000000000
--- a/app-text/xhtml1-20020801-r5
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare prerm unpack
-DEPEND=app-text/sgml-common dev-libs/libxml2 >=app-text/sgml-common-0.6.3-r2
-DESCRIPTION=DTDs for the eXtensible HyperText Markup Language 1.0
-EAPI=5
-HOMEPAGE=http://www.w3.org/TR/xhtml1/
-KEYWORDS=amd64 ~arm64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=W3C
-SLOT=0
-SRC_URI=http://www.w3.org/TR/xhtml1/xhtml1.tgz
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	sgml-catalog	1ca36a4ae32c67b390f310dd6d7b1189	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=bb2e44fdebb7d1a15f01bb71c79d6a92
diff --git a/app-text/xhtml1/Manifest b/app-text/xhtml1/Manifest
new file mode 100644
index 000000000000..378648ec292a
--- /dev/null
+++ b/app-text/xhtml1/Manifest
@@ -0,0 +1,4 @@
+AUX xhtml1-catalog.patch 834 BLAKE2B 47236e18d55237bbfb6299b634253545299dd9649a58d42af6fc8e56afbb8547564dc17bbefb808b96aea739d7ba673403ab2f3c96b5eddceb7f886353320b51 SHA512 0b4fdb64e73405be53930984e5f628a1b5b48e6d43bebef9f9c502fca31d13b760385c0481030f8a09556447891a542dc4c7bb23f0618fd937e2934936b26780
+DIST xhtml1.tgz 232192 BLAKE2B 4e2da9b73da93a8196ade80549a2e255b1954178472fddaf2e3d979befda8689f3540a65d41723e40bd0450d626608ffcdcd1fa9183da5e3b13d90a5649fdc23 SHA512 184758381c5e2d36b80fa1e4470e864777383ff7539b48291036f8a3f1dba0b354a32142bfcc9071147fb20bcd4c0d4d541e09e865047938ab4cf9ae5a806412
+EBUILD xhtml1-20020801-r5.ebuild 2177 BLAKE2B 0d0c33716b2f816b03713365af543835934e9112afd74c00099fb98d9013cc5b8adb0581f3e6dfd64456511cd1199352cd51dcee244acee426b3eb547ce19b55 SHA512 9b7732f5606ba95344bfe1bce64f5f3ccc7a298356b9d25f3ab6e9fa667c4f9be2f98168494c535b9226cec6c3dbf2b55a92f7681d5222fbaf7e6af0efede957
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/xhtml1/files/xhtml1-catalog.patch b/app-text/xhtml1/files/xhtml1-catalog.patch
new file mode 100644
index 000000000000..37b41a2b0dc1
--- /dev/null
+++ b/app-text/xhtml1/files/xhtml1-catalog.patch
@@ -0,0 +1,19 @@
+diff -NurdB xhtml1-20020801/DTD/xhtml.soc xhtml1-20020801-patched/DTD/xhtml.soc
+--- xhtml1-20020801/DTD/xhtml.soc	2002-08-01 13:23:08.000000000 -0500
++++ xhtml1-20020801-patched/DTD/xhtml.soc	2005-06-21 04:12:36.000000000 -0500
+@@ -1,4 +1,9 @@
+ OVERRIDE	YES
++
++DTDDECL  "-//W3C//DTD XHTML 1.0 Strict//EN"       "xhtml1.dcl"
++DTDDECL  "-//W3C//DTD XHTML 1.0 Transitional//EN" "xhtml1.dcl"
++DTDDECL  "-//W3C//DTD XHTML 1.0 Frameset//EN"     "xhtml1.dcl"
++
+         -- Oasis entity catalog for Extensible HTML 1.0 --
+ 
+ PUBLIC  "-//W3C//DTD XHTML 1.0 Strict//EN"        "xhtml1-strict.dtd"
+@@ -10,5 +15,3 @@
+ PUBLIC	"-//W3C//ENTITIES Latin 1 for XHTML//EN"  "xhtml-lat1.ent"
+ PUBLIC	"-//W3C//ENTITIES Symbols for XHTML//EN" "xhtml-symbol.ent"
+ PUBLIC	"-//W3C//ENTITIES Special for XHTML//EN" "xhtml-special.ent"
+-
+-SGMLDECL "xhtml1.dcl"
diff --git a/app-text/xhtml1/metadata.xml b/app-text/xhtml1/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-text/xhtml1/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/app-text/xhtml1/xhtml1-20020801-r5.ebuild b/app-text/xhtml1/xhtml1-20020801-r5.ebuild
new file mode 100644
index 000000000000..b1ffbb673296
--- /dev/null
+++ b/app-text/xhtml1/xhtml1-20020801-r5.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit sgml-catalog eutils
+
+DESCRIPTION="DTDs for the eXtensible HyperText Markup Language 1.0"
+HOMEPAGE="http://www.w3.org/TR/xhtml1/"
+SRC_URI="http://www.w3.org/TR/xhtml1/xhtml1.tgz"
+LICENSE="W3C"
+
+SLOT="0"
+KEYWORDS="amd64 ~arm64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE=""
+
+DEPEND="app-text/sgml-common
+	dev-libs/libxml2"
+RDEPEND=""
+
+xml_catalog_setup() {
+	CATALOG="${EROOT}etc/xml/catalog"
+	XMLTOOL="${EROOT}usr/bin/xmlcatalog"
+	DTDDIR="${EROOT}usr/share/sgml/${PN}"
+
+	[ -x "${XMLTOOL}" ] || return 1
+
+	return 0
+}
+
+src_prepare() {
+	sgml-catalog_cat_include "/etc/sgml/${PN}.cat" \
+		"/usr/share/sgml/${PN}/xhtml.soc"
+
+	epatch "${FILESDIR}"/${PN}-catalog.patch
+}
+
+src_install() {
+	insinto /usr/share/sgml/${PN}
+	doins DTD/xhtml.soc DTD/*.dcl DTD/*.dtd DTD/*.ent
+	insinto /etc/sgml
+	dodoc *.pdf *.ps
+	dohtml *.html *.png *.css
+}
+
+pkg_postinst() {
+	sgml-catalog_pkg_postinst
+	xml_catalog_setup || return
+
+	einfo "Installing xhtml1 in the global XML catalog"
+
+	$XMLTOOL --noout --add 'public' '-//W3C//DTD XHTML 1.0 Strict//EN' \
+		${DTDDIR}/xhtml1-strict.dtd $CATALOG
+	$XMLTOOL --noout --add 'public' '-//W3C//DTD XHTML 1.0 Transitional//EN' \
+		${DTDDIR}/xhtml1-transitional.dtd $CATALOG
+	$XMLTOOL --noout --add 'public' '-//W3C//DTD XHTML 1.0 Frameset//EN' \
+		${DTDDIR}/xhtml1-frameset.dtd $CATALOG
+	$XMLTOOL --noout --add 'rewriteSystem' 'http://www.w3.org/TR/xhtml1/DTD' \
+		${DTDDIR} $CATALOG
+	$XMLTOOL --noout --add 'rewriteURI' 'http://www.w3.org/TR/xhtml1/DTD' \
+		${DTDDIR} $CATALOG
+}
+
+pkg_postrm() {
+	sgml-catalog_pkg_postrm
+	xml_catalog_setup || return
+
+	if [ -d "$DTDDIR" ]; then
+		einfo "The xhtml1 data directory still exists."
+		einfo "No entries will be removed from the XML catalog."
+		return
+	fi
+
+	einfo "Removing xhtml1 from the global XML catalog"
+
+	$XMLTOOL --noout --del '-//W3C//DTD XHTML 1.0 Strict//EN' $CATALOG
+	$XMLTOOL --noout --del '-//W3C//DTD XHTML 1.0 Transitional//EN' $CATALOG
+	$XMLTOOL --noout --del '-//W3C//DTD XHTML 1.0 Frameset//EN' $CATALOG
+	$XMLTOOL --noout --del 'http://www.w3.org/TR/xhtml1/DTD' $CATALOG
+}
diff --git a/app-text/xindy-2.4-r1 b/app-text/xindy-2.4-r1
deleted file mode 100644
index 2e1d19fb480f..000000000000
--- a/app-text/xindy-2.4-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure prepare
-DEPEND=virtual/latex-base dev-texlive/texlive-fontsrecommended >=dev-lisp/clisp-2.44.1-r1 dev-texlive/texlive-langcyrillic dev-lang/perl sys-devel/flex >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A Flexible Indexing System
-EAPI=6
-HOMEPAGE=http://www.xindy.org/ https://github.com/jschrod/xindy.ctan
-IUSE=doc
-KEYWORDS=alpha amd64 ia64 ppc x86
-LICENSE=GPL-2
-RDEPEND=virtual/latex-base dev-texlive/texlive-fontsrecommended >=dev-lisp/clisp-2.44.1-r1 dev-texlive/texlive-langcyrillic
-SLOT=0
-SRC_URI=http://www.xindy.org/xindy-2.4.tar.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=239c4b80111765253a410f104d1b9e8c
diff --git a/app-text/xindy/Manifest b/app-text/xindy/Manifest
new file mode 100644
index 000000000000..00ba2b07edee
--- /dev/null
+++ b/app-text/xindy/Manifest
@@ -0,0 +1,7 @@
+AUX xindy-2.4-configure.patch 884 BLAKE2B fbb60e5bdc287b0a37f2e047081c9263fe7c763f9831c9e99dcf1f9eb143f75e09096ddc532185d699aeb862f98c643c54e3bfb16c9942106c4546d18dcd48b4 SHA512 1b40f03481ced4caa2a4e137c7ec2ce970c8eeba9c228da4caa1952b533f5346a025f885860024168a95739d3f0e6bfe3173f1654ce747a4f2b4f6e4ba41c1d0
+AUX xindy-2.4-locale.patch 679 BLAKE2B b67f436e0aa67b8474336bfa1f70f6da52199871b91934bb73c2485ea80d5d3859f91e624e930f0f1a5c2f0e59d28698a6bd1725131b0cadf82314a0681c51ff SHA512 4d80684d08def3d3cde3765056d562b60d6bbef36e3495933c0aba0016308f95e462c2857215b4e47325339c5238f565bb798b96ad197c23e156d9b9c7fb3f4a
+AUX xindy-2.4-nogrep.patch 431 BLAKE2B 97543e7eeff2cb4c23c8b9cc0d5673fca2c3f682553a8a3d25bc39253a371320a2a423fef63294be32f5c36b5bac30717766b3a9a4c75663535ce0a6bd8e13bc SHA512 fdcc109b89a6e56c86624f348ebe1c98f574b9f788e3f307e3b110fc2b93643af087e16711b3f0bc6604dbdcfae06080693e4976d8ebec5816e68fb73f89fa6c
+AUX xindy-2.4-perl5.26.patch 337 BLAKE2B c869adcd80cc93bbfe46a385effab94a920f3fb76441c653ea269962071ad5f9269961caebd13d6fce38f3f4dea485291b510db6e884aefc5edbd22cf4b9bd4a SHA512 3f3abc9654e3c7c9de12a542241e107d80046bc26d0eed336e046835a221ea190d526b37c85f91b722e6cac89f140e38b0cebaf208a2391d8d7a42a2ca4b8459
+DIST xindy-2.4.tar.gz 498024 BLAKE2B 67cc7f96e4937e8130c66449226d581f121e7b06a82bde40f3f880e48e48e49805856e39c7670a34080731168ee7386beffe52fa6c3e8142a3d66f4c7ebb8ce3 SHA512 d718954c0c9efcf36dcc99518542b45b3fbbb922b98989c56feb542b00944003adb5834656add0aa88b1983f98e1d9d76e5355aaf9e6ad39f3e0dd109a18ade4
+EBUILD xindy-2.4-r1.ebuild 1001 BLAKE2B ab261500f7a94ab8c5986fa8552554af11c4ab47598e2c08b0e6ee52f1d6c4201f480579ee079fee0dddc373c827c6cf7a42a3a35af6b3ae7772a9d39f008b31 SHA512 99b6fda7294d8291f6ffe1c6d8335f96572f9b715530421c89091dbc26d3302324df7cfbfd35c541e18f4a0aa79609f296ce67413f5a4831af3fe954968acb86
+MISC metadata.xml 1118 BLAKE2B 1bb41c8208737b0ad0d3545143cedd0b70aa2cdf632905f1572ca2c2aaa2eb35e712eb5971b4e4bd8a66a3130ebc1f21c8d6ad194056fe5a1c15c522e1d57219 SHA512 ef09dceddfc91214cf575c58f9ffa8f82ec10bfa7274caec809a00c83b9a07668139eca7e420e04c5fe38bbca9084bfcb6fafd10bc91092138726dfa1dc4cced
diff --git a/app-text/xindy/files/xindy-2.4-configure.patch b/app-text/xindy/files/xindy-2.4-configure.patch
new file mode 100644
index 000000000000..b76341f1f759
--- /dev/null
+++ b/app-text/xindy/files/xindy-2.4-configure.patch
@@ -0,0 +1,21 @@
+--- xindy-2.4/configure.ac.orig	2010-05-10 16:12:10.000000000 -0700
++++ xindy-2.4/configure.ac	2010-09-28 23:43:39.591495118 -0700
+@@ -42,12 +42,16 @@
+ 
+ # Test for building make-rules
+ AC_ARG_ENABLE(make-rules, AS_HELP_STRING([--enable-make-rules ],[build and install make-rules package (default is YES)]),[BUILDRULES=$enableval],[BUILDRULES=yes])
+-test "$BUILDRULES" = "yes"  &&  AC_PROG_LATEX
++if test "x$BUILDRULES" = "xyes"; then
++	AC_PROG_LATEX
++fi
+ AM_CONDITIONAL(BUILDRULES, test "$BUILDRULES" = "yes")
+ 
+ # Test for building Documentation
+ AC_ARG_ENABLE(docs, AS_HELP_STRING([--enable-docs ],[build and install documentation (default is YES)]),[BUILDDOCS=$enableval],[BUILDDOCS=yes])
+-test "$BUILDDOCS" = "yes"  &&  AC_PROG_PDFLATEX
++if test "x$BUILDDOCS" = "xyes"; then 
++	AC_PROG_PDFLATEX
++fi
+ AM_CONDITIONAL(BUILDDOCS, test "$BUILDDOCS" = "yes")
+ 
+ # Checks for programs:
diff --git a/app-text/xindy/files/xindy-2.4-locale.patch b/app-text/xindy/files/xindy-2.4-locale.patch
new file mode 100644
index 000000000000..c2edccc4bef6
--- /dev/null
+++ b/app-text/xindy/files/xindy-2.4-locale.patch
@@ -0,0 +1,22 @@
+--- xindy-2.4.orig/src/Makefile.am
++++ xindy-2.4/src/Makefile.am
+@@ -41,7 +41,7 @@
+ DEFAULTS   = defaults.xdy
+ DUMP_XINDY = dump-xindy.lsp
+ MEMFILE    = xindy.mem
+-CLISP      = @CLISP@ -q -E iso-8859-1
++CLISP      = @CLISP@ -q
+ 
+ xindy.mem: $(DEFAULTS) $(FAS) $(DUMP_XINDY)
+ 	rm -f $(MEMFILE)
+--- xindy-2.4.orig/user-commands/xindy.in
++++ xindy-2.4/user-commands/xindy.in
+@@ -777,7 +777,7 @@
+ sub call_xindy ( $$ ) {
+     my ($mem_file, $xindy_exp) = @_;
+ 
+-    my @command = ($clisp, '-M', $mem_file, '-E', 'iso-8859-1');
++    my @command = ($clisp, '-M', $mem_file);
+     if ( $interactive ) {
+ 	print "Proposed xindy expression:\n\n$xindy_exp\n"  unless $quiet;
+     } else {
diff --git a/app-text/xindy/files/xindy-2.4-nogrep.patch b/app-text/xindy/files/xindy-2.4-nogrep.patch
new file mode 100644
index 000000000000..41f1b3a03609
--- /dev/null
+++ b/app-text/xindy/files/xindy-2.4-nogrep.patch
@@ -0,0 +1,13 @@
+https://bugs.gentoo.org/573794
+
+--- xindy-2.4-orig/make-rules/inputenc/Makefile.am
++++ xindy-2.4/make-rules/inputenc/Makefile.am
+@@ -43,7 +43,7 @@
+ latin.xdy : latin1.xdy latin2.xdy latin3.xdy
+ 	echo ';; Generated from latin?.xdy' >latin.xdy
+ 	echo >>latin.xdy
+-	sort -u latin?.xdy | grep -v '^;' >>latin.xdy
++	sort -u latin?.xdy | sed '/^;/d' >>latin.xdy
+ 
+ %.xdy %.idx :
+ 	$(PERL) $(srcdir)/make-testidx.pl TS1,T2A,T1 $* >$*.tex
diff --git a/app-text/xindy/files/xindy-2.4-perl5.26.patch b/app-text/xindy/files/xindy-2.4-perl5.26.patch
new file mode 100644
index 000000000000..657b5e94c362
--- /dev/null
+++ b/app-text/xindy/files/xindy-2.4-perl5.26.patch
@@ -0,0 +1,11 @@
+--- xindy-2.4/make-rules/inputenc/make-inp-rules.pl
++++ xindy-2.4/make-rules/inputenc/make-inp-rules.pl
+@@ -8,7 +8,7 @@
+ 
+ 
+ while (<STDIN>) {
+-  if (/\\indexentry{(.+)--([8-9a-f][0-9a-f])\}\{1\}/) {
++  if (/\\indexentry\{(.+)--([8-9a-f][0-9a-f])\}\{1\}/) {
+     if (!($1 =~ /inputenc Error/)) {
+       $i = hex($2);
+       $macro = $1;
diff --git a/app-text/xindy/metadata.xml b/app-text/xindy/metadata.xml
new file mode 100644
index 000000000000..8916aa9cb8ad
--- /dev/null
+++ b/app-text/xindy/metadata.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>common-lisp@gentoo.org</email>
+		<name>Gentoo Common Lisp Project</name>
+	</maintainer>
+	<longdescription lang="en">
+		xindy is an index processor that can be used to generate book-like indexes
+		for arbitrary document-preparation systems. This includes systems such as
+		TeX and LaTeX, the roff-family, SGML/XML-based systems (e.g., HTML) that
+		process some kind of text and generate indexing information. The kernel
+		system is not fixed to any specific system, but can be configured to work
+		together with such systems.
+
+		In comparison to other index processors xindy has several powerful features
+		that make it an ideal framework for describing and generating complex
+		indices, addressing especially international indexing. Have a look at
+		xindy's Overview that describes its most important features!
+	</longdescription>
+</pkgmetadata>
diff --git a/app-text/xindy/xindy-2.4-r1.ebuild b/app-text/xindy/xindy-2.4-r1.ebuild
new file mode 100644
index 000000000000..fbfb484e1482
--- /dev/null
+++ b/app-text/xindy/xindy-2.4-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="A Flexible Indexing System"
+HOMEPAGE="http://www.xindy.org/ https://github.com/jschrod/xindy.ctan"
+SRC_URI="http://www.xindy.org/${P}.tar.gz"
+
+# The latest development is now on the TeXlive SVN.
+# The author jschrod backports it from time to time to his github repo.
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ia64 ppc x86"
+IUSE="doc"
+
+RDEPEND="virtual/latex-base
+	dev-texlive/texlive-fontsrecommended
+	>=dev-lisp/clisp-2.44.1-r1
+	dev-texlive/texlive-langcyrillic"
+DEPEND="${RDEPEND}
+	dev-lang/perl
+	sys-devel/flex"
+
+PATCHES=("${FILESDIR}"/${P}-configure.patch
+	"${FILESDIR}"/${P}-locale.patch
+	"${FILESDIR}"/${P}-nogrep.patch
+	"${FILESDIR}"/${P}-perl5.26.patch)
+DOCS=(AUTHORS ChangeLog.Gour NEWS README)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable doc docs)
+}
+
+src_compile() {
+	VARTEXFONTS="${T}/fonts" emake
+}
diff --git a/app-text/xiphos-4.0.6a b/app-text/xiphos-4.0.6a
deleted file mode 100644
index 1c54c7c29edc..000000000000
--- a/app-text/xiphos-4.0.6a
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=app-text/sword-1.7.4 >=dev-libs/glib-2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-libs/libxml2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] gnome-base/gconf[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] gnome-extra/gtkhtml:4.0 >=gnome-extra/libgsf-1.14 net-libs/webkit-gtk:4 x11-libs/gtk+:3 dbus? ( dev-libs/dbus-glib ) app-text/docbook2X app-text/gnome-doc-utils[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] app-text/rarian dev-libs/libxslt[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-util/intltool >=net-libs/biblesync-1.1.2-r1[-static] virtual/pkgconfig sys-devel/gettext >=sys-apps/sed-4
-DESCRIPTION=A bible study frontend for Sword (formerly known as GnomeSword)
-EAPI=6
-HOMEPAGE=http://xiphos.org/
-IUSE=dbus debug python_targets_python2_7
-KEYWORDS=amd64
-LICENSE=GPL-2 FDL-1.1 LGPL-2 MIT MPL-1.1
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=app-text/sword-1.7.4 >=dev-libs/glib-2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-libs/libxml2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] gnome-base/gconf[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] gnome-extra/gtkhtml:4.0 >=gnome-extra/libgsf-1.14 net-libs/webkit-gtk:4 x11-libs/gtk+:3 dbus? ( dev-libs/dbus-glib )
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=https://github.com/crosswire/xiphos/releases/download/4.0.6a/xiphos-4.0.6a-20170820.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a478d1b8bb782a6d339ea5237762a75f
diff --git a/app-text/xiphos-4.1.0 b/app-text/xiphos-4.1.0
deleted file mode 100644
index a77e9ec62211..000000000000
--- a/app-text/xiphos-4.1.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=app-text/sword-1.8.0 >=dev-libs/glib-2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-libs/libxml2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] gnome-base/gconf[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] gnome-extra/gtkhtml:4.0 >=gnome-extra/libgsf-1.14 net-libs/webkit-gtk:4 x11-libs/gtk+:3 dbus? ( dev-libs/dbus-glib ) app-text/docbook2X app-text/gnome-doc-utils[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] app-text/rarian dev-libs/libxslt[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-util/intltool >=net-libs/biblesync-1.1.2-r1[-static] virtual/pkgconfig sys-devel/gettext >=sys-apps/sed-4
-DESCRIPTION=A bible study frontend for Sword (formerly known as GnomeSword)
-EAPI=6
-HOMEPAGE=http://xiphos.org/
-IUSE=dbus debug python_targets_python2_7
-KEYWORDS=~amd64
-LICENSE=GPL-2 FDL-1.1 LGPL-2 MIT MPL-1.1
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] >=app-text/sword-1.8.0 >=dev-libs/glib-2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] dev-libs/libxml2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] gnome-base/gconf[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] gnome-extra/gtkhtml:4.0 >=gnome-extra/libgsf-1.14 net-libs/webkit-gtk:4 x11-libs/gtk+:3 dbus? ( dev-libs/dbus-glib )
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=https://github.com/crosswire/xiphos/releases/download/4.1.0/xiphos-4.1.0.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	flag-o-matic	5128c4729303400bd8d4b0b966530955	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	26fdbe5e685d53f67303a3a43d9e4848	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5330c3aa91a2a7ed5f3a018cd7acd828
diff --git a/app-text/xiphos/Manifest b/app-text/xiphos/Manifest
new file mode 100644
index 000000000000..e3b6df574586
--- /dev/null
+++ b/app-text/xiphos/Manifest
@@ -0,0 +1,5 @@
+DIST xiphos-4.0.6a-20170820.tar.gz 30584893 BLAKE2B a3b76543c8d1c0d03fcc2f567751df49230ef1d35019bec98ef726edb6a519424d0c773d4ff6f7eb3ad714f56af6dac19fc1ac2dc29560b03e3ec3ea9a46ccfd SHA512 a0577521c6b9033b74b3b0a0fd7a88222de00dc2e9db100d66e1bb60bc117173badd26c47d2e896ffa167c52a263c9bf9046d650a9b4ae497bec6164bfb0a29b
+DIST xiphos-4.1.0.tar.gz 30623199 BLAKE2B 3f4e804b346b5f3225458bf3653d033c95fb4cb8148b5e1c7d7ba875637877df1489d43b22e6d47ed1d477545d564da57d864f54e4a4e30c61e4b4c94b3f2066 SHA512 f2da65a0cf10cda5ca471a09d351be8e2e5601857b4cb363ba45865e4595bebbc9b8cfa47660a1106b1521b4059d341c7e8c04c0c712387b913bdf994d1c6400
+EBUILD xiphos-4.0.6a.ebuild 2045 BLAKE2B 02426203620395f5a64438b0a7f97f41224a454fb8fcab01b61a6bb607bdda89ab0f47a1e4d44372db100abc8b8f28f0aa24dcff6cdb71f8e98412a589747d7d SHA512 e33b0410713e889a93febe02576e6a8213243be185c66b3b947fb0e7dc48c76178a05dc3e031f81bccf89668f9feb64f9db45fd59babaf263576ac58c3d85000
+EBUILD xiphos-4.1.0.ebuild 1998 BLAKE2B 4446b0796c9cc14c3f4cea5b7bef5b3773c7ad86cdfa8cb69f413494ba3fa161063373ffa3bbcf00e5bf68ead866675347f8ea92ed9b7a63edac679dbc4553a6 SHA512 24797cb338bce8906f6553e61f46d7eacab72ebb9540c3ee4465c1509e32884e56c5345388ff11ef0b2ca0a97542b47f63e383964439945726337d9a7b9cec2b
+MISC metadata.xml 300 BLAKE2B 84a7c7a8de67cb50a6c042a07d91b56067bec4e449c2a888d77f9c17ae23f5cf82f59d32237dd649af9b34bcd13df34f0fe19997ac57f7b468db4f50b281829c SHA512 0e8ea5d19ca48a68c4266c8cefb5c29d43d56c2ba61f271460ac35d5d8be18486c84ade898e2a8b647648afa24a19ee04ee60f2fca5a0fe358920deec2418340
diff --git a/app-text/xiphos/metadata.xml b/app-text/xiphos/metadata.xml
new file mode 100644
index 000000000000..139d2b70ed62
--- /dev/null
+++ b/app-text/xiphos/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>theology@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">gnomesword</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/xiphos/xiphos-4.0.6a.ebuild b/app-text/xiphos/xiphos-4.0.6a.ebuild
new file mode 100644
index 000000000000..1bd7cf90e5b0
--- /dev/null
+++ b/app-text/xiphos/xiphos-4.0.6a.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+inherit flag-o-matic gnome2-utils python-single-r1 toolchain-funcs
+
+MY_PV="${PV}-20170820"
+MY_P="${PN}-${MY_PV}"
+DESCRIPTION="A bible study frontend for Sword (formerly known as GnomeSword)"
+HOMEPAGE="http://xiphos.org/"
+SRC_URI="https://github.com/crosswire/${PN}/releases/download/${PV}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2 FDL-1.1 LGPL-2 MIT MPL-1.1"
+SLOT="0"
+KEYWORDS="amd64"
+IUSE="dbus debug"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	>=app-text/sword-1.7.4
+	>=dev-libs/glib-2[${PYTHON_USEDEP}]
+	dev-libs/libxml2[${PYTHON_USEDEP}]
+	gnome-base/gconf[${PYTHON_USEDEP}]
+	gnome-extra/gtkhtml:4.0
+	>=gnome-extra/libgsf-1.14
+	net-libs/webkit-gtk:4
+	x11-libs/gtk+:3
+	dbus? ( dev-libs/dbus-glib )
+"
+DEPEND="${RDEPEND}
+	app-text/docbook2X
+	app-text/gnome-doc-utils[${PYTHON_USEDEP}]
+	app-text/rarian
+	dev-libs/libxslt[${PYTHON_USEDEP}]
+	dev-util/intltool
+	>=net-libs/biblesync-1.1.2-r1[-static]
+	virtual/pkgconfig
+	sys-devel/gettext
+"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	sed -i \
+		-e '/FLAGS_DEBUG/s:-g:-Wall:' \
+		-e '/FLAGS_RELEASE/s:-O2:-Wall:' \
+		wscript || die
+	default
+}
+
+src_configure() {
+	append-cppflags -DNO_SWORD_SET_RENDER_NOTE_NUMBERS=1
+
+	tc-export AR CC CPP CXX RANLIB
+
+	CCFLAGS="${CFLAGS}" \
+	LINKFLAGS="${LDFLAGS}" \
+	SGML2MAN="$(type -P docbook2man.pl)" \
+		./waf -v \
+			--prefix=/usr \
+			--gtk=3 \
+			--enable-webkit2 \
+			--debug-level=$(use debug && echo debug || echo release) \
+			$(use dbus || echo --disable-dbus) \
+			configure || die
+}
+
+src_compile() {
+	./waf -v build || die
+}
+
+src_install() {
+	./waf -v --destdir="${D}" install || die
+
+	doman ${PN}.1
+	dodoc AUTHORS ChangeLog RELEASE-NOTES TODO
+
+	dodoc Xiphos.ogg
+	docompress -x /usr/share/doc/${PF}/Xiphos.ogg
+
+	rm -rf "${ED}"/usr/share/doc/${PN}
+}
+
+pkg_preinst() {	gnome2_icon_savelist; }
+pkg_postinst() { gnome2_icon_cache_update; }
+pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/app-text/xiphos/xiphos-4.1.0.ebuild b/app-text/xiphos/xiphos-4.1.0.ebuild
new file mode 100644
index 000000000000..9824202606e8
--- /dev/null
+++ b/app-text/xiphos/xiphos-4.1.0.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+inherit flag-o-matic gnome2-utils python-single-r1 toolchain-funcs
+
+DESCRIPTION="A bible study frontend for Sword (formerly known as GnomeSword)"
+HOMEPAGE="http://xiphos.org/"
+SRC_URI="https://github.com/crosswire/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2 FDL-1.1 LGPL-2 MIT MPL-1.1"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="dbus debug"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	>=app-text/sword-1.8.0
+	>=dev-libs/glib-2[${PYTHON_USEDEP}]
+	dev-libs/libxml2[${PYTHON_USEDEP}]
+	gnome-base/gconf[${PYTHON_USEDEP}]
+	gnome-extra/gtkhtml:4.0
+	>=gnome-extra/libgsf-1.14
+	net-libs/webkit-gtk:4
+	x11-libs/gtk+:3
+	dbus? ( dev-libs/dbus-glib )
+"
+DEPEND="${RDEPEND}
+	app-text/docbook2X
+	app-text/gnome-doc-utils[${PYTHON_USEDEP}]
+	app-text/rarian
+	dev-libs/libxslt[${PYTHON_USEDEP}]
+	dev-util/intltool
+	>=net-libs/biblesync-1.1.2-r1[-static]
+	virtual/pkgconfig
+	sys-devel/gettext
+"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	sed -i \
+		-e '/FLAGS_DEBUG/s:-g:-Wall:' \
+		-e '/FLAGS_RELEASE/s:-O2:-Wall:' \
+		wscript || die
+	default
+}
+
+src_configure() {
+	append-cppflags -DNO_SWORD_SET_RENDER_NOTE_NUMBERS=1
+
+	tc-export AR CC CPP CXX RANLIB
+
+	CCFLAGS="${CFLAGS}" \
+	LINKFLAGS="${LDFLAGS}" \
+	SGML2MAN="$(type -P docbook2man.pl)" \
+		./waf -v \
+			--prefix=/usr \
+			--gtk=3 \
+			--enable-webkit2 \
+			--debug-level=$(use debug && echo debug || echo release) \
+			$(use dbus || echo --disable-dbus) \
+			configure || die
+}
+
+src_compile() {
+	./waf -v build || die
+}
+
+src_install() {
+	./waf -v --destdir="${D}" install || die
+
+	doman ${PN}.1
+	dodoc AUTHORS ChangeLog RELEASE-NOTES TODO
+
+	dodoc Xiphos.ogg
+	docompress -x /usr/share/doc/${PF}/Xiphos.ogg
+
+	rm -rf "${ED}"/usr/share/doc/${PN}
+}
+
+pkg_preinst() {	gnome2_icon_savelist; }
+pkg_postinst() { gnome2_icon_cache_update; }
+pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/app-text/xlhtml-0.5.1_p6 b/app-text/xlhtml-0.5.1_p6
deleted file mode 100644
index d1e6f7483d30..000000000000
--- a/app-text/xlhtml-0.5.1_p6
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Convert MS Excel and Powerpoint files to HTML
-EAPI=5
-HOMEPAGE=http://chicago.sourceforge.net/xlhtml/ http://packages.debian.org/etch/xlhtml/
-KEYWORDS=alpha amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://debian/pool/main/x/xlhtml/xlhtml_0.5.1.orig.tar.gz mirror://debian/pool/main/x/xlhtml/xlhtml_0.5.1-6.diff.gz
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=036665e15ac2bb97b010b1a9b0d02511
diff --git a/app-text/xlhtml/Manifest b/app-text/xlhtml/Manifest
new file mode 100644
index 000000000000..ad382167c7e3
--- /dev/null
+++ b/app-text/xlhtml/Manifest
@@ -0,0 +1,4 @@
+DIST xlhtml_0.5.1-6.diff.gz 119282 BLAKE2B 032ba3c27a8d1d8b3b0bc40b30d137ff03f6b3d2d6dd0cec00203d705fd70fbf926e737536829e3aeeb3592a157402ce49c0754e5b232df3d28aee046141b5ad SHA512 f1f4bba58858e6033f164e689333904887b7cd60bf082e2247e7fe0c54f3737e72aff6590deefd1d8a04d4b25d27631664594c50c9cc4bbdc8c9b20c6ccce7bd
+DIST xlhtml_0.5.1.orig.tar.gz 263933 BLAKE2B 88d08e4e3dd573136f8a7ef27038b80bf8dde14f648e200f1673e1a83ebcd4ba085f3073d51f0473e5ca45e731414bad5bf00381dd7c56b369311cb6473342c7 SHA512 9ac1cafd4496293cbc5ca9109a8d467fab6dd24c1daa91754b7f49502e2607272292b8bb9ed876b21fe1b287ef3293a0f6c5882c18a18fd715137c27d63f9f01
+EBUILD xlhtml-0.5.1_p6.ebuild 969 BLAKE2B f1a7ff55f6ec192c2ec329951097dc35f0907b228cbdb61f19d9c25c663882125af1244ae553a1e5fbd79ffd3dc972de5387ebfbbc4a6e298768c1c05181596f SHA512 7041a06c8a35e5c268e0ee4377cee1980a4f812184dfa27ebbeb363f845fac4e15f01799627ffa229e335e70979681d49db5cfcc022615fa921adc07fa45e178
+MISC metadata.xml 249 BLAKE2B 31251b3297cc7eb5625140690803a9f0f7471c492eb02f10594f5031c5ca133bd409f65d9285644c6c3fadd1af1155a4946d0935feba73a3c90c4d95f60889fa SHA512 f6d4ee96a09d5be353d8965ce7944db541bfd6fbe75e2a80dd660993e36250fe146c30ca914667c0d09ae3916274295661f2a6b0b1bc1c2fcc0123a7cde2b3a6
diff --git a/app-text/xlhtml/metadata.xml b/app-text/xlhtml/metadata.xml
new file mode 100644
index 000000000000..093eecf6e488
--- /dev/null
+++ b/app-text/xlhtml/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <!-- maintainer-needed -->
+  <upstream>
+    <remote-id type="sourceforge">chicago</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-text/xlhtml/xlhtml-0.5.1_p6.ebuild b/app-text/xlhtml/xlhtml-0.5.1_p6.ebuild
new file mode 100644
index 000000000000..eb983af44ba3
--- /dev/null
+++ b/app-text/xlhtml/xlhtml-0.5.1_p6.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools eutils
+
+MY_PV=${PV/_p*/}
+DEB_PR=${PV/*_p/}
+
+DESCRIPTION="Convert MS Excel and Powerpoint files to HTML"
+HOMEPAGE="http://chicago.sourceforge.net/xlhtml/ http://packages.debian.org/etch/xlhtml/"
+SRC_URI="
+	mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${MY_PV}.orig.tar.gz
+	mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${MY_PV}-${DEB_PR}.diff.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE=""
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	ecvs_clean
+	epatch "${WORKDIR}"/${PN}_${MY_PV}-${DEB_PR}.diff
+
+	mv configure.{in,ac} || die
+
+	eautoreconf
+}
+
+src_install() {
+	default
+
+	docinto cole
+	dodoc cole/{AUTHORS,COPYING,NEWS,ChangeLog,THANKS,TODO}
+
+	docinto ppthtml
+	dodoc ppthtml/{ChangeLog,README,THANKS}
+
+	docinto xlhtml
+	dodoc -r xlhtml/{ChangeLog,README,THANKS,TODO,contrib}
+}
diff --git a/app-text/xlsx2csv-0.7.2 b/app-text/xlsx2csv-0.7.2
deleted file mode 100644
index c936d6545aeb..000000000000
--- a/app-text/xlsx2csv-0.7.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-lang/perl python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_4? ( dev-lang/python:3.4[xml] ) python_targets_python3_5? ( dev-lang/python:3.5[xml] ) python_targets_python3_6? ( dev-lang/python:3.6[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Convert MS Office xlsx files to CSV
-EAPI=5
-HOMEPAGE=https://github.com/dilshod/xlsx2csv/
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_4? ( dev-lang/python:3.4[xml] ) python_targets_python3_5? ( dev-lang/python:3.5[xml] ) python_targets_python3_6? ( dev-lang/python:3.6[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/x/xlsx2csv/xlsx2csv-0.7.2.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2854e17aac0367938fad4786164c9b0a
diff --git a/app-text/xlsx2csv-0.7.3 b/app-text/xlsx2csv-0.7.3
deleted file mode 100644
index 989a3ed5e1ac..000000000000
--- a/app-text/xlsx2csv-0.7.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-lang/perl python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_4? ( dev-lang/python:3.4[xml] ) python_targets_python3_5? ( dev-lang/python:3.5[xml] ) python_targets_python3_6? ( dev-lang/python:3.6[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Convert MS Office xlsx files to CSV
-EAPI=6
-HOMEPAGE=https://github.com/dilshod/xlsx2csv/
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_4? ( dev-lang/python:3.4[xml] ) python_targets_python3_5? ( dev-lang/python:3.5[xml] ) python_targets_python3_6? ( dev-lang/python:3.6[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/x/xlsx2csv/xlsx2csv-0.7.3.tar.gz
-_eclasses_=distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=cdd1f54366922f6475d55f9ff07eeeca
diff --git a/app-text/xlsx2csv/Manifest b/app-text/xlsx2csv/Manifest
new file mode 100644
index 000000000000..ee618d453d27
--- /dev/null
+++ b/app-text/xlsx2csv/Manifest
@@ -0,0 +1,5 @@
+DIST xlsx2csv-0.7.2.tar.gz 188520 BLAKE2B f0db947e0f2a69997f1c380fd1f6427fef9ff354dd8ea68fec06767a5222e4a1163b8401be3c40d9075fcd1b57e3ed33a046e8fa881e93d5e638d103a98c417c SHA512 c55535271801a690ed9ff28c2572d13cdac0efd206685a2119b73d1da7b4a46754da60782b36f7976bc5dc1b478860430848ccbee347824aea1a6556764c5922
+DIST xlsx2csv-0.7.3.tar.gz 201482 BLAKE2B a2268e584097777d28f2565a19d0f271cb694066e1abffffd7578ecf0271efd420af63932eaea4389c062e050da257fa2f7164c9de7cdfa4ab3fd416692e7968 SHA512 855fcce9ae6ec51c46673e085a456d2862912d0da5130fdac34d88e5612c64d2bc0674c13b3bfb6cd6b7017e513fe0924dbb594db543020842705a82b6006e8e
+EBUILD xlsx2csv-0.7.2.ebuild 544 BLAKE2B e990caa76a47651d6228cc6a0ea2b9f2e620cf2119cd3ecfe77fe3064c9ddd8b865f3e317f594c472384a1bf0b139cfbc1df613ef7bd4ef319081620836dead5 SHA512 dd0ec87bc91079bedf57ad386b7ef403e6e0317f2a1edf5ff379788c7215567c2531d5970d5f7acd301a0eba073512726d6bc28c3919c110bc8ac0e5470201a3
+EBUILD xlsx2csv-0.7.3.ebuild 544 BLAKE2B d6380cc49b1f277049c6730e5c058849ef4995a3c8589d73f2d6ef442ebee072a300fb018ca6bb35cbbd95cc64737342dac73758a53b624c0fc85ae91f022963 SHA512 c58752c07e4aec3963b50e2d47d44d8e608d5144b2205bd30e7c13be4b5097fe029d39275fecf2183e58ea348f8d4ae80e91a5ba155080d3a348728c920f6313
+MISC metadata.xml 385 BLAKE2B 6392216bb79b39e6121a2b6e48f838c04acc0682e1cff0c4c39c68cc7439edb2ff924b817e6bef0e94af24c64b19e68c897d5ef620bee4c171004a7420f7e151 SHA512 e608a317791c590b9dc226f44cc9ddfc2c2d4ebf39cad1b41d230d14549d2718ad09a8cdd79afc2c2e75f4929907ea14d4944923013e00001e9ab0e87c58619b
diff --git a/app-text/xlsx2csv/metadata.xml b/app-text/xlsx2csv/metadata.xml
new file mode 100644
index 000000000000..4b2ed89ad35a
--- /dev/null
+++ b/app-text/xlsx2csv/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>radhermit@gentoo.org</email>
+    <name>Tim Harder</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">xlsx2csv</remote-id>
+    <remote-id type="github">dilshod/xlsx2csv</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-text/xlsx2csv/xlsx2csv-0.7.2.ebuild b/app-text/xlsx2csv/xlsx2csv-0.7.2.ebuild
new file mode 100644
index 000000000000..56d36da399eb
--- /dev/null
+++ b/app-text/xlsx2csv/xlsx2csv-0.7.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_REQ_USE="xml"
+
+inherit distutils-r1
+
+DESCRIPTION="Convert MS Office xlsx files to CSV"
+HOMEPAGE="https://github.com/dilshod/xlsx2csv/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-lang/perl"
+
+python_compile_all() {
+	emake -C man
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	doman man/${PN}.1
+}
diff --git a/app-text/xlsx2csv/xlsx2csv-0.7.3.ebuild b/app-text/xlsx2csv/xlsx2csv-0.7.3.ebuild
new file mode 100644
index 000000000000..213c2d7ff6be
--- /dev/null
+++ b/app-text/xlsx2csv/xlsx2csv-0.7.3.ebuild
@@ -0,0 +1,27 @@
+# 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} )
+PYTHON_REQ_USE="xml"
+
+inherit distutils-r1
+
+DESCRIPTION="Convert MS Office xlsx files to CSV"
+HOMEPAGE="https://github.com/dilshod/xlsx2csv/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-lang/perl"
+
+python_compile_all() {
+	emake -C man
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	doman man/${PN}.1
+}
diff --git a/app-text/xml2-0.5 b/app-text/xml2-0.5
deleted file mode 100644
index 0449d2f806e8..000000000000
--- a/app-text/xml2-0.5
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DEPEND=dev-libs/libxml2 virtual/pkgconfig
-DESCRIPTION=These tools are used to convert XML and HTML to and from a line-oriented format
-EAPI=4
-HOMEPAGE=http://dan.egnor.name/xml2
-KEYWORDS=~amd64 ~x86 ~x86-linux ~ppc-macos
-LICENSE=GPL-2
-RDEPEND=dev-libs/libxml2
-SLOT=0
-SRC_URI=http://download.ofb.net/gale/xml2-0.5.tar.gz
-_md5_=bc14ad416bb9f79225dcb959c4f35ff4
diff --git a/app-text/xml2/Manifest b/app-text/xml2/Manifest
new file mode 100644
index 000000000000..97b615070e51
--- /dev/null
+++ b/app-text/xml2/Manifest
@@ -0,0 +1,3 @@
+DIST xml2-0.5.tar.gz 86318 BLAKE2B acafc3f28baf21308ecb5ca7bfef3526e0850355d1f4ce29a26ba2a580d5a2a7c6a1bb072f6e4c77df3a4de6fd7fb83bb1d7fd959926b8f34618063eee48c31f SHA512 76b6523e1b64af32529fd8cec52f61f3ca45e452c1398772367f8389368bb7712698e4ba6cb6c8e50e92f68f7f9517f90668c73016e11797931ddb6858782aba
+EBUILD xml2-0.5.ebuild 445 BLAKE2B b76147c754053956e8e772145a71a41b4b1d98a69820876d671c2291ead6fe74c943dee193d1893d4e9ff8c6e11fa7c3ecef6ebed05bb4347a567cf01108959d SHA512 6f994f874089f6190c1f3528d2f64a54022619ee06b80102c6cc17ddd3df383f7f736d6b8879ce53e8a9a6451dd25acf09b7b287dc059e6c11e48ce1eca98a3b
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/xml2/metadata.xml b/app-text/xml2/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-text/xml2/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/app-text/xml2/xml2-0.5.ebuild b/app-text/xml2/xml2-0.5.ebuild
new file mode 100644
index 000000000000..45dbd05bc02b
--- /dev/null
+++ b/app-text/xml2/xml2-0.5.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+DESCRIPTION="These tools are used to convert XML and HTML to and from a line-oriented format"
+HOMEPAGE="http://dan.egnor.name/xml2"
+SRC_URI="http://download.ofb.net/gale/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-linux ~ppc-macos"
+IUSE=""
+
+RDEPEND="dev-libs/libxml2"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
diff --git a/app-text/xml2doc-20030510-r1 b/app-text/xml2doc-20030510-r1
deleted file mode 100644
index 4514e9208931..000000000000
--- a/app-text/xml2doc-20030510-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=>=dev-libs/libxml2-2.5
-DESCRIPTION=Tool to convert simple XML to a variety of formats (pdf, html, txt, manpage)
-EAPI=4
-HOMEPAGE=http://xml2doc.sourceforge.net
-KEYWORDS=alpha amd64 ~hppa ia64 ~mips ppc ppc64 sparc x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/libxml2-2.5
-SLOT=0
-SRC_URI=mirror://sourceforge/xml2doc/xml2doc-20030510.tgz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=894a12baadeb08aa9274f01e59f1a137
diff --git a/app-text/xml2doc/Manifest b/app-text/xml2doc/Manifest
new file mode 100644
index 000000000000..cede4b7ac543
--- /dev/null
+++ b/app-text/xml2doc/Manifest
@@ -0,0 +1,4 @@
+AUX xml2doc-pointer_fix.patch 627 BLAKE2B 3ca9313b44d88fce3f548874d40ed57b42b9faa66e30574677c911f7d5c9d0a8d5eea8c35781162302543df82c5b38b1327fcaabee0a50c396c95937c3a86e44 SHA512 ebdf69986821fdb1a22e3da4447729433d7f30d08e516b5b28c1f9e4fe6ec98d7a31e925028f940e8a0aaab5c05bd52a1a4d12564fd47a79953b1de606fd2430
+DIST xml2doc-20030510.tgz 53307 BLAKE2B 3f7e44ede6ac0a2ec4762e66181de34ffe553035b54ee302345d1b38a5063106fc4ba65abec042b4ec693b173d70fc4b548ebc942b2a8f6636f84e7beeed2bd6 SHA512 9eb2970b7adef1669b9b0aede2b3d2b42ba234c8294f0f8e6e230d8fcc6cf878675b2f0bff87ee36a255ab29376be844d92d382be7aad0ab11972847cfe49dbd
+EBUILD xml2doc-20030510-r1.ebuild 1217 BLAKE2B 7b48db570d5435d43d48d03e53ee8231aefa570fee8a1965abadfbc0078576575fdeae11af3a0018bc15081cf2455aeb80e22ee49ff56755e763c678e3d0f79c SHA512 19ef01d4a2a2ecf59122073e060ee0b13208a113d3839f71969509cfcef3e12597c37963a77daaa3be5223ec40bc9351ddb583ad680e549354dfc9e36535f07e
+MISC metadata.xml 244 BLAKE2B 6c0f152456a096c4bfbf861d8d7db04d0b8c605deb5f9a3277cd6b60df4a714c77bb12d5e4a491a193da11883447855986468ecf5c707600febbed973253181d SHA512 b4abe1dd13476a480e518e284cb832c2b41893049169975ee44edba8661af79b7cd8f8110e03b920fe90cd8e0e1d926bd5a692a24ecb841bd454659de3422ee9
diff --git a/app-text/xml2doc/files/xml2doc-pointer_fix.patch b/app-text/xml2doc/files/xml2doc-pointer_fix.patch
new file mode 100644
index 000000000000..b6adabe3c1a3
--- /dev/null
+++ b/app-text/xml2doc/files/xml2doc-pointer_fix.patch
@@ -0,0 +1,20 @@
+diff -NurdpB xml2doc/src/output_info.c xml2doc-patched/src/output_info.c
+--- xml2doc/src/output_info.c	2003-04-25 05:11:27.000000000 -0500
++++ xml2doc-patched/src/output_info.c	2007-03-14 15:07:59.000000000 -0500
+@@ -9,11 +9,11 @@ void output_info()
+ 		*subject  =  xmlGetProp(Doc[n].cur,"subject"),
+ 		*keywords =  xmlGetProp(Doc[n].cur,"keywords"),
+ 		*trapped  =  xmlGetProp(Doc[n].cur,"trapped");
+-	struct time_t *timet;
+-        struct tm *clk;
+-	
+-	time((time_t *)&timet);		
+-	clk=localtime((const time_t *)&timet);
++	time_t timet;
++	struct tm *clk;
++
++	time(&timet);
++	clk=localtime(&timet);
+ 
+ 	switch(DocS.output)
+ 	{
diff --git a/app-text/xml2doc/metadata.xml b/app-text/xml2doc/metadata.xml
new file mode 100644
index 000000000000..6109befef74c
--- /dev/null
+++ b/app-text/xml2doc/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="sourceforge">xml2doc</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/xml2doc/xml2doc-20030510-r1.ebuild b/app-text/xml2doc/xml2doc-20030510-r1.ebuild
new file mode 100644
index 000000000000..ee66dcf4fb06
--- /dev/null
+++ b/app-text/xml2doc/xml2doc-20030510-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Tool to convert simple XML to a variety of formats (pdf, html, txt, manpage)"
+
+HOMEPAGE="http://xml2doc.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
+
+LICENSE="GPL-2"
+IUSE=""
+SLOT="0"
+
+KEYWORDS="alpha amd64 ~hppa ia64 ~mips ppc ppc64 sparc x86"
+
+DEPEND=">=dev-libs/libxml2-2.5"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	# Fix pointer-related bug detected by a QA notice.
+	epatch "${FILESDIR}/${PN}-pointer_fix.patch"
+
+	# Don't strip symbols from binary (bug #152266)
+	sed -i -e '/^\s*strip/d' \
+		-e 's/^\t$(CC) $(LFLAGS).*/\t$(LINK.o) $(L_PDF) $^ -lxml2 -o $(BIN)/' \
+		-e '/^\t$(CC) $(CFLAGS) /d' \
+		src/Makefile.in
+}
+
+src_configure() {
+	econf --disable-pdf
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)"
+
+	cd "${S}/doc"
+	"${S}"/src/xml2doc -oM manpage.xml xml2doc.1 || die
+}
+
+src_install() {
+	# xml2doc's make install is unfortunately broken
+
+	# binary
+	dobin src/xml2doc || die
+
+	# documentation
+	dodoc BUGS README TODO || die
+	docinto examples
+	dodoc examples/*.{xml,png} || die
+
+	# manpage
+	doman doc/xml2doc.1 || die
+}
diff --git a/app-text/xmldiff-0.6.10-r2 b/app-text/xmldiff-0.6.10-r2
deleted file mode 100644
index 1fad588a6380..000000000000
--- a/app-text/xmldiff-0.6.10-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=A tool that figures out the differences between two similar XML files
-EAPI=5
-HOMEPAGE=https://www.logilab.org/project/xmldiff
-IUSE=python_targets_python2_7
-KEYWORDS=alpha amd64 ia64 ppc sparc x86 ~x86-linux
-LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=ftp://ftp.logilab.fr/pub/xmldiff/xmldiff-0.6.10.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	distutils-r1	63fea93ca1cc4fdc5fa2247afc4e3a15	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multibuild	35719a9cd25ec71ee49c966f6868454c	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	0b5829eb6369d7af3a834b6eed7b7107	python-utils-r1	7db901256449fef43c3aaa4d486c1c63	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=51f35145ce3aa5e507b08991c207b525
diff --git a/app-text/xmldiff/Manifest b/app-text/xmldiff/Manifest
new file mode 100644
index 000000000000..c8648021f6ff
--- /dev/null
+++ b/app-text/xmldiff/Manifest
@@ -0,0 +1,3 @@
+DIST xmldiff-0.6.10.tar.gz 45827 BLAKE2B f4b97d4fa7063f1edb66ab1bd465dc81cd66f35233dcd3d8ae2cc1f13e9e841645ddf8848dcd3bafc45d44da218c8260b36f5210883f3963572b375173e6d687 SHA512 b183a6e94258c4d693fa97e759868dae2dca6088e3cf12cf08b40e82d18a375f02b12d62d0cfc03fb74a5138f32f6614f555b95a3062ba768d1cdaf3391cc95b
+EBUILD xmldiff-0.6.10-r2.ebuild 488 BLAKE2B 189741dc68933d3e514fb99b816aa2d531650d7850816cbabbb161e9bfad810a79d84b4e92e2ecc1782e6f9cc043590c3def905e1559e035dc9a67af8e1e52b4 SHA512 a2bd7bb2bb2a7cb3c6cfd3b6489dfe510b6f1ff6eb7b421e43f0fa29ceb229a3b60f73a982807c66d51b140770808d5657de5774ffeb77f87ca1be050fdd712c
+MISC metadata.xml 575 BLAKE2B a4b096b5e7322a3b44bd67a360f32ea6042ad59e6f90c93d33fe468550e2bbe23d3d449e633c4f1ab8133333b689341d374196784d4bb9f4a6bc2b20030002ae SHA512 6bc0a3df2b2c0c34df37d6b5985fcf4fba8577560edbebfc4d87ce0e66b8bba4d44eb6df72ed22c70d84b1ead2c975f567ec45f6bc01128cbd5c62cc7ec0fd4e
diff --git a/app-text/xmldiff/metadata.xml b/app-text/xmldiff/metadata.xml
new file mode 100644
index 000000000000..e7734cc5fb8a
--- /dev/null
+++ b/app-text/xmldiff/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>xmw@gentoo.org</email>
+		<name>Michael Weber</name>
+	</maintainer>
+	<longdescription>
+		A python tool that figures out the differences between two
+		similar XML files, in the same way the diff utility does.
+		Xmldiff was initially developed for the Narval project and could also be
+		used as a library or as a command line tool. It can work either with XML
+		files or DOM trees.
+	</longdescription>
+</pkgmetadata>
diff --git a/app-text/xmldiff/xmldiff-0.6.10-r2.ebuild b/app-text/xmldiff/xmldiff-0.6.10-r2.ebuild
new file mode 100644
index 000000000000..e116f9beb7a1
--- /dev/null
+++ b/app-text/xmldiff/xmldiff-0.6.10-r2.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="A tool that figures out the differences between two similar XML files"
+HOMEPAGE="https://www.logilab.org/project/xmldiff"
+SRC_URI="ftp://ftp.logilab.fr/pub/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ia64 ppc sparc x86 ~x86-linux"
+IUSE=""
+
+DOCS=( ChangeLog README README.xmlrev TODO )
diff --git a/app-text/xmlformat-1.04 b/app-text/xmlformat-1.04
deleted file mode 100644
index 3815d0e836a6..000000000000
--- a/app-text/xmlformat-1.04
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install test
-DEPEND=ruby? ( || ( dev-lang/ruby:2.3 dev-lang/ruby:2.2 dev-lang/ruby:2.4 dev-lang/ruby:2.5 ) virtual/rubygems ) !ruby? ( dev-lang/perl )
-DESCRIPTION=Reformat XML documents to your custom style
-EAPI=5
-HOMEPAGE=http://www.kitebird.com/software/xmlformat/
-IUSE=ruby doc
-KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=xmlformat
-RDEPEND=ruby? ( || ( dev-lang/ruby:2.3 dev-lang/ruby:2.2 dev-lang/ruby:2.4 dev-lang/ruby:2.5 ) virtual/rubygems ) !ruby? ( dev-lang/perl )
-SLOT=0
-SRC_URI=http://www.kitebird.com/software/xmlformat/xmlformat-1.04.tar.gz
-_eclasses_=ruby-single	7435c1687c234eb8cf5b212756f6381e	ruby-utils	e5942a80e3c3b936c6b84d6dc4af9f9c
-_md5_=75fa847eaf109223d41ce808ac1e197c
diff --git a/app-text/xmlformat/Manifest b/app-text/xmlformat/Manifest
new file mode 100644
index 000000000000..57607ef30105
--- /dev/null
+++ b/app-text/xmlformat/Manifest
@@ -0,0 +1,3 @@
+DIST xmlformat-1.04.tar.gz 156498 BLAKE2B 18463dea611a5d080056b0ed314eb12555e2abb12d630fb879421fa6359606f7606fda42e146eaaea7ae2fa470661ab4e28a86762375024704e607316f6323cf SHA512 e45471accf0c04e016d3a9a5bbc2f984a9a76e1d5406a80300bf9da9d04bd78b67716055271923669462b70a1713b94a1e1937318115dfd9eb9d258b69a3c14d
+EBUILD xmlformat-1.04.ebuild 971 BLAKE2B 571ca3d2dc069aa83f71adb8a21a63169ebf2f236b62c958aed58c4e0788ad8b66f8a7a286318b0d9be5f0f977a2decbc99e93812e5f5e969d1387971e74aa2f SHA512 3b7e3e29a617fe595fc2caf741284e3b5a211caa481e110db0e4f9aac9494a5b693b6c9ba09cd5e532843dc0faddc268b45f1c118bff7619670ad77aec34436f
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/xmlformat/metadata.xml b/app-text/xmlformat/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-text/xmlformat/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/app-text/xmlformat/xmlformat-1.04.ebuild b/app-text/xmlformat/xmlformat-1.04.ebuild
new file mode 100644
index 000000000000..b91035f55bd4
--- /dev/null
+++ b/app-text/xmlformat/xmlformat-1.04.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
+
+inherit ruby-single
+
+DESCRIPTION="Reformat XML documents to your custom style"
+SRC_URI="http://www.kitebird.com/software/${PN}/${P}.tar.gz"
+HOMEPAGE="http://www.kitebird.com/software/xmlformat/"
+
+SLOT="0"
+LICENSE="xmlformat"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+DEPEND="ruby? ( ${RUBY_DEPS} )
+	!ruby? ( dev-lang/perl )"
+RDEPEND=${DEPEND}
+IUSE="ruby doc"
+
+src_install() {
+	dobin xmlformat.pl
+
+	if use ruby
+	then
+		dobin xmlformat.rb
+		dosym xmlformat.rb /usr/bin/xmlformat
+	else
+		dosym xmlformat.pl /usr/bin/xmlformat
+	fi
+
+	dodoc BUGS ChangeLog README TODO
+
+	if use doc
+	then
+		# APIs
+		insinto /usr/share/doc/${PF}
+		doins -r docs/*
+	fi
+}
+
+src_test() {
+	if use ruby
+	then
+		./runtest all || die "runtest for ruby failed."
+	else
+		./runtest -p all || die "runtest for perl failed."
+	fi
+}
diff --git a/app-text/xmlstarlet-1.6.1 b/app-text/xmlstarlet-1.6.1
deleted file mode 100644
index aa277d129eb0..000000000000
--- a/app-text/xmlstarlet-1.6.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=>=dev-libs/libxml2-2.6.27 >=dev-libs/libxslt-1.1.9 dev-libs/libgcrypt:0 virtual/libiconv sys-apps/sed
-DESCRIPTION=A set of tools to transform, query, validate, and edit XML documents
-EAPI=4
-HOMEPAGE=http://xmlstar.sourceforge.net/
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ppc ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=MIT
-RDEPEND=>=dev-libs/libxml2-2.6.27 >=dev-libs/libxslt-1.1.9 dev-libs/libgcrypt:0 virtual/libiconv
-SLOT=0
-SRC_URI=mirror://sourceforge/xmlstar/xmlstarlet-1.6.1.tar.gz
-_md5_=7ad12c6021fece82bf6af2d231b4b281
diff --git a/app-text/xmlstarlet/Manifest b/app-text/xmlstarlet/Manifest
new file mode 100644
index 000000000000..bd403653d478
--- /dev/null
+++ b/app-text/xmlstarlet/Manifest
@@ -0,0 +1,3 @@
+DIST xmlstarlet-1.6.1.tar.gz 420923 BLAKE2B 56bf29f62549a7445e3cf15b6a3f60558dbcacf96645c3acc5a45b432d61f47614274a5d3e7234399f7dbdb854b503d73a6cfb8989710b7363d743dce4dff8f0 SHA512 4228df812caec7059d7a76986c4d9a4262bd861cc53dca05f341ae6c062be05f1c39fc637918ab00f60f40587c6c556e3c9bfaf8a18b149e3c321a92214dbe8b
+EBUILD xmlstarlet-1.6.1.ebuild 933 BLAKE2B bd579b52641fb927084d915a1272b1f57f198a16f5f810f780c6e36e3667e1a62f2c1ba2fe7cd62740425457b22382b3a05edd4997616489e6dcea2f7f813c17 SHA512 9907ecd56ddc3e689799ffd69078957c240bb39ad502317733d9d021605d0b26e22f67ae511b1a3ce194d58fa5ef6aa95df7536046168c18eb73d976aaeb3bf9
+MISC metadata.xml 293 BLAKE2B 1e39cff7005653b64f2f27c49262c0ae492da15d33d361e5e9b4148a3e975db2b30e26468fe5cf7f61155f53a3f76a16121b8a4c85ae5420d0ec74885d33bba9 SHA512 9fd9f809f74a272cc9abb789f3e08ab9b2ecdd1f6ca3931f43567b3b2e3423c0622bd3cc52f5dceac6989282351400fe9c1554ec2b69439986902b11f589796d
diff --git a/app-text/xmlstarlet/metadata.xml b/app-text/xmlstarlet/metadata.xml
new file mode 100644
index 000000000000..191767272026
--- /dev/null
+++ b/app-text/xmlstarlet/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>sping@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">xmlstar</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/xmlstarlet/xmlstarlet-1.6.1.ebuild b/app-text/xmlstarlet/xmlstarlet-1.6.1.ebuild
new file mode 100644
index 000000000000..96f6d174f1ce
--- /dev/null
+++ b/app-text/xmlstarlet/xmlstarlet-1.6.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+
+DESCRIPTION="A set of tools to transform, query, validate, and edit XML documents"
+HOMEPAGE="http://xmlstar.sourceforge.net/"
+SRC_URI="mirror://sourceforge/xmlstar/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE=""
+
+RDEPEND=">=dev-libs/libxml2-2.6.27
+	>=dev-libs/libxslt-1.1.9
+	dev-libs/libgcrypt:0
+	virtual/libiconv"
+
+DEPEND="${RDEPEND}
+	sys-apps/sed"
+
+src_configure() {
+	# NOTE: Fully built documentation is already shipped with the tarball:
+	# - doc/xmlstarlet-ug.{pdf,ps,html}
+	# - doc/xmlstarlet.txt
+	# - doc/xmlstarlet.1
+	econf \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--disable-build-docs \
+		--disable-static-libs \
+		--disable-silent-rules
+}
+
+src_install() {
+	default
+
+	dosym xml /usr/bin/xmlstarlet
+}
diff --git a/app-text/xmlto-0.0.26-r1 b/app-text/xmlto-0.0.26-r1
deleted file mode 100644
index b19337004e31..000000000000
--- a/app-text/xmlto-0.0.26-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure prepare
-DEPEND=>=app-text/docbook-xsl-stylesheets-1.62.0-r1 app-text/docbook-xml-dtd:4.2 app-shells/bash:0 dev-libs/libxslt sys-apps/sed || ( >=sys-apps/coreutils-6.10-r1 sys-freebsd/freebsd-ubin ) || ( sys-apps/util-linux app-misc/getopt ) || ( sys-apps/which sys-freebsd/freebsd-ubin ) text? ( || ( virtual/w3m www-client/lynx www-client/links ) ) latex? ( >=app-text/passivetex-1.25 >=dev-tex/xmltex-1.9-r2 )
-DESCRIPTION=script for converting XML and DocBook documents to a variety of output formats
-EAPI=5
-HOMEPAGE=https://pagure.io/xmlto
-IUSE=latex text
-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 ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=>=app-text/docbook-xsl-stylesheets-1.62.0-r1 app-text/docbook-xml-dtd:4.2 app-shells/bash:0 dev-libs/libxslt sys-apps/sed || ( >=sys-apps/coreutils-6.10-r1 sys-freebsd/freebsd-ubin ) || ( sys-apps/util-linux app-misc/getopt ) || ( sys-apps/which sys-freebsd/freebsd-ubin ) text? ( || ( virtual/w3m www-client/lynx www-client/links ) ) latex? ( >=app-text/passivetex-1.25 >=dev-tex/xmltex-1.9-r2 )
-SLOT=0
-SRC_URI=https://releases.pagure.org/xmlto/xmlto-0.0.26.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=acb86d362b8236d52798b8f10b51f5dc
diff --git a/app-text/xmlto-0.0.28-r1 b/app-text/xmlto-0.0.28-r1
deleted file mode 100644
index 1b88d0252b8d..000000000000
--- a/app-text/xmlto-0.0.28-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure prepare
-DEPEND=>=app-text/docbook-xsl-stylesheets-1.62.0-r1 app-text/docbook-xml-dtd:4.2 app-shells/bash:0 dev-libs/libxslt sys-apps/sed || ( >=sys-apps/coreutils-6.10-r1 sys-freebsd/freebsd-ubin ) || ( sys-apps/util-linux app-misc/getopt ) || ( sys-apps/which sys-freebsd/freebsd-ubin ) text? ( || ( virtual/w3m www-client/lynx www-client/elinks ) ) latex? ( >=app-text/passivetex-1.25 >=dev-tex/xmltex-1.9-r2 )
-DESCRIPTION=script for converting XML and DocBook documents to a variety of output formats
-EAPI=5
-HOMEPAGE=https://pagure.io/xmlto
-IUSE=latex text
-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 ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=>=app-text/docbook-xsl-stylesheets-1.62.0-r1 app-text/docbook-xml-dtd:4.2 app-shells/bash:0 dev-libs/libxslt sys-apps/sed || ( >=sys-apps/coreutils-6.10-r1 sys-freebsd/freebsd-ubin ) || ( sys-apps/util-linux app-misc/getopt ) || ( sys-apps/which sys-freebsd/freebsd-ubin ) text? ( || ( virtual/w3m www-client/lynx www-client/elinks ) ) latex? ( >=app-text/passivetex-1.25 >=dev-tex/xmltex-1.9-r2 )
-SLOT=0
-SRC_URI=https://releases.pagure.org/xmlto/xmlto-0.0.28.tar.bz2
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=b9eac9c7336387accf6ef2fdde22b9dc
diff --git a/app-text/xmlto/Manifest b/app-text/xmlto/Manifest
new file mode 100644
index 000000000000..d73e42d20e20
--- /dev/null
+++ b/app-text/xmlto/Manifest
@@ -0,0 +1,6 @@
+AUX xmlto-0.0.22-format_fo_passivetex_check.patch 2286 BLAKE2B eb004b4fa394840b8e6fd792bfacfee75d180a1493d960348a33c7737a33a15a809fff28f4b6ade3deb045b629eb48a675b56037da56a7fabcd20718dfdaa6a4 SHA512 c8eeb3dc909431dd2fb9f5286b6ee98a40dce80a29606a9884bdab50c039ac90097720b9b968dfac76546492844de0b72f2f6c937da14b47142ad81b897023f4
+DIST xmlto-0.0.26.tar.bz2 119819 BLAKE2B 9674389d7fac9e60ccab6530acc95338789401f6ddbd3bdea7cb98a350a50bbd8e539565fdcbad42778a1bbac22590bc923b3cae9108ec510dbc62e5d32e38c6 SHA512 85110f22a7b5a5c8de4115ae5d0391645a223191b17455a4f9539b02f56f7003fd4ba70e48f0e5e46cdb91220a9027802e725f88ca8659e3ce1576f8609ccd18
+DIST xmlto-0.0.28.tar.bz2 127921 BLAKE2B 12ef3e2e1436c330e7b003d08f4a4d4032d70255777956949eb8b47b6f5466e7c158b0f85dc87069c1e379603cac0b01c88589f98ca1ef9e862f0aef31169f6d SHA512 6e0c4968d4f1b7a3b132904182aa72a73f6167553eabdeb65cfafa6295ef7b960541685769d04144207963cca77b0c44db4f9fbb2796348ffcb37b3b399f18f1
+EBUILD xmlto-0.0.26-r1.ebuild 1348 BLAKE2B fa3ef6d8ee89e8f7965ad6a4fd4a95a89962be6b301b8d799c2aaf417f235a316044a204fb0077584b3771a1bad11d476537d031ac6f7b3850fdf8cde4bf2b0a SHA512 36750c08fd77ccd4bcf23782c3a0f881b3f256f0f293f2a266b3de908aed2fdff0c119185ab0cb8e5a3c25659ea2236bf2b03148c5bd1f23eb4f963dbe891335
+EBUILD xmlto-0.0.28-r1.ebuild 1360 BLAKE2B 9ffe7e58938a26f59b73dfc8abc060d1e98078e5dae8d7e77adaa87977a7d13cc6a9541d672b946345705b0667f7d5472ff8507e25f39ec6241af176b02bcbee SHA512 83303264380434741e5b3897d853cf92bad11acd3ab4b11c1e8e7e7abaf5b2ea0e307eb67149536b67401d02c47481615b2f05f5fb94033a7380bce93ac38d34
+MISC metadata.xml 247 BLAKE2B 17c173af66eaa7e25c4a88ae4e5b8cba24cd1f324224ddeb95774690a862c678f2c6c51cfd175aaa3781efa83d0526c01883b7888cba6fb9ba8f62b9bef5942f SHA512 f2b92e9bda8e4466d98436c15ee46b2a382afa4bfcf868678bb245abda936298ed41d03f3dcf5a61000ae1b1031a5578635e15293d63c531773d6a42d356af47
diff --git a/app-text/xmlto/files/xmlto-0.0.22-format_fo_passivetex_check.patch b/app-text/xmlto/files/xmlto-0.0.22-format_fo_passivetex_check.patch
new file mode 100644
index 000000000000..6c3dc7ce5127
--- /dev/null
+++ b/app-text/xmlto/files/xmlto-0.0.22-format_fo_passivetex_check.patch
@@ -0,0 +1,46 @@
+- Check for a passivetex format file and tell the user, if it's missing.
+- Modified to use texmf-site directory by ssuominen at gentoo.org.
+- http://bugs.debian.org/190840
+
+diff -ur xmlto-0.0.22.orig/format/fo/dvi xmlto-0.0.22/format/fo/dvi
+--- xmlto-0.0.22.orig/format/fo/dvi	2009-03-20 10:28:02.000000000 +0200
++++ xmlto-0.0.22/format/fo/dvi	2009-05-22 15:20:33.000000000 +0300
+@@ -11,6 +11,10 @@
+     echo >&2 "Can't process, xmltex tool not found at $XMLTEX_PATH."
+     exit 3
+   fi
++  if [ ! -f /usr/share/texmf-site/tex/xmltex/passivetex/fotex.xmt ]; then
++    printf "PassiveTeX is needed for this format, but it is not installed. Please install\nthe passivetex package.\n"
++    exit 1
++  fi
+   # Work around stupid tetex bug with '_' in filenames
+   # Also work around stupid tetex limitation with long lines (bug #101055)
+   sed -e "s,/>,\n/>,g" "$XSLT_PROCESSED" >tmp.fo
+diff -ur xmlto-0.0.22.orig/format/fo/pdf xmlto-0.0.22/format/fo/pdf
+--- xmlto-0.0.22.orig/format/fo/pdf	2009-03-20 10:28:33.000000000 +0200
++++ xmlto-0.0.22/format/fo/pdf	2009-05-22 15:20:33.000000000 +0300
+@@ -13,6 +13,10 @@
+ 	    echo >&2 "Can't process, pdfxmltex tool not found at $PDFXMLTEX_PATH."
+ 	    exit 3
+ 	  fi
++	  if [ ! -f /usr/share/texmf-site/tex/xmltex/passivetex/fotex.xmt ]; then
++	    printf "PassiveTeX is needed for this format, but it is not installed. Please install\nthe passivetex package.\n"
++	    exit 1
++	  fi
+ 	  # Work around stupid tetex bug with '_' in filenames
+ 	  # Also work around stupid tetex limitation with long lines (bug #101055)
+ 	  sed -e "s,/>,\n/>,g" "$XSLT_PROCESSED" >tmp.fo
+diff -ur xmlto-0.0.22.orig/format/fo/ps xmlto-0.0.22/format/fo/ps
+--- xmlto-0.0.22.orig/format/fo/ps	2009-03-17 18:39:52.000000000 +0200
++++ xmlto-0.0.22/format/fo/ps	2009-05-22 15:20:33.000000000 +0300
+@@ -8,6 +8,10 @@
+ 	  then
+ 	    echo >&2 "Post-process XSL-FO to DVI"
+ 	  fi
++	  if [ ! -f /usr/share/texmf-site/tex/xmltex/passivetex/fotex.xmt ]; then
++	    printf "PassiveTeX is needed for this format, but it is not installed. Please install\nthe passivetex package.\n"
++	    exit 1
++	  fi
+ 	  # Work around stupid tetex bug with '_' in filenames
+ 	  # Also work around stupid tetex limitation with long lines (bug #101055)
+ 	  sed -e "s,/>,\n/>,g" "$XSLT_PROCESSED" >tmp.fo
diff --git a/app-text/xmlto/metadata.xml b/app-text/xmlto/metadata.xml
new file mode 100644
index 000000000000..a6f3fe89fa47
--- /dev/null
+++ b/app-text/xmlto/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<!-- maintainer-needed -->
+<use>
+	<flag name="text">Support conversion from XML to plain text</flag>
+</use>
+</pkgmetadata>
diff --git a/app-text/xmlto/xmlto-0.0.26-r1.ebuild b/app-text/xmlto/xmlto-0.0.26-r1.ebuild
new file mode 100644
index 000000000000..5f0b782929a1
--- /dev/null
+++ b/app-text/xmlto/xmlto-0.0.26-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils
+
+DESCRIPTION="script for converting XML and DocBook documents to a variety of output formats"
+HOMEPAGE="https://pagure.io/xmlto"
+SRC_URI="https://releases.pagure.org/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-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 ~x86-solaris"
+IUSE="latex text"
+
+RDEPEND=">=app-text/docbook-xsl-stylesheets-1.62.0-r1
+	app-text/docbook-xml-dtd:4.2
+	app-shells/bash:0
+	dev-libs/libxslt
+	sys-apps/sed
+	|| ( >=sys-apps/coreutils-6.10-r1 sys-freebsd/freebsd-ubin )
+	|| ( sys-apps/util-linux app-misc/getopt )
+	|| ( sys-apps/which sys-freebsd/freebsd-ubin )
+	text? ( || ( virtual/w3m www-client/lynx www-client/links ) )
+	latex? ( >=app-text/passivetex-1.25 >=dev-tex/xmltex-1.9-r2 )"
+# We only depend on flex when we patch the imput lexer.
+DEPEND="${RDEPEND}"
+
+DOCS="AUTHORS ChangeLog FAQ NEWS README THANKS"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.0.22-format_fo_passivetex_check.patch
+}
+
+src_configure() {
+	# We don't want the script to detect /bin/sh if it is bash.
+	export ac_cv_path_BASH=/bin/bash
+	has_version sys-apps/util-linux || export GETOPT=getopt-long
+	econf
+}
diff --git a/app-text/xmlto/xmlto-0.0.28-r1.ebuild b/app-text/xmlto/xmlto-0.0.28-r1.ebuild
new file mode 100644
index 000000000000..fae031611ce3
--- /dev/null
+++ b/app-text/xmlto/xmlto-0.0.28-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils
+
+DESCRIPTION="script for converting XML and DocBook documents to a variety of output formats"
+HOMEPAGE="https://pagure.io/xmlto"
+SRC_URI="https://releases.pagure.org/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-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 ~x86-solaris"
+IUSE="latex text"
+
+RDEPEND=">=app-text/docbook-xsl-stylesheets-1.62.0-r1
+	app-text/docbook-xml-dtd:4.2
+	app-shells/bash:0
+	dev-libs/libxslt
+	sys-apps/sed
+	|| ( >=sys-apps/coreutils-6.10-r1 sys-freebsd/freebsd-ubin )
+	|| ( sys-apps/util-linux app-misc/getopt )
+	|| ( sys-apps/which sys-freebsd/freebsd-ubin )
+	text? ( || ( virtual/w3m www-client/lynx www-client/elinks ) )
+	latex? ( >=app-text/passivetex-1.25 >=dev-tex/xmltex-1.9-r2 )"
+# We only depend on flex when we patch the imput lexer.
+DEPEND="${RDEPEND}"
+
+DOCS="AUTHORS ChangeLog FAQ NEWS README THANKS"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.0.22-format_fo_passivetex_check.patch
+}
+
+src_configure() {
+	# We don't want the script to detect /bin/sh if it is bash.
+	export ac_cv_path_BASH=${BASH}
+	has_version sys-apps/util-linux || export GETOPT=getopt-long
+	econf
+}
diff --git a/app-text/xournal-0.4.8 b/app-text/xournal-0.4.8
deleted file mode 100644
index b9ef2b9096af..000000000000
--- a/app-text/xournal-0.4.8
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=app-text/poppler[cairo] dev-libs/atk dev-libs/glib gnome-base/libgnomecanvas media-libs/freetype media-libs/fontconfig sys-libs/zlib x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/pango virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=An application for notetaking, sketching, and keeping a journal using a stylus
-EAPI=5
-HOMEPAGE=http://xournal.sourceforge.net/
-IUSE=+pdf
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=app-text/poppler[cairo] dev-libs/atk dev-libs/glib gnome-base/libgnomecanvas media-libs/freetype media-libs/fontconfig sys-libs/zlib x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/pango pdf? ( app-text/poppler[utils] app-text/ghostscript-gpl )
-SLOT=0
-SRC_URI=mirror://sourceforge/xournal/xournal-0.4.8.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c88eaff09d7b72f235915658a22ec12e
diff --git a/app-text/xournal-0.4.8-r1 b/app-text/xournal-0.4.8-r1
deleted file mode 100644
index d42ef593e8a3..000000000000
--- a/app-text/xournal-0.4.8-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=app-text/poppler[cairo] dev-libs/atk dev-libs/glib gnome-base/libgnomecanvas media-libs/freetype media-libs/fontconfig sys-libs/zlib x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/pango virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=An application for notetaking, sketching, and keeping a journal using a stylus
-EAPI=5
-HOMEPAGE=http://xournal.sourceforge.net/
-IUSE=+pdf vanilla
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=app-text/poppler[cairo] dev-libs/atk dev-libs/glib gnome-base/libgnomecanvas media-libs/freetype media-libs/fontconfig sys-libs/zlib x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/pango pdf? ( app-text/poppler[utils] app-text/ghostscript-gpl )
-SLOT=0
-SRC_URI=mirror://sourceforge/xournal/xournal-0.4.8.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1cf01cf555b10d303b1e7d087fdcc057
diff --git a/app-text/xournal-0.4.8.2016 b/app-text/xournal-0.4.8.2016
deleted file mode 100644
index c69c9880affa..000000000000
--- a/app-text/xournal-0.4.8.2016
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=app-text/poppler[cairo] dev-libs/atk dev-libs/glib gnome-base/libgnomecanvas media-libs/freetype media-libs/fontconfig sys-libs/zlib x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/pango virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=An application for notetaking, sketching, and keeping a journal using a stylus
-EAPI=6
-HOMEPAGE=http://xournal.sourceforge.net/
-IUSE=+pdf vanilla
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=app-text/poppler[cairo] dev-libs/atk dev-libs/glib gnome-base/libgnomecanvas media-libs/freetype media-libs/fontconfig sys-libs/zlib x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/pango pdf? ( app-text/poppler[utils] app-text/ghostscript-gpl )
-SLOT=0
-SRC_URI=mirror://sourceforge/xournal/xournal-0.4.8.2016.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9bdc31e32bc1a15fdcc5cedb1e7df683
diff --git a/app-text/xournal-9999 b/app-text/xournal-9999
deleted file mode 100644
index 556d24fe9f41..000000000000
--- a/app-text/xournal-9999
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=app-text/poppler[cairo] dev-libs/atk dev-libs/glib gnome-base/libgnomecanvas media-libs/freetype media-libs/fontconfig sys-libs/zlib x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/pango virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=An application for notetaking, sketching, and keeping a journal using a stylus
-EAPI=6
-HOMEPAGE=http://xournal.sourceforge.net/
-IUSE=+pdf vanilla
-LICENSE=GPL-2
-RDEPEND=app-text/poppler[cairo] dev-libs/atk dev-libs/glib gnome-base/libgnomecanvas media-libs/freetype media-libs/fontconfig sys-libs/zlib x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/pango pdf? ( app-text/poppler[utils] app-text/ghostscript-gpl )
-SLOT=0
-_eclasses_=autotools	d0e5375d47f4c809f406eb892e531513	desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	git-r3	8f6de46b0aa318aea0e8cac62ece098b	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9bdc31e32bc1a15fdcc5cedb1e7df683
diff --git a/app-text/xournal/Manifest b/app-text/xournal/Manifest
new file mode 100644
index 000000000000..12947b98e102
--- /dev/null
+++ b/app-text/xournal/Manifest
@@ -0,0 +1,8 @@
+AUX xournal-0.4.8-aspectratio.patch 3494 BLAKE2B 966fabedcb5d1ea3cce635713e45beb1fbae3a5fcee54701fcb3f581107ae80f67af4492998d7dfad7fccccba225bf0758ffc327aa6dd7ea8197d21de26735ee SHA512 26f017ab04e857710ec380ffc70f75520f66dd1097b6cd15fcb599c44f4bcb0ec905859b4ad3e613fff1731e2fe83938f221081b314cc0e69bf3d07b4e54ad70
+DIST xournal-0.4.8.2016.tar.gz 646082 BLAKE2B 4f64fb45759616d99f961b8db575bec1620e089d9f87d4e02d3de7b1cb1d9189d439d78e5b89c93d5635138206f603e40bb33a46458d34a9ec050869e54be531 SHA512 1426d5c9ba3486fbe342d49fc19fcc162965cd6a7b7754f79665e43fe0e60e6f42f61969405ace78fdaa7b99cbb3d4b07b7fb5df246d68a329b52084b6eec76e
+DIST xournal-0.4.8.tar.gz 641240 BLAKE2B cbf82f3ddb27854ce4a17fe80d1ed012f47529ee3f41eac0118f4948f4ca76488fb647c77ab21c99cf19de0016df4db31a448d4c626a42219b2b13b297b5d51e SHA512 cfd5760a0e832ef02786a29cb744d4932aeee97c4d6992b430e647bd59aaef1042735203824d0eaf9da9b884dcdadcfb8f5acea221638db91438ae46a6ee42bf
+EBUILD xournal-0.4.8-r1.ebuild 1202 BLAKE2B 7bd649419efc8c130d88e90303f7b1946a907c8737b1dde4cc5aaf3798e3fc54e7459dbb70abf4fc0539245b710f5b5e8f8a9f125452cd2e0a6d4109532c8c39 SHA512 f872b8b3c4b00a265ab0fc74f33f895c1fbfd676d39df4ebe2a1c2d5282b3265d13f741067ce6f417cc03f437db7e10768693bd9de758ec9b5ffc6d920d300e0
+EBUILD xournal-0.4.8.2016.ebuild 1185 BLAKE2B fb8edbf9bdf19cc7f450592c4addb81afa4369c865bb9a276f4c730079b789d12abe0036b3f5cc1d4b578b3cece037e4288d8c44aeff9b3b7436c5ef29d683cc SHA512 247f3963f18a8f4f96ee69e2497428eb424a11c800cadf7302405b9c192f8d32ee4f7ae5657bdc5d14c1c99c66d94361364beb70d3d5f6de23c2ef1f3a6012bb
+EBUILD xournal-0.4.8.ebuild 1069 BLAKE2B 26606ab4d9128be573c91e33025270ed832f71c9b8d6b27cb1fe80defa11936d3ea8d2643376e691aa365d5140e287cad109be3019de6bcf8f02baadbc45a168 SHA512 7f74070413631ace102df1bb34cc06023d17eb35a6da2e5fce6c09914e6afff101e49eff7cfdfcfb9afc7699b4345e07c7d3ad7c575685269d7050e136769eb6
+EBUILD xournal-9999.ebuild 1185 BLAKE2B fb8edbf9bdf19cc7f450592c4addb81afa4369c865bb9a276f4c730079b789d12abe0036b3f5cc1d4b578b3cece037e4288d8c44aeff9b3b7436c5ef29d683cc SHA512 247f3963f18a8f4f96ee69e2497428eb424a11c800cadf7302405b9c192f8d32ee4f7ae5657bdc5d14c1c99c66d94361364beb70d3d5f6de23c2ef1f3a6012bb
+MISC metadata.xml 652 BLAKE2B 780548e075d6468df82b41e454b8d77c97eb7c9e4b4e4e286b7cd98a4f6c2d5489b355eb088602f414eeecd32b19b42d7c24aec6b1436aed3c818f60605d54f7 SHA512 1105a21a4f228529e6a9bfa038e2f72cdc59bcb663b6206ec57daa3d779d0bfcff3cf1228418dc5031ba37da149dcacb897fa9562db39a4990382521d73a0648
diff --git a/app-text/xournal/files/xournal-0.4.8-aspectratio.patch b/app-text/xournal/files/xournal-0.4.8-aspectratio.patch
new file mode 100644
index 000000000000..d054492a44eb
--- /dev/null
+++ b/app-text/xournal/files/xournal-0.4.8-aspectratio.patch
@@ -0,0 +1,74 @@
+Forward-port upstream patch submission
+https://sourceforge.net/p/xournal/patches/58/
+https://sourceforge.net/p/xournal/patches/_discuss/thread/f1d7a1d7/4c10/attachment/xournal-0.4.5-dawb-aspectratio.patch
+
+It applies cleanly, just to xo-selection.c instead of xo-paint.c.
+
+Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
+
+diff -Narpu --exclude '*.orig' --exclude '*.rej' --exclude '*~' xournal-0.4.8.orig/src/xo-selection.c xournal-0.4.8/src/xo-selection.c
+--- xournal-0.4.8.orig/src/xo-selection.c	2014-06-06 16:41:45.000000000 -0700
++++ xournal-0.4.8/src/xo-selection.c	2017-02-09 15:31:08.960817336 -0800
+@@ -347,6 +347,12 @@ gboolean start_resizesel(GdkEvent *event
+     ui.selection->new_x2 = ui.selection->bbox.right;
+     gnome_canvas_item_set(ui.selection->canvas_item, "dash", NULL, NULL);
+     update_cursor_for_resize(pt);
++
++    // Check whether we should preserve the aspect ratio
++    if (event->button.button == 3)
++    	ui.cur_brush->tool_options |= TOOLOPT_SELECT_PRESERVE;
++    else
++    	ui.cur_brush->tool_options &= ~TOOLOPT_SELECT_PRESERVE;
+     return TRUE;
+   }
+   return FALSE;
+@@ -498,6 +504,38 @@ void continue_resizesel(GdkEvent *event)
+   if (ui.selection->resizing_left) ui.selection->new_x1 = pt[0];
+   if (ui.selection->resizing_right) ui.selection->new_x2 = pt[0];
+ 
++  if (ui.cur_brush->tool_options & TOOLOPT_SELECT_PRESERVE) {
++	  double aspectratio = (ui.selection->bbox.top - ui.selection->bbox.bottom)/(ui.selection->bbox.right - ui.selection->bbox.left);
++	  double newheight = ui.selection->new_y1 - ui.selection->new_y2;
++	  double newwidth = ui.selection->new_x2 - ui.selection->new_x1;
++	  gboolean boundheight;
++
++	  // Resizing from top or bottom only
++	  if ((ui.selection->resizing_top || ui.selection->resizing_bottom) && !(ui.selection->resizing_left || ui.selection->resizing_right))
++		  boundheight = 0;
++	  // Resizing from right or left only
++	  else if (!(ui.selection->resizing_top || ui.selection->resizing_bottom) && (ui.selection->resizing_left || ui.selection->resizing_right))
++		  boundheight = 1;
++	  // Resizing from a corner
++	  else if (newheight/aspectratio > newwidth)
++		  boundheight = 0;
++	  else
++		  boundheight = 1;
++
++	  if (boundheight) {
++		  // Bound the height
++		  newheight = newwidth*aspectratio;
++		  if (ui.selection->resizing_top) ui.selection->new_y1 = ui.selection->new_y2 + newheight;
++		  else ui.selection->new_y2 = ui.selection->new_y1 - newheight;
++	  }
++	  else {
++		  // Bound the width
++		  newwidth = newheight/aspectratio;
++		  if (ui.selection->resizing_left) ui.selection->new_x1 = ui.selection->new_x2 - newwidth;
++		  else ui.selection->new_x2 = ui.selection->new_x1 + newwidth;
++	  }
++  }
++
+   gnome_canvas_item_set(ui.selection->canvas_item, 
+     "x1", ui.selection->new_x1, "x2", ui.selection->new_x2,
+     "y1", ui.selection->new_y1, "y2", ui.selection->new_y2, NULL);
+diff -Narpu --exclude '*.orig' --exclude '*.rej' --exclude '*~' xournal-0.4.8.orig/src/xournal.h xournal-0.4.8/src/xournal.h
+--- xournal-0.4.8.orig/src/xournal.h	2014-06-28 12:47:20.000000000 -0700
++++ xournal-0.4.8/src/xournal.h	2017-02-09 15:29:08.866517375 -0800
+@@ -154,6 +154,7 @@ extern guint predef_bgcolors_rgba[COLOR_
+ #define TOOLOPT_ERASER_STANDARD     0
+ #define TOOLOPT_ERASER_WHITEOUT     1
+ #define TOOLOPT_ERASER_STROKES      2
++#define TOOLOPT_SELECT_PRESERVE     1 // Preserve the aspect ratio of the selection when resizing
+ 
+ extern double predef_thickness[NUM_STROKE_TOOLS][THICKNESS_MAX];
+ 
diff --git a/app-text/xournal/metadata.xml b/app-text/xournal/metadata.xml
new file mode 100644
index 000000000000..125eb5b19afe
--- /dev/null
+++ b/app-text/xournal/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>dilfridge@gentoo.org</email>
+	</maintainer>
+	<longdescription lang="en">
+		Xournal is an application for notetaking, sketching, keeping
+		a journal using a stylus. It is free software (GNU GPL)
+		and runs on Linux (recent distributions) and other GTK+/Gnome
+		platforms. It is similar to Microsoft Windows Journal or to
+		other alternatives such as Jarnal, Gournal, and NoteLab.
+	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">xournal</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/xournal/xournal-0.4.8-r1.ebuild b/app-text/xournal/xournal-0.4.8-r1.ebuild
new file mode 100644
index 000000000000..69d6ceebd250
--- /dev/null
+++ b/app-text/xournal/xournal-0.4.8-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+GCONF_DEBUG=no
+
+[[ ${PV} == *9999 ]] && GNOME2_EAUTORECONF=yes
+
+inherit gnome2
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.code.sf.net/p/xournal/code"
+	unset SRC_URI
+else
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+fi
+
+DESCRIPTION="An application for notetaking, sketching, and keeping a journal using a stylus"
+HOMEPAGE="http://xournal.sourceforge.net/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+pdf vanilla"
+
+COMMONDEPEND="
+	app-text/poppler[cairo]
+	dev-libs/atk
+	dev-libs/glib
+	gnome-base/libgnomecanvas
+	media-libs/freetype
+	media-libs/fontconfig
+	sys-libs/zlib
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:2
+	x11-libs/pango
+"
+RDEPEND="${COMMONDEPEND}
+	pdf? ( app-text/poppler[utils] app-text/ghostscript-gpl )
+"
+DEPEND="${COMMONDEPEND}
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default_src_prepare
+	if ! use vanilla; then
+		epatch "${FILESDIR}"/xournal-0.4.8-aspectratio.patch
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	emake DESTDIR="${D}" desktop-install
+
+	dodoc ChangeLog AUTHORS README
+	dohtml -r html-doc/*
+}
diff --git a/app-text/xournal/xournal-0.4.8.2016.ebuild b/app-text/xournal/xournal-0.4.8.2016.ebuild
new file mode 100644
index 000000000000..50477f8a4537
--- /dev/null
+++ b/app-text/xournal/xournal-0.4.8.2016.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+[[ ${PV} == *9999 ]] && GNOME2_EAUTORECONF=yes
+
+inherit gnome2
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.code.sf.net/p/xournal/code"
+	unset SRC_URI
+else
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+fi
+
+DESCRIPTION="An application for notetaking, sketching, and keeping a journal using a stylus"
+HOMEPAGE="http://xournal.sourceforge.net/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+pdf vanilla"
+
+COMMONDEPEND="
+	app-text/poppler[cairo]
+	dev-libs/atk
+	dev-libs/glib
+	gnome-base/libgnomecanvas
+	media-libs/freetype
+	media-libs/fontconfig
+	sys-libs/zlib
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:2
+	x11-libs/pango
+"
+RDEPEND="${COMMONDEPEND}
+	pdf? ( app-text/poppler[utils] app-text/ghostscript-gpl )
+"
+DEPEND="${COMMONDEPEND}
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default_src_prepare
+	if ! use vanilla; then
+		eapply "${FILESDIR}"/xournal-0.4.8-aspectratio.patch
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	emake DESTDIR="${D}" desktop-install
+
+	dodoc ChangeLog AUTHORS README
+	dodoc -r html-doc/*
+}
diff --git a/app-text/xournal/xournal-0.4.8.ebuild b/app-text/xournal/xournal-0.4.8.ebuild
new file mode 100644
index 000000000000..1e879f6a6f85
--- /dev/null
+++ b/app-text/xournal/xournal-0.4.8.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+GCONF_DEBUG=no
+
+[[ ${PV} == *9999 ]] && GNOME2_EAUTORECONF=yes
+
+inherit gnome2
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.code.sf.net/p/xournal/code"
+	unset SRC_URI
+else
+	KEYWORDS="amd64 x86"
+	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+fi
+
+DESCRIPTION="An application for notetaking, sketching, and keeping a journal using a stylus"
+HOMEPAGE="http://xournal.sourceforge.net/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+pdf"
+
+COMMONDEPEND="
+	app-text/poppler[cairo]
+	dev-libs/atk
+	dev-libs/glib
+	gnome-base/libgnomecanvas
+	media-libs/freetype
+	media-libs/fontconfig
+	sys-libs/zlib
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:2
+	x11-libs/pango
+"
+RDEPEND="${COMMONDEPEND}
+	pdf? ( app-text/poppler[utils] app-text/ghostscript-gpl )
+"
+DEPEND="${COMMONDEPEND}
+	virtual/pkgconfig
+"
+
+src_install() {
+	emake DESTDIR="${D}" install
+	emake DESTDIR="${D}" desktop-install
+
+	dodoc ChangeLog AUTHORS README
+	dohtml -r html-doc/*
+}
diff --git a/app-text/xournal/xournal-9999.ebuild b/app-text/xournal/xournal-9999.ebuild
new file mode 100644
index 000000000000..50477f8a4537
--- /dev/null
+++ b/app-text/xournal/xournal-9999.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+[[ ${PV} == *9999 ]] && GNOME2_EAUTORECONF=yes
+
+inherit gnome2
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.code.sf.net/p/xournal/code"
+	unset SRC_URI
+else
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+fi
+
+DESCRIPTION="An application for notetaking, sketching, and keeping a journal using a stylus"
+HOMEPAGE="http://xournal.sourceforge.net/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+pdf vanilla"
+
+COMMONDEPEND="
+	app-text/poppler[cairo]
+	dev-libs/atk
+	dev-libs/glib
+	gnome-base/libgnomecanvas
+	media-libs/freetype
+	media-libs/fontconfig
+	sys-libs/zlib
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:2
+	x11-libs/pango
+"
+RDEPEND="${COMMONDEPEND}
+	pdf? ( app-text/poppler[utils] app-text/ghostscript-gpl )
+"
+DEPEND="${COMMONDEPEND}
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default_src_prepare
+	if ! use vanilla; then
+		eapply "${FILESDIR}"/xournal-0.4.8-aspectratio.patch
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	emake DESTDIR="${D}" desktop-install
+
+	dodoc ChangeLog AUTHORS README
+	dodoc -r html-doc/*
+}
diff --git a/app-text/yelp-tools-3.18.0 b/app-text/yelp-tools-3.18.0
deleted file mode 100644
index a88c6d9756a7..000000000000
--- a/app-text/yelp-tools-3.18.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=dev-libs/libxml2-2.6.12 >=dev-libs/libxslt-1.1.8 dev-util/itstool >=gnome-extra/yelp-xsl-3.17.3 virtual/awk virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Collection of tools for building and converting documentation
-EAPI=5
-HOMEPAGE=https://wiki.gnome.org/Apps/Yelp/Tools
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux
-LICENSE=|| ( GPL-2+ freedist ) GPL-2+
-RDEPEND=>=dev-libs/libxml2-2.6.12 >=dev-libs/libxslt-1.1.8 dev-util/itstool >=gnome-extra/yelp-xsl-3.17.3 virtual/awk
-SLOT=0
-SRC_URI=mirror://gnome/sources/yelp-tools/3.18/yelp-tools-3.18.0.tar.xz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	29bb8f7881c95139e532a2d5e47ff834	libtool	0081a71a261724730ec4c248494f044d	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	26ca8a8bd95d6a74122c08ba98a4ee72	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f1ad21ae073a342614fe9be19e3d55c7
diff --git a/app-text/yelp-tools/Manifest b/app-text/yelp-tools/Manifest
new file mode 100644
index 000000000000..74b90265eda7
--- /dev/null
+++ b/app-text/yelp-tools/Manifest
@@ -0,0 +1,3 @@
+DIST yelp-tools-3.18.0.tar.xz 210712 BLAKE2B 8b9af089bc2d337d5474525f369b5ff5773391dac4deba7610545625a8550cb2735f9295282cd490b176ba9648f3b91e3865fedba27c4c0b4155b2e99bf8db8e SHA512 75957b06bdade966a33a41ecc68dfa3eb3b3e3550dc8c6664ee694c4b043c8b45a2403dd23c9810347ed7234ceb5389a34133554de012a7e0afc5db891525fb8
+EBUILD yelp-tools-3.18.0.ebuild 676 BLAKE2B 3b61711246d66e63716f0eb89cee32dd2aa10bf08c2d110b5a93d9fd2acc83e45b0fea8b7eed2666a58b14ff4615e54fa4f776e5d9251af12ebe09d7d2d7b685 SHA512 2c1ad45aac535e45e939a9fe99ea124b4973a00ce37bd7c89c021d40a92c0a6ffadfae3afddae61126046e9261b2ee9a2265d3e828b0eb43d1c957545e79b4a5
+MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-text/yelp-tools/metadata.xml b/app-text/yelp-tools/metadata.xml
new file mode 100644
index 000000000000..39980802b1da
--- /dev/null
+++ b/app-text/yelp-tools/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-text/yelp-tools/yelp-tools-3.18.0.ebuild b/app-text/yelp-tools/yelp-tools-3.18.0.ebuild
new file mode 100644
index 000000000000..5763df6d82b6
--- /dev/null
+++ b/app-text/yelp-tools/yelp-tools-3.18.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit gnome2
+
+DESCRIPTION="Collection of tools for building and converting documentation"
+HOMEPAGE="https://wiki.gnome.org/Apps/Yelp/Tools"
+
+LICENSE="|| ( GPL-2+ freedist ) GPL-2+" # yelp.m4 is GPL2 || freely distributable
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	>=dev-libs/libxml2-2.6.12
+	>=dev-libs/libxslt-1.1.8
+	dev-util/itstool
+	>=gnome-extra/yelp-xsl-3.17.3
+	virtual/awk
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
diff --git a/app-text/yodl-4.01.00 b/app-text/yodl-4.01.00
deleted file mode 100644
index b270aec209bd..000000000000
--- a/app-text/yodl-4.01.00
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=>=dev-util/icmake-8.00.00
-DESCRIPTION=Your Own Document Language: a pre-document language and tools to process it
-EAPI=6
-HOMEPAGE=https://fbb-git.github.io/yodl/ https://github.com/fbb-git/yodl
-IUSE=doc
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-SLOT=0
-SRC_URI=https://github.com/fbb-git/yodl/archive/4.01.00.tar.gz -> yodl-4.01.00.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=d602193c249b5a3bdb06f96a9a8f1ad3
diff --git a/app-text/yodl-4.02.00 b/app-text/yodl-4.02.00
deleted file mode 100644
index 33c50e41b1c2..000000000000
--- a/app-text/yodl-4.02.00
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=>=dev-util/icmake-8.00.00
-DESCRIPTION=Your Own Document Language: a pre-document language and tools to process it
-EAPI=6
-HOMEPAGE=https://fbb-git.github.io/yodl/ https://github.com/fbb-git/yodl
-IUSE=doc
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-SLOT=0
-SRC_URI=https://github.com/fbb-git/yodl/archive/4.02.00.tar.gz -> yodl-4.02.00.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=9f1bcb94f80dd204c03db6b2bdf8e861
diff --git a/app-text/yodl-4.02.01 b/app-text/yodl-4.02.01
deleted file mode 100644
index b0f1b914f636..000000000000
--- a/app-text/yodl-4.02.01
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=>=dev-util/icmake-8.00.00
-DESCRIPTION=Your Own Document Language: a pre-document language and tools to process it
-EAPI=6
-HOMEPAGE=https://fbb-git.gitlab.io/yodl/ https://gitlab.com/fbb-git/yodl
-IUSE=doc
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-SLOT=0
-SRC_URI=https://gitlab.com/fbb-git/yodl/-/archive/4.02.01/yodl-4.02.01.tar.gz
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607
-_md5_=2faee8c3960fed9b68c474172dede51c
diff --git a/app-text/yodl/Manifest b/app-text/yodl/Manifest
new file mode 100644
index 000000000000..96fb2498df57
--- /dev/null
+++ b/app-text/yodl/Manifest
@@ -0,0 +1,7 @@
+DIST yodl-4.01.00.tar.gz 288932 BLAKE2B 71491eaedae9cf0b6bc65f1da3065bc2a90e9ff5f527cbac66a714c761e679600635f7f10b0f20b7e1a15413c1930ee6e64e5ec083226058b6c8822e4a445437 SHA512 f195dec8e03b83561b47f9bd00fbb0fe711bbc254c32413d748587d8bf3848e050b90a2140977bec5a335021b2ef49ec5a6b0ca89f1649def495d81c3e7b437f
+DIST yodl-4.02.00.tar.gz 308567 BLAKE2B bf64ff7248ddcdc17dec23fe4407c28edf604b76746f13e97dfbb470421c15ca6235747c9ef349925a0293f8503d319a637a11352a2987f161fb2bcab60ddf7e SHA512 ca3a2490bf54a0ce4e800a62a3de9a5cf37df96f0f553de89623ef6d36f07b65b7c09168e77d267d7fb79d900a8e8a6c6d3c17c4b733345001213f5450c02b13
+DIST yodl-4.02.01.tar.gz 308670 BLAKE2B f94c094f17ec99e66f64a704e41814274f61128ff21b11077d772874dcbc9f15fbc878df8831e7f73d9b6c89a497462c694bc0bdb6cd5637c0db08303e3838d5 SHA512 59e23bb173786b8806f56bf302dee9d8d971d0d840c609e2b24d9783b5866fca2509be844616318f9a4f302117b3a41f620be5cba09181e7ccdcf0c141402be7
+EBUILD yodl-4.01.00.ebuild 1136 BLAKE2B 2311cafeb275140c3caff1006836c89bb15a628ee72197103244a904bd56aa5bf9911e681edd073ccde6e1eb24b7e1473e5106fef5b74e8bb5581c0e9e7cfd6f SHA512 dbd05b7eab771c07e1d57d113d165f0bc54e47fd0762ae5dbcd908c8ced6b29000d3b5c241813126b1d0b33efbbfe2fb14cb98eb7ec5f2beff3afa5cd188b6c9
+EBUILD yodl-4.02.00.ebuild 1192 BLAKE2B 5e1a1b4b8f8c1dca81c70f15d6b2cef95be19e27708c0ec87081bf3292d062beebb98dfc2b6065a057d3b6b2e7bf0c89787046cad2d146d4cd71b9a51f5ca1fa SHA512 8978742891afabfcd2c18e76bd0cc98239fff3f305af890b033efa852f7b7853317cb7d1887d2ac5175a162a174a6080c307af200d189b11c7859a968a7880ca
+EBUILD yodl-4.02.01.ebuild 1184 BLAKE2B 7547e9d39fd312c30e1d465cec9f95fc15ef1acfd04e45af85105b95ef57a5fa8a24949d2d70348c9c03a89a060c59a785f771f0a70eb99b673753c0ea939bfd SHA512 a33e23178c78cad05f8f3c1e1b67cab2676706e2c989346a823c993ee3ac60dbe3c303a01c71d38ef9bb5cbcbd8ef039e0ef63c8cec52409a9ed200a6d53dbf4
+MISC metadata.xml 323 BLAKE2B 0824e46514ffb380f85b6a7037c4c37f5717e2a0697d51687639a2854a400e25dcc2125b670646dd93dcbf52c620835d7617a0ea37af707aecfabbfb3d32ce00 SHA512 aa2993598b712f5e5d45bd44fbd934e338d4bd6a23c106ccaac071b08fe0136395b897dfb40f33139a2c105d68e67e781f556ee9db1587eba60e20ac5e65da25
diff --git a/app-text/yodl/metadata.xml b/app-text/yodl/metadata.xml
new file mode 100644
index 000000000000..dbb763b1ee5a
--- /dev/null
+++ b/app-text/yodl/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>radhermit@gentoo.org</email>
+		<name>Tim Harder</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="gitlab">fbb-git/yodl</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/yodl/yodl-4.01.00.ebuild b/app-text/yodl/yodl-4.01.00.ebuild
new file mode 100644
index 000000000000..8c697af720a1
--- /dev/null
+++ b/app-text/yodl/yodl-4.01.00.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="Your Own Document Language: a pre-document language and tools to process it"
+HOMEPAGE="https://fbb-git.github.io/yodl/ https://github.com/fbb-git/yodl"
+SRC_URI="https://github.com/fbb-git/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+DEPEND=">=dev-util/icmake-8.00.00"
+
+S=${WORKDIR}/${P}/${PN}
+
+src_prepare() {
+	sed -e "/DOC.* =/s/yodl\(-doc\)\?/${PF}/" \
+		-e "/COMPILER =/s/gcc/$(tc-getCC)/" \
+		-e "/CXX =/s/g++/$(tc-getCXX)/" \
+		-i INSTALL.im || die
+
+	sed -e "s/ar r /$(tc-getAR) r /" \
+		-e "s/ranlib/$(tc-getRANLIB)/" \
+		-i icmake/stdcompile || die
+
+	default
+}
+
+src_compile() {
+	./build programs || die
+	./build macros || die
+	./build man || die
+	use doc && { ./build manual || die ; }
+}
+
+src_install() {
+	./build install programs "${ED}" || die
+	./build install macros "${ED}" || die
+	./build install man "${ED}" || die
+	./build install docs "${ED}" || die
+	use doc && { ./build install manual "${ED}" || die ; }
+}
diff --git a/app-text/yodl/yodl-4.02.00.ebuild b/app-text/yodl/yodl-4.02.00.ebuild
new file mode 100644
index 000000000000..b49b2b6193d4
--- /dev/null
+++ b/app-text/yodl/yodl-4.02.00.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="Your Own Document Language: a pre-document language and tools to process it"
+HOMEPAGE="https://fbb-git.github.io/yodl/ https://github.com/fbb-git/yodl"
+SRC_URI="https://github.com/fbb-git/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+DEPEND=">=dev-util/icmake-8.00.00"
+
+S=${WORKDIR}/${P}/${PN}
+
+src_prepare() {
+	sed -e "/DOC.* =/s/yodl\(-doc\)\?/${PF}/" \
+		-e "/COMPILER =/s/gcc/$(tc-getCC)/" \
+		-e "/CXX =/s/g++/$(tc-getCXX)/" \
+		-i INSTALL.im || die
+	sed -i "s/g++/$(tc-getCXX)/" verbinsert/icmconf || die
+
+	sed -e "s/ar r /$(tc-getAR) r /" \
+		-e "s/ranlib/$(tc-getRANLIB)/" \
+		-i icmake/stdcompile || die
+
+	default
+}
+
+src_compile() {
+	./build programs || die
+	./build macros || die
+	./build man || die
+	use doc && { ./build manual || die ; }
+}
+
+src_install() {
+	./build install programs "${ED}" || die
+	./build install macros "${ED}" || die
+	./build install man "${ED}" || die
+	./build install docs "${ED}" || die
+	use doc && { ./build install manual "${ED}" || die ; }
+}
diff --git a/app-text/yodl/yodl-4.02.01.ebuild b/app-text/yodl/yodl-4.02.01.ebuild
new file mode 100644
index 000000000000..3ea825807fc1
--- /dev/null
+++ b/app-text/yodl/yodl-4.02.01.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="Your Own Document Language: a pre-document language and tools to process it"
+HOMEPAGE="https://fbb-git.gitlab.io/yodl/ https://gitlab.com/fbb-git/yodl"
+SRC_URI="https://gitlab.com/fbb-git/${PN}/-/archive/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+DEPEND=">=dev-util/icmake-8.00.00"
+
+S=${WORKDIR}/${P}/${PN}
+
+src_prepare() {
+	sed -e "/DOC.* =/s/yodl\(-doc\)\?/${PF}/" \
+		-e "/COMPILER =/s/gcc/$(tc-getCC)/" \
+		-e "/CXX =/s/g++/$(tc-getCXX)/" \
+		-i INSTALL.im || die
+	sed -i "s/g++/$(tc-getCXX)/" verbinsert/icmconf || die
+
+	sed -e "s/ar r /$(tc-getAR) r /" \
+		-e "s/ranlib/$(tc-getRANLIB)/" \
+		-i icmake/stdcompile || die
+
+	default
+}
+
+src_compile() {
+	./build programs || die
+	./build macros || die
+	./build man || die
+	use doc && { ./build manual || die ; }
+}
+
+src_install() {
+	./build install programs "${ED}" || die
+	./build install macros "${ED}" || die
+	./build install man "${ED}" || die
+	./build install docs "${ED}" || die
+	use doc && { ./build install manual "${ED}" || die ; }
+}
diff --git a/app-text/zathura-0.3.7 b/app-text/zathura-0.3.7
deleted file mode 100644
index 1f168d7673e6..000000000000
--- a/app-text/zathura-0.3.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=>=dev-libs/girara-0.2.7:3= >=dev-libs/glib-2.32:2= x11-libs/cairo:= >=x11-libs/gtk+-3.6:3 magic? ( sys-apps/file:= ) sqlite? ( dev-db/sqlite:3= ) synctex? ( >=app-text/texlive-core-2015 ) sys-devel/gettext virtual/pkgconfig test? ( dev-libs/check ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=A highly customizable and functional document viewer
-EAPI=5
-HOMEPAGE=http://pwmt.org/projects/zathura/
-IUSE=+magic sqlite synctex test test
-KEYWORDS=amd64 arm x86 ~amd64-linux ~x86-linux
-LICENSE=ZLIB
-RDEPEND=>=dev-libs/girara-0.2.7:3= >=dev-libs/glib-2.32:2= x11-libs/cairo:= >=x11-libs/gtk+-3.6:3 magic? ( sys-apps/file:= ) sqlite? ( dev-db/sqlite:3= ) synctex? ( >=app-text/texlive-core-2015 )
-SLOT=0
-SRC_URI=http://pwmt.org/projects/zathura/download/zathura-0.3.7.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=715e8a2205306fb36400601406467377
diff --git a/app-text/zathura-0.3.8 b/app-text/zathura-0.3.8
deleted file mode 100644
index 99c452f66972..000000000000
--- a/app-text/zathura-0.3.8
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm test
-DEPEND=>=dev-libs/girara-0.2.8:3= >=dev-libs/glib-2.32:2= x11-libs/cairo:= >=x11-libs/gtk+-3.6:3 magic? ( sys-apps/file:= ) sqlite? ( dev-db/sqlite:3= ) synctex? ( >=app-text/texlive-core-2015 ) sys-devel/gettext virtual/pkgconfig test? ( dev-libs/check ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=A highly customizable and functional document viewer
-EAPI=6
-HOMEPAGE=http://pwmt.org/projects/zathura/
-IUSE=+magic sqlite synctex test test
-KEYWORDS=amd64 ~arm x86 ~amd64-linux ~x86-linux
-LICENSE=ZLIB
-RDEPEND=>=dev-libs/girara-0.2.8:3= >=dev-libs/glib-2.32:2= x11-libs/cairo:= >=x11-libs/gtk+-3.6:3 magic? ( sys-apps/file:= ) sqlite? ( dev-db/sqlite:3= ) synctex? ( >=app-text/texlive-core-2015 )
-SLOT=0
-SRC_URI=http://pwmt.org/projects/zathura/download/zathura-0.3.8.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0b53f7ab641b86f2fe9788ce9b1f2b84
diff --git a/app-text/zathura-9999 b/app-text/zathura-9999
deleted file mode 100644
index 427a5fb8460b..000000000000
--- a/app-text/zathura-9999
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm test unpack
-DEPEND=>=dev-libs/girara-0.2.7:3= >=dev-libs/glib-2.32:2= x11-libs/cairo:= >=x11-libs/gtk+-3.6:3 magic? ( sys-apps/file:= ) sqlite? ( dev-db/sqlite:3= ) synctex? ( >=app-text/texlive-core-2015 ) sys-devel/gettext virtual/pkgconfig test? ( dev-libs/check ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=A highly customizable and functional document viewer
-EAPI=5
-HOMEPAGE=http://pwmt.org/projects/zathura/
-IUSE=+magic sqlite synctex test test
-LICENSE=ZLIB
-RDEPEND=>=dev-libs/girara-0.2.7:3= >=dev-libs/glib-2.32:2= x11-libs/cairo:= >=x11-libs/gtk+-3.6:3 magic? ( sys-apps/file:= ) sqlite? ( dev-db/sqlite:3= ) synctex? ( >=app-text/texlive-core-2015 )
-SLOT=0
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	git-r3	8f6de46b0aa318aea0e8cac62ece098b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4cacf5402117e8be231f5fd755815b48
diff --git a/app-text/zathura-cb-0.1.6 b/app-text/zathura-cb-0.1.6
deleted file mode 100644
index c1ebc4e8686f..000000000000
--- a/app-text/zathura-cb-0.1.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst
-DEPEND=>=app-text/zathura-0.3.1 dev-libs/glib:2= app-arch/libarchive:= x11-libs/cairo:= x11-libs/gdk-pixbuf:= virtual/pkgconfig
-DESCRIPTION=Comic book plug-in for zathura with 7zip, rar, tar and zip support
-EAPI=5
-HOMEPAGE=https://pwmt.org/projects/zathura/
-KEYWORDS=amd64 arm x86
-LICENSE=ZLIB
-RDEPEND=>=app-text/zathura-0.3.1 dev-libs/glib:2= app-arch/libarchive:= x11-libs/cairo:= x11-libs/gdk-pixbuf:=
-SLOT=0
-SRC_URI=https://pwmt.org/projects/zathura/plugins/download/zathura-cb-0.1.6.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=cf7be3a9334be4d3e21055561ddd9ddb
diff --git a/app-text/zathura-cb-0.1.7 b/app-text/zathura-cb-0.1.7
deleted file mode 100644
index a17b506a74df..000000000000
--- a/app-text/zathura-cb-0.1.7
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=app-text/zathura-0.3.8 dev-libs/glib:2= app-arch/libarchive:= x11-libs/cairo:= x11-libs/gdk-pixbuf:= virtual/pkgconfig dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Comic book plug-in for zathura with 7zip, rar, tar and zip support
-EAPI=6
-HOMEPAGE=https://pwmt.org/projects/zathura/
-KEYWORDS=amd64 ~arm x86
-LICENSE=ZLIB
-RDEPEND=>=app-text/zathura-0.3.8 dev-libs/glib:2= app-arch/libarchive:= x11-libs/cairo:= x11-libs/gdk-pixbuf:=
-SLOT=0
-SRC_URI=https://pwmt.org/projects/zathura/plugins/download/zathura-cb-0.1.7.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=db877e64aa53b91fffbb80e6dbd058d5
diff --git a/app-text/zathura-cb-9999 b/app-text/zathura-cb-9999
deleted file mode 100644
index 1bf14ca9cd3d..000000000000
--- a/app-text/zathura-cb-9999
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=app-text/zathura-0.3.8 dev-libs/glib:2= app-arch/libarchive:= x11-libs/cairo:= x11-libs/gdk-pixbuf:= virtual/pkgconfig dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=Comic book plug-in for zathura with 7zip, rar, tar and zip support
-EAPI=6
-HOMEPAGE=https://pwmt.org/projects/zathura/
-LICENSE=ZLIB
-RDEPEND=>=app-text/zathura-0.3.8 dev-libs/glib:2= app-arch/libarchive:= x11-libs/cairo:= x11-libs/gdk-pixbuf:=
-SLOT=0
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	git-r3	8f6de46b0aa318aea0e8cac62ece098b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	54aecea034d5e90bdb0684b80da5c9f3	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=06aa9a66efe49585aec7a0790da2cef0
diff --git a/app-text/zathura-cb/Manifest b/app-text/zathura-cb/Manifest
new file mode 100644
index 000000000000..a31e2acfdd50
--- /dev/null
+++ b/app-text/zathura-cb/Manifest
@@ -0,0 +1,6 @@
+DIST zathura-cb-0.1.6.tar.gz 7205 BLAKE2B 57fa7c8d54cdfdd717d89b8341139c70c86921a65b328a59f1e382d4c8ea03c041184f065e092ec98fff577c029363430b32db95a3b034cbeb19eb51b07d3948 SHA512 986293957b6bc5e5fe7033bb7c91e857b1089fe1a041eb39e516b4e906c2619d22d7ebfa0bfaba982cc6145cba4c6a2af01be810c6da71f4c862fb42bc91f230
+DIST zathura-cb-0.1.7.tar.gz 6971 BLAKE2B 814b0ff8e3d33c85e06ceb3abb315aa16464efda8a5c60554eb7ac8ce3babcf33daea5122e1ca201c1fbffb616a1eea79ba40b74e0c325ec23a7c2dd249d2e6f SHA512 a48c70bf534a8798d94c1b15382dad229d37ea5f5cbef8382ce87a4366c3607609577f10a8eeb2056e2aa539014e6411e08c879f5359f80ff676cb55c6ae9af2
+EBUILD zathura-cb-0.1.6.ebuild 1169 BLAKE2B 48bdabc0538c032080e8e25ad9b32e8114a7387ea772453e83382368bbc6b524245f02adc55afb75825cefd11108b00d62cfd7e09051ae224f022b961b11acbc SHA512 00d8287f33cd414bb78c34a682645e444eb84f59b58cac5ac4d6290f23fdba1c07f5894383747e253ced4cfe5128d28e250394239fcde54901a9ac0f401df6e3
+EBUILD zathura-cb-0.1.7.ebuild 1192 BLAKE2B 40ab3a5b2d465a29f06ae511ed608520a70425e980e19e1ea5cba0b2e5b6863841e3f832680ac054773ef6487b00b27155f0b512a28fe3c847514b6e168426d1 SHA512 db692f30c3688e5dd3999b768edefac58cd1653e46449ac95dc2bf248454d4d997a4a65f40dbc59562ca3c1744e485f73aa373aa22d79d4560d74f3dcca229da
+EBUILD zathura-cb-9999.ebuild 1194 BLAKE2B e45d6a066522374b807e917b6baca20ea91897a1b5cc99a2caccd2e9dedf5853774749a53c9c3009e4de36f2036bd09d14d7cb01cb7bfbb663c2d31f8b4b92eb SHA512 00eeca9e086cf608309fd780cf376cc40c5580de57ad42d79fc77bcc012ad799cb8dfce4530f3069e4a28b196925090b25e3a6882cae4b7ce121900798e63a29
+MISC metadata.xml 702 BLAKE2B 494044f73e5201e73328ba0f0ab58cd40ae7860127449aaed63e96ec0962a3e2c5cc2b617dd58c73c9226d5ca7e1237f94064eb8dab48fe1a88e8c50bfb40216 SHA512 0f416ccc5110783602c76a1b2670f22c15104a2868d23b635180faf4993d3879198c04fc29e7a8d23b13105bd6b2268d9d7877a0e36dbab1726919b3d5c0a37f
diff --git a/app-text/zathura-cb/metadata.xml b/app-text/zathura-cb/metadata.xml
new file mode 100644
index 000000000000..b7ed6eb4ffbe
--- /dev/null
+++ b/app-text/zathura-cb/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>xmw@gentoo.org</email>
+    <name>Michael Weber</name>
+  </maintainer>
+  <upstream>
+    <maintainer status="active">
+      <email>mlq@pwmt.org</email>
+      <name>Moritz Lipp</name>
+    </maintainer>
+    <maintainer status="active">
+      <email>sebastian+dev@ramacher.at</email>
+      <name>Sebastian Ramacher</name>
+    </maintainer>
+    <changelog>http://pwmt.org/projects/zathura/download/</changelog>
+    <doc lang="en">http://pwmt.org/projects/zathura/</doc>
+    <bugs-to>http://bugs.pwmt.org/</bugs-to>
+  </upstream>
+</pkgmetadata>
diff --git a/app-text/zathura-cb/zathura-cb-0.1.6.ebuild b/app-text/zathura-cb/zathura-cb-0.1.6.ebuild
new file mode 100644
index 000000000000..8422c19f22a2
--- /dev/null
+++ b/app-text/zathura-cb/zathura-cb-0.1.6.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils toolchain-funcs readme.gentoo-r1
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-cb.git"
+	EGIT_BRANCH="develop"
+else
+	KEYWORDS="amd64 arm x86"
+	SRC_URI="https://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz"
+fi
+
+DESCRIPTION="Comic book plug-in for zathura with 7zip, rar, tar and zip support"
+HOMEPAGE="https://pwmt.org/projects/zathura/"
+
+LICENSE="ZLIB"
+SLOT="0"
+IUSE=""
+
+RDEPEND=">=app-text/zathura-0.3.1
+	dev-libs/glib:2=
+	app-arch/libarchive:=
+	x11-libs/cairo:=
+	x11-libs/gdk-pixbuf:="
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_configure() {
+	myzathuraconf=(
+		CC="$(tc-getCC)"
+		LD="$(tc-getLD)"
+		VERBOSE=1
+		DESTDIR="${D}"
+	)
+}
+
+src_compile() {
+	emake "${myzathuraconf[@]}"
+}
+
+src_install() {
+	emake "${myzathuraconf[@]}" install
+	dodoc AUTHORS
+
+	FORCE_PRINT_ELOG=1
+	local DOC_CONTENTS="Consider installing app-arch/p7zip app-arch/tar app-arch/unrar
+		app-arch/unzip for additional file support."
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/app-text/zathura-cb/zathura-cb-0.1.7.ebuild b/app-text/zathura-cb/zathura-cb-0.1.7.ebuild
new file mode 100644
index 000000000000..bb222a057113
--- /dev/null
+++ b/app-text/zathura-cb/zathura-cb-0.1.7.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils toolchain-funcs readme.gentoo-r1 xdg
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-cb.git"
+	EGIT_BRANCH="develop"
+else
+	KEYWORDS="amd64 ~arm x86"
+	SRC_URI="https://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz"
+fi
+
+DESCRIPTION="Comic book plug-in for zathura with 7zip, rar, tar and zip support"
+HOMEPAGE="https://pwmt.org/projects/zathura/"
+
+LICENSE="ZLIB"
+SLOT="0"
+IUSE=""
+
+RDEPEND=">=app-text/zathura-0.3.8
+	dev-libs/glib:2=
+	app-arch/libarchive:=
+	x11-libs/cairo:=
+	x11-libs/gdk-pixbuf:="
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_configure() {
+	myzathuraconf=(
+		CC="$(tc-getCC)"
+		LD="$(tc-getLD)"
+		VERBOSE=1
+		DESTDIR="${D}"
+	)
+}
+
+src_compile() {
+	emake "${myzathuraconf[@]}"
+}
+
+src_install() {
+	emake "${myzathuraconf[@]}" install
+	dodoc AUTHORS
+
+	FORCE_PRINT_ELOG=1
+	local DOC_CONTENTS="Consider installing app-arch/p7zip app-arch/tar app-arch/unrar
+		app-arch/unzip for additional file support."
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	readme.gentoo_print_elog
+}
diff --git a/app-text/zathura-cb/zathura-cb-9999.ebuild b/app-text/zathura-cb/zathura-cb-9999.ebuild
new file mode 100644
index 000000000000..f1483517b654
--- /dev/null
+++ b/app-text/zathura-cb/zathura-cb-9999.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils toolchain-funcs readme.gentoo-r1 xdg
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-cb.git"
+	EGIT_BRANCH="develop"
+else
+	KEYWORDS="~amd64 ~arm ~x86"
+	SRC_URI="https://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz"
+fi
+
+DESCRIPTION="Comic book plug-in for zathura with 7zip, rar, tar and zip support"
+HOMEPAGE="https://pwmt.org/projects/zathura/"
+
+LICENSE="ZLIB"
+SLOT="0"
+IUSE=""
+
+RDEPEND=">=app-text/zathura-0.3.8
+	dev-libs/glib:2=
+	app-arch/libarchive:=
+	x11-libs/cairo:=
+	x11-libs/gdk-pixbuf:="
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_configure() {
+	myzathuraconf=(
+		CC="$(tc-getCC)"
+		LD="$(tc-getLD)"
+		VERBOSE=1
+		DESTDIR="${D}"
+	)
+}
+
+src_compile() {
+	emake "${myzathuraconf[@]}"
+}
+
+src_install() {
+	emake "${myzathuraconf[@]}" install
+	dodoc AUTHORS
+
+	FORCE_PRINT_ELOG=1
+	local DOC_CONTENTS="Consider installing app-arch/p7zip app-arch/tar app-arch/unrar
+		app-arch/unzip for additional file support."
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	readme.gentoo_print_elog
+}
diff --git a/app-text/zathura-djvu-0.2.6 b/app-text/zathura-djvu-0.2.6
deleted file mode 100644
index f1a53fb99bf3..000000000000
--- a/app-text/zathura-djvu-0.2.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install
-DEPEND=>=app-text/djvu-3.5.24-r1:= >=app-text/zathura-0.3.1 dev-libs/glib:2= x11-libs/cairo:= virtual/pkgconfig
-DESCRIPTION=DjVu plug-in for zathura
-EAPI=5
-HOMEPAGE=http://pwmt.org/projects/zathura/
-KEYWORDS=amd64 arm x86
-LICENSE=ZLIB
-RDEPEND=>=app-text/djvu-3.5.24-r1:= >=app-text/zathura-0.3.1 dev-libs/glib:2= x11-libs/cairo:=
-SLOT=0
-SRC_URI=http://pwmt.org/projects/zathura/plugins/download/zathura-djvu-0.2.6.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f66a5feea566e211d4c1d06af56b9b15
diff --git a/app-text/zathura-djvu-0.2.7 b/app-text/zathura-djvu-0.2.7
deleted file mode 100644
index f6e20ae491f8..000000000000
--- a/app-text/zathura-djvu-0.2.7
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=app-text/djvu-3.5.24-r1:= >=app-text/zathura-0.3.8 dev-libs/glib:2= x11-libs/cairo:= virtual/pkgconfig dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=DjVu plug-in for zathura
-EAPI=6
-HOMEPAGE=http://pwmt.org/projects/zathura/
-KEYWORDS=amd64 ~arm x86
-LICENSE=ZLIB
-RDEPEND=>=app-text/djvu-3.5.24-r1:= >=app-text/zathura-0.3.8 dev-libs/glib:2= x11-libs/cairo:=
-SLOT=0
-SRC_URI=http://pwmt.org/projects/zathura/plugins/download/zathura-djvu-0.2.7.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f10d51ffae4e2f20ba44733b70d0b59b
diff --git a/app-text/zathura-djvu-9999 b/app-text/zathura-djvu-9999
deleted file mode 100644
index 5215fb63cf66..000000000000
--- a/app-text/zathura-djvu-9999
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=app-text/djvu-3.5.24-r1:= >=app-text/zathura-0.3.8 dev-libs/glib:2= x11-libs/cairo:= virtual/pkgconfig dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=DjVu plug-in for zathura
-EAPI=6
-HOMEPAGE=http://pwmt.org/projects/zathura/
-LICENSE=ZLIB
-RDEPEND=>=app-text/djvu-3.5.24-r1:= >=app-text/zathura-0.3.8 dev-libs/glib:2= x11-libs/cairo:=
-SLOT=0
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	git-r3	8f6de46b0aa318aea0e8cac62ece098b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=cedaa401f4cc5de153ff331d736eb589
diff --git a/app-text/zathura-djvu/Manifest b/app-text/zathura-djvu/Manifest
new file mode 100644
index 000000000000..51c88c241b46
--- /dev/null
+++ b/app-text/zathura-djvu/Manifest
@@ -0,0 +1,6 @@
+DIST zathura-djvu-0.2.6.tar.gz 11137 BLAKE2B 23efc23cd53068abb3e118d6dc9b1e875c3f292d2e7ab49abbf6c599d6241c37959e9f74ac2b0f06838cadca0a07e39e1dda2e188f6861b72d4cd7a4bb1fcc62 SHA512 8534faa0de896ffea8d8d6f2d0c22697f2fd6ae3f73e955f5077e0a0656c13fd8823580f1b89c4b5aebb5189c69642ef690fc9167be178ce9533e9bb5d483dac
+DIST zathura-djvu-0.2.7.tar.gz 10909 BLAKE2B 6a55927aa99ec5d29b8f24922c4871c050c25f6c166ee3435390488deefd13f1f81f4286a0c3cd348e4f550e1b4082b9a7c5c7cce40371f8fb62074c87a2d372 SHA512 f0a33f53caced4cb90354e431d180a3b357db300ba5a376051e45f5409e8476105640e92768c2a31bdbbb0b37dea05df24a6489799c556e30336013f807b28b6
+EBUILD zathura-djvu-0.2.6.ebuild 869 BLAKE2B e808ea94258c503b48549c6dd56c1f037454ef06721b3c703ee20665dd14560765d02e0f838a3d79cce7f642c0b2fedb9bb11b848ce346fb2af1f685b4dfb377 SHA512 dabaa16d72e7281c7ed9cf8deda8fb011401127f671738bcbc1f9c370bd16147acfe716c01a5e1011be19f4bda718eda25800cdc7728f52c6ea475febcde2ce0
+EBUILD zathura-djvu-0.2.7.ebuild 874 BLAKE2B 50f207c61625f4f2e5569ad5f961fd3dd6643e639c243cb100e027e44e92a3adbccbd5489d085eec4edbfada291ef5a1cbe4ebbd9bcf32339903bd91c9285e11 SHA512 f1c0d7acbb3b39b044ab87a27a7ebe76912ed55cb87f7ade7d19926a4e32cea6009896e86a6348bcd527757292ca0aab70dc173dbdccb51d057711a8b1f2ffd3
+EBUILD zathura-djvu-9999.ebuild 876 BLAKE2B c0332a2c39389801dc8bbcfe42ed6aab193f23eccb43a29fce315c025f787cb47d3ee7945e2798b5b4407f5a63355a4c810e317a2b5c9826d3403bf660cce38b SHA512 e317ca99924d3e1c8a59e2f95ff91cb348b6e4dc310399f646d90b720c97e633f504508b63193fad90a7f9ec1c475253174ca4b9966b2b14ff7d6c9bcc58bed5
+MISC metadata.xml 702 BLAKE2B 494044f73e5201e73328ba0f0ab58cd40ae7860127449aaed63e96ec0962a3e2c5cc2b617dd58c73c9226d5ca7e1237f94064eb8dab48fe1a88e8c50bfb40216 SHA512 0f416ccc5110783602c76a1b2670f22c15104a2868d23b635180faf4993d3879198c04fc29e7a8d23b13105bd6b2268d9d7877a0e36dbab1726919b3d5c0a37f
diff --git a/app-text/zathura-djvu/metadata.xml b/app-text/zathura-djvu/metadata.xml
new file mode 100644
index 000000000000..b7ed6eb4ffbe
--- /dev/null
+++ b/app-text/zathura-djvu/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>xmw@gentoo.org</email>
+    <name>Michael Weber</name>
+  </maintainer>
+  <upstream>
+    <maintainer status="active">
+      <email>mlq@pwmt.org</email>
+      <name>Moritz Lipp</name>
+    </maintainer>
+    <maintainer status="active">
+      <email>sebastian+dev@ramacher.at</email>
+      <name>Sebastian Ramacher</name>
+    </maintainer>
+    <changelog>http://pwmt.org/projects/zathura/download/</changelog>
+    <doc lang="en">http://pwmt.org/projects/zathura/</doc>
+    <bugs-to>http://bugs.pwmt.org/</bugs-to>
+  </upstream>
+</pkgmetadata>
diff --git a/app-text/zathura-djvu/zathura-djvu-0.2.6.ebuild b/app-text/zathura-djvu/zathura-djvu-0.2.6.ebuild
new file mode 100644
index 000000000000..2de3b88232f7
--- /dev/null
+++ b/app-text/zathura-djvu/zathura-djvu-0.2.6.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-djvu.git"
+	EGIT_BRANCH="develop"
+else
+	KEYWORDS="amd64 arm x86"
+	SRC_URI="http://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz"
+fi
+
+DESCRIPTION="DjVu plug-in for zathura"
+HOMEPAGE="http://pwmt.org/projects/zathura/"
+
+LICENSE="ZLIB"
+SLOT="0"
+IUSE=""
+
+RDEPEND=">=app-text/djvu-3.5.24-r1:=
+	>=app-text/zathura-0.3.1
+	dev-libs/glib:2=
+	x11-libs/cairo:="
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_configure() {
+	myzathuraconf=(
+		CC="$(tc-getCC)"
+		LD="$(tc-getLD)"
+		VERBOSE=1
+		DESTDIR="${D}"
+	)
+}
+
+src_compile() {
+	emake "${myzathuraconf[@]}"
+}
+
+src_install() {
+	emake "${myzathuraconf[@]}" install
+	dodoc AUTHORS
+}
diff --git a/app-text/zathura-djvu/zathura-djvu-0.2.7.ebuild b/app-text/zathura-djvu/zathura-djvu-0.2.7.ebuild
new file mode 100644
index 000000000000..67cdfe31ae92
--- /dev/null
+++ b/app-text/zathura-djvu/zathura-djvu-0.2.7.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils toolchain-funcs xdg
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-djvu.git"
+	EGIT_BRANCH="develop"
+else
+	KEYWORDS="amd64 ~arm x86"
+	SRC_URI="http://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz"
+fi
+
+DESCRIPTION="DjVu plug-in for zathura"
+HOMEPAGE="http://pwmt.org/projects/zathura/"
+
+LICENSE="ZLIB"
+SLOT="0"
+IUSE=""
+
+RDEPEND=">=app-text/djvu-3.5.24-r1:=
+	>=app-text/zathura-0.3.8
+	dev-libs/glib:2=
+	x11-libs/cairo:="
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_configure() {
+	myzathuraconf=(
+		CC="$(tc-getCC)"
+		LD="$(tc-getLD)"
+		VERBOSE=1
+		DESTDIR="${D}"
+	)
+}
+
+src_compile() {
+	emake "${myzathuraconf[@]}"
+}
+
+src_install() {
+	emake "${myzathuraconf[@]}" install
+	dodoc AUTHORS
+}
diff --git a/app-text/zathura-djvu/zathura-djvu-9999.ebuild b/app-text/zathura-djvu/zathura-djvu-9999.ebuild
new file mode 100644
index 000000000000..06d973da811e
--- /dev/null
+++ b/app-text/zathura-djvu/zathura-djvu-9999.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils toolchain-funcs xdg
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-djvu.git"
+	EGIT_BRANCH="develop"
+else
+	KEYWORDS="~amd64 ~arm ~x86"
+	SRC_URI="http://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz"
+fi
+
+DESCRIPTION="DjVu plug-in for zathura"
+HOMEPAGE="http://pwmt.org/projects/zathura/"
+
+LICENSE="ZLIB"
+SLOT="0"
+IUSE=""
+
+RDEPEND=">=app-text/djvu-3.5.24-r1:=
+	>=app-text/zathura-0.3.8
+	dev-libs/glib:2=
+	x11-libs/cairo:="
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_configure() {
+	myzathuraconf=(
+		CC="$(tc-getCC)"
+		LD="$(tc-getLD)"
+		VERBOSE=1
+		DESTDIR="${D}"
+	)
+}
+
+src_compile() {
+	emake "${myzathuraconf[@]}"
+}
+
+src_install() {
+	emake "${myzathuraconf[@]}" install
+	dodoc AUTHORS
+}
diff --git a/app-text/zathura-meta-0 b/app-text/zathura-meta-0
deleted file mode 100644
index e83368705a57..000000000000
--- a/app-text/zathura-meta-0
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Meta package for app-text/zathura plugins
-EAPI=5
-HOMEPAGE=https://pwmt.org/projects/zathura/
-IUSE=cb djvu +pdf postscript
-KEYWORDS=amd64 ~arm x86
-LICENSE=metapackage
-RDEPEND=app-text/zathura cb? ( app-text/zathura-cb ) djvu? ( app-text/zathura-djvu ) pdf? ( || ( app-text/zathura-pdf-poppler app-text/zathura-pdf-mupdf ) ) postscript? ( app-text/zathura-ps )
-SLOT=0
-_md5_=09626ba2f19ba208a2dd8add9f8dfdc3
diff --git a/app-text/zathura-meta/Manifest b/app-text/zathura-meta/Manifest
new file mode 100644
index 000000000000..ea587ec5c89b
--- /dev/null
+++ b/app-text/zathura-meta/Manifest
@@ -0,0 +1,2 @@
+EBUILD zathura-meta-0.ebuild 518 BLAKE2B 08078da4df7db22f94b56a25525b454f08a35851bd3e7783fe3e2508371f3846d90b533bea45c1f2413e996e5c3ef88234ecf81c446bc9820512e225afdbec27 SHA512 5262dac8ffc3c9ab4e58b8d131a539ac53759cb8beddf1818a58d61dfc225f56ce3d76304cfa5d669fed018515948c2f98a767de04b1db351f6d64e56d79102e
+MISC metadata.xml 784 BLAKE2B 1828dcb5847efbdff5b7cad10ba17fc6561debe2c8f860863ed158c918dc74fe7851ef21a9dd08c06cd62c4322aaee30b3f1e496d0fcc60a2fd85bc64e20b867 SHA512 862a83f9aef1dd793f72015ec94a778582639c421446775316ae8f7c22a627cce2e09bef70049252617340ee1ff71704a95ea1a78547aec65af1ca8dbe9fde45
diff --git a/app-text/zathura-meta/metadata.xml b/app-text/zathura-meta/metadata.xml
new file mode 100644
index 000000000000..2482ebc42ae1
--- /dev/null
+++ b/app-text/zathura-meta/metadata.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>xmw@gentoo.org</email>
+    <name>Michael Weber</name>
+  </maintainer>
+  <use>
+    <flag name="cb">Install plug-in for ComicBook support</flag>
+  </use>
+  <upstream>
+    <maintainer status="active">
+      <email>mlq@pwmt.org</email>
+      <name>Moritz Lipp</name>
+    </maintainer>
+    <maintainer status="active">
+      <email>sebastian+dev@ramacher.at</email>
+      <name>Sebastian Ramacher</name>
+    </maintainer>
+    <changelog>http://pwmt.org/projects/zathura/download/</changelog>
+    <doc lang="en">http://pwmt.org/projects/zathura/</doc>
+    <bugs-to>http://bugs.pwmt.org/</bugs-to>
+  </upstream>
+</pkgmetadata>
diff --git a/app-text/zathura-meta/zathura-meta-0.ebuild b/app-text/zathura-meta/zathura-meta-0.ebuild
new file mode 100644
index 000000000000..7c733b9625ff
--- /dev/null
+++ b/app-text/zathura-meta/zathura-meta-0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="Meta package for app-text/zathura plugins"
+HOMEPAGE="https://pwmt.org/projects/zathura/"
+SRC_URI=""
+
+LICENSE="metapackage"
+SLOT="0"
+KEYWORDS="amd64 ~arm x86"
+IUSE="cb djvu +pdf postscript"
+
+RDEPEND="app-text/zathura
+	cb? ( app-text/zathura-cb )
+	djvu? ( app-text/zathura-djvu )
+	pdf? ( || ( app-text/zathura-pdf-poppler app-text/zathura-pdf-mupdf ) )
+	postscript? ( app-text/zathura-ps )"
diff --git a/app-text/zathura-pdf-mupdf-0.3.1 b/app-text/zathura-pdf-mupdf-0.3.1
deleted file mode 100644
index b03f32bd3db7..000000000000
--- a/app-text/zathura-pdf-mupdf-0.3.1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install
-DEPEND=!app-text/zathura-pdf-poppler >=app-text/mupdf-1.10a:= <app-text/mupdf-1.12.0:= >=app-text/zathura-0.3.1 media-libs/jbig2dec:= media-libs/openjpeg:2= virtual/jpeg:0 x11-libs/cairo:= virtual/pkgconfig
-DESCRIPTION=PDF plug-in for zathura
-EAPI=5
-HOMEPAGE=https://pwmt.org/projects/zathura/
-KEYWORDS=amd64 arm x86
-LICENSE=ZLIB
-RDEPEND=!app-text/zathura-pdf-poppler >=app-text/mupdf-1.10a:= <app-text/mupdf-1.12.0:= >=app-text/zathura-0.3.1 media-libs/jbig2dec:= media-libs/openjpeg:2= virtual/jpeg:0 x11-libs/cairo:=
-SLOT=0
-SRC_URI=https://pwmt.org/projects/zathura/plugins/download/zathura-pdf-mupdf-0.3.1.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f27233a1f5701b79f05b068e787aca0a
diff --git a/app-text/zathura-pdf-mupdf-0.3.2 b/app-text/zathura-pdf-mupdf-0.3.2
deleted file mode 100644
index 35a565b064bc..000000000000
--- a/app-text/zathura-pdf-mupdf-0.3.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=!app-text/zathura-pdf-poppler >=app-text/mupdf-1.12.0:= >=app-text/zathura-0.3.8 media-libs/jbig2dec:= media-libs/openjpeg:2= virtual/jpeg:0 x11-libs/cairo:= virtual/pkgconfig dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=PDF plug-in for zathura
-EAPI=6
-HOMEPAGE=https://pwmt.org/projects/zathura/
-KEYWORDS=amd64 ~arm x86
-LICENSE=ZLIB
-RDEPEND=!app-text/zathura-pdf-poppler >=app-text/mupdf-1.12.0:= >=app-text/zathura-0.3.8 media-libs/jbig2dec:= media-libs/openjpeg:2= virtual/jpeg:0 x11-libs/cairo:=
-SLOT=0
-SRC_URI=https://pwmt.org/projects/zathura/plugins/download/zathura-pdf-mupdf-0.3.2.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=477bbea5972c2e1b1da0681aae952f35
diff --git a/app-text/zathura-pdf-mupdf-9999 b/app-text/zathura-pdf-mupdf-9999
deleted file mode 100644
index 672163949e3b..000000000000
--- a/app-text/zathura-pdf-mupdf-9999
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=!app-text/zathura-pdf-poppler >=app-text/mupdf-1.12.0:= >=app-text/zathura-0.3.8 media-libs/jbig2dec:= media-libs/openjpeg:2= virtual/jpeg:0 x11-libs/cairo:= virtual/pkgconfig dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=PDF plug-in for zathura
-EAPI=6
-HOMEPAGE=https://pwmt.org/projects/zathura/
-LICENSE=ZLIB
-RDEPEND=!app-text/zathura-pdf-poppler >=app-text/mupdf-1.12.0:= >=app-text/zathura-0.3.8 media-libs/jbig2dec:= media-libs/openjpeg:2= virtual/jpeg:0 x11-libs/cairo:=
-SLOT=0
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	git-r3	8f6de46b0aa318aea0e8cac62ece098b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b03110e5bf26b38ec131520b570bfba9
diff --git a/app-text/zathura-pdf-mupdf/Manifest b/app-text/zathura-pdf-mupdf/Manifest
new file mode 100644
index 000000000000..ccf91c29c90d
--- /dev/null
+++ b/app-text/zathura-pdf-mupdf/Manifest
@@ -0,0 +1,6 @@
+DIST zathura-pdf-mupdf-0.3.1.tar.gz 9755 BLAKE2B bbacecd503bda14301e1111799bf8fd82aa1488d4db5a28db7c0805b1e1391c038be64a0f4c64be974c2173396f972115ec6300686f34ac9b8b3e7e091d7ae5c SHA512 87b5b8a750a6911be37a0195b0f4bc3304350f9d29173091b3eeece40350b10cb98b009b2722a69ae1e617b4242292f3eba17fea97d5276e485069180f2bd67d
+DIST zathura-pdf-mupdf-0.3.2.tar.gz 9687 BLAKE2B 53ec5997c69ee160f60b90ba83ab15bff55fcd14f22b34cd54bf226a57d71d1fc95e62c2daac97f0285eee6bf6cd71e9c49a5f97920d19860c58bcc9d568deae SHA512 f6273923d0c1d7f6fad5cc3369c35fff9f87dabcb726d5ab4f814775f5e8783c552cbac7ad1381f3c6d91753698d64a96c7e76e0b8b5a16d9c28147fbdeb3089
+EBUILD zathura-pdf-mupdf-0.3.1.ebuild 1095 BLAKE2B 1c8506329cb6b56e46f53522990271aeb72afd30b38301cb1443fa8808460af81810713958c6f55f1fd79a635426d89812511b9ac8a5441020cc483a7b068284 SHA512 a8eb48a9029089008b9925d946d909a21802275a23a0e33edf67780c028fd1a7c8432438bc3aaac3b8460d40d0f7df8b9219bd8af5c99c6eb98339510e7c0479
+EBUILD zathura-pdf-mupdf-0.3.2.ebuild 1075 BLAKE2B 1ffa737a7111bb24a314443f6da4e6bc69b2077ea5d1b080b83f0335aa7df897c5c9216c497f533dd3a6e59f243f9267ac88a9b7e348852a7d7c547520fa1adb SHA512 20828e21b1b6255a5c05ac42594ce1b8d6749920cf5490e4a174947734d77b4ea048ef894d5271dfe3900ffdfefa7d5ddc3daf6fb5be1fdc5b3f1853f1c01aa2
+EBUILD zathura-pdf-mupdf-9999.ebuild 1077 BLAKE2B d4f06640c28f86f45c274fdb77dca863742a4685dc47d14d82095a8adbac0c713a00a5c7676d017128926473f7ead99d6fe520682693b3e811da8b55ea49644c SHA512 c1f52c483e368114ee230b920bbe440687d668499b991ad92d85d6a93f677e0671c1561f3f8ca8230f1d84941facee607fd7661225c139a79a8299ab0140749e
+MISC metadata.xml 702 BLAKE2B 494044f73e5201e73328ba0f0ab58cd40ae7860127449aaed63e96ec0962a3e2c5cc2b617dd58c73c9226d5ca7e1237f94064eb8dab48fe1a88e8c50bfb40216 SHA512 0f416ccc5110783602c76a1b2670f22c15104a2868d23b635180faf4993d3879198c04fc29e7a8d23b13105bd6b2268d9d7877a0e36dbab1726919b3d5c0a37f
diff --git a/app-text/zathura-pdf-mupdf/metadata.xml b/app-text/zathura-pdf-mupdf/metadata.xml
new file mode 100644
index 000000000000..b7ed6eb4ffbe
--- /dev/null
+++ b/app-text/zathura-pdf-mupdf/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>xmw@gentoo.org</email>
+    <name>Michael Weber</name>
+  </maintainer>
+  <upstream>
+    <maintainer status="active">
+      <email>mlq@pwmt.org</email>
+      <name>Moritz Lipp</name>
+    </maintainer>
+    <maintainer status="active">
+      <email>sebastian+dev@ramacher.at</email>
+      <name>Sebastian Ramacher</name>
+    </maintainer>
+    <changelog>http://pwmt.org/projects/zathura/download/</changelog>
+    <doc lang="en">http://pwmt.org/projects/zathura/</doc>
+    <bugs-to>http://bugs.pwmt.org/</bugs-to>
+  </upstream>
+</pkgmetadata>
diff --git a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.1.ebuild b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.1.ebuild
new file mode 100644
index 000000000000..2d076f7b32cd
--- /dev/null
+++ b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-pdf-mupdf.git"
+	EGIT_BRANCH="develop"
+else
+	KEYWORDS="amd64 arm x86"
+	SRC_URI="https://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz"
+fi
+
+DESCRIPTION="PDF plug-in for zathura"
+HOMEPAGE="https://pwmt.org/projects/zathura/"
+
+LICENSE="ZLIB"
+SLOT="0"
+IUSE=""
+
+RDEPEND="!app-text/zathura-pdf-poppler
+	>=app-text/mupdf-1.10a:=
+	<app-text/mupdf-1.12.0:=
+	>=app-text/zathura-0.3.1
+	media-libs/jbig2dec:=
+	media-libs/openjpeg:2=
+	virtual/jpeg:0
+	x11-libs/cairo:="
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_configure() {
+	myzathuraconf=(
+		CC="$(tc-getCC)"
+		LD="$(tc-getLD)"
+		VERBOSE=1
+		DESTDIR="${D}"
+		MUPDF_LIB="$($(tc-getPKG_CONFIG) --libs mupdf)"
+		OPENSSL_INC="$($(tc-getPKG_CONFIG) --cflags mupdf)"
+		OPENSSL_LIB=''
+	)
+}
+
+src_compile() {
+	emake "${myzathuraconf[@]}"
+}
+
+src_install() {
+	emake "${myzathuraconf[@]}" install
+	dodoc AUTHORS
+}
diff --git a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.2.ebuild b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.2.ebuild
new file mode 100644
index 000000000000..cb18bcab1632
--- /dev/null
+++ b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils toolchain-funcs xdg
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-pdf-mupdf.git"
+	EGIT_BRANCH="develop"
+else
+	KEYWORDS="amd64 ~arm x86"
+	SRC_URI="https://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz"
+fi
+
+DESCRIPTION="PDF plug-in for zathura"
+HOMEPAGE="https://pwmt.org/projects/zathura/"
+
+LICENSE="ZLIB"
+SLOT="0"
+IUSE=""
+
+RDEPEND="!app-text/zathura-pdf-poppler
+	>=app-text/mupdf-1.12.0:=
+	>=app-text/zathura-0.3.8
+	media-libs/jbig2dec:=
+	media-libs/openjpeg:2=
+	virtual/jpeg:0
+	x11-libs/cairo:="
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_configure() {
+	myzathuraconf=(
+		CC="$(tc-getCC)"
+		LD="$(tc-getLD)"
+		VERBOSE=1
+		DESTDIR="${D}"
+		MUPDF_LIB="$($(tc-getPKG_CONFIG) --libs mupdf)"
+		OPENSSL_INC="$($(tc-getPKG_CONFIG) --cflags mupdf)"
+		OPENSSL_LIB=''
+	)
+}
+
+src_compile() {
+	emake "${myzathuraconf[@]}"
+}
+
+src_install() {
+	emake "${myzathuraconf[@]}" install
+	dodoc AUTHORS
+}
diff --git a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-9999.ebuild b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-9999.ebuild
new file mode 100644
index 000000000000..8d7a7aa0a007
--- /dev/null
+++ b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-9999.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils toolchain-funcs xdg
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-pdf-mupdf.git"
+	EGIT_BRANCH="develop"
+else
+	KEYWORDS="~amd64 ~arm ~x86"
+	SRC_URI="https://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz"
+fi
+
+DESCRIPTION="PDF plug-in for zathura"
+HOMEPAGE="https://pwmt.org/projects/zathura/"
+
+LICENSE="ZLIB"
+SLOT="0"
+IUSE=""
+
+RDEPEND="!app-text/zathura-pdf-poppler
+	>=app-text/mupdf-1.12.0:=
+	>=app-text/zathura-0.3.8
+	media-libs/jbig2dec:=
+	media-libs/openjpeg:2=
+	virtual/jpeg:0
+	x11-libs/cairo:="
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_configure() {
+	myzathuraconf=(
+		CC="$(tc-getCC)"
+		LD="$(tc-getLD)"
+		VERBOSE=1
+		DESTDIR="${D}"
+		MUPDF_LIB="$($(tc-getPKG_CONFIG) --libs mupdf)"
+		OPENSSL_INC="$($(tc-getPKG_CONFIG) --cflags mupdf)"
+		OPENSSL_LIB=''
+	)
+}
+
+src_compile() {
+	emake "${myzathuraconf[@]}"
+}
+
+src_install() {
+	emake "${myzathuraconf[@]}" install
+	dodoc AUTHORS
+}
diff --git a/app-text/zathura-pdf-poppler-0.2.7 b/app-text/zathura-pdf-poppler-0.2.7
deleted file mode 100644
index 968f89897602..000000000000
--- a/app-text/zathura-pdf-poppler-0.2.7
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install
-DEPEND=app-text/poppler[cairo] >=app-text/zathura-0.2.7 x11-libs/cairo:= virtual/pkgconfig
-DESCRIPTION=PDF plug-in for zathura
-EAPI=5
-HOMEPAGE=http://pwmt.org/projects/zathura/
-KEYWORDS=amd64 arm x86
-LICENSE=ZLIB
-RDEPEND=app-text/poppler[cairo] >=app-text/zathura-0.2.7 x11-libs/cairo:=
-SLOT=0
-SRC_URI=http://pwmt.org/projects/zathura/plugins/download/zathura-pdf-poppler-0.2.7.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=866e8559904ce1781322b5b18ace1996
diff --git a/app-text/zathura-pdf-poppler-0.2.8 b/app-text/zathura-pdf-poppler-0.2.8
deleted file mode 100644
index e015e0381117..000000000000
--- a/app-text/zathura-pdf-poppler-0.2.8
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=app-text/poppler[cairo] >=app-text/zathura-0.3.8 x11-libs/cairo:= virtual/pkgconfig dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=PDF plug-in for zathura
-EAPI=6
-HOMEPAGE=http://pwmt.org/projects/zathura/
-KEYWORDS=amd64 ~arm x86
-LICENSE=ZLIB
-RDEPEND=app-text/poppler[cairo] >=app-text/zathura-0.3.8 x11-libs/cairo:=
-SLOT=0
-SRC_URI=http://pwmt.org/projects/zathura/plugins/download/zathura-pdf-poppler-0.2.8.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=80596a9ac945fdf9ca932eb7b861e030
diff --git a/app-text/zathura-pdf-poppler-9999 b/app-text/zathura-pdf-poppler-9999
deleted file mode 100644
index 2ad80ea2c567..000000000000
--- a/app-text/zathura-pdf-poppler-9999
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=app-text/poppler[cairo] >=app-text/zathura-0.3.8 x11-libs/cairo:= virtual/pkgconfig dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=PDF plug-in for zathura
-EAPI=6
-HOMEPAGE=http://pwmt.org/projects/zathura/
-LICENSE=ZLIB
-RDEPEND=app-text/poppler[cairo] >=app-text/zathura-0.3.8 x11-libs/cairo:=
-SLOT=0
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	git-r3	8f6de46b0aa318aea0e8cac62ece098b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f3e948f382cad5272e9e4c672cfa6352
diff --git a/app-text/zathura-pdf-poppler/Manifest b/app-text/zathura-pdf-poppler/Manifest
new file mode 100644
index 000000000000..3e81a2e72e22
--- /dev/null
+++ b/app-text/zathura-pdf-poppler/Manifest
@@ -0,0 +1,6 @@
+DIST zathura-pdf-poppler-0.2.7.tar.gz 9610 BLAKE2B ed0921545cfa435f47e45db223a469e80485ae3716ff20bb1fd213cd689eb5754935644198289a4fbe44cf30e837093e5f5568f714e66d4a3de11d53adfda5fb SHA512 815ef775059652337ca91ef6a089fa51105bbd3ac649ecd167da7da2a6ac62f617d04e85dbeb311ab47d86929338d8656037bcabc1177435804035914c6dfbdb
+DIST zathura-pdf-poppler-0.2.8.tar.gz 9504 BLAKE2B fc7ac4b4789f23d03b084dd90489c2b6e6fa0a93814140cf563fb826ed5bc7bad2cdcbf100cc6c2e708ecabd85be177c88a4faf9a0fc910bbfcddc1a515a7373 SHA512 644a36e31f89ee87a4d9bd50d5f9e209f06b6755af00009756422c89ad2ab50a97dd2c03a037b4e22bcf04bd620bd5b5ea55db7c380da9d3cebe0d1c00e18b9b
+EBUILD zathura-pdf-poppler-0.2.7.ebuild 854 BLAKE2B 48cd2dbd815496570c0826fb6f265b5b983f203689a5351c3a0a948ed9cd61d3b515940c755a2c297dbe294b6fd8b9cc732970ed2e24d7181d43a3a235a39f41 SHA512 8f1064fd8da384e347980adaf2370ea1e60eab857e50038ca16718768ccab732cfb95d5aef1fe1fcc53758e5ac872c3d0d787eae14bbbd76670e9679223f6396
+EBUILD zathura-pdf-poppler-0.2.8.ebuild 859 BLAKE2B 39684772f5ef3b03275019594f4991c76c1aebf76ac1e48f5e540406497bb9b29cd142e225b1b442cdf9f5b75dd34e6cd23d5b612c73a4dd6945aa4a0c2f2ac9 SHA512 c5f26fba2fa2077b14a53bb7e1d46ab8c228cce3f0d06676b673d4a09acac7dee77e524eeaf7b63c6a3882290c9a906d5aab4c8a199dc294acc91ccd7d65ef66
+EBUILD zathura-pdf-poppler-9999.ebuild 861 BLAKE2B 5237bbfc9f3202dd7178a2a37abaaac0d67af71344823969175d7b677387ab1040d6a1fbd83d6927aee6faa95f9e2e36b4fb1bc5a348bf007ebbbbf0b363c8dc SHA512 e451c62dd3fae3610b36b0511bcdf760d70cb27b56fe2c75b57151fd9fab7c714e83ba511c3f2e622e0d8467d4c3c4d40593eb882cbfba69712af7e140104e0f
+MISC metadata.xml 702 BLAKE2B 494044f73e5201e73328ba0f0ab58cd40ae7860127449aaed63e96ec0962a3e2c5cc2b617dd58c73c9226d5ca7e1237f94064eb8dab48fe1a88e8c50bfb40216 SHA512 0f416ccc5110783602c76a1b2670f22c15104a2868d23b635180faf4993d3879198c04fc29e7a8d23b13105bd6b2268d9d7877a0e36dbab1726919b3d5c0a37f
diff --git a/app-text/zathura-pdf-poppler/metadata.xml b/app-text/zathura-pdf-poppler/metadata.xml
new file mode 100644
index 000000000000..b7ed6eb4ffbe
--- /dev/null
+++ b/app-text/zathura-pdf-poppler/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>xmw@gentoo.org</email>
+    <name>Michael Weber</name>
+  </maintainer>
+  <upstream>
+    <maintainer status="active">
+      <email>mlq@pwmt.org</email>
+      <name>Moritz Lipp</name>
+    </maintainer>
+    <maintainer status="active">
+      <email>sebastian+dev@ramacher.at</email>
+      <name>Sebastian Ramacher</name>
+    </maintainer>
+    <changelog>http://pwmt.org/projects/zathura/download/</changelog>
+    <doc lang="en">http://pwmt.org/projects/zathura/</doc>
+    <bugs-to>http://bugs.pwmt.org/</bugs-to>
+  </upstream>
+</pkgmetadata>
diff --git a/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.2.7.ebuild b/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.2.7.ebuild
new file mode 100644
index 000000000000..c27384680f4d
--- /dev/null
+++ b/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.2.7.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-pdf-poppler.git"
+	EGIT_BRANCH="develop"
+else
+	KEYWORDS="amd64 arm x86"
+	SRC_URI="http://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz"
+fi
+
+DESCRIPTION="PDF plug-in for zathura"
+HOMEPAGE="http://pwmt.org/projects/zathura/"
+
+LICENSE="ZLIB"
+SLOT="0"
+IUSE=""
+
+RDEPEND="app-text/poppler[cairo]
+	>=app-text/zathura-0.2.7
+	x11-libs/cairo:="
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_configure() {
+	myzathuraconf=(
+		CC="$(tc-getCC)"
+		LD="$(tc-getLD)"
+		VERBOSE=1
+	)
+}
+
+src_compile() {
+	emake "${myzathuraconf[@]}"
+}
+
+src_install() {
+	emake "${myzathuraconf[@]}" DESTDIR="${ED%/}" install
+	dodoc AUTHORS
+}
diff --git a/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.2.8.ebuild b/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.2.8.ebuild
new file mode 100644
index 000000000000..7ad3b3bea727
--- /dev/null
+++ b/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.2.8.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils toolchain-funcs xdg
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-pdf-poppler.git"
+	EGIT_BRANCH="develop"
+else
+	KEYWORDS="amd64 ~arm x86"
+	SRC_URI="http://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz"
+fi
+
+DESCRIPTION="PDF plug-in for zathura"
+HOMEPAGE="http://pwmt.org/projects/zathura/"
+
+LICENSE="ZLIB"
+SLOT="0"
+IUSE=""
+
+RDEPEND="app-text/poppler[cairo]
+	>=app-text/zathura-0.3.8
+	x11-libs/cairo:="
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_configure() {
+	myzathuraconf=(
+		CC="$(tc-getCC)"
+		LD="$(tc-getLD)"
+		VERBOSE=1
+	)
+}
+
+src_compile() {
+	emake "${myzathuraconf[@]}"
+}
+
+src_install() {
+	emake "${myzathuraconf[@]}" DESTDIR="${ED%/}" install
+	dodoc AUTHORS
+}
diff --git a/app-text/zathura-pdf-poppler/zathura-pdf-poppler-9999.ebuild b/app-text/zathura-pdf-poppler/zathura-pdf-poppler-9999.ebuild
new file mode 100644
index 000000000000..ca0b8305c134
--- /dev/null
+++ b/app-text/zathura-pdf-poppler/zathura-pdf-poppler-9999.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils toolchain-funcs xdg
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-pdf-poppler.git"
+	EGIT_BRANCH="develop"
+else
+	KEYWORDS="~amd64 ~arm ~x86"
+	SRC_URI="http://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz"
+fi
+
+DESCRIPTION="PDF plug-in for zathura"
+HOMEPAGE="http://pwmt.org/projects/zathura/"
+
+LICENSE="ZLIB"
+SLOT="0"
+IUSE=""
+
+RDEPEND="app-text/poppler[cairo]
+	>=app-text/zathura-0.3.8
+	x11-libs/cairo:="
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_configure() {
+	myzathuraconf=(
+		CC="$(tc-getCC)"
+		LD="$(tc-getLD)"
+		VERBOSE=1
+	)
+}
+
+src_compile() {
+	emake "${myzathuraconf[@]}"
+}
+
+src_install() {
+	emake "${myzathuraconf[@]}" DESTDIR="${ED%/}" install
+	dodoc AUTHORS
+}
diff --git a/app-text/zathura-ps-0.2.4 b/app-text/zathura-ps-0.2.4
deleted file mode 100644
index 07aac2efcbb7..000000000000
--- a/app-text/zathura-ps-0.2.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install
-DEPEND=>=app-text/libspectre-0.2.6:= >=app-text/zathura-0.2.7 dev-libs/glib:2= x11-libs/cairo:= virtual/pkgconfig
-DESCRIPTION=PostScript plug-in for zathura
-EAPI=5
-HOMEPAGE=https://pwmt.org/projects/zathura/
-KEYWORDS=amd64 arm x86 ~amd64-linux ~x86-linux
-LICENSE=ZLIB
-RDEPEND=>=app-text/libspectre-0.2.6:= >=app-text/zathura-0.2.7 dev-libs/glib:2= x11-libs/cairo:=
-SLOT=0
-SRC_URI=https://pwmt.org/projects/zathura/plugins/download/zathura-ps-0.2.4.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=a918978cb6447ccd08bcc83c95de0f09
diff --git a/app-text/zathura-ps-0.2.5 b/app-text/zathura-ps-0.2.5
deleted file mode 100644
index e1a644ed68e6..000000000000
--- a/app-text/zathura-ps-0.2.5
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=app-text/libspectre-0.2.6:= >=app-text/zathura-0.3.8 dev-libs/glib:2= x11-libs/cairo:= virtual/pkgconfig dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=PostScript plug-in for zathura
-EAPI=6
-HOMEPAGE=https://pwmt.org/projects/zathura/
-KEYWORDS=amd64 ~arm x86 ~amd64-linux ~x86-linux
-LICENSE=ZLIB
-RDEPEND=>=app-text/libspectre-0.2.6:= >=app-text/zathura-0.3.8 dev-libs/glib:2= x11-libs/cairo:=
-SLOT=0
-SRC_URI=https://pwmt.org/projects/zathura/plugins/download/zathura-ps-0.2.5.tar.gz
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=36392f0999e7ce42a0cf13d03b63f709
diff --git a/app-text/zathura-ps-9999 b/app-text/zathura-ps-9999
deleted file mode 100644
index 2d04df4e8905..000000000000
--- a/app-text/zathura-ps-9999
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=>=app-text/libspectre-0.2.6:= >=app-text/zathura-0.3.8 dev-libs/glib:2= x11-libs/cairo:= virtual/pkgconfig dev-util/desktop-file-utils x11-misc/shared-mime-info >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=PostScript plug-in for zathura
-EAPI=6
-HOMEPAGE=https://pwmt.org/projects/zathura/
-LICENSE=ZLIB
-RDEPEND=>=app-text/libspectre-0.2.6:= >=app-text/zathura-0.3.8 dev-libs/glib:2= x11-libs/cairo:=
-SLOT=0
-_eclasses_=desktop	1b286a7e7143d8c4ec89cd0d2743a097	epatch	9a5f039771f143195164a15a4faa41a1	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	5b8ce72259e08104b337fe28c6de5dbc	git-r3	8f6de46b0aa318aea0e8cac62ece098b	ltprune	607e058da37aa6dabfa408b7d61da72e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	1e35303c63cd707f6c3422b4493d5607	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a72e0184b11e76e5bb02311c22065294
diff --git a/app-text/zathura-ps/Manifest b/app-text/zathura-ps/Manifest
new file mode 100644
index 000000000000..1d66205b0bbc
--- /dev/null
+++ b/app-text/zathura-ps/Manifest
@@ -0,0 +1,6 @@
+DIST zathura-ps-0.2.4.tar.gz 5980 BLAKE2B ee60ebeea519eb618081816d0f0109cd5c327f5a4676e9260ec5b0d6c309368fe611a3bcb8dbefd7bd9661207630529311eebb1f54f4814eebf18378b640825e SHA512 c63cbd4ff032cffa85305393a8e7f2864986e3a8204832cd7f9f12878e2c69fd0393ace91dd7b0fa8829f3a785abc2675d2ecb99dfa71794d699b567be954922
+DIST zathura-ps-0.2.5.tar.gz 5845 BLAKE2B b716381b66f54626298544fab6ef6f857066db50b027e1b729cfa59e33a23fda4cab09ba8dc33317725058b6942ef84fbc7c24aa30a4d7db2c73f7ac1b6ef137 SHA512 043898fdca56bee28a8e2af61d3216af25e222c0a137737e599881bb21e805dd8a609ff2901a50763bdbb34bf2e3fca2afaf1a59b715f3ba6aa067971c99c258
+EBUILD zathura-ps-0.2.4.ebuild 927 BLAKE2B 28da921678d723a5a7039f80458e38b81e156ee9f1d6c2e472c70b69a66ea247e0e15b29f5218011f7585fa37a066223a6d3fe819063d244252bedc5dc1abd28 SHA512 ba7fbe161e87d476ed6413c44bc63d72ffe1ad79b5f555e9b01db19e7a06a772809b842ccd9e83e1ae98eede115cf9bcd97af005151510d2f2758f186841c837
+EBUILD zathura-ps-0.2.5.ebuild 932 BLAKE2B 1323526a3d9fbacd60af911d3d4d12069bcf8da3f2bd9d231bcb12d529dd9734b709b454c464c5f9554414c9276daf4cc260d86863faeca1553e1da25c13856a SHA512 ff560eb37bfcd9ccc371929490124afd499bb418ee9f5372256b517ada51eebde958d270d0875d078474d8b53619f8fe40b00d837197060cf6636cd7924b4eec
+EBUILD zathura-ps-9999.ebuild 934 BLAKE2B 3df19a2ebc4af3b76a3006cad4b381b2a8ac35c29c4c857f423d3a66a2be5870b9ff4aa4f53008dd8fef0b1ed39329dbc8d783444c5b142ebe1fffdc77caa697 SHA512 f4105099eef1796eb4d302c1ba0f76a1d6008464810da8c5bf59e0ef5076901a0dbe1f07dda5da8a52a6e723b8e34e0f3ff37ce4607fe16f98915a93664135d6
+MISC metadata.xml 702 BLAKE2B 494044f73e5201e73328ba0f0ab58cd40ae7860127449aaed63e96ec0962a3e2c5cc2b617dd58c73c9226d5ca7e1237f94064eb8dab48fe1a88e8c50bfb40216 SHA512 0f416ccc5110783602c76a1b2670f22c15104a2868d23b635180faf4993d3879198c04fc29e7a8d23b13105bd6b2268d9d7877a0e36dbab1726919b3d5c0a37f
diff --git a/app-text/zathura-ps/metadata.xml b/app-text/zathura-ps/metadata.xml
new file mode 100644
index 000000000000..b7ed6eb4ffbe
--- /dev/null
+++ b/app-text/zathura-ps/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>xmw@gentoo.org</email>
+    <name>Michael Weber</name>
+  </maintainer>
+  <upstream>
+    <maintainer status="active">
+      <email>mlq@pwmt.org</email>
+      <name>Moritz Lipp</name>
+    </maintainer>
+    <maintainer status="active">
+      <email>sebastian+dev@ramacher.at</email>
+      <name>Sebastian Ramacher</name>
+    </maintainer>
+    <changelog>http://pwmt.org/projects/zathura/download/</changelog>
+    <doc lang="en">http://pwmt.org/projects/zathura/</doc>
+    <bugs-to>http://bugs.pwmt.org/</bugs-to>
+  </upstream>
+</pkgmetadata>
diff --git a/app-text/zathura-ps/zathura-ps-0.2.4.ebuild b/app-text/zathura-ps/zathura-ps-0.2.4.ebuild
new file mode 100644
index 000000000000..f05771182caf
--- /dev/null
+++ b/app-text/zathura-ps/zathura-ps-0.2.4.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-ps.git"
+	EGIT_BRANCH="develop"
+else
+	KEYWORDS="amd64 arm x86 ~amd64-linux ~x86-linux"
+	SRC_URI="https://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz"
+fi
+
+DESCRIPTION="PostScript plug-in for zathura"
+HOMEPAGE="https://pwmt.org/projects/zathura/"
+
+LICENSE="ZLIB"
+SLOT="0"
+IUSE=""
+
+RDEPEND=">=app-text/libspectre-0.2.6:=
+	>=app-text/zathura-0.2.7
+	dev-libs/glib:2=
+	x11-libs/cairo:="
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_configure() {
+	myzathuraconf=(
+		CC="$(tc-getCC)"
+		LD="$(tc-getLD)"
+		VERBOSE=1
+		DESTDIR="${D}"
+		PREFIX="${EPREFIX}/usr"
+	)
+}
+
+src_compile() {
+	emake "${myzathuraconf[@]}"
+}
+
+src_install() {
+	emake "${myzathuraconf[@]}" install
+	dodoc AUTHORS
+}
diff --git a/app-text/zathura-ps/zathura-ps-0.2.5.ebuild b/app-text/zathura-ps/zathura-ps-0.2.5.ebuild
new file mode 100644
index 000000000000..0b688fc4614e
--- /dev/null
+++ b/app-text/zathura-ps/zathura-ps-0.2.5.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils toolchain-funcs xdg
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-ps.git"
+	EGIT_BRANCH="develop"
+else
+	KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
+	SRC_URI="https://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz"
+fi
+
+DESCRIPTION="PostScript plug-in for zathura"
+HOMEPAGE="https://pwmt.org/projects/zathura/"
+
+LICENSE="ZLIB"
+SLOT="0"
+IUSE=""
+
+RDEPEND=">=app-text/libspectre-0.2.6:=
+	>=app-text/zathura-0.3.8
+	dev-libs/glib:2=
+	x11-libs/cairo:="
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_configure() {
+	myzathuraconf=(
+		CC="$(tc-getCC)"
+		LD="$(tc-getLD)"
+		VERBOSE=1
+		DESTDIR="${D}"
+		PREFIX="${EPREFIX}/usr"
+	)
+}
+
+src_compile() {
+	emake "${myzathuraconf[@]}"
+}
+
+src_install() {
+	emake "${myzathuraconf[@]}" install
+	dodoc AUTHORS
+}
diff --git a/app-text/zathura-ps/zathura-ps-9999.ebuild b/app-text/zathura-ps/zathura-ps-9999.ebuild
new file mode 100644
index 000000000000..305bfa827e75
--- /dev/null
+++ b/app-text/zathura-ps/zathura-ps-9999.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils toolchain-funcs xdg
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-ps.git"
+	EGIT_BRANCH="develop"
+else
+	KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+	SRC_URI="https://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz"
+fi
+
+DESCRIPTION="PostScript plug-in for zathura"
+HOMEPAGE="https://pwmt.org/projects/zathura/"
+
+LICENSE="ZLIB"
+SLOT="0"
+IUSE=""
+
+RDEPEND=">=app-text/libspectre-0.2.6:=
+	>=app-text/zathura-0.3.8
+	dev-libs/glib:2=
+	x11-libs/cairo:="
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_configure() {
+	myzathuraconf=(
+		CC="$(tc-getCC)"
+		LD="$(tc-getLD)"
+		VERBOSE=1
+		DESTDIR="${D}"
+		PREFIX="${EPREFIX}/usr"
+	)
+}
+
+src_compile() {
+	emake "${myzathuraconf[@]}"
+}
+
+src_install() {
+	emake "${myzathuraconf[@]}" install
+	dodoc AUTHORS
+}
diff --git a/app-text/zathura/Manifest b/app-text/zathura/Manifest
new file mode 100644
index 000000000000..90bdc0538168
--- /dev/null
+++ b/app-text/zathura/Manifest
@@ -0,0 +1,7 @@
+AUX zathura-0.3.7-tests.patch 702 BLAKE2B 86ff60915631ab060eec0dbcf389157a1b6b8663404b4ea990dba509a64ce36d4921944a361b83e9ce83705b21aaa75b40441687c9b9e7d7d12634a47de99106 SHA512 8c1190b9511495328b841dd90500265e123fa4510e0660ca30510961b9222adcc72ad74f2e6a51d0710b9a86fb88d382c1f92739396804675a5b93cc78a941ca
+DIST zathura-0.3.7.tar.gz 174095 BLAKE2B f0025b75b319dbfa397362e102318f1dc1b5dd41f8beb1380cd781fd7594d15234781d862bf20b59ad4bcb9d1aa67210aa10779c19273e81341bfb74962f3139 SHA512 830a1b88820507a40a20b046c504d8ab3022a35c2c4c0d93a67f77ab5e31d746362a6f28fb9786a647cd0bfd943306aca74cbb2092774aedfb52380e713df533
+DIST zathura-0.3.8.tar.gz 174962 BLAKE2B 44d91564ee42cea80357230c789160e37774d5ae29f8de8bac1fbf734a28e7b862d58d807fe3fa01d323d0baaf88a3960243f8022893c3ad40b67ba8d8a1ae6d SHA512 bad10eaf6642885f96850a01921dc1580357144d8b9b27e88e7765e6fc8e7d8f8c94c240904469e1e6b22114be5117a28a24c87183476d2c89d93f27a5083109
+EBUILD zathura-0.3.7.ebuild 1481 BLAKE2B fb038b60a8a130a760f486dfaaf9051929bed9e6bc5defa99e89db283df286bd1e85ea71e5d88a97350e687125921c6884c0b0e7bf8ba56c3df98fa75158df36 SHA512 0927fdbf3d1a26580505cbdc31d97ffd056d8eb16a14e116673564ccc33fe78604a1913e48e29f4df24f66df07195489a3dd6fbad38764e96a98347261769d73
+EBUILD zathura-0.3.8.ebuild 1415 BLAKE2B 6972a811ea161d0004e89abafb330cb75ee900e02d4420ca0b31cd048f6ad9982676d1d1fe757c35dbbed2ef3c65b6e3a2090fd87278d0a060b909f97512ad54 SHA512 4779dfe9077ac2aa51815fb99026a88a877a5e3333732cfbbe07f8d926c6cfdd9c5fbc5f45854559308db56869c7e53e65a5f10b706b626d936315f14b3f16f3
+EBUILD zathura-9999.ebuild 1412 BLAKE2B 5f304234d4918670a7a4750a18e823998e464f1e853bd2a426d9bb683799b2d10a8c91aa1c72b8d6e0070573e45c639291f847cd0564f3977860ddf3e04f8e7c SHA512 f3d639e1dbf2cd2d4c998ae69ef6518c50ec1ba8d6944796cc4394d77e4974c2726529f9b019ce54816264921ec88a148ec0f23241fb729e5c0d58fb25bfd15e
+MISC metadata.xml 823 BLAKE2B 745fba701ca26b7b430c8b55393ef77dae3175068b0afebcd6e2b3a9ac90823e542734464e4c1852e1306963c06663d13a507b6dc4967b54cdcc12c117046f81 SHA512 4bf7d56010d989c286976ece526874abbeb90449d940d4ff550f5c084ded0e028998c7b021fc2e3015ebf202d43a5d35fa9b4e8083d6eeadfb9c2915cbbeaa87
diff --git a/app-text/zathura/files/zathura-0.3.7-tests.patch b/app-text/zathura/files/zathura-0.3.7-tests.patch
new file mode 100644
index 000000000000..77321445c6a6
--- /dev/null
+++ b/app-text/zathura/files/zathura-0.3.7-tests.patch
@@ -0,0 +1,24 @@
+--- zathura-0.3.7/tests/Makefile
++++ zathura-0.3.7/tests/Makefile
+@@ -7,7 +7,11 @@
+ include config.mk
+ 
+ PROJECT = tests
+-SOURCE  = tests.c $(wildcard test_*.c)
++ifneq (${WITH_SQLITE},0)
++	SOURCE  = tests.c $(wildcard test_*.c)
++else
++	SOURCE  = $(filter-out database-sqlite.c,tests.c $(wildcard test_*.c))
++endif
+ OBJECTS       = $(addprefix ${BUILDDIR_RELEASE}/,${SOURCE:.c=.o})
+ OBJECTS_DEBUG = $(addprefix ${BUILDDIR_DEBUG}/,${SOURCE:.c=.o})
+ OBJECTS_GCOV  = $(addprefix ${BUILDDIR_GCOV}/,${SOURCE:.c=.o})
+@@ -23,8 +27,6 @@
+ INCS     += $(SQLITE_INC)
+ LIBS     += $(SQLITE_LIB)
+ CPPFLAGS += -DWITH_SQLITE
+-else
+-SOURCE = $(filter-out database-sqlite.c,$(OSOURCE))
+ endif
+ 
+ ifneq ($(WITH_MAGIC),0)
diff --git a/app-text/zathura/metadata.xml b/app-text/zathura/metadata.xml
new file mode 100644
index 000000000000..10adea682545
--- /dev/null
+++ b/app-text/zathura/metadata.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>xmw@gentoo.org</email>
+		<name>Michael Weber</name>
+	</maintainer>
+	<use>
+		<flag name="magic">Use libmagic to determine mimetypes</flag>
+		<flag name="synctex">Use libsynctex to get latex codeline from pdf</flag>
+	</use>
+	<upstream>
+		<maintainer status="active">
+			<email>mlq@pwmt.org</email>
+			<name>Moritz Lipp</name>
+		</maintainer>
+		<maintainer status="active">
+			<email>sebastian+dev@ramacher.at</email>
+			<name>Sebastian Ramacher</name>
+		</maintainer>
+		<changelog>http://pwmt.org/projects/zathura/download/</changelog>
+		<doc lang="en">http://pwmt.org/projects/zathura/</doc>
+		<bugs-to>http://bugs.pwmt.org/</bugs-to>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/zathura/zathura-0.3.7.ebuild b/app-text/zathura/zathura-0.3.7.ebuild
new file mode 100644
index 000000000000..8281cf21819d
--- /dev/null
+++ b/app-text/zathura/zathura-0.3.7.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils multilib toolchain-funcs virtualx xdg-utils
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura.git"
+	EGIT_BRANCH="develop"
+else
+	KEYWORDS="amd64 arm x86 ~amd64-linux ~x86-linux"
+	SRC_URI="http://pwmt.org/projects/${PN}/download/${P}.tar.gz"
+fi
+
+DESCRIPTION="A highly customizable and functional document viewer"
+HOMEPAGE="http://pwmt.org/projects/zathura/"
+
+LICENSE="ZLIB"
+SLOT="0"
+IUSE="+magic sqlite synctex test"
+
+RDEPEND=">=dev-libs/girara-0.2.7:3=
+	>=dev-libs/glib-2.32:2=
+	x11-libs/cairo:=
+	>=x11-libs/gtk+-3.6:3
+	magic? ( sys-apps/file:= )
+	sqlite? ( dev-db/sqlite:3= )
+	synctex? ( >=app-text/texlive-core-2015 )"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig
+	test? ( dev-libs/check )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-tests.patch
+
+	epatch_user
+}
+
+src_configure() {
+	myzathuraconf=(
+		WITH_MAGIC=$(usex magic 1 0)
+		WITH_SQLITE=$(usex sqlite 1 0)
+		WITH_SYNCTEX=$(usex synctex 1 0)
+		PREFIX="${EPREFIX}"/usr
+		LIBDIR='${PREFIX}'/$(get_libdir)
+		CC="$(tc-getCC)"
+		SFLAGS=''
+		VERBOSE=1
+		DESTDIR="${D}"
+	)
+}
+
+src_compile() {
+	emake "${myzathuraconf[@]}"
+}
+
+src_test() {
+	Xemake "${myzathuraconf[@]}" test
+}
+
+src_install() {
+	emake "${myzathuraconf[@]}" install
+	dodoc AUTHORS
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/app-text/zathura/zathura-0.3.8.ebuild b/app-text/zathura/zathura-0.3.8.ebuild
new file mode 100644
index 000000000000..ea705b8b5a89
--- /dev/null
+++ b/app-text/zathura/zathura-0.3.8.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils multilib toolchain-funcs virtualx xdg-utils
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura.git"
+	EGIT_BRANCH="develop"
+else
+	KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
+	SRC_URI="http://pwmt.org/projects/${PN}/download/${P}.tar.gz"
+fi
+
+DESCRIPTION="A highly customizable and functional document viewer"
+HOMEPAGE="http://pwmt.org/projects/zathura/"
+
+LICENSE="ZLIB"
+SLOT="0"
+IUSE="+magic sqlite synctex test"
+
+RDEPEND=">=dev-libs/girara-0.2.8:3=
+	>=dev-libs/glib-2.32:2=
+	x11-libs/cairo:=
+	>=x11-libs/gtk+-3.6:3
+	magic? ( sys-apps/file:= )
+	sqlite? ( dev-db/sqlite:3= )
+	synctex? ( >=app-text/texlive-core-2015 )"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig
+	test? ( dev-libs/check )"
+
+src_configure() {
+	myzathuraconf=(
+		WITH_MAGIC=$(usex magic 1 0)
+		WITH_SQLITE=$(usex sqlite 1 0)
+		WITH_SYNCTEX=$(usex synctex 1 0)
+		PREFIX="${EPREFIX}"/usr
+		LIBDIR='${PREFIX}'/$(get_libdir)
+		CC="$(tc-getCC)"
+		SFLAGS=''
+		VERBOSE=1
+		DESTDIR="${D}"
+	)
+}
+
+src_compile() {
+	emake "${myzathuraconf[@]}"
+}
+
+src_test() {
+	virtx emake "${myzathuraconf[@]}" test
+}
+
+src_install() {
+	emake "${myzathuraconf[@]}" install
+	dodoc AUTHORS
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/app-text/zathura/zathura-9999.ebuild b/app-text/zathura/zathura-9999.ebuild
new file mode 100644
index 000000000000..70f20b7aed63
--- /dev/null
+++ b/app-text/zathura/zathura-9999.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils multilib toolchain-funcs virtualx xdg-utils
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura.git"
+	EGIT_BRANCH="develop"
+else
+	KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+	SRC_URI="http://pwmt.org/projects/${PN}/download/${P}.tar.gz"
+fi
+
+DESCRIPTION="A highly customizable and functional document viewer"
+HOMEPAGE="http://pwmt.org/projects/zathura/"
+
+LICENSE="ZLIB"
+SLOT="0"
+IUSE="+magic sqlite synctex test"
+
+RDEPEND=">=dev-libs/girara-0.2.7:3=
+	>=dev-libs/glib-2.32:2=
+	x11-libs/cairo:=
+	>=x11-libs/gtk+-3.6:3
+	magic? ( sys-apps/file:= )
+	sqlite? ( dev-db/sqlite:3= )
+	synctex? ( >=app-text/texlive-core-2015 )"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig
+	test? ( dev-libs/check )"
+
+src_configure() {
+	myzathuraconf=(
+		WITH_MAGIC=$(usex magic 1 0)
+		WITH_SQLITE=$(usex sqlite 1 0)
+		WITH_SYNCTEX=$(usex synctex 1 0)
+		PREFIX="${EPREFIX}"/usr
+		LIBDIR='${PREFIX}'/$(get_libdir)
+		CC="$(tc-getCC)"
+		SFLAGS=''
+		VERBOSE=1
+		DESTDIR="${D}"
+	)
+}
+
+src_compile() {
+	emake "${myzathuraconf[@]}"
+}
+
+src_test() {
+	Xemake "${myzathuraconf[@]}" test
+}
+
+src_install() {
+	emake "${myzathuraconf[@]}" install
+	dodoc AUTHORS
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}