reinit the tree, so we can have metadata

1602 files changed, 57422 insertions, 0 deletions

diff --git a/app-text/XML-Schema-learner/Manifest b/app-text/XML-Schema-learner/Manifest
new file mode 100644
index 000000000000..f1dbe67cdd88
--- /dev/null
+++ b/app-text/XML-Schema-learner/Manifest
@@ -0,0 +1,5 @@
+DIST XML-Schema-learner-1.0.1.tar.gz 51057 SHA256 79e9416db683fee9463ba895283423661e05aa8de2b15c9ea2372c83110ab011 SHA512 f357c1a99ac6a7f807538910dfe5e19b14f789046816d333cb031addfbffc0858fd5641f52dcd7304417d0cf0b6c45d1eb3f2092652c4891c09fc45dd26feb9d WHIRLPOOL 810a51fa5920d46f96e82d018c95e9524dfc85b433fd1579f90a7ff241e6300dc88f166725e68f58a0aac1658fc92ba374da03e3995ed22ba08da23e6003df43
+EBUILD XML-Schema-learner-1.0.1.ebuild 990 SHA256 ab9ed2e82316867ba6fe56b356bda9008fd4c6f8dc413cb5e04f7965c918776a SHA512 578bb825228e78d83617ec19bd72def2443b3c39b00da1982aec26c0cdcd19e89e1bd792c406854044394cd4f2405ce7815960a63871f611ed4fe99f9fb4c621 WHIRLPOOL 52a79fb235053d21139fd76e86b7cdb4f59878eec5de55c3833868e655c989c16db8002bf81b41f1c34f88840efc611f75fca76dd67dcaf3197fcd5cab486a7d
+MISC ChangeLog 2427 SHA256 b4d974c7489286e1573da18c7d9a8a31b73db44070c1a17fc7ac3a7382c22c09 SHA512 900948e0cfd29eb323a7a5d2507f9c08a057a0dd06a030f17396d8111a50c98859c743fdd96eb4e34f45a55405ae7164f40f2eee2cb1f4b9fe1da0733f93988c WHIRLPOOL 564f1fd56970a9641826f32f09d65c9cbc60aeb49e95eea2a5074500f0f3b4031351e3c34019cc8472596202b48e73cd2bc9bb8aadc82811ca7c8610470b8fdc
+MISC ChangeLog-2015 1552 SHA256 e819a35f687a0841adac43660e625a1367b0ecfecb132ba9fd92b42f7504b3eb SHA512 183f116b77a06e2c5a3f4c56b704b836b41eb4802d2fcaa0e75098fa2f8bee1bff0eec79d34b1ce6a3f8adf09544a770860fbe706d09fb798fc63f00962e0001 WHIRLPOOL 7de57aab43d8e058ff441dd22e419ccd7748eec82fc19af4964bb48087cea2c8e66aafb9962769e5e1dc0895bf603e66035302ac6ea4f8511e13bd7f50d49f21
+MISC metadata.xml 942 SHA256 9b2f58fa129255110e5877b387f34afcb092d678cd3498cacb8d18b003ed0d9f SHA512 48e0d860bbede84a76773ad1a77620cdee393eb0894f63461371ae7cb12a43fa0b640bb2dee17eb3eeb22fbe24899c90da704a74f70075e722e83f5d0be86bb2 WHIRLPOOL 66e8bd2d9c2df4aa90224ccec086e984b0c715fe188bba068bd0358e48d4aec9c9c7584c01d3e52a0319eb0d64041d9cf981683186c7b0f24ab9a8d6cf890865
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/Manifest b/app-text/a2ps/Manifest
new file mode 100644
index 000000000000..fe0648b0125f
--- /dev/null
+++ b/app-text/a2ps/Manifest
@@ -0,0 +1,21 @@
+AUX 50a2ps-gentoo.el 218 SHA256 421f04aba83fc2fdf02230a86d940bae039206473cb070f2cdd78b0d0725d9e3 SHA512 d1696581767c62903ea24cc7ffec2f25c30b64a0a7aa76d22e8a1872c5ea9b1aaa0f88f7ce24b1ee57f3da57bd3eaa36f2c5fd388437ce9a935bd82912075269 WHIRLPOOL 2a807602fcc08d914fd22f3cc77b16767a1b6303ddaa9802613c0df3bdcced07c225a65ac33808af0a3b2669601ebf3eb18f8976a587b6b969c6baf0c44c5fe0
+AUX a2ps-4.13-manpage-chmod.patch 461 SHA256 032c4698c1dabb1a72978b9aefef7a8895098fb5a7e46e81d861fedfef3b11ab SHA512 f3dc2698ee989928b3179b65b01bf12d828f4428bd860f6f1a3811daaa9d6256b353c2acb5cd4bf392dd89b040f8e9c15420ab4373f3d54b8b60652aaf23f864 WHIRLPOOL d94998e5a7bbbdd6fc4ccccbb6701b25c25ff4fd90a8619c7ddca954053f44c540d3d7756a8165c62889a63015b7c96fa9b5c5b384d078b4ce9f8e83b8d8ce5f
+AUX a2ps-4.13-stdout.diff 462 SHA256 bde80a714f5de1221ec828cf0f33859561510190e97b08f4ba62ab41ad26fc74 SHA512 61be8be21b08f39b0a7509bb96f67139165421baaaa20968ec54f9df37d5b8c355f06bc76513ed10c8c7d61608ed766ed28d4498211dff285d6b381aaf2454dc WHIRLPOOL 2213de93347dae7e2350c4932f3556a5d8cc198d64c7ac245de6328ef97e2e291fc83e086428d487450aee5ba92e5f738aee65a40987e4af088bc6d207b1b0e0
+AUX a2ps-4.13c-emacs.patch 442 SHA256 943739a788db47f10942477754f42c8c9b22cdaad4463bea4103c31a330de76a SHA512 0ef1a215ecb757e249c4d4bdf9a789419c6cd433f7e330783fef13a0158c57c5c5e6a22526d8abcca0919bdb1dc08337869fdd3f0fe192284ca087eafad322a3 WHIRLPOOL 2e204b9aed61c118f699f3434e6d6679564c8cd9ce7079be7b020a78813be27e1212293a39216ab0519ac34dc5eda30999836a7af202fa37b27a2abe9288198d
+AUX a2ps-4.13c-fnmatch-replacement.patch 1500 SHA256 5d1b8a8791fa2a36c23f43ef153a724cce1f8eec8fb92ab886f52fae7f8f3be3 SHA512 5509ae1277ff1f1f487fb106ed6673eb67fa7d1531a35bfa087f78a0bdb4dc0bf38c69b7fab95161a19406fc1acaef09b22b8a05ef603c6d43a8d7a8c3077b56 WHIRLPOOL c08ae041456250152d1355a09ec2b253da6637d67d7834ade169550903132c44345647ceefeef7a4bb2168504752b1b5b6a88d15e8f395bb9b1ed618c1e98286
+AUX a2ps-4.13c-locale-gentoo.diff 981 SHA256 2878415235a2d23231e4295fba1adf0435ddcc539394f7ebe49cf23fdf76ec29 SHA512 56800ba839e04a89088c130df9676595cbcdfa15fb1853eb85560e9d529e93d6db4b5813375ede8cf82aa8b0fd51f81f5f080e2c5d38dc1a7739a8e62e0ab997 WHIRLPOOL 618928fad266cbb3335a9408a78c30fd62a87596631f8e316e35db5d219e11ada62096db7f000db80ca963bb6695441f54781ab6a8c4bb71ef64ef458d81ba03
+AUX a2ps-4.14-CVE-2001-1593.patch 1728 SHA256 fb851a9deaea3309ccdd1429671eb20082ca4ad44628a53588a1e9f65f7729cd SHA512 1c83de1a53ed224ad5793041210023fb706ceb901c43ca0a7f8cb392500922851a8d25887ad5983a45fa9ec0bee2f41870134340c16544f3c1e7ff93c7e48c1f WHIRLPOOL 3cb33289d3d9cb6ae65c47398a012a99ea8a56dfbcd3dcaddb6a80197d4eb9d237e0ff3623d05275d97a6d60895b366062291487f68fcc7d0cdda68cab753ea1
+AUX a2ps-4.14-CVE-2014-0466.patch 1489 SHA256 3f594f07babe32ff0ec9fd8e2b609f9a01426b7fabc2c6ceb265f10fd2c7c449 SHA512 b978261dfbe63fe2b2f66123d1fa1dfb33949f7902636fa23b0b8b299d779e5a494483b052f25039db81e9156fc2aeb2d6be4d56ddf0572f7bc0361ade9111fa WHIRLPOOL f71e2414744a8b6d75def08bc2798ce57151a1051a2216e1bc4fcb10716b15e40ec241662e51ab913c72f0d5cce2ffded32f5c5913d05ad8eca4bc0dc6eeb9a8
+AUX a2ps-4.14-check-mempcpy.patch 514 SHA256 7ec2164888d1621a8406d431ed3accd137ec8f92e0ca885175bc1c17010519a1 SHA512 6835f5e9205cb549da52c4a3c13aad601c9e9d294f0f35ebe4d8cc6f8bd8b5f6fe77b857f8c92f552a43c02eb6de812021c078ce597c319bde176f0e91cd167b WHIRLPOOL 00a2fdc4c2267d6b9548c7c908387d544ee5a8579453b3974ef54cdc44df9f382db764cd098949765002b7bde79005088a460ed690d3cea20c62f5e8d749045e
+AUX a2ps-4.14-cleanup.patch 2633 SHA256 5c9285a014a8e57066978b93afbdafdd47d11ed01afaa7c15af4f20c8d2b991c SHA512 07afbf25203c6eacb92ab8c32fa6b913a832163a03fcd47c163cf3bdfd0cf07efd960342005fd7923108b978bc0395919c7f70e048d547b4bc5c083eed86a1f3 WHIRLPOOL ccdba46c3f562d102b7abf66e2f0eef334fffe4e19aa86097cde21ede3b05a217cac1c78b098d739209fffab6a6ea9b63622b2bd122ebc9f7c22c1991387d544
+AUX a2ps-4.14-fix-stpcpy-proto.patch 436 SHA256 3707120fbbbd8306f01fec785c18b9fa2eee02ec689cde5ad251a9337af6573e SHA512 439af060da55d93e8fa6962f7b77c292e47b1a39d987c35010edd52f0ebf360337b5bd29fd134d4d4ab8333187672e7ae97c2d0259c706e38a2cf9d719dcf7bb WHIRLPOOL 886d71fc29fc02d8e8dde050108f4e9b59ece6af2d723a7ba0377dfe1730e3ac6543f02b395b250ee2672e0bf56cb1f4818dbcc52f2c17103f0f1d6c3583d750
+AUX a2ps-4.14-ja-cleanup.patch 3210 SHA256 f2d4ff66d3d908d65a2ce4dd69bceb933d6b02a6141996eae80f00dad389e68b SHA512 1a2ce34b5b0bc79bf269fe171c64bcdef0a87bf4efa8508eee851228a1483efce9c8945a17def7abc4cdfe2f1f8611d63995d98099e290d06fb1be430350b778 WHIRLPOOL f085bc34785e8a1ce9a6d65418d8031032c977530a1efae777c88a1bc2598a376197afe453a4f0bf3d3d7fcb9c4473247cf565cf8c3ccd6e3ff97116a2ed44ba
+AUX a2ps-4.14-psset.patch 616 SHA256 8525836efb9ba5db025b013e0262912ccabc77773307a8b79da6ec1f7444a9e3 SHA512 3118d91519c81e5e9f46a5386e9db757936231e71047ba8579b3d969a7c824bad6325b54221a61a0b171bb87669b548704a068bc71a1cd3b48d3a32416fe0c0f WHIRLPOOL 86eb4c5a06c07a7acea062f7c49b3deb9866569bda3d07382684859575d84978fb6677e9210dc0fa99a42b2908b9f14e434e349e69a0797c88f96d6539df19fe
+AUX a2ps-4.14-ptrdiff_t.patch 367 SHA256 09fa3327d064f3246103894b8abbbea2c7b0d2446080a4b5c9cd0510b9efd6d0 SHA512 b9ebff895614a20b8f9e891ce53cf0f7ec38452619f7e907deadff22840a019737dd129690f5ffec91f7f798ae03bd0c7c62f1aa751589865f589362825038c5 WHIRLPOOL 35adb3bfadb7e2601138df84757aa5111580aa70b4347661c237755bc29108739d570b0bee7c626f57bcb7278b05266bdcd4e7113ade633c96dda30014bcb221
+AUX a2ps-4.14-texinfo-5.x.patch 5996 SHA256 a6e97e23d6af0bb30221f13c4d3aa2f25107902bcd568667cd84423ea66b812a SHA512 1e93a21cda8547a49d09e429c8ffed23b68e7f7555fa356f615bc76eef059a0065cc71e62bb4f1a1239aaf140796195c7d264c5c884e1a89516facbdbcb955d9 WHIRLPOOL 3a26e722a0c80b7377113b3c1e114b2d9b5b8a8cc5431debc7539e35b2ed44d7260c1b4d7bc827df431987ac1c0375f9e11a4a9f0fa21231540dcdd06d072891
+DIST a2ps-4.14-ja_nls.patch.gz 27576 SHA256 90b2a4caf680f04ac8c325a4bc7434edf038ef7059003179b7fa65a5bafdecdc SHA512 f02f553dd9d9dbd9dfe41ebfe103493000aa4e9de5634c94e7453f73b66d88fea6b0010095913a4a99c7285990a1df1ebcc39da451b2b34f96b0c191112b125f WHIRLPOOL 38a532bc7f696cf3a1addc502b6ad2d26ed4222b770b0e9fc4633fc81cad911df7e64781516a84cdc589965d12d51142c0a06980be7211b0a6d9bf279a11d55e
+DIST a2ps-4.14.tar.gz 2552507 SHA256 f3ae8d3d4564a41b6e2a21f237d2f2b104f48108591e8b83497500182a3ab3a4 SHA512 fd6ac8ab47d789114c283e8ca508f7f56feabd1a189f4ac772cad9e6be7e3791e210892cfffd04ad1d39efe4b15386b2e61bf4cd56b70ed581c0554f36bfe06f WHIRLPOOL f0e445b760e0fdee031c9b8204430880f8e46d0eee2b580bec0dca35564818b7a8925b5941346c008a5ef32dedc28768b43f0e58f3a0e71f289bf593e5325e8d
+EBUILD a2ps-4.14-r6.ebuild 3607 SHA256 d92c48f94ddd40ec56db547bdb3d908973b9bf5e21996497db4dbbeaf5d10013 SHA512 6dc1bad592bade03497dc0c3ab5deeb8b826d280e58652d6f10b42d0068fb4370b35c1567954ba4a443ef8b6934a764195d31b602d97f49e56b6009168e30c6e WHIRLPOOL ab7f4bc923b48c9808633df740523a3936f66b7a6a36760f20555153b20d80e82179500a4e28c933376d3a0e73a3427f8327bf53ba7a4598377871ddfca8746a
+MISC ChangeLog 4840 SHA256 8313c8765c0bdc1336b1d11dd97eb1c3bcbb7c48c9166171b33beef0df7022e0 SHA512 f1c38db6bb4219a0fa203f359a04fd6db849078cab012d26009c700b6591d7c21b6d641f5d11053d63817b8ecf32a07a4b9e247c64b32b81e13d8dd592328377 WHIRLPOOL b9f27c8e4963957577082687c01ad3b6dc78de3ec706220f85805f3e996cb108ffd86bfba99ab54dbbdba08532e2bd65c5d065c3ef322ae2571aae0a5e256d77
+MISC ChangeLog-2015 16680 SHA256 8530f4e5cab8f395ffcdec58819b9c017a17b61f46087b11344c3bfa895f5791 SHA512 3261ea7bf1f2314b6827b17b3d25b69774c82fcab0feec067229ad97711a1dc40e5f230168dfa749a507dc1723b7d33c39ca9d5a3764faf09fa25399e7c5883f WHIRLPOOL f1e0f749712dd7e572460ad6b80ab2356264c27d3773cb55157f8fea29d3129cae3b476a06572decba83137fc35b37563adc50b2301f88359cd7bca259077b78
+MISC metadata.xml 346 SHA256 079a4260f6086ae918b04c03bfb20d6cea5ae7820dccb218a5d5a0d0235e2f5a SHA512 0973b9c922d40a291ad52b590c40ef122167070e2f3c2c30980a83188bf8ed8742d825542ca1ea88139fd7ceb0e251f91dff13822ffbec4c9a6af2ea2b7a0010 WHIRLPOOL 683929c1e3611b5405f7a41f42941d5318ce68ba60c46586b05299daf7e6037bdde4dcfbbb995ed69a2a203532027825b00e798dca751e1221d1700d1b0662fe
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..0094fa4318f0
--- /dev/null
+++ b/app-text/a2ps/a2ps-4.14-r6.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2017 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
+	linguas_ja? ( 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="emacs latex linguas_ja 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 linguas_ja; 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/Manifest b/app-text/active-dvi/Manifest
new file mode 100644
index 000000000000..a4e36e3d2226
--- /dev/null
+++ b/app-text/active-dvi/Manifest
@@ -0,0 +1,6 @@
+AUX active-dvi-1.9-htmlcflags.patch 464 SHA256 f1b8f95294d9bbc0a5918f1dc28bcabc12edb166894c985826bdb51de759bd03 SHA512 994e7310097baececcb2f028041e66c6fb36e33a8fc6761ab2a73fb3c0d32999b92bdfdcc784366bf8f291070a5c5cc53ded072d7a562e2bdb8f559a21151d03 WHIRLPOOL e1daca72b5a5d767637a87404656b9579efbbfe1387885705d6e8f7662173d31da52f860cb086f8ee399554d7530554ff057a23d085802378266d8ef142e5ba3
+DIST advi-1.10.2.tar.gz 9772060 SHA256 01556d20896db57c1d05961b2dd48a44d2fbca2adb10d4a9ded732bcf6cb0cc6 SHA512 93479e22261019b571bc331604a659e4e58200284bcdd63929b2c7ab07f8e9fabbd120f8876081a36e7e09e08286eeba9a45f3b077b545a9e404060622ec45c8 WHIRLPOOL 007d4e59c615deeeef0979dff8aca6aa1e088b1542de9076cd2a7f4c4e593a68110249f660c17e50ff25ef20eba5067d1640713fd7c9f44ead19e269c5a8bb47
+EBUILD active-dvi-1.10.2-r1.ebuild 1606 SHA256 1f5a8a22d48094779395ef4577dcbc5a49850b67731269a2fa9efe21f4aeb9e3 SHA512 f8db3a564f89e54ed70ce574ed33fe496e596ee29eec021192717f7d9ab1b5132cb201a50cd464aa9769ee8f31f1320ad66dd72a2f7f25ec5fb7b00feb3ba4c3 WHIRLPOOL c6f1707089869b173b859bc4d59a6beda92554c527313092aaae31325b2ae0567e61a05a8c142a65ada1f8667f86677ea6ba50a59cd1d33bd6855b1e034f3b4e
+MISC ChangeLog 2672 SHA256 bb05242a0e3c21014554730a1f4603de93d72e481dedf065ec71c03e812a8c76 SHA512 60495c9d2ac8fbf22b9220238e1b15f0fca31b64d7d37a3212772ec20a8c6cfd2af293291299976d3e9db716a234b0bbbadff96359b937f4740e46bad820a6eb WHIRLPOOL 14548c5d452c8ead52e7d8686ea60b66eb64eb18cc048c43a1d2cb83cf3a350f4ccdb6c68c1e9159527024039d559a4696f813dade109a3d1fe2349ea7233863
+MISC ChangeLog-2015 7190 SHA256 13c014b379d23451820b217c3cf7f2ce11c9e837df7a02de53704901172e714a SHA512 3290ed2674b83ceef2866d5b725a860ec50ba39382d58b9d59ed73a6b6701762d5bd1445182cd6ce55a6f313359af7b04a35a059f6fc43052dce7085caf569b7 WHIRLPOOL 4682ac59b874209d1e6635ad50867717f29e58001cfc9d3a154b1ec51d243c98fc03894732ed168fc0540a83b9374d10d865a3a1adb92581978e8d00ccf0246d
+MISC metadata.xml 245 SHA256 b3de478821488be2cdc91b078e21c911dc384af882c5c44631a47dfa91516dc8 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690 WHIRLPOOL 701a78fc2214f5fd4bd781477f85e87e716b8d76ea831a0fa4afc8871c4286cc363679f1ff4f844555ad4f77cc7265208b83e805f56c22fc4baeed1062280c08
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..da5ecbb0bf95
--- /dev/null
+++ b/app-text/active-dvi/active-dvi-1.10.2-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2014 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-proto/xineramaproto
+	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/Manifest b/app-text/agrep/Manifest
new file mode 100644
index 000000000000..7652ac85085c
--- /dev/null
+++ b/app-text/agrep/Manifest
@@ -0,0 +1,5 @@
+DIST agrep-2.04.tar.Z 62351 SHA256 31275a2fee28fb8966e1978d26fe8113b61ce49b39e68ddf4cad3964db72d5f8 SHA512 4524250c2c0b309243fd245efb04fa8d867f45a92b0d977b29d2ff8ec99586c16c35b8a78cdd5aeb4c529fe0270c8b1220d6ddf52d947e6181a5f04bdbed5aee WHIRLPOOL a77870cb9b08512a847acf203d6b5ccad343a9b0bff107d8d768a9d5545c01ecccf860b0e35a9be82a46bbfc5718ba963145016dc8039ab3c157ba0a824316b0
+EBUILD agrep-2.04-r2.ebuild 767 SHA256 d8f56b0c49b2471469ee253855c7d8e7998766772b0a3c390a42d586046ec692 SHA512 7feeb33bf97fe3a6763afce7791979b6f8562e7a067523ace0ee3f9d8cc62e5250ff95795ea5cff38950ee026c3a3b137dd01aad2015a7bbee2147cc44e01cbc WHIRLPOOL 59ce0af9429c903dada1a968d6bc0cec64ebfe8ab682dff0d2502a13bc37cecca94d85fc84b1901584cef4c370a070de897d953dda20fde207043f85bcf971fa
+MISC ChangeLog 2655 SHA256 971d575539adcca20ac5d8ccb17f1e6c5dcc28de1970a0a1bb68eb1f417e7e3d SHA512 233d19f8a1fe6d7b6146bf0839148b46e2a00cf70cc921dc8ea9f5b90d322ed9d9332f268cc299aec5e07e90355bc2c9bd45b71fad0db11452a39ddc8b442fcc WHIRLPOOL 8f68955a9ea4ab45799a20191fe4dce639b010473623ee4738e3f6db38c8c6c38d5d75419b52725881546581a9930b606117735e0e2ff5064a700103cd488964
+MISC ChangeLog-2015 3124 SHA256 4c5c48cea794c79f6d64e6da96ecda85710ef2dcacfb5596290fd93d46b7a427 SHA512 116e90edace6ad83ed734d5cd1ebbf82db1e5600c0a19b9299643112d6f655afe4de436253c570ba4adae3b1bc5651118b5e20513e7a03d1e857f6e73d03a9c6 WHIRLPOOL 2610b68200252402d5118b43438e33095365ac97e373f8443741a560afb6d94db59c0d314b16b96bd5b2e37120d082a69508ce42d1e11048f66bbf8c183f38d1
+MISC metadata.xml 265 SHA256 5c4f9426c69dd2191012bf8aae1952f4f6298c1f6ff0ec1e45fe0e05327694e9 SHA512 176f814d8c555e8726f36e012367b698e8a19a0662982621029a7f9190beecc5e6798e43c51698dc149364966cdeff7061121e54fa9d4cf2a3559a6ce4904e25 WHIRLPOOL 2fa84a9f23f48e804ab20a6fabe2707f86227bded2a41d3af30958db5a69bc6276140a7f035a256caeca5a8b8ce1c240383c300a90fc4a83334c178769bc3519
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/Manifest b/app-text/aiksaurus/Manifest
new file mode 100644
index 000000000000..cbc2508648f4
--- /dev/null
+++ b/app-text/aiksaurus/Manifest
@@ -0,0 +1,6 @@
+AUX aiksaurus-1.2.1-gcc43.patch 734 SHA256 bfdd6a2d183da1753c507451141658b832712fdb99b67361b5d77ce2957c0431 SHA512 6f821ac66f0dd4601f84a6fe8f71b14712854e293f4ebc755a80d34032725cee61b919da1547b514e3d8b6a07edd29016ae53283a28f1792119ae99850016241 WHIRLPOOL c59149dc0a3f18462f4612deacab175cae8886ece4e8f57e7ae20c36bd6cc277166dd4f6dea6ebdc7ca5748cebce4e038d91dd4250b78400f2592b449cf90647
+DIST aiksaurus-1.2.1.tar.gz 928893 SHA256 1b62cb6351835217f3c229faba3182ba2aa0ab395849bb894dab422976dc8cf4 SHA512 48591850f28f1a8f4b4986df14090ef7bd57cbfbad739cb0013db021f6f5bcb3c592b38e36774735499e27b9e99330504f8d9c6022158e25469cbc81d13f7463 WHIRLPOOL 8cce9571658bf2419e4f05b01bc8bf7cf45dbca4c2d6a0bcfb458c9ee156940d97eab26fc496002307a145eec99f8b3d9ce0286823b04f16c476cbc23ff1d24a
+EBUILD aiksaurus-1.2.1.ebuild 894 SHA256 d35b8e076da82169b2906bd0da67d13a0ff708ed3f3b328aad77bbc319adc37a SHA512 1314ccb54ec11b65eac68eb753978633d7ff2479dbf65df3a335e4d4c9cf9f0bbbba25475990ee9522ae09c48bf0737487cba0f6b31e09e11dfd45dceb700a23 WHIRLPOOL de24e981bd0782396bfe9e95d809d2e58e86dd76bb9d810880ae0f82de8ce2f54bee2fe0e2196bcba52e03ad75d2c692fb91d8f64044cc3c62863b9a80746b56
+MISC ChangeLog 2854 SHA256 2b83d58c5a8e15780eb28269d77f4c1cce1e343b8c61f8ec0997fa6db3681ccf SHA512 96ec91f9636957473661aeda2b4509ea64a6cc70447a87a047cd19b93683b7515ddbd10463bed7d52c9fbb256f1d08b35cc26bc1abc8b1f04c50560d02a6e14e WHIRLPOOL e205294669492c0c5af985273567a2c05caaae8f33ea07a508d491d5d8fb09086e772ae821772829b0195645a8b08019a27837c476cdb6ce290558145e5735b3
+MISC ChangeLog-2015 4963 SHA256 b60a5fb283d9b443a39ee232d6bb7a5449bcc45b6ff96ccf0120e8e2f8a0d8c2 SHA512 a0b55898c52c1f8b3fdd56c377d0b140ce5ca86cf0c67a952bda1dd6bdeebbf9e1a7be3d9dd02245fa903bf79d412a4e53f42ce7a041b20799cd9f1f092aee9f WHIRLPOOL d9ea12825b22362a19b8f0b3159960c0cb4fbd7bc183ea37ce154c9bf102f0e549b10f104fd20256a66bf3bc23e9bfb900709f4cf4cca358e174f0ddbcff45ab
+MISC metadata.xml 245 SHA256 927a4d2833f76d0a1286d8cde78d6e6cb34d99560b597fa621740a0ea5cbb36a SHA512 34945e0950bf668d24db2565287fdd8484cccb8968df2efbcc665905ee583f45222fe0ff848c267cf9a25f58d3aae9e870656d88b1f813b7812a185782564e08 WHIRLPOOL ffe1c13a0d118cf199c8db4d1c5bd21a202534020eef3fbec3bb2aadde6158e6afab4251fa54c1c85c980844a0ec023771cc77a784413b3a4326e2ebf93e286c
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..d359b259e030
--- /dev/null
+++ b/app-text/aiksaurus/aiksaurus-1.2.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=2
+inherit flag-o-matic eutils 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 )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gcc43.patch #214248
+
+	# 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)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS README* ChangeLog
+}
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/Manifest b/app-text/an/Manifest
new file mode 100644
index 000000000000..a58b0261bfc5
--- /dev/null
+++ b/app-text/an/Manifest
@@ -0,0 +1,6 @@
+DIST an_1.2.orig.tar.xz 13196 SHA256 b925d57d80bd0d83b755f5b8d78e6d5bf05eb059ec84a7d8fbb77b18c73b17a5 SHA512 919c525aa1215e3c1b2200c6820a357c6406c19b7447147cc4243d339c554b9892bea11797769df0bf96dd72c89f61bf3d977769faf9bc7f9edf609a7daeac3d WHIRLPOOL 45f4f39a2560b5db5457ac352d7617d04667f3d3ca17cc6a91172fe479f537ac69723b9e47b2fadc8446b6bf20b81920beb61669370378239361333eeb2de7a1
+EBUILD an-1.2-r1.ebuild 770 SHA256 1c6f072c4b36a741741eed791a0badae94e1970e8b2e13ea79be0be82a36d2a0 SHA512 618ae33718d53a0702798933fe3ee2c14856f76aee53682ea60c2baddc7c28f4800753cdc1f61a21cc9097824716d1d2237291d306d6642fbdabd4755299b226 WHIRLPOOL 5b8999e463388370ba97452a33b9d7dc79b6c9e4da82df5246aef8686bd1724401444668d3520c119d0bcb84eba48108d3ace13514c8b90397c0f5b0124a0204
+EBUILD an-1.2.ebuild 719 SHA256 16a3827bcc749f3f914f50763de22156831e127aed80756dedea3e0d15431647 SHA512 774b56f85bc3d9812e5824551f83aebca3d08e34e0857030cca8b378f57ab5032d6a6f5f1f0bc6b766df0c2b825b0cf91e30d259e4f6fb772ad374cc4b447d1b WHIRLPOOL 602e003e9fccf3b603c5807b076a73c2ca238e0750c4414a347088e91420798879978250c781a9ed3103acbcb7635d3178c86a4376d79ae6fe008b90847c5914
+MISC ChangeLog 2550 SHA256 a740fc15fe19172d24c99496c567745a180f3480375516fc19e327295e1730da SHA512 7e51ef8be714cf23829ca353ba16dc76ea50dd2e77d80e14ff29d6ea413fd02d49a015c1f0b57935a55551375bdcf5c5161ba27a2f86e2127219d4494d9cd57f WHIRLPOOL b15257d06ebf9800c98e0b4a590b60c245b39d405224bf43a992fa68b412005dad98f0deabde3b5cd6faf59cd65de301cd19e8eee0f937502005ba98a89ae689
+MISC ChangeLog-2015 6278 SHA256 b8102bc4d877b2bcf5021811a1c06bb0416d2e1b6d55b033da40859023c75bab SHA512 149128b288771d30d8950f74b77fdbd28d620688fd278adb0c18ea217d005b90e57197ed34ec7bb026135c29bc92980cc9fe5a8d0f55bd7dd9b43b492258834c WHIRLPOOL 0157b0413e178c95eb407e7eed7c5055fa352753d8baae749591dba1ee95b78e80767eba7e5c7f526841815d33acd589e5557f0695d4f669ab838e07319ee2ed
+MISC metadata.xml 242 SHA256 2dd8816f3b3c6c2b406b58b4e8afe619429cfdfdbffde31cf1513aa89497f9d2 SHA512 01fa45ae0901d0f1bbae0a22f72b4c999c24b4718a0a1f7cf8db80ebb29c9a97903246e560ec7e5d5e6800f425b7e32172802206109e67545aa82b2fbac13cf9 WHIRLPOOL b2342fa2a6426a490ddece46c240f7d28c3deccbe179d287bfb7d5d6c47727800bcfe57832ce25052e8575d4851c363058a1f7e0288f4b3e6e0cde54e77fc09b
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/Manifest b/app-text/ansifilter/Manifest
new file mode 100644
index 000000000000..6911d010237c
--- /dev/null
+++ b/app-text/ansifilter/Manifest
@@ -0,0 +1,5 @@
+DIST ansifilter-2.8.1.tar.bz2 436461 SHA256 65556f76c234e709e9c3d326042e88a769ebf456c2fbbc5e32ffb247214fc6c6 SHA512 f736b1e9d975a17431a19c2a889ede1feab6b8967d6981fa08d4d1a541cdc1478258dbf6173b7d00f9aa476cf79cfd1c7321c9d017a8aa6ad7ac9133b33a0830 WHIRLPOOL 233edb50e9ed1e1116a1a5875bce4ddd197b9d0b5cadc490d07b3f0b62c9e0de28eba3ac8e06846f58d4cbb2359d621d268eeec19c2e0c894390ef7bd71ca1b8
+EBUILD ansifilter-2.8.1.ebuild 1000 SHA256 453018256c464c38120fa559167ea6b3b99aeeed636e88ab8add81517ab0013d SHA512 a409b86071066d8fab61c5b69b0c576e8210522b07741972898dde788a262138d44f4d28b4018ec1ef8a23adffcdb34ab6263045881cf4014c3bf366106f6ed5 WHIRLPOOL 5e5b4ece8d0001afd2a5f41f3b1a4b107bb25b124eb0dd92ff081a028807a234a1672b25283279a725ee3863dc300f26934aa4b2af447a35e359bc65aa47a62e
+MISC ChangeLog 3914 SHA256 31d678bc8197665b111ef9c4c3ef31132399ec229d72cf88ddb55dee9d0767a3 SHA512 f385b18086f957b0a7e89ed341fc5c988e8ef6337d654daf86d6652fc2a5b2fd9c74cfae84321038f8b6f41337ba8f3a7272e1581520b1cd9b94ca8ed260cf90 WHIRLPOOL fd70558b5f2d3f5089efe605f0eef4826c11f722bbefdaf01afb507e5f77457d6ddf794f022d855e343bf533a2062796b4a78a3290a1f8e8b38a132e07f0a3d4
+MISC ChangeLog-2015 1133 SHA256 6a7e93f7101c85027960746cb9b6c886ae2ee7a088107b1f0cdfe832dd3abd29 SHA512 ac7f0cc6d31c5c9ca1b92ea41c5c7fa3cfff05eea51d3623b5e3f7215fcd15a2ac2083c8458757e57ae48bc6cc5af012363db31c17d119c774a0edbace971922 WHIRLPOOL 504290a475df1a672e79564a5e526b9e7035480945507010d4d32688ab3149ab8036a9c45838c66376c750d1d458542a87ab7e137315066f2a38da857dbc206d
+MISC metadata.xml 221 SHA256 c73636a70f6ee6e176f71ac32048a002355627ef4f1181fb245c6c0eb39be8b8 SHA512 e50d6cad26239ebf4260f0cf4bdf4e29ef2038e999039adf94f49b184b5993f02bb0d4cdb3de6c7b5cda99890db42dcd2b65c5342256be50dc19e6aab2406353 WHIRLPOOL 8e35f4dca402d63d64baae4aba21722f8daccb3a61861a0b453cb355305fb29dc8e9d1e1760eb2f13d264502aaaafc37d15258338e97dbb4aea15239944f25d6
diff --git a/app-text/ansifilter/ansifilter-2.8.1.ebuild b/app-text/ansifilter/ansifilter-2.8.1.ebuild
new file mode 100644
index 000000000000..47881d0b8810
--- /dev/null
+++ b/app-text/ansifilter/ansifilter-2.8.1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2017 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/Manifest b/app-text/antiword/Manifest
new file mode 100644
index 000000000000..9fbf2e10079a
--- /dev/null
+++ b/app-text/antiword/Manifest
@@ -0,0 +1,7 @@
+AUX antiword-0.37-CVE-2014-8123.patch 528 SHA256 130ae28174bfb30d75755e0df55eab33ffc417173c493dc53405cdd47c2ce60c SHA512 412884a236abb5ee75e5c707581c7e0158614d0e168cd9a8fe02dd8dcb8c0963ae2269c9575cd9cb9f4876efb3bec6bef7934fec5c7738530012495637a2d694 WHIRLPOOL b676eb14c31dc6555cd303f42a1c30c84b1c7597ff0de4c28d69278c8d8f67791ca040b03392c73c2e6a785b5958fad60340fce35b89a76eeea3909714c17d28
+DIST antiword-0.37.tar.gz 317884 SHA256 8e2c000fcbc6d641b0e6ff95e13c846da3ff31097801e86702124a206888f5ac SHA512 6cd8fb9137238417544cf8754829a2d5296055d730ea62a8a025236baa79516190317d146401ff40cde73e1ee2c3c374a2ea01b2e5d24e149310bcabb8bfdce8 WHIRLPOOL 653299ddeba3c153651a664abe12d9c9960227289cfada037574d97dbb3a1a2bf958571815ce6995e38ce7a197714b1852a39aebae108986cb74e861e948c7e3
+DIST antiword-gentoo-patches-r2.tar.bz2 1747 SHA256 62de6106d47e80a5e890bfbe4d2c85c5c78022e196857a4fca035c7c035d583d SHA512 45ed3ee1c514a9ee78bc8963e56be18426b47ea628f02934dbcec83c2d632162e458f75f998da438daae4794fcce36fd8922a172804c0fc83c6f32c9a8092ffe WHIRLPOOL e3a578c1bb082378f0db480aaab640f56f53e23fb35416a04e06803a8fdbd0193f0fbe33cce074dad00d13feada2bc97ce62dae460123047bbe80cd49994b445
+EBUILD antiword-0.37-r1.ebuild 1431 SHA256 e1700fe885c12607b441d31f7e54bcd97162a4989074d5a0268b60e68a20653c SHA512 fdc188c4658e1093e4f843711a1843da8e827f1c737a627e54000bb3b4d16827eb828c52019b64adaca2fcfb20e6f57b29271f8d7c21241fc7fd9878c0204585 WHIRLPOOL 8013bdf71acad70492ec0a9c74794f778cebcd968f063fc72f193de296ccc3b939e2837c69a81e630cfa7532bf59a926701cad96a8159b43a927af96c3386286
+MISC ChangeLog 3228 SHA256 c0bbe8592fe9632f23a9fe4796f5381a91ee9b2de2ddb20c2381bf78955a3672 SHA512 961d0d5f2245b924203a6c459c70246ff9c97265f2b6646ed196bcc9a011f989ee8c4f19f87c2daaea5dd12b004daf3dc7e28097d5f5461ac83f921e538741ae WHIRLPOOL 828ea80e1a5460c9b6ef60ed98b50b607e9827c9e9b42b703d080821004054a31bde16555103d3e3bd5b2b834c97ded630809e583c45704575710e6da4ed4f2b
+MISC ChangeLog-2015 7639 SHA256 72b84b5a396d6611ff98c5f592d2ffe5092f879c8eb0e86a263326b54e52de2b SHA512 5b9e92a8b4ade62db21ab76e5141483bb8028663608d4a54ccff439c254cb98b5b50ede2c0361a56ba6300cb440f9a7ff1542c909ce19df27d423e8dfc2b2c85 WHIRLPOOL f19a682a47c6fb4342409c0b2e8117184a14fb4db552bfbf497edb69f39a64ee195be4d2a80056e772350d532655483cd6a194b35cafcb1ea05a2a7df1095b6a
+MISC metadata.xml 646 SHA256 49743c55af4012113a52ebff24f576dad1d7af6c3e09e7c92f51f1f690478585 SHA512 0959f670bfca8a2d2cba2783fb0d9a9a7102faaa1220e7dc304f709e4cf15132ebbc5c764836c3c5becada9a3058b954d812f944dc3f0103ce0936caa4a804f8 WHIRLPOOL e1b9613c23319cf6f51721c7df1b3ddcb3fbe3541cbd2af8948ce47d4c4d7f6e3535a9794e0f33bec7576cd46236abc4ab149a7b1c4825e8f1f772a8c39935c5
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..cc6b77e7c645
--- /dev/null
+++ b/app-text/antiword/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>clabbe.montjoie@gmail.com</email>
+		<name>LABBE Corentin (Montjoie)</name>
+		<description>Maintainer. Assign bugs to him</description>
+	</maintainer>
+	<maintainer type="person">
+		<email>grobian@gentoo.org</email>
+		<name>Fabian Groffen</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:antiword_project:antiword</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/antixls/Manifest b/app-text/antixls/Manifest
new file mode 100644
index 000000000000..cda9a5e9c0a0
--- /dev/null
+++ b/app-text/antixls/Manifest
@@ -0,0 +1,5 @@
+DIST antixls-0.3b.perl 4627 SHA256 e08aa669251e215e00769acdfb188071b384cb6be4deb10c7bdc9223b95b6399 SHA512 7e6a6ce26ea8134ee35bab55da73fefc1b211bb58b52468e012abb3ddd0688afea5f3b87b9de49bdb0daff1b6d79b02d4cd6bc2b045a88ff7dc557610ac6fd7f WHIRLPOOL 79da24a5c569b332922eecbf558f4339b426ab38b8d414b3e3bcfd94d2dc42c4e2f8826be592e1ad6a2fbb4acaf286aa5a02d695d4dee93efc69b62e42f891a7
+EBUILD antixls-0.3b.ebuild 521 SHA256 bac90ebfe724f47a2515222c599487ada0af571da25e5ac7927afccd3b5dc4af SHA512 0a9c3b42f7eb96778d62c8779981728bea08cbc24b4558321fccedc580b27566ee419693f943b47a0f579e47edfc9c608dc2c0c01c5e56aef516f2bf4c8ee4e5 WHIRLPOOL 82d1f0edd48c7083f1b295841bc33b8da3ee1859752ed1e4b8a2f082febc05422cf87ffb238df639ba362aa10f160f0abe0b3d7e1b9f2e3471d08d77fe7f6119
+MISC ChangeLog 2520 SHA256 abfebbff4f96d86ffbcc417207510670357a1fe7a00236daf89194c726d7eb9e SHA512 5c4171e902fe070cb2c2fc479a0f3606b0ff3f6fb78cf04fb45da0cffc847280efd4436ac03fe6b9c742fba143e453a0b7820d98813cb7fec113e73db626141d WHIRLPOOL 5b181e27c958cba02a7ada17f8bec1412a8c81cdbcaa56ada4041ab96a527a7bb1d89bfc45baec2f929a5d76751143ae73baa0e2cee0f302f50536ecdae14974
+MISC ChangeLog-2015 1361 SHA256 3dd9667a2c8563b1f404020451ddaa33f219a68584271f2dbc5ece2e6801acac SHA512 fd76acd948a133b8143b5de84945a5590345e192f73574f445cd0824cc686babbe76b242357a56fc8f0bcf895a77000e3ddb79a2f1572399640ab7c9bb1b7215 WHIRLPOOL fa8747d763a7e875c1f073632dd74c58dfb8d034e4a21c47f6419cf1ede25b65ce0c544613a800f1a13fa6469aa209ee323fc8bd4fcc9c4ab2132d2b9ddacd9c
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/app-text/antixls/antixls-0.3b.ebuild b/app-text/antixls/antixls-0.3b.ebuild
new file mode 100644
index 000000000000..14a98632b593
--- /dev/null
+++ b/app-text/antixls/antixls-0.3b.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+DESCRIPTION="Print out an XLS file with minimal formatting, or extract the data into CSV"
+HOMEPAGE="http://www.af0.net/~dan/?antixls"
+SRC_URI="http://www.af0.net/~dan/repos/${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"
+
+src_install() {
+	mv "${DISTDIR}/${P}.perl" ${PN}
+	dobin ${PN}
+}
diff --git a/app-text/antixls/metadata.xml b/app-text/antixls/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-text/antixls/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/apvlv/Manifest b/app-text/apvlv/Manifest
new file mode 100644
index 000000000000..13cefc568b3f
--- /dev/null
+++ b/app-text/apvlv/Manifest
@@ -0,0 +1,7 @@
+AUX apvlv-0.1.5-cflags.patch 702 SHA256 00ddf6ecefa9eb34745e7fcb5262c5dcb574221262399897bfab58d1f7c1ca68 SHA512 de7842c8cb402f045240aa50bdf05a13c6e9a4bea099fc8c41f07329b330fbb98f6edc229f0bb78eec65b14ecfffe9240441387717024939c11b9a69cb65919f WHIRLPOOL 9a1b8efb0f11e2ac36e4a8a0f26eafe6e124582264a17d75f9549e73ff36abc64231fb3e3aa1f5cbf8a5cfb5be7ef2f2e0df3730464c60a8fd1686b7fe134553
+AUX apvlv-0.1.5-gcc6.patch 403 SHA256 69f28540aec5b287208d0c5e3755ab2eab483fc5d90316620d0ab523e51ae9f9 SHA512 f838fe6c601765e7d03ba83575aa5ffa2562d90e257832109ebe879b29d67228784c920ff7c9716010f10d2c36f4e873bc2425fc337857c437c6a19e6bd5e5f5 WHIRLPOOL 4e4f0d453f2a8a32ad5ec3b64cff844e713a69a03fd9dbbd56f96c65aeced7de3658862bd3fa5907cfccfcb69854a70a715f7cd58bc265116011fe95762ae7c5
+DIST apvlv-0.1.5.tar.gz 4254177 SHA256 dca98157e63c9fec12d6514751ea26549813dc7b87d838b0003f31a444100a8a SHA512 680b2d6e272cda34b0b9065f5fdf7b917a4e3ed4d54a6e78cb41a60cf43374c687b506d4148d6cecf87912957fbe6bc4c77e9278616fd236e49ade15774e1ccd WHIRLPOOL c254d3ca939b308dc58aadee20e33c5a6bda7495c4521d3433d2eb4a03ab4c9fd25f0589554506b08496f9024ef6d8c8648abc31b5175ad5b181272b9e6cae00
+EBUILD apvlv-0.1.5-r1.ebuild 1246 SHA256 7427829a9780a9067d976873e2e7e43f68b3a2a9b6e522415776f7dd869506c8 SHA512 3f4bd0ed51b4c6de0915398dd22c857b532c227b88c9727acbdb55abb519b07e57e618b37ab4a4ebd34858d89287e2d0df2f98cd4cbcc823fc0596566f2aff16 WHIRLPOOL 113a44916519a48e33595b8446ece40976bb923d28fa1673f831e3c13664c2a715abd7021045561644f384b3fc3f98e3d9778dc2820dfcb6583daf02d74dffd1
+MISC ChangeLog 4266 SHA256 82ede40b4236937c41188792f2f963b711fa62d3590fd150d36950785ec6cb78 SHA512 649eadec33b956034f0d52bcd65849d0755189c2afd686fa2de270d3ae58bc641c3c2a5cf08155edb8942d20b96b1297a6dff27458d66ce29c9e481c28e28e59 WHIRLPOOL d7c7caa0e3f6652e4264a5e36702b9f852b42a52b1aea156c8c001915ab4db4b459e7b5c9ca67cd52492f81f18fff679fc5392457225b3239835cac96c4e2b18
+MISC ChangeLog-2015 4141 SHA256 10e5079bd4c589f8babea812b86aa3cacd309ec1f8059fcdde374e4dd1dc5013 SHA512 dcdae4e21b8c018fece8339d00e439fb5fd3bc608c6b319f0fd0b8ea16afc4cbd7cfe006168574eab761351f357a34954a38c36652973a26711066a2422381ff WHIRLPOOL fabf9a3f69ce1b34600e801f62fa58795db56b8ff5c7f4b5ec768b3dc6825402245806f6e55ebc38df3c1f814ac90615fef64aeceb6255f7e6f7e8cff3def2f2
+MISC metadata.xml 304 SHA256 77aa46c6213e5819aeb15f8fed88bef1943f6763ca8e565ad324bf5bded2bb07 SHA512 0d01027269ed441b2c29ae9ae560e16eca4a6aed7ed7d0e418887c538673b913988dc3f7c6414982198dfda258044ff7ef3667b8fc53cfd9d4f7773dd5d35030 WHIRLPOOL d08c93455dc2b0fd604bb3876fc58b5566b76689e5d9f8c19ea3797c820758808174c1bca10ff0170facd932e38ee2ea82edeb4f624759e59969564bd7b417b2
diff --git a/app-text/apvlv/apvlv-0.1.5-r1.ebuild b/app-text/apvlv/apvlv-0.1.5-r1.ebuild
new file mode 100644
index 000000000000..94e7aec16202
--- /dev/null
+++ b/app-text/apvlv/apvlv-0.1.5-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils cmake-utils 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
+"
+
+src_prepare() {
+	# preserve cflags
+	epatch "${FILESDIR}/${PN}-0.1.5-cflags.patch"
+	epatch "${FILESDIR}/${PN}-0.1.5-gcc6.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
+		$(cmake-utils_use djvu APVLV_WITH_DJVU)
+		$(cmake-utils_use debug APVLV_ENABLE_DEBUG)
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	dodoc AUTHORS NEWS README THANKS TODO
+	newicon -s 32 icons/pdf.png ${PN}.png
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+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/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/Manifest b/app-text/asa/Manifest
new file mode 100644
index 000000000000..1b56d96b15d7
--- /dev/null
+++ b/app-text/asa/Manifest
@@ -0,0 +1,5 @@
+DIST asa-1.1.tar.gz 9893 SHA256 7b543dcbd072b8d28ad7ef1fec8104ae574f3efba411ec82eeb2034e9245ac6c SHA512 70452783da23929d9a02cdf9cefd7403698fc8ae703ee5403dd84834b3ac39febf1edc02cb59b233cbdf51cd2f8c04922a77833dd8d851e2106de2e2fe444728 WHIRLPOOL 9179d602d604ec3c7ac2f2603a699ca31169bca6a2f66c0e90d050179821101227eeb35ef8eb46c0b595acdd9d58c8f7f891b498fcb37efe4a50c4bbdc5f1a72
+EBUILD asa-1.1-r1.ebuild 582 SHA256 908ddddf1732951c03054bc7166f87f819eeb0c75695b7bbd6593194839d8845 SHA512 c8a99e085e4cc2ba763c7fe93c71476f66e7c1b9ce5e61418b79e8b784f117e4c69f4c36bb42a1ac93ece6ab53c3665197f626939963c918b94f9551e0a2edf1 WHIRLPOOL 74995b7527394cbc1e1dfef0e8f2c7597760f7a4237d2ba79fba52b2ef8a47b5700f64ba9f436041926877284577181ec00f28fc442c65ee2488cc2cb107a8aa
+MISC ChangeLog 2206 SHA256 1498d7b2ebbf11dd185d6dbebeb616188f094f2e72f7a2885aebd233bea6b601 SHA512 c93fc99a56598d920bd1a7c1c15c873645321cd4de33cdf48b3926ccaeee986585ff0b3248630effd7220e231760496434d06c6cd856560698767e72f139ba1d WHIRLPOOL 30862bed8bc2d84f1d9bf783a3054bc1faba63c7bf596a2a904d733c21abe67c61d3d31abe62727ff8d09b7dbe8f64835316f8112dfa60569f1ebd590450b5bc
+MISC ChangeLog-2015 445 SHA256 776864364a71826b48ee3c66e2b2b65bfe466b8585006309c9663fe23bed9a94 SHA512 a6c71e6147f988f475b571a6786b0eaeb1e7ad041682daa856e26bc24c615d374436ac6b5244f70303f1090d93720a07bbc26a0d9abe8829a087a4bac9fd28d8 WHIRLPOOL 4e92480101b7877ffd5064c213d36a877f85579e7eb0c47cd8c867dbe680058576daf32ddc060ea6b366b65385b91882b32a2d4d9cce9d7ac313511faf6a19ca
+MISC metadata.xml 125 SHA256 57be2f5f99b542957b156f0ed7b30e214d721a7764b38a086155ef3ea75590d4 SHA512 59faf3fa455a1926455e56e789043a1fab0a443aa3877152ac22dd29af6425676edc5d1fa67473465a4caf9dceb52dd868fd5fcb4cfbd02136d92a007ba68288 WHIRLPOOL f5f246ce1e15aaf8c3edfe6303eb589c1190459191522642f485c74cd9d1193bbfddfa5d12fac1f2b429f0eee286e3844c1335993e13a2a5989dc08e141a2f56
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/Manifest b/app-text/asciidoc/Manifest
new file mode 100644
index 000000000000..8fad5cccba08
--- /dev/null
+++ b/app-text/asciidoc/Manifest
@@ -0,0 +1,8 @@
+DIST asciidoc-8.6.9.tar.gz 907253 SHA256 78db9d0567c8ab6570a6eff7ffdf84eadd91f2dfc0a92a2d0105d323cab4e1f0 SHA512 1984482010dbd35c3a1def67f4915ce83ecfc29a7463f84aa312107d7a9ff647978f57615462c65e885bea424eed89a212df728cc3acd3c63df1c763dfa5e955 WHIRLPOOL dbd576ed3b7bcaf46afd33d9aae7a94f82fb171fa73f0b99f737b6934f62927ea11e1290aeac141ce5de27f66a56d7ed2d110f2b0d84e0598e858eac0e52b35d
+EBUILD asciidoc-8.6.9-r2.ebuild 2194 SHA256 835d09e0de77cd9c3c7d11ff4f5452a0a94aa18b1dbfd728fc63919d82fc15fe SHA512 8800a9c0a0ffc8105315d468194b8c6aa0a23d2345b1a5aa4ba5950c3d2daca94f28ffd81f40e52c10d8de94d9f67306d69a3c00acf4008821ffb4c21625f190 WHIRLPOOL 13ce366a6bf41a82d7f95918d90b3fecd08be57132ca1bc3186865c8771886126a831a2bf417912590653e91035c7ba5ebf57146bda701444c0a44e5320976cb
+EBUILD asciidoc-8.6.9-r3.ebuild 2303 SHA256 e96f7fd6da782041c1e713215eec7e8e23be2dccf27b25ff424f2b17b58e57fa SHA512 2bec7c7ea7c879fd756ea4f47e375a52840f6f000047736a58a2f1df172ab46810263ad8e88cf3d7fbcfab18ed2be5927fb0fb39360d65bfc221df7aff010c46 WHIRLPOOL 8cace39c0d67dd076251b198e10faaea1317d803a7da8215bc401f98c1bf92c0d8360953c178b94077aa5d7c0de1aefb95120ebe21dad617791043f1e2b14445
+EBUILD asciidoc-8.6.9-r5.ebuild 2381 SHA256 07d5ff47533c31492ccc12677b13acd9265d09020abed96e177599391c07fa89 SHA512 90bcd4eda341780c682b3de57f2d25903d0f6990fba83cfaea43214f14553fdcb1095e456f301ad1c754fcd9f9a59e0a063efa6faaefa9d77da70b9f4c76df11 WHIRLPOOL f90c6613007408a942e312c81c112ebde1fb33e0d8e7ffde73bae9c8db2939d8fffa77d88835b5d93a953b67f779f34fede484ba606eb816bf97a59c7c852565
+EBUILD asciidoc-9999.ebuild 2825 SHA256 0463091f73a83241b12717b3cfacb9f6791af906231d80c8d75c9729e2983d09 SHA512 822c2100845e6d960910cdc1af3e10d83c3410b4b92995bcbc86e6e82b91ccc6a24a84575bc85ad831bc45d54cc2056e8281048dde291c043a6ad2fcc68afe21 WHIRLPOOL 6ae1e36dcd44f66e50c1807977026d0158aa4ba629a1f3acc911828c166114555065464da4facda2e3309f6b9ff94cd77a4f94bb59d68edd3f5efaa0ecc30102
+MISC ChangeLog 8762 SHA256 a65df8bab04bd07e80c0eecf86081fa5a7061daec43c4d1238143565f8391bca SHA512 a2a2f2961b82d23f1459c508af6aec923eef71d7408653f025a6beac20b9376b2d92774910276b123301e70f2f30d802cf03ddeb5869ef0a2cdccb4903299a0f WHIRLPOOL bf34214d3f4ef42e5156eeb7b0da45c5432be35654884dca44e459dd9dc91e6f496acb4af8a9c116d7d54c21cca30cccaebdb3f7470c78bb6c25f6a0c2ea486f
+MISC ChangeLog-2015 15568 SHA256 d7ba2f8295a1a51593f0394adbb65476298ea2aef511db8c101748a3ad0d59d2 SHA512 3fd8c898a19c9821c2a5cd949e62b5f0076b2d28864785d7f276b0f5eed477bd1980b4cff1731067d150086612d9b1a3844f6ab879873516ef2f7c0c2c43b2d4 WHIRLPOOL ceda16169a2d0f36b1b4ea3a91cded15ee8dcade4148502030e4511bd4fa9e8104ff4c2e0258fc0955e29bb0524b02819d6cd2e743e74b73acb7581777c442b0
+MISC metadata.xml 583 SHA256 745ad8106536c9e69d0697772abfd3a4366b01fa922e292c3b16831311e93e3c SHA512 cf654b12cae851d762b538926912ed626a5681033f9c579ca9e62d442345c8efe5a5373784c702994c2b97a0acf7f251d257da29dc3960a2dc8c1b84327f11af WHIRLPOOL 3c9119d5f49082d19e4d0fe1903fdf41d062ca9d5ab7c3befd1e19ac9e7e94ed6683b378bc7fa04b32b7060b6b64159502d15b92202f37344302971978cce58b
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..a8ca6c45174c
--- /dev/null
+++ b/app-text/asciidoc/asciidoc-8.6.9-r2.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2017 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="AsciiDoc is 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-r3.ebuild b/app-text/asciidoc/asciidoc-8.6.9-r3.ebuild
new file mode 100644
index 000000000000..afdfacf6638b
--- /dev/null
+++ b/app-text/asciidoc/asciidoc-8.6.9-r3.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 pypy )
+inherit readme.gentoo-r1 python-single-r1
+
+DESCRIPTION="AsciiDoc is 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-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() {
+	local -x ASCIIDOC_PY=asciidoc.py
+	"${PYTHON}" tests/test${PN}.py update || die
+	"${PYTHON}" tests/test${PN}.py run || die
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/app-text/asciidoc/asciidoc-8.6.9-r5.ebuild b/app-text/asciidoc/asciidoc-8.6.9-r5.ebuild
new file mode 100644
index 000000000000..2c68badd971e
--- /dev/null
+++ b/app-text/asciidoc/asciidoc-8.6.9-r5.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2017 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="AsciiDoc is 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 CHANGELOG 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-9999.ebuild b/app-text/asciidoc/asciidoc-9999.ebuild
new file mode 100644
index 000000000000..39a4499e5458
--- /dev/null
+++ b/app-text/asciidoc/asciidoc-9999.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 pypy )
+
+[ "$PV" == "9999" ] && inherit git-r3 autotools
+inherit readme.gentoo-r1 python-single-r1
+
+DESCRIPTION="AsciiDoc is a plain text human readable/writable document format"
+HOMEPAGE="http://www.methods.co.nz/asciidoc/"
+if [ "$PV" == "9999" ]; then
+	EGIT_REPO_URI="https://github.com/asciidoc/asciidoc.git"
+	SRC_URI=""
+	KEYWORDS=""
+else
+	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"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="examples graphviz highlight test"
+
+REQUIRED_USE="highlight? ( ${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.
+"
+
+if [ "$PV" == "9999" ]; then
+	DEPEND="${DEPEND}
+		www-client/lynx
+		dev-util/source-highlight"
+fi
+
+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
+
+	[ "$PV" == "9999" ] && eautoconf
+}
+
+src_configure() {
+	econf --sysconfdir="${EPREFIX}"/usr/share
+}
+
+src_compile() {
+	default
+
+	if [ "$PV" == "9999" ]; then
+		# replicate build rules from doc/main.aap; this avoids a dependency on
+		# the A-A-P build tool
+		for f in CHANGELOG.txt BUGS.txt README.asciidoc; do
+			${PYTHON} asciidoc.py -f text.conf -n -b html4 -o - "$f" | \
+				lynx -dump -stdin > "${f%.*}" || die
+		done
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	python_fix_shebang "${ED}"/usr/bin/*.py
+
+	if use examples; then
+		# This is a symlink to a directory
+		rm examples/website/images || die
+
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+		dosym ../../../asciidoc/images /usr/share/doc/${PF}/examples
+	fi
+
+	readme.gentoo_create_doc
+	dodoc BUGS CHANGELOG README docbook-xsl/asciidoc-docbook-xsl.txt \
+			dblatex/dblatex-readme.txt filters/code/code-filter-readme.txt
+}
+
+src_test() {
+	local -x ASCIIDOC_PY=asciidoc.py
+	"${PYTHON}" tests/test${PN}.py update || die
+	"${PYTHON}" tests/test${PN}.py run || die
+}
+
+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..67cccfcf094a
--- /dev/null
+++ b/app-text/asciidoc/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>marcec@gmx.de</email>
+		<name>Marc Joliet</name>
+		<description>Proxied maintainer. Assign bugs to him.</description>
+	</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/Manifest b/app-text/aspell/Manifest
new file mode 100644
index 000000000000..d31586d7df46
--- /dev/null
+++ b/app-text/aspell/Manifest
@@ -0,0 +1,13 @@
+AUX aspell-0.60.5-nls.patch 443 SHA256 9c8a619f97ffcbb6a90bb5d5f0531d0890ca0033dcfae5b0fc70cb635df7b39c SHA512 579de3e40e6036701b02e0936cbe7a0aebfe09f5fef35241827d9a64eea024148d530cb1cd435d5c9307358940c1704309511cd633e45307546e7f5d30d97120 WHIRLPOOL be989a88515e94e00529d078301431b67bb07b9934c846c2856b6f386f41ce2ff58c86f218caa23df2f3824f5865b1e42b158c197500ad4aaab07c320c3d6ead
+AUX aspell-0.60.5-solaris.patch 538 SHA256 7f43d10cd9dc36eabc3837f023ba1e2fe7588b833acac0b81b7e28c22635bf65 SHA512 0386e629e77335cc42529134104ed62980c7b1a7bedf1b1925f78a2bd014c0db5292520bdd75152233464806527956761aa4795e7201569a9dbe365386ea8418 WHIRLPOOL f99c6756f6efa2ef0b6e24eeb9710f59abf52144be929ee18a33932a8ef6f942a5627fc0ab2c250bfcf52c755017a6ba642b5b2a257ba8f45e2a917d649f781b
+AUX aspell-0.60.6-darwin-bundles.patch 967 SHA256 bc12f8061e552576d55101c5614d3c653e9959bdadbab7a7cdaad5ad6e64863e SHA512 d1725c48b0fcb77131ad7d8804afd87fc9552993552bbee52164ad9d8b49e9e3ddd6d78b1a519ab242462e4f66f32b375e995aca1feb88faaddb5c036f6cf6eb WHIRLPOOL 4414f5c7b1c3a729dc36ba7d73abfb6b89b021a574782c072b81b1e65d654961c89148858ac3e055cb7b6b63981924991c683d61215043cb991225664be9162b
+AUX aspell-0.60.6.1-clang.patch 1288 SHA256 dd2df4877cb783c39706801c8434151e61736a08d226f5c1e1de4a8df1c23019 SHA512 453e46b6057dc9fba5e80aa9a3c569f5aa2bc04deeebc4951539e6f251babfba0f6ea2e4f51c59d6e870bf69b1ef7d03b76816d7557a6b673ed0d276f0b3244f WHIRLPOOL 44842bca3fd52ba141afb02b93fc334a40dc2e04378b7fe00176e5151f09c3a71131ebb63f976a1ad8b66b6546cec6c457c06598363f497fb60a3551a846937c
+AUX aspell-0.60.6.1-unicode.patch 8273 SHA256 e3a4b5f65fa60a2a1467ad93e655ce8cac574ef9eca8ee937389b3753b26c154 SHA512 8601183d2e84801c193f5a4412e021ff79ccd27e031c0e8ec85a879619868d13389cb60fb0f4fa971114da64645dd4fc5cbe480f49e88d575826cf429a533b98 WHIRLPOOL e4afabdf50cb0a9baf100a704de5e71336833a505fc369338eed03278757093f03f2f1b209acf09b41e8e500264b752ef2d222cbc83d92867b6f32c2bc74435f
+DIST aspell-0.60.6.1.tar.gz 1878163 SHA256 f52583a83a63633701c5f71db3dc40aab87b7f76b29723aeb27941eff42df6e1 SHA512 f310c7590be98406589b5c26ca36a2ecfe4733f0b40fd6c176b96b7955ef2b5cd0ec9a3d770cf132146ae7a896042b4b698945112995ee1ae66adcfa5542247f WHIRLPOOL 0c77b95a29b598491c12cf22737d5ff758b2758b4f815356d2f52da398afe2b45209cd3b59f90e5b3c1976ee8a09e8cd553507bd93a0cd49043c8531f9a4990b
+DIST aspell-0.60.7-rc1.tar.gz 2034916 SHA256 86b5662f24316142f70c5890787bdc5596625ca3604dfe85926ee61f27f2365e SHA512 e13240d78b8afd74d8a8cfd5fc7fe2081de85b33621e86543cdf942ed601d36c4e0cbf38a54be083e951127fa9435677cec2997387cb0e7b51a5597386e7e8d1 WHIRLPOOL 6c48decc0470827024584e0519de70a9b6ffbe1526617eb86614123161dfabcaad7ded9e3d73698ade427523370f7f52f46570bb8052c6502ed30ee4ce2a5799
+EBUILD aspell-0.60.6.1-r3.ebuild 2725 SHA256 c8cbfb7cd0f1c6c4597ace3b277c1b1a5c5644a05f419d7c460d2752de50556d SHA512 a67ef4a339427f65777ad9cbeb505b7dc1e1f154acc0096729db65df52e17894999846b9a07fa0aff1866629eedd5efb8c8c45b7fb64e74e640ad551e083f71b WHIRLPOOL 74b16928ef7f16a07b5bf82f8aa89f07ad46cff824fe77d94444318c2c87e0aea269d828f025ca06ab1bcd37f1fbbcd7db967649e710edf3a33bcc75fe5fefa3
+EBUILD aspell-0.60.6.1-r4.ebuild 2488 SHA256 cb6092d37d9ab0b3cc619963b6230ac166917eae7a5eb549e8a4a4da7a241b46 SHA512 413796f85ade231c4f8339c14870f8019a7f93fef7405324f37af25b888ee93038bb14e0aea4c57f1804bf973d00bb62d66172e395c62d2b9c095f6b21bfb97c WHIRLPOOL df447e013ba23356e106d32536429fc513d0933164e10408a46237ec6d510d78be444c42eada167aafac0c04d112f2ca6b930827df210c2304b6e9f048f849ba
+EBUILD aspell-0.60.7_rc1.ebuild 2811 SHA256 5f8a05c51ea99a6ea617426590232449d70b68d58d92afcce3d5de2fcd668584 SHA512 f469187960a086b6ac6b701573dff240d9785cbf8a0674d28182b18d1d5de4dd8e40a51d628e8cc0cc7a9933f715d954aed5d60d333ba5dfd6cc8de27df5186f WHIRLPOOL 7503a12e4eb0a17d044f9f962136cf7cfcf7baa380394657c41c8c78b1444c4a6f9034caf5ba95b19dc3654c68f62bba61e50e0aa625d0532384a68d640aaefa
+MISC ChangeLog 5600 SHA256 2936ca1196bc84c5354589a3662719381f9af31e22466b2b24f2f3b32e664faa SHA512 aed7e8c17e61957fcda7f1bd8443fab054aa3831b3820fba6c40d02e0efc0f90b26a7afb823f8c40412654aebb671b7c1d2479efe2cbb38de31e9a6d3a346156 WHIRLPOOL 98523ed47ac6fabf1595960a42859e08c39802cf5738a5f8f38ca3c03202f87dcf40412ac3b5d2313558caa632f502b78b60787046dc329b46fc178a4f38a98e
+MISC ChangeLog-2015 23773 SHA256 db04f0d455485520f07c52667671a557dcc7e6a15ecc2647b54894fbae8658e9 SHA512 35496469308dbfcf5cf2d3001dde6fbe30955770526fa94a93ecfdc5d20f05aa6ce73a5083a3575ede5d095c188c3fd22c861bbbe6f4a2222cd37574d5d09566 WHIRLPOOL cc360c5510028899fa96e82c88b9c345a078311d47b7dcc0ae2e67379b9d38e4a9afa18b7f61045967ae34e81f3488c569f738456de9e1f8b42e267b9dd7fc21
+MISC metadata.xml 139 SHA256 5cdc1888ebc8807b9a37b1d33429c61cabe7415a4f240e21a4c2ff8eca7a34ed SHA512 8be912ace7468a4396eb1da00a9785030a8ce35da4357a01591876a1056fd45e44da65de2af3e1eb0506ce6551714962c40c3ae5a3aefa2ad231de35af2519be WHIRLPOOL 620431014dd4fb752c3d46d11904ecb2c6d4525f5b4e30f4f778a3b74d3f7187ae4ccd856ebd7eabb48ce261b21849c732928fe647edce024a3fdc082d8f8630
diff --git a/app-text/aspell/aspell-0.60.6.1-r3.ebuild b/app-text/aspell/aspell-0.60.6.1-r3.ebuild
new file mode 100644
index 000000000000..7c6d6d12527d
--- /dev/null
+++ b/app-text/aspell/aspell-0.60.6.1-r3.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools eutils flag-o-matic libtool toolchain-funcs
+
+DESCRIPTION="A spell checker replacement for ispell"
+HOMEPAGE="http://aspell.net/"
+SRC_URI="mirror://gnu/aspell/${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="nls"
+
+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/@/-}"
+	# Need to keep linguas_* for now, since aspell uses gettext
+	IUSE+=" linguas_${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
+
+COMMON_DEPEND="
+	>=sys-libs/ncurses-5.2:0=
+	nls? ( virtual/libintl )
+"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+
+# English dictionary 0.5 is incompatible with aspell-0.6
+RDEPEND="${COMMON_DEPEND}
+	!=app-dicts/aspell-en-0.5*
+"
+
+src_prepare() {
+	# fix for bug #467602
+	if has_version ">=sys-devel/automake-1.13" ; then
+		sed -i -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' \
+			"${S}"/configure.ac || die
+	fi
+
+	epatch \
+		"${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"
+
+	rm m4/lt* m4/libtool.m4
+	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
+
+}
+
+src_configure() {
+	if has_version "sys-libs/ncurses[unicode]" ; then
+		CURSES_LIB="$($(tc-getPKG_CONFIG) --libs ncursesw)"
+	else
+		CURSES_LIB="$($(tc-getPKG_CONFIG) --libs ncurses)"
+	fi
+
+	CURSES_LIB="${CURSES_LIB}" econf \
+		$(use_enable nls) \
+		--disable-static \
+		--sysconfdir="${EPREFIX}"/etc/aspell \
+		--enable-docdir="${EPREFIX}"/usr/share/doc/${PF}
+}
+
+src_install() {
+	default
+
+	dodoc README* TODO
+	dohtml -r manual/aspell{,-dev}.html
+	docinto examples
+	dodoc "${S}"/examples/*.c
+
+	# install ispell/aspell compatibility scripts
+	newbin scripts/ispell ispell-aspell
+	newbin scripts/spell spell-aspell
+
+	prune_libtool_files --modules
+}
diff --git a/app-text/aspell/aspell-0.60.6.1-r4.ebuild b/app-text/aspell/aspell-0.60.6.1-r4.ebuild
new file mode 100644
index 000000000000..fe7d97be8848
--- /dev/null
+++ b/app-text/aspell/aspell-0.60.6.1-r4.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools flag-o-matic libtool toolchain-funcs
+
+DESCRIPTION="A spell checker replacement for ispell"
+HOMEPAGE="http://aspell.net/"
+SRC_URI="mirror://gnu/aspell/${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~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/@/-}"
+	# Need to keep linguas_* for now, since aspell uses gettext
+	IUSE+=" linguas_${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 )
+"
+
+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
+}
+
+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/aspell-0.60.7_rc1.ebuild b/app-text/aspell/aspell-0.60.7_rc1.ebuild
new file mode 100644
index 000000000000..574323a3d2db
--- /dev/null
+++ b/app-text/aspell/aspell-0.60.7_rc1.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2017 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 ~sparc-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/@/-}"
+	# Need to keep linguas_* for now, since aspell uses gettext
+	IUSE+=" linguas_${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/Manifest b/app-text/atril/Manifest
new file mode 100644
index 000000000000..94a2adcb5bc1
--- /dev/null
+++ b/app-text/atril/Manifest
@@ -0,0 +1,14 @@
+DIST atril-1.12.2.tar.xz 1663920 SHA256 47cd22969d4ff6ef860a310a57f77f1fcc0c5674113a72ee507d2b1b5c780226 SHA512 2ceeda42adeb284a25caff3a69d15a231129988fb410e4d502a281ccf5819307b9963722a2e330307a1c3b15d3c82405b708d983ed1c266e091a35264766e6ec WHIRLPOOL 8eb8a0cd40c0c3d21141493a09b3dc8f2c4d902fff1ed80fe5468b1ac342c81312518c015cbd288372f228bc4bb91bb1555af8f8b5842e72e4eb895fc787988c
+DIST atril-1.14.2.tar.xz 1703272 SHA256 9a8eadd85bda4539560f01a2127be4d6c358c07c6a744c09d1fdb5bff7ce14f4 SHA512 9f77abe43848a3a35df1484edef4a6bbc6339f82b0d8e9f3c149c44fd632f2720acf24bcc1354b944c5c364fc4ce1d70b733c1ec5bc40b1a17041e59acf7bd9b WHIRLPOOL 3e4bf2f6af6369b7cf410f161c159f6f0221d311b354c24d8b86fbcb14c3553d01ea6d79667d9817541aa401202bc8590d074f635745730854a148ca74b41dfc
+DIST atril-1.16.1.tar.xz 1691456 SHA256 c74a5f8c8603fa5952efb4343f055677e4474f1907080be9658d4456d3dc092f SHA512 69128171f13f50079b0b40bfada868967c289b5970e3cda3454f10e7cf723000ab29290c7c9ada67648c370472fd51eeb0a8dbbfa0af05babfc85cb28e3570fe WHIRLPOOL a7b386897c598e473642aa8c3ba2a40211c4389ef3560e574adf04072882887e37a50a7d83ff5fab4c74982908994c926211272d33220fb47a360e05c851a670
+DIST atril-1.18.0.tar.xz 1688144 SHA256 c2284f17f7b683efa22615f00cf2768ea07667981d8304566e49c3d863de80fd SHA512 71e40faebfac08c60c90e7c919d2274976a5f03e6f9c6882fe81d4736152c14b1baf45da770f357030708d103203a4ffc47387c736c4df8737dfc5caf1fd466a WHIRLPOOL 4cef97e4a832a2123ddfc1ddaf2af8d44af9a746676ce356c0d7dcc4fe463a762ab33982fa2045ca9bf461dd79c52b513d6fe263fd153121ff3a6afad1708ecc
+EBUILD atril-1.12.2-r3.ebuild 2347 SHA256 1253933089f14ca020345ff8788bd6b3f715ce76a5b652585d2409429d31021d SHA512 a02f369ebb18e2b6f0c6e99e8db6185928bac62d02a29381f88872ee63fb948296e1347c15bc2b687f349e7036887d70f193adc26c9d13d07778537598a2f0ef WHIRLPOOL 99dacb65e3c753f0186529cdb8b1d88a3b5bdd33e9e116aa7a72f217fe21e3a78a0c0c550356ddeb2c767efb95efd68c22644a7ee92094fd40d0996303be6fac
+EBUILD atril-1.12.2-r4.ebuild 2333 SHA256 820ed2d8933682b746aedeb92b1e8233379d6ee8951ee09a9a7a116b1e692e26 SHA512 c485c4bda248f2719800166ff8a5b6fcdc6610012661bdc0a490ef06414ba2a2a5a9f483841d7c2bcb5efe4900f3fa4b06b348935ec0e6d2d84c0482405edc60 WHIRLPOOL 818fd64bbbbd3e961f02b2d1e9b888479e53cc3cf90e2c44e5fb5825cf367d7592acaaa19390eced529f7b8c8cfe6181581eaa4d80c15ade0969b7554923b3d5
+EBUILD atril-1.14.2-r1.ebuild 2373 SHA256 4788380fad37640ba89dee20d02d94982bd37860516f3591bfe45c96b3853d78 SHA512 f10dac5113a74cee27f28f47ae59e850a9331755864016cf35a24fe3ddcea84a7e6ce2d24bbc8237d2b4745afc1fd4616f5f8d0df9c6bd5aa1cc2c36fa5b4625 WHIRLPOOL 4880b967e3ccfb9cdac0d96a3516bcd7bf8e51968144a916cdeee2fba70dd14b373305f3bf9e47848bd5d460e867cd7b5cdd4724cd0e708e348ce7825c2d7f62
+EBUILD atril-1.14.2.ebuild 2389 SHA256 ddcb7f1878c7ddf682d91300cef883b4221f3c24853fecc5caabe1fd48acad00 SHA512 6910eaf71e24fcf9c42048dde071f2117f5f8ed81e122a6d4619a977a16e2977821870edbe62ade81e39dd3e34ff689e6cd29a9c8dea4c96008dd86f04240e80 WHIRLPOOL 05837650aa69af56cd846e8d94e735bed40efa027dd3872ea6a04e72053db9c04ad5d671832cf94b5d53854fdaa38abc3e0315f75c7c071ac81c1f25b8c49283
+EBUILD atril-1.16.1-r1.ebuild 2310 SHA256 863f2e70efa1a475f315b36178c62944f6e6c578ea7bba337ef1802c09217ab5 SHA512 61d811ce7d246b8e962dfd60a710da7a5f08ad17bb532a0396f1206599918e0eb89ec7675032fc1a3bdb72724073feb80d35875e7215636fc8d22abff43fb188 WHIRLPOOL 36a2a17f9abdd27a230e723363be251f62713bc397a9275ca2a530b5c34fc14e2fe47cd55ef1e8387fba939c318746d89272a7634473287a156b92861e739903
+EBUILD atril-1.16.1.ebuild 2326 SHA256 984eb424094ca9c714e96dc9b000d7e3b94fdd4e41da69f8a1184a5cd7272f62 SHA512 1ffc591b8b4c193909d5603f8aecb2eb1501aa9b8ab4e2abe9fe9a33a39268e1e73b62f59edf0a80294915bec82e2fb13162b8666a8821e21d624b9fb988676a WHIRLPOOL afb0f8d98775e8c5365fc70821afe4f57c7373eac43301ee1378923769fd25a4300cfc14425f117770a53fa57879c4e862c7de6245ce0ea076d6a7f763352546
+EBUILD atril-1.18.0.ebuild 2162 SHA256 ae522c7814cb10a077f42ff5451b591c7b69a94e24259b2f2f25dc4e7b1421de SHA512 813b95f5230e292164c658147e961b6cc2eb5ab80ad63643fa06fcc6bd9092750f4af45b8de4c85965b704740ec8e138cee25185296d8aa5156dca58f96212a8 WHIRLPOOL 53d52337cd9aacd7f5616750dfc06e832e6554e7a5883a9bf28266c0099267a7b65d4d28bf5df249892d5ceb47d726a8c4169e30e2843b042b711698e7068ec5
+MISC ChangeLog 5815 SHA256 01a88c082c524b9bb8ae0d8b8a2ab495bf2afb3925af22107262a098c36705a3 SHA512 8ece396a1ff632fa5a4ccde01b89838b6298841966a541ef5212e0d7eee11ec9ec58911e51fcae3114985b1572cb91c6ba0463fdbfeed4cec1f911ee58712415 WHIRLPOOL 73ea430fc247eed383c67339cd1887ea49624ca38759a43cfd06cca6770a75d2d2d689a4ee2d96bdb1eb5fb098626a97a9d49496892315756f3dc74762ae54fc
+MISC ChangeLog-2015 1249 SHA256 3aa2ad53dda652f8f91d9288596c475473adbb27ba6fd0a3e0a7b5225a44e30f SHA512 b9976048766136413bfbab246302d3c7bd92f1c5a0831465c37aac68e325e5aab60a65d36335b8046c2be74912f3929577d3f6cac7418e9c4ad2bebc017ad339 WHIRLPOOL 12e953096e9fe2eed2e8109fa3d71af1e836d909fe052ae8d05477901bcce54c091c65a995b8158425774b96163a36ecfa952bda1861180314b8e124de0c8ec4
+MISC metadata.xml 843 SHA256 0999375d419d5013be0997cfaa15ee5dc192b666b78137453c75857d5b5dcc68 SHA512 9248d2446621337488268f0c7f839821383bba8d170620376cb95b96868448fc3bc411e336104f59db0d8bb5d304dc1c0b76ef818686b930c93a04764e9f4fdc WHIRLPOOL 738d22725147e653f4338d01750bf7328f702f5b40f710a740f78e2fe059abb1513c7890b6afac2c7c7d015181de007dea71ed3009bebc466a4c14715f699bdf
diff --git a/app-text/atril/atril-1.12.2-r3.ebuild b/app-text/atril/atril-1.12.2-r3.ebuild
new file mode 100644
index 000000000000..78c75e698fc5
--- /dev/null
+++ b/app-text/atril/atril-1.12.2-r3.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2016 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 )"
+
+RDEPEND=">=app-text/poppler-0.16:0=[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?]
+		epub? ( >=net-libs/webkit-gtk-2.4.3:2 )
+	)
+	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"
+
+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.12.2-r4.ebuild b/app-text/atril/atril-1.12.2-r4.ebuild
new file mode 100644
index 000000000000..8a29b95e1db7
--- /dev/null
+++ b/app-text/atril/atril-1.12.2-r4.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2017 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:0=[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"
+
+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-r1.ebuild b/app-text/atril/atril-1.14.2-r1.ebuild
new file mode 100644
index 000000000000..12e1ae529a2d
--- /dev/null
+++ b/app-text/atril/atril-1.14.2-r1.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2017 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:0=[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"
+
+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.ebuild b/app-text/atril/atril-1.14.2.ebuild
new file mode 100644
index 000000000000..cec82ec0eadf
--- /dev/null
+++ b/app-text/atril/atril-1.14.2.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2016 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 )"
+
+COMMON_DEPEND=">=app-text/poppler-0.16:0=[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?]
+		epub? ( >=net-libs/webkit-gtk-2.4.3:2 )
+	)
+	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"
+
+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-r1.ebuild b/app-text/atril/atril-1.16.1-r1.ebuild
new file mode 100644
index 000000000000..4259cddf89bc
--- /dev/null
+++ b/app-text/atril/atril-1.16.1-r1.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2017 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:0=[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"
+
+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.16.1.ebuild b/app-text/atril/atril-1.16.1.ebuild
new file mode 100644
index 000000000000..25821be1a795
--- /dev/null
+++ b/app-text/atril/atril-1.16.1.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2016 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 )"
+
+COMMON_DEPEND=">=app-text/poppler-0.22:0=[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?]
+		epub? ( >=net-libs/webkit-gtk-2.4.3:2 )
+	)
+	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"
+
+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.0.ebuild b/app-text/atril/atril-1.18.0.ebuild
new file mode 100644
index 000000000000..e253873cfbba
--- /dev/null
+++ b/app-text/atril/atril-1.18.0.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2017 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 +postscript t1lib tiff xps"
+
+REQUIRED_USE="t1lib? ( dvi )"
+
+COMMON_DEPEND=">=app-text/poppler-0.22:0=[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/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/Manifest b/app-text/bact/Manifest
new file mode 100644
index 000000000000..218044aff549
--- /dev/null
+++ b/app-text/bact/Manifest
@@ -0,0 +1,6 @@
+AUX bact-0.13-cpp14.patch 1686 SHA256 d60243b8ab3d467505d779a47ab49bffbc5955f053eb1b23613cc7369182206e SHA512 c61d19a2aab85f8597ea40548ef4e2984aa20b44a7ef1c7d5b45d10ef38956cd614844ed5bee0e770a7cfe7f9c8778e491e0ead2585653a57676b4b33dad9204 WHIRLPOOL 1e88e95f4a5256dc0622a549c1771b630240a277d96f506fbb3a02dc6237127d481f67f9251bc487b975f7464bcafe3767e4a34a77614820be3d931f622c54af
+DIST bact-0.13.tar.gz 230681 SHA256 4aa55c30621afd3793bd15471b3c0d77d3b489051cbfb30a9f0640de8928ab40 SHA512 ba531c41d93e60699d9a06bd1d1df71f6fb1559c1cccd86756a88bcf72279065d3c565cbb1664444cb74fa25a3472d77682419fe9efa8881d73b23f0bcddb9f8 WHIRLPOOL a7157b6600f24c80aaa2dff5db1a8ce74085985b839c59f0020569073a8fb2b879ad2d8df0ea50fa46c62e05bac6d2588de1f8465b7d939677c57f360c6a7dde
+EBUILD bact-0.13-r1.ebuild 674 SHA256 5c36b726a3868713c41ae663a426cbb59151c021e1dcf73f8b84b6aec3098d38 SHA512 b1601d1110fdd875cc2236c3ca2b19dc74e60d2da66307c84f8537115fb33d608a1b01a28dd124a5a14cd2805902dc99d11b11463bea09ec5c1a5bbce0cd0085 WHIRLPOOL a68c4d75ce7e8e08d8137d34cccaa53b6054dc4e5a87a8f5621a4295ae17aff2adb665e1b1d242e9f96819b1648ac4148a1ee1402f9786daa2f9d70ecc33d8e7
+MISC ChangeLog 3001 SHA256 6cc71a863ae9e04b00637234e0f972be1b52b6d588d2e2dbb4ccc38a61c5eb80 SHA512 720f7f4cb6a6ce95aed2b54e0acfaccd708585e856843025d1952501e0f22ff4c7a5b28c973c53aaf9c88a02ff8a1cdae887c0f30bbef20682abe92e71f48bd1 WHIRLPOOL 8a7c06f5d9b34b226ab92da77a6724ded39aa8cacbbcab43c9adacb6a2dc85b59cfbcdda612ed4423b3f4d5f5746a234ea2f4430759d879f9f0c4f7970f13f33
+MISC ChangeLog-2015 1033 SHA256 c542712203af0d4a6f9911bc9b8d7b93d9293d649501de2d57649a1da39c113d SHA512 57a4b8a5d2dcc3a52ff2e06daac422dc6943ee4e3dc1c135a331d748f886fb5f8b1512c58b42bbc621c725f1488f994867510f1597428120e2b5182a9a1c0dbb WHIRLPOOL 70db63051b72b3b5fb3e0b7e38a7e881660e851a61b29119034922c0bee4ec5d997af9ff9f93bd2c8eb234514a4b8084ceb200a74f213bc281fb5fc72491a971
+MISC metadata.xml 490 SHA256 cac297ed0fff3b075662617dacefea3d0e3f1d4977dbbaa09f7ec4bbcdb2166f SHA512 0772c6cc2a90788091a69e6b3ca315e5b74e3ee93b7f5f857ce30c588bde689464ca87629ef5c4c8911920eb18e2dcb9eda3d915e6d9a52aacb3f039760fc31a WHIRLPOOL 1356c1df27220a58ffe97b725f5f92963d7e29452dd46ceb2da963983363fb857eb1a579d272e766e321d201d696fd9800f979102e3453f111bbda26d00d4215
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/Manifest b/app-text/barcode/Manifest
new file mode 100644
index 000000000000..0aeeea4c50e6
--- /dev/null
+++ b/app-text/barcode/Manifest
@@ -0,0 +1,8 @@
+AUX 0.98-info.patch 441 SHA256 eea6dd65ef32bfd9fc9dffc2b7769f8a3d36192fd39312c594859ca56b1738b8 SHA512 694c4ccd03baa7a17c0512b55b9a39fb2de34afef61194833fe5a481ba13c22f1d21217f53908ca8ad4cea536fbd9a6453486ba2778349e6b1651d2c67513ad7 WHIRLPOOL 80e71ec2535d065929aeb76c2c96d033f118fe5adb30c9e42114d05656678a02c8b7993e67f22f9cc4e90e86b173d1fcd4c8bcc8cb5fa441801bd89c64dfb528
+DIST barcode-0.98.tar.gz 335658 SHA256 4229e19279b9787ac7e98852fa0bfd93986dce93b9cb07d93a017d68d409b635 SHA512 b2ff43d0c752a9fe7c17d65ef136ff2432ceddd27879c91cb18e46e9b0fc8ed6c174aa4154c0fa6d6e70c478ac86448b8eafa1857bb759159b2eaecc8d6f7ca1 WHIRLPOOL 30bdb0037b5c69e6638175c27f96cce3329934b4febb634c48bd1b3b49cf2b6ef20462bb93432e4b3965f6f9f6a2f3d33d80a3dfa9365d9b69c993403a159327
+DIST barcode-0.99.tar.gz 890730 SHA256 7c031cf3eb811242f53664379aebbdd9fae0b7b26b5e5d584c31a9f338154b64 SHA512 f500dbe7eaa657ed6879316835557533e0972c8740a8bb61bea46efdd4120827a3c412ca24fec6e1833395191521425dae272f10d8553a252896b363290118b1 WHIRLPOOL 93cbc4d12fbc8d5ec1c4cd0b89f281bee9722814900890678d72b15a165ff27d1446f6ff7dd4b68c001ce343bb3ceb0fae6a3faabed30de5184e08ce0e206ba7
+EBUILD barcode-0.98-r1.ebuild 805 SHA256 9c4765b6ec99082d6e5074b64dad7ebf38cb5c8c19a5836e564bfc1c88ff5c8e SHA512 4a5207b85e31bd773e838541c0d4a33f762bbc484f11ffca272b3b90aa3c3369f51ec4639629d435afd5ec590967bb005083bd68f39a56f348a3717ef1ebe073 WHIRLPOOL ac1437ab1414d889e2883c2d81c0200a058ed595d2f7aa7129a6c1e2ab328fbcb360df26d045e33268b69d395efd54a976300c9fc6ec0b64c2af7fb0b140b6d6
+EBUILD barcode-0.99.ebuild 674 SHA256 29ee05ec0d7c02a5aa3e5d6e973359520d6b8ad1903790ac97e377be70f00b06 SHA512 a6ffef8901b504023a4efa95405b4f171c07fb974c238f7e78f96af75b39fa00fd00f72cc358759a85276af3832ee5b604a3a3ca5d90aee5944ccb2a5b8dd0a0 WHIRLPOOL 8fd1929ac7b537973bb69287826093ab120e6c4c8aa1e0e2ff3dfe9d485fd147131673deabbd333787ee26d8b8eab68d1416c6433661e951cbe825f20fa8f10b
+MISC ChangeLog 2360 SHA256 07be1c08538a444de2baaa802d895b189a689b467a35d5ee53c195b23cb2cdf4 SHA512 e76b3dcb07b2e7856e2aa42c72db27e67881aab0fffaff5a1ad51249ff17554c83de82804767b82987d6ac457b8205c7af4855655d8dfca5c50cbfd3e0b108a6 WHIRLPOOL 2335e2c94833048eeb4be439f59de14d5930587e2b5d6f038588678db589076793169606461b4452f3d593c2673d05e6aae8f88c3fd6e1c6a6dada36cb2e80ba
+MISC ChangeLog-2015 2756 SHA256 c2f11592f892c18e94b9bfe80dddb8dbdbc2b1ffd219cf195f1126eede415d0b SHA512 7a5af2e4ae79115479f60954a9e7b9f4b01893d82a8bae81a4beb3fe71ad49a81481f6f986fa2f5dd030f7f82d937df8e384dd6a8a761bf3991b8d9e180b11b2 WHIRLPOOL 4478dfe98895dac57cf37544088ffdb4bc4d637c4055675e0681f0543b223c562f58de7425d53c35dfe0c149735b79d3bfe7d9ae8313659775ab942f8a7bdd64
+MISC metadata.xml 243 SHA256 b66b8525fb29c095cd8ec13d15d441ab447c51e2b8af0d1ca2ac2cbb1a45c321 SHA512 dbdb824584151c0ccb600c9fa433898cb613604bc97c7305b7a0809d22574007bc9ee3037b3922ee5256471519fd27510c3168b24ca3f75ab63e5c3051502d3f WHIRLPOOL aa513e07000c8b4adff180bf45894c09a8d22a5870f1edee3449bed650d1829348c6d3f4cb469cf8d7967386d341ff07e072ab0a51d0b890f66fbd3dcae8fac8
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/Manifest b/app-text/bdf2psf/Manifest
new file mode 100644
index 000000000000..8c7b92b44b8a
--- /dev/null
+++ b/app-text/bdf2psf/Manifest
@@ -0,0 +1,7 @@
+DIST console-setup_1.104.tar.gz 3272857 SHA256 ad3b4156b4b39f59e5d84d53eaa91858d5b4a36ecbffb3ba6b78151316ebcede SHA512 72b07a0ed955069777c1691b16753534630bcbdb5cd94f05ae95e8c27436c233598f01418fbf52a29b6ecf7d8217e6af841778d8e5d329569f2f585b538ba03e WHIRLPOOL e3a83ca20dcc9cfaecfdc075886bb0f7195b38fcfdd43a89d9efc746dff104c6e06f31704ffc2b708f228eb43f4bd76873850d29f3451cc833c31b385dc7dd8d
+DIST console-setup_1.155.tar.xz 1641952 SHA256 0ddb3bd491cca99f6fa9be754dd64da9449988064af6736f62a0ee07f8fa7a2d SHA512 e00b0b48d91c9587c0659714f74de259bf3efd1caa553c4a06d9bc545335463808db2da16797ffca1dc59cae4f524619d3cf9a68db2ff5ad7b47cdd8aced37ac WHIRLPOOL 2e3589099ed48215018c1c15643aca206d4cf2018cce596ebb230d4a8335c063151c666c0874fcb3a1e8042794690f9b81896bbe67501e3d90106f94beb0b1bb
+EBUILD bdf2psf-1.104.ebuild 693 SHA256 65898f46fd9e2d9093af7760f90f11c4f9bb1d6acf6917913601e1f92ddaec89 SHA512 a4c868d5e4d02b5de553fda422e02b662a73b95dad846a758527dd66ada333cac9406c46d596f37d915a23d2ebd482f0e4752351d337969035afdc6130a1ad5e WHIRLPOOL 7e73965fe6751e5752ded52014788e59d8050cdc9d3ae850ca43f5505f2fee13d692f8deda25e2b6f3117ec7d633fdbacbc661fd1762ad095ff50892abb60bc7
+EBUILD bdf2psf-1.155.ebuild 701 SHA256 8d2912b26bc03c882b5b8e9885a6e0919a006935dd2b410c9680cd23f6f667d6 SHA512 d47ddc0b4e9a2f2c6839c4ede3043cebbd8100e1621486b006f3412841f51c434c28d893e4f6fd2f34d9ac485771351aa66c99bc097ceed0e06fd96d998c85aa WHIRLPOOL 019c68cff3ab2be67cfb84e40f7c2d8efa766beecb567892e79e5a1945530a4d487025ef3d335707822db44b3571e8051d08345613e9aa72b4e6cfadbfc7aa90
+MISC ChangeLog 3957 SHA256 ec11b6049f95dee57ef04bb7bda52250ffbc1bfbe22f6c0d959f8ee8378caf44 SHA512 ff1f48676a93c74f2897439ad2ccd6e4f59318fbb1bd4498a2266812d24c3785c0206589f090cad9cb9a57cffb54d65508e5ec00cb909735986a1895d6bb9660 WHIRLPOOL b737c9a81e056f6224d871b2a0e33f6cf968c1f9fee35d41b78fe3620a0d48cf427d583361dc6298abe191836229a37d40272b580db7d7df53b3aed30a9ad5f9
+MISC ChangeLog-2015 1136 SHA256 ea574c97c59c362f344bcc7ac65dd32b9c785da01f74941cc577031733a28269 SHA512 bb02eafdac9246252e73fc1649c1b52299aede4007c8f206b544eec0f3226cec62f5c9eabd690afe38b96f1bc93bb9b8b5c3534d777ab55eac16fb4f69a95a32 WHIRLPOOL eabe9b8ee61d396cd14c92444b765ebf763d96b6eaecaa94d883097d826d59c69c62f094f7d65109dad42103b531849afcb9e86f1366877c4ba94b5cedd5d376
+MISC metadata.xml 246 SHA256 87fa83ef14035e5fbb6dac93f3d4afd4085e971aab6d7401ac2b6bed9e5eb84d SHA512 b6df287a6e1f18bf267a05d8eb6dea788ae7ec74de31d9cea76fea038e4090c6a83d62221505d280d55e9b314d059c409e442951d78eb3a58928307ff118147b WHIRLPOOL 1e17af59af785717b26fdd3df4e84788475fa23ad410fc7a9214c0b86c57b80b54cd66742f44ef0a29d9c96611842d57d833d41568a4859b3e2fe491d691d55a
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/Manifest b/app-text/bibclean/Manifest
new file mode 100644
index 000000000000..49f0259d5ecd
--- /dev/null
+++ b/app-text/bibclean/Manifest
@@ -0,0 +1,8 @@
+AUX bibclean-2.11.4-ldflags.patch 545 SHA256 c58ec0c93de125ad387ddf43efb2e04479b517a6055adea26c068c4a1c4868f0 SHA512 29640b1fd56da829c58d9643964bd5d556bc45c82d16370e7bb4cc24a5772bd76c8f8c8e817fbfb52b61846d4184f258c44cbac3011f897c4796648900374669 WHIRLPOOL 1d83425244166d583f4c4539f00d04bc5d08ebe133684b1c4ae96ae44dd6b9eff263a2bb839e390ebb8538f14df724c2570c1b31fccdd6113894f2b4570f1f95
+DIST bibclean-2.11.4.tar.bz2 1244790 SHA256 cb38bcee5db50efe0135dd0499e2adf75574012467c1c6f72a63799198361225 SHA512 e04f785ca017148600984a852e3093b86eb3ca1c67f41427556d2b08e57e11f05502db5a5beb868a33780a12ee06dc7f5eb9cf794c8f7346cfce582e4761ce14 WHIRLPOOL 59fd63259bfbddb855a571777d840a6562ad9d99788a5e60e822cfdd1baafd544991b5aff8da7078e83f8c54d9ff58cb101531600fd36f423c7dbb633d97f1b4
+DIST bibclean-2.17.tar.bz2 2253830 SHA256 f44047660b4c2e19f9375bc960364ca1f61ae07751835cb9b2ffe3c024cd6a75 SHA512 5f0d6b315ecc98c47f48c1e5fe7bcbd374cf97dec5cc97ce4438300a7419e6b2f1efae313efdf9d21211e9cd658c1f4bac10aa3b0d55dfa8a5783d982b1dde0f WHIRLPOOL 9a3682772b9275feb93032c392efc6d8a936984da02403f71bb18e733d3dfac91cc589e77d020d1c3e6e28e8f9ea234e6f473ca90b3b12c7d45fc89713de9ac9
+EBUILD bibclean-2.11.4.ebuild 718 SHA256 48a7115b367306ddc6c4f2e13fc3dce30f5e3408fba24c540b672b91b953805e SHA512 2ba6b63cd53b9effaa95d2175569689d18dd5e0b4e19641d227f34dca779eba51ebaca4f9f1200b50b9c704bd5d4a0832a0073d3eddfa0bbb6a0e2a927659ac2 WHIRLPOOL 722ae6a56180dddbc427ad9f3a0f5df32f975facf198aef8a7149743cbeb7ba8bad5325661b137c6a363b3bfadf5104fd25c2b2bcfe7aafc0929a735c263cf69
+EBUILD bibclean-2.17.ebuild 600 SHA256 43c9f104e7627065320dcc14da783bc16151ca43b67ead819c34d73081d2cf31 SHA512 165fc67decc61eab8ea889c9652933ed741f7ddec7cb0a7a6c166a51878d229143d3b77e950667da55a68f937ae4f68cbbd729528372b2732cddb7e88e85db68 WHIRLPOOL da186fab987450e0903e7cb92dfdf285cb1b069ef3daa218003e2ad93aba3ae76caf7c97ad16e901134083deec736f7f75581f1bf9349803dbaf59d908759ea4
+MISC ChangeLog 2680 SHA256 d94d853cb753f88dd4a1cea42fedfa3254ef2acccf08cac255572d26fdc0a79d SHA512 12e5a5be0bae81e8c8329899dbe296042a92a99d28cb8d643257a73a1f4a3d8c5a7982dba921a51bb672a0d9198fec2d226935b3071554738e165f06f37d6d8a WHIRLPOOL 1d2eaf2a9c06288e3189b45f2b77afbcb516c401ff4f2b21d33e413f0e846a3d5a3adb3321e29aef08aa547375bb491c5fe1df5d76eee539f22ad2a1f75e7c35
+MISC ChangeLog-2015 1013 SHA256 386d9d5d6939f359aee00b1a359fae2eecb0fb99b01620f5bb3eea221153ee23 SHA512 f41680c5a03e47cb6755ea41265c116e35ccbebaa30e20676ac29b6e4f553da275603a37999f1416b6df931fbf6b21d1c8694b22b2c1f35812acc03862b0c571 WHIRLPOOL 1bcc8e724c974b83b9e52a3c87b3d64f8cdbd8b89fa9ca377f748481bfe7a69d1d665a154def02650c9a68bd7d4f5fa44be3cd8506ea0b3cdabb8e5df5ff2e9a
+MISC metadata.xml 245 SHA256 b3de478821488be2cdc91b078e21c911dc384af882c5c44631a47dfa91516dc8 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690 WHIRLPOOL 701a78fc2214f5fd4bd781477f85e87e716b8d76ea831a0fa4afc8871c4286cc363679f1ff4f844555ad4f77cc7265208b83e805f56c22fc4baeed1062280c08
diff --git a/app-text/bibclean/bibclean-2.11.4.ebuild b/app-text/bibclean/bibclean-2.11.4.ebuild
new file mode 100644
index 000000000000..2c38844314fb
--- /dev/null
+++ b/app-text/bibclean/bibclean-2.11.4.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit toolchain-funcs eutils
+
+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="~x86 ~amd64"
+IUSE=""
+
+SLOT="0"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-ldflags.patch"
+}
+
+src_compile() {
+	tc-export CC CXX
+	econf
+	emake LDFLAGS="${LDFLAGS}" || die "emake failed"
+}
+
+src_install() {
+	dobin bibclean
+	newman bibclean.man bibclean.1
+}
diff --git a/app-text/bibclean/bibclean-2.17.ebuild b/app-text/bibclean/bibclean-2.17.ebuild
new file mode 100644
index 000000000000..5e81ffbd2ceb
--- /dev/null
+++ b/app-text/bibclean/bibclean-2.17.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit toolchain-funcs eutils
+
+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="~x86 ~amd64"
+IUSE=""
+
+SLOT="0"
+
+src_compile() {
+	emake -j1 LDFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	dobin bibclean
+	newman bibclean.man bibclean.1
+}
diff --git a/app-text/bibclean/files/bibclean-2.11.4-ldflags.patch b/app-text/bibclean/files/bibclean-2.11.4-ldflags.patch
new file mode 100644
index 000000000000..e93c3be91030
--- /dev/null
+++ b/app-text/bibclean/files/bibclean-2.11.4-ldflags.patch
@@ -0,0 +1,13 @@
+Index: bibclean-2.11.4/Makefile.in
+===================================================================
+--- bibclean-2.11.4.orig/Makefile.in
++++ bibclean-2.11.4/Makefile.in
+@@ -343,7 +343,7 @@ BIBCLEAN-OBJS   = bibclean.o chek.o do.o
+ 		  $(LIBOBJS)
+ 
+ bibclean:         $(BIBCLEAN-OBJS)
+-	$(CC) -o bibclean $(CFLAGS) $(BIBCLEAN-OBJS) $(LIBS)
++	$(CC) $(LDFLAGS) -o bibclean $(CFLAGS) $(BIBCLEAN-OBJS) $(LIBS)
+ 
+ # This target converts the option descriptions from the manual pages
+ # to C code for inclusion in bibclean.c.  The first awk command
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/Manifest b/app-text/bibletime/Manifest
new file mode 100644
index 000000000000..0867089179c7
--- /dev/null
+++ b/app-text/bibletime/Manifest
@@ -0,0 +1,5 @@
+DIST bibletime-2.11.0.tar.xz 2403136 SHA256 8794db413ce927d8e664a873efbab62f8764a1f27b62d62165cb455ef55f1a32 SHA512 41f0751db30b9001d04e1c4040dca022c83eb440987104e2c3465f4233f8c0ecb1c940eac0433409f97f78c89c00d0f880f822a51219eadcbf3fc6513cfa81e6 WHIRLPOOL 664e9b8c9181dd604dec2f54ec7e37b042cc6050eb96e6c1c7b44ac2d2515594feb409be57645ca46cc8acc16c4a5875098ce35ec53b753b2fedd9b54bea9bbe
+EBUILD bibletime-2.11.0.ebuild 960 SHA256 f123e2257b9822eb2e162aa3c66030c18ac5adf64ec5fe92c7bb04d5f1acc453 SHA512 35dfdbdc5220a77856ad9d00ba93eb5b834a3f3bb00dea85d1f418af8a4212a959e09682f471b083e0cfff1e53a7dd3678dd55783e786f0adf39be16df786ec2 WHIRLPOOL db7081330a8db33eac124e61796595accf5c3319e144be9be0c46d8e67576395140a1160aea96a5a61d623f114faa865479d47958f94dafa1a1b6177b819186a
+MISC ChangeLog 3300 SHA256 7c275ca2704b5ea7b1e587cd21892843ed9b7fb9d93bd18650cbd8078636871b SHA512 33d998fe6c6dd233231a02c69d46a5cde13c54b399444becf671616bc983fd209efbc75222580824d856039ace3b171707e02416f848c0c67a0acdb98be4bd39 WHIRLPOOL d6f1e0594c55ebb704ed558f2753dccca00b47a780cfeacf53edb0d0b484e4cd93cd8b4f8f635041ceb7f819ca01dfcad8b31ec06cc27444145bf1f344b6afb7
+MISC ChangeLog-2015 10099 SHA256 7c5c826f1a91f1ec005c43f08fa623c6726b5c320493dbc4e0bb465631d82876 SHA512 26ab224f1a9eaf0af6c156496c8586939bee0b312de2174af7272d2f7d7ae67d9663815b8b539ef443847abab0e797852a77a93e27c298e5456cc847804b5f5f WHIRLPOOL e828bea9a23308be07c4526eb8dba3dc5a6fb2d9ba1fb5c450944e06dfb9f74fdc59b84145d27821722bc58bbd9689383ce54aaf47e019f98a90886bd05c3bdf
+MISC metadata.xml 658 SHA256 3c2a3dc7c6637384b2984e0b2b0abb7796ef7f4111f80090f6d6344753d3aadc SHA512 4d3e9dd30225ea7a354750d38bc4e4b9cac37a2cfe9e40d79835536b5ed9ae7c6704f1b12a32e0bf2926574378d6ec014ccdcc4a7af0b15f6e336d980060eeae WHIRLPOOL 154c24966034af3e46d55b244e1e7aa17139c03ffa3502d7f7d0970cd608d8036822288bbb9d2dfa7892097d73fdff23c62b855a9fe2ab0022c661545a5d01cb
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/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/Manifest b/app-text/bibus/Manifest
new file mode 100644
index 000000000000..b540dd31f9e3
--- /dev/null
+++ b/app-text/bibus/Manifest
@@ -0,0 +1,10 @@
+AUX bibus-1.5.2-bibus.cfg.patch 1280 SHA256 cdd318183769306cfc945951d8734b8370014945d520c3b8607eae0c442fb03b SHA512 f62aee3cd67d2c845cd3d19ee07ecab2a2a058d49c55232b7df51df3dde42bfba6a4f23cbc4d31f38788c9edf73780f444a4a5354b2deafac6a0f2d7158a2627 WHIRLPOOL fb05be4902ab8aedcf4e80a40c24d15270bed58ec6ab81e98b3660d264307012e1ada538287e08a137dc67e2974e1e8bcbdf2f6e4d35ec75cb4868cd25256c4b
+AUX bibus-1.5.2-install.patch 5630 SHA256 33d29b68cc89d8023011aa15d544769c832ba280eca98478c68159d41778f72f SHA512 a553cd687d0bd861b65896acb2cface6f8950e3a6006975ae53108d5984ead2e9dde8e610e003b5c8888bd0b7e635542a83c1a502df09cb6a7dcb85b8a0a1e33 WHIRLPOOL 1d0ecbdf8ac74f8f9c1e27f3d6e11f5fe71b5436922c457621a49ef8088d6597fa796e3c9a9f7d7dc4b17eaf584c20014a58128ac8f1eef835678f1ea9c3da1c
+AUX bibus-1.5.2-wx30.patch 7623 SHA256 37d21557bf4375b048df41cbdd346ffc08b57deb83dba2cffb55e1c141aff1a6 SHA512 48915b9dedbaddc6fc1f7adc6f197e1e5df01942a897c6aab664fa36c980a0978d111deb29e05d2b282f9ec17e01ff2117f11d86cd53600a0fa6ebfc4c6de049 WHIRLPOOL efb5b3a3f70639cd3538d337ab72215b2f6d3a02e7499ce7afba9bd74576fee3dc2da420b2926c168332493238828ea7540f6275d6127c916cf4773aa4c05b2e
+DIST bibus-1.5.2-lo-4.patch.xz 13196 SHA256 b7147230929c304ab357c6a725c5cabbd577607e6200df968cdf2c057603c8a1 SHA512 68b90574e9dd0bb3e2cc89c539ff35febdf4ac37dfb65c06709d21b62fdda0108c93f05d37ab96bf52c4f99bbe20caa361d562c297b05dc7ea37404eea659fd1 WHIRLPOOL d807d81277fac722c50d98575939142a6f1f5a1e9eb88dec0acf0053349f54ecce7d7dcf070742b143bbf166704994b401eeb1e1ecd3e32c351d9bc41c09d1d8
+DIST bibus_1.5.2.orig.tar.gz 5411889 SHA256 c6c66d6bdce403b7791bf58cc16eeaae9f0e9d1c3f0ba8411f9f3e694d740f02 SHA512 33d091dacc707859a11010fcba57691a3e2726ae7579d601720b4398f7be29b580be978da8cd058fab491ec5b52dd3ce33c964a8d5077f8e80d8f0f387ffa2c4 WHIRLPOOL 964f13902a8a20d9e838784cf1f0a032bb2327cd28f3b2470c35a7394ae7f7536a7884d798a8308049a02f6976183ffb1c56cc4d8b20dce13f98033668a90d38
+EBUILD bibus-1.5.2-r2.ebuild 2073 SHA256 d697f9e7200a2337d27def9544ed63e5851e69a9f78020b8ed0752de8e0c6076 SHA512 bb07320da8f9e63bb854010fad2e0096da1d4c8858b38ed04b15971cfdb5b103af233098f5d45dd1e9ef6831d070adf799b246626f04405c5f503302075ce0c9 WHIRLPOOL 2daef5c50ebb43c9a3b34bc687d398304b3bf2f685bd3724b65fcd2d763f0c9e219679c3bf1bc5f12311b808408f00926ad9ba7dab14327044aaecc7f38cbf04
+EBUILD bibus-1.5.2-r3.ebuild 2067 SHA256 9de71d7bd004abb59cf4bc303711ebe39786af052539aa07a5e6f9be39fd4f94 SHA512 c635061c82dc2c9496eda0c4bf587265cd54015eb070f93333a427bb8d2da8b12f98361431b9b37a6e552ed972069958e5b1f447807edbdc775b7061a75976b7 WHIRLPOOL 3066fc81f9c828244438d4ff7ed716555b50c85cf1b97b78092730c29b324581e1bbc639997b457bf1417d40b1d60037e5761387971b7492d610c85e9d0396a9
+MISC ChangeLog 3773 SHA256 b73db29405ae3406a30584ceed8334c0fe13e53b31a3e1476d5d0851261511f4 SHA512 97ffa22c04e16029a22d59c92024247cca7681ed768a9cd97146c65a61cfd8fb28b1c4aa382f6ccdc98da1bd34214fe571ddc68a9ab365277cadfcca6ccf461d WHIRLPOOL 00f1aad3c8946ed9d6847c76c4779c42b02c637e7dab626cde6f3ab0523844577f14315f7619734e4392b77c5c5bddfe3f8977d67df8e45f1b4a451abd12725a
+MISC ChangeLog-2015 6768 SHA256 09751212cad7560fbec3888ddaaa6a9b2a12223cbaf0b02ed7043db36bd412fc SHA512 04fe6a2f805ffca73a117c55936c8a186765cdc60f5635a0e5bd2ff56a7bb269744e3e81ec15683dee0d6a0430e5ade042300fd9352f173d92e4c91223b365ec WHIRLPOOL c155f7cacb2c02f0e58e88497584043b01c9ca6b502e86ebc9642c34d55ad24610dda000e36ce66e8663718a2982fd8e78fe8d3997c59c2b8a6d1e8177fe1e03
+MISC metadata.xml 335 SHA256 cd07b450a91fad05d81c79343968a94d3d3419d5765979d6905ed6cd15d1434b SHA512 fe16c696e26755549539bce6b16f8370df11af5bf69c774a103ea608e99525e83a8e2b355efcff51a42f8296bc0146e66d4d4e49004e1a54dbbaba98dcdc867f WHIRLPOOL 11ead0861679bc2f692c1ee669dc823501320590f9e1a509b7aa350f73c2966a94a0c57029bae06f00d569b4c17259c504f586425a43a53695e24172556eb443
diff --git a/app-text/bibus/bibus-1.5.2-r2.ebuild b/app-text/bibus/bibus-1.5.2-r2.ebuild
new file mode 100644
index 000000000000..fa34f6e11d94
--- /dev/null
+++ b/app-text/bibus/bibus-1.5.2-r2.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite"
+
+inherit eutils fdo-mime multilib python-r1 versionator
+
+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:2.8[${PYTHON_USEDEP}]
+	dev-db/sqliteodbc
+	dev-db/unixODBC
+	mysql? (
+		dev-python/mysql-python[${PYTHON_USEDEP}]
+		dev-db/myodbc
+	)"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	if [[ -d "/usr/$(get_libdir)/openoffice" ]] ; then
+		OFFICESUITE="/usr/$(get_libdir)/openoffice"
+	else
+		OFFICESUITE="/usr/$(get_libdir)/libreoffice"
+	fi
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-install.patch \
+		"${FILESDIR}"/${P}-bibus.cfg.patch \
+		"${WORKDIR}"/${P}-lo-4.patch
+}
+
+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() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
diff --git a/app-text/bibus/bibus-1.5.2-r3.ebuild b/app-text/bibus/bibus-1.5.2-r3.ebuild
new file mode 100644
index 000000000000..712ed76b6310
--- /dev/null
+++ b/app-text/bibus/bibus-1.5.2-r3.ebuild
@@ -0,0 +1,86 @@
+# 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="sqlite"
+
+inherit fdo-mime python-r1 versionator
+
+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() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
diff --git a/app-text/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/Manifest b/app-text/bibutils/Manifest
new file mode 100644
index 000000000000..59be2b280f05
--- /dev/null
+++ b/app-text/bibutils/Manifest
@@ -0,0 +1,5 @@
+DIST bibutils_4.12_src.tgz 447566 SHA256 2f98217a442db8d5532263893aab338535cf17053b79cc8bf82287c6af2060d5 SHA512 04329ecb685bf4d5314c6d3a2d5bb21e67112d73bcb49f5a7808a4082f32a9aecb40add4ec4b5320be35f49cd8e101dc1e35409e7c6cad8c39238d2122f91dd0 WHIRLPOOL c36fd9cba003ef7fcec7c9a004eac7c15eef663f3bebb2bad2483462677b0da893f4670e8fd6ec8a1476278c050d4a17517c4b27221a09a388dd7c4293452c8a
+EBUILD bibutils-4.12.ebuild 1005 SHA256 9ff7718c510811dabff1973664842e8a781dd00815a4b17faf422ede4eaff689 SHA512 fa3c470b226c04c7b3d4d1311ba44ee0eca3d70d34efcb4d69a11f1a6da85e94bf352fde88a76400a4cfbb3133b761bb71c4c45d9113775efa0e538ea390a61e WHIRLPOOL 9ee1f75a3208755f6c7c8347d24caf972151ad30be789f6b3441f3976aa086d047f6ea90135e2a64d6ef9be898e275ee6f2440a80033c40789b0d5762004f11e
+MISC ChangeLog 2428 SHA256 93b9cedf3b0a2d2800487d54ff687da7063a22d66686f5e79a392b90267f28d8 SHA512 199c16cb34876a14fda0f82a6ea3f699b65dc0bf12be4276b30a870e3cb4cfaaef32bc6a9da923935daace4cd029ed9c70240a43d7443b175b8f6f2fd0fbb85f WHIRLPOOL 40904928d7d1f809d42feccb06b5e699eede333d299da3a81bd73b59adc44e8b70483d068ba1bddcef296448832617542ffe83bdd89ed9b50fe02fc45d4733b5
+MISC ChangeLog-2015 1966 SHA256 6574b5a147617d4be21fd5c85c6aad0efd739dfca91c3908cb9ba4d6011666e6 SHA512 f52b18c4063d8f69bb025b67aaf14a9223c4b1dfb000932ef034ec88d88af089ebf1025741eec5529adcbcfd6ef540dbb53c8ea12fd3a58abda7d82aa64a2382 WHIRLPOOL 4566cdca12dd56c0e8f90caa844cf56a90347a31faf2f63007739a2ec4b523aa9dbe8f777f3539a303df75f3f42208124b5e5336a518688a70bb05c8c7e30a50
+MISC metadata.xml 249 SHA256 d92f4663e317d15aa310d71020356d744cc23e6d8bc8a52ef44a2331a3c37adb SHA512 29a9c1817fd4299246d5fa995b73b9f1996b112b70f468139cf9cd8f07077d831e0788d3b93aaba67bb38dce5850830c27543fccbddbac02b0da4ff899def519 WHIRLPOOL b995ffbeda7d1119f53cf016f0ed502521258c348735fe3b362dc082e0f76cf1a09c0848bcfd8b8bc97d6afc6104628f9c3d116a1a8f4c393b1fcc2471f6ddfe
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/Manifest b/app-text/binfind/Manifest
new file mode 100644
index 000000000000..024fdf8ca697
--- /dev/null
+++ b/app-text/binfind/Manifest
@@ -0,0 +1,5 @@
+DIST binfind-0.0.3.tar.gz 91222 SHA256 1db422fd185d0cdc9915415279952eceef9f426195081b970366a2f0f4dafd78 SHA512 b3a8b72669f701ce54fb3d1c2331262cfc7f396239d14741d3a106c999ef58739a7f33de87da427983ffb641baa7fae4857aa6aab2e1c0748a61d8b913dca3f1 WHIRLPOOL c920a79989db1097f5cf1a4c00001fbc2321cd8ee506abfb4092fcfcdaaed31ad74d6b6e328a4aeba12a30625bcc27b2c62a3b2a25b0a6f9568671c6f6611520
+EBUILD binfind-0.0.3.ebuild 445 SHA256 fb8e07770a753603551f3bece92ab5fbd091b07ddc5f30db06edb697eae49bb3 SHA512 db7ecf9ec9b44573d407a8190059b260209818c0ca971e7419570b5f25fa3bb936afa74c671f773b9be7d06562fbe15e455865ec67ee9b95c07a6512d3aa558e WHIRLPOOL 9eed9d1ff98c3011672c64f8ea0c164643ebf2dbb5ec6bbeaf46847baca9b993b3f0f036ad0261659350aea3735fbc877771ad0a06d67c81d458668f99f6bb5b
+MISC ChangeLog 2176 SHA256 9bc2b3ae54d139ebdb5e7d0d9f4bf312111fa2c3fd78294728e3b2bf1cc08ea9 SHA512 c4264d1bcaaa58045cbf08ca3ddeecdc7ef551315ecb8258c3d579f04ca075be5ba10d05c4a1e78aa321594bb53ef8223a501a631d0668d9c134fd00cc73ec62 WHIRLPOOL 1e2ec2b88ddd169b7d232369dedaab91175e9bd8b589085df25c3b41ac307615e51efcf03949f337fb3a6b1923e85b99dcd7644d7ed3301073d82da668244154
+MISC ChangeLog-2015 500 SHA256 89acbfefc582e80e0e229040b03f4c5970264a5871939ded643c6a5791c50624 SHA512 78d5a226eb829166c0724caf5f9f1597131beba80d46dce829269b56f67741ac1d44168cfa3585a343cd162ca40a5bd984c9dc2953e433614fff4ae7171cfe7e WHIRLPOOL 3d67d8103475e72f92acc388561fec5f65f2164fbd1496f32068137433e2dad29a1a24a1dd9140d4e2c251738e3ec3117a64f53f4cbdfdc44c88420859af96c7
+MISC metadata.xml 216 SHA256 f7475919f28a8a93ec8bd025c8f8bbab918f66d0d1737420c876f0480308fe6a SHA512 e881b59fe49746eb25ad66c258b41aba501e4eb563129093a3898ea970a20506e7898f7c355cfcf99605234962bf2c77c1309c258b9a2b84ee4302ccb71c9dbd WHIRLPOOL 163285b60aa93e00993af659dc1e29a9eb245bd3415dd5ec75b284250596165f469028102b72fa0c344834443a44c1bbcf6272fe6a3f5211f721fc96e1c6ec16
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..ad56526c4417
--- /dev/null
+++ b/app-text/binfind/binfind-0.0.3.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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/Manifest b/app-text/blahtexml/Manifest
new file mode 100644
index 000000000000..7bdaecce15d6
--- /dev/null
+++ b/app-text/blahtexml/Manifest
@@ -0,0 +1,8 @@
+AUX blahtexml-0.9-Makefile.patch 1811 SHA256 b48dd33230532807e743c12292c2cfc6a36c76043bf40b3c1e5fa7d3a581df91 SHA512 e27fc386b4392d33fe6b78379d364d3b17586c12843acf18fa16244169d151f8e750804289114c24f179fca6b0abe94f4eb622089af90c538dd7e9f3182d8d18 WHIRLPOOL 42911792e45dc3b2864313dbd950a81259c25bbd4c9b49f59ea53976837006c7611641184c87812807a30d2ce70a1ea0bc7537523fe511abc7e70821044643d7
+AUX blahtexml-0.9-gcc-4.7.patch 672 SHA256 fd71bebc80c943cdf91c3a223f1e7568290418bb92869edb3b051c1a3a3aaf58 SHA512 d683ea1113f4aaefb692b8a7b0cb7365673c835fa3c85e229243d0c96ee2b2ff52026dec96d1670cc0e42f1fa9124dfd547445e6e5b0a85f462e881f177d2ad4 WHIRLPOOL a8eb86c61b2b755382f0e4f73014c966ff2f6506f04a626e577cbfed1cdac7c657a45436396ed8237ff9ff60d7a32ee760163e26427bc77a0b1c0f976883202f
+AUX blahtexml.1 3094 SHA256 dc845cfd1cfc4535546319995a6c094c85deb063b61c5107a66e9a1b7638ad51 SHA512 0f114e4cfb806fe6d120a738118ccd0817d898434a9d878cd20e5ea59d804420f07b90b9763a387e5b29251ca4acf9b1d7b7b845f9f86036d9dc729775155a7d WHIRLPOOL cca4b4dfa0e5375719b69d37cfe95e5fac208c9384f38d8082765f1c4a7e6bf5e90aa266e436cf41357bfc538480b1313f0422c6fa62d3754a997002d6139d73
+DIST blahtexml-0.9-src.tar.gz 168564 SHA256 c5145b02bdf03cd95b7b136de63286819e696639824961d7408bec4591bc3737 SHA512 5a5ddd50c0b3a25954135c44de0ac3a3d992e3e9dd691a552512415c385a39011595683877cdf98aee77d6ef2f9dae750214798ec2af69b8de089d0aec64b042 WHIRLPOOL 10aed077f16914f2ceff02929069c305a1b6a154e0aafea1c25048b9394c2fddb76cd852c83a1025464e89ecaf7d68d0f552e47818696a0343518fea8deb2852
+EBUILD blahtexml-0.9.ebuild 787 SHA256 de8aea13977cf55df9214ac007e3e47214fa27aa241b0a9526a75a6848bb0cef SHA512 bab44aab55fbc4168ca15df95765472b4960a2b9d7d93210cea3f8647c2aaea00374a74831dc7208a4633870d47b6f53a1cba6f7aeeac0b335316a46783ae507 WHIRLPOOL 4aa08c1fc83d3aeae39f3f1b999d46d2cecd4d014d031f837a8c1efb972c7058a49e6827c74fae0080a3079af132047fd63e224b6f4a1439c5d0dc5e335b6dc7
+MISC ChangeLog 2273 SHA256 d5a902d55a50551ae92870589f6c3b6cd576b140e9ba6165f8e1bf57a7c22915 SHA512 ca1e25f98d189b8134579d9ae44bcf69139ac6821bb6ec42d6d1a455460f9e51a6c4db6f1f0d17432d7e98cb842e9a84b5979efb3841e8e7f246d1fa3af1ac31 WHIRLPOOL 040c02176737b19d669534d7c2c04efb7b268ae1953b8c6a190cdcbccd5a911f7764b166e2693dbca8b7762cb0d039c466bde66b07002bc834a80a25f24db92b
+MISC ChangeLog-2015 1030 SHA256 093cbd853ce772db33861a77eba50e4503f694e5818fa4a27a8387c333cb0c43 SHA512 11eeabac2f879c160a988cea711935df30388be641ed8e1b2cc96998c03b7905bb64cd83987fcecea3e0463b36091537f9f4032840c617997d8ba05278b1eecc WHIRLPOOL 7b9ec0c47d88489ab009e29e9987af393f1f475cea7fcc66e085d23bba53108d88c4a86c2726a4d46514e1b22605ce5e18ea5bfdb3b1600fdb4b5f98b06acb14
+MISC metadata.xml 168 SHA256 9f5073e4f4682efd1d4fda14feb67df188972340a55fa9e06ee82b66e24f8cc8 SHA512 00eec08786156434460f5ed77b647579546cf1a86341a4f2c9c9c84326468c2c21dc5101c4277103b19266bb6f788823f4ddf3b9d044da26326d79bf2ac9a274 WHIRLPOOL 3ec0b2fcfb36e82c8f9dd8877875a38095bc9b11aff96d69a7919ee610efe27f65318c974161f6ba135150ad361a8c108938841c3d48c42f5a92d1762858d898
diff --git a/app-text/blahtexml/blahtexml-0.9.ebuild b/app-text/blahtexml/blahtexml-0.9.ebuild
new file mode 100644
index 000000000000..50be0fd0c5a5
--- /dev/null
+++ b/app-text/blahtexml/blahtexml-0.9.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 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 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/Manifest b/app-text/blogc/Manifest
new file mode 100644
index 000000000000..76239e517868
--- /dev/null
+++ b/app-text/blogc/Manifest
@@ -0,0 +1,5 @@
+DIST blogc-0.12.0.tar.xz 290484 SHA256 85453c0184396f217ac95ae8ba70f0693b16f57321f82a09b7ff46d3a1d257ac SHA512 959610d6be23bbb011a881712deaa8100120a1a76c4cf4722716a915d55af7ca93ed416d3a39cb8fbad64e0693b64fbfe3055b1a7d012a003c05122a199a65b9 WHIRLPOOL 8ec096d2fbe537b29265dc92eea8b913e83396a6dc1629e9a86434e0e963ee4804183625c1a51b9730f7822175af77a0ad5297614518b86c25d22c9b54ef4300
+EBUILD blogc-0.12.0.ebuild 1059 SHA256 f2193f16013b89cd5a75ce5f889e49fe31d95a0dbc2677d90a28622aef4ffc72 SHA512 682eaabc08c412f8783fcf418d7c67cfca5c1a00967d57c6ad7bb45261d7460108ed8374cac9c7c7ed9f39529ef9e1056638fd24f14a4b20fbc94c127d103bf5 WHIRLPOOL 2dfcf4f1d00df9699915999bcef67a5a7ce2ed29a970a2bdab69b3b2dc8179accc02450582019092c7e85b58e9eaabc13bde5fbe5957a1396a5e47ce2bac86b2
+EBUILD blogc-9999.ebuild 1120 SHA256 3bcc8e0219dfab274b1d779146910a7addc0923d59bc7224669f531873acd5b2 SHA512 ed4c808f2cfa1435972a53ae17f76a9e3423943713759cb7ad7378e6417a3912dbb16e0964d963dac8a476be37c90a42d8f875128101ee806f12a8ab11a519d9 WHIRLPOOL c47edca97b898f9c2648a77c633de276943cfbcf1babcdbeb7df58ad655fb214755c8b027283d6a3467f8df63c079b0605e9fa8d42004467dcb8baff6ab125a4
+MISC ChangeLog 7443 SHA256 c97584592377bacef640f5acef20fe7db503e1d77eee817576d42e00b8ac9e6e SHA512 590323ef815f638baa4525d3ea45a1f3cc316ff820c266af4ce20cf1df741e7ac05d347fb7f4a598b38c90505717bbfb3bdbd2938fb9cd7310e4e6050fe3aa5b WHIRLPOOL bcb6fce5ce97bbb0d7ac1bec316568b36cc28076f5f1fe93a7ac47b72cea9ef1e20e86df61a6ac583e4ce35b0c9340d78bc39b06314d585ff9f6043ee0fba927
+MISC metadata.xml 785 SHA256 86755fe3de81a18ae42a2e43700cbee96209b3b1645bc31b31acfbdddbaa8343 SHA512 31230bdb8113bb73662328e0e657e710cd33e65f126d638f0cefdacbe97525643604f48ce3da27f80b8163d129092c7df7eee265cd6d6194cd0181b138230206 WHIRLPOOL 842602c93857ff4ca6724b868e007076abdf8ed47619cf6f90d70fedef798c55653970ad58a12423d2c835896c3b6c3a4168e614e499d68baf1797c49744c9d7
diff --git a/app-text/blogc/blogc-0.12.0.ebuild b/app-text/blogc/blogc-0.12.0.ebuild
new file mode 100644
index 000000000000..8dfe5bbee967
--- /dev/null
+++ b/app-text/blogc/blogc-0.12.0.ebuild
@@ -0,0 +1,57 @@
+# 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 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 httpd runserver) \
+		--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/Manifest b/app-text/bogosort/Manifest
new file mode 100644
index 000000000000..f5944c03e116
--- /dev/null
+++ b/app-text/bogosort/Manifest
@@ -0,0 +1,7 @@
+AUX bogosort-0.4.2-glibc-2.10.patch 1479 SHA256 8c0aeb13b37d7d41b1a93ef85c887aa0aa30c6b6ca5f7a80a0fdbe7894baac60 SHA512 742b473df18b8eee876857fc3fa14bacc95bce4e14d083deb066d4451385437cd040cf40b6c572762c047b1aaa3e2ee973f2d880c5915993bf6a4ba130a776e4 WHIRLPOOL f41a42ff2eb02f1e3e81167b5516c508e7d13899992b2b54d5f20c7de02fae55bbeb15799ff704e77b0eacdbd3510af9df23a3240292f9e8b41b80386482c696
+AUX xmalloc.patch 395 SHA256 40bcf7bb6475d1c69f7777da6ef27ba7e96e3ecf99aa3ebfccc842e89485f953 SHA512 c1479f342d71e1c53a2b038bc7bf858292c6585b8360b41c6006a4ef0efbafc3260cf8523efedee945c084247851186dda3450ab0533465c33176b038a8c0243 WHIRLPOOL d85104ea2a67f7ed5f8fcf165c7026562731fddef10dd9fb7a8cd48ff82f57d8b2f391c9a8d8d029ebea5a4d6ad65b1711b9f670e44b798346f74064d7d903b7
+DIST bogosort-0.4.2.tar.gz 161628 SHA256 bfd66ce866bb8935088873c52323a06997f627a209da1017491425d93e5510ef SHA512 2d2f7be36ec08aa78323cbdc5f1030297706c364d6fc82554065cf737295d11c90dd6061323f2732b63c70401d710b2018075bff6d1e6ab0078069b405ea62e9 WHIRLPOOL 35402daa7555d86327d4bc9534b8d92bd0f34413241b8a24914a7bbf32a2f4c7708ea3e8fcc0420c0ba2b73a6708581df8dbfdaead3da05b77a0a9a72c6bb241
+EBUILD bogosort-0.4.2-r1.ebuild 702 SHA256 da107dcc93c5ea38cbe3037575f113fdcb3dbf4f41d2621bd35cf04442185600 SHA512 7baec5a2de60f5bbef8689c12d6fdc54a3fd40dee3b64877af819422f986c50fb706c52906486a055af2ef16650e908a3c5b960181dba14b1ee14955d5c7a769 WHIRLPOOL 35c8de0eaa149ba1b93515c2d41616a52329a62ab65eee03b4ed0a88e1ad764e0c7ecabae53a7d042816f5cc4d067b276758dcb587b3645521ba779fcb55aa98
+MISC ChangeLog 2500 SHA256 42d40a79d78def9eec61ba34650ef416c77c37f625faf23b4274a5f01b4d31f8 SHA512 26495beadb3bf3bc8c7add444ac0f0d60fdaaff5bb24d727db4010cace2d88e0ad9da23c76aa5eb030754e271d6a48bfb4ff5e390a18136ece2466d2ab1eea50 WHIRLPOOL 60b2b407c56af431f14c689bd4f664d81bf148ddb9f89b394b5410ef2876c1ea3c3eaae4a3020d9ba90df3c579641b4ad4bac7e8c490e5f4e55c00945ad21e2f
+MISC ChangeLog-2015 2959 SHA256 e66f0d7736c748ff278b0f4b77b07f43cff876bc2bfe668ec6e3f33209c846c0 SHA512 ebf7dd087942d7fd14660da9ef0b88b94aa307f018fa75b114b30e77cea150a223aa150617828e4b156293a0710be90958122fc41fbff0060f5707904b3a0482 WHIRLPOOL 67f81fd9bb96950432e716d5ee8613920bfa23587f0511fa1a2857d9c1e7149acfd6426adec8d13bfa739108bcb42e1931e8f14ee23b147a9552a8a0f5d74cb4
+MISC metadata.xml 507 SHA256 a3c182e5db58642fa02ee9365ef42da34bb729bae7e9f18061036ef203a4ae73 SHA512 6ae8689da9f5a0628f5543ca7958fe0dfab379c2c6a7e2ce3fd8aa67e6b2ffdad15b18e6f7d132019d59511b036e1dbcaabd28bd7ce710962fe6c21a52719a68 WHIRLPOOL b3d545ba46ea471c3afc3933ace135c7b24068b1a175840bdd6280074b18459e8110f8cad48d5ffe947565ddf1fce1d4a8da5492e0f8eb5ff8bb18c72bcc3ce3
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..8d70e291eb67
--- /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/Manifest b/app-text/build-docbook-catalog/Manifest
new file mode 100644
index 000000000000..8c2c46a2a9eb
--- /dev/null
+++ b/app-text/build-docbook-catalog/Manifest
@@ -0,0 +1,9 @@
+DIST build-docbook-catalog-1.19.1.tar.xz 4552 SHA256 78c3c6f2e4703d5fd7f24bc737777fadfd52a0d2f7bf4bbdc217cb927721a149 SHA512 9c4b1a30d8b2f820046cf987296035a1418fa55f47c2adc6702cdaa3a01efc8584bdc6804889cf13a85bb1f30b129af5c62ecf8a7376d56d0738f717619ddcc3 WHIRLPOOL c219b126a570ba42e6ed78ccfe8fa581f929bd6562332d2722c33f167831841ffc32e3a919342af6f38c1babeeb6e42172da7c580046a692eae5777f630c2e57
+DIST build-docbook-catalog-1.20.tar.xz 4620 SHA256 9475e60a7eda5d9a427315c0bd60a04b7e1f8a214596d470073aaf9db8ed47d2 SHA512 65656c78709a8da01cfedc786a31da2de125eeb65bdaa3d2e49ed3a0a7ff4429280d5d384f23dca0ab540b74f7c9b2ed4b80e970905a7d2838a841c81925b3f6 WHIRLPOOL 3f2b52f82ca08bfcd4fb81acf6d4a09f5e5a6e466fc1cf6bf1a16fb4f8f47dc60b3fee10e87db7027fcc22d4eff545c071185abf016a0c1e147cb5572c645e88
+DIST build-docbook-catalog-1.21.tar.xz 4620 SHA256 e951a6ceb553fe74d45658f7805dda2daef466a2558c6ed30bd0bbc02a4f3394 SHA512 0becc1bae100101b072c62bee844157151336aebc39a046030c8b7b501e13f1b3552097b244ac51339abd2e724304f4fe728861b7d5f070c26973998936861bc WHIRLPOOL af8237aa112df1ca186790a2692674771f0705338604115610781d3aa05dcb034ef2baf2a079e153e0e4dd0e0d1222cc819bfae8e40b9486540020f56a79c42c
+EBUILD build-docbook-catalog-1.19.1.ebuild 773 SHA256 d269f220fcedf928d468f1187a39dce11f17679afc7ba732bcbfd0aabfc1d9ff SHA512 c70bc6fef6cd6b333594dbc1ba5b61a74feb3c2be312c383c1c2f25b48b3cf5aabad9cbdf516f320e4de9e983069a8a4f2d965b340f64ca426a99257030d10a7 WHIRLPOOL a32b88db1fd1c4a8aae271b40df24fad3d3d17e9ce81b8e0342c89bcdc540563b589c780afa37e78f4c52cc08a869ba2d709a42c1a19f7ddf339f13288892b61
+EBUILD build-docbook-catalog-1.20.ebuild 1152 SHA256 e3b100f16b0168e58356114cbb9e1f136f0770aa80fdc21454603441caeebfc4 SHA512 32f38925bbdb050b4898e39328e78223e00307981d723ccab9cd86323da3d66bdf6d35240cae7075450997d8cacc7799c3b7d2aaa7edd78012bd7efaab935749 WHIRLPOOL efabaccc5c297e0f99ae45b71ffa9e4749e135087428c014a2c7992848093a0ffbbedb9ced0eed6cda000f83bf51d8a529cca77054d6a173da29866f9527d463
+EBUILD build-docbook-catalog-1.21.ebuild 1114 SHA256 ca3496d1eb1239d8139d4b3328b35e0516c1cca7a01eeee89af48361e194077c SHA512 9a9338d2bf96598d176ad7b36e8a2e3877dd576feb427b040e059720bd7d08e65a9458f041ed109315cdd797f5ec9c49225e931ff68af602355c5e93f79b4a52 WHIRLPOOL 5a105a979f15602b485e8e30f810cde7f1b14100bd27f1b90940604dbc49e74b53196193541be79369886b2c947c84c02f7560b9ab7fc088b1aaa6fef0dca7ff
+MISC ChangeLog 3437 SHA256 19a29697fca8bccd90f6325f2c1d4c8cb4889491743125331876dee9b1fa7d60 SHA512 d5f134478c270fcf4dfbc6bedd1f28a80cc42ea346fa322c923e7ffd44b1a8645a4fa105ead6c2dea277656e61254ca6c3d9dfe2ec5888e2f4bfb8fa931a1105 WHIRLPOOL 2dfa41bf5bf0fe38c307dc4a77ee7d9cd5688feaf833c959f801c1196fd4ab5c2ceeaed772327d6a4328f44e4586a3aecd3206d6a70286f93668ae81e59b7a4d
+MISC ChangeLog-2015 7035 SHA256 34759b92fdbf25c4e9fc74b221ec331cfe383d26630890eb91497312ee208130 SHA512 0542aec9cd1e3e7aa4386a5a67be248b827ebc75aac5c260a6a516fbd03b151f70eddca61341fe5e2afe765c5f496fc62597a8d3a389c66b92b5d536e64a27cf WHIRLPOOL fb0665e7084badfb1a3085531fc8e6bdbd851747410044e2e6bf8c9c02d39fb2d860320e8cb867864565ed878325fca2ed24baddbe9e3448d99733739d0d04e0
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/app-text/build-docbook-catalog/build-docbook-catalog-1.19.1.ebuild b/app-text/build-docbook-catalog/build-docbook-catalog-1.19.1.ebuild
new file mode 100644
index 000000000000..90ceac95f47d
--- /dev/null
+++ b/app-text/build-docbook-catalog/build-docbook-catalog-1.19.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+
+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/~floppym/distfiles/${P}.tar.xz
+	https://dev.gentoo.org/~vapier/dist/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+IUSE="userland_BSD"
+
+RDEPEND="|| ( sys-apps/util-linux app-misc/getopt )
+	!<app-text/docbook-xsl-stylesheets-1.73.1
+	userland_BSD? ( sys-apps/flock )
+	dev-libs/libxml2"
+DEPEND=""
+
+pkg_postinst() {
+	# New version -> regen files
+	build-docbook-catalog
+}
diff --git a/app-text/build-docbook-catalog/build-docbook-catalog-1.20.ebuild b/app-text/build-docbook-catalog/build-docbook-catalog-1.20.ebuild
new file mode 100644
index 000000000000..685216e9ea2e
--- /dev/null
+++ b/app-text/build-docbook-catalog/build-docbook-catalog-1.20.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 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/~floppym/distfiles/${P}.tar.xz
+	https://dev.gentoo.org/~vapier/dist/${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 ~amd64-fbsd ~sparc-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/build-docbook-catalog-1.21.ebuild b/app-text/build-docbook-catalog/build-docbook-catalog-1.21.ebuild
new file mode 100644
index 000000000000..6c36ab8153f4
--- /dev/null
+++ b/app-text/build-docbook-catalog/build-docbook-catalog-1.21.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 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 ~sparc-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/Manifest b/app-text/c2ps/Manifest
new file mode 100644
index 000000000000..7020a79dbe4f
--- /dev/null
+++ b/app-text/c2ps/Manifest
@@ -0,0 +1,6 @@
+AUX c2ps-4.0-LDFLAGS.patch 342 SHA256 dca0b51b7c1e790da7a475d213d886017c44b81671da189cf93a7d4bf103682f SHA512 79e943df0b2edbb6a7ab915e4760c46d34ac281eb2249f24be26ead327cf0f2bdf1aea58cf9e76453e89b2902ec2790eb50210cfcb433ab91a8449b03fcc3945 WHIRLPOOL 9562b366b0c319ab91c728fa6dc6a6a258138481c771c2aeeee95d691ccb758441d10d74c96d09785e2bdc84c922069bacd83aa33d11aad35e7795fa154535eb
+DIST c2ps-4.0.tar.gz 48137 SHA256 c22800552b6018a7f01978cf918ad11ec780404b3fa87888e76929a08414a860 SHA512 dde931a201950412c8aad04a59f9ca0862b21a221bb7212ee64cbba0193421f1538804525361075be3ed601c5015a0c4e0c3592696f8b545f5a45524b2c5c619 WHIRLPOOL cefaa75a7553020059b05b0dca0b592a8b18632bb88f7b5b6caa7d22f24c8af95f4e30d0610ba1589b684b4904c7deca6339d5f0e2380bf29f25db9566d9f4b7
+EBUILD c2ps-4.0.ebuild 683 SHA256 d86ab315cdc115d4adcad245ac7bfdaee1b653bb5cd41285ccfc7759960b9c95 SHA512 a101fe636fef9abaacc97f96e225b99965462fbdf1744ef113a4abcee43bf351a5195d881b1537f97d4995b5017bb9ca112ecf808a6d6c054a711daf52d66111 WHIRLPOOL 79d311a9cea3330b5cd6d7bbbdb7412a627524030f735124d5c2d1ffe2710038ebaba1865bc72ff7d1f8c8e27459e11fca2afcae43995cf3c738ac16e1505f98
+MISC ChangeLog 2445 SHA256 eca4c1fb7796c16c8f1e7ddb4683a21f40b5f87a013ae66da3e8da28bbfd4727 SHA512 c51c8ea47418950dcacde8623b77137d4afb86afd72aa7df5ced723c46af4f2ad9f6dc24c1447bb83324c5f2cd4ae209c1bf5d9223aa226c5fb87fd69621b035 WHIRLPOOL da806deb544cb2f399d41d3407e4fd51f9d3752769f1028b566912eb10db2b0c6db74b2f7419c4f034b81d17f19b5c0293fb8345839832e4dcce61af96b43fcf
+MISC ChangeLog-2015 2048 SHA256 ea68f75bf547b222375756e20b898d9e8e3fef3575c73fc4c9fff4300f02c4fc SHA512 29fcac10f3c5fc00e02c2e53387886d0878d470294a93cc63a3f59b756be78873a102520961f38a7966287dd21a52d75117ae1ffae4ca882d67e18959c19e673 WHIRLPOOL dad254402793dd8b2e719cf137d343977d04d42c9bf8d72799d55801b41dd4bf9c1e82918f179d4db4ef6ebb4d566654c7c21b031224ac2b0a0f4a93f591513b
+MISC metadata.xml 255 SHA256 369a8c8c92b41e8d46a7225354bd493797b21f0b8b5c3f9ad4ac0a7e14322ebc SHA512 c6c5f966cfbe396fde1b15334442de9e0004b44c4b48775588b0b25a058ad1751252761370c9c254280e97561fa6306f5aa0cc7959c675d4ee11f7f95d777a36 WHIRLPOOL a6043f3549b633ddc8017207016e272af3ca85d175e603a0bfffcad7c5fef4457a01bfe76ceeec5ca09e957dafb78459db4d9cadc6ec99874d5be44ca85e27c0
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/Manifest b/app-text/calibre/Manifest
new file mode 100644
index 000000000000..a4e326604c67
--- /dev/null
+++ b/app-text/calibre/Manifest
@@ -0,0 +1,16 @@
+AUX calibre-2.83.0-lzxd-bounds-error-bug-540596.patch 1296 SHA256 468d264c1120ade7b423e75b181fca5cf1d289812cacaf3baca58cbc3886d804 SHA512 fba16c95a69b38113d4331faceae4a81f2319ae1631a03662bd3483ad6f1b687d16db28f9df019990a3bc6918c75f4a4492ca7ef772168a575cb06ff0761bddf WHIRLPOOL 01bd3f992794b9a68d75c87548623803d2a84ccba7ea2a83b43c272c42ba7bfb9e8ea425f864d1f0bfb5b906d3152044b4d1bcd2c5d5e4d11ad6f37f0d9c365b
+AUX calibre-2.9.0-no_updates_dialog.patch 1661 SHA256 2a711b55c48bb53ff54e1654c7a907212966e815dde879f8e154df389127c230 SHA512 9663b95ed64bdc2bc40692922384d1c6073177eee58a49c412883c4d2ae098e4e0b4ea51b80443108b7c0c3e4f3fda60c00fc3be4d0b62a5d79d982697927235 WHIRLPOOL 6af5e426e2f2f4d2dfc8c0f5150b5ae70dea0c536ddf50e531ecea06d203ecac93d6743a4cd7418dd93af95e2ee251a6c06aa93535bf75564819cf40babb1e5e
+AUX calibre-disable_plugins.patch 1042 SHA256 4921ba7be29d8e2789f3e31d23faa96f308cbf556f2704c001a3dd4dda9dfda2 SHA512 c152ddd92728a89db10c75a4d00a968bf119bef68da8b9116c76827e3cdc8f8a7e5c45fbb973f6ca8db1f79e461518351ce2d47e5e059c282f36d2df499d1629 WHIRLPOOL 8a4870df539bc768b9dcfb28623773d730ba27ef307dac856f4fd9ff682b710a7b33dc93e505cb5d974a95885089c079838a59d579c496ad6a173384eb14bdda
+AUX calibre-server-3.conf 541 SHA256 be3511e03fc38beadac6703eec5720bae5257b11f6bd6dce907ce977b1310ed9 SHA512 12ef793a5b6ffd4413f780a13cad63927a95f15d17d85d4229eb5005ead68e51779abb822f9898ab5ae8c2094affeec1f9e85c34f109499739e6726b7641542a WHIRLPOOL 18ead6612ec8eba3953323ca1327689610f5a84466e582f786aa8d650e946b20e8516c785fa172819c23b5d6e5540246493d70a728184286c67b41fab8044e78
+AUX calibre-server-3.init 1796 SHA256 49d43520cc064781a04cf53bc33892c75daad7bffde8ced9b92a986cf11fc74b SHA512 88110ded1b9c6cf8d3bfc3d5889654f77578f9d299e88daea9023767b930082e00fbddbb92a6e43c46d900248f3684232d93396ec1d0e784c7ec14b44783f98a WHIRLPOOL 3c1eebcceae3bc8599b68d038bfd5049d652114d43988ac5dfb182e677efa8d406ac7422b7a631ac9ad415437b96a9192d30c83823a81fe348afe10499998a73
+AUX calibre-server.conf 523 SHA256 55b20e6a208f7eb7128e0f8e0f8ead83a55ef80bcb62737d1658074141a5b213 SHA512 4595786d9b6ed7662a1124e8acc32e03e0149f614a07890f9df08d05811a1b8de51cc33cc1bfbf30b072c7ad75dc3b8247e9de53d20ee2b45017cb4160437058 WHIRLPOOL a4ba22fb5a9893c2db6254e2ee569514dd132284e0f4e8b62561ec3def773c917d17d6718975b1ecbd02197cb3330506e48b6dd656c20cfacfd610a680e34db1
+AUX calibre-server.init 1811 SHA256 52c42322c2766848384f1695d0ddd805fc6344984700e10678c991408d6839dd SHA512 760aa7a8f51b23b116ba07749855737869ff2313f0528d67e5a46bc362e5c0a04a7e1f46c32dd6e82add4fa5dc41d397db32dbd1a09c912008e0890d1a133eeb WHIRLPOOL a2d53be995c282c45d344002e8769fe73b9aa6baa4b53a8672e399e0155ad160aa45d74ff93c67c2f29e030acbba577c9e97427af406672ed6cf4eaeeb4d4404
+DIST calibre-2.78.0.tar.xz 38739404 SHA256 d2b0b0c5451d3ac05ce9de0b801ddf8de7664fee45f273d7ee8445a1ec2f898b SHA512 0779ac385dde45ac4baee7cecb0916e245f3e1cf20662bad9d9a4278265390b1aa89c2b478601b57113e7de08a69343288488ee299e8b43332f0129e650aa0ca WHIRLPOOL 325fc344445078ef0df0a29b4cd8e32445a881ede89e3db87606166ff0c8b7db10b7cc34432e63c2bb49382537a5107686339b987f1be807d59a1786ddfd4a75
+DIST calibre-3.3.0.tar.xz 36308116 SHA256 0cd42109f432995a75bd921a37444c142cc25d178083857efbac756f615403ff SHA512 bb63f83d5e35079daba9ec6e7849e6a65c51cf0b2da9fc45b86a2b64cc147f862f08413730f3d2710793de7b045fc73913534dfca11b128ad0ea72e92033f977 WHIRLPOOL 151c6633f53e75b097276f026fedd083b8b7aa28b28e4d2d0de587a3e8280e40f04a13998b8eae5a9f54f1041e7a8b85fa8de99734437b4246bf66664ce31a7d
+DIST calibre-3.8.0.tar.xz 37922608 SHA256 17bfe172420e55ff4f4b19b80253210bacb9a4d0f2fdcffd5b0f456cf5765c4c SHA512 db7ff5cb0ee82b3237090cbf6a13d13bfa5e27139dd067290ed59d407d2dbbae2ecd3dab338a0beed845079387a051b092233350091ef6ec82623d3a16b1d48d WHIRLPOOL 45e56c6157f9047ced7fd06dcf5824baaf0e85707d5c7617c196d0054e852fcbe296e629d30317b197772f5e1d637600a5bfaf54e363729df9fa6074fcc097ad
+EBUILD calibre-2.78.0.ebuild 8033 SHA256 ae79fb390f3eda82331c14638fd184f1388f92dc4a367349e2cd8a70e5b1e661 SHA512 c65f281218b26c1f77c6e226ab86bce7dab3089c99e5a8be39b52cf6f77c643520cfb5a1026d303a09964044bfe6c9ff2f5dc1fef1a625a61354a9d950d43487 WHIRLPOOL 084d6f160cdecf7d58405c8d98a5bdab410d055024a2af96fc9a1ca1bd47ca208c1960f74dc757a676569ae0b6beaa41a589527ec6a0976ed8783dc1e748b4dd
+EBUILD calibre-3.3.0.ebuild 8800 SHA256 1e37cd836f0bc2a6ea54e44df4df54d7f6161c6e354a3d0231b75379febbdb75 SHA512 581cb6b0331a058b013cf32de5b7d87b7ddf35482f91c62dbb947d392c90d46cf58690780534a1bb2c243dca2cee1b015b0ef361ed9763fe3cddd20ef2faafb8 WHIRLPOOL b9a9b502c578f30775aeca3bae247a12e56e2123144fd1ae5b1021dfd637b44b68b27fdfe36586be5f9b87d75f36a43990b7ae4972622d0517ba6a02e0d1e189
+EBUILD calibre-3.8.0.ebuild 8843 SHA256 47d8555cf9c7629a8b8d54272a25e95f81691900e7022511fe62d205e490b2be SHA512 41a12022df5a61a6b7308a65c34cb04eb25187d6da72691bfe6d60f39b7fe6e33ce48fe4fd03d576193df41e246bfc61c0086266f1584093739a0709602b949a WHIRLPOOL 933cabba789551404e05b1ff5a2a7ceb133669bc166c0dd974e145e5540bb3ea46bd668e088ff05f4b54693cec477602e2323de5a5dfad412e63f9888142a592
+MISC ChangeLog 8048 SHA256 cda01ae0e25d1044578adf6eb9110e044a61e3632007117c44a6c8450e3d42ab SHA512 eeeb0d3508851fdb0781c100a35949b7cbbca54b2db0d90ace1d7442731763d64c82056e0140525aa583bea2a5781a85da7cfb3d29221a4978d9831bc3b0f9ed WHIRLPOOL f75954b21b0c03f53e5506056d789a0005ade7453e394bf2785caa83ad7fe3f65e1d94270cafafc8ce0a61d745643530e484adcfd99f8dc575097b720a4a0c7c
+MISC ChangeLog-2015 55764 SHA256 646fbdf0734a1e0b37bcbe60db314ed6d429f00855dbc5ad3998b421dc770162 SHA512 e5e3b325fb049600e53d40b0b57bd9cea6e85c42079c7fe7a237f103ed9c3ab2a4efc4d6e0805a1a2aac369fce402b431c3406a89c56df16e05f83e8e7b9275a WHIRLPOOL 74cdf07d68112e9c4a59fcbe7211708184df32f9c86af748382e706b8706d26e8d0dda3df9379d8b6fbba4cca758dcf51883e51d34077202657922f10fac499e
+MISC metadata.xml 382 SHA256 bbd3bcd6ae5f8fcad12ba26cca6573afdd5ce30f6b49a6c1906962e41503b724 SHA512 8503e0a4a48d93682c386eb1d6507b4b26585afc9d62b7cd52bc00b457a887bd17422a03669ff404570ff7f5ff6f0bba14ee935979f8b54722870d6620097de5 WHIRLPOOL 217d2edc15bb7a9abd41dfb48c0cfc6402145cb8b4b4a43493ea4b9f0df3c365b96918a092ec8f53b4f86fce229e5a1169949475f4299b628a88916e42232774
diff --git a/app-text/calibre/calibre-2.78.0.ebuild b/app-text/calibre/calibre-2.78.0.ebuild
new file mode 100644
index 000000000000..b2d45db79e7c
--- /dev/null
+++ b/app-text/calibre/calibre-2.78.0.ebuild
@@ -0,0 +1,251 @@
+# 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="sqlite,ssl"
+
+inherit eutils fdo-mime bash-completion-r1 multilib toolchain-funcs python-single-r1
+
+DESCRIPTION="Ebook management application"
+HOMEPAGE="http://calibre-ebook.com/"
+SRC_URI="http://download.calibre-ebook.com/${PV}/${P}.tar.xz"
+
+LICENSE="
+	GPL-3+
+	GPL-3
+	GPL-2+
+	GPL-2
+	GPL-1+
+	LGPL-3+
+	LGPL-2.1+
+	LGPL-2.1
+	BSD
+	MIT
+	Old-MIT
+	Apache-2.0
+	public-domain
+	|| ( Artistic GPL-1+ )
+	CC-BY-3.0
+	OFL-1.1
+	PSF-2
+	unRAR
+"
+KEYWORDS="amd64 ~arm x86"
+SLOT="0"
+IUSE="+udisks"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	>=app-text/podofo-0.8.2:=
+	>=app-text/poppler-0.26.5[qt5]
+	>=dev-libs/chmlib-0.40:=
+	dev-libs/glib:2
+	>=dev-libs/icu-4.4:=
+	>=dev-python/apsw-3.7.17[${PYTHON_USEDEP}]
+	>=dev-python/beautifulsoup-3.0.5:python-2[${PYTHON_USEDEP}]
+	>=dev-python/cssselect-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/cssutils-0.9.9[${PYTHON_USEDEP}]
+	>=dev-python/dbus-python-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/lxml-3.2.1[${PYTHON_USEDEP}]
+	>=dev-python/mechanize-0.1.11[${PYTHON_USEDEP}]
+	dev-python/netifaces[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.0.1[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-1.4.1[${PYTHON_USEDEP}]
+	>=dev-python/PyQt5-5.3.1[gui,svg,webkit,widgets,network,printsupport,${PYTHON_USEDEP}]
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	media-fonts/liberation-fonts
+	>=media-gfx/imagemagick-6.5.9[jpeg,png]
+	media-libs/fontconfig
+	>=media-libs/freetype-2:=
+	>=media-libs/libmtp-1.1.5:=
+	>=media-libs/libwmf-0.2.8
+	sys-libs/zlib
+	virtual/libusb:1=
+	virtual/python-dnspython[${PYTHON_USEDEP}]
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrender
+	>=x11-misc/xdg-utils-1.0.2-r2
+	udisks? ( virtual/libudev )"
+RDEPEND="${COMMON_DEPEND}
+	udisks? ( || ( sys-fs/udisks:2 sys-fs/udisks:0 ) )"
+DEPEND="${COMMON_DEPEND}
+	>=dev-python/setuptools-0.6_rc5[${PYTHON_USEDEP}]
+	>=virtual/podofo-build-0.8.2
+	virtual/pkgconfig"
+
+src_prepare() {
+	# no_updates: do not annoy user with "new version is availible all the time
+	# disable_plugins: walking sec-hole, wait for upstream to use GHNS interface
+	eapply \
+		"${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch" \
+		"${FILESDIR}/${PN}-disable_plugins.patch" \
+		"${FILESDIR}/${PN}-2.83.0-lzxd-bounds-error-bug-540596.patch"
+
+	eapply_user
+
+	# Fix outdated version constant.
+	#sed -e "s#\\(^numeric_version =\\).*#\\1 (${PV//./, })#" \
+	#	-i src/calibre/constants.py || \
+	#	die "sed failed to patch constants.py"
+
+	# Avoid sandbox violation in /usr/share/gnome/apps when linux.py
+	# calls xdg-* (bug #258938).
+	sed -e "s|'xdg-desktop-menu', 'install'|\\0, '--mode', 'user'|" \
+		-e "s|check_call(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
+		-e "s|\\(CurrentDir(tdir)\\), \\\\\$|\\1:|" \
+		-e "s|, PreserveMIMEDefaults():|:|" \
+		-e "s|'xdg-icon-resource', 'install'|\\0, '--mode', 'user'|" \
+		-e "s|cmd\[2\]|cmd[4]|" \
+		-e "s|cc(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
+		-e "s|'xdg-mime', 'install'|\\0, '--mode', 'user'|" \
+		-i src/calibre/linux.py || die "sed failed to patch linux.py"
+
+	# Disable unnecessary privilege dropping for bug #287067.
+	sed -e "s:if os.geteuid() == 0:if False and os.geteuid() == 0:" \
+		-i setup/install.py || die "sed failed to patch install.py"
+
+	sed -e "/^            self\\.check_call(qmc + \\[.*\\.pro'\\])$/a\
+\\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ self.check_call(['sed', \
+'-e', 's|^CFLAGS .*|\\\\\\\\0 ${CFLAGS}|', \
+'-e', 's|^CXXFLAGS .*|\\\\\\\\0 ${CXXFLAGS}|', \
+'-e', 's|^LFLAGS .*|\\\\\\\\0 ${LDFLAGS}|', \
+'-i', 'Makefile'])" \
+		-i setup/build.py || die "sed failed to patch build.py"
+
+	# use system beautifulsoup, instead of bundled
+	rm -f "${S}"/src/calibre/ebooks/BeautifulSoup.py \
+		|| die "could not remove bundled beautifulsoup"
+	find "${S}" -type f -name \*.py -exec \
+		sed -e 's/calibre.ebooks.BeautifulSoup/BeautifulSoup/' -i {} + \
+		|| die "could not sed bundled beautifulsoup out of the source tree"
+
+	# avoid failure of xdg tools to recognize vendor prefix
+	sed -e "s|xdg-icon-resource install|xdg-icon-resource install --novendor|" \
+		-e "s|'xdg-mime', 'install'|'xdg-mime', 'install', '--novendor'|" \
+		-e "s|'xdg-desktop-menu', 'install'|'xdg-desktop-menu', 'install', '--novendor'|" \
+		-i "${S}"/src/calibre/linux.py || die 'sed failed'
+
+	# don't create/install uninstaller
+	sed '/self\.create_uninstaller()/d' -i src/calibre/linux.py || die
+}
+
+src_install() {
+	# Bypass kbuildsycoca and update-mime-database in order to
+	# avoid sandbox violations if xdg-mime tries to call them.
+	cat - > "${T}/kbuildsycoca" <<-EOF
+	#!${BASH}
+	echo $0 : $@
+	exit 0
+	EOF
+
+	cp "${T}"/{kbuildsycoca,update-mime-database} || die
+	chmod +x "${T}"/{kbuildsycoca,update-mime-database} || die
+
+	export QMAKE="${EPREFIX}/usr/$(get_libdir)/qt5/bin/qmake"
+
+	# Unset DISPLAY in order to prevent xdg-mime from triggering a sandbox
+	# violation with kbuildsycoca as in bug #287067, comment #13.
+	export -n DISPLAY
+
+	# Bug #352625 - Some LANGUAGE values can trigger the following ValueError:
+	#   File "/usr/lib/python2.6/locale.py", line 486, in getdefaultlocale
+	#    return _parse_localename(localename)
+	#  File "/usr/lib/python2.6/locale.py", line 418, in _parse_localename
+	#    raise ValueError, 'unknown locale: %s' % localename
+	#ValueError: unknown locale: 46
+	export -n LANGUAGE
+
+	# Bug #295672 - Avoid sandbox violation in ~/.config by forcing
+	# variables to point to our fake temporary $HOME.
+	export HOME="${T}/fake_homedir"
+	export XDG_CONFIG_HOME="${HOME}/.config"
+	export XDG_DATA_HOME="${HOME}/.local/share"
+	export CALIBRE_CONFIG_DIRECTORY="${XDG_CONFIG_HOME}/calibre"
+	mkdir -p "${XDG_DATA_HOME}" "${CALIBRE_CONFIG_DIRECTORY}" || die
+
+	tc-export CC CXX
+	# Bug #334243 - respect LDFLAGS when building extensions
+	export OVERRIDE_CFLAGS="$CFLAGS" OVERRIDE_LDFLAGS="$LDFLAGS"
+	local libdir=$(get_libdir)
+	[[ -n $libdir ]] || die "get_libdir returned an empty string"
+
+	# Bug #472690 - Avoid sandbox violation for /dev/dri/card0.
+	local x
+	for x in /dev/dri/card[0-9] ; do
+		[[ -e ${x} ]] && addpredict ${x}
+	done
+
+	#dodir "/usr/$(get_libdir)/python2.7/site-packages" # for init_calibre.py
+	#dodir $(python_get_sitedir)
+	PATH=${T}:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
+	"${PYTHON}" setup.py install \
+		--root="${D}" \
+		--prefix="${EPREFIX}/usr" \
+		--libdir="${EPREFIX}/usr/${libdir}" \
+		--staging-root="${ED}usr" \
+		--staging-libdir="${ED}usr/${libdir}" || die
+
+	# The menu entries end up here due to '--mode user' being added to
+	# xdg-* options in src_prepare.
+	dodir /usr/share/mime/packages
+	chmod -fR a+rX,u+w,g-w,o-w "${HOME}"/.local
+	mv "${HOME}"/.local/share/mime/packages/* "${ED}"usr/share/mime/packages/ ||
+		die "failed to register mime types"
+	dodir /usr/share/icons
+	mv "${HOME}"/.local/share/icons/* "${ED}"usr/share/icons/ ||
+		die "failed to install icon files"
+
+	domenu "${HOME}"/.local/share/applications/*.desktop ||
+		die "failed to install .desktop menu files"
+
+	find "${ED}"usr/share -type d -empty -delete
+
+	cd "${ED}"/usr/share/calibre/fonts/liberation || die
+	local x
+	for x in * ; do
+		[[ -f ${EPREFIX}usr/share/fonts/liberation-fonts/${x} ]] || continue
+		ln -sf "../../../fonts/liberation-fonts/${x}" "${x}" || die
+	done
+
+	einfo "Converting python shebangs"
+	python_fix_shebang "${ED}"
+
+	einfo "Compiling python modules"
+	python_optimize "${ED}"usr/lib/calibre
+
+	newinitd "${FILESDIR}"/calibre-server.init calibre-server
+	newconfd "${FILESDIR}"/calibre-server.conf calibre-server
+
+	bashcomp_alias calibre \
+		lrfviewer \
+		calibre-debug \
+		ebook-meta \
+		calibre-server \
+		ebook-viewer \
+		ebook-polish \
+		fetch-ebook-metadata \
+		lrf2lrs \
+		ebook-convert \
+		ebook-edit \
+		calibre-smtp \
+		ebook-device
+
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
diff --git a/app-text/calibre/calibre-3.3.0.ebuild b/app-text/calibre/calibre-3.3.0.ebuild
new file mode 100644
index 000000000000..46710a8a8454
--- /dev/null
+++ b/app-text/calibre/calibre-3.3.0.ebuild
@@ -0,0 +1,276 @@
+# 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="sqlite,ssl"
+
+inherit eutils fdo-mime bash-completion-r1 multilib toolchain-funcs python-single-r1
+
+DESCRIPTION="Ebook management application"
+HOMEPAGE="http://calibre-ebook.com/"
+SRC_URI="http://download.calibre-ebook.com/${PV}/${P}.tar.xz"
+
+LICENSE="
+	GPL-3+
+	GPL-3
+	GPL-2+
+	GPL-2
+	GPL-1+
+	LGPL-3+
+	LGPL-2.1+
+	LGPL-2.1
+	BSD
+	MIT
+	Old-MIT
+	Apache-2.0
+	public-domain
+	|| ( Artistic GPL-1+ )
+	CC-BY-3.0
+	OFL-1.1
+	PSF-2
+	unRAR
+"
+KEYWORDS="~amd64 ~arm ~x86"
+SLOT="0"
+IUSE="ios +udisks"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	>=app-text/podofo-0.8.2:=
+	>=app-text/poppler-0.26.5[qt5]
+	>=dev-libs/chmlib-0.40:=
+	dev-libs/glib:2
+	>=dev-libs/icu-57.1:=
+	>=dev-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/lxml-3.2.1[${PYTHON_USEDEP}]
+	>=dev-python/mechanize-0.2.5[${PYTHON_USEDEP}]
+	dev-python/msgpack[${PYTHON_USEDEP}]
+	dev-python/netifaces[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.1.3[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}]
+	>=dev-python/PyQt5-5.8[gui,svg,webkit,widgets,network,printsupport,${PYTHON_USEDEP}]
+	dev-python/regex[${PYTHON_USEDEP}]
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	media-fonts/liberation-fonts
+	>=media-gfx/imagemagick-6.5.9[jpeg,png]
+	media-libs/fontconfig
+	>=media-libs/freetype-2:=
+	>=media-libs/libmtp-1.1.11:=
+	>=media-libs/libwmf-0.2.8
+	>=media-gfx/optipng-0.7.6
+	sys-libs/zlib
+	virtual/libusb:1=
+	virtual/python-dnspython[${PYTHON_USEDEP}]
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrender
+	>=x11-misc/xdg-utils-1.0.2-r2
+	ios? (
+		>=app-pda/usbmuxd-1.0.8
+		>=app-pda/libimobiledevice-1.2.0
+	)
+	udisks? ( virtual/libudev )"
+RDEPEND="${COMMON_DEPEND}
+	udisks? ( || ( sys-fs/udisks:2 sys-fs/udisks:0 ) )"
+DEPEND="${COMMON_DEPEND}
+	>=dev-python/setuptools-23.1.0[${PYTHON_USEDEP}]
+	>=virtual/podofo-build-0.9.4
+	virtual/pkgconfig"
+
+src_prepare() {
+	# no_updates: do not annoy user with "new version is availible all the time
+	# disable_plugins: walking sec-hole, wait for upstream to use GHNS interface
+	eapply \
+		"${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch" \
+		"${FILESDIR}/${PN}-disable_plugins.patch"
+
+	eapply_user
+
+	# Fix outdated version constant.
+	#sed -e "s#\\(^numeric_version =\\).*#\\1 (${PV//./, })#" \
+	#	-i src/calibre/constants.py || \
+	#	die "sed failed to patch constants.py"
+
+	# Avoid sandbox violation in /usr/share/gnome/apps when linux.py
+	# calls xdg-* (bug #258938).
+	sed -e "s|'xdg-desktop-menu', 'install'|\\0, '--mode', 'user'|" \
+		-e "s|check_call(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
+		-e "s|\\(CurrentDir(tdir)\\), \\\\\$|\\1:|" \
+		-e "s|, PreserveMIMEDefaults():|:|" \
+		-e "s|'xdg-icon-resource', 'install'|\\0, '--mode', 'user'|" \
+		-e "s|cmd\[2\]|cmd[4]|" \
+		-e "s|cc(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
+		-e "s|'xdg-mime', 'install'|\\0, '--mode', 'user'|" \
+		-i src/calibre/linux.py || die "sed failed to patch linux.py"
+
+	# Disable unnecessary privilege dropping for bug #287067.
+	sed -e "s:if os.geteuid() == 0:if False and os.geteuid() == 0:" \
+		-i setup/install.py || die "sed failed to patch install.py"
+
+	sed -e "/^                self.check_call(\\[QMAKE\\] + qmc + \\[proname\\])$/a\
+\\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ self.check_call(['sed', \
+'-e', 's|^CFLAGS .*|\\\\\\\\0 ${CFLAGS}|', \
+'-e', 's|^CXXFLAGS .*|\\\\\\\\0 ${CXXFLAGS}|', \
+'-e', 's|^LFLAGS .*|\\\\\\\\0 ${LDFLAGS}|', \
+'-i', 'Makefile'])" \
+		-i setup/build.py || die "sed failed to patch build.py"
+
+	# use system beautifulsoup, instead of bundled
+	rm -f "${S}"/src/calibre/ebooks/BeautifulSoup.py \
+		|| die "could not remove bundled beautifulsoup"
+	find "${S}" -type f -name \*.py -exec \
+		sed -e 's/calibre.ebooks.BeautifulSoup/BeautifulSoup/' -i {} + \
+		|| die "could not sed bundled beautifulsoup out of the source tree"
+
+	# avoid failure of xdg tools to recognize vendor prefix
+	sed -e "s|xdg-icon-resource install|xdg-icon-resource install --novendor|" \
+		-e "s|'xdg-mime', 'install'|'xdg-mime', 'install', '--novendor'|" \
+		-e "s|'xdg-desktop-menu', 'install'|'xdg-desktop-menu', 'install', '--novendor'|" \
+		-i "${S}"/src/calibre/linux.py || die 'sed failed'
+
+	# don't create/install uninstaller
+	sed '/self\.create_uninstaller()/d' -i src/calibre/linux.py || die
+}
+
+src_install() {
+	# Bypass kbuildsycoca and update-mime-database in order to
+	# avoid sandbox violations if xdg-mime tries to call them.
+	cat - > "${T}/kbuildsycoca" <<-EOF
+	#!${BASH}
+	echo $0 : $@
+	exit 0
+	EOF
+
+	cp "${T}"/{kbuildsycoca,update-mime-database} || die
+	chmod +x "${T}"/{kbuildsycoca,update-mime-database} || die
+
+	export QMAKE="${EPREFIX}/usr/$(get_libdir)/qt5/bin/qmake"
+
+	# Unset DISPLAY in order to prevent xdg-mime from triggering a sandbox
+	# violation with kbuildsycoca as in bug #287067, comment #13.
+	export -n DISPLAY
+
+	# Bug #352625 - Some LANGUAGE values can trigger the following ValueError:
+	#   File "/usr/lib/python2.6/locale.py", line 486, in getdefaultlocale
+	#    return _parse_localename(localename)
+	#  File "/usr/lib/python2.6/locale.py", line 418, in _parse_localename
+	#    raise ValueError, 'unknown locale: %s' % localename
+	#ValueError: unknown locale: 46
+	export -n LANGUAGE
+
+	# Bug #295672 - Avoid sandbox violation in ~/.config by forcing
+	# variables to point to our fake temporary $HOME.
+	export HOME="${T}/fake_homedir"
+	export XDG_CONFIG_HOME="${HOME}/.config"
+	export XDG_DATA_HOME="${HOME}/.local/share"
+	export CALIBRE_CONFIG_DIRECTORY="${XDG_CONFIG_HOME}/calibre"
+	mkdir -p "${XDG_DATA_HOME}" "${CALIBRE_CONFIG_DIRECTORY}" || die
+
+	tc-export CC CXX
+	# Bug #334243 - respect LDFLAGS when building extensions
+	export OVERRIDE_CFLAGS="$CFLAGS" OVERRIDE_LDFLAGS="$LDFLAGS"
+	local libdir=$(get_libdir)
+	[[ -n $libdir ]] || die "get_libdir returned an empty string"
+
+	# Bug #472690 - Avoid sandbox violation for /dev/dri/card0.
+	local x
+	for x in /dev/dri/card[0-9] ; do
+		[[ -e ${x} ]] && addpredict ${x}
+	done
+
+	#dodir "/usr/$(get_libdir)/python2.7/site-packages" # for init_calibre.py
+	#dodir $(python_get_sitedir)
+	PATH=${T}:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
+	"${PYTHON}" setup.py install \
+		--root="${D}" \
+		--prefix="${EPREFIX}/usr" \
+		--libdir="${EPREFIX}/usr/${libdir}" \
+		--staging-root="${ED}usr" \
+		--staging-libdir="${ED}usr/${libdir}" || die
+
+	# The menu entries end up here due to '--mode user' being added to
+	# xdg-* options in src_prepare.
+	dodir /usr/share/mime/packages
+	chmod -fR a+rX,u+w,g-w,o-w "${HOME}"/.local
+	mv "${HOME}"/.local/share/mime/packages/* "${ED}"usr/share/mime/packages/ ||
+		die "failed to register mime types"
+	dodir /usr/share/icons
+	mv "${HOME}"/.local/share/icons/* "${ED}"usr/share/icons/ ||
+		die "failed to install icon files"
+
+	domenu "${HOME}"/.local/share/applications/*.desktop ||
+		die "failed to install .desktop menu files"
+
+	find "${ED}"usr/share -type d -empty -delete
+
+	cd "${ED}"/usr/share/calibre/fonts/liberation || die
+	local x
+	for x in * ; do
+		[[ -f ${EPREFIX}usr/share/fonts/liberation-fonts/${x} ]] || continue
+		ln -sf "../../../fonts/liberation-fonts/${x}" "${x}" || die
+	done
+
+	einfo "Converting python shebangs"
+	python_fix_shebang "${ED}"
+
+	einfo "Compiling python modules"
+	python_optimize "${ED}"usr/lib/calibre
+
+	newinitd "${FILESDIR}"/calibre-server-3.init calibre-server
+	newconfd "${FILESDIR}"/calibre-server-3.conf calibre-server
+
+	bashcomp_alias calibre \
+		lrfviewer \
+		calibre-debug \
+		ebook-meta \
+		calibre-server \
+		ebook-viewer \
+		ebook-polish \
+		fetch-ebook-metadata \
+		lrf2lrs \
+		ebook-convert \
+		ebook-edit \
+		calibre-smtp \
+		ebook-device
+
+}
+
+pkg_preinst() {
+	# Indentify stray directories from upstream's "Binary install"
+	# method (see bug 622728).
+	CALIBRE_LIB_DIR=/usr/$(get_libdir)/calibre
+	CALIBRE_LIB_CONTENT=$(for x in "${ED%/}${CALIBRE_LIB_DIR}"/*; do
+		printf -- "${x##*/} "; done) || die "Failed to list ${ED%/}${CALIBRE_LIB_DIR}"
+}
+
+pkg_postinst() {
+	[[ -n ${CALIBRE_LIB_DIR} ]] || die "CALIBRE_LIB_DIR is unset"
+	local x
+	for x in "${EROOT%/}${CALIBRE_LIB_DIR}"/*; do
+		if [[ " ${CALIBRE_LIB_CONTENT} " != *" ${x##*/} "* ]]; then
+			elog "Purging '${x}'"
+			rm -rf "${x}"
+		fi
+	done
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
diff --git a/app-text/calibre/calibre-3.8.0.ebuild b/app-text/calibre/calibre-3.8.0.ebuild
new file mode 100644
index 000000000000..e18eb11846bc
--- /dev/null
+++ b/app-text/calibre/calibre-3.8.0.ebuild
@@ -0,0 +1,277 @@
+# 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="sqlite,ssl"
+
+inherit eutils fdo-mime bash-completion-r1 multilib toolchain-funcs python-single-r1
+
+DESCRIPTION="Ebook management application"
+HOMEPAGE="http://calibre-ebook.com/"
+SRC_URI="http://download.calibre-ebook.com/${PV}/${P}.tar.xz"
+
+LICENSE="
+	GPL-3+
+	GPL-3
+	GPL-2+
+	GPL-2
+	GPL-1+
+	LGPL-3+
+	LGPL-2.1+
+	LGPL-2.1
+	BSD
+	MIT
+	Old-MIT
+	Apache-2.0
+	public-domain
+	|| ( Artistic GPL-1+ )
+	CC-BY-3.0
+	OFL-1.1
+	PSF-2
+	unRAR
+"
+KEYWORDS="~amd64 ~arm ~x86"
+SLOT="0"
+IUSE="ios +udisks"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	>=app-text/podofo-0.8.2:=
+	>=app-text/poppler-0.26.5[qt5]
+	>=dev-libs/chmlib-0.40:=
+	dev-libs/glib:2
+	>=dev-libs/icu-57.1:=
+	>=dev-python/apsw-3.13.0[${PYTHON_USEDEP}]
+	>=dev-python/beautifulsoup-3.0.5:python-2[${PYTHON_USEDEP}]
+	dev-python/chardet[${PYTHON_USEDEP}]
+	>=dev-python/cssselect-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/cssutils-1.0.1[${PYTHON_USEDEP}]
+	>=dev-python/dbus-python-1.2.4[${PYTHON_USEDEP}]
+	>=dev-libs/dbus-glib-0.106
+	>=sys-apps/dbus-1.10.8
+	dev-python/html5-parser[${PYTHON_USEDEP}]
+	>=dev-python/lxml-3.2.1[${PYTHON_USEDEP}]
+	>=dev-python/mechanize-0.2.5[${PYTHON_USEDEP}]
+	dev-python/msgpack[${PYTHON_USEDEP}]
+	dev-python/netifaces[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.1.3[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}]
+	>=dev-python/PyQt5-5.8[gui,svg,webkit,widgets,network,printsupport,${PYTHON_USEDEP}]
+	dev-python/regex[${PYTHON_USEDEP}]
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	media-fonts/liberation-fonts
+	>=media-gfx/imagemagick-6.5.9[jpeg,png]
+	media-libs/fontconfig
+	>=media-libs/freetype-2:=
+	>=media-libs/libmtp-1.1.11:=
+	>=media-libs/libwmf-0.2.8
+	>=media-gfx/optipng-0.7.6
+	sys-libs/zlib
+	virtual/libusb:1=
+	virtual/python-dnspython[${PYTHON_USEDEP}]
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrender
+	>=x11-misc/xdg-utils-1.0.2-r2
+	ios? (
+		>=app-pda/usbmuxd-1.0.8
+		>=app-pda/libimobiledevice-1.2.0
+	)
+	udisks? ( virtual/libudev )"
+RDEPEND="${COMMON_DEPEND}
+	udisks? ( || ( sys-fs/udisks:2 sys-fs/udisks:0 ) )"
+DEPEND="${COMMON_DEPEND}
+	>=dev-python/setuptools-23.1.0[${PYTHON_USEDEP}]
+	>=virtual/podofo-build-0.9.4
+	virtual/pkgconfig"
+
+src_prepare() {
+	# no_updates: do not annoy user with "new version is availible all the time
+	# disable_plugins: walking sec-hole, wait for upstream to use GHNS interface
+	eapply \
+		"${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch" \
+		"${FILESDIR}/${PN}-disable_plugins.patch"
+
+	eapply_user
+
+	# Fix outdated version constant.
+	#sed -e "s#\\(^numeric_version =\\).*#\\1 (${PV//./, })#" \
+	#	-i src/calibre/constants.py || \
+	#	die "sed failed to patch constants.py"
+
+	# Avoid sandbox violation in /usr/share/gnome/apps when linux.py
+	# calls xdg-* (bug #258938).
+	sed -e "s|'xdg-desktop-menu', 'install'|\\0, '--mode', 'user'|" \
+		-e "s|check_call(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
+		-e "s|\\(CurrentDir(tdir)\\), \\\\\$|\\1:|" \
+		-e "s|, PreserveMIMEDefaults():|:|" \
+		-e "s|'xdg-icon-resource', 'install'|\\0, '--mode', 'user'|" \
+		-e "s|cmd\[2\]|cmd[4]|" \
+		-e "s|cc(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
+		-e "s|'xdg-mime', 'install'|\\0, '--mode', 'user'|" \
+		-i src/calibre/linux.py || die "sed failed to patch linux.py"
+
+	# Disable unnecessary privilege dropping for bug #287067.
+	sed -e "s:if os.geteuid() == 0:if False and os.geteuid() == 0:" \
+		-i setup/install.py || die "sed failed to patch install.py"
+
+	sed -e "/^                self.check_call(\\[QMAKE\\] + qmc + \\[proname\\])$/a\
+\\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ self.check_call(['sed', \
+'-e', 's|^CFLAGS .*|\\\\\\\\0 ${CFLAGS}|', \
+'-e', 's|^CXXFLAGS .*|\\\\\\\\0 ${CXXFLAGS}|', \
+'-e', 's|^LFLAGS .*|\\\\\\\\0 ${LDFLAGS}|', \
+'-i', 'Makefile'])" \
+		-i setup/build.py || die "sed failed to patch build.py"
+
+	# use system beautifulsoup, instead of bundled
+	rm -f "${S}"/src/calibre/ebooks/BeautifulSoup.py \
+		|| die "could not remove bundled beautifulsoup"
+	find "${S}" -type f -name \*.py -exec \
+		sed -e 's/calibre.ebooks.BeautifulSoup/BeautifulSoup/' -i {} + \
+		|| die "could not sed bundled beautifulsoup out of the source tree"
+
+	# avoid failure of xdg tools to recognize vendor prefix
+	sed -e "s|xdg-icon-resource install|xdg-icon-resource install --novendor|" \
+		-e "s|'xdg-mime', 'install'|'xdg-mime', 'install', '--novendor'|" \
+		-e "s|'xdg-desktop-menu', 'install'|'xdg-desktop-menu', 'install', '--novendor'|" \
+		-i "${S}"/src/calibre/linux.py || die 'sed failed'
+
+	# don't create/install uninstaller
+	sed '/self\.create_uninstaller()/d' -i src/calibre/linux.py || die
+}
+
+src_install() {
+	# Bypass kbuildsycoca and update-mime-database in order to
+	# avoid sandbox violations if xdg-mime tries to call them.
+	cat - > "${T}/kbuildsycoca" <<-EOF
+	#!${BASH}
+	echo $0 : $@
+	exit 0
+	EOF
+
+	cp "${T}"/{kbuildsycoca,update-mime-database} || die
+	chmod +x "${T}"/{kbuildsycoca,update-mime-database} || die
+
+	export QMAKE="${EPREFIX}/usr/$(get_libdir)/qt5/bin/qmake"
+
+	# Unset DISPLAY in order to prevent xdg-mime from triggering a sandbox
+	# violation with kbuildsycoca as in bug #287067, comment #13.
+	export -n DISPLAY
+
+	# Bug #352625 - Some LANGUAGE values can trigger the following ValueError:
+	#   File "/usr/lib/python2.6/locale.py", line 486, in getdefaultlocale
+	#    return _parse_localename(localename)
+	#  File "/usr/lib/python2.6/locale.py", line 418, in _parse_localename
+	#    raise ValueError, 'unknown locale: %s' % localename
+	#ValueError: unknown locale: 46
+	export -n LANGUAGE
+
+	# Bug #295672 - Avoid sandbox violation in ~/.config by forcing
+	# variables to point to our fake temporary $HOME.
+	export HOME="${T}/fake_homedir"
+	export XDG_CONFIG_HOME="${HOME}/.config"
+	export XDG_DATA_HOME="${HOME}/.local/share"
+	export CALIBRE_CONFIG_DIRECTORY="${XDG_CONFIG_HOME}/calibre"
+	mkdir -p "${XDG_DATA_HOME}" "${CALIBRE_CONFIG_DIRECTORY}" || die
+
+	tc-export CC CXX
+	# Bug #334243 - respect LDFLAGS when building extensions
+	export OVERRIDE_CFLAGS="$CFLAGS" OVERRIDE_LDFLAGS="$LDFLAGS"
+	local libdir=$(get_libdir)
+	[[ -n $libdir ]] || die "get_libdir returned an empty string"
+
+	# Bug #472690 - Avoid sandbox violation for /dev/dri/card0.
+	local x
+	for x in /dev/dri/card[0-9] ; do
+		[[ -e ${x} ]] && addpredict ${x}
+	done
+
+	#dodir "/usr/$(get_libdir)/python2.7/site-packages" # for init_calibre.py
+	#dodir $(python_get_sitedir)
+	PATH=${T}:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
+	"${PYTHON}" setup.py install \
+		--root="${D}" \
+		--prefix="${EPREFIX}/usr" \
+		--libdir="${EPREFIX}/usr/${libdir}" \
+		--staging-root="${ED}usr" \
+		--staging-libdir="${ED}usr/${libdir}" || die
+
+	# The menu entries end up here due to '--mode user' being added to
+	# xdg-* options in src_prepare.
+	dodir /usr/share/mime/packages
+	chmod -fR a+rX,u+w,g-w,o-w "${HOME}"/.local
+	mv "${HOME}"/.local/share/mime/packages/* "${ED}"usr/share/mime/packages/ ||
+		die "failed to register mime types"
+	dodir /usr/share/icons
+	mv "${HOME}"/.local/share/icons/* "${ED}"usr/share/icons/ ||
+		die "failed to install icon files"
+
+	domenu "${HOME}"/.local/share/applications/*.desktop ||
+		die "failed to install .desktop menu files"
+
+	find "${ED}"usr/share -type d -empty -delete
+
+	cd "${ED}"/usr/share/calibre/fonts/liberation || die
+	local x
+	for x in * ; do
+		[[ -f ${EPREFIX}usr/share/fonts/liberation-fonts/${x} ]] || continue
+		ln -sf "../../../fonts/liberation-fonts/${x}" "${x}" || die
+	done
+
+	einfo "Converting python shebangs"
+	python_fix_shebang "${ED}"
+
+	einfo "Compiling python modules"
+	python_optimize "${ED}"usr/lib/calibre
+
+	newinitd "${FILESDIR}"/calibre-server-3.init calibre-server
+	newconfd "${FILESDIR}"/calibre-server-3.conf calibre-server
+
+	bashcomp_alias calibre \
+		lrfviewer \
+		calibre-debug \
+		ebook-meta \
+		calibre-server \
+		ebook-viewer \
+		ebook-polish \
+		fetch-ebook-metadata \
+		lrf2lrs \
+		ebook-convert \
+		ebook-edit \
+		calibre-smtp \
+		ebook-device
+
+}
+
+pkg_preinst() {
+	# Indentify stray directories from upstream's "Binary install"
+	# method (see bug 622728).
+	CALIBRE_LIB_DIR=/usr/$(get_libdir)/calibre
+	CALIBRE_LIB_CONTENT=$(for x in "${ED%/}${CALIBRE_LIB_DIR}"/*; do
+		printf -- "${x##*/} "; done) || die "Failed to list ${ED%/}${CALIBRE_LIB_DIR}"
+}
+
+pkg_postinst() {
+	[[ -n ${CALIBRE_LIB_DIR} ]] || die "CALIBRE_LIB_DIR is unset"
+	local x
+	for x in "${EROOT%/}${CALIBRE_LIB_DIR}"/*; do
+		if [[ " ${CALIBRE_LIB_CONTENT} " != *" ${x##*/} "* ]]; then
+			elog "Purging '${x}'"
+			rm -rf "${x}"
+		fi
+	done
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
diff --git a/app-text/calibre/files/calibre-2.83.0-lzxd-bounds-error-bug-540596.patch b/app-text/calibre/files/calibre-2.83.0-lzxd-bounds-error-bug-540596.patch
new file mode 100644
index 000000000000..5f7d5a4682f9
--- /dev/null
+++ b/app-text/calibre/files/calibre-2.83.0-lzxd-bounds-error-bug-540596.patch
@@ -0,0 +1,37 @@
+From f335c8719b224d3ca7a967b6e91cebd5b26684fe Mon Sep 17 00:00:00 2001
+From: Zac Medico <zmedico@gentoo.org>
+Date: Sun, 23 Apr 2017 16:13:00 -0700
+Subject: [PATCH] Fix bounds error in lzxd_static_init
+
+https://bugs.gentoo.org/show_bug.cgi?id=540596
+https://github.com/kovidgoyal/calibre/pull/650
+
+This includes the changes from the following upstream commits:
+
+https://github.com/kyz/libmspack/commit/6a42ddd1d472afeaf0f7da91e16b60ab2063fb92
+https://github.com/kyz/libmspack/commit/ce3cc03aa500dd9c0b6b820f9519f6b6b9dede05
+---
+ src/calibre/utils/lzx/lzxd.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/calibre/utils/lzx/lzxd.c b/src/calibre/utils/lzx/lzxd.c
+index e683a9e..c531aaa 100644
+--- a/src/calibre/utils/lzx/lzxd.c
++++ b/src/calibre/utils/lzx/lzxd.c
+@@ -357,11 +357,12 @@ static unsigned char extra_bits[51];
+ static void lzxd_static_init(void) {
+   int i, j;
+ 
+-  for (i = 0, j = 0; i < 51; i += 2) {
++  for (i = 0, j = 0; i < 50; i += 2) {
+     extra_bits[i]   = j; /* 0,0,0,0,1,1,2,2,3,3,4,4,5,5,6,6,7,7... */
+     extra_bits[i+1] = j;
+     if ((i != 0) && (j < 17)) j++; /* 0,0,1,2,3,4...15,16,17,17,17,17... */
+   }
++  extra_bits[50] = 17;
+ 
+   for (i = 0, j = 0; i < 51; i++) {
+     position_base[i] = j; /* 0,1,2,3,4,6,8,12,16,24,32,... */
+-- 
+2.10.2
+
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/files/calibre-server.conf b/app-text/calibre/files/calibre-server.conf
new file mode 100644
index 000000000000..c1bed84289cc
--- /dev/null
+++ b/app-text/calibre/files/calibre-server.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_OPTS="--username calibre --password password --thread-pool 10 --port 8080"
diff --git a/app-text/calibre/files/calibre-server.init b/app-text/calibre/files/calibre-server.init
new file mode 100644
index 000000000000..2f905424cfa7
--- /dev/null
+++ b/app-text/calibre/files/calibre-server.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 \
+		-- --with-library "${CALIBRE_LIBRARY}" ${CALIBRE_OPTS}
+	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/catdoc/Manifest b/app-text/catdoc/Manifest
new file mode 100644
index 000000000000..ed217eac7af5
--- /dev/null
+++ b/app-text/catdoc/Manifest
@@ -0,0 +1,6 @@
+AUX catdoc-0.95-parallel-make.patch 1568 SHA256 4eb7986369ee1b547d22d57e4124c68aa0659afd909461c51917972c5b1844ed SHA512 f40d7440bf19157b862226e8d956b5505e6d79db3a39a21f71f68d6943b162f62863333739f1f4777c2c38b4116b4745888ed0cf5cd4159ccc84d02979f691ea WHIRLPOOL 841a7744c771dcb4bb60b091cc78b56298714b2d713cab9fd53ddd9a855f3458d521dbd85de2d0f425878a87d6724604557339e58f8e0f6a4929cc6f54748dda
+DIST catdoc-0.95.tar.gz 217779 SHA256 514a84180352b6bf367c1d2499819dfa82b60d8c45777432fa643a5ed7d80796 SHA512 dd6bded4b6b70749c007256b182b063ff266f86d53024d8582001678821e8096c5b980bc8f43015d9c82bbe022d71d4ba5fe68aff31b2ff6db3688595e651b2c WHIRLPOOL 1303c74cc6a13183e2ea8ee2bf616da419a8b9f03f4e2fcdce3b0462306084fab85a1cd68bb4ab07caac40c56a91284103e54084d7f523d9894b0eee9359184c
+EBUILD catdoc-0.95.ebuild 1194 SHA256 a7999d1d8e8638ee846846fadb50f90733c8c3149abf100a1ab066201272cf35 SHA512 48e93c76ff30043e9fb800109cdab36bd25e7d24895aede5767641b636a62ac30477e6a5dfda5d46a3d6c61f3cdcdd1876b3ecc6c0fecf539c06d7f3766adef5 WHIRLPOOL 01387589c005e0fa2daa0324fc4d65bb2208a721b544c9760e6fee15c589154aeda4c171562b7ca93201607c4610a512503824d6b087c3b5bc07b4c4492ff55c
+MISC ChangeLog 3631 SHA256 d46256ab215db40b6d3402ef2a20a8cd1f4f4ce9a258e81f6111a4e2302bfab6 SHA512 efe14fe7e8e9639d32268b282e38e0a72269f8eca95206e571ce9fb2c441ec3aa5121c9be3b822d0ce473fc7f497d65288dba70a8d6f3153232782bd36c7ff4d WHIRLPOOL bfa896b4d931f73eedee2d5f56b65e05a83684f1839efde80374c886ae3c701a82bd9126505a5413a260c7c7c84fddfe694b9990e6a2eceea693957cc93bf6f7
+MISC ChangeLog-2015 4479 SHA256 d21396e54b8bbd3358ceff9b230159334062f9d2731914abcd10f5e5a00ca199 SHA512 b99283e310f5cbe7d9b63480d6c9996a842a076507e9740b1c86a5909f7b824c882176ddcfebad810c5f7ad5ea8fab8fa6b985639cf4d0dd4d964c8121175aa6 WHIRLPOOL f245827295a7e2d8411e5126e5ab9668b518bb2b4361aa1720f637e3a2c807910eaa6e0f760eef8b4742525d812bb9a331e1314ee3ea5c23f76bb0273bb86074
+MISC metadata.xml 245 SHA256 b3de478821488be2cdc91b078e21c911dc384af882c5c44631a47dfa91516dc8 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690 WHIRLPOOL 701a78fc2214f5fd4bd781477f85e87e716b8d76ea831a0fa4afc8871c4286cc363679f1ff4f844555ad4f77cc7265208b83e805f56c22fc4baeed1062280c08
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/Manifest b/app-text/cb2bib/Manifest
new file mode 100644
index 000000000000..88dbdccd608e
--- /dev/null
+++ b/app-text/cb2bib/Manifest
@@ -0,0 +1,5 @@
+DIST cb2bib-1.9.7.tar.gz 845121 SHA256 fae8520d85a01066434dbdc9357663467c20b4578229cea3047cc6f069dd283f SHA512 87a438288c6e7776db136de63de1a8e27f2abf8499d28c0691b60ad3ef4f848e8987af4fc47d1f2cfb1d47009e28e7535f6bab998811cb721bfc9f384941b1e4 WHIRLPOOL a4dc37345e93f815a50503108b9997717ea96885869a6aef5991f39aa1698810d7289a55da6cf330729e8e12c8399781b0eaebdbae256ac245d2700900da9529
+EBUILD cb2bib-1.9.7.ebuild 1790 SHA256 fcb8eb90a2c464c32d2cde581c88ea38726638c3757cfe7148314796db581707 SHA512 32a00cff24547b539671f355083d5b8956d49a1ad416ad904c94f2c72b4ad2c1376298e6aaf1515a995f771cb9b6a2989c06a80ed408c24982b94dbc72109d7b WHIRLPOOL ebdb3c0baa35734a466c5de6a8331440be15efef55c5f51c0587e3831781f7e580f8314fe2049c5dd62ec16a28c8b406416a219347add86d9831b0a74493477a
+MISC ChangeLog 3199 SHA256 887bd7394a3d7dfa6a80a8d82290f4e65cfa87678356b1d1cf09854397f871dd SHA512 91af96c2a24fb34029c3a1329f21d0b7c472d0097090ccf270951b1851535e8e65508cc19cbd43cc084bc7cd6426a1a3c68cd9da81991ec29fb77495fcc8d0a7 WHIRLPOOL 75fc2e06afbd55533d39571b91b082aa97b8c12abd80f72dfc97edd79bf2ef9986bdc259270b0e19e3a863863d47e2c0c8daaa2d58585077813ee8455d71c589
+MISC ChangeLog-2015 3062 SHA256 77455389d00420d9c7745a1502de1265970295511c993d9fe69fe9baaaadae61 SHA512 6f37ed9033a863ba11f5694a729f8a465fc2c08b5feb70a76043775086f17be719fb6f79804e805551739fcec70cb61869869fccea31b42736cc3447d0361fc9 WHIRLPOOL 56855e00dd056f9821493baa11c751d9596f45c1155ea4d2519a855e64a8850652d40154cab9ae6d2eb106864e2b7153bb6541f305de0259319494ffab5f4981
+MISC metadata.xml 443 SHA256 6c069c09089eb26f619d68bbdb29c08a2f885bf4aa45be4c260d0734b6b7b6be SHA512 d5c544ca2ebdbd563ec4230bcfdb71567902c681c489979d5bc0546faf0fd98a6b3d2107b5dc18c2347cda5db092b012158421286a539dd82747669de34f983a WHIRLPOOL d6bb3d3733933a3e76262cb0f932b25f9abbec61a1a6abf48ee6cc2a818f56c00d4cb82688e5cc1498d1a9246e1af24f2d8ed38df3f3778ebc1607f3c38bbd6a
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/Manifest b/app-text/cedilla/Manifest
new file mode 100644
index 000000000000..33a3a75da5fc
--- /dev/null
+++ b/app-text/cedilla/Manifest
@@ -0,0 +1,6 @@
+AUX cedilla-gentoo-r1.patch 645 SHA256 ea80f4221ba773f1eb5cef090f0ad8847af3eeb5ab91379e53cc700b1a92acdb SHA512 4a9d4c4f28509e2b527568a28a69dbcce0c4e7a8d6ae9a967dfb33ff639f12a5dae16a885b0f51686d3d444c9f651cf904bb5c93326308fc37e13d4ec8bb4162 WHIRLPOOL 28ead6a9b3d053f14a97f883181aa52a7c1c05e1dda5d3e793adaaaba7f041e2055fa7a0798f6f759fca86f149199e8aa9fe885f3ef36bff00897d506168d8e0
+DIST cedilla-0.6.tar.gz 130676 SHA256 c5840c3e125fab29af844540239dfb475b59c6ecd67270736898608de743df43 SHA512 95d98fd4ab95b48023f635d61133ea1a8138a797cd1c414da0d4907531eb067ac147e8d612a528373da425d37fee7c1139dc7f0019308938c096e37caebf4e38 WHIRLPOOL fff84c8c7e2e1c1452dfbaf6bf58d97d405c1f56269cadb0d852ba7c183dec0b73906dfa62ca732e84a7eeb472d4ee2d66adebdd1fc224e56a5c45792a5f1117
+EBUILD cedilla-0.6.ebuild 697 SHA256 e99eb5a118a5fbabecd56a80cbb9565f3bd63ebf016e5455d472c66754d29a2a SHA512 61c7d132115f2e255de5b1aad34397541f89fdaa1ebd24dab36e7b2d71bac7e592884a78d36bc3addd8108133091455bd0025c28c672787f0a995b0bba919fae WHIRLPOOL f4f19a3f398cfd75a7e107d24d3ecc3fd5ef19d6b3c2eac7b50c8b471b9b878f3d7e09c3c508d8af317e644cf08c99abd62fa0c6d56790ef6bc0985c4946744f
+MISC ChangeLog 2522 SHA256 7c57e779df9477360306e5e0728f279f8fcaf8406d39b3753e24f86ea65d85a1 SHA512 d88b7dec0febbee0019ef6f34b1d4f4e36e42f013d0fab3afeed13f4ea3c7b80d2651e98a309d864b6c71e07af010c653c3ca122b4613270499763434ade79c5 WHIRLPOOL 8996ab36cb2b5dca69fb12e66b445260870c00de0a5f133c11b9b9e63b6abe38e7597f3e77a826b84b3ad3dffa472b83ea9786f650b854ca763d02b74e04ecb4
+MISC ChangeLog-2015 1934 SHA256 f770cbdc4d7fa420daabf8ac7cf69068c16d44e2c973efa4486a3fe30140e26c SHA512 6638dee5bc96145af61e0d905c1d5d33a3674a6e40cc1851e1984df8d84d1e3e1e2d1ae68748df16704debf2c7169f4e07e664ae0c041118339f201371ca09c9 WHIRLPOOL 64a2921ebde4a47c7f8219f070b7ad19ba79f603c66fe0b15eb3285884e00ac2567055a6c9c96ed96f82b870520c39795886b1e0733a4c16bf0879a85ba430e5
+MISC metadata.xml 253 SHA256 92ff51ad29adacd63576f838ceb8f37794de39a507edff45a2781389659128ad SHA512 751b9e487ef1a87d5d6a0e0799ef5bde65d4de96863fbf654d4f9352daf521d496292f03006b8dc6a0ff72db92432b9848951dcf1d2490043fcc53991e49f090 WHIRLPOOL 084348f2f16be8d8cd3a81737ebc0c3e65b120fa4f95efbf411305c1c327ab083b14cf7fc4ec18ec50dd6693049d70ce0548a7c24df6c12a8d6b1cdfbff8d567
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/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..61626d314697
--- /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/Manifest b/app-text/chasen/Manifest
new file mode 100644
index 000000000000..214be81c072a
--- /dev/null
+++ b/app-text/chasen/Manifest
@@ -0,0 +1,6 @@
+AUX chasen-2.4.4-cve-2011-4000.patch 559 SHA256 7debf023179cb2c47e2a1245288c225a03dec917e9937c0e3547f9a7b5ac447a SHA512 308a82dfcba13fc33733df853f0abf9979f2d8ff18e1c3f552ac7cd3b6c844dd40e125790fa62844a326ef7e546d0b24fc01c801f3e6cee0aa8b7b2a08474623 WHIRLPOOL e0ba857ce2ba27baf612b1bd061f9534be3a4c3535f86243b7acfe21c7a4b4ec9d57602a7e50f16de2b66249d52f42afffced770dcfdd82d447de739dae8e805
+DIST chasen-2.4.4.tar.gz 845720 SHA256 09e41f681097f87ba6c953d3724c34c1826c3cfa590898a2166fb310a006f932 SHA512 4551d28be6c0de7a585decf03cf5b56def3d181cfdfd975565ac7236e2c3e8cc0bcf5331f1ae309a914f95c6715e13ba3e9d80ebbd6e86c2316a43b7ed831075 WHIRLPOOL 04c948a703ed720accb2c87c98873407c719456b4e74c43363ebe435329e306f8e28c9b333d2fb709a0fd164c43aa3c333768a5c9aefbf7795dfc7a9c1bbece8
+EBUILD chasen-2.4.4-r3.ebuild 1084 SHA256 5e9bf909e57931d11d8c18186dcb04e7c723222cc30d79bc5f531d5396aac54b SHA512 5bcc3c9aa096fdc223b71cf8b216bdaa09b33c4ced0c44b76c2f9bfb985d1169fc046c43f9371613ce3234ce8e79f91cc5651d2911f45c36852bc709701f098d WHIRLPOOL c0ddb7c75ad68434b784cb6927511797a444cbef34454d44afa22a63c5c52696d1530ec6a7e18cbef413d576ea24db98d36ceb2b88824674d132c4f1edb9fba4
+MISC ChangeLog 2745 SHA256 ce04f1382550246b0d9650314edbf28f017737796c7f4a8b9003ec04394f1793 SHA512 dbd7ba4d3b11c103fac484bab22aa0fbf88a7e3a180dfb924448f857d20c28ec368ff0e106955fd888a1d2f0149567dad3359c0b367754beea2d8770e6df039b WHIRLPOOL 37fb05af18edb5c1ddcbccab30e3d47ac5ee01709b0a4642bb449e0f86c21bb87b2935ef992de6c033f291424b78f574b6f5257a2ae0b0964215ec175d8dc271
+MISC ChangeLog-2015 6948 SHA256 844d4b5e7b898713ece3704caccf92c118ca939283a9baaf0fede36d87ae466b SHA512 40eb4824dfdb6c48d6edb0aa2b507b08d2082c445b51308b60f3df57d24a9547ab18e9e5141f094ed0205f14743ef37c47019a30acec864ffe7a5529938bfb6f WHIRLPOOL 3d543f4ddc83922304de9dc37a6f880f7fa31eeb41c7a4d2586f04be5ae4b9d4cdc28b3553cc107f1e07ec4a690f6f15d181a46636d4b74e52b4245d540083c3
+MISC metadata.xml 320 SHA256 015a232241a54a4cfadea367e63315f36c927eb33f0332b26d1745fa83b3aaf2 SHA512 1bf81a4a404bd57dd50b071ec19fa00e17b2a733d3988251d195406a8229d0fb3500498ebbb634f863df5d1d56445ceb1605a470421c54697a130769f0f4263c WHIRLPOOL 9a786781affa28866efe8a509b3a1738eb8ac15e6d37d149452d053240c882bd2a4bab529b9d7e478ddefea205eacee4744e22423397c417f3d3abc2bb7cf080
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/Manifest b/app-text/cherrytree/Manifest
new file mode 100644
index 000000000000..862c1186667b
--- /dev/null
+++ b/app-text/cherrytree/Manifest
@@ -0,0 +1,4 @@
+DIST cherrytree-0.37.0.tar.gz 8888703 SHA256 fa51071c8060fe337bf3092ab75188ce0bbd2ab1b34092607806787b116e54ed SHA512 a1aaf92657c58c70430a45adaa771050b43476bc2a33dc929b108842d5ef46aa83c4fa4cfe8c4f54a9a3656fc0d30046fae34cbac5aa9fe3f32aa539058636f5 WHIRLPOOL 59a8e68c9f2c031bf2acbee827dc73923f0e8f49ab9bf3a40f8b89683f0f2c343466783575b70a13821fc7409f47710fe089bbfcc4bc310a64cd78e68a25c319
+EBUILD cherrytree-0.37.0.ebuild 1190 SHA256 55ef6a3388bfdafc5097092929e862895d3e050eee9591d034f2ab48998c5698 SHA512 5ddbf42ad89196aca786b6fe1dff11be5a79f66cd3ae239e04eed6a2953c5ee717011e5594fdb4462c90eaf5d18f51e95fc3ef2e2b4a4c372ee253e63b546555 WHIRLPOOL 0d07244c0d02be9c9cb9b80bc1a0afcc271698411c3abcc6fc132f0649901b580cd3afda29bfc07b49fde903411e3a09a4db8bd01b27bf618fc57f8379dd9f2c
+MISC ChangeLog 2906 SHA256 250ed8e5f01091515b1e5d7388e0a7cadc52f89a0e4247e67f72840638cfda1c SHA512 336aa83a13fc8659e7009d7ff4d4f68a9b6206f6c46ffc97d1efcacb733404b6e7897888f5cf08c8762d6c612c436ee799ab2b938efd589950e9b4688854e789 WHIRLPOOL f808607648256f8091442c033c0062286b93b9ee579f309a1a9621ec3419b52ed438f3f6185db77676ceeb8c8d1256b81fa46acb866617052ecdcfd9823cfae6
+MISC metadata.xml 250 SHA256 dfad247da152e7217668b2c06233c4acfbe025df8a6cf4b5429fa8af391a3d91 SHA512 c9d9bb6db803a0958073fb76a3d26192374ec85b66ccddaac01829afea556302126f99dc6158d71ae4cc9e5152da0ce203ad527ffe923edb6239c7ff43e19a76 WHIRLPOOL 614e05b98bec248420f6c778dd1711d5284b20714a107eb66c8dfaa4208ec5013a4ae6614b550644af0e132c6924d5c00b26b43a44ef116022aea5339bfab1b4
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..5f140f1d7283
--- /dev/null
+++ b/app-text/cherrytree/cherrytree-0.37.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2016 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='http://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/Manifest b/app-text/chm2pdf/Manifest
new file mode 100644
index 000000000000..a4c592be107e
--- /dev/null
+++ b/app-text/chm2pdf/Manifest
@@ -0,0 +1,6 @@
+AUX tempdir.patch 3694 SHA256 c3a19bfb3fdc12c416b6ef1ecd8ac9e3f28e85be906a90328acaf90614080f3d SHA512 e7d29e71afad11c79d508c35c9060a39308c78e654f00808cb38b7e75ebf5f885bbd436f58e9900977c2e81d0f4a7f543daeab6bd2f9a919c4c3b74dba33c325 WHIRLPOOL 19daca55d78d94321c5b5a8e46d075133a473a4a95affc6e55f9fdf253fc596e514be49d5840d08911416330b85070a4bc80d60fe6749ac5055b540bc6f260eb
+DIST chm2pdf-0.9.1.tar.gz 19955 SHA256 204293c264c94bd17f56925d21d20b9f69a96136836198ba1a5014fe128ec3b0 SHA512 1d1997b17750f371e60cc6bf9693a8e4316deadd63247700f6ebd1bf02340f2e0524766a6be846d0f6349416b8551609da63fbf60ecd62766cf0d9b4f0c886d3 WHIRLPOOL 15607e84628ea2395b0f55ce0e1c2ab8c41f087e348e453a39db101f21c7e32f533d1537ad79957cf02b4c91f8dc7bf1afa883bf083067f09bbfb0012a373943
+EBUILD chm2pdf-0.9.1-r2.ebuild 768 SHA256 6e6ad6f6b26fa65faef80c01ef1aa466dd6027bd7a2fa6a2780d440eb641a52d SHA512 e6015c7b5eed96714e2afac98132141f55067654cd65dfb510c4266a68fc69328fbaa28bc771cc8978ec45f512f50e3d4234e7be1c9f09932daec093ef35a7cf WHIRLPOOL a8af7147696e6171205e72eac7be239834c0ab33e538c1fe35f80bbf1ea47dc565e864db47ee5b1e44882be314229c804588de55418fa3c4497c35c547ba9184
+MISC ChangeLog 2896 SHA256 fe9064562fec4331c3d95379913398744521b1f40629e18e01e3ab53ad279d18 SHA512 08736da0ecf8b1d39788869423262e3486dc6831b5ef1b6971769e55487326d2f9de97c132b0f8cd88adb155e9429f04a23f1508b6b71168a2c374c52c1b16f5 WHIRLPOOL 7aa32f010a68de24ddfdb5899b8b0cb26f46d327dcc858c475959fb2ab5a961bb9e078ed4eaf7a6ee91a1abf75da1ce90e924e4b7cd2a37f34050677732e2191
+MISC ChangeLog-2015 2251 SHA256 8f87af4ba466889578ddf470bf3743036ac4f1ff50c272e7f03df6a137cda7c6 SHA512 e8bffe945ad56e64e64f68b282f8efa78cc43db561a87e5b95c967e4a6b89c438d6048b78b627c86737cfc565acbe95cb0c33fea7062f5e5e8ea58a418a0c66d WHIRLPOOL 89462a234ded7e3bb130b3addeb4250157193a7ccbca5ee71684324a979fc65160b09c24742803b8723ed277f06f15ca9d93cb010e301961865c639d3e27fdea
+MISC metadata.xml 429 SHA256 291b1833888603a87ae9bd9c6cbd2c28665590edf385ec85c786d3eb665373b3 SHA512 1896223e19ba2d91b519bb3dfea24535bf42676a3d53a115c9f101babf8c80f03bee6f9f84081cdeab592c05e3c50d22a157f5a1d71afcba1bde963576f4f651 WHIRLPOOL e88acf501063498215771e15e90bd2e155b914d88050b6f66991bd9c4382bf68b35f042f8fd26039227d70f356ff6a47688dbd547e3dd9073f7055498a4fa44a
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..ad784932062a
--- /dev/null
+++ b/app-text/chm2pdf/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>hwoarang@gentoo.org</email>
+		<name>Markos Chandras</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>rhill@gentoo.org</email>
+		<name>Ryan Hill</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="google-code">chm2pdf</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/clara/Manifest b/app-text/clara/Manifest
new file mode 100644
index 000000000000..04d8a2d31745
--- /dev/null
+++ b/app-text/clara/Manifest
@@ -0,0 +1,8 @@
+AUX clara-20031214-debian-vararg.patch 1768 SHA256 182f119de487727fb853a03f215f85d527a56d6a0d79cbdca767f42bff64b153 SHA512 3ec7c2bb9a11721c670ac1f74f2038f0909d0282392381be8c2bb2b9fd564b32dc94b56ab9458d95a63bf701816729610501e8cea2ca9088f64db62f560611bb WHIRLPOOL 19b3542b889a7724dd0aefd52b97a332c6cbd8e162a47f970f808c6af1932405ed66cc742b3ef08c9a2dba8bfb9f2ac3646244a7e6705b0bedc859195cc6c329
+AUX clara_open_mode.patch 567 SHA256 644267ddd9e8ade43ea90a49e008a2544e73c78e9eb885a88fb37ae0ac3b9222 SHA512 787972048c6ddcea4727b72a0b327486349876de2978358fcc4386010d5f43415e6573bf01d4c48ad747195718186954403ddae63a09f1bf5471995b17d27b34 WHIRLPOOL b8ac53f7f7c7edef04c2fecdb85776362c4f4e03d1bf02a07a5f70eee41efb266ad43a1487d9fad613a72dd3a89bb24cb99721f5c1d1f6a303b52ae137bed804
+DIST clara-20031214.tar.gz 451539 SHA256 baae846923004ac1b5b91f73057d5faf042eb499434e163b7ab6db88410bbce1 SHA512 260d710132a3903d71b6c4c0885ac1709b60d520861e3dcd5e4b75a3bf5627549c94423670be08245e7a9db6a870a93a9526c8d318fadaddcce00cbf02985f49 WHIRLPOOL 19d229f9e4f391eb7e40d93799467a44de23dc202be012265c6580d08a55f2a4c2fac59323df1ee61798435b763aa0cf73e8425da02cc34cd9009eececadddb6
+EBUILD clara-20031214-r1.ebuild 1262 SHA256 fe8da18a3a214cec0dbebbd86ff5a2956e9a93129d0ce961e31667ef1e33b621 SHA512 499a121d78c780e025ba45b9f56e1e8b8c16d7776ec2b21b1bd1af5b60b4c1526f5bd443c19ea697c12d5c7d519e902a17a15756c3d42f1cbe2972c49773335b WHIRLPOOL 7b02e6c11bf28fa4e7ba22d31f5cd60e0945dc08b891e4fe27f8b84e68d4b27896550894c8a9b995934d7a7944573b8f867937bf2b1774d6ebf9189406019180
+EBUILD clara-20031214.ebuild 1237 SHA256 138343f1357d16e0c4c8f51eb152d3bf9b85b398986f3923e99ad8f0e642fef5 SHA512 64b71ffa2203dbe8a579796787f1cdcf3c24576f2c4d59d710666c115d7c0c97bbe9a2dee3731900209d8158d5d729d01d3e1e720674f3af1cf40b3bdb05365e WHIRLPOOL cd820bca206a7bbe1d49cf05490ed262bd7adc9ca3e40fe54a0a050eb813db8b7d355bddf3cae39eeecd745cbe26617d12e18b0b535464a4160f30c0887d6048
+MISC ChangeLog 2866 SHA256 73a2e764527ded26f870550371f17ea3910d3d06d29647d39803e869dd13eb16 SHA512 09242a4fca1a071714f3f227eb46c46e03193ef652850296ae33f3ece3c7176466c3ae8576711fb5339c791d23ae84bfb58a3e4a75789e050afea6d88dbaf128 WHIRLPOOL 7b3588c75b8152162680bc74dbe735c21145db4812dfaa34c6ceef55b4010c5f27703ba60e97f96de640b62444d73edb21f9861d60a47b9515722033e89f18f6
+MISC ChangeLog-2015 2769 SHA256 2717a662efc46931474aa90626f89997bb0f0067d3796eff4427030ffa7e320a SHA512 55c750759e0146f8709f81120437f92f495377b633c3bd82bfcde57dcc9a7773787000f757435f38963c0f8fdae3d914e82d1ef98e7ac386813ad2ed20f2123b WHIRLPOOL 7f7b1a6c3e588e62041dd97a24957eca080cefc3d29c5477b0fa77dafa7785780aab7f8d747c5ffe771e85d1bacfdde7ada59bd727d64493978abad14b05fe27
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
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..e4243a261efe
--- /dev/null
+++ b/app-text/clara/clara-20031214.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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/Manifest b/app-text/cmark/Manifest
new file mode 100644
index 000000000000..dda50073630a
--- /dev/null
+++ b/app-text/cmark/Manifest
@@ -0,0 +1,5 @@
+DIST cmark-0.27.1.tar.gz 215574 SHA256 669b4c19355e8cb90139fdd03b02283b97130e92ea99a104552a2976751446b5 SHA512 a7797c9dfd54e20499666e37ba67b1902ef0d40867e7b941c1cfc93d4fbe935fb073be69aecc9f9f8c8e9524049037771635b45e071af981613431f3fbbe7b41 WHIRLPOOL 0eac7dd03176ca0fd21f89288b8e1ce92889cac00690e512304afa58c4e1777040697b78897c851a8c1c59d181cfc6e5ce3f5a980efd9939f66cc950e91fdc07
+DIST cmark-0.28.0.tar.gz 228973 SHA256 68cf191f4a78494a43b7e1663506635e370f0ba4c67c9ee9518e295685bbfe0e SHA512 86aeb42f17440c8e743057851bc3cee9ed4b3fa27dacc37d6af54dee7739210a712020e59c102ed1852b7c3f904881cb4e9b80ea475772095514c4025284cbb6 WHIRLPOOL 27705cc8cd65c5c094eb62a2d0e44942aa6f89e86218a8971ca7a6d617a49fdde44ff7358d77dd36fa42ff0cd6a54d473695742f827b773300b76bc221477cea
+EBUILD cmark-0.27.1.ebuild 815 SHA256 3c5f66e6d55cbe9fe377fca8df089efb6d89c002b3850d71ffc1a0d957b20722 SHA512 085a7b751106662ae8a243e87629d043816ddb157730596c09688895e512e67054791bed436cc6bb22b140bae221d43552f1326315c44c8b24bb808178b98b04 WHIRLPOOL b6433792eca872e6ac4aa4e0149eea2c416865a63d13420795b50e57055dc0a11dd08701a7e659aa4fb53a5f3ef85a33c0d0c8950c7129ae766fff74c1f74819
+EBUILD cmark-0.28.0.ebuild 704 SHA256 c93fad8ac579de965d686925267e5d11f948fd00f0c29cbfa97abf02ef0615ae SHA512 c279cc5b8d899436fed2eed3d4979ac462b28f2248e2fbab934d8ce4075447c11525deb6bcd7fdc7544c36abf71b113ab6266f59f8a1f626c9b84b0fc38e0764 WHIRLPOOL 62c4b9f9ec112e9bf9b7e46b9d24d7fca4ac60886d9650d5ff8bcb7855cfacb70a976f71b8b33f006cd1fbf091e57b9306c52a9229700b7d9de656304cc7f767
+MISC metadata.xml 577 SHA256 d2b2c22e471f2fc98e11f1c65a0002e0f63a52915b02e0c0f50dbcdc037b9d9a SHA512 93ccb3c6ec9907489589f3aae77d00eb2858d5d436b78be1f711a060f47fadf92d2da8a81a9388ae7946ad1b6a93cc88cb96bfe15cdd81b1e56bdd7f4750a4c1 WHIRLPOOL 2ade09f096f44c727c420a24ed56db4d034b7ad43b3404b3a0f9e162a95424dacc0968f5e71cff9611cf4fcb34ea85191839a3f8d21545136b6ac90441a27246
diff --git a/app-text/cmark/cmark-0.27.1.ebuild b/app-text/cmark/cmark-0.27.1.ebuild
new file mode 100644
index 000000000000..a69f2b36f50b
--- /dev/null
+++ b/app-text/cmark/cmark-0.27.1.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=( python3_{4,5} )
+
+inherit cmake-utils python-any-r1
+
+DESCRIPTION="CommonMark parsing and rendering library and program in C"
+HOMEPAGE="https://github.com/jgm/cmark"
+SRC_URI="https://github.com/jgm/cmark/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="
+	test? ( ${PYTHON_DEPS} )"
+RDEPEND=""
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+	# Remove static library from installing
+	sed -i -e \
+		s":\${LIBRARY} \${STATICLIBRARY}:\${LIBRARY}:g" \
+		src/CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMARK_TESTS="$(usex test)"
+	)
+	cmake-utils_src_configure
+}
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/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/Manifest b/app-text/cmigemo/Manifest
new file mode 100644
index 000000000000..f61c57d80d96
--- /dev/null
+++ b/app-text/cmigemo/Manifest
@@ -0,0 +1,11 @@
+AUX cmigemo-1.2-migemo-dict.diff 825 SHA256 cacc1b65bf7041d9ff3628c1cc3c674ba5a210053addea8c4c3b122891455a84 SHA512 e7b6826c4ce5a87a7e95743f233efaa6a5edc2515a86c85dc24e7dcf9d9a105fbab2f9fd8a81b3ff124a032eaa8dfd5050ca23ef7818ea29a7e8f9c44877388a WHIRLPOOL e2ad5aa998f78758f1459e6bc3d0c446d2d27f425aa0d008644a92784cb7d2c27c5d1b85eee321eabc8ef9ad21936cf28fb6d4f603c9af3180e8315554e7318e
+AUX cmigemo-1.3c-gentoo.patch 1948 SHA256 d985d7802b70afac6b5170b0b82bee0478ef42eef96d0c59c34d0104dd4952b3 SHA512 90035c0fbf3b341113e4991f08c9962e27d37f6f215983379e92d7c616a67662b8754f390f9f19f7c84f1d5cc9a51a815999ec6c84e7c642758b3324f05b7837 WHIRLPOOL b06a1aa44ca5abcf22a7deb2447fd454fc0a0786dfebb07afc05fe85ce168e4075a112218397d6c2e050cab754e439047ba4f56bcb881b702050835270d1f7e3
+AUX cmigemo-1.3c-ldflags.patch 502 SHA256 4a1e0c3c84d88c7a1538422e258cbe06f0f2e3e8309d723544d73e234b1d7cc0 SHA512 932bfad5afc4c90531cac96a9a7fb06d1ed690b3391ad9425c5ae1baa7caf2d8046d208e25816ea4ecfbbe44b2a95216e551cbbeb7808548f534853e6b817f7b WHIRLPOOL ef9b2cc3242b5a9b22af611d8e9eafe431862ce1068de9ef6d87b7a42413066ba72ac4310ae2c6231e0f8e9a1edd9314c7c90a2cbe0aa654e3ccc2d47300e73f
+DIST cmigemo-1.3c-MIT.tar.bz2 54447 SHA256 1923882f420aca97d726161ac532491419debd2b746506b1c0ce4fc1dfc79fb6 SHA512 8c5b9109f4309906ed19d5d48643918f51c339be7f3b34c90d2d814fed1b6d30e77a1539f6c1e11ceb3560f83fd9e1079254af0b41e81b274e39128de6ffeb18 WHIRLPOOL 05cdf068242be09a34de25c15940d0ed7d7f779184ff63997d268f34114403552bcb21f1b3e62cda3c429e5deafa081fef56beca2ed4a67bedc75d25232c4961
+DIST cmigemo-1.3c.tar.bz2 54323 SHA256 d42fc98e062ff88886b3133905fa540ae41694fdd222ac0b88433046a9b6de59 SHA512 240bdc92139d692cdb9e98a977f77105ef3ca716ede030629b3c4652276f0b0955ae80cc443fb879cada4b3fc83f7e4181043355e0285fcfe1011f4db4d13cc1 WHIRLPOOL f82f7a4686c2cd7224e08f036694c2d16461709906f77ed3a186506869628d739ed575cc4b7603629b7490a6b34e923697520f4f55518f3b220919ff99c6e9d9
+EBUILD cmigemo-1.3c-r1.ebuild 1910 SHA256 51826dd8e6d1e17aeddd393b963a2aac2dba57dce11ebae014bbad5abb2226ba SHA512 f8c23bbb27d3903b67923effcb087ca39c3e02a6168fa35867271935e408e2f1787fb30e23cab917050933c8d5c12b8d00f52e233630273649af43f98be08172 WHIRLPOOL 6f4df4a59015b20552015298bf8034839a95e54c003489d7814642a2c79a1943eb4db76f53b7bc4d7f41a97332c33f0783a2a47c0706910478e44f7d4b5e8f1c
+EBUILD cmigemo-1.3c-r2.ebuild 2065 SHA256 12450e883161edb4b7cb0795ec23fe1a40bce69ed1b8688b8b7ac4c9849e05db SHA512 0b7889d5d72b57f5b9b9d917fff39a125e08b0f762cf0bb455370f4297788a3dc2ce50071c65e4e4cd5a01e10c54af38117f2cc785b121ad330b3bcd416b1772 WHIRLPOOL 63fa185e5a3ba95a8f464456ef954a0ae82380b060f6564be6ba373c6eeb619642a6f5f168f528d8d49874ef33e4a799c7e269a68462dc976bda6c4ab68780f1
+EBUILD cmigemo-1.3c.ebuild 1576 SHA256 950dcaa9d286fdb89321a643f43c344a5dd0ca48c9b60d2c95cf7c5edb512aa5 SHA512 cd42f961ef05ec7bd653cefae000960e97c24b4e32f52aabe02971c3305c823561a5b51d555355f7045ef59fa6d6e7a6982621f7b4b85f2b789ac2d984d92da3 WHIRLPOOL 6df467a6dcc2644c91c30ab1f0b46c9ce52a517ca899fea9df77d672f8b0a52398a5614e15daa4f8ee1e03879c9a1405cc5f4ac3cb7ca888d7e48c51f9e19d3b
+MISC ChangeLog 2647 SHA256 883ab90708c17f503820fe657c2a186a518f24cc85a3b2112330bf4b6955d558 SHA512 22012600c6377e2b82e3d5fde93043b9035b3ec0357f5b52cb23fb4ba905048db5d0644e3c02ae079c19835a0c424d0025b1da779773827f285df31b53306418 WHIRLPOOL 1bf72acf90709c60dbd6bd7d0adb5c96e192a4aa8f86245279396e8fc29f91a31096cdbcb7168c7e17ac39288c1610af60291d86151bdc3cd2fab719f78415d5
+MISC ChangeLog-2015 3440 SHA256 72c8075c8663ea29e4415d6782eb6dcaca024bd4eec686fe667b2167b93e9774 SHA512 285ce6599ce3a5882a48c51360057523d7e7b8ffd7113ff77d55d0559d28cadf7a412e8e408e3b87f5f4792075b5cadde2a1a8aff8bf16741a0d3b7aeda796e8 WHIRLPOOL fd19cd93f31222127875df621ba5a7267e96605a8c42b59755da427d7e507dcf35f70596514095e3680207583a143ec74fad4143f12a4f1bee16181fd41a69b0
+MISC metadata.xml 234 SHA256 5ee3f7d7197cf269efebe240796a0484e0bd2da3cff78e63b87c32cb4297c175 SHA512 16ea852f76297335e7ef70c8019fe09d46c0455922c049ba6e92696232e957955fd671d467ebdd0bf7837d39a26083d5be2a6f8abeba53807f0b8c5b97f2e441 WHIRLPOOL a29087cfdc7418c4dfdeffc62f80a934a759de3f014f9599dc3be9a8292c4717165dc75c1a565b4dca34479115f4ae17ddb62aa6960e93ad71e12b4c26c8040d
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..7de417e11521
--- /dev/null
+++ b/app-text/cmigemo/cmigemo-1.3c.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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/Manifest b/app-text/code2html/Manifest
new file mode 100644
index 000000000000..12cbe91f5f49
--- /dev/null
+++ b/app-text/code2html/Manifest
@@ -0,0 +1,8 @@
+AUX code2html-0.9.1-prefix.patch 1393 SHA256 f07c9463f086a1afc4d672178ec37c55e1141393d248dd0580f0287290c9f3b8 SHA512 3331c0590e992b098548cc10deffc270b4ed7cb790b747124a2053ba8a96274bcdaa08eaf8513f24a6ec8d9fb6b9bb93f8690a55d00e767085c005dc2e5f7ca4 WHIRLPOOL 9ea0837fbc5259c967f1f58d84454223df7c32b75000ef70fe65ed6d84ec97ef1fed07479a576db8d2216e0ed483c32b68da2f7e3cd10038fce3d69b17dd6be7
+AUX code2html-0.9.1-scalar.patch 1435 SHA256 ef9872b3e5bba28d8678785b5efaffc10f4c877cf6ac7f596a9c85af64c3b779 SHA512 5e7124876b2888b24792d351d958efc09daee90422cf457a2a820920d6185df0d53dbd68f79acb084e4b4fed45fece8dcfc642ae94f0def78567e4f8366022b6 WHIRLPOOL 8cef153944f6788ec3e3c04eb031816359d9e5bc3018844ed928bc46fceb4cea34bf112a8c38043962002c9c1ac06ebdc293390cb954fffebabfd01ef8c29bb2
+DIST code2html-0.9.1-gentoo_patches.tar.bz2 2666 SHA256 e1a1ff10d861db2d52435e29707a7de0e779f0afeb6277cecde438cb98f12092 SHA512 cd478b53f0c11b9b4838a842bd8cb344698c85b1c3e09f03a75214f4002f4748a15f995530d6b6c743a4edb784c8aa703786ec10d3bda971b9485153e7090fdc WHIRLPOOL 7b7cbd9401a7cf1c7e815add7fb21c64927b80799a3cb3884968002f847145bf2d8417481190b217f6c1b3ae2e5bda09ffc8e71c9becf8f9e649f748dc8bab3a
+DIST code2html-0.9.1.tar.gz 39811 SHA256 f2fde58ba378766a21affc692eeac622aa1c6434f05c993aedf53203edec2d84 SHA512 97fb8cadfe64a389711c58b13b7b5d977849f3a242c32a2456f93d7abd39f5d0a4152416f5c73aa05f151316ea0d8486b2b9923a5390eefec3e9d8253cc0b2d3 WHIRLPOOL 949dea088ef02753b59b114d930bf02c4ae7ef14d23b2cc2df6d4dfd06e79b4e40cde043927ca9ab68f45edeb9b7ef25b6605ef2011d2af2b9cb09d9b69d8952
+EBUILD code2html-0.9.1-r2.ebuild 1024 SHA256 324f6ef773e88c3cea794de4aef63d1a5ca129efb0463f330eb58e1568c6b611 SHA512 17b5612546ef90b77cbaa14f3da9820dda7c7a11da5b7cf1d760b829aaafb14cd2b89bd8f5d3d8b5c3c1a0b34e3c72e12d380ad047decf3bacdd1a1831765a35 WHIRLPOOL cd864abb3efda62327a00cedb7ad8f04fa62990e7093105ad2e66db011ed972c2271f03f58406ad691fd1107d39e2f2e23a48920a870d543b2b8c49deccfd28b
+MISC ChangeLog 2674 SHA256 a36b69003569f2af8bfd57753c63d7048ca58b21460300652cc432bab28c4121 SHA512 97a6f2749e5247e0f4e643af3675c680466e978bcce9683b96e76031ab7ad3b45ef37660516dce35a3e4fb360b2fdab16762a71f76ae7344388cb7258de90d6c WHIRLPOOL f5b3c6d0b6faa9925546562867b11183fefa4218bb720d362c3d150a300a500efe31275c19afe3b3048af7ee8b54cb8c74697d86de3b8793d4e10f510be8c77c
+MISC ChangeLog-2015 3504 SHA256 3708ecc1b3fdd666d4a814f93bf8e2f42724fb71cef64b14c8c9f77215a2083e SHA512 af4b4b61737ac6f15fff856a94d0ac2e34eb540c45d6d1a41bf6eceb52d1e6b237aba96560b98697c29bdc0f3462d05d2a339e6c128d5e0d868a5c27ff4e7d92 WHIRLPOOL d0051a06c7d3e9593c6d34d530fc7fcd06fba450bbb40d767648dcc374e471c120f7c43b4a1a237d0c6a1186933238e2933ed4580254acf66fac954ccfede44a
+MISC metadata.xml 363 SHA256 fb0eb1def06cf0dbcdcbbf31c43eea9f75c282152a952e44b424659a6172697a SHA512 52e56f49ca7fa6b899f18be6602bd2e1c2987e5a4663593cc2e857a47e0f55637585801e656f79029e68d277a2b89d83f27953644fc778f6e7d425e2c3adb00f WHIRLPOOL 309d4001b0484efa92204c2d2ffc12917486a25086469820dd89746de98a26d41ae1f51a20007c0dcc901334f69eb7945ad661d49513ac64e5dd4c79ad56bafa
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/Manifest b/app-text/convertlit/Manifest
new file mode 100644
index 000000000000..fef72c64d35a
--- /dev/null
+++ b/app-text/convertlit/Manifest
@@ -0,0 +1,10 @@
+AUX convertlit-1.8-respectflags-r1.patch 838 SHA256 7e7eca180e5edc04b55cdf41476eb4f8659d5ab4e9641ad7891e2a1267e2cd88 SHA512 d02f79dd787712eeab3b13ea7b7e8553a3aa31767bf1a10cc6a714c9e93b6c82ae1fefce9507393268bcbd8bcd9d5939ea41da4a5b18368f4244b5f2e6eb2256 WHIRLPOOL b210a50021cbd12861b677daa96705973b5ec4fe63ad556db29b780ef830ab28cda72d38adbd60349c1c85a22374a14c35dd91a2ca3a298df95af5fbbc162d92
+AUX convertlit-1.8-respectflags.patch 840 SHA256 64c23b1ea950305f1f6a47e248a4454a8b73091fdc58da05514e1178ee6976ae SHA512 ff5bc3ddeb7e59d6068a907bae710c705c861e9f8f439b8d6105c2bc2bb391ac3407cd884f8baa1d0998c60ab4ffd9ad53cc35dd64dcd461f4ac2f6782723dbc WHIRLPOOL 5f7a20f462e2dd6e1cbe9cc9e7866c4db8ed73fac770a67a077e3b2d61594f117ba550e6af8e4b28ca7efedb5f6b33567d70cd34166c4a8bd045cdf8244045ce
+AUX fix-Wformat-security-warnings.patch 936 SHA256 79c587cda8d7639f362d83756508af15f8e7b24c9388eebca2df6e3956544e3a SHA512 6f8798a8b54951c15da4f28d4c8103811c4d77ba96eb12a4e19bc35876c148c1247d19ea5b3d60028b156d50d5dbd67ec5254e47a556d195ca8c084bbc571e4d WHIRLPOOL 5375ebd2ee4cc8c17a9f2cd92566da79abd73b017793b1fba69482c0da85278b0aa780e17e5be21c39638d58e32b1191d6713a5c27161f93d9da5799ac1e13ae
+AUX support-ar-variable.patch 408 SHA256 e5f3ae6c0d2d25e548d7d9eb21912e2e788cccf051c6cb518681640b0ee4e67f SHA512 8d807507cccc58979092becb1725d4871f62746f06b3d4ac8740a0704019d3900cd60098497a0d770fcb9bab68e9bf34dc50219afda0995209ea88a71b084ce6 WHIRLPOOL 29ce8c70f350fd1e7841ff4787b4debf27ce0f801ee1572106fb6541939b32f68e3e16e3c34b3d79931c0fd3120f879d1dda43088e05b3c4c7d6513e18427a8f
+DIST clit18src.zip 135120 SHA256 d70a85f5b945104340d56f48ec17bcf544e3bb3c35b1b3d58d230be699e557ba SHA512 0d4b7d525f5164a73a47a00e1c4e93ff50e738a4e6c541ded283c4779e6a67138f601c23a41344517ca5d7f8c9141b25cc6edc7f3967fbf9042e99f647354f36 WHIRLPOOL f6cc678fdb4c9b00a5389aa3a2950509c62e5eaf3a9fd14ef38134ae594a583c0d32b0bcd0a940fdc7c5976f0fa160f0fcfb4ae33c5d6251272fc164eee118cb
+EBUILD convertlit-1.8-r1.ebuild 882 SHA256 2236b14c47c3c79105304b9215ca12d60a286a4a56a28df070bef95ae19e7b44 SHA512 6dc7d07e27d0ccb621aedc5c9f9c8f99a311645fcb6f1f3761ccbed34c8af4f7b0741bb08ecbb4e4a5994ab2ecc39c6f37772d0799b2c0f8842707dbb5ab7c39 WHIRLPOOL 58d0e4d6c294a9e5195b14b28da7783cf84b1282246de3d1c36dcf5aa3270a8ea87da281644377dc7613a98b2b7982166c942df3f417e98fef221adb3d5a51e0
+EBUILD convertlit-1.8-r3.ebuild 956 SHA256 1961816736636ea05e9cf37a039910eb5ebec5c496e535329e4ddf10c649b025 SHA512 e17043bfd5060376468a160f62b635ff3bbaa430cf6083d2d1a05bd9e8de5762efd912ebef0edda1ef551d7326d69d5898a462def1fb9095e60380474057aacb WHIRLPOOL 580c408cc05deb41ec018547f0e6bd2f263e3a67f8582616c6b50ba080641b46f0ee21ed523890fd11b42bfa3443193b19656611a4b2f3c4ffa9c3cfb8eadde6
+MISC ChangeLog 3278 SHA256 d1ca55ae39c21bf9ebb1a7fcef746199eaaa7cbf8299cf21e1e7939eab3d15a6 SHA512 ebf98d958c7095e1d0be40e5e0af4f6151698147150dbcfbaba4bccf1df3823bd9925df50322c190a83ea15420b86c30b7434bfbee4abf8ec6f5861eb142d1d7 WHIRLPOOL 6e35fd5bf34c10d67022a6c56f7908533f0bbb559bab2eacd3cdcdb56d9605703840aa82981eb065ed027d77de2a5397e7b959de81e1baec51852a43a105470a
+MISC ChangeLog-2015 3406 SHA256 99238294d1904e5849e6ff9967e68dfb18839861ec80ca13525677effd82ea35 SHA512 672898c3d2fa562741ef25c6a657df2e40a49e4f4637deaa54763c3a27a954915730089498705053c5b304f9eae23aca3e23f6e639ba8ba03f01fc7924d642b4 WHIRLPOOL a7dc7335bf76b1b872ffdf2e0e46a83ebd267ac6457f2c54e15ead6e907658d05de3e98017a613cfe29f17c49936b0673e3e0860f1da8b797012c67c65d1418a
+MISC metadata.xml 562 SHA256 fef5af983ac851a530f45366c84dec3d53e3f35b1dad40c28e077ea4e3744281 SHA512 1264f1669bece35fbd465ebf7911c7d416d85d092aa6e1601b240728fc2a0cb521d913e3bae08962fc5e70c2b70ee17989191e0bc21f04c9c1ed30592ff4820e WHIRLPOOL 57d04af62ff4bde1f67d8f498438cf74a9308fe1a2db2bcfb87ebc0c38dc35f787aa517660e5e642987d25141a53ec6401aed5cda540649e39e1d899cb483f6e
diff --git a/app-text/convertlit/convertlit-1.8-r1.ebuild b/app-text/convertlit/convertlit-1.8-r1.ebuild
new file mode 100644
index 000000000000..d24d3282ff58
--- /dev/null
+++ b/app-text/convertlit/convertlit-1.8-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit eutils toolchain-funcs
+
+MY_P="clit${PV//./}"
+
+DESCRIPTION="CLit converts MS ebook .lit files to .opf (xml+html+png+jpg)"
+HOMEPAGE="http://www.convertlit.com/"
+SRC_URI="http://www.convertlit.com/${MY_P}src.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE=""
+
+RDEPEND=">=dev-libs/libtommath-0.36-r1"
+
+DEPEND="${RDEPEND}
+	app-arch/unzip"
+
+RDEPEND="${RDEPEND}
+	!app-text/open_c-lit"
+
+S=${WORKDIR}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-respectflags.patch"
+}
+
+src_compile() {
+	tc-export CC
+
+	cd "${S}"/lib
+	emake || die "make lib failed"
+	cd "${S}"/${MY_P}
+	emake || die "make ${MY_P} failed"
+}
+
+src_install() {
+	dobin ${MY_P}/clit || die
+	dodoc README
+}
diff --git a/app-text/convertlit/convertlit-1.8-r3.ebuild b/app-text/convertlit/convertlit-1.8-r3.ebuild
new file mode 100644
index 000000000000..dcf0a65454ec
--- /dev/null
+++ b/app-text/convertlit/convertlit-1.8-r3.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
+
+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/convertlit-1.8-respectflags.patch b/app-text/convertlit/files/convertlit-1.8-respectflags.patch
new file mode 100644
index 000000000000..06209ef62ada
--- /dev/null
+++ b/app-text/convertlit/files/convertlit-1.8-respectflags.patch
@@ -0,0 +1,28 @@
+Index: clit18/Makefile
+===================================================================
+--- clit18/Makefile.orig
++++ 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
+===================================================================
+--- lib/Makefile.orig
++++ 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/Manifest b/app-text/convmv/Manifest
new file mode 100644
index 000000000000..3ebc74b45e2e
--- /dev/null
+++ b/app-text/convmv/Manifest
@@ -0,0 +1,7 @@
+DIST convmv-2.01.tar.gz 29375 SHA256 782ac06982aeaf8ff3ab8fc42cb49cb8bc562dbd1e97ef7e17bedcf3ecf2483a SHA512 e82957bcc1462b17c5f667e85caf0d2e8c407fb48afc6faa957f45626cbfa58c141de05f43cc810e8d4abbadc4cc01bf87ee64c157fece20fafed07ad04cc48c WHIRLPOOL fc7f6f6b93c872d1fce69372340b97165ec0138fe02952d7737bea582e6ecdef89cc766e20b7fbf2d75925ce5bf6759d2accf8f276f4feaf02383dfcb33c1bb6
+DIST convmv-2.03.tar.gz 29688 SHA256 f898fd850c8ef5abe48f7536e4b23ce4e11b6133974b2fc41d9197dfecc1c027 SHA512 21f71d8009ee0f8e6b67f439809d2330e3c1a4073be8e5ad565829b89327115d25235d7f6019d96ee9f93d83e33df0869b19ad7cdd4cf8777e0ebecec437147f WHIRLPOOL 11028f4c664ab6f3672c6fd486fd24114aa5969c121d41554aaa873a72be1f254a9570aa22c1648719bbbafdde602432b9cb0a8737a1e905abefdd60033bee84
+EBUILD convmv-2.01.ebuild 686 SHA256 ba994c874cfa131b4a8630a842212354728293415537ecf82e9f2f136f0b7960 SHA512 a18b53165e2a2017bf21b5dd65fb0c9b90e74ef3ea293b81a0ea139cdca2423d24615dea827e3c3b46d881f1cda6e00a1e529e1a7a23e5ce56a0d2cb4a8ca635 WHIRLPOOL a9893ada63aa65c5820fa62fc11d3c933cde9f3793c091f4f7eebd1783c1cf595bcf2cfdba634c97ea513c760e4eb1b2f2315d9f6cd4e895c98dfb400c67041b
+EBUILD convmv-2.03.ebuild 694 SHA256 e3c15e9035835323e9bbbc560361d3e9a0a1c0cc97879944a458b55efc51c42e SHA512 150e4a53edf05199f8afb637d9cdd44062688cf7f41a3796bc237fbb88c7a1ba4d4625987568b1a93c88cef24dbd53ec23e538011efd76490f7272d4dfbaed8d WHIRLPOOL 4f0ed92660bf30231e02377135197c9931aed2100a3a55f55f73744e7c8b22876539c45130076260e2033e27604254e900ba2d96b49864e53863acba3353e21d
+MISC ChangeLog 2271 SHA256 5a768f7bf23cb42ea56dc94a64c63aad2ad67b6f4ee72e81da375fccc1140f0a SHA512 5b4a5d3f9e7f56d85140e70c5b7e62d415983c78ca237294a31211a8c716042418eb2b480320243770019c0d01fbe2f8c0c97466f28406ef1247d5a69b8f1f69 WHIRLPOOL 4bbd5949313171a10e10a0d3fbe9cb6facef72baef7963202f8c2b517b03fe69cff6c276b602b40ff16d4317279486545c7fabfa0ff58e9f1886d5cf6910cd89
+MISC ChangeLog-2015 5112 SHA256 43efe9b107a2df73c864cb4fc8d3566394557ff57b805c71c481336e1c3329cf SHA512 f55e7ad7b9d78c731b9fa6ac868e1638f312924b1e7107cfe8173b98bc15d672a58ee1eddc9d65282ce9f919c46df9163805c5e99779ebd7d6a963bbcd771d7b WHIRLPOOL 1f268dd108f68da970afd4ef10522d25b42f80211c12508c53d97bb7596f6624813de58d27d9ba238bc3aece6ce5156629eecf3009c59bbebff241f50e39a5cc
+MISC metadata.xml 257 SHA256 60e4ef3049f5fa18420a7f022f935739458c852364eae6f39636410f0902c089 SHA512 ff078cacb115b8f3624b45d883d8ed72701e3d2fccae06c04c633eb60821b23681cc151e00689d1b6035c94570535e7ac0de51a55dae99f606886164883185ea WHIRLPOOL 81d95f2549c08fe57538c904c4d9d89f5c12c342e3ad031414bd4abb4e58fc8a0c37edbd62941fbdbf2b5b69ab2bec2e6798704b53b35f78806d625ae7377697
diff --git a/app-text/convmv/convmv-2.01.ebuild b/app-text/convmv/convmv-2.01.ebuild
new file mode 100644
index 000000000000..f33868fa45fb
--- /dev/null
+++ b/app-text/convmv/convmv-2.01.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 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="http://j3e.de/linux/convmv"
+SRC_URI="http://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.03.ebuild b/app-text/convmv/convmv-2.03.ebuild
new file mode 100644
index 000000000000..6fad4bcbd995
--- /dev/null
+++ b/app-text/convmv/convmv-2.03.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 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="http://j3e.de/linux/convmv"
+SRC_URI="http://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/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/Manifest b/app-text/cook/Manifest
new file mode 100644
index 000000000000..a1eada14b610
--- /dev/null
+++ b/app-text/cook/Manifest
@@ -0,0 +1,5 @@
+DIST cook-1.0.2.tar.gz 139428 SHA256 b56bab9d5227a37c50e94afc65923a579a0c2ef08a23a6fddb611cb4fd1006da SHA512 6941d3541a6cccc18fcbf14128e0593556148d40f74715b0da943455a223099406d632466137fabef27a2083b582701df92666a1ad6e6a04f5d2d3dc0b62e1a1 WHIRLPOOL b16482bfd614247fda8def080fd872945c614ba13f59471ae84f8e9c4997828630b44b2f4e7d87d586e3ba3d4be41721d8906fa9d8d75c879f84079dd6138bcd
+EBUILD cook-1.0.2-r1.ebuild 1123 SHA256 f450d55dec65a30278dcaf629bd6582fc0209ade0d6582d7e6ee42fb04f7ec60 SHA512 dda71a638f351197f0c18bfacd14c048a773249f3fb2358a58f9bc42943f4dd3724762c06b4aadc37984626c2113112a7d31f8c8fefbde0b7c89a596d9f6b54d WHIRLPOOL a0505ac6b561fec1ca46387dbcb2b04bbd3dc0987a9adb4b266fa1a5ed9e9ede44f86083716e9a841c5a014d789fa15b7da68acf6235f01d4773ed543d950bba
+MISC ChangeLog 2519 SHA256 6a35570e16651d7d24d41ab2b41b83afc7d63c2ce9ea11265e1b33e25df565ad SHA512 bd3cc1221374881374e6b26d1d600fa3f446bfc473516bf7ce61c13f1e82fd934f19fd601917b69b2c0e3df03c424d63c7d7707d10eb9dabe98992a1c754f34b WHIRLPOOL aa204e55dbc7dfd52be1a07d4d56ad181c78c90b7fd6354928e024785ebdd8ee081a04f7361db1e5378d3ee95bfa6f2bea4da93ad842e6d01ba2e9e580013d54
+MISC ChangeLog-2015 2092 SHA256 e1292873fbc62f1b6dac03bad6b8a0a92c0f2702bb19a74d136cb2a24e93eca6 SHA512 3d6a6cc4968e356d449167875d4110c66ff829deb05c5c3d129544c6dcf4f5907f6cf99b6fb79bb1cc6337d36f43aba182dbee537a86259a7dac1d6fe791a945 WHIRLPOOL 029a668545640453b79c7e98b34d04597f980c81da0e20af42ec21c518f952664d7c61ccc913cc642fbf41a4f98b6fb835390ab23ce49aaeec1dba0386cddaf7
+MISC metadata.xml 241 SHA256 fd7f8332cbf731d6c69939a2a5668b0cee6c79562920be61e5e75eb542fffe09 SHA512 36edaae333e04297f6f6357cbcaaf6360580a83e20ec3af8b09c1010601e47c29c45b6eec5347cb90f8fc1fecdffeb1074d3ee55dda78c29026210ea58a7264c WHIRLPOOL 9d7a20a5e3c8195b0ea29f1cbfb492e6d0b2c5bc153c2fe8c8dd8b396370f267b21de0b6619cd61d585fcf5b88c05bcbc2aa014c8b5cbce25397bf0ab575b1eb
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..249c23502165
--- /dev/null
+++ b/app-text/cook/cook-1.0.2-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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/Manifest b/app-text/coolreader/Manifest
new file mode 100644
index 000000000000..29b19235a9f0
--- /dev/null
+++ b/app-text/coolreader/Manifest
@@ -0,0 +1,5 @@
+AUX cr3.1.2.71-r1_qt5_wx.diff 10066 SHA256 54090908b2e20a33888a85cf8d5a371b624c54a002ea164b1a01ff5cfe856838 SHA512 9f7a82964d1f5c308ad5124433dd0ed7debd715f1c0c2431bc84c9bf71d1d5dbbfb82a669b1c6ee114196c5e8ba1b745b07cc2195d4198c664ea15cf82182384 WHIRLPOOL b6e586e1179d9acd0e584591db3c65b6a9151e1f148154b15f20fef0ed4f7001747b66fe6db97d2a5e098f718c764991dbc6ac302132fc10a6b30a2815d60336
+AUX cr3ini.diff 1535 SHA256 8028aaf8bb1b3dbf0d48333240f83bbb9ef1b71a344b1ddce4bbe47cd9c35f29 SHA512 efd7bfda3617168bda2bfad9e561b7bf3de89f141cf4155618bc6864fa5497d5b0e08ea583b302f4e9e3f60442472c7e5358313dd49549dce3fe078d58ee4ee5 WHIRLPOOL 5f2128c8acfd9900dca9a0197857c97cb84bdb221a9edb81e4fe73c910c0a8eceaa645e310b6d6bb8034cf8119086e90d857ff5d702c545a13cdeb80892b4b4b
+DIST coolreader-3.1.2.71.tar.bz2 10141514 SHA256 746345984be549284713a450686f0c8b04f1485f9a28bedc457940ea1b52f7d1 SHA512 2859eabfc8ba603d1cb09b07358887135b6968268a5f2fa7f874a1e8613d1b5ebe69d9b133f16e84321d1a460eae5088a7947433c6fb340a47bde9ceee415735 WHIRLPOOL b8a8bb58c811592577dc4e1b9b1ae0ed0a3dd92e277b1501962d2c7683c0969b49f71fa147c445f7985cf82bea6431a818915bdf2387f48831fab70defdf42c7
+EBUILD coolreader-3.1.2.71-r2.ebuild 1769 SHA256 cc0542f20a22c3100b8a364de0dedfe0a39952924bf6ff93081c17cbb23e5d73 SHA512 ba1db10c44e2cd8ad697596264d041c3eafad8ea82fda1878ac6077696e928b3e2b3ac335f63878d7849ffbecd66ff5a220f64e3425315c5f1520176c842d0bb WHIRLPOOL 203159595225b5c3679757e58d3f77f25fe9f867b3211ab4b33be68df60d02c965edd1a820c9f0c1bd3addd0c965411881770a807e45fe3334fbd8464d663d56
+MISC metadata.xml 528 SHA256 f8cff5008df71398dab0c06b9158da710af074b900e702e40395d0474ba54b57 SHA512 7cca7abbe95fc510c91f0c3b4db45257b00dd5497c1f978e398d4e5a7dcd8238e9056b4980eaa9e4cbd97cda9b5781186f87301df17383b051a876d0974cbf8f WHIRLPOOL 5086b2a5c9164b565f8e8b727821ce41c979d35b239f68541a4fb2ba1efdf6d4e8338ecca493a9f921b8d7a206c51c3888f6f5f234e6ba455126d5841daecca1
diff --git a/app-text/coolreader/coolreader-3.1.2.71-r2.ebuild b/app-text/coolreader/coolreader-3.1.2.71-r2.ebuild
new file mode 100644
index 000000000000..afcc1ac458be
--- /dev/null
+++ b/app-text/coolreader/coolreader-3.1.2.71-r2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-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:3.0 x11-libs/wxGTK:2.8 ) )
+	!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" )
+
+src_configure() {
+	CMAKE_USE_DIR="${S}"
+	CMAKE_BUILD_TYPE="Release"
+	if use wxwidgets; then
+		. "${ROOT}/var/lib/wxwidgets/current"
+		if [[ "${WXCONFIG}" -eq "none" ]]; then
+		   	die "The wxGTK profile should be selected!"
+		fi
+		local mycmakeargs=(-D GUI=WX)
+	else
+		local mycmakeargs=(-D GUI=QT5)
+	fi
+	cmake-utils_src_configure
+}
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..afd1b4bc9da9
--- /dev/null
+++ b/app-text/coolreader/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>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>
+  <upstream>
+    <remote-id type="sourceforge">crengine</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-text/cpdf/Manifest b/app-text/cpdf/Manifest
new file mode 100644
index 000000000000..bbf22988e0f0
--- /dev/null
+++ b/app-text/cpdf/Manifest
@@ -0,0 +1,5 @@
+DIST cpdf-2.1.1.tar.gz 349536 SHA256 00a3c8b6f1ff60feff7d0b72c095befb576c08edc35ffee28a4d3a24ad599956 SHA512 aa06efaf098d3fe3f560ea30da9c3546e13d294b22d61c4cc3df553eb90e338d59ee1b51d14d7982ce52967bcf98c2afec9a5b5ae101e2183961f4be862c6517 WHIRLPOOL 317af6b976820ddbf3340b75e026f673bd47a7ce4f7de715cd6d71754b1fd403a4fadddffee85023dfd9a6aa44dfeeaf8dfb025784e70d0c33f0418420b80fc3
+EBUILD cpdf-2.1.1-r1.ebuild 815 SHA256 8ff99a71be01fb9de9acc5820fa337a9f88c3951475726d43719fab6f4891a11 SHA512 e51916639a09447f6cefa7d2400c0ea1349f52926acd16b6d4ef250c5a4d865af04501763e0f0d40d78735e426b601c8d88cf171d2cff374898b6b98a3c8fff8 WHIRLPOOL 7a0e644a92475b6ee064aad643c61f4e63983860352da4778e8c76ca3c1a4b4f5bdace904daf0d39f37e9594e349d905bf08b12d951bb0488c289211cd116403
+MISC ChangeLog 2173 SHA256 a5ed10720db42da669d2cb58fd9c571e0c7aa464cc139296d0cb42ec3ce2e424 SHA512 64bac7e317e6e49864b8304b9e1d26d1c0eb7b34ea47bb095570ff360064ae3a1792a3f7c90b34c279c18ceb2ba04fda179698cf54297180a8a5620e106cb8ee WHIRLPOOL 4b4afc8dd7ceebb381c8878b72ce6388a4d72705df5e9a0671d2681c148c5d210cd2096fbb0226959cb4662934b2b033766c3a30c0daef85dfde82fdf5e5cf92
+MISC ChangeLog-2015 985 SHA256 7da17d0a66b8128912bccb9393cb70f7ad4bbf51773dc3ffdedda2efc77942a2 SHA512 05d5a938faa40b5c88c5cb78e2071646362552405617449092903dca4c0f601edfa07a6bf83e367c179795b2787e64ad5189964b3718bff536ac8c78b2ebf13d WHIRLPOOL 6a8d08a96b3b93468f7d47230e86d9363c2c1c605cc574349ef27b3127ce565432699510506a6fed61e67426197687eeeb3174f77ac46ccfa086f862289438ea
+MISC metadata.xml 347 SHA256 637d334828f7e923148ea64bdf6f3de3299e6c500f36980ea7af782a6fcdae03 SHA512 e97b4580d3d0e3c06a6e24aac842e66a354e2a9ea9eb70486383143999a2c8a188bdc5ac2d5672ae1ed83950f94d8fcce3d8c3a4d701009bd4102b88bd4b715d WHIRLPOOL 57c14f390c6c26bdd14c4cf277b6d2f25cafa68607e96c0d72d56f7961eb67e4a0def891b1b059e155c09e335b0642552d7e9bff9210c05d40d737c630aee27f
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++/Manifest b/app-text/crf++/Manifest
new file mode 100644
index 000000000000..074d15979f47
--- /dev/null
+++ b/app-text/crf++/Manifest
@@ -0,0 +1,8 @@
+AUX crf++-0.54-gcc46.patch 297 SHA256 1725711e299ccf9531d97dd087af17477aa94009b5f36b7dd16372353a3e758b SHA512 3390be3aee788af08969a02ebcc4a645537d635e47091da528a6fa1a3d43a20e677287d47070bdc97b3b0c4f8aeabd5a5c107d598919a5e9882ef180f704c390 WHIRLPOOL da1a38907606e3886a2713091674aa7da7c51c1a5226fdbb611bed339bafabcceb934c0b8d0826ae778b3953b1e0bbb5bdb4a8a41871121745002d48830d5d07
+DIST CRF++-0.54.tar.gz 809008 SHA256 8dab6e9ab71212b3d223588f6855384f2b29dada0a30d450266f8990ced63354 SHA512 4198ad9423776a44d02db51a655a35f36db767ec623f55de426b3415179ac7187b91d23c6ef9a2cf3d1c38e14507fc7681006ff2ba50dcfc771a7d5e9d1c5760 WHIRLPOOL 6e09affc37cee8bda9df1b7a919f386e026f4218a5ccda7e677b7a172887aba7af85db2357ea1ec51c8122115bb558183e242315d2991b4745df6ce90835cda4
+DIST CRF++-0.58.tar.gz 790570 SHA256 9d1c0a994f25a5025cede5e1d3a687ec98cd4949bfb2aae13f2a873a13259cb2 SHA512 676b3e9ed89b5fb2f246175b58c384f10cab09fff8329c07311fed3832f55dbad26a25d2946c9efaa75cd8026517cb9e1742bb70ca26187367747852073e4eb9 WHIRLPOOL 87f642639c0d670a7926d99630f2230fffbbea1e02976fc8f47dc580dcbfffdca6e2e066445e7bd28fb517dd5f3798af9fda6549c54fd5278f3570befc155ee6
+EBUILD crf++-0.54.ebuild 1118 SHA256 c2d865746984cce9a8eb11fa4fc1e94e676c34ba449e9d6c83ded741a2f04723 SHA512 7ae040f57b491421e2c6689f0b54ba3d963aadd1e67721177ed44aeb6539e3d40f229f652a695fe863fe752634b8d3600f00e6e78e8ec4ae807fe36971c414e5 WHIRLPOOL 0b2bd1eca997186c775327153f6ded88a45a4c60dcd6098efcb349a07012c8a87162219dc97329bf1a41e7c55745c5e53aa6a1dd596288e4be046c0ff7bedee2
+EBUILD crf++-0.58.ebuild 1097 SHA256 2b12051525e7d8688eba855a18c80150314704f85adbad831f89284b12c4712b SHA512 2b452d9e7be197a3100061040d606fac3df07bc61deb3a3fad69ff65fde3ab7b5e3fdcb2a57b45b29f7a23f8459d987a00be51be6a02874d6b15a27415bde91c WHIRLPOOL 672c1e8a6dde344982da177d142da8fe7e49bb80915790618a654dd917573b9fd70416b8ee7037b9e94116012462680a3aa4760c2a55a43c69d2d4b738237b28
+MISC ChangeLog 3202 SHA256 8b52f0e0b0cc00c69b1b3f58fe84ef209c03a7e3a0e0f2a32d8fc609a9b50f77 SHA512 8d5f9df2023a6d964f66c4f3d9b948ae82bfea56231cb20102b42acfdd7474cfe4dc74ddf77965eee037e415b04b4eb24d81d2aff95048ec0b06c89006b68d75 WHIRLPOOL e13bd9800801457f8a29074e86d5b5e8532e70d47865d84c9a7e71c60126004504fba9fed644479729dd5fe63513a6ca6eca4626a19eea6f704d7f83520d0ad9
+MISC ChangeLog-2015 2656 SHA256 a3a25b18f58caa3b986c81a020ee228d07218f1f8a64c56b10cafee024981670 SHA512 f741e9f1cf52616dde578b37c0ae5fb23a44115279ca40e8203a265cc9ad89d307cac335da377baa6c24643e037c91cc24b9e60a07aad6daf2e9d8556ae33121 WHIRLPOOL a44f71be673be161cbb02bad47c51b112ea38e9aaf7f46364815da5b7faa2a3692f0e23d9ac2de0716b9d6eb52266af9ceca754b9709b9c1049d21a8abaf19b4
+MISC metadata.xml 666 SHA256 3cd0a5196043d626b8b66bb7bd5af8d3e44a8d9d2f36458cc71151159f2ce7c7 SHA512 922c14845da38ed461a50f654bd858f1d1de04642bdd40ba353f87000fb1d0150dfe9fa2e52ed5b4d8dd2e8f64b636c94577cf74a9c138f0aebd1a0d9da462d8 WHIRLPOOL 9599f6fbb773da64b0b8401e1019a65eabd6062db285073d155c6c041fa979b3e4effbe77b535f770a580c9079de4965ba7fae282d0a8197f78d90ab4ea004b9
diff --git a/app-text/crf++/crf++-0.54.ebuild b/app-text/crf++/crf++-0.54.ebuild
new file mode 100644
index 000000000000..204eda151148
--- /dev/null
+++ b/app-text/crf++/crf++-0.54.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="3"
+inherit autotools eutils
+
+MY_P="${P/crf/CRF}"
+DESCRIPTION="Yet Another CRF toolkit for segmenting/labelling sequential data"
+HOMEPAGE="http://crfpp.sourceforge.net/"
+SRC_URI="mirror://sourceforge/crfpp/${MY_P}.tar.gz"
+
+LICENSE="|| ( BSD LGPL-2.1 )"
+SLOT="0"
+KEYWORDS="amd64 x86 ~x86-fbsd"
+IUSE="examples static-libs"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	sed -i \
+		-e "/CFLAGS/s/-O3/${CFLAGS}/" \
+		-e "/CXXFLAGS/s/-O3/${CXXFLAGS}/" \
+		configure.in || die
+
+	# bug #365921
+	epatch "${FILESDIR}/${P}-gcc46.patch"
+
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable static-libs static) || die
+}
+
+src_test() {
+	for task in example/* ; do
+		(
+			cd "${task}"
+			./exec.sh || die "failed test in ${task}"
+		)
+	done
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+
+	if ! use static-libs ; then
+		find "${ED}" -name "*.la" -type f -delete || die
+	fi
+
+	dodoc AUTHORS README || die
+	dohtml -r doc/* || die
+
+	if use examples ; then
+		insinto /usr/share/doc/${PF}
+		doins -r example || die
+	fi
+}
diff --git a/app-text/crf++/crf++-0.58.ebuild b/app-text/crf++/crf++-0.58.ebuild
new file mode 100644
index 000000000000..7518e894e2e9
--- /dev/null
+++ b/app-text/crf++/crf++-0.58.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="3"
+inherit autotools eutils
+
+MY_P="${P/crf/CRF}"
+DESCRIPTION="Yet Another CRF toolkit for segmenting/labelling sequential data"
+HOMEPAGE="https://crfpp.googlecode.com/svn/trunk/doc/index.html"
+SRC_URI="https://crfpp.googlecode.com/files/${MY_P}.tar.gz"
+
+LICENSE="|| ( BSD LGPL-2.1 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+IUSE="examples static-libs"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	sed -i \
+		-e "/CFLAGS/s/-O3/${CFLAGS}/" \
+		-e "/CXXFLAGS/s/-O3/${CXXFLAGS}/" \
+		configure.in || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable static-libs static) || die
+}
+
+src_test() {
+	for task in example/* ; do
+		(
+			cd "${task}"
+			./exec.sh || die "failed test in ${task}"
+		)
+	done
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+
+	if ! use static-libs ; then
+		find "${ED}" -name "*.la" -type f -delete || die
+	fi
+
+	dodoc AUTHORS README || die
+	dohtml -r doc/* || die
+
+	if use examples ; then
+		insinto /usr/share/doc/${PF}
+		doins -r example || die
+	fi
+}
diff --git a/app-text/crf++/files/crf++-0.54-gcc46.patch b/app-text/crf++/files/crf++-0.54-gcc46.patch
new file mode 100644
index 000000000000..93cb54020cfc
--- /dev/null
+++ b/app-text/crf++/files/crf++-0.54-gcc46.patch
@@ -0,0 +1,11 @@
+diff -Naur CRF++-0.54.orig/path.h CRF++-0.54/path.h
+--- CRF++-0.54.orig/path.h	2009-04-05 20:42:35.000000000 +0900
++++ CRF++-0.54/path.h	2011-05-31 01:31:43.845198215 +0900
+@@ -8,6 +8,7 @@
+ #ifndef CRFPP_PATH_H_
+ #define CRFPP_PATH_H_
+ 
++#include <cstddef>
+ #include <vector>
+ #include "node.h"
+ 
diff --git a/app-text/crf++/metadata.xml b/app-text/crf++/metadata.xml
new file mode 100644
index 000000000000..4fea4cf917d6
--- /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="sourceforge">crfpp</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/crm114/Manifest b/app-text/crm114/Manifest
new file mode 100644
index 000000000000..47459e0fda70
--- /dev/null
+++ b/app-text/crm114/Manifest
@@ -0,0 +1,6 @@
+AUX crm114-20100106-fix-makefile.patch 1796 SHA256 aa1be34f4065dc6261101a4fec987138b40c344f347714132ca9da0914ad2d2e SHA512 3011a85116510fce131bd3c13b5ec1e4faeefdb1eebf114782d417fb9ce8050ce15cae05f8b651728335233641be1e870fe48702fa620b542a8f1c963853b81c WHIRLPOOL 59ee1eb13502093a6b7b9fdcf2d8f9d90e258b70e37d2fd4b564e5789715d2785f5cdb7667047dbb5ae2f710184c8582d868ca2f4dcd2d955f8b1fdb80e39f2a
+DIST crm114-20100106-BlameMichelson.src.tar.gz 724672 SHA256 fb626472eca43ac2bc03526d49151c5f76b46b92327ab9ee9c9455210b938c2b SHA512 bb95fa50d6feef1a127e39e4005c4964b0096c3c7059f63bbf2293042351cf5ceeb7590fd1bedc64291ba556dfba96856dba8554f2f52a6cbaa3ad65012809c6 WHIRLPOOL 8ae6f01d5b7a3d8419662ea9a34a32d25c39f7aea7e35118eb20439f82cbad4d288478ebd87fb521c2871b654a137d4c432a7f7064f918e047b65a69e6be0518
+EBUILD crm114-20100106-r1.ebuild 1962 SHA256 e2273a0cc091961aab448fd986d94963adfa46a977d9fe159b1deffea027d489 SHA512 29a09f44a2f9ca1011e15d36060a57603e1fffe9c22fc7a61bf82f3b77ff4e747a96133724f5f8168bfb341626a1d7f5556ac562e94666f8e544c09cfc9a535c WHIRLPOOL 6fcfcfb3bfe7e13b91811837e969463206f5c43f0527e79e374e6d4c98d65e78648ae2e865a1fa1629a5797cf51c62280b6dc657d7f77b37e30fa0d1145bec22
+MISC ChangeLog 3303 SHA256 191b84cc6900ff5db94492696defde77b802a7b47c350a7cfae1679b83ee8523 SHA512 d60b37549776b5dce08e74b29c2aa80ad1d5f29462e48bf32edb605eae4368519cfaad12e12b5877612909638610d3d4fdd475fa294573a0200caeb29efe8ace WHIRLPOOL 5737d7cd81bff06bf6295d7b501a7bba7b111fb1686d05bdf1ea773f8d8c6a111cfd6074665e46deb65dd0d7dd2f96fecfc9caff4336283b1fb282a725448e36
+MISC ChangeLog-2015 8960 SHA256 07eeb1eda817953ccb15126b6e0c9a7656ba564fd1bdb04519a1d8a9e39e29d7 SHA512 451268ad41aa5ca985f511e2eb58fb05011e0aa4b4e6fcf93454ac71fe37d9cd6551bd2aed0514ba3531e33b516fd6d9ab6ddf54ea8d957f342554823c7756b8 WHIRLPOOL 48eeaa8ae3ddeee2e4167d4ad45ae5ad4081ea75d6ca8d463108c8a42381492145238600178b60928502c3a4987dc06c667772b25ebc09ca8e8b733e64e50727
+MISC metadata.xml 866 SHA256 57a97097ba306a960f2d87fdce08fff8a8943aae4fa32d016d60b33c92fa15c6 SHA512 0d0b0809d30b60378d19c5433eb536a12886f7d2fa982c80e2d317a33e04b365050dc4d372f79cd8a0c948bc283417507c24fb0e99693072ad95562d0b9264a6 WHIRLPOOL 6be3ae590b28bbc3bfde3e52770150dc1ebdbf8e55ee484b6e872aba58be9135f6be27371ee626a5e1b175f53478f4cc4a61032060f5b4c3ad8c3b0aab7c4698
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..497faa0ea1bd
--- /dev/null
+++ b/app-text/crm114/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>steev@gentoo.org</email>
+    <name>Steev Klimaszewski</name>
+    <description>Maintainer</description>
+  </maintainer>
+  <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/Manifest b/app-text/csvfix/Manifest
new file mode 100644
index 000000000000..a248dfb9c37a
--- /dev/null
+++ b/app-text/csvfix/Manifest
@@ -0,0 +1,8 @@
+AUX csvfix-1.10a-tests.patch 1004 SHA256 1cd14d0b00845b739e2ed79a4efd76ba62976eb448786e9704e645a559914e85 SHA512 3f2330d44872cb022f9f0d9ef9f3bf43d27da94d53ec306d84d56c6d5cf6bbd2afbfa710872cb7a144caeefcf90ce7837422fc421bee30a0af78bdef7d991383 WHIRLPOOL afa2e0353278b24a84b1bb39234b11c47e4f5f0d1b63ce4e2ec8798fd5174b9d8b883dc042bc0a0caedc67cae4825f51c5f47c6963252087c9cb5802d7dae199
+AUX csvfix-1.6-makefile.patch 1604 SHA256 63b46d45ff200537bf0553958d5f702b8d6cb166f2a8227b21cbe34949593f17 SHA512 f1f5cf1e2d1b7d5d3031ff27fa570ec501af38e9340e8d00be62bee1a46afb9e2941de6d40644d7f5d1326abd8d94036bfc5b04d4fad0e5dba15faaaa22b66dc WHIRLPOOL 49111164fa49c3825b5e2654895ce546493e75a3b458fe1b997ce619e26469b7735338cd0144365860df93abc27d2aff8a82f88a990ed2a132b94f3ce781ab34
+DIST csvfix-1.6.tar.bz2 322530 SHA256 d899796e0e6ff5ff6ed6ffd106bec4a66f681eea9ed1068834d35939948028a1 SHA512 abd525cff11e6dc4e59f5b26d57b2327564327e27009bbf777a6d83a6f8e474415b4448408aa162c6fb20b9a5bbaf970bdca23d8a9d7e31c3b8aaa19cd878035 WHIRLPOOL 8a40e334ad281585bd88e83ffc3435e0bfc8851f5b7cb924f5ada4a84757fa172ce0061fe1af906e67eca0cd61b11ef0f75813af3935544804e896dafe57deb9
+DIST csvfix_man_html_160.zip 403468 SHA256 56e770ed6a5f8526b560157fa134d5b6c1e0bf21103a8dca5964cd7d476d96da SHA512 868047ca4eef7bbbf3735f25489c72820465c414af2ffa11fd3e61fd45ca80661d73082a90b94c4503876bb2355a6b3751f8ede862744f0d7223e77ae770ccd5 WHIRLPOOL 2a5490432f6b88ded5bb25b7bfb664f85dd4eb6dfc292b84fda9ffb427601e089d32f1815f415d75e924652a667f9459509df3d20f635a99d0b398da6897ec8b
+EBUILD csvfix-1.6.ebuild 1079 SHA256 820777a260968081626c2891498494a6fb4a083ace5a893486117c90e9cd0afb SHA512 c311b14e8465c49c44c58a8017107b05c76edc9b66a9519a50889041812c2d215d4b9c3b0c3f44bbe08126bd612a7bf90b4c09b2641eab2cb225f5ae653798b0 WHIRLPOOL baa1ffe70ee85ae9ba8373d99517f30bdaa097848e3c5b79a2d327d533753b80ca60b6c349501f59c729d2a31da5f6f798fb944c234a55392d6022ffc0564678
+MISC ChangeLog 2873 SHA256 54a1e1180fbe1f599f91a9a3532e2046e7ef60141741180cae0aeafe90cddec4 SHA512 c9a1cffc8f9ac34c1b696dbe2b4dcd09d636ee0353998848ea9af5f0e5af432c50ca3e69d443dab33b660c94ab5fc92796a74a5d916673d591502b21a51394a0 WHIRLPOOL 03a0778c60fb2f8b6c090166351577ab7f2b5ff209565c479f388838b0ddb2960dde781af7d560bd40bae930b1dd206c9c15606893eb50ecbb17be6914ea643c
+MISC ChangeLog-2015 1695 SHA256 91daca286e7b8a378d88efb186f6feade8a3ce54025367569b8af657a50c7193 SHA512 0ccf94b1dd1506a8481a2250021bb209ad5e0b3af2ffb1eb8d967c69a4e64d0059fe2163ecf2c7b0ed6bd9d6ed330be2e7f6629c61a9bc44facdd965a7fb6c7e WHIRLPOOL 4b58587ae232a6430786659a5e40d6b45e8c4d8f775f94cf478691c507ecefa4df458fccc04014dff27997d12f3e9c1e4d0f7acd541c8a8f60346f402b82fbc1
+MISC metadata.xml 336 SHA256 cd5395048ac16a7f1468c4e58039d89aeff1ea45aef2b54ed71bdec62eb34620 SHA512 e2d5e85fd1ecca319a7fe32f7fcd1f897cc3ba4c5fb4200ca9be1a4ebbc1e26c7200fbdf8cf5df9850bc57b62c9ef227cb907c611d43c2e5f04de3639811caa1 WHIRLPOOL 09e16f11226b81aeabaa844ffa7667a68c8d8391fb12f66c6e77e003467100efbadb6f49a67fe8c4d3e83059b578f1b99f6a9651bdaf538d970584245792dc9b
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/Manifest b/app-text/cuneiform/Manifest
new file mode 100644
index 000000000000..63f942e38f8a
--- /dev/null
+++ b/app-text/cuneiform/Manifest
@@ -0,0 +1,9 @@
+AUX c-assert.diff 2053 SHA256 0a545dc5bd305185181c5484f0521ae19a697b1f9772117107c906dd81f54839 SHA512 f330005441e0b9abefa97f0dfe46dcbf1c4471185417408e81b87c5b5332db49355fbeb2e5bb4d75f4f0ff79a0e8c60228de12776187c0fdb3bcc67370ec040f WHIRLPOOL 9518f048c38184efc20ae9f725cda6b2e1c01ac61d640bdc03323e876b0afedfcb11dae8c871d2b268aab06859e76552d0fd37d1859a21ea89c19be7b196f855
+AUX cuneiform.1 2844 SHA256 4671a067dc2d999a18c4521639aff5f565d043d6200ea195ebcb3551db31b291 SHA512 55dfaa6fd759a24c1a49ed1455a6f04e63c40f048872bc8309b770942747006bb5ed4704171a53490552c4170471934dcaeeb692921ebbc020f012f84afc6d77 WHIRLPOOL 853cd8e2806ca3b9fbebe642de8b46b63b1e1faf5884c84eabda63e4c005b18a66d97fdc19f1e832eb1f83b08dbeba935d2a34ccae5c3d1e9a473b4b27588392
+AUX graphicsmagick.diff 1547 SHA256 41a0eae334afcc76aebf3a31ca0da7660338ebb3cb552e599558e450fbb1292f SHA512 1aec9b28b1fdde076a4eb3b9d03c448ed28dfdfe102d0fcb7dd9c75c3dd735854ca69d0334c0b1067fa897cfd96044cc49cdf7c8b90e464fa653b702a946fad6 WHIRLPOOL 766591aa762dbe3dab06e424493bc96294b9be0b00d99b15852ef47acd4d385d8a7202242a29307967aa0e62a3214e675c4964d6911ea5d1f6148fbdc7e89534
+AUX libm.diff 634 SHA256 881e0414035dcb3899137612c7171776ca72da9de0074c5a66f22a68b07be494 SHA512 7b1f00e9644ef0762adb10d64835bd9f2e5b2d64729a75cd1afde62f6560afe4fb632e666a4f971686aabbc8a6d5d6364ab641787a01152667e25904fedfff62 WHIRLPOOL e5f4341c40eb92f8ce0eb81ee6148d2b245ab308a840c5decc8ccae06556813e138191f61d2ffca34d33d17057caecf9818fc28de9bb29e640a646204668e757
+DIST cuneiform-linux-1.1.0.tar.bz2 26388511 SHA256 577e0d054de72086c33b4e8ae15033657776509b9a7af6eb272888eefcbdbbad SHA512 82395f43aae9f4b1301fb47b8d46613affb0ccb09c92d64ac3d77a593618cd56824225b0306176e4d8b90eb468abf6b9f534e97f28dabd4bba81cb7977b79b56 WHIRLPOOL 90823a056dbf61738fbd8cd7cdd739e32bd571f39bab3ff8e8548cf6359c683a1f0f481cf416292504ee4bb277ed7d5b1edb98f5741a6cf97877cacc2646a70f
+EBUILD cuneiform-1.1.0-r2.ebuild 1327 SHA256 e3a4e80ed7f776a5abcde0835efa1f6a7fdf0b6aca857028067cfd29b2f3d59f SHA512 083eb8b48d059513e696de7c8eb340526817d577f1b51ee34833101d86583131f9d563e01222c7256bcf201edf1a6a3d0ef03f027b5d524f8a1087d9be6c706e WHIRLPOOL be75c3bd0b7e8be510e52927ebca75985953f56741a2a5e70536856c56bf4e90927d077b2a48fa14279e1aace32b84bb8347b3f777274bed31493f6ba9ee1d17
+MISC ChangeLog 2858 SHA256 b3ddd57103311018d17d02fe472dfd1406b2add6fa9b95b1350002ec9b94bcc5 SHA512 088f50f1987e156f22d90eb65bc9ba398c4e59554565f4f54a1626e19faf629fec1c6cb0fcf9aa61d4d3047e4d01354d062a4d55381c146e1b7162aedcf90d80 WHIRLPOOL 295909723185d186e508b4a38022030e0d164dae57033fa3f2c9918d87d7defe60de69e02cc0f8036486382987e533867b7442abbfaaea6bdbaca519d682551e
+MISC ChangeLog-2015 3627 SHA256 71da389c691e88c3c777b39bad0f091e5da038ab20f652b230f5d8efd78c6e16 SHA512 86849a53328eb31ee9276a3ff9555ac7181282d024dbd5dcc1a88bc3efcb5d982819ef854198bb04ec7ae39f76f2f00f1d7caf4f6f109c0e8a5088e1306dbfbd WHIRLPOOL a61f1a75604b936618f518e9c90f892173eac9943a17e7446078605c4118fd61cd9447b55705fd14f9533ee05a3a88de0b473def6ed2b9464fec912cf1ada77c
+MISC metadata.xml 344 SHA256 c2df145fd1b3f238e15f5971b92b9bdce816afa8f4a934def2474f4e74170a2d SHA512 7c8e545246470ac8e3928f698434403dfd4ccfacce041d623a1fbfdc26bf2a032b4df5604425292d5fc63570237c576630d61884f1ab03e7d2052b9d167a385e WHIRLPOOL 4920a5ff540d71d045f2a0cbeaf61c29af3ffaf9e0c61674da4b8a8fe248141a5e4f1cf820ddbc4bcf477048d6cf9f090e05b961e4c55b365d00382efe59bf1c
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/Manifest b/app-text/cutemarked/Manifest
new file mode 100644
index 000000000000..736f404de8fb
--- /dev/null
+++ b/app-text/cutemarked/Manifest
@@ -0,0 +1,6 @@
+AUX cutemarked-0.11.1-respect-destdir.patch 992 SHA256 a477d1d580b89d140395a2d4359e155597912f0befcf06693439693abceda61d SHA512 dc6c48c7c0b9b4684b333d1f1aa000d95422b1cac4e71f16cb84eb8bcede63fcc653528005af17fb6757475c9c05c50bffe859d64d5c568e831de7e7769fc92d WHIRLPOOL e69817ed88c0c878f6be2e25ccebd53a722da26137a648ef1897d3388c5b8bad7295e5bd6c453d6a1ecfdc780f0284a74979e8899f7ce4cbf3b1e1e6ab0fa567
+DIST cutemarked-0.11.3.tar.gz 772238 SHA256 78a41808c2f0452375810abdff76eeaaee012f8d1368a2b8772ec6b4d2ceeec8 SHA512 3b776f6453812ce4afa37532bf03adce01ad3ec2fb0d848e3a0e5f18ca30be6f1e9f6b3c815917a96c9637c722d53a5bc249d5f58b209000d7d794239626ca30 WHIRLPOOL 655d319e0781849ff33e7fe4e0e7c8733b9b6b80c55e0c09ddee1c94e6b3880e6de773cdd66a6b48ef0aa58a7723c64092e3bc108f2f1bac3818953f27623e59
+EBUILD cutemarked-0.11.3.ebuild 730 SHA256 3dd110e976ae652db4c393018316218182972132e8ecc86c178ede17026bbe30 SHA512 b19d529d6b924a038375c8a4dc9a881fc865fd85b33cbf64b0035fe729d48b68a01e01c1738251b2fe6a1a2d903b71e1af0c161d144557c0c080f6224b517e7d WHIRLPOOL 105efcb372f055286f80e9ecbe648a3c9b0b47fded2011ab8598dd92aa03641247b64f683ac5b9a217a6c63116098c1158589d8f6288850158ca15a939b667b8
+MISC ChangeLog 2548 SHA256 6477d71c4becb8954701fa1d4555776d9ece3bcd5bf6049a517ccd0a203512a7 SHA512 6cbb359401c261e8d5a7551f316443a4b6a842dbed3520c735a6b8eb655ba3c9053cce82866619d35d04d1d4de0e490df676381c9703a75d27de2baf3ca44e8f WHIRLPOOL dca1f25ffe16458805d61dcf95914b0dcc2c39cefffa87c6221fd7a10de0f939a63f91e5ae8dfc3a7d43f5e30a7ec48f193b1e4b2c746642ad8dbc7bb2c8cfae
+MISC ChangeLog-2015 406 SHA256 7b1e4b652381f40c756e268f1a3b20d19704fcdab3731637c46070efc2694577 SHA512 98ab9cb4e07f7849e71abe91163b81d9a6c2a1b2b212759639fa3d0076680d600e33622b9e5d3cd67169f5dd68c8375d909285743fac3ebe00a46d660cad8436 WHIRLPOOL c955a7d8f4009418cda964a6e7004058472df05d710701d8bd7a7e67d114bc91ac6725cd463391271137fdc07509da9eebf66409b4a88933be96ac50891f5742
+MISC metadata.xml 342 SHA256 53db776c6249ce19b7cb4d3aa77a0dfa83123688d5559b3ccfe8dac0a0b0175c SHA512 4568bb1fe2212d4dcde357798fb5e0c3ab4155e5ff388e6fd545a8a2c2ffad023eefc2e874bebd7005cee77266ee034f11dddf8f260cab0be396094db9e2f39a WHIRLPOOL 3984a6c448a20741f9d1cb19a16bd20044ff8750f23a5cd638bf337c8c947806f35bf0595ab6ff3e87204ed2495f4e2c21c0578c8a4dd03bc0d23b2cd8153b4c
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/Manifest b/app-text/cwtext/Manifest
new file mode 100644
index 000000000000..5685a7eeb1a0
--- /dev/null
+++ b/app-text/cwtext/Manifest
@@ -0,0 +1,6 @@
+AUX cwtext-0.94-asneeded.patch 525 SHA256 866c36048048815c99c7b6ece57245a6369f8cc01d9d5c4bb5e8e85e2e5dc493 SHA512 e80d4705d71badb3a0c75a21b99cb2b8033272c609a9cfea769ec48825544f3972cdc505ad32842c34da4918e7dcfcff07900f3611a5a1ca0fdd4c48784d7067 WHIRLPOOL 8c05ff1e59663dc0dad6a5c6d9863087cdcbb13275074e2ce2b6e90a098cf8c40b14c6bfd2aeb9b3479a0b2904d59f5ea11de0cdcfa3a3d10d083eabe91892d5
+DIST cwtext-0.96.tar.gz 16596 SHA256 db108e6f510583edf4a285c6d6ab9ab9fdffa3bc5682903b316fd10e1e12393e SHA512 6765c79b6feea2947974bf4654ed1edc83f6c9ddaae1bf37d5ed95dedc4ce9b45d5e41dff7ec50d6586f34901d8f93a3230f1a7e1cf4d52b8a84c851cfbdbd33 WHIRLPOOL eb06efa8c9eb1817431826a5454d417c9440da7e7a8f5ce7a3fd34466d64a2e097140973e31237657b2c88d7b95044e51c9d00568f5217610e5b997f8c6e0a80
+EBUILD cwtext-0.96.ebuild 697 SHA256 5b54c752075847f66cd41aa1fdc879760767f349633ee98e6ea865c73c7e61d8 SHA512 ff402483b0ddd83610e6cc9a3ffd22d930d7e8dfaa59c7aab85af843e4d9cf96463d3ca4beea9787d59eff9b0eac3fc37139921602e553bff25924ebf2acc0c4 WHIRLPOOL 6a668d5f65e2f6ec5cc828ff5160c72aa882ef3c513ece74abc7af5934d1022a0d391f627c553cc3557e9e7e93e0374538d9b2a825969945272b2f5004babeb8
+MISC ChangeLog 2206 SHA256 b039fa93e193d447a51f399519de3aa77c3596eb0daf6a5fe281705babccf474 SHA512 3b61ce73efa31b99b31335c4feaa41723a7edda8a25a70dec1ec8333b014477c985607d27ef6ad46db295f945d66e5f8500013822bb1f5dd2b52a04444926399 WHIRLPOOL 578d2ca54388e2c149ca02d9490acbba8d3dae087053c6a0082c557e7bea0c0737bf93dbeb8ca54e1f448bb956b7232e9f07ba3ac0d89ec51a559962aec4e8f7
+MISC ChangeLog-2015 3214 SHA256 c159c3d605f4b71fa9d95b98fe6db3be8afa4837f694848c092e78b688e0eb12 SHA512 d649701f28302870061b3d2c261e24c1522d2d59bd4a7a3dc230f038ac9abf4c296e2a8d35c1db457f98a98b5a3f3727ce1b7a74f8f4600c6ea28b4a5bb2029f WHIRLPOOL 3352c87954c94b883736ef8a5545096b64c9e03d6c591e258f839da4ca8b5a75e7773d9e06b7ad67403cd9cac9d77bdd84fd7fbcc9b074b00941e7d0b92ee182
+MISC metadata.xml 325 SHA256 6ab9b588522fb7302f3b62f6363075b07d64166692ac4cad10900bdba8836abe SHA512 e61b6497de3ea7dfbc4244c904bd2e3966bdfc3fb228836ffd21e7955da87da325af62b0f8cde180b75d0632dcacf77b46e2b56249b14b2dfa827cc082bd217f WHIRLPOOL 9ef033c328ef801e03c16d26a71c40bc8ad9422af9b7705d78162f1c8056c9b65de9c47e1b0ee285de1a7c5e06bf9bee9dffcbaeaea0e7d0e7a9c108519cc7bc
diff --git a/app-text/cwtext/cwtext-0.96.ebuild b/app-text/cwtext/cwtext-0.96.ebuild
new file mode 100644
index 000000000000..7fd1242e9b98
--- /dev/null
+++ b/app-text/cwtext/cwtext-0.96.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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/Manifest b/app-text/dbacl/Manifest
new file mode 100644
index 000000000000..4f9764f07087
--- /dev/null
+++ b/app-text/dbacl/Manifest
@@ -0,0 +1,5 @@
+DIST dbacl-1.14.tar.gz 922969 SHA256 07e795ab4d8ba530d466667409e6a62507ce397bb5bb19e5f1dbc370ba794408 SHA512 1cf0877c8bea9c47e055f9291efbb934b65cfd7d26d4ef375ee9fb154b557c691e760543254c5128eb1a04b0724462078f47477a91c4e396e7096ef88d2d77c9 WHIRLPOOL 1490a4100d79beeb9236093dd93a6236722adf69ccd68c408a41ea5a1e9b6068048038b407b36353c258a6b13298ea141d24dabd36dcc49f7380b8f5d5b58c71
+EBUILD dbacl-1.14.ebuild 704 SHA256 ea3d25ca753822bc6f761c9b0a34d33fc8b04ad56991617a584e21057970cead SHA512 6c1e721db59b9f330ea0fab1491f0ab39cf801c628525b963a616da664c84175fe71633f492cf0e1650d37d955fac41695cc50970b9a6fe7ad5968538cc8727a WHIRLPOOL 391bb17fbd07b0a64e0b6bcb1726f8ab5fcaafa025ef066a039abc1d53c6402926e7c68c7b2afca3faaf2670f23766d408f030b3c3b2e201be6eea4e3a5cb21a
+MISC ChangeLog 2168 SHA256 e51263848f3f31b620b4350ecdfdf5423822f3eb1b72df64a81514cf7f22b2ed SHA512 c204dc8eced24947c251307425fc53a5082892d3e79ef6606b55c517a8dd1ce96f75ad5db54cb647c27177aabe4b16d73a9707b21c406bbaf5a6f0f9eac6a09a WHIRLPOOL 959ed869b55db35d2340dbcd8548a4ec15fdf962541c523196ed80876ae3f0539ee8953eeefdd1bd4084bfdaeb7b5aad2fd6c4303bbb9e85789afcc1807bf1df
+MISC ChangeLog-2015 3509 SHA256 fcae8037ffb6d159bb6ce6b54e3aa940b5f0cc09a8a2b402b03202fd4e474bd7 SHA512 de5992f490493ffb26f67d3954846b3a0e86b271bf043bb2fe3415fe4094887fc85ec80f535f6cae6e98eb826b1a42858e18553bc0e758f3db6cdff9f75a63c5 WHIRLPOOL d21733cf574eb947ba838b135b82a7fb7384f08197d71ae65c41529038d42c2030e1fe916c807b10b7be1fcc5e4c9f5126f1ac2d03b751b94ce6caba119d5d0f
+MISC metadata.xml 610 SHA256 10452954ae1cb4c011d59d956507d39fbeb906262047e895cc4b750ae2f4296b SHA512 3151e9a89b575615aa7bc26fae4edbf84a53a24893c1c07f6d8f46fd1058f2270bf7a30697217e1326b733204ee38edd56a7ab8f9949ae2a5450b87828ae290b WHIRLPOOL bfe701bcbd74d65f9f4ba9c2159e392ea7926079363c82fb08c40ae93f42f0d7021c9330859f9b45c3c18b7ebac97b43bb93e90a7e60593e0c7481780150034d
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/Manifest b/app-text/dblatex/Manifest
new file mode 100644
index 000000000000..8234e78b45a9
--- /dev/null
+++ b/app-text/dblatex/Manifest
@@ -0,0 +1,7 @@
+AUX dblatex-no-inkscape-dependency.patch 595 SHA256 0cd23f2c9b5af88b4ec29d32d43d3b8c2dafce902a00873c5780a021b8b2094b SHA512 69cb27f3548a55ae2d34e1b9c05f963a05e5b810e5338e7adb5f4739c03f3bd6bb650e9a6a63edfc75554b45a835c1cb596681dd3e440ea1acb0d2b661d25c6c WHIRLPOOL c89ba1927f6f47b27a787bdb3e201c30567cc446abf59fcc6a594df442c15587e5a022dd200e99db8ffed760ce3e43474d31d07b6e6bd392d1f46aea72d408a4
+AUX dblatex-path-logging.patch 537 SHA256 04ec91eb38cb970d85b7299f41335cb833de82aed6b68dd28defaa20ed7114ad SHA512 04a1f26e59a7c45eed758f8e8fa1f5e1469e3ea71fa65c836d038397c0d8bbc0ca658c05697dcb32371dde33cf3d20be3f987d7b68f194f2d254071cf2836213 WHIRLPOOL ba95dcb5d78546d6ff200c7e038cb6ca6f1db1cb9a64ac48573ea5904915520330abf8dd7ddaef8a903a98bb2d024764467505c75b13f9a2041be97e371dbadd
+AUX dblatex-setup.patch 773 SHA256 94b4b1d27c18458c9b2cc2ef412cddfb7fbec4a02bf1a5fc6736016c8df90bb3 SHA512 c9ca96db18f81ffd999d3b2fd274d2fbf29f869d199d954fac562938a8475510278f0d3bb7cb948414f13c84c6f94dbec196c7bd04f3abe3400c3fdfe36941fb WHIRLPOOL 92598c59d2be617cc042d32b016b558a5f391a3102efcde9b6576264d5323080d374abce8bb47d096f9709b67690489d61692f17e9ee3a3a76fe36a63c6a1f30
+DIST dblatex-0.3.7.tar.bz2 1513975 SHA256 59ce3fdfd4d6cf44beb8705d9267b7be7cb32d4f826834c861c5b7016c7e722e SHA512 7f7111dfe7d880a93679422a43700787755ebee7f17483b4bc5a8ce55c521d7fe0baeb4890a910b9007141d63a3e3b8f50347e68001ad7c1a14916920e11a40c WHIRLPOOL df27896ecf5f2f194fb51f9e6a566c324495c9fb9c1217514af97b5c30fc2dc0dd5a7aa9bb71daf36a4329101a90f7743d9c5962b8a2fbe994773320d3cf937e
+EBUILD dblatex-0.3.7.ebuild 1087 SHA256 8fdd0a33325ad8fd114a4eeee95af0a950308efe51901dd1d362378573c5aada SHA512 a30bc61ff7495b9743d0bd9c99b98b56eefa75bf9aefe3f1b3d3d9bfb5b4df2d6919fa156d8d7a512d14b9fb0c556c1083533f4e36968fc0153f55e92d03d310 WHIRLPOOL 6c1f43864aeec5a692fc048c540643e1ad537846076423f3ccb9f1a4d532f9065c4389e85b1e97b24437a2bee9b82515b2e53ac902bed09b7da6b2ef791d02ac
+MISC ChangeLog 1969 SHA256 aa31d133752837b6369bb653520308bc67ec42237ff4478725730aa3a9e11e3f SHA512 2239152919b14534467dbda01f4d6e4de4f64b3182540ee73a66f9217c80440eaad75e3b7405b21ab714417e2fbee8d35fd222be4d184f911b61b83dea97c553 WHIRLPOOL e8ebeb4a8918807c006c7ab636c6872758cd6b26ab5dc9a795ec86e22ef5a137315acd48b624ed92f9b986dc7d0c261bd8ec7712028de14b6e03d03f64b02520
+MISC metadata.xml 811 SHA256 a430d1c453b9d1106daa54519cc6fb0f761a3e5925e14bf2523117402b198fd4 SHA512 58d4f7ca0dcac11f6d2d4a303f67ad41dd8f475f03016b3088c377366a5c7beb3622f5157359ef30612f73a3fb3072d4bc9fe495dd8739bec5fc062a62d39f81 WHIRLPOOL 11fe86eb9226f547fe839b960502f6c4debee649bac9f129a7091e70e278d5d51effb56a0cdffb65c2505c0848aa93386e4ab8a81518410cb5667bad0d2c7a2a
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..4f45d485f7eb
--- /dev/null
+++ b/app-text/dblatex/dblatex-0.3.7.ebuild
@@ -0,0 +1,42 @@
+# 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
+
+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 x86"
+IUSE=""
+
+RDEPEND="
+	app-text/texlive
+	dev-texlive/texlive-latexextra
+	dev-texlive/texlive-latexrecommended
+	|| ( dev-texlive/texlive-mathscience dev-texlive/texlive-mathextra )
+	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_SOURCE="${FILESDIR}" EPATCH_SUFFIX="patch" EPATCH_FORCE="yes" epatch
+}
+
+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-no-inkscape-dependency.patch b/app-text/dblatex/files/dblatex-no-inkscape-dependency.patch
new file mode 100644
index 000000000000..1d032f4ac26c
--- /dev/null
+++ b/app-text/dblatex/files/dblatex-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..943df18371e8
--- /dev/null
+++ b/app-text/dblatex/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>zoltan@sinustrom.info</email>
+        <name>Zoltan Puskas</name>
+        <description>Proxied maintainer. Assign bugs to him.</description>
+    </maintainer>
+    <maintainer type="project">
+        <email>proxy-maint@gentoo.org</email>
+        <name>Proxy Maintainers</name>
+    </maintainer>
+    <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/Manifest b/app-text/ddir/Manifest
new file mode 100644
index 000000000000..efaac92293cb
--- /dev/null
+++ b/app-text/ddir/Manifest
@@ -0,0 +1,5 @@
+DIST ddir-0_p20100323.tar.bz2 15875 SHA256 fb90025d4e5b370a0c0e9564c2655cfa635639b180e6ef91b237bf67d652c566 SHA512 e2f367eef02c14a1d937db71fcd798990975581f6352ffad01894b40aea218f48a22d2aa96660cb1f8876b0720a8e76eacf9a5c87f0ecd2f58cafd5434acccad WHIRLPOOL 19bb6378bb50e8ef233d8f8f34e43b797ce630a8c558284c50ef461d4ad8ad66f2b2089fd5a9c8a11cd97b10e18f97dfed397b83f98162d17bb1bc6b31b52a3e
+EBUILD ddir-0_p20100323.ebuild 492 SHA256 1f93af7950e8760d3a2a7694663d9c4e9de326aa22e77d5dcd0bcc3c7585e263 SHA512 1548ed16f6522be6f9c65b207e373c8d19331eb657aef0673ddeb696175eef3fd705d820deeaf8e251acc8f351b55afafb7caa345db0fa603a3b631508ddf334 WHIRLPOOL a58d68f09528d1add9ca6482de67a3bf47a0ded4a9772efdb9e43a4890fe5847f856513a6d4284be5201593fe8a48825f1191b4dc7f6d2142474f499f9824348
+MISC ChangeLog 2525 SHA256 509313238ead22684b2c38b4e88e3d9ba3bfa704f4445246845d7a863878e853 SHA512 fd90fa2e43a4f2020b3946786d5e37f43797395110fd0a4568a6bb088674531c7a0ebec1666068cdf61e48aaacaadc2a59f9f9ccd9ccb6c76cd7b75d269f40e6 WHIRLPOOL 71ef2fa1621173d40559228252e60b35662efd4b34fd74a9773c5850e622d6a0f41de6029143041fcc274ab3fe110db1a16f2464dca133eeb8b6d2ff99b41979
+MISC ChangeLog-2015 429 SHA256 fbdc84dd7e01c065b896c574bf06d4d560e3657f466df598d6c9affc6ff6f995 SHA512 01f1cff63ce8a264574a15eb7e3c99eae687d6a102da2a8925205f68e724d4e1cf84aa78ab6ce9de9325be510ecf2405d1796f9d90a5bcca31c8b5019daf0332 WHIRLPOOL 1c20f762c9c7dd8159dae2aa1909fedc82308b533e2cfe4cb9317891442c1f705cc3b2aaf6a8cc96123063e2e7876b1ce0eff813e277e543ca120e51e0ae81a5
+MISC metadata.xml 239 SHA256 ae5a306d206bd091a53e47197f7b764e722f29ce26336a3924fc305cf47cda68 SHA512 146e1784395f9829562092d49772899fd84d99fa48d2f52c2f9359a8443973a4284d798d54453041fae44f64df806830d31a94f5b883c35579d5f574f7a8e798 WHIRLPOOL 4a70a879a4262c226a43386f1569344c4fa75b950a11d8bf812d1cd2e85fea4f6834c6570d834c7200608bed2d5bfd738b330f40470f5a96d62f1a4f0e43788b
diff --git a/app-text/ddir/ddir-0_p20100323.ebuild b/app-text/ddir/ddir-0_p20100323.ebuild
new file mode 100644
index 000000000000..27cef2e3fae3
--- /dev/null
+++ b/app-text/ddir/ddir-0_p20100323.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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/Manifest b/app-text/delta/Manifest
new file mode 100644
index 000000000000..6ee9fb984cb2
--- /dev/null
+++ b/app-text/delta/Manifest
@@ -0,0 +1,5 @@
+DIST delta-2006.08.03.tar.gz 32804 SHA256 38184847a92b01b099bf927dbe66ef88fcfbe7d346a7304eeaad0977cb809ca0 SHA512 3720f164f3721ad06bf5a73e654c70a67d6e7a56d0ce574fb0e8571b33269e56611a909f915bd0ea46434d94206a9548fd99fdef98181efe41e7fb03de75c585 WHIRLPOOL c6b72773d137c824896a54b6994c1b84a562a82e8012fc52dbae08b9e132cdc5737f1fb1ea91631cbaaa700ce37d53c20de78d6e95139bcaa73384064bc58d37
+EBUILD delta-20060803.ebuild 733 SHA256 b7a1053917fb230ce8f64b4f0748b504d12ac967b170119795024fac1a99c1df SHA512 0341224ebe9e298fefddefba786bd686731d13c105b36ecd1cb9f7c37966b4813ae9bb154b286f3ad3a64a8812d012463feffeb58e76144438ad57126fe3d7fb WHIRLPOOL 87a48433431d4c86d7fa569a3cc0a52ce91fe4790c2bb87ab40dc96ec979e61b704b937bf6e9b7de35ca49664965b693dc3e15995b123f65697e8e285f605a43
+MISC ChangeLog 2427 SHA256 452591f179da4d1cecdf15c33c5f3c2451ccec4518452ba51295cf07c9fa2787 SHA512 eee7eb0a9a8df80c68cddc872753ea31b5ef479be60710e0ba178fc748c091cec38ffc01cf43d0656f03177c31f766145ec6b961f1d09ebba7aeeae54a24b2e0 WHIRLPOOL 6bbe0db725381d389a52912f6b5ab67a3ed233f2d12368a3609c331481b22623307016485dd0d2bf4034a31d8b84cdfca9648d954b09c0d23f27f7ed9606d695
+MISC ChangeLog-2015 1951 SHA256 2055e92ab177b67284fddcd0c65f9a4f99f8c87209ab07f2f3caa6b0d0e63186 SHA512 9fb46e206e911f02f08cc127d9b0547a7f27cc59879733ea26f3c10cbb82b4fddcf407a6986c99834e5752d69c680a169cbb0cc23071fdf359c895e8f0c020b8 WHIRLPOOL 36d9b06b5bd0f843cd05eaea4f769fdc5aaad77c5a242a8d8a937397dfb813174d9edf42e2cfd060f4df70bcc39191e01c8b08a55c0d2addf50d3227cea45a4c
+MISC metadata.xml 553 SHA256 8ad8681da1c7c2e73e62099fc6508fff05dfee1125d587ec1ec1d26af006712f SHA512 c85367dc67630d0879e88dbc93b73f7283f1dd526a03a7c44eaba69556d69c5c60f5b0c187daf05f05a90d6ae644c1a72ce47ab5a6fe8ec46e92a827f0f1c9b4 WHIRLPOOL 386df3dcf0e4ce1e559dea3d342ba29625211240c70c382054887e9238dbf97c23a6dabcaa1976601ce7b9d7cad98ce4abc5f3f425976c261a48640aa5f79a2b
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/Manifest b/app-text/dictd/Manifest
new file mode 100644
index 000000000000..ef1662059e0f
--- /dev/null
+++ b/app-text/dictd/Manifest
@@ -0,0 +1,14 @@
+AUX 1.10.11/colorit.conf 848 SHA256 54969fbc6e782013c086e3055f0fa1989ddeb71f5b87e94205d82cefee657d8f SHA512 d836de8a5a409bcbc3e6ee71e3b8fab20229b9937cb909f061cd8d2fd8cb841870d42ce9c4501c441a7825c642be76a7da3c242e9831b1caa30fa5b26e173813 WHIRLPOOL 9a2efd8d14d574b5d9fe0ea307f60776cdeec7ef2987f4de20235592883cd6ca00777bb6a504166c17e6e59b3701818f66a26f4491cdce91561d6b905361de64
+AUX 1.10.11/dict.conf 243 SHA256 278b6986ebbfe74396a9e287d94a2d8128a83d511df84f02093058081aa12d57 SHA512 22fbfd3bf8c4f88801aab848e160f46bf17757086ffe8fe7a4cdb78f983e88f6c923cac8714f78d31ab311957aa860731f663324b742febd0a5039085672aeb5 WHIRLPOOL 4b2951a6a3205c88fec2192202603427bbe633561f40a97ffd9c0a644f6a0781136cbced6a91e0ae4b50a6292367357cbc9e21ab71eeb8454633c44cc271a30d
+AUX 1.10.11/dictd.conf 781 SHA256 a44f35bcd74814d25e6693de994a9572ef3203c467b772b45f0562dd1004f93a SHA512 60c7ade9e3c160c69b87405962b0e92f6beb3941fecdbbb90c2343f1db1cc800bd26f1a670435641859e6bc864aa8ace58749c07dd106c3afd7eea81601445c3 WHIRLPOOL 3ee396b4255d064cffad81a29fbaec634c6b208255b66b1d7b391cb5aca07cfdd7395a956c187e2f60fe44f26703b623858881649b015fb889f1d9981f488385
+AUX 1.10.11/dictd.confd 207 SHA256 5c2274a37b28ab36ae5b0d93148b919b1da47b6ad074c0c948aa182d18b0c7a3 SHA512 16e31e250bce84cfa25d5d187f736053773889afd248248fac61aac115df2938fbe6f30049c143f2c290b60652947125763adaffdfcd71260853d574c0434348 WHIRLPOOL 0503d719a1df2e7b8405b85a50c461289dbc55bbb3a642966b7751fb7def24db5224537d0f7e70b25ea935eaf745ce60276aac93d00505212bb2a74042de5c72
+AUX 1.10.11/dictd.initd 1982 SHA256 4bc51b6d12aecf7e49dafce316f287d8fa87891a8a0f5ad21c4b51a46ad828f6 SHA512 7b8907dbc9f40f81b8431e691506142954643e6539ca6bb486f629fb929f60da8a7e52066e46374478f805dc1b6e84931f3b4a6a2f8f7d34f56a8664c5f4a0ab WHIRLPOOL 7b87a83e5e9e4fc24b5c9fda56490f86b82818391624cc2abedd0fc4a0ce7722873a0d51a6f3b776dbf6e251181173b0fc8ce69a0a1e790ea4ba350800c926f0
+AUX 1.10.11/site.info 235 SHA256 cb55e7aaedef73665996f015a07e97e45cd3771775e291d798bf163b0052c0a2 SHA512 74bb341f049acd7d502d9117ae1321bedc499958ba377c02a2591880cc45d451409fd99a76ec3ddcf1846f6d124ef5ae1da40c5c001b67e94c68a895c2dcfd79 WHIRLPOOL 964bcfbab3788e9e3b088420f5b5d63239ceae81f65aba4074e975c269ae4c1de65dad3f22c6d6d8f04ee839bbb5580f7cace470843f77e52aefda4c51a7f899
+AUX dictd-1.10.11-colorit-nopp-fix.patch 323 SHA256 720962dbe93456a948c489dd7ecc1f8384169b88c7a662ffee960b5eab4c7409 SHA512 af4a35954d4c38e7e33d23a05dccba4dc7ffb5b4905cb34487718a664f8c52c3cebb17296367fb9f8b203137bbc00fef62d2f452446fb589f914ff8862bbc1e7 WHIRLPOOL 71c58dd5c3743824aaac8a46e90ddabf427918238184129112381784827dd67b0ca9fd1e41714a68b6328bf608097d68d25210b9edce4b603600166bb2333a21
+AUX dictd-1.12.0-build.patch 643 SHA256 332769df227f6269eb2b134400f9cf2281f46ef30844d5517732f663b9f40000 SHA512 577a85b765a3a7e8e8510ea36567541073a79cd2f99a8efed69ee1fb1e7d32a864d872fe358c0692be56af0c94ea241cb4effb9623371f0eb8492d8c4d223433 WHIRLPOOL eb3e6e78ed1b7579182a2b725434b1d2f87f0a4ba237587fc2a982b79388a917c4b50d960db12b875d50affa8e607c0cf3cf53093222de839a665db08d552b89
+AUX dictd.service 181 SHA256 be3cde8b4361808060d682d1d04a5b08b3b6f58c92196b36b28eea89e3ea0a94 SHA512 e09f48b746977bfc118fe448bd41c33c6ad61fd94b42ce343ea087b858624498306d958203ec5e219dbdf94d54f8eb5a1feb7c48ad3b3ebc2eb1e9d3594828b9 WHIRLPOOL bad96e4d5e0c660c29603e48339885a60b70c88b99bf6bb59aab185aa959f87fc2691aa29602b64922cabd8fa12e465e234f33e4e25b5a9b8876c529c4e612aa
+DIST dictd-1.12.1.tar.gz 423870 SHA256 a237f6ecdc854ab10de5145ed42eaa2d9b6d51ffdc495f7daee59b05cc363656 SHA512 51bceba36f9e34ffcbbf42a6235aab6097fe66ba8ed086ea60d0df8b7daf91c6449fdf7c5605150c77035d98029053233db106f9188786b30e02ecd61748209b WHIRLPOOL d9f92667c0cb66d893f4f4630cc2dae61dd54b5d96b01d312d83eebd34278ddb11b76c2fcaef40a0b6dcd608d5a542d14c6645c7769893879eb9c229e04c9648
+EBUILD dictd-1.12.1-r2.ebuild 2804 SHA256 ba042d5d246777276e7734d01492c1c5aeaa827a2b3728dd9eaaaa0d304920de SHA512 489ecd4f356e3d2631fb1bd783f861f26467695b66a06d9e97ce9407ec0fd27b6ba0607a5344a325995719248623e41ff8c3da4c13ae5a17589c7fa08c72f3c0 WHIRLPOOL a29865c3c59a4e46e5b53db1f99e95edc878db1299a9941dacd1b61a4c080045e06f2220d5922c21395eb3af582707e1f475ddc4b866d25c35196cb7972cf147
+MISC ChangeLog 3342 SHA256 190c73f41b36ddf52184a6a887f40252a9da311f5024745e0cef214b7f4a48ce SHA512 1bd9e5d97676debf10b1fb8204bf8ee394afffd099f517346cc70269c3066537a2bff6fa0b1f24fd88e3379b87611088fd4c0947b3cd0601dde63e6b2f0b438a WHIRLPOOL e02d41ef5b5ecca6d0cf8f0d69134b1e223e4588b805209fee1c0b06f2336c1699882138e630ee7f5518da8ed98570f8b671560d5001112fa0a83a4504949e68
+MISC ChangeLog-2015 16995 SHA256 7fc9dae97621088888cdd8bc3c4de1cb251e489ab2e3ef9ea911c452e9872e42 SHA512 fb57a4bbc4c200986c06037e0d3fd0e3e274621ebd09a306e5ac522eaa6c9cd24e99f3b63b3bfbda7a7c3a96dd7aa74deab11e96c90289e593dcdc73ef33c3f6 WHIRLPOOL de7a64ff633f651cc676654e6d40a90ca705f0189f89d8198d4d2f80618931ff21b97d593961bf3a2e4850a09543cf04c6507bd6fdfdb217249d2ef8ba141d02
+MISC metadata.xml 484 SHA256 fe58d99be3c10754c2162592bea45b4f315b96317d687be016f4859d5007e22e SHA512 b404b831fbea2146daf29f4bc81af88c5e226134950fa1eff68823bdf0b00208328936983d1e9c8c51e3420a27c0eca99e83d1178451b8e5df265b8623d3385e WHIRLPOOL 8a3799ac66fe4ae5abceb404f66a07aaf423876914a7b284bda383c2d2003f24c4f57e5c6b665f79a79a96d9ea81611b23fa18675d1fbbc8548507db3bc6ef83
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/Manifest b/app-text/diction/Manifest
new file mode 100644
index 000000000000..1786e25bc1f8
--- /dev/null
+++ b/app-text/diction/Manifest
@@ -0,0 +1,6 @@
+AUX diction-1.13-make.patch 367 SHA256 9f4b2839ac89043d571195bea8a940be3bd285e960a8590fd282729bce828034 SHA512 ab317f3de37697a098dc9c50ef741417772ab66434a41b89381bf123b9e980263a1b6b488f7f1b1bfbe25a178b2d7acc793067e8eb26e34300e639765af818bc WHIRLPOOL 93c657373614e5d4aa20c68b36ac0e7064a8eb08eba60930f3e628a3e4c4728b96173aa98bd45bae678ca2a9bd18ad3d969be6c778fee66e1b282b2f8e3cb10b
+DIST diction-1.13.tar.gz 145971 SHA256 095e0eb4bb7e0bdfd7e5b0dcfb53c743d7b24c1464bdd599ef4461b4c249d121 SHA512 f410f9992adcc362bc60f3e39e85cc07df5763623729c6d599538707aff0831e8cde59d80bcd384975d75229d6ce1cae9bebdf6eb3d4a7203b22d2a1773df039 WHIRLPOOL 3a1ac454bde896a7c51511e7ceaf463997a2cb1557b0e7668f027d844a8501cb6a32315cce02b394139a9433b4f08a19180d6ebf08590f136d1414e281a0f1c0
+EBUILD diction-1.13.ebuild 560 SHA256 5ab24596f704ba3935477536386051c64db4994fff68f394301b42ddd8ce377a SHA512 62214b2d75940fd215871d7d3eefc0adc3198a178e1eb4e0376999f8dc484f5f9d3094495eb128140e3f7b333a5e39820ce665402f19fa25f4d9e884caf45f24 WHIRLPOOL 2b69dce71d1ae1756c48f7758ea38b3c5abb79a884f2c7f7ffad0dbf24c6d4fd4545e2d2c3e6ead143dcc2f1030d50adae1a04969ee88a8581079bc551667b07
+MISC ChangeLog 2610 SHA256 cb582c68533009ec4dae09e1635637905bab9e40ac446a7ece4ac4bbee7bb56c SHA512 1a521d8cf79b0301b9248dd9e644c1ccffc8f71648c0625fb31408c8d1434f5c274d5d34be3b2dcdf59248bf0b212159d296135392fd61732c9b1fafa672bddd WHIRLPOOL 0a3069b1bbf6d20978a79ae19d87692f0aaf765de056df5bf8b04ed224e9994283e85d553831f9bcacc9c59d632f1189fed28c66deb873de14ca4501203bde0e
+MISC ChangeLog-2015 6251 SHA256 01b16fdbd1b0f4253a06d1ad404994a22cc3aa41c1f3969d0fdc36ad6fda8e22 SHA512 5703765df50a5c183d7725ab52ae4276bbad143475508a8e6ce78bfb41f99290f210a682eeea0ee88a91931ba786fc48b27d0e6883f91b48824276944669d3d3 WHIRLPOOL bedd8f780ec83d5e91ab0cd6ab9cdfa0d71c4720042c04b6dd2e1c591932d70299b3c56b3c2200ea2510f632abef44668b9ee92b5bdd4fbc83ce33d9051eb867
+MISC metadata.xml 1006 SHA256 0b022335a6366426449f31dbb672416c28f38bcefce8ad40a925ffbb673831c8 SHA512 f8aa49a2b7cef19bd9658516a2ca5cbac77883c1e1c1615d00a886c46d2505999a383652e1fed8a6341d69b31a0fa4763ff2df7bb0ad2f03f65948982dee4675 WHIRLPOOL 29c9b9321fd000a87961da102758eec9ec7d826d33ab415ad260838999daff45dfe68e43a7fe69d3baf8bff520fe3ec1b1011cbff9650b67f3583fa77fbd50b1
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/Manifest b/app-text/diffpdf/Manifest
new file mode 100644
index 000000000000..4a84a68e5ee0
--- /dev/null
+++ b/app-text/diffpdf/Manifest
@@ -0,0 +1,5 @@
+DIST diffpdf-2.1.3.tar.gz 91856 SHA256 c6142ee038a78108397f45b0c456dca7a4fe1d75250f21a514a134101d322433 SHA512 137e00f7c1d696b097f271c51fa5f19d471efb85fb3d5381c096c32f1ff824083b1122bbefa758fb9320ac8e0c9c16e6b88c8b6286bd98388d88c45c714a948d WHIRLPOOL 3c4b4a90edefc98d208b41cdd35e40438a8e1cbf9177e6f1955cc8819374f223e79fee0d5dbcd55dd4a9ce46cb807d5bf5b7039e1f55e95ae23478ca26dc984d
+EBUILD diffpdf-2.1.3.ebuild 678 SHA256 964a208a8386f806522d33a0c2232e5b75f6c13bca50825247b94d95ef040fdb SHA512 36af124c32eb8a4255dd137e83ae5c05253ba706088d8144f0e38d1146db1b40ec4653dbddbf6d5c41407208550b8193960e91954d8eceb52fae2dd4eb3ee476 WHIRLPOOL 52f23e7f4f1dd2cd09422d8bcaf392af9f443bef02f38bda2354425bbe8cf1237069fa9279a57a54a84e9085ca330d63f4d5eb92fff01bac5e0e933f3670aa98
+MISC ChangeLog 2176 SHA256 480d4787575ab7fa025fa40b31da16214d50b6ca1e1122b0cf99368cbbfe3c20 SHA512 c2752830a2b0a00bef7b0c075acaffcbfece51e7b4b7899d3eea60811ec5d25f23c22e475532381216ce1eb256baf9be269990d19f9182db6b502fac647832a3 WHIRLPOOL 318103b7f7a2efc8bd3c7ff3acea6e8c05eee8f694da1bb6a2e7ac7a5a2c8297be426e7d1d4ae9c8cf60ed02a662a78db3d1c3eda89c06d99510f59b15b99a5d
+MISC ChangeLog-2015 1635 SHA256 e61272d29f7498b99f1089eef2a7609220852c1c852d7caf47980ce20df6c370 SHA512 f264c52d66b5704a05acf2436c4b71bdc55d309ef22af337fc90b07ab83d53227fa804e9a2be7910917fabb8627e628541fb221fe06fea4d4d43f8d8b5040d89 WHIRLPOOL 0ec1417934c85b28bb50eab4211d0eb3f57eddd20bc238c28e57a4c7d75d4ebfae736454d528d61c729b4467521f9ba5f0e9d39f37c2d9a6e17e31b9109a9251
+MISC metadata.xml 247 SHA256 3a2199c30818c24de28d5cb4ef9ab8e6afb8c563ff316ff965882182bc227142 SHA512 4ae39ceedf573357554a383ccfab1d716abb7265c3a1eb407d1dc4bf3b38fc91b5cdeec8ba0bad84efb2595aebb6d115ade1575e12812079e47797b7dcd3fa7a WHIRLPOOL 9cd501f7902fe8ed2fd0e479dae23cfc9a3e35a1c7766171ce7bb0807d46f9590a6c96339f99e746d894f96ba0b1ff5178f5ba830ac73184677ccbc9cc22580d
diff --git a/app-text/diffpdf/diffpdf-2.1.3.ebuild b/app-text/diffpdf/diffpdf-2.1.3.ebuild
new file mode 100644
index 000000000000..51e213918991
--- /dev/null
+++ b/app-text/diffpdf/diffpdf-2.1.3.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit qt4-r2 eutils qmake-utils
+
+DESCRIPTION="Program that textually or visually compares two PDF files"
+HOMEPAGE="http://www.qtrac.eu/diffpdf.html"
+SRC_URI="http://www.qtrac.eu/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+IUSE=""
+
+DEPEND="
+	app-text/poppler:=[qt4]
+	>=dev-qt/qtcore-4.6:4
+	>=dev-qt/qtgui-4.6:4
+"
+RDEPEND="${DEPEND}"
+
+DOCS="README"
+
+src_configure() {
+	$(qt4_get_bindir)/lrelease diffpdf.pro || die 'Generating translations failed'
+	qt4-r2_src_configure
+}
+
+src_install() {
+	qt4-r2_src_install
+
+	dobin diffpdf
+	doman diffpdf.1
+}
diff --git a/app-text/diffpdf/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/Manifest b/app-text/ding/Manifest
new file mode 100644
index 000000000000..dc7a1c6dc08a
--- /dev/null
+++ b/app-text/ding/Manifest
@@ -0,0 +1,5 @@
+DIST ding-1.8.1.tar.gz 6543141 SHA256 5817bad70d9661fc1efc8bad38939bf665818c549a9675e8e041fff487c61232 SHA512 7d1b459d40e26482c3c16a79565cb897a492fa5807f44c5c3ed1022bcf65ba90bec9cb503cc67970742c2beeb34bd653c684e56ef5492f536254bf475d3f70a4 WHIRLPOOL 5562a3e5903ff42c9a678d860a1f6738a9062e28134d573f8bc48d6fd4cdd967b7966bd9458dd83c940451dcc38a20b933c570fa9b6214f5233f48237c410b29
+EBUILD ding-1.8.1.ebuild 573 SHA256 2d803860462cccfe38c26c194eaed182813057982f55592e947cd97b4f9d8adc SHA512 5574c5589a53ab0a70a17bb6fed42c7a5abdee544ab66aa356452b96579778c42745ebe8eadb6e0acb8d0912de7186793211103e763be95168ea2bacb1bbeb5a WHIRLPOOL 58136574848f6d794db4f0fc147488652f539ce5d4e72c717c75254f673747ba2c9ae813f94f2ec00646f056122d339a83ce8e44c168f14bb975cca2bccde980
+MISC ChangeLog 2767 SHA256 d99bb448f67269d249905ce459237d94ec5d878845e5a396aa79af1322377d94 SHA512 ab6eada77a07eb57b95ca4c1a2f62e04d70a58844e4adfebf1ae58415ce1cefe5e2dfb7ccd7cb77fe6b01211cca64a9d2bea2490bfc172019ddeaa69b5d86988 WHIRLPOOL 793efd15e29e8853d6db364c670f23145d3a385b12d5c1d5cfdb411ae36fca94c25e9539b073ae03278a533f86043d8f866b57bfaee8c9a6e9eec30bef84bb62
+MISC ChangeLog-2015 2755 SHA256 1b6d4efde5d4c0e59863abc648fa0cd4ca40450c55bff5cc997de86539a41b4e SHA512 652be8ebfa0920dda7c3b086c32431f9149ff643fa01a853c940eba74fe436a15c2163b5f707e40609a67d9dbdbac81eec41a445f20cfb178c936f9411a0dcb1 WHIRLPOOL 51e4ac52c6fafd445abd683a26e181b4c5db9ed1702312a869613e9adcfc63e5fcac7d5f4fcb1e9a246b296a4e38d9a24ee4528f2501286973c891827d631cd0
+MISC metadata.xml 251 SHA256 59d4a6753275d4f64e51844f8c61bf78d104e103e42c551df15ba14c8e65e9ea SHA512 0ccc4891c6c5de39cbe83d8391b0345611be252a2b1fedea6644ba1cfb283140a8250f32cd26b701db9c60d42782b214d03574592ef3b585bb15d2ffcb5f016e WHIRLPOOL 26dafe883e7e85115f4a9a758c911c206f37f2239544b74a4beb392815efc8f35b230528845def4a7032851e037ecfc595280bfa119035dd07ccaba3a8360927
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..6e50e8576fed
--- /dev/null
+++ b/app-text/ding/ding-1.8.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 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="http://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/Manifest b/app-text/discount/Manifest
new file mode 100644
index 000000000000..1bd78564d3b6
--- /dev/null
+++ b/app-text/discount/Manifest
@@ -0,0 +1,7 @@
+DIST discount-2.1.8a.tar.bz2 85161 SHA256 c01502f4eedba8163dcd30c613ba5ee238a068f75291be127856261727e03526 SHA512 a1eba7076a27da56136b8057189c5474a36bf11f8233cbae270c8a0cf9b070332b4dcdbbbecfbfbe1d8c19961ccaf87cee27ebe855c6bc6558d8ccc423553c96 WHIRLPOOL 5d7148f6c4e9f84a5290fffafa417c4684517df6fce0deec773beb2f89b4416b7849aa50351c27338653b8950b68c3c49ba223d31e347ad7562b0cb040761114
+DIST discount-2.2.2.tar.bz2 89288 SHA256 ec7916731e3ef8516336333f8b7aa9e2af51e57c0017b1e03fa43f1ba6978f64 SHA512 67d882c0a334592230332815c543458b3c916a950bf7983f8a468fbc9f61154b4023d4bf451b76639fcb3a076506b48118f192a8e21f2535b3f49c7f081bbdf3 WHIRLPOOL 30ea10c83c54ffe43720486b8cec652d5f0ed60263904f9a8f902baa9feef7fdb4abab4ee69f0be12311c0631b53dfd8816d40cd43e755f31a2afa0eb46a3c87
+EBUILD discount-2.1.8a-r1.ebuild 2429 SHA256 615f0f325b6098ed931e1f96f6bcffcf666b6facd133b99b19ead8afef73c840 SHA512 065784f0effb3c1c24ba3b7897022480c956aa07a1288e047fb5e1a2fb51a347a7950f5ea09b4af2ef01222021297b4a8744fac70d07532651af978aebfe6118 WHIRLPOOL dfe3ea7f4047b9e0c6b12ec081ed3a97efc893cb8dfab4891ad792eded58ab4bcd79fcb8ab6fe8a20d3466cac1a86b836145e5c8860bda23f8f3614b53b0f0c3
+EBUILD discount-2.2.2.ebuild 1745 SHA256 73cfe60ccfb1b37407792188256cadbcc917b2ef1ed42b10c37e9dc170f8b50f SHA512 6bc80e256fd4d7ed70e4c525671ea2b65a746d356053f7b0d5e5ff33f43f9bdfbfe9a23ae843ef8096588c5895455d108c63d0d1f518cd7621c06c971d7ac4e7 WHIRLPOOL cd160268c82aa6cd43bb8927b9f0ce63f4026cd2472d72e6d173896b043d0f21f45778fd453b13fe85e6c4f79bfb93ae8b9a9470047b07c1c3c036ae48483be3
+MISC ChangeLog 4437 SHA256 d5163ee5d70cd238e1d1f4660191c8bcacf611acd85cc7c979c9d2574e656362 SHA512 d86bf209c399934d4e61bb6301d13a9bc0479d2177e027683e793b59428312e3b0987e3ed51a2b30a6f2c0f770361481d17cad2919f7341534939a61b02e74ad WHIRLPOOL ef0c778f497f1b471fc6be02bef58b821a4164056b1be0be1283c521922c3c7be32cce4b000dc06fed5d9f8f9f85b72c3ec56ab354f3a157595fe772887df223
+MISC ChangeLog-2015 2472 SHA256 7e63434fb1e7db783a0d961204a17cfed6790b3dd940fd238fecb5aa966520b5 SHA512 1c296077c16676cedcf2db0e4de5d17204ef2c496fd1145084be1be3aef8b711fa2c48ca287f4e04a51b6b5b02304bc6cb0a69976b05a22e8ca9d4ffca2675f8 WHIRLPOOL ebee3ca9558584c36adb5a61f11a955fe993a540f8699addbd2260c2fc39f19202128c7f54e213f0988de735619439a91fb05804f365ddd00c9d597c20ac2e0d
+MISC metadata.xml 366 SHA256 c99a065110021175e05522d5512f0dbbd68597796c4ec69689cf454acb6b35ab SHA512 39d05813a4efdcd14d0f5932efc63c25ae22b83088cb1bf020863e8ab9bdb348bcbd48901a2dff3c1184dc1483ae3868d2b4a2fd942dda91150944008773db3f WHIRLPOOL e7c7f81de4d006693fe9039cbd2b4aafb72336dd19cde6fe49acd5cff16d5484825f4d605f4b823e1b541b7f50fb4fa91603aa7563443482b87c21a3584b8184
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..a16f7b4e4025
--- /dev/null
+++ b/app-text/discount/discount-2.2.2.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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[@]}"
+	"${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/Manifest b/app-text/djview/Manifest
new file mode 100644
index 000000000000..6bcdb9aec587
--- /dev/null
+++ b/app-text/djview/Manifest
@@ -0,0 +1,13 @@
+DIST djview-4.10.3.tar.gz 1119618 SHA256 50b80ecddc5aec03c49882c91b3af2f42abfe8454d5ddc01fb313e3481e6ab25 SHA512 6e3da481cec699558cbdca17b19b971d693341e6f5ffc07010f8ba717c6434e6d96969bfc322e4edcaaa5fd364e583c7c0908c814725caad4dcc3dad968a74c5 WHIRLPOOL 54ce8245b13c189a58e3f8171cecd3c1c48e8e56bdae3103b19186627fb002521e3fa25c1e81a49149d8b331fd9636af4badbb0be389d56022cab87ff8f2e60d
+DIST djview-4.10.5.tar.gz 1111729 SHA256 a0b302807106053d1983659ebb0139c7b1c393b3e6407f1f47990d7e3c5d7b3d SHA512 d7fa4e643e006cb1d71fe6d808fd1b200b965928bf2cdd872c9c1c1833bed71ac3c70a2967a06f31bbd83f347cb5e330f4869e42e7d9c6cd13a0db54e4354614 WHIRLPOOL 319329ac099504a3443638c91a3d078e72d231fd56504198e88017d101f8e492250d9a9205ab0eabf04af59cde2f1bad1a4056f5c8d2a99de4f916b46eda6e0e
+DIST djview-4.10.6.tar.gz 1113072 SHA256 8446f3cd692238421a342f12baa365528445637bffb96899f319fe762fda7c21 SHA512 c06b9c4c7addd9dededdc9d441094bca685c4d23744e3d1208eab33d9d341a85f120176bf9f1b879ac6620f591eefe05ac774870b1ba3215c43baf1eaf9d14f8 WHIRLPOOL c5596ea985cc9c7d6516ea851acdfb908617277a1c5b4425253bad0b907b7c50b22d23e07bcd60da188e324289217f0fbddcf0c38fa42ac367060692a259976b
+DIST djview-4.10.tar.gz 1077198 SHA256 7caf7ee249edd994092b32a5573f111b2337ec99159083a5cf1a20432633ba7f SHA512 b3755992df2000f088a93c0d77d4a2ea62f6495f67106142d4787b94d248c54561068a40700c18325c0977a057b26948762a7b71c392b0ccef455776dcb0aad0 WHIRLPOOL 179d850a994521c02a7c64e17aa8d5c618011e8a765023325bc86e19f8b7797ac1f70962b1ccb9438b3a853463c797698a29d09f937317fa0ab0ac65b5016f29
+DIST djview-4.9.tar.gz 930676 SHA256 d150f557aaa073356d77c1f5e566a6a566281df5f92395b6822139f0e5c90e0c SHA512 dc2862d673eb77cca77a512a64257e7b37707789de41362fb62295ef495201a81cf31d0282a88ed70e32f8c7cd5643b568ce9761297d0e61d72fdbea7ecbfa94 WHIRLPOOL b522f9ba7283430fa7134f172b6a358c95da03e10fcf1e5f55bdd5c9be1f2929c07682e48e3a90695c838dfd2ffb875794c95e70d4096dd9595da402f76523fd
+EBUILD djview-4.10.3.ebuild 1977 SHA256 f2cfe4778660d5c37877c878add10aa1e064d367872974d7ff130532de9ca37d SHA512 538d5f93cf7bd1b9201ddb8fbd2eb3374137c47f8e3624dbdcf44e3b823e72e3e7d8ef041af35c52f4d36f5abb36d19c68e4dd5c24ed8ae05dd30a4cafb42609 WHIRLPOOL 7bc2ac522517b70b93501f84763c506eaae126a5e13fec09577fc817c0763c59ca5a7abb94391efa5ff17b95109b6335948ad2384ac0f45d668e6862eea3f2f8
+EBUILD djview-4.10.5.ebuild 1977 SHA256 f2cfe4778660d5c37877c878add10aa1e064d367872974d7ff130532de9ca37d SHA512 538d5f93cf7bd1b9201ddb8fbd2eb3374137c47f8e3624dbdcf44e3b823e72e3e7d8ef041af35c52f4d36f5abb36d19c68e4dd5c24ed8ae05dd30a4cafb42609 WHIRLPOOL 7bc2ac522517b70b93501f84763c506eaae126a5e13fec09577fc817c0763c59ca5a7abb94391efa5ff17b95109b6335948ad2384ac0f45d668e6862eea3f2f8
+EBUILD djview-4.10.6.ebuild 1977 SHA256 f2cfe4778660d5c37877c878add10aa1e064d367872974d7ff130532de9ca37d SHA512 538d5f93cf7bd1b9201ddb8fbd2eb3374137c47f8e3624dbdcf44e3b823e72e3e7d8ef041af35c52f4d36f5abb36d19c68e4dd5c24ed8ae05dd30a4cafb42609 WHIRLPOOL 7bc2ac522517b70b93501f84763c506eaae126a5e13fec09577fc817c0763c59ca5a7abb94391efa5ff17b95109b6335948ad2384ac0f45d668e6862eea3f2f8
+EBUILD djview-4.10.ebuild 2027 SHA256 8fd1ca7732a3316070bc49a7c2d20293060948e707b3191f8bc91b80b438c25c SHA512 3ceea3d4e3e82acf37d6612391b9f9d38d324a3e2a2ba8f8c6e667cbe5bf43cbf40c4fc5f2c055de82f521dbe8d76e448169d531e815d061ed5f38928d93cae5 WHIRLPOOL 889ed1d4952d3357326b112ee878f466c301cdde8fdb1c7cc55b1d6115499147ab416042e83c9d6959b2566faf7d68f60667b9d3f3b7badbf2a2393f526fd4f6
+EBUILD djview-4.9.ebuild 1945 SHA256 e1bcc601789790429e7562dd1d71d549bc40e2e6aa1d7009c979165f9dbb5ac2 SHA512 8eedc3e6d1f0d6e8512eb7b6e305221b325cca6267990d619f91dd01eabd2f607e0df00145528f6f0b96aae25630585968f99e30d061378039be952089f27fde WHIRLPOOL 717d597fa20a82c1e968f0ca3dde3114e817b94a37aed35065b5347d723c4a3662a4d8ef890268ff37e645f7eb0e474cc0cc862c6bc90df08f741db5acfd2f69
+MISC ChangeLog 2944 SHA256 b5c6ee3a693076190f6d1523bcd139b473531766262cb65706c44933f986db48 SHA512 204b34144ee1537c37c39266e57525935b9f6433d2820f841c6f507da1ef142d2440c35819d14df9364efdd0f7f4b7f76dc254e4610d4923b17164ef748e1ac3 WHIRLPOOL 49fa4a23e396b43fb07eae4b391d2258ea71166e7a768f28149bef00ffd85f21d6ee3de2dbfda15f15cfadab448b5da0548f8edc3fecfb74efdf72ebc587b876
+MISC ChangeLog-2015 3966 SHA256 08e8ab32f19323fb66432c50d4eb95caa7ab2cad88a4c8a49f08e4c8ba638841 SHA512 3cc7220a7c9866c102d7fb97d0992d4b099b4ba311cce14a2630727a4c4f0afd9ac837772e3d43bbb6b712649f8c4ef593b2407b3ddaa8c072b2b3bfcbccccf6 WHIRLPOOL 554a4281f584588b428164ecd89085cc559ed798510e19f2dbf6fdafccd1c22025d98dba4326e17ca3b83a6f9fd3d4bc77c2a8e69291bdfbf8d2df706bac5c31
+MISC metadata.xml 323 SHA256 fc4d0ce234b1ecedbc5d345bfbdca3efbad55e507b095df65229353fd77f2777 SHA512 53a7a7290a2286fd31248db31160697a3b2693275013a1ea453258f9ac52fa3ea7111718ca35a5eb1652050699e5be1111c7ebb73b2a3c699383d8305509a5c4 WHIRLPOOL e839e561abd832d23d9f7399f8941e55d130bb0bc097534e7633265b896c74d98fe57f7e2961c536ee878f3b9548399bad5eac30c11fad3aca36387b05f2bfad
diff --git a/app-text/djview/djview-4.10.3.ebuild b/app-text/djview/djview-4.10.3.ebuild
new file mode 100644
index 000000000000..21dc4b949344
--- /dev/null
+++ b/app-text/djview/djview-4.10.3.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit autotools gnome2-utils fdo-mime flag-o-matic versionator toolchain-funcs multilib nsplugins
+
+DESCRIPTION="Portable DjVu viewer using Qt4"
+HOMEPAGE="http://djvu.sourceforge.net/djview4.html"
+SRC_URI="mirror://sourceforge/djvu/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="debug nsplugin"
+
+RDEPEND="
+	>=app-text/djvu-3.5.22-r1
+	dev-qt/qtdbus:4
+	dev-qt/qtopengl:4
+	dev-qt/qtgui:4"
+DEPEND="${RDEPEND}
+	>=sys-devel/autoconf-2.67
+	virtual/pkgconfig
+	nsplugin? ( dev-libs/glib:2 )"
+
+src_prepare() {
+	# 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 is needed because of kde3
+	QTDIR=/usr \
+	econf \
+		--with-x \
+		$(use_enable nsplugin nsdejavu) \
+		--disable-desktopfiles
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)"
+}
+
+src_install() {
+	emake DESTDIR="${D}" \
+		plugindir=/usr/$(get_libdir)/${PLUGINS_DIR} \
+			install
+
+	dodoc README NEWS
+
+	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_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
diff --git a/app-text/djview/djview-4.10.5.ebuild b/app-text/djview/djview-4.10.5.ebuild
new file mode 100644
index 000000000000..21dc4b949344
--- /dev/null
+++ b/app-text/djview/djview-4.10.5.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit autotools gnome2-utils fdo-mime flag-o-matic versionator toolchain-funcs multilib nsplugins
+
+DESCRIPTION="Portable DjVu viewer using Qt4"
+HOMEPAGE="http://djvu.sourceforge.net/djview4.html"
+SRC_URI="mirror://sourceforge/djvu/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="debug nsplugin"
+
+RDEPEND="
+	>=app-text/djvu-3.5.22-r1
+	dev-qt/qtdbus:4
+	dev-qt/qtopengl:4
+	dev-qt/qtgui:4"
+DEPEND="${RDEPEND}
+	>=sys-devel/autoconf-2.67
+	virtual/pkgconfig
+	nsplugin? ( dev-libs/glib:2 )"
+
+src_prepare() {
+	# 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 is needed because of kde3
+	QTDIR=/usr \
+	econf \
+		--with-x \
+		$(use_enable nsplugin nsdejavu) \
+		--disable-desktopfiles
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)"
+}
+
+src_install() {
+	emake DESTDIR="${D}" \
+		plugindir=/usr/$(get_libdir)/${PLUGINS_DIR} \
+			install
+
+	dodoc README NEWS
+
+	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_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
diff --git a/app-text/djview/djview-4.10.6.ebuild b/app-text/djview/djview-4.10.6.ebuild
new file mode 100644
index 000000000000..21dc4b949344
--- /dev/null
+++ b/app-text/djview/djview-4.10.6.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit autotools gnome2-utils fdo-mime flag-o-matic versionator toolchain-funcs multilib nsplugins
+
+DESCRIPTION="Portable DjVu viewer using Qt4"
+HOMEPAGE="http://djvu.sourceforge.net/djview4.html"
+SRC_URI="mirror://sourceforge/djvu/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="debug nsplugin"
+
+RDEPEND="
+	>=app-text/djvu-3.5.22-r1
+	dev-qt/qtdbus:4
+	dev-qt/qtopengl:4
+	dev-qt/qtgui:4"
+DEPEND="${RDEPEND}
+	>=sys-devel/autoconf-2.67
+	virtual/pkgconfig
+	nsplugin? ( dev-libs/glib:2 )"
+
+src_prepare() {
+	# 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 is needed because of kde3
+	QTDIR=/usr \
+	econf \
+		--with-x \
+		$(use_enable nsplugin nsdejavu) \
+		--disable-desktopfiles
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)"
+}
+
+src_install() {
+	emake DESTDIR="${D}" \
+		plugindir=/usr/$(get_libdir)/${PLUGINS_DIR} \
+			install
+
+	dodoc README NEWS
+
+	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_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
diff --git a/app-text/djview/djview-4.10.ebuild b/app-text/djview/djview-4.10.ebuild
new file mode 100644
index 000000000000..bc6ab11b3c1e
--- /dev/null
+++ b/app-text/djview/djview-4.10.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit autotools gnome2-utils fdo-mime flag-o-matic versionator toolchain-funcs multilib nsplugins
+
+MY_P=${PN}-$(replace_version_separator 2 '-')
+
+DESCRIPTION="Portable DjVu viewer using Qt4"
+HOMEPAGE="http://djvu.sourceforge.net/djview4.html"
+SRC_URI="mirror://sourceforge/djvu/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="debug nsplugin"
+
+RDEPEND="
+	>=app-text/djvu-3.5.22-r1
+	dev-qt/qtdbus:4
+	dev-qt/qtopengl:4
+	dev-qt/qtgui:4"
+DEPEND="${RDEPEND}
+	>=sys-devel/autoconf-2.67
+	virtual/pkgconfig
+	nsplugin? ( dev-libs/glib:2 )"
+
+src_prepare() {
+	# 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 is needed because of kde3
+	QTDIR=/usr \
+	econf \
+		--with-x \
+		$(use_enable nsplugin nsdejavu) \
+		--disable-desktopfiles
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)"
+}
+
+src_install() {
+	emake DESTDIR="${D}" \
+		plugindir=/usr/$(get_libdir)/${PLUGINS_DIR} \
+			install
+
+	dodoc README NEWS
+
+	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_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
diff --git a/app-text/djview/djview-4.9.ebuild b/app-text/djview/djview-4.9.ebuild
new file mode 100644
index 000000000000..bd924b75378b
--- /dev/null
+++ b/app-text/djview/djview-4.9.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit autotools gnome2-utils fdo-mime flag-o-matic versionator toolchain-funcs multilib nsplugins
+
+MY_P=${PN}-$(replace_version_separator 2 '-')
+
+DESCRIPTION="Portable DjVu viewer using Qt4"
+HOMEPAGE="http://djvu.sourceforge.net/djview4.html"
+SRC_URI="mirror://sourceforge/djvu/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 x86"
+IUSE="debug nsplugin"
+
+RDEPEND="
+	>=app-text/djvu-3.5.22-r1
+	dev-qt/qtdbus:4
+	dev-qt/qtgui:4"
+DEPEND="${RDEPEND}
+	>=sys-devel/autoconf-2.67
+	virtual/pkgconfig
+	nsplugin? ( dev-libs/glib:2 )"
+
+S=${WORKDIR}/${PN}4-${PV}
+
+src_prepare() {
+	# 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 is needed because of kde3
+	QTDIR=/usr \
+	econf \
+		--with-x \
+		$(use_enable nsplugin nsdejavu) \
+		--disable-desktopfiles
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)"
+}
+
+src_install() {
+	emake DESTDIR="${D}" \
+		plugindir=/usr/$(get_libdir)/${PLUGINS_DIR} \
+			install
+
+	dodoc README NEWS
+
+	cd desktopfiles
+	insinto /usr/share/icons/hicolor/32x32/apps
+	newins hi32-djview4.png djvulibre-djview4.png
+	insinto /usr/share/icons/hicolor/64x64/apps
+	newins hi64-djview4.png djvulibre-djview4.png
+	insinto /usr/share/icons/hicolor/scalable/apps
+	newins djview.svg djvulibre-djview4.svg
+	domenu djvulibre-djview4.desktop
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
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/Manifest b/app-text/djvu/Manifest
new file mode 100644
index 000000000000..6fd393c378ac
--- /dev/null
+++ b/app-text/djvu/Manifest
@@ -0,0 +1,8 @@
+AUX djvu-3.5.24-gcc46.patch 859 SHA256 c13e57ca5bbe87c57d74643cfe35ff6eeb823e575aacf507e676f1f8ac2259aa SHA512 8e27341bb994dca8ea27cf6da1141f06b5c96f1b853e7d4215214893c32a17fe3adc821c98ff8793d23cde458420f944b7f4d51e794fda9a061fea6f1eac08ca WHIRLPOOL 784b31623938e7f62969dc7db7bb5b2b545c6d7192edebca2933fbe094d9cf42ee3614abb0ba8f54f453246f07119defee6d9e3a92764f87d64cd38dbc705b2f
+DIST djvulibre-3.5.25.3.tar.gz 2543949 SHA256 898d7ed6dd2fa311a521baa95407a91b20a872d80c45e8245442d64f142cb1e0 SHA512 0e38f56d77915ee6707dd19a36a8ca9167608c39449a5c73de9cd784d712852c07c068b79a794e25f6d3ded0f927d083413dde197c9fc8f7b68c03cffe68035b WHIRLPOOL 43ce341be7dd6322f7bf05ed541e9eb6b8b923d95893bb8f8b78761ae452384e39c39e23723b4d0fc7fe8e95301dc414ac9c2d74a169a6ae12b86e5968f1edc3
+DIST djvulibre-3.5.27.tar.gz 3648522 SHA256 e69668252565603875fb88500cde02bf93d12d48a3884e472696c896e81f505f SHA512 62abcaa2fe7edab536477929ba38b882453dab1a06e119a3f838b38d5c61f5d8c252e4769e6534582b826e49bcfb490513179580fab9c3afa84aa92053ccebee WHIRLPOOL 7caff93eeaaaccb393c03013b62220cfc1b1a50e4d6da4a107ae0267fed1f5f9e6d3ad2b61845be5192b67917ec064a2c21c0f4ad567d4b0d6f56168ae4593bc
+EBUILD djvu-3.5.25.3.ebuild 1769 SHA256 74bdbbbfdb83702f9d9c50b982777c6595b5907111d3dafd9f05501e556717d6 SHA512 51e5ed5fb1c2f3deff3e989c5bbabeb43177ac7ba0174f5ecc6916bb1734d88fcc6f6a9585183a30688ee70dae214c27b047b9f762e9b9eaafc3b5f77af86d53 WHIRLPOOL 8bfc83c75eeb2c0d828ac775d522c563e7e66e80bf11f3dc6842635ec078f05e093158bdcd934fc2785d2d5574a376187703f0dac1e514d4a300858bb65bab1c
+EBUILD djvu-3.5.27.ebuild 1467 SHA256 ad22a204b85f5f5ef25cd2a68fdf7873673ae03daac37966909338fac282075f SHA512 6c244b2ee9107d061d0f8abd74efc606551196b479c1a527db6bfe232fae3843112e3ed2fa29e8eba85ab54bcfde4dcc50a98cec4e6fd8ce729764adff3e84f2 WHIRLPOOL 2527af8d44848dd751f90a581672eae13aa870dfbd218604d1fe583d70dee84a76ab8bf24c6180dd4368277b41d97c7a4c528365634aaaf311faa666cd4bfdef
+MISC ChangeLog 2697 SHA256 3ebcc8d9f9877e3a024cda8dc6019f96cfca7bf2957e48c5b76844a3e93e5f50 SHA512 abd6829a18b99296f8c5a80fe95ed69978ac786b69bcd888b008d454f661e7335ce7895d6f70e4e5886e76a6654e0122703933deca2894fe471a96741f3be826 WHIRLPOOL db04442f5ba2ddb49d024716e3d7d14aeecdf3c41c28446c5df1e5b2e44c69e5f79ab31b2b68f00e65d8d6ec950b406a655faad1757bf5f70c222d60dcde3195
+MISC ChangeLog-2015 19330 SHA256 31c029f70ed8223ca5c5be0260751729a69f6182668b7d050156f565db4358a7 SHA512 e8297dd91742f743281c4731fad3ef41b128fb88bfcabbf29e567051bc8e1e3ae643a908ef94fbeb015f2b19e4af113c93fbe7913e19d1c53efae23b6fd8d1bb WHIRLPOOL 165ef2401a0e602607a30d8b3c15154c89e0e450172d09731d23bfdb4909779be424cdc93db556fc718733fd39f2a0885a223c39da6ed4a6ae5f96fc19513817
+MISC metadata.xml 948 SHA256 9c5cad18c654bf32ac6e4f8fbac22e67318ed3400c2ca4acd11053c0cf160b40 SHA512 e5cfa3a2b2077a3f0dbfcc99165fb678e8c8759724790d520f1bed670fed5e753a47207bbbcd7d2ff2d55def5b34bf32201771918c9e7a16583d91553ac75e42 WHIRLPOOL 2198d5d107ab6a0aa44d64408a8d0fc8202e187c018cf497a306f67320eda7a90b4a102404081491a1468b5c2d4067abfd1616df4eb41080853107daf80f80de
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..e06287eef0f5
--- /dev/null
+++ b/app-text/djvu/djvu-3.5.25.3.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools eutils fdo-mime flag-o-matic
+
+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() {
+	fdo-mime_mime_database_update
+	has_version app-text/djview || \
+		optfeature "For djviewer or browser plugin" app-text/djview
+}
+
+pkg_postrm() {
+	fdo-mime_mime_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..e77303c6ddd1
--- /dev/null
+++ b/app-text/djvu/djvu-3.5.27.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils fdo-mime flag-o-matic
+
+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() {
+	fdo-mime_mime_database_update
+	has_version app-text/djview || \
+		optfeature "For djviewer or browser plugin" app-text/djview
+}
+
+pkg_postrm() {
+	fdo-mime_mime_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/Manifest b/app-text/djvusmooth/Manifest
new file mode 100644
index 000000000000..9afda4654b00
--- /dev/null
+++ b/app-text/djvusmooth/Manifest
@@ -0,0 +1,5 @@
+DIST djvusmooth-0.2.18.tar.gz 70548 SHA256 823f2ad11f535cb1c2c26971921fcf993d4298e142ccbe5a6716e022a3d2cdfd SHA512 786d7e9dc49f9a6923ebfaec7d4e68446e4bd72f7ff7cca9cd3a1513f3b1751485d6879dc59b51ce1d58390dbcf23b8992b42f9f2b5e6938d434d6966b7a4a72 WHIRLPOOL b479eb9a11f80282838a01064a864ec89934cdd8dc694741207815602124d8bfd001d163bd7516ab0b6092ff2309aaa162ec457cd77655ef3b17c9bf2f17179e
+EBUILD djvusmooth-0.2.18.ebuild 562 SHA256 0d3f13830cc92db84db522960c3a1d19b079b071653a7937e53aac941aaceb81 SHA512 c32ea14195c45e2eb805c7e7c5a2d26330c2a42c621586ced20872f2a3f43524e89752bd213caf914be686179dad5d3e47b765f49c8cda66fa36a83a5ffd1d48 WHIRLPOOL afa4c61c7cc2157656199cee8fcfe88a0a9b63419748abe31ca930141d9819af4cc0e920782af37faedacd01102bd31a64e9a77b44be0fd4eac8499f133a5387
+MISC ChangeLog 2187 SHA256 3e235cde7524ce0ca51db1ff7e0df28981ce5061cb09538e1b49d32b50026bb8 SHA512 6465c0a2082800fa80aca7a18dc0c2d64d223aa57b790d61853c011c3bbdd684097b66b81e5a3abf105ece5f422ceb84c47e052b0ef3c0b037b5b28c6b27efb5 WHIRLPOOL 6b23cfba876e29b3a5e6d38f3e93a789423020e9b866e1bee1c0383dfaeca6293ddeaa6f5fc6bef0e146a466bffdfd0b25c069b8495cdb474e5c43ac37db7606
+MISC ChangeLog-2015 473 SHA256 6c8121bb8bcbb1085ae2363c48b1013ed2b0c303d3da1c765dc4506774636438 SHA512 0c6a0d70e88290b013a5093250b2999bbb1b90646eaab541a61d1b697540cb82403faa60cf63a3a3e34c1cf2fcc9698daaeb15a9e94a099ddb5919c801dd694d WHIRLPOOL 96e25773475c7e96c7c000011393fd2f1343fdfef34038303cef81a21c56fe4644f2b605206c49008cf6264074e5719ac4231a4751257648635cf86820a02907
+MISC metadata.xml 253 SHA256 509c40a55c1c18cdc7e0347725bfaf9f68aaabee098c995fafded387a2504a08 SHA512 ebdbe1749818e629dd679f454444046f355d35acc10ad66d0a110cd582cd68c42f9f2dd880bde858a99abd85d46cde7b293a65c8ca3510c6bd1674e40b5b0d0e WHIRLPOOL cca874159fbbec887c52b1b5dfd4feca04263d49145552a3202ddec5b7f5df0ae602162108ec84bbbaddd15231312d1fae1dadcdd71be27750cedcc68c6a7e8e
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/Manifest b/app-text/docbook-dsssl-stylesheets/Manifest
new file mode 100644
index 000000000000..05109e2dafac
--- /dev/null
+++ b/app-text/docbook-dsssl-stylesheets/Manifest
@@ -0,0 +1,7 @@
+AUX docbook-dsssl-stylesheets-1.77.Makefile 676 SHA256 9dec10a3f0c4fbe860f4fecf49cf4470c875a95957871ab97cbeb36a484b3e14 SHA512 110c5dbed17a759179c08fe44410b7d098dc42c8a1d6ed1a4accb30d815ccbd0f2a65a65723b18747577c838106d5e9c193c466a7c2e7f69fe2aeb1a4637d2c3 WHIRLPOOL b402e32c5d4f45cdd6ed31c88931ac538035ea6a2808993e307ba19d6c4f511e00df9530cc88abcf9a2ec557fe146fba600394d375541d5d88cbe8fdc863a4b7
+DIST docbook-dsssl-1.79.tar.bz2 277650 SHA256 2f329e120bee9ef42fbdd74ddd60e05e49786c5a7953a0ff4c680ae6bdf0e2bc SHA512 fad71e67227b54b0a7c31a351b4d5c0695517b3687714807d7b144d239dc6f7e0d556520e705eb75581c82e0deea4b32ccfde1eccad2718337b757eddd64843e WHIRLPOOL 3c1f8745878e4c50102aaab2ed29eeb1f2ba0e0b20a7ee7426db85f971f811b744721a3e2468035557a1bcf851e166d199e526e18dfa5f23ad0a3d9e76d071f8
+EBUILD docbook-dsssl-stylesheets-1.79-r2.ebuild 1662 SHA256 bbcb127bb0a390e249c97bca12ea93fc3c8045604fbdef74716a9f370fcd6964 SHA512 668472dc141ab026c04763a81074dc06d0113472d9ab89197a1eb216301be440d8267fe9e70a225278a9bc9d4bbbd5a303dc5cfc00972404a6287e024d5dbd03 WHIRLPOOL e7a3d2e50865c5caab93cbb78a6d2e99e0883d3bb6d0d29e6cb7c62bf1f5ab3642177a995371d871763a90a578ff026d7d8df77a2b41c10fa694948bce935c99
+EBUILD docbook-dsssl-stylesheets-1.79.ebuild 1651 SHA256 61b911571b8797805ab548100e5b0b821245710147221094ed2f68f2a90d5acc SHA512 209ca4152e9f32734dec59d3a9eda73e418c5db71f043461786f941b663ed654fec7d16a9ae4f63b17b58245f978bec7b73477b7d7a6d02a5937a709b8b7ccd9 WHIRLPOOL 8dedf98752f787a121a7c5362259426080b51c31982ec254e8be3a3bcecc659c4979d3962f184a73c1850f893818e5b8f825d4ab7a5cbcaee0b1aa369f865588
+MISC ChangeLog 2624 SHA256 a28c9396e8f04e0ceaee6f5383c57002180d153a2a9d22f44675388243b287c0 SHA512 575d9a855ea45997fe9d119ee5a74e050d62f1dea2a00e14769b610ae433ff688b8f0262d0bf28ef34b0ed1e662a52cc52f34ad4de8e9541daf9fd5ad3d8f9da WHIRLPOOL 823c411f51d0b57281fa16ae207edc7a3ab207429e80d8f1bfa87674b5b1addcf6b55b52fbfaabafeda94779a83c95d09e68035f52d150856ecfa2f559f8593a
+MISC ChangeLog-2015 6648 SHA256 78e329faa32bd3e9e60bc04b60b4bc1e617110890b04a72da48e3ae25ddcca61 SHA512 364dfad57ea9a1321247a921580b539233cf87f1f89d96fa969eb1fb6f78174ade403582ca8617e9bf71a6ba8f6e8d468e5348319f6168b50bdefdaa297ca772 WHIRLPOOL cb8c422d6e1f3bee7b7daa5073ef489a8fa95d0f43f185a88c08d2f4d5d7b6b5dee8b8ca1a198bac18f759b2aee4d3d185a019135689ab295ee5268ca3a8a539
+MISC metadata.xml 244 SHA256 6b0789bed896facb90071f1f2a69526cdfadb2be5afec7bd4f1f6e5e6ef28143 SHA512 bbbde89bd3a4d4e2071d840c10a83781a0950bf6e362bc4e69a24ac9da5ce216ec338a935519e8913df63db8b3ecd12f6ac3868519fd1b1378285c923fd234ec WHIRLPOOL c14355ec563bd81d93ef58e757bf350b6bb641cb781cd4d85cb6ce7cd2b768a81ae454473df539e2d17f6cf99da0992b73786c150756fd359a3b3e510f3778db
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..7db7def58b19
--- /dev/null
+++ b/app-text/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-1.79-r2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2017 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="http://wiki.docbook.org/topic/DocBookDssslStylesheets"
+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 ~sparc-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/docbook-dsssl-stylesheets-1.79.ebuild b/app-text/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-1.79.ebuild
new file mode 100644
index 000000000000..1b93b6bf9ac6
--- /dev/null
+++ b/app-text/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-1.79.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="3"
+
+inherit sgml-catalog
+
+MY_P=${P/-stylesheets/}
+S=${WORKDIR}/${MY_P}
+DESCRIPTION="DSSSL Stylesheets for DocBook"
+HOMEPAGE="http://wiki.docbook.org/topic/DocBookDssslStylesheets"
+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 ~sparc-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-dtd/Manifest b/app-text/docbook-sgml-dtd/Manifest
new file mode 100644
index 000000000000..6a22ecb48076
--- /dev/null
+++ b/app-text/docbook-sgml-dtd/Manifest
@@ -0,0 +1,27 @@
+AUX docbook-sgml-dtd-3.0-catalog.diff 2144 SHA256 0e86312ea2e3495297c7e8d38013a39900539455a12a29fdeafd1ce60bc41304 SHA512 e0ae3b49da83fcbd95fd12ae268d414d12e72c16f5d4342f3d2268f378b9c57ccd1c4daf1ed739a3ffc4b36c2b2842bd2f18ff2d1081c65ccca2aae694613654 WHIRLPOOL 8cf5e4f803d60617a8bc8301c163bc4fcc01de3bff4fc9362a50e54fca5de3e82c426c0703571216aee18f61da646f03d3f083a3e1dc513f327d0ae8783f583a
+AUX docbook-sgml-dtd-3.1-catalog.diff 2125 SHA256 4e5f470aaa33edf75dc7b03bcb1dc9146ef4134509e115b6ed3deba27e56006d SHA512 cf4162f0b318bfb0e2a95384eb7520a1cc07971637a07f97841515c7ab3c6eba3ab4e45a39c406f24a10a79069b506e5066c436c59e569347a798827db3b8ff4 WHIRLPOOL 961d70d01dba482ecefb86a45f21db5204e38bfa57855f6d02cc30685a95865be7efd034629d53f8894066d27041847f5203da592dfef2732e18882078519db6
+AUX docbook-sgml-dtd-4.0-catalog.diff 2096 SHA256 689e3ea909241527aecc7f1c40699292cccdb10b33a2def97d3fb87aeb86ecdd SHA512 933f0f6ed79f749b82bc265fee41b01e0c1272f5b45bc298b77636cc9e527e722061300dc9acb5e39ed9af92177c0df03746f761702dd42091c423d5147cf3ba WHIRLPOOL 3fbf600ecebdbda5ed518dbce85e1308a0eba1394cbfcf3b8cc816caf9fbe5c2e51e709ceda901e14be6d4e9354d56baa9fec60198010002d22ad0afab1d34e2
+AUX docbook-sgml-dtd-4.1-catalog.diff 2096 SHA256 0450cf0fc0a00bd554bc848d1cf2d35d54aa769c40a82e70614292d9d7cff6d2 SHA512 fcbf05b86f4d2290160929049f3599b34a7c88f3fe92f36b539d8cce0ce9d3dea74acfff164a8176f5e28b50416abfc9057623013edd59e18ec6fa8e254fba6a WHIRLPOOL 34d46aba2740a766ce761597af3d6cde56c378a38a0455c63d2e67d31dccab9a74c11cc9eefec092a1df0f55d33de3ef0915bb76c1b4864c1c131d66b5f73e25
+AUX docbook-sgml-dtd-4.2-catalog.diff 2528 SHA256 261925809c97d6c65ec0d0d98a0b5f5f4bda1d01adafb59d76d63f52164021a6 SHA512 23a61f2cee28e997e16a33177212578dc6a99c84868fae338f3fb5d2ac7a01322d22824785009711fe70462169118c88d57a928849da8c94af847d423b6449d0 WHIRLPOOL bdefebe260561761a134aae87300cf446eeefa84c4665f369832c1958da12b36534bde9bc6939bde4fd4341fd516541cf37e878b6cdeb4dab08a6fd6c33e12fc
+AUX docbook-sgml-dtd-4.3-catalog.diff 2471 SHA256 87d7fd4d9ea0d8b4e0b457d517d504aef44f6a19ff36f7276ea7021f7116eba5 SHA512 8143551df2b88963e1acb29ca281ea30629e6fbc41d1966c9d967dd00e1411bb55b0847069c25403f15fd814bddbb7552589e9682ba30c74656c291dc4906f49 WHIRLPOOL 959484e0e5bb1e5040bcd4000f4b9028aa126e87d13035d09d244823adc0aeec6e1ee0bb7515ab4a61cb0da0bb969caff55f94d2e76d724dc2cc042c04ec8809
+AUX docbook-sgml-dtd-4.4-catalog.diff 2471 SHA256 71183cdee2871d345437da0a6e53abd04c45acbe39747aad5fdafbd1b1b6b5a6 SHA512 86f1db81e539e4e76d2f3f799b1c5e3297ede2fc2f448f6a2b69d1fbae3d2d4a2a444f66186b5b9525c171e32082f9e213ea31715456cc17d998e15c68fe14da WHIRLPOOL 980aa77245233e25c69aba838611d4395a04019db0e08db6efcd5b5d32966eaeff70c7e89cfb3002d59cd4303f56efa573fd1d91bedbf500580b1a6df7d914d9
+AUX docbook-sgml-dtd-4.5-catalog.diff 2583 SHA256 071d740b48b6b3aa10675cac516827a8c76b99c9d6d937fdca7c3fe1441237df SHA512 a2c35b12043db3b0676d29b9525e669a13c7e892a7f4a2a47392fbe16febb7727508d75a45deaacca0af386930236c4889e86e4a17c727c98a9c600b28fd392f WHIRLPOOL 57f8d06ba01e37f9df6f0abc41cdfbd1a8af608033d6960d106f988986e472a9ba85693b711dbd21fd2d30fd7b46861f13c6a8f601b81c0535feff02d839ae25
+DIST docbk30.zip 43441 SHA256 ecf71cbe8ddbad7494ff520d5b4edf73a428c0b159178cb0cb619cba685e61c6 SHA512 4e186c7b38bf70a3225bd9fca4edf99d3e7f316308b561aad9a0548f8e0ba941b54f20f6e653819de8a26db5eb54fc7442c3e2d740c2ba60311b3038a4bb9198 WHIRLPOOL 2bb3b2d6802e928e80fd4bf1cfdb5f62900bea7916b534b1d426fe42fd8e2d180493cdda2769e58fb0115faa94fd5eda982fe372a5cae637bd0661b4fbe0fbd2
+DIST docbk31.zip 55952 SHA256 20261d2771b9a052abfa3d8fab1aa62be05791a010281c566f9073bf0e644538 SHA512 397c9df011007b71ddc9c052d28db7ab38ac2c05e7f575aaad41a6b4995b910cd147f9a822d162271bc073cbfca0788d7f323be381c900c3a32c352e658d37fe WHIRLPOOL 298c420c12ef1de550cc5dae1a3b8f8d49d53143c7a33f0d36fe5fc602f2ef37506f9a6184bc663ada531675bd7cfbc50119a1c3e873ad381b146ded85bdbf32
+DIST docbk40.zip 55742 SHA256 dfef22f109779e4cfaafa27b6d381d975ac05eaafb5b3d4407d7043e310817bb SHA512 ae1078190bd34c2b7f0eab667a2502822eb80e17243c447849736ea8d7eeb65c71b571cc39106763c6c9f75c83f3b684a40a18e1dd6da5d235c63a107c931276 WHIRLPOOL caa6ea2866d5fcc90d9c63b7300cc811bbce984804c3ebb170e9cc04c02181ceb9f0ec6f1b9b1fdef99264216762b5990f70bf9a5af6b2767d2f476d78cdb596
+DIST docbk41.zip 56654 SHA256 deaafcf0a3677692e7ad4412c0e41c1db3e9da6cdcdb3dd32b2cc1f9c97d6311 SHA512 d1c76a381b37c599c127286be67939bd8348721339ed9dde6140c69a2d89568e290e7554e6763ab903e050edc505520497eb612865e2a07224e4907b51fb87d5 WHIRLPOOL 0d91b952ce7e42163374188b38ee52b5cd3c563b7f4cc959db351018ed17b8dbc765a9e53d98ca4590feaf31a3ef7bade528411846986bf4cab97b22e25927a5
+DIST docbook-4.2.zip 61830 SHA256 67ebd2c94b342718c6865d2de60f5d4ff02d77a7e4b0d9e72a48c45f2b2635c3 SHA512 d51e07310a1426a5fecb809ef1bc32aa7d72c673528b3ffda0b6d3c1e22baab89f94dd5160386d657d567eb225c9bd2cff1096cd07c7184f6e0b690692a5661d WHIRLPOOL e001139677822f29c88c2ad595ea4183783b780f07f645bf754075874a9e370888426bdcfc18860791fa0af76d8d0f03ea64902a13555ac847fc198d578ffdf6
+DIST docbook-4.3.zip 66117 SHA256 88f52fab7bd49b2e8f40c525014129c26a5a4b8bbd1494e00387556ec76f95ee SHA512 18ead2e683a9e9bc39e1487ee06fb72542557fa0c76f0e899b566cb52207e3bbfcb415ed59163c6d59e8d58f92289e115416d56bc6ed8f182910f7a18565b227 WHIRLPOOL a0904dc4648b70e222da2e95d94ff5d1627dc4acc77748e49162542ae0d1f9830675a2ef141b0f751796d9a43f87b91219d1a8efe44d4d06893c36d6497a7522
+DIST docbook-4.4.zip 66879 SHA256 0ac7960409b032c8e517483523ecb92af4e59196a33b3e2c5617daa22b7a8a6c SHA512 561d6f68e293fb98d13010dc287c6ea59d9e6a033af3518ab4d735a374a7a603150ecf555a1126577dd00baa692a6c5d09afc4d3fed70f2fe8b5b86d6bb5ecd8 WHIRLPOOL 0e3dac2e28661bc19b8399314bcd12a1fe0af14f5045b735b257256374b577e7ca7e73377210d4f974b1c169ec6315fec547fefc330615db85de04f5b246f4fd
+DIST docbook-4.5.zip 71252 SHA256 8043e514e80c6c19cb146b5d37937d1305bf3abf9b0097c36df7f70f611cdf43 SHA512 cde483678562a18f67fa5fbe631fbdfcbef907b6b6fb63749125fdc883af2448d4a95aefb8fba8bcdd0417fb078063984fe8eb3c7050978f4f4b03d527c329df WHIRLPOOL af3905835b527a0ac19cd8aa2596ffe85baafb43c5fbde76fe3ea89be9fb27c3d053f1ba892b3953945ef0a1a844da6a25378f4a1462557a50b8b30255520498
+EBUILD docbook-sgml-dtd-3.0-r3.ebuild 1050 SHA256 a8fb5de166be9e8da2a99a399a4df0489b5ca9c44870f605e59c7ee90e8ab3c3 SHA512 12549c4f579feeaa7bce4951700cc49d118bd0ab687a3238be3fcea5580142e60bfd60e45ea9479ec73b45e99f4169342f32c7463088d10512bf0e52cf515052 WHIRLPOOL 49b6c82e5a5c4c767d02826192d2df33806381d3641acecb14929f027f6def147fbb296fcdc56532e57ef16da110a46552fb246f679165aae08e7836aa6d4890
+EBUILD docbook-sgml-dtd-3.1-r3.ebuild 1050 SHA256 dddee9694639732227c2fff1a89d1688ad1537145b05fda3aba9fcc5fd40ed5f SHA512 b594abc7d4a1ed5f1dfd6e660a58054ac4b514890f06ba3db019b499fca036d5ec13628ae209a64813f3d8dce26574e5d49c2debe73b67ac1730e9a4ac8897bc WHIRLPOOL 169dbe63bb251d3039b0c735650b6106ea525e87dc49f99b9a02fdae6ed1e5bd82b79ba910bf5e944eccff19aafd804e49aeea2ca15c98bac7f67bf7e27b7380
+EBUILD docbook-sgml-dtd-4.0-r3.ebuild 1050 SHA256 dbea5fece6b84f2c2a13369e54a09479306c886840ca0029b4523338732d01f4 SHA512 2ab6e56b962996278efa98eb215e1a6d175a35b9c40ab47847bb88014127de87c7effe7eddae91cfd414a3371e853731949885b9acc52b06a03ff513ee0bda7c WHIRLPOOL 475f19967cacb84a2478cea859682550543d8068ae956f0fbc9c4cb4cdf206df8d8940e1ce83c3af6cb81c9a3f5f66c67d9cab78a32df0b0cac83ffc3ae8675a
+EBUILD docbook-sgml-dtd-4.1-r3.ebuild 1050 SHA256 4b9376b25e62a771c2b016cd0b86765ec25634a19dafdfa47e5fb7eed1d5ac45 SHA512 78465733387455939f68dfe7ffa06b31ce5b67977b3b2892960e9ffcd31d8955dd272d48a8488dbdc8f7d5fb779667a6f422486267296f36ea834cfdc37de7ff WHIRLPOOL 59c752764ba98e850cd8fb55ffad52e7f96095823abf0b71b4ef58b17625611bdf51e2f6dd70275d4bb50cf9d531f8addbf4a556410d9f13e240a81810d101be
+EBUILD docbook-sgml-dtd-4.2-r2.ebuild 1041 SHA256 4bff603ae49eb44f5e4d2e1ad6c86d6057d90bd44883ca6a7e16635446d81658 SHA512 45e1f259b57a2ce35ec275d18fcbb0f80095b31038f620a61fdb57324d8321997082dd5596f3d3aa2adee4e169391b33a4c0ff725a4bad28d809c62ff75338a2 WHIRLPOOL 50895fefdb54880ce2447ce7b6c4b75d260872ab78695c844e337c4445504180f2823c281ce9b64cb8c989c05c245ee737be15369650f382e28757a6ac16b6d2
+EBUILD docbook-sgml-dtd-4.3-r2.ebuild 1022 SHA256 0d55dff4d10cd024c5d7c064bc634d5861d0558225944a7f55e9a038121eb2ac SHA512 67c2e1db9058cb07dfa151219a8dd2f2fc15ddbc62d81507a6a50e22547074c1ffdbef13e33d3199f267e48b59b5cdc8f5681f713e096c66c9b214b27316bb69 WHIRLPOOL bb6c50cab72b15bd6144cd69092e76ed4899d0759e7ccfc4142ab37c3baccf29f4c1989242b33f30d4d4315713b90e1fa32893aaa6be57ec04c42dc77ea7bbb9
+EBUILD docbook-sgml-dtd-4.4.ebuild 1032 SHA256 0116a19a8193296d92a04757c7b20dbc2347a8515cf1c977d763c031617f4ee9 SHA512 a5d231f68ba38ef1001f7402a8b870af10c5b22b7f5dd583c91e76209c479baf67d7d95b47afd35ef5426716df1e13f3636866897aa3f560dd3cc1c547aa96cc WHIRLPOOL f8c83a6af4489601f57a3395cfb248bafb3be60f7e6049fac19554c260aa6041639b53a845fa36684ab9333028e404966e3d996fdefd99094f77caac4ea01e5b
+EBUILD docbook-sgml-dtd-4.5.ebuild 1041 SHA256 fb9b239fb0816cfdaced06d3f111ea0b13489a7e6747cc4b7392591ccb936765 SHA512 cddae542be4333d6c06fe45dd12dd2e2c6b57f77f174d0611ce406c0b3f8bac49aeafe1a6433fd572b35953f15d1dbc41aae6d8dfe3922222ea327d5f767dd38 WHIRLPOOL bbd4ed9f7fa022bc217ea11e443fa4070807a6d112c972e526ab458a0d2ee76aceabbed31ced5dedd2fbb404db29d9304f540c1bd48e0dbe5a9c249fa3c289cf
+MISC ChangeLog 3401 SHA256 06a21fd5bcc92feab148a9f67c116d650557e5cce0c916354df6668819ad43a2 SHA512 06ab8ba34ee5b97ca7c76a9b050202f4ef679662425df3423084444c7ad5108ad4fdb5d8f1c522987fb6ee91c42a04b3ed07ae00bda209a9f25221d8a6bb7848 WHIRLPOOL e61ab97616f6b9f649f17cecc65b6ee23e22bd8541187a0af4824b75e233d4d2297b840897cf433e04fe7b08feaa79d7c5269bb08a381532d7edbd6d524b1ef8
+MISC ChangeLog-2015 12096 SHA256 a557c7d31815ef1bb62d617d5ab6eb23b9dfe3a1e90c48f18cddaa8c1fcec769 SHA512 cdbde2f4860426b821d9b5b68862367b7cfac224974a1a4b4d6d1f8a40e5e46a00b599298e3f93aa3403ab6815f2966f67ba6657abe1cbdb7110e6fb89762cb2 WHIRLPOOL 4fd0c458ec7b1a64692f94e36bffc24fd358bef1c72d0ab36fa02e205c527d883af54179c3fa46a52059a5fdf642c04756469714e725f8751966d8555b20ae9f
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
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..63f4c000d671
--- /dev/null
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r3.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit sgml-catalog eutils
+
+MY_P="docbk30"
+DESCRIPTION="Docbook SGML DTD 3.0"
+HOMEPAGE="http://docbook.org/sgml/"
+SRC_URI="http://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 ~sparc-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_unpack() {
+	unpack ${A}
+	epatch "${FILESDIR}"/${P}-catalog.diff
+}
+
+src_install() {
+	insinto /usr/share/sgml/docbook/sgml-dtd-${PV}
+	doins *.dcl *.dtd *.mod || die "doins failed"
+	newins docbook.cat catalog || die "newins failed"
+
+	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..e51932f0d1e8
--- /dev/null
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r3.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit sgml-catalog eutils
+
+MY_P="docbk31"
+DESCRIPTION="Docbook SGML DTD 3.1"
+HOMEPAGE="http://docbook.org/sgml/"
+SRC_URI="http://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 ~sparc-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_unpack() {
+	unpack ${A}
+	epatch "${FILESDIR}"/${P}-catalog.diff
+}
+
+src_install() {
+	insinto /usr/share/sgml/docbook/sgml-dtd-${PV}
+	doins *.dcl *.dtd *.mod || die "doins failed"
+	newins docbook.cat catalog || die "newins failed"
+
+	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..978d581ad8ba
--- /dev/null
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.0-r3.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit sgml-catalog eutils
+
+MY_P="docbk40"
+DESCRIPTION="Docbook SGML DTD 4.0"
+HOMEPAGE="http://docbook.org/sgml/"
+SRC_URI="http://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 ~sparc-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_unpack() {
+	unpack ${A}
+	epatch "${FILESDIR}"/${P}-catalog.diff
+}
+
+src_install() {
+	insinto /usr/share/sgml/docbook/sgml-dtd-${PV}
+	doins *.dcl *.dtd *.mod || die "doins failed"
+	newins docbook.cat catalog || die "newins failed"
+
+	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..9bd906ee79d9
--- /dev/null
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1-r3.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit sgml-catalog eutils
+
+MY_P="docbk41"
+DESCRIPTION="Docbook SGML DTD 4.1"
+HOMEPAGE="http://docbook.org/sgml/"
+SRC_URI="http://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 ~sparc-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_unpack() {
+	unpack ${A}
+	epatch "${FILESDIR}"/${P}-catalog.diff
+}
+
+src_install() {
+	insinto /usr/share/sgml/docbook/sgml-dtd-${PV}
+	doins *.dcl *.dtd *.mod || die "doins failed"
+	newins docbook.cat catalog || die "newins failed"
+
+	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..283555ed258a
--- /dev/null
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.2-r2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit sgml-catalog eutils
+
+MY_P="docbook-4.2"
+DESCRIPTION="Docbook SGML DTD 4.2"
+HOMEPAGE="http://docbook.org/sgml/"
+SRC_URI="http://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 ~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_unpack() {
+	unpack ${A}
+	epatch "${FILESDIR}"/${P}-catalog.diff
+}
+
+src_install() {
+	insinto /usr/share/sgml/docbook/sgml-dtd-${PV}
+	doins *.dcl *.dtd *.mod || die "doins failed"
+	newins docbook.cat catalog || die "newins failed"
+
+	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..ecabcace6a2e
--- /dev/null
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.3-r2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit sgml-catalog eutils
+
+MY_P="docbook-${PV}"
+DESCRIPTION="Docbook SGML DTD 4.3"
+HOMEPAGE="http://docbook.org/sgml/"
+SRC_URI="http://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-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_unpack() {
+	unpack ${A}
+	epatch "${FILESDIR}"/${P}-catalog.diff
+}
+
+src_install() {
+	insinto /usr/share/sgml/docbook/sgml-dtd-${PV}
+	doins *.dcl *.dtd *.mod || die "doins failed"
+	newins docbook.cat catalog || die "newins failed"
+
+	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..e03d198a5dd3
--- /dev/null
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.4.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit sgml-catalog eutils
+
+MY_P="docbook-${PV}"
+DESCRIPTION="Docbook SGML DTD 4.4"
+HOMEPAGE="http://docbook.org/sgml/"
+SRC_URI="http://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 ~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_unpack() {
+	unpack ${A}
+	epatch "${FILESDIR}"/${P}-catalog.diff
+}
+
+src_install() {
+	insinto /usr/share/sgml/docbook/sgml-dtd-${PV}
+	doins *.dcl *.dtd *.mod || die "doins failed"
+	newins docbook.cat catalog || die "newins failed"
+
+	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..e837fad00436
--- /dev/null
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.5.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+inherit eutils sgml-catalog
+
+MY_P="docbook-${PV}"
+DESCRIPTION="Docbook SGML DTD 4.5"
+HOMEPAGE="http://docbook.org/sgml/"
+SRC_URI="http://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 ~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_unpack() {
+	unpack ${A}
+	epatch "${FILESDIR}"/${P}-catalog.diff
+}
+
+src_install() {
+	insinto /usr/share/sgml/docbook/sgml-dtd-${PV}
+	doins *.dcl *.dtd *.mod *.xml || die "doins failed"
+	newins docbook.cat catalog || die "newins failed"
+
+	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/Manifest b/app-text/docbook-sgml-utils/Manifest
new file mode 100644
index 000000000000..66471c8339c6
--- /dev/null
+++ b/app-text/docbook-sgml-utils/Manifest
@@ -0,0 +1,8 @@
+AUX docbook-sgml-utils-0.6.14-grep-2.7.patch 603 SHA256 b7d2b32232007bbaa3911ef98b2d20b127e9d9d193f7742348c36aae4291bca3 SHA512 c574c31a746c016e10cfd7691486b5ddabaa66cfb2350db403b66c8e82e03be590ca12de5f64da5f0ffdde4355d652a7df53d912ad1d10ddbc147c301232176b WHIRLPOOL d80c6f9b40f19c078fecf5855547af538e729d973411cf0115a37dee6db8999fd154b4b9ff4b68fcb924d686d70ab66a5995d552ddde6ad894860cba276e07d7
+AUX docbook-utils-0.6.14-elinks.patch 445 SHA256 9e26e6ad17c2e2bd1d66a06aecc4ec6a077bb94ed2942acad0368f8fe923331b SHA512 67985be1ef2cea086a1029ebce17edbb9508e9b8498cdb304cde71ca3a58a48c461c9a1ff5ec83758864c67cdbc4fa7e414270a7783a41b8cfe95f0526e00f42 WHIRLPOOL ee9ab3f695715dd9beafe66e8ce80149a4b555c3355e17ac9ed67b1137bf19cf4db279e7ea055df5d607e99eae2f60824efc9e6955a6e8da92cbc400ec41ed93
+AUX docbook-utils-0.6.14-prefix.patch 3055 SHA256 363eba749fb9cb7f58a615168af7be5782a2f4c39dc2c3acf17292f160c214a9 SHA512 c4f95b8507070dda4ed102c45e6b8fe40172a2a5d8b041259903f46c3bedb351d85924810cb9bae3073b674ec8b39bd86d5f570c8c28c8100134f62abb59c1a8 WHIRLPOOL f1fcd085cfcf93321e49aa600427a2c6151bea6c233ab442d6ba57c2b4850801eb62b5c49e34be8c2ce6980e642235bd06d5d6e11817ca44fdd04aa91ce2ebc4
+DIST docbook-utils-0.6.14.tar.gz 124998 SHA256 48faab8ee8a7605c9342fb7b906e0815e3cee84a489182af38e8f7c0df2e92e9 SHA512 8052316a643b5eaa6c0373a9ed7f2406e7c3cb3da9d3c955a271c89813a8f3196fcd9e6c8385c7b6b7ecb916515e3ec7897aece4473989f0e4dc52a2bc8bbfdf WHIRLPOOL ca29b3c744e317108c627d1c669b2fec9ccda634c9bbdeed9d0121dbe06f4136a3cb7e29a23c71d8a857df07f7ec623f4549b437cd99f55376a4b6fc8dea76c6
+EBUILD docbook-sgml-utils-0.6.14-r1.ebuild 1864 SHA256 e20e1dce062251894cf68d9ef53f8c085320e624e82991ea89bbfd8e79432c80 SHA512 38efc7b3e888b8bd82b9bd2c03fbf5052a675ed7c0fed5c006578ff381213d05cb165e62979aad00c82146a1a9f217528607adc3b38c7e63bb8cad0f053c53bd WHIRLPOOL 79b72603bdb0840ec7d1e9f20a21bf02e7cfecc85a3b89d8ae80813eb4ca307b1531f73d516c3dba15fe3dd68a605e77f2d31af07ad5d78c2dbd3e8a7d9d778c
+MISC ChangeLog 3410 SHA256 769b6661205d7fc8e6478189bedc98b030204bed0953e81e62c9afc440714388 SHA512 350de4917de1c21b6c2a7692f5229062b698d2d7495fac26a96aeb08b27b31bab46d07fce3c8a05a12eaf1dd7365743f38b9728dc79068cecd93be7bf375b982 WHIRLPOOL 297f6dc57f06b677357b71891408566e61ec596aa2b916141124d4e4d510b599a6ed2254f9d7d82493166d3f14a25ec0bc39e1d633cb3421542e5009f43064c0
+MISC ChangeLog-2015 10141 SHA256 a2f22f0d637b0e22edfafb42ce102ef9c9d3a633059af49396391dcd610201ca SHA512 2eb14a7f9a182ae9b68ed8ef6cb32ff9821927f8c9f82595ff914419188d43df40159cb13c0e6870ed5b5ad151445954375b3a6f44c1448be13513f5313c4068 WHIRLPOOL e19989fb3c646b16c9390b19aa0bcb6ec415a8ecc9bb1253885f45a6668122fe0b3fde43ce98ea469e4a8bbf704945f0d2fb83d6794bc93fdf052b49078cb6b0
+MISC metadata.xml 328 SHA256 1e434ac0f76dbd60f0966a91bc47332f6871a8c4496b650a3698be8a01b3f11b SHA512 258243842db06c12a0751afd612ada57c02433da50c419be86dea6ed655b11120e30b8299228bbb81b6efda1574915d69933c4cda8bc9b0ad79c506a6172bb06 WHIRLPOOL e200a183cb257ed53e17f057f7e98a1d06b15bf020441dc7c9cecb63f423c7b505b8ee6ab415cd279d9499598bee939ef98a8cf7370001173721ec6c88d0f242
diff --git a/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r1.ebuild b/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r1.ebuild
new file mode 100644
index 000000000000..dafe1f1da55a
--- /dev/null
+++ b/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=3
+
+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 ~sparc-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
+	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 || die
+}
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..2f06977880d4
--- /dev/null
+++ b/app-text/docbook-sgml/Manifest
@@ -0,0 +1,4 @@
+EBUILD docbook-sgml-1.0.ebuild 560 SHA256 96fbac7435e1a8df967a65740299b759da2214e84d73db769e36aed2ea1d9cdf SHA512 a35ae42c8c63ff34ec465163f2a74c959f19670a25f742160f4cc53f6b066cf242b5ebdd8801de5adb2d7bb776f7c38e83aa7c944d132ac0a2f59d66e35a5717 WHIRLPOOL 4aa255a2b4fdc41e81dee46258bda5bfc019089346156004d63be5e2e92c919826d4746893214a4bad1a233b0ab63fd56995dccc76a2229d60a7e415f5fa9cce
+MISC ChangeLog 2533 SHA256 b25164a9a31465773355e18c3830591a2f624169a47fb6ffdb652cfb77f7c3e8 SHA512 48654f62c450cb70aac3939aeacdf815c32d5e8c3333b814acbde3a83e312f097c4a3d09f9eb3d794906e7ac39889d5cea7ae32793da23411bccf95fcbed63d2 WHIRLPOOL 36bb6b646da96fd93072956774f1f9da2773d757f5479aa93df1663742804d9b0e12f5c16ac2d9bf19e79115f6a14831d25325fda813f468f07b34d77f98a38d
+MISC ChangeLog-2015 2215 SHA256 47685b88c5c77aadf82c3e75bbe429db439ec36bb63beab299bf00fb8fa17fd1 SHA512 029c1fb10cfacbd68c222ee4af824cd92a7e75587f27773e9c4daf877a0e376fee23cee40fff8f5f6980af1a246fa677390963e859eaa9c74be74a813f92cd3d WHIRLPOOL 30d715b3de0b50c2e81bfc5dbc21edea3a5fe63e787339c554b23b7fb5a0802eede093f7eff67de77cbfbdce913d66369716f85d6ca6400661c3f4dcdeaa9371
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
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..d71a2cccf244
--- /dev/null
+++ b/app-text/docbook-sgml/docbook-sgml-1.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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/Manifest b/app-text/docbook-xml-dtd/Manifest
new file mode 100644
index 000000000000..694c4896b0a8
--- /dev/null
+++ b/app-text/docbook-xml-dtd/Manifest
@@ -0,0 +1,13 @@
+DIST docbkx412.zip 75683 SHA256 30f0644064e0ea71751438251940b1431f46acada814a062870f486c772e7772 SHA512 f700591a671694ca0ac51f5b5b7e825df5c0b3604b20baa6afd3aaafa7ce99470ca1c261781b105b42bfa5485c23217cf3db821b3fcf2ebdae9df07bb8ae4063 WHIRLPOOL d0eb5c989030d1371a8c27ba94d16513b859298081d502b553532cdb5e6af95cdcb28c062d26b59196d0de1cf623004125dfdd6f4ac7aa386831dfb0bcb8c240
+DIST docbook-xml-4.2.zip 78428 SHA256 acc4601e4f97a196076b7e64b368d9248b07c7abf26b34a02cca40eeebe60fa2 SHA512 0c836346130d1e8f4e26e00959f6b4fd2c3c11269ba5cbf11cdc904724e189606f431c99cd5ab188877daa0eb44c58d0bc30556df3b51df480396818d61c4e0a WHIRLPOOL 97e9e87119ce16207be511ffe03ead982b2c33f9071f7c0a299bb50c6a3e707c39fbef5dcdc4a2bee70b80f55a18ca28f9ca94c06d613c9efcbeaa2ad3d1c162
+DIST docbook-xml-4.3.zip 83865 SHA256 23068a94ea6fd484b004c5a73ec36a66aa47ea8f0d6b62cc1695931f5c143464 SHA512 f5090fb74884bae3d4fac8a3c5060bffff5d6a74272de183c181a7642e4b91f4ed32ad028537d198010782c3d98575ce679672f76a9749ed124432195886a7cb WHIRLPOOL 3716b381cb3d39d9645b5d637a899f9bd985905dc00106f717767c934477979c5fe84984c49c62ff8d858e71caf69cef3305b34e68357ba4a1f3ac4df1d81dae
+DIST docbook-xml-4.4.zip 96107 SHA256 02f159eb88c4254d95e831c51c144b1863b216d909b5ff45743a1ce6f5273090 SHA512 7df5af4df24e4618b09814e4e20c147c722962531f03a40c28cd60f1db16b4c330420adf96adb7d66ed6eda84046ee91b467fd6f6fbfac2201537e2080735d76 WHIRLPOOL 3e56c7a1bcaee412f4915ccade689d7ac897e267775d26d8abf200edf2ef7ba63a477053273d8b12f2fbb8d22eb7e5498c9bad0d0cbdd4770600c3e56199d11a
+DIST docbook-xml-4.5.zip 98497 SHA256 4e4e037a2b83c98c6c94818390d4bdd3f6e10f6ec62dd79188594e26190dc7b4 SHA512 1ee282fe86c9282610ee72c0e1d1acfc03f1afb9dc67166f438f2703109046479edb6329313ecb2949db27993077e077d111501c10b8769ebb20719eb6213d27 WHIRLPOOL e28a36a51b66eeb721b0c9f33e9deabb0645dfa53af883f991f58e9fbd52386351bb03b7a9ad61239cbc92f7f4375c001d25e468fd6199fe0d08c92e979b891f
+EBUILD docbook-xml-dtd-4.1.2-r6.ebuild 1364 SHA256 a93f6a6e6ae56630df2ecec7ca1d215f2cb1df8118a6853dde423530211650dd SHA512 bb7530cbd7aa1ec196394a148333b547b413cc780cd67a4b8160cdabb43e1e1ab03963db1d65ff7360dbee9ae82654acbd0cd83d901bceb5754222a1a7fd489c WHIRLPOOL 04ba946ef4d58de2de0601773bdd834da41dcc89ecc697c92888d0ce083c4276833a5dfe9c7830aad849426ced2722349480df7856445070ebee972fdd87d9c3
+EBUILD docbook-xml-dtd-4.2-r2.ebuild 1343 SHA256 54ad26447127a1524dad9a694d9730e35dbb7090d8f69e8e03dc3190940f845f SHA512 3fef4ea9d934cd2a8e01a40d6b050defa29af29d638e5b541a37ad10d2b9872220c90ecc134f11339cea50a7cce423ed332f075394220bf88c4427c9cbccf8a8 WHIRLPOOL b9b8114e2814e4213c172aad23a64ffacf20bcbf237365f03a882b3e5fab8ada0223278037a9eb11ac9e24b60a2cfdde7b8dee1c2ccc56c7fc9eefef482361a2
+EBUILD docbook-xml-dtd-4.3-r1.ebuild 1348 SHA256 18e79ea93457e00054d306cbe914174bd0e749e716bba414fb2087b95615732f SHA512 54d002099036ee06f76eb71a112326e27725ca93cbedb6357a2936b42428f8800f98223e4d6ae32c11b90dde3f6233660421ad8b598b28b4e684dd0f67a35012 WHIRLPOOL 85c04d057e1c12bb33b840239bd619fbd084730451e9bef96a4a2ebb1d6e3d7d9b043ae2f389f5b876863b71f83b574f678a3876b4950ccec64ffb2a9f3be042
+EBUILD docbook-xml-dtd-4.4-r2.ebuild 1542 SHA256 c24ffd54cffb4ed53491d23247d36bde07e4514e7c34c8666d545be2569f6a36 SHA512 fffc729362c8dc59af788857b3db32204068e0fa711672a4df7de81a41862dafa89ccadb1ccab3f16d9856289bbaf822771c0c6a4a3b0dc70067b7b86204c8f6 WHIRLPOOL b5a0b5ed9d32e8afdae22d4878605662387fb199182f161576fa1221eca883adf1ce0d9ae012e905a3bc9446fb8930afabc1f1389df0deb2c2f53b215706fb45
+EBUILD docbook-xml-dtd-4.5-r1.ebuild 1577 SHA256 5e7b254d77da5432da3a5e90f371b35bc639fcd8828bbc588ba31fb2f4c8e734 SHA512 40e80ba6732919d0097baf554a0598f0c950a35f7f635bcd4483e3c635a20f2c39b75bf4c0f35c640d623f2b75db5f33b63ae33443d15e0850b9416e84897dc8 WHIRLPOOL 8f248ffc4398a76b89e4eec82cf6d749b937b05aa9a65ca5900daf6469cb00f8765af3900f8f7adfc221e771913522f93a30c653dde935fb5fbe2741ba7c68be
+MISC ChangeLog 2836 SHA256 b0e86db68db0249ae3f6ad99de7138046f36f7e7fe09a84b573fb6ffb1e6a128 SHA512 c96a1247897326a1a21354f460a68c5f4beec19cf465e2c4fe4253cb553e7c6147fc98b6ba762fdf2a9810843eb778a8f89ea28fbeab624ac35de1f12aabe22d WHIRLPOOL c004bdbec6730f453e2a7d71c9e15042cd0b1e2b107014834178ecca4b2563c95836ec006068cfe9277914d9017cef77501ef8e560f84ca2fe40c507f69f8580
+MISC ChangeLog-2015 14853 SHA256 6d231acc9dae11aa0e034c0ac2fe13859dc07eec931052e8aa10c479ad60a2e7 SHA512 7d656a7663811d6592a9c2352880e163d9082ed62f67b4ae4dba927f7381f5f2d14e903b605ae01fe7ec553ec069a3c75336c264b329e17e5d8d5ca5fbb2c89c WHIRLPOOL 1ab877278b8e8f5e6aca4f0e81db6b9602fe69373e20ac65b272a541275d095a97b818fe2a218f48c0a2b02f064e1125281f268633b6c113fcecbb5212fbdc5c
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
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..eaa26af1097f
--- /dev/null
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r6.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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 ~sparc-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..b3a604912be8
--- /dev/null
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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 ~sparc-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..59404ade7049
--- /dev/null
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.3-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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..b4614bd146a9
--- /dev/null
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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 ~sparc-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..c7157e7a6962
--- /dev/null
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.5-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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 ~sparc-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/Manifest b/app-text/docbook-xml-simple-dtd/Manifest
new file mode 100644
index 000000000000..af682f646b63
--- /dev/null
+++ b/app-text/docbook-xml-simple-dtd/Manifest
@@ -0,0 +1,14 @@
+AUX docbook-xml-simple-dtd-1.0.cat 428 SHA256 7f6a4bfb164fc411830885594266972618f4539712bab9d0704a931615ca883a SHA512 c03796d8ee68d024e9ab2cbbb87c3bc1d680555b410bbf0293bc6649bd433f961a490dbc3a27aaf984cc86df35e29e6752a67d2f589e8070fe0aa3c22b328436 WHIRLPOOL 75bc99207f33d9bea6853d29c5a0a07bc86c289776167391978828f336b3979d346cfb8b267773e6fc49d2452f514a142d27904f40517eb109f831b963a85865
+AUX docbook-xml-simple-dtd-4.1.2.4.catalog 1728 SHA256 30bbe27691f329f9825936fe75243457084262901ebf0eb696f84a7fc9d3aad4 SHA512 a233642906efc9534a14abf9427c8d2b2726e84419f221091fd2cb939e33b9a4f405de7b3ae1d3bccd292eb11ccfb6b494e3d321bacabab41f50b6a3441e1d65 WHIRLPOOL 26b2634b01a90f079761c4b1fc4bbd5bc11d35aeb1189b8cbde889287d0ffb0dad5c3fc2ea9ef9a73fd350fb6876f6dbceb4851accf8d39be75c76ca405b2f86
+AUX docbook-xml-simple-dtd-4.1.2.5.catalog 1728 SHA256 fedf8f0b3992683d67ee6d43354da7fb067fcc4d9483f97be3bd54d2f562d08c SHA512 b1c66124c982febb3f59d44e157d0f3affd15d069e7daa9a138f1e32aa4283024bc14831cda34b40ecc19242c80bc4d3b111fbfadf1659ea652d1e3d7b1e9085 WHIRLPOOL 0f58b46d78cafafa854f03e503194a0ea56670d6e7dfa7474017f5ff471e0636bc5aefbc7748ea49a9c9b52500aa5ab4e7dbe312f7438f77532ace5250aee989
+DIST docbook-simple-1.0.zip 31173 SHA256 412665bd9958a39044d4ab5432c3c786f7f5db51a59905290e4d099983d714ba SHA512 5be8a2fb48b95912412eb250d2dad6126c78f81155b7eb115d175d32831430ede285d5f4bbebd0d8a50a1a3159fe1b7d133adf84ff8447111ca88a441b415643 WHIRLPOOL 6d9eeb0790520dc3a665b2743b5bf97e91659663a067d0784ba084c1c7d0e8c7f796a2796301c8db99ce878516bae40ed135542100430d43d2232c2fdaeb0d18
+DIST sdb4124.zip 35199 SHA256 14aea7b901dd07f7725273fe96456599e226792dc2a02556bef6ab970a57bb56 SHA512 b5c158cfcaaa4150d5ee719d11f3fc2b5a207cace241a147b39ab4a9f721cae2a894a88cd3dd944ecd24feae850b387faa03c669747b02de839f5d6a3ff0821f WHIRLPOOL e5a6e30fc2f34e9acafd09decf6b052614d31999631fa54a3f8d7533d7c8311212b4cf1b41bb46fada09d65f40062f975265b97366b41b2d1df7dd3fcc99e8b4
+DIST simple4125.zip 29839 SHA256 a3c8dc4961b469447986dc4b6b4d7081450ddb1097ad1d8c82e0d35b335aa1a2 SHA512 21c8d411f5b37c82442283dadbde99352778efe90fcf7eab7cc6a74fe9b702f14ffa5bd39e058d8f29fada7dbcdb197d5c880c29b207e3509ba856c5d19cfef1 WHIRLPOOL c958abceeb6337d6ace1e06c266ca262d837822307a86fc9fc51948ddd1ce6087b294aff1cd349df9d76a4cbfa78cdecbe7cde44fe70d5b024a59548f3701119
+EBUILD docbook-xml-simple-dtd-1.0-r1.ebuild 863 SHA256 44364fd35ced16c013b486c9f27529c311be6eeafac535e0aa7eeea597f7d0bd SHA512 8c9c40a7d760924c667dcc97ec2f6fcb879e1d29d6ccb862874a43d5bc8daa9cd8145472911a06c4c436a85934865c33b980ec18c8aed05306ff4454901361d2 WHIRLPOOL c26d8e756811dc9cd7256beb0e2c52ae764e1fc1ea50a144eda458450408a3a74a7d5c954ec7bdc39dec310e120d5b4e8b58f6c18fc1db07a8fabe3d0b39f6fb
+EBUILD docbook-xml-simple-dtd-1.0-r2.ebuild 1033 SHA256 c45bed28e75bd0aed81edfa2534393d1fc1c236b6703f36ba0e0d3c165892b02 SHA512 750c5196f57f116d912caefc2de2283bcb8e0da0095a6059f86c58c84b1b3597cb0da47d909fd63487d7dd5c5ff1942509a8f7fb9bb5fe80aac7347fa3088634 WHIRLPOOL 78b0184cb915bdb9279e822341f36bc3903929ececc6758a794bcd37e1134cdf3cedd6f27bdb254ecdd17b7dbb6efc0a4c8c2aa2ae81798a7369aac5a7eb0e43
+EBUILD docbook-xml-simple-dtd-4.1.2.4-r2.ebuild 886 SHA256 244c856c746531b94faaf71ecc316ff935e722128d71ad7e3b6395559bb3e903 SHA512 03c61f93867d56ccd4abc7fa76b477455d6811c474e6addf5e969669bd5f47fc716fafdebb90534be4f1673b6ba633038d92d9baf1edf9c9ae7fb8f16aec0a4c WHIRLPOOL 2f87372cdfc8170623e787e9b9f6f80703ed9158889180952d63b6d3ef84c7977da48b9b82ae59e8c02c9a0b41058287f680f1d1903d7b4a36610f6457e12fff
+EBUILD docbook-xml-simple-dtd-4.1.2.4-r3.ebuild 1083 SHA256 07f061d11bd32bc73df719ee95af82086ceec652236c1187d7bf94d5e8705a4c SHA512 d2bfd1030cb4a0e2497cfc4520c147b3c12b86c11d5b4f9f4d94bb8d9378bc2b231e6b20a26233f5d1ee9e98fb7725a7c99c22964c83b74c5089cd9f6dc6ba4c WHIRLPOOL 2e1890de683f58daa9de95e57f14ab2aedb8a19d5b9a10676c6e300c6036df59440dd86227fad4b5bb284b8b801a8fe2b8b0a7e68f2b99982aa5058deec496a5
+EBUILD docbook-xml-simple-dtd-4.1.2.5-r2.ebuild 997 SHA256 cdd022590933d37964b62f3d2eb5749fd83f85b0620ce5a8b3efba82a564635a SHA512 2aa40c9f70c89f1258670f57f00d7121773025cf7eea2536cafb978ca0548391c03c51f50016506c69ef937bd71d7f5164f20c3b57600761e2c9010209691391 WHIRLPOOL 7a2a9693f4d80e299c6a522566ada347d572c775f25a50ae68605c68d41ebc9af339f2528b2bbb0362128fdf6dc11c7358b0bb3a15cb2782c5b2f20ba0b6f397
+MISC ChangeLog 3076 SHA256 a74fc825fe518701126d2afebe0776d5406a30fb6494db978351d9fb98f63387 SHA512 f6f94da62af0163649bd88aa1b5060f725a3cda01f1e6e2575fa5344699a969fe6466b68fde552044fe657b9dd0d600fd7d86a59b5ce784bcbbea1161d15fef6 WHIRLPOOL 1c192f401042a6c0c94be0e53b8458713527c24877a0d9716f7a9b27bc0592f1f04358b9c8c6e8ca4078d1a0eb1200f723164efb371b31cdf71b58f53d11e03e
+MISC ChangeLog-2015 10277 SHA256 2b255adf1f8ce3a754ffff3c4d4bd39bbe46e066d648ec373f4b5d9ad57f7567 SHA512 3fc4835e1d4ac6f1b64cc86db451162a753ea5cdc32da3ac6973ae072572f73373d5549d25f670adfccb5a7536affaa93e4173eef700561f31ef590d72fb137b WHIRLPOOL c0b72dd1bd23614d77160032605ab94d3496ce45029ff6e547042abe870d73c3d436597d9db1cfec2a2638ef93f12cc879db88ce5ce85a6d58cb64d485466b22
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
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..5850f1b5a425
--- /dev/null
+++ b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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 ~sparc-fbsd ~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..1960bdb47f14
--- /dev/null
+++ b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0-r2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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 ~sparc-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..22180e986bc8
--- /dev/null
+++ b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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 ~sparc-fbsd ~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..6e4004063ace
--- /dev/null
+++ b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r3.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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 ~sparc-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..757e8bc439e5
--- /dev/null
+++ b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.5-r2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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 ~sparc-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/Manifest b/app-text/docbook-xsl-ns-stylesheets/Manifest
new file mode 100644
index 000000000000..1e7646bf0d73
--- /dev/null
+++ b/app-text/docbook-xsl-ns-stylesheets/Manifest
@@ -0,0 +1,5 @@
+DIST docbook-xsl-ns-1.78.0.tar.bz2 4992293 SHA256 255f67ff33c879e461d7a7550be80477d1bd0b0c3406fa50e9b4037eeb8c598e SHA512 f3b9b52a4ba5670c17086cdf64674080ef82a9226f085887c23c53d2d102611d690895c71d14186cd84a25c7735b05d6c55207f4b2b9084d65889aaac7993cf3 WHIRLPOOL d0f875baddea8317eaf6b5a4d1d0e9b3e4a380fada6414a310a88c3a9ea8fc2f502c249a1862e100138030409f1fa0052514b905ba56fa084c3798d78d0a0396
+EBUILD docbook-xsl-ns-stylesheets-1.78.0.ebuild 1675 SHA256 29684a26b5a3dd7d8f429026ed712fa990fd40d8da8f8df13ce4c2b38a1da525 SHA512 a9287ad0ba9e864e761e30c254de6d2c07b08698cb5f8d52fce518fc55a9d59e23f29089c4595be9e479ec722c022a07d3ade94db31305651a1a1f4cae1436fb WHIRLPOOL c6a6ede499bba80bbedf1b17c2013402b8dcf9e03201c4cc2da74d1d34d7e5f9143772b1926ff939129cc0d9f98c901decef20744b82f92bc3e74fce839c8a91
+MISC ChangeLog 2355 SHA256 c5ec3fd1af3fa5c3332d29850cbb927ef510d70c172bbe0eaa61abf712cc1b0e SHA512 dd02e87175c6586875081eef77ff536a6e481b0f3618ed141713bb7e87e9ca3b3ee7d0b7d23e418a0f4038677391e51be79803531ff45570048fe4334450cb74 WHIRLPOOL 96a31928b4e677e3c30f46cef3b198d1afd1da7769a42135249d80c77c189a39ba9c3bc6b5cec1efff4302298e5b2dbaca6aa5eaceb9f183a7b45c9e190cc801
+MISC ChangeLog-2015 8544 SHA256 3df38476f1738954c0ddacdbce973b455c26f136a901f12876e2ded06f33917f SHA512 5ac1d93706d77443128ea46c68351c810736265a04206d63c393890eae977394422bed7b12f3da4e238d356b70231adb40361ab0aab467d5e29b0b95ac31c8cb WHIRLPOOL e05e25724e70a8e2a79933d42265bb5313deb1fbf39b22a9213aa432c4cae55fb45bc0cb3196d67ba2b112ffadba2941b3e25b2851e93cfe124e9026e8d28ddb
+MISC metadata.xml 393 SHA256 3d09f9621aa1f56dc9871233f8aa74f25c9fad076855162a204721d68f8c1fc4 SHA512 914f819cb6e1c4c3b556781e53f99209ad8b5f054be006965611bd27dce71bd0de5af8a2aa6f883bf044bfdc9a1fed63b54aaf5231f3951271803d4b9f005df3 WHIRLPOOL 301b44dce5fd20c924e4978664ab252df33dd041322ff6e73e94c7729770cd24b1c5d766c7edc294f76dfc19496d8b6de518a65bd130b98eb7031de5729f2979
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..0d4e7fd9e01c
--- /dev/null
+++ b/app-text/docbook-xsl-ns-stylesheets/docbook-xsl-ns-stylesheets-1.78.0.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2013 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="http://wiki.docbook.org/topic/DocBookXslStylesheets"
+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 ~sparc-fbsd ~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..2994e8678f23
--- /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/Manifest b/app-text/docbook-xsl-stylesheets/Manifest
new file mode 100644
index 000000000000..e83ca8181f7a
--- /dev/null
+++ b/app-text/docbook-xsl-stylesheets/Manifest
@@ -0,0 +1,7 @@
+AUX nonrecursive-string-subst.patch 1205 SHA256 9ba5a2f75647df559c2399ec660017135e6997a188e220557e7ce106f5b6a174 SHA512 6a26838078a3ce28273dddfa1af6a378cffc28b6d1ba48a4cfc839addd7bf58ce217d6584b735f9c75381954744ab2386c75fa3c593858b6e27882be55c00d04 WHIRLPOOL 5a7fb22716c1a60cb1db45eb28f8b3ec712b8a50a1bea09429c0b28dab3d0efe4a2db9ab7ec66c68afe9b7f7d726142c54102bdaf9167cc3b7b683d6095d2908
+DIST docbook-xsl-1.79.1.tar.bz2 21967928 SHA256 725f452e12b296956e8bfb876ccece71eeecdd14b94f667f3ed9091761a4a968 SHA512 83325cbaf1545da6b9b8b77f5f0e6fdece26e3c455164b300a1aa3d19e3bd29ae71fd563553a714a5394968d1a65684c6c7987c77524469358d18b8c227025c7 WHIRLPOOL 3bd03072aba15cda9e7a18cb6c1edfc91cdb706811fd07d5aa69df1ffd5a48394848079cf63c67360104f0c0ec89920268b49d358c62bf5f61d6030938be0a0f
+EBUILD docbook-xsl-stylesheets-1.79.1-r1.ebuild 2122 SHA256 07b4a9ab8ddd956d3cd903937ec86fd6074640b55267064d847473303d09c3b4 SHA512 69c1f46596e62747f2011d69def968960f8243393998b5897f83dd4a641931e25dfe496ae502ee5c83714bc887b5c8023b8f208b1b3897d6f472eae134c2b2b3 WHIRLPOOL 48d318e0bd0b26b9c204909671ecb012d814939f6f8c31a5d14e1eff8e1e9fdf868fe307682b51546f7a9c78042c97e25c9b7ea12b02825d485ffb4ba433b3c0
+EBUILD docbook-xsl-stylesheets-1.79.1-r2.ebuild 2205 SHA256 21ba8e8d6a56ef7a7264e47d068bd31ba0b890f719992799bfcc65041edee024 SHA512 08cfc53c2763f048067ffac104399fd2ba0ebe96be2a27b5d109f571fa7e962bb83138847c7e735ee73b24f69d94f2c65de3b816f5a1bdf218b02cbea2dc1efe WHIRLPOOL 57b083dfb08cd296ec1dd18faf8240a6356acd87d3f87b85c5a48c8f32912971ff0cd361dd5eac9c9f7cc5df4e9375033fc8d5a287359bbeeb73544d631515e1
+MISC ChangeLog 6412 SHA256 4100cad59ade8d958d25869c216b36e624b0213d0caf75884139d2f615bfe2cb SHA512 709cea232603969d2eafe2eda9f4458dff6985ef56addc0c68a66af524533b255a171770cd324b1012c10503408343b245f7c037809db32e4d9ea5e939f16f60 WHIRLPOOL 8f8f7c0825a10fecb5813e78520977148fd21743e349cf6e342a0479352d159c5f37f2b85a182024a36b348c8fbb58b835998241f31ec24de76a937f4eb8b2f1
+MISC ChangeLog-2015 21798 SHA256 4623f854e4c43c60f894bd3f6d4ff4475857408493097d9bfd0295a3a61bd939 SHA512 08d90bd46c16548a31fa2b8406e69ea3901ad8d29242bf2571af99eec1fe95e24129789757a62b116986951e6d386dbf6e3be0fa991c3c1ede07cee87232cf42 WHIRLPOOL 87d9c3efd7f2574951297a67a90bb036c11b7dc452ad35993a78bb201214d63ad70c11770a6f1c434894711c5613ebccb6a22971393bc2bcbb0c5ac5e3a0fb53
+MISC metadata.xml 421 SHA256 968d1dab6c82064188793b82a79bea3413049d3ffa0cb91938672435fd5f494c SHA512 eecf30c4aa114f3b067b5761907fdcc52994b59e675eff946eae1e72ff26c7e17f9e7afd9ae78888e455a49ef29bef2688ea35e1da4f2251df1c6a62eaf769b6 WHIRLPOOL cba0627740529f5d450c8deb968999f67643a466714cd44f0a3910a177f1a0c079b6b98ff0b449c7f0db5a3b73f577d8292c29809cd4a232593b1076c9c4f3df
diff --git a/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r1.ebuild b/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r1.ebuild
new file mode 100644
index 000000000000..f31e0f944d4f
--- /dev/null
+++ b/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r1.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+
+inherit ruby-single
+
+DOCBOOKDIR="/usr/share/sgml/${PN/-//}"
+MY_PN="${PN%-stylesheets}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="XSL Stylesheets for Docbook"
+HOMEPAGE="http://wiki.docbook.org/DocBookXslStylesheets"
+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 ~sparc-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
+
+src_prepare() {
+	# 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/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..77db5fdb1ab0
--- /dev/null
+++ b/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r2.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+
+inherit ruby-single
+
+DOCBOOKDIR="/usr/share/sgml/${PN/-//}"
+MY_PN="${PN%-stylesheets}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="XSL Stylesheets for Docbook"
+HOMEPAGE="http://wiki.docbook.org/DocBookXslStylesheets"
+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 ~sparc-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..f99be59a688e
--- /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/Manifest b/app-text/docbook2X/Manifest
new file mode 100644
index 000000000000..4579fdca2577
--- /dev/null
+++ b/app-text/docbook2X/Manifest
@@ -0,0 +1,9 @@
+AUX docbook2X-0.8.8-drop-htmldir.patch 327 SHA256 34e2b9e4f013a7abdaba5452887b79c1fa75bc147de2aaabbbd1ef9a4161e72b SHA512 c8e3cbbf1f18aeb5489d12f8fd661c38adae7e60ef3861135ff0aa3c515cc509ecc9ae19ace81e94cd181dac15b08bbb4783b39bd96674bdc83abc95aac5ddcc WHIRLPOOL a0a3a740a1832d3b16c354ef48e7ddc8f0f78f7597c731d40ced42aa2024ad9d844ed136535675a41f89c922531d2316247a46330fb3a159ab8146accc4b1bb5
+AUX docbook2X-0.8.8-error_on_missing_refentry.patch 1247 SHA256 273eaa08cfff75bb5fab4975761d1e427e4180d82700da396901a59ed0546c0d SHA512 ea9ed94190edb2ac2055694bb927457f94eeadf0eff340b9f5fdba6fad5b1dc0b9617829ce3470914cbe0ba0be145dfb000218d57f22ee767ebb8082d6c06bfb WHIRLPOOL 7a406d599e85df95be73dbfbdc3bcb60147575fd32240d863056416c852fcb3b14ee3eb8099363006cea8ea238125ef181b6bd0aab38915c7f77636a8d7d0fdb
+AUX docbook2X-0.8.8-filename_whitespace_handling.patch 2080 SHA256 ac5755da0dbdd67e7131284e865d86df24a56ac26cfbcdcdbe561926a54999fd SHA512 3a72979c03a1b5135662ad5cedefd0d508001994e727a0820d628ff5ad2476c09befeb921b9562230fdec3db547e5eec4b301aa08430dd6c2ce2632624a1c375 WHIRLPOOL 8430e967ea8020dde623079e49d309f0f920ad302e41bd68f4004ad135879a7c1594f23e0776ef4ac4a2bf39cdb6392e22bbd31fa18a65a5419015d633bf42ac
+AUX docbook2X-0.8.8-preprocessor_declaration_syntax.patch 3358 SHA256 0f571f0e9576ef09a07c46da76723cd3f83085ccf8daf25dee15b9921455112a SHA512 af88626ca61847a25ef8c4cf8a09ea27cd1dce6510952e9629b704d3637097b10d85b9727e502dd7eecea1d2152a71cd26bf6abf4a8370eb8647258faa30be45 WHIRLPOOL ab0af93c225825a39e18992b7139f2e5f2a5829e6b25fc6861dd6929f02314136fa84cd0c4336259747bec38a8447ca119c1ffac0357f5d681ef10cff403cd8e
+DIST docbook2X-0.8.8.tar.gz 723909 SHA256 4077757d367a9d1b1427e8d5dfc3c49d993e90deabc6df23d05cfe9cd2fcdc45 SHA512 cc336017ad734fc62d96d289105e8ea154c418a03a37f3e21b0b3520063f8b466b4aae5a5aec2e0b83f6324c6c79b5557247a93338d0a9882a94a44112f6b65c WHIRLPOOL 60cf325cbb9dbc7e0edc3a7bc4beb061259b22602efae54335f3828417c593ce7cb4c838eb33d598e1e6c2b2583e93eafbdfab37dba2873f1d8abaa72ed07b95
+EBUILD docbook2X-0.8.8-r4.ebuild 1564 SHA256 d5e307dc746d442c29b3e301e3272ae7511514f11f321c10e5c90b017bce24ba SHA512 7718a0eadc029faa32d909e5374d9bd86fc3a61281dc03405064e8ed46de0129f0f26ce1b32270bd4e80b7fb92f3dcf134ae05e44f28e603b5e99d250e2b26ff WHIRLPOOL 2afe5492c7962a22b8576f00e71a217d6ec926978659327eef6b3a4780fa86474c847dae652bdc8aeaf92891448f8cc1ef13e5b9449f878218526bdb781843e4
+MISC ChangeLog 2760 SHA256 f341758e0da3b842dbbd6dbfed8daa7b0b2a8964b5b8f5deadb65bf5a4b7c9fa SHA512 f14d1e858f1e9009fa95538ec18e1f952c7dcc174efd813ce012228554d6c30b331d297e817d4d48e53e675f955c43e2954696488ec61746c91d6416efd55c78 WHIRLPOOL 2973143d11d9b2fc84991e8915d0ba95184f4a9c379fad1a1ecef06f4c39b3648ff0a9cff45c9b908f98f0d894cb57e57604575e443fbd17b501a73b5a139aec
+MISC ChangeLog-2015 8916 SHA256 72e51b4919dcfee8f271aa68c7cb52518119112983ab23ad2b6b6d1c246beaf8 SHA512 d1fb5c262d722342d54c4c285aac183a5fc43a1221ab258f2810cbcf96b516414053838bfea9d5e3d8c7ce381e8b3002a4d73899d6eeb2f63459f4ec27db5585 WHIRLPOOL 999c6a9e5d76756109441727256059fe1fe8bf6d8d5b8ace62ccc542d8206d93565af5f6ffc73b9e7ec6a0986411b363d6f2e94edd7dc3e04ef4e8c6f51fcf47
+MISC metadata.xml 246 SHA256 415e69d38d05c0e7c775484274a3a88a24c0105e6b0997943fa8903a33efb7d7 SHA512 751233aacee2a81a9b2e02bf872dc788d2fe39fa6d6b3781146dbd19e4eebf5854620b2ae9d62e0d4dada2a64903ecf789e94b3eefecedd131808bc575617759 WHIRLPOOL b1703a7e342b70b955918eb7c1761be1509dcb879e0c80d17309078f07ba1830cce2b7d105a5a871d0dae1f4890e8032580c3bb359006296326e42e5dff8cc8b
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/Manifest b/app-text/doconce/Manifest
new file mode 100644
index 000000000000..542674741601
--- /dev/null
+++ b/app-text/doconce/Manifest
@@ -0,0 +1,3 @@
+DIST doconce-1.3.tar.bz2 112034753 SHA256 dcb63fdc86f035664fa0b283b21ff3af37fc519de8a67e2f73d161df0dedc8e3 SHA512 b59568e801f4cc5b7f01f3c3d344702ec80c65b5a065e2ece3b3ed8cb5f669739c9adf3caf96cd0b43c646ccae0f11325d5ca64ee1a325ac404ec6e5feb6148d WHIRLPOOL b4d03f6b8bb7ac0a950c4c362234ac2630f7449301f89d5c2bd93c02e4e7d5daa198863f6d20b71d7bc81170f5326ac2c79de4307937b022e06400a8298586b6
+EBUILD doconce-1.3.ebuild 513 SHA256 a2a01317377eb3d440ec4d43c1e45e3e1a207b826411a7a96f921cfd4fd4afe9 SHA512 6c301a4e339c2764794f98186ebfa3fa8ece1f925f096a275f2c6ae78523cf74e55a9960c349e701f732b32d0305f556f8114141f8b8f1725fadd2b104d3617d WHIRLPOOL 27e4983eaa97f03f2f73a4a1f760397df8153f6b591cceba5b1f0226b643849184299500441f5c29ed3def8da75ab27dceaefa6100774d2c7bc25b813bebd355
+MISC metadata.xml 889 SHA256 f637972e011c82e6b031cab5610c8fd9fe15565389934b31e8c9110357a1d218 SHA512 a07b96f67cf20d3a5bf72e3e8b0c518db54ec034eed091ef1a00d32383c06591a4bcdee4af94a0f89299ca8da0f5caf8aed7c0a783b0f58d96870e3fb4715d4a WHIRLPOOL d0604ac818b138006afaafb8a0042fa11e84d78fbb0ae67cf5c8a13ce5c42b180a7807c7f62e2e716d3627bc7a0cb5b43b5def90c744e30eaf93c288624a477c
diff --git a/app-text/doconce/doconce-1.3.ebuild b/app-text/doconce/doconce-1.3.ebuild
new file mode 100644
index 000000000000..3653bc76b98d
--- /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.python.org/pypi/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/metadata.xml b/app-text/doconce/metadata.xml
new file mode 100644
index 000000000000..ce47b04dd0ff
--- /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">processing</remote-id>
+    <remote-id type="github">hplgit/doconce</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-text/docx2txt/Manifest b/app-text/docx2txt/Manifest
new file mode 100644
index 000000000000..9c59b1aa0b33
--- /dev/null
+++ b/app-text/docx2txt/Manifest
@@ -0,0 +1,10 @@
+AUX docx2txt-1.1-paragraph-newline.patch 220 SHA256 b48b287c296dd1ad66a8ecbf76ee9507773864ce63a7515804d2a9b94a59f605 SHA512 07d8686e1bd1f5ad1b18a5a3559667243dd9e580dff52711090843d5814736a371c382c2ad12d2dd01bbd827acc9a6f420d34f3ff4d02f9fb5864c07e86ec39f WHIRLPOOL dc934195322ed1b8d4d93e9ab8552a8ab506a35a53b6f8fc8fb948e0c0c25514b694ed16883923196a907eb7271b6386418d1ce38d2e932109edfd50573d6ffd
+DIST docx2txt-1.2.tgz 28483 SHA256 33649d1e8c4f86df897d478376cf76bd9f2aed27a952aaa96c615bce976488cf SHA512 ba5884c4d85e23aad26f74727b40e2d9d43cdf2e63f270486cbbfed5ef431f44f8f40a2583d3185fa3c16a97d9cd78e84feaf8f1f7be78ae9e1662e04a2013d6 WHIRLPOOL 8bf767eee6ec4768fddefc0c480bf6f5c41f21c7e5128771ff465de2884654ef462c6b226f4c01f0ff244c8f73f5edade184240d3854f942c2102b53c00a3cdb
+DIST docx2txt-1.3.tgz 29953 SHA256 ece1689e204c961a962bb339b87ecd9fb009cdc01a87a4d658819a3313a90ece SHA512 9ad74558074cd3e72b0d2e6541dc56d7b74d59d6313fb0cde1b2f02a0e1cdb05d705a650c0dde02e5b3a683f8ee6ab2fb5b865301f4213cd3e8770cd9e4d0d97 WHIRLPOOL 3580c0caa69f5d35963daf17f637452e02d748eb7eb02579049f087d35a202c5f611bbee9dc8cbd53a98776f77870379f83316c1840ab2105cd98600009abc4e
+DIST docx2txt-1.4.tgz 31302 SHA256 b297752910a404c1435e703d5aedb4571222bd759fa316c86ad8c8bbe58c6d1b SHA512 5e59cd4065f409c20e17b29d3935a2637147392e86a325b28b78748d3b3867ce91f14f3349621b3c95b2ce6a8e38e33cf0816d1f9dccbebfdde9ba29fbd7f5b3 WHIRLPOOL 7f9f53c4aaa45a60ffa4a4e19b727e0898c9d39dabf3685317ee664a8723ed75fe8da4711ce06b8b06132ce304e29613fef331b53d0e54551e79fb1ea67fdf76
+EBUILD docx2txt-1.2.ebuild 575 SHA256 506734c56358efee819e2972145bee8b75aadb66fe1e219bae33229ba5516082 SHA512 4bdfb666d79f5ebc7931dba558e51d856475b7dd2b7ba5880432cf6092c093e2292c24c2a0bb76009e4435b189beaf1c5a55e22edfb6c9df2835bebd562d9385 WHIRLPOOL 569e79e23a0a11dc2199805960f56d2d9cf601a9ace92f92294f827e26327703c6022ee56814c7a09649191071a72d0f72a6093cd9d5dcac79c85aa2d84d3cd1
+EBUILD docx2txt-1.3.ebuild 567 SHA256 8d59c31def4aaf1ecd54f627129ff1b7330bfd41c3a845bdab850a50f7c0e5dd SHA512 ac564249b0c17e504c0ddf1c1c08ae08cf3efce67cda334b98bf12bff6e5ac43607dc070319bb074aae7567c4d69dee8819d4d414732a0df1ccfbb28f5dfdad0 WHIRLPOOL 7a1b17aab6eaf59f3c634c543e9f7dde7cc36dc1fe5c8c91f42e0d421fdeffb35142dd5d012dbd2453085373f3e357dedc537619649f695f645fc9cde109393d
+EBUILD docx2txt-1.4.ebuild 567 SHA256 8d59c31def4aaf1ecd54f627129ff1b7330bfd41c3a845bdab850a50f7c0e5dd SHA512 ac564249b0c17e504c0ddf1c1c08ae08cf3efce67cda334b98bf12bff6e5ac43607dc070319bb074aae7567c4d69dee8819d4d414732a0df1ccfbb28f5dfdad0 WHIRLPOOL 7a1b17aab6eaf59f3c634c543e9f7dde7cc36dc1fe5c8c91f42e0d421fdeffb35142dd5d012dbd2453085373f3e357dedc537619649f695f645fc9cde109393d
+MISC ChangeLog 2322 SHA256 b7b64bead6d886bdbb7ae676c45d01477ac8d8cb76ddea6c85b20da6fa4573bd SHA512 e30e33cce4c2968008a42f72334d21d51dd417b43a11e64b6b22707924624b2b49aaa25d2cb21028343e85e3f56948f462524c6bbf883387fe72d014279f2258 WHIRLPOOL e56b4da8a32d8306762f7110fef9a2eb81059eb9a1186d2d98fcd5fd024df1ad5be078ceeda6a1efc205f5128467d9527785452f73d86516cedbb06c31f8d347
+MISC ChangeLog-2015 1168 SHA256 5c2b17276b8add248c6d2f63521460f82d2284ede348010c3a2b4fea73f6c880 SHA512 e78f7f6a55577b4691c919431ae7e05905ce87f201a053cc5b2cc27acae9cbed254d6d2b7c563319c785ccb5bb2c4f696bfa68975dec1c74061b76772b32c82c WHIRLPOOL 52a3770f80a76ee5094b5a004431495bf21edc5f00d0d8cc4364fdfc16976a4ecacf63b90d7acc0d26811f77bf826f546f6aa1717348809c5238edddbf815c66
+MISC metadata.xml 324 SHA256 80498274d6d9fec638018ef70ee3aaa54faeb0fc9793d22ce7a3413005345df5 SHA512 f350709b5ea69be8bf2912b0bac7d26d3cc0828f5674d4c4d0b19fc79e1d1a65a636a25165bcfdd93f998cc4fd0a27cc3f15ab3b8c5b9bdb7ab201ad639a32c4 WHIRLPOOL b94a79485a6cfb8ee53c5b58fde92d38a86d2a20a64afd168e0626c540f164cb4ac2061c7a25c519d69f145fd1e306dc769a38b1e88e4225919e40ce7686b932
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/Manifest b/app-text/dos2unix/Manifest
new file mode 100644
index 000000000000..a351156fffea
--- /dev/null
+++ b/app-text/dos2unix/Manifest
@@ -0,0 +1,7 @@
+DIST dos2unix-7.3.4.tar.gz 640991 SHA256 8ccda7bbc5a2f903dafd95900abb5bf5e77a769b572ef25150fde4056c5f30c5 SHA512 29958a2c702acc112b10f3fcb43fbff3b860c6d1f725c153af9a52dc20736755604f77bec37299dc88923a9e9b2ad73b994e9bc6f42f2757fe1819dd9873d710 WHIRLPOOL 46c771c63572d0d0301db5bde4734297df037654cbc71e5a8f93003fbf503399ec5026bc53fea3b3b10e346e2b59d24bdcd6d9139342354cdb1b8a6e240deaeb
+DIST dos2unix-7.3.5.tar.gz 662133 SHA256 a72caa2fb5cb739403315472fe522eda41aabab2a02ad6f5589639330af262e5 SHA512 beafefa715d894ec51bd808b18485bcf413f93b888203486e659f7e30b922b32b2f1da2305ef9ae85e54085ba3819bd512957bb872b529fe4728000cec7d3e58 WHIRLPOOL e1cda793c7e9a2b0f0000c61f5c4b9a48db37d41020af14e253b838768e81b0e94ea7a0666be712f79f89b05e5a6f72a1bf8516a01822f5da39062cc0bedf01f
+EBUILD dos2unix-7.3.4.ebuild 2026 SHA256 2740f83a639d0e3de27e615e429dbbd9bc61a6ba67addcea2ff5514f9d288e71 SHA512 5e251e9ff961e07e91fef0c462d32f4e3b0ad7b7cfbb38a35b11c9a784b79256a4a4073a55adc4e96ff67fc896f85f2d007662cef8cfb09061709a02ddb4d760 WHIRLPOOL 3a6302216ca7ffc009902dae8475991151f0dcb9f8a38b7b46deb2a05b54eb6fc0388021130f911a2af5c36006631bbbfa4ace248a5614319da0cf2b3c77c923
+EBUILD dos2unix-7.3.5.ebuild 2046 SHA256 c619db5f4357058ed36ddc65f95fc97996c4a5886863211c4dbc488d245a393c SHA512 27fc2bd3e3e43512d4ab571ca5ddfb4f6ba8e0940eb8bd65c9d90f0c602822334f5789f3a2101311006fb614708ca32396ae8c3d24b8b313aa9248c8cd76d350 WHIRLPOOL a56b643af417670b4eff43acbd543dd688e1f2dac13f46f673d54f45529900456191815a5fea34690ec73396b40adf1aed94e9e6104bf5754855ef9173fa7c67
+MISC ChangeLog 7196 SHA256 4a2c232190d6729640540918b5be7b533c2edaaa445f850cc6a47b9c3a59f04a SHA512 66da70a04731f3bd299bc577885b31e3c278016b38b1f5228394a384f960c49a0c3e97154ec82ef1489c9a9fce195077254240e458f649037e6859b0c060fe50 WHIRLPOOL 48484b065ae3a96f6c15a454e701ce60cac060d2a1e1466afc29d18544ca2f9d2d5cddb60820b6d8f400c568d1a2386febc868662587b5ddf6c9996ec7adf5d3
+MISC ChangeLog-2015 19680 SHA256 99b0f5f0d9a2a0ae8117f683cd295d8a8c5b0cfc2208325fc96cdb7c6ad416db SHA512 6921c2763ca5d07eba46899fc0ba3869042972fc9d60e85c835eb50d08b56ebc6a176a64d1e808802b1afe5ea7b6c2ad74f773fc50e55fbd83ee224c317a003e WHIRLPOOL f9e49b2959b16982e507cd9b67e24d9d5fd535d1b61676f1621a012ec2c15541a5382ab54aedd635669c13be995ce008d77dc52e0110c168da42a6d407465cf5
+MISC metadata.xml 343 SHA256 accb2d04b009f465af9d869da452b1c3d87b42cf599aeb5dad3a9fee04d3d225 SHA512 12f79ed9fdd8df3c05110ea2a31123ca92a855cdf9287910802cb4e68c384764cc84c29929376426b23bfe9699574dbbdc2105d82c6e2701aa9fe67079d867f3 WHIRLPOOL da97fdf7c8ac3e5877f177dfc34336c261e7317551ded69c7e4cdc92569091ff2d6b6f491995c3cb57db3483a5136ac0a9bba8c2471025b31bb290e94062f1f1
diff --git a/app-text/dos2unix/dos2unix-7.3.4.ebuild b/app-text/dos2unix/dos2unix-7.3.4.ebuild
new file mode 100644
index 000000000000..3b4310036b01
--- /dev/null
+++ b/app-text/dos2unix/dos2unix-7.3.4.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 ~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.3.5.ebuild b/app-text/dos2unix/dos2unix-7.3.5.ebuild
new file mode 100644
index 000000000000..7e09f7d15bea
--- /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/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/Manifest b/app-text/duali/Manifest
new file mode 100644
index 000000000000..8bc4738f0ccb
--- /dev/null
+++ b/app-text/duali/Manifest
@@ -0,0 +1,5 @@
+DIST duali-0.2.0.tar.bz2 13334 SHA256 898045bb4d36e9d4e2292c8e308ccd483dad47115ccb107cdfa41a9b9a46472a SHA512 9234647b722a54fce8f947f2f0eb8cc121e5bdd32bcf606bc8ff71854eaf68655474e374b3328b2a20af58484e5962dadf716bc220f7fd697a8cfbb99afb2d30 WHIRLPOOL 3c2e3bd136a6353cd126c2aa30db5d73739d9dcc88fc4ea9d11574833135eb2ba145696cb835f1752045dab5c7458fc5dd51ea6f4d050e32893b6d00fe0f400b
+EBUILD duali-0.2.0-r1.ebuild 946 SHA256 e5a6e5ca5971272391561dc0ea64e97803ab600fca5dc524dec4e710fae0661c SHA512 76f7b3f2cef67e6e6c46c93e9f4fbac440a7fe0d4ff4d34e276d3ba918868d6c7c2750f6bb09226ee33950888b1853705daed2ef46f5c447c60163dd7fbd3762 WHIRLPOOL f1bd7f6abe16e32f6b275578c3fbac7012af59c869fd733d3891d62dfbdd3114eac2bfcd48bf30c9f0ec3350043d9326262a44cee5481ca2b111889ca04498b2
+MISC ChangeLog 4143 SHA256 86ccbac5d6553faa4d8c7b5b6056d2ecdec637cd0552135e2f601e01b0c41586 SHA512 13590e46a2119366db29e4ccaa06739dd2e457e569ce9ea3737fefaab76d882288f4df76e9e3f513eeaf3d80c381177673ee0b52e9a40efc2b74ba122858fe82 WHIRLPOOL cdb894298be5500e14b6dbe6848e22a424b7d6ad4938b8f790ccbfe7d77844013a711ff098ea875a061735fef63bcb91ee3d36b00f147bca8c02869af3e23bb1
+MISC ChangeLog-2015 2264 SHA256 44eec026d1622c80908f566b70c900c0f44f513796d0ea337473f7123df983da SHA512 f617a6258d68e6fc41d84ff68fd67c61cc8e9340dd1944da99818034c6878122edff330e85a32b98993a671ee963a89fc3f2e3fe06ff82a9281101cc9f6bf645 WHIRLPOOL 8a6a5e58a4285e9d1be1baaa00603025fb8865bf16014f4b3cec94abd66a31ef44bebed104b26505328c371a34fdadc4f96c5f0ce4020c376d0441409358721a
+MISC metadata.xml 245 SHA256 b1ba64436af220fdfc3060f10fd506bb56a87ac574b51885d672f110c83e5bf5 SHA512 5cf81ad67c841f8eb5a71ef18b6ae6c344d68fb63c80c21f4a9b9a0060de938264530276a152eb5451dd88a5955f04a48c8cd4d034be6bc7a1922b5e4f43539f WHIRLPOOL 99bfe54c3b1f17bd70d63f6cfaae2af82dbe19f6256d755fda680766d7fb220ea1e0ea25a1ffa8057032eb4e07130852168a09cd6e58bc3f0041487b9d111af9
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/dvibook/Manifest b/app-text/dvibook/Manifest
new file mode 100644
index 000000000000..dbace97ae503
--- /dev/null
+++ b/app-text/dvibook/Manifest
@@ -0,0 +1,6 @@
+AUX dvibook-20001129.patch 6625 SHA256 f406a7c7200d6b2ecbdb37065ef4b89d71107c6c7f35e5080aacb6c7488d2a31 SHA512 9e5ee7d42da5c77061ea0c59d4784cf1c0e197c03d37586cf9f2d13bd4c740149b9100609a98c1f7aa4a71b80cc4f7328c65cc40b3c476bcb0d672da091cc8cc WHIRLPOOL 042854068dbbd45f6c883f93f0c164ff9012cb7149cd810e6e5b3ef9c71ad59c3504529e325e3ab6ae08e70c9953942ade90f0a02872f9a25a7c204f5ed076ce
+DIST dvibook-20001129.tar.gz 141312 SHA256 d0217d94ecc8c15f4d5aafe94d63e26de5957882a14ea4bdd95f518bd31f125d SHA512 7d9991d8d870951f3e68a5b931ea05466b85dd5b23c5f62ebe3e4c2ddc0650677a0e65f506b7b66938f297a95200879cdbe3370e3e3a92b68bab1b671923d590 WHIRLPOOL fb5251b7f072d26201099674fb5509288bbec6629646810551ea1b1a56665a530ba1779edd56e16e19021d1843664c4e16be27a7bb79189f7d906f27e84b1439
+EBUILD dvibook-20001129.ebuild 731 SHA256 689b2c2cb783cff1507ef35b6ae09614728d95a3d6efcc96502dff7900894ebf SHA512 0eb857c5ea94cb491a785de3b5a6baa34ddde24f342cc452d0280e88785b3427ab097803b88b3f92667fd805725ed8987815eaee2163dfde1d914144c56839a5 WHIRLPOOL b12c76053ab7fc1d548a474bc7d7c2f0c5fc9ac52576c46aadc752faee3fafe2f9896bb88961f464faa723b358053dfb6052a290990f3da373949ac8fc0f8855
+MISC ChangeLog 2464 SHA256 f0c12b91cdfaa326266ca44a8daf8bb55e1d6076cf364cf4a053e8b1fa3dd8cb SHA512 8fdf22d0207dbc2295351de7349e56e2b404e380cd6c8010e691f84b6aacda2de74fb77f34f7cada7cc1c75bb4271d8f7ca6fcca88130abd1c79fe95ebfe2638 WHIRLPOOL 152ae8154a3db4c96fa500776d5e3b824e6d81a1af47749dde68f4ccae852622c62b4bf6fb71d89748297d8a66df2ea288b60faa664e8dfdacc249d2c05b4d26
+MISC ChangeLog-2015 1517 SHA256 88634770a01781228b5ca46c5d1d22b9b5ba63604f09243e7833d5617acc8a42 SHA512 41600f4a90664cfdcd4682185a52e30b4679a77258da042421e47671fab216d876de9184e79c7b113effe7bbfb212fbac454d1d324fb63314b4f3a3313600254 WHIRLPOOL 938edc597db944614102f0d6a7708e1f2e88068ee75ae312fb819004009d0f8c470a42fb5aa5389551586100fa29b1c6c7b0fd526bd529addcb76edb5101afb2
+MISC metadata.xml 245 SHA256 b3de478821488be2cdc91b078e21c911dc384af882c5c44631a47dfa91516dc8 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690 WHIRLPOOL 701a78fc2214f5fd4bd781477f85e87e716b8d76ea831a0fa4afc8871c4286cc363679f1ff4f844555ad4f77cc7265208b83e805f56c22fc4baeed1062280c08
diff --git a/app-text/dvibook/dvibook-20001129.ebuild b/app-text/dvibook/dvibook-20001129.ebuild
new file mode 100644
index 000000000000..bfe0374149f5
--- /dev/null
+++ b/app-text/dvibook/dvibook-20001129.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit toolchain-funcs
+
+DESCRIPTION="DVI file utilities: dvibook, dviconcat, dvitodvi, and dviselect"
+HOMEPAGE="http://www.ctan.org/tex-archive/dviware/dvibook/"
+# Taken from: ftp://tug.ctan.org/tex-archive/dviware/${PN}.tar.gz
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="dvibook"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc x86"
+IUSE=""
+
+DEPEND="x11-misc/imake
+	x11-misc/gccmakedep
+	app-text/rman"
+RDEPEND=""
+
+S="${WORKDIR}/${PN}"
+
+PATCHES=(
+	"${FILESDIR}/${P}.patch"
+)
+
+src_compile() {
+	xmkmf -a || die "xmkmf failed"
+	emake CC="$(tc-getCC)"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install install.man
+	dodoc README
+}
diff --git a/app-text/dvibook/files/dvibook-20001129.patch b/app-text/dvibook/files/dvibook-20001129.patch
new file mode 100644
index 000000000000..595ac98ecac5
--- /dev/null
+++ b/app-text/dvibook/files/dvibook-20001129.patch
@@ -0,0 +1,253 @@
+diff -Nur dvibook-orig/Dvibook/Imakefile dvibook/Dvibook/Imakefile
+--- dvibook-orig/Dvibook/Imakefile	1994-03-19 01:00:00.000000000 +0100
++++ dvibook/Dvibook/Imakefile	2004-07-08 09:24:05.038918792 +0200
+@@ -1,24 +1,15 @@
+-OBJS	=dvibook.o
+-SRCS	=dvibook.c
++#include "../Imake.Config"
+ 
+-      LIBTEXROOT= ../
+-      LIBTEXSRC	= ../libtex
+-         LIBTEX	= $(LIBTEXSRC)/libtex.a
+-      DEPLIBTEX	= $(LIBTEX)
+-        DEPLIBS = $(DEPLIBTEX) XawClientDepLibs
+-LOCAL_LIBRARIES = $(LIBTEX)
+-
+-        DEFINES = -I$(LIBTEXROOT)
++         BINDIR = $(TEX_BINDIR)
++         MANDIR = $(TEX_MANDIR)
+ 
+-FILES	=Imakefile dvibook.man Makefile.raw $(SRCS)
++          FILES = Imakefile dvibook.man $(SRCS)
+ 
+-all: dvibook
++       INCLUDES = -I$(LIBTEXROOT)
++LOCAL_LIBRARIES = $(LIBTEX)
++        DEPLIBS = $(DEPLIBTEX)
+ 
+-NormalProgramTarget(dvibook,$(OBJS),$(DEPLIBS),$(LOCAL_LIBRARIES),$(SYSLIBS))
+-InstallProgram(dvibook, $(BINDIR))
+-InstallManPage(dvibook,$(MANDIR))
+-DependTarget()
+-TagsTarget()
++SimpleProgramTarget(dvibook)
+ 
+ tar:
+ 	cd ../..;\
+diff -Nur dvibook-orig/Dvitodvi/Imakefile dvibook/Dvitodvi/Imakefile
+--- dvibook-orig/Dvitodvi/Imakefile	1994-03-19 01:00:00.000000000 +0100
++++ dvibook/Dvitodvi/Imakefile	2004-07-08 09:24:05.039918647 +0200
+@@ -1,24 +1,15 @@
+-OBJS	=dvitodvi.o
+-SRCS	=dvitodvi.c
++#include "../Imake.Config"
+ 
+-      LIBTEXROOT= ../
+-      LIBTEXSRC	= ../libtex
+-         LIBTEX	= $(LIBTEXSRC)/libtex.a
+-      DEPLIBTEX	= $(LIBTEX)
+-        DEPLIBS = $(DEPLIBTEX) XawClientDepLibs
+-LOCAL_LIBRARIES = $(LIBTEX)
+-
+-        DEFINES = -I$(LIBTEXROOT)
++         BINDIR = $(TEX_BINDIR)
++         MANDIR = $(TEX_MANDIR)
+ 
+-FILES	=Imakefile dvitodvi.man Makefile.raw $(SRCS)
++          FILES = Imakefile dvitodvi.man $(SRCS)
+ 
+-all: dvitodvi
++       INCLUDES = -I$(LIBTEXROOT)
++LOCAL_LIBRARIES = $(LIBTEX)
++        DEPLIBS = $(DEPLIBTEX)
+ 
+-NormalProgramTarget(dvitodvi,$(OBJS),$(DEPLIBS),$(LOCAL_LIBRARIES),$(SYSLIBS))
+-InstallProgram(dvitodvi, $(BINDIR))
+-InstallManPage(dvitodvi,$(MANDIR))
+-DependTarget()
+-TagsTarget()
++SimpleProgramTarget(dvitodvi)
+ 
+ tar:
+ 	cd ../..;\
+diff -Nur dvibook-orig/Imake.Config dvibook/Imake.Config
+--- dvibook-orig/Imake.Config	1994-03-19 01:00:00.000000000 +0100
++++ dvibook/Imake.Config	2004-07-08 09:24:05.039918647 +0200
+@@ -1,8 +1,8 @@
+ /* * Install directories for programs not related to X */
+ 
+-TEX_BINDIR = /srl/TeX/bin
+-TEX_MANDIR = /srl/TeX/man/man1
+-TEX_INPUTS = /srl/TeX/lib/tex/inputs
++TEX_BINDIR = /usr/bin
++TEX_MANDIR = /usr/share/man/man1
++MANSUFFIX = 1
+ 
+ /*
+  *	Set `FONTDESC' to the location of your fontdesc file, unquoted.
+@@ -189,7 +189,7 @@
+ /*
+  * 	 Undefine GETOP if your loader complains about multiple ref's.
+  */
+-#if 1
++#if 0
+   GETOPT=getopt.o
+ #else
+   GETOPT=
+diff -Nur dvibook-orig/libtex/error.c dvibook/libtex/error.c
+--- dvibook-orig/libtex/error.c	1994-03-19 01:00:00.000000000 +0100
++++ dvibook/libtex/error.c	2004-07-08 09:24:05.054916460 +0200
+@@ -21,7 +21,7 @@
+ #include "types.h"		/* for HAVE_VPRINTF */
+ #include "error.h"
+ #include <stdio.h>
+-#include <varargs.h>
++#include <stdarg.h>
+ 
+ #if defined(lint) && !defined(LINT_ANYWAY)
+ 
+@@ -34,12 +34,9 @@
+ /* VARARGS1 ARGSUSED */
+ void panic(fmt) char *fmt; { exit(1); /* NOTREACHED */ }
+ 
+-#else lint
++#else /* lint */
+ 
+ extern char *ProgName;		/* program name from argv[0] */
+-extern int errno;		/* Unix system-call error */
+-extern char *sys_errlist[];	/* table of error number => string */
+-extern int sys_nerr;		/* size of table */
+ 
+ static FILE *trap_file;		/* error diversion file, if any */
+ static void (*trap_fn)();	/* trap function */
+@@ -143,10 +140,7 @@
+ 	(void) _doprnt(fmt, l, fp);
+ #endif
+ 	if (e) {
+-		if (e < sys_nerr)
+-			(void) fprintf(fp, ": %s", sys_errlist[e]);
+-		else
+-			(void) fprintf(fp, ": Unknown error code %d", e);
++		(void) fprintf(fp, ": %s", strerror(e));
+ 	}
+ 	(void) putc('\n', fp);
+ 	(void) fflush(fp);
+@@ -160,18 +154,11 @@
+  * Print an error message and optionally quit.
+  */
+ void
+-error(va_alist)
+-	va_dcl
++error(int quit, int e, const char *fmt, ...)
+ {
+ 	va_list l;
+-	int quit, e;
+-	char *fmt;
+ 
+-	va_start(l);
+-	quit = va_arg(l, int);
+-	if ((e = va_arg(l, int)) < 0)
+-		e = errno;
+-	fmt = va_arg(l, char *);
++	va_start(l, fmt);
+ 	verror(quit, (char *)NULL, fmt, l, e);
+ 	va_end(l);
+ }
+@@ -180,15 +167,12 @@
+  * Panic (print to stderr and abort).
+  */
+ void
+-panic(va_alist)
+-	va_dcl
++panic(const char *fmt, ...)
+ {
+ 	va_list l;
+-	char *fmt;
+ 
+ 	SetErrorTrap((void (*)())NULL);	/* shut down any trap */
+-	va_start(l);
+-	fmt = va_arg(l, char *);
++	va_start(l, fmt);
+ 	verror(0, "panic: ", fmt, l, 0);
+ 	va_end(l);
+ 	abort();
+diff -Nur dvibook-orig/libtex/error.h dvibook/libtex/error.h
+--- dvibook-orig/libtex/error.h	1994-03-19 01:00:00.000000000 +0100
++++ dvibook/libtex/error.h	2004-07-08 09:24:05.054916460 +0200
+@@ -8,7 +8,7 @@
+ /*
+  * Errors.
+  */
+-void	error(/* int quit, int e, char *fmt, ... */);
+-void	panic(/* char *fmt, ... */);
++void	error(int quit, int e, const char *fmt, ...);
++void	panic(const char *fmt, ...);
+ 
+ void	SetErrorTrap(/* void (*fn)(int quit, char *text) */);
+diff -Nur dvibook-orig/libtex/gripes0.c dvibook/libtex/gripes0.c
+--- dvibook-orig/libtex/gripes0.c	1994-03-19 01:00:00.000000000 +0100
++++ dvibook/libtex/gripes0.c	2004-07-08 09:24:05.054916460 +0200
+@@ -14,12 +14,11 @@
+  */
+ 
+ #include <stdio.h>
++#include <errno.h>
+ #include "types.h"
+ #include "error.h"
+ #include "gripes.h"
+ 
+-extern	errno;
+-
+ /*
+  * Cannot allocate memory.
+  */
+diff -Nur dvibook-orig/libtex/sdecode.c dvibook/libtex/sdecode.c
+--- dvibook-orig/libtex/sdecode.c	1994-03-19 01:00:00.000000000 +0100
++++ dvibook/libtex/sdecode.c	2004-07-08 09:24:05.055916315 +0200
+@@ -10,7 +10,7 @@
+ #endif
+ 
+ #include <stdio.h>
+-#include <varargs.h>
++#include <stdarg.h>
+ #include "types.h"
+ #include "sdecode.h"
+ 
+@@ -21,7 +21,7 @@
+ static int sdset;		/* flag says whether cclass[] set up */
+ 
+ static void args(), badarg();
+-static int scan(), scan_i(), scan_d();
++static int scan_i(), scan_d();
+ 
+ extern char *strsave();
+ 
+@@ -80,6 +80,8 @@
+ 	int	di_bkw;		/* true iff keyword is in static buffer */
+ };
+ 
++static int scan(register struct decode_info *di, ...);
++
+ /*
+  * `Edit' the text in the buffer in-place.
+  * Return the count of characters resulting from the edit (e.g.,
+@@ -553,17 +555,14 @@
+ }
+ 
+ static int
+-scan(va_alist)
+-	va_dcl
++scan(register struct decode_info *di, ...)
+ {
+-	register struct decode_info *di;
+ 	register char *fmt;
+ 	register int c;
+ 	char **fmtp;
+ 	va_list ap;
+ 
+-	va_start(ap);
+-	di = va_arg(ap, struct decode_info *);
++	va_start(ap, di);
+ 	fmtp = va_arg(ap, char **);
+ 	fmt = *fmtp;
+ 	while ((c = *fmt++) != 0) {
diff --git a/app-text/dvibook/metadata.xml b/app-text/dvibook/metadata.xml
new file mode 100644
index 000000000000..13170c3184d8
--- /dev/null
+++ b/app-text/dvibook/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/dvipdfm/Manifest b/app-text/dvipdfm/Manifest
new file mode 100644
index 000000000000..26361de06875
--- /dev/null
+++ b/app-text/dvipdfm/Manifest
@@ -0,0 +1,7 @@
+AUX dvipdfm-0.13.2d-libpng14.patch 643 SHA256 8a009c2a0bacf7c175714e5fe96d01babf4fc4a2d415f1d3491c6c5fbbee9c6f SHA512 3eee7c8f811eeee4adcf597f0ec011f2a5237c076ac7e82bf46e55b61ceaeba43201acbca2a39a7f13a59e787c7a607755bcf4c57fa9c47e5b6b2e7e6d8518ad WHIRLPOOL 6bd445a1e03addf7a7eac648231989b71d1bc9383fe33102b7883de8f990a45b46045d97ced45f9c8af4d160a811429c90db6e3671c63d93080c3905632a0e9a
+DIST dvipdfm-0.13.2d.tar.gz 236898 SHA256 fc21d4ef316fdd28cce7ce64a9ed3d2254ea1969380a5f52d131ec61d5fb73bc SHA512 f983c64d41920a0cd4b23fec666446c22a989670d0413da1a2fc028ce1ae7e30bbe8a1547be49c4f04cf3961166821613b8482213134086c115a12e6791f8e2e WHIRLPOOL 74cf6bcd1a26363f9236030226846d583506722fa041d3bc3b45513bd465ff84295dc9c444cdd3a1e19424fc8abae86f68f78148b8fdca878dcfb3a48d10f90c
+EBUILD dvipdfm-0.13.2d-r1.ebuild 1552 SHA256 90285164bfc400ec4a9a4a2bf9e02b2ab61901f972eff0cddbfc63161d4249d2 SHA512 8560dfa1f32004d55ec2d49b743f0186429ab14bd3a9c89bf227606d0822e7bda109cbfa58c806d208821fb47f12342b7239dcee39d6c1fa36f2c93d56410c95 WHIRLPOOL b733dd24ec03476aeb1230847edcc75ffa81ed8c71663fafdeaf7434b8fcc03010e153f76a7edb9e3f35b2a47f036d6f640478b5a4ab044ab5174ffeef852f22
+EBUILD dvipdfm-0.13.2d-r2.ebuild 1632 SHA256 e5de0f0a10fd0499285c74f02182638b9febc5d109bb58703ee26df6a5067ae0 SHA512 7b11347332ef9357902726eee20c9877ef2a59812f3bfa628e4daae1dd6322865b6f2ca672cc28c8c09047fa295ef5db0369da3b298909d89171c4d280ecf582 WHIRLPOOL 7824131b927b4e80ccb5d437b7bbba503a80f0f07d38efe1ac67e58684a11200ba01b0ad636db6e90fc9f723f35e3bc8662f97829f65d33a70eb0152a87dccc2
+MISC ChangeLog 2540 SHA256 5cd293fa4b32bbc0ada569ce686a810c3a7ad2f8687ddd84ac6ec2203d2610eb SHA512 46d5860c895101daa90b4d6c5677983cfec55863ee6a9205581f305bc0cee29bc2e7e2e6268cbe26383aa3cda2c27131cf858c4b1fecd7c7e0c1030deaf3dda9 WHIRLPOOL 9f940c0a64d295c565fa4b7b624c4f3d9cdc026315b75b4346b13bcad2e2742f928d2782d462f4fe40b2cc5002657082f51b6a304606ec47a5000e49b5508e13
+MISC ChangeLog-2015 4521 SHA256 9c501808f8f3148ac262cd8691e2da2a8494940fb66419cae148611bc13afa3a SHA512 c7be752bb2fba51725f409120751ca8de7dee04eacc49835a22acc97d97869703d9635c834f208ddc85775cb61f0ab41fe68fb0d19d93df4001fa1dbfd1af3eb WHIRLPOOL ba2cb0566c47ca0c7ab19c4da059e608141bc2c78396d5a3efb0891c482a63b959ec5f48c637de3da28097a1ec5f54fc0c59876c2aab0acff1d6430b0dec11a2
+MISC metadata.xml 245 SHA256 b3de478821488be2cdc91b078e21c911dc384af882c5c44631a47dfa91516dc8 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690 WHIRLPOOL 701a78fc2214f5fd4bd781477f85e87e716b8d76ea831a0fa4afc8871c4286cc363679f1ff4f844555ad4f77cc7265208b83e805f56c22fc4baeed1062280c08
diff --git a/app-text/dvipdfm/dvipdfm-0.13.2d-r1.ebuild b/app-text/dvipdfm/dvipdfm-0.13.2d-r1.ebuild
new file mode 100644
index 000000000000..153f75fad3d4
--- /dev/null
+++ b/app-text/dvipdfm/dvipdfm-0.13.2d-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=3
+inherit eutils
+
+DESCRIPTION="DVI to PDF translator"
+SRC_URI="http://gaspra.kettering.edu/dvipdfm/${P}.tar.gz"
+HOMEPAGE="http://gaspra.kettering.edu/dvipdfm/"
+LICENSE="GPL-2"
+
+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 ~x64-solaris ~x86-solaris"
+SLOT="0"
+IUSE=""
+
+DEPEND="!>=app-text/tetex-2
+	>=media-libs/libpng-1.2.1
+	>=sys-libs/zlib-1.1.4
+	!app-text/ptex
+	virtual/latex-base"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-libpng14.patch
+}
+
+src_install () {
+	einstall || die "einstall failed!"
+
+	# Install .map and .enc files to correct locations, bug #200956
+	dodir /usr/share/texmf/fonts/map/dvipdfm/base
+
+	for i in cmr.map psbase14.map lw35urw.map lw35urwa.map t1fonts.map; do
+		mv "${ED}usr/share/texmf/dvipdfm/config/${i}" "${ED}usr/share/texmf/fonts/map/dvipdfm/base" || die "moving .map file failed"
+	done
+
+	dodir /usr/share/texmf/fonts/enc/dvipdfm
+
+	mv "${ED}usr/share/texmf/dvipdfm/base" "${ED}usr/share/texmf/fonts/enc/dvipdfm/base" || die "moving .enc file failed"
+
+	dodoc AUTHORS ChangeLog Credits NEWS OBTAINING README* TODO
+
+	docinto doc
+	dodoc doc/*
+
+	docinto latex-support
+	dodoc latex-support/*
+
+	insinto /usr/share/texmf/tex/latex/dvipdfm/
+	doins latex-support/dvipdfm.def
+}
+
+pkg_postinst() {
+	if [ "$ROOT" = "/" ] ; then
+		"${EPREFIX}"/usr/sbin/texmf-update
+	fi
+}
diff --git a/app-text/dvipdfm/dvipdfm-0.13.2d-r2.ebuild b/app-text/dvipdfm/dvipdfm-0.13.2d-r2.ebuild
new file mode 100644
index 000000000000..91cb219c17d4
--- /dev/null
+++ b/app-text/dvipdfm/dvipdfm-0.13.2d-r2.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=3
+inherit eutils
+
+DESCRIPTION="DVI to PDF translator"
+SRC_URI="http://gaspra.kettering.edu/dvipdfm/${P}.tar.gz"
+HOMEPAGE="http://gaspra.kettering.edu/dvipdfm/"
+LICENSE="GPL-2"
+
+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 ~x64-solaris ~x86-solaris"
+SLOT="0"
+IUSE=""
+
+DEPEND="!>=app-text/tetex-2
+	>=media-libs/libpng-1.2.1
+	>=sys-libs/zlib-1.1.4
+	!app-text/ptex
+	virtual/latex-base"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-libpng14.patch
+}
+
+src_install () {
+	einstall texmf="${ED}usr/share/texmf-site" || die "einstall failed!"
+
+	# Install .map and .enc files to correct locations, bug #200956
+	dodir /usr/share/texmf-site/fonts/map/dvipdfm/base
+
+	for i in cmr.map psbase14.map lw35urw.map lw35urwa.map t1fonts.map; do
+		mv "${ED}usr/share/texmf-site/dvipdfm/config/${i}" "${ED}usr/share/texmf-site/fonts/map/dvipdfm/base" || die "moving .map file failed"
+	done
+
+	dodir /usr/share/texmf-site/fonts/enc/dvipdfm
+
+	mv "${ED}usr/share/texmf-site/dvipdfm/base" "${ED}usr/share/texmf-site/fonts/enc/dvipdfm/base" || die "moving .enc file failed"
+
+	dodoc AUTHORS ChangeLog Credits NEWS OBTAINING README* TODO
+
+	docinto doc
+	dodoc doc/*
+
+	docinto latex-support
+	dodoc latex-support/*
+
+	insinto /usr/share/texmf-site/tex/latex/dvipdfm/
+	doins latex-support/dvipdfm.def
+}
+
+pkg_postinst() {
+	if [ "$ROOT" = "/" ] ; then
+		"${EPREFIX}"/usr/sbin/texmf-update
+	fi
+}
diff --git a/app-text/dvipdfm/files/dvipdfm-0.13.2d-libpng14.patch b/app-text/dvipdfm/files/dvipdfm-0.13.2d-libpng14.patch
new file mode 100644
index 000000000000..f2b2e9816fae
--- /dev/null
+++ b/app-text/dvipdfm/files/dvipdfm-0.13.2d-libpng14.patch
@@ -0,0 +1,22 @@
+--- pngimage.c
++++ pngimage.c
+@@ -41,7 +41,7 @@
+   rewind (png_file);
+   if (fread (sigbytes, 1, sizeof(sigbytes), png_file) !=
+       sizeof(sigbytes) ||
+-      (!png_check_sig (sigbytes, sizeof(sigbytes))))
++      (png_sig_cmp (sigbytes, 0, sizeof(sigbytes))))
+     return 0;
+   else
+     return 1;
+--- thumbnail.c
++++ thumbnail.c
+@@ -78,7 +78,7 @@
+   }
+   if (fread (sigbytes, 1, sizeof(sigbytes), thumb_file) !=
+       sizeof(sigbytes) ||
+-      (!png_check_sig (sigbytes, sizeof(sigbytes)))) {
++      (png_sig_cmp (sigbytes, 0, sizeof(sigbytes)))) {
+     fprintf (stderr, "\nThumbnail not a png file! Skipping\n");
+     return NULL;
+   }
diff --git a/app-text/dvipdfm/metadata.xml b/app-text/dvipdfm/metadata.xml
new file mode 100644
index 000000000000..13170c3184d8
--- /dev/null
+++ b/app-text/dvipdfm/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/dvipdfmx/Manifest b/app-text/dvipdfmx/Manifest
new file mode 100644
index 000000000000..af61ee5adf72
--- /dev/null
+++ b/app-text/dvipdfmx/Manifest
@@ -0,0 +1,6 @@
+AUX 20090708-fix_file_collisions.patch 452 SHA256 c2dc6112a432a19763a6118190141745d02dec3d648c8f212b204906007ed31b SHA512 02736657101d9b8aa8e77904f0eac1ac229637a77f05ed537abcd356640255bb31baa1eb21f7fa510646e0d9e15797b045a54379d9849d05a6c8ce85e0bd4c72 WHIRLPOOL 64aec4ea2a983b4dfd491306690111c1214bc3d03198942bf3563a4af842cefc6fa4da350665eb7acfc1a0c13b0e1e250e9e1aed548ebe04451ad53f6c751573
+DIST dvipdfmx-20110311.tar.gz 616749 SHA256 ba7b052a17d8be4d94d64186fa77ddcce52ab5ee755b02e8444c56450ad2cbbe SHA512 0d5fc5dba35b0fe7074a392a99338861ce999809e5c20da830ebd6ba4c8ba45819054463862f3025d3a30c78aad227d3e014651ebf5e7976e86a3d9dac93d406 WHIRLPOOL 37bb24e9c8afbddf74e23896b3f106a12ed2441a43efb27944f6cc01467e8c5c53d7534df250ce65255b18ac62288efc0f7930e0debf8a1a4c35d49d0e9ed301
+EBUILD dvipdfmx-20110311-r1.ebuild 1871 SHA256 3085cd86274f9f3a7fc4de0d75ffbb1efd4e84b9e00bb66d5a2350adf5d5dfe0 SHA512 ccb46b939a9d9e6dcccf8405f7e1635246f64b8d4f9cf2730ff70f9ca9dcbda6e12bffe06e0d24b93155b303617837626aa658a1ff43331a296805c312c14130 WHIRLPOOL 3b9c6423b0780fdd625f7d3030ffd484e9ae9f9b2148b1ae811f80585929bb8296fc7398b71a8440433e9950b6e2199f81e5cbb4994a5728d0f569562341224f
+MISC ChangeLog 2487 SHA256 e91f251f75c64ceffc5c2b4a6161967ab727346344910ac6ffbb1ba9d17fb847 SHA512 31b5d7b6946fe6f01cf94e17638927a81128170fee4c94802943acb39acd0ba1c6de88a39f570c11f7b4f1c963831fd5a8a28a6ed790aff8bff0c104a23caf9a WHIRLPOOL d9c2253e59a765587a533f364c87014f12bcd6edc53b20893eac101678cadf7589edc1d04ff9bf120c5d0c89c93a0a662dbfe7062d13e4a4f45b45d68f59c710
+MISC ChangeLog-2015 12085 SHA256 a8299a0124a069ca377798a372b9d47c80d481b941d5b1e34e4eb91d60104ad8 SHA512 de12cebe0c151613dd9a97f8c1796eeb1cdd95708db3c3ddb901c29525bea47981d3ac15c64838fc99a7c38dd1f32bd85262cbaddf02ef4caaf23c633315045d WHIRLPOOL d6242df33b26d33129b0aaeb8c25cc9e85afc5728de1496a412ab1fce082ac7eed52cda7f51f418158c74d47637b96fb80e5c790b7cf694b1f904f8ff9fd938e
+MISC metadata.xml 1047 SHA256 4a34431bdda0d44446d7836f19d623cd07aed668753e40aff34cfdf6579094db SHA512 3a6cfdba7c6a95ef86031a44a226b5a582830a41a546ecaa7817c9cc72f14a5adc239a6a35862aab0cb5b75551531e438b792291f0c0839a48a3e8a8b68d9a10 WHIRLPOOL e7e7537872dc231cda826e76554ae32f6587245725ed39e4f271e8a083b4522bb9b3da81662bbc794bc91d95f7c2e2ac8af619c831f734ee34e8879f11dd102b
diff --git a/app-text/dvipdfmx/dvipdfmx-20110311-r1.ebuild b/app-text/dvipdfmx/dvipdfmx-20110311-r1.ebuild
new file mode 100644
index 000000000000..3c43a1351f68
--- /dev/null
+++ b/app-text/dvipdfmx/dvipdfmx-20110311-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=3
+inherit autotools eutils texlive-common flag-o-matic toolchain-funcs
+
+DESCRIPTION="DVI to PDF translator with multi-byte character support"
+HOMEPAGE="http://project.ktug.or.kr/dvipdfmx/"
+SRC_URI="http://project.ktug.or.kr/${PN}/snapshot/latest/${P}.tar.gz"
+
+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 ~x86-macos ~sparc-solaris"
+IUSE=""
+
+DEPEND="app-text/libpaper
+	>=media-libs/libpng-1.2:0
+	sys-libs/zlib
+	dev-libs/kpathsea
+	app-text/libpaper"
+RDEPEND="${DEPEND}
+	virtual/tex-base
+	>=app-text/poppler-0.12.3-r3
+	app-text/poppler-data"
+DEPEND="${DEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	epatch "${FILESDIR}"/20090708-fix_file_collisions.patch
+	sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.in || die
+	eautoreconf
+	has_version '>=dev-libs/kpathsea-6.2.1' && append-cppflags "$($(tc-getPKG_CONFIG) --cflags kpathsea)"
+}
+
+src_install() {
+	# Override dvipdfmx.cfg default installation location so that it is easy to
+	# modify it and it gets config protected. Symlink it from the old location.
+	emake configdatadir="${EPREFIX}/etc/texmf/dvipdfmx" \
+		glyphlistdatadir="${EPREFIX}/usr/share/texmf-site/fonts/map/glyphlist" \
+		mapdatadir="${EPREFIX}/usr/share/texmf-site/fonts/map/dvipdfmx" \
+		DESTDIR="${D}" \
+		install || die
+	dosym /etc/texmf/dvipdfmx/dvipdfmx.cfg /usr/share/texmf-site/dvipdfmx/dvipdfmx.cfg || die
+
+	# Symlink poppler-data cMap, bug #201258
+	dosym /usr/share/poppler/cMap /usr/share/texmf-site/fonts/cmap/cMap || die
+	dodoc AUTHORS ChangeLog README || die
+
+	# Remove symlink conflicting with app-text/dvipdfm (bug #295235)
+	rm "${ED}"/usr/bin/ebb
+}
+
+pkg_postinst() {
+	etexmf-update
+}
+
+pkg_postrm() {
+	etexmf-update
+}
diff --git a/app-text/dvipdfmx/files/20090708-fix_file_collisions.patch b/app-text/dvipdfmx/files/20090708-fix_file_collisions.patch
new file mode 100644
index 000000000000..2b89de6b3649
--- /dev/null
+++ b/app-text/dvipdfmx/files/20090708-fix_file_collisions.patch
@@ -0,0 +1,11 @@
+diff -urN dvipdfmx-20090708/data/Makefile.am dvipdfmx-20090708.new/data/Makefile.am
+--- dvipdfmx-20090708/data/Makefile.am	2009-05-01 01:49:00.000000000 +0200
++++ dvipdfmx-20090708.new/data/Makefile.am	2009-11-29 23:05:55.000000000 +0100
+@@ -10,7 +10,3 @@
+ mapdatadir = $(datadir)/texmf/fonts/map/dvipdfmx
+ dist_mapdata_DATA = \
+   $(srcdir)/cid-x.map
+-
+-cmapdatadir = $(datadir)/texmf/fonts/cmap/dvipdfmx
+-dist_cmapdata_DATA = \
+-  $(srcdir)/EUC-UCS2
diff --git a/app-text/dvipdfmx/metadata.xml b/app-text/dvipdfmx/metadata.xml
new file mode 100644
index 000000000000..3ed9ea8c5044
--- /dev/null
+++ b/app-text/dvipdfmx/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>cjk@gentoo.org</email>
+		<name>Cjk</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>printing@gentoo.org</email>
+		<name>Gentoo Printing Project</name>
+	</maintainer>
+	<longdescription lang="en">
+		The DVIPDFMx (formerly dvipdfm-cjk) project provides an eXtended
+		version of the dvipdfm, a DVI to PDF translator developed by Mark A.
+		Wicks. The primary goal of this project is to support multi-byte
+		character encodings and large character sets for East Asian languages
+		by CID-keyed font technology.  The secondary goal is to support as
+		many features as pdfTeX developed by Han The Thanh. This project is a
+		combined work of the dvipdfm-jpn project by Shunsaku Hirata and its
+		modified one, dvipdfm-kor, by Jin-Hwan Cho.
+	</longdescription>
+</pkgmetadata>
diff --git a/app-text/dvipng/Manifest b/app-text/dvipng/Manifest
new file mode 100644
index 000000000000..045f3dc5f082
--- /dev/null
+++ b/app-text/dvipng/Manifest
@@ -0,0 +1,5 @@
+DIST dvipng-1.15.tar.gz 171529 SHA256 197e9fd0f87ede32dc4bc1d39ec2cd72fa5260856f9d0dc2d8e6895130408347 SHA512 54647526a9d3a26d2ba9c7ef17f285a426d9df06ffb1d5336a1da95cbf24cd17505ba7f6b1ffd14a0beb7f91ab3e519612ce3d3ea3f30c278733127dfbf07c5c WHIRLPOOL 4c0c5e410b107cd6cb56f9360acd556ae4336855d0624800d96e46cd29caead0467bc554d3d1c404e4564a3ce7b3732386f6af93ea98312c6b17745582f4ef92
+EBUILD dvipng-1.15.ebuild 1121 SHA256 ca0b6b026c462dd2f71ca9c05540e8645c024fe1e9139c287486a5469fb64955 SHA512 95692a71c955e8d9ff08b32171831148aa455a60b765e2b1beea7687da1eeb1d8e7b9f0acd9c8da4a3f2173f26f1b77f6c2d67210d538eed25a88f80075eb82f WHIRLPOOL d50860ed69120ed223c162efbfe0d1f3396fe2c63d0ef54790a2dcc78e27b37218d47f50773aeaa911aab29054a6b333c55c64709dd54a546df500fb6dcba42e
+MISC ChangeLog 4692 SHA256 4c54f263d0d8c8d7b6ae6415db189e0cd177ef8751e21f300d23f3cb8bd0f74b SHA512 5c8a36ad303018a74a9bcb0860b0cfecf353ea619eda7c4d39030fe2c48cc9d15f229862803291e48b59bc3790d51c99844de00c08f872e35e42ce3fce0bf49d WHIRLPOOL 953e41959b378d4335f96292935ba9afcace76f68f9a7638087eeccfc9f1d17ed4163c485033e3fd00ca984a31a5f2123f734db657b608c9240bd184f6b59fb3
+MISC ChangeLog-2015 10782 SHA256 1c85522affe248b12676053046b7254975a2da52e4ed352c870b05b0e1ae4e0a SHA512 6a783ae9c85b5b3d57aab6658f0b482fa3d7b40eb3689daf10f7863d73aa98a97a0a4cd583b9df0677cde2d1b813108fe37aef9c2052bee20a9403f8145e2c8c WHIRLPOOL 06afe5ba493f4b8fd653bf2be0bdea3164037077d6cf7f44645cb176d59a9fbd9e70d3fb6a50169fc46e56bae19839db3a182f87e2c208147d68b52cfba4c418
+MISC metadata.xml 1122 SHA256 df214d66d5d49875741bababf44bdabf36b6a2bcd3ba05c166e12b3eedbd4a04 SHA512 c2f663c6ae8113fc462e16ce50ef44172c8d5cffaf34e9095701df7e3ae568126bb782c8a02e3d735239ea7263e6cd9778bf21f4d7166c24799a9090ecd8bc26 WHIRLPOOL 23ef33769e2dbc4a491df92f30425719b614393b82c42f42d4b232ab2dc51e2bd40888b4e8740f9c376ec5647e5f968314bb409b81f2549c0f2c9d8203b75d43
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/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/Manifest b/app-text/dvipsk/Manifest
new file mode 100644
index 000000000000..1238578c0955
--- /dev/null
+++ b/app-text/dvipsk/Manifest
@@ -0,0 +1,19 @@
+DIST texlive-20120701-source.tar.xz 131904044 SHA256 9666617d5dac3e82578e696835cc9f251ee0a56d162d86dff08659ac5dcb6c81 SHA512 0e8653aa21094e079900d17256f0768ac5514690a3725d96923d5fdc7633484d611441df1af8c674b38b9ce6a8845a9004976cd00635742dfc6837aa433caf5f WHIRLPOOL 9d570a1bd58cca8baed399ab53eb767c7c3db607c00363ce563e14dfccdd235703c538e6a651aa7f2934adf21f8477775f1547f9e7f3d957b89af644c89bcb57
+DIST texlive-20150521-source.tar.xz 45459552 SHA256 ed9bcd7bdce899c3c27c16a8c5c3017c4f09e1d7fd097038351b72497e9d4669 SHA512 9d06bb88c489715787ce619c4c6b5e2d4251e1db8d48ae7fe2d1a253634c76bc6d7282ef9c93c77847845cae01eafb58dfb37ba3fb83a6d223f0d7fe8f5d3855 WHIRLPOOL e19e4cf9c6122e8a2e80d3ad62171591a2d53317792ce69d7b2afdd6978d397c873565d597b1457d23ba6f5b5de33750955690a92fb6c34d814c075397b67a0b
+DIST texlive-20160523-source.tar.xz 45941100 SHA256 a8b32ca47f0a403661a09e202f4567a995beb718c18d8f81ca6d76daa1da21ed SHA512 915fa2f5e2099dd385ef81033db7aafdf09558c0c200fed0748a8a42fd61f69d3eaac9decea334e30981af739dd81061a9b1d6853c7f6d00285fe0be40e26c3e WHIRLPOOL 25d27fb7a7bdb47d40ddf951394e36546b184d71f2e09adb20698bd0f960e54841ddd0313a87510cb2ef43953eb4d9d05d30b88d25d15762dd774575c88fedbe
+DIST texlive-20170524-source.tar.xz 63483372 SHA256 0161695304e941334dc0b3b5dabcf8edf46c09b7bc33eea8229b5ead7ccfb2aa SHA512 18c18940992ab94ce22e22ccd4ad798253ea14ac2ab296a10ea5e9a8da9f33989f2e2641b42b564d1d5fb53bd371da3e68726b676d706b469016ad146cd19daa WHIRLPOOL c4edaf427f0249942b36db105a65474e833735d6e9954682fe7e15ab327b26ccafb9174bf806d0b6c629b0f2a6b55e80022af291d9a2f377b82dff4fdec42d3d
+DIST texlive-module-dvips-2012.tar.xz 95692 SHA256 9f12bb214eb245061bca42cd79fff999751725e35e972b2aa11439ced23f0d10 SHA512 cc5a5070fd04b501e2fae92864bfe027db2fb01cc5c0087fa62ba71ea044baa1166f5990d8545fc0b6ead130a069f825a6df243028ae1e8e7337d48936676d19 WHIRLPOOL 8c269d5242cb73cdeb83d6c304f9669fe3a7fbffa3faa67e765b5418c1ac8da8d1f3a2c20f9aea47b63734f813057aa99715c038de382f1ef3405e1cbf0a1b68
+DIST texlive-module-dvips-2015.tar.xz 159316 SHA256 dcf7b9cd4d1bd26d59e7e21ff944f843c59c4938c92175fa669287ca58097be0 SHA512 1dc167b54b4e8e5d45867247347e62a6d3613fcb20db6ae145e259e591ad96693f29f2b5ef0eecc2cb625f418c54c082646e3c36a61fdb25ea9d6715f87e6ef4 WHIRLPOOL f01876935b9281da5390bf24feb2dff4500db0e27eed0c7848ab905b998d50429ce5d1f9c6442d82944630d18b988b9ad1cd8c73a53f8daea3b876f6f73313b0
+DIST texlive-module-dvips-2016.tar.xz 34372 SHA256 a9920fc30e6c882bfcaae00c1f05cca5cb40948a531898c091ed7bb430121a2d SHA512 e5fb9e65f0070d52b13b94d11c72247fac71bfe45d43daf8b6bebc3f8b06d63927832bd1fbf5f66464ff1d9ae001773c650ffdd9e9b30f26dee2087b3d3118a7 WHIRLPOOL d5fed0ad02ac8a3b3ad4997f8dd06beddf8c0c2332a86063e79ea664d1654ccf3a8117d84e40508a457b3e80f3153f79da0f68833ddfb1ac3c7a5c41eb7441f6
+DIST texlive-module-dvips-2017.tar.xz 34372 SHA256 a9920fc30e6c882bfcaae00c1f05cca5cb40948a531898c091ed7bb430121a2d SHA512 e5fb9e65f0070d52b13b94d11c72247fac71bfe45d43daf8b6bebc3f8b06d63927832bd1fbf5f66464ff1d9ae001773c650ffdd9e9b30f26dee2087b3d3118a7 WHIRLPOOL d5fed0ad02ac8a3b3ad4997f8dd06beddf8c0c2332a86063e79ea664d1654ccf3a8117d84e40508a457b3e80f3153f79da0f68833ddfb1ac3c7a5c41eb7441f6
+DIST texlive-module-dvips.doc-2012.tar.xz 484056 SHA256 247a738b46cd7283179de5bbd8e4ecf330fb145a886580b5ebd5547cee530e9c SHA512 05e0719edd98169982daa4fbf8b943b71b8bf8b4ae4f84ae70015bbff4e7ba2d55c7a4ed4a8ccf081193669ecceeb21dd05476d104d3742be0842b1bba84a4a5 WHIRLPOOL 3af98dc454152c1c0a6abfda19c43a29a8701a4dab3d155b530c2a0e0c0f81db7911de31b491c08b0cca4b8a06172a58796f54a2ea2184ab6371fede7b627edd
+DIST texlive-module-dvips.doc-2015.tar.xz 481208 SHA256 f3960b038f010ed8d2eafc60d3d22c89562acd9e995b41610a154fc3ade09940 SHA512 bbe2ff14b1f2f3cc3b5b2d7866cef64f33b7a8e1a5a71a9e6efd210748ab8fa5b6be94d0efe46d3b757b1c7db7713d9dfe56164c63488142eb790990a1d99f2c WHIRLPOOL 01d001648f33d45ca03b65d324c223d272771ee26c1bd852684b6581c742d8301fe3053b917a2a52fa7d7a7439c48cb1c9ec097fca2d1e9e319527862c899b64
+DIST texlive-module-dvips.doc-2016.tar.xz 513008 SHA256 edc32c4671e1a50f7d7abcd15354680e53684e75147403af3d3ae0ee93152a68 SHA512 ada60c607ca2034663277a15b11c37c2d1b0350193e26934ee3a96adaf15ccd4ae76a35113c44d30d471732062dfe971a4a024f64e7e028518bd7bbc05b914de WHIRLPOOL 2d1dedb6ee50edb6a11b616b84fe75f2c99ba8eb80eaf327cfa2cacfd39cfd9d42bac395aa5fa7e0e82e604fce2882dcaec441dafde8bfcadbfdd39827f1432d
+DIST texlive-module-dvips.doc-2017.tar.xz 481464 SHA256 25584eec555ca1896798a8ef6c881b768846f541c015f68e58cbc1d39055d182 SHA512 87c2577ee4c0a82430b165fd7864ec266d00b9a621b8964f39f2adecc427dedf63d7354c0849bc1bc9c0f220b35f47b499de5255500208881abb5ea5e2012f18 WHIRLPOOL d967286e48f9d565743f3d9bbf6d660b96bbe9b8c205370b54e8327fe860782f2940ae72a3f7c9cd4788f1daed8470839c77fa7389cf1fbebc3e7ca922006d32
+EBUILD dvipsk-5.992_p20120701.ebuild 2000 SHA256 64a5907fc45336683e9689822b8f83e92dd2b0ecc4f0be54c06426bf1028e322 SHA512 7edb3cf94ce4eca71ff6a9c2d8d941b98f03f669577cd734b0bc24bf396ed821c1c7d5b493a97c9fa2f262fe3520fc82061d7b5c22f7f8291cd8aedb771e2fdc WHIRLPOOL 11d65df7c5dd006d669755c1e484ce0380556920fba26a02aa1f19321c4fe5299f233d8f10bf7d9bafffc8dc3305c9b79b13785285281d308ca6a283d2e43a4d
+EBUILD dvipsk-5.995_p20150521.ebuild 1944 SHA256 dd38ac2467b632fd228362d1c5e4044dc21e5c63998f44abc70077690243d9e2 SHA512 a4d3295a5d8fc8d11b0023d37e3f1df30c836fbcede3c2b131f550704f959678238720705dad182f325fd181bce032615afe242f1bbafd9d68cfa1a29984d680 WHIRLPOOL 4ed20e52bf4ea019a6bd98a116044aedbb543b1797aa4cf61cb3d16d5ab189148b9838e5a5a77fa1b4db6be15acecc7c486131fcc8637a66f69ea4807728dfa9
+EBUILD dvipsk-5.996_p20160523.ebuild 1956 SHA256 a099ab580b30784d26741624916aee832050452b8909acc7a51a974f1529cf97 SHA512 b4d84566fb3655cf8a38c28fae357485ed3ae936d569aedd7114200cd65c19e0ba651e2c7a6f0b1410f78c1d2d3132b92b0610953763914446f0d215849f5668 WHIRLPOOL 9fd1e1b323308f1acaf4305aa961530e558bd5eefadfa7480b421d8abe93a4949b3899b62d217182e03bca45cf71c23aefeaf8971d6dd0cd4c7f57044f9ed176
+EBUILD dvipsk-5.997_p20170524.ebuild 1960 SHA256 7bd5adb9339e2e323957123774318bb4d2a78a7b55902738a28835ebe1b49833 SHA512 5aed406660d52fba0376f860bd5caa196e32fc613c3315778d425f5538ed989fbd20642e2f279a6caa98554ea78a3257c6b24f852527860cd677e4e2f5271101 WHIRLPOOL 15b5cf290cd3d2783104338f42c5ff09373e4deefc73e7ca3c67250d9d42ae37ccb71dbc9cc587cb1cc260ff6b08a1f4dbb2fcb8b671925100e3d4937245dc2f
+MISC ChangeLog 3234 SHA256 04501522575352701a56d84e9fbb8f20ba49cf7ca6ca92029853993163128928 SHA512 3c96326697ab1d719f1a2378d67ea99b33f972b2c2951c6bd31a80139daa258e2bbe0ba745dab4aa5e6ff98096d87d1807bcdb0ea00d577b54abf9f38d2206b1 WHIRLPOOL eb77dc386fef29a3ff3cf68eeae69b60d9da8746f21aad414dc56313189ef92381cc3a9b1f5499f9aa02b67d2494756e0fc579cba6cfcc807293a6b35df0d0cb
+MISC ChangeLog-2015 6307 SHA256 5376440432823651cb4d7f7e87d94d8641adaa319354f5ca446a03bb9a5d352d SHA512 f5624f1415c0aeb5a9d9d98b67e7798463314703c88562de52b30d03c88e855ff1c1fc455e24b30766950f0db53624b2efd7e24b21ef2a61876c27a769f7241a WHIRLPOOL 96a31af014bfd267d0754cdca20b197e401ef47b7f61326341094c36a5a465ec099a0e6acbed2fcc2718deadbf991593b32e914c0d66259a8de6d48a764814fa
+MISC metadata.xml 358 SHA256 ff0b9f8887c6df4e625e131a06e1612e53f7d09cb75a12ebe3a4a1fbced282a4 SHA512 51f6411780af5d7775f8f80d246d5f4e297abb1960a0b0c21c6dc5c03a9a407dad8cbc4977a679590cffb4523f1b72a0f7b15ab100c938391a5abfd3e17e8818 WHIRLPOOL f8f5c4ccbb3bab42abda823707c2e968328aa3422b1ace474a584c170450e7c1e297c637d4a442613639d17e10c665f186d48dcedb37c8ab4e1b0a556257d8b0
diff --git a/app-text/dvipsk/dvipsk-5.992_p20120701.ebuild b/app-text/dvipsk/dvipsk-5.992_p20120701.ebuild
new file mode 100644
index 000000000000..b36c06c39d45
--- /dev/null
+++ b/app-text/dvipsk/dvipsk-5.992_p20120701.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=2012
+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 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.1.0_p20120701"
+RDEPEND="
+	!<app-text/texlive-core-2010
+	!<dev-texlive/texlive-basic-2009
+	!app-text/ptex
+	${DEPEND}"
+
+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/dvips/base" install
+
+	dodir /usr/share # just in case
+	cp -pR "${WORKDIR}"/texmf "${ED}/usr/share/" || die "failed to install texmf trees"
+	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.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..92d31990c2d4
--- /dev/null
+++ b/app-text/dvipsk/dvipsk-5.997_p20170524.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=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/Manifest b/app-text/dvisvgm/Manifest
new file mode 100644
index 000000000000..c1e7a78dc642
--- /dev/null
+++ b/app-text/dvisvgm/Manifest
@@ -0,0 +1,7 @@
+DIST dvisvgm-1.10.tar.gz 831654 SHA256 339f4dcef0916c1daaf1b65d966737279464ec6858b28fda7196d8030d7f3735 SHA512 2d3cb2e6b36d6a3b996347b6031f67bb89bc76d2bf0244347e512e66333536638caf855d9856771b10245387abae99a06d4c6fe33def814cae639810b4cfe906 WHIRLPOOL 398e5378ce6e84768b73f7d6e9776eb177619de785a70d8fa416fecb275903e49c065ec23d78881eede9d4944525ecfba44d34a5d1b74b87dc1ef6ecf127b869
+DIST dvisvgm-2.1.3.tar.gz 2802278 SHA256 553215051e85882ab4658c294ed0483cd5009d295f0a38dfccb480367abfd170 SHA512 dfd6e94b28dcdf2d1be236f3f29eaf4e3e5b7bb34544cdd55ae09de612b02561dd782b693a9a94eea07420c795d31ef210eba34cb663d7de98f438c089369ff2 WHIRLPOOL 0baf0fff0172f9ff7dc95a848b69af240d6008f9f6e306f613f73b02a54d1922407cd12560fe166fd758de5f6f4a04e00e5d50af8098d09d59be84d4353e6962
+EBUILD dvisvgm-1.10.ebuild 1090 SHA256 0abeb2e2aa9694b5f21e412da1881a94b66ba13314933db21bf24052f8fe443f SHA512 d8e598f3c9b47aa88aa5aa2ec38abdb543fdcf46b48be9fa7b967be3fbba15bb1fd995498f0e6743b54c802ee7c8149eb5ea0cfc5415fe3c3371c5b2f0180ccc WHIRLPOOL cd3632ab3ac688531b67095213074baf79a22c1b4f3fd85faa5410ea87def6aa2da0dbd92cb982eb7de6d928b9cb2b0bacc1e23265c0efdb2ce62d72ea85f329
+EBUILD dvisvgm-2.1.3.ebuild 1145 SHA256 f5c3e052e00808044daa8d9a84234b7a4104cedb200523be5ef217865d9f54f8 SHA512 37c82be8f2bb33c19e0a82f8e6dc927973b727e9d406591a4774f12f1179ebfea4c04dd5c79bdd28869641afbb65c44bab0a8589ecca1ceaf62ca2da3c2f1b0b WHIRLPOOL 32faaa4de0bcaf71ab617bbe839f6cdebdb673feb7c0917924597585b130125b23dbc5028a50808f1d5314d98fc5e5613c555adc19fae8d64c15a4913d300f81
+MISC ChangeLog 4695 SHA256 b982de63bec8e30ac538cb1f2376dec0a0f1546e8e80b77dde289e95dc5a9dc8 SHA512 8b504755170ee752702619e87b454c81355ba880602c93f302d873baea835e542b639e87b03c31a33e2f2d57f8b1d994554b874b0e98526f773122cc1f3edef6 WHIRLPOOL 798d1fccc8e3b41027d2a5197b14cf84b126ef1e20034518e142c0f9370374424b56cfda19ef59980ea37f8291dea8804d44d0e9b79776d1509552cad90c2b84
+MISC ChangeLog-2015 9647 SHA256 638cbf58bb9c77fdbabf46ea99d531fcd67995b110465e9bb7ce69d2b67c6b7c SHA512 b54d784e94fff9a96ad524265c57ec17eb9aa0057c795fc9008ae31bbb6e02942a7e449bd086e306ff4ab60e752699130faa45a496996cbbd690db593da0963c WHIRLPOOL 6641485f75337b83ef59fdfc89afd632a10b2638b6d0252826407e660c6500fceb04db41827f9f8bff536d154947c43a4967021fa24073ab229d280054789a71
+MISC metadata.xml 382 SHA256 506562ef5982dd90056c108774a316eb1fa358776318f26ba6c4d0e50411875a SHA512 0d9a02bb1979574379451b38d790a58479fa438cbb5ee657058a7259b7e5cfa441854ce8bde11ed8cfedb06adb1e6361164d6bbb258466586cb5fa9cdff852c0 WHIRLPOOL 589c3866a2fdb005ad5aff8e1a23ebda44009fc157c2dd9357a10555b21fe317b16e68dbfb5b2a5ed9ad5203ae8bfae97172464fd02e1f7a42ced74616506e08
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..1263e4f4465e
--- /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/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/Manifest b/app-text/ebook-tools/Manifest
new file mode 100644
index 000000000000..68c229d2028e
--- /dev/null
+++ b/app-text/ebook-tools/Manifest
@@ -0,0 +1,5 @@
+DIST ebook-tools-0.2.2.tar.gz 46889 SHA256 cbc35996e911144fa62925366ad6a6212d6af2588f1e39075954973bbee627ae SHA512 b4518249835ed7cc672392bf2f8b1c62bc218e41c53663bb26ab34c9e43a99b6b7ae794babdb4bd775e467bb17918703a66ee57c8cf94cb7afc4ba2a7f74816a WHIRLPOOL c9c3a5bd48d1821f2e823538f33ba8cd90ff56ad4d1b6c73a7592b086ef86c617ac64a707b270b5483734a16217640afba4591095bf445ec0e4ef77b8f3e5c8d
+EBUILD ebook-tools-0.2.2-r1.ebuild 687 SHA256 e3ecf06f072feaddcb3d0631a435188638fd5ee4b05929a3ccd47a562856f7fb SHA512 c6b7e37fa21b92a61e5af028efea54f748bc87089a8741eead3ad43845fcb0646efe99cbb74e8e683c30d37d689efb3c899d2674667b4377e08652d177033e65 WHIRLPOOL 16cffe2636ee51471fdcd6ae7d04974c18aa0cb07ad20cd8dd6d3fc8a390f52ac72e6e8b0e184a2f38ace694be9389b565f507434ddcd6a9ed78624a06143f1c
+MISC ChangeLog 3205 SHA256 2afc5416b54c4de13ea604bc888bcb90ebaac54a4353949a9e382ec48ed92b89 SHA512 f2f7cf038847825e5b9e91cd5b48aad3691fd4ded502804ec2f15e8dfb71367b76998b8a35657420d7e066c26d6a6b8238f32a8d6465afbd09e2c3f1d3ef3984 WHIRLPOOL c42d5ab0eae417aa64a92efbc71a127307ec2621f0ff6268f56929432503e9dcea4b28718e192c6bf249291f9ceb67a0ebc34784992c1ed9d1576451cf9a93d1
+MISC ChangeLog-2015 3654 SHA256 4f2573756da7f7bc39cc66593ae90c0440003145cbee3976b44b8d52368d4d46 SHA512 42a8dcd24848db21c6e365ddbb911808f4cd70cb5495d1543b04374c58cc058f1319a710fbdfdcb2b53e1dbde3f4507a10ffaac6f979ff06ac4993789dc059bd WHIRLPOOL 0c3381db6edcd3531618abadc7820118154148078607b8ca4a3fd57ebecba2c300eaf257d19455125b998b5ed66ef23feab9a36187d03d6231aa59890b828034
+MISC metadata.xml 400 SHA256 e8d8e1df0afc4e3af6f0db4c752391f1a21f0c8bc26c2e0842d9eb5ec327d90d SHA512 2ab30e14742c63fc54cc75068b57d1c9fa178d6f57fb03b8b15c5649d4bdf35c5068a132c6ee50fe855a2037af67b5c2fd2229cc97b4f3e89f4eecde6d21885b WHIRLPOOL 959a84a2efade4719d9c6eef91748779c7d8d3cf2fba2fedf51b179dd773c277c697238d5641a67793885b6f41b9bdb53cf6564633c59174832ee47f3437d5cc
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..0ac6824df5d9
--- /dev/null
+++ b/app-text/ebook-tools/ebook-tools-0.2.2-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils multilib
+
+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	)
+"
+
+DOCS=( INSTALL README TODO )
+
+src_prepare() {
+	default
+
+	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/Manifest b/app-text/editorconfig-core-c/Manifest
new file mode 100644
index 000000000000..b56bcc781864
--- /dev/null
+++ b/app-text/editorconfig-core-c/Manifest
@@ -0,0 +1,4 @@
+DIST editorconfig-core-c-0.12.1.tar.gz 65369 SHA256 c7bd714c73f01edde583b059b51078173aa85a36fa05bb9652d35a75fe0ac372 SHA512 3517f7db84d632615ba651eeafab6730739b7bf01f4ea34fbca65f58463fbbcbabc101587b289a7922b55708453262c65569077c51087424d47d0676dc1db686 WHIRLPOOL fdecba1d3621079cf3fa3c685d09ccf7f845f7964a1a7cb70e6d2e35e8533da08795ae75424c243d7ec9f6e179f2e7dea2add3eaaac9d15c813ffd0136bc6392
+EBUILD editorconfig-core-c-0.12.1.ebuild 891 SHA256 9556d21914c57556a440fa65fa439faed186fac0795cbfca5ea025829cb827ac SHA512 527ce58ed36cca79ab12695cbbc05d7e9f5b5761932bf1cea6ad24e1d7117edc4df6ae79af0549d99b2f833877b33d7c66424ff5748db878cf9a6ba634246fcf WHIRLPOOL 4158bf40e51c734528f0ea1066b0537d4228be898c778b12395adabade542ee0d006c8b1874743e289e0b4863e101eb03d36ec537467e200d9a4e6805678dcb0
+MISC ChangeLog 502 SHA256 fd3a93c2a91aa9870ecdc7c129ea885a5a86b58627c510bd3fa7f2fb2c9145fd SHA512 aa083d25869be7a0e2b03b2c85cd4a1669859a1ea91d86915841cead5ffcac89de3f4cda5d656f88acc91d2f8c25880b00241e86f3900aa2d46f1c0ce2ae29ad WHIRLPOOL 3e6f180b6339f9e2c5b6d1474dad53a0df572309d3f91a28b1ac27ccb60dcca35404a3a6a88551bebcff55439f890c4d88a27479abbec81df8de4e0887b3a1c7
+MISC metadata.xml 388 SHA256 31002b4bba745cbff54a3420eaa6cb43b74a9c3e2f331d455c309962436c2dde SHA512 fbaff22b9f648c2e94d68904cbb23de8ee0340641c626d5a533992837ec6405b65a96872bfdedce3a75351ac73e344d5faed1a51f63a4330f65e4aa8190ffed4 WHIRLPOOL 91eccda0e3642459a1a116cf7fcf9adcd137d2b51e78b0ceb1c7f46d08abf3dec880f88d066902bc273b5327b15fcdbc42f4737b94b16c26aec3a4294b5147a4
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..d9b1f574e805
--- /dev/null
+++ b/app-text/editorconfig-core-c/editorconfig-core-c-0.12.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 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/${PN}/"
+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/Manifest b/app-text/enchant/Manifest
new file mode 100644
index 000000000000..338c154daa4c
--- /dev/null
+++ b/app-text/enchant/Manifest
@@ -0,0 +1,14 @@
+AUX enchant-1.6.0-hunspell140_fix.patch 372 SHA256 8af2416c76a4d45f43fb436d9f0158fe3d6bcec810fa8b636812873dd1a34ffb SHA512 94dd08fe828ba1fb7f043a0a277855988d3efb4f9ddd00da839833582f79986f09f7aec66a980641737dbce1b7302b6f6f7bfee7ac80db66dafdd5fcbf74c3fd WHIRLPOOL b66bf2beaef7942124f3a429a71f58eda3a8452d5876f8ac9ef1ea29ab728cf5429a039326c8fee4999c32201593eaef27a36019c9834d731c1a22cf7e523f3c
+AUX enchant-1.6.0-hunspell150_fix.patch 577 SHA256 113918ae07c492736a7fa359c86fe6f1e3c9582cd1b4a3f6fd0a0848a6a8c6f8 SHA512 893620f45a1dd7956aef9f3517186a9226c00e6b85df4770d6ea388fc08854e7884143fe3c7a064c7ec4f8353a9b9571d0c07da22df5c6ee41fc4c6bbce5874f WHIRLPOOL ab11f48c15b2444f4329cd10a428428fc43ec63233ea4f9333dbcb0d284bfc68b00feab79253d598f0a0455a3942fbc0243184036cdb2e810a42bb81647d0f55
+AUX enchant-2.1.0-hunspell150_fix.patch 783 SHA256 fd50ead615cbe380278df76b3cf755cf5b2644d186045c096761827a33f55000 SHA512 a8406777511f458f47a97c2c8246445abd05d611413beb0c9ad6e756418e5930f8516857c58193a14b700f1f539feb5c819881ea97d71d07839ebca0d3576994 WHIRLPOOL c74ff090b33b8e878ba4fa749db3e28f2f40d2892e924e981674f8ac4ca6293dfc1f157aa3d8ece97af853d83857b87f0256bee9c665c6deddab2d70875fc450
+DIST enchant-1.6.0.tar.gz 607018 SHA256 2fac9e7be7e9424b2c5570d8affe568db39f7572c10ed48d4e13cddf03f7097f SHA512 0ca1634bb783df51512df4abecc89abdadee6baf7330d6e5f90cc15d10779896a3521a1c079ecc07e4df4f7a018ce398cca9d0125a7845a314a059840ebc9137 WHIRLPOOL f6677a11f1d05e210cbd6a7b13f3987ea93b3f1e73537b048093c14686b0310e75a89fdb8798ad0ed386a7e1cd793f60820006df8c1f7919c46c7245ee6a74c9
+DIST enchant-1.6.1.tar.gz 642124 SHA256 bef0d9c0fef2e4e8746956b68e4d6c6641f6b85bd2908d91731efb68eba9e3f5 SHA512 26c62dfa89ee40150db502651a2f876fba00569b7015f205dae27a029557effacff335bbe36124dbe6686537da2305bcab02592179d03e95fdf9741d54b98036 WHIRLPOOL daffe1ee16e731d3d6ba56362f882c8f8bd7462a264fcf9caf05ed8093c0ca275977fb9c83c391d9e3287e6e98516b52e468c9bf9cc86532cf0b3eeba8f02fbd
+DIST enchant-2.1.0.tar.gz 962857 SHA256 2cdda2d9edb62ad895c34be35c598d56ac5b9b9298f3dfdaa2b40a1914d1db7e SHA512 5dee7c5693ffc4ca0933e0881ca6e1f6bab1553af79cadf29733589790c6626db524cf33b0008b3de4c48e122ed93929478cce35608d9a52ab71edb51f598f27 WHIRLPOOL 4bb340288fffae6f8c6bc7bf21127ea812b79698d8be0f275e638fe47d1cd1c2b6b96b15fb0a0cec983d8b3db6c3e973e9521d86247c1e1df31f3db4ee80cb8f
+DIST enchant-2.1.1.tar.gz 961821 SHA256 5fad0a1e82ddfed91647e93da5955fc76249760fd51865648a36074dc97d526c SHA512 5cb57198ea826da6d9ed9042edca87fcca9b811e8e75b382ed1568c5b1d8d4f8d6ba732a167c8d52261cfce540f23f84bd4d2889a4beafd2db1d8509c0b6bc15 WHIRLPOOL 955b1d853233529198b3a487406b0c481273214b5c54c22fbc992ea63f66143e278082f3d17370e9140d6211cf36586881ff73dbd07c66b01346d36cd2f2f316
+EBUILD enchant-1.6.0.ebuild 1560 SHA256 b4d196e3288fbd88bd4574d5e626fb0201b16ea0e08a9f6bfde723c8a84cb50f SHA512 e800eb39c1df85310236f1a760a218539622dc6670856482009efd2d7609b748e79f2a0aeb4fa565a17420226ebc7c7c87a4860e6e749b2b6d677ae308fa695f WHIRLPOOL ce5fb0f22e025e95dc7ccea943d5452758179add5b1f0e514b18dbea56f8f4332d1df041db13131d780bb67c320ff40911bfbb8d79696e90f76bcc76dc5f07bb
+EBUILD enchant-1.6.1.ebuild 1626 SHA256 c1b1ac5d5f9da4c9c67a7c3b281daa0d32f92c485dc9ef0ef713be2cde6e31ba SHA512 a6d011b85539119cdaed553918d30114c288e2f7898734b6d676cd732d18f6c62c0969ddd2fc39d3a953d6f40a562623c067f0f87ddce46b93b65bd31d9729cf WHIRLPOOL 961bad3f00d046d467c7166f8869e930be96391b5a5ff4737ee82c31f9cda70d7e7795214005a26a3ff40e4cbe13775baa69526c88fb00729df1a88c03b71851
+EBUILD enchant-2.1.0.ebuild 1432 SHA256 cc5175e06088360533c6820b16af78516bad0a2631193b763f7700e53324a426 SHA512 4131394259cc3280717fb1f6ebd7334289c0209d21af7659ce412f4124a537d7b920e2d4b6f72e1ec6303e5e53238209ad5dfd37e5c011ffe32c9557084ceaf1 WHIRLPOOL 9dc71b51aba6287ba46fb3ab5271d90eb34044d2b6dc3fa9d96d7a64248a743e95af929c521f11d05dc436ecb128f273ad0ab8ffb197386510ec237aa735529b
+EBUILD enchant-2.1.1.ebuild 1291 SHA256 9f63c17b8b5e74cfe3b3ae139bf6c1449de0b5253250bd93d6aaf220a34c4d16 SHA512 f5ceb6c6114864facef4a56da39a17324a86880c680fae23acc0617e97223ab9ac36996f2aae55bfbfb5f0861263c272969f93dae17f82bfe61601b232b26266 WHIRLPOOL 74acdfbaa22132559f85f551d7098e6e08c37e469f7a1d1e858a3c28828075a29225a6853c476c748691bc10e56bb25cc344ef9311db50118e786ba8878a2707
+MISC ChangeLog 3096 SHA256 8f56703204db0c230ca5127b857f95ea662a3919ccda4b66472e2b91e8ae35ff SHA512 eb6ad3c465a1589da77fdde411258c2dd39617dec6e76d8967034fc4dfe18f661c60bd11b99702c8f5eb4e87dbbbf90ff1890815a6d0423419072b0f038178d9 WHIRLPOOL 053a86bcb1ab83550337a0ebfa827450fcedbdd827b211835407c8e652acd7550ccaa617ae3374fb3d8f677192f82af1376a30cb85a19da77330ca1adebbf926
+MISC ChangeLog-2015 14273 SHA256 f68693601de59c173fb30d97a94feb06bafcc2d93a5c411e012404eee50d967e SHA512 70ef146761b9b6b1e3aaa2174863fd22ebcfa5a39c07e5c67d680dc903333dd7c9e3cf287fd4bad8ab3867aa7dadb09fa38c65a40f54f669e51853a5c3bf4b53 WHIRLPOOL dc89c8800fc84d65397feecfae94b359737ead5edcb4fe2828f0713715cef63e92bd4264ccc7876801a6f44c9054f5c5327ee52978d284c890a3f2105f266dfb
+MISC metadata.xml 551 SHA256 c1dc6d6f7cf4716ddce1d3db93da0d3b35b8f6e4ad45403fce438ff1ad563fa9 SHA512 15358f20d39014be293f87d60871f16712f4314808bdd28bd25d6cced2278fc46eaa36f1e44c970c1379488bcf0fa359686abf3fa8ff10f4d66cb2f82057a528 WHIRLPOOL 2280109033941d67bdef204f3d7bc28f5fbaecd23660b1174a2ae24d42b4083cfacfeb88c81af3a66ed114f7accfd0d4889d7c53f832af90811dee6e282ef0bf
diff --git a/app-text/enchant/enchant-1.6.0.ebuild b/app-text/enchant/enchant-1.6.0.ebuild
new file mode 100644
index 000000000000..5a4e593dc79c
--- /dev/null
+++ b/app-text/enchant/enchant-1.6.0.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="Spellchecker wrapping library"
+HOMEPAGE="http://www.abisource.com/enchant/"
+SRC_URI="http://www.abisource.com/downloads/${PN}/${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 zemberek"
+REQUIRED_USE="|| ( hunspell aspell zemberek )"
+
+COMMON_DEPENDS="
+	dev-libs/glib:2
+	aspell? ( app-text/aspell )
+	hunspell? ( >=app-text/hunspell-1.2.1:0= )
+	zemberek? ( dev-libs/dbus-glib )
+"
+RDEPEND="${COMMON_DEPENDS}
+	zemberek? ( app-text/zemberek-server )
+"
+DEPEND="${COMMON_DEPENDS}
+	virtual/pkgconfig
+"
+
+DOCS="AUTHORS BUGS ChangeLog HACKING MAINTAINERS NEWS README TODO"
+
+PATCHES=(
+	# http://bugzilla.abisource.com/show_bug.cgi?id=13772
+	"${FILESDIR}/${P}-hunspell140_fix.patch"
+	"${FILESDIR}/${P}-hunspell150_fix.patch"
+)
+
+src_prepare() {
+	default
+	sed -i \
+		-e 's:noinst_PROGRAMS:check_PROGRAMS:' \
+		tests/Makefile.am || die
+	mv configure.in configure.ac || die
+	AT_M4DIR=ac-helpers eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable aspell) \
+		$(use_enable hunspell myspell) \
+		$(use_with hunspell system-myspell) \
+		$(use_enable static-libs static) \
+		$(use_enable zemberek) \
+		--disable-ispell \
+		--with-myspell-dir="${EPREFIX}"/usr/share/myspell/
+}
+
+src_install() {
+	default
+	prune_libtool_files --modules
+}
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..ff615eb5b756
--- /dev/null
+++ b/app-text/enchant/enchant-1.6.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2017 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 zemberek"
+REQUIRED_USE="|| ( hunspell aspell zemberek )"
+
+# 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= )
+	zemberek? ( dev-libs/dbus-glib )
+"
+RDEPEND="${COMMON_DEPENDS}
+	zemberek? ( app-text/zemberek-server )
+"
+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) \
+		$(use_enable zemberek) \
+		--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..e37685161438
--- /dev/null
+++ b/app-text/enchant/enchant-2.1.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2017 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 zemberek"
+REQUIRED_USE="|| ( hunspell aspell zemberek )"
+
+# 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= )
+	zemberek? ( dev-libs/dbus-glib )
+"
+RDEPEND="${COMMON_DEPENDS}
+	zemberek? ( app-text/zemberek-server )
+"
+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) \
+		$(use_with zemberek) \
+		--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..4e9c52c25da6
--- /dev/null
+++ b/app-text/enchant/enchant-2.1.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2017 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 zemberek"
+REQUIRED_USE="|| ( hunspell aspell zemberek )"
+
+# 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= )
+	zemberek? ( dev-libs/dbus-glib )
+"
+RDEPEND="${COMMON_DEPENDS}
+	zemberek? ( app-text/zemberek-server )
+"
+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) \
+		$(use_with zemberek) \
+		--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-hunspell140_fix.patch b/app-text/enchant/files/enchant-1.6.0-hunspell140_fix.patch
new file mode 100644
index 000000000000..5d58ab7f540c
--- /dev/null
+++ b/app-text/enchant/files/enchant-1.6.0-hunspell140_fix.patch
@@ -0,0 +1,16 @@
+https://bugs.gentoo.org/583486
+http://bugzilla.abisource.com/show_bug.cgi?id=13772
+
+--- enchant-1.6.0/src/myspell/myspell_checker.cpp
++++ enchant-1.6.0/src/myspell/myspell_checker.cpp
+@@ -148,6 +148,10 @@
+ 		g_iconv_close(m_translate_out);
+ }
+ 
++#ifndef MAXWORDLEN
++#   define MAXWORDLEN 100
++#endif
++
+ bool
+ MySpellChecker::checkWord(const char *utf8Word, size_t len)
+ {
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..8a391bed92f8
--- /dev/null
+++ b/app-text/enchant/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>
+	<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>
+		<flag name="zemberek">Adds support for <pkg>app-text/zemberek-server</pkg> spell checker server</flag>
+	</use>
+</pkgmetadata>
diff --git a/app-text/enscript/Manifest b/app-text/enscript/Manifest
new file mode 100644
index 000000000000..b9322eeaaf23
--- /dev/null
+++ b/app-text/enscript/Manifest
@@ -0,0 +1,10 @@
+AUX ebuild.st 6047 SHA256 ff133d4e6bbfa26f82ee7de1e6a0f7a2385dad40ed31995f7e484155597beba4 SHA512 1c01943ec901dc4ea314715232fac279fa051b441b39e8cc5bca759b67dda87c4982eba23a37f3b60b041815c347ea85faf774e5574471232e4e941eb186caf5 WHIRLPOOL 16089f55dc7b19d65400b7d7f5ce2afb2f62b97063655c6f8e5fe5eb6be40092affab4301339c60da1d898350c54b7fd6ba383f9e0ca9e9c3dd0a1eaa853fda1
+AUX enscript-1.6.2-ruby.patch 661 SHA256 53bf90fa47841bcab742155d28f314ff5864c122b7f7d7fbb12177d43b3b60a7 SHA512 6ca804c1f9e1bc19eb896c88c4e710b5212e570d5e0d84b5b40100d4645bdb483c55ad902ae5db9a617268387d6b1d6db54f69e9ba3479f0f669dc1b2314d65c WHIRLPOOL bbaa5216e0d052802d72897784537f5b0ebc16691b3e268197f183985f493aacc96e009cb146f638e037fce3b38ae396b7650ad31d454f3b0bab0b751a67094b
+AUX enscript-1.6.4-ebuild.st.patch 332 SHA256 fae2d59559a61a3d2f0fb25695c3dc5eab917e1eb22af61844e85584281728a6 SHA512 8e86a7b2966810852703a7f3636b0c92e940d3fba21a46be46086830799cfecd2870cd38679f009cb9d984bf3c475e843df67970619cf43ebf272c209b204fd9 WHIRLPOOL 92c4dd373180556d4c3b2f7df372835c20b912d705072e735f99f492155c6a9f2919a8292bda8fd5d5f3dada2f42d8b915ca2688f1c0969b7ba6bf42ed9c3ec3
+AUX enscript-1.6.5.2-php.st.patch 410 SHA256 2439a1d1fb1bf2f0a55f097b2d507316a767875db1fd9ee17f57d8bc2c242be7 SHA512 71bf65c91d6d362bbb700ef26b72137e524a969da0971b7f0c30ac409a7f002103769cc25c02222d0ccb1bf69919a419481af9ea479828e3df18ec7a2e1d29b0 WHIRLPOOL 9a8df36fcc440d7a3f5983f52cba8e5e296bf873f5e6014ebcc86ce4cf7af0de8e2adb5b70caec95fc4334615fe074ab5342d7a88c1b5a84e4f864964eb8d37d
+AUX ruby.st 3904 SHA256 211d8a241d177c9c1c232eec514357b96b2d28554d63b72df3d72f79a41b25b0 SHA512 43af0998ebe95530129aec126b9f91878bbbf7dd52530cb162b25f5779f9eb5b870f41727665e66dd5cf42a6d5e790899bf03c38c1a914adf2b0eecac83154e2 WHIRLPOOL dc0fd98a3d80a9369cf95472b167cc81fb6adb7d2a020fac56e9bd99a81bbc46d8ac5d2d65c2c0b23ad9c3bab85abf9be6de34f8167b966307a2e9ead6207d0f
+DIST enscript-1.6.6.tar.gz 1330493 SHA256 6d56bada6934d055b34b6c90399aa85975e66457ac5bf513427ae7fc77f5c0bb SHA512 bf1c2b9ea7723518a1ef312145ddcd6ffdef0c6e8b5795ea84cb55d76fccc02f441d0c2dc6897e970368186e6a829ab74a090716624e0f7a8f575653fa495ebc WHIRLPOOL 718d06a76add39cc916a4a30262049787de73aee5e569407bf5a40eba4f90cd47c89ed6cc151269175d4fe250c15f6a04aed138828315988697d5b9eda03d055
+EBUILD enscript-1.6.6.ebuild 1139 SHA256 94008bec413e25ce4a17cf092554bf93d6bbeb78d297c7272a25b8fa39a18c74 SHA512 748b16650373e043a94de3422a547b599ccd24d915cf461c46b5d8e4ac81a35b3f690d15734d54377395bef9b4dcf1e8880ec420fda47eb62d8885fa0867d0c0 WHIRLPOOL 6c6cd0b5c0ad91044887dfb3a3b19d1755ad5522edfdfc5876cf7736009113a3538c3cfc88c030299c358212d4c69c5a35359fa2a51c1cd210a88cc8129932a9
+MISC ChangeLog 2734 SHA256 8a096f49dfe62fe20754612951b10170f6c206e471caa6a9d50442e5b1ecf129 SHA512 2eb7ebdb258d87c21a084c029c864d22627d44eb4006dad237d5de98b10a7dfd7d982e9d9370714148c3d118f2bc3ebcb88824fcd0b6c52c90d917de4c751c98 WHIRLPOOL 8c078324504d99983f220b558b9414acb256fad9796b8ce2599c9644d622561b3f4f62d72f177b4dd100af71681ac63f5bd94d1dbd433244e0c628ebac7163be
+MISC ChangeLog-2015 10486 SHA256 3bfdf4e9f055325cedf936497be32eba23ebe06be307434890f3b8d69841a0ac SHA512 85e3c31b3112936c5e02aaab436a1053c7cafd2c46823995579ba3d647ec1334bb0f0de8c91ae59276fad40274b94f0cfa21c248f4636154945f0546b655289d WHIRLPOOL 2b3d3065ae29f2be76492b5580e6d630db305f3c481f6ea4cbf9643c0ad7e182b412bc953a5a71a4c2feed9262bf88011bfaad49a9610f536cd4426468381bc0
+MISC metadata.xml 255 SHA256 369a8c8c92b41e8d46a7225354bd493797b21f0b8b5c3f9ad4ac0a7e14322ebc SHA512 c6c5f966cfbe396fde1b15334442de9e0004b44c4b48775588b0b25a058ad1751252761370c9c254280e97561fa6306f5aa0cc7959c675d4ee11f7f95d777a36 WHIRLPOOL a6043f3549b633ddc8017207016e272af3ca85d175e603a0bfffcad7c5fef4457a01bfe76ceeec5ca09e957dafb78459db4d9cadc6ec99874d5be44ca85e27c0
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/Manifest b/app-text/epspdf/Manifest
new file mode 100644
index 000000000000..71aa27e02861
--- /dev/null
+++ b/app-text/epspdf/Manifest
@@ -0,0 +1,13 @@
+DIST epspdf.0.5.3.tgz 436341 SHA256 71ecbaf5e7fc1e525e865fa98b2f64d64f3c084eafdfee8e3a23203a9c191eba SHA512 fa2a777c0036ba5b1b960064c13ec1dd8f9180258e4f92fd46a5703c90214b154c7e231faada29f6d0da3b02062e8262b20a8a535ccfc702032bf1c07d4131e2 WHIRLPOOL 46e36bdf55925584a66ab00f807a4fcd52df7ae5913aa58be2889a8c7d07bddd00f6c8de54c19b00a9f30063b3ba1dac6e267bb02223d7410d4d29d1a70c6110
+DIST epspdf.0.6.0.tgz 352989 SHA256 8cceb04f011d1583b7257c1d54c491701ccb76c8d7560923f5b24cb5f264b5f5 SHA512 44a7015fa0b7298429567e998068864419fd396f6b0781bf7877c6599d3bb2f254b7a0f976500655851a95d727880d106d9e1df9086306eef74db0b109a63506 WHIRLPOOL f47bb164d4ffb203cb2931921ba8bc04232568560882f1f3c7a5fb51db41e44f26b9c58178cdace2e1d608b3a79fd692ca15c0ca344008992b7109c973a98e49
+DIST epspdf.0.6.1.tgz 343913 SHA256 8452f9b4a547cc6aac9170aa1eea88ce903e07d31e4cc645b1fb76e7555db3f0 SHA512 3efa037e9081d4c4c74ba56e2c7767c8abafb64e5f0a9f73fcf6b1e6ca7e6f68576555aff4031b8cd82ebdf001949a4455648dad3bf79ee6a37be1c73a5b4443 WHIRLPOOL 3c3a40d80df5b172d2065b983ed535ca4f6b5a96f0410bbe2319aff3fe7c217fafffad7d7f60778ca5d544daa7c56c6a8afbdf458dfce8dccde89bb0f42a1821
+DIST epspdf.0.6.2.tgz 348540 SHA256 4e1dc27bd1c8fe23fe0869b430b5976bddea87350fc93553906855d3962f6e96 SHA512 c4778683c990a7ead16fc7f266f6f7977f71ad81c4e69abff6c1fbc7cc7250a0f8ba557d4896f4d9f26cc826e5509c0ae4d09c687fea119bc2ed26912b4639e4 WHIRLPOOL b77dda7266192f996e79366044415f23f925b6e46eda80c8cd75be6a390e0bb63a1c786be1642b88fa5197f7bf468501f16c7b3a419fcec3359e3ac0cdbc2cfc
+DIST epspdf.0.6.3.tgz 335975 SHA256 eef1e902f9eb6ed8770dbe15147bf9696297cad8e0ec3eb34fe4574033d2d996 SHA512 ddb0d8c17b6b0bbb934312e6253a2b689d2545c892af989efac9782022c501109f2ff57bb2ea7c26d63d7747e2a510c18bd22a6076bb7137fe0252c38b2125ea WHIRLPOOL e78aa86961012d56817079d0f299129af48407bab6a957ae772d7144401cfe84bf7cb1e03e6fe0b4fd1d8cb4f15267ae690f78df078300d75590d12df0fa89a8
+EBUILD epspdf-0.5.3.ebuild 1438 SHA256 1c1989a4ea2384be7c7d9929ab0e6f0a5e054f4af6b307ba3ef3089e62670b44 SHA512 9f0630ec5ea8406ca0cdeb93f2a09f6dda0f5df28eb3e90536f65c19884e8c4bea25293f0ef8a32ad8772fe79d2f2f1beff3ce59a59fee19580727bdffa8c141 WHIRLPOOL 95e85c92784032d888c6d5547d09b632c2828b00e38d13fe90ce42d03a246e8d48f26b74d75b01bcf4a9c3439742d09a3ae837f92781e7e1939cf4efde046bce
+EBUILD epspdf-0.6.0.ebuild 1294 SHA256 ef395bdeb4866ad662513e6cc4058a7dd2dca218826d561a5ce332c850b7879b SHA512 ac737cd99a6951e27dc297fab0dd8e5029a1e5140b31dfb3737781f58aaaf66560f4401933a282dc410d8f9e4437374d8d057b78557602e223301d2bfe8c086d WHIRLPOOL 9cd1295910c8bf964004bad041e7485f5d93e8e834309ab1d884a76f70fe4744c92961b4ab6720e2140da27943fdd1579946074ef497a41a57bf2f98a122964b
+EBUILD epspdf-0.6.1.ebuild 1383 SHA256 7738799abe6c7f4e6ef3d98d235c744486970f8d67b4eb9b8e9056507cf4e8d9 SHA512 c5df44ad626356b7ebaf81c4163510473561c398e8ab9a8d78abfcfc4ac10fcab6cc40242619eee22fd3ea4482ac509d0282ea4b91196cb378c02965c14bc50e WHIRLPOOL f253058d814ac6bf92429de8fbb084ed138e55a71fb4094330dc4ec7eae2ab74b0127c79e2e32ded3c2a0a9b9a4002b8d86984041dba16fcd70a58a1693447f4
+EBUILD epspdf-0.6.2.ebuild 1383 SHA256 7738799abe6c7f4e6ef3d98d235c744486970f8d67b4eb9b8e9056507cf4e8d9 SHA512 c5df44ad626356b7ebaf81c4163510473561c398e8ab9a8d78abfcfc4ac10fcab6cc40242619eee22fd3ea4482ac509d0282ea4b91196cb378c02965c14bc50e WHIRLPOOL f253058d814ac6bf92429de8fbb084ed138e55a71fb4094330dc4ec7eae2ab74b0127c79e2e32ded3c2a0a9b9a4002b8d86984041dba16fcd70a58a1693447f4
+EBUILD epspdf-0.6.3.ebuild 1390 SHA256 e4ebc21bdce51423b6023d4597af2359820927a3ff9cfb3beb979077b03fa623 SHA512 cf7fe0118112f27651e500fd672d00308b17acb0852619bd94063011abb8b461f71fc8bebef91d2a4045b5e314c1e7f62114fbf5485e67b1e34674ae181b97b9 WHIRLPOOL 63990d1fd8f9d5ead1d94e85ff57a818d71bc044b577ef9b5330c82b6a8d18a653262d4367918af47144c72f211eee485f1886762429c51deefd3f6dd0d78e02
+MISC ChangeLog 2891 SHA256 3bcc5e0b1571a267b27f4918ba1af5905bf340693d19003bf799ae8e1ddc9bc6 SHA512 6678a002057a25b571dfdc38d6e85bdec421b06df468449fd89ee6488c557615aa7c6d3fee777d9116832fae683c7c41b0e0503238f3289e824ed6220cddeffa WHIRLPOOL 7066a6903036453457a094c9619b80137caaee1059e64c39521f57a15b83cbe369e3b704f611f105f742b0b0f4598f1cf2818c501ab0cee42b4ddd7d144ebf0a
+MISC ChangeLog-2015 3023 SHA256 5b3764029dfd331cacc011cfb89ce5094df1838c1d6492579a795496ad5e86d7 SHA512 d93a7de67c0ff5c9a2a0523be1ee5f0c41fc1ba94b2df5775935e68a2cd5ce549dcd10f0ce9eaba4ee84c3fe36acf316000ad34e0e4c49a7db92c4622f64a88a WHIRLPOOL 112ca7b0ce4dd437c72b695998a723375a0338b2672eb8940f367acb216c2fb4be51c8c255ee081a74317901f8d27026e9dd3ce93b76b0ffff6a9e87d15ef8d9
+MISC metadata.xml 245 SHA256 b3de478821488be2cdc91b078e21c911dc384af882c5c44631a47dfa91516dc8 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690 WHIRLPOOL 701a78fc2214f5fd4bd781477f85e87e716b8d76ea831a0fa4afc8871c4286cc363679f1ff4f844555ad4f77cc7265208b83e805f56c22fc4baeed1062280c08
diff --git a/app-text/epspdf/epspdf-0.5.3.ebuild b/app-text/epspdf/epspdf-0.5.3.ebuild
new file mode 100644
index 000000000000..a717cd08931d
--- /dev/null
+++ b/app-text/epspdf/epspdf-0.5.3.ebuild
@@ -0,0 +1,54 @@
+# 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="sys-apps/texinfo"
+RDEPEND="!<dev-texlive/texlive-pictures-2011-r1
+	dev-lang/ruby
+	app-text/ghostscript-gpl
+	tk? ( dev-lang/tk )"
+
+S=${WORKDIR}/${PN}
+INSTALLDIR=/usr/share/${PN}
+FILES="epspdf.rb epspdfrc.rb makegray.pro"
+TKFILES="epspdf.help epspdf.icns epspdf.ico epspdftk.tcl"
+
+#epspdf.info seems broken, rebuild it
+src_compile() {
+	cd "${S}/doc"
+	makeinfo epspdf.texi || 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.rb"
+	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.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.1.ebuild b/app-text/epspdf/epspdf-0.6.1.ebuild
new file mode 100644
index 000000000000..7db287fd524d
--- /dev/null
+++ b/app-text/epspdf/epspdf-0.6.1.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 ~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/epspdf-0.6.2.ebuild b/app-text/epspdf/epspdf-0.6.2.ebuild
new file mode 100644
index 000000000000..7db287fd524d
--- /dev/null
+++ b/app-text/epspdf/epspdf-0.6.2.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 ~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/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/Manifest b/app-text/epstool/Manifest
new file mode 100644
index 000000000000..9e30179b1f4f
--- /dev/null
+++ b/app-text/epstool/Manifest
@@ -0,0 +1,6 @@
+AUX gcc43.patch 632 SHA256 50dbfda7c668d3a07878bd628c0ae89bb71cb0be8dadfd4589781990d25d15f6 SHA512 a088a86e2c66469da955a4ba2309142cf54be9d88ca18c8c173d9a285a145c3432ec99d4c212f5f69caeeef17035a063f2ca55d57bf72325258555a0af8ca875 WHIRLPOOL 322f1bfec5b818feccb83144edec7e8a42f71d2b217eec1cfe328b421e6af395c04874e060c5b76a92dbd4daf1d7a073cd22ca8777abcf5154e95b6a9e3e8b2d
+DIST epstool-3.08.tar.gz 191567 SHA256 f3f14b95146868ff3f93c8720d5539deef3b6531630a552165664c7ee3c2cfdd SHA512 d6d70825c7d08cca318503bd8c12b48408b6d6cd3a64f26df94890373a3e73b68dc09a4eb454b81893c7ee3c11da791cdfed7466eb1410414cd1b97d80e8abf1 WHIRLPOOL 18b23dec04a5d08a849051fc8e0912f1bad5a73a2bcaff181a0a48bcce7fa0008ac1184bb4df6a74a0d7c64ce58b27d911195dd71d257201e0efad8afbe02d33
+EBUILD epstool-3.08-r1.ebuild 903 SHA256 6baaf6203883636060843e96051d065bdb8c42bd87d96317a54f683f349c2d7d SHA512 ec0b4d0c5282fcbc39c726b21809f4a7bbb41dacda97a94e2574574f2cc32d08fe768430710f7ac1e91f28a98a8492d74b9df7d430ec7da4aef0507aa2210d3b WHIRLPOOL e047e83b0cc7e01591dd46453975bee7d66e5e0d91429724a12ac3b4f1f5d4773d9202cc9041aeb7a59577777bf50701cee33938d8895098e5f22e5252bea4f1
+MISC ChangeLog 2546 SHA256 9f1fb4f5d25ade21b6fc3107cee899938dc55de05346324250ec4e70af341beb SHA512 0f4329c6376331ebcace3316413997fc19bf32523d151616c94f85cc5e4e83f6c5e1663c7e4da8dea7a08856c8041d75c67117c4eef028b87c10aa53d0fd2a4e WHIRLPOOL fa623a985d2a2ee3c40bcb8a0e4020e0d5322628958df5f30ea43960f2d7d74bb48f5559208c72484b6d784f4304259612d8a526ced75ac65f399abff4b75cd7
+MISC ChangeLog-2015 4489 SHA256 9a9cfa36d2c10cf3dfaea1bed543726f5b3e0eb0437c8047d14e5046b344c150 SHA512 a62002b72fb238b8cc4d2512603e46eb7dd524f2c8120131ea0ce5cf6ecf0b7b796794d2f32044fa70d2077457a8e2140c4b61f30ddf6ac5d82b14c4691ea794 WHIRLPOOL 5f2bbb936650681aad28a1085391276d2fa18274afb3f0248d123729952f47334f4be6b958040681c45ce718fc24944d1d0d55ab8dc70b90f545e3fbb5e3792e
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
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/Manifest b/app-text/evince/Manifest
new file mode 100644
index 000000000000..383fe91d121a
--- /dev/null
+++ b/app-text/evince/Manifest
@@ -0,0 +1,8 @@
+AUX 3.22.1-CVE-2017-1000083.patch 5157 SHA256 7e755824da994a0d9b82f85733ac20c17a881fa98d9e5165368387b2f9e279fd SHA512 f7bf0a0015191d4994d7e6a40a8a3bc4b8b2ec18ad04ca8fc46cca455709955d9f13d7ab2a0f419faca55a85064c4fe9c9f57ac4d9683f0c3fb61331996eb921 WHIRLPOOL 3261868e9c82009dad0aadd52c535a38dcb86b7071a27c352614d8eab93d68aa69a0a11d1d42a9b26193e82f102698590e487b55444fc3a0d72f83b8c9850082
+DIST evince-3.22.1.tar.xz 3365004 SHA256 f3d439db3b5a5745d26175d615a71dffa1535235b1e3aa0b85d397ea33ab231c SHA512 c36a90bf98f25b4f9f05536f1a09c38be30b814529e17a4ab159ba7c1e952402a211f335d4cdf1928ace8a5b46d6d019fbbd457ce11c2ffa264d8bb7c32d5a18 WHIRLPOOL 7b646bab40f9c05b7689de70b1de2e313b0576a772887187d71b51b00c456251169b7e5bb85f44f443a0dcce5199a405dc303c49a4be3d62c244225493c58749
+DIST evince-3.24.1.tar.xz 3511576 SHA256 9ca0c5213407b37be55fddb04a85d9301b692c4412c5920319d975403bff0f37 SHA512 205c1c9b68c9215bdcebf0c36841a35898e056ef8e56208db62c1fac04c4efad8fbc0800f410e3c94c526536adba5e8ead68bebec8f81061a3831789c5173726 WHIRLPOOL de0074c42ec8614a7ef34848de6768a722a855f3113fdad7392993a913f707f6e4fc55f86cbab945b41bc84ba92d79c82e2bc0b680a99702681b4d775706e3c6
+EBUILD evince-3.22.1-r1.ebuild 2874 SHA256 0832fb9f4f4095f23763a6c9b6f419c12d29768ad4e42365d911f81a1ce94012 SHA512 0b41b16686f158123aebc9cd939186524c6c0c84bb2e8dd043620538f2d283ebdf98fcdedadb713adc8f969403bf29b42b0c4854ad7ee043ac68e721d6aab075 WHIRLPOOL a838857c14986adef4f0671a6ac60560a1d98daf8a49c82195b1b09d47f38e6d9809b875cee1d3c185bb75269b7dbf3b1d133f0a52bdb5e84245e1cf9a38c3da
+EBUILD evince-3.24.1.ebuild 2819 SHA256 af3cebcf6c6ded6a839280df54f92a2106d9183fd13b5f1028d8eecc31b735b1 SHA512 7aebe03d4e66ee9a686c08ac8f0c3c0e9205a3cc35e3334fc463eaa4112b01a817558c2760a25f57371685e0e6fc3e9f7bbc57003f1879c5a43eeda3ad7a94f2 WHIRLPOOL 48b96ace9dd75c62fe41f88d5fb5f2a8ca18ca9185c47939156622cbc943150c03a52c1241ab75410a78bb1df721f4661ce830a97b43fd4b8273b09f0628deac
+MISC ChangeLog 5311 SHA256 e1308727ba2c885331119d8bc2e280c78edb8ca853493bd9e8c575f647c7bc1c SHA512 d58d5bafd59b1f3c04d4781edb6c0509a1583dd53f8ef5ea020c1042b63e2be0d7d5d7ce037833a31d82fa7e13394991bc1643751ac0250f1e07c2cd49992290 WHIRLPOOL c6b16268ac6c374eb945800e66709691205c8255a4914ef4114e547d35eb648ac6e43a86d5a117018c076789cb3f3a201930d9036a6b9b147a2c7a742a6a620e
+MISC ChangeLog-2015 44981 SHA256 e8ed4f19d188781c6eb9321bbcea98648fbc3800a6d2e18167adfec313c7e589 SHA512 eb0b055150f34498fdf1a951195e4571ac79b4a43c99f4f5aa86c66a55a5db42335e29712e4bfb7f1e6cd89a98bf49bb4de7709a7c75812826f03f7194016ed9 WHIRLPOOL 4eccd6bf9e9293a82e01c3d45a40fa097556cf1cd18c7d04f7483a2a1c37d79e1823904b12ff54d9f0eec4065af099036d17b35c7e1c4c8eb7622a48f9ef0107
+MISC metadata.xml 612 SHA256 9dcf1b7b52be95787c7208d719f965fbcb88ec5b40d50e4a994dfff9af9dcbb4 SHA512 a9ce7d786d979e14c852b0fe3f722b346dce2f1f52b8f9ab272a1f2291ce88adba78c5d347e3e33a3bb0a58f46d77d20febc92516a4c12bc9f987cccd7aa977c WHIRLPOOL c766224427b16bdc43a415c9753fa9a4dc55b2d8ac5f745003a1bbc175a3f13e85be7731800b55fe84340cc752124c7361b39e8ca032ca075b8c6d6d0948e526
diff --git a/app-text/evince/evince-3.22.1-r1.ebuild b/app-text/evince/evince-3.22.1-r1.ebuild
new file mode 100644
index 000000000000..7ce30ec41a4e
--- /dev/null
+++ b/app-text/evince/evince-3.22.1-r1.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2017 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-1000083.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/evince-3.24.1.ebuild b/app-text/evince/evince-3.24.1.ebuild
new file mode 100644
index 000000000000..28ce5a2f8a0d
--- /dev/null
+++ b/app-text/evince/evince-3.24.1.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2017 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
+
+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.22.1-CVE-2017-1000083.patch b/app-text/evince/files/3.22.1-CVE-2017-1000083.patch
new file mode 100644
index 000000000000..9164c618145a
--- /dev/null
+++ b/app-text/evince/files/3.22.1-CVE-2017-1000083.patch
@@ -0,0 +1,130 @@
+From: Bastien Nocera
+Date: Thu, 6 Jul 2017 20:02:00 +0200
+Subject: comics: Remove support for tar and tar-like commands
+
+When handling tar files, or using a command with tar-compatible syntax,
+to open comic-book archives, both the archive name (the name of the
+comics file) and the filename (the name of a page within the archive)
+are quoted to not be interpreted by the shell.
+
+But the filename is completely with the attacker's control and can start
+with "--" which leads to tar interpreting it as a command line flag.
+
+This can be exploited by creating a CBT file (a tar archive with the
+.cbt suffix) with an embedded file named something like this:
+"--checkpoint-action=exec=bash -c 'touch ~/hacked;'.jpg"
+
+CBT files are infinitely rare (CBZ is usually used for DRM-free
+commercial releases, CBR for those from more dubious provenance), so
+removing support is the easiest way to avoid the bug triggering. All
+this code was rewritten in the development release for GNOME 3.26 to not
+shell out to any command, closing off this particular attack vector.
+
+This also removes the ability to use libarchive's bsdtar-compatible
+binary for CBZ (ZIP), CB7 (7zip), and CBR (RAR) formats. The first two
+are already supported by unzip and 7zip respectively. libarchive's RAR
+support is limited, so unrar is a requirement anyway.
+
+Discovered by Felix Wilhelm from the Google Security Team.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=784630
+---
+ backend/comics/comics-document.c | 40 +---------------------------------------
+ configure.ac                     |  2 +-
+ 2 files changed, 2 insertions(+), 40 deletions(-)
+
+diff --git a/backend/comics/comics-document.c b/backend/comics/comics-document.c
+index 96ed26e..3af119a 100644
+--- a/backend/comics/comics-document.c
++++ b/backend/comics/comics-document.c
+@@ -56,8 +56,7 @@ typedef enum
+ 	RARLABS,
+ 	GNAUNRAR,
+ 	UNZIP,
+-	P7ZIP,
+-	TAR
++	P7ZIP
+ } ComicBookDecompressType;
+ 
+ typedef struct _ComicsDocumentClass ComicsDocumentClass;
+@@ -117,9 +116,6 @@ static const ComicBookDecompressCommand command_usage_def[] = {
+ 
+         /* 7zip */
+ 	{NULL               , "%s l -- %s"     , "%s x -y %s -o%s", FALSE, OFFSET_7Z},
+-
+-        /* tar */
+-	{"%s -xOf"          , "%s -tf %s"      , NULL             , FALSE, NO_OFFSET}
+ };
+ 
+ static GSList*    get_supported_image_extensions (void);
+@@ -364,13 +360,6 @@ comics_check_decompress_command	(gchar          *mime_type,
+ 			comics_document->command_usage = GNAUNRAR;
+ 			return TRUE;
+ 		}
+-		comics_document->selected_command =
+-				g_find_program_in_path ("bsdtar");
+-		if (comics_document->selected_command) {
+-			comics_document->command_usage = TAR;
+-			return TRUE;
+-		}
+-
+ 	} else if (g_content_type_is_a (mime_type, "application/x-cbz") ||
+ 		   g_content_type_is_a (mime_type, "application/zip")) {
+ 		/* InfoZIP's unzip program */
+@@ -396,12 +385,6 @@ comics_check_decompress_command	(gchar          *mime_type,
+ 			comics_document->command_usage = P7ZIP;
+ 			return TRUE;
+ 		}
+-		comics_document->selected_command =
+-				g_find_program_in_path ("bsdtar");
+-		if (comics_document->selected_command) {
+-			comics_document->command_usage = TAR;
+-			return TRUE;
+-		}
+ 
+ 	} else if (g_content_type_is_a (mime_type, "application/x-cb7") ||
+ 		   g_content_type_is_a (mime_type, "application/x-7z-compressed")) {
+@@ -425,27 +408,6 @@ comics_check_decompress_command	(gchar          *mime_type,
+ 			comics_document->command_usage = P7ZIP;
+ 			return TRUE;
+ 		}
+-		comics_document->selected_command =
+-				g_find_program_in_path ("bsdtar");
+-		if (comics_document->selected_command) {
+-			comics_document->command_usage = TAR;
+-			return TRUE;
+-		}
+-	} else if (g_content_type_is_a (mime_type, "application/x-cbt") ||
+-		   g_content_type_is_a (mime_type, "application/x-tar")) {
+-		/* tar utility (Tape ARchive) */
+-		comics_document->selected_command =
+-				g_find_program_in_path ("tar");
+-		if (comics_document->selected_command) {
+-			comics_document->command_usage = TAR;
+-			return TRUE;
+-		}
+-		comics_document->selected_command =
+-				g_find_program_in_path ("bsdtar");
+-		if (comics_document->selected_command) {
+-			comics_document->command_usage = TAR;
+-			return TRUE;
+-		}
+ 	} else {
+ 		g_set_error (error,
+ 			     EV_DOCUMENT_ERROR,
+diff --git a/configure.ac b/configure.ac
+index 36e866a..26a1a7d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -795,7 +795,7 @@ AC_SUBST(TIFF_MIME_TYPES)
+ AC_SUBST(APPDATA_TIFF_MIME_TYPES)
+ AM_SUBST_NOTMAKE(APPDATA_TIFF_MIME_TYPES)
+ if test "x$enable_comics" = "xyes"; then
+-        COMICS_MIME_TYPES="application/x-cbr;application/x-cbz;application/x-cb7;application/x-cbt;application/x-ext-cbr;application/x-ext-cbz;application/vnd.comicbook+zip;application/x-ext-cb7;application/x-ext-cbt"
++        COMICS_MIME_TYPES="application/x-cbr;application/x-cbz;application/x-cb7;application/x-ext-cbr;application/x-ext-cbz;application/vnd.comicbook+zip;application/x-ext-cb7;"
+         APPDATA_COMICS_MIME_TYPES=$(echo "<mimetype>$COMICS_MIME_TYPES</mimetype>" | sed -e 's/;/<\/mimetype>\n    <mimetype>/g')
+         if test -z "$EVINCE_MIME_TYPES"; then
+            EVINCE_MIME_TYPES="${COMICS_MIME_TYPES}"
+-- 
+cgit v0.12
+
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/Manifest b/app-text/expander/Manifest
new file mode 100644
index 000000000000..a576b46fc851
--- /dev/null
+++ b/app-text/expander/Manifest
@@ -0,0 +1,6 @@
+AUX expander-2.0.5-gentoo.patch 1971 SHA256 0b04f87fe812b9faff18675a5834dd17a5140133cb2ee6b008992ff99a5deb94 SHA512 f81577c3ee11d2e13b59258a59e02a3ec26b265ee2206fde5585f75c21db015907835ade2db88a19ab1afd778a3a7d146d99d1dfb891237d04b2e6a052f49f57 WHIRLPOOL 2bb45e6b78073715e5316dc3fde7263d93d26bf8cf2085bded606ae32d4578acc5fb93511ee0c51f37afca12cfad9532c3f2beecb9df72b436fbd71ab488329e
+DIST nedit_expander_kit_2.05.tar.gz 92571 SHA256 6d2ebebfc50b277b375eba6325d8d9ef381a9a12d8e581c0b65ce28e1f0eff15 SHA512 a9d5e97db95eec9f98d71360c6af5a6908f31f59221ac1f509ae4f661b0614610b9591b9e2f58bba1175a6b609407d720369ba99cecb5496133d889bf93788ee WHIRLPOOL 8eb5664b1892234db2463c63e32f9743375da979ccdd7af1f5fbdd8b25713ab2c65c2e07e1e0d43e8c06cfea98847c78f5ed7da86e1727a6669615b7c82b606a
+EBUILD expander-2.0.5-r2.ebuild 1094 SHA256 041adef8c15bdb356806003eff94017a5f23fbb567f8e3ceb6174c749bc9b3c4 SHA512 1c95a0838980dd94d03257eae7c3c405d3236e0af0b828860a1e9d428788d77beb0add8bbcb8cabed07e7839c164ff44137a189965cd42a0ca1c32fa0620ae01 WHIRLPOOL 64a088b327fa2a9d3a392d22ba750b2dc403dadc8c472219a0cb91530ee7d3eed58315716103ed55890b3b13f0c94e720b78b1a86c6cf4bb0277d5ea473eb81c
+MISC ChangeLog 2569 SHA256 4aa9033d633f87b86b1d8546226afcbb2ba3626b69de4b9566c65ae73e88759f SHA512 9f6033bc976cd2243e72868ff90f9296bf65c5974b2a396d38bd25c65ccf8b6e1c3a7badc88b861cf9c784980eaf01308520dea86e53b1b86021cc3e93211314 WHIRLPOOL 9011b9828398e4ad94e5a4d281baadc3b96de7f1d44e4834f49a33a8164f21feb0d5a5735ed708e68c098590396d66e2d12cbc44ff06265dd4d17e06ed4496df
+MISC ChangeLog-2015 1789 SHA256 09f7cefd1ac6a012457cf17bc695b047f94461d3ff250b6e734ee8e28e77b95d SHA512 98bd26e57318f378bff53244a77df935be60e74cd3256eb55740465f4112fe79b1c895513ce53df714abdbb572a5f2ab382cb9e6c6e9797833bf44468678f999 WHIRLPOOL a4a75e9d4288d72de53bc3edfca291cdcb0f0043d9a518aa0b5c157d85ae747e047042f5e9217e0e5a74235b7ad2e43ac9d3f7fea8628a908ba48169d4fe6ca0
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
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/Manifest b/app-text/extract_url/Manifest
new file mode 100644
index 000000000000..34bafc1df917
--- /dev/null
+++ b/app-text/extract_url/Manifest
@@ -0,0 +1,3 @@
+DIST extract_url-1.6.2.tar.gz 16296 SHA256 5f0b568d5c9449f477527b4077d8269f1f5e6d6531dfa5eb6ca72dbacab6f336 SHA512 c95c52c096569d4fb24da95480c8c5262ee29bfce8ddc9cb70af45d17f4977edff6d95eda8aa7976f82fc75e7de262fab21a3498590e1c212cf9cf6435d2c4f1 WHIRLPOOL 535885571e6ed7870ff4943864883f774ad18d55239c76e4a2e82beaabe699f3e57775e4bf52167e06bd882befb7374f41a77d554d01f7caf97470936107d19e
+EBUILD extract_url-1.6.2.ebuild 640 SHA256 a8cc8a59956fde6330c9697e76d464387b136718e3cfc1caf55e015799841575 SHA512 ed7ce99f826c642f2bb92505c51d5d3fd8cff989a65dad5ea493d5d6f38cc9033c8eac2fe8a6a60d0afbd9d85d1c5da084f7e777098bb0d3f6479929f00478ff WHIRLPOOL 15265b1a6235a8a21b8b89477a392764286cb2f51486dc9cad833d27270bf66a78285eb70ce72cb3f0025d6b0ebf2c796ee7a5cf6d99269fc360dae79a33a32f
+MISC metadata.xml 332 SHA256 03e610750b63cf895fe50952a65013c182db63c6fbab5a16bbcb38234f21e58d SHA512 f10d426e688c66c2ecc76c7d8a6bbb87cbb5fb0e3ce237a82a63c65fff1a4d6ab8d981c679ccf6a2e3049479fc679277829fae1e66071d6c8ccf6da22b2b0fb5 WHIRLPOOL 155466d426b5791558efd6e2f7f7a5450f47c638eca2a3dda21ac4b76211d2462b91e838e5a9be6aa61a35c6b2db3e34708f3ec9bc9f50ea853abafecf9a9447
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/Manifest b/app-text/fbless/Manifest
new file mode 100644
index 000000000000..522c4d1ac4ee
--- /dev/null
+++ b/app-text/fbless/Manifest
@@ -0,0 +1,5 @@
+DIST fbless-0.2.3.tar.gz 115622 SHA256 68ae914d141da913ed6ff1805a1739346c33756b64a9407c14e95e278452c362 SHA512 b5188b0b4c0654915487a49930987c02a3e9bc3ba47a830f744362b464235a502fb28e20bb8c91cea15a5bdbeea54775697bf57ca581f5ebbadb84134dfdbafd WHIRLPOOL 7cb37452dd320689a33edb3e59a97cf8936dfb1578f6ee60c11da579b1f054767f2335969eb5e6eb3b84e243e41c681f02aaf43b8e750bdefab85427d4b19b1d
+EBUILD fbless-0.2.3.ebuild 468 SHA256 62c94b00d9eca07acfb90e5c09be5aaf950c7a4772d698fff575e1f72f4fbf33 SHA512 df77db59ba00eeb44af5357a454bf1ed5aeda2dd52967f1c735c81ccc8b2daee48972acf183ff66a9af1d1398aade49b91a16f0e8775b6315396b181408829cc WHIRLPOOL 767179784c466a622addeefcf633a7a111e6852e5596328564f63c55fbe7fad5fef75c1378a753e4bcb8e1eb2707cb9f495f09c71e8ca5da160e5bbd8b38e361
+MISC ChangeLog 2227 SHA256 6f5892a083b9c56a57ef9633a5be7b58aeecdb9951a851397eda9bd359751f4f SHA512 301a6a2c63d0a958f171b8afa7530dad91fa9604065a7672358bc63810e6405fc459c5e41da9cdbd89ad8f4b418d75eede8d2daed302596c9f6feac29040f90b WHIRLPOOL e0fad5e280bbd51b92f50ff0a2d069968795fb4d7f2ef19eddb25b85ebeb6c84d3fbdea00c45bee40a4c0cdf95ca023349639704fbf4557d22c8d4744576ef5b
+MISC ChangeLog-2015 1166 SHA256 ac361f4199d6965e01ffecad60f86915443ff1bea44e9a49ab842d49695061dd SHA512 3024dd61e545f3a5fb1093f44a6b75e78a1fb9db375fa7b561f20786500c56dc82820ef26ff001c725c70c983d08a4fa2dba3d0a620c4fe6c4876045cb70f902 WHIRLPOOL eb3e18474d41236ec4612410d21d13ce5747b4c5a6eea38e46eefca47d52a403a4c2c459ca5b682c12d28647a9f7166cf2eaf801281d9639bc1e6b054d445b12
+MISC metadata.xml 338 SHA256 5d0245457524229dfe8ce222291b11cacba0448e891409dbbc2b43a4a516cc6a SHA512 e3b7de793ac97b5b39d855cdbe930df8575d24c55894ec03e789fb0090bba6d73fffe00a5b2cb84900da90e3240de722e784ac80e7ceebed8eead0b6ec705da0 WHIRLPOOL b65be7de5618240cdc55819fe4db3a9400fef9bb5a6346547e958211bb4be506e250e861f3947a0fd23f0613977184c9de4d512832067b920c4b840e38d9ca9b
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/Manifest b/app-text/fbpdf/Manifest
new file mode 100644
index 000000000000..8b8a92d20968
--- /dev/null
+++ b/app-text/fbpdf/Manifest
@@ -0,0 +1,6 @@
+AUX fbpdf-0_p20161202-format.patch 410 SHA256 dd16cf1fa3a96395712501a8d186955f3ac7f429f0de3537379a531513260e89 SHA512 d450d8afe3547a0837147daee207352f257d7009c39c64867e779ac8d099e2aba5ad6fa931d8139daa4a5a8cb1022fc8faa85adc9be8833aa3b8633f05f6292a WHIRLPOOL 2e3c7450ad38ec83c829b6c672755662788b8f25ee32dfc733d53754548a5a3b475c14cf56b1ef15ab017d9e1efdec74a374bb907cc5d634248a42e8bfabd06e
+AUX fbpdf-0_p20161202-mupdfthird.patch 262 SHA256 fc4d98647f31825788edbb582079059a8688cec89327e19713a0bbc2b61de251 SHA512 aa469d088373ac79998642bc6d3c6ac8eb0138d5495eb95cf6cbd7e13ea1d346a59a72ea860fe7e6b6ba669ac50cdb120432fa9011677515b021ef3121a2a657 WHIRLPOOL 51f2a2589a3f70a4c11185b6b514bf43da57a1b23f0531f661b1c4cbca9fb8b4423ce06a5c1b635daa660fe10ed1d6cb0093327d23c15f9653c514a801b02335
+DIST fbpdf-0_p20161202.tar.gz 7795 SHA256 9cd0fb4cb2a6602606b7e24cb9b1e81c663b07f0a982236f0de5dc25b4653823 SHA512 c122f12485b9e0055bd5b60d66a5034d20738c6a5a1a9f384ef8cb93e4c6b1275434eea884398590db2b06a746cc0ff00df29ecdc5faecc1730a022435164107 WHIRLPOOL dd576141183548aaa1036eb36524b1c7bf8df6d3645fca11846323687a7b3e6a80d09e709980e8da41ac82763c16b69247be1a33aa758191f79d37d6bb936079
+EBUILD fbpdf-0_p20161202.ebuild 781 SHA256 a05ffdc0fe6e0d7e3abeb2a68f2405269065e7609e844c1751e02be12223645c SHA512 23eaec8913b35dfcc98a7301fe36ea804c9d54f795fafea1f37252c97429ac6e2a2c3b5858bb366cd64aee12c52644835c3e24e511c50ab17df4a549a545be8e WHIRLPOOL a96be97cb77dc57956571dc0714e35ab273893cc831b9f3189ebd9e9d2ab56dabe743f6c19954f845643661bd8218ef622fc65052f01fda2ae3100dbbd404f84
+MISC ChangeLog 572 SHA256 f076f16713aa99399360fee30d4033fc3e248104b79a3fc4ea1750ebc00a47be SHA512 24c375e4a8cf11250e8454e1d67224473213a334f3447e4aa5d66edeedf783513a1d55b4432680e117133f9803736a283a7c3275272c0d6ff3c1af83c41e920b WHIRLPOOL 5f05987a2c3ada4a7275bd317eff8870a923d9523bdf04ba2e86c5b40a803639c9285d7f3778446236954ac1fb26ffdfd413901beb0e5610c086c7359227fc64
+MISC metadata.xml 299 SHA256 e435d069f688da8661bc23fac22e48ba2eea714ba02f00705228f1d47fe000e6 SHA512 dbd6a3b7b1a02fac0cf201f618d1f17d4c992263e6face26f3bc94a8b7523e4194777bc742455823a6e5c72c2029e81c59048783679fb594c2991367ad86b2fe WHIRLPOOL 3779aae9558a4bbed71939bb36cee97ae1468b9a7405fe7af0dfb29fda4acbcd7081238f2aa39faa93fcae3d2cc16205bf3a039fd273eed31afa95f1093b6a92
diff --git a/app-text/fbpdf/fbpdf-0_p20161202.ebuild b/app-text/fbpdf/fbpdf-0_p20161202.ebuild
new file mode 100644
index 000000000000..02e5ea6ffd6a
--- /dev/null
+++ b/app-text/fbpdf/fbpdf-0_p20161202.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="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=
+	dev-lang/mujs:0=
+	media-libs/freetype:2=
+	media-libs/jbig2dec:0=
+	virtual/jpeg:0=
+	media-libs/openjpeg:0=
+	dev-libs/openssl:0=
+	app-text/djvu: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..248be000563e
--- /dev/null
+++ b/app-text/fbpdf/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="person">
+		<email>slyfox@gentoo.org</email>
+		<name>Sergei Trofimovich</name>
+		<description>Primary Maintainer</description>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-text/fbreader/Manifest b/app-text/fbreader/Manifest
new file mode 100644
index 000000000000..99d782c8d632
--- /dev/null
+++ b/app-text/fbreader/Manifest
@@ -0,0 +1,10 @@
+AUX fbreader-0.99.4-gcc6.patch 512 SHA256 bc67b538c51a5b77468469df6b5e96ce918ee11a5ff4e88e398ad5661d322f9c SHA512 79c64750c250e10fa6530ed397a77ed9ebb2b76d12a6c0967cf8739b24f8381c76961e72388d0116f514c71c3cecc04a4945781dc87db3a30a18e4a1afc0315d WHIRLPOOL c135809b6e692f2fced4d0674154c7b25939fd5f924d52aecabda500b27da8bbfb78b3ced1e91575fcd00e468265656f8e9b5dec793da2ea13fc722985078411
+AUX fbreader-0.99.4-ld-bfd.patch 532 SHA256 c583f1bf48349f69972e83955265799ea218c2b359a3eb0eb11211ae7c9d5802 SHA512 77c6a0454706f68f5065333c1bbf8456aaf405ae8532019f1d557d5f66d7d0b633d409b320c8ffba50a78d04f4d64c7d655c3b0ee6f87fdf146aa5f04332167d WHIRLPOOL 7be2d6bf4bb4f8d473cb804dee90ae26608f57ec65e1f8bf14d10dbf1eb17d5693fd0b1d767be24ee35fdcae4ad73e9883b7df962d6d4b757983cc98ac1b890a
+AUX fbreader-0.99.4-mimetypes.patch 505 SHA256 8f7f6c793ed08ef305031d402e996911942fabead97e69f87e7cc556572647f1 SHA512 03fd64a802be53bf33c9582d5c2804e0c67809a43db02a2bfbc3e5a15592346cae9ba44333f2f547bcc623bc1d9785ca7a10c77d58a23152a1d3f59328e75d7b WHIRLPOOL 3f4847c2c02cd9f6dedd1df4fc33ca007ee8fd3dac6d0ba170bb2f188a1fad4f393ae1865dd705f78b4666e0af48684c2bae3ce5f7c55a3a83baadb8d580dd66
+AUX fbreader-0.99.4-qreal-cast.patch 950 SHA256 0f3e585292c0dbefa4db33c2b69e90871400be0f92f18fa6ed32daae1227f848 SHA512 260e1966eb5f0bfd42fc3c28fdcdd92d37314d93b31f44e1ec0f94e81ad0084caeaadb69cbd16eb4e8f8b9359534449604845e1b79e63b0dd2eff96b342286d1 WHIRLPOOL aafe31212c1111e43d504f4b84119cdd766c656c86ea454a2fbee541fa5f6bf3649c33aa4874b578d5f0b8ad0541b417a9c69bca11c06c63263f52b62dd3a12d
+AUX fbreader-0.99.4.patch 472 SHA256 cb3aa6795c8f7c694ba296f6f6e6a7939648578a289bc84c10f8302c7e72df86 SHA512 486dc74e3cfc6f94f1bf95269e35e866465095efee0cd31b586592fbd780613d4d5d243b809e494da14a69da8e0c5e47e6dd2ca35619616c4497eb0a053ba09d WHIRLPOOL c9bed0e846e90e9d31240d24ae536092a00819676fa9588b3125182bb242a597a69947eaa4b19ab5f7b2aba5fc4cf5e700c945f5174d2e8a384677ac6c256c42
+DIST fbreader-sources-0.99.4.tgz 2345664 SHA256 3d7c31d5ea314589d2a963290ad16f4d3d631a41e802b8b39f8be0c9f71eb8e9 SHA512 d4b11d7ab03df002ad4212db805b10b80a24ea4384e92122b12c25a3f817a0eb343509ae30e31d68417fd4ce27f77e043235436f0081ff2c785a2830d6211dc7 WHIRLPOOL 1d25ff39bcd93d3b0445abc76d3bbaf5e376385303fd71c98e3844123c85b9edd413f18c8d89a95807391ee2fb9c044d4dfc4b5898484548a011ecc22993e3d9
+EBUILD fbreader-0.99.4-r2.ebuild 2144 SHA256 87b49ae4e525a1c9d285a9ed49bf36ea2bc9f6a5b2e13ac73e28cac9807632e7 SHA512 4219403d355e7b38a04944cb589090a412fcbf1fdf2c21a5f04984f41c6175096bcc9436dd0179e19687f08d5b6326290baadb8b4e641254f627c679b50d09ee WHIRLPOOL 4f029512f2400269915e8c27bb718d157d98a325921c3e1c8ff6d66a1f8f9d4b31994d5aeaa4fa253f74410bc27d81e4b67248347059e7b4295d94dfcaef9718
+MISC ChangeLog 2862 SHA256 d71979bfe4b7db5a250a69508147d5b041345332d79da2aef5674f3e225a6461 SHA512 7119be4d7ab6af8835a81ea616b15febdc480987669e60e88ac6e401e46eebea51b9abd1a3f22e797f7a644e14a481a184df2302bcb3b2c8712dc6e71646d489 WHIRLPOOL f756ded8013beb14a2a574d5414cc5cb9aef19a12ff5ec75ec30a0c56eec9f5fd20b5c468dade79f0196e7a16f5a4993dfb7dccdbb1f4bd515a1feca37818bca
+MISC ChangeLog-2015 6698 SHA256 1df0df24d5560e8398111e053087e8153ee5f9da9dbd8cd2868db3c58449929d SHA512 31b67c3fb8c0b3854d750f0bf2840cbc82d99e7b67c599898c3f5a6f6ae4b2a94e1afc6b4cd1f9bfba0e24f3dacb80abcabe610b0e90626822843464d471ef93 WHIRLPOOL 8c9e35fadbd828160efdec9673f2fc3e26b1c7f10c551fd2097558cb397af939600eb2e07eedc896ecf129f9c1dfd4291ff78ca40f60c86d3ee99c330f3acf03
+MISC metadata.xml 332 SHA256 e5dde6d2eaf01486025c10a8ddea13c5db04504de76002de9beaf0042f73760b SHA512 f8ea42df45ef57c3a81098a86e13ab124ebfb4f6a8ae34153a03977e122448358d2cb852dd1f9b95a50e293f33a159940132b35b9444e5553eed6017bdeb5e98 WHIRLPOOL 2fa86bf91438ae5df35038019aa2e2d27eb79bd5510830bbdc3e7d0c9ba9e2217fe8c7d160d0874a5d10dbb630c962d24b8625f3b6eda915c77fd47940853372
diff --git a/app-text/fbreader/fbreader-0.99.4-r2.ebuild b/app-text/fbreader/fbreader-0.99.4-r2.ebuild
new file mode 100644
index 000000000000..347957b53029
--- /dev/null
+++ b/app-text/fbreader/fbreader-0.99.4-r2.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils multilib
+
+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:4[ssl]
+	dev-qt/qtgui:4
+"
+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
+	epatch "${FILESDIR}"/${P}.patch
+	# bug #515698
+	epatch "${FILESDIR}"/${P}-qreal-cast.patch
+	# bug #516794
+	epatch "${FILESDIR}"/${P}-mimetypes.patch
+	# bug #437262
+	epatch "${FILESDIR}"/${P}-ld-bfd.patch
+	# bug #592588
+	epatch "${FILESDIR}"/${P}-gcc6.patch
+}
+
+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-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.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..f71ef8d677c5
--- /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/Manifest b/app-text/fdftk/Manifest
new file mode 100644
index 000000000000..678b0a97e903
--- /dev/null
+++ b/app-text/fdftk/Manifest
@@ -0,0 +1,5 @@
+DIST FDFToolkitForUnix.tar.gz 5725906 SHA256 f7da280f258051f790efdcb6717c95f11acd410f825a0450864d4eea943afa51 SHA512 835438c5031464c169543d42a512ad691824dcea6d7f38e746bbe778adc9511eaa15c49ac2d4b3a92e4f831275e16a409e9e1e275983fb70309559ecdf686a66 WHIRLPOOL e3c44edb0745b6946023e0f483ae49de80132feb6a7e2b2b3051183226b54fd796405f8ac1e657e665360794adf4c3f42f24122830ff6a25a87e0c8529260152
+EBUILD fdftk-6.0-r1.ebuild 1437 SHA256 f8da24a0a93b5bb18b5fb7f53e4c48d3b0500f0259fe12cd984eac8d4941e486 SHA512 e09a43ac61516e3b44d2e4cdad56e2da43df887518c12384d9d0c6af84df37f55d30f20ac6083f5836c24a5c0543d18ba6e681c459f2ab0e74e96d67ea1a99f4 WHIRLPOOL 39457da8caa194a8c6adf28107726e81bd77ec8d9ce207071665ab28b87452bb4d91e36ba242081eb3a188f8f4db294b06d143851768e0ebd8d7c3cfee7fb076
+MISC ChangeLog 2423 SHA256 8e3322b4fe9ce4ec916858f567c2b421a345a5ef0620effa423d9dea41a71928 SHA512 97ed8afa5d6eda0e194dafd1d94ba4d9e2eed79a62c39743e20609f46a86ff501b45f35e2a19357161bce6930b69de6b18fcdc8b81f6fa695658fb0abd9d36bc WHIRLPOOL 06049b583b04e22ac0f62661674ed1a58fe67ee36be987b0406a7800e63a711ed02c1a71fb8c990b8b23d6fff7195ff19fc049d691a8a49751224b5f217b1f7d
+MISC ChangeLog-2015 1545 SHA256 936061bf5b049481e69e7a9c24aed2cfd2ba69663978a379fc88d5b1348809da SHA512 3e70ff4543066a966dc69bbfcaf540475aee9edc3bcbf4c04ea1a7897ad33514d1f51fe87cbd135c44d342496a28924f871e86027858359a418f1e8c1d6024a4 WHIRLPOOL 7679c7233f316e8653b6f3590519613442d213c4727728261ddec7d5040a90683114a31da84e72be709f09b2433904111b440e591f14d09f28fe320607f9f0d3
+MISC metadata.xml 324 SHA256 1a6043995302da8212b37aba107db3c7e8e8d075c1f801775405886b373ba081 SHA512 73461851a2949c275eeb920052d972a17c5f687eeabc7453614289cc1fa05b4c2ae9a40a2bcf5b767b564c8ce93e24b7a619e71ab706424a9e0990a30ad28959 WHIRLPOOL e6a898dde91102a8694ebefd99982ac98e6d8cb818da31319cfd4f47cf558b948a901f18466e48d9b0e1c0014335d93445f53f9020ce3823085a2af0749de1d5
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..dcae70d7b7b0
--- /dev/null
+++ b/app-text/fdftk/fdftk-6.0-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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/flpsed/Manifest b/app-text/flpsed/Manifest
new file mode 100644
index 000000000000..089301390f5d
--- /dev/null
+++ b/app-text/flpsed/Manifest
@@ -0,0 +1,10 @@
+AUX flpsed-0.7.2-desktop.patch 247 SHA256 b969c92af4fe37904a248c21cffca01c4ea3bca6c8c215a3a9205df7a45b8e77 SHA512 b632a6b4948a12910916ef71a4710dcbabf91fdfbc302e3242d9101310101377023e58a12b24b6139d26fa37261a779db21773a8329e3f74d2e74c5cd1c6190f WHIRLPOOL 097d8566841ece7a42c3dca8045cd2c1a93701f611effd357bfac821fd8ff95d56af24eca89aa0faaacac75dc464c2651fc3a0f5d55f9fd962fc261cb9a6e6d3
+DIST flpsed-0.7.0.tar.gz 119159 SHA256 aedb5c96dfdcbe260d133f9b674a98d9948a1614d76ce623acb57503f2850b38 SHA512 0d5112f4e4f4401a1942767d0de1b38cffbc37e0f798b59e9371c37892c6d2e2448146baff2737e416ab9ec5d96963728918d4a49fc059ac1119d8ac946db59e WHIRLPOOL a52dd393b2a1aef829ce8d1f6ef7b9a9c95f08da39c4dec261943ea37abf2bb319cbb53bd76642d0b6d1e47f520b4236995528be1010ebc2ffa41b4aaa850edd
+DIST flpsed-0.7.2.tar.gz 146678 SHA256 c8c5b54fd21d0b2af2c11bcd7e68f0533c183ba0e9b24f8923dd64ab1eb56284 SHA512 d0e2f7d34e48555d74f58e9df16fa6d29e8fda1fb4c6e58ccdda512f25d7f7ee0e3657e11564cdb9dec483c14f42078636430e5ec987165cc7c6c5de8990984d WHIRLPOOL e7e713070463a99301fbceba62700c3b09ec8131a96d569305cffeb26664148254b84ace75a61a91672e939e568436821b0c054e9d70d7f4a3f4463699887007
+DIST flpsed-0.7.3.tar.gz 146788 SHA256 b70bb751bd70af9893ae2369f0789fd79729d0d6d1fee6e0522c4e6f55c7cf6e SHA512 b0a8bf2ea08630d280f83f7c32b4574ba4cf7fd989943492e77d1b73c8d83c81a5df40e64bfff744b5518de845eba21119242ff752e16b20816b225ccb7c3321 WHIRLPOOL b9b8e6e98e9685093303e88f1356e97faded49da6e216db0fbc164300f1b6c2baef2722e0ffc494fefe63796d67768062d8b5ca47b59955f65ea47f26f6892fc
+EBUILD flpsed-0.7.0.ebuild 428 SHA256 5291f419c36a21eae8323dc2e4f4576285fa4f3e489285f163329f39101cf6a0 SHA512 eff4dfaba72d90281a42f0d1f327ab78024099dcba5713d0c6b6cd52483d1b867e08f2f2a5630aaa2872cfff7fca3d599a5a079be12b1024eb152afa155525d7 WHIRLPOOL 5581b75df2a80ed48469ed5dea016184110f770efa634c27e1f2ea5fb1162e6a105246998e6c49e5b4e2d9370b9584fb44723306d8d437c9b7cd09e8d34ab158
+EBUILD flpsed-0.7.2.ebuild 604 SHA256 aaa1b41d937ecd23210e371adaca41a6ef84b3aa6e9dc472f30350ec6748bed9 SHA512 a09b7cbf10d1c4b5aed3fba5467fb79d420f61bc779fbf61241492c33b7579fa693113dba336c5a2e8d8f5d2415d2958cb6333f06fbe41e8b51010fa9867b8d5 WHIRLPOOL 05de29fc8320bed4d831a025e12290ce1a65db80eaed1203acb8567ae6baeab4d2add81d6e86c9306d81640b2c55f669e1dfaa1073a39c34c16397bcab93f22a
+EBUILD flpsed-0.7.3.ebuild 611 SHA256 f6c6161e7991a87ebbeb7a955807192b5ed9e2e39ed410803e81fbc67d097a75 SHA512 5feb11a89d61f3fbb4d273681ac4c0d7fbd4c2fdfc47d0c665e2fda38bbd6bda26e2a7a0b0aae950c7a103ce1d9bbde961749214e291b3c31ce51c0c92b8fbb5 WHIRLPOOL 1a73e00e0120baaab2c104326cb40aebeead30720d61a28f84acb3f0e799f71405173b5acf426194aeafec8b634a8d7ab83a5f57b22176cfc6388dece6ae170f
+MISC ChangeLog 2561 SHA256 d125383dd8b5f529bf762f6fb141b120dd20ff90cbe48ce6467a1aa8b46fef4a SHA512 db1d2b0bf311f1f9b07ee947c944a6f3c674c3af68073e2a287170892e702207d902b7acfd9bc89e6e00aab801ef8370d8a8c4123634457cefdb60036b6c72c7 WHIRLPOOL 2d300724bfce5167e43df0d10507cfde74d5281329117533091ceef7a8062f2dfb7701a45802eb19de34a25fa97ad9cbe7bbeae7bd0170be49b2ed7cd130a513
+MISC ChangeLog-2015 4165 SHA256 3ff056bef17389319ac6a032263642aa3948fdad1124a92b7242128730ab4a03 SHA512 7972841bbcad3be871b9edd1da0931ce1351b09b292d44fda5c253da84d70f50e6dcb780369a6725bc43857766816141114553cd2775f5f31e4e2db8fe3c7f4b WHIRLPOOL 27ce715a1833f84da58c4bc6d114bb999a82eeab51bad78d5ce2eb16e5c00caee259ea47eef641ca015398356e8daa3682ac4fd3b27dce06b529b6a1cbcfa12f
+MISC metadata.xml 245 SHA256 b3de478821488be2cdc91b078e21c911dc384af882c5c44631a47dfa91516dc8 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690 WHIRLPOOL 701a78fc2214f5fd4bd781477f85e87e716b8d76ea831a0fa4afc8871c4286cc363679f1ff4f844555ad4f77cc7265208b83e805f56c22fc4baeed1062280c08
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/Manifest b/app-text/freepwing/Manifest
new file mode 100644
index 000000000000..0cd043a4a88f
--- /dev/null
+++ b/app-text/freepwing/Manifest
@@ -0,0 +1,5 @@
+DIST freepwing-1.4.3.tar.gz 129499 SHA256 34287268520b622ada5b1390dbec346e586e04509278eb2e3baad67f494f3796 SHA512 e363d2751410d6e39e786920faf63c4efee74e5004594f95157f700eb3a68a92a9e98635978f21f5da60f7bd9e1a3b4049f90c7b9da0b4bb0374081ab6738734 WHIRLPOOL 2133bba842d1c37139182ffd9aaf3b4d1a443edd296043dd5b9ffecd6e96e4d828748b4623f26d52404654bf37b277b655cd7dc70e552a32a30cee5c35808bd2
+EBUILD freepwing-1.4.3.ebuild 566 SHA256 e857fb627ab3dc592c83c901b5f5e801ef147905843704efcf7429a3a532e8c2 SHA512 4c0c33bdff315150821b619e615bc22d1fbac19c26736f2304173ed348a4af4540bdf6351762a8d1c71625d72ae090e985e5d870130878f38fc77954a99739e9 WHIRLPOOL b001dcde3989fd9b4c18f248bc455a8a2ad03bafa46741f656f002652212e0cd5e31c17d0a3daecec3902e3529c16b60b0211f342f18b14fea399b12ffcb0f0c
+MISC ChangeLog 2528 SHA256 c8de1bb0783becabf01033b2ebd719deb1f3e9737c4378aff377d59cd0c503fa SHA512 7ac9615c3d6f139e71e18a0dd04f4278c6a357887b12f4793c4e4868d123f46e9faa8c8faa78b87db03be1ec9e628da5144d3af45c12fa0fbbaeae59cd278670 WHIRLPOOL bdedf9d30ab1e6656d1d67edb00a42dfae34cb1f60c262dbf9e70d96147820d737dc918db0c22ac42d2a1cd954674d74cc78e93602bf57ca26de7d97c5e88f01
+MISC ChangeLog-2015 1007 SHA256 b72a248e1e0be15ec98f046064bc3409dd6c83b14e2d706bcbb15aa53df9411e SHA512 cb7f045a662aa8b5348738ea87e0594607e479ec3d492982e78a5fe12036c11410aba3d1017212639ebf71b05583738abede3d5ff8ddce9fc7122e0b8fef28fb WHIRLPOOL f80c0e17414e7c8b2a6fad43341bb9b25447da2404b13f8a51a8929dc85a48d7fb2ddf4a43ed97dbddb7ac611add5f9b95f599608f2dea5a854ba619864f8f8d
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
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..4b9cf3f6f351
--- /dev/null
+++ b/app-text/freepwing/freepwing-1.4.3.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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/Manifest b/app-text/gentoo-guide-xml-dtd/Manifest
new file mode 100644
index 000000000000..7773e52f3c65
--- /dev/null
+++ b/app-text/gentoo-guide-xml-dtd/Manifest
@@ -0,0 +1,10 @@
+AUX catalog 524 SHA256 e343b21c82c7a7192c471098d079ac0cae0e247ce5ca1da6c370ef9fe81a725b SHA512 1a5ea6247d65553e823b853311a13eeed9c589e4c66203e152b516f636b8a39f53560715dbf6f421d653af2e78f63327f913894556645ae92a3d479d3f3b2c85 WHIRLPOOL 56c280116ede7f50ddb5df10d4f4f5d4f880b71985e5c618952d5482900a74525309fa1d11dbc8139aec21679173ca7daf54f3616145810ef4667cb2d6dedece
+AUX ent/iso-lat1.ent 4554 SHA256 82e8588eae820695977bd1a7158714b3c09ebf9d8228e875fe90fd9f0b8b59c5 SHA512 3e86258b3ac6849b82e6524d7701ed2ce1cafbb1697c3ce900572f55515a8fecfb1ea9e245939eaa58d6d99625719e258aab9f7660ca2d132cb9eb9deee055c4 WHIRLPOOL 7f84831d21a2bfc499660a42fc430740bf54a186374198f58c140508af6cca7940294dd04fdb8bc3e5fbecfeaacb819a8e01614e9d179a0136e9a9c0ac7a7fa3
+AUX ent/iso-num.ent 4085 SHA256 3cd12debf4067ce81435970f9c9e8326354bbd901ecaa0cc3daf7a2087b64af5 SHA512 2ba450e7b2f144425b373f04b17cf6724ceecfafca9e6bbdcbd67a0f945a078ad882d969f7509e0170bb2b532299d9b4b73c3bab735279029355344d8e411044 WHIRLPOOL 71cf2790c0239e9c2c0acfca08f23019c3a389b22ad7a31207c35023e81f0929cac3d5ccc1872246f3f1ae6f3f5a8d0297bebcb098baacfa011129a548465446
+AUX ent/iso-pub.ent 4590 SHA256 941de8044ca8224ea3ad89cbc8d0f44301a2650106a683d9e028a7704eace91f SHA512 b18f51ee40d602d0e91e1b6472f81f7fe1222394d818443616deb174806db217093794291bf410372ceb558ba05d875834b0ebc263135d632cf9ed73ddf16fce WHIRLPOOL 335d0944c7792b9953d7ee8fa4d3fff429b9da62a5b1fb6e12f2de37cb2fac174c81d5cd39c1c8f8b0250c750611d6f36e008cc96f89d5326e8c7dc223701ea9
+AUX guide/guide-2.1.dtd 3806 SHA256 b9a56b2a1015f77f5f2cbaffed439ea5928edeafcce3bd9306099970df007be6 SHA512 b44e40196353446a3ad02e0288ce387b72cb35177ed9fbc3f4a1e046ccc54658ea94d48aa344508dc10b60d2096e4309e80db21381638d515a225976a9e65626 WHIRLPOOL a17e74cc8bdc9ca4b2f81fc1e3e7e0b47dbb6d02cbf408581c177281f05c3737c5d3f6e4001cb1a8626da4a7545161b7986d54644b32397e787b142fa0b2f1fc
+AUX guide/guide.dtd 7026 SHA256 2bbadbb3ccf3cf90355ec4daf3970e45c999d22caa850f293c1bc629a8d0886d SHA512 088436a7e1d1c9d23f717b34fdef5ef80f04f64ce68edf1d98c430266e77c06b0857db1e028aa640ae5457ac7f0ba95cbc45f79e3bd7945a388f8403dd12e508 WHIRLPOOL 2b81c9701a078e741fa083ae7ab36bbb6e04cdc53a8cc472b437464842312f27b1f4919180b8cd60015082b989ebd3cef19a458430a3fa56e2ca84cd9f31baff
+EBUILD gentoo-guide-xml-dtd-2.1-r1.ebuild 694 SHA256 829537acaa2df099de64d04dd04c7f128ac47f0e18c0d48741d8123539f1a163 SHA512 29686267883ca0c7f5cb29de1968842626df97c3c5b7b7796969880e059db531d70222acb65c392ed0323bbd06db108ad9d8db27f4e1b84cd69d162ffada1b89 WHIRLPOOL 6cdd4e95f9c4b3e927ba28272e2cd4292028ed1b944f47abe0191046bbbc788e0caeded54969c253916fdbed8f40e0b2ef97ab2b77a4c9164ae8570082239eee
+MISC ChangeLog 2746 SHA256 cc5e3aba33397ecce7c1e716b15c70a5c0bf8bbd513bd660581e0d536d95ea1f SHA512 0f4dfa298032995d165813f7403a1ef57e7276fae2a985b9edf0cbcba5ed9efa40cf3b6f572de2971fff16f9e37f24e20e920b0f04b13750dc1e254c803fc494 WHIRLPOOL d37afefb0722f74e399164aea06ee4517f6aef391fda330a6a9a4e05076526f4bfa8e78cc7bad98f261acf8119fd850b5deca0dfed85c779ab5ecf34344d6f8c
+MISC ChangeLog-2015 2017 SHA256 4937c984a87237015b1c80e9c311a74c2ad5c98cb7b808daebfe49741763828e SHA512 464a198079a23643062977f3b465b90357bdd1c0208f78ccec31ce2134c576444f34708d8823b1f8e92d6262e959b29edaf452c06f1eb83fb09036a6dc1ed1f8 WHIRLPOOL cdd717410a936afda7df4b1ba57d77e67048d9cad1f24743d1add2b7c023ccbd74e5f92f9454d9de7b3642a8caa3075906d403debdefa768521ee1b2f2b8861b
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
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..d358d79a0c60
--- /dev/null
+++ b/app-text/gentoo-guide-xml-dtd/gentoo-guide-xml-dtd-2.1-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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/Manifest b/app-text/getxbook/Manifest
new file mode 100644
index 000000000000..622c335f9c98
--- /dev/null
+++ b/app-text/getxbook/Manifest
@@ -0,0 +1,6 @@
+AUX getxbook-1.0.patch 863 SHA256 ceaa5f841154f9ce5458e71424dbe1000203634680e516aa09ee3ff538671811 SHA512 3b953cafff23f01918eb910d06cc6bc81d8420fbbe18cfa3cab59458977c7a843ac62ef8789ce0883c225200593f657efce593afcd5bc9a8d87a8f30784ed0cc WHIRLPOOL 2388bd79fdb1de0f173a30aad7d89970575efc12619e55bb5d6bef1d9c806d01e87cc144cfb94dd9547df5817964b9c32a934a5d59fcd51472c329cba82f5c27
+DIST getxbook-1.0.tar.bz2 22314 SHA256 ce0f7d0bcd9002d31c94617cecde8145cbc138a2ab3aed1a75af26b26e3e9521 SHA512 df912e67ddd823e4b1ce1539522ef0804f74758aa27baa0c568790859fac97d40dbc8f574be936fdf3ba8a1135bcc3d9af1bedf0205353d7a12f8993393fe941 WHIRLPOOL 863b3c21b7c79166d3ac14cc7e11971b6aee4ba724eef48362bdf56b58fba21fd61a9162a2839b4f981cf6e2dd61228b69ea00adad8b84a62cf14530dd45d580
+EBUILD getxbook-1.0-r1.ebuild 935 SHA256 eb8cbe5acb2cfc29f845275792f3f893edfd049623871d28c9f85dca6a8c7bed SHA512 bc0d6f4a98efbd087552ede80bef2c81645e559f2d18df1b606cf7de6379a6cf36acb7ff04ad708fdb4d01b54e65dbdf9198684289179f79a19ecbeb1c8d6bdb WHIRLPOOL 707995766a12476d2053a6fac41959a5109a6ea467dfee0cf6568790061d7e1fc07815a21d7ee07f4e7add44367a995ec4b8b67c824c3d6c119267263bfa2c9f
+MISC ChangeLog 2208 SHA256 15643c9f2da3e07e06ceb04226ebcb2e03365fb7da13d5623560b7e7f138c100 SHA512 85e597398fdd0c52b8f96e14277bb693859da8b242367436f2233874b3865ddfb8a31de8ab6d925e2af05be5e2cbe25dbecd54c6e9c119a782dc2faedbc9ca7e WHIRLPOOL d46d0d346a52cdd8d376221d73b5418e0b66f7124c23eebcdd2ae0e721493f432bc929a2f02045830087157fa1886e5886e18a7cde727d8095c64fdbec8b965d
+MISC ChangeLog-2015 1257 SHA256 9bdb5c2649f618ef0e0fa7249709073f093008de372c020d3a467b656e48837b SHA512 61e53e6f16d3629e48ae065bf5e890dfc29f3cd7a8b76d8a7ead29e8f3fce2abbfa7c929baebd702dcf7ad9c8c693a55b740b95874b39f03a7819ad1e3c305d0 WHIRLPOOL f43de2d029ca8c6413ffc264cd248d5a4524a15f61ff2863f2430945cf9a3b78b68d7d7b0b5ae2cc1379ed0808cfaf8ba7154fcb40ab5ab5f6ee72f496935880
+MISC metadata.xml 635 SHA256 04bd8547b3f9d5793471b22f6625f1364549a71de6932e580d7d65c773f50142 SHA512 297c1e817da165662e84bda74934d4493edf3cca336d48ac6e1cd7bf5bb599d9967e0fe38f0fffbafc526185b0bdbcd6244cf7c5b61fb303791e64dcfd80e504 WHIRLPOOL 08dac7beaa8436b73884c0b2403b39cbc9de3f6a2815cc86b419a37ba326b471c4c6ea85d371fd7162f2836a4c12521d3c3ff961d7f3137275fd0251c10a8cd9
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/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/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/Manifest b/app-text/ghostscript-gpl/Manifest
new file mode 100644
index 000000000000..8741d4bdd9ce
--- /dev/null
+++ b/app-text/ghostscript-gpl/Manifest
@@ -0,0 +1,7 @@
+AUX ghostscript-gpl-9.18-gserrors.h-backport.patch 1412 SHA256 d0b223115feebae343a9c8f598cc53b994238c2415c4bd0dc83e8f49ad538451 SHA512 86f82ce483fe31fa8ccc6bfec3936ced30fb4a67c1875012630877dac1367b70b392886e3f822670ea2a6885c7a992a6543751007ad5c30a31601c4f9a23b904 WHIRLPOOL 52e6e83b39692816d2be4cd727f5add82ba8abbd0d1a3cbcbefc99470b6d696bff7ea18ae77960a71bf0f96d8cf7046a818e9a695bdc71d8a59beb9a54d24127
+DIST ghostscript-9.21.tar.xz 29164532 SHA256 2be1d014888a34187ad4bbec19ab5692cc943bd1cb14886065aeb43a3393d053 SHA512 cfea089b92fb01e3f7c18a9ce05e7165fc8b356e2914bf53b7f2fd9de672279c8b97ced07e983e619f0d4334ce16018b100cfbf0cc872c215a8cf2aff4c78731 WHIRLPOOL 3836454ff852633940420a4812667b13c7e9b6602c3fcac7383298bf06cf2157a4580ad4c06cb9797af21418b162f52ff5bc03dd3651079078677eba252c8b40
+DIST ghostscript-gpl-9.21-patchset-1.tar.xz 6196 SHA256 53abca720b67cd6b6117b2d4e2946916957fac68ce5caffe7c151504f9db777c SHA512 58fef7080ca17a238231fb528be48f52bcfa771b1e496d7fede6df45fb927f1bb1c755cb77e02aa739295b0ccf0b3d3959f9a05a1628d32ffd11e134c0e0d355 WHIRLPOOL 2541f34acaa5fc923cd82b8873c82acc512bca2b6b28cf347e511acd5a259b4676687cc3c2454b8631a4c7559801c3691e6397c8bf3e04c7575c9566574f35c9
+EBUILD ghostscript-gpl-9.21.ebuild 5561 SHA256 1965a53fe775276ebee6abfc5dbaa165ffe05cc03a3ba921a59443999d40e85f SHA512 0e6e410f15df35ee8aeca223c01d619574bcbfefd3e3c2468e1bb2b6ef9626b4c00051050889b43aa6ffefd1d4103e21f93e7c0c8898ecec5ad79746a6d38d3a WHIRLPOOL 2d76911fbc95fea043b207ad07d3b7fb4a86cf6fb4b4cab9cd42adf709aa0a045187067ea54ab21f25fc3f3eca26062f2c04608168e0b64b65da07e802f1d20c
+MISC ChangeLog 5750 SHA256 c454e54cf20c632e8c191dc74958bd6d941175de240a5067cdb09976d5473fdf SHA512 ef7bc8d878ddcec6e988c6e54fb9bab785c6c17c15eeab502c864569aa8b80c418169572eaacb24f2f67e7ac2b339d560cf91f3a93efb095fb91d3068212f7bd WHIRLPOOL 74f0c66eae78c1556854289aa85917f015c1722c3c74d8c74b5394744397de9ed46d18b13498c51e7e0f5518eb448611f49d7ebf574c2bab2c6b1757478ca45b
+MISC ChangeLog-2015 33265 SHA256 84395effc41482066ab97cdf2625728aca7077680c3fd19612f6687e08c6f7c3 SHA512 f49e0a352505113a5c1a233c14ddf0845c53f4a62d48403633d00832aeb2ffdb85cca8fd0e5ca6daf21c212ade41c41069db43927b36cdf79e7b08c42ac50566 WHIRLPOOL 7b0fef3096642d4e81746d8d9834ee1c947417bf1362c53572fd883f49de45edbbd46fa6e1c86f463122281f2b0ef60891257f9e6d2d8a0d50a24f4a03674639
+MISC metadata.xml 516 SHA256 c1080e7742c7915645c90e70143a45fdf66d90eae50f8c74009d5d20530dedf4 SHA512 2f20a51f4716d8581748520da0c353f3b9846182ab77ac459abe178f6fd68942c9fc15614ac5a01ae183ff94f3db318037038f48fae54620d6aa7a25de9834d6 WHIRLPOOL 93ef13281887a1d0dd886eb93e892bfcb8b8987e457caf2f668f3dd2e731ff8d4f25696cfc51d5b8a36bd25fce1c0bddba760f827befa75a4cd8824fdb9388f1
diff --git a/app-text/ghostscript-gpl/files/ghostscript-gpl-9.18-gserrors.h-backport.patch b/app-text/ghostscript-gpl/files/ghostscript-gpl-9.18-gserrors.h-backport.patch
new file mode 100644
index 000000000000..c34e4866213e
--- /dev/null
+++ b/app-text/ghostscript-gpl/files/ghostscript-gpl-9.18-gserrors.h-backport.patch
@@ -0,0 +1,43 @@
+From feafe5e540a0545ec5d28f3f66bb542056bba495 Mon Sep 17 00:00:00 2001
+From: Chris Liddell <chris.liddell@artifex.com>
+Date: Fri, 23 Oct 2015 10:16:11 +0100
+Subject: [PATCH] Bug 696301: add gserrors.h to the installed files
+
+for the so-install target.
+
+Also remove a spurious (copy'n'paste error) comment.
+
+No cluster differences
+---
+ base/gserrors.h   | 2 +-
+ base/unix-dll.mak | 1 +
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/base/gserrors.h b/base/gserrors.h
+index 5f18081..cdebb38 100644
+--- a/base/gserrors.h
++++ b/base/gserrors.h
+@@ -25,7 +25,7 @@
+ /* We don't use a typedef internally to avoid a lot of casting. */
+ 
+ enum gs_error_type {
+-    gs_error_ok = 0,	/* unknown error */
++    gs_error_ok = 0,
+     gs_error_unknownerror = -1,	/* unknown error */
+     gs_error_dictfull = -2,
+     gs_error_dictstackoverflow = -3,
+diff --git a/base/unix-dll.mak b/base/unix-dll.mak
+index 7b67aa1..73b4fa9 100644
+--- a/base/unix-dll.mak
++++ b/base/unix-dll.mak
+@@ -186,6 +186,7 @@ install-so-subtarget: so-subtarget
+ 	ln -s $(GS_SONAME_MAJOR_MINOR) $(DESTDIR)$(libdir)/$(GS_SONAME_MAJOR)
+ 	$(INSTALL_DATA) $(PSSRC)iapi.h $(DESTDIR)$(gsincludedir)iapi.h
+ 	$(INSTALL_DATA) $(PSSRC)ierrors.h $(DESTDIR)$(gsincludedir)ierrors.h
++	$(INSTALL_DATA) $(GLSRC)gserrors.h $(DESTDIR)$(gsincludedir)gserrors.h
+ 	$(INSTALL_DATA) $(DEVSRC)gdevdsp.h $(DESTDIR)$(gsincludedir)gdevdsp.h
+ 
+ soinstall:
+-- 
+2.5.1
+
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..96684b339410
--- /dev/null
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-9.21.ebuild
@@ -0,0 +1,206 @@
+# Copyright 1999-2017 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="http://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 ~sparc-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/Manifest b/app-text/glark/Manifest
new file mode 100644
index 000000000000..72b6b4f1af54
--- /dev/null
+++ b/app-text/glark/Manifest
@@ -0,0 +1,5 @@
+DIST glark-git-1.10.5.tgz 196283 SHA256 b6d12ca82d1f88b14476f40e98ae9c34801107a49fb21871c8189a01bc824647 SHA512 6dcad5567a10f1608925b690e86cb8c0f4be56cc4bce70410d3dd3568a191be2c3fbeaa00bea296de6d658b65b8bd081b1d5555e3e43c3f03a22d5e3d19d6c2c WHIRLPOOL d8853c288b96600acd0802688ffe864fbe4841ce1bbc7845dce67f23bf16a2f728d0ccf7758f70a321a58e0a093ced6cf54606542c766d4b8ed090d87fd8f223
+EBUILD glark-1.10.5-r1.ebuild 932 SHA256 0f51ef314d2a1a03ef2cc7359d4470a83edfc7a0589f0596c94343cc6fa52d13 SHA512 73afb6bb5ee111a764b2a23bf8dd6add7c9a9ef7c0d0dc9e25df83e88c3846ae23b1a1a96f1745714a34005622617b32252a3e62e8225cace39e7cd1b3ac4ace WHIRLPOOL a4fda0d5e4e2cf99f2cbbeb12c29408f1881040f8b6e14696e7f78a8dd67c4ba2e12f73905b5d28d1f7c4e18da6b62e0c754c26fcbf94c02439118d3d0bfc763
+MISC ChangeLog 2948 SHA256 1b7c610c7945e55037c94c5072a32ed5a1c0c5d9ea828c2ddf39a986cf456b0b SHA512 8369bbe03d51d0e8d23a9e883e4cebc7e5ca10f09fadfc2e7aaadb3568149fc89ed9487eab0ceae47ae862d53f18eac11fb28c397e9ffc3be12588049f934585 WHIRLPOOL 26842146bb2f49000517bf259ddcf3d91569f05b6bb75367aa42ccf14a50d34a1315e97f2295b1eb0b0f90e332338303b6695cdf63e341c2e1d9e16865496b70
+MISC ChangeLog-2015 9525 SHA256 c44816a37b42bdac4d7ac64d4d1e4ded80ca3655a7b9ef14550babcc198d1edc SHA512 a9934a5b8370a36aca1ddebe60180c2975c90f7f87fdba005877aa725c12bda5073df0a6c274693a015c1839933d64361e8f42c8b70625218501a520384c1efc WHIRLPOOL 5c318d1d3589ea8c2fe2b2639624d60deaa5e6de790f5e728d13f1e606c1a33dc1446c857fd21ffc2dc9fcb4fb7ff65e84cdd04f47618d34bebe7745dd524d16
+MISC metadata.xml 452 SHA256 79a54d8886d7b8940dd5510355d035034f6bf3061196379f5e66dac6038c6734 SHA512 4ad436340a3d16c7c141423ad827f585c3dc7a73db3602ac57ae3112941349f83c604a35d802ff2a3fe9efbf5614b57ec03291c07f394d84989535f24ef85a2e WHIRLPOOL 35bb608258d6f402d191ae5e899042e19f84a7b7ceb74ea0a4281218d325c32b12f7bdda97be8909b511c97fd7dafa5645de193e015310ed922a562345315eb7
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..68e1b5299ed0
--- /dev/null
+++ b/app-text/glark/glark-1.10.5-r1.ebuild
@@ -0,0 +1,38 @@
+# 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_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/Manifest b/app-text/glosung/Manifest
new file mode 100644
index 000000000000..63e5e14df3d3
--- /dev/null
+++ b/app-text/glosung/Manifest
@@ -0,0 +1,12 @@
+AUX glosung-3.6.2-glib-includes.patch 329 SHA256 c9cc1607fadc3a5ae4f2cc4147ceb97805618912e505ae1e12c949a2739f069f SHA512 cceb87873bb1b617f0d550d0d1818e21705c9894015a6c8bbd6050365af580956fcf6f79289cc0ac619552ec170af3f42f5222c5733548f7eb5d3fd303733044 WHIRLPOOL ccf5a804c91299a2fc0cd3a7e4f3b765c630cfe151872b00426a3a16f0d52d85a0800ce81e691f2a4942b86a7045ec1620812e3e3f28fa7e3d8c654769581601
+AUX glosung-3.6.2-scons-2.3.2-respectflags.patch 1701 SHA256 a8560edd3780aa20d8478e22fcc711b26e02fa3077a468aac2362f0b4a3aa3af SHA512 6b2dfabc97cc87280a8078accd5d39bbae47b3d03db9efc85b820da135c6231683916cdae3a00dcd662d3c74332322997579370bf7b539f15ea033786d4fbb70 WHIRLPOOL 8cd9e23b3074b49aebe94ef198ea675da9550ffd1c62182497b22afa038fa4f0f0393056a27936d485c85c0d6e2e03dad5844e3471bbefebef31c15e8e811508
+AUX glosung-3.6.2-scons-respectflags.patch 1720 SHA256 2f30dd716dd64c5ee2a6766c0ea65a7d789210bdcada326c94a2477c60b88d36 SHA512 e2ab10f723fa30e9aec8f10fe629711228ee4d08076095fdf3879bc23da1f15fe991367272d55c5490f96255100a6024c96f639613f6a402b3112fb68ae29520 WHIRLPOOL c3438d1feaf72fa256f6a3ce71b529a5561f0f765afac40a9101c74ba0245b3cab2631d137ee3c6b021fccc47e93eefd5e6a865efdcd16fda0631529ac1b0797
+AUX glosung-3.6.4-scons-respectflags.patch 1785 SHA256 222e660339f4c7cc4d290cf074f881a437f0c157f45593aa32fab2a6738bd135 SHA512 7cedc550a6cc3902c38deac26016facf1383c581d03b2cbc4fc484c0ba0cd332bba5496904325a09c8416595fa14c92b1db320f902fd1acaa515e1e8d4da4b8c WHIRLPOOL afffe0df6cda9a5b264a9acc96a9f8403e44231ae4e2f2eb2a1a1432c39fd0412ea5fcc39cf21e097a9e14acf230ed4f03ae347e97b8269f481f519189cd3060
+AUX glosung.desktop 374 SHA256 813df4d09c476b28b44af96e86b7e663fde1970e1ca1274f4f6d5a87c67d715f SHA512 3afccd76f801b61690eda4e7902aa3abe048a241dbbe31dc17670611d0463acbf5f54536d59f8b6da2d55423b62bdb0b16c30c241cca27b0774908e067d280a2 WHIRLPOOL 5160b172bd2fa81b615d117f17296a50f4f111ee17f86ecc31ec80601949381bfb5c7e1649c9d8c98fff84940887654ca586417c22b657b15ec51d14f35ef1db
+DIST glosung-3.6.2.tar.bz2 65089 SHA256 5b46cd776b51ea3ace6ef901512c4100e79ce5225f7d7cf910b69d930b7df4c9 SHA512 a9e16f9202092e6b73ca640787785fd6985ea1ba914260b783bf8f4b6ebbd6ed807cbdec5381059a2f905fae31b7aa844844ae2f9df0379c60e1251140760b11 WHIRLPOOL 91bb6e08f149430edb41b901072b5fe4993590f7ef173b99f313d857539e1be40dd00797b8623312da8a2909be7577d39b5804523e3b79bce00eccf919ee5a8c
+DIST glosung-3.6.4.tar.bz2 71887 SHA256 1104e61f04d1e9be5e7aa0ede7e9f7a415974b97222164e410d9828a81b233cc SHA512 c4f51d2569e0c74bddf6806551c314a337d573cd10ab1b6dc04c735c24e4e3e679af35b5d7340d7917e6f4c1fd2b4dec283205c5f744b8c020630ba428738349 WHIRLPOOL fd1643b0e602a8f38a0c64566b798e922b117bed50f46183faca0ec11696fc0567903af0ed9becd0d189571777968c5606b234ac9f9cb7972fcf9b6f9cf392e6
+EBUILD glosung-3.6.2-r1.ebuild 1232 SHA256 575e0da5c796b7854599a1faae2d3c9ade5b51b2a375ddd8ebdf0a6302149906 SHA512 5497faa310f62402217930b38b51cb4882abb839bac0f89403296c10604d2a5c5e6bc4cb800ad77c5facb1ae4454a49c4ff4a3a5dc2491842c16de27077babe8 WHIRLPOOL b121eca6e51a3fec22fe97792c799fa6f48a056f3afcea754072f29abe797572133719e02fcdfaaa217b2cfda99aa4cd0c9623232219043b29892e29bfd28c9f
+EBUILD glosung-3.6.4.ebuild 1040 SHA256 03e54bbb315cc86eb1a2bf9c2f517f97d6e0731045cc8d75435501a5d1d5955f SHA512 d8250228f1941331ac9ff867affd2ea6a42041eeb03ba832dbeb0e63361955390503cb396e9dc031c5b21bd090e9f9d78dd95b97adc51ba151d782df73bef7ab WHIRLPOOL 6b82d0afc754bb17e34f4bf18d56966e7cfc05ddc935cf22b53cc121a39542e7d491828bd4bc89488fe2f88041d682f5d4206e060394d93a195477d3174a9c38
+MISC ChangeLog 2831 SHA256 5220e63b4dc8f311f7715360a2c51d4dd9e43de4710c550994dd4eaffad2eef0 SHA512 4678f940a2e6e9ea0a00582e067dcf33ebc91540babc368a0473b9cd7318102d320eca4e5746365908059be28f68f5f2658574745fd28963a6bbfded486abd48 WHIRLPOOL be4f9f74c029d5359751d5d59e323772b918a7d55d06ee1602924bd7450b2167148ce9ee7a4abb08b122ae8ae5553e6947c95cd3d22704c6fcc2fbe43a7907c1
+MISC ChangeLog-2015 3366 SHA256 147bcffaebc122c74d70687244ae05383335b0608416d5ed7f73ea704b84dca6 SHA512 c2868729ab12c095844af2190c1b8d93bcbcc7fc416913765a652beb193bc8e1e19ed53c2fd8ac99a6810e055f7c84adf4ee935bdaa55877441fe18594737f92 WHIRLPOOL fa451e60c5f224f1bbfb7911b1d4648ce2266bd6a01c4c5374dbacb29608c93d143151cc0320a793b05f4bfd438bba739487be2ac84a9429c6114fbb85d7ac7c
+MISC metadata.xml 297 SHA256 83d88a3957d61fc52df3f6972a020a427ff1a54256749d72ebbbdd8f47c4f6fd SHA512 4e9f59f67c171aa9fef3056f2231632fe454646bd45a1170d996f99ba5ab4ab08bc8194f7c1a345f405331dd5bd302d10e57379760eaf867dc69f200884dd8f8 WHIRLPOOL 08e88c1bfe62d1cbb23b2a0af08172254bd9944c0e4c799ee72a60e86169a6f522d2b2b22f40321a21fe757bf7e4488eaf150c36ab5246c4d1bccde71083013c
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/Manifest b/app-text/gnome-doc-utils/Manifest
new file mode 100644
index 000000000000..2fb08aa567d6
--- /dev/null
+++ b/app-text/gnome-doc-utils/Manifest
@@ -0,0 +1,6 @@
+AUX gnome-doc-utils-0.20.10-fix-out-of-tree-build.patch 2101 SHA256 bd9b785064554ab872175154a7e9fdd74f5566b66b057fef93cea6bfc323c958 SHA512 25cff56b05bf4ec0ca55a6fcab1700bd6bec9f60a923e14607fd894bd9b63cd669a4e3e9b7bacc0480e040e393370be05f237ea21074cb439a3cf176be0dd78c WHIRLPOOL eafde10cb49f211ffe315efbf58b1015136729be74b3617ba612a0091bf27e7b6a2f33881f5bd5667d38a4d8e19d706762b70a09e765bd4be79a38ad5e8215f1
+DIST gnome-doc-utils-0.20.10.tar.xz 526700 SHA256 cb0639ffa9550b6ddf3b62f3b1add92fb92ab4690d351f2353cffe668be8c4a6 SHA512 1cb5e3b9ca9e45e6c551801e9c9c4aac725c2ce85238c230a4c70b36c90419886b921d8dd464df0643fc3bbb877df075abaa83a36d1609c5664960c31e11d151 WHIRLPOOL b840fd722ba7994aa587a85159cb1873c710bf5074ce7c1c6c0cfb601847b5ae3aea1584f43daa4cbcbb4d486c0b6609115191c5eacf4c23f99d42a696791011
+EBUILD gnome-doc-utils-0.20.10-r1.ebuild 1767 SHA256 3779586fdfd7a332871c9e4ba16b5d84be6ef82eabd7496e57193519292e14ac SHA512 0b968123c33ebdbf84d4b9966a12714ee8c2ce5a1b8b2da3b8135ba068505f24f52fea1e9f67a36fa6a730d94103d437e9a7c5fb8b86f6d459bb507d049b9824 WHIRLPOOL d19be0b4577367690511362f3975d7e1c1d5b866e9bc2b3f8d4a1462ae018c280e8024d668abd8cd85fc5c40d83906a1c034b8089d76875603c76467617faa4e
+MISC ChangeLog 3028 SHA256 ede30f9f044b49b142693e853dd389d38b6267614938cb792bd4abd6c71ed4c1 SHA512 fc66defd69b77f83d23236ed9db502451437307ed15f827c681eeb547b1db28be1800abc329c1db6117977cf458fcc8db35c2947059ab6ebf83fd68c98950d49 WHIRLPOOL fcf0dc23efb5983b31d29441465f68470e2ca958e274c139020dd4bbde7b0a41ea4493f53d6fcf6f7e9eb3a9a84585a488adc52083940ec732eecf04af3d99e4
+MISC ChangeLog-2015 30597 SHA256 eecc4b98c4cd960b908895b94c384f7be214cf665342b513a4734cd17aaceb65 SHA512 eb1b766d39ad2e37c46433aa173cb4c711b9292f929dc4088c4659899bc9244baeb75ad70cf48e132bd33f9240b81c0f701a83b844784c431b1156d4dbf33dad WHIRLPOOL 65e0936871e86cc786b66f335274d5c563d1ea42db73ff8e7dc39a108e1a0c12f95f4766d06b2f8490a6377fa27a6b8f2a6148dfac869d54c329b4d00e15bf6c
+MISC metadata.xml 259 SHA256 6d16d32cce05219baff0d7aef9baf4f8f4622ba77a55e9bc5ae9b074ae8d4600 SHA512 fbef629394690b3a5608abc6344816f6acf1e8e2663f29949fd14a662c628f16fee77a1ec1641066806d143fb94c1571bc5b46b829dc53620af6956377fe15cc WHIRLPOOL dd2c856848fdc98df5a4ffca31b95078656373a87ccf2e44be410e7139f2980f3ebb0ae951e2e92fc46ce8e3a3ecefec169c3a15bbcceba69c1bd8224a8dd271
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/Manifest b/app-text/gnopaster/Manifest
new file mode 100644
index 000000000000..f43adff1e26e
--- /dev/null
+++ b/app-text/gnopaster/Manifest
@@ -0,0 +1,5 @@
+DIST gnopaster-0.0.9.pl.gz 2791 SHA256 894782ba23e3cc42e2ac54578f49e485706a93e72179b5b03d694d017dba66fb SHA512 db7f6ffa7e0d4d9c4fcfaf830ee0b9aa40736ef8e67b12b8de4a4a0ad9e02964fa4c5b8521fed6299c336fb7ecd7cbfe8a9f7b2b0d5ed823545b5e67ff6c48cc WHIRLPOOL 144a0b4a915164a46b91dbdedb24241537dcc60cb234c63ecc20522c6d82b07446526a0e0f1d0f877fb928a479bfefa1393aea2c89d4c1ec49416dc352d76f87
+EBUILD gnopaster-0.0.9.ebuild 480 SHA256 6636c15a54370c745f1df0c1aa820ac09a97c84bc6a303aa50b201c5f3bfbab6 SHA512 44f16c8e2f74e0948e00aaa7996aaf3551e9478a90927b2a25babf9b1ad3f155aac3b3e23c544c39530033236246c9360b2747fccb6b96310685fd543a9d53d1 WHIRLPOOL d6a057c064732f434c12aff2f51bf2801971b124650e7d92cd5335ca789f83ade059d66d77df107c7d4d66f20a9851365a1314f8d4b6b9466b552af27b8ba2fa
+MISC ChangeLog 2528 SHA256 7e644782b608e18b8c5bae67c86323e9b56decbf4b975bebd898e9cbea83c13e SHA512 7b6cca17116dd425729642ffe71488d31cd9603f54640be8f1f696866887c90adf4459628cb8302a30578d5dfbebc565106860609b1ef92551cfecbbc2954a3b WHIRLPOOL 0eb8794e392e43a1437a67fdb330cced3a6c84df454749d47de1afa2c9103ca5cf21cbc2e6887eb652019984eb1087ff910504eb3ae0297d789719f65167d4b6
+MISC ChangeLog-2015 1624 SHA256 b846dd82580c26657e331715d96f909415167159207db7a874035a4784ac06cf SHA512 65d50d15aeb3706b9b19d7a69d0e8b220d757e953f26d18a10bdf5190bc68eccda8d47eedc3a4ced6c1c266154b3b8db36049f02c82f312044445eec51968955 WHIRLPOOL 62898229f316a01d8fbafe5a5ab5627b07f674367c11e6ebe87a49c7e9db275f654d61e044e500c5a0ba8dc12de59bf6db77dc51035618e1117c97bd254ce97f
+MISC metadata.xml 245 SHA256 688c54c12c8d1338001120c092e8002b829c898a6a3dc62de3360eed794db2aa SHA512 09853ccf6aa61683ae8b490342245ae8d790a246a91c1ee165aa3f9905a7a002b974d8dff65381432a859682900ff02875b819afff856194d9c92ef0d99d70cf WHIRLPOOL 0194eda12659eeb23683cb2253bb5e0f713c870c788fe9cf97adb1aa9ed67707081a6d57c37d4fb9b78f011b8c835b5011a1cbfcbf240c7888946c453c05afb3
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..9bcd1fede2aa
--- /dev/null
+++ b/app-text/gnopaster/gnopaster-0.0.9.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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/Manifest b/app-text/gocr/Manifest
new file mode 100644
index 000000000000..1c9398c55785
--- /dev/null
+++ b/app-text/gocr/Manifest
@@ -0,0 +1,7 @@
+DIST gocr-0.49.tar.gz 392386 SHA256 cc29931d50b3be11608dc79d1c7d8a20919dbe6313b1ba5dc88ecf99cffd171a SHA512 4559ab2cb05d67212da1857a9e7280abea0b4a172454d5145f04f7d23237d065c7b17ea110123ebbea5d62e589c507e73957e1b15e856b19f9bfc5efbecf467c WHIRLPOOL b62b991d63846b7a1f953b0251a7821bb7c9728633197d4e05e3f9276988d9db62f61e8242948abc5089b2f71f33d9480a8c79e4b4d12cbb4d53a39b73ed6806
+DIST gocr-0.50.tar.gz 419209 SHA256 bc261244f887419cba6d962ec1ad58eefd77176885093c4a43061e7fd565f5b5 SHA512 36392516711d43f8561147684b6f4e22a450bc87f1cb30ceaab4a1821ac583ff5a3d25b3bbf1637f01bfb55366b45cc7d5086d1f29f006d615bb658d0e5faab9 WHIRLPOOL d15b08eda68a27259c22c4f50d05e6d2bda7d1ad42c486279fa34a94b915ce52328f8fa6202cdf93bade2023d85be86d9e5fdab5aaaff9a63d6a6f5ab63f3189
+EBUILD gocr-0.49.ebuild 1194 SHA256 14cc4ed41897335a2cfb048230bca162136e4ee8be84811366c00198159f3cb3 SHA512 d6f044d7a983154b6298c95d8d86bde528c7374d8e6cff82967df4414df07252c81dc691dbb0e49d7ac8c4a5b528b336c4978cbc4ff185bc9e2d675d2733e06a WHIRLPOOL 28fecb0fb04e72ab96e610178d6af526e83db22cfc4df72cce2a051b84cd72452c678ff703048c106912acbfbb0d5ad545662586129668396c93b318aab3519d
+EBUILD gocr-0.50.ebuild 1205 SHA256 67eaa481ef1881f266dbf61f0a14036355766363a30517cad0cd0e0d23020a11 SHA512 8ed6c616d903d0d8414f95b40c8bcc2dbe6adf091edd3ee61596e560dcbcb850b7df220854f81b4a2c6312efb6a4d9cc51e2062d0e6c90b0152b181df5421fd6 WHIRLPOOL aed0f331372c2f49cc48df117d9885735f74c2a19d4a9fbf88e7c6cc0cd1715d7b0b8e2de6c2131d004a85befd864a2ddc57eaa5727674cded1dd68a7a824278
+MISC ChangeLog 3006 SHA256 51cceba3f0eb267fc81d6bc33bf94baa41855d11c33fd3c37a2a60081c090a44 SHA512 e7154fcce57d8b34f759fb8dd2f68cf5be68d2b5a08a8adfa300331d15ed78eccf305906a952c317568a8172be83087310aa8eb78b288e31306cecff043b0a8d WHIRLPOOL 2ffaf8fbbc1d37b3e3354f3b2610f82464f2f764888d7cc26bc24684ec08f0b9ecab9207dd5bea63da9f561d3898cee4d3b78e7fa193cc0f586afe6806123307
+MISC ChangeLog-2015 9548 SHA256 698a6c9c3298313fba2f2abc8cc8402d6b73943a0ab793cce34fe567204a9b38 SHA512 1853d31f8a213b54a5960857b988c4ad236c1995f06c5927ee99089c1c9ed34b96898086171ec54a78cc5ce122b7394eac9d725c4d939af3607b01e92fbd6ed3 WHIRLPOOL 7374e5ee8ccbb53452f65c0e699af7cae83bf6c40aedfbae21d484573955acfe9719a9c7d92a7d35eaaa1cd60ecde199d2d4db212e78da2c7b259c200e30a26f
+MISC metadata.xml 323 SHA256 d7371caf76cdb72815eb61e31df0d0844349519e99f5d0672ff59617de2e8492 SHA512 5b38ff42ca62ce001e5041406a24ccd8bc1c7f33d7a9e1f84ca0d5d48a3ad2f80e74732a846ffb6768709748bd2dca5868f76ab4c1b00f1e75a6f622597858e1 WHIRLPOOL f87c56161fe704f17f007641a2f76a17e328841c728e1e050cc853f19e670e6ef6e6f1926d6390bb166bfa8edb2a4967422feec3333fefd7c62e96f8e3d028ea
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..5a67d28e8b0c
--- /dev/null
+++ b/app-text/gocr/gocr-0.50.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2013 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/Manifest b/app-text/goldendict/Manifest
new file mode 100644
index 000000000000..07f91d033101
--- /dev/null
+++ b/app-text/goldendict/Manifest
@@ -0,0 +1,7 @@
+AUX goldendict-1.0.1-gcc-4.7.patch 1051 SHA256 d61d95f464e82ed83493cbb5ded3ecc59a34eb879eb9c7140d801ee6e0c4454e SHA512 72dfb5c32cd77eb55251d59861206f6705ab43afabefb17cd4e8d51321bd2b343bbbc88906f0d915fc89df5e53c0d3577b625fff9411b0291f28ff505a595327 WHIRLPOOL 0be27abba1ffc552a4eb4b146fd3745bcc669b2bfa50fd488af71d96b1ad441f4c86a71e473e2fdc3af9e41f4527ce2df3a21814304cb82f45f7c6c311db1a10
+AUX goldendict-1.5.0-qtsingleapplication-unbundle.patch 341 SHA256 9eeb3c70a6807ded4f018116e1c41d2fa86ed2b811d5b19b7e7e833fda4df978 SHA512 86a08b1333a61fee7559028f68779f45cf17da6f7e6f3ea9cae46184279469b91e38f825ad072e0557bcd4188b87fe8f0bd696c4819e3bc96874439d1290e5a3 WHIRLPOOL 09237db13061d0aa8d2d36c13d1428363655bcad284e8e8b5b3959ab526cf3177276cfe05a5f55a1ffb0ec2092a34cb5dcf53f812b66b00cf5579bf8b2451c95
+DIST goldendict-1.5.0_rc2.tar.gz 19413751 SHA256 bccee0a3d3902f8fa31e439e220a405065fff774e5f8c581be2b0743d3f83fde SHA512 b88067a90df42b07d926231f624be8796f031b872443a45f9744ceeea27f39325bc665090f773528a26ad8391ae2423a29c602068bf2cc4ed5870a07646d2362 WHIRLPOOL f385a8536360b9401a67284d95be65d98d5f6b57d5af73852f5ec1af95c4ce36c9903e9ed04dbd67e7bf035b5b6745378344cc5efbb4923ce4ea31988f95f6ff
+EBUILD goldendict-1.5.0_rc2-r1.ebuild 1702 SHA256 2ab9b7f95376cbf2e2a5932fdc25a299481c5867075c8d905d2dc4bf1de3abcc SHA512 c30659f5e7f1170f807d4dab272e939f2cea7bfb015e28a0ae6c2197c8a275c8004d4064b248978aa61515363722b3a9cbb1eebce370648b4bf54877d7ad77e9 WHIRLPOOL 9958cd348be1f4bd5a0191b42b3e2b20811ef508f92fb6eae44fb34ebcef983828129a1a3f7bb56c3def795e58d60a728e8276564cde4a02526f7bf2088bb365
+MISC ChangeLog 3182 SHA256 e0c78327b3d7b296bf0e5475c360f3e30c8da4ec3e17c7b446cf910dcfe58ef4 SHA512 c888e60a224656d5f8cb634ec3ebb14816fef40cda211cebcd48012818d739357ed0fd7b5c9f2123f6a369ac87916d5facd1e69c198da2dab8c3a4f557b7d5f6 WHIRLPOOL f5368e8ccc87e5e35ab236c5e215f6aa99c0cab9121bc73bc027faf7d34922911e6d5a5356cf9518f83933fe36703ed0a72125c8d757a29001a068ac35db6d78
+MISC ChangeLog-2015 3149 SHA256 15cf425a076746e32692a396d53aed64940e0492a7d09690db10843d39bd39be SHA512 cec44537dc9b8f8e17c6844287d9e5c7e572f0aff7b6b1c0e06bf2a15f896f07ab63d826934aa55087d6f4abaa3a958a7a2c86a644422bd0f6701b122842f5df WHIRLPOOL 739fd1189a0e6f8dd83bbaab8e30fb8ebfb78dac92b8d1e546b7ccc56bd84583ecb7fcfbebbe2bb168a81d33f2f729f33f671cc23abf17a8cb634fae7cd05a1c
+MISC metadata.xml 388 SHA256 84d0c56ecc3c639c8d0444e0727491cc816de5a0f41c481fc12a3b7ce997062b SHA512 c9be98ab768c3c13ff4b03336fc90314ec0e233d0860501d85b5c65250965d994a3f8ab4cf8f58cee3da27fdc37964c10854bc66b9cc16e5f558f0b7a4a39f42 WHIRLPOOL 3c06b0bc0005d72ede5497cdccef2f5c773eb137688fa520af3c61d464fd7fc0e15738fe5968ccbfe869d3f74d2000d5db2c9e5eb654ffb6a28121a57f7f32fd
diff --git a/app-text/goldendict/files/goldendict-1.0.1-gcc-4.7.patch b/app-text/goldendict/files/goldendict-1.0.1-gcc-4.7.patch
new file mode 100644
index 000000000000..24995a221b3c
--- /dev/null
+++ b/app-text/goldendict/files/goldendict-1.0.1-gcc-4.7.patch
@@ -0,0 +1,40 @@
+From b00d081da20b9a6b257573c6b23a6bc640c4dab1 Mon Sep 17 00:00:00 2001
+From: Michael Palimaka <kensington@gentoo.org>
+Date: Fri, 20 Jul 2012 03:27:38 +1000
+Subject: [PATCH] Fix build with GCC 4.7 by adding missing includes.
+
+---
+ processwrapper.cc                       | 4 ++++
+ qtsingleapplication/src/qtlocalpeer.cpp | 1 +
+ 2 files changed, 5 insertions(+)
+
+diff --git a/processwrapper.cc b/processwrapper.cc
+index f7f3f19..86b985d 100644
+--- a/processwrapper.cc
++++ b/processwrapper.cc
+@@ -2,6 +2,10 @@
+ 

+ #include <QtCore>

+ 

++#if defined(Q_OS_UNIX)

++#include <unistd.h>

++#endif

++

+ #ifdef Q_OS_WIN32

+ 

+ #include <windows.h>

+diff --git a/qtsingleapplication/src/qtlocalpeer.cpp b/qtsingleapplication/src/qtlocalpeer.cpp
+index 382d182..506c142 100644
+--- a/qtsingleapplication/src/qtlocalpeer.cpp
++++ b/qtsingleapplication/src/qtlocalpeer.cpp
+@@ -50,6 +50,7 @@ static PProcessIdToSessionId pProcessIdToSessionId = 0;
+ #endif
+ #if defined(Q_OS_UNIX)
+ #include <time.h>
++#include <unistd.h>
+ #endif
+ 
+ namespace QtLP_Private {
+-- 
+1.7.11.1
+
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-r1.ebuild b/app-text/goldendict/goldendict-1.5.0_rc2-r1.ebuild
new file mode 100644
index 000000000000..0ac7d9edbe8c
--- /dev/null
+++ b/app-text/goldendict/goldendict-1.5.0_rc2-r1.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2017 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/Manifest b/app-text/grip/Manifest
new file mode 100644
index 000000000000..c73e84d4a8d9
--- /dev/null
+++ b/app-text/grip/Manifest
@@ -0,0 +1,4 @@
+DIST grip-4.2.0.zip 43079 SHA256 8eab9415ade50b9160d84160b0adb9f0ef8460a2b409a9c94158a5461b294394 SHA512 2989a1cc2cb98254e932d5bf6679a205992e74802e68fe45d11cf087747d2379778df254bbf1cf980bb8993dc5568c5112707c645babbb32aae49f443319ff6b WHIRLPOOL 536cecc62272cd891d4b7bc782f77b6c9e3f142c4436107b050a3fada7abb23a98c6b864b3fc3d11561fe76a7504cb7ad0c892ec44aecefc31b7a2f74d34e136
+EBUILD grip-4.2.0.ebuild 602 SHA256 81ee3ab1e0267cacddfc1a5e9b9a1fb099dbf38e4e66d8906dbf7f71cfcbf30e SHA512 43b7b1419d247608f14a4c59f545cf443024d30d467494afbac56912768b7b355c51cb2bf7576fffed432d9475803e3b17cdaf947d4d7090def77033a6aa28e9 WHIRLPOOL b131cdf6e568049fa7e18b7a30479376998a6bdfc3656d1bc74b01d23aec83fd0f86ad410cd7624c5ee7b74702e902613765d330f90f52ea21ba7333bd5e0e4c
+MISC ChangeLog 791 SHA256 12100a2d2d763523a6f622bb6b00a27cdccdf6d9b35fdeeb20de4c5299432029 SHA512 9fba2afde25439a74d72eec583f10dd7ad6b7b6f4af752d513d934eb6517a26c054b662d05690bf6346f68bd1a991ede7b4b6547a8f41b1e6ac11091b6a2a74d WHIRLPOOL bd362cdc6148c6979f48e3d21c129e813595faeeb788c89ffcff98b2871c27d3bf3fd9d922c81f76b147bff35c73067fbffd33e894fd764d7f4673d6d5eceb52
+MISC metadata.xml 287 SHA256 1f485af06d9255b1d40486d66722bbef87c3c0cceb7437a68cd1c55ee81919c1 SHA512 047bdd78979d55e9e37b92f51b52190c6a5780d6b3475560ae8908fdc98274949372918e1ab150821f09bff97cc12f25097f4e89ee4431861b608be79bd942bc WHIRLPOOL cbf383143fb1e280d418e3368df0b0d03d9d4025513de64678a59806bb29a22160479fcdfb8bde403bb12f4be89b722fc9ff0983adfe04933d465d0146c21e2b
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..32493d9a31af
--- /dev/null
+++ b/app-text/grip/grip-4.2.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 pypy{,3} python3_{4,5} )
+
+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-normalizer-mysql/Manifest b/app-text/groonga-normalizer-mysql/Manifest
new file mode 100644
index 000000000000..c46054860ec7
--- /dev/null
+++ b/app-text/groonga-normalizer-mysql/Manifest
@@ -0,0 +1,11 @@
+DIST groonga-normalizer-mysql-1.0.6.tar.gz 430461 SHA256 7e037aa42b7a3212140674d39a8dc0d722670d744f99e019bde308db91eb4d85 SHA512 36ef0344ba73633669d12dd13b08cd336b2b77a7c76e11b52b5ce17fcf20b17a0ea8a3f68be1be91d07e3fe5a87b667664d7a503a54ba1cace3bd6c252286821 WHIRLPOOL 7e36266b5bade8bd1bb288f3936b059f57b24ea3662610999d5b9667688076b1de21d99ea21b774af43793fbef4feeb605eb4051bd95a5d0e0d36c49507307f7
+DIST groonga-normalizer-mysql-1.0.9.tar.gz 527908 SHA256 bb1dc59939464f833e94de64e33b2a643f5bee03cad28d92af70af9820519e70 SHA512 878d10dc6f7280c62e9563db19a61450a0181c19d47b2a5afe3bef4bfa157abfe3de726f0d61b6b7040b3b37abd78f63cd257f48fe779ff6a1ea0ed262b70a97 WHIRLPOOL 1ef11b150934d532a97be1ac8b43280989763e76d9bbadf1faeb0a99b6a68f0066ebac8bb66f8fdfe6fcfc94f9a127d5159119746c69307305b8a3ae160d88d9
+DIST groonga-normalizer-mysql-1.1.0.tar.gz 529179 SHA256 525daffdb999b647ce87328ec2e94c004ab59803b00a71ce1afd0b5dfd167116 SHA512 a607ea875a1500b408742f52c5a0e465db4fc45101cd6b433a5fede8631fdadd6d24571ec188f70e39906178d35ad46138848bd57aaac721da32c064f3506416 WHIRLPOOL c3546878e4bd7c1a5a2b911bdf325f9846574adf45929af073d00923e7d6851c8408cd27cea861c84ab96b140cae09130977773ae6cce5fca4c56c4ca08948b3
+DIST groonga-normalizer-mysql-1.1.1.tar.gz 548788 SHA256 bc83d1e5e0f32d4b95e219cb940a7e3f61f0f743abd3bd47c2d436a34e503870 SHA512 40686a50133149b614057907c58f5b37d596fcaf697b4a6f3e68b776ac8c728cdd4c8a6e7c5676fe92ff96a4358b623f2b3740f6b72d317f1650c006cfb34369 WHIRLPOOL d09ede6cc08fbe0fc14e4c1ef60c1ca84f99a7c1a7aa3e122c6f3b525e45c2cb98b2b665b62650093c5fb79442945c1d30e87e68121ac9668b5d07087532d5b0
+EBUILD groonga-normalizer-mysql-1.0.6.ebuild 707 SHA256 53c3ca2fb34cb29ce8410499bca808ce412f1b7fa0c8f690c55f3519a700683a SHA512 4cb757f68205b8cb3f9dedb5a6081a8b81e6c1a4280a6f07c226792e063f1c90556208df0d3a8986c3a4d76d254de16abcade378e7c68d11b1567ce4faa12d77 WHIRLPOOL e6b173336c4003e4b6f3263e8471e4d4a6e073ede4314741220b635ebc0d16d370a95c99aa3d2277da174e7d75caa07af1f1820095efc0205848e9517feb1867
+EBUILD groonga-normalizer-mysql-1.0.9.ebuild 695 SHA256 152a64a3f5650989e95f93b0bddc0677d9eab1c59ec08c9c01985393596538ca SHA512 4c540660c4dfb7591822ba57ffef29968aae07538b4b1f8dca8c1620f3468b311aa905a2ea7276d54ba2a4f317115e3fd44cb8cb298aa60c27d4d883a19823be WHIRLPOOL 8849e426983c0bbab7c0d0497809fb88e4d486a7338910f9c75f610062f3fd9475cdf523f0760f2b334b9af5619a164caf1e3b84230247101546f2f91ce7a8cb
+EBUILD groonga-normalizer-mysql-1.1.0.ebuild 695 SHA256 152a64a3f5650989e95f93b0bddc0677d9eab1c59ec08c9c01985393596538ca SHA512 4c540660c4dfb7591822ba57ffef29968aae07538b4b1f8dca8c1620f3468b311aa905a2ea7276d54ba2a4f317115e3fd44cb8cb298aa60c27d4d883a19823be WHIRLPOOL 8849e426983c0bbab7c0d0497809fb88e4d486a7338910f9c75f610062f3fd9475cdf523f0760f2b334b9af5619a164caf1e3b84230247101546f2f91ce7a8cb
+EBUILD groonga-normalizer-mysql-1.1.1.ebuild 716 SHA256 141e90a050e3275e04f369da9eac503d53e6e94dbb3ef71b59cf9e6b9ae64f6f SHA512 ddf60d07f9ab8387474bf4701f9b609d83f84c72354653606adfe0609b6224758c48bf1d73e6cfdb4e67e4ddb52e051a98bfffb53696c32e921ff788b7300f51 WHIRLPOOL 709b51c5cbaf431fbed8fe292cf45e5466385da7e2c47c016f571acaece323a83278dd82efb43a676f1bc0ca15b72d260f1264fb0b15b78d9fc40481a53a36c2
+MISC ChangeLog 2897 SHA256 d8481112ea06baf9178028068f7f5f5b6869ebfc884a60055194ce0fbcb61e87 SHA512 47c3f0189c9da03a0a771457536e7ee3e6128aefc7edba39d05d657b454afef738678269dc2165ba8cea1a6b8ede2e270f1c4a0d1969598d75caa48a93389e42 WHIRLPOOL 80d350d1ba72cfdaa70d0477c3acfd09f75f8fe7e1632760eef6561905c02c49baa635e762ba809a54cdfaf8c72f2bdecdc1bcb8f95097dcc02fea12930afd0b
+MISC ChangeLog-2015 635 SHA256 2eb2509eaa8d8c32bbb877998d9fcf762f46bccbcd87d3084e357d78d46015b4 SHA512 cb043a0d9ff0c6e813d7f4cafac331f3de64ff3e796b8b599135efbf474a7b116dd0f8799006041bf1bda0a3b235a20270743cea90c146268d9268aefe85e643 WHIRLPOOL 15aecda7970d93277eb57615050e1977a4c02a1938d30462dbdc80cf8f33dc4813d2b60c102b72affedfa4cbaaff26064213143893ec3df8ad2e72a84a73b9ab
+MISC metadata.xml 215 SHA256 504acd32223234b97ed838bf70f18f89f54381bb005f694dd095b9eee8d0b958 SHA512 b9dfac6d012a908a88f80298c5df82f8b093bcb8f6b523ac7d1897289d0e72d4a62baca343c1b784b1e3f37a94efe000d353b7ea74cbd9b4584698c890d5a7f0 WHIRLPOOL 5f1e70d79291206c68222edc1c766808c7f001848680cc73cfce1bd7c1d0645fa8c09c706d92578e8a45afa9f057eb2ca8dfee4657d924d555b2b663f1612383
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..21f045a0eb8f
--- /dev/null
+++ b/app-text/groonga/Manifest
@@ -0,0 +1,11 @@
+AUX groonga.confd 259 SHA256 7df19e8fcc0d7a684661851a36dd896c906182986b3e29b06b87568a7484e109 SHA512 489feed6a4c22eb2ac02be070dd84ed3eb677b4f250b7eacd5619c1749b322b302bdff36fc3586e83125ac7ef02569054c4f267ddd7b26e5aa378af428cbc8ea WHIRLPOOL d9462426fee215b1225491dbf4158f4d592c677a44ab7c98d9fa12d6671510774cf7b5c9bfa8642ceee70e1710ded59c009972af51dad8de9f83fd85530563e9
+AUX groonga.initd 715 SHA256 83e97ec13ffe257c487a1e8e5419bcf6117241c7cfbca5bf159ed615a8cbd38f SHA512 7b4f789c9201f40fee0d99b94554bc33aebf024da02794143317215713cea3f2a9fda2e87d2a8bb864a7d0c8a2c44e824c65deecd4c95360423f7d3a4f04f8c2 WHIRLPOOL 9a56d6ba015195dc4c6c9333609450713f6e85cc0b441007d925f71ac88ad291c62ebd45eb6775f4fc747122a2d3bbda18befa0991f1e7ddb8ec569a91ed1ab6
+DIST groonga-5.0.3.tar.gz 12421501 SHA256 d4f3e9d00cb16c0028cb32422fa666cbbfb32f47597988fd308931274d94cf52 SHA512 c4595054f46e150b0b95b3d1fb6a18098c93471ee0cdeefc54d266a710db57d6b68a6aceb1a61ede5ebb4e1b5518be64b9b96809bd85634b61c84c1923cbf158 WHIRLPOOL bbcf91770eb626dfaf5d01e04b6f4b2f4ee6fff8fad73cdca36c500560ce8d0b9dc606391b1ae0a23d2fd763ba4eddbc69f2eb8b692a5c3c59c1b21745d01de0
+DIST groonga-5.0.9.tar.gz 12851324 SHA256 4fb59009dca154ffb53f9b408dc296e6e215f8eda613a8ef184fa634e702d35d SHA512 6e89be8894737616cfcbd0edd92c94a25fb8a2f9c97bd0aab10c2d628664aa328384d6b953516fe96cec5b58fd229c42262caad4785ca9574c759d6d7177fba6 WHIRLPOOL 7f7ac215d4eb0eca0eb18e496a79c6023fe2040f2423c3b4b968d4923b800676c1ad2982880925880ffee5b92ff508b21132ecc2f9b7675612e147adfd13dd6c
+DIST groonga-6.1.2.tar.gz 14028916 SHA256 6625d7e1b822da6c29391558fac51e4e3b99145635e96c6eff85e7e33139b0f7 SHA512 cd2dd667608fac856b36a824c5ea285da937cc11b6d4e5ad2f84581f6fbc714b4bb381515ec7b467ddccfad77c77c080000def653d9cdd8725c0f512c7b83f20 WHIRLPOOL ca0b53bb6def465830fb048ac8b83319ccac8e035facb76fb145a8f454336889fef04a8c774fbcfaf32a75cbf938005266f1cf80fc85e55888c4c5ee67bf8bb2
+EBUILD groonga-5.0.3.ebuild 2418 SHA256 5b95401c2bd1b894bd6427f0edcd55ca9a4803a7f428072f08b88370a458a8b5 SHA512 52c3e67423eb88c7626b9b831c2058af4eeda069589b9ff315350c57eb8e4c151bbfaff5702c6c474204a5699ef2548932d389bf75edffb94b286c7a18d7f0f1 WHIRLPOOL 62ece3eb51446043e407a2b6c542c20b340e9948dae7b4daf9b2b35cbf27c71f50eb573e93d1523a01b8409ccdbf69b3e5c47e84c790c9f6b9bf7d62436dd6cf
+EBUILD groonga-5.0.9.ebuild 2418 SHA256 5b95401c2bd1b894bd6427f0edcd55ca9a4803a7f428072f08b88370a458a8b5 SHA512 52c3e67423eb88c7626b9b831c2058af4eeda069589b9ff315350c57eb8e4c151bbfaff5702c6c474204a5699ef2548932d389bf75edffb94b286c7a18d7f0f1 WHIRLPOOL 62ece3eb51446043e407a2b6c542c20b340e9948dae7b4daf9b2b35cbf27c71f50eb573e93d1523a01b8409ccdbf69b3e5c47e84c790c9f6b9bf7d62436dd6cf
+EBUILD groonga-6.1.2.ebuild 2447 SHA256 938b908f996cb5bec2a0b157bca8e1e27c655b5ef9989e8d10211edbf6961579 SHA512 0770d4c27bee71d3fad3caf42b10ca0da006a1d20861c154e8f8b14edb19fb9f8e619b5f6b905a59eba8d3c17d982ec9b628b6d561b638df28da8fd3a9d48189 WHIRLPOOL ca3a48ae8f15fedd22d6ece506b0aa823e4aa0096bf1d46be01dda81cd42d219efd577b61fe54cf6b131edc62fcbdd1921f537e8eb148d1649525633735a1ed2
+MISC ChangeLog 2956 SHA256 44258eceff298fdb8701ccc1bd00d200668f132178889623d744a06d2162b874 SHA512 7ddaba4b976137471a5eaf67300a26aa2148b9647840bb2b0d11e6a02ee473ec0e5371575286e9e585c56fcb1cccb0b4e24d6973d1b2694a5a8c0e8b2375f75c WHIRLPOOL a973f463062b4d0fb1740da1ae288c37cfff056f9765d42b6dac06aaeb9c34960a1ac1fd5733bec5c8d20716c1d9857def02cc07b6de6c9e28baf001f097984c
+MISC ChangeLog-2015 777 SHA256 6b72945f65f7db5ad000f9d40c0c4debbb94c0813b0706b694682847ebae339d SHA512 f3f8ef4a45e22c88d064b9cd3a0818c86b1b3527f7417713db5bab057d4bb9813d875d348cc9b429653ee419a0ba61347bfb4046da5aaa697b5e1e88cf66203c WHIRLPOOL 25203987f01a9f645872ffb42811b25cad31f26fef60598a70477dae7942825abce57b473aea47309d816e0d033f902b7601a939606a5888bfabceaffcf82684
+MISC metadata.xml 1205 SHA256 5f72653cfec44e15cc4bb81a05375d1f546a12ad6b319ed2d5681beb6f3bfb74 SHA512 a3206dfafcada30567bbf6762fdbd4562f72a1da607cc2928426133cbe84e29277c9605778e6a77f8cb6e2c129f1949389443caa1757c72372e7e8c546ee9c88 WHIRLPOOL 141c308771333759cfda5f2f343bd220a49239e0998647c6f5a9208a497145b65890564f3b7bb8fecd54b5d72f3d7e923e8d43dfe6a4ae5c5635246f1e883f58
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/metadata.xml b/app-text/groonga/metadata.xml
new file mode 100644
index 000000000000..937c8f296172
--- /dev/null
+++ b/app-text/groonga/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>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="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>
+</use>
+</pkgmetadata>
diff --git a/app-text/grutatxt/Manifest b/app-text/grutatxt/Manifest
new file mode 100644
index 000000000000..dc57bac4fc9d
--- /dev/null
+++ b/app-text/grutatxt/Manifest
@@ -0,0 +1,5 @@
+DIST Grutatxt-2.0.16.tar.gz 29929 SHA256 38c6c78e269ea8a6cbf384af812026216005d43f683e26c5bb1af47eb24d5960 SHA512 bf5203308d0fb4baea9b161ac3374116f7cd60de3d43e8699f90626aa3f67354d2ff304ab8d45ae6368add31777b4e56a7a4d944137aa5d3687dd457c71a8512 WHIRLPOOL 99c9f05c8f9d7df3382ee992c6a131ac295602f546b898c04cd2a5e9f25c0daed8469225dbe450883888f1fbe6ee913d80d24cac9248ad78c49d88d41296b04f
+EBUILD grutatxt-2.0.16-r1.ebuild 640 SHA256 c23f3ede187498c8f58bae5839f4e8abf86ee53d17ba9d9cd2cf7a2a0f4c5499 SHA512 4b97945428ebb6f093f437464a90471b49800c8c8048e4dd8401ba91c88ce80decc694dc647477d175ba80ebf00109acf2c5b2ed9d058331e78e96ec3c98a6aa WHIRLPOOL 4ce1134f913714a40cc8d01067c64c12c6db9e239f1f4f8026118b8d8dbcdbf19644f967a8d0c64075ad77790070af348632962c649d9252f9337d4ccb6cf716
+MISC ChangeLog 2533 SHA256 2e4e3a5d84fa9baef5f5932556535557d08fe45c8138c07cb8c8ea2301fb6263 SHA512 1ca546e6c271ffb1e957ed76f7a275f1f3f7f142a497861ec23131dd507b5d743bcc3d4066ca4dd1cea5af9529652c76aa9bad9e55fee435f97931f92286be4d WHIRLPOOL c605d90f7c712dc09e12cdba44f2ec9be75f7e8581447ee54495d03e0c2894ee2af19bfc5e2b72f89ebff15e39f169e6e08e02c6c597c98c24eff8da15f66ffd
+MISC ChangeLog-2015 2908 SHA256 247ba057ce95d3cd6cf85bc755f6c10a3c7e6636b5c1a70e4d44f2cf77cfaaee SHA512 3edb4e77d533a9775c0750ba98a8538e5a01f951756c9575859465ba7bcf0409ce1d0e1b2f75b42e8c45fbc4fb1b33ff46541aaf39504039b744de24c0d0c385 WHIRLPOOL 2e6408d374f59fecb94d4c0a8376ac59f1c18481f50c646b0422c072058fa7d2000bb498b4c0de6397ac622954371dacc0a0bc0375cc7f90e6215c3a2c9b6dc0
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
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/Manifest b/app-text/gspell/Manifest
new file mode 100644
index 000000000000..fe5a1c7b727c
--- /dev/null
+++ b/app-text/gspell/Manifest
@@ -0,0 +1,8 @@
+DIST gspell-1.2.3.tar.xz 395360 SHA256 a64e158e47a6e2b8ec9a3a1fea98a416f78a13e275c909b2ed488494ff835f82 SHA512 b45f17e8707187a070d4c5d4f91e4bcbd4108e596519c2900d7ca1f35050b6b397ed8c012fa25e179dddaf8b9c3a356b26c6070698f8333dff00c57a72e47198 WHIRLPOOL 1b6f22740d2b5597c20aa6d84e3e9e0b0b50c2fccfd811f49c99dff5e3762bc91a7582f223711f0f37a95c37d302b40697bd3517c170e8991cad4d556398875f
+DIST gspell-1.4.1.tar.xz 408996 SHA256 442f88fecd7f9e00a6a9d0af2d762744dd3c119217ff11d6739500f75b0f10be SHA512 ded60e876598d8b6002ea28aa9a0d8f84c56c3a46d245df051949f5400f605a666279e42949bf2bfb365cf31f4618f1ce657dd3b81ed748af1036eddc1e67f6d WHIRLPOOL 5d76db642cad3dcfdc58d7a2a5b81768b16f7c29829646c8d6517e6fbc835389affc06372b9e339bfade388debd57d3d389920b2bd1e605b1e3cbbcfdbb61f64
+DIST gspell-1.4.2.tar.xz 407356 SHA256 a59ba7e747bfbe93f6e511d7df3169d1530b518b46ca620cbc000fecbcdf0399 SHA512 00f53d3ca47a4ba1af1e8b4983a41dc6df8a9788898b45ffdd161a3fc8de28024cc985f49fbb872912c0a94addbca3b28ce2edda70eeb206a794e2bcf65e4a5e WHIRLPOOL a657ad0b6d3c41fccee2ddf09cf220acd8e59dbe687b78d61e1c25a6bf03e5033efa988587fbe511428562be85593bffefa47ee3188d48e929cca32c8aeddccf
+EBUILD gspell-1.2.3.ebuild 993 SHA256 72e03d48586896509e342c81b8d5fb0ccad200d9bb1f563cc3c93a0913365693 SHA512 10dea47cbf272ecf8453a13e78b92d2d4555aec588277b1cd59ca060457f33ef96784bef944e3fc1c073c2f526ce07866fe8fc4d671d087b1ac3c08148f10e13 WHIRLPOOL 0dc1d0e8306ad7e93c5957326a15a04ac373cb3c292b438ed06009b7b96a7b1a4e96a32e64dbafae49cecd064b95ab3573ef6fd486a86c25b486b9ad6f318f1b
+EBUILD gspell-1.4.1.ebuild 962 SHA256 7a0a1fcd6b452fa5411e71c5545e8e930b8092beb74ff7301e70e725eb2523ce SHA512 7e930978ff6535e377a5009804703afcca050560073ffb80492cd3be722a8620938cf10aae6a8a8904c6f7081f4046416b63c774aab0a20c662ce336d889a4da WHIRLPOOL 7669bd2d421dbcdd21733a5e86ef2b4bbff88ccd7831b8af26fde9293fb5c1c629cbd4a05088287b69904829ddf8a05d7599fe7b3d0e40635dfe12d4e6d60fd2
+EBUILD gspell-1.4.2.ebuild 967 SHA256 c21e58b545b6700379e590a4a1d14e0372958374a14893b203120fc1ffc53fda SHA512 2b80bf4af6b51713e22d339793403b5e61b5f353ff0ee815e69a08bba2b4e2570e74c3ed208ad1cf9e93dcacf9e4eee49361ae8ed6ea761739b54bbfda0d7bb5 WHIRLPOOL 19d33273f26928710943a8102786f8f9502f4e3b4d14ae7a2a9eb6a044b02086edbb1b2e6421af7af9188d99ac1f6d00f630bb2a26247993c3bc850e81f803d3
+MISC ChangeLog 3567 SHA256 ae6d642448f7ae3c2f04bf92117b589c3233bc580b4e030d3fcf3e5467f5acbe SHA512 ba0e8a838c8a13c825d074f90e21e6c2ffd7839f9b1d66b0ed875b03f4e4f194f1189d4d97ac430f5e7d3d468a3b8614b247a14c5195f79efffefa31aa56add6 WHIRLPOOL c9a27ae579cb419b1e1fb0605fd72516d80eb769b7f8a32aa2f9fccff9526aae9427a5d6b8049b84796c71c9090147095fdd24c42733f7dc5e8b4e0928e1ede4
+MISC metadata.xml 249 SHA256 4505b0bfeadff287958620b7dc7b7209699065a8f17139a237a5dd409a726a97 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 WHIRLPOOL 333a938ee1d2124595596c572697bf5ebad523a92ba12005cfb12e6bb6270881a94a911f0cc9c1cf2bb571559e8271e07dfd307dabe50058236dbe7103562b92
diff --git a/app-text/gspell/gspell-1.2.3.ebuild b/app-text/gspell/gspell-1.2.3.ebuild
new file mode 100644
index 000000000000..666297d4e373
--- /dev/null
+++ b/app-text/gspell/gspell-1.2.3.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2017 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 x86"
+
+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
+	>=dev-util/intltool-0.35.0
+	>=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/gspell-1.4.1.ebuild b/app-text/gspell/gspell-1.4.1.ebuild
new file mode 100644
index 000000000000..96bc7681b90a
--- /dev/null
+++ b/app-text/gspell/gspell-1.4.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 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 ~x86"
+
+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/gspell-1.4.2.ebuild b/app-text/gspell/gspell-1.4.2.ebuild
new file mode 100644
index 000000000000..3981f50f9f09
--- /dev/null
+++ b/app-text/gspell/gspell-1.4.2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 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 ~x86"
+
+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/Manifest b/app-text/gtkspell/Manifest
new file mode 100644
index 000000000000..ce54ae800599
--- /dev/null
+++ b/app-text/gtkspell/Manifest
@@ -0,0 +1,9 @@
+DIST gtkspell-2.0.16.tar.gz 351277 SHA256 8fc7dc560167b2cb7193e76aca625a152dc19b0ebf49816b78539cbb90d80d02 SHA512 7d3afb327c2e15608194e6ee6110107a0ce082e483788d831d636b2e579472304137373c09a966d8e5c0cd2f830bf2e0ee477c9b5fca7da6ee27fd1498915b9d WHIRLPOOL 58dc258297412b99185f8d284fb4d2ab71ab834aa29e17a9dfb743e93271ae14d517fea2dc886112898f666104300df62b04082c307b3870de4a5d908bf2ae57
+DIST gtkspell3-3.0.7.tar.gz 447648 SHA256 13f2e6d3e2554cc24253ef592074b28c117db33b7a4465c98c69a3e0a4fa3cc2 SHA512 121c32050a3f3fe6868d76ce7783cb4619a9cbca083b45b78e1279e4c86143fe414e60971fed4c505b066449743664b372a06589af9c3e8dd1bafae355f83e47 WHIRLPOOL db0c04e6a6c01bf6929ef92c7f53f0852afab5216854d9dfd028749caa016b9cce94d8c41b0cca6d2e4a5e6005141bb080b1167e4dfeefa4acd0cd8196a8e112
+DIST gtkspell3-3.0.9.tar.xz 298988 SHA256 a4f4a4a2789f7499563e26d96b22d8085222ebe278da47d026b2de782b8b4d26 SHA512 de6cc24ca092067a101996142bf2b3cfb6a5af2170ea4b0185a997e5c88adead7ba53c5a297c3110b3a66dc87d37e429720f972895bb2931f9a033fc006e2eab WHIRLPOOL 18a54c570d603d7e8643647da124b5fe85064b695584f8728e1d753e3cda6e849615317569c9607bd63c6d4abda2ce7e99336718313fc66ec13070df9ea076da
+EBUILD gtkspell-2.0.16.ebuild 942 SHA256 f600cc86f604619a488e2672a0cc6b844b4dd2f5828d581aceb8871b0334bb53 SHA512 90460f1f223900b13fa54ffdf5e87ff2b810d540242691f3574079ed66dd061539cf0d0bd5668f3fde09b2a18297cea93afedffb2772ac3725cdb98a5270ef53 WHIRLPOOL 6d6451ade9d1e2bfcf4110ad2cc11fd539ce19c876b1f6accb67e45f12ee42cea7d70ab9019c3c55ba208e48401330ba317786322ebd1672608c72cb3c50e430
+EBUILD gtkspell-3.0.7.ebuild 1063 SHA256 70c833ceee2acedcaa162e6d3da60deff677ab4e54094e942a2aade3a5fb14cf SHA512 65358c2816dca16196719bffc48d9c0ddd46c40d9df32e16cca40622405935931d083b46b6493a3b7da50834ae785fe784886585f9c7b67185afed9204835ee1 WHIRLPOOL a1c0dc2880d3714fb30b60a51145ff48fc4c08242fb7a34aa82fd74964a2116da3a184cd59b88f62d91099a5fda204c73d04f1107ead6a6783188cf8a042a00d
+EBUILD gtkspell-3.0.9.ebuild 1079 SHA256 c6af9fffb4255cc652820f1fca3ce7b60adfad3e803d8a1c01bf26ad458b0331 SHA512 534f89174c9305709653db2c2f5cf96affbf6e34dc0fc7fbaaa361afcc6c886fa510516bc0df671b8e238c21fac48cfdc2ac7c49125652b46f4883b456ec593f WHIRLPOOL c0adb161554753c5ecff9fde1b0b8ccc138cf64266e84fa25dc51ccad63d993ce645ced401ad4b403c0be54af4432d2ee0fa34472f0c3199e3d3106c91f90815
+MISC ChangeLog 3704 SHA256 861a807bfe66d02e2cec379a738a73a2f43b9fa8b90be7509ba03aa15c62e55f SHA512 ebbd2cfc1874d7b2339f8429f0e0cbe45ece40cc27d4b3fe59a15786a57874f24f0d366ebc9d02d37dfef1e849fe0c3876a73a3c52176c0568b83a08fd94e28e WHIRLPOOL e247a864a2d0f07b89243b4f1a839d502c23e7659e030028a3c669b29085cfa2966f414ddb94cc88d5ff95e8adbfbe0d5d7cf74db29cee2fc6d1b5f44717073c
+MISC ChangeLog-2015 14284 SHA256 a33ce636469ded1db0edd4bd4c15601aee3ff34a11de653412e593017d05e94b SHA512 a59e2188772d0e484c5c852bec0533487e0ecbf4411ade76b5438672174977b6c5482a7cd61499e109299500b6c5bbdd57cce5a753cade94d4604cc6a0604c48 WHIRLPOOL 8bf71ae4ba57fc47b17d8d42cd27f157c5c8ed1e33eeae45b0a3b7ac8b6b3cb7dce8fcad7fbb17a51bf4229c0b8ec6f608224031f5f2baa128b6a643c9ca8908
+MISC metadata.xml 331 SHA256 a1017ee90e2a795b8361ab0873e0f5d784189d36de4e32e16dfe0b603a6a6455 SHA512 51f55422f9e5a13f8cff5ae6ed6e00f2be248ccd4b472c0d8519c73fcda34d19129fc3183d4c570480198f14468fd8b208ddab0c70df05431ab8470399221514 WHIRLPOOL a27f159c61076d9c092d8580f4a46084b2825d0d898a1c2a9488720163711c8e2c645591b62e78ce67b6eaf923ff8d4829a198d97d1106d914dd609bf9339d8f
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.7.ebuild b/app-text/gtkspell/gtkspell-3.0.7.ebuild
new file mode 100644
index 000000000000..63cc9b4b5b45
--- /dev/null
+++ b/app-text/gtkspell/gtkspell-3.0.7.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit eutils 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.gz"
+
+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"
+
+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/gtkspell-3.0.9.ebuild b/app-text/gtkspell/gtkspell-3.0.9.ebuild
new file mode 100644
index 000000000000..a5ee97156fc5
--- /dev/null
+++ b/app-text/gtkspell/gtkspell-3.0.9.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 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/Manifest b/app-text/gtranslator/Manifest
new file mode 100644
index 000000000000..f6919a23f236
--- /dev/null
+++ b/app-text/gtranslator/Manifest
@@ -0,0 +1,7 @@
+AUX gtranslator-2.91.7-gi-silence.patch 869 SHA256 5556cc715d2672a48caf0106c937c2eca801663344ab005c6cd6d77fd733496d SHA512 c23457f2267377aefda4842e2300b33ced326ca7933d5d060e9f4c2e419267f722589f7fc9d7793f5b73e1f3cba2a3f863501c44ddf4f50a2acc45ad3b2b862e WHIRLPOOL 0c7d5ff5fa7b1cc1e8d0600b9ee9309373a4f119093a0cbb4cc049a437bf889205807c25b7315b7bc0e5fbac51e62503d69175105e0c05935d8bde93cc1b4d00
+AUX gtranslator-2.91.7-gucharmap-python3.patch 1851 SHA256 17144c526e896e1ebbab56575fe80b0f7ee173008eb30e52c9d5338c819d2bb7 SHA512 0a622e707018fcf27c8d29317d87ad967a98eafb6961c447c566a383b434b4c06d8544e7c8575bfe36b352d9e08b2e6570628b4bf41ac3c41af3e31905a7a1e8 WHIRLPOOL 3b26bb9ec62a21d4ce44b8091446107201bf76b221d6f365233837240ff542c098c6c7a01b62bf4acdbab4dfd8b705abcac794786fc77b1182f0176f8188106b
+DIST gtranslator-2.91.7.tar.xz 2835836 SHA256 2b25b45b33e4aa856953b4a5da1d98bd51a343ddb479aeae3934bfe0c3651f9d SHA512 8d2a582e06ab0fecb9c18bde372ca0cd02d426155d4b30b876bd8f2e177c88c79d410adb0297ab85f18a952eeef32c17352cde18eda3c4c4fe33833db25022b5 WHIRLPOOL f39557d03cd0d8d833478b8e9d356c4db6ac13a9a5ebd2c09c0bc022a383342d490762eb53b99a1f32182c348e27ab21aa5d2ef1950f19b0913584997e1cac98
+EBUILD gtranslator-2.91.7-r1.ebuild 2151 SHA256 36f43a8914973c191b29d9f23ee3e1a5b4235fab7952a2e51b18d7226296b95f SHA512 31547c1651f68d81ef446352424de2e9fba5525b5f23ca302784ecdf6cd82005e8f8376ec1b29f710334d692f3df8fd142a2c59553e3e909225b6559e95986b8 WHIRLPOOL d7d23a12d1520540525798878b0d22e25c64b20015121a04679565ea45bf14872ad5adfdc7c80836765d66dbc41ecf95205a0d42cdf48648b7af5cd56136bde8
+MISC ChangeLog 3169 SHA256 55d4eacaef3f1911d7f1a0f971bf046b8763453cbf71ee0c622448199197680b SHA512 32e8aa4902f5d099e78b2b410800ace5e9340f9969361be28d4bf8054c8723be2f13fedfd0d8da06010bad476005a035737f2aefb62783b33290c3862e108066 WHIRLPOOL e10827e2ae8b45b98a3a536953192100d88a33cce914d1762f4646bb670e21afbc7daa1be000ac27a486ea1a4866666a60cf87043f560e5c1af4774108aa6069
+MISC ChangeLog-2015 9983 SHA256 29c911b03e438ceb3f18aef0b4527b0985bdbfa4de56b51b0e789ca7f9c8d2ae SHA512 d132238edfb27f1b7a03a0aee92ecff9fc5df441abbad8379cddc334c00bf72f210dc4e8a915f83fff0a42c5648612ffdddae73d1e1c47d681984f0a9a4f8d30 WHIRLPOOL bbc37d55d2529a35166f77308f6f0625fd087069f52322b73e9c99379aac20fe8355f0e44890d9ab4049298bfb8e516b122671ed8b09eac58b180ae7ea8edef7
+MISC metadata.xml 586 SHA256 de4647b0412259ea7e3a61cf268036472e1c3b5794c1febd8420447d0b703cb3 SHA512 9f1f582767da7fec99f0cebecc01775b4b76b5eba91015a1c987599ed37bf8f4b031004765dc4388f8094e34034d3cf3636f53f6ac3c7b8c15e8a2e7986fd76f WHIRLPOOL 75d3c6646a0025d281194706d32186fd22af29b0e002cbae6e36ce0f6430efc2f481663107f9669891ff6b969a903a73f6e096e8e35aac31af1140528bc5a8d8
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..81f1ffe9481d
--- /dev/null
+++ b/app-text/gtranslator/gtranslator-2.91.7-r1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2017 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} )
+
+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/Manifest b/app-text/gv/Manifest
new file mode 100644
index 000000000000..30137bda7560
--- /dev/null
+++ b/app-text/gv/Manifest
@@ -0,0 +1,9 @@
+AUX gv-3.7.3-libXaw3d-1.6.patch 404 SHA256 9cf35551ab6e386d9358ac8ed0ab21ed5d14eaa031e27ad0a4de00780c68b2af SHA512 3b047d34b03efeefe5f764ac02f32b9e1b7fe43f8a08eb49e54313ce42d2c6323573dfb90fd46d77eb81c3acc9dfbd98a5551f5cf49b48240a519eb57c4e1b19 WHIRLPOOL 53fdb6cd8d2e87c3430e41840eae8c603fd4fdebe2c170e21e7d5d7216dc3fc53bad441d454d8ffd4102d9876d1e44bcab9dec1f3561ac0e8034b78887559b88
+AUX gv_icon.xpm 2837 SHA256 b1d29d7b1eaf618143334f3048bfbfed08e5bc399d2c1f9b785b04b2736bfc15 SHA512 6aae3a463fbf3484028f7ca8f50cb7a332f5566f3bb84dd5c17843b581e1b6013b4f99a1de8600e9d4a0ba5b9b7ce131ee37b0fd80b97e32ef018d272f756076 WHIRLPOOL 3c98da885cafaba66c4e2e343c9b9e055912169135287bdb3cbb4640eef0623a5f988a903e7db6d5411b91bceb43163dc3862ebb42812618c5799b8c0977c938
+DIST gv-3.7.3.90.tar.gz 757506 SHA256 2824aefb0cbced31def7a815e1d6f00e17f47a4cb5ed1be93e4d259c7b64b63f SHA512 a80ff303fda1d6f13d66847f4b20aee4b364a05ec750bdb08267aa46470b201edf9762e16ad39dfe9da03118658598697f411dc8c32ab8bbad05a1161e816c50 WHIRLPOOL b9f3465f15ed7a6696e32a49f55942f0b18fe7b61c4dbec39a4fd97e4ff926bb4a8891b49010563b5959adda8f72e5cb1b802392086fb8dc44fb7f8b482f1334
+DIST gv-3.7.3.tar.gz 754282 SHA256 ee01ba96e3a5c319eb4658357372a118dbb0e231891b360edecbdebd449d1c2b SHA512 0c0339f023896016212bb1b8ef0185689dd669855c060d0491e1ac59c76ca19f3006b1b00b421cb40bb0beba8e2d35dad1da7d856ac9d33440cfbb07ff1e33c3 WHIRLPOOL 78e3e99a8065d42a84ba699256b8f1a366c74bc5c36eb5c79e0c7e0b6462e38711cd8eea6f474d9861feff92b4c84f38c5bf39b5df55f926443f3ce722cfb316
+EBUILD gv-3.7.3-r1.ebuild 1180 SHA256 917b8f59370b420b4530aa1b6b44357d6aedaa76f65ef7f441f9566f26cf5aba SHA512 8f7d9af7d1876a7cb3ccb1a68166936122658c42b3e598c4b5d7249c0b0f703331668cdc97518443cae40e2085c55a36a6af9407e58b0d58a548611467633ffa WHIRLPOOL 110f9d2b4b452c4acd17d1cefcad753eddaebe39b610c1b6407cd4b4ce5061184196ef9d0db50b362f950b7fe253837b4add73ccb8aad34adf53ec2b3bcb5157
+EBUILD gv-3.7.3.90.ebuild 1049 SHA256 e11b5c8b636f330b8bdf5dfeaf3a4013ebaaa1705369f4e344e186dfa60b8a13 SHA512 46303129c72fc3e28f5f54f16a7f8f20366b35bc8e45a9534feaeb6aafdf68b0338d2440ccfec3332f64206a915f1fd3b5a9d6a4e4ec13a55906989a05d4bcf3 WHIRLPOOL acded2fcc7dcadcf98048225c6eb909958a4acc81394480f2f3899aafac092bd51bb44af6b7f2c54b58a70341c86a8fbe8e2bb021dd699743594f1d4c22b35d4
+MISC ChangeLog 2698 SHA256 1dd3a86a6c778bb41d54ab0ced42b1006fa81e2caa45abc4c15c810cb9b107a7 SHA512 2809fbb6c3aa244210094edc40a290a9fd2a301afaf52089fc96031bd3a5aa8d327da655204a5078893a96692ae40f8095167b7742a2c80c9140858092f06aba WHIRLPOOL 625abe3e791b8bfbc4db53cf3e37c4b5875921156e42020dbfbd0de58a368323612db05ebe02f6e5c520e876f92eee5ce25625a70902e9b29818cab5d4c6f963
+MISC ChangeLog-2015 14571 SHA256 3266137715c2c79aac72675b87ec0259ea458be68365c043589bfb9a1c40e8dc SHA512 35de8f97a6defbb06d8cf486c30e4084a4d4e801cf194ddf23a4f8d6738a113ef81af43198f1a73736e7053684abda8fbe7e04b803cb70cea8866e55c9d9a9c8 WHIRLPOOL a4de016edea562da4e903b4348d2c4384913c92b47e5658428adda98e709dbf8991878e3b86fab40be4c1c1051617379ac2b188a7d730cfa057b7d48a97cdcb9
+MISC metadata.xml 255 SHA256 369a8c8c92b41e8d46a7225354bd493797b21f0b8b5c3f9ad4ac0a7e14322ebc SHA512 c6c5f966cfbe396fde1b15334442de9e0004b44c4b48775588b0b25a058ad1751252761370c9c254280e97561fa6306f5aa0cc7959c675d4ee11f7f95d777a36 WHIRLPOOL a6043f3549b633ddc8017207016e272af3ca85d175e603a0bfffcad7c5fef4457a01bfe76ceeec5ca09e957dafb78459db4d9cadc6ec99874d5be44ca85e27c0
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..35a80d634e16
--- /dev/null
+++ b/app-text/gv/gv-3.7.3-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2017 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-proto/xproto"
+
+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..db63c43154e6
--- /dev/null
+++ b/app-text/gv/gv-3.7.3.90.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 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-proto/xproto"
+
+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/Manifest b/app-text/hd2u/Manifest
new file mode 100644
index 000000000000..3804a2bdd2ee
--- /dev/null
+++ b/app-text/hd2u/Manifest
@@ -0,0 +1,6 @@
+AUX hd2u-1.0.3-build.patch 666 SHA256 7a033db83fb7371cac482af2e15067e1c8585363bc7a64eaead17a3fc525e1de SHA512 934fe3043aceeeee5df7ae5879198d385639f5b489581209c44e7ec91f5d05216424bf5652f557e154a1a442633848ebe1167b61af9c9e374cd30594744f4d7d WHIRLPOOL e7782bccd5944505614d201c16bf75f7176dde5aa717e4338aa722987c83452eaed6c08fbe64e761804a41426d64c006ab605762180cf6f89a541f3827520843
+DIST hd2u-1.0.3.tgz 60024 SHA256 3c9269e4aa188ddfb1ccadbb9a1906d87f6cbb60b8a2ce71cc6c9f2082ccc890 SHA512 d354964f0ad5392315767b96438d843a5f1d6afe78da5b0c5ea65a3b0b2a61beabff3ecac89df81b9271a14ca443f23dfffeb51815e02b724ad287e42fc2d6cc WHIRLPOOL 36ef7e7beaa27129a12c9dbb7ecbc62c048d2a4db87c68ccb8a2ba5442d9e2bfab6db6a636204331b3c213af45635f2bd6eaa33fd89c60473f684420c423ae1b
+EBUILD hd2u-1.0.3.ebuild 515 SHA256 1a11812a5b214a2256c3d739e51d1751d2c1b8082537081f1c3e2a61ebb68e43 SHA512 d0a7153a1d1961c2a1cf31028f300362a5fbaa6959719404c8f5d8cffd0bfdecc2cff47946aacd2a57fad53635532519ae8d09929acf86a654fdd041c32f03b7 WHIRLPOOL 1346440333ffd2fd528dc9100e5c99a24c025a3feca96c14aded9c106a12e880600a33acc895ea6c7b0c539fabcda23e9c4a3793a5b76334db729bc5233a05d5
+MISC ChangeLog 2649 SHA256 f1034b93eb6dedb7f99134b37d1011093eb138e3456e16014415474970b4db08 SHA512 1b24a7c1cd89897a6aa227ef01619a7ba27466677666ea84524d8b01ed8083c958437663342d48d1f41381b2aca544d18e0a793ef814f4db0433891f96e2145b WHIRLPOOL 2a2cd272c6c8b69229f4eb92c2e4154365dff4c67d1183f8838f54815d511d8a5cfb94e3f700396be7e44593d13c44f385a3cc05c3cf89b538d788f8101818b3
+MISC ChangeLog-2015 4386 SHA256 703016275271c51d7d6d82bb2d6a6c69af95a4c7cbce1cec204167524dc9337b SHA512 655470ae097a1f44d1e0ec761733f785de9d9c567f962bf9316697f818308d48514e1a0b3230c7e216a76f7452b4e60c654a147085c44cef2edf2c4840625f89 WHIRLPOOL d144bcf3b4dd958919c4d17608f985273319df6d5f57e976de1999a099c7df0e9d1a001791f6cdfbcd301a3f9d9ce67a76afbafd18d3d9b2e83c9e6490c2731f
+MISC metadata.xml 265 SHA256 5c4f9426c69dd2191012bf8aae1952f4f6298c1f6ff0ec1e45fe0e05327694e9 SHA512 176f814d8c555e8726f36e012367b698e8a19a0662982621029a7f9190beecc5e6798e43c51698dc149364966cdeff7061121e54fa9d4cf2a3559a6ce4904e25 WHIRLPOOL 2fa84a9f23f48e804ab20a6fabe2707f86227bded2a41d3af30958db5a69bc6276140a7f035a256caeca5a8b8ce1c240383c300a90fc4a83334c178769bc3519
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/Manifest b/app-text/highlight/Manifest
new file mode 100644
index 000000000000..ed55734362ee
--- /dev/null
+++ b/app-text/highlight/Manifest
@@ -0,0 +1,11 @@
+DIST highlight-3.17.tar.bz2 617834 SHA256 87ca5907943da25c756407d35ea0df8eb7762f3e32544201da27555c8eadb301 SHA512 27d5391339e80b616146489e97f63bca336f18b26c2ff5b94ae5bf183d3d1cdbfba202ab36d8eac86dee98ff49c6cc6c41dcf31860f0277f0327688e622d954e WHIRLPOOL 53ee5a4c58021f2a395d1d2e29090a43b06f3ad4ccad4461843f5a1eedebabe5ff33d2ac0c97c9d1ea496023c3acfe9eb30ff4d9d119a0eae4173ea1f9352cc3
+DIST highlight-3.33.tar.bz2 620644 SHA256 64b530354feccabc3e8eeec02a0341be0625509db1fa5dd201c4d07e4d845c3c SHA512 12dc233e91380d762cafdc8a685fe6063e2b115d4df5e7ed83c4e880076a8b4fd3d41bf3631a9840600ae3012a87c64c31667b0f81655dd2ad10f26c563cce83 WHIRLPOOL 350b94f608e28d17b746630658cd3a4eea03465a30e73b7c44b1b03fc852818506c0bedbe148376c4466e7dc99a19c1ff0e21b17a16bb8f32ef533fa1edf521a
+DIST highlight-3.34.tar.bz2 622273 SHA256 1ea4ff989d192a0c2538f7b18683f41829596800e9f6fecf58d9d621218664bb SHA512 f052adfe2b78d6cc28f23e303a0b2d5fd7d86aa261a3a40cca5e07fd7867eee3da415204194387d0e9818860b22ba2578fe200ee783e9cc07a5e30d94431ab51 WHIRLPOOL 58cacc5b3686ac3963832fd5706dc4c5589cdbdab0cfacaeb67f8810e9159ce5f3a4f045e1c894251b3d40d6a9abec3edb111e5589440f2cb9c6e728527474f7
+DIST highlight-3.35.tar.bz2 1181873 SHA256 8a14b49f5e0c07daa9f40b4ce674baa00bb20061079473a5d386656f6d236d05 SHA512 4f0959b4deacccf3de7137a4db45c2ec7091fb7427076cb5c5709a8d2027458328133ff541ebfb5cbe25fdcd9eebcd1cc9ed58526300d56ac6205fe6b806d211 WHIRLPOOL c7a9fa2aa61be797aeb1c6dda2074c0acb3f15a34603bc007f84897c69b64cf2b834a5b461d7b1b4343652aee2493f76ce829f636bc130d1e3d0bb97ca9e17b2
+EBUILD highlight-3.17.ebuild 1671 SHA256 79c327b448d5fc6a2cf73e357a7df83b9d2dc0dc56f6677c73d117588891b866 SHA512 fd3825a6aa4b15eff9d23527e9e7e669db1044b22c657c7e5b19e531556d2d2ddff5bf83c00130f5ed9a3dfcae3264110628f4937d0c9cc6f3884f12620d68c8 WHIRLPOOL 3dc9ff55b28ba8a545453f14af346024cd5be9a03df58f9fee1c62ef249e4a7233f73a422e50ba6ccf5e843eed30d71e6996ba95b45eac996a8cf7d3774f53ec
+EBUILD highlight-3.33.ebuild 1703 SHA256 1bde63e9a46c2154c231670515fecb265d99fb45467b10f8139785adc8a34a72 SHA512 a05064a3bcb5111e8dee23d7d59ef4d6bb68c150f6af6589bf765010f3c7973e33b7e37227d67537e344c2622a8463bc398759182d4549ef3e56c2915194d73f WHIRLPOOL 52b529dadc26262a1712b29b381cde845f35cf24d60c81156897f3b3dea514a376e94030c4ad4cb76f6f54530c5990cb484c561cef964201ed1e1d2527f9f1d2
+EBUILD highlight-3.34.ebuild 1874 SHA256 933677815bb1ee967e581e822209f4080436ec9ef08eeddfdc3e5d5f3be61d39 SHA512 a096bddb1e73adfbee46d5c85f6d96a8a7fc7bf8166de352d518249c249b34812f1c518f77ff9b815685ac117b525cb247fcb0e567abf8d68bb35615f7365630 WHIRLPOOL 81de94cb399f18ff3f41bf0852571a2ab0545b96e71de4ba98a599f25a9b8ee1c1ff6db7c191d30ef7fb829b32b69327855a4049f73ff867b789ef16d0bc19b8
+EBUILD highlight-3.35.ebuild 1881 SHA256 d7f632a05c43a61e2a6c5db58d919ac556668a1ad1ef6b4b4f293cb3b8d408bf SHA512 ef89032b8570768becdf30112bf1d914d9b7d18957c4d15e1ad41fc759ee6b2ff36477f7489d9f526103b6fb8e22514432d40968316316bc381f5e9811306400 WHIRLPOOL cee0d4a001704d73fabed60dff899fb1f70b148748f3bda17eec14abf0b2954fba6acb28b5ca971728aa5fe45de825b8e94e175ac80ea6b2e4d02955f070f9ff
+MISC ChangeLog 4762 SHA256 8bfa1e2bdc556a9a3380d17a8d652c3f2af204a4546b179820e18b1f75613fc6 SHA512 7bc1c7af912e494cfb9c365803e6c3f16959da2d8cd0d6a2caef44302e9cc47ebd1efad2f717062a5d5350eeefc83550fdff2804feac4a96fd1350bad1121d73 WHIRLPOOL 8405252dccaf5ad0ab0bebfdaaab202d516515f8e2a2084ec03d884c683cac011120f0d554eda60065fb3cb7dff4f90fc406ed6490e03c5fe7916b6940fe135f
+MISC ChangeLog-2015 11290 SHA256 d110a42710d7d0bb05c2376952e93e533413f01b00772ab1c0122666008b16f0 SHA512 9a1c88bebd11a3b30f07bc3c5861cbffbbad66e31b77f85a46bb2d97721ff64477edc5d71b134f18da1476a712d246d1d1e68bfed0f47823eccd45418795ecc8 WHIRLPOOL fd61bb2dfc23e34a4794bf1452190d04ee2a3545a335b0db053c461b8d1bb86cf4a32d14dc034d28a55ebbb5a378b175647c96a35449614cb3de7b6811be2f6e
+MISC metadata.xml 249 SHA256 1c23b6a75de713ca6f4316742ebb0884fd6cbe80d7b97bcab4f467131a3506f0 SHA512 895325641a176c848988fb5f36cdb567b584d22f6e778b3de674de480cbca30b7cf8f12ecbbe1173a63e3229889e1e0f5efd5afea4f0d4c429ac236598f80f1e WHIRLPOOL 79f461d266db8e176661a5c24527780598eb751a1fbdbc05871a0207ed5b5dde38767357e4e0c5bdad4f609a7e11d7c9ec5c3a404274c83d4a5c3910f9305c1c
diff --git a/app-text/highlight/highlight-3.17.ebuild b/app-text/highlight/highlight-3.17.ebuild
new file mode 100644
index 000000000000..1aa9d93f20a3
--- /dev/null
+++ b/app-text/highlight/highlight-3.17.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit toolchain-funcs qt4-r2 flag-o-matic
+
+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 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="examples qt4"
+
+RDEPEND="dev-lang/lua
+	qt4? (
+		dev-qt/qtgui:4
+		dev-qt/qtcore:4
+	)"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+	virtual/pkgconfig"
+
+src_prepare() {
+	sed -i "/LSB_DOC_DIR/s:doc/${PN}:doc/${PF}:" \
+		src/core/datadir.cpp || die
+
+	if has_version '<dev-lang/lua-5.2' ; then
+		sed -i 's/-DUSE_LUA52//' src/makefile || die
+	fi
+}
+
+src_compile() {
+	myhlopts=(
+		"CXX=$(tc-getCXX)"
+		"AR=$(tc-getAR)"
+		"LDFLAGS=${LDFLAGS}"
+		"CFLAGS=${CXXFLAGS}"
+		"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/"
+	)
+	emake -f makefile "${myhlopts[@]}"
+	if use qt4 ; then
+		cd src/gui-qt
+		eqmake4 'DEFINES+=DATA_DIR=\\\"'"${EPREFIX}"'/usr/share/${PN}/\\\" CONFIG_DIR=\\\"'"${EPREFIX}"'/etc/${PN}/\\\" DOC_DIR=\\\"'"${EPREFIX}"'/usr/share/doc/${PF}/\\\"'
+		emake
+	fi
+}
+
+src_install() {
+	emake -f makefile "${myhlopts[@]}" install
+	use qt4 && emake -f makefile "${myhlopts[@]}" install-gui
+
+	if use examples ; then
+		docompress -x /usr/share/doc/${PF}/examples
+	else
+		rm -rf "${ED}"/usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/app-text/highlight/highlight-3.33.ebuild b/app-text/highlight/highlight-3.33.ebuild
new file mode 100644
index 000000000000..86d60f69c989
--- /dev/null
+++ b/app-text/highlight/highlight-3.33.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit toolchain-funcs qt4-r2 flag-o-matic
+
+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 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="examples qt4"
+
+RDEPEND="dev-lang/lua:0=
+	qt4? (
+		dev-qt/qtgui:4
+		dev-qt/qtcore:4
+	)"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+	virtual/pkgconfig"
+
+src_prepare() {
+	sed -i "/LSB_DOC_DIR/s:doc/${PN}:doc/${PF}:" \
+		src/core/datadir.cpp || die
+
+	if has_version '<dev-lang/lua-5.2' ; then
+		sed -i 's/-DUSE_LUA52//' src/makefile || die
+	fi
+}
+
+src_compile() {
+	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/"
+	)
+	emake -f makefile "${myhlopts[@]}"
+	if use qt4 ; then
+		cd src/gui-qt
+		eqmake4 'DEFINES+=DATA_DIR=\\\"'"${EPREFIX}"'/usr/share/${PN}/\\\" CONFIG_DIR=\\\"'"${EPREFIX}"'/etc/${PN}/\\\" DOC_DIR=\\\"'"${EPREFIX}"'/usr/share/doc/${PF}/\\\"'
+		emake
+	fi
+}
+
+src_install() {
+	emake -f makefile "${myhlopts[@]}" install
+	use qt4 && emake -f makefile "${myhlopts[@]}" install-gui
+
+	if use examples ; then
+		docompress -x /usr/share/doc/${PF}/examples
+	else
+		rm -rf "${ED}"/usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/app-text/highlight/highlight-3.34.ebuild b/app-text/highlight/highlight-3.34.ebuild
new file mode 100644
index 000000000000..71e7930cfd38
--- /dev/null
+++ b/app-text/highlight/highlight-3.34.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit toolchain-funcs qt4-r2 flag-o-matic
+
+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 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="examples qt4"
+
+RDEPEND="dev-lang/lua:0=
+	qt4? (
+		dev-qt/qtgui:4
+		dev-qt/qtcore:4
+	)"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+	virtual/pkgconfig"
+
+src_prepare() {
+	sed -i "/LSB_DOC_DIR/s:doc/${PN}:doc/${PF}:" \
+		src/core/datadir.cpp || die
+
+	if has_version '<dev-lang/lua-5.2' ; then
+		sed -i 's/-DUSE_LUA52//' src/makefile || die
+	fi
+
+	# We set it via eqmake4, otherwise it forces clang...
+	sed -e 's/QMAKE_CC/#QMAKE_CC/g' \
+		-e 's/QMAKE_CXX /#QMAKE_CXX /g' \
+		-i "${S}/src/gui-qt/highlight.pro" || die
+}
+
+src_compile() {
+	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/"
+	)
+	emake -f makefile "${myhlopts[@]}"
+	if use qt4 ; then
+		cd src/gui-qt
+		eqmake4 'DEFINES+=DATA_DIR=\\\"'"${EPREFIX}"'/usr/share/${PN}/\\\" CONFIG_DIR=\\\"'"${EPREFIX}"'/etc/${PN}/\\\" DOC_DIR=\\\"'"${EPREFIX}"'/usr/share/doc/${PF}/\\\"'
+		emake
+	fi
+}
+
+src_install() {
+	emake -f makefile "${myhlopts[@]}" install
+	use qt4 && emake -f makefile "${myhlopts[@]}" install-gui
+
+	if use examples ; then
+		docompress -x /usr/share/doc/${PF}/examples
+	else
+		rm -rf "${ED}"/usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/app-text/highlight/highlight-3.35.ebuild b/app-text/highlight/highlight-3.35.ebuild
new file mode 100644
index 000000000000..9e13486c2f56
--- /dev/null
+++ b/app-text/highlight/highlight-3.35.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit toolchain-funcs qt4-r2 flag-o-matic
+
+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 qt4"
+
+RDEPEND="dev-lang/lua:0=
+	qt4? (
+		dev-qt/qtgui:4
+		dev-qt/qtcore:4
+	)"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+	virtual/pkgconfig"
+
+src_prepare() {
+	sed -i "/LSB_DOC_DIR/s:doc/${PN}:doc/${PF}:" \
+		src/core/datadir.cpp || die
+
+	if has_version '<dev-lang/lua-5.2' ; then
+		sed -i 's/-DUSE_LUA52//' src/makefile || die
+	fi
+
+	# We set it via eqmake4, otherwise it forces clang...
+	sed -e 's/QMAKE_CC/#QMAKE_CC/g' \
+		-e 's/QMAKE_CXX /#QMAKE_CXX /g' \
+		-i "${S}/src/gui-qt/highlight.pro" || die
+}
+
+src_compile() {
+	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/"
+	)
+	emake -f makefile "${myhlopts[@]}"
+	if use qt4 ; then
+		cd src/gui-qt
+		eqmake4 'DEFINES+=DATA_DIR=\\\"'"${EPREFIX}"'/usr/share/${PN}/\\\" CONFIG_DIR=\\\"'"${EPREFIX}"'/etc/${PN}/\\\" DOC_DIR=\\\"'"${EPREFIX}"'/usr/share/doc/${PF}/\\\"'
+		emake
+	fi
+}
+
+src_install() {
+	emake -f makefile "${myhlopts[@]}" install
+	use qt4 && emake -f makefile "${myhlopts[@]}" install-gui
+
+	if use examples ; then
+		docompress -x /usr/share/doc/${PF}/examples
+	else
+		rm -rf "${ED}"/usr/share/doc/${PF}/examples
+	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/Manifest b/app-text/hnb/Manifest
new file mode 100644
index 000000000000..36b0ff34d400
--- /dev/null
+++ b/app-text/hnb/Manifest
@@ -0,0 +1,8 @@
+AUX hnb-1.9.18-flags.patch 2527 SHA256 f416fc5021b03b1229cfa3aa59ef5d0d19e44212a639219ef5ccac92886d6622 SHA512 672e8836a0766d0b922359572aff8319aa701a10863fb618bcd74c52980303d0e3158f3de7ca50cb05367296c7121c510a4e900d60721dee33b4e657a8a07e5a WHIRLPOOL e9449ed3f9743b1d9935bd36e0729ff73e2104e77d47348a9172e4f92f4fa08b9e9ffc8bec85d80b5428fc636be939802e3930b26e275902aa1566a82bf9908a
+AUX hnb-1.9.18-include.patch 244 SHA256 f16316a5f26ae4e279a3a9c275089b925065817dd7541aca4b56ff81c6cf71ed SHA512 5fa1b46221068885d9d2e2bde2f647c9f6756173af2f6568e4f32a00f64d6d753ed2aa2b841f7c1206afbd3d6af849bc374e8a29e84d2140c68cfa6627f4cb62 WHIRLPOOL 86702ebebca9133c308e6f6cbfe6f8cc4d37becd910adf774fa9e934e2d3667912a39c6f9673c38334c6742c25424492006dc8e0f22da9305261aa61beca579c
+AUX hnb-1.9.18-printf.patch 216 SHA256 91a6b0397a0f01104b76eb49e9ddc4aa2792eb420be8f28bb5f36481b7c17371 SHA512 2638a268020ca55619be92921698e82d540b1f7bf75af3014339ae7e5f674e9f28e3618bd195f0e946f5276c0c2464e2336883db90af2036d2b356f1c9680e53 WHIRLPOOL 53c83e579c09883eec2eb39749743abda7dc9bf3dc5cdc86f623c6687315950f093a3ba855792b346a16309c919225660a84a530fdb3d5e0b36637e23b059af4
+DIST hnb-1.9.18.tar.gz 166043 SHA256 b9a1e567d904dc9d3eb262e4f6fd46a4494339452333c35d77e154c7b0d5031f SHA512 9919a5d6512b6da3d19cc8efbed21d4452a2f6a343a38758c36728f73415b6e8ad57e24ff3eec17eb4e1e53b458d579c165ae1ad906f5b75f2fd42897159a30f WHIRLPOOL 713bb592a3122e7fcaad0a6378134dbf6055d41004020bef4ddff0d1ac59ff596337b41b54792726cb170c8155ac4bf2ce4e9d0ebddb1ea5f403c0802e45330e
+EBUILD hnb-1.9.18-r1.ebuild 794 SHA256 bfaeade11a4f5352f1d042c1bcc8aa4e8b93320b3e0814ab5a227306a45322bd SHA512 642fde554203fa300e8b883a8580a85207d0ad34e4c5382f90ca5f79f9152a8c8bdcfb376b7211ecf6f0618fb7eb0b79e277cb04c75ca9c39054b927afa8a833 WHIRLPOOL 9d7fb8a08b5cff5e248a4e41578ec27abcffebaa307be7db0fd579efe667361c899c834816992574462125471e214187ace059dce69aec3804ccca96403a3929
+MISC ChangeLog 3162 SHA256 e82f1c20d4e0b69cd54027ee385691a4f5c0134a789329def26b3221edb5ff7b SHA512 bd8621947db620f63fe4e21114bc03a1c0f299c8f41e792af60c391da25a7d7c73aa76f77659b2296dcdfc0a45831eb32c40f43e38e50a715e0da834ab5c2d55 WHIRLPOOL 4d8b6db4cda1657082ca2304bdc050a79d6ebc3c835ce0f06c5c82f1a128a6468170838a3ca4b1c7a24f0b7c95894e4b0501288d3887c63083ba04775139d43e
+MISC ChangeLog-2015 3673 SHA256 6b81cb55e5f4cfc990e4b2d37e09a6b7bdf398341e421e2a9465dfa0abcd0b72 SHA512 b92030ac8b3f7e8bdf548b5947bb5ca3cbac6ec91b2c45694f0b2fa081db50fe9c0868a3ab160014ab6c937c6fb42b605a952879348b4d1e1614dbb6a102542f WHIRLPOOL cca085abfd2bf7f9cc43648c7d82e18c71e3f89da7f36b48c6e629297ab62c865890a301cc191504c15f21bb69438fcd267e381c4e5c1d1803bb9b18effaf159
+MISC metadata.xml 521 SHA256 e3f47ea9872680c9a8a6e553f94c10e5b4bb4131765b173ade539c8b22b5d4f3 SHA512 109d368df00aef9bb47380f20afb9695a877425a557ff188d16c37037160c6342cd6533f858ca224d197ce1b4c21e7b456584753de264e412d0b22a3cb16d903 WHIRLPOOL 11730725762e609f0f101309716c60b4dd31fb7d81b62a21fbe72dc3abce7658f4c0c99d8523bf4d845ead504e1c92129ddf1ecb2e3f7ed7a88b3204f7a13b86
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/Manifest b/app-text/htag/Manifest
new file mode 100644
index 000000000000..2670e85a352c
--- /dev/null
+++ b/app-text/htag/Manifest
@@ -0,0 +1,5 @@
+DIST htag-0.0.24.tar.gz 33602 SHA256 445ee5732d37755d4fa0b8baf3f3d9a2770288b60e703c7ee169fb96fa772b50 SHA512 28f3cae3bbaaecc2f61ca1d50b4d2e56e4bcddf2644aa37566019bd116ab653b019a5b048aac2b8a07faf6b906ac94164c81ac082c675602bd921dff62bf4858 WHIRLPOOL efced4ad02a028f5b7a437c6eaaf0daf69ba9f08c6cb4434e276c7eacf2afe11ad6f96347eebc1676d7c8d191f8ab22549bf5deef3c426a9cc9ecbe89a5a55c3
+EBUILD htag-0.0.24-r1.ebuild 724 SHA256 b313c7c998a4bbe891a153b71c9079d14af98a0750ca92a7fe9c680d63194e25 SHA512 6e8121b3dbe900e4e48ce514811a1498baf96c3f64cf5af83873f5db78c78b85ba199cf9422a6aa9e0aade448393a64e366a2b42007954c6dd470eefba212202 WHIRLPOOL 013d5b6eba2e895c61438832a45dda73bbdfc707e180b8d621ac6ef79ad5db136e03c9a4851b2b5ac2487bef9cd6bcee271b199f7743225b7d7637ecff91a989
+MISC ChangeLog 2426 SHA256 85574136264a4665d6c07d669ebb7bd998d2b30912bfff1a2c23da7be2d22f3d SHA512 8ccbb63c1a78045b571bffc9b00f721e78afeb5e5e450785a78321204cbc64005414b3118d8f1ef64b1a0c28390a66beb6fdbb6cb45f002d71dc191a61b9aedd WHIRLPOOL bf9be0a04ac42f333c5fbb297e630d65710693dd9d64f54a17d33625f64ee2c2a716fe451bdde8aae8888981e38a2ac90f33e2fc41f3f81b5fd140c01a0fd835
+MISC ChangeLog-2015 2788 SHA256 52c527f6b61059dff185b2547778ae73e0d025a2468b608b81a74ada7c8dc0fc SHA512 418b7518be7c6f5d595916942f0ae2af203bfd97e3dbd8ac37a16ff03a6e3ec232dcd90aa04d69057551a1d8645ea27463fbd74f161042b0dc218016625deb7e WHIRLPOOL a6a02311e9cc6f460112b2b1b7d297a809491ea108743c3ac575d0fbce89a0bae1f09dbf548a4ac20b0e7344b3bda06fe10900876cde7dd038e67b988095710f
+MISC metadata.xml 271 SHA256 fb77ec802242340d65f4f1cf61787ffa6fb4d57ed02f61feebeed67d2dfb5467 SHA512 3e98f5382cf789992bdfc0f32e6e36eba31944be654c03f2ed9bd00baf56c8b768c256c4f8778d5775d6df38da4afcf8e32b6e6495a1ecfc8e7982c7c8943b1b WHIRLPOOL d6212acd36a69fee56b014b2e1724369857e776204569ac774915e589fd2242b3cd961226d9f125eed452d6c420468e60f038c9b49d1d2a8827d13766918f872
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/Manifest b/app-text/html-xml-utils/Manifest
new file mode 100644
index 000000000000..6a93e74c33a0
--- /dev/null
+++ b/app-text/html-xml-utils/Manifest
@@ -0,0 +1,10 @@
+DIST html-xml-utils-6.9.tar.gz 311449 SHA256 9cf401dc84ca01752adf1f2d9862c4f227bb089504ed9d03d7fd40603e87fab2 SHA512 590a04e91130d7daecc4c1935808d872f3d49967be345060039bae5986b70be3be40104bc215524017a08c5492671a1fd96b63028f26f84faa400a9fbd283778 WHIRLPOOL b89b0bf5225256af2a0464429f2aa7eb1171ea982afc02ae0377e7cbd0633ee33cd39069bb0cd9056c712c20e7568b3716e448b1b8e47a9eb92193076734c353
+DIST html-xml-utils-7.0.tar.gz 334696 SHA256 e7d30de4fb4731f3ecd4622ac30db9fb82e1aa0ab190ae13e457360eea9460b0 SHA512 305578c135972c64e048962734c4794ed3a386a4bc3194cb14277fbe5bfcdb01a13a32bcf751d1216b3e89244ab778235c8cfb12d412fdfe1bf26229b5e23732 WHIRLPOOL 00452006f08853580eadb3179f3c57e31ef9909bd7170b2f5abe588031147ac1a39525d4de3f0e3a60bcd1f896c5866ecdcc6786d543e5417044344c6c7799f1
+DIST html-xml-utils-7.1.tar.gz 319559 SHA256 ec0efd2263b864bb7e0ae5c59f02c43c5d8aebd0e1c0d2bfce391e665766d56e SHA512 a17328500552ad28136a08d0c7dd992d53afbc853ffd8930b516b3218915f4f159234f27af66d135a51dc25eb6c35e6f14d6f0006bdfc2abf351ac8298334d48 WHIRLPOOL 2ac829710c4e1c8b8bf6e89676b0ed6847dac9e2445e7628b47bd0c5397cb02b890cb4d5c8411fb236ecde2815b3879a54cad3eab1348839eb1eddc1e3f4868f
+EBUILD html-xml-utils-6.9-r1.ebuild 534 SHA256 97a6edec295d0d2e1925760b9f2946b29f6ab00d70405afa54bd99f030042ec6 SHA512 39cc174c62a8c96d16d00987ac39c4160b4c12804c4ddb0d21cc2bb49ddb5226c12c196416f7f9a0700667ab83f6a471a76b3dab95685f667aebae5add450cc0 WHIRLPOOL 44e518fa5c75c1514fd59360f87f7eb5d43f1835c70518365c59c2e8f88735ae87db5ff7472aa711d888dffc208f88543812407626bd8da9834d87fcd9a45ded
+EBUILD html-xml-utils-6.9.ebuild 521 SHA256 92b742074a280127ce69f1fb9112e2e9eae1922ae0ec6a714ae20b16b85af670 SHA512 624d91296ebae1488e978eef8c477da23d096a08ebb16a60c92d2862bbe09f0a80694a635870801c00e6e59cfe2f3c601eaac232e2ce76539d89149020f22d15 WHIRLPOOL 9f6949a8399f1123b70c2628c19654c507a457df5138aa5152f17dfa212a7019473cbd2a09a4f05219b164a4d3facc17a6c95771770076b88dca5bc68906d4ed
+EBUILD html-xml-utils-7.0.ebuild 715 SHA256 bccf4e0e923373c1d8f59e81ed3258a1b6f2b4417cea6878a1d0ad89233164ca SHA512 76c019ff9e14c846de543bff0720cec0302c358fc3987829a9aaf049c29d571436a1c31ccfd1f65d54315d9d0dab24856258964fc910e291ef9c8e59b754a2ea WHIRLPOOL 9f299c6ec0b18bad8e0ffa7366dc4f2268f58e283279bf550af42c6dd4215048c3d48ea8dd129fe6870edce039876db717efd338de0abdfaffcb39fcf672872a
+EBUILD html-xml-utils-7.1.ebuild 715 SHA256 bccf4e0e923373c1d8f59e81ed3258a1b6f2b4417cea6878a1d0ad89233164ca SHA512 76c019ff9e14c846de543bff0720cec0302c358fc3987829a9aaf049c29d571436a1c31ccfd1f65d54315d9d0dab24856258964fc910e291ef9c8e59b754a2ea WHIRLPOOL 9f299c6ec0b18bad8e0ffa7366dc4f2268f58e283279bf550af42c6dd4215048c3d48ea8dd129fe6870edce039876db717efd338de0abdfaffcb39fcf672872a
+MISC ChangeLog 3512 SHA256 816925977485274a4192d5eef75ef7365a28dd7bb18c254dcd67533eb907df2a SHA512 f5324420ac84e6e09b764662dfa1e1e7e66510bbec71840406568584987753468dc772bc1a8c3c58653fc3aa33dd8742f4efa2a0e737b876542eb1e312457149 WHIRLPOOL d28a3a06a12a325acabb059a22252ff6b81400bbe33a8acce194d9bd6092ead3484fa580b769fe1bdcf94c146d723a03c68d602626d9b35c601203e0aa9b3615
+MISC ChangeLog-2015 7768 SHA256 8dabacae0f327d94ac8db165bf67a7ac53096ecad39fd5e9d1eed30828dcd37c SHA512 f93490f9ad442c71e7cdde74e90557f23822b4b4e97d6dbf1ca5a97c8fbc0f2f17935fe7a0985c93b2c556d3d07ee7fdebf480068b8e16c630d334610a6301cd WHIRLPOOL eef546a4b7b9416b21edd65d41980877047b442c8a904a7e2a17f517733f30865b4563b89e0bd38acd4add6c2e57209fd602702f63ce18c314df60ab8af85e07
+MISC metadata.xml 220 SHA256 998ce4afb847c8594ee92e054f8a06ae3de375d38b2e400eebab911ebbad60a8 SHA512 1db105eebacb6c7d44fd17746981e6e24badb2e81327410aa935a7603379cfcc8f3cf27dcf4e9d870cea2f73f6a15cf052e3e785205095ea9a93d72980ff71cc WHIRLPOOL 23c78e4c05afc8a04239236928ca26e539b0a969f44389b90a34fef3f4a57f18d9db2838d3df439c482cd4b89ce8b959dde5e83500c44ebd2af453629ef79a3d
diff --git a/app-text/html-xml-utils/html-xml-utils-6.9-r1.ebuild b/app-text/html-xml-utils/html-xml-utils-6.9-r1.ebuild
new file mode 100644
index 000000000000..8f754f220aba
--- /dev/null
+++ b/app-text/html-xml-utils/html-xml-utils-6.9-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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"
+IUSE=""
+
+RDEPEND="net-misc/curl"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+	sed -e "/doc_DATA = COPYING/d" -i Makefile.in || die
+}
diff --git a/app-text/html-xml-utils/html-xml-utils-6.9.ebuild b/app-text/html-xml-utils/html-xml-utils-6.9.ebuild
new file mode 100644
index 000000000000..f7eba1b63be6
--- /dev/null
+++ b/app-text/html-xml-utils/html-xml-utils-6.9.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+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"
+IUSE=""
+
+RDEPEND="net-misc/curl"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	sed -e "/doc_DATA = COPYING/d" -i Makefile.in || die
+}
diff --git a/app-text/html-xml-utils/html-xml-utils-7.0.ebuild b/app-text/html-xml-utils/html-xml-utils-7.0.ebuild
new file mode 100644
index 000000000000..9d9c59066edf
--- /dev/null
+++ b/app-text/html-xml-utils/html-xml-utils-7.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2016 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"
+IUSE=""
+
+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.1.ebuild b/app-text/html-xml-utils/html-xml-utils-7.1.ebuild
new file mode 100644
index 000000000000..9d9c59066edf
--- /dev/null
+++ b/app-text/html-xml-utils/html-xml-utils-7.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2016 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"
+IUSE=""
+
+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/Manifest b/app-text/html2text/Manifest
new file mode 100644
index 000000000000..153f1659bf97
--- /dev/null
+++ b/app-text/html2text/Manifest
@@ -0,0 +1,10 @@
+AUX html2text-1.3.2a-compiler.patch 247 SHA256 45baac91a2f393ab546f25ac2ade176a207f2c862e2cbdbb08a8b6f1a79874b1 SHA512 f7c2192e65fe6976ac9d21d45fcb3eb9cd460314945fd9e8f62ada1189935c3799aea43b6ebb15a86b6f313fb95e4115d6aa67a148f11d1b8774d9ca115b538e WHIRLPOOL da35a04b5607a18c314f3cd8de74c935e52a53b30eecb413e183173b828876804504299b0b0395699d4f6a7625875b3962a3aeaa624040540453101191320d1d
+AUX html2text-1.3.2a-urlistream-get.patch 186 SHA256 9373fe49bace3b435dabe451cda2505f0618bbf8a3b6e8bc841cf83dea3e09fc SHA512 388c30725c72e3d7b372544b4a4fec871d3069fe050aec3212b047d8bdb0c31575e2703e46374b3b7d0422ca8cf2ce2f2d3960d56c32977d85a93d4d94b41659 WHIRLPOOL 84f5273be1f43ed0ab731dd08b1faaefa401ce26a871a5870aceb8d42c13ec7c18703bbf2e9ddfbf3ac51bae8d6da0a31f27e4a44b3b42f194952ea9ff2b3e98
+DIST html2text-1.3.2a.tar.gz 130088 SHA256 000b39d5d910b867ff7e087177b470a1e26e2819920dcffd5991c33f6d480392 SHA512 8ec2c17849615b8b78b6f7e9066e5bcfb419b293ffe98323ed0942e891993e205ef37ddfd2839eb12b6bad561989027aea0ba2d57eb7193d424715f93ded90e5 WHIRLPOOL cd0279ae362af014a6f2af5368567e86567cb0e41aad02629f43dbee02fe094bdcfef9887159304d1dfc99667907a3fb620d2e17f5a222e7ca8d139445ebd761
+DIST patch-amd64-html2text-1.3.2a.diff 2230 SHA256 b05c425ce431de104dc0c506786f07590895195911e09c9cba62a64974ca05a0 SHA512 2a421a20aec8a547bbdf54b81e30a6a1d4cf093e7ad67b27158f0c7248ca0abadd8d96ce0a27adcdd375012db6fd21f61f42a8343bfd910cd8a9720c0a043be1 WHIRLPOOL d1d40eae5b1078a17e3e276ef78cab92707aaf26c478423a321ea08bd9f884501a4faf31e9050dfaad41b8e9d68432dc0164e7e6d7c3ea00c9b599631d1b1aad
+DIST patch-utf8-html2text-1.3.2a.diff 29499 SHA256 be4e90094d2854059924cb2c59ca31a5e9e0e22d2245fa5dc0c03f604798c5d1 SHA512 be31251471b221a38d291420d5f23e01d5017c20d953064c33ca3dd148543ae877ab584c16fcb01df1341abdb02494b05d08fdcf94bf70bad6b510ee8fac3376 WHIRLPOOL a512ca16db7a919fd60b3f3bf6797138df1ecfcc25e3d97cf3e800ca75b4d86860443c0a57c12e2f7ddece593e1c84c1f7a803be826ec154c9cfb2eb02712355
+EBUILD html2text-1.3.2a-r1.ebuild 994 SHA256 d92bb3c4774c817dddbe6bf6ecb35366d66e1294d520a6cb3828ed42cc4affd3 SHA512 94ad8a3df67dc20c080bab7a5eabe3ed2f38c39df6f454f6425b0033774b5aa0f393afe16d69e01f499ee69c2f31316a979cc0326e19737550d5bfa57603e0fb WHIRLPOOL f601a629c8fc3cca78e6e45bfd76e55e607d3116ba644d9bf1f856c91c5561885c2b4440be93cc39b4b9a165bd00c6ca44d647a62200685c10e638c4e702b2ee
+EBUILD html2text-1.3.2a.ebuild 933 SHA256 b7b5ee0f6c3ea976db2c081604b8444335ff96a76888156d005de065aaaaefe0 SHA512 ab234c98f3998db61cb17dad4fc72dbfa184a93511d7a4482bee1dd0f1a350ef59645b5ffbd427fb0d4107135d19a95cb3cf8e36760377309e63076a56158e4a WHIRLPOOL e594cecd5fab8777ec32011d98a7538e845cbe7ab7a22917353791fcffe016df23ec1f9879ca5af3ddb22e26fd3efac96041098b3fad7c4fed1c42b90f1f3b88
+MISC ChangeLog 2805 SHA256 1d8aec0b2da23c3251ca015e705d7d8e98c7313c4636d4591c8893be0761c56f SHA512 2d285603e9b4c4c76c8e59bd5165e60b2267fc6f0a97d1544094813a4089ec1822daa3b4f5306bbc9d91217a5dcad1563cce652f673ed063564cc81e00c25b44 WHIRLPOOL bbd83d060dbe6d31ddd6bc77a6ce8fc7a708fd7c33f1ba2aca98911b88ffbbfc618ad458b9aa5cf64f728e5c74e9a998fcc9255df2259071fbe75da382fd0ba4
+MISC ChangeLog-2015 6371 SHA256 30c19234c687f2f2ebacfaa0e772c2fc62b2b55c2e85fb5c84aa804f398c5041 SHA512 5b1e32f10ce2915316e3d705815b8f125bec0ed5c711dbc9aafbc959c348ad0385bbe32e20d316e81a1bdcc4189d0eab03f12c9d3ea783d096472dfd19c3a206 WHIRLPOOL 5f6f574bae6787dd464142a0749a5446c349cc73ac77d82d325f7e8e59f2740a894f002e0241420202d03fee55cfb8b2728b0ca9dc534568c080e8329bb6daa8
+MISC metadata.xml 441 SHA256 667174f53cba8c4e9259098631ec1a640e59787437f3f687a61863ac62afda9b SHA512 a96c70a0ae0f81baa23079cde78599b3f60c9a29f91bbae49ee81fdc7582b82d25d7419beb7883aa072d06c1173240baad4be45eb6921c0e30cc656c4a34f4de WHIRLPOOL 19abc1add6b3a98f667adf471ae595e3122dbe052cba9fca710f24def6fb455cd278bd4b9066b21e954306f446e1288cdf3fe8ea98f6ad698d029180aee171a1
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..a8450b9a1875
--- /dev/null
+++ b/app-text/html2text/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>jazzoslav@gmail.com</email>
+		<name>Jaroslav Rakhmatoullin</name>
+		<description>Proxied maintainer, assign bugs to him</description>
+	</maintainer>
+<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-text/html401/Manifest b/app-text/html401/Manifest
new file mode 100644
index 000000000000..9ed64abdc0e5
--- /dev/null
+++ b/app-text/html401/Manifest
@@ -0,0 +1,6 @@
+AUX html401-decl.diff 469 SHA256 3c770826dd4c0c664b3677ac7242e5110385cb1b5132963696d9199c810ce7b0 SHA512 066d1c3672e2b8fd86a696c511c4eab92c8772f147503a986f6c89d1c33720325d15c22157c81d7f121ee441328b89f73a194d5e7e40af4408b0f9b8e0cc65d2 WHIRLPOOL 5040ba10c1adab11b3401464cdf2021e9ff0c3d8e27384288b5bc4aff355fed67bec5c04be6686c2b3f93646f345a895c0d96fddae6fa136d5b7d9417a1f9057
+DIST html40.tgz 369830 SHA256 c5f9af793b0fa71eb94858f2cf659292779f4fba638a6cab7d23d5ea43541a1d SHA512 f7423b55f8a5ad2806555700f450e1f46ba4370d1e47f1332e18b01ecd5a41217fc4426ad29c852b6e17100dc4c0a7add9961df35e87660df0e087ad03e4918e WHIRLPOOL c8435e1ee2f3d9f3cb8dc861849b9910b9b3dc33808d7f2cc95d91cd80669758534f761bf028a848dd4a97fa56f3e6a73f9bc0a1fcd03743e65cb775d15fc231
+EBUILD html401-19991224-r2.ebuild 751 SHA256 87b4d58e64a0967fd814773e149cc2877f128b6f4ebbe5c2c6f0f49d6f7e318d SHA512 48f9954963d403399bcb63dc18fa24ea36b28fa0d79f3612e504a37139cc3efe4a6a1537d349a9d2c62bef9c5f7542cb6f7359728747e90649145b71d14a494d WHIRLPOOL e6d2b04b12d499700512f7c4dc0391ed12896bca1a2358ee9e4372d468f0a773b0b1ade17f38cdea4efa2eac992685e6316c9fdfde39b154d811047c97991f7a
+MISC ChangeLog 2560 SHA256 c194c65e500291ecff5e96f60bf27baf00527a41b5bf2e5c4a4dbb866024ca9d SHA512 3ea2c31e85a671e37c9ce22d92294ab4e57fbe779cf10302cd53787cf930fbda1c356111a320e7462f9ebd76b3935ac645338c9f2eed2e49aff11e5022d0ef32 WHIRLPOOL a97f9c5a05c589a408b5036d6f8d3b4e195e5d2c89ebfb37038c79979d286e1813395e7163304071993fbaba26cc89dbe4b2ec1f72a8a4832b7840b12ff76695
+MISC ChangeLog-2015 2700 SHA256 033198ae985d94ab58e997f9b81b707383f9ceb454ae929c0d9859fbf5e28ec9 SHA512 be1a626b6fe899bb4d1d16d9d12fff93d764c00d1a954002df9bdb139e2bd070148499dba18b2e6bc85a84ddf6eae8d33eecda24f896c5c7a1918e3980082e39 WHIRLPOOL b00bffaa069ecfbb0545d34ae6497372a89cd3664440972dc43d4686141b352e944f1267d14e2872e481360cf2df3813f171a0b04c4671842efa36f433e18d9c
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
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-r2.ebuild b/app-text/html401/html401-19991224-r2.ebuild
new file mode 100644
index 000000000000..807d1d6eaeef
--- /dev/null
+++ b/app-text/html401/html401-19991224-r2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=3
+
+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 /etc/sgml
+	dohtml -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/Manifest b/app-text/htmlc/Manifest
new file mode 100644
index 000000000000..280daaac3e0b
--- /dev/null
+++ b/app-text/htmlc/Manifest
@@ -0,0 +1,8 @@
+AUX werror.patch 791 SHA256 cf403d48245137bd903a34248808d1272733d16b00694b3f680fd97cfcc8f839 SHA512 fe62de854558ad673e8d88b42d6c71543e32f846afaca1e5062d365b18b4613216e0021ffb4b59e923c4aaba1db6c621c65744de2ac3c864e17e61384022b4bd WHIRLPOOL 9981135e72a00fae4b2f545c5601195b639fbcfc67b345726349943e026581fb3f6247bf804c6df38f3ce42690a8bb2aeeae1b5387ec49631b2503e7568181a6
+DIST htmlc-2.4.0.tgz 132584 SHA256 d4cf430f18ed543c448ac8765d1e4e363e72bdb2f6a639467eab62b886769594 SHA512 8de81041cea0c6d07188cb0d8cd553c1d20ea37d01a8d7425d23a10c7fd3d93dc1f7c1e3de473cb624720dc7588a3d891432d5945a23d1f253d2109cdafc15dc WHIRLPOOL c10d87c014d636d492d7dc422846078b6e03dae3831a743d5bdb4fd50f4462f5562563c1bcd9b96acce807199343accee1fb69e378679c6cd3cb8af55ce9ec77
+DIST htmlc-2.6.tgz 286727 SHA256 dbd3400f436bc5ee90161a796950583584bffd0a586ad320f56494546854b835 SHA512 fa268cf547d60babcbf1aee73f75d3516b08e83158dc0bee36f724abfe2f46ad4b571c09d9d14f97315c70f88d3ea29000fe2d838042242325adce201d60a8f4 WHIRLPOOL 57ee35b14e82a861cb184fd71105484874b7ff71e145d2ac55b1a0a958293c65a811549704938185547a34f7fed154a6d722b4130be3576366da8c92961c3b1d
+EBUILD htmlc-2.40.0.ebuild 877 SHA256 86fad25c1ec57380e677adaed5e6eadbdf16d042e8a96f16c2a7455427de4d7d SHA512 f97c54930c582ef4a1f9d969ac3d8bf2a5f1af368af8f90a2b4214468cfb51e3841c19eacd47b1e0fec1f666d7c21fb5c699261950715d26feeaac9bbc67c9f2 WHIRLPOOL 98c9f42655c17a827e5f7d6945a307516ee088e49f557b6b092c5d9ace8bf8bc8ffeaa38f68b4fc47be76aca30f15ccfec7adc0f1da208401bb9bf34ca7fd362
+EBUILD htmlc-2.60.0.ebuild 951 SHA256 dd0ab62e3d8204def115157594bd15a6929c5cdb74034414023447f82fd770b4 SHA512 180a18c3586dc3d7a0fa9ede3c1083c3d70c54454faeb24d8ad1f64746d3586cbbbb0cfbe4a7627f474edeeace6998c11cc0ae79fe15b50a2c31916969fe3a7b WHIRLPOOL b03185b416e33c63ab1e5f4e7809cdbb05dd55324d43e60548b56af3c5181a5e67e82e5ed38f926cda2ca4bfb3e3d65797c977e7ad795e8ec99f65044f45b3c6
+MISC ChangeLog 2494 SHA256 24cce862059f62e8ef9d7b47b447d499fc14ef013af431f199637143e2bdfebb SHA512 51e7f1da63e9287ae11e84f19329f694c426cbd5be7eb891c5c0f697f1ecbdbf4055e1fad4f7ca056eac572eb9982903868e16f1d7d56ddfe0d50c1ed82afdb8 WHIRLPOOL 060e698cba30c4c4efd55f419443e7091f6e917ebf5da00d9ac73ce77046dbb4a4bfabe5886a1dff966b6445ad7aba7908642f79925b87df068c3fef0e274160
+MISC ChangeLog-2015 1746 SHA256 2383c96b9718460a8532f472f4ab33250142176cd54309bad2f6241a378ac8ab SHA512 29aea00d108a7c433e28c5b3003612df7fc20274a61b384c012043e54ca839dfaf3f2e5228880f63ed29db351d9077e28c5c115ce2740a154dc3079b322ac5da WHIRLPOOL af9b3a1580e317ad78490c5c28456722e22be47a01b1a3574f6127199307b21c24950f8ac661b327c66ddc7a94597c8892d9d00137c09885ef7c7acaa8be2ac0
+MISC metadata.xml 247 SHA256 1e5906c3f850b776eb8532a92da9c868e9ed204a1fb40289cb778d9ee9eb972d SHA512 0f7ebd1264695f56fe6ab78e4e82c07866376f03ebfa12b22b60d0b2df819aa818832cb0d9eb2d77ab642a786b44cd127f579c348f0b2f57bc22e26b3b51c42b WHIRLPOOL 5a7860c9397b969860f00ae555207d30e89f0c9d87c1f191b443635088d0700bd3c78b163a6c862a521ab275ad735b4a2fa8e4f7553020a2ad993f6640259011
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/Manifest b/app-text/htmldoc/Manifest
new file mode 100644
index 000000000000..2677457bf3de
--- /dev/null
+++ b/app-text/htmldoc/Manifest
@@ -0,0 +1,5 @@
+DIST htmldoc-1.8.30-source.tar.gz 3901592 SHA256 7fb7a532f590f7ce1b7c8486d9fe30adaea3c7c32cb412ba7cf093d67cba5fc6 SHA512 713dc67622533dae896745ac8809e43a7f91696715aeb77df2628bd04c0d3e16c8402891499e8e0c10cab793b44114e600d5935b3c76a3cfa303c10897456804 WHIRLPOOL 873cc5785bc295197e8461214f02279b6225b9ea07345a86e855341abc5a827aeef0c715b4c77ed8a74028e2a5a61ae6b0412055c09cbe39a92be54764561d7f
+EBUILD htmldoc-1.8.30.ebuild 1113 SHA256 c68f7121427168b5537b4d5ac6f0d818078c125bf407361d26a5321c7adf748b SHA512 535e27ae7e6ac09315b0f3b0290b0963320e0335ed91fd82cac323dcf431a99a2146f97a2cbbdf187dbd5401b8833594a84d912ae9ff832534848bcb7d35c94f WHIRLPOOL 6c0489e850dfa6a5c487fae31afe8403219cd462e9b3e7c4639b9b0e30e23956be771c7967f099ee98fb2c1059e3f22365b0dc4199082ac4baa0c7509effed6a
+MISC ChangeLog 4768 SHA256 3f4238d29f9b143ed836fb5d9ab3ab36f66bd5e05409f16344e4046c8bd0c652 SHA512 67b9acb616b8e892728ec214201eb0d288e04478dcfae14cfea0634721b5bf3e9797ad4c15efa4cc351b8462566e7be8b7492be3baaaba26db20bd38c36ddbe5 WHIRLPOOL d5fd33cd82dfa1d7fe874909d151ed4db23d42c46acc520de83082478ef5c05f35b905b549cdffd75866aa32525bb51bc6a9a3da3f27ad53a955be9c791f1873
+MISC ChangeLog-2015 9292 SHA256 c065f10b06cb30fbf5f00ad537bf8a1fd6ae9214e508d19f365d7d532312e3dd SHA512 165a27675f333aa8b1b3440aa37e9abc8e2e95830809b91b901a143817c41ace8db53da941c0d8e8adc3899859dcd3b0662ea6a7b682e3953aa245ec500abbc7 WHIRLPOOL 0831951c5333dce91d8b24c93a170b50c853f2c201f3de330011fbd2f701a8ea1c879c25f3128883f7fd2f986ac727f79bb47d91a762e4ebd72f7f4700e637c0
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
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/Manifest b/app-text/htmlinc/Manifest
new file mode 100644
index 000000000000..d7cd8264834d
--- /dev/null
+++ b/app-text/htmlinc/Manifest
@@ -0,0 +1,7 @@
+AUX htmlinc-gcc3-gentoo.patch 3601 SHA256 38b629b2b064adc39b392fd1bb3bb7b90e3e90cb9f918574b866106c662a0c51 SHA512 f29d5c823fae27ef027002a8e075e105f028c8a4892d142c64d69af7bca52a63de4ca19aa0cf86acc67f772349472d2b04003c71257cf1b7464c9dee56d95afd WHIRLPOOL 21224247c0c97bdd7f359c7320f5d78c9b05ae8a55479e39955785d2e73570dbf3a4e2227b05d5b90644889b79290eb9c186a18b08367ca9f49911ab6d0df246
+DIST htmlinc.tar.gz 17042 SHA256 e3323552591d27ff8160e7c0e440193734637d4acaa53cf756cc9f04b4ae61a7 SHA512 2bdb7a5df4a8152d9a23f7b740995bd565e92998ef199cfb7d08b1f5e8ae4390c5179f78da71dfa4b7ce18a2a0bfe6002d465b0fa8d860a25afdec5eb4f3ee4c WHIRLPOOL 8aa66b48ebc0320cc45b813a4b99240d0aa60e62c43a5cf0fb56135fbcbcd33f3b7c29522face7974bc0ef2622e7d8bb2e0afdf1d7203c77365fcbacb39c777b
+EBUILD htmlinc-1.0_beta1-r2.ebuild 722 SHA256 61d1bd41ea4f08c05a0742974eec593aa782124dfb370ca5e1c5c031503d64a3 SHA512 f2514266fa029136b0ea9561033624aafd61a89ff51e9d512bb2046663495e2ee281d4390826f724184527c48e4a571a3a5c700c103b987f2a6f460edb68f60e WHIRLPOOL f8dbb894868c2f696552e35a638dbbc7b211b9689e3068e11a97ef4402c6c7311ddfdc95860b961132eb8cfcc4563c6655e3e5dfe355f95bdbeb156ca76177bd
+EBUILD htmlinc-1.0_beta1.ebuild 520 SHA256 520563171941dd4895d3b27c1f855e816d86e302c8b22ba91b80325dff413835 SHA512 f81b5c4e02041ee0f0e0ace6f30d8c49baefd95d0ef43c354b19f4182b271d31d94961091c5ccc4ea17abe28f6ed5352463ed0b00185b1f539693204f306fe8f WHIRLPOOL ca6dc15ed93f2f92510e2615d87eb0792e6ee3d993fbdec79b0e9caf35915adf4b9b779759443960b296456ad2227713eaa4aa8012a332ada1b6028e1d090296
+MISC ChangeLog 2632 SHA256 89f57e6ae2d8e97446ba09bdd1506a91116af84fc5f29b54b24ba212389df5cd SHA512 c17b35eacd9953d23237a3ce26a0d7e16ebd78f1cd8865a9884784a6d7b5a508a49f100acf44bfa92d7d446497abf45d6879d44cdfe1992527a9987c0a8f39ed WHIRLPOOL 43efaa4470cc8ac1b3db52d61d5e1c23a8b6975818626b5b7322b4aabf0ae0a7a2da58df938140ed1d380b95dc6c7f97c86e1dbe88313b44f1a8d7b346af99ec
+MISC ChangeLog-2015 2137 SHA256 b3a3d1a97951919c4b4435a6aea69df5bd663f01abefbcaddc203d109bee08bf SHA512 6d145fb64eab59c807f58d66b94112ad091f850b34e33da2f6be7e903be88c6f8c195b65dba47bae16a1fa005d85a68a6747ba56fbc8b7ab2525092bb8f85fbe WHIRLPOOL 658401a4a4974a532a48f2c5c59fa30296f4d6b5d91ca76be1e0af64c03b779c0d1243f168e544aa071c4cf9a5153db59d79637d41a6381a1d2672f0ed7379e8
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
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..62cc5f2aa95d
--- /dev/null
+++ b/app-text/htmlinc/htmlinc-1.0_beta1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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/Manifest b/app-text/htmlmin/Manifest
new file mode 100644
index 000000000000..bdda7c51cdc1
--- /dev/null
+++ b/app-text/htmlmin/Manifest
@@ -0,0 +1,3 @@
+DIST htmlmin-0.1.11_pre20170909.tar.gz 123229 SHA256 4b4ac0ef990a7f278d6f70d44b87b3512e1600df07dbc2bbef37b06e0ff6971c SHA512 85b29bca8f40680574fa21e2720a6b573ba69b94c239cdbcea80cdb1d0032bbf0d735f596f2a3beb3b3691b2366cdfd6051dd2499eaeb6b4b7618c7b59ebd7ec WHIRLPOOL 480e5a6bc3d3bfe6c4f1a81365aac25d5d0a9a106441fed65f298d4c527b567af323da603ca2998b5c7cf4a23f7915459ec2ace26fb5b809a073e38439a39ef3
+EBUILD htmlmin-0.1.11_pre20170909.ebuild 636 SHA256 aecd352e60ce01326510a03ff34c2cda6dd1d86caaa13c1b0dfd86482b50760f SHA512 78fbce18dc2bfe6d59cc61c90dc154095011652d4d87b81e8cd84832aca48c63a18f92fa1969bfc2893df546b4ba46528ad9ba9877b1a18a94ec8c03ce06d1b8 WHIRLPOOL 1a21e3213ce10c95ded61b0763629f25d4416440bcb24e4f95079fec4443316c2b1b30441bf73323d52c6727d57e743e7119cf6e06dcdb9e0b4a4a0014b0ad5b
+MISC metadata.xml 424 SHA256 a36bd77dc78f514b142b13c19d8825ae9c3973ed5eccba00c9813e023726de21 SHA512 53ae65ab7e6dd530f398c228e7ad38242a367efdd398a5bd321704e42f33b997c4fc5bfb942a90722b164ff29b35c1f6e3d3e15414241995bd371c3090c250e0 WHIRLPOOL 41e61a5d2a294a82a496307872ba86fe409457114331acd40ec337d63e6c5ba86f62f08a44b3d8726323982b4fe43b7c6a812f8675011784d2f7c83f3d58e285
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..89d79280a31f
--- /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/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/Manifest b/app-text/htmlrecode/Manifest
new file mode 100644
index 000000000000..58f2b8ee5a5a
--- /dev/null
+++ b/app-text/htmlrecode/Manifest
@@ -0,0 +1,6 @@
+AUX htmlrecode-1.3.1-ar.patch 187 SHA256 e1230fd0820972abbfce5420f1949a95addd463caded62dd156541b20102db42 SHA512 a49a858d317a8eaaf5ac5079763e04f043c5471519dd7f362ccb621ec43b13841c31a24436d255f5386982bd78ae6182ad7c5bf990e4c4164ec800ac616a9df8 WHIRLPOOL e7d72311f793c2a0a933a8169b96afef9fc17040285ae74bfb2e601a7b671bf0028ef6b5e70cc9703601a12c9a926d545529d3a34fc9ec1378aae0cb4bdc9a72
+DIST htmlrecode-1.3.1.tar.bz2 51387 SHA256 295c2b89d9357e1345e08cc7f33ff3d5843dec6acbffa604a11c17a1d58b61f0 SHA512 180b9c2a1214007bd3163d5df7bcf15c299f452b78f0383a01d85d48212d8ae32c2b5598f44c40ce54b332c26f3ee5c448c614fbae383ec9a326e44f69b0ad10 WHIRLPOOL 6b30e57899f4d17f0663094860be0d1d98b985881c67b73ea49394bdda0ceaf8749b0bdaa949c35bd0a661c676b4c63ba9426c1af13ea5c1ac9f61050b54f092
+EBUILD htmlrecode-1.3.1.ebuild 797 SHA256 c5324132776263a20d615f9aa45ab70dac597a0acbef427dc2d7b8c6021df5bf SHA512 3a837a54b2b4de230fe75cc156cdc94a1a316fb41db76285ee8de5508f3692d731c99baf721cd8476cb22102e4d1fdec33c3c91f9ffbd8cabb6e1158475a162f WHIRLPOOL 3c83e64c4f0221c444997f8729c78a35fa4eaef0a0fa05c1462e468081cf9a6a0414eb85322892bd97470dc55e3ed6c32d505b815d3ac4d5f12c5e4844b4abbc
+MISC ChangeLog 2565 SHA256 88b2e6d1db62a9cec34089ef3e741355bec7518d91a499673e0c4507cd63de67 SHA512 125954c0e2d7cf52f0383276c82514d0d85d14b82b7d352ab02bdf4c1abae375799b974bd00be15379f0ce02e0a61c49c3e6b144ff02b7973d1f70eb24dec300 WHIRLPOOL c6273b2fb451d24577d9f78be9d048e51ed49ebe9e8725c088443b45edec1ebb5a41bbd3cb5fa7346edebb0c9cee84429bcbaa7d9c985c1089a7fb46ec8e38ce
+MISC ChangeLog-2015 1872 SHA256 94dbf35d04f1ee2a0f0ac93467b1b2362358eb7a7955d8f894ab6617570beef6 SHA512 492e6f1bc94214496db0795fbc52cfdbccbd894cc763ec0df04625a7f2b2e33f523724884900f986453c602c19890f60a12d18aa011a07cd13ced90351cdcdde WHIRLPOOL e7150fe5f730f2aa646deebcffa1e374de54d407232e316f17b34aa3e81bf31ef8df80715c67feea7c80649d242d577f586fc25c38f20dbf16e020b585107c3b
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
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.ebuild b/app-text/htmlrecode/htmlrecode-1.3.1.ebuild
new file mode 100644
index 000000000000..62baa2ad62e0
--- /dev/null
+++ b/app-text/htmlrecode/htmlrecode-1.3.1.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="Recodes HTML file using a new character set"
+HOMEPAGE="http://bisqwit.iki.fi/source/htmlrecode.html"
+SRC_URI="http://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/Manifest b/app-text/htmltidy/Manifest
new file mode 100644
index 000000000000..f3d5a3e2fff3
--- /dev/null
+++ b/app-text/htmltidy/Manifest
@@ -0,0 +1,9 @@
+AUX 11CVE-2015-5522.patch 1387 SHA256 23676aaf6f619009965ad5b4440789ef9ae53715b8f5bab77a018b87ed39a7a1 SHA512 d543dcf963fca7eaf644033a6f0252ec16b628984e1acd86fdb6d4657f01a2b3010c4c5f41b48126ce91cd38b5902349289ae4e11376cdc827813aac84b83f2c WHIRLPOOL 9856d43aa8e50b7adcb05c22b18e422fcaf6330bf861b8dd05e97de752d14d4b4e8831b047c5356cafec7b38bffc1549ed8bfa468e35a6f98d5f2c364a8b71b4
+AUX htmltidy-20090325-tidyrc.patch 923 SHA256 2953cab71d0363b3c53798e8405cef560a2026a4f4a044a9b21def11ab682811 SHA512 2acef36a990196c4c995a4678988f5f4bc51b87c17a01843b1f7cefc4ff1062425d366b29ace0839ea8b6b64a8923c5f56ac4048106825b946059eae8951e326 WHIRLPOOL cebe5a7147dc5dc80f2265beabf143b0717135d6217fb98cb4e231667d2c499230a6535b587ebb2d256ab1659dfff8b1035388cfbc35c996acf380ef5f6b39a6
+AUX htmltidy-5.10.26-strip-O2-flag.patch 370 SHA256 6acd356327faa4043a0b4cf5f242a5249d32c136fc39594701aca67ad70f353b SHA512 671a0ef17388fb39d5623e0dd2b8aa6c55c22d9f3ba8eea093ddea1234a2786ef983cbe9dd7002fe04b2986ae888458f4f44120c47aa34dc145d34d9db2f81d7 WHIRLPOOL 5eba3729929b61d5f36bd5dbe7316f755722087d40d791d6699ccae24d57711e440a7de1db3299690d7103412cb0b8a590c75574ce2f79ed9abdf802a447dd1b
+DIST tidy-20090325-doc.tar.bz2 13319 SHA256 be018829d24d5477556f3b72a426335ca21f62ca103b50a5d17c0e16ffd97956 SHA512 0224d1f839f3829a9c879eba8a98ceee3b0c9f8bfe1721076859714428d534f492acd11e49992fccc2e45afd64d79067793c90f7af06d623ef89e7c16dfee35b WHIRLPOOL ff8a127b28f9a1b3b4d65a0955e2e5253fd208f4eb723d884d7c06390b75ba1c191556def64d5f39ff671b15d165c294ffa3c102f3d574ee65b14eafd6ea1554
+DIST tidy-20090325.tar.bz2 382016 SHA256 58099898f326eff209a97509d1879cee19812a8a7048e2143b39821d35d7b6bd SHA512 daeab2c3dd7f1248a5dbc1585267a8fdb0be09a940b79c3e53c97051f692cf85ea9f0a267f37e1c877054b77efb836d422a1e7ff61b22b383a2d2ac08939b970 WHIRLPOOL b9dcc9561acebe02812f717a8b2dae95c3360db08701e45164a68e4216641282f277e3434c1a2365f021fbc91e467f2c863e237753f5ed3d5f7a76e6e3217c61
+EBUILD htmltidy-20090325-r2.ebuild 2004 SHA256 0bc627a6f33b80cac96b42618255ddf7f4b0c27c3b4602598f0bd5d040e701a2 SHA512 1ed2082e5c4c4df5e13f4febc7d65de8a6b0b18580660fd0ee09ff45973f41cfd7f92a80ae0f6fa7ea544c9632e1cf3c89e3bcc398658b937c6f7d116c5c5c5e WHIRLPOOL 2e0c4a964b2e29c6064759b9d9d41ff206129ea7d5d246aa9dff2e93af03818b5efb12ffa2f9957e4258460d287e6b3dd7297a8cc0104a622ba4871d3b727ab8
+MISC ChangeLog 5430 SHA256 80b78db97b9003fdc8544fe101d0a43a83880c29f137452ab318eba0f0b29b29 SHA512 906ef037a865b7b2445c1aee91c9aa8afe8baa8915d02c7dcb49a2865b945e8457268ff98af321c2ce4ba4d0abe6dc3b418635a13044f897abaedc19745f2e83 WHIRLPOOL 34cfd2a1b2f0648ed3e01f77ede6c8f3659ce844554983576bc5698c2172fef4a4c027cb797988da1c5f71c30e97853f604c2e2a039bded7b127a94b16bf9811
+MISC ChangeLog-2015 8899 SHA256 73f32dd9c06b7887099daf1f97c33813a588b51d4c9cdb8a24f20cfa9a8e9a07 SHA512 a4efcd5edfe0385bddc407604a70e05bb7fd39eb82eb5a666ba2e466fba80cdbb937cb002776fbf8d62451b7aca4850bf6a3e38961a60a04696a27447752ba15 WHIRLPOOL 20d7256d1b3779c7c74ebdc81cf314a232a67503debdf73708038e7a72b2a125a5e58e8f171a321c81465adf515edd475b18fd51c699b61cfaa9c56cf387d2d1
+MISC metadata.xml 241 SHA256 2c5ca5ac1d346383778a871af2456baf8ae270465d255063855a7a5f9de1a697 SHA512 3f74e1d47cf7af59d7255fbb4e6f04fc372447cc101a524779ac59bdc4acba08d53756350575e377f2ccf0ebf309f499ec81fda9d7cd93d234e53dd06cf504ba WHIRLPOOL f5c4d96a16689a42a05d95f5c7016432cc5a244145bfaffa7768dee17b73a2e656f22ef40fce3f1da5a809ef776d0b9cdea200c6c23a9ebc7a6d8c26e24db3c7
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..660b01c8fe4d
--- /dev/null
+++ b/app-text/htmltidy/htmltidy-20090325-r2.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2017 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/Manifest b/app-text/htp/Manifest
new file mode 100644
index 000000000000..4ca33a5ef909
--- /dev/null
+++ b/app-text/htp/Manifest
@@ -0,0 +1,6 @@
+AUX strip.patch 261 SHA256 d38007bf4e0d835f25e99b0acea17538e241db170a703df59d3ee38350a01760 SHA512 2f2a9afb828e9de08fa97ca2798a0d2dc6f65cbf192cbc749c3790ed542f75c49c5fbb4644fb8017f93dc24a42c584914d5659841a211c1fe74a3aa43be633e4 WHIRLPOOL 14c54bdcd0feb197127fda6fce441d0d0c582cb5a4e21522eb384bb5c6ef744bc6567d95277491c60d1472df3c7635b292b4c80744c4494bc1a5537c3db54771
+DIST htp-1.16.tar.gz 141133 SHA256 905da83203be2d45d8bf0e454010ed73b78588dc65c0725b9ed712f01b7da8f2 SHA512 f33a9497fc3a1d0b95d8e3ee2747583d58626b565644e7c8cc054570458907aac9db42c6fa816b176b0e10db98ec7d1cedb521406035a8e7173e1abd991533a0 WHIRLPOOL 6b7d7da22fbd6768099fa333a897e4cf968becd565a41831f91fc033a74ac09ad0ada06c9fe1b26ca6bb742d61f61fe0c13c7a5da578f4db2b61fe66e37ceea8
+EBUILD htp-1.16-r1.ebuild 1254 SHA256 ee92b53bc2511cc476329eba1f738012dccddafe31d94529f73c9fe06ce62606 SHA512 0217b514defbe8cbf8bfee84c53287a3bd93b1841b4ae3c2bbd8927833174321c77e4b67c26d0587cfc0d855e76497af42cf04b179eb39a0cd2a218042a3b897 WHIRLPOOL bf9ae12cc1bcd78f1450d9f2b789ca6de5d167d741e5c856336dd5bd6a57114049adbf4a990f25369b73c658faafb070ac7c7dbc7c59d04dbe1f9b1223e7a354
+MISC ChangeLog 2439 SHA256 819ee271e935b5f86e1ab5f5d2a1b8df92af503df568295f699f4e2b788f4259 SHA512 350cc0c5061bcef59505205fda74fa605217747b301db385e07f97852058afbf2b05ce5bc039108959503528202b032aa47673a5f05df204f7887f8ba43dae86 WHIRLPOOL 2496089845071c2ea90f708cd34396ced15bf8ebf2c189247b94eb772c4424c10bc906811c3e05e1f67bc17a1334c4b67f742783736887694587fcf8da636604
+MISC ChangeLog-2015 1677 SHA256 5f14906ff8ca54c35ceb415a4ac7cccd75bf40b2f5c36093569d992b0bbfd73c SHA512 b7ed696acae3fefdd8cdd09025191096d994905f5e02888bdf13c02bc18da13c112e565ff98323368917aa9651583f2a3aa5a3ad19ec2acda5d0bf0a71f2f596 WHIRLPOOL 9c27eb82d66bb82e9e1d1082377c867b6ff0cf465c73c6c24d3c532a3365b50cdc76d803ef2c3756d43d9bb27de0967c4a6ee32ffffedff9f92e8a13c6ef9448
+MISC metadata.xml 323 SHA256 b67254295d941a7a222937357af09c925cb6a5b577a3be8ecaac6c5779eba255 SHA512 f5c0a7720bd23aa0c604e0ffa07e2925afe69f9af09c9364818e16197fdf55c1decac5839234cdb08e483be1bfb4d0a88279e57c2b48c0002d3de27e90616f26 WHIRLPOOL 22d08e9ded205287b796e1d9a4b14b2dd60ea5bb1ba2f4304f931b903dd068af37b696d4c2d81444f120fe93552c140289408ab086fd542f6dba2987fd80a62a
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/Manifest b/app-text/hunspell/Manifest
new file mode 100644
index 000000000000..52564282ede2
--- /dev/null
+++ b/app-text/hunspell/Manifest
@@ -0,0 +1,9 @@
+AUX hunspell-1.6.0-renameexes.patch 5005 SHA256 ce11943935aac39c5e038fabfff01d2f30450b73c3cb62005675f209cce66036 SHA512 a39225e25c76c6a6f3b92cc932efcc952c8559de2967d7a1c962b3f8a6ab39430fa82cf17ae51f15490f58297ecdfb9154c3ce7a8b058a717bfd1d694cf83245 WHIRLPOOL 7a0c08076bb3159a1ff7908e4cfe15224e856234beb9469d9a843a0d824b29d79588ccd74b95b9a57d6c79a370ab192aa10121b08615cc62ec0983d933c164b4
+AUX hunspell-1.6.2-renameexes.patch 5104 SHA256 e60e2bc287fd62329cd6b594f7bb8c121597ccc2c9d2741b83f888b80bd42138 SHA512 0d1871eda31b83851bf153746e0f4957599e889a536e9c0994d1cb988bc4a887788c1fafe4dccccaa94e68a69e6fa4ff1e201678fa8d1afdcb9608b83211b0ae WHIRLPOOL 506ec47e8f909f06cc76a06010f994f95739aff8c68acfb79eff7a1898e25e206694de0d3af2648297cd5214d2bb3f1d270156387443a057a205a004ff3e1b8f
+DIST hunspell-1.6.1.tar.gz 706893 SHA256 30f593733c50b794016bb03d31fd2a2071e4610c6fa4708e33edad2335102c49 SHA512 39b096ec1f5226f13eaf241647fc9b49a6dad04945ae0bcdc61ba845d66d67d64a72ba4287b6f376b5ad053b5d0e1d42a42415c30521c50693f0544718029458 WHIRLPOOL 3013fc1538d01650ffc233f53f000cab7c797be7c712d7609598f0c5807eacf5a13215bce7176da6578e5e78825525864f833db56dbe64362431d3680fbd6b00
+DIST hunspell-1.6.2.tar.gz 721165 SHA256 3cd9ceb062fe5814f668e4f22b2fa6e3ba0b339b921739541ce180cac4d6f4c4 SHA512 a23127f1271da95ac06a1fb2f57b659485e959567b61da05b2bb350684003a0fb7e882b5e524c465fd890f79f513ed03174f38611989a1c09081147c47d6da11 WHIRLPOOL 04b83cbe0bb83fce42fd61a4585ffa03619c4cb5e7cf49f1e432dee34150ef63dd45074cfe820b7efc8965d2be1c8aefaae1d43424161d31494fbb4a72afb173
+EBUILD hunspell-1.6.1-r1.ebuild 2371 SHA256 8085f16f83760aee42f9b522794e6fe8c4e008b9009ff83e188e43115de08301 SHA512 1c5c69d6ab227ba941593d00034581d3b6911f56c1b20618b3dc4b75fee0e8addc8fa3370489026bc63792888ddba9b06878f5d84bac5f0acfe2fcd8203bc205 WHIRLPOOL d4b2f014b297e1c6c3b39e091224a45f1805e78b14b6ce1c896227fbf7f72a7c5b32419916d020edac5bce92fc156a43b407bf9b51d207ea1815ce6a36239bcd
+EBUILD hunspell-1.6.2.ebuild 2421 SHA256 59018034c1fdf1cb923b4bb4f96c57a793e2a981e0a47b357832b4cbd41da513 SHA512 983e699ae46ef7c8f5ab6f9e50dd860827210b46f8ebded352d32f810e5da73ef94eb42dad774a829fb11916b3a881bb751a1a567ec82215866ee004b8a6b92e WHIRLPOOL 5ab2164579ad7ab9a6306f0af75758b4601295b5029fca414c2d2cc1303e401d0c99e7b814fa108fe45fad0dc59fa718178fb0fdf7d0338b95090cc7549dddf9
+MISC ChangeLog 4853 SHA256 003edf39cbe4f65a4597a79b7a650eea618edbddfdbe430fe54cf3cb233e136c SHA512 d58e74b6391adb1fc1d1aec45a3851fd37ac200cd916624efdc782113c731e58ff47bc42512db964bb83a35b1d813b84f76da2c112a3d5a326fa396e1a44faab WHIRLPOOL 4620d6129357acd916108b7e0722048896ef699ebe3f98c479793ef36ba67a6e81a69c7177f5fe2fa0494db70788e5ce9848cdcf47d4e1fb74763abc35b7654e
+MISC ChangeLog-2015 17639 SHA256 807a75b695c2a29687156474a5ab1fbba65e88323002a653d19cbd976df11704 SHA512 fbf4e844e9309a49167d6509e0bd5fab001e12f154634cd16f35dd3c5331eda4a141b765fedfd667ec2b36dab4b45262eaf49b04ef7f8ea1c449a582e47686cd WHIRLPOOL 670ad1cc77ffa869c6e933d20df4db450e91820886cc438174cb689202a9982fdf032e54db5238a70e3c94a793f692044c3b0f5105d9234398068df52615364b
+MISC metadata.xml 274 SHA256 21850966e37f3647f03b21fdb2c7fb8d99f1983032d53fffca99ff6f31760ee5 SHA512 09ac7c3282788aae9fe48dc86a3bec7d2a5b651b22d6ea06108f9ca5a86e96dddf9ab80433d0f16549649665d9a582d6c44217b73a000ee83995aad922f3caa8 WHIRLPOOL 152f36575908286dab8e4d18c77b389c9ea59b370ea1201b5e8c51c69ec5a17ce0d1e38f75595988536c0ceb4462c787f5f3a1e1ad86739aa98ef5b1f8be8690
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..8692a1368714
--- /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="http://hunspell.sourceforge.net/"
+
+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.ebuild b/app-text/hunspell/hunspell-1.6.2.ebuild
new file mode 100644
index 000000000000..43b312396878
--- /dev/null
+++ b/app-text/hunspell/hunspell-1.6.2.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit ltprune 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="http://hunspell.sourceforge.net/"
+
+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.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
+
+	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/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/Manifest b/app-text/hyperestraier/Manifest
new file mode 100644
index 000000000000..a3fa822100b4
--- /dev/null
+++ b/app-text/hyperestraier/Manifest
@@ -0,0 +1,8 @@
+AUX hyperestraier-configure.patch 11535 SHA256 ef1527875e707cdb9c9485dd0cb2b657b58c0f092dddf61a7112dd8aaba42d68 SHA512 79f7179c7bae4da8b2c728b29ad3e0abd16a4af1decbd36862fc1a58c3a000fa1d9726bcb230eaeb2ce2597cf39c35ab321856f2fb3dc0a0183257afe087a26f WHIRLPOOL 4fbbdbed643b0c333840e80127c3b849ac468981b495547da3e500b44714ffa0e2f3ba925452b9dc4100d4640c705acd540e64f286c2fc585d6414d3ed184b95
+AUX hyperestraier-perl.patch 844 SHA256 d7abdf4f9f795b236be6ec47d770de636868b314738c783278a1d4c1d09feffa SHA512 73c7bd659d80464baf1d28a0eed69c9fdb3052a62aa46dc0b56f2ba6f75d458531dc6023684bd92b22b7fc4b79869ccd82e835827096b163faee0f94b0615465 WHIRLPOOL c6c1d2cfa0cc24a9e22a46bbc569f16b08f34a8a60bcf5a0ee8f11c7a26fb4cf2a5c6ddbc854a8772986cac5b090d97d2ce87ebfd095c5fb59b76564dc80ffab
+AUX hyperestraier-ruby19.patch 5143 SHA256 632ae11a4b088bf425c768fe34e3aa0f9b0c38566001ff190051b8466de3de30 SHA512 fcae611f594eeb35b6aca6eb1139304538793afc6b794e8dee1a59243d5da216f364165c90e7cf7691ed9a7f38a610ba27f37c2eef2baa4042c4a993cbfefb2a WHIRLPOOL 8472e6672e70f6182d31a175a871d937e91ea43e89c0919ac5922226dccf4477dfd75449be2b707dae28dcab4617bed6cb623e4a12f4a4e3d704de3c6d4d22bc
+DIST hyperestraier-1.4.13.tar.gz 1014600 SHA256 92f3e76d12da79e116e4e68487ffdddfc2abe5f50f509247905414daa5c38fff SHA512 ec97f487bb0e085f74222106fc5fab227c8c02ee8d736c0b4adef57ec0e4310f829ac59fff5a1c92321786e89bbc2a059a0acff6ab0e5844b83627567bb265fc WHIRLPOOL 686b6de4334fc345c98239d981367247fa670eaa3dc7769d5cb71a694c278bef9ab03f7ef3260281eaa1ef4070b611c780374bb6d832c45908c86a9941a44b70
+EBUILD hyperestraier-1.4.13.ebuild 3545 SHA256 566f4fbef0e05ee7239f5d2057d943bc5b1c56dac7865d160955d9f8ab8fd12a SHA512 b6d977c697ff32183fe9eaec5df12d35f6f4f72198e8787d564de3700a03c79fb48d412c96c3b99ad733619e3c1d94a20fe90bbaede32ec0bf6cef50e4dbac93 WHIRLPOOL a10d4059cf67ab8c23d772dd729312a84c48c96ddfe0f43d5a30c5c4a460e27a2cb2b7b1336a44695f5fd3f769a0cfdf6c66c8ae96511aec29767d7650530e40
+MISC ChangeLog 2840 SHA256 20a194f7ed96af68c34691685f3b9cc907eef20708eaacce06d6a5f02fd142d2 SHA512 e8cae87674a80f23f3a0c6ca1d60db0cc3d6d87e340d0ef753707162bba2312392c810db7f6b2f5b3251d4511c05989c295e3d54b48b433da998e1acc485a18e WHIRLPOOL bfe9a08df387198009da5f4588263e230597fbdf4c96e31ac9f68654785624f8021c53a8e3f9b2f47fbd7f72b1ffaeb88dd0f66cd9a782701809fdf36ec82e89
+MISC ChangeLog-2015 8415 SHA256 a2fb095f2c4119ae367871f180cc940f74bdd4d7dff056dbf84e304eb5b64956 SHA512 6c77889216eaa995f95260428702af474db12efbf90db72160d8dcb5ac7af29cfad6795b1b245509350a7160501725c0d78f2c865d149ebd432ffa04c20c6584 WHIRLPOOL 2d7692cd19f84a46be2fa5e798359f20ce4f4e8bac339cffd543dd3fca84736d6c51c33b446cfdbf052ea2ebaba4fa85a433f9f580e48eb5e535d2c82bdaf6e7
+MISC metadata.xml 423 SHA256 2210cbe3aaab34f1fd66035daf2e09c1157841d4e6a2965513ad2f9d2b0034f6 SHA512 60323531c2e899eed9db9635ecc0cf11d1482738006e86bbcdfb74e931b1e0ce1cc7741619d3b473d504c35d4a73f4542e2e6904e75208a4beb818fcf7d06723 WHIRLPOOL aaa866d1ed1ef2fb3112ab96029bb098e7d51dde34b72c84d97810b667d354afbc09339845bcbe336f3a16d8e6542f77b93563aa10a65b363ce891bfb66f0015
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/Manifest b/app-text/info2html/Manifest
new file mode 100644
index 000000000000..412f83fbead7
--- /dev/null
+++ b/app-text/info2html/Manifest
@@ -0,0 +1,6 @@
+AUX info2html-2.0-xss.patch 2206 SHA256 a243877e41fdd7b5174b89a58e1f8d7d0afb5a2bfef4e7a6cc591e02287cf98f SHA512 9ffdd82d6cd0f53473fa8eedd5372c09b3a0a2f2b59bea229320fb77bf07d9f9a9f6892585250cd9fa5034213b2b08a346e739ae931c6a42bbdc73487348b947 WHIRLPOOL cf6224069af3a6b09eaef177b501c474d9b69d639e3364b8a7e7183f606c44c27e188be182cf34c198ddb1fb3b6110ec255198f75f0a3f75310962704f1b2351
+DIST info2html-2.0.tar 51200 SHA256 553f4d17e7edc13e5d27ae66e27b8702e1e83691adb3505a26e3af70276f84a5 SHA512 1b9ebc8bdd4101d24116fe22df9e5d3124300b2ac11585d8c7fff9652f7984983480442af9d9f86300f9684335d85b96f276a775c56c95e7fac85ebc46235e06 WHIRLPOOL b8212904cd11434479bdca42575818c73d5eef8d4e52fb8d980533ff27bdfb22db043352ba6a435c028aadd9ef8bffae440baebc8e296d7d8c555977ec89317a
+EBUILD info2html-2.0.ebuild 1928 SHA256 7ef0e99cd0c786e1aa2b39da287c27a23b6fb7d1a50ec49e2252d45d15984488 SHA512 4e8b599429cf76c26a909d0aa93072bc1033e4c6a8a454cca4aa6e2440668e55c7f762f486ffcb19a4d64375dbad0c5cc73157471a207623d502b0f08846ac10 WHIRLPOOL 61ba12a94f51bcfb4e165eed5077acb026b426fd2658220ecef624e13173170b983c333f87e461d2ddb06a8468a1196495d75c30eb6285520837600a7ccc3ec1
+MISC ChangeLog 2461 SHA256 ee4c8623581e6749189a01266ea07bc5b9f80820d52acdaee80f76330826cff8 SHA512 548ee8ac9e57f6ef341dabe2f7061bf81b99d340eed85f513799d1ee1265b8cfe3a578b876080aae233601d2867ea1c9735031f088f2c6ff2c30066f5c75f702 WHIRLPOOL 3050906486163682f22399af9f63c11dbc1ce42fbcf2a0328d08da916a634f7b58c39ed90ad3d2f9475d78eba914b10410f5c192a30c613b29f626864b3ea3bb
+MISC ChangeLog-2015 3402 SHA256 f1e881fe41071727656873d38d4bc72ce60db4f6d4c19f362cd36186c7900753 SHA512 c898ae835d8101ddbb165ab169e6ca899583ab1836249dad97efed974ee6a6984982724fddff762dc0c284961c7caed946117ab23285ec106e258ffa7567624c WHIRLPOOL f36ce72b3cfa7beb20da357d541713b9cbef485ee55e75e142114ca5f584964d610997d96fbcb1afabe9385b4eb64569828dea779640cbe9c3cd8f0f83cda3f0
+MISC metadata.xml 329 SHA256 e792e5d71d2f0eee2d2feec311c70a76d1734cedfb263f752b02e0a90707fe12 SHA512 18e0083cb85393d3d92abda8016dcdebe9f84fcd176557cb433b858ed9b6087ce7e5b53022d689e3861526d10440a9fe7fd6a1d86782a76d8f0756c3046bae23 WHIRLPOOL 0b580c549f5ea00338bf9905e07cab9853416e1dccabdcadbf2b5d835268ecd657d66de6440689c7feb36efad303f34e9ab69b1da8de576707c0fe8a8cc2d3d8
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..f106bc188e13
--- /dev/null
+++ b/app-text/info2html/info2html-2.0.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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/Manifest b/app-text/iso-codes/Manifest
new file mode 100644
index 000000000000..2d32f4859fa5
--- /dev/null
+++ b/app-text/iso-codes/Manifest
@@ -0,0 +1,7 @@
+DIST iso-codes-3.74.tar.xz 3455148 SHA256 21f4f3cea8fe09f5b53784522303a0e1e7d083964ecaf1c75b1441d4d9ec6aee SHA512 b4d583a6aee331c2cdf7cdd68a0ef5e7c3b291c4afa9a9a636e9fe2aef54e784cec070f5b8fafb31e8c84b278e1a9b08d7f925187882f7382378b66778e0d9cb WHIRLPOOL 0e83c3c7fcc3f21b1b5aacd003c65550dc896cb3bb4eff0fc8a5719870a7ce4ce3fe2da8ea6e3a5ab47512d3137a1b331c2880999534d82c34b5bbf1a91d3663
+DIST iso-codes-3.75.tar.xz 3461424 SHA256 7335e0301cd77cd4ee019bf5d3709aa79309d49dd66e85ba350caf67e00b00cd SHA512 157899048cec091864ad8a7723314e28a0ccc4a0e1a5c2101bb630baf1a034bf117e38263e3c95e0135ba9d3a4d76635c8201c50a54e25f6af24c87253b8b40e WHIRLPOOL 33488e9a89217b3e1b0f1bad93168f7acb6b8f4693dffa6b8c417cd1dbbeff47a1cd63b82dec3aa879a8f1df7205114f934815acd8117f14bfcbc865a89b49f7
+EBUILD iso-codes-3.74.ebuild 2414 SHA256 477c16df8e2e858e43f3269ef537167ce98b817bc758a68f0bb59956c4ec6e83 SHA512 0080d32cb19f1b72d007f1738997c22eac368a8182c2e07f6cffedcc006cdfdd97c8c6ab80ff8a48d5355831ba5e0fefbbaffd328fc660ab583b31ba9dfebfca WHIRLPOOL fa517735f1a26e06e19271c2380f9b2d80f6e941649bdbf70bb748ad0e6b020ec83f633aca47cdfd45b7a977fa182357371c4b090231cbae8390445387597c61
+EBUILD iso-codes-3.75.ebuild 2423 SHA256 9bb35d3a73ad145e20b49c837f831c522942df8609e1dafaf70eff69dcd23875 SHA512 f8dc62420ddbd98b03a8e03fe54dd13c364fefd48084a177e8f5c3982c5a74521da2993792421a94ede39d9a7f2727ed45bfcb54360d54a4c4bfc599e936a700 WHIRLPOOL ba293d6081f066b7339f5f82a8b974dc822f7f174426ee6a8e40a623180884633cf422648a05e97ef582b5dcf594a7373ff87b24db06bb2d80f18cd0c972b195
+MISC ChangeLog 10618 SHA256 cf85cb0082cdca7aa6e531d20a4a642fe36798d6f90a45e041cf21cf2a4ead2a SHA512 f2d0aec9ce607b3b4f863b57b0df4c8a2d07253935ef4d2fe22dc62de94a832babb281736af1b6f64bc1cf6718b1d2be35d4bdee5c80259a594ea23cf6f8ca34 WHIRLPOOL f8ef40ff6c88d2b234d43972d0800cfa4db8afd64d45378dabaf92068aeb6a8d57959c91539080af01e3d6a0bcd74d0fa461743670189aae0f3a3f5c9e58d1eb
+MISC ChangeLog-2015 22706 SHA256 9edc87953f7c1ac9d191f101f536eeff8bac9c4b620f9f685be3e23d83e9f801 SHA512 33830c04e0ff084024ec72a34a2b3a7f660c4255d925ff398237d5309cd1f98e0250f9425f0f86d1a98856de31142a53c7d8df78c8302cb94fc0da07aca4b420 WHIRLPOOL 9f5bf706267dcc232a62c4264300abd47cc35eba4eaee31761e8441c60e2eaf3cb4826785755251484417fab653929337f1b90988fed1bc4327da4166b733f7a
+MISC metadata.xml 480 SHA256 cf8e68a4ef990fd0c70ebbd363c30a2e2bba8485590d39a124fff1247c60fdb9 SHA512 5729ca31911ea7dad748e9f3afdd1f45f9034d783b56a75609101bfdb0a204bda8a078e7d251e89731091726062c4ac962e000ec7a898cb66ff787c8f2308d4c WHIRLPOOL da17e7f6a4e0d3d0d7342566c36b50938cfd1c82bf8ed1bcb902e976a2daf35741b7240f2b4bf8ab5885daf1b632232f322c5495788ded318df34657ab8193d8
diff --git a/app-text/iso-codes/iso-codes-3.74.ebuild b/app-text/iso-codes/iso-codes-3.74.ebuild
new file mode 100644
index 000000000000..7b19bfc4b0e9
--- /dev/null
+++ b/app-text/iso-codes/iso-codes-3.74.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2017 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 use "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.75.ebuild b/app-text/iso-codes/iso-codes-3.75.ebuild
new file mode 100644
index 000000000000..64c8a46ae42e
--- /dev/null
+++ b/app-text/iso-codes/iso-codes-3.75.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2017 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 use "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/Manifest b/app-text/itex2mml/Manifest
new file mode 100644
index 000000000000..f6098f371b6a
--- /dev/null
+++ b/app-text/itex2mml/Manifest
@@ -0,0 +1,7 @@
+DIST itexToMML-1.5.5.tar.gz 155205 SHA256 c25e5ca7b8739e12cdeeeb8a62ea1a2f29831cc9fd97f62ec13eecd2feb389eb SHA512 452436fe6f72d2c99c2bf3aec0d5d74d0bd754b6f54948428e45f50b037927a64ae3148386c387d3065d35392c3744ec6467d3e6fb8c25d46a3872d92d35ce2d WHIRLPOOL a016a5d890f13eb4fd272a4bec667cd1c4f0bd687523fbde116f2b21ad6a1ed19f719803214e1138e4409bfa0238a27eb4a57244414a6e5f52887975078f9f83
+DIST itexToMML-1.5.6.tar.gz 155394 SHA256 e042fd0aa6e0cab09b28f9332e9f22c5f2b9bc94100386d70c105e7cf3eddf70 SHA512 2f4ebcaccbef71ba1728909bdc60abf06606cfe267481835315fb1ecaa365641e45dfad370cffb758153379e721bde48e71ff660b0cba511f8d8db8a4aec0171 WHIRLPOOL e8d00d997a1daa9f6f48a18bb11cb420c145e7ccc5a842a42cef523eda3832d5ba50186aa8798faaed3e6c898c0c893af531aaaee293351ab3b1d6f376b8df46
+EBUILD itex2mml-1.5.5.ebuild 603 SHA256 a164c9df5ffd2eabb5e7f57bb2f505b381f335bb333cbd26ef8793aa8aef91f2 SHA512 d587a865ba033db2e5c7243a999c9795dfadf8c63e10e6a2b284753375f1efdfc5a7bc72e1985e76653c9b0899cca52173a3b3b9f565c8e44e6e58c0f51bd752 WHIRLPOOL c041ef3b57de1133152b91a4d074882f747fc8b0b77530ea2405a2f137439608cc31daadb338ef21652901fb838ca9cca98751e71015f8b3384ceb7b65825dea
+EBUILD itex2mml-1.5.6.ebuild 610 SHA256 ce24dc7f349a7901e2c128d988db5bb937bd06911701d919a3ce098b91f5d3a1 SHA512 c5e3768e40144a01604ab19152154955a75c7f6754822e0aecbd8361093c0905fafd22d6954574a0776e15a58a02ae2af6d402c962c6d6cd31d0c4b5da8cc26d WHIRLPOOL 6d78d76fabe571b587133726272c1b35bd2bb683117c302d4378ba68943f691d69c8930924e6aaf8df853551212b19f186aa67eff5a1d37d88b3ec7666d6448b
+MISC ChangeLog 3075 SHA256 27cc9733d61337554de0671d33cb7e53ae896688449035a162c159753cc4253e SHA512 3f83ce3279e63d6ab50aba0225c9a3f57d534c2a0de5381ec578a173405dcfdbf0ccf0be4585c7c094d025cafcb9f39f804251b00cf37902ca0ba52605e2830b WHIRLPOOL e4343d6e29c5b12489a06ec65840c41d795b1ccecc64df4fe39cb2003e540d44cd4712022ede61ed6eb893fc9b2e620e17a38f19b2b2c3ae19b13f0170d87cb2
+MISC ChangeLog-2015 525 SHA256 900fdc61d0c0102a3ed3f3f78702f480b3d93de638f858126882088a9d74b4fe SHA512 ba3b8bd894de78b8d76bc86317cb9d541b037f250e76c9d5d4a3ecb8955af1e700363fbcb0c19b2a559d3b9374c3d2e914db648db9a1773aa30e79b35e53fbec WHIRLPOOL ae80334dfd1aca00394a60866b6e33219c6129989fc6fc42cee09863840a27dca0700124ed79113dcc9a9b1afbc9d8cbb8584fed96a924b3a386037e210358f2
+MISC metadata.xml 168 SHA256 9f5073e4f4682efd1d4fda14feb67df188972340a55fa9e06ee82b66e24f8cc8 SHA512 00eec08786156434460f5ed77b647579546cf1a86341a4f2c9c9c84326468c2c21dc5101c4277103b19266bb6f788823f4ddf3b9d044da26326d79bf2ac9a274 WHIRLPOOL 3ec0b2fcfb36e82c8f9dd8877875a38095bc9b11aff96d69a7919ee610efe27f65318c974161f6ba135150ad361a8c108938841c3d48c42f5a92d1762858d898
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..3ad8b505268d
--- /dev/null
+++ b/app-text/itex2mml/itex2mml-1.5.5.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 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="http://golem.ph.utexas.edu/~distler/blog/itex2MML.html"
+SRC_URI="http://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..d3d28f105538
--- /dev/null
+++ b/app-text/itex2mml/itex2mml-1.5.6.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 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="http://golem.ph.utexas.edu/~distler/blog/itex2MML.html"
+SRC_URI="http://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-bin/Manifest b/app-text/jabref-bin/Manifest
new file mode 100644
index 000000000000..47c07c999f13
--- /dev/null
+++ b/app-text/jabref-bin/Manifest
@@ -0,0 +1,29 @@
+DIST JabRef-2.10.jar 15223054 SHA256 bb8f001043079bd12f7f8867d725723fca33b03889af864a100d0cf5c4364ce4 SHA512 833ec41bf8d5a76892ec82f0726c5dcf6382de8b05a949b1d697dbdbb79ba727557069f3267827a7febe6ec4ead996c8de273479b8e3d0363467ec6b91e6bd3a WHIRLPOOL a8026762ae934e680f24698e5c658c03a8f6e1c0ec6d48a0ee4b3eaee9ceb93b1831777009627c02f0377333b7f96b34da4e8e36481a859a63bd3d799f5cb03e
+DIST JabRef-2.11.1.jar 20375475 SHA256 7c6174826390bb5842eae52b6e7aa4f31eee8ebeab2019ebdf26414f986732fd SHA512 515b97f0bdc2a3067260912a3f1fd7b866f420b13e04f66dac99e05b0a9682fead5edf964e7a697f7fdedead7b56011f6822f9610e8533c715486d7fd7b9abb1 WHIRLPOOL 9774b937e4caf7a94e629adfd2e3a66f8b786af8f7e56f4837dda94e9bab7bfb276ecf0023f684f9bf45d5438b80344847c983bf448740d3b22b5712187786fc
+DIST JabRef-2.11.jar 20374561 SHA256 2e8b6f01e4b783049817ad0cc83fc05de57574cd2196a98d81862ec5ccbd5a38 SHA512 e16703d9a849c56f1203d3d55bd93e9da867f8778fedb09d3783a806f3c24937ba16a06e10c81628571a2f7c1c4e31c31ca2f6a319b77ca00b617b7e3f2a819a WHIRLPOOL 17385b7f3fae303025c08fd1c98ad695a4f636020ff5f1a5e5ab9c7e9bc10c84e3da4b2da9d2c2856374e346b030c065f5521761bc63a995d54b049a64f50357
+DIST JabRef-3.1.jar 20307649 SHA256 81adaa1b672535e7b64814b6ad8f6a00e8bcf0a82b0849ba4523e36cd440425d SHA512 aab648f19feecf64a9afe3e69092736c0c2c177ee3a6c0dc3a9a9a8cea6d5a0d24201abed7048e4b569b0f1bb4736c1ad75df056243293e7b82795f50eb16476 WHIRLPOOL 437744b7236249e342ccaba9b08164727017b4136246c04a73c824c0df91e9b9f6d0814294f110ab935fb60bcd60d70f921774dfced0375ea19afafe60451c22
+DIST JabRef-3.2.jar 20246639 SHA256 5f3d18052019dd10475de6e8e1d3c900300cd7195d6e1e6262fab104d06abadb SHA512 db7c2cde0e1d858d14b80f7820a729cac97c74a442e65b18d7c8a7366dbc719bef14e652cf44f04256efffd9d42136e2c865347b3975a0450ec13ef4b3cf71c9 WHIRLPOOL 6cf53e25ce220750145282567cf4dbd11f6fcb7e90ae18d3cfafc3f2a001c3933ddcae6bfe33dcd9ee495719a795fdf2b313e872aab788176d038b2984888b39
+DIST JabRef-3.3.jar 24456650 SHA256 4c81e72a8585c800a3d5728f15ed2db425a48e14f08962d393e875721a32baa6 SHA512 9d5ed2ff35bccc3d45181be6a013b6c10f1859e63d98b4f5ab2d325a69abf107ea546b78609c9ca620bbf939857029be5d32b92a8eb25be6c526b6e15f41d24f WHIRLPOOL 71fd2fe538299bef3692adbf188277a946c2b0f7b41b5c0fdf9bc20ba8a68f34ce9190109deab0a4f804f6b2e329b33731a9df281544c18dd01758a254bb4178
+DIST JabRef-3.4.jar 24390719 SHA256 0dbe96ea837ce35a624ddad65458916dee2245b12985b8612ae18b42429735de SHA512 310993160888f31d0ad644b562a7f643abfca18c7c3479a7f24db5620ebbdc04f8285bbaa47f46964aab5b61308f337a334b05200214a1084e0def0c0d32f490 WHIRLPOOL bfaab04c205306d519af71e455228d810065047ef16913e3b309c79274fe084d7aa88f865774d511dbf7d6bfee9bde536817a29bb15743876b6b777df86fd888
+DIST JabRef-3.6.jar 25421252 SHA256 85792b7c7200b7a371e5fbcb4f996d63a0ab1963d3bc976f1b8670e7788f0e90 SHA512 756f02fe76b9d04c6a6db149d8f9c6a3365be0922e2bd2af9fba0dd7bc88bbda7ce7843e862e295fc58c1d8c0c95c0d5dee88f024ce51405f09159c308880237 WHIRLPOOL 31dd53db79d850a2892d6092064765026f856dbc4035e8461e6a0950acb6ec79d471165c38cbe93a9c1692403585b000becacafaa74c5aa3021b15ed2bca3d5f
+DIST JabRef-3.7.jar 36702576 SHA256 1475552e2956b7a94cbab7b6c8671fc391be0d42cfa1ece3aed75dd0a8c1ecf3 SHA512 74ed9fcfa3e6e4a3facf588d8fa2d73374137d9796ba79aa9c97df6807348af5f5ca9b8670e8909d06847f8501c9a344e300172be444be9b2bd773cd4d6314c4 WHIRLPOOL e482b83bdb7209a802868309cd27dc55f4e645b60a32b27f41cca05d4fb823e65ace0012fe80e9cb706337e8b867a28964680c683892d2508160c021890e9f97
+DIST JabRef-3.8.1.jar 36739725 SHA256 8fa5f317a8be62c714dff6d88e3aa3fea5c3b6b1e59f20a221b87d72aa775a85 SHA512 9241fb586da7bc6047dc6eb6e5b31800003bf31d6262033b54629e0c81856b56234a5c671ce7ab87d3b7332a70551c81c2275354e97607ad9f513686c5826780 WHIRLPOOL 90e692b9559b123c4a36694e3e1216ea207650c6073bed57ac9a7d45b27a53f409970a87c818b5129b7a53c7d936cc24570a8762fdec4bf31bf8c37e06567ea1
+DIST JabRef-3.8.2.jar 37003442 SHA256 f7226e9eb64f96ef2d179c4b1f9e9bcd7a630d247f2feb0ecaa243408379720a SHA512 84546987ffdef106643b3aba3216041809ac42464ff37fb63dbe806e282c19c25139d8532b695a4f5ca8ad638eb23860b32bd3806e82409e2d38425d5a42e830 WHIRLPOOL f7f5e501929d99304af4ec22edfea155076fa1d5ba21caabaeabe60556df7935a595181d8200f201c5c6e001fbfdf46565203b4b78b622edc31396ff9a241e23
+DIST JabRef-3.8.jar 36714920 SHA256 13bcfd10ab3d2dbe21dfad06ecf4dbf1cd08e4e1fe6a6a93293d844b4c5c3a98 SHA512 15805d06c7a566b60c28035e0f9a1d525b68774395a618e43ed7fdcc053d21e61f5930c658155d2e4ff739821789f2f988ce6e9a5502bd5536ce0a672ee19854 WHIRLPOOL 289997ea41ea77f774034a32b08bb07739b8dc86e69892c611b38d7728d87936a0738d0fde1ccb7bac49b0960659c057093aff4ddb08583a8f788b19d5b2e0e6
+DIST JabRef-4.0.jar 56583311 SHA256 5555fd7691600a47e6ced54873738b4bd04dc2ad7f749c66887d343d2ff1dc06 SHA512 a3e27ae895c77c6d9e6a9bd2312c7b590fe7d9c45a5d42ecc5ebb75a7be9bce27bcfb7d17e06409c05e7fe490b3ff0e6776c3f12b205acb5e95bceeef6823af2 WHIRLPOOL 4ae24530fa8dcaf34ca2c2efb390db0681745512ab9d1fdcc13186d6a40e472cc2023f3cc521c227e4b32bb54e2050b46d9cfb5a6a66582f4296696b1cf90db7
+EBUILD jabref-bin-2.10.ebuild 603 SHA256 8497a8fa9695a23d1618c54ea2dde819c1b6dcf3fefc4e72d93cfe3df076a867 SHA512 2544d2c4e19e3131512a29312737c73f3ffe8eca139f6d4b951e420213d96ae78e94ef2ad7ad57f3289ddfbcfca7b8ef6ac73d6e02f5be248b5a0585f2013a8c WHIRLPOOL f34465b863757ae2bf90a86baadb006e0e8b281ad13d40f10fbe24728fd87e5ba76def31d4fd61b5e509666019b4c379be3e3c6d6218e86aab802ae7f85b074b
+EBUILD jabref-bin-2.11.1.ebuild 828 SHA256 2a6abb395a3ea8fd7675d67eb3afb39e4aadc63a6e30d1b4a457e631525bd017 SHA512 6f5c3e9723a731eac11fe529f7444ad32b4f491af7d951e6c86cb7244db6fbd394c1af3e491e339fe10fbeded05ce32efef287f850423f67b0131d7576406295 WHIRLPOOL b47c5649cd3068f812c81053e4ca167581b7886a9ceb19c254e4b87de43aab15ad9c09da6ba59b2ffdba7e9fd6bfba95ece5d7ac9bbf305d8f54c8b96742bab5
+EBUILD jabref-bin-2.11.ebuild 828 SHA256 2a6abb395a3ea8fd7675d67eb3afb39e4aadc63a6e30d1b4a457e631525bd017 SHA512 6f5c3e9723a731eac11fe529f7444ad32b4f491af7d951e6c86cb7244db6fbd394c1af3e491e339fe10fbeded05ce32efef287f850423f67b0131d7576406295 WHIRLPOOL b47c5649cd3068f812c81053e4ca167581b7886a9ceb19c254e4b87de43aab15ad9c09da6ba59b2ffdba7e9fd6bfba95ece5d7ac9bbf305d8f54c8b96742bab5
+EBUILD jabref-bin-3.1.ebuild 870 SHA256 780ab26197fa14c0c4873e27ccb92a6de39cbaed0cb6755538913ff713908f0e SHA512 539c8eb3d01e3de6fefbdc506750cfc3f79d6f8900734a72905d867eed7d0d015d31c5e0929f330a83a55756119eeafb01a904dad277c25a713c2f1202036a3a WHIRLPOOL 629755cdd60deb28c2c65747f07eaa2aec46399df7b215420d6e8228347f559eadca44e15cf400a1055d2f3bf246754a666eec16969dd5e94fa93853f0d4fb01
+EBUILD jabref-bin-3.2.ebuild 860 SHA256 00f2dad2e76dbd381872d63e1dc748cbf8b6872d770236ead556e3100d849124 SHA512 25cfc1213aee19d39a7e3fe904157ddf47ae9a354a6b001bd5c46f0455260196f9efa91425b25202ca3866caee509c5aa9d6f558822c66d5a535d904bff39f63 WHIRLPOOL 65dac554d693ae764aadfc1dd32823792fc46000db3af1f4b33fc86f561e97369858af37177e4661017d45b33c6cba3b910b4ec44f3e94e5f94e4cef937d103c
+EBUILD jabref-bin-3.3.ebuild 862 SHA256 259f3e33783feba7f6cb9358aeda1cf25771f15ed81dd73b420aa579744c5c88 SHA512 fbe6ac430bc156d163f9e8cfb4338121ad6e68b6ecdf66312927a92e60179d50cc55961ddfb83f87209937957703bd83861b761e916a863385a1c4e43c23a5e4 WHIRLPOOL c3e6223246ba6d5cca1fad6b12d9a2d7eacb035916f13f7939353febb590e1b81720c1015d291e271ed21b39cf8d47d6d8ca4d8fcc2f261264addfc0b358d219
+EBUILD jabref-bin-3.4.ebuild 864 SHA256 c13cdaeae2e6a8cde67ddfae08632e12653a161e6a6225abb1707f505c21024e SHA512 c46c42698f69a57e1906fa6a20b923c41e71b2a85d621d71fb108d395a1936a8293dc0d33aa8091d281e86c1b2f84bf19a9bd2743a9c8844b4c99eecb86789fb WHIRLPOOL f73f1e60669ac412e252f1b3864b338ab88d8a87afe15f48686bc6303af564b55c66ce74c889df2d47491e909e722b2e2aab59259fcf695a1d4ddad698458a67
+EBUILD jabref-bin-3.6.ebuild 866 SHA256 78c6ab60045fcd3716738091681b3206a76f0651414ea47ce95e850b009567a4 SHA512 cfa723738a369055005f5f29bd96b1148cece86feea5cb0e543a2d1e879dad5be9f9e3ed99029dd2bbf6568ac699546dd49371671e1ebc24b7c53255f207a945 WHIRLPOOL ac407fce79dfc0f61648cc31c3aa000294dd68030c6cec4dcea5ad0ddd45ed705c0f55adec844ac42802243054bd22462972bb789aa326f74e1918d499b1e819
+EBUILD jabref-bin-3.7.ebuild 864 SHA256 0c8bb85eb692aab866229f838ba3d79a6f77b85aa07f493eec728ed6914ff65e SHA512 de433c0159c235682089415e190723c35cf43d103f3057751dee50f294841cc5b274d0f06de63ea875bd2ff84c4765d3fd93a0b170df09822bc785a95e928561 WHIRLPOOL 9e5984e33bb7e4be27fd182e628df2084d8c9f20fcec566deff48ed52baa6f46e75b1712619b7ef257d0561e33b7bfab606a20430cf23f1e8034d394090a5f7c
+EBUILD jabref-bin-3.8.1.ebuild 951 SHA256 ef3e46804615b165fbc911ec3ca1cdd88adb97787f033e4ca246e55f038dff48 SHA512 6694b2a83bcb8830c754b5fe79284dd4936070b2ce0ae65426482fe869390d8534212b6824c39a3be1bc5755d7bc458959185e9ca483f7d2444ec0bd30b8dcdf WHIRLPOOL 439fce1e6bdc24602642679ad92b38bcc136144e1da9a34061c5d5fcaa923daf4c74eca58da1386c32e079625fcfad8e7e9777762acfa98865701bf76a5ca3dc
+EBUILD jabref-bin-3.8.2.ebuild 949 SHA256 7a6ab8c10f1cd6d06cb9f1a053d8b6abe69bae328641a53279c19da16bec4bc5 SHA512 a45a9fd77aaf59d172f2e12d49f720af8f5d6de9f53756941612d614ab1391767a79731a5fb0321d724330c483280df9883b76c64ca21635909434ca11e57ff7 WHIRLPOOL f91affa8bbf306f734b99a12abb136ef9663f68b37d1f3f29ee395b1f4bfb7dd2bf7215c006a388acbcaafa3b459b4aea719fd202cdd27064f4b759ff0cdec02
+EBUILD jabref-bin-3.8.ebuild 956 SHA256 430e2a4bc90f99001d78dd7eb21128455cac12ef5b71c688648016b1ce5ba272 SHA512 fc4c01169ba38ac8beaece6f2240791eec8c361b0a72bdca2fa26262115ef8d7e5c64b69d8398c21c7ee6d41597c837da6fb1aa3aedeff18f216228bab96de1e WHIRLPOOL 8e2aec29ea93e8385ba19f04742a2cab9017091207a1e10348c8128b3d8e619ea463119417759aa056771e6ca406dbe5237777e358afc0b8c8ffd78ed6731ef5
+EBUILD jabref-bin-4.0.ebuild 956 SHA256 c139358f7724efeab9bd90f6a79c796a142146fd9a7a379ed19973a086d588f0 SHA512 d80f47fabe97fcd54dab91e84d788549c7c40d1fbc3c410f886e719539e6ebbd997b47a96c1ca89f770844c147639a026d8f8b191ca65886facca8d08f221d76 WHIRLPOOL da96d23405a2958e295106b84f2e5a26cfdd06a0d90305f304b68e41182213303f6704f6efb28e06d927557a2eff8e604696586162b88f562db25ea8d19b92e6
+MISC ChangeLog 6179 SHA256 2ded29d71e74422e71644639b0552a2ad2b16e5f865b917bfbcb3e39f6e4b56a SHA512 0e72d7494e5cc56699ec4dc63b3ee40c4c2aa4fd0351828b99fe1b3003e0e8326c92313154863918c38f48b02b9abfab12cb659cadacdb0bd86b380501ede9f5 WHIRLPOOL 2ab3b0307abc8e378644dfedf72c5314b9a46ef05b30460459acff798c50903dc402ae62f1307298ded3fc2d54d858014a36183cb4af5466b6a241312af000b4
+MISC ChangeLog-2015 1106 SHA256 ee587b34ef9ffa585089c57bbd8dfb4c51b50dffb590d4982a1a126ec04cfb5d SHA512 2855bd32273bdc948e20052168b52da82376a47c077a49fd6f7733e747660f690019b6b74a191c4eb5f7d77997ef66a38f8b38ee2095024c23cb5498f4c2b412 WHIRLPOOL f16c439fce25a059db2d30f4e88b70b224b5cb0faef0b35b161a54dd07dd4ce95e3b0576c54cf0258e7af85e24da791b553d8243c9bbc6924679a8e003ee7d78
+MISC metadata.xml 911 SHA256 3e1c02120f04c3bb62cf5d1f6e668ffe60db3317f683b8df3e03dd78b798985d SHA512 7a3e7ab167709c28857aed83ffd4e3ec5b202b9d444b4fc7a07c33d2415316e4aa8f22b80cc2bd281a1625e02503bbb5b517c01efe6a70558b2b9815b3b7f2b3 WHIRLPOOL fdd0992350101881fb1a82cf50d2e5ef616eb0c4f9ceeeaf623e55d66b97d5ad4499650dda10b4337e9bc8f705d730b5a2ae9e921f43820453f4dddaa56b9d8a
diff --git a/app-text/jabref-bin/jabref-bin-2.10.ebuild b/app-text/jabref-bin/jabref-bin-2.10.ebuild
new file mode 100644
index 000000000000..0820eb6e6bc6
--- /dev/null
+++ b/app-text/jabref-bin/jabref-bin-2.10.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils java-pkg-2
+
+MY_PV_1="${PV/_beta/b}"
+MY_PV="${MY_PV_1/_rc/}"
+
+DESCRIPTION="Java GUI for managing BibTeX and other bibliographies"
+HOMEPAGE="http://jabref.sourceforge.net/"
+SRC_URI="mirror://sourceforge/jabref/JabRef-${MY_PV}.jar"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+RDEPEND=">=virtual/jre-1.6"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	cp -v "${DISTDIR}/${A}" . || die
+}
+
+src_install() {
+	java-pkg_newjar JabRef-${MY_PV}.jar
+	java-pkg_dolauncher ${PN} --jar ${PN}.jar
+}
diff --git a/app-text/jabref-bin/jabref-bin-2.11.1.ebuild b/app-text/jabref-bin/jabref-bin-2.11.1.ebuild
new file mode 100644
index 000000000000..c55d7e11f04d
--- /dev/null
+++ b/app-text/jabref-bin/jabref-bin-2.11.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+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://jabref.sourceforge.net/"
+SRC_URI="mirror://sourceforge/jabref/JabRef-${MY_PV}.jar"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND=">=virtual/jre-1.6"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	cp -v "${DISTDIR}/${A}" . || die
+	jar xf  ${A} images/JabRef-icon-48.png || die
+}
+
+src_install() {
+	java-pkg_newjar "JabRef-${MY_PV}.jar"
+	java-pkg_dolauncher "${PN}" --jar "${PN}.jar"
+	newicon images/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-2.11.ebuild b/app-text/jabref-bin/jabref-bin-2.11.ebuild
new file mode 100644
index 000000000000..c55d7e11f04d
--- /dev/null
+++ b/app-text/jabref-bin/jabref-bin-2.11.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+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://jabref.sourceforge.net/"
+SRC_URI="mirror://sourceforge/jabref/JabRef-${MY_PV}.jar"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND=">=virtual/jre-1.6"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	cp -v "${DISTDIR}/${A}" . || die
+	jar xf  ${A} images/JabRef-icon-48.png || die
+}
+
+src_install() {
+	java-pkg_newjar "JabRef-${MY_PV}.jar"
+	java-pkg_dolauncher "${PN}" --jar "${PN}.jar"
+	newicon images/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.1.ebuild b/app-text/jabref-bin/jabref-bin-3.1.ebuild
new file mode 100644
index 000000000000..3703a092e2ab
--- /dev/null
+++ b/app-text/jabref-bin/jabref-bin-3.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+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://jabref.sourceforge.net/"
+SRC_URI="mirror://sourceforge/jabref/JabRef-${MY_PV}.jar"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="|| ( >=virtual/jre-1.8 >=virtual/jdk-1.8 )"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	cp -v "${DISTDIR}/${A}" . || die
+	jar xf  ${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.2.ebuild b/app-text/jabref-bin/jabref-bin-3.2.ebuild
new file mode 100644
index 000000000000..79a8e5e6a71a
--- /dev/null
+++ b/app-text/jabref-bin/jabref-bin-3.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+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"
+
+RDEPEND="|| ( >=virtual/jre-1.8 >=virtual/jdk-1.8 )"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	cp -v "${DISTDIR}/${A}" . || die
+	jar xf  ${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.3.ebuild b/app-text/jabref-bin/jabref-bin-3.3.ebuild
new file mode 100644
index 000000000000..3b4bd83b98ca
--- /dev/null
+++ b/app-text/jabref-bin/jabref-bin-3.3.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+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"
+
+RDEPEND="|| ( >=virtual/jre-1.8 >=virtual/jdk-1.8 )"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	cp -v "${DISTDIR}/${A}" . || die
+	jar xf  ${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.4.ebuild b/app-text/jabref-bin/jabref-bin-3.4.ebuild
new file mode 100644
index 000000000000..2fc1f51a3d03
--- /dev/null
+++ b/app-text/jabref-bin/jabref-bin-3.4.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+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.6.ebuild b/app-text/jabref-bin/jabref-bin-3.6.ebuild
new file mode 100644
index 000000000000..59fb615fdd29
--- /dev/null
+++ b/app-text/jabref-bin/jabref-bin-3.6.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+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.7.ebuild b/app-text/jabref-bin/jabref-bin-3.7.ebuild
new file mode 100644
index 000000000000..305d64f7834c
--- /dev/null
+++ b/app-text/jabref-bin/jabref-bin-3.7.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2016 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..73c9a8ac3519
--- /dev/null
+++ b/app-text/jabref-bin/jabref-bin-3.8.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2016 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..cefa6107ab82
--- /dev/null
+++ b/app-text/jabref-bin/jabref-bin-3.8.2.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 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..7168c09aeec3
--- /dev/null
+++ b/app-text/jabref-bin/jabref-bin-3.8.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2016 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..5f6f30990ea9
--- /dev/null
+++ b/app-text/jabref-bin/jabref-bin-4.0.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 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/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
+}
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..9cd66fe776fb
--- /dev/null
+++ b/app-text/jabref/Manifest
@@ -0,0 +1,6 @@
+DIST JabRef-2.10-src.tar.bz2 16769469 SHA256 09b57afcfeb1730b58a887dc28f0f4c803e9c00fade1f57245ab70e2a98ce6ad SHA512 72eee8fb08040fc7bfd395729d3c74f0a8841c90d5aa6e6e8d8e68ddcc1ffe1f6659a045aa951d51deffe266ee0b1ff844c4fdf36537d5463de6b361803bb942 WHIRLPOOL db0edafb63a6c37b001b071693278c2c0054ab20ae0744147fe8b1a828f1e575b7751d5aabca05a640fc7c099ce9402df835c6e81a0c3b21b7aa700110c426de
+EBUILD jabref-2.10-r2.ebuild 1818 SHA256 5e84c3768519f899a892815ea1c3d7b9a09849910cbaaea48e5a5860b72f4567 SHA512 4c685bce3c6d9cf4dae811548d7f230647049c728669bbb5816ddf1de43c226efe1002d7e2d42cce7008a4aaaf920e5136913b1f0072d49953f808ce44e2e050 WHIRLPOOL 0edf6266782b005f6558ae8c2c606ed0cb6f78305d8eb37043ec97504d0dcc4ce8b935cca446a7382cbec9a4fb5f3e247d7242507eb6903e9e75879e6505dd11
+EBUILD jabref-2.10-r4.ebuild 1844 SHA256 47bf001ed72f9b77f712959dec2e284041708c9bdf9713bf13c8ba7a33e31281 SHA512 e246388881e6e8b1d3290ae7bbeedad21b0af60ee4647df53b953f2b390f6cb255e66b2ef9e5f8b042e552522f784e208fbc9e1b7b9ce9a5aa43f8d9c52303e3 WHIRLPOOL 502d4d4062209a467fc790a19ec9464190570f00c13ae68b597734c66f073c4ce02a18bc29825cf02c70c7cc18078440c5bf3c9f774cd79cb775fbf0c5aad655
+MISC ChangeLog 3248 SHA256 3b5a643bfbc8d6f08b731e750f757550bd42eb9ccc620d430f5a5281ffbde603 SHA512 b04a4f17f39804dd27b6f52687427f9ce851f06e522f2f95a89dd8a9314e1896c19af65f5b3ca4e4f5d7db06008c5fc16d762db9a8e738fed27d7d1759f70d7b WHIRLPOOL 8dad26aa8d5cdaabaad5fbfb835c4dac8d4461c11912762b76d3f4da83d955e395adf5a6ad6cab46e97201fb1989db729663b8e48f6250d3ee267f3eb6906a71
+MISC ChangeLog-2015 14984 SHA256 280ba02171188dce99473d8b24b1c010dee2af96222af485b0d63da7eaef8db6 SHA512 0b27b491b368661a8099db65c5672768c4f58b02d8e323ea9347ea947e43cb489d8055ab8a58f8a29eeb0084903a1a28e8024fb228331004a3b7930b5f4d4ef6 WHIRLPOOL 6d18f2539a7f954ed0d7f60b70d91e552fdd5c2a2b65c436930a94d173239fad0cd21fc39cf8ae83b2cfcdfce28464258ec31596d200bd187c8edd49bff17331
+MISC metadata.xml 537 SHA256 e80e1226886f0c57f07ca4f3a4b86671815ebe6aeb8be324f61a8b4f2f952df3 SHA512 8478bf7312a365c4fce15051b0cedb465e92a274e215bcf989e744434ed93f568217f953cbaa07e9adfc5e620187d4ed4076d3201806bfe2df55ae8743bfaaa2 WHIRLPOOL 260bc263737a3cbe81dcdebe8cbcdfe7a5ad45443a66d9a29d56e824c8db0a1dd30d3c2be883cf59472e374dd1ef0762b3d13d06fbfc9a163a0ac7d5ff6021d7
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/Manifest b/app-text/jadetex/Manifest
new file mode 100644
index 000000000000..c045843c21b5
--- /dev/null
+++ b/app-text/jadetex/Manifest
@@ -0,0 +1,7 @@
+AUX 80jadetex.cnf 995 SHA256 d146a34c916474a33669f0ac892127d72cc2680d2d4e3f56e9e43e7566012eb1 SHA512 b1e940b79bbb76b3ad02c82e25120651ab64259be104849fc39aee94fcedaea091220b6896217faa84f93a45cbafca5b1855396b47210952723148b69d9727f9 WHIRLPOOL 9d51961e3f5269a593081b715e71a8c141795002dc8c9ffc2ad4da30e7e7555a3aea12baae9763f2d5ee04b54b44689141c64f595cdd1e460ea0fb6c77ccefcc
+AUX format.jadetex.cnf 170 SHA256 4b2d4c9b54c5f738b874e108b5943ee59c9a6f7a75ffc3692ae7d00ca73d93ad SHA512 8d5d6ed30c45e1d79f108268e045acb763fa6815ca90a8f246daff51350ab2c19c7d38237aff3ced94f10bb9de06e3021c11138d3f038f4beaff25c5cade391b WHIRLPOOL a3e1fcd59d1a46244a4518b6cfa938766069e968e348042fb81166b5eb8d5a5d34db5d9b01f0ec33928598dc2be5a2b31f78f77d911883df2ee6ac28a1262422
+DIST jadetex-3.13.tar.gz 103137 SHA256 115aa01dc9665c263453e51dbb099769c63e47adb5e800436950154701059cf8 SHA512 188fb83b50fbe82856a32ef95088d5c801750114810e3cdf7e1758f78b6a94b331b7ae7d81feb1c08b7bb31ac52f8435503911933350baa3068ad373e11dbba1 WHIRLPOOL e2f23146969cf107e32658cf4fc338d39c89fd720ba8f77289e003c0c70910fd0d5cfb373f8ad2f012d1cfdbf028e9d56a63f6efd5e7d65fe23639d1a01ee8e9
+EBUILD jadetex-3.13-r7.ebuild 1620 SHA256 c7af40441457b5535c0da899c93e7adcd2563d4233e95bae6f942db204bc8871 SHA512 bc4e327e12f928cd4adb1c841362950d6e78e8b68f40077f89703d55123d9423be096289f6f691427a7e5fbe14d35d4effb1ca4f496f7cfcf59e9067e74b6ad3 WHIRLPOOL fce87bb1ead806183c142b907c4c0e0e59beb1331c69c72e2677caccc4ab2dc82a3b87aea4f6f9633e96c10722326813e1ff562b05628b5be226e70ce537cd15
+MISC ChangeLog 2480 SHA256 da029270870b0f628d13b8b4d8b7687a61f2eaa8168128287a0964ac61aec83e SHA512 d5f80e6b24b656ab5b7a6c70c34bcd63781b8fdf36e8ec63c688c176198c408e40df77b21b2aee09ddaf5a97cba4a909513e18c8959dd1ffe0eee441e63a23fd WHIRLPOOL a9c15a8c6f17dd027378b19abfe4f4e66474ea3be9e354702616ab4f9d091138ea12c2d4ea214b1d7fd6b907c3d4d21dd77278fdeba70f314ba7fffc0c6bcbec
+MISC ChangeLog-2015 9405 SHA256 4698102c5c83877613e463cb7eaa441b541ef111c1374b1d5a61f4c348b5cec9 SHA512 b88f5c6ca9627237338121217c9a121932298e07228ddcd83ebdc13f12bf268e798a233b09a8bc0b6757cfb7f743c1ceb1909386eaaa9b64c69df67bed0d98fc WHIRLPOOL e886037ec01de18b52a580310235133b2b4e8b29579d93ad22f913b52ae39b4aa7e962015891dfe151d9cf818d43ded4c9d80947d3281a0f8022f54480656d44
+MISC metadata.xml 326 SHA256 2b5c6c8ef0f155991251fdbc410ae2473b2d42b02b032a79722b580906ce212e SHA512 eb50eeb89f113a376963fe314c979d5e399f43b0ab85fcecc923618c717e30c90f8f70fe22ba7a02b39b14c57861efebfdb785f607a2e7830578aee20c2bd915 WHIRLPOOL 84132edca88f401f60d1e8a50c66252ab122b83189a5830cee67f83cbcb4757dc9f0b09268368bf43bd8e931013922fb0ce618243fa1fd29cf37e2cecfa6925a
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/Manifest b/app-text/jist/Manifest
new file mode 100644
index 000000000000..ad56f1388709
--- /dev/null
+++ b/app-text/jist/Manifest
@@ -0,0 +1,5 @@
+DIST jist-1.5.1.gem 13824 SHA256 0969d1c53b4e1be607f96afe8d0bc7662c9c80d79eea5a2e452ac712a2e06b81 SHA512 e59a0c5a5b0439a5cc3b847de3cbb0b9991685c1403fd8482ffd5564a77c8812587a7384ac19bb77cb812d0ece63df8ccd029c8757a242dc50a44da3e66b9936 WHIRLPOOL 1d246b371142476ba6550f01b7c0036c5c80af6985f80dbc7ba3d963543ace1957e7ae3e77e9c7f5ea4072823bfe1bdded1b808e60ec78aee411e16c81db01e5
+EBUILD jist-1.5.1-r1.ebuild 700 SHA256 6fcbf560ab264d0dbcc0fc385c6176230e9a50305042b6ad3ca0cd38be3df94f SHA512 bfb364afb3287d941434a5143d1df1a330208bc3570a33dee3adf55aef74af0f78a17d18660bf55a36afef6c282e8cb8abd33fd4c2defc59843e13abba4bb6b0 WHIRLPOOL 634158d4962093271dcb12e7d216991b8fd35416a24dcd4fedbdd07b65a2694937f0808fdbe913ebc15978d9d8e102d4efc2d666f258c587406aa9fb80353de5
+MISC ChangeLog 3118 SHA256 b75b6a037a9db8b7772441fce629ec10eddcbaf2b425d772eee3a4a73b947dd9 SHA512 a5b0633b058e0b951ac61d04c3b04e8959bf34d13a42d1ccca237537f58c3b251e189fc64e13d7701930fdf2656f8ca28658fa28969299719c492c8c26578740 WHIRLPOOL e98a637f20ace87831f0007819b7df4e62db76444c58057d0e896d680147c79f7a14aefc38b1c440dfd399494babf56a91b6db91df460b95d766d2ce8eaf724c
+MISC ChangeLog-2015 2398 SHA256 4f6a316fff1d473ee7e6a68b77e5448aec81005beb6925bba7269552ebf23309 SHA512 d703f7bc96d8da339fd96567d525322f16511490b5323714419fc5e32baffaf735e3bbed777b3cc953956d5624bce0a24e01bdde92d39f2ba1e362ee94799d50 WHIRLPOOL a0e2d0ddabff919350b973b98636f642a246d4ae345f9d57ff4f50a4aa9f27f0ce79450b988eedd082c95ec8ff0f0c670f5a4362270d9d210f081767453815dd
+MISC metadata.xml 342 SHA256 94efad2a63d828ce20d5b0d11f6fc8bf3a81d7df55227883eaa460dcac68e55e SHA512 dd94324def89cb3c5745995b21180e8ddcc785f81d53352c0b920f64a3e007f4edaf216116debb65686d5c43cd17291e0fc98edfc7ac5dc8f8d916c467a2f6cd WHIRLPOOL 77cc9cd3a76b5c537140177a9a0fa612ed7642c4eb8ff48059dd0f4cd65976b909e0dfe20c950fdcb1219679de24f32c29c8bbdbbf24fad9b736b277dc61b44e
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/jmupdf/Manifest b/app-text/jmupdf/Manifest
new file mode 100644
index 000000000000..a726ec61736d
--- /dev/null
+++ b/app-text/jmupdf/Manifest
@@ -0,0 +1,8 @@
+AUX jmupdf-0.4.1-build-xml.patch 792 SHA256 33e580ad84a7f2df9c98ba38d70b3d44195ac278d7f70c8c3fa5c462184267e3 SHA512 307d6feb98cec0bf06873b53e9eab7de238a8ef64f65164f7ae52ec8362afe4123410629e8bc18862fa70b2ea153e46c991152663142c5078378550c1279690d WHIRLPOOL 979f3621d249f5c0c67b8c14670ce11f6d34f822b7a7361a4d8c5f7775701db6293ce12b4eb9d23b2c68117309beb269f1dc3b2abc32c9caea182d34780e61ef
+AUX jmupdf-0.4.1-umlaut.patch 415 SHA256 efae6fbcb18ac4164188cf613b0963077fe080b94346b8aa2c5a7b1af09bb72d SHA512 f67ee76cb5f2cf5a30010a914c0cf370a283e16c2ccb1500f8b9301a372707cb41a1e89bb108a13088cd348d44c8b8e568274f4eff6efd9b8c62e4f11bfc8159 WHIRLPOOL 163a46bfb96224fc9f637e3b8d64ac1b15d67bedd8011b92bb27a012a3b1e29639bedab6a7f824cf4860c9cc6aec07b78e75781acbbc5c0fe60d77cf120f756a
+DIST 2012-02-23-source-jmupdf-0.4.1.7z 4212084 SHA256 cb7311021dce6e1e7425b088f4d60c12f43c0e26eff794b057d78e105cdbbbc0 SHA512 f16190d02f9c3f6fe9aa2acd7bd270b6e807b61e926cd1bc4e17628f2d62a45d0f024c2748e4eb0a20e7da55895289f6c74685cb371e101a0901235a48eb1f42 WHIRLPOOL e8e93d303e925d1c1313d9951b3306d01abcb9ce1bca50fb40054e807c67f0347ee7c2375de11fde4f957f56fdc98e70620698fb3a02ff8a9f651fb6a21ffe86
+EBUILD jmupdf-0.4.1-r1.ebuild 1707 SHA256 4b8b798d21b60d1d48fe6bdc7d10dde4910587197c8fdeda134e6075a5af73bd SHA512 9c2a462b912b11776d1dec605704ae6c8c2e107c59c2b346d929dcdf328a85b9dabb690643ef512bde058e4a824bcff871eab66a15a87dcec39b98c64c74b388 WHIRLPOOL 963e35f7d4f0aaa4fafe624f8555d7b7970695ac1085ee53c644371f82359245a5ea1f90a9682e2344335b2a5f68c4303d27cacb18e7021a67914d29795a3ec5
+EBUILD jmupdf-9999.ebuild 1557 SHA256 ad36634a9b94f5d24082e1070850614392664d8ca680cd2438da7db4c5a256c9 SHA512 03e325bf300c265eb8f5b7e0ef9f8119130bb2d161bbac5f99bae531482fb7949b302eac56c112819d20391e074207970c62196bfdf416749832b57dc03763a1 WHIRLPOOL 304f7e52f0a9caa0cb627291109fef890ab3d3ed7f4685758d9c97b7f52a194bbd5691e862416fceec48ddcdc63fbfafd520473dc07a0d9c13b911fa72a97c2f
+MISC ChangeLog 2791 SHA256 796240b8772f1072c0011408a683044e8fddff110fa2378130efeeffd2dafe3c SHA512 45744e2403efba91cb5f0351c2c27b03daae9fe1ae393d3764bc0d3d7ca10617b73690ae4ab117a2dd82aaa56c4443d66ec47295513557e8a0019cafd2b5a544 WHIRLPOOL fec105b1d456d9c00507928b9038f8b29a8b9cdd73c6cca2888bff16d3edf044a2951d896b614082ef4028c569c9da9d37e26d6fe0eccad0f28c81b6fb86c935
+MISC ChangeLog-2015 796 SHA256 e0d2715bdb1897050ea3e942a879bc434888688527a85cb16c641b3b18c80362 SHA512 6e4df804caea7b06ff4d076224e83a08e8eed930833f2b46c7af9e6e7be0fdea7e885510a59e4d28ac3d38bca8a8a6af0f67ff0ed13906ed627c869a5d971688 WHIRLPOOL d8fd6ed44aa3bc7ff311df45d367aa0e63aaaa6d763f9f5d621422e59c48e9a81b89b3fbbd193e671a8e98995b2731725675e488c1cd30e25e8009fd2d133773
+MISC metadata.xml 761 SHA256 4f642a06499cf9d5953a853fed73cb994b60caa51b77e086bcb5b5cf92fabf9e SHA512 08b8a8cee776f079485289f9b1925eec9c7ba47f08fcb64d8b42c1d7c2ca2544a3963e2525fd1fd4de9c38f9a2b6744a63100f39c83d07a0a2b259c80e1bf564 WHIRLPOOL b7d979a65ff70ac49f25a334b901fd7e8bab43ab490746450c7ebd953c61419a499b037d2b50cf9b6878325bc7a74ae82d0a1f2ffc8404d2b9c957fbd12b5da8
diff --git a/app-text/jmupdf/files/jmupdf-0.4.1-build-xml.patch b/app-text/jmupdf/files/jmupdf-0.4.1-build-xml.patch
new file mode 100644
index 000000000000..3eb6a12c5f71
--- /dev/null
+++ b/app-text/jmupdf/files/jmupdf-0.4.1-build-xml.patch
@@ -0,0 +1,27 @@
+--- jmupdf-0.4.1/jmupdf/build.xml
++++ jmupdf-0.4.1/jmupdf/build.xml
+@@ -1,7 +1,7 @@
+ <?xml version="1.0" encoding="UTF-8"?>

+ 	<project name="jmupdf" default="jmupdf" basedir=".">

+ 

+-		<property name="source.dir" value="${basedir}/bin"/>		

++		<property name="source.dir" value="${basedir}/src"/>		

+ 		<property name="target.dir" value="${basedir}"/>

+ 		<property name="build.dir" value="${basedir}/build"/>

+ 

+@@ -11,9 +11,12 @@
+ 			

+ 			<mkdir dir="${build.dir}"/>

+ 

+-	    	<copy todir="${build.dir}"> 

+-	    		<fileset dir="${source.dir}" includes="**/*"/>

+-	    	</copy>

++			<javac srcdir="${source.dir}"

++				includeantruntime="false"

++				destdir="${build.dir}"

++				debug="on"

++				source="1.5"

++			/>

+ 

+ 			<jar destfile="${build.dir}/jmupdf.jar">

+ 				<manifest>

diff --git a/app-text/jmupdf/files/jmupdf-0.4.1-umlaut.patch b/app-text/jmupdf/files/jmupdf-0.4.1-umlaut.patch
new file mode 100644
index 000000000000..c53e7bd0d813
--- /dev/null
+++ b/app-text/jmupdf/files/jmupdf-0.4.1-umlaut.patch
@@ -0,0 +1,11 @@
+--- jmupdf-0.4.1/jmupdf/src/com/examples/pdf/convert/Pdf_2_Png.java
++++ jmupdf-0.4.1/jmupdf/src/com/examples/pdf/convert/Pdf_2_Png.java
+@@ -26,7 +26,7 @@
+ 			 */

+ 			pdfDoc.saveAsPng(

+ 					1,									// Page number

+-					"e:\\tmp\\Lösung.png",				// PNG file

++					"e:\\tmp\\Loesung.png",				// PNG file

+ 					2f,									// Zoom	

+ 					ImageType.IMAGE_TYPE_RGB);		// Color space. Only RGB, ARGB & Gray.

+ 

diff --git a/app-text/jmupdf/jmupdf-0.4.1-r1.ebuild b/app-text/jmupdf/jmupdf-0.4.1-r1.ebuild
new file mode 100644
index 000000000000..df7924d2755f
--- /dev/null
+++ b/app-text/jmupdf/jmupdf-0.4.1-r1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils flag-o-matic java-pkg-2 java-ant-2 multilib
+EANT_BUILD_TARGET=${PN}
+
+DESCRIPTION="Java library for rendering PDF, XPS and CBZ (Comic Book) documents"
+HOMEPAGE="https://code.google.com/p/jmupdf/"
+SRC_URI="https://jmupdf.googlecode.com/files/2012-02-23-source-${P}.7z"
+
+LICENSE="GPL-1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="system-mupdf"
+
+REQUIRED_USE="!system-mupdf"
+
+RDEPEND="
+	media-libs/freetype:2
+	media-libs/openjpeg:0=
+	system-mupdf? ( >=app-text/mupdf-1.2 )
+	virtual/jdk:1.7
+"
+DEPEND="${RDEPEND}
+	app-arch/p7zip
+	media-libs/libbmp
+"
+
+S=${WORKDIR}/${PN}/${PN}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-build-xml.patch \
+		"${FILESDIR}"/${P}-umlaut.patch
+
+	edos2unix ../mupdf/jni/*
+
+	sed -e "/^JVM_INCLUDES/s:=.*:= $(java-pkg_get-jni-cflags):" \
+		-i ../mupdf/MakeJNI2 || die
+	sed -e "s:-pipe -O2::" \
+		-i ../mupdf/Makerules || die
+
+	rm -r ../mupdf/thirdparty || die
+	if use system-mupdf ; then
+		for i in android apps cbz cmaps debian draw fitz fonts ios pdf scripts viewer win32 xps ; do
+			einfo remove mupdf/${i}
+			rm -r ../mupdf/${i} || die
+		done
+	fi
+}
+
+src_compile() {
+	local system-fitz=$(usex system-mupdf "FITZ_LIB=\"${EROOT}usr/$(get_libdir)/libfitz.so\"" "" )
+	emake -C ../mupdf \
+		CC="$(tc-getCC)" \
+		AR="$(tc-getAR)" \
+		SYS_FREETYPE_INC="$($(tc-getPKG_CONFIG) --cflags freetype2)" \
+		"${system-fitz}" \
+		JNI_DLL=build/libjmupdf.so \
+		JNI_CMD="-shared -Wl,-soname -Wl,lib${PN}.so" \
+		build/libjmupdf.so
+
+	java-pkg-2_src_compile
+}
+
+src_install() {
+	dolib.so ../mupdf/build/lib${PN}.so
+
+	java-pkg_dojar build/${PN}{,-viewer}.jar
+
+	dodoc Readme
+}
diff --git a/app-text/jmupdf/jmupdf-9999.ebuild b/app-text/jmupdf/jmupdf-9999.ebuild
new file mode 100644
index 000000000000..a2b0354b57ec
--- /dev/null
+++ b/app-text/jmupdf/jmupdf-9999.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils flag-o-matic git-2 java-pkg-2 java-ant-2 multilib
+EANT_BUILD_TARGET=${PN}
+
+DESCRIPTION="Java library for rendering PDF, XPS and CBZ (Comic Book) documents"
+HOMEPAGE="https://code.google.com/p/jmupdf/"
+EGIT_REPO_URI="https://code.google.com/p/${PN}/"
+
+LICENSE="GPL-1"
+SLOT="0"
+KEYWORDS=""
+IUSE="system-mupdf"
+
+REQUIRED_USE="!system-mupdf"
+
+RDEPEND="system-mupdf? ( >=app-text/mupdf-1.2 )
+	virtual/jdk:1.7"
+DEPEND="${RDEPEND}
+	app-arch/p7zip
+	media-libs/libbmp"
+
+src_prepare() {
+	if ! grep javac ${PN}/build.xml >/dev/null ; then
+		epatch \
+			"${FILESDIR}"/${PN}-0.4.1-build-xml.patch
+	fi
+
+	edos2unix $(find mupdf/jni -type f)
+
+	sed -e "/^JVM_INCLUDES/s:=.*:= $(java-pkg_get-jni-cflags):" \
+		-i mupdf/MakeJNI2 || die
+	sed -e "s:-pipe -O2::" \
+		-i mupdf/Makerules || die
+
+	rm -r mupdf/thirdparty || die
+	if use system-mupdf ; then
+		for i in android apps cbz cmaps debian draw fitz fonts ios pdf scripts viewer win32 xps ; do
+			einfo remove mupdf/${i}
+			rm -r mupdf/${i} || die
+		done
+	fi
+}
+
+src_compile() {
+	#append-cflags -Ijni/includes
+	emake -C mupdf \
+		CC="$(tc-getCC)" \
+		AR="$(tc-getAR)" \
+		SYS_FREETYPE_INC="$($(tc-getPKG_CONFIG) --cflags freetype2)" \
+		JNI_DLL=build/libjmupdf.so \
+		JNI_CMD="-shared -Wl,-soname -Wl,lib${PN}.so" \
+		build/libjmupdf.so
+
+	cd ${PN}
+	java-pkg-2_src_compile
+}
+
+src_install() {
+	dolib.so mupdf/build/lib${PN}.so
+
+	cd ${PN}
+	java-pkg_dojar build/${PN}{,-viewer}.jar
+
+	dodoc Readme
+}
diff --git a/app-text/jmupdf/metadata.xml b/app-text/jmupdf/metadata.xml
new file mode 100644
index 000000000000..42a250af9af9
--- /dev/null
+++ b/app-text/jmupdf/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>xmw@gentoo.org</email>
+<name>Michael Weber</name>
+</maintainer>
+<maintainer type="project">
+	<email>java@gentoo.org</email>
+	<name>Java</name>
+</maintainer>
+<use>
+	<flag name="system-mupdf">Link against system version of app-text/mupdf</flag>
+</use>
+<longdescription>
+JMuPdf is a Java library for rendering PDF, XPS and CBZ (Comic Book) documents. It can render pages and export them into various formats as well as generate a Java buffered image. It has the ability to render the whole page or sections (cropping). It can also extract page text, links, outlines, etc.
+</longdescription>
+</pkgmetadata>
diff --git a/app-text/jo/Manifest b/app-text/jo/Manifest
new file mode 100644
index 000000000000..5d475b63644a
--- /dev/null
+++ b/app-text/jo/Manifest
@@ -0,0 +1,4 @@
+AUX jo-1.1-version.patch 217 SHA256 eacdf21036f8b082887cd1d5ef3fb9600ea8e25b039a6dd843c02a066ff8c3ef SHA512 c70e5993069229143f75f2360bf7b4756a988f71d321a0f26c821d0258d523fc2c9d754692b498ece20ff452444ee817af609435160409f1ebe4033287ef89a3 WHIRLPOOL 4ae5f722e90b0d3c25d3f12bc0f721ccd16f07b12c6bf5732c3de563dd278d365585b5bbe5c2db115110d60098de2b903c437b9a2412f912bdfcd5ff8b65589b
+DIST jo-1.1.tar.gz 50395 SHA256 1471e257517ff8123197aa022b2e76c914fbfdbecb5fbb7be9c55a231d8a9630 SHA512 fd220acf53d554cb9e9920510dba2f4a01337b126dca89882e02ba96cdd84bf7a5e935a4c06dddb5200cd808f0609fd697e51a56161dc99b1638e33181494242 WHIRLPOOL 50c87c5fb02337490970747fead3c1a4333b7a8de6ef98ac197bfa809599bde40c48e968d8621199f5aa3fde1977b5382ed40b54fd07b0a7b5df84ffc370d67a
+EBUILD jo-1.1.ebuild 412 SHA256 e8bcf92a7525e3d36f2d25b41f1deb9c3bc2ec6eced64a7b6df0213d58349286 SHA512 4914cdbb6a5f71e58da34c82f188901400c5afda7abe58ecece89e175b984f16333529a986baba15513ad6b08f6559b0f8f5d6b0276fbc14aecddae344192246 WHIRLPOOL 5123c03893badb7793c1c03811816057e1711ee7e03529fd85e9ac8d07e95d0d82c494cbf4a1a7e46531b0be43223d62c23ae050ac9b006466761b7ba59478c5
+MISC metadata.xml 288 SHA256 81719b3b40f09acc7b984ac7c80169786ddc9445e61700f18ac2ecf2794725a9 SHA512 c8e9c740f13a6d2e94d28748750b51c44d9291d4fdc8823dc11647e0ae058866c06d49656011398d48fed78192bfe89f50a5fd05d36054974e3e65bdc82c55cb WHIRLPOOL 73215a1cfe455ca0b2de5e7579b4690463fead93a6b62663487e00b4bb6c4ecd7255bcc03681a5cbb8ce2393e65a4f3d656ca94c927cb3934d51c41002ecaef7
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/Manifest b/app-text/jpdftweak/Manifest
new file mode 100644
index 000000000000..800123abb9df
--- /dev/null
+++ b/app-text/jpdftweak/Manifest
@@ -0,0 +1,5 @@
+DIST jpdftweak-src-0.9.zip 129611 SHA256 d909656b87c021f62022ffbd21ce1aaf67b27144fb2ffc5b2313dec2a79388af SHA512 55e68ba13876f2ac24b635af955d3054fed00135f05532625f40a245cc39176398bf6c0bf4a393e9e475604933727a7fdb270b94b38390b8ca9a41447d6652f7 WHIRLPOOL 1e902a0ef5beaac1a856ad0c7e2494bf4735fcc4e653609a39c3c65a078de12306b4868cf6ecab9895ea854e420b04b1f6f70dd77019b23340405117de38affd
+EBUILD jpdftweak-0.9-r1.ebuild 783 SHA256 75d0015c7e2e3c8fdfbd3a9a8b14cbb44512216ab762c6bb98142ee232fd47ed SHA512 e7397a887b2ae55c0c78313a9e7c7477bd6e4358e1bd26bba91f5d25badab1c5bc42e177fae9e04461d3b8b5723f76d88d33c574135e2f337477acf46669a865 WHIRLPOOL 04e63f6df83479f48596b221441d590a4b3ed8e22f2a3c9347a411631df98cd9f37ba2b432c3039e1b0557c2127ca6b45cc638eae9cfe7bc7e7e9b7ec90530a2
+MISC ChangeLog 2435 SHA256 59ff3bda4b0c8387e475340643e1a6c5d49a7d1b6263cd0abd232d0a12e42fe6 SHA512 d142769d110d25cc2df68edd8c031188b0b5c9989a144a23ba72c2d84e3977264643c9e6b93924be335d0de94b60f0ca1be53bf740897af3290b07e336fef747 WHIRLPOOL bf44704f9e5110c41955177051b22e93ba735edc52c8ab6b8ace381ca8ed6822efe2ef17c2cb84eb8a187f544932dd4877468b86a51f95aefe2d5a35e006a6cb
+MISC ChangeLog-2015 991 SHA256 c697ce67223803b77fca5611e0b75d01c9a8c1aca7b2ad58c23f59d13b551a11 SHA512 df881310a771bc41a13e149df5825a034d1885c730529e778d9fc08bf37952261182ca3d0fb61422c5c0f17927330efb60bbe739f67d7e578e73e8f319661dad WHIRLPOOL 5e6775cc1bc5edf9df69a46d8270aee52b93d11ad90d22238f59202d02104b8d5342d145f0cc6a51a459ab2ec034a66c848b2720558d27beb4036fb3d14a34cf
+MISC metadata.xml 824 SHA256 38fc0b9e2fd99244f92208ece5ef5246f40c44dd384b8bba9d35e8e4f332ed33 SHA512 7b6006308a845e6180404f16a24c1075a7a5ac27b2f2aa861ddfd2fa367d172817853dd531808e8d4e1fcdfe017d9af3d62f9670e7f96494c60c85dae9de7d1a WHIRLPOOL 0f6e90e5421f513b3c72841d1783325012165708d5d7d6add7ea69b25a89327d129833a883cfa614ef0d3a8115734dc3f08fb29fdc5f828d051686442744e5ce
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/Manifest b/app-text/kbibtex/Manifest
new file mode 100644
index 000000000000..c96fe9fc62bb
--- /dev/null
+++ b/app-text/kbibtex/Manifest
@@ -0,0 +1,6 @@
+AUX kbibtex-0.6.2-webkit.patch 2775 SHA256 c3211929b130b5281553fc40f4829bcc07f111bcf22404ef54f540f2c8640393 SHA512 742407fff818b164a3bd730d60f52dc92f32c4cea97ca9b28465e833b442fde6edaaf1e7dd34851cd569a627548b20e905b8e6ffc744cb1c8dbf81fd3337813b WHIRLPOOL 130d427af24fefd6a7b668be6cfc75e229a9b95dedd5fc3537295ca21299fe04a1457ff134395c6e9edc87a65ff2b85e0c4ff0f95125583d879221ed92aff90d
+DIST kbibtex-0.6.2.tar.xz 3081364 SHA256 d99e419aec1d3af0a57eba6d7498de4e6be25ddbd5a5e56fc9de09e7e17dcdf3 SHA512 aa23e80cb273c0ae721ecc917f540070deea520fea2d7ca7ee97fde2c6918dba84769ad083fed93b9d0260539273c20c214b92c94269b413f46cb644d16dc270 WHIRLPOOL 4ab308a8a44df4f3e3a485a67b265ecaf28d2c4a9e4e126d5ab4b95eac12ecacdd3b49bd03f67167a358d86b8359d758e3c4cbc72bd5eed8c10873d181f7e32e
+EBUILD kbibtex-0.6.2.ebuild 668 SHA256 69407f68275278898d406fd41f2ff3bad4a8c7087a5bdddade64389033d540ae SHA512 8f7cad285dabeb9816ed881f0a55a9f155516730891896e1b87bfb39be97f420e411d6a282a21593b69579e3599bca4523133c64e7d1ab108cd699e2754909b8 WHIRLPOOL aea1c65830d4c00b995466d04ac604e0b198c084fea3bb510c0805ae1bc19b27e967b4786272276e0293b4682baf437f4289358836c8be6cbad90bc2de7bfef8
+MISC ChangeLog 3633 SHA256 37cb6f156decc4f678a63c3b0ea04ee987747ef8b69d30f982cb86d3d2a250a6 SHA512 56f600aa975da762f5bb93c1b9260c8890c44076e92b9475bb9b8a78339f998bc626e6d643e7062d7b2a20d3f515a0e6809b60719bbffed2c1df7ec713a4378a WHIRLPOOL bb060dae179908100af322e1d5e8eee98bc2cd0155fbfb0cb1f51ab873e6965d238c1a9808be6f7fbeb5e3428139ddf119f583cf9b1b3fcf4889fa5da56aec70
+MISC ChangeLog-2015 3808 SHA256 ce37bac1a969142355638aefc0a4945b20e35c4b2308127584c8fa39a7687978 SHA512 f8f980715fc99e02d43a1a5b72fd6eb59d1fcba8d8e4d9263d58f69ee7a5bc12dbb0e0b3a25b5e88c67af27d293532dceeb251099a365a20c0915df1c37bbe33 WHIRLPOOL 8fb56fb596aef41b314fb7070b5f3619b2e9e7bed51ab9b55beceed1832bb6f540d7970b29dd9436406e0d7429d1c7e09f1acfc39b3dcb22934cd7363c746d69
+MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c
diff --git a/app-text/kbibtex/files/kbibtex-0.6.2-webkit.patch b/app-text/kbibtex/files/kbibtex-0.6.2-webkit.patch
new file mode 100644
index 000000000000..c59a7fb9caf1
--- /dev/null
+++ b/app-text/kbibtex/files/kbibtex-0.6.2-webkit.patch
@@ -0,0 +1,109 @@
+commit 2cd09d41ed559461a0f0a346ebec3dea82c06947
+Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date:   Sat Jan 21 18:26:46 2017 +0100
+
+    Add option to disable Qt4WebKit even if present
+    
+    - Link against Qt4WebKit only if(HAVE_WEBKIT)
+    - Remove Qt4WebKit linking from tests
+    
+    REVIEW: 129863
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ee3d810..1acbf8a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -48,6 +48,12 @@ set(
+ )
+ 
+ option(
++    WITH_QTWEBKIT
++    "Enable QtWebkit support"
++    ON
++)
++
++option(
+     UNITY_BUILD
+     "Compile multiple C++ files in one big, merged file (\"Unity build\")\nSee also http://t-fischer.dreamwidth.org/3054.html"
+ )
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 04222a7..0b7be01 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -37,24 +37,41 @@ include(
+ # check if QtWebKit is available, which seems to be not available
+ # on e.g. RedHat Enterprise Linux 6 or Scientific Linux 6
+ if(
+-    QT_QTWEBKIT_FOUND
++    WITH_QTWEBKIT
+ )
+-    message(
+-        STATUS
+-        "Found QtWebKit, enabling WebKit support"
++    if(
++        QT_QTWEBKIT_FOUND
++    )
++        message(
++            STATUS
++            "Found QtWebKit, enabling WebKit support"
++        )
++        add_definitions(
++            -DHAVE_QTWEBKIT
++        )
++        set(
++            OPTIONAL_QTWEBKIT_LIBRARIES
++            ${QT_QTWEBKIT_LIBRARIES}
++        )
++    else(
++        QT_QTWEBKIT_FOUND
+     )
+-    add_definitions(
+-        -DHAVE_QTWEBKIT
++        message(
++            STATUS
++            "QtWebKit not found, disabling WebKit support"
++        )
++    endif(
++        QT_QTWEBKIT_FOUND
+     )
+ else(
+-    QT_QTWEBKIT_FOUND
++    WITH_QTWEBKIT
+ )
+     message(
+         STATUS
+-        "QtWebKit not found, disabling WebKit support"
++        "QtWebKit support disabled by configure"
+     )
+ endif(
+-    QT_QTWEBKIT_FOUND
++    WITH_QTWEBKIT
+ )
+ 
+ add_definitions(
+diff --git a/src/networking/CMakeLists.txt b/src/networking/CMakeLists.txt
+index efa14f4..f7ade08 100644
+--- a/src/networking/CMakeLists.txt
++++ b/src/networking/CMakeLists.txt
+@@ -131,7 +131,7 @@ target_link_libraries(
+     kbibtexnetworking
+     LINK_PRIVATE
+     ${QT_QTCORE_LIBRARY}
+-    ${QT_QTWEBKIT_LIBRARY}
++    ${OPTIONAL_QTWEBKIT_LIBRARIES}
+     ${KDE4_KDECORE_LIBS}
+     ${KDE4_KIO_LIBS}
+     ${POPPLER_QT4_LIBRARIES}
+diff --git a/src/program/CMakeLists.txt b/src/program/CMakeLists.txt
+index a9fe213..fa57506 100644
+--- a/src/program/CMakeLists.txt
++++ b/src/program/CMakeLists.txt
+@@ -65,7 +65,7 @@ kde4_add_executable(
+ target_link_libraries(
+     kbibtex
+     LINK_PRIVATE
+-    ${QT_QTWEBKIT_LIBRARIES}
++    ${OPTIONAL_QTWEBKIT_LIBRARIES}
+     ${KDE4_KIO_LIBS}
+     ${KDE4_KPARTS_LIBS}
+     ${KDE4_KFILE_LIBS}
diff --git a/app-text/kbibtex/kbibtex-0.6.2.ebuild b/app-text/kbibtex/kbibtex-0.6.2.ebuild
new file mode 100644
index 000000000000..1ed3726917b9
--- /dev/null
+++ b/app-text/kbibtex/kbibtex-0.6.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit kde4-base
+
+DESCRIPTION="BibTeX editor by KDE to edit bibliographies used with LaTeX"
+HOMEPAGE="https://userbase.kde.org/KBibTeX"
+SRC_URI="mirror://kde/stable/KBibTeX/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="4"
+KEYWORDS="amd64 x86"
+IUSE="debug"
+
+DEPEND="
+	app-text/poppler[qt4]
+	dev-libs/libxml2
+	dev-libs/libxslt
+	dev-libs/qoauth:0
+	virtual/tex-base
+	x11-libs/libqxt
+"
+RDEPEND="${DEPEND}
+	dev-tex/bibtex2html
+"
+
+PATCHES=( "${FILESDIR}/${P}-webkit.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_QTWEBKIT=OFF
+	)
+
+	kde4-base_src_configure
+}
diff --git a/app-text/kbibtex/metadata.xml b/app-text/kbibtex/metadata.xml
new file mode 100644
index 000000000000..2fdbf33d963d
--- /dev/null
+++ b/app-text/kbibtex/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>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-text/kchmviewer/Manifest b/app-text/kchmviewer/Manifest
new file mode 100644
index 000000000000..10d9ebed903f
--- /dev/null
+++ b/app-text/kchmviewer/Manifest
@@ -0,0 +1,7 @@
+AUX kchmviewer-7.7-force-qtwebkit.patch 960 SHA256 68897ddf16904f9c45c36ecbfce5023a9f01075993c1068c04c2d769e2e3d7a7 SHA512 bb93256211bc7390acb52b142da5cd12dc4c8220fdf745c6b5dcc93bfba8880272ad0134c868409afe5fe6ea3bcae47cebe1aaab13cdead6556bf15bd838b549 WHIRLPOOL 09884f831c08945921d975e289f1f07adc2a66ad583add5f3644cf2171be584744798b007e6fe8f1c6fac5bb3908ae199eaee00f3d7223440228f4e9991523c1
+AUX kchmviewer-7.7-underlinking.patch 300 SHA256 bb9345a0ecaf70e06cfad06c6c2dbbfca79c3462e1f4bb459e80ecaa31ea58cc SHA512 004056e7ba232a80f76fe7a8955a2ef621d8148f7c594c78ae3136dca7ca8d3c39e8ab3081f75b3181bef3c9a720601cc7e65ba371b95853faa4bf845e80d0ec WHIRLPOOL a89e0c5399a888c3a08100fed176ad310f9c47dea5fc390b5b8b4d72a31a0aa98f12b7c7ff200c8362e2368b95157f91d7e58590e940803718487ba6fd84b693
+DIST kchmviewer-7.7.tar.gz 345952 SHA256 27cbac45c786b1718550a87e6f86010e161302b426c6396ff2a3091b913b17dd SHA512 e217db388f99142114e4de6735916d46c9d89f144390b58dffd739ed7246048c23af75c2eb9effba3e942a21564f9205265155a93a21d6343bea83a26fd99070 WHIRLPOOL 94230893add520861605edc09979f98774cc553f95b30364860afb130e5a77cbafa487fa5623d7d063bbec350a3b5d845ecd54072556128fc9c7a7d1d24dfa46
+EBUILD kchmviewer-7.7-r1.ebuild 958 SHA256 539d737a4436a5f892494711123be4aac0f1c926968a86425324e81b2dfd87b4 SHA512 960de65730bdd95a7db91a6d77f90f3b547050ec9f74246053d6fbf6daf57ef885b8d85c20d6bf7fe5276b94fca6254706fad64cca29e229b0f4b9bf87a29b8b WHIRLPOOL 122dfe9ad3d4ba57e3c490a7d98a0e2bdcd3161fead1ff84a3cafb8bd3cb7e66110cd8560ffdc228852339c9a997335c1f73e1eb9c5595d3683b30aa2eeb18a1
+MISC ChangeLog 4994 SHA256 516c4c0a3a41d51d2d8681b2cf9902223cda9c5ab96e641b892289a0e6fd8fee SHA512 312e2e3aa458a64d0cb68be5b3e3950a2bebe30856fa6a96acfa5ecb1e040c059e3413a14a5ffc67d81aa8179f0a13ffe3e14ec80405170bccb513d2546ac8c1 WHIRLPOOL 9457c6224b431c4074db5e5362c9a83bf452947839b83ed39349c25fa607ac3e0e9847c487790d30b6479c2c8dfee6722806298df470b6e53e415839bd2b6ea4
+MISC ChangeLog-2015 14663 SHA256 e996690c43ff97bde0bf0c32fd4da13e53528534622d0a4a9e2c33eed2f6bdf4 SHA512 a02093d2c8f5079fe9b540d165d9c47e28dbf09e6fc536d5f8f079ea72b60bcb6ae3e4b852373d88138c24687dfc0e0fb868cea28ff87eeef6069631ff2733b7 WHIRLPOOL b1bc229a28e8d6c07cd8b9033051af8947fbad8a050850c07afe46d4b0a9000b41a15b77b6931cb82ae36e6943c1b332417873f0267d45a25d5fcd062bf4dd7c
+MISC metadata.xml 979 SHA256 6304106ca2b3cbdee33cca87322532448d241a6da31e4df069cefef4f2971699 SHA512 e7786881fccd93bebb9ee1e0904d18b9eb1c6604f36aecd44673f3cd59c09955a9bde08bf765efee3422bc9c514d59040375e770f960163640acc0577642d399 WHIRLPOOL d4ddd0691b2c09d5b67eb2eb5210ae2ff781de939a5d6888214a69b1244ebde0cd1e9dd3adb3110283b08f71a136680df97d9ee3d9f3a37c2bc4854ceb8de815
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/kding/Manifest b/app-text/kding/Manifest
new file mode 100644
index 000000000000..c67409de55b2
--- /dev/null
+++ b/app-text/kding/Manifest
@@ -0,0 +1,7 @@
+AUX kding-0.6-cmake.patch 316 SHA256 02e50d912565ca07da35bec89be079b69aacb5ee3d4ac74d263a59e26dadaaad SHA512 22b8215aea440ab3c090196b18ad8f2404fcf3f80f06a468ed82dd0a2b8fe3de303c72fd86b0045b954f0401710386590f1d298bc82569fd7fb9129690194a95 WHIRLPOOL 06df99bd225b87e1bb56949b84ef3f86f8c091345e6952564926e7f499c2faf07c5044e17373cd74f12c9fa0501874664e64af4dfd4e256c877049dfad094746
+AUX kding-0.6-dtd.patch 931 SHA256 db76c928ccb924daf63e5ac352429ddb5cfcc2782ecfefa7eccd8b19bedc73c4 SHA512 8daecc561c8646f282d0781b7653857c550870fbaa5f4036ebd62ca796991cdd4f924c8e885690b6c30a98e84e2003fc1c169072ddd36b131bdb8e3235f2750c WHIRLPOOL 636278846df72d61e97dea6fd13ddd8d6b33c0fe1b061347057adadce707d626d87b517dfb76a92bbde5c3ab5a1df112509ee0f3176c19ff04b5fd2ae3675c0b
+DIST kding-0.6.tar.bz2 3348783 SHA256 56c070b772b406529972648822dfb45b705980d7f74a98bd009efec72f9c7f71 SHA512 362890e95c8779d188745b41b6d7ef3050740999bf49baf98c16c73debb78fb1e57ebbeaddb902b458f00088f437b86eab398dd029626e35805e8ef6f09d0b86 WHIRLPOOL 5caf0e918dd8ac1f1eafcd04b06c3f1714092523178af6ad959c717ad0a1ca63c0b3cb46655ad8e773a702330c7699239dbce70324c3b5dfd4f9f27a12857737
+EBUILD kding-0.6-r3.ebuild 891 SHA256 461a1c56f5f60ff38ae12532b534543b280cbdf2dcb5b627890d52ff641d4465 SHA512 4619b691afd6096cf41f808fe48bbfcd88b22c17a8ed66bd827bafe31d042c63dc92de593f67255e092d06ce13674cdc9a0a507ba3b872d3193e32ad0633d766 WHIRLPOOL 41b5cd6b6c4e589abd1aec9288ea1b2731a10c97517efb7183a00bdb5ba41d13cc2d6316255e5277c0726c8c8a2f43fd8299a6bf17ff8cbb24c65c4c8d08e73f
+MISC ChangeLog 3111 SHA256 000476b36036232893fd42f4f27595e8965be8a100c22d1f9711f0c8f548ffcc SHA512 fd3c5b671050f0d750f8ef038cf5ea5fc8ae4b97e993fa5b55853ee7cfb266ca00ac7857477cdbb3a8965f32cd059851692f338ddc0d1b19eb86fa1b542a1caf WHIRLPOOL 3c8089442e69ac99dd7df95024829022d87eda2900b369b04e53d19b0f678636e463e39d693739769c0b51a40c22ae41f6e036e238f9eef4d3dc79aab0f6bd55
+MISC ChangeLog-2015 3411 SHA256 b201c2583c024ec763046783b39690cea6da73bb9883264d2ebcf159a2af0233 SHA512 1b8ce022aa5e9142aac422a27e804a370a0c2255f667d2ed81d4ab6f2e14460eb34004c90564e9ef3ca5ac670ead7837ec0412c767439206c0378fbc9dfe2754 WHIRLPOOL 3fb7aabcef63c2ad47f957bd40031b471f348a4db4541afe941fa22c45a6fb75c5d69319b07e87986d8237b16cab67e7ba8112aceb3d60be878991fb2f5caa88
+MISC metadata.xml 464 SHA256 9327cac73b3fd49e9698cd0697275b6a1589809eadcab097813e040cf8997127 SHA512 fa436820fa2e563450efc886cf5639055d1fc3b7af9acdd256e4910e8895f87ea77e21f6bc6fe2548c11c8c05d880da41f30b6154e8ad36e50d7a37817815b94 WHIRLPOOL 73253ad1e6b2a5e0015224e1127a6a764b264269f11f3e05d1a63484662645180895b7a11c8e696365ddb9416aa65520715151db6798a5d52c1f0fc7cfafd834
diff --git a/app-text/kding/files/kding-0.6-cmake.patch b/app-text/kding/files/kding-0.6-cmake.patch
new file mode 100644
index 000000000000..bd6929ac12e2
--- /dev/null
+++ b/app-text/kding/files/kding-0.6-cmake.patch
@@ -0,0 +1,8 @@
+diff -Naur kding-0.6.orig/CMakeLists.txt kding-0.6/CMakeLists.txt
+--- kding-0.6.orig/CMakeLists.txt	2009-09-20 14:09:48.000000000 +0200
++++ kding-0.6/CMakeLists.txt	2016-05-26 19:03:47.146777630 +0200
+@@ -1,3 +1,4 @@
++cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)
+ project(kding)
+ 
+ find_package(KDE4 REQUIRED)
diff --git a/app-text/kding/files/kding-0.6-dtd.patch b/app-text/kding/files/kding-0.6-dtd.patch
new file mode 100644
index 000000000000..f039b40fd344
--- /dev/null
+++ b/app-text/kding/files/kding-0.6-dtd.patch
@@ -0,0 +1,20 @@
+http://bugs.gentoo.org/338466
+
+--- a/doc/de/index.docbook
++++ b/doc/de/index.docbook
+@@ -1,5 +1,5 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+-<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
++<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+     <!ENTITY kding "<application>KDing</application>">
+     <!ENTITY kappname "&kding;"><!-- Do *not* replace kappname-->
+     <!ENTITY % addindex "IGNORE">
+--- a/doc/en/index.docbook
++++ b/doc/en/index.docbook
+@@ -1,5 +1,5 @@
+ <?xml version="1.0" ?>
+-<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
++<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+     <!ENTITY kding "<application>KDing</application>">
+     <!ENTITY kappname "&kding;"><!-- Do *not* replace kappname-->
+     <!ENTITY % addindex "IGNORE">
diff --git a/app-text/kding/kding-0.6-r3.ebuild b/app-text/kding/kding-0.6-r3.ebuild
new file mode 100644
index 000000000000..3b3fa6c950f8
--- /dev/null
+++ b/app-text/kding/kding-0.6-r3.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="optional"
+KDE_LINGUAS="de"
+inherit kde4-base
+
+DESCRIPTION="KDE port of Ding, a dictionary lookup program"
+HOMEPAGE="http://www.rexi.org/software/kding/"
+SRC_URI="http://www.rexi.org/downloads/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="4"
+KEYWORDS="amd64 x86"
+IUSE="debug"
+
+DEPEND="media-libs/libpng:0"
+
+PATCHES=(
+	"${FILESDIR}/${P}-dtd.patch"
+	"${FILESDIR}/${P}-cmake.patch"
+)
+
+src_prepare() {
+	sed -e "/Encoding=UTF-8/d" \
+		-i resources/kding.desktop || die "fixing .desktop file failed"
+
+	kde4-base_src_prepare
+}
+
+src_install() {
+	kde4-base_src_install
+
+	# bug 510510
+	pngfix -q --out=out.png "${ED}/usr/share/icons/hicolor/22x22/apps/kding.png"
+	mv -f out.png "${ED}/usr/share/icons/hicolor/22x22/apps/kding.png" \
+	|| die "fixing broken png file failed"
+}
diff --git a/app-text/kding/metadata.xml b/app-text/kding/metadata.xml
new file mode 100644
index 000000000000..d12863250210
--- /dev/null
+++ b/app-text/kding/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>
+	<longdescription lang="en">
+		KDing is a KDE port of Ding, a dictionary lookup program. It is
+		a simple program sitting in KDE's system tray that can translate
+		the current clipboard content.
+	</longdescription>
+</pkgmetadata>
diff --git a/app-text/keepnote/Manifest b/app-text/keepnote/Manifest
new file mode 100644
index 000000000000..4b79b7fc1caa
--- /dev/null
+++ b/app-text/keepnote/Manifest
@@ -0,0 +1,6 @@
+AUX keepnote-0.7.8-desktopfile.patch 1195 SHA256 af30dbb7609df09993561436a46144e1c1c657eff99732e50de3a6b260be53e3 SHA512 f2b59d656573bd052fe2b26687338939ace7cfbbf71a0ef051c45b829662ccd601f08a406de87cbd37391dfe2743cda13b58bced26fa2186688289a008f8d1be WHIRLPOOL fc11c8aaa1dc7ad866d3bded6c89f245eeb4e680af04b4b84feabc637f5a9fd44bdfb7ba942dba4fd41bead1ee0f8fbe8b310174c95df2e0d1c4a2b8d16b9ef2
+DIST keepnote-0.7.9.tar.gz 786634 SHA256 a57f329867ab93eae156392fee7ab77a754c4fdde5bab986b74415c6932ff8dc SHA512 1d818fab1fea69b6369209dbaad403b2431352ba359d4f233ab412fd56a57e970b6b6adf63201811ce45faee471cf3521c6b4ccecc67f3befc727b2e77189ac5 WHIRLPOOL fd848310465a7d2ec664acd60c14eae0be62ed77a58682d8248c6a233e746a944e7ad6852804d035bb74b0b717e78095e81075e29ed3793133f6e35e20aa1316
+EBUILD keepnote-0.7.9-r2.ebuild 854 SHA256 0d3cb8752e9357704e8f4dcbefe4a66155d0ee9b840b7d59e107181dba8c9920 SHA512 f3c26859af94cae7c6dda7255f2d03d105dba5493e3a468b65617c062dbb9d5c23f651b11b0b6e68aba0b59da4a0b18edeae23b5f54e37d76db273fff48286ca WHIRLPOOL b18fd09c43d7df55bdf073eaf61fcb62d09084014fbfda5d59fbd5dc9992096b044844a92b8ed72ba055791197ea82cfddb4e3ad12ea34f8dfe737214472ca05
+MISC ChangeLog 2941 SHA256 1559b381375b252862c5ab49a7f096135c3a018765e40c21ac88a653f3eab4fc SHA512 e7cbdcd165accac368c406ca74cc388a09df4939b7a881350206077294646c48d0464b8f208a95f91f93401468d7bcf9918ca0dede2462c7cdbe2e529e52032b WHIRLPOOL 27e2dec07b46fa7e6e3bba91955841cd647043a046c1cfe129cc52254011ef166bd8c3bda2105989b6b2d305d22e15250d5160e930cd1445040957bbf25ede47
+MISC ChangeLog-2015 2245 SHA256 81deb9ee16b86d6042c75ff42972de0897e69014c47e5b5c12bd59882f24ad09 SHA512 a045d75c92305c5d3869df76b7f6cf774b868dc3ed677992a64c150d6f0a0c0c5076e97101868aabbb758c03d4aff46739b1c25a6eb53ebb9bc17b17dbbdb839 WHIRLPOOL 8b7ce78d619c717e059c38a356ee12e09e70bfbb66315bf6f5ef2251cfe0f1b12d05062ca27d3c9ccfee1042c46462e0872ff348eb97c349e7e57c298f077f60
+MISC metadata.xml 834 SHA256 d72a66845924f203755386d5d241c981bf049d9d349f432b2e2b5379acdc95ab SHA512 41a8b0ae71f525751e5d87cf86010b7433ce908ebc597ea45c8777a639c33564729ec838452c7dc7100a2d8f7b86a77497463fb1c1ec5209980d3b419cf51e79 WHIRLPOOL 94047d2da6906c71101fc6dc8e6636d0287d3edcda7983ad655aa726575ab09e59730663f715abe8e3105fd8886ce0b6113c51f1bf11a0df204188a94fe89367
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..79a462e8de3c
--- /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/Manifest b/app-text/krop/Manifest
new file mode 100644
index 000000000000..896e2e237f1d
--- /dev/null
+++ b/app-text/krop/Manifest
@@ -0,0 +1,7 @@
+DIST krop-0.4.11.tar.gz 35450 SHA256 5dc069afdad722e030037f7cc54bfd8b4ff3990c5600947722303053d2519d0f SHA512 785ac432f7e906ebee167791751b164a0ec30087caef0916bcd95494d7db310949aa4e44569ddaa181daca9c5834b743d3fdc64183093a41e23bb58cbe0d6cae WHIRLPOOL 5c09ddfb50055dc5a5a27e3f21bff1d1a8d7759e60cd488c54538438f83d43cb8254bf4fe0c633a9d7852a27906f3049e5a15c1d6e6ca025d161ac6de7fee778
+DIST krop-0.4.13.tar.gz 36654 SHA256 46aad911c6c5d46201e5e8c21b85bcbf6f1d8f5d9889e96e7bcab2cb6dd26966 SHA512 2d2af25124b45108715eb90344a5683adbda4c788bd419360b641e9f47553fe143a40205a44af9b3e4db6df4148b3328547e774f24b5c7c0fd23c9206e8a14b2 WHIRLPOOL 5d1e39a16e9e985ba7a78f1384578ff7d2dfc818218d02bdae06d694a833c3839e8373ef02f56abdded053bdde2d9d0c433bb8f227d2163953c0a17d222e1c53
+EBUILD krop-0.4.11.ebuild 609 SHA256 b664c79542807bd26d3e8ceda75078bb117f03d95e321d13bbb81324f8796080 SHA512 a0dd10fa9ede60ae319817da497cb5be4256e3fa2d6d98d1998f8f93fd88609ff31c80d8446d3757c501d338b48eb68008a63046667255a93583637010ec65b8 WHIRLPOOL 71049deb865d0d381c9a545ae642c3d0ffa83c2c9354ff75fb06f3105c9b15f54319facaf1271856f0f3b9e9a56e0b313a8a3692bb9a1e958c0cbc0fecb939bd
+EBUILD krop-0.4.13.ebuild 609 SHA256 b664c79542807bd26d3e8ceda75078bb117f03d95e321d13bbb81324f8796080 SHA512 a0dd10fa9ede60ae319817da497cb5be4256e3fa2d6d98d1998f8f93fd88609ff31c80d8446d3757c501d338b48eb68008a63046667255a93583637010ec65b8 WHIRLPOOL 71049deb865d0d381c9a545ae642c3d0ffa83c2c9354ff75fb06f3105c9b15f54319facaf1271856f0f3b9e9a56e0b313a8a3692bb9a1e958c0cbc0fecb939bd
+MISC ChangeLog 2786 SHA256 df49537fbea2f8c35bd0d3862d166db93388fdafd38bf80f05d42904d6c24811 SHA512 a2ea11268478dbbafea542fa9fe46d3621e922efd8d71f1a6a817b391745a07616a11eeae4db2f8b2fd3a4000b71473dcf0d253b709c7d3bffd812e29be35d8b WHIRLPOOL 4107017df23afcf88b7ff199a8ec63188046a7d4c37a41ffc75dcf1088b83ef1702ada3b209ba2ff5e69c5824bc9c81edfb56fc23f725e80f1da03cd53de8ba1
+MISC ChangeLog-2015 844 SHA256 a46cf3582bd1928b421de2c56b0aa42678017bc1f0a739056b123c0b079e41d9 SHA512 a2a92b700852f947375a35af4b3434490c0a781798107869c199ad86c04d6888d9757e00fb5543d9672e809faefb79fb53ff40a2683da3796efd31a02dca20a1 WHIRLPOOL bb34f7f0ab6537d7c025eac1b0d962d7a1a9ef4b2e837535dd38c7157705c8a59708995260c3f242b53d1aac57857ac2fbdc8a15b7d6b0bcae9f53111606cbd8
+MISC metadata.xml 333 SHA256 28ad31d41677f42c533c9a4777aadeb38889781ee284862b157dafa075aaaca4 SHA512 30ec13878bbe3b50c90f1849bbc5bf0f8dc05bf1b6a8f79695590f48c76618eef4666965b8130d1909db3c960a43d3149dba525017f342ce9635afc530b873f0 WHIRLPOOL bcd6a63dc74bb85f06e11d7629bafa0ed3674d5ead0b70bc073692b9163fef729c134b1646e432765f46e55112f55bdb62c88ab275c94faf92deb3722123551e
diff --git a/app-text/krop/krop-0.4.11.ebuild b/app-text/krop/krop-0.4.11.ebuild
new file mode 100644
index 000000000000..a4a95ac16ae7
--- /dev/null
+++ b/app-text/krop/krop-0.4.11.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit eutils distutils-r1
+
+DESCRIPTION="A tool to crop PDF files"
+HOMEPAGE="http://arminstraub.com/software/krop"
+SRC_URI="http://arminstraub.com/downloads/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-python/python-poppler-qt4[${PYTHON_USEDEP}]
+	dev-python/PyPDF2[${PYTHON_USEDEP}]
+	dev-python/PyQt4[${PYTHON_USEDEP}]"
+
+src_install() {
+	distutils-r1_src_install
+	domenu "${WORKDIR}/${P}/${PN}.desktop"
+}
diff --git a/app-text/krop/krop-0.4.13.ebuild b/app-text/krop/krop-0.4.13.ebuild
new file mode 100644
index 000000000000..a4a95ac16ae7
--- /dev/null
+++ b/app-text/krop/krop-0.4.13.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit eutils distutils-r1
+
+DESCRIPTION="A tool to crop PDF files"
+HOMEPAGE="http://arminstraub.com/software/krop"
+SRC_URI="http://arminstraub.com/downloads/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-python/python-poppler-qt4[${PYTHON_USEDEP}]
+	dev-python/PyPDF2[${PYTHON_USEDEP}]
+	dev-python/PyQt4[${PYTHON_USEDEP}]"
+
+src_install() {
+	distutils-r1_src_install
+	domenu "${WORKDIR}/${P}/${PN}.desktop"
+}
diff --git a/app-text/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/Manifest b/app-text/landslide/Manifest
new file mode 100644
index 000000000000..e5af23f8db92
--- /dev/null
+++ b/app-text/landslide/Manifest
@@ -0,0 +1,5 @@
+DIST landslide-1.1.3.tar.gz 151003 SHA256 5b0d7c204fef6b06c0997c02c9cb4096b1e7c80fdb548e4ceea9f3b6fa11530f SHA512 2b29c416f8af04c0bf048060e0fe67b0b6a5e293485c5e3f68b9d1ce9d63ef66ca3bc58a96f65705c6918542932ef0a2fa6072b17c4c01cfc1975d283b417152 WHIRLPOOL 1e56326958f41b10e32168fe4b22bf9c383b626c30e58559769c05cf515d3d3395c71ded5acd7f6c49277b5e33ae479cd4fbd570b0cc6a5be32f92c3ff361416
+EBUILD landslide-1.1.3.ebuild 817 SHA256 eec69d19e79ecfc941769054adbd8906c8efd3f802973210bbaaceeb0193cff0 SHA512 216fdf069c2d726f729efcde3fe53ca50533fb5c8c3a0cdc3dae16832acfbca7ae03d4779c248c603b769a66a861c502b5f2fc36300cef7ccb5be04c82a788b6 WHIRLPOOL 2eeb96fcc97279b09e5b2b224a541697d2224ed84f4a7ad774b10edd0bbf143a0037a3728cc64dbda4034c52937b8b7a497dd83c43bd07e4d1f5d5899cd54112
+MISC ChangeLog 2744 SHA256 274c35b2bf220acc31610df8019e5e4517c2809b4745ed63314fc5369d4634f9 SHA512 9e0800c4a08d18c359ab3b3dc4ce8b99f277e517e0b92c8ef9905e18587b04a75222c0b551318ceae5e4569be8f4643f666e4c7b7d5ad92e593c220657d1921e WHIRLPOOL 058849ce73dc090622d9d402d75f79cb5197ee2e0268e924da9f6cff23730a2f13622a7a3370e591ec11e9e249c96f18d802c9d2e3863954445d6c2584aabc56
+MISC ChangeLog-2015 1378 SHA256 c39a41d7dd630b021a3ecfdeaeb66163f318ef0ff281480b3768c9c8580967c6 SHA512 d4dfa656bafc422b8510500261d3f0931dba170402847b2f119ffeabf4c63c85542e127254d22d9ddf917df040488c6689c9dc2735150723ee5dcb570b23d004 WHIRLPOOL 2b1fde466df6f900d25f416b7d5f7d51fed086e7ef824ed436b889f11b9ac4043c0b87e87a2f55915efcccdc55caf81356f19666a6c9c5147061ec57273209cd
+MISC metadata.xml 298 SHA256 762ba24174069556d5ca834806ba50db57680cdae14a498f9920c3a50a8299d3 SHA512 19a5bf1f42b94a00856b856fc0120024df40a4394a17e61fdacc817d1b355b601595a27cc0f814d3f6b436775799b44aa4f5090daa91452b55d4760e8c89b8d0 WHIRLPOOL d49493620d075fedf89a8b3b9bfb2039ad42515c1210f8a1cd190cd7a32c4e2e1d05e2d6da198aa2c12fdecfb391e5fa19fa4b1836f56e4b548e9b115ab3d716
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..686014a4ffdd
--- /dev/null
+++ b/app-text/landslide/landslide-1.1.3.ebuild
@@ -0,0 +1,31 @@
+# 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 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/Manifest b/app-text/languagetool/Manifest
new file mode 100644
index 000000000000..7966c00f1be7
--- /dev/null
+++ b/app-text/languagetool/Manifest
@@ -0,0 +1,4 @@
+DIST LanguageTool-3.5.zip 93540212 SHA256 643029da89041ccfb48772deaf0dd0e16942de2d381c5dc8ae9372f1b043bcab SHA512 ad49dd292ca6841e1ef439b2dbe55748f621333b418bd6a596534cd5b2cb7019170c98046c8e2c68c3d75a9e5d132cf329de6481eaaccb8f78aae2233bdb8e45 WHIRLPOOL d518d0eaee5447115f09dfac0071462d9a2c51e3327da7f9500a251571fb9186920f9c68eb008f151bc8db173ad22a4068b4953165d1219f05e6857fe8554369
+EBUILD languagetool-3.5-r1.ebuild 1401 SHA256 960981b9bdc783b489a1d2acaea5bcc28684a60436b7921927c54233d70770f2 SHA512 06017178133ce4deb304287cbb7529a0bf3ec26a606042e8b6db80c5a2a6641c2caa9b4196069fc60d0d03a4010f57b41634d9e25b36fdc2bcb4a6cfde190c83 WHIRLPOOL 906ebbe821b1107badc863e1d53af21340527ca354b54a2fc825925c00a767131e435275e5b9395c1a7c6961304870299f0e60502d6f2ceb45cd6d99b32b078d
+MISC ChangeLog 1508 SHA256 883ecbbc944a1a77dc5534ea300e184b77938d38a7119c68237c9a6259e69dc1 SHA512 ed2a9af8491d7f9d780369ede3db5bee121d81a0a7f64e0204bdece919a13fcae076166f537cf045de09058dd5214a857a2d88b545abf436e0b64e95e3882de6 WHIRLPOOL a5476d6578b5e8e5d48009a825415305aea8f963d0144a351b0b1530076282ce2c3eb91129953a50b9d494423209489c0be16a42325d2a1c7e0bac8972243e9c
+MISC metadata.xml 255 SHA256 fa2495381a46939e915222bc4f5e8c1e704f336ca63c064a2a63090c79b0e5ff SHA512 305ae93d2bb3da79ee181cf36bb0ca2bbac016c20555967d7281cd5c0edfc26c1450dacd7a7de57078650dab0e815be9169c0b25a24d71488185f71ae8834167 WHIRLPOOL 0e543ebc68a9501374d42528b31fc9d94ab416939eefc6cc37dcf033d0ecd85397ec58ab67e02d6a08b2f4c0048891d441a2b217075e4596ffc25d5b12cc8ec8
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..db1fe9570a30
--- /dev/null
+++ b/app-text/languagetool/languagetool-3.5-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2016 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="http://www.languagetool.org/"
+SRC_URI="http://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/Manifest b/app-text/lcdf-typetools/Manifest
new file mode 100644
index 000000000000..25e8d0ecd20f
--- /dev/null
+++ b/app-text/lcdf-typetools/Manifest
@@ -0,0 +1,5 @@
+DIST lcdf-typetools-2.106.tar.gz 643503 SHA256 503c3869f73a392ae0ba41e0fc4f7672e70e2d66e8a81f3bb183f495183fa967 SHA512 039215132585214e6518864161885f7a06f08f8b36b002a961b1d83182e388b31eb034eaa4466ba56a2af52e1cfb202e88f004be17c22df1343f94481e3114cf WHIRLPOOL 6ec074348f3a1f17d06b7f70f5b170d70b63055d81556ba8c2c14c50e7be4f0070f3ad685a1624a8e10a78db931cd798f7656a08b7fa0c324d663f4d0fcfad51
+EBUILD lcdf-typetools-2.106.ebuild 890 SHA256 52fc70dc15faeb9a1b7e7bdfeb50c8c78f07b6116207f2d3066addc45d751977 SHA512 7775bda480cbbcb9a19575a10fd5b5e9081ccb3aa0e4a9419782662caf4926e2c4ff3498671232c6fd476c2d5a1f4cbdacd33b8626358700e9316b951d2fbe23 WHIRLPOOL 3970b400e067ee11f533d0ad1d8b2416c07732d028e5f3de33a5324ba80b434bd5fc6825cc6332f15aa3d7cc2a5e673f3949459bc16a9ae8c17b213327a95439
+MISC ChangeLog 4177 SHA256 c87d6c2360605d350f2bc1e0410b8e80e354809d2827c6ea57aef368ef454853 SHA512 8ecc0636a9b8003d3a54b717b49cc4cf276c4c33804ccb4cd969c3cc513afeb654af7230b1e6c6705253b1951865263cf7d712a4f4a1b1a47390c09ea55fff4b WHIRLPOOL cec119c11f08f07d89e270fb621318bd7add47b979e8ec8c0ee521e23957cfb3d2e8a521cf5f989cdd831d2974a222cc903672c3ae0aa81791d803476ef18df3
+MISC ChangeLog-2015 13461 SHA256 e7812f14ec13e571fb977343ade6d1c2b5409f00776f0d38ad70835a5ff1ebbb SHA512 e11173f902c7eee7e8d5c929dd527e70860a8c875e26690b520df753f6278e598bd78fe8bf13240c143ce85c1099eab68c7a7c842b64cef799993bca7f6de87f WHIRLPOOL 7c9f44d7f663c01e69d1ce1e7be844b96df8af13c47d73326be9d25a2c7157a13a3302dafe613928405cc33063bf68514d2e014e23794b37097e75613cc960ab
+MISC metadata.xml 794 SHA256 9518aea3f3c6b016f19854f7b1b9a478443b2b5157ac1b657d6d97c227dc703a SHA512 9ae4e29814e34012d731aacc0a8b4a38649c95a988049f3fc10c7f260cb6ebcc57caa0a93d21eb8e66e64207673842ab7ab2fb71792ed3d537b7eca891609cba WHIRLPOOL d98330ba84752f17aa838470d66edc634cf8f89e4594d65dedd2b9eda84be7c40a6441c04d269c3f688ffc4fdfcf713b6e699b7ab3d46a81858cebcaae6a8628
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/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/Manifest b/app-text/lesspipe/Manifest
new file mode 100644
index 000000000000..9c77bb021a6a
--- /dev/null
+++ b/app-text/lesspipe/Manifest
@@ -0,0 +1,4 @@
+DIST lesspipe-1.83.tar.gz 115129 SHA256 d616f0d51852e60fb0d0801eec9c31b10e0acc6fdfdc62ec46ef7bfd60ce675e SHA512 c6418ac2bfc2dee9d32d56b0ea4a94954b1431db54fef8b67a9cf7d961cf4a23d87b2f41b2a4560d2333029c6d4ed5c6f399cb635f857bd43f1603993b5cb55d WHIRLPOOL 4ff4baac25c768a4177d71a82f766b326cff6840e0032d6b9125506de38ff20264b71c765cb08777adda9e9f24e18e33e452667be8e7a94f7fef062f1d6f019f
+EBUILD lesspipe-1.83.ebuild 1161 SHA256 9ade675aaa4337be94dc34bc8af9cca8124a8fbbb0724d31837e710489627cd5 SHA512 0e14c9d4744af386c1f575874fcb0fbc12d405456c210b55240032f330f6626953c1ea7a361f24a154a377e6bf9837fb04cb3367d3bdd655ae5d3b377b4679e4 WHIRLPOOL c3114b8c528dec3604c20af95934ac8d1b7f3baede2efc359195900d3b11d2bd666738b0ddb15bca84f80b87cecb5d2d839e4e99cf325d84dc2e101beaee0d14
+MISC ChangeLog 379 SHA256 5b9744ac3446c67febdbf8f9f71388d6c5cb8c7aa4bc27da4474939b3724a8ba SHA512 8f4ea82e6b15ca4289f2efbe6c0d1329dc0cd208a566c07ffaf2b97547b4d1d65fc6d5f5b8efef3d102732964d764c494a883ca4c334c31c7fb7cf2d79c3d166 WHIRLPOOL 60229df4aa2e3561b37347d08959d266f9582624e92943a1da56c30eede83edead639bd5b60a53fea3c1615bfc4ce458e623d9f1a2eaa5dbefa54c91ee4047c8
+MISC metadata.xml 303 SHA256 de8626350ef7a3645b1c23c4d372e6757a1828e6e8d53ffa2e7b5046ddc95735 SHA512 efdd1963073db285de7f83ff804fdc98876846cb011fa0c8aa65f9b3c1dd6b7cdb039ca6a7a03018edfdff930f817208bb29601bb0c5571fc16d637615e0c7b7 WHIRLPOOL 9ad464bec6ae95b2f2dc5f675dace1a5bcec9bd8a59b1b5ecf0d73c9b26f23583531bbe5ce0f28e59c152928ae4fb7db1afd819d7fffb3b940945cc0447c6354
diff --git a/app-text/lesspipe/lesspipe-1.83.ebuild b/app-text/lesspipe/lesspipe-1.83.ebuild
new file mode 100644
index 000000000000..a3dc8e985281
--- /dev/null
+++ b/app-text/lesspipe/lesspipe-1.83.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 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 ~sparc-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/Manifest b/app-text/letterize/Manifest
new file mode 100644
index 000000000000..02984dc4e74a
--- /dev/null
+++ b/app-text/letterize/Manifest
@@ -0,0 +1,7 @@
+DIST letterize-1.3.tar.gz 7772 SHA256 bd86e477770c7df04e12cd7612c1e2e3f2ac97835bfe64ca954c99bf2a47c644 SHA512 481caa2ecd487e7950faa87e1468887fbc4b3964d02ea86394489834bc6368bad590c54744d08cfa00b34b05ebab094f24a0b84ea91af4ab8e56455c6615bdb8 WHIRLPOOL 141f774c2454c3643c25f8c8025b048f7a1c57c4641d8398b45dabd4b6262011f551593946828a22af6a5d4917d51797678729680b36c63e115c056b5dac8d3b
+DIST letterize-1.4.tar.gz 7464 SHA256 310e8b824434a942950cd6aee08f87d07eb0725952c7e399eb798c4bc009ed61 SHA512 7e57c6ebe8c5a1bfa16e6cf3f1b01f7e27127c32a1ea373a5221d807d5926b7064153c16c0081a83fec64bdb72379fc18540dedb639d7ec3cf318747438e414a WHIRLPOOL 413ded2bfac993d0da30efc77df593d1dd560499e70120627ecce4a260081b5c91c0c68f9d7af7c3d27b632c426bbb89b66c3b7c7353ac771300b1fec51eb6b5
+EBUILD letterize-1.3.ebuild 475 SHA256 0b5cc85b0a6c239fcb58036b881618ac135abbd4c4cf037a70a64fd3c850ec82 SHA512 6213b60190c5fe89e1eef50963a521bf072ea4cf3d48dab8dfe8c27dede1237118c83dffb37e610153a8c17d2337b2082d22eeb4d76810f82ff45531be35533f WHIRLPOOL d5110fe8deccdf38dd1f67d68fad5ba4bd424390a12c436e266f480ed38f87710feaf3bef01d6896443880bde9a19f242f469d4308217c1db16b4a779766b628
+EBUILD letterize-1.4.ebuild 475 SHA256 3d8f69e85fc768bb8eaf651b34d850abc24c90fce27b8b0077adf65e7ec3d8e1 SHA512 7a39848329399dbaec5ebabf56dd70b227fd9d4ec39b9927f913ca44895a8c392c6632f2a0a66fb49090ffee8c8368fe298e0fa1c65d2a280ff1ba310921e9e9 WHIRLPOOL c7c8a53d71379385f6515b15d58ca7c1150c327572190836ee90a3726bde9d14face008a3c9b9a398e69644d5b1b126c7d050e1637c30b19a9075f1cab18df75
+MISC ChangeLog 2638 SHA256 39fb9947a72991d9984f5009c13bf4bee157796cf9348aead04099d35ff60ea6 SHA512 a45617633538ea864355196ee2a5b2ea8d36be1253e8d98a6c1faed7d18016fa8661a69b342cbdad1b7eadb02139b500c9ccc65356f4436571a21b3ac4c78973 WHIRLPOOL 4392117edd855dc0a9e87c124a81ed06206e561840a8fc49466a2396ba23746fa6699c5588ae58791e4da698f8a3c30cd6af3abdd9882cd4a3b470832152802b
+MISC ChangeLog-2015 1056 SHA256 0d4293f8a81cdf12d5cf81653b4144c899f7935e33835cc1666d9c5009a4ab47 SHA512 84c4af86c182ff68a8f0a793c4462b3cd2a218b6d2b382104a7ac4cd157c1693bde304eec55f7e03d7113d23d472ef336a3546324578ed8cb8919dfa4b041196 WHIRLPOOL 731085d07e618a610ab4cb6cd96a42b863d313e7f1c530d8b7ace2978b9eb3298caf7517a32c3767a6f1c654a35846d9712c76c8df7ae440fef22a6429eb9871
+MISC metadata.xml 245 SHA256 b3de478821488be2cdc91b078e21c911dc384af882c5c44631a47dfa91516dc8 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690 WHIRLPOOL 701a78fc2214f5fd4bd781477f85e87e716b8d76ea831a0fa4afc8871c4286cc363679f1ff4f844555ad4f77cc7265208b83e805f56c22fc4baeed1062280c08
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/Manifest b/app-text/libabw/Manifest
new file mode 100644
index 000000000000..1f716d71ae10
--- /dev/null
+++ b/app-text/libabw/Manifest
@@ -0,0 +1,8 @@
+AUX libabw-0.1.1-boost-1.59.patch 1077 SHA256 57da19d649ebba0ca57d89a6ec935d8c7663dc5f9070178bade9a414f0d3ac33 SHA512 436c8a855a8cdac0eeb24d7e6b7d7aeb2ca804402b6a70f793b654c2ff0d830a1b769db489f5c6f3650c5b65ea5cb8c62f4875b565f3f6cb9824b8f7d11e28da WHIRLPOOL 2afc37e8659351997060042ea5d2c117464e83bcc615c9f3e9b7ec682c49ac38eb1bf899fb6952720758769cad34b3bb54b7b3aefb214f78315db47ba5ad015a
+AUX libabw-0.1.1-dereference-before-null-check.patch 989 SHA256 bb584ed1b90f96d12e4d7b65405e7b5fdbe8920e79d05fb83d96bbb991e205a4 SHA512 a9b3e07d4ca41579a44c0953e2934f9e8e4abbc5c42c50a71f64c5a665f6b2b35e93facd4822546342f349b78f19d9203598818fce3f19833c9c6bd4e3c5b694 WHIRLPOOL 33e9f4b6782838500400b6afc55edcc85eb2a46bd320d813419e5b047acd87c23366166dce6c931b1e44888eb7874d6c87aa325eef7315d08b28f12c87e81d41
+AUX libabw-0.1.1-do-not-let-AbiDocument_parse-throw.patch 1308 SHA256 e576a9e8e9071be0cb2b203ca92f4fcf8c0a82c4c0ed7a59225c8e647ace86a8 SHA512 1bd8c97e171b489e4c183a73452a0fb33e98bb3dfb184dc9abc4989ab9f43ee43ee09ee319f6f1291b4141f759f2495b7a5b65c86b8d0f9bdcb0fc50a23fd242 WHIRLPOOL 7f27b0f776479ded9c84ad95157f9b10abebb02a620756d83f50329889060e6aeaa0b5e18e878b565cebb9ddaa21cf297994d754fcdd81b479d76636520d2a7c
+DIST libabw-0.1.1.tar.xz 287628 SHA256 cfc698c2dd4ab592138a941ae26e2e18c3dac69bc196b5167df7f5eb88fc217e SHA512 853dd86ecc79e8590d3163e05e145ad66240ae3cf12d206d021775a94bfb33d70aa5acdcdd193ac747baeae1ba0eed18099ea6f4515be23bdd70b431e96c4b1a WHIRLPOOL 4672c825279b20b1df92d52950eba6344d4ca99711f050069e35503b995f05fafe597706f6587d08409af3f59a64717da365e2e6101ce23665819f25ce4da9f7
+EBUILD libabw-0.1.1.ebuild 1000 SHA256 3724886f759293373d1f5064ec5dedf7e9ee45b2c50d2e25ed3893b1ff5e30f3 SHA512 b74c609ab5c4a31af35a037f0cb83f054041f8dfdde00b4bca2b142442a110c35aae886f637df56b3edc3fb408183b6e01439971d09fd18cd10245d21127560c WHIRLPOOL e3cbed6c79d6a75bc1ee7b1d83e86691d1dd754613905b828fdd6862d38a64a17122ab49150c6151608138f58c6bf76ac59d44937d1bbe26735cf9f84a03ce0f
+MISC ChangeLog 4276 SHA256 4f528d97bc4c6d46a5ffc1e0a7f325647de57b0108e36662c97091016e0e01e0 SHA512 be5cc08438df1ec1e8eb509ad27687e2ea7c04a1b3f7516117a690ebac817cfaf43217b69deb448b659e4e7920f2752d03a6ffc41f478ec17a7d4b5bbf40b5ea WHIRLPOOL b0e0e65c275ed69bd21953e0859f4ff0c6c4987660c5390fa7a0f21713c00a0e48864ddf3a0a3a190a9d82db1d5c00c68fb95f2ee46bc40af962e02a42f98a3f
+MISC ChangeLog-2015 1563 SHA256 2d1abf16adc46cb886030a3aa3feae020561fa6e1c7190640db9c6907cceca1c SHA512 b65da53e61e0e8f4bf1b61b36077444fd4547cbc77822adbecfb9dc673d770e9330c4777451469142bf3643ff8bc43378ff15e3516077f7b29bcc23a2b040a45 WHIRLPOOL 43abb12d6a02ca246e5ff61e30eb10893ab86ad05626008f343aa90aa3cfcafe54d12fa583ba93805fb00bce4dff253dfab6a91649a4f78eea32ab7cabb86288
+MISC metadata.xml 255 SHA256 34d028c790cfe86c47c5c3dcf8655fcefc3e23ff52fed38a400ce42d678c8c5e SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3 WHIRLPOOL 87f7199996948fe95e5417f8da0c4c90cd51a68f246ac8ae87a2e2a31c11c709f220d664eb893b34692577415e5f5eb351dd7e310dbc59f508fa40c7edb8ceeb
diff --git a/app-text/libabw/files/libabw-0.1.1-boost-1.59.patch b/app-text/libabw/files/libabw-0.1.1-boost-1.59.patch
new file mode 100644
index 000000000000..f2e745a44d20
--- /dev/null
+++ b/app-text/libabw/files/libabw-0.1.1-boost-1.59.patch
@@ -0,0 +1,22 @@
+From: David Tardon <dtardon@redhat.com>
+Date: Sun, 30 Aug 2015 06:05:31 +0000 (+0200)
+Subject: fix build with boost 1.59
+X-Git-Url: https://gerrit.libreoffice.org/gitweb?p=libabw.git;a=commitdiff_plain;h=ee2d0729315888d1847587ad556470d2fdc883a7;hp=7ea0b5530cf321cd80231b84421e4c107d1cc479
+
+fix build with boost 1.59
+
+Change-Id: I5645629526a8d9d896e4faeb2c7b9ea88540fd23
+---
+
+diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
+index 5766f39..d12d8e2 100644
+--- a/src/lib/Makefile.am
++++ b/src/lib/Makefile.am
+@@ -26,6 +26,7 @@ generated_files = \
+ 	$(top_builddir)/src/lib/tokens.h \
+ 	$(top_builddir)/src/lib/tokenhash.h
+ 
++libabw_@ABW_MAJOR_VERSION@_@ABW_MINOR_VERSION@_la_CPPFLAGS = -DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED
+ libabw_@ABW_MAJOR_VERSION@_@ABW_MINOR_VERSION@_la_LIBADD  = $(REVENGE_LIBS) $(LIBXML_LIBS) $(ZLIB_LIBS) @LIBABW_WIN32_RESOURCE@
+ libabw_@ABW_MAJOR_VERSION@_@ABW_MINOR_VERSION@_la_DEPENDENCIES = @LIBABW_WIN32_RESOURCE@
+ libabw_@ABW_MAJOR_VERSION@_@ABW_MINOR_VERSION@_la_LDFLAGS = $(version_info) -export-dynamic $(no_undefined)
diff --git a/app-text/libabw/files/libabw-0.1.1-dereference-before-null-check.patch b/app-text/libabw/files/libabw-0.1.1-dereference-before-null-check.patch
new file mode 100644
index 000000000000..1df274afbe8f
--- /dev/null
+++ b/app-text/libabw/files/libabw-0.1.1-dereference-before-null-check.patch
@@ -0,0 +1,27 @@
+From: David Tardon <dtardon@redhat.com>
+Date: Sat, 20 Dec 2014 17:35:36 +0000 (+0100)
+Subject: coverity#1259904 dereference before null check
+X-Git-Url: https://gerrit.libreoffice.org/gitweb?p=libabw.git;a=commitdiff_plain;h=a65eb81c5e9d9da0548eb9066f9dde77a7328cc3
+
+coverity#1259904 dereference before null check
+
+Change-Id: If53074b31a821b0764acc9e9f1b0f9d7894e2e5e
+---
+
+diff --git a/src/lib/ABWParser.cpp b/src/lib/ABWParser.cpp
+index cf914bf..426ab54 100644
+--- a/src/lib/ABWParser.cpp
++++ b/src/lib/ABWParser.cpp
+@@ -338,9 +338,11 @@ void libabw::ABWParser::readAbiword(xmlTextReaderPtr reader)
+ void libabw::ABWParser::readM(xmlTextReaderPtr reader)
+ {
+   xmlChar *const key = xmlTextReaderGetAttribute(reader, BAD_CAST("key"));
+-  m_state->m_currentMetadataKey = reinterpret_cast<const char *>(key);
+   if (key)
++  {
++    m_state->m_currentMetadataKey = reinterpret_cast<const char *>(key);
+     xmlFree(key);
++  }
+ }
+ 
+ void libabw::ABWParser::readHistory(xmlTextReaderPtr reader)
diff --git a/app-text/libabw/files/libabw-0.1.1-do-not-let-AbiDocument_parse-throw.patch b/app-text/libabw/files/libabw-0.1.1-do-not-let-AbiDocument_parse-throw.patch
new file mode 100644
index 000000000000..4854072bc8a0
--- /dev/null
+++ b/app-text/libabw/files/libabw-0.1.1-do-not-let-AbiDocument_parse-throw.patch
@@ -0,0 +1,35 @@
+From: David Tardon <dtardon@redhat.com>
+Date: Sat, 20 Dec 2014 17:40:45 +0000 (+0100)
+Subject: coverity#1259905 do not let AbiDocument::parse throw
+X-Git-Url: https://gerrit.libreoffice.org/gitweb?p=libabw.git;a=commitdiff_plain;h=2f372e8adf8e6b1f8cf70f08adddcf66be54d94a
+
+coverity#1259905 do not let AbiDocument::parse throw
+
+This also fixes coverity#1259906 and coverity#1259907 .
+
+Change-Id: I55d892517ac93ca43478d51d8e4a20c704ff6790
+---
+
+diff --git a/src/lib/AbiDocument.cpp b/src/lib/AbiDocument.cpp
+index b8ab661..23ff750 100644
+--- a/src/lib/AbiDocument.cpp
++++ b/src/lib/AbiDocument.cpp
+@@ -110,7 +110,7 @@ is not protected
+ \return A value that indicates whether the conversion was successful and in case it
+ was not, it indicates the reason of the error
+ */
+-ABWAPI bool libabw::AbiDocument::parse(librevenge::RVNGInputStream *input, librevenge::RVNGTextInterface *textInterface)
++ABWAPI bool libabw::AbiDocument::parse(librevenge::RVNGInputStream *input, librevenge::RVNGTextInterface *textInterface) try
+ {
+   ABW_DEBUG_MSG(("AbiDocument::parse\n"));
+   if (!input)
+@@ -122,4 +122,9 @@ ABWAPI bool libabw::AbiDocument::parse(librevenge::RVNGInputStream *input, libre
+     return true;
+   return false;
+ }
++catch (...)
++{
++  return false;
++}
++
+ /* vim:set shiftwidth=2 softtabstop=2 expandtab: */
diff --git a/app-text/libabw/libabw-0.1.1.ebuild b/app-text/libabw/libabw-0.1.1.ebuild
new file mode 100644
index 000000000000..c98a1ac1d581
--- /dev/null
+++ b/app-text/libabw/libabw-0.1.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="Library parsing abiword documents"
+HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/${PN}"
+SRC_URI="http://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 )
+"
+
+PATCHES=(
+	# from git master
+	"${FILESDIR}/${PN}-0.1.1-dereference-before-null-check.patch"
+	"${FILESDIR}/${PN}-0.1.1-do-not-let-AbiDocument_parse-throw.patch"
+	"${FILESDIR}/${PN}-0.1.1-boost-1.59.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-werror \
+		$(use_with doc docs) \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/app-text/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/Manifest b/app-text/libebook/Manifest
new file mode 100644
index 000000000000..26e348320d81
--- /dev/null
+++ b/app-text/libebook/Manifest
@@ -0,0 +1,7 @@
+AUX libebook-0.1.2-boost-1.59-makefile.patch 335 SHA256 37220b3816187d3148c4dcc9ff6b126be6647b3aa57a1bf14665e583002085a6 SHA512 fe435d531d0b4646d8642dfa471352519e3e606b31c3fe727ebbd1ebecdeef58663aadbd7ae95ac902055074b550b659c7eb5cc981a078315462da9a892abe43 WHIRLPOOL 8ad328c223802fcba88b1a4daac19e1f8ffc6930fd32d3ae0233fea3c4538b924150ad054d696f93123e4fecb78374701bf8807863ecd7394683083ec9ee6a5d
+AUX libebook-0.1.2-tests.patch 784 SHA256 d57cf762cffac8eca76b278332ae57fc1b060fd0cdb70aff1fd492560573ef38 SHA512 e176746ed85e0564332b7ed6e375f0869931e7f489d734dc1ecbd685af595ce1247f933a82736c239df322d57505c40cd23af434db711b8087ee77e26de2c1ad WHIRLPOOL b436b7efaf3d43ca494a890a773139280788aa0cca1cda71e27623455e0f121a7f561b6c4cc392538e58209c1cf7c7192613e0a6a01139100ca9558bd176ec03
+DIST libe-book-0.1.2.tar.bz2 465922 SHA256 b710a57c633205b933015474d0ac0862253d1c52114d535dd09b20939a0d1850 SHA512 82982874f9c0f5e400166e9367a4b6017cf11bbd69e2e79240137385a5d68ddea08f13676f8c5d0e983f441de17cda9f4b5f7c90c5cb3515e319de638edf3a38 WHIRLPOOL 068e8ed47ea5ad231c47d8848157db6c0bdd03425f87f181c2b3ce23c8006a9d7e6848d9dee960d3ad0fd5dbc24f8e7a4d15249056a0ae58debbb653d10a8228
+EBUILD libebook-0.1.2-r1.ebuild 1022 SHA256 dfb78ed97be56a4dcb747a427ee17ca196d68bb946b033152ab45fc22c7686b2 SHA512 6532e18f8add0ec7405877df28901bfda5e9c62d2e121d12f0a952812bc28c911dd1dce03111c1d7fd6ada9c70dfb67bd46a7c486510cb04dbfe51990133b6fb WHIRLPOOL c541c97151e393fcef0b2279817c43d45e5a522b9ccaf36c1caad1afb41b0fc5e602c4246405a064e7803a454402c937376bb6c18109763565930293c6307ea7
+MISC ChangeLog 3846 SHA256 c081f18240b0cf40c80712ab591cea0b1cce2b028748563178cd23df5a0a0bea SHA512 abed11bee4f32fbd0e4fe136ae11e9e54b8280850a45b487daacbd48a64870377f1d382454c2023e7a5072945310e07313ef297bbcea3b6e54844c1a69b3ab67 WHIRLPOOL 6019e40f4fc48477eb419aa0a37953dd4b312fa2f01a957492be9c34a31d1393ff63e8abb26f4581429672a6e8bf3c6aa6260a3c6c7bd27fcd1813869fcea43f
+MISC ChangeLog-2015 1690 SHA256 4638521243736b69681fb65f65199aa43493885c908ef5c871c9b5fed12b3e63 SHA512 f3392683e4424553ab7ed27fdc1338bb69ab8dcf4591f9490bff97902a102a1ea5abb6290adfdb1a004dd84e26b61eac6551d15e9b774186117bca84a4c2ea4d WHIRLPOOL 85175b19fb57765484ecf9a472ba270f0cb1c577be1609a5fca086d7893d9ee9fe1cb28a49630c50870ac70a5d965f0ad04d7708e130d9e84486a554706fa111
+MISC metadata.xml 404 SHA256 78d0db7664597969309b877588ff861f3b50f5d4cc3fb2b2b803b2b2b1e86114 SHA512 8e0679b60d1fd56fcb165fd7b5a8e1367f4ee472d7a58e157e6bb1445b502b1fee56b18d099837dcabaa35f7b18f52515cbb51f7bfe9c4c2a824210e4003a275 WHIRLPOOL bc437183142cbb27819aa0088f6f0ffd7b240cf77e0e6faae7429ab92c9fd47b50ecd1e39aac64d7b80743497c89497a3b7d1385b3105ba7a9d65fd66a72d752
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..53975fc2cc1e
--- /dev/null
+++ b/app-text/libebook/libebook-0.1.2-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN="libe-book"
+MY_P="${MY_PN}-${PV}"
+
+inherit autotools
+
+DESCRIPTION="Library parsing various ebook formats"
+HOMEPAGE="http://www.sourceforge.net/projects/libebook/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 x86"
+IUSE="doc test tools"
+
+RDEPEND="
+	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() {
+	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/libetonyek/Manifest b/app-text/libetonyek/Manifest
new file mode 100644
index 000000000000..ce8582963e0f
--- /dev/null
+++ b/app-text/libetonyek/Manifest
@@ -0,0 +1,8 @@
+AUX libetonyek-0.1.6-drop-test.patch 1105 SHA256 050d1c99de0f5564ef8f05fe7e50bb1fce99b79ad3cb90e8da4777246967e099 SHA512 a4d53634fe5fea85120773b609aa901f164a3a93a0ead44f25fbde433470c22a6956744a3b35683bacdf1d55f99f63da47a0dcc39c78f02d537eb8a4883cec5e WHIRLPOOL c37d20925d1c149520fe3e0ca0b7389b89b775ae1d2fac28050881968ed747f77935d23649bb5c7dc080cf86f26a95f57c21e25d1dbf02834ed418bc73e46187
+AUX libetonyek-0.1.6-mdds-1.2.patch 1170 SHA256 d2956ab771787d88bec86221fa2fddb5219cb9ac1d64d82711bccc5b33abba8b SHA512 4432fda977bbb0d4b1a5e163d4ff18372717aa93a12775117880b04daeb695e64ec69d3e577caef09fdeb133237a868c8afaece9b60fb4511efb55032469137f WHIRLPOOL 5919d6e09a8294b8f5afc2ba8838cf08d32a27291f4f4bf33778839c8e81d46040090da5060940f3384e6652d06306cd5ebabae4529a28440653c29ea3e8d8a0
+DIST libetonyek-0.1.6.tar.xz 1243364 SHA256 df54271492070fbcc6aad9f81ca89658b25dd106cc4ab6b04b067b7a43dcc078 SHA512 10ae0403d98f33b27be4c3c905dec3df48cc01ce438f8760298edeadb76dd74da997edbd7dc03635fbc168b318bfe6e130f2306f495dfbf4135dd6dfcccabb4e WHIRLPOOL 932704f1d8bb1269e6be8e3fd7bd64af01ba0f098272befc747da9a4bd225bb201542bebf31d6e6338e613835fca4d7c6e2c1454df4ed764af30459393b6d73b
+EBUILD libetonyek-0.1.6.ebuild 1505 SHA256 5d442a601cf146b06ec3b4e3e2af63db39b184f7ca884254bf117349201e651d SHA512 2576240fc405e4ab26bf2c80c5dca3ea3723010f5a9b9052aea06f12c6073894dc57522432fa3f540379a89e267f8ebd7af6d41d3892ea0629a63691b404e60d WHIRLPOOL 8a05d9fec7ea894765218e711a8af2628078d4b061a3ee1d7995648d7bee83a1177adfd24f581a9595eb82f6fb22af74ca75993a10641d09cfdd568369a43ff8
+EBUILD libetonyek-9999.ebuild 1406 SHA256 2ea7acbaa598a2b9b0d311c21263bc9ffd01468f82f9a7321eef4c68f6241bd1 SHA512 a7f170d0b41c96cb16689685875b41770be1e0017b4b2016dce4f3b80a2ab82cd019cda84837a9095aac89f9a5f86f558fc274f2c19b0f84fe554fb83d241d07 WHIRLPOOL 9f1f3929abdae8eb93a1c25fac474242f5b427bbd5db461f7e07280cd40b6c5d42500e7d6960608f6998883910ea30ac2cabc115cb3b2cc5e71c69aeed4a65f4
+MISC ChangeLog 6189 SHA256 9a127d40a3e9436851b5482fcdd712b137235123376ec7675a4307d8af8c1733 SHA512 1ddb61e03f4cb16a98380acab3f8523afb441641fea1e1b7987fe3eee8a864a34d06ab973ab37ddd86b4932e2ddcc9eb8cf0acf0c7cee683ec43dcf28efaf8aa WHIRLPOOL 501df2826e1bde3b795285bbca998143ab678f74ca1d924a57067dcb2dca93dd216acad22869e34a79a470bdc25bc859eefc974687aa59d31df98b8684457458
+MISC ChangeLog-2015 2369 SHA256 9a4563d8beab7e18e288e97e32a6cee1beadba719cc7a450f750e447e9f89b8f SHA512 17f6d0d1ab4b174cd24273c924e07440435e717aabd50a35a1e06bbfbef49a50ccea1eb727922e3ea8bbd5969d74ed4b3adccef979a9a6ec57f8e13b1f440d34 WHIRLPOOL 56afc7b2322bd406f85adc3ec4725f647034724a66a997fa2904fd15779c4748c305ce7562296a1c7e1b3fb976196b543f7028f9416319dc40fed79709fa1c69
+MISC metadata.xml 255 SHA256 34d028c790cfe86c47c5c3dcf8655fcefc3e23ff52fed38a400ce42d678c8c5e SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3 WHIRLPOOL 87f7199996948fe95e5417f8da0c4c90cd51a68f246ac8ae87a2e2a31c11c709f220d664eb893b34692577415e5f5eb351dd7e310dbc59f508fa40c7edb8ceeb
diff --git a/app-text/libetonyek/files/libetonyek-0.1.6-drop-test.patch b/app-text/libetonyek/files/libetonyek-0.1.6-drop-test.patch
new file mode 100644
index 000000000000..a868f797484d
--- /dev/null
+++ b/app-text/libetonyek/files/libetonyek-0.1.6-drop-test.patch
@@ -0,0 +1,36 @@
+From 1a20d8ece2ea3e8aa1d319cd88e8a6aa637982f2 Mon Sep 17 00:00:00 2001
+From: David Tardon <dtardon@redhat.com>
+Date: Fri, 30 Sep 2016 09:57:15 +0200
+Subject: [PATCH] drop test that violates Unicode tr#35
+
+(and therefore fails with latest liblangtag)
+
+Change-Id: I0e06c6c4e8bcf999cf5559d6287e77ae97e555d8
+---
+ src/test/IWORKLanguageManagerTest.cpp |   10 ----------
+ 1 file changed, 10 deletions(-)
+
+diff --git a/src/test/IWORKLanguageManagerTest.cpp b/src/test/IWORKLanguageManagerTest.cpp
+index 8fca0a6..e663bd2 100644
+--- a/src/test/IWORKLanguageManagerTest.cpp
++++ b/src/test/IWORKLanguageManagerTest.cpp
+@@ -104,16 +104,6 @@ void IWORKLanguageManagerTest::testTagToProps()
+   }
+ 
+   {
+-    const string tag(mgr.addTag("ccc"));
+-    CPPUNIT_ASSERT(!tag.empty());
+-    RVNGPropertyList props;
+-    mgr.writeProperties(tag, props);
+-    assertProperty("unknown lang", props, "fo:language", "ccc");
+-    CPPUNIT_ASSERT(!props["fo:country"]);
+-    CPPUNIT_ASSERT(!props["fo:script"]);
+-  }
+-
+-  {
+     // invalid tag
+     const string tag(mgr.addTag("13c"));
+     CPPUNIT_ASSERT(tag.empty());
+-- 
+1.7.9.5
+
diff --git a/app-text/libetonyek/files/libetonyek-0.1.6-mdds-1.2.patch b/app-text/libetonyek/files/libetonyek-0.1.6-mdds-1.2.patch
new file mode 100644
index 000000000000..7a3f22e94c2f
--- /dev/null
+++ b/app-text/libetonyek/files/libetonyek-0.1.6-mdds-1.2.patch
@@ -0,0 +1,33 @@
+--- libetonyek-0.1.6/configure.ac
++++ libetonyek-0.1.6/configure.ac
+@@ -24,8 +24,8 @@ AC_LANG([C++])
+ # Configure options
+ # =================
+ AC_ARG_WITH([mdds],
+-            AS_HELP_STRING([--with-mdds=1.0|0.x], [Specify which version of mdds to use (1.0 is the default)]),
+-            [], [with_mdds="1.0"])
++            AS_HELP_STRING([--with-mdds=1.2|0.x], [Specify which version of mdds to use (1.2 is the default)]),
++            [], [with_mdds="1.2"])
+ 
+ # ===========================
+ # Find required base packages
+@@ -47,7 +47,7 @@ AC_PROG_SED
+ 
+ AM_MISSING_PROG([GPERF], [gperf])
+ 
+-AS_IF([test "$with_mdds" = "1.0"], [AX_CXX_COMPILE_STDCXX_11([noext])])
++AS_IF([test "$with_mdds" != "0.x"], [AX_CXX_COMPILE_STDCXX_11([noext])])
+ 
+ # ===============
+ # Find librevenge
+@@ -138,8 +138,8 @@ AC_SUBST([GLM_CFLAGS])
+ # =========
+ # Find mdds
+ # =========
+-AS_IF([test "$with_mdds" = "1.0"], [
+-    PKG_CHECK_MODULES([MDDS], [mdds-1.0])
++AS_IF([test "$with_mdds" != "0.x"], [
++    PKG_CHECK_MODULES([MDDS], [mdds-][$with_mdds])
+ ], [
+     PKG_CHECK_MODULES([MDDS], [mdds])
+     AC_MSG_CHECKING([checking if mdds::flat_segment_tree can store values of any type])
diff --git a/app-text/libetonyek/libetonyek-0.1.6.ebuild b/app-text/libetonyek/libetonyek-0.1.6.ebuild
new file mode 100644
index 000000000000..e73685fed275
--- /dev/null
+++ b/app-text/libetonyek/libetonyek-0.1.6.ebuild
@@ -0,0 +1,67 @@
+# 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"
+inherit autotools
+[[ ${PV} == 9999 ]] && inherit 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-0.5
+	dev-libs/librevenge
+	dev-libs/libxml2
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+	>=dev-util/mdds-1.2.0:1
+	media-libs/glm
+	sys-devel/libtool
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	test? ( dev-util/cppunit )
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-mdds-1.2.patch" # patch taken from Debian
+	"${FILESDIR}/${P}-drop-test.patch" # bug 595022
+)
+
+pkg_pretend() {
+	if [[ $(gcc-major-version) -lt 4 ]] || {
+		[[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 8 ]]; }
+	then
+		eerror "Compilation with gcc older than 4.8 is not supported"
+		die "Too old gcc found."
+	fi
+}
+
+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)
+}
+
+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..26e021ff6f50
--- /dev/null
+++ b/app-text/libetonyek/libetonyek-9999.ebuild
@@ -0,0 +1,62 @@
+# 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 ~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 )
+"
+
+pkg_pretend() {
+	if [[ $(gcc-major-version) -lt 4 ]] || {
+		[[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 8 ]]; }
+	then
+		eerror "Compilation with gcc older than 4.8 is not supported"
+		die "Too old gcc found."
+	fi
+}
+
+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/Manifest b/app-text/libexttextcat/Manifest
new file mode 100644
index 000000000000..47319d9a32df
--- /dev/null
+++ b/app-text/libexttextcat/Manifest
@@ -0,0 +1,7 @@
+DIST libexttextcat-3.4.4.tar.xz 1025376 SHA256 f24c086cf3523424228ed58b9f678cc7647688822e5407d5fbc155fbfc846293 SHA512 f1f7a4292199cb6102cc56a5338b19049664ea664adc96a67a71205fe33d6a40f68b8695825fe253427575347ab6230dce5e0b703635534f32a0f70ff001eeed WHIRLPOOL 00413e249aab03720bc237f72497441586c49a24bfdc23100adce0b76585602d44f84393b90eade07eeb6c7083eb4ba5ff9f5f439148880ad7599d2db2b080e2
+DIST libexttextcat-3.4.5.tar.xz 1041268 SHA256 13fdbc9d4c489a4d0519e51933a1aa21fe3fb9eb7da191b87f7a63e82797dac8 SHA512 f05a9f08c2f2f335d0e483c024321b96fee7424bc1398d4c6acbd9c501f92e22f881bc3d6ec2c0434f9bf4604f3c4b0e880e37d3d0de410eac1a20ea6669baa6 WHIRLPOOL 64c11606ac87af7ca9b1394a098b1a4490f2531db214aa9283625bc118cbc1bf123dd93f6dd94e608bddcc57f9ec522c7dfb641065232dfad7c53ba405299b9e
+EBUILD libexttextcat-3.4.4.ebuild 621 SHA256 f5a5a00157271534371806666618f807b54c5ecad23bcae74bbaf50adaafe8b3 SHA512 40df2ccd0bf11cbf8d6e07b40ac2418718eac6d28193058a9305e67d8ab10a12a0473ff1e4eecd3f23622f685b26015144e55b2d3c23b6588c9948e3502c519b WHIRLPOOL 452ef6ed6d2eae4b1e1feeaa37422f3aa135e64afba993b49ed4f7ef117776ab6846cf9fc3e4c139d6c522a73c1dc2dbb7d0eb7063d2515a65f68c455e779645
+EBUILD libexttextcat-3.4.5.ebuild 626 SHA256 98e86e6190b6a3e45f61014f6293ed352bd11ec52fb4fd0b4e0cec2576895f0d SHA512 8c8fc9b7980cc69beba0bf2b81d4863987142ad0dcfeb9abadcbad6933f990703706382576c20a53e44933b2fc3e66cd77de2895cbba1f332288e4977354d37d WHIRLPOOL c7d8794ce5832dcedee712c9e0d90718b54f09bb890b9aff4c008f6bcf3b266f97b0be8b1a6fc487fe0aa3d0c1982c25a50b08736528d9024e6ec7b27b371507
+MISC ChangeLog 3745 SHA256 525bdba0826149c6185a8436ce9c5d24a7972f74300c22599a9e0cc0f14b5a08 SHA512 e0a8de392472e91f8975f92ddce3ad6fd183c7cfa461c446a8a6c52b854df243a16666e6a9377382dc3c74538db4952631311cc5d7887570bace33dc537c0fdd WHIRLPOOL 9200f5bdee19c5a9e6437e4c34f58d13d2d1ee69a44f3a20e7a4ca6992e24c65df8a38d8d5e66f62a9c16264755851fe34c1b440447df21e387d8d96ad038023
+MISC ChangeLog-2015 3801 SHA256 195b658e88dbce7e259b5ab476c341981d7ff768350fd70dcf23ea161e19efc3 SHA512 600609132dd85fbe229598c389c86e2ec2d321dee4a898fd0b8ca71f7fd91d4aa92f3d1bde2056afdd93ab4ab4dddbea5d33f912197feb9fb64cdbe23f355f83 WHIRLPOOL a32d38dbc5cfbdbef20fcf1e14b889db2a6e85ea9511d86118da71f842b76a7fb891a0bb235c674fef13b30974b0a48989addf9841dc4129c31bb682e2263353
+MISC metadata.xml 255 SHA256 34d028c790cfe86c47c5c3dcf8655fcefc3e23ff52fed38a400ce42d678c8c5e SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3 WHIRLPOOL 87f7199996948fe95e5417f8da0c4c90cd51a68f246ac8ae87a2e2a31c11c709f220d664eb893b34692577415e5f5eb351dd7e310dbc59f508fa40c7edb8ceeb
diff --git a/app-text/libexttextcat/libexttextcat-3.4.4.ebuild b/app-text/libexttextcat/libexttextcat-3.4.4.ebuild
new file mode 100644
index 000000000000..6fd945af2870
--- /dev/null
+++ b/app-text/libexttextcat/libexttextcat-3.4.4.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils
+
+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 ppc ppc64 ~s390 x86 ~amd64-linux ~x86-linux"
+IUSE="static-libs"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	econf \
+		--disable-werror \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	prune_libtool_files --all
+}
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..126ef36d1431
--- /dev/null
+++ b/app-text/libexttextcat/libexttextcat-3.4.5.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 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 ~ppc ~ppc64 ~s390 ~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/Manifest b/app-text/libgepub/Manifest
new file mode 100644
index 000000000000..997c8bbf4beb
--- /dev/null
+++ b/app-text/libgepub/Manifest
@@ -0,0 +1,6 @@
+DIST libgepub-0.4.tar.xz 246016 SHA256 5666a1c4d186d205bd2d91b71d4c1cd5426025569114a765dd913a564f149ff4 SHA512 dd3e9837ba2c5896319918bda19eec8ea790d54f7893ddca46774f96f8e09ac1962ae6cbfc0bcd23c15059c63683ef4a6673e05f8416b024591677fddfa3ca15 WHIRLPOOL 024fe741655adc6fafb66f797fe77e39845764d7fb328f8c553d3cd5917d00e996b030f83342af5789e00bd54569eb25cc0728fd690bf03ae62ab6a9aef96652
+DIST libgepub-0.5.2.tar.xz 27076 SHA256 848328999285441739a18664f62e8008aef8d87d1da00aeb91138035fc672b38 SHA512 9e8ba3acc717fe5d1957935b154776720fcdb90ab566e0888203bce4ea2281b84f9fe44d554f6b5cadb1bba3aeae8b5b9a759001f404c43fa46b0ba16b959e69 WHIRLPOOL fb4a89592f05c59e6782fe044df3ee5fb786e10fac0d3baf5da250cbac8273d590920bab6e401f7175949d890373326e7e37045a8768927c79e012518945f073
+EBUILD libgepub-0.4.ebuild 681 SHA256 688c62aa640c0589b71491068daaa504cbca1b49a7ee0fa5a8526666f794d5c0 SHA512 0071795abfdc4915fc7eb8ef88fb1d0ba6883e2010f5ff4836b9119ac02da6364ff223e0c32a00dac23ba404054fcdbc3dbee0e113a91ffb88eb3dba2882edba WHIRLPOOL 9f672e705f8ef634b2697b5b7dc4a2306c6244cec6637fd7e10f9fbcdc77ee547b2768f3aa199b31d9dcc3375848d5d08d1a5c04ff79d39a9470d1456cd95971
+EBUILD libgepub-0.5.2.ebuild 673 SHA256 15f66c81cc61ca12cf2ff5163d16015bc44532322b7fba3546a95483cc3d83d4 SHA512 cda432b08898fd45911231fd83c7c009792df6b43ae4398bb3a9adeef9226d49a030bd2b2447da0815741fbb1ee4f20393987ed59eb5114352324829f3607527 WHIRLPOOL 257b9cca8d5de125fbbf20992a54a2dd6c6c440ffc197bb6891a26261156be07749530dab2e8fe9f4f11def1e11eadfca0d81f178ecfe214cbed9d708c4d17e6
+MISC ChangeLog 335 SHA256 6d3774f55b2862ca2afe3dd44a342e3469b22a6d2b24458c8efff993f96e31cb SHA512 a963f70afcb6cd847c8a3a81f24de65dce92ffe739c770ca8a488fc39c0c9c418b087722bb98747e6a162acd2655c5bc188428ac03b20f7294c302f59e3e0bed WHIRLPOOL 50e07954a6f428cc72a8e6a1a9ccd7438cfcc280d3d571b84be6dcb614751c0e3b9c4a44b8e5ca97c445696356329df5dac32f9848c052c76bf573fd09680640
+MISC metadata.xml 259 SHA256 6d16d32cce05219baff0d7aef9baf4f8f4622ba77a55e9bc5ae9b074ae8d4600 SHA512 fbef629394690b3a5608abc6344816f6acf1e8e2663f29949fd14a662c628f16fee77a1ec1641066806d143fb94c1571bc5b46b829dc53620af6956377fe15cc WHIRLPOOL dd2c856848fdc98df5a4ffca31b95078656373a87ccf2e44be410e7139f2980f3ebb0ae951e2e92fc46ce8e3a3ecefec169c3a15bbcceba69c1bd8224a8dd271
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/Manifest b/app-text/libgxps/Manifest
new file mode 100644
index 000000000000..dc82139cd717
--- /dev/null
+++ b/app-text/libgxps/Manifest
@@ -0,0 +1,7 @@
+DIST libgxps-0.2.5.tar.xz 346532 SHA256 3e7594c5c9b077171ec9ccd3ff2b4f4c4b29884d26d4f35e740c8887b40199a0 SHA512 f449c4cb989910797c84614ce9f141d4e9adcda0c18f309f656de397ba5deabfa9b4c558c81be7f52bc44c048c401616775989cd1ff9408eeea44f46ef56635b WHIRLPOOL db7514e785f46a3fbf32db9962c2644837855116acbbf37373388c3cfed3b88645c4a574fe8e2ae41913b68250d9448dd3566d9b15b258c74810262f4411f9b8
+DIST libgxps-0.3.0.tar.xz 93000 SHA256 412b1343bd31fee41f7204c47514d34c563ae34dafa4cc710897366bd6cd0fae SHA512 283ce3041f0238ef1dcae30ce2adbc3f843677e00ae22f20ed3459828f3edaab6d05d87c20dddb613925ab248ed0b29855a94198b982606c3dcb2e59f800b013 WHIRLPOOL 00b8544245bc6be3d2a8d183a35f3f4936951fdc3772d1c7ee893ce5fe97712bc472d0ab3ff670c35655bb8f93941e9687d54e3b503075929958bc492c6fa42e
+EBUILD libgxps-0.2.5.ebuild 1161 SHA256 50acbe5dfda1fc2087899529e7c448e295feb9fc73a7b49ea407e1f9537a5cc7 SHA512 644ca138e4c1867fe00d1af8df9a64206ddded7fbec270623537a5f9c86a1eeb4c47fbb33b5914aa337e43d97ead97f3df61172bef751810b61ef7e125f4c527 WHIRLPOOL e6678a46470a03e9cdaf53eaff0222b488e576c7487efb323caa5a733020582297960c8c73343e79ff11212c8fe45f13922d075e1cee9897cfcd2a812d35a92b
+EBUILD libgxps-0.3.0.ebuild 1215 SHA256 238c9b4b1f232462f1c2d5ac3b1ee2291df1ab34c584ae1988970d95968eea39 SHA512 055c5cd9440b4c3bc51015bb3a91fcb803a28b9c01771852b8280f0cb87490aa9edc9b7c4a98846a29fd3c79a8e80aaaa29d3e585be87b79cd295e2900601419 WHIRLPOOL 8007c4838d7597a51fac250e01a86b847b415f50b315c68e65490c4b8db15c869be3e30d6bf695722c63d328c34ca3368c633d31b2d323d43652fc7aabbf8753
+MISC ChangeLog 4972 SHA256 f8f935360d9ba494c9a151072213f78790f7aa9b49c59795fea6ec9a86504cd5 SHA512 176b65d050ae3351176a6b88bd67ce9799329814af81af675f40af30b16884529659bf0e3961148675dcb0341b91c963e8e4995cd2e826c550985d44bb7e2a9f WHIRLPOOL 179f201323fac5a848aad32213fdb09f196f1b9fdb290a4431f2e8cf3ad24e1976e0ffb6ed5519be9cc38b7873aaf3d8d74c322f52d3b9184aabdb07acdf83ef
+MISC ChangeLog-2015 2913 SHA256 5f53c0b25af1aedc7958a36c0ad538bffe1fab5fe05e6b06c01fe1a063465916 SHA512 c255640c1e49fdd749247e19f12b3eb78319a0ed8e83f55a7d5864480fa9968bf5b673a9b1add88e0ec466cc0f0e0ae13f538acaf9382c7f7a0cfa38b2ead056 WHIRLPOOL 17a4fb510a28d801bb480608cd84cf3b6e15972a94eb9c0a9459faa01b2795740d6ac9aa27f3f6c4b4803a9580f373cc752da691dd22b15c22912693fdc64ef5
+MISC metadata.xml 249 SHA256 4505b0bfeadff287958620b7dc7b7209699065a8f17139a237a5dd409a726a97 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 WHIRLPOOL 333a938ee1d2124595596c572697bf5ebad523a92ba12005cfb12e6bb6270881a94a911f0cc9c1cf2bb571559e8271e07dfd307dabe50058236dbe7103562b92
diff --git a/app-text/libgxps/libgxps-0.2.5.ebuild b/app-text/libgxps/libgxps-0.2.5.ebuild
new file mode 100644
index 000000000000..8573da92cd0c
--- /dev/null
+++ b/app-text/libgxps/libgxps-0.2.5.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2
+
+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="debug +introspection jpeg lcms static-libs 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() {
+	gnome2_src_configure \
+		--enable-man \
+		--disable-test \
+		$(use_enable debug) \
+		$(use_enable introspection) \
+		$(use_with jpeg libjpeg) \
+		$(use_with lcms liblcms2) \
+		$(use_enable static-libs static) \
+		$(use_with tiff libtiff)
+}
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..7303f6bbede6
--- /dev/null
+++ b/app-text/libgxps/libgxps-0.3.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2017 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 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/Manifest b/app-text/liblangtag/Manifest
new file mode 100644
index 000000000000..4c3b502904d4
--- /dev/null
+++ b/app-text/liblangtag/Manifest
@@ -0,0 +1,5 @@
+DIST liblangtag-0.6.2.tar.bz2 766080 SHA256 d6242790324f1432fb0a6fae71b6851f520b2c5a87675497cf8ea14c2924d52e SHA512 812e00d0a26eedc1fa9bee6d0b9da53b8faca8d1fc5f93a0423106b5b777c7b1ec5854da7d02606c215ad1a1248de93016559c7a55288a4b427857fb1ed1ad8f WHIRLPOOL 6eeba5e4aeb432cc2a3ac102aaa7d4c448afa137c0c9056e7b7f86e4589b76463e6de6b12ad05ca3302ed66305f525c5c418ccf59589b5b5212ec9061c17717f
+EBUILD liblangtag-0.6.2.ebuild 1156 SHA256 a2b851a2b5883d89d367bfecbf0b5790a45aad8f230de1f6256e1b2ebbeda951 SHA512 e300c2810e739298e2700297e69bf3abaa795f85a7b580c466f90f5c9df6825e1ce43210520df1e98913671ee94d6567f3335d2cf39a5f19b76bb4853dbaca08 WHIRLPOOL 57b122398c6d826e435fe5c2d61c5b49fdfaeb4a6494155459f3d96de0555a767506de3cca838a8c823c44b6099dcb4a1f35886e87ab8ddaabd672df823d5196
+MISC ChangeLog 7420 SHA256 117d38adb348c80f9bd73df8e158c8f40e973955effa19f0755250753c64f565 SHA512 ba3b74c374661977c0377477e4aee138bd8e8e14290621a2be2657b1db73cd38c7cb91c30377d3b523f366cea4d8d42d0379dd02b445fc404aa68c36d8503803 WHIRLPOOL f94777732f5c3f4c365911c9eab0add686d983912343c0c7af970c7d4b769578ce69bbb402d0faf6d566e9c6464cc468b550e09afe222c14512d89fb0bc54dec
+MISC ChangeLog-2015 4155 SHA256 369da4596142b7d98abaaf8a83b132d70b5a075f08e0c3e20c4de3106183505b SHA512 84795b7ad435eab7b71d6a5b600e88ffe7c0b3ce0c33654d15c6b2fe683815a2cd311c4ca9542002c23f078640315d699efb7d836edc9868b9af1b8de1f6123e WHIRLPOOL daa17e9593339a7a90784fa53c4f3c25843957619748e3e9220d6865b72e64fd91a789b1654c4cf9cc7db3557386ffbc912bc51d8afd57937ddbe8597a88be61
+MISC metadata.xml 349 SHA256 fe60265ed3c58287a600ca32c690576ad49eb609a3e5583ad8bb804dd20fa2e3 SHA512 dc4a715ede23108572522e1e6c7afd36b3c3359fe4145e5a02b45e7fc094f1633fbfcdf0d9c75955f75acb1487e438bb437a85766d7a06e628674447d5cf3d96 WHIRLPOOL 7f611823e7e84e5fedf5993f08b3a7d757305d3ccb8e209a3cd41b883131b0b193bcc14bbde9b9cc3a065ab4ef8afaa80820ec693bdf70112ea87f82e3717e52
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/Manifest b/app-text/libmspub/Manifest
new file mode 100644
index 000000000000..9d6253b12f1e
--- /dev/null
+++ b/app-text/libmspub/Manifest
@@ -0,0 +1,6 @@
+DIST libmspub-0.1.2.tar.xz 345556 SHA256 b0baabf82d20c08ad000e80fa02154ce2f2ffde1ee60240d6e3a917c3b35560f SHA512 c19025a2b887c33f5966b0972204ab2a8ae841b82df38eaf53c0cdc8f99d93cccab5e1c78143a79d5aef9c7a7387bd6f2cf34833a00861058e0e4687f48be714 WHIRLPOOL 0ba2e79d0b9d0eecd632cba551251c40bf49331d98e9c6e657a9870bebfb4d68e755c738b0c8f3055b2c1cc8336d9ec00c98b147d3a960d3ccb63dd5fad534af
+EBUILD libmspub-0.1.2.ebuild 1104 SHA256 8ec8748258b77e78b9141e2444a68b640b4953e91e4410cb9a451de62751646c SHA512 2b51600c91a38352d73d98571327f42f4a23213a5588e8e465162cf80fad926c6062964d76cfc2ef9b6f9e496ddfab157e29293ec5de9aff641b732c21fe16c5 WHIRLPOOL dc0df51c4dc2df7cb53bbf9a67038eb905228403077f6cdf9a062925b035391ccf265d7cf5d4726a0f72150be34d5edec3b481ed8256989dd2aa234d809e50f8
+EBUILD libmspub-9999.ebuild 1081 SHA256 ecb8f0d398058db028c5f0f02fb9c27c5a3dc3471ca33f08ac2643152d581ee5 SHA512 f9628d9dfef0f93360ce7b7fa39894a272627ca3e00c382fa8bda258591fc56759505eed49a1fb77d8b8361b5a935ac12db7cda53d75a0222a66e914d15629e3 WHIRLPOOL 1d4a43e71edd3e9a75401372c2b3bf62e34c53f003a62804bf0ebee2c72f9355e50bdb11c4fcb422932fb628ceeda3f90bd10fc4457aedc14ef8e3d17867602e
+MISC ChangeLog 4039 SHA256 2b086d8a7692f3300fc8cf2aca444fce58c0d132220057b2d7687977696ccaa0 SHA512 ce075f913d32894f19de7ffb707f9f2ab97dbd7bd7b3fa1be89ae06bccf9493bcd2dc3ddc159bb1046cbe552afc3cd4068679350441b43aaf703b0165f2c7bc6 WHIRLPOOL 413e706f40ca1b5e23c419fcec5c1d8693c5ac70eb8df55913222face8f063b56c69c32664d0843a14e691df0ed8e9ca1b0acb275aa6e27449de4e85da3c8c7a
+MISC ChangeLog-2015 2552 SHA256 6616a8b79cede80a8dd453e5aee865bb19b47a82b834dbc4c3577db7f11f43ad SHA512 5166414d4c62b8674c7160f0a9af3b19877c45cda6645e3e1ff46befe784258dfbff784f44e7d37fa4de2037dbfd85b01f6c3f844fe784c788842516e294a9c0 WHIRLPOOL 2e818df65d9ac3564266f29ea74decd73b7791e177aa1d3b1025ed60ab7f187c88f21fef5fa224cd025f93e74a112070f51805b4527454330a561af7ebe03ff9
+MISC metadata.xml 255 SHA256 34d028c790cfe86c47c5c3dcf8655fcefc3e23ff52fed38a400ce42d678c8c5e SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3 WHIRLPOOL 87f7199996948fe95e5417f8da0c4c90cd51a68f246ac8ae87a2e2a31c11c709f220d664eb893b34692577415e5f5eb351dd7e310dbc59f508fa40c7edb8ceeb
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..4cd06c1e06a3
--- /dev/null
+++ b/app-text/libmspub/libmspub-0.1.2.ebuild
@@ -0,0 +1,50 @@
+# 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/libmspub.git"
+[[ ${PV} == 9999 ]] && inherit autotools git-r3
+
+DESCRIPTION="Library parsing Microsoft Publisher documents"
+HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libmspub"
+[[ ${PV} == 9999 ]] || SRC_URI="https://dev-www.libreoffice.org/src/libmspub/${P}.tar.xz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+
+# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
+[[ ${PV} == 9999 ]] || \
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86"
+
+IUSE="doc static-libs"
+
+RDEPEND="
+	dev-libs/icu:=
+	dev-libs/librevenge
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+	sys-devel/libtool
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+
+src_prepare() {
+	default
+	[[ -d m4 ]] || mkdir "m4"
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-werror \
+		$(use_with doc docs) \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/app-text/libmspub/libmspub-9999.ebuild b/app-text/libmspub/libmspub-9999.ebuild
new file mode 100644
index 000000000000..83a7b70ff42b
--- /dev/null
+++ b/app-text/libmspub/libmspub-9999.ebuild
@@ -0,0 +1,50 @@
+# 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/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 ~x86"
+
+IUSE="doc static-libs"
+
+RDEPEND="
+	dev-libs/icu:=
+	dev-libs/librevenge
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+	sys-devel/libtool
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+
+src_prepare() {
+	default
+	[[ -d m4 ]] || mkdir "m4"
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-werror \
+		$(use_with doc docs) \
+		$(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/app-text/libmspub/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/Manifest b/app-text/libmwaw/Manifest
new file mode 100644
index 000000000000..2f65f3713e63
--- /dev/null
+++ b/app-text/libmwaw/Manifest
@@ -0,0 +1,9 @@
+AUX libmwaw-0.3.11-CVE-2017-9433.patch 792 SHA256 4bfe6e85cad2d9b5e8fcbc59c15d09cfbeab93fe310e05f6bf4c4a54a083044d SHA512 a5f2996dd2e2de6eec0c637ee9e9777a803a4f7386c38436ad59c0af972c0a2b0ababc90018e5ebf0a67453fd66f154c175b82a1fb7dc6ba82d16468f7aee696 WHIRLPOOL a90b6109af04787d923e4f5ffb0fde62e2aee201e59c4f29b6a0d76e9e9ff9e1bb174c0462831080e30c66f4be7741e5ee01b2c73a8e1d7377153641727a2f33
+DIST libmwaw-0.3.11.tar.xz 1254200 SHA256 4b483a196bbe82bc0f7cb4cdf70ef1cedb91139bd2e037eabaed4a4d6ed2299a SHA512 d4a810c6066023608a15ece8a6bbc958e586d679fc4ad51156091ec88355292872f10198e723e28776b45e140a830fd4c698732cf6103743d6e80ad8e1d778ab WHIRLPOOL 2de11bde90937727372eb7e7d4d1af52b66e8ef2f14bd78ce1d26399aa6ee853dc1fe11000cfcf8a361698296866ced2f2da7848f75763a22458ae0504903b48
+DIST libmwaw-0.3.12.tar.xz 1258972 SHA256 7691a6e6e7221d61c40e3f630a8907e3e516b99a587e47d09ec53f8ac60ed1e7 SHA512 8af8477ff6fc251600f9a66059b20fd8b9fad8d599c01e847d7185944447b3a34567036daff4d4510934aa1462bd4810a39467e8ac0ec223147b3b53447220ec WHIRLPOOL 9dd39fc43c7b8cf3806889a1cabde4c1bbd4f21e5e1ea2dfa66a6ea69f28ab28c966e160d157f0ee4559e85b6b7fac07dfa314d2ef0597986c85660b3a5cc0f9
+EBUILD libmwaw-0.3.11-r1.ebuild 1080 SHA256 0900891771d1ed67d8a028c295ec2993ec66cbf1fc20b5664c2af922d6118b57 SHA512 a044974bdc83a5d7ad63fd585596ff366cb3f1bcb16147b11e7813242a36ae3f983f05a49280a6cadf1468f658fbefb22fa0973fad03a80eeb740d317fe34163 WHIRLPOOL 74d385a364de0acdf748a4ecb1eaa4c4b05a02d194e80cdf92d710517489ec33905fd98e3da0db1e04965ac0cae88d2595d94b16ea3f67cf097b28d5e7282f75
+EBUILD libmwaw-0.3.12.ebuild 1037 SHA256 8c32d966043155991573f4878d28e8c8a742ec4aeb1945eece9dfc53aeaa012b SHA512 c395022fce3c568ec08167e158b3c0676d783e12cf0c2b582b02e36917e89dbaed11b4964e3295f80cdb3ed6e40c3f4b1399275c5c282a032b99460d335b1a3d WHIRLPOOL a618ec511fb715ed363c8713e22fc4f5fd8f127bd84b356e8d9391a49f04ddc586a4368a1541c35261fe4e5d6adc1b471684e26e0de2219567de83030fe91ffc
+EBUILD libmwaw-9999.ebuild 1030 SHA256 13c867cdabc34bbc8bd10fd65dfe61b8f1660650a56e3e0cfd50af6aa9489aef SHA512 ad24e38700f9fb91b90615c14b799bb677119e18303f90591a4f7df106677552b7fc4a005e5e5555e5bb6f6de3fb13d952a366dc534212eb6c84b053e3fb241e WHIRLPOOL 46cb6783a4e23ea20c3d3c9d1b40ad43bf1e3efdcafb2c7bca1917511d1bb07103b9fa3fb8263c1bfd63c50d4b37128abac869b5c5bc4b464af22285be73a185
+MISC ChangeLog 5189 SHA256 60cf618cc047ff50be95311d7ee467a81fc77c05ae515246aaf484b444d73db3 SHA512 92b79f39c8a5a2a46132ed7e92f2511a6b26fef8bdbc07afb5a46a09d8f27fcc44a9101657af2b2d7decaa4ad7aa1f68d089ec1f2751f73834f1a8468113d57c WHIRLPOOL 808bd24d756f597d51c52a13ab795fde0beaf6dbd9b15efd7f48c961829d8b1aeeddd083153f42a2a0741cf353a44988d7f14d571cbbff5fbaf2445516fe90fe
+MISC ChangeLog-2015 3078 SHA256 1024b69c7cda3bd25b237d89db5d8b7aa24ad4acdf8e8aee491811f797c43c83 SHA512 6057013db3fce9175ae94710482a6aa6b4ef519ffcccbb73c08da7328e9fd06df2ba8b9060c49af1f62d3f30a70a96f3c7a4ab64735da98db14aa6a7bd2dfe67 WHIRLPOOL 7b9875d8c9e6bf3a30224167007087a7070dad369e287a31fae1e7c1b3f261132faefbb2e83f944f8927a9f8d4b5574529a27cd30b1d913a8a56b1609e35b164
+MISC metadata.xml 403 SHA256 5489f721ce312bbf8d6b247d199be6c652bbddd67a96e0039e64505b82629d8c SHA512 12cebd7bdaff6a793598f40cb11f4ae6681dcb29b18ecb7db92681abf1f6d4ce0281ae292c84106a143c0ff5ff3395e37604b3576c6a479001fc351dba10c7ed WHIRLPOOL da130bec55d0970a2d7cd890cf1818a17dc4eb42bdfa20046420f30ff0e0ad7e1f8703314d970b627bee8299bacf0d44c8cf4549eb69b4f75e24557fed28d6ef
diff --git a/app-text/libmwaw/files/libmwaw-0.3.11-CVE-2017-9433.patch b/app-text/libmwaw/files/libmwaw-0.3.11-CVE-2017-9433.patch
new file mode 100644
index 000000000000..4918fd4b6516
--- /dev/null
+++ b/app-text/libmwaw/files/libmwaw-0.3.11-CVE-2017-9433.patch
@@ -0,0 +1,19 @@
+commit 68b3b74569881248bfb6cbb4266177cc253b292f
+Author: David Tardon <dtardon@redhat.com>
+Date:   Sat Apr 8 14:03:29 2017 +0200
+
+    ofz#1037 resize vector correctly
+
+diff --git a/src/lib/MsWrd1Parser.cxx b/src/lib/MsWrd1Parser.cxx
+index 63547e6..3626064 100644
+--- a/src/lib/MsWrd1Parser.cxx
++++ b/src/lib/MsWrd1Parser.cxx
+@@ -902,7 +902,7 @@ bool MsWrd1Parser::readFootnoteCorrespondance(MWAWVec2i limits)
+     int id = fIt++->second;
+     fPos[1] = fIt==footnoteMap.end() ? m_state->m_eot : fIt->first;
+     if (id >= int(m_state->m_footnotesList.size()))
+-      m_state->m_footnotesList.resize(size_t(id),MWAWVec2l(0,0));
++      m_state->m_footnotesList.resize(size_t(id)+1,MWAWVec2l(0,0));
+     m_state->m_footnotesList[size_t(id)]=fPos;
+   }
+   ascii().addDelimiter(input->tell(),'|');
diff --git a/app-text/libmwaw/libmwaw-0.3.11-r1.ebuild b/app-text/libmwaw/libmwaw-0.3.11-r1.ebuild
new file mode 100644
index 000000000000..3007843c6004
--- /dev/null
+++ b/app-text/libmwaw/libmwaw-0.3.11-r1.ebuild
@@ -0,0 +1,52 @@
+# 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 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}-CVE-2017-9433.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 \
+		--with-sharedptr=c++11 \
+		$(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.12.ebuild b/app-text/libmwaw/libmwaw-0.3.12.ebuild
new file mode 100644
index 000000000000..cb4c3a2f3efa
--- /dev/null
+++ b/app-text/libmwaw/libmwaw-0.3.12.ebuild
@@ -0,0 +1,50 @@
+# 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 )
+"
+
+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 \
+		--with-sharedptr=c++11 \
+		$(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..b0434c260bc2
--- /dev/null
+++ b/app-text/libmwaw/libmwaw-9999.ebuild
@@ -0,0 +1,50 @@
+# 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 ~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 \
+		--with-sharedptr=c++11 \
+		$(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/libodfgen/Manifest b/app-text/libodfgen/Manifest
new file mode 100644
index 000000000000..09e64e812b09
--- /dev/null
+++ b/app-text/libodfgen/Manifest
@@ -0,0 +1,6 @@
+DIST libodfgen-0.1.6.tar.xz 359988 SHA256 03b210ab44f05e38091508cdca6ba0ff73de3ea8a168f849b8f1c5059c20b9e9 SHA512 bc5e6908ee14c576adececdf8a94ae01f2ed487e6f2490e41aab787e1e8f72a3fb2a786f51ceeefa327710af215741ce13bcf4bb3d99d2aaf403f568c5db75a5 WHIRLPOOL 2c71505c0189a59bb893c7edfd8e4050c7a60f6193e2a77ed63090d8f80618332b0f0c2020d1fc1f319b5635386381b6fea6d3d5117678d9c425d7661a70ddf1
+EBUILD libodfgen-0.1.6.ebuild 892 SHA256 8689b1ebb7c880e850d78d1e54e81f669b3657e81e047564514534d99ed5cabc SHA512 2d1465998ba5e568fa4f79b86833936a67640dc2844d3fcd865879f1e9c5006345a5143827dab71fa30a3341fc82783798d2dd335165d13e3b55e18080dd233d WHIRLPOOL 1da41572a4938d4578bf9134d59c6c6e834bb77f95a9964d078a3c861e5c31ed11157c3be51ed6ff10c24e29e4c71a95232d78fc7937854ff0c17dae14424202
+EBUILD libodfgen-9999.ebuild 887 SHA256 3b79c29013382429aec7487ff513ee05ce7290293882740e6a1fd4374e0785f1 SHA512 801ff64c3f1fc23dcd53500a8cff20434bf4f9416d968df681961e82a72e0b8e96b97a2a10fbbd2fb7838e9437c61f24a218822d876b2df68d5a6e9d98f63ad6 WHIRLPOOL 1e9a218c84f73510d50536327723ad4be73f10c9785a6d45e95c39407a5be109a0e3e2cdecd2d514c3159a2945e54abcfd2b9d78701a813ff85a3452173ca9b0
+MISC ChangeLog 3322 SHA256 92262ed44f80b114e22c22774ea4194a3f288164d3a453d37d00c7cffd647d63 SHA512 b50206e8b5e70d034f8200a28a8a9970f01a13240c6f97346e514f3a05e9d0128f22274c615611065533edab6a69e534fc04b707e6d5af609392d8b0f86e7472 WHIRLPOOL b6fdf553ea59a81065eaf49ec65dde1f360295e36c01e1388c70627228db5bc40fa0da100876c297e2c86c02a662bd1d2cf4ccff31dfc198d9644da9f05dacf1
+MISC ChangeLog-2015 3583 SHA256 a5774376f33063c90f6bfa5c253aa246d9dd0bfe760a2328604d18f1180b592a SHA512 df82a49fdd6083cd92547a10a83f961e96e766dab4f3fdd9979ead4e3228b64f3e891615f3228d555cadffee5820feeb7ef8fe4d48c6eb949f1de1165d23fd73 WHIRLPOOL 5b5b11542d0f6a5265563e99193ccdc13055ecd18bdcee6ef63e6dc068afa9f3bdc4da9b622f8d51bb3d2e4c6f64e9cdbab453abf9c1c81c71c372510dd99c64
+MISC metadata.xml 331 SHA256 14e79bbd4cc71959cc155ccc82ab4b67f2b4f4c637e314c7ea0c3e622a653df8 SHA512 f96053e0336bf862446e0ca96ca743a1b7fac4977e6d5d4b9781424ac33a3d89c3e4c334eb27a427d3f83c2c437e8fe4b0eaf4ed87513c3eeaae39a72db8767d WHIRLPOOL 7467ffe2e76ccbce1c4d8a6d02c9e666f1f87802ff9c8d3fbdbf0e8d71203101e7c62d74c4af756d2f9b3406dd4937c703baf0bae7eea9483ce68376a515b5aa
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/Manifest b/app-text/libpaper/Manifest
new file mode 100644
index 000000000000..d2ab27fb335f
--- /dev/null
+++ b/app-text/libpaper/Manifest
@@ -0,0 +1,7 @@
+DIST libpaper_1.1.24+nmu5.tar.gz 49032 SHA256 e29deda4cd7350189c71af0925cbf4a4473f9841d1419a922e1e8ff1954db1f2 SHA512 4d20d454dd7d09dd7e84b9ccc3b0ff8d65d95e0ae3874ec41462f812882e7ead032310396801a47a32bfff112c4a9adaf2d8d3e6235a1fa6fbb853196a363c56 WHIRLPOOL 595e74f41f733a3ec0e8f79ff46182fb3f92f1e28306e79f4e7b78f91872124e26a30321b54da68c15be577037c6a2cc2f85be6051cc021993c7d59724769fcc
+DIST libpaper_1.1.24.tar.gz 355272 SHA256 38ac28114673d4b175a939d981e0477a0ed9bcaab27033522ecb2ca78ee90c7e SHA512 f90816723dafa9ce0aef652e027b13174d2430208003d3715d6f96226130bc66cfc36465f1a5a3f855697708c389f219b964a5534a64a8c98ac53662040df67b WHIRLPOOL 74a7cb6dec146104988dd5c5e0b4bf7fb776bde086c4fecf658d949e17d6701fa1b23511a7be43f01a01dcfd7c0340f23c3c9ec1c51fb7718d6b0dbf1761e75d
+EBUILD libpaper-1.1.24-r2.ebuild 1333 SHA256 3c5706d044f129a3e3bab46ecf543c9b76c2551df7ee0377c5caac9efcd64dd9 SHA512 3733558af4de1f877860c7a23e8b4bf9df6d7251caf4f81745b06d4ac421c38694b4ec33e28a7190579b58f7af144ce7c62110b9f78879f069cc6c2d394929b4 WHIRLPOOL 7f177f6c55b7f448d1559a458b1fe628462338669c313421c1b9d5afbd403aa81b52615b25744dbdd6c752e3a73f8a78cc3afbc3228c87f99c12351a9ad22eb3
+EBUILD libpaper-1.1.24_p5.ebuild 1378 SHA256 a21e60dada9de4ef28f30187f85f35421bd6698895e4306224e0a544b55d043b SHA512 9228a03312c917c3fdb3733ce8be2329c706637a955e91b351910aacb63dcbecbea5bfdca20e095c5afdf6265844f4c6e47697ef1643de3fbcca0a3a81dad2bc WHIRLPOOL c938278f55d7b4eadfe1780e0489cc1b2a151b7b0fa043d38885811556a02c17cf35d10eec605d153a2e90b08f52d22bfb25f9500a2c9cddd0cc23414ff10101
+MISC ChangeLog 2438 SHA256 a29554c082b25ce61f6df70f9a227b7dde4d56c2427fa26ebc857e1b7e84e24d SHA512 2662c58b6a5f88a6dfa8d38549a61cc109eeb1106d9e39d9c697de0c941f74377bac2d6206ddc69008391cb5380ca3a08c72883a1a6ddade3fe15ef9be3d654b WHIRLPOOL 0577f16e626119cca6d3cd3941df0e4d0e2e2c8b027ffa057928dadca9a6f431b224f13baa39a28b74f07ffb71ef846d7667404094ac9b3227ab98fb7c20a2e1
+MISC ChangeLog-2015 8944 SHA256 3954a25070c0f89c4a40e22a8b629fcd2adaf2f20cd1ab1795b290a0e3903c42 SHA512 61899c33296c1dce793bbb26284cf811ec9fbda154acf677a739e889fa7912c5b12c66faf2ec975b4d58c770d213841fb34f766d7ca02b2923bc40489e961722 WHIRLPOOL c59e4b472c9f789a96ce89c106f26c7b189393f1826a5ca5b1b6e08982a56f541c9eead1f4b53ed0ec1a614cc25c29144e9e6fef7921049b2229e603cf122579
+MISC metadata.xml 255 SHA256 369a8c8c92b41e8d46a7225354bd493797b21f0b8b5c3f9ad4ac0a7e14322ebc SHA512 c6c5f966cfbe396fde1b15334442de9e0004b44c4b48775588b0b25a058ad1751252761370c9c254280e97561fa6306f5aa0cc7959c675d4ee11f7f95d777a36 WHIRLPOOL a6043f3549b633ddc8017207016e272af3ca85d175e603a0bfffcad7c5fef4457a01bfe76ceeec5ca09e957dafb78459db4d9cadc6ec99874d5be44ca85e27c0
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..5426fbe2a6a5
--- /dev/null
+++ b/app-text/libpaper/libpaper-1.1.24-r2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2017 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 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+RDEPEND="abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20130224-r10
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	)"
+DEPEND=""
+
+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..2d38d6de8929
--- /dev/null
+++ b/app-text/libpaper/libpaper-1.1.24_p5.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2017 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 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+RDEPEND="abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20130224-r10
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	)"
+DEPEND=""
+
+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/libspectre/Manifest b/app-text/libspectre/Manifest
new file mode 100644
index 000000000000..c42fbe94de1b
--- /dev/null
+++ b/app-text/libspectre/Manifest
@@ -0,0 +1,9 @@
+AUX libspectre-0.2.0-interix.patch 728 SHA256 a19151017aff039af21ede3cef036a7cf18bd8e0e386799e7e11c8b34038a976 SHA512 d5b35ea095175a3f51553e3bed6e0e02bf7396b036923660d2ea6cd73241ef6d84a8dac977c9ce38078d41b99aadc203e13853d7087624a43f2a3eae35fedb8c WHIRLPOOL 024f3e5e9d2b425d4db7baa53f8c706a70e5f3dafe9637b9a27a1adaa7e4b4869fa98d4a97cfc02abb449dc3b38e303dd7fa6a148e2f223873f05162e06fbe82
+AUX libspectre-0.2.7-gs918.patch 1272 SHA256 e4c186ddc6cebc92ee0aee24bc79c7f5fff147a0c0d9cadf7ebdc3906d44711c SHA512 50c307ffd6fbd1de92239670afa61a68a32b788e3664a1d4d5b86a074102596e678492c91f6ff9fb8ca58bbe00b5a5fc01034a0d04e5cee3149932ce0337b401 WHIRLPOOL 2cc319ca3a6579ac263216ff115c9992abbf9c2585b748f2196a08135ae4ed9336d27386ece3bed87047102389a24bac4066f99ab6bca1fbdc3d1b099f3bcc5e
+DIST libspectre-0.2.7.tar.gz 387947 SHA256 e81b822a106beed14cf0fec70f1b890c690c2ffa150fa2eee41dc26518a6c3ec SHA512 2e60905f7eeed9ac6ec3b5f8b47a7dad85178c8c35a63ba097ef6088dd334f7fde5797ecb05cf67532b759d07a65006427914d2cd6b09107ecc90620c9541794 WHIRLPOOL b59a1fea4ebd0cac13d4b5c7e76247de214761929bd71cf7879832acc4779786d764ddf2d38c5dea070f6e05c41f0d8460b8a8b11a51c35492827228740fb604
+DIST libspectre-0.2.8.tar.gz 421791 SHA256 65256af389823bbc4ee4d25bfd1cc19023ffc29ae9f9677f2d200fa6e98bc7a8 SHA512 ebbe7f6adcbc7f7d6af61f24e23b114116c878755dbe90f1163546c1284a005b4d539be01986c1f940611e84141ca19768b8effc2abf1013606da7c93547da86 WHIRLPOOL 6e454fe6d16d8f01b45e82424b62a333876edfe44772fafafa1915caefdcbf857975814fd3d14294c5abebe3d1a80842a9ce212e43825bf144ebef96a60af32e
+EBUILD libspectre-0.2.7.ebuild 1232 SHA256 6ae8fe8662e3216b813ea30685a5bbb27114eb5b14c7161d4532be3516fd45a5 SHA512 b3e700400305328d680e5e1a62aa696990cdff6ac55e3fe5079549ffb3c53e30559ff69b5d05090c6929d4511d2c13a28b82ba50ab0adcc412546da52b7b4992 WHIRLPOOL 4ae74e68a1bb0f1cd0e1df389086a86d9b523c48d660a8b80f22d14b44605bc9fa97b15a046217ddf4ce8c9f184edd1195dd1dcff23580af3e08de4f4aee7436
+EBUILD libspectre-0.2.8.ebuild 1113 SHA256 77a2b613b98004b94425ae00269b546dbb4dba683b56197464c973cefb9df0c3 SHA512 605ad231744d73a078ce1f4532dab61966117311796597b146906becdbc83a3ceaf2c388442e0f809fb4a662bb07cad29a4ede41af66442deee9b2489f73e61d WHIRLPOOL a69ae7a87d8325b921b656493f9d9d9410549cb26d1d7db95b702c305eec88a494419ca2bf1c1e770256fa74364e3c1d1627c304ca3750727d8554835dc35aa0
+MISC ChangeLog 3899 SHA256 258289c288d7cf400216dd9549b9be3b8101524c9c54bbe4586431fe2a0f2cee SHA512 fdf3fa6805c56efd0f80bbe7405b73606636cdd01ea25fe9c61b094240f325eb6723d0115fd26b8705ccd9e0630b963e4087550dbca78a4cb45033506c9992f1 WHIRLPOOL be141a029fe8963d10a605b7b15bea390b8cb1aa80a5bb9dfa9b8ccc6741142eaa9e5900747d0ff7ecc802e136396285953994c273f7e7caaea1c6dfbcc028d5
+MISC ChangeLog-2015 7818 SHA256 606727da7f0aed9b91b782f4179c83641c1a81d5d8fc1cb9f03521b2a433acbd SHA512 cde98b56882eb845ed9cdf21d9435ba03386afd9df2262b1d9d5d1b75952ac3e95b0e027803fa3c9b82bb48cacb10c4a7253bb34f0d6987f73e1ff0b1dfe3d06 WHIRLPOOL 7ef1f44f22342888cae65a795cdfdece91a5021b3230823a7866f7db28fe151098e1e5dd252db824436aae3ccad24d6c7223087e48d18a849f397bb3e988cd5c
+MISC metadata.xml 232 SHA256 6f828dfe6278daec9b0b3a9eeb589d072d79dba873dca6a50422e554c2f3582c SHA512 21ba416ac701f1c9deb55d07f8afbf9da930fb04d274d84c5cf0df5e549554059959228ee6a4b8523d985fe0762af1a7c36aaefcb0e5b3c7baa5866e2841cfb4 WHIRLPOOL 95b029eb4fea616dbf4f41cb372a67a13b7f5d67d9dad52bc27b4597bd1cf73b00fa34ddd8637495337a469162e3086075e8e69734a2147eb89d940fe048159a
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/Manifest b/app-text/libstaroffice/Manifest
new file mode 100644
index 000000000000..2bd391e13e84
--- /dev/null
+++ b/app-text/libstaroffice/Manifest
@@ -0,0 +1,7 @@
+DIST libstaroffice-0.0.3.tar.xz 679800 SHA256 bedeec104b4cc3896b3dfd1976dda5ce7392d1942bf8f5d2f7d796cc47e422c6 SHA512 ea60576537761a5b969a861ac43c8d4a9da5e5261d0a31f3d7743f8507e6979ccd4cba1784e8c3d909c08b692349ae11e87428834fd3df5b8d56e423caa7bcd8 WHIRLPOOL c8ba69eb347aa0c77f886511d79dba5011aa0ff25c3e9f4ec4af31b8b9303fd9dc1df32742bbc3c87d2a7fba32a7f830fdc3a38ca391559038388f4d97afe9af
+DIST libstaroffice-0.0.4.tar.xz 681828 SHA256 6e728784d002144716b10fe122973b3e4edda9004538386b0b58bb303404903a SHA512 d591e554ce108165f1952ae82835241df0f986ce51f1a4fe43d282733358bb8d72418621f91f431367a5c09f9a40a9784666ffa2da303c5543ee000b1d6abf38 WHIRLPOOL ac295aa290f92bc2071a56439dafb4280c52e2de8e36e6e686cdf31150bff8c87989bbc693cc4175d96c1ae5a155f21bb8f9344b0ed10920ebec161ba20a7110
+EBUILD libstaroffice-0.0.3.ebuild 931 SHA256 444118af1a5a6972157fe5244227f781dba6f4b3e6434637cbea73ea22d9cbe4 SHA512 e03dfd8bc242f41415275a6dcb75d30a5e78918f504ffa1a7dc19923c74df4c5f23feae84a29553d9e4b5a84a989b583cce921dbf8bffecd3818fb27dad2a027 WHIRLPOOL 957399894bc9621e338c4fdeb754f99e252fc41195a133f6e6cb5efde946c04ed9125400aae357a2faccdbd08c07d4046ce52a5c288ca39f5ce95f9a403dcbca
+EBUILD libstaroffice-0.0.4.ebuild 938 SHA256 a429cbf2fbe83cd3cd5a8d38d27cecdfc277b6262f5bd9f36d8657c955a09bb9 SHA512 fe4d35ba9f0d4e811532a5a70c56a2e3b0e576220000ee5d1bd9348f7bf36327c2fe8f14acaf9c5f2244480a5372a4b0406d31595a0376629cb4876d459c976a WHIRLPOOL 4255b9fcfa87161e64eed85bac8eebe65173e12d928d66a23ea1c1092e2e180089e112dc87e5e9f0f6eb84f72b531662d4b1b1244d72496d72575f534ac59a92
+EBUILD libstaroffice-9999.ebuild 931 SHA256 444118af1a5a6972157fe5244227f781dba6f4b3e6434637cbea73ea22d9cbe4 SHA512 e03dfd8bc242f41415275a6dcb75d30a5e78918f504ffa1a7dc19923c74df4c5f23feae84a29553d9e4b5a84a989b583cce921dbf8bffecd3818fb27dad2a027 WHIRLPOOL 957399894bc9621e338c4fdeb754f99e252fc41195a133f6e6cb5efde946c04ed9125400aae357a2faccdbd08c07d4046ce52a5c288ca39f5ce95f9a403dcbca
+MISC ChangeLog 600 SHA256 69b7b2578f81466a7aa5a3db4ac572596ee7f40f94e83859b112f96ff4857460 SHA512 9e3a3f904d8a88618bbaa01284f400d966f5ddaaf7c477622444c45c01731cbe3162fc2001e5dae6f3cb87e2a8d3f194fdbb39c486620b9677228562314c9c0d WHIRLPOOL 090168f6366b83a74ec6a1f1c4182883fbfaafeb29952c6f4884b28248334a5f80028bacb30356a2cfddffd7d538388378867ba2c0621b63d56140d432585025
+MISC metadata.xml 469 SHA256 b9365f3aaa1a2c5096e1aa2491f70d06c1a45b307f7c95f09b4a752dc1d034e0 SHA512 2f352e3b818123c53c188dd2d31b7ea3acc1bdbe9dc127d44697512eeb2a7cf2e138b306c69c619cf7fb24d8424305ff4b3d5637fd945c2832a2dfb9ef7743c8 WHIRLPOOL 1d842b3fd1016936c82cd8fae1697e860dc0a65d8d3d7362be25f76472b1f5c9cc267ec92073680b572dafb1465d2de1f0db5b7ebf02d02bc6e6ef9162eaac18
diff --git a/app-text/libstaroffice/libstaroffice-0.0.3.ebuild b/app-text/libstaroffice/libstaroffice-0.0.3.ebuild
new file mode 100644
index 000000000000..57dbc81af329
--- /dev/null
+++ b/app-text/libstaroffice/libstaroffice-0.0.3.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 ~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.4.ebuild b/app-text/libstaroffice/libstaroffice-0.0.4.ebuild
new file mode 100644
index 000000000000..20a958e6735b
--- /dev/null
+++ b/app-text/libstaroffice/libstaroffice-0.0.4.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-9999.ebuild b/app-text/libstaroffice/libstaroffice-9999.ebuild
new file mode 100644
index 000000000000..57dbc81af329
--- /dev/null
+++ b/app-text/libstaroffice/libstaroffice-9999.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 ~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/Manifest b/app-text/libwpd/Manifest
new file mode 100644
index 000000000000..03ea5a005fd0
--- /dev/null
+++ b/app-text/libwpd/Manifest
@@ -0,0 +1,8 @@
+AUX libwpd-0.10.1-CVE-2017-14226.patch 2247 SHA256 de7ecfd890a8d71aa9a944963b17d0aae65aef554bb2ea8412e7013b4399f50f SHA512 f817c9f962b8caf3919eea8faf8c9222515b909934f49efc9f3d0fdb406e680ce05d1407cdd74d4befbfee8d2db41520f0c6c756c6d050720cff7f5d16aae073 WHIRLPOOL be826095c13e44d10a13c5a4355f3a3de61f4042a5389283f414cf95fe3e99bbf74afa5f89818d4418e41d5c84cda2938e5a010dba8886cd9d16f81c70b55697
+DIST libwpd-0.10.1.tar.xz 524004 SHA256 09d3410bc770f9d9eedc8544b5c211771ea3322de3fee19b58ad7d40fb2984f6 SHA512 976694b5e02fd9eb0b3769d5071e9ae88505f491d8fa34473e5b99cd350060a85ddfad9b3c38e9b37a280e695e4571d353fd69fe7b69a627097587912b58ad2c WHIRLPOOL c6c1124a7124edda4dad6788794c46067ad21c8fde0765ff1b1ca6305c08139e86ac0667d6fd6ca53e4bed41ad0b7aa6b4803fad5f7f72c529cf0c3b22bc7b43
+DIST libwpd-0.10.2.tar.xz 536400 SHA256 323f68beaf4f35e5a4d7daffb4703d0566698280109210fa4eaa90dea27d6610 SHA512 821dbc0535ebd4fa41bcf984e344e11176862676c66abebe45cf4284f8de6e6cc7629f8a605b169d034a5c2f3e2461513d61e11e549ca73b8328eb66ac3bdd79 WHIRLPOOL 9ac29bab74f6131966212b932601e397fb5f291aed78e5e1e9da1bafc3ac21329bf1f3b39fde4ed8e8b84918903bb5142624a44293631c515c96b8f9d3511cd6
+EBUILD libwpd-0.10.1-r1.ebuild 1357 SHA256 a01a046ab4f4bf3ec628026f38853a3fe8d81760ec1ea10a4b6be49c1e742172 SHA512 88614a13745eb1b594944ba6c4b68620fa4cf9c96f0d040e7e1a9b2e8f07733b6a93919086fd943818eedc0e29a877a682d19c3032a12c14aade9c96972f66b1 WHIRLPOOL a6937a87472fcf1e574f56ecfc15ec2c28f7a0bb81410928b5d3d75e97a6f6c90545d38cda4fe707380d05c6da752f77c5247e5a8c623db9374de7e3119f3b99
+EBUILD libwpd-0.10.2.ebuild 1306 SHA256 24d864e54861826e715c6bdd3925b51667dab954ff686ccf31bd4cdd90cc26d9 SHA512 26c24fb44e672e2b15f7a1fe399c45c622d33ff3d9d29adac709cbbdbf05eb7f076b3a6f4099e1842a282bf948b38691298d2be4fd3b76e4be99012d8ce00e7b WHIRLPOOL f7f99d82809404d9aae864dbf75bf7f1f83757e992653f93870048af5149aded41ef9c11c441a8e4434e0bf2a312c3a7f0a0b146f3258ac72245a421320cb9be
+MISC ChangeLog 3491 SHA256 9602eef0338576e65bcb7f493e9c270c2cb8a4081cfec334a667439cb27ac932 SHA512 115ff2b61759e6ab96d55acac00183b1f28108fddef5205ffa4db59b260b856ccbc8ff47b1e314a29ace1f39e70bd2c8597aa7c614893303a16b7a545775e292 WHIRLPOOL de14db0e27d620e6d3f3881daff03e2eefda3349251b274526c34af0efb4cfacf516b335ba7dfd7b94e1c48d43251161892917940f289da9ffe2ca41360a5efe
+MISC ChangeLog-2015 16613 SHA256 f97236f0af538975fa7a4271120f88560e7f39c1fadf6e070255642c995dcddc SHA512 e0004d6a76aaa241f534f71c542671b6ce278f8859d79a36f68d4a0a04c7cd5632b4c112ccc3f0a1f76403311c8961c0297559df7015910cf3fa0f33cf6911b6 WHIRLPOOL ceec052621b8c713fc0d14eeff309f1b6304db6172427cb1df14c6ea736a9fc3a9320fa6b9618956f0efbe811336e8cd78db474a7e86689578e786f3b4e3011a
+MISC metadata.xml 402 SHA256 e8f2ae86b0e2d7b188d94dc0a7981ada02d027367bf4577a0529008b688299c2 SHA512 af33c7d44f5766cadb1955928210dc6f28171eef00cfbdd96a0257226bb7eee560fb05cf58673dfbbef932600ec3e8fafa666db3f9c3ddd2bcfa5a2a90cd77f2 WHIRLPOOL a056475a17c5f567e6020ec3c6763879a8d503eb23bb3f5243a4daa3030759e40b19aa4d6718a63bda0b68a5ec240dfc20a70a63069d38a58b7c67595ba984cd
diff --git a/app-text/libwpd/files/libwpd-0.10.1-CVE-2017-14226.patch b/app-text/libwpd/files/libwpd-0.10.1-CVE-2017-14226.patch
new file mode 100644
index 000000000000..4a5c0df922fa
--- /dev/null
+++ b/app-text/libwpd/files/libwpd-0.10.1-CVE-2017-14226.patch
@@ -0,0 +1,50 @@
+Gentoo-bug: 630682 (CVE-2017-14226)
+
+Change-Id: I0d8d6887fa360c05d5f9e2a070410c77926b9ce1
+Reviewed-on: https://gerrit.libreoffice.org/42054
+Tested-by: Jenkins <ci@libreoffice.org>
+Reviewed-by: Caolán McNamara <caolanm@redhat.com>
+Tested-by: Caolán McNamara <caolanm@redhat.com>
+
+--- a/src/lib/WP5StylesListener.cpp
++++ b/src/lib/WP5StylesListener.cpp
+@@ -85,8 +85,9 @@
+ 		m_currentPage = WPXPageSpan(m_pageList.back(), 0.0, 0.0);
+ 		m_currentPage.setPageSpan(1);
+ 
+-		for (std::vector<WPXHeaderFooter>::const_iterator HFiter = (m_nextPage.getHeaderFooterList()).begin();
+-		        HFiter != (m_nextPage.getHeaderFooterList()).end(); ++HFiter)
++		std::vector<WPXHeaderFooter> headerFooterList = m_nextPage.getHeaderFooterList();
++		for (std::vector<WPXHeaderFooter>::const_iterator HFiter = headerFooterList.begin();
++		        HFiter != headerFooterList.end(); ++HFiter)
+ 		{
+ 			if ((*HFiter).getOccurrence() != NEVER)
+ 			{
+--- a/src/lib/WP42StylesListener.cpp
++++ b/src/lib/WP42StylesListener.cpp
+@@ -84,8 +84,9 @@
+ 			m_currentPage = WPXPageSpan(m_pageList.back(), 0.0, 0.0);
+ 			m_currentPage.setPageSpan(1);
+ 
+-			for (std::vector<WPXHeaderFooter>::const_iterator HFiter = (m_nextPage.getHeaderFooterList()).begin();
+-			        HFiter != (m_nextPage.getHeaderFooterList()).end(); ++HFiter)
++			std::vector<WPXHeaderFooter> headerFooterList = m_nextPage.getHeaderFooterList();
++			for (std::vector<WPXHeaderFooter>::const_iterator HFiter = headerFooterList.begin();
++			        HFiter != headerFooterList.end(); ++HFiter)
+ 			{
+ 				if ((*HFiter).getOccurrence() != NEVER)
+ 				{
+--- a/src/lib/WP1StylesListener.cpp
++++ b/src/lib/WP1StylesListener.cpp
+@@ -83,8 +83,9 @@
+ 			m_currentPage = WPXPageSpan(m_pageList.back(), 0.0, 0.0);
+ 			m_currentPage.setPageSpan(1);
+ 
+-			for (std::vector<WPXHeaderFooter>::const_iterator HFiter = (m_nextPage.getHeaderFooterList()).begin();
+-			        HFiter != (m_nextPage.getHeaderFooterList()).end(); ++HFiter)
++			std::vector<WPXHeaderFooter> headerFooterList = m_nextPage.getHeaderFooterList();
++			for (std::vector<WPXHeaderFooter>::const_iterator HFiter = headerFooterList.begin();
++			        HFiter != headerFooterList.end(); ++HFiter)
+ 			{
+ 				if ((*HFiter).getOccurrence() != NEVER)
+ 				{
diff --git a/app-text/libwpd/libwpd-0.10.1-r1.ebuild b/app-text/libwpd/libwpd-0.10.1-r1.ebuild
new file mode 100644
index 000000000000..dbd2ea12c0ef
--- /dev/null
+++ b/app-text/libwpd/libwpd-0.10.1-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 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 )
+"
+
+PATCHES=( "${FILESDIR}/${P}-CVE-2017-14226.patch" )
+
+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/libwpd-0.10.2.ebuild b/app-text/libwpd/libwpd-0.10.2.ebuild
new file mode 100644
index 000000000000..c541619cd91e
--- /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/Manifest b/app-text/libwpg/Manifest
new file mode 100644
index 000000000000..d0f845e19812
--- /dev/null
+++ b/app-text/libwpg/Manifest
@@ -0,0 +1,7 @@
+DIST libwpg-0.3.1.tar.xz 316576 SHA256 620d888c10d7e1127d5123ff0065f1b62b86b91bac27d8ae10dcfbdb6bf4278f SHA512 5222609510857d32250e25b1108ecf4c0ce1e58fba280b7c15d400bc8963112adaa9fffa3c21087d4984ec52176d69b30bfc9460ffef978d6b0d7ccc400063b2 WHIRLPOOL c35c51b5098757a0de9a1288d185708775d4ecc2b69ad76e818df5308ec1cbcb870552d45edfe011f65aff141e12656bf98a8ce5207fc0f12ecbc9c705afb3e2
+DIST libwpg-0.3.2.tar.xz 326840 SHA256 57faf1ab97d63d57383ac5d7875e992a3d190436732f4083310c0471e72f8c33 SHA512 f3f76a17056274b2dfd11ce4eb451411d8458b00b3f7be4fae0a932a382f247adbaae1f4f8f6005e7b84f063e415ef5ab609015ba32f779c6ab2f0404b275f3f WHIRLPOOL 492ebc20d136ccd2525c9e1b1ac5613dc6dc74df140c1e190defa22fa5fdb2c04765c5121764c0452087ac9038446384634e61d04512046c22784c523791d911
+EBUILD libwpg-0.3.1.ebuild 1284 SHA256 cb0f1a1b494009382dd1565890ca5d1de166ea64a8a4258d9631ab82c867c3f5 SHA512 10c37c3bc9046758d110594f43182c5b0a95ea63febce3a5aac282940d8c26bc698dba5c08bfba5d7b18b2aa26291d44bd3707a1b60671a25c07d90912248d5b WHIRLPOOL 771fb7bc416131d791cbc948d4a42fabcef10c4605cc5966f30a45a13465b62407257aa710ef583397930cbda933f9217e14cfa767bab9205713d4e9db5f02e4
+EBUILD libwpg-0.3.2.ebuild 1286 SHA256 9ebe321bd0592995653156f54439d320b22f16474b40ac2cb4d4c1e6b259e06e SHA512 826d24772498c6c4e3c9159f5d0a521361b1d578d2a7392cb3da5d1c1cd56cfa781f215ddaf748387fc9658b0c6c643f6db652224687f1edcb0c94117d6e7fff WHIRLPOOL c093a8e3994fcc2385f4eea7ed781e98962779273bb0dbbd090df2254a199fa87cf594939727ac3bcb2a5542cbf8fd8c3d2b1395e2d738b3ba21006376886ccb
+MISC ChangeLog 2904 SHA256 2070237e1d04337313d96ae6294f0189ffa5a5bb86c281c4d2415a33f3ede301 SHA512 6acaa78ea311cca014b2c5e8f2c9fa9ab8ad8fafccb9914f8d2dbf2f8c5d4b1ee1e6950551fb182206ae35ed73c7e14b08f72685592d9f91e4f7fb50b4810469 WHIRLPOOL 186287c0d8df8784a2e903a38b07042c67cb381e391b0e78291683c122f5bc6cc9d83402be23f87cf3f9c9337b0a970dbd2c256242de50444bf19ae1957b45f2
+MISC ChangeLog-2015 6547 SHA256 21c4a0c94bb8b435b55eb5452f782eae74b8e9567ff01358ab36c99e6a04ff95 SHA512 34623db3f0a6d2430112de405738c730b3bd3f2f5d464604f3053c0bf1c8a669bc3979dff5b9e4648bcdf1c8697fd6370407fa88810446a1b7776dd9d07e80ef WHIRLPOOL 48ff621ce5a002b09f8b4a798e5a5f38c68ece7c550c72b299ca45db3f6c027247632e92e0289ba6c81c2f309d02e90fd5069d7cae4301555e51ee601c1470a2
+MISC metadata.xml 441 SHA256 c6da58046a5521f66d095d48d22e734fc7979302de949b3ca7c1110b2cbb3590 SHA512 9725ace7bfceff2309f836bf01ab5da588f24da56d85e1130c098353e617945b820b7763cf0932e15e2b5d7ed339929fed26e8defc6a19bcad17235fe01bfc3c WHIRLPOOL 7d4bcd7254890d20724d331882da80fc37dcfe25f2549b991f30e435d88b722b882233c31c022f003ead3761aca3b5a18f595755a10dde1d2fca75d4d9b74d34
diff --git a/app-text/libwpg/libwpg-0.3.1.ebuild b/app-text/libwpg/libwpg-0.3.1.ebuild
new file mode 100644
index 000000000000..46042da23141
--- /dev/null
+++ b/app-text/libwpg/libwpg-0.3.1.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/libwpg-0.3.2.ebuild b/app-text/libwpg/libwpg-0.3.2.ebuild
new file mode 100644
index 000000000000..c6a8e938c204
--- /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/Manifest b/app-text/libwps/Manifest
new file mode 100644
index 000000000000..0c49e9054f6e
--- /dev/null
+++ b/app-text/libwps/Manifest
@@ -0,0 +1,7 @@
+DIST libwps-0.4.6.tar.xz 592276 SHA256 e48a7c2fd20048a0a8eaf69bad972575f8b9f06e7497c787463f127d332fccd0 SHA512 00d1d9108f405cb5eeb67985057f0c6a5d9dd8ef9c3daeebb6739e10a38a5db7cbf22a9e4d09684452376896009993ba08cb015ec0616b56c222244d87a3241e WHIRLPOOL 31198a1889148c87357c0411cd7c28c75de69048ed9c589e98c8a9f866a18295a6d572308966bc1173f207499616bcd1e87eb48bbbec5193fef36228a23ca5c5
+DIST libwps-0.4.7.tar.xz 595580 SHA256 2f2cab630bceace24f9dbb7d187cd6cd1f4c9f8a7b682c5f7e49c1e2cb58b217 SHA512 d38b778016f8ca6a44edba86177d28a3f0bcd338e57276a615eeb9d470def71aa9326c3077789129418b38e88ae6f6d1901d08f5716081ba2eb9847a133c96da WHIRLPOOL 8dd7cc93f9a9da8e1685ab40c9a8fbe92bc0b1ca1c2888c9d70681156fdaea918dcef2bc6ed31f8d0d6a1345009275cb5517cdb513bea8abd90c17b124aba5e7
+EBUILD libwps-0.4.6.ebuild 766 SHA256 a51f5d43bc7d49c107120ca2befeda68d3aae84faa116f507114310bcdac0fb2 SHA512 bbba2450fdfaf1afba70e24b111f901757a3424565df25db914fad9e56e559a1b5b6c386a47f89a5890ce8f9ef0217c18d66796bc7bade923bcc84384b3012f8 WHIRLPOOL f4bd60524482e21ff5af5936befa061cb99518641d2198bf22cf4d2d38201451aa4396c55527d3f50e7e2e0956b9a9c49944d74eb38cde191fba768ba6119a89
+EBUILD libwps-0.4.7.ebuild 775 SHA256 eee73f16d41e124d377e8fdcbf5846f02ccdc97493f575e085a343dbbe92c545 SHA512 6ee24066264c1ebe6ed50deb1d766e4e26df51ee588a62c907436ba8a0c73c975ba3726f050b808413509fb73f8f0040c8ed1642a2f27f1486b6c73e20092509 WHIRLPOOL ba326e94aeeaacc5fb88ba0d64aca8ecf75df2b46e3313ac4417a1ab8a5a22ba8f4deea5ad1848716f670d22404aa1eb080a6c8a3129c38c827c6e8449eecd77
+MISC ChangeLog 5631 SHA256 ae6f5410bc0d2c239f3819bbd1c5a8394092ba30f5068590082bf06a713f82b7 SHA512 83f3217b2759dfce2e32913e85119a3c79c7f3163c8505cd17ba4fe89e2ba50a3c8bd3d190d9b2b851a2419047e1b0ed9266cb0504e1ff0cb6404f882e95565a WHIRLPOOL bf41a82f33f59b353a1cebb81fd0d1206766209200721b052ddfb685b60475fbc38b2a661568d6dcb7772408bd41011d714c558e48b7cb12160e6dfed17d0d26
+MISC ChangeLog-2015 7840 SHA256 65bddd4d5e189b67fde63332a26b0fe069eefbeeed88c8a76b394f278b8fdec2 SHA512 bfa05554c7acc0c1ad74f5be0937c310ae8a6a8de54902b0312536ecea39b0e8a7f4575ab5ff8fb829d02b1d83e446ec7456917c434861e2e4bd1ef0c8c3a32d WHIRLPOOL 53599a84f271e81723bff43e284a773ac0995c52914528ca0bb8450135fb3dbc30ebff72e20829e6d80dde3fbb46493b0da3e8e56a54f6b6ee13be57eeff2a95
+MISC metadata.xml 512 SHA256 059cedc7383a5f3094024cd5ec48b6702692854c934a50c325b8b5385096a7da SHA512 971b6f541825d73b66f09bc6b6ab677c2b1f1430a6cdd469dfe57162528d13b048681c8e00de061aa8ef5f98914b36b8bce7e13a35044937e65298469241bc1e WHIRLPOOL aa62ac9cee4993753f54d57df5130ee17166587b0ec15519ba3de57e276ca59d115c5df81af637f8cee4e6b488cd0c8ac61d925b7e894cc5a667e0612c66a011
diff --git a/app-text/libwps/libwps-0.4.6.ebuild b/app-text/libwps/libwps-0.4.6.ebuild
new file mode 100644
index 000000000000..c4509e0069c2
--- /dev/null
+++ b/app-text/libwps/libwps-0.4.6.ebuild
@@ -0,0 +1,36 @@
+# 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 x86"
+IUSE="doc debug static-libs tools"
+
+RDEPEND="
+	dev-libs/librevenge
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+
+src_configure() {
+	econf \
+		--disable-werror \
+		--with-sharedptr=c++11 \
+		$(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.7.ebuild b/app-text/libwps/libwps-0.4.7.ebuild
new file mode 100644
index 000000000000..4fcc13d5559b
--- /dev/null
+++ b/app-text/libwps/libwps-0.4.7.ebuild
@@ -0,0 +1,36 @@
+# 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 \
+		--with-sharedptr=c++11 \
+		$(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/Manifest b/app-text/libxmlpatch/Manifest
new file mode 100644
index 000000000000..3cdebb75c136
--- /dev/null
+++ b/app-text/libxmlpatch/Manifest
@@ -0,0 +1,6 @@
+AUX libxmlpatch-0.3.3-gentoo.patch 2029 SHA256 a11868632dfa5e1f91766ebddb0ef0ab3e9454212d8a16dedb05c62d98ee98f6 SHA512 076f5ce303fa410ed48828bfd4c9544d4606511597bf39676a899fb577bc4670db83706ef05928d9e49a665089864d6fb2e22321c19217ed341265d57d2c4052 WHIRLPOOL 58585560c12478452b3461a8f0f870914bc77f25a6e5cdf4de08337a48aba063ea0e19a41333da37f530a7f3df52059f0921c44ad464725df3a1b2e8531a7337
+DIST libxmlpatch-0.3.3.tar.gz 405496 SHA256 7236eec7bc450580c99c2d465ce2573687bb0229aa469e961bcbb0ffcb029d55 SHA512 2eb305ddd6aa1778bc9c9e7b8cae5f82ee05c0ed0a47bbb651209c496fff68f4e527b7d6ad1808bc8bf1f72aaa0172a12ddb140622ce87e3cd150a0ec4d35571 WHIRLPOOL 4a65435573490a7d07279ee7d7c6701ba3942c7b2340523af91481d46a1dbd4131cf19ccdcb6be0506735fe260be93e772839808b6c455781d81b8f79ec65def
+EBUILD libxmlpatch-0.3.3.ebuild 772 SHA256 68e97786dfd96862a879e02dd79b4586401c0b3f61346c308277a5c29d5a5a46 SHA512 9087aa0c074e6c7b11b58bd02a6f8c19ba8d8c6730712a3157808de30b4064956caa862bdf31a7127b7772b6b7deef46597aa3d63cd197a0579bd9694a283f02 WHIRLPOOL 8e802e36934e387221fb61ecaab3538cb72ed9cd2b9bd11d9cbad73c6278fb76cf4bca72109e92499180f7ee1823e721f0c073e678dbcc352ff83a229b5f943e
+MISC ChangeLog 2575 SHA256 19bd93d3c30107e6efab6a7741dbf3113d413d3b87d67cbcaea1f5389aefd5fe SHA512 c2e4747ea4475051f61e22329e64e806345daefa629ed81997ec4650754b7701f638d7e366746aae5830a0211478c83c5466c61be16524fe6d6ff47823b2f376 WHIRLPOOL 48fa6b226116e503627752f2b847d069b6a9c3ecb744283e8f2328c091cca02e829bc43cda764eb72fc6f02a8fcfb8d6268ce508028886c00911b98599e2c6d2
+MISC ChangeLog-2015 1444 SHA256 245c758a82358c7e2ad49bbd960247688689a4c2825bfdac405ba87dc95fc5db SHA512 57bd4c363588813f498901b0631e8e1888016d03f19341dff631044eb069049c148a480951cf0e5930a685d4010779a546b39da202045542b94b1f3cff7b63e5 WHIRLPOOL 386e8debb84afc02fb7a3338301427d325eff82b270ba3d83985028742a0f80ee6de594e41e06da83972d9d14523cff6cae9ad4fe1efaef16066711e733b3e2a
+MISC metadata.xml 245 SHA256 dc8bb5c266f6f92e80973b0def2a91c2b7a9532cb70f52a49981492514757907 SHA512 f884111cb1a85bb4e909b8bc6a70ca00e8d69e066fc9ef79ddbf0b3fc277bc8a47ce13bc1b7bd03a4be9bc0a54704440552394f1d1a8c68d0bf9704b8f05769f WHIRLPOOL 6cb421f48de37f0c9087dd982ecf9881a7366ef65a5e8d430206e1c4602ba1edd5b8937bbbd7b403d60ac104f7f7c2ef1362ea2ad28a924532bbc709ef60e78a
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/Manifest b/app-text/linuxdoc-tools/Manifest
new file mode 100644
index 000000000000..ff9654aec498
--- /dev/null
+++ b/app-text/linuxdoc-tools/Manifest
@@ -0,0 +1,5 @@
+DIST linuxdoc-tools-0.9.72.tar.gz 614429 SHA256 664bfc4e580a5e7b8917104aa93b7f5021367e24ee22d67411a5f3f27fa81ba4 SHA512 2d522a99212dab2535786b64e0b404a9bb023d1612d8e57a628de21b5e77b104285713a98591c61a2fb2196e687b34180198ab0dfeda2b44fbbce051e9919408 WHIRLPOOL a9185f1666675d1ed398b9b96e798c7788e52d1ad57e39692fd9d06174f111b559c9e4f62a5762b0d0af3a7fc3d7d943b9e788d2d9df031f3d0cf4e2595587ee
+EBUILD linuxdoc-tools-0.9.72.ebuild 1777 SHA256 10825c5229f22dfd0614c11ceb7366f151b14415e5126d7702c9fedeb82b161d SHA512 40632a82dc9252a4bac966174c4e87f6f1adf075fb2ef125ea07ccc5796b98e74d8823d1afff11f98e042ded4eb5b7da82a8b8c5ab052e4f7d53357b84cbf649 WHIRLPOOL 3bda25cd82a5263c54b1c22d2fcfecadbaec0b3b5c5ee2f0a7dee0e3181ed500bcddecfb24018fe55157e49f6f17f8568ee45d02a319929ed3d6731885722959
+MISC ChangeLog 8752 SHA256 5c5021af2cff651421511fd761707d96e0cb6a43d0ffa059ac95bc7d7f451b75 SHA512 f5aa770304557466d3c39d19033421600a7536cda91b3f21238c5d6d94c01a33aa889f48eb546e1e91769dba4cf6bbd492436cfd80e5fda7a6ab89e6c4ec2160 WHIRLPOOL a5ef95a2d4513611edb4f93743f561897fbd8aa63b704a288fa4fd44f26559455fa9c209564d7e304339f6395d2756693c7e2d8a3a0c291be304916b157c83bf
+MISC ChangeLog-2015 4827 SHA256 643c8a92ed36c263bb293fe99c224210f435d51a3f135f6f8926274ffb4f81c7 SHA512 9d12067c92d7e7f9ed31597439726462abe50518c485b895d3e23e0de4b0bc13d45c3fb58d5d57324c2c2035a5b1ea4e4a1ac596bc2b778664e05c361b89e0c7 WHIRLPOOL 083853bce70d9403faf09e7fc0e3881613dbec47f859f5d5bea6d3560c6a9bc595880fa76fa681b9f379ddfc5c4572a7d118ba5b403ea763ec2323c4e912f0b9
+MISC metadata.xml 911 SHA256 dcd2d0223d26c84f80a30953da23929e601960896f3f5a850319b2411c18a67c SHA512 6afd802552b700006b38a5eee516e5e1f59d0af0dff294bc2807804f8a85823ca2c5a928c0cfe2d5ef74d8c34521ecdd2a54d4ff5a1d322f17d42a6e5e6ad0f4 WHIRLPOOL 10b9193efe3623d0295897dfe43c37673d3aa816620b28fdbb6b6bb44c8cda8af06fc4645ba1f850f51c479f282073bf9350e6e6a1b8e7f97659ca761a0b30d2
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/Manifest b/app-text/llpp/Manifest
new file mode 100644
index 000000000000..254772ff50bf
--- /dev/null
+++ b/app-text/llpp/Manifest
@@ -0,0 +1,6 @@
+AUX llpp-26b-WM_CLASS.patch 860 SHA256 75b53ce00f0bff223a2fb4840ba2438019ccba6c756f453632a6aefef7681c2f SHA512 42973fa329ab7fc900b1a5e86fee70918c5e78486cfc6fcf4802d9dc3e5a8a902d866a1ad23f3a6febf1dcd2d18f90389369d89024e3e1727a19fce456cf8604 WHIRLPOOL d8f906c0026e3734315053fe5f3f0e51e787d78551711e07a28dc047b66a2c52de0b633c5fa6514496fcc8ee5f74b1b4924a1adf1cb62da625dd83f04eae0da7
+DIST llpp-26b.tar.gz 169385 SHA256 1c14c794cefddc38c2acb72233ded21380184333571c9b2b01cfc108c9068798 SHA512 ce7d743d8ec998a93cf272083dc5926ce6a250aee6ac768814f511ecb309ffe94fb0e2561ca1778e1c7fbd5824545477937618c8e66d32fd273f9b5e5e3fd143 WHIRLPOOL 2f5c85d56cf1ba3c33012fe7c9b783fb343b752a28ffef56bef2e82d560489e55f0fe090261f6582fc1a28fad0b5260e1dc7abe3e106ed24b74ff355def6cb0b
+EBUILD llpp-26b.ebuild 3077 SHA256 c798cab086b24fa09871b4176363da97a4639df326e72543959e49c83591fa3a SHA512 0fa627c9ec0cc4b086b32249af7dd215a92a43b46795586b8135d65de754ab4116de16e17bee3b877a1c3eb86e03870107a16b2d2793effebe5df8c9d1a23b80 WHIRLPOOL 86d1f0e50705edc6883c999de6708e1c03498d3b8fffd728a2f9897a26982842e0bd951f9f3976b27ad2ce81d69dd46b7c1269b4c1e358d6209362d04c49aa0c
+MISC ChangeLog 4530 SHA256 0110677ba3b043b8f4bf1893aa2728202b668f8963487ad458608301069f2bf0 SHA512 4d4786dc653224800ea06c8fd8babce2cd9fcd7cc4704d200500c8f00418922a568429741b1ea8dc83566e1609d46ffde8053f20c251ccd5606545bcfe9a8bde WHIRLPOOL b801cdc126534c8a8bd920519b6fb23072be610852fca88f9fd55dda12937e1629daf2f6c0b439035acf5fd67ec3890de10bf03fe4bd3d004575148e00d20b71
+MISC ChangeLog-2015 9408 SHA256 87cf9afc8920652220d101ee4805165bb695bfd94f83d0d0d02168d925a8f7bc SHA512 9674319838f0a754e19a8395ed3bbb6a040419d4231bc00606e2026c50a557750c3383fa8fe5cb57b5a14667702f04340f2eb1eea8373b81699317db3e157ba1 WHIRLPOOL 69d60366b67f56b59f3cb017c5cae4a340fa7a48cf4d1202cd4a5fcfe63388ee8955f9b63d493090c4b851671189384c3768dd199f5c8a545f66d2508cd2b227
+MISC metadata.xml 237 SHA256 ffb571839c57797d282263369646d2bba2662601a45f7bb3251bb97f716554a6 SHA512 ae2360aa6b1b00c67e0acea4935c02b64585b9a15e126fec9d5d99637021c542c0a495e5116205f3da287def46fa5b19cb1a7f3042c12c5f7a78d66d92fcb03f WHIRLPOOL 60d6da846c983457e038ea5ba3c0bf48f939c9586610985a14cac9772fd1d45d781a643abc16482f232f3028e44fe99fe1a382deaebf6589602fc244a4460e3f
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..a597bef81e81
--- /dev/null
+++ b/app-text/llpp/llpp-26b.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2017 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]
+	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/Manifest b/app-text/logmerge/Manifest
new file mode 100644
index 000000000000..e59385a36e0c
--- /dev/null
+++ b/app-text/logmerge/Manifest
@@ -0,0 +1,5 @@
+DIST logmerge-0.5.2b.tar.gz 3407 SHA256 f24fe4f6f1c2cb543012e1be360a02eeb9119a1cb2ccc0afe7b5d8edc7ebfdf8 SHA512 9185d52c62d2ea68fee0e1c6fa798cda60b4a2b621436f5060d7c9b3e5b15363fdb1c9fb40351f66dc48173498f3b18035c46fcf58fa3063bad0008b9bb5946f WHIRLPOOL ea469ca6dbf5e51e1ddc98988510f094bac9c69a79e12799399bd7d07b586d2a7269fb6d91fa5e97c9007ecc5d4bca69a7c36af975bd4f787f57fac5991c2866
+EBUILD logmerge-0.5.2b.ebuild 450 SHA256 83cb176eca6ccff88b080ea1f5eb85b3ad28bf2eff1021689ad03213c99e56a3 SHA512 a542512742a0597691407e8d6f1a4756f8cc5c98fc30d2210701ed36f2675b57187969e38a576feaa26efa2f476f338d7f9fc15e7a299b931cfbca60eecb8604 WHIRLPOOL eda808f01f0ef11a13929767b792bb712bb12dfaf8a1f403e03a9034aaae0893f2cd0415b8ebd89d6b0ad8cca6bb0960315723d94b9eb1543be5dc4c4ddbaa93
+MISC ChangeLog 2850 SHA256 c25df6ce0bc7628eb9bcd06cd6c406c8b564d9ae0801fd3b08d3a40a8a4228c4 SHA512 c5dc48220eb7b87fef8bdf3c3626129d6900eb91af8e8f77c434263c046e4e8d4d72077e86ed8d5c16bcdd43eda77ad963ab47d42c319a61f1d1286dff36509a WHIRLPOOL 8eeef777dafee6321059a5ce6ca98f9a90d02ca7acec426758bfe5ff995a38a3a2f0c581bfd0632b482ad76b39a12532a79008a28bfc23a8e6b2ad5b0709e5fb
+MISC ChangeLog-2015 786 SHA256 ef13aed14ec11af2a66bcb9ddd1f5aff46346577404644944a0efb5ae0e331c8 SHA512 f99d1a30e5f93c20dbc44f2c92e16806112c92feb829ab6e4378fd321e0ee2f1114d671d9f7a89df565700d403534c904265b6932879db9a82e71e8528954208 WHIRLPOOL cc3df89c26db1cabde213e9ef013678a7dd5bfd6b46b2967cda401ec34c883fccbd762425877998f9b1ccf3c121d3fe2a62f9dd7c2388f92832f716392144f3e
+MISC metadata.xml 404 SHA256 dcbcb9d9dbd7ebf50b4abe0dc7682889581f3445112434d2983377f4456a74fd SHA512 f35a08d3fc5d52a61e91ec28c1b15cb1fbaec77f1a5652b4cc44d7f12b675526111349f3b96519d705b42d2198ab545d81fbfc8c4fdd56e4a3ee11346dd85d24 WHIRLPOOL fe515171a2a9c95fe43fdd59d09de88146d267f0d4aeacaf303957ea038b410f14ee3efbba1a0ba4e2a0a3e4b6f4b55704e3f2da7d9fc4923b629609d5c9da08
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/Manifest b/app-text/lout/Manifest
new file mode 100644
index 000000000000..00e73597dbca
--- /dev/null
+++ b/app-text/lout/Manifest
@@ -0,0 +1,6 @@
+AUX lout-3.38-makefile.patch 715 SHA256 4418a5b83d4868ea418e1026b704a5ed1217aa84a9b383d225eee6e540b4c95e SHA512 17fbc465143bec59ca1bb410aa3b4e376ce2fc4e65a15747f72104db9387ba9429ce21f83e2b64224ed8b856c42b68df4bf27e2c9df9ed4d9bae872b126967bc WHIRLPOOL 8f1b04d196a2adc17dfc7d9b1e8e766ba706cf063173cc082ecea1c7edd4bcf24ba9c6286e94ee976176855b8fd0ab97c6ec587b94ee704377edfedac66a1521
+DIST lout-3.40.tar.gz 2172651 SHA256 3d16f1ce3373ed96419ba57399c2e4d94f88613c2cb4968cb0331ecac3da68bd SHA512 adffbb44b9328f0d64b1c8f08fe0217307b1cca870827ca54e0aaae5a2258f519e3e6f0adc715ba6d192dd731ab26c2cc86aa8611d991d5665503842e599c061 WHIRLPOOL 6a39cf906cadd48404f60efe0cfe3adf5126ee2f9372b8019edaae21be0a5f4f1430b51d6567486be13c302841e1e0f393e7e03060cd9853273f2c23d69b1b95
+EBUILD lout-3.40.ebuild 2046 SHA256 f4b42f965671dae36a856c28fab4c9e00f7542e4c1978fdf9829af662d00da05 SHA512 31ffe212dfa3f64156ad8376c862eedf4ea568c2b3649ce92d62789820cc8bbc7f2c9778e08fc29d5bf0dea76064e6ae6caac62f7692153109fccf9dd83ffeea WHIRLPOOL 47804c7e471db91ee36563b4886729365c1c43e2bdaec048938561eb0e59ce52b4b55626c524507c895b7c7621f9517f40da3592965cdc759416d890c411d4ee
+MISC ChangeLog 2596 SHA256 7d305b93292ffbd70b7576d0f6eeaeb3a60e31ab09bb352b5d167bd856f58d3a SHA512 feef9adb111fe26f16afba700f331ed234df1dfde0894e465727031a4659e95d0564b40a9028fdbd555b000de6010c047004c51a4934be2aeddb912e3f18a6fa WHIRLPOOL 79270dfb6f16bea2e68b12fbf2caa201207eaa6aad29a5fbf806aaf01a59710eb651bb8713f8b32da8f08dd7b14c6d3eb4337255b03b00078a8d3db16b96553c
+MISC ChangeLog-2015 5102 SHA256 081fcc9f8019d2d0a5306bf9e59b5736fe96e59a6a797618306547e66342d3d6 SHA512 ddf02952720c9cd7ba4048780fe0dd5d4284873e4eeeaa5dc25e308dddbff3a4227f583c830615922a5538ed2eb2423b3ff6bb8760fe25834279d576e7b89eec WHIRLPOOL 4ee53b26d1bcdf478e1338fc32a69bce6df1df7e460ad2363b96e3c8e1a3ce29dd51e0c52bffdde87e2eaec1735f79874510eff1e1540f6edb7abd11d6c98013
+MISC metadata.xml 241 SHA256 014ba5fd77bbdbbef71baf20b6b8003b4a02d221336cbeaf4da5fb9ad398a205 SHA512 a51c29d1e99be12f982724f0d4e738b509cbf9bdfa71461320386fcbd9f44431c09e78487ea246540285b39cb271d5e75da04512ef89fca87729161388aaf8e9 WHIRLPOOL bf29fed236f9e4b007b294a5f9d55de88d299df5fcbf76d11270cdd94949fb96c5661df225d3ef2ab927d3a48b11a39325bdc80c32c248a72d45b158c693f4a8
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/Manifest b/app-text/lv/Manifest
new file mode 100644
index 000000000000..6486d1214665
--- /dev/null
+++ b/app-text/lv/Manifest
@@ -0,0 +1,10 @@
+AUX lv-4.51-gentoo.patch 1385 SHA256 84df1e1816664648d4dbbfb489ed3e4a815a58f6f8e2b205c8d823e5becb5fa8 SHA512 b8af37ef32cb61a8d4903faeff2ff7f9e3cf4e4f0f3bb167503792bd0a3ee870c1c1dcd0d483c902e49c280e7d0783d4f34323bffa3aa9fa6a603d80c391d647 WHIRLPOOL 7ee5b40f2b1384372b1e0d2b57b4eeda395e9ac4050fb6049607da003f17251805e460c4374896be759883fa32f4fbed0fdd38caabd3b7b66e8489a21a40eada
+AUX lv-4.51-protos.patch 874 SHA256 3ddb5f109e6248a20b2e4827535f6a67d84c7c14206153c86635813849378085 SHA512 785c95aee52503d573269ad8a6d8d879462cd754ab2b1ed79e02a43dd2b8ae8e472ed3fdd8985ef8baa9a6aba564be3960f9f021f2a1d113b6e781482699ce95 WHIRLPOOL 595f4367665a8cf9d88825caf170fc4e34570239a22f5307923119d59d715b6902d45a30ba2451634f3cb1328396f1aaf3b3dffb3274d449a9a08d6b826a3a2a
+AUX lv-4.51-tinfo.patch 708 SHA256 9c40ae773f096fea92b5af41796d89f98571a46baa80de83bd5654e140268939 SHA512 3b49387dfeceef6cef6676c0fffb2e733f995daa5f56714fb4c15c47b7ec8a48f746c065fd3b11286dd578ef6c93630940e17342b8d858267907705e427dd962 WHIRLPOOL 1ecc84b6a9e7aa953e4391ccdfc9c4e9ed705aa2e46d91e60ff9503dc1498a191e800796b656770a4d093c6cac66f84344b7f685bbf1e9e5a61de81b6c4ba408
+AUX lv-4.51-xz.diff 1445 SHA256 f895df2b9f801eefb8d19503c1f2ff668f434ee8d14cd4257f3a78feab638ab1 SHA512 fb48d11cca4ca89d1ccecd267ed3a9502ae6541fa1c9564852742979e0dcbb4ca6e083ae90b65987366d3a3f6d43d4411af6ed1bcaa181908ada8ee3b4354f72 WHIRLPOOL 8138f8831a955a6de2955ec9a76e143c9464cd6b7d6128c046a4feb09f7043520a5a8f6b820b95c9eff1ca3878a281e5eaad889045c65aee0f1c341ecaee848a
+DIST lv451.tar.gz 605082 SHA256 e1cd2e27109fbdbc6d435f2c3a99c8a6ef2898941f5d2f7bacf0c1ad70158bcf SHA512 88c05cb06ddc56e7f16f30b38218ec3bf9c8ef6c3c2b08d5a3f950b6870b82417368ada3f14f183b0feb6ed32d144d71901ad8134e5f88ddec11fc7b9520e810 WHIRLPOOL 9dabb78926c0e7dd7f4ea1181a2e3e9bfb1f2819d4b71c1fbee05779612e77fc4e795d150aba3891f2f4b57ca0f2697353813e30b654640a0ed58c4e51cb4b8f
+EBUILD lv-4.51-r3.ebuild 1009 SHA256 50eacd6b52c8687df583d51da3d82a810acc8b47a02a841a9fbcadbc6370ac0e SHA512 f38131dedfe7d7a8055e26d809e4acebd1f63966f7c9c186cba579afc1bc99139686e37e9ec4536fd56828d2fd5d6562dfe77f179917896c7ec084441bfa980b WHIRLPOOL 0cf2e5f1def909ecb276887746380334577c5a26b6bf827a0bf58c310a093e43fb44fa36b4a6ab890cd4af892731a85bee51a2114f9517ed710e669282502f05
+EBUILD lv-4.51-r4.ebuild 963 SHA256 6d592a428cda8c6f98992422bdcc539d09df7694be44a2b9b5cb5b89ddeca995 SHA512 c43686140618d519d89e9dc5036b45ecae9c361e03150892f2333cc572352b73f9fb460ace04f6f313354a3a1861efc435e59a90886551b34fef87cd63910416 WHIRLPOOL ba975f44ae17b0a1b9abe35c2728ee9cccda83861117f5ecf39a0c26b13dac68e2839125421883c2d12b9307a1bdb3d0b5a793819c6a994a5ab29132c5b32b24
+MISC ChangeLog 2499 SHA256 31bfc4dadcb46fd3692bd259367758f222889a99fd1b23b0547701978f73c342 SHA512 096ee9bea2202b9baa83fdfa29a9f2b8afb127e1a437edcf6989891222975f391c4a104b5cb9d477d007d4c695b41ed8e21881b2f5505251fe72899e8e54d7db WHIRLPOOL 997e635410441ef249ea269b906ebc6ff208d2f55a3143e00e36de296e1673375d6bc629810b169210bb9587b677bc7e47de21d68c42702421141be70bc6004d
+MISC ChangeLog-2015 5255 SHA256 881f94b40a73aa7e6172e66a4aa5b82d12ce3872d627a0cd08c75721957bb816 SHA512 09c1c3f03f5f2ee60dec787e15de6dc50ef6204a3c6c2f2338ae2699d075cf7333f4ecb581af9a951c2d46b3eea99182fa16309114c5021e8437741a322ceee6 WHIRLPOOL 789f07c9b1a6662106aeb46820b6e8d34b1c54fcda8636d1a53fabe2e7abce8147145368da4815e2c5943e98fd8260a9a1bee760608bedab73bdb1f2a6736d19
+MISC metadata.xml 358 SHA256 43661988a455151391103a9ea776235c8a0d4c0ef81870cc95f31863b8e64148 SHA512 7b250d5ddc092d7ecd4e6f48175e1f57f1671af4f8529368f368071b777fd773e363e83bcd3cfee3c9352ee93c9c0bc205f940c4cb6601dac3164ad34766e6a1 WHIRLPOOL 727008f8359e00e2d60dc8e5298c39b752e3d5babc05e547444c9e1b5ba5562fec9935f0db85d3017a400333ec03cc9adcc296c3ceb537621c7c039805105502
diff --git a/app-text/lv/files/lv-4.51-gentoo.patch b/app-text/lv/files/lv-4.51-gentoo.patch
new file mode 100644
index 000000000000..90acab49fd16
--- /dev/null
+++ b/app-text/lv/files/lv-4.51-gentoo.patch
@@ -0,0 +1,40 @@
+diff -Naur lv451.orig/src/Makefile.in lv451/src/Makefile.in
+--- lv451.orig/src/Makefile.in	2004-01-06 16:22:17.000000000 +0900
++++ lv451/src/Makefile.in	2008-10-08 00:20:13.000000000 +0900
+@@ -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-4.51-protos.patch b/app-text/lv/files/lv-4.51-protos.patch
new file mode 100644
index 000000000000..602ef5f6117f
--- /dev/null
+++ b/app-text/lv/files/lv-4.51-protos.patch
@@ -0,0 +1,29 @@
+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]
+diff --git a/src/guess.c b/src/guess.c
+index facd95e..555acd3 100644
+--- 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>
+diff --git a/src/guesslocale.c b/src/guesslocale.c
+index 7974c88..c259723 100644
+--- 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-4.51-tinfo.patch b/app-text/lv/files/lv-4.51-tinfo.patch
new file mode 100644
index 000000000000..9c17a92a65ef
--- /dev/null
+++ b/app-text/lv/files/lv-4.51-tinfo.patch
@@ -0,0 +1,22 @@
+diff --git a/src/configure.in b/src/configure.in
+index 7d118de..29833a7 100644
+--- 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-4.51-xz.diff b/app-text/lv/files/lv-4.51-xz.diff
new file mode 100644
index 000000000000..058029b8be28
--- /dev/null
+++ b/app-text/lv/files/lv-4.51-xz.diff
@@ -0,0 +1,43 @@
+--- lv451.orig/index.html
++++ lv451/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,
+--- lv451.orig/src/stream.c
++++ lv451/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 or bzcat or 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..b7a63bf3f3aa
--- /dev/null
+++ b/app-text/lv/lv-4.51-r3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 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/"
+SRC_URI="http://www.ff.iij4u.or.jp/~nrt/freeware/${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="sys-libs/ncurses
+	!app-editors/levee"
+DEPEND="${RDEPEND}
+	dev-lang/perl"
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+	epatch "${FILESDIR}"/${P}-xz.diff
+	epatch "${FILESDIR}"/${P}-tinfo.patch
+	epatch "${FILESDIR}"/${P}-protos.patch
+	cd "${S}"/src
+	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..a1b366d3665c
--- /dev/null
+++ b/app-text/lv/lv-4.51-r4.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools eutils toolchain-funcs
+
+MY_P="${PN}${PV//./}"
+
+DESCRIPTION="Powerful Multilingual File Viewer"
+HOMEPAGE="http://www.ff.iij4u.or.jp/~nrt/lv/"
+SRC_URI="http://www.ff.iij4u.or.jp/~nrt/freeware/${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="sys-libs/ncurses:0=
+	!app-editors/levee"
+DEPEND="${RDEPEND}
+	dev-lang/perl"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=(README hello.sample)
+HTML_DOCS=(index.html relnote.html hello.sample.gif)
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gentoo.patch
+	"${FILESDIR}"/${P}-xz.diff
+	"${FILESDIR}"/${P}-tinfo.patch
+	"${FILESDIR}"/${P}-protos.patch
+)
+
+src_prepare() {
+	default
+
+	cd src
+	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/Manifest b/app-text/mandoc/Manifest
new file mode 100644
index 000000000000..a0f95d33c809
--- /dev/null
+++ b/app-text/mandoc/Manifest
@@ -0,0 +1,5 @@
+DIST mandoc-1.14.3.tar.gz 617202 SHA256 0b0c8f67958c1569ead4b690680c337984b879dfd2ad4648d96924332fd99528 SHA512 cd638fbacb068fcd6191f2a4e941effc010e3ebf06a3e32847b892c2e561771d03d5bca8fbdf8434d6491f4b68df3f443e2568b79193b7342044fba476fcd30b WHIRLPOOL 1aece4e6735008992450167a55274bf0ea97c064c33adb252343a031d18416ff951ceacce9f8c86118ebe63711302ec09ce7b4e495b1cb9f3f383af8b8219c50
+DIST mdocml-1.14.1.tar.gz 549302 SHA256 356954f141ec6f5635e938c826f2e16e4619bb361c64d84a31f6775d030a615b SHA512 90f00297d162faa404fe4e530f95422c210b8d23a0be5a115c2c8c17255d366e224444901842affb06ed8aaf8febd3e5c79966ff713fa7daf00e8c48b7a857c6 WHIRLPOOL 28f67bd250d8fe7730bb6906b4dd9fc67362e36af23c2fd43d2109f0db2eb227db023b12b946d0a71e198b3f199665b21e935a016f577c4f35fa0b732e9918d3
+EBUILD mandoc-1.14.1-r1.ebuild 1549 SHA256 3aea3526b21055b2c7f01f933d376a24fba42aecb8c923ae8abe3f1b5b4494b6 SHA512 10a594d1da10cd7e55bf0aad3ee788b46a533c8b0c0b47f75f1143ac349371c337ab57fabf6166aa6e3a26d6dd2f382cdca6aeb60f0390f40cf6e25e66302758 WHIRLPOOL 50d85715960a08ffe5050b547dcf7d4abda852ffa70d815980eb0da6740a01cb184ba02441570bcb175005a37a734124420f4429a94f119f5d2a9d82ef1a7174
+EBUILD mandoc-1.14.3.ebuild 1536 SHA256 03e78c941751c7d4276c7bdf044bfd29a09af28aa0da308228f3bbf8ff61362f SHA512 ba3e9775ce7566f2a7ba9cfd6d8f5e2b86aa3197a9bee35749323b55385d88d7ed8bd29126bca3061e7dc569411483e39952bcca713324e675b0f67f72d09551 WHIRLPOOL 60716ed137b03864f1cc95fea28afaeafcaddc9149b34ef9d3b36bb1c279dee29e9e0b5c04105df7fcdbd8ac08dcb378abdfe0cf6440dec709644f60a6b0cd55
+MISC metadata.xml 220 SHA256 8b7fa3a17e0058bf9e5c6ac8bf9329bfe9a2b0e5718d65b09711f8d421248504 SHA512 c262561324e85dc1fe18ceede654af3ae9f494b36233a807944dbbc7ac9764c93654d1faf958ef4c98c1fb370c71f5073443294289f43ddee0c76e606a703d32 WHIRLPOOL b4814ccae6bee1cea3e03b0df3e4a9e695289cc803bf0ed40166f3ba707ba2fa3a9b7fae0c621ba77c60bc1d729bdf002033072d86af66335b6e9cfef0bd3311
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/Manifest b/app-text/manpager/Manifest
new file mode 100644
index 000000000000..b7656071e445
--- /dev/null
+++ b/app-text/manpager/Manifest
@@ -0,0 +1,4 @@
+AUX manpager.c 1809 SHA256 bb90bcb9d2efff5db0957b56fdb20bf97ac1aacfe4f71989833dcfa34704c620 SHA512 4f827429dc46993010d0096cb352920dfdcaf2cc97bf10e2155dfea3fda601c011467be65ca3f2e3f5c44cb26de0fd9eb58f7d875f75fd5f1db4b2c6cdabdca2 WHIRLPOOL bb26d082896f41de845fcbe9b5d660b28a14f8afad4f9c266d5fbc04c967858ab72d3b95569cac29e4cd12278ddb6e9589b5fb8d18d157632d6d5adb17e874a8
+EBUILD manpager-1.ebuild 646 SHA256 fa9a4a3ddddf45764b6b37df3d8dafb8b02361782a0562e9656d7574a0decd33 SHA512 7e4582eefc9acfc019b6bf4e9601d3efce10c70bc512af5e806b899bc1d7c9d08b5af4e0ae06d791e110b0a1803b53d1248890ede0f625578b7c2139ab3ad74c WHIRLPOOL d70990c5460ff0fdde63548ba5617208e1c0640a560f5cc12bad73a23c34603c330fd7f18d41e713f78eef554c5e5def183d9d5d0afb1bd90291a26b59dca2c8
+MISC ChangeLog 970 SHA256 476449bcf02927a7044880a4a6760b066e42e9e43d85aa0b7818f4678cac352d SHA512 bda470cedb820caa752f5e40b3ea12ee4dff162591cd443799fdc0df24153c1ead03f5dfefda32a8d22f0b4ac55cb0a8c9d2ebb0c682a500f872956582ee6eee WHIRLPOOL 8db067486f23494239da80bff8a3435caae3eb803f2ebc666103da3e065decd961aebaa2d81384f5bab234d8cfd9a4030e6cd60e222f2a69cf0900c81986e7e1
+MISC metadata.xml 253 SHA256 d82c33ef453113a5c1ebe250dcba373c22934a69b0a86c6ab15a5ca589c25b91 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 WHIRLPOOL e5aee23acff864609953a1e4de768f0e4aef704b44c53c021f28573e1ca5c99f1a46d92935ecec2449f7b4419a36d8373127d0ecfa8d7bae72d835e1839eb3f8
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/mathtex/Manifest b/app-text/mathtex/Manifest
new file mode 100644
index 000000000000..0ae218886be3
--- /dev/null
+++ b/app-text/mathtex/Manifest
@@ -0,0 +1,5 @@
+DIST mathtex-1.04.zip 148443 SHA256 f3bd3dc0491f37eb5de8bcd40b04cb11cd84581d2f16a6a2f61fc79622dd6adf SHA512 4b299a6dc503a01d6be3182ad982e38c0b6d926f09a09bd5169f8ad2c947c020ad532b15146379b4bc2158cfceec4cb4a0b7bf902423e0a8ad9b0b0190a99601 WHIRLPOOL 4c67b17a5d761e612ec12f372244665b0c41aea9066bb970bb263477a18407f76ef43786be50f41d645019165126219c39b22e6c67b2d2c60b70dc0b535040e2
+EBUILD mathtex-1.04.ebuild 885 SHA256 36c4c2ec97cdda8890e780f66eb18b9bb4608276eb36fc18232615f6449ae92f SHA512 1c74aaa03a53c5ce6639ab5e4e960f1556aeaf3978df76eb17a9f5d9c69cfa876ef18a68b86113c518927d5239b0fa88b6a0aa9eb3300bc0cbcf48f7b296865f WHIRLPOOL c6d1f2579a87e117e5f1cb44404ae969671b73f8581fca4828425b2dc4257a5cbbb6dfab56077be7d4142041874c2ecb2ad63911070e40efcb19f4cd9a0fe715
+MISC ChangeLog 2567 SHA256 0e12173b991033b26806ef42ab8f4e19062b7a2b9178386aa64aee40bab10212 SHA512 f00da7223d7236525f2b98afd921319480ef5a093e13ade5a9013b9bed58edda8f701d6d2983945a581b13505fc5dde4e586a2f5f93a252312d89d33cdbbf4c9 WHIRLPOOL 3e85def9a79ee504e2bdebba2f15e64e6ba3799949ec5fee762f42b954413488c7a634da638cf86d3d23ee4a752cd066c0b82309c086354c57eeed8abe59fc8d
+MISC ChangeLog-2015 1069 SHA256 cb14e5be6b2834b0f686435dc09e8021fd38df90b3fc5e3fb77af17cfeab7d38 SHA512 398d2c2dbaeefbdceb2c4f83af4ab575f24adcd1c5bef7db639ae66cdb745ec8ae0d1224ad1e05086c7a8f0bd992de2cdc8cc627c2cbc023c99b123cb90aeaf2 WHIRLPOOL 4cc1e9c1511eb58c1dbe16d6eb1070de3efde9f409d639094c538131952fba82d5856c8836c8397c497716def396120716860ede6a9546b5041963f3199ae887
+MISC metadata.xml 633 SHA256 d818344e4303e486d3f36714e54c4411d1915093e0c4d86b202ae21c481b89e0 SHA512 9086dbde5cbad1aebf2b0ffdf011db515befe5bff5c40e37726a0fce358f12875469d0afa70f410e273f3ec1f80a4980c77acb888b7aa5c83cd7ecb28afbb21a WHIRLPOOL 1da69dd6dcb07cb0766f4c499458d2ce1ff6cf772d2ea2fd292dcb265d5000c80ab1fc57c48445ad5fe98d7632547157aa4f274a70762f1363572a71ffe9ac13
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/Manifest b/app-text/mecab/Manifest
new file mode 100644
index 000000000000..18ced0f7d5bc
--- /dev/null
+++ b/app-text/mecab/Manifest
@@ -0,0 +1,6 @@
+AUX mecab-0.98-iconv.patch 396 SHA256 03ca106c9c3bf1a9401dd363e017f22b14371d5f8d11e315942951be49de0d1b SHA512 00ff7e2e716ed2617506824af4887a5d3dd088aba8d93b2c07ad8b834b4526678381903db95055aa798223886e10378c0b26ce28757123d5a8e3651fc873260a WHIRLPOOL 962b1e8c1323aec70d0857f48457429a076faa3c765e8b175788e26c493b356ae35054905013a522d958b3019cf0b26b3f4fe8f7f616df4a999e8a71ca42aac9
+DIST mecab-0.996.tar.gz 1398663 SHA256 e073325783135b72e666145c781bb48fada583d5224fb2490fb6c1403ba69c59 SHA512 aca6d16f411b9ba9b6687242246aeb28ede6d6c6a9122d4a32da9d8e76e79b5f4af2c8e3b13ad9462b34e9d2994cbd9bbbedebac45609684db9b703da999577f WHIRLPOOL a21bcc48f61c98a20c299ccbe7ae1c1c39c5502903107906be7c5dfb6fafb60d0768a665cd3005339cd5fa4ff476bfdba53abbdbf114a7e8ccce9835de9b11cb
+EBUILD mecab-0.996.ebuild 1008 SHA256 cacb3492d65f0b36fcca93b8f0727ab7292c50b7d0ece9bc955ea489c1637178 SHA512 745dde54ddcb6c12699050d63a060ad33565d7ae94817b14cc38cbac5516eb61922980287fba40c42e39c05b031d67b39c1701e7998bfa8eea81e63e299d8fc7 WHIRLPOOL 09ebb1ea80e66858cfe97e125d9f98c8c59802dda144d0b0b45c6ea3751ddb8cb6dfd55abc08a3dba0ba5303f9cab57e768f6b2d1dcfbc4fe089d14533cd54bd
+MISC ChangeLog 3159 SHA256 e5434b403948aac11c032a16d811c188956ddbca5d4526ed55cb841f7f43b9e7 SHA512 76e9fdded828cb346c0d446bce374723a8d340dd42960ccb46f0790a7b05ec03637c5af46034bc35e17928d7a43b53119a32d8c67b10e6945eb827c89f1a841e WHIRLPOOL 917a0b761b7a6ba6d6f951344b0059ccbdb90414f8e5acd9e35ac2fa703d1c75a3bed16f952ff069b3ae89d836aa2306fadc10f561b2671d4d38bd85d4b4f74c
+MISC ChangeLog-2015 9567 SHA256 d75dac6271e5d305b19dadac4571842ff7b0ac8ac2b37ee2f9e7ee4fb5582e51 SHA512 22435d4637452da8ba1d44f3fa98358790960b5ed9332799848b46c2fe7dc7241ee4110abf80bfab5b86f7df658fc7119ca3f7786fa79bf8faf96111ad960fe0 WHIRLPOOL 90ce5cd127c1f97c8b5591c9621c12038a1ad7792124ea2fed8edcaee2beae9deaccec7c51cb69376d847718792fde07f31846981b739030a3b2468e96eeaa0d
+MISC metadata.xml 359 SHA256 4d36587acbe08a40e836a607cae5579c49e166c1c4d043751f246aaad95a7b86 SHA512 26564a01d9ab28904670979d1961ab53dff53842e73ddb00f7d28f40c63ee0550daa6d48e44ea7e8a9ba04fe6852f61fae99612f111c0aef96d7422b21818c87 WHIRLPOOL ea914aa9d5286f4eeb42a9ab1af6aecfd2bba30ed74f497dd7ca5c3dc13852767044f1d04fece04ad3767a2e3625fbf20f886f08be1adc88dcf7ae23ec208ac7
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/Manifest b/app-text/mftrace/Manifest
new file mode 100644
index 000000000000..c4992bfc5bd5
--- /dev/null
+++ b/app-text/mftrace/Manifest
@@ -0,0 +1,7 @@
+DIST mftrace-1.2.18.tar.gz 79112 SHA256 0d31065f1d35919e311d9170bbfcdacc58736e3f783311411ed1277aa09d3261 SHA512 db26a643a92cfcbb150c5f80af65b1ce6030a266023b4433ea760c3601092c42602617f52a49ce467cd3a4804aa6779e72ee38dc557dc03e1e1c86a36dbd54db WHIRLPOOL 32db904ab2962046052416ecab143b3bcc3480ac4baa99d1c68dfb0da8907722f69ab3de68d8e62fb9959094e0b08b764a1e2aca3945737238877f4b0372526d
+DIST mftrace-1.2.19.tar.gz 78907 SHA256 778126f4220aa31fc91fa8baafd26aaf8be9c5e8fed5c0e92a61de04d32bbdb5 SHA512 410739ced17c5e5bb82c286b6b935c9d8d46299f9c04f0ba4c97df9ada5d7e9c778c720fb8a2377eb6df3c629a6e7264836fe7675733cf60197a817477dc49ee WHIRLPOOL d14aaa78202de9c84fc5a9d533705e53fa2bbb9b2271f53d40cc9342c5a96c5a582f6d05014626b6f2cceeaf9f32c8949ccc23aa30604899f1a0864e1fbfcd1c
+EBUILD mftrace-1.2.18-r3.ebuild 880 SHA256 cef5ee6fcf75ef8252652439d7664dfbc50b5b834d5b948b4027fa72358ac3bc SHA512 f98ca43a58e9a15945772880dddb0c82df88469b02913c1b95f5e8b748619a189b8a7b98fa5e90ca6049f3a7213056bc1e97cb4cf9575b209a9e3c40e6dba651 WHIRLPOOL 2c459cfbfeb73a534d3734e0a1826929d2e4bdb262486d08d806bb79ad1325a98ed852932febd790603f694494ad16b06a230707b4349aab29f9f57f83a8df5e
+EBUILD mftrace-1.2.19-r1.ebuild 883 SHA256 0a7a9019834c09d706ef3917aa48c29a41e0e9ee3d561bdde7723fbab6bd1385 SHA512 7641184886ca69f49686a4bff64445660d73109ba0dd1a88bf869b398413d54ef795254cb06e06c73a87346734d8b7c704e0b843d10e74fe2678dfafc4430689 WHIRLPOOL e1e0b568451c792ffb67593b7fd1c786906d76c8bbbb5d50e1d9c95df110b326e973d9a5bcb72924d0278ae9285addfcb628dddd35953fd0d6c04158ee6d2ff2
+MISC ChangeLog 2429 SHA256 6f6b96ca938dc0e5e19d7c9d3d48864357abe5226513b46910c5d060fb5dd356 SHA512 c250bd4da5e235295e4c19d5082eb3e42ffe81028a4ed4fbc2598368395a68f5b8ff6271766f428bf08769454bc28cae80c8433b6772fa7cdea63e58b54ae902 WHIRLPOOL 084c59d477a1c665322b89e0b07356bc7a960130241f2fe2ec0d9f42a6adad61b4ca9c4bb165eb780175ef5de059c53b46748ff25b2523770a5c36f5e477e241
+MISC ChangeLog-2015 9606 SHA256 727b7767105368a5968eab298132584a5b4224e1fb52ca8d7c43f9cd1238bbc9 SHA512 0a553f5bfa59d06a336161a36e1d0f6ad81f05b71be3451053fd5256bd6f56ef3ad6a8b706999ceb0db80274c1d4397de25847876d80034b628a4610524b350e WHIRLPOOL 3f4f9f88872b8ca1612b66edc3ed6a5bd7e26edff020321f18428ba8cdec15375d6cf532ed4c84fd23bc39ba3370bae0ba89d016f5f3f2c61786451ea5dbf641
+MISC metadata.xml 340 SHA256 9d376f04b3dab700e9711078f6e9452760a42a724ed1d5701e28a0140c90a885 SHA512 f8317a47d8515f79517a74e966aa31a05c9900a5a4aa52d9aac86b92d15553d03e6d82051312eb689d62381be05ab0f2fe9234bd520e86faf8226aba0cc9ba21 WHIRLPOOL 52c0d23828d220958db10d818c1349c43ed0b3c2160c3b0a229285fb79794290983b9cb428ef61cf39d3ec5e1513612ca8cd3458cc6cdc1d4040da08dfd073db
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/Manifest b/app-text/mht-rip/Manifest
new file mode 100644
index 000000000000..0c883a1e89ee
--- /dev/null
+++ b/app-text/mht-rip/Manifest
@@ -0,0 +1,5 @@
+DIST mht-rip-0.8.c 9105 SHA256 f30669b1dd036e59ef9af70bbf257e6beb3b736c1b31672bef52dea18f0410de SHA512 377643c75e621dfa88f426db8e0f8e0959aaa841d1950ab1cc4d514de1a4120cbd20e9f18aa58607b6012a9417095489de968002bd8d91fd89f71dcc0b90357e WHIRLPOOL 35f82466220e36f3d2e37932038e46be8165a93fefbcbb383ec5e9dbd4f7d48d4360a65bbb9b5bc703ecc8db1759d3847472a5783198c8653ae4986554a4c6da
+EBUILD mht-rip-0.8.ebuild 465 SHA256 9cf42246ddf239d0fe55be03aeb8a3fb55811735eca4ff0c09fcaab6adc94fbc SHA512 ef7ad68636aaafa980f4f6c9d5184dc8fa4c6cae03d3e3fe4fcbbde1940c11a0e34ca7e19bd02092e0fe5e9b8452a0750e396bfcd5ed82cb92bdf88fb281ed0e WHIRLPOOL 08985139945ed857f0847dbf7d0dd757f31fe3b95f9a259f38b51e0cddbcb0a858cf42d6a9a388945cc50bdb308ca3f65dc21ec295fce3b2d31f4875513fcdba
+MISC ChangeLog 2518 SHA256 1a0df60c8817514872030e7cdef71cef206b9c8ebb849ed176ba680f1955c122 SHA512 366d6758891aa4cdc7db0cd2bb67fcb4306eafda49814051bf182e474d9154e9e17039000138c4b6562d5fca0129b478699b935bc686e0cbc063521a9ba94c13 WHIRLPOOL 204422527ca936d493a5a5b7295501bd903ce8f988225952422a2e7445b06d9246de54b873b26f7a4ecca9cf6d3f51d42a6e671720cc2d152e837f0892321708
+MISC ChangeLog-2015 604 SHA256 08d836cdc90da322b0ebb237e3802885c5869c8b22d3a0f239e6b374c7539145 SHA512 d73d630e619fdb50ef85cb377c8cf7bcd20f18a79a3d16d67727434129a8d2b72362ec9f30029045906b06083b095a3e047482527e73d57dbfe285f9b8810e2c WHIRLPOOL 506a273aaacc4c424ff88ec5ad40f7c389101a48ad39cbfcc364c330041d712581b849c3530b16d02919af396864195444840cd12977d8ddd80f5bd14ef12e8f
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
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..ec146d676784
--- /dev/null
+++ b/app-text/mht-rip/mht-rip-0.8.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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/Manifest b/app-text/mpage/Manifest
new file mode 100644
index 000000000000..cf3fd962ab65
--- /dev/null
+++ b/app-text/mpage/Manifest
@@ -0,0 +1,9 @@
+AUX 01_previous_changes.patch 21005 SHA256 ccba0b10a967c562cc5335477404994471aba2f4559870a689c93f776196504e SHA512 6c59dbc87380f938ca0ee0956d17c00a6d9284414bffd69e457e4ccefd481ab9e3a382ec12adab2e4871b083b2de8ca6045c698a85130d8115e10ba0e61a0e48 WHIRLPOOL 4e48d9d9f734d74f4d63a1641da3aa4987f39d49379bc0c838df1c15d5080526d0bb929c3c9d392562093493531aba3c929ffcba46a0ebde10a123b1d07250af
+AUX 10_bts354935_fix_fontdefs.patch 2348 SHA256 63a780d61e840493f1bb12f62437dd8747d34522a65ce805ba0b6dc1c1453150 SHA512 4d41ba2278e7be9c279b9525de4f72a5f0132fb2830fb2e14c999218d04ced22b388363a340dfc333aa6cf1ec50baf16841f6be9d4f532f46a0fc318b6eac039 WHIRLPOOL 4ace1e22d74c40aec9c8964ad6ea5cf1b8b62c2b16f49bcb99922ffcc1fd5a0fc117f1f4a91e3c74f0ca8b67a648597916686e8846afac91189345aba06c9e99
+AUX 20_bts416573_manpage_fixes.patch 17151 SHA256 07b7b0429e63164b276b5b9b10f8a46f0f460d63183d4151e727e61eea2f4067 SHA512 11be64f9a200b2ec8ce547960da320677e19b8b0c30627b989b879e0369886fe72e75004286aad0def759603239539052478549299ad57fe5f3eb6a40356b7c9 WHIRLPOOL 691c267ba9b7b42e6efc02f14139fbc82b598e589137cd77533fbad468a81fe999f625bed8d122ac4761e8dcadc5b4b7c221687bee7d45fcab3165965b8f85d2
+AUX 30_bts443280_libdir_manpage.patch 741 SHA256 59db3c5e0188ae45ed5b3ecc6c548e4088abdc60267158b4dd37f25e40b15e38 SHA512 2c5efe3bf0e26ffa08085a230b44aaddc7256a8a946c151b7fefde2ccde0b410221d878b5d543c7fc878bc7ccf7c7dcc567d8f9b2de5ed728257951505d66bba WHIRLPOOL 000ea81d8ceef7bd3162706c071c5fe24ea89b30237bada911dc45cd99a604ef5d41e812b9dc5b16104bc90f0cc2625bb3d76abe0167602f8ccf43c1d6be0c89
+DIST mpage-2.5.6.tgz 86748 SHA256 4fe66dfc27f7c4bfbca60ef617f968aa2e6ee877e8921aa968c16a03aa4edc04 SHA512 79a51d0fa08848b22f758e8bc3f57680d33492d261a0061c6cce002c3cb5f129a78221d2af1749c79d4e46385136d9996294499531e60e8fc501f9fd61f8077d WHIRLPOOL 9d7abfd66ba0faf53a18f9dc59d1566d22364f9a7b0593a149cae1d2e781f4c104dfcd984da63081b9276811f9832829d8feab1ad41040070ca8c7378e96f7cf
+EBUILD mpage-2.5.6-r1.ebuild 884 SHA256 36ce34e3e923e7860d4fecf317ba2dc3c6c915c07c8d7f8fffb61ff5ea5672b6 SHA512 6c82b323a350126f1a5aa656053dc143850cf531e52778e5facdfca517516483e781445bbe975705db403380e542527f23d6e7e083ee7593d910986f99971c9c WHIRLPOOL 36135b7f79624a8b84d8226ef46d18129b47fc7884948125e4bd631dddb3e9aa5eb86fca982f06c6faf5f2f53093b815c9735465ed79cdbca3dfcc08bdeab72e
+MISC ChangeLog 2685 SHA256 c88e0c620fcff40cd2be0cae4181c362205093496dc67275b8f02664fe780282 SHA512 904315a52f9abbe7927fb1ff90308d0a9105ce64df924e02c518320aac41c4e461f99857eb2ce3ba197c13b24e153e4902f1a4444ffa98f35d665e0cae61756b WHIRLPOOL f0c37cad102d146c61b927534f2433b0d5d209f218d68b2c7eeae4ae9eaa9e34788aefcdab47a9350e74918881394bd5ab777d55048914ca32f24d5f42810d7b
+MISC ChangeLog-2015 3923 SHA256 927f48d0c50fc74ab9d085b7a54e9428607dec2643b89be01e962339d13bd06f SHA512 66aec295988fbb68d1dc72d279d4e1fca98f7da63b652881305324c3ddea96655daf3430875efb99f481cca21aff7900553c1e46583faf78649373fde2008606 WHIRLPOOL 3f87c61cba58aad7f278a23affaa934aeebb877f12736b4b64f67d748c803aefc015578998168994c3031e6f98eda75aaeafa575160191b80446fc001c69d989
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/app-text/mpage/files/01_previous_changes.patch b/app-text/mpage/files/01_previous_changes.patch
new file mode 100644
index 000000000000..9b3682547e8c
--- /dev/null
+++ b/app-text/mpage/files/01_previous_changes.patch
@@ -0,0 +1,740 @@
+Index: mpage-2.5.6/file.c
+===================================================================
+--- mpage-2.5.6.orig/file.c	2008-08-11 23:14:20.500638502 +0200
++++ mpage-2.5.6/file.c	2008-08-11 23:28:25.560795737 +0200
+@@ -363,7 +363,7 @@
+         Debug(DB_STDIN, "%%iswanted: opt_first[i]: %d\n", opt_first[i]);
+         Debug(DB_STDIN, "%%iswanted: opt_alt[i]: %d\n", opt_alt[i]);
+         Debug(DB_STDIN, "%%iswanted: opt_last[i]: %d\n", opt_last[i]);
+-        if ((sn >= opt_first[i] && (opt_alt[i] <= 1 || (sn - opt_first[i]) % opt_alt[i] == 0) ) &&
++        if ((sn >= opt_first[i]) && ((sn - opt_first[i]) % opt_alt[i] == 0) &&
+             (sn <= opt_last[i])) {
+             Debug(DB_STDIN, "%%iswanted: wanted page %d\n", sn);
+             ps_outpages++;
+Index: mpage-2.5.6/mpage.1.in
+===================================================================
+--- mpage-2.5.6.orig/mpage.1.in	2008-08-11 23:17:10.154306512 +0200
++++ mpage-2.5.6/mpage.1.in	2008-08-11 23:27:23.605265090 +0200
+@@ -1,4 +1,4 @@
+-.TH MPAGE Local 2008/01/14
++.TH MPAGE 1 2008/01/14
+ 
+ .SH NAME
+ mpage \- print multiple pages per sheet on PostScript printer
+@@ -417,17 +417,33 @@
+ .TP
+ .B -t
+ Toggle printing on both sides of the paper.
+-This will toggle duplex mode of the printer.
+++This option has 3 states: nop, yes, no, which mean:
++.BR  NOP :
++ dont do anything on PostScript, so printer default will be used;
++.BR  YES :
++ force printer to do duplex;
++.BR  NO  :
++force printer not to do it.
++If there is no -t, then the duplex is NOP. If you put some -t on
++the command line, the state toggles as "yes,no,yes,no...".
++So, if your printer is set to print, by default, in duplex mode,
++you will use "-t -t" on command line to force it to print in non-duplex mode.
+ Use this option only if your printer is capable of printing in duplex mode. 
+ .RI ( default
+-off).
++NOP).
+ 
+ .TP
+ .B -T
+-Toggle tumble of every second pages when printing in duplex mode.
+-Use this option only if your printer is capable of printing in duplex mode
+-and together with
+-.BR -t . 
++Toggle tumble of every second pages.
++This option has 3 states: nop, yes, no (with behaviour similar to -t).
++So, if your printer is set to print, by default, in duplex mode,
++with tumble on,
++you will use "-T -T" on command line to print in nontumble mode.
++Use this option only if your printer is capable of printing in duplex mode.
++With this version of mpage,
++you may use this option even if you do not use -t.
++.RI ( default
++NOP.)
+ 
+ .TP
+ .B -u
+@@ -546,7 +562,7 @@
+ environment variables.
+ 
+ .SH FILES
+-/usr/tmp/mpageXXXXXX
++/tmp/mpageXXXXXX
+ .br
+ PREFIX/share/mpage
+ 
+Index: mpage-2.5.6/mpage.c
+===================================================================
+--- mpage-2.5.6.orig/mpage.c	2008-08-11 23:31:51.044505584 +0200
++++ mpage-2.5.6/mpage.c	2008-08-11 23:39:12.205645922 +0200
+@@ -44,9 +44,21 @@
+     struct sheet *thesheet;
+     char outcommand[LINESIZE]; /* the command which is the output filter */
+ 
++    char * paper;
++
+     current_locale = setlocale(LC_ALL,"");
+ 
+-   
++#ifdef LIBPAPER
++    paperinit();
++    paper = systempapername();
++    if (!paper)
++    {
++      fprintf(stderr,"systempapername() returned NULL! exiting\n");
++      exit(1);
++    }
++    strncpy(opt_page,paper,31);
++#endif
++
+ #ifdef __EMX__
+     /*
+      * wildcard expansion from emx package (used by OS/2)
+@@ -235,10 +247,10 @@
+     fprintf(outfd, "/mp_stm usertime def\n");
+     fprintf(outfd, "/mp_pgc statusdict begin pagecount end def\n");
+     fprintf(outfd, "statusdict begin /jobname (%s) def end\n", name);
+-    if (opt_duplex) {
++    if (opt_duplex && opt_duplex != 4 ) {
+        fprintf(outfd, "statusdict /setduplexmode known");
+        fprintf(outfd, " { statusdict begin true setduplexmode end } if\n");
+-       if (opt_tumble) {
++       if (opt_tumble && opt_tumble != 4 ) {
+            fprintf(outfd, "statusdict /settumble known ");
+            fprintf(outfd, "{ statusdict begin true settumble end } if\n"); 
+        }
+Index: mpage-2.5.6/mpage.h
+===================================================================
+--- mpage-2.5.6.orig/mpage.h	2008-08-11 23:39:40.279245746 +0200
++++ mpage-2.5.6/mpage.h	2008-08-11 23:45:02.565611800 +0200
+@@ -31,6 +31,10 @@
+ #include <limits.h>
+ #include <string.h>
+ 
++#ifdef LIBPAPER
++#include <paper.h>
++#endif
++
+ #define	VERSION		"2.5.6 Januari 2008"
+ 
+ #define	TRUE		1
+@@ -125,10 +129,11 @@
+ /*
+  * set default page size
+  */
++#ifndef LIBPAPER
+ #if !defined(PAGE_DEF)
+ # define PAGE_DEF	"A4"
+ #endif
+-
++#endif
+ /*
+  * define print spooler types
+  */
+@@ -221,9 +226,6 @@
+ extern int ps_height;	/* number of points in the Y direction (11 inches) */
+ extern char * media;	/* name of output page media */
+ 
+-
+-extern struct page_desc paper[];
+-
+ /* array of sheets where pages are ordered for coli ??? */
+ extern struct sheet coli[];
+ 
+@@ -280,7 +282,11 @@
+ extern int opt_width;		/* number of columns to fit on reduced page */
+ extern int opt_mp_header;	/* let mpage create a header */
+ extern int opt_sheetheader;     /* let mpage create sheetheaders */
++#ifndef LIBPAPER
+ extern char * opt_page;		/* sheets size: a4 or us letter */
++#else
++extern char opt_page[];                /* sheets size: a4 or us letter */
++#endif
+ extern int opt_fold;		/* fold long lines */
+ extern int opt_outline;		/* print a nice outline around pages */
+ extern int opt_verbose;		/* print a count of pages sent to printer */
+Index: mpage-2.5.6/page.c
+===================================================================
+--- mpage-2.5.6.orig/page.c	2008-08-11 23:48:28.317336922 +0200
++++ mpage-2.5.6/page.c	2008-08-11 23:55:46.090284181 +0200
+@@ -21,6 +21,8 @@
+ #include "mpage.h"
+ #include "string.h"
+ 
++extern struct page_desc paper[];
++
+ #define PAPERSIZE_FILE  "/etc/papersize"
+ void
+ check_papersize()
+@@ -59,12 +61,24 @@
+ void
+ set_page()
+ {
++#ifndef LIBPAPER
+     int i = select_pagetype(opt_page);
+  
+     media = paper[i].media;
+     ps_width = paper[i].width;
+     ps_height = paper[i].height;
+-
++#else
++    struct paper * ps;
++    ps=paperinfo(opt_page);
++    if (!ps) {
++      fprintf(stderr,"%s: unknown page format: %s\n",
++              MPAGE, opt_page);
++      exit(1);
++    }
++    media = papername(ps);
++    ps_width = paperpswidth(ps);
++    ps_height = paperpsheight(ps);
++#endif
+     return;
+ 
+ } /* set_page */
+@@ -76,11 +90,21 @@
+ {
+     int i = 0;
+ 
++#ifndef LIBPAPER
+     while (paper[i].media && strcasecmp(pt, paper[i].media))
+         i++;
+     if (paper[i].media)
+         opt_page = paper[i].media;
+     else
++#else
++    struct paper * ps;
++
++    strncpy(opt_page,pt,31);
++    opt_page[31]='\0';
++
++    ps=paperinfo(opt_page);
++    if (!ps)
++#endif
+         fprintf(stderr, "%s: ignoring unknown paper type: %s\n",
+                                 MPAGE, pt);
+     return i;
+Index: mpage-2.5.6/FAQ
+===================================================================
+--- mpage-2.5.6.orig/FAQ	2008-08-11 23:54:21.317453255 +0200
++++ mpage-2.5.6/FAQ	2008-08-11 23:55:38.833870662 +0200
+@@ -27,3 +27,14 @@
+ 
+     This information is buried in the dvips manual somewhere, but is not easy
+     to find!
++
++Using mpage with magicfilter
++============================
++Andreas Jellinghaus <aj@debian.org> writes:
++
++I'm using mpage with lprng and magicfilter. My local magic filter setup
++is /usr/sbin/ljet4l-filter, and this line passes all ASCII files to mpage :
++default                 pipe    /usr/bin/mpage -A -2
++
++I don't want to waste paper with ASCII texts. MPage also works for
++postscript files.
+Index: mpage-2.5.6/README
+===================================================================
+--- mpage-2.5.6.orig/README	2008-08-11 23:56:29.352749569 +0200
++++ mpage-2.5.6/README	2008-08-11 23:07:25.849008850 +0200
+@@ -1,28 +1,3 @@
+-
+-COPYRIGHT:
+-
+-Mpage and all the files distributed with mpage are covered by copyright:
+-
+- Copyright (c) 1994-2004 Marcel J.E. Mol, The Netherlands
+- Copyright (c) 1988 Mark P. Hahn, Herndon, Virginia
+-  
+-     Permission is granted to anyone to make or distribute verbatim
+-     copies of this document as received, in any medium, provided
+-     that this copyright notice is preserved, and that the
+-     distributor grants the recipient permission for further
+-     redistribution as permitted by this notice.
+-
+-   marcel@mesa.nl
+-   MESA Consulting  B.V.
+-   Nootdorp
+-   The Netherlands
+-   Phone: +31-15-3105252
+-   Mobile:+31-6-54724868
+-   Fax:   +31-15-3105253
+-   email: info@mesa.nl		http://www.mesa.nl   ftp://ftp.mesa.nl
+-   
+-
+-=================================================================
+ DESCRIPTION:
+ 
+ Mpage is a program to reduce and print multiple pages of text per
+@@ -30,54 +5,21 @@
+ It also has limited functionality to do the same directly with postscript
+ files.
+ 
+-The following are the files you should have for mpage.
+-
+-     README                 Notes and descriptions, this file
+-     README.OS2             OS/2 port description
+-     Copyright              Copyright notice
+-     CHANGES                Change history
+-     Makefile               The Makefile
+-     TODO                   Wish List for changes
+-     FAQ                    Useful tips and hints
+-     NEWS                   Global changes, User visible changes
+-     Mpage.lsm              LSM file for mpage
+-     args.c                 Command line and options processing
+-     encoding.h             Definition of internal default character encoding
+-     encoding.h.CP850       Popular for renaming to encoding.h
+-     file.c                 Generic file handling
+-     glob.c                 Global variable setup
+-     mpage.h                Definitions
+-     mpage.c                Main Control
+-     page.c                 Page layout routines
+-     post.c                 PostScript file processing
+-     sample.c               Prints sample page layout pages 
+-     text.c                 Text file processing
+-     util.c                 Misc utility functions
+-     mpage.1                Manual page
++The following are some of the files you should receive in the Debian
++package:
+ 
+      All.chars              Test file containing all ASCII characters
+      Encodings              Directory with character encoding library files
+      Characters             List of Postscript character encoding names
+      Encoding.format        Description on how to create character encoding
+                             library files
+-     gencodes.c             Util program to build All.chars file
+-     Test                   Directory with test pages
+-
+-     OS2                    Directory with simulated lpr for OS/2
+      Contrib                Directory with contributions by others
+      Contrib/mfix           Fix to mpage that makes it work with ArborText
+ 
+-
+-INSTRUCTIONS:
+-
+-All you should need to do is run make. Actually it is probably better
+-to have a look at the Makefile and to check settings like for example PAGESIZE
+-to set the default page size (e.g A4 or Letter ...).
+-This will create the programs mpage and msample.  Mpage is
+-the program to print n-up pages.  Msample prints a sample outline.  I
+-used it for debugging the placement of the layout.  It is also handy
+-for other layout purposes.  It accepts all the arguments that mpage
+-does, but does not print files.
++Msample prints a sample outline.  I used it for debugging the
++placement of the layout.  It is also handy for other layout purposes.
++It accepts all the arguments that mpage does, but does not print
++files.
+ 
+ As a quick sample try:
+ 
+@@ -87,9 +29,16 @@
+ or
+ 	"groff  -man mpage.1 | mpage -2"
+ 
++USING ENCODINGS:
+ 
+-The manual page, mpage.1, formats with UCB or ATT manual macros.
++Example supplied by Vassilis Virvilis.  To print Greek characters, use
++the Greek fonts from http://www.csd.uch.gr/~lourakis/genscript/.  Both
++enscript and a2ps embed the fonts in the generated postscript
++document. mpage utilizes the printer fonts. Therefore you will have to
++actually install the font for ghostscript.  To print the Greek
++characters, use the following command:
+ 
++   mpage -FCourier-ISOLatinGreek -CISO-8859.7 test.txt  > test.ps
+ 
+ 
+ USING MPAGE:
+Index: mpage-2.5.6/args.c
+===================================================================
+--- mpage-2.5.6.orig/args.c	2008-08-11 23:57:11.963177801 +0200
++++ mpage-2.5.6/args.c	2008-08-11 23:07:25.817007026 +0200
+@@ -91,7 +91,11 @@
+                                      UPDOWN : LEFTRIGHT;
+                         break;
+                 case 'A':    /* A4 sized, european paper */
++#ifndef LIBPAPER
+                         opt_page = "A4"; /* deprecated */
++#else
++	       		strcpy(opt_page,"a4");
++#endif
+                         break;
+                 case 'b':     /* base paper type */
+                         OPTARG();
+@@ -386,17 +390,25 @@
+                 case 'S':
+                         opt_square = 0;
+                         break;
++// opt_duplex and opt_tumble have 3 possible values:
++// 4 : do not do anything
++// 0 : force printer to do it
++// !0 : force printer not to do it
+                 case 't':
+-                        opt_duplex = 1 - opt_duplex;
++                        opt_duplex = ! opt_duplex;
+                         break;
+                 case 'T':
+-                        opt_tumble = 1 - opt_tumble;
++                        opt_tumble = ! opt_tumble;
+                         break;
+                 case 'u':
+                         check_utf8 = 1 - check_utf8;
+                         break;
+                 case 'U':    /* Letter sized, US paper */
++#ifndef LIBPAPER
+                         opt_page = "Letter"; /* deprecated */
++#else
++	       		strcpy(opt_page,"letter");
++#endif
+                         break;
+                 case 'v':    /* verbose (print page count) */
+                         opt_verbose = 1 - opt_verbose;
+Index: mpage-2.5.6/glob.c
+===================================================================
+--- mpage-2.5.6.orig/glob.c	2008-08-11 23:58:11.934595375 +0200
++++ mpage-2.5.6/glob.c	2008-08-11 23:07:25.829007710 +0200
+@@ -327,7 +327,11 @@
+ int opt_lines         = 0;		/* lines to fit on reduced page */
+ int opt_killtrail     = 1;		/* Quit reading input on %%TRailer */
+ int opt_width         = 0;	        /* columns to fit on reduced page */
++#ifndef LIBPAPER
+ char * opt_page       = PAGE_DEF;       /* default paper size */
++#else
++char opt_page [32]; /* default paper size */
++#endif
+ /* boolean's: set default to 0 or 1 */
+ int opt_pr            = 0;		/* if true use pr(1) to format output */
+ int opt_mp_header     = 0;              /* let mpage create headers */
+@@ -342,8 +346,12 @@
+ int opt_last[MAXJARG];         	  /* print as many as supplied per -j */
+ int opt_alt[MAXJARG];             /* by default print all sheets, odd+even per -j*/
+ int opt_file          = 1;        /* should each file appera on a new sheet */
+-int opt_duplex        = DEFAULT_DUPLEX;  /* duplex mode flag */
+-int opt_tumble        = 0;        /* tumble overy second pages */
++// opt_duplex and opt_tumble have 3 possible values:
++// 4 , aka NOP : dont do anything on PostScript,so printer default will be used
++// 0 , aka yes : force printer to do it
++// !0, aka no  : force printer not to do it
++int opt_duplex        = 4;        /* duplex mode flag */
++int opt_tumble        = 4;        /* tumble overy second pages */
+ int opt_textbox       = 0;        /* don't normally draw box around text */
+ int opt_input         = IN_AUTO;  /* select input file format */
+ int opt_encoding      = DEFAULT_ENCODING; /* use default encoding or not */
+@@ -420,10 +428,15 @@
+  -j Print specified sheets: first[-last][%%interval]\n\
+     -j 1-10 does first 10 sheets, -j 1%%2 prints odd ones, -j 2%%2 even ones.\n\
+  -J Set the start of the sheet page count\n\
+- -t Toggle printing both sides of the paper (Duplex mode, %s)\n\
+- -T Toggle tumble of every second pages when printing in duplex mode (off)\n",
+-    fontname, opt_tabstop, PAGE_DEF, printprog, printarg,
+-    opt_duplex ? "on" : "off"
+++ -t Toggle printing both sides of the paper (NOP,on,off,on...)\n\
+++ -T Toggle tumble of every second pages  (NOP,on,off,on...)\n",
++    fontname, opt_tabstop,
++#ifndef LIBPAPER
++    PAGE_DEF,
++#else
++    opt_page,
++#endif
++    PAGE_DEF, printprog, printarg
+     );
+     fprintf(stderr, "\n(c) 1993-2005 Marcel Mol, marcel@mesa.nl (MESA Consulting)\n");
+ 
+Index: mpage-2.5.6/Contrib/psprint
+===================================================================
+--- mpage-2.5.6.orig/Contrib/psprint	2008-08-12 00:01:13.312931539 +0200
++++ mpage-2.5.6/Contrib/psprint	2008-08-11 23:07:25.825007484 +0200
+@@ -1,10 +1,9 @@
+-#!/bin/ksh -
++#!/bin/sh -
+ 
+ STDIN_TMP_FILE=/tmp/psprint.$$
+ 
+ GS=/usr/local/bin/gs
+ GSLIB=/usr/local/lib/ghostscript/3.53
+-RM=/bin/rm
+ #
+ # define print command (SYSV or BSD ish)
+ # PRINT="lp -or -s"
+@@ -20,7 +19,7 @@
+     ${GSLIB}/quit.ps
+ done
+ 
+-${RM} -f "${STDIN_TMP_FILE}"
++rm -f "${STDIN_TMP_FILE}"
+ 
+ exit 0
+ 
+Index: mpage-2.5.6/Encodings/ISO-8859.7
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ mpage-2.5.6/Encodings/ISO-8859.7	2008-08-11 23:07:25.853009079 +0200
+@@ -0,0 +1,231 @@
++%%%% ISO-8859.7 character encoding (I think...)
++27 255  % first and last encoding
++027 /florin
++028 /dagger
++029 /daggerdbl
++030 /perthousand
++031 /trademark
++032 /space
++033 /exclam
++034 /quotedbl
++035 /numbersign
++036 /dollar
++037 /percent
++038 /ampersand
++039 /quoteright
++040 /parenleft
++041 /parenright
++042 /asterisk
++043 /plus
++044 /comma
++045 /hyphen
++046 /period
++047 /slash
++048 /zero
++049 /one
++050 /two
++051 /three
++052 /four
++053 /five
++054 /six
++055 /seven
++056 /eight
++057 /nine
++058 /colon
++059 /semicolon
++060 /less
++061 /equal
++062 /greater
++063 /question
++064 /at
++065 /A
++066 /B
++067 /C
++068 /D
++069 /E
++070 /F
++071 /G
++072 /H
++073 /I
++074 /J
++075 /K
++076 /L
++077 /M
++078 /N
++079 /O
++080 /P
++081 /Q
++082 /R
++083 /S
++084 /T
++085 /U
++086 /V
++087 /W
++088 /X
++089 /Y
++090 /Z
++091 /bracketleft
++092 /backslash
++093 /bracketright
++094 /asciicircum
++095 /underscore
++096 /quoteleft
++097 /a
++098 /b
++099 /c
++100 /d
++101 /e
++102 /f
++103 /g
++104 /h
++105 /i
++106 /j
++107 /k
++108 /l
++109 /m
++110 /n
++111 /o
++112 /p
++113 /q
++114 /r
++115 /s
++116 /t
++117 /u
++118 /v
++119 /w
++120 /x
++121 /y
++122 /z
++123 /braceleft
++124 /bar
++125 /braceright
++126 /asciitilde
++127 /.notdef
++128 /.notdef
++129 /.notdef
++130 /.notdef
++131 /.notdef
++132 /.notdef
++133 /.notdef
++134 /.notdef
++135 /.notdef
++136 /.notdef
++137 /.notdef
++138 /.notdef
++139 /.notdef
++140 /.notdef
++141 /.notdef
++142 /.notdef
++143 /.notdef
++144 /.notdef
++145 /.notdef
++146 /.notdef
++147 /.notdef
++148 /.notdef
++149 /.notdef
++150 /.notdef
++151 /.notdef
++152 /.notdef
++153 /.notdef
++154 /.notdef
++155 /.notdef      	
++156 /.notdef
++157 /.notdef
++158 /.notdef
++159 /.notdef      	
++160 /space
++161 /quoteleft
++162 /quoteright
++163 /sterling     	
++164 /.notdef
++165 /.notdef
++166 /brokenbar
++167 /section      	
++168 /dieresis
++169 /copyright
++170 /.notdef
++171 /guillemotleft	
++172 /logicalnot
++173 /hyphen
++174 /.notdef
++175 /endash       	
++176 /degree
++177 /plusminus
++178 /twosuperior
++179 /threesuperior	
++180 /acute
++181 /dieresisacute
++182 /afii9936
++183 /periodcentered	
++184 /afii9937
++185 /afii9938
++186 /afii9939
++187 /guillemotright	
++188 /afii9940
++189 /onehalf
++190 /afii9941
++191 /afii9942     	
++192 /afii9977
++193 /afii9793
++194 /afii9794
++195 /afii9796     	
++196 /afii9797
++197 /afii9798
++198 /afii9801
++199 /afii9802     	
++200 /afii9803
++201 /afii9804
++202 /afii9805
++203 /afii9806     	
++204 /afii9807
++205 /afii9808
++206 /afii9809
++207 /afii9810     	
++208 /afii9811
++209 /afii9813
++210 /.notdef
++211 /afii9814     	
++212 /afii9816
++213 /afii9817
++214 /afii9818
++215 /afii9819     	
++216 /afii9820
++217 /afii9821
++218 /afii9943
++219 /afii9944     	
++220 /afii9968
++221 /afii9969
++222 /afii9970
++223 /afii9971     	
++224 /afii9978
++225 /afii9825
++226 /afii9826
++227 /afii9828
++228 /afii9829
++229 /afii9830
++230 /afii9833
++231 /afii9834
++232 /afii9835
++233 /afii9836
++234 /afii9837
++235 /afii9838
++236 /afii9839
++237 /afii9840
++238 /afii9841
++239 /afii9842
++240 /afii9843
++241 /afii9845
++242 /afii9847
++243 /afii9846
++244 /afii9848
++245 /afii9849
++246 /afii9850
++247 /afii9851
++248 /afii9852
++249 /afii9853
++250 /afii9975
++251 /afii9976
++252 /afii9972
++253 /afii9973
++254 /afii9974
++255 /.notdef
+Index: mpage-2.5.6/Contrib/mfix/mfix.c
+===================================================================
+--- mpage-2.5.6.orig/Contrib/mfix/mfix.c	2008-08-12 00:02:40.797917022 +0200
++++ mpage-2.5.6/Contrib/mfix/mfix.c	2008-08-11 23:07:25.829007710 +0200
+@@ -1,7 +1,7 @@
+ #include <stdio.h>
+ 
+-FILE *in=stdin,*out=stdout;
+-char line[200]; line2[200];
++FILE *in,*out;
++char line[200], line2[200];
+ 
+ int
+ strcp(st1,st2)
+@@ -15,6 +15,8 @@
+ main()
+ {
+   int i;
++  in = stdin;
++  out = stdout;
+   for(i=0; i<10; i=1)
+   {
+     if (fgets(line,200,in)==NULL) { close(in); close(out); exit(1); }
+@@ -41,4 +43,4 @@
+     fprintf(out,"%s",line);
+   }
+ }
+-    
+\ No newline at end of file
++    
diff --git a/app-text/mpage/files/10_bts354935_fix_fontdefs.patch b/app-text/mpage/files/10_bts354935_fix_fontdefs.patch
new file mode 100644
index 000000000000..3749ec5984cf
--- /dev/null
+++ b/app-text/mpage/files/10_bts354935_fix_fontdefs.patch
@@ -0,0 +1,39 @@
+Index: mpage-2.5.6/mpage.c
+===================================================================
+--- mpage-2.5.6.orig/mpage.c	2008-08-12 00:26:43.344123046 +0200
++++ mpage-2.5.6/mpage.c	2008-08-12 00:29:55.663082680 +0200
+@@ -345,25 +345,25 @@
+       if (!strncmp (current_locale, "ja_JP", 5)){
+ #ifdef KANJI
+ #ifdef GOTHIC
+-	fprintf(outfd, "/kanj /GothicBBB-Medium-H findfont %d scalefont def\n", fsize - 1);
+-	fprintf(outfd, "/han /GothicBBB-Medium.Hankaku findfont %d scalefont def\n", fsize - 1);
++        fprintf(outfd, "/kanj { /GothicBBB-Medium-H findfont %d scalefont } def\n", fsize - 1);
++        fprintf(outfd, "/han { /GothicBBB-Medium.Hankaku findfont %d scalefont } def\n", fsize - 1);
+ #else
+-	fprintf(outfd, "/kanj /Ryumin-Light-H findfont %d scalefont def\n", fsize - 1);
+-	fprintf(outfd, "/han /Ryumin-Light.Hankaku findfont %d scalefont def\n", fsize - 1);
++        fprintf(outfd, "/kanj { /Ryumin-Light-H findfont %d scalefont } def\n", fsize - 1);
++        fprintf(outfd, "/han { /Ryumin-Light.Hankaku findfont %d scalefont } def\n", fsize - 1);
+ #endif
+ #endif
+ #ifdef GOTHIC
+-	fprintf(outfd, "/unijis /GothicBBB-Medium-UniJIS-UTF8-H findfont %d scalefont def\n", fsize - 1);
++        fprintf(outfd, "/unijis { /GothicBBB-Medium-UniJIS-UTF8-H findfont %d scalefont } def\n", fsize - 1);
+ #else
+-	fprintf(outfd, "/unijis /Ryumin-Light-UniJIS-UTF8-H findfont %d scalefont def\n", fsize - 1);
++        fprintf(outfd, "/unijis { /Ryumin-Light-UniJIS-UTF8-H findfont %d scalefont } def\n", fsize - 1);
+ #endif
+       }
+       else if (!strncmp (current_locale, "ko_KR", 5))
+-	fprintf(outfd, "/uniks /Baekmuk-Batang-UniKS-UTF8-H findfont %d scalefont def\n", fsize - 1);
++        fprintf(outfd, "/uniks { /Baekmuk-Batang-UniKS-UTF8-H findfont %d scalefont } def\n", fsize - 1);
+       else if (!strncmp (current_locale, "zh_CN", 5))
+-	fprintf(outfd, "/unigb /BousungEG-Light-GB-UniGB-UTF8-H findfont %d scalefont def\n", fsize - 1);
++        fprintf(outfd, "/unigb { /BousungEG-Light-GB-UniGB-UTF8-H findfont %d scalefont } def\n", fsize - 1);
+       else if (!strncmp (current_locale, "zh_TW", 5))
+-	fprintf(outfd, "/unicns /ShanHeiSun-Light-UniCNS-UTF8-H findfont %d scalefont def\n", fsize - 1);
++        fprintf(outfd, "/unicns { /ShanHeiSun-Light-UniCNS-UTF8-H findfont %d scalefont } def\n", fsize - 1);
+     }
+ 
+ # ifdef DEBUG
diff --git a/app-text/mpage/files/20_bts416573_manpage_fixes.patch b/app-text/mpage/files/20_bts416573_manpage_fixes.patch
new file mode 100644
index 000000000000..3a4df84e4ee6
--- /dev/null
+++ b/app-text/mpage/files/20_bts416573_manpage_fixes.patch
@@ -0,0 +1,628 @@
+Index: mpage-2.5.6/mpage.1.in
+===================================================================
+--- mpage-2.5.6.orig/mpage.1.in	2008-08-12 19:12:42.274087056 +0200
++++ mpage-2.5.6/mpage.1.in	2008-08-12 19:14:15.003371396 +0200
+@@ -54,7 +54,7 @@
+ 
+ 
+ .SH DESCRIPTION
+-.I mpage
++.B mpage
+ reads plain text files or PostScript documents and prints them on a
+ PostScript printer with the text reduced in size so that several
+ pages appear on one sheet of paper.
+@@ -63,14 +63,18 @@
+ 
+ .PP
+ The following options are recognized (note that arguments to options may be
+-separated from the option by spaces, except for 
++separated from the option by spaces, except for
+ .BR -B ,
+ .BR -m ,
+ .BR -M ,
+ .B -p
+ and
+ .BR -P ):
+-Also when mpage encounters -- as option it will stop parsing arguments
++Also when
++.B mpage
++encounters
++.B --
++as option it will stop parsing arguments
+ and the remaining arguments are interpreted as filenames.
+ 
+ .TP
+@@ -84,7 +88,7 @@
+ .TP
+ .B -4
+ Print 4 normal pages per sheet
+-.IR (default) .
++.RI ( default ).
+ 
+ .TP
+ .B -8
+@@ -95,25 +99,29 @@
+ Toggle layout of the pages on the sheet so that successively numbered
+ pages run down the sheet, as opposed to left to right.
+ .RI ( default
+-updown) .
++updown).
+ 
+ .TP
+ .B -A
+-This option is deprecated, see \fB-b\fP.
+-Prepare output for A4 sized paper.
+-For default see 'mpage -x'.
++This option is deprecated, use
++.B -bA4
++instead.
+ 
+ .TP
+-.BI -b papertype
+-Prepare output for selected paper type.
++.BI -b papersize
++Prepare output for the selected paper type.
+ .I Papersize
+-can be \fIA3\fP for European A3,
+-\fIA4\fP for European A4,
+-\fILetter\fP for US Letter or \fILegal\fP for Legal
+-sized paper.
+-For default see 'mpage -x'.
+-To see the list of currently available types, just give the 'mpage -bl'
+-or 'mpage -b?' command (Note: mpage exits after finding such option use.)
++can be \fBA3\fP for European A3,
++\fBA4\fP for European A4,
++\fBLetter\fP for US Letter, or \fBLegal\fP for Legal
++sized paper.  For available types, see option \fB-bl\fP.
++For the default, see 'mpage \-x'.  This default is taken from the
++system; see \fBpapersize\fP(5).  If it isn't found, mpage exits
++with an error.
++
++.TP
++.BR -bl ,\  -b?
++List the currently available paper types, then exit.
+ 
+ .TP
+ .BR -B [\fI<num>\fR[\fBlrtb\fR]*]
+@@ -121,19 +129,19 @@
+ Specify text box margins and line thickness.
+ The default is 0 columns (lines) for both left and right (top and bottom)
+ margins and 0 line thickness.
+-Specifying 
+-.B -B 
+-solely toggles printing of the box. 
++Specifying
++.B -B
++solely toggles printing of the box.
+ .IR l ,
+ .IR r ,
+ .I t
+ or
+ .I b
+-set the left, right, top or bottom margin respectively to 
++set the left, right, top or bottom margin respectively to
+ .I <num>
+ columns (lines).
+-Not specifying any of the sides, will set the line thickness when 
+-.I <num> 
++Not specifying any of the sides, will set the line thickness when
++.I <num>
+ is given.
+ For example
+ .BI -B 1
+@@ -142,7 +150,7 @@
+ 
+ .TP
+ .B -c
+-Toggle concatenation off pages from different files on single sheets
++Toggle concatenation of pages from different files on single sheets
+ .RI ( default
+ off).
+ 
+@@ -166,27 +174,26 @@
+ 
+ .TP
+ .BI -D dateformat
+-Set the date format as in 
++Set the date format as in
+ .IR strftime (3)
+ to be used in date/time representations (e.g. in headers).
+-(Note: to be useful you probably need the \fB-H\fP option.)
++(Note: to make this useful you probably need the \fB-H\fP option.)
+ 
+ .TP
+ .B -e
+-Print 2 normal pages per sheet in duplex mode. Every first 
+-and fourth page or on one side and every second and third
++Print 2 normal pages per sheet in duplex mode: every first
++and fourth page on one side and every second and third
+ on the other side. This is more or less a combination of
+-the \fR-O\fP and \fR-E\fP option but then in one pass.
++the \fR-O\fP and \fR-E\fP options but in one pass.
+ 
+ .TP
+ .B -E
+-Print 2 normal pages per sheet. However, this option will print
+-every second and third page of every set of four pages.
+-This option will ignore
++Print 2 normal pages per sheet, namely: print only the second and
++third page of every set of four pages. See also \fB-O\fP. These
++options override
+ .B -a
+ and
+ .BR -l .
+-See also the \fR-O\fP option.
+ Using these options double sided prints can be created without
+ a duplex printer.
+ 
+@@ -194,11 +201,11 @@
+ .B -f
+ Toggles folding lines longer than page width
+ .RI ( default
+-off) .
++off).
+ 
+ .TP
+ .BI -F fontname
+-Specify font. 
++Specify font.
+ .RI ( default
+ Courier). Check your printer for supported fonts. Note: this has
+ almost nothing to do with the fonts used for your X-windows/KDE/Gnome
+@@ -206,13 +213,13 @@
+ 
+ .TP
+ .BI -h header
+-This is used only when the 
++This is used only when the
+ .B -p
+ or
+ .B -H
+ switch is used and is passed as the "\fB-h\fI\ header\fR" option to
+-.BR pr ( 1 )
+-or as the header for 
++.BR pr (1)
++or as the header for
+ .BR -H .
+ 
+ .TP
+@@ -220,26 +227,26 @@
+ Create header line for each logical page separated from page text by a
+ horizontal line. Unless
+ .B -h
+-is given, the header consist of last file modification time,
++is given, the header consists of last file modification time,
+ filename and page number, all in bold and slightly larger font.
+ This option only applies to non-postscript files.
+ 
+ .TP
+ .BI -I indent
+-Indent text by 
++Indent text by
+ .I indent
+ characters.
+ 
+ .TP
+-.BI -j first\fR[\fI-last\fR][\fI%interval\fR]
++.BI -j first\fR[ - last\fR][ % interval\fR]
+ Print just the selected sheets, specified by a number, starting at 1.
+-Here 
++Here
+ .I last
+ defaults to the end of data, \fIinterval\fP to 1.
+-Several \fB-j\fR options can be given (upto MAXJARGS, default 100)
++Several \fB-j\fR options can be given (up to MAXJARGS, default 100)
+ to create a complex selection of pages.
+-Thus \fB-j\fI1\-10\fR selects the first 10 sheets, while
+-\fB-j\fI 1%2\fR prints just the odd-numbered sheets and \fB-j\fI 2%2\fR
++Thus \fB-j1\-10\fR selects the first 10 sheets, while
++\fB-j\ 1%2\fR prints just the odd-numbered sheets and \fB-j\ 2%2\fR
+ prints just the even ones.
+ .sp
+ You can do double-sided printing, in two passes, as follows.
+@@ -249,7 +256,7 @@
+ Print the odd-numbered sheets with
+ .IP
+ .ti +5
+-mpage ... -j 1%2 ...
++mpage ... \-j 1%2 ...
+ .IP
+ Note the number of pages it reports.  (Only half this many will really
+ be printed).  When printing finishes, if mpage reported an
+@@ -262,7 +269,7 @@
+ Now print the even-numbered sheets in reverse order with
+ .IP
+ .ti +5
+-mpage ... -r -j 2%2 ...
++mpage ... \-r \-j 2%2 ...
+ .IP
+ hoping no one else reaches the printer before you do.
+ 
+@@ -274,70 +281,71 @@
+ 
+ .TP
+ .B -k
+-When mpage finds a %%TRailer or %%PSTrailer in the postscript input file
++When mpage finds a %%Trailer or %%PSTrailer in the postscript input file
+ it normally assumes this is the end of the postscript file and stops reading
+ the input file. But when the PS file includes EPS files, %%Trailers might
+-be anywhere. Using this option ignores the %%TRailer and %%PSTRailer lines.
++be anywhere. Using this option ignores the %%Trailer and %%PSTrailer lines.
++
+ .TP
+ .B -l
+-Toggle printing landscape or portrait mode.
+-Landscape pages are 55 lines long by 132 characters wide by default. 
+-Portrait pages are 66 lines long by 80 characters wide by default.
++Toggle printing landscape or portrait mode
+ .RI ( default
+-portrait.) 
++portrait).
++Landscape pages are 55 lines long by 132 characters wide by default.
++Portrait pages are 66 lines long by 80 characters wide by default.
+ 
+ .TP
+ .BI -L lines
+ Adjust the page reduction parameters so that
+ .I lines
+ lines will fit in the space of one page.
+-This overrides the default values normally supplied.  (See 
++This overrides the default values normally supplied.  (See
+ .BR -l .)
+-If used in conjunction with 
++If used in conjunction with
+ .B -p
+ then this value is passed to the
+ .BR pr (1)
+ as well.
+ As a side effect this changes the font size as well (as will the \fB-W\fR
+-option.) So while there is an option to change font family, there is no 
++option.) So while there is an option to change font family, there is no
+ explicit option to change font size!
+ 
+ .TP
+ .BR -m [\fI<num>\fR[\fBlrtb\fR]*]
+ Specify sheet margin. The default margin is 20 points.
+-Only specifying 
+-.B -m 
+-sets left margin to 40 points. 
++Only specifying
++.B -m
++sets left margin to 40 points.
+ .IR l ,
+ .IR r ,
+ .I t
+ or
+ .I b
+-set left, right, top or bottom margin respectively to 
++set left, right, top or bottom margin respectively to
+ .I <num>
+ points.
+-Not specifying any of the sides will set all sides when 
+-.I <num> 
++Not specifying any of the sides will set all sides when
++.I <num>
+ is given.
+ .I <num>
+ defaults to 40 points. For example
+ .BI -m 10
+ sets all margins to 10 points.
+ .BI -m l50tb
+-sets left margin to default 40 and top and bottom margin to 50 points.
++sets left margin to default 40 and top and bottom margins to 50 points.
+ .BI -m 50l25bt30r
+-set bottom and top margin to 25, left margin to 50 and
++sets bottom and top margin to 25, left margin to 50 and
+ right margin to 30 points.
+ Margins can have negative numbers.
+ 
+ .TP
+ .BR -M [\fI<num>\fR[\fBlrtb\fR]*]
+-Specify logical page margins. For syntax, see 
++Specify logical page margins. For syntax, see
+ .B -m
+ option.
+-Defaults are 4 for 
+-.B -M 
+-solely, and 8 for 
++Defaults are 4 for
++.B -M
++solely, and 8 for
+ .IR <num> .
+ Margins can be negative.
+ This way large white borders
+@@ -351,20 +359,18 @@
+ 
+ .TP
+ .B -O
+-Print 2 normal pages per sheet.
+-However, this option will print every first and fourth page of every
+-set of four pages.
+-This option will ignore 
++Print 2 normal pages per sheet, namely: print only the first and
++fourth page of every set of four pages. See also \fB-E\fP. These
++options override
+ .B -a
+ and
+ .BR -l .
+-See also the \fR-E\fP option.
+ Using these options double sided prints can be created without
+ a duplex printer.
+ 
+ .TP
+ .BR -p [\fIprprog\fR]
+-Pipe input through 
++Pipe input through
+ .I prprog
+ command (including specified options) before printing
+ (assumes the input is a text file).
+@@ -373,14 +379,16 @@
+ 
+ .TP
+ .BR -P [\fIprinter\fR]
+-Specify the printer to which the PostScript output will be sent
+-(e.g.lpr -P\fIprinter\fP). Using
++Specify the printer to which the PostScript output is sent
++(e.g. lpr \-P\fIprinter\fP). Using
+ .B -P
+-with no printer specified will send the PostScript to the default printer
+-queue (e.g. lpr). Using -P- will return output to stdout, useful in
+-combination with MPAGE environment variable. Without
++with no printer specified sends the PostScript to the default printer
++queue (e.g. lpr). Using \fB-P-\fP returns output to stdout, useful in
++combination with the
++.B MPAGE
++environment variable. Without
+ .B -P
+-output will be send to standard output.
++output is sent to standard output.
+ 
+ .TP
+ .B -r
+@@ -392,58 +400,65 @@
+ .B -R
+ Switch to left to right mode, starting first page on left bottom corner.
+ This might be useful for landscape postscript files.
+-(Note: using 
++(Note: using
+ .B -l
+ after
+ .B -R
+ undoes
+ .BR -R ,
+-and switches to normal landscape mode.
++and switches to normal landscape mode.)
+ 
+ .TP
+ .BI -s tabstop
+ Set tabstop width (\fIdefault\fP 8 characters).
+-Should by >= 2.
++Should be >= 2.
+ 
+ .TP
+ .B -S
+ Accept non-square page reduction.
+ By default, pages are shrunk equally in X and Y, even if this wastes some
+ space on the sheet.
+-With \fB\-S\fP, 
+-reduced pages are larger but slightly distorted. (only used when printing
++With \fB\-S\fP,
++reduced pages are larger but slightly distorted. (Only used when printing
+ postscript files.)
+ 
+ .TP
+ .B -t
+ Toggle printing on both sides of the paper.
+-+This option has 3 states: nop, yes, no, which mean:
+-.BR  NOP :
+- dont do anything on PostScript, so printer default will be used;
+-.BR  YES :
+- force printer to do duplex;
+-.BR  NO  :
++This option has 3 states: nop, yes, no, which mean:
++.RS
++.TP
++.BR NOP :
++don't do anything in PostScript, use the printer default;
++.TP
++.BR YES :
++force printer to do duplex;
++.TP
++.BR NO :
+ force printer not to do it.
+-If there is no -t, then the duplex is NOP. If you put some -t on
++.HP 0
++If there is no \fB\-t\fP, then the duplex is NOP. If you put some \-t on
+ the command line, the state toggles as "yes,no,yes,no...".
+ So, if your printer is set to print, by default, in duplex mode,
+-you will use "-t -t" on command line to force it to print in non-duplex mode.
+-Use this option only if your printer is capable of printing in duplex mode. 
++you will use "\-t \-t" on the command line to force it to print in
++non-duplex mode. Use this option only if your printer is capable of
++printing in duplex mode.
+ .RI ( default
+ NOP).
++.RE
+ 
+ .TP
+ .B -T
+ Toggle tumble of every second pages.
+-This option has 3 states: nop, yes, no (with behaviour similar to -t).
++This option has 3 states: nop, yes, no (with behaviour similar to \-t).
+ So, if your printer is set to print, by default, in duplex mode,
+ with tumble on,
+-you will use "-T -T" on command line to print in nontumble mode.
++you will use "\-T \-T" on command line to print in nontumble mode.
+ Use this option only if your printer is capable of printing in duplex mode.
+ With this version of mpage,
+-you may use this option even if you do not use -t.
++you may use this option even if you do not use \-t.
+ .RI ( default
+-NOP.)
++NOP).
+ 
+ .TP
+ .B -u
+@@ -451,15 +466,15 @@
+ 
+ .TP
+ .B -U
+-This option is deprecated, see \fB-b\fP.
+-Prepare output for US Letter sized paper.
+-For default see 'mpage -x'.
++This option is deprecated, use
++.B -bLetter
++instead.
+ 
+ .TP
+ .B -v
+ Toggle printing a count of the number of sheets produced for printing
+ .RI ( default
+-off.)
++off).
+ 
+ .TP
+ .B -V
+@@ -467,27 +482,27 @@
+ 
+ .TP
+ .BI -W width
+-Adjust the page reduction parameters so that a line with
++Adjust the page reduction parameters so that a line
+ .I width
+ characters long will fit in the space of one page.
+-This overrides the default values normally supplied.  (See 
++This overrides the default values normally supplied.  (See
+ .BR -l .)
+ If used in conjunction with
+ .B -p
+-then this value is passed to the s
++then this value is passed to the
+ .BR pr (1)
+ program as well.
+ See also the \fB-L\fP\ option on font sizes.
+ 
+ .TP
+ .B -x
+-Force usage display, which also shows current defaults.
++Print usage information (including current defaults), then exit.
+ 
+ .TP
+-.B -X [header]
++.BR -X [\fIheader\fR]
+ Print header on the left and the page number on the right
+ of each physical page (sheet).
+-If no header is given, the default is the current filename (note 
++If no header is given, the default is the current filename (note
+ influence of
+ .BR -c ),
+ the filename of the first file on the page is used.
+@@ -495,12 +510,12 @@
+ .TP
+ .BI -z printcommand
+ Specify command to use to send output to.
+-Default is 
+-.B lpr 
+-(1) for BSD style spooler,
+-.B lp
+-(1) for SYSV style spooler.
+-You can specify command line options, but note 
++Default is
++.BR lpr (1)
++for BSD style spooler,
++.BR lp (1)
++for SYSV style spooler.
++You can specify command line options, but note
+ .BR -Z .
+ For example \fB-zlp\fR for system V Unix.
+ 
+@@ -508,7 +523,7 @@
+ .BI -Z printprog_queuename_arg
+ Specify what option to use for the "\fB-z\fI\ printcommand\fR" to specify
+ a printqueue.
+-For example \fB-zlp -Z-d\fR for system V Unix.
++For example \fB\-zlp \-Z\-d\fR for system V Unix.
+ Default is
+ .B -P
+ for BSD style spooler,
+@@ -518,10 +533,10 @@
+ .PP
+ 
+ .SH ENVIRONMENT
+-.I mpage
++.B mpage
+ examines the
+ .B PRINTER
+-(or 
++(or
+ .B LPDEST
+ for SYSV style spooler)
+ environment variable to override its default printer.
+@@ -529,18 +544,20 @@
+ .PP
+ The
+ .B MPAGE_LIB
+-environment variable can be used to control where the character 
++environment variable can be used to control where the character
+ encoding files (\fB-C\fR) can be found.
+ 
+ .PP
+-.I mpage
++.B mpage
+ also examines the
+ .B MPAGE
+ environment variable for default option settings.
+ Any option or combination of options can be specified in the
+ .B MPAGE
+ environment variable.
+-For example, if MPAGE is set to the string:
++For example, if
++.B MPAGE
++is set to the string:
+ .IP
+ .B -2oPqms -L60
+ .PP
+@@ -550,14 +567,14 @@
+ .B "qms"
+ (overriding the
+ .B PRINTER\fR/\fBLPDEST
+-environment variable, if it exists.)
++environment variable, if it exists).
+ In the environment variable, white space is used as an option delimiter,
+ and no quoting is recognized.
+ 
+ .PP
+ Any command line options will override both the
+ .B PRINTER
+-and 
++and
+ .B MPAGE
+ environment variables.
+ 
+@@ -571,7 +588,7 @@
+ Suffers under the burden of far too many switches.
+ (But
+ .B you
+-wanted the choices!) 
++wanted the choices!)
+ .PP
+ NULL characters in a postscript input file will cause mpage to crash!
+ .PP
+@@ -580,7 +597,7 @@
+ Mpage is year 2000 compliant, as long as the underlying operating system is!!!
+ 
+ .SH VERSION
+-Version 2.5.6, Released Januari 2008.
++Version 2.5.6, Released January 2008.
+ .br
+ Location:
+ .IP
+@@ -588,6 +605,6 @@
+ .br
+ ftp://ftp.mesa.nl/pub/mpage
+ .SH AUTHORS
+-Marcel Mol <marcel@mesa.nl> (current maintainer). 
++Marcel Mol <marcel@mesa.nl> (current maintainer).
+ .PP
+-Mark P. Hahn (Original author) 
++Mark P. Hahn (Original author)
diff --git a/app-text/mpage/files/30_bts443280_libdir_manpage.patch b/app-text/mpage/files/30_bts443280_libdir_manpage.patch
new file mode 100644
index 000000000000..9e2e630500e6
--- /dev/null
+++ b/app-text/mpage/files/30_bts443280_libdir_manpage.patch
@@ -0,0 +1,22 @@
+Index: mpage-2.5.6/mpage.1.in
+===================================================================
+--- mpage-2.5.6.orig/mpage.1.in	2008-08-12 19:40:49.390230323 +0200
++++ mpage-2.5.6/mpage.1.in	2008-08-12 19:41:08.143299000 +0200
+@@ -157,7 +157,7 @@
+ .TP
+ .BR -C [\fIencodingfile\fR]
+ Specify the character encoding file.
+-The file should be in the mpage library directory (\fIPREFIX/share/mpage\fR).
++The file should be in the mpage library directory (\fIPREFIX/lib/mpage\fR).
+ .I Mpage
+ has an internal default encoding based on Latin-1 or IBM codepage 850.
+ Depending on compile time option this encoding definition is on or not.
+@@ -581,7 +581,7 @@
+ .SH FILES
+ /tmp/mpageXXXXXX
+ .br
+-PREFIX/share/mpage
++PREFIX/lib/mpage
+ 
+ .SH BUGS
+ .PP
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..612cf81ab708
--- /dev/null
+++ b/app-text/mpage/mpage-2.5.6-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2012 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"
+
+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="${FILESDIR}" 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/Manifest b/app-text/multitail/Manifest
new file mode 100644
index 000000000000..a47244c65ad0
--- /dev/null
+++ b/app-text/multitail/Manifest
@@ -0,0 +1,8 @@
+AUX multitail-6.4.1-gentoo.patch 1440 SHA256 18f0b158eafaf838dac957cfb21ac9db9ecbcc4e1d45cf42d35079346698adc1 SHA512 eb53834c68dc46c22a2d900cf5e8835a98ff9c9b001ae15eb778bb6348bd48b17dea8a1605bfcc9ddad4324300a81013a0a3710e559c00e369ae42cdfb38b6a7 WHIRLPOOL d898950a532daf38f554a7ab111621ae39de898c28e25b7d8854bc96784734eeed24c232afc86456ec464341aaf28ca38e9c32bacd7af4d88beab3c180881ea3
+DIST multitail-6.4.1.tgz 155717 SHA256 8a6baecf3537c791f70645f3613bfea0c91a22040f2531bfe03b6d0cdd112134 SHA512 14d4785df257aaac8b3c1a5de8aa48a0b6c3e7829867e1fbc8d458636ecafcf506e09b12581cf562e1f503218b1729e47e9197f541bede90dc0a4d5e916b1c8b WHIRLPOOL 467d9fd6d089aebe597475d07217baadcb280ea952ae731310365a55046009c808b16657485c037f54dd746e2103f318c3555de04d4e14f2ab2ef19bbc408543
+DIST multitail-6.4.2.tgz 155757 SHA256 af1d5458a78ad3b747c5eeb135b19bdca281ce414cefdc6ea0cff6d913caa1fd SHA512 668c453372ba1e4013aa5191c697bdcaad82c84732841c120a506bee063d2134941e93aed63f96e5aeeb6045829a13aba012f9514dbd9520ab4f1b9b75b42dbd WHIRLPOOL c74a85671f2772a6b5d8cc224481fc1793d851573e77e9b7cc4bc3e0569b4ba58ca63989f7f82e2e91dabc29363b87dd361305178b8c174fe2a7b250c86e731b
+EBUILD multitail-6.4.1.ebuild 1282 SHA256 75eaa31152d2e8bd81b3c99c1866e2dce62b4cc8a0d65aeeee3b5771fa06a694 SHA512 4f74993f6fa90cdec97da72db2ec18f680095d479211233eaa619eed64db54247a3a763c8980858f9177d72a543b273d75304529c2ceca013414140d6ba6f633 WHIRLPOOL 4c0e22944409d3618a9f8395bbf9b79871655900960b2f5b564a059163281d29bc57da4c895e210b28399d55c4d4aa747eec553aa4480e295246a05dfab3f979
+EBUILD multitail-6.4.2.ebuild 1288 SHA256 a373821358652ec019286cfe85c3046e0bf98e628a7ea357bc3527ff7801ebad SHA512 4beadf5564ff8827c0360236bfc882a5522ce926281b7633110a24c81beeb1a6fd102c2ab0b51b73e9713b66a5b1d2f6f3e63cb0f23297b7dc9dca148c0a1429 WHIRLPOOL 1562359d1b9ec40c3ff7b5d828d36f81ca5ba0107a508865eb8a8ae19867d632cefd61d89cf1281d86c0326835052f34cd174df25ea68acf71b1fa4be0789702
+MISC ChangeLog 4751 SHA256 02aed0f0c56e963750b80d62f7f37258e0cfd08be384e9a9ecea5a8833f2041a SHA512 042f709710ca64b325cbf3d98e001e08d87872b499ff9035c3804d4990eb497b1bfa5dcfd12fe69303ff8aab94c113a9239fcb4d224a9d8d7f641f5871c37045 WHIRLPOOL b4ba4fd75099fe16c3975bb6e25ff21b3d3ad7bf03d50cc506197a28ebc3a73221320b8d6c661b80575077bdd3bcfba206d35759ee7c58c6c5d835d8c8ebebc5
+MISC ChangeLog-2015 15651 SHA256 8eb84796a812f13620b25cd3934b3c9450fd06e13f5502a601280095cd2d55a0 SHA512 8847f9389f21ad9f067d0ae9009409fdadbb8a9f2a088e8070f5c5943b130d0141a3d09688ecaf0186f321a95d61173e306655f50853fbbaa7414bd319785e94 WHIRLPOOL e52612777fab0373c736fa3a733a4faeb49f58934eab39780fec01293076463bf8fe2fee79509ce558314ae2c7adcd714d2d432484c2f245884e299df8f8e70a
+MISC metadata.xml 436 SHA256 0ab7203a5b0705aff0a540e100f17e8960f2d0512e659941dd35f8144df42246 SHA512 cde00a0ec284fa538b1894947dfb4616a71ebf64b09602868d431300cba3e569d504296c66b1661293f6ed18e94dbae43a1da1fe70b5fbb2f3fa5ca45ab4ea7d WHIRLPOOL bed6659ed80b813e990a9261b22cf1ccd52ab265ed4a59c4a35fb75f79ed45d199636bdba27c1936cc3f2c0e28564fa0815fd50348c17fdd35c3fa97e8de3c3b
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..27ef92564dbe
--- /dev/null
+++ b/app-text/multitail/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>wschlich@gentoo.org</email>
+    <name>Wolfram Schlich</name>
+    <description>Primary maintainer</description>
+  </maintainer>
+<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/Manifest b/app-text/mupdf/Manifest
new file mode 100644
index 000000000000..2de3934d18f3
--- /dev/null
+++ b/app-text/mupdf/Manifest
@@ -0,0 +1,14 @@
+AUX mupdf-1.10a-add-desktop-pc-xpm-files.patch 13387 SHA256 2b6636d8504e789a13b6827b2a0e51999dbb153ac5b00b68b298ebfa136efc93 SHA512 1d6ccfccf785cca01b1a607e94f90a5e31c748154e9fa7664b9863c7b26951f17a584ffc7cd23dd83d1e547498e22c902067e9695006824017e69d33dbf25a5b WHIRLPOOL 8e447d2821aeb7ca203f832e555a3084d79bc0c8cc33c9c61bbca2efa56e3eafda2b2a0a21bf594215717c282c9d9cb2a7cbabc240fb32aa26beaf1b8d7874a2
+AUX mupdf-1.11-CFLAGS.patch 234 SHA256 2016f456c177132ecfe7a1f834979e977b8833d5d447bf191f6a2b3468dc989f SHA512 8c0ae23e14842cf089434c716733f26738def189fbbb44341b772c9993b9f73b269f4d7744d2ef90a285cd1b02d7f67e18f1146e91851fc4d8c118c49ef0dea2 WHIRLPOOL 8e2982e3f432921d5b453252ab9eb213d7b19b195e1d855783beb1897cd4fbc868ffe6b2072891e8854ec6e1820864f8dac902e248236ac793fd4a6aab69762f
+AUX mupdf-1.11-CVE-2017-6060.patch 675 SHA256 338f274678cb16454b1e25ded32be597384a1fb4797dec95309d90ba64f2a628 SHA512 1ff64fb7f8a527d643cb57b472bbc48b73769eb826acdb511a5f77877d748ee165bb0e072ad27b62af5e3b7fcb075595ff53812824c5b03e686f758d0d270bd3 WHIRLPOOL 5346677adb55b384bb05d9a7a2ea01ade3f134e8adcc295c62aaf8df9bd6542a11dd7d6ff0f0b0325897107dfbf36e60be45b2a20dd909d0f2769864037386ea
+AUX mupdf-1.11-drop-libmupdfthird.patch 327 SHA256 8fcd9ca8fac316e866a482c2c8eaf35a452e8c71c50e564f58c50fffe4d7823b SHA512 c4cc2e2b6d341627f79ff1990de988b06be9b27c4cfdd81160e3304ebf3a5bdda6e3f88656d43d5bf6fe91725b55422990c71ae930058ca6437686e9afe75d21 WHIRLPOOL 422760cded5cd8ff6b741f0fb8549a90a42a56a99c66e456c539e987b6870fb2c74350c890d6677cfd585843256a2ee6f03582eda9fa6ec37c69127439c2bd37
+AUX mupdf-1.11-openssl-curl-x11.patch 1087 SHA256 ac51bda631154c752932332b1119ab2db5e0ca1902b3697840443d956ab249ee SHA512 f3441a4ef5548e11adda6984ed84c6fe6d337a9ac3b17456b8b1b620e51f134fd39f5cef969ffe43b1a3025b3b6026b7cfc6d7fcdccc464859e3bf931d253c82 WHIRLPOOL 9be3942d349c9e1689070a36abfc957da6730c8ceffa7d7ed689303496d31a536a1f3cb79ec2b2e8216c0052ed669de49a38fe1a7e5f6b3c082e2d8f715c0e0f
+AUX mupdf-1.11-system-glfw.patch 288 SHA256 a841c8af88f94791325cac717d6d1b0ac503bc0a6ac369744a4f4393f0faab7e SHA512 8331c72323011be2905383af3e0d76653d2a8551da3b815730aa8287494d6f867cc82bc8e2ba9ca2f5bdbb301ca3aba775c946019567957246bab1a852cda75f WHIRLPOOL 63643f6f7ae5901442ee3067f2a310b2737f973659a63204eabfae994d91b5d881db6822d222e2698404aa699ecc94a7895a9374c1199f7896e09cf53ba74653
+AUX mupdf-1.3-zoom-2.patch 214 SHA256 450b10fd3b9ed1d91df283db0086f89b02b9ff7f8a4d24f792ce6ea76f0c93e8 SHA512 95bb2d68246dc22eb0fb6e8a312c0f02476f356ee219c417dfa06473b5944d9e63ae6778cd967c70e60fb933eee1aac337efd2476b0bc791df1c69f7b7b822b3 WHIRLPOOL 47eb252b06e32cea80c5861f94ae5f391c6f803a0ee7dc8765d4eb7decc516936a0821c821957d17ab9a6f5b6d5c16bf071ad201bb1eea14cd04911059d3735d
+AUX mupdf-1.9a-debug-build.patch 159 SHA256 c22f80dd7f1f696012cf0d6286682205431646a4fac03b4785f1ab93e810855a SHA512 5337c7dc2c5b29200378082651b81f5483475fe5cba997b2c55f60143e3f00901b19fc51216413151be87cef80e8fe452cde81006bfc552bdb6b1e9d6c0309cb WHIRLPOOL 4589bd816a6555fdb4da247e792ccb6f1472deaf1728eb84300132f8efc1cea52a49b57316c0dfa1de61ce6dc5c53c08bc310c05b29f69d1af3e135a7186cd11
+DIST mupdf-1.11-source.tar.gz 40156070 SHA256 209474a80c56a035ce3f4958a63373a96fad75c927c7b1acdc553fc85855f00a SHA512 501670f540e298a8126806ebbd9db8b29866f663b7bbf26c9ade1933e42f0c00ad410b9d93f3ddbfb3e45c38722869095de28d832fe3fb3703c55cc9a01dbf63 WHIRLPOOL 91ee829b7b39b31c21cda324925e70a52139515c9cd2ef6fb3d903493c96af22d2c2bf19017dfc6d58842c8ebd7896faef34b73d94822977f10300c916fe1352
+EBUILD mupdf-1.11-r1.ebuild 4654 SHA256 903381266f63fbe5b9d9ec83fd3ba6496e8a33b5ad39c32cc1f8c440602e5dce SHA512 9e7ebefdf8ddea80adf2c36cffb03466472c69321042ccea464768c943549e8568cf7ce3289932b2a9610e9ea8753c99366a128709d7e3e026dbc42a38870f9c WHIRLPOOL 2501d0b0db410b0839e58d145f0ba625a030eff1ba1f6f28862259bb1bd72d385e4d031f905a28d5ddfd43ef2e8c3165379ef3d98e7e7faacb90694b8a03d757
+EBUILD mupdf-1.11-r2.ebuild 4777 SHA256 c0258d7c70b3ebb101565d89391c05822a31b44c4c9f3f8c1f288bc7d9f8b097 SHA512 6d7a44601d1b45bb9122f18a895758b660c399c63f9643516c43a438540ef864eb6afae2928b21a3f59ef225def9802c90e425129cf4680ed04defee5d889663 WHIRLPOOL 9679adf3fa8c1ff8cd562157cd884841d965f82947a34b04c25366cc692ecf6bde8a9fe6b3c55075b0a2af1e06c7ce6dfdb48882c87cfd31c62f52ec4b12cfa9
+MISC ChangeLog 6777 SHA256 a88fbf17daa38aaba9fba4ca133388d560a96ba77a8e1f13f169fee76caf4885 SHA512 c9a889e876e1de04b6b6734152e208583d046729c54d903eae5e23856cb36a2a6822aa7bd8dff9ee2a9bd19e8ebf4b020c997d3c3b169aed4382210599c77f9a WHIRLPOOL b86480a08ec67d2a9ec9099f262455962254fd7227ac3024701a0df25b53583782a384e585b6a394b7704ce24f333f8c4eb6b0db87f61166bb2d4d22acb614f1
+MISC ChangeLog-2015 18906 SHA256 0490eee90b47fae3fc4a7d4c1f292bfa7a1badcd1fdf0e02e79525c30bb6bed3 SHA512 0e4c8b9a8b0bd5459c99814a1d39c4185ad15807bf2df05c35d5cd82152260d80b71bdf9f27d2ce9bf613b729a55d51b3df26a31537c918ca8d7ed26410e4d4e WHIRLPOOL fdd6762068f91c1013bd0a7dfc15773d8c57343ced4d5d47dfea36450b2640856161bb3b1048338d36b500136a9cd76f59cb7aaf32be9fc76f1adab885c598bd
+MISC metadata.xml 315 SHA256 e5e59f2fb1f03e4c46068ac36f2075b8527af23f99e4f3a3d074a41f0a6ba1de SHA512 1f3d23236f716a9e02a4f320105a8cd36e0dc84e25e35764677b66f7ae42039e0ae6f82ef06635cb0fe53fbb2e27ab854e54d45280275b8235f186328daa2b4e WHIRLPOOL 54257bf5e653e3377c7eb65d6faaa874d9f4eca1e5aca7175598df242344f8f8626dd54a47c850bd5019718c35505b7b12d921328f8ddac516493d1c0d441c04
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..eaf116788682
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-1.11-drop-libmupdfthird.patch
@@ -0,0 +1,11 @@
+--- 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)
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.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..eb9d06b4a3a7
--- /dev/null
+++ b/app-text/mupdf/mupdf-1.11-r1.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2017 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="http://mupdf.com/"
+SRC_URI="http://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..ba45032f2193
--- /dev/null
+++ b/app-text/mupdf/mupdf-1.11-r2.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2017 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="http://mupdf.com/"
+SRC_URI="http://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/mythes/Manifest b/app-text/mythes/Manifest
new file mode 100644
index 000000000000..b80157b90408
--- /dev/null
+++ b/app-text/mythes/Manifest
@@ -0,0 +1,5 @@
+DIST mythes-1.2.4.tar.gz 4910303 SHA256 1e81f395d8c851c3e4e75b568e20fa2fa549354e75ab397f9de4b0e0790a305f SHA512 a04da39812bcfb1391a2cba7de73e955eafe141679ec03ed6657d03bebf360b432480d0037dff9ed72a1dfda5a70d77d44ac2bb14cdb109fd8e2a38376feee21 WHIRLPOOL c41699774fc81667c2ae3fd41e2ec8165cb99b4680f66f136af9e17f40b90ce9a0a0215668ed9a34e2b76f8f3d4c4b244aae4ed2c51378e27eec678035ad907b
+EBUILD mythes-1.2.4.ebuild 590 SHA256 29bf01b188bf7e8b2d649c6e4cadb5d01e58c35c46f7ee79be52d37e385d9c5e SHA512 499fe11088df9d7209b5d07960d62b0999724dcaff9f31ff297b427b009b1761794028588981c30b1b78930d8723f1658b6d0832032b0a64b37f6fa617162443 WHIRLPOOL 84671ee77c63379d5e4ad8a4c11763b92858bfa872899bdd74416c59ba35e6cbf1d7b52f36d3d0047f8612ebaea2d9a5e5477a6fcd3e5991cb9b1ee4be197627
+MISC ChangeLog 2562 SHA256 b4eebeef3d0a19831e5f6466651dda35c1906966a1a368a09a657138b32c0226 SHA512 48600d3e13c05378f6e28bbbb7835ef4f5d2cd433b06f4a14a8f051749d14cd7504d752fb11e84629c978c53d8589891e57382e0ffa8be8d9ac592d0112afce8 WHIRLPOOL 7183e029385e69639e75ceec3a4ab525cf8c844c1d6ce61390e19bdca13b5d14df06f83247b3fda59660e5aa3a95589d2ccaedde4c8b7a467643389a10367cd1
+MISC ChangeLog-2015 2627 SHA256 ca172d031271c391c94dfa92e09f076634fa2ebab240d8550e48de9a6b4dc6ac SHA512 22fd6acaf7e4b6495a335703dd014bac9ea97ccd92681ed5a0c62f1065760762c306639c719926f89ec7a0029ead0eb68d06f92e59fab8fc5e6421c2d93bf0c5 WHIRLPOOL 90d6bdfc7184623e1344cd6ded57cffb899fdc518a8ee9d0364f66587041e6bbbc3a52ad5731827a613445cca2677f073e855f22cc65199d15057bb51176e636
+MISC metadata.xml 333 SHA256 16027f52ddb7db209628de9bfcae72d9f34f530a8a4a43fad7bb74d7b2a135ec SHA512 1c2849146c40fcf9b1c352d57e9580ea7d9c2fbdc71c5cf601343e3beb9580876b6dc1d42d41abe01163d92c0eb7837fedf85fc3e7408801f0d966ccc8e78ba2 WHIRLPOOL 8d0ff5258f30359716c5d56f6e5c4dfd7c30b0fa6127b0778bb988164bdb51e9ae2cd1e72d3c4fc9da8e6d849d003ee73b198f82c004586fd60a060a4d4ad60c
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/Manifest b/app-text/namazu/Manifest
new file mode 100644
index 000000000000..d6869d03dd7d
--- /dev/null
+++ b/app-text/namazu/Manifest
@@ -0,0 +1,10 @@
+AUX 50namazu-gentoo.el 108 SHA256 42a3f8c20434d06bb5f9f8b50d94754a12494932f61f07e9fdeeaaeca68e398b SHA512 aec608edb1a428de7bf0365b0ed181096b742e3eaf49c1f68d7f24d0843fc130304ef110d2060a531c9594bc7c8f6f9fd5dd5b0d51a31eff6c497bc01ad6c1f9 WHIRLPOOL 9e9e27d805fa59a2c2d2af49e2c4d8fd084c5fe861620bd62a274d463f6466c4d8be2b32a455009e7e797f0725ab7da91dcfc370f0ad72653d6e87aee8aea1f4
+AUX namazu-2.0.19-gentoo.patch 1258 SHA256 89218d988e64446cf65d4ff73f53a45543cc45d83dce9065ef4d44a2dc5844dd SHA512 bf6c7e3b91114b2be955440436a921a2428a5b833a89d64940ce1a8038060419fd9714421e0f1c4d0ba0180e4f1b4d2236b22469089622864db65ed2e7db4d0b WHIRLPOOL 3d450f8aa7ffe4958a894eee3f97cca08c150dc531cf43c6ee646c79df24efc6fb6eb8ff8506643a12c52ea79b0bda974fefcc2f3b2aed98cf748d7aafeca2f2
+AUX namazu-2.0.21-search.patch 2122 SHA256 5d5c75102e3e0dc3cb35eb91a44d7ceabc699a7ae809812e841cf64b82e13db9 SHA512 b69d347ba10d88d99f335bfa2dca61d52c284ef2f5375f43f0c7fe16fc8d39cb4b8e3ad57a1bfbc07d463284ec53dbdc805233e0c6f441b451ae50dba1e960c8 WHIRLPOOL 5df0f138b66e1f264c0e129528df491fb9bd88f5f2a6eafb349014f15a72230bdef9aac8ff5895c901ccd1f17e144354f8f7aeb24a83c802e4786d068f17ea85
+DIST namazu-2.0.21.tar.gz 1394048 SHA256 5c18afb679db07084a05aca8dffcfb5329173d99db8d07ff6d90b57c333c71f7 SHA512 c0ce1b8c8b8ce30ee7d28cfed790a9c8585d1b468eefe2ba4ac70976e09329ae04a3a3bbf0b86b9673cfdf206f2b103896daca2f053062f451884fa659b31ea6 WHIRLPOOL 61794e4c1644303c90c074c4f383a74dd8db0550c8108120bc1ee9dd47d9b1e3aeef6484008c6ee729eb7711c4da57bb0d50f16ab0353886296e70d4f9daa9db
+DIST namazu-2.0.22pre1.tar.gz 1394798 SHA256 58937c8dd62934c4b6596670361e53b20505415afa02bf1491b5ae0176d4afbb SHA512 de982a45a7e8d11f901e0e5db3ba8047d065569c56de676d6b876747e8bf5c358f0d3037a6539421cbff2c0f0cbc889d379b33500e308d038e663d62cd4b5005 WHIRLPOOL 86723855e372cfd4f7e035ca609c19114ee8531d3202a34382718cf4a037db8c883e3cf4a94616afc95e380f66720131c08f577b94975ce13fb079e9cb36a595
+EBUILD namazu-2.0.21.ebuild 1550 SHA256 8b80434f1b196a259257a6fbbcf228168e4ddbfa2374cfce8599f289b20455fd SHA512 dc909c71022555bb77e4ba1a47baef8c310eb3aa3a43cf395a178ae2652c0c26a1139835469a868594dce8a4c907de234f3f3304a3b3ed234c6b2031293de5b9 WHIRLPOOL eda759bad6ead81b20969e2bd86d90b5e67428fec309445ae73ece2d9fbf53f894adee13fcc733115ec0aae33bcc7a61e1f2f4dd9e9b220ff35ae69347edd35c
+EBUILD namazu-2.0.22_p1.ebuild 1607 SHA256 0eedabb0ac007d542b22853c1167e9f739a9d81b38c825ef59d51556ef881f10 SHA512 4da30b1aabb027dda91b95732a1d5ae5457f8b8615a02be26a0e153b89d3e7d3a7927c9df36cc2333b4af9d5042f95ddb52af971310514a3601fb1a0cf7ac3e5 WHIRLPOOL ded90da124d22e1484f1e66dc7d6fe5dca8e1606cef0779bc4a53462a9c84fb693da907ec30e99f102b74cbfe8888adaa37b80774593d4db21e31276d9fb0d35
+MISC ChangeLog 2748 SHA256 7901afe8f2fee04c792899107a36bce46d207d0db81d175a2e74c6b7a0679da0 SHA512 b52b80f9a134e078d369769a5ce52fc9ac93b34c8032e8301560ed714d694e6ad0deb69858600c0239ce3a4af5313831f06dc14278551f88232394d1c8109bcb WHIRLPOOL 47139da8d3210df1d6667ba15457bc9eabe625f2f3248a615e408c81ada476a555241dee53990ca6534dfced89e8499db295d6c9a33de623590f88183faec482
+MISC ChangeLog-2015 5706 SHA256 2a43cce186d5165b37db66638b64fc291b7a5b86c496b8bffc20ea5561ffdf28 SHA512 aa1eaa43eeda63569764bc6f88e3973f100885c12cba72fb3f99e28ea525f32fd74ab156a9104893f3f77d35192a52849a227fa5e31700e6c89a5d9ed60acd87 WHIRLPOOL cc170dd8770951aa1dd774157c0557d7b93bcf344e58c2717ef4270b86dbe796a50bc6e48eda51b200eea2455abf214973ed1eb540560509d2156a093e30b568
+MISC metadata.xml 320 SHA256 9604d5dfbe5c1580a03ae86cb4b7f7993661599e8776b4738856c6c3bfbeeaef SHA512 7fefedc1acd2f81eaf89ea57b6963d1e308be3be6d85dc2c56d52c1c3a4f5ff1531f07db5b560838c51185dc105de1f72dfda565549cbe58c519ba8e6099f478 WHIRLPOOL a8bfd5aa57cdbec194738e7047c926df69e700ff96c64db6fd2905b5bb7c665e502dbfb67509bfd024d3e5f8e378cd7c2b01e59f3b0272eb7aa9037404e25fe9
diff --git a/app-text/namazu/files/50namazu-gentoo.el b/app-text/namazu/files/50namazu-gentoo.el
new file mode 100644
index 000000000000..56bbce50af82
--- /dev/null
+++ b/app-text/namazu/files/50namazu-gentoo.el
@@ -0,0 +1,5 @@
+
+;; namazu site-lisp configuration
+
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'namazu "namazu" nil t)
diff --git a/app-text/namazu/files/namazu-2.0.19-gentoo.patch b/app-text/namazu/files/namazu-2.0.19-gentoo.patch
new file mode 100644
index 000000000000..6d7f649507bd
--- /dev/null
+++ b/app-text/namazu/files/namazu-2.0.19-gentoo.patch
@@ -0,0 +1,29 @@
+diff -Naur namazu-2.0.19.orig/filter/Makefile.am namazu-2.0.19/filter/Makefile.am
+--- namazu-2.0.19.orig/filter/Makefile.am	2008-05-03 02:07:03.000000000 +0900
++++ namazu-2.0.19/filter/Makefile.am	2009-03-13 01:04:20.000000000 +0900
+@@ -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 -Naur namazu-2.0.19.orig/filter/Makefile.in namazu-2.0.19/filter/Makefile.in
+--- namazu-2.0.19.orig/filter/Makefile.in	2009-03-12 23:24:48.000000000 +0900
++++ namazu-2.0.19/filter/Makefile.in	2009-03-13 01:05:08.000000000 +0900
+@@ -455,12 +455,6 @@
+ 	uninstall uninstall-am uninstall-filterDATA uninstall-info-am \
+ 	uninstall-info-recursive uninstall-recursive
+ 
+-
+-# 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
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
diff --git a/app-text/namazu/files/namazu-2.0.21-search.patch b/app-text/namazu/files/namazu-2.0.21-search.patch
new file mode 100644
index 000000000000..6a8e10e8e1a0
--- /dev/null
+++ b/app-text/namazu/files/namazu-2.0.21-search.patch
@@ -0,0 +1,56 @@
+--- a/nmz/search.c	2011-08-05 09:26:47.000000000 +0900
++++ b/nmz/search.c	2011-08-05 09:32:25.000000000 +0900
+@@ -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/metadata.xml b/app-text/namazu/metadata.xml
new file mode 100644
index 000000000000..d84b2e08fb4d
--- /dev/null
+++ b/app-text/namazu/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>hattya@gentoo.org</email>
+  </maintainer>
+<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..4609a1dfba2b
--- /dev/null
+++ b/app-text/namazu/namazu-2.0.21.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils elisp-common
+
+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 nls tk l10n_ja"
+
+RDEPEND=">=dev-perl/File-MMagic-1.20
+	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 )"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-2.0.19-gentoo.patch"
+	epatch "${FILESDIR}/${PN}-2.0.21-search.patch"
+}
+
+src_configure() {
+	local myconf
+	use tk && myconf="--with-namazu=/usr/bin/namazu
+					--with-mknmz=/usr/bin/mknmz
+					--with-indexdir=/var/lib/namazu/index"
+
+	econf \
+		$(use_enable nls) \
+		$(use_enable tk tknamazu) \
+		${myconf}
+}
+
+src_compile() {
+	emake
+
+	if use emacs; then
+		cd lisp
+		elisp-compile gnus-nmz-1.el namazu.el
+	fi
+}
+
+src_install () {
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS CREDITS ChangeLog* HACKING* NEWS README* THANKS TODO etc/*.png
+	dohtml -r doc/*
+
+	if use emacs; then
+		elisp-install ${PN} lisp/gnus-nmz-1.el* lisp/namazu.el*
+		elisp-site-file-install "${FILESDIR}"/50${PN}-gentoo.el
+
+		docinto lisp
+		dodoc lisp/ChangeLog*
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/app-text/namazu/namazu-2.0.22_p1.ebuild b/app-text/namazu/namazu-2.0.22_p1.ebuild
new file mode 100644
index 000000000000..213abbf2f808
--- /dev/null
+++ b/app-text/namazu/namazu-2.0.22_p1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit autotools-utils eutils elisp-common
+
+DESCRIPTION="Namazu is a full-text search engine"
+HOMEPAGE="http://www.namazu.org/"
+SRC_URI="http://www.namazu.org/test/${P/_p/pre}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="emacs nls tk l10n_ja"
+
+RDEPEND=">=dev-perl/File-MMagic-1.20
+	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}"/${P/_p/pre}
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.0.19-gentoo.patch"
+)
+DOCS=(AUTHORS CREDITS NEWS THANKS TODO)
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable nls)
+		$(use_enable tk tknamazu)
+	)
+
+	use tk && myeconfargs+=(
+		--with-namazu=/usr/bin/namazu
+		--with-mknmz=/usr/bin/mknmz
+		--with-indexdir=/var/lib/namazu/index
+	)
+	autotools-utils_src_configure
+}
+
+src_compile() {
+	autotools-utils_src_compile
+
+	if use emacs; then
+		cd lisp
+		elisp-compile gnus-nmz-1.el namazu.el
+	fi
+}
+
+src_install () {
+	autotools-utils_src_install
+	dodoc ChangeLog* HACKING* README* etc/*.png
+	dohtml -r doc/*
+	rm -r "${ED}"/usr/share/namazu/doc || die
+	if use emacs; then
+		elisp-install ${PN} lisp/gnus-nmz-1.el* lisp/namazu.el*
+		elisp-site-file-install "${FILESDIR}"/50${PN}-gentoo.el
+
+		docinto lisp
+		dodoc lisp/ChangeLog*
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/app-text/nfoview/Manifest b/app-text/nfoview/Manifest
new file mode 100644
index 000000000000..ef0b18bfeb35
--- /dev/null
+++ b/app-text/nfoview/Manifest
@@ -0,0 +1,6 @@
+DIST nfoview-1.15.1.tar.xz 88400 SHA256 ed7643a781e9a96a904b1165dbefd0440fa029d25819233f0543925bb7067b1e SHA512 e4cf86003b03ae57b8a4e76990df77c7e9e441abd8ab0440385405b0f600a85539a152de5893ebe75797bd96ecb811086c48b1439b9f8719050eb12315f67426 WHIRLPOOL da47cc6275fec9a8d01d2bd38eabbf66188eec7c7e6cd657f3ebfbe4b51f010a3dcbd29faad7978aa504a8faa191959d8a3d36b0f54c301c84d3a2b089a4309a
+EBUILD nfoview-1.15.1.ebuild 900 SHA256 6acaf2539fb9cea05821eecebda89f2cb2c5d4a667b6a38ed55630cb81b71da1 SHA512 f496971d2cb700f6841103428895a180fa9d850a3315da55fd44b0b56a2d0efd19b80d5e322016e5c73085c1d0d7d7ace8e7708cd5b792b2211960e238a7b57c WHIRLPOOL 2293b36119404f0f233ef9f9d91dccc311beeee67bc99d3f44fe790e32029cdcfa960bd6aa96f5fe3291065d176033b414f5ca2f115fd4ebf13c0d12c58a7d88
+EBUILD nfoview-9999.ebuild 902 SHA256 5b290d04b791908e4a7486890bd752530fe1a44f9624f28abdce13281d8d70bb SHA512 0bd096440050195340ffd808689bba988cfb891f4c2032e43eaa26f8d8df96671c56b06ca5c8366d823fcd00c0a3e817b69b1bf03b7e21bf8cd7ebd266922bfa WHIRLPOOL 301757e979fe2d42c5d065f553d0543c80cba877fc3b34fbaf4152ccff33f76ed3ae6bd3d084ed757702c3d7c5331028a8b459948d9f2f165de167b2af7c685a
+MISC ChangeLog 2778 SHA256 251c9ebe93028817610b7e8bdcb085b347eecd076d70348b1d38a984455967d1 SHA512 9acd3565b1d1ea1208cdf73656594d8b1d2e6449fc9c6c3e457820520102042c55217a28105696e9a95741e34237119521f9ba250d354fe2d0b8187acd4b68ca WHIRLPOOL 60ad1f6c8bc4eceeddedbbe9e153e4fcdbe845fc11cac8dc2f7dd6094c1815fbba3c84a071ec7e0e0c9f20cbbf23f90f32cddaaba696de5688637356138e7a76
+MISC ChangeLog-2015 3766 SHA256 81a68847e737717c2564821383698ee2bcb67767313663f6bf687a54620ca142 SHA512 10c6fef3306a3a6415b3cc7f7f4cfeddd089b534c7ef6f8d4db1c33e36cd24cf1dac87849d50dd7037abd6189559cfc7a1714f7db44c727a06c7395d0d16fe47 WHIRLPOOL a3fe14fcc478fb161681d41657c9a47b3f44c6f41ac59556f4ba961e837bc6aea18f793b9d570fd5094e0802d404c4ad6991b557d999436b38c64624b2a6decd
+MISC metadata.xml 214 SHA256 d6339a92715ade5f609951c445c03024adbfecbca53a9cb232c6838c8ded201e SHA512 ac8342ba1f8eaf027f23e677b348b4da59f5d6b0d9ddf434def5413c6f7c9b3d803fe2c8141fd7aaf8c8d9ac2a0fe800e3d0c41017c28dbd9104e34f83ca24f7 WHIRLPOOL 5c05dce3362f17da9c9478ea9ad10b392d6fb5ec493b4904abff61ebc4e4b838fd5f77abfbea0f9ccd334027105ada679f392cd1a0940d3a28f0c6af1c99e375
diff --git a/app-text/nfoview/metadata.xml b/app-text/nfoview/metadata.xml
new file mode 100644
index 000000000000..1021f53d6e8c
--- /dev/null
+++ b/app-text/nfoview/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>vapier@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/app-text/nfoview/nfoview-1.15.1.ebuild b/app-text/nfoview/nfoview-1.15.1.ebuild
new file mode 100644
index 000000000000..e96a9fe27f54
--- /dev/null
+++ b/app-text/nfoview/nfoview-1.15.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit distutils-r1 fdo-mime gnome2-utils
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://github.com/otsaloma/nfoview.git
+		https://github.com/otsaloma/nfoview.git"
+	inherit git-2
+	SRC_URI=""
+	#KEYWORDS=""
+else
+	SRC_URI="http://download.gna.org/nfoview/${PV:0:4}/${P}.tar.xz"
+	KEYWORDS="amd64 x86"
+fi
+
+DESCRIPTION="simple viewer for NFO files, which are ASCII art in the CP437 codepage"
+HOMEPAGE="http://home.gna.org/nfoview/"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE=""
+
+DEPEND="dev-python/pygobject:3"
+RDEPEND="${DEPEND}
+	media-fonts/terminus-font"
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	fdo-mime_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..58b524bbcffb
--- /dev/null
+++ b/app-text/nfoview/nfoview-9999.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit distutils-r1 fdo-mime gnome2-utils
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://github.com/otsaloma/nfoview.git
+		https://github.com/otsaloma/nfoview.git"
+	inherit git-2
+	SRC_URI=""
+	#KEYWORDS=""
+else
+	SRC_URI="http://download.gna.org/nfoview/${PV:0:4}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="simple viewer for NFO files, which are ASCII art in the CP437 codepage"
+HOMEPAGE="http://home.gna.org/nfoview/"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE=""
+
+DEPEND="dev-python/pygobject:3"
+RDEPEND="${DEPEND}
+	media-fonts/terminus-font"
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	fdo-mime_desktop_database_update
+}
diff --git a/app-text/noweb/Manifest b/app-text/noweb/Manifest
new file mode 100644
index 000000000000..67433d23f194
--- /dev/null
+++ b/app-text/noweb/Manifest
@@ -0,0 +1,9 @@
+AUX 50noweb-gentoo.el 180 SHA256 2c8c08cc2f6adc075496f1ad4e4d6615c0f183f2eee0df6639c05a8a0aef1d65 SHA512 96e3b747096d30ee2202b155dce79aee783c9adbc66f1392f5d6cee6be82ed951551de5c2c8f2f48f6a905ffb2be045cbe5bc5e999c6acd042b8d77e480384b0 WHIRLPOOL 615767ce947d29d16b469079abfb712acbe8323e9bfdddcdd8c3d0f1a8cf156854c7518f74635e6f34a55de01be8e71dac35cc99b44524be4d2eed1fedd4cd61
+AUX noweb-2.11b-ldflags.patch 619 SHA256 0a7c2712855ce1d5efd8eba3655df527312f23fc51bc551b8ae6a5b6be669056 SHA512 4d73c9025da77c39a359a90f2605c0f870bcca2b737b47bb64d4e0096f2c2c285867383e1accf221db8e83b98ccfa6dd02f4e77c837eb2d0f195394d07359106 WHIRLPOOL 2e1116a459213e1b52b0b4a7d21c377eb7d6c7e27ee9481cac2e013500debfbe5e8c9c5d508d5cca59d7dc7e011d0dd74657fa6f4fe9e6948fb32905e1db6264
+AUX noweb-2.11b-recmake.patch 5470 SHA256 2673b9719982285a6b1a4741160e702584854b56aa3873f4568ba29aa89f5078 SHA512 ca7fcc11710ade0ac903408fdb4c9388903c50b885fda27cfabd34ffc0db72ee9b8ecf10347a74af5b50cce0275e5e4ee81544caafd21df36e77b264c2a24438 WHIRLPOOL 5eccb10de71e60cd02a9ec78541e09ecd358dda1878cad20a7a56996c8a334e1be18bdd2f46a0b295c1023fc255ebf64b38591956652029b49208406facd574b
+AUX noweb-2.9-security.patch 6558 SHA256 45492023f74919efbf32806fd891c68697a00526eac9c924af2ef26b43477746 SHA512 259612cbb57a0c13d0d6e53818c4da7adf8389fa6a826cc9966c5924d2da6582c89b6457c8c77c0067e4e3580c0fd4156138de67671d30c52e9c63e75d6f80a2 WHIRLPOOL a3b0ec18a2cd93fdc92a44491fbf5f9926914293841a1ea158afefccc2e0085dfbaed26e2dd355913e64930c429716ec78951c6f768170bd3d2bb503c3bef7ea
+DIST noweb-2.11b.tgz 738870 SHA256 c913f26c1edb37e331c747619835b4cade000b54e459bb08f4d38899ab690d82 SHA512 0363c68aa31549fd806a575e6055b117db51fb5b5f28e7b30bdf3c108b3cf9546e1c6a4e64faf892b013c79665b14d436879800d4e970b0732fbd482b416d0f9 WHIRLPOOL b2f357e993d9e4af5b2d2d1f5a9c3bd720a8177b05d01fba501addecf884b739db0b17dd21e8a834a75ec6444d0b5c85679b8e868d3ed2a674010c3441b64f91
+EBUILD noweb-2.11b-r4.ebuild 2690 SHA256 cc6cf219056ced660e827f35d4ec2e2f5922d6bd369f7366a2d4864819d2a809 SHA512 b7d38298a1f2074fbd1d954721f1711fb55bcd9d73091a5e9a8666f7449c0811bb972666161e2b1a7d318f90ad56eec2efbd6b139ea23722594385768a26c491 WHIRLPOOL 0f18f435189b4b8740b942259e90964718013d2ac736149dd1ba6ec794af1d8102f57ff4bf9331e96134d5ebd915b4d9ab53bab7aa470a8b0fed29556d95b07c
+MISC ChangeLog 2556 SHA256 69fa180b4dcf922a999a341add27d1488f5d941a5d033517ea6bb4d2fbb700b8 SHA512 8f3ce7f323d46bba762a4d63c86f1bbf9a924f65473504e16ed68d059b7f91fe329555d047f3ed91d6964d3ffc7ee3e1249122d7b0a884b859b1f454e6fbeb5f WHIRLPOOL 96b1fe25e9a6d631c5752cb30b0b164757147d78c5fa073ec69ce13798115683e77e6c0855d7166d3edfa0932f821801b45c0e311fce547f647ace9f7ca24cc7
+MISC ChangeLog-2015 9122 SHA256 c7897c0df4bc48310b20a1b6af9f98a0f2f86d5dac16da786ff8e157e96abdef SHA512 a50077e9a6745392be7638b172f67bf9c836fdca1c8142889450465f005b7715ce63aba7e7e07a5c48e9212d840daa7393372e066890580a236956b3b79a6e65 WHIRLPOOL f50ec7ba179289a9eb4f9f12752be9f7433663f50410ae8d3c3c21fe5bd952fe848c38f4395392683874383dcc4d33d699e833821dc9abbf12aadd63b36f365a
+MISC metadata.xml 245 SHA256 b3de478821488be2cdc91b078e21c911dc384af882c5c44631a47dfa91516dc8 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690 WHIRLPOOL 701a78fc2214f5fd4bd781477f85e87e716b8d76ea831a0fa4afc8871c4286cc363679f1ff4f844555ad4f77cc7265208b83e805f56c22fc4baeed1062280c08
diff --git a/app-text/noweb/files/50noweb-gentoo.el b/app-text/noweb/files/50noweb-gentoo.el
new file mode 100644
index 000000000000..90b971d74635
--- /dev/null
+++ b/app-text/noweb/files/50noweb-gentoo.el
@@ -0,0 +1,4 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload  'noweb-mode "noweb-mode"
+  "Minor meta mode for editing noweb files." t)
+(add-to-list 'auto-mode-alist '("\\.nw\\'" . noweb-mode))
diff --git a/app-text/noweb/files/noweb-2.11b-ldflags.patch b/app-text/noweb/files/noweb-2.11b-ldflags.patch
new file mode 100644
index 000000000000..3fe114cb1dd9
--- /dev/null
+++ b/app-text/noweb/files/noweb-2.11b-ldflags.patch
@@ -0,0 +1,27 @@
+https://bugs.gentoo.org/show_bug.cgi?id=338899
+
+Index: noweb-2.11b/src/c/Makefile
+===================================================================
+--- noweb-2.11b.orig/src/c/Makefile
++++ noweb-2.11b/src/c/Makefile
+@@ -41,16 +41,16 @@ CPIF=>
+ all:	nt markup mnt finduses
+ 
+ nt:	$(TANGLEOBJS)
+-	$(CC) $(CFLAGS) -o nt $(TANGLEOBJS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o nt $(TANGLEOBJS)
+ 
+ finduses:	$(FINDUSESOBJS)
+-	$(CC) $(CFLAGS) -o finduses $(FINDUSESOBJS)
++
+ 
+ markup:	$(MARKUPOBJS)
+-	$(CC) $(CFLAGS) -o markup $(MARKUPOBJS)
++
+ 
+ mnt:	$(MNTOBJS)
+-	$(CC) $(CFLAGS) -o mnt $(MNTOBJS)
++
+ 
+ source:	$(SRCS)
+ touch: $(SRCS)
diff --git a/app-text/noweb/files/noweb-2.11b-recmake.patch b/app-text/noweb/files/noweb-2.11b-recmake.patch
new file mode 100644
index 000000000000..98b29935b7d1
--- /dev/null
+++ b/app-text/noweb/files/noweb-2.11b-recmake.patch
@@ -0,0 +1,136 @@
+https://bugs.gentoo.org/show_bug.cgi?id=264273
+
+Index: noweb-2.11b/Makefile
+===================================================================
+--- noweb-2.11b.orig/Makefile
++++ noweb-2.11b/Makefile
+@@ -9,14 +9,14 @@ SHELL=/bin/sh
+ CINAME=-Nv`echo $(VERSION) | tr . _`
+ CIMSG=-f -m'standard checkin preparing to export version $(VERSION)'
+ 
+-source: ;	for i in src; do (cd $$i; make source); done
+-www: ;		for i in src/xdoc examples; do (cd $$i; make www); done
++source: ;	for i in src; do (cd $$i; $(MAKE) source); done
++www: ;		for i in src/xdoc examples; do (cd $$i; $(MAKE) www); done
+ 
+ clean:
+-	for i in src examples contrib; do (cd $$i; make clean); done
++	for i in src examples contrib; do (cd $$i; $(MAKE) clean); done
+ 	rm -f nwsrcfilter *~ */*~
+ clobber: clean
+-	for i in src examples contrib; do (cd $$i; make clobber); done
++	for i in src examples contrib; do (cd $$i; $(MAKE) clobber); done
+ 
+ DATE:
+ 	(./echo -n "Version $(VERSION) of "; date) > DATE
+@@ -51,6 +51,6 @@ emacscheck:
+ 	diff src/elisp/noweb-mode.el $(HOME)/emacs/noweb-mode.el
+ 
+ checkin:
+-	(cd src; make "CINAME=$(CINAME)" "CIMSG=$(CIMSG)" checkin)
++	(cd src; $(MAKE) "CINAME=$(CINAME)" "CIMSG=$(CIMSG)" checkin)
+ 
+ 
+Index: noweb-2.11b/contrib/norman/Makefile
+===================================================================
+--- noweb-2.11b.orig/contrib/norman/Makefile
++++ noweb-2.11b/contrib/norman/Makefile
+@@ -1,10 +1,10 @@
+ LIB=/dev/null	# to be overridden
+ DIRS=numarkup
+ 
+-all: ;	for i in $(DIRS); do (cd $$i; make ICONC=$(ICONC) ICONT=$(ICONT) all); done
+-install: ;	for i in $(DIRS); do (cd $$i; make LIB=$(LIB) BIN=$(BIN) install); done
+-source: ;	for i in $(DIRS); do (cd $$i; make source); done
+-clean: ;	for i in $(DIRS); do (cd $$i; make clean); done
++all: ;	for i in $(DIRS); do (cd $$i; $(MAKE) ICONC=$(ICONC) ICONT=$(ICONT) all); done
++install: ;	for i in $(DIRS); do (cd $$i; $(MAKE) LIB=$(LIB) BIN=$(BIN) install); done
++source: ;	for i in $(DIRS); do (cd $$i; $(MAKE) source); done
++clean: ;	for i in $(DIRS); do (cd $$i; $(MAKE) clean); done
+ iconlib:	# cheap hack for slackmake
+ 	true
+ 
+Index: noweb-2.11b/contrib/norman/numarkup/Makefile
+===================================================================
+--- noweb-2.11b.orig/contrib/norman/numarkup/Makefile
++++ noweb-2.11b/contrib/norman/numarkup/Makefile
+@@ -11,11 +11,11 @@ OBJS = main.o pass1.o latex.o input.o sc
+ 
+ all: 
+ 	noweb -t numarkup.nw
+-	make $(TARGET)
++	$(MAKE) $(TARGET)
+ 
+ install:
+ 	noweb -t numarkup.nw
+-	make $(TARGET)
++	$(MAKE) $(TARGET)
+ 	strip $(TARGET)
+ 	cp $(TARGET) $(LIB)
+ 
+Index: noweb-2.11b/src/Makefile
+===================================================================
+--- noweb-2.11b.orig/src/Makefile
++++ noweb-2.11b/src/Makefile
+@@ -41,9 +41,9 @@ LIBNAME=$(LIB)
+ TEXNAME=$(TEXINPUTS)
+ 
+ all: 
+-	cd c; make "CC=$(CC)" "CFLAGS=$(CFLAGS)" all 
+-	for i in shell lib xdoc tex; do (cd $$i; make all); done
+-	cd $(LIBSRC); make "ICONT=$(ICONT)" "ICONC=$(ICONC)" all
++	cd c; $(MAKE) "CC=$(CC)" "CFLAGS=$(CFLAGS)" all 
++	for i in shell lib xdoc tex; do (cd $$i; $(MAKE) all); done
++	cd $(LIBSRC); $(MAKE) "ICONT=$(ICONT)" "ICONC=$(ICONC)" all
+ 
+ FAQ: FAQ.html
+ 	sleep 1; html2ascii FAQ.html > FAQ
+@@ -101,13 +101,13 @@ install-code: install-shell
+ 	-mkdir $(BIN) $(LIB) 2>/dev/null
+ 	true c/nt c/markup c/mnt c/finduses
+ 	cp c/nt c/markup c/mnt c/finduses $(LIB)
+-	cd $(LIBSRC); make ICONT=$(ICONT) ICONC=$(ICONC) LIB=$(LIB) BIN=$(BIN) install
+-	cd lib; make LIB=$(LIB) install
++	cd $(LIBSRC); $(MAKE) ICONT=$(ICONT) ICONC=$(ICONC) LIB=$(LIB) BIN=$(BIN) install
++	cd lib; $(MAKE) LIB=$(LIB) install
+ 
+ uninstall-code: uninstall-shell
+ 	rm $(LIB)/nt $(LIB)/markup $(LIB)/mnt $(LIB)/finduses 
+-	cd $(LIBSRC); make ICONT=$(ICONT) ICONC=$(ICONC) LIB=$(LIB) BIN=$(BIN) uninstall
+-	cd lib; make LIB=$(LIB) uninstall
++	cd $(LIBSRC); $(MAKE) ICONT=$(ICONT) ICONC=$(ICONC) LIB=$(LIB) BIN=$(BIN) uninstall
++	cd lib; $(MAKE) LIB=$(LIB) uninstall
+ install-man:
+ 	-mkdir $(MAN) $(MANDIR) $(MAN7DIR) 2>/dev/null
+ 	sed -e "s@|LIBDIR|@$(LIBNAME)@" -e "s@|TEXINPUTS|@$(TEXNAME)@" xdoc/cpif.1 > $(MANDIR)/cpif.$(MANEXT)
+@@ -193,24 +193,24 @@ install-elisp:
+ uninstall-elisp:
+ 	rm -f $(ELISP)/noweb-mode.el
+ checkin:
+-	for i in lib tex xdoc; do (cd $$i; make "CINAME=$(CINAME)" "CIMSG=$(CIMSG)" checkin); done
++	for i in lib tex xdoc; do (cd $$i; $(MAKE) "CINAME=$(CINAME)" "CIMSG=$(CIMSG)" checkin); done
+ 	for i in c icon awk; do (cd $$i; ci -l $(CINAME) $(CIMSG) *.nw Makefile); done
+ 	(cd elisp; ci -l $(CINAME) $(CIMSG) *.el)
+ 	ci -l $(CINAME) $(CIMSG) Makefile.nw INSTALL INSTALL.DOS README FAQ COPYRIGHT nwmake *.nw
+ 
+ source: FAQ
+-	for i in c shell lib xdoc icon awk tex; do (cd $$i; make CPIF=">" source); done
++	for i in c shell lib xdoc icon awk tex; do (cd $$i; $(MAKE) CPIF=">" source); done
+ 	sleep 1
+-	for i in c shell lib xdoc icon awk tex; do (cd $$i; make touch); done
++	for i in c shell lib xdoc icon awk tex; do (cd $$i; $(MAKE) touch); done
+ touch:
+ 	touch FAQ
+-	for i in c shell lib xdoc icon awk tex; do (cd $$i; make touch); done
++	for i in c shell lib xdoc icon awk tex; do (cd $$i; $(MAKE) touch); done
+ clean:
+-	for i in c shell lib xdoc icon awk tex; do (cd $$i; make clean); done
++	for i in c shell lib xdoc icon awk tex; do (cd $$i; $(MAKE) clean); done
+ 	rm -f nwsrcfilter *~ */*~
+ 
+ clobber: clean
+-	for i in c lib icon awk xdoc; do (cd $$i; make clobber); done
++	for i in c lib icon awk xdoc; do (cd $$i; $(MAKE) clobber); done
+ 
+ Makefile: Makefile.nw
+ 	chmod +w Makefile
diff --git a/app-text/noweb/files/noweb-2.9-security.patch b/app-text/noweb/files/noweb-2.9-security.patch
new file mode 100644
index 000000000000..951af7968ae7
--- /dev/null
+++ b/app-text/noweb/files/noweb-2.9-security.patch
@@ -0,0 +1,178 @@
+diff -urN noweb-2.9.orig/src/awk/totex.nw noweb-2.9/src/awk/totex.nw
+--- noweb-2.9.orig/src/awk/totex.nw	2000-03-27 02:00:00.000000000 +0200
++++ noweb-2.9/src/awk/totex.nw	2006-02-17 12:47:05.000000000 +0100
+@@ -24,7 +24,7 @@
+ @
+ On an ugly system, we have to put it in a file.
+ <<invoke awk program using file>>=
+-awkfile=/tmp/totex$$.awk
++awkfile=$(tempfile -p totex)
+ trap 'rm -f $awkfile; exit 1' 0 1 2 15	# clean up files
+ cat > $awkfile << 'EOF'
+ <<awk program for conversion to {\TeX}>>
+diff -urN noweb-2.9.orig/src/awkname noweb-2.9/src/awkname
+--- noweb-2.9.orig/src/awkname	2000-06-23 12:56:00.000000000 +0200
++++ noweb-2.9/src/awkname	2006-02-17 12:47:05.000000000 +0100
+@@ -5,7 +5,7 @@
+ esac
+ 
+ rc=0
+-new=/tmp/$$.new; old=/tmp/$$.old
++new=$(tempfile -p new); old=$(tempfile -p old)
+ 
+ for file in lib/emptydefn lib/unmarkup lib/toascii lib/btdefn \
+                         awk/noidx awk/totex awk/tohtml awk/noindex \
+diff -urN noweb-2.9.orig/src/lib/toascii noweb-2.9/src/lib/toascii
+--- noweb-2.9.orig/src/lib/toascii	2001-03-28 15:49:00.000000000 +0200
++++ noweb-2.9/src/lib/toascii	2006-02-17 12:47:05.000000000 +0100
+@@ -7,9 +7,9 @@
+                 *)      echo "This can't happen -- $i passed to toascii" 1>&2 ; exit 1 ;;
+         esac
+ done
+-awkfile="tmp/awk$$.tmp"
+-textfile="/tmp/text$$.tmp"
+-tagsfile="/tmp/tags$$.tmp"
++awkfile=$(tempfile -p awk -s .tmp)
++textfile=$(tempfile -p text -s .tmp)
++tagsfile=$(tempfile -p tags -s .tmp)
+ export awkfile textfile tagsfile
+ trap 'rm -f $awkfile $textfile $tagsfile' 0 1 2 10 14 15
+ nawk 'BEGIN { textfile=ENVIRON["textfile"]
+diff -urN noweb-2.9.orig/src/lib/toascii.nw noweb-2.9/src/lib/toascii.nw
+--- noweb-2.9.orig/src/lib/toascii.nw	2000-03-27 02:00:00.000000000 +0200
++++ noweb-2.9/src/lib/toascii.nw	2006-02-17 12:48:20.000000000 +0100
+@@ -28,9 +28,9 @@
+ Also arranged here is a temporary file for storage of the awk program on an
+ ugly system, as discussed below.
+ <<arrange temporary files>>=
+-awkfile="tmp/awk$$.tmp"
+-textfile="/tmp/text$$.tmp"
+-tagsfile="/tmp/tags$$.tmp"
++awkfile=$(tempfile -p awk -s .tmp) || { echo "$0: Cannot create temporary file" >&2; exit 1;  }
++textfile=$(tempfile -p text -s .tmp) || { echo "$0: Cannot create temporary file" >&2; exit 1;  }
++tagsfile=$(tempfile -p tags -s .tmp) || { echo "$0: Cannot create temporary file" >&2; exit 1;  }
+ export awkfile textfile tagsfile
+ trap 'rm -f $awkfile $textfile $tagsfile' 0 1 2 10 14 15
+ @ %def textfile tagsfile awkfile
+diff -urN noweb-2.9.orig/src/shell/cpif noweb-2.9/src/shell/cpif
+--- noweb-2.9.orig/src/shell/cpif	2000-03-27 02:00:00.000000000 +0200
++++ noweb-2.9/src/shell/cpif	2006-02-17 12:47:05.000000000 +0100
+@@ -17,7 +17,7 @@
+ 0)		echo 'Usage: '`basename $0`' [ -eq -ne ] file...' 1>&2; exit 2
+ esac
+ 
+-new=/tmp/$$
++new=$(tempfile)
+ trap 'rm -f $new; exit 1' 1 2 15	# clean up files
+ 
+ cat >$new
+diff -urN noweb-2.9.orig/src/shell/nonu noweb-2.9/src/shell/nonu
+--- noweb-2.9.orig/src/shell/nonu	2000-03-27 02:00:00.000000000 +0200
++++ noweb-2.9/src/shell/nonu	2006-02-17 12:47:05.000000000 +0100
+@@ -2,7 +2,7 @@
+ LIB=/usr/public/pkg/noweb/lib
+ # attempt to convert nuweb to noweb using sam
+ 
+-tmp=/tmp/nonu$$
++tmp=$(tempfile -p nonu)
+ trap '/bin/rm -f $tmp; exit 1' 1 2 15	# clean up files
+ cp $1 $tmp || exit 1
+ 
+diff -urN noweb-2.9.orig/src/shell/noroff noweb-2.9/src/shell/noroff
+--- noweb-2.9.orig/src/shell/noroff	2001-03-28 15:49:00.000000000 +0200
++++ noweb-2.9/src/shell/noroff	2006-02-17 12:47:05.000000000 +0100
+@@ -35,9 +35,10 @@
+ 
+ base="`basename $1 | sed '/\./s/\.[^.]*$//'`"
+ tagsfile="$base.nwt"
++tmpfile=$(tempfile -p tags)
+ (echo ".so $macrodir/tmac.w"
+ if [ -r "$tagsfile" ]; then 
+-   cp $tagsfile /tmp/tags.$$
++   cp $tagsfile $tmpfile
+    $AWK '{
+ 	     if      (sub(/^###TAG### /       , "")) tags[$1] = $2
+ 	     else if (sub(/^###BEGINCHUNKS###/, "")) printf ".de CLIST\n.CLISTBEGIN\n"
+@@ -88,8 +89,8 @@
+ 	 #	print str3
+ 	 #	print convquote(str3)
+ 	 # }
+-	 function tag(s) { if (s in tags) return tags[s]; else return "???" }' /tmp/tags.$$
+-   rm -f /tmp/tags.$$
++	 function tag(s) { if (s in tags) return tags[s]; else return "???" }' $tmpfile
++   rm -f $tmpfile
+  fi
+  cat "$@") |
+ ($ROFF $opts 2>$tagsfile)
+diff -urN noweb-2.9.orig/src/shell/roff.mm noweb-2.9/src/shell/roff.mm
+--- noweb-2.9.orig/src/shell/roff.mm	2000-03-27 02:00:00.000000000 +0200
++++ noweb-2.9/src/shell/roff.mm	2006-02-17 12:48:20.000000000 +0100
+@@ -214,7 +214,7 @@
+ .ADDLIST 1a
+ .PRINTLIST
+ 
+-awkfile="/tmp/noweb$$.awk"
++awkfile=$(tempfile -p noweb -s .awk) || { echo "$0: Cannot create temporary file" >&2; exit 1;  }
+ trap 'rm -f $awkfile' 0 1 2 10 14 15
+ cat > $awkfile \&<< 'EOF'
+ \c
+@@ -1628,14 +1628,15 @@
+ tagsfile="$base.nwt"
+ (echo ".so $macrodir/tmac.w"
+ if [ -r "$tagsfile" ]; then 
+-   cp $tagsfile /tmp/tags.$$
++   tagstemp=$(tempfile -p tags) || { echo "$0: Cannot create temporary file" >&2; exit 1;  }
++   cp $tagsfile $tagstemp
+    $AWK '\c
+ .USE "action for \*[BEGINCONVQUOTE]tags\*[ENDCONVQUOTE] line" 11c
+ \&
+          \c
+ .USE "functions" 8a
+-\&' /tmp/tags.$$
+-   rm -f /tmp/tags.$$
++\&' $tagstemp
++   rm -f $tagstemp
+  fi
+  cat "$@") |
+ ($ROFF $opts 2>$tagsfile)
+diff -urN noweb-2.9.orig/src/shell/roff.nw noweb-2.9/src/shell/roff.nw
+--- noweb-2.9.orig/src/shell/roff.nw	2000-03-27 02:00:00.000000000 +0200
++++ noweb-2.9/src/shell/roff.nw	2006-02-17 12:47:05.000000000 +0100
+@@ -80,7 +80,7 @@
+ other, and quoting each quote is ugly.  The pragmatic solution is to
+ copy the awk program into a temporary file, using a shell here-document.
+ <<invoke awk program>>=
+-awkfile="/tmp/noweb$$.awk"
++awkfile=$(tempfile -p noweb -s .awk)
+ trap 'rm -f $awkfile' 0 1 2 10 14 15
+ cat > $awkfile << 'EOF'
+ <<awk program>>
+@@ -662,12 +662,13 @@
+ 
+ base="`basename $1 | sed '/\./s/\.[^.]*$//'`"
+ tagsfile="$base.nwt"
++tmpfile=$(tempfile -p tags)
+ (echo ".so $macrodir/tmac.w"
+ if [ -r "$tagsfile" ]; then 
+-   cp $tagsfile /tmp/tags.$$
++   cp $tagsfile $tmpfile
+    $AWK '<<action for [[tags]] line>>
+-         <<functions>>' /tmp/tags.$$
+-   rm -f /tmp/tags.$$
++         <<functions>>' $tmpfile
++   rm -f $tmpfile
+  fi
+  cat "$@") |
+ ($ROFF $opts 2>$tagsfile)
+diff -urN noweb-2.9.orig/src/shell/toroff noweb-2.9/src/shell/toroff
+--- noweb-2.9.orig/src/shell/toroff	2001-03-28 15:49:00.000000000 +0200
++++ noweb-2.9/src/shell/toroff	2006-02-17 12:47:05.000000000 +0100
+@@ -9,7 +9,7 @@
+            exit 1;;
+     esac
+ done
+-awkfile="/tmp/noweb$$.awk"
++awkfile=$(tempfile -p noweb -s .awk)
+ trap 'rm -f $awkfile' 0 1 2 10 14 15
+ cat > $awkfile << 'EOF'
+ /^@begin docs 0$/ { if (delay) next }
diff --git a/app-text/noweb/metadata.xml b/app-text/noweb/metadata.xml
new file mode 100644
index 000000000000..13170c3184d8
--- /dev/null
+++ b/app-text/noweb/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/noweb/noweb-2.11b-r4.ebuild b/app-text/noweb/noweb-2.11b-r4.ebuild
new file mode 100644
index 000000000000..2f1d182a8cd6
--- /dev/null
+++ b/app-text/noweb/noweb-2.11b-r4.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=3
+
+inherit eutils toolchain-funcs elisp-common
+
+DESCRIPTION="a literate programming tool, lighter than web"
+HOMEPAGE="http://www.eecs.harvard.edu/~nr/noweb/"
+SRC_URI="http://www.eecs.harvard.edu/~nr/noweb/dist/${P}.tgz"
+
+LICENSE="noweb emacs? ( GPL-2 )"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="emacs examples"
+
+DEPEND="virtual/tex-base
+	dev-lang/icon
+	sys-apps/debianutils
+	emacs? ( virtual/emacs )"
+RDEPEND=${DEPEND}
+
+S=${WORKDIR}/${P}/src
+
+SITEFILE=50${PN}-gentoo.el
+
+src_prepare() {
+	# glibc2.10 compat (bug 270757)
+#	mkdir d && cp -r c/* d/
+	sed "s:getline (:getline_nonlibc (:" -i c/getline.{c,h} || die
+	sed "s:getline(:getline_nonlibc(:" -i c/{notangle.c,getline.c,finduses.c} || die
+#	diff -u d/ c/
+
+	epatch "${FILESDIR}"/${PN}-2.9-security.patch
+	# dont run texhash...
+	sed -i -e "s/texhash/true/" Makefile
+	# dont strip...
+	sed -i -e "s/strip/true/" Makefile
+
+	cd "${WORKDIR}/${P}"
+	epatch "${FILESDIR}"/${P}-recmake.patch
+	epatch "${FILESDIR}"/${P}-ldflags.patch
+}
+
+src_compile() {
+	# noweb tries to use notangle and noweb; see bug #50429
+	( cd c; emake ICONC="icont" CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LIBSRC="icon" ) || die
+	export PATH="${PATH}:${T}"
+	emake ICONC="icont" CC="$(tc-getCC)" BIN="${T}" LIB="${T}" LIBSRC="icon" install-code \
+		|| die "make temporal install failed."
+
+	emake ICONC="icont" CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LIBSRC="icon" || die "make failed"
+	# Set awk to awk not nawk
+	./awkname awk
+
+	if use emacs; then
+		elisp-compile elisp/noweb-mode.el || die "elisp-compile failed"
+	fi
+}
+
+src_install () {
+	# It needs the directories to exist first...
+	dodir /usr/bin
+	dodir /usr/libexec/${PN}
+	dodir /usr/share/man
+	dodir /usr/share/texmf-site/tex/inputs
+	emake ICONC="icont" \
+		BIN="${ED}/usr/bin" \
+		LIBSRC="icon" \
+		LIBNAME="${EPREFIX}/usr/libexec/${PN}" \
+		LIB="${ED}/usr/libexec/${PN}" \
+		MAN="${ED}/usr/share/man" \
+		TEXNAME="${EPREFIX}/usr/share/texmf-site/tex/inputs" \
+		TEXINPUTS="${ED}/usr/share/texmf-site/tex/inputs" \
+		install || die "make install failed"
+	cd "${WORKDIR}/${P}"
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins examples/*
+	fi
+	dodoc CHANGES README
+
+	if use emacs; then
+		elisp-install ${PN} src/elisp/noweb-mode.{el,elc} \
+			|| die "elisp-install failed"
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}" \
+			|| die "elisp-site-file-install failed"
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+	einfo "Running texhash to complete installation.."
+	texhash
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/app-text/o3read/Manifest b/app-text/o3read/Manifest
new file mode 100644
index 000000000000..87a8fb419eab
--- /dev/null
+++ b/app-text/o3read/Manifest
@@ -0,0 +1,5 @@
+DIST o3read-0.0.4.tar.gz 21075 SHA256 3704b448099d3396bec4cf503c298628c815703aae12bfcddbac4444bc786430 SHA512 5287a9d58a77cba47397265de9decac1d4327f0a6065cbf7303451d48126a173ad2763157355c9a41237feac6b467ddff5d7e5ad4b4d6c3870f1d09ae0035879 WHIRLPOOL d6b29e83446500fae54701042c0fa29177a99f11ab574708c52d393e08dcb908bbfb901e0b9b3de08867323037ad2471c4bdd6f1db3538fb0cfff74289f7ca8e
+EBUILD o3read-0.0.4.ebuild 631 SHA256 c2178e40e43e2ffd32c68c696b159fb8cdfccaab9a7cd0d74c18c3ef8c1cf102 SHA512 de72f26f1d09390eb361b1f9f9071da5ba204ea2a1ce1a4ed15cd487c06f849cfa4c6363ca6b5b4a50df48a5588e35e2add166d5584a60d50a50f7f84fcc518f WHIRLPOOL e81c4051aa0cbac9f2070ac8fe4434b76044adadf5645fdf03a67fe12a45519bcf43cb25a7e714209309f91c7da3e259ad7ef411b6e877caba917b9e200b5419
+MISC ChangeLog 2519 SHA256 77a5892bc0c9ff5454740356c8bbecaabd72d43fd34808b3ae2d3f7a06bbefe8 SHA512 530f28489d812e27cf795e8d1f4c2d1425e47e6f1e8ff66ca27b4f9a8585f84f34dc9a60146fd74e33e361016aaec3252f3d2137cfdda6a8b7edbb171ab6f82e WHIRLPOOL 66527f5d103d50a85c6bd40c2dcc1212075fe936e4ec30c7b8c8455b6ac953d4de13bf4281ab8372633fa21ee8d6a6cfba18417c38a3493fd516d2752c0c8948
+MISC ChangeLog-2015 2001 SHA256 3cd40f076716b2504595ea3300e1661a8638c981c102738e3c3fbd9e06ec6a9c SHA512 f5a500c8606a6ad965ccb420129acb3bb1c153679820055a129d843add117546c5c3824338e32952c1179c3881e593dd20847433cd4b468a234906b9e6fafc28 WHIRLPOOL 57d97fdd0271b16b65ab0fe5b54d90e40b2fc7bf89e927ccdbdfd81606b69ff863e92abc1d9ffb1dac5a91e09e9a2b0ac46f3dbe9ca927a5e6979fcf1e87fa70
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
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/Manifest b/app-text/ocrad/Manifest
new file mode 100644
index 000000000000..63be23f3193c
--- /dev/null
+++ b/app-text/ocrad/Manifest
@@ -0,0 +1,13 @@
+DIST ocrad-0.22.tar.lz 87698 SHA256 d6c9dcbcf4c9cc643edfe5a03cb6125d6c39abe59e83719effb056d63c5198fd SHA512 45c7934776d96b6868a0109bf40b6814503c03bf63cb797e6a727599aa79e700a253b4eb3ec8ec8ec7abc3417601dacafc7560b147395171348cdae1b6951254 WHIRLPOOL 02c975a4ea2fe442e6d3de694e4cae7ab1777ad223cda4d6a9bb3d3206ca313ff471cbd1d629c676bf28df0382d3630563c35ca49c5883cf393b5e3ce4442609
+DIST ocrad-0.23.tar.lz 87385 SHA256 f5bc9479c01fe8c64aa836c8636dff65e9b459c2edbd4fc0656f47f435d9a06f SHA512 db3c282dd121b5138d7e0e8d52fe88a3d392aa5ba2a5b821c74a84b1f66f0bfb8f3b9f08a276b6814c6bb6c31b1a51f5bcaf0c6e66e1a4d659ea72f60b383d13 WHIRLPOOL 4fdf1b8d8061fc116295b8984465b5cea0be1406b0a76bff7b779ba8e3ee4dba07c6dc7345a36fc0fbc523013a721d8baf136d19f7e429144d282039248ba9d5
+DIST ocrad-0.24.tar.lz 84506 SHA256 9beaede0a0ba8ac39c5fb78aef2ed31313ac7f2cd20215718a0b80260ee81442 SHA512 c43cb4dc678e9588e7061af6ea83a0514181e56201fe5ab68b50b8a1c8e1ae7c7fbf959cdf172b7200b89d9e6b1f42261ead4fbf3a6d0123860feff7954e532d WHIRLPOOL dffc5c39e71901205c890bd78e186128295874344f1e989dab784cd623b553b0a42cc2faf3e778d45816a482158d938c13cb478a95c292960848c5a338c49aa3
+DIST ocrad-0.25.tar.lz 91464 SHA256 e710be9c030fbcbce2315077326c8268feb422c0bc39fa744644cbbd1f5d4dd4 SHA512 48a0753d699af909d4d0295005e12ec626dad8772a5212c0d579df3b24cf01f6e457ec61edc708a0f6eebace75f37ce0544e8b19c11c9a25166aafedc92c258f WHIRLPOOL a4c7a8a84270d33f2722d86464e138cc0454ca2b055e7d0416dacf402c3ab998d8daa6f32ab80ac57f9ae2c832737eeede4f8fcc660ffcbf64f063e0e3085bf0
+DIST ocrad-0.26.tar.lz 91450 SHA256 c383d37869baa0990d38d38836d4d567e9e2862aa0cd704868b62dafeac18e3c SHA512 6cf4c97c4dbbc3a623192de2da261e4854dc3082a26d9731fd00feb8ed371cb18d41f5a8ed992f98e2a00aed68d60f1f3aa90b05f8472431fcf5bc5e3d10e70c WHIRLPOOL 6fbb55eb6ac006d46019f0903e6db35a4f038e7b0436a3c7933d87afe8081d2f591d00865bebf0d42ffb8c1948cae722c0bc3df389e021db2eb659391c3d111c
+EBUILD ocrad-0.22.ebuild 755 SHA256 2fe306344278cf679f35e67b2d6b80000fe22f40b4617fc22fcd452ba21b9294 SHA512 e02df78e5516f824beb87e565c5116a7c66d19e7593831bc389148c14c85c399297ca545c2f62bfe6fbbc21bf47f4a5b82b9761a37c52babb0e46aa30abb2bc9 WHIRLPOOL be2cc29510b10bddb4130f6c6f6d9be2d3381fa60fe2593f17d6958f372d919070bb306956276900b0abb34b0428f5e5e2b5d46936bdd68386bf67f9cd58665a
+EBUILD ocrad-0.23.ebuild 759 SHA256 f8ed9f88647db8ea3f6381826acda0387e36735cda4c5317a82a3a2bc7e1b360 SHA512 ec14af5534f218db1fdb7943b65f69abc376709adcf8d8f00603f1969e60476fdd189dbc5fd413cec8ea43eb443f4d833b120bfa7cfc2d04a42fe28414c135bb WHIRLPOOL 08261d42f5aca209f8a34931955fdf656e4ea790110aed00a9b92eeb177383c44364e10b25c58eb88a616bedfbf670d92945e33798590153fb543ef580a2534c
+EBUILD ocrad-0.24.ebuild 759 SHA256 66b0fec9e9ff1d7a41492458f3b96270c32a98c9a4527f44b9093348104aeb62 SHA512 65ce48702e9f29b5b6d1184c0a4aa807c1226c2d54d710fdcea6365f3fad0c2ae22a1f528a74e04452297efb337904ad5462825be8dbc8bd46bfb208bd762838 WHIRLPOOL 0446a9d6b6e2b848639353d8a847e915f9942162da7f8c9bbe548d93592accbd0a538ba448256c20ea150c8524ec3275af5428a51533e6c99fbfba142deb8f77
+EBUILD ocrad-0.25.ebuild 759 SHA256 34f126e795716b44aa552b5f2af8052bd83a744d57e686a80f5313e186dfe7ba SHA512 ba8a7d8c05290255a59954645050cc93e991657e38fa0e02f9f7929420226edf4fa95eec01f8736c6cad5707b0a89ed27e439e559173f34c22ea89bbc68c66c0 WHIRLPOOL 6b08cf17e3bc5c675ada2050ca3fe48c8b30cd1515f0981df3183ad6ec6a8ee4c75ea188131a14684b5cf12245cdb87632638a19cd145c9785d2e265b1dde57d
+EBUILD ocrad-0.26.ebuild 759 SHA256 3b9633f65fe60b89fc23a94ae09acb78e83530a7c5043f1f9d88824f933be35b SHA512 1680e6b2f64cb164596bd89339da1ec86f4facb4c6944f2374b883318ca4da8f9037aa0f26c01086cc5b15b9ca7f8e89d5d15f1640405e249613121832a1abfd WHIRLPOOL e7b7d57249a87e86916f9149af93b9a2b87c16f7cf47fab3e3b754d3d5117b85a61cf05b06d77af010c184087de1d50abfa7fc42eee829cf8dd0cfc2b79f037c
+MISC ChangeLog 2769 SHA256 8d3611be9627800f210d92d787ff0bd106e8272df18cbe39a571b1dfc8d82891 SHA512 82c87156cf6030d9a1aa6e2a0e6e6118eaf07c57a015ffdf1e3b1aacef38509f8661c90032b075a6e7a4afa87ddd1dcaafc5044937528a4330891168c4ac8813 WHIRLPOOL ce7b7ad65cc3f7d306bf5526f3751c55d9e647e8dbc6dc2298ac1914881d60541a1cf7887dfb19e971e6ab03645bc66f92b3bc398e42f773ad7cc2ff6b172fde
+MISC ChangeLog-2015 5697 SHA256 e03e5327f844c44dead71525e68035f9370ecd9ef1bd60129de7f8c0bfa18c79 SHA512 804d33bb35c7b6058330531e4a9dd203f35cc3dda2491ff544351288d7153fc157794fb12cfa0292a55fa85773f8e521c414d2d71306458a319f09226d1bef39 WHIRLPOOL da45fe20c6cba70b0b58d9ef78eecae77ac666a200185525924e1a8d54d7999ebccaa17f04caf4e4e3cee55ba121f97fb8309969c05c7c970907e46eb87982fb
+MISC metadata.xml 496 SHA256 24429a735d79143834f5f59344dfcc36a3af5eec8c58716b02a72ca65542f338 SHA512 702db4a3d253c553bb6ca651e80da98099fa6bb275e3b166eb43f7324a9165a6d2db397b9339ad2909d6c276029a8dbfab63bb7d8087dfe2c78345b7ed8088c0 WHIRLPOOL 12b78915b77d5ed64eb3db5fe0e307af9dac8d058f4e8ccebd99e946f652e9b13028c432e802c5079c49c19f31e092e7d34647f3c224d8e01c2f8101d4201f45
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/Manifest b/app-text/odt2txt/Manifest
new file mode 100644
index 000000000000..9b0c0ab96a7a
--- /dev/null
+++ b/app-text/odt2txt/Manifest
@@ -0,0 +1,6 @@
+AUX odt2txt-0.4-darwin_iconv.patch 366 SHA256 2ce5183a5f5d64ebb265cfe527b60819e2a06fac17707ccc83f2aece9dccd0e8 SHA512 0341c6d4d06b96766e35f55358f26ed52d8eb456f853cd83b098fb3e2adae690bc47090dfd8a1a66f9d24c77586a9fb7151cbe9695dcbdc3f9eef8f5d81b5762 WHIRLPOOL 3eed04e8eeeaae23d191e7d3d0f69a91d959da3327f1234c3966a08d8c9a0d536750dedc528136c06567bc4222be91ee1c3767932a7654646ce45cecdb5891d4
+DIST odt2txt-0.4.tar.gz 23997 SHA256 a5f4bdf81cdc2afb60fa74ed5da34235eafdc78263f5aaa325193c2bf8d166f8 SHA512 65642dccdb08408e34d484d78be9777aa374cdabbcadd2ab54f43df29db506b136f13e5af720b9b6b6cfdb8508e4fab44159302d35fc002a22979efabf69bfc4 WHIRLPOOL 905d6e385325d6943011bd0e3053ee82e503c746ef33760377b5737226a0269b39bdd4656316c7102ed5c7349dc5e86b5d689e7fab72a9ac4c49f255cfced4c2
+EBUILD odt2txt-0.4-r1.ebuild 726 SHA256 8f08201b91075c4ef1133c8444fe57549b708683bf6b7fe31dd803f45f7a599f SHA512 832fffdd8c1f62f71215d804541fe0e041726acc8a1964f3733afad1ad30d08f7fc7075c28ea8d7764225c1dea7cd086343e1b40e345040b9d45594d1911d877 WHIRLPOOL 153a75aebbcecd8d5f1a6de1bbfc1e9fbf5ccc53910631f0a916fc4628c7d0881ba5a40ad3020945ecb321e7a5fd1d255911c8754ac3eae36067da21f1287a63
+MISC ChangeLog 2863 SHA256 4211744bf40e20820e730f012e4df936fb2e77c1a6e1daaafffef256edb887b0 SHA512 86124be8d7fb8f1d2a1ca09f8b8fb985fdfb3672a4421d7e7eb6c97eddbcbda00ff9c7ec06db1361288c587dbfae0e9f2c920d3d3e593bf8e71492cb0e3ad04c WHIRLPOOL a657a700165db6fbcb864d10eee102fcb7862c7e83b27861a6958cbb4ac122acee413c52792fac6c9eea16d39d7c4cff16cd6f28e4bfdf9964c97fd013db259e
+MISC ChangeLog-2015 1467 SHA256 c1ce2030030fbf96e9ba4651f451f9babe0b38b73a58a28f2b374655e0b1a057 SHA512 38b7df78bae136c59ddc38873f6b1e62bc36ccd5044c99d5513d39c9a641d36911619c47ad3a3f95a4d4b164338600b17cda614d493d58d02584fb08127519ab WHIRLPOOL fea808723596a2983d8226f59f02b13d5c4c2d711bce6655ac3d2dc74d5a8d2d7fa748ded768969b1022ab8f92936357ccc45d56505c08091aa54183292d29d5
+MISC metadata.xml 429 SHA256 7c6c9b5bf2cf6fbaccb1e5777a28125132f46dcf5679d9149d255480fe632f56 SHA512 b5c6a669512e6cb41edb1be1244d347b9560d9cbbe499db614ecd5e84984a9a9bba5f04f0d8d32fb879fd5b08eaef950f3d65235112481da840a3f1656378156 WHIRLPOOL 9bcb2d31ee505396e048e158f3eae3fdb9bc0fa1eaf8e6edf4887b2ae9b4abf8b3b89013a65d02de02886f3fd1ac082450cc773426d2a12aa331d85704f30b0a
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/metadata.xml b/app-text/odt2txt/metadata.xml
new file mode 100644
index 000000000000..21ee5648c0e6
--- /dev/null
+++ b/app-text/odt2txt/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>clabbe.montjoie@gmail.com</email>
+<name>LABBE Corentin (Montjoie)</name>
+<description>Maintainer. Assign bugs to him</description>
+</maintainer>
+<maintainer type="project">
+<email>proxy-maint@gentoo.org</email>
+<name>Proxy Maintainers</name>
+</maintainer>
+</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/openjade/Manifest b/app-text/openjade/Manifest
new file mode 100644
index 000000000000..922bfeb49dd6
--- /dev/null
+++ b/app-text/openjade/Manifest
@@ -0,0 +1,17 @@
+AUX openjade-1.3.2-acinclude.m4 1922 SHA256 89e781bf9acc4c02a5cc0c737cadc6cb38254de527974b3ea023cb4738127260 SHA512 76915d34e746f85eb15d2c79cc7a030070e5d266e3b2520d2321195f19c13aebc9a28fc4298006ab90a73148baebda568b3dc29517505224b78a8c244c2c0fdb WHIRLPOOL d10c70f455c645d2477c90d0a2afb4051196f34936ef44ae26224f9938e12849d6ad738bdef4c1059b5e3b33ce09bcbf1cc4f3ada58918587a681cc99c9be5c9
+AUX openjade-1.3.2-darwin.patch 1109 SHA256 ccd1be234f2ed49d2a0f43784d001215f014ffa0f5b216a98f746196b675e4c2 SHA512 ba6a5a78ee9bbc1c9a598bdfcc1bd1ab78a0220c1ad130b2aeff8911854cfe211026a1b30377e3d3fa56b5a3cd6519b58c1b1f2158bae82b63dc38031e126c68 WHIRLPOOL 933482a69551df4f8fadbb6f2f43cf680ef10b12a4bf6e58f3123e9c27f15e57add01d4a577b6d3af4b333315a147864256b3b0cdf752dee0c742841234bd95f
+AUX openjade-1.3.2-deplibs.patch 1506 SHA256 93905d0b4878f580fece323c1ebb4b5d5db05f1e6f06dde39cfd9b2dd0a95433 SHA512 4a7df423c8b8ad15a1a39900c1bb6882157534c981a9c0679b2c6d71a435b6bf3adf27052799a9eb1dd4f6ecd7e19be72889d9a55c7511ffde9dd11f4c558d9e WHIRLPOOL 40d7d622c11ceda74bacd05e188bf321f25b61fb03c5aa8c84383606fbdbbc80eecc7c559a4f1f710285e0867c950cc656c4f8b8907cf2eede0adeb8f33b22c6
+AUX openjade-1.3.2-gcc46.patch 2164 SHA256 fb873273dc31becdab60ff669c683bbb363ad3abb08949ad0ac54cfc28cf2214 SHA512 df222938e4a04d27618540592e61b8d71fe42caaa4d8aeb90bfcd338efb1ff7903ea860dc460b65a69adf1ccf300a7d67459ff4950a35d9a35569fb8b3ed1438 WHIRLPOOL 2bc00a4f01e8c5af941ceaf87171231064b96131bf1575c6d6f506a6c83c40c20e789691d8602cc98ef00cc8d1e899d2594e8a937315b08ee0b3af4611277e51
+AUX openjade-1.3.2-ldflags.patch 819 SHA256 7fd651fb682d70a3f5062a65d0da60bebdc5b958cc936d7980339f49b360c3a0 SHA512 6112fbc474f0f2c3c024040b42b13290ba2763381b7f99071d7d9d4f8d11bf1087a2c319eba9f0006e2cc067a14a52cedde98444338b180f9566172b52c044ec WHIRLPOOL 2d0d5a6bce8d438dcd2f4406fafbc87ef1b1ec54b6ba0411eb5df11e17e2f2406dbc086b476135aca4512f75595425b45306f656087bac5d66b9110327ba65ee
+AUX openjade-1.3.2-libosp-la.patch 1725 SHA256 c0922350016fbd2784f9080a67b0f8d6171884d506216d7983dfdf95ef15ab11 SHA512 9b73b95ce3ac1d0042641eb0ddbb5ce753d2fd639dab026b9eab0f45bb3231515c69670f02c2a0793d950b6a6276f94e838d273f01e43694e97525af65903a0e WHIRLPOOL c423be9b8f54dd1150442cf47630652808a829f8c163a6a0ec711b4fbf6e66180b01276c50748a93bafce407b4a2e1781ea4abb50e822ae956f24ed92bd55e7e
+AUX openjade-1.3.2-msggen.pl.patch 748 SHA256 19a15169e0463b66d215c9097084b8441ff86b2b7ddebcfa6dddc3da1271e5a6 SHA512 31f25e96bb3df3d8c0850a6ca2c2f0e59c19d23aa62a697ea475c9d2a5a36f5e1fcf807878ca7be5b57538b96d3295591466f1035edd9a885e035525f445b410 WHIRLPOOL 476ec0445702a41bd48dac9788266158e0d4d4b2f1bd0e7ad590150272423e4b659f04654490bb1110a0a8dfc14cb37d47caae6f1632a866497fadf0723ea9f4
+AUX openjade-1.3.2-no-undefined.patch 434 SHA256 d8114a1430a456b04c662497d49f01051bed68d914a3ea4040139aec44c65518 SHA512 fcabb03a649150a05b847fe9f367dffb8b2df4b8635bea8f50a433afb43bab4d6bc58c0bad705b84421d4c5e1d19e2df03065d89544d023c225c0f529f168656 WHIRLPOOL 58d3af82fae42afa530fb523e97c76dfff3066aa2c491ee2084ca30a373f1f8f5b9a7de590d7cbbfa40e0033d69d66b3941c6b5230eeeeb972b9ca5edf121227
+AUX openjade-1.3.2-respect-ldflags.patch 500 SHA256 498b8c9eb8eb4adea6bbe63c3e85f7a1aa619734caecd7ed4c0d70487850778b SHA512 bca7e9550329bc033a1df4ca78bc1ae75b12f27fdecc6aafff136fd81c93f88045ca675dd03e711b4d428a3de832f3bfa703d639319a2b348a2f8268091658d8 WHIRLPOOL 0f2bc31aee27c00c3d8179b518c516ba7b2a42945883894f4463a8c4d912b52bfe11ceaade13e84fa19e5e22b8a5364d54af21d5c624413c79d47ed24fa54759
+AUX openjade-1.3.2-wchar_t-uint.patch 492 SHA256 4b52ea775dcbdcf0b4850cabd8ea82a32dc30faedd715932bd6c805ea59dbfd8 SHA512 5485e8bf2a781f87b14cef2e1b054604a1bca554a682d6f064c940df0b2eadaa1103085e56d57ec6b5bf816792be6ef954095c90349d30d1dd0e37faf766fc0d WHIRLPOOL 86bf710d341c1bcc40b3a1f35754bbcd32cf4eac84d92d41550f79586eebf37a54afca3d22916005801caa84b9a831893a6c70ff75928e8eeab0b06b4455dd56
+AUX openjade-1.3.2.dsssl-catalog 269 SHA256 f33d7ce1b564b91bbdf5b8983f21ce4c6a0e420f0e8676a8439f460a49b16abc SHA512 fba4332fb995c05ae9f9a83cea5422c11ae37ec99b4e37f40edf11acd5be011cff9c7d3b0fcfd0bf2f9569bbe991374678811301ca07a7ef033556309012e340 WHIRLPOOL 64a4089857fe045cf24b2d41f36ed5cfe336b5779f2ed8a927fd11091ef70eaace398b29be12d1a4923464fd47e98128d87029fe59daece3afb556c79528b297
+DIST openjade-1.3.2.tar.gz 894834 SHA256 1d2d7996cc94f9b87d0c51cf0e028070ac177c4123ecbfd7ac1cb8d0b7d322d1 SHA512 c39f70ec8020bd7a2b3e125cbd146b49ddb57910a042bd212da02722617ed5681f32dab60acc26ab89ac658997c6f604911d7be3be391d6278267481f3bcf2f1 WHIRLPOOL 3affbfe811a5650a6adcc70e698eb75bafcbc1f1b205a384bd3bf5cd8885cb049a28d818bf3d807e7f9b00f7f998a39c09f68e55e3283abcc42d90d042ddab20
+EBUILD openjade-1.3.2-r6.ebuild 3595 SHA256 c1be8ea055500a0a6a0418746226739122a92cc3f54101ffae42a04106b9a592 SHA512 d8e93fe535681291d8b6c8c7be44b2d63265f953f914a65b598684e0b0e3a635038b521dc993dd993055001e5e339b7560c0686c57dacf60ab3678f200738924 WHIRLPOOL 32cf6711b215af5500733fad797b81b496081702126f91747f44bc39533aa8972d8f1aa549767fe3bc8cd53accce965843ab9eae43de377ae1924f61e62b513e
+EBUILD openjade-1.3.2-r7.ebuild 3695 SHA256 800d71fee829ea0f18ce221fbe6aeb84bfbe89ad167d6ac259964d185aa72d81 SHA512 b5c511f83733ffe26c005e2693dd6b0f87df9cf95d266b0ecb0057d6d6571aa403e214e361f8e14fc786765afd8cd3b4d689fc94bd9e188151c7ab4421ebb999 WHIRLPOOL b92e366d44924c8f60727a2ba9b6f555f1316d04857faf8b744e0448bd0c3075459079654e795355d83b3d1c7a260abe04283ec428358b38ae1f4f3640de9a58
+MISC ChangeLog 3286 SHA256 6bda27962557681029c82ed685b8cdc7ff667e8a2bbeb2fe29b60797f9c1083e SHA512 59c5c673ed019d83c870da003f3cfdc3e506570d34b8c6aa70c757d8d036b68df460ade63db4b72b67a0386859b53bc5f5539f0b5c775c7c000ca4278df9bb4a WHIRLPOOL fbd8991f07e1aea447dc568422d1c48dda5d46135e5abb56e6aa192d0d7704f1725a5e2380087efe91f2e3eacf3138c7374b49b07efd84d74e7a7bef5139a690
+MISC ChangeLog-2015 12847 SHA256 bc9e62163b90fcb33bef438f8ca831c8c9356c03f863e7e3778129bef26cd406 SHA512 c7aa57e0dc3ea81e97c38d1da0bee1efecf6ff74edb88cc38b0f6199fbbc8954d7a40f0545b9873d4dc80c0e2127856da20fc54d05e476acb6987b47d386bb57 WHIRLPOOL af1b964cac749ae6ca72fa323685acc0f81f5c12cdd604aefb6950d3d669e3c5f4d4b20b7c97b3505e4df833f4e11613806221c6e534c8f5c38d101fece6eec0
+MISC metadata.xml 245 SHA256 b3283b6629ae16761b85fa70c2cca9df82360a8b5ab3697b8facf3bf7bfab9ed SHA512 5d2a537b74c248094a700b0eeed29425d8d62c36ae30fca3ea8381daf41f74284333344775a108ff374b94b9f334516aa41892a983c825efa855b35a0f110c40 WHIRLPOOL 7ab525a89593dc0ec7ed73e7e8956a779be70b5df6ef017ddf3fd352a5f6eef9d30b864bf640e3a03601f7a15cd67f5aa653e293bfcff09b786405a581ccd3de
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-darwin.patch b/app-text/openjade/files/openjade-1.3.2-darwin.patch
new file mode 100644
index 000000000000..524454860d80
--- /dev/null
+++ b/app-text/openjade/files/openjade-1.3.2-darwin.patch
@@ -0,0 +1,41 @@
+See also http://finkproject.org/doc/porting/libtool.php
+(Section 3.3) Fixing 1.4.x (Subsection 1) The flat_namespace bug
+--- configure~	2007-10-08 01:55:00 +0200
++++ configure	2007-10-08 01:55:27 +0200
+@@ -3063,9 +3063,6 @@
+ 
+ 
+ case "${host}" in
+-  *-*-darwin*)
+-    LINKFLAGS="-no-undefined"
+-    ;;
+   *)
+     if test "$GXX"
+     then
+@@ -7907,7 +7904,7 @@
+     ;;
+ 
+   darwin* | rhapsody*)
+-    allow_undefined_flag='-undefined suppress'
++    allow_undefined_flag='-undefined suppress -flat_namespace'
+     # FIXME: Relying on posixy $() will cause problems for
+     #        cross-compilation, but unfortunately the echo tests do not
+     #        yet detect zsh echo's removal of \ escapes.
+--- config/ltmain.sh~	2002-01-17 14:45:52 +0100
++++ config/ltmain.sh	2007-10-08 03:08:26 +0200
+@@ -3913,10 +3913,15 @@
+ 
+ # Directory that this library needs to be installed in:
+ libdir='$install_libdir'"
++case "${host}" in
++  *-*-darwin*)
++    ;;
++  *)
+ 	  if test "$installed" = no && test $need_relink = yes; then
+ 	    $echo >> $output "\
+ relink_command=\"$relink_command\""
+ 	  fi
++esac
+ 	done
+       fi
+ 
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-r6.ebuild b/app-text/openjade/openjade-1.3.2-r6.ebuild
new file mode 100644
index 000000000000..2f11d90edf21
--- /dev/null
+++ b/app-text/openjade/openjade-1.3.2-r6.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+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 ~sparc-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}-darwin.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/openjade/openjade-1.3.2-r7.ebuild b/app-text/openjade/openjade-1.3.2-r7.ebuild
new file mode 100644
index 000000000000..782e039e8a64
--- /dev/null
+++ b/app-text/openjade/openjade-1.3.2-r7.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2017 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 ~sparc-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/Manifest b/app-text/openlp/Manifest
new file mode 100644
index 000000000000..786afe6767fc
--- /dev/null
+++ b/app-text/openlp/Manifest
@@ -0,0 +1,6 @@
+AUX OpenLP-2.4.2-disable-tests.patch 795 SHA256 a024fca478b34248d74d4c4a071ad637f1d5b1e45db3749608a9464271b64a4e SHA512 ac67c675a4793be0194ccdc522737de0fd2b7b008707c19cfb5dd4fd1c17e88a59c0d38cdfebb02272774da81dbf06ca8b897504abe3d37b5eeaf40b8d0c63f9 WHIRLPOOL 4fdbba70eaec1ca4bf29d3bdf8104f8ac887b99267880d964caf48f2bb1b7aaa4a34d21b067809f516cccb6ca1b1c80d63cc28a447431d04f5fad5facc2ccbe2
+DIST OpenLP-2.4.2.tar.gz 7430438 SHA256 ae56a9661a1847eb3c859fec3ac73e7b2e8b102b821232a26fd273f61a039c9c SHA512 650662231a5ef23460162f794237f8ecf54c20f8514793aef1b1bada2912e82c3e1a8aaec36e56a88ed38b5c282393635f6345926362080f8101ef6285a5d317 WHIRLPOOL 2771a17c76001b2981ceb4b5fad44319fa4218477fcdc00589a7e437ae6d721624ef5955ee041db20bf9bb6b802e90f386c7e87a95c53dcae9b52d7ebd072e7b
+EBUILD openlp-2.4.2.ebuild 1189 SHA256 7917212d4fc44417057beea87ef2e79d613ae3780633e1e82ea5b8c9a9b6e340 SHA512 3d7dbd0028ee9b8347724d090d7ab472b7f5aa8b9fbf5812ff42bcddf184cdb6136b72c8d4fc3921854cb71d02f24292b56970219217487811942b7c4591892b WHIRLPOOL 00d17051ea63ea33488be3b65344c9c0edc3d361ec42cc38622cef28e1e4e9a01b73c215eda9167b041bb37a60fefb3fb9ff79fced676408f4516fd349cabe71
+MISC ChangeLog 2496 SHA256 191a510f513528a2f02c53359c2297074e02af80a9c795fba1fe953088b96211 SHA512 8034ac5ca65ab27b0894f65c8dddb15d383e38590df2f54de62df6ddfbd10fec76343c2a7699022b563d6393230231f943a936593162f796dfe19e7aec3338fd WHIRLPOOL 21e0b9a51d7598c6d7a908ebe730f3c80fe25442c26a418021f5de21024be66b6d66e096a5b47e5e7ec052ade3c57c08d73facc0eed10e937ed455af5f9b79e2
+MISC ChangeLog-2015 805 SHA256 bbffb9f9c6b85876be05b39e777e9210ecb19328d63ddd447927cef92226c9dc SHA512 afcd63ac567b7d025a8fdc53fd5696f28f4f67f0f702b559d655f8d006583f6b84655ea37e0222d50f0e7a60a1bd9779db1be678e4c9560b39c63a466608730b WHIRLPOOL 5d80a07cec48023a476b1817db2dd89adbf10e943da001b8fd6b33a44e259ee88adbf2c82a59a78f5d067225e0eb864e52106a9d2171677afeccef293cc451cb
+MISC metadata.xml 294 SHA256 9f13e9363b06986ece9bc91752d60c19849250848dac635e9c4ef78713159d89 SHA512 c8a3971d0143dec3196e52b3bf877b4b3e29041ec6c3c78cc20415cc9fb9640bd0762a651c3f7fd8c12b27b60d0fcf99eb8f0761c10337a9cbcf84e7e78c37e6 WHIRLPOOL 0ce5e93bdacbf5e8edb7b9b03434fdd742e349a6e6fc658c943be7bc72bdbf23134f5f141f587318cddc9260340cf4f77e7f2020a5a58b34e1a0703414d9f95e
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.2.ebuild b/app-text/openlp/openlp-2.4.2.ebuild
new file mode 100644
index 000000000000..eb72deb54d74
--- /dev/null
+++ b/app-text/openlp/openlp-2.4.2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_REQ_USE='sqlite'
+
+inherit distutils-r1
+
+DESCRIPTION="Free church presentation software"
+HOMEPAGE="http://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-${PV}-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/Manifest b/app-text/opensp/Manifest
new file mode 100644
index 000000000000..61cf0ae04c03
--- /dev/null
+++ b/app-text/opensp/Manifest
@@ -0,0 +1,8 @@
+AUX opensp-1.5-gcc34.patch 263 SHA256 679aa70752d48a6bd0d2ff32c8e4c7153f2ce6e50a43cdffe9a3f4bf23e68264 SHA512 bafb4149026e19ef3e4ba34f84510cdc5a5cb6621e58114d06b5979f74a21f4093f141dccd4166a1e83eaeb6310187efbc9a4cadae0c1d55a1929eebac3caa63 WHIRLPOOL fd17e36e11ff002941552ba35c18d843d219b5ad3fcb7d67e095b6b5e317137d3016e6d4c8145908de19badb33a8ab62d05f312071cee44ad3fcb4a68c042328
+AUX opensp-1.5.2-fix-segfault.patch 747 SHA256 d60915133b0d00ccd5453864af4e389e50825071f70bb2c7f88e53d9fd81246b SHA512 e0c72df8e8b191c6cecabcac550cc52918bbff7c2fddf8099ff4403de0fe817c1f3f5deb44b4c33e9d135a97a4fd8978c4090f6740c99dbadc6f9b06e24c41cf WHIRLPOOL e4028a8980d17dcc303166147cfcf24d21aaed79db70ebed45c259e94928f77042046da60e5e18f34c638d2635958e3e0ee04fd89317a495f1460ad728203c17
+DIST OpenSP-1.5.2.tar.gz 1521390 SHA256 57f4898498a368918b0d49c826aa434bb5b703d2c3b169beb348016ab25617ce SHA512 a7dcc246ba7f58969ecd6d107c7b82dede811e65f375b7aa3e683621f2c6ff3e7dccefdd79098fcadad6cca8bb94c2933c63f4701be2c002f9a56f1bbe6b047e WHIRLPOOL 9565425b87d0f68025a2058e8941c5c64519cdb1ab3f22aeec6968473989f39b805dbfa8ca8c74f3968358fac2144756cf50aeab8e6c9ce8112610bd445d5ce2
+EBUILD opensp-1.5.2-r3.ebuild 1917 SHA256 de2b546d7d060b4a3f98f88f770b1aa3c187874de3832bdf695afbe78358ef54 SHA512 4f7e27bfbdaa0987c3e87fac99082732a1f741ced6404cd0282b489a56b4164f8e8f4688644b55c25da5f31472e043557a119658658590f16f15822f078ed213 WHIRLPOOL 3431c7242b2d80ecc63c2b228c6c11d3793e9eeff95d933f3e3341b604e02c1f2e3fb19fed265cff60c1c645e6f1e2ab535508729ec0776116b6e4d1c97c09c7
+EBUILD opensp-1.5.2-r4.ebuild 1981 SHA256 c2b5062ced9d601e5cff305f15475e4307ba881d7f3ef1ef03158898ec9efb24 SHA512 4520d96aaf2bcc86ecdcfb22dcb959f9fa5709584f1484a3939fc2bc9bba93c1bf51839635e50dd00d25676bb0f3b92b6b784df54e4150f311055a9afd670b5e WHIRLPOOL a16e6dfc7b0f4580adc06ced37034795aef1c25612dc9dad076e6597f27dc3ed308546516b12ae3e58bf4628690056a3150b99297f04e21609e3ac5190cd4447
+MISC ChangeLog 2308 SHA256 39f03a192deff58d623a4f5505e8778b7efc803cc06b2c53351c0898b235bb9c SHA512 5e42030043dc81b6354cb59d2b4bd2b2f570f4569a13b522d0c2ca23f030e2f882cdec27e22ae7b054558703eec4b9157dde98825c4119cc716c8d8bbe043fbc WHIRLPOOL e9282199927cabae628767bfb7fcfc70ee3d50677d2a960246b084728c3c66d1fc5cb8f72db7a5e6f5aa66cfd2fe80d625bebd6c7763b01205e90e3fee454001
+MISC ChangeLog-2015 9194 SHA256 085d0f865e1ca53847addec0946b26d7df5db7739bdef9b818c98aa8faa943c6 SHA512 abc62ec98d05235b3829a5c9c1a49b67194c1d5e0fcad5d6855bc0e9195cc923008a2bb8276752d35361d33f4618219e2d91a7de3014f8368f3d825fa70d2657 WHIRLPOOL de03203e03881b3e290b8ca4f5d0c13b9cb65010b91d1d3dde4176907057aa6c8f89454ba39e15bd965229d3c9d8ce8313a3e4a87440755f2bfabaf7dea1a226
+MISC metadata.xml 418 SHA256 12de568288fe2a8d05ea073ac0a0d965aa617abc68e9690f6b37281fb7398756 SHA512 d69bb957dd6b4af7a13527a7c6fb15b7df9ae62cddafb561557654d4076c3e455b28ed16c081fe6c8843c0ed9ec26bef4d26035ac6389d6d95523953bd940008 WHIRLPOOL 9f1c7b3cae102ff14a90c7716291422ef5034cd419dce26135f4c7eda67ab5941f0a5b2050266d8b753e699a540a38ae8bbfaf99418c1355073259ff7d9ec009
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-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..74e59561b3f4
--- /dev/null
+++ b/app-text/opensp/opensp-1.5.2-r3.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2014 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-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc nls static-libs test"
+
+DEPEND="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=""
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-1.5-gcc34.patch \
+		"${FILESDIR}"/${P}-fix-segfault.patch
+}
+
+src_configure() {
+	# 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-r4.ebuild b/app-text/opensp/opensp-1.5.2-r4.ebuild
new file mode 100644
index 000000000000..9ca36741d8cf
--- /dev/null
+++ b/app-text/opensp/opensp-1.5.2-r4.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2017 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 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc nls static-libs test"
+
+RDEPEND="
+	|| ( net-libs/libnsl <sys-libs/glibc-2.26 )
+"
+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
+	use prefix && eautoreconf
+}
+
+src_configure() {
+	# 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/Manifest b/app-text/ots/Manifest
new file mode 100644
index 000000000000..c170be2dda9b
--- /dev/null
+++ b/app-text/ots/Manifest
@@ -0,0 +1,9 @@
+AUX ots-0.5.0-automake-1.13.patch 435 SHA256 9bac99ba35f13fa1563a6e154da73272fdade090d882612f7057ae32544dfc98 SHA512 9ff7d9117ea12917b967c386054afbc25c2c9a9e85d9930fa7ecdf9e0c230a64a6f3689d22c94a796f00d13cd652fd6d7bcfe21c7ccc1649ee58f68ca5f89a11 WHIRLPOOL 00bef4180c3f2b2b6c2df0de68dbb4d99652a7a7410b23694d31398ef53b700d55391c282e99fa8939a4c5c8361786d1cea93a38fd2aaaee0332a388e3c8b52a
+AUX ots-0.5.0-fix-installation.patch 514 SHA256 cf2780a52212e8e1393d1e4799cc94ae9fef426f0633c7624c0a2c758d61b820 SHA512 490974d43f3001220505fe9b77830b57f0ffc8faf0ab262c3de8f50c4ada75df64588441f20810e6958ed78de5a2e898c889cb686eddeeccfe497f42cbfa4664 WHIRLPOOL ec165b6527687019a8eda175f2a46701aa2bcf6770dbac61310dc2bfabe6f1c39517949fbc2d1705b61d0ec14a28eeb54251d853a3f36c30622325b168f56680
+AUX ots-0.5.0-fix-underlinking.patch 863 SHA256 9c46f66814c7c30795101dc9258b484a64c3459a2be8fb91f4b766f285afc092 SHA512 34f189afbba9d1c8936142f27e5ab6ed4ab2eac8271a58e9295e46b993b0be7d48fa771cd62b3a8374da15b07deaa12eefcc01b0dd34643947cb43cd64f5d0a6 WHIRLPOOL 81230b7093e9483f52d792e250f4683e5f3827112962b1822bc9f7a1a02477dd434859730b30ba2b78b6f23de44e36860862fd045c495973e93d10afbad028c4
+AUX ots-0.5.0-math.patch 402 SHA256 329d2bef112039430a8d78592370e90f53c91c595a53b77a0bf0431fb26c26c2 SHA512 4ba250e3c51eb621bba6e8ee1d291719c86d04ecb2dc20cbd1bf7bae27ea22ffbe54376d690c24c84a0af0da9907dcf40d01c0aa53e9b610737930a442cf6918 WHIRLPOOL bbfeb9cf45aa4c2e5921e23927f34e4d2ab6b8a85888990341c0473ff961b83fda94f9f2c0b060f175925c034d8fa1db3dfec7d63057aa00ea58137a09b14740
+DIST ots-0.5.0.tar.gz 371126 SHA256 ea908d22256166d1200fef55a82dd3ea8e096a249eaaf0b926f3577f1a63e137 SHA512 736a672e16b741f2948e6874b88d4ade8e0450941915e65285f2fe661194a6d384a6abb267b15c3254c638750c644b4b2cf4279d7bda163b02336fcd8da9cfbe WHIRLPOOL 53fbbdc514231531f669eb5635549538f67523503c3550d7bff2deb207e293abc6efee0e6a9b2d627387c8577be971f97188b6fd2e209431b63c90df29c79357
+EBUILD ots-0.5.0-r1.ebuild 1124 SHA256 743cb684ac4515ea665bf2be4c1a3f1b910eecc29544f281edaa8877ea8ca56b SHA512 288c8c5dcb109b05dd0f36ed24a2419778e01da987b14c4f0d478f229979a7f01290f24a6aa1d2983c6fe23ba3b7eb2d4999e8a9ecdd27846050edab4f5c2d28 WHIRLPOOL 926f2949a89934d67ddef4aa31a4b8fd5a8ed124354bd4aa9271008240d57ff9976c32b3f709e6b98f665bb2307374975167f894548d0f6a10dcf858c82b01e2
+MISC ChangeLog 2671 SHA256 c178d458fc32e6b081267664706826bffc1fd3520e07d71aadbe38fd59c42971 SHA512 cf7ed7700bb3accd6a7fe7830c8d9d4c9a745c4c2bb8b75f8102bfffd6a4bcfa3c56205db48bc08936fc5261d4ff46c3cb9648ece8c53bf920082c9bc9405015 WHIRLPOOL 7aaa235f1d4e0a99aedb47c9c585b23e17439c37a66438f81245b2100a4b8b2607d115511c597cd8e15a54162c72de1f9a58d6d5573ef016d0ab0cfe0e524092
+MISC ChangeLog-2015 5461 SHA256 9313e9353aa6787d9592187ce94fc3cfe46d7ddd092ad109f9f8801aa9405459 SHA512 79f6083a7edf6f68958f9d62deb3b161abc71e270d46785cdaf253c2839c21e5c6623e7b07b7ef33ac1b7258caae2aea026cb61c17992cd8dfb001295ba1134d WHIRLPOOL 233f96b8d1dcf7e9c31bfebb68a5059f82b54ea60ad41d8aaaa9d45dd3dae9cda43a10f102799693b055eb4b4dbb4a8155cd0408ca5d7e97b8f012f874cfaeaf
+MISC metadata.xml 243 SHA256 1bce04e723ab396868c8a2d6590d41b74aef49a87e96774b0ceceff5658ff468 SHA512 354efb009da3999e18811a3e91f53628d4ce26aa103544be6b5d42caf9c5d9881097e81777665f96c7828a15a7e38f1e4a118579a865eb4c740e580527b42774 WHIRLPOOL 532974727c923d44a0f71c610d7a39a1c05c3ae1d20abec7868703d9f942e31737c19a94065ede93f52deab3531b26477fb946d8651bd11b91ca3039725374d5
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/Manifest b/app-text/pandoc/Manifest
new file mode 100644
index 000000000000..3f3111249476
--- /dev/null
+++ b/app-text/pandoc/Manifest
@@ -0,0 +1,17 @@
+AUX pandoc-1.15.0.6-no-https.patch 407 SHA256 256f6aeb9872b77ea11d104720c4a23c410b5af8c03b997c6d95d4dcfc6f7f34 SHA512 3c8901649fdedd56bd6ae65af5667c563a04aff8f282194cfb70ae343408d82a6842e9e2e46be73f1938db889773fe946ae8da46bca45acbc882f5eabbf747e1 WHIRLPOOL fddb00e5b7099c9ae6fb553924e4b68477c0323af331d9055e384aa041e7c0ed7a52f9349d93953b2bcb7521c6a3a5ad0543978d5a51053688defed9a25497e8
+DIST pandoc-1.12.4.2.tar.gz 1048263 SHA256 2f47f5f36498d26aa9cda7b93bcee76afedeeca7463478b5eda076209ba27f45 SHA512 fd9f056350bb8b4981eaa0960f841a3e8b40956cc3ee1593a3e2eaef4256d494c5d1c6fd537419e95498ccc9115408e5cb56ce1d6783a33824dc67af059a3743 WHIRLPOOL 795a27f9106d9848abb1cf120cdfe92fdaf839e5097e5bb17533859f4b56f958d92b5027483cb08dd7a4d448e106487fd9d37f2a9d67ed4479647acca2ed77a1
+DIST pandoc-1.13.2.1.tar.gz 1999641 SHA256 66da6eb690b8de41eccf05620e165630854d74c08cf69dbfb68d0ea84589785f SHA512 3505e456705da7a370ebd9628959475a9dabaede5cf50b24a780783a814ac9e1efc84dfce37215dbc472af3cacbf05d13e8f447b6602700b2648fd13d170808d WHIRLPOOL 2413041022e237454439f60e32cd7a2bb38452abe7ff78ce72594e54fa05122db6802713c7fa2145b0e23b0a085fa883c5cc5e7ad899d24ae3d5a47a4e1f6622
+DIST pandoc-1.14.0.4.tar.gz 2052114 SHA256 01955bfb1f397ec22bbce10e2df7b4f2214b7289bf79bf51eb7ae0e3b427fadf SHA512 57d5e43179ae499ec95ec09fbdbf22ad1d7406fcb7151e9c608d9c0ac69e3b5f7eea6b50fd5d2526d52e9227e7fb05c5bda9da13a21537c582f1c2d4b9779443 WHIRLPOOL bc95f9b480b2336c7e0470187609a12d5e1f3ef5074af0bebb72c622d7c056efa74fa682190c08d9721f16b919d9264b859b2cbede2ac192870c419a60b5ef8c
+DIST pandoc-1.15.0.6.tar.gz 2049870 SHA256 d950968142526d5a765af7dfb26b47c3f60d4f883aa9d9eab668614179f1ed46 SHA512 4c9bfea7440d6bdb72fb10a9a99b69c018db0ef0f1028d86b032e6c4df215c86566b93fd55c5cba7772d713d4ce3f764891de079dfa24de8ca21f818b7729211 WHIRLPOOL 54b4cfc5fe71604997bc484368623cc9468eeb688e14c97fdd5e510f644c254e47008cb73116b7a5f8b1216923375addceea7fc19c3ef1fe7411c3e739d2d72d
+DIST pandoc-1.18.tar.gz 2711663 SHA256 3ea4b977f31d71dedd99a4584a895659efbbab02b00fdc9daaf7781787ce4e92 SHA512 52bc68e9586366433e522a867946adf2e03219dfa4ca63cd6ff318ebb251f77ab16aa18f0350605fa31f8e085bb6cac9055f9661a0ef3cb5693faba9e124d049 WHIRLPOOL 6395ab82cf6cc9a13a8f248be7997f031a6724ebc3fd3175151eaff5095a2284047d009e0eb72d215022453c43a69a83a153533dd62ad2d326d8d006a2146ac7
+DIST pandoc-1.19.2.1.tar.gz 2755101 SHA256 08692f3d77bf95bb9ba3407f7af26de7c23134e7efcdafad0bdaf9050e2c7801 SHA512 bb814c162b68efd00f249899ebb2cffa07c69bf0ac73838191de8da38dbc9a37b9edb0c24473c7ac8f816c0105d340ca7387c5f5c6f07a908e1537f4d35ef2f9 WHIRLPOOL 9e34ff0bb8a9c2a53a2d060024e77374c0d9bbebbd75fdf5defdbe55ee81f4162774adfbc7fd753a9244d9f971da1537b3690bd3e0ae7aa7990b89e92f8de9cd
+EBUILD pandoc-1.12.4.2-r1.ebuild 4149 SHA256 87ba0aa5a357fac4b4a316a7572ec56864c17d1732c73f43f9dc372ffa035aaa SHA512 2eae02132cfa1c375614427c5396478579eb028bf4aca572c1dac71762a71f8c9ecf716c3282747b041c5132344732cf94b018a0450ee4398f2e502dcbc9899d WHIRLPOOL 53948b7f71309899df87442c24d3ad751e0a1562f575f29b374f5744b48928bfd5c1b698c2ee7977f17751821813c778b55b13bf0dce0f9626afbf894a90e0aa
+EBUILD pandoc-1.13.2.1.ebuild 5041 SHA256 e9b6710fbb2c06b40c2e5d149188e51a2374a3d9aa4f25225880248bb60ae932 SHA512 b7c0f5e5a9a90e02ff91424829d49a7917de7ac561fa9b848c88fa8e9e064049c284f22d34e1380b3ce059730aa77a09a94f68481f40978d427922a5a4c4ad60 WHIRLPOOL 080ab8cb2b88fe2e0cbee90bbd877f6aa760df7ffd48dfc6954288ef5078399b8132e8d86f714b9a51077b3080ce336197041c70a075ecd923bd6c889d6f1dd7
+EBUILD pandoc-1.14.0.4.ebuild 5340 SHA256 5c509171293bc1846fd8ace5452adb385294b9e1b25d5968e61dd69a83e606e2 SHA512 23a41dc824605ee67f99d0ce1b3aec123e9389baed04e56c16f534d1ed469c673a7d764d157e12b037a1d29a8ead4ebeb84defc7ac6a1368618c0a42cb4a44f0 WHIRLPOOL df7101f47e51a9b623537f2929f7f5abf82957535b6bb8d0e3719c8edc65a14492ac248c7158cdd6731d6f6c0465bcc272627f76b918476ed3d99b33eff12894
+EBUILD pandoc-1.15.0.6.ebuild 4925 SHA256 634e43423c57336bfc0180b7ef8d79c3eb6837dc3fb5d41cea534b426ccf1bd0 SHA512 8f54615ba43f4ad98d8bf4f683a43a0be1a04f4eb1fb85958585752291e7713879475c0e325fcd6f89df18c0a2fa3a8b06cee7a19f78f75bd2b43686cecb61ce WHIRLPOOL 8354af8fc39e6090e23b5d0b3504aac7377109efd6a49e03107811cf468951092f3a5615bbf8a9dc6983fc9c4cd9accf037a9ba74335257c45ff66322d016b5e
+EBUILD pandoc-1.18.ebuild 4837 SHA256 1d2d94960ca314ab3ffa16006c6e969e65b37aa322af6c072c28169a6bc45aec SHA512 569cc13dbe08ba3863f911e1c9c31644e518f73a695c5f0aa84f23c73ee6b5c3f4cc0cebc3167e942c074c67318efff5a6be11ec3d6ba93c54f4c3d5dca7d056 WHIRLPOOL f826652c04d3539ca94d271dd5ab5549d246590183f82d1b712d359572f0ba8f0908885ee40d53e02c43cb9b494a472e25e01e8bda599ca0024c29b02f931d81
+EBUILD pandoc-1.19.2.1-r1.ebuild 4913 SHA256 fe32fc5f06bfacef2c6e56f3263f4a8b95ae60f5e0e7e39f5f81dcfaf21f4c67 SHA512 77b9a05d6ebe40673a5792074e022d8b97fd47531bf434c461b45c69d92f7b3267147205c6da1004e89a1bea03b93848fdeb604f175fd0072bc2fd6784aa2df0 WHIRLPOOL 04ec264dd49863d0666324a17618357cd0946bf228c9f429c36d0d2c48e9dde907860435cce2e4816c808f4ea3fb7a67a7c4b41cc4df2411722a03b16fc88da7
+EBUILD pandoc-1.19.2.1.ebuild 4787 SHA256 e865c6d4a89f838a90bb8a4cca9dc9aac25bb22e396d0220ef0c095991dbe284 SHA512 bb8b15ff611e70b0ef51972e73147cd768e154e44e6cfb7f09bbfdd8c5583dcb113c00d31c1df8d2b7aa5c4cc29e6f44db5af75dec2dc8d3415ab7b1e1b792a7 WHIRLPOOL 2cde74a35061e7d02b7dca2a83d70bcbe0ff3108832414b2f162066c0e17f0f5829997f71b8fb5079c35c235572655f93d68e964be16a60fe7ba49923539e077
+MISC ChangeLog 4261 SHA256 ee407bc450a093d757c67dfe6d6f93b697f2f7d2edac90f8d38d62c81674cadd SHA512 ec58a63fb2e25347f5876589f93fdead62c6e6b724e285eea011d0c10cf94b65cb6ea345835d6d6955f8da46e41d8967866bd9d6f4a9b7afb483d13e769c70ea WHIRLPOOL 042e11da98c218215c80271b11eb98653693c9d515c18f9b9275acf9e5d591670c27032eabb68592b99ae708b3e91c72a1ad2268c6de96184d67adb23bb23194
+MISC ChangeLog-2015 8109 SHA256 51ff1436ef8b9a1a522d24e71cb2926aa0d352fd24d92dd722e22dca82e710d6 SHA512 455dcbb987e09979244965413ec94be35e1b5824190218e2201203e61b7a8c49f4773e7de8b054a3a2cc45750db49c048e69f9ada42414b3415efa23ef4555eb WHIRLPOOL ad3ed4f4c562c60c8fec7e75c02013b87462da3bf58c4f7389c8807420538d0254b65bc636a610e18572234302a7086c57a6a4aefa8abc6ef075f7149b18b7d7
+MISC metadata.xml 1305 SHA256 88387994a8e9285af918403408b7675b812bbb15e67651aebec0331d8acd5ef4 SHA512 629756e0dd15252a2d7fdbd5c6c24992d027041de4c19759caf130b7ad69809dcbfb39b27988df9bdfa65696ce9d564d75e0ec422172699820e8892e48d84039 WHIRLPOOL 3c3b67361ebb7ff1b82552b677fd70a122ed2cda13ebe2b469930bc70112d70f8782d1c9f6062933341383e0df34fedc728d1d7df3282baae819e9268fc47e11
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..8fc1f385f439
--- /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-backend/Manifest b/app-text/paperwork-backend/Manifest
new file mode 100644
index 000000000000..73aaa6ceb924
--- /dev/null
+++ b/app-text/paperwork-backend/Manifest
@@ -0,0 +1,6 @@
+DIST paperwork-backend-1.1.2.tar.gz 54340 SHA256 19b15ed995b06bd9d9a61c82389983feaaaa6d5dffe41b88e87bbe3a5e297dd8 SHA512 626a4e44243769c0982d2a4677e35e4c3431e6b68b05687f13574e1f9cfd026d0b949e95e53ea37c976ea5826883eb2ac672cffc346eb05631f3498bb525391a WHIRLPOOL ba197dfb5d131e522df9a8b8d77c8a94e01a1001dede460d8e7ecce6c413c1e7735d6bcd19a739b01b4abceb72c88ca654aa59b2a1513eb4aa3bf68132e07330
+DIST paperwork-backend-1.2.tar.gz 63167 SHA256 321f1a637b4df6c8d01caa2d172ca10c6285d1515ba75f594eeee71643ef5378 SHA512 278d7080c9806a6ae68cb15ba9df2ac22bd2c120f0e77a9d7eacbbd6e70476d4fb803c572216e580a068527ae8c10c3f2e66199aca3d94949e655c08214beeb1 WHIRLPOOL c064abc9feaac7a8d55a9e712bc3f0c61d60c7518560d44328d4cf3147614914445c9a29598b4d536e29186af793851acfcc6d2b0e3d5a3f7b93ed2987bfe144
+EBUILD paperwork-backend-1.1.2.ebuild 852 SHA256 c90dd4c13721da6b2f970bb894a6dd70e849afbc20dfc36795d01b8d4ba6a53e SHA512 a0cafaaa7704ba1f43450c8e39a0015b20cf6a5b11d89041de91dbedb01f163df52f6ed4c69817811ad1f42aeaf231dd305c8340ebdaaff141121c6c980ea6ea WHIRLPOOL e231d58b702a1e45988eb8ff2a717e97d49143b556de664b7dc5c0088eeca4aec51672d504794a0517d44504c6df49decd46d3fe139a731ea91b261a3915bab7
+EBUILD paperwork-backend-1.2.ebuild 902 SHA256 14dc3f0721c5ae5d0a1cecfdf9197159c9b46809f72dd84e66fe9042d8b8c91f SHA512 6aa20f76e3ce2c17efbd16fbdff34db4a02a43b56ea5bccf4c4e28325c1e3bf27baedc21ae5bdcae335e4c136d8e26d392d5d647759642b72df9a26c798c2e43 WHIRLPOOL 7c9fca92cd5b5dcfb7f6e218c7674bc9e6b3077bf5f7a70b055274d2c5733516536f9df397026afa13e0e7f558ae2b00f72d3a495fb72ddbdd0e4e6a7db1d580
+MISC ChangeLog 967 SHA256 80c94264883f889f3144b34e4e4373588120b159ac8841f004384c953adf3982 SHA512 c4735f795f54cf2005eec720416013f0f562edbd73d73fb7123ecd456881504e68ba236411e7717d057baaf32a9d399daf0b349d1435c1a8a7025a35e015a0ad WHIRLPOOL adb9b70d3d44f2f0e3e89bb7f641c906816c1ccdb1c8c8fdad8a44cda19886f4e551a58fed4cb49c7c82f3294aac9a8260892d1c818747ec7862c8fc7a7f8703
+MISC metadata.xml 358 SHA256 1e8689d80462e15218f7106ada045210bcdc68a56c29df92226dcbbebd554d6b SHA512 1a5a81b753e23232ec0fa2e5239d80ae70a589403a1cec20191590f4d5741fe2519a389ecad905e4fd89d148f8420dc602016fe92f10fe03ebea70508d4d361d WHIRLPOOL e5f803d50bf121128bc23692478b57ad05b8b63b8ee801a7cea7d692596c6b30ec323353f606cc1dce479b26c696ee019ff0964f8283d726f878f2f538e1c2b7
diff --git a/app-text/paperwork-backend/metadata.xml b/app-text/paperwork-backend/metadata.xml
new file mode 100644
index 000000000000..911820b2dd32
--- /dev/null
+++ b/app-text/paperwork-backend/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>voyageur@gentoo.org</email>
+    <name>Bernard Cafarelli</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">openpaperwork/paperwork-backend</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-text/paperwork-backend/paperwork-backend-1.1.2.ebuild b/app-text/paperwork-backend/paperwork-backend-1.1.2.ebuild
new file mode 100644
index 000000000000..e287a22cac97
--- /dev/null
+++ b/app-text/paperwork-backend/paperwork-backend-1.1.2.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=( python{3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Backend part of Paperwork (Python API, no UI)"
+HOMEPAGE="https://github.com/jflesch/paperwork-backend"
+SRC_URI="https://github.com/jflesch/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="app-text/poppler[introspection]
+	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.ebuild b/app-text/paperwork-backend/paperwork-backend-1.2.ebuild
new file mode 100644
index 000000000000..da6daad02406
--- /dev/null
+++ b/app-text/paperwork-backend/paperwork-backend-1.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/Manifest b/app-text/paperwork/Manifest
new file mode 100644
index 000000000000..16770f7a3427
--- /dev/null
+++ b/app-text/paperwork/Manifest
@@ -0,0 +1,7 @@
+DIST paperwork-1.1.2.tar.gz 331028 SHA256 7beaf56fa91fb602d185256f3bbf3d9a85a332efd87d35dc22dbb9051bd94fa8 SHA512 14c018c9b148e1569948d2de7b1c0c04d353a7af7aa6a7102585665d9af2f5f2055145338a001085be0fc165abec066d73d3adc4a378a307326edf730c3c3606 WHIRLPOOL f951a15a9e2c14dbd08cd0b767c99dfa8ba63890d07ca135c347f141696652085494bc42f01d29015676a45fa4bc0f5785e4ec8a33cd5ab46bea48e21770d050
+DIST paperwork-1.2.tar.gz 8086428 SHA256 87f4610adfe0f79931d27d9a3c3b5441f77d9db64ed4f72ae2a1bf844df7eca5 SHA512 9c8c43ef31be2eef57ffbcdb00b4e91dd2b1eade75814b789c489abfb6f7bae07e68f7207c8fdef4f3bf95bd68bca8a680b965259106af9f0166bee7a6cf5ea0 WHIRLPOOL fa0e6acf4bd7514899433077a32222ced8fdf8565467dd7cb8cc05ab2c737352d67a8375af98bbed507ab5a73b302cd968dddce2bba8f13a3749edef8562f001
+EBUILD paperwork-1.1.2.ebuild 914 SHA256 749db520a98a8b7ec6dc7399bc91d1a9f1b737cbb0fba17535f0a69cf5b58beb SHA512 2529c16f7f10b9c0da68337485f53fd52b9b6d4236dad7939e98adcca4dff74fc648570d0a06ad2ecf0b8b1e6851f4671e89e64663287263232ebfa5b7fcbdc3 WHIRLPOOL b34c278abd306ae348b74c0fe87e6e6566a8f2b054581e6b50c6a3988863bccd47034aa8f303ea2eb6d52a14a7b1a079539b87f988ecd7564c3d22e4456502d6
+EBUILD paperwork-1.2.ebuild 926 SHA256 8d398a4d8e628c0593d9d20b24af907ab3d603f6a29cdae94e9a73fb912532ec SHA512 0e64099e88fce4e4050cc4d30a6917ba9981825801738c01187d46c2b39a10159d31ed7e9ce8ed0c5bcf4f38da0b00a993bdfc91e6d0be62586cdffcb9da9f5f WHIRLPOOL 0539a7c4296bede511893401d3641c04c3b0a57d703a65cc0c7b57d9a5f306a9e6b83d7853a50075a618023897c9f81578d080019a8aa1a793717f671613f66e
+MISC ChangeLog 4353 SHA256 df1ae08ea32bbd7f7b5c52c1c6fbf98db9986a316c9d0ba46b8811ddf8387a1d SHA512 df83031a14f86971e99c70236ac3073a3a5e70ee31351ee7d79062a5103e5a7de35071c32a93849786689ddd555104288913123ed91c2d22707f0464452db48b WHIRLPOOL 22d287e2638eb4f9f095a7f8055b1706bc967819838f01d25e4094015d57c7af87f830054f0e9a8b717232be05a0d3768fc87d5779603e774b6642e8be839ed9
+MISC ChangeLog-2015 1818 SHA256 d80aa5257d448cbd7cea6e86469aa75f0ea1f22a1820b0067f449b6eff6e1682 SHA512 340d17f6b34cd14f49928a0e13b5320cab3837e74fda5a3e993c88aa03b2eef871db624ccb1ef1a912e3649d5aae230c433d8390ce4eaa6fe6f7a9a4f92c2132 WHIRLPOOL a067b717801cd166cb9ba00b79ec4f30b33d4e2a252f03a3343c290501efb1b53629b5991c257bd8fbeca41054ad5c4c4df29d2aea9e2c17db41700e0ce81450
+MISC metadata.xml 727 SHA256 bc01475856bfcac0d3192b01e685553b21758eeb618710ecd11681e1e845b6b3 SHA512 cc1ee40752039159b50cb5e12a8f92a0e3c84b4bd0861538bb366b8202194503de68a48154f51873444f366543d3143f800754e88b73f0b128133e0e0268f989 WHIRLPOOL 1c46bd9206956fff7a941168365a00962aaa041e19e1c8f16600199fb2fe1e553ca93068e60f075cd410033e9f3d00b2d0900dd932ad5627c96ee0c8c3ac83b9
diff --git a/app-text/paperwork/metadata.xml b/app-text/paperwork/metadata.xml
new file mode 100644
index 000000000000..2b459e66b553
--- /dev/null
+++ b/app-text/paperwork/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>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="github">openpaperwork/paperwork</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-text/paperwork/paperwork-1.1.2.ebuild b/app-text/paperwork/paperwork-1.1.2.ebuild
new file mode 100644
index 000000000000..c301f25b4f83
--- /dev/null
+++ b/app-text/paperwork/paperwork-1.1.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=( python{3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="a personal document manager for scanned documents (and PDFs)"
+HOMEPAGE="https://github.com/jflesch/paperwork"
+SRC_URI="https://github.com/jflesch/${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/simplebayes[${PYTHON_USEDEP}]
+	x11-libs/gtk+:3[introspection]"
+DEPEND="${RDEPEND}"
diff --git a/app-text/paperwork/paperwork-1.2.ebuild b/app-text/paperwork/paperwork-1.2.ebuild
new file mode 100644
index 000000000000..1ce4f4dfe5d4
--- /dev/null
+++ b/app-text/paperwork/paperwork-1.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="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/simplebayes[${PYTHON_USEDEP}]
+	x11-libs/gtk+:3[introspection]"
+DEPEND="${RDEPEND}"
diff --git a/app-text/paps/Manifest b/app-text/paps/Manifest
new file mode 100644
index 000000000000..fad5498632bd
--- /dev/null
+++ b/app-text/paps/Manifest
@@ -0,0 +1,9 @@
+AUX paps-0.6.8-fix-as-needed-build.patch 1051 SHA256 0df19dae30e2e22142cc4085088c48e98201b33d308073883a0ac88fee88a6e8 SHA512 943a2e2d267cf339cc3958ae5622fb4f8c3cd25fca63fa6c91c5b37c34e833dbdaf3a11e038d00b23a44fc590a268729941fee790f9f513f0532f9c339141695 WHIRLPOOL 23ef8def7c451b9f7c20e3ddebecdd08fc2b812511021fe278f69a826dd16e50f97b8736aaaece8dcf3a82eca9dd466f02f28e71698e9e4d972ccd02dc425b5b
+AUX paps-0.6.8-fix-doxygen-acinclude.patch 699 SHA256 3ad387e3acacb577ec8072d00a5886cc742c688b7ffa41824420bd04a4d7f1e7 SHA512 b3c0949e7b6579cd3c3f82692ca2e0e9479bf435cc99b8c9c71e1842e32bccd9a79c2c199541ced21812ebf5cfc0887304511aa7cd1d4eba4bb2d476c4710b7b WHIRLPOOL 8593a2394e8c973c16793fc3c9be393c5e8e11ac70c3e9e0f91c24e53aae7b10fd420cf43902890ebab91339d543bb4cf7f85e51b76421914f848301d6f71436
+AUX paps-0.6.8-fix-empty-file.patch 558 SHA256 43b92010ae6a90829ee9799474c66760108e0f13928faaf5fc030a12dedde487 SHA512 19d28f75664a7a626564176c223df77445710d7a941d145046dfdc5697dbacab25b60329e3ddda4f7ef6dcb5c1b4f14ad5641d190d83b8a17ddfa76bfb934a01 WHIRLPOOL b5446f05d18e71c447fc219b619da9f4209a64c582d619ab072f70e43a8201afa4fe86352116a837c686c8dc957e8cc6a28cca37385575a18f2a532ca25ed661
+AUX paps-0.6.8-fix-freetype-include.patch 323 SHA256 b6a731df8c5a315ee70873d4e8f045082b316579f146b2a9e872c8ecf961b2ce SHA512 1ace4c661972853390feaf3f4a123416a6847b5d969017884df75561255a487c0c1e0adf37a1904f17c6855996a2edb0a5e388c996d31224f713bdba9425b287 WHIRLPOOL a9e253769c56df915d75ed2237bc6283724969283cf8e9ddfc4a748c4f706d3c13e2e38dbed0302b4a35706d51cfb39d3a3a8eb97fd2ae912b305f070d864f8b
+DIST paps-0.6.8.tar.gz 460062 SHA256 db214c4ea7ecde2f7986b869f6249864d3ff364e6f210c15aa2824bcbd850a20 SHA512 db657d90179e11fe42bbcdbebe09a84f1927c99d0b539c9e29b66b3cb8ffcf33ff500c9d81835ae5a0880382bf8f24801f04742517b76b8e005b125a139d8bba WHIRLPOOL 69291aeadac3d85c1f0ca53bbe09b0510949b75159ca138c3102e1708e898a50a38fa4b78c9003957fb83da82ade57a5e26be8b63bb68c2022148f45f2615e27
+EBUILD paps-0.6.8-r2.ebuild 777 SHA256 d85a1047977fe9495a822e7e79960e18f49e891d5e2c77e7685e905a36dcb53b SHA512 bfccabf0ecdea578b095022acd26280ff4d2ed9cdcc342787169dbc6d6040dc13221ee4d6c36ccc756645de785b75b48307437db5aab2d28f7445d6fba0f754c WHIRLPOOL 47e6bd1f6742b37c756c93256c585642ab78ea1d8dc41496aa2fa66248b2db981155ffc96ea9bf5120f3ac824f8ecc35720a490cc885410b627013de3c2458a1
+MISC ChangeLog 3716 SHA256 548a2af23fdb803a159c23adcb4b7f8eef0275bed7417fe15da5f46ad779e198 SHA512 328d9e564cfb269638e1157cf15bb21509bfee79f172ba35058719d5d82277a56dd3b0e483cf22277e700bc49864be9fe1b08a2660080d06fd33fb7df28d805a WHIRLPOOL 8d14f77413cbecfd20b2e08122c741bdd2e1529803b5a6028d0f8f9572bedb664bc71199b36f4e43687abe6bc40d146d4150ee57cfc0799528d451784d44848e
+MISC ChangeLog-2015 1306 SHA256 a51b070875206febe9f827c1374862fd05706e04d1f1be498fd6165f05a46924 SHA512 ef4f16a0ec257e79a3e74d7e92b06e7147e86e7c1dcae4b716db7987a58619a0657f468ba8b253999acbd3e4cd013a5b9dd58d3d37ed3ea79a4d94d6d4f97ae3 WHIRLPOOL c153c8a00607fb65d3e1a59ab511c25a99dbddf78c386a717a4387024666ae1e16074a0c334e45c5092e57b5c8bd908df9fa35740c2f1599db6a4468452e0629
+MISC metadata.xml 317 SHA256 890bd71fb68b5cb6859bb3a30cbe0608592e129ce94b5f1e83e888f563858120 SHA512 8f35f01381203ad3dc040eaad87a286b1c8ded91eb9f0d6d77f98168a49dafed6e6c4c7235cf4eee163981178d5c967c819625008cac700202378f717f90421a WHIRLPOOL 8d3d5f66a047ecdedf3cf75afce095d8830099768362037567a423b17e97b5767a5c92bb0a113953853755400478301ac62825dbff2bfec14f4ec54346210395
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/Manifest b/app-text/par/Manifest
new file mode 100644
index 000000000000..51152019a97e
--- /dev/null
+++ b/app-text/par/Manifest
@@ -0,0 +1,5 @@
+DIST Par152.tar.gz 47999 SHA256 33dcdae905f4b4267b4dc1f3efb032d79705ca8d2122e17efdecfd8162067082 SHA512 f5a46da4b693e6a3d15ccd57e24ee9b0332ebfbcfc88da9ef0731e18932ba6f0adde7691a233264d6361e8903ff7e2263f71885a415c896dc4c45a0d05b1978e WHIRLPOOL 750392d8f4bfccbff6931b221b426b9dfd08568d0e20ea5833672e76baa213992878d690565a973d6e86e5974b89c203418805fe77227a392bb3740103497192
+EBUILD par-1.52-r1.ebuild 730 SHA256 eb590a9e0fbe276a1af4f19a3217008dfee0961ddccd430260374cf3d70f8c82 SHA512 b72c83f06eba360ea9df2275775cf960f5ec718ccc9e59a9546d6db959479ab6e6d07424dba3998193673aa1ec73870d3997b12b1416e40b91ee04c6af66f082 WHIRLPOOL 4b37cbdc87c6a92360716bdb1f386ec1b5019d09703371d6f827a22a62e407e59cab68c8d778751e264c9dba755a83ecaca9def6f767ae18c9039d5031b5bddc
+MISC ChangeLog 2600 SHA256 edcfc96a11cc885fc94b8ebb47b853783fa4965f696cbbd21664c22711f45b6e SHA512 42ca2e9da43c881d3785939de08d57062c2a8ee12975d0cef72ac99d6faf52dd8e941a9cbfb1131be35919c88375dcf80b327d10e1f0fde200dc3c6fe782fd7a WHIRLPOOL 4d509378d0213ea9d82250ea2d41512b341818f895fe78717c55ed394d4918bad268a3bfc90d9f02aa4b92da227cf269a823f347fc52808ead9eb6390e7c59ab
+MISC ChangeLog-2015 1731 SHA256 2cb1c434152ba62a23fa22966efa0787685de3fc4ccf6b850cf9fb801fdc76d9 SHA512 f3e9fa4b828c79f0b3aa3151426f553247dace3b678c8f9b0c48ee2149f4e1f759730b8cf0c33736bd3c1da0ec195cb95bc22027eaf37ee9c9790b188a7d4d6f WHIRLPOOL f8fff39dc38871c08ae9accfc78986363b9c7ea7b01d2a17c20b3449146c0d3f4599f4433b84cf5cff476eafa59cc6bfbcdf1f5c8aae092d1ab695971d36f12b
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
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/Manifest b/app-text/passivetex/Manifest
new file mode 100644
index 000000000000..3c3831f056f6
--- /dev/null
+++ b/app-text/passivetex/Manifest
@@ -0,0 +1,5 @@
+DIST passivetex-1.25.zip 1190258 SHA256 a92669d54ace92b828378fa51f3c7b0faa2e43cf42d7bfbe2506a0a984c1b439 SHA512 083ba4fab9fee327ed3fef5bdc48b415138951432dcb53b1478d1ba16a92bebc1cfc4b8590e2aa647a32c7658124f2aca8160230176c623bbf531e996c43622b WHIRLPOOL 383eec514dbb8ed26b7dd120c07dfe60642a5b0f11df40be83cdc3d0eb76d09e8ec5dfc9f05bd413df45a56f16916c66df694e18eac856c13b34d907a2a2f8a3
+EBUILD passivetex-1.25.ebuild 799 SHA256 94763e9e0568214b255c97db55e96d5a14381ea5d60804f162cfc2b65f0381db SHA512 18f7e865d200377daeafbe3760bd1f1af4cf8cf30147f258fc5be0701efc09a214818fc55684656d9bb435911d40c05a7b50b944bcf81879bb0c0106dcddd0ef WHIRLPOOL 0c550a1167281207fe1bb6ce2c83f2b761237fc94bf6d92bcbb7b17472b70b93324a86b0c24da4bea892486b81a93a80592821190f96f9911e2f1f8bb8739be0
+MISC ChangeLog 2434 SHA256 6f47137e55aec4d5c92dd142f035cb004187532aaa293099a5a04c08db425e5c SHA512 cf15d573f5c03fd0975a5e5087ab679f454872741e07a49f86da36575f437546c9ab9e67bb7b6b8bb614ff2e93ee2e563ab1c14aafa01be180298d0daf5ba402 WHIRLPOOL e6353b61e3a3a443be5521a70fdfc02f94777662282bf191ae1e5a9ad89ccd7377acd6e5107f4f783cb1d3338e764b682a97629d5646cda36f02195abae2068d
+MISC ChangeLog-2015 3981 SHA256 6129401f4bcde9cf91be36aa14e74518ba078f4f1e0d8b4004a755197238fa79 SHA512 acc803a776b6d2bbe307a35f1813f958d17752fc75e418421b42fae7ef3ad5ebcb271a602eedb6cd79d6406a63feeaee97e714bf9f7b5b569da8256358dc0952 WHIRLPOOL 38b4888daa936043459cfdc84493fb321ee125f476847381c9852a96583232eab03090d3878f3b0a762b96726f67c11387ab7569d84aad9ad21042cea1f2d156
+MISC metadata.xml 245 SHA256 b3de478821488be2cdc91b078e21c911dc384af882c5c44631a47dfa91516dc8 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690 WHIRLPOOL 701a78fc2214f5fd4bd781477f85e87e716b8d76ea831a0fa4afc8871c4286cc363679f1ff4f844555ad4f77cc7265208b83e805f56c22fc4baeed1062280c08
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..dbf89e89c207
--- /dev/null
+++ b/app-text/passivetex/passivetex-1.25.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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/Manifest b/app-text/pastebinit/Manifest
new file mode 100644
index 000000000000..00fb78165da0
--- /dev/null
+++ b/app-text/pastebinit/Manifest
@@ -0,0 +1,5 @@
+DIST pastebinit-1.5.tar.bz2 42941 SHA256 42e5a84ce7e46825fb3b6478e11893fad357197327257e474bd0d3549f438457 SHA512 cc4b7c46ab7932be3a1064ce7a1d91da3ebf4b132ad44b0090c8d431bfc68e945357344e59ac1239e37b3178de124930c5c8dc552b42f16c39c0452ac9ab8099 WHIRLPOOL 0d20dd1ab5cb10436fc23fae27f090195400cfcfca1b24b860e27f1e5d38d7341c08ae1c8d7cc747e4127e3c8ae634355f796a6308a5a61671210c9581b22481
+EBUILD pastebinit-1.5.ebuild 1340 SHA256 f32f009c3754dba606934f15e63e7f0bf993fdbd1a7ac267202147849bda0f8a SHA512 7f2cab15367a685f65881271f6860d5569d6d021fe18d66f190dbb9005bd0fb288fa68932586052443ab5457121b7759040d1ee390d52b7616e828c0bdd673e5 WHIRLPOOL d0165e41e5eaf3239ab4d0e7f5dce868b2f74414a5778b08278f786671497d0c14f0e970e65f6d59278fd24e59ca494a5201037da32d915aa26774558b8ceac6
+MISC ChangeLog 3278 SHA256 a6571f9d6a1f3284fe0deab0c32606f00e6372ca12acbb07e7e2a434ccadb869 SHA512 0f7f1e298f7b7ac2796dd3da34f72b9669b4df8754722fbcfe6580be6f1f9a06940c67e7457839455d51241c1faebaac0202e4535479fea4ee8b0cddb40f3fda WHIRLPOOL d32e180ba5906463d81bfb9d78c37126d296b1671c81595e0d3ea491287e8f3c40901a36d3a872e09785ce35c60e6eda37b193b0aad030e110833b6d13cff329
+MISC ChangeLog-2015 1760 SHA256 62cf3a38a86df230064778c80ae052c732729f2ef0dfe4b0ce6767ff955024c5 SHA512 e55b8950c931deefa717f39f6d7d71772f83e934a36448f9bf5337e5cbce22f09f5647ea4c955379f0a13e01da811810f525d1be87f39ced7e132f7d0c2ca264 WHIRLPOOL afa1a90d51ed2b327218dfdf0806959955f2a463904df6fc2f610b752dc37b5d3ce2032bfb31cd843a44751db369bd4158cfd260f93dbf48b2c3bb2f1d8233ab
+MISC metadata.xml 300 SHA256 bba8c08801e22b77c3dcfe761fc04b3f60335314185a2730fe98c16611df87e7 SHA512 7dc26c0febbda314bdcba49514f0222c0cca81d0fc20a0576061b406c1ba388a0d190888b98f61291b4b3e251115c0417ea6a6e2aebae1d32678d182741fb39f WHIRLPOOL cfb5210e91c692076f13da16a6a36d9c1d513c38246a3dd373fb37722f712848c4d8ebe058e21563ec9acb69c0648b8d459625c5f48725b08c9db397cd3d062f
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/Manifest b/app-text/pdf2djvu/Manifest
new file mode 100644
index 000000000000..82dfe30ec050
--- /dev/null
+++ b/app-text/pdf2djvu/Manifest
@@ -0,0 +1,7 @@
+DIST pdf2djvu-0.9.3.tar.xz 239492 SHA256 d05eb7a10e22d18b77113831ac1c6e380c4569e021c39554d5bb54effe4c7077 SHA512 388b76642c354480674b6eee4961792c4ef483313ffd25a6248d1d6302985ac5adfb558ae9241062893a419463c9626d8dac9d08297d66b68a98cebbcc4dc193 WHIRLPOOL 76f5d53c11c921968eaf9f91b4fcf7ff25bd6405b6f92638af4fd38c5931941f6c48f4ba586d0ef3a6f5f8bdcfff68b1681c6429e32c818ffe379bd3a6891bfc
+DIST pdf2djvu-0.9.4.tar.xz 250332 SHA256 c5702283fc6f39e8c0c49c2dc67b95e321dc926199bc77578d3daeef4de62fa8 SHA512 6b97d0577ee6e623d8c877393f551dd2a5e19508e5cd6dc5bb2d3ae1a2b71c2f0ffc7020d85507bc52a25da09a301dd5ddf45ab2628928477e0846707ea57322 WHIRLPOOL 007e1d2a150ca1300d67852ef6ee5e47e0ab36c253d0628438f3a199c42b889613f0aeb8d2ab661555d87bf0b913975ffa65f80fc3d9c5fad475d581d13fb2b6
+EBUILD pdf2djvu-0.9.3.ebuild 1153 SHA256 2a2330887ff966dcce9b2f5e9fa7fb6a588593752890fd1c2184a3e5e636dbd4 SHA512 5524e8d7423c0ab0052a4800bbbfde3092743fc35cc0a9479508ae91c9255b398cada18cd391a62e50ac930e6a854661a61b9794f99ade9b826fbcffdfc7ff7e WHIRLPOOL e88bb928e09afa2fb2fe85cf4a62775682bb2b7da853d2dec9ec4e086b56744e541e39d606fef73cdf05adbbc65027b21f38f7c9272a7cb48e41e5258aa90e12
+EBUILD pdf2djvu-0.9.4.ebuild 1267 SHA256 b114c8a4a594574e3df7960480d1601f5e0c8ddf69276ae9263c4d0865f5845b SHA512 558acd5d80cf329db929f3a47d054d7f083db867bc5e375e3b3e545c320d10e1512550c8f6c6ca42428670ac686f0af1d644f09ae43b54555f0ca6b0e6a1bd57 WHIRLPOOL f6f09b855760e0fefd6f02a0c70b8851f3028d4f39fd1837390977584b1cf57f0e241d8ceb96b51835102200c1a94d6078a325ed08507b5b41b266cbf2459272
+MISC ChangeLog 4363 SHA256 09098e70e75919e46c2827b1acfb740205d94582cd45b2a031f25ffba6f2b5b3 SHA512 921090069750950c51a4ac5a747909053c4108c0b01b0a2120380cf7b6b41b176daea3578bb38159d9195f002d3b2887017fa34cd1ce8127eeb676c543c5c2ca WHIRLPOOL a19fc90333fb4f564891fdd58c2d5b4da7fcb4c7b1b11a91f67535e009f6df6eb3c543c42c0828cc69a9f6d981bfb6c32b8726fe8c473048d78761ca99f7e6fb
+MISC ChangeLog-2015 3966 SHA256 387cfc9608b23ea40a8b32a6c6322a9cb6cf42f293bd8b30fd4d1c17e9401274 SHA512 bf415ed259d95bc792ee9dbe0fba967161c859e014d34bf1fb9d1f2f579e8133b728c2398d91e8b942c4131b61563a36b0c543aebd6912ede11c6525d3362195 WHIRLPOOL 2c29b062f0d4c1f4962c9fbbc835f8a983e6e6043bf3c2b4df74a0717c47fdd1ba2ae53a7ea779c5e4163257d0825c24a02fa8b14f1c6de6194cf99dbaee968b
+MISC metadata.xml 351 SHA256 74773f1472f3515cf5d80670cb0d0e69cdab9fa6b5031d455da24d0383d1787a SHA512 98cfb584785e967dfd11dc82da694ccde0031609c28faca492d2384d6257020ebf8ac264dcb512129f5a681455ce3228b9f443aa2aa99197134ed7957901eb06 WHIRLPOOL f1c3f3c652a4cf497d09df8859f84817746e8e9bbcbbd636661cf18837d24cbc3431e829796232f1599e9e15f55f26cc2c4b3924d2f38c99254c55422c17e1dc
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.3.ebuild b/app-text/pdf2djvu/pdf2djvu-0.9.3.ebuild
new file mode 100644
index 000000000000..af5fbd00e708
--- /dev/null
+++ b/app-text/pdf2djvu/pdf2djvu-0.9.3.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-any-r1 toolchain-funcs
+
+DESCRIPTION="A tool to create DjVu files from PDF files"
+HOMEPAGE="http://jwilk.net/software/pdf2djvu"
+SRC_URI="https://bitbucket.org/jwilk/${PN}/downloads/${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} )"
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_configure() {
+	local openmp=--disable-openmp
+	use openmp && tc-has-openmp && openmp=--enable-openmp
+
+	econf \
+		${openmp} \
+		$(use_enable nls) \
+		$(use_with graphicsmagick)
+}
+
+src_install() {
+	default
+	dodoc doc/{changelog,{cjk,credits,djvudigital}.txt}
+}
diff --git a/app-text/pdf2djvu/pdf2djvu-0.9.4.ebuild b/app-text/pdf2djvu/pdf2djvu-0.9.4.ebuild
new file mode 100644
index 000000000000..d046e0746aa2
--- /dev/null
+++ b/app-text/pdf2djvu/pdf2djvu-0.9.4.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+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://bitbucket.org/jwilk/${PN}/downloads/${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} )"
+
+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)
+}
+
+src_install() {
+	default
+	dodoc doc/{changelog,{cjk,credits,djvudigital}.txt}
+}
diff --git a/app-text/pdf2html/Manifest b/app-text/pdf2html/Manifest
new file mode 100644
index 000000000000..85b0f1ed9ef4
--- /dev/null
+++ b/app-text/pdf2html/Manifest
@@ -0,0 +1,7 @@
+AUX pdf2html-1.4-gentoo.patch 2277 SHA256 c4fb059289ccb1e20a85cf79d91dbe7aaa3feb83fa37bdd70f694191f5aaab26 SHA512 5639f201a04d14347e13e4ff13d3b88c534f614dfaa0dac6494420e71a0c29ccfef83984fbfe4b130d91fa21c97b32f615abb2c875a2b447e48f542ce976ced1 WHIRLPOOL 49d03a363e7c44fff589ef2d1150c9c7de3e9fbbd4085215dc19b92e6a13ec83f78c96bb3955f9fcf278b91749c731e2fd6dc7341ef5d5e2ce111ffa0ee36f09
+AUX pdf2html-1.4-libpng15.patch 218 SHA256 f5e6a9c3682e0d2dbbe39192e1801001fc7b20d1bf54b87d6428c0f2745e9021 SHA512 2a0a80a639432cfdb067872d12c9c6ab9e5239a2f945d0fe362d1abfa4e8d203b377981807c686fccc53ed1afaee0b651345c8cd959f8cf268b5728c4145cb56 WHIRLPOOL e55efb8d02ac0d6aba7894bb6abce45f7495e289cfdac5bb1c9afc23cc6cf2f95f688935a31baded341bf7edf4b6e47662cad4da21d90254829cec433820edf2
+DIST pdf2html-1.4.tgz 22976 SHA256 71ee70c56ec1629442518992e1de743287d7b8799d0aae75e3be8095f7245b61 SHA512 00488c5e6303e1609294e7873c892866d19f3ee820f22f2d75436de22037bf3e4e1a565b7db29df5f6b20a76c5e2df4786e39e1d803cd7cca88274da65c7bbbb WHIRLPOOL b2b85e7bf705fcb1cbeca36d66593342725bcc6cccf699ae443b0150f757ed54ead385c7f7e84302a51d3cc995a3ee066980447d6948518f685edf7236df7d87
+EBUILD pdf2html-1.4.ebuild 1083 SHA256 2adbf25280936bae534ac8eb0cafa82b612e69c9a8f3311215b1600bbcc66724 SHA512 0de389bd8d2c32a4daef3a433a9f336b3f22d0e6c1b1d8c485605b22a251dd99732db0b3994a75a32ac5272ed28b57db099e4b9a5879062b087069a4b907694d WHIRLPOOL 2334dcfe28c329168f1d58526402232028e7c08cb266e57216c0479b521d5a0174dc06ffdf553547f4965869e93c44ac96bc66f2fb569f210439514389df49fe
+MISC ChangeLog 2498 SHA256 bdcef36f1e7fb109be345fb99bcacc2c1665bd0788f3018c089f5eeba13382fc SHA512 d992baa75615b66d71876fe353020b87ab40cb410974a6b3eb1a0a8e2e7fbccca735f8beac7e12d40caed2c153a82db7198b9c4cf85a40e6730942cbcd614f31 WHIRLPOOL a09ce5903c4641d2f2f6b9d4fe60dbbd92b2f58f5cff0de43df9adcb03fa5c883ee5051d281affa33b910c0c54d77847022e7d0e28fcab0cd4f21d01476e70de
+MISC ChangeLog-2015 2452 SHA256 4b2b7241b73a9849981169cc057ba5c7b2578fafbe1c7713e53c974605b23034 SHA512 8dcd2788081977936bdde663d8381bb2a4ca5fb36bfd7f626e29f293040a89c41184cfc0b07ab68ee6e57e7591570df260742bf91b1941304025a37bebb19a66 WHIRLPOOL a67189c08840da4f9b51ab040b24aa2bec73e4652b67e00b1f683648693094e471b910636b59a64df163bea298a358fa6877327fad55eb8e22331b1df5640030
+MISC metadata.xml 245 SHA256 b3de478821488be2cdc91b078e21c911dc384af882c5c44631a47dfa91516dc8 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690 WHIRLPOOL 701a78fc2214f5fd4bd781477f85e87e716b8d76ea831a0fa4afc8871c4286cc363679f1ff4f844555ad4f77cc7265208b83e805f56c22fc4baeed1062280c08
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/Manifest b/app-text/pdf2htmlEX/Manifest
new file mode 100644
index 000000000000..0d522e66862c
--- /dev/null
+++ b/app-text/pdf2htmlEX/Manifest
@@ -0,0 +1,3 @@
+DIST pdf2htmlEX-0.14.6.tgz 8955179 SHA256 320ac2e1c2ea4a2972970f52809d90073ee00a6c42ef6d9833fb48436222f0e5 SHA512 0bef898653755da3d731a99f2850d11a686a1db589c615216c84dcac76f3a3c41f561732fe37be262cfec3f65970b2704819c3bd4d94d87cd63d26f062dacf50 WHIRLPOOL bda12473493b02139480b6f53cdaf87746f445881a974cb862d538603a094da4d459063a5383c44c4d6075f9065ab561cf4c9cdb8c71645d87c732d79126ad9d
+EBUILD pdf2htmlEX-0.14.6.ebuild 559 SHA256 54d9bf598180ac8467d1e66a341dce63a582d0f8788da4469cf717e7d86b050a SHA512 a903ef5c199c68c8eb5243dd1abcedf0bbad5d7b13132ada1affc18a635e27ca1f52b075c2221dd67e5a5a69fbc85d2ab1a1a0fcbf0398e91bb705b3343f0a60 WHIRLPOOL fd97ee3018d9b02d79e71bd06b986b4cff12a4ecd0eefdd7ce819df12abb1975762db9e5219269f14ae2110d75b04390cf144773b3b404be4c59f14655a30e51
+MISC metadata.xml 355 SHA256 f5153f157b30e5693da12bd21cf12ea749e4af4f20400bd411c981ba1c71e109 SHA512 c416fe8d4c3edf1055170e0c4cd84fa9da19437c6eab58fde5198561048018ae6b9387d52017dfbc38db717ef370fc70a1dcc0eb37c8843b4e65cfa7e80314ff WHIRLPOOL fa4fc184122808e64bf8bb75c188d986f0a8e700725d33051ef2dc07070aff7c2ca3411724191d02a3303371b3f397bfe013d1d4c4764e13aeac37d87fad4163
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.ebuild b/app-text/pdf2htmlEX/pdf2htmlEX-0.14.6.ebuild
new file mode 100644
index 000000000000..965311e3a296
--- /dev/null
+++ b/app-text/pdf2htmlEX/pdf2htmlEX-0.14.6.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="A precise PDF to HTML converter"
+HOMEPAGE="http://coolwanglu.github.io/pdf2htmlEX/"
+SRC_URI="https://github.com/coolwanglu/${PN}/archive/v${PV}.tar.gz -> ${P}.tgz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+
+IUSE=""
+
+CDEPEND="
+	app-text/poppler:=[jpeg,png]
+	app-text/poppler-data
+	media-gfx/fontforge
+	media-libs/freetype
+	x11-libs/cairo[svg]
+"
+RDEPEND="${CDEPEND}
+"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig
+"
diff --git a/app-text/pdf2oo/Manifest b/app-text/pdf2oo/Manifest
new file mode 100644
index 000000000000..d3e085b231ee
--- /dev/null
+++ b/app-text/pdf2oo/Manifest
@@ -0,0 +1,5 @@
+DIST pdf2oo-20090715.tar.gz 14765 SHA256 e779e80f5c052dc7d3ccf5baf2dae81353c3f56b376cbd633bbb608979450df8 SHA512 44a933e55f9137d8b02f8deedd3e0af2bbaf7a5d8ba94b3ab3ee32cf2ee331576a871fadb902fbf32ff231200d1e54b2bf8d31cd15005dee7deb5810a804bff5 WHIRLPOOL 36b729a2c395a4fe45eb14aded9628e5b074c790578d72c6a2ac3213ad29f69ab362ac611031d3e82d1f2121d0f60734eab6ef5bf938d26913f8509b3474853d
+EBUILD pdf2oo-20090715-r1.ebuild 467 SHA256 a94b4febfddda0c71d7ac2adbcb034b6adc915d4e6bfa3a603f5d11971b5640f SHA512 e23740f08207b911ab2ba0f4d0c5677d8891f9fb0f73da24a8fc97eec68233bd123e0318f20067cc63cc4aead803b6efa94ed27a531b064cdc68d9262b677228 WHIRLPOOL 32b5341955daa81b567273e7fc0ca3cf348679cbd335f04c098c7610dd2d67257e9a2604b1e892b02f863e15cc87363abe6993169b9cb48396eb1f758acb2ab6
+MISC ChangeLog 2639 SHA256 a5b92b0f5cfc50bcaea488faa251d1878bbea7f221791da483d90a6fcf04a81f SHA512 3153e077de305df0a5a54e2a1f70762615df3e8efe2df290581d55359c9beff47481aa1153c2ab779c09118be7a9e069f6e90cc0e20ccc67947451e09c3ed731 WHIRLPOOL 79079523015e1175bd14aa9983239c178693020e02b52fafa7b36d71e60a9b1f4459ff3ee8d29b92d3754d59fe707ea20a13833b0342cc69e2ba092c402e3319
+MISC ChangeLog-2015 1551 SHA256 8eb72c1a62789c94ab0ea92b4940a96425769b55ff1b33ec8a4232f10fc873c4 SHA512 547fd62b6c90cb6c7314eef5f20d413cf9708ff2003fae3953f5635882fccbfb0fb04b43aa932ad1252d8d3a3355e5f53369e1bea576ea4513a9ff91b011c5d6 WHIRLPOOL 9b3099cec95001dd52abeb13ad128b67d89aa52f20de3be8ead95ee6c2b32caf3f4350de91834aced7c1da61f7768b84ea471f35e9267191fb284c16e56402e6
+MISC metadata.xml 243 SHA256 dc51c177fcb1636e09fe1d4dfd02267defb6975afbc32f69ca8d168632b3fb9d SHA512 291aee3a56aec25ed0cdd95310748d5ba4e45213128dcda8510b9b1803ddb0fedf0764b79240a095eee1679f74b4875da4718210303cf2b6fed6af3d682d8ad3 WHIRLPOOL d15bd0596a356a02d6b8afa9dfdff2f481419c6f3de5449c81451e8918cb6353b0dedd9be0903891b146a06808b47dff34a0fe9f917091a822098a718da0023f
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/Manifest b/app-text/pdfgrep/Manifest
new file mode 100644
index 000000000000..8e9c36bf4040
--- /dev/null
+++ b/app-text/pdfgrep/Manifest
@@ -0,0 +1,7 @@
+DIST pdfgrep-1.4.1.tar.gz 151926 SHA256 db04a210e6bb7b77cd6c54b17f0f6fed0d123a85f97a541b270736a5d3840f2c SHA512 27ce23c25a5f284b3eba92a0f8dbf02600248548967c1e71dfb41e43528824d9add587ea0ac23899ff07d2ffc6c74c2e6e4c2e7240e69494b8d31b7a4afc3735 WHIRLPOOL f08308a13b0b577215521b116db7b4c787b34993665031a690308e45333f35e86419928310b303060cda40aaf4ed5d474400bcee0e29106c9f8c8935d779687e
+DIST pdfgrep-2.0.1.tar.gz 187217 SHA256 0370d744b3072d47383dbed2cb9c8b0b64b83c084da5a8961f8d4bc7669e941e SHA512 4285f8cb514975a0040cdd6b82133090e27ba5c2f95ca880dccc3dd4fa3427260a5fc73d807df9124a79fa36ac6ed8c11380cde11e00599ed7134d92c50df4a0 WHIRLPOOL c13ecf026c640fdb832cc4299c090ae8eab5f29998f6e001accfa97235a7995a62d2644fa2905c80634604f9def022d5e029dd27fb5d849ffdbea5646de25294
+EBUILD pdfgrep-1.4.1-r1.ebuild 607 SHA256 5ed106e58a14aa3a5d05791513d82f63222d3d6d9fea34f9c92778f05ab6b29d SHA512 452781a1574939f7ba9e47b601c67a0897ed7f2f422615cc1bc9bfd98e7d1d90700b2de0132134aba9ea930aded068ad7cb4298b88b4d21da33b2bb5078af91b WHIRLPOOL 3380f829e7d9644ab5bb6ce1b5d87dea345c61e81de1f8eb7f9c47fb6fbf4e10bbd9b76bcac36b772618a085d6ec838c03d170283237a0731c03f65915f19c62
+EBUILD pdfgrep-2.0.1.ebuild 639 SHA256 d46d81375ba4d9597d149e2af7628cf58f81a504e3f80ffec5b62eedc113fc08 SHA512 ad7e531f46569bdf9f59071068b93e197fc4ce3679fa91d1aaf4fd6d19334773b500fe46e659739311c97b56974c9d830732a9e9abf24f87f97017f024c05f96 WHIRLPOOL 60a62257a052ef1db93edaef595731022bfdef4c6180e163727bd92b7a715999d6f8dd7744e845bcc51b3591382e0358cb1ff6f9226075a3ea90a77357a75bb9
+MISC ChangeLog 3707 SHA256 c3171928a259f0ffb7f1dbd65bd1b87a1ed0992296db4cb3fb0ce8d3af66fa5b SHA512 df7219ab3624c930eaf9b4ed6fa5061ea6440414111e01d99cce5f2b84b312077084606f7a5d9be812cba368a6068e766ff803a58ea3639f81f7cf927f2ee865 WHIRLPOOL 110633012b8e11111c7020030282978e22c76b46ceeeabac60daf09ad3eec46ff74cd97fcf8d7ebd15618710a5ffb2413d0b84636e00a56e680c5a961da8a35b
+MISC ChangeLog-2015 1984 SHA256 77160a1cb1b7ee740400743fb1b8159e0ff9174f35597407055544438fcf644a SHA512 d628737d18fb7d731a654f189a0e3d88088e312ad5f911402bc966795b86113893fa87bba001db474e0681c8194c3001c735a6866d2763461977d139ed710d5c WHIRLPOOL b06e7aa450fe591031f1f36cd8af3cbad62c5d1dc15deb3b9d2fef6fc4659018c773e69db62d7c63948b4f17079c14d468d40d97217f6fa230e30c825c1bed9d
+MISC metadata.xml 669 SHA256 08d923af306270248119004fb3b52e244e13e73740fc8ab8bacc27ac51d31227 SHA512 22f8e105bdd34a2e5d0b9b96ddad8f163787b933128924341c511e6902610b5956edba7ae213d5112038943268fa0d4c99c1deea25d629e2038f01585fb35472 WHIRLPOOL beb96f744d63a94ad15cad6509574158a4a3fdc2800c8d890cd18680f969e5fa5da3b36a0dd87bf8e9f99c959ae423879d2c969539265675cb68a9d90afc716f
diff --git a/app-text/pdfgrep/metadata.xml b/app-text/pdfgrep/metadata.xml
new file mode 100644
index 000000000000..d7a6d6a0d0e0
--- /dev/null
+++ b/app-text/pdfgrep/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>jlec@gentoo.org</email>
+		<description>Tree Proxy</description>
+	</maintainer>
+	<maintainer type="person">
+		<email>flo@geekplace.eu</email>
+		<description>Maintainer, CC him on bugs</description>
+	</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..fb916b4566ae
--- /dev/null
+++ b/app-text/pdfgrep/pdfgrep-2.0.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 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/Manifest b/app-text/pdfjam/Manifest
new file mode 100644
index 000000000000..9d22a5952a85
--- /dev/null
+++ b/app-text/pdfjam/Manifest
@@ -0,0 +1,5 @@
+DIST pdfjam_208.tgz 180725 SHA256 c731c598cfad076c985526ff89cbf34423a216101aa5e2d753a71de119ecc0f3 SHA512 728c8d304c6d2af773980d20ef4a4be6e0a5dad286ad8cd00be9b1687f5024e00032a750c10c74dcd24431f081368d02b76f03cc5bb1c8725a060cd70be0fd8c WHIRLPOOL 18ff3ade14664694cc910d7d458f7f573ed32b05055d71d38eab03bb9238af92e03f9af8bb77f636b295b0cc90d68ca7e87a147febbce4036e14bbda0115ee42
+EBUILD pdfjam-2.08.ebuild 619 SHA256 9e5f45c61e19f0486dd96f05f5bfe8d1b5336a009f98c3508a60f008a0dc59d1 SHA512 6c560d9513108af24d959ad7c282e987880b1fe8d4ed8dd0b7a7f59b4050b49481e793cf6dd82c02faf4f8446c4381401764da80c652d866386d6b2152960df2 WHIRLPOOL c4f5d3e49dcdc80c809c92a9b3f5eacd1652ce26474040756c87d78313a32b3d227a2f0195ed5345493353f6d5465d25b782cb11b2e75611e043d3cb201fa870
+MISC ChangeLog 2422 SHA256 9e93650617fc4eca7cec3132e10389a3f980a86e8090d170e2d545d75d52fa8b SHA512 1106dc7a77acd855ccbfa0ac415940c48ae424f7dbbd417a28612fea2cdf2096f241bcade68326217e1b4b186791cbc144e10a58652bd3e118cb507a00d0b739 WHIRLPOOL dfb9615ee47c012c4daff3d89c5ed9c0bd4db65a4ff8d494b507ab00b75b64e723cd3b22fea52e1167647802a0a08c0e7d6d816822d0b25d0ee4aeba81e7ea02
+MISC ChangeLog-2015 5733 SHA256 ab6467ae3bb7120a1b404f85aca4eafa87d340e4fc23da7f5ac8ab68292a5d43 SHA512 52659714c7ff98093bb237c901c109fa7f09f7b1c473db37db609fb9eae9bc278e9b0d85c8126cfeacd96b99fc57d8ff3a024b7dfb00cf4e5adc0dcae32cd124 WHIRLPOOL efc1065d97226f420abe22bf7ff49c1b77674d16a5563e739c5394fefa4c8e4cd6d88f45770a9df43c145ef3113fe98afaec4951c85680dfb8f994e817a90387
+MISC metadata.xml 249 SHA256 1c23b6a75de713ca6f4316742ebb0884fd6cbe80d7b97bcab4f467131a3506f0 SHA512 895325641a176c848988fb5f36cdb567b584d22f6e778b3de674de480cbca30b7cf8f12ecbbe1173a63e3229889e1e0f5efd5afea4f0d4c429ac236598f80f1e WHIRLPOOL 79f461d266db8e176661a5c24527780598eb751a1fbdbc05871a0207ed5b5dde38767357e4e0c5bdad4f609a7e11d7c9ec5c3a404274c83d4a5c3910f9305c1c
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..0924dc583b99
--- /dev/null
+++ b/app-text/pdfjam/pdfjam-2.08.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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/Manifest b/app-text/pdfminer/Manifest
new file mode 100644
index 000000000000..e79c64d008ae
--- /dev/null
+++ b/app-text/pdfminer/Manifest
@@ -0,0 +1,8 @@
+DIST pdfminer-20131113.tar.gz 4080763 SHA256 1016246265f9d48645229164ef44483e9b9a1b3e6902783782f9ae4e1024ea19 SHA512 be598f9ca5cb87fcde91190f72ee77209a6f8ca9db93588c914e6ec666b2a3cc69abedd92ca73a53e714c3660065b7f2c1e9c770e46c838f6d3d489dd637203e WHIRLPOOL 91980937f332332591d31241c558176dcd3cdc5da065fa9e748463d39f582facbef8e64c10155e691bdd938589c6616136c2cd63bf91ad1f54852e116edc5cee
+DIST pdfminer-20140328.tar.gz 4081233 SHA256 ba187b93056586a14edd5e630cf63ae96b1cc84b611f55dcddbc997316d9f262 SHA512 8abb2328f7824ee980df0ce42d758c15534e97379ea9213b4aa1d29864d24d73c9e2d6020964e9ab734c0c6f7d1ae70bccbd6605168eaadf83923718a1f4849a WHIRLPOOL 0f1e5e10936d2a6f02872699812e4b8449875330f1dbb668a15c5a85c94d3cb2cf5cb471fb280159df20fa454344b1256469180cdfb5ec3091df07e49c283264
+EBUILD pdfminer-20131113.ebuild 654 SHA256 e50ab65fbc11532a4a350e8ac51820c63a38c9e58680e1f4db85f69b368ce02d SHA512 17157d7f1821f2b162a77ec935dc115e8fd49d82ded2c94b4ad1a53fabb4a3bba2214bea2134370fab8b8dfbb0d19517c1a3b21c8019624e466e46734183e17b WHIRLPOOL 9372d5abaa96e61d26860525953e4d75b3d3ce4b922e163ce6c6d06f58aeb8e8ee5b763321663f565bcf1e5d3a4df5fe1638d6ca1a88eac4a1293de4876c98bf
+EBUILD pdfminer-20140328-r1.ebuild 695 SHA256 173bfea1db373a54638e2ce92f89cb736679983952d435d6e17dc79b2cbb3153 SHA512 7ec8e958aeb555b89ae096a9b854208488311a2c65a6a128d8d4889f72b90881e2ff5fee18d4d2a8a4816f1ac78c2e6bbc1e9f7414b10a216bb175147ef9e226 WHIRLPOOL f057d2c11f8020addbfce772e1a11b470410484319c321c6985b940cd197c33c38befd98dbfd18063a108d7fd90e1bda0525cb41dab18d0df7b8f254592d388c
+EBUILD pdfminer-20140328.ebuild 657 SHA256 a654e23366ed875843fd0121c37c9e504953deccc29b3b6f51f9dac6c975a4ce SHA512 42f330095f33098b4e32ed7fba0c9f5df5060ce3fd7d929dd5bef5128b945f21988383933f59f57424f1eb0f6d0fb3ccd6a2099a32c0c113957408706804c69a WHIRLPOOL f67263a9b170eccc4963ca59478221ea875d80f6b75fba1a0daf0f2c96377b77c68aedb0ad439f1c8877554bc495119bc27c64598d8f79db2616a97d4ed099fd
+MISC ChangeLog 3124 SHA256 790f3e162ef268b16a935dc9af9b03b7aea0738339300456a0018152f7200093 SHA512 443ffa942894e5365afde4f495f543503b7e9fb9717e01260922aa3b55d79d4abae684b2bb8c5c07627a7b78ae2a460bb0c3b2644d70361080f6ad4226b6dade WHIRLPOOL 24b673093e250e2bc7134512380874c4a027accb711bc398a589c7c905625e40ebfff67bd0464f09ffa0a1972a22f6ea0f01e7807b502ea9a463bfa6a112a0ec
+MISC ChangeLog-2015 1058 SHA256 9251c996745b659c4a5be6acfb5ae0aa382f66f7e808d56db6c462126d82a2c5 SHA512 3615f3084cac863a3f982b4b0ab9f74e05442f8ccafd5a131ead34e82386591915e8b4e227b95d020161b43ce36d1b6c74d8e98666c32464cca4294df738d5b7 WHIRLPOOL 36366ecf4d5d0c71159df3b97ac3f3fddec0df7c14ac62cacf9aec9eb7b9060c43c55ee483ba27c39a352c4bff38d7472aad47a40f00a225cc4eda27860a0684
+MISC metadata.xml 238 SHA256 6bb246401dfad92b93cc5fb0cd41bd2a77d5ae97e862686dbb7c67297328188d SHA512 899f64c55b53cf0a2d38498f0b0070d4707a6eb0289d8138c6757f703909dc2b6a009fee9fe640e5c16adca6f2f953cf445ba6e6b8f5f43d9185ef836a611297 WHIRLPOOL e98fdb62f8f120e0c79ca514b477ea39752a7fda8adfbc39e8e31f62b0b96db0207c8a84a67d666e668832338c5a57cc396695c209349f294583f9c2e09d8b8e
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..2fc6b04b5539
--- /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.python.org/pypi/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..37cc74f89fbd
--- /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.python.org/pypi/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..421a92df759a
--- /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.python.org/pypi/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/Manifest b/app-text/pdfsandwich/Manifest
new file mode 100644
index 000000000000..24a21d1f2596
--- /dev/null
+++ b/app-text/pdfsandwich/Manifest
@@ -0,0 +1,5 @@
+DIST pdfsandwich-0.1.4.tar.bz2 16401 SHA256 8b82f3ae08000c5cae1ff5a0f6537b0b563befef928e5198255b743a46714af3 SHA512 ee03aea13c72cc5a02136b5d16d2425f685f0b7a9d6fa6cff6c792bd24e6316720dff321b5e8237b949c98c713f39cb8b08b855b76e2a77350927b1ee7943171 WHIRLPOOL d8eb5fd281b1eb3f9e371ee71c486b8e839048f3ab569f8b62644e21ad921692283b2d35dfeb07111f86cf52eeb926da4152fcf58124cca2f96aa05116e8e115
+EBUILD pdfsandwich-0.1.4-r1.ebuild 970 SHA256 31e52d93880ab0f86aec47a27b2abd5362b6c7a85ae9a575103b6ec7743ae5ef SHA512 3505739fec5f3d76a7d51c0c9f4f4cf992faa59e23779dfd0ebf677246da0a794ca18af304a5631e7fc0984bd698bfe69f6c3a012389cdc943a543ac0fe4b263 WHIRLPOOL 293f1bbd0ef56e30dc2dc30809dcee8cbbd106a20ac3562dfb77c865f302386ff180d4d9b19156c1fdafd5433904c7e71ff5657e1ce69a86779ee6009407394b
+MISC ChangeLog 2188 SHA256 465634736809ae641d29b66eb22cf8399c51e75d89fe413b05588b34e8d5b3df SHA512 7b3c12835c3517cb6a4f3f8639e06142f5761bf59665ddea8a9159f7b2eb23b49bd845dcae2cbe3394d515aba47c295a600eef28dc1a459b6dc546fd902b9997 WHIRLPOOL 71bcd50831b6902f27910c9a71c74a54d8c7bc56d650b607598aabc29b27320b8c2be9063ae69e6019e718ac4e093cb6ac32676decdf753f5f8bfb8cad9ff44b
+MISC ChangeLog-2015 1879 SHA256 8dc86c03230b063d2eb0d87006c6b0d263fe12e7583b4b810a61abb9d855dc04 SHA512 2badcf204953484ae85ba0ede7dd65008c95d8e1279ccf75260aa0550819213beeb00787709604e38fae4ccba4188f46009670fe3340c16e74aeca881b187ff8 WHIRLPOOL 0e4519e1c97c056c118bc05b683641da069cd8bf32b53e60ef5118a1383fb06b271e3dccc0fef11abd555abe404e74113b2ec0e3db69e7bb93953bfa0f1a3bff
+MISC metadata.xml 937 SHA256 a001b3d2fe61a29e09b9d64972ddd43758ea78195c154993e132a79ca0aeae25 SHA512 595e3fdd841667046ae3064ee12aa288586cb1db3f8cd902aaf5c7c1bfb1c1776c641c400593b273dad83bf4f3a4c98f1f031125b8d65af3e836d6c2abdbc531 WHIRLPOOL bdffa2c49b734e8b72b4070ebceafdc336df67b0e9cf1a21bf82bc5f2d4720a574340044182faf00e8aecf894ce17e8810ebd72bf8d621d43f5daf758f46464a
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/Manifest b/app-text/pdfshuffler/Manifest
new file mode 100644
index 000000000000..359e551eac70
--- /dev/null
+++ b/app-text/pdfshuffler/Manifest
@@ -0,0 +1,6 @@
+AUX pdfshuffler-PyPDF2.patch 701 SHA256 9897bf9c98a9c80064733f1134da9b8989d9a0ed13227fe53bfe5ec268d56479 SHA512 8496ebb9656e1f9e5ee99184a5d8cf0493ebacedc9f936804aedd784930457d39390b577683e77b6b5264ba50f7e2b202404c40ae426ba42b6f612d7ca193433 WHIRLPOOL f315087040800cb569fec4060b9b4d6ed6d9c05b0b01a5cc59744d56d3b558829d90da3887b90ecfee527c7613e2132cee0f792c680c2d746163ea9e0d7a2c1d
+DIST pdfshuffler-0.6.0.tar.gz 48071 SHA256 df3629b5a0ba91fda6b703ddf7b3e6f224a01d5cdfb76a5de77d67615466ef58 SHA512 e2563e9b5faf3ebac56f3840017ad9279a5e8e096c9f44ec053c617894910b1d0531457bc37d8fb9bc1db13ae25b94d55ca0b4ec26fbddeb9e51e6b4d75293fe WHIRLPOOL 72463cd666892af708208fd5816d882d956e3c068744e270775079107ea3b583cb81adc0225fc2e88232df3c74d292056804fff6bf64e707afe17359eaba21a4
+EBUILD pdfshuffler-0.6.0-r1.ebuild 888 SHA256 8368d5e718b9eed1bed77d09bfe7baa36adff1a18cf7982644868d87d639f53f SHA512 0b480e5a2b3675b7d295226535e60f12f398ed2866cc5dfb8d10d274b80cc68438aebf08a2417d1635f65ba691341139524f856def2aef8b150df15ce786eb02 WHIRLPOOL a215aeb53547bf0782b577f73a3f6ab86f808fd8646fedeac641b44fec5f9b647f7427cdc01a78779941f4f045afdda068df485f84bbe910a449e3cbddaf3e16
+MISC ChangeLog 2697 SHA256 aa0ea63dff8595ae0281ebebe8ce27fa7fb509639c6476566ce00168b4e88e3b SHA512 d53d19fbed3c88e03c0694e5f5b974bc482f347e817d32c58f33d99396f04194b7000e92fc57cbf5bf6475c8319e0f1de5b39f8291aadb3bcddba71b4d9cdbd6 WHIRLPOOL 843e73db797a1faf87583828ff08375f7c7e4eedcb7253a3d0ba629e6976850c65e76aac46b21652e0b12ec66da8cc919299c02426f7c356182336de6c88f92c
+MISC ChangeLog-2015 2867 SHA256 66aa256ea9a28986dea6944a7b086c160d37004edf30d53b4cb21073223afa5d SHA512 ec07ea83688d9c1d80a61d1d3bb5b2c58451bc2c7169eb300c550486c8ab1b7a10e74dd986b3be9797f7465a977616eca9689f38971d33aec6c614bb996f693e WHIRLPOOL 37b24e818ab40191efa3eb7d97d13d10bb29faacc5466fbc28dbff4e413fca95fd8c7d7f89f39165fd27cb61e309e08f2d04482b236c45c5a461864a1dd76b16
+MISC metadata.xml 317 SHA256 87ebd2e16d6692f4cfc54f53e8f4403f03045aa504cc916005e45e2a054b6ec5 SHA512 1e710aa1ddf91651f987d6fdf7ae15bb4ad58190c374b72bb9198e19262a4c3e1e4faedc8647a50060e113a32f38994bc0ac8393455b4ceeedf2973e310b7992 WHIRLPOOL 57f49e598de51591a2f77afb392c04da91284c8005091823855878dbe8bc7b8e1641f92d5590d281d1a3b2de5bdd7a04ecfdb067dc0d5927f6ab728c9db7b886
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..f63524e20d40
--- /dev/null
+++ b/app-text/pdfshuffler/pdfshuffler-0.6.0-r1.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 distutils-r1 fdo-mime gnome2-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() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+	gnome2_icon_cache_update
+}
diff --git a/app-text/pdftk/Manifest b/app-text/pdftk/Manifest
new file mode 100644
index 000000000000..4a45ea7f7a0a
--- /dev/null
+++ b/app-text/pdftk/Manifest
@@ -0,0 +1,6 @@
+AUX pdftk-2.02-flags.patch 1922 SHA256 6ba0d9943ac4c1b1dfe623db3eed9555661ffa66ff33446fd00642355cb3413a SHA512 96d2aceda2c98704ee70e55f84bd831ee131153d21a2b6f094ec111a1475cdc5da01434566d1c9aff2de403e55a81b0ae6baeb5d3017cb979662de895ebbf768 WHIRLPOOL ad58aea7d9bfb62d183de0a6747725f8589ba6e87ce6ebfaa4f7528e5514c477f31f517da4985c4eacf2d217821bd564dd9b683ad049fb67891f3a9d510d5920
+DIST pdftk-2.02-src.zip 2239008 SHA256 118f6a25fd3acaafb58824dce6f97cdc07e56050e666b90e4c4ef426ea37b8c1 SHA512 5c73ab3b7b12cfc24a17c2737d224fdde2ae684e1712031a968b83f5b8d91c521d477e932fc47f8b4a8c0ff0ba183678aaa13a1e7b29107c5c47ded8d960ef54 WHIRLPOOL 910ee5f755e7ea46043cece0bd9a6645dc8a503280fd7d86eb2f77d303af0031b5e428cc7222cee23995e6fe5aefd142a610c77ec9969142e841e0f18153e082
+EBUILD pdftk-2.02.ebuild 846 SHA256 81415174944ecf929c7e7ba124f9d5799c3b672dc9858ddc284f655a1a7423f3 SHA512 1727e99131a9cd5fb291fea47b05f94a771eee807f079f5edf894b7954deea5eb0a9539660d3fe78ade13f4b5e37e0920254e955f1c0ba8d2647b33e020273c0 WHIRLPOOL e6d6a266611bfd2f696c96a560a58641da59872e051af7bb80eb37338dc9338f5ad89c58680e8835898f6574d10c3b49fe459b1a28fbd9ec92cf22472ed1d55d
+MISC ChangeLog 2450 SHA256 d2187e5bc3e4e86dfaebd0b4780a2a9dc6c8344735eee97572c646b9b03d84a1 SHA512 bf66bc238ac2449191ab3ba922c7214e227af4ad0e55ee8f1bd8942f87b34ee284feecb647a313458e1044b3934768f93829399ffdf4fc895526d40e4c2fb034 WHIRLPOOL 6f2b4484e9c81b657e831dd2721777e6986794840bf13a2286c07f49bc02020355356cf3eae6c5279942d4ce24edb02e06c7413a820b94ea7c3a19b07cdacf9f
+MISC ChangeLog-2015 7251 SHA256 74e090f894a5181b997f6ae3fba7cf669af62f7155c20a9712ae6709481a858d SHA512 d860d393b3cab23e87544050222801b7440024eb2c437f4d6a704bba8a9d09a861da54cb82be59c8f4753c0adadf93eb1047fb26f5dcf09f9e13e423b6d7506a WHIRLPOOL f6cdf4fec2c6adc54ae61b4f3e47e1d52f811b68ea57876f1892e75207c4f1aed8062864cd78e3e988aa94c385ba5a7eca2ff7348d95d2e73a68d5ae616ac209
+MISC metadata.xml 348 SHA256 727e15437625bd28417595a85989c5629baffa5b48fa642ae2d6ccf469ff7ff5 SHA512 f7031388d3d15f091e5e477bbcc7291b1e2362cc41fb485875e8a4ec81c9b86ee4a8b9ee640eeffe7e2bc17cc90ab417945bd6aca52cf13c85d979774e8a3572 WHIRLPOOL b4445cfebbed931b71b6d390935f02fb0208ce192e5ce6efc477bae4db48968135a031611d3eef0c66f42b3d6d6ae949f8ad7ceadda1b78b9b6c457b1388a142
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..0aa09e4f2ac2
--- /dev/null
+++ b/app-text/pdftk/pdftk-2.02.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 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="http://www.pdflabs.com/tools/pdftk-the-pdf-toolkit/"
+SRC_URI="http://www.pdflabs.com/tools/pdftk-the-pdf-toolkit/${P}-src.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux"
+
+DEPEND="sys-devel/gcc[gcj]"
+RDEPEND="${DEPEND}"
+
+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
+
+	# 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/peg-markdown/Manifest b/app-text/peg-markdown/Manifest
new file mode 100644
index 000000000000..dd88ad73d84e
--- /dev/null
+++ b/app-text/peg-markdown/Manifest
@@ -0,0 +1,5 @@
+DIST peg-markdown-0.4.14.tar.gz 85692 SHA256 111bc56058cfed11890af11bec7419e2f7ccec6b399bf05f8c55dae0a1712980 SHA512 38e43b548b2cedf04fae87baf91c9e0767914bdb617ee4b6a3cbe950f8cbb0717c457cafabcff606501e889ac196a0aef94317f3bf85f5b88a2285f686b6dd5e WHIRLPOOL ae799da2be4d5dde55d73fd841063a88242a6e6cddb1473cda847a32d53a3f75b100937df0b07b1a83bbf995ae9a125bda9ace19809318d56b7eb646aabd781b
+EBUILD peg-markdown-0.4.14.ebuild 922 SHA256 755c649e145177ec072a8a483d2c0f0689ddb2b8956a2a6fb54da7cb4ad08996 SHA512 8a75ea5bc64564d25c0e5ed8ff82c361c5b418b40562aca67352396d004754224c83db88ea9d3065aa52abc19f91a84232e540421eca418b326c5d824ba2c1dc WHIRLPOOL 0f10ae0293467ef2e100be7bf42f959328bf4b387383d1f5d86127145da1c092062b7b6d7d025f2b500a86d1e52e2c422124506e867c7b8832217032651f155e
+MISC ChangeLog 2193 SHA256 ba7ddb2e87ee184774e19d1f71ab2658e3e65546aa225185e14f97ed21d661f0 SHA512 c4d4b5ad692b1de303ad0bda359fc389c20c02479079554783224e74b3dc97c4e48acc3dca04dec6d605be68d528612e4b8b75932c42e8bbb4975331e8fedb2c WHIRLPOOL 93b481ace13b399bfe7c457f6824d70cbd7f0634be609e73b284f7fc81d11e0e725fe498b14285edc354fad9a0bdd062433cc2d5baf1b3f36d4eba67c871e38e
+MISC ChangeLog-2015 590 SHA256 dbf65839017935eeec83fe4e20b16d4e41847ebdba9e81fcf46082d64f80b65f SHA512 401bf6833be98e646b2533d4c3ca6148da743df72b9ae2e7fee6bfcfae6e78ed23b3f3b5bf0a79cd62b1811bfc269ff88ba7c2b562a5d81a2e573f8b2f225ed9 WHIRLPOOL d2e695008939930ab5e87173759c09648357379eb82e20e8c91f1fd7b6e135d4e7a0a1405ed4f1d3a4e22100e092fea6c1793ca0073647777ac6d35639c91233
+MISC metadata.xml 338 SHA256 f02cd711c7c9b5afa8ae16d51ed732d86441ea2b3ee1c16bedcc6a04d3f1323d SHA512 d95bbb5ca89e46c57e21d2bbebedbdbf9a103db6ee3f5ba01155d69c4d4e091a918fc9cd6dc6787918ad11075cb0160a9490a551475fe0100be57a08c8aea838 WHIRLPOOL 043b1fa0178c13e385c9ec1db847e20ebab933a3c312e1d99ce44a00de03071bb8d897d4c3773d929b79ab3a37e8736898b2a860d59321a9d4f903046cb31c4d
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/Manifest b/app-text/pelican/Manifest
new file mode 100644
index 000000000000..0fcdb3711350
--- /dev/null
+++ b/app-text/pelican/Manifest
@@ -0,0 +1,12 @@
+DIST pelican-3.6.0.tar.gz 773887 SHA256 ff0db0e355295d1170988dc6d22388f3681f75accd51d02455638ad18a85c837 SHA512 7c4bcda6155b363d9e0d31d1763f20f9e3a3e9c5cd250ef4ce02305504e910c3ad61b3ae4ab909d1bca51a46102fe59583a6700f5a32a14d0c1cde47507db3d0 WHIRLPOOL 6685061f617f56b36cdb29f303765eace8703229caaae7d680b035a6a38ff7341bf72e06c8f980a8b28f156f429995e3e91c752337bd14fd9641813f63957131
+DIST pelican-3.6.3.tar.gz 775060 SHA256 d19bc7df61afc5b68eba028f0cf0832ee2a12a04a01d7fe11bdfdd847ddd417b SHA512 8bd8fcb72e67955d9c267731f74905417174d0767ec159d9b141e74aaa3cd8ee095270a7cc30847c413c702944df0c0b974ff8e98c55aa5004c00dbc55eadb16 WHIRLPOOL d4f021bba46dddb73159aa21d034b589978a823fed29ab07ad8aac1adf15b94f8f88a813253fedf9fb118e4e3e925bdc86487ddd6ba3427954ca1e184105b2cf
+DIST pelican-3.7.0.tar.gz 784432 SHA256 14a2fa2e366776c0ba44419a7364e3c1c4b36870920c458005584538f49a3f69 SHA512 e4b8a771737a8f6fab109b0f4544229f09141f38210b502f605ae449be7ba12bb43db6637592d2e9060255e923f092c6cfe8dc7bbeec1431d5b625f3a9b8222d WHIRLPOOL f0706d7748327374f524093f543bbd5c58933825a3a682490d54ab09205b989997e4960880864aa565e696f86810ec9275929b66b85cfff3c4f3a269e8b9673d
+DIST pelican-3.7.1.tar.gz 784605 SHA256 81e1c8492d6491b7a637525eda6a0840ee36d2ce11c54233419b3661ce4d5c80 SHA512 9e04e6a2009cc134f74410d8c8349831467192e7524287e23cad0b68232f2b5dd04f5d98505222d71eb3441e466bccec1cafc7f6e3c6bfcb4c5e57e4ab0fadda WHIRLPOOL 99f64656faeee81a6cef10619fe636e60b9ed94457a6d990255ab623024f7b606a73254d03eb397d39ba63d52d75a4f667612f19e4ea893213215c7669701081
+EBUILD pelican-3.6.0.ebuild 1221 SHA256 c8ec7c37a220b5662c984304388f267b990ad6dbd5caafd080c21f3f4f8239b7 SHA512 a09684aa3f6d0ffcbfeb0771112a075727a3804f31c5207c8db3fc581571415e467ea54eb2e8835efacf135badad71e729b5d5054f80f4084c6cfe54d86588b3 WHIRLPOOL 7273e45d1256922f75c10fa7bf87aa683deb7cd0140d99eba76d20bb9bba3741cd36ad0df15a4fc720c61dfc93cdc06e6a7df9e824382c3a424a7aaee37e3454
+EBUILD pelican-3.6.3.ebuild 1544 SHA256 54efff41a5a9cdb8ce752a7b34cea07c23527fa86d55ace3f81b2286cbdd7dbb SHA512 690404e3b343f08ccc6108eb35715b499dc873aebad8fe5bb714f1f14339daf97d80ba7553b22a966699381ea8ae2929280b5497797957a531e589d200b71a4b WHIRLPOOL 68bb10c9611e615ca836e6f11a55d7e5ccc6eaf2abee9f9a53add8aac1511c274a03a23f56f17f4a2d308570bb9ef6ca72dd62a5f5eedb0635cc48e879a4a600
+EBUILD pelican-3.7.0.ebuild 1473 SHA256 b75ec9e4380753256d5277b9da5f4e62f89b8f658f66d4550152af732a456c9b SHA512 c19b2b065fa670ad0be6caad73bff8a981dae5ce5aabac8bb6dd7d7d63ca3306993892428bda66faf53a94a99612e5bfa0a7832c5a55c52477e8dac6ffc9608c WHIRLPOOL 95e38ba4ebe02243b6a165f3c693696fe498904795946701b68dccaca63f15123159028862d8dd700169e431302d580c96b7490a73e7c0e6f436bb0eb94dc74d
+EBUILD pelican-3.7.1.ebuild 1475 SHA256 81f858ef16bd44bc1fb25166702263c95b5b1c889c29883802331ba20121aeef SHA512 9c8b55d9e80b78ce3777452d3a3cac0c6b0f087719242646dcf731fa29bd3d9cc2b50c572c036cb19bb8831da8e03c1fa9bf701375b877e81b7a6cdf9c1ea212 WHIRLPOOL d0b78b4d4fc155c185c45246696e79ee7261028dff8d026bbc4ee909b0218d4bbb04d72c67113fcd434917123c014652a98c9d5e22fd06844f94ccc268a7fa84
+EBUILD pelican-9999.ebuild 1550 SHA256 ee405230d881acd5c9951d29b32142546f15b894e23cd6dc676aa8bb5ea04e74 SHA512 5700c2587e3779f58384b4059f7d743ee203de6e0a22a239f6ed88d45da983f8eaf6e50aaa4579549d1ac600d1b7d24296495ff161f862e4c54eced75713e300 WHIRLPOOL 26a3b0d9b2197780eec73bc473ec7bbe2dcf483af6c9e6f90d5506e7571c77d3b33e2656e363c8af411d3acc9d57ea743099ea7dd2ddbc80c2e57a644d48129f
+MISC ChangeLog 4159 SHA256 fa9cce1f8c7ae9ef3f3cf226b88b6378672f55ee569e9e9815e868b032b59304 SHA512 fd8c0af65f3c1a2a97a013d7896c44bd9f76ff4b3932b30fb19d82cf10c1a3e7e1f08512f43d5b5e96047937292fa4c6c895ec607bbfa851da3a6c748d622a8c WHIRLPOOL 06de6a2b490f342dae10a2e3a0332ee1aca31ebc13abeeabd47010334b1ca5c9ad11df1652e9f50a6b7a8b49494abcc051a5e62abc824c58cf1d790b596087d6
+MISC ChangeLog-2015 3269 SHA256 df6e71eaf03870f43fae904a0e148be3a97d6a80ac9ed42801a829c7a8635d77 SHA512 caba7fe46d8d5b56e48c1d7dd2308d61aa1e061d2f91bf827d0478cbf3f26510d2d4e892643a2964d948238c9d3a3a796a6ef01327a2aff87fd287993289b0d2 WHIRLPOOL 05df1b15583de85909b8c28ba63e7bc02c585ee17694f72a5206a551ab8804bf4cb23d820ee6738e4fbf9d66f25227c2f0efb5861cc2782f6f06893b952c4d1c
+MISC metadata.xml 632 SHA256 d46911d184a0ec183c23c6905ae441a2e072e8a4add6e6e2b49d387cfa5866ea SHA512 4dcf10f729ec1380050cdace0cb9dbb6de9866c22350e5cc0cf03f827b122cebea76299fd0bc405d02f8ee451303d5e8536e2d44c83e15ec8da982849aaceefc WHIRLPOOL 4d74b90625eba7703538cf492596b8b68351e5bf7ae9116d43bcbf5d45a13e116f1439c571321971bfdc02f156141f8b53a7e3932eee02ad8b20286a068a0c4b
diff --git a/app-text/pelican/metadata.xml b/app-text/pelican/metadata.xml
new file mode 100644
index 000000000000..f910bc58fa31
--- /dev/null
+++ b/app-text/pelican/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>djc@gentoo.org</email>
+    <name>Dirkjan Ochtman</name>
+  </maintainer>
+  <maintainer type="person">
+    <email>zlg@gentoo.org</email>
+    <name>Daniel Campbell</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..f4d5dbe81917
--- /dev/null
+++ b/app-text/pelican/pelican-3.6.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2016 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="http://blog.getpelican.com/ https://pypi.python.org/pypi/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..96e0c0b7b937
--- /dev/null
+++ b/app-text/pelican/pelican-3.6.3.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2016 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="http://blog.getpelican.com/ https://pypi.python.org/pypi/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..81ca84e73e89
--- /dev/null
+++ b/app-text/pelican/pelican-3.7.0.ebuild
@@ -0,0 +1,53 @@
+# 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} )
+
+inherit distutils-r1
+
+DESCRIPTION="A tool to generate a static blog, with restructured text or markdown input files"
+HOMEPAGE="http://blog.getpelican.com/ https://pypi.python.org/pypi/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..955134e2669d
--- /dev/null
+++ b/app-text/pelican/pelican-3.7.1.ebuild
@@ -0,0 +1,53 @@
+# 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} )
+
+inherit distutils-r1
+
+DESCRIPTION="A tool to generate a static blog, with restructured text or markdown input files"
+HOMEPAGE="http://blog.getpelican.com/ https://pypi.python.org/pypi/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..d2af18c93768
--- /dev/null
+++ b/app-text/pelican/pelican-9999.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2016 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 git-r3
+
+DESCRIPTION="A tool to generate a static blog, with restructured text or markdown input files"
+HOMEPAGE="http://blog.getpelican.com/ https://pypi.python.org/pypi/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/Manifest b/app-text/pep/Manifest
new file mode 100644
index 000000000000..00f003b01955
--- /dev/null
+++ b/app-text/pep/Manifest
@@ -0,0 +1,7 @@
+AUX pep-2.8-gentoo.patch 494 SHA256 2f9bebf7f3215667cbb6453c2d5766f226582c5149222a3362d89f679a8f7d78 SHA512 5c214a7d6d86ff59f2edf9e77d480414d7a2dbc0ce5f9a96012c6e642f6c0918772558f46c0c2c5e3f6898c7e751438859bae5bb89a900e64e33f1dd53f390e7 WHIRLPOOL 2dc8bd6cd8d35ff941a940a577868d0c813e630620cae011468d04fe55c4df8fea994999c96b5cde72da76ec2ee2de73f9db3088b9d06fb16f11c21bcf42da36
+AUX pep-2.8-include.patch 239 SHA256 e032043ce54de39dcd4b895f68237bae68e5915e0ee929e2b7287f46fac8dc58 SHA512 980ac8e710b2c0213c9ab6cb298274ca3eef21fdf9cd980e62530b98e913784cb5346fc13613b9723eaa6352383d31079d74749e21ac322edde86863344eff80 WHIRLPOOL 065099184704dfee4118e22b2ce8e3b75c466f3234b4fdc8f457869f419bbc8e10756da50680a85f97ba9561e0ee7f5350c04ed892ef752851175439cbb3101d
+DIST pep28.zip 83969 SHA256 108fe13e0038284c7939414687c7efee7af73f73c387048ac574e6196d295af4 SHA512 c987b8f23409475e1882e06a87366a1692a7d859af907b4154715a4caf4475d6c266162ede019b29d65400fe72e115948d26e9c9396d628ea5f35ca472548ec8 WHIRLPOOL 46343ea72b1d5797a217d7e3b8066e4f594460ec2b2409a1fc4099e444d5329e2cd3e6bf867576a45197809fce17512f4ae86bc320720b1d89c0818a04ab43d1
+EBUILD pep-2.8-r1.ebuild 1149 SHA256 c0d7493dd4b5b71f1d3959c1c0f27d6280b6eb6421097e9b939f2d14a6872145 SHA512 b4f5ca5770d0127f20b4b2c6145fa68703c5751df0dfac7739046e823dfd3f5193ecef150804bf59282c1286903d113727f3f30460258d3fea1d9d1116caafe6 WHIRLPOOL e7adbc6a32fb356202e3ee502130e4bf95b5256bc242eaaa5cc2e4c96f2eff01278c245901d273a1c3e13f6752d80297545d0094fb75cccb31770e11790aec6a
+MISC ChangeLog 2573 SHA256 1a91a85c310104f616b9d8b3e05ea45d559a00412b43c7665cfa6482a6753b05 SHA512 9190b57ee28f0572f5ca416beb644541748303be1fad471b3b6421f15b6064e22025889c9e35a40365734f1a28083690283c8356f02b7a12dffe3046ebc40353 WHIRLPOOL c94115e50b1a96e375050eae7c0610d30e01f40c71ff3c46f34bfd77f2adf2c16eb63ce6289e06f6c44a0d223cd8748a20c62f6344710966b5ef222e3937a4f7
+MISC ChangeLog-2015 2966 SHA256 a01296e2f0acbdc0d61ed8e5f94b0175f4558263a4b116da27e539212004ca38 SHA512 2da9b12ff62c28d71ecb0f915036e24f9ffb7980c7e7728942955e59d49ed662fb2fb4b43334b4ae8d112669bd634750991ac22dd8c1d5eb6a9d2302b9098379 WHIRLPOOL 6079ac972143c02d7fb46917903f7bc3dfb867972fbe6f0b91cee88addbca260f4a8e9c928a5658ca8965bc11b0ad8cc974cf31d45043d0398f55a2ace3210f9
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
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/Manifest b/app-text/pinfo/Manifest
new file mode 100644
index 000000000000..d7079081230e
--- /dev/null
+++ b/app-text/pinfo/Manifest
@@ -0,0 +1,17 @@
+AUX pinfo-0.6.10-clearfilenameprefix.patch 278 SHA256 20d728aa624413c08abb6cde3fd7c942799cd73a8c9cd2d10eeadd7a5628a9ac SHA512 6d4b0e19c94011eacdaca85e6a566f296d8e41e89c7687d25e5aa6c3e155f0a51112d59fe9bebafa83144469a1bce85400559812adc7d7ad8990b80712b45906 WHIRLPOOL b89db2f944c660702a90b01bbcaf0c197fa1f354f1e07886244fb6219ea62f4d6b7eb8f8757e6325ead689be710eaf48ab5eb3b4082da967547dde9a134747ec
+AUX pinfo-0.6.10-dir-file.patch 280 SHA256 9d133edb6882a1eb30a74e96976105b32ece189aad4b62070264d2dd0bea48e5 SHA512 bcc16752f2c98b7c013ec1dae84ada89f44d6c00298ed5069b2098674bedcb31bf9e29d3e5c821398518fd59e0fbd84e9141dad2885c55d5a3c76ef728a24b50 WHIRLPOOL 2b23ff84d0a62c48698fd3688176452ea64ac69a4727299f42693a76af52770dcabc84f9f346d392eb3561dec5dac9fdd51a6b2fe5368620fb8e3c55ad089e2d
+AUX pinfo-0.6.10-gettext-0.19.patch 3622 SHA256 cc56673e43bef4284c99fd94b262f38a9898653d6360035bcb906f5e7d587422 SHA512 52e4aaebe829e1d10846dadb96b03d973d8b5fe0c40b5c3c2ee8d107b020dc8efff175018cca81c42cecc2631a4e4efe74c6655c38d2d819db0224d16b15babf WHIRLPOOL 8bccd7c36748b456e4bb031422f62839e6e594c836933dfe40401017b6ff182212d259f1b6f525e16da95d62de9c90af3cf9f5fa10f1000a00938b39ceb9a406
+AUX pinfo-0.6.10-info-suffix.patch 968 SHA256 52f7f5d737a550947175a324980dffe489138f11a52a8614202d669bf54183e4 SHA512 882c80eb6d36f264e20cc532aa1cb00f3a1982b887bd199e4879e4e5845d18cd7a5e01c023ef723290c174a8534bc60060758f31ad7d1dd995f1441a4c496ada WHIRLPOOL 80dd67d9690888e366e8e37078938b4936762609296e41322e4d5afe2291338d9fb2fd04a12ad4af83ed8a2e53ef9e838514e4230e2722cf8ed08626b13dc617
+AUX pinfo-0.6.10-libc-basename.patch 736 SHA256 8d86dc85c86946c24377c3a317e8b86be9e19a33c4f7d89505cf32effa80d895 SHA512 b415aeebca3dc4a4d064781b70908ec70af522928428214e090f23e9ea82cbfde2bab2a08a88ebca88b30daf702b06a934157674bfd8d5f56ee4f973a2732e6e WHIRLPOOL e194b79e6d561de7273c72befd0e7589d9d1068430eac20f65a958c5e777c0e6af9e5822aa65689df1e470f0850535f3251c26a54f0d8a7f24dca1fa07d0ed06
+AUX pinfo-0.6.10-ncurses-check.patch 408 SHA256 4d4deee90c41ee187d1ecebe6d03c59f00f3643086d5e89dbb9274d943a8a490 SHA512 c7ed7036b5e629882129b559cbdeec3ebe1a8f6f72ad91db4b743bbce45ea7f55d49fd4c8884fb424a6df048f52f680d880fb2cba2125367cdbf993222203d30 WHIRLPOOL 35dae9b4d03d06c0e664d003ab58e3cbfc3b460950ea857485378f54e12ade309e03e408ee79d0bdbf3acc677d587b4f328ec506389a2026f184e8e0946d0625
+AUX pinfo-0.6.10-tinfo.patch 944 SHA256 70518777b63c738346f19fcc86855344f316220628a12f2325615019c6f32bd5 SHA512 9a4ff5fdc9a461c205f46e71cd43873270cfa1b4e5d897145bf30e51a0a0ffd350add33ff812a8870272f5e30bb8173c0a30af9fadd9f09ee9916512c106e42c WHIRLPOOL 3899b79bda32ab9c7d08a4135fffa713881640cdb0753c47d6d9c6418fb77c4140a56fcdec31839a944951ae32624b48921bb0ba69a99531c6b449682df83566
+AUX pinfo-0.6.10-version.patch 264 SHA256 cbabed690a4116ec639918e5a15f41ac51264e56923ae931f3b47f9598ee2ac2 SHA512 aa998d5b63d50c844dcfdc6e6419dafab3d31c32e6e6a2e67101d124a5badf0968eb0e52fb46aea8ca2e8ac7e8eed7c4aabbdadffe9e99165d7525d89990625d WHIRLPOOL 6e0e8f5aa4106b967011fadcb85004f91aba6b2c2c00e76e87e4e5721f4c0c0819343aee652d20817c89743167e172cd8db5b9172cf490df88553178a33fc0ca
+AUX pinfo-0.6.9-GROFF_NO_SGR.patch 259 SHA256 4ce70f8db368b69785fe28a9574dd2267a69e33ef6d98922c513080ea860211b SHA512 373eea0e8feca230c14bf658ca5e73698ea16d35b5ca790c46b5bf02a83aaf1d55628183f89666913dfea96ef0f3653789255f8dfd616fe5b3a19be195d46ce6 WHIRLPOOL ad812f647963156a8b4dff867aff7afb3035e16e69422b68a113ff81ffe193e9efa331dfc9bddf4509e8014c1adda23f73a6bb8e4af348793724cf06771b085e
+AUX pinfo-0.6.9-as-needed.patch 457 SHA256 b3e6fa18a7e3a9a1938c44ebd43184983b32adf1df24fd556cb9675b480600de SHA512 c4b23c4f273b35d2594af81ee4bf9aca60cd5208f1c3ab4a084805a63fdecc8bb7f2a7ee6118130ba691e3fa17e79f2671a90b7bc0af7e3cccaf12d2baecfe7f WHIRLPOOL 503e94d4db24a0387a4fdc60f8bf541ec34ae1e19faea5346a38709f641e46d20c05c7974e18fd1c42c2a31a5f328198597560a6478e3125fa960dc960315d3f
+AUX pinfo-0.6.9-lzma-xz.patch 614 SHA256 5c8923ee6dce84a114ad27aefaa2a3ced2a98b971958c56eefdabe26ed0fb804 SHA512 8e3ec8a98347c061826cc913c09fd2177d0f8625947c319b527e85d5ae3dcbf7dafb34b5f4a5e2fc9639bcc4db45afdea7dda6db6a88001e1c6a3994b4847ae4 WHIRLPOOL 62500cf2d5736a3c92ba321c012165df2f37577d3557a088ce414e8c1a613c30fe4640d6ec82f60d9d4c80631a4ef9e50c5803efbb2794e75f41bea98856a254
+DIST pinfo-0.6.10.tar.bz2 133059 SHA256 122180a0c23d11bc9eb569a4de3ff97d3052af96e32466fa62f2daf46ff61c5d SHA512 d3aeb93a668b939a2be7dd397ef5c918a8d108a1a7613ce39d4ef2faafbd549582a35d95c74c1dc74f4c86c9f2bf09b7bca7b5006c5a79302403dd906e8d376e WHIRLPOOL 92878e887f52729a266e99b25ea671f54f0cb5f11680c018bfb92a70de4ff2927ee59cf01e4fddbfe9c78c7c61b8c0dfd6edfcc761a0e6ddb6e751e0e6220047
+EBUILD pinfo-0.6.10-r5.ebuild 1327 SHA256 bb9c97b6c77e8ddbae20b24a8e23f6eba3d62f42078e085cd71993650e9fe2e3 SHA512 f5132c2d41aba6c9cc41076571d70266db613f28ce63c1c3d3b3902c011d3860004cd910280527090b72c97a7735928ae2c3e8f85f96139134bf847d6ec624ba WHIRLPOOL fef46d98e8fba6222360a97a539b71077874c0b766f561bad9215c84ed10473135070c6082e6890a23c6a0d14a684fb53d68e2cce1fed2b1eced12d17b952382
+EBUILD pinfo-0.6.10-r6.ebuild 1373 SHA256 8b3d7d761b039af64b0b1c7704babc06a5e5fdd5be45e2515b36d606eebd6e4b SHA512 2215891f197a9d456afff3ff1b26e15b89f6b1edb66e81936e3f495d1ac83b255f30dbbd1c533642ea0f080c2d4bc2809029eaabe2519a746bcb194167e76ed7 WHIRLPOOL 7a4aab14926e353a5e571ad27a81bbea0b52a7696a973655c6e42c0fba7c07aa1ae2ebe1350606d70897689b8a88de222d2821bf99c042b792e70cf58090c4eb
+MISC ChangeLog 3262 SHA256 ea2badfdeaa85c2e1e343dc03c2418004c2ca663e61d1819926480ca76c66d7f SHA512 8dfd39524930a04bab57fc7c18dd3515fb242517853025a55a88c0215dc492e2e782751da8db6d50b31038365240c4b1b46c4e72da8b11819f22b140ba7e1f68 WHIRLPOOL abfe3115d1138143af094904be3f404a065e795351d33c775c1f83ce3bf6946cdd5f9b57b3dcb74540ee734ac7eb6e097670102ad69a70a4560b0b66871ed5af
+MISC ChangeLog-2015 11320 SHA256 778c497f93c6b8a945262ef9dd04ee8ac23aca8b8bfac9ec524359bfbb2d76b0 SHA512 78c0abc2ccfaeb2d5722084f4a6349b2b170161a8d624c3a84389b95d88e9ca91fcd96c503a4937e84868110e41ed9e0412fdf3559824f6f060df98c99640973 WHIRLPOOL a77bdac63d66118b6bd4f4b1f170a40bf1702c246cd87e35eaecb2595b300bf49f225b4845bc6c5a95a4206016e279cb4da47d451b7f8f799c16ecf6ae023da7
+MISC metadata.xml 214 SHA256 066ee5930f6189098f8f9e16b343a5a1144d3edb4bb5cebfd5096b320967b096 SHA512 6bd18312d33fe28edbaf93fa559dab76a4eb813f37bf3accccd113e111507617827f4423e81f6448edc51245f86c73a5b1d65c0a9310c3aa1d1b910597303fc1 WHIRLPOOL 90d93fa4efb176a2039bbd120ccef48a0652aed82b079c11645923730f790b0831b00d6d7a619eccbc0a53d1538a0896d406ff8002871283c1999856f1e4b52e
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-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..f18ab4f78a9b
--- /dev/null
+++ b/app-text/pinfo/pinfo-0.6.10-r6.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2017 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
+)
+
+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/Manifest b/app-text/po4a/Manifest
new file mode 100644
index 000000000000..c26aefc24a60
--- /dev/null
+++ b/app-text/po4a/Manifest
@@ -0,0 +1,9 @@
+AUX po4a-0.45-614122-no-dot-inc.patch 473 SHA256 16917d4dd4ce620431762f727efd83549276b1b014f8ba40b5600bfb62a9ecd5 SHA512 0a651b9de200b3ca08b3c849f24eba6cfbac93dd5f35911c9bf2aade174cbec27ad2c5a061a628db1b308dc9c576e2dad3db71da9a507d6337bed9ce620ad042 WHIRLPOOL 1f58420fec8361a7db9115dcaf8a3bb7ee3640f230a8349fe5907ae231023afc4962dfabc666cb818456c03b3cb3dd5932cddf23f389361ce44dc3574e04e098
+AUX po4a-0.45-port-our-regex-to-perl-5.22.patch 1779 SHA256 3f6e6ab17bfc62425e64a77dafafffd53a3eef4da4fbdc3eb7408aa8e8c54de4 SHA512 493e80b8ffff96ef4434fe268e96a305246ca5f492f4d24fa01752131aa6f2c88c6b484f7e8c536d268d3de4c0fb7b0b7a920bc2709108f66822b5e64b030576 WHIRLPOOL 2b1f5d8f9b7646c052297e41d241d59236376f9fff8a7a3daca030043c962f467a7af2c786757aac6d421d6bf82b3c619b1846755035fd80a6e26fcfa2b59790
+DIST po4a_0.45.orig.tar.gz 2208959 SHA256 f5f47db85b48893d87d921152c96082233975bd0e0a9ee14f58c07d7dff81678 SHA512 e67334b7a45d3c23b7226077e01e12b3c4f1202531596f02851b6a9e7249b2b8a0c37f37ebbaf591753f041a4c6ce42c062b4822e91ac75884dcd0994c27323f WHIRLPOOL 404bb45412fff4cec13304490e5f74ee4a4573d3c755491816cfe501c3e83dbdb58ae3c799516fe21c692c9de6fbc2dd5a261c8039eca2e2777365b27ac358cd
+DIST po4a_0.47.orig.tar.gz 2389750 SHA256 5010e1b7df1115cbd475f46587fc05fefc97301f9bba0c2f15106005ca017507 SHA512 9c459a9795977a39aacc09cfb6ddbdc7dd2174e22896fa7bde90510a43ea833054aef558f7ca798991addc052a2c7f91ee11e5d49658a5c80a9ecb9c135ff97a WHIRLPOOL f6b52ffd39ebfc3ec71d5719fc7e01260acb4d4525d63209c69cc73aa5d18dec6f06e476d911591c8b6a89ab4d73747221320ae578835f2a2c1fb84c665480ab
+EBUILD po4a-0.45-r3.ebuild 1980 SHA256 e0b955ec1818c33500dd0776b51d4d73402640fd131a475cfd253c0b5f210b1b SHA512 28547b542eb7ddc4125f9d6c1d1cd9efa3f0db8498beffde5ffe0f8ff9bd2223ff2e43d7b8f0d71571f6a91487c3259941cc1b5c217bcb8b01a443093cdde26e WHIRLPOOL a0eda856dba6177b2ec2e1fe7f91b5516026cfcc763fbe1d7ed82a385db33dcef5aa7aa9a14da2d9b5ac8d63a029eba8d60d82b3e33c7ce733e9fb42e9bb3bec
+EBUILD po4a-0.47-r1.ebuild 1665 SHA256 95cafa81f2c63cf4ebe6cd419c6a96c0cbcd42baeb3c62d241fbddcc6289bfbc SHA512 59548632757f68e89e9b672b15cf5f3201ffdc022b912aeeb25dbe18b2a6da7bde8eadd9e079612ee9148034a14063211a0289f2801a2d3746fd70b1e591a141 WHIRLPOOL 69cf4b0b88169a378b0edac681298d388ff7fa584c3715d4a615cef149f5c8cdbec32904912369e3fa67495cf926ea87209bc739e397ab539b6e0d48fb5e9bd6
+MISC ChangeLog 4692 SHA256 4b395e8c30f49560a65fec8c98decf8b498e8a6de6ad02025fbf1c547c74b553 SHA512 eb6a6d0ede014120fb1011498597e23acd63c4e66d9d56ece62f76ebce0cfebbb3fed5f1a97d8ede60fd8be4127ab865dd1831317c35e9b2d65720b375ec9dc8 WHIRLPOOL 956b74de73f69ffb4101cf5b82bac10391b8a68230a90ff55f2f88bcaafc571b9cade9b732a09e10c328812bc292ecee616f2a4c3aa364e3643a4b9c9deb55cf
+MISC ChangeLog-2015 11480 SHA256 9d59f488c56195844ec5e1b5075840236e6226594aa485335c9641f631f97645 SHA512 9ad3252fcf74a5f14151e657cf1af2e8724c3856bf970c8210cab56bdfc3734ea199666897d71769a9745714f7bd632a7349ce20dc111559cc7f848110d62832 WHIRLPOOL ac70db9c4732db13696b08f51f32e77b3817edfa5e1157b89a0d7bb76808ad86f50240312940289c602ea5883e78761cff84b0e9ac223b171db80e4077f66afc
+MISC metadata.xml 359 SHA256 5f050aaa88c70c2c9e277cdd14c9deaf8a5d784562cb983193a5b0478ceb5d9a SHA512 aea1ab25da9b3d9c4b0080912a0260d642f91a4c58c608e7b091fdaaf40aa8bd9c7c0237f2cb90227826c1bda9931ab3d307a42354b5fd3172e07ea676e2f566 WHIRLPOOL c41493c1fca4cc086d0f87c7c023753419870f48aa77dc258d80ecfd1562a668682d72f16a9a40f9970d19e75d1008ad50b33db4a2f2e16b5dffe4784c247f9c
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/files/po4a-0.45-port-our-regex-to-perl-5.22.patch b/app-text/po4a/files/po4a-0.45-port-our-regex-to-perl-5.22.patch
new file mode 100644
index 000000000000..a204d5e97217
--- /dev/null
+++ b/app-text/po4a/files/po4a-0.45-port-our-regex-to-perl-5.22.patch
@@ -0,0 +1,44 @@
+Fix sgml and tex regex against perl-5.22. See Gentoo-bug: 604428.
+Based on a patch from upstream git. Original commit info:
+From 44e5c2f02b3166536257bc9d6384d41dda386648 Mon Sep 17 00:00:00 2001
+From: Martin Quinson <martin.quinson@loria.fr>
+Date: Fri, 28 Aug 2015 19:01:17 +0200
+Subject: [PATCH] Port our regex to Perl 5.22 (patch by Roderich Schupp)
+
+---
+ lib/Locale/Po4a/Sgml.pm | 4 ++--
+ lib/Locale/Po4a/TeX.pm  | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/lib/Locale/Po4a/Sgml.pm b/lib/Locale/Po4a/Sgml.pm
+index 742e003..3ad5e8d 100644
+--- a/lib/Locale/Po4a/Sgml.pm
++++ b/lib/Locale/Po4a/Sgml.pm
+@@ -672,9 +672,9 @@ sub parse_file {
+             }
+         }
+     }
+-    $prolog =~ s/<!--{PO4A-ent-beg-(.*?)}(.*?){PO4A-ent-end}-->/<!ENTITY % $1 SYSTEM "$2">/g;
++    $prolog =~ s/<!--\{PO4A-ent-beg-(.*?)\}(.*?)\{PO4A-ent-end\}-->/<!ENTITY % $1 SYSTEM "$2">/g;
+     # Unprotect undefined inclusions, and die of them
+-    $prolog =~ s/{PO4A-percent}/%/sg;
++    $prolog =~ s/\{PO4A-percent\}/%/sg;
+     if ($prolog =~ /%([^;\s]*);/) {
+         die wrap_mod("po4a::sgml",
+                      dgettext("po4a",
+diff --git a/lib/Locale/Po4a/TeX.pm b/lib/Locale/Po4a/TeX.pm
+index a78f94b..0faa465 100644
+--- a/lib/Locale/Po4a/TeX.pm
++++ b/lib/Locale/Po4a/TeX.pm
+@@ -1168,7 +1168,7 @@ sub parse {
+ #       environment contains an un-closed bracket)
+         if (   ($closed and ($line =~ /^\s*$/ or
+                              $line =~ /^\s*$RE_VERBATIM\s*$/))
+-            or (in_verbatim(@env) and $line =~ /^\s*\Q$ESCAPE\Eend{$env[-1]}\s*$/)
++            or (in_verbatim(@env) and $line =~ /^\s*\Q$ESCAPE\Eend\{$env[-1]\}\s*$/)
+            ) {
+             # An empty line. This indicates the end of the current
+             # paragraph.
+-- 
+2.10.2
+
diff --git a/app-text/po4a/metadata.xml b/app-text/po4a/metadata.xml
new file mode 100644
index 000000000000..4153ed21dbec
--- /dev/null
+++ b/app-text/po4a/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>fatzer2@gmail.com</email>
+	<name>Alexander Golubev</name>
+</maintainer>
+<maintainer type="project">
+	<email>proxy-maint@gentoo.org</email>
+	<name>Proxy Maintainers</name>
+</maintainer>
+</pkgmetadata>
diff --git a/app-text/po4a/po4a-0.45-r3.ebuild b/app-text/po4a/po4a-0.45-r3.ebuild
new file mode 100644
index 000000000000..3523e66bb77e
--- /dev/null
+++ b/app-text/po4a/po4a-0.45-r3.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+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"
+
+# Needed because this package also installs to vendor_perl
+GENTOO_DEPEND_ON_PERL_SUBSLOT="yes"
+inherit perl-app perl-module l10n
+
+DESCRIPTION="Tools for helping translation of documentation"
+HOMEPAGE="http://po4a.alioth.debian.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 )"
+
+SRC_TEST="do"
+
+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"
+
+	# Array containing locale files to remove
+	local locales_to_remove=( )
+
+	# Get rid of disabled locales
+	my_get_disabled_locales() {
+		locales_to_remove=( "${locales_to_remove[@]}" "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"
+	einfo "Removing locale files not listed in it ..."
+
+	# Fix bad escaping of '.' in @INC modification
+	epatch "${FILESDIR}/${P}-614122-no-dot-inc.patch"
+
+	# perl_rm_files also updates the Manifest file
+	# and therefore silences Perl as to .po files we're about to clean
+	perl_rm_files "${locales_to_remove[@]}"
+}
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..f08c52407590
--- /dev/null
+++ b/app-text/po4a/po4a-0.47-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2017 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="http://po4a.alioth.debian.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/Manifest b/app-text/podofo/Manifest
new file mode 100644
index 000000000000..8a7892e57e64
--- /dev/null
+++ b/app-text/podofo/Manifest
@@ -0,0 +1,7 @@
+DIST podofo-0.9.6_pre20170508.tar.xz 919876 SHA256 6a35e08aa22105eeb6b00078b74791da2d4dc0d86189f795315808428efacd17 SHA512 37d8e844ba5763d06d467e316871436e1a63795d66675677d9775cd1bd311f43b241d58e82213a0342ab69a0f5cd80261aad48c4af29c82f7bcc0c14bd242f10 WHIRLPOOL c0ad8baca1f912929d1b2dd2e783340aeeb50965136dcf2699407cb70ca058e20748ee8024739b913a1e2ddb317c72f5aed6074862c4360d339365764ac9c67a
+DIST podofo-0.9.6_pre20170629.tar.xz 919076 SHA256 439c0bffed19275315075d5b0a2728453e7a8bee4480e1f23bca2ee4b02462d0 SHA512 29b0e28131ca9cadf19e5ec43df1c39e146ad8d35ad9f0bfa2dff1138e3448c3be95c6130ef8a19b7ad927b8e0c5a7890485f120d7f7da85e2b434e4a417d9bc WHIRLPOOL b8ecab404679f48ff611e543d375829a636f4026232a83ff2fe3f3ca42f1a5c2a589641d4c09b92b7b078026a6b4d95b172a764089729086f7001d3a4850b272
+EBUILD podofo-0.9.6_pre20170508-r1.ebuild 4568 SHA256 6448aa71687a02888a1899668eda1c7ad25241002c541a1249b0d3fda6adeddb SHA512 0eadda6a9b55c3ae59c97c05913a16e72ffa8a92a9fd493af559fb2ad6ec47f4a63a38b6234262914ad592c3f0c1638baa500f26d0417efa5f7220238e150cf9 WHIRLPOOL 22b58c5d7ec43342fe196c1a83cc29df91fde63192c6ab1ba66f881bf0eeab99742b56eb29b555074219ad9e8df67a5aaaf1c471889628e38a538cfaeecd639e
+EBUILD podofo-0.9.6_pre20170629.ebuild 4572 SHA256 e7017feda1ec4a493cade2a16c47896c6c315fe44bdf0096baf938df3e8fb6fa SHA512 9674acb8f7c2083d016be5d1a2b13b37260fb1f3af01df35b7348f39b75a521e7e268719ba18045265cc7972152576d3dd964631122c7120bc707ed181c34aea WHIRLPOOL 1d3e37b1fdd14c15f4e0a2dc79ba0d2c65e0bac581afd549584c6db0f7e720a3d2b62e5e1b845ca410b1fc889870194d4fc34dc4686c21fb863f8fd906404b0a
+MISC ChangeLog 2797 SHA256 2bbdfd21d3a55ef07a70dc8cd12541154ae04fbf8730517da21521f516a2cd84 SHA512 65aafc3ae675642aa2fbdeace471764dd39a0f9652fd7d11b7323014442663747c335f0fd69e465b53a10d828df80b9e00cdd96c16d0c3bdd6d907a467e36f19 WHIRLPOOL 58fe360d9c9a798c757b8daaa8e159b2959a94730a0a50b16912585b352290dcc83361848fafc6bffe6bf568a9be42a9cf6a06d86e207f3a557873effb46758b
+MISC ChangeLog-2015 6318 SHA256 5889ccb41f137263065fb570314a65cd47716f1e19ca4b33fa0991376e257b16 SHA512 0e2b938cc3a3890f5e6703db04e0de4e9472ef198dd92c48bff69761f7f9455f91b528c1d5aac0384ed6eb69e0a5c5932b3ec30f3a8c926160a4f26fd2045a89 WHIRLPOOL ced1b9d5d0d16cfafde24523293cc56bbeb8646b1cca1555a2d5d410b80ce41b5c692128d04a212ae9c90e0d102984deaac3006bb453a7b4870e72527bf5c08a
+MISC metadata.xml 509 SHA256 5f3cae4a9d1bc05fdb61e1cdf376a8b21575a5745d04b5ea15d49156dfd0cfdc SHA512 ad2bbc4598d80be1fcd4fdbfe0a08bec65795f23e768762dc02be766d82cf1549b6861bd8e96bd72b468674ab1e36ebbead3464dc647378b72a8679fcf422236 WHIRLPOOL 035d533eece1c3c373dbb817c202b8a7e069d7e96046f0d4d945ca79faaf1d3d61b21cb30f40ce7b6d33acfe3f40cb1233cd32e6144f2b36f6202a5d3a995318
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..5c1264949294
--- /dev/null
+++ b/app-text/podofo/podofo-0.9.6_pre20170508-r1.ebuild
@@ -0,0 +1,143 @@
+# 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
+	eapply_user
+}
+
+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_pre20170629.ebuild b/app-text/podofo/podofo-0.9.6_pre20170629.ebuild
new file mode 100644
index 000000000000..fad0b2864e29
--- /dev/null
+++ b/app-text/podofo/podofo-0.9.6_pre20170629.ebuild
@@ -0,0 +1,143 @@
+# 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 )"
+
+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
+	eapply_user
+}
+
+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-data/Manifest b/app-text/poppler-data/Manifest
new file mode 100644
index 000000000000..5e66f6387f95
--- /dev/null
+++ b/app-text/poppler-data/Manifest
@@ -0,0 +1,7 @@
+DIST poppler-data-0.4.7.tar.gz 4182339 SHA256 e752b0d88a7aba54574152143e7bf76436a7ef51977c55d6bd9a48dccde3a7de SHA512 9a865f077f8760a106c6b28302357253c6d63a8f4f10a9506724d1f0ba42e3481bd790ca07e7ee245c63de3650a33c12e80e20e94415a0e37b05225cfe0efce2 WHIRLPOOL 4e939252767112723678fe8771f958eeef6d3fd26224c26ecf54feb2a7a29510d86f183f1b8267fcf56848a24fb6e3e3c4c001145edd9751d953cb882585b827
+DIST poppler-data-0.4.8.tar.gz 4209901 SHA256 1096a18161f263cccdc6d8a2eb5548c41ff8fcf9a3609243f1b6296abdf72872 SHA512 c9435f557ca696fb1e94b6a0b42d401cc911a08f995e3494a7352b47bde5091226f2bb99792ff2b1ee02dfebee66f50f736daca72020a19217ce1c27bde92d54 WHIRLPOOL f161af2815252d2b8f5d1898be8f325d6c68c3d38188f0a8a90b7b8a001a65f202dac2738a42e94dfd42d9623e4e83903fcbb5f2c2b2e1d2b23018d783870f08
+EBUILD poppler-data-0.4.7.ebuild 800 SHA256 3888271054e81ba25f209858eb9923ba549e16f3ca2236de2fe73cdffc9a6189 SHA512 797cd7e233c53b67e89d5cdcb730656903ec7e053801df6b45c74acb683d0a35c4cc31c5d6c499a1b2df22424e1f336776cd1fdab87e57ca268f878e03687f3c WHIRLPOOL 94e71674cec5db5c937a63c34bc3893be655c90d1b0266dede072c43243d3e85b94b1799ae2636aab6f3ba85bcc0d1b5a1eeedce4166f184127f1e9e912b04dd
+EBUILD poppler-data-0.4.8.ebuild 810 SHA256 954567b99078aa4a3a85fe9b2196ffaeb80d6c4c775aee5089176376e8c00849 SHA512 5cfa787630be77dafb333e2f94ce7613df417af7d32ba1a7675529ef9ef66e9226e2d6d2deaff232033503f59919bae98f36ce46ba628877c1d8c054f300faf6 WHIRLPOOL 5439bcfda6bf4a5708783feeb93fd948687de7cf468b60c74f5799d438d1a7c60752c49736a3847ec7917fd0162fdbb63144656c223910a5741affa5e21868fe
+MISC ChangeLog 3238 SHA256 46cb7c4a71d0ef29e3946d038bf081309dac4a96d285197bec0cfabc70457177 SHA512 44dab4677bd30103a6e2b49169da2049652a2fe91d5bcbdfb9949a9c118dc3097eca330cad270b65947501759d66c48a5ef058b6e03fde257ec112eeff978b26 WHIRLPOOL 8a0ff0a19764add5bfb0bf530b6b2f7ade80f40334131c5ac71d316c8d13bc9c8838f16e3191617c5959f606884f57dcce989bf179bd2e6d2cd250331cb882e5
+MISC ChangeLog-2015 10033 SHA256 c8a36759fcf5394a20d0aed904e43ca54c16462c799e4b0106f4b50878c09ac6 SHA512 d24a1ceea52cc980feec93b514447f09c3ee6a0a6b92e35bf3f5db97dce4c9816f274cf751b6597d117429f091f32116b5683fb39923a0b47dfeda74bb2b2f37 WHIRLPOOL 5aaa0dbdc9be03c472340dc4947194653926bef335b0a626b88b3ff66b23f08167378e2ffb70a5d9680eac3d4263c463c3b223b9b7a4bd90fec073945db68c10
+MISC metadata.xml 255 SHA256 369a8c8c92b41e8d46a7225354bd493797b21f0b8b5c3f9ad4ac0a7e14322ebc SHA512 c6c5f966cfbe396fde1b15334442de9e0004b44c4b48775588b0b25a058ad1751252761370c9c254280e97561fa6306f5aa0cc7959c675d4ee11f7f95d777a36 WHIRLPOOL a6043f3549b633ddc8017207016e272af3ca85d175e603a0bfffcad7c5fef4457a01bfe76ceeec5ca09e957dafb78459db4d9cadc6ec99874d5be44ca85e27c0
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..6a70f4a18061
--- /dev/null
+++ b/app-text/poppler-data/poppler-data-0.4.7.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 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 ~sparc-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..05b8cc6dab63
--- /dev/null
+++ b/app-text/poppler-data/poppler-data-0.4.8.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 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 ~sparc-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..d0cc76eee58b
--- /dev/null
+++ b/app-text/poppler/Manifest
@@ -0,0 +1,28 @@
+AUX cairo-qt-experimental/0001-Cairo-backend-added-to-Qt4-wrapper.patch 6045 SHA256 b42f2b4fda5a3c2b92a7cfa19853c4dcee737f43adf4b1423b7d03775a3a2e17 SHA512 c29e75830be3e60a89fbf11ea3e76ccfa598b77bcf7fe89bf6d763fc945947d3b6ea4e1af7998a22e7ed61d71c096024d59d404add0a1493244bbd460f0191cc WHIRLPOOL dd2d2edf8850733b440a15d1b2206dd68c8d4960e429bdd4df1d8967eb37cb5eb03704ca516b632797a4b099e0a805e9cad0181c5186f31a6d5e5de6cd361fb4
+AUX cairo-qt-experimental/0002-Setting-default-Qt4-backend-to-Cairo.patch 762 SHA256 9bf935f7d33fdea10b613d374e184eab159c5bc6125c9a52d3b1588447ce8bac SHA512 680fa980f95dad86eb04605c665a888813bed236b07d2935bd794606cbdd28fb00dd9d3f69197d7a9358b61279f3df55f17f0075a6be0189fe4025f14d80de7c WHIRLPOOL 5dfe89d0baf45b298de77f808fbb0bcad9da03c544556fdc8b533f073f0e323acaab324bef89a50115a60023e39eecf5b9ccfe8b5eb2480d6e5ba35767a27693
+AUX cairo-qt-experimental/0003-Forcing-subpixel-rendering-in-Cairo-backend.patch 1095 SHA256 de6443dd25c0ffcc59c3bc89fc656399479c2c3f9025a27a861d1387b2810e54 SHA512 fe323a7f8c068d13df7764b8cb7f24b35fda0a5948aef200b88ce8adbaaa8870740ab4574f0673a75b4e430df52ae646926e525353919cb5b16bcd0896265c4f WHIRLPOOL d5e6753e08aaf0332cc9575bec120355f376f5d2b94232475d9e8f5ebc7b44638afac1c5c31818b92aa0e67f61bcd65b4a6a14793d6fd0700344cc2ff4bd0a5c
+AUX cairo-qt-experimental/0004-Enabling-slight-hinting-in-Cairo-Backend.patch 1676 SHA256 2dc073e15aa1751dea2234794bb1171c49a6fe2266c55331cf669389e92c8247 SHA512 e31ceb3f66a0f4e948e6008a6802412ba4c2b5cb26a9b1aa10e08f14e8b86aef359fa48133e134c444202ce02966a5ae06d8c7e98199c4fea6fd924ef73a0e28 WHIRLPOOL 351b2313478dadb45d4c33aa1793df647fb00b3cfe292a6ab89d35f21a3b20799fb63986ee7674f885d88f1bc5e1bea847b307ea0ccfe34902510afe0258ee6e
+AUX poppler-0.26.0-qt5-dependencies.patch 1112 SHA256 f32f81e4fa0b39799acc5f4c3b36ffdf9d1674b8da902e14b1ff7e5ea01eec56 SHA512 94353b0c94b9385496074888e04e11e2349a9e1c60131c661bfb4c7df3df3c5c2494761b94b2bd47f8fe69c17aab4ea3c3d0812df6491554085001148d70477b WHIRLPOOL ef6e1b94a0d5f1085723ae3c80684772b4a30ae0628fe69548bb61468df14c17ae16e4a562f4edbd0dd41f28453657e3b17213ee97ba3907e396745b0738fa55
+AUX poppler-0.28.1-fix-multilib-configuration.patch 813 SHA256 c2107ff3bfdbb4176e3febfe9efada4bd5ab2a198ef3ab44688e2e05c1d42a56 SHA512 fc12ae5a484bd231a10bd31860f07d773899ba034cb43f55bc53da7701dc8a3d8ce86885330cdad1a4d32fd8ce712105d3c8b984855857fabd4d4e92bb54dfed WHIRLPOOL b578e6e93595409557af0fb2907f7e022ad73f1561d9e98f8fbbe0e4c5e30c61fd7fa1f1368b504a6a3136799595c0d5213e6ab5db35c85f9664275675069cc1
+AUX poppler-0.28.1-respect-cflags.patch 2733 SHA256 f654924d669cc61ac5be0d3d6075e835ae8b5d5c9c849ad73e86f7996833383d SHA512 f36671cb51cd6c45f2db5fedcae73763b300067f732d8c546d3f0b30af6aa7fcdcfe07e5349d43d93cee0f0a420f85c031b3482ce8bc514a5180e1c968bb465a WHIRLPOOL 53b1ef9d4f052fc0cafaa3a645d11f9a615861d505abec4412721b4a8a9d93c7fa624d8be676f248f81a4d4094826e36ab6c1f2f84577fd54c17be9bc89465b4
+AUX poppler-0.33.0-openjpeg2.patch 667 SHA256 439a6a79440be4777e9f6568eaced07896ef614d6049ee33a22443fdf71916a7 SHA512 7ab16d1a4200a963c2fbae9917445c4536660acfdccc266cf6bd04a16bd329dec12cd0dae9bf26aa9da8e9d7882ffb66876f5bf85095bdb57e1d981a325ad494 WHIRLPOOL e18118ca42e075bc8fcd6f21a336cf0d9719e6b86a1d4017d3eff091a1b194fd538beb43eaece23980083d3293b409223ea9d9ee75c9905fee89507a195c9478
+AUX poppler-0.40-FindQt4.patch 1169 SHA256 2bbf9d7b7b95ac818f9d665797a2a5a539718b314dc7d6cd6d1e9b7b279e7172 SHA512 e7fb511c6b28228f81eee57cc40296657d7bd454faeb3ab7b4e4175c62c78ef8c5ed9f9127b77aefbef28ed04ab234e1fb9faef113ab009733e4c23a540a5b23 WHIRLPOOL 41a2516d255a6754fbb4bc41d4d376ed1655da8037fc3eb70587e3d463613e5fbaf12eca0ab907ec1cecaa66ca48e7afbfe46b4c653b3587587259fea2e63131
+AUX poppler-0.53.0-respect-cflags.patch 2879 SHA256 bd9e3064b77ca827b0cce615922c703464e3d74231ebd33dbf9008ecd7310b71 SHA512 a342a43a36f636d7960038b96b42e6c00f498d2ff3218ba33c50329971be30e7d30342b50ab30828b4c3b80bd69be11af545d60657f8318c4191d0000c9db25e WHIRLPOOL 8a1d60a6085adb91b5b64d992314c3cd80cb3ddae7ca9ee8c72030251b914dd30a086baba2ce217b412870c27f6280b9c4c47bec6c099c789cac51dd32db2536
+AUX poppler-0.59.0-qt5-dependencies.patch 944 SHA256 4fb00d04ca2df0eb6aa20f0704e9c3c25478cf54ba47bbb9ad761f30130e6f45 SHA512 d42d83601968f013d22018e80b2feb9ed275200f5585b2d8724486f22da24ca665a9c279c300cc1bc5b4ab69f6d945ed4044368e1ae1092e87dbe720ab35db8d WHIRLPOOL dde1d5afd870d6f361e57a83d4bcb5b0c58f47d3c52b0dcf7684f293c733c4da1f779e82cbad32dfd532d25f51cbf5ec6b4bd6df600078fe07496f890682a334
+AUX poppler-0.59.0-respect-cflags.patch 2749 SHA256 7cd2f99440c6dd29d2a1395d298e5d17b8c252209328e49cfabccf2287b4f1b4 SHA512 5078957d4b73a8f6bf1f9e4ccf46acabdb3b52cf58b3717dfda23518047648ad371e1aa60b371a72314a2171ec21ed4e0e2162c43876b512d8ca07eafda1702c WHIRLPOOL 78344be54fcfc37f517d0f2ddbe9471be4fc6773776cbb282ca79d669aa5ad9aec8353e78b431ae5e8d8eaaf0f3b22a025112142665aed0515d3ee5390c2a1df
+AUX poppler-0.60.1-qt5-dependencies.patch 934 SHA256 2230542bd9154b2905a2c3f274e55c9817502ceaa14f30a0cd57806137f5d887 SHA512 fc2e3297da9dbbb6ba9377958c08626db44790ec6ba3acdbc1c348d3e909bd7b061fa64995d584d89a42d1bc9cb278827590b303bd1ff57c0557f2bae450b81c WHIRLPOOL dd1ea8dac84c2aef744a412d37146dfd0a39952ab55ea1be5eaf608b49d82e366974335e5ca38ecb3236574e9081c9b189ca7581f26c236fbbcf352529cfd16f
+AUX poppler-0.60.1-respect-cflags.patch 2956 SHA256 0c32d963dd61af1a3c88f0f50268bc08b285638f08cb91df45a6a75452156e1c SHA512 905ba703b71f637946f5adae510034a47cdc6dadb987d3c50de12e6275b53cc7d3f91456a62b4af8ef096592fd19b611888c37c7867ec44cfd82d3b252a4ac43 WHIRLPOOL b90741ed5ec1916f7b7be9a3a5420b103298a2310bd2866f6ed58fafcbce22cef60e692a1187eb56f2093ebf681108dabafd3125c164dd2f5b27af30ce9d8b43
+DIST poppler-0.45.0.tar.xz 1674464 SHA256 96dd1a6024bcdaa4530a3b49687db3d5c24ddfd072ccb37c6de0e42599728798 SHA512 b703bed35da3572801834740bf61d59b6a3ee3b88bc1b3181bde3472264be4f6b89ceacb56179d7093329946abd6ba2501acfaf209d4f543352ff9fd38c47f1b WHIRLPOOL 687b1ba816dbff1b0a69cb05914dd7fb161bfd8c0fa4e26b77bb0ad26e27f7d7d94085a1022716a8d7a7563145f0acead9fccbbd332959d0216b81b27f3632e8
+DIST poppler-0.57.0.tar.xz 1703300 SHA256 0ea37de71b7db78212ebc79df59f99b66409a29c2eac4d882dae9f2397fe44d8 SHA512 197a0bf51e7fd607db83144d771904e48f266ab9e1252c688f9e7700a5bdd239670cf0363e9d77137bafa9c08fb6ddb9d066cc78a74dac7dfd717662b25cac5f WHIRLPOOL fb0c15e4834f23b2956014748f92557de9996b8a2a37cf4a7ba62ca22f01866455a933bcf0412775a8d5a8f6ba1ba463f2fd63e27fa406b5fb5bf1fd25d32000
+DIST poppler-0.58.0.tar.xz 1710412 SHA256 0e42e46419ae54b02d9f2b527c6475b6011d15816918b9057dfa3aae211af832 SHA512 0675846fc99578925840cbb17083463da6ea54f7de348b946ae7d4480d9d87bd4b5069392b23a8b9bbafe0aafafaf5a200134be52d0832558104cb4aa2497aee WHIRLPOOL 658f7dfbb786c2e09558f7e89ef0832db4ff32eaef08b7360fbf468236db01b44e33374424df6b64c17f018d7b10f61e151c08026652628d387958143a5a3837
+DIST poppler-0.59.0.tar.xz 1712004 SHA256 a3d626b24cd14efa9864e12584b22c9c32f51c46417d7c10ca17651f297c9641 SHA512 23777922dc95feee2a4459281081b37e124a39fc25cd00c2c3fc206f5484c13eb9ac5317f674fbbcb51e384f9a53e38b4cacbf1426c68d2bae21a7cefbc48a0e WHIRLPOOL 82ec203c17e2b2544cc0ac12d0b22bb051abf776114d17e1548f47d5e38ff289dee2e9c4b27dc16e3953b6f5b5ff0e0eeecfba73561dbc396ee0db7c5a4847e2
+DIST poppler-0.60.1.tar.xz 1432712 SHA256 19f185e05c3b59b4a1de2cec8ef39f5446035493d17bbed41d02fb9a77c8a93c SHA512 db73524b7413dddee38d5a049f3926338ee123b8fc4893d80ee9cf5aaae47c8c7b75b112293b156cd375894e548ec68e5fbf4af305e77b43bc3868ad1c966cdc WHIRLPOOL fe1fe7a3f0c0bac57c7503ad183fe2e8e2f0378c4dedc0dadbc6dcfaeaf8044bf387256742a970af5ed9e2704e42c35e996957e765eeff1aca4bedcc427ae6a7
+EBUILD poppler-0.45.0.ebuild 4108 SHA256 fb29a6d15775c6029bcd3d2796bb43eac7120e3ac7304ac815714b24c758c903 SHA512 d0baeb8e0db1b7e0faf183b4913457d77a742981814a06cd1f75644b7238cf9f06fceccb9cf1c40f1e56a79a215dc2aab80da099f89fd300106ed383c877253f WHIRLPOOL c82e97dc8ea77ea41d9a224d734abb2a8b1137a6a49f860a8f782c9108bb7c7257338c60734c908009ce1b9b7e64ece124307b3766a67741330e5cdafc96c2eb
+EBUILD poppler-0.57.0.ebuild 3861 SHA256 270e5ac0a32ad32b074cab62d1b103fba784545022b6e8f028d58b5ce11e000e SHA512 e45b9bae903907b99e33e878d5aaee3fda48316914894bd17566a7453a6f84dd1d2009addedd2547cbe4037f31ccc590c33797efca10e989cb3e98f2ac5976d9 WHIRLPOOL b70bf74855823c84f77a36cebb59d4d856096c3fe16527626f7cfef97ef9dd7ec624409c1083de483234407c4a7b2f5ce19903c32641de9325748649eadc4055
+EBUILD poppler-0.58.0.ebuild 3866 SHA256 15b2567ab3f0406649403383c4ed72f8efa4a56a12fa8953dfc2881202782d2a SHA512 bc922423d817ad927ec5c25ec8504c187fd88a634fe03cf7b92d9c75342db7c92f65a1d37dbb134876d73b3f5a6261adc87b31639f642bf634682472b2a85218 WHIRLPOOL cb2c8b25c56519c3f8491084950d5f62205756078fc810e9e920bfe5f884e9abb15e4d0d1eee204699dd3701c8db3021ace8d6ddc21c2a42930d6a990056e59d
+EBUILD poppler-0.59.0.ebuild 3866 SHA256 025009ab5401a66987c0212a6db8e217ad30e0dbc71ef3a428bcee0fde6daaf7 SHA512 c888b97b35099c864d93f34cadec29db3d705648ecb36ec0d21622dbc58e2851eb59a0e32edf86f695b167ec9d89e008aaf4cc2ddfa1e5d702b79f635d667a70 WHIRLPOOL e4cebc30bd49442c22bd83a9c83da6911a9c6923ff42cb0b990831392ed29c33212d17ab8aabaf3a07e4458c0d1b31c9d223a0c99b75186f58a31d634255536f
+EBUILD poppler-0.60.1.ebuild 3861 SHA256 a1c0de6efb508cad5181ddf6fff049677198ec917c8d609b8cfe0ab8d554f651 SHA512 973c61d28678966e7e3282121d0edf27a94680710fafbe3eae8c8a20a2edad72621a4b1ed8831f22fb3c527d85b6f800edb9ec17847b252abdda6e33b88585bb WHIRLPOOL da25c7257a4538fbed96fc656fbae8cd1663ceacac243cb8b8974ccca625598349bcab3bf05583c57d0b01297cb12ece6128eef94d9e8cfe8ae10da6b8f71dcb
+EBUILD poppler-9999.ebuild 3875 SHA256 f3239dd95fc6202eb33521819752dca5d9f26802c4098521cb2cd0a6e329b44d SHA512 43de0b5e351cbdb94e52f9a18a5147f6e627f5552d34b6ffd9b4f1693118d0648ef2893ac50ca6147d716decb5afabfbd1b21afbe9add2116ee655bb40bff01c WHIRLPOOL c3efede6367e4de565bdbe5341132b900fb9e9fd8a7a6c7f0541de6119910b4627ec25221285becd87bce23e528baf543a5fdb7455d917761dcfc103887e8298
+MISC ChangeLog 12583 SHA256 b10bb0674eaf3fb5709ac71f335e1d0b3010cc6465f52c43d0d9f8d80ba327f4 SHA512 92b92d9ca9d028de27ae96ac2de9f2f38b582742d0f6474315e341dc883488632a106232c4763375b93161885276cb4aa0c833712d96e569d2915881877611cf WHIRLPOOL fd51e52ac26587ade05a2548432a914936db4be111871ca8295930b47ee5e3064ad49cffc932ca6258191281b731f084b80186596e4d95d3fb63fc68587168ae
+MISC ChangeLog-2015 64326 SHA256 2d1c6158c2ddf8e667300324ead9d16a38118479df81bbfd17b754e19027b72f SHA512 beba273afefaaa7163bc58e177d7c52ac3e957037bf1616647021a174ea0cd86fc272c6cb8747b81e597e04ec2378591b37e4ca084f231c5ff20d4c9043fd961 WHIRLPOOL 9a7e71e81554411c48d7b6b60a7702c32c2a180f6dcbefc55777d9fb44f728250d08e08873dbc59653a90dc58da453e9d4789fc9a4fb8949d61971672bcf518c
+MISC metadata.xml 999 SHA256 ffe981c4c31df137ec6f6523138ab48e6d6bb60e84e8940e83211bc9415f05af SHA512 c23399b672d336acafa0e4589e44c66e57fcc71f4a4878f7f18672d9d02bae82e50f543c7462b1bb9ce3b08ee4f835997f1f571bbbb75bfbf820d9b31b60542b WHIRLPOOL a16ec5546bb6dc986e8100f316e91b738b1c97d85a0b0648901260792dd3acdd95b2f3271f46e77c0c6837285d5afdf7d65f80c3406cf9dca2d468e95082b19d
diff --git a/app-text/poppler/files/cairo-qt-experimental/0001-Cairo-backend-added-to-Qt4-wrapper.patch b/app-text/poppler/files/cairo-qt-experimental/0001-Cairo-backend-added-to-Qt4-wrapper.patch
new file mode 100644
index 000000000000..2246b29b1340
--- /dev/null
+++ b/app-text/poppler/files/cairo-qt-experimental/0001-Cairo-backend-added-to-Qt4-wrapper.patch
@@ -0,0 +1,199 @@
+From e8fcbaca23878f0edd2015440eec55aaba0e8f9f Mon Sep 17 00:00:00 2001
+From: Paul Gideon Dann <pdgiddie@gmail.com>
+Date: Wed, 20 May 2009 11:42:28 +0100
+Subject: [PATCH 1/4] Cairo backend added to Qt4 wrapper
+
+---
+ qt4/src/CMakeLists.txt      | 15 ++++++++++
+ qt4/src/poppler-document.cc |  3 ++
+ qt4/src/poppler-page.cc     | 70 +++++++++++++++++++++++++++++++++++++++++++++
+ qt4/src/poppler-qt4.h       |  3 +-
+ qt4/tests/CMakeLists.txt    |  5 ++++
+ 5 files changed, 95 insertions(+), 1 deletion(-)
+
+diff --git a/qt4/src/CMakeLists.txt b/qt4/src/CMakeLists.txt
+index 189eca2..5338b55 100644
+--- a/qt4/src/CMakeLists.txt
++++ b/qt4/src/CMakeLists.txt
+@@ -6,6 +6,11 @@ include_directories(
+   ${CMAKE_CURRENT_BINARY_DIR}
+ )
+ 
++if (HAVE_CAIRO)
++  include_directories(${CAIRO_INCLUDE_DIRS})
++  add_definitions(${CAIRO_CFLAGS})
++endif (HAVE_CAIRO)
++
+ set(poppler_qt4_SRCS
+   poppler-annotation.cc
+   poppler-document.cc
+@@ -28,10 +33,20 @@ set(poppler_qt4_SRCS
+   poppler-media.cc
+   ArthurOutputDev.cc
+ )
++if (HAVE_CAIRO)
++  set(poppler_qt4_SRCS ${poppler_qt4_SRCS}
++    ${CMAKE_SOURCE_DIR}/poppler/CairoOutputDev.cc
++    ${CMAKE_SOURCE_DIR}/poppler/CairoRescaleBox.cc
++    ${CMAKE_SOURCE_DIR}/poppler/CairoFontEngine.cc
++  )
++endif(HAVE_CAIRO)
+ qt4_automoc(${poppler_qt4_SRCS})
+ add_library(poppler-qt4 SHARED ${poppler_qt4_SRCS})
+ set_target_properties(poppler-qt4 PROPERTIES VERSION 4.9.0 SOVERSION 4)
+ target_link_libraries(poppler-qt4 poppler ${QT4_QTCORE_LIBRARY} ${QT4_QTGUI_LIBRARY} ${QT4_QTXML_LIBRARY})
++if (HAVE_CAIRO)
++  target_link_libraries(poppler-qt4 ${CAIRO_LIBRARIES})
++endif (HAVE_CAIRO)
+ if(MSVC)
+ target_link_libraries(poppler-qt4 poppler ${poppler_LIBS})
+ endif(MSVC)
+diff --git a/qt4/src/poppler-document.cc b/qt4/src/poppler-document.cc
+index 94f997d..6decaaf 100644
+--- a/qt4/src/poppler-document.cc
++++ b/qt4/src/poppler-document.cc
+@@ -547,6 +547,9 @@ namespace Poppler {
+         ret << Document::SplashBackend;
+ #endif
+         ret << Document::ArthurBackend;
++#if defined(HAVE_CAIRO)
++        ret << Document::CairoBackend;
++#endif
+         return ret;
+     }
+ 
+diff --git a/qt4/src/poppler-page.cc b/qt4/src/poppler-page.cc
+index 83bcf4a..df1d344 100644
+--- a/qt4/src/poppler-page.cc
++++ b/qt4/src/poppler-page.cc
+@@ -40,6 +40,7 @@
+ #include <QtGui/QPainter>
+ 
+ #include <config.h>
++#include <math.h>
+ #include <PDFDoc.h>
+ #include <Catalog.h>
+ #include <Form.h>
+@@ -53,6 +54,9 @@
+ #include <SplashOutputDev.h>
+ #include <splash/SplashBitmap.h>
+ #endif
++#if defined(HAVE_CAIRO)
++#include <CairoOutputDev.h>
++#endif
+ 
+ #include "poppler-private.h"
+ #include "poppler-page-transition-private.h"
+@@ -405,6 +409,70 @@ QImage Page::renderToImage(double xres, double yres, int x, int y, int w, int h,
+       img = tmpimg;
+       break;
+     }
++    case Poppler::Document::CairoBackend:
++    {
++#if defined(HAVE_CAIRO)
++      CairoOutputDev *output_dev = new CairoOutputDev();
++      output_dev->startDoc(m_page->parentDoc->doc);
++      int buffer_width, buffer_height, rotate;
++      cairo_surface_t *surface;
++      cairo_t *cairo;
++
++      // If w or h are -1, that indicates the whole page, so we need to
++      // calculate how many pixels that corresponds to.  Otherwise, we can use w
++      // or h directly for our buffer size.
++      const QSize pageSize = this->pageSize();
++      if (w == -1) {
++        const double xscale = xres / 72.0;
++        const double width = pageSize.width();;
++        buffer_width = (int) ceil(width * xscale);
++      } else {
++        buffer_width = w;
++      }
++      if (h == -1) {
++        const double yscale = yres / 72.0;
++        const double height = pageSize.height();
++        buffer_height = (int) ceil(height * yscale);
++      } else {
++        buffer_height = h;
++      }
++
++      rotate = rotation + m_page->page->getRotate();
++
++      // FIXME: Okular never provides a rotation value, so I don't have any way
++      // of testing this right now.  The result is that subpixels are ordered
++      // incorrectly when the page is rotated.
++
++      //if (rotate == 90 || rotate == 270) {
++      //  const double temp = height;
++      //  height = width;
++      //  width = temp;
++      //}
++
++      img = QImage(buffer_width, buffer_height, QImage::Format_ARGB32);
++      img.fill(Qt::white);  // Never transparent
++
++      surface = cairo_image_surface_create_for_data(
++                  img.bits(),
++                  CAIRO_FORMAT_ARGB32,
++                  buffer_width, buffer_height,
++                  img.bytesPerLine());
++
++      cairo = cairo_create(surface);
++      output_dev->setCairo(cairo);
++
++      m_page->parentDoc->doc->displayPageSlice(
++        output_dev, m_page->index + 1, xres, yres, rotation, false, true,
++        false, x, y, w, h);
++
++      // Clean up
++      output_dev->setCairo(NULL);
++      cairo_destroy(cairo);
++      cairo_surface_destroy(surface);
++      delete output_dev;
++#endif
++      break;
++    }
+   }
+ 
+   return img;
+@@ -447,6 +515,8 @@ bool Page::renderToPainter(QPainter* painter, double xres, double yres, int x, i
+          painter->restore();
+       return true;
+     }
++    case Poppler::Document::CairoBackend:
++      return false;
+   }
+   return false;
+ }
+diff --git a/qt4/src/poppler-qt4.h b/qt4/src/poppler-qt4.h
+index c0340a4..118f8ba 100644
+--- a/qt4/src/poppler-qt4.h
++++ b/qt4/src/poppler-qt4.h
+@@ -886,7 +886,8 @@ delete it;
+ 	*/
+ 	enum RenderBackend {
+ 	    SplashBackend,   ///< Splash backend
+-	    ArthurBackend   ///< Arthur (Qt4) backend
++	    ArthurBackend,   ///< Arthur (Qt4) backend
++	    CairoBackend     ///< Cairo backend
+ 	};
+ 
+ 	/**
+diff --git a/qt4/tests/CMakeLists.txt b/qt4/tests/CMakeLists.txt
+index bba868f..8c40471 100644
+--- a/qt4/tests/CMakeLists.txt
++++ b/qt4/tests/CMakeLists.txt
+@@ -8,6 +8,11 @@ include_directories(
+   ${QT4_INCLUDE_DIR}
+ )
+ 
++if (HAVE_CAIRO)
++  include_directories(${CAIRO_INCLUDE_DIRS})
++  add_definitions(${CAIRO_CFLAGS})
++endif (HAVE_CAIRO)
++
+ macro(QT4_ADD_SIMPLETEST exe source)
+   string(REPLACE "-" "" test_name ${exe})
+   set(${test_name}_SOURCES
+-- 
+2.7.3
+
diff --git a/app-text/poppler/files/cairo-qt-experimental/0002-Setting-default-Qt4-backend-to-Cairo.patch b/app-text/poppler/files/cairo-qt-experimental/0002-Setting-default-Qt4-backend-to-Cairo.patch
new file mode 100644
index 000000000000..3a360394182e
--- /dev/null
+++ b/app-text/poppler/files/cairo-qt-experimental/0002-Setting-default-Qt4-backend-to-Cairo.patch
@@ -0,0 +1,25 @@
+From 7ddcf7bf4296ed58dc316b0dd6b000057740e118 Mon Sep 17 00:00:00 2001
+From: Paul Gideon Dann <pdgiddie@gmail.com>
+Date: Wed, 20 May 2009 13:17:29 +0100
+Subject: [PATCH 2/4] Setting default Qt4 backend to Cairo
+
+---
+ qt4/src/poppler-private.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/qt4/src/poppler-private.cc b/qt4/src/poppler-private.cc
+index cbf21b1..1c7f16c 100644
+--- a/qt4/src/poppler-private.cc
++++ b/qt4/src/poppler-private.cc
+@@ -236,7 +236,7 @@ namespace Debug {
+     void DocumentData::init()
+     {
+         m_fontInfoIterator = 0;
+-        m_backend = Document::SplashBackend;
++        m_backend = Document::CairoBackend;
+         paperColor = Qt::white;
+         m_hints = 0;
+         m_optContentModel = 0;
+-- 
+2.7.3
+
diff --git a/app-text/poppler/files/cairo-qt-experimental/0003-Forcing-subpixel-rendering-in-Cairo-backend.patch b/app-text/poppler/files/cairo-qt-experimental/0003-Forcing-subpixel-rendering-in-Cairo-backend.patch
new file mode 100644
index 000000000000..21547b951802
--- /dev/null
+++ b/app-text/poppler/files/cairo-qt-experimental/0003-Forcing-subpixel-rendering-in-Cairo-backend.patch
@@ -0,0 +1,30 @@
+From a9a6a3fcf4f2bf62e83d325a790624241084ad72 Mon Sep 17 00:00:00 2001
+From: Paul Gideon Dann <pdgiddie@gmail.com>
+Date: Wed, 20 May 2009 13:06:48 +0100
+Subject: [PATCH 3/4] Forcing subpixel rendering in Cairo backend
+
+---
+ poppler/CairoOutputDev.cc | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/poppler/CairoOutputDev.cc b/poppler/CairoOutputDev.cc
+index d0d6cb4..50e64f9 100644
+--- a/poppler/CairoOutputDev.cc
++++ b/poppler/CairoOutputDev.cc
+@@ -203,6 +203,13 @@ void CairoOutputDev::setCairo(cairo_t *cairo)
+   }
+   if (cairo != NULL) {
+     this->cairo = cairo_reference (cairo);
++    {
++      cairo_font_options_t *options = cairo_font_options_create ();
++      cairo_get_font_options (cairo, options);
++      cairo_font_options_set_antialias (options, CAIRO_ANTIALIAS_SUBPIXEL);
++      cairo_set_font_options (cairo, options);
++      cairo_font_options_destroy (options);
++    }
+ 	/* save the initial matrix so that we can use it for type3 fonts. */
+ 	//XXX: is this sufficient? could we miss changes to the matrix somehow?
+ 	cairo_get_matrix(cairo, &orig_matrix);
+-- 
+2.7.3
+
diff --git a/app-text/poppler/files/cairo-qt-experimental/0004-Enabling-slight-hinting-in-Cairo-Backend.patch b/app-text/poppler/files/cairo-qt-experimental/0004-Enabling-slight-hinting-in-Cairo-Backend.patch
new file mode 100644
index 000000000000..0f622323a9f0
--- /dev/null
+++ b/app-text/poppler/files/cairo-qt-experimental/0004-Enabling-slight-hinting-in-Cairo-Backend.patch
@@ -0,0 +1,45 @@
+From 1604ec6cb759b6f2b8aa006faa0ec990cd511b36 Mon Sep 17 00:00:00 2001
+From: Paul Gideon Dann <pdgiddie@gmail.com>
+Date: Thu, 21 May 2009 10:55:49 +0100
+Subject: [PATCH 4/4] Enabling slight hinting in Cairo Backend
+
+Originally suggested at:
+http://bugs.freedesktop.org/show_bug.cgi?id=3307#c20
+---
+ poppler/CairoFontEngine.cc | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/poppler/CairoFontEngine.cc b/poppler/CairoFontEngine.cc
+index 3cff917..75a1c50 100644
+--- a/poppler/CairoFontEngine.cc
++++ b/poppler/CairoFontEngine.cc
+@@ -132,7 +132,7 @@ CairoFont::getSubstitutionCorrection(GfxFont *gfxFont)
+ 	cairo_matrix_t m;
+ 	cairo_matrix_init_identity(&m);
+ 	cairo_font_options_t *options = cairo_font_options_create();
+-	cairo_font_options_set_hint_style(options, CAIRO_HINT_STYLE_NONE);
++	cairo_font_options_set_hint_style(options, CAIRO_HINT_STYLE_SLIGHT);
+ 	cairo_font_options_set_hint_metrics(options, CAIRO_HINT_METRICS_OFF);
+ 	cairo_scaled_font_t *scaled_font = cairo_scaled_font_create(cairo_font_face, &m, &m, options);
+ 
+@@ -189,7 +189,7 @@ _ft_new_face_uncached (FT_Library lib,
+   }
+ 
+   font_face = cairo_ft_font_face_create_for_ft_face (face,
+-							  FT_LOAD_NO_HINTING |
++							  FT_LOAD_TARGET_LIGHT |
+ 							  FT_LOAD_NO_BITMAP);
+   if (cairo_font_face_set_user_data (font_face,
+ 				     &_ft_cairo_key,
+@@ -358,7 +358,7 @@ _ft_new_face (FT_Library lib,
+   _ft_open_faces = l;
+ 
+   l->font_face = cairo_ft_font_face_create_for_ft_face (tmpl.face,
+-							  FT_LOAD_NO_HINTING |
++							  FT_LOAD_TARGET_LIGHT |
+ 							  FT_LOAD_NO_BITMAP);
+   if (cairo_font_face_set_user_data (l->font_face,
+ 				     &_ft_cairo_key,
+-- 
+2.7.3
+
diff --git a/app-text/poppler/files/poppler-0.26.0-qt5-dependencies.patch b/app-text/poppler/files/poppler-0.26.0-qt5-dependencies.patch
new file mode 100644
index 000000000000..bf1effd4377d
--- /dev/null
+++ b/app-text/poppler/files/poppler-0.26.0-qt5-dependencies.patch
@@ -0,0 +1,31 @@
+From 95f6a96e390830233d953f8afa37817499912b35 Mon Sep 17 00:00:00 2001
+From: Johannes Huber <johu@gentoo.org>
+Date: Sat, 10 May 2014 15:00:48 +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 fbafc4e..073f39b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -106,12 +106,10 @@ if(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION} VERSION_
+   find_package(Qt5Core)
+   find_package(Qt5Gui)
+   find_package(Qt5Xml)
+-  find_package(Qt5Widgets)
+-  find_package(Qt5Test)
+-  if (Qt5Core_FOUND AND Qt5Gui_FOUND AND Qt5Xml_FOUND AND Qt5Widgets_FOUND AND Qt5Test_FOUND)
++  if (Qt5Core_FOUND AND Qt5Gui_FOUND AND Qt5Xml_FOUND)
+     set(QT5_FOUND true)
+   else ()
+-    message("-- Package Qt5Core or Qt5Gui or Qt5Xml or Qt5Widgets or Qt5Test not found")
++    message("-- Package Qt5Core or Qt5Gui or Qt5Xml not found")
+     set(QT5_FOUND false)
+   endif()
+ else(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION} VERSION_GREATER 2.8.7)
+-- 
+1.9.2
+
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.28.1-respect-cflags.patch b/app-text/poppler/files/poppler-0.28.1-respect-cflags.patch
new file mode 100644
index 000000000000..0b94042c8af8
--- /dev/null
+++ b/app-text/poppler/files/poppler-0.28.1-respect-cflags.patch
@@ -0,0 +1,48 @@
+diff --git a/cmake/modules/PopplerMacros.cmake b/cmake/modules/PopplerMacros.cmake
+index 6cadf40..7e5e6b2 100644
+--- a/cmake/modules/PopplerMacros.cmake
++++ b/cmake/modules/PopplerMacros.cmake
+@@ -98,41 +98,10 @@ if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
+   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(DEFAULT_COMPILE_WARNINGS_NO)
+   set(DEFAULT_COMPILE_WARNINGS_YES "-Wall -Wcast-align -fno-exceptions -fno-check-new -fno-common")
+   set(DEFAULT_COMPILE_WARNINGS_KDE "-Wno-long-long -Wundef -D_XOPEN_SOURCE=600 -D_BSD_SOURCE -Wcast-align -Wconversion -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-exceptions -fno-check-new -fno-common")
+ 
+-  set(CMAKE_CXX_FLAGS                "-Wnon-virtual-dtor -Woverloaded-virtual ${CMAKE_CXX_FLAGS}")
+-  set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g")
+-  set(CMAKE_CXX_FLAGS_RELEASE        "-O2 -DNDEBUG")
+-  set(CMAKE_CXX_FLAGS_DEBUG          "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline")
+-  set(CMAKE_CXX_FLAGS_DEBUGFULL      "-g3 -fno-inline")
+-  set(CMAKE_CXX_FLAGS_PROFILE        "-g3 -fno-inline -ftest-coverage -fprofile-arcs")
+-  set(CMAKE_C_FLAGS                  "-std=c99")
+-  set(CMAKE_C_FLAGS_RELWITHDEBINFO   "-O2 -g")
+-  set(CMAKE_C_FLAGS_RELEASE          "-O2 -DNDEBUG")
+-  set(CMAKE_C_FLAGS_DEBUG            "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline")
+-  set(CMAKE_C_FLAGS_DEBUGFULL        "-g3 -fno-inline")
+-  set(CMAKE_C_FLAGS_PROFILE          "-g3 -fno-inline -ftest-coverage -fprofile-arcs")
+-
+-  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(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g")
+-  set(CMAKE_CXX_FLAGS_RELEASE        "-O2 -DNDEBUG")
+-  set(CMAKE_CXX_FLAGS_DEBUG          "-O2 -g -0b0 -noalign")
+-  set(CMAKE_CXX_FLAGS_DEBUGFULL      "-g -Ob0 -noalign")
+-  set(CMAKE_C_FLAGS_RELWITHDEBINFO   "-O2 -g")
+-  set(CMAKE_C_FLAGS_RELEASE          "-O2 -DNDEBUG")
+-  set(CMAKE_C_FLAGS_DEBUG            "-O2 -g -Ob0 -noalign")
+-  set(CMAKE_C_FLAGS_DEBUGFULL        "-g -Ob0 -noalign")
+-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")
diff --git a/app-text/poppler/files/poppler-0.33.0-openjpeg2.patch b/app-text/poppler/files/poppler-0.33.0-openjpeg2.patch
new file mode 100644
index 000000000000..af1a72fe9aa8
--- /dev/null
+++ b/app-text/poppler/files/poppler-0.33.0-openjpeg2.patch
@@ -0,0 +1,15 @@
+Sadly the CMake side of openjpeg slotting in Gentoo is broken.
+To reliably find openjpeg:2 we need to use pkg-config.
+
+diff -ruN poppler-0.33.0.orig/CMakeLists.txt poppler-0.33.0/CMakeLists.txt
+--- poppler-0.33.0.orig/CMakeLists.txt	2015-05-14 20:22:31.000000000 +0200
++++ poppler-0.33.0/CMakeLists.txt	2015-05-24 20:39:30.163709257 +0200
+@@ -172,7 +172,7 @@
+   set(USE_OPENJPEG1 ${LIBOPENJPEG_FOUND})
+   set(WITH_OPENJPEG ${LIBOPENJPEG_FOUND})
+ elseif(ENABLE_LIBOPENJPEG STREQUAL "openjpeg2")
+-  find_package(LIBOPENJPEG2)
++  pkg_check_modules(LIBOPENJPEG2 libopenjp2)
+   set(USE_OPENJPEG2 ${LIBOPENJPEG2_FOUND})
+   set(WITH_OPENJPEG ${LIBOPENJPEG2_FOUND})
+ endif()
diff --git a/app-text/poppler/files/poppler-0.40-FindQt4.patch b/app-text/poppler/files/poppler-0.40-FindQt4.patch
new file mode 100644
index 000000000000..84c58d5f7c7f
--- /dev/null
+++ b/app-text/poppler/files/poppler-0.40-FindQt4.patch
@@ -0,0 +1,31 @@
+
+Ensure that the correct version of Qt is always used.
+
+With the introduction qt-4.8.6, Qt binaries were moved from /usr/bin to
+/usr/$(get_libdir)/qt4/bin, leaving behind in their place symlinks to qtchooser.
+
+There is no guarantee to which version of Qt these symlinks might point, so it
+is necessary to find the correct version explicitly.
+
+Once qmake is found, it is queried for the correct location of all other items.
+
+Gentoo-bug: 572382
+
+--- a/cmake/modules/FindQt4.cmake
++++ b/cmake/modules/FindQt4.cmake
+@@ -313,11 +313,10 @@
+ 
+ GET_FILENAME_COMPONENT(qt_install_version "[HKEY_CURRENT_USER\\Software\\trolltech\\Versions;DefaultQtVersion]" NAME)
+ # check for qmake
+-FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake qmake4 qmake-qt4 PATHS
+-  "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\4.0.0;InstallDir]/bin"
+-  "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\4.0.0;InstallDir]/bin"
+-  "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\${qt_install_version};InstallDir]/bin"
+-  $ENV{QTDIR}/bin
++FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake PATHS
++  /usr/${CMAKE_INSTALL_LIBDIR}/qt4/bin
++  /usr/bin
++  NO_DEFAULT_PATH
+ )
+ 
+ IF (QT_QMAKE_EXECUTABLE)
diff --git a/app-text/poppler/files/poppler-0.53.0-respect-cflags.patch b/app-text/poppler/files/poppler-0.53.0-respect-cflags.patch
new file mode 100644
index 000000000000..3fdd9c20382b
--- /dev/null
+++ b/app-text/poppler/files/poppler-0.53.0-respect-cflags.patch
@@ -0,0 +1,52 @@
+diff --git a/cmake/modules/PopplerMacros.cmake b/cmake/modules/PopplerMacros.cmake
+index 8e3ef399..5c20bf63 100644
+--- a/cmake/modules/PopplerMacros.cmake
++++ b/cmake/modules/PopplerMacros.cmake
+@@ -98,45 +98,14 @@ if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
+   set(CMAKE_BUILD_TYPE RelWithDebInfo)
+ endif(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
+ 
+-if(CMAKE_COMPILER_IS_GNUCXX)
+    if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS "5.0.0")
+       set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wsuggest-override" )
+    endif()
+ 
+-  # set the default compile warnings
+   set(DEFAULT_COMPILE_WARNINGS_NO)
+   set(DEFAULT_COMPILE_WARNINGS_YES "-Wall -Wcast-align -fno-exceptions -fno-check-new -fno-common")
+   set(DEFAULT_COMPILE_WARNINGS_KDE "-Wno-long-long -Wundef -D_XOPEN_SOURCE=600 -D_BSD_SOURCE -Wcast-align -Wconversion -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-exceptions -fno-check-new -fno-common")
+ 
+-  set(CMAKE_CXX_FLAGS                "-Wnon-virtual-dtor -Woverloaded-virtual ${CMAKE_CXX_FLAGS}")
+-  set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g")
+-  set(CMAKE_CXX_FLAGS_RELEASE        "-O2 -DNDEBUG")
+-  set(CMAKE_CXX_FLAGS_DEBUG          "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline")
+-  set(CMAKE_CXX_FLAGS_DEBUGFULL      "-g3 -fno-inline")
+-  set(CMAKE_CXX_FLAGS_PROFILE        "-g3 -fno-inline -ftest-coverage -fprofile-arcs")
+-  set(CMAKE_C_FLAGS                  "-std=c99")
+-  set(CMAKE_C_FLAGS_RELWITHDEBINFO   "-O2 -g")
+-  set(CMAKE_C_FLAGS_RELEASE          "-O2 -DNDEBUG")
+-  set(CMAKE_C_FLAGS_DEBUG            "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline")
+-  set(CMAKE_C_FLAGS_DEBUGFULL        "-g3 -fno-inline")
+-  set(CMAKE_C_FLAGS_PROFILE          "-g3 -fno-inline -ftest-coverage -fprofile-arcs")
+-
+-  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(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g")
+-  set(CMAKE_CXX_FLAGS_RELEASE        "-O2 -DNDEBUG")
+-  set(CMAKE_CXX_FLAGS_DEBUG          "-O2 -g -0b0 -noalign")
+-  set(CMAKE_CXX_FLAGS_DEBUGFULL      "-g -Ob0 -noalign")
+-  set(CMAKE_C_FLAGS_RELWITHDEBINFO   "-O2 -g")
+-  set(CMAKE_C_FLAGS_RELEASE          "-O2 -DNDEBUG")
+-  set(CMAKE_C_FLAGS_DEBUG            "-O2 -g -Ob0 -noalign")
+-  set(CMAKE_C_FLAGS_DEBUGFULL        "-g -Ob0 -noalign")
+-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")
diff --git a/app-text/poppler/files/poppler-0.59.0-qt5-dependencies.patch b/app-text/poppler/files/poppler-0.59.0-qt5-dependencies.patch
new file mode 100644
index 000000000000..2bef6945716d
--- /dev/null
+++ b/app-text/poppler/files/poppler-0.59.0-qt5-dependencies.patch
@@ -0,0 +1,31 @@
+From 2f7ca474ec49f805257c75cefb364e08ebd9e4d1 Mon Sep 17 00:00:00 2001
+From: Johannes Huber <johu@gentoo.org>
+Date: Tue, 5 Sep 2017 22:58:44 +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 a5b0a5be..787bd0d6 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -133,12 +133,10 @@ macro_optional_find_package(Qt4)
+ find_package(Qt5Core)
+ find_package(Qt5Gui)
+ find_package(Qt5Xml)
+-find_package(Qt5Widgets)
+-find_package(Qt5Test)
+-if (Qt5Core_FOUND AND Qt5Gui_FOUND AND Qt5Xml_FOUND AND Qt5Widgets_FOUND AND Qt5Test_FOUND)
++if (Qt5Core_FOUND AND Qt5Gui_FOUND AND Qt5Xml_FOUND)
+   set(QT5_FOUND true)
+ else ()
+-  message("-- Package Qt5Core or Qt5Gui or Qt5Xml or Qt5Widgets or Qt5Test not found")
++  message("-- Package Qt5Core or Qt5Gui or Qt5Xml not found")
+   set(QT5_FOUND false)
+ endif()
+ 
+-- 
+2.14.1
+
diff --git a/app-text/poppler/files/poppler-0.59.0-respect-cflags.patch b/app-text/poppler/files/poppler-0.59.0-respect-cflags.patch
new file mode 100644
index 000000000000..ada6ddfc7d75
--- /dev/null
+++ b/app-text/poppler/files/poppler-0.59.0-respect-cflags.patch
@@ -0,0 +1,50 @@
+--- poppler-0.59.0/cmake/modules/PopplerMacros.cmake
++++ poppler-0.59.0/cmake/modules/PopplerMacros.cmake
+@@ -98,45 +98,14 @@
+   set(CMAKE_BUILD_TYPE RelWithDebInfo)
+ endif(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
+ 
+-if(CMAKE_COMPILER_IS_GNUCXX)
+    if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS "5.0.0")
+       set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wsuggest-override" )
+    endif()
+ 
+-  # set the default compile warnings
+   set(DEFAULT_COMPILE_WARNINGS_NO)
+   set(DEFAULT_COMPILE_WARNINGS_YES "-Wall -Wcast-align -fno-exceptions -fno-check-new -fno-common")
+   set(DEFAULT_COMPILE_WARNINGS_KDE "-Wno-long-long -Wundef -D_XOPEN_SOURCE=600 -D_BSD_SOURCE -Wcast-align -Wconversion -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-exceptions -fno-check-new -fno-common")
+ 
+-  set(CMAKE_CXX_FLAGS                "-Wnon-virtual-dtor -Woverloaded-virtual -D_DEFAULT_SOURCE ${CMAKE_CXX_FLAGS}")
+-  set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g")
+-  set(CMAKE_CXX_FLAGS_RELEASE        "-O2 -DNDEBUG")
+-  set(CMAKE_CXX_FLAGS_DEBUG          "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline")
+-  set(CMAKE_CXX_FLAGS_DEBUGFULL      "-g3 -fno-inline")
+-  set(CMAKE_CXX_FLAGS_PROFILE        "-g3 -fno-inline -ftest-coverage -fprofile-arcs")
+-  set(CMAKE_C_FLAGS                  "-std=c99")
+-  set(CMAKE_C_FLAGS_RELWITHDEBINFO   "-O2 -g")
+-  set(CMAKE_C_FLAGS_RELEASE          "-O2 -DNDEBUG")
+-  set(CMAKE_C_FLAGS_DEBUG            "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline")
+-  set(CMAKE_C_FLAGS_DEBUGFULL        "-g3 -fno-inline")
+-  set(CMAKE_C_FLAGS_PROFILE          "-g3 -fno-inline -ftest-coverage -fprofile-arcs")
+-
+-  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(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g")
+-  set(CMAKE_CXX_FLAGS_RELEASE        "-O2 -DNDEBUG")
+-  set(CMAKE_CXX_FLAGS_DEBUG          "-O2 -g -0b0 -noalign")
+-  set(CMAKE_CXX_FLAGS_DEBUGFULL      "-g -Ob0 -noalign")
+-  set(CMAKE_C_FLAGS_RELWITHDEBINFO   "-O2 -g")
+-  set(CMAKE_C_FLAGS_RELEASE          "-O2 -DNDEBUG")
+-  set(CMAKE_C_FLAGS_DEBUG            "-O2 -g -Ob0 -noalign")
+-  set(CMAKE_C_FLAGS_DEBUGFULL        "-g -Ob0 -noalign")
+-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")
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.60.1-respect-cflags.patch b/app-text/poppler/files/poppler-0.60.1-respect-cflags.patch
new file mode 100644
index 000000000000..4e1df0d62c68
--- /dev/null
+++ b/app-text/poppler/files/poppler-0.60.1-respect-cflags.patch
@@ -0,0 +1,53 @@
+--- poppler-0.60.1/cmake/modules/PopplerMacros.cmake
++++ poppler-0.60.1/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")
+-  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")
diff --git a/app-text/poppler/metadata.xml b/app-text/poppler/metadata.xml
new file mode 100644
index 000000000000..40c1c894b848
--- /dev/null
+++ b/app-text/poppler/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="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>
+	<flag name="cairo-qt">Enable experimental Cairo font rasterizer for Qt4 backend.</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.45.0.ebuild b/app-text/poppler/poppler-0.45.0.ebuild
new file mode 100644
index 000000000000..ad745e69149c
--- /dev/null
+++ b/app-text/poppler/poppler-0.45.0.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils 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 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	SLOT="0/62"   # 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 cairo-qt cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt4 qt5 tiff +utils"
+
+REQUIRED_USE="cairo-qt? ( qt4 )"
+
+# 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:= )
+	)
+	cairo-qt? ( >=x11-libs/cairo-1.10.0 )
+	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= )
+	qt4? (
+		dev-qt/qtcore:4
+		dev-qt/qtgui:4
+	)
+	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 TODO)
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.26.0-qt5-dependencies.patch"
+	"${FILESDIR}/${PN}-0.28.1-fix-multilib-configuration.patch"
+	"${FILESDIR}/${PN}-0.28.1-respect-cflags.patch"
+	"${FILESDIR}/${PN}-0.33.0-openjpeg2.patch"
+	"${FILESDIR}/${PN}-0.40-FindQt4.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
+
+	# Enable experimental patchset for subpixel font rendering using cairo
+	# backend for poppler-qt4 from https://github.com/giddie/poppler-qt4-cairo-backend.
+	if use cairo-qt; then
+		ewarn "Enabling unsupported, experimental cairo-qt patchset. Please do not report bugs."
+		epatch "${FILESDIR}/cairo-qt-experimental/0001-Cairo-backend-added-to-Qt4-wrapper.patch"
+		epatch "${FILESDIR}/cairo-qt-experimental/0002-Setting-default-Qt4-backend-to-Cairo.patch"
+		epatch "${FILESDIR}/cairo-qt-experimental/0003-Forcing-subpixel-rendering-in-Cairo-backend.patch"
+		epatch "${FILESDIR}/cairo-qt-experimental/0004-Enabling-slight-hinting-in-Cairo-Backend.patch"
+	fi
+}
+
+src_configure() {
+	xdg_environment_reset
+	local mycmakeargs=(
+		-DBUILD_GTK_TESTS=OFF
+		-DBUILD_QT4_TESTS=OFF
+		-DBUILD_QT5_TESTS=OFF
+		-DBUILD_CPP_TESTS=OFF
+		-DENABLE_SPLASH=ON
+		-DENABLE_ZLIB=ON
+		-DENABLE_ZLIB_UNCOMPRESS=OFF
+		-DENABLE_XPDF_HEADERS=ON
+		-DENABLE_LIBCURL="$(usex curl)"
+		-DENABLE_CPP="$(usex cxx)"
+		-DENABLE_UTILS="$(usex utils)"
+		-DSPLASH_CMYK=OFF
+		-DUSE_FIXEDPOINT=OFF
+		-DUSE_FLOAT=OFF
+		-DWITH_Cairo="$(usex cairo)"
+		-DWITH_GObjectIntrospection="$(usex introspection)"
+		-DWITH_JPEG="$(usex jpeg)"
+		-DWITH_NSS3="$(usex nss)"
+		-DWITH_PNG="$(usex png)"
+		-DWITH_Qt4="$(usex qt4)"
+		$(cmake-utils_use_find_package qt5 Qt5Core)
+		-DWITH_TIFF="$(usex tiff)"
+	)
+	if use jpeg2k; then
+		mycmakeargs+=(-DENABLE_LIBOPENJPEG=openjpeg2)
+	else
+		mycmakeargs+=(-DENABLE_LIBOPENJPEG=)
+	fi
+	if use lcms; then
+		mycmakeargs+=(-DENABLE_CMS=lcms2)
+	else
+		mycmakeargs+=(-DENABLE_CMS=)
+	fi
+
+	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.57.0.ebuild b/app-text/poppler/poppler-0.57.0.ebuild
new file mode 100644
index 000000000000..4f93e5af5dab
--- /dev/null
+++ b/app-text/poppler/poppler-0.57.0.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils 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 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	SLOT="0/68"   # 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 qt4 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= )
+	qt4? (
+		dev-qt/qtcore:4
+		dev-qt/qtgui:4
+	)
+	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 TODO)
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.26.0-qt5-dependencies.patch"
+	"${FILESDIR}/${PN}-0.28.1-fix-multilib-configuration.patch"
+	"${FILESDIR}/${PN}-0.53.0-respect-cflags.patch"
+	"${FILESDIR}/${PN}-0.33.0-openjpeg2.patch"
+	"${FILESDIR}/${PN}-0.40-FindQt4.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
+
+	if tc-is-clang && [[ ${CHOST} == *-darwin* ]] ; then
+		# we need to up the C++ version, bug #622526
+		export CXX="$(tc-getCXX) -std=c++11"
+	fi
+}
+
+src_configure() {
+	xdg_environment_reset
+	local mycmakeargs=(
+		-DBUILD_GTK_TESTS=OFF
+		-DBUILD_QT4_TESTS=OFF
+		-DBUILD_QT5_TESTS=OFF
+		-DBUILD_CPP_TESTS=OFF
+		-DENABLE_SPLASH=ON
+		-DENABLE_ZLIB=ON
+		-DENABLE_ZLIB_UNCOMPRESS=OFF
+		-DENABLE_XPDF_HEADERS=ON
+		-DENABLE_LIBCURL="$(usex curl)"
+		-DENABLE_CPP="$(usex cxx)"
+		-DENABLE_UTILS="$(usex utils)"
+		-DSPLASH_CMYK=OFF
+		-DUSE_FIXEDPOINT=OFF
+		-DUSE_FLOAT=OFF
+		-DWITH_Cairo="$(usex cairo)"
+		-DWITH_GObjectIntrospection="$(usex introspection)"
+		-DWITH_JPEG="$(usex jpeg)"
+		-DWITH_NSS3="$(usex nss)"
+		-DWITH_PNG="$(usex png)"
+		-DWITH_Qt4="$(usex qt4)"
+		$(cmake-utils_use_find_package qt5 Qt5Core)
+		-DWITH_TIFF="$(usex tiff)"
+	)
+	if use jpeg; then
+		mycmakeargs+=(-DENABLE_DCTDECODER=libjpeg)
+	else
+		mycmakeargs+=(-DENABLE_DCTDECODER=none)
+	fi
+	if use jpeg2k; then
+		mycmakeargs+=(-DENABLE_LIBOPENJPEG=openjpeg2)
+	else
+		mycmakeargs+=(-DENABLE_LIBOPENJPEG=none)
+	fi
+	if use lcms; then
+		mycmakeargs+=(-DENABLE_CMS=lcms2)
+	else
+		mycmakeargs+=(-DENABLE_CMS=)
+	fi
+
+	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.58.0.ebuild b/app-text/poppler/poppler-0.58.0.ebuild
new file mode 100644
index 000000000000..7f9c6e9e3d54
--- /dev/null
+++ b/app-text/poppler/poppler-0.58.0.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils 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 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	SLOT="0/69"   # 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 qt4 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= )
+	qt4? (
+		dev-qt/qtcore:4
+		dev-qt/qtgui:4
+	)
+	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 TODO)
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.26.0-qt5-dependencies.patch"
+	"${FILESDIR}/${PN}-0.28.1-fix-multilib-configuration.patch"
+	"${FILESDIR}/${PN}-0.53.0-respect-cflags.patch"
+	"${FILESDIR}/${PN}-0.33.0-openjpeg2.patch"
+	"${FILESDIR}/${PN}-0.40-FindQt4.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
+
+	if tc-is-clang && [[ ${CHOST} == *-darwin* ]] ; then
+		# we need to up the C++ version, bug #622526
+		export CXX="$(tc-getCXX) -std=c++11"
+	fi
+}
+
+src_configure() {
+	xdg_environment_reset
+	local mycmakeargs=(
+		-DBUILD_GTK_TESTS=OFF
+		-DBUILD_QT4_TESTS=OFF
+		-DBUILD_QT5_TESTS=OFF
+		-DBUILD_CPP_TESTS=OFF
+		-DENABLE_SPLASH=ON
+		-DENABLE_ZLIB=ON
+		-DENABLE_ZLIB_UNCOMPRESS=OFF
+		-DENABLE_XPDF_HEADERS=ON
+		-DENABLE_LIBCURL="$(usex curl)"
+		-DENABLE_CPP="$(usex cxx)"
+		-DENABLE_UTILS="$(usex utils)"
+		-DSPLASH_CMYK=OFF
+		-DUSE_FIXEDPOINT=OFF
+		-DUSE_FLOAT=OFF
+		-DWITH_Cairo="$(usex cairo)"
+		-DWITH_GObjectIntrospection="$(usex introspection)"
+		-DWITH_JPEG="$(usex jpeg)"
+		-DWITH_NSS3="$(usex nss)"
+		-DWITH_PNG="$(usex png)"
+		-DWITH_Qt4="$(usex qt4)"
+		$(cmake-utils_use_find_package qt5 Qt5Core)
+		-DWITH_TIFF="$(usex tiff)"
+	)
+	if use jpeg; then
+		mycmakeargs+=(-DENABLE_DCTDECODER=libjpeg)
+	else
+		mycmakeargs+=(-DENABLE_DCTDECODER=none)
+	fi
+	if use jpeg2k; then
+		mycmakeargs+=(-DENABLE_LIBOPENJPEG=openjpeg2)
+	else
+		mycmakeargs+=(-DENABLE_LIBOPENJPEG=none)
+	fi
+	if use lcms; then
+		mycmakeargs+=(-DENABLE_CMS=lcms2)
+	else
+		mycmakeargs+=(-DENABLE_CMS=)
+	fi
+
+	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.59.0.ebuild b/app-text/poppler/poppler-0.59.0.ebuild
new file mode 100644
index 000000000000..ebc378efb7dd
--- /dev/null
+++ b/app-text/poppler/poppler-0.59.0.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils 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 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	SLOT="0/70"   # 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 qt4 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= )
+	qt4? (
+		dev-qt/qtcore:4
+		dev-qt/qtgui:4
+	)
+	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 TODO)
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.59.0-qt5-dependencies.patch"
+	"${FILESDIR}/${PN}-0.28.1-fix-multilib-configuration.patch"
+	"${FILESDIR}/${PN}-0.59.0-respect-cflags.patch"
+	"${FILESDIR}/${PN}-0.33.0-openjpeg2.patch"
+	"${FILESDIR}/${PN}-0.40-FindQt4.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
+
+	if tc-is-clang && [[ ${CHOST} == *-darwin* ]] ; then
+		# we need to up the C++ version, bug #622526
+		export CXX="$(tc-getCXX) -std=c++11"
+	fi
+}
+
+src_configure() {
+	xdg_environment_reset
+	local mycmakeargs=(
+		-DBUILD_GTK_TESTS=OFF
+		-DBUILD_QT4_TESTS=OFF
+		-DBUILD_QT5_TESTS=OFF
+		-DBUILD_CPP_TESTS=OFF
+		-DENABLE_SPLASH=ON
+		-DENABLE_ZLIB=ON
+		-DENABLE_ZLIB_UNCOMPRESS=OFF
+		-DENABLE_XPDF_HEADERS=ON
+		-DENABLE_LIBCURL="$(usex curl)"
+		-DENABLE_CPP="$(usex cxx)"
+		-DENABLE_UTILS="$(usex utils)"
+		-DSPLASH_CMYK=OFF
+		-DUSE_FIXEDPOINT=OFF
+		-DUSE_FLOAT=OFF
+		-DWITH_Cairo="$(usex cairo)"
+		-DWITH_GObjectIntrospection="$(usex introspection)"
+		-DWITH_JPEG="$(usex jpeg)"
+		-DWITH_NSS3="$(usex nss)"
+		-DWITH_PNG="$(usex png)"
+		-DWITH_Qt4="$(usex qt4)"
+		$(cmake-utils_use_find_package qt5 Qt5Core)
+		-DWITH_TIFF="$(usex tiff)"
+	)
+	if use jpeg; then
+		mycmakeargs+=(-DENABLE_DCTDECODER=libjpeg)
+	else
+		mycmakeargs+=(-DENABLE_DCTDECODER=none)
+	fi
+	if use jpeg2k; then
+		mycmakeargs+=(-DENABLE_LIBOPENJPEG=openjpeg2)
+	else
+		mycmakeargs+=(-DENABLE_LIBOPENJPEG=none)
+	fi
+	if use lcms; then
+		mycmakeargs+=(-DENABLE_CMS=lcms2)
+	else
+		mycmakeargs+=(-DENABLE_CMS=)
+	fi
+
+	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.60.1.ebuild b/app-text/poppler/poppler-0.60.1.ebuild
new file mode 100644
index 000000000000..7415bbf1f6c5
--- /dev/null
+++ b/app-text/poppler/poppler-0.60.1.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils 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 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	SLOT="0/71"   # 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 qt4 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= )
+	qt4? (
+		dev-qt/qtcore:4
+		dev-qt/qtgui:4
+	)
+	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.60.1-respect-cflags.patch"
+	"${FILESDIR}/${PN}-0.33.0-openjpeg2.patch"
+	"${FILESDIR}/${PN}-0.40-FindQt4.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
+
+	if tc-is-clang && [[ ${CHOST} == *-darwin* ]] ; then
+		# we need to up the C++ version, bug #622526
+		export CXX="$(tc-getCXX) -std=c++11"
+	fi
+}
+
+src_configure() {
+	xdg_environment_reset
+	local mycmakeargs=(
+		-DBUILD_GTK_TESTS=OFF
+		-DBUILD_QT4_TESTS=OFF
+		-DBUILD_QT5_TESTS=OFF
+		-DBUILD_CPP_TESTS=OFF
+		-DENABLE_SPLASH=ON
+		-DENABLE_ZLIB=ON
+		-DENABLE_ZLIB_UNCOMPRESS=OFF
+		-DENABLE_XPDF_HEADERS=ON
+		-DENABLE_LIBCURL="$(usex curl)"
+		-DENABLE_CPP="$(usex cxx)"
+		-DENABLE_UTILS="$(usex utils)"
+		-DSPLASH_CMYK=OFF
+		-DUSE_FIXEDPOINT=OFF
+		-DUSE_FLOAT=OFF
+		-DWITH_Cairo="$(usex cairo)"
+		-DWITH_GObjectIntrospection="$(usex introspection)"
+		-DWITH_JPEG="$(usex jpeg)"
+		-DWITH_NSS3="$(usex nss)"
+		-DWITH_PNG="$(usex png)"
+		-DWITH_Qt4="$(usex qt4)"
+		$(cmake-utils_use_find_package qt5 Qt5Core)
+		-DWITH_TIFF="$(usex tiff)"
+	)
+	if use jpeg; then
+		mycmakeargs+=(-DENABLE_DCTDECODER=libjpeg)
+	else
+		mycmakeargs+=(-DENABLE_DCTDECODER=none)
+	fi
+	if use jpeg2k; then
+		mycmakeargs+=(-DENABLE_LIBOPENJPEG=openjpeg2)
+	else
+		mycmakeargs+=(-DENABLE_LIBOPENJPEG=none)
+	fi
+	if use lcms; then
+		mycmakeargs+=(-DENABLE_CMS=lcms2)
+	else
+		mycmakeargs+=(-DENABLE_CMS=)
+	fi
+
+	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..3194d05c38bc
--- /dev/null
+++ b/app-text/poppler/poppler-9999.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils 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 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	SLOT="0/71"   # 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 qt4 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= )
+	qt4? (
+		dev-qt/qtcore:4
+		dev-qt/qtgui:4
+	)
+	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.60.1-respect-cflags.patch"
+	"${FILESDIR}/${PN}-0.33.0-openjpeg2.patch"
+	"${FILESDIR}/${PN}-0.40-FindQt4.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
+
+	if tc-is-clang && [[ ${CHOST} == *-darwin* ]] ; then
+		# we need to up the C++ version, bug #622526
+		export CXX="$(tc-getCXX) -std=c++11"
+	fi
+}
+
+src_configure() {
+	xdg_environment_reset
+	local mycmakeargs=(
+		-DBUILD_GTK_TESTS=OFF
+		-DBUILD_QT4_TESTS=OFF
+		-DBUILD_QT5_TESTS=OFF
+		-DBUILD_CPP_TESTS=OFF
+		-DENABLE_SPLASH=ON
+		-DENABLE_ZLIB=ON
+		-DENABLE_ZLIB_UNCOMPRESS=OFF
+		-DENABLE_XPDF_HEADERS=ON
+		-DENABLE_LIBCURL="$(usex curl)"
+		-DENABLE_CPP="$(usex cxx)"
+		-DENABLE_UTILS="$(usex utils)"
+		-DSPLASH_CMYK=OFF
+		-DUSE_FIXEDPOINT=OFF
+		-DUSE_FLOAT=OFF
+		-DWITH_Cairo="$(usex cairo)"
+		-DWITH_GObjectIntrospection="$(usex introspection)"
+		-DWITH_JPEG="$(usex jpeg)"
+		-DWITH_NSS3="$(usex nss)"
+		-DWITH_PNG="$(usex png)"
+		-DWITH_Qt4="$(usex qt4)"
+		$(cmake-utils_use_find_package qt5 Qt5Core)
+		-DWITH_TIFF="$(usex tiff)"
+	)
+	if use jpeg; then
+		mycmakeargs+=(-DENABLE_DCTDECODER=libjpeg)
+	else
+		mycmakeargs+=(-DENABLE_DCTDECODER=none)
+	fi
+	if use jpeg2k; then
+		mycmakeargs+=(-DENABLE_LIBOPENJPEG=openjpeg2)
+	else
+		mycmakeargs+=(-DENABLE_LIBOPENJPEG=none)
+	fi
+	if use lcms; then
+		mycmakeargs+=(-DENABLE_CMS=lcms2)
+	else
+		mycmakeargs+=(-DENABLE_CMS=)
+	fi
+
+	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/Manifest b/app-text/ps2eps/Manifest
new file mode 100644
index 000000000000..440dcf3d6b0d
--- /dev/null
+++ b/app-text/ps2eps/Manifest
@@ -0,0 +1,5 @@
+DIST ps2eps-1.68.tar.gz 97304 SHA256 b08f12eed88965d1891261fb70e87c7e3a3f3172ebc31bdb7994a7ce854dd925 SHA512 7fc84da5da00d5b1169d6e337b1db232adf80d9d957e48bfdd9272946151adca3e44f712587387ef557488cd15f44210b3fbd8c545488ec0071641d9d25a9c2b WHIRLPOOL 231f22ccfff1341ca9ac713254786028b422df9e805754b4631e6d73146413ccfc7ac9306433c45c63c3ad7499065f444580da8125a15a6120dae1c9cdc536ac
+EBUILD ps2eps-1.68.ebuild 1004 SHA256 a53339f1c32fd00722e32ad6552699a933af98fe7eb059c9d4638d48c10f99b4 SHA512 748209dd038fb7ad69875e1dd3874c75a8d18e060b6ef38d6e21f9ca475a1f0f45c4be741e765368f6953143a38dda816f21a3ba379d249edd7ad55413a4428f WHIRLPOOL a888dd59d1291da542a2dbd9d77b79502144620f44ea7911765e34e2b7d24085486c5ef1ab32dc0959e438ca6164c1d586c888c942740800f4b11db7a892ed09
+MISC ChangeLog 2815 SHA256 589d0a47542b318e997c38da45f6e529dd6dace0ba196e0ebe13092f54da2828 SHA512 68b018749554af0e6e9dfb38b6baf042c527567be22737ae8b40ac2b67e5de8ef878b41129e79fa812fed6bb7b0603d3f7f4166f8507104a8c628f327b6c032e WHIRLPOOL a9d1b5fbbbcce1816e6decd2bf99e8d4c072bc1b84904744e87066588b2c9634ca8446fea9e5b285d949aa67d7f9a9cb1ae31ee4ace3370ee79868696c55b36d
+MISC ChangeLog-2015 4042 SHA256 218eece233734deb82ac56a7f917142597cb737696bcc64a5bb1f6c4faec7fa3 SHA512 814a77558ad5230515a03de2c04e27d2c93fb943d157d625f4aa17e35f7a9e04704c3381caed19a845dcf917a78effb4934b7775264b0b78780c1e1c80d25bd1 WHIRLPOOL e30ab616ab924407e1336c451e0ee4a4ba43f127a4ecbca45efd913a907b175ef297d9d8674c0e0c86d8943bc5665e7ac98c46cc594528edc1f149906c083432
+MISC metadata.xml 527 SHA256 ac6cb238d6f9b575c98e7abc8729ccef6c7acdb0a426b31713f6c1c3dcb5b14e SHA512 dc7d6f35acbffedfe3775248fb3e1ecf7a847541c1b2ff137466b57c75755f8b43435502b079574a84dc13ad435ede3664abb7ec86718448be60529e4ab143c5 WHIRLPOOL 9a18edbb5cdc11de83b81743d97a0e7eff3f9873b5114d630645b648eb0987cbcdf5c6b16c253ae201a6dfb679fd108696dcf3f89af0dba8205ee9ec12f44007
diff --git a/app-text/ps2eps/metadata.xml b/app-text/ps2eps/metadata.xml
new file mode 100644
index 000000000000..59807bb3bb76
--- /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..6c23cab927fa
--- /dev/null
+++ b/app-text/ps2eps/ps2eps-1.68.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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/Manifest b/app-text/ps2pkm/Manifest
new file mode 100644
index 000000000000..cbd7f27092ca
--- /dev/null
+++ b/app-text/ps2pkm/Manifest
@@ -0,0 +1,11 @@
+DIST texlive-20120701-source.tar.xz 131904044 SHA256 9666617d5dac3e82578e696835cc9f251ee0a56d162d86dff08659ac5dcb6c81 SHA512 0e8653aa21094e079900d17256f0768ac5514690a3725d96923d5fdc7633484d611441df1af8c674b38b9ce6a8845a9004976cd00635742dfc6837aa433caf5f WHIRLPOOL 9d570a1bd58cca8baed399ab53eb767c7c3db607c00363ce563e14dfccdd235703c538e6a651aa7f2934adf21f8477775f1547f9e7f3d957b89af644c89bcb57
+DIST texlive-20150521-source.tar.xz 45459552 SHA256 ed9bcd7bdce899c3c27c16a8c5c3017c4f09e1d7fd097038351b72497e9d4669 SHA512 9d06bb88c489715787ce619c4c6b5e2d4251e1db8d48ae7fe2d1a253634c76bc6d7282ef9c93c77847845cae01eafb58dfb37ba3fb83a6d223f0d7fe8f5d3855 WHIRLPOOL e19e4cf9c6122e8a2e80d3ad62171591a2d53317792ce69d7b2afdd6978d397c873565d597b1457d23ba6f5b5de33750955690a92fb6c34d814c075397b67a0b
+DIST texlive-20160523-source.tar.xz 45941100 SHA256 a8b32ca47f0a403661a09e202f4567a995beb718c18d8f81ca6d76daa1da21ed SHA512 915fa2f5e2099dd385ef81033db7aafdf09558c0c200fed0748a8a42fd61f69d3eaac9decea334e30981af739dd81061a9b1d6853c7f6d00285fe0be40e26c3e WHIRLPOOL 25d27fb7a7bdb47d40ddf951394e36546b184d71f2e09adb20698bd0f960e54841ddd0313a87510cb2ef43953eb4d9d05d30b88d25d15762dd774575c88fedbe
+DIST texlive-20170524-source.tar.xz 63483372 SHA256 0161695304e941334dc0b3b5dabcf8edf46c09b7bc33eea8229b5ead7ccfb2aa SHA512 18c18940992ab94ce22e22ccd4ad798253ea14ac2ab296a10ea5e9a8da9f33989f2e2641b42b564d1d5fb53bd371da3e68726b676d706b469016ad146cd19daa WHIRLPOOL c4edaf427f0249942b36db105a65474e833735d6e9954682fe7e15ab327b26ccafb9174bf806d0b6c629b0f2a6b55e80022af291d9a2f377b82dff4fdec42d3d
+EBUILD ps2pkm-1.5_p20120701.ebuild 811 SHA256 a9a38edf3da260c968d7159de6147560b0f7eaa8648c00f598ffd700538881f5 SHA512 0eacc17e678b0ed8d9ba77a5c8e0bc91fa134317cb5dc8393eb91d1ba5653668ec60bfd19a1f5bcf0cb9912f9a1428494c5d5244d9930d13d308a1c288d7c263 WHIRLPOOL de8756e4086391811d6eb51dcab15353bb9c29bfdf420fd4b8104764138b1d6a92c8116fe1fb9493d506c71dd0e2ce6e6b57c4ebc8bda385ac426338b0631320
+EBUILD ps2pkm-1.7_p20150521.ebuild 836 SHA256 b9f0c5401c6578b1d5e4e451c24c287e288726979297a6ca7a7fa79cba9239f8 SHA512 5007f586c9941ae159cbfdc49ebbd0da23f11b81731f5954ff79dcdff700764d15c555173c17b9d4bcfe82727eada7a0d07c98e19a62ce3e2933707c8557cb24 WHIRLPOOL 5fbec21aced12e290b70bbc06019ede429dd9950ece912aa40c35489b4a90e99c6ac3261f061c21d7dd06613c4f6e85adf7b998eb87ccc8fc80f30487238175f
+EBUILD ps2pkm-1.8_p20160523.ebuild 848 SHA256 6b4ce0326314e8c45429b9de84500f6838209b22ea863230047ec56ebf22ed09 SHA512 829b0fa2979bc26a1198bc265b8e5977ccbf6edc2b9834f60ef504318d54c288bc54621f646e5f01313d12fbeee9d4223e9d8d7aae75635e24e3069f422a7659 WHIRLPOOL 443520383546248ca22d57d34c8813e19966170411020211eed40c1db9f22351adabad15b10f6cbbf929124e2150f55690875e06a7eababfa6b47910d33c0431
+EBUILD ps2pkm-1.8_p20170524.ebuild 852 SHA256 9708f1edf6f2f949f8b8cf4aae520d9710c4c6caa8b0ff591005e304b74b3a26 SHA512 07933a28ec584e12a5eaf1581439f7da372f36e014bcf4de0ea4de982feedb1954f23ce83ded7ec3170696aaff7ee8a6bdca445d990e4b981ac6bb01069dce19 WHIRLPOOL b2c885f4fc384f8e6c09933d2dd2cd78ebf2b81e75224bfe1b6db88443ffe9a32b350d3a035603de4c1aa4e5c5ec2004cbc9d4c3a69034c853771b38731e1f76
+MISC ChangeLog 3214 SHA256 00bc72f2b1236be16f5b9e896234a7306a9e8cdf10bcd3ad5a178dac8192b45f SHA512 f0e8ad3f90f6fb1ae79239e9a41274df1ed35b6fe2c94e747120c6a6b0b4058ec1ab3419106cb7fc5b9afd5266da97b689469561507d1f253ffd6eddbd3d872b WHIRLPOOL 056d75722aa375c5ed3a5959c274b67d3c590d43f6ec92e35248434d098eed4ac4b476a4ed5a3c27b62eae9704f81e707f72bb2193fd569a5006bb4a28abfa00
+MISC ChangeLog-2015 5705 SHA256 396445523cb61727b5e7916f7484b2e980c24c9117249f6e4d27ee58d36feaf8 SHA512 345fad29bcc1ac94c07234d08c1c78dcb621d929f268b0554ac163e0c9360c5fb0fc8727e0946f826d8bf76aacaf20330bd936f6f22282e28d74e2bd95681d17 WHIRLPOOL a205ef93cf8701175e0cb7543cb51ee489b2ab4d9fad9c33e8462da456b175c4b2e3e098aa70a6884f5b42cf81f147a7ce4ea7ba2671313d380955491c5b3cca
+MISC metadata.xml 358 SHA256 ff0b9f8887c6df4e625e131a06e1612e53f7d09cb75a12ebe3a4a1fbced282a4 SHA512 51f6411780af5d7775f8f80d246d5f4e297abb1960a0b0c21c6dc5c03a9a407dad8cbc4977a679590cffb4523f1b72a0f7b15ab100c938391a5abfd3e17e8818 WHIRLPOOL f8f5c4ccbb3bab42abda823707c2e968328aa3422b1ace474a584c170450e7c1e297c637d4a442613639d17e10c665f186d48dcedb37c8ab4e1b0a556257d8b0
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.5_p20120701.ebuild b/app-text/ps2pkm/ps2pkm-1.5_p20120701.ebuild
new file mode 100644
index 000000000000..1caf31f4024d
--- /dev/null
+++ b/app-text/ps2pkm/ps2pkm-1.5_p20120701.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+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 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.1.0_p20120701"
+RDEPEND="
+	!<app-text/texlive-core-2010
+	!app-text/ptex
+	${DEPEND}"
+
+S=${WORKDIR}/texlive-${PV#*_p}-source/texk/${PN}
+DOCS=( "ChangeLog" "CHANGES.type1" "README" "README.14m" "README.type1" )
+
+src_configure() {
+	econf --with-system-kpathsea
+}
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..754ea421214e
--- /dev/null
+++ b/app-text/ps2pkm/ps2pkm-1.8_p20170524.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/psiconv/Manifest b/app-text/psiconv/Manifest
new file mode 100644
index 000000000000..1abed6755e35
--- /dev/null
+++ b/app-text/psiconv/Manifest
@@ -0,0 +1,5 @@
+DIST psiconv-0.8.3.tar.gz 326460 SHA256 4fec0d7c1d18f593e9a90a7dc08d84489aa92828849bd4ff393eab20f44543b8 SHA512 a48814f64fd2c3dda0dfa13c331d2d60ff8674ab7a56f51efcad29d3dd6874f4b94dc0a21ef3066b0fa605b18635ee151fbb4e3eeb06dab3854a329ed70348a9 WHIRLPOOL 79e024d60c8621dcc8a36cba29109d358241ecff3dd3fec38c32d0b187c03ba947a7d8495bf384ebe3e87efda89e170315da1ab8952dba0b03232980a026373b
+EBUILD psiconv-0.8.3-r1.ebuild 579 SHA256 841345c35f2095550b333eca2fcf97b4a07cf2efc9fee9a1e3bf23d4fec88e56 SHA512 9a03f74797245f144f8a1b81c463bca6a151132c349699bd95527524190eaaa0256fa8b105bec8914d0c2fb80cee8e2652b0c8971447678e78133f0f4a141b92 WHIRLPOOL f5ec773a2ff3ce90a001d1cea504aa3d9b13f7fc15043bda65d27fa9068fe274091344ab1c7c622ad1b09e18e7aa0855a1fd1b685743f39cfd40ed5c1d0378cd
+MISC ChangeLog 2528 SHA256 736c91159b6b4a7365a5d254f23319443c80b31c179740ea231628979b4dc3b6 SHA512 703d52c86cd9eb4d4e91f301a209d963b61ed11cdceb66ef7eb49b77c6c49b2366100207b2d14d12e5cd4f6c2b4c48b4e4a08fc26b51d911f6614c4749a81447 WHIRLPOOL 397c91fdc33815f9be64cb304c62ffa3073f0cbe9a0115007936a3fcfb18c64f204a468e1fd28264298e86684ce5c890b72f83c516dffb75652f45711e16348a
+MISC ChangeLog-2015 1521 SHA256 2d038bc2d41cfc5da1ae92b991feba33c144ae36c98bc6f14ac5ac71c1aec943 SHA512 7df54afb4165449336d2526cf30dfc47615be2f06e0f6c0e1e78952fd87f3e4f567417b8adf69c8ba36d9da00a1695b836788ad10b84ed9743335c6fe33f175b WHIRLPOOL fb7499ab64024e348a2d9fbe7d23397b1af93363e862c36fdc3e2b9e05fb0125e6cfc91e4451ca9c4fa35ad260931e156a4310eb5a84f1df1fbc87b4696aadf6
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
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/Manifest b/app-text/pspdftool/Manifest
new file mode 100644
index 000000000000..09005f2b0df0
--- /dev/null
+++ b/app-text/pspdftool/Manifest
@@ -0,0 +1,6 @@
+DIST pspdftool-0.03.tar.bz2 129936 SHA256 18e932c35221861909528c6a358f404720ce911a7a139bcf6376eb6fc2fde610 SHA512 8e621719c59f79f7201e8221a851e85d11573fa1895a64ab5e77382fa1103004f70a38f98928a8ce4b5795ce89ac3e4a7a5eade772959e26e49d6db9cc7fe7ea WHIRLPOOL 1db9fb41af6a70dc6de4799199b657038755a938dc89872a9ccb6e3a7fb22bfca8cb83befe8471ea3f65cf4e74113e96b4fc67f7d2e88fc51f27d6f04b99f9d0
+EBUILD pspdftool-0.03.ebuild 882 SHA256 e2474693acc9876c88cd25e8aca3a1db0b0ef4dfa75e5645cc197eea825768bf SHA512 2555568da3e8feb2a0bf29384b67f5204eeb61dcf176d976f2c5f66718a1ab9c0f377d3ad0a89169fe8fb7cfec13864a02fb48a275e9a50299932f87dc52e28c WHIRLPOOL ad3a16465aa51471a8d54727b960fa91d7100fded795edf249299b8d3f8c7ffe61c15a0a8a872e2645390085148eee336d30bfc51cb075eeece215f21798a9c4
+EBUILD pspdftool-9999.ebuild 806 SHA256 3310e9ee7f64ee675553acbb5cbe3741109e5a9880231954a2255af6d3ad35e3 SHA512 a0a04775997d3cd9cd460ceb49f96d34cd225590a6d9f39ad65a80d0c04212e31641d621ffffad3742bba70bc1bddabe9e9adbdabaec2ac45ef90718481e227a WHIRLPOOL ec65ed03d435fefa7274cd5e911e7ca1c49fda81ddf9bcd92304667eceb55d50b4066959060f7698944f1858c2f23461e976ce1923d39837b0744d50815f1c92
+MISC ChangeLog 2536 SHA256 8f176871e35390bcd0f2d86b689ce26b1f1b427cb79b0e30bbdce00ea113fe25 SHA512 66e06874143eecefd68a185f23a858ee19b1221e9bf95f856b32a5d1463ada3cdb5fa7f382c2d3d876bc05f83f46d5a01f2b92677fc160b8c3505b59ef7045e7 WHIRLPOOL a4e5d0087c8651a1b015de02ed50ae06eaac2c073cab0397c542d5b28b6f8fa7501bed7a98c4ea0a7ee9294be4b263e813bdfa6d36d2e6879507447c4c42139c
+MISC ChangeLog-2015 924 SHA256 92d991e92185f09248bfc2ab554579103653bcb95a3cf819dbf1d35d4bf64089 SHA512 2ccfe35bc734431581413602ced5946a7c8d4c37e6fd8512d84abdeaf4fac67bddac594685906fa060eb9d59e04702139f861f83b0060d893a86e72315906ac9 WHIRLPOOL 4261d769b8a21c1e385133c2c3d1f56715fada745adae5edc0903e5202ba56c289aaa20bb45012de2e5ce42bee92c3de323f7e2dc2801277007b34993ab97787
+MISC metadata.xml 582 SHA256 5228140497d3461a8a8ef5a44e03103e734299ba6853f200f1a69ca0cd9c0be3 SHA512 92b2c503810d865abaf91e3f92da3b8de7a2fc8821169c6c303e240edb68fcc5d98731b999660a8599442263f88b06c616dcb944b754f97bf656c37d2d108f5c WHIRLPOOL b22f4753ba8bd0d143b1603902d366fe274c43258053905dfcd407b17d328fb0240c5901488230fb5fe9d6b0b917e7456f3d8ad2e04707232ae8bd53e43f2ef3
diff --git a/app-text/pspdftool/metadata.xml b/app-text/pspdftool/metadata.xml
new file mode 100644
index 000000000000..07d5444f00dc
--- /dev/null
+++ b/app-text/pspdftool/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>miska@gentoo.org</email>
+		<name>Michal Hrušecký</name>
+	</maintainer>
+	<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/Manifest b/app-text/pspresent/Manifest
new file mode 100644
index 000000000000..be39cd29c5cf
--- /dev/null
+++ b/app-text/pspresent/Manifest
@@ -0,0 +1,5 @@
+DIST pspresent-1.3.tar.gz 14357 SHA256 94f2b6fa437929c9add2b8f4554a204d49132170c1d167c4389c7de26f5a6f80 SHA512 cfca0b4758d03051cea95d077a45239103f6fd24dada775c3b7fb0b7f78863f6628b530a21834546546dc935596b6d93dbe45048a661fcc41152a4b97b8f21f3 WHIRLPOOL 2704797e1ae5bf7c7876f7cb79be57ac430fe2dc7ea7b0297fe77381f073c406eddc3878da247da6811755a9058290bad70495f597aef77a93fc4de1aa0edc86
+EBUILD pspresent-1.3-r1.ebuild 915 SHA256 8d51c0e6cd983b95b1a6420d66561f33c0c7bb08eaf7f0b6d878af25c0317bfc SHA512 4e436d19d84a701b003900219acca98effef86be25b533a16c97172e471f7c5bb1602ac7fa10de8b1d14d643ee6fc9310dc6e81347684340c465c550130c18aa WHIRLPOOL 2182cc20424f4703e79518900908d659a81fc9144940f7e6d94c79c7e690f8d388902c2781400d2888e4cdd59fd8cffc71418f1be20375dd5f10d33ea7c17144
+MISC ChangeLog 2530 SHA256 d106b7a10eb8747cdf8990562265bb0e3e64ba42d7b27c729a78f8f7f33f48e6 SHA512 d6215958d9a1b06a34e3f7339e2523ab46b045b7be4d9f235da5b8794a8ba6f825b38975532e10c8a6e6c8c0ae4ad2c2e00cc518a1368ad8b6137462437cd1f4 WHIRLPOOL 4b23439a3b193ed2d0a7f12a60f02081e769dc6b7ab4924f284a3d9070442b633d2ce1c3723595f7995dd88a910879da7b6d9a7086a40baea1612f18f2f6b306
+MISC ChangeLog-2015 3971 SHA256 258a60ffb546d4141f60e2f455bbdbacb5cb89bd5615f3164f87aa5a309bc087 SHA512 26b84a4b26a5034f1db35795cd02688dfefe1af19dd925956eefd779a16623448e1af671cebfdd1eafb3276349d6eae4f072ab5608d2049b7fea47c9d3da91d8 WHIRLPOOL b2b4c8805c0445d1546b80340415bbc6eea53556b48f03d6ba5599a4e932a6a3f41c9bf57d11d081d4ab86dfff22317dd48e8b1afb831052fe748e05e0e66360
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
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..128bda4cc35e
--- /dev/null
+++ b/app-text/pspresent/pspresent-1.3-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="2"
+
+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-proto/xproto
+	xinerama? ( x11-proto/xineramaproto )
+	>=sys-apps/sed-4"
+
+src_prepare() {
+	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) || die
+}
+
+src_install() {
+	dobin pspresent
+	doman pspresent.1
+}
diff --git a/app-text/pstotext/Manifest b/app-text/pstotext/Manifest
new file mode 100644
index 000000000000..4351a1d6d60b
--- /dev/null
+++ b/app-text/pstotext/Manifest
@@ -0,0 +1,7 @@
+AUX 1.9-flags.patch 775 SHA256 fff20b702f82c3b81d4a9c8c0d58047f02f2ca64c5371a509f713bfdf4395fe7 SHA512 4933522482e76eb9a220da6baf74722318e1b3c818515560f58a2d448b66a5236450c96171e89c8fa899c4e4904fcbde8457e87accbde0b6275c7154e1e9e462 WHIRLPOOL cd3b078a79e081697a932a7126d78794dea4de24dbfa35fa41dabcf2c696bbee04c06c0aa64ebdca52ce4a9acf0c71b3c19717a1e0dbb5f8abf992dc2b168f3e
+AUX pstotext-1.9-quote-chars-fix.patch 3491 SHA256 86a031cba40e1d5ffc7cb17970a2af25c2816d274215f0aa7ade367ae8f41ce4 SHA512 c6ffabaf5b5f7261e79e43d0083543b0428cde0d62c1b9e9513905d03dd5174a1ee1a537dfa8d906b7422cc6c9e5606fc7dc6f177d11441fd028355e99c2c4a6 WHIRLPOOL 6338e4a016638fa4232f44034feafd4277e12554fbc0e8fc594fb751c4bf0f7a957a960da57093ce247d55b8c231d20d7d4f0e14269cded5d772a670f3e80753
+DIST pstotext-1.9.tar.gz 37461 SHA256 cfe0a251d0d43982a7d3bdf1d1670c854432739d00cb593c9beaca4b2cc36c27 SHA512 a8148e94d635544a7dfa8c96ff6071717388e4dc6c3db36f2c50939dce96c1f824ee423b1622af9111fffc60cb298215a6ee85d956c81873d71ceac804ee48ca WHIRLPOOL 2e2bec427d230c007687af13425ff6ac366e8b868950d8338855451c63ecc0ff401e14d5ddc6ee645e4dc209d4a5af5d772dcf1f8e2299917c1c3ce8d234017e
+EBUILD pstotext-1.9-r4.ebuild 659 SHA256 32900f941dcc691241c7bb00aae09d62b4ce87f486fd2c234dcd321cfeb836f8 SHA512 a4654692a85c847ae918547e22ea2837b8ca78a156528fdf485ade26c9d8ce84c7a04a07fac1b4b018955126f3dc514a4590ad00d5d897bb62708ff1002234db WHIRLPOOL 9d3d46f214096f1222c6b5a5573a58e83c9151fe20c4c142da24f2112a85cdb664c67461bf3d51b3f994e317f0ec3244df1db6e040b4f443affb72bfa7f3c1f3
+MISC ChangeLog 2501 SHA256 eb2067bfc043dc4bcb547be20f50f93311af726c16894bd92b3bb8fcfae27b3b SHA512 c5036261f837a60b27009333e596c98a067a7591465ad44d1ae144431742d025ecdc98653931b8263397fc7b65967dc2ec20ac41e74ef0b0a8ae1dcef914f159 WHIRLPOOL 54c29a9f2248e4e8552629c4b7c64d2b3c4f218082092e697a14d7e597fc71d03b4a999f874fd2cc7680479c9e96edcc747ab23094ab42747b3ccd08fd608f4f
+MISC ChangeLog-2015 5200 SHA256 2be58038043a4ec058a62d28c4b9084f896ee4d1cf5466c9c9a88fb0e4f91401 SHA512 f6c28d05f9762f890464c3843e28548852b075d040a94b0292e0dc359726707adf073db9f2d6439e5cf3bb86b1834307b1797bec3d13339c9adbc280ec44215f WHIRLPOOL 9f5a6c80008775e405c2d79329e25c81b1772b83628aa83c1ecdb88702c0bbc3cfd93a17f89597911f7970d410a86c44c00b0957b750efe1a2a91ef4e21d41f9
+MISC metadata.xml 249 SHA256 1c23b6a75de713ca6f4316742ebb0884fd6cbe80d7b97bcab4f467131a3506f0 SHA512 895325641a176c848988fb5f36cdb567b584d22f6e778b3de674de480cbca30b7cf8f12ecbbe1173a63e3229889e1e0f5efd5afea4f0d4c429ac236598f80f1e WHIRLPOOL 79f461d266db8e176661a5c24527780598eb751a1fbdbc05871a0207ed5b5dde38767357e4e0c5bdad4f609a7e11d7c9ec5c3a404274c83d4a5c3910f9305c1c
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/Manifest b/app-text/psutils/Manifest
new file mode 100644
index 000000000000..1fd64cb23cee
--- /dev/null
+++ b/app-text/psutils/Manifest
@@ -0,0 +1,8 @@
+AUX psutils-1.17-ldflags.patch 1417 SHA256 6f4389d8c2695302f6bf820b53790117fe60b2d6e7b76c95b0197b0c848dd602 SHA512 179b1551516a8acc9f4f9859b4bbe06a6d6e2ba0ddfe20c147a143e6795d61d9cb4f55107866d7a891f0be0dbebaf11d836f4c129205da44ba561a133d69ab08 WHIRLPOOL 2e932444970e58da7252a7ddb31841f00a6e89aa75885b571f81521c6422052184366a42aebe933627a7a6419d58a9ba738c52409addcc4f77443abda6afed11
+AUX psutils-1.17-no-fixmacps.patch 1176 SHA256 44926da1032a087d6dbfb7d66ae051eaf3f21dd493323ed09b2e67bd49e76b06 SHA512 707ebb4594b341044e27cd3fb35402b4d3144eb52f9baffcc633dbde69b53717da148b6c03074411cb95dcf50b48ba87df4ad6c2ec3b24f37b0951c40012efdc WHIRLPOOL 6c7c179de1fb4d1a4f8c64c4bcfb35fec9c3771b4f8a159161f3dff9b3935bd72bfa8e18c8380d7c7a517519fce768b37dc90ac37aca5381627bbefccf3407cf
+DIST psutils_1.17.dfsg.orig.tar.gz 40296 SHA256 53e24aff04895b47fb2178dc9df3acb78d91c33c2d6bd524c49e9641479c4f6c SHA512 a4ee49ecea9a948c0cfb8b51d10471409ec461a07bb94c1158c64e433f02ede4770fcb961d6ec79088bf247176db9757389d3e1cf5b64246b3b90b5584b59ff3 WHIRLPOOL a621251c2956f40eeacbae77a68287a808446655b15d9c17b5d51d3f1946ddb427ae12a6172d49f5c82f31afb3b54fcf00f12aeb258e0cd08b7c9a60df1524f6
+EBUILD psutils-1.17-r2.ebuild 1002 SHA256 20474b35fc4e8287a06b68c65bf94600f70c69eb32271d58912e966de445f23f SHA512 01b3277af28ec70dd8bb6afbaabf6a2410787ef032b189fde69c40ca61323b2a76b03f8555c4be840174b47a6a59e78eb10103b4acb1061f7b09ab4d7a838e7f WHIRLPOOL 5cbf7b52bb28f11455fc351c24059103c2f4e6db2c958b1b15b29aea820c275f2d3bf6409c10252b1925cf63a149d2a29959886a14fd6d8fa69395628ffa3587
+EBUILD psutils-1.17-r3.ebuild 1000 SHA256 733f3a6a43b00a947e00f98675473ea0422eca7ca9076a0b215e12776c154c05 SHA512 b0fb5b9acec3d19be87b68c0577136ffec43fa881fdd203f9074e4377bf3a42b7147d2787c921cdd46d43a040975fc6b2bd000a71a8ee2a30a355169c23a824b WHIRLPOOL 75168354cd8a8b3d98a63d7bed2f5ca9fd247ca69828c6b96b6d2658ba753f08b1d075e6e5eef68440377af202f9775ff5e5bcaed3cc79ce0802e06edd736d0d
+MISC ChangeLog 2507 SHA256 51e402c5f329e441c2582f7a6552792707d45d04ba6df4cf118ad0068b954732 SHA512 5c5f97115d32726faf52de543cd21f7e9d6a17242e97578bb3e76815cb49a7cf5df5a137a3fa61d3c4269e969cb9d9af494f3d13b1874a1ffc5af8b236713473 WHIRLPOOL 806a4eadcbba261485d4e9d1147dbea05e2d76fc27a9ad807f8b15e5c14617a3fac3ec3341926ecd38920091c2e376ad13588fa66c2c1f31023e0476509af31d
+MISC ChangeLog-2015 4611 SHA256 fcf6677c340c1071b9987c576655cfdd5c05b5e09dea64c8bb77a8bd5e0e4db5 SHA512 e519755a559c63b780a76fd1160e3f6612fa5061da988345a00dd95969531260665d2ebe3ef6bde86d939576fa493add1c8e898505f9bfa9acb8b4389632c4c6 WHIRLPOOL d49feb2d7c1be033752a3db1659832aa0ea82fb88b1dfdf8c295af7e34955ffa55e2779efd18c0c373397f4092b87c6598148913603680b1ef324fa5c25ca86d
+MISC metadata.xml 245 SHA256 b3de478821488be2cdc91b078e21c911dc384af882c5c44631a47dfa91516dc8 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690 WHIRLPOOL 701a78fc2214f5fd4bd781477f85e87e716b8d76ea831a0fa4afc8871c4286cc363679f1ff4f844555ad4f77cc7265208b83e805f56c22fc4baeed1062280c08
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-r2.ebuild b/app-text/psutils/psutils-1.17-r2.ebuild
new file mode 100644
index 000000000000..a91ce6307be9
--- /dev/null
+++ b/app-text/psutils/psutils-1.17-r2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=3
+
+inherit toolchain-funcs eutils
+
+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 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() {
+	epatch "${FILESDIR}/${P}-ldflags.patch"
+	epatch "${FILESDIR}/${P}-no-fixmacps.patch"
+	sed \
+		-e "s:/usr/local:\$(DESTDIR)${EPREFIX}/usr:" \
+		"${S}/Makefile.unix" > "${S}/Makefile"
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" || die
+}
+
+src_install () {
+	dodir /usr/{bin,share/man}
+	emake DESTDIR="${D}" install || die
+	dodoc README
+}
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..201879533dcb
--- /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/Manifest b/app-text/pybookreader/Manifest
new file mode 100644
index 000000000000..dac251793867
--- /dev/null
+++ b/app-text/pybookreader/Manifest
@@ -0,0 +1,5 @@
+DIST PyBookReader-0.5.0.tar.gz 285488 SHA256 785f1e5d6629a966d1833e525d6b4c1bc5f7e4328164ff00e4050c6bbeac3ed9 SHA512 0eb3b71b58c62706ac6cca70150d28071a0a24e02ae2949a8a26c02f5d060effec941d97ad3c5e4fc5a47fb222c315a91258ef31360e2f164f85b6728e6e239d WHIRLPOOL 41d1947bc1f56a356fe885057db89b5a8021583df13f11d869a2b9c7bb4f6056f782442f478b943d5f06da520bb0bd5e2a05692c08e49f4b5ffe3258bf5047bd
+EBUILD pybookreader-0.5.0-r1.ebuild 554 SHA256 fa08c1be842704e873375c5c6101bba75039388e4e8ab840b114fd69b3534b41 SHA512 0f4e01a5c5aa89f29b171fc13a45047f541204cebcb8bf06066eba16a6cc875e95c3dcb2af2a7c7680f83b3a87ffe3b315a544785c6bc526191125e18618a017 WHIRLPOOL b609947f2bfb41db10e9c1abd9971b19a16e3da91002830800889a4c2123e5ed51157a865ec3fbd744c4a0d634fd59a3e6a9a53cbac61b7f71c87c53aa7dbd84
+MISC ChangeLog 2457 SHA256 f54318850d9576f9c64f268dc0f51f02a52918584767c6ba01c40545a118352b SHA512 14a91cce16334ca2360a7b4905b0afa56bb95702448d0e0b92f5042be16965610e17b8ae5b6534c7ebb3958a2fbb64fe93615ebfdbb0e37193996fcd44d4155f WHIRLPOOL a89919f3879b45f46fb1ca795f4e5ab4335e5577677c58186b1c9229fa44912297d2a94f9ff18bae349267097faa8efaef32ecd870377821062020350f94b2b0
+MISC ChangeLog-2015 968 SHA256 4257b59ec6f2c29ea67bfa383e20014d381578662a93d9d71d7747813d3dcbf7 SHA512 47675a697b364ca61a3fe19e0fc367c7c28b42c9c98d509e9e87f29d06da937a697689640768079ae09b8b14456f25be51fd6bea61e79c1c3d303a4a2747726a WHIRLPOOL 984ebadec3a601c9f310d67abb913ac20478a02aadc10af74b10e9aac89178ca9266675fdcf4cc446553adab8263c0d85c15a1063b5aa0a19d96b836d92538bd
+MISC metadata.xml 427 SHA256 29ff868f485cd0956b9ba17470466b1544ec4e1f4da0afac053f8f39b736e345 SHA512 39174d33ba3c17a9599c8c57d70690c4dece94eb56eb2ff70462a00990af31714c43210286a8058019fe5e8c854d7cf690eb71c2970f9b8b3e60eaaed5e31fdb WHIRLPOOL 4ac762f17dfe7e6223f60d932f73ca975b76cee6ed8723aa520ddbe45ce38460f11c7ef2aab7c35e66e5e1344d13453815a8e7bca8ff46f7166892da8b3223f7
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/Manifest b/app-text/pylize/Manifest
new file mode 100644
index 000000000000..8ab61dfa3b04
--- /dev/null
+++ b/app-text/pylize/Manifest
@@ -0,0 +1,6 @@
+AUX pylize-pillow.patch 375 SHA256 bc0418683b27603039f51268ad929ff223be901d321d47d4936f7dc461c34cd2 SHA512 5e6beeb1a0192328039d581eeaf568e606a1fa002f8d91ddb397e27d873e23834fda67cd88a5afb24563a515cb37c234ed2d8c913472ce9fccd431249be852dc WHIRLPOOL e4028c39276230ebbd2356034d00e1935789478628a466e72a695e399a570aef65b18ac8b340111ca71939a0a603dcf3cedf28e11e3266e32559cb536d8c337e
+DIST pylize-1.3b.tar.bz2 70979 SHA256 8de876e2581a556e23d538b3ed5b970929a51c236b24c1fd5161c26c8c42bb44 SHA512 271be57bdebb605566a7ee0340d34247f8ede4df7ba729c85c23f6df1ca24cadb25c870cce5b1ac35544205d90e716742cd31e150b9a8f98b2dcfae441a76454 WHIRLPOOL cc81f7000fedf10d3aae1922c3334bd00575a45c0a17bcdcb899e6b5229c621637b3f7815e5af8c08303ffa57d7db9073be675419fd8e9afe0e70e4eecf7f679
+EBUILD pylize-1.3b-r1.ebuild 1029 SHA256 1614e75d718bb6ef92ed190fd3057e6bf55c94728484e3d7123cee836619f338 SHA512 dada782c5b6a0f6d146d20ad26ddbaef46cd7476c8c5fa5143904855178676fbe028a22ef01c213af2ae052c7c8b6e227ed506a49dbb8f4e3931708264346fe2 WHIRLPOOL a4e9de360feb1d615aa7b2592e334431966b8a935010b915d947a789a650fd9cba3e2ddc298f2a40e78129e2b93bad30aac9a2008863d72d4ac05890eb300b24
+MISC ChangeLog 2745 SHA256 bf8feda8f92422f51917b2c83d80ef8f8db36e1d968c9abf40eba0eb66864620 SHA512 1b5d7bd243b714b51aa8909ec72149afa67b32b370ba7b167b2b591b3bdce0efabd36ca40f6ec5875ca54e308e82fe527307a2c7208e8c16f71cdc7630cbedab WHIRLPOOL bc3a1b66621e641f708dd6b5fd3fa9be47d2f3525028e1885525a7e032ed5663313c0536013db5d19431fb091bf98c2e2858d6607cfb46f0f680e5dbd79caab0
+MISC ChangeLog-2015 2588 SHA256 d8e14b229cb622993894d26584b77719af26d3bfef7005df4fa5f9718a974673 SHA512 a6610e6d2f56e3b701a50f180836ee8c3a8ce4a9a2629f682429d1c9196fa634cfa96069fa5d8e43656d93d75b4a9a1b723ff40129c8f4b2ad1f5b1948e22c82 WHIRLPOOL cf7db8d73b3c51f20479e7382625cc29611497f301a6d51dad726f7717d5c0a09832311ca10d9a50696ab7d275b2dcdabece9c6d35ef62b1c9c2bea50a097df6
+MISC metadata.xml 547 SHA256 7df7fab4b323b5d44170766224a4edae0e4953875b537d184a972b70a683f61d SHA512 bf43543c0b0c4f90940d0a5b40c342d9151673418994e074421e723ed8242fa742cc06b93cf846bf8b860b997faa68b4f0f978d274434bb33b77c3e9cddec435 WHIRLPOOL 8c92bade04ec2b29ad7b18f17a78e145c064ecb60ded2f209d51c404272a0e54f44a51540cc292296ff1d0b2bb7ab1fbd1b1a5341bdd7dfd7a248524635ee9aa
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/Manifest b/app-text/pytextile/Manifest
new file mode 100644
index 000000000000..903846172ae1
--- /dev/null
+++ b/app-text/pytextile/Manifest
@@ -0,0 +1,8 @@
+AUX pytextile-2.1.8-sanitizer.patch 606 SHA256 5b421c561c88995c28a5c4ce61e40634cc515bb8ac9eebfdc8a55ab175188d78 SHA512 3c7a568e64cd28cc0666f06e6b2022454126a654f4ae0d0c82edada69ca7ec1ebce1582961ac84667b3a0c932c5e9d98521c100e1d62df100d276ae33417ba13 WHIRLPOOL d68276b4e85676ea1c1e51e38843b943a4d317406f65551bc3d710c146e80e06930c815d1a7e0731dd173ce409c033a4400a19e570be709250b79acb6f924b6e
+DIST pytextile-2.3.3.tar.gz 42277 SHA256 88526eae638751c1ea36855f6299338e6cdde38bb04b8628b87b02b1a698dca6 SHA512 980c872bfdc056753fa5b344cbc828dbdc9ddfc2656f3cfb5c15b3351cfd9e4016f57af14b60af2f2764e556865301d7923a8f0687c5857fc2201bf10f56ab60 WHIRLPOOL be5661dcc13994ec8019e032d2a54dd1d1f0aac61919615a36484f6b1cde3db598644fc3c89f18e01507e0a37d3ae55d25a2953a14e3ecfb94e1a99298f702ef
+DIST textile-2.1.8.tar.gz 34002 SHA256 c443f4bf0a31df9e707e615f869d4f51b08cdb222d17ca3009eda44f7cfd8629 SHA512 b1675a131b482f4926efb45312b16c722ff158d9296704918b56316d470056f986ce18d495525a8e9f236bdd62e09ca6a17b443a7db8c8c36e5d05fcffce67da WHIRLPOOL fedcd9b9277387604e258fca427e3cd587f3b2ba93e65b39474ce57810fa67dae772241c5cf69dc8aaf89416d6191271f1fece4fa2f2e63f19fec6597b956bd5
+EBUILD pytextile-2.1.8.ebuild 924 SHA256 8ceadf55afe6c4f2ff4cc773616544d5fb05c4c0818a476d51b49399ed92d5ec SHA512 7a38a87b3459aeaf5af5c07db276d5b2bfa931d8fbd340b45d27e80aabbaab096e6dfdf2702c18416ae978015b2787b62ea4d1133234b842c40c8144ee389e73 WHIRLPOOL b8ddbfa3a870dbd85c12a7270b798f8c031e2e7f9dfd40111ec35633f86fdf764eb5a6dcc02074e439c239c60aca1f8cec1f86fa67b407118b66a5b18c9887a3
+EBUILD pytextile-2.3.3.ebuild 1006 SHA256 00a255dfb699b9bb90bafb15a53ca41cf5e9a57a85c9cdb819291047710fc2bd SHA512 87c996d122485723bd97e50b30a21633d599f57d3d6db16053ff2944a735b61539b68ceebab527a30de553a118abe2c1b80281a2bbc7105142ed049fe3a1fff1 WHIRLPOOL 1c452fae739eb1df7c7f890bfffde9c2fb80bca8f20f70dce764e7c1d2b6fd652f47814d280c208038ae37214e4daf5d7f36e2f1e37fe670af1d37c225b15dda
+MISC ChangeLog 3698 SHA256 639b4450fe49610db2906b1219517da2ee51ffea7a97475b57971c205861c907 SHA512 7a9168ed5199a50778a764ab576c1ecfd52a0b403035c7c68e0a987754e701c13f43957b1c4e36cbac88460da9fa23aeb66d378d37bf4c994707f07a29b15319 WHIRLPOOL dbe9c18fb09e3d9dc8a1b025028b6c91c8db71602a9419105d902c2c9be2b64e92462c08367c456bc616d6a8dcc4c18025ce69f7cb045910e4ec68d707128ee0
+MISC ChangeLog-2015 5806 SHA256 8008e4ee5db167fc42dd53ce6479e47c81dd7cf3074c1fc7a97ee662c881e790 SHA512 e6239c2d0b48999fb797a9bec8ab7d9807d55ca7ae853a01ee32a831928f727f183f7fd689185b15511faf2688b4cd3a6f14cff330da868e699bfb65ca642647 WHIRLPOOL cdff7f50c9ad7f925900b6d9b52896c6a29d78f914c5f277e5d1935c1b8108c5e48a23f00f264af8ceb63fa2c7fbf895d2f6e32bbcc636254b35287c7108cbe6
+MISC metadata.xml 554 SHA256 6326725cf03c84856ba096449280729a0358a40717caaeafa251c99d4aaebb68 SHA512 6d4de4859070958c55f816ee8692a33f1a7b70de38549e9a6242044ccfdfffc590da29c79c450862537185fe2803bb0e09b2bb46ea76cf5548a2ded01a26434f WHIRLPOOL 47b022b38c23d902dcf51ec46ddf0f4a2e1c6ad6c38d6acead125840900f25b2a3beb435c03b9a7f95cea851d0134d10c46326f0d642a92c3872b221fd348950
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..4641ee712126
--- /dev/null
+++ b/app-text/pytextile/pytextile-2.3.3.ebuild
@@ -0,0 +1,41 @@
+# 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} 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/Manifest b/app-text/q-text-as-data/Manifest
new file mode 100644
index 000000000000..a26546ffdcb0
--- /dev/null
+++ b/app-text/q-text-as-data/Manifest
@@ -0,0 +1,4 @@
+DIST q-1.5.0.tar.gz 58746 SHA256 69bde3fb75aa1d42ba306576b135b8a72121a995e6d865cc8c18db289c602c4b SHA512 d21dd16a31629e36f0dee72ebc574283c7937821cb2da7ccaacb8484a35b53193dad05fe9857d1498434a0c1083514ea5b9e5d8a636bcd51d4c5924cb7bb1b55 WHIRLPOOL 264ecbd3a064ba37fc581fea1f9c7b3e6a7f8985c6dcc1c6856193036e202ba3483b90502640f042a25b418eaecc881bc3246855812ffbf55126789b6e79a44f
+EBUILD q-text-as-data-1.5.0.ebuild 989 SHA256 a7ac78be3eb197ac267ede984a65541ef80157e025c38db83c8fe2cd922a5a40 SHA512 0061a746a1432124970ff40722fd756938f9e50b63ed916d21a814aea7beaece049df2c5ccb9308824972928f4c9ac5fdaf31497731acf9609c8d5453809a7f4 WHIRLPOOL 0d5c3a68ad0cab46f52e2eca42c8bd97a6de5f46794055471189e9d906f389b4a6c811333ef7225a724ceb8a7f8ccbe3421a4002c883cb5be5ffc58c276da32e
+MISC ChangeLog 571 SHA256 59469687f85b6f46bef17db0f89e32f0c1a03de370a0ec43b835885ce8c6a817 SHA512 46887a884f622118a9e239931863316396af80a6a6b269f3a886b66919991c84c29099b68348c9f6ba9de1c395f37630254bfbcec2a90a127d0ae532dc3e39d6 WHIRLPOOL 73421bd47f56e60ab7a3d1708e1a935c70fa9dfbda2e1bc57c96cbd7b2ce9581eacca52209f1eee98cc2949398395460f74f7a9ff3c61ed60b1ce7102832604e
+MISC metadata.xml 300 SHA256 4e1617413f888847bece031b7531b3426f761f836daeb53850fe3e828f09a0f6 SHA512 3b90282d1ba8092665a1421e81e53a82dadcdf3c70ecdcc0c71e97e00d0ad2f7ba1e970d507ab9d354721cd13e08582ae21c482955372c5d8bc0caeb3d4505aa WHIRLPOOL f1fdae1d3e02ac374762204dfd0c29fb8baaf446d54b2fa5a8982c874ebf2a9940bc94551cce1153423e2854253518de05caad3e1eacf7193b16d8d491c45259
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/Manifest b/app-text/qpdf/Manifest
new file mode 100644
index 000000000000..4a2f64b2f507
--- /dev/null
+++ b/app-text/qpdf/Manifest
@@ -0,0 +1,11 @@
+DIST qpdf-5.1.1.tar.gz 7662701 SHA256 95d355d8fa5e1c677e04d884161de94f5438bf3bdc1638498796b042bad4a726 SHA512 236132290694730d7de08635560435d34ae44f4edbc1b887e494f2ee183271331827226e7e29e539d25d5a2ca1dd5815a387c46edc0b6fd898436bbb674d9993 WHIRLPOOL 66eee10dc5163f1e53afcbd02b71bab73598c28ebb9b005c26af4e58396fd693af7ed76a17fd0c29819b0fa08a71ea0158c76bfa0b0d452a78bb357277644459
+DIST qpdf-5.1.3.tar.gz 7681578 SHA256 d5164bdad3afc381568dbe8e1509a4a6a911d4d077f1fc20b9866ef8fad901d3 SHA512 676cc6db27dcbcdece21cb427c6aae14646389f4000ff111feee8fdbbb03fe715035e5236a08db4137f275a09ed0dda5c80afbdc5093fe7f56b69a0e335ab73a WHIRLPOOL 96cf06c0da63f9f3f5bccd422875c23e473443a4552de3c23ab9971104876fb5463cb6b7db86faee3aac04bddd9b59391093a7d5840cad801093162561ba459d
+DIST qpdf-6.0.0.tar.gz 8344860 SHA256 a9fdc7e94d38fcd3831f37b6e0fe36492bf79aa6d54f8f66062cf7f9c4155233 SHA512 303e3cc77ddb87b9494e26c35e0b45b42f73692054c56a00f2e4f1922633c6ebb45c8684992cd9bf32f03366fcc4cd7e7ec6fb9432d2dbba6e0b24395909b5bf WHIRLPOOL f9fae783c16a93826f825a8efe1a116cbde00fb19b8b56dbfcad7878557c106c8f7a58945af3002f2a72aa032247008013edce8943a45cca8c186b68bf2b5cd3
+DIST qpdf-7.0.0.tar.gz 7053781 SHA256 fed08de14caad0fe5efd148d9eca886d812588b2cbb35d13e61993ee8eb8c65f SHA512 7b52d67b4d2c428a7b0c1cd03b03a23f05d38d7e3c81041079a137919019ea5158f12bf95fdcfcff6b43ffdefe93a85127ced2a363a6b4b380cbaa02a3840256 WHIRLPOOL 939704f39badda6edd6fca114134a54888cfb2d9d97fb7085214eec7d25069432a7d7495f8a56201160e5f893b1f60aa6fb2d8bf3831eaf86299429cb892b809
+EBUILD qpdf-5.1.1-r1.ebuild 1316 SHA256 a7ae9fdbbd2f71b82ea1909183dadb9dce664b3c96a10a7a3da106e0aa521ec6 SHA512 f8803fd52e6f7ee42f364cbde11465b95181350b3e1ab0f7378db844eb9f183723805350347d27a12071c4da6c3f4ab0a604430e5894a6ed0028b1794835a234 WHIRLPOOL 66d938bb63e49f3278467d9c9faa743952e4253bde249cde285a567aec4a5e303706d76f1e38f2a86e48591311561127b61e88f41e52df5aa185bdc9e0ef7520
+EBUILD qpdf-5.1.3-r1.ebuild 1330 SHA256 ff52a27ea872d3fee9b58ad2fff521d847a02047cd16aad6a88ed5f28765fd69 SHA512 8ba17da0d59e2fd3219d5edb02d778accd75a6588fda5d218d62755a5e54488c80f513566fec0091a85a19ea55c0e49f74ad17454d9128104f9724d343b27ff3 WHIRLPOOL 03da2307e9b384f6a3cce33ccd69560ec290241af12d17b7d7a7bc9116286fc487f6e3b8efefdb4b879f7438add0894906d4c47c449b1ab4e010602617fec65b
+EBUILD qpdf-6.0.0-r2.ebuild 1223 SHA256 8af98c415883deab0d1661ae4bf327ffa363f05d641daa5b4f7c64d45ddb34f5 SHA512 9d11d2921dc5a579e9099c33a1b6fb9b3dfc30f38e5c928e91758fb96be0a478f68abb9ed8d41878fca9e34e989c60a92429bdaa9da293fcd3f7f6bc291f1819 WHIRLPOOL 95b35f73b24bc02d1da03f232157f0cfefdbb2ec9822e976de72abf2260139e2e56ef320556e76772bdb01dcc4f95dca6cf7e0cf8dfa4855892b876e7494b8f6
+EBUILD qpdf-7.0.0.ebuild 1243 SHA256 dedcbfd6e80a0edc22dee7412713409447889d066772cfa004db0ea290f8aef6 SHA512 d5cafcfa976ec5dea186adef4a5bd1102cfb04dc0844dd2894119446a56a043688c2d341d7785748643150e62e24a7794c57e0817e041e192ee7cc136224924a WHIRLPOOL 0018225541f6fb4b0464b3bc10cabf3dc68e39452362547214d2ebad92e1802c5da8fe4402ee057559ec1d839778c6ca450aca7d17ed8be322545051d4bfab31
+MISC ChangeLog 3431 SHA256 6b0ae0d22cd4abe74fcaebe011e12b3faceba88bbb7473e3fdd6af68b064bfca SHA512 64bfd6841c5400a6cdef5acaf55c44696bb6b23cf5d38110c50ac8752047b5b9cd15b98e60a611dca8676e1c5fd514718de50a36adeaa90e9b6711d658f16048 WHIRLPOOL f56a221608c138a562fb9b0aace8bb2ca22efe5e3dd7dd5bb6b87e18f65e6ea8cca55f04b2b95b95084f1a82d48ec3282929874fb9a55ed28ea16c465eff6398
+MISC ChangeLog-2015 6308 SHA256 9c969026385fd6ec61f8d31db32bf76fdfdba99079085fc0523da55e5f9b9e79 SHA512 c5ebd542a18be75c45a00e4c596ab869b85e24b5f316c49d2b1d3a3bb94865d183fd3cd65673e1282e5b7464f1b185f24c1447746e2b330cbb22365b93f0f78c WHIRLPOOL a29fc4ceb83cfcd87bd877f7e5c5f1acd3016aa4b946d91089b61f27da78d103e8aaa0ca79439c01a5419f226ddb86f6ac638d137f7cdbce63a64989e4057be1
+MISC metadata.xml 438 SHA256 cacf14efed5f71af911028d98a1b9b8e9efd779b94e20cb763104681c96b2d00 SHA512 4c1aa514207b18e7b4de0585545d1c7b5def7f42be9d43726801f9a9ae7b129b91802dedf4e3eb9f2595a26e3863918c029b927ab42b6aab7ab0130c000ff843 WHIRLPOOL e9f411b855c1f3be16b04a832064dca4c5d0c341ab7820d90df44d47463580d7896f003a2de229bedf93c96618c0b53034470f7fa3dff4ac4d2dac78ab851f46
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-5.1.1-r1.ebuild b/app-text/qpdf/qpdf-5.1.1-r1.ebuild
new file mode 100644
index 000000000000..350b27088603
--- /dev/null
+++ b/app-text/qpdf/qpdf-5.1.1-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit eutils
+
+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="Artistic-2"
+SLOT="0/13" # subslot = libqpdf soname version
+KEYWORDS="alpha amd64 arm 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"
+
+RDEPEND="dev-libs/libpcre
+	sys-libs/zlib"
+DEPEND="${RDEPEND}
+	test? (
+		sys-apps/diffutils
+		media-libs/tiff
+		app-text/ghostscript-gpl[tiff]
+	)"
+# Only need perl for the installed tools.
+RDEPEND+=" perl? ( >=dev-lang/perl-5.8 )"
+
+DOCS=( ChangeLog README TODO )
+
+src_prepare() {
+	# manually install docs
+	sed -i "/docdir/d" make/libtool.mk || die
+}
+
+src_configure() {
+	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 doc ; then
+		dodoc doc/qpdf-manual.pdf
+		dohtml doc/*
+	fi
+
+	if use examples ; then
+		dobin examples/build/.libs/*
+	fi
+
+	prune_libtool_files
+}
diff --git a/app-text/qpdf/qpdf-5.1.3-r1.ebuild b/app-text/qpdf/qpdf-5.1.3-r1.ebuild
new file mode 100644
index 000000000000..9d94e855b41f
--- /dev/null
+++ b/app-text/qpdf/qpdf-5.1.3-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils
+
+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="Artistic-2"
+SLOT="0/13" # subslot = libqpdf soname version
+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"
+
+RDEPEND="dev-libs/libpcre
+	sys-libs/zlib"
+DEPEND="${RDEPEND}
+	test? (
+		sys-apps/diffutils
+		media-libs/tiff
+		app-text/ghostscript-gpl[tiff]
+	)"
+# Only need perl for the installed tools.
+RDEPEND+=" perl? ( >=dev-lang/perl-5.8 )"
+
+DOCS=( ChangeLog README TODO )
+
+src_prepare() {
+	# manually install docs
+	sed -i "/docdir/d" make/libtool.mk || die
+}
+
+src_configure() {
+	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 doc ; then
+		dodoc doc/qpdf-manual.pdf
+		dohtml doc/*
+	fi
+
+	if use examples ; then
+		dobin examples/build/.libs/*
+	fi
+
+	prune_libtool_files
+}
diff --git a/app-text/qpdf/qpdf-6.0.0-r2.ebuild b/app-text/qpdf/qpdf-6.0.0-r2.ebuild
new file mode 100644
index 000000000000..f00413270dcc
--- /dev/null
+++ b/app-text/qpdf/qpdf-6.0.0-r2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2017 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="Artistic-2"
+
+# subslot = libqpdf soname version
+SLOT="0/17"
+
+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="
+	dev-libs/libpcre
+	sys-libs/zlib
+"
+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 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.0.0.ebuild b/app-text/qpdf/qpdf-7.0.0.ebuild
new file mode 100644
index 000000000000..8aee07529518
--- /dev/null
+++ b/app-text/qpdf/qpdf-7.0.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2017 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/qpdfview/Manifest b/app-text/qpdfview/Manifest
new file mode 100644
index 000000000000..d4bf6b8f0b6c
--- /dev/null
+++ b/app-text/qpdfview/Manifest
@@ -0,0 +1,7 @@
+DIST qpdfview-0.4.16.tar.gz 636095 SHA256 fad416e8fefc3057fa1b8d12d964c7eccd16dffe0307a0d6e9d55a543294da7f SHA512 d3ac05fc51d48533e44e58cd19e5d222a8bfbc9da4df02ece6a405d2fdd3346eb4614816ae91e89facf28e107b920ff3ce7b2ccc8c9b7832ae2595ef70d65584 WHIRLPOOL 47bc82937562fdcbdf17f567bb0fa6e8eebd2e657320c129e9fd4f592c27eab855e7d2d69a22b45666509ace93b12528811b0671cb9483607448152bb676f11e
+DIST qpdfview-0.4.17beta1.tar.gz 658978 SHA256 60206c5f76410a35098e3c965552cec08cd85941776ea6f6b207d7ea63ce940f SHA512 803bd9a1165fc84302fb3c7734127eaab754bd2bf23083a1bcf340810fa617800f3d0069eae7b1f43fb528ebe17a6a32a652efbb902d525a95efc31efeb1e10a WHIRLPOOL 9ed967656b0e7e1f8828377d667d27a8c468f687b2df76285e1502cbdf0c5183bcec31bd8189ac80455395154e3df447eae1798b9581d05c7a8c24544b7d467b
+EBUILD qpdfview-0.4.16.ebuild 2136 SHA256 b9c8580d80cae221b0800e84c485a1510442c33353023bec42fbe8726a87b757 SHA512 17b67cceb5dd0a3ff56b53f1f7cd2a951c5dc7f3e91b88bf669f54c5258d084da76622e8eacbf5cbbbef8376250dc354f38ee7c5b71ded124ad13263af6e29d6 WHIRLPOOL c9f9e2776d563f40aee122466b7fa6ccf7ed2800cfdbaeb4fca230d91daddf8c66bdc3618f64ce9179b7ca25699775f96a742be93d239142635956c7da013637
+EBUILD qpdfview-0.4.17_beta1.ebuild 2169 SHA256 5a27a75d91333658235a8eafc4e91af68cbbeaa204f4d687a43bfed6a5d7e5d0 SHA512 14fe234d15e1f6a38a8ba2c744c5f9061c21969f43bab039227636eb69f25fea5f1a91ffb15afe84c3eb92de25ef1c0db693b02a074f365e9069af5ae145ad24 WHIRLPOOL e1fceb7f92e8a2fdb45bb96b46f56b57e5a20cefda42a4e650f5d171898aef35beea66c50b7879aa5c7cf0e97bff60d89716b33dbb7d8711d79d1b44bd9397bf
+MISC ChangeLog 4017 SHA256 758c62670b511d5f5e6bd98aa10d4632517f14709567f918c971d89eb2b14da6 SHA512 b53ebcf52c69fdeef2e8b443bd02979ca862c7be7594e2e0f153cb619e7ee81d1259024530aaf5ad31ff32d7019255ead1abe83c25cb00d9b7627b7057e238f5 WHIRLPOOL eb5c59537da43bef49904f7bc7eeffeb22db309fdd7b506771b3fa84a7b291a96d3f9d5f3b4fe8a3822f04dd0780e17b0da6ffacae0fa8097a9f6be76c207f82
+MISC ChangeLog-2015 11060 SHA256 4ebf33e2c1cd4f1eebdcf332d4e5726130ac5b7cb72be83d594ea4f3cedb650e SHA512 247ae9e9375993208b3cec76c61abb2f642e6c30b5e06176c5f32cc7db1a1c45f2e4e36da2809171090e602746544d659cec4773c4176fd9c6b98c0bdd760c7d WHIRLPOOL 8362376ff3aec029438936654d4d29f7ea668c0a9825c5b65460c02cba42f27cd134622ceeb8f38bb76bd15e9843a28e3775e816f4114a79e655fc4136764cce
+MISC metadata.xml 534 SHA256 f1dfee48e5bb767e4280f6285a400d697ac30f9f80ef43e1cb8a47be81b9a9e5 SHA512 e086f5e92c5ad9058f13c23c814a5cdc988a09cdbebecb1018b59d32a756dc2766b13ee1c3e09966cc7e221cc1c4ee26f9bf11c50610f94b28c20a34c316f133 WHIRLPOOL 00488c21cda0206d84de693e4264103ef0158e26a318b8b515a9a4a36f977d341686892dabe9657bc1accec2fbd17e747f03ffd65117859014a6e213fff65f3b
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..89e07a090fb5
--- /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/queequeg/Manifest b/app-text/queequeg/Manifest
new file mode 100644
index 000000000000..a23fcf9043f2
--- /dev/null
+++ b/app-text/queequeg/Manifest
@@ -0,0 +1,5 @@
+DIST queequeg-0.91.tar.gz 69449 SHA256 44e2f2bb8b68d08b7ee95ece24cefeeea8ec6ff9150851922015b73fc8908136 SHA512 e5366577e587fd3f286c917135cd043ef599ef6ee673757f3538668f749ce6a57c2a257f31f1e9d38724cb6ee4680b4401800c23f84ae27deac75392ab6c5e34 WHIRLPOOL 82eef90391ac6933b03e10fef46d5c5500b9dcd9cffccb4e9412ba6c13ee2cb43a2cf9916bf0b32a487f315fe78aec9b3613a678abc7681e9f842fc24f4f7027
+EBUILD queequeg-0.91-r2.ebuild 1002 SHA256 784ef9f22d8f3979d21af8d8486671433dfa14baa22740175d03853e6216d184 SHA512 dd8b83be480c467dc5a49cff67898d3787afc0aa738f661009e9a6fbaedc0bbc53c1b7dfb71e3fe7ce36660746417c8805a5f6b320755f6881b909d204719494 WHIRLPOOL e5e0a2a7f7e35f667b6f01db577a70a696f9f129da7e5a8d7c94cc76d82e29f7ea42c98498ce90898148cb8f1649f84bc080017bc2998626d791366b3844be83
+MISC ChangeLog 2428 SHA256 aeb63d0c9ef12691063749df63cebd39608240d65986d8a272573c506ba596c3 SHA512 44451c59a150dbdf0966ace8ebc4cd36fb01c546ab2abd31751e72e5bb19408456fe79c43d62634ec3f10dd3190c98961910a95bb9bd677098df7f935e517966 WHIRLPOOL 6c45f5acd13172dcede57dc00942c5319b84bfef5f010a489e317c15789deb31bc962fc4bf9131d1c69749f091722f3eeaca22e2e906f352e0f5e6f56be3c493
+MISC ChangeLog-2015 1572 SHA256 c92686319fc1aad89fdd84ad144c057d417ec2bc0254b791e46d1bcab222ccae SHA512 fd268d73888646cb7e3c5f6929ebbb0dfee85653a018884007dea356faabef3d81c98b8d25336ebcaa266eb3d1ebfe168e8676dd49b0f8a926d20765c30b77af WHIRLPOOL 64666029bc7f8249c13240ea253e4547206562761e888c156efc85923da886649e5f682224952b60a587c4d6409c2e34ab93245506620c8edfa4e409689938d8
+MISC metadata.xml 390 SHA256 2e4cac34d14063bdaa189730bf48707ce7a0398fce7fab544c09c6f714b0115b SHA512 5a750294043ee99964070d290dd178659f8587c5fc9e13d73f78c9a73bd880b55ebe48eeabb66181cb24595a566c5767c8cd01f7f6874d279156b746f306e1a6 WHIRLPOOL fe4c72ddde257fc4f11b2be3476bebad4a83939f64225edb6a01056afae986bc1479f2b9b2cabc16d72ca0f6d0868fd02b8407901ee1054ccaf7043c88e3ab63
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/Manifest b/app-text/rarian/Manifest
new file mode 100644
index 000000000000..f8079caec635
--- /dev/null
+++ b/app-text/rarian/Manifest
@@ -0,0 +1,7 @@
+AUX rarian-0.8.1-fix-old-doc.patch 629 SHA256 2ac6f3d6df8f221fa36fbe4a86ee9a9c6d4d8a829d58d1d85afff1c9b959ad65 SHA512 7847e99bafccef02f2a153dea2c504ed69a2c2a19fd68496003f5ddb19c5316da03ea61711605b25fee07a04d522a99bc84c128a5a69e6c5e66a468d03b689d5 WHIRLPOOL bd62c4e33a0d1ca27dba1e440f55d205ac34cd75891bf9e2e8f15fcb73e155b56a2c44b57375885e8d0a1294cfb8f5b15e13bde918f8a0cb6bf71671683a4293
+DIST rarian-0.8.1-r3-patches.tar.xz 33508 SHA256 204f4f57724bc4c6f914df5cecea0b799b0f0f166f12e6462ea3762c76c6f234 SHA512 a6a258803ce165854047aacd1ffef32d8d5c271cad3e6b74fb3c694ca6a0de9a8f253c89f9ff53279e7228ae401fad06721f10a6374a03a51bad76b2ef969000 WHIRLPOOL 1824c7e537e9d10e126e3bf8b0b6ed388394ac47b29ea5c5cb4685557572b9a61c663a0337fea34f982782e625c559f549b371934b2f125b4eec1cbf4ee258ad
+DIST rarian-0.8.1.tar.gz 459461 SHA256 b410d9581dddfabe93e29f9e235a9f9d04d33d8eb12afd0f5ad3bd238c55adef SHA512 ddc640e1ac210e9dc3fcdde6bbff6e21dabe97b160b531cac68d47d1b831dec71b7c4aced9819cfafd8f89f290920c4e33550b8e29d9872a1c1a202d6fe8e3eb WHIRLPOOL bd11206a4701e1771ebd5d82123d299c1c3cbb7ecfa6e00654372494d07b8f47cdfc6e88dc8ea6a405acdae0f57b12ae8c927a952f42d55cdab8f1214f0ac237
+EBUILD rarian-0.8.1-r3.ebuild 1851 SHA256 819994926e59c7a96e3496b81118fa2fa91588478032dea112179cb1f19bf01b SHA512 41e5bed59f5f19e871ad4fcccbbb591c22ee37c6cb574e8dc9eb7fe8e3821481bc761718e43dfe0f4a0892d24df1f52c506a4640cd64cd73a5b787d6bae74091 WHIRLPOOL 653a8d29d78f6edc5548d7e41be2e163c4ed17d146fcc894692aee59428c7905db5d6279e4ce1a9927e690819df652de4ad9fa91fca81d3d78a276c8c9e74281
+MISC ChangeLog 4088 SHA256 c93e1b2e90f0722f673cf8eb25f50b6f35fcc3f772e48e96a938dbb7a9143db8 SHA512 6705d0e6c495ea580cd9efa024ad3b85eb3e7d362c01c8a274810e40150596ae7d7d67e66697f9b3f1f341ec811e9d15690a722fb427f82e0b7aaf733f178917 WHIRLPOOL 23acb5626e544388a4178e67dd2141b9ec8787ab6e265ab5ab89b5d1325b7a888c9389c82c6331b4409149a323277906310b946cc5d4e92085d061fa9f17a0ba
+MISC ChangeLog-2015 8686 SHA256 22356f0a1441149e0c30547e3bc82c62e8d447482159cd85617faae593ff1ecd SHA512 b2b2f3bb9cb9528558dd76110ecc1700ad52326b5840646b7662bf1236dcac7f9752b7b5caa02e39f4f46431ba0c9b4e360b332f0834886742fc2f69d38bb9ef WHIRLPOOL bfc9c05d1ed1932401cafef67d1b0566df8f0dd78d32effb7b9b2d338ea782fd908e454306bf6e85f782e6c03ad6a078ac9ae46a3966003d45ad45a1df0c035b
+MISC metadata.xml 249 SHA256 4505b0bfeadff287958620b7dc7b7209699065a8f17139a237a5dd409a726a97 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 WHIRLPOOL 333a938ee1d2124595596c572697bf5ebad523a92ba12005cfb12e6bb6270881a94a911f0cc9c1cf2bb571559e8271e07dfd307dabe50058236dbe7103562b92
diff --git a/app-text/rarian/files/rarian-0.8.1-fix-old-doc.patch b/app-text/rarian/files/rarian-0.8.1-fix-old-doc.patch
new file mode 100644
index 000000000000..f84f987d8f10
--- /dev/null
+++ b/app-text/rarian/files/rarian-0.8.1-fix-old-doc.patch
@@ -0,0 +1,13 @@
+--- util/rarian-sk-preinstall.cpp.old	2008-09-01 20:40:21.000000000 +0200
++++ util/rarian-sk-preinstall.cpp	2010-01-30 11:29:39.000000000 +0100
+@@ -96,8 +96,8 @@
+     }
+     if (i == 1) {
+       /* Normal path.  Add file:/ to the start */
+-      new_url = (char *) malloc (sizeof(char) * (strlen (input) + 7));
+-      sprintf (new_url, "file:/%s", input);
++      new_url = (char *) malloc (sizeof(char) * (strlen (input) + 8));
++      sprintf (new_url, "file://%s", input);
+     } else {
+       /* Don't know what to do.  Just copy and append file: to it */
+       new_url = (char *) malloc (sizeof(char) * (strlen(input) + 6));
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..3352e0728408
--- /dev/null
+++ b/app-text/rarian/rarian-0.8.1-r3.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2017 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 ~sparc-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/Manifest b/app-text/recode/Manifest
new file mode 100644
index 000000000000..4430b7510445
--- /dev/null
+++ b/app-text/recode/Manifest
@@ -0,0 +1,10 @@
+AUX recode-3.6-as-if.patch 472 SHA256 9ab5b40dd93461ca95c5f5dd197bbe0767c45fe64fb1898f073a24c5705822b5 SHA512 5209779be9d03b770f679c2be736bc68a710e1c064b1f4a2fbb9963a8ca59a258a22b5d34ed6ac19e7a40ca83c64995f37aa9f466e49841ba2662b89d0789763 WHIRLPOOL a462c1e46c966105cbca839d850062a90a8973ec6b1e7a40b8f54df85b243dde1337338d67e9768fae5eb4c34295ad4dda3a96ee173115092b090cf7370a478f
+AUX recode-3.6-gettextfix.diff 514 SHA256 eb080ec09e508f24974d3bed2dc114d2d8c5d69615e98beea67aa07d4a1e076b SHA512 71408313ed269aeb8b015c171a6d16663e2bc7a3fe5ad4e0dc16ae0ec0e1f769605d92d7e32aec908a42a5ee148cd1f00ad2c069e947c0c4f64fb3b9f7dfb1b3 WHIRLPOOL 8487a9d51e16ff97e27db2fd10d787adb430a9b2f7a0935a76a6ff889d974a475acef0452dfd61db28be429c9769c6d1eb4255a9e4741574949fdbd895f1775b
+DIST recode-3.6.tar.gz 1751886 SHA256 e3e6a4f3f8e5c6052ab70155990c074d87aa0b614fc1be31d194750d1d962fcf SHA512 68de277ac8cd5f6023bb077b959ab5778a78edac1299d507bab906824080b6f86e9bfcd89169aa474197c2faa9af2ceb1ed272c8dd4d50caef373afa05daed1b WHIRLPOOL 08eef3eea75d1898800d9f18eec95f50706b4e75285ce22e71723069f7e2a07ee762693c8366e5139add65b319276ced71b6f046884c1e75eb89a3922b7f3dab
+DIST recode-3.7_pre20140303.zip 1902903 SHA256 baba145f8c8aa7ba223419dadc942f2182450925283c1067fa16f87b3a9b3857 SHA512 256d79d6f9de18bbf53cb322f0467411ef2ff8e4f242d073d7302fbd05e4942373023514d0a88e33701280c1cb4e0235d76efb9220729cd1f91f9ad8fd2407de WHIRLPOOL 19290f675cacc30ee51f198d765d27af9d03d7a6e0f048b1f14b812f7cf11533a542dbd1bc13c61037ae327a5b5693e07a5bd9b1aa3d244266f2f658ca378dfd
+DIST recode_3.6-20.debian.tar.gz 341117 SHA256 ec0e25d91a8d5e4a61e8e2876c338ae6c1ba89018f02ff1ee4eb01cb7c44e7ee SHA512 bc586534e77b49da7d387187a8ddb042a12871f87f4f32c818ce7218b7254ac5ba6eccb14aaaf0312579f27958883f2da620016a7049c3af24c8bfba81acc3ef WHIRLPOOL 72f00b3d6732b8794456795d847dbb2114c2577b8d5c9683c8fcb41d3bd92548322dc9d73d38af3a4811fb531d9482d1a5d37ee6600cf281bed4ceb6e794b058
+EBUILD recode-3.6_p20-r1.ebuild 1665 SHA256 de56d3a1ed237c627a5621910ca44a1707227f8216cd4a503375dc3265747c80 SHA512 deb02a301a74b69c41c2ce8e7e6f4915bbfab252351b967a6f50aca472b6d0b839bc766f8e46a8f1ba591c5e294d5c985a59e34f975300f9eaf859bfa681d0ae WHIRLPOOL 315b95e0915ca87616e84599a2e8b034f70498651fdd662a34390fa9b880851d610b5bf467c65e25d53ce1bddea46a31605130c86bd7fe57421dcaf9a7667c6a
+EBUILD recode-3.7_pre20140303.ebuild 1112 SHA256 8c65ed1fe206dd7294437f584d644da8c1706146d67a4da4350a4b7229ad23dd SHA512 f402ca775006bfef301b63759204a47bf46719b954912fe0235bd47b24998a13fc8cbb167277eb3aa51e60038ad59a08a29e3e4b82098cf13a587b31c1e79c35 WHIRLPOOL 58bfb9f3ce871aad5951c4570b113bbc03883464463224b909008968346a1659ef37481011d439c6187bb5e864bf80959d4bc99e9c07a9baf4182bdbe0407417
+MISC ChangeLog 2896 SHA256 7f9886a621c3148a29d9f008c859c0ffab832347c8a07304d67d09398132ce66 SHA512 6f295bc32b20db686bf6f246ef71a4733f69bc0adaf07d29aeb6a472eb5cc3b4e75267470ff1e89d5b1a1add1758f4494fee966efe40df3c5917794d3832693c WHIRLPOOL 268729f264b0791eb2a2019455db49708380d1c5acd0a0bafa680d59132105f1d6e85daf9bb5264796f052d56ad1207be51ec890e959f5c2d2cb9e3d321b1642
+MISC ChangeLog-2015 13536 SHA256 fabb10b0e09b2a656a9a9d3c4e17c3258c4a07db217a3c48c40873751ba4055e SHA512 d811e5dbb4a70309a9159d5643b3e35dcb105001da9ea519bde2d79529daaf44d4761da7d9e54289a6894fcd212683a118b56a04e66a85545d4b6086d681e4a0 WHIRLPOOL 073da415ef94cfa3850db7941ba3dc8a8b821815d4ef0609c765845d49e274bc0ec41df7f173dbad17bfebf50d1c162339569e37e43cbef5c22c1ea3445740f5
+MISC metadata.xml 271 SHA256 fb77ec802242340d65f4f1cf61787ffa6fb4d57ed02f61feebeed67d2dfb5467 SHA512 3e98f5382cf789992bdfc0f32e6e36eba31944be654c03f2ed9bd00baf56c8b768c256c4f8778d5775d6df38da4afcf8e32b6e6495a1ecfc8e7982c7c8943b1b WHIRLPOOL d6212acd36a69fee56b014b2e1724369857e776204569ac774915e589fd2242b3cd961226d9f125eed452d6c420468e60f038c9b49d1d2a8827d13766918f872
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..c65c85ddd67f
--- /dev/null
+++ b/app-text/recode/recode-3.6_p20-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2017 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="http://recode.progiciels-bpi.ca/"
+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..7ec8284a8d04
--- /dev/null
+++ b/app-text/recode/recode-3.7_pre20140303.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2017 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="http://recode.progiciels-bpi.ca/"
+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/Manifest b/app-text/reed/Manifest
new file mode 100644
index 000000000000..b1dfba5f106e
--- /dev/null
+++ b/app-text/reed/Manifest
@@ -0,0 +1,5 @@
+DIST reed-5.4.tar.gz 32414 SHA256 226a057aa5db705e83b685207d635d0d3b983999f1e526e0768aa56b0e7c02a8 SHA512 47216c6444ff2a53a0f6ad0e598761d078fb19099507e5687d15be7f875664d3cb9b74f2a4af8c450d179032e46785d96abc66c2bf9cd264db2f87aa089512f7 WHIRLPOOL f603ab7516bb09970ba1bdad52dc5aac7c76ceb61f7b74e3d7adf3eeb8382c7d3ce982b0a48c0b11fad041398a3c5cf7287a1b33e11bdc94aa9032ac045494cf
+EBUILD reed-5.4.ebuild 904 SHA256 6c036b7b78b02832041f4c09389574db1a76dd81e7ec8e64d22e47c881e31091 SHA512 192c30fc19c4c0ad2af92eca1864f956572e43b722d381ac6a84e5c2814e30f3e750159eae4a2a181b71b73d5b4a1811aa6e96a3d4de65eb26b3a11b94023666 WHIRLPOOL fe7dd431e3d6d7927b5a338bb4218ad144007f8cc0923d1e8edada78594537ac3605420107ec3507c35fc7725e082356c932a34cd0dce142799c32d313e66bba
+MISC ChangeLog 2509 SHA256 4ba39b6257f1ce43671b029fb5253fd3fe4109d8cc338da71dd93a97fdd13c44 SHA512 40c1afc400a036cf28f8a83c7fa140d900345c12e659e856597124c7b3b817a76d3d59d6a978623807394c30ef7ed07f602cf8d7aadcc12c4424009ce2567a93 WHIRLPOOL ae17cba6d3255ccf68356f154532b3f3eb25e3bdd459dcbafed7e5e0cc259b7bb63befe3a6aed9d93cd155469a6a4355d56d973965abf51dcf89351ffb918a1c
+MISC ChangeLog-2015 1539 SHA256 0eab1df9eb71f2ec792f8d78a606179bace213ae67fb75d7d226036c75d03052 SHA512 ade71a1612abe8973afec5caf063f2006ccdff6ca89bcc7905c2646bba7e801a9bab8004824863027f1d1ae1e02eea0b9341519dd5b2c9814f23795c5a4bc76c WHIRLPOOL be14ff50f3305ed97c9fe0ab15a09d0522585c201cdec057ac7876b0274d3375c995478e4281204466d1e3947fbf0a8212821fca22e24d38f85403c722661a6b
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
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/Manifest b/app-text/refbase/Manifest
new file mode 100644
index 000000000000..d180f83f43a6
--- /dev/null
+++ b/app-text/refbase/Manifest
@@ -0,0 +1,6 @@
+AUX postinstall-en.txt 837 SHA256 88ce87080451d17dae1e9897af7e9d53f2006817e1166c211a95b950a6556b8c SHA512 fab28207a5d3bff1c8cb499ced404d5ecf2dfcd27493c0ba8b4cedd14518a0d2fdee16e61c28c6d14daa486de80ef33725cc66b48f4fe1ec9e150e5b037f9f3b WHIRLPOOL 88d25e028b061d5fe50b6a336878f222f3c33682867fdbadebf7f1c3a104c95b89a3dc1c57ae68b59c7750a974d05e5e4df62f04c0304fb9ec23d90a5d12c7b4
+DIST refbase-0.9.5.tar.gz 1395726 SHA256 b832ab7f0e8c0ded88c7210d5314be849491ea913b78486898ffb3535b4391eb SHA512 68022eee0c15a4e733a8eef8cd5ca15d6e29a4f3559539657c4a38733a4338b51ef4b716cfd964bdd5eb94dda3c7f012b6e01deb59879f3dbfd79d4d8ce11305 WHIRLPOOL f85609b99182d0fb7d16b39e900d857773136975624b110c6d9a23547682785e416d44797d15f0880b6f342fb30a1474ec362f95b40119202c4454f7168b6b20
+EBUILD refbase-0.9.5.ebuild 904 SHA256 d1eacef42327e93c2844e0dad6104bc567d4e47a623328b38028c804bb68be73 SHA512 42234f423b8e9c3a6f8d3c878d7974d7f672689cf9a6fa61d01978296d6faada55c4c5fc66c1338384ab7481128f19fe01b6cce8d2b9bbd910b6071fd94f4d4b WHIRLPOOL dd35b15e9511eac3bdf02b8c592fa8d8e091b66b02e07d2b4dac186dc7a67e56bca9c21a79e53f15f8c31fc02069ecfedbf4e0beedd36b9052c7db37d1383ee9
+MISC ChangeLog 2707 SHA256 e0543e20a8604491ebc0c55c31b8d8eaf092ba5372dfa715a7e87528820e7bab SHA512 9fbea2fb4b2a47a9fbf53138b81f140bdffdb3d65fb00309d30f8fb0247a8ecaffe9d14092fa0a2161c6f53b20ee0a6d314386a2aae1e689e4cf7344c964dcaf WHIRLPOOL 692750d19622b9e9b2c6c33a4c777e3b92c5e33d574d734d1755329c5dfdbeb36d5179227b00e6df38e7f58ba1022916487d9654888f21570d1b7bb562bf2088
+MISC ChangeLog-2015 1882 SHA256 6c79329eddf635493b290358a13460984f6f5d103c9c5567ea8b26bf64ee2a91 SHA512 26b8dcf84cc1b49f6537ebae5339ca871756cc5d1c3d404660b1a59d8144e69809a163f1739b5112518d7ddf3bff4eba648e9e3c568e25f5c17550cbbb7ecb36 WHIRLPOOL a3a2a60b50f66c5b61530db776202e8db4ca95c2efbe83b43fc4d6aab2915b3cabcfc0eef5dc78392e2f7c78970ce64e21ac715dda013ed4820c9c2a1bb2e718
+MISC metadata.xml 330 SHA256 910a9bd2250014f907a4273b1e4288504f38dedb6d38bdaa1eaec5b89b2c7ca3 SHA512 0fbcf620763f7e60e102335842267a1b934695c96b50055e5d338b5504592990c8817afe416cc3b48f9da72aa3365b83ec448165d07446c20fcd4bdd6e5ddb77 WHIRLPOOL a92b2b21b352fd431949bcefe98bc06724f17f4844239fa2ee2fe58de7b1c1d581cb99f7ad3b83e1b714a06cd687c3ff20b06eb091595f12c6c86a1235d4e663
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/Manifest b/app-text/referencer/Manifest
new file mode 100644
index 000000000000..622c2274e085
--- /dev/null
+++ b/app-text/referencer/Manifest
@@ -0,0 +1,6 @@
+AUX referencer-1.2.2-lib_path.patch 809 SHA256 d9afc6a1b4eb15a546bc6114e09f115e18c94d800e862d125b8679f8fd94d437 SHA512 4857eaf468aaba555e7a74b23f91049c68746a6bc1a80d4df287a3363f92871ccb879bdf7f0f8dfb6f18a6f0443fc61f743cbe23b164de4fa0f8a076f59a839b WHIRLPOOL d84562ce6abb1ad695b704aa2694b50dea4e30c6e28a1eaa51f307d9349d02bbd772a0d23b99f51923edce42583579c35bd074b51a4ce106c656c8a2f1fae093
+DIST referencer-1.2.2.tar.gz 694421 SHA256 992d36a2cc10347704e4c77ead94d5e8952b0512a8885e0991461df88b31d964 SHA512 de8d759890f283e7863e6174334bcb051edf70f87a6fb06f724ffa1699be60c83d0191bde0324b571fab0801752a5b92fb507a3cd337fa9adb5ea7d22b280907 WHIRLPOOL c1466878e40c4a46dbac084422b0a023e3a189405a2eab181cb3923090c9e078313c6b24eac66faf48e00f634c87e96572cd30607253239ab769c5402c19b49d
+EBUILD referencer-1.2.2.ebuild 1156 SHA256 747c26ed871b35e41306bfa49365000135944bf7c528cb04eecb7c01b4f40d9e SHA512 2566c111f2d65132ed4a79c386e19d2cec91da6916b3012d42e7b9e6a019ce612035c751a9fd4ec8f7f50c0496211e1ff742003b87fe80ad76cbd709bdec41b3 WHIRLPOOL 63b9528ddf8607fba7788d09ff67688bfd54868f67278f0232c645dd2703b431fea0f3778b8eb8855529df04fd509825b392c1a9c8e0629c3f8921a62c14f552
+MISC ChangeLog 4207 SHA256 fd32835ba4e7718f85cfe21b677ab242e118d4b77a5adc121ed0505e7d32caff SHA512 41202a7e3c5309ba438a6b710704a4dc5480018feb4619a7f65578b1578cad7a68df2bc6a630b290fec865b7acc5e07b6e40d695e4dcd46fabd339f3377668af WHIRLPOOL d71baeda2f7a4f1c6a81056b6b1e217d89b407cbe16763de3b081ca09417db3c97efd1d960b2d8fbe5c63170e09036ff2fb21d8af847182c118afd6d065eeee2
+MISC ChangeLog-2015 794 SHA256 9a521c761aad7b45155572d6ea70ab71ecbdb83f1443e8ce81b24072fdc70bba SHA512 d589442735ad74bfd132723387c129600eda4ab972cb3c4cffacd7872f2aa3df9f3a466dd949d55c9d66a8dacf464b62877f771779ff426c81c5573b8308390e WHIRLPOOL 318a069d2871caf98ebf71293c418476e586a576182a5be486f7e5b3fd8908f47282f2e1f83526aee94bb07a1ab543821418c7e1466d134b065fc16e1b80378d
+MISC metadata.xml 530 SHA256 1b6fa709974b4173b2eb9c346ecf7f4e461ebc6699a218edf188b8ccc6729c73 SHA512 0fd3c2ce3397a850a02364dadf3beea67f2863ed6d1834d19aa6068953178f6a03667c7133f6f96d39323254ceb0fd40a30a4a0404e54254f963a15e83b1edaa WHIRLPOOL c71604bc447b08d15afa457caeb4dc146ae3ebc4829ee4c2948a32df306b37a69ff188aa7136671cef63e9d0963faf65fd5536fa8e5edfe2887fc9fd0ae4f52d
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..82da138d5883
--- /dev/null
+++ b/app-text/referencer/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>dominik.kriegner@gmail.com</email>
+		<name>Dominik Kriegner</name>
+		<description>Proxied maintainer; set to assignee in all bugs</description>
+	</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..cbd54159ff5d
--- /dev/null
+++ b/app-text/referencer/referencer-1.2.2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2017 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/Manifest b/app-text/restview/Manifest
new file mode 100644
index 000000000000..9607aa731d55
--- /dev/null
+++ b/app-text/restview/Manifest
@@ -0,0 +1,5 @@
+DIST restview-2.7.0.tar.gz 29448 SHA256 e7842100f3de179c68cfe7c2cf56c61509cd6068bc6dd58ab42c0ade5d5f97ec SHA512 fccfed505832b85bd4fad964f78b0de371ea0a42ac5cc700a8604e413743a236b70f0160edc115d1e9cdef03f2aa7fc461893f40e01203a048756887f655f65c WHIRLPOOL b72e5c4b179198e51facc0b8ce9b3aa713617100adcaacb7359e58c6d964300c4e2cb60bd73ab059ed4d1e20e55df098df0b5769887315d70fc85c3d520305e1
+EBUILD restview-2.7.0.ebuild 725 SHA256 291e92bd200fed231eeb45380dd4951fafa411018b704d22bc93d4f3997b61a5 SHA512 a47dac5ea27b6cab34f5e60d8f021286acd0da4455b017b8501f6d66378eaced52f2dcd907e9192938c0e5cc9aa127dd690cbdca65826d6b2966cdd0f39c9b33 WHIRLPOOL 7b61c6a161c45b8c77ed17d4782fff18cc912b8fa15bf252822299bd9298e65e82554557ea5311f2599941fff026710060849ee553ef9e42457ead13e8827bf8
+MISC ChangeLog 2841 SHA256 c74546974a47b095905184e5f771bfc8526c0bb4d7fb63df9dbc8e885f65ddc6 SHA512 7858bd3ef9a947558d4795176fd43a4c046f0823e62ab0dcb102f8c18a7a641ec0217b1a1e6592be7eb90c85bf6139921fbc4ca698d483a72a30747babbcf61c WHIRLPOOL 6581adad7d97a44bf04eb432796e7ec58a72b1cb511df77918a9bf57d88b96dc5102323ef0df09b3b5607564dbc9db75f701af055039b757285127f2aef91639
+MISC ChangeLog-2015 1029 SHA256 86371fa677b7ed8c93f071131b35f4ebc46d31d11591e4d20a25ebe3a776ceaf SHA512 8e53543fb48c0aa0e253f6c4c86c912b035ac5a69b0f36ebc402015556c3309c504ac6f112fd991fbd4e4f5fcb39ad3e57d1449d22a4ddea2562619369f59310 WHIRLPOOL 0a1e7df4d0fd6c0d507866cf72723c329a1fb1730b2c108d6eaeb8d84902f7ee33b100fe385a44c47d326979fb3cab4a06c404867006e6980c1da328bf9dc9dc
+MISC metadata.xml 327 SHA256 e3edb617800de4ac3d3f1035a31082f596ccaad2d7d1b96122548fe0cfe501e2 SHA512 f4fcd47d4f411bbae5e9a29055a34a0e4a0367750ac10ce57bec7d4c32dbce43679e041b444eab258e616b571936de251fa22fd06aa8e3258cc2c882f913d3b9 WHIRLPOOL b40e202d986512db10af3e454eb242e9b113dc4de8b2c96335eae16bc493f0d962ba78b7095a168722747d3c6fe0112c05d8b7c6c3727041d5403f0f6438cd12
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..88ffb5063445
--- /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.python.org/pypi/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/Manifest b/app-text/rfcutil/Manifest
new file mode 100644
index 000000000000..faa52749b7a0
--- /dev/null
+++ b/app-text/rfcutil/Manifest
@@ -0,0 +1,7 @@
+AUX rfc-3.2.3-index.patch 998 SHA256 7ccf5a4ca44bf97fbddaef08f1a17c54fd482fff2a6ea65ec2d738fb1edf370a SHA512 cbf0dd87e6879e2510da0cbb43a62ac1e772afda178d8c9d6a8817c93b8edfa2dda98bda0b57c6bd3abdc06e558b8656ef9dd7467cd4efdba391a01a1f47180a WHIRLPOOL 39f7d578970958e0b119d052154243fa8e08a25eb86e4764dcd155200a0a863e67e4b1bff1d8c9ee7d7e605d707a9e4cdd789214fff4393de2a2ca9e091764c8
+AUX rfc-3.2.3-paths.patch 839 SHA256 8058e668a8d9580b816b40f28c7efaf9d69bbd08f048afe381bf3f1adc606462 SHA512 be0897633ed1a56ccd5f44b018af030a9eeb6c02cd792dfe5cc0f3280f9a9319f5c48a2f71a6928b64c6ec7360c3f7c18ec74d9cea4039cfd68e35147eea1d79 WHIRLPOOL 9d2278230b873271ab8fce49ac23b39fb440c536bac5fbcacf290334ffc8ca37dd863c6da288ad063eca8823fa2f6ac56f9713feaf3cd1a3a2ac12ce614dbc5b
+DIST rfc-3.2.3.tar.gz 10469 SHA256 894ca3d84bbe354748a4808e60f3d35879637b0fb5a6f9e47a1ece3314231950 SHA512 b16ff2ee0c7a1213369dd4d5d1033c6daf95f283b170ffc46c02b65cd125d4bf2b5dd8b25e8b6a9153330f8fc624454589ecb6d77f2d47e9e34ae18ccbdaf095 WHIRLPOOL ac2e2648f21e6e8aeceef7e2d8e2efe2bddf6cceaf14c87b6f024264cbe04e7ba6a7713103478b45aaba9438dce233d830fae9721c5b408a7a513c27bd53b005
+EBUILD rfcutil-3.2.3-r2.ebuild 951 SHA256 b283c7cbe636c0dff913c9fafa5b73fc22ea18daf7f157f012d1e380c1918d29 SHA512 5d86444d8656d6c1aa725868a8aac33b040da5e5c6b5aefac542cc40b186e3d05ac17b99d936bec1077bcbbbac17f2194fde08528493d91d3a725734842f4788 WHIRLPOOL 32885d0fb448f81dad0d7b5be0e3b1fd1c15ecdbcef38ae2e45100c072b36b4bb705b59d3c7a5bef7c9613d01cda20c35e2199e0aeab792e701ed1d93335d174
+MISC ChangeLog 2590 SHA256 b9c805d23c2efa68577cd84d051ca35cdbafc0703ba08db07676ba1093a25805 SHA512 6bb3d15f97d1fca34ab76fcd33bb29420eedb9a3c50b9db8f7e10048240fd0ce9cd78f3a2537e549a652a93f58728ea36f0cd944bd953d03317d51d98d581777 WHIRLPOOL f8f9811fc23f877e66670d91dc2d074ffd814c860cf4354ce76e95d5825740edbeb727742036812ff66dd4167659e2f1d84497a343731ce6a8be172792bbaeca
+MISC ChangeLog-2015 4485 SHA256 f569b8671e1d531abb7830358c1cf8fb139465952ff6046eede0a825c25ccfb0 SHA512 a0d081bbf91cfb340946146d3695f44259cb158199ca5bf810cf84e826fe3b9fb9dd1d03b0ec13298fbb2d2695cb6b80c928939acf3cca4a6540e09c1ed210eb WHIRLPOOL 4b57ba67c3378e0ae8d30b7418d16a4135074d0bf035bf6cf49da9aef6c5da1fae85eb271d1d87df96b8cbf71e0a752b0f3c38fd9b8bc7b4cbe8bfdf4fd793ea
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
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/Manifest b/app-text/rhyme/Manifest
new file mode 100644
index 000000000000..518309037d66
--- /dev/null
+++ b/app-text/rhyme/Manifest
@@ -0,0 +1,5 @@
+DIST rhyme-0.9.tar.gz 896013 SHA256 11d4862cc3adfc18ea83ca233854c562fcebdc838fa7fb62de6ef3f63f992bd4 SHA512 a769313c4790eae94eca1ecf8c00459b9d74e6437d339f8dc9f6642eea51258a0fc2541877a68eeb3a897c29877b673be17826450c1da5a2352a61266784d0fb WHIRLPOOL a2751ec43dffaa1efa8ad62a29f75c3f69d9558226c321085d583e5abdfb34910bb1a682c0ee9bb3d409cbe324294933188004bd5cb16f51b3ddfcedc3e2e6ac
+EBUILD rhyme-0.9-r1.ebuild 971 SHA256 ca6f59d10b4b88901823c41f78b385cbcdcf4481e854ff241742dfb67a99fad9 SHA512 7d5bdad5eff4b3a4d31cfbab65e38971b6cc41756cfaf2f7d210a89a7c98b78569c59db670f8de5dcc23aa2bf254a9b280b365efbe3f3ec83259b011f6a45f9c WHIRLPOOL c6eebe29bd0c251af1d0cba065ad7ac4374a7757a279ae8b160fc40b3dd7a8b7b8be794b423a85af580a0e81950404ad2036bd96b75ea74a0ff83b7aaef19993
+MISC ChangeLog 2518 SHA256 739317e95a284297b1e5f0c81b6fff05b40a5e12383dca23d565ddaaa0dc44de SHA512 448948d5aab2a7ecf84d05c1ca1c4027998c08f37759568dc6538c158fa392a92d593646bb696ef0efcf3a2e1e4390cc45f29c6ac27235f35f8e218b1bd5dbab WHIRLPOOL 740beb7c903a86e7a9f2527ded8b19922c47a2d798c4744d7a49b71836fb99e7543e758e9ac2ad216da6ec39364eca5258e15b6cc164e725b2dced364dcccc2d
+MISC ChangeLog-2015 2314 SHA256 5da130626c75a5b7dd6068f4c95cf4a4483c6aab8bb84196bf661937db7df0ef SHA512 5357a181fa8a7da317584a51a21d7b16309e82b6ee2f8a112cb63ab01b8487d4ebbf5ade7440ada635e6d7bbfb702ade6450e459a4c3cd084173ade37dde2365 WHIRLPOOL b893780c819d72f8abc08b57a32a3b8c7565ccfefd850600a4e0d2cc1908cda2a6fc49c3b60878df90af7aa7da1b829b537026f0696fdaab5604d89603d39692
+MISC metadata.xml 667 SHA256 d21f696f7cdd160722d495a02a2992920e652497798ed07435a9fbd806110fc3 SHA512 c63a131298491268402524a8efed010e464393ccc19343cc966d5c2b39d3e69b890264902614f3a2ba18eeb253faf7624b9fe488b3b501e04122d8841e7caac6 WHIRLPOOL ffa26f7deb40d7e512285204f5ef1be794e719efe18b4ffbd8f86475f37618f648430bc73ff04e34055a39af1cabeb308026919f2463f4f26aca7da08c09b686
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/Manifest b/app-text/rman/Manifest
new file mode 100644
index 000000000000..e3d36dee0956
--- /dev/null
+++ b/app-text/rman/Manifest
@@ -0,0 +1,8 @@
+AUX rman-3.2-format-security.patch 458 SHA256 8cd00bda12ac1dd13788ded52100955f38da22745d67478d1c1decd176407d59 SHA512 1994555d399656f9d22586464f1ee46f67d279c1d93184b69e551b87d9fb393ba24ad7dc6ea62dda1288fe605dedca1e4bdc20eb333acedc535f1063e2f62aab WHIRLPOOL 5d92d9a218de77b716e4118b0bff43fad73da44ee8d289cc692c1e3d2867699aa70ed8761cc703d0e9e3eaaa369f01675278cbaf963cae492b26d728b96eef81
+AUX rman-3.2-gentoo.diff 560 SHA256 1a0001de30f6f15b88d3951211f1d9d0bf19ea21fdbab4d222afcab5ca80ed2a SHA512 528b2e7385882620ecaa0374a65579e0fe56803aa6991277ea1279d18d65a4331ebbfc2374a711bda2f5722a5fcc236681f9c4dfb3c0abed1e931ff986cbf74e WHIRLPOOL c8781a58ca5c9249f67d4e1781b7033ada966a9536fb4ac4fbb53988e2fac044768c46f4697dcaed195fe2e00c5701a6dbdac1f3f8b84012795b03a84fe544a1
+AUX rman-3.2-ldflags.patch 451 SHA256 cc23e72b5bf113f899f0cf678acd5ac876a4600dd97654c0b233cc37063c396e SHA512 936c9fb92e3f018ec0006370ea61f010b61469171a22a9f52a6773f32ef3ab01764b726573aa30548b1c9ea6db3893302a45d20c06bc19f7e272b5e531bec433 WHIRLPOOL bd308aa721f38f7a3b83ceacf4c24d02b8722c4ab8eff424087e583269949bc28adbcf2712cb59bdb0ac73f42c3f0c10e6cd28a1fe65b1cf1356c39fbc833880
+DIST rman-3.2.tar.gz 79397 SHA256 68a130696b251966db10a4774e2bc8083a0147b83f64c11e9bb4cd654da32d5f SHA512 a70aea0af1510088fd88a736e63a6dab9200040be5eb89912ede4f50e3de97d423574841bbb66e90fb12934f3834dac0acefe78ff1c73a78a79c95c3dd6fa5ae WHIRLPOOL 4ca7685e17a9034eaca12d623c0bb4c9c803d26149e58608b3e45cfc934ebcf0bd4700db01cfbafe6893141b68a4d470d6c9cbee6e18a526f1929902d5e837f5
+EBUILD rman-3.2-r1.ebuild 828 SHA256 61723ce2eb46cfd387943913f800e74bbbed57c8e7db0b72e999321aa83cf8d1 SHA512 b382ed08fee10f3d4970c61ca5b2c0d3e77c214f151491e916392f92eed9e5f4dea6e14f8f4ece6d16294778b467971cf9f9fd307339029973ab8856206445ad WHIRLPOOL b891033a5090d361b827594799ae79a53f0df84bb463f0507e8f0c327d59958ab0ff1c213016c6d2282451f71ca4e831088a46fe69e6cdeff2c16330df473c2b
+MISC ChangeLog 2771 SHA256 59c0f1505f7fd7ce7c7fd21d64c2101f73cb4a766c9f6c64f4b70ae9bf173ef1 SHA512 c7c9263da986488dc0347b6ad70cc3182085da3c3a7936ad78196de76aea0359b61503a3aedede655f4624211310b8a0ececa72bf598b17cc9484cb0e9a58d3d WHIRLPOOL b1bfd82cec42de879a5c56998a1ca66ff7cedef46ce89c300d66422c8806ca1533aa7cf60bdc4fbd8b9c07484f98c70dceb7168288efeb7b7712e49a5e4348da
+MISC ChangeLog-2015 5621 SHA256 16b790c2ee3011043834fa9bb1980bfe5b100b0d1c99586cf727399d66b8765b SHA512 d44542431d1974609d2f66f0c74ba48998ed4eb837eb377bd506a259b6736f40f2a8f9031360397b8d34c79400555c85fc2750eed9b87cdfdd1a853c3b98aa05 WHIRLPOOL 319f5702c825eaa664463aa25a2448185f98885953946954f19cfa55e099bf9ad695d4638dbfe9fce720645d0dd05f717c677745324e5707a31d90cf40e37d0a
+MISC metadata.xml 334 SHA256 0643f12dfe54c7ccbe2139185e0fc08cdadb667deb80883ac24743328e05fc44 SHA512 29d5b70060964469ce308fed8bc01e09bb74b3d2ac0605760d88f7dbd19a1cdd6517cdbab76f4269188454112837e0d27b32bbf3c5b9ecd5bb4d3ea4f862188c WHIRLPOOL f93efde3bd3e33a3428e56e3cdc3b3e01d0416e9f9500c82ae755e8a908521ef9a428624cb450c2ea733513cf5850ff912f44c0664fa609df02fa9e285844aaa
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..ab6d881923bd
--- /dev/null
+++ b/app-text/rman/rman-3.2-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 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/Manifest b/app-text/rnv/Manifest
new file mode 100644
index 000000000000..b0d96a1ba3dc
--- /dev/null
+++ b/app-text/rnv/Manifest
@@ -0,0 +1,7 @@
+DIST rnv-1.7.11.tar.xz 140904 SHA256 4ab920f1e4d60841bdc17dbed72ae735bf825af8a9d9eda99165a13be7cc9de6 SHA512 e706ae6cc9b55032b23c0ce4ce728f426727c20d0291f9ea4369221c5b3d59f29ad477c6da4992a9bda7c583078498faabc06a9865081517aeac81b2d2fec212 WHIRLPOOL fb6ea2d27917557dcee74316114a80ea644b09ab499f294ae080356f774a321f0e83491842fe4c1591f105d51eda618f741ee4c61bd82632566a24413b23de6d
+DIST rnv-1.7.11.zip 211316 SHA256 39ed53271f20517a55aa74ad5e393dca407e14512a31ecac4c223378bdd4a6ac SHA512 0d9457015e35177144eb88f6d6234e8d94c3a5a45f26f961b4aaba892bf92c0ddcaf0e037cf3fbbeecf110399760e182c20973e6ba32d1223d2f82600582a28e WHIRLPOOL fe82f65b68e55a7f607d7fb0cc200e83e6882c71226095894615822e68d06e20aebb85e80028edd3c5d4881f47779e42a26947d03757c1391ff8a1dc1a5ab175
+EBUILD rnv-1.7.11-r1.ebuild 650 SHA256 8fed62e000cef68ec14380a6efab6d18ab3003b8f2b17da95da72223b289912e SHA512 f472402695d4f33fe267aaaa9f8319e981e87c7a20484dc3bc67d450627813665029e50ef82a9e8957279f1d088d51518b2ddd7a7ba3e6038dd57abb135ea660 WHIRLPOOL b67b8c17ba622970762ab18bd39a75bd0e479be3c9a44d9abe9192f6a56029634c9274e29c76d5590a84504ed9bbf1965380e2b803cdd9ffb6848ad100aa6a9a
+EBUILD rnv-1.7.11.ebuild 576 SHA256 f7186e11ecec42b665d0fd29f14de4f1c13a808080821dd45911a1db63ad27bd SHA512 d94b3b964563764f5ae11f9a7468d75b00ed5522f1a0c4cdb5b23d6c9f316f9b8a357998504086af8df22b3c04533cec7188fed7f107334e48209933be36a6b7 WHIRLPOOL 89b9249d5111ae8e9bdb104bf11cc5969952cbf1c0a8158a57e564792eb59b0e272f373d7c09285299ee285f3644b6eb606ad2dcbb4c5ab1a2c2ff176e25db0b
+MISC ChangeLog 3356 SHA256 de8ce5098ee1533e7b60c45a4ed177121ada64095f897fee306f4189e6b20ff6 SHA512 0145f0a79794e5865617ec90bdb94a83c01eec781941f2c612843d83af1e97888ae6722e99abb52aff822513a3c8a878b758216ccf27873cfcfd00abbb6e0e01 WHIRLPOOL b10751cc2352ff7ee2ed084523bb210700b9e3d3e59327bfbe25bbb7e3e802766a26059bfe070660a9bc40a5f48d1fa558ac07d94405dd5243ac5d3957981f0a
+MISC ChangeLog-2015 2843 SHA256 e659761186aeec1974bc3e9e75fd23e89b16f0ff72082c7900c2c6091791aac9 SHA512 400a7e01c44c43abcb82c143a24101e91a1668484358ae58f92dbd766f17a47d225316179bdc7d8a6c6108717218d3dae28bb60f16e2128b28ef7e35ef7a4144 WHIRLPOOL 5d3e96fd8dbc82313eede01520a053348078e823cdfc675e8511f657d2633e04e4c284552d2c02dae7c16d0bbbfb88caa220dfa4026aeb92b176a0e0690f9b98
+MISC metadata.xml 402 SHA256 b3084c02db396a2fa0d95e3aa2ec56f42928a9755067040e86a8b706dce9a1db SHA512 4d9406d86d89d241f23290eb315695ea70bbfdb8f9e9c3c996a798cd473aeceac37f82178191505a5bb7a51479fa74dc20d6dc40a930b1b0a6d6433a3fe36f43 WHIRLPOOL 8707d0900e03937e1cb13bf185f1d20ffb860a4a1b01bb7d95aecab61041a2fff5be839b2809cf43d3afb5d4734cb9a6ab17fe5ca7bbe56575adba95a711aea1
diff --git a/app-text/rnv/metadata.xml b/app-text/rnv/metadata.xml
new file mode 100644
index 000000000000..857f078172f2
--- /dev/null
+++ b/app-text/rnv/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>dma05@web.de</email>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<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..86f7b1c49866
--- /dev/null
+++ b/app-text/rnv/rnv-1.7.11-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+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"
+
+RDEPEND="dev-libs/expat
+	dev-scheme/scm[libscm]"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	sed -i -e "/^AR/s/ar/$(tc-getAR)/" Makefile.in || die 'sed on Makefile.in failed'
+}
+
+src_configure() {
+	LIBS="-ldl -lm" \
+		econf $(use_with scheme scm /usr)
+}
+
+src_install() {
+	default
+	dodoc readme.txt
+}
diff --git a/app-text/rnv/rnv-1.7.11.ebuild b/app-text/rnv/rnv-1.7.11.ebuild
new file mode 100644
index 000000000000..ffc1df6fa8a6
--- /dev/null
+++ b/app-text/rnv/rnv-1.7.11.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+
+inherit toolchain-funcs
+
+DESCRIPTION="A lightweight Relax NG Compact Syntax validator"
+HOMEPAGE="http://www.davidashen.net/rnv.html"
+SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~ppc x86"
+IUSE=""
+
+RDEPEND="dev-libs/expat"
+DEPEND="${RDEPEND}
+		app-arch/unzip"
+
+src_prepare() {
+	sed -i -e "/^AR/s/ar/$(tc-getAR)/" Makefile.in || die 'sed on Makefile.in failed'
+}
+
+src_install() {
+	dobin rnv rvp arx
+	dodoc readme.txt
+}
diff --git a/app-text/robodoc/Manifest b/app-text/robodoc/Manifest
new file mode 100644
index 000000000000..9d83eefb3f0a
--- /dev/null
+++ b/app-text/robodoc/Manifest
@@ -0,0 +1,5 @@
+DIST robodoc-4.99.36.tar.gz 280680 SHA256 d38279746204d8862d8436042b089d8c9dffefec6e7f33224f955d82b965a029 SHA512 6643cb1419c58195f26899e629a4a7470014b425e05b7615e523f972b67eb0e39421c373b8c80b53a4dd0d121d61481a7a0e66f7fca7fe82422d56b8ff048b9b WHIRLPOOL cbb3afdf6cd75c8dae47822a2cd9def070557daafb3ea31a138b115ebe3c531990ba50ddd0fd402b7c013dbadf376ac8e7c4c5ea685c41dc781e571bec4ecfa2
+EBUILD robodoc-4.99.36.ebuild 817 SHA256 ceffb68ddcce57c9c52c62c9dc66121f2137d23019768aa8ef7f7f121a4e6282 SHA512 58ac7ff9c1cd30fadb077cece95dc1d2dd1933acc0f7e56e5045431cc6f03b6569fb565c64693063f9928d1c54c121a3440ccb2a3d75027a15d0d49851ee5cef WHIRLPOOL e4e9ee1bc2f2296e2063845feecb573ff24256e5fc8859317c879b5a7910ab15237bdd93d5af84ac53eeda8ffab64df79a4daa0815f7d246237d527597499dad
+MISC ChangeLog 2526 SHA256 c0d19efa71125b86a58977c8a51e2730e782adb61cf4b1d2ad1951d7e383bf13 SHA512 76b51dde451a4b0c8265bbeafb528b39999a1068b08aa9252a0fc19b45056b4f8eb8abff8ab2c2cc69070a7cc70d21b83ac54c1d15feef6e05625b5d52454073 WHIRLPOOL 7a54e25c0c66a66ca070efacc4aad5f6cdeedc4508e96cf4303e162c69bf6889a2c8544e52ce1b9f8ee5c6b8b564d50310900d3f780adc5106bb06ad361c1a69
+MISC ChangeLog-2015 1048 SHA256 cd2dd1c54f04d432e8e9a5cf5d5b11aace9f45ea506757021e37511d350ff4cc SHA512 19c596dca7fe60790421f050e6d2cb9fe58849ef64bfe83f3dbe22d89f42de14e4631397b3cedd5c2964a10b62bc3c6c6ebb0147531a858d5ae49be8cbc0f449 WHIRLPOOL a2c73677f0f97a2c3836d8dfee293f6bfe7554c446348a8688eaab13715ae5e27cefebb0253e388b503980121d8c2f3f891b96bbb0771598410eea075acc4476
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
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/Manifest b/app-text/ronn/Manifest
new file mode 100644
index 000000000000..0c6d8689a530
--- /dev/null
+++ b/app-text/ronn/Manifest
@@ -0,0 +1,5 @@
+DIST ronn-0.7.3.gem 61440 SHA256 82df6fd4a3aa91734866710d2811a6387e50a7513fc528ce6c7d95ee7ad7f41e SHA512 885418c88d5a1073f9457ea11e29d82d3bb40ad12506589ccfab83ad447445e41282c9688aba5646082ae5ecc6a047fa9439ffae14561152fc61a136474f611c WHIRLPOOL 0497ea22ff387f661381a2d0e13cc8d44068e85ec0b90f40cc80f7effa84c3277ee585464547f926aae853c4a88197c1b1b9056edf2da60583c1005bfa942c65
+EBUILD ronn-0.7.3-r3.ebuild 1163 SHA256 968586df671feaf632f7ffb46c14b361a129e1f39c79c9a94b23900ee2ea7bf1 SHA512 1f82682ec69ab767175218e51ea2374778d92ebe15da14647005ee256930950e92c1bd94d82c81d27207085cc6dc9fd88cc7857fa816eebd83af40726137f7ae WHIRLPOOL 5e93947eaa55980718dc2b91ee7e44e4bfe8bec9e235000b48a7acd7ef272f3c314c77e614a25b72f1f601ca91155de6cae4a08a1278c6aa516e513e1bbeda92
+MISC ChangeLog 5167 SHA256 d41d580d05b3fbfa6557a464108954ff5b930d7f60a76895cf8f92dca593ab2f SHA512 98537bd3cf03db178384928dfcc7ca3df41cd4653c52d7c8cd361105ceeee211cef36bde55f13dc203a017adb26b17518451ceb327f247151157d79c5a205af4 WHIRLPOOL b70ddb83983afdda62179808db6f433dc6bfefdf4cebfc6b3594111d772e6b2340bfafc6ca92e847827529fa28298389710f263bd671c8885d34f5309d207b10
+MISC ChangeLog-2015 4976 SHA256 17fda6b5d048d97d453c97db47170dc4ac0df9de5d4478182df098da351f0ae7 SHA512 1b7b46775c606839f74e0205833a03b33302da4a07a3cd744a6f9db724c76fa0ef129b34f7784a63a91263c57560340e07aeca96ae287e008742c9a411708492 WHIRLPOOL b2389b12ee0ce9f788190c59778e63b6f58377968efec690e663fc7efe73437f0846864a1abd2bc8a8afa61365d024d88396de067191eb5667794730fba059bd
+MISC metadata.xml 339 SHA256 fb4f127247869af03a4c609eb4cf8b6d9f7575c5ce198d6a8bdcff4fb6f2ac11 SHA512 0be4072cf3514eba60569138ed409362b318616ad4514e319d9b4add120e74fd7655e2fc5c3ab8d7b5d813cfcf8e1054fb98395a1a89d9fb90e447a825ee9439 WHIRLPOOL 15cdef9be80640b8ce8cf7f9c92128dd7e3067dff196826281c507069a85b4a0d9681ad1948f5a89fcb8fbf31ab85edcc6ae521abc44ea1f4600ed0f287d35aa
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..f3b3fad224ed
--- /dev/null
+++ b/app-text/ronn/ronn-0.7.3-r3.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+
+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/Manifest b/app-text/rpl/Manifest
new file mode 100644
index 000000000000..c09adf7415fa
--- /dev/null
+++ b/app-text/rpl/Manifest
@@ -0,0 +1,5 @@
+DIST rpl-1.5.5.tar.gz 11397 SHA256 4ebb876f1ff4673f34a51caf7f4b722c564dcff8473352174a478418c89c02ac SHA512 f43af366b8fc34b6c4578841f50046170810187119eb0730405a082f64d5c095fd9d28fabf1f0fda1dad85f24e98047df4d695b39b7ea5b99d32efc18634000f WHIRLPOOL 5e5d168a2dff871e1b3464365bbd1d8b74715ed79a32163c009ce5b2898de1e47656b6f7338f5765b794691fe248bf32495c3b0111f4dd30b00584434ecaad7a
+EBUILD rpl-1.5.5-r1.ebuild 654 SHA256 867bdecd79204f6ca29bd6938dd1bb4da367ff86e6e3078feba7df09f4d49ab6 SHA512 c9b61a885c1bcca000002df4dc9b114444c1a490072b080b7318880517227d5929a05df26b172cec3a95c83e5d3c8d49cadd41a3c7263e095ad62451b84c12a8 WHIRLPOOL 007156652175a006833efa6f281f60432c0ec805f4e1bed5913dd0ebe89e7d31bfed1fb96ca9f37a21338d54f944062cfcdaf04cdc5beec315433ef62a2134eb
+MISC ChangeLog 3199 SHA256 bd0375a6b4a200bf2a808a1cd983b9ef8ba93dcaf3245d6beba83f1ac39a74e9 SHA512 119cf738d64b697b5029d2d4d851c1b6705328c69bf568ca881f6f71cc643a0eca560c367652365e93cbd215cff830a563ae171db05244fc2aacd21e9e0fa4c4 WHIRLPOOL a71ed9855fe756afc1527b38c240b477b596b79b9e279b1f567d6fb62a060907af66ad29dc34d59a494cad2be74549fe878445490a88f8547ba13d929afbef62
+MISC ChangeLog-2015 2752 SHA256 c3235d99a695eb779b50b0724330f9ac613c7aca48bbbed8bedc9a13c292c850 SHA512 9fcde225ce21966562ceb9457326e1be40bddfe21e5af819126918ede1c9b93c61fc4f464e49d05036575d817840afd4a974454460e502e3cd740c824e0dfc15 WHIRLPOOL a6966870204d9a3a03277d0b2350ae74b0b932de9bad870ef28d456d198fabf66ce085361343ead3ecc72b63dd2dcff981aeaff4703ce3146be529f8b0081e4b
+MISC metadata.xml 338 SHA256 0d89daced144aa8086f8d67c81badbfdd8b2f7df1de41e5a30f3392a72427a06 SHA512 e8231d1fb1b810948ec4ff31afceaaffa7b6d3f0ed565118f8555cb0721de20dad9a845e213162b3b1619e2b20610e4df0843293df049e17f8e4e1977957104a WHIRLPOOL 72c935a272b6b00f563e779f5a6dd8a0620e642f6a3d4ef466fd7fee9ca16df2f9775b5e4ebc51d948b81ead7e4d7e3c2ab63c964c98c03b64732423d4c6939c
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/Manifest b/app-text/rtf2html/Manifest
new file mode 100644
index 000000000000..d2ce5f3fdc66
--- /dev/null
+++ b/app-text/rtf2html/Manifest
@@ -0,0 +1,6 @@
+AUX rtf2html-0.2.0-gcc43.patch 693 SHA256 c21d3a20785baf4936798848d15cf87614fc804c2c9a289b42c797c3fe035791 SHA512 e8f4ad4f30ef8b317786a9c6b864245254c9127d5967ffc61c9934a55f0223c2f15ad388b1047ca3aaef11fcf1bad372f515df24c32a52a3abdbb6aaa5afe2d6 WHIRLPOOL 115a733429f5e864c437cf320e2aa7fb6382731d1b9e2027d72bc4e5783a0bc6ce06fa34fd5eb35e9d2991eb84860257e92e01b3c97cd3c1fbf694fbe4a03fcf
+DIST rtf2html-0.2.0.tar.bz2 75292 SHA256 13d39bdd3387aeba1e640d3209aa2ce56871291247734757d399675e4b8b918b SHA512 7399c98adb4dc0f45e420cd6836c36720d6b19ccbba062d2102b2693a6812642d6193000172ef7eeef5b8a84dcb2d35c1eb99fbf3bffaf8dad43e8ca06c6fe75 WHIRLPOOL 077eb9d7fec11796e4a1c4257bd6380621a3c112bb9faab0e1090a8419b96c49e2bf7fced42bd5568408fa497d691f61a99eb538c35c1409d9ee703d7654397d
+EBUILD rtf2html-0.2.0-r1.ebuild 700 SHA256 591314b2fabb8109ccd23212a80806e282b9ab61f9f63d60b01255aeeeb657d6 SHA512 5b48e0bbd927f43a759cb5d345a728721321734523d41a57415cdfd3ca37b906b5f7c5704547db96b81b5ed573fefbbf3ae5858d504abb16ed33bf34fc1b8081 WHIRLPOOL 152d8ba4d1771f9a98331e26745ea1b4ef2b9f7737ea4f414ad1846b5a94803d5d232e9bfd0cbad19b1eefc314a0f7ab756cd5a676b39be75c7569426f845306
+MISC ChangeLog 2220 SHA256 b69a8669f07d595d72fe08ce6a1667369a448c4580e4f4721e61df68cb34bfd8 SHA512 74a9aa7ede755c908d05935e1d0c14026c26ae952d63e505aa9fcdc856c00d084fe1133083359605f97610c1283a1565afba94cef89a1ed53e8cbb6994880b6c WHIRLPOOL 10e5c7faa50d783366014ebe134182a496951aee8678618f7afd98a29cfca43339ff70ff1138302e55b9ed7973d254b0b6d1e9fd2d81e793e460974df16bf1c0
+MISC ChangeLog-2015 1846 SHA256 14c6a4ca1ec57f7b575e96d59e16fa7f489b24b1c927fa4b9ecc0f0f9ea29fff SHA512 fc28133809ec70a9963faa691905af8aaee0d7d2c02abb9fa1ecefc50a6fba900934d8826581d4f8f3f0d07a940ddc3455bac19f0a98c4845a88056ea6000ebb WHIRLPOOL c690c8080e42a9dc6d2e68504a24119fa0f15637c531298ed07d09b4378ae7945f02c01982c84928b37d8fd625ec376fc569d09ec063451714657796fdf458a2
+MISC metadata.xml 318 SHA256 b8d3d74a9f015bc450dc790c1ad11fb99bf64275b5e938aa4e9922026408ef9d SHA512 f9fce83b4df04e11ddd34a60cc7bb32e9ab12cc5eed26352de20186660ab8173d910b6cdae63e1562f83bd1ed89f6210aca1cd5401ae93f31296dbac6f3256d4 WHIRLPOOL b7937dcf38589df8873b94a4683e239427c0dc5a4e86b9d2a42577556f08e61bc3a523a3519373649b4e9c52cbad70c0356d24268eb5976daa3d98918b50648d
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/Manifest b/app-text/sablotron/Manifest
new file mode 100644
index 000000000000..002a9538c584
--- /dev/null
+++ b/app-text/sablotron/Manifest
@@ -0,0 +1,7 @@
+AUX 1.0.3-libsablot-expat.patch 286 SHA256 5721c00006a06a991bb171c85ffc794348bbe732bae68447a26457621eedda89 SHA512 29b7ae2798696439d3b181196677a7e7beacecac39abae631c73aff2d77e608bbf0088100953db78feb82cba37f89350da238cf8053e694c8ff0b3d8e8837040 WHIRLPOOL 135c03dacf33d923c4c52c138d6c47877c415231e9075652b68aa9efd793bd0bccfd0655eca25152249238b67af37aa172bf647d739caec2b865b9b4da582b69
+DIST Sablot-1.0.3.tar.gz 607597 SHA256 a0c737ada78d0d305a2a964595167e0c6d17ff0afd3b801714768deb681bf362 SHA512 836c1a9d09317194333619461b0e5ea312277cadb6df5ae5ed327bdfee4090970bd3056ec0b3bd6aa8a3e3289af1bc5c1461c9fe15b53a944f1042190c485031 WHIRLPOOL 4422053971238feebb798a22d5d82581f1f62e361cfd4bf5eff38ed7d87dffb6d9093a56dc3b992674987025de3fdec107d0c7de9138ceeabaab3281fb84ae83
+EBUILD sablotron-1.0.3-r1.ebuild 1062 SHA256 7b29809e7f04d90590a9e07fedb865950d19d81186f0fb7f53e3639fa9f8c13e SHA512 0e0bf8ece2c8ed9387f998bbf1033cd3c862e0cca3332d21d01a394879b9171f7fcf8dd9dc3e78fbf3f9866397e9d0118ad6e1fdc64fd76b1ac107886a88efea WHIRLPOOL 71d96792f7b7446d57d430117412a4e5c94eceeb726b056b5400e325d7146a92e85811fd1b41bc376ea8ad252faa354d13a8a40e16aacbbe02a9079e92dba8a2
+EBUILD sablotron-1.0.3.ebuild 1092 SHA256 26d0fa201d506cf91c57725dcddcfad6370c6a436faa32e44f75bd1186bbd0bc SHA512 99577a5aa616f985af56735a42928ca36a6367c86e0b191fc699b4b2848b04f40f24616f7afdd7e70c44217e707d1fb8c40430362109547bb2c06c702292432c WHIRLPOOL f0cad93726a6093fd59dcc548ccfa8b1590c72fe2769c9fd8108ce8bb05717b3effa19c0ce43b71e6f80fd8e41192d763c844325dea903e3bd1f885187c5e02e
+MISC ChangeLog 2564 SHA256 053134630acbf3a9e6ed6eec4962d61fc52b93e2c93f358c5d419c5022155c2b SHA512 c117662e77da2a7c3e7497446231f4067f8e28eddf7e775d82f60a8d675fa558a36ddb5328947abd3746edee3697c32ab8965aa5736a85503f2f38ab89b33f99 WHIRLPOOL a0be81eaa9c658574d8c97542074be1eb1f18b460c81c2f37f06eed27f87248504086e9766b31c9d04d03b9242da7447780ff4c9ba2898f08c28ae387250297b
+MISC ChangeLog-2015 9591 SHA256 fa4cdd251a84e10ad4366981806fd58fbb817c06f497850194ff9337e18e20a1 SHA512 2b07f1528cad1a858bc348d02206570833336e8b4d25022af968eeb2a31ed9747f35b1864b8568be78ed8043971f925b9efcc9e66dd26fecb50c5de2a9580a19 WHIRLPOOL 1235cf57a0ee53e40d489e4cb791884377bf888c61e75ece1a132ddc2ebe25e55bd0f211945e05d3c15abe2b8e75252cd70baa02b186fd8b1f0839579d629b97
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
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..4bceeb87bd16
--- /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/sablotron/sablotron-1.0.3.ebuild b/app-text/sablotron/sablotron-1.0.3.ebuild
new file mode 100644
index 000000000000..c9118189fdc2
--- /dev/null
+++ b/app-text/sablotron/sablotron-1.0.3.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="3"
+
+inherit base 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() {
+	base_src_prepare
+	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 || die "Install failed"
+
+	dodoc README README_JS RELEASE src/TODO
+}
diff --git a/app-text/sary/Manifest b/app-text/sary/Manifest
new file mode 100644
index 000000000000..c638da329e8b
--- /dev/null
+++ b/app-text/sary/Manifest
@@ -0,0 +1,5 @@
+DIST sary-1.2.0.tar.gz 393787 SHA256 d4b16e32c97a253b546922d2926c8600383352f0af0d95e2938b6d846dfc6a11 SHA512 0eeae82a384970b4d96f7a0ca3929e74d17b8b3ebc61459ec9fc7172e61c3835ffe2de8aaab7ebd64f54be24d39f6734949ebc98758c28cec299b3bd25020632 WHIRLPOOL 0a63d5a507da154588228e18c777eaca251888b7b67342c31775d6f1d8b0c9f877b2e79be473807ab08dc4d9cb87779cac3bdd8290a64333b3507b65583ac7d2
+EBUILD sary-1.2.0-r1.ebuild 950 SHA256 a5621f07bd8726c84cd92d0357bf566343b95492426fe9c081a0429d8cc76320 SHA512 74713f39515aec6da7df7664755243d28c339313c1de070824d2ef05a1deb50309ead443bdad9e490da891b92ed0daaa181f9cadb6337a38c9192c6772a7c83c WHIRLPOOL 027d5a54ed78f506ba8b1482664583f374e54510c8f54340376aae0de84146e60aff034eba2c48a4059f0e030bcbaa0f1d52d297efefdf2171bb7c3b677e0c09
+MISC ChangeLog 2970 SHA256 4f05a344ead5bae3adcbcbd583e3434110c6909aa79f4a024261e6c7ad2d55e9 SHA512 34f6b2ad3a5228d94ff711fceaff7415b11c4e26f4cf119f8093f575ed717555563471f7a60f64f2980627019928934130d32b9a7853fa8b794ca1a8cb858ef7 WHIRLPOOL 5d19f20cd3888afba5b8a4d65d95202dfb9f787c60743ffd701f55e06d8a13061cc37831480189b108cff673c9a61fcd574075157f10fc3fb6cf9f6deeddc31f
+MISC ChangeLog-2015 4674 SHA256 a57a106e0b0bf10b30a6fef40f86db65e17271c7afb734e420228c33eadbf40d SHA512 fc09e53f12511ddfc1af57aecc9464a8a28a518460e7cbd990d3160888800ae2848989965987d6f1ff5b0a59eabce7ce45dc2dd183c9f40a9e9e9989d1155db4 WHIRLPOOL a89eb0aa8cfa444a2e0929199abbbaef565569dc499cbe3528f52add46825e0cb6f756f6b68d296a3f467545a38d5332f1c3437dea2007d98ff0cc562287d3ca
+MISC metadata.xml 614 SHA256 bac721d7f0677b2a5c101a074f858ac31d2d7b4f7d960cc068fa3eb77f106005 SHA512 ef381dbe030d43e46f5b8aaf13c0783cb1a215bb2961793d75500712fd491983e2df30eb838eb504432d2cc844b7e064d0f96c0efd67d190295496b8cc082a15 WHIRLPOOL 690c3eeb1520160192b3581ee5a10e30c6218e137fed69e5f6fefd71072ccba09c5c114f37adea0b9ac005d81cc9ced1d2bd86cb354c7ac1e35f2544ae6f36ad
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/scrollkeeper-dtd/Manifest b/app-text/scrollkeeper-dtd/Manifest
new file mode 100644
index 000000000000..e4e4879c4940
--- /dev/null
+++ b/app-text/scrollkeeper-dtd/Manifest
@@ -0,0 +1,5 @@
+DIST scrollkeeper-omf.dtd 11031 SHA256 43df758009b17f8487419ef1fe3039379370417385885a2578e1789ab092ae26 SHA512 edb38d85352d0ed4a4fd1eea108cd88696d2f0759bc4402d4b7f85aa56b5647ca5a518de14deb3a429344ede474d42a64b90100e5d3c772ae6e5e47a47d86ff0 WHIRLPOOL a99c168e3645c2f7bf497d3e38ff3b98b5334246d87cbb3d12e9b15e72e7ea420db60ff553c49d45f5a380cd8a0a813269e08af20767f365bbaa9796b392d5eb
+EBUILD scrollkeeper-dtd-1.0.ebuild 1536 SHA256 b2e33c866f04e1bcee7a2cdc889bf7ef0ebd7432b68debbc8493992ed8e0f893 SHA512 ba34893ad3727668de8b47a8497beabe990e8367430f6440f4f6374bcd13571cbc005bd8d8addcc5d613c74c2a0647dfb34ecf6fc2b88ec6c6f6ca0e692cbd28 WHIRLPOOL 2fc9eec8b9335eb1284065b707a4333ff8791748cbab67253a8ea85ecaa9c823decc961dab6854379a757b0e4ba2f03493f3399840b8203c17cc4d3a7790a92c
+MISC ChangeLog 2996 SHA256 164dc3c293a13d3c9f3e38d3756c31697edefed04221cd9cf08f14ad3d7c6155 SHA512 dcb43e4aef508b40d9af03adacf1923e25bfd794d2d43f7afb2da163776eb7b0319bd2d7584a08f7fa4a417ab8af9128df46c96c6f6f64713b4e55c627d9e097 WHIRLPOOL ac686d35068440a1143aafce2a1495d85a43dc68f652c6fe7d8cb756a3b8a73c571997bb34bb9c98d0f1f1b4a4d546cd803ef5b3cb522ed367bd4adaf9a3fed3
+MISC ChangeLog-2015 1252 SHA256 8fcf2e94aa4a94e6c3dc3505b574c7ebc9a210f6dac34ca5f318308b4a877e18 SHA512 5701be609be182c15f454f1c780ca95a80ff9964c399d8495ee5a99559bfa4cff7c4ab4bbe3b0004a9d1b5480e95fb42ae3344939151f40f7f00eda1a83ade21 WHIRLPOOL e1fd53a3084008596599a5f872f332e32f57d68684036a8aa63a6a2db09c3ea42adffbcefa16be0ca8c277d38ce07c8173440c0bd3a11116ffed4a8c52b33a9d
+MISC metadata.xml 335 SHA256 862ef21e2f0303db91cd9cfb7f5ad0b81ae5435c545ed99d0e7120fe8fbbe78b SHA512 c0180e1504b25daba0b5f2a6556793cf721eca12a4c488a57e7960b9b096129e5f535a24e1da1ffa6b1d9e8b646325edcebd00e5f7e908ace3d81d818e49f8e3 WHIRLPOOL 687f4848a9272ce21ea0750c5a75769c6afb65c226ccd7f32e0dc4a4a545ccf0805359453a2a58fb2983e1270551b4e632dc577c2e6f52f3e786a4dc9defef11
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.ebuild b/app-text/scrollkeeper-dtd/scrollkeeper-dtd-1.0.ebuild
new file mode 100644
index 000000000000..f173b2dd8842
--- /dev/null
+++ b/app-text/scrollkeeper-dtd/scrollkeeper-dtd-1.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="3"
+
+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 ~sparc-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"
+
+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..d1f5aa1be7ad
--- /dev/null
+++ b/app-text/scrollkeeper/Manifest
@@ -0,0 +1,4 @@
+EBUILD scrollkeeper-9999-r1.ebuild 512 SHA256 c0f9ac0f1812ec26fdb92084c45b701d904bcedecbe855ca92cecee1a04f3c4c SHA512 660e673089f96be6a2cde8d781671d912eaa45af9672a9f303787e30bd676bda07973ae345189e90f3bc322b378e8755846eb889014b7f50944d700dc86535e0 WHIRLPOOL 0e6fb26102b79667de976355c7b55ce1ab382786afcad5d605bbe73358f23ad02bdfa1e6e81c3087fe6cd70af2e9f451449444e39bdba51e09ef38307df08b91
+MISC ChangeLog 2680 SHA256 71bb86c12ccbb78286a5e6defbe0e8c2495e6d7b290e094e574fcd62fbd8c1ba SHA512 34164b681d868fb84523eb3b796f7cade606c9800d8c2da023baa708c8567845a0152af747fdde86c98b4e56fe6abc21345a329b3226f289ebd0ac76ac1b1fcc WHIRLPOOL 611fc5c8b88b23e75be2393540a2fbd26c16e831bd51f994818fb6688fda8bcb167a68c4e5641be80f1e04b54edcba74297769209837ac9f2d8a817a60a4a31b
+MISC ChangeLog-2015 14177 SHA256 a819f86f1810be991c76288b570c9e38395d4b4e8aa24a98b00ecab5fcc3e647 SHA512 a9159fcfb584840dc6cf33cf96aeba04142b88381b25f1ab5e53f4b1b919f6486d362792d6ef04b8d9974c8734839ff9d26acc1c112af131afa5403d74876fff WHIRLPOOL 06cfec77e0b8bfd4f04279e99756ee5de1584db94b74d06ec2d4e58f8c2f153d01a4bf690ca5eef6bae995a2033dee727ffd72d19c0bf7f0094a0f306858fa77
+MISC metadata.xml 249 SHA256 4505b0bfeadff287958620b7dc7b7209699065a8f17139a237a5dd409a726a97 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 WHIRLPOOL 333a938ee1d2124595596c572697bf5ebad523a92ba12005cfb12e6bb6270881a94a911f0cc9c1cf2bb571559e8271e07dfd307dabe50058236dbe7103562b92
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-r1.ebuild b/app-text/scrollkeeper/scrollkeeper-9999-r1.ebuild
new file mode 100644
index 000000000000..bf2f4e36fa8f
--- /dev/null
+++ b/app-text/scrollkeeper/scrollkeeper-9999-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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 ~sparc-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/Manifest b/app-text/sdcv/Manifest
new file mode 100644
index 000000000000..163f61195fa1
--- /dev/null
+++ b/app-text/sdcv/Manifest
@@ -0,0 +1,6 @@
+DIST sdcv-0.5.0-beta2-Source.tar.bz2 51508 SHA256 386cfc96285a653c697f8baeab676cb3f1645cea029464d194872d0bbae14ffb SHA512 e00ce45042ddd289bdf41f8907c9b8ece983bb6c24356f4905c4b017741d664d590c8f9a159aff600e96d8c3edf792a568d6afdf01865484d1cd5d94f7786570 WHIRLPOOL 0e9cb7eaf6ccee6f9c7dbebbfee4d4a80c1cdca7444f2ba6f276a670924395dcdabd4ee7efe929bd940f3b3accc01e425f0270c2d7c897bcbd4adc03fd566a05
+EBUILD sdcv-0.5.0_beta2-r1.ebuild 1422 SHA256 5820d78c749b08e296b2d7ed541df32fce66dedfb7ba3d0232223e64182fd3a4 SHA512 84b11fd945a2999fb2477ef5daf54f3d443227c37bb7c3413e153d09297944c93269a1043622ed13521ab11ad8b2768fb2a1d3f6486587f3535910dce6718519 WHIRLPOOL 7d380e8c57af792b78747cf732e59eb6ba08b55245270ce06061645e8fc2ed4b09c65b6968e95db77a55823589950ecb20b49b57305cb236acd593b9391078d6
+EBUILD sdcv-0.5.0_beta2.ebuild 784 SHA256 ee31529becb2897c65e0ca4202fac7c96032cd1cb8c3400da90623518de20012 SHA512 3421819e4a02b4e62be853a371439040a2ead97b1de3f3f85b725b926212e755ce8047dace4d0bcd528726d391afc5a7ea4ff9982f342a2bfaa12dfe1477bc28 WHIRLPOOL 2b5ea18624a2c77979208b63c4fe0e719fcb1b864ff4bb85707bc55c6727714cb50cf91de1ba5d00043ca0977c63b5c41a418e1e5cdf152ba3ad598f18d31471
+MISC ChangeLog 4654 SHA256 3c2973f5956a66a8d6ff6d02d1c9546e39755c2b399a6ec0f436cf745b78b004 SHA512 4041c1f3edf629f0e3bd1fd7a7d7816a8cfb947ea9fde8900259bffe7563b04cb7938d838b7de50d16446503779ef1a1a19f1783195db824aff171084e6a4066 WHIRLPOOL 6d000089bf0aa29383c7da03d81d3154779fefd533339548fe4e77d9ce8b0d0ff377a66803c5abc149855533f0e2c8b07970e2a628aa2de2234fdc1287e94126
+MISC ChangeLog-2015 1350 SHA256 fdd3ad555fcdf7ba4c23845d7dd9f9cf554a7f4148086a060c6db44a22aa518f SHA512 bf67e5ba00ee7f46064f9c7643ac6c8e3ed985e525b56243a72345d3275cbfa72445abb13d1bedb0cd148bb1b88ade381a06012831fda2275695a56a1c2687b7 WHIRLPOOL 7cf8a3f8cd2a9ec2956be73398e71b4bc2918dbdb774200cf94efe0bb7a3102754bc95795297190c37db755171e25b6e390d189d3b4a0fee5045f30e56d2b8cf
+MISC metadata.xml 523 SHA256 28bf637b939ad21093fbb8bff45fdfdefef47543e108bf37ed28fa258b49c286 SHA512 d1c4be3dea4d7cf435bb98f6a02cce92925c113fc17c505377659095b53c1857b2730fa2363910630e51dda847f6d85f9dd6dd80abece74b844995ca7a09c8c8 WHIRLPOOL b9b0767e484910fe25bd3fddb642b5d31163219569815275926dd29b8df8af43e50853b0fcf9fe28ee1b0ee93e5303ab039c71285ca1120bf8ec9c173d9ae5f6
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..77ff9d69adda
--- /dev/null
+++ b/app-text/sdcv/sdcv-0.5.0_beta2-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2016 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 ! use 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/sdcv/sdcv-0.5.0_beta2.ebuild b/app-text/sdcv/sdcv-0.5.0_beta2.ebuild
new file mode 100644
index 000000000000..84bd106223f1
--- /dev/null
+++ b/app-text/sdcv/sdcv-0.5.0_beta2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit cmake-utils
+
+DESCRIPTION="Console version of Stardict program"
+HOMEPAGE="http://sdcv.sourceforge.net"
+MY_PV="${PV/_beta/-beta}-Source"
+MY_PF="${PN}-${MY_PV}"
+S="${WORKDIR}/${MY_PF}"
+SRC_URI="mirror://sourceforge/${PN}/${MY_PF}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="nls"
+
+RDEPEND="sys-libs/zlib
+	sys-libs/readline:=
+	>=dev-libs/glib-2.6.1"
+DEPEND="${RDEPEND}
+	nls? ( >=sys-devel/gettext-0.14.1 )"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_with nls)
+	)
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	cmake-utils_src_compile lang
+}
+
+src_install() {
+	cmake-utils_src_install
+	dodoc AUTHORS NEWS
+}
diff --git a/app-text/searchmonkey/Manifest b/app-text/searchmonkey/Manifest
new file mode 100644
index 000000000000..36e24cd465cd
--- /dev/null
+++ b/app-text/searchmonkey/Manifest
@@ -0,0 +1,11 @@
+AUX searchmonkey-2.0.0-gcc4.7.patch 1342 SHA256 8ac09a7985a7085fbea5b4c117e7ae62d375fee06f2457080dbfc924a4cc4900 SHA512 0a303099c99ae6e7b66ab6934bd5fad6301901d294642fc68dc1eaee0bd35d87e04870243e178acaedee2cac84ab90219854621bb778d491134a0995fb9d8501 WHIRLPOOL 09ed731129123635724f54d92b2de787193aff44a1ab25286b011abb2e5fed67ea7cb70326ab3f43f2e79af777162c2902c6674c4b004d3806596b198c91d762
+AUX searchmonkey-2.0.0-gcc6.patch 572 SHA256 3b67dc2c140d99ed3d0340505b1fe1ef15302d447de68ec6d106b6f0394f33d5 SHA512 9f55a6c28a09ab108acaa921546be194027480f756fd2c66dcb730cf8795a7510a545d47066fea9d62a765f928719a5c40d11d723f316e3d2822433a00c82089 WHIRLPOOL 0cd4ddef282c187aa6ffd16a5dd22b9dfb0fa1f84d0429de43ebfffea7c8d91b680f8826b3977584b1efe918ffb9d17d99eb56c6c83bab4c4762902e96e81837
+AUX searchmonkey-2.0.0.desktop 181 SHA256 e97a27492a75ea09b7f14caeecb3c75217a06c91fb8fc93248ef294ffdd9925f SHA512 4c70055169de7c442e960061f82714a72f03ce10f85471004d05d2813b0f2b4d7d1413d1a49e10e60049bdeded63a21614ff11ea3f9ca5f10f10ba9cf682222c WHIRLPOOL 12642da291aee8b5e6c62095f399924f45ce58094a4d024db387359f3949c418b9815985b554b58db64a95c238c23ff39e5622a80ee8cbb6a1f05ad72db55ecf
+DIST searchmonkey-0.8.1.tar.gz 364824 SHA256 5b20484deeb0b4134fa3848d9db631637ec62ed9eac337863b118f617558caca SHA512 9a07031fe629ef3b910c252b179f0ba33e83750b25a632631bbd50531632f8d77b0943cef87ba0f854afb590274e45c9eaf45d3cb51dc55b2faffe1a45fe0d87 WHIRLPOOL 0a749b232931f95612c94975c16dd8ff40123c6dfc5a092f6c5e1ffb152361e3e86154cd2584aa09d6a8f39f86639edb0e9cf39a7ab16068eeea76eb3c013e2a
+DIST searchmonkey_v2.0.0.zip 491726 SHA256 116ebe50c8daff6fa3366ca19087ac1c7d6a40e0c39b9e3c0f4cb6ed66ee87b1 SHA512 bde6560c58ed2b0295fdbdf778e947926c08ab9e70ab4fde4e4fc170353a7301d5c598669975654dede88faeb367627f05ee144a7ab18443db43b2f4f7396ba3 WHIRLPOOL 5d14090321cab861df4b4e2c5bd11aebc38d9b884115b809ae97c7a559a7e5742e0a8ef273336e834169f0456ac05b159d1716a721d329d8a4569046d4180e33
+EBUILD searchmonkey-0.8.1.ebuild 596 SHA256 4566db6af4e50c76db787869f211281f0e02407b391a5b5859e24abb8b7bc49b SHA512 a786f6a20842e53f1cf5559239332c05bbf6dbc1e09787561b84c7b6d1e2e00a252f64362828af87525b78fc58a552ec9557138003f3d6593052c8fdc8da0bfa WHIRLPOOL adfc0c91e7567b8935753b1ad6db24226bc8e05675f8d896b58592da973ccaa4ef88a9d62ae1a6f2816050298a6b4e599a55e2ba080fc99d6fa92d15fc251eb9
+EBUILD searchmonkey-2.0.0-r1.ebuild 830 SHA256 a1c126e22b7a74dcba7e830991770066a3330f8c307c6686f4f2a7feba2a3589 SHA512 b8f9336a2e80ab7fb82300e2b8b1c7fc53cf8c8968bbd8b3aa06e134e1eb6ab0f4bded4c59036d9408b7c26fd4798c7f5e7fec2ac93b0c0717b1c5e579c32b94 WHIRLPOOL 80f81f42f34968cca480249a06d078d5c4cb8c6a10b5e0348c0f4f9fec8ada4782dc9a50184bb5d06b4ab46b789449dc0928fa95ae4ebcc47b587afe0d2bcca2
+EBUILD searchmonkey-2.0.0.ebuild 788 SHA256 effb7f91b3de3c3c94bc880ce35a5660fe876f8559cb9bed2a913415961e0c23 SHA512 1b7da549c0daca9fe0011bf29a06541cb9a96e825ada079fc975943a2a698d18bbc70783738ccc982e56e59e850058f1ac11e63facb52ca02e1783eadbf5b7e7 WHIRLPOOL 853aa0f154eef8fcecc1f6b0c8a48d58b307fad7174d3c9f8f1faba3de1e37079872d426ecc252f5439c25fc1c2b98300b25fefa63011536d04a95af28cb88a4
+MISC ChangeLog 2937 SHA256 4cf6e16506a756405632c255651b29d555ea6a66e2a6c5ca5697866c9ebe9a5f SHA512 f34d4c222977daad63da4696c957c2c6abeb5138f51581b7d764de6906d418ca15d0eb8b05fac31007af43d243132e59e4bcb036cd9972c33854bea168053883 WHIRLPOOL e30455cc35ec9d4e6d057febda79fb80f4a0bf4f1818b96a2df4d39767a060d823076030b1f296e66c65e5c5af12e019132720ec3c3a5c892a144708f1f9490c
+MISC ChangeLog-2015 2172 SHA256 aefc736f8e917e89fc43fed66fb43597c81ddd134ec3604f61ca7cb5eca3aee6 SHA512 0a7e71221954f7b1a9f8c9d6423ffa30482e988e05ad25119d333b7e3fc360f16fa43ffd196ed30c213f741dfec7d097c11b2a1989870f92f5cbf09fe7d3e606 WHIRLPOOL e87e5b9a904823fd088209734f9aafa9c323ae077545ad415152daf0efb5e86c7d421b20f2b70ee1abbfcf45efe59614c5e4e203209cfd475c4a377d7d85e5a6
+MISC metadata.xml 249 SHA256 7c53f4f106146fa7455b5c302ca42e59fd1067dbae65b97a9f6bbecf23d38ba0 SHA512 0dcb7f72ef6733582eca7f8af4e2e7b2852c3f9a97035940d003b6edca4830cf59b469bc919ffd89e1c64270c0a73b51c9eb7e0c70c190c81ccf3fa994ad7bb2 WHIRLPOOL 30929e6c792c9c0bdfb9e150c61f6b856ef3e31b83f35e7a653273d5bb616b27a1a9a45cdbb45ec97467d41b615858df478fb70fce7cb9080b4934d3e6e0aa01
diff --git a/app-text/searchmonkey/files/searchmonkey-2.0.0-gcc4.7.patch b/app-text/searchmonkey/files/searchmonkey-2.0.0-gcc4.7.patch
new file mode 100644
index 000000000000..f9d1718dd7b4
--- /dev/null
+++ b/app-text/searchmonkey/files/searchmonkey-2.0.0-gcc4.7.patch
@@ -0,0 +1,40 @@
+ Utility.h |   20 ++++++++++----------
+ 1 files changed, 10 insertions(+), 10 deletions(-)
+
+diff --git a/Utility.h b/Utility.h
+index 890eada..99f9a4e 100644
+--- a/Utility.h
++++ b/Utility.h
+@@ -92,16 +92,6 @@ QRegExp::PatternSyntax uint2syntax(uint _index);
+     CallEach(observers, searchable, &Subject::Register);

+     here the Subject is the type of Caller

+ */

+-template <typename CalleeContainer, typename Caller, typename Op>

+-void CallEach(const CalleeContainer& container, Caller& caller, Op op)

+-{

+-    for_each(container.begin(), container.end(), bind1st(mem_fun(op), caller));

+-}

+-template <typename T>

+-bool IsValueInRange(T value, T lowerBound, T upperBound)

+-{

+-    return LowerBoundFit(value, lowerBound) && UpperBoundFit(value, upperBound);

+-}

+ template <typename T>

+ bool BoundSpecified(T boundValue)

+ {

+@@ -129,5 +119,15 @@ bool UpperBoundFit(T value, T upperBound)
+ 

+     return false;

+ }

++template <typename CalleeContainer, typename Caller, typename Op>

++void CallEach(const CalleeContainer& container, Caller& caller, Op op)

++{

++    for_each(container.begin(), container.end(), bind1st(mem_fun(op), caller));

++}

++template <typename T>

++bool IsValueInRange(T value, T lowerBound, T upperBound)

++{

++    return LowerBoundFit(value, lowerBound) && UpperBoundFit(value, upperBound);

++}

+ 

+ #endif

diff --git a/app-text/searchmonkey/files/searchmonkey-2.0.0-gcc6.patch b/app-text/searchmonkey/files/searchmonkey-2.0.0-gcc6.patch
new file mode 100644
index 000000000000..ede01afa39e7
--- /dev/null
+++ b/app-text/searchmonkey/files/searchmonkey-2.0.0-gcc6.patch
@@ -0,0 +1,14 @@
+Bug: https://bugs.gentoo.org/602166

+

+diff -Naur a/mainwindow.cpp b/mainwindow.cpp
+--- a/mainwindow.cpp	2017-07-31 18:06:33.206668001 -0400
++++ b/mainwindow.cpp	2017-07-31 18:07:09.685940997 -0400
+@@ -781,7 +781,7 @@
+  ******************************************************************************/

+ void MainWindow::find  () throw() {

+ 

+-	auto autoSettingsReset asr(sui);  // dtor calls sui->reset()

++	autoSettingsReset asr(sui);  // dtor calls sui->reset()

+ 

+ 	bool modeAdvanced = ui->actionAdvanced->isChecked();

+ 	qDebug() << "modeAdvanced-" << modeAdvanced;

diff --git a/app-text/searchmonkey/files/searchmonkey-2.0.0.desktop b/app-text/searchmonkey/files/searchmonkey-2.0.0.desktop
new file mode 100644
index 000000000000..cdd082e75141
--- /dev/null
+++ b/app-text/searchmonkey/files/searchmonkey-2.0.0.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Version=1.0
+Name=Searchmonkey 2
+Exec=searchmonkey2
+Icon=/usr/share/pixmaps/searchmonkey-300x300.png
+Terminal=false
+Categories=FileTools;Utility;Qt;
diff --git a/app-text/searchmonkey/metadata.xml b/app-text/searchmonkey/metadata.xml
new file mode 100644
index 000000000000..811e07d2e1d3
--- /dev/null
+++ b/app-text/searchmonkey/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">searchmonkey</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/searchmonkey/searchmonkey-0.8.1.ebuild b/app-text/searchmonkey/searchmonkey-0.8.1.ebuild
new file mode 100644
index 000000000000..e418a50adba1
--- /dev/null
+++ b/app-text/searchmonkey/searchmonkey-0.8.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="2"
+
+inherit eutils
+
+DESCRIPTION="Powerful text searches using regular expressions"
+HOMEPAGE="http://searchmonkey.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 x86"
+IUSE=""
+
+RDEPEND=">=x11-libs/gtk+-2.6:2"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+	dodoc AUTHORS ChangeLog INSTALL NEWS README
+	make_desktop_entry ${PN} ${PN} ${PN} "Utility;GTK"
+}
diff --git a/app-text/searchmonkey/searchmonkey-2.0.0-r1.ebuild b/app-text/searchmonkey/searchmonkey-2.0.0-r1.ebuild
new file mode 100644
index 000000000000..34061ebf5259
--- /dev/null
+++ b/app-text/searchmonkey/searchmonkey-2.0.0-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 eutils qmake-utils
+
+MY_PN=${PN}2
+MY_P=${PN}_v${PV}
+
+DESCRIPTION="Powerful text searches using regular expressions"
+HOMEPAGE="http://searchmonkey.sourceforge.net/"
+# Switch to ^s when we switch to EAPI=6.
+SRC_URI="mirror://sourceforge/project/${PN}/S${MY_PN:1}/${PV}%20%5Bstable%5D/${MY_P}.zip"
+
+LICENSE="GPL-3"
+SLOT="2"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4"
+DEPEND="${RDEPEND}
+	app-arch/unzip"
+
+S="${WORKDIR}"/${MY_P}
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gcc4.7.patch
+	"${FILESDIR}"/${P}-gcc6.patch
+)
+
+src_compile() {
+	eqmake4
+}
+
+src_install() {
+	newbin ${PN} ${MY_PN}
+
+	# Hand-made desktop icon
+	doicon pixmaps/searchmonkey-300x300.png
+	domenu "${FILESDIR}"/${P}.desktop
+}
diff --git a/app-text/searchmonkey/searchmonkey-2.0.0.ebuild b/app-text/searchmonkey/searchmonkey-2.0.0.ebuild
new file mode 100644
index 000000000000..c69ce6729127
--- /dev/null
+++ b/app-text/searchmonkey/searchmonkey-2.0.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+inherit qt4-r2
+
+MY_PN=${PN}2
+MY_P=${PN}_v${PV}
+
+DESCRIPTION="Powerful text searches using regular expressions"
+HOMEPAGE="http://searchmonkey.sourceforge.net/"
+# Switch to ^s when we switch to EAPI=6.
+SRC_URI="mirror://sourceforge/project/${PN}/S${MY_PN:1}/${PV}%20%5Bstable%5D/${MY_P}.zip"
+
+LICENSE="GPL-3"
+SLOT="2"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4"
+DEPEND="${RDEPEND}
+	app-arch/unzip"
+
+S="${WORKDIR}"/${MY_P}
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gcc4.7.patch
+	"${FILESDIR}"/${P}-gcc6.patch
+)
+
+src_install() {
+	newbin ${PN} ${MY_PN}
+
+	# Hand-made desktop icon
+	doicon pixmaps/searchmonkey-300x300.png
+	domenu "${FILESDIR}"/${P}.desktop
+}
diff --git a/app-text/sgml-common/Manifest b/app-text/sgml-common/Manifest
new file mode 100644
index 000000000000..2822beedf7bc
--- /dev/null
+++ b/app-text/sgml-common/Manifest
@@ -0,0 +1,7 @@
+AUX sgml-common-0.6.3-install-catalog.in 5064 SHA256 dffad899948ae7177b33e1c3132f9b7c6ea9e3f5a6d1e34b9334b91e54cc5fa6 SHA512 85fbcdd7aceb28256e08ca1a5b6472247d81499e604d6a45edabf662bc32b72a22326db907e2a408b1a6da02deccd89606749e3fc8e42594ad6402ab29d501b9 WHIRLPOOL a25ad29a334b38d794e52ac5a04232d319ffa109d3130e2d9a89868548090a1001c512c75bd67f9335fd6d0a898bae673692106238e7ebe1a876d3dd45717e2f
+AUX sgml-common-0.6.3-prefix.patch 658 SHA256 6926c44655ddd713276cc26d777d39b56b3cc740e55bbc2c543daad21359bee3 SHA512 25e02afb59be7c056577169a5c644a2fa6800bf07c5876fac3f9ad6b3094ee186b1864f59ae2fcbb99acb7f0d6e0d32f8daeb2aeec16f8f2f98d43b3e890ef7d WHIRLPOOL f7b7ee85138b5e7f89f7fb88653d416dcf534530535aec3fb3fe84fd51e49d84b0745f529f412faf29bc7d2b000331d214a6952ad71833c4d0b08be7119052da
+DIST sgml-common-0.6.3-gentoo.tar.gz 128903 SHA256 c5f6668cb19e230df5c5adaf2704fa5225da0aab090b42a23f4247224c6523ee SHA512 c8de573d707ccf524407c9be9a6e7740341eb88ecb6bee69d6d11a2658ef74e6acfb7495afa33c9983ab015c3c925aac98278a4e01ee217892a9fb99e60798ce WHIRLPOOL 18187f92fd4def6affdbb9e7c6de5f4a29f906b6f5199bb9db049ff106cc3fccd51144b83ad575caeb1ef8b6cb01d59db7a33563867fe14053019d93b9084772
+EBUILD sgml-common-0.6.3-r5.ebuild 2477 SHA256 df6a6e510a63d98a3f96cd588c6ffa88b1b6fa10956a244decdc71608da2da47 SHA512 0ea375e2fd3a481f59656f488aa9e5702d6755019a909cbe7f091e836cb9d99f3f19fda10e9ec03bc66033b234891aca1b71a81ddb15b74cd271da816358ee78 WHIRLPOOL e5208df33f487685aba0e07a2e6b95df6b10be73fafcab0861bfc1f702e8634026c13eafe28590ad4971e1d1cbc09626bd78dbda8aa3c91444a11cf3b1ec5fcb
+MISC ChangeLog 2659 SHA256 7c001a3980252c54534108bc7214b5258af8cc676ea68204a1a54a0314bb9510 SHA512 4fa4aba97b8ef2b58eca9d9c018118de7cab0960e3c89910f253608a8e7a26b209f481a2cde77c91da1db4684b1a1d621cff77251f0aaafe5399917cf45cb304 WHIRLPOOL ed0322d2ccb3dbc76daef67e8a910c8e57d10e3c1150c558f72dec69ae7b718e8458429a78da5e968cfe852e86b186709daf040a6765bceabeeb62f91a4af387
+MISC ChangeLog-2015 9360 SHA256 dff19456b9a5b4d3efdd731757777f1ed2b5be1bbcc5e048f4d40a8ad88f2cdd SHA512 3534e8a2fbad7010a90e820834e12410f3f43e55e1f9df7f325ff0f8b820cb1131f8fe27917efda2ea53ac46317ddfc25b36604cd909cae1029706c267c04d6d WHIRLPOOL ed88533f45ba5de82da8d2efd01b79b8fb70738fcd0b92b948c268d54aeebc164950538c59737f1b317770f14aa8f13693de9609c0985abc08074693733288cc
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
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..bfca708799d3
--- /dev/null
+++ b/app-text/sgml-common/files/sgml-common-0.6.3-prefix.patch
@@ -0,0 +1,17 @@
+--- bin/sgmlwhich~	2007-10-08 04:21:25 +0200
++++ 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? ;-)
+--- config/sgml.conf~	2000-11-17 09:36:11 +0100
++++ 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-r5.ebuild b/app-text/sgml-common/sgml-common-0.6.3-r5.ebuild
new file mode 100644
index 000000000000..adb5d0c161d5
--- /dev/null
+++ b/app-text/sgml-common/sgml-common-0.6.3-r5.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="3"
+
+inherit eutils prefix
+
+DESCRIPTION="Base ISO character entities and utilities for SGML"
+HOMEPAGE="http://www.iso.ch/cate/3524030.html"
+#SRC_URI="mirror://kde/devel/docbook/SOURCES/${P}.tgz"
+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 ~sparc-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=""
+
+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"
+
+	epatch "${FILESDIR}"/${P}-prefix.patch
+	eprefixify bin/install-catalog.in bin/sgmlwhich config/sgml.conf
+}
+
+src_configure() {
+	econf --htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+}
+
+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 \
+		"${EPREFIX}"/etc/sgml/sgml-ent.cat \
+		"${EPREFIX}"/usr/share/sgml/sgml-iso-entities-8879.1986/catalog
+	"$installer" --add \
+		"${EPREFIX}"/etc/sgml/sgml-docbook.cat \
+		"${EPREFIX}"/etc/sgml/sgml-ent.cat
+
+	local file
+	for file in `find "${EROOT}etc/sgml/" -name "*.cat"` "${EROOT}etc/sgml/catalog"
+	do
+		einfo "Fixing ${file}"
+		awk '/"$/ { print $1 " " $2 }
+			! /"$/ { print $1 " \"" $2 "\"" }' ${file} > ${file}.new
+		mv ${file}.new ${file}
+	done
+}
+
+pkg_prerm() {
+	cp "${EROOT}usr/bin/install-catalog" "${T}"
+}
+
+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 \
+			"${EPREFIX}"/etc/sgml/sgml-ent.cat \
+			"${EPREFIX}"/usr/share/sgml/sgml-iso-entities-8879.1986/catalog
+	fi
+
+	if [ -e "${EROOT}etc/sgml/sgml-docbook.cat" ]; then
+		"${T}"/install-catalog --remove \
+			"${EPREFIX}"/etc/sgml/sgml-docbook.cat \
+			"${EPREFIX}"/etc/sgml/sgml-ent.cat
+	fi
+}
diff --git a/app-text/sgmltools-lite/Manifest b/app-text/sgmltools-lite/Manifest
new file mode 100644
index 000000000000..bfb2d4b69dbb
--- /dev/null
+++ b/app-text/sgmltools-lite/Manifest
@@ -0,0 +1,6 @@
+DIST nw-eps-icons-0.0.1.tar.gz 8733 SHA256 15295129f1ddd3bc1d09775296bf0aacef722799394189b0755acb3d1725c012 SHA512 597062e9882bb9bb73144bbdb056c3ccc2a6d99efc7da836f483ccd6f3799705bcbb897099cb1a580c8e22d936d281d95c3a875694f8e15b6989faf437f6cc7a WHIRLPOOL 8aba320641c652e38ad4e87a48ac5f5454ded681ec1d9fc4a2430e272e3a6b9d6f230c4ede9e02d8df2f4f711bee33b2e7929f96871a685d17aa52a5ef3cdbf5
+DIST sgmltools-lite-3.0.3.tar.gz 61342 SHA256 eb9d2270f9ac5f17b8bd2d27f53ae700937365079413843fe5089c9568d0f1d8 SHA512 36709ba726859b734a7402c533ba7d2abc0546007bc97dba76ac824bc42f6f8ac7ef263b3740d0be51749cbc0982d010ba938646fca2006fa2c5094a296b3c81 WHIRLPOOL 46a94114a04c54a19f1d6a37a35bfb30804b1fde8defc931b9464980600b2707ca9ea970632d5d793dee1bbd0a388ef3e64a8be2806093e33dca4eb7bfd4c7d3
+EBUILD sgmltools-lite-3.0.3-r14.ebuild 2205 SHA256 8f0d36e90dcb1015ebf23eb4f956cb259ae37b34fabc740a12270e82cd86be78 SHA512 f1cf3035547d1626ace249218a75399e7ad9374f60de3203003393418324628dce27f28cd608f4a4c310306d36043a6856db273307c8ec5a9a3642307e1cb351 WHIRLPOOL 5029b71f51201efce66a5c21851b46e323c99ecde9d97bab6afdfcb2e60ce0ced89c6e746b123ef5ffb0e910e5b444ce86672d06cc1442acacaf88a6eefd9dc4
+MISC ChangeLog 2551 SHA256 670b9577aa1904d60b10c868be744d7b28c3ea1e47c6eccb0a1281a73c584fe8 SHA512 b32097ce8646235c69333eca3e8f274ac31a39993abb4cefbaa39d49a97d9a763e9a9e0e928df21ebcd9924910c2ec1fc226947940e1eecc5a757dce42bed450 WHIRLPOOL 9a688373ba0bb90ead553b142a644a843d4f53b8fce7c53893d3863f5ae31dd21fe31b109eda3864a0668518f48b2f52d5e672d77fd370879ce9632e4fecc7cf
+MISC ChangeLog-2015 11996 SHA256 d2ca87dccc057c839693b7c1991f88e673ce4ba0019e4c07978e540f19d12a15 SHA512 b93af698d6cdfbe5eff13296f7cb4e05ac4d921e18d1e13bc9a3a99ccbca97359109644f90e5177528227b85eecd0e02ecd732f084fd7857a1525e68be442084 WHIRLPOOL 571703e729b3038722dd53f550a14c2dc8cf61550e567a1c96cdf66d5aa1064df688d74e9747ac3abedaf26426e54061290caaf99240c554a253a8f6ac192298
+MISC metadata.xml 411 SHA256 d62c1c62bf76a3653f3d6926747edc97771db0b26af331decf1b1f5e9f394ee7 SHA512 411e4e0cdd20140b2334c00fc27ecafe637a02570808336250bef84240c478a994f780dec21170bacde605abda04ee27ffc937c3555b47080575713e308950e7 WHIRLPOOL 40903ef3f7fee9d3be5614358269fadd89524872e911f30c06ec350958e35fd545f74ba41c9dc7a3594b5030d7e879032e4ff4da14a448b74b088f671adaad80
diff --git a/app-text/sgmltools-lite/metadata.xml b/app-text/sgmltools-lite/metadata.xml
new file mode 100644
index 000000000000..829e9064a191
--- /dev/null
+++ b/app-text/sgmltools-lite/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 -->
+	<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/Manifest b/app-text/sgrep/Manifest
new file mode 100644
index 000000000000..1cd9cf9ad370
--- /dev/null
+++ b/app-text/sgrep/Manifest
@@ -0,0 +1,5 @@
+DIST sgrep-1.94a.tar.gz 193267 SHA256 d5b16478e3ab44735e24283d2d895d2c9c80139c95228df3bdb2ac446395faf9 SHA512 8d2571a738c6a87cc34aea3a0692d15aea1d4a0439401b97368da2a021992ef8d0754e91e10409c1c059712bfe69ac4188e3be856211e48f8e6d528b5684283a WHIRLPOOL bc39aab9c39e5ffdb64babd8de5819eff6665f430ff51644e6789d6f0fe721407104fbc877719cb7b24f7424c514e0284e3ae7bc728e21ef68c8606b9c2f52f9
+EBUILD sgrep-1.94a.ebuild 704 SHA256 8b6b2dc776177f323a494cdb2a7ed7502f86abb2e4e76b039bfc252b54dc8e9e SHA512 aff8595657db0cf5fc6186fa58feda22dee88cbae4f65e45825b0e20c529126bd7c51df99aef4200fa6629d9e6396a248303a5fc30308635fa141552cf6d64a8 WHIRLPOOL cfe3b4a3d317a7dd3909284bb423c5417bdea4f72d28a2bae892ce2cd97edb8b59f880faea81abc0944d3d7c782a536ba2b8930e391066f91eecde1abf042ebf
+MISC ChangeLog 2516 SHA256 02c99e13a677b1139c89458e81de6c3f6ee8c445943efe61c9a7b4d7e68e7f4a SHA512 4c7a762a6f27d33757ae28550fa684672c432b8b1a4308144b86543d8b8577b787889793431c7d5de8afd65e1eda5cf4358c2b53ebbf7b5f81a80b61da61f9f0 WHIRLPOOL 20c3b5db1ca51dc7f98cfd110c329f32acf213af7168827c68bfe6215b93ebdeb73c1b9c86f757ec36084a06fb1eafe056a031e48051ec01374ec226ca5018fd
+MISC ChangeLog-2015 1763 SHA256 1a3fef0226a847bec927a6376e24a652234541e5dcf0e29b0239b0ac86db3713 SHA512 482ef7e4d42bdba5167cc3cc1981e5d11de496facaee71f47950ef6e9c103b94105945fbbb85ba4ae5fea1f25a7a51e24c6738762969b9cae208a32aa43a5482 WHIRLPOOL dfc62e29f6def3a9a1218669ab9e7d76a6559d03c840bad6ae1b95e6c550f8a79b05d3b0f590b12f008f6db1045e0cc8aed77d7e26ee5e7aae8e1349740fc11a
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
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..6e31bd750619
--- /dev/null
+++ b/app-text/sgrep/sgrep-1.94a.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+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="http://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() {
+	sed -i -e "s:/usr/lib:/etc:g" sgrep.1
+}
+
+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/Manifest b/app-text/sigil/Manifest
new file mode 100644
index 000000000000..4591ee64ee9a
--- /dev/null
+++ b/app-text/sigil/Manifest
@@ -0,0 +1,10 @@
+AUX sigil-0.9.4-proper-gumbo-install.patch 1582 SHA256 fab824cd6ce418ebbfe1fcbdc1b180e5e2071ec63b4a3076401b69272fd83221 SHA512 880a34ffddee86e5e66fe6d0ca12798e29af0a3e554fcde69872f9c6cd9e731e8cc02e6a88acafd0e3d418883c6e9346cefcfd7e0c7aae6f05758b2a667fccb6 WHIRLPOOL 4598f4a6303b1be803d19f9166bf7243cb160cb59528d622c43649b1b43e8e535cec5abd62f6cde82630d0c1ee829db83dbd6c712ac6d0963063eb092d3ef052
+DIST Sigil-0.9.5-Code.zip 19224845 SHA256 fd9963c4e5b9013bd95ed0659dbc5e67c9848982800f2ec99bf96bbdfb708ff1 SHA512 f2e151f716ce57f9bb94d621ae8e5281c6a0cce12e58b49abe959d1f602fbdb8d28f16d5dc418dca871b100efba2fe13f7f2a66c6704346b5a40755a68e8f625 WHIRLPOOL 8ec15cb19175097b4bd0613139366d58a5fd0c01259e3cfb9203d585e009f1207ba3e9b68cd5213793c8309f9e18720ac9eec674d820947833a90dbcc6dcc3d5
+DIST Sigil-0.9.6-Code.zip 19307454 SHA256 7856ad20116ef13fc3f79fa01c1d65c8b15ce1047f1e88b0723c2658cd8f18fd SHA512 8ae5ce89baf199a10b940d25b3bb3cb97a03dab993e318c5a2b5e6fcba7d4741cbc865f3408d36bd5ad784c35833e4ab3d7b3e282047560d57cd7790c6709417 WHIRLPOOL d74290b59247ced4977bf575adb93c7a76a8045f464b649854e49f6028cb2a9fb28c50fc36d00d3ab106768a85c514b5df5252e5172597a6120913a051b9cca7
+DIST sigil-0.8.7.tar.gz 19394061 SHA256 0352cc46714ebb5067a0fbdbbc76dded8f10ea0f4f43374c7dbcac6eba49e104 SHA512 24b74c835ae1f8fb887c9d2c59b3ccc6720ce1fe8d19a6b0056754ab5ea6e63c34c4b229f4e4b3a880e722876d288e58385f5a0ad15b295f147b77b1acf28652 WHIRLPOOL 2cb7a8a928069a2f005396faa9bdacde1f77f3cca3a3ba2458b8562e48298a127b9de9d7ecea5f106ad68865d5074b13fff5a234497b2b6655ac1a3c3edef827
+EBUILD sigil-0.8.7-r1.ebuild 1276 SHA256 11ace9e20eb41c98ea4a2807836a619f35d77b234f8618ef902d2a732ffe4e58 SHA512 99f64144328eb0e7566646a5705bc533df127da56f633c38ba85f432e63cda949f54f322419b7934ed80263fb275f897d8513d721d7b6807ce4ac1cabf0d2456 WHIRLPOOL 0ea210a1b0c9ef6b4ce968020df451de94dc6115969717ddd53bf4a8bd6436ebc38c59dba5965c17a221b7ed4134f402e2a3dea1b687e429aa7f9d60cabfae7e
+EBUILD sigil-0.9.5-r2.ebuild 2242 SHA256 47fa5d6143fd8bcb492fcbaf36be3642ab7553be797fc4da62718fad8a58abca SHA512 c72a5bb74e93c6722710f411b59bbaa1ea11ec67fab47c6e21c041c4c81d1f5e868f572b2f1eb1a1e251a15052a25ced0cd5f72020e6d9240a61f6a913438d04 WHIRLPOOL 0d82691655eb657c6feb57275dad2bae7032caf24bcaf9d99b0e281da094db1a578e90340e118a618f6d178d38c99da48d2a60c456922c4b530a55c6fffb318f
+EBUILD sigil-0.9.6.ebuild 2242 SHA256 47fa5d6143fd8bcb492fcbaf36be3642ab7553be797fc4da62718fad8a58abca SHA512 c72a5bb74e93c6722710f411b59bbaa1ea11ec67fab47c6e21c041c4c81d1f5e868f572b2f1eb1a1e251a15052a25ced0cd5f72020e6d9240a61f6a913438d04 WHIRLPOOL 0d82691655eb657c6feb57275dad2bae7032caf24bcaf9d99b0e281da094db1a578e90340e118a618f6d178d38c99da48d2a60c456922c4b530a55c6fffb318f
+MISC ChangeLog 7635 SHA256 607c351b0c32280e50848c2454d95ba3a1fa500abe99759889edf80477cde5cc SHA512 1436d601f1aeab5fcd8fc7e8eadf793e257922154bdb9217e74cc3dc64bb6e1c1e27fffb10ccc0ff021e5a2a06e9da1c8e77e0007e69adcdce42e87690549825 WHIRLPOOL 019c929d678af0db3e4e4d5662e15bf392ca7272bee98b82786d4a882aa5fa004d6037d107de156abfe3e3a720f564776ac2e8b4d16f2d7a84043f097aabf97a
+MISC ChangeLog-2015 2643 SHA256 d4a27d050f4fb657eef3ad487c632eb8f9afca6e7760b4d89e628a16295e7c2f SHA512 15270b02a9bcbcf23225a53efff1d0fac71a1eea3fd51c20aeed1804553a9703a29341dca9ad772d08f467612f5cae089d55d4a051c84fa06390ad7310b28d66 WHIRLPOOL 90e0e673221edeaae669ad2167a6679cdc00b6fd36ebb34e5bcdf95c5601de220c5da03a455555176abb89d0020bef45144785324a9511a6b3d533edf888df5a
+MISC metadata.xml 636 SHA256 2e9262d0707ae9ba14e8906f138a408ecf7835c715a42e857cfe082aa0ed0f4d SHA512 66546079856b255a0c5c46a2eb3df314a08b510456e971f74422748cd689517b248f01f9500f3c7a76698d5f9271540be52ba4e1ab457f55c25f75c3cf5da488 WHIRLPOOL 88ab73db404348de3170d5b2f2c3577261bd5af2fa564bfa25d70ac3ddbe888f0592dab50b6ed632da46037308bafc8e5964a5bc8513cd0b7d1999755c9be0fa
diff --git a/app-text/sigil/files/sigil-0.9.4-proper-gumbo-install.patch b/app-text/sigil/files/sigil-0.9.4-proper-gumbo-install.patch
new file mode 100644
index 000000000000..6e7db28fe99a
--- /dev/null
+++ b/app-text/sigil/files/sigil-0.9.4-proper-gumbo-install.patch
@@ -0,0 +1,26 @@
+diff -Naur Sigil-0.9.4/internal/gumbo/CMakeLists.txt Sigil-0.9.4.b/internal/gumbo/CMakeLists.txt
+--- Sigil-0.9.4/internal/gumbo/CMakeLists.txt	2016-03-13 20:20:52.000000000 +0100
++++ Sigil-0.9.4.b/internal/gumbo/CMakeLists.txt	2016-03-22 14:50:26.026558216 +0100
+@@ -40,4 +40,5 @@
+ 
+ if( UNIX AND NOT APPLE )
+ 	set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99" )
++  install( TARGETS sigilgumbo DESTINATION ${CMAKE_INSTALL_PREFIX}/${LIBDIR}/sigil/ )
+ endif()
+diff -Naur Sigil-0.9.4/src/CMakeLists.txt Sigil-0.9.4.b/src/CMakeLists.txt
+--- Sigil-0.9.4/src/CMakeLists.txt	2016-03-13 20:20:52.000000000 +0100
++++ Sigil-0.9.4.b/src/CMakeLists.txt	2016-03-22 14:49:49.628556236 +0100
+@@ -1015,12 +1015,10 @@
+     endif()
+ 
+     # Standard Linux 'make install'
+-    install( TARGETS sigil DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/sigil/ )
++    install( TARGETS sigil DESTINATION ${CMAKE_INSTALL_PREFIX}/${LIBDIR}/sigil/ )
+     install( PROGRAMS ${LINUX_LAUNCH_INSTALL_SCRIPT_CONFIGURED} DESTINATION ${CMAKE_INSTALL_PREFIX}/bin/ RENAME ${PROJECT_NAME} )
+     if( NOT USE_SYSTEM_LIBS OR NOT HUNSPELL_FOUND )
+-        install( PROGRAMS ${HUNSPELL_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/sigil/ )
+     endif()
+-    install( PROGRAMS ${GUMBO_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/sigil/ )
+     install( FILES ${LINUX_DESKTOP_FILE} DESTINATION ${SHARE_INSTALL_PREFIX}/share/applications/ )
+     install( FILES ${LINUX_DESKTOP_ICON_FILE} DESTINATION ${SHARE_INSTALL_PREFIX}/share/pixmaps RENAME sigil.png )
+     install( FILES ${QM_FILES} DESTINATION ${SIGIL_SHARE_ROOT}/translations/ )
diff --git a/app-text/sigil/metadata.xml b/app-text/sigil/metadata.xml
new file mode 100644
index 000000000000..9637b6e07a8b
--- /dev/null
+++ b/app-text/sigil/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>tomboy64@sina.cn</email>
+		<name>M.B.</name>
+		<description>Maintainer, assign bugs to him</description>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<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.8.7-r1.ebuild b/app-text/sigil/sigil-0.8.7-r1.ebuild
new file mode 100644
index 000000000000..6262c14ed950
--- /dev/null
+++ b/app-text/sigil/sigil-0.8.7-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+# This ebuild could use some python checks, as sigil contains python plugin architecture.
+
+inherit cmake-utils
+
+MY_PN="Sigil"
+
+DESCRIPTION="Sigil is a multi-platform WYSIWYG ebook editor for ePub format"
+HOMEPAGE="http://sigil-ebook.com/"
+SRC_URI="https://github.com/Sigil-Ebook/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=app-text/hunspell-1.3.2
+	>=dev-libs/boost-1.49[threads]
+	>=dev-libs/libpcre-8.31[pcre16]
+	>=dev-libs/xerces-c-3.1.1[icu]
+	>=dev-qt/qtconcurrent-5.4:5
+	>=dev-qt/qtcore-5.4:5
+	>=dev-qt/qtgui-5.4:5
+	>=dev-qt/qtnetwork-5.4:5
+	>=dev-qt/qtprintsupport-5.4:5
+	>=dev-qt/qtsvg-5.4:5
+	>=dev-qt/qtwebkit-5.4:5
+	>=dev-qt/qtwidgets-5.4:5
+	>=dev-qt/qtxml-5.4:5
+	>=dev-qt/qtxmlpatterns-5.4:5
+	>=sys-libs/zlib-1.2.7[minizip]
+"
+DEPEND="${RDEPEND}
+	>=sys-devel/gcc-4.8
+	virtual/pkgconfig
+	>=dev-qt/linguist-tools-5.4:5
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+DOCS=( README.md )
+
+src_prepare() {
+	# sigil tries to copy non-needed qt libs for deb package, safe to ignore this completely
+	sed -e '/set( QT_LIBS/d' -i src/Sigil/CMakeLists.txt || die "sed failed"
+
+	cmake-utils_src_prepare
+}
diff --git a/app-text/sigil/sigil-0.9.5-r2.ebuild b/app-text/sigil/sigil-0.9.5-r2.ebuild
new file mode 100644
index 000000000000..4fa21a160310
--- /dev/null
+++ b/app-text/sigil/sigil-0.9.5-r2.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_4 python3_5 )
+
+inherit cmake-utils python-single-r1
+
+my_pn="Sigil"
+
+DESCRIPTION="Sigil is a multi-platform WYSIWYG ebook editor for ePub format"
+HOMEPAGE="http://sigil-ebook.com/"
+SRC_URI="https://github.com/Sigil-Ebook/${my_pn}/releases/download/${PV}/${my_pn}-${PV}-Code.zip"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	app-text/hunspell
+	dev-libs/boost[threads]
+	dev-libs/libpcre[pcre16]
+	dev-libs/xerces-c[icu]
+	dev-python/chardet[${PYTHON_USEDEP}]
+	dev-python/cssselect[${PYTHON_USEDEP}]
+	dev-python/cssutils[${PYTHON_USEDEP}]
+	dev-python/html5lib[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/regex[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	>=dev-qt/qtconcurrent-5.4:5
+	>=dev-qt/qtcore-5.4:5
+	>=dev-qt/qtgui-5.4:5
+	>=dev-qt/qtprintsupport-5.4:5
+	>=dev-qt/qtwebkit-5.4:5
+	>=dev-qt/qtwidgets-5.4:5
+	>=dev-qt/qtxmlpatterns-5.4:5
+	sys-libs/zlib[minizip]
+"
+DEPEND="${RDEPEND}
+	>=sys-devel/gcc-4.8
+	virtual/pkgconfig
+	>=dev-qt/linguist-tools-5.4:5
+	app-arch/unzip
+"
+
+S="${WORKDIR}"
+
+PATCHES=(
+	# sigil tries to copy non-needed qt libs for deb package, safe to ignore this completely
+	"${FILESDIR}"/${PN}-0.9.4-proper-gumbo-install.patch
+)
+DOCS=( ChangeLog.txt README.md )
+
+src_configure() {
+	local mycmakeargs=(
+		-DUSE_SYSTEM_LIBS=1
+		-DSYSTEM_LIBS_REQUIRED=1
+		-DLIBDIR="$(get_libdir)"
+	)
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	elog "From Sigil's release notes:"
+	elog "When you fire up Sigil for the very first time:"
+	elog "navigate to the new General Preferences and select the default"
+	elog "epub version you plan to work with (epub 2 or epub3) so that new"
+	elog "empty ebooks start with the correct code."
+	elog "if you plan to work with epub3 epubs, you should change your"
+	elog "PreserveEntities setting to use ONLY NUMERIC entities."
+	elog ""
+	elog "For example use & # 1 6 0 ; for non-breaking spaces and etc."
+	elog ""
+	elog "We strongly recommend enabling Mend On Open in your settings"
+	elog "for best performance with Sigil."
+}
diff --git a/app-text/sigil/sigil-0.9.6.ebuild b/app-text/sigil/sigil-0.9.6.ebuild
new file mode 100644
index 000000000000..4fa21a160310
--- /dev/null
+++ b/app-text/sigil/sigil-0.9.6.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_4 python3_5 )
+
+inherit cmake-utils python-single-r1
+
+my_pn="Sigil"
+
+DESCRIPTION="Sigil is a multi-platform WYSIWYG ebook editor for ePub format"
+HOMEPAGE="http://sigil-ebook.com/"
+SRC_URI="https://github.com/Sigil-Ebook/${my_pn}/releases/download/${PV}/${my_pn}-${PV}-Code.zip"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	app-text/hunspell
+	dev-libs/boost[threads]
+	dev-libs/libpcre[pcre16]
+	dev-libs/xerces-c[icu]
+	dev-python/chardet[${PYTHON_USEDEP}]
+	dev-python/cssselect[${PYTHON_USEDEP}]
+	dev-python/cssutils[${PYTHON_USEDEP}]
+	dev-python/html5lib[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/regex[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	>=dev-qt/qtconcurrent-5.4:5
+	>=dev-qt/qtcore-5.4:5
+	>=dev-qt/qtgui-5.4:5
+	>=dev-qt/qtprintsupport-5.4:5
+	>=dev-qt/qtwebkit-5.4:5
+	>=dev-qt/qtwidgets-5.4:5
+	>=dev-qt/qtxmlpatterns-5.4:5
+	sys-libs/zlib[minizip]
+"
+DEPEND="${RDEPEND}
+	>=sys-devel/gcc-4.8
+	virtual/pkgconfig
+	>=dev-qt/linguist-tools-5.4:5
+	app-arch/unzip
+"
+
+S="${WORKDIR}"
+
+PATCHES=(
+	# sigil tries to copy non-needed qt libs for deb package, safe to ignore this completely
+	"${FILESDIR}"/${PN}-0.9.4-proper-gumbo-install.patch
+)
+DOCS=( ChangeLog.txt README.md )
+
+src_configure() {
+	local mycmakeargs=(
+		-DUSE_SYSTEM_LIBS=1
+		-DSYSTEM_LIBS_REQUIRED=1
+		-DLIBDIR="$(get_libdir)"
+	)
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	elog "From Sigil's release notes:"
+	elog "When you fire up Sigil for the very first time:"
+	elog "navigate to the new General Preferences and select the default"
+	elog "epub version you plan to work with (epub 2 or epub3) so that new"
+	elog "empty ebooks start with the correct code."
+	elog "if you plan to work with epub3 epubs, you should change your"
+	elog "PreserveEntities setting to use ONLY NUMERIC entities."
+	elog ""
+	elog "For example use & # 1 6 0 ; for non-breaking spaces and etc."
+	elog ""
+	elog "We strongly recommend enabling Mend On Open in your settings"
+	elog "for best performance with Sigil."
+}
diff --git a/app-text/silvercity/Manifest b/app-text/silvercity/Manifest
new file mode 100644
index 000000000000..eb49a54f4d77
--- /dev/null
+++ b/app-text/silvercity/Manifest
@@ -0,0 +1,5 @@
+DIST SilverCity-0.9.7.tar.gz 278396 SHA256 5b226e71d75c0afc4434c6fbfb44214e8728fd69703045b2134802f71ef049bd SHA512 230c4ce61a0dfef36ba63dfa2d290c2368ae0a1055445b1e17cd12ff436ec80ec91e5a8ff47870c19a3f7a50f958ce59bbe5be06aa07dd0bf0a70038ca3150b0 WHIRLPOOL 2a45f0952adf8542d04aef0111dfc926b5019108d739a168d591f8bd57c3064b7d6bc5f05a9d00d7939c42a935ec0d4b80fa14ca34107fee26dfcd8613ce6b2b
+EBUILD silvercity-0.9.7-r1.ebuild 923 SHA256 0e2aad067fcc3d2ccf10097cafd9e9a401eeb5de67fa401da48442cc4efb1631 SHA512 6a224815f39ff8ef107fc62c23f0ca63fde672c792ec666816eca19ca1fd0aab2e6616c7b7873d18dfdd4d426b5cf88040ce292dd9ed6e07d6f5dde39b47ef62 WHIRLPOOL f7c925447541cbe57d5b9b3c7c0fbd5ee7745f53d97170cdabdb89b88bdc09da7da9040768f268c4c099c715831f5dd327a2111ed4fa6fbf726db85ae8ce629f
+MISC ChangeLog 2804 SHA256 8136456444a7082337879ab91646ba5fd62b0016849d9ce96264c7726cd1d93a SHA512 dea9a1706897fd5ebb3798f58d3d80cdf39f8112b85e1563dea646fd00930d95a2cf73b30f0398458981b9dd96ce64588787c61d5604aca2bd4dce352a5892c0 WHIRLPOOL 10d8515ba9231916381b66c4fbd0ffc87e0d3d46aa9c52d2bb31b988a731ffe8a7cc15b37cb9d47224c7f373f384ab6a8792a10550fdab1f6899fd0136fa37b3
+MISC ChangeLog-2015 4237 SHA256 ceb6c5b6301cc14a25cf7e6a53d7e2a876bc9e4f4b3f2c8ff29e33ed0751a557 SHA512 e2e7e82a9ec6af8fa37da6a792a633729c781daa741bb000dfc7c0c2da7ca11d661f228c4949400c8cf5c26c9f47b2ec5d3e2996700f5edf8392a00dac9cb431 WHIRLPOOL 3d274bceba8eb807600524e2ca16c6c0d63f69ba39fa955539737fe4021d70b2e4b49f595238f856ace30d2e2972eb1a67cfd6372c6218eef7b34759f3037bd8
+MISC metadata.xml 330 SHA256 d2804628cbc4e90240148281867e1aac48f4a7683553ce0ebdaeb4195bc235ef SHA512 6ae025cf1a3a56a19a6fbf436c293fe57365e87d11386797f94fd680bd0d044c8c13860670e070af9c1cad7c0a5f6bd4c29468ac5177456d20196844482676bd WHIRLPOOL 2104a2a6ecd7487183e4806c0393f82cc5dbe3473acbab34df82d86eadb2e052e19bf317a37d01ca5ba92ccdaa1d5103549e60f09737a243d5dc189c25fbc6d7
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/Manifest b/app-text/sloccount/Manifest
new file mode 100644
index 000000000000..cc99b626e3de
--- /dev/null
+++ b/app-text/sloccount/Manifest
@@ -0,0 +1,8 @@
+AUX sloccount-2.26-coreutils-tail-n-fix.patch 468 SHA256 79ef08b0ba5f892878fe410b6e360566202acea9d1abcf07481e9218393f7c6a SHA512 200ccf47b4ca21a17cbe06ccf7b9a8022c794d1b5c0e0f59477b74a37704a6d5a106d4a7791ab84f6387032c938c132ffc1971e4db6532b21d5a0f2fef6df03e WHIRLPOOL e756041390e1ef3fcd6b7528832ea6d2adf58a1761346a1ce6942efe0dc9b469273f3d97317bd16d61761b5641a73a808006ec1cd20d1e7892c66aa5937c86d0
+AUX sloccount-2.26-gentoo.patch 852 SHA256 6592efb16312a2c2ae99ca50d9bb5f3a186967eca32b55573d612a7ed609e63c SHA512 226a28d6ce4bc42f3074dc4390379e0d4539d9e2d9dabe3ec7b60fd41a9b3d9d882d4c4b0dce6803eb137230b67cc622d2b3ab6c4ead0cb90a410efe4b5b18af WHIRLPOOL b3b0965878662239f12f9688def70db58f0b07f951893ce33ade04656fba2e3bdef133f1ff2b852fdd95fea4033766456d5eb9d9fec99de65fb82f4af4197502
+AUX sloccount-2.26-libexec.patch 2293 SHA256 c098bc1ba364a43cfb39805f6d7c46c7f3d72f4969c0bfb2dd4d62ef750df1f7 SHA512 87101dc6c6632d38ff25b842b3342ee7caae0a926ce7c62f07360691a1494f8fefb8a039743d6cc49e3ca53a2eb179a06a97763ff5cf6224056a0916317afa35 WHIRLPOOL a09040e640099af129a5e912ccf1b8f6f09b408f6fc8b9c415254ac1d7b11783875187727b835688e930b8d4a6fdac59a1dd9112fed96a26ac85b65b029d9611
+DIST sloccount-2.26.tar.gz 190948 SHA256 fa7fa2bbf2f627dd2d0fdb958bd8ec4527231254c120a8b4322405d8a4e3d12b SHA512 ed6ab315a56dbdc86c654b94e790c9ea9e2dcad0db26b63c0973c33eb7fa634b4ade0a1f3c6ccfd5172ea95f648c1dd3b0ae2575b0aa44b3fec708c24a6aca54 WHIRLPOOL dd809909e10601ec733a7e5426183553c00c2cd25164db2d9085c975f689209067c206094caa84ef5085fc27a7188509fced271928e2d28ccb5a6b0749f7cd77
+EBUILD sloccount-2.26-r3.ebuild 1267 SHA256 d5fed62cdec507414d2f3e7be0f04cb71cafc217aaec04fe54f973420900cf35 SHA512 c6bedf3aaaafa0fcd5b3145fbf46034a60081ab9deb8f6168258574581a085afc22cafcb36a70ab24680286cbfc670a08099f0d677a1da0961707b7ff6a11782 WHIRLPOOL 9868dfe041e26c1435c0ad0c4dd342183e6637a4a24145a8015c33addb19c7955b19790cce34da48429a0e4a2b031c1556b95b56f1bd057143c9f7ed2c968d97
+MISC ChangeLog 2450 SHA256 d38ffde1e04673a63035b72f9b3a5ff3b37a2faeae233fd0a0e5a15d323b7de7 SHA512 aafe8ce21ad79d3ac5e2df3d80ccfeeadea18cc391e098d9b4c32e8fc26edc26c35c0e6ad6f1470d52a73135e1ed4f2dc68eb93019bc54eb645339fae0527dac WHIRLPOOL 74db4fc292f742fa9d73cd70b659d92c5e942a63708c73083697e270a4627f2745b19ad85b818b744c70054b7f3ace5a51e9eb961da654fd6a97b2f0a12b2df4
+MISC ChangeLog-2015 4704 SHA256 46be8c7f6bff4a440cf23e9a97c1d9f84e6efb3fe534bc1497653f54313fab06 SHA512 7c6deb273353ddd84db44c17c6ae91c05877783638b7ed5e520aa6a00ecd851feb37965eb873bba08a61694b0dfce8f2a7e052d0c51b1df0c0f46c7c163e8da6 WHIRLPOOL 88366e9ef7172e27523f879fd776325cd8d44e0f90808b8ce862ceb8a5ac8d2f14d65dce0ec0d0374afa3689386b6fadbd9e6b561de6c07c39c6592274fd8490
+MISC metadata.xml 216 SHA256 f7475919f28a8a93ec8bd025c8f8bbab918f66d0d1737420c876f0480308fe6a SHA512 e881b59fe49746eb25ad66c258b41aba501e4eb563129093a3898ea970a20506e7898f7c355cfcf99605234962bf2c77c1309c258b9a2b84ee4302ccb71c9dbd WHIRLPOOL 163285b60aa93e00993af659dc1e29a9eb245bd3415dd5ec75b284250596165f469028102b72fa0c344834443a44c1bbcf6272fe6a3f5211f721fc96e1c6ec16
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/Manifest b/app-text/spellutils/Manifest
new file mode 100644
index 000000000000..96c4350bfb55
--- /dev/null
+++ b/app-text/spellutils/Manifest
@@ -0,0 +1,6 @@
+AUX spellutils-0.7-nls.patch 506 SHA256 c4fccf1d519984dc8f9b33f3be056a8506180954285705e2565a12d957f29c59 SHA512 1d329b8cb27f6f50c3b0c7572352ca57420da12553143269c691f4998d62d6b7f730c42f2cbae324debddbda1729be3ea775c90ee3894d75e64d5f685f764723 WHIRLPOOL f1957ffdaaba7c45eacbab8f67b0a1bd17f7090a234256d62bf70d1529e28eef57c878a449be99d1e5aa20fe5b122c595c1d6db5aff4b0d1c9b6cd9f520c3943
+DIST spellutils-0.7.tar.bz2 110421 SHA256 0d5723321b6d60f31a93a43708904b2fddfcff3ec2fdd30e13214c64dd28e875 SHA512 030b06038c587e668fcbef95afc64e28db48a25f2b247b829155c1a5b66d3b3012650cb4c13e5de41a70a1665b05fbfb44a4cd0b1295868e611a21d855f02f9e WHIRLPOOL eae95485f51ef7bede2076c60a7b2aa3f36b57723bb30aadc8fd863aded939f0529e18e656cc18cdb614945657ccecbb4ebf5580aa598974edaf2485ac71a709
+EBUILD spellutils-0.7.ebuild 690 SHA256 c83325e34cf498964d49b863b706810e4409bb608adc3978ac1837c170425310 SHA512 e6be857d650496a3beea4bf6270baca2742b665ffc86cd68d423fe3aad1e3da84a6d3ddc9302f275e2258fa5c61bd0f73835c9dd3fb74807c542cfd7ad2e2829 WHIRLPOOL 1b93ef29f161e06be7c00c23acd48abf29bf6f567bbbe79c7404968b2dc2ded2a42d948cd15aa6d6aaf50967dcd0e721175336c385da35a1b420ec810a723d72
+MISC ChangeLog 2560 SHA256 a4d1779b0a2a1ac5c80832f0f79d4b62a3c10d7a89b948b4cb517fd57f12b42a SHA512 f1bf32e19c483f3915f26e7cf1eb210be7747d7219dde787a577e20503de1fb7cbd63a88c343296cf6503f613978027759f17ed5ead91a711f71487cb7273c75 WHIRLPOOL 515a5cba330ed8d5e317c4ce0a7885f0d92c30ac59af4f7f5afa1bb251a7c28f6cd07d5bcb564e476353098619b156eb0d8aea55dd90058d38ccf7d4b0e1324b
+MISC ChangeLog-2015 1628 SHA256 98cb1123890e6613400e3aaf70d10b2c62c0d1806e1f0cc45fd647b9124c736b SHA512 3e696ddcf0bea697f77ad5ffe690506e6e67a9f9dd15905cb21fa7251b36bde2ec8a2518468da8efdf76aa12f165229661918330124e6ac7ab8e2deb1d6527bb WHIRLPOOL b08d90bd9807b5475f64458ae0e6efb0527d0e05836c6b935041e824b9b6722c22195291053a25e2694a1423e5116d1efd9079dd3eedf096c2bd6c2e571475bd
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
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/Manifest b/app-text/stardict/Manifest
new file mode 100644
index 000000000000..75b47b007388
--- /dev/null
+++ b/app-text/stardict/Manifest
@@ -0,0 +1,10 @@
+AUX stardict-4.0.0_pre20160518-tabfile.patch 1144 SHA256 e53b212ba2537d34da940a80422947fb2304aa4ddea538797c7d0ab6bcbcb4e4 SHA512 532f70556fcf64cfd9e7e00fc226533754089f3091402c402943fbda296755aae9e0466d4972f6e94d34e9644d34ee94b253a1b460d4d3915a6e2afae59c67ae WHIRLPOOL 4e97b9de2452111b01ae62d843785d97ab02fd6901875f679fe82f55eae7536746bff42d00a0707e0b46a429c51df3b20341c73789d7f7a1ae6d966e410b8495
+DIST QQWry.Dat.bz2 4114875 SHA256 3eda90ee8ea13ec88767336b078d2dfe2c971d6a31df60f409d526e3e29a4f83 SHA512 46fd677359a2144429eb9d16131ca6b19db1c086fa93e275aa3d702d3024a65d54064df931d1ed2ba5b0c1f7d9595a284f2a8995d9cd5aac96a45216422dc9ae WHIRLPOOL 456bab65658a8af76160f162fc66868c8a74653a88a1a115e2a20dd90ba9ae8a93b1aa1ee9856cc811d1b1229ca910868ea5db764a119ae9b31cbabf962cab5f
+DIST WyabdcRealPeopleTTS.tar.bz2 84329208 SHA256 96a398eaef3e84f6f23e61683e6439913a4d44055e695dd4a1936f9340d64870 SHA512 1553e62c139ecb005bb04163147d94aa58e4ba7f9ee3172b760c6e4776587c12bf816c42e0131c82195b7c738ec9ee5082f39b974790f5cacd522367919beaa0 WHIRLPOOL 210c121c25c7726cee62c2f2beb3186f0799d68c5537442eda967694f176cbbbc6d09a8c3759de093226e283ae651348ed7173a9f93bbf776325fb656e19720c
+DIST stardict-3.0.6.tar.bz2 9341740 SHA256 6a0a695a8977604e0509a3db1bc6a67e53599b14f29494ba942f21d2c26b82e7 SHA512 81d93324b6e8954af7c20ea6d2a3054bb564d786a21b1cb541c728da7a18a6e7ddb23e595055ccc77e6866bbb8c89fb4f17023e33664761dbe1ee8cd55768658 WHIRLPOOL 9502af310d5eba5ed23457fff9e9f00e2d8453873cece3c20e2c5daf861bd665fc7b9c8e292be5b1d886f9a9fd0d5ad9bd1d8fbd043d221e6637c1c8185f444f
+DIST stardict-4.0.0_pre20160518.tar.xz 3605324 SHA256 8257c215b7da56c1ce9b3abbdac5c6381cf0702c172cd92f2629fb446a0cb86a SHA512 5fb04d7870019f17038e0750a2250a0dca44c427f427cd987542eea2bdfab91223e2c01bae844c43f7d8991d51c0420bd4d77ad6d3f7d86cf6f9c50dae7ca50e WHIRLPOOL 618261ed89db9acaad6f5fa4f44e49abae1d7c272987dce37c49ee81736d77bde977d57743182c77d95d930b7ca0c12e4ff59a85b31f93a1990674ba6e33e2ea
+EBUILD stardict-3.0.6-r3.ebuild 6048 SHA256 ba8874ae6b6cae1dc3061ca3b0fa5e70dc0d059f013344a6b1e6df48d68cf8c9 SHA512 6ceb6977ddd47a167d2d037c987171cdcb9b4fe21fc89f11b2b0df421c1f9960f442b108723976f1417f3d02f8d08c09079a05bc709e79afa055298c287accb8 WHIRLPOOL 57596e25c98a209724952bc4d8dce0decc0ca58fbda16d65a7e8c732d2d82e4cddb7b8fe8f0cb0cdf001d8d906d063864fd69d24d2d7e81a6655e114470cab5b
+EBUILD stardict-4.0.0_pre20160518-r1.ebuild 6779 SHA256 b4d67bbdcbb14fc2a0eccc5c0c9a485cefebeefb238d8c8e5d1f2ec145f1e4be SHA512 b7b0b93bffb2200aa97076ea8de54395a6db668c79d5b489d91759399b645c0941372480607819fe3c80162940f244a279c8db6b5ffc6a89a8cd75e41fad8021 WHIRLPOOL 9122b136ffd2c8f24d84da6018600306ad27b075d0b32efb5370690213a970877a12feed1597812e12bc7f01d0b967ae01927a446dddcde6fa46e24878cbf6fe
+MISC ChangeLog 9061 SHA256 04ff58509698e45d7f67b07d4c0c72666bf5539dc82770ca5a13e4d6de186593 SHA512 7a88162354bd51fb07303a921e12058df3684e2cf2824442f861f0802a5a244a432f284ee3121a120be4b8b02d50a573371aee8d7ad50049d239a2f7f7861dc2 WHIRLPOOL 7cf69b5ddfa476733c8fdbbfc7536c794d9cbb2d485b13166d449520d3eeff3fc4c94a5d9231cd4996678f15ba7cedd7442566128716eab8537535d840225b66
+MISC ChangeLog-2015 17637 SHA256 374e22a64abb6cac0bf0ec763609d75814b960bf632978db34ec65a00b85e66a SHA512 97fd8eac89a0db7d14112a3458f9425e0a830fe079fbdb35e54707b92762ae802337e06e5756f1e4c6e28b04a6a6d40cdb122a53805bc2cb138960ef602b09ce WHIRLPOOL 371f6cb0abbc519cad9b4b6e7bee4c22ccf04dc6ebf6b7e86b03e7e23acda8e362149888ec9730f5f4379b146ac81433ff1b775e089b03bc8ff639396e840170
+MISC metadata.xml 2699 SHA256 6ce20c93d90fb9720c54edcb03ebaf253f16974bc41fec8140f0e9ab383aa84f SHA512 05fcfca88349789f48fa8b1f0741e0fc6f5c0b217b214285ea6b93d17c7307b6dcfe75945d71b77efb913fa74592542238957aefd41b2bc17314fce5e52eaf18 WHIRLPOOL dff464b1819c3be4fdb7bd737dd56ace72b5c13aa73ae8319f6a698d7345406bd0af790747915cdc0512933b8c22772be2282e3779fa62efb2f90cd229f353b9
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..e9fe64135919
--- /dev/null
+++ b/app-text/stardict/metadata.xml
@@ -0,0 +1,49 @@
+<?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-modules/Manifest b/app-text/sword-modules/Manifest
new file mode 100644
index 000000000000..017fa572abea
--- /dev/null
+++ b/app-text/sword-modules/Manifest
@@ -0,0 +1,4 @@
+EBUILD sword-modules-1.ebuild 3971 SHA256 1411204f8064a18338335e30a1c468f5b88951de99c8572ccf4c8f7039851fed SHA512 900b7506d16f487f397af1cd3d8188fbb73ea1637cb3686d0f78d21f3abacaa7fd1a95ea02b034d0739bb6b666e65b48e9c508e0a93569ab7d24fde6827a1504 WHIRLPOOL bf39119bbd2d742097c6f250a348db5f1eeea7331d2c0e8bce541f5bfad76982c3fc6e3b0f0273c9e30a5a48fa4a4622230e13adfd3977b5b7d280e88eae6e28
+MISC ChangeLog 2437 SHA256 16fd137a835cff7a0d8e9a88a230ba4a8c67d5cce420308bfb1a6d3934dd59a9 SHA512 b9f9a3a4f4dfb328771c3272be3b417d7be31666b2c4e5c7b4869e72f5d37af90b32e26bb354028a179d8507bc9d7bbbc557c4b6c8035b25b857a4bc7180c575 WHIRLPOOL 82ea256ffb261447e56f748936768b746e02b49726e2be6e2f0ddf4e2ab8484d3579a082d24831daf13198b0b46712b172bdadb205b0aac79c9f0595c5327acf
+MISC ChangeLog-2015 3636 SHA256 a08f80236fafe35d7706c9920c5dc8056a459a9e9361e614c3163929e36409c1 SHA512 a113942b4bac63b5e97c6e5e47bf0ec93ec1173338c3583ba3517b8cc4586a1c0cdab59fb93813575ee878ed20c5e4eb13fbd973b423a7eaf7bc1bb457064452 WHIRLPOOL 0472b1543ebd28413ab7b886a81842f93eb12b1fd4e9c2f2651a70809715397f31ebc0c03a5cbb156307f966f5856f92b153c7601325c92b02ad6d4544e72461
+MISC metadata.xml 378 SHA256 d7eb3ef54b1c3631c0e8e3ab6fe85bbf6bf505adc323252eb26d0368fa7cec60 SHA512 066849ccc8fbb9e87e694a0c6e3de55b9d4d685eace107a70287d2aab827231dbb7d2eba8fb5e92dec30de93cb4d8749332a7cdc838d971e298b8c0818ad026d WHIRLPOOL 39573f949f46c18979ebfd4d3d6cc79ec7d151310020d297b40dcb11340e228e855f6bb5b77a55ebb91a63729acfd62c8e562fabb768e15babe20cfedc69ffaf
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..7936bed4147d
--- /dev/null
+++ b/app-text/sword/Manifest
@@ -0,0 +1,7 @@
+AUX sword-1.6.2-gcc47.patch 1251 SHA256 3139272398bb95733b14af83dbe1a23dc895df484a073e901073adbe8ccf8b8e SHA512 2c131c963bbf4d181ee31ae5a6a28c0ea93daf3ad42f5a6dd3841edbb328011d2082c550a0311092eee08da9e5aa5692fdb1d02b3d3fb2cb186ee042dd021a71 WHIRLPOOL 616d54a3fc49fa29bd182acab3742850cd91e83c9b59c4153a6313e2d5ac7a0e808065849f0f8c4a1a716b1edd1b3f020d4cd5303bbf8e5fdedaeca97611b3c2
+AUX sword-1.7.4-gcc6.patch 626 SHA256 c783f0cc82aad0b2523520f6f1c4681d072814357f991c97eaed30ae8bf27633 SHA512 8084f3ce8be27879a5b038c5c55ed6c0071e02c2f19ee390cdbc6eaf822fb5268c0f5f9450ba22dfc944b5a1d46f5e4feeebd81f3810532edc9f905921b95f04 WHIRLPOOL bfb3eb02865fe05e37230efcd04a07a49f11867ce7f1ca3001a71388e1f0516e9e3bb8d333f9acd904749ac26806e5a016cdece40183836ddd98449024b1e85c
+DIST sword-1.7.4.tar.gz 2157882 SHA256 995da8cf5a207c1f09809bf4b9db0bd7d267da5fcdb9d6666c9b313edd9d213d SHA512 4c8b183e613367364439cc7a8a842012f75180fccc8eb775b9af2dc4c10f39c152261d35f0aadaaa91a11df36ab1a4057c2edc50ea4b0b3bb0ab0a847ff68f75 WHIRLPOOL a998552c18b5913d88f091d7dfec307e409401a01eb6011b62c7b4d3ea81355f816f013d7a3165ada2fa54454fdea980574091d8006d05f161cf55438f1df14b
+EBUILD sword-1.7.4.ebuild 1806 SHA256 32c41c7ea310e9fe38c35edc98d3f2f253bb6ab67099b4df08c5b1eec1f04bfc SHA512 63e09d9cc09d52a46a53e16ecd465dc14d14089f2167c793d62b9e4fd2dd3a89db9410081abcda4a86c00e639de5566695c5ca8440aceecabc6e07f9bdb074d7 WHIRLPOOL f5d72be286c4ee93139f6bb2e3aefc34cb5b4ebe71a1235d5e8b966b211e89e37385965df91d2e3f18bc48a58529b148bfb818e51fad6add14b8b94c6108432f
+MISC ChangeLog 2899 SHA256 c9011d88f56f86d89f5926d322e0fe842e56dd696e170a5988d9ab1a156c176c SHA512 b644b5f463d06f21d5c020c2745337eb6ea4eaa96f4d61f525e3a7cbbfb2d9e7d7a03228dcfad1e169b1f5a04bb3336bcf9912f6da53dc1b760a4a501e05d6b4 WHIRLPOOL 6dae9178f384d86dd4b540d27ecd8ea25d66515ebc26c5fd480e728d59241c941ff2e064a931ab9a7e555c87d1e6c979336c39a44235573fc8892fb0f1f25718
+MISC ChangeLog-2015 9933 SHA256 44e85bc622ecf64881d56dcb7eaaea593f1d079f01985e8e2fd05c6f9fa673af SHA512 faa409e310dc4b2ee42426c0333f9b6b807ea7f47977ad4aaf3a2a4da82a5eae88448552232b2f3c2f9496ef48443d9ad18bc120adf80da9d97c22283dc8e62a WHIRLPOOL eb04fc90cd1784136b448d22b9c05aaf19a13ac61c7e66a6580e6c4e7adcbccbf4f85fa1bd2f375346789690af628baa0901de4f67fecb4dff1d634cf3152487
+MISC metadata.xml 462 SHA256 8561ec0d9cadf7a9df9507c23736fc5caed222339248d244eb70b5936db6ff27 SHA512 df9a01114d4063b4ae82f1046cab4d22c790de4cd63b0b7b5f6f33d59918cc081c3601542299236c3b4ea9062ec0f315ed82db6295797ee4140408a75e0696c3 WHIRLPOOL f0288af7a0e2d2a3b8c76eaddd88a173e3e482e1b3bcc35ac0714375033ce0aface4ca8859ec6499071d210b4fa5fcd70eb4012504dfdb0d04115ee1f2248136
diff --git a/app-text/sword/files/sword-1.6.2-gcc47.patch b/app-text/sword/files/sword-1.6.2-gcc47.patch
new file mode 100644
index 000000000000..7b55de75b646
--- /dev/null
+++ b/app-text/sword/files/sword-1.6.2-gcc47.patch
@@ -0,0 +1,35 @@
+https://bugs.gentoo.org/419505
+
+
+--- a/include/multimapwdef.h
++++ b/include/multimapwdef.h
+@@ -12,21 +12,21 @@ class multimapwithdefault : public std::multimap<Key, T, Compare> {
+ public:
+ 	typedef std::pair<const Key, T> value_type;
+ 	T& getWithDefault(const Key& k, const T& defaultValue) {
+-		if (find(k) == this->end()) {
+-			insert(value_type(k, defaultValue));
++		if (this->find(k) == this->end()) {
++			this->insert(value_type(k, defaultValue));
+ 		}
+-		return (*(find(k))).second;
++		return (*(this->find(k))).second;
+ 	}
+ 
+ 	T& operator[](const Key& k) {
+-		if (find(k) == this->end()) {
+-			insert(value_type(k, T()));
++		if (this->find(k) == this->end()) {
++			this->insert(value_type(k, T()));
+ 		}
+-		return (*(find(k))).second;
++		return (*(this->find(k))).second;
+ 	}
+ 	bool has(const Key& k, const T &val) const {
+-		typename std::multimap<Key, T, Compare>::const_iterator start = lower_bound(k);
+-		typename std::multimap<Key, T, Compare>::const_iterator end = upper_bound(k);
++		typename std::multimap<Key, T, Compare>::const_iterator start = this->lower_bound(k);
++		typename std::multimap<Key, T, Compare>::const_iterator end = this->upper_bound(k);
+ 		for (; start!=end; start++) {
+ 			if (start->second == val)
+ 				return true;
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..dd852d82e555
--- /dev/null
+++ b/app-text/sword/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>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>
+</pkgmetadata>
diff --git a/app-text/sword/sword-1.7.4.ebuild b/app-text/sword/sword-1.7.4.ebuild
new file mode 100644
index 000000000000..2db87d10461d
--- /dev/null
+++ b/app-text/sword/sword-1.7.4.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+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="curl debug doc icu static-libs"
+
+RDEPEND="sys-libs/zlib
+	curl? ( net-misc/curl )
+	icu? ( dev-libs/icu:= )
+"
+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"
+}
+
+src_configure() {
+	# TODO: Why is this here and can we remove it?
+	strip-flags
+
+	econf \
+		$(use_enable static-libs static) \
+		$(use_enable debug) \
+		--with-zlib \
+		$(use_with icu) \
+		--with-conf \
+		$(use_with curl)
+}
+
+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/Manifest b/app-text/t1utils/Manifest
new file mode 100644
index 000000000000..5d6d94a0d63c
--- /dev/null
+++ b/app-text/t1utils/Manifest
@@ -0,0 +1,9 @@
+DIST t1utils-1.39.tar.gz 175047 SHA256 0faef3e5c4927b38b05ac99ee177b7d7cddbbf5b4452f98b244f684b52b0d4c4 SHA512 930fa0f264136fdc5d3d18e9a3b45c4818413d01ed12a32daa1b5ecfcc0ea4d6554faf428c6bab9247a2cfc16973787c0b6f0dfbb0273fa6a03a3e8d1d501301 WHIRLPOOL 976452434ea273cc1a42973cec28cd7587925490e37369715eeebb5e1d4aebca829d61893060512d621fe9393dd3758d670f0e1827347d8240cb622aa7afa1be
+DIST t1utils-1.40.tar.gz 176192 SHA256 56060d147f628fb3a356aea35e5119c0b3fdf1ed8c750e0ab16b95cdf1713d8b SHA512 790a6196b9dedd7ff7b25b7933678190d6380a341d543ca9064372c2c1c8eb8114a054dadd67f7f198084f1d7ed2cc10d78a6dbee6805b8e614328e0809a1807 WHIRLPOOL 9dc53f775ac66879ab9f3a2ab5fcfca9459bdb30871e21b210ffb76b9ee6d1b251c866ea568930d5b5605944056e5986ecfbe04b4fc825792ed3642d973443bf
+DIST t1utils-1.41.tar.gz 176552 SHA256 fc5edd7e829902b3b685886382fed690d533681c0ab218a387c9e47606623427 SHA512 b532d3af38a73903a512eb1297ba7510747dcbe8362acc4a0f20f2a3c786d82d8f5b22997ed3867114f33153a34cdd71c4c8e6a093db3cecc3825b6e4725a00b WHIRLPOOL 587e81e69c991f7ef3ffd7df4023b5acb71e8e836c82b4f549eddac9ba0c4c111d89617d46123f31ddb819132cf8b460fdf6a7986f51e33f067fd15d173f7e05
+EBUILD t1utils-1.39.ebuild 636 SHA256 788bd02454ed5071be18bf6d7be54ef8187dbd4a0b0604cbc9db29a88a692091 SHA512 4c4e285265f05720bafeb2c6a272b55936ed7589cb41f463962fafb70b8bc7be9e1d1e6a8664ee14f5fd49c1ac05f64977d5472394c8b56e48a43538d7f9bf59 WHIRLPOOL 4cdfba909009e0395f1dbca1a1fd5e1bea6e6f7756bc23bc5793b3cd9caff69eace92ee24903eb7fb997ba124b13302b7bf154fdd7b75768dc0f56bf284f9a08
+EBUILD t1utils-1.40.ebuild 645 SHA256 3c518004c2884809e151fbe2d0ebb4d309b7d4471ec73a63dda6329e9de0c0a9 SHA512 6bfefc1d614f986f5b5bd0c3c731fff40dc6549254a213a72fde184113653998757a0bbc33bf09011892fc6ca50632839d9332952cb13e4c03613f0122c9190c WHIRLPOOL 76bae5122a0078f733e42fd4c3e9219b497c6158414ba969274b952ba073e6b669bee07c189a7fc3d4e0f23d22969bcaacbe01a64391ca50fd6c3dcae2d1f050
+EBUILD t1utils-1.41-r1.ebuild 582 SHA256 b9b00b177d4c01f634d3efbf4a317c7ca065fea6901bd48b3a6560af7a0bef74 SHA512 ec09c0b28ff09f1add4d9436df2c3fe293980ade630d31e58a0831140cc2ec68268ce59e1d4c7cb81e288420e42a2620154516783b456b55f8b072365334be18 WHIRLPOOL f8d24c7d8cd7dadb4e09d83101fbd555a0f577240b622184d4c383e77e0d17f8752d30e316e0f848e52afadeb8fd6e0eb1e1c3ad9dc3e725713bf8c513771fa7
+MISC ChangeLog 2425 SHA256 b1832aca62504d21363caaddfdd6469a09ff642e4033c20cc994866adfcbe937 SHA512 85bf516c7f7eef9937876d91c5491beb6d9d875c6ec988859b934e986543d76ee8cd11228cd388eb3b4acce3aa9e37c445678cb7041d1b43e70fc97c4e51529d WHIRLPOOL f9ec07903821cccff65ad2a4506e61b755c2174bb0cce5f533e5b115f5fd0eadaa18268daf3fd6eb051086b53efeead75e3538173a3622c64e16b81bbb99f560
+MISC ChangeLog-2015 10482 SHA256 7de3941da3e2bc18889ddede75034f4d91cdc579777d34a5e6a4f6d0d47c4564 SHA512 bb61e78ed135246a925a4ea67ca05cb2732b2f16eaeef7087f3481539b671e2e1aa9fc03ba29338cdcda1393795c00a63daef2fbd41897a7db13752fc1134be3 WHIRLPOOL a2c80ae4c1c1b15b40f8648c560abac8b0d6d20b46ba9e419e6c0c8e60a13137dc29ae05515de5f46fcf49327d6aa793e3e70df2a290e4cd1c69dbe8cc2a3904
+MISC metadata.xml 347 SHA256 1a5ec1a4df7c8fc0840fcf90a85264850b287c473f15c8c3209ef7ad1581ac2e SHA512 6a4884011de9218a6c0417b64690cc76c9c5be7a525f4439fb04e70c3ed287080fdb5707004d611107dee69230bb1f892078260bd18dfe7aa824d88e23dffc16 WHIRLPOOL 9dd6601560addbcf6eb34c947d0a1410e0fc281801e154afc9948a7b067868259316d4c079835884b57261008923be3bb59037d4efc7f628d249b391a3ec78fd
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..c5f8095a6db0
--- /dev/null
+++ b/app-text/t1utils/t1utils-1.39.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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.40.ebuild b/app-text/t1utils/t1utils-1.40.ebuild
new file mode 100644
index 000000000000..2023fde00df1
--- /dev/null
+++ b/app-text/t1utils/t1utils-1.40.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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/tabler/Manifest b/app-text/tabler/Manifest
new file mode 100644
index 000000000000..95744e0a77b1
--- /dev/null
+++ b/app-text/tabler/Manifest
@@ -0,0 +1,6 @@
+DIST tabler-2.tar.gz 87706 SHA256 681e15e245db8869ea7ed21177adb93e8734a8076acde0f5b015fb8994761c9a SHA512 6f01796b4cadae22f9ae0029ee8a7bb224d04faae1793b13c9d8473e6a902543a5bd6da86e806f9c50c8b39ad7f5d44525c2a701920cd6c62c27995409d0b1d8 WHIRLPOOL cfb8d4c9e6ce3460a05f9b923b5e3017417b572ba49aa3d37cb02e1d0f4061556f4346e56caa0b9080cd4f85cd0ff74081ac4097f4b2922a0a4b9e45051d34a8
+EBUILD tabler-2-r1.ebuild 431 SHA256 26c975df1f351f4a4fd41e3ca9b61814e9e44a40defedcabc4862253e1a1dbb4 SHA512 821fea3041884d6ce0c6481f3ffd6e570cd585c0328f0f1d209fc34e72fec6f5716dccf13b970fd2aac7fee60bc18efd65d7316a7c5c4eef369969f179874c00 WHIRLPOOL cfca78bdeebbb64a45002cd328015fe391bd0bb14ebc7bd4af3a4bddf00a474f24a90e3d27130f63318faa71596f15962c0e4c6505946e74866733b55568868f
+EBUILD tabler-2.ebuild 444 SHA256 5bce4022391070d7d9d19e62f2dedb1baeb7ffc9d563b1b31ad9b0f112bafb2f SHA512 7c7a39eb2fce427f311d44394e16f78b10cb49b6fae469d278521f414f19f27569ed1b16a2ceb84ceec7e4045eeef1ebff8356d4c29c8091e79dc7560196aa74 WHIRLPOOL a00bd1ec56d5c8fa41bdf15b41003f1f1ab0e4d46a2fb6615cd2c763e82bd2cdc4cd3515a807df8c67cf0c6cac6b9a86902392a655b4d42af423c42607ffabc5
+MISC ChangeLog 2618 SHA256 9b754bf2829709e584776194c113c17e4f992f70e0539d97cf381bdc4044a274 SHA512 eb0a299e0e6e2bf505aa34c6d6b22354a461071d02817f762c889d08a3f0446b6ee7a5f566d8322d28452977a5d15670d4fc8f9a6ad0f742abb5878dad462e2f WHIRLPOOL 9bf59d9f2ff878d990df6b91bfd892b904cca7c3fddfe84ef533926f0bcc52ddd4f4d10071f316794d6c426996dbcb42765da612cb56fddb570a09f97a69ffdb
+MISC ChangeLog-2015 882 SHA256 e9e3d8047c7f9565bc145609f55a876d0b6f645c943855e2f75cd9b81eff8d51 SHA512 004d72311d81f7b5e8e66d19c3e7c61ceace67a15f23ff94b039fdee0c52e9e05df1a0be4565f7b594a5ad1dbe3505405eaadde8aa3c616a59ca0425ec8a8b21 WHIRLPOOL 2f17cc45cb923d445a346a6e321e428b96dfdd75f3eed82b78140002be98115c2fba3e155e2bb75beedef720a69fa9753e9fd808b7a0153728e363f172adc0f5
+MISC metadata.xml 243 SHA256 89bd33cae2f67a688d4cc0dd20cd4dbc8fc7fdec244934d9d47cd8f6f52aa70f SHA512 c0d977a25c38fe6c32745c0b18520aa510c617922f267a468b2b788480104214bb5db37564d6ae52c45298e98da2764595734c827ab01abcce1270ed241e3bf7 WHIRLPOOL 74a8762fce04d6d9c2718a67dfd9bf9493cac7281ed34b6794edcf175502691547384715ea333ed5e73e5b4108a792075463d100be11cd4195454bca10684c0c
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..ed6a81d08f97
--- /dev/null
+++ b/app-text/tabler/tabler-2-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="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/tabler/tabler-2.ebuild b/app-text/tabler/tabler-2.ebuild
new file mode 100644
index 000000000000..e55a2d01d4dd
--- /dev/null
+++ b/app-text/tabler/tabler-2.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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 || die "Install failed"
+	dodoc AUTHORS ChangeLog README
+}
diff --git a/app-text/talkfilters/Manifest b/app-text/talkfilters/Manifest
new file mode 100644
index 000000000000..4cee54534c58
--- /dev/null
+++ b/app-text/talkfilters/Manifest
@@ -0,0 +1,6 @@
+AUX talkfilters-2.3.8-format-security.patch 862 SHA256 d13acaf21d0b5147e35520220f5bb34eb517975bec20a63ebcc4e6c1daeb2663 SHA512 b210777c038878cdd06365a13591c723151356864c08bee700005e509b2f0f6aec4819730ca631d401e4cbb9d3dbd3a4a6551f0920819fa6097585ae43f6c8f4 WHIRLPOOL db516178dbfd99c4057c8fcc20b4144b4704127407810df9e3532ae3066f64b6da221e5059285106d6b9fb1b2bb7438a72946e09734fe30e25fb66b73dab86bc
+DIST talkfilters-2.3.8.tar.gz 821338 SHA256 4681e71170af06c6bffcd4e454eff67224cde06f0d678d26dc72da45f02ecca6 SHA512 3fb317c572e95756fea9dcbaeac01e9576b05f5b0710e64513ecd05ec219f8050dec3bc5bc5d0d5f00c642487925765843da03525cfcb23925cab3c321272b28 WHIRLPOOL 81a7ec75d4a71794675b52da0feaf729048082fb7531c06fedb5ad8e3beb8e8e198d071ecac479cd54cb06123b0245e3614abcdf27d26b7a5eaaebeb179d5a0c
+EBUILD talkfilters-2.3.8-r1.ebuild 554 SHA256 7d52c928982168165018c1b7eea7dd4d92bda19f901400940d57534fb3a14cf1 SHA512 5cf58ccc9abd312c0c70204331ee564a96e4c651ab9139b1816dc225a96aebec34a6021b2dae283351c76919cac640ded3c47c8d9ee5887c0b137f8a9ee28de1 WHIRLPOOL c8d7da7de96f30ca8bc6ab78f73b2d2751417363bd2bc187194fc0337fe0210e22b3e52d0e28dd44ba94fdcdc7ad5ee938510ffb6e7881cf80f7f0b495b1f255
+MISC ChangeLog 3061 SHA256 e5abd5fd081c85c31a1f1b96a659dbfdd170f89baf6faa3ebe1b8fab5af814a3 SHA512 e4e7d21afe666778486b79fd5c12ee62bf5bc09c8df19e577efe29212c652fcdb5001738e94ce6698e05f34b529a3a8c35b3c8d54c1316b7f676dfdd4a6aad3a WHIRLPOOL 0a3fa7dd1f1f530ba2aad55532be49a86df546f969d1c876453fff7b9567ea671bf2bdf8502cc9dbe919b3d38541aeeab926fea28aba89bd66bdfa488b6b5366
+MISC ChangeLog-2015 4721 SHA256 d17a1c9f7d61982d6f0ed524c3f8d23278f289d105c9f664280e99f20c60bb02 SHA512 15eb060317bcf83ce89f7261d851c47a60a227e8f6e44bd9ed3cf0a2305d540c35ed9c23da08726d4e64f6ad06ad23ab812ca3e2f6b78a9d74221218dfc61708 WHIRLPOOL dfb1df07bebae9aa8e41e44166cdea0a99c13608a8650dd099df594a11cd04d9fd295bf690dfb70b8a135622f1e8bc6d0d9b5739706dffee33edefcf4820896b
+MISC metadata.xml 957 SHA256 c56a0797826071586d098be0c436d7976ed3eda341fd5e5ca5ba651cdc360c89 SHA512 d1b664bff6db93a8289a01b6ef00df35a06207722360ca753853fde6cd667abd739acbbadc9eacb16d46536326c61d6b1673ab50940f778c7ed7c228a082b52e WHIRLPOOL 93b34384c53eb325446163c0a71c48bb9ba06953f254184c55e43ef166212b7609e7612b0c420605e9aaed73221d7f51ea2316883fd2f34180a736b65673a816
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/Manifest b/app-text/teckit/Manifest
new file mode 100644
index 000000000000..c6c0ff28aea5
--- /dev/null
+++ b/app-text/teckit/Manifest
@@ -0,0 +1,12 @@
+AUX teckit-2.5.1-gcc43.patch 327 SHA256 7391726e9b29f488f5405dddc25bdf78a790760dd60397200dacf23efb24882d SHA512 455e4b610ee8945113f3f73e1d710d34b3eeede81bced34fa8287bc63e685e298049fb6bb05485407a4bbdd5712a3e1e565e5e38b93fcf91c2f4eaa25e0a52f8 WHIRLPOOL def97d14ec627d100bd8ff59d27bcbf6083471b8e1d1fcf91a51a082dfb1dd15cba81454915e5d1a883dd74d2808b4ee5c4ca86b3eb8029fbaab59b9152285a9
+AUX teckit-2.5.1-mixcflagscxxflags.patch 534 SHA256 b59fdcdb7489293ba9420d66a415f62b0369ba3c5d844b42531a0dddcf469df7 SHA512 7b76d3ebc6ecba24a7cd6469b47b35245e73d5c02a32c67a6205434f8c4b73ab6f1a77d0f8cf95081c4b441e876a2d62a1c276f69171d4f9f4679ccccbfd1c87 WHIRLPOOL dc48c8169d5b1524c0ea905bc584e7e86929092de7aefa9a0ad14852d334f2f8454dbc4e80bbc044caed18a7ccc745b6475fad2e9b46b1bd17894f622e484ed8
+AUX teckit-2.5.1-rc.patch 418 SHA256 d9b52fe040af796f64ba9da0c3926db7b8ebe118f38516200485db155f94aced SHA512 d2e93369fe9706726ac0042d68d5444843a2b572ecae7bbc54a4dd39bf75a36080d49bd8acca30a36b3a8ee2e28836e4b0308bbd1bc955f3d5d5c3302b4c78f3 WHIRLPOOL 63c1d3af4afa15e98cf775667830d3c0e7be8a268d08d5a56fcc17dedf70f5bbc3d6874fa6077b93b7c3395c931ef80ab886534f874614651e225e427987d849
+DIST TECkit_2.5.3.tar.gz 2417611 SHA256 c048f1bdcfe3d361574818ca693e15295ece124f66db651f96c50379ae353e0c SHA512 7d2d315a38fa8df82a6180bfcd4737f5b9c664ff27d723c9dfd51902e0aa195d1eba4b49665cd22a2bbf28a9626b3569cb8aceb74b6f390c12c108a748a2e49e WHIRLPOOL 72046c709c1a2a12c52511669c4d0a3bca3800086041fa3cc15fb9d35274ea670bc4f1de19c574982fcea4aeff1824863dd57d96de010b36ca4d80fed8a599cc
+DIST TECkit_2_5_1.tar.gz 2630207 SHA256 59a01952684c4599a7f30b4f0deedcb6276f04fce73ac6fcbcbd55c4e2e6513a SHA512 db38ead681a5f3005769bf86bd39e3e769836885f672aea593284f0ad90932827697c30244944097ac4173633e6d0daa86e993136f179c4634440384811b418c WHIRLPOOL 2967688f1d78b3c1f2c42a72c12bf7c8c612d182a232432d2083e4e1b05d2bd92115fe28e8bc29596414c7e81da7fc48277666141e39f217d7cb9ea09a46c5c2
+DIST teckit-2.5.6.tar.gz 2500800 SHA256 a27bcee822111efe56ee0c9047d6ed5d8cb1b5005c372517c42c4a7552884105 SHA512 d3462dbf22658de85fd718c43229259c460730d907226435195742f1ab65accc4ec83f7b6cb32a0e99fa12ddb7f2b7b5f2598c8853636aa5b31c8592ed9b4745 WHIRLPOOL 796d19d557e94871017b41978ebbecdb5f80cd6cafc15a6a395c56db76709c6bb64ee6536cf0ce29cda29bb92050faa765e437de9d362106d312ed66dfb7b1c6
+EBUILD teckit-2.5.1.ebuild 1126 SHA256 eae5459e0c66c28b93e7c271eef0fe389966624f0a0013e05655939dbe94c979 SHA512 ae98b74bfc9b2386190160c82188c84b67cbbdf63205ef45c1d45d187e50b1d4228fc0deaa8825e9d8c437185aa21ef1070572f4d4ecb762e5bd595254f38d3b WHIRLPOOL c8d22f8fdb0561c3e8a118c2d2912e366ae8c9814025e313add27d7585a231516f680cbca34419ce34b09e1c2e31b4be032d37f73536bd48ca53e40d329bbd9c
+EBUILD teckit-2.5.3.ebuild 1221 SHA256 05b79a97c447f9258c580a42f01dd3933c3c8fab907c041b0111e6678729f047 SHA512 489359d29292a2b7bab49bc8e939cc4f3601c96829f5d373970a0de551e61a1e8575f5b111b644d49a5465f1faabd6fe2671ef87e726eaf883d537a661f7cb3f WHIRLPOOL cc5ebba8564285be4e3f9e9c5df6bee39731aef79ba02b9123ebf4bb2c9b2a997de41ed3c0571d444cb2e7c53d0bf86467d6da440b4e4ac53120fbe13ff0c23c
+EBUILD teckit-2.5.6.ebuild 1144 SHA256 3f87605565228aec43dfbb8afa6548761a789ada77dca5501f4342c077ccc9d0 SHA512 5c513708c5641db73d1d7cb478df5a6b6474115a1f60f91e299de3c61f29978530176cfa907e93e0eb67afd6630fb97a369e0b8fe4cb681bde480b16cf585dcc WHIRLPOOL ab6544df2b2dc06322b9e772c331171ab5ef7101b34cba5d014b986b34828793376b33303e5e857813792e34fcacea7e6c674950f789225b2573b09f1c5b43f2
+MISC ChangeLog 2740 SHA256 f09bcede5d1024be620d7f4f2369d216f67f9127c060d4982a1583d763bfb187 SHA512 34763bbcf7511b8e407fcf57f42b7a8719b5c216940a64b6fd34d6372c359838e234c3dc6f125a7ab8d10e9d353b3cdec0820beeba90b5b36f0f293a0318cb5c WHIRLPOOL ef0d845a60756ff6f2572fc8475b14f2ce0000a3c55735ba1f7f615de89492105dfde6968068ad7ae972324804c636f4b8dcda577560378a080dcf84ddb94738
+MISC ChangeLog-2015 3154 SHA256 ab3624ba71ee0c9145dc090f2f37ac1a21d96b94ceeaef1df25b781a7294e778 SHA512 8eb8c02321893bd70501de199723e73f5107e36cb39f4f1a2cf74e2d257970bef0492685992f09fbbb1df1191b0cdea58621ed8c74f533a6eb6594b0f5723858 WHIRLPOOL a8f17409d52dd37fc763a974877fb8506f4f271d8c21519fe0cb0d6be9b7f47edc56df49d726b4dc9ff6dff56cae5f1927ea826cfa1c1599002bb63e5353f9fa
+MISC metadata.xml 328 SHA256 56ac15fc96baf7896901fe99367ad7c8822461df683f2eb996dbe7d365cf3365 SHA512 f4ee21269605eb831d9a6cbe639da9f2bf63aa14ffb69bf41b7fa4304e4680f5e11ff9efaf30b63cbe0f3708468af19c5412353dab4af8d9a49e6f845a2b7f67 WHIRLPOOL ee99d3cea5fb495dd0efc7f1016b9a7240af329335130667e7bd2a554740b63767ec6448d42a558957bc8238833be617b1779f0f2b378095f95b56e5a2c9273e
diff --git a/app-text/teckit/files/teckit-2.5.1-gcc43.patch b/app-text/teckit/files/teckit-2.5.1-gcc43.patch
new file mode 100644
index 000000000000..f5a6bfddcfa2
--- /dev/null
+++ b/app-text/teckit/files/teckit-2.5.1-gcc43.patch
@@ -0,0 +1,12 @@
+Index: TECkit_2_5_1/source/Compiler.cpp
+===================================================================
+--- TECkit_2_5_1.orig/source/Compiler.cpp
++++ TECkit_2_5_1/source/Compiler.cpp
+@@ -29,6 +29,7 @@ Description:
+ 
+ #include "Compiler.h"
+ 
++#include <cstdio>
+ #include <iostream>
+ #include <iomanip>
+ #include <algorithm>
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/files/teckit-2.5.1-rc.patch b/app-text/teckit/files/teckit-2.5.1-rc.patch
new file mode 100644
index 000000000000..a4f1a3fae5d6
--- /dev/null
+++ b/app-text/teckit/files/teckit-2.5.1-rc.patch
@@ -0,0 +1,15 @@
+Index: TECkit_2_5_1/configure.ac
+===================================================================
+--- TECkit_2_5_1.orig/configure.ac
++++ TECkit_2_5_1/configure.ac
+@@ -15,10 +15,6 @@ AM_PROG_CC_C_O
+ AC_PROG_INSTALL
+ AC_PROG_LIBTOOL
+ 
+-if test "${target_os}" = "mingw32"; then
+-AC_PROG_RC
+-fi
+-
+ AC_ARG_WITH(old-lib-names,
+ [  --with-old-lib-names    Use old library names (for Windows only)],
+ [case "${withval}" in
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.1.ebuild b/app-text/teckit/teckit-2.5.1.ebuild
new file mode 100644
index 000000000000..8d5e637df119
--- /dev/null
+++ b/app-text/teckit/teckit-2.5.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="2"
+
+inherit autotools eutils
+
+MY_P=TECkit_${PV//./_}
+DESCRIPTION="Text Encoding Conversion toolkit"
+HOMEPAGE="http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&cat_id=TECkit"
+SRC_URI="http://scripts.sil.org/svn-view/teckit/TAGS/${MY_P}.tar.gz"
+
+LICENSE="|| ( CPL-0.5 LGPL-2.1 )"
+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=""
+
+RDEPEND="sys-libs/zlib
+	dev-libs/expat"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-rc.patch"
+	epatch "${FILESDIR}/${P}-gcc43.patch"
+	epatch "${FILESDIR}/${P}-mixcflagscxxflags.patch"
+	rm -f configure
+	sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.ac || die
+	eautoreconf
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS README NEWS
+}
+
+src_test() {
+	cd "${S}/test"
+	chmod +x dotests.pl
+	./dotests.pl || die "tests failed"
+}
diff --git a/app-text/teckit/teckit-2.5.3.ebuild b/app-text/teckit/teckit-2.5.3.ebuild
new file mode 100644
index 000000000000..ec0249e01485
--- /dev/null
+++ b/app-text/teckit/teckit-2.5.3.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools eutils
+
+MY_P=TECkit_${PV}
+DESCRIPTION="Text Encoding Conversion toolkit"
+HOMEPAGE="http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&cat_id=TECkit"
+SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
+# Upstream regenerates tarballs at each fetch, breaking checksums:
+# SRC_URI="http://scripts.sil.org/svn-view/teckit/TAGS/${MY_P}.tar.gz"
+# https://bugs.gentoo.org/show_bug.cgi?id=554972
+
+LICENSE="|| ( CPL-0.5 LGPL-2.1 )"
+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=""
+
+RDEPEND="sys-libs/zlib
+	dev-libs/expat"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+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_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS README NEWS
+}
+
+src_test() {
+	cd "${S}/test"
+	chmod +x dotests.pl
+	./dotests.pl || die "tests failed"
+}
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..607a5a9834f2
--- /dev/null
+++ b/app-text/teckit/teckit-2.5.6.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 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/Manifest b/app-text/teseq/Manifest
new file mode 100644
index 000000000000..3e4b3a2bdf8b
--- /dev/null
+++ b/app-text/teseq/Manifest
@@ -0,0 +1,4 @@
+DIST teseq-1.1.1.tar.xz 240256 SHA256 230d2b4a587542284c415b33557a27774f5ad1580ed9db272bcd1e2034ea0589 SHA512 c7747c734e640f7cc607389e001ab2cb9e368b504bd41406eea4dd7ba8bfead79659c68b148e33e797b843e9a46de38d104172303329b88e3fde0266aa1ffd7c WHIRLPOOL ad8eade357f9bbd6a53acc16d12b8088de4c9297604553edcfb10b9d920d479d92cb422c6c7160f13359b1e7934ec9a630215239d76bbc94118c8e2c3611ae4d
+EBUILD teseq-1.1.1.ebuild 335 SHA256 fff2475ca00d12b24ffdffb13a4a80b178fd229e9747a02d7f15a25fd8becd25 SHA512 25033bf62d9ec10a6078fa383fffb86bad4a4bb2bd2a8feaf7f05c1ac3ef435e26b47b568e69514254185ba69e2c755e6a05a248c28f7c3b0578feb7ef885af2 WHIRLPOOL 1f71541770d2d95071c40e4d7573b00e6277ae40929fef890a24c291e2df67340245ea12601287232437f806f4cda44ffcb452fce97ec11e5e4cd87731e4558d
+MISC ChangeLog 1226 SHA256 6bae9f108759d5b071b9355feb872fb7e86a7fcfa6e487a03b75ad827ba762c9 SHA512 a034a0c75df829dc238177bb8f6f1cc05ac5accff8fbc85fb1f7839a27bd403f29dccc825de1af36bbc3355c4397f3d2d4a2e41314d26b1c9cd3400715a727a3 WHIRLPOOL 1d7fd29869849d4aecbb789629b4fa866f49f1292dc5c995f2489f3a33b5fe358191c3f9164adf90a0ae7b425a63cf4d2036b83db6e6dfd56f5fa562f3975dfb
+MISC metadata.xml 210 SHA256 59333e331c55cfd39ab5a54817053590464e735d79003424078790bad0f03885 SHA512 f7cbe57a24b67a28696f91061ad8bd61d7d4cf3d59d20c3dcc6a4921e29672d00ecf3ece70a8813399d2467ebd626f8f829300e81fc722e9aaa527e213a5fb54 WHIRLPOOL 4720a4dc9840fd244dc5c4ce9695cdb0007a36c7b0262d4db8a8b0fec37fc718fd0c33f87c9ca0cfd5f5f09b6fe42f1cf93103a85de3f2c3d5dce10a82ef082d
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/Manifest b/app-text/tesseract/Manifest
new file mode 100644
index 000000000000..88ccad2f7c50
--- /dev/null
+++ b/app-text/tesseract/Manifest
@@ -0,0 +1,160 @@
+AUX tesseract-2.04-gcc47.patch 289 SHA256 746c23a72b12df832d7b4a4c5d5be2307ae628960a57f517a3f11e8106cb28c4 SHA512 fc4cf373b97369063a3034f4155c6c314902f5c33e5bae4df89e7aea8b1843ee25a62787a32d377d893622a1bbdc6fe44759ec0d034df5c0200fb75e4028db59 WHIRLPOOL a7a124671f1dc97811b18abea06b892e91469233eb52bf7a89d23840a0f014481ae230c93a15208c9dcb0b38b7a7f7de2eefb767aad253311dbfaf149b45c1ba
+AUX tesseract-3.04.01-fix-opencl-ldflags.patch 377 SHA256 5824076da1b00c4a0bb053d2ff92bb7c4a58a7240e8d9523c42d566e3ef9c874 SHA512 9991775c96d7f9c30900446ba9ee7654a7cfa6cdec61b7389f346c04b4ead46e9d9e20fd97f486e182c008f87e423b3581c65241eb2a9618243941f5327d5cf8 WHIRLPOOL f2cecfe19e59e9f6c9808b993fe1a630f86e28be0c95a080647cf4deaaa0b1676f93816009bbdabc4ec495bbb54cb8cdb5ff9ce19870c477e6c67a06d8838e92
+AUX tesseract-3.04.01-use-system-piccolo2d.patch 1158 SHA256 b0bd55e5261eff06f1582b9c4397f7733adcee5e9d6f2b211581d00042d316ed SHA512 635276f604238c0aace8be06ee6d0e7ec5fcb61a6cbe2504721ce41407a9799289f4917e4fecbe2155072e324c3ae3246238ec12abd23700a9311532657e678b WHIRLPOOL 79a8ee14441a9da96b5f92f50009e2626a44e419cc82ff739e857f2e772e11ffeb58c093b4e6f02234bfcb7cdd107e345cb25810154c793fdf5bb94f210fc26b
+AUX tesseract-3.05.00-libtiff.patch 727 SHA256 82c8d50682499eda412780801cc36d84f90f7b91ede7039915a207b1d5fdb0fa SHA512 70ac55ef42d473963b22508c16e9a5d4f3b38e0fad7bc855e5b03edac23320f8bf60dbc3d3543f2ef6b9e70ef62ac89d86bb77f75981521b7fecf13c74b05803 WHIRLPOOL 98fd87e7604f08898a896b8980c77453b6d86063953b2db44565316e0b9831cf5ddb30e205c57fba77d384f3713bdaa524ccd0f6b2b1cc8639c70ee9d33bbfd7
+AUX tesseract-3.05.00-no_graphics.patch 2199 SHA256 b25fc6af786ac480d220e171eb336cede09803fde45b29a32de915b619574be9 SHA512 136b4f298e52517a801a19847ceb85cbb77ee0de42a43dc5a82faa7039f0b9c0bde965453ac5cd6c25f4578351217319a0ceb719fa42f207a38b3efe0c210388 WHIRLPOOL 4c7a820441f1d654b50ab737a027067bd72b2b6cca948fe048f248e908bca909422fde8b5452ebb5f386f68947f52161fb95e91288657fb728acf0c727974e21
+AUX tesseract-4.00.00-use-system-piccolo2d.patch 1030 SHA256 982ca57c821580fb822073321a9f18ecffabedbaee976e8d90348291aaad413e SHA512 df203ab3933a59f1f2f689ce8dcf266200c705837b5b97dab5f7b1684903523ffa7b88c374c2e7c0b106c1726ef54fdcda47ab44bf75cf51e7dc4308dac6a810 WHIRLPOOL 95994a4a811a8f75e23ac9247e755b07ae4ea7dc2dcf4c988371b12f30003aee2d4649a0e7d130c28642808a8a6d727bfb90b23dbd524faf5e37c60855db3d8c
+AUX tesseract-4.00.00_alpha-isnan.patch 1027 SHA256 5ecd373f1cc2575a82dc2c9a5b56d4d7f3d28f79c738a2db940272e6e25fedc4 SHA512 c2fa33a385b7fa0da525abf80ac39f846bb89df89a80c71c076355e98ac1d16a01d69c9ba748462f02e8f94b0049e6706ad77406ed0cc230fcac20b00fc917d8 WHIRLPOOL 1a5a9f24dab0b49b54c281d7ddadcf4569f6ed30e8e129080be384574127a47db233f537f51e03429bb360dd515f80d5b7e55f0f893e87e1ecc53bb1f6d42e26
+AUX tesseract-4.00.00_alpha-no_graphics.patch 4485 SHA256 f51e1d249cddedbf04739b4a4ecca132646ceef323f971ba08c96168ad98c250 SHA512 d64592d0236fdadde005020e3afe3839029b2090d052c8034f1f16c401a6df99bbd11750dd9e0013367afae04e770c8166e984531be05822f8cc134c2ff9b1d4 WHIRLPOOL ae381c13fd92e3bc616fea85d76f9bcc68473ef3e459c2b927e17e17e48825e46e7b8032e061de0dcba3edaa6a2ff9a881d7ba75bbd98e67db843e59ad0716f5
+AUX tesseract-4.00.00_alpha-openmp.patch 3817 SHA256 91c2422be9c70fbc979c9594005920047556559f54183bb4d32da852bc07655c SHA512 6e685f0b8da173714139bf48c2406bfb365081f8723c7b58c9feeb140ad0abf6875b871fd95c521f3e26421869c84409a0b8f405ea3179847a1052899148d4ca WHIRLPOOL b8989c4a915ae4cad402533c74e0612106bd6e8046e89cd4b4fb404784ab16d57230d5fd3d925ae20e9162344707285ef1a08fa9f6703395684a244bf0a32801
+DIST afr.traineddata-4.00 12213914 SHA256 6f4d631e4dd824091f1581c8594fbcc67633b55dabdaebcec5434e89ab4355a7 SHA512 1c00ef71a0e846bf5d0d57c7c3a3a8b5af47dfa8f429dbc02fdb560731923c0d0ab3273b3b975a570ffe7bfed2c7b284ef28ef4f830f8d4a0f33d84692cc655b WHIRLPOOL dce6effae838bc4df76a95d4041034add07020c35d63ff6cc0a66f18769b069014ed96a4c3ec3807342a5bab675c0c642e3b738feb166d427a244ad4fa1e00c9
+DIST amh.traineddata-4.00 9771502 SHA256 1b5d9634cbb9f39daca68601f6d719963b6e5923e1f5bb8b4710123a47043cbd SHA512 0b449936c350eff717aa5bba502d3df86632746de9b3a7320252cb69707d18596b0bbd4a27caa3cb5bb560add8991bfbe7b56dac6f7e0a9f91202924fcb694de WHIRLPOOL 14eea7c8415e86a32396d7fd29df43d83942eb370a9e4423ae16490d5f4045abfb7bafc08a2d59b843a11c1a4720996f428b80c7560aa1f1f9975e1a816b5499
+DIST ara.traineddata-3.04.00 6315068 SHA256 21c98aaf7aeba2271ac0cc4a363d364d806649d7cb0bcab85d4b9a385f49645a SHA512 7fba780ec9061148c01dafee1227f8e338c1cf199a5c2869d58703123ea89f2279551e15159ab37038ec8ebc755076ede6ef049cc8a6e6764aa66d81c72a259b WHIRLPOOL d258d6eecb01feca9f0de5c973ab4a3c952db764b624ba98732e58af18a88332daa746e19194bcee8ed6fe1abe2a8d42b0b8976f0c9bde66e9831482b389f038
+DIST ara.traineddata-4.00 12537236 SHA256 a1b229d72f12cc626a8c2dde6f77ccfbd09b28ff09c87f26d77a55be910091cb SHA512 a3dfc8604aba6efccb0cdd39488ea978d324ec953c5e74892cbfb7506f1b4276e5e335cba56301272779d7a0ec69c55187db01bcd01de06a524ecb92820b7348 WHIRLPOOL 5de0109bbace36be9ed59abd256fbe437954e779233f8c67ccfee67a3472d2b798710c5c2464a8650fe3ecae626a1453b86c1939dd6831c63ba83890a8c67aa9
+DIST asm.traineddata-4.00 23520270 SHA256 1cac90fa32cd89073c70cff5a91b622b8c522a02ce684c462578a97d7508d70f SHA512 9413806ba55d101cf2c88c0c0cf408a8b4010c4a4b4ecfb315f98527865a1ddd052f1590326500f4c583628171d203a2a5530ef406b583a8b9f5451da91bb42a WHIRLPOOL 833e5b58a7829f3ca0abe380b910fa122e81aa01a657f336c0dffb9155b98b6d921b57498a699c1c5908e64b542fa7a91abbbef2e936f5a94d4a2ab4088c369c
+DIST aze.traineddata-4.00 15168011 SHA256 83762cbc4064944fbcb35ab41ae35ea093dce82bbc9f0f2f0cf1e3aa8b4cf960 SHA512 372241fa9f1d060d47a1ffd4830cbca4c9a319a014631545ca8f2c043609afe4427d4342e522d383778f0448ad853fccb632ef3eaa6dc09192ba06f1693102cf WHIRLPOOL bd55aff2b7da00d5667380f2b590eac3fec361e44513cce2dad873c3764f30a20ea4f4ff3b09dc6ac226a5988c71db9578078c59fd3ff463e715c86f8bd69cb1
+DIST aze_cyrl.traineddata-4.00 10530787 SHA256 827a302f906bbafafeef1b881c06719991e86177d03ea9122b010c84529dd08e SHA512 8cba80fd1201ad89eaaf31bf256924257fb45e192b139abcd9a7cefe43e4e30fd35dd4e08588d593a062b2668f0715804f66566479dd0a0beb688bb2c1ce7291 WHIRLPOOL 489a948912eb97cd35f71a68a925133788b896e003285a77a987870da28733689a2e954849606fdb63f8445ca529173e8abf6b1025e9ad6d74d6902b8ad48c28
+DIST bel.traineddata-4.00 16325127 SHA256 109e0adb6958f055f1f8cb47aec24b30100c3a42a20e4ed72e2214d5ee0a62bf SHA512 b6c7eccda420fc6c9cb30d3cd2e38b8f2d09766a77f701f3daae38fde198e2314a9a050841f2fec2fe49551e8334d9d5b820303b2d19285a942b423c66a71538 WHIRLPOOL f98ef5ef30c92dc7ce6dac8a42955cb4d3ccf4357d19f78fccf6ff12e38af580427d61c04f0008a369d2cbea7b00f8a19082c7d111dd9c827db6b4267e91f932
+DIST ben.traineddata-4.00 23447857 SHA256 f55f8ee76cd328a440fe2aa6b2d7d382534b21f7442c551634710f2ab0923a90 SHA512 6e59864bb499e048d8f8ce575f280f897b14bc626cad1970bb70d267f982be96ce2dacde847d060520288389bcbf2bd4a39d6abd9269a51d3d7970ffa19f4a17 WHIRLPOOL 255b114d9c990fe327b1fb4aad6a8fab22c3d83b0f1a1da90a8a6d27cc114d69dadebc51351c65c9e8404bbbcfee7bc594f72df49f47c6fe24a545e603da89db
+DIST bod.traineddata-4.00 35497681 SHA256 9d49b3736d13819e6548f8f8ebe29055381d1506f42f1596a048fe8ecceb252f SHA512 3b57c9d71b0914f274a6dc34e3d60fdb94f487e67e2fbddc92dafdb3bdc6e90766aa5b780449d367a6ac4d02b2c6634ee43efe74cbe52f71b11358e4d1c74339 WHIRLPOOL 675ec41d75c3c124eea423e962a70f4b6fd667c030fdd696f46c67c6e47467e74043b4bb7b8b08defd88ded53ad75a115cde2418a3c4f73ff061b263f181de0c
+DIST bos.traineddata-4.00 13859186 SHA256 07d192090364016c21845788b882087b2de6ad8f98dac1d19019958ba166dcb7 SHA512 21d9c6c4bbc042b1ee473d2f67fbd875cfa6f7fd9652abf914f8a0c526b5833ebb9602ee942f72642b00db4d632647beb531da37db712f0acdb86410024ebb01 WHIRLPOOL eb72dffee3335ae5da3306377853a45e1ac40c8e4fe16306718ec406545d27abe44aacddb4f9f3d96ed8db1c9acdd3737c73c7f9ed6cad0ac2290238ad3ff695
+DIST bul.traineddata-3.04.00 6026234 SHA256 ca0bd253b4ab6202db5e8b2cecbc4219b4f725e51468cabf5bc99338e2c3de33 SHA512 5115b4f92359344a17ee43b298c5c012569d77325e440bbe079ce7734ed087cbbe7ffb2b2dcb831e522fde2cde556e5de630f9ca85c141e9282e951e008e156c WHIRLPOOL 1bc19032224a6d4f94aae67fd8f5caabbcc00c00b0329513bf23c7a978f01269edec965e6090564b345862dc8810c2bc9c6fd04c736b7f4180998dd0cb8cb8fa
+DIST bul.traineddata-4.00 13677970 SHA256 aea17ad60107f4dad3533c5e4688d2b5f67ef4d0f22b0d2975f112f493e47a24 SHA512 26a010581fc65673d48b30fdd69308cee47c12531bb260c93a0b22429b2c342e78ee3d7ccae1590e71ea2fb1c9f33110a3bbbaebf8e7c4fbaab207a4bf9cea48 WHIRLPOOL d8a7a66969a1fd586f01026ee9e90f81afb8e4c2774d332109c47c295e28e3c45da0f44326dcdafa86a7f79c4ecf9362c345ec12c265e1975c5b380e728490d3
+DIST cat.traineddata-3.04.00 5356190 SHA256 29af67467ec1b1ffd4d2d9748f0219f2220974b0e53a66ec7234f1768b43fc4d SHA512 d3b1f2ff0d7d57fdbddbf9a2cd44fd1fcec08d13b82c6fd77a21fe45ef8e33dd809332b59d8bec0600f2596e0bf163605811539aca154eb11f7d8238e6df9630 WHIRLPOOL 94b50ede6a958d9c0c8128296a1dc9d2d3a7ce148f6a42603e8c95c4e968e69f0007a457744ca539854e6470f8eab9faa009f1ddd8b9bd266215a44307fad0b6
+DIST cat.traineddata-4.00 12704811 SHA256 8e4e3b56191ea751d1af402ef6e911d544a5a013feb9e89b14da1c9c4183b5f0 SHA512 d743b2515081d2121f294ba179c81a96f632b9ffec539777a3f1f1f54516a02d068377fed05ee7008fd6268e754645aec7d338043fda1340a4da432358248db1 WHIRLPOOL 101841659e4315479d0b5361e62ecd084cd3cdbbcb3b49afa72a67b0a5717da48f2481fba3994296c6df5c7b15b8ac9c055f5f527b47d9ddb1963fb3f035d5a5
+DIST ces.traineddata-3.04.00 11896327 SHA256 60c58ecd97875a41eccae4846a2e4bf74cb0e4bc066d1bc430919c76a19fb37f SHA512 de65b88d76fd50115099dfaac8ac80b7c6581eb0aa6186fa0c91c9cf12e90632a96de341b2faf94a8de1c5ed7b71c196571c914792b6aa7de42a3b7542ed625d WHIRLPOOL 2d906496e63304ee7e094ed69dcd1d97253e9802f16e338652c1550c4ae7812be4cc7bef6ac75fe1efb182f59bafafe61d3fd5ee54f37c0e1c65c85bf96614cf
+DIST ces.traineddata-4.00 22727966 SHA256 cf4270e56547a07ab342e78bacc3bb7fa72bac390520d6a91e8ea759b9f32f2e SHA512 48513c3c653aee6c6d7b22cd364331ee4ce5daeae6291b0f3eeac7cbfec8603ada5c64ae10f084ac12151d659ccc8957d040df36e68e605b34c56293491f0d6a WHIRLPOOL 6c7df1c1eede3c8ba7b88368cdb566d61ecd582ddb26c59657c8068d3fbc2ed90e1b8382c45bcf09f9af0d4618cf64446d381b3d670aca8597828a3a284581a7
+DIST chi_sim.traineddata-3.04.00 42089623 SHA256 323ae74d4a2ff49e932dbb4d6282fe0e67ddfafda075ec85803ecd077207454c SHA512 e3427c17988e777447262bd3f5704f84d1296a8c02d10f343fc6f698ed23b8577670bdc76f3e0ea53284a233de1e6d0f25224d984bed75bfd52f73e6a6945673 WHIRLPOOL 40b202dce49c25bac2f684189581567ac97ab5dbf00eeb6a06a00272856f5f0f0de22c2025e1b57e122af58af7edeba83cad28ef10a698e53c5ff5e598357526
+DIST chi_sim.traineddata-4.00 52662579 SHA256 c0b1f7a21638e2ae4e2fabdeec0433eed152ed4849a5e724f585437da5092e2e SHA512 18c6307c2f1d7f498df58a198b4bd61fb434651a1cdaf2abfea259f01d0064edaad69421c744ef3485134b49868ff3a5c75cb53db87d68bb1b746e29f9356440 WHIRLPOOL e4de16698b90ebe7c3aaf5ddd2171dc66ff572ccc05d92c2b60905adeebda1809f169c76277fb4ed9c7dd49781264aca40504d63607d2aef967d9e9618ba7e59
+DIST chi_tra.traineddata-3.04.00 56692327 SHA256 774d566bd0b36e4b6c07415dfa5b6b57feb2575b1f5f231d7fe01a52dac5dd0e SHA512 149795758dd51beeea3b9739395b599c9b6fac35862ef50fd663273709f00bab72840a6983d09289d05269f808a6af25b588d9740f54736beaf2452da1c735d1 WHIRLPOOL 3c8dfd8658a6b81d594a73c6da4d8e8223a38d15328938d92a8ee5e1afc50671476daa4f525b403f727ec8773b895f783ed3c1c68bb8c068fd1c7d2715708ed2
+DIST chi_tra.traineddata-4.00 67377986 SHA256 34fec4c96cf006a0810186d5ac3fc9a7584fc7ebe6cfa3991d663ed38eeb9d4d SHA512 a8300b785ae367b94059ea8519512474088c2202410aa74d9621fc5aaeb552125f257daccad1294456f8dd7ae07071e73151847b296b971c8c18d48ae519201f WHIRLPOOL 89baf4bccb54a80a4c91fc7b17758a95fa84d515846acba7640ba1f07005449d9ca114ec9af16cfe49165b440ce90ff37448c38a18be10572eb23a8507c8a358
+DIST chr.traineddata-3.04.00 1083194 SHA256 8bb20f8a78e31a4802fa9f1e075cb7de8d7c2eac5b7b33942a6d82abe0783acc SHA512 e0982f5069a9cab4ad274babcd00a7199e2e76ae02167101a24c0074a91db5faf55f921159da724391860c9187423b14b5aab096f90eccc604a32b2d30376455 WHIRLPOOL e5cf1c4156589eb9d1d5e290e03b5b87d9165608da3df2587621f5b876c65e1dbd2c290c7b6f2400853e8d46e54e2805248d9363172363d52000c4ce11fabf14
+DIST cym.traineddata-4.00 10333739 SHA256 adb749ca5879f9e5bb18af074c7bb7a0b5ce20f4ce84a00e05993957c2206451 SHA512 8f845d557be62195689ecf17b43c229bd33e85cac4cadf90b176e9a6d9f184411465be5b3534344b562bfa14b10cad6b0f47cb7dcece3f3d7192b13db7fd2e23 WHIRLPOOL de3ddebbdfc547bfa011dee04ed1a0e8cb723ace487de0de0141a44021a5085e513815563feae2cf79eea96752abe423ae0d29f9f0dbb62362f1dd62b2ce6e37
+DIST dan.traineddata-3.04.00 7340575 SHA256 f9521a8381ab1823be0808f933a9bb8f1172968a44e391e370b1fe9b4d913ee8 SHA512 ed320c5a3b93b5416ad1941a3e8a331a2f60570ba74b4bc2285e687472e7222556379c0ef261ae06970e3b9710c5fa89a26da5d509be325c2e627ed6e9f48bff WHIRLPOOL 3aed0bdc2613b5b2b98b2860a629e49a186a8eb28ae3ec958f212bbb939d263aac0a326ab4c870ba01ee6564e83faf9fc0e7849955d596954b1e761d9d76805d
+DIST dan.traineddata-4.00 16011554 SHA256 88accaa0831412b9ab18ccb72f60ed973d64ff634c9a796aee9d77347ba132cd SHA512 3b678b28d4d5c67c4781251974dc36fb8d430440a1409b67e5c7124ee3c04fb39fe545af8a7e8fd0e14a24ccde55a9dc32bae127eb48ad7c8eab16cc374fde48 WHIRLPOOL 7be1e3c751accff2e6e3e7fe86b78d2eb8c38b23ee599081df1b8d35a9707dc34aaaa6f4a10738d0bf84a34d8b5fadc6594c0ca0023992883bc9bd6667f2d6be
+DIST dan_frak.traineddata-3.04.00 1622710 SHA256 7183617a7ba763f59c1ed87ebc8b4885da03a9bba2b99d4600afac58fd28b1af SHA512 8bb21f7ee21f99e0eb8fb55bdcd60b006bb1dbb42946f1f7dce1c53bcbef46f5f6cca7aaf069b1b3c43b13eee2c7dee752fea8c38003ee266999752a9b466b01 WHIRLPOOL 629500189e28509d17fb6bad33a443c5f9a79126403e2132d63ad9a28516b8364462b5e7ee346eb95b3af357fe805a739f3e28d2e84b3f787d419156d3b9234f
+DIST deu.traineddata-3.04.00 13367187 SHA256 cb7eb42a7e972cec7ef904fe81825d7b547c46df684c814fdb11a930b13bca3a SHA512 fd4eab9e9203ea3a2f009c5feb337449b4ec2acb67b42c5420ccf69b342ca9afa655093d7e9b07d3ad435a80e9f59eeaf3ca578608a9136ca13ee234444d6995 WHIRLPOOL 554ebb795842f3086750ad55e826e57d0725e60c831ed7be213d73e80efce734983f53c1ace9d91776b865b7cfeb745554f5eb6f9bcaf3138be4fdca6c27898c
+DIST deu.traineddata-4.00 20193615 SHA256 59d92b49a22ff96964ba7be053a9e7198cd14c88f76788e7ce2555f5acb9a40c SHA512 23326861284f096e40834bac31ef4e9344507b9332c8bbdc10dced0c60743bb2fbeae79d888c80c56e796661a2232998f1f7ba64ff1e0c9bc79ff13bd0a2663c WHIRLPOOL a2a5d53f2242bf158baaa8429448c7d298634689127dc9d2389dc58856fb925c9ebdf62a463fc517f39fbc993a05cce416ed71e72dc330d46239c0219f51773b
+DIST deu_frak.traineddata-3.04.00 1978593 SHA256 cbb200e394485c5b515de203963c2a76c14bdef2cf258219ecf2bcacf6cc93f8 SHA512 6d458b657c5b88671e0932da24fe91051b7191105b710b18331620347407c5f91338ae951ee9e0464af2d93dca552d77b1e40d372dda1aed12bc209baf00d4b7 WHIRLPOOL 87e9d1645d01f5f6418516649b96274ad587b7d584eec72501d2435398038e5f57f5e910086636b51eb80bd666598a3af61a447a8bdf5a1cedcf7a8a0304a390
+DIST dzo.traineddata-4.00 8771208 SHA256 3fa23360be6e114296901c33c4c5dece0049b7ef0665a16cc8dd0cf94cb8e615 SHA512 b9801388c1e2e6355846be86ec61b8eb0bdec0c2907b787c5ee5cfd042a3889b8b4a9baea27775088a1e18597c024012263830ee238b4d8f7c58d31c607f47e6 WHIRLPOOL 6bc9c018465cdd3671cff9c9f3ff7db892509318dfe85c86a6233e69f156c115794cd59fbeef5dea84ea0068c3670648c2220a3d91921722f3778f39d7f162d5
+DIST ell.traineddata-3.04.00 5422512 SHA256 bbe0ed0758c69043114b13fc8f00a42342c647f27be352c05b4978e265380e64 SHA512 b542f4cad465332b7d9742ce64951289a22f31c2196335b09037e047c9fe2966689426d9e973173147aa7c0ca73cddb337c9ec7b485b13b80eea3e44ad31bb48 WHIRLPOOL 16d89cb546883bf75a8b75e55c0eb88d915d07cad0f4c5b3e0640385f4b7cb2a6aeeedce13cf48538f5a78ec39776ccdecef9c3264cd749e1d224cdcff5e310a
+DIST ell.traineddata-4.00 12594922 SHA256 797c80b46587c18b020a0231006b4ff6463ba923969eaeb3ecbc4ffa2f7608b9 SHA512 ba49067c8eed46992615013a09f58c457bf333afa4f152f3b1f837e934c71d04564bf1e9a1a8d80cd4aeac95639c19124aa586f3043737c556d28e2bc478fbae WHIRLPOOL ee877b8ff4bdc6cb17934583b8b6cff424e375b2dafbddf07db7a0a9f99d45d488c31250f87168da9518d528232aea10cc7e31b61934d5c9b71345ee43ad911b
+DIST eng.traineddata-3.04.00 21876550 SHA256 c0515c9f1e0c79e1069fcc05c2b2f6a6841fb5e1082d695db160333c1154f06d SHA512 e03d205900e3f6b866b2342eb8f32fb35dad28c7f58b7bdc3c0bec0de570f87578168d8d64b1f0bedac7bbcf462dd949b00701943a55ba3f42842ad1629e230a WHIRLPOOL e71cec7e7e8b9b8183f459741ce2eb1a33923e73802ab35dae81ab7939b980b028e4d4a3325205a52f67b8502323e9cd8dee6efd69ca40c0eb42b0961d5d8786
+DIST eng.traineddata-4.00 31873501 SHA256 1cb1468826191cc7d4158fe0a3014d3f5e3bbac618d754586afc86ddae8bcdae SHA512 dec017b60c7ee7c8dfe1c4cef562a02c8699c2856d6562641a7077c1a0b5493a26085fa81e7dfff97323054276f24eb51f64833bc2fe7bbe91b1955c6f719618 WHIRLPOOL f6e2b5b4dff3eed23ac807078af70e07e18989f3ed040c883a4556173c627556816783156e9134fedeebe1e62bcf60c97f3bec3fbad2ac2a6c50540ac5d29d03
+DIST enm.traineddata-4.00 10479188 SHA256 4f91bd9ddb757508ac0d65f36afef37545fe4d2b557451c1ec91d58ed55aaf65 SHA512 fe78e53eaaedee66e688291d684c221673b787dd3f020736f60ecdf4dd1257f3d2ccfcc10408a6ef50c711b538a4a3933c84d1ebfded82c2adc1685e7a9712ed WHIRLPOOL 2d150f66ad8747d4d42a718b64196adb8238346ed20c3e312e16f49b0e545ec51693a8015b267f5e3f46d0f5aecb0942465b3dad7faf9ad4233faa799df23f12
+DIST epo.traineddata-4.00 15408492 SHA256 7837df9717900031f54e28882f33e5d1676f062ed6aec6c38902dc6c0bd4931e SHA512 44230babdbe3ff366c0141f49ee524cc7eb1226be767e865b4ddd5afc1c1f99b67ccdc68ddc1ad0c8b3a368937508d9edbeeef099cb23815b506f1e08910427f WHIRLPOOL 7499e8fcba07c399ef1c864b2733996c359cf0dadca08412f1b265259e5fc55c6e4936bd223b94f9b0f97e54ce7db8c8912a3e3b9ec5be714eeb8ac5ee59bbf1
+DIST equ.traineddata-3.04.00 2251826 SHA256 3af43a2420ce927dbce68474d644625947189a82ce6ae4fd32106399146819db SHA512 2c5e5f9f85e956e0ebdbb25aa4e92bc163808ba9944c8d1ec9a76e4c70727c3657c6e56c86266a2e769e48c6f6d9aea72bf2080f723f3d90c089f775c3dae9d8 WHIRLPOOL 074d613cdb990703731deb228fbf4bec660e8e4be053bc8196ab639d14f84cb51e11a2ac285e4cbc4c362a90e2117d90a19b843cdf11f5ab3263d604ddd252b8
+DIST equ.traineddata-4.00 2251826 SHA256 3af43a2420ce927dbce68474d644625947189a82ce6ae4fd32106399146819db SHA512 2c5e5f9f85e956e0ebdbb25aa4e92bc163808ba9944c8d1ec9a76e4c70727c3657c6e56c86266a2e769e48c6f6d9aea72bf2080f723f3d90c089f775c3dae9d8 WHIRLPOOL 074d613cdb990703731deb228fbf4bec660e8e4be053bc8196ab639d14f84cb51e11a2ac285e4cbc4c362a90e2117d90a19b843cdf11f5ab3263d604ddd252b8
+DIST est.traineddata-4.00 21175883 SHA256 d4843e1615d8d01260d1b7b3d3beda182b7226f3becedaaa67889c6cdc5cf30e SHA512 733200cfb2e963e93d12666b28f7993af4a84737cf4c9a4c68946fa70076d4fc649bde93e68d701d1970fb7ac3adb2c1fcf89f54b0a35dfa56c257f8a30ab6f8 WHIRLPOOL b4dcccbb53b2e5f7811ec437e3565b0206be6892898bf8c5281485a25e2063843ab8b7c8ca942d7c055e54a24c34817632fb4c207f533c93c75a1aa2e03a0452
+DIST eus.traineddata-4.00 12542297 SHA256 ab62a90b031886f7769bb52bf30be7d82f09284585d777fc0e2cca3ad309230a SHA512 bbdab8f049a42cbe9e84d9695c6d209613ac35549147f000301954f8275b2683bbb2787df772f084e2f7887b2de9c0567fb424e80f0e82f95a14bbdac66c266e WHIRLPOOL 2a824adf3a860f756aa7a845727acef72c046a468a2af6dcf361dad7d65666f730afb39b394b3e29746388286fc7be72fc64058c17a962b7aab0877dd26746b7
+DIST fas.traineddata-4.00 10579225 SHA256 897d37f61416ec360f62745e05422c1a2f2087ce07f234d254d2d2e007c90944 SHA512 8423479acc7ed52156a0a4f3c574de4555e51979a98f60a760c86b5726a767bdab7a787069574cbe2f9dd11f9ad9a723b9b9f03b656e2b0e0192cccaeef0c3b8 WHIRLPOOL b731b58cfe26a99b32f572e7c5c1106d0fa83cb63ee49081b9f0f4f2a3e47e8c9aad5e4c80557aeeefdf35701a5e89dde78731c3e9ef89737308fa05e0a31eab
+DIST fin.traineddata-3.04.00 13274908 SHA256 f830c625f635a637cb11a6a565126b1ae105c24ae9fd7cb92c8d5130c7184cf1 SHA512 036e5e383ec4ffc0e06fb5a93d288f21360660d10c6daf8459edd3fb94f611ed49ffcfb9bc1fdd1d8476690f53950ca31963ccdb36a35d3330fe2ffef0a81789 WHIRLPOOL 9068bd4b23ac62d8b4cc846b10abb7bf536b786a8eefc32745ca99370eb6739b4ee9bd912b78cb0922e6111a0e8be2dc58285c0726dd2ebd92bb3349bf8344db
+DIST fin.traineddata-4.00 28467692 SHA256 650eb990e434349647e686f5578294678f4a3cac4a5381e43f7958dadbe99547 SHA512 a077a853ab89d2d03d5bd7ccb60af51544c7ef3afd230ab0e12dc616f28130c860701af314f6e73f24ccdca4fd8d4c611126df525fbded4b7f023a135ab3a094 WHIRLPOOL 5efbd39c9ff29097fb380c2f946c5a50227236d4dc847d662305277560586a23796d1ccd24caa61b6b1e984971d743162698ce8f897449d481a9ed969fd8aa4b
+DIST fra.traineddata-3.04.00 14044118 SHA256 86afb23ad146467f263e8ade56fd3951b1cc28f8c4eebc34f993d3c02d88a7ab SHA512 c41223608625491fdbf2d4fbe526da472bb5c269958e776b2058d4a782ebeffff9749e30c7db34adcdbd30669d82be97ee58d303027d5a67ae61b87b65c2e561 WHIRLPOOL edd6121dbfb52ca11ce86fcf54ec5f026d6b4341f824fbe1eab45af2e830bf1cf80615626b260c79343337fb61181e69b42281da78e6784dc28d244afd09a1fb
+DIST fra.traineddata-4.00 20908386 SHA256 a9eccaf325f39d7db2d5ee14f07818e517bf11f04d1de475e89ec707ac3a7824 SHA512 ecf1ded66b3e5c903161377903b5a693ea8221b155ac61fa88b0e2ba1fdb34cce8d8e6d0270a45ed822baa012d7d24ee15c6032a31b62d9b773106e39bd18603 WHIRLPOOL a2d3f6601b3903288ab9f076c1acc3d36908e532944718b3925bacf578c0a2dc9db9da123021c23e7160fd2ac9a42042495f3552acff4f47f7884dbfca253fc4
+DIST frk.traineddata-4.00 29861799 SHA256 210c3f6a42309481b6bafa06a492c02dc7ed58224bbc0a6687cf8884d6f327c1 SHA512 1d70263862960fd55e51bf906dfc2092cb9acbab94e46f57c9dc83180585604a12072c977f820b2bbbe2b7a26bc63ca4e24900ac95d4f8a0e6d45f0a485dc186 WHIRLPOOL cdf0562f2a0edfd644dd6f9cf443f3e446bd6f7932e0ea971b3d5db6a27d72f32f17474ef8febea6555796475e398560970f83f915ca7169c5ad4b779ce4c3b1
+DIST frm.traineddata-4.00 24482384 SHA256 a5a6e0a9f996d8330a0bd4ebfa22035cce55b677d327bd426019cd462e603f3e SHA512 946587cbbde6d4fa537312bb9cbb1952f5c30cd404b2cec4f2bc6282e3b190bddc4f2450e0f1904a1b5e8523c5651a5592fa892aaed2d2da7b0f1cc6f35f3e2d WHIRLPOOL e5078edcf3036a47a99fa9c4a55d0d81c7d6020277ab3fdc4d65228072605ce185c9dae817a59b4f675e25da3ab3d098268724fd70042d0884a3d432f5da206c
+DIST gle.traineddata-4.00 10190010 SHA256 7d2ef97cefa831545d2aa1ec88e9de449e87498f8f29b6fbcef33b0cf175ab9d SHA512 b8ac110cd62185aaf4336080e9e08df83f9bca2418aacb440345c5a00b2b938613ef1b13788dd4484791b3728e9b88fd739ed1cd042b82ca61341f541b4403d3 WHIRLPOOL b2869e089dfbe0e92a4fb97f3a47872db996dfc2fc08556028d58f97b787808a3de7eb8b6472f4357cb7d7ed145f908c6c87146f6a62cf1130b313949df299c9
+DIST glg.traineddata-4.00 12746027 SHA256 9ad4d863c98d0be7bbcc214c97fccc2b36638481d70706aa257a8540d392c9ac SHA512 3c0e34d0b2fc50e21bd1d08ec2862fe3839f84206669127b5a902cf9d61ffb38faa25d68154619053677ca2682cc70260d2ca443bc3ea4d319ce0ee4b21e649b WHIRLPOOL 3ebe8da307aaabe2922317979e659d0fb851e9df28b5177b21b830535635414e816d035d16ffef921725d9c779db5120c49f34508875ff14039767f42279d7bb
+DIST grc.traineddata-4.00 12838816 SHA256 ea737fac889cbcbf6f9507b1c0c409374f1b04870d66f4c6f3108c21296be545 SHA512 121aa44fd9f6b1841bcc50407c483aa7c94dc63217cedf655c393907e32d24e5dadc34f9c40c044153329f01010128c58a3ae8b6e30b8fa1419c1b66617b9202 WHIRLPOOL 2e29dd519dd991b589379265eb7f1820fb6c9b506db7a016629f3b95e0fc1f18e4e6c57efb3a2422a9d3b94b7ba4aa246c5fa46c01553b71b6658eccd45c00fd
+DIST guj.traineddata-4.00 22879598 SHA256 60efe00e38e19bee7885bd28462ef056c3ec2110555be9123cfe0636c8622b05 SHA512 47cd56dbd2cce5bc1dd1947440f03ca3879df8526256bd4f8973fc670046f68eb4b5529f13402af9e1580c4af272f976a1a95efae1126d09208f18c7aa9d7b6f WHIRLPOOL 91c3330959758cf850037340cca3a3cae4a7493fd813c16a0a1025f1e81708551bcc14457554df0b578a71ff3fb4d5849670d4cfd7bf689555295f0f34006aac
+DIST heb.traineddata-3.04.00 4339016 SHA256 4f79288afde9162ee27841f0de999e690022cf1e3bd1723e34ca8f189c4bea9b SHA512 9528f3b0d63bb2bc4f90c33808208846df2e9806085f134d4d6d6cd4ff96fe30ba3ae58db222245a7320646319526185ddc29cfb728d6db5038988bcf14a7727 WHIRLPOOL d9fc11c9fb6a87fa4f0f1e03b63fa3e8a33dfb8f32b66b127172bc1acf835943505985f856c49d183a028b5fab66d7c691ac66f6ed3f10199bae3d7f669058b9
+DIST heb.traineddata-4.00 10992421 SHA256 5f793cfb994e586356114a92239bb7965702c6c58bfb5b1aafcd5d63745faad1 SHA512 b86ae5cc2ba7a1d9b3e178e9eb9153f2de38906de5054f494f0e4d35fb22af0c479ad9400ed8d1e625e648a7769778966eeae8a4064b1c9c85c3b78a7235155c WHIRLPOOL c200b8ab25d95679591e589c53e1437e8dc6b44f7825d455351fae4b1460e2415337a92a43b674126d4e32f6242d908bae77db8b2015ca54d6c828e3848345f6
+DIST hin.traineddata-3.04.00 14152165 SHA256 6e99459dbdcc40bfec132747bc233054916bed9da02f89567c9388c32e2fd6ee SHA512 3ac300090fc39564079aa3ba70dc09841d0fcf3181ff2f25e50fc5687c17ec9e8a5f5343879a87f7362235bafe074025de5eb02391fc68f0637f8bef1c16c3ed WHIRLPOOL ceee2a21820c0d77a788e2f303e6d128a8cca71443887ad7b922b0079a120e2b0bada1d4cc6d54030ab4105093d11042be9597219a4ccf31ce2860bb58a31b48
+DIST hin.traineddata-4.00 25757980 SHA256 ccca65fe8a649f2391c36a00b70d94725f90bef45775a38baa82a1294f564890 SHA512 53c55f22b3d52a852e7b1a699eddf4567e1b72897c4f5ca2cb13e0968c1e40d0a9d80ca84986c35e9b478868e1dc2d86b65873960d21f8d3671980a796dae2fc WHIRLPOOL 5bfe6e7620347ba393d8be3a53bb8bd39418a11559be5a67ca049d7124be7f5013b86e4395c5a718240d6c3951c41f683ce1a334c1e2321e4427592cb0afdf52
+DIST hrv.traineddata-4.00 19582927 SHA256 c084acdd2943d0315547c7f5af68814c2954a05cb8bc5695557aa679108762f2 SHA512 35bbe4c202993d421a29f63390b2b5e774d348e15c9bfbe88b8e910f949fc84e3c9edee13fe47a3e8629a55384ee880f815d74eabe85fcb775c9d4bdb16e4321 WHIRLPOOL b59222b999c377f5818492fcbd380120adfcf2a358cfd89dae42ef77feef81807ce3c7d3a8ec47a08c3c7ac3f2ffd767e9a4023d2a4522fec5b8cf2e51656aa9
+DIST hun.traineddata-3.04.00 12213770 SHA256 a6704d2e8dae62240597342c33736cd7bd836a88e188fc74db038ec87be3ffa7 SHA512 cdd6957f83a50850b30d66de5063db83d0612bbbf3a582aacf35f011b8b595ba5dd03f4ffea784c337ce568bdd1cc3cdbdf96f5fc80783bad634a785f12f147e WHIRLPOOL f475ff06bc43215b9f9817da4a7958167e273bc25259655682bcffa81ce96e2944efe8909502b47ff73eead791af65356179685f4d38e7c8671f03a5883dc054
+DIST hun.traineddata-4.00 21667149 SHA256 2c1f9144e3e4a272c6f063f75b9dc963aeadac78b57c3145b7d4976b0f444e99 SHA512 f59a5b2291fd5588b4107936bd813209df174e5a6494af6b3101f7f426501c00d78c3c2e02a9e3277f2b802ebd6e1c1b95825f8e08a9bf7eac12bd149d9fa4e5 WHIRLPOOL 234395fa396a3514feafa0cc51d8d8245f02150f5c811f18541df9fad5dd4d7bad67e2cde19efd7eae3067d06e5f026977b2eba1e00a7acf5433de684836c538
+DIST ind.traineddata-3.04.00 6503178 SHA256 3738deb007baf9f01b3a601835003f71c314d1b955f8a743634f6f1ec8220d88 SHA512 997b0acbfac262d8889b47e8ad3c9ddea7893b89fe5edcbdb9a7fafe68ab4ac9e93e67cc1806bc6f4b1e1fa669da034687fae982318f9e05ad4716da0f276c77 WHIRLPOOL a564f9fb7b481f95466e5d65d8e02326df629932a52125b277ed11479d1145f911cf5941666b18cc8ce7325806a902c4ed0b5cb613cbc41859088c21b4142867
+DIST ind.traineddata-4.00 14281790 SHA256 e2d6adc8842b4d5b2e65953af736b2c77f434a59ab90eed26ed61271de574769 SHA512 1835d1992975214c3a85a436e78cf732c8f8a1464e8c24109f6d1dab65764f4a1b0757e32166620637074ef02d0749eb494e66f4932d1e0af11ecf00fa7bb28d WHIRLPOOL 8e3cbd8b77b1afafccbf5bc9bfd042854c1cff8e7764b9f6f1d71c41d23d83635eeff38208dceee98b5ae733e100c255b9e975a333ab1427a099319cbd866778
+DIST isl.traineddata-4.00 14374305 SHA256 af4989b7141d17da728fe118aa49abbeed40aaa22eae862137e5839dea54a9b6 SHA512 598e827226edeb843d03848edcf95cf41a8adec2aacb79c2be47411876a2fd5650bffc1e6a252f3eae4b148667dc0a7e02b4130bcea898c6ade9ed99af8e9299 WHIRLPOOL b22bb508cfc12d89703bf7a3b9e8d25dd17e02e1552cf23e8417925b1020d7ebe0eebdac4137f095db0a8dd152f9380100ee7bffdb32dbfbcbf96bbd1df47734
+DIST ita.traineddata-3.04.00 14210569 SHA256 5a4e6e826e021d04f3494c2bd74ed1af5977b67fdedceb3c9aa30ff6c7a4b3d3 SHA512 97566bb89803656cca14d3559a46734b74f7859fa651399705de8a22259828e76aca2ef8d27f486e3ae7779005772966155ef190ba666ea31b7bf8c1d2fe53ef WHIRLPOOL 3e2714679db204426e1997bce5ad8616fc0413523768f9e962ea73b1272041a2c7c88210600627d079be2ce41f09f16f67c0d431e899042181199bf924b08a26
+DIST ita.traineddata-4.00 23586689 SHA256 e9ef89885616eb98774a4258ac0609484448c0e2d4dd19a3b2956ac2fc2b7a6a SHA512 0e32802292edb6bde1300a28af43e720e8cd6ea28e236865b01f8f5ff7b2e04b88d5d1ff2c32bf4fe20691c01aee4e524411c4cabb612e881e7573dc836ed0e6 WHIRLPOOL 27b8d6137d8791d045278b66e0a30fe8067169647feffb8f9bb0dd8eb0ce9cb6980ae145fd84efa69ea174c046e3d5aa788b892ad66f243d9a8ca9fc2dc68c32
+DIST ita_old.traineddata-4.00 23437150 SHA256 f6fe55e7d34a750355306dc990556cf02fd6efc2182a75adae5c4477ddd747be SHA512 d0e98445f637422dc24350c7d29c8e3a3403a75b8a28322706b5dc7c8588e9a74796edbc39036ee44bfe68964e7aa60f430682ac2385501a4fd8653c54d01c5f WHIRLPOOL 1daa562306ef6cc1dff9fa88d19e9e0214497ce66da474ba7a472cd8f8423baca414134a0e7ed1cdc6bfce109be6387426907c2fb99d26209308fadc090c3a32
+DIST jpn.traineddata-3.04.00 33072615 SHA256 3c3c957cbbfb6fe66b38b46bc17f86158dfdb1688a2a28ede7ee0ec891f4aaf2 SHA512 23d2880f19e53739bff456a2e656924ea811872f16aa6bd52c87afdf2d7f639896d9b732ad0eea1966acb3ac76e2ed17dd6786cbbfabd9602f4af229580bf567 WHIRLPOOL 67bcc22f05f19f196b8349e73659d2f5c3b41fa1a4a73dcf824d058675037b96ae23873aba99d084a8409abba6d75548b4f1dc0f83ff38fdf29d1826fe2a9978
+DIST jpn.traineddata-4.00 44380238 SHA256 5ab3a7ced22f3f8056ecd1281075f487c628d275827a50a295e14093e6acf225 SHA512 ff49dd391d718152232b1db45ddd909441c9b6e753d56ce66ff637421db0e3876d7f2e66901bb67f8ca42c34d009d519e6814cb38fbc4403f63791754fe2aaf2 WHIRLPOOL 4b5a87fa00064c11f11a5a58423f90f921201ed88abd8b83dd84c7e582fb253585fcb0b8a6d3feb6e86b550e0f9eaecc4b84835d6cdb9640f01476f297a800d2
+DIST kan.traineddata-4.00 49079291 SHA256 e90a77f81ec43d1ed0b4e032825b6ccfd2972ad23c10d70c0ebf5ab3284d10e5 SHA512 b407ac1d48f7d60d1e2ad67dffc0a7d0756466bf4f687089f62bbac44d787804048c95ddf83565726fcf5638f9986e11fce163c008bce92b51d42b4016444a9f WHIRLPOOL 35f61715f296c0e86990c4999d167cd7fab7c0323d48c659801ebf328208af56baf889b4b93ab395a4b8634b201ccef19ce9431e6bd893ef581a72bb1199397f
+DIST kat.traineddata-4.00 15490959 SHA256 0069a55127ac156188ac05aa01aa3233887c9f2dfee264f81221788b10aa3ef9 SHA512 9af3cdfcc0be350a9a2952a478bd5f12cae0a688486dfb391b5eae9a44c28b24a05209b08feb36fd7b27dde86a300bde32b569596854370ec5e08bedcb39efa9 WHIRLPOOL 55e3768590e449e857d86ad4c10a10f6a3f212130f2b2032513a57965c3e14eaccc35f86958256a65f1401d16c10c8f13fd9a6aeeeb35ae4aee80018f90ca95d
+DIST kat_old.traineddata-4.00 5981988 SHA256 ec5c6ce0a2f3e1f2dcbce60878c236df7451c587f599761303620fd4205c1dfe SHA512 d98c6ad4a345726b20178eb018fe521c5e811eaeb79f7eb3c6c2abe4e984bc9bd03cb4644942ea24aa88e01a5972c8e1e3df9374b4f0e5e6464c8f5eb131b74b WHIRLPOOL c010524a98e49e4df6978dfd703286a662be33a41323936ecced2e47fbfda6e9201d9e96ad6ed2273db13359d3aeafb5906db1796c229e56d8f1c462a25204a7
+DIST kaz.traineddata-4.00 12616561 SHA256 5b1f7169c076f1b7574b75816a2edb36cf24d3e7426d877535ba2d1f466d0437 SHA512 742bfd1ecd6cc06b1f4c89aecd64439b981d5194933fae7a8fc428b3b761b99f9cf54151c3ab2950a9e3630ffd28ce973e82c4cf3fa6b035a1fb60562c038912 WHIRLPOOL 90ef4be1d4358594fb1940d6be5d39e6032ede76d3f682afa854f192a0c8ca79671b1cd8cfd4c09ba0d50cefb8f8366c24d4c18f262beae27e63e79470fdc5da
+DIST khm.traineddata-4.00 54152200 SHA256 d3773943b7a93272d8b333abdb9c3ea2f8ac4de453c60224cc1bcafc363370ec SHA512 3d9d096880e75ca6df0fc47548fd31f1035b2527edcfcfc6df926f358fdffc9ef8b8347cf7d58bfe76ed1b0bc8906ec02a0e493bdcdca14a78c251aadca56b42 WHIRLPOOL 81b837e0653db7622843274c75838a76a7dbef5c7ffb75f6472a4e1f43049923781c5aa45a4a3480dc4d1b840b83401767543dcc19ea3105d23d2e35232c673d
+DIST kir.traineddata-4.00 13994013 SHA256 f2eae5116348c61d925a62223b761809ea073ea8a42988f259bd3699b08a70c8 SHA512 399c4f53a1a6ac8c3895231d15fdd2e564e2fc81b900dacbc1d39fde019f2f881be83ed79c2a7637b5ad7a11be0139275929f4cccaab388583ad107666776582 WHIRLPOOL 64fc4a909987cd45889b53a7f7ef987a0c07d159c391d3d33a51b989cda90a6e0e3b1cad2dd26041fed4a2a0156e569d216da2efc1c3e59da4ce7a93fcc29263
+DIST kor.traineddata-3.04.00 13309831 SHA256 fb312ebe119a7673ca68c0a9f7b9ddd13a704f64609dd22f2fd606889c918de6 SHA512 83d44cc7a870aa3efa6858f09ed1ee50d810e29711b706d6417d2aa79125da13bcd8f50e107dceef93849446a0506d122bfb8ce649f7e1e7181cdf75a6e0e4ee WHIRLPOOL b8adca986f62de6149f7b9710ea71f29de61af5aab7010b1de2621e4b5b546289a11a176192cb86d4ab3b2fc55df76837fd70c37fa2c3659da527bdc10d7d7a5
+DIST kor.traineddata-4.00 19342144 SHA256 97aae68095e6fd71943e91bb3f32706e43ff31eee165e06783d078adbca930d4 SHA512 1f932f25b60ec8a1f375bf03b9e51f3457d0259340bb4bed21bcaae44768c5dbfeb3b2dca98b88de89d8b52cc6e38dddee61315d4a286833186e5fdea1e7f773 WHIRLPOOL c13d771a48ddc296daa345dc1ae8d0decc6b3eab63606af5d3d87391982b2cd0e3b2f36cfadd3b2557e92693b80dac9400490218fe4edf428b8caf0c33a2340d
+DIST kur.traineddata-4.00 2020502 SHA256 2c865e0519fe5b8fde0b6e2184745c9c06ec96eb93fb13fb7ec298679abbe2b2 SHA512 49e0661a2517632543eaeebd8c6468231f811bfca513731c7e5b1b0f6c0f1f1c86e3e8d757bb0cea1af077db46517cbce72cd8d9d71cb006c1ed6a51c9b8d24d WHIRLPOOL da7b7add6a51901b6484cff3eacf44fae96ccbc59ce30b7888a7f81f2167c1c0e1ca8701dd0be77270350a63c91205d52bd92d408e67d934f266955565690db0
+DIST lao.traineddata-4.00 28962138 SHA256 560f041738ec66fb8564fd1166da731989938ed19edc17dde6182e8e57aaf09a SHA512 75e56e234e544de5c683801be0e0c5b41cec7553f441c302c4ca1936c73afe2a0f467118e5b773d574495d925f54d5607675056674c0908362735c6a1b777a9f WHIRLPOOL c3ecfff4c11b840aec56b7d4285680da0812113da5c8c2bc7b9f9080c34f531f92c6dcd76c81202f14f5c96aa925e9ec457b40b1a7ee3cd4ec3d41d7cf2e7145
+DIST lat.traineddata-4.00 15241172 SHA256 04ab8334a20feb8e73e5b0da5b5c1c32d1e47cadfcfa44c90f953415ecdcd08e SHA512 fef165eaada48f0c423177674061e05f569a3973e10423a78c2ce8fda21848e421150a9ce47f4185d70a72a344239715b2199d82dc5f609a29681cd85ac53234 WHIRLPOOL e3b976d679d669aa04ad6d0d34abc2cfd8c8aa5fcd9f28b2debec0a58b7c5ce2d7f9bb62eb31ca7a59ea8281b6a96630a3c47509ca10f44ac5a9343189ee1c78
+DIST lav.traineddata-3.04.00 7802105 SHA256 4f1f06376f498d0dae11fb03200ee124c615dc848fee1c05aff9187bf8f6bf3b SHA512 f45f3c722994c627a681bc38b66f64eb7d33563654f35ad838acdc11f66d7290eba3af3cb41aed633af981316f71fe44cc6fc20a0229b6ae20f3a96a1744a16b WHIRLPOOL c1f2c9a22f98d5c44f8da541baa48f02b7137eddecabd04a81ad889b1a0088f1d97e4115376824b780e8bb5dd15ffbe9302339112d93919703e65d139975923f
+DIST lav.traineddata-4.00 16963807 SHA256 336311ab7ba29d9de3a5929ea7a3baf3460f43aabbcb54afd0449d577e5c900e SHA512 c8ab21a9de64b13fd2e96c8300e77d81bbbc8037ee8cf38cc5ab98f3b81b2cdf969dd4a0b893cb3d545eaa24dd3fface55b3da3cc8350e6e3c8ed71134ae7018 WHIRLPOOL e3cd23a5bb79d781ffdd5614595c7398c365baaa4ac338f7fc890807a03b82cead0cfd7ac38114c2816a05a9c3439c58246c944f0c9fcc6adf894efdfa44bac9
+DIST lit.traineddata-3.04.00 8916163 SHA256 158a5277572f04bb9fb070a3bc00ad3a5fe7a5e25856c9f92489662ce57b0038 SHA512 cebd5fdd1387b919c6327fb8a6337c44787bfcde283e56dd71bd96b22ac4435c2a55418f57c4dbcf11f7174eb4feb736370d2b8f5ed2184a3c8503e13fc404d0 WHIRLPOOL 969355747616e5b7d5657db26b2c1efec3ac8b06c2c63d00e9dcbd876a7fc8da207d6c579e0179f0083aae134e23f24be5ba64ca7a54e0015c9f130bd3b20bed
+DIST lit.traineddata-4.00 19560399 SHA256 20a1b5460d6dcad1c2d69fde51709a7550ab5fff7625b4940695fe4d71b0fb69 SHA512 e8c7f23bfa87b23a80c15929e0697f6a9a2fee62b298555bcae61aed80f9cb4528e54c92733c844a69f656e98e302a2415cbc4ee54f3c5f2743ffd653fa78e37 WHIRLPOOL 6b7e6300f7a9f776e84fcf5d0edd9f56c9f25fdeb0d14b2484d374a7a230ebbb79fe8a888f98a5500dcbff538148b8fcdbb3b7ea2e8f7847e67784c210f4cbda
+DIST mal.traineddata-4.00 21778761 SHA256 2c34c9c7440af81a7aa62cb7d5bed1a53f97ea9cbd82e7c352440570e8063190 SHA512 2b0cb5ea506a91206f3e33c5c7db7e48369cca240aad57e78c9a8b642826a3fdde5b0b1f5d83f8745db4d9ee66f96e6ae8d321cd41ae93f6759c83927c235bea WHIRLPOOL 01f0494848ab22b908a4cfa2bdc56b1c561fcce1254bfe4ba88d511d117b552716d0dee928d92a66808c9b8b561cdbdca2be5563c907c671860b591a362ef127
+DIST mar.traineddata-4.00 26199347 SHA256 f3a9398f8ac7b664c81bcc5ff1c0dd9b6f97da614eb4480f23c7f911c9555fb0 SHA512 60fb8db91831476a7bdb70d64f16811a1d244286fd92c2db65b7d53e177aa0141149325d8eb87c29a1935a7942d74ecca36e7153c656c47366a2eba4f35c815d WHIRLPOOL deae3034f7df6156524f470b6f73079c324b31c1535245bb0cad904294818c79b79ddcec2b35e02d262a88ea35278f3eb1c2bcc542a2228f396cb0dea822f29a
+DIST mkd.traineddata-4.00 10485081 SHA256 957b8d55af5efe12bf36d2600fb0497f7cfce99a613aea8a284ddbe4e054566a SHA512 2bd8220e6133c7e60980da687fd8fa25ef227de76326bff70f7e285ffa7d30c05bbc0ae57af346fc17dd37f5c1cf408b976d8983be264687517c292056daf75e WHIRLPOOL a903a525e707051a25377001252db209e18db7315ab95c17deb1634585e6ea262bc751b7bfaef410de0fd9bfed4f2908c56f74976ed75d4ad0cf3e13dd5ac918
+DIST msa.traineddata-4.00 14604064 SHA256 0e46cb2898e566372dca9a2343fba839025a77c00cbea465cbf8abca5d4af9ce SHA512 deb9fba173fd967ea6e92b68f79417c126c3b2d25b67eeb4390a6d27d04e585e27761c1c81ae8c03119a223570bb1bddfe31b13cb5450666253cc1a8fe83b9f8 WHIRLPOOL 8663b01b928e202b24c665ca467416b131fe07c55c758bbaa8da179633c3b4384df99db4a0cb8ca1ca0e4f2f7a21a5679f4a8e051b4ec7b69be45f648007d64f
+DIST mya.traineddata-4.00 75085274 SHA256 cdbc5a22978fac4a3cf0fce793aecadd341d6d0a4bc30daefd06bf47fc7c6391 SHA512 681d641eefb389636e59ddd9c3bf23153d0bc0aaf4a6bebeb15af4cda6a9069c78f64e1eea75abcb06aa563ff074ba7b3688d54025c71a073c0e88133bc1d7ca WHIRLPOOL a39ec612dbc411368f674535411309650834561869ef16191e9674725ede7570d0855601449d70cbe195dca43fad9c3b372758607f345cb66e8ee2a08b24b823
+DIST nep.traineddata-4.00 24248362 SHA256 69c7814418482736247d5ce24bad470b6a1c420aaa829e56e12c28d70c6dbf10 SHA512 f289a240f2d9c442b8c4cb678d849547dd3c8c187ad4d4e5829c98c925fe07e0763679e04c8a2360a4a0a77644dd191ac31728398a807731ead879896e4f5509 WHIRLPOOL 31c88602500f9405891761b8dc5212706a810ada6e0d61bf1c86acb850cf42f0267635fb08100340ad2514dfa69846a71e603c03598cafae36c6449f3b152b20
+DIST nld.traineddata-3.04.00 17098919 SHA256 bd849345e8476f47b40c17204fef5cf64287244c19b9d17e297ffe70fc5c9cb2 SHA512 adffd81fe6fdbc94f790a102940dcbf913d51ab1a75b7ced9818f88df5c9444f2f3eb6363523084f1dd474c98a558e02ccfc32d83ae73af2af180334c1c39a1c WHIRLPOOL 508f0107b19862e50606c86240a48c13336ca28816acde8a697b2ed28ceb621e72f629a97fc4d551d4dc6e9a9c69e3f2269f629ceb687063405c61894565e3b3
+DIST nld.traineddata-4.00 33075399 SHA256 070817e07ab27c1f715fdf2cb49b8c748a75ec2f9a312eb299f2db554606b30a SHA512 248ac4048b8909e325bd3ca4edbe48f9853eb8fdd8ad9d1950a557706fe45832ada8dac9dbbf033d33fe676101fa81f96de1c691465b77ad84e29f1307eb2846 WHIRLPOOL ab8860f4c14de9399b843634e875bc62d2a000481ea1fdf51ec104921aa44ec7425de6bf6398287fafa25e23ab44f4c299a3cf4f9ac3b7aab3d97ca32075fcd2
+DIST nor.traineddata-3.04.00 8262167 SHA256 a990269f3d815ad206ea0f27b14d07e7a0be0c171335397bc0b46ea0cdcfdbfa SHA512 4e943a2e19b10b3c8c862e23e78c70f6a02d3c2ebcd01a90b7f25a677f92b19bde052a6fa48f640c0d8b7d74769fc7fc45ab1c412339cb0e9e108926be439ce2 WHIRLPOOL 3d609ed7c818f0c2329ee2521c5bf75165f9be317ad7d50d12aa77333f3e069f4ffdda904b3c632b01b921c3aa6778b08d8e955935e12e28815ed0f666adcc17
+DIST nor.traineddata-4.00 17444731 SHA256 d3e94ea7e6f79e03a4f395e1db70fccdfb705d881e5c698ed8a37b5c09564d34 SHA512 9f439a99e7316796c9d1fe3a562ea056459897d1cb195fe20ede546fe09b46dff9ffcff497b6db1ba1d9e82a914724f7645ef33263fdf9d7a86e5102802ff1f4 WHIRLPOOL 3ce55885e9dac14031fc11b514b456af3c83eedefb5fe719fb0e4d8209917c69f7035438134788286529548f8d8d8577a794b558ae7142f8b902152a5dc67992
+DIST ori.traineddata-4.00 14655225 SHA256 c788902125b7f02cc71a29dbbd4481422ecf2e80d218a8a3fabdf18a523a385c SHA512 532f3b0466675fb15f22888323bdb4bef983204169333b46387820add7f7d9e2d79bda3b65cb7a0825d20da13ca721c1233066592de0145555ccce2da7e0ec6a WHIRLPOOL 456664d5af44cbdf3a29c95147d14db884d84f3f0e5f1bd34a5a311d03af581cda0ed48ac7aa4d4281f8733c892cc4dbbb144549cc7c15c5da9ff750fdf687a6
+DIST osd.traineddata-3.04.00 10562727 SHA256 9cf5d576fcc47564f11265841e5ca839001e7e6f38ff7f7aacf46d15a96b00ff SHA512 c54f481903187bed19cf14c69b24c44044b540f50814de66dff8d35e6987eea71ef4464492a8fae9242fcb22cccbe59e009f3a4dab6c36ad63f78c52ebe9628f WHIRLPOOL 909efcb63ee6eebb9b5b28eb05548aed669e21081f708e51e705da42f06e8694a7fa5338a1e5af27269f8145cac7031ad730238472747234062b2f18ef2fc1be
+DIST osd.traineddata-4.00 10562727 SHA256 9cf5d576fcc47564f11265841e5ca839001e7e6f38ff7f7aacf46d15a96b00ff SHA512 c54f481903187bed19cf14c69b24c44044b540f50814de66dff8d35e6987eea71ef4464492a8fae9242fcb22cccbe59e009f3a4dab6c36ad63f78c52ebe9628f WHIRLPOOL 909efcb63ee6eebb9b5b28eb05548aed669e21081f708e51e705da42f06e8694a7fa5338a1e5af27269f8145cac7031ad730238472747234062b2f18ef2fc1be
+DIST pan.traineddata-4.00 20032828 SHA256 ae91e968970f8ca27ec3321399e499a7ecfe7fa03644c65b4b26b1a9f2e5bbe6 SHA512 c86547b2ae1dedd259237acd59417cc1a181dcb2960791974dea2dc7cfeaf1d7604988c892ae40b5d51b63573d3fcbfc24aa87e2e068f532ecca730cd3395872 WHIRLPOOL 282be74e324e51643712fd398298083a93706d9323205522856d825f1116fe2c3e1fb70617f09b9d122d147d10587a63732ace70746015cf204ea34628be84cf
+DIST pol.traineddata-3.04.00 13918058 SHA256 1d2292319d2e3c65e15f19f55b961c9b492651fc179f3bcd219affe7c141bf94 SHA512 e1730d8bdbb296d223000747aea0dfd9561401e17f37518f4f7ae6c1b13cf500f5f359df465013112e126fc426e3e940b5dc98f84bdfc6517a73a1f8e8fc4c10 WHIRLPOOL 2feae8c53b76358a4c51b4760e86015f313cef22fcfe137863ee7d0ba2baf802d1de929e763e22297d6c3b5328f2eac5bc42aa65b39f558bcc9ba8b51422fbb6
+DIST pol.traineddata-4.00 25941386 SHA256 10b5a77c4e865ccaa79984879457df8aea7b6b0caabd9a5860733d485c913634 SHA512 42442d52aa1afa52274b307994a1470bd643b017ab3effde0a61e44a22463fd17cbc516cfe2bcd3bb9964782315b08a95d1dd7b40d3f31c04fec8109fad224ba WHIRLPOOL fff6e2d39c728370abfeb95926e121a1c1e4b2b64608b61259dd01d388ac9a1b4ddaa69d563e86e887a6ac15cde9c89238ec4399e2c83653cda910981fb16cba
+DIST por.traineddata-3.04.00 12914622 SHA256 089fb419cd7bd135236244dd9a4b8a42dfe2ee97d97b481efdd7b92c9c6324a0 SHA512 cf771fb86aad468d73c879049382b4c88b978eb9ac450472b1729f2cc86e713e5ffe5bdd3f226e3f6e6340e38e115d201046849428b05c2a3bd406eed240ea03 WHIRLPOOL f7142c9e86cbbeefa10ed8375518f3adb61ecf6dcd0c8ca55c6b54d57ac279bf9efa56ea92ef05c38a14168f4344ae82058556b948bf516bbac2a0886e01453b
+DIST por.traineddata-4.00 21457953 SHA256 c63e1b06a52ff00ede0faee27a024cc37ed9c350cc671b827fb7a173d99f3293 SHA512 5bc95002bda1fd0cf15d3be6d417fcda952417c5a9e08c46f3bcce859e89be2359ec4bb15199bee0cc72b407251b7b4ee655d67d46f8738bf29bf2b12bf3b29d WHIRLPOOL 012a644fd177060043c7707b27b3b6e613e790b0115dce31bb16d3a895d4796d5720a8feb378f2f6fb20703341aec441ef6815f2e35be68855873986e8e276e6
+DIST ron.traineddata-3.04.00 7957608 SHA256 f4f3614d4b009eeb0ab5815ebef080ebba7c470b3f80c9f97ed6da0d3f409986 SHA512 921aec7e0e91d7bcb3b85e2b0c5544b105cb01516c100eac21caedfcf27da678c392574c3dfedc81ff52571a8702c91ee76529ecea2b6bc3e155f6e2c56b951a WHIRLPOOL 3257cad73ef2f12b91518942669463728a31bfdfe9db4e604411ec02edba4933c047ba6df9eac65f46436e5f5242fd58ee3070d59b9b140f3b8c3fe19a74bd43
+DIST ron.traineddata-4.00 16545516 SHA256 d174190ea050c537d69b988ae75d4e5d8eb718358b6ef0b55bf60b00ccb680ef SHA512 045eb12025bb4e85edd7f82407287e451432411303a17bfe2ae13327a99f568903fa6b105d3fdd6ab066161821106485dbd8d44931b2eb357cd6145adbcd3d65 WHIRLPOOL 854e7392ad61062e62b95f7802de321b2becc6f4ff69c707cd1bf16ac889621b04ba974d795808a3e0deb2a0921eb2fd427b96d64c070f0be6211193e726b237
+DIST rus.traineddata-3.04.00 16152507 SHA256 1800dcaf043e95007269f07168a12258cd8b87bf413769c2b5a3d5451e45cab4 SHA512 e5053d8b53a676d800f490276172f16f2754e009408164958ad2f61071906042c299b23fdd3dde4a10026e42b19d03f8a8ab7de2fc29d8b9843d30de5c36a335 WHIRLPOOL a2d14ba6ab87b681bb95d60527677268ec7ffeaac59fd6a240fdce023fc5e2f2377f3250a7a393c14221f43f8c3ea7e7a93dc83b9fec3e7bd37d1fcb0a53f658
+DIST rus.traineddata-4.00 28115168 SHA256 fdb9b7abbc417661b54ee7c4b5ee01a7a95e828aec3bd8bd912de4433fe18c40 SHA512 4a4524a4759b52e7936518c37aa3e60032537a5a2e11fc8ad5e48bf92a2f8efc54cab3962db5e980b9d894dcbf791ad796c55b875eb95b7f03444eb75c1cedee WHIRLPOOL ada91f2d6700b39f993a84751f10bf336bfb359c88897ea83d86481f4acd203ad21e9ffcd6bb2def86f94e8f08704cf0cd392fa563ebcbf046feacbb0050a037
+DIST san.traineddata-4.00 44276691 SHA256 8d112844481d48ee3252cc053b959e81592670ffaa3333efb8b7ebda403845a5 SHA512 97c266b3dd7b557575004d432ed7ea09ee44cf168d8f00a0dc544ebcc4df736c175a88f9c0b45a600d99eb7b3616bd2ceb96ebd2eae67b43f9d38bc35736d006 WHIRLPOOL 7793fa1b6d3c856d37380daa2e9413f30f8d23da7bdf9be0a2dba1425f7126f9fa7764142d20ba441ec75066d11f329659c450239b177f730ea485af96ce69a4
+DIST sin.traineddata-4.00 13528944 SHA256 a18aeec83bed7f88f4ef38cddef2220c946f217ce0ac6229b38387d997b05b2e SHA512 1dc149d2c9e1c394d2945a6c41a9885ba05a82b6b629f87157d8439932066fa54b5316aba0430c4f861703a8aabc3cacc1577992d68869a988b11d4b93c71140 WHIRLPOOL ce7a2a2b8e6a5ebfdbb3cf06f96d8b8ba955cc6231ffb575adf1cc98984ccfaefb7a112aa3613087a161df08894977262aeb9a220f17975c6e8ce7ac3d13a905
+DIST slk.traineddata-3.04.00 9126966 SHA256 ba5d2aba09f59e1952583825dd7b0eb9ba706283d1c0f93be8d7381b5e5eae2f SHA512 33fbb9ee9881eb68b1e75cf9c7cacc31f306bb4371139894271e34e201740325ea26fb9622e4cf980a6c3a162568927a4085c5f63d483146fa2b2fe3d4b85a96 WHIRLPOOL 133a028dbea660377922a7df3690b3218b1e68735c6b9a19b2eb5d6e142a5d50e1a24d245f81a593c7baf14e7ac76536dd0c218033ef2e4e72f620a5f67b9a6f
+DIST slk.traineddata-4.00 19335882 SHA256 46536c109d17dd93839b77f0c0031e784956c96d2ef5b0765bcd0a431df1d9a0 SHA512 f72db1f57ffab113424d872ad97f8b1381c2be1ad2b8f09f6b4a5a75eb59d5f53e3319160b451fd6313ee8cb0606afd089f4051580d4af4dfa7706814d89bf7b WHIRLPOOL 4853be3476697b94a1e5d4ea6ca900a3d381023a5ca92a29c9b2cea8c65b9ea78bd509baf125ad2c1896114ddc4cc79df15a79ae92fb709cb0e968424a74da2b
+DIST slk_frak.traineddata-3.04.00 845250 SHA256 1e7f1e59ead24a136dc0626e98019594a042e62087bfcf8f0fddb3e283b5d87f SHA512 89b794f06772982ec63e317e95ba1c6b611881b8363b645ebfbb4e7c29f914545162401d4766d1b3247ada6df1fa1d7cc02ea539a746fd6839c45124e9e68ae5 WHIRLPOOL bbd770dd93a15f016ab7ae1db3e82f50ef376705097a3b5c6b2dc09c0c2514b2c44eb550f41605c27f6a1b6a226d6e20f5eb1f3922c0a6f6bcb53ee3a5b6d278
+DIST slv.traineddata-3.04.00 6824064 SHA256 305884e151a01421e847a4a30f05e9c899fcefd483a12d2ea8e0f205534d56ce SHA512 26634af8d9585f293d4af38c0bd6bd7c552edeaa59e3f2ab1e170431f40ba172ca455ede49df90a0b97b4da253b3a96394f4729f6a349361c3e954f2f59e2bbe WHIRLPOOL c765b5922c8d415f2281e9d6f6a5aee1e1717dbf779171ebd6f4dbeedbdf813361de80cf2531bc84f032c07b39b6d6098d9a5a37ec24bca8d86303955691fbab
+DIST slv.traineddata-4.00 15472904 SHA256 15fa29517d0e7696196a80c35001d20fbcef39e15100cf236ad4d2a0e6c0dc6a SHA512 975542196c706e98430e5e8fd9673d03ada91a829c0b0744bacb6fbbbe93d22f3fd36de4993766fdbb76f3902e4e7bdcf59a4b51a0c452130b3a368d0e645208 WHIRLPOOL 7fd9bce9559c74dfee93e0ed02cd91e01069e39b7c4ca87232f086923a93aa0f49e120c62ef30ca34b074e4c125168cf151f544f8503c9af3c1eee9d12b30a40
+DIST spa.traineddata-3.04.00 15953087 SHA256 f23985996bbcfe2b57864ccb082783c1c74c87429f04411a04a6ba4d3da2efda SHA512 e1356c0948c9245fecd335b1b7dd3c84c56b09210e84c5d211d9ddfb2bd3aa232c97f8e8d03f2a6639120c5196aa4222a8385da64528261c7cf137cd64b214a8 WHIRLPOOL 3be9607b1041aac3e744165e7767b32acd91e9746c7b35bb052dfb94f5a4391d19fa8da9122164c01d3f2d39224960a6ce83c431acfeb5e9c391ff1d4b816ba1
+DIST spa.traineddata-4.00 25107848 SHA256 687793a658359a9fefa78b809dc9233caa4c5f941f3fb27dc07bb5c04aef86f7 SHA512 5d009401faa71d3a8e9c4ff32dd1efc5e38c02b8c4170653ebb33874e6c489f7556c67ce6ca7cee27500496f657cf4361314563576176ff5e545b8079722bb8f WHIRLPOOL 6c2efe99d1c221f98145ceab32368f037cd67dc60eeaafdb08ad9ccfa5f02062cfcea525afe82beaafc305e5c044ec2bf883b34b9cc3b5d113997c3ee0fbb5a5
+DIST spa_old.traineddata-4.00 26019934 SHA256 6f574e9e4fe4746fefa54e058f1566fa24fbdcc7c933b4f7051b091473b25e9f SHA512 b50c9785e6962defd3c9373272581eefd476405e8b0f20d4f692a99137af01319ec92af0c51207d724d4f83852c789c2f5109cc6f47a1a79080d5024926ffc7c WHIRLPOOL 96f87b3a4e1318711d2101f2e9a2233ab6ef1925deae7ba1d97e9dcd7164d394e3ad8e79a4b0ef30d8b3eb33cfb2367d48c409a102045cf75a2b963b90bead53
+DIST sqi.traineddata-4.00 14827880 SHA256 f3c48a78c94a1d6bd860be96dacded344719f118be5e301c13f55f15aa2be838 SHA512 56a2e2486f05498f6fd136f27406eafc218e2c9328274c60c4bacc5f51289d3b99810c305da76e5ab3ded05ac1c33bc822b367394bb030dc7f2f6bda3092a4fa WHIRLPOOL c5973031b484585e4c40554086ebdc85824d6f0af5de4a59abaa287835fa6bbca8a8b031e32f705f157c7d3c3143bc3cf76504d7416496fd98e83aec60c9f496
+DIST srp.traineddata-3.04.00 4611681 SHA256 35bfeb3ce14f5afeb82c9be2490db34178c0e13f7de8061013a083b163c67415 SHA512 41925f957f9b30617746072216dbfb642d55caebdf95f8c322fbc78cf6040b85ed3bb91e81c3114830504189fb8e9f33a3150878a571ce714345e9d87263ac2a WHIRLPOOL 5a10a60970f8bfd5dd5245b2da20861d4b1107d31f1c81531cd7f77030015e75dfa820c3fd4e824865a2f89e8f5254137ff533b7c80e00a27cc3d90a94aecc44
+DIST srp.traineddata-4.00 12189572 SHA256 b06de5ae5cb8745b0e00d363ecd36f8857da82f1e33cfa6f23d22815b53fea97 SHA512 69f7703d48cc3e6cd1d2d40d1012ead58a3905beba6787cf0276c0268d142f64bc7116ab43c6339eb8704ebb293ec25c2041093b4eca8cc76d64cf432a95f26d WHIRLPOOL 3195cb4c361701fa66fc1780c5714a5dd62458c51e96b645e367e2574f9a3f60192800c9f3e1ee364d4340ae5d487d6b99bc0886b0e1318cd6709c130933dbc3
+DIST srp_latn.traineddata-4.00 14395288 SHA256 79df402b9b6d51b5f4bc88f9a5744a52d0a6b63ff2d56f9cc9e0ec761de944bf SHA512 65644d3f7e01cc77038a438d438707f48f5dda1827f729e793fc478a997afe84388d51993e18b31833f5b1a3f37b183112ec1459bdc3184ccce3f6dd361c232b WHIRLPOOL 807d8cd84af888272d49d93f80e5af7938ba41163ef9a70dc86e80382c734ab3c599eaad0680ab0d69c23e0ad071de42a031c2885ed164fba74b7a7fd7b4c6f0
+DIST swa.traineddata-4.00 10931654 SHA256 c944c1def83e56d24704f87eac50720735e83c444aef0ea6edfa90640bacb75e SHA512 bb865197fe1558ea8b63a83d68906a7f2a12aadcdba2904f1f01f15db4576e96d942b8a2c684ee3a049f2cdc3997b9e6ca49faf531b1d885abe7228a50af2d2b WHIRLPOOL cd195ff88f0ab72049d0da9361fe072c0b9f99a3fbc88ab045aa19f15444536d9d285155cf1e464872a3aec218281e3e2dfcb0765408b1b5b92e9019d5d0c090
+DIST swe.traineddata-3.04.00 9460295 SHA256 2a6407bbf187eb1fcfd1633fae9abffcd6220e7ab74e05e65bf16426ac8f2050 SHA512 d69c916daa5946d11129e5401f0b8d9b8965df7fa2223e78c8e607e2bcc102a91c875a86e6a737612b61823ebd7f331c3d4c5db28ee35d1fb830beb9414bd167 WHIRLPOOL c95f12b64b1563d195b38cd8ad169f91e7608ba72c2e93fb49aebd7ec6bd065431b8ee892621cdd7d01922b99e71f52d1f1e5023b3af682eb2125419f0d529cd
+DIST swe.traineddata-4.00 19062525 SHA256 f292c86c4388c08a0ec862f81e5b08619164cc765821008b530cfaa357aff4fb SHA512 634c75641d27026afa84e4179889673bcc1dd6eb56459894612e0148a3e70862c82e5e92832ea83e066c128cb5646eec90a0b36f3cb4c789128b43cc27117450 WHIRLPOOL 3bb944fa51e0504ddcdf70fb7cec120eee71f48180d586e350a605a0cfffeb2bb255cc266de04d133f61bea61cd488a381537ea21328771541d798bf745e49de
+DIST syr.traineddata-4.00 8056121 SHA256 d7be312ddbf720ea29380d5dbaa0427ae027de507e178e671f7232cc7ae8a0bf SHA512 c79acc0bde79d7f38b5ddd34683615886d7c284040273849e4b31dd988c4c0ac1617c0f6ef9d246b47eaade5ad5fdfdc4bf99dbb29e2d33c3827927135ea6f06 WHIRLPOOL adc125d0323fc99a51be568eb75d77891a7e84b377091dabdec816642b1fc7a5c2e14f256a1ccb81994c633824adf3ee3a258a17747472f8ae30993e37e2ce65
+DIST tam.traineddata-4.00 17333471 SHA256 ba8dc53bd987e4bdfacc37f46e6b0c8f7aea9c000d142ebda40f9f27c3aa2a48 SHA512 9ad90eb8c291712e4cd874d41ed9bcd4169427a50509a353f5549382909458b46a7e4a092dec0d475c548e681426a81597c577f2f821978405a94f965fd4d05f WHIRLPOOL dd3b1489d6c8758b7a36cc4d5d85f61f10643f2b3ffef63a3ae380a1b9314de9490304a27a04c92780ea90eac9f6fbb9845f3a0760df0c715864372dc1f958f0
+DIST tel.traineddata-4.00 54446537 SHA256 9db74228a36fcdbcde54e6e6118c0998b2fb73ed84c9e42b52062009c5becd66 SHA512 5e5c2ca84f095ec4dd3184d6cb75702482c699b5cd04f8750ab8958f578f7b24cf3253a83d19a4a1f3716466b95a81737d473339e3593538e46372c4588febb6 WHIRLPOOL 1eb738325fd5610ae3a71791a998aed4f901e03eac629547a5d627f7173dbf3b268732e08a7a64fd4147773bbfc56f560b5f02f32bd3adb16166e6cd8d85e794
+DIST tesseract-3.04.01.tar.gz 2269105 SHA256 57f63e1b14ae04c3932a2683e4be4954a2849e17edd638ffe91bc5a2156adc6a SHA512 816f6c29f8efeaf157891ddb022bd0daf8eb27c0cb8b6df5542e745d209f0ce617245e4583c59a561ed3216044d3afb38f8620ee94cdea656364923dcb140b5b WHIRLPOOL 995502084484d172becdfdaa38888cd21f0fe2b8845fe4a64726f9fbcd35310d64153be6325016dd50ca37b95069112b63d4f0528bd989a58c3b88dc6c6a6813
+DIST tesseract-3.05.00.tar.gz 3581853 SHA256 3fe83e06d0f73b39f6e92ed9fc7ccba3ef734877b76aa5ddaaa778fac095d996 SHA512 54ba96bd1b0d19883e8a0f717ecfddd459945f9dda0fd340e29e2dab3af94d0eceb7f3d207f34685ee97d1ec763efac5d94dec7e0498a7ca85fec35da4ed76b1 WHIRLPOOL 33622256479395eb12c72e4d3187eecf23fe4557f4fcaecf9b5f1ba3aeab67e333b0d979812525f3a1504102764bc572a79f8e64c794be805004e5fec5cdef5b
+DIST tesseract-3.05.01.tar.gz 3574810 SHA256 05898f93c5d057fada49b9a116fc86ad9310ff1726a0f499c3e5211b3af47ec1 SHA512 a49c20c98386684cd89582e57b772811204fad8e5ff18214fb0da109f73629c70845054985e31e8deeb49107fbcf56e546aff661f08eb5dd60fbf83dbe976e81 WHIRLPOOL b104dcf66976dfb25c389682572c13cb3827c9bd07d82502539b6cc7db3aac56579d82afeb6db185677cb3f9aa8819c63c780792b46b1b58fbdb775841d4026c
+DIST tesseract-4.00.00_alpha.tar.gz 3706567 SHA256 ada7db147970317eed8223bb72702359ac53ad570e135f7f6824f40c41ea6791 SHA512 282ec941233ceb80fe1008e585a6069fe8ecd6bf2dd1d0f56e2e79b772a0b83bca918d5da892a6cab194a7828607e41a7fd873acec33181b8b86c3c37e434103 WHIRLPOOL ae27cd45ce680c71785c36bd4d5414efc5b07baa483094fd33ee7bd886b55e21a4034ddaa5d55a265cf23983ba21dc98c5e2e2148178e4fabd2c69e1a9326c9e
+DIST tesseract-ocr-3.02.02-doc-html.tar.gz 10635901 SHA256 e7ffd3082005345a682268740140bfdde73461528d6f2da019fef29539477a7b SHA512 4cca5974635ed9c1656a00735bf682ed1eca5cb9a3641a0d063f66ffbdf9dcbc0476628a5b5c48684bd23f5616412e71e9cec608ac979760010c1ee91764290f WHIRLPOOL e84ceb57cbc7065b37424a2d53ce7ecea39f45856efe76610840296f20869742674b8b248b205ba293b7c729f85ff7938defce930409efa907af2d4309ca0a6b
+DIST tgk.traineddata-4.00 6555909 SHA256 70a4f0e2b81591fb37687e7a33ee94a8f8591b788c2903267fc43f90662e843a SHA512 abc5f2c4ac91b17a250f2f4847c9528a7673d51230415b7a069dc7243e2c210564400d34d5c38da6b727c8c24af26cbde3e7ef8a9674fa1605da001b4b1b60bb WHIRLPOOL 4d53fa690f81ff1115d0d2aaf3c906d21d4f30b5b2b37932f25e3f6e6c7a5a9920098d66019f5ad70b6bd11e9ed33ce9599de22bb7f7545cf5f5909f516847d9
+DIST tgl.traineddata-3.04.00 4114554 SHA256 e794af607426269bb32eedb2f20706e278fbb00e4a75c43dc4a7b8c8e2033938 SHA512 8c205fd0d4b2fc774e5b6a19cb56dcdb91b7d001acd881e34363e437d5eeae8615b853ae09f93c4957328d3a423300b9a20a443ca971a14ede1867de6194a2bb WHIRLPOOL 767dfce0bb3937d2c7beee8ad454296386383644532de1886df34aa33b3bcc3a70de06dd2d2b336b5efa6fda940970ae091478bad8d64a422a925ee1711ffa91
+DIST tgl.traineddata-4.00 11991699 SHA256 1902088273eabff7ee97f48ee57f2c5e4400ddf4d0b1986ed53b4c2b081ee25d SHA512 fda51303a8963432fa541510287aec32ea9ee7342e0ca7dfba4f40c5d352aec74bf7982bc469e12196d51a8906dd224df01aead0d14859102267e7ffd19f0380 WHIRLPOOL 2487e5c1e446c9d630ea8127491a8e5b122bac96a1d865f4c2916ff5aec57d4493bdc51738139135a566afcd467287ef761643d5c5d0826abc0d94a33dafe686
+DIST tha.traineddata-3.04.00 13565168 SHA256 ca4a42d4481bd0377cd02731b5149c228bf73e8b7a61e44b9a2d5e274be150f8 SHA512 1f8750ee148a6dc5677441bdf8b41d09594b591c34c7fc0af1923a89acf9db76f12ab3ed136819b6900b70ff393fd586054fd383a427ca70b4cf9aecb6db029a WHIRLPOOL 07f937618a058313b90a6e1640c37731fbcc9167afba33d9926d57064b9748c4dfec467a240cf74a92a69a1bdb0694c93dc6d18fab8ca99ea3a9228ca184f658
+DIST tha.traineddata-4.00 22477903 SHA256 8497a3bc45289dc5fa0d5d2578ded745b71864e196deb8d5ac9a3dada259c120 SHA512 b4349650ca1f2a5317cd2691a9fa97afde1c22872147829a71b0c49cdffe7b8a732c9aafcb87fe12431e0bc897a82e48204e5d2369e8441a654aa3baa4d41096 WHIRLPOOL 8b756fcf40ba03e53a92c4ca19433ce45c6c0f27c1ff2f2f7560ffb8be608a0121b493bb577b85215255c21fb9136f2a35aa1d15779231a505cd5d5239730576
+DIST tur.traineddata-3.04.00 14069931 SHA256 5cbcce5efb66b3da10a14397fbc3a88d8457b9f1b724b9c8d96449b152c21677 SHA512 822b51bf9836f0d2b5923fc8ea14690a16d6e1831dc8828d0aad7cb4bda2bcec06ba7cdc79187d48b93e3541dfd46f1f50dc44dae504af9dd7a788052a05b51e WHIRLPOOL 6fd2d777c4ca4a5a89db44fb663b80e8540eb3fd4b26e75825b35f49f24f389f7bf2ff91e88f8b2d35cf0969ff7437e37cbf813384d16c94da2b59088a4a364f
+DIST tur.traineddata-4.00 26503738 SHA256 34e3b573b8a0bfef2ca7a0a14216e33f05dadd5078848d37a1e50a7a896acc6a SHA512 03b58b9757a975a2b6101ce62cf12a13ae1b167bb3f8c8fb9384802ae6427af5f2182600972412c942d706a37b624ea49cd7ef3bab7244e7dd7bd765e011a558 WHIRLPOOL 733b4a0960ee7d87aa2029fef3df2119938f6ac450b3668ff8d9df2a3f6a123e1b4daf21abe0efdbedaa9af69355f736b7b9145fb0d5b46152a388e78ab78849
+DIST uig.traineddata-4.00 7657636 SHA256 5844a53300a20ef3000ac3c7a933d398c2b20563c07e80309a1d62f63a89926d SHA512 fc53338b875bd8d104f196e59b66e070fd789d8a58c54f04cf5b788bb83b4b83c5c9b6f1b1f468619358e833e436e1bd64c2b6b52e8499f5cd6189ebbdee3ddd WHIRLPOOL 4e8ca0dfa96b0d00c7529cb6e7bf8ee0ee3aea23a644e1f2ba54af7e514969b6cddb2cd6e8b57d8af5bb7a9b39e2ae552e5a99d34eb98a8e2905b16ca4cdba79
+DIST ukr.traineddata-3.04.00 8043189 SHA256 2f8b2cd0f0b5b8612a4b80abcebaa3ac46f5f0368926629b3cff576b9d95bc31 SHA512 16117151debf90d79eb9f84c0b215b1d9d72d5b61bbf0004330b34b1502388f7d81051ce5ce296720dd10f53ba08f1e15cebaf4030330b5a071810612f78e0ef WHIRLPOOL 763229993a81d379d6a9d0384ddde95feac95c9e3442a27b94bc3e574235df88dfcd50638c39cba49f966de5f7605aaf884dcc5199715755a4e858be490948e5
+DIST ukr.traineddata-4.00 17775376 SHA256 5ac765c0f9c7c8eccc04acdd0dad76db8b554d5d1f127d8cb8786381a256900f SHA512 26f02bd7d4c392beb3ec174041685d6eed0b6a2f0d7102d6dea271e94bfc8bbbbcb4d74bb34e72357cb3de7bd72f7e5da2d7fa576b98374f9a0938b2b52c9c81 WHIRLPOOL 0f62c92091c056447ad1c2c87d3cc3f8f0b4788dc4868b1b0068333a5b03121a8fcebe8fdcd78141c2818757a1dba1fb7284e16776764c77619b464132f5f8e4
+DIST uzb.traineddata-4.00 12505562 SHA256 5a597c227033a9f33ecb08b4b7763a72e0adee5a1323e08de3f04ec4e5aa3b85 SHA512 dd7579e62d5564d22945447d471bc288abceab99b21e224ec9adafc20899cf708e7fecc5c2c0133171f6a6841d56c04743a0b7762ee021e6b5d5f678e4cdc05c WHIRLPOOL a36bee1c4c92d2a38e7f6637b44c42a1c1a5884738c73fe228416071340e267cf40d17cf00cf8910cdd909cf087daba4345be0e6d9012a5402b96651bc75b473
+DIST uzb_cyrl.traineddata-4.00 10390622 SHA256 7531d9642da84766def415263017476eebfef9ec35de9da3c60f5e1142576876 SHA512 d2e82371312bdeb3e4db73bb74270553165df2f4d2b62ae7de474286c8c02e27f7c5401c3857c60d0d1de3d02b9106e396de7cfa167b82bb8a874101498be0e7 WHIRLPOOL bcfa633ea30c10fff8e3a3fbdb5c2c64612024e20ad55bc03ecf37b4f2e7153b358d0a5724eedc166b9d661a2bc3f295f536490b75146d6458fc81f3b261789a
+DIST vie.traineddata-3.04.00 6096118 SHA256 cef5e63747c86e21bcbbd30bb683a1b104f98293b74b2a89174870d5bb4441c9 SHA512 51087e2141051906a1815798175ff8b9f214ae36c7d87cb60999489ccc684307ea7ef65c5ae4024f95c51b89084ab9f0e8dde0a4d480eaf78dceebfba87350cf WHIRLPOOL abe4f4633dcc9f98c2f0e6da01a4ed419dcf0a8b1261fe528bd147e2f52498cb424e3effea68dfe826d52b55c50ae35350a861138269012232ef83caf234ad89
+DIST vie.traineddata-4.00 12209616 SHA256 3a1b8db4487c1c8c49db7733a569d0cadff3aa7ada20984870e23aedc865d391 SHA512 6f73647d8fc4df104eb8a8b9444bb46e0ee7560dfff3c33055a791a17a9ffb78a857dac2aa0219c628469eea636f89eb1551151fd79d7ac8c2d4a09c68765560 WHIRLPOOL 642db83b34e74de086064222a9c8871ccbc501a6ed616df2942de90895c15b007c76ba2c6ba74125b042a897c5c875393d4da1772900f8d9fdada0152a7eca76
+EBUILD tesseract-3.04.01-r1.ebuild 5840 SHA256 3810b1ba3615ff1045f132c0db24ce8f7f725a355e0fcfaa7051dd8621a06231 SHA512 3efdd691009be9654e4a08ae71bd06c66fc73464c75d0700ee9d7c1a7eb2e23c7c28959ada858f57a6cac4b86f8d175252bfa4cd78d8b9e550eb6c1a487a595e WHIRLPOOL 6b636bfe6263dc4ddd1d6458458f35f18f053f28d86269418c21979bcdd3c1ef0ed3e70aafa1719bfa251d391dbfb35be6b5110f2c19bd8268df71d7fb7e539b
+EBUILD tesseract-3.04.01.ebuild 6015 SHA256 e2a3906e42d6ab7bd19ad1f845040057dd9b0e2b035d914a376f32d2537753dd SHA512 594137b725f56ed51edc35ebd82521e31c0e2e12c85fc52e9394be2005653c64dd66a1bf45437d7b26e4b1eab2c4320814541529f23c4800631c9c3f541d8e5a WHIRLPOOL 2b5a6996fbf3cc02ea0bedfd73f332907def0c68fb3916cc6e282b7efeddc2d1c3825cd3a76f4db5992ff9629263bf751dbc7bd33db14a78648bdb7020e2f45f
+EBUILD tesseract-3.05.00.ebuild 5862 SHA256 24ff684850a333d05b85acc6c6d4e3af4ca2bc933e8e83039a8e9ec28761cfaf SHA512 8b26500aa7384bf7d215dafbebc69088ee6108d646353a99ef821594cc357a8e4b845ebb7c4d12ac562516bd56befe3440e9d645997884da82e1d7fb4deb50b6 WHIRLPOOL 24f2ece81b6fcb39ff74e872915cfce208d8cad80a8b49d6f9cf68033e315a4f8c511d6dfde1c853e37ce079f9a3df2ea26dadda22982126aa07a815acead2c8
+EBUILD tesseract-3.05.01.ebuild 5844 SHA256 34363aab1e5e55149dd8bdfa2708638e236b0cee5f494bf2958b85183703d094 SHA512 6119b0e3c47e331a6a572e5ebb04ce9efbf811dec3944fc1db0d40829a44e7ccb160baa855f0dbc1179c0f15c1a50b26a1886ee6cc5aae0573362ebdacf01d2c WHIRLPOOL 2784484dfcf2abccf7d6bf3c13d93e5238712c8f322e34c48aa413e87c68c5b9c638aaaa97aa713ba8f0fa96ebf59d18b894c1fd49357e04be851b2cdbddddeb
+EBUILD tesseract-4.00.00_alpha.ebuild 4167 SHA256 789d1d98bc6d102c4ecff66ff19dbc8a82d9dc0fb6d37cb1ce05de672946da88 SHA512 1fbd99257210baee6791dc8fc4b3faa39b86bcbf786ed9c1a4da521c7b5b4a0c48a9c74596d589fcbe07767cd104490ef1b5c72beaa7226bdcfac373f30eed03 WHIRLPOOL 5430d605a83f09dea550381527263064bfda7970b3d180bdd2aae89f3f30007a6d318fce777e2f339ca206a791b835839b2a00e0ce05f7c65922e9e8a61a6d32
+EBUILD tesseract-9999.ebuild 3975 SHA256 228b858cc97323f0b572f2fd110ce80e6fc11d5e73a041fc78b637df379c43a3 SHA512 f1c5f75693a6eaff06a193113266020cde1bdbba7ba291ae7e6aad94fd7a94401fa03ac3f8ea2fdcd27417438045fac83a242027fb34ae836d6bfb0e77ad1f13 WHIRLPOOL 32f0ce945ffc0507abcf731d60d924895436af5d59f8e6290c29687623fe588fa83c20a9636b9613c18ea843ec6a11cbe0f9461774334d5321f516215329d319
+MISC ChangeLog 8122 SHA256 cebd38913ffb7d684050cec2a48d7e1d6e06b9c0626b7d43befa6617484a61f5 SHA512 0fa73baf87079d7a78318666d19207715b20256ea04e7b29d400f1acb8fa0cb1077006b8fba1d60b4524fa7adc35e2abf3bc13ad56f5c160dcf76b5010deda3c WHIRLPOOL 848855be547044a0db19fe0994e2c1c87e9b864ba176182efbdcd7602195253fa5867e3fb87ccc89525626b8fa0652e1ced57c17aff8860396ead7c5bec3df38
+MISC ChangeLog-2015 9372 SHA256 0e3db28103b0954119c44be961dfb06f8a62d29f67f6e314f05ceb30aa8c0033 SHA512 bf33c8ca4355633528881d07197ec3fcfda79a9e6f7823edb4f41ba2eeef7ba76c065030bc2d5e347af3fd96d2b6522037a4174ca09f38129ad3c878d544be8d WHIRLPOOL 41c75f4a74b577dbe5c4a187ec3abe959ef0b42d5d7f95c5c3dc51bc91885db0bb3ca1f5e4f1aad5bc96d53f656929e8bcbc6d8011ece93e876d3625924b7513
+MISC metadata.xml 1271 SHA256 aa8efd92a124419f1e0a16dd9ca23794bf16ee7801ef9b2918e2023fb8481292 SHA512 7ea459bc822290be824fc07b7abe26e13ad537e932b5cf71925e654f191fdee4d8681fabdd9a7fb246e87a9a365a8c0d6f933e34217aff24eb8bf3d741369656 WHIRLPOOL 518442d23b541e9543f9e3d5c8d7b7944cc73789306497988ca76288aeb1c26b2baabc1cacc6d86b51213cbd4f3b20d88e33f032e909c159fba1824fdf35cd30
diff --git a/app-text/tesseract/files/tesseract-2.04-gcc47.patch b/app-text/tesseract/files/tesseract-2.04-gcc47.patch
new file mode 100644
index 000000000000..afc560a8dc4a
--- /dev/null
+++ b/app-text/tesseract/files/tesseract-2.04-gcc47.patch
@@ -0,0 +1,10 @@
+--- ./viewer/svutil.cpp.ori	2012-04-28 01:59:58.441072997 +0200
++++ ./viewer/svutil.cpp	2012-04-28 02:00:35.085467955 +0200
+@@ -37,6 +37,7 @@
+ #include <signal.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <unistd.h>
+ #include <netdb.h>
+ #include <sys/socket.h>
+ #ifdef __linux__
diff --git a/app-text/tesseract/files/tesseract-3.04.01-fix-opencl-ldflags.patch b/app-text/tesseract/files/tesseract-3.04.01-fix-opencl-ldflags.patch
new file mode 100644
index 000000000000..b1b2b63fb539
--- /dev/null
+++ b/app-text/tesseract/files/tesseract-3.04.01-fix-opencl-ldflags.patch
@@ -0,0 +1,11 @@
+--- tesseract-3.04.01/configure.ac.orig	2016-08-11 10:50:28.853292674 +0200
++++ tesseract-3.04.01/configure.ac	2016-08-11 11:06:32.919076995 +0200
+@@ -248,7 +248,7 @@
+         fi
+         AC_SUBST([AM_CPPFLAGS], [-DUSE_OPENCL])
+         OPENCL_CPPFLAGS="-I${OPENCL_INC}"
+-        OPENCL_LDFLAGS="-l${OPENCL_LIBS}"
++        OPENCL_LDFLAGS="${OPENCL_LIBS}"
+     fi
+     ;;
+ esac
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-libtiff.patch b/app-text/tesseract/files/tesseract-3.05.00-libtiff.patch
new file mode 100644
index 000000000000..5771739c3445
--- /dev/null
+++ b/app-text/tesseract/files/tesseract-3.05.00-libtiff.patch
@@ -0,0 +1,25 @@
+From 9ec0c4fa9c9836d414c02662a6f94f48815d61b2 Mon Sep 17 00:00:00 2001
+From: Stefan Weil <sw@weilnetz.de>
+Date: Tue, 13 Dec 2016 13:28:29 +0100
+Subject: [PATCH] api: Add missing dependency on libtiff
+
+It is needed because of a direct call to TIFFSetWarningHandler.
+
+Signed-off-by: Stefan Weil <sw@weilnetz.de>
+---
+ api/Makefile.am | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/api/Makefile.am b/api/Makefile.am
+index 76a8ed4..25e7f21 100644
+--- a/api/Makefile.am
++++ b/api/Makefile.am
+@@ -90,6 +90,8 @@ tesseract_LDFLAGS = $(OPENCL_LDFLAGS)
+ 
+ tesseract_LDADD += $(OPENMP_CXXFLAGS)
+ 
++tesseract_LDADD += -ltiff
++
+ if T_WIN
+ tesseract_LDADD += -lws2_32
+ libtesseract_la_LDFLAGS += -no-undefined -Wl,--as-needed -lws2_32
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.04.01-r1.ebuild b/app-text/tesseract/tesseract-3.04.01-r1.ebuild
new file mode 100644
index 000000000000..d7d23a447a0a
--- /dev/null
+++ b/app-text/tesseract/tesseract-3.04.01-r1.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2017 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 ~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 ReleaseNotes )
+
+PATCHES=(
+	"${FILESDIR}/${P}-use-system-piccolo2d.patch"
+	"${FILESDIR}/${P}-fix-opencl-ldflags.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-3.04.01.ebuild b/app-text/tesseract/tesseract-3.04.01.ebuild
new file mode 100644
index 000000000000..6852fc486ef1
--- /dev/null
+++ b/app-text/tesseract/tesseract-3.04.01.ebuild
@@ -0,0 +1,153 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+MY_PN="tesseract-ocr"
+LANGPACKV="3.04.00"
+URI_PREFIX="https://github.com/${MY_PN}/tessdata/raw/${LANGPACKV}/"
+JAVA_PKG_OPT_USE="scrollview"
+
+inherit eutils autotools java-pkg-opt-2
+
+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}
+	doc? ( https://tesseract-ocr.googlecode.com/files/tesseract-ocr-3.02.02-doc-html.tar.gz )
+	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 ~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}
+	scrollview? ( >=virtual/jdk-1.7 )"
+
+RDEPEND="${CDEPEND}
+	scrollview? ( >=virtual/jre-1.7 )"
+
+DOCS=( AUTHORS ChangeLog NEWS README.md ReleaseNotes )
+
+PATCHES=(
+	"${FILESDIR}/tesseract-2.04-gcc47.patch"
+	"${FILESDIR}/${P}-use-system-piccolo2d.patch"
+	"${FILESDIR}/${P}-fix-opencl-ldflags.patch"
+)
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	use doc && unpack tesseract-ocr-3.02.02-doc-html.tar.gz
+	for file in ${A}; do
+		if [[ "${file}" == *traineddata* ]]; then
+			cp "${DISTDIR}/${file}" "${S}/tessdata/${file%-*}" || die
+		fi
+	done
+}
+
+src_prepare() {
+	epatch "${PATCHES[@]}"
+	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 scrollview && emake ScrollView.jar JAVAC="javac $(java-pkg_javac-args)"
+	use training && emake training
+}
+
+src_install() {
+	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
+
+	if use doc; then
+		dohtml -r "${WORKDIR}/${MY_PN}"/doc/html/*
+	fi
+
+	insinto /usr/share/tessdata
+	doins tessdata/*traineddata* # language files
+	use scrollview && doins java/ScrollView.jar # scrollview
+}
diff --git a/app-text/tesseract/tesseract-3.05.00.ebuild b/app-text/tesseract/tesseract-3.05.00.ebuild
new file mode 100644
index 000000000000..7b1c14b4f5b0
--- /dev/null
+++ b/app-text/tesseract/tesseract-3.05.00.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2017 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 ~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}/${P}-libtiff.patch"
+	"${FILESDIR}/${P}-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-3.05.01.ebuild b/app-text/tesseract/tesseract-3.05.01.ebuild
new file mode 100644
index 000000000000..b5bbdc949294
--- /dev/null
+++ b/app-text/tesseract/tesseract-3.05.01.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2017 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/Manifest b/app-text/texi2html/Manifest
new file mode 100644
index 000000000000..221c15c2e415
--- /dev/null
+++ b/app-text/texi2html/Manifest
@@ -0,0 +1,5 @@
+DIST texi2html-5.0.tar.bz2 15397249 SHA256 e8a98b0ee20c495a6ab894398a065ef580272dbd5a15b1b19e8bd1bc89d9f9fa SHA512 50afc2f1f8875d3e62a51cc0339bd4c4f058041f42a9fda9cd5b02960f0d5c72838e4f010702ba716dbd256946f64520ce1e5b86539b6f7b8b7ce24a43c98e9d WHIRLPOOL d881c31767c5dd26c283910a570ab880fb10f5d11549682056da7a61a22b1a1aa12a9f17a6695124516f57b8952104d9f127e69268f529ed547c2dedc32569be
+EBUILD texi2html-5.0-r1.ebuild 1235 SHA256 9404db942bd412a89248eb3f78c81f1bac09071b1bd246c4375d0b89aad35bb6 SHA512 f5f6afb4908598d1492fef3217d59903f18fbc47ef803f1a4ed4e5cd89cccf67a035d7908e0f2ba41e4b016db21d5b9297d172b7e6d1c75e3759816cdfe445ae WHIRLPOOL 7b1457f431d5a637faea63fc94ed4518bec7567852298679b0110884ff637f3395f54400ae0176e702463ce025ba5b242278bf4dd0e289e2e37efa821f299d23
+MISC ChangeLog 2435 SHA256 f11357c8f5b954816bbc6fe465992594f5c8c6f8e726b891e76e7b1babff839f SHA512 1dc61944ac65cb028bca0c51988cb5474e681ffee79a9e3f00d4eb3936e3d0d0e1102524f41cf0d1654cd65d5b371d576cfef2a0fd9c0046467edf691e68503e WHIRLPOOL af10521012a098a4cb2c6425897ecfdad73fe9860166f8e4bc6fd231a34a8002b701e2859506419a13e459a9a9d7a35f75be73164c6164be42358f2003ea59b5
+MISC ChangeLog-2015 8272 SHA256 0e3097fb0b7ae4807d386afda869516333750218f7bc203585d9d98be667759a SHA512 8b6323047ab68cf99d606eba02887519e50501294cb17988116bd4069714cb7e31f30bae18ad0b9f5d3a0c600407bc5de6022a726367a13f0044846e0afaea1e WHIRLPOOL 34abe10aeea60d02214ae1360bac749c5cef992ea56e52da14b437cd8c624a7360f7616e7a248fd4216101aa0c158dd6d30f288bf13dc946be51399bb7c5b885
+MISC metadata.xml 245 SHA256 b3de478821488be2cdc91b078e21c911dc384af882c5c44631a47dfa91516dc8 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690 WHIRLPOOL 701a78fc2214f5fd4bd781477f85e87e716b8d76ea831a0fa4afc8871c4286cc363679f1ff4f844555ad4f77cc7265208b83e805f56c22fc4baeed1062280c08
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..f7e01f45b706
--- /dev/null
+++ b/app-text/texi2html/texi2html-5.0-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+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
+}
+
+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-core/Manifest b/app-text/texlive-core/Manifest
new file mode 100644
index 000000000000..e42d30baf16b
--- /dev/null
+++ b/app-text/texlive-core/Manifest
@@ -0,0 +1,790 @@
+AUX texmf-update2010 5163 SHA256 b19566f0c8032a7f24ee0ead26d627e306ee360aa8a5948a1256bc2760f89856 SHA512 e89bb321b438a70c23db587ac092cb8a98c783157c42bf1df80dce00e10c58741b5a6c685a3ee5511b61f4a2a98b833faf3d6d8f8dc24ab2e4a4342875d8454c WHIRLPOOL c62b97abaadf95b1452851ac88a7575001ca09f4e26f8e582f6fffde0b90c5fdafc0d78f3ec030152bd34a7cec44e5ae2ad2bab46d978dabb90a69d4b6f95b41
+DIST texlive-20120701-source.tar.xz 131904044 SHA256 9666617d5dac3e82578e696835cc9f251ee0a56d162d86dff08659ac5dcb6c81 SHA512 0e8653aa21094e079900d17256f0768ac5514690a3725d96923d5fdc7633484d611441df1af8c674b38b9ce6a8845a9004976cd00635742dfc6837aa433caf5f WHIRLPOOL 9d570a1bd58cca8baed399ab53eb767c7c3db607c00363ce563e14dfccdd235703c538e6a651aa7f2934adf21f8477775f1547f9e7f3d957b89af644c89bcb57
+DIST texlive-20130530-source.tar.xz 179963948 SHA256 a905832e4c04dd1cb16db4bb7baacb78fbc19682bd33ac2697a3a85ce78d79d4 SHA512 4aa85273a675af2453f09777b7cb348c18add77410d72f562c6586f6814d4e7c34b6f3690e3453020654fb0a265339fcabf590d9155367d52846224499af334c WHIRLPOOL 3affaf25d3936505d971599092964b0f0e97d107d22dbac6a85ad547e1d2726a6a09c5075fecb0c6ff8c88bc1bd09d78f95902f76eb76c608f8a7bc42dd6bc33
+DIST texlive-20140525-source.tar.xz 41657688 SHA256 08bb4eb02923ac65ce1183612c6b64da185904f26a1660f5ca4f902d055795be SHA512 09169af15d806abd721e55ffc20ed684c0a7ad60783272d49fabfe9c88857c4abd15b60f30e3f5511ceda1982fdc1d33db8265f97e374bfa5b250dbb5612f8ad WHIRLPOOL fd7fffeeaf319bca5333f6d5d8d9cc6517f76ffe5b2793a73604d844cb7474d83c23826f98d4d11ea5e1a35c0f273e12b2fe6f5945f9880a9577fedad6625014
+DIST texlive-20150521-source.tar.xz 45459552 SHA256 ed9bcd7bdce899c3c27c16a8c5c3017c4f09e1d7fd097038351b72497e9d4669 SHA512 9d06bb88c489715787ce619c4c6b5e2d4251e1db8d48ae7fe2d1a253634c76bc6d7282ef9c93c77847845cae01eafb58dfb37ba3fb83a6d223f0d7fe8f5d3855 WHIRLPOOL e19e4cf9c6122e8a2e80d3ad62171591a2d53317792ce69d7b2afdd6978d397c873565d597b1457d23ba6f5b5de33750955690a92fb6c34d814c075397b67a0b
+DIST texlive-20160523-source.tar.xz 45941100 SHA256 a8b32ca47f0a403661a09e202f4567a995beb718c18d8f81ca6d76daa1da21ed SHA512 915fa2f5e2099dd385ef81033db7aafdf09558c0c200fed0748a8a42fd61f69d3eaac9decea334e30981af739dd81061a9b1d6853c7f6d00285fe0be40e26c3e WHIRLPOOL 25d27fb7a7bdb47d40ddf951394e36546b184d71f2e09adb20698bd0f960e54841ddd0313a87510cb2ef43953eb4d9d05d30b88d25d15762dd774575c88fedbe
+DIST texlive-20170524-source.tar.xz 63483372 SHA256 0161695304e941334dc0b3b5dabcf8edf46c09b7bc33eea8229b5ead7ccfb2aa SHA512 18c18940992ab94ce22e22ccd4ad798253ea14ac2ab296a10ea5e9a8da9f33989f2e2641b42b564d1d5fb53bd371da3e68726b676d706b469016ad146cd19daa WHIRLPOOL c4edaf427f0249942b36db105a65474e833735d6e9954682fe7e15ab327b26ccafb9174bf806d0b6c629b0f2a6b55e80022af291d9a2f377b82dff4fdec42d3d
+DIST texlive-core-patches-39.tar.xz 3056 SHA256 685705f1994b751df42738cb542a6ca0b4adbc013275318667c634665b8bd25b SHA512 95e7161820a648d667c2a69bd74c1d24a20670128889d1ebbec2e700b0459d84bb4d96b2d9f355e519d9efe0e126689b29225af1a184e5a06e0cb398fefc7cc3 WHIRLPOOL 24359dbca04f3e9f9c09a9afc195dd6858da2284947cbebaa770e73ef78276059f9d2e3c8a95c5005971fa64be76367a55887f1f94e423e7d0ca227d5573dc95
+DIST texlive-core-patches-48.tar.xz 3528 SHA256 521bffc6a9d3a79fe157855f6a58954b26308230ab2d4daa382f5c101e836177 SHA512 af7e3de4ab378e837a07bf5cd1e0db0bffd043273cc90b6d93484a1a4dfdee52df9846d656ab7821a2b3af82ccdc8ea6f86f35fea97a846166a9cd92e0f06021 WHIRLPOOL 5a5151960dea201cf87fada0a3e3cf297580d6a9b92ed5cc97ee49c0dd8d473798ddc858a4301b16c15dff71d1aafe663ab3017f0f391ea3aad1f0de8506ddc6
+DIST texlive-core-patches-49.tar.xz 2796 SHA256 2c17e0b8d24dd007e86ff7fbe7ef14d42f1b5287e08c133ab2c5c82cedc16709 SHA512 4faf0b9653b9a5335e4b210d15200b4118245687ff12e617f181bdece5d2b5cd827247fc72bdc304722f72d8f017804b8026300a9be18f7663749ddc82c7bb17 WHIRLPOOL 8145a9d5d4fa2713a1aaf0e51f546a20a844d1a12306d7f2b82e66ece961edafd34f9e6aebfc3f3110a23366dc1d43a13cc4fa7fc69c9f67fd300c55f7bb7b92
+DIST texlive-core-patches-50.tar.xz 4632 SHA256 417d50014d1701bb75aee0cfcae95716926fefdc7d0057c9784ba68bd1eab2e4 SHA512 f8fab7940b417b7065c9c467f7a9612e161a1a44db50a4523ee4a092ba381f7580adf1c3d75375165795dfc3f23d005028d67351815481dbdbd6edb13f376b64 WHIRLPOOL 9611be98c2fe494c1d354a23a1c1dfcaf30ca9e6f321056dbe34b99eef64dc8fbcc59428cf5ef8099584968b0b574d0e3e6acac87e37c5583e78eb87f87733b6
+DIST texlive-core-patches-52.tar.xz 3376 SHA256 294f44d6b24801206eec23a497d0b17f68ed88f8ef3d33492efd75e889db309f SHA512 fbc84217911d797373ad03e3da3bcb2277d74edf3a9fd77a5bf67bed7fb207d1cd3d9c9c7947c906ee10989fe6ceb6c263a4002a592217bce7e873db813dc367 WHIRLPOOL e249a1aa3c563beb14ebe88f93c2b144dfa6de3b7d47b502a9a7e18a8a0f39ab399925a47bd7e4406ecf2010589791fee09a71b6db48a04beadac18294cb0474
+DIST texlive-core-patches-65.tar.xz 4108 SHA256 11c3c2f70a9c1f685226c87c2d2393fd144f521899827683abefabd3ad9df5ed SHA512 71ec54cce052ed60bd0d3c836901d5b2fdc8ab6190536056d617652953009b4645896e7d22ccb9d4ebf177aaefcdca30269600e0cb16daa8d395b036c679971c WHIRLPOOL c7accba8af814c00d0534c74653e3937d322fda79ce650e6cdd7bbcea114bb4d8fb7e0438d3c5c799f7ee3f4550b13cf5e512a49859c8a97f1d0b765614bdbd5
+DIST texlive-core-patches-68.tar.xz 5140 SHA256 8aa9d8e2be9ff02a065856bb2778f7c604a476499ff7c9fdc34e0c7e3db13866 SHA512 225e7019c132b7e8185343c409cc2b6f418cb062127e916aa3b70db0c6f19d7957415056f2b526f1ea7b7ad13d4367822f34bb710f85ab7cc6bc757b21871d20 WHIRLPOOL c3ada6ff7d7d6e770c69e0ea7970dab6c858bd92dcd76e94394e5a012ff5087a7bbdfafd4f1800ac0f134365483158dac4c6419c74875936721a21a11feb89e9
+DIST texlive-module-a2ping-2012.tar.xz 31124 SHA256 37b769091af7c7c9f95c52f92cbc26b22f72dc0de5ecb0e9e37cf1482438605a SHA512 b4f74f037d1113d204d3f0e34c8418e354ae002ab09e8c326458bf7c9c9a9bfa3211317e03bb7e69d7f2e83a2b22851410287477176dab5288dacf5a9ec4a8a6 WHIRLPOOL 5e76ab0e818c3e20d8211c35230a9ee1084f1de830c988b1ed9707036481582540aa97c6ee9e31b0dd1ee2a8346dc3b81197d8c0489563122bba2dd7dffe5fe1
+DIST texlive-module-a2ping-2013.tar.xz 31124 SHA256 a50f2714269e1725a05584d2e1b0b822f082c7291a989d37976b8666f69e8e09 SHA512 bc05c8610e58bacb6001fd41f848d12f8e77837b5e24d32f7af1c9939778d92aeac7ee07969f22e86c72a8850650ad1d06341681503d8d8699dbf6db1de4be62 WHIRLPOOL c4ebb0c3bb4db9d176fbadfd06753509965aa7d1d89be69ded9cc4488b1629fbd7584f2fed70b9633ead1341fb88de006b7f840446f142ec25eaeeb8cd7577d5
+DIST texlive-module-a2ping-2014.tar.xz 31124 SHA256 18c8686e9d443af0e3b6d4feaaa42996b1fa2f03a07dce0e19d10226b7bc8839 SHA512 d5b65f04a96b7206624fd80fae4a04779fd31995247ed4b04d3ddb7197aeb3373d6b3679f674e29fb39e7022f37115fab2a3f5fc7304b3c6c133456242fef8bb WHIRLPOOL a6a8c93836825b07930a61c35d37b657479025d217b4d006021724a1b85c9afa4b6dffa0ba1d96bc0bdcaa3fd72274c11ea401d8387d1bcedbd20df2fde31cbd
+DIST texlive-module-a2ping-2015.tar.xz 31124 SHA256 b3560a102e5509e38e7ef7089de8773992bc09fc6c3fe6d98e8b986d5fdeda34 SHA512 aabf99f37183a27b2f8d13b1aabbd59ed0c78237d3432bb0ce85ed97855e6ee09026aaeff2733296b5d1438195995b63ae33c803088b07732e74aed2407547c8 WHIRLPOOL 71984e301b8e53849acd6fa99701c0e79c7217075ace02d464487f53732fcfe9952553a431eed7d5db4be7a5ebc8d2bd6364b09370ecf2163971d80a232bf123
+DIST texlive-module-a2ping-2016.tar.xz 31136 SHA256 a0a04bdb87071e18b548f2d393251f1f6eb41c0cbd8186af16efe1662451eccb SHA512 4711f184222fd95498a6d3ee94db19209c7836e6b775303926766d97921f2e8324b0aa2252a958fb619dbeca50729d2be4851a2add5503e7e8f4e713fc993e41 WHIRLPOOL 315ddeea1678f6c87fab00f87ea99bda240e5205148a17485b72a17bed515739c6e2f6e83af9767c7f281cc9caa8d16ff088837b69b3b10b3d9ea450b802ecf8
+DIST texlive-module-a2ping-2017.tar.xz 31136 SHA256 a0a04bdb87071e18b548f2d393251f1f6eb41c0cbd8186af16efe1662451eccb SHA512 4711f184222fd95498a6d3ee94db19209c7836e6b775303926766d97921f2e8324b0aa2252a958fb619dbeca50729d2be4851a2add5503e7e8f4e713fc993e41 WHIRLPOOL 315ddeea1678f6c87fab00f87ea99bda240e5205148a17485b72a17bed515739c6e2f6e83af9767c7f281cc9caa8d16ff088837b69b3b10b3d9ea450b802ecf8
+DIST texlive-module-a2ping.doc-2012.tar.xz 17520 SHA256 8652f4aa2017b079854798845f32e824782d608d208463dc0751de3d4d1f0546 SHA512 8ac3e783e8dd336cbaaef845a6422ac5e51629a14c902a994975dfabe734e383745dd0bf6a5c03863ea5c7d57439b1f0a83be1db6297a56c2ee0f8e110b27d4c WHIRLPOOL 2a15b7e65c52901ca224be147209284885dfd4f70ede38cb4129fda2145602df081aae556d1091e5a3a721d4b6dc99794c2c80f1f92161328742e9ce1943a54e
+DIST texlive-module-a2ping.doc-2013.tar.xz 17524 SHA256 50393ecce90a712deca06f867949d5a2f86ba6fe68a4c7a48e26637badf5842d SHA512 b209027336a226b08def7864548ddd5e68c15d1ce7cc54f4fd54182baf0500a34012841736ea75c82bd9879ff3c0cdd0501502e69252d1b93d7436274b18284a WHIRLPOOL e44995baf5ab759649c9ca54c5ab1c7fdc18cf5674f49d0c9397462819b50611016939e89109f11a5c6a2f024c7bffd12a2979d76888b3a3a55ef3efddc8a19a
+DIST texlive-module-a2ping.doc-2014.tar.xz 17524 SHA256 2b83f31b3a470e7843d568fbdcf2c6739fc6ca343f59b8f1392620135d755a81 SHA512 444f5b1fb4b60a6a6037dc9a297e8e388a41ba9a645c1b6864c323a638f2e1c021ba7cc06341f6371760523fa5995230ec1a884e86bf69892bca3d02b5ae474e WHIRLPOOL e99215628480571f41af37bd7f3dcafe612b1c3e4392539a7c5e239e2ed90a939f98d1ce2c0b1b470ba04bbd71f392e32d04bd6c641901a875d28035da7fbe4f
+DIST texlive-module-a2ping.doc-2015.tar.xz 17528 SHA256 987991356a1f8075f6e1740b95229184b7ac895bc69d30c5c8efdcaecb541ff3 SHA512 0136c3f814d2f120acc573508d407eecefafa4b1428931fce2648f697a2b47d226a295f202aac57e89b1d405565e7236c94a6df579dc2771d7d92439a3ec603d WHIRLPOOL a6e5ac5d7c3f1ea95507cdb119a511def5ac8b666d426136d5536c742790f562a121bb64588e9f660b84c86e783d63c6d1a79e58c7b67235786f1eb7a5cf3252
+DIST texlive-module-a2ping.doc-2016.tar.xz 17524 SHA256 c532e058309bfe1ae99305c84fad302eaa4d65c140f9d267538b889eaf691de7 SHA512 8cfcc3b2a5dc462895a2bbd82f3a21537ae5d3fe81217b0b664b2008d6d18259f18de10e6eb3e3ac2655f96067b0f9bc6e30f69d068d9335598eb0b075eb4cea WHIRLPOOL 2e03692044cea67acbe715f1248a71ce552f31a9876ae17520dc5e58e971a77aac630bbf0063b861d94ada4eeda6774d513e894af05a91630d0ae0f83a65d78e
+DIST texlive-module-a2ping.doc-2017.tar.xz 17524 SHA256 c532e058309bfe1ae99305c84fad302eaa4d65c140f9d267538b889eaf691de7 SHA512 8cfcc3b2a5dc462895a2bbd82f3a21537ae5d3fe81217b0b664b2008d6d18259f18de10e6eb3e3ac2655f96067b0f9bc6e30f69d068d9335598eb0b075eb4cea WHIRLPOOL 2e03692044cea67acbe715f1248a71ce552f31a9876ae17520dc5e58e971a77aac630bbf0063b861d94ada4eeda6774d513e894af05a91630d0ae0f83a65d78e
+DIST texlive-module-adhocfilelist-2013.tar.xz 3560 SHA256 73d63bf9a4170a5950faaafa61a00de43489adade01704952702c54d2aa6e941 SHA512 c443d4c06d5390cc4a0166dd7b95cd7eaff8a30f4cc1104a506277c0634fe708e0b47cf19925cbe05b8eec2f73ec90000a40c0b5a8acce9bcc2c3f5624ebe5fc WHIRLPOOL f71ff87ce41d23c76a8542f3fa8e74ab112e22e566184ec924e6b23d95deda1a0d352b872a893431453093271c88e90a279955f533cc527afd8454ba18ca2f2a
+DIST texlive-module-adhocfilelist-2014.tar.xz 3568 SHA256 3620522b16c79d754194d83f2be4da193370287772163957274b0ed5ca43b707 SHA512 355d13f9b60f93891fe419965066a73c5844eb9431f65407801d5a2a4bdf0c7ab8249fee87696d66343963ca144ca97a25c8d88d6570205c2c5c749112b8c363 WHIRLPOOL cd46690f7cc0f5be913d52bb21c641c4bab7f43886cfd888c8da5212a9ff6ebe92ed7d39e678c1daee4b650b65734f971c6805c5605f32eede8f34a5870e8a4d
+DIST texlive-module-adhocfilelist-2015.tar.xz 3556 SHA256 191e0a82e2b0328184354c3a685cba63eb6d5c742d75e781aeb4d2f5c835cef9 SHA512 9737dbebc2e16c53cdf11491a9d9da58b53bd879ec95830407bf6a23d9ed3347c3b6e0efd8e97365e99323d5f70d12ad6c986edee93446c4980d51c96afdc1de WHIRLPOOL d342f537a20cdc8b5f9393670e619a70ebf7ebd2ec9b92dee133c0e6138a6747aaf98384e7b4e6d61b5f6f7ff1412b269c4a8ac890bc526371793ed0b946ab99
+DIST texlive-module-adhocfilelist-2016.tar.xz 3568 SHA256 3cffa46db638106381f5fe316701ed0bd08e04f79b52e279baef9830503a3d78 SHA512 637cd01a30bf9808b7cff6a0024230f20d0bd68911beddbd4ef64072855d28ac57d1df0f7cf4b78e376aba1f06f979f03c135bc65b58ef1beb9a0c8128b2c2c5 WHIRLPOOL bf351050009010f2187948a16f354ea11235b83a092e301b13180b69534568304448d1982434f127bf19c8371923a132313bb28f7789c05c2134f514ddd30bb0
+DIST texlive-module-adhocfilelist-2017.tar.xz 3568 SHA256 3cffa46db638106381f5fe316701ed0bd08e04f79b52e279baef9830503a3d78 SHA512 637cd01a30bf9808b7cff6a0024230f20d0bd68911beddbd4ef64072855d28ac57d1df0f7cf4b78e376aba1f06f979f03c135bc65b58ef1beb9a0c8128b2c2c5 WHIRLPOOL bf351050009010f2187948a16f354ea11235b83a092e301b13180b69534568304448d1982434f127bf19c8371923a132313bb28f7789c05c2134f514ddd30bb0
+DIST texlive-module-adhocfilelist.doc-2013.tar.xz 9876 SHA256 6532e21e431c55209b1cb18c093794589d87e7e1bb9efac108da007c619c9146 SHA512 23467123e6a3f243fd78bde22986a216c65ae21b57108957a7c3a0db3e4924e00f68922948b44692e4e2ea6e2e4c928babb7ee19010189d40e16fc629018925d WHIRLPOOL c060a76b1efe8a1f1d43cf449c015666d77ef8fdc6bf62b0e5f3cf64d3c1ea27dede34b90d7a48a7e399e20b1684c6c060a4e758b9f739028f2803efa5def430
+DIST texlive-module-adhocfilelist.doc-2014.tar.xz 9876 SHA256 8454cfc5d5dc4df0cf44e2adb36267bde82f414bd91bee4c27d8abe5228aecd2 SHA512 d388fe6020d74cb0c9610cca90836ad457385076194a772dc010d6b857aa58422965815b4c5166e86be2a782e1f704edb879a35814602f6571c9f455e63edc88 WHIRLPOOL afabf37ce9ff0840538a4913eb70d08a0647ed4026a183c646e439d96e9faa1cbe26ae07128c53c00b0f20c0ef037f5be19f71f3925672cddd3aedac23fc560d
+DIST texlive-module-adhocfilelist.doc-2015.tar.xz 9880 SHA256 83f1d542e807eb76f5cdf9651d57d06c53e8e71ec2ed850787f13a3e50fa9f79 SHA512 e7fcbd3a8ddfc4d5cfa8e5429636c78e8e5ec5ebab91277cf8429211d11a214c7765e8d38f6ec6a4384e39d561f9bc005bf05c436be022c26c84493c3a4ed4bb WHIRLPOOL e485b0d719bd3c37a9db3d4651f90fc9535ed059c3b9b7a0c08624d13aacf8942903fe3883fb6a8f41caf9b699ed9c2d0ba4919bbbfe35820924b1cc2cce83a6
+DIST texlive-module-adhocfilelist.doc-2016.tar.xz 9876 SHA256 365b9b06b4d0a3bf69e3f2588c34502b84894ef29812e56ee7806cab2f1c5b8c SHA512 db69dca80f163a9c8d1eb7d911b5c030341ee3d93a383e0dc4b4d60715c736c80192e61b665310bdc9c819b8fe702f6a28049cb5e08bf87d880fcf27069c9beb WHIRLPOOL f877f3eaa7e39f42adedbac2cadf0c6ed728bd7131ed7cbcdcf05a01d22f4e4c051ba1cd25eeb1efa17100d72e467ac5281a539de447c9ed1238c167fc53088f
+DIST texlive-module-adhocfilelist.doc-2017.tar.xz 9876 SHA256 365b9b06b4d0a3bf69e3f2588c34502b84894ef29812e56ee7806cab2f1c5b8c SHA512 db69dca80f163a9c8d1eb7d911b5c030341ee3d93a383e0dc4b4d60715c736c80192e61b665310bdc9c819b8fe702f6a28049cb5e08bf87d880fcf27069c9beb WHIRLPOOL f877f3eaa7e39f42adedbac2cadf0c6ed728bd7131ed7cbcdcf05a01d22f4e4c051ba1cd25eeb1efa17100d72e467ac5281a539de447c9ed1238c167fc53088f
+DIST texlive-module-adhocfilelist.source-2013.tar.xz 16408 SHA256 6b62efc972429ef12706d42c3297a99c32464a74ea4f65bc500e7e0861bd982b SHA512 9942de3e2d6d5bb9c5183986dd957f4a5d6b47b97d1c5d58f40da8acf9610dd216e23e64b2d33a0e3bd2052e9cf812bce00813232d90e8b4d0f3196542aaf6ec WHIRLPOOL 62e26068528ee3aa4375eb1eee4c73a9d6f14240692627d366666dec68b8f8b2841a25099231a61e3d88fa050c1ab74d9024ddc07d603493d8007d024ee0ea7b
+DIST texlive-module-adhocfilelist.source-2014.tar.xz 16412 SHA256 e9491a77e4fd279c1c822d3353ac09601a291c9eb1ee490f6ca839774aefbfbe SHA512 9d890897c605156d90339cb067d0ccd7b4a6c370a647a22267ccd4bf22d690bd801f645bcc450863c43e73d92352ff3b867258a246b07013c4bbb668c6f02f9c WHIRLPOOL e0f98194636254ad757cda2d2de66e0a500221d973aac9250d6a534de19ebcdf8d885b9ab1843dd473064d2cc11784c8dcd2f68e97e52b40aeeab5fc58812016
+DIST texlive-module-adhocfilelist.source-2015.tar.xz 16408 SHA256 d8cd3c583ace6f3741482e9c9a95566e327cf86f2ed84c6511f79fe159cbe939 SHA512 85767aeaa18ec44a7bdfa6723a642f99d15856ea4e03d40ea5883ec65dcb8d9108c3a068787226ee16500986bfb4c988af73bc93f84544cfd798ce71e3525fdb WHIRLPOOL 4e27f078b2c23ea1ca521ad4c4817958439edc3d3e437015ad1d504fa2ea51ea63f25e43dc7f40b029fe658529288bfbef04ac7f77e79ac57ae0d5d5368f801d
+DIST texlive-module-adhocfilelist.source-2016.tar.xz 16408 SHA256 095d521e6e8852fc2a13efc93966a19aee0a7ad612f166e6bfbe4a62077f103b SHA512 1e74ead0f3cc61b6985e530d884702867c2cb9af1e545b697adf7ef1fcaa49cf01ac768cd1c5161900feccfcb3accbe96b3da7b62219e9dac5cad89cb04a35f0 WHIRLPOOL d8b9a13122e7cf0b6213b897338783a81defa789b14eed1a66827653ef5a9d5ebfcc7959b64e3b03113613c85be62893462ae8c00b0d735e66527454130fb82d
+DIST texlive-module-adhocfilelist.source-2017.tar.xz 16408 SHA256 095d521e6e8852fc2a13efc93966a19aee0a7ad612f166e6bfbe4a62077f103b SHA512 1e74ead0f3cc61b6985e530d884702867c2cb9af1e545b697adf7ef1fcaa49cf01ac768cd1c5161900feccfcb3accbe96b3da7b62219e9dac5cad89cb04a35f0 WHIRLPOOL d8b9a13122e7cf0b6213b897338783a81defa789b14eed1a66827653ef5a9d5ebfcc7959b64e3b03113613c85be62893462ae8c00b0d735e66527454130fb82d
+DIST texlive-module-arara-2016.tar.xz 2333636 SHA256 f275ffc0c267212f1572d08dfe0727e1410f019dcdf281cd6199ebee7e4a5391 SHA512 3acfdc5872c866f8c883bb5e0ab97bc15e67c8afb799a633905493c82e20bb1183a50786d4d39b41a21e2b0fa51a8d373e645379774249ddfca5a851526bff21 WHIRLPOOL 3fa4464711ca34746cad638db747ab279320fb8cc73f82de09463248449fc2be1b7eb8742d83a4ec1fbc65b1f340232762d3740227874633b321f94fdb2e293c
+DIST texlive-module-arara-2017.tar.xz 2333636 SHA256 f275ffc0c267212f1572d08dfe0727e1410f019dcdf281cd6199ebee7e4a5391 SHA512 3acfdc5872c866f8c883bb5e0ab97bc15e67c8afb799a633905493c82e20bb1183a50786d4d39b41a21e2b0fa51a8d373e645379774249ddfca5a851526bff21 WHIRLPOOL 3fa4464711ca34746cad638db747ab279320fb8cc73f82de09463248449fc2be1b7eb8742d83a4ec1fbc65b1f340232762d3740227874633b321f94fdb2e293c
+DIST texlive-module-arara.doc-2016.tar.xz 2748360 SHA256 d9a6f89a8e46c251e7ba3e255b3a97a29b4400045fe60cf8e87032bb6a273de4 SHA512 26cce9f3563aa76863f62090dba9bceea01ceb27c48f3e4ce6f7ed260b99916d8b48337a40b9bc8cc23edf38be738054ad7b00aaa15ea58a57433481484d5b45 WHIRLPOOL b06a6e55bbd5ba5663ed4fc4ac3ff09363b159a3edb20b1ede63a92ab1088c23d7713389c97db0b63e8e2b2d11349c7343f8995213e809b4e3a5d246194e3cee
+DIST texlive-module-arara.doc-2017.tar.xz 2748360 SHA256 5b2f4e8be43f6ef9ce32da4c0fce3793912c697a6c39f15b9c5596cfd564245f SHA512 5e917d8f326d1c9dc4568ed9a9c27c9aa31513c5188c66986056138ee4144b79b9fd8111a8638b0c42ae5c0fde62ba89bfa2f98cf9d2238a7ed929ae917625c9 WHIRLPOOL 4a6fd30c32f617358b35c2ef0eb2d7253c1f3fae0c55ea5d871a614f87c9fdb56b59bbedcc5f2de186c34e55993250bdff583c06fed03bd8ff104e3f6361a851
+DIST texlive-module-arara.source-2016.tar.xz 22508 SHA256 2478ddeb9527cb17cf5b9abfa01375887e9509cfd9161163448ef39a0fe61ff3 SHA512 fff9a37c9a3c8ddf835552c9ee5b87234a2db96b699a5324cf880bdf68bbece8ed2329f57c4c646859ccdfc065e3fde7e413014727a607eb70bce8aaea48e536 WHIRLPOOL f0e3eba9a9bb5b870cc22aade1ee97a2ad8dc7770651ef3bfeaccd46f21e34fe47454b2184d3825bce487eab5ee459889874ca88b83d5190fc53ad7d973c3fed
+DIST texlive-module-arara.source-2017.tar.xz 22508 SHA256 2478ddeb9527cb17cf5b9abfa01375887e9509cfd9161163448ef39a0fe61ff3 SHA512 fff9a37c9a3c8ddf835552c9ee5b87234a2db96b699a5324cf880bdf68bbece8ed2329f57c4c646859ccdfc065e3fde7e413014727a607eb70bce8aaea48e536 WHIRLPOOL f0e3eba9a9bb5b870cc22aade1ee97a2ad8dc7770651ef3bfeaccd46f21e34fe47454b2184d3825bce487eab5ee459889874ca88b83d5190fc53ad7d973c3fed
+DIST texlive-module-asymptote-2012.tar.xz 266772 SHA256 e6fd94edbbed89403a3e90a03112266fe5c576dccc5fe9f91983db6ac5d548ae SHA512 4c27081cd4318a05a06ef7b0fa7cd8126feba72df390044299bb94b620103ea38c45da78d2a22566e244173ceb6a07d62b68d91dd9db1c4a06662da8eeea8f08 WHIRLPOOL 60666fac7387bdd28686c8611e314ef1b2f270b5865641af64df80951829675c0a2b3c3473d08febe6c0f1bbfb833a05aec55221e25dda13129afee051e2bd47
+DIST texlive-module-asymptote-2013.tar.xz 268552 SHA256 52c1c2154071d97752981fc11d426d2c645a9f34c4145e848fb41e94b1b728a4 SHA512 0d7ce78ec6bc3bdf4a235f1231b275b0978603f1c7c045420dfd52a11f53dc82f2b7262279b4d34f96611c2ab50c691dff1ffd7cabb2a664bc88fa8b3ab862a7 WHIRLPOOL aba398249126f38f2f5d71b726abaa4552abf4fb5acc97eaa33f2ab625910dc0c84bdddfa1d162bcf5cd6fc9b816a75af2cf0709d681bf6376fce19a4685e0a1
+DIST texlive-module-asymptote-2014.tar.xz 264576 SHA256 60ddfe8e78643fe682e2cfecf0a5b5539dffaa123ff7aa39ceccd2db8a3e4069 SHA512 c4f9964ab2a21d33db91f564eb3d9368996a43e6d6874754d5d5186122a75c8af93a2031b94c7794a1a73346209c4914a70b57385c7b8e7aa8d593b0f4dc9443 WHIRLPOOL 4b13b99233aa68de4fcb66d464452790f63149a34b45070c2e7fd3a61130f386c7c45df5c7e9d451525128222589482707a95cc37b46b397e21f87e34cf36915
+DIST texlive-module-asymptote-2015.tar.xz 275908 SHA256 39571a00cf998ecc4e6e6b299c97f2e67ff3018fee8bb6006b4a5859f7ba35d0 SHA512 e9d030ba4c25254bcc913f0775db75b14a925df424d2bd2f30a80f0fd22eb420a7364a0c09b6c877808da516a04f4175b85458cf3d80912890481da2b2926189 WHIRLPOOL ce90c603d9f2cdfda6a1d6932c65aa0b02a0cf3814cdab6baf939ed79cd6c1fa376bc0f699ea3362a79aab95a03c9b9d905892e0825ab10c4a566c3991295820
+DIST texlive-module-asymptote-2016.tar.xz 277476 SHA256 3c69fdab075494f610dae24d2b9b2279fbd46778414c27bc2ea4772741a488ac SHA512 cc806e6c201cc9a360b621f292eee69473ad6d29beb1a9e68180cc908de7c42617bc167a568189af39b1e6482ef88799bf36afe179a118ac25b47f4858da9e49 WHIRLPOOL 96bfdf95418ea29656742376bb355a506bd0cfac9e410f06b4ec4a1ef77a6b0934546a7d1ddb3f696ed9f042b55e208f000cf4525c2e2a2496e96c32a4d7416e
+DIST texlive-module-asymptote-2017.tar.xz 277568 SHA256 1f2aa5a8d26fdf616201675ee359e616e50f7399d4f1b74c346cb32ac220b406 SHA512 184cdd0ae495ce695309453458b8a6db2e29950e192a45c86f7b553823ce978eacc506e5e9454de1b1b4a2ed4c12450b0b59a006dff954d008311437aefeb3f9 WHIRLPOOL cbb6611fc94e9aabee677953d04ac777901118b4e1701bd246f997fa6fb9f97aabd9d9103c49ef43ac769c4e800eba9b771f39a2285ef13355dc2aada1e00a16
+DIST texlive-module-asymptote.doc-2012.tar.xz 1720260 SHA256 b8eda3e53f4b16d7ca435a683e5f71ff2668fa1d89c934713bfefb8b8f1ec693 SHA512 f7d49538f4bb538a62f4d6a80578d55e957fa193691b88bba21df30cd722b60b72b5951bbcb2adb53082ae08f476093a27d66e0124b9b26fe95a6b0133058223 WHIRLPOOL 75fc89dd3ca3bbeb5852fdd2c5c70c3f9e6a0c1523f8267d5e72fbd8ad693704201c08c5b3dac7eea765d890101dd939cecfc415853279a4dfe022286f514cd0
+DIST texlive-module-asymptote.doc-2013.tar.xz 1726716 SHA256 a3d909bc2a1ea92ad85fa6e65ce01e24f0b7096baedb306eb2ad021fe14e44fd SHA512 b20a23f24e07b62ce707dc998b1ce98464f1a053c86af3ec5e55ed48e6b81d27bbdd9372690a08f61bcae2b61e12babc3e226241f3da2e28470ba3db71e1a859 WHIRLPOOL e58c8218922bd01e27901f434200eccf0be293713ac94decb63ed40afe84c34d770ff029e6770e43bc78a8f2388a9cbec5ca1b82b79842d1222f125928400fa6
+DIST texlive-module-asymptote.doc-2014.tar.xz 1766804 SHA256 601dde3e5affa8ebaecd6df97626630938540e1e0443fcd9e1b847942b7db430 SHA512 29f338e236f81bcc4cf06dc561761450e2a41812188c1f9096840b365963f57e3f4c8900c344722e4d80c1e9febcda2b5ecd2434a9e42deb2872b3781a60eb26 WHIRLPOOL 15aff60d00347be7858c7068513b626230863844b67925d01620fa1cb3317dde5f2ad5cfbb752df669311215aa7fff349802a98c9d9437e6c6968752549acf50
+DIST texlive-module-asymptote.doc-2015.tar.xz 1770716 SHA256 0c1e505f34d5a3b0f79b2e9a6df93b4a3d968da33ee0d5d3386bd6624e68251b SHA512 2fdc9d0bdef7746a22cf56866f61d77f15b16257361496040c2d5b9a3e855082c7d45e482a392ceda7125929f9d94aa42018c031393a9e6e74ada7cb5860321f WHIRLPOOL cb9408a9b9f01bcfb58846416a9c00c0874d11966fd6451f5faa98583e158261a7c15fad913c1132896a870821f2966acee1eac432bf7b083921b61e957191d3
+DIST texlive-module-asymptote.doc-2016.tar.xz 1809720 SHA256 38f8f593d9933283de4dc88734d50e217d8703f3ad73dde084f045d46af16818 SHA512 35e657b556a7f5c867893bd0cb1a708064b64b86eb292a22123a69e0153c5c9820f68ec3209a7af2ee1cf813726afea1c59c30fde00974fe62458622834f67fc WHIRLPOOL 51ff8a5b822221b50e4328ece6a1027f54de2d4eebc9ff91f1848b32a32cb4f92eaae2b1e68a9ef232bc484556b352a832544b70cd72800632c15daa3ca0798f
+DIST texlive-module-asymptote.doc-2017.tar.xz 1791956 SHA256 cf81e996716ac2564cd3f57772d63e558a05077fbe432c8457199fe97f666cb8 SHA512 50a12a697b9b9c45a4137af23d88d7dbbe2cbfcb091655feed4511418a559863193236ff8a2c0c5730052d6984a03aef3ceddf1d96fc9ff838b57459fc288dca WHIRLPOOL ceb507a12cfb4e895788309f8ab94f0434816f066eec678d93233942d243fdadfb7fce808bef4104a45eff0fcdd78fd1058f36687e48be662b806ba8465165bd
+DIST texlive-module-bibtex8-2012.tar.xz 9204 SHA256 b8d21905744b56a61d30b13f112fcd4983de6e5847d7cb8b25695bf6cea1a4b1 SHA512 49c47a12641ce6628e83d698d775d8be1602af4c9454f677ad7de156d6c441b95df0a880e2eaa0fd0179eea430b60fdf1c49659df04d62332ab4d90021f557be WHIRLPOOL 20110f0d377a2f90157d8ab75f6fccc1df652d1226e8df1b0cff3a6fe1b5f52ded105b33cd79e4de31459f9deca6b6f1f39eafe31601aa81bba9f4e41adcca93
+DIST texlive-module-bibtex8.doc-2012.tar.xz 13412 SHA256 dc29cd4d4440b025572c29828c075d32d7cd9a9e12b66154dfd19372781dd5a1 SHA512 5e26aa539c10ae5c1d473197c78cba24343b0ed0c6c26c488c24ab85a46ef55fd88a3626d264a4ae823d75c9fd50f1500867c0d14c971eb5db5e98580cf6bea6 WHIRLPOOL cf6328332c897d03f136c0dc30e72373ec908e05798a53d4314c7577f21da6945db1d11a8f2222c2a0d73e6fb0d6349ce822094df5d492d9dc1995c2e3d88d1d
+DIST texlive-module-bundledoc-2012.tar.xz 11924 SHA256 3c2e2f6f10c0eb64569610d6be9585fd3e6bdea80266d883883c404696fcb1c3 SHA512 8f0929a050e45e5bd3b4b02953f1dc714ca5ac39e400d895b56bb38c9d057ac3b715078fca875115d983e5436561323f4fea61b1119b00c7916100e6c88ec8a4 WHIRLPOOL 6954830845c4a5b63986898c3de937163796586c342e56b936b71a925ba1fb14c1210fc90aef3b549cf7e35a992a57a4396a1eb0744c7cf58f150395d5f587e0
+DIST texlive-module-bundledoc-2013.tar.xz 11924 SHA256 fd50f063fef075bc576cedf2e06f2dfe958a17037eed00a20e8226bb0ed1d09d SHA512 be041e64a1ef3ae10a85243ceb2192ff773d41051c9092be0267c557fffaa235d25296217eac7a46a057900a8a478465f899b56946609a19cb51abcb0ed0c0be WHIRLPOOL c36790a714a87106462cbb15c6dda3dfbce35662bb08b478df868419101b6770a0c7fd90ae34347574936dda252bf80edb3a7f4b506a5eb49956a03d5b05d072
+DIST texlive-module-bundledoc-2014.tar.xz 12192 SHA256 5d0c3284e9331e9d170194da52747e6af71ea813b33479ef5cc808f38270f3a0 SHA512 2b30700bc2a835895217b36d6e48492473edaa18afaf68f6784d2cd3bf1262392f5335a94e337d2f8d3d32fe83d42479570d6a471bc2bd58fbd8731bb6f07ce8 WHIRLPOOL 14fc5ce94cb664c39983f7e79238081c87a28a0a11322097c65ec5425c598b6169adc6066e4fe93d65f108e52d2efb28f5df502d89aaadfda2a597d811542879
+DIST texlive-module-bundledoc-2015.tar.xz 12196 SHA256 b61f90e0f60c9fe73c30906f8449b544a9db9b51638f87528b5b79162e6d1ec4 SHA512 8d3c33d1292fb684db28aa5519d245ab1e352a9a18259f342014c33739febc27acc8ec2810c950effa3eddda35f08f7f128005b360520121281a049dca849f82 WHIRLPOOL 57f25a60448feebfe80edcb63c983f587ec803574a566eddd555d9d297cc37eca7fc16383300f4d8d2adc63d611b34d0bfc38432d637b7ecfdc7e0235a84e9b3
+DIST texlive-module-bundledoc-2016.tar.xz 12208 SHA256 a90ac5e351c3c904b463a63b714a99f6cc246fbf89784805fac82debea307506 SHA512 0f1ac0081ef20f4154534211dba7addfab6e252a12a1f023b8f1e21184e738694bf9f66e045181b83ec348c0add209ed3ee987603cadb3fef75760a288524ec0 WHIRLPOOL 3de03035344c50744443c1288cbe5f7f5330c9f129a6cf5d19e3feae5888fb94ec24b6643ecfbe964e74bfe8d4cd356ed27a3eeb54f5dfe5afb70a860cde00d9
+DIST texlive-module-bundledoc-2017.tar.xz 12208 SHA256 4942bff32211378f65d6dba367cd3290b9e94174638238a789e337a312235cb6 SHA512 075193471d65e6b7eb61a1cd18b1380054467b346bd66f82a02b060f259e0fd1b49f510ae088579f555360effd40ae3a6e3a35dde0e956b8271845b445507ed1 WHIRLPOOL 5663b5cf30dba5f98bb4e0f7f9e53e558a6fab65c6e808cfc01e027aacf0bebc10a54bb2f43af31b520de90e6de17eb768261d63616f2087341d54d98c8e1586
+DIST texlive-module-bundledoc.doc-2012.tar.xz 36772 SHA256 13f72b6be42642a6088d04a0af507f90c3a83b9767b4dcea0a3b1f8b7f6c2b9e SHA512 7bffe7f51c65a76417026f1472c75d66443fd011125eb2e5be2b337331aadbae7c38164b2f0b9a68a97866ecbc8b65196e6d17a7d693faf6c181528db39bd1a8 WHIRLPOOL 97817a21bc11305a0d66eeade6accea4ce1b01bcbed905608eb50b775093be05b826ff33e7069d7041622372d59b56e9ffc04cf28ca842cd761abea863bd4f1d
+DIST texlive-module-bundledoc.doc-2013.tar.xz 36780 SHA256 e40be2a70965125eb7ad3947835dc702aec1804ea942dd5624d551a898b01920 SHA512 c01eee9f3b968befa2d6f2c128035c751e4359b7c50a01544a26670fca509327be3e534fade97d8fd06f7cebb5c59ed7767d34eae5a6324e8e3d33dc5b1a21d7 WHIRLPOOL b023a28632e771a295cf5dbbaefd223c82679f1b1565c98aa662bc812bc546f2234031597f17be2c6bfaf99db9e4acd6c98c815318b522d1b3586bc6f96273d1
+DIST texlive-module-bundledoc.doc-2014.tar.xz 37388 SHA256 705494c1614ca311857bd2cdae331f3570a262d4dc23f84814e1fa605d9658b2 SHA512 d80b9ead76754d747ea6c3ceb57f90fd2b9b5e4835b681b42d2837b868a3e1e8992c8602ce6580f02010fd6e27348a2e129d65266fbd10a8a2db40f5b790c78c WHIRLPOOL 02ef594ae3f28c2f3a1364b94ce88662baf85a270c36a2d51d567be2acf51402651373e69a3c86204a90595e1575fd2243190f096625bfa944925f2e44e43329
+DIST texlive-module-bundledoc.doc-2015.tar.xz 37392 SHA256 a9c4e06eb306ea888e36c86f42d1de6eaa2acc0c209ae7c75e95a5a533263900 SHA512 dae046b927e3a03e9a815c6124b4355640c797c2ff3fa1ef53f1a84475211a1cf93daa0448c0f6b2b3e0d733af544b64b7b1860d66e1c0b91e6501adab2bb020 WHIRLPOOL 5e7f051d164a138cb30ec2b0ea83de481c299f53fd2f96bf49c7d446d1f1fb7c607380ec913b73d3a5d8905988f91dda87ff37c5db14b0f99d61934cfa3a9d4f
+DIST texlive-module-bundledoc.doc-2016.tar.xz 37392 SHA256 2dcab43860bf51907c06de6ae3ce9d6484ba5688729585779bb8589027fa57af SHA512 f765ad03ec75b1a0f7d577ac8c3cd03e196e6dea569836eb3a02d6aa50a7cd0084d8a41eabdc4207423291eb8e7f4002340c32e6d04c07968a8533cef80a6b97 WHIRLPOOL a5bb3dc9c8fce1aafd37c062b296c47f7f1f609290e97fd817eea30775aae8390512a6ec03500ae8756c0ff687a670d3a71de2378814cc2f7d716c01ec2fee8e
+DIST texlive-module-bundledoc.doc-2017.tar.xz 37392 SHA256 2dcab43860bf51907c06de6ae3ce9d6484ba5688729585779bb8589027fa57af SHA512 f765ad03ec75b1a0f7d577ac8c3cd03e196e6dea569836eb3a02d6aa50a7cd0084d8a41eabdc4207423291eb8e7f4002340c32e6d04c07968a8533cef80a6b97 WHIRLPOOL a5bb3dc9c8fce1aafd37c062b296c47f7f1f609290e97fd817eea30775aae8390512a6ec03500ae8756c0ff687a670d3a71de2378814cc2f7d716c01ec2fee8e
+DIST texlive-module-checklistings-2016.tar.xz 6464 SHA256 4b3b2bfa8d8b5e44cf9b7a9873a3befb8ecb8b13d7d10f44b7847b721e5e23f7 SHA512 07ad9be070c095e9342c74e737c2fac92bfceffb00aac267df94c90b03b1c88d9df5774fe29827c40f9ad8442f28c4bda53d3e2df21fa9fc18b497b01b106c56 WHIRLPOOL eb85af5fd5636e6fbdeb637d9f97065c1b1677dd6adf83d76ad5d64664be96e56435cca3110d1121f6bfbb9c473fa863b0c7a24b815b5e11912310cda5bc4a4a
+DIST texlive-module-checklistings-2017.tar.xz 6476 SHA256 38680067b6702cb86f9177bbc00df18feb2e4c0f600e1b875ef49eecda2fd0fa SHA512 c58753601d1af48ec2bae629b5671fdf1de8f055058763a9328a1fea9829960a86df836358fef16985747b31f4e1a569d78d4acf167cdece2d34eb57ab738548 WHIRLPOOL 6e6c7da21feea05f2a68b77c50cee5b3e789600c6e8cc094786193673f05c451f612a3dad745fe88e7e58e28f3455afda5e3686089165068bd5c8a70486403b3
+DIST texlive-module-checklistings.doc-2016.tar.xz 364456 SHA256 b04373f05530028b1eff67a97ab62f826f3985086539df5fd23a65b8d2e05650 SHA512 02e261ed793694a9ef339bfdbf66dbd8810619ff1a76606b9f989393963cce273f9c9014d9acd7f040e8341f9c3bf750a2c9e660441257d72a03363bbc55fcf8 WHIRLPOOL 7187ab2b2814c8e095a35c6de607e1292560a57414702382b23d54e3e332e65bfd830bc846e29a5bbf5e88cb1399c0b4f5cc00a873c73cf80446fa86ffa87d4b
+DIST texlive-module-checklistings.doc-2017.tar.xz 364452 SHA256 194becb55b1436a4dff8003a1fd70fc121a04dd3c35ec2d256496d7318922a40 SHA512 771246b9ccc70cb337a3f55e0d04e406c338217298f091c9372533bb55c5c98f0947287b2f0340bda049f5f0acbd33d2ab9e706426c5b487e0a31460863d5e40 WHIRLPOOL 8741cf9798d5068f14c22b7fbf5b4c7af236895cb0beaf3bb6cad7274cc53bfa654a3660ff3817efb929fdf547f8da99c9613f76310f2d59c8952347c7e44217
+DIST texlive-module-checklistings.source-2016.tar.xz 10952 SHA256 c0a6312aa5a7157d61a559504526e737ab8291e4d159346120c65dac24ffb400 SHA512 f77af99ecd80e10aa43d6d232252acd02ba5d62599348d6d55b4ab90d10575cba33dd1eaae460ad93e1d17447d454309d5525bc8fbfa2b6839585f43b5c97090 WHIRLPOOL 970953938732725329310378759b82fdc0df679b9212a43a76b6c7f7c6e025a18a37b05b4cb623c8c6fbd48f63157ad640c6eccaec73dddf83f04a240c91d2e0
+DIST texlive-module-checklistings.source-2017.tar.xz 10948 SHA256 516dbcac8c43d0decfac14a8ed2bc5a18e1251de2b87303906591cafa5f8c2c6 SHA512 8fd158560f0bbdc7ea996b510ca69cf30dce26decd6c963533ea80a6eba7d6543c72e12175fc568725fbd8e4c8226503cabc607b52d68d51901bc8f32146e818 WHIRLPOOL cc789b6f86a8354a39ffc0ea7b6a784f61cbe50fba83c72e4058ae4e1fc96cfb16c2e0d0306e4ff7d691b1885fc7ade00d5f31e54911dba855c1fa37d7150bbd
+DIST texlive-module-collection-binextra-2012.tar.xz 716 SHA256 b1d4d65db934062bb0a23090582dfb056c78da1ff9b912c11c6bf0bc823d4fbf SHA512 5ed7c43b2bfa6d78d212b7c13914e60f3d943e429fd10f2db8a7c38f59dfe5b41d621199d5be368d5b90ba3950970d8b6bce698647d55f94f1324ddb88fc7935 WHIRLPOOL 75eb941d17ae05174307ef66d8f848a07265d233d6c439cf2c9d5ba22c91285cf281961fb5a954afd166399032dcfc453ad5f954153336e70fd9ae41dc34a312
+DIST texlive-module-collection-binextra-2013.tar.xz 744 SHA256 1517a9d4a7f6ddf843c5fcd281fc9279d5b4986ff6fdbba59a7aaa54eb0a99f5 SHA512 f3f946dd82a42e226c4c9c9ac174bb950ca8b24054f0089956f6de6ce906ef39e3db6d99459b8381f60ef0ab7444c4b53f9833171ad8661f8f85984751bef914 WHIRLPOOL 56c89c1124582e3c79230d3c2485fba2c887e7450a0c1218f8cab2e1eeecd6e5b5e58b177d8bfbc2ed8cf702372d84fa0bfc4446b106afd2b0988f674e58a3e1
+DIST texlive-module-collection-binextra-2014.tar.xz 768 SHA256 858c10cd8587043094233ca56d0fdcdc0fa014382664ab6517afb69a821b0c1f SHA512 81346c9830588876dc3d8ca8a43cb43318a069224cce228791b8d2fd9b3d09cacda02c4691a4aaf9c73a772bd026ec51052a934995a460b54c884b62ea73f4ad WHIRLPOOL 4cfe07586bcc7ecc6add3c2b446e9cb109326403dc330158d223ddfad022121dae636f0a184e8d7730662c37074476b303dfb5dff8f7eea68eea79b54a69d729
+DIST texlive-module-collection-binextra-2015.tar.xz 804 SHA256 1e9884a716ae3f7887d29e5e957795cbd22a4e0b0dddd7c770c238b9e08bb5c4 SHA512 50b64fd9c4dc475f69b0b40c6c695c16e80d8b3295f9b065cb234ddc85c4a1982dcbe175a79449e4ae8fed7e3f110c7775e497e5d85a285d1d67e476f11f9941 WHIRLPOOL 86d2becd07d75bad04a8a3a077f02270562979d9e8808d2cf8fc2d46c2603eada6ed6075f31fbcde4615166d36cc618e1a054c52374af587e361b5279e6803f2
+DIST texlive-module-collection-binextra-2016.tar.xz 848 SHA256 9f265df57289e353825060c37b79156b4a6b8ca92a8488b27ed689feef53fa26 SHA512 ab5459f4a6431f22b88255e3b2114ecc2cf34e58e5d450da7ef70904511a6596061250c27b23fcae74f955b8e040f1820e444f504a71ae3f41d0784c67aaecdb WHIRLPOOL 503f9e0c4dd4c5940439a748689493b345b25385fb5e8e7c082d9f8249e0811cc3c47352cd9c0f6b5ae6ccfca4a2ce2d0c3ac53e371bfb958311fde526dba741
+DIST texlive-module-collection-binextra-2017.tar.xz 848 SHA256 9f265df57289e353825060c37b79156b4a6b8ca92a8488b27ed689feef53fa26 SHA512 ab5459f4a6431f22b88255e3b2114ecc2cf34e58e5d450da7ef70904511a6596061250c27b23fcae74f955b8e040f1820e444f504a71ae3f41d0784c67aaecdb WHIRLPOOL 503f9e0c4dd4c5940439a748689493b345b25385fb5e8e7c082d9f8249e0811cc3c47352cd9c0f6b5ae6ccfca4a2ce2d0c3ac53e371bfb958311fde526dba741
+DIST texlive-module-ctan_chk-2016.tar.xz 512 SHA256 62e7da740238927b8074d5ff23a4100634a257614c2ccc2302573f8541e0a8ef SHA512 b1a15b0ad26055dff982bcb30d8798ac0dbc021f1265239118a97b0fe0fd53accb3d2c215365f998c317d25eab1bfc8b1b52f481b166e8fc88dcf37931abbc85 WHIRLPOOL 4ee81ce16b6b108a49999a5a07ddbf920ae682151456ebd609b4dc881581a7ce41fa9f93edc14d501104e10da80e7f02b5733ee1b6f19a940b7b3ae8f73fa268
+DIST texlive-module-ctan_chk-2017.tar.xz 512 SHA256 62e7da740238927b8074d5ff23a4100634a257614c2ccc2302573f8541e0a8ef SHA512 b1a15b0ad26055dff982bcb30d8798ac0dbc021f1265239118a97b0fe0fd53accb3d2c215365f998c317d25eab1bfc8b1b52f481b166e8fc88dcf37931abbc85 WHIRLPOOL 4ee81ce16b6b108a49999a5a07ddbf920ae682151456ebd609b4dc881581a7ce41fa9f93edc14d501104e10da80e7f02b5733ee1b6f19a940b7b3ae8f73fa268
+DIST texlive-module-ctan_chk.doc-2016.tar.xz 222000 SHA256 08594fcd75b0b68694559682c9d5268e9774665c7b0ca3196aea64581309eb3e SHA512 b19b54aa1d651eb83f102c0798feffc97c973a3836dd2ee37eef13e2e83d7e1d2a089a73504a514bb2868e3c838fe94f6d94c85a19183666cfa4d35b470cc243 WHIRLPOOL 87b648d64905823e2780b6ac8938a940caa7a38686bdbf993abf189cffa24173ac22d523bd621f41098bc1372bbe8e7b4dfc873a299915909ef4ca50f3284f94
+DIST texlive-module-ctan_chk.doc-2017.tar.xz 222000 SHA256 bdb2b01c5dfc9ab824ecd05c29f724dba49be1423e287aa1b8b845c655db9b69 SHA512 cb3c694bb7b2f361b9e05e8dbd8d4594aac84886d1138e55b45dc2cb102620d2ec904f4e061e931d1ed57b410efb3d6b7fb699fc7f714d049337f285e531ab6a WHIRLPOOL ead9d77d646fe3887a1cf178d0358425cc301dd2fa58d3de3971237f901b9fa3dddca67a7d06ddb3adfe0388d233bc0617824af512d9772a234e30cd554403b7
+DIST texlive-module-ctanify-2012.tar.xz 7632 SHA256 34f4610d5c5af994135deafcf69d077264258c3af5201e4aff3322dd53f033dd SHA512 2676863e394d0af6139dd23d48325d05d174a55d9b6d0b5c5f8372e1edb25a87459fa86a59429a3720e68068b62e0d4472c293103969d660304bbe58b62af8e1 WHIRLPOOL 72684fdfb88b4f317da38aa8eb71d0e1e65149778d23833bd8b2777130dfde81d1cd28807f32a5a088d93914bd2fef3b7ff3f2c1952208c237a944a8ab923018
+DIST texlive-module-ctanify-2013.tar.xz 7768 SHA256 4cdaf0b296e3c9cd35d6f6f6bbf5a24e764caec0ad9f184850b52bff7144207b SHA512 5f3b7a260adb1ea7ef7cfdd192a6aa760e830dbe4e2a269fd9b0f6650375cc6db0d980c1786a565ef62e3230425b4c28ebe8bc9544df1508f6264977f256522d WHIRLPOOL e772a9ba3dc01d0943bd279b47621dfcbe141fd756eb22ec764e715f234c8733bcc900f9cf5b82f7bf546fecb7f88593beae55b1522e7c12bd2d4438cee2aa27
+DIST texlive-module-ctanify-2014.tar.xz 7776 SHA256 204ead2fb0d3edd03791fa06d8603d58278aeb298536e9a5ebd5862f41a1f71b SHA512 c3cb304ca256950fed9106e499bbb6744ac20ca24af21b140a65998c4bde862375fd83321259baecdee4928ae940f239e8e60521967950f65135587920f16211 WHIRLPOOL 87d151dbe1041099a07339f8ca903cbb35b992c68de140d3321e8ec2a2484bd59346f46f0d0dd1e892b450efd3761b38623fbd8fa572f4248ebf380d41999882
+DIST texlive-module-ctanify-2015.tar.xz 8016 SHA256 15aadaead8dfe32675759a291cbdc181d7ac671855302c54473cf6f8ddfec9d8 SHA512 0087ee071bad4bdfc861d4e42742bcb745ae414be094d052975cb2f14d40f2e0fc5e74373944a830cbd78a3336e6583ff29690309e13662c795d7a4bcf8ca1d1 WHIRLPOOL b1a12a3b6291a143e59352294bdd04d04a752a961d155731e8df77c70399a7a0f5a81c411ff989bc150c08a582c399b23cb900a0470ade3a5440184fecb327dd
+DIST texlive-module-ctanify-2016.tar.xz 8140 SHA256 81a305ac6a2bb79297dd6d5cd20cd9140a572066de18600d7c8140a2ebfadbcd SHA512 e9239e70b17f109dde7bc7d5475fd3bc16153591f8c703ed91ee4086d2cc5c0d188a49a877691866f2bc1fe2d92e72af1533de581827cb1e79ef59e10006e31e WHIRLPOOL cce306f084ca9ad0102f566438a5c947ccf3bea71c0c45cd32d0e9b7147ffafe8c95231ea7324dd92847285f24280ac888747370a1408edbd2d5a332aeec1fe8
+DIST texlive-module-ctanify-2017.tar.xz 8228 SHA256 d21498a390722c232cbd5d308937c8abf92629bd64d898afba59fad766375714 SHA512 335cfca62d46fd278f3c9b80dad62ca7a10310a5101c53fbd3060a4025b388eb962f9f41b4b7dd9bc896f4b7c32e127ac0b901ebd1f7a9e8a16a6ce749cbe92c WHIRLPOOL d61e511fa85681ba5909a1eda0ce84b11d49723f09e75a38df1c11803881602f89921d334ae4dbf40bcedd8abd103094744b622166dd9971821c8c16b02ff9d9
+DIST texlive-module-ctanify.doc-2012.tar.xz 30072 SHA256 b24a0f5c1fc4dd639eb5b35c83a0630c169d99fe102d1d815143ae1db89bc3ab SHA512 1789f0df0413e95171bfedada165a75b5979974f8d4e1c06e8069797725f028583c2d660d40c18c5beee4cce4dfd1e553ac35eab2ab5e6ecad7b88b07bd2f1ac WHIRLPOOL f287db185dc47f25c4f40ecc53ad0f0ab230ece114639d811d2029ff59930c73d2cc56c6cb82a5fcf4d2f4a5182915d465aaab7ebc87caede0b45a36678b9e28
+DIST texlive-module-ctanify.doc-2013.tar.xz 29816 SHA256 aca95573d73a663b8e209c40e84dd2b2b418ace5b3968aaa7441b7adc6b1cb99 SHA512 558a6b3478f0b6820ff03bb28bdb77a617467a9ca800fabd91422256e7dc42031f92786155f3238d58d5092da8e3392c435b67e26d2fafb6f2eea80c99973571 WHIRLPOOL d737189ce5d4866cd5e79dcc278d8bcacff9075826acb6a61af22a4ca8b8eeb4b80697c5f41c0b3e7c660a046fa8186c6a65e94647b2af17793220c07f7b434a
+DIST texlive-module-ctanify.doc-2014.tar.xz 29816 SHA256 5c2561aa377568bd18a536bc2251eec134adbb2ba7675d32950874c0b320fd19 SHA512 7c4b0e784a8368399af604ecf8e7c70ab6e78939fff6723cb5d1b874ff032a401f6522c29eb4a50a052d5615a5f9f829fda5d4fce2b3f9167e540c7d9a100387 WHIRLPOOL 3cc5f4de4aaf57cc8ac151a01cdfe6f16e8c0726eb47a13d4198db885205673b157a94fec05c547d7cabc6e1269cc6d1b26e462331c8bb7594a988e2ea40dd62
+DIST texlive-module-ctanify.doc-2015.tar.xz 30828 SHA256 8b2c66ca015bbf68e058932f37dbb616c2c73fc37dc21a1c89c97b5cda9d1044 SHA512 f56b23d633cd781536e8dc97c8cd2a75b95d8a0c21465b4fcaae7ef6b8ae7d10110fbc9b1c4d5801bb55e99bdb504b0307c8b75e80f121ed08780d57e9f96aae WHIRLPOOL 632713bda8e7f928cd5af0150e4af6f1105c1628676740eaf29af9e7c6d05766bb9fd7573498faafcec3fd7adbce882fcfa0edb5a19becaecbf368625f949852
+DIST texlive-module-ctanify.doc-2016.tar.xz 58036 SHA256 5644d80648d939e92deeff9661dedf7bf478a29ae158455256c3e8ace5b791d0 SHA512 3e0270263d6685be7ebb26df5b420fe696fd818db630fa0b7f8d839192b5204dc3886ed53e7e494858b08a136b477b24d5c90b7d5271917a66c2f63ba96c433d WHIRLPOOL b4fbb33033669cdac350bc7f8b9be4cd9db849335e0e0183c05d41591deca63faf19583711794eea88f75f55128586770750d7f251802b583892893f45534c7e
+DIST texlive-module-ctanify.doc-2017.tar.xz 57964 SHA256 942b4f76c365d6fd6f16c75495a4ca84337bc36e3f6675b3c428fd8adf3efb12 SHA512 c845fe36bb7c388e07a254938796181dc19d36a5947cbd9d571ce983ef2148bcad275f6f593386ef18ac26490b743b6db3a337cead46e20cc952946a7f3fb89e WHIRLPOOL 3439994e9c9a229757f0e3d0499380b55faa44831c3aa79cfa7b5cab5e854e8b7df666363d953786b87f167f96d99bec8018ae2acecdbd5bb78601547356909f
+DIST texlive-module-ctanupload-2012.tar.xz 5036 SHA256 81f6abc7641abe3f0bcb095b9e4b224ace39d4e18d1cf56904929cbb7c7a528b SHA512 435853b386277dffc2aca6dab8831dada20d0251dc0d7038fa4b1ebe174b24be9c0fc5b778d7dfa64ce405f0eec7babff5eacb2a00d033ccd773d21378c4fd12 WHIRLPOOL 4f32f56b7dee3c9cc7f1334f2d0c8a639dc63bde6559a15db2f12c5271752ed1774e08fbb2d3bb443051b78ad68651915d40bd04c146edc346de00cfec098aa0
+DIST texlive-module-ctanupload-2013.tar.xz 5036 SHA256 81f6abc7641abe3f0bcb095b9e4b224ace39d4e18d1cf56904929cbb7c7a528b SHA512 435853b386277dffc2aca6dab8831dada20d0251dc0d7038fa4b1ebe174b24be9c0fc5b778d7dfa64ce405f0eec7babff5eacb2a00d033ccd773d21378c4fd12 WHIRLPOOL 4f32f56b7dee3c9cc7f1334f2d0c8a639dc63bde6559a15db2f12c5271752ed1774e08fbb2d3bb443051b78ad68651915d40bd04c146edc346de00cfec098aa0
+DIST texlive-module-ctanupload-2014.tar.xz 5040 SHA256 a57ff2e53c4314c5bb92463bcb0d1bb84fa026265497d1c2253fc1447c235705 SHA512 778ce09abc559ef6e9dfea8a58afb6000990c28b2a9e5a2a4a64838da449e20f8bff80b64f2648396e4e53df85c0f79f1e371ba06945dd43a1f140d4adb10fb4 WHIRLPOOL 38a0b5298e83e5d6996f684f17fc788ddde10fbf8b3c6f81bd93b3c28ddef9a6be72d1a7b9a27fff3e9d94d96104276d4ef0cd4e6cb7261c7f92f86b4c2adedb
+DIST texlive-module-ctanupload-2015.tar.xz 5088 SHA256 55c0e702e2b3c958c0236c333fee45865b85a2f374316b541ce1087844c36747 SHA512 a25c26d7d585190efca0ec6c780ba7c8e44d537d2259f5e2bfde95d16b9ef2ab60d30345099ee00ee2d7e6df9b158f66c960ad9a6985ed647c6a08dee021f099 WHIRLPOOL 05f21b9f9ec041e2e72d7267db182f8773a164a73844519145474295e901c331d3f14fdc04262ae0e9450299dc37c885172cec013e66d2fcffa2516f016cd54b
+DIST texlive-module-ctanupload-2016.tar.xz 5108 SHA256 b690544ac3be4c3fa1074f66fddcd59fedae94ebab4c8992e8d3ea2277cb1883 SHA512 814d68f2870afc8c22d411dc8a2c55fe00851258c315b0be0db28122c939d4b3dd5a446579a0da3c66b807c288eb38dfabc855af9cbcf4fad3905b5cb7ecc1fd WHIRLPOOL 0581bb3aa10cb5431a0c4b599d1a0bcd8128a71920cfb872faa53d51d2596b7741135d8e5d34669ec89aa236f7b441194a9a670db1eea65de184341bd66fb4ae
+DIST texlive-module-ctanupload-2017.tar.xz 5108 SHA256 b690544ac3be4c3fa1074f66fddcd59fedae94ebab4c8992e8d3ea2277cb1883 SHA512 814d68f2870afc8c22d411dc8a2c55fe00851258c315b0be0db28122c939d4b3dd5a446579a0da3c66b807c288eb38dfabc855af9cbcf4fad3905b5cb7ecc1fd WHIRLPOOL 0581bb3aa10cb5431a0c4b599d1a0bcd8128a71920cfb872faa53d51d2596b7741135d8e5d34669ec89aa236f7b441194a9a670db1eea65de184341bd66fb4ae
+DIST texlive-module-ctanupload.doc-2012.tar.xz 174960 SHA256 e0efab1639eb866f9933a0541e3097d05b353e0dd2e702b41b7aea72cb8b207c SHA512 c9bdc567b1cda8de9f9e00eb2cd617738fc52344abc46b749209abf80e1ec3f6b713db715a977756b8bea977bbbff34927ff9c112d4b9b1e2043dc9c9f578def WHIRLPOOL 9e994a83c3620f979a7044d37d4f6013672caf412a04e45f05ca2a7833c82b3621305090a6217e71588542ab182aa779daf112343d56674b8eeb3cf68190cb03
+DIST texlive-module-ctanupload.doc-2013.tar.xz 174960 SHA256 e0efab1639eb866f9933a0541e3097d05b353e0dd2e702b41b7aea72cb8b207c SHA512 c9bdc567b1cda8de9f9e00eb2cd617738fc52344abc46b749209abf80e1ec3f6b713db715a977756b8bea977bbbff34927ff9c112d4b9b1e2043dc9c9f578def WHIRLPOOL 9e994a83c3620f979a7044d37d4f6013672caf412a04e45f05ca2a7833c82b3621305090a6217e71588542ab182aa779daf112343d56674b8eeb3cf68190cb03
+DIST texlive-module-ctanupload.doc-2014.tar.xz 174964 SHA256 e8493a8ba4843f1c81e5344398fdc06a0e493876a77ae2b07b2095722241b2cb SHA512 b8ff54d4466b7fafb855f0a652bbf7e1026a10f0e65f5f3c55780c9b1324dbcf56d595f246c365e4d717d982aaa1cbc4c6ef7a04f96f1c743bad1b9c91732958 WHIRLPOOL d3fdd7f9f8c73ea26c7b15998fd63ccc9afecd76d3bbf25981d3e05efa87708f108e9945a7a89ae697c72a39998c3abada7a365e7507f571c9591803b22c9d2b
+DIST texlive-module-ctanupload.doc-2015.tar.xz 174964 SHA256 b241b5fe36a64542988872343594d7c099714aed77be06b5ccfe503cd466208f SHA512 2fad955f48b3a600105515bf0cc45cd7afbb43d093d0958aa63a217c5b55a663476c31d70a689cd6109d899059ee9bc98d6232ddb3198868500349740fe2c955 WHIRLPOOL 2e6c3500191dc4baaa898b4794b92b7986251f11af3ca20eea223a3332b5c32d4cc5d5ff7f3822f669e0489776142d2b67fc67a2e4574177721176752e625caa
+DIST texlive-module-ctanupload.doc-2016.tar.xz 174964 SHA256 c7f7336330706393d79fdcf1aa3d924ed5baf68fd3b8cc686ec531da6a0386e0 SHA512 e0a50984563a0ce6ad326a12f2095017fe16708c869dd3913ad3b9003f450a812879eb095c8c73e698e34d088b607282a0538eae540104c4a7b8ed24e675b8f9 WHIRLPOOL 5e0cff543f078da09699a0e6f8e1a8a6039c708bac320b5e9717207ec595a434f7bfca4c90265c32a337c66f4fd72b3b415faa1dae1fe93c6059ebb56301643f
+DIST texlive-module-ctanupload.doc-2017.tar.xz 174944 SHA256 f6fda5d3c96279da4f31bdd75d614cb44d0315a15dbde8aeb398dbc877c97789 SHA512 29f8c0649a249c02f05b153590de221eab0147e093c241e78521d0264045c5de3f9f26a5f008294ba10622f4fe7c7cb00217025282faef22cca2d4d6a87a347e WHIRLPOOL bb2cdc78d229bed81442bf61202ade1c1dea60db8601882f89fb6887d0fe6deb8ec8da86ab70e7eb840b5b9eb0f2855f9856f06cfe2f70f2dfaa72758acb0672
+DIST texlive-module-ctie-2012.tar.xz 396 SHA256 5d4a1c8bfd7a66a4fbabf544d377ae4b5be7b646fbd1a60c137bb404e8218da8 SHA512 44cb74a97ecf5241dceb53816bc0543109aba19aaa832c6da6311c09939ac6c5dea82d7358ff589ac6132c7c1ab2c88b6234ca8439b44431cb63c70665b9bc7e WHIRLPOOL 54245c841e3d33c5925a508fddd47fdadff680ca0ec0c61f14a16ef8b0663f9ca111417d66b37197fbbe895b91245165e0ffb0a45d6449ec37ea71a6fd3decbc
+DIST texlive-module-ctie-2013.tar.xz 396 SHA256 441f76ff943e920a36ec892c5f91be6aecd03f411feffcea9370c2be0c6742a1 SHA512 69a48f1cec3ef9a35d801cc7ef2451f21659e90f596ccb69c7b1798cb04daffa0949467c01475d34e1204d00d60f9b98331e1abb727ccd844dd6d413cef645a6 WHIRLPOOL 24884c36caae0912e5e720096cb6e8814c8cce53a4574755f864963246edb0175828cf08fba0a104cd46735ca9c33573bf87675cfbbd4390994f0e38355d8c1b
+DIST texlive-module-ctie-2014.tar.xz 396 SHA256 18da75ddb767757352d011985ad12950147162c8c81d691f8ada296b33f78947 SHA512 1693e0d225ba4c30ad309992185ea729eb23c8736293fcc084a796b1a85bd7e3f29ac5235968797df7d7482b1b283d261fcf08fc34f4c5fad06b0bf03ba5f663 WHIRLPOOL 998d5240b61b28e9606d2217e6b790350c6aab56e6aac836f6f64e021eb5de68af52fa61a563e0e57a4902505c4fbde553c3a0d6f9b1619c647caa5191859319
+DIST texlive-module-ctie-2015.tar.xz 396 SHA256 2720e6fb65ce5855c3f2c6b1e4b852f31d9e58c911f039e18c226314c8691714 SHA512 cc2a17d304b43c9803a3f2c7046b70a89105ae455e34ecc7c771997d215d2d4e471aaabf1267c0a3bc2bbbf4a704e056d7f7189b798a8efa5963638ff92e1da5 WHIRLPOOL 290042d702e0cb558b0a307ba93c2e49c6900586c23edf7c841822bda29a45b8b22079ac49b8407f4f3fb16cdb03dd73def2ba5bcd1c2f82b5bcd0d58a0600c9
+DIST texlive-module-ctie-2016.tar.xz 408 SHA256 86e1ef6321c9b0267ae9de7dc96307e6aae63aca6bf12ea58e4f59dfe8994bbd SHA512 686e4d1682f73e6e881ee560a03cd757c6acd443c182487ca6c76fdc2247e673a9b0b1b1b2abb191b52f1a53bbbc493bed561bcd915fa27d5c565b60d6ee08b6 WHIRLPOOL be54318875367f3d5cfb0543f72aaa0f88def8867f0b6df2d7850598dd1163e2976ca763344c0adb9e7ab3595554a8d4519e81062ba444be8fa21d93e3a0b584
+DIST texlive-module-ctie-2017.tar.xz 408 SHA256 43636c1f7813d3ccf9ab82a4e155b5dd3680bd15ddaf748865e9d6ae16e19dc9 SHA512 b881e721bebd88dfe7de6163f76c424ef85d480cb09e52d9b2b02c6224578fc2a416e1afd3ef803e5cfb7428fea53879029f1ff5c52d7377149cb4fb9ffa0722 WHIRLPOOL f0ef1674e7fe91258efcb2f6bb20e754da49dbeefe06d99aa4c345a34995d6d1cd196e49dc91ffc4018bcad93dd8a446c73c522b73863b9ab855246cfa1b025b
+DIST texlive-module-ctie.doc-2012.tar.xz 4020 SHA256 2cbd9e444e9d362b9c1235eb55027089cd8997e4ac2610d32f3aae46d6390071 SHA512 4a1f9d68904028a6dd460ec68b5828450ace6633426bbb30ccee3ae4707efce98bf16e2fe47ab9f100df198b7552b858383a2cab054a153e9cd6742237931418 WHIRLPOOL 57430a94c8b6104f94b379c3bb7608fdf8b4d5824c8a90f7e49dd458a4e617908397abe61a4f6475c378f5e9738d78b78262e34968df6e56abdabb9a17832c31
+DIST texlive-module-ctie.doc-2013.tar.xz 4060 SHA256 f6eca16b1c0a5b015510b9223c992a19453abe3064d696b2f78ff105a2009fec SHA512 c32a44224579ba86199799048d2e590541191b16075119df11f0994df3ddd2155b3d410673b90a9269c8c3770df50af3048a9a5589d436343d35b65fac09f00e WHIRLPOOL 0191ffbc4f5b4c916d3b046a23d48571438110732f7fb9fd24463c2bab14bc69fda27b29d14720007dba9e4df2fbff806d1b8b3d262b6ea38d1e10e57b128f9d
+DIST texlive-module-ctie.doc-2014.tar.xz 4060 SHA256 9259730600bdb007367c4207f01bb8bbdfafdeb4753a1404d77e5b13a6b8413b SHA512 8204dc78442c34f4df926a118a8dcfb34874e495c2302488792d8fad6da56e57ae779afcbb83ee917fbc248e6577f168d029f62ef5202c5b9b9daabea43c998d WHIRLPOOL 759206c27eca9ceba185a97841586d41c2c307c9cdf7ad4722f4f28704543174b331cb1954923062768cca0b9984017903df2c2910d98c08208bcc17c99a3c72
+DIST texlive-module-ctie.doc-2015.tar.xz 4064 SHA256 a0cd4c20c1baa59b7f526bc86b640161ec795dd2b1a5fffc83db7fa661eeeeb1 SHA512 ced8ad5dfa53ff8eab3c50e8ca6fd037a0d4b6a91d5329c57e3b43d94a751e2c2ba83743da0f1e15ec1be772b49e780d3d419ad89917d2f657122844bf3a6a94 WHIRLPOOL 8936c41349a71afda2d9eef3038ff314f71fc161cdad792e42fdd65d307e23520689154269307073a4e3a54c767804916cc5c2d4c1caa1c66cece144da169788
+DIST texlive-module-ctie.doc-2016.tar.xz 16580 SHA256 5eda259a34cf3d4210d6683a51f666bca1fef4d31c227e78a602437b4841cd69 SHA512 311931484aedb2c217acb7760de9406bfd6e5922c3fc1a9590514ac27087b27268b22e4ec7d8be2b704aba9ee55803ee52ceb6431c6aeb27b23ab8a45c613afc WHIRLPOOL d1704e44924e525df753e462f2e175bc20a33a3af7210b2fe558934b53748c0c1d621991ec17ec7ba9ab77e880355e09de174bb7394a27536892b52187defe58
+DIST texlive-module-ctie.doc-2017.tar.xz 16580 SHA256 5eda259a34cf3d4210d6683a51f666bca1fef4d31c227e78a602437b4841cd69 SHA512 311931484aedb2c217acb7760de9406bfd6e5922c3fc1a9590514ac27087b27268b22e4ec7d8be2b704aba9ee55803ee52ceb6431c6aeb27b23ab8a45c613afc WHIRLPOOL d1704e44924e525df753e462f2e175bc20a33a3af7210b2fe558934b53748c0c1d621991ec17ec7ba9ab77e880355e09de174bb7394a27536892b52187defe58
+DIST texlive-module-cweb-2012.tar.xz 12656 SHA256 05faf9ea203b2d4682dd02b24d8f85d6078a27310b906a9c157a541ded6bc892 SHA512 f55baba71d7dd6f1f6ad194f14afbb58b870edd6298029e1c06394c953aabd2edfecf9e2b934ad084b8b399bc1aea50d72753f957851c157d68f0edbc88e998b WHIRLPOOL 52c839dc70095f9240d43c508572b609355c3d1dc825e0992ecc97a66e38205df78f19e297d1d61113737cdbfff2eb58b20681629b1d5d7d3d5d8213d623964d
+DIST texlive-module-cweb-2013.tar.xz 12656 SHA256 93ff09baf13f7967f63148a6c63e2399d20346a4265439c4c32d754f9fe805d0 SHA512 15d11afcf2b4010ef515332438009d9649e84a866cb58a204c4fee4da9ae172f06a2069702216c848c041ac941a368f7f0e60594138c9e05621ba6541a6b4917 WHIRLPOOL aff4b662483952514f7bf1622bbfafda52f2bca7856673503054fcad83fc55e09bc45472ec051e04f135fd9a3c0d56a7691586883ac31410678cb29fa92dfd29
+DIST texlive-module-cweb-2014.tar.xz 12652 SHA256 16c2ed5ea6f00eae72daf4aaaef93c40f9f2b4df4a01d1bbc024db09882913d9 SHA512 d60cb46d829782ec8579aadf5db3ef8ad07d7f34983f097b3ce401709c5f7a94e9c6509d47b1782608c66629e997e335f43710fa9cf4f3260823e32f42bb0afa WHIRLPOOL 4a6bf3942ae3d5286b8c98da457e5480eafe0d81fad2892dae1811dad953a4dc3b793951b830d01caae5c37afb48961599ff9abf0aa0ecbb5d4342c65c21d7fb
+DIST texlive-module-cweb-2015.tar.xz 12656 SHA256 93559849d0c5247b195951b85f1f5f5f4ef7377ab5596f6ecb93ac463cf8d29f SHA512 d7ef0862f781145773468d54fd04e3064e750d9e30a49bda69008852100a54b69c749e050b750164ac11c52bcd0728445c17b02884601c80c77203535a348520 WHIRLPOOL 50ba34a1ea600d62b58f11acef2260458c1ffa80ff450ab59ecb6adfb45dfcd16dc07191ba33d8b7e023163d4b139a5d3e603cedbeb7e3353d836f18c4a0daba
+DIST texlive-module-cweb-2016.tar.xz 12824 SHA256 8a6cbe643fd8d92c77a2398bfe3056f74854647908b2ac88a989b99648af813e SHA512 935dc109708e6eaad5c5dfd8d8867f44b96f2855513901739da418decaa4bb4ae536a0b6a546c28fd8600172ba57af42a1ee0cd23bd76ac17ca229734ea98d7f WHIRLPOOL 64dcb31e83aadb1768f55cfeb2a67346405d95963e8f48c2ae8bc0b6d13b03b8aae9d804a9eecd83e368219462b6c9dc2c6eff6a39a480a0b237c642559aff0b
+DIST texlive-module-cweb-2017.tar.xz 12900 SHA256 6f7198188d3e56fd2fa0d20d439063e585292f53714bb66751f2c0af03c30b84 SHA512 6e8bea28c9e8288d186f46afdd30b864ecd0abc20fd687f0a8a35aaa9b1ceab0d208af6d0bb5eb5fd0d47a57d0d3826610dcaaba5e95c1821590ade62207548a WHIRLPOOL 21b4bab5fd25271a41cccb74b0e8045d3c7f9a2c91a4e7458adcd02e880368dcc40d5386f03257de6c069984726537d78262f77f279b065806e716898d11e777
+DIST texlive-module-cweb.doc-2012.tar.xz 60928 SHA256 6bbdbb926d7cb440481fab75f0bdf26bb847c438e1968e113a63fe338af1c1c7 SHA512 4537b9255ee980b3411e8a9a6a91a5567c6483cbc2bde63e9e7a659dce84bd09a275dd628d98632504973430bc5d0423419cde0e0faf26b62c3bd9ffe86c8cdc WHIRLPOOL 2ee72e160d858b04bebdcd638a999881dd2c0a90ff435b4ab2a64b29796b26340a7546e4f8c7ddb668ce2352791e155b1d7074140e0855e1793799f8d8dba886
+DIST texlive-module-cweb.doc-2013.tar.xz 62116 SHA256 0cf2edd104e39a5772bc694068c780bb83c5506ff23b2b04f515dc5294cff9b0 SHA512 3e043c176723f87b645e6eda8263be1e3adb28961c50d3f8dcafb48fa1f4546fbc6873569d9a4bbae531932699ecef3dc995a92a09b95c5aedc5848d614f9862 WHIRLPOOL 5902097cf6e2a8e53249103fe144b5127cd03e424074268b158cddcc7422cab7a68bde3986dda08a5782c555b9b9faf07126fc91eb8daf76f6dc3b4ff2633820
+DIST texlive-module-cweb.doc-2014.tar.xz 60920 SHA256 b7ec4911c7c93e1a70655ceb7919c962c97871b6fa40753aeacaca90ed3b44bb SHA512 c2f5fc752bb2ff64414701a2eb559c3e6a6478e20623c2f9906b72853f4c864caa60cc7ba4840fe38c2b2262e4a285d4eb58a3148222bf7b65d1519a25b5e444 WHIRLPOOL 0eace805cb19ac831b55e3217f4e39c19b6f8f33c1922de8df8a68441ba09fe1b4752a4b489b622ed08f6846753a6006502b3bc0b8e87d916461462f9621a37a
+DIST texlive-module-cweb.doc-2015.tar.xz 60916 SHA256 648c90203795f89ed982b822f2ab9998f5d4b3211a94d91e30b4f10cc10d45a8 SHA512 350ab0480eb4d92ef578bf0d8d6ca18b5e88e91bfb1d4c6babdec48ac0408dfbc1ec8130b6aaba5d0127ac4a59d3d35945b55ee60ae743d7890e098b2916518d WHIRLPOOL ff9276cb4b7f6bbdd5bdae034e719458878317b8a770c24308f974cb07560d084f6f0fe3ff36197a7146f83db1358230bda37380efdc5fa28a3945ce12aab954
+DIST texlive-module-cweb.doc-2016.tar.xz 81176 SHA256 bc716532ecf9ea19d565cae96e6ec59b3329ac7d33ba5dacb06bfc645469be03 SHA512 b06d50363037d34ea51460f636c57aaa6d9dd6aa4906a78bb96b0b79e1363423ccfa2c050aca1a995ba48ad36593aa79a8be4b1fc64191a9651421bd50147897 WHIRLPOOL 87d1dade3f62eea9ef4228ae556044ad4348bf7f61f54e9a88936e3ef8bb1f4f248491978d74250c64b66631a8313d29c7aa5a804fc2b5df119dd2dbdd320a22
+DIST texlive-module-cweb.doc-2017.tar.xz 60908 SHA256 db3b7c6548f40f8b452391efa79233b90b945f23f9bcb20378cd3a5c984b8573 SHA512 10db26820e6d3998fc0be20f73088fe7a2aa06cedde32aff51a539d71ad49e8e7f51a25950e1db578770dff78a8f5a486f28590ffc0a655a72cc04b4072d0221 WHIRLPOOL 826b0c39014685ce913149a303b3e17519ec359334b77310e2e31da5601d7b3f3e4d57e8cd6696252ea09738479a0719c3b2bf7b2ddffbae62a2553f4f92d1a2
+DIST texlive-module-de-macro-2012.tar.xz 7836 SHA256 1030513f0c87641e111b1ea25312e4738be53d76cb00b1ea97e79c92a9b97513 SHA512 14dfeea1a2c7f8fb79456eca64b156fd1f7e92342f67fe9f81e3893ccf209d472eec20b52f65d07164a21310330dcdcc12032ae43c753aa0dc96640db608a18e WHIRLPOOL dacde22c15e1bb790a31426b4a6d7398af20cc3783158e4e59f45165635517621175a123d58680a15297da8b24e9da1a1fb3f8ee4820a03302913a9df44b907b
+DIST texlive-module-de-macro-2013.tar.xz 7836 SHA256 1030513f0c87641e111b1ea25312e4738be53d76cb00b1ea97e79c92a9b97513 SHA512 14dfeea1a2c7f8fb79456eca64b156fd1f7e92342f67fe9f81e3893ccf209d472eec20b52f65d07164a21310330dcdcc12032ae43c753aa0dc96640db608a18e WHIRLPOOL dacde22c15e1bb790a31426b4a6d7398af20cc3783158e4e59f45165635517621175a123d58680a15297da8b24e9da1a1fb3f8ee4820a03302913a9df44b907b
+DIST texlive-module-de-macro-2014.tar.xz 7840 SHA256 01b6301c7394bc5e7e5d8f7e9a7e05bd71d0de299c4dce0869a0aaf49bfeeeb8 SHA512 42f585b6472913568ac3a3ff095812ac9a6795432b4ed2ef4a2117afb463c5ab848d75f3a26d45c0d20cf49ee196f9fe9a187e21dae309eb0a02af8b00c079b0 WHIRLPOOL 62a146ae7548054e3bfa28d0299849874e9204d05b58827948964a8fa97171837cda1aa66902849cd47c7cb44017b6de6be37122ab6b4efa4d67275fb7e1efc7
+DIST texlive-module-de-macro-2015.tar.xz 7836 SHA256 c3b07bc59ea76dbf121f5f19c88049bc77f6cefb08ced47b8d8285696410c7be SHA512 42a7671fa609ed231bab0abb875bb10a7c4a33a2530515687a5fc731e6f8805c1a771f09646d78ddb003c776a58da1abd4faaaf8fb5381a606a2d29ca0cbf60f WHIRLPOOL 4ff5bc1e644f6079540f389df4eb1c35ff8af619990fdff296aa3d186995116dafec8ec91258af8ebb41ed72aeba5e9bcc45f121af1e7cdc09b9437b0e525dde
+DIST texlive-module-de-macro-2016.tar.xz 7848 SHA256 f29f5f222d6cca73d70ce703b46177180af7ce290accacd28ee6a6ea5bf9cbe5 SHA512 c1ca050042c263b80b64ca744be2f3153f94fecba7680e007f5be64c9df1a140343205a764ff7bed8a561ecccaf522fb7e89423faf4e665725716ad0f3a26a1d WHIRLPOOL 1b989705d6d2851d390dd4284c462fc2166f1ab0b5dcfaa74af09c91f9e45194c2c6f1f69f89af737a8964f0bb6f5374b94f875f30542e3b869deba1550b4499
+DIST texlive-module-de-macro-2017.tar.xz 7840 SHA256 8770c122884dca58bc733c90cfa294fbda8c45c788589bf6fa55d22caf51e789 SHA512 759f9146b37d485bae92cd6ecfc4291ece42017ce6be601669d989e52229270e04d6e8e26a2a8db46cc9f6f1eed3c5babe57bcf7c080afe828e2320510a3aed3 WHIRLPOOL 9faac402c0afdea2e496f7ad13671560e97b372459fafd3c394aea8a0178c93ac59dd5431df8909830d2e1e663de4bfa36429b2df568bd1fba49637774dec77e
+DIST texlive-module-de-macro.doc-2012.tar.xz 49764 SHA256 2ff01a5888b2fdf5bd524d2fb007eae0128c9fe2395097f11003b2f9be6bcf84 SHA512 b6ebe5da1e68829cacc9026a30e6a54e5e97f67202005d9d0d0052f2c2032d9a625ad17aee4e16295426094d64c2ed5970aa8c2d7cacb181e471bb52001d8ba0 WHIRLPOOL 63ad4993278af278001c6deac922fdca224e2dddc7ff87e1f8850554531d642a8c3406868513b4ed3d5383b2ed41fd88e9bed3535ec255ed4024a9e192bb48af
+DIST texlive-module-de-macro.doc-2013.tar.xz 49764 SHA256 2ff01a5888b2fdf5bd524d2fb007eae0128c9fe2395097f11003b2f9be6bcf84 SHA512 b6ebe5da1e68829cacc9026a30e6a54e5e97f67202005d9d0d0052f2c2032d9a625ad17aee4e16295426094d64c2ed5970aa8c2d7cacb181e471bb52001d8ba0 WHIRLPOOL 63ad4993278af278001c6deac922fdca224e2dddc7ff87e1f8850554531d642a8c3406868513b4ed3d5383b2ed41fd88e9bed3535ec255ed4024a9e192bb48af
+DIST texlive-module-de-macro.doc-2014.tar.xz 49764 SHA256 4308f2bf77d199be82d673539e84b31cd2fe7cfc94e49ad5c86e59693e778f04 SHA512 461842dd2ba2a3febdfee752166a0e9b62f3ffc7b4fb8fa3156fd1db0de71b53990802e43ba9939d774a4b2ee8d6aafa37d6f0cb17616e41ff9e6d066acb0d14 WHIRLPOOL 90c7f7c7f59912101bd54bfa8d4762f435dc6d38776298ce20aa906eef4fd066be8affbb756652929084e2aa245623600fc703051f34fcbfa0f3fcb0daeca3f1
+DIST texlive-module-de-macro.doc-2015.tar.xz 49764 SHA256 f863c8aa7d4111addcf9500b3e335419f7f35f5b7737af9b5906f18a8da3d938 SHA512 eb49fb4a2e92973d4183e5ca64097ebc3c4eeea38baa3a3d000c885edfd6fc0bba509a4a350da711a2fdc3fb36f07e54074a6e78a6927cde57b807a050e48136 WHIRLPOOL 69d510d339b7ec9df3d120b0eccaad7c4e696b64e0d662b1346fc17d4cce4ac03894330150eb3ca0e34e49252100a82f4b604e4e745554c4a3168b177a2399fb
+DIST texlive-module-de-macro.doc-2016.tar.xz 49768 SHA256 918ea2cdfea228e20a86c7db9ca49b55f348bb0e69b7a6dda38e74aec00b4543 SHA512 5807f590961fd581f4a30068d613345af89e7f21858cdebf70f48cf714e105026e6b7806ba65b9a1ca0ecf138f02b1798cd4e9cd91756d6bcbf925f7b5a63915 WHIRLPOOL 4926945104977ab5bb1111f485b8ac4df61a6429a97d854d87fc63f9ee0e4acb97b32d9f81f1c5932d63fc4d92fe11198d9a40d2d73ebbd4e0e3e93f90458e0b
+DIST texlive-module-de-macro.doc-2017.tar.xz 49764 SHA256 68458079326f7498b592b754c6fc94536793cf4d5a521737c4113381113e3674 SHA512 00784c0670b5f11ed715f76745acc3ebc098b318ca2b00c294dae3ebf162af0f47b4192d993f7b1f5d443eadf0f7a2644cfc2bfb71956eb680cad2c593a29cee WHIRLPOOL 9dff84e93bc4a8ceb35dd6177e2b9f443702b855eac77234d0e6b844267945e63fd125737f903cdfd50cc34657db8cbef7850f4a8d5a9ccf003e81ff3bd7a5a8
+DIST texlive-module-dtl-2012.tar.xz 20192 SHA256 4e614ca961716ee879e449f3fff0323bb7494c07cf8a62332429cbc3ef193ebf SHA512 a4e555e99694063004bde02c877cd3a65ae40dcb70e067eea9408118822b583bd32aec01d2f263e7bde67794538735775c70a9de039d4454bff3a314bbe59b9d WHIRLPOOL 2035cef66deaf20bc8305cb84b50fe7b3af17fdc96a05d1c9ca96d9764e927c77a72da56614bc3e418fbff3d86b7b3a2f9adee81ab529aa27cb626bfeb377c37
+DIST texlive-module-dtl-2013.tar.xz 20416 SHA256 4e1acffd00d7edb6b40ac0097177cf10ea6d51a4cd0416cc6420901ce2d6a4ed SHA512 d6a9c7394606f50b88922351b0870006af526aadd38666560ff39cf21ec54604a06ee72135ed2fc55cf8b036138e1b981902a850ef2cb28f8186375791ee5c9d WHIRLPOOL 142cc08a1f1869f19514ae670737e7328af53a06998e21f9091378f031e9b5b89d9fae9a585e4573bda8fdb8af599c52707b8b727b30c43b52c19da69f9a0359
+DIST texlive-module-dtl-2014.tar.xz 568 SHA256 1fd88b0ced165a633f1197e4254d2379331daa7f832d474ef7ee097f14f78382 SHA512 a0cae691f69a480cb9c4dd0342421a6512e53234741018b946c06f07a4381e99cf81fa2fd4a7694df259801a55ba64a9ec605601446cf6f882652698ee8ce9d8 WHIRLPOOL dc5627458db01f59f2b4c4d1939ab525feeb051674dbae669d1de62542134136f8f411345c179ba5e4c6a6e98d94b9d1f8d50daa34a9788c7aca080b9f17fd02
+DIST texlive-module-dtl-2015.tar.xz 568 SHA256 29f0de1177537108bbfea3907a02b17f020ba100d1d1df35b71c3e34ff23c5a4 SHA512 79c0eb2f51139c49e8c88857b33fb22ebb085010a6d32f64f0304a2a26a17426239e96567a25b8946b7dd98febcec3da96282deb807e35b1cbe14b6b46a9aa1d WHIRLPOOL e65f4cc884dc079404f5e9b1afd8b64f271877da9080d7b0fbaa7ac52b3a8a1c6ec5d0bf95a082e41ccdb435d9bf06439e72968d689a2ee20a67a554f5f528eb
+DIST texlive-module-dtl-2016.tar.xz 580 SHA256 9ca7de3ae885141b66781c6758e3186b7cdec42f7a0ef0bf460d306849df9c5c SHA512 a10e239f20462a47c8ca0955dbfac1c8d3fd6a73ccaeacca07afe4dc5b7fcb70768cb9c61cbe245b306cae045e8179772c69cfcbd866f6b0f9388c6da54b483f WHIRLPOOL 8cb7d161974e76d1c50699bc1a2d9f3f79df4390e2458ea12aef041f50d1febb2dc3aa78769585e819274336ace2c976e8f59a3ac29d44eb804d3f89f18f6abb
+DIST texlive-module-dtl-2017.tar.xz 580 SHA256 9ca7de3ae885141b66781c6758e3186b7cdec42f7a0ef0bf460d306849df9c5c SHA512 a10e239f20462a47c8ca0955dbfac1c8d3fd6a73ccaeacca07afe4dc5b7fcb70768cb9c61cbe245b306cae045e8179772c69cfcbd866f6b0f9388c6da54b483f WHIRLPOOL 8cb7d161974e76d1c50699bc1a2d9f3f79df4390e2458ea12aef041f50d1febb2dc3aa78769585e819274336ace2c976e8f59a3ac29d44eb804d3f89f18f6abb
+DIST texlive-module-dtl.doc-2016.tar.xz 52976 SHA256 3a70458d45c9c1738882559456f785387f45b04692b0553b8083354c5a082da6 SHA512 665c3913285843b7ac6d4571d94eb70a29b64bdefcb55bcfc9e21e2fd5f290840f66d83c58c35945dd9cf5b53c5da08c45bf6082f444e948efc2547580f7a192 WHIRLPOOL d0e3bbc5f0ca12cf20145193b7a136350bcdb59e96bfc295514d1c5d887a3ac9bb2df7b54721f6e5022e618a940fba42d40764e0f8bae873e97ad144da6da2b0
+DIST texlive-module-dtl.doc-2017.tar.xz 19580 SHA256 48e0b6155749e8a88c89cbe20d4be5dc05588379b5502c5f8b1a91eaee296efc SHA512 a340bf2a2af68edca51f4c6a7cede18faa8da5fbddb26a134bfc28e4d79dfb33631a8ee562fc1598596453e4030fa6ec343dae588223adadfae5dcc6953b3169 WHIRLPOOL 338a6139945bb3419061bb16f220e3b19189475f99639201895a8c94399c32b2662ff7beb49e261cea1a66df90e196e909fff5a6667422d868cecf4586fdfc5b
+DIST texlive-module-dtxgen-2013.tar.xz 5552 SHA256 eae11228693cb1e495646f68319ae76d9a53db58f7f68b1a983c5c4ea41d081b SHA512 54c90660bab3e8686e765d398a4304498a8c3cca2e7484d1d6cdf7f67abe392a7bbd7d7d5d3d752d6fad392de578b44965682bedfaba3ca216cd491287a399be WHIRLPOOL 3f84efe6fe9d92b9bb9cb20a84831fa7fefba78a65cc2bbc7606db367723cbfa6c2d99997aed16e7ca6eda0d5790662544e18f0e7227fac0d672565baed5f390
+DIST texlive-module-dtxgen-2014.tar.xz 5344 SHA256 71b3ecffde1fd233e74cd7807c468f251d1722321bdcf52018faa70b1ff4a8dc SHA512 9f70bcf749d15be7d49ae83f9610ed84a9a84c60c8c2056ce7bbf249dcbae1669449c37bc01161ee75603e75771f1fd831f609f4aff9f9c8d95551f4e0f5e894 WHIRLPOOL a631d6eec87de53883b6eb2a71c6f5799b576fa2fc41e508d1550af7d47231613e06003dd87ea791418e9c2d093e87989eb83f5a8a55df9755730f70c5f17751
+DIST texlive-module-dtxgen-2015.tar.xz 5352 SHA256 4d299d47bc97dfa1ca697589c5e7c50da11a1e3eae4a34ea8f76bc87768f23dc SHA512 622bbf140081446def15d7fccfda31981aa7eefd2a703130482e13cdf41313c4dba5c700124f6b246b9691ffa0c0308aa149fdcdd883907ad6ba108bb0aa8295 WHIRLPOOL c54efc89e826b0c5c3ac57b48a566dc4148ebb4d15610b7c8e5490fee571dd7647dc0c270f8c0ebdb442a6a3f1ce3de929d47b23329382c642eece8e60ec7a43
+DIST texlive-module-dtxgen-2016.tar.xz 5696 SHA256 d89697b394aa7df96093644f0342444e1082e2069a8f4849433fbdf890a31ef8 SHA512 969342405ac223c212038e241b2396c4300b7d15c65f66d87a32a7fa7332fca25256e3aaed6ed9a23639b1b6e8acad20779b238b2ba8a75a8baf5002926a6f77 WHIRLPOOL 70e8108bba8aa44b5aad5bbd7a55c7811d50319d31def056af8dd819435dce668fbe86529e065fdc8294ff51e5932e864fade09b1d0bcc650dba0cb1d9c24aae
+DIST texlive-module-dtxgen-2017.tar.xz 5700 SHA256 f387a98751d8252bd450c514cd66ad3b88a559860c56a093655391c0fc7d78f7 SHA512 faaf12b7897a2d9f2d647096770e0f65bc44fd36b84a6587672c9551cb79627c71bd6cbf251bfe3ebc407d7537f9e8d42f5b301df7760afca7269cf2e6699915 WHIRLPOOL 9e84258f0355d434c6a81df790e5fef6c8276581a43f3d3e0e02e9ea798dea9f11fdf9eb5be61c91630420eab241a8225376927a35ccbbe0cb2ef8f69f2c5111
+DIST texlive-module-dtxgen.doc-2013.tar.xz 64712 SHA256 13c28a3faf161d3d2309076cdd6af2fb69b7991136431393b58404aafe173aca SHA512 4423cbbb2854ffd3ebdb779037f11acade6542bab77d7a53bf5fec3dae056a816d2e82b1a1ad0ddd21d357314bc83049dcd0460d1673b83aa4ff54b1df0d8f38 WHIRLPOOL 50d4d28a886a9cc4c6c51cf87fe5e2fe6b8adc6af74eaaed2f159cc1a308e4c657d26f9d5f9c3e5b5421d3bb5f5a80906d5c3b3fa04d5ef84b6fbb842cba53db
+DIST texlive-module-dtxgen.doc-2014.tar.xz 43164 SHA256 6d3d8f9fa201f37f418426cc364afeb4ebcfef1bd3f070b9977fedccb011bc04 SHA512 4a63491d66fe78e82338842e0dabefee003023349b8f65b23089aa4651203f4f8d39988eef8ed0911e5560b050916f77920c864966d8c735b490e4249d0a1e48 WHIRLPOOL 99b0e865d4b64104efbe0b655e141c3e9d31bbd64e940d3b148be1d53a56fa85ec39fa2e761c14c4b2e5ede47f7cd7c1855c44945a7de259d86f086212950432
+DIST texlive-module-dtxgen.doc-2015.tar.xz 42712 SHA256 854444857a178a9d6fefbf7e2f438fb100e8c02bf98b1232e473d016f36cfb14 SHA512 a25e807a55eeebd57a6824f0f8657e9d22f9bd9792da7691dcb36cd3a9fbe6b2256ce4a17e1946026099bf3a821f5f2007a80642d77d690992840d318b2e8c3b WHIRLPOOL b1132e968f76a469a4dbff9793d34b30048e8f65851d25e27ce5669c226540dce5b3415e11069da4388c53a5e8775821ddb0b434c244fa65a21dca5cc4518675
+DIST texlive-module-dtxgen.doc-2016.tar.xz 46204 SHA256 b467ec97596a93a92453c362c5ddc6a1795b63911850af6de9e4acb11886940e SHA512 25ad47b247cc8b53b388f776b803959d0c3a532f8fc3092696aec1a6bd08d13373963cc9708173d946af696aba172de7e2853eab4ee6c4e70ca7ad106b437834 WHIRLPOOL 75f8c27cfb92fe3c7676a6795c6c62275a3e4c210c2493f7d8dadf29dbd9f20b378d9781189fef1e4f147c752c9a797a841211dfa987ca3b5038fbb7177893f1
+DIST texlive-module-dtxgen.doc-2017.tar.xz 46204 SHA256 71343d53116eeb5c3644a90173bfc5f7c532d8e99ed543e9199cbb79f9136831 SHA512 e53316cab21fd5c9902c566dff44d4f16da6d666040185df3962c8119726fa135acdfe1f08b5a011a3e2287d157b3ea98091db46a5dfdea68994edfedc04a90c WHIRLPOOL a32d54cc7b5fc48cc1b5c45d96b0da0f596e015776b9092524bf90be9a9ec2feb068f34904192745c454e057003571fc06dabfa02e150006c8c3c52361d70808
+DIST texlive-module-dvi2tty-2012.tar.xz 10220 SHA256 b5c8b7118979901af41fb15f6e5c7901a5c577131dd467440b7ea7ef971f49dc SHA512 518b73cf96feb19a2f4d7b4281c429f0b949d9fc0981e5ab149ce537c47e1a892897deec5b7ef5047eae8b7d91750b4d5a6b77fe7df4d7c076c24cecb9fcc7ea WHIRLPOOL 5f445623b292bb33ffc3f1d9796e5246400144aac7dd7eaf7876bebcefe8daf64ad3d4b1481a91cd99d17661454e8ae8d313bfc964d284284cf699b57a1b22df
+DIST texlive-module-dvi2tty-2013.tar.xz 10304 SHA256 0d1483e1f7c604c4c54302a934396198096a8736eaf0c39761dad820de94a978 SHA512 77be43f03b9054c1f5b6ed61ed63f1024548b79cb725592cfb44f611bed0f5ce797333ce2815bf190afc1303317518ecdf8cbbbc7d99e08e088f99778957d4fc WHIRLPOOL a8afd38622de14f6049cfad2bd27e4d63043f26b9c32c67e3b28c562271075ea23edd930019d1d9270ccbad154d51745de26fd66a0c947316ab4626567e8ca9f
+DIST texlive-module-dvi2tty-2014.tar.xz 452 SHA256 7577904cccd5b70169677248a293d34a1629738ffeb8f1f54bc2a2b125ad569c SHA512 1b98b277de404af4ba16387fd818a571158d03ddd631356fad6aa34483035aa4764115cc56ab786bebae7e5c117d949270fc79e43f24f3f91bc806c2aa95ca00 WHIRLPOOL 77da9e406bd34bf1d251f3e15d4521cf2a0426a5beada5853f3517fbbaf294d37ea2d131de7db38f4eb16ce16136f15219bd8a059a16cccb7a02e6c03de9c354
+DIST texlive-module-dvi2tty-2015.tar.xz 452 SHA256 b06c243174f3feb3ed9133e655488ad9bbaa41189c491ab8d24db0a2d28379e9 SHA512 b7a8e8ee90809d2e4b058eebbd590245aafdfc766a1a93b411d4b2237ba275203e6b44f9d45fcbbf0dc7288ceabb1bc527e81019c92651ec44a2160dddb527dd WHIRLPOOL 2c6171fd86c93e2fd873438ece14f327e0dae5afd6937878cd127986fdda7b5cbc6be845a5d040865ea50bdf528af6112112c8c9d7388bc15ddeeaf328b686dc
+DIST texlive-module-dvi2tty-2016.tar.xz 472 SHA256 16a8a845f131c9509f11bf63aecdc8fc2945d5ec6b49f8d4381437cc4952d3b4 SHA512 94b16b7f07d0a2b80b4a356d76f8dd38ebf948be85f691fa132ae971a6ef29b09ba0f89d2633d1109eb8ca6fab1842919a83144763b5a4774ce41b130f42fee3 WHIRLPOOL 5cffd9e1c3ab8bd25ed37c892935aa9d48c795ece94b22432e11154fa052d15832ef25ba6060debf189b8988375622f36c03a3f191662c52b710dc011b802716
+DIST texlive-module-dvi2tty-2017.tar.xz 472 SHA256 03f2f7f2790542be12dd332dd9a6f19434cc78000312368917f59e6154cbdeb2 SHA512 21a8e5e9f077ce1fb1e6b5b249d8eed4a75d007bbff65c58edb83fe07932440568d8d8ad19ac714e12e57d0aef56ca2d5e6276e51c249c172498ca404cba55fa WHIRLPOOL c7fdf3766f61e2ec6a6a2223884d56bacebbd9aab064713727b3289ea15f915eaad1ec8ee6091a090590bd2cdf7b38eca657065a268dd7f8291ea4a2e8701002
+DIST texlive-module-dvi2tty.doc-2012.tar.xz 2628 SHA256 ef7115fbb35ed0faab443329dbfc309e1dd8bedc759920bacb03ff8aaeba96bb SHA512 fdf0becddceaa470e304fae0883ce0eb30d2bb69400eeeb8aae411f5218ad955be92a193c7ca51ae7af2baa9345032c9e5d1578d57efc6a5a367077e28f16922 WHIRLPOOL 3268d77309f6de6d1b54c14bd5a03b2cdd6ada56089486fd381f2f04cce6ba0a35febb1a25de04ae32152c47ea9d4cb75f6a9beade035448bdea78eca3a5b1f6
+DIST texlive-module-dvi2tty.doc-2013.tar.xz 2672 SHA256 d01ed9a42cda2e1d12a6431368e586af214ae061c680da669cfff7b5549186e1 SHA512 bb315d21808a13f9472e0e760b4b1ab1a979e5d6d24a8a3df636a9bc2e1a385e83b6b6f321341780f2dba9f636e34d71b15303353bc0941d3d953f5dd2dce1ca WHIRLPOOL 6a13e444f629946ce2036a208497e3640bd0c79bcfa904448d0a8cab5f448fdffdbed585748df662fa1e0555897ebe7470fd7b913cb25555d8835348e5cb8a9f
+DIST texlive-module-dvi2tty.doc-2014.tar.xz 11564 SHA256 2b94264d6e38f035243523c6b2ba211406e1efa5138dce5b70a5024e480b4c2c SHA512 93d517df64d6863df9bc581fc1b297c26c0b85d5ef3c614db47719824af630740a71fc365785327e90b5fc0cf0158a4558c2431c57dedba74a9a0e44f5a3f279 WHIRLPOOL 5004517b2c4e63462f544f3a1edc88c80ba9ded432ec6596b4102e5ab29218a5e2f94a0ba75fd3979819b12f00ed937b6f23643b8710fa97fc008c87a6bf73d6
+DIST texlive-module-dvi2tty.doc-2015.tar.xz 11544 SHA256 afaf4ff1a869f61e85138ef5db40852ea994309a001a69870face1d2cfbb6b8b SHA512 0acd601bb9abf23e9d1dffb02d63725b086dd7ce2eece45408ec8d650229f1b1b1c03b0d0cc251d6e9219281c44809c136f675e24d9d0d79d9e5f74d7b50d1ca WHIRLPOOL 87e9a817ea6384a9649ab559c97345d433153694db667cff71a66046e6cfe2322c80a6c6b8fd56fd8b023b94c91fa41edf3141c84fac9743d1893db309c16b16
+DIST texlive-module-dvi2tty.doc-2016.tar.xz 36292 SHA256 9d1d703ed3a05670cb34d246762e47a38e1f0510203667739171d23d9c179ee2 SHA512 3a3b1b1d38b16525b1275c356b156b1223f00343e7646dcfadc699d010bef8a968aa8a2c9dc43a81650282f90fd3de7f3a1fe7ec01218833c24cc7be75b0ceef WHIRLPOOL fc200caab21cb0962f11b2cb507ba61dc8dfa6ab7d39233b3fd16cff3c6f3d395cc0dfb36a2c40e61100c6d659ff6c69038af03c83041319340bc008e780e1b8
+DIST texlive-module-dvi2tty.doc-2017.tar.xz 10964 SHA256 e250665d782e2237846430a5f70044131f47a5aec3e1e6c13089fa0b56f3faf4 SHA512 5384f60e4b72858c10503f458a50f0d554bcb081cbf3614bbef77aa351855bc70b69a59268b8a3dc1bcc2a26ecfbbe06d424a888806fa7a3d05df1b31c1b1532 WHIRLPOOL 65c6391e6e100dd36a2ce0f620af9a6e4af80b4ee6e6691cbbd4d6745e7866f9e091ceecb54e1bd2d761882b11f1c585e9ec02fb5826d3db7784e8e7263856bc
+DIST texlive-module-dviasm-2012.tar.xz 8140 SHA256 900135c4a175fc84d4610db83023823eb0ae45ba8b7a1a8e087ca35908363559 SHA512 ea096b73396f9d96563858714704b8399e1e21f1f815ed141582ece4a2ada2d1f61c94c339f5769489a02149c55cd8838f6bd099729207c065da2577934aa11a WHIRLPOOL 9dc2c351cf0100ca42673b1f39d67e4e82bbff2d0ed2001635c44d78d6f5d1e0d2bcc94d6726f4b23b03e05a56aa9d216956fa07e884e459de958212a0f69769
+DIST texlive-module-dviasm-2013.tar.xz 8140 SHA256 900135c4a175fc84d4610db83023823eb0ae45ba8b7a1a8e087ca35908363559 SHA512 ea096b73396f9d96563858714704b8399e1e21f1f815ed141582ece4a2ada2d1f61c94c339f5769489a02149c55cd8838f6bd099729207c065da2577934aa11a WHIRLPOOL 9dc2c351cf0100ca42673b1f39d67e4e82bbff2d0ed2001635c44d78d6f5d1e0d2bcc94d6726f4b23b03e05a56aa9d216956fa07e884e459de958212a0f69769
+DIST texlive-module-dviasm-2014.tar.xz 10040 SHA256 1b1991b41af89ea72d6863d8fcd71e590ae11b2ba7b74ec2cb4e8548f1367a35 SHA512 3f9c133805dcad2952f476b627498318deb03f2f3b9b5f2821484a9cfc54e1f6a0619cbcf339dec22daacd6ee9657e0ee218754811c13875a9cea91256f5141a WHIRLPOOL 65bc5a902a51fe0791c9037061e2f5195b3a656ea05d59c3b17c96ba560703876affb18f77ff5be6bcfb12e92f0cb31d6ff16363f3e2fe29855a00655bf7b7ed
+DIST texlive-module-dviasm-2015.tar.xz 9492 SHA256 d4db83154c01e88e5817d46c921b3d5ca7b2e86f6b2d1a57e4c7be3fc7679fa6 SHA512 a7fc1a931e9243ef13a5e54272ee89cc7d6b8a8ec724b19b4999e95532d9debc3d98a9b563381c07d9ffb2a01dd80e2921683304131552eb1d809394c2894079 WHIRLPOOL 1c4e4e497ea73c3f3d7e886341ea8253e988ea23cbe794d0a5bf93f4f2256519f055113203f11f616006bf7746cb92866e7cfb6fe34ca15f0849a145e06c7544
+DIST texlive-module-dviasm-2016.tar.xz 9516 SHA256 f65762a5c89db73da07ef2f4ba2ca17bfa38e5ef71df2b838459e11657154fcf SHA512 25bbe1b0a90886a025cd1b64e63669baa382e1ac4517211edb8d01dc7876cfacc3dd13358727c4a5f3cf171aa90f8af7c822c31c8dbe3bb55512eab97ec1e4c9 WHIRLPOOL 57e2b5489a82a2da1c60ee421eb9508bd553e0d37e7ef9c60aa2bec0050753a28098dfabe4c27e26c20e9f67a8168c4f51fc7089e3d76a5be7fdc9919cd0b3c1
+DIST texlive-module-dviasm-2017.tar.xz 9516 SHA256 f65762a5c89db73da07ef2f4ba2ca17bfa38e5ef71df2b838459e11657154fcf SHA512 25bbe1b0a90886a025cd1b64e63669baa382e1ac4517211edb8d01dc7876cfacc3dd13358727c4a5f3cf171aa90f8af7c822c31c8dbe3bb55512eab97ec1e4c9 WHIRLPOOL 57e2b5489a82a2da1c60ee421eb9508bd553e0d37e7ef9c60aa2bec0050753a28098dfabe4c27e26c20e9f67a8168c4f51fc7089e3d76a5be7fdc9919cd0b3c1
+DIST texlive-module-dviasm.doc-2016.tar.xz 664 SHA256 e765a2d59902907a25c5b1822c7c2b9bb55b9a9d5efd7063564359c65a0a1a08 SHA512 88e2ade06aa8f4effc61e52d3cef76bdb3e2ac51b16e73f3a50f6183e3f11b144faf98bfede4d8a49627c247740f5eef9b06f76bc6d2838f65bd1592d65e1991 WHIRLPOOL 621a1d5bb873a59af4aba7ad126635d7c18356aa8d1c18f713b9155131f5a028d881ca2810c082ae31905194d829195cc4e3f683b9ecb62d9e439857cf51d829
+DIST texlive-module-dviasm.doc-2017.tar.xz 664 SHA256 263a8f2c41abde58b48d9f579cb6ce25bdc22932e27f5abec3ddfef290cbedea SHA512 13b9b6fe891fe6c0e5c7819c74225b2b943811452562a684c1f71fae7628ba167acb48178187a5a6d56625744ab840aac90cff15010e64e36c3a4eeb1ed84ceb WHIRLPOOL ffb6004e7a5396d1ced16992d24f19a4bf4ff1a306b8f2bf1f59b867703bb4e50858db360b3f44e787040493e27264eba1efc350407f0a17f15ae30662802ba6
+DIST texlive-module-dvicopy-2012.tar.xz 516 SHA256 ed4189c34495d0061af11ec077719360220810952b721e3fce42db48b70a574c SHA512 731a0cab9bb10dcb2a668fae348bce470ca0de4df26412534e1cfd7881f9b9c60b952f0a260c3bcf2812558d319dbe4065586dbbc37d1cc8cd580cb33dba5208 WHIRLPOOL da48e776c4dfe4cb7f7ae7d6d6c88fd4b2ad666c0a9e9707ca7cf99926ecc690c799ecd2437022e691e1660ff315cf6b97a26e0049adb37b9f1aa440c67614a6
+DIST texlive-module-dvicopy-2013.tar.xz 516 SHA256 9179724c6adc0a942dd1822fa32a06b7d951c0057672373c486d92fac6aa8c9c SHA512 cc221657b061d1ac26d34b53fe740cdbe6941696c3e13ce30f915ed74fac10c9dc678c3dac4524bb60002b2b835e4b868c831642702b153aeb88e127e50b772d WHIRLPOOL b832f06d84add12f6b5a8dab1bba762985d689476f10f509335dfe28f8b9557847300bcba77794301fd8dc31240068a5fca76aeb8f8290146282a9cfeabe041f
+DIST texlive-module-dvicopy-2014.tar.xz 516 SHA256 49dafa355867565869a2bb3ecdd97cf189bfea376db8641b23349730a27e4f99 SHA512 bdb29f2bbd7af4900f829ec4da4d243e0c8c2c3fab74f05f9948a4eb5e81c5732a7e768af91860c924bf10c3a6316c07e27f9bbf911ab8840856f3f40367c800 WHIRLPOOL 82a66fb29854daeb56ee542263c1b43fca13096d430cd4d2bbfad2e6c9d542ccdd03343f7469f67ad50098d1d139800956e5179163a6e48ac343a2e28e685cf2
+DIST texlive-module-dvicopy-2015.tar.xz 516 SHA256 f3911f3f3d6cb985837964ffcbe1ad21685fa800257231f829791c256f268588 SHA512 0a81fbe61977b0765d57a726bac13434551a12689dab3951da54048bd17e72b8c848ed66fb7e3ecef608b55f9e262427235908365b549caa474a3047993bc839 WHIRLPOOL 5970b43aa05f55a7df22e32c1a39ec976ee3aee918a306fa3b3108bdabb126d056551c3206a96342a36bd7af8fb459a27219dccbd251ec400695ca3bfafab8a1
+DIST texlive-module-dvicopy-2016.tar.xz 524 SHA256 0669a424110095ab062de3413b5b11c709c0ae68a657fdb83339883a2df38764 SHA512 537444d1baa72d23c09c42a53c39bf111a363ad683fa94851baa186b856730e37c01ea5aa60076a3da5475503fb134c44f8b32bc8bceed3d63e809d1e4161c0a WHIRLPOOL e328caca900855ee0104726d49e212b95c9d1b88fcef8e38edbd0f70510e2ee868b7dcc655930919cc17c91becf74a10e6686ab3a7191844ac6321a53ff747fd
+DIST texlive-module-dvicopy-2017.tar.xz 524 SHA256 0669a424110095ab062de3413b5b11c709c0ae68a657fdb83339883a2df38764 SHA512 537444d1baa72d23c09c42a53c39bf111a363ad683fa94851baa186b856730e37c01ea5aa60076a3da5475503fb134c44f8b32bc8bceed3d63e809d1e4161c0a WHIRLPOOL e328caca900855ee0104726d49e212b95c9d1b88fcef8e38edbd0f70510e2ee868b7dcc655930919cc17c91becf74a10e6686ab3a7191844ac6321a53ff747fd
+DIST texlive-module-dvicopy.doc-2012.tar.xz 3624 SHA256 2d013d37e5fdc89d948651a2ac8723e6de5870702305fd961992eac3f4ed8a14 SHA512 71cb1cb89b3232ed678405020efd6cb131a85ae173cfaf7401996fdf11ba2a9e977b3fd363366dc4147519582ca3b4a3d77ee1f7d3fee573f1a3741f984c5821 WHIRLPOOL 4c07227a1e6f15b8d5c41ff1023f78d458704c215d2efeaf2da923f3e0cf7ad6c39adbdec1f65e7e90c4e5be66a97250ae6ca82cab9e1d4bd54d437d8c84f552
+DIST texlive-module-dvicopy.doc-2013.tar.xz 3632 SHA256 5e0dafba8febbea7a4868f42cba424cf133345822ae41c7eb6e7e49e58a4132b SHA512 97a584a01673d65205364d571676d8dcf5a45f6d5c7d3eb59849383c7f2322a5f5024afc9ab3626c05f143a6baceffc733582a1df9b2daecca37ccdf699b614d WHIRLPOOL 98d6c0c84f4ce3403ebe15260fd203bc1aa8a9527d22e2cf89a78e08a44bc3cabb44ab10332b5ebfe1fc354ff8eaa5a11670c1aa469b867edfad77915737b4d0
+DIST texlive-module-dvicopy.doc-2014.tar.xz 3636 SHA256 b4855b0c368a84ccf791274b8ea7a27e3e0d261b3230da32aa62a93cad1a2384 SHA512 de0560594f15d00f32b1fffb68a3f732dc3250f9f74db78f4bbbb2f8b69649748540c5999b203fd6e2dcddd82ded6402e91b57a3c37a9077c57a9ff842162ed4 WHIRLPOOL ae81df47cebc7743d4fa3a6dd2f038011c7bfc58e69c0b50aded6a5bb4e1bfc41c21e9f1f75dbf6f83b38f0dd10f922f06317bc693ae4e82bfeb3813dcdaee4e
+DIST texlive-module-dvicopy.doc-2015.tar.xz 3640 SHA256 b7516edc3b7bd6ad521883aa949878a16d5e562389a9c62136bd7073fc690a33 SHA512 e0f620b1881019ff79adfa86e28f21feeffbaf66f8e886dd55b1c1de98ddb7edbfc3cf6c4325a5e7d48ef794bf355a55967e68ce39b5d6c148ab9b8bcb64f8c6 WHIRLPOOL e9c89eacf465c5f54133fe473af1f1a86ed674778d170124547e3a59fc5dfa2b694bb703199eb20f01852a6f54e0acccc0de92f03dc428ba743382516e8cd327
+DIST texlive-module-dvicopy.doc-2016.tar.xz 18332 SHA256 19cf99ed429184890432e6caec95765fd02ebea1ea9b32d53f7c9f5de33f5303 SHA512 d5795057b51f3744a415b155340fda499b1e2712f55782f330732140981d3cd74f9126d882b08064d2a98b972912959975b89f18da5f763273db66ea149e0ba2 WHIRLPOOL 7bf2e7e2f346f0e27f1ba508e1c1a6b7c8a7c60db217ad9ca36169ceeb3c91d186c1485acd83d464d782268f1e098e59a6d1b37db30553df7d19f65c2259788b
+DIST texlive-module-dvicopy.doc-2017.tar.xz 3592 SHA256 3271e478632db1451d8ebc5e18f014616bdc22bda1ad8a0ab64f8277078dd303 SHA512 c308ffafbdfdf152abd842918c73aa55689a514a1de6cdc53595ea988bc7aebacb022efc77bc5b7eb0469e619f1fb6916e2a3515ba5dfc6e4744a22b64dfaee8 WHIRLPOOL ed3166961fab5c4fed13c37a98192e9a5582aceb577aafc4119fb7d4ad217899e2ff76f5bbc0713538d841cc11a95deee2b537dcd5eab60c8010f8fd5d935088
+DIST texlive-module-dvidvi-2012.tar.xz 8504 SHA256 a53635fd86ff5acd5f6fc2adc3532221b24e9dd9dd4d89c955abbc9b0c3c67c1 SHA512 148a3b55a22109a139aee1e3c3815a76bb1608bd974cbe3ecaff6893938eee3c529e123d5c1d7ce81fae3fdd5d0cb7f80c786e7ea1d395e753a41e153ab52329 WHIRLPOOL 7f143230308f45d9f6a7ff8dcb7eb95932d2b47f7b1b153d222166d83f48c9b992c19eb8004f5fa7e1782f433f495fbffc44c81dfac1ea3a36fe29cce38855a0
+DIST texlive-module-dvidvi-2013.tar.xz 8512 SHA256 6c20c08d0e87a66c68019dfc55718aaa5691cd665fe613fa3d136b1c3d4a3517 SHA512 569d129a7822b815c8fc22a5065b8a0f867ca08ee045e8775156a2329dcf646299e1b6b516746791a0d23bda5b029ee9d048d8d8c48cc5bd9c86aacc293bb61b WHIRLPOOL 227a58e72b88602e4b2532e4c64cefbd387c2a54b35df8b4ebb86b947aa30e34d644a0ad49d6242ff13a3b8d3977897dd96f8d4c557f88f7e9c587449ed3b3dd
+DIST texlive-module-dvidvi-2014.tar.xz 8508 SHA256 4fda6c20b3c882dbe6c08e10bd0f0a2f22c93de5558c2272a8476d85ab4c3445 SHA512 aa2e7a03a3c07af1b35b6d779a9338051bd67db5a01e907970e9230e4f155b89cf1c2e1485283dd81ca703949e92432d0499b06d79d7b826d89ffd458166412b WHIRLPOOL df573b6039fc7b86cb90ae0707190cc5e96a703c9ec58f5894e8b26d626f959ece159b7d25d03b02e4e4c240b8b1ba322944d5c96bce634ff69fb2b0353a1835
+DIST texlive-module-dvidvi-2015.tar.xz 8504 SHA256 6b302b8049cd5f36848486080d304fa81213d0f124b8b5fde827ce5decbebf33 SHA512 cd62b84111366c68e6fdadc045944c6dee907ed30472c7a4c3925f649c1894c59b2337a4590b43e4742d5907c23dceea81738c99d5f99169dd7526a7167ca041 WHIRLPOOL 5fbd0db08a323c63873902100a456769124aba1b4344ad2ae833da118b1369b2d970601ed556c1b2227db8b76442d579c79e68bab6c877caf5940769e8618345
+DIST texlive-module-dvidvi-2016.tar.xz 468 SHA256 7813e65e3f1f385c843ae4ddb2ae23ba17004810ea6b5733300bfc9dd977293e SHA512 29ccf47b7a4d81999daa3a16b774783d582df2b9af1dd814ba09329b5fdcda4af8a9183af31e2f9c4c416cf26425c2443571c9249f992dde98058824a64bdb31 WHIRLPOOL 7291668cb4f5fdd369b9862677ecfc170f148c5ead8d573d07ad1a25419ec5050e9315053f398537a32eee43161a9433065fe5fc7634f5b8901f39f1e7b5a372
+DIST texlive-module-dvidvi-2017.tar.xz 468 SHA256 7813e65e3f1f385c843ae4ddb2ae23ba17004810ea6b5733300bfc9dd977293e SHA512 29ccf47b7a4d81999daa3a16b774783d582df2b9af1dd814ba09329b5fdcda4af8a9183af31e2f9c4c416cf26425c2443571c9249f992dde98058824a64bdb31 WHIRLPOOL 7291668cb4f5fdd369b9862677ecfc170f148c5ead8d573d07ad1a25419ec5050e9315053f398537a32eee43161a9433065fe5fc7634f5b8901f39f1e7b5a372
+DIST texlive-module-dvidvi.doc-2016.tar.xz 19728 SHA256 8b27dd763b8cd6ba142c74b50f0e1c04ee4bfffe14ad5f8a27622c9bce889dea SHA512 811d193f05e643ae69956b0c700dba40b6002df585b8cd3642e7ba89187ee7159a4eb03940f1762eb20d8359d88731651cad59d67b6a4f1b3f70d34d91f413f9 WHIRLPOOL df02592beff52b0349514564e9e296636beedf012e545a017ec345dc26f3db769475530c113f5b8e4c78aa2ad0034d410e4a2766718597df7ad474cf76859ac8
+DIST texlive-module-dvidvi.doc-2017.tar.xz 7880 SHA256 3b8d926fa10af1a4f053cd3248bb947bc1c0408d647cf8b768d174b1bc9e3924 SHA512 72685126bffcdb0adf0aff770d17eabb1da16e999b24a40c4f5a0925e8eee1e168f88abca69a6d803dc91a8871beac954feca4d22b08542e5887d8f4226f7cda WHIRLPOOL 660fbc61af65404f7771e7bf2b2af48e0c0ca7c70933c702e7acd8ba62730025de8a93f1ef936c45521b77db3fe634a5fe66a7b59dfb325c3e62962b80cf4fda
+DIST texlive-module-dviljk-2012.tar.xz 532 SHA256 cb6f792772923d1643d27f6fd3b048a736aac97f1b892ddb2a04514ee7e71580 SHA512 f47000a47d395cabad868d95c4f9e1fc698c2f89f84c187759993467b5a17c366cb6adaa704d2dd5b11c01dc8141d7f2fba1f7a88f7f2bd85c319e504bf3c62a WHIRLPOOL 4abb6338b87083697ff3dfad80ee75f881f5922b1a406ff7d4f362aed9fe0328e78d05313d20828b4b6bb704744aad0c3d2a282952922a8b78d1313b09436b93
+DIST texlive-module-dviljk-2013.tar.xz 532 SHA256 49fe1e2650a5c0278cd67bfdb084fcc5ee5591f1c0fa24da073ae4eed5a48e4c SHA512 22a914d266035c78f5ef3030ff215efb6742d33f00bec6504a9d79c8bc4a3eee7cb3419beabd62c7d5cce7ff73c75190cd83be6f15d4be96f561c86568fa8e62 WHIRLPOOL dd93c5b814a5ead26ee7b1003ca3eb98846966aacc59b29b4e7165cd11363a563dfc3b0f0049f4e498831fa2422dd60ba3f8d795af32e338cb8ea1e62a5479e0
+DIST texlive-module-dviljk-2014.tar.xz 532 SHA256 cd86a439bb4f67520b70d00b9df654bd444d7b4851196e1ba3af959d1230fc8d SHA512 de9e38690421d445e440ee79c2eb805e6f58b53ace4b69b8ed5ff5d69690b39333c31d6abb42c911823dae77fd312efec08efac49fa6199b8b7719eb64d06959 WHIRLPOOL e51ddcec4c1c1657676a15d2f986ea0411f052ef7e3c8d846a2795112b44a885fb7415867f52b5bea35644faf6ca8958dafccdf77a6e5cba438094430d9fd687
+DIST texlive-module-dviljk-2015.tar.xz 520 SHA256 c98bd1937379cba550bdd724c867568777e821706a54e508defff6995f23b597 SHA512 0063f9c3de5bcc5fbf380aa760bf77c9ae55ec1228ee801d8d9db65ada03b8b9ae8a544e403d2551ba5b703b795cfbe7113126ab7e7d9d6494cbc0138870a45a WHIRLPOOL cce746bec5b719de0fc0e544eb2ffdfcecf48803943eb2ad68c21a121102217274c8769338d11666548c24aa243e47eb1296b1d5d18723ee494fbdd93eb1902f
+DIST texlive-module-dviljk-2016.tar.xz 532 SHA256 5665a8807efa9e826e751c7f275481fd1542f88cbba891c1a69668d4b9734b9c SHA512 2fc2bd385e0952e1f1a348040de644aa98c63ddf436e7cdf30366f779203d55632b96e2a8e167413887a6eb1f5a86e37b3c49b067de582db553ffcec51c046d2 WHIRLPOOL 4a657eeafb5ef00b0ede4d99e44d3922309a49d77835b3890ad9b79cd3f492ec08e92ec76ba58b8b16e311b48e5f8547bfc95c236995f1e85ec7bc58cf0f6234
+DIST texlive-module-dviljk-2017.tar.xz 532 SHA256 5665a8807efa9e826e751c7f275481fd1542f88cbba891c1a69668d4b9734b9c SHA512 2fc2bd385e0952e1f1a348040de644aa98c63ddf436e7cdf30366f779203d55632b96e2a8e167413887a6eb1f5a86e37b3c49b067de582db553ffcec51c046d2 WHIRLPOOL 4a657eeafb5ef00b0ede4d99e44d3922309a49d77835b3890ad9b79cd3f492ec08e92ec76ba58b8b16e311b48e5f8547bfc95c236995f1e85ec7bc58cf0f6234
+DIST texlive-module-dviljk.doc-2012.tar.xz 36752 SHA256 49b8d91242f14f5d7a76128230874ca574221f585b0ad36ba731f207e0490680 SHA512 cd8c8efab075a08143113bbc794b4787ccd023d26a037defb5b50a3bdfcf9e2d73cff4907e8a5b64430d55bc59a2748f0a503c6da554f044b39301f9ee5a7478 WHIRLPOOL cc7146ee4e93643ef2fe738686589a7b2e5c98e66f1da99785bebf7912dc4ce7da055d711691696bb6ba22c6b4733bef13491afbb782e24b5a57ff6a30316edf
+DIST texlive-module-dviljk.doc-2013.tar.xz 36712 SHA256 dd65dc8cdf66187af5b213468fa116020459859a831fa8623b93fb4fee7ed0d9 SHA512 50c06aec06b9d65661d79be5d038670a69040059a11c780362412b8611986e2ac50525f0bd13e0024f02497213d93af8ea17764a3f4be2c66b886becdfe05d57 WHIRLPOOL de4ea11aa51930f0010f8a2d95b8365045fe3e0e6eba4e0758f75b44ed2ef029743f0c1b287897a262c44d2f1aca63a79ebad404d49ede8df452732447607933
+DIST texlive-module-dviljk.doc-2014.tar.xz 36752 SHA256 09230eba8ce147946b418e37f9dd70821e786b6c48acd54b2b9937f23cd52216 SHA512 f5afd9dbdd8d71ffa831c1f991422eeff8feff04c4db3e4308a8a3b74e3c60383913e1811edbdf98440f08e932da1bce2ae24e8996377012916538d7f20abdc2 WHIRLPOOL af39337a1bc64a54278672319f456c730dd5c1e3cdcad395d6e646b95d46003c056f022328d1401753f76abb6cf86b6eb8cc8c8684e2593931a5365f076d1e45
+DIST texlive-module-dviljk.doc-2015.tar.xz 36724 SHA256 bd1e28b84ffbaeed178bd6ddddc83b760e43ef0dfad786d9ac8458059ed6f4de SHA512 5231507bbe70ce0bccde4986dd4ddba81bd50469617526ec8352b04bfa46bbb3543e3260c792f2017d430289838a82b6ec7a79fc9a6432d3b954c9a7a5e7a6ea WHIRLPOOL 978f9698e412a8f9f63269c705b5e2ad7b0ddc9cc51614f6cfa398d43fd27f86852e435a6f64068aaa46a0481f1ed6f1ef399d088007e56788e64f4e9ee91225
+DIST texlive-module-dviljk.doc-2016.tar.xz 76064 SHA256 e0b068a3e67f8de5cb0d14c323d8d07a717228a955a509e6242dd77d81e04426 SHA512 0fcf4d1a1253444408f0dd885a54186c44b757aef9313940234147ac0ab8c67f93b031be4c6f2df5a7dc841559e10c94c3da3f46abbf9470c0c88445d1b82e88 WHIRLPOOL a1140deeb68d77fbf9b740d761d014b3fceb59fc1a1a306213368997760c8ec4afef2b02d8dc9d400a2a54a7fca6270493c6a4ec01b88f37c7c5e4ba82a3e183
+DIST texlive-module-dviljk.doc-2017.tar.xz 42128 SHA256 0add0aa445bf2dc00e9ebc79a0f9b5f23893409e502f0824f393dea4ebc68998 SHA512 4140bf5492da8d3e4566d7dcfbb3c45f722fc1b924b429d1b4b8a32acae424b4485d0810390182527c6400ace88c4b45b6da06bb4838141e12142ec5c87f05f0 WHIRLPOOL b4c75359b8cb301c21430879e8b3bf30917604f5187d5c2cd62f6a6e555fe142cfb14120bc49930729bcf8b744ea762a884b014b09b05b88329e74547f2b4196
+DIST texlive-module-dvipng-2012.tar.xz 888 SHA256 e6d656a282b2ddda2cb7af9f5a2b0eeef87e233dd4b3784b815d104e344d7ba6 SHA512 c6cd5b1249e22bc5efe44f05a8adcb414f176b184481b63f294f5497eeb7aaea439c89e4b851e490b47d0e878d2c6548272e006b19a21029a326805d29e621f0 WHIRLPOOL 8c2de0ec7aa70be7c282ab4542863285c6cce9678030f5d0502818f0d3089b77d906dbe50497fd10425ba5c072e15f6729cf857c041eaf8b86fe2785b2bd04b9
+DIST texlive-module-dvipng.doc-2012.tar.xz 271968 SHA256 f96e47547c0bb25a455118d60b61fc0760567e3aa3b4f21899ebe3f246145bfe SHA512 397cc3a4649fc8214722e479c12a7957f8ab1a64cc79b3142ea39469145533db7be1a29e249e2132feba00fa6f44401d79fe017845981ef64b709a95cd0b02f8 WHIRLPOOL 4942b4379af005e3d985aa63d656e868688d48733ed627b7f2a16bd8492d8eb4a7631cc82e57e643600dc626ece4e0e4849fcceadd6de1f3f1862de251c9b1dc
+DIST texlive-module-dvipos-2012.tar.xz 244 SHA256 bf09bf25b045366f113cd672c6772c5bdc752edf8d0281b7d9fb48064d88b852 SHA512 6acd58097ca1881458a453aefcd641d6467329d0e667f94afa81db45c4ce3c0eda8458894757a789334d0788090ec09caa57c36ca81804ea9d79efe6c9ffebaf WHIRLPOOL e96a866ed79c190c87ec6405271aadc1b9df7e21cfe6bc30eed9e93bec423ecf4581ecb5b34cb2279f528b56d4df2cc8b6c7e982cfde942cd33d88c24dffe25f
+DIST texlive-module-dvipos-2013.tar.xz 240 SHA256 ca02f6cd13804ca26c7632477a5df39cbf7640c7c3bfe1191fafb73fafcdb0c6 SHA512 deb58c15d407f4dc944be584b1c44ce25948c0caaac22e47d28506ff60742eda4cce85fcfd00c04e2f225eaf6946ba717b770af63240c7f0c01645c0e65cc967 WHIRLPOOL a99a36bb036f13b2fda370105a147c827c1c3b06771f05ad1c1a3f705164b5545d1ea2f81d1c52eb3e8b6f922ca67613df70c568c748a724ef18bab8c73e3cfe
+DIST texlive-module-dvipos-2014.tar.xz 244 SHA256 22249743528a8b29da4340b4017a47c86260b26efc09c9fec746c7635aef9dc5 SHA512 fe2d8a02920fbcf0db2967ec537a2e2be767d07e9c7f3e7b9c4fe2dd1a2f0ac87430400e7cf790ad5d0f79c0d99b0ac91bc5d94b56213af36e3adc67d109a605 WHIRLPOOL f32497cb7b302b32e998b0eafce37b23ef7bf98508d36e426046fac2dcc01cc361b9d84b8a8fa2fe0cd9eb11302aa06e4fef0a3b0ea90de951890a49bbc853cd
+DIST texlive-module-dvipos-2015.tar.xz 244 SHA256 6d55e964523e63811ddc51d7dc76ea24aab4838b3c110519df6210e378eba371 SHA512 ef954c5fb5367f3496086cf7121190a792427111c6c4b155efae093f3f54239c8fe4208bf2d4b1471d87a93159b8b2c753cb0c53da8ab9a7f0b46bb8abae7f85 WHIRLPOOL 5bc8f70bca1ecdff8775ab39749158eb6476abbad403bb8cfbdd7d132dd41cf844bb36df5f77aaea34285eb317ea88a8dd8907d97766c7fb0a6c0a5edfa0a54d
+DIST texlive-module-dvipos-2016.tar.xz 244 SHA256 5e080734919aee663b9e67d5eaf013cbe38b1f24b690c880d02a762a1e5eeae1 SHA512 a18ef80cc04b075e36bd04d160e3b324df1b00cadf796de633e687d1ddc099da85202ec10cc5b41e4e686adbddaf10bd265a7b17a928dcfc428a20dfe1940c38 WHIRLPOOL dcf82e5faeeeb94bd7c3111de373bf7a33c952358d3f058349a1a9a004f5cfa9f97411dbf62c5ff78801618f51f40266aec99579bb51c9330056f1be9729f906
+DIST texlive-module-dvipos-2017.tar.xz 244 SHA256 465c978930203a1a3f86974f6088facbb8ce39ebc33dcb07fcbdeceb60dff8f2 SHA512 ea01dc9fa33eb847010fc4f13b023d8ef0e87a9da1e9cb7b8f15f51ac6c428952ea5d8406184c0807ba4eeec255933637122155ebe08fbcd8fc5d3df5fa1fbd4 WHIRLPOOL 740140610ccbd9efdd270f5321f15c47f4c6777997d77c0b77e8b4732a2b2f996a68d377a29690cdc06fcde04ae41c95b62cbef08faedf02f9830e5c7c60ebbb
+DIST texlive-module-dvipos.doc-2012.tar.xz 7484 SHA256 83e96b1248279eb30cbfa6d11339179b39be5b29c8d691c1966687cedc9f7e24 SHA512 35c273cf568bfdef10d226b6a4d8b6b9d2f506ebf25dac722ab3eb37e0d4474cc0d44ed2b9abf51575ced461eacff4ea9f471424241e635e91525a69fa753a90 WHIRLPOOL 84f912f5c8f7e3125486e6cf17377bad9342f7b9310b9a320fd828b3d72189420df78f60daaa55d0a6e8076919f3a7b34014ddec00a2c81737ba55a0f9c5348b
+DIST texlive-module-dvipos.doc-2013.tar.xz 7492 SHA256 fc41630a38c61c002ab957a6b8c2aaca899888713e8c5276fe83b0c66461a6dd SHA512 68ba83e556380333ce24373b7808e0c8085f72c7ccb712ac3be962e26a06e665e38704ed5b14c0677bb3fb92ea16b36f02a1d61daff208b0450d12d2a41141ae WHIRLPOOL 0a4954b34ae529b23d81be5bd97047d516f8fe332e34b9eec085e9829258d11864e1dc181a76e24818ebd6c9798c7fc3132e0db28025eb5143cfc3916aaf1265
+DIST texlive-module-dvipos.doc-2014.tar.xz 7488 SHA256 d74b679e1abe7869a1546d7e7f07c6606d0bc076b91c8cc4fa00c02fc19ba07f SHA512 e1f93e712a147293be422c965c9f5cf6cf5b28e5ae498b614d42854747be35da7817c5446c87316d2591b88cdfadfe86a100e82a4bbd71c9f639d8004de3f92f WHIRLPOOL ab9eee1cac940a210eb7d1a2997835142a73d7f1424844b624ac2d6b8bbb1a328ad919f1eb7a45fc91f35d273e105655c75e2053aa25d6b544443921cb7a625b
+DIST texlive-module-dvipos.doc-2015.tar.xz 7484 SHA256 30fe12d5b34b1fb786f0de1cdf030456f9d323e7c452515b695634e81bad5ca6 SHA512 3e7c2b0e6dac7cd3d757f80e7d9e7b7b8c3b3239a428385c0e8f3e8d28ce4dc667d32c94f098aa93097965423514c8c44a97c2edc5f14038642e68d3d705b9cd WHIRLPOOL 10980eaa68d7c0ae0c06dee863c865223e2cb69b2440f899b643561cd753b3337391f90de4020d13e1fe369449617247fbf6b569dc88dfdd2e124d94bd83aba6
+DIST texlive-module-dvipos.doc-2016.tar.xz 28584 SHA256 2a5b28db69ca3b8b258be684f2a4200893b6d7ff78a22454efddcc33442d0c50 SHA512 d1793c7a43d11473a96478321a15b84b8bf753156a570401bf0fdd559028168094318ee2243266424405cc17b2ae1f7c4f8aed97fa2ce09f6114928e6a92f4a0 WHIRLPOOL c14c289a816a0b21fedf23fb74321e4df12aad83e0f274f87360218ce154df5b06e7614935a62a119700248303abac9269c7bb324428ed99862dd63378880435
+DIST texlive-module-dvipos.doc-2017.tar.xz 11144 SHA256 febca89ece083f8b7b8d127f532c92b12750acf01e7ae2f1f4a730d97c32349c SHA512 e1720314341e7063baf34dc5ce7086dddf282a82c5723df8b67547b9ac868e336657a88b0243b1dd20762c4371e2b5a8341314af558c55a7462534bb35c2a965 WHIRLPOOL 8eb1a65d3200ff413aca33352c4b300437d16dc99b25fd76e8e6205c59fcc6ca97de04ddf78d86af7047d75f525eaacf9884736b2404953e7f78bbbb19c0aebb
+DIST texlive-module-findhyph-2012.tar.xz 3552 SHA256 a4db5b3646c1cbeeb059b59d8b90e262aab639b967161aaeffec34a977313b42 SHA512 3a29ece70678fd55cc5d519bd01e6d03aad134f94edf178be628254410ce5b63d233f2a0cfee2dd703a0cf498673e8af71245b004bc3d4fcce23ef8583cfa312 WHIRLPOOL 3edfc9f1ccb3d0f9a518b7d4d2f6d2d73c57981f4a5dc519aa0f009f8f8579019e45ce0500cd92477d7e6a8fe20512ab31aac871e101474c1d46915c72e205dc
+DIST texlive-module-findhyph-2013.tar.xz 3764 SHA256 3effbcc3cd106cf4c9437057f2762a45253d89551120f1f4306df09c493531ba SHA512 275f74dd7eb166b73a9d517a2831f0ea350c5c7430e6ed55caae0b3e422cb0b39cd6cb0a17b65902e471d911e8dca1995293e58e7388b4e3c958e406a4aaba86 WHIRLPOOL a3ebd27ad675baf1c55c9e438fb0dd33bdd6a53c87363e6b838ad0f216cf795c105181306a91cf2547cf53b849ace9bbc5e88619d1f519447455ca5b710d6ee9
+DIST texlive-module-findhyph-2014.tar.xz 3764 SHA256 6300550d38347b9f0dbaf7618f6da3699c05ef206f1925a5d8d8b09057dcdb20 SHA512 8640a06242d9a1a285d7ff76602e226930f529404caaf72cb4e0b5334ea84b48a77cce1a4b386fbc1905ca9b4f77fb4fcc08d9abf816ad923cc3bebc4ab15b2d WHIRLPOOL e7a29ed2625b18cf7747d04b12475d175c10080301ce6f5098c4133899dd5a6180698ed9f7f8acd37169cbef19e560cb49c26f83af9ef2168a573daa73bc2730
+DIST texlive-module-findhyph-2015.tar.xz 3764 SHA256 b1c2def09e815f2c98b35c7f93254351927ea5163ce19a5f46a2936aed1944ae SHA512 881d6b744a7bb2e6e8b7faab2b136d19cad33d63977357def69a147853e12447194e51c95dd84d481e732af2c8179f1a4787aadb5ba93658e077b02777ac72b1 WHIRLPOOL 56a4787b512b12cc5e02bd3df49cebdc727fd615def572ee9526fefcb02c28d00c7ccd0d9307700a5a6f4c351d9b4115df01971ba9676220753560350d32d0a9
+DIST texlive-module-findhyph-2016.tar.xz 3900 SHA256 608a9c3dcb98ac039807add9b3de3be1f7bcbc3c74e705d9412d81aef99acd0d SHA512 42ec175d04baae17699218d2a1d12598f303dd8cfa1ba8ee6ceef6493d7ba001e54de4140ddf5ba9f1ccc3fa913c33725f862b1e70de6a40824f98791eceb6e1 WHIRLPOOL 2571a59ab68c39bca09a2a86e781547baba7a4beca30bbf0dc3956451b96095b0ed422de739a1198c01494fb3db6d264c2ffb87ff22ffd5c4f6cc3c53e95caa0
+DIST texlive-module-findhyph-2017.tar.xz 3904 SHA256 86decfa641705acddf865526cd4aa859eccf44ec0ac93f9eb7f6506626696c14 SHA512 f6f117fd97f3c5cc7833da907b49783925704a43580b980d67a6bde4c501ab0d48b6d662bef3c11d1c802559a120ebaf3673c7a69f4d636133fd1e46629fee26 WHIRLPOOL a2a1e4e597419fc07f2056d3cab435454944210b094d723582bea29833b112a289dd759ff4c5eebae86f2dfcc5af3b3c20ecba86f95faf6df54013f7d1107444
+DIST texlive-module-findhyph.doc-2012.tar.xz 11648 SHA256 8aa34aca58919491758585695c44973ba9a3a4694036da5d1d2117daf2ccc324 SHA512 f0cadb13d32f52be2d6951d09274a7b84a722377ffb125e785963e0f58fb352d323c839adfdd6b98e4e97d71e7a92761eed994cf7b3d74bd98c114bbb708e7c5 WHIRLPOOL 7666a2699dc86e249380655a9a80e475a5b4efbdb965544767990aae408f938982313d87d8760435d9274f0f54441dd69bf0e67ed9dd57546779ac110b2b8fc3
+DIST texlive-module-findhyph.doc-2013.tar.xz 12168 SHA256 6a8fbb1888ca68c131fa9b23fa679c8d40bc4399b62638cd2113b51148077ec6 SHA512 2440081caf7332ac5e64b468b1743e91a62da7b1762dbafeab3d9e1318c6fdfbb165aabad0481f123868da3a03263b6253395adf8858a62696d727d179ed75b8 WHIRLPOOL 8989f8e6119a1bdd4dd350fdf185f6a77065ef5c49bcde4eac9e48fcf7b41abd9cab0cf4688b11e4dabcc55a6a9164243b555fd2f0e1b6b161af6ed9203f5c38
+DIST texlive-module-findhyph.doc-2014.tar.xz 12172 SHA256 68ed56620207e3330d97153ec640f19913e05cfcb313b3bb559a300f352836cd SHA512 bd8fcb07f322c2cf497e8e83ed600ebae8425406b9d3f568bf63c6e2669727256f3d19c20010a4a43c20dc707f0b31d15a7c832e349c6b46d6b365011d3f1f73 WHIRLPOOL 88c42ce8a3699452325a32dd22f8a5f3763b33e630f8ab7da6d5be4bf8ced03dcfa85bba5bf1c0eedda6ae28444bdd2f833b4cbc779bdc037dc16c1d4df3282c
+DIST texlive-module-findhyph.doc-2015.tar.xz 12176 SHA256 ca69a7788c9d6345c0f29772b7731981c9237a4a6f8331a32baa82d5eff4baf3 SHA512 43ef223bd1f75d91ec875b98cadd672e6985940875018279f0e68657c4c2171f85f7f1569c59197cbfb3b12c4abb665841b196565505334eae997e09be3a5682 WHIRLPOOL cf4918d4131ba8eb34a9ff73f077a28dad486cb1acb6684819489c50656055f778685495f1d770c9f37eb39abc149fd5cd40adbcf1e3ee2bb1a99ef5b4778ce9
+DIST texlive-module-findhyph.doc-2016.tar.xz 12020 SHA256 465604949efde59a5f7771c2627441af0ac6b544cb0298afb5606f8aa44ed7cf SHA512 3b66812d082b3edb6f46b94992d555b0deb532cc258244bb6c2454826af41fdcbdd1d40f2f8ad9f885772925ca4cf738de8255b510b59afccc721424f249e1d7 WHIRLPOOL 4ecbaab5b4c60fb328a05e0fd035917c025a983ec2aac56534b2a3eeb01f23749b4b848a97d18d121e793e7539dd3010b7389ed320e3cbae98a919333889b154
+DIST texlive-module-findhyph.doc-2017.tar.xz 12024 SHA256 5e4d8049b5e7588b847bdf0e2335658b819046e19d9ae3dd66f5d0b9f7dbb2ca SHA512 fe8f33cf13a69b43b80464e3799a090e0a0eb0bbc3420b5b9500ceb490582f79defa4b2ad29d406dccc4b2ddb5d5b83fbf644eaa99ea0565cb258706d1acc0f5 WHIRLPOOL 73f4ff304ccce26ae4786e12d974f0fdd1d36d42bf36a2facfa6370fba62f692150451d950f7e6bed804e40e1f8ecfcdb7ff17058c5408934451eeef052a4717
+DIST texlive-module-fragmaster-2012.tar.xz 6860 SHA256 e8cb437c9fb126e7738ac473f8be8184bfb56628e45817bb004878d8f2c55b0f SHA512 df1867cd0662a81b9aa681dcbda5df76d5a0520ec73778a605d82d24c864e60b89252074de6bacb6448011a24a359691b2089cb810ecb6224291e7715e465003 WHIRLPOOL 2c6503acffa34ff730bd6a87eb80cec4e0cfeb9355776763a0ce05c4c08815932d15750bf444ded93ddc8950d16976622ed7bfc665727f540c078099be0ee8b7
+DIST texlive-module-fragmaster-2013.tar.xz 6860 SHA256 e8cb437c9fb126e7738ac473f8be8184bfb56628e45817bb004878d8f2c55b0f SHA512 df1867cd0662a81b9aa681dcbda5df76d5a0520ec73778a605d82d24c864e60b89252074de6bacb6448011a24a359691b2089cb810ecb6224291e7715e465003 WHIRLPOOL 2c6503acffa34ff730bd6a87eb80cec4e0cfeb9355776763a0ce05c4c08815932d15750bf444ded93ddc8950d16976622ed7bfc665727f540c078099be0ee8b7
+DIST texlive-module-fragmaster-2014.tar.xz 6860 SHA256 778b3cec56ad8f27a23a616326abaa55c10d34e1c2ed26121a5ec2e47d089d30 SHA512 d893ca4c9fcfe0ff599058c380fd6537071d8c4ad071b5257d504d583c6672795c821adcbd6571451f4e8715fb5595bc40bd71438a1ae773da79a0ae5b906811 WHIRLPOOL eefe2f7612551fd60ee125cb699075176c45812c938acc8684c412c576f73061029de253079306d533d24a044142ba7aa0813b1739375ac0c4db5896b1b3b4c4
+DIST texlive-module-fragmaster-2015.tar.xz 6860 SHA256 78b5122fb47a8f0f576d0dd5406261eb384864eaccab8d9aa3ee4ee0f74e3bab SHA512 6ee332e8ec09144ecbd9a066143cbdbff601b814ca60d8d81d4e8c17b87c4f7bc177368ea9cb8ac42a055c2b66601713d876df00c9fa56a1ba814d62d894315b WHIRLPOOL dda482a7df35c7a23ae00db5616c0a3570be792b72628b7cbe7b8d219344ca9de9911aa97e3afbf0e3948eb3351211bc9025da7b527c2d6200a33c80602d53e7
+DIST texlive-module-fragmaster-2016.tar.xz 6872 SHA256 a2c816cd001638821b159e52d26194ee9619da605602ef46f9e990a5518f74ac SHA512 65387d934a6e9f1a505a9d594d4457721425421a9cbb011d993bdc161a528db70bfe67484560b9ac2145fe302c50e2bd8e3218a4e09dc7d419686d56229da6e3 WHIRLPOOL 6ab4dfe458da0bc08b64683fda755b64251b4c3e7aa3a4eef89819351d9e544e1fc92438c389c0659a6715915e02eef6298587cd41823dcc51acca436ea05f49
+DIST texlive-module-fragmaster-2017.tar.xz 6872 SHA256 ccc1e9d4a96a0e63091c63af49881d0e0520af87bfc28518e57726fc389b8709 SHA512 a7e6fccbd850e7b3ee942a3d5af379e79a946fa9b037ed47d8de50b250eff15d0e6250ce2ddfbf8f7535a1b7c1bf39d80d5a352e1b77fe9bbe0bfd25da434bdc WHIRLPOOL 3f83c42f3c4312632915e7af91b0abae874f1f3584e344773b8b57424c6d261b7744a776d670938ad772e0568b62bb0c8dad6970d93cb2d84cc9d3bfc9a0a9cb
+DIST texlive-module-fragmaster.doc-2012.tar.xz 80316 SHA256 29221709348c9a90d5640c53d222fa39360bc838b3c4d8bdefd8ab45f3a1d2b7 SHA512 dba1fe9625d93d274c78126396d3ea552db3c0f86c79c528e9972e4f046e4668f0149e1230ead860c4435f2103531a760b1d6ed66dad61bd81afe4f513cc6589 WHIRLPOOL 2a608ab7adf41c0c31fcb3cdcc10d8830ff63fdbd4995442c56911941ae7ff74e8c95f73905c4b86afc9eef3d0e7eb6398f8d83bbf2cfe0205f41021f5f6899b
+DIST texlive-module-fragmaster.doc-2013.tar.xz 80316 SHA256 29221709348c9a90d5640c53d222fa39360bc838b3c4d8bdefd8ab45f3a1d2b7 SHA512 dba1fe9625d93d274c78126396d3ea552db3c0f86c79c528e9972e4f046e4668f0149e1230ead860c4435f2103531a760b1d6ed66dad61bd81afe4f513cc6589 WHIRLPOOL 2a608ab7adf41c0c31fcb3cdcc10d8830ff63fdbd4995442c56911941ae7ff74e8c95f73905c4b86afc9eef3d0e7eb6398f8d83bbf2cfe0205f41021f5f6899b
+DIST texlive-module-fragmaster.doc-2014.tar.xz 80316 SHA256 c87cf69d78e39d78f32c88b2374808de9909d38717d99ef2a12a3f92df2c3292 SHA512 f4315ff96b617ecaa5555e9103091586a1bfffd2cd84098f096ac2cd6318a478067f75f3752752454b191c82f795ebbd3e236e3633e332550ffbd14e9353377e WHIRLPOOL 3d18454214f80ce67587f5663d9ddb300b769cd54c8f32744ba005b7fa61467565bd640cb818a08f34a31a62eb25d9149a61531c2d58374364e8330700686295
+DIST texlive-module-fragmaster.doc-2015.tar.xz 80316 SHA256 383396651be6bd11cdcb09102464c2ad25acee63a8d9c05423fbf55df6ced566 SHA512 d394d6e19ce402aec992b6485f53462613f05544e777b99d4a70627a042977ba00b3a404a6e2d9174fbf05a8146a97ce20f1a116ee07dea46c438d7814c4c1d2 WHIRLPOOL 630ead480fae9eb9ec3e4ac6f08fd99f3eeb825ca2eb48afec8a5aa261d349ee4ddcf1ca1df872e296701ade604cfef8c6e5669498fe417dc2c6cec4ad152a7f
+DIST texlive-module-fragmaster.doc-2016.tar.xz 80316 SHA256 d3688658448108ec0ef3169647160545b2415f53fe5217bb7ab7af8bacba4bf3 SHA512 7fabd07830227e309d046069c9edf681c0641d73285cf239a3035287455a4120f7d6b6ec8f4e4537069c7f3e57562799adbffce6ed202eed0fc1551b87e29884 WHIRLPOOL f64afe05abe07db31fc0dbff1757d1ef85e10999335f415597d89784c8d0ab9e38cf0e8c8543a492967173ad827555096af481e60424468a931f635b4680c485
+DIST texlive-module-fragmaster.doc-2017.tar.xz 80256 SHA256 ebb7a55cf1fa8703d0ce8462a6130325aa4f88611946d3823f7e8e1f1efd72cb SHA512 cab8ac6247875ed48f86f16a67cf3ba8b320aeabd61cf95a6c43a6cabea9ae11ee0cd9e2bee0b577ebbb414216cd4015a36161c83627647371418ef61d28c8b2 WHIRLPOOL c89c36f05268d72cf3ab73b4e2864206e3da382e38879d9132311eed6bbc49cf6982bb9cd01bd9533386a106dab638ee7e6c9a349efe09e7856a198fc12bb973
+DIST texlive-module-gsftopk-2012.tar.xz 3416 SHA256 ef55b77a7b9953efe22322534479311454db95eecf9b22f3a7a5a4e7743f8fad SHA512 8fce72b6d89d898ef9666ccfe3cfb90fbb6e888c8196d1ca540d76b3b6c1d3ffe65d36975f19021adb4c1a019d3f682ba0a502927cb6718b50f54bb7f86d5d09 WHIRLPOOL 020c6c1bc7a3f30356cb5738d651e5eb774d70fa39b06cd04de9532a0a20c5e53fa7509f36767187519ac576e102f1de600b0771d0128df2a356a05e3b285e82
+DIST texlive-module-gsftopk-2013.tar.xz 3416 SHA256 7efa8242eb612420632b5c9f6b75f6a9c34799ad0c927d380a78528e93b178b4 SHA512 1c6be0ad950185881bd7a6d3b9f58fddbcbde93be429b83dff19c59615beeed4ceaebc3e69a08a2e860d1282831d384e6cb766534ab9b7de3aa7b86d707d3737 WHIRLPOOL a604a6e0be2536f066608ad0ab03af17f4a3130856511026e82f4531894911739eeec45c37ae2dc2b3049f902990289a827e4abcc08993152a5b220aec17aef2
+DIST texlive-module-gsftopk-2014.tar.xz 3416 SHA256 f56b7697e3f4a6701b1d746db5848e877169a9dbf3fff762a5c5ba6a853763df SHA512 a0e4a22687b9d33d125a12dfd0bf1b8ee236c1f99d44fd02281d617894b868348ccd6a893d4ca514ce9888b07dcdf0e6a766d10e772c0e109b19616b3a6bee4f WHIRLPOOL 5e5fcb751f28a03066fdb51480b9c5ad70a21cca5ffaca6689844d11bfc0f0e3ab994a58cd6515519ea8a1cef543c6c48ab2e3fd37d70abea0a05d3cc9fa190a
+DIST texlive-module-gsftopk-2015.tar.xz 3416 SHA256 23f484df6c1852909f125357739d878c96a5430fc28b71d99168b3f9d8beeed2 SHA512 8f1629c4caba8e1fc9be8e82095215c0b0b26f66cd44557d9c847a9ee2c0660bcc479ae42c0e439299cf96203a131109cba2a86419b4abe6fd00fd9cc08b0bf3 WHIRLPOOL f0753d4697e71a9bb86f9532916ecdaf7e89c679d5d39ff47ca927a96fd2f2f5edcd11200d80d52750969c491ef15beb52b763399645f0a69dd024965aef813d
+DIST texlive-module-gsftopk-2016.tar.xz 3428 SHA256 469e6d594d0db3e42fed18739dc0b2fe161f8f03d9980b8c3fffdc88393bbc9f SHA512 750872ad83d230743dd4a5d929f54c11c42bfe3454b6547a96c09afebf81ebac4502e906f2b9ca4c2f613220f778d5a137fd72841b07355d6df6874b09779572 WHIRLPOOL 26fbeb414cfdeff06657abfac15c28f23de3fb73ff35a05b0419289da33b057601c94c21f1b5e55646df8ccb0c7666b1e7595f6b7c197bdeab8c2c3ba232c0fb
+DIST texlive-module-gsftopk-2017.tar.xz 3428 SHA256 0df010cbb093354daae002d951fca5eb46eb2251d40572b804b36aedbeb0be4a SHA512 9f3cf2841b1f275c13991ca07483bb47e9e833bf5d2d137af2660d7e01127f878b26cf0bab98668504edbf0d87e4e17fdeb8c7c654de01048298298771d289ce WHIRLPOOL a2f7f6754d0cc616eae8cff2f2a300f0ee2372ea974162ba2debc06c61ecd0a2276b2d76653813e0bc46aa45427ab06fb9b0fd79388baf210e04e5ee888112c4
+DIST texlive-module-gsftopk.doc-2012.tar.xz 12284 SHA256 f733c347cd3de19f1641fdd033f661cf6176300a36b7b36334e3ba24da988c42 SHA512 7f8156713be8d8c48d05afe91fa3f0cd52e4dfbd4c547cceaef4ab52818f0e7da6c890431f3fa1b83646c52862582390542d23fe9f4306d876447d72a5d28c35 WHIRLPOOL 5a0e30e13b6da6f5c3184e28c46de4d53b6234be517bdca43e4852d2c0fdd7ff36085790e6c22afc215092800e32bc4bc21f0535b900b9522efca7f64b815f9a
+DIST texlive-module-gsftopk.doc-2013.tar.xz 12380 SHA256 74d950123225d80072a53c520f319dfbdeeece902bcee8c84f2040768240f8e5 SHA512 200fe2ddd5646ae4f18eca7c26cbcf6339d2e0af2b3a3836faf49c2fa230760a0fe3c7d823bc8a5801c1725e977b9740445a1480a2d6a9762c7023876830adfe WHIRLPOOL facc1a8ca5fcd6c7d2ce222e84d52c13b2f0492c0f8d31f3003d7410d7ecd31e27c345ea447df89353135d4736366519ba96f7de17c3939b3873533a70f7e525
+DIST texlive-module-gsftopk.doc-2014.tar.xz 12380 SHA256 4bcee93a8e945c7c64b177c24e313c35a8c4923d643e69bed25dd8fa342674b8 SHA512 d815477de20e6f639891a5ac4c12cc2dfe1c5e57e72b2ec9bb801b8df160ea74fb6bd7022716d92ed5e238b34cf8cbed02c5a33e33d53e691f40582d1a986816 WHIRLPOOL 624e04ef5c4010a7112522f85d002603a15a9653302bc02e41f79a31be3c61f248e76350fbd36b2199aad1b2225078c1e17f205ea105a09044ea5a0df017e469
+DIST texlive-module-gsftopk.doc-2015.tar.xz 12384 SHA256 071dcc0dd8fba96c4b6e4a8f15b510a65f31797798695358480fd1d0c5928d73 SHA512 28b03b8168868647c90636dd7f45e41ea5665bb4a980fbb92299626fbe22fa9b34294a75e30c259d206b346ac946c8f3486eef9768ca6831c43c767a89daa8d8 WHIRLPOOL b96f3de150a86a446ab79a288e57b56fb701ff4e44c8aa4e451392732acdb3fdcc453f6ba0658e5c47a13cb4969d1aa4b759bfadd8b49de6bb27cf970d436028
+DIST texlive-module-gsftopk.doc-2016.tar.xz 28032 SHA256 c9843bc137e0937822a184f8e278245e89c1da0efe4cfcf7aa71f16add5774dd SHA512 6a5be7daa5cac154a8980495a031bf9d254cb9e773ef8915d44169d7c049e1bc3edca2a51ea2e0ad4c2df810230602af019f951303a4bb851d69078832e0ac73 WHIRLPOOL 0d27fef014131f5e9baf454a92a8b8c3184975458a1a4b02a7b8d227341c80c1b05821d7f14e0fb94ce632410194a06a09d25139cb41dd976f2251a33ce7eb66
+DIST texlive-module-gsftopk.doc-2017.tar.xz 11764 SHA256 82da90b2ed0b0a8a8d7ec9b9022ea3b5afccedb964998650b24da62c4a349b23 SHA512 6114d30883da80d9ca222c7191f57c613d28871d737df506f977442484ece94934c2c72e0c78c8ed619622c4d0a2c4a174d917ea9408f976ee0e14f3db7cd55b WHIRLPOOL 52bbc909e11cd168129cc3fdd6d5c3461db3f57c782f861940c8c542523c3e994eea70ddf8c204874e206c9a627da44affcdfc794b67793176bca4a4bc84ca2b
+DIST texlive-module-hook-pre-commit-pkg-2016.tar.xz 772 SHA256 5c6f4310438ba47c3988be86dcf2b9eff9ce1ce5ce3a5ca0803de312924c8b05 SHA512 931966fc66b06841d5d2db93a5e259036ebc4a64d080f3d021386ded16717c7f88be34201f2d7b44bbbcc0688b5a67231ad7d5a844b290dd66d96f97390cac2b WHIRLPOOL 9fd21bdd87cbcdef364e59c5a69d7ee0a9a142ee921866ab8a218f30e411d938beb039f646a481b9329fcf04169c9e96ec06551f0589a4bcb90d6cb58ef9f32e
+DIST texlive-module-hook-pre-commit-pkg-2017.tar.xz 776 SHA256 f210190317293ad53b044cb326f58b5b4fbc02925b7fe9429cf006297ff1ee93 SHA512 8db15c4d2347289caf9cbe967e4bc7ee819868d11d6723afbc9ff045247fccf52694e0533f441ad8b69ffbcffcc98e52f17ad901b47a7a9fa2c19cfdcc693dc1 WHIRLPOOL 1f1b3c0a56d8c90dad3304465ca3a3aee1f5d9110ad053442567554350519a3355ae0da253b28897adb24fb34d35874a7ee9d11afe7230c3940c7fb76ef36fa1
+DIST texlive-module-hook-pre-commit-pkg.doc-2016.tar.xz 2784 SHA256 037002edefa8f5d0cd8fff4b7f437989bf60d22a10d5ae591ad7c0783dfbbe36 SHA512 727cce2647d203c3a8c8c918ade775af08da1edcea7bc57f55b566caaba5ca42310b6c0a90b089f3ca10718a5c1dbd16c95549930b0d4b33c68b0a3367dbb172 WHIRLPOOL ef01e5960727410f7d919412f94ce71da55f3f142878dec9f98cccc74745151a681fd1e8ab07b587a6b494503b11943f7fe4893bfa9b7202205e5c9c4e5c39ef
+DIST texlive-module-hook-pre-commit-pkg.doc-2017.tar.xz 2784 SHA256 037002edefa8f5d0cd8fff4b7f437989bf60d22a10d5ae591ad7c0783dfbbe36 SHA512 727cce2647d203c3a8c8c918ade775af08da1edcea7bc57f55b566caaba5ca42310b6c0a90b089f3ca10718a5c1dbd16c95549930b0d4b33c68b0a3367dbb172 WHIRLPOOL ef01e5960727410f7d919412f94ce71da55f3f142878dec9f98cccc74745151a681fd1e8ab07b587a6b494503b11943f7fe4893bfa9b7202205e5c9c4e5c39ef
+DIST texlive-module-hyphen-base-2012.tar.xz 21960 SHA256 95e5e126a12eec9f47fbc74f46774688c9f76bc5b7e4ed3e1764c092296dd658 SHA512 4feaaff8aece9a6f61712da7bec594a6aa3698d45ce5e1b0e0ba9d0a24ebe8d15cdfcac63338a2bfacbd2d4f0948057c9bff089f6a947fccf0f8f23667985e57 WHIRLPOOL 11577e904c4e7e769c9df64b7fdd6f2919f75e173751ab0f4d8a74389236e54304080576a2924f533824ac90fe787347863ef28b7592f1dc24b59bc2d5795afa
+DIST texlive-module-hyphen-base-2013.tar.xz 22124 SHA256 b0760e5b7f7a9d5bb7018ea107ec9e87e7d422b0b9ab6d53cbe3718af2e7eb83 SHA512 631cec856b81dfa9c48e28bead5984c89cda58169bb2a73c3173d4aeed5ab97da52542fa870ecda5241f518cd7f3ea55994382e1a7fcf681bc6e45be250f27a7 WHIRLPOOL b4a831fe3e8770ee16367e8133ea0ccab393515c8e7cdd5cd3089dddc91d2a92ed5f0efa4c0222bdc9caaae3eb3129ae8762d14045951736c7f092cd6b4d53aa
+DIST texlive-module-hyphen-base-2014.tar.xz 22180 SHA256 782498bd5eba66977171996b32844d465c95ea19652f69ecaf2cf4d0cba6df33 SHA512 6e9ab85928e3ef5cf7dbf0e077e0fc436a69af799845489d5ec097614225bbf68f8e08ba5badac86623e46140698890a68f5f2475d01bf642e79a1e5ab571cd3 WHIRLPOOL 9e5f511d86eca97299490937933dbc1dec9b616ffdead836a519227b056748a55084e83652f69d9e8f9ce588183753ae0d66de58ede89ca3bf0ac079d1b2a5f7
+DIST texlive-module-hyphen-base-2015.tar.xz 22184 SHA256 9e23ead3d5674b56c8fe0233899e4d5516e6078920662973ec113a84a2640f5c SHA512 f3c41472d0a39636137b64a8aeed842c04a7c699950a90fe3216af4ad6a80569bb812b043f1660edb558fe966f2679f19f4e5385f3584977974cdee769779b46 WHIRLPOOL e6be1ee701d1df58862590a6eaa72a69a5b9b61a926761c7b2a9a12dd291bb41b110f991371117cad0d7f21670491ebd6207efd692c58d1cb63aa520336035a5
+DIST texlive-module-hyphen-base-2016.tar.xz 22244 SHA256 258db652e7044752ea9b77c20467533994e3d224b22bda4d8f3b9ca8b3710af1 SHA512 19c83740cc23cc73f2600384e3f9edf777a7a21fc2146d7187fae78f7c44733658ffeb8f6f549468a15309229015570b470aeb4770b70678e52011cc06bf546a WHIRLPOOL 004e200a1ddbf9211af2ebbcc1873b2b8365f1cd810814ac2dcd1f72fde726ee15a5b13a87d2ff72c219f7ab7cbb69c5de8cd16dc755b45536efd6fefde84308
+DIST texlive-module-hyphen-base-2017.tar.xz 22296 SHA256 b7d0087cf5270f5418ba2a660c515a703038bae869a82fc426e206635d842f29 SHA512 6a6ccb73d2e56233956460ab6ec1e1585f9ff4d88cf14e91186429f7fee78bdf58c78d96f25e0e8208d8824ab907b49f2d61119e4d7d17c1b79aed2fd2b3e834 WHIRLPOOL abebadeda9729c5b6a2b5476b6a32d2c82ebe516725048d3bbac495623872224df5c5bdfffb0b7b64375c9e3a4a6a6f89c85745eae337db23e35aaea7a0c50c8
+DIST texlive-module-hyphenex-2012.tar.xz 7004 SHA256 0abfcbef069282b935a99d8f1ddf347d31386e8f2e4e99e565ccc18d36362a57 SHA512 04b9c172b5118482e99485e463a8c8120d9544c285a17a08b94f30d79510e23f85bcb953cd3a9e17134f5af20e9ba8787a018a59f4891a73887070b2544370b1 WHIRLPOOL a8693346a7a9cb069cdca78a7e09dba870fa1132a7ce78efee4a81b41b781ff5fc73bd3af2c4c6c9b317633a789f6d09df6e034a4d09bf382013f7edcfb5f3eb
+DIST texlive-module-hyphenex-2013.tar.xz 7012 SHA256 cb57e8820116e39a9a2cf4b9a634a4aaa6e4aa47ddd936d5a69a599ebf9d1a80 SHA512 b4f69b3b69e699274128fb2964032f6aa0debefa78507de2020ad881ac5247ef341febe529d867a415e9edb91389b14b0ac5c9270d1727c8df5d57fce93aa433 WHIRLPOOL 8b2de3da5d5faaa4aee7b3162192c14aae5f2bf002f8f199199829aa4d3643048becc4bf5d4237cc2b88d1c17c8884a984b651d0cbe60416f1817a40193f4773
+DIST texlive-module-hyphenex-2014.tar.xz 7364 SHA256 75fe6c914deb944e2ec9969c2f7bdc4b16f6abb5bbea06bfd8e580cf6f1e4176 SHA512 a830c655789e7695ff3d3cba92b6ef5b4efb476580b01fa039695256a22e8c1cb1c8a368d6a3e1a113dcd7179f3b18ff5ce7ec4a2ca6501caf5035e7a19d3d09 WHIRLPOOL c5debff6f63ee6f38d30f8ac55892506ffbb45c97c7c2b4178ccf98e3ade92ed20cc0a0ae3b3191e7b79fac041e8572cfd37d75b42de693af1925a7e3530d115
+DIST texlive-module-hyphenex-2015.tar.xz 7488 SHA256 fe3db936444a3f48ccd82bbf663fe22241ca6ddc56be0a1a15a05b13f03bb03a SHA512 669525ce045b75b1e37d5518626df745971372b15178b89294e08f52106bdc4de8b12d4e35e24bb7dd8009197c0095f3d8957d060833fa3122fa6e81376706bc WHIRLPOOL e899a06ab22b3263458627d33dd9d3cfa0f674e8418547a019a34878fe36e8fa35e89f13489ae17a43ca16283769c7df8dbd73be15e00b3866be6275be241c06
+DIST texlive-module-hyphenex-2016.tar.xz 7512 SHA256 638f079615aa3deaad1ffe3f25b0b94823b2dbc684845aaf8b8b2acb2fe51b6f SHA512 d92236780a8e22c2430bc656fb4d4f630665d7be084a796a11508ed102592dd4de940f99e6a3501577c093cbb0cbd861eb8d41d92fba09a6cd0f5e5d2dab9f22 WHIRLPOOL 40f785dc4af0ef644d7f4c88ae1216f631c7e787e48956c52171e9e820ec2957c7e6940b84e0d2be331d3bf9cf808cae2eed3bdb1cff4e27a6e5525c63619d0e
+DIST texlive-module-hyphenex-2017.tar.xz 7512 SHA256 638f079615aa3deaad1ffe3f25b0b94823b2dbc684845aaf8b8b2acb2fe51b6f SHA512 d92236780a8e22c2430bc656fb4d4f630665d7be084a796a11508ed102592dd4de940f99e6a3501577c093cbb0cbd861eb8d41d92fba09a6cd0f5e5d2dab9f22 WHIRLPOOL 40f785dc4af0ef644d7f4c88ae1216f631c7e787e48956c52171e9e820ec2957c7e6940b84e0d2be331d3bf9cf808cae2eed3bdb1cff4e27a6e5525c63619d0e
+DIST texlive-module-hyphenex.source-2012.tar.xz 188484 SHA256 c16d36140bf1b387195ed9e17a5adb42a1e764b62e27ba5dc46717a5af744684 SHA512 d7e3c9ff8633d9e42888f5bbf7250dcddcbe7943ab37a76c714988bb1e09fdba61a47f447c857c7d851b6965d6708420b7756a31cb00a97af9ea79da47429cd8 WHIRLPOOL 7f21394e8186d0baea844b58e3da0f2836cc7ad0258152f8e63de2e3aa77751083cbd6f359096d58fe80cf60931ee218cfbe67255aa8c076d487db1ddb32c3d9
+DIST texlive-module-hyphenex.source-2013.tar.xz 188492 SHA256 ba0a22bcf457ffc313c991a5c4fdffd72cc20ef2372e6d1cf6ac2795a34cc7e8 SHA512 181669852b415b437d7f154d3e95c9ce47d3e1f763ca6e75b944c31da9d91b422a2b5da351da391b1e0c141c306a45ac8754b313a355a921d4745734c72ed807 WHIRLPOOL 146acb17090a5ed2b3fc53f77230e7dea4cd4e377bf5b49e252d618835b3369cacf832d130807b83419118e8319d09abd74055c613e59ee55e09b382ce64d5be
+DIST texlive-module-hyphenex.source-2014.tar.xz 182892 SHA256 74c81a71b89e257adcf5479f67e87b38d8a3a238198c117399a253ffabdf39e3 SHA512 e7219a4c3fbcd80858f34f98627f2886fbe004f10890fa999beb528400bd441e28ce24a3800e9251f0e8536db86f618892516f4318bdec39664b848ec3ebef91 WHIRLPOOL 627a45bf6ad473e2be7367038c463595549a391dd8d517419e1ea39d3d7c0d901b380b7d16e2ee1dcbeb71d5fd33ebdbb421fcfac110358c088105e654057b21
+DIST texlive-module-hyphenex.source-2015.tar.xz 183836 SHA256 4fbe38b9101d9e937e7f909d0e2deede8cbdf3b622b6ef9c94018f9d7d6bab36 SHA512 fa88b36e3a615e89b11a8c67981d483dcb659bee054ceabfa3b3d89ea38120da7e01e297f960be465e4750e92b44976e02fcca0955732681dd94ec60567ae9cf WHIRLPOOL 12e377832b7aabf384bb7a5b09a3cb24887c9acc3d89ba9c9b9cc279e9b44288c102bfc71b7ee683f07c301c9a923de9e70e69c2cc21bf576e385eb9d95149a6
+DIST texlive-module-hyphenex.source-2016.tar.xz 183840 SHA256 a72b1b74a3f8787a8648a9fa03c045faf19a555ef1b85b76a80eb08bf38e2a69 SHA512 370235797f5754994efb735b8c1691d3be19dcce9e112969323e16502cc5cf695bd63ac5265ce90a7312415a6acc106999dd290a22e9865a03b0ce952ee62f56 WHIRLPOOL ca5744b61e243a2251a8adc498faa7f9516e5d2ff96cd5c26ae3394fafd85644b015d881073287f11ca9d14a43ada3f69d679d52a3ded38cadc0a4a2c1147a45
+DIST texlive-module-hyphenex.source-2017.tar.xz 183840 SHA256 a72b1b74a3f8787a8648a9fa03c045faf19a555ef1b85b76a80eb08bf38e2a69 SHA512 370235797f5754994efb735b8c1691d3be19dcce9e112969323e16502cc5cf695bd63ac5265ce90a7312415a6acc106999dd290a22e9865a03b0ce952ee62f56 WHIRLPOOL ca5744b61e243a2251a8adc498faa7f9516e5d2ff96cd5c26ae3394fafd85644b015d881073287f11ca9d14a43ada3f69d679d52a3ded38cadc0a4a2c1147a45
+DIST texlive-module-installfont-2012.tar.xz 4668 SHA256 6eb206658b5b6d7918a4c950c412c3a6f1c9ba7ea22218dfe2f7d5198991193b SHA512 5568125313095fe4998ac8e3728af8dedaea569828261d7754b88d90b3b6a9ae15095a54e0f1321babdf6e35e7fa21e8add891512e92c98e0bfeb291ca77d4b0 WHIRLPOOL 3d003a3d8cb5a18c76b240e9fd4ab344cd89c824b11f58b45f2270dc98dc8fe92f4584ed4d741d0c15f3278d7965993e9d98cfd253343d02dcad5e8ccb4bb124
+DIST texlive-module-installfont-2013.tar.xz 4668 SHA256 cd49ef930c54cfe675e42b83b7107812d3b5a40bf613c9e5411ffecdea2d7389 SHA512 feed9d603183874043bccab9595eca55a4c2f34e8f5979e5a436a8f3f8216e559e45dab439f10899d5d568efb4ccd2a790bd77fd3b45003e3fed407ca187f932 WHIRLPOOL ea0e4bf9bc23ab8efbd86330d33763bb606ad0bee82a29e8db6a42cd8d408563a5f0bab012aa5b7eea448bf31c87d815e5cf5495a87e2efea2ecb82bacac726f
+DIST texlive-module-installfont-2014.tar.xz 4792 SHA256 82e5e9a73e7117cf85bd4fb9fa976528c83f133ecbb436e6fd2d95275f84a9cc SHA512 3b319cb33a4814ed541edf05e20f0dd5f759db9c2120930adc4e8f4101cab607ede30ea7a921fd368961c1214632312366d7edf318b8476fe4d15a4027981548 WHIRLPOOL ffb71c7524823247a0e966318a10c9deea92ae60d4def32fb5d32e27b0ebeb117b0b9e1e89fff6bf4c72f9e34ef8f1fb6d014f2cff4a0ab4b8916688691707f0
+DIST texlive-module-installfont-2015.tar.xz 4792 SHA256 9785e59fc2de0dfe4e5416a7a74399114f63fac35ca06e389a6188f0792d31de SHA512 48d56cb3b99b3181034184307f5135e1545914c76a99450e88c32f736081a9cd78ebf3826918468514d7870f592f332dffda57488c90e833e92d6243739af06b WHIRLPOOL 9464d3f14d7eb464433cc13a14ca3a5b06da5d751019378ef7a8925ed1a6a0bb35628399447d85aaca9e9e951973d3b03f94ca4ec9e8d91b537ec2fee9c8263b
+DIST texlive-module-installfont-2016.tar.xz 4800 SHA256 3f74463f631d5ac6731a853cb04e105894c956d53dceda99ffc914580b317b81 SHA512 b7fb4ae448a386338bebb2d77179f8c407c30ea97f91dfb25023408a4ccd932fc8c887ada7f932a8eb60da4d309f34d5c219bc9133cfa9a18fe9ff0ca2412767 WHIRLPOOL cf83e520d712d1ca2418ad8fd19d172d8a04366d57aa4a73baffe2e79e4346aeef9b7a6421847b39d58a784c1661fdad288e23652524b9654f6ea312ab8c9135
+DIST texlive-module-installfont-2017.tar.xz 4796 SHA256 bce878e938be77d29cd96a48cd563bd23a9ae9b9ff3dff187ca90c819cf6e4b0 SHA512 f15bf4b91feaf5af8466db0492aee40c3570494a9ad503b62badf319b2aa20371eac883f714b60e015fa3ff15d8cddff65da373de653a6780fe2709de8fe8071 WHIRLPOOL 49a6161b2404700fda319e7c1a58623b345fe02cedaa5353b1802deb4adfa4d7b75f725fb01af37feaf803819cf6c7d1d2cb479370a9a615db20f21a5fff4eff
+DIST texlive-module-installfont.doc-2012.tar.xz 55356 SHA256 55481ee55673a6c88d4fa54ea7e2e2a33929ecc9c54c50ba2621f1e28ae83da7 SHA512 8d7d620942c1ea07de33adfc108f7981e7a75f231a7d9cf5b8cfc68115d38481edffc494038b967d54d5d9be16c844a990d0e33e55e48c07a5591f591928d8f4 WHIRLPOOL dc6edfd760b58591aa36bb7cd6e10d69a15c5bc4e268a6156b8bd0eb29e3762f86e29e12806b140e738681e3ccf95510baf418633299beadb44f0a48edc3e0d6
+DIST texlive-module-installfont.doc-2013.tar.xz 55356 SHA256 b32617619cea644f07c14e9bb1f511509b330c71f869a4251a3a16fb292739ea SHA512 106bd42d31adf9364e068005668bc6b96678e96418ee4445e14488ded2196bccb3b0dbf62d895af6713bfbd5df0286992bc0ee2d2b0b3a9c8b368e24bf5435e0 WHIRLPOOL 54a9fe00880f4325a8ae0a259ddcb873966a9407b389d736cc4f0522a019c3ac8680418d5a14f2edf24bdec23115eb70325a5fc92e6a19d1e578fc63c2540e98
+DIST texlive-module-installfont.doc-2014.tar.xz 56044 SHA256 7cb395cd585aa4db032befa9476c11dc897d2ccca47aaa94e13f43145ecee0f1 SHA512 e95fa7670dda871b473f3eb3d9644cafb67494fde0f00d195872aa6de0af0ae2f9665274665b3927f3702f28856d732dccd05a4200f45391731b98d05282774c WHIRLPOOL 59160c349f87b9dfcf32c99447cd3642d729fb5d916afd7fd876fe3a8bf093d05aae89f12514f63652a94ea3fb9ee68e0d62e935773c0743e803f83dd7c55d19
+DIST texlive-module-installfont.doc-2015.tar.xz 56044 SHA256 54e6bb7926aa5619eca94c157a57bae4677e15f62842d7e661cd620c19ec7512 SHA512 877853b347f21726d4bb93094a61977d5ff0a9c2189f7258519238e063764c8116ea9549cb7151d3196b773d5260e490801941d7719a2daeb612028221ebd359 WHIRLPOOL 3689e180b195660b7b858291803a3fa29ade8c08f5236d01188c61b05172dcd86136516ae9a083a94f21952bbb75f5b5215ead9b6141f2db3eb378aaf9a1a476
+DIST texlive-module-installfont.doc-2016.tar.xz 56040 SHA256 7f18a32f31109c72753e428fa94ea399064e8d46ccd5f8ace006b392135b7c37 SHA512 601fe2974f002ede756a16fa7edec7b930ecd4cdaab7398afc9b0df33cd5d3193894d674d139468916ec52cfa9dd139b2783f4c99e37349785c3007709b558fa WHIRLPOOL 0d11192d0b63cb18aa9ef01d61b8a1eca5bb57dae00b9bba91357ef318eb31c3fd17ca72c8a3db794e025a3f4b8f1d3f3ab63b750f15d6c4fa17338e9a169013
+DIST texlive-module-installfont.doc-2017.tar.xz 56028 SHA256 12b1f5330d886294ad3777a3f402dae8130fd1eba85a35a3d79bf75fe8de8092 SHA512 cad711520909fabcb44a551c3d3b4ac12682ffa5ac5986d168fe0e0c0e5ca0cf8135d2a3964f7d4f15f8891ec5d44fc88d0f00a458308b82e31dd1bb52dcdcce WHIRLPOOL 4efc90201be54ccccc3a096488740088a7c4d9781e83d52a1734bb1ffde6f29d655a6224afcea901c5c361323e8247533d0903fc66b06fa1e64c82e163fa119c
+DIST texlive-module-lacheck-2012.tar.xz 7672 SHA256 da244f7fc997f01a3975873e346848104d8931c359da3930da5a17de2207ef55 SHA512 672af827322d928b1f7c2b1141b41be00e3ccc5f7176b9a016321cf36f3b8f8bc45bf94eeaa488cf81a1df11d9dd8e1953d6d14cd0e8fc1b1d065e00dc0fbda6 WHIRLPOOL 367dd055a15ae90f9dc0108aa77f85b555789ad5a786ed8f8a708be58d2ad32ed522d9bfc7952a473bbb06ea7e1070cc1e9e3650fe05daba8b3229d485c1559a
+DIST texlive-module-lacheck-2013.tar.xz 7744 SHA256 0abefc312fcb3432c3c80ad3020f13aebebf6514d4f62a9b1ea4c236d927955c SHA512 c24e7f0257ae73ed8c3fff5eaf32c218d4942533b17f0ead990cc10df370300f4545b1d6eb49ff5994b4c8f20c1b93f4fe47ea2c38ddb53bdb9a580d8448670f WHIRLPOOL 6f565993b54cfc374043e713bee8a51cb318adbf432cde5c89aa0537c815d9f7a30375ea3115df8af903bdabb65e8527c5a35b35ff34f1bc48365eab924cbad3
+DIST texlive-module-lacheck-2014.tar.xz 440 SHA256 15fd4c2624423e340b2848369668d6f6e3a71fc8bdd8d06dbd0c2a3ad5236de6 SHA512 610c8defa073dd5217b5ebf72e40f496a90cf64b637540d8e79eb4232e50f1cf643afa099926c4520824a0d2bbc9b1daf29f0ef4b27acd6a2e06014d249663b0 WHIRLPOOL e2c1ba2b54e6e471e9c4cebb4d2e718c970c947f5b094f800a71e45c77eb739e8a792aa4caaec6645edaf18781637625caa49ff49cdc5157dcc6f29aea63a8c5
+DIST texlive-module-lacheck-2015.tar.xz 432 SHA256 ded361e8eebcdd53d12bf5ebdb5ad05f7fe8ae9d9794da1ae97a672cde619dfb SHA512 3754a538b8699b871dc8f2a6b5ec9b483dccbf34012457fc25d358387ded56ae51be82c7f4f0e3be1211695665a3241a5cbe61cbfd89e81a54bd7179a94a2634 WHIRLPOOL 10195b6d031ee4ef7373acc692b6230dbf7b420ea3a6a732e68ddc0a3577727fc8f777a13eb664565b64e517b82bce908839e3dcd9a9ca942d5abacf9c2cdd64
+DIST texlive-module-lacheck-2016.tar.xz 464 SHA256 642c6cb5a5d0c660de922d62646d087073b2044116f4fde29f5af6dcb48e8016 SHA512 b27fda27d39f1f20450f72cd5ccc7bc59590d16d6ef0a79d80563586b3013ce5701e9a6045c53539390028a1372f99386c00158a5fe104060e59eeea6e75aed7 WHIRLPOOL 878dcb98a2e68ffd6dd90d82a94283bb4cec975fddfda7dceefea5384bf5efeff256b1a41b5781c1eea063502f4651a8c29d5073a7e3d8159177a99c6bd5472b
+DIST texlive-module-lacheck-2017.tar.xz 464 SHA256 ace514de00f892fa800dc7fe0adda1bf02e25bb86c5cdc5072e081974d4f8ecc SHA512 16a3bcff6278cbc0b8237590951b6e5c5cb4f13402d2991db8f69ed4ba7c95a4cc2caf6563a2e38a386caeb68af11452d26a3a18a8bab3576255ba88128a8eac WHIRLPOOL e5ed872bfbe05c3df9c6ce6e9279263fea36106577dd709e3610da23d7e7866fa1d40527e853f9fb3139d4b42e0389d676eca389f9e722953de1295d8f2bd2a1
+DIST texlive-module-lacheck.doc-2016.tar.xz 21412 SHA256 39bf66e98931e86894b8fe248ceb20e0174ea41585542120f3fb6454f97aa11d SHA512 a993938c00147d2859544ae266ef7a0e9c57d74095c6c0ababcd36a14a36e22d7ad2856a960278b81331566ba6af80735d644b4493e3ee44b3dfe96194d633ab WHIRLPOOL 5338109a532b8aef2780a1213083e63aff8b9e250f6193983b879afd4add01ee6dcd3c45ffec5c79c377324ee6758d60b065aa4ced138f2c63a8410cf92c43b5
+DIST texlive-module-lacheck.doc-2017.tar.xz 7404 SHA256 99662bc9051d512b691accabc7f59e0426fcd0187d25ba204d97422ed8821498 SHA512 dccade3cb114fcaed052b8474e6d4e3884023cfffd34ba8e4895452dd84f114270f3cd20a731b52d5443953154d6d0c112b27bbad536ff1cdef463f66f1e9fa2 WHIRLPOOL 9b29ef72f8ed856c651dc36495fdf7ca4ee27eafdf7f0a3d197178c0c9130c15c0f5a0a1475af680627606069d34bf2e6521c927ac5fa6c1c4024d9b8f046978
+DIST texlive-module-latex-git-log-2014.tar.xz 4832 SHA256 232a9b32eede8903019b3ef8916696f047dd3e07f5a2d644f31c339beba12608 SHA512 5bb8172aa7606b44cc16faa747cc76c40a694cb4f3e1d03bb8c56197074236a9e2ee864dc6e99892b3e6854453e2ec3db6d7c9315c10e9e881454bc551d6dfe8 WHIRLPOOL b44d64952afb66b3d391eb59921b6734fadcd1359226217195d78a2d2a416a2097295d0a6e5437d888356c402feaec01b502a5fc565f4b1ab6598d7e3bf0bbe6
+DIST texlive-module-latex-git-log-2015.tar.xz 4832 SHA256 75ba1232091e9acbf595b6b776bb2351ddb5afe65b196ee98c5c5f0767f36b34 SHA512 6493463295df6cfbeba72b87445dac94bf193a53775c753f00650e313a0a3f9a6ac330f63c8244e0039f17e5da8f5342f8a6f7008b53e2affe23357459c82962 WHIRLPOOL f1966afa49e468dec4bdf318c30d03d619f367c9a63342ddd87239f8366757c7df78d0fedb40c258b63951ccbc5cc8dd0eff8822dbdcdf286a2df567c62bed5a
+DIST texlive-module-latex-git-log-2016.tar.xz 4840 SHA256 a402e327a6324332ea3ab73a29da50bad7ca774b072f208819a75e174df276dd SHA512 bb65f8d8198ce06c527e2c766b0f80d4cae7391fb223a883a3d843823c49064a62dd6402c0881eed0d01f4eaa55b703f2cb354e205e3ff44c83fc7fc56323b22 WHIRLPOOL f032182b31bcd313aa82271291dc4b211302de9c7ec77dd70f7a8e1fb45808d051d0125c7df64e01c888d8b18db8a89613f10c871250a294b401d57644dd048c
+DIST texlive-module-latex-git-log-2017.tar.xz 4840 SHA256 0721e1d213a0e5531b8fd652816c5afda00c302882d7e9194c2a5c9db08b37f1 SHA512 01a823d96ea3cb193617ad26405768231a1ba3f22165b008f0a4898e3db14da424cdcdd12fc353e0c89b42e6cd80e3b1531d772f663ea9487f8fb02c763a1c03 WHIRLPOOL 7d42a8fb889c302275e4f272105f0a82da6a9d3c247a6be2e091df10a28c748da1e9db446a01aca16adb818e7591d709598e992ba2b0758bd4b933eaac985220
+DIST texlive-module-latex-git-log.doc-2014.tar.xz 91528 SHA256 298bf1de24fca230adf1058c681f4335f773377f0385e4969e217b9aa39b17fb SHA512 04995a590e3010919fa05613f4edf16ef71b2466b241cb66d477404be78da60916a92ab05134af2921d6676dda8402e7dd8057333c1ce2b4187b25ede6672714 WHIRLPOOL 067dc38289b7ac8f90f43ac65c18d9a7e8c64631278e620dde70f996c6f37996594e2410132aa820a6a3d7c25fce46e989e82502d08bd3c88e34202cf3006eca
+DIST texlive-module-latex-git-log.doc-2015.tar.xz 91528 SHA256 e0ae78c41f6e296552ad4706a5217b642196bfd8d08540e297744308156a0968 SHA512 21a090e73e502bb2c8ba29eb83fd4990f5529f2dafe351f683400fc630766512464613d8d22c6b54a22b3111426796800dd80815dc0d67e660034d8eb6cd0e11 WHIRLPOOL 23bdda51273f4ddbc19bb9f428dda2a97df69fe6ce20d7c9eb2f1bc01334029ed72eb4e23a0b6a710389411148e80184d16f0dfb3c4b55036dfb544478b0994e
+DIST texlive-module-latex-git-log.doc-2016.tar.xz 91528 SHA256 f5af8a2203258073f66f7b9ccedd2a755c386fff8e1e719d3587a449b18f5ec5 SHA512 0e08eb2ca6a0c933a82b66058d463c781b0313e5631ed4e35312d0f612dc2c627dfa5ad5d4b520a457975f31266c6ce132f2318fa2fd1a66f4860fc14dfd334d WHIRLPOOL 84e3e8843a685a334845b79ddacdfe0596393751a6911e6c28394610c10e6aa2bfdfeb4779d13c19dcc341b077c43ad17b79d2b26715c6b2e0b5b9dcf9ac07a7
+DIST texlive-module-latex-git-log.doc-2017.tar.xz 91528 SHA256 f5af8a2203258073f66f7b9ccedd2a755c386fff8e1e719d3587a449b18f5ec5 SHA512 0e08eb2ca6a0c933a82b66058d463c781b0313e5631ed4e35312d0f612dc2c627dfa5ad5d4b520a457975f31266c6ce132f2318fa2fd1a66f4860fc14dfd334d WHIRLPOOL 84e3e8843a685a334845b79ddacdfe0596393751a6911e6c28394610c10e6aa2bfdfeb4779d13c19dcc341b077c43ad17b79d2b26715c6b2e0b5b9dcf9ac07a7
+DIST texlive-module-latex-papersize-2016.tar.xz 4608 SHA256 eda97f2b7fbf10925cc353e176100ac0e51c3be54a7e40061a3edda88518a9db SHA512 84f4af6e54673015a85ac1bc7e16a93b1fc9c57df4251ca56fd3af5a90bbb750a9d4aef4fc5ab769bd3ccf965ee1bc31704de90d0f2c88d23d696b866c8a2fa5 WHIRLPOOL ec32353940e573f6b26f49f73a2cb9fa3d756f164acc5b555116f52b22dfc1e1ca5b0b856c25e62e70c4a592ea717686216afeae6243db690c6bfa10c5783bb0
+DIST texlive-module-latex-papersize-2017.tar.xz 4608 SHA256 eda97f2b7fbf10925cc353e176100ac0e51c3be54a7e40061a3edda88518a9db SHA512 84f4af6e54673015a85ac1bc7e16a93b1fc9c57df4251ca56fd3af5a90bbb750a9d4aef4fc5ab769bd3ccf965ee1bc31704de90d0f2c88d23d696b866c8a2fa5 WHIRLPOOL ec32353940e573f6b26f49f73a2cb9fa3d756f164acc5b555116f52b22dfc1e1ca5b0b856c25e62e70c4a592ea717686216afeae6243db690c6bfa10c5783bb0
+DIST texlive-module-latex-papersize.doc-2016.tar.xz 596 SHA256 09dae1229372a2a4c5754ef5ad2c09226b9230cf3717d6a7f257cb42e9667ffe SHA512 c4360a451e9a21ea60dc10631a97782aaf6ece934b0bedadf5d0328ae689ef599c914b4ae2579d3c0ff5bd833f93c0efbb4085589df56a7dc93c895b6a519a35 WHIRLPOOL 509513dfa3c61be677d2f5bf39707e680ba7cb0f48398d57c38d6618c9e5c13e02bb6e559d8363977f35f7e40ee4d206f989f0d06b325c85967d1cdaf6fec3a0
+DIST texlive-module-latex-papersize.doc-2017.tar.xz 600 SHA256 925937c333bcdbed9e9cf3d57a7af4ef3ce0e8d198dd99c9989fd76fc3aa866e SHA512 e3aa2050c9fab9c806f0df66bc2d34b97a8b67e6e1bb41b13e524054731419145003305117ecf515dc47c98ae365c78784a5f09f823145e01ea08aa54ebb024b WHIRLPOOL b78cbced00ae7086439bda1fd69ff6b23a0cdad9f3c84a164050288653958e4bcd6d4747c96d0ef05ac650988595c59399a62f9d92da158b73c43dde1967e04c
+DIST texlive-module-latex2man-2012.tar.xz 13612 SHA256 71556df54881d875093869f3b51ea9eb023f6436ab90abb2f5fb9c9dd7d3cdd4 SHA512 c725acf8bea1f4b20ccb88f9cc92bcbce5891a36f678b20a5b8e879c7063127703e3d0f26f31cfd3c1195b79270eafbd238809752a6990ae673bf3214396e9d5 WHIRLPOOL cfbb8f42feac0caa9373f2370bd5202cff32fab077b3f753c709e63db9d7645300e3539c13cc3ce3b0ac1d6eb24b3466bfd11865f462d56828d32e1368cd392b
+DIST texlive-module-latex2man-2013.tar.xz 13616 SHA256 d6e755c00dac8b3afb48b388a7a5cf42e38092ccfeb00a912231ebec688b723a SHA512 a37d6e7e1b7fc792354cbb1719b059908fede59cfc11b7f63014543955f7f6ccf1b81a255dbd66c3b48bce63e8ea44939e5d576851baa7f66e462aa26e079f7e WHIRLPOOL e769afa458a5100360d4c565b6a2d151bc0db7d1c489ecbb12a35232e40d975b7fb13ab8ffbed6ce7f14b0861ff3e26f230c6bc131aa90c2cf309264f258b927
+DIST texlive-module-latex2man-2014.tar.xz 13616 SHA256 dbc753eab717f0473413bc02911ca41dc062230b7a9c555e4e3d0dac9e4ca402 SHA512 f45b8bf9e5ec36d400e33ab74541ccb4111d2abb42879e763ab5ea5475a3d0b9f7f9c8822e8aadb90011cdbc6fad8fde7f29819699b936b90933c5977efae367 WHIRLPOOL 23997769fc09b260cf291a844e78dd10dcc100b474f915b8c65be505fcb553d92815c36f55e076e166ef7184c771360d86bcbda0c7fbba30a20e93c52e40c485
+DIST texlive-module-latex2man-2015.tar.xz 13616 SHA256 fa41c9d37eab039ad984cc950cc213dc187c47431bddb4a7645a655010b10163 SHA512 679e2e6d3ac452d595147b740890d8dee439b42b71a1101e095b568f05531322f5aafd289463019879d3b79cde57c31f7a1023b6a933bc013c2646b819bc4d25 WHIRLPOOL 0df5da074c16bfd1c2f7068385ed6cd72680c99c65702f7beca6fe39cfb7ec142ccf578582ff9ad61cc531f7fcf5843aa7824cfe4fc5328037490ae80623106b
+DIST texlive-module-latex2man-2016.tar.xz 13628 SHA256 0683b39c700828322519f66947da0bf66903dfbe077a64c394e3225552155826 SHA512 5b5403b76d5f2ef5b9ec01ef925c6adcd4b5f17fb17d7afc6bc3663e553d6845c4db3551e2150943a9af5853ccb47642cfc49a1abe5c7c068d5d59e02a2f5b8b WHIRLPOOL ed34a1376ef9035456b6eaf5f594a6a954861d04a0516005e49d912cd5f51f6a05f9de2936971630cb7b8c28a4f07d7323bcfd58d6a5fa407835cfa010680494
+DIST texlive-module-latex2man-2017.tar.xz 13940 SHA256 21a62c1f449e552e2b278d5897deb192d3b31f47e0084e8cc6d4b12a08e038bb SHA512 e3579403dc9e984cb51f8854436968abf69a29ae6984cdbd0fb2fe0141b1ff2af65d2100011fb6355580b7f8a73a3c0bdcd3b225c8f7e13a828c6b2c5ee602af WHIRLPOOL 7826163b94834b765c577ca19ae5eb0a075c17347db7b319f879d1e73a917e8440be75d97dae7e35c788139230f4e0a9f6cbe74aa05daf860305e870019cc9be
+DIST texlive-module-latex2man.doc-2012.tar.xz 206808 SHA256 052de7f987169c3da05b427b88aa1f19a6b9f1ec7d1e82bdfcc5017d6b81985d SHA512 89912228d2398739b1b79035e21d4d556333821e04e321c7d80dc77068fcaa3d60031f9900c7e15e06759e52f3795ced680efe97f3c1f567c36b024646184fcb WHIRLPOOL 977f524453e1986840fe9c4a3a4c5fb74f56679ae724b7922241b449efd7d8e04fd2645156ae7a633d5f23b9383ba449cffa5370678eca303a3f9d90380feedf
+DIST texlive-module-latex2man.doc-2013.tar.xz 206952 SHA256 4b383de1d74356c58477f61cc5c982c07a24934cea019f5c9c205da23e85e134 SHA512 2b89f6056ef056b7c3c91f6c24ba9b04614df8599bf102875a1707a3ec24ea6a2bc662cc10b741bb2784fd2064555cbb8e177656696c6a49ee4988ecc2cc754e WHIRLPOOL ebac2bee806c5411f13905b0ec720fe01afdd936ce646eee5641838192b5ae4811d52e14b8ceb3d3f06342c197e1e86c9c8607e9e30e856826b771bb0e464164
+DIST texlive-module-latex2man.doc-2014.tar.xz 231872 SHA256 78c89f8bffc086f1ab840ad4b399be6f480ea72fa6d9cf5eaff1828bb685082f SHA512 b575440c2a2854d22004713b13c08c47e399eb0fa34e8f59b83d90e9d417556750ab27ba51335d1a921f88a3f7a4aa5c5bd760e5b6a8c132134d16e3aafccbf9 WHIRLPOOL 222792b41449f0bc36d6e20daae9e49a0092cf3a01ad474659ecdb9c33b57d4a1543f5d2d01584b3471d6eb3f41f7553317f1954f570872a11053d8ef67863c4
+DIST texlive-module-latex2man.doc-2015.tar.xz 231872 SHA256 d4fa0d9a97e6652fb8eda36d1726ad4e317cc578400457347662d6a320a2da76 SHA512 a348f141453dd57260edf0ea42c58a2b9a70f0ddba0dba506c9880f5d7888c1b1189d60c1eaf5ead15fcc07760d3d43ae9c5178d3b65193272b1bac7389f12ef WHIRLPOOL 49b86d57e16844cfa781880d6d55eaf5e439bbdee7f0c90578f7a10a7f50c8dedc9a1242fea8e6e9def5f0e67346b33fd73b96aae036d2acb40bbb8d6c3745b6
+DIST texlive-module-latex2man.doc-2016.tar.xz 231868 SHA256 804f5743b82e4c6d4676a1c33011e44ab12c032508b0f899d702089bea736057 SHA512 829c4b3393ad9a1cc50e71cd9aceb1ee457540eadf11941dee58ac5741b93c70c8c19c08c12b10d8ef7ef1667937899ab25e2d3b451ce961154885d69cfb1070 WHIRLPOOL 53f7d24e18f5475a02c183ae0e65ccf03b9762e02fffa4befc2e1d019bd1c6f5e54faae6c597c9f2fa503e272c54a7f5e47d2aab0d02b9f2721ab0c8e445787c
+DIST texlive-module-latex2man.doc-2017.tar.xz 344456 SHA256 000fa4c60c3c4e84b34b77583bab341dac55eaa841d95949f9dab6bde3441ba8 SHA512 88f4b0fc6a12355b0defe1c1ee10aba1d06cd498556ddf043ab12d480ed5f1946cbceb58de7beef452afeb24e416261eed8aff8c21c330909f6cc6a8cce9d5c8 WHIRLPOOL 1cea27360e3a8155bd4da1204bb8d8ddb23010eb90f0966ad7ed204cce59b828931350cad27753f24b26ac1659f1f3af752e926686b3e8c66a6c643a7ee9058a
+DIST texlive-module-latex2nemeth-2016.tar.xz 7082664 SHA256 09bccf1cb8392b047efb5365736b4f5dbaf6c165a1b8adf1c932fb503008c21f SHA512 f65a25838d5feb6c90eefec17e13561241359db663dc1c109a1a0fc6a4d8dbf48919ef068db1284c8e117d22566230ecae405c69813fb7e95d26cc1e5da1f403 WHIRLPOOL 282df25d99f8a7c04273152b8aa75680580c82fda274884e74c71936cf691762ee435b4a50833f91ce723b700557995c1ff2db87805c430e8ad9e5c1559a3310
+DIST texlive-module-latex2nemeth-2017.tar.xz 7082664 SHA256 09bccf1cb8392b047efb5365736b4f5dbaf6c165a1b8adf1c932fb503008c21f SHA512 f65a25838d5feb6c90eefec17e13561241359db663dc1c109a1a0fc6a4d8dbf48919ef068db1284c8e117d22566230ecae405c69813fb7e95d26cc1e5da1f403 WHIRLPOOL 282df25d99f8a7c04273152b8aa75680580c82fda274884e74c71936cf691762ee435b4a50833f91ce723b700557995c1ff2db87805c430e8ad9e5c1559a3310
+DIST texlive-module-latex2nemeth.doc-2016.tar.xz 23852 SHA256 e522887d2d2b301b20975518a9337c02146b473efba0297caa296a17f19d3d87 SHA512 611ccb9252914e28d8008abbebc02b1d540d151978cd306635aaaa181a2cb42c41a573b10c2fcaa1c805b66545cfa0329301e3bda6b87d5b7e01af3df3491a2a WHIRLPOOL 3f2fb19f399508ab9db44ac0eedd1376114f92b7049d0dd5b3a98abf0ba295f492d53304d5f8dd88bfc1291cd323bec99c0d33d340fc42450e7d94bafe6f437b
+DIST texlive-module-latex2nemeth.doc-2017.tar.xz 23852 SHA256 590c4defc0d7f06a8501a31e9a4c68e3deebb2127c644b069ebec6bc99940adc SHA512 c55505f0b00e4d600ef9a40461f6e3888f4c820ca1462a2c2edbd5c9f9ca75e08e543cb9fb25ce56313a6eb80747a710134ec5933f71a172e5a675ea9a0d76ee WHIRLPOOL 856b82f2b0694674d0e3705b8027ada2a2dc22f075df1a44d0221eaa95c7c225c1ec93e93d2dba8250ce549af4648962c0f4e90d57a460aab005dc3defb53033
+DIST texlive-module-latexfileversion-2012.tar.xz 1632 SHA256 2ddaecef290af87fd5916ffbf317826fccc9fbd0dbf290a0f4671bc013efd50b SHA512 953a3e288d24b5da9fdb497934a5e2d8a599a9b47c2e36626573a1dfb7b746cec89645da13a76a6da0a38178b2680e4ab0f9f559aab6ac4560e42d008020652e WHIRLPOOL a717abe781a8fd1f4ca46b082275ee73253efaeaf5ff88ad9d3ad0a81e6c768e98aa72d5c4c8efa3bd67c2b3f8b3a1e3caf77a7f1df171c7186d3b71e7b110cb
+DIST texlive-module-latexfileversion-2013.tar.xz 1628 SHA256 c3a26be8ce6ac9c30384cda1cdff6b85c70e1e19430231bb730bf94a507e461d SHA512 e4016d21a1a515b29e39da6b1c75eadca572f13dfebce2694adeec4f9515548e1a76b56d03246abfb6760eb7727a2244a72379ac86823bc67858a00df20b4086 WHIRLPOOL a5afec65dd66e079d5eaada6f257838f5d414dc3642f7863dc79c1183554834fc886d8774d34beb801f2cc2af93fa431b6d347e826287e3e8b7ea7a0bf6d433f
+DIST texlive-module-latexfileversion-2014.tar.xz 1632 SHA256 932a93c6312fe6107cb5aa006ca3340fe378fad7d332c010202fcd95b71bb40e SHA512 e34a3342167b809b1295a4d44e81698746786bd0901a46b47510b87c2ac371009fee0b342999b947c9fefc161046cebc1f43a1389575b57c7e830994fd1b7ca2 WHIRLPOOL 94229e5f70cefe08d8f0328d332d8636bc98fd3c07ec5065692a5f718c55045881030849810ef2ec6a31f36bbdf155ecb739c77d85f35329330bffaeaa379d96
+DIST texlive-module-latexfileversion-2015.tar.xz 1636 SHA256 3282d9c86936d0109ca9be144df15e12f463b7b1b965d9403b9f5bc321f88002 SHA512 7ab5c6635a6c0f6fcd3849f51933afbc7756d6aa58f7dca16cd0cc5243bee687115fdc358734546b7d4298b924a2a461834880e1f83b064b67beefdb805d9ec0 WHIRLPOOL 56b561aed58c41d6cc2c6a2cfb70361f4c4acea59ac34d69e87d809654c532c9b21bf3999530d0bd8cc281be8a5c4e749cbb8a6b0568f0d99fcb4a6fd3353139
+DIST texlive-module-latexfileversion-2016.tar.xz 1648 SHA256 0410b02fb6a595e7a6a215a72c1b45f1b2ac8f4d675a423e1461c1cf5f9d521f SHA512 20c1596ddb6d554b521e2e67529d4eca94391616ef41bc52ac504d11f991e5416a2edf42d1792a5081f551b2d60c29353b3ef562efb77b98f30590600e26c2f7 WHIRLPOOL 44e99c5a9d9888d51e92f696cf7c09592bc5f79289ff270d69856e527a9520939bfae092af784fe767c38b27bfabe0460a76da5d19b261cec48a36c7049b7bd3
+DIST texlive-module-latexfileversion-2017.tar.xz 1652 SHA256 45018de79fa5e9010f58bc56d49dbd226d9cfdd17aa665fa5c8889bb72bc6f96 SHA512 7b2c2ef5ae64d2921da0fa553f7fb745dc7c8f9c5675f5c018e29a4745f2333c0f51d00eaeac6474a35a382d9286896b0c9a7a105424ec680f53f8a93faa5b2e WHIRLPOOL 3121197170ff855fd8a0a070479402287261f4ccd8c0f48740b452a3ce64dec867985fd1aa41b3d4d6e294c792ab8fe63b8992cda2229731751cee03772fc191
+DIST texlive-module-latexfileversion.doc-2012.tar.xz 924 SHA256 28398106056beaeabdad85347412b6b410fedcb8c24d7787715583a4b5c0f849 SHA512 fb8d04bfea0618dc85cd28c9ae02927ef4e1b56ba7f99c611b042f8dc7c6bd958f4faa1fc7a74b31b26be9890dec5b2cff8c65d9f7b063d8d1c1d7ccab58dbb4 WHIRLPOOL 7cba3bfd82246f3ac62f19288088da1b6bd7687a948c6788dda95799ef9ca276a1410d52b1e1d55125dfc366dd858af9159cea9cfab5c953ce9d4553f3b4f39e
+DIST texlive-module-latexfileversion.doc-2013.tar.xz 924 SHA256 a0d94a9486a7a31df5649dcafdb67ddb4f6166918dc9a3b388cc878a8fab38b3 SHA512 54b4ae907b2119e72119a559c403ee33be4ad7796e900d690b8f5d18b4f97626ca372c16badb0327ea0107462300755668ed36cc126821853af19b6afca95a02 WHIRLPOOL a190c60ca2ed4839afe4357a33c51bbaf0a9c1ef63234c7d90807a02bc78aadbcf2af5cf033eba5cb54f9459c245c7284cf817ec7b663dd51395b5a2c70f169f
+DIST texlive-module-latexfileversion.doc-2014.tar.xz 928 SHA256 bb814501172779e9df8368ca9e74b0d784546f561cb1ed1c361bf9721bf4f12e SHA512 a8716908054a1bb65e10e1aac743b86d793e390f6c8a146182c738d40d67a94f5febee79c2d48599c3475583ca5bd548ac80bcb361e611608b07981c1ca335e2 WHIRLPOOL 92a55617c8e75cbddc75b11c81d572eaef4217e09290152ac4034b465b61e6a7c09c9dd7e1ad5fac6cb96c27dbcf85677f59419b93e4bea0da9ef07bc7ed02b6
+DIST texlive-module-latexfileversion.doc-2015.tar.xz 928 SHA256 836aae2563a3ffeb5e74e7af56f544626fe736cdc878d92b0c97ff9b997a99fd SHA512 73616f6fbd0b47cc498142f75c68b1c8eac42396e48a2434d62cf0ba5e533418a93f925cbd46c4dc43e8cc688a086985ecd7506471ed9290a48a6db9d0788c73 WHIRLPOOL 75bef2f0442f52122f4754da86529cdddb95fb1a1bcef93879b75c33d49cbe4f061989d9a4ece8b794ce9fe20503131c20f13144c6c96b9e7582fa137769f7a2
+DIST texlive-module-latexfileversion.doc-2016.tar.xz 928 SHA256 5a685d1150fd4b7e7556b69ed504887bef10bd6db2b637f54b5afd1233f0edb4 SHA512 93e172bdd159dee0608c7c9b0454dc24c0457b1ff6060b5a09295fdc3927bf564486ecaff87d25f346c245cd8d83b2c53032fe0fac4432dac3187a6a8e9a2ad8 WHIRLPOOL 6bdead84f8a4a462b4ae5190ee59ed0f3db1c8dffe63c2c70d6d376ac4e710e5b51517b01ac802c34bc6337fccf9432b3b934e901896758a801eb040d2d3a83a
+DIST texlive-module-latexfileversion.doc-2017.tar.xz 928 SHA256 4600bb0641a5cca9d6552982886a63cc51d3c9ee4f8edad0d39b446102156e27 SHA512 46a5495320ead028664b1c02c872147cf350f05f1f9a18291fd47a266a06a66449bbdc0d9d4818cad30f75f29a2ea3611fd6c88379aaf3a703e76e6df9f6b679 WHIRLPOOL b7a4c5b5fbd137fe5f104990473ccb8da5edf46a3bf3203b7f343b01050585f3d1f9bb8945f1f691e4a226d6aa763730060e4ce87f43355c95b63c5821d1fa94
+DIST texlive-module-latexindent-2014.tar.xz 14664 SHA256 a0acddc7be739af6959fc76de5ef8a61f2f79320550c65b04f6d812fdd7daf82 SHA512 1c54a72df6abeefced5c76ae7f4dea8b90be736292d11253d3466358bc63c821427f5ffe3d970643ad26185ebc19771f7a30a4ba05e07829d165d74016d1ad39 WHIRLPOOL 6374a836dc1e1d540a898e26a20828e678afaabfe6c4bac2622a19657b49da81ac18f90902f4eb54a5f5059d02bf28c24f247c27ac0024b4976bf50ce19a4db7
+DIST texlive-module-latexindent-2015.tar.xz 17616 SHA256 6f965f895b6ef3cdede6106bddd344609a26133b45063448458a9a63e252c7be SHA512 499fc65d51902aeb20d9cb6e7adf53a05dc5035e2f2262523d39490f466ad792b0eb0532e932675f2b8be516d270fa5dbad5377922573c078f4c4ea5128332a4 WHIRLPOOL 7eb48a27a0876e32af981ed12375e4fc437949ec809c4a7a1c63991001851085cbf696d8fd604bc5960639fa67122067bb265bef7c38a7bf053fd8e1027bd50c
+DIST texlive-module-latexindent-2016.tar.xz 19736 SHA256 71c1152f011ee4db6f8fdbf358d8bfa446167815b7b1121863c7e626654231b9 SHA512 97667beda33dbc772906e845671902ed7cae0b276b3e9db3701a32f2c32c4aa2fa0f04cfa22d5cb3b9e29084e23af86fc7a261ffd09f5ad67ca3e4f5e0258265 WHIRLPOOL 631f56434c2fc96f3947b603f573d75a0c7a59f4934c4d5db2bb7d314eac3605588d750a8e725fdc6a8cd35e9c19249da45bff1626844840bd9ba478b87efae3
+DIST texlive-module-latexindent-2017.tar.xz 38844 SHA256 446f936a4e107765935760446ad63112226c7227a1ef5f19d7593ca9ca6c5982 SHA512 f8797cf236d783536bd208abfbd7bda3fe05f5101e3ff2cdf546179a526029ab47fc25eadce6f54cd8f0ab29ea155d412163726cc2119395ced80507d8597f69 WHIRLPOOL 40708d41c8d5dae9dbec7b1c558f38877e89eb112f17ba82699118ab13a367b77a0488678ae099aca8a68de7a81ea4c2f51c9cb4f67d32c8c12804009f9af49c
+DIST texlive-module-latexindent.doc-2014.tar.xz 294616 SHA256 1da186affc0df992f51262a5a1295ca3132d6f10a2aa7312386195b11ccce1d4 SHA512 f55dfe3ddc54ee75d8a5b9c80aa4c10454aeceb25f72434eca92f9bda2a4da5c180366fbdd5303c9ed29f9aded1fddc5d3f835584f8d8718f8aba4fccc9f8626 WHIRLPOOL 5e8418037103a809554959146c5a7e279c3305fe8f88a3341cfc3aa5d023192f9ffc80dff0ea79ac8cb11dc53cfc1c0c6b31f4b21a587fd999c6952fb5623034
+DIST texlive-module-latexindent.doc-2015.tar.xz 297260 SHA256 6e6cfd5d1c524a2709c44dcefb5ce4bc9da8b6e5517732821e24b0e606630b0e SHA512 82cbb8f5761d42cc4d4c797da32eb14c6aebee0cccc48c4f1e9c0381d2dd6c9bf59457f079cdd546bb0a804e22cc5318a488812f46d13b9d6d03b0fefe006894 WHIRLPOOL d56144edfb7d2f89962be1892be9c0ff5e2374f9a74b23595e43d3c3ddc0e99988241ad071330f91930db78d8a974fd5de2fdd4468e0bcd7ae09c9cb1606fcda
+DIST texlive-module-latexindent.doc-2016.tar.xz 343636 SHA256 187172b9c88f426f90b8b6bc2d8ee4f28af24399e6ffe4c0f0da2b773d518758 SHA512 4bb97f2ef234200173827c44f23ba49d709e0d0b5934671a0a14eb9e9932f139136dee534390a898e1a3ee0cf0fd3c07e90c2eb77c4a09d2b5b0431ba3d9f79e WHIRLPOOL cceabb8918fc8124b31ac51bc804e958539981fd84bd7cdd457dc9cda9c2b40a569a70083c29179227a869b6edb8d9b813fa7b5831cb16149f6ab004b7628bda
+DIST texlive-module-latexindent.doc-2017.tar.xz 541996 SHA256 00e180296ecdc6b333e67e84697f134a361e239bdf229e6274825d133bc31aaf SHA512 53d8e5566272f7dbfca899687a4981e142d9e801d6f9c6c9a33e5fa6adb0bf22828edc130f7320a3719b93001125066ec48a497743490ae5f7872747317b6f2d WHIRLPOOL 2e381a9446183582798519a0bd221a26572738cfdd49fe55db2ff8b1ff5a02c9a603aad303d37e6ecd62d50ca4f34134391b19b11038633965f1ff424be284d3
+DIST texlive-module-latexpand-2012.tar.xz 2736 SHA256 87bdfa48354cdecd8b764cd92578ba435fe4c7c6ee326cfebee2849e309d7273 SHA512 87848e0bbb6f127b648055c8b1887729f3af4172d88723077bbb03e5dd743cd2223aaff653f2630eebbed6b393d686b0fc642d8d995356b3abf3d7d1ce181d6f WHIRLPOOL ee2e8750e15c5ed6120324dddd10c0c52f6acb087a0aa7c38883a9d26c559753dcb6046015502520b81de3ebc6db8dce88b8660a6d38873533655264e4457058
+DIST texlive-module-latexpand-2013.tar.xz 2756 SHA256 dfff03f493521055ff2937ab0e62de51887d937283fe12dbddcc15e2126da242 SHA512 ce5f1837da74993d21c53ee83dc758baaa78d211ecf9d8a27690c15653df5e6492bc7398ad7d1711f8edb53c1672718b9d8604cc797c1994b1a3d80a92e48c12 WHIRLPOOL 9e8bba2a3cf965d3d95ceb68f6134c02dfd4c1bf985031214a5096d2f046ed4c822e80cc0498765396964c48ee25447c9fab15bb863665b1ee6954a479bd833d
+DIST texlive-module-latexpand-2014.tar.xz 3168 SHA256 c61c86be785f3b0098ff19004724e8ffc9a553e4a6b87e06202bdd81adacb0ee SHA512 15a9eb2457f11974f67d77ff765b0be7bd9e085f839f5d583b78453d7139e29c97df8f544593e6854b051a818535c1ffa4a59bfd2f3daf4b8b3d5db6b7d327fe WHIRLPOOL bc99bbf993b5a59f9718140045f9c8c9c7528ac0e0b7139d95dde1463fdad336ea478846896d4983cac2c1b27c5f200077bb938278bfe7a26dd0263ea5f0e4ae
+DIST texlive-module-latexpand-2015.tar.xz 4392 SHA256 8acaf62d4663b5f82afbcb6dbcdcf485fef06fc8ae6b37a611077e69cbba7abb SHA512 6a57b0f2efede77bce1a5ce6a9bb74166f34cf5496efab8f12a42e0c37610a159d4e51304cb33575b0f58f20e2d693643608dd3e43df8a077929eae06ab4b525 WHIRLPOOL e5ef83b865c8a058cdcf961fb3b7c2bb5043c4015a49fb97536b221c6b777b3e505d19eaeec147f9cd0985529ea20ea5f1bbd31311359855a132e0bc5e36cb1a
+DIST texlive-module-latexpand-2016.tar.xz 4664 SHA256 9b7df2e853e928ba2a8b503bfa78d3a17da264e6e557d404cc8af85ad028ca81 SHA512 6ee6d23920539c540a67516a7f7a07a454878e61424e9e40328e5562872e1a555ffd75a12482a09593b8ee906845ecfad8633a931ee2e05b9d4918a07aa67ff6 WHIRLPOOL 2e0c52bf92d4286f54a40a6be1d28d7a1bc9fa9df859c9778224f4fd9b34d92ab144a108d018a425958814c235fbe04b6a4ff9652eb661f416686e8e14b3629a
+DIST texlive-module-latexpand-2017.tar.xz 4664 SHA256 706b0fd76cf843991f5cf0227b9852f4c6c6026b87919dbc1afc80d603f07e16 SHA512 e74ed2886e781740d77c18303fd98eab17e431812f033b0e7734e4aec966ef3476605ffbdefb960f7be511ac5c2e4e01586f3ba3b3b1708e02b0656a02e4b6d1 WHIRLPOOL c148cb63ded34ffe7ae338a2b6e1129aeb4d4e116ee38df60d5fea8294eaacd49b4bde6134dd65e8368ff5d18c202fe46518eda50471cc5ad2ea398d4e3c3c7e
+DIST texlive-module-latexpand.doc-2012.tar.xz 1464 SHA256 fe82dd255b50b3685f84169e33e8c22b2f20b362097ff8fa00e8a2a489b46c2c SHA512 754fba616e3dfbfb6361208178c8f96f8432b3a6f131e091eec9d9cd1c9df09d3473e6d0f084d954b5b4896255c8cc52b590e9a0808212eece7aa4a6b1cd1522 WHIRLPOOL 2988f096311d2676030f114a427dd2a9a4d0fae5ba7efd19366872cd9a47e8cdd4c50e9f338d4d4f56d7abc441541bcf1a5ddeacb47f1f41f055b0aa6f2bca23
+DIST texlive-module-latexpand.doc-2013.tar.xz 2048 SHA256 aa8429a079ca48a41dcbc95e78b6c8abc22221ee3d80e9f81888bb3ed46ffa55 SHA512 e7c902c2a79488232467456568304df14a8f3045ccf8caf2695f17c3a090280858b2093fc62e0c7a4f563a280b72bab5327ef9687e77058241905fb579ff8ee0 WHIRLPOOL 3720e1e73993e8ae7f473d4cdb48e7dddeb0f84dc5a38609f49611117cc39ee564c1860c42023ecb95354c419957568a9f0a461ce112628d7de9623f56835200
+DIST texlive-module-latexpand.doc-2014.tar.xz 4772 SHA256 0e0a39210fb22fa417dadf1839a09a6e185983edd55fdc6345c333ec71e15f8f SHA512 103b153c698ad3955a19e49ffa6866739a509944a575b589321314bff7f3feb39f6641860894c00dd86dbbe132d7fb564fb7fa2e29f4da05e370bcd83fbd67df WHIRLPOOL 226f29cc64c83e11edc08554d029ec833c477c6d87a2130b5385c79858faec3905d5237b04d93c2752eabf10bd408d6ebd2b26aa852c27c5ddb0c9f960f07666
+DIST texlive-module-latexpand.doc-2015.tar.xz 2120 SHA256 f79ea223e7b85f6661aee5382c0744e07cb257876c03b39533369211408b3b08 SHA512 710df97ba7f1a9ebfa35145c64dd48c4a2d625d514dfa19fac880c11e3f7126ef682f7aaa4352d1f19d4e8db1654b46765d1293dbbff76db9c25407b64384bc5 WHIRLPOOL ae58300f128a86d0f9599f66bd49d4244860a342d264b346b6d41f2d28a9077b6e6872fb41a7f604c20caae5246fdc262781d68e89b353ccbf323f1a7b0efc46
+DIST texlive-module-latexpand.doc-2016.tar.xz 3000 SHA256 c5db21a0cadee19b676aca3fc48b3d2c4e7eb2e828a8c3cb9d19396b7401e93d SHA512 be05689f140ef29ab04c86c60f61dd178100c914fd57dd7da1425b94cf27f1d8bae6e34d2ca8e2060045335aab98607d1bd53d4cc6753a6675827a97ecf3d786 WHIRLPOOL 038ae252efb0e0b21f831fa5de004f8124f9ccd4bb77ca172108c18ede477a26a9ab03d20908e09e2385e9c32cedac0aef07745bd1768018d4138e8765875b7e
+DIST texlive-module-latexpand.doc-2017.tar.xz 3000 SHA256 a15f307f9533f6f75018b9bd7e2f209350111f06e5af269518ae9d54fae772bc SHA512 ab847d512042ea1079621f9492001ee09c278b130a7c61412d883fb3687bb85d52dc53c3133d54acd444c38d21d42d5ad1b95f918ccf38bd9575f9fb19bd6ede WHIRLPOOL a5503baa41a5462ac9356e973b3820ad00fcd1be7d68f04184a818709f5c84f43c0d25bf8a047571c26c4144296df2a28ceb09436738f1395681fc21d0bb58c0
+DIST texlive-module-listings-ext-2012.tar.xz 4836 SHA256 5d1f4d2cc4225b68804b31dc29722d9c2664329c71fa2723320bea3023959814 SHA512 57a7a11107c3fac7db7b3bc248bc028fadc7ebc6172ad778811139c5221f374e47a3fcfefac86c842a7a2f149623ee806158d316832d26cd1bdc2449f65a6c86 WHIRLPOOL 3fa4c95ac3d5f7bb973a2f3e180783787e73faaa2976429f66a54842ac5f648b969a9a180a2d817cc0c2d34fd4212a42bba12784f8c4184f3fb128581dcf567f
+DIST texlive-module-listings-ext-2013.tar.xz 4848 SHA256 047b365dee802548bc380c2993b8866733884a89346a8055c10d12c4445e61fa SHA512 35fdd77c6b627e40b93536150b15ab66f96d2c9a73b8beae1311ea6496b7bf06cdf9b76f2e47205f82e8afbb0843602fb3318dd431214a8af2bb863e2096f200 WHIRLPOOL 5f24d187ec84973cce1a21199626efb41e0622989005ae4d2b307de630ba8f417651e1d3001df65ff81a462515071bb6a4d2395936ecb673fa2a301f179d0d55
+DIST texlive-module-listings-ext-2014.tar.xz 4852 SHA256 c28332da2e0ceb3069f6ea1023eb268df349792fcf8af2b1633b1cd88a149597 SHA512 eb4962950ec2e2efe1b88b02b6458d8a05dec3cbc28b70f124384bc85a10dde34e6e1f988fdb390d8810461c961e6b73162b94ef54b90f8f460f78c382c9e59e WHIRLPOOL fef8e85c12e3e18937a0ea8d99e774ef071697b46ea0f84f8e5cfba9bfe99497b28ae0c0652881b04d16fe5baee5d4b5c9ae899af9f8cb23ccd19bf88d18c48b
+DIST texlive-module-listings-ext-2015.tar.xz 4852 SHA256 070d4c104784aa66f5fedf1992f21614920a361145996ce67fc440906640f81c SHA512 cc5454b01fd1fb660ee8ddf240e891faf93e591f7746cf8fe86a84a136446531817c1f752a69d8c6473dd75dc3e85149d3d4cb7cfaafd86a59f82ea98d80f88d WHIRLPOOL e0c30cf2fed472fb01614b1a280f4b448433c4c3b74e1d611011db58eabfbd1524fa10a4d9236d777d441f8d35af465ce444bccc061a2d3d56a6bb6dba648bc1
+DIST texlive-module-listings-ext-2016.tar.xz 4860 SHA256 dc3d4bc5802179ea8c9130ea68b2f7aad644d4fc584a1dfd47dd875a16dfcf9d SHA512 bf41e0d10a17cc6e555ea793dddd532e8815c17d67c7522220fd755690487cc452d39326e139fe0462210151a18cb90860026ba69d2f23e24af57de4ce9317b6 WHIRLPOOL afa7a10e5aa631283784654b76c2ef7254fe08f7d6735a606d34a7a345e9f2628206a04c7963b807ca512417d842737a6e618ccf5ea5f0005b1469125888da22
+DIST texlive-module-listings-ext-2017.tar.xz 4852 SHA256 a715f7dc3ea81b63367bc0c008e8551af271faf1e9eee3ca950eac42b27468ee SHA512 a40ef2786fe5624c233f846995903ebe19fe6fb9525899f23e73818eb8f87dcb296d6bf0c23366741f6a8eb8655c21ae7337a4b80d90949961b007ccdc67f461 WHIRLPOOL bcca389d3fe85ec847130ff8145ecf6edcd66d12be330cc639b422b6c24c5c042e43895193c894a593f4e0d645af69d6bfaca2dba7cd7eeb1d13a5b8321732b1
+DIST texlive-module-listings-ext.doc-2012.tar.xz 103700 SHA256 84c08b130604716ef30673c106bae49977d67562a63d094dc342141df1c6ff62 SHA512 2418493a7109dd502f740524afe77e1abb8835ddd1b69b669c8eba1dad784920bbd0965ef09769d4bdd6ca629c9dabadb92a88e4ed99fee3f900194440878d91 WHIRLPOOL 775ecd425f18181b08897a3bcba18eb9eb4fc8d0aff814d5a98e6d0e0b5997f65afb79123269b651c0cd87ed4f0bff6de4708bf20c96f9d34c1f688060079739
+DIST texlive-module-listings-ext.doc-2013.tar.xz 103700 SHA256 12318a4b2760687b0ddb9e604d708aa10ec0ba4519a0b998939c3846e684af05 SHA512 4432a3212c17458df2aecc517f8393c20436a2a584aab5c192a68a295c5d1a087e00bd152790258941c677935752923f2dc9fa43cc74dd03d7d19f2c4ed8616a WHIRLPOOL 9ea91d2e35d17855ebf7d4d595db0dd18544b97bf6da7a387795daa87f64fd18cac6b6e49a2eda8a9d8cf2034bd53edd8391dc80e9bdd2b6344fa69efee0e186
+DIST texlive-module-listings-ext.doc-2014.tar.xz 103704 SHA256 1c838c757efe52732223415f8c6797a78e440dfefeded154df9c1edcc1bbbcd9 SHA512 8109c2238f033bd2d26dc16f0ecda340e4bb382aec1e1f11862853c0950767a54f372d43c5a335c4690746526cad6473a6596681e78b655b64fcfc9f9b20ded9 WHIRLPOOL cb55913e62b75816a13a55aa6373fbe5da7686393d1de52e8684ecf830df1ea1ddcd14d07923841f2f12883e24c75c5164e5ac20a406de323db1972bb6912746
+DIST texlive-module-listings-ext.doc-2015.tar.xz 103704 SHA256 84e603a1e62a06513d94853971f35341fd23de4ad64a58ae49117487feedd3bb SHA512 bfb004dddc09564a63f603aff661826eb4237ef110a3d874ea9a3ecbd0f7ff8f91f416634b7eb1dfb2cccef1fb5ee02bf8353bb9376cd7692eab4691633de8a5 WHIRLPOOL abacc0159f2cef425132f6a04b02c15c1e0dc536d19175318e6db275025b443e0a79fbebe045030464d5baef1cf3facc9f873a38c52bd752c0a3d12c8edda4a1
+DIST texlive-module-listings-ext.doc-2016.tar.xz 103704 SHA256 9c4f3d7ed06a49f385d2e3ec3ca2acf994d1957f19e30ac2a786941f3fb0e90a SHA512 a7f07219739d4d27c5be405968eef6dbc7f86b10928d65f9267d117008daf25678ab013134894a69688315800c8046fb28c5357285f2c32c5ea3be4553b1b14c WHIRLPOOL eeb8432bdb5d9808a1c55c6a50ee9a32644883b9e5bbe32d68a853da9e6a6a1acfee5a5c0eb5d6375f1f086222c91887953bc850e61f4ca063cce3a2e2cd2a42
+DIST texlive-module-listings-ext.doc-2017.tar.xz 103660 SHA256 e2c1fc83522994ed9bcdb6125604a605e0bf587cd6afa7666bb9eb5a68a5978c SHA512 edd67257cb74020f36a11a95e6f53dca80b376d73ccf75a87d689ec606019ba35f5b836f012c1817764da8c3b2947ef47ae707f22c47c4096dd31c4bfa58a327 WHIRLPOOL d9505ad91ffbb08e5165cc4e2d5d9ec5c9e769dbff4e4cdb2e6cb8b3db30062a8388c8ce82887f5455a9491a88d02d948ed42011b3f8641bf10ccaf7ef025669
+DIST texlive-module-listings-ext.source-2012.tar.xz 22648 SHA256 d4241ac0478d7e0d5a4ec1d83597cb2516775daa8562ea9786e70e3bbec6bcad SHA512 bbfa7e1b5b78ebb3a7fc473eec2cad3f65f1a0506cf9c52fc1d2b57d173a42b412f63eac6f09ce57ea1d674ae28bc59c0d1ffaa6d7f5315f384286a5dea67161 WHIRLPOOL 8fdf6040edb2b3b2feb692d7405c32d3321ba56c459e4c617fa82ca44ad626f48413ba8172a74998deb92dfd3845dcb74eacc64ecfd131d3df530b4e34c7d1d4
+DIST texlive-module-listings-ext.source-2013.tar.xz 22652 SHA256 d31dbb755c54f80209082391c145f5345c976ffb6b6b870ba17f1f20b0c924df SHA512 2033bb7a5f9a53962aea576a4e12526150402535009e10dee31c32bad1c5e170294d460e0f0163fb6a3888d9a268e0c3ae6418959b4665e4c3295232e11d7913 WHIRLPOOL 943d0ed801922248cc53554a82974f254764543df2681ae01e26eb67c06f67b59ea28d99fe45b4cb61ef79c1d02d8c9d24c5cda34c6a53d591a8a60e01da8974
+DIST texlive-module-listings-ext.source-2014.tar.xz 22656 SHA256 2be02bda70ba4bd7a2932ad6a81cb99daf2f4384cd2bd098fe6f8a3e57abd351 SHA512 37335770be09b6e6db1a2bb20ffa48fd0b0d379ff683524b2c1984daa5a3b5df57290734c6f77fe906ea79aa106eeee0f0777981e7c9dd0b41dbad2375b31cbc WHIRLPOOL 0830d306d3b1b8a505724ca19691c49f5051ec3f9c1798d1a0ca2c391ec04ad69ef6c47ed243b726e791057c45b4efbd8270b233f44c9371b198b4e7b326a69e
+DIST texlive-module-listings-ext.source-2015.tar.xz 22656 SHA256 0797f73671e58c488eb38c53985e09e775ce8c9426d446bd73ee07bda9f04976 SHA512 7525637b396c4c0221db68038a5c5e64fa021d2e697312301818126de2a7547379a24e9d215b2cb30287ef83619b59889b1d20b678d28d61ae9577d3c09f367f WHIRLPOOL f088bb01bdbeaad69a9178e90a54ac009cff8e4fec89dddf840732f5870ab21f7fcd0295425163bff71b45d9f6315598b4e3789eb780567385913a2c18beb1b0
+DIST texlive-module-listings-ext.source-2016.tar.xz 22652 SHA256 6591ca78597f170a6b7dfd04d1e821a59a4cad355b99f904f4900d1178289a2c SHA512 c6fd772d878aea20c002bd10aa7f99c89f912d447fabe3742845f90c8a9b5708a3b933177b3cefa8deff4e287f0ffa3b78e516fc5b43b3ef1f84b4bbeee45dbb WHIRLPOOL ee95c4ea5df25ddbd392f8d7ce3544aaa24253d4d98808c52134bdba9bb2bc6a6f6cf0ffa11fcfe59b560ab433440d500c3cef26912ba70beb01d5bdd1b18ba1
+DIST texlive-module-listings-ext.source-2017.tar.xz 22640 SHA256 2e217af246fa1490ed7cb024cc51cc022c290ed87af17087976a8d35e09f6eb6 SHA512 4bde1dbcd6c5dcd258682314cbde29ce93c4c765158798b27fa17a23fe77c3e4ef73f86578716da6233039f864bb44a1450206bfa7c12b7500d650c16930784a WHIRLPOOL 3d6f3f7fea54797ce476881d6d02c7127dcf1a61a4e6bda2656e377594e1723d455d6c0c6177adefb2911e23ccac8770af75eb2f31d05e92591cd5d1e2a3dcf2
+DIST texlive-module-ltxfileinfo-2013.tar.xz 5012 SHA256 38c9b7e8b4f251d7e81b3a8c67823cab0157ef4a1476e067afc0e1238c85f357 SHA512 11378af64e1d3d8b7ccb3e1bc82f75edba5436f83dd24c8be800029f04b7154852a9d0dd283fdb7136a1c523e6f86fb73e37b4c94a78ddae9c3b4b6f727daa5d WHIRLPOOL 4c50741705e5951d89b6c2d9fb859d2fc386b7471840dd902b8940b4e5ec323c50a61e29f84e7b0ba72e5038d2ef3dd3d4cd13a2eb0217fa8de59c30206c56d0
+DIST texlive-module-ltxfileinfo-2014.tar.xz 5296 SHA256 29b4e0377d23daca637fc0c20fe3a12ca4ca28b5f0289311a29af2722f4dc821 SHA512 d487163d23e2d6f51c6f06b1167b07616aaf3f50ab0567f6cdf5400dd3fdce8f7c3a3eca76a891c4d584698d63401d1bf4e224733cd7f31dbb9cd1a4f55439e8 WHIRLPOOL 7e136af76b2c40b2df1f4dccdd0fe593baac571ff7ff6ccd83f26047255f8c5353636fc061f0f08c44aa43131187842ab9ef234a717e02d35e0a9e9bc73d21c0
+DIST texlive-module-ltxfileinfo-2015.tar.xz 5308 SHA256 b04b070287cb51ef52b0325712ce90b9fdb77c5e020af648de53c457cb04dca4 SHA512 0c2219904e92d9f1b430056df2ed0ed1397d6ca87130cf5192fb5219e60a5585e8838c61e5e35ede537fc19337b2f110b98396e159cf53c6b092c76a1437671c WHIRLPOOL b968ce6aaa785459c744944196ee2caaeaf5ad31d542619606b5b7fefcb66ebfc7b3f432c7464d2827e7e7486bf1e26d395216661fcccd8a0d9875fe85f10427
+DIST texlive-module-ltxfileinfo-2016.tar.xz 5172 SHA256 1f28d4b23091f20dd243294b82cb7debe83e16722fbf23881bdf44323617ab37 SHA512 f441ef14def62f9ff9a6dd80574f0a526748810b17a5993f2880f464eeb30997578406112179103fd614afe91d2f6bf8ca19448e83ef455d630623980eee67f5 WHIRLPOOL 77092ce656c9315ff66da44285bb058e9e7ababafffb21fe55c633a9e493b6f952fdb96a76f965706dd89657ba4451f61eb4b70dd84b23b096a3a1d46c4c505b
+DIST texlive-module-ltxfileinfo-2017.tar.xz 5172 SHA256 1f28d4b23091f20dd243294b82cb7debe83e16722fbf23881bdf44323617ab37 SHA512 f441ef14def62f9ff9a6dd80574f0a526748810b17a5993f2880f464eeb30997578406112179103fd614afe91d2f6bf8ca19448e83ef455d630623980eee67f5 WHIRLPOOL 77092ce656c9315ff66da44285bb058e9e7ababafffb21fe55c633a9e493b6f952fdb96a76f965706dd89657ba4451f61eb4b70dd84b23b096a3a1d46c4c505b
+DIST texlive-module-ltxfileinfo.doc-2013.tar.xz 50952 SHA256 3a0c935fa3118083ed490c23c52f0dfa62eaa983a5eb84d056527da11099b494 SHA512 ea91fb9c5c1faa0be83c013939797f489468c0fd8db4b64693d4c3f43f288a7456c909e904c5d53213c85fce2e821353dca834ebee02ac9b72ef1445bfdd4915 WHIRLPOOL 9e30def38383429c1ad46fb12e012b8b31c3b05f92c1d19b3e49df058827d254629d99910755c6f5a26ef72f5f30f2323bbd1dbbb3444f961da700309f2dd8e6
+DIST texlive-module-ltxfileinfo.doc-2014.tar.xz 38528 SHA256 c248c39b576ac2b5ddbdc8f78e829ebe84920eddbfa32ea606129cef9cb9a194 SHA512 130b7ce6e4b69dbd4e04db3ab9b73184c48d6a4d881b4ef4ec5c461e00624187db661553bcea83857139c62ad99afbd225e1d34d4679a4fe13148703889b30da WHIRLPOOL 277e02b50f6e8e15252f44260c60108b4185674da5bf634eb076c9a41296a5db2444b50aabba3af3cad75e7351abc208ad18caa625ca35c404d4823ecc8c22e4
+DIST texlive-module-ltxfileinfo.doc-2015.tar.xz 38096 SHA256 9aeda452b3906490d13bc4a3784f506165bbcc6461f7d08411a3ead6c84601f1 SHA512 0c0492d5f51868ace19e1d30dbf8e32590eb683ad1a5a06ecb491479699462ad9d8156561e58fdd0906a4d37272d15277934cf4b57c8b54fad8d817c6d5691a5 WHIRLPOOL e250b636cf5ccbd533435cedd8388f264cc6c2cab9465ca401ef9c22cdc91d7216a75444dd36bd81c3d38dc860bb4d1a750f4a7d3d5b98361ccd026577e2398e
+DIST texlive-module-ltxfileinfo.doc-2016.tar.xz 37612 SHA256 c69069bcc36a55680f824d9f073c30120a3348140bc4d26b788c9d416420cb25 SHA512 13fb8954668cbb7f3e08719c4512aaaf3d9f9798d387ca8eb42d8601a38b37243d2085a6c22814233011fafd6d7f4d0d38c06ed5e8584e37f2e863cc3fb9ab4c WHIRLPOOL a6036597b1599fd9fc5df5cb0dad67833647c6f04d68f19efb47314af5cde61fa8f79b7b1741c015c1e19b6e8cda41190953a91529b27a53346adca29ea92666
+DIST texlive-module-ltxfileinfo.doc-2017.tar.xz 37604 SHA256 308e84852cd97c22e07a4781cecd8666872bfbe5042b2ae1831c4da08a0ef842 SHA512 44e7b6664fd865a78ef23379cfd39c720ddf9040d3ffe63c4ea922e2825a14f49926782e1e3ae4cba347c26b8bbbd15e630d94dfc36c68dbe813fcaaeb11da88 WHIRLPOOL e0295cb4a8f330af4c077472a15f23b08627c270eca6343ba4b72216d93fbdf635821048246f0d0d0fb3605f4bfef9309f5fb3fd9d4780ff591c35c295e1b081
+DIST texlive-module-ltximg-2014.tar.xz 5492 SHA256 971185742f08600766f86094366fb1967f7519619b303f9a629a52c0b2a6ce0e SHA512 e348c6df70f6fbd9cf618f080537c4ed74552ba146f86ebf4fa5bbd742ddb9530f86fe1e12c2e21082e8dc923701114b9e6417211d13179395c4130170163309 WHIRLPOOL 092fef6e4a77923f7f7d1a8221e66b7267981cc1ebed4798eec87a9ea827b23bd4bfd465ebdaae3ccd47a0e7f46b788d910c2d221b8283863829e2f154aa671e
+DIST texlive-module-ltximg-2015.tar.xz 10332 SHA256 f5ed24eeab886ef24d6f44647c449b0f78481a7fcba320f34a06ff6a5e1d2800 SHA512 1be2aca26a4dfbb5dc0ca9ebc006b3d85d761cc0822a43fe65b344caff201bb31ebe481fda6df55892881cdc2a4b9ebc6e7a577867535239dfec03ee1ed8ab27 WHIRLPOOL 5f1be2e17d0b17f462a790f913e77efd708f16ab3b71db157e87b2cdf56f25492d1b26d98ec6846857318119acc3a30f7b2e537caf8b72d70c8e8e93bf0fc543
+DIST texlive-module-ltximg-2016.tar.xz 10352 SHA256 fef3209af62a96c909d9a43fed55d77a76d235a8fb194a2cf2b1edc1e9d41ee7 SHA512 ddae4ed4afc9c4e18b0cb7a49cf7a0f3aadcbe75bff0c0962b40aab505ebd5c2a8b60f523d9cfaa9235beeb75601126b5621b3a84437ce21c3fd4d651ead2783 WHIRLPOOL 2b07faebca339063e926748b5136c3bce01e4abbce7d5e8a8cd82a53c17fb76215df68b19ca6559902c3abaf406fb8bc973055798ec37f0655e3f958a9092308
+DIST texlive-module-ltximg-2017.tar.xz 10352 SHA256 fef3209af62a96c909d9a43fed55d77a76d235a8fb194a2cf2b1edc1e9d41ee7 SHA512 ddae4ed4afc9c4e18b0cb7a49cf7a0f3aadcbe75bff0c0962b40aab505ebd5c2a8b60f523d9cfaa9235beeb75601126b5621b3a84437ce21c3fd4d651ead2783 WHIRLPOOL 2b07faebca339063e926748b5136c3bce01e4abbce7d5e8a8cd82a53c17fb76215df68b19ca6559902c3abaf406fb8bc973055798ec37f0655e3f958a9092308
+DIST texlive-module-ltximg.doc-2014.tar.xz 48800 SHA256 5a8a4683ccf4e6562579d128bcb64a0cbedb43e2ad02d791aaadf3e0a375c966 SHA512 14819636587c89823fff196fd5c34919155f3aa8c495385d8f25e374edbb83f281632f5b84b662326ded80d06f99090f8ff226de6b5bcde49f2e4f1a0672b59c WHIRLPOOL 852c6b25a627559fb1dc033439fedfde2dc164d1ee99f232a3272e17764d980a117adfecf8b0be05a07fa8dd4bdb4eb8e16c5a113b179a0639dc7553c69fa51e
+DIST texlive-module-ltximg.doc-2015.tar.xz 350872 SHA256 5b5ab952796103ae57a64d8ce5368573f72e5aedde3f655cfc28d3aaa3cab83e SHA512 18ac14dbb519192f658a8c004c361742b68534161c0814d911f2ce5a023446ff5f4262884ccdd0e3a91c2dd964c5f395aaf196e1f908f60a45e380f0251ca41a WHIRLPOOL 88b25cdc779e5f36ca744cd7c1f32903486e241a514b65f7011971cc29d87213208168de97081a47d93131ad98c5a768f40323e32dd7be77e9b00180a8de3066
+DIST texlive-module-ltximg.doc-2016.tar.xz 350876 SHA256 bfbd97e15b43a12a32b3fcc6cbc0c6c202200e5535170455b7b081cb112067ba SHA512 6c6a563586c706bfb547e69b26821a09a4818a9e4d4f611bdbba2f60f6fb7bd2687b7eb62e0f121e920d4653954453b2e2f27c5f1ea03c0658d53dd4418eeb55 WHIRLPOOL 23e031c5b728b53f8fe3d41506dee74f2e88eba335ff96ea670f0aeb1eec7b0689817ae413a75b275e965cf694ac27a9ed6cb8377dbe0b5d30ca00e8e70ada33
+DIST texlive-module-ltximg.doc-2017.tar.xz 350876 SHA256 f2039612b3cd2d3071f16c84d2f666cb2b21741ec9242f15a432c1379bb52e53 SHA512 a761b23a9873912e677f042378b7598750480d527c7fd58b5c36be638265138033e4a6aec411e879a9ada801aed85694898b4da9459c52040e9d33408ae485a8 WHIRLPOOL 6398630a91eccc014d5663cfac7603d77fa9065745d702ba59dbcf8df53c9119b19c7214c0d6d1d174c7a4f8a3530b443e7817dee8b57eaf86a99e9bf1f05f26
+DIST texlive-module-make4ht-2016.tar.xz 10880 SHA256 5b7f2a431d71cd100f51bf1b71ff4f199b4cc582e55e44983fffdb9eb10ab9cb SHA512 3e9da602606c3766ccde30014a406a4898a9a416cb7a73643553ab4f793826a418339fff8e4fe8e62297c4c02cf325137922f1c5f7f97799c25d4f4785eec3a4 WHIRLPOOL 1dbfdd89d7c6a7f6a3814c0ddafdfbdc4bb0e0ad1f4099da6fa967537f67a8a6c4fd7c3317a3f64c8c18cee535b0229eadb2affeceeef0b9d0973f630c67e9cd
+DIST texlive-module-make4ht-2017.tar.xz 15268 SHA256 4f5af4099718a966273347e4aadba48d6b7b9f45194148403bfc90c09559242d SHA512 06d90bcc80409a9f18024bf730f956d126bb5745f43e30cf159ca8a94487fb0dbc347b1b30b2d954e8e3d79160ee0c13c94f4ffbfefae332bf39f94823da599f WHIRLPOOL 088869678b50e8c80e3126885ab9d0440fd390a51b9b9fb4d3df33d107b494764e75ae2f6608846ca19b73401b857577febecec3be521e3ee2dd14aa5b4e7b73
+DIST texlive-module-make4ht.doc-2016.tar.xz 67372 SHA256 2657e64e933083469860229392a30840ca7be10d08b6db080cfcd68d5514dc02 SHA512 836d44b74469dfde682ab6e3475f555faa93301f6f1928a41b24c592895f6770a25e4128f6ddb89edc91fef693cd875aac41993903d8f5f2a5e0f8e2427eab55 WHIRLPOOL 68b187fef9f33c54bb32eece22194ac0fb0ea333af655dfb18865edc53b917f80aaf8892aa1e8ff7bbd0a802e349154d95eb27be21c6a37d3633d036336183d2
+DIST texlive-module-make4ht.doc-2017.tar.xz 72112 SHA256 21c571603811530940093d2e8bce3c85fce8e4938d7b46a4ade8c684e7d223a1 SHA512 05dceee32a5488df1bc889e2ebd006cc2c901e8445a7f7e3ddde51afa24dab59fabca9b2df963febb7018b4e840f0107f7aded5653ac9046b7625d3a5852fbe9 WHIRLPOOL 2b32f9f4f3d2315dfef050b8fb64fd5a15362257230b9cb917ad831caf0706c85e1514c12b0df050ea3148757e862aa768916fd6f83d885e59c33885db7c6b34
+DIST texlive-module-match_parens-2012.tar.xz 2024 SHA256 2769656ae953929145514d7de503b06a78afb73b6cf5ecb19b71318e83598887 SHA512 639acc4053168cd5a6bbc651e5169af3be16bc3e4912ea0e339391b43afeef070886efd8d9e4195738da0a524aa39dc73407055df5b02f11c64278dc909e195d WHIRLPOOL a061f1b21371bcfd81a7c5e6897aee9e0af1d0eef959e50f29183724ce412f816e88c6358a1294bd1f587c8a375ef56f6b88a01e87b40f7486771194e8f88ea0
+DIST texlive-module-match_parens-2013.tar.xz 2024 SHA256 2769656ae953929145514d7de503b06a78afb73b6cf5ecb19b71318e83598887 SHA512 639acc4053168cd5a6bbc651e5169af3be16bc3e4912ea0e339391b43afeef070886efd8d9e4195738da0a524aa39dc73407055df5b02f11c64278dc909e195d WHIRLPOOL a061f1b21371bcfd81a7c5e6897aee9e0af1d0eef959e50f29183724ce412f816e88c6358a1294bd1f587c8a375ef56f6b88a01e87b40f7486771194e8f88ea0
+DIST texlive-module-match_parens-2014.tar.xz 2132 SHA256 8665e7dac990ce668bd1cf613fe3edc2069cc86a44219242b979b987114fa8f4 SHA512 b6c19e6774b9d78c94dc726122d2869e95098f7212a06b70ffd49ea6d6f7cf9269ba117a01bea1d5fda901fe2a2ad5c395372c19cae5deb7e191a816e3d2a3d7 WHIRLPOOL 2bc80e32049463dea5c41d955c31179f963a72d2d3f0e9a160638a92fc398eba071ff22b1c07ecf4c63a871eb09bff9d1651caa5f3ed78b778e2bcca2a1f77ef
+DIST texlive-module-match_parens-2015.tar.xz 3308 SHA256 dac3d27ccf7f7ec2dca4f5d8aa8a8b800df5e637e3e2cbb20d1f37be74828fbf SHA512 48b329a89106a9d78299fd049c17d27733ccfc48646b438890137b2015b0458bb7f06d619eacdbd1eb18215e342f01bdb028a449ef40a2df23edd6423077c363 WHIRLPOOL e2a06d38de3f24d05f0949f91832c9898442b6b8a50d8d86f4da626a2898a5360f0efc7e6cd7c4ad410e6ec73e59570f71d3f2c9583a6cdcfe2663bcb755b39d
+DIST texlive-module-match_parens-2016.tar.xz 3328 SHA256 3a84a15adff5bf853a60e4be6589389da398c2006774879a292c1e7d09092e70 SHA512 a604521dd72736f3f5ac703734218e534f4690d59fedfda06576f6ae402306e94a810da9ef8c7739dcbb7537df04f7d09bf5d08b2b58e0df90710a3394eab03e WHIRLPOOL 9662f6e6fd4b0f69afc9ad8a28a319fee870a8ca7a28b290469783f93c9edfe3e6d00a270e299a3b228b8bf6677b088cafe285e12966a67bb25e8e9216311132
+DIST texlive-module-match_parens-2017.tar.xz 3328 SHA256 3a84a15adff5bf853a60e4be6589389da398c2006774879a292c1e7d09092e70 SHA512 a604521dd72736f3f5ac703734218e534f4690d59fedfda06576f6ae402306e94a810da9ef8c7739dcbb7537df04f7d09bf5d08b2b58e0df90710a3394eab03e WHIRLPOOL 9662f6e6fd4b0f69afc9ad8a28a319fee870a8ca7a28b290469783f93c9edfe3e6d00a270e299a3b228b8bf6677b088cafe285e12966a67bb25e8e9216311132
+DIST texlive-module-match_parens.doc-2012.tar.xz 55432 SHA256 42446879b938bf585e2c382889798db71d84a022fd32a56b5f1af237f1daa23a SHA512 6fa9c568bc1e2cc5cb80667604a80e0902083e2d0c6b090c3f5656ff1eabe51f643ad19314af2f47f1a929d4eca084e1f22ac18e3630183f00dc0ef3f697fedc WHIRLPOOL 92a193dd78f07e7982a30a77fa9029fd9baa3a1e85bde3c6a1beaa9726ac6d039cb9eb2dbdf29fddeeeb4f95a81ae3e747699b334879d9982f50d0514710be66
+DIST texlive-module-match_parens.doc-2013.tar.xz 55432 SHA256 42446879b938bf585e2c382889798db71d84a022fd32a56b5f1af237f1daa23a SHA512 6fa9c568bc1e2cc5cb80667604a80e0902083e2d0c6b090c3f5656ff1eabe51f643ad19314af2f47f1a929d4eca084e1f22ac18e3630183f00dc0ef3f697fedc WHIRLPOOL 92a193dd78f07e7982a30a77fa9029fd9baa3a1e85bde3c6a1beaa9726ac6d039cb9eb2dbdf29fddeeeb4f95a81ae3e747699b334879d9982f50d0514710be66
+DIST texlive-module-match_parens.doc-2014.tar.xz 35160 SHA256 722fdc487a8073363859132f92401a5c4605499530f76a828237bf74d1576da0 SHA512 3a1c545dda2b55917ac177fff6725e4f717eff6a66a65b1639992c83c021b3ecfb083bc340e229887d089a87b982c646d1fdd612690f9b623de36480ea1f2b7e WHIRLPOOL 80088983b311f2282fc2cf920e0502d10a6f54499568ad086faa5ebbea14ea90074a6d799da16b8a5544170bac4163468dc43716aae52ce53a807a014c398744
+DIST texlive-module-match_parens.doc-2015.tar.xz 57272 SHA256 0f7da82721614d6955b465b9433f08d32e2fdd4d61f71e35398682554e084e26 SHA512 abf0de8c54f2a218153662047ac873daf788b0b842152e3df318402e899425a7e03881e31a5f7142d88dd58b41bae608a634fd9dad92c5c95480bf0a63f052e9 WHIRLPOOL 4863e3c98261cb3df6f86299975fa03c724fba575e32a90141dfddf056c983aa3d8501c82f77744e2bc76847970cc129bcf1e600212c8dcd0e1f5267b9701a64
+DIST texlive-module-match_parens.doc-2016.tar.xz 57272 SHA256 4e19a8ac6ce327c9edd9c94d37c54c4ed761a24da8b3bd26c65d2d4516b8584a SHA512 6f33b5bf2440b9d65933b1d01461bfc63b96aea89c0f04b010e9cb15a52745042852d3818a7b41be7d6d6a39dbcce3056b06807140a5c89608252288edce4c8e WHIRLPOOL f0a63cd081ecd55a8f6485d64a4ddad0c901280ac560c38508a3ed992d237ac249e5ebd1edf2b68cf47432b8148ab397941750887739924e6994472550d460d8
+DIST texlive-module-match_parens.doc-2017.tar.xz 57280 SHA256 da99b1bba6cb2d581d1c31651245f7cc5b22c8b437fe8c2ee123fcadef37bf3b SHA512 d92fa529b9cd6cbdee2d8e6f178fa8395c08540d044d0522d1da2a68c78654666d0f7ec05960c9b9f8b2530b4c54bc695887da13a1ba383d6c3bfcc49ebd64b1 WHIRLPOOL 4d72e4f9ad23ae7fe72704fe315e05820de5f60dedc3f1a699fa140e71c904f8bb4a5397e8b54dbd7e8c32dbe79e27b8e716030856adf074b7aab2858cc10cdf
+DIST texlive-module-mflua-2016.tar.xz 1060 SHA256 71c672429304d6da72b3a037be7794648629c8d00ba6d1752c054f6223a1d505 SHA512 ca42bd7f4efcc05477bea946809fba14df8dcca7e57325cad15b11836d1cabbb1aa089e6c7f17b23fb96131f99f1da678194e97e67269296c0a2694863ea11dc WHIRLPOOL 27751f4bfdd5b16c3cdbc8b9f964f5ab19083c1dd1ed84fdfc5a20cf050a102e48688bc4b16bfd80a51e2e204ff4f6385b8f29913ea1472794b1f3b6884f9691
+DIST texlive-module-mflua-2017.tar.xz 27848 SHA256 d96f0ce16de40d92ffb281140cfddf4a7665fd5a6dac5f06d23500a6b22332f2 SHA512 83d84e3cb1291c2af4067df2fce91e14bc30d11843c5aae36aefce4e0e1fe5cf6896ecff8791c2888abb16d13933cdcaacec11421d534b71dc3b6cf8c1c02bd6 WHIRLPOOL b03de6df3f333e62feb78177820acd941b48a4e1d4f6b808ae5e2ec67e0063fae5c0c1f12d2c246ab17aeea4e0308bbb31f8a2a25e3dddcbe158ebe7506e2ca8
+DIST texlive-module-mkjobtexmf-2012.tar.xz 7436 SHA256 5f135bf892ea4e087cfab58fa7a89dd37a96ae8eb12c655c2aed6307df73b5b5 SHA512 dc799e6fd30e55264934f69ac450761255b9d330ff37700d004037e79bc0fa15669bdbf2c3e5bfbdb2530cfbb383bb3e503292edc4360fc95bdaf9f907d69e0b WHIRLPOOL 4d5a546085afc5f636de01e80799664719a312e63c05e310b8d319412ce00a4466898e560c55c5501d1e99d396a606cd5880dbe530ad4eea9a4700a8af6763a6
+DIST texlive-module-mkjobtexmf-2013.tar.xz 7436 SHA256 51f634f1699838e4a6e66164ea0b190a2bc3509ac6a6e9821bf07f07269a3146 SHA512 14eff723a69ef43b195dfdb5e44deebb603d09c8d1ee0429ba6be24544c30737ec668535ce305177db2df46696b2afc3ca11cd1b6376ef39f18f2a956b846a6f WHIRLPOOL 670ab18c3eaea0d4834ba94b50df21e8ccb9d22e1d7a4765bfba76a4a7cd4bd57f6f3e3b60cf5019018a4b8a167c53d661fe1d84ec7cb6125b7b6a7e6e89d647
+DIST texlive-module-mkjobtexmf-2014.tar.xz 7436 SHA256 66c8b872569138d925c2296a6b87c0c13f7cde38052461bba2904de7c113a9aa SHA512 5b43855bc73c1110be886229dcc6c0624cd5952e64fccfbfe9c7a0f985924ec3fae1fae70abd56dbee2a2c6a9090548ccf70093bee8a643e53338df4af9bf89d WHIRLPOOL fb500234bb1e377505f9181bfaf23717b737afcac88d1b97f369d4d7748fcb12d90ba17ae09956b2cbc91dbae532b7dc16498d6ccbecc05f8c92618845997e8c
+DIST texlive-module-mkjobtexmf-2015.tar.xz 7436 SHA256 d0bbcdb8dc4d1ad7242ea4447991c2130885d1ca306929f35fcd57f3b43f1f75 SHA512 2385b499c47f7db1c54a82f599397987d54f0e7e73ede74fdabbcc7e87c83f51ba59a607e1775ec082328dad5c2a894fdec623fc0ae7ccc12ed3dfabb13a698c WHIRLPOOL f402d2d6b75bb7e3919526b130db4a01ddfc47a501a2a7223f2eb41c85819b1d75d57cc24b735d72b35031d3e1a3fbf17501253aaa341c7f311a209d7dfbc81c
+DIST texlive-module-mkjobtexmf-2016.tar.xz 7444 SHA256 2a2bf6fddd16ed563be03132574b87faf4cfad1fa48baee073680dce38293da5 SHA512 956521aa85102211193116a04798aabbefe52457eee714d7f2a3bae843335c932af987a9c3e7364c6ebba561836d479b2bcba81ce6ef5c8010929a3f6ded090b WHIRLPOOL 3ac204dff5a02038c2f91151d5b1f2bba152373fa481ee57a2f256c7938953dd9531c508956a4271880ff25fbc9f0c91bc0c2e08063bd5350269ba5a24087606
+DIST texlive-module-mkjobtexmf-2017.tar.xz 7444 SHA256 c9cad4c13067c9b5a2f2f2b94df3a5f9ded057383bc428e06055bed660c171b8 SHA512 b87432ef1fcface11e93e541595fdf74de1539d9f2ce0dbbe3e35c73064230812628745aec782b8026cc60f9797aeaca9057c534ac852b22bf44d24d5cf1b960 WHIRLPOOL 44a207cafd002c4612297936ad48a02489a5aa02d649d830f23499f1aec10f5e8396bf6cc090108b0050e4a3c682c427597e78190fd596b4cb062718869d32ce
+DIST texlive-module-mkjobtexmf.doc-2012.tar.xz 80296 SHA256 c304acdeb07363584f35c788e43c8b5f8d1d9f16f57ea240383f5136bbd7e6dc SHA512 83b9706720d19e286b4fb608cd4a33023c325beb3899a4173eb7294dfc0229a25cbd16c25426640222389acde537e489c17554af40e343ccb75f744c429ec398 WHIRLPOOL 111a79e225cc1c133a3844ca682c6bb5edefa91f51dadb4347c834669e5ba6623ece2d6b1d4da81a7155635fa81851e2e4e3622edd933ffd65ec734879ed5f71
+DIST texlive-module-mkjobtexmf.doc-2013.tar.xz 80280 SHA256 943ddb8267420a7c59cd66ca39eb67fefb8d05976d3dce71cfc27b936bdf2840 SHA512 ebea740ab2667d165eb013e2deeae656062970cb4189c35122a2c4dc51d50e1125d4981e03e00fc44adaa7a9e811b1724a198aa8b6a1e8b8fd345c658be7adcc WHIRLPOOL 56c11dd36e7fdde5b05280178ddb829231e151b7e4606e5a0a4136cd3634a134a67f184a43e88bf68cb729d110f7368951ef0716de808ea6ada997bdf2665475
+DIST texlive-module-mkjobtexmf.doc-2014.tar.xz 80280 SHA256 87ac796d2131ba2b97164874373c49aacf42c3e7d98aee23b09135d6576534e3 SHA512 65bbb165239057f04086aaf31ae87ca2b631fef745142fa6f66146c1ad91d4804f78bb7314641071fcbfcfe48871b019dc1c92ad0f275dc21e5d110327d8c2a6 WHIRLPOOL 55bf830a47c7787f313349d43a5a04cdd9962ef0e31246ee2c652790e5d94e7c7026354cbbec22b2dc8d3da67b2fd84eabdfd2e714bf52cadcf0b4de2d6b8f7f
+DIST texlive-module-mkjobtexmf.doc-2015.tar.xz 80280 SHA256 8eb3e9037ae53314dbd57575b7fe700616c9673189d0df03fde7e9695d033f18 SHA512 aab98aa351456677ec3aa27f236aba76b546ce930d07fef7ba90487057980ff3e32668bdaf537e35404d5953ac8f4c1b57f3eedc133138fd330971db2919db71 WHIRLPOOL 9713ac58905059e38df4e64c1c62faa7e6f4bbd8993103576c05f965edb59d03bbb49aaf338b2eab2676fde81440085e9df8708fc04d32f51a84017e8a1ff32b
+DIST texlive-module-mkjobtexmf.doc-2016.tar.xz 80280 SHA256 09112eece96283a32867eb35f4111c54b039ff7e1c0734e2ecd78a8e810623c3 SHA512 695508d18d0ce39fe014dbca4444aeb821dbda6752c4e41f760d8cd1f2dacd7bbac8df50ea2f62f5b7808cbece17e68cc194c40766fff79456b6104dfff6d4bb WHIRLPOOL c7ed8dcc2a55942bdfe1916d20df85a4e6c5bc6c97dd74c315147a23d98abc38cff444050710cb3bc57691f2760a5cf1fd3a5357fd0da546b71eef7d10fe2ed9
+DIST texlive-module-mkjobtexmf.doc-2017.tar.xz 80276 SHA256 ff595af4183bfea59834ca2593495b58dd3e45a0ba0e3843a815a6b39c85b361 SHA512 4df1df676df7f1a1c1bf0d1c0a51df8e4839558b79fd410446b522ce218f499960420af351c195c61fb66f9eeaea869762f3ca8091f76c662aeec333fcfd0f80 WHIRLPOOL 0df98f8d7ca089cd41ad322b10b562232e6c654a32df9f7ae94452f4e0ffc2e5bb64639718e8838a72aceccd0856030e1d378f26c285e38482876822f73bda08
+DIST texlive-module-mkjobtexmf.source-2012.tar.xz 19828 SHA256 a538d190a1dc754a1eb3ece98db92e22149ba16c9a2535f18d0202258b98ead6 SHA512 dccb2812216dafd0b750a30b0e3ffda318bc58646301918a593fef3c9bc01ace93fa96e6529dfdd11c79efce4d654b36c4de20affcdc38b8a58629ce67c731b7 WHIRLPOOL 6072dec2df1c582b2a00061c72bc2bcce72220487f49b1b1a854c0f8b08a3e354c4e105a2ebc03da7fb2fc001df0b70767bd52d56e9c25c74db1049e554594d0
+DIST texlive-module-mkjobtexmf.source-2013.tar.xz 19828 SHA256 ab1e86fb406e9b9df29994382f53deca0b5d1a678b43a9cbaca4171ba756ff10 SHA512 7e446d4aad3f060975e443e05398189dbb03514d8f6cb0658ef0abc3c64b4d48cbc0846e2ca478d064f3f3e97842057303ba354a6307a89e3be8a9a6f948fd60 WHIRLPOOL 3667b6b0e10708bb397daf4943400bda21bb723fe51a82253edd6725f6581dcc3eb29139478e78a08290c568c11d96a4854505ec328666bc546aa47151b44d6c
+DIST texlive-module-mkjobtexmf.source-2014.tar.xz 19832 SHA256 6b8ca3370c31f06bd76590437473e7ce50ebcd1ca36d99debe69c932be301d8d SHA512 496465c89b6e91fe7903d77918539663524e639b88ad96f0144688e8dc4ef1de8c401ee4470ae55fb5fb30b04e4e32f91bd611335a035072928fb91730c0c276 WHIRLPOOL d69cdf1da09a2d23231cd7af99ce18e9f58c09b1ee1abaa8106eea4d4fb7c9f679d897b51fb765ddbbee4d902f8fd8bb36c933eb7ec8d97947df9a36b0326002
+DIST texlive-module-mkjobtexmf.source-2015.tar.xz 19828 SHA256 240284a0c22ff9c159c239d5ed0247e6864ce764485ccdad774524c6b3ded2af SHA512 7b5ecf383de7b55cfaa1dc67b0be8050d003b3ea200cc71d1a52c57d50e53e31cb4fae952739ad1885ec05a6e7324bce438c3a40ed1e6b08dd681f2474a458c0 WHIRLPOOL 117908e96b7640869dec7c1687948389000b110e04372347211c533ea527509580e6cd13a6f0dcb14938afc2c4b841c28aaa6db59e3103050c74ff19906662b5
+DIST texlive-module-mkjobtexmf.source-2016.tar.xz 19828 SHA256 d50a3a10d4e02f0f3963d775b40d9593514c26c1c5ed5e8b59e6687eacf98d34 SHA512 ea1ae4540023f21a35fd82207752ededbdfb07883894baccf2f6def17c51c7aa821b5f3b5411384e986717ee797b9589cf0ade8dbed6c57653ebd6e5028e0506 WHIRLPOOL 137a42f1aeebc494d4e17cbf8793cf6f492ffc137e168daa5c281246039ddf8034615973493308a7656abc2656b45b0d56d23162f4d2a43ba2d3543701407914
+DIST texlive-module-mkjobtexmf.source-2017.tar.xz 19820 SHA256 82acd323b80bda9f253567c986a6f6ca301ddbc5f9a2ec96b811e214bc529bbf SHA512 2ff63f05ec1d4b09842a20b93a1ecab09245dfdb3cfbd3e37f1e1cd9d25760c161948433c10ef05373d84cc44b56714f86073afb48053a8f965c64490da0b3ed WHIRLPOOL 57f50f81d61af0290c1d59f05653c62aee0de1e6cef9056b57ec415247d1bcc06472ae77a655f5e18e877a46d574df5ee6c38d62d2b02b54c4b1c79b7c38cefe
+DIST texlive-module-patgen-2012.tar.xz 520 SHA256 6ee316500de675ba31f12037536756ea60a957e6c96d6397714843403aad0c94 SHA512 d5821734f4e5d948416faa60224ef918d402868f98724d11c31b4ab0688f2a168c76678ab6c9c4c8f23e94379d5cf3693396397e73c76a0a42046487e47b7be2 WHIRLPOOL 4e85f096cdb44413054be3e493aca673f297b2d3c891a31aad5ec7cf6b2c7575b8998ee69c72a871b4eb29e1894c333fe2460da1dcd07808820a66bfb3648e10
+DIST texlive-module-patgen-2013.tar.xz 520 SHA256 61801c1774240c057fdea474848e0523d5a42cbbbf0397211e5dc0d3e4540847 SHA512 41f78850786fd5b5a25a720aab4c0ec7dd82c19a640d942fd0ff92d3623e1b374e789548da33d8b3a22ea9ee2a1b6d654d716cfe1b1794d80e7cae50f22826f1 WHIRLPOOL 485c1e0603154a10f5d9b1228017c6c6d2bbd9d05098d8e325c2bda1787340dbc825b20e91efd13b739cdcad0ddbbc6ca2ed0a647821f2464f7f6ef6dae273be
+DIST texlive-module-patgen-2014.tar.xz 516 SHA256 b4c9729c1a1f3af89b7cc65eb235236b0ea392b74f02b1b7a20456f849a0f79a SHA512 8bda3844ebbb5862dfbeeb83ae94c6a952b4593b0bc25cd454fbfcf248357df3df3dc0e7c871f543c47ac08f1d629392d4430a8716b4eb41d15f6f06bd8b450a WHIRLPOOL 6b98c3b1c2177b89b55703470537ec366ce366d4228d953e550a65a391c8446d1e7040ee68170e226c2db030f9427659f3e52bb65a5f83f8e6a697539d4d3114
+DIST texlive-module-patgen-2015.tar.xz 516 SHA256 620dec87623dde7db50ff0dad1da49149614b86b628135e4a935fc7ee3716604 SHA512 b3801f754576c1713596a6914e20363a2a26a0ad7052bca3a1d82b3c103f2c9f468b5632661460c406ecc3cdae9983134874d42c166566134e0285ac0ad735f4 WHIRLPOOL 8bcd9fc881fdacda2366032af52202a54e280751c4f8391bb995e76aa35e0c43fdbb84993debf743d9af9cfcfd02f1d029084d9d48b696a8ec94d07372883c61
+DIST texlive-module-patgen-2016.tar.xz 532 SHA256 6345102e51a8d7aa960bbf7842cd37b86d42e5793f91b0513ce63a525f545e9c SHA512 129087787df6ff3f450ba9b4af53eec8c5349bef186825ade2d2831139c2c4d2de5b8d2a354052a06f86f1fca251047cddea3bae2d9dbdbcb469d0dd0877786e WHIRLPOOL 6c2e984ef042793e6db34e855284bca4fd1f21fc3e4c3cde82cfeae4f9246a1596271e92360ec101c01c6c8859aa6dade309e1305a245562cd06d446fac7ad95
+DIST texlive-module-patgen-2017.tar.xz 532 SHA256 6345102e51a8d7aa960bbf7842cd37b86d42e5793f91b0513ce63a525f545e9c SHA512 129087787df6ff3f450ba9b4af53eec8c5349bef186825ade2d2831139c2c4d2de5b8d2a354052a06f86f1fca251047cddea3bae2d9dbdbcb469d0dd0877786e WHIRLPOOL 6c2e984ef042793e6db34e855284bca4fd1f21fc3e4c3cde82cfeae4f9246a1596271e92360ec101c01c6c8859aa6dade309e1305a245562cd06d446fac7ad95
+DIST texlive-module-patgen.doc-2012.tar.xz 11320 SHA256 4a06f64590a0802916fe4ba6e02a96f9ea923314814cebd542ddb4392107ec89 SHA512 3144f4a12c0a701e36af201492a1fc571a3fecd2b7597da14252e6ed2688e32408e7120e13a265c1a8e0ba9b972434350d219dcefb4b29d56f6c56c0b2cb12d3 WHIRLPOOL 444f73a6680f1c8fa10243ef9b46c86af1866635fda21fd08dc07d72624e3917657845898730a13abb7fa4da1618862e14355c87e2cdc29cd368f479a2f22326
+DIST texlive-module-patgen.doc-2013.tar.xz 11368 SHA256 e103387c85b0faeac95ec75c1034af0248532fa9cc77aa3d693cd0edb215992f SHA512 bd3654e631699684f1224cb8c5c18e002e2661162daa7bd334735046155c0a65a3f92e3c817fba4eb849250da57f81558a0912a271750494f69c5f0b38ee70a3 WHIRLPOOL e357df78911707403a3169ad5e961ee93cbe1966a2ac7a0b09c5463c5ad4e79711ea6118a5f83be21d73c01f6b9e07c2754ca951729676ff8b10a8ec7ea84cf3
+DIST texlive-module-patgen.doc-2014.tar.xz 11360 SHA256 96f068bcfb835dfb63872714bcdec163f41dd7fa3852999056f8a9e9bd8ea8e6 SHA512 5b7f0a771af61d7b52e3ce930a0f6168c2d34de610ee8a46caf8afe3daadf58988b695b94b93888e86833eaafe684da24015b873ebe4f916e0e18681ac947796 WHIRLPOOL b8bcb2756c47fb5e0dff3d7d42577279412e878719ab14efcb9060b86f785a608761cb0721f11eae6b44b273f0e7eec1e19447e78fa78313e4d9e4f2ac832f34
+DIST texlive-module-patgen.doc-2015.tar.xz 11668 SHA256 fe1416ef9e4b9f5922203595bf122b443138d4fd63a2943f4d473dc3ac309493 SHA512 dae40717634f3aab413a046fa04b7997ca26f66fcee34659ce62d85add9858dce12528893683518556d4944fb315daa7bd9ff40fdca23c439c419c6dbe2db438 WHIRLPOOL 1fd837dabecbefaedb02fa46afe2816285f1e437bdbd30530537a2ff4fa994635de4248c186dce1b5d065d4aff87b84ac7283acf3977bfaca13ed5a3ac6c0e41
+DIST texlive-module-patgen.doc-2016.tar.xz 29108 SHA256 4ddf75778708dd7bd00202360e081dab9f3ee470efbf0beeed1ef370c0d34612 SHA512 3f9ac07a886933bd980006bc083fbc95f5e103d2bac330b2f4f2af8eed76c6fb0191ebd58af1d84cc84c51824dfe11fbc8d32d9099b9f0144dc010764769379c WHIRLPOOL a937e203ce41a685ea0dded354262c899388b65d6c5fc463c0b24326095463759c501c482f00dfbf1dee7efe1602cc9f809702aed33f6ae5d0b05528012177cf
+DIST texlive-module-patgen.doc-2017.tar.xz 10960 SHA256 effbcbcf65ed915fce7a1864f15ff08c6775d16c76198e3372659e621886c98d SHA512 b1b69e00f32402f3bf2012f25840e63e3e1ebb00a5224efe7c7425d54a4c37945dfa097a1f41e89b360e4d0d769ae003774503fed41e4e1076004d296be27117 WHIRLPOOL 70ce68817894abcacda7b456b34bc70aee5a0018f9ab39691399bd5ed62d787719ea413c9bc5d51385282c15bc1c5447a98f546c5d97dedb60fd4684bebe3255
+DIST texlive-module-pdfbook2-2016.tar.xz 3496 SHA256 24ac8f7b9c8e408a40e1e20bbbc03cdc612fdc8e33d67ede565a2140a007a229 SHA512 f47fef10250135fdaccf4b44a6c62cf1a648b3ca8762b241b9390fa890a17e946f4e750f121c985d133af4289c15ce7e576011de3dfc4fcca4c3bdae52c4c508 WHIRLPOOL 263fa2d3fd109a4f777664c824d8c49de4c29125c737f13b584b4f99fbad4ef2d394e77163215d88c2f1dc41991c7f79dfe752bdfc8b8606aeba798cc8dd7a54
+DIST texlive-module-pdfbook2-2017.tar.xz 3492 SHA256 3b4dc166d85244be6d63b7a26ba59a026a5e1b4a1c27b328d72d8a1e5b6438db SHA512 62aa520c215830d8145bb0fd7af60915245be4b246bf42eb912124e61c9a388da67f3ca7efad560f98701c5b32be0b87ec9e78078b9900f44f0095c9c069ab1d WHIRLPOOL 69dd15792628bfd722ce0a82896f92135caf31c97bec65288278c5d07bcd86244a3d87906c1e1fd6e2e5f7f1abd0349d0eb232be46ed03bdb00101990eb7dee2
+DIST texlive-module-pdfbook2.doc-2016.tar.xz 7552 SHA256 ce0539ae25e7a7594d46cfb8e29c218e745e09fe8647e5c854c9016686f535b7 SHA512 bd882c85cebb5ae9ada4c6bc0e69f92d96f57a6efec212851b3420dec6f3dd7db91fd1b0fa357ded5613fe4f46da3b1c4ce44d2fe1c85eb1f1c15514fe0a29ed WHIRLPOOL 99ead19690ca1610c68e684996cd88ae27e3978d250bf244fbf287d623be2fe0503d53299a53d878fed9e1f49a5647bbdabf3f21e1b300ce4f5f82be6d19231d
+DIST texlive-module-pdfbook2.doc-2017.tar.xz 7552 SHA256 fdb13fc4fc9017a701515dc4e9cecf64794c5a8d80b0b80025b765fb6f8dc8ff SHA512 7620a797dcae68e7bf093c119b06f377ea2665b228125bedae11ce129d8053df066e771df2053fb8d90473cd7d00a75ec5235a0ac5221b0171605d145a18321d WHIRLPOOL 8901dbb4d7f15e05061f35946191393087922b0ca74d50bb142229543fa9f6bf2e8e60e4727790d85d55146e08f782b774fccdef3129744fbebc158b1da814ff
+DIST texlive-module-pdfcrop-2012.tar.xz 10232 SHA256 250e88f10c576b55ddf14dd813ff46827cf79b71ede0a13869d380e13d667693 SHA512 a554461d0ff0f5c24b0df7589641a1891a43afd10f5a636ca02e9a379596a4481137bd1ffcf1c487a5fbb3166972439b949fc6a902a13242b9e160f81807607c WHIRLPOOL 3fdec0a74d250c772a8f9753b3c9a8a67b94a4d6dee08d858ac8093557abf97765a790b2879d155693c7ea6f5fca194c026db519b7be8a6cdf90c62ba55f609d
+DIST texlive-module-pdfcrop-2013.tar.xz 10720 SHA256 f63a1e91ff8b1c0bc0d362ee038ac3495095c6ca6274b1b6bb0575f7bc8400f6 SHA512 5a0dfbae52f52f8f9e1792af46e585f150fda2e2104427fa32bd4b2dd5c84523cdaa24f60f67bfdc3781fcc2c562f2587c7fe6390aa5a7b089b7a50b23837b50 WHIRLPOOL a10ab40dce4281ec4d49c1546065b242ca78f7c5bed3a8df937470ef9f3e36e532b64ce20fee3f587ef6ba9b8b25ab2f8a0ff9593ac4c0bb1a5a16a7d532f046
+DIST texlive-module-pdfcrop-2014.tar.xz 10712 SHA256 9dc630c03ad80c118362309ab7f23f8c68f2c138faca21fc7c776f588a7fbdb6 SHA512 528cffd3e37f1a76b19725b9f50bd87bb27b0496938888c0505833f60baaf48f33c4afd9665abbd48176a77f207992fe796fbdaef71390fa0984e130796cfb94 WHIRLPOOL 721051768dc3649be1f3abef49b47f7af872a3c809c493d48db2c47e4426bc19e9cf5eee1a2ea9d2e7e6401d32010ec02d66d0b7120cb14374a7e8f69211d039
+DIST texlive-module-pdfcrop-2015.tar.xz 10716 SHA256 793df197a22040f854a118847690b276c8bd7fe08eaa8988b31811eefac895d0 SHA512 a356a1f5ab4d616c93400cae2bf5f1eb74433edb6ee0108187c24582711174169f0f3704614301c8f68d0ed96a259d27616e423d9d776e5438f651a15474e70b WHIRLPOOL 6192325e6f5958f73faa8e9b9b51657a482bc0538c8cfd16dc0135ed759c62625dbde60b78059da3ce4bcfa9b7bdd825d28ad6ecc05b19495a95cf7d36edd8ba
+DIST texlive-module-pdfcrop-2016.tar.xz 10724 SHA256 dc79104fae7ca888d4b09c403b34f9796a6c08e1af87533863db41d89b24bacc SHA512 0fa7b15f22e5dd80581e8398aa3fc9f58568572338e1c2c137c3db2514ef0297b2d29a14485d64e1602cfb75bfdd27d584ec2e9eecd35d6027a57cdba2727673 WHIRLPOOL ff02f9994180e1db1e5655a56bc7d52ed7b30499c57347587f47dded80ae5acc876b0292bd3914bb96edc089a4b97d52475531de44f6e351e7d6166ef08bf527
+DIST texlive-module-pdfcrop-2017.tar.xz 10720 SHA256 46708c290f32951240d30e2369692e588567f09522c839c2fe49c4784c316660 SHA512 11d2e8e911e8cfcabd5a4f6555715e08cd6ca51868c1a0dd7d9332fea5fe7fc4b571669058a99ca518f7dbafdf45a517231ea8a654ad39ad9169a789b3346a00 WHIRLPOOL 1f293070f9c1f41a0fcded3a09efaf0d9b1476129a8421bd27b6e0194d4f3fd98554a440b302edf62894187a32a911319f2ecd643b1881d4c6d805eb8fe38799
+DIST texlive-module-pdfcrop.doc-2012.tar.xz 4172 SHA256 7d0c943d40e0b7cfece71e596ff936ca6b2f965a82e5b649e515d3869a23a68a SHA512 67f2757330e1c398807b1c5a68e9abba363242da6a86ae5207253416c49f51e0870ec69c4140d794d011b328b0c82ad02c9ba0e8b7964cd6341e070a6029e165 WHIRLPOOL 26ab675a082034d9cf6045b0e769f61213b890c29af54c62c068707c651b5d8f10b95a1b91b99821c4e3bdf01fc5e2f9a15b2643ce2d4e704f83e345bb023604
+DIST texlive-module-pdfcrop.doc-2013.tar.xz 4300 SHA256 ee16a2f2ae78bceeb14cbd459e7cb88c964ea3cdf832b725ceb7eebe9d270ea6 SHA512 33cdc2c508c4a3a442f41d09da07deabd8cbf5a4a131b9da1a8de080ce1334fcf3e6c3bf8483a125172260613da7956a7cbd2ba3342c53d36464393186ff20a8 WHIRLPOOL 523cdf325adcf83579025c26e4595cea6072686108b12dc50cdf1921a61ccbc6d3adcd640f17c5fa7257e3e761ebe213188a97f8c3fd442febcad11eb6d2b9ef
+DIST texlive-module-pdfcrop.doc-2014.tar.xz 4300 SHA256 c42e47f3964038d1870ee085cf9f1100fcc0c9716ee85214e6bbc168d548b10e SHA512 b1df987d397d6045728b29b595c77de2d4f8f95011d2ee1ad0bf62b8dd2876a362ccb4fe97ae1e9db4e4b6fc6dbdbb513ec622e7ac9bc1086b59dd578795cfdb WHIRLPOOL ef1b0ea8df3acbf8cf7a5da133010d32a763a438cf9039154d24479a59547b65eac9381bc52b8973bec11fc89409b997ad2e734cf16442e6a4dfa80072cc2c28
+DIST texlive-module-pdfcrop.doc-2015.tar.xz 4300 SHA256 4387b904c4aa176b89f4906091875378a6884c185fd8d126a03c5e55ada48f18 SHA512 36758166898f6cbee214f6a73f07cbe5828dd6ad8648ad293dfa0947345fa39c28488e61dae7d32fbb1862abfe7b114e06c0f326af67fdb8d98082021963295c WHIRLPOOL acb6d086d91502a75e8fe6587a7491131bc3410854a877f0788c801a90cd6b889467a027666fbe54f1cd70b5d96b68e6325289e4a467c675398d9dc14baa9e8c
+DIST texlive-module-pdfcrop.doc-2016.tar.xz 4300 SHA256 1aa5a5473d1e257a48fb70c677dc00018a3ae0369a54f3f0f69aa339743c6a91 SHA512 13260483069da8cfe84da41e6a3011883e7ec2b1bc900b011893eb1cc0927ef01ed98d36048c454a911a144ba967a94521030c94b2f2e5d4588b717984ccd519 WHIRLPOOL 0697aabaf2e1f43ca35821526b01ba98d6cab7e56ed395742b0ff10772caeafb0e5f062393d54414a2693cb96d4fbbff0246dacadb94e968ed7e60469bc95e46
+DIST texlive-module-pdfcrop.doc-2017.tar.xz 4300 SHA256 4bbfbfd7e7657393069f87d9fb092a141fb2c249a2898d35496db595611a9f2b SHA512 fc9537872e8a7234d80e76709d69ea7c3e17e02321b26477a96186e9b190d6c093a62caef83bebc76d4aa4134273e28e74d456ddaeb9e53fd073f9838ecb6110 WHIRLPOOL 1c4811411f68c9e74ddabda9927d66b18a88e97d36aa9029c9ff84e5f7c18e55acf3ada33bfaf210d89daac60827ce76530c3319b1389dfb6dd08d2057642a25
+DIST texlive-module-pdflatexpicscale-2016.tar.xz 2928 SHA256 67a04273df250ee0ae44173036ee2d9da3e76bb71dbc16310b62b85150363200 SHA512 86f3b2368d6c7b3a2e4493fee13ec59b905b80d00416363da38efb11dd7de85f723e97e830aeb45a03a0183173e65bba9a80018ea7324fe4e674464544154d51 WHIRLPOOL 97ed5cb6e348d2b4ca5d8604e5726e11155889f76df9dbcfea967ba1a478ee23b8219dd704763e9ae33c1073d763ffbc77a3925e9f828194e804fe8c35c3388e
+DIST texlive-module-pdflatexpicscale-2017.tar.xz 3120 SHA256 5f82b187b2f251b30154de5cd339b59fe8cc7c1963364f7c32ea2e255a24a832 SHA512 2e6c4baababe8b656e12eecdbe73d8410c060c3d4aca5dcfc626728126481a5a86b8b7d031a35c85a26e2cb79ed1e7bba7e143b449b0118b5a11d9bd9bd135b3 WHIRLPOOL 6063ab6a40e5e5ab75307acf149ebd1693d3ea421568f7e52505a9810568c4c5b09a90d039d2c317bbcacce30b9a5063585f40624797575fcfdadbe961ebc957
+DIST texlive-module-pdflatexpicscale.doc-2016.tar.xz 193112 SHA256 560a64f375c663088ca9d78725f68a02713229aafa673fcfc89b68261069d982 SHA512 870a82d51c3d33c00443aba797e23b6aab8d11b33e254f86c0e5d934f595947803706d1dbc9559714c7a49879ca8cbbd9e8a2a0152b707a84073a6df0e912bfb WHIRLPOOL 6dc584923a351d819ebd5fd50561bfda203a4e48b2fd53a1e5ca916210c623f0de802e2c50cc41e310702bbe07e6ee31b33c491a58131e901ce652e90ccd7f8a
+DIST texlive-module-pdflatexpicscale.doc-2017.tar.xz 86448 SHA256 b21c516079d90390ae3d743b0a1fd70f46cc68091d252df0c32b94bfa5680077 SHA512 6a19f1366879369ccebfb53663ab565e3a635bdde413fa7c1d8d6a58faaab745cf213b35e183ca1bbca4c90dc3a8c60f1ff0e472817d703ce015852d0028122f WHIRLPOOL 4428aef31c9b66ad8fd51d95ac69c6b356e9043b282ddc9794bc74ae78f67e521f3e0a3031fbf6ef04b950c8c1dcad6ad6e10ea83878b0ab92ba2bdf8461671f
+DIST texlive-module-pdftools-2012.tar.xz 1852 SHA256 efb622b1cf0960642e220272549c5ca0a23a3c6730d455adf91cd67dd6af26ca SHA512 5668ab9ce28b9fc241b5a197123492f0b9b6d274024fa97473b1ff5ebf3a664a6a28bdf01d4010e0053a5172d3d29ab69d61e344df66fcb1260aeb25d7514029 WHIRLPOOL 3a44b881895c08d363fc9ace46103b5847571b0760fb89723e909f68d833ee207677127163bdb6892fa9030d9ff9d82c18dc65a2e29bb3209adf73193ccf8084
+DIST texlive-module-pdftools-2013.tar.xz 1856 SHA256 218882d7d4f3ba2858f2ad0d0fc558926e611f12fdac2154233ab7ebce0123a8 SHA512 9047c9b828e298b18e0bbbee0109faf7eeec3296ab10a02dcd0f87af6ebf0b67abf335e90b3b137d3e5a2667e333f08c71580548612d44b57d6f581da8189db3 WHIRLPOOL 73ec6657e471353de15a615e0aedd1155270ff9266c773df7f4b155cad8a2cce5cea00288f07a21bd52d1b3eb9c7fca355584ee7be07207adb671ef6f17d10d7
+DIST texlive-module-pdftools-2014.tar.xz 1856 SHA256 2872999e50156cd432a216b7250381a994c53a443ba5a597ecaaf0632724881c SHA512 c310ce92c094385d78959ef93f7e1688c5bac07ea1caf631735ab6a026ffe4b3059b51efb9c27cc012250c5747e17f57a52d3d3408c9a0cf8879fe2ae9608b81 WHIRLPOOL 24cade9d2069490d6707bb8b9bff1726e3bc4c7f15af5a80ced8c4d8bff99589af27bd6faa15a7bc74a748e357a72f6edcee07739a086c94a993a59688b93c4f
+DIST texlive-module-pdftools-2015.tar.xz 1856 SHA256 8e887a20f1756e71a522b2325da4e2f18494633fb05d083c667c2bc1f51c886e SHA512 2614ae836c4b4aa07baa0a1e9b9b949c0a6b6c1821cfe45ce8642dc9b2d393638d8176a37b264eeabb83ef7a13a4eff439c2b0b56d80f6dddf1fbc494de6ee48 WHIRLPOOL 16e4be3048dd3fdd71eed87fb2a3c1fb4e37c6baf2260e77a7a35d320bedd56bf4a5ee0601d90f61cc3ffc278d34fa20263ab5c5aa5fa6ccea887f0a9f197cde
+DIST texlive-module-pdftools-2016.tar.xz 1872 SHA256 8da7d148ad3b419d3ea2146ff7e27fa21849e63b575ebd1293b578a385ebdbd5 SHA512 04c1f532d360bd2865392b40dffc9b81b29e6940832ad36522f184d8da32ebd47f268a67f6ac75239de46e37911f60ad4dd644335312e3e6d2d7722c08103b1e WHIRLPOOL 522266661ad287179d64591a0b7d2682ed8bfb6940e96d48be4756982f49c27bea538742500304ed0d11e51072cf125e82fcdc7f2a48e691ec91f446d211fac1
+DIST texlive-module-pdftools-2017.tar.xz 1872 SHA256 e521c18d8a25d206616a86024e51e74f2919db456f3ce31e6a31c1f6f9c26b7a SHA512 9f6684fa61f3bf757fc970214065b76523e9f0bf324024fe90268034a2322646cbd10f3a005135cc176e7ea17c434fd9e727337d45929ef24f024b0ee7edfb10 WHIRLPOOL e042329437b6b00ba082005258591b26ab3b01af36ba52fbfb8c04a21e5cc7ae60c783d86760ae505cfc1008165942fce77c6e51da9ce7fdc3c564ac4e949048
+DIST texlive-module-pdftools.doc-2012.tar.xz 20552 SHA256 d03e998d7426aae4453c7de986c0813a19dacb494607efef64013654c6fbcd71 SHA512 098448bb139ede15c77e00a070b4514a160ee9f2d2a9a3f737bbbbeaef864d12599c2a12f674a161ed3508fa5322af08732b22bf7fa944539954d45d3a05ee27 WHIRLPOOL 765697f53eb6c599eb350d4143c4ddf0f3618fafd5d37d8fbbe421746ffeb925882c774b6bc246aa2efbd9967b7794935088e38c649402bcb1f3fbd93e12c4fe
+DIST texlive-module-pdftools.doc-2013.tar.xz 20680 SHA256 7029d73a8e5a5d72fb70e30719118554ef8c68f1c8b83f149c2c35bf6d7faf58 SHA512 f1c1d7d2b53e8eb446ec8fa3ee9533e63e4fc1234d3d99b58b3dfd7ff64cd977d5c3fb14dde2360ba9f0e5a2512b8ab994c640ee11fbfe954262170c734189f1 WHIRLPOOL 09f84632f9cc7705bbc6b575fe73dc74d33ebffb6ee05377b49a9bfb2d872e374bc2b2af235fe5b172ce94df2da3ae2315b25771fd63048b42d6772c138d2e00
+DIST texlive-module-pdftools.doc-2014.tar.xz 20564 SHA256 a77c4736a5f9e8f72d6bf5faf810ccb1d8348cc11aa5263a4acceabd97486ee8 SHA512 ef9f857e035d28a81d7733e8fbecb27a05fe6432a244581b7a707df63ea8d06cf8cde6e2f3416e800b0705b8380019c7180e1f2dd57eecfd62eed8ac9c72f3fa WHIRLPOOL 6e1eee9dd1c86070bf773d9cbe11049a11ed24ff179272230392a6c029748da486c83ca382842bf79be4439b1b65c29d17e66657ec14a6f21e4e75d8e5c87e9f
+DIST texlive-module-pdftools.doc-2015.tar.xz 21032 SHA256 8bdba3fa3cfab1c2e3da2bf4045a17e04506cca28f55b2f893a6cc2bbcac59a3 SHA512 e4e212d9df0293b0f8f38cff221a671a04c81537c08ef68d203114d138f38d14713aa2abba33d7e68368e032fafedef8a3923fcb8f4fc52343f3d49b43d07b26 WHIRLPOOL 6f564a9f52ac224fff5f172cabecbed7df47ce826cef2b401c6b796c26750bb168c5c32a862c9da459abae220850447a192ceed5a87af44f96173e5272211080
+DIST texlive-module-pdftools.doc-2016.tar.xz 73680 SHA256 b0ca7a594b98715820ca3c6bf5feb8e541f653356e2dcaef9d659a6d881ff714 SHA512 e89610bc333017173d5e3f81826a244daa5e7a9ea779f580e06ea54ee2e1a456b7d83ca8fae39a38270d14bfcda4a8c8d9520e0903ab9e91cafcb1aae0207bcc WHIRLPOOL b2c7cdf44a3e698e10d8e8033bf97591c7387ece58061839ada908c88826eb84c46eccea38b8e900a952c044764e5aa92bc7802cc664fa4d935e645e4d8f27fd
+DIST texlive-module-pdftools.doc-2017.tar.xz 73680 SHA256 b0ca7a594b98715820ca3c6bf5feb8e541f653356e2dcaef9d659a6d881ff714 SHA512 e89610bc333017173d5e3f81826a244daa5e7a9ea779f580e06ea54ee2e1a456b7d83ca8fae39a38270d14bfcda4a8c8d9520e0903ab9e91cafcb1aae0207bcc WHIRLPOOL b2c7cdf44a3e698e10d8e8033bf97591c7387ece58061839ada908c88826eb84c46eccea38b8e900a952c044764e5aa92bc7802cc664fa4d935e645e4d8f27fd
+DIST texlive-module-pdfxup-2016.tar.xz 7260 SHA256 1d4a3456653f0305d8ce0d0d4be404d3d1075db09aa536cb5d70ce3115fa6be1 SHA512 598107c336f9ace01c160c107da09e6a43d0d508b1e8b9f5304d6ab099b924ef97726d925031c5643b179e647d7d66638028cf006d9afc7898ccbb6830b87a68 WHIRLPOOL cabc5fe13b15b2c6a6c32ff9d071f6bd8d33b9b152a48fbbb6271ff5048ed2045fde8487ef7713c16b6b21e69d2fbdbb1dbb3d98c783ce617219f5d564ed9b37
+DIST texlive-module-pdfxup-2017.tar.xz 7260 SHA256 1d4a3456653f0305d8ce0d0d4be404d3d1075db09aa536cb5d70ce3115fa6be1 SHA512 598107c336f9ace01c160c107da09e6a43d0d508b1e8b9f5304d6ab099b924ef97726d925031c5643b179e647d7d66638028cf006d9afc7898ccbb6830b87a68 WHIRLPOOL cabc5fe13b15b2c6a6c32ff9d071f6bd8d33b9b152a48fbbb6271ff5048ed2045fde8487ef7713c16b6b21e69d2fbdbb1dbb3d98c783ce617219f5d564ed9b37
+DIST texlive-module-pdfxup.doc-2016.tar.xz 21260 SHA256 7b7c773482b2b34c402c0406a88e0b9d4855513beb4b3fb330c4a87fa9633d94 SHA512 934aef9a1ddfe0e1f6cab6078e4bb4c1e4c4d428ca3f249f32ebfa72f9148af342c080164cf291b4e1cedec5fed1d596026427e9c7253c4e151778ccaa399b2f WHIRLPOOL 3ae0525bba057a12db14a223925408c2b06f57f27e8cc6ac6f0f38b585f2440c03ad60fc7fa10f3314b4967277277a22ea3e9cd349e97273e6efd44057ca2475
+DIST texlive-module-pdfxup.doc-2017.tar.xz 21260 SHA256 7b7c773482b2b34c402c0406a88e0b9d4855513beb4b3fb330c4a87fa9633d94 SHA512 934aef9a1ddfe0e1f6cab6078e4bb4c1e4c4d428ca3f249f32ebfa72f9148af342c080164cf291b4e1cedec5fed1d596026427e9c7253c4e151778ccaa399b2f WHIRLPOOL 3ae0525bba057a12db14a223925408c2b06f57f27e8cc6ac6f0f38b585f2440c03ad60fc7fa10f3314b4967277277a22ea3e9cd349e97273e6efd44057ca2475
+DIST texlive-module-pfarrei-2013.tar.xz 4640 SHA256 ace8e07123d233ccfed0fe1f9e4599e855355b646d8b6d72a65c3bf3794eb143 SHA512 6f4fefb0b338deba88dc18946ea2054ce2f56dbcf5c7094e502e1b5627f7f870aaaa6bed5c0ac2e9b23639c4ec845bddca971b6de380643a79e7267448ff77c1 WHIRLPOOL c2225e4f6315350434500fff3b31c0962e6bc811214b6749f2820592bf9e163f8ae934ca0e08645c2f2230377b37eceb815ccc134944fdaa79927ba43817fd0e
+DIST texlive-module-pfarrei-2014.tar.xz 4624 SHA256 3ee8e8091c8d4d7b4ec46f5d26ef7e4a0d7605223657baa10bf4260d6c070ffe SHA512 95d9f99b38b28110bc9661115851c47531b44ecaf8f1db643a5f6ba57da49f44326dff2ac432d7a404d1bb9f8b61d839ae94e6267fe319b8d701b022e8bfaec8 WHIRLPOOL c0b44765602791eef58e1953a6773da5a96d4502a5ab91b753c6fb965db51e0de735e08f0677bb81ea8f33ddca47aa611749402973bb0bbdb17a4323556b108e
+DIST texlive-module-pfarrei-2015.tar.xz 4624 SHA256 062b486d365b559cbdaf3122bf4ce3ccf240a4e2df0e0e6730f9380935a2122c SHA512 cc13cd7552877be7889611056b30614a642bba8babdcbc48404c803215ba400769274ec1cff1881ce0ba09051d109af5c31c12f5269140ea554bba700f15f6a5 WHIRLPOOL 1e705aa75713506d0429f06e167eeeab5d15c145333fca7a073c3966ef517f1f75c0f4daeb027096a04aaf92ec14afee61bc7abbe1326e7fbd3ae2fb6894f515
+DIST texlive-module-pfarrei-2016.tar.xz 4636 SHA256 c6d1641380c7f72ca62b763876f69d57bdce5f4aec1eebccbe892c92245c74ae SHA512 39373904f213647029a282fd86940dbdf097828f3b47b1d0c6bd9bc99baee20665df6e5e5af3d2221a661fd71f91884470e5b7d540368dd968955b438c5f0753 WHIRLPOOL df31dc99060aa00716f5d5c9c9412cd3dfe82efe9160620d48c1a829be2898c5faabf7092cec53a3b03b3c167c0100f7c949b30b013d266ed01640340bd35cb5
+DIST texlive-module-pfarrei-2017.tar.xz 4640 SHA256 15d7162235c8ef47b486144de8b22ca34d3e7d17d4c6f57f7243efec12a2b5fb SHA512 3fd11229796b4958fe8b8a3e2c4a4f0556063328ecb83cd9f4273c9bfa7b0d81dac776fc5d79f5b96b7366e0dd259d27af1747752e1fe4bcf7396519020a6d95 WHIRLPOOL 24d2418bc8345400eb6fa1a7f4c0232fb9e8abfd43d7bc5c22815d9d4787f6f16c67c0e1d94ff7ee14817ef09c47ea3fddde129a1b26543240e6bc3869b896fb
+DIST texlive-module-pfarrei.doc-2013.tar.xz 499228 SHA256 1e9df40e2b26b1313583fb1b9ae14eceb992dfaa87c5ea7650c0310be093d14b SHA512 1e6236e0799ebc0e87aae00f38265a3833d304f8525f1ed40edc044a1f82c4306f6496e2d71798797b4a16a4b04ad5bcc36e68df1e392127320c6b88c0dd6a20 WHIRLPOOL 6067a59dddf2badb915971f3d3234ca1d1c691da245772a330c80d1f26eecf193790f0d0ed16827dc25379a4a69a5d92f1372ddd022c18338e748f82776e91aa
+DIST texlive-module-pfarrei.doc-2014.tar.xz 499400 SHA256 937870653f090c22ef911d238fb685cb33333217efcab02165780bd4b859e193 SHA512 b3a6bf5b121a99b4a81dee9985bd171b89f57d6f50dbbb43b5c79dfffeb94d84c8aec179c1cc26ed3bdc0c458747f75484f387115c5f610c1332ae04e7b8379c WHIRLPOOL 394cb9fe82a54fc3ac3eb364e297c732f0a651a1655fdb4c85ccdb00ba71cb661b8b3d525bf48a0b746e99252f7aebcff2f20552e4c8ce381245e464a7a78a6e
+DIST texlive-module-pfarrei.doc-2015.tar.xz 499400 SHA256 9ba582979ade2ac5349f4a0fa1ae91c1870782783b975c636344fe30b36843dc SHA512 f3937409cbf0dd4d0deeaad8c114ef2cba1e82c268cd2b6743feb4a7adb75f641bf9cb410c6d2e3858c3af26810d3eac80dbae7f4dbbe63bc0fca49281ef2a0d WHIRLPOOL f6fa361835abf3a88038f0789a4b50009f52d9efd583719d138b8811e91e123220f5e52279efad4b3ba3654e67d278b182975d89a4f3163f150e59b61c961cb8
+DIST texlive-module-pfarrei.doc-2016.tar.xz 499400 SHA256 c0c6958f602f6a7158844ee99f175adee1e537acc76e34a1cd5e58b8e7d86c53 SHA512 66ce3c9aa05bee674cc1966f52968edef3b0da97225457f5bc723e3f800c5f14200c75597fc67b82b167ad8aed92a28235d53b9030f08e5a29fcaaf2be3f5324 WHIRLPOOL 9af21b5daa7a86a285b0662ba03f1eaa49965b26e22782c1ee27709a099684eea559f619a98f4803170010d76adec66293ac7274d2052c736ffdba6f6320e59e
+DIST texlive-module-pfarrei.doc-2017.tar.xz 499400 SHA256 c0c6958f602f6a7158844ee99f175adee1e537acc76e34a1cd5e58b8e7d86c53 SHA512 66ce3c9aa05bee674cc1966f52968edef3b0da97225457f5bc723e3f800c5f14200c75597fc67b82b167ad8aed92a28235d53b9030f08e5a29fcaaf2be3f5324 WHIRLPOOL 9af21b5daa7a86a285b0662ba03f1eaa49965b26e22782c1ee27709a099684eea559f619a98f4803170010d76adec66293ac7274d2052c736ffdba6f6320e59e
+DIST texlive-module-pfarrei.source-2013.tar.xz 13236 SHA256 3c13011babef4dccfdbfc294c9bdc37545f84fa7519bf64fa1f57c042430470c SHA512 0b092d1a7e8cac156966f61cbbd443f0ca8a0ecee4644757e2e7d68e40ab89fedf082db058a567ea6f03522c848c339d3d993cc972029525c3c2c8bc6d5a5ff4 WHIRLPOOL 1dad5aecb04700219da94403a41920f6ec5b18301dbab29f5b66ad2b989276dc953f45097cbe1f91086d8179a036ff3e64ac512f47e949730c147fffcb4f142c
+DIST texlive-module-pfarrei.source-2014.tar.xz 13448 SHA256 25520334eb2e413d9bebb595a4f15c2dc44899de644d320832dd94abb10b5a05 SHA512 36cff608e225ef0589dda63655e1fe392d3fd2fe85bf41a3f45594a2ec393286a118e5a1b527f719c24ec39a253b90ad5bc24d9c06a8fba6440b483707036bf8 WHIRLPOOL 3e380e4bf87dca7e5cd65ac759d422d4efbc5dce92c17b38abbdfde0ba697c20175589dcadddda0c283d3a559d1ac30b96ea28811a58c11abc7c48712053abe7
+DIST texlive-module-pfarrei.source-2015.tar.xz 13448 SHA256 b6488fddde371e2ce1a0c44914c32f59931476e63b60e6ea113e2325adf5789e SHA512 843648f2f768a3f31e486bf7531de844ebcf0486aad559d65f03e87fa5d3f685403095aba5b3304b10e55d79cf337761a11e09db436432a07a47f7386d036bb9 WHIRLPOOL bcdf76859f6311d55cb83f4d97f7f1ece50e5f1e06853af2a92864389a53fcf4b37b69aa5396be07e949125489dbfb1262aa271c04ccb2535f41b4994c8dd907
+DIST texlive-module-pfarrei.source-2016.tar.xz 13448 SHA256 4e4eab96052ba8174ae4087796665a4f4ec58bfbc6349f86985d5905ef11f2f3 SHA512 c823b44f6edfce892d2a6a14687d0d7cd8eb1b2eea267040d1ad2d0bbb18a0218dbe665f9d0fb43e10ba85879fb71ff26f779207a1067b4cb027c0354e136e5e WHIRLPOOL 8ddb60979b0da376e901198af5949cd7242233fabf9cdab19ded10a6e0e5061adbdd363953d97eee4a2a3f1434760f9082eb8f1f61295d701cec512405f9e75f
+DIST texlive-module-pfarrei.source-2017.tar.xz 13448 SHA256 b42dcb273c2465400b779d60904dcefb5cfd9b972ac360941760d27a845ad630 SHA512 2a00bb71000bce7cdba9648d51cc5a7943e2b11ffe1a9bf68dea4d4a320a337f73aef4152b7d5ef10b8a406329b0979eac82e84c21bbeb89421bf0785cb085b0 WHIRLPOOL 65d01f41c00b80066352a45d33a4f9f5cd2fef8009a7b4d2ade3dcfa218dfeb9db396451329136e642b20440d72cb0c6d27e3716a142c193f9e4cc63038adc15
+DIST texlive-module-pkfix-2012.tar.xz 7544 SHA256 283779b6b577c27c3ba1e31c2452f8db4171d4e773dfe4ff36e9bfc666107552 SHA512 cac0c15c8d80f88d2a3e35b9e919c55deac28431d5e48377521e51530c139ef3cff02ad2bd05bf8190d007d8fd23f8c5baa14ef295205705c0454b126a426993 WHIRLPOOL 20cbf7e7850a5b98db28c17181bb602514d2bb1ed139571483557e48405a4d7a70dd22dc85137658489af6bdbb63195c62d25c7f75b82319393e060ae93369fa
+DIST texlive-module-pkfix-2013.tar.xz 7544 SHA256 283779b6b577c27c3ba1e31c2452f8db4171d4e773dfe4ff36e9bfc666107552 SHA512 cac0c15c8d80f88d2a3e35b9e919c55deac28431d5e48377521e51530c139ef3cff02ad2bd05bf8190d007d8fd23f8c5baa14ef295205705c0454b126a426993 WHIRLPOOL 20cbf7e7850a5b98db28c17181bb602514d2bb1ed139571483557e48405a4d7a70dd22dc85137658489af6bdbb63195c62d25c7f75b82319393e060ae93369fa
+DIST texlive-module-pkfix-2014.tar.xz 7548 SHA256 3bf42c72b1c3b8e91427a1cde101b2e696726c02092a556d5e285bf5026513b9 SHA512 320d6e67345438c8273cd0d7fbd65439eeefbe382268d04bbe2c19a409f4aa19cddbc780aaf0cd9963cd5dbc082d9859bc0cd0e3516e956193816026567fb31e WHIRLPOOL cf815b02434a9e67c125590cffb2d77b55b83961d3583be6532255d0aee7d9dcf6cdefb6a9832c3dbeb14584075b1ee527541647bb5d884883123a2715ebfef0
+DIST texlive-module-pkfix-2015.tar.xz 7552 SHA256 49d4b6ad546f46ec568002f955fe8400f0260ec318009a9f0374acfa40371822 SHA512 231c6576cd52cffebcd3cd78f2d526f157ddc93230a2059cac17e21bfbf3a059e0a1066bf150aad1028a286d509f0071f0774006510c8d89b4d94d1fc3fbf1e5 WHIRLPOOL 3c0b55b32072c6b1c9f01bd196686466b3a1063ed5f01567499642ed30f8aeeedaccc2a7452f552a010222f31ef64ed49cb058d3c99cab05becf2cbf0af345fa
+DIST texlive-module-pkfix-2016.tar.xz 7568 SHA256 23940ca6b0e0fa3d2868f113de46008bcb14620aab22fd401f5107accc665e26 SHA512 bbe8ed77042f82fc0c261f470e1d560a17d33d64bb83af62cfcac635bdac7716908d95064c3691ccf4803e30c77ba0e4defe88d6ef56acfea01bbf7a302b44e1 WHIRLPOOL eab24f62131f1244ca9b28c19d35cdc58092bd5da90f815050c2a606d2863c13bc5f73d684c447faff16132ec008f5b46d395b673b0454e1165055929c7bd73d
+DIST texlive-module-pkfix-2017.tar.xz 7572 SHA256 01cd265b17230896144c1541aa6a4770ad12fa04552f4ce608937db20246a3f9 SHA512 5ec75f9a8760dc9d159a003738e700938aed4312b76c3b32feeae1e3736bfb7e0ec61bc6627753ba2c035c93a47f21176ed8588f73510e1deb76dd8d159b3691 WHIRLPOOL db53918e7ee8276f3fced1bd107022b730b6a9ac02984f248f7caf6feaaf60edcd8a873dd4b21377d2e1e8fb818b5cf3875660ca4e752c03a428c11dd052075c
+DIST texlive-module-pkfix-helper-2012.tar.xz 16704 SHA256 e3049572cc5dd1983b0f1f8da3d10a4e46f0d82c4996238a5a0582ce66f73815 SHA512 83cb2f4b4d03a03b96652b636592948f3cdfaef4ee75ef614914c3e147832115507f9c3b20c5b425c50a45c010d92fdd8e5dd96d839d09e1ac3480a25442bfe7 WHIRLPOOL 335d2e61906583fd621d5b4064ef81e19bbbfd25431c5f20427cad74f1f05da797e03e73ade297c516398072e3761827852ea729ab77a746a7837f7fb1eab20d
+DIST texlive-module-pkfix-helper-2013.tar.xz 16708 SHA256 4f781fbcc0d57bd0575b2fc17ea0107eed66ed8f72c95c6b555488218f8f471c SHA512 1bfaecee57bee93128d18e36baf7d673db25557bfe0b0ef8b422329f9d9c2a35c343121b8ae1f7a2e73ea7db7e8d23d0fa9ba08d06dc92f0205ff47fcea2e7e0 WHIRLPOOL b88cd050c59e8c03372db692ab7003fc3dbe60fa9b5a92afaba1888a8003b133307e8a87f0e141fd7cdf46cc2f440b17001af949d886ccf5dc69acf95496fd32
+DIST texlive-module-pkfix-helper-2014.tar.xz 16708 SHA256 f3ca070520b265ce2ded237a9bc42a6483d45e11d102544b194015a9960c8581 SHA512 750c8ae0502a190167f826fdc1d643adbf58c6ee1a5992e556b2b30dcbb1c0a8bc2e1ab46c8bf95bb640428af1f2e74f30f0ffae29bba0a8b962e98e3f4f196b WHIRLPOOL ab45b57cd54eae646c533e07d78d052b7e80a3d20ed8f4734a641366e550f451e7b23ec9d02273ee7e0c2e6f01ed1bc2a14fdb745d1ddcd8beb41137266321cb
+DIST texlive-module-pkfix-helper-2015.tar.xz 16708 SHA256 c0f55aa9bce3b0b2b51e7a89c3a83402a50044297a3a938af3674676a4f2eb00 SHA512 211cce87d4a89d3af19b0c22e8dc49c59a91f4dc64b6a06f4fbd04ca51280cdf81fd2e456b6ba48a24e25fa8f5f8fd4b8a14b83cedbc3162f27a218d9b54be71 WHIRLPOOL 4ec5fff95a08a71399df26e1a7049fb18527112db20043559a941798116b0a729433e50ebc14d3a9ca411d5c3c2e2b2de344c99a1c329315127a1724b9d9bba4
+DIST texlive-module-pkfix-helper-2016.tar.xz 16716 SHA256 70814fcc455e00ef443d6c87f97c4282f5544ba0e1b5bcc0954be3bd5c17a468 SHA512 14de8aed71eee67bb1b5f7989c18e16dc35191aa762a4e30ffe916161b81c1397f284d6cd8a497ca9e639302b663c388d0ddf3bd7110bd512021232e63e84086 WHIRLPOOL 79c152ad87dcabe09329c463bfd026d69c2d6bd8350633baa4ba80106bdf90487ab1b25ecb5eb0802752e65e786b4f7c1b29b1a2b9b6863e713d7581809a57e0
+DIST texlive-module-pkfix-helper-2017.tar.xz 16716 SHA256 70814fcc455e00ef443d6c87f97c4282f5544ba0e1b5bcc0954be3bd5c17a468 SHA512 14de8aed71eee67bb1b5f7989c18e16dc35191aa762a4e30ffe916161b81c1397f284d6cd8a497ca9e639302b663c388d0ddf3bd7110bd512021232e63e84086 WHIRLPOOL 79c152ad87dcabe09329c463bfd026d69c2d6bd8350633baa4ba80106bdf90487ab1b25ecb5eb0802752e65e786b4f7c1b29b1a2b9b6863e713d7581809a57e0
+DIST texlive-module-pkfix-helper.doc-2012.tar.xz 641432 SHA256 f84ce630e0e1bedd97b2570e4f9bb6eff68df8bfc93fa10770b287802337f4f8 SHA512 cc19d846abd9352f6b263c6c13716d0d8e2ad6a8ca0d8ab140abc8521be70b542f2102673d21774d3b44a8a2189ab7368604e2ef39e4a70d0c8e235d06a6a216 WHIRLPOOL c62eb47b2170f09bc4ff4fcf725f5409782cc90277e33285e5441ebb9d2ca42a0c5174412421df92d39c949ec2fd4ffdcf94aa3c397e1a8100cc510ac7ff0b47
+DIST texlive-module-pkfix-helper.doc-2013.tar.xz 640356 SHA256 b6e6c876843a76450b316ae97fa191d44f786d51314b7520366ba9f691c9ed7d SHA512 b3ece470f5f6a308617b0ae3a8a523dd3b418ca2b5e0a487a97f22c65219f722c6a2ac6ede628611b880a2da2c04db0cd85ba33d7b4c7ce6fe0f8d87777796f2 WHIRLPOOL 0eccc6e07eadaf43a010e24cf603299303f42d7407e98438be60c0898189b95ca780bb1fc19ac23c2bbbb54002d9c330e9617469ea99103ad67dac94e0aa20bc
+DIST texlive-module-pkfix-helper.doc-2014.tar.xz 640356 SHA256 643b30c14e1d1f13ff060bb46f3623ce0d26194f00e52f2449c34fc2e544ac9f SHA512 55686b1f4b653970a7b8595296bc0916c8c88333c63e47d0219e48cdb84cd3fe0aaf53b9e702a845e1bd0334d54022492bf30c31a239c53c86fb347ae93c5898 WHIRLPOOL 4467764db53c6134b881d493f63d0f5c1abcb2cc6b0159eeeb1e797d5ee75acf54a176d9983bc63bfc1ffcb4e4c3810284d8d9c035aff05bda06823d6743d2cf
+DIST texlive-module-pkfix-helper.doc-2015.tar.xz 640356 SHA256 6eba6f396a5add8d9413ec5b2c3419d010bd674f2be51ff6569a04d999f93454 SHA512 83bf6aa63691f0b21d426b9d8a652f4c1b9e8d1318e4718c9dc6157894899ec4eaffedd744334225961d647eb00e1d6190d681f8dfb59aac1813db895eac1514 WHIRLPOOL 3e821fb0e781b5b157b7e7e26b66bd180c76ba074ee31d5dd509a2ae9b6e2948b21acc13a7b5ca323e18d9d477421bf77e746f2355250bd2cc91f82f2fdf197f
+DIST texlive-module-pkfix-helper.doc-2016.tar.xz 640356 SHA256 133b049d853d6b0d8ab15f13362a1cc3649d611edc32a09300899c8f18a2e216 SHA512 18ae4f4ba80d9c547105f8491fd4d4c70b10f76d28ac36f4a7fcaa6c5c1af4663a20c61a0ada156e21203d269902814ddd8bba1d6439847f2f76d29593da0eeb WHIRLPOOL fd9f3ff19b2cc87aaedb5bc170d10973a6d0be756c7295c692d4b13f7aa62ab6278c16bb65cae321e86ed966e11b2999cab79f9d1b4ad7b83fd68a0b8a777810
+DIST texlive-module-pkfix-helper.doc-2017.tar.xz 640356 SHA256 a18f44d822e39c6ae388352a70970e52706676f19fd713d64f1b0031c0e8179a SHA512 9bd23f5fbad0899936b27d91de75a248b304ace9314e28e9e4278d482545bb7cbc027b7f4933c2f868ce2c19ac3eb74527e176c4f648146613717de36488f7b5 WHIRLPOOL 58f14bcdec788883d9d728468fa0aa12f7c54bdf45709a7c2e5e715273dfb23788abf2e2c12687c2bc4805ece235b0ff1324a36aeaa81dd9e0ae0783a02c34dd
+DIST texlive-module-pkfix.doc-2012.tar.xz 4372 SHA256 c24ab52d1abb0fab5423217cc7a186550c29f0039de951dfcbbaa347c136ede3 SHA512 69ff250d59bf212c97aa3f5f99d17e4a0c273da5bf79e29c5925abf9f91cb22f6dd607b2bf29142d24744b9e2bcfce1c0e516ae205ab67272402d27205e6583f WHIRLPOOL 0b81183f4bf1e1b10428a991871988e1b7871af63e39bf4b6813cebd5e5ad349185808b76309e0b378f795475d8875c99a76072a67c7f35cf3a0b05971700492
+DIST texlive-module-pkfix.doc-2013.tar.xz 4372 SHA256 c24ab52d1abb0fab5423217cc7a186550c29f0039de951dfcbbaa347c136ede3 SHA512 69ff250d59bf212c97aa3f5f99d17e4a0c273da5bf79e29c5925abf9f91cb22f6dd607b2bf29142d24744b9e2bcfce1c0e516ae205ab67272402d27205e6583f WHIRLPOOL 0b81183f4bf1e1b10428a991871988e1b7871af63e39bf4b6813cebd5e5ad349185808b76309e0b378f795475d8875c99a76072a67c7f35cf3a0b05971700492
+DIST texlive-module-pkfix.doc-2014.tar.xz 4380 SHA256 c5dba038a50688e87ada8dbcb1572c4dc0fc60ecc7c2726a85aa0eaab48fb790 SHA512 6af4b5b73fab6b98b0c81ea698eef4af9a18798e719e8dcceaac9df11ebd5520d0c07944158382dc320cc96e12ae3cf596a3f2309c4e7c7d244bfa4ebf306e4c WHIRLPOOL c3d91d1c09811def06e71ddd959a825d723a8a9fe1f837128b69f55796bfd2c4d5f12f86208a492624f819f47ec1ed8205b18a1a68fb4a863eafb535bd827e7a
+DIST texlive-module-pkfix.doc-2015.tar.xz 4380 SHA256 f8a3d43ccd4ba565a0572680ddeac2064d7ac4ce03830106a52b941b4b84b5ef SHA512 c2f0f2d774a098ce01bf74d369a0fa59966152e787661dbbde8496cbeb4f84dfd4a3ec9046d122e704080d1d6e24e36a7bd2ac7046eabf4bdde39708988ad52f WHIRLPOOL 535162fac393022cc759ef126bda3cef6b786481679d3e553790b61f1c6100d12fef99ce70d9bb4e0c7c5e42d63fcb6507e4eb247f88229b77227d7fabb77f94
+DIST texlive-module-pkfix.doc-2016.tar.xz 4376 SHA256 e9b80a0ca05ed50556d42bfd08cf9a7b007265a7b0b6c0847f6c9f67eb46c378 SHA512 209405747fd8faa6fa5b5c109bfadfb3dc8c764ecfbef044a4bef219f1a31d06efa6da205e1b45bdbc35e36f283430cdc0610f5a7fb9692ce1fbab0307e4e4e6 WHIRLPOOL 3ce4e07c7554ac2bfb02bc64d48f18926fca3d6cc8a1693c70dd2f0f99fb45e09f0483ebd9a08e689ca9a558ae08c0c3f88a3f9c0971a2cb41cd944090f883c8
+DIST texlive-module-pkfix.doc-2017.tar.xz 4376 SHA256 e9b80a0ca05ed50556d42bfd08cf9a7b007265a7b0b6c0847f6c9f67eb46c378 SHA512 209405747fd8faa6fa5b5c109bfadfb3dc8c764ecfbef044a4bef219f1a31d06efa6da205e1b45bdbc35e36f283430cdc0610f5a7fb9692ce1fbab0307e4e4e6 WHIRLPOOL 3ce4e07c7554ac2bfb02bc64d48f18926fca3d6cc8a1693c70dd2f0f99fb45e09f0483ebd9a08e689ca9a558ae08c0c3f88a3f9c0971a2cb41cd944090f883c8
+DIST texlive-module-purifyeps-2012.tar.xz 6204 SHA256 4ce55367dcb2fed6ff4eece633b49c9490639d9fe69f178ee5222e821584bd7f SHA512 894fee48158002532b09b1a56d4bd115053de156b3886fdf00c43e3da737ffda7c7f0c1d250bc5637c28ecd47864b0982357d51a06512ecd5aa68179a8ad992c WHIRLPOOL 744251218978a6c4f36dc05ebd21bcb30549e9fda91712f1867728c182ac4e2493d7d0e8eb9fab3f6356be8d502caf8eb2319d9f0e3850923807aabb94539f2f
+DIST texlive-module-purifyeps-2013.tar.xz 6204 SHA256 9215449622f16afc222b3b4c368b2b4ff6c9358661eef2bca9896a9184453700 SHA512 353b0ac77f06a63401cd9ed721a3181f5a0c7602c5b04bf114eb5c4f4666c6ce812f170797b89426bab1be938e68c145ad610534f9c165fc6b82ee7d28017548 WHIRLPOOL 831c47ea96f2b6e0379c3034288110813919358ba66eaaadf74140b8df0a2a243cb8a3449b0644ea1ce73204804908564cacc354f47408db1ef204295126ec14
+DIST texlive-module-purifyeps-2014.tar.xz 6204 SHA256 b42ef7edd054bdcf376305da8aa118ccb38515753d12c856d79ca7b0ead581c3 SHA512 721aaf1baebf974959ddc5e277b7cae4abdbca990a8cfdfdadab751be81acccd30777211f5e0d38f72a304106c196dff2b11694d3853fee882d984189139f739 WHIRLPOOL c7dc7363c5687416c4f3785d4fcd560893ea5e579faf47efd61360286d4ad1215b561e73dec3a96bd0e429761a6fd6fb3c44034e12824b19ead2faacfb7a3896
+DIST texlive-module-purifyeps-2015.tar.xz 6208 SHA256 93c2f622590ee985507a80470f116bcfc74daa7bd1007efca72c2ae22b777f92 SHA512 5aa0024e9aa4e7738baa7ad80b69747be94c6eb06603ef07c6adda0f97512d8ba11d3f5512551dba958d2826138886da17109cc74cd57e19e0ccd47408d60c77 WHIRLPOOL 33816f4bd1ed27782b4313bd761f948493f200ab95210f2b75a889a5eed725c4c5feb2aa7de278ec3783284088962d529ad190f9e5126379dc3a049ad7a23e3f
+DIST texlive-module-purifyeps-2016.tar.xz 6212 SHA256 7e45277eb3cd77a9f50a12dbff3037b2a8e72d257af1e4e2125c17c87bd4e39b SHA512 7bdbbab789f3cc29fecde72949602efb5a3e3bbb530db6efaf653e44560b8a2b2ab839e50f7e8f96eff3f9bb9d210749814452ab589f1fc44c814d9911573b33 WHIRLPOOL babeb9bf3f45e1867f6fe51b13da6fd31a2d7b04b4a9b7bd123c00a1ecab971024f237e35a8883a2d7375944986edbece5d9b9c36774e6a1ac6c6c82130713bb
+DIST texlive-module-purifyeps-2017.tar.xz 6212 SHA256 faa3bf5b57fa195253ced053a1dcbeab609f4c1555bf4b97cfb45c89a2575cf9 SHA512 28561a89dbfb895180d0112fb39920c0da0f52830c6a1389afcc080d381c70ccdb217192b2b154f0f31611c67b16603f33c69eaed9d8e5d0571f3886e1481817 WHIRLPOOL 1d842016d13e7b0ad0780c6f9199b132c88e089d4b07e4aa72b2b4623654de296234c7accd79acefac2082f9fcd048a3385d21f17e9dafccc4f7b78443bbf87d
+DIST texlive-module-purifyeps.doc-2012.tar.xz 15056 SHA256 ee7c35e244cc480f1076aaebb33e04b67f9055ace62697217e97dae5321c7094 SHA512 bccca2497560e12ecb27f087d43e7fe76f2fa137aa3ba8c0c6f6a1c45148c7ec679da9593bcb38136b8da2c00708419fffb1030205db610dcb86bf527f99b101 WHIRLPOOL 82701b317aa5a8bb27cf84a02151b69cb84a44baec421751492520949f3b69bdc788676482836f7c2296105e7d08606074810661a39401c93760dc34178515d4
+DIST texlive-module-purifyeps.doc-2013.tar.xz 15060 SHA256 0ea191a506f6759bda6f1f41f3f5deff8e08a5688084561ba7fc39075b1f676a SHA512 4fa63c3e9f10753ec7afa38ac8d01cd00a0ef0b19fdeaabf57aa2d663fe38d13a24c8f34d26c5eb9ca9cb84f4ce307df6e381f39ec3076e19523d98d0b544218 WHIRLPOOL 77dde7b43d0bed13d02bc194230a021da4375a69fdf80138397914a8ddf7b737c8b8aca13b082f8f6365640a929ea4cf29fff0d2decd000fbe8dcd5cde73a3cf
+DIST texlive-module-purifyeps.doc-2014.tar.xz 15060 SHA256 792f62ee6492624bad43b4550a40fb82e3eaf15f6fca82c36dfaf87245837e0f SHA512 0c86716a7587fd86a36ea139e91cfd0e8f45d5659d4382a3c85f7ce5467f47d2514b736b46166c6ce8ebeb539e576ae0f9530d56cea33d5b84232b633cf0705d WHIRLPOOL a4341495f2494da1d618d1c314ddd6bca6305299f8b6ad7d921cfbfd3b887ff635e0c1a4982b5caa1d367ecfd3e96a8ee2210a8dd0ebd869511d70a735659c72
+DIST texlive-module-purifyeps.doc-2015.tar.xz 15060 SHA256 fb033734016977aa3be7eab5e57ec203338914bbc066c20459cade02421c598e SHA512 a6c8b2e6893dab6147a94f11f7aff2e62d0e1c85d75cfa2e588912f59a26e127a463b1f975d145f61b37defe4743a0d8c24c89e332cb12676682c56b5d5af718 WHIRLPOOL c7985498b6fa6ffcc68127fa5a29d3031166ce31f71bd57de6aed76da7b2f607eb21c0dd3b499ae19179fd8ec6fbc200b6e8be9aa5b9d1fffc514bd45362a100
+DIST texlive-module-purifyeps.doc-2016.tar.xz 15060 SHA256 d525a0933d9b0d888851efbd6b2763907662356b99819cbe44ab710059d75329 SHA512 a169abfa97666fc166d6b15151f7dcc9c0ec82d25ba0bce15cf21abb4bc818a52ceb29f31b2516fdbeaafd69d4fb1b729aa76a5f92eb1f4a9adf0903d724ab47 WHIRLPOOL ee50a60ae67e146bf4ef90a15f3acd7a38c80e1b653f0fefd3ab29cdf0fa3c2b192254eab0b444069611d03c7b7b771bd58278ded3a07c0082323f20580e15d9
+DIST texlive-module-purifyeps.doc-2017.tar.xz 15060 SHA256 0b146aed7201cab4dafc9335ed55c2e0ad6125a25722afcd93f02226da8c7412 SHA512 666846fdd403a143a1756c271c02561576c1ba314fa02400156914baf694d90d461c621bd2d9eb1491e498bb92a4d68e1d69bc20e35d9aaa7440bdc4b76b9b07 WHIRLPOOL 9d8f3bbe6fbfd70a427cc43fba23a539d0c939e8065194b8c775a918b486ab011111492e68b646539d32e1307821c72dd9c8f60f1664b8c774ba0b24b66b0bb4
+DIST texlive-module-pythontex.doc-2016.tar.xz 1525440 SHA256 26132e880180dc186010151bf59d6c45e5bbe47137777db94fc6271faef4984a SHA512 e8043aabf1136484b95acc125545e7c90e08d130392916e0be1af226f8dc2c91a1a5a956961bd1f2717c7f0ea20068ad6567fbd854bad40f21fbd0512d46cc33 WHIRLPOOL bc0bd96735ba9c457ed488d10f6ada13fe7b54d1981a19382b526553aa78078c90be0f84ffea95a3fb15c85da3f3b109d61823018643a8929e28f6f5f91cc3ab
+DIST texlive-module-pythontex.doc-2017.tar.xz 1525440 SHA256 cb59c99f899a1cb3f7e62f023dcfacb27f0f6667750b1144c9a3a591754d0aa6 SHA512 8ddd52bb6fdd93510120343222234a3f8dff4497037a6529017437353c5d409572f122f5b1cf78088d554986f1694d8674cb7d8991d90683c197a4b08c5bb844 WHIRLPOOL 65effb43b14d4925d2440045005df0911f83c56bae73b3c003b5dcb8dec8129c4798d0c3484d4c980cd580f3f51ec30a7b5a3271d84ea2cca20298c458bfa4ad
+DIST texlive-module-pythontex.source-2016.tar.xz 81912 SHA256 1c9e17b911f282b30e1c0f76407e3e5c50ae3c7b589834f742d478855ac559d5 SHA512 0ccf641e1e6e831723657d41b52655211a58908337e55487e02920ef1b80d8eb99dd2d21cb9d2b094fec64acaeeb35d94fe3c24bcd92785b61a23804a755fa5a WHIRLPOOL cd4ea62c3491edc8848280f90ebf6b97045c43d448dd2e9b7afcc8910ad19e1325ec59f04b91bdb4e7ecb8b16458a20b7d7003abbe5a72afe561a431d7c60776
+DIST texlive-module-pythontex.source-2017.tar.xz 81880 SHA256 48b8454331b994c455be9d3be378e5f75cafd59ace8bfb7943b1204faf87e97d SHA512 4e05da64a7dc831a169d891aae6202cd1e9c72812838552a23dd3d43b961fc39f2db30080a61056b950df730c2144ea82526255aea213c8793a4e629c6b4c4fb WHIRLPOOL b6075fb9f03f8a06c21752caad71b1ef07b9e22490fd6326bcbb7518e74756a599656d4e07b7564f7ffab4e2913d7416d21e5265aa0d41663ed73f45f1dc5a48
+DIST texlive-module-seetexk-2012.tar.xz 17752 SHA256 43083988b2e804e3347c01f83aa821c97eee585be1c47d19baf93adb8aa327a4 SHA512 79b5e3821b96c3e1e8d28bc2fc5ccff71f47f8de7cacad62a372d193cf747dbc2de6cbd5483410e941d9144b702d85640994d074eed1c6d9fad62dcff85402bb WHIRLPOOL b9aaf862da61078abc7c75ac8d494af19e27d0a534e30ced3fab86fe2f956b3aae15781120b94770505e34c0e3778ef53005daa62ddfe43a939f7de1f5ef35eb
+DIST texlive-module-seetexk-2013.tar.xz 17936 SHA256 cda49a910151ae3a82704de772f46b05c0def7114a11af4d2713ee69fad84d0c SHA512 7860e542e766244a34dc6bb924fc7f40a353ab6385e5743356746862b94b3b1e93425429b72530d5d3e3e947445b4191ac495b814a405dcf91c8ee70c123f227 WHIRLPOOL 7b871f8c5a33e08e053f8adccc8b5d52262442ba6359482b15c91442def06921d0db674fa3fa126d86d3ece420671ca067d224c357e4247f80a731e0e1441849
+DIST texlive-module-seetexk-2014.tar.xz 632 SHA256 56e14799434dfa3a23fc25373888cf8b54dca4b65fe064517dd8dcc89156cce7 SHA512 949a630f796dad3336f2993b76033ed0e999d45843697c8393f1f220415fcf112e97f43301eae907cc21a215f6eaccf86666799eb58e710cd89cce832f781611 WHIRLPOOL 5e023447c02ff9edde8024cbd83aa27fd4420d05a62c50c968c5265022c536a213a7b57808e10fc8850b22ea690fedeada25ff756a431b6111ea42ea58689940
+DIST texlive-module-seetexk-2015.tar.xz 632 SHA256 628a6187902d2fac23da0e1b2fa4f38ef346f0879c4cc801be2bc00b4a0d056d SHA512 75e44ee50c51489356b1bec626ffccfcd93be80ef21125c3fae63c3a3d4885fe1db4e8bbd2146cef7c5e09b752bb054a22e1f18a3be1a2279ff8adfc3e24c210 WHIRLPOOL 7b066f47e4b5ef6e6138b43965afe31b1f7b6cc5721a6f7c0201874fb2b44a0ce55c6f807953ed5ff9c51e65b8779b35437000916f99849022351f1753cdf53b
+DIST texlive-module-seetexk-2016.tar.xz 644 SHA256 256be52decaffcf983ffb899a8dcaffab6fe76d8b1a7bd7a3119ca621f0ef145 SHA512 35e63104ef1b9358620a9b18db3eb3aefc84c26e26ee3cdaed3ba9bf818592fede2f18cc7cafa55866a7faa98d358132941245587f993b0d25246ab68b9a0a6e WHIRLPOOL b7eb8f94a252b40fc447ec49f677bb139f1c67e7bcdbe46fafe83c343ddefa2c94070b3296fdabef1ca4ab8752452a93043a0011fed5d2e34470c5fcf87f397e
+DIST texlive-module-seetexk-2017.tar.xz 644 SHA256 edae8a8390559ce27110132e83cf467bf0b8b4df25eab5f4fc6e0162aa8a8c43 SHA512 f18b647cd991c862a1e27a0d172d294918cab89d91a00f6de33858b67f07a2d1279d3b343a711b20a2067b631fbe7908a60b613f22a475e95bcb90c0ef1604b5 WHIRLPOOL c695ae03722c7f6550faac8eb957a1e1e51645a831778bf2dec61b0bc96601cf86bda0d62865d5f9075d0fc8be339e0ca38ffa3f741371585d69694221305c42
+DIST texlive-module-seetexk.doc-2016.tar.xz 69192 SHA256 ed7534b2c78132d674c30c83a3c400358b08294a7e550aba4baaec9f31c59c73 SHA512 db06fe4c45a4f6402c383430d94b7833221fa45e149d6abcfc0ef7d362fda9f816738b37d9f1871e51de9ed214f062c75ff1f272d699614699c5e1c36c1d2cad WHIRLPOOL 298a6db227ce98d7aedc43f26156f55643fb1b9e4b44ee2db01a380c5f02ad40085d0a66921ae226bf5accdac777ce60ea0b1104a8eceda9687e32d97dd512ea
+DIST texlive-module-seetexk.doc-2017.tar.xz 16780 SHA256 986ad0811f95a7edf574eddbe63b87fdc5878e089139a7bb50278fd0fd8f4d55 SHA512 8d0f79f6d4528d234c264752ce27944f70291d299f6d7e1a254537b0acf1a296894d8f961efb8ddea6130a1faea0e400f99456bf15464e5b08a26a652ec9df94 WHIRLPOOL 22f336fe988308bd4a5497b5e86c7893a0e320c477748f5bcba8a965c01178f99a2ae3ed104752637fb91abd53c23076b2df86a2736904d42a0a6a7df5aaf1ca
+DIST texlive-module-srcredact-2016.tar.xz 4236 SHA256 2fd513106fde18b5e73bc034cc168295f5d2ad62e3d7ae992e2699f396a8abcb SHA512 f192de24c480a97a17784b567ad29d592da33a0e2b1dd56800b17144dc2e23bc7f6ee51d0f36eaeea037eb30113e7c7df1f2ed430c06fadec6957a6c9f54470b WHIRLPOOL 0618182aca4cedfef1213fd808d6585c291e3e8780eed33d58b27ca3e228760695d58f8a302579d4bae2e73fd7c13975f022ae79c2adff7837b0f24c3c2ff9d0
+DIST texlive-module-srcredact-2017.tar.xz 4236 SHA256 2fd513106fde18b5e73bc034cc168295f5d2ad62e3d7ae992e2699f396a8abcb SHA512 f192de24c480a97a17784b567ad29d592da33a0e2b1dd56800b17144dc2e23bc7f6ee51d0f36eaeea037eb30113e7c7df1f2ed430c06fadec6957a6c9f54470b WHIRLPOOL 0618182aca4cedfef1213fd808d6585c291e3e8780eed33d58b27ca3e228760695d58f8a302579d4bae2e73fd7c13975f022ae79c2adff7837b0f24c3c2ff9d0
+DIST texlive-module-srcredact.doc-2016.tar.xz 384384 SHA256 1dff93c01a3f1b0cde05c034968edc54e7ed6d609637ac341d60b57afaa4ef41 SHA512 4e923a6fe601698931ce1e6e858555c87aa3b7f9d8ef5f71482a0fdf498c6b0d15d68c4aa61765cd6ebbc747290a087dd807e0f5cadd2855505f230c0c192a50 WHIRLPOOL 56e3758de9e838c49d2a80d78daaacffcc38fe27a157d71bf1bcdeb387e10f63e54047644ada4261321b43e60f784e1959aec289e7391939e1d252b17651a2c0
+DIST texlive-module-srcredact.doc-2017.tar.xz 384372 SHA256 27e0f065237f299b19c4c50e6c39706cacf8e98437037b01ec9f23bae258d2b1 SHA512 fbd5c700002f3d7c72bb127b24f13b4017a17b69eba9897e1a84d65fbb5123f36c56c06a8ab35fcdde7e4c13731cc5d92f2f3a92734bf9c4e77fb6af14622a16 WHIRLPOOL 8baa17bb788c5e5ee41d86b7a87688b7f414cd305e87f447e509bba2b37ecf48db9180e4120d06daa08a66811de6da4e4c9a360a2256b53e6977a574b2b272a3
+DIST texlive-module-sty2dtx-2012.tar.xz 7408 SHA256 2a4d2fc1bc38306e25e3b0e09b0c941133e2397f542d8462aefa18749dbd5df5 SHA512 463c1e3beb66186549f19157e139b38ee239593b0f342450aa6fdff7db21d01f62e0621485cf76dbb4679a58d8aa956a8074cff5e143d1b972dadef11801a1ef WHIRLPOOL 4ef82c5b7e416d199b28a2dbb2b81c3986765cecafdc15dbe8cf65ecbde9c75b8031b5832c4830f5feae24c748eb520a59bdc618368293c93c10024f730dec99
+DIST texlive-module-sty2dtx-2013.tar.xz 8652 SHA256 4dea9f201699907700fffb657c3be855014134bd6b41495d2d0b707833d6c1d7 SHA512 0252cc3c611cfae2669e48ab694e9b9900126f385087f0b629d25b2f50a3a5706e624116a14e9704fcf3c694da1beeabaf14fd047a0dc9c21a86596e259fc7e6 WHIRLPOOL 6e35bb8aa03b81e991a526555f1f97e15c60bf306d4cfe1a5b185395bce9d3e6a5f22612ebb3725d2b2cd40f40a5896c27ca37571d361bd8ce23a96cc54b102c
+DIST texlive-module-sty2dtx-2014.tar.xz 8652 SHA256 8819c23618dcda2aaef8b206ea4fdb5ca8e1d7844b04fb62619129db4bd3aadb SHA512 32f0954a1a31f6188ab934e5e6e168ea181e72776a78e51c30c41f098f6645f955d9d96775da92eca04499d16c88b6015a0e0ad3a7e05987f9ba1dbbec287973 WHIRLPOOL e992fed766bf95acac1a394f8469ea9e5602fdf82d7c32893d1aebe11de297a279e3431218f194bd5922f0fb21eb1cba1373713331129a79c8c7222ef7a5e1cb
+DIST texlive-module-sty2dtx-2015.tar.xz 8652 SHA256 a42ee958ba64d01f25a974ece1942f28a9811e933de0a4e7132ec7c2bc9699df SHA512 d0bd0ba91fe59e968695350eb201135f416448e0e0ace61c708098f530ec6a3e16fe48a6e5a0ae24a8bffed3a90408a0175db4f7cae1f85075d61634a1bccae0 WHIRLPOOL 0daa254f590cbe063ad87bfd8f4b1748da2a0df3923a7c50bd356cf9346bd9b2174fdacda2c79302d55dd092eb120592ba580dc9b261d64cdcd5afb380203b8d
+DIST texlive-module-sty2dtx-2016.tar.xz 8672 SHA256 a941b9b8b6be39f2f98173114b11e908c287f34fb880bd6e9eb3eb0dc127141f SHA512 28858f261898d682760a3eb6f381f4b4d56c604d7bd471ce1217a229131110a7e7c99b22808d48999b86d68c801354018e75e56c763d629e0aa8c574da2d164d WHIRLPOOL 5ed15e4d39f0ce3e425e4680a77355de6775a04474a3efe8e90f80cfa11e3d4bafef5e260cfb6dac324c68da11eb502d82f6e5059920f973f613b8bcc60f6f51
+DIST texlive-module-sty2dtx-2017.tar.xz 8672 SHA256 a941b9b8b6be39f2f98173114b11e908c287f34fb880bd6e9eb3eb0dc127141f SHA512 28858f261898d682760a3eb6f381f4b4d56c604d7bd471ce1217a229131110a7e7c99b22808d48999b86d68c801354018e75e56c763d629e0aa8c574da2d164d WHIRLPOOL 5ed15e4d39f0ce3e425e4680a77355de6775a04474a3efe8e90f80cfa11e3d4bafef5e260cfb6dac324c68da11eb502d82f6e5059920f973f613b8bcc60f6f51
+DIST texlive-module-sty2dtx.doc-2012.tar.xz 2352 SHA256 cc0c229ee78fc845e3cf290ec51bcc97d7e42656dcd4bf15bd84a32f3257fe01 SHA512 281b89240fb06419b3cf6ca3bd760ea266af9ab2fe4181522bb0aacbf9f2ba120acac9aed35008655c1960831f7943f3f8397b12d2dd2185ea80f618c4835c8b WHIRLPOOL f0e7110d628c06a5696ab2489dc9b4c74dc8ceba67bc6fb3671f9dffb91791be8e53743d75d53f03172a28a1b82f476e96f6ee37a8734b3d2028382a710f0398
+DIST texlive-module-sty2dtx.doc-2013.tar.xz 151548 SHA256 1a28e46d2a5f6b705cc1c75c715306aabb3c2d6e0fb02c2977fc521d3eb803f3 SHA512 2c1213870ffe0f35114e392f8fea7c6a6fc167528fa1d59131fac23672f49b1109ab8ee8b0105e3d0b1b2a482eb278733ee8357c6a3d266eb492f5871f7b6e76 WHIRLPOOL 8c7c3156d94fd978e303becbae2d682d3b00eefea5ea4394d460c5cb8ee3e7fd1c8c9318dce0917e98c35d90b484d4059e895143677eab05191e316cd41b46fa
+DIST texlive-module-sty2dtx.doc-2014.tar.xz 151548 SHA256 c210e175fbaf8368a76e5bf5e18d1469337af3b87924b18cd9479839cb339718 SHA512 5a0633a96b5c3b634bdbccba4ffc178cef6ba6198a2c539c81841b78e437fb5382d61b98a8f8a5e59e6ec5ac6a9297ebb39eb6836e385f9d0a3a1b085d007cd1 WHIRLPOOL 4f82b88a408461cb4c26f7ad754862125975bb01630665201f2fbdef4bcf2d9a68dcadf45b8ad564d675fdfc893eeb092a48737f1cfe87b7636808dda9e17adc
+DIST texlive-module-sty2dtx.doc-2015.tar.xz 151548 SHA256 3d28c9a874a1cc617fa0ec9ff8ee2af538babdc3f0f42e8a6b1c5a6ba2d173b4 SHA512 f59c3cbcdfff5923f73cf8b81c704ad66d3d356a0dcbcc5ec6566bb02d90af53fdd34f55cb9173f510166114c3d8aa842470a8ed5d6f5589ffb8d5c64b019e18 WHIRLPOOL 30ce30ace66f34383d10f7a83178b9571458d7f898074d32faa2c15b5f50ba17ae8b55651949bab35124be55bf36057be9c0e4a6697e4ca53dbd67c32b4c5ee7
+DIST texlive-module-sty2dtx.doc-2016.tar.xz 151548 SHA256 ce3dd952b160c05da3a219e76a4d8289870f272b39bbe4097bac2ed79443b282 SHA512 f472e1b64d68164aa966a1ce885824c2f9369a48bf54a660271ffbd669f73ad9c1b21ab1db69ce706815275db31ea427eadaed245c510a96ce162b89830658c9 WHIRLPOOL d65594981feb90e9c2b5f1c02ad92a9ae967c8c1a7205c9ac07e4ca6ec181db7a4b1777bf8669fc8d8305d833eba5a5e62212564430d8ae6ce5f1d1b29e89c21
+DIST texlive-module-sty2dtx.doc-2017.tar.xz 151552 SHA256 f0711bd8a0b08c837bcd87ccc1f346cbce1f46cf290d5ff754f5673194a7d85d SHA512 0323a7d039fdd1a3f623418c5294a5e1193da458b5a3d955c0a20551fe8928fa81461d76de1c9b0c1b5020156bc1e56a571439fcb83241e1f5ffeba741988b10 WHIRLPOOL 0172d96541f37adcc09d9108b44914b60f5f098ef950d9f4e07cfaa6df263cfc5b2963483c31ba0982013fa5d5cd7cfdbfc6ad76ec353fe41db94aab76547e7e
+DIST texlive-module-synctex-2012.tar.xz 244 SHA256 91e8a2c3e58e78b86ea8e8d468987689ba2a3e6f8467f251dfb546925326e119 SHA512 55121e02cc9e40b0ef92002e856dc9c2e7d405d0d27da5fe86f78262c68f0999c90f514ed4447d2ea6abb93dd12c97d9207f941ab5bf4b80d52848a1fc9cf82a WHIRLPOOL 6303d9c5eb790521a39f372ac9e35304af88ba7ebeeddc55f9ee675f32f8d81747b061f1fa69a53e75a31af9cfc65abfab58c150efa220d1f1f342d86d38b7e1
+DIST texlive-module-synctex-2013.tar.xz 244 SHA256 3c277b12446daba555b4ff8e6a5d72a6b683d0eee24fd9d6a8f5865be3558133 SHA512 62d5d098ff961d3c4008719f3aa3917f8597108eb21bd0989dbd640bb01f8ad1a9bbfd5f9a12cff634ebb7311ced1d3bb29f8b64e1b524f1197d8b7b0f521da8 WHIRLPOOL 9b38623385ab3c13d6c652df3293ae505d41542cb44b432fa73d926fefb2ce007f4c55dabf600f7cbb18047ae68c5c86a72f500179169074cb2eb0286e2160b2
+DIST texlive-module-synctex-2014.tar.xz 244 SHA256 f82ec6fbc5bf21cc43c2beea0d594fdb98e5f6da5f09f0662fc1d17cdf446471 SHA512 aa8e2a4c5da2eff3c56b566955ed9a2e3b5ea38c75482b937c4b456dcdda399c87c353bd22954a4b004f99ecfa2300698a10e38dc39df7a54fdc90bfe59d00df WHIRLPOOL c33408bee9af439c8c42c3b258ea313f3bf6bf49f0f1167831c6bc3f33da5c7a3d4f0d608f534024a4e20cea68fd6688375225ea9cbbe9b5dd7977c519f93903
+DIST texlive-module-synctex-2015.tar.xz 244 SHA256 1680f59733ed37bea70c948b415f87948d304d118a6632dfbd07007df303ceb7 SHA512 41f9cc29c14590796163a755ace7d4da29c7529dc2ee0a22c525856a1138ff3b60bab281958f6e10d08a48df6a0efde54e71be380da76df89309d866447f2c50 WHIRLPOOL a0a02fb773a48270f5d4ddd58a358145c2d6476e7c9cc7391c21da0031ce1fd59870e39a029b5d801a2dde017628c7662004d5af90ac1c982e42d93d0c6e06a5
+DIST texlive-module-synctex-2016.tar.xz 244 SHA256 7c5561e80d83803eb7f8ac54da2ad8401b52ed57ce00a6ab670b88f5604c515c SHA512 f6c0b41e5691dbec92aabdfb1e84716766cfd0aecaa260d66014f3bd7e08da57800978b3bf6b892cdb88ac5c960f898fa836488883a7a533fd98d48dba58ade8 WHIRLPOOL adbd370a4b30dc50ad35116261c609c34430e25aede903d70d965fc740fd6712b9e55e9cfb685cbdd2e893a986c082b6b526f3f029824583421fb9a5db568904
+DIST texlive-module-synctex-2017.tar.xz 244 SHA256 7c5561e80d83803eb7f8ac54da2ad8401b52ed57ce00a6ab670b88f5604c515c SHA512 f6c0b41e5691dbec92aabdfb1e84716766cfd0aecaa260d66014f3bd7e08da57800978b3bf6b892cdb88ac5c960f898fa836488883a7a533fd98d48dba58ade8 WHIRLPOOL adbd370a4b30dc50ad35116261c609c34430e25aede903d70d965fc740fd6712b9e55e9cfb685cbdd2e893a986c082b6b526f3f029824583421fb9a5db568904
+DIST texlive-module-synctex.doc-2012.tar.xz 10040 SHA256 c6755bb228c6a0375ff6f86597d5270edde9d4ecd339a13e3bc1be3db533b8d1 SHA512 58ca83e420a432f73e1d3283612eefbc66a0886d8942e40a2189cf19573a96b16b798d9b8ab0ac85f5b503c6895a0c54cd56067afbe579f5a88d3ae211437a1e WHIRLPOOL 2c594ba17072e721556403693b1d9725fcb77c7208bc685b3945377eb44348d8965a009eccdeb68169c3959349981d9186a660e74ca7451c346b3c10064c0711
+DIST texlive-module-synctex.doc-2013.tar.xz 10068 SHA256 7255aa230f326ea6ca0092de5b77951d1f77c97557850459942ba8543af0abdf SHA512 4f1e50a2d72901ec4f423509e201c5bcd13c478f4777c874910bb887edb885c6c2ee6fa71f4dad94425efe6e817163e5b18a97a34eb80c3222aed76b812030a8 WHIRLPOOL 0213bc8b43c3fef531427e853b999a992303c09ae27a30f4dcfa8a196577b16384485e452988bd02722f342d477d47e04578bd58c4327fb7afa3e1a91c2cb32a
+DIST texlive-module-synctex.doc-2014.tar.xz 10040 SHA256 70686be7d7836140a00d70eee982e8d229a7cb183f035040419519ddd29cc535 SHA512 863b1ab5d8686b1309581da1965d2d6b7a56941d8fdc0caf47d7a8e545cf6c2f31018a05c551fb5fb492f20421ff20e8924b1f3872b338768d0becfb8a16567d WHIRLPOOL cbaac5811bc572f5121100d0e8096286d8270c53652e8cca164f7e1ec7bb077e203dfee2a9b55bbe753a78490a6d5caac14f337d80abcea87b60f1704aecf86a
+DIST texlive-module-synctex.doc-2015.tar.xz 10044 SHA256 a30be0e456dad57a7afe80f5c2d0155542b940289ff529728362b6a7704cd358 SHA512 2c66e77efcba97280f3d719340e605d58ffbe7cdf75e034458107ec85c1dd76eb28e27962c17f847ea3d312d106fc59b0cb7b91e844cb9f5ce3afbe469a55311 WHIRLPOOL 9f96704898b06ca89b7a2ff89a6b4cba60fee806dc803681dc03e13eb7a9f8a60149b44006283849b457ee48ec5d84f0d837f8963ae0939f7c18f0d84b54f835
+DIST texlive-module-synctex.doc-2016.tar.xz 36924 SHA256 6c35f249f4a439994594e2ead7f3a008c5f8de954e6e66e50bae2e52ffbbe60e SHA512 7e4439d19f2724ecbe1c7d1e0f1d04199047ae29ef10beabe614e3689af35ed0503af736be3d65045079495173c651dad5e50d0e9a6f8ba9baf86836fc678a8a WHIRLPOOL 2c856565ae23a84f5e4c7648b2141aa089d227549dad8af048f67a54b54daa7ad574fbfaaefe25ad46e1f639039e21258c2c2829fae7c51e8fd10220bf072cc6
+DIST texlive-module-synctex.doc-2017.tar.xz 21220 SHA256 639119b2570a5a8b53b41dbeb6cd60b309c71abc9da85bcbb721f697132236d0 SHA512 1a2ae03662a4104f1b2923c9ddb5f63c3040f2f646128cf4987865ff72d367852580a15d01b179a14e9dce4efbab946ef78ee7766ca98d99021d0adc7cbc36be WHIRLPOOL 35a0f57254284a751cfb86d08f03848fd7e24f09f72ce356583278a0f1d83f1ab837340e5f66a4168dd4279e44a25092294e0047d6ac6633b3a9220ffff5a914
+DIST texlive-module-tetex-2012.tar.xz 28912 SHA256 955c31b297b55383112b83e1a97907bde4581cad9c33680e4cc23e4a400b09fb SHA512 5b3f72b0af4eb5045398a29dd343ab5a71d0336cd7f509e3cb48682d3c5e8d19c0d8e7d13ef43113d9354ce2461e6f6ceac700cec5e47db42bb1a1ea0504a00d WHIRLPOOL 95c341c3140101b02e7e880fe73f50317224b6ecd2869abe3a3bb7cc73701cde8673a510a15841de09a15fd803f9ea573ceea06cb3f89b9d7b20e1f76f9100a6
+DIST texlive-module-tetex-2013.tar.xz 47544 SHA256 90956c363b2348d815db8d51dc1de4c8b7e2a580e8df0034915f93541a92ba23 SHA512 62eb8c86cc13c40ccb6cdcb3aa509b75aa6d4b156b64f741c40709c2f1c7abad7456458a513803d7babfde78ab65a84672d3565091c108a9ea70dffe0152c2ef WHIRLPOOL 862345e7ddcd697e9bc1f2c3d8d9e204247af49908998dd9c2397a3a949adbfa855953e536344646fe342cdc5f0d69cdd444e9d2259ff7c4a42014c58fc5ae05
+DIST texlive-module-tetex-2014.tar.xz 51412 SHA256 e52992d5c083778019861b60890fb9aeab5591367a712edc3aa3e7350fef638c SHA512 44569fc813f09a18eac64b23c9cff43a62b1564a08fd68ca596d5a9079be3d3aa54c67ac198616615c52773bd54c78146ce57909c76df94b6de975ea70cef228 WHIRLPOOL 1a20872bbf67a8ab77a8700fc66623afdf5f2df0be0905feabfa132ce134bb18025148c3d68efe8d6c64227ca5c0db02d19f9de403cb01e9034c0c595ec414b5
+DIST texlive-module-tetex-2015.tar.xz 57300 SHA256 6754914b2ad0318341946f0c9cae2bea9e018f10ea2264d88895e798d3c9a33f SHA512 7fbfc89e8ea695afd1d9b6103bfde895075ed5a6445c0fe9f02d4eac9757ace5f871cb036d2996830bc4cf76f40d8291a7cb3f03e670fefe34f0b9ef586dda36 WHIRLPOOL e4f63d093406b64394a46c635fefe17fefec4b4798b2455ad68d6524ce72351c640be2d75543708d66628ffae64fd7b046ad8c288b1a886f962682f0e839a1ca
+DIST texlive-module-tetex-2016.tar.xz 59904 SHA256 65190c0024ad28f71d9366bec7f34e5f330588477699f561a0af4b6e66775514 SHA512 4f142ca15e3db93f6366f8529ab7f1d6778b20df41aa6b64eab37888b6cee7f8ae41a5667969bc42bd0f73c312ce6bdcaa1f07917bb3fa897bca3c2f3bfbb22e WHIRLPOOL 5666f8d46f2a40bba94fc9887963488ba1eaedc5d0e2d8e46d19c02d255b0d9b1a92ed31ad249bc7444247400306601df10c9a61955499df2421997134c723d3
+DIST texlive-module-tetex-2017.tar.xz 60072 SHA256 4d5521ffcdccf75abdc265cb850f15adc9dfce661778378ef6becab3f7b7afeb SHA512 22eade74858326f76f6ea22f2eeedcabc313e2e59a36a1a079cfafe7c9351953fb8e381fe9097110336dbbbea9c123a437fbd5e4fb9d7efe395ebdfe0c7d453a WHIRLPOOL 170c9da38735c6b0b3226af7f0a811738eb42d197db071cfd5e1d79bd2aac992f38689be28a13ca09b29239cfb15197b5d488974a5f7c3198b1f22fffea2181c
+DIST texlive-module-tetex.doc-2012.tar.xz 332676 SHA256 52df76e6f2ae85a7ff623b217d403093d9f7285b5d83f0da6e2f6c44c6f18bc9 SHA512 78564c72baac0fea6bf24a3b6a252324dc5c841b2962dd887536700f288f0499f4061223a7b6000c660fd95652a35773c9c8ca3a63c28b7cf8b15e007eb4c7c1 WHIRLPOOL 812540b4cd69c72e4be680249190d02c4c9c8d464494bf8d4be2ac0cb9796db7a3631b6db6d530cb0279b55ac3320fa1b8da3265ceb6a5c4ad08e3613114516f
+DIST texlive-module-tetex.doc-2013.tar.xz 340220 SHA256 b2c8817ab812f25da23fc7b99e46ee35cb2aada777c5c681ccfa47f07f0d0995 SHA512 a102f540d6237385e1a4c2ab18178805da48528bee7891c50b0d43e96c8dfdebf4d095ddfba8bed18dd5b820312f7300c8c23d14fd2883b4030a67514032a381 WHIRLPOOL 1f830d1fbf6a05feaa5c00c69606014896d214f95d9a33d8c26799ff1435644af89d13db046623dca2281d2810053d1d61c3e877df7e162a103ebeb0ecb2db38
+DIST texlive-module-tetex.doc-2014.tar.xz 340376 SHA256 652fa1ba12d9b466604fe88a90750edf3d542401895585cc5e6155aabde82b09 SHA512 47ef57574c3c8d96969c353afa8f4f941ec8aac992248241686b4ac00542fefc1b726336b30421befa5c981b1924be86988b36c6aaadc438082b5ed3423a09f9 WHIRLPOOL 7cb1dd79d6aee9ad0ccd34375f7f9bb968beb5e29cbd474d843d5b57b34f5f3f196aa636385c3a6da6db85ef2976ea19d6726396ed7b1d659dbbf3cec9ac88ab
+DIST texlive-module-tetex.doc-2015.tar.xz 344216 SHA256 a949782cc9c6d484ae4300e060d6b8b87851370eddb780f0d564cfc0b87fbf0d SHA512 02a4a10af8bab08034423dcb4aa4a7927468bffa097495c4e8de655e82114b0cc482b4f32476db6e4550d17f743742f0cc4fc58905175f8083da291656fadf9f WHIRLPOOL 9749760cdbbfff3f8046674723f941b3cf5677fc8f8fb1696ba7e8360cbe18b59ca304cc82e90026d1afc6ea51d2e7dce5e8f72a350a66300d091be542fedef8
+DIST texlive-module-tetex.doc-2016.tar.xz 521384 SHA256 6575e240da02fbb26df79e11ddbc75eacf36f7caa512146f89387569c759e41c SHA512 9db573e4216fbe026f1c2eaa678df718f6951fb7ebba71ff3eddc353fe4ce88332035a6ea678c4bfeb2a496d35d2cdbb10ae33915d4f3f91f52c83cab20a211d WHIRLPOOL d63fa41e7279ec620e11c0fc30371807c7bbbe366e7296ba5fbb703fa927e9eb5a6d8ca7bc64a5045d2317f26e50772a69a501674970dbbbcc4798c01745add6
+DIST texlive-module-tetex.doc-2017.tar.xz 348764 SHA256 0a744237652c88a195d079d5b1e80c39e775b26ab469f8bd0ff7134c53258620 SHA512 d0e83b87f9a844c9961bda9875f8812dd507e8edb9664fe0edb19a775f34cfdd3f096295f5d0c209ecd3c7ef4a11416601c61f0d4db4bef0297ee96d9ae430f2 WHIRLPOOL 49305d51d4925de9162f1401e606acd5a0265772f42fb0a08585ecf5ad2595c0e4b75f66406e1dbcb19391d582ce68fa880029d5ec4b52d1d48cbc82b1f5710d
+DIST texlive-module-tex4ebook-2016.tar.xz 13352 SHA256 80c1a0fc517743f105e9d3d64225210f120e0a4d0d7985f1c109086c4f9e1310 SHA512 06f7b0af006fff3d3d583967066bf2b7320e7e8d1aeefb0776fb5cf30f5fa49c956a47f677f115b680f50db6b6486a11d1a00e7a687a49a6870761e7c90bea42 WHIRLPOOL d6ced6ef80cb376ed8d5920c87aa5d066a6e4ce51208c196fdddbb626412c54baeac19cc6fdc596ccca6711123cff96d999263550628ec58456bf070215a2aee
+DIST texlive-module-tex4ebook-2017.tar.xz 13352 SHA256 80c1a0fc517743f105e9d3d64225210f120e0a4d0d7985f1c109086c4f9e1310 SHA512 06f7b0af006fff3d3d583967066bf2b7320e7e8d1aeefb0776fb5cf30f5fa49c956a47f677f115b680f50db6b6486a11d1a00e7a687a49a6870761e7c90bea42 WHIRLPOOL d6ced6ef80cb376ed8d5920c87aa5d066a6e4ce51208c196fdddbb626412c54baeac19cc6fdc596ccca6711123cff96d999263550628ec58456bf070215a2aee
+DIST texlive-module-tex4ebook.doc-2016.tar.xz 72536 SHA256 090db20066e51528ed59802027c373ebadc2d2f92458c4369e95e97b7348e7f2 SHA512 2da50214c0612614b539eb2db68e30cd73edd024b14073cf6ceceddbfffe29aa4eb8ba5c0c6f002856e097574a16045aebe7fcb2c7e04ddb218181c5ab64c3e8 WHIRLPOOL 5c3b382f573e3bd54ab7ee142144782ef291b07bf911d63442b7c6eb167dbc77b77fd179651c08704ece404e73615489a53fea333df05cae964fb97a70ad4d76
+DIST texlive-module-tex4ebook.doc-2017.tar.xz 72536 SHA256 090db20066e51528ed59802027c373ebadc2d2f92458c4369e95e97b7348e7f2 SHA512 2da50214c0612614b539eb2db68e30cd73edd024b14073cf6ceceddbfffe29aa4eb8ba5c0c6f002856e097574a16045aebe7fcb2c7e04ddb218181c5ab64c3e8 WHIRLPOOL 5c3b382f573e3bd54ab7ee142144782ef291b07bf911d63442b7c6eb167dbc77b77fd179651c08704ece404e73615489a53fea333df05cae964fb97a70ad4d76
+DIST texlive-module-texconfig-2012.tar.xz 4288 SHA256 2fcce61c0effa2f68827c5fd5ab0c3ba380af7753aa14a031994a8c1fc47ea55 SHA512 b5ba72bb63b8b84d8c6e7740c3f68bc6fc2711b3cd21497f2f1d7fabc11cb75d6424c9da6d9bbfb4d9d26be2f9122435cb0cba7db6fb1a87a1549b9a00abe9f2 WHIRLPOOL 0365966f7af2eae780ea112a146c7b64099de369ba3e17342ee2f6ae2c9621f1201fe799801d40203b83ce97c0437fd3c64518ae38fc751c0be3edece45033a3
+DIST texlive-module-texconfig-2013.tar.xz 12324 SHA256 47720f42e05e7a48dd8eb934b0e9b75efe888574be05f64223c161872b6fd592 SHA512 cd76b011bf6ec1ffc74e429c2b0aadf1805978a631b2b1709c212da943ced394808b87a10b1cc70c22eda726b755539b5990e332917f8fbb8d2c007f4784d4df WHIRLPOOL 85017da1530d190c1658ef8217ffe71fd3fc756e7a391d9ecd39e5b7408fe7c7e1ea289d2ae75a523ab09697f61de021b39e77fdee683bb3f41968427eb38842
+DIST texlive-module-texconfig-2014.tar.xz 12424 SHA256 0f54b64f8860ce1f219030f9f699693bb3ab2ef8687949594814170d970a3ff6 SHA512 55d905ef042e3a6d34fd539dd31a83c01632ba6b0547601cc4fc87fce147f94b3ee8bb425a1b1a8f8b8b0bf65f9c898dc4a1b22823051044771612ec3b9b5f9d WHIRLPOOL dca6d0067283283e2b7203284410afd4dec11158a1220314b1b951fa1432187a166ab9d90a6d576962f7e8f7a5cd81924701bb27059a63b3c69de802e367d525
+DIST texlive-module-texconfig-2015.tar.xz 12424 SHA256 7222893dfe4f797a3b768c357f6d58f03c45e9b90bad2de8d87f7e368db918e0 SHA512 ecc1f7a5f447f2ca9eb89b6774eaaa66407fa672dbfa4c35393fe97fe80abc528dfb62814fe0b38c52edc4341076d088095d283d12521d7500879b1f09217632 WHIRLPOOL cf4e9bd1ad8526003bad1ebce440ad5fd202ab7c0f6ca1bca47a730c204339e1af97d1440b10685ecca6acf723fae0b47684edb78150db44ca2ef46e1d373704
+DIST texlive-module-texconfig-2016.tar.xz 12428 SHA256 a74d85ed4a1c35d6608a77025a9b0d0f0b7f7d86afc945471309eaaf95cd3c9a SHA512 5565d51ffd81e3618de5c4d1e6f1026e6d3ef7bf4a7d41981547ccb5fbae7a9ac26d1864dc260c77800b6fb9cab186201d389b38cca4edc8f99aa61374069d81 WHIRLPOOL 78171dcb07c80541fde193ecf337f7a54c9f151e698fd8fb158c91430a23a4b5fd864e4cff4d412bf92c4f40a479b2eb988a1a145c31c67b2c15e68404c52d14
+DIST texlive-module-texconfig-2017.tar.xz 12492 SHA256 3789897a375504b876ec166200bae397342c2744875c119f7d1781538a75af77 SHA512 5473622487ae5b5f6bd430bc3b75ee7c1fdd646f74442fbcb9d4a943f27e013a21bb05a35a724efe4dd330bca3572dc6024be031072aa2d9ab8c9d4e75ea065c WHIRLPOOL 878fe5f6a064aeecb96ed72ef0c7caf3df454b5ad72b6ef0ea10dc97cfed9d0277c43e8eca42edf6a5d57d4cd84ed886c4253d82ecbd363f3880ace00a1833de
+DIST texlive-module-texconfig.doc-2012.tar.xz 9636 SHA256 13e27160eb4e0960b799cded221cea2a4e8393d3bf1a6c5f94f7c92050ee2d5a SHA512 05391817506b629d0b56fba0cb57607868789ec84de4318a6bba7e66b3366bf7e12b1c858c2e50e14e7dc660699190fc6ece061319eb790249b7399cfde7113a WHIRLPOOL a42d35e2be90e0ec251ef9c9674bc29f2ff93f19cb1820152b94439806e31d5e60c6a414a57a133bbad5f9e32464c3436ddefe9ee6a7a45d57689eb8c1044509
+DIST texlive-module-texconfig.doc-2013.tar.xz 9660 SHA256 f27ebd4aaaf14f1e706b6701002b0625eec6429cdc2e852be87eb5a825e7b08f SHA512 c86aae7b2cbb0e6f97c6695c7cae7e6a9e03fdd22b28a42bb708c2e17912fd7de43d9dc2d5d2e5e6a0d5d04345de02fc713435e3aecf1b9c05334dd011915d0e WHIRLPOOL b4e747510e43f8c0193e84615ceabf0d8e63fec7bf5602c9e49450dbfbd4df539d2df394831b9e037c847d0ec04264740e9d956fc79193c9be5e7cc9213d244a
+DIST texlive-module-texconfig.doc-2014.tar.xz 9656 SHA256 d549ee2ce2f23501423c6824dd200b8262e6b197ecc3ac908f56f3c8aee00563 SHA512 5fa758f5b8df6c2d7cf9c5a169c721426582086dc764186389bc5be1ff45dd1d5f582aaedc62907d240d8a830eaea70629930891ed1797a04635b0d43d63cfcf WHIRLPOOL 902447e64f4cbd054f74cc99e02ba2e5478245f469074fc887ade153763e27c35adb406850d3b138b0cd8427d9a36ca067993499153355e9120e8ad34932af8b
+DIST texlive-module-texconfig.doc-2015.tar.xz 9756 SHA256 95dc949a6e21db81041ba70b36ea3e96d32304b1f4e92d3ae1aad0207125df8f SHA512 24c79d380d8e9daa8c5a4d6d4a2580bf304a4594614716f855767cc9d34234a276b3fb93eb55e4532078a074c0be962bf7cdb53729afedaf7a1a6ff0141eb356 WHIRLPOOL 7aea15b5c0a1fb95c7a4cdd46a284ebddf4ac7f2af6f06784a26891a7252552fc7166500a954c181fd87ac823b79e0b64bef61bf123a7cc8ca14ad78fa08a37e
+DIST texlive-module-texconfig.doc-2016.tar.xz 28132 SHA256 eea76bd434b7c2eaa97836ae039b61efcec16032d5f8584526e81982f46a8ae7 SHA512 3467b34fee7dc7bda25a85d759ab150d113effb27d64c632d69bea332114372299accf749e112709a39104afeb2c562a1f189c9bbbe41325b27827e515545b79 WHIRLPOOL fd0b8d03595e86c271866cc3a65991505ce01562f7939b47470bc7327e1fa0a5b789f0e8766837435855a54774d101a5bbbbb1db9a042e51a16f0178ea83d775
+DIST texlive-module-texconfig.doc-2017.tar.xz 28132 SHA256 eea76bd434b7c2eaa97836ae039b61efcec16032d5f8584526e81982f46a8ae7 SHA512 3467b34fee7dc7bda25a85d759ab150d113effb27d64c632d69bea332114372299accf749e112709a39104afeb2c562a1f189c9bbbe41325b27827e515545b79 WHIRLPOOL fd0b8d03595e86c271866cc3a65991505ce01562f7939b47470bc7327e1fa0a5b789f0e8766837435855a54774d101a5bbbbb1db9a042e51a16f0178ea83d775
+DIST texlive-module-texcount-2012.tar.xz 25832 SHA256 00022e51fcddccbde4a466c6b6eadd8a64e33ea4cbda51adf39fb1d4a71ea792 SHA512 a622fc0b894a8c7d03f2693bc381876eedf8ca29153a858ffebfd12fd6a60587d8a4bda44b62c1e2ff8e28de44c8c9cf30fa6e9fd2506b13a57a482b674055e5 WHIRLPOOL 21568fd0d531ffa6d041c3cfe1170139cbb974c8e91719ffedbcfa13d3d4488a1f77e8bc6135974c1dcabe4a4a6e79ff719caead127689abfd101939e29e6329
+DIST texlive-module-texcount-2013.tar.xz 25832 SHA256 00022e51fcddccbde4a466c6b6eadd8a64e33ea4cbda51adf39fb1d4a71ea792 SHA512 a622fc0b894a8c7d03f2693bc381876eedf8ca29153a858ffebfd12fd6a60587d8a4bda44b62c1e2ff8e28de44c8c9cf30fa6e9fd2506b13a57a482b674055e5 WHIRLPOOL 21568fd0d531ffa6d041c3cfe1170139cbb974c8e91719ffedbcfa13d3d4488a1f77e8bc6135974c1dcabe4a4a6e79ff719caead127689abfd101939e29e6329
+DIST texlive-module-texcount-2014.tar.xz 33956 SHA256 35c040fc62dd6b9e6f4d4613a1cad5b48f70f9974c51d026283bc44b5d772c1f SHA512 9259d53113de96a033db98cd32022b98787ec9e477e3c0f6183186c02a8e6223c8605fe282fbe67e30d8173a9edefaab51b2e8e53b4cce2a55cb7eb19b7b7da2 WHIRLPOOL b8ba4456b13f2ac5ba500538ffa6fb87b20bd07627aeae8153fff7d1eb1d827ce3ecd985774040357e6630a3fa1e4e6e44d7ebca63cfa1c07c73971bcb903d03
+DIST texlive-module-texcount-2015.tar.xz 33960 SHA256 c72bd0b25ea915963537c5c90dc50c9ed2b773980852706740ff9d023884b54d SHA512 90eabffd8c57932f7d31ac9657d3008e3a0504519e129b89d35f4c6cd4a43167802af26041543ea9e44ccb6e16c486fa763ee8d5224dd4027efeaeb586efd1f1 WHIRLPOOL b670d1e86585c6de9b40d4e576dba2a92c3f9e64d9f765be8e77634f8c6fdd1908ced704465c6550efbb76941084b49238aae0ce8f2a7de7a774c28e4c84fc88
+DIST texlive-module-texcount-2016.tar.xz 33976 SHA256 79bfaf907112f6bf532cfa809a097397a228e0078c918fab8bf8afc6f9ddf88b SHA512 1283f3554ad91423c5244c74670821a098ae8aa10c06b0a409b1852ca86c0c90b24ef3a1d76e894dda6636a95784fb8820aaba6442efdda566b8674a8faeffaf WHIRLPOOL f41896c3dc634e12f9fb9bdb8c3f4bf9a6b06c4588ebda2c652b8113a42707f002d8901abb7b368f24f601d30e28c10d8a8b40ff91dd8bb8eb29597efc20a871
+DIST texlive-module-texcount-2017.tar.xz 33976 SHA256 79bfaf907112f6bf532cfa809a097397a228e0078c918fab8bf8afc6f9ddf88b SHA512 1283f3554ad91423c5244c74670821a098ae8aa10c06b0a409b1852ca86c0c90b24ef3a1d76e894dda6636a95784fb8820aaba6442efdda566b8674a8faeffaf WHIRLPOOL f41896c3dc634e12f9fb9bdb8c3f4bf9a6b06c4588ebda2c652b8113a42707f002d8901abb7b368f24f601d30e28c10d8a8b40ff91dd8bb8eb29597efc20a871
+DIST texlive-module-texcount.doc-2012.tar.xz 319296 SHA256 a8a210821752e28b074cdab8cb0d47c31921a3dcde73622c428e688b34099c3b SHA512 34352740007638c7169d979527021c9cb2bdca2a46b295be2ba11b289c3c28a3b6f526d3158a30e7be37255b6abd97573f5d58f46abc2afb2293162c0a5a163a WHIRLPOOL fac3dadb136b69b38ab6b86bdc75b90691b90a4ce7668fbd7c4c135d9d378c1641f840fb2057fb2aabb595f7b774c2378a2c966496a030d568eeb5ae883ebdaf
+DIST texlive-module-texcount.doc-2013.tar.xz 319296 SHA256 a8a210821752e28b074cdab8cb0d47c31921a3dcde73622c428e688b34099c3b SHA512 34352740007638c7169d979527021c9cb2bdca2a46b295be2ba11b289c3c28a3b6f526d3158a30e7be37255b6abd97573f5d58f46abc2afb2293162c0a5a163a WHIRLPOOL fac3dadb136b69b38ab6b86bdc75b90691b90a4ce7668fbd7c4c135d9d378c1641f840fb2057fb2aabb595f7b774c2378a2c966496a030d568eeb5ae883ebdaf
+DIST texlive-module-texcount.doc-2014.tar.xz 554816 SHA256 3adaa96516442a5712103193ad95f3cb530951f5a58cb35334b98ec4c668fc3f SHA512 7b2bb2d0d7023a973d07d5a607cd7ff797ec17aac4724d8cf6db1d628fcb10aea8d60df1c44eab654734fa93bc42284a6b6ce462d150e795a09d1c3ea73adc62 WHIRLPOOL dc7484a6c1a631add82e3691fd441b84df39bb5f7bcb544c8002bddc840cdf1aa1a0ce1b8aa3d2bfd407c0f3d8877945fb516525245f5c349747a815c51e6c1c
+DIST texlive-module-texcount.doc-2015.tar.xz 554820 SHA256 3e5454aad97a6d7d985c00733c87ab4294996ea8b3a416cc75f5d45465b9fb36 SHA512 3c2a97d32386f77d355fe9a5caf29d71d330023a2f237edb370e6150ab30cf03ff99c98f0ea112a451b55a69b3bf6e71ffd60cc417c40b8705343afd4b068b2c WHIRLPOOL 1f827b37d4147cc0acdabbab3907a793c222b7fa8ece3c1799609031e52aa294225ac8ab1188618be24363b41ae86a0f971a46b360957b72017e56fa6d8b9775
+DIST texlive-module-texcount.doc-2016.tar.xz 554820 SHA256 b1c6790c23427882ae29c2643257071ef98294df7da7bc1eb18154d61cff0499 SHA512 92de144ab0406a3c30565d1bd3320933f9ea1696fc22d41103975677adeaa844faa69571160e303f70b266bb3c079c20cb24c74502f51409eab8800a6e46d9b7 WHIRLPOOL 5637b1c4e1e7be8932232be58f720ff2d5428b49e5297c1d9765e16dc8bd5901dab176f373afc313b1d5fd09023cd1cb7d732502a149e70364ffe350b128e31d
+DIST texlive-module-texcount.doc-2017.tar.xz 554756 SHA256 9afc8ddbc6ae46248d98a81f05a225923b073b2d2d7d0c933d3ff9c28aad6f5e SHA512 f87c36f1d46552d258156d36764c6d96839576e30510257f72d24b4eddba1c624b12ff4405be3e39e1aa9d3f70c02e272a3affd513f2dc9ca3671568279ed6ca WHIRLPOOL 538d1727f99d0484624759afacf251d5dffc2dab8a27ed1aede88f26614cc5054115ec04ea330bbacb8c3da512314e63e4b1c270cc8ebb26b4f042ff6530986d
+DIST texlive-module-texdef-2012.tar.xz 9268 SHA256 b8cc200f47ad4906f877269262e4b1b4d7478cb8df3e28edab0600370932576d SHA512 da34a7f6d7d2f799f9796dc743559be7dc911f7a9049cd3ad133f350bfd5ae32ec1698bffcfb78b2fede3a9ca6ce079b096c4cb5a67c6ec8083930671c8034a8 WHIRLPOOL c1d67a25b896e1055f818211620bc10c90ba2558ff8dbaf568c21aaff5a0cb2e6f40b06890e244ec1e004a83c867a91139fe95318d37f8bde07a068e5f5c482e
+DIST texlive-module-texdef-2013.tar.xz 9268 SHA256 b8cc200f47ad4906f877269262e4b1b4d7478cb8df3e28edab0600370932576d SHA512 da34a7f6d7d2f799f9796dc743559be7dc911f7a9049cd3ad133f350bfd5ae32ec1698bffcfb78b2fede3a9ca6ce079b096c4cb5a67c6ec8083930671c8034a8 WHIRLPOOL c1d67a25b896e1055f818211620bc10c90ba2558ff8dbaf568c21aaff5a0cb2e6f40b06890e244ec1e004a83c867a91139fe95318d37f8bde07a068e5f5c482e
+DIST texlive-module-texdef-2014.tar.xz 9276 SHA256 b39cd784395b7a74f6adf6cbcb849eaa4bf97fdebc76cdc76da4c9a6fcea530c SHA512 2e3a843a9de228f57cb93c9d9d75ed238649b6e3d1c028d9dab1daf04de613d95412e9945f32f0544ed774a7ba8b6fbdbf2943eed2f2dbded0faf97f7de3f74b WHIRLPOOL 5abeb8d8bed16335ee830c4f90ce5d9eced9b2c6de13b01c78784953622b34ca54a382b477b1483f44354ddcb32c850d52414b3cfb1a17620338856841d09259
+DIST texlive-module-texdef-2015.tar.xz 9276 SHA256 fc8def124880dbafb21ec9611a1c9235857cb2b407fd82b7ad4f5bdea8c27bb7 SHA512 0c83f6c46b9de4ba457a519fe19c65690bbd5a8f2f6e6a6aa01fab2444b631d500f38836c0c479d9be3251c1a2b9abe83c7c1415cc184a680c883ef061eb2f45 WHIRLPOOL 4274c26dc3f952739016a2c01785b33175c1a2940b5edb034c021b9a53f71bbe04057c7f330e9e086155be89f5a2010811472c2735201eb413a99b11d387022d
+DIST texlive-module-texdef-2016.tar.xz 9280 SHA256 34c1bf96a3194012fb4281ec8d5d82b03d6a6f81805df47c26a84b5d177d7763 SHA512 79527a3b020f5fa3ce69f3436ef71f0f17d388b61b53e133dc8558ff26ab9a600d06233c41aeef6e4935d98c3b2d1c2b1ebb6f8265f0750bbfde847fcaddac6d WHIRLPOOL 303c32a0681c00fc378db56e835f5b562d733e002105c59e5525be0b7de17afed91707fe02a61d5c34f79134b858d6dbea2c7f07f448d06411ed14bcc9ef18dd
+DIST texlive-module-texdef-2017.tar.xz 9280 SHA256 34c1bf96a3194012fb4281ec8d5d82b03d6a6f81805df47c26a84b5d177d7763 SHA512 79527a3b020f5fa3ce69f3436ef71f0f17d388b61b53e133dc8558ff26ab9a600d06233c41aeef6e4935d98c3b2d1c2b1ebb6f8265f0750bbfde847fcaddac6d WHIRLPOOL 303c32a0681c00fc378db56e835f5b562d733e002105c59e5525be0b7de17afed91707fe02a61d5c34f79134b858d6dbea2c7f07f448d06411ed14bcc9ef18dd
+DIST texlive-module-texdef.doc-2012.tar.xz 249876 SHA256 c3b1ad688072d50bae69f0c7afe4d9fc6c5b506eb347fd0cad49a4eea5a3bc88 SHA512 eb7eceae35dff2d5d25062aaad91dbb14df5a15d26b58dabc4678696c2de43c1089587e6a36ce3fe25be95ed97a81754284878fcb6efd3fa7a5bd4d70e415c45 WHIRLPOOL 4de8370a756c2bb793a22a04988c6e27b939514562e2c36d8cbca6a501cc5759e0d2928da990a9083fd7c24fc7fdc6f158af6a7aba3f93037f8d2e0bfb0b5d97
+DIST texlive-module-texdef.doc-2013.tar.xz 249876 SHA256 c3b1ad688072d50bae69f0c7afe4d9fc6c5b506eb347fd0cad49a4eea5a3bc88 SHA512 eb7eceae35dff2d5d25062aaad91dbb14df5a15d26b58dabc4678696c2de43c1089587e6a36ce3fe25be95ed97a81754284878fcb6efd3fa7a5bd4d70e415c45 WHIRLPOOL 4de8370a756c2bb793a22a04988c6e27b939514562e2c36d8cbca6a501cc5759e0d2928da990a9083fd7c24fc7fdc6f158af6a7aba3f93037f8d2e0bfb0b5d97
+DIST texlive-module-texdef.doc-2014.tar.xz 249880 SHA256 da353d9740683d6fd3e20c872791a0bdaf1d80114c768aec460bd02ccfb7951b SHA512 e136307d1a734cb7c1d8d0a9be1a55f7c03e8e4b20ed4b6ebac9e2b4cbc265e44393c8e98172468515c70cebc3766a1b47c9651526cfc3f445037c4367c6836f WHIRLPOOL 34ca1604a2e11cc97291d3d5fe3547a6006362678fda10256b88c01a6a94c16a0001bc6f0da67012e2613ae54fba49f303c65a9f6c498e27a0aeac6bcdc32456
+DIST texlive-module-texdef.doc-2015.tar.xz 249880 SHA256 87dae2d74d091044d372a18ce2b8568fd0ba63d305a39edf04abbea02fb15ab6 SHA512 9380899f5d1a05d91ddec971136a8e6974ca6e7c5e854f43eb05c951b8364faca8574521df568018515ddebdf13f357f121d67b9fa1880b5f5cc0ceed609860b WHIRLPOOL 9219c7435e3971b5c58017387e575fe8f2786eb6d9754dc4be5e136624eff78dd4f47d3249772a1e3a452c736299272eb64de153e9c78acee6ff1302e9aa1fba
+DIST texlive-module-texdef.doc-2016.tar.xz 249880 SHA256 7c78f5ee63c4276e8f6d213b08d0851f2954303781352efe5176407167a541ce SHA512 9a927c1ed062d3e0de77c7f690d7a247fda1c10b00f0323f09e9818f672fa47f39cf70b96701c1547fcad3966e0aae2aa2f6ae512ef0c62987c8568868ab8b58 WHIRLPOOL e9143b666aa8e7127a0c99bc58b02d1fbc7b2b2659651000c7142aeff731aaa9bf5ff608ddacdaa66021882b8974c0d06e1d51643dc1ecb44f2e6005ee7d6552
+DIST texlive-module-texdef.doc-2017.tar.xz 249876 SHA256 707cdedfd33ce2159f2955477d16b9e85aa4ee4cb258404382c8037b728c845e SHA512 9ad1743eb54c5d32dddda440294595f512b9eb64d45d4041ff2edb44a99cc689df17b5384bb5ef7150202a7d1f5c2cd08cfc81abcc2c1fea5e9098c7ef74877a WHIRLPOOL a403608d7f51f8a117763cc389354938012ba52fbdeaac4243aa817d852cbdeb12ad9637cc794a003980760ce4ed8906a8c33f38b79bbcbcbd782194247d4584
+DIST texlive-module-texdef.source-2012.tar.xz 3892 SHA256 0f87b3f86695a80388a30e649cbc344c4a262722d67c0921f9e9510269a9775d SHA512 05882ffe5c863a710e4d36190bf50cb2544c211282d852898a94dabe8b287be5b3d46647fa1bcffe8fe0e699f5e021b3e5ccd67fb10c4107ec79dc96d4fac02f WHIRLPOOL f1bb84d112bddbcb14cc90e0bc109a642d0bff103a5a021f3a057e606bf006d4e96a4366f2e8f09996ac8c8b15800705a02a7cfd454093dbcc9bd4de15441e39
+DIST texlive-module-texdef.source-2013.tar.xz 3892 SHA256 0f87b3f86695a80388a30e649cbc344c4a262722d67c0921f9e9510269a9775d SHA512 05882ffe5c863a710e4d36190bf50cb2544c211282d852898a94dabe8b287be5b3d46647fa1bcffe8fe0e699f5e021b3e5ccd67fb10c4107ec79dc96d4fac02f WHIRLPOOL f1bb84d112bddbcb14cc90e0bc109a642d0bff103a5a021f3a057e606bf006d4e96a4366f2e8f09996ac8c8b15800705a02a7cfd454093dbcc9bd4de15441e39
+DIST texlive-module-texdef.source-2014.tar.xz 3896 SHA256 5c3fd5da7b110a82b76eb009ebb66ac89d30dfd48913c8da8e7b920e93d0aae1 SHA512 d40f6f40346bc14b24d4d10f8f5ed0f2493fd4b995f085465e057700dcbf0dec4cd6e4af82ab5a00da0346b0af2f79d1a4c73b12f0779344ce0ee660bcd0c012 WHIRLPOOL 078deee4f22921d79ea3083e620903011f53dbcd635adf7db43f7a789c482cb6c9b383d5db2be797f9c2e4170acf60c618c79b1f0d020bdf9efb233086b7eb8d
+DIST texlive-module-texdef.source-2015.tar.xz 3896 SHA256 552569d00a00c8911e2b301c5791e78ad90f0be6da5da525810e4dc763f2680c SHA512 0b3356e51f5cd10df3cd4749fc64e131758dfe027d1fd9451ce2acaaf288dcb0b1ec930946be54de8f988c15c5fc34d30440ef299ef3718e2f70ca9979f17928 WHIRLPOOL 4925e54751a6039c41989c085f50887c997b71faa7d06339cde47a3e532ee868e3f4f4e0bc1ad5b304befe13884c3aa6aace359a5e44d90b81f35520691015cd
+DIST texlive-module-texdef.source-2016.tar.xz 3896 SHA256 7f9545219b62413ba6977fed5055d6ed38cf13816b0582cea2bf102e03ea45b3 SHA512 92000293637f81fe1fd78a4402ca0a9bf9591f337149a4efd72d2f49609f0c69751bb323262c012574a50aa24a1d0f786928fba9e8999853856cb9514e345d45 WHIRLPOOL 0c7adc957c7baabf98369d140446f5158ca6b25d35a14a286caebb3475266ae4f75e80f548fa64980578682fa08d9c73333591db3a4b2843bfbef14e4be76e89
+DIST texlive-module-texdef.source-2017.tar.xz 3888 SHA256 ba9a13e4eeb9de3b2f5f0b449a56e84b111db8fa1692d3ff8519db70a424956e SHA512 41c19aea1b9141542a6b5262decf3aea1d241c41d1aa0225eac028b564facead789c637e9d580b65ed68db7698dbe6d9fc7572b045259571b802860c7b455d68 WHIRLPOOL 02487a6943c1379472bb24379fb1ebd43c57d6a8506a77762b2a7ad9aec9b138fc0031c35d40bfbd2f95c8bf0ad06acacd8476a245144cc31191ed7cf25f75c0
+DIST texlive-module-texdiff-2012.tar.xz 7136 SHA256 55b7e1a2d206704e2385e708d21de60f4edfb02824dfa393f3e5f186f8bb1aa7 SHA512 13f34d6607987d2a129d6f56538f9378fef3c584d9b8212e34cb01e274a93c60f56b9b333de8e176dbd5e26b8a4f7765af29a5231d7adaf6408bdf9624fc37ee WHIRLPOOL 85cbaff6827cff79270c53baf47f337bac0376766d720de586e6a3885ecd971927b2a90f55ad79d12f597b790373f103af7c3a6eebebc731d2dd11d3a0ffb4f6
+DIST texlive-module-texdiff-2013.tar.xz 7136 SHA256 3313dbf876721335c71ea5fe5303445761f7bbb2d4fe3964c865c539c28909d3 SHA512 f6d664c36bc3544b97205d481a05a97917f95f2612f084e021aff8a141be79940f7a19c62696cba8de5964ea1fec38d9a90681498ca6c3732142253766597f3a WHIRLPOOL 5dea08bdd6d06a7e188b807f0411f504461246e8661b3157e041c808921f8fd250bcca697ec96471ea33b174510b4d2bfaf1fa47820e68f333bbac6748903adb
+DIST texlive-module-texdiff-2014.tar.xz 7136 SHA256 8ee90ae8d329306a62b6202233b6e5060d0c8da9aa9edf35b2cc01c2e031db74 SHA512 0dc8fed72c1603a7437b2f50fc348ca34d5b883c72db4551bcb5ad7c55018a10dcaacb470a0954a17198a5f57823200b73b133aa91ea48e35923701341e7a5d7 WHIRLPOOL e90477e858d99f887900e76601e2d3c9827c149789ad33863305fe6bcf7bda2f6be1e0eafca5c46cd7eb1633345c037eaee75e5f3f8a2be626f90640579be894
+DIST texlive-module-texdiff-2015.tar.xz 7136 SHA256 4df670cd129f961107384f8f8915fe3ab4aaf12f4a5f0006ee028567f0ce9a19 SHA512 3bbf709bcb4cfddbb92385d79a9ce9488889e3e0c6bdd3f61e89439b38eac14c0a01272392b1db1c3cd417dc9924f20b34debd9055112ba7d2292c3bfe3edb71 WHIRLPOOL b563f13aaa4fd8c107e0b4633017793189e7ea88792a1d9c1b6a46caad4cbce14fa5951f1d111c674e4b5b6a1638374e8c25061ee4d8f1a863d8af7b2f4e4efc
+DIST texlive-module-texdiff-2016.tar.xz 7152 SHA256 0e94df2cc144a5a8d73d1f3d0c75209509b7317c00b8eac8a23a533f3fa5050a SHA512 8e300ab38c698a33ba6fce3416e6e1c57e53929dd5ccd7cf6c64b17e8c79f5eae0faaa9fd54f9bc909dcc1d3b961b3b799a98fce219503a7add53c0bc306a150 WHIRLPOOL 6e5982a470f9ebc900ed701a6e5d626628818477aa1275554de0530377176d8065d244f16aae4807595a0a2c3047254fff2cee53afdf19816bbba972f2b6f3b1
+DIST texlive-module-texdiff-2017.tar.xz 7152 SHA256 0e94df2cc144a5a8d73d1f3d0c75209509b7317c00b8eac8a23a533f3fa5050a SHA512 8e300ab38c698a33ba6fce3416e6e1c57e53929dd5ccd7cf6c64b17e8c79f5eae0faaa9fd54f9bc909dcc1d3b961b3b799a98fce219503a7add53c0bc306a150 WHIRLPOOL 6e5982a470f9ebc900ed701a6e5d626628818477aa1275554de0530377176d8065d244f16aae4807595a0a2c3047254fff2cee53afdf19816bbba972f2b6f3b1
+DIST texlive-module-texdiff.doc-2012.tar.xz 10296 SHA256 07f4b8852f229cd8654bf1f1a8c8f1033ed325ef5d50a1c458334860d7e133b5 SHA512 58d22225e2d55b6871b51516cd916044ad888dfd4d8c0d19153e8432ed665379e486d562f1c3234d0f141f578c1ca6273ca870b9bb8c5dbd0b2c5eadb12dea43 WHIRLPOOL 39d7906db0bb02cdaf979e82f57c5553a81e2f4980f978f2bc58415813d1d889e0bdaa3f318ec9cd7f904c21686137ad354676bef6dab0741a844a08cb876cd4
+DIST texlive-module-texdiff.doc-2013.tar.xz 10296 SHA256 5ff501633825f807e1f5fde64f390ddf826f710fc94166d5219a35ef7c0e4c54 SHA512 ef1608b9a0b36db5e9ab2aeaa2188a3e4c8fb671c72f267723f9da92529ee410528f6d62c81b24354a5bf23dbbfcba151af17cc13ad6f1b902fbfa8e90ea90fc WHIRLPOOL cb2e5d3bc0529fd7953e184c23feffd9fb49bdaae07d3da2ceadb1df10aca47ac3d94ae0b083594d548665451b06d5c096eb416fe1d2d4c0e9e449b68a1abd4a
+DIST texlive-module-texdiff.doc-2014.tar.xz 10300 SHA256 c7956b28fe30803421ef44036358a0428b448b452147e5e0bdf4cd69971363b1 SHA512 5267c471afa524d2f7fd4af7fc08852df858540b11d3cac56c0d60465f4e0dc90b4fc1c6a4f8ed17528d5baf6c2195b1353ec99eaaeec56b3b3a4c9afc4fed8b WHIRLPOOL cce93b2f67804d323c3b2cda9c611961baece779eea430c0aa7d4fb268afaabc3729abfe0504e7c1cae4690f899e19c64f5293618eefebdff61cbc0bcc617e41
+DIST texlive-module-texdiff.doc-2015.tar.xz 10300 SHA256 25221b1754148fab081575099652d55a99ebb6c95f5fb9672c9b539f10e469db SHA512 db3eabbd54058d2ba966ceb4098906759a28f45bfdf4650951349629d00124137d9f4c0ed0812578edbbfa9ca894154ae1893ab946828a164c29c0fccb42f3d3 WHIRLPOOL 05faba2d748aabed796a523403dc63b03d92423c9a974ae73dd6b2397f91565276a0e27e3e2134359d2f7ea8d8071cd37bfe8ad844ec44ae030452e77e202cc2
+DIST texlive-module-texdiff.doc-2016.tar.xz 10300 SHA256 46236c8263f85feb3f9846c543bb8a0c6feb55c06128443bca558051468c063f SHA512 d5c5c12dc2d6186f5e196bba31216986166b7efa9f6d44599d43446278d00576f94b858fe91ca5911811c5daa2d409411722e7d29543973641c78036aac15bd1 WHIRLPOOL 787de42fff3cf86c2b014b0fa81aeadaa7350e713727d32ed26565103dd64b10cecaa59b90391fc415ca0c3f490aabb43145465759c35b6b16771f8e1d79d5d8
+DIST texlive-module-texdiff.doc-2017.tar.xz 10300 SHA256 46236c8263f85feb3f9846c543bb8a0c6feb55c06128443bca558051468c063f SHA512 d5c5c12dc2d6186f5e196bba31216986166b7efa9f6d44599d43446278d00576f94b858fe91ca5911811c5daa2d409411722e7d29543973641c78036aac15bd1 WHIRLPOOL 787de42fff3cf86c2b014b0fa81aeadaa7350e713727d32ed26565103dd64b10cecaa59b90391fc415ca0c3f490aabb43145465759c35b6b16771f8e1d79d5d8
+DIST texlive-module-texdirflatten-2012.tar.xz 3076 SHA256 fa0a9c9f2acf2725b333f2dc6193c25c9240070fb5a854b4bb3cf5aad74ef011 SHA512 8047dc5cefab8d8fbb6d53fb12e3602339209477a015c0dd52581a824f5f6722bd8cc50d25ce370d9e16886cd23d02c5119b9a2c36b01fe3d41f79f852091f8d WHIRLPOOL f3835aa66fd1e828db82a4b1e3f2229dc6658f4a312cc3f8151acdd71b3eec03f10d5eb09c0bcfb21534249449013dbe23943d160537b05fd6bbc2e73d806e4f
+DIST texlive-module-texdirflatten-2013.tar.xz 3080 SHA256 ba0db7ebca1ffe6c4fe3f390c25ea68d721fb5b2b49fdfa170f66b72a3a4ba3f SHA512 2174afa617fbbceb84758b8365a56489a69d8722dc2177313b9b9f1b347c400191f9d938a071a11ea2bc25ae17e5e4f9a321d4e348fa0a6f4772f5fd54605f45 WHIRLPOOL 3105d2b1746c85f44c66c69a9f72e523bd4e50291ac7dddf93c3cc33758621c4f5e7382912b6c43b3ea9755ec394016fcb95e951ba350e78289318970dad26f1
+DIST texlive-module-texdirflatten-2014.tar.xz 3076 SHA256 2f2acf4474d41665e7436d7431958fb48d0635463bfec960d519aac19efcf9af SHA512 e370993e6d6ae25c3192aa2e023537646a2f895cf759f4479586ae33b1e0ea0cdfa5de8814e1f1fa4b9474d24000891ac093366f02a19798564e22bae76eae47 WHIRLPOOL 81b3975fe81fdf21518fb36aadb55ea05f0b5595c12d321589dee3243be6f8ec3114f669ff1ca4efb4b7bbd6851b25dcda7ce7477d0313662505f398fb7389a4
+DIST texlive-module-texdirflatten-2015.tar.xz 3076 SHA256 b6d50fbe23721e986b7536173e3673870da0d3e0151169f7b9ea641e6533e81b SHA512 48ef9e8a67194c380e21e9b9cc4bb518e96a1447d5fdd60efdceea0f74ad89273ee38801101630991b7d397b9b2e48dfd2ddd7188d5970e64a992f424180328b WHIRLPOOL 500b4e365e2a43c3eba26c3395d5b4e556e56104815a8eb5d7939248893c10de5879110d47f6de7b8683fb12717bb0c372111d1e9da4a4ca07974c2d60c39a6a
+DIST texlive-module-texdirflatten-2016.tar.xz 3088 SHA256 31bf36d577fed3985ab2645d2385dbfb408f1f4da398eef00256fe3ecdb46f71 SHA512 6497fb734576083784449ea29f8f7f59ac8a82b8caa44e8a96cfed3e8ff65735d66d09d8c147348b92dd2817679eadd9c8dddcdcab74bc29efaf8edc940a19fb WHIRLPOOL ac25f67fe95abf55871de0a5d123d72e3062bdb8d3b76b003cdc2d89324bb4adf6348c666af29795125412506c37bb71ca1a67a053d1c036b8ce911c93380a69
+DIST texlive-module-texdirflatten-2017.tar.xz 3084 SHA256 48ef9c3df6743746130b3ffd1dcc1a4f06a3425e57871343a5db7fe831e0f496 SHA512 73404f73d3c7ee569ef019ed4ce621512b6cb2d6f6c85bafc362759b1e1bbc4f56048d17e98b481099d7a0c4348594ec5a514752ff8888c153f4239f3e6d2322 WHIRLPOOL aca922f5bd0ab2d6feb7b1103ea38703b90fb7e6e6f83302c83bb46c9ca15ba057d606d08f6c1bf4fdb21390debb75579bae72d0db473fd282197f07a7a0b6b3
+DIST texlive-module-texdirflatten.doc-2012.tar.xz 5616 SHA256 c04f1bd709b81ee1a98373ab5886cb740dd1250e3c0fe6dab5f1e54d05e5457c SHA512 c64f7bc95d2d6aea0a1967689ffba9df62d7c9013a8f6b36a52f4ff358de86ee5b13f4e0eb396c3cbdb6dc2f7dbfccf06e37d00250baa9860d9b22ad365d7c61 WHIRLPOOL 74a56dec1452bfd7adb3c87079eb7e91d01420118a0e6e14c58eb59ec07677a2ad5b694e2c9d4f7bf9760b90a9d187ad88aa8bc93eb2ae476c2a2e5d8be8306a
+DIST texlive-module-texdirflatten.doc-2013.tar.xz 5616 SHA256 94afee2432c525c17cc25e663e2f1e802e47e1476fde70f728fb542d1f854e9f SHA512 240760f5b05cebe43c8910523084b2d6386e28c050a2ead4da1a2d10782a5cdb79fb91e9bae6e261ef979dc48d92e254983d9505f45d41adc98be3ec6bc1fec5 WHIRLPOOL 6afa4ee525b1ebf0992cd6258286e0f60651ee59acded8e618ec7d54f1d9a8d39158b218484499d5404c678c58b5d5f5cfad85c561fa3b4b9665f94c644918bd
+DIST texlive-module-texdirflatten.doc-2014.tar.xz 5616 SHA256 856087a73ea44fc4cc43e306487d90251e80bcd387f6d571968c83c2c97b0184 SHA512 22ec50f4199bff8614e664f5085e2e7cb88cfdf705f606640a5bbe4f022df430b04eacfd49a719036b8b11d1f035843d3c56431e0d82ca2f72652c0c4984c123 WHIRLPOOL 5148a115e585c351482b61fb6cf946296fa38479b42339eee26213cc5c6884fec7d9efada146facc0638757bcfa66dd4af88d77ab4895ab765227f470b080c82
+DIST texlive-module-texdirflatten.doc-2015.tar.xz 5616 SHA256 7fa42af4b3a4fa8b772d500b3e08d39418c51616e96772700cc01274b7aec332 SHA512 a2fb282dc97f6c33dab70897b673103dd9da0b2f6cd65715aa6962414491ddf6e7b8ab893afad2b9c4df1546e188cc188f8674876322ca97322631e431089e79 WHIRLPOOL d5028afe86a21db1d974c7c61140b759e02cc2457675c8cb76a5b9a9556a6657e93e12df4fa59d9951c8eb5f0c391386910840e49eae8177a7da6de4756babc2
+DIST texlive-module-texdirflatten.doc-2016.tar.xz 5620 SHA256 c0031c97ecc4a82d153015c2672801b9158753b2f3ee54dea70337a16874b0ad SHA512 da1973e711c102e4ae62d668013d1ee3d12e7300db081466148ff80352b24e75b2990ceb6b1afbf363707bbf833529450925bf33c0bdf9b3458d4ccfac9ae697 WHIRLPOOL 769e52bacb7b05b3db435602d5958892b74b5e651309b8a03a8576a30a29b34aeaf81af45f210bafa97158fbe04a689add2526ee2f8ac4d57799193b19362152
+DIST texlive-module-texdirflatten.doc-2017.tar.xz 5608 SHA256 7e24d5755ed2b21d4376440d03a5f001b91f9ddffc6cf5c861bd27eea868b1ad SHA512 a3e00dff899ca3bb7033eb8c8608d44cc3319f73afe6fa0d00c25e330ee13827df9556857f75b9000b4716ad1ab9d8b648f20509cc3ea4b10d2991bd6b3f9ea7 WHIRLPOOL 6954aad539361aa5cd19c61979e90bee4edfb60d25159b0a12c06be58766160606e0c7ce5415d2f5f40d8a6f2a7da17fe031482bd75b72361bef97fde98f57c2
+DIST texlive-module-texdoc-2012.tar.xz 167440 SHA256 fd3f130e32265cb80712175398401c9ca6dbb5f1bafb97e5f4586d8ddbc77f11 SHA512 9ab9cd99c477cf4b174822b02d17267fccba4d06190228802f013c94b6f2d6b6a3170059e91bc60ce09de48d8a38e80c9f1c0dd5dcd655b2d16fa957e23e1bb0 WHIRLPOOL 1c0353341cc43e9029c77b9eab764e8acd3d6486b3f2ea71865d6a2e58647dcef76dd965ace908b955ce0c1dc85ea02991161c136c75390d10f7c173393dffce
+DIST texlive-module-texdoc-2013.tar.xz 167308 SHA256 767815b068de8216879f7333ca25b56168a1974206bf8ca346bd46f9b7f25c53 SHA512 0f1f0cdbad3a46caa4f16de59d17e2c41cd41fbb9a3d1655c63b57e1d5d2557878146c76b37fd574158346c3d7239ee3abeef3e7e9344e4153979695dad32b05 WHIRLPOOL 5c7a9e9f615c1ec25d87caf705f2ae62e1a49c5e809cb9113eb1f0bbb0bb75e507887f3b31faa0af5b25401a6add75f101aa77b468346f19c3ad8d69b44b5a01
+DIST texlive-module-texdoc-2014.tar.xz 167336 SHA256 e0a5dc34844c06a30cb19658551ca641abd5a89fea8231f9c074d59818806693 SHA512 b8a784c03f3087e694d543686702e9a0042901c5b8a6a130ac95b85522ae6ac59a0687449e81aac9e8e43bdccc2ef6eb8784990e205340164936765588ff893a WHIRLPOOL 351c0758550cce9c18aa0fcfb48d3aa4084a1e507d0d0d15b65952a63b2ff9b804277cff30d83515f17ba6a89c8155a66f2d460f65da8a00bfe1b7a00993b536
+DIST texlive-module-texdoc-2015.tar.xz 167336 SHA256 e6e558bbe421644278364c764d97b904c43ff86edf116f7d0713d1f43a5d9f97 SHA512 7ab8f2db199f96f4290097e07e5073fc73d3b5b9839f0a60cc87078b2db48b1b53bd84dbb5ef7db5d21a2f802bba5bd7177132106c8f8c793c28b6a217755422 WHIRLPOOL 1b2c038648ce8d24a200b537b1b1e881f14193eee569503dc3a9281ac0213edc741ca00ec4748954afd649ec9d85c6aaa037ee8fe3be180d1d204a22ec97d850
+DIST texlive-module-texdoc-2016.tar.xz 167368 SHA256 e307496aeb3a7e47d0406d83d46dbe367fe70f6711c673e55d00798e80d58e00 SHA512 dc3dfdb7b480a837eeca239e8289b075d5ef7900a92345b8dfc3546a3c63bb378527b2084476fd86a526f4591b2a2e943c3300db10e2d333e1d57ab870d59c08 WHIRLPOOL da0cea204d8ff63214cafe2a9083f19691fbf440a73edc09b4df7f727df78dd5b0f7e36e0cd76b1f4dea2cff6165958a1984e8d1c68a1da0f26142245e268775
+DIST texlive-module-texdoc-2017.tar.xz 214216 SHA256 b6855af75b357b26057cb6b3a5654d7a0bb53ce19948d9f32dd8f80bc16d1bbd SHA512 f20124d5e65956d568b96efa1c58214d6ff664477e9525610f07b48898d2a09d55c39276571a7d2954c09bb6732abf5a0067c430d4f0f3ff9355f2d57fab22cd WHIRLPOOL 3470c6b78ed665f77ff24515b65b42cf23516ee44bcbe76532430b3a998167b8890360170d5959782ee42abadbac95eadb095c8c85e4c1543e9344dfc1917daa
+DIST texlive-module-texdoc.doc-2012.tar.xz 140348 SHA256 671ecf24020dc5090cb053054558c23738e0b1b25ae7d8ae9282cd896a490435 SHA512 8e4d4175127090bcf0ac7ca61df19263c7fb5bedc1bfa88100bee4889c3278dfb07d11cf297bca5c72dd00749ffa0f13bdcb8133ae362cbc52f1e53ee2ca8678 WHIRLPOOL 42746cd14b2375c9692fbcc45314eafd4559a5dbb83088b7852f0e2b4b99e025c2544f5140de5e401daf3a9298418d7629f77359a6fa9d97befef2fffab5d775
+DIST texlive-module-texdoc.doc-2013.tar.xz 140544 SHA256 acf039a9daec91d0ea57fdb877efa3bcd872a1b87b35064c7e64c715f74acb08 SHA512 57056868e93ecf814960d9866f52891ce7639d6c15bc3595a22893b3613cc248ac36a7bc0778506ca0e5633d39e99c99d467d4b9de8b2378c1541726f8e9da4d WHIRLPOOL 8a647abf1c8d14fece931bb78ad2d95cca17244a008c17af006e2d65c6ec25937b5f60967780f5d8f22af205cbf27193fd9b74241a73812f1de420a6779f4bf2
+DIST texlive-module-texdoc.doc-2014.tar.xz 140556 SHA256 200bf5fa2326f5886d2da18bddc41b480cd979ac75e4398987bb9d9d996bbc96 SHA512 ec0c1caaee1fdcd4cf0b1272fce841a15f7dab768544ec566125bc4e29ed3de1456d0985363dab96a29a8a0c946383dd456a6895a39e3465a75f39cef49193e0 WHIRLPOOL d72c7eb0f9e1ac4ddd21d4bcfedba97c79f8cf0849e044b4bf79bb5f21e4069409122b733d261e26f3b1a207b4c9facb817d5a9c78ecffb1c5516e1dadc816ee
+DIST texlive-module-texdoc.doc-2015.tar.xz 140556 SHA256 e5bc3693d2d07aec0e5764e92dd4c3b1c7864acaa8c3332ed4debd7cc0b5675a SHA512 d3ce4114a693186cb3d251d0ac1f8b4092cad63bb8e3ff69f7610b12fdf5f17ed03f17012cd5ceca2c07975a130b915d56257a232b9d8624a95a45f38a19c1df WHIRLPOOL 525952ba4db79e5a835418608679426cf4daf638abb0cc5ddb8df4d1a21e0d072c9a9d4c831c49da770e1f6a92889fe0745f6e52bdfc7491a5c6d5e9c091c950
+DIST texlive-module-texdoc.doc-2016.tar.xz 157712 SHA256 6a80f701c0fac66a752899dc170c508d7fbf6ebd313b6cf18fe8bcf4089e4a5b SHA512 ce82834e0ed4b5698f957059548e86bcb3e4348cd58e220b824bc9aad72cefd63c775fb371c03eba4c27811ce8083f2eb147db560ae28c60744f4bb7cf3c20ba WHIRLPOOL 468bcdfe17f351444f28ba03589766299f5457709d67b751a2b9d8cdec94913bb8f4cf803816b6a1feabff2118a7f8bcc3933985e91dbbc7f08aa27db94d3769
+DIST texlive-module-texdoc.doc-2017.tar.xz 157676 SHA256 b489acef4ecef880294ba6a503be06f8677fbfbfafa5d8e0ff0b0d93a0d2754f SHA512 52ac9f9406c18856aa1f1570fa52e7ba4dd29b84b10a9c877dd88561248d48b8aa954ac4260d07018e2873dd5a43cf3c02bca02a87db2470d72c6becb115fbe6 WHIRLPOOL 3c697d05299a84e1b083266a3411c71a450bb9a445d7866fb9390e53c2c19ed80cb2962cf6b633caa4f159d5811d2b96721ae7fe1705d3b7925ab98e7aabd0bb
+DIST texlive-module-texfot-2016.tar.xz 6148 SHA256 7437c2a4fd5d7423e3bec118fa83d9ce9d65db1f5477643ec70112208658285b SHA512 40b6db87dc624e9fde0c134b982920fd59b29d771b9a8016870f9c161befbf1d0f3a6f122c20363285e7e71b2aa8464cd1fe4afff2c9ea96b850da4a0841e6dc WHIRLPOOL 8e4e7615519ffdc57ae30ae4ae8c542748922c3fb1650bb0ae6d1bc5933ffb01f9f5bd0ee3e7b3235ac0a34aaec304dffbbeafdbd631a4297f1e94dce195bf18
+DIST texlive-module-texfot-2017.tar.xz 6148 SHA256 7437c2a4fd5d7423e3bec118fa83d9ce9d65db1f5477643ec70112208658285b SHA512 40b6db87dc624e9fde0c134b982920fd59b29d771b9a8016870f9c161befbf1d0f3a6f122c20363285e7e71b2aa8464cd1fe4afff2c9ea96b850da4a0841e6dc WHIRLPOOL 8e4e7615519ffdc57ae30ae4ae8c542748922c3fb1650bb0ae6d1bc5933ffb01f9f5bd0ee3e7b3235ac0a34aaec304dffbbeafdbd631a4297f1e94dce195bf18
+DIST texlive-module-texfot.doc-2016.tar.xz 31680 SHA256 e0221470cfdee49f70c98b22ee6c31173527c7140730b02fa9f5d76cdcbdb98a SHA512 ea12297d42d3ee6166aefc6a08507a9c1840c162ac837d1a3705c0e4cb7c4bed57c483ad6ae8ca01f487e492a88c2c0d9fdf7f07833553aabd07112a0aaeb786 WHIRLPOOL 0d9c791b2758cdf06068211487fedfe2caf890c8a25e86796f2639c93ebef85bf89fd3eb3b204f7b602c13baf64e0f18f7b83c73f27571619f852519f38ffe90
+DIST texlive-module-texfot.doc-2017.tar.xz 31680 SHA256 e0221470cfdee49f70c98b22ee6c31173527c7140730b02fa9f5d76cdcbdb98a SHA512 ea12297d42d3ee6166aefc6a08507a9c1840c162ac837d1a3705c0e4cb7c4bed57c483ad6ae8ca01f487e492a88c2c0d9fdf7f07833553aabd07112a0aaeb786 WHIRLPOOL 0d9c791b2758cdf06068211487fedfe2caf890c8a25e86796f2639c93ebef85bf89fd3eb3b204f7b602c13baf64e0f18f7b83c73f27571619f852519f38ffe90
+DIST texlive-module-texlive.infra-2012.tar.xz 201208 SHA256 5fe00631127b70ce82a76d70f3b1b71bef0eacef875bf3558c136a76943cdc04 SHA512 7f665d9a1bd17c96085829f56560fce1021e27e33a5448bac38b4f80c0632592038e1f867cc72ad28a8164dbbd460b1d9c63a4c29f6d2419c9f59eec4f897c0f WHIRLPOOL e4b6619a7bbc863388d2e568755abef3b953e632b701f8767e801bb7ece28f87920b1af61066721a7b5e1b8934dd4a153f7ed3a16b5ddcb3b3ce8a8de3aaca17
+DIST texlive-module-texlive.infra-2013.tar.xz 208688 SHA256 4863956f78c100dff87001a4a866c276803bd16f1db7c50a44fa07bc1e87e8ba SHA512 b0155d3a8d47d49680cf70a68862f856730d63f3f1d7b6c556491b3251151b499a646c05253c9c372e0032247543b48743391cb06de268de4a0b9ac56ea0105c WHIRLPOOL a6e26140dbdeb6f7d7639559ad5768293680ff0946e53e1936ba406fecc74352516194cf9f6e5e252fe16bdbe9a92805e8f03524d25c98c97bd4c9f733ac6a1a
+DIST texlive-module-texlive.infra-2014.tar.xz 208212 SHA256 9661472c9e0311daeaff1c6cf0d1d973325ff6332e8a51d9e60821eb45b31546 SHA512 f44336f0ecaa56e00c6cbb6299746315294cea658b3b1a7b0a06c54b17c2698d422eb5727f5da4ebbfc63b4f441eaa87c0cc2023a260efd27edb5bd8d2be645a WHIRLPOOL f0e59fa68d39670afe7ee37307c28368d93276079b60273dcfef6c41e83d69cfa788b75ce43abc75359cc5a051e2aa921f6b99ab7a5f3f512c19f23cb713118d
+DIST texlive-module-texlive.infra-2015.tar.xz 211924 SHA256 c7ff0b9a117a527f9f9426577f768635597b0834fc493601019a6c8667143ea4 SHA512 5e539b43b3360bd5ab828e0f3f5669e17e16fc0656999e6c239a7bd50a78c866b32b670dda1c97b1fd15701a3a31ad7b24df6ba351e75260ea9ad50f83747f0a WHIRLPOOL cc4eb88fcad84bfb147b8cb64f989205751159954abec1b1a80e622addf5c2bc51d9f368666bf70adac437fcf59ab972f26e05d8953ceda8f2e170eaa474bbc3
+DIST texlive-module-texlive.infra-2016.tar.xz 194264 SHA256 25323dbf9d5948611db87e8e0a62fd7517345afe62e62ff82f4659ad3c0b5153 SHA512 583a28fd7a23a68f7a3dee0060d98d60e89e16a32d054604beefd73d1db951ba81e4ae8142fc60deb35bf8ab8b6449a36e99393fe1a5eee086a50b3af431f1c3 WHIRLPOOL 5c0cf9363a4fbd9a41d678ac080a0bc3ad7be16351ef73e26493433830a44266e1f283a4b7d1d898d543a179d87b2288fe03585c17f65a632077d4382f486e07
+DIST texlive-module-texlive.infra-2017.tar.xz 200472 SHA256 cd19ca409b2031b5581c332ea2caeb3a7ea5c209c1c402060d07c9c72927f05c SHA512 13b73020baaf358a4812a10ac17fc22250fb9383ba1f1d535b7f25f2354e9f4fceb5cd6f479f38c8951d4894ff6315315fa058ef415ab11d4eea03601308ad53 WHIRLPOOL aec1c1fdefe179a7d2405f4be5f20a564c4e11203a0d51b52283b529884100dfa92167b0ea081616997e59a8f61cd34cb70f48501264702ac489ba34eaabd360
+DIST texlive-module-texlive.infra.doc-2012.tar.xz 87012 SHA256 a4c83ff198dd01e1fb892367e56e9acd306cc931f1a3163956dba8f32d7dccf8 SHA512 144986792b7f47fcac25a246ac910b0e10f12e827944a4e5f2a005611f2f15e3d295f3ecc41e8722255aa46c1d8fff774614d7440e0f916feec5fa493ff348cf WHIRLPOOL c3e71f58d8e5fd66c4441270bc93ee82f3bac012cd7826efce404e4d523d3c3d217f62d635968db46c9bb91662ce827d32d24c154e8f1f763ac2c2bfda252a47
+DIST texlive-module-texlive.infra.doc-2013.tar.xz 96212 SHA256 15523845f4f107fd568c8f65dd43b04a07e10de67224ae5cc363fa4ca7320d47 SHA512 57d81d60a0c9a4b43199379b284edd758cca674abd1f45cbb6c62aa8af1efc69b34da2a8420343ca9d19d45802bd4215fb97a3af77262baddfa88fd736c1f7ca WHIRLPOOL 2f91c73adf4b4bd502dbc7c16031e3e75d8f27c5d06b8b95a4ec8e11d6c78e210e70f63cee57e8a4c82ff7fa7072255463571479fc0a43ed6f3f59b8c876da00
+DIST texlive-module-texlive.infra.doc-2014.tar.xz 97624 SHA256 244c6911d1aa894427934f1ab56ddae33647a78737619aed71864c46836a797a SHA512 7e51c659b69af5b068147b8839dea86aa0d7ea34592cd6e9a16e3e30fdbb9c10b540bfcbb47edf3cee4cb287fc050d04fb50dd1aefee5e0b76b503658385c55c WHIRLPOOL 397f08f9e036f65321b8ba006dc7814a5367de81f4553bf592d8014aaa33f1134670a7698e776751c97c36f5ca4da11ac0c75b28e36c312f5c49f92e74dff37b
+DIST texlive-module-texlive.infra.doc-2015.tar.xz 96312 SHA256 46e123efc4fbfd4d727d027ae9dc1ccae39f5f7728b220768161d5df58f693de SHA512 5cc285015d819c5f88f0a01beee1fcf145957da2a483005b26034997ca7a5a01a3147b392fb6f7ffe5d8dd0d07a8ad242acfb7bb391d6db0f7038a617916142b WHIRLPOOL 6735d74b9a53c74579e345ce5a9639d3937bdaeb4b89ec2c29cc956e955c3981e4c4c48b3fe09b6828f40b26b4e566fd1df634de9d94a4cb5ed7c49ee83a372d
+DIST texlive-module-texlive.infra.doc-2016.tar.xz 168904 SHA256 3b0382ff68c4bcabf3caddd1dc5596a6916e02ce94929751e1e16cdbf7352fed SHA512 dd7c466ca4c94c81a0b7bd0d3ce5938c82f38c878a5b1e6ea68317f064ceecb43f02616c303265998f92bb486f3eddbbc3d6d16cea8c92a57e01f1591219c710 WHIRLPOOL 7df11fa9f1e2d84185d33570774fb85c4f6b9c8b7ab5ad68c1073f8e19094ddde1b0a6404e26729863a1fa6813239bd7285e9ed7d8a5cd6bca0014584a86e5f5
+DIST texlive-module-texlive.infra.doc-2017.tar.xz 168904 SHA256 3b0382ff68c4bcabf3caddd1dc5596a6916e02ce94929751e1e16cdbf7352fed SHA512 dd7c466ca4c94c81a0b7bd0d3ce5938c82f38c878a5b1e6ea68317f064ceecb43f02616c303265998f92bb486f3eddbbc3d6d16cea8c92a57e01f1591219c710 WHIRLPOOL 7df11fa9f1e2d84185d33570774fb85c4f6b9c8b7ab5ad68c1073f8e19094ddde1b0a6404e26729863a1fa6813239bd7285e9ed7d8a5cd6bca0014584a86e5f5
+DIST texlive-module-texliveonfly-2012.tar.xz 6144 SHA256 81d276b4f7e9a4579ce889a0a4722ffbe1a0b1ced16aa06426acda9c2e73c71f SHA512 a43746ea789f47536e6066ee3bb0e1ac3c06e4cf026c0b0af730e1c6fa4a16fcce251a87f0f06500d85f4c0bccb8269480865b62c28be9c1334e6178d6e03071 WHIRLPOOL 7f99a942a644a18e9184cbaa80738dd9a5d24e2b54c01eb023b5a4bd3b7975bf6f4bfbc51ad15bad5503f21193fb6203174f06d1a360b114f5a8a07633c8636b
+DIST texlive-module-texliveonfly-2013.tar.xz 6144 SHA256 81d276b4f7e9a4579ce889a0a4722ffbe1a0b1ced16aa06426acda9c2e73c71f SHA512 a43746ea789f47536e6066ee3bb0e1ac3c06e4cf026c0b0af730e1c6fa4a16fcce251a87f0f06500d85f4c0bccb8269480865b62c28be9c1334e6178d6e03071 WHIRLPOOL 7f99a942a644a18e9184cbaa80738dd9a5d24e2b54c01eb023b5a4bd3b7975bf6f4bfbc51ad15bad5503f21193fb6203174f06d1a360b114f5a8a07633c8636b
+DIST texlive-module-texliveonfly-2014.tar.xz 6140 SHA256 b2f3e4f35bb26f8aa404ff530a82a2e130c497e441994e0096f2f34eb7ef216f SHA512 6ecd957140aae2bd565646d3a31ee9e14c879707f2eb298886d1e2f844719b1413c8f95ea4659e88a2d5e0910e95781d5009d415ed03f0c8f3fc63c876a6cd79 WHIRLPOOL 62f5e50a3bb539fe36ba809699ae0b4da0758cd8ac97f09d7768f2b0602417c905d2b964bf62de9ea519cb3ec4c211660987974d2890a99c54e411de512ae824
+DIST texlive-module-texliveonfly-2015.tar.xz 6140 SHA256 df4e3ee5a5cad3b3140e49ab5c97006d705f3893b2d0042e1d22c06758dec844 SHA512 527a6612850e604c500bbe9e86b5645dc5551e41f46b55c22fd932ae52bd38fba24a5aee7e1ba5597cdf2e0525e765232bc1912715e90855a438a12db238178f WHIRLPOOL 7eb12886837628ff9060fbf08dc71a394b564d504cec1a745dab2e59d7f9b9a9a86742d70586a5679e87aa44a11c3e27fc4d29d783d701a1d103ba704340b5b9
+DIST texlive-module-texliveonfly-2016.tar.xz 6148 SHA256 cd46e9c72345dfa5abe15248fdc09c9061bf6d0c1a8c75c4f5095fe0cc8a322e SHA512 76a4b3efbd55ca1ec655fb72afc6074186357d672a586926eeb893726f77e3f5cfde10d5698952e079bf953ea1a8821e76b6f06ff46229516433aa9d6f27e440 WHIRLPOOL e83f61d24a7e78c7e24f5297f523e4cd57813be1fccd3832b6ad5e142524363963fd0373dfd1d8be6c28756d8b08fc86f91555bcfdd35b40a82e5f43ed08bd56
+DIST texlive-module-texliveonfly-2017.tar.xz 6148 SHA256 3777039b8f283de591d1eaba83727fd8692ff2c454b03f346f52a8fe84c64d60 SHA512 dd18460601a387dc43587a81e6e2f1b3282c84340a1c1e89644eb22718f4d911f9fe651707645237cf74b07d9b05b8c5cb54741698141e0f3cffd6d184289612 WHIRLPOOL 6200007c62141674c8014800d2d39b0c51cca3d766a354b176699a035f372f23a84ecad7cbabde8f979e57d9f8af683d72b6acb6263b9195e4b18f2cb10ca40c
+DIST texlive-module-texliveonfly.doc-2012.tar.xz 704 SHA256 939e915e8639bbe6419d6443536c9a4993f0994fbb084bc1d27603c28c3ddd46 SHA512 5faeadea23eaa50c8609a1059af31ca4149fd90a5c2ba3ff501a0b8559d2504e52093cab79115754c1038ef932ea96f7cdd378d325940bde3984c3d3637b774d WHIRLPOOL bf063ce33355db4e0b82e568305f1e84acf403b294dd5fdfc2f3b048b6f1020d0a6f6932a839d27959836b0fe61c15cf8bd4e6cdb3164d70f1e641f8f398ceb8
+DIST texlive-module-texliveonfly.doc-2013.tar.xz 704 SHA256 939e915e8639bbe6419d6443536c9a4993f0994fbb084bc1d27603c28c3ddd46 SHA512 5faeadea23eaa50c8609a1059af31ca4149fd90a5c2ba3ff501a0b8559d2504e52093cab79115754c1038ef932ea96f7cdd378d325940bde3984c3d3637b774d WHIRLPOOL bf063ce33355db4e0b82e568305f1e84acf403b294dd5fdfc2f3b048b6f1020d0a6f6932a839d27959836b0fe61c15cf8bd4e6cdb3164d70f1e641f8f398ceb8
+DIST texlive-module-texliveonfly.doc-2014.tar.xz 704 SHA256 2093239713404067bcc34cd9469b46038d40aab85bd1c6d115074e860b2c43ab SHA512 834c0c3ea612c4b697e435c899408ad8106802351a446122448e8e0684a8885fcc7733f0b8467f90daeb88730346d5447ca2092d5a9f7174695e2b0b04dc315c WHIRLPOOL 49210fc0c17870b56972ea81038cc8daec083b078ed4a5706de272e9cb8ed1d02f2c424d4bc257704447d898c66cce56736dab600dae00376412f330af6b599a
+DIST texlive-module-texliveonfly.doc-2015.tar.xz 704 SHA256 dbe0563a41290c7be66495ea4b8eb7cbbe29165bbc1216fa6b77f9674e0a231f SHA512 e95a765c8efa426ec4403b3a0b8e30569ac539111a41b4affcc87e21d69980db7b7d3fa88c6b2775e56ef0caf140832630087cb47b426cd2b030fdcb03091f46 WHIRLPOOL cb087b622f24025782d579a7edf1e67b850e9f34481da4a4e1ab5f98a791c5be58aee25215adcb4ee49b0fa7161fafb0c32271685edad05da11ae7fcd47696c8
+DIST texlive-module-texliveonfly.doc-2016.tar.xz 700 SHA256 ddc7c59e6a089ffd9402c6f437f02927911215676707390d8c732f5b605b41d9 SHA512 e84543231522b62de362760cec32e57321470382b6eedc944b5f02200d9454f10a743397d48acef3e5f926f378830607f9fea20208d5aaca0884cbc4bf6988ce WHIRLPOOL ab63729400845eb52d36045c6291149866f8d65a8d9da9d66b24353d0db607309f1a873cbc1a0ce44968496f7827f01bda5235c9fd3d57e05b06f417e951bf87
+DIST texlive-module-texliveonfly.doc-2017.tar.xz 700 SHA256 ddc7c59e6a089ffd9402c6f437f02927911215676707390d8c732f5b605b41d9 SHA512 e84543231522b62de362760cec32e57321470382b6eedc944b5f02200d9454f10a743397d48acef3e5f926f378830607f9fea20208d5aaca0884cbc4bf6988ce WHIRLPOOL ab63729400845eb52d36045c6291149866f8d65a8d9da9d66b24353d0db607309f1a873cbc1a0ce44968496f7827f01bda5235c9fd3d57e05b06f417e951bf87
+DIST texlive-module-texloganalyser-2012.tar.xz 3476 SHA256 84d5c1df6d597cda2d459f70c7e37df4564999c8c75bfbf693bb5539414f6605 SHA512 c42593a18f238a5007fb8383d2d5a0d83928fbb57cdefc31fc6cf1e3bce89950f74ab3123f17ffebaef6152fabbc056a09a197b5067466e3cfc3f3c418ee71ce WHIRLPOOL 37ad6ba475d30edc7a4f5d9dfa0a312100665563cea1da55b976620c8a14584a7dc427d0eb61a1ab6a393ac4510b9b7ae859b374fec053f90580c7cfa93e6d7f
+DIST texlive-module-texloganalyser-2013.tar.xz 3476 SHA256 84d5c1df6d597cda2d459f70c7e37df4564999c8c75bfbf693bb5539414f6605 SHA512 c42593a18f238a5007fb8383d2d5a0d83928fbb57cdefc31fc6cf1e3bce89950f74ab3123f17ffebaef6152fabbc056a09a197b5067466e3cfc3f3c418ee71ce WHIRLPOOL 37ad6ba475d30edc7a4f5d9dfa0a312100665563cea1da55b976620c8a14584a7dc427d0eb61a1ab6a393ac4510b9b7ae859b374fec053f90580c7cfa93e6d7f
+DIST texlive-module-texloganalyser-2014.tar.xz 3476 SHA256 9405b46cfc7f91970c3b0b9f9f674a47b0706baf0b12efb098c59b6f8f1b749f SHA512 871d9b1bae28858ac968ff52ad9377fbee2dd4250aa96700b710b32888f93283d93d2da24ce0d2c36fae7c010f8cc5d8b0381ae7cec2c8d4a01c02313797c4cc WHIRLPOOL 8a37973f54d2b08f3eb64543d9257bdf89f41c7ee2d0f9b79076b65ce98d944b3e9b8ce3220546fda37fb527ccaab838a28d431a30940e6028e653d5b858ad02
+DIST texlive-module-texloganalyser-2015.tar.xz 3832 SHA256 bb655facebd91238f0a1454d06aa8273953d5ddd8a96462322d977cec18c62b6 SHA512 509467329e8a3bae07efac5d43392a608cb9ddde8b4e5cd9ad8d88c285e753865db242513f9410564316326fcc64e3218233dd4d029c58d08c11caeb17c35065 WHIRLPOOL 2337fbc93a6f83cbf29e6c3e50c24abe70f24e3d856e42e2c9d4bcc5b48acb2840f96d9a1c76cf4ee99d3126047c9f5a84419dcf263a1718f1b5d66ab8859923
+DIST texlive-module-texloganalyser-2016.tar.xz 3844 SHA256 85b253395056aae453e80951b77503c8cc7b7a1bf6caec27dadbca6522c22ed5 SHA512 4ad74a418469bca56eeac138830d4e4020b3a0c3db36b0fbd25b89bd14367219590ef5d948cab79f22f1acccedf4b0073a2ace78447075242a66b40a1b6faf93 WHIRLPOOL 14ef65e450ad69240fff0f9934a38be41fdcacabafb9eb09ffd554908559ce8334f2297a39947790adf87b557ac6831e0c84614b0aa931ee0076a97a8b1a4117
+DIST texlive-module-texloganalyser-2017.tar.xz 3844 SHA256 85b253395056aae453e80951b77503c8cc7b7a1bf6caec27dadbca6522c22ed5 SHA512 4ad74a418469bca56eeac138830d4e4020b3a0c3db36b0fbd25b89bd14367219590ef5d948cab79f22f1acccedf4b0073a2ace78447075242a66b40a1b6faf93 WHIRLPOOL 14ef65e450ad69240fff0f9934a38be41fdcacabafb9eb09ffd554908559ce8334f2297a39947790adf87b557ac6831e0c84614b0aa931ee0076a97a8b1a4117
+DIST texlive-module-texloganalyser.doc-2012.tar.xz 512 SHA256 d600cb9a3ac8fc3eedffff7286d9c299651a5a578be7e7d8940733a6e08ee57a SHA512 a5c250da447c2e3128f50b3af48f9cd6d4b4d40206e45f901bcec80e70edb00b3317bc7e50a3431847b8d888a592b2bfb391b3367f04de6f75bbe3429c24ee25 WHIRLPOOL ed8dc3b142b619773847e6e5b426141aa09eef564ae9e14eac4f6e2df3ab654d766f76beefca337e7ece3e0b1a333baca6774f9252ea455cd5150a0a92a5f26f
+DIST texlive-module-texloganalyser.doc-2013.tar.xz 512 SHA256 d600cb9a3ac8fc3eedffff7286d9c299651a5a578be7e7d8940733a6e08ee57a SHA512 a5c250da447c2e3128f50b3af48f9cd6d4b4d40206e45f901bcec80e70edb00b3317bc7e50a3431847b8d888a592b2bfb391b3367f04de6f75bbe3429c24ee25 WHIRLPOOL ed8dc3b142b619773847e6e5b426141aa09eef564ae9e14eac4f6e2df3ab654d766f76beefca337e7ece3e0b1a333baca6774f9252ea455cd5150a0a92a5f26f
+DIST texlive-module-texloganalyser.doc-2014.tar.xz 512 SHA256 fd7d05340cb2d146a36719c31223179f0e5705ae38cd2d7d7f00d4d27545fd5b SHA512 1f5f4e8ccac06af16e595fe27354b0a7534d363da18545a268a14d9aac53953313fe5d349e6d841cf745fbced30835541a6e752b5800ec532e34c4faa6794897 WHIRLPOOL 4f31813f9f60ddcdb949afa0253492c6600ee5c1e669b1123cd36a0def9f5c5a9eef4f923b7530e6170146cf61db2898b6dd170f22f55952dfbe25136656eb46
+DIST texlive-module-texloganalyser.doc-2015.tar.xz 512 SHA256 11f8fa1ae61b6c210c539834d148d0dea0ad5139fbcd0dfcd2e1a0ddaf71269a SHA512 3974918e8867d12bf467cc5933d983159bd7cb087f038dccd5813e6b5c39a312589a77fd1398f2645f51b221181c6b1cdde8d86f5972b07b159d166a9a8e152a WHIRLPOOL 363a4f5f521c170cc42c660698716bddb98982acc499dee849452f0f7352bf9588d72d101ae12920db5b8f0de1809dfb39290e9627011305ec80ddb4a90f9bbf
+DIST texlive-module-texloganalyser.doc-2016.tar.xz 512 SHA256 31e61daec377d59f871749ecad6b1255e9e3474297613ae7760aec45b0a30173 SHA512 4d570f8377ec751aacf39876c2fa0235c0aa4a348c8716cea24c740516bbc2e9132318bf11d003bf15566c825ff059893ce35a1bc32564e670c29932cd2c1769 WHIRLPOOL 1f2f8e24c8283b8fc0a37fa787de7189f064088c6a9224a51fba234b55a586789a89e432ccd4b32ef4873b61664e875a070fc8e285751fc7058c7007bbac0be4
+DIST texlive-module-texloganalyser.doc-2017.tar.xz 512 SHA256 290eb73127e90c9a552eed0a92b1ee2736cbb15bb3d3476ff20e1049dad1e0a5 SHA512 922b73d9948fb8a0c79d553d7ff96389172fc924ec03f400a9bdccaa288bb59163778b01cec5ac74df700bfafcaba3d961a22bfb9b025f47440ec4b718bd81e6 WHIRLPOOL fcc16316b54a1b3f0ecf3fd51c527b0c1b510bf0114da2689862ff4cf670c29ce40e1dbb35225adae771acfac505cc5c9ec07f111fe45735426f4829b764be23
+DIST texlive-module-texosquery-2016.tar.xz 9128 SHA256 52e10c74676e569371e717fb56ea3cd7a452b81314b4b218cd480962faf2370f SHA512 556c649291fbb33ce2e18ddb30d5d5206055f8d656adf4d2d956eb8f0815e28f644dc07e293e4e98088ca0dadd9db396e38effe04e6ea978de0b68c3ca845dd9 WHIRLPOOL e23b5eb15f4a1627370cf1d9b5506f76c624a4091dc9713dc004de005b94cb93de76113931a4531b27d132aeb8b8a24a4d160c08dfae1e8f6d1c1f9cddeb82cd
+DIST texlive-module-texosquery-2017.tar.xz 163988 SHA256 eb62d387b7478b7875e98024d17d80cfc03d9d68b000157034d8a67992b700f8 SHA512 3a34bbdf928908993cdbf0287680b0136ca3a43e4bf7ac245ac4c15cc2f55cfc9f0e80d4e8a443619d8ecea259d7541790ee1cfbcc8dc8094295b22c77dbb8b7 WHIRLPOOL 01c03a1b87a105216cf312f7624f59adaea78790253ca91a1a7fd4db4804b0bdb06e2aa5cae70b840d638e57aaf59a08eb5886bb3e3f92579b0fb8ee4cbd4c2a
+DIST texlive-module-texosquery.doc-2016.tar.xz 253000 SHA256 dc9b70e2b19f3f176b9ef8c66d4eb1b36a5549c07c007309e5da49f0f225c372 SHA512 c0c9076b9a7d5cf2a7c81bc9a90cc75f41798e7b67eb76bdd8047bbcb542b67034b42edbcb8d0c7b6858204af375473f2bb29eb137f36a93329f008dd55e6850 WHIRLPOOL cbcc1b2e3f1c5ca36e6aaf52af4620d581b43066230651e21515d3d3b7b01bbdb905c58f3d7d8024fae83e6934f6944e6c917daee6b2b6ab13a1428f017f8dc0
+DIST texlive-module-texosquery.doc-2017.tar.xz 496380 SHA256 e4061ce02780014b8f5da5d7eb3eaeb763d7bc9a6eaf865ee92e4eeb7acf0e36 SHA512 b57a8c02deed662b5437cc1d739994f69542ed307ea5b37ea6d1f7dec45e441e6d05458e8cacd6837d76598f0a83f6c912152514e62791e82b403a27534cf7d3 WHIRLPOOL 90dba77c284eef343d18c41339f116962ec4876fc7237157246b67ef59f3cf9ab69abf2856320843e0484c5a9e1472ac8773f5d56700a6a74ab0c07c344b301c
+DIST texlive-module-texosquery.source-2016.tar.xz 11556 SHA256 d670b70bf28b2b67e7dc9d6c730aaf9a56ba06349b95eb57b9728f2d83b68f08 SHA512 8b7f75ae1cab5f2821b57b0ac38fd60175d44f3582f52791d505ad27718d8e9b38bfb0383a3cad35f4ce0c39d53932a689a64d6135ce06a5e04530eb09de3a8a WHIRLPOOL dccdaacc6814dbccdcd9fed64239f505b502f3fcc57d28b7b527ee89e08851fe2f883262667d3fd3a3e6a08abddb951ea8220d70d3d97120660c219f12b8c040
+DIST texlive-module-texosquery.source-2017.tar.xz 69084 SHA256 80b286563e446f89d18ed83a0db114e3ee780711bff4bafc067e31a8b5847a83 SHA512 d16795a95e298913d0bc5a3f41453a523278259b4c211890609635d7445d0a6eb0367d8c842a6e7df4a9ae9cf0b9ba2b9a804aa8b2ce5abd380c59958a60b27a WHIRLPOOL 18f7b15538ecb543a829b7c8d76db929e0b7ee530cede752069f6341dc1d94df7a59941d099118a6e2b3daa683ad8b93c6194bb44cda3882c60bc41d7ef26766
+DIST texlive-module-texware-2012.tar.xz 572 SHA256 7c197689311939d78570437749d9fecfad8cfdabc226844241c5a0dbac2fda0a SHA512 4af0857bcee2d093f2e634e9f3327ce75b9388311a1ebf2492c869089aa50f7e8122df647a31354686d5b09614cf1be969cb1a9804859817c856802f321f7dbe WHIRLPOOL 0216a6e22e7e970d45645917c906d0a5b3120ca895a84360dd5a7279d7aa40b19afb7dda4bd1c2684053829b48ba2f25c26126fcc8c1fcb767737614e1260df2
+DIST texlive-module-texware-2013.tar.xz 576 SHA256 7b5514dd3178c253e48406ed44d06eb177755330f65a204b27088398fba26c48 SHA512 bbd8e46c59c761fbcdf70042740654c40b67f7cc5756a60f9067baa64ea0115b5239669e524b9cd25cba66fc4bd8f249fcb7a22ce5a5a0ad36ec7e7f6f7a1120 WHIRLPOOL 22531e76530b8838c959edfbabf5a31886f08b65b09d9dd74b44c1ca8c072c9966f3e321e254ec95f413b03e8a155c58d5c46c97cdb72157e443f04c5eebd08d
+DIST texlive-module-texware-2014.tar.xz 576 SHA256 7f822e5b06c32c2eec2c1399c14c01886a03b04e375423bf3689d9e4aff0062b SHA512 81208f05c4ff102fe6eb59bd8a4fbf27fd5b8601c245b12014f6e6da7d1cb83fc180f5ff06efe1a6508bfd12957aff5ca679fcd0ace8e84ff42ebabc35a00b9c WHIRLPOOL 13316c5a9ad5ee75075841e25c823800683d4d1f4319fb5b3ce1476e3e91301634e997472746ec0c5cce4595aeaf8f5daaed613e7fcbdce7ccd15cb5201cd533
+DIST texlive-module-texware-2015.tar.xz 576 SHA256 ec3780ade07991872a5e7175a989f79b8862e2cb0fc083b0c8830afd8f17e5af SHA512 51391c326bc049c4dd2af5445d8b7eb748d480d9837728e04769ced231c5bc5ae533b1c725302566d9b1ea22da1802ee850a06461cf16c07de629f0746f3933d WHIRLPOOL 2971ce6bee51f1b9c4d6a80336246a31c2c74845398f2d4708cb279dac42779b19a6084d0dcffe64370063308da291e68b7d58fcaf9b81f6a4bbcde544c00a8b
+DIST texlive-module-texware-2016.tar.xz 588 SHA256 1311381934af24b5017563ba9ff9dc82fcf3576a812d9c1d2c884165745c8260 SHA512 5e06b23f2f5f74ada7025f5922828e38e22732f6be5234f7f464d880fa1ff6cf0300afa94c8bb17b1e3b55a4b158c36b937992f9d25d55696d81e2dce345ce3d WHIRLPOOL 610268b522efb44234a58e7e87f2d298563f068240aaee3af1323465e24631b61187a0b38276562ac0ac0c79396a0b708c2447ceaf9436274e7d54faa25f54e9
+DIST texlive-module-texware-2017.tar.xz 588 SHA256 9dda3b7d6dc0ffa70f8c8402f33dc938025155ea6b494ebc1eeed2ed4f66f9e5 SHA512 b210ba9c3492631bb63fd230b5c719e604724a66064a4fdd1cafbaa6a66e3727aa7634d856bf3c10fd8d49155a62c447d261e0181a46ae7d067ef8ebf39f2a7c WHIRLPOOL dbdf79ab182fc6e6352f392dfc1a14a44e4f983885ba2273ccf2e4a1b7665a5f077e64a45d136c769913b47466264f3e3bbe8ccd2c2d70aaa0f98b24a67d0ab7
+DIST texlive-module-texware.doc-2012.tar.xz 6948 SHA256 321ed8b5818ab709d63bd44a0de5f5e7f1bd8c1f7515564702f6602a1d310902 SHA512 e8b5bd96ea141af268105617b1bc8a232bba1f28fc5c4b79ee95f652face666d0e09455fe12a911f1bbb20bdef5b61554749fe6d0143791a0b74af41455ee719 WHIRLPOOL 7d1358b15d2b2afff1844bcac6bfffece23485d880363151d7e8ae08afccbc7dce6392b26e91821d11e01b57ab5134f8491cc0f91de8e21f4de4893af3de42f9
+DIST texlive-module-texware.doc-2013.tar.xz 7016 SHA256 3ad159d33a52899a07f36b7b841c561d8f17d1b2ea704db7f519e6c1d144f9ac SHA512 b5ce84ffdbd628897bc2afe4f854a7336f6aa45724e1531d55521ed350d2d257ab315f2beabc9b88b35874702d6a212d28a197a366fea25448f64c807e05fbad WHIRLPOOL 2ae6df940f3db7d46e377882a15e57509b07107b8f60ef369514fb48073c60221c87a8badfad07ebf69081a01db1f20654058e54abcfcd921b02e98674d20e9c
+DIST texlive-module-texware.doc-2014.tar.xz 7028 SHA256 0051d742c1e3bacad71cad11a868de756cc04371423bd586792504e0fc661abe SHA512 65bdad7bf0bbf228e711a255bdd0b4f024d7cf1f945e5ab417192d68cf6cb2438ae7374b82f1fd2daf48f6678f4318948e96d798d568dcb93278acee3ce6e80c WHIRLPOOL 0ceb2d65416be76c7e89e965d25e7aff7262e3f4a3a87b7df34caa2e0bae8c54aa8da6a1672c3488c8a25f3e71047f2d0429223f37ae568b2dfd43f4162ea5cc
+DIST texlive-module-texware.doc-2015.tar.xz 7024 SHA256 612c7f5c02afadd5781b90b9e9707e45e0390cca9009f1a42f37c6c78e0f569c SHA512 d409a24c14180dcc3a34cc6a814778a2445e07eb7b794608d36df6482ea56edbb324fd6e2d27e256853658d4a1867054ba0f508a972794bf32b640dce5eb4efc WHIRLPOOL 8b69789a5ab98e8f10f95ccbaae04afb578a7577ea9affb25848089c5a634cf3c532f28d53a75ab39a31e492147c3c317b83ee607b7bd69e539e59e15a8a2b39
+DIST texlive-module-texware.doc-2016.tar.xz 34412 SHA256 50585c69179bfc88b8b9753896f0292d5965a727e949b5491878cf4b73146fb6 SHA512 63decbabef250daf9ac5ac6ce97e447333dc7724a56850d63067dbb929b1840fa5467f8db6a310d3992e93d4dad93d6e41f1dabaeaeaf811ce2608b3bc5b7987 WHIRLPOOL 8f3b158993e37ebec07196783ba1db87c422085d2490fe5106778615263ed03662eeeb772d0a1039a57c89c261754b259ca6fadc123d7b58eb5305d13eae77fb
+DIST texlive-module-texware.doc-2017.tar.xz 34412 SHA256 50585c69179bfc88b8b9753896f0292d5965a727e949b5491878cf4b73146fb6 SHA512 63decbabef250daf9ac5ac6ce97e447333dc7724a56850d63067dbb929b1840fa5467f8db6a310d3992e93d4dad93d6e41f1dabaeaeaf811ce2608b3bc5b7987 WHIRLPOOL 8f3b158993e37ebec07196783ba1db87c422085d2490fe5106778615263ed03662eeeb772d0a1039a57c89c261754b259ca6fadc123d7b58eb5305d13eae77fb
+DIST texlive-module-tie-2012.tar.xz 484 SHA256 53b2013f1102c46a29fd7d9b2a00f4b97c53d1dd9e4803874288cacdec123651 SHA512 e4b88a9ef25223e97eea8f8c3a5c23beb552577f4f5119972950d37301f69410c3633fbde2270c624e4985af651b49ed6d3d494a646fb96c311d26932e6491c6 WHIRLPOOL 597d10e964b2131db276607b6d08fe6898f55b7f988a97a11428b4fb39db0290c65bda9d1e3487148e3410bada3fe8d31f3229995abc5beafc15bd189a417241
+DIST texlive-module-tie-2013.tar.xz 484 SHA256 a040d49f388c8b3b1869626aab47111ccbcc2cb901644db606ef0afecbad9e7a SHA512 ad8c086d8570c2513f8fb7b34f3d4f9b9b089c6d6cce668dd0f8e2f1db75279377db8226a285d2a77efce31454494a165f55e70d558bee3925ed12f63931c478 WHIRLPOOL 81f3aafde456dc7dd43430409b9e5ac1e51a90f1f4c6dab9a5a9e6dc03d6882b51f5918d19f024cd8d5c9aafac869e6b04aee78b9fda982e11193bd664067d48
+DIST texlive-module-tie-2014.tar.xz 484 SHA256 6fdcc20a8c03d94e40192e2189c90c2f6aeb5bdea3844443cca745a962484610 SHA512 e358eb044d15986d38ba9ec9ce2b38becdf1a946fd87dfad0f2c58c053cb04eb629410086a771c1a81a3f9155fb65e0a08619b509069628b3010274833ba3dd3 WHIRLPOOL 18b8a2d74c89ee303fd2db12ae819ba933ca1bf21c8bbf0b760cdc02b8baf0a73f7659969ef9072ca58bc38391182e75d25680f220c39905171292782fc3d991
+DIST texlive-module-tie-2015.tar.xz 488 SHA256 f2bf8255cc19d6f437d52fa230a6df9e94f6141a3ff001c843cc7f47f332533c SHA512 03d9523ab78fe93cab6fb420770d14d765b2e26af1e3ff396d93abdb8cd6b1f52176a863989126632841a8e839f9b635679923feba49ec659006960900efc63f WHIRLPOOL 359e922d6f64cac17f4e763796bcf3c3fdc462a5752085c0e8d8bbc46d5f6faa56b9705dc669632bdf3725fa9470896dae203fa758c46c0a740016022a1684a4
+DIST texlive-module-tie-2016.tar.xz 504 SHA256 2e1592cd504dc2e1d61cb933f1f742bf65ee0c3bc98369248dbf968152f77021 SHA512 40643ce881e2eb1de29e5c12eda0d6b93596a5160da4a83dabc5676969d41a9c04f6adec7f1d92821f6736b8cd7a5119bb45f23343e6bcc49e3b6a7564c1a272 WHIRLPOOL ee7dccfbb8f26ef4adcdbbabdbb746ce8d1fd8299a4d0eeca0a17677b708c0c2ddefaf032f65131e8d713bef29bce874c6b24fb9af189a2817c52ddb271a17a2
+DIST texlive-module-tie-2017.tar.xz 504 SHA256 b124a096e71ae51be1e10760dbad893f5236f251b6b06c704e68693490b56a7b SHA512 91d008e9f9734c4b0eefd7d016395cf095602e3efad281c01ee502790b40ce357673dac432bdc2869f917e7a71e007df871524e993cbcbb581390b85a8287b24 WHIRLPOOL 7493e321cfcacdd6dc8bf5924f8937109a9f368ae84bd62cf43aa8dd34256f5f2c10175c27bb78aa5c3f430ffae6ebea339a3c6dcf475c51f1c87aeed513ffc6
+DIST texlive-module-tie.doc-2012.tar.xz 3596 SHA256 690eb0767df2e857fff31ea05a8f76a0eba56be8369a09dfffe2497154ac6e10 SHA512 a7ce197a90a7ce5fc69a6ad7eb0a7b97f196722b9817e8cff1b93201cb903b7d99ec4924e68ef4ff94edc42cf9a58c6a9e98b44e869bfc0f961569a6d010ce77 WHIRLPOOL 6656b9a8e10695bbdc9d197795982928f090a91206375df25c55c61512cb1fc69c5373d20611e07a3fbc0fef0019e4c2c260e8f3984d03afa287c8c14c12d3af
+DIST texlive-module-tie.doc-2013.tar.xz 3632 SHA256 366bbfab331b265b3e24ac788ee4b6ebe63e72a2ae15145b26ded039ff6893b2 SHA512 0f00aba793005fd595b6b5915c5114b075e8c2489f4257329be0eed5a52a73f66f2aa2ab54b3f15667d4067ac84205f03a54424396c348f810097858c9f0f04e WHIRLPOOL bb8b08f687fa457c309c46b59df4a333a411f1c328339e06339e4eb0f41734cd2a2603cd4c22789eb3ba8993a237496bfe80925f02e0557ce35ed29175330c67
+DIST texlive-module-tie.doc-2014.tar.xz 3636 SHA256 54b71ae4ee02f8acd3b155bc8aaaca4cae79571db754d5c452dfb1f186e4d2ce SHA512 6c44aca48eb7bc5f24207ecd456c3572b2745b23974662d65e419d71ab79e8e290be9eca9b985b18026aa3fae26c49e456f698ca00e9bd7ad8d9c42bc8821de4 WHIRLPOOL 770f3394cf8aed5c37e336793a108f770871f1738f06890ea9a83210b71624a17de8d0de5e3e09dbb6f57f9dfc750df814da2a5be29829b065cd4fce8bc062e1
+DIST texlive-module-tie.doc-2015.tar.xz 3640 SHA256 c371ee02643784ad197bc37eb9670a5f6f8f785022c1d18dd096b4cb29f815bc SHA512 49275ec99202bd7d80a103e17918b4891f63f4ba1279818a9d9f007d74e24395925cc4016f0a24de63ae7344448ae14bfd043e617fcb01cd92affe6372554e7c WHIRLPOOL efdc8c147262b3fcf1d3c3ab14ae4996456adcb87d4b4fd03c5ffe2004e02c3ee512123d10ec9aa7c98255d852206123b1e3aa5d9a84d13c0ee783e552bdbcb1
+DIST texlive-module-tie.doc-2016.tar.xz 14984 SHA256 a4c07bfe0ac9fd212bd26bb50b6e04d4e240df276c7e4f91d838d77828997e3f SHA512 93d9eaaa217c1504852ad52ca04851616d5b7ea5c5d3521538ca29f16f03b28fa0ce22275f4d22026192826259ab6e80547f80dbfaa3117eb7e44517c22c01e8 WHIRLPOOL aa3985821f79fb7174874455cb0115b28fd34e0847ec2215777e153b641215e84696079d75f815862fe96bdcd8024fc5bc7ba1511d2858923a46b1c07af0d001
+DIST texlive-module-tie.doc-2017.tar.xz 14984 SHA256 a4c07bfe0ac9fd212bd26bb50b6e04d4e240df276c7e4f91d838d77828997e3f SHA512 93d9eaaa217c1504852ad52ca04851616d5b7ea5c5d3521538ca29f16f03b28fa0ce22275f4d22026192826259ab6e80547f80dbfaa3117eb7e44517c22c01e8 WHIRLPOOL aa3985821f79fb7174874455cb0115b28fd34e0847ec2215777e153b641215e84696079d75f815862fe96bdcd8024fc5bc7ba1511d2858923a46b1c07af0d001
+DIST texlive-module-tpic2pdftex-2012.tar.xz 436 SHA256 14fd8c2714f0815278071dee9978d4c96905a93ae2bd1e6c7125886a0bea0d6b SHA512 5146bc48613f2f375ee374f3c26ac299ccd9fa494b84c8288e899e1e602166bae36fdc5f9e32d5d4c146abbfd3098607008b126b7773ca1420e6e57f23e385a9 WHIRLPOOL d5441ede8e3cb02c1c35801b4ddb369070af63bea3c051f56639bd823c1eb39a2100a2c2db7b8546c7f00c5adc9964302391f40a9a72c9b038bef5f3fa3581ea
+DIST texlive-module-tpic2pdftex-2013.tar.xz 440 SHA256 eadc7a5cb5d0b1c4dff31b379ed7f33a8110a370b7cb1162df6df4b0479f4684 SHA512 278be30dcb04c54c298492a5501760ca4c847ffb8da2d8619aa352ffbedf677b6a59ac91c7a1d47cf7e474f67f110f354c28f08406310ed90b66d1c6d7bf5046 WHIRLPOOL d7c1f14f1e41277049bdaeb0dd1c8bdf6ef73dc6df51f2ea1a13fee7f1186ad8040ee8a36d6390f70334d53561063ce91de3853d655936b0f254eb997f852373
+DIST texlive-module-tpic2pdftex-2014.tar.xz 436 SHA256 6ce22069ac10f61b02370e1bf6aef0d112b1318d08e9fcc005348cdc22674daa SHA512 d423e784abae60a3377498c005ecee530009218cdc5e282b3a8bae74e6deb502878ed732612d9b7a1e2ebd69927f0176b4c52c02cd7e7f2b001ce0a91f8c8677 WHIRLPOOL 8e81c8f2dc434a80dfd0814fbaa0b459891d4c479f53a7c79593c21c4738283e970701e7cf41746e5f1a05632eabbdac9c13d1907052811358d93ec25d528a22
+DIST texlive-module-tpic2pdftex-2015.tar.xz 428 SHA256 2faabac7437ed324f578d148bc78d00c93e9b50055a6b4609ee1fcbd0895fc6c SHA512 81652209cc9d1c35609bf24f5d6e95aafb38ad64ac41acf57a305ae6f461298beb1dfabd945a780e7f004d401c0a4676be9e72d53cf4ebb3474c3d6e523d44dc WHIRLPOOL faf53cd73af0318f1c33cf0b745ee7fe736b2521679c3979bda60aa2148de67b3e488f42c0b527a4fb75a2930e7ae3a7f3e3266397ca42536742f94afed8f8fa
+DIST texlive-module-tpic2pdftex-2016.tar.xz 440 SHA256 60b4a3dd9c4645b1d23d02741f9a05c3034420206c2ae8789aa2c5d120aea70a SHA512 e12d1448a5e543f8add38ff8a573a8a4d0cd26088bb5282eed4d9fbf59451b20c120d2572e81511dfa49e5751feca2ad9f099338410f84bbda8ed927b40d3057 WHIRLPOOL 66ad4d3de5cb8d99871d7f40d78316737cc0ea2c01e8b4e9eb0ee88fef351e16268c99ffb0ef68ef3af971848f64f2d9770598ae73772977c2879bedd6b47705
+DIST texlive-module-tpic2pdftex-2017.tar.xz 440 SHA256 f1b2bfb84e0e10f588f17c1e1fbd7a25ea511b7e65d3815c45fcb79397f87279 SHA512 ff542fc31ae85d199a72d5f6913c482ee9441b31d95a109a6a9a3dcfeae41aef85e80911b9e755f11cc700765f9b40527406bc36991a2280c4b09ec63d0e9bc5 WHIRLPOOL 8d9cf7f6b1af070fc145671b40833f651d27b706906aee596d2fcbc864a35a7a3d5cac93357dc21d7aca80029b073dd2488384bd7725d9c00965978a60db8988
+DIST texlive-module-tpic2pdftex.doc-2012.tar.xz 41912 SHA256 e26daa43d1b81fcf8227d48013b893012f6726e4a6b81ed27dbe111f3dd5f77d SHA512 d3f5d3737fd2f8a588d4c27fc31351f2c638ee5ad2dda27a64d1d83b1549082286a3752ce5a24baa76e8d0731470684fb834522861502a5834e4b6bf0e0c0076 WHIRLPOOL 5275507e68d75692b3ca83d9eef692d805e6ff411fd167c6f6c8d25a8933a450f695f0c85214efd2f1c52598a792bfc66626d49b13513b7c22ef4fe88137ea6d
+DIST texlive-module-tpic2pdftex.doc-2013.tar.xz 41912 SHA256 234b95bd5f57c96cf2e74c895308496b0f82000ea62a41452a5b83e47cbed534 SHA512 06efa89ba8fd9b3fa9d9c086f582e4f6192cc657a9ba99f9e0e9775b118d5f90c85cdeeb096e461d6d2211eb945ddd7ca46fd89b0b37e6bcbf12063d0d5e67ce WHIRLPOOL 7c5fe64986f26a0c1dfa82ba9eddfae14a74f2eb8e5c316dea43b461a9e3dfc3049a22916fe56acba2e293ffb4fa4946d4492918dda2d9f217af8d71db0a4a4c
+DIST texlive-module-tpic2pdftex.doc-2014.tar.xz 41908 SHA256 308f32aec31acf88f99f31e7d45e663bb67a90ae61c6724dd4945598d8d5e7ea SHA512 f6ef7ffcd9f7d94a7d2b77dbe0c21589a26364ddb003fe273388928fe719abe6edae72b72b57bd3c22558f5ae5a02c55fe4a7e6f964d8e4876cd9e2351fbc23d WHIRLPOOL a661037f38ec314b9b9c3b5e1c6b07593fc2b786d6436140021848e6d1f8f5feb1560d9485b9bb3575b0263e9136a7fcd1986fca625404dad742276cabd51d00
+DIST texlive-module-tpic2pdftex.doc-2015.tar.xz 41920 SHA256 ae62ff32f63c0556892a3de07bbdecb8dd038312486ada4cd6b03ee8f51a8906 SHA512 059375a12423ceac27d71dbe6a69918b0d498f81a68ea4547bb1d6caf2250ad2f1d3796b172965558848fc421da9182bd75ee823c45293fd02647c8dd998815c WHIRLPOOL 1f4864e21088998ebe68363d1899a7ac5b5ab9a07fb73f071d627dc4e8a2bab9b55176311d1903068bd554782f6c0bc7fd2f5db6f3978e5c2263776c90dcffa3
+DIST texlive-module-tpic2pdftex.doc-2016.tar.xz 54424 SHA256 f8cdb9884f1e7f7b3fb0478ab43ca01e2b911897ebcfba61290a52235a214f98 SHA512 b0dccc2270471354823aa0987dc14da80a71a8a6a4491e88b695718cce84fba64accc5066737c72c033b8e5ab6945e063d40ee6e08c72e2808e3fdedec89a4e3 WHIRLPOOL 7add9ea63f9c8dfb073e795476f41a965a2c59a71bc47b02676e354a46f32a79053695c350e4970d71ba521981dfc3b4393f1c0dd7f878c2a1612a4d671349a9
+DIST texlive-module-tpic2pdftex.doc-2017.tar.xz 41848 SHA256 8d571008ae39e8fb3577705c888288a6807316060897107ecf48dd66d7f93dcb SHA512 e08e33a9c04f32bf4dd5d1f3f9be95cd36cec5998c8dc1dba2799ee9ca9ac1e9326550ecc53500c98506c03cea4fb08a766eea88ba85482ed2bd6dc03b306708 WHIRLPOOL cc549fbff378de964316c86920908aa152080dcfec59b0ed6f661e1c0f7452f96e3c0b20ea7d6ff42b4d53bf4110287ef8248e096bc9aa5a0677b4571fd63bd6
+DIST texlive-module-typeoutfileinfo-2012.tar.xz 1436 SHA256 784014d721f6a42db2f0c530a1cbd9882c126a56c50533c8e2706aa2c470f9cf SHA512 87d5801fe18ccf7db381e681335b03614711234a761d9f890ade8936df3ce871796f580e6759c981df4de66b06cf0ef60311c31648fe3ee9749c651eb43d4f27 WHIRLPOOL 2e141711ba3ec1a0d315466871311c6040996c78421176a385086b2da413870f2c3543517f96da88e7d43868b11332bc140d444baa743f67a387100b353d7d78
+DIST texlive-module-typeoutfileinfo-2013.tar.xz 1576 SHA256 c56002c22574dbb3fc77e541eeb25097321638dbb52f9866f9ecbbeafe42cd92 SHA512 cad4c00a8decbaeb22351939472322d476bbc6437a9e5d52854f13ca5b64271d156d42b0274d0a4fd7cd8a189cac8d5f88cd4ffeeaa9905426f9f27fdf3b56f7 WHIRLPOOL 6a50194daadac3166d01c98ec04b4adadb7e5fdddc4851ac06185299838b1937b89d0fdb74a9cc10a6ad38a42430feb35d9d8837df9996942807ed942ab22299
+DIST texlive-module-typeoutfileinfo-2014.tar.xz 1584 SHA256 2b72a190fa8f2566cf9696a6061420c2cd1c9003c5cc38f7199bb7462d7ed85c SHA512 9d0ee3cc607f5d26ffc3a67f9d8b07a7761d60b992a5542a6ea4cdc70816e257a8d6483a0645d1d52082723570b1a6425dd98b1579e14fde6e097442d25f0833 WHIRLPOOL 9fc77f28e5e5b465a1a024eec80df943ea1502130384deaa0388d96f5430f1bf2508a8f2b528a5bd3df0011a9f103c1a98dfc1118a1a4f85f0caacac0207272d
+DIST texlive-module-typeoutfileinfo-2015.tar.xz 1584 SHA256 6ad5c153b276d550db2b36016d85467467cedf3b0378ec9d034a393729c50895 SHA512 918d2aeeecd430ebd577995cf2f91f0654c5f5a5bead7b424e2d56cbad59023ba9fe0418d860e2c9aca38e080b8d75360d47a9460cc4d469c874be0f63d3561e WHIRLPOOL 6a7f1e04a9278441fb10911f46a0af312b3138fe7a3717a14a70053268c1aea127e3003444c3f95f9994660e1380bfcc7436e55b2eb35c7f5469af6573e242d5
+DIST texlive-module-typeoutfileinfo-2016.tar.xz 1596 SHA256 9cd390ba16fa012e8f3fb07fb0308768092f2e39780a13a6e2cfbda73e9c6bee SHA512 d287e4c728d33ba67e8c907c8c28f06d5b75660d0f5b996c917c127c903b0a6f5d292c9a97e5ed34a23d953ce62ff5b9bd357ef7674f87a60ffd71eda3d0d7fb WHIRLPOOL 9bab3cfce086124f71023cedbf4184a9bbd83bc5dc4d3b35c33a92929705beeed6b9263a7cad51390eff9d4138a74def270bc4301f232fc07827f7513525db89
+DIST texlive-module-typeoutfileinfo-2017.tar.xz 1596 SHA256 9cd390ba16fa012e8f3fb07fb0308768092f2e39780a13a6e2cfbda73e9c6bee SHA512 d287e4c728d33ba67e8c907c8c28f06d5b75660d0f5b996c917c127c903b0a6f5d292c9a97e5ed34a23d953ce62ff5b9bd357ef7674f87a60ffd71eda3d0d7fb WHIRLPOOL 9bab3cfce086124f71023cedbf4184a9bbd83bc5dc4d3b35c33a92929705beeed6b9263a7cad51390eff9d4138a74def270bc4301f232fc07827f7513525db89
+DIST texlive-module-typeoutfileinfo.doc-2014.tar.xz 760 SHA256 58197a027f6a5fff733ba8a4c19d971a8b6f0b69670e9b1a1f12a705d773dbfe SHA512 5f22a07783ce2144b3e5bd17356a68f4939cfe91e05aa6e782ac38a719ae81b4809ebe61012e08c79dbbb61f7d1a192f580fd49cc0374a825b1b9b4dc50203cb WHIRLPOOL de3ae70f43837e255d7fdb86b24d8628bc65060005b7e6305e89d0f62070f60679d6afccdde725ffe129eab500f8278d76ab8a800e1765db9154a601cb6ac31d
+DIST texlive-module-typeoutfileinfo.doc-2015.tar.xz 760 SHA256 44510f95932d59abdb3380b47a7f8a0e4d77f30e3b24ebdeeddcb0072f94615f SHA512 558e8fa93838c2c9183ae11d402c665c73b671c0d9c3e3c1aa402e5e905370cfc15ac0265a64e51ba0e30e731965e18e02f5ee04451939717d405e828c26a1c7 WHIRLPOOL 9991bf1ddd3e0e7be969c0be48294625e2007b4d516c07aa092ad3784217d34f044bc91906cc08ced632e99f325ec0e4394faf509d3f6cc6d289da783c59cb96
+DIST texlive-module-typeoutfileinfo.doc-2016.tar.xz 760 SHA256 d0a9472b81965c66349bc20bb703f8bcacec30f5c73ae13471d40d098a19761d SHA512 0e7849574a7d41f4937c51090f01644cea1ae2cc39c15fd9a146fe40a7fb7b5f9548d1e1d6f45f7099f65f54a1455bb573ac62e4debb49f529dcc08627357b81 WHIRLPOOL 8c2fac98d40374499acebaae218747a84f41014642df15d926ba7bf95b898e449e15812f81b043cbc3b6b8f14948ce1279f1ccd798258f551dcc6db8522d275d
+DIST texlive-module-typeoutfileinfo.doc-2017.tar.xz 760 SHA256 0d1cc5ae4480e6cb6a2e7b6931739f9fd98aa2c7f108d3815e1a0247b4078f5e SHA512 277b08d5cdf7d6ebef2d03644c635c0a3ead2d18e037264a3505dd1c6a7c9c7bea60a7e81fd99648efa486158d573ebd58b10b62014b5194c84386f4ab6788de WHIRLPOOL 2a65ae5aa54e62d879b9fc0abaa7654274e86084036cf75ac7d9803bc60443c7cde60487645d9f1ec421e83833385f49491bf052a830e3e584d411bf12ae03a3
+DIST texlive-module-web-2012.tar.xz 512 SHA256 bdbe20eaa1816032f99905145fb01631a9d9c2e2ca8051f9b4863ef1687d03ce SHA512 6ed075516647f0df3a287ebf4648c65b933cb59517a8d41a5c63b902fada13bf27485e5e0f51e59c338901aeccdc5913f4d7cac9e7ea2f7d027463e51b356358 WHIRLPOOL 10abf739da5fdeff3842721ecb34caec64ffc012554ba9ebd1450546fe13cb127268c2f512dc2d1db2408197dbf652c6be98c9581c4a7e8fb808ec4e91f9129d
+DIST texlive-module-web-2013.tar.xz 512 SHA256 5b5b8c95f38de17652a2464d5dcdcc98a70961d6d5b30d2d0075765164f0f873 SHA512 d3be015f8c706298041e024c8a3794f1e76527d296a3401ed4d09321dbe577a2a109ea72e6ba2b67b44ca0e0043604a8b465b2326deaf8a429b2c79466cb71b5 WHIRLPOOL 9f5d0896885b6281e2ef3c92c52bf42e4c65fb6586cadca4336e425fa482d3b4895f609d0c521019e29ac43cc8aeaf8a405b5463ad4f6f95a5638f68a1ae700f
+DIST texlive-module-web-2014.tar.xz 512 SHA256 a84abe3fcd211f003db7013a2362dc2776f8843359de9f9ec060b7a5af3a0a3f SHA512 978857a15afdef62db6686f4cdd9d33df3db0c24657e319bccfa2797bf335ee8d2556aa5e2cc5402554de59d8fb1d3836611104ee1f063be248a7213f1389ce7 WHIRLPOOL f66c6fe56dca20695eaf06fa3944dcbdc70e62999455a05515ccadd262dc24e3a2826208ff8d4b461aba542a3d60245769f3c7284e71df9dac9f99686a443988
+DIST texlive-module-web-2015.tar.xz 512 SHA256 ae8450aea5ba87929d96b027893d890ecf50a74f50ba611277480668cd092499 SHA512 d861e17f41840ffdf9947dd2c8eae06a71f1e4cf0ece5ea53f1b6a4c6a93f134faacb94f60f6e4a4fb7a88b5c4806c231d27ca65b432abc47359df721db15aab WHIRLPOOL 6478b67aba0538ae3d531e857d9952c9a7f3dbdfa65042b1837599d6d3221e81b0e47fa3abaa86b4131eff7e0dd1c8eb1e0742200e4d81be8678566f141543fe
+DIST texlive-module-web-2016.tar.xz 524 SHA256 0b866e992b4c1711e1c01d391754a9d2e08baa986042348888c205550000bab8 SHA512 8dcab0b976bf1976ca40c925182248ed9d5ff06843540eedb720fc5ff89f44594befbc084270adbb3fd3c6c96c437f248236e82252b2e4a7f48d761470c7d15e WHIRLPOOL 48de03fb47a641cc963b38a40a90fe1d60240c0d5770039f4ec9d1dca1efa45259745db6146a41f0e13e28dca8bbae2b4450bc0119993c0178810a9419248894
+DIST texlive-module-web-2017.tar.xz 524 SHA256 0b866e992b4c1711e1c01d391754a9d2e08baa986042348888c205550000bab8 SHA512 8dcab0b976bf1976ca40c925182248ed9d5ff06843540eedb720fc5ff89f44594befbc084270adbb3fd3c6c96c437f248236e82252b2e4a7f48d761470c7d15e WHIRLPOOL 48de03fb47a641cc963b38a40a90fe1d60240c0d5770039f4ec9d1dca1efa45259745db6146a41f0e13e28dca8bbae2b4450bc0119993c0178810a9419248894
+DIST texlive-module-web.doc-2012.tar.xz 11508 SHA256 c0023456ff68d89ecccf5d368c8bb19a4e90baccdda814bfe332213031d09440 SHA512 664c1b1579bfd346c6dd14f1df5919105e945e8f7e29fb0a49158e2fb9b8fc33432d6b206bdda7560991d82f577dea7decd52378405e0fec75c450addec2d765 WHIRLPOOL a546a7a57723820bb68b1152b62656e976af59390013091cfc00e9635d6bfbe223b3848f691aa7d443f342f236f8c1b126b67be6df801379ea2ecdbb23319cac
+DIST texlive-module-web.doc-2013.tar.xz 11596 SHA256 d6da8a94e2fddac6d167221807883cdfe67fab43f19ba1e4061f3f1fed2e80d2 SHA512 15298f6c808dfdbb960130d7677e33bd3e48bca6230f85870df0e8430a55a738e7f73e6dd5c3f96792d9e829bb3990a64d593cc664f2902b118f7ee316c069dd WHIRLPOOL b8435046bde4c03271339397c681d0a854f24baad5ada98b13e05d5db7151d938e4a671da8fb310789178d0e7c622977784265233561bbbb61e62fb363ed1eae
+DIST texlive-module-web.doc-2014.tar.xz 11580 SHA256 e0aae3d6cb0823adeb31c070511b069068b295480fe8d4db65f7142411df7805 SHA512 809e7685522bad25a7975b6f604f9f2279005a7a5a63a7937f71ab4ace0fa2978b69812fb0892db7b6cae842b5bfb5c1133a9cf542456a65238427fbf5c526c9 WHIRLPOOL 476ff1866a87f586066b82bb4f2796edd94b921e5e3438f9e32965697d20fa6fe00ec0acdb3018ae5d5e92d0d9573081589371429b520e52156f58c221cfae9c
+DIST texlive-module-web.doc-2015.tar.xz 11588 SHA256 730c5fdda0a1fba21fe3a565069d8d53499f639a488e72d2a77fc5bc1925a44f SHA512 82ee0445f423a43a2e5588d73f566534c6fc32772029f332d8875dab255867c9cd9036875211aff157b158bbf739b840e5aeb0670010ae55da232f375dd1db1a WHIRLPOOL 2647c642da8d8e57272c5c602b1547c9a72b6bd938f1ba9cf89a381f0b69fbd578b0c43e2482e0f745a6cd1ff015dafdcd27c21969fb61dd704628002d82483d
+DIST texlive-module-web.doc-2016.tar.xz 41924 SHA256 9b8eda9e58398ed6f8d500ba7219b076aa95ee8d0defd5cc0ece373f980b772d SHA512 1f47b9fe15e48f0c29e754ce51c563bd44bd31c5f8dc0810a0ea6c42b24e2a8b70e02ec38dcb14e6aa6603fa34d0ba72d6ae481088e105a8972c4d364df1af40 WHIRLPOOL b77f4f648276faf3d843593a0402fc0c246bf5f00d34f82c0bc2fa5c92a7127c0ab1239d0107250336b6af81d5e2499a6c6ef71d54575bbbe28e70d68a37ec7d
+DIST texlive-module-web.doc-2017.tar.xz 41924 SHA256 9b8eda9e58398ed6f8d500ba7219b076aa95ee8d0defd5cc0ece373f980b772d SHA512 1f47b9fe15e48f0c29e754ce51c563bd44bd31c5f8dc0810a0ea6c42b24e2a8b70e02ec38dcb14e6aa6603fa34d0ba72d6ae481088e105a8972c4d364df1af40 WHIRLPOOL b77f4f648276faf3d843593a0402fc0c246bf5f00d34f82c0bc2fa5c92a7127c0ab1239d0107250336b6af81d5e2499a6c6ef71d54575bbbe28e70d68a37ec7d
+EBUILD texlive-core-2012-r1.ebuild 10990 SHA256 e83f1636426dae85514b705dae3e810264842c64559ca0207cbf812b7187c769 SHA512 cdd1d265c035422f1ebef20e4d7a649b1ab4a753b3ad3523e1b448998a95aa8fb01b0a909ef7c24970abdb64a1e929c3367bd05b06453acf6464aea060e2b9fe WHIRLPOOL 5c1223441bbbc02289eef748d423961efbc9125769d7f1959c519e8c04b7f97303b3d24ecdcec5af91c7d4ba687a1627d9de1ff1985b9314bfd0eb09c0a8b561
+EBUILD texlive-core-2012-r3.ebuild 11001 SHA256 0f0c5940a2750eca0c29cae08200680b06e2a9f36c59a1c970204688d765a666 SHA512 ceb332609089330490931c2b9775f0e18eb43c1c6b8fd48ac589c5144df9d6fbef976a0dd91320a9a51c3d48ed171eb90286dc7777732aecfbeb5e42fa6ce30a WHIRLPOOL 29083adfc67efc597e81fbfb9dd8013199b690dd2ec90e0885682c062f67a34e3f1e02b84b9f7ba3e3c908336c8e3ca41a069d77f5bfee9aa6bedea577c135f5
+EBUILD texlive-core-2013-r3.ebuild 11429 SHA256 e5bba4f0939109174c75407d7125ca7aa7ef4b4e8eb011ee3853528a61578512 SHA512 f950f09a80e85ded7e0125371756aa8d788fcdfb8aba6a91b6c7117d75d0e152f18b1e7024a3d14c1749b75771531bc115511684ac1bf8a84b66f14a7719db82 WHIRLPOOL 9f1e4429a3c1267430ce9ed6786b16809334603fc577321a5a358a2e68818bcff352e1dd0d619621c05c09af7239f61e9afc86dde16c08857af597f08704f15c
+EBUILD texlive-core-2014-r4.ebuild 10720 SHA256 b3d21749e96f77f14515b7716f53b29a169b0ed9cf5def43bc141ae1ee13bda8 SHA512 efa6656f4242526b174c43eb4349ae2339c9f2f59e68190ac87dba6337b4750fc0404140e5c6df3f61a1cd96ee4a6b48279d3c8e8ae7fbd828264b191d7115f3 WHIRLPOOL 3eb54960b16066cf8624c7ce2dd77b5eb7ae623aea06909c2da0b8581e17d58a6784c739bf2db0c9026deff1cc1b2957dcc58b0666dff4a5a2dfd9ed40827b21
+EBUILD texlive-core-2015-r1.ebuild 10925 SHA256 1e0b9a7299514ef8d53673f55380b3ab7425800894220263973949db10cd1bcf SHA512 409576c65f51cc4b824c3a98d2b34273c4163b8aee3de426b0b38bde573b4dc4e08c36225aaab15b550842d86778d63780ece0d55fed0fb7070dc1d28d3026ad WHIRLPOOL 2d17d59222981f2b4e2b29bba612fca93ba459228eea19190ba3c68dce4f48232d621247eaa5434075a6585636ce87d7a968ad61bff461d002f8c52be7a66d25
+EBUILD texlive-core-2016-r5.ebuild 11555 SHA256 d545b536d52fcd3320300882bdab8c6accbb67c3900c53507facee6ebe244eac SHA512 8d17485bea8ed2f0da0b5a3443c38f8e1d78daba639033042464c609432f42a574264920b673e732193efc6a9522c015c8ca9a1529577b5c6a01551a39864237 WHIRLPOOL de7b7efd6a1d3e95c319793d564529d3488793cb1ea4b1d89a4198253c9f1b0cbb88033139d2c34a6866f4c4ab49cf10cb8ddfe6448b3c9f586c55b58e0c7f54
+EBUILD texlive-core-2017-r2.ebuild 11636 SHA256 2790f6a44b0d97b215c1428e4a3392519ce61e0d21cac56884457a29d411d3c4 SHA512 8d6372725aff445e2207610decc2b914dbb2f02aa8c26dbe4d004a2b6b6963da8cd2c88e9756d366edf4103c55dd5acc2b59b6c32e12ab20f7000a17ad6d209c WHIRLPOOL a6f0e90510c7fca5ebf43d468356d7d3966055c526e7a268aec1dbc764bd685cab70031940caf0e2a4e297211c2409d326021c62acf473fab5408ab150443875
+MISC ChangeLog 5197 SHA256 90a7784e88149f92c53380e7f062ef8fc1a4e1c6a28693281ba61c6da8f3fe62 SHA512 d96cd0b45161bd00f1d7437d243b84786848cdda4c4fcb04c3cf8589a40b113b3093208cf2b07a652ea0dec604165c8c89d87e70e3f11435229c16b31fc119ca WHIRLPOOL b245c9a5c4eac4b1b49d84e2e325e4123d7b65356db49eb4202447683aa1165c66e8d0575aa8bce3cdd5f13c4f1d3ca0c9b0b456b24fb4b840427690dfd9c08b
+MISC ChangeLog-2015 36766 SHA256 4555d72629959ea5c6dff9a514c9bb16df6c05cedd632cd8205193d8aa4ff046 SHA512 2b168370040144bb5f885ddb2b195618ffb4c37c06357d7c0b600f073b5c3cd42c407e773cd1b31c2228f7a960d92dca998820a60105f229908e845a9dc27952 WHIRLPOOL 9c988a380d21ccb48623ce4daa79ea707a07fdd763c1d36bb9fdf89f24e8212214cdf51c763a9e85f6a3a5e02cbe6d82f0a3c25d1bf595365af4c22e7793803b
+MISC metadata.xml 677 SHA256 aa591377474a0b25ff0049bc61e139944e0707b90b037013fbab7c515d8617c3 SHA512 7b82f8e7023740f6d43393e8994f6a968350656a94dbd15ab7daafb58d338f601177e87e96f3b80ce0f6ad9abfecb7a6fa669a0cd21d65b79d2c5f6ae74cf87e WHIRLPOOL 315dd59da62894a6e5c167d1958c8f512700d496c9c769dc030bebe773bfc804c9c2ae144abba3b9d46513cff20fef1d66d9a6665a00361dd0bda92fd8d0a906
diff --git a/app-text/texlive-core/files/texmf-update2010 b/app-text/texlive-core/files/texmf-update2010
new file mode 100644
index 000000000000..a877823e7c1e
--- /dev/null
+++ b/app-text/texlive-core/files/texmf-update2010
@@ -0,0 +1,165 @@
+#!/bin/bash
+#
+# Utility to update Gentoo TeXLive distribution configuration files
+#
+
+echo "Configuring TeXLive ..."
+
+PATH=/bin:/usr/bin
+
+# Fix for all those with altered umask for root
+umask 022
+
+# Make sure we have a correct environment, bug #30432
+# The list of env. vars is taken from the INSTALL file
+for texvar in AFMFONTS BIBINPUTS BSTINPUTS DVILJFONTS DVIPSFONTS \
+	DVIPSHEADERS GFFONTS GLYPHFONTS INDEXSTYLE MFBASES MFINPUTS \
+	MFPOOL MFTINPUTS MPINPUTS MPMEMS MPPOOL MPSUPPORT OCPINPUTS \
+	OFMFONTS OPLFONTS OTPINPUTS OVFFONTS OVPFONTS PKFONTS PSHEADERS \
+	T1FONTS T1INPUTS TEXBIB TEXCONFIG TEXDOCS TEXFONTMAPS TEXFONTS \
+	TEXFORMATS TEXINDEXSTYLE TEXINPUTS TEXMFCNF TEXMFDBS TEXMFINI \
+	TEXPICTS TEXPKS TEXPOOL TEXPSHEADERS TEXSOURCES TFMFONTS TRFONTS \
+	VFFONTS XDVIFONTS XDVIVFS ; do
+
+	if [ "${!texvar}" ]; then
+		if ! $(echo ${!texvar} | grep '^:\|::\|:$' &>/dev/null) ; then
+			export ${texvar}="${!texvar}:"
+		fi
+	fi
+done
+
+if [ "$TEXINPUTS" ]; then
+	if $(echo ${TEXINPUTS} | grep '/usr/share/texmf' &>/dev/null) ; then
+		export TEXINPUTS=$(echo ${TEXINPUTS} | sed -e 's|/usr/share/texmf/*:\?||g')
+	elif $(echo ${TEXINPUTS} | grep '/var/lib/texmf' &>/dev/null) ; then
+		export TEXINPUTS=$(echo ${TEXINPUTS} | sed -e 's|/var/lib/texmf/*:\?||g')
+	fi
+fi
+
+MKTEMP_COMMAND="mktemp -t tmp.XXXXXXXXXX"
+DIFF_COMMAND="cmp -s"
+TEMP_FILE="`${MKTEMP_COMMAND}`"
+
+if [ -z "${TEMP_FILE}" ]; then
+    exit
+fi
+
+# check whether config files for fmtutil and updmap have changed
+STATUS_FMTUTIL="0"
+STATUS_UPDMAP="0"
+
+if [ -d /etc/texmf/texmf.d ]; then
+    echo "Generating /etc/texmf/web2c/texmf.cnf from /etc/texmf/texmf.d ..."
+    cat /etc/texmf/texmf.d/*.cnf > "/etc/texmf/web2c/texmf.cnf"
+fi
+
+if [ -d /etc/texmf/fmtutil.d ]; then
+    echo "Generating /etc/texmf/web2c/fmtutil.cnf from /etc/texmf/fmtutil.d ..."
+    if [ -f /etc/texmf/web2c/fmtutil.cnf ]; then
+	cp -f /etc/texmf/web2c/fmtutil.cnf ${TEMP_FILE}
+    else
+	touch ${TEMP_FILE}
+    fi
+    cat /etc/texmf/fmtutil.d/*.cnf > "/etc/texmf/web2c/fmtutil.cnf"
+    ${DIFF_COMMAND} /etc/texmf/web2c/fmtutil.cnf ${TEMP_FILE}
+    STATUS_FMTUTIL="${STATUS_FMTUTIL}$?"
+else
+# if no regeneration took place:
+# always regenerate the formats to be on the safe side
+    STATUS_FMTUTIL="${STATUS_FMTUTIL}3"
+fi
+
+if [ -d /etc/texmf/updmap.d ]; then
+    if [ -f /etc/texmf/web2c/updmap.cfg ]; then
+	cp -f /etc/texmf/web2c/updmap.cfg ${TEMP_FILE}
+    else
+	touch ${TEMP_FILE}
+    fi
+    echo "Generating /etc/texmf/web2c/updmap.cfg from /etc/texmf/updmap.d ..."
+    cat /etc/texmf/updmap.d/*.cfg > "/etc/texmf/web2c/updmap.cfg"
+    ${DIFF_COMMAND} /etc/texmf/web2c/updmap.cfg ${TEMP_FILE}
+    STATUS_UPDMAP="${STATUS_UPDMAP}$?"
+else
+# if no regeneration could be done:
+# always regenerate the maps to be on the safe side
+    STATUS_UPDMAP="${STATUS_UPDMAP}3"
+fi
+
+echo "Generating ls-R files"
+mktexlsr &>/dev/null
+
+# Generate language.dat file, from texlive install-pkg.sh
+X=`kpsewhich language.dat`
+Z=`dirname $X`
+if [ -n "$X" -a -f "$Z/language.dat" -a -f "$Z/language.us" ] ; then
+    echo "Generating language.dat file"
+
+    # Save the old one, we will check if it has changed
+    cp -f "$Z/language.dat" "${TEMP_FILE}"
+
+    cat "$Z/language.us" > "$Z/language.dat"
+    for i in /etc/texmf/language.dat.d/language.*.dat; do
+            [ -f "$i" ] && cat "$i" >> "$Z/language.dat"
+    done
+
+    ${DIFF_COMMAND} "$Z/language.dat" "${TEMP_FILE}"
+    STATUS_FMTUTIL="${STATUS_FMTUTIL}$?"
+fi
+
+# Generate language.def file.
+if [ -n "$X" -a -f "$Z/language.def" -a -f "$Z/language.us.def" ] ; then
+    echo "Generating language.def file"
+
+    # Save the old one, we will check if it has changed
+    cp -f "$Z/language.def" "${TEMP_FILE}"
+
+    cat "$Z/language.us.def" > "$Z/language.def"
+    for i in /etc/texmf/language.def.d/language.*.def; do
+            [ -f "$i" ] && cat "$i" >> "$Z/language.def"
+    done
+    cat << EOF >> "$Z/language.def"
+%%% No changes may be made beyond this point.
+
+\uselanguage {USenglish}             %%% This MUST be the last line of the file.
+EOF
+
+    ${DIFF_COMMAND} "$Z/language.def" "${TEMP_FILE}"
+    STATUS_FMTUTIL="${STATUS_FMTUTIL}$?"
+fi
+
+# Generate language.dat.lua file.
+if [ -n "$X" -a -f "$Z/language.dat.lua" -a -f "$Z/language.us.lua" ] ; then
+    echo "Generating language.dat.lua file"
+
+    # Save the old one, we will check if it has changed
+    cp -f "$Z/language.dat.lua" "${TEMP_FILE}"
+
+    cat "$Z/language.us.lua" > "$Z/language.dat.lua"
+    for i in /etc/texmf/language.dat.lua.d/language.*.dat.lua; do
+            [ -f "$i" ] && cat "$i" >> "$Z/language.dat.lua"
+    done
+    printf "}\n" >> "$Z/language.dat.lua"
+
+    ${DIFF_COMMAND} "$Z/language.dat.lua" "${TEMP_FILE}"
+    STATUS_FMTUTIL="${STATUS_FMTUTIL}$?"
+fi
+
+if [ "${STATUS_FMTUTIL}" -ne 0 ] ; then
+    echo "Generating format files ..."
+    fmtutil-sys --all &>/dev/null
+else
+    echo "Skipping format files, since they are unchanged"
+fi
+
+if [ "${STATUS_UPDMAP}" -ne 0 ] ; then
+    echo "Generating font maps..."
+    updmap-sys &>/dev/null
+else
+    echo "Skipping font maps, since they are unchanged"
+fi
+
+rm -f ${TEMP_FILE}
+
+echo
+echo "Use 'texconfig font ro'(rw) to disable (enable) font generation for users"
+echo
diff --git a/app-text/texlive-core/metadata.xml b/app-text/texlive-core/metadata.xml
new file mode 100644
index 000000000000..0104ffa2fe9d
--- /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-2012-r1.ebuild b/app-text/texlive-core/texlive-core-2012-r1.ebuild
new file mode 100644
index 000000000000..5d3194187126
--- /dev/null
+++ b/app-text/texlive-core/texlive-core-2012-r1.ebuild
@@ -0,0 +1,346 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+#TL_UPSTREAM_PATCHLEVEL="1"
+PATCHLEVEL="39"
+TL_SOURCE_VERSION=20120701
+
+inherit eutils flag-o-matic toolchain-funcs libtool texlive-common
+
+MY_PV=${PN%-core}-${TL_SOURCE_VERSION}-source
+
+DESCRIPTION="A complete TeX distribution"
+HOMEPAGE="http://tug.org/texlive/"
+SLOT="0"
+LICENSE="GPL-2 LPPL-1.3c TeX"
+
+SRC_URI="mirror://gentoo/${MY_PV}.tar.xz"
+
+# Fetch patches
+SRC_URI="${SRC_URI} mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.xz"
+#	mirror://gentoo/texlive-core-upstream-patches-${TL_UPSTREAM_PATCHLEVEL}.tar.xz"
+
+TL_CORE_BINEXTRA_MODULES="
+	a2ping asymptote bibtex8 bundledoc ctanify ctanupload ctie cweb de-macro dtl
+	dvi2tty dviasm dvicopy dvidvi dviljk dvipng dvipos findhyph fragmaster
+	hyphenex installfont lacheck latex2man latexfileversion latexpand
+	listings-ext match_parens mkjobtexmf patgen pdfcrop pdftools pkfix
+	pkfix-helper purifyeps seetexk sty2dtx synctex texcount texdef texdiff
+	texdirflatten texdoc texliveonfly texloganalyser texware tie tpic2pdftex
+	typeoutfileinfo web	collection-binextra
+	"
+TL_CORE_BINEXTRA_DOC_MODULES="
+	a2ping.doc asymptote.doc bibtex8.doc bundledoc.doc ctanify.doc
+	ctanupload.doc ctie.doc cweb.doc de-macro.doc dvi2tty.doc dvicopy.doc
+	dviljk.doc dvipng.doc dvipos.doc findhyph.doc fragmaster.doc installfont.doc
+	latex2man.doc latexfileversion.doc latexpand.doc listings-ext.doc
+	match_parens.doc mkjobtexmf.doc patgen.doc pdfcrop.doc pdftools.doc
+	pkfix.doc pkfix-helper.doc purifyeps.doc sty2dtx.doc synctex.doc
+	texcount.doc texdef.doc texdiff.doc texdirflatten.doc texdoc.doc
+	texliveonfly.doc texloganalyser.doc texware.doc tie.doc tpic2pdftex.doc
+	typeoutfileinfo web.doc
+	"
+TL_CORE_BINEXTRA_SRC_MODULES="hyphenex.source listings-ext.source mkjobtexmf.source texdef.source"
+
+TL_CORE_EXTRA_MODULES="tetex hyphen-base texconfig gsftopk texlive.infra ${TL_CORE_BINEXTRA_MODULES}"
+TL_CORE_EXTRA_DOC_MODULES="tetex.doc texconfig.doc gsftopk.doc texlive.infra.doc ${TL_CORE_BINEXTRA_DOC_MODULES}"
+TL_CORE_EXTRA_SRC_MODULES="${TL_CORE_BINEXTRA_SRC_MODULES}"
+
+for i in ${TL_CORE_EXTRA_MODULES}; do
+	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.tar.xz"
+done
+
+SRC_URI="${SRC_URI} doc? ( "
+for i in ${TL_CORE_EXTRA_DOC_MODULES}; do
+	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.tar.xz"
+done
+SRC_URI="${SRC_URI} )"
+SRC_URI="${SRC_URI} source? ( "
+for i in ${TL_CORE_EXTRA_SRC_MODULES}; do
+	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.tar.xz"
+done
+SRC_URI="${SRC_URI} )"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="cjk X doc source tk xetex"
+
+MODULAR_X_DEPEND="X? (
+				x11-libs/libXmu
+				x11-libs/libXp
+				x11-libs/libXpm
+				x11-libs/libXaw
+	)"
+
+COMMON_DEPEND="${MODULAR_X_DEPEND}
+	!app-text/ptex
+	!app-text/tetex
+	!<app-text/texlive-2007
+	!app-text/xetex
+	!<dev-texlive/texlive-basic-2009
+	!<dev-texlive/texlive-metapost-2011
+	!app-text/dvibook
+	sys-libs/zlib
+	>=media-libs/libpng-1.2.43-r2:0=
+	>=app-text/poppler-0.12.3-r3:=
+	xetex? (
+		app-text/teckit
+		media-libs/fontconfig
+		media-libs/freetype:2
+		media-libs/silgraphite
+	)
+	>=dev-libs/kpathsea-6.1.0_p20120701
+	cjk? ( >=dev-libs/ptexenc-1.2.0_p20120701 )"
+
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+	sys-apps/ed
+	sys-devel/flex
+	app-arch/xz-utils"
+
+RDEPEND="${COMMON_DEPEND}
+	>=app-text/ps2pkm-1.5_p20120701
+	>=app-text/dvipsk-5.992_p20120701
+	>=dev-tex/bibtexu-3.71_p20120701
+	virtual/perl-Getopt-Long
+	xetex? ( >=app-text/xdvipdfmx-0.7.8_p20120701 )
+	tk? ( dev-perl/Tk )"
+
+# texdoc needs luatex.
+PDEPEND=">=dev-tex/luatex-0.70"
+
+S="${WORKDIR}/${P}_build"
+B="${WORKDIR}/${MY_PV}"
+
+src_unpack() {
+	unpack ${A}
+	mkdir -p "${S}" || die "failed to create build dir"
+}
+
+src_prepare() {
+	mv "${WORKDIR}"/texmf* "${B}" || die "failed to move texmf files"
+
+	cd "${B}"
+	#EPATCH_MULTI_MSG="Applying patches from upstream bugfix branch..." EPATCH_SUFFIX="patch" epatch "${WORKDIR}/gentoo_branch2011_patches"
+	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
+
+	elibtoolize
+}
+
+src_configure() {
+	# It fails on alpha without this
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# Bug #265232 and bug #414271:
+	if use hppa; then
+		append-cppflags "-DU_IS_BIG_ENDIAN=1"
+	fi
+
+	# Too many regexps use A-Z a-z constructs, what causes problems with locales
+	# that don't have the same alphabetical order than ascii. Bug #242430
+	# So we set LC_ALL to C in order to avoid problems.
+	export LC_ALL=C
+	tc-export CC CXX AR RANLIB
+	ECONF_SOURCE="${B}" \
+		econf -C \
+		--bindir=/usr/bin \
+		--datadir="${S}" \
+		--with-system-freetype2 \
+		--with-freetype2-include=/usr/include \
+		--with-system-zlib \
+		--with-system-libpng \
+		--with-system-xpdf \
+		--with-system-poppler \
+		--with-system-teckit \
+		--with-teckit-includes=/usr/include/teckit \
+		--with-system-graphite \
+		--with-system-kpathsea \
+		--with-system-icu \
+		--with-system-ptexenc \
+		--without-texinfo \
+		--disable-dialog \
+		--disable-multiplatform \
+		--enable-epsfwin \
+		--enable-mftalkwin \
+		--enable-regiswin \
+		--enable-tektronixwin \
+		--enable-unitermwin \
+		--with-ps=gs \
+		--disable-psutils \
+		--disable-t1utils \
+		--enable-ipc \
+		--disable-biber \
+		--disable-bibtexu \
+		--disable-dvipng \
+		--disable-dvipsk \
+		--disable-dvipdfmx \
+		--disable-chktex \
+		--disable-lcdf-typetools \
+		--disable-pdfopen \
+		--disable-ps2eps \
+		--disable-ps2pkm \
+		--disable-detex \
+		--disable-ttf2pk \
+		--disable-tex4htk \
+		--disable-cjkutils \
+		--disable-xdvik \
+		--disable-xindy \
+		--disable-luatex \
+		--disable-dvi2tty \
+		--disable-dvisvgm \
+		--disable-vlna \
+		--disable-xdvipdfmx \
+		--enable-shared \
+		--disable-native-texlive-build \
+		--disable-largefile \
+		$(use_enable xetex) \
+		$(use_enable cjk ptex) \
+		$(use_enable cjk eptex) \
+		$(use_enable cjk uptex) \
+		$(use_enable cjk euptex) \
+		$(use_enable cjk mendexk) \
+		$(use_enable cjk makejvf) \
+		$(use_with X x)
+}
+
+src_compile() {
+	emake SHELL=/bin/sh texmf=${TEXMF_PATH:-/usr/share/texmf} || die "emake failed"
+
+	cd "${B}"
+	# Mimic updmap --syncwithtrees to enable only fonts installed
+	# Code copied from updmap script
+	for i in `egrep '^(Mixed)?Map' "texmf/web2c/updmap.cfg" | sed 's@.* @@'`; do
+		texlive-common_is_file_present_in_texmf "$i" || echo "$i"
+	done > "${T}/updmap_update"
+	{
+		sed 's@/@\\/@g; s@^@/^MixedMap[     ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
+		sed 's@/@\\/@g; s@^@/^Map[  ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
+	} > "${T}/updmap_update2"
+	sed -f "${T}/updmap_update2" "texmf/web2c/updmap.cfg" >	"${T}/updmap_update3"\
+		&& cat "${T}/updmap_update3" > "texmf/web2c/updmap.cfg"
+}
+
+src_test() {
+	ewarn "Due to modular layout of texlive ebuilds,"
+	ewarn "It would not make much sense to use tests into the ebuild"
+	ewarn "And tests would fail anyway"
+	ewarn "Alternatively you can try to compile any tex file"
+	ewarn "Tex warnings should be considered as errors and reported"
+	ewarn "You can also run fmtutil-sys --all and check for errors/warnings there"
+}
+
+src_install() {
+	dodir ${TEXMF_PATH:-/usr/share/texmf}/web2c
+	emake DESTDIR="${D}" texmf="${D}${TEXMF_PATH:-/usr/share/texmf}" run_texlinks="true" run_mktexlsr="true" install || die "install failed"
+
+	cd "${B}"
+	dodir /usr/share # just in case
+	cp -pR texmf{,-dist} "${D}/usr/share/" || die "failed to install texmf trees"
+	cp -pR "${WORKDIR}"/tlpkg "${D}/usr/share/" || die "failed to install tlpkg files"
+
+	newsbin "${FILESDIR}/texmf-update2010" texmf-update
+
+	# When X is disabled mf-nowin doesn't exist but some scripts expect it to
+	# exist. Instead, it is called mf, so we symlink it to please everything.
+	use X || dosym mf /usr/bin/mf-nowin
+
+	docinto texk
+	cd "${B}/texk"
+	dodoc ChangeLog README || die "failed to install texk docs"
+
+	docinto dviljk
+	cd "${B}/texk/dviljk"
+	dodoc ChangeLog README NEWS || die "failed to install dviljk docs"
+
+	docinto makeindexk
+	cd "${B}/texk/makeindexk"
+	dodoc ChangeLog NOTES README || die "failed to install makeindexk docs"
+
+	docinto web2c
+	cd "${B}/texk/web2c"
+	dodoc ChangeLog NEWS PROJECTS README || die "failed to install web2c docs"
+
+	use doc || rm -rf "${D}/usr/share/texmf/doc"
+	use doc || rm -rf "${D}/usr/share/texmf-dist/doc"
+
+	dodir /etc/env.d
+	echo 'CONFIG_PROTECT_MASK="/etc/texmf/web2c /etc/texmf/language.dat.d /etc/texmf/language.def.d /etc/texmf/updmap.d"' > "${D}/etc/env.d/98texlive"
+	# populate /etc/texmf
+	keepdir /etc/texmf/web2c
+
+	# take care of updmap.cfg and language.d files
+	keepdir /etc/texmf/{updmap.d,language.dat.d,language.def.d,language.dat.lua.d}
+
+	mv "${D}${TEXMF_PATH}/web2c/updmap.cfg"	"${D}/etc/texmf/updmap.d/00updmap.cfg" || die "moving updmap.cfg failed"
+
+	# Remove fmtutil.cnf, it will be regenerated from /etc/texmf/fmtutil.d files
+	# by texmf-update
+	rm -f "${D}${TEXMF_PATH}/web2c/fmtutil.cnf"
+	# Remove bundled and invalid updmap.cfg
+	rm -f "${D}/usr/share/texmf-dist/web2c/updmap.cfg"
+
+	texlive-common_handle_config_files
+
+	keepdir /usr/share/texmf-site
+
+	# the virtex symlink is not installed
+	# The links has to be relative, since the targets
+	# is not present at this stage and MacOS doesn't
+	# like non-existing targets
+	dosym tex /usr/bin/virtex
+	dosym pdftex /usr/bin/pdfvirtex
+
+	# Remove texdoctk if we don't want it
+	if ! use tk ; then
+		rm -f "${D}/usr/bin/texdoctk" "${D}/usr/share/texmf/scripts/tetex/texdoctk.pl" "${D}/usr/share/man/man1/texdoctk.1" || die "failed to remove texdoc tk!"
+	fi
+
+	# Rename mpost to leave room for mplib
+	mv "${D}/usr/bin/mpost" "${D}/usr/bin/mpost-${P}"
+	dosym "mpost-${P}" /usr/bin/mpost
+
+	# Ditto for pdftex
+	mv "${D}/usr/bin/pdftex" "${D}/usr/bin/pdftex-${P}"
+	dosym "pdftex-${P}" /usr/bin/pdftex
+}
+
+pkg_preinst() {
+	# Remove stray files to keep the upgrade path sane
+	if has_version =app-text/texlive-core-2007* ; then
+		for i in pdftex/pdflatex aleph/aleph aleph/lamed omega/lambda omega/omega xetex/xetex xetex/xelatex tex/tex pdftex/etex pdftex/pdftex pdftex/pdfetex ; do
+			for j in log fmt ; do
+				local file="${ROOT}/var/lib/texmf/web2c/${i}.${j}"
+				if [ -f "${file}" ] ; then
+					elog "Removing stray ${file} from TeXLive 2007 install."
+					rm -f "${file}"
+				fi
+			done
+		done
+		for j in base log ; do
+			local file="${ROOT}/var/lib/texmf/web2c/metafont/mf.${j}"
+			if [ -f "${file}" ] ; then
+				elog "Removing stray ${file} from TeXLive 2007 install."
+				rm -f "${file}"
+			fi
+		done
+	fi
+}
+
+pkg_postinst() {
+	etexmf-update
+
+	elog
+	elog "If you have configuration files in /etc/texmf to merge,"
+	elog "please update them and run /usr/sbin/texmf-update."
+	elog
+	ewarn "If you are migrating from an older TeX distribution"
+	ewarn "Please make sure you have read:"
+	ewarn "https://wiki.gentoo.org/wiki/Project:TeX/Tex_Live_Migration_Guide"
+	ewarn "in order to avoid possible problems"
+	elog
+	elog "TeXLive has been split in various ebuilds. If you are missing a"
+	elog "package to process your TeX documents, you can install"
+	elog "dev-tex/texmfind to easily search for them."
+	elog
+}
diff --git a/app-text/texlive-core/texlive-core-2012-r3.ebuild b/app-text/texlive-core/texlive-core-2012-r3.ebuild
new file mode 100644
index 000000000000..04ecb18e5cef
--- /dev/null
+++ b/app-text/texlive-core/texlive-core-2012-r3.ebuild
@@ -0,0 +1,346 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+#TL_UPSTREAM_PATCHLEVEL="1"
+PATCHLEVEL="48"
+TL_SOURCE_VERSION=20120701
+
+inherit eutils flag-o-matic toolchain-funcs libtool texlive-common
+
+MY_PV=${PN%-core}-${TL_SOURCE_VERSION}-source
+
+DESCRIPTION="A complete TeX distribution"
+HOMEPAGE="http://tug.org/texlive/"
+SLOT="0"
+LICENSE="GPL-2 LPPL-1.3c TeX"
+
+SRC_URI="mirror://gentoo/${MY_PV}.tar.xz"
+
+# Fetch patches
+SRC_URI="${SRC_URI} mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.xz"
+#	mirror://gentoo/texlive-core-upstream-patches-${TL_UPSTREAM_PATCHLEVEL}.tar.xz"
+
+TL_CORE_BINEXTRA_MODULES="
+	a2ping asymptote bibtex8 bundledoc ctanify ctanupload ctie cweb de-macro dtl
+	dvi2tty dviasm dvicopy dvidvi dviljk dvipng dvipos findhyph fragmaster
+	hyphenex installfont lacheck latex2man latexfileversion latexpand
+	listings-ext match_parens mkjobtexmf patgen pdfcrop pdftools pkfix
+	pkfix-helper purifyeps seetexk sty2dtx synctex texcount texdef texdiff
+	texdirflatten texdoc texliveonfly texloganalyser texware tie tpic2pdftex
+	typeoutfileinfo web	collection-binextra
+	"
+TL_CORE_BINEXTRA_DOC_MODULES="
+	a2ping.doc asymptote.doc bibtex8.doc bundledoc.doc ctanify.doc
+	ctanupload.doc ctie.doc cweb.doc de-macro.doc dvi2tty.doc dvicopy.doc
+	dviljk.doc dvipng.doc dvipos.doc findhyph.doc fragmaster.doc installfont.doc
+	latex2man.doc latexfileversion.doc latexpand.doc listings-ext.doc
+	match_parens.doc mkjobtexmf.doc patgen.doc pdfcrop.doc pdftools.doc
+	pkfix.doc pkfix-helper.doc purifyeps.doc sty2dtx.doc synctex.doc
+	texcount.doc texdef.doc texdiff.doc texdirflatten.doc texdoc.doc
+	texliveonfly.doc texloganalyser.doc texware.doc tie.doc tpic2pdftex.doc
+	typeoutfileinfo web.doc
+	"
+TL_CORE_BINEXTRA_SRC_MODULES="hyphenex.source listings-ext.source mkjobtexmf.source texdef.source"
+
+TL_CORE_EXTRA_MODULES="tetex hyphen-base texconfig gsftopk texlive.infra ${TL_CORE_BINEXTRA_MODULES}"
+TL_CORE_EXTRA_DOC_MODULES="tetex.doc texconfig.doc gsftopk.doc texlive.infra.doc ${TL_CORE_BINEXTRA_DOC_MODULES}"
+TL_CORE_EXTRA_SRC_MODULES="${TL_CORE_BINEXTRA_SRC_MODULES}"
+
+for i in ${TL_CORE_EXTRA_MODULES}; do
+	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.tar.xz"
+done
+
+SRC_URI="${SRC_URI} doc? ( "
+for i in ${TL_CORE_EXTRA_DOC_MODULES}; do
+	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.tar.xz"
+done
+SRC_URI="${SRC_URI} )"
+SRC_URI="${SRC_URI} source? ( "
+for i in ${TL_CORE_EXTRA_SRC_MODULES}; do
+	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.tar.xz"
+done
+SRC_URI="${SRC_URI} )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="cjk X doc source tk xetex"
+
+MODULAR_X_DEPEND="X? (
+				x11-libs/libXmu
+				x11-libs/libXp
+				x11-libs/libXpm
+				x11-libs/libXaw
+	)"
+
+COMMON_DEPEND="${MODULAR_X_DEPEND}
+	!app-text/ptex
+	!app-text/tetex
+	!<app-text/texlive-2007
+	!app-text/xetex
+	!<dev-texlive/texlive-basic-2009
+	!<dev-texlive/texlive-metapost-2011
+	!app-text/dvibook
+	sys-libs/zlib
+	>=media-libs/libpng-1.2.43-r2:0=
+	>=app-text/poppler-0.12.3-r3:=
+	xetex? (
+		app-text/teckit
+		media-libs/fontconfig
+		media-libs/freetype:2
+		media-libs/silgraphite
+	)
+	>=dev-libs/kpathsea-6.1.0_p20120701
+	cjk? ( >=dev-libs/ptexenc-1.2.0_p20120701 )"
+
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+	sys-apps/ed
+	sys-devel/flex
+	app-arch/xz-utils"
+
+RDEPEND="${COMMON_DEPEND}
+	>=app-text/ps2pkm-1.5_p20120701
+	>=app-text/dvipsk-5.992_p20120701
+	>=dev-tex/bibtexu-3.71_p20120701
+	virtual/perl-Getopt-Long
+	xetex? ( >=app-text/xdvipdfmx-0.7.8_p20120701 )
+	tk? ( dev-perl/Tk )"
+
+# texdoc needs luatex.
+PDEPEND=">=dev-tex/luatex-0.70"
+
+S="${WORKDIR}/${P}_build"
+B="${WORKDIR}/${MY_PV}"
+
+src_unpack() {
+	unpack ${A}
+	mkdir -p "${S}" || die "failed to create build dir"
+}
+
+src_prepare() {
+	mv "${WORKDIR}"/texmf* "${B}" || die "failed to move texmf files"
+
+	cd "${B}"
+	#EPATCH_MULTI_MSG="Applying patches from upstream bugfix branch..." EPATCH_SUFFIX="patch" epatch "${WORKDIR}/gentoo_branch2011_patches"
+	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
+
+	elibtoolize
+}
+
+src_configure() {
+	# It fails on alpha without this
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# Bug #265232 and bug #414271:
+	if use hppa; then
+		append-cppflags "-DU_IS_BIG_ENDIAN=1"
+	fi
+
+	# Too many regexps use A-Z a-z constructs, what causes problems with locales
+	# that don't have the same alphabetical order than ascii. Bug #242430
+	# So we set LC_ALL to C in order to avoid problems.
+	export LC_ALL=C
+	tc-export CC CXX AR RANLIB
+	ECONF_SOURCE="${B}" \
+		econf -C \
+		--bindir=/usr/bin \
+		--datadir="${S}" \
+		--with-system-freetype2 \
+		--with-freetype2-include=/usr/include \
+		--with-system-zlib \
+		--with-system-libpng \
+		--with-system-xpdf \
+		--with-system-poppler \
+		--with-system-teckit \
+		--with-teckit-includes=/usr/include/teckit \
+		--with-system-graphite \
+		--with-system-kpathsea \
+		--with-system-icu \
+		--with-system-ptexenc \
+		--without-texinfo \
+		--disable-dialog \
+		--disable-multiplatform \
+		--enable-epsfwin \
+		--enable-mftalkwin \
+		--enable-regiswin \
+		--enable-tektronixwin \
+		--enable-unitermwin \
+		--with-ps=gs \
+		--disable-psutils \
+		--disable-t1utils \
+		--enable-ipc \
+		--disable-biber \
+		--disable-bibtexu \
+		--disable-dvipng \
+		--disable-dvipsk \
+		--disable-dvipdfmx \
+		--disable-chktex \
+		--disable-lcdf-typetools \
+		--disable-pdfopen \
+		--disable-ps2eps \
+		--disable-ps2pkm \
+		--disable-detex \
+		--disable-ttf2pk \
+		--disable-tex4htk \
+		--disable-cjkutils \
+		--disable-xdvik \
+		--disable-xindy \
+		--disable-luatex \
+		--disable-dvi2tty \
+		--disable-dvisvgm \
+		--disable-vlna \
+		--disable-xdvipdfmx \
+		--enable-shared \
+		--disable-native-texlive-build \
+		--disable-largefile \
+		$(use_enable xetex) \
+		$(use_enable cjk ptex) \
+		$(use_enable cjk eptex) \
+		$(use_enable cjk uptex) \
+		$(use_enable cjk euptex) \
+		$(use_enable cjk mendexk) \
+		$(use_enable cjk makejvf) \
+		$(use_with X x)
+}
+
+src_compile() {
+	emake SHELL=/bin/sh texmf=${TEXMF_PATH:-/usr/share/texmf} || die "emake failed"
+
+	cd "${B}"
+	# Mimic updmap --syncwithtrees to enable only fonts installed
+	# Code copied from updmap script
+	for i in `egrep '^(Mixed)?Map' "texmf/web2c/updmap.cfg" | sed 's@.* @@'`; do
+		texlive-common_is_file_present_in_texmf "$i" || echo "$i"
+	done > "${T}/updmap_update"
+	{
+		sed 's@/@\\/@g; s@^@/^MixedMap[     ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
+		sed 's@/@\\/@g; s@^@/^Map[  ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
+	} > "${T}/updmap_update2"
+	sed -f "${T}/updmap_update2" "texmf/web2c/updmap.cfg" >	"${T}/updmap_update3"\
+		&& cat "${T}/updmap_update3" > "texmf/web2c/updmap.cfg"
+}
+
+src_test() {
+	ewarn "Due to modular layout of texlive ebuilds,"
+	ewarn "It would not make much sense to use tests into the ebuild"
+	ewarn "And tests would fail anyway"
+	ewarn "Alternatively you can try to compile any tex file"
+	ewarn "Tex warnings should be considered as errors and reported"
+	ewarn "You can also run fmtutil-sys --all and check for errors/warnings there"
+}
+
+src_install() {
+	dodir ${TEXMF_PATH:-/usr/share/texmf}/web2c
+	emake DESTDIR="${D}" texmf="${D}${TEXMF_PATH:-/usr/share/texmf}" run_texlinks="true" run_mktexlsr="true" install || die "install failed"
+
+	cd "${B}"
+	dodir /usr/share # just in case
+	cp -pR texmf{,-dist} "${D}/usr/share/" || die "failed to install texmf trees"
+	cp -pR "${WORKDIR}"/tlpkg "${D}/usr/share/" || die "failed to install tlpkg files"
+
+	newsbin "${FILESDIR}/texmf-update2010" texmf-update
+
+	# When X is disabled mf-nowin doesn't exist but some scripts expect it to
+	# exist. Instead, it is called mf, so we symlink it to please everything.
+	use X || dosym mf /usr/bin/mf-nowin
+
+	docinto texk
+	cd "${B}/texk"
+	dodoc ChangeLog README || die "failed to install texk docs"
+
+	docinto dviljk
+	cd "${B}/texk/dviljk"
+	dodoc ChangeLog README NEWS || die "failed to install dviljk docs"
+
+	docinto makeindexk
+	cd "${B}/texk/makeindexk"
+	dodoc ChangeLog NOTES README || die "failed to install makeindexk docs"
+
+	docinto web2c
+	cd "${B}/texk/web2c"
+	dodoc ChangeLog NEWS PROJECTS README || die "failed to install web2c docs"
+
+	use doc || rm -rf "${D}/usr/share/texmf/doc"
+	use doc || rm -rf "${D}/usr/share/texmf-dist/doc"
+
+	dodir /etc/env.d
+	echo 'CONFIG_PROTECT_MASK="/etc/texmf/web2c /etc/texmf/language.dat.d /etc/texmf/language.def.d /etc/texmf/updmap.d"' > "${D}/etc/env.d/98texlive"
+	# populate /etc/texmf
+	keepdir /etc/texmf/web2c
+
+	# take care of updmap.cfg and language.d files
+	keepdir /etc/texmf/{updmap.d,language.dat.d,language.def.d,language.dat.lua.d}
+
+	mv "${D}${TEXMF_PATH}/web2c/updmap.cfg"	"${D}/etc/texmf/updmap.d/00updmap.cfg" || die "moving updmap.cfg failed"
+
+	# Remove fmtutil.cnf, it will be regenerated from /etc/texmf/fmtutil.d files
+	# by texmf-update
+	rm -f "${D}${TEXMF_PATH}/web2c/fmtutil.cnf"
+	# Remove bundled and invalid updmap.cfg
+	rm -f "${D}/usr/share/texmf-dist/web2c/updmap.cfg"
+
+	texlive-common_handle_config_files
+
+	keepdir /usr/share/texmf-site
+
+	# the virtex symlink is not installed
+	# The links has to be relative, since the targets
+	# is not present at this stage and MacOS doesn't
+	# like non-existing targets
+	dosym tex /usr/bin/virtex
+	dosym pdftex /usr/bin/pdfvirtex
+
+	# Remove texdoctk if we don't want it
+	if ! use tk ; then
+		rm -f "${D}/usr/bin/texdoctk" "${D}/usr/share/texmf/scripts/tetex/texdoctk.pl" "${D}/usr/share/man/man1/texdoctk.1" || die "failed to remove texdoc tk!"
+	fi
+
+	# Rename mpost to leave room for mplib
+	mv "${D}/usr/bin/mpost" "${D}/usr/bin/mpost-${P}"
+	dosym "mpost-${P}" /usr/bin/mpost
+
+	# Ditto for pdftex
+	mv "${D}/usr/bin/pdftex" "${D}/usr/bin/pdftex-${P}"
+	dosym "pdftex-${P}" /usr/bin/pdftex
+}
+
+pkg_preinst() {
+	# Remove stray files to keep the upgrade path sane
+	if has_version =app-text/texlive-core-2007* ; then
+		for i in pdftex/pdflatex aleph/aleph aleph/lamed omega/lambda omega/omega xetex/xetex xetex/xelatex tex/tex pdftex/etex pdftex/pdftex pdftex/pdfetex ; do
+			for j in log fmt ; do
+				local file="${ROOT}/var/lib/texmf/web2c/${i}.${j}"
+				if [ -f "${file}" ] ; then
+					elog "Removing stray ${file} from TeXLive 2007 install."
+					rm -f "${file}"
+				fi
+			done
+		done
+		for j in base log ; do
+			local file="${ROOT}/var/lib/texmf/web2c/metafont/mf.${j}"
+			if [ -f "${file}" ] ; then
+				elog "Removing stray ${file} from TeXLive 2007 install."
+				rm -f "${file}"
+			fi
+		done
+	fi
+}
+
+pkg_postinst() {
+	etexmf-update
+
+	elog
+	elog "If you have configuration files in /etc/texmf to merge,"
+	elog "please update them and run /usr/sbin/texmf-update."
+	elog
+	ewarn "If you are migrating from an older TeX distribution"
+	ewarn "Please make sure you have read:"
+	ewarn "https://wiki.gentoo.org/wiki/Project:TeX/Tex_Live_Migration_Guide"
+	ewarn "in order to avoid possible problems"
+	elog
+	elog "TeXLive has been split in various ebuilds. If you are missing a"
+	elog "package to process your TeX documents, you can install"
+	elog "dev-tex/texmfind to easily search for them."
+	elog
+}
diff --git a/app-text/texlive-core/texlive-core-2013-r3.ebuild b/app-text/texlive-core/texlive-core-2013-r3.ebuild
new file mode 100644
index 000000000000..8b230aec8b2d
--- /dev/null
+++ b/app-text/texlive-core/texlive-core-2013-r3.ebuild
@@ -0,0 +1,353 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+#TL_UPSTREAM_PATCHLEVEL="1"
+PATCHLEVEL="49"
+TL_SOURCE_VERSION=20130530
+
+inherit eutils flag-o-matic toolchain-funcs libtool texlive-common
+
+MY_PV=${PN%-core}-${TL_SOURCE_VERSION}-source
+
+DESCRIPTION="A complete TeX distribution"
+HOMEPAGE="http://tug.org/texlive/"
+SLOT="0"
+LICENSE="GPL-2 LPPL-1.3c TeX"
+
+SRC_URI="mirror://gentoo/${MY_PV}.tar.xz"
+
+# Fetch patches
+SRC_URI="${SRC_URI} mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.xz"
+#	mirror://gentoo/texlive-core-upstream-patches-${TL_UPSTREAM_PATCHLEVEL}.tar.xz"
+
+TL_CORE_BINEXTRA_MODULES="
+	a2ping adhocfilelist asymptote bundledoc ctanify ctanupload ctie cweb
+	de-macro dtl dtxgen dvi2tty dviasm dvicopy dvidvi dviljk dvipos findhyph
+	fragmaster hyphenex installfont lacheck latex2man latexfileversion
+	latexpand ltxfileinfo listings-ext match_parens mkjobtexmf patgen pdfcrop
+	pdftools pfarrei pkfix pkfix-helper purifyeps seetexk sty2dtx synctex
+	texcount texdef texdiff texdirflatten texdoc texliveonfly texloganalyser
+	texware tie tpic2pdftex typeoutfileinfo web	collection-binextra
+	"
+TL_CORE_BINEXTRA_DOC_MODULES="
+	a2ping.doc adhocfilelist.doc asymptote.doc bundledoc.doc ctanify.doc
+	ctanupload.doc ctie.doc cweb.doc de-macro.doc dtxgen.doc dvi2tty.doc
+	dvicopy.doc	dviljk.doc dvipos.doc findhyph.doc fragmaster.doc
+	installfont.doc	latex2man.doc latexfileversion.doc latexpand.doc
+	ltxfileinfo.doc listings-ext.doc match_parens.doc mkjobtexmf.doc patgen.doc
+	pdfcrop.doc pdftools.doc pfarrei.doc pkfix.doc pkfix-helper.doc
+	purifyeps.doc sty2dtx.doc synctex.doc texcount.doc texdef.doc texdiff.doc
+	texdirflatten.doc texdoc.doc texliveonfly.doc texloganalyser.doc texware.doc
+	tie.doc tpic2pdftex.doc	typeoutfileinfo web.doc
+	"
+TL_CORE_BINEXTRA_SRC_MODULES="
+	adhocfilelist.source hyphenex.source listings-ext.source mkjobtexmf.source
+	pfarrei.source texdef.source
+	"
+
+TL_CORE_EXTRA_MODULES="tetex hyphen-base texconfig gsftopk texlive.infra ${TL_CORE_BINEXTRA_MODULES}"
+TL_CORE_EXTRA_DOC_MODULES="tetex.doc texconfig.doc gsftopk.doc texlive.infra.doc ${TL_CORE_BINEXTRA_DOC_MODULES}"
+TL_CORE_EXTRA_SRC_MODULES="${TL_CORE_BINEXTRA_SRC_MODULES}"
+
+for i in ${TL_CORE_EXTRA_MODULES}; do
+	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.tar.xz"
+done
+
+SRC_URI="${SRC_URI} doc? ( "
+for i in ${TL_CORE_EXTRA_DOC_MODULES}; do
+	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.tar.xz"
+done
+SRC_URI="${SRC_URI} )"
+SRC_URI="${SRC_URI} source? ( "
+for i in ${TL_CORE_EXTRA_SRC_MODULES}; do
+	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.tar.xz"
+done
+SRC_URI="${SRC_URI} )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="cjk X doc source tk xetex"
+
+TEXMF_PATH=/usr/share/texmf-dist
+
+MODULAR_X_DEPEND="X? (
+				x11-libs/libXmu
+				x11-libs/libXp
+				x11-libs/libXpm
+				x11-libs/libXaw
+	)"
+
+COMMON_DEPEND="${MODULAR_X_DEPEND}
+	!app-text/ptex
+	!app-text/tetex
+	!<app-text/texlive-2007
+	!app-text/xetex
+	!<dev-texlive/texlive-basic-2013
+	!<dev-texlive/texlive-metapost-2011
+	!app-text/dvibook
+	sys-libs/zlib
+	>=media-libs/libpng-1.2.43-r2:0=
+	>=app-text/poppler-0.12.3-r3:=
+	>=x11-libs/cairo-1.12
+	>=x11-libs/pixman-0.18
+	xetex? (
+		>=media-libs/harfbuzz-0.9.20[icu,graphite]
+		>=dev-libs/icu-50:=
+		app-text/teckit
+		media-libs/fontconfig
+		media-gfx/graphite2
+		media-libs/freetype:2
+	)
+	>=dev-libs/kpathsea-6.1.1_p20130530
+	cjk? ( >=dev-libs/ptexenc-1.3.1_p20130530 )"
+
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+	sys-apps/ed
+	sys-devel/flex
+	app-arch/xz-utils"
+
+RDEPEND="${COMMON_DEPEND}
+	>=app-text/ps2pkm-1.5_p20130530
+	>=app-text/dvipsk-5.993_p20130530
+	>=dev-tex/bibtexu-3.71_p20130530
+	virtual/perl-Getopt-Long
+	xetex? ( >=app-text/xdvipdfmx-0.7.9_p20130530 )
+	tk? ( dev-perl/Tk )"
+
+# texdoc needs luatex.
+PDEPEND=">=dev-tex/luatex-0.76"
+
+S="${WORKDIR}/${P}_build"
+B="${WORKDIR}/${MY_PV}"
+
+src_unpack() {
+	unpack ${A}
+	mkdir -p "${S}" || die "failed to create build dir"
+}
+
+RELOC_TARGET=texmf-dist
+
+src_prepare() {
+	cd "${WORKDIR}"
+	# From texlive-module.eclass.
+	grep -H RELOC tlpkg/tlpobj/* | awk '{print $2}' | sed 's#^RELOC/##' > "${T}/reloclist"
+	{ for i in $(<"${T}/reloclist"); do  dirname $i; done; } | uniq > "${T}/dirlist"
+	for i in $(<"${T}/dirlist"); do
+		[ -d "${RELOC_TARGET}/${i}" ] || mkdir -p "${RELOC_TARGET}/${i}"
+	done
+	for i in $(<"${T}/reloclist"); do
+		mv "${i}" "${RELOC_TARGET}"/$(dirname "${i}") || die "failed to relocate ${i} to ${RELOC_TARGET}/$(dirname ${i})"
+	done
+
+	mv "${WORKDIR}"/texmf* "${B}" || die "failed to move texmf files"
+
+	cd "${B}"
+	#EPATCH_MULTI_MSG="Applying patches from upstream bugfix branch..." EPATCH_SUFFIX="patch" epatch "${WORKDIR}/gentoo_branch2011_patches"
+	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
+
+	elibtoolize
+}
+
+src_configure() {
+	# It fails on alpha without this
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# Too many regexps use A-Z a-z constructs, what causes problems with locales
+	# that don't have the same alphabetical order than ascii. Bug #242430
+	# So we set LC_ALL to C in order to avoid problems.
+	export LC_ALL=C
+	tc-export CC CXX AR RANLIB
+	ECONF_SOURCE="${B}" \
+		econf -C \
+		--bindir="${EPREFIX}"/usr/bin \
+		--datadir="${S}" \
+		--with-system-freetype2 \
+		--with-system-zlib \
+		--with-system-libpng \
+		--with-system-xpdf \
+		--with-system-poppler \
+		--with-system-teckit \
+		--with-teckit-includes="${EPREFIX}"/usr/include/teckit \
+		--with-system-kpathsea \
+		--with-kpathsea-includes="${EPREFIX}"/usr/include \
+		--with-system-icu \
+		--with-system-ptexenc \
+		--with-system-harfbuzz \
+		--with-system-icu \
+		--with-system-graphite2 \
+		--with-system-cairo \
+		--with-system-pixman \
+		--without-texinfo \
+		--disable-dialog \
+		--disable-multiplatform \
+		--enable-epsfwin \
+		--enable-mftalkwin \
+		--enable-regiswin \
+		--enable-tektronixwin \
+		--enable-unitermwin \
+		--with-ps=gs \
+		--disable-psutils \
+		--disable-t1utils \
+		--enable-ipc \
+		--disable-biber \
+		--disable-bibtex-x \
+		--disable-dvipng \
+		--disable-dvipsk \
+		--disable-dvipdfmx \
+		--disable-chktex \
+		--disable-lcdf-typetools \
+		--disable-pdfopen \
+		--disable-ps2eps \
+		--disable-ps2pkm \
+		--disable-detex \
+		--disable-ttf2pk \
+		--disable-tex4htk \
+		--disable-cjkutils \
+		--disable-xdvik \
+		--disable-xindy \
+		--disable-luatex \
+		--disable-dvi2tty \
+		--disable-dvisvgm \
+		--disable-vlna \
+		--disable-xdvipdfmx \
+		--enable-shared \
+		--disable-native-texlive-build \
+		--disable-largefile \
+		$(use_enable xetex) \
+		$(use_enable cjk ptex) \
+		$(use_enable cjk eptex) \
+		$(use_enable cjk uptex) \
+		$(use_enable cjk euptex) \
+		$(use_enable cjk mendexk) \
+		$(use_enable cjk makejvf) \
+		$(use_enable tk texdoctk) \
+		$(use_with X x)
+}
+
+src_compile() {
+	tc-export CC CXX AR RANLIB
+	emake SHELL="${EPREFIX}"/bin/sh texmf="${EPREFIX}"${TEXMF_PATH:-/usr/share/texmf-dist} || die "emake failed"
+
+	cd "${B}"
+	# Mimic updmap --syncwithtrees to enable only fonts installed
+	# Code copied from updmap script
+	for i in `egrep '^(Mixed|Kanji)?Map' "texmf-dist/web2c/updmap.cfg" | sed 's@.* @@'`; do
+		texlive-common_is_file_present_in_texmf "$i" || echo "$i"
+	done > "${T}/updmap_update"
+	{
+		sed 's@/@\\/@g; s@^@/^MixedMap[     ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
+		sed 's@/@\\/@g; s@^@/^Map[  ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
+		sed 's@/@\\/@g; s@^@/^KanjiMap[     ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
+	} > "${T}/updmap_update2"
+	sed -f "${T}/updmap_update2" "texmf-dist/web2c/updmap.cfg" >	"${T}/updmap_update3"\
+		&& cat "${T}/updmap_update3" > "texmf-dist/web2c/updmap.cfg"
+}
+
+src_install() {
+	dodir ${TEXMF_PATH:-/usr/share/texmf-dist}/web2c
+	emake DESTDIR="${D}" texmf="${ED}${TEXMF_PATH:-/usr/share/texmf-dist}" run_texlinks="true" run_mktexlsr="true" install || die "install failed"
+
+	cd "${B}"
+	dodir /usr/share # just in case
+	cp -pR texmf-dist "${ED}/usr/share/" || die "failed to install texmf trees"
+	cp -pR "${WORKDIR}"/tlpkg "${ED}/usr/share/" || die "failed to install tlpkg files"
+
+	# When X is disabled mf-nowin doesn't exist but some scripts expect it to
+	# exist. Instead, it is called mf, so we symlink it to please everything.
+	use X || dosym mf /usr/bin/mf-nowin
+
+	docinto texk
+	cd "${B}/texk"
+	dodoc ChangeLog README || die "failed to install texk docs"
+
+	docinto dviljk
+	cd "${B}/texk/dviljk"
+	dodoc ChangeLog README NEWS || die "failed to install dviljk docs"
+
+	docinto makeindexk
+	cd "${B}/texk/makeindexk"
+	dodoc ChangeLog NOTES README || die "failed to install makeindexk docs"
+
+	docinto web2c
+	cd "${B}/texk/web2c"
+	dodoc ChangeLog NEWS PROJECTS README || die "failed to install web2c docs"
+
+	use doc || rm -rf "${ED}/usr/share/texmf-dist/doc"
+
+	dodir /etc/env.d
+	echo 'CONFIG_PROTECT_MASK="/etc/texmf/web2c /etc/texmf/language.dat.d /etc/texmf/language.def.d /etc/texmf/updmap.d"' > "${ED}/etc/env.d/98texlive"
+	# populate /etc/texmf
+	keepdir /etc/texmf/web2c
+
+	# take care of updmap.cfg and language.d files
+	keepdir /etc/texmf/{updmap.d,language.dat.d,language.def.d,language.dat.lua.d}
+
+	mv "${ED}${TEXMF_PATH}/web2c/updmap.cfg" "${ED}/etc/texmf/updmap.d/00updmap.cfg" || die "moving updmap.cfg failed"
+
+	# Remove fmtutil.cnf, it will be regenerated from /etc/texmf/fmtutil.d files
+	# by texmf-update
+	rm -f "${ED}${TEXMF_PATH}/web2c/fmtutil.cnf"
+	# Remove bundled and invalid updmap.cfg
+	rm -f "${ED}/usr/share/texmf-dist/web2c/updmap.cfg"
+
+	texlive-common_handle_config_files
+
+	keepdir /usr/share/texmf-site
+
+	# the virtex symlink is not installed
+	# The links has to be relative, since the targets
+	# is not present at this stage and MacOS doesn't
+	# like non-existing targets
+	dosym tex /usr/bin/virtex
+	dosym pdftex /usr/bin/pdfvirtex
+
+	# Rename mpost to leave room for mplib
+	mv "${ED}/usr/bin/mpost" "${ED}/usr/bin/mpost-${P}"
+	dosym "mpost-${P}" /usr/bin/mpost
+
+	# Ditto for pdftex
+	mv "${ED}/usr/bin/pdftex" "${ED}/usr/bin/pdftex-${P}"
+	dosym "pdftex-${P}" /usr/bin/pdftex
+}
+
+pkg_preinst() {
+	# Remove stray files to keep the upgrade path sane
+	if has_version =app-text/texlive-core-2007* ; then
+		for i in pdftex/pdflatex aleph/aleph aleph/lamed omega/lambda omega/omega xetex/xetex xetex/xelatex tex/tex pdftex/etex pdftex/pdftex pdftex/pdfetex ; do
+			for j in log fmt ; do
+				local file="${EROOT}/var/lib/texmf/web2c/${i}.${j}"
+				if [ -f "${file}" ] ; then
+					elog "Removing stray ${file} from TeXLive 2007 install."
+					rm -f "${file}"
+				fi
+			done
+		done
+		for j in base log ; do
+			local file="${EROOT}/var/lib/texmf/web2c/metafont/mf.${j}"
+			if [ -f "${file}" ] ; then
+				elog "Removing stray ${file} from TeXLive 2007 install."
+				rm -f "${file}"
+			fi
+		done
+	fi
+}
+
+pkg_postinst() {
+	etexmf-update
+
+	elog
+	elog "If you have configuration files in ${EPREFIX}/etc/texmf to merge,"
+	elog "please update them and run ${EPREFIX}/usr/sbin/texmf-update."
+	elog
+	ewarn "If you are migrating from an older TeX distribution"
+	ewarn "Please make sure you have read:"
+	ewarn "https://wiki.gentoo.org/wiki/Project:TeX/Tex_Live_Migration_Guide"
+	ewarn "in order to avoid possible problems"
+	elog
+	elog "TeXLive has been split in various ebuilds. If you are missing a"
+	elog "package to process your TeX documents, you can install"
+	elog "dev-tex/texmfind to easily search for them."
+	elog
+}
diff --git a/app-text/texlive-core/texlive-core-2014-r4.ebuild b/app-text/texlive-core/texlive-core-2014-r4.ebuild
new file mode 100644
index 000000000000..9317ded37053
--- /dev/null
+++ b/app-text/texlive-core/texlive-core-2014-r4.ebuild
@@ -0,0 +1,337 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+#TL_UPSTREAM_PATCHLEVEL="1"
+PATCHLEVEL="50"
+TL_SOURCE_VERSION=20140525
+
+inherit eutils flag-o-matic toolchain-funcs libtool texlive-common
+
+MY_PV=${PN%-core}-${TL_SOURCE_VERSION}-source
+
+DESCRIPTION="A complete TeX distribution"
+HOMEPAGE="http://tug.org/texlive/"
+SLOT="0"
+LICENSE="GPL-2 LPPL-1.3c TeX"
+
+SRC_URI="mirror://gentoo/${MY_PV}.tar.xz"
+
+# Fetch patches
+SRC_URI="${SRC_URI} mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.xz"
+#	mirror://gentoo/texlive-core-upstream-patches-${TL_UPSTREAM_PATCHLEVEL}.tar.xz"
+
+TL_CORE_BINEXTRA_MODULES="
+	a2ping adhocfilelist asymptote bundledoc ctanify ctanupload ctie cweb
+	de-macro dtl dtxgen dvi2tty dviasm dvicopy dvidvi dviljk dvipos findhyph
+	fragmaster hyphenex installfont lacheck latex-git-log latex2man
+	latexfileversion latexpand latexindent ltxfileinfo ltximg listings-ext
+	match_parens mkjobtexmf patgen pdfcrop pdftools pfarrei pkfix pkfix-helper
+	purifyeps seetexk sty2dtx synctex texcount texdef texdiff texdirflatten
+	texdoc texliveonfly texloganalyser texware tie tpic2pdftex typeoutfileinfo
+	web collection-binextra
+	"
+TL_CORE_BINEXTRA_DOC_MODULES="
+	a2ping.doc adhocfilelist.doc asymptote.doc bundledoc.doc ctanify.doc
+	ctanupload.doc ctie.doc cweb.doc de-macro.doc dtxgen.doc dvi2tty.doc
+	dvicopy.doc	dviljk.doc dvipos.doc findhyph.doc fragmaster.doc
+	installfont.doc	latex-git-log.doc latex2man.doc latexfileversion.doc
+	latexpand.doc latexindent.doc ltxfileinfo.doc ltximg.doc listings-ext.doc
+	match_parens.doc mkjobtexmf.doc patgen.doc pdfcrop.doc pdftools.doc
+	pfarrei.doc pkfix.doc pkfix-helper.doc purifyeps.doc sty2dtx.doc synctex.doc
+	texcount.doc texdef.doc texdiff.doc texdirflatten.doc texdoc.doc
+	texliveonfly.doc texloganalyser.doc texware.doc tie.doc tpic2pdftex.doc
+	typeoutfileinfo.doc web.doc
+	"
+TL_CORE_BINEXTRA_SRC_MODULES="
+	adhocfilelist.source hyphenex.source listings-ext.source mkjobtexmf.source
+	pfarrei.source texdef.source
+	"
+
+TL_CORE_EXTRA_MODULES="tetex hyphen-base texconfig gsftopk texlive.infra ${TL_CORE_BINEXTRA_MODULES}"
+TL_CORE_EXTRA_DOC_MODULES="tetex.doc texconfig.doc gsftopk.doc texlive.infra.doc ${TL_CORE_BINEXTRA_DOC_MODULES}"
+TL_CORE_EXTRA_SRC_MODULES="${TL_CORE_BINEXTRA_SRC_MODULES}"
+
+for i in ${TL_CORE_EXTRA_MODULES}; do
+	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.tar.xz"
+done
+
+SRC_URI="${SRC_URI} doc? ( "
+for i in ${TL_CORE_EXTRA_DOC_MODULES}; do
+	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.tar.xz"
+done
+SRC_URI="${SRC_URI} )"
+SRC_URI="${SRC_URI} source? ( "
+for i in ${TL_CORE_EXTRA_SRC_MODULES}; do
+	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.tar.xz"
+done
+SRC_URI="${SRC_URI} )"
+
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="cjk X doc source tk xetex"
+
+TEXMF_PATH=/usr/share/texmf-dist
+
+MODULAR_X_DEPEND="X? (
+				x11-libs/libXmu
+				x11-libs/libXp
+				x11-libs/libXpm
+				x11-libs/libXaw
+	)"
+
+COMMON_DEPEND="${MODULAR_X_DEPEND}
+	!app-text/ptex
+	!app-text/tetex
+	!<app-text/texlive-2007
+	!app-text/xetex
+	!<dev-texlive/texlive-basic-2014
+	!<dev-texlive/texlive-metapost-2011
+	!app-text/dvibook
+	!dev-tex/luatex
+	!app-text/dvipdfm
+	!app-text/dvipdfmx
+	!app-text/xdvipdfmx
+	sys-libs/zlib
+	>=media-libs/libpng-1.2.43-r2:0=
+	>=app-text/poppler-0.12.3-r3:=
+	>=x11-libs/cairo-1.12
+	>=x11-libs/pixman-0.18
+	dev-libs/zziplib
+	app-text/libpaper
+	xetex? (
+		>=media-libs/harfbuzz-0.9.20[icu,graphite]
+		>=dev-libs/icu-50:=
+		app-text/teckit
+		media-libs/fontconfig
+		media-gfx/graphite2
+	)
+	media-libs/freetype:2
+	>=dev-libs/kpathsea-6.2.0
+	cjk? ( >=dev-libs/ptexenc-1.3.2_p20140525-r1 )"
+
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+	sys-apps/ed
+	sys-devel/flex
+	app-arch/xz-utils"
+
+RDEPEND="${COMMON_DEPEND}
+	>=app-text/ps2pkm-1.5_p20130530
+	>=app-text/dvipsk-5.993_p20130530
+	>=dev-tex/bibtexu-3.71_p20130530
+	virtual/perl-Getopt-Long
+	tk? ( dev-perl/Tk )"
+
+S="${WORKDIR}/${P}_build"
+B="${WORKDIR}/${MY_PV}"
+
+src_unpack() {
+	unpack ${A}
+	mkdir -p "${S}" || die "failed to create build dir"
+}
+
+RELOC_TARGET=texmf-dist
+
+src_prepare() {
+	cd "${WORKDIR}"
+	# From texlive-module.eclass.
+	grep -H RELOC tlpkg/tlpobj/* | awk '{print $2}' | sed 's#^RELOC/##' > "${T}/reloclist"
+	{ for i in $(<"${T}/reloclist"); do  dirname $i; done; } | uniq > "${T}/dirlist"
+	for i in $(<"${T}/dirlist"); do
+		[ -d "${RELOC_TARGET}/${i}" ] || mkdir -p "${RELOC_TARGET}/${i}"
+	done
+	for i in $(<"${T}/reloclist"); do
+		mv "${i}" "${RELOC_TARGET}"/$(dirname "${i}") || die "failed to relocate ${i} to ${RELOC_TARGET}/$(dirname ${i})"
+	done
+
+	mv "${WORKDIR}"/texmf* "${B}" || die "failed to move texmf files"
+
+	cd "${B}"
+	#EPATCH_MULTI_MSG="Applying patches from upstream bugfix branch..." EPATCH_SUFFIX="patch" epatch "${WORKDIR}/gentoo_branch2011_patches"
+	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
+
+	elibtoolize
+}
+
+src_configure() {
+	# It fails on alpha without this
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	has_version '>=dev-libs/kpathsea-6.2.1' && append-cppflags "$($(tc-getPKG_CONFIG) --cflags kpathsea)"
+
+	# Too many regexps use A-Z a-z constructs, what causes problems with locales
+	# that don't have the same alphabetical order than ascii. Bug #242430
+	# So we set LC_ALL to C in order to avoid problems.
+	export LC_ALL=C
+	tc-export CC CXX AR RANLIB
+	ECONF_SOURCE="${B}" \
+		econf -C \
+		--bindir="${EPREFIX}"/usr/bin \
+		--datadir="${S}" \
+		--with-system-freetype2 \
+		--with-system-zlib \
+		--with-system-libpng \
+		--with-system-xpdf \
+		--with-system-poppler \
+		--with-system-teckit \
+		--with-teckit-includes="${EPREFIX}"/usr/include/teckit \
+		--with-system-kpathsea \
+		--with-kpathsea-includes="${EPREFIX}"/usr/include \
+		--with-system-icu \
+		--with-system-ptexenc \
+		--with-system-harfbuzz \
+		--with-system-icu \
+		--with-system-graphite2 \
+		--with-system-cairo \
+		--with-system-pixman \
+		--with-system-zziplib \
+		--with-system-libpaper \
+		--without-texinfo \
+		--disable-dialog \
+		--disable-multiplatform \
+		--enable-epsfwin \
+		--enable-mftalkwin \
+		--enable-regiswin \
+		--enable-tektronixwin \
+		--enable-unitermwin \
+		--with-ps=gs \
+		--disable-psutils \
+		--disable-t1utils \
+		--enable-ipc \
+		--disable-biber \
+		--disable-bibtex-x \
+		--disable-dvipng \
+		--disable-dvipsk \
+		--disable-chktex \
+		--disable-lcdf-typetools \
+		--disable-pdfopen \
+		--disable-ps2eps \
+		--disable-ps2pkm \
+		--disable-detex \
+		--disable-ttf2pk2 \
+		--disable-tex4htk \
+		--disable-cjkutils \
+		--disable-xdvik \
+		--disable-xindy \
+		--enable-luatex \
+		--disable-dvi2tty \
+		--disable-dvisvgm \
+		--disable-vlna \
+		--enable-shared \
+		--disable-native-texlive-build \
+		--disable-largefile \
+		$(use_enable xetex) \
+		$(use_enable cjk ptex) \
+		$(use_enable cjk eptex) \
+		$(use_enable cjk uptex) \
+		$(use_enable cjk euptex) \
+		$(use_enable cjk mendexk) \
+		$(use_enable cjk makejvf) \
+		$(use_enable tk texdoctk) \
+		$(use_with X x)
+}
+
+src_compile() {
+	tc-export CC CXX AR RANLIB
+	emake SHELL="${EPREFIX}"/bin/sh texmf="${EPREFIX}"${TEXMF_PATH:-/usr/share/texmf-dist}
+
+	cd "${B}" || die
+	# Mimic updmap --syncwithtrees to enable only fonts installed
+	# Code copied from updmap script
+	for i in `egrep '^(Mixed|Kanji)?Map' "texmf-dist/web2c/updmap.cfg" | sed 's@.* @@'`; do
+		texlive-common_is_file_present_in_texmf "$i" || echo "$i"
+	done > "${T}/updmap_update"
+	{
+		sed 's@/@\\/@g; s@^@/^MixedMap[     ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
+		sed 's@/@\\/@g; s@^@/^Map[  ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
+		sed 's@/@\\/@g; s@^@/^KanjiMap[     ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
+	} > "${T}/updmap_update2"
+	sed -f "${T}/updmap_update2" "texmf-dist/web2c/updmap.cfg" >	"${T}/updmap_update3"\
+		&& cat "${T}/updmap_update3" > "texmf-dist/web2c/updmap.cfg"
+}
+
+src_install() {
+	dodir ${TEXMF_PATH:-/usr/share/texmf-dist}/web2c
+	emake DESTDIR="${D}" texmf="${ED}${TEXMF_PATH:-/usr/share/texmf-dist}" run_texlinks="true" run_mktexlsr="true" install
+
+	cd "${B}" || die
+	dodir /usr/share # just in case
+	cp -pR texmf-dist "${ED}/usr/share/" || die "failed to install texmf trees"
+	cp -pR "${WORKDIR}"/tlpkg "${ED}/usr/share/" || die "failed to install tlpkg files"
+
+	# When X is disabled mf-nowin doesn't exist but some scripts expect it to
+	# exist. Instead, it is called mf, so we symlink it to please everything.
+	use X || dosym mf /usr/bin/mf-nowin
+
+	docinto texk
+	cd "${B}/texk"
+	dodoc ChangeLog README
+
+	docinto dviljk
+	cd "${B}/texk/dviljk"
+	dodoc ChangeLog README NEWS
+
+	docinto makeindexk
+	cd "${B}/texk/makeindexk"
+	dodoc ChangeLog NOTES README
+
+	docinto web2c
+	cd "${B}/texk/web2c"
+	dodoc ChangeLog NEWS PROJECTS README
+
+	use doc || rm -rf "${ED}/usr/share/texmf-dist/doc"
+
+	dodir /etc/env.d
+	echo 'CONFIG_PROTECT_MASK="/etc/texmf/web2c /etc/texmf/language.dat.d /etc/texmf/language.def.d /etc/texmf/updmap.d"' > "${ED}/etc/env.d/98texlive"
+	# populate /etc/texmf
+	keepdir /etc/texmf/web2c
+
+	# take care of updmap.cfg and language.d files
+	keepdir /etc/texmf/{updmap.d,language.dat.d,language.def.d,language.dat.lua.d}
+
+	mv "${ED}${TEXMF_PATH}/web2c/updmap.cfg" "${ED}/etc/texmf/updmap.d/00updmap.cfg" || die "moving updmap.cfg failed"
+
+	# Remove fmtutil.cnf, it will be regenerated from /etc/texmf/fmtutil.d files
+	# by texmf-update
+	rm -f "${ED}${TEXMF_PATH}/web2c/fmtutil.cnf"
+	# Remove bundled and invalid updmap.cfg
+	rm -f "${ED}/usr/share/texmf-dist/web2c/updmap.cfg"
+
+	texlive-common_handle_config_files
+
+	keepdir /usr/share/texmf-site
+
+	# the virtex symlink is not installed
+	# The links has to be relative, since the targets
+	# is not present at this stage and MacOS doesn't
+	# like non-existing targets
+	dosym tex /usr/bin/virtex
+	dosym pdftex /usr/bin/pdfvirtex
+
+	# Rename mpost to leave room for mplib
+	mv "${ED}/usr/bin/mpost" "${ED}/usr/bin/mpost-${P}"
+	dosym "mpost-${P}" /usr/bin/mpost
+
+	# Ditto for pdftex
+	mv "${ED}/usr/bin/pdftex" "${ED}/usr/bin/pdftex-${P}"
+	dosym "pdftex-${P}" /usr/bin/pdftex
+}
+
+pkg_postinst() {
+	etexmf-update
+
+	elog
+	elog "If you have configuration files in ${EPREFIX}/etc/texmf to merge,"
+	elog "please update them and run ${EPREFIX}/usr/sbin/texmf-update."
+	elog
+	ewarn "If you are migrating from an older TeX distribution"
+	ewarn "Please make sure you have read:"
+	ewarn "https://wiki.gentoo.org/wiki/Project:TeX/Tex_Live_Migration_Guide"
+	ewarn "in order to avoid possible problems"
+	elog
+	elog "TeXLive has been split in various ebuilds. If you are missing a"
+	elog "package to process your TeX documents, you can install"
+	elog "dev-tex/texmfind to easily search for them."
+	elog
+}
diff --git a/app-text/texlive-core/texlive-core-2015-r1.ebuild b/app-text/texlive-core/texlive-core-2015-r1.ebuild
new file mode 100644
index 000000000000..8c72c8131fdf
--- /dev/null
+++ b/app-text/texlive-core/texlive-core-2015-r1.ebuild
@@ -0,0 +1,346 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+#TL_UPSTREAM_PATCHLEVEL="1"
+PATCHLEVEL="52"
+TL_SOURCE_VERSION=20150521
+
+inherit eutils flag-o-matic toolchain-funcs libtool texlive-common
+
+MY_PV=${PN%-core}-${TL_SOURCE_VERSION}-source
+
+DESCRIPTION="A complete TeX distribution"
+HOMEPAGE="http://tug.org/texlive/"
+SLOT="0"
+LICENSE="GPL-2 LPPL-1.3c TeX"
+
+SRC_URI="mirror://gentoo/${MY_PV}.tar.xz"
+
+# Fetch patches
+SRC_URI="${SRC_URI} mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.xz"
+#	mirror://gentoo/texlive-core-upstream-patches-${TL_UPSTREAM_PATCHLEVEL}.tar.xz"
+
+TL_CORE_BINEXTRA_MODULES="
+	a2ping adhocfilelist asymptote bundledoc ctanify ctanupload ctie cweb
+	de-macro dtl dtxgen dvi2tty dviasm dvicopy dvidvi dviljk dvipos findhyph
+	fragmaster hyphenex installfont lacheck latex-git-log latex2man
+	latexfileversion latexpand latexindent ltxfileinfo ltximg listings-ext
+	match_parens mkjobtexmf patgen pdfcrop pdftools pfarrei pkfix pkfix-helper
+	purifyeps seetexk sty2dtx synctex texcount texdef texdiff texdirflatten
+	texdoc texliveonfly texloganalyser texware tie tpic2pdftex typeoutfileinfo
+	web collection-binextra
+	"
+TL_CORE_BINEXTRA_DOC_MODULES="
+	a2ping.doc adhocfilelist.doc asymptote.doc bundledoc.doc ctanify.doc
+	ctanupload.doc ctie.doc cweb.doc de-macro.doc dtxgen.doc dvi2tty.doc
+	dvicopy.doc	dviljk.doc dvipos.doc findhyph.doc fragmaster.doc
+	installfont.doc	latex-git-log.doc latex2man.doc latexfileversion.doc
+	latexpand.doc latexindent.doc ltxfileinfo.doc ltximg.doc listings-ext.doc
+	match_parens.doc mkjobtexmf.doc patgen.doc pdfcrop.doc pdftools.doc
+	pfarrei.doc pkfix.doc pkfix-helper.doc purifyeps.doc sty2dtx.doc synctex.doc
+	texcount.doc texdef.doc texdiff.doc texdirflatten.doc texdoc.doc
+	texliveonfly.doc texloganalyser.doc texware.doc tie.doc tpic2pdftex.doc
+	typeoutfileinfo.doc web.doc
+	"
+TL_CORE_BINEXTRA_SRC_MODULES="
+	adhocfilelist.source hyphenex.source listings-ext.source mkjobtexmf.source
+	pfarrei.source texdef.source
+	"
+
+TL_CORE_EXTRA_MODULES="tetex hyphen-base texconfig gsftopk texlive.infra ${TL_CORE_BINEXTRA_MODULES}"
+TL_CORE_EXTRA_DOC_MODULES="tetex.doc texconfig.doc gsftopk.doc texlive.infra.doc ${TL_CORE_BINEXTRA_DOC_MODULES}"
+TL_CORE_EXTRA_SRC_MODULES="${TL_CORE_BINEXTRA_SRC_MODULES}"
+
+for i in ${TL_CORE_EXTRA_MODULES}; do
+	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.tar.xz"
+done
+
+SRC_URI="${SRC_URI} doc? ( "
+for i in ${TL_CORE_EXTRA_DOC_MODULES}; do
+	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.tar.xz"
+done
+SRC_URI="${SRC_URI} )"
+SRC_URI="${SRC_URI} source? ( "
+for i in ${TL_CORE_EXTRA_SRC_MODULES}; do
+	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.tar.xz"
+done
+SRC_URI="${SRC_URI} )"
+
+KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="cjk X doc source tk +luajittex xetex"
+
+TEXMF_PATH=/usr/share/texmf-dist
+
+MODULAR_X_DEPEND="X? (
+				x11-libs/libXmu
+				x11-libs/libXp
+				x11-libs/libXpm
+				x11-libs/libXaw
+	)"
+
+COMMON_DEPEND="${MODULAR_X_DEPEND}
+	!app-text/ptex
+	!app-text/tetex
+	!<app-text/texlive-2007
+	!app-text/xetex
+	!<dev-texlive/texlive-basic-2014
+	!<dev-texlive/texlive-metapost-2011
+	!app-text/dvibook
+	!dev-tex/luatex
+	!app-text/dvipdfm
+	!app-text/dvipdfmx
+	!app-text/xdvipdfmx
+	sys-libs/zlib
+	>=media-libs/libpng-1.2.43-r2:0=
+	>=app-text/poppler-0.12.3-r3:=
+	>=x11-libs/cairo-1.12
+	>=x11-libs/pixman-0.18
+	dev-libs/zziplib
+	app-text/libpaper
+	dev-libs/gmp:0
+	dev-libs/mpfr:0
+	xetex? (
+		>=media-libs/harfbuzz-0.9.20[icu,graphite]
+		>=dev-libs/icu-50:=
+		>=app-text/teckit-2.5.3
+		media-libs/fontconfig
+		media-gfx/graphite2
+	)
+	media-libs/freetype:2
+	>=dev-libs/kpathsea-6.2.1
+	cjk? ( >=dev-libs/ptexenc-1.3.3_p20150521 )"
+
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+	sys-apps/ed
+	sys-devel/flex
+	app-arch/xz-utils"
+
+RDEPEND="${COMMON_DEPEND}
+	>=app-text/ps2pkm-1.7_p20150521
+	>=app-text/dvipsk-5.995_p20150521
+	>=dev-tex/bibtexu-3.71_p20150521
+	virtual/perl-Getopt-Long
+	tk? ( dev-perl/Tk )"
+
+S="${WORKDIR}/${P}_build"
+B="${WORKDIR}/${MY_PV}"
+
+src_unpack() {
+	unpack ${A}
+	mkdir -p "${S}" || die "failed to create build dir"
+}
+
+RELOC_TARGET=texmf-dist
+
+src_prepare() {
+	cd "${WORKDIR}"
+	# From texlive-module.eclass.
+	grep -H RELOC tlpkg/tlpobj/* | awk '{print $2}' | sed 's#^RELOC/##' > "${T}/reloclist"
+	{ for i in $(<"${T}/reloclist"); do  dirname $i; done; } | uniq > "${T}/dirlist"
+	for i in $(<"${T}/dirlist"); do
+		[ -d "${RELOC_TARGET}/${i}" ] || mkdir -p "${RELOC_TARGET}/${i}"
+	done
+	for i in $(<"${T}/reloclist"); do
+		mv "${i}" "${RELOC_TARGET}"/$(dirname "${i}") || die "failed to relocate ${i} to ${RELOC_TARGET}/$(dirname ${i})"
+	done
+
+	mv "${WORKDIR}"/texmf* "${B}" || die "failed to move texmf files"
+
+	cd "${B}"
+	#EPATCH_MULTI_MSG="Applying patches from upstream bugfix branch..." EPATCH_SUFFIX="patch" epatch "${WORKDIR}/gentoo_branch2011_patches"
+	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
+
+	sed -i \
+		-e "s,/usr/include /usr/local/include.*echo \$KPATHSEA_INCLUDES.*,${EPREFIX}/usr/include\"," \
+		texk/web2c/configure || die
+
+	elibtoolize
+}
+
+src_configure() {
+	# It fails on alpha without this
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# Too many regexps use A-Z a-z constructs, what causes problems with locales
+	# that don't have the same alphabetical order than ascii. Bug #242430
+	# So we set LC_ALL to C in order to avoid problems.
+	export LC_ALL=C
+	tc-export CC CXX AR RANLIB
+	ECONF_SOURCE="${B}" \
+		econf -C \
+		--bindir="${EPREFIX}"/usr/bin \
+		--datadir="${S}" \
+		--with-system-freetype2 \
+		--with-system-zlib \
+		--with-system-libpng \
+		--with-system-xpdf \
+		--with-system-poppler \
+		--with-system-teckit \
+		--with-teckit-includes="${EPREFIX}"/usr/include/teckit \
+		--with-system-kpathsea \
+		--with-kpathsea-includes="${EPREFIX}"/usr/include \
+		--with-system-icu \
+		--with-system-ptexenc \
+		--with-system-harfbuzz \
+		--with-system-icu \
+		--with-system-graphite2 \
+		--with-system-cairo \
+		--with-system-pixman \
+		--with-system-zziplib \
+		--with-system-libpaper \
+		--with-system-gmp \
+		--with-system-mpfr \
+		--without-texinfo \
+		--disable-dialog \
+		--disable-multiplatform \
+		--enable-epsfwin \
+		--enable-mftalkwin \
+		--enable-regiswin \
+		--enable-tektronixwin \
+		--enable-unitermwin \
+		--with-ps=gs \
+		--disable-psutils \
+		--disable-t1utils \
+		--enable-ipc \
+		--disable-biber \
+		--disable-bibtex-x \
+		--disable-dvipng \
+		--disable-dvipsk \
+		--disable-chktex \
+		--disable-lcdf-typetools \
+		--disable-pdfopen \
+		--disable-ps2eps \
+		--disable-ps2pk \
+		--disable-detex \
+		--disable-ttf2pk2 \
+		--disable-tex4htk \
+		--disable-cjkutils \
+		--disable-xdvik \
+		--disable-xindy \
+		--enable-luatex \
+		--disable-dvi2tty \
+		--disable-dvisvgm \
+		--disable-vlna \
+		--enable-shared \
+		--disable-native-texlive-build \
+		--disable-largefile \
+		$(use_enable luajittex) \
+		$(use_enable xetex) \
+		$(use_enable cjk ptex) \
+		$(use_enable cjk eptex) \
+		$(use_enable cjk uptex) \
+		$(use_enable cjk euptex) \
+		$(use_enable cjk mendexk) \
+		$(use_enable cjk makejvf) \
+		$(use_enable cjk pmp) \
+		$(use_enable cjk upmp) \
+		$(use_enable tk texdoctk) \
+		$(use_with X x)
+}
+
+src_compile() {
+	tc-export CC CXX AR RANLIB
+	emake SHELL="${EPREFIX}"/bin/sh texmf="${EPREFIX}"${TEXMF_PATH:-/usr/share/texmf-dist}
+
+	cd "${B}" || die
+	# Mimic updmap --syncwithtrees to enable only fonts installed
+	# Code copied from updmap script
+	for i in `egrep '^(Mixed|Kanji)?Map' "texmf-dist/web2c/updmap.cfg" | sed 's@.* @@'`; do
+		texlive-common_is_file_present_in_texmf "$i" || echo "$i"
+	done > "${T}/updmap_update"
+	{
+		sed 's@/@\\/@g; s@^@/^MixedMap[     ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
+		sed 's@/@\\/@g; s@^@/^Map[  ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
+		sed 's@/@\\/@g; s@^@/^KanjiMap[     ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
+	} > "${T}/updmap_update2"
+	sed -f "${T}/updmap_update2" "texmf-dist/web2c/updmap.cfg" >	"${T}/updmap_update3"\
+		&& cat "${T}/updmap_update3" > "texmf-dist/web2c/updmap.cfg"
+}
+
+src_install() {
+	dodir ${TEXMF_PATH:-/usr/share/texmf-dist}/web2c
+	emake DESTDIR="${D}" texmf="${ED}${TEXMF_PATH:-/usr/share/texmf-dist}" run_texlinks="true" run_mktexlsr="true" install
+
+	cd "${B}" || die
+	dodir /usr/share # just in case
+	cp -pR texmf-dist "${ED}/usr/share/" || die "failed to install texmf trees"
+	cp -pR "${WORKDIR}"/tlpkg "${ED}/usr/share/" || die "failed to install tlpkg files"
+
+	# When X is disabled mf-nowin doesn't exist but some scripts expect it to
+	# exist. Instead, it is called mf, so we symlink it to please everything.
+	use X || dosym mf /usr/bin/mf-nowin
+
+	docinto texk
+	cd "${B}/texk"
+	dodoc ChangeLog README
+
+	docinto dviljk
+	cd "${B}/texk/dviljk"
+	dodoc ChangeLog README NEWS
+
+	docinto makeindexk
+	cd "${B}/texk/makeindexk"
+	dodoc ChangeLog NOTES README
+
+	docinto web2c
+	cd "${B}/texk/web2c"
+	dodoc ChangeLog NEWS PROJECTS README
+
+	use doc || rm -rf "${ED}/usr/share/texmf-dist/doc"
+
+	dodir /etc/env.d
+	echo 'CONFIG_PROTECT_MASK="/etc/texmf/web2c /etc/texmf/language.dat.d /etc/texmf/language.def.d /etc/texmf/updmap.d"' > "${ED}/etc/env.d/98texlive"
+	# populate /etc/texmf
+	keepdir /etc/texmf/web2c
+
+	# take care of updmap.cfg and language.d files
+	keepdir /etc/texmf/{updmap.d,language.dat.d,language.def.d,language.dat.lua.d}
+
+	mv "${ED}${TEXMF_PATH}/web2c/updmap.cfg" "${ED}/etc/texmf/updmap.d/00updmap.cfg" || die "moving updmap.cfg failed"
+
+	# Remove fmtutil.cnf, it will be regenerated from /etc/texmf/fmtutil.d files
+	# by texmf-update
+	rm -f "${ED}${TEXMF_PATH}/web2c/fmtutil.cnf"
+	# Remove bundled and invalid updmap.cfg
+	rm -f "${ED}/usr/share/texmf-dist/web2c/updmap.cfg"
+
+	texlive-common_handle_config_files
+
+	keepdir /usr/share/texmf-site
+
+	# the virtex symlink is not installed
+	# The links has to be relative, since the targets
+	# is not present at this stage and MacOS doesn't
+	# like non-existing targets
+	dosym tex /usr/bin/virtex
+	dosym pdftex /usr/bin/pdfvirtex
+
+	# Rename mpost to leave room for mplib
+	mv "${ED}/usr/bin/mpost" "${ED}/usr/bin/mpost-${P}"
+	dosym "mpost-${P}" /usr/bin/mpost
+
+	# Ditto for pdftex
+	mv "${ED}/usr/bin/pdftex" "${ED}/usr/bin/pdftex-${P}"
+	dosym "pdftex-${P}" /usr/bin/pdftex
+}
+
+pkg_postinst() {
+	etexmf-update
+
+	elog
+	elog "If you have configuration files in ${EPREFIX}/etc/texmf to merge,"
+	elog "please update them and run ${EPREFIX}/usr/sbin/texmf-update."
+	elog
+	ewarn "If you are migrating from an older TeX distribution"
+	ewarn "Please make sure you have read:"
+	ewarn "https://wiki.gentoo.org/wiki/Project:TeX/Tex_Live_Migration_Guide"
+	ewarn "in order to avoid possible problems"
+	elog
+	elog "TeXLive has been split in various ebuilds. If you are missing a"
+	elog "package to process your TeX documents, you can install"
+	elog "dev-tex/texmfind to easily search for them."
+	elog
+}
diff --git a/app-text/texlive-core/texlive-core-2016-r5.ebuild b/app-text/texlive-core/texlive-core-2016-r5.ebuild
new file mode 100644
index 000000000000..968bc1ce9d0d
--- /dev/null
+++ b/app-text/texlive-core/texlive-core-2016-r5.ebuild
@@ -0,0 +1,356 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+#TL_UPSTREAM_PATCHLEVEL="1"
+PATCHLEVEL="65"
+TL_SOURCE_VERSION=20160523
+
+inherit eutils flag-o-matic toolchain-funcs libtool texlive-common
+
+MY_PV=${PN%-core}-${TL_SOURCE_VERSION}-source
+
+DESCRIPTION="A complete TeX distribution"
+HOMEPAGE="http://tug.org/texlive/"
+SLOT="0"
+LICENSE="GPL-2 LPPL-1.3c TeX"
+
+SRC_URI="mirror://gentoo/${MY_PV}.tar.xz"
+
+# Fetch patches
+SRC_URI="${SRC_URI} mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.xz"
+#	mirror://gentoo/texlive-core-upstream-patches-${TL_UPSTREAM_PATCHLEVEL}.tar.xz"
+
+TL_CORE_BINEXTRA_MODULES="
+	a2ping adhocfilelist arara asymptote bundledoc checklistings ctan_chk
+	ctanify ctanupload ctie cweb de-macro dtl dtxgen dvi2tty dviasm dvicopy
+	dvidvi dviljk dvipos findhyph fragmaster hook-pre-commit-pkg hyphenex
+	installfont lacheck latex-git-log latex-papersize latex2man latex2nemeth
+	latexfileversion latexpand latexindent ltxfileinfo ltximg listings-ext make4ht
+	match_parens mflua mkjobtexmf patgen pdfbook2 pdfcrop pdflatexpicscale pdftools
+	pdfxup pfarrei pkfix pkfix-helper purifyeps seetexk srcredact sty2dtx
+	synctex tex4ebook texcount texdef texdiff texdirflatten texdoc texfot
+	texliveonfly texloganalyser texosquery texware tie tpic2pdftex typeoutfileinfo
+	web collection-binextra
+	"
+TL_CORE_BINEXTRA_DOC_MODULES="
+	a2ping.doc adhocfilelist.doc arara.doc asymptote.doc bundledoc.doc
+	checklistings.doc ctan_chk.doc ctanify.doc ctanupload.doc ctie.doc
+	cweb.doc de-macro.doc dtl.doc dtxgen.doc dvi2tty.doc dviasm.doc dvicopy.doc
+	dvidvi.doc dviljk.doc dvipos.doc findhyph.doc fragmaster.doc
+	hook-pre-commit-pkg.doc installfont.doc lacheck.doc latex-git-log.doc
+	latex-papersize.doc latex2man.doc latex2nemeth.doc latexfileversion.doc
+	latexpand.doc latexindent.doc ltxfileinfo.doc ltximg.doc listings-ext.doc
+	make4ht.doc match_parens.doc mkjobtexmf.doc patgen.doc pdfbook2.doc pdfcrop.doc
+	pdflatexpicscale.doc pdftools.doc pdfxup.doc pfarrei.doc pkfix.doc
+	pkfix-helper.doc purifyeps.doc pythontex.doc seetexk.doc srcredact.doc
+	sty2dtx.doc synctex.doc tex4ebook.doc texcount.doc texdef.doc texdiff.doc
+	texdirflatten.doc texdoc.doc texfot.doc texliveonfly.doc texloganalyser.doc
+	texosquery.doc texware.doc tie.doc tpic2pdftex.doc typeoutfileinfo.doc web.doc
+"
+TL_CORE_BINEXTRA_SRC_MODULES="
+	adhocfilelist.source arara.source checklistings.source hyphenex.source
+	listings-ext.source mkjobtexmf.source pfarrei.source pythontex.source
+	texdef.source texosquery.source
+"
+
+TL_CORE_EXTRA_MODULES="tetex hyphen-base texconfig gsftopk texlive.infra ${TL_CORE_BINEXTRA_MODULES}"
+TL_CORE_EXTRA_DOC_MODULES="tetex.doc texconfig.doc gsftopk.doc texlive.infra.doc ${TL_CORE_BINEXTRA_DOC_MODULES}"
+TL_CORE_EXTRA_SRC_MODULES="${TL_CORE_BINEXTRA_SRC_MODULES}"
+
+for i in ${TL_CORE_EXTRA_MODULES}; do
+	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.tar.xz"
+done
+
+SRC_URI="${SRC_URI} doc? ( "
+for i in ${TL_CORE_EXTRA_DOC_MODULES}; do
+	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.tar.xz"
+done
+SRC_URI="${SRC_URI} )"
+SRC_URI="${SRC_URI} source? ( "
+for i in ${TL_CORE_EXTRA_SRC_MODULES}; do
+	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.tar.xz"
+done
+SRC_URI="${SRC_URI} )"
+
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="cjk X doc source tk +luajittex xetex"
+
+TEXMF_PATH=/usr/share/texmf-dist
+
+MODULAR_X_DEPEND="X? (
+				x11-libs/libXmu
+				x11-libs/libXp
+				x11-libs/libXpm
+				x11-libs/libXaw
+	)"
+
+COMMON_DEPEND="${MODULAR_X_DEPEND}
+	!app-text/ptex
+	!app-text/tetex
+	!<app-text/texlive-2007
+	!app-text/xetex
+	!<dev-texlive/texlive-basic-2014
+	!<dev-texlive/texlive-metapost-2011
+	!app-text/dvibook
+	!dev-tex/luatex
+	!app-text/dvipdfm
+	!app-text/dvipdfmx
+	!app-text/xdvipdfmx
+	sys-libs/zlib
+	>=media-libs/libpng-1.2.43-r2:0=
+	>=app-text/poppler-0.12.3-r3:=
+	>=x11-libs/cairo-1.12
+	>=x11-libs/pixman-0.18
+	dev-libs/zziplib
+	app-text/libpaper
+	dev-libs/gmp:0
+	dev-libs/mpfr:0
+	xetex? (
+		>=media-libs/harfbuzz-0.9.20[icu,graphite]
+		>=dev-libs/icu-50:=
+		>=app-text/teckit-2.5.3
+		media-libs/fontconfig
+		media-gfx/graphite2
+	)
+	media-libs/freetype:2
+	>=dev-libs/kpathsea-6.2.1
+	cjk? ( >=dev-libs/ptexenc-1.3.4_p20160523 )"
+
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+	sys-apps/ed
+	sys-devel/flex
+	app-arch/xz-utils"
+
+RDEPEND="${COMMON_DEPEND}
+	>=app-text/ps2pkm-1.8_p20160523
+	>=app-text/dvipsk-5.996_p20160523
+	>=dev-tex/bibtexu-3.71_p20160523
+	virtual/perl-Getopt-Long
+	tk? ( dev-perl/Tk )"
+
+S="${WORKDIR}/${P}_build"
+B="${WORKDIR}/${MY_PV}"
+
+src_unpack() {
+	unpack ${A}
+	mkdir -p "${S}" || die "failed to create build dir"
+}
+
+RELOC_TARGET=texmf-dist
+
+src_prepare() {
+	cd "${WORKDIR}"
+	# From texlive-module.eclass.
+	grep -H RELOC tlpkg/tlpobj/* | awk '{print $2}' | sed 's#^RELOC/##' > "${T}/reloclist"
+	{ for i in $(<"${T}/reloclist"); do  dirname $i; done; } | uniq > "${T}/dirlist"
+	for i in $(<"${T}/dirlist"); do
+		[ -d "${RELOC_TARGET}/${i}" ] || mkdir -p "${RELOC_TARGET}/${i}"
+	done
+	for i in $(<"${T}/reloclist"); do
+		mv "${i}" "${RELOC_TARGET}"/$(dirname "${i}") || die "failed to relocate ${i} to ${RELOC_TARGET}/$(dirname ${i})"
+	done
+
+	mv "${WORKDIR}"/texmf* "${B}" || die "failed to move texmf files"
+
+	cd "${B}"
+	#EPATCH_MULTI_MSG="Applying patches from upstream bugfix branch..." EPATCH_SUFFIX="patch" epatch "${WORKDIR}/gentoo_branch2011_patches"
+	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
+
+	sed -i \
+		-e "s,/usr/include /usr/local/include.*echo \$KPATHSEA_INCLUDES.*,${EPREFIX}/usr/include\"," \
+		texk/web2c/configure || die
+
+	elibtoolize
+}
+
+src_configure() {
+	# It fails on alpha without this
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# Required for newest icu, bug #618732
+	append-cxxflags '-std=c++11'
+
+	# Too many regexps use A-Z a-z constructs, what causes problems with locales
+	# that don't have the same alphabetical order than ascii. Bug #242430
+	# So we set LC_ALL to C in order to avoid problems.
+	export LC_ALL=C
+	tc-export CC CXX AR RANLIB
+	ECONF_SOURCE="${B}" \
+		econf -C \
+		--bindir="${EPREFIX}"/usr/bin \
+		--datadir="${S}" \
+		--with-system-freetype2 \
+		--with-system-zlib \
+		--with-system-libpng \
+		--with-system-xpdf \
+		--with-system-poppler \
+		--with-system-teckit \
+		--with-teckit-includes="${EPREFIX}"/usr/include/teckit \
+		--with-system-kpathsea \
+		--with-kpathsea-includes="${EPREFIX}"/usr/include \
+		--with-system-icu \
+		--with-system-ptexenc \
+		--with-system-harfbuzz \
+		--with-system-icu \
+		--with-system-graphite2 \
+		--with-system-cairo \
+		--with-system-pixman \
+		--with-system-zziplib \
+		--with-system-libpaper \
+		--with-system-gmp \
+		--with-system-mpfr \
+		--without-texinfo \
+		--disable-dialog \
+		--disable-multiplatform \
+		--enable-epsfwin \
+		--enable-mftalkwin \
+		--enable-regiswin \
+		--enable-tektronixwin \
+		--enable-unitermwin \
+		--with-ps=gs \
+		--disable-psutils \
+		--disable-t1utils \
+		--enable-ipc \
+		--disable-biber \
+		--disable-bibtex-x \
+		--disable-dvipng \
+		--disable-dvipsk \
+		--disable-chktex \
+		--disable-lcdf-typetools \
+		--disable-pdfopen \
+		--disable-ps2eps \
+		--disable-ps2pk \
+		--disable-detex \
+		--disable-ttf2pk2 \
+		--disable-tex4htk \
+		--disable-cjkutils \
+		--disable-xdvik \
+		--disable-xindy \
+		--enable-luatex \
+		--disable-dvi2tty \
+		--disable-dvisvgm \
+		--disable-vlna \
+		--enable-shared \
+		--disable-native-texlive-build \
+		--disable-largefile \
+		$(use_enable luajittex) \
+		$(use_enable luajittex mfluajit) \
+		$(use_enable xetex) \
+		$(use_enable cjk ptex) \
+		$(use_enable cjk eptex) \
+		$(use_enable cjk uptex) \
+		$(use_enable cjk euptex) \
+		$(use_enable cjk mendexk) \
+		$(use_enable cjk makejvf) \
+		$(use_enable cjk pmp) \
+		$(use_enable cjk upmp) \
+		$(use_enable tk texdoctk) \
+		$(use_with X x)
+}
+
+src_compile() {
+	tc-export CC CXX AR RANLIB
+	emake SHELL="${EPREFIX}"/bin/sh texmf="${EPREFIX}"${TEXMF_PATH:-/usr/share/texmf-dist}
+
+	cd "${B}" || die
+	# Mimic updmap --syncwithtrees to enable only fonts installed
+	# Code copied from updmap script
+	for i in `egrep '^(Mixed|Kanji)?Map' "texmf-dist/web2c/updmap.cfg" | sed 's@.* @@'`; do
+		texlive-common_is_file_present_in_texmf "$i" || echo "$i"
+	done > "${T}/updmap_update"
+	{
+		sed 's@/@\\/@g; s@^@/^MixedMap[     ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
+		sed 's@/@\\/@g; s@^@/^Map[  ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
+		sed 's@/@\\/@g; s@^@/^KanjiMap[     ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
+	} > "${T}/updmap_update2"
+	sed -f "${T}/updmap_update2" "texmf-dist/web2c/updmap.cfg" >	"${T}/updmap_update3"\
+		&& cat "${T}/updmap_update3" > "texmf-dist/web2c/updmap.cfg"
+}
+
+src_install() {
+	dodir ${TEXMF_PATH:-/usr/share/texmf-dist}/web2c
+	emake DESTDIR="${D}" texmf="${ED}${TEXMF_PATH:-/usr/share/texmf-dist}" run_texlinks="true" run_mktexlsr="true" install
+
+	cd "${B}" || die
+	dodir /usr/share # just in case
+	cp -pR texmf-dist "${ED}/usr/share/" || die "failed to install texmf trees"
+	cp -pR "${WORKDIR}"/tlpkg "${ED}/usr/share/" || die "failed to install tlpkg files"
+
+	# When X is disabled mf-nowin doesn't exist but some scripts expect it to
+	# exist. Instead, it is called mf, so we symlink it to please everything.
+	use X || dosym mf /usr/bin/mf-nowin
+
+	docinto texk
+	cd "${B}/texk"
+	dodoc ChangeLog README
+
+	docinto dviljk
+	cd "${B}/texk/dviljk"
+	dodoc ChangeLog README NEWS
+
+	docinto makeindexk
+	cd "${B}/texk/makeindexk"
+	dodoc ChangeLog NOTES README
+
+	docinto web2c
+	cd "${B}/texk/web2c"
+	dodoc ChangeLog NEWS PROJECTS README
+
+	use doc || rm -rf "${ED}/usr/share/texmf-dist/doc"
+
+	dodir /etc/env.d
+	echo 'CONFIG_PROTECT_MASK="/etc/texmf/web2c /etc/texmf/language.dat.d /etc/texmf/language.def.d /etc/texmf/updmap.d"' > "${ED}/etc/env.d/98texlive"
+	# populate /etc/texmf
+	keepdir /etc/texmf/web2c
+
+	# take care of updmap.cfg and language.d files
+	keepdir /etc/texmf/{updmap.d,language.dat.d,language.def.d,language.dat.lua.d}
+
+	mv "${ED}${TEXMF_PATH}/web2c/updmap.cfg" "${ED}/etc/texmf/updmap.d/00updmap.cfg" || die "moving updmap.cfg failed"
+
+	# Remove fmtutil.cnf, it will be regenerated from /etc/texmf/fmtutil.d files
+	# by texmf-update
+	rm -f "${ED}${TEXMF_PATH}/web2c/fmtutil.cnf"
+	# Remove bundled and invalid updmap.cfg
+	rm -f "${ED}/usr/share/texmf-dist/web2c/updmap.cfg"
+
+	texlive-common_handle_config_files
+
+	keepdir /usr/share/texmf-site
+
+	# the virtex symlink is not installed
+	# The links has to be relative, since the targets
+	# is not present at this stage and MacOS doesn't
+	# like non-existing targets
+	dosym tex /usr/bin/virtex
+	dosym pdftex /usr/bin/pdfvirtex
+
+	# Rename mpost to leave room for mplib
+	mv "${ED}/usr/bin/mpost" "${ED}/usr/bin/mpost-${P}"
+	dosym "mpost-${P}" /usr/bin/mpost
+
+	# Ditto for pdftex
+	mv "${ED}/usr/bin/pdftex" "${ED}/usr/bin/pdftex-${P}"
+	dosym "pdftex-${P}" /usr/bin/pdftex
+}
+
+pkg_postinst() {
+	etexmf-update
+
+	elog
+	elog "If you have configuration files in ${EPREFIX}/etc/texmf to merge,"
+	elog "please update them and run ${EPREFIX}/usr/sbin/texmf-update."
+	elog
+	ewarn "If you are migrating from an older TeX distribution"
+	ewarn "Please make sure you have read:"
+	ewarn "https://wiki.gentoo.org/wiki/Project:TeX/Tex_Live_Migration_Guide"
+	ewarn "in order to avoid possible problems"
+	elog
+	elog "TeXLive has been split in various ebuilds. If you are missing a"
+	elog "package to process your TeX documents, you can install"
+	elog "dev-tex/texmfind to easily search for them."
+	elog
+}
diff --git a/app-text/texlive-core/texlive-core-2017-r2.ebuild b/app-text/texlive-core/texlive-core-2017-r2.ebuild
new file mode 100644
index 000000000000..c34e273db5b0
--- /dev/null
+++ b/app-text/texlive-core/texlive-core-2017-r2.ebuild
@@ -0,0 +1,360 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+#TL_UPSTREAM_PATCHLEVEL="1"
+PATCHLEVEL="68"
+TL_SOURCE_VERSION=20170524
+
+inherit eutils flag-o-matic toolchain-funcs libtool texlive-common
+
+MY_PV=${PN%-core}-${TL_SOURCE_VERSION}-source
+
+DESCRIPTION="A complete TeX distribution"
+HOMEPAGE="http://tug.org/texlive/"
+SLOT="0"
+LICENSE="GPL-2 LPPL-1.3c TeX"
+
+SRC_URI="mirror://gentoo/${MY_PV}.tar.xz"
+
+# Fetch patches
+SRC_URI="${SRC_URI} mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.xz"
+#	mirror://gentoo/texlive-core-upstream-patches-${TL_UPSTREAM_PATCHLEVEL}.tar.xz"
+
+TL_CORE_BINEXTRA_MODULES="
+	a2ping adhocfilelist arara asymptote bundledoc checklistings ctan_chk
+	ctanify ctanupload ctie cweb de-macro dtl dtxgen dvi2tty dviasm dvicopy
+	dvidvi dviljk dvipos findhyph fragmaster hook-pre-commit-pkg hyphenex
+	installfont lacheck latex-git-log latex-papersize latex2man latex2nemeth
+	latexfileversion latexpand latexindent ltxfileinfo ltximg listings-ext make4ht
+	match_parens mflua mkjobtexmf patgen pdfbook2 pdfcrop pdflatexpicscale pdftools
+	pdfxup pfarrei pkfix pkfix-helper purifyeps seetexk srcredact sty2dtx
+	synctex tex4ebook texcount texdef texdiff texdirflatten texdoc texfot
+	texliveonfly texloganalyser texosquery texware tie tpic2pdftex typeoutfileinfo
+	web collection-binextra
+	"
+TL_CORE_BINEXTRA_DOC_MODULES="
+	a2ping.doc adhocfilelist.doc arara.doc asymptote.doc bundledoc.doc
+	checklistings.doc ctan_chk.doc ctanify.doc ctanupload.doc ctie.doc
+	cweb.doc de-macro.doc dtl.doc dtxgen.doc dvi2tty.doc dviasm.doc dvicopy.doc
+	dvidvi.doc dviljk.doc dvipos.doc findhyph.doc fragmaster.doc
+	hook-pre-commit-pkg.doc installfont.doc lacheck.doc latex-git-log.doc
+	latex-papersize.doc latex2man.doc latex2nemeth.doc latexfileversion.doc
+	latexpand.doc latexindent.doc ltxfileinfo.doc ltximg.doc listings-ext.doc
+	make4ht.doc match_parens.doc mkjobtexmf.doc patgen.doc pdfbook2.doc pdfcrop.doc
+	pdflatexpicscale.doc pdftools.doc pdfxup.doc pfarrei.doc pkfix.doc
+	pkfix-helper.doc purifyeps.doc pythontex.doc seetexk.doc srcredact.doc
+	sty2dtx.doc synctex.doc tex4ebook.doc texcount.doc texdef.doc texdiff.doc
+	texdirflatten.doc texdoc.doc texfot.doc texliveonfly.doc texloganalyser.doc
+	texosquery.doc texware.doc tie.doc tpic2pdftex.doc typeoutfileinfo.doc web.doc
+"
+TL_CORE_BINEXTRA_SRC_MODULES="
+	adhocfilelist.source arara.source checklistings.source hyphenex.source
+	listings-ext.source mkjobtexmf.source pfarrei.source pythontex.source
+	texdef.source texosquery.source
+"
+
+TL_CORE_EXTRA_MODULES="tetex hyphen-base texconfig gsftopk texlive.infra ${TL_CORE_BINEXTRA_MODULES}"
+TL_CORE_EXTRA_DOC_MODULES="tetex.doc texconfig.doc gsftopk.doc texlive.infra.doc ${TL_CORE_BINEXTRA_DOC_MODULES}"
+TL_CORE_EXTRA_SRC_MODULES="${TL_CORE_BINEXTRA_SRC_MODULES}"
+
+for i in ${TL_CORE_EXTRA_MODULES}; do
+	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.tar.xz"
+done
+
+SRC_URI="${SRC_URI} doc? ( "
+for i in ${TL_CORE_EXTRA_DOC_MODULES}; do
+	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.tar.xz"
+done
+SRC_URI="${SRC_URI} )"
+SRC_URI="${SRC_URI} source? ( "
+for i in ${TL_CORE_EXTRA_SRC_MODULES}; do
+	SRC_URI="${SRC_URI} mirror://gentoo/texlive-module-${i}-${PV}.tar.xz"
+done
+SRC_URI="${SRC_URI} )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="cjk X doc source tk +luajittex xetex"
+
+TEXMF_PATH=/usr/share/texmf-dist
+
+MODULAR_X_DEPEND="X? (
+				x11-libs/libXmu
+				x11-libs/libXp
+				x11-libs/libXpm
+				x11-libs/libXaw
+	)"
+
+COMMON_DEPEND="${MODULAR_X_DEPEND}
+	!app-text/ptex
+	!app-text/tetex
+	!<app-text/texlive-2007
+	!app-text/xetex
+	!<dev-texlive/texlive-basic-2014
+	!<dev-texlive/texlive-metapost-2011
+	!app-text/dvibook
+	!dev-tex/luatex
+	!app-text/dvipdfm
+	!app-text/dvipdfmx
+	!app-text/xdvipdfmx
+	sys-libs/zlib
+	>=media-libs/libpng-1.2.43-r2:0=
+	>=app-text/poppler-0.12.3-r3:=
+	<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}"
+	#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/Manifest b/app-text/texlive/Manifest
new file mode 100644
index 000000000000..95ac6dcea82b
--- /dev/null
+++ b/app-text/texlive/Manifest
@@ -0,0 +1,6 @@
+EBUILD texlive-2015.ebuild 7573 SHA256 236ce312b811af5729e515166055bfd523ee1e0301b0f316c3664f501b5821cf SHA512 a89d62f23eea5e1f7d1d45261294c08147e8c3f5174a55615bc8d22400577d6dbb67aee0aba00c983457dd439299aff8800f10ef61902a88eb931b2d99b1986f WHIRLPOOL 5e4de9c4a9529ae1b993bfc8774badbcebb10c0e8907ee109e4011971c6f33babf28af49e59f04a342464bb3c62e22179c476bf6eb745efd7cff0ed1b1b0824b
+EBUILD texlive-2016.ebuild 7545 SHA256 f383cfde5390fa8646217f632c05467cd986919233f1b15db435b80ce2d9dacc SHA512 f5306d3c4031cd7095e27e41990f57dd8f8a5bc4045ab4ef4ed40f9ab7b3bfe656ab8d531c1aa527f316895eadc774dcb3ccc81724b176794e89dcce726b100b WHIRLPOOL 83ee33debc26c679300639d8db63ca0bba37ef5ad4c2a36b0cdb405c6a81b0a04e9d38bec38715743a406f29d3228c3072fef2abe45273f86b7b7a3fe4a7d33c
+EBUILD texlive-2017.ebuild 7407 SHA256 39ab3b042b67c505cf0bd626cbeb7cf147cbfbd55c8cee1f0e92341b7b3f1fb8 SHA512 c956a804125233b01970900db134c5e183b4757bf88fecd43ff409be2cf2814f15531357795d7a4adeedc17463440986719878e47b0ae7a337a574dc0218ecf8 WHIRLPOOL 176edc259142fe2594cf6432d239f9df3723a2b914d8ef7fb363a941f6b738880bd6c7feaa7f4172acd6527cc4481479c804b7e5f5db79eaf22c15421423b050
+MISC ChangeLog 3504 SHA256 fd7e70a475bf79a186a8e67dccfa5b5703e282b384d67640b7acf8e1a0253e02 SHA512 914f0c125d39c73dbe81571263b9f50ac604c3833d9292f8706ed7273891ecf8302739bc645d0e0172ca189b307568d0868f03c4d179cf95ac570296be7a8c93 WHIRLPOOL 0a5c983d80d8b244add375fd608a63d4ab750e6ed922c8fcc89fff1414e8a63a54a11e303e286fcad941b17f50362c9cbaf0e4b0edc1412b91e712c1012bd730
+MISC ChangeLog-2015 9211 SHA256 c4ec8e0d70878f82a6acf4edab7d9f88ef4c79bf4314160533227911a3972072 SHA512 a6d0af25de4390aa5471f679cb67e9376fc5c35dc318c946953cc9fb2bbdd9ddd65a832c84e28b7e6827504b78b18f77e60e281d83615a040e3a628197aa137e WHIRLPOOL 0fecc8f354a242a7caa8c7557dc6597689efef67cb72ec570f1b95204088677870dca007259c8d76a9659800a3f43e3e59111e47ab9efacb5f8f6f4b976d8bf8
+MISC metadata.xml 2561 SHA256 4f500f09dd0c80eeb3438fbbc781566c1d84a14c8043d5911bd499be77b1b6ef SHA512 287d95a0a885ba2194faadb7e7ba9fe860ea620596bc0eafccd46c769eacfb7effb71d20286a4286777b94a45d5ba63fb5e3d8d5561eba4df3e938dc407e5b07 WHIRLPOOL e245c2788f1bc5a3c6beee5a8db46060fa52b6b010e4bd597a200abfdf8380c22b7a01f46dc789b8b7b8f5162f5e585a1cf35aa999736bd673e34d1f06ec2886
diff --git a/app-text/texlive/metadata.xml b/app-text/texlive/metadata.xml
new file mode 100644
index 000000000000..a0e92f237df1
--- /dev/null
+++ b/app-text/texlive/metadata.xml
@@ -0,0 +1,47 @@
+<?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="omega">Add omega packages
+    (<pkg>dev-texlive/texlive-omega</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-science</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-2015.ebuild b/app-text/texlive/texlive-2015.ebuild
new file mode 100644
index 000000000000..098be06fbe1f
--- /dev/null
+++ b/app-text/texlive/texlive-2015.ebuild
@@ -0,0 +1,169 @@
+# Copyright 1999-2017 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 ~hppa ~mips ppc ppc64 ~s390 ~sh 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 omega 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 en-GB 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-genericrecommended-${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-genericextra-${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
+		>=${TEXLIVE_CAT}/texlive-mathextra-${PV}
+		>=${TEXLIVE_CAT}/texlive-plainextra-${PV}
+	)
+	xetex? ( >=${TEXLIVE_CAT}/texlive-xetex-${PV} )
+	graphics? ( >=${TEXLIVE_CAT}/texlive-pictures-${PV}
+		dev-tex/dot2texi )
+	epspdf? ( app-text/epspdf )
+	science? ( >=${TEXLIVE_CAT}/texlive-science-${PV} )
+	publishers? ( >=${TEXLIVE_CAT}/texlive-publishers-${PV} )
+	music? ( >=${TEXLIVE_CAT}/texlive-music-${PV} )
+	pstricks? ( >=${TEXLIVE_CAT}/texlive-pstricks-${PV} )
+	omega? ( >=${TEXLIVE_CAT}/texlive-omega-${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-langafrican-${PV}
+	              >=${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_en-GB? ( >=${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-langindic-${PV} )
+	l10n_bn?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
+	l10n_gu?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
+	l10n_hi?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
+	l10n_kn?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
+	l10n_ml?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
+	l10n_mr?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
+	l10n_or?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
+	l10n_pa?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
+	l10n_sa?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
+	l10n_ta?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
+	l10n_te?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
+	l10n_it?    ( >=${TEXLIVE_CAT}/texlive-langitalian-${PV} )
+	l10n_ja?    ( >=${TEXLIVE_CAT}/texlive-langjapanese-${PV} )
+	l10n_ko?    ( >=${TEXLIVE_CAT}/texlive-langkorean-${PV} )
+	l10n_la?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_lt?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_lv?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_mn?    ( >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
+	l10n_nb?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_nn?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_no?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_cy?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_eo?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_et?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_ga?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_rm?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_hsb?   ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_ia?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_id?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_is?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_lo?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_ro?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_sq?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_sr?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV}
+	              >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
+	l10n_sl?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_tr?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_pl?    ( >=${TEXLIVE_CAT}/texlive-langpolish-${PV} )
+	l10n_pt?    ( >=${TEXLIVE_CAT}/texlive-langportuguese-${PV} )
+	l10n_ca?    ( >=${TEXLIVE_CAT}/texlive-langspanish-${PV} )
+	l10n_gl?    ( >=${TEXLIVE_CAT}/texlive-langspanish-${PV} )
+	l10n_es?    ( >=${TEXLIVE_CAT}/texlive-langspanish-${PV} )
+	l10n_sco?   ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_sv?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_tk?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_vi?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_zh?    ( >=${TEXLIVE_CAT}/texlive-langchinese-${PV} )
+	xindy? ( app-text/xindy )
+"
diff --git a/app-text/texlive/texlive-2016.ebuild b/app-text/texlive/texlive-2016.ebuild
new file mode 100644
index 000000000000..6558dfacd64a
--- /dev/null
+++ b/app-text/texlive/texlive-2016.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2017 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 ~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 omega 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 en-GB 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-genericrecommended-${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-genericextra-${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
+		>=${TEXLIVE_CAT}/texlive-plainextra-${PV}
+	)
+	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} )
+	omega? ( >=${TEXLIVE_CAT}/texlive-omega-${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-langafrican-${PV}
+	              >=${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_en-GB? ( >=${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-langindic-${PV} )
+	l10n_bn?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
+	l10n_gu?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
+	l10n_hi?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
+	l10n_kn?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
+	l10n_ml?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
+	l10n_mr?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
+	l10n_or?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
+	l10n_pa?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
+	l10n_sa?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
+	l10n_ta?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
+	l10n_te?    ( >=${TEXLIVE_CAT}/texlive-langindic-${PV} )
+	l10n_it?    ( >=${TEXLIVE_CAT}/texlive-langitalian-${PV} )
+	l10n_ja?    ( >=${TEXLIVE_CAT}/texlive-langjapanese-${PV} )
+	l10n_ko?    ( >=${TEXLIVE_CAT}/texlive-langkorean-${PV} )
+	l10n_la?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_lt?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_lv?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_mn?    ( >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
+	l10n_nb?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_nn?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_no?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_cy?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_eo?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_et?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_ga?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_rm?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_hsb?   ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_ia?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_id?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_is?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_lo?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_ro?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_sq?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_sr?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV}
+	              >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
+	l10n_sl?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_tr?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_pl?    ( >=${TEXLIVE_CAT}/texlive-langpolish-${PV} )
+	l10n_pt?    ( >=${TEXLIVE_CAT}/texlive-langportuguese-${PV} )
+	l10n_ca?    ( >=${TEXLIVE_CAT}/texlive-langspanish-${PV} )
+	l10n_gl?    ( >=${TEXLIVE_CAT}/texlive-langspanish-${PV} )
+	l10n_es?    ( >=${TEXLIVE_CAT}/texlive-langspanish-${PV} )
+	l10n_sco?   ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_sv?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_tk?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_vi?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_zh?    ( >=${TEXLIVE_CAT}/texlive-langchinese-${PV} )
+	xindy? ( app-text/xindy )
+"
diff --git a/app-text/texlive/texlive-2017.ebuild b/app-text/texlive/texlive-2017.ebuild
new file mode 100644
index 000000000000..e29aa60f0ae6
--- /dev/null
+++ b/app-text/texlive/texlive-2017.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2017 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 en-GB 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}
+	              >=${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_en-GB? ( >=${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/Manifest b/app-text/tidy-html5/Manifest
new file mode 100644
index 000000000000..84b151d45c70
--- /dev/null
+++ b/app-text/tidy-html5/Manifest
@@ -0,0 +1,4 @@
+DIST tidy-html5-5.4.0.zip 573217 SHA256 aa9d611cdee60ef0d20941f6c5f09240189e3a90e4ef8994b15bf561ce3ed691 SHA512 788646c0c15a1be58695469977c340cbe7d37fada63faea34b67c1d7ffe6074ed2b6dcd6cc946a0ae99cd5319c9a8c5ffb81958f82b6097a35a3215bc1776fa8 WHIRLPOOL f081b17b22feb05c436756dea7e55cdd98608bc99d085db0121e0fdb297761dc7a87b4793586cdaf841bcc4a6bd1e08a566620030702482bd1ecce7dcdd94c86
+EBUILD tidy-html5-5.4.0.ebuild 526 SHA256 c213b782819176d6ceb7ecdbfb342292830d25ef9aa0795b3127865bc9029922 SHA512 44a7e56d59986d4adb41dd03e56b0247c1b0e79152bbb9dc361e54c64abd6da2615a5b4c51b02ceb348fd0e853469f294996e894c389093185d6439efdbe7a59 WHIRLPOOL 57072f6a9ca3c41c8ab0539bdb94d4c10c0241be66b553f76631b7123b11ae1d20d35545a6d7e41b5d9e0ce83cb8e782d85eb7838c274548d461fcde086d6d8e
+MISC ChangeLog 978 SHA256 513e6ea20d797009ee623795bf2addda863b0f1a5483b35647f1a8c27f22e8aa SHA512 41fa217f867573ca29dfbd65077b44814dd6ec37b18609b75fc23ca23e6ffe39a3d6e1a62620a438a115593b9373aba73f0a009c0ac5a9abf2f0eb55940bc5b7 WHIRLPOOL 81826a0d2f467105abb2a492a5fb92dec06dbdc9394592b1599a59d917d6a430aece5f6311f17c9e05d5fddac592eccef864f6281d4988d8dc632dfd5398b93e
+MISC metadata.xml 333 SHA256 d910f727e617f0247dc25a8b119900cb752f7b7398e9c7095265f152b679a53b SHA512 aedfa31a9188be8d3ad9ea8b278acf1b3e90f9b0c91dd63b00c19a90c6a74d16ee57d80810f39392564fbc1b782b35b6231a9b453f91e765296e5ec45d5c087b WHIRLPOOL ff03377b14221f5131e7a9c76535907c2648249a2f615de9f932c50202e7679a8496341fbc508cca894d0ac21089432d12bff6c2c7d14503d9e67afbd08a8afb
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.4.0.ebuild b/app-text/tidy-html5/tidy-html5-5.4.0.ebuild
new file mode 100644
index 000000000000..fffb62956b10
--- /dev/null
+++ b/app-text/tidy-html5/tidy-html5-5.4.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2017 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}.zip -> ${P}.zip"
+
+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 )
diff --git a/app-text/tkinfo/Manifest b/app-text/tkinfo/Manifest
new file mode 100644
index 000000000000..cc92ab47b883
--- /dev/null
+++ b/app-text/tkinfo/Manifest
@@ -0,0 +1,5 @@
+DIST tkinfo-2.8.tar.gz 56234 SHA256 0dfa737dbb3f71e7816b444df2adc1f3a7bdb6c0d44c6f41ab42543d590eb152 SHA512 dfce278a1b33eebcebe3f6f9b5885a8c247f3181d154bc35d8b6d894f1f33043e9e40dd4c8dc336fa100700883295e8a648bece6f04ee556d4fa2f69adaecb76 WHIRLPOOL 09b4c2b883aea9a51d592db34ba79d7716d49cba816dbcadd0f3fa8acf94b3af8c9258542f3239cb7462126e5d16d18ce2b234e26d4a93a8b0369624611154fd
+EBUILD tkinfo-2.8-r1.ebuild 581 SHA256 40f5299f265e0298d7de143f2b87404945abeaa9553f4b61319111532a572820 SHA512 eec40f40b689952b707230a1278594eefac0624e3aa4727f86b5607f082daa598c72f09735fbf92b8915c33efc897b253fc1f7305cf1a400584d218439996faf WHIRLPOOL f30d67645512f116f1ea10d0b1fb095999468acd76c30d00e4683187c05e3e46b762c3ef03c557a4437248979433f6c7780eefc4bc10c7619fc8b2209eff1a50
+MISC ChangeLog 2996 SHA256 3c65a63005ac24ef84b952ad913cf17288bb90bd2d4ee7d9d95e686299594c44 SHA512 7a9d84b2633b9904d6c2be0c8cb35cc107a3dace2fa63cb47213e2f645788e0a9fefb62547f2eef46678131b10382b15d9129335032d38c043d371a0286e79be WHIRLPOOL c808533a68a317ba418f5871f630f494d0bad3c138469f1079130f1638841025c246d39338f51ec724d4ede7d5e1354f6da1d699e1785b2540bc96180b6e6f33
+MISC ChangeLog-2015 2342 SHA256 5637e5e95a44141c293d081051d653e597b86a5f11e89a0606495ed9913e0120 SHA512 f2397efaf24b63d2bdb56b31c62780e974a2c1abc09efba15124fc44813b2278b7600b5c3774132434752748dad3313603766d0ebb936a310b3e693a2f4a3b7f WHIRLPOOL f7031eecfbc7e68ba227f4de562f0df5b431826d1375401c3562eeba8b17dccdd63b4adb9433118ef9a695ee7008d349cdff2e94724bd8b018e06d44d346574b
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
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/Manifest b/app-text/tkman/Manifest
new file mode 100644
index 000000000000..2f934a07ae41
--- /dev/null
+++ b/app-text/tkman/Manifest
@@ -0,0 +1,8 @@
+AUX tkman-2.2-gentoo.diff 2321 SHA256 58d1e00288634797525308ef84a5c8840146b02f7cce85acc098b3240190059f SHA512 9f7329e2ed8267dfed31417a41a3d512571920ba6391d9fc23ef40ff5a18e0c74cf07d810ffc9de27ea88f560dc985d985b0cfe43e7d47b7fcd48af9d109eef7 WHIRLPOOL 9958ec17fcece98aeb6be541dff37aa9d5fb921c6a2e862edb955180641ed38edb6736f231c092d8654482dfec057023d35bc6ea56aaa39e189ecfc3cb1bf822
+AUX tkman-CVE-2008-5137.diff 11645 SHA256 3292226a9690420f52a562a587b93f6a0ff5124db685a4d237350e94bb03298a SHA512 60c65badeaa93d5e032117152905bd3c06985d7694fdec8c9ef9d0816446a865c45a1a4e7ac2dffc8eaf76163514de30663b2185fe6ba8e27a2cf9276aa09f4f WHIRLPOOL f8b83762953b136bf6c0e51448ee53754cfa9cd51d132130604271a1ec8c08399871ba89109ced7df2fdbf780fdb1d82ad363bcedf6a7cf6177fbf6ed3b71165
+AUX tkman.desktop 149 SHA256 ffd7d86e43c577b4152f8e490f4cc68635304d6e69f4d3fa8d82eda7be9906ac SHA512 d73c6ca978f0538c1b02f321cc4f45eec496c3e978229fc7eb373190d447c4d0c7639d0eaf8a3b7cc22d569e6a9088dd8371799874b41b13bb758c75369e572b WHIRLPOOL 59565d93a2ff8fdcdf18a622b19f723ea69bf836bb55115f44d59bd2aff165dd2945b6937e4426e71548b6c8baeb50610f10cea5c76b0be75e6bce18eb6804f3
+DIST tkman-2.2.tar.gz 229273 SHA256 ae2fde02705f154c119c76ca2d9c4132f01706359d218508b682652c8cfb3173 SHA512 31adaa4017282a6e6fba18a5f72c07c7d7d3bc63ef043b214bf68ec4837c73d4e0679d8b7513b0bae3984e1737e797ca886e15150b2e1a9cd288bbd7491a8777 WHIRLPOOL 703a9b9ed432191b5b6a9e10f93a932473a111780b0f190421aa6151f008e05186cc720d83ae4c7880ce4ff4769aab0e72311fb33f9f04b748ff26b7688d8895
+EBUILD tkman-2.2-r1.ebuild 754 SHA256 b87c4b5bd749dc101e7b59fc26339d8a9b6e5e7db5a8f4a7b41cc8e84391c42f SHA512 71702d9f1da8d8261da90ca67f42bd21acb1844b21c331fb5d3decc923f0a66c8b70811782b40a1768fdc9e2b0a6b38c81bc5f0392f583cdeb93e949a1ce604f WHIRLPOOL 71d2964f511c0669337ac0ff5952c20006ee54dc51a2c068d6780a9fc6c633c348de1e5e8d355ffdb68dbbf337cf69390e855bf56d99a4a4a7366da1a481285f
+MISC ChangeLog 2605 SHA256 0fe479cefa4ad0cf8a94e5b054b08e7b1a70f55d2dda6f8a0c9c40c24eccc115 SHA512 1867ea5a69bfaf6226ad6c8baaacc049616d89543d737d2db04a8e26dc3cc80b6ffff564ed2ceb710aacded0a40347c9c0250fe6b4f7448120b3f906a94ea0e4 WHIRLPOOL 547af21054cc9d971bc1ca019b5c51ca787f64252b038c0a1dd50c4064951c50d3ef66aa6861ae34503df8077c99019056fc6a46a9b20e7b8bea4155a55bcce2
+MISC ChangeLog-2015 3253 SHA256 7b15e5d9d986843b7644c3a152c106ceb83f4bbb248917b3a47c3a5c1fb7ed03 SHA512 e843bd827a402312510571dca151be684389cab8cacabb938c449b90dede2e4469a5dee2e089c8cd9cfb66b9680995620471bdea56696001d87b7e0ced10f3e7 WHIRLPOOL f44d29243455f52acc8960c49415b7ffcd2d311bd5baf6e43a134622db32fb6be08bc86f5b88cd77ffe09f78189279fd9f8b46a7a8ed5f5dcff4cbada8376de0
+MISC metadata.xml 242 SHA256 e03e9a0119307912d9d2812a030261e9f8c5e391d0cb98bdaefb73543df60eb2 SHA512 5fb21614caacb9cac921de0acb6fb5dffbc5c3f9666cea2f1a357234e88c4f990d4a55eafd60f0ccfb29060576b955a4710bf75890a7ea4343131d28696dd4ed WHIRLPOOL 6427a359067ca92a40ea237ca6a8165fb1e83803fa78229407f8113467e468142ff118ced12ddc061ee0d1b1795630f5a26a470d2776e850d7ad80451915f3e1
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/Manifest b/app-text/tofrodos/Manifest
new file mode 100644
index 000000000000..adbd3072ae1b
--- /dev/null
+++ b/app-text/tofrodos/Manifest
@@ -0,0 +1,6 @@
+AUX tofrodos-1.7.8-CFLAGS.patch 306 SHA256 9447cde65dc487905d50ab34b549d79e0dd6cd995d8538afcd9e70ee5798be4b SHA512 d96573638ba4cc4c3413ad42b903a08ac84286571317097aabcba7dfc69f794e53601154b5faf3e19ca0833377a742df745209ae3958ec9e7d2895e13bce5b2d WHIRLPOOL 5cfcd3ae81557f7beeda5f8195497c033f685e35c8c8bbaf688d3eb653b81f2979fbf0f7176b0c24116893b4a99ac052288b2308cad0406667460ffceb0891f3
+DIST tofrodos-1.7.12a.tar.gz 97588 SHA256 3098af78325486b99116c65c9f9bbbbfb3dfbeab1ab1e63a8da79550a5af6a08 SHA512 45a03203ccd053ec02a420fe4a63b427ee74dfa2c30e914836621a1cd7836ce81800e8bd5f1cccdb93233780ce79bc74d4ad49dca6192899b3039cf559baa8a2 WHIRLPOOL 73491c118a219a4cc25d2763b28a3cc10bcdaa08ae01a3cc99842254f6df3afb4662b25d2d73b1bb6e36408fc32007bc4a758361a5a951679c616fdae3f5aecb
+EBUILD tofrodos-1.7.12a.ebuild 699 SHA256 87a8d4d4fdb1c875c724d5ca8fa05813816cf8dae6f4f1d0a461fa833ccbfe78 SHA512 8c4e88d3082d5c597f18fcf45c092ac86d291236ab9cd2e78cdae2a62cb6c85bec5adbee83007c9a64cf8dfe85401db3ace18e45561ac13ea7d92284943462ad WHIRLPOOL 33b975f1fac650a63ffd8de68cb9d40ffb1a10b692b46bf7c998b20d0dffd59cba0b1ad525d09f599915a7b2caaf0e7c1d08425cef334eb77ab611d6a6ffe934
+MISC ChangeLog 2886 SHA256 4e217845e06ef8abe73f0c5a676682cf9305985122f0f78663d4b4cdab2804c9 SHA512 1b9b12258b67b2614c558524f198e35725d7434dca1c60a2797a22616b662f8e5185f131ac7c2381ac107473e82b74229f1b3e397c5202fa2bcf7e8c0391b820 WHIRLPOOL cf7e2ff3653ea9ffebfb9970643ba7c54de2a3cfe62a26da78283f6ddd074d7cf6b06621b79926d385cffa94d88026e78b642367aa1e4cec9eff6a5dc98101f6
+MISC ChangeLog-2015 1177 SHA256 36cb20b03f34d744d71dec069060b9b84dd4d8c15c1dcfc715ee6a2fa749f63b SHA512 47a603641fec6c005cd7652f40d4ac3e7606c0820bfe2a0e12cdc035c67b51b3d6c417944c654f38e131733c7ef93b9a06227d593cb97ca834774e8c926248b1 WHIRLPOOL 1dcff25be491f1f8e292fb8e1a9ad419b2671ba863bde1fdd54b79091562604dea133722885868324ee9a632345469b993ea8339c593f9205110b861ff40043d
+MISC metadata.xml 325 SHA256 8be543c0eb4535c7c58326c2d3ea573a6340321a9e49195f35c5e457bb342cd3 SHA512 d32c6a8e3e9bd397896145130afc1328ed86f507af35e2ab5b0a9b385462624542728178a06530af5cda863aee10e961bf3d189fbe3d1cf64619ba3d0a8f0b8b WHIRLPOOL d5af19cc48ca884952d9ca06807a0800533115f1b744bc60b3e2a20aacd0120676e33eb047b68c98307da9fe3d0c80e83b55f739beb8f5f6f0316fa61e27efcf
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/Manifest b/app-text/tokyodystopia/Manifest
new file mode 100644
index 000000000000..dd0bf13fd309
--- /dev/null
+++ b/app-text/tokyodystopia/Manifest
@@ -0,0 +1,8 @@
+AUX fix_ldconfig.patch 439 SHA256 1b374a675a6386cc64d575659baed130e6d4ad5e6cee0388051e86477d70c413 SHA512 1b7c2c1bf8331069cdc74ad60c0ea346050118755c1502a3b1ee0786518d578a322ab1b8eda77d9699a6a4bd2eb9396a32407c5dc64238c1f28f3873957fc0cd WHIRLPOOL 66f2fdd343f5e264880be871d9b50a249a3dddb75fb654ffaa6cc9f5cb6159c029553916310c2b87be72a7520b44395c0d93e9d04d1985356c8b63b5c1b75599
+AUX fix_rpath.patch 2631 SHA256 6707cfb79b5982e1e474a0feedf23c036d524439a9aeaf900469b468b904f690 SHA512 cc4a357c5dbdc95e0b557e2a9578b5e4c6595b19c9b8c061b9882f77f25a5f2b710c1fc83aed1bb1ec8df6ca22ab20b822f1d134743c7ccdd94f68a30bc199b1 WHIRLPOOL baa216b1877ecb84575fe86a2f60e4baf9f762446e61118384a787adcb01820b04583feea4994ccf6d352475206aaa40b19a31a9c665be485540ca54d4c30d8a
+AUX remove_docinst.patch 456 SHA256 5e4d8a11a7bd6422e0fe7d5bb307e8a7dee5a05c9a6fea15d3ea81707626f4d9 SHA512 cb052f09c37e0b84e9e236cf7722974b29e0a2d537bd1268cbb8de0db9ba35292836c82b1d21b35f04b753d58c908f32bb42ceeaba03ae086888aeb278dd6a29 WHIRLPOOL f89623cd769df1b06ae2845328bf24b734e8b870b85933b37e34f69495aeff840ee39eb0ac721e73529c3cfae5690925160e18a2f84f29fd54f83486f794f10f
+DIST tokyodystopia-0.9.15.tar.gz 158522 SHA256 28b43c592a127d1c9168eac98f680aa49d1137b4c14b8d078389bbad1a81830a SHA512 14e956ea6d84c3e00f1af5b8fd7e7ded8e886d585d80f492119521594826e21dd556b875b9552203c9d2f9e2830b15078d635a62975162436a7c2a13387086dd WHIRLPOOL 46a76637fb3f212622e9439d477c989f0b0064c590e625ed06e6d5ebaa366fef016e614a2b85eff8837643a05cae627cb27a1cbfb30cefde3b74eb155fc6e18e
+EBUILD tokyodystopia-0.9.15.ebuild 851 SHA256 201bd58533d0cd232f0570527f30bb9ff1754b9056bbf1cd07abb51bf27ddb8f SHA512 23d0384098c12352f79db79c0835be29d91fa988a370c357f2d7920a3acefc06967f0dee5f094fa8449626b069fee976b23206a48a7f96971e7728ff49a18aec WHIRLPOOL b579fbe87973bf2001d8de9fa875304309c49cad1f3ba26305ffb3ef2511a5fa77849ac8f99c7612a914fe32cc96516ec7f6b901e5c90722392cef2a0e2c5f88
+MISC ChangeLog 2278 SHA256 4d73fd8d2b3d7cdc48a98277de0490f4fd300aec694f54020de59f86f4bfecac SHA512 5e5508341254f34e6a855efe3828e1127104b2911d854c16a5270ace5bc3d57c1e2f3de1ce0fd74bb39cd913e5bb4d0b65fffe50a1917e9a32734a9a71711748 WHIRLPOOL 4a71fc89611d2dfe87f7c5334d7dadd420be6a080dc790fe603adacd9de8d5f8994fb38457558f5fa5810c70d0d0b0f88cf9f37acbcbb6ecc49913635661e5e4
+MISC ChangeLog-2015 1215 SHA256 19a5b9a370029a9be24e63a6ecafd9102a0361522f0c8e28685b85b97db4467c SHA512 be44706257354679474cd625a18e05c4c8bedfbf0c064d70642ce0f3eb461c8f5b6cc57f926c47752b74d2f2de7f3cb1effd78dc9efe7baa4b4527dd6ed864ae WHIRLPOOL d9d47d119a59a8286b9611a004837d36a3ea58ee41cb5f4b7c3309393b9a6d5819defb4a751b3b9d2df0129c88dd8bfd244ce6be6d1601eaf40aad2f28a0db0a
+MISC metadata.xml 247 SHA256 0deec0776f26fb762fdf7711f4589b14f52a2456436ef557eec62a2cf2fb2bb7 SHA512 29cf52c16b0cce69899d9c2da8acd9144b7d760442aa323b854dceadb42459e009545193b1df7911ac2241b59f4819b4a6bb1d206d6f57953f770031433bb6b7 WHIRLPOOL a135fa622e99d3dcdb432bc6b3c366076b3d86b4bfd9a76c852d781b8e9152541c7e7a2c7c6d6a3c4d2200dce792847a08166aaf7c17c22b6299dfe868234dec
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..9a0508821fb2
--- /dev/null
+++ b/app-text/tokyodystopia/tokyodystopia-0.9.15.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="2"
+
+inherit eutils
+
+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}"
+
+src_prepare() {
+	epatch "${FILESDIR}/fix_rpath.patch"
+	epatch "${FILESDIR}/fix_ldconfig.patch"
+	epatch "${FILESDIR}/remove_docinst.patch"
+}
+
+src_configure() {
+	econf --libexecdir=/usr/libexec/${PN} || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "Install failed"
+
+	dohtml doc/* || die
+
+	if use examples; then
+		insinto /usr/share/${PF}/example
+		doins example/* || die "Install failed"
+	fi
+
+}
+
+src_test() {
+	emake -j1 check || die "Tests failed"
+}
diff --git a/app-text/trang/Manifest b/app-text/trang/Manifest
new file mode 100644
index 000000000000..06a2c15cb4bd
--- /dev/null
+++ b/app-text/trang/Manifest
@@ -0,0 +1,6 @@
+AUX test.xml 3053 SHA256 641b0ba68e3a4ce7d02de1d0cdcb7e918f35dd2e88157eb665a4d79238eef999 SHA512 11b4faef6fce89d72e8cdcc25cc1dc6c89ea7bc44252e0521a9a5ff47f686e78c46eac6b606e47f51b0bdb8175e583d5c1c56bdcb8bea105c70a63b65f20ea67 WHIRLPOOL d4de2ae72050b6b4de1b8b23e82e3cc6b65c8229c6b2743bcd0621ed04af1cfa932d12b67496b42f39ca8e24e5301bdff487913da682cb2db6f6d73a16d39520
+DIST trang-20151127.tar.gz 13746141 SHA256 86c810a42d974665d12db5213943cd72fcb6912d80b5a2853e083bc454ca6b75 SHA512 f5c6973791e8caa8dcce6bbf92cbd58491f55edd7819523947ad718ea3973eb81afc6b21d4e830949c2f183b485915dab98dbb5b90e01324677cfa41f5746e26 WHIRLPOOL c11781da0cf8d5deada8c59dcfbc13dffd78e045c97b4b27768d8772563b989e9c6434fa4be13ea3c53574ad59baf0eb3a150bc3d77edc7336315f6961fb0b6c
+EBUILD trang-20151127.ebuild 2070 SHA256 a92005e4882b762ad2c35630bbbc7eb3876ad856d5e4b61799196a0c832409ec SHA512 b0d9aa8adb56abbe566ccf37e6e2764127d2e752df1b02670175a653187add219a74433bdb6cad7a691a14effc59c25d7d18c08f0721c4f20fa34b4778dfb9a4 WHIRLPOOL 68f973a18a7a357e79a3a4499ef639c1c60aec70c2716b9a866d78e89c1fc7e48237b3469a7249018147a1a4fbf883aa22ead7b8c45149326c2b35b1024f5c54
+MISC ChangeLog 3784 SHA256 cadb3b50a93c838609fd9c02755a7cc2d3d46511f62cb4bf3941d87a25199ca9 SHA512 15b5feb0240df7d65beb8c8ddfda9df13f29bb731e8b49b823d0c4343adae92614ba408818ca9ac5224be9707cd736d821c7c40bd0a3204f58e526cc2f69918a WHIRLPOOL 450fef18b024afa1b55879da22fe67a6d1ecdbb788df6ef9334ecc649da9414032833ee6d2a7ca38dde7ea38321015825db10b205ed71040721ce9363048f5e0
+MISC ChangeLog-2015 4140 SHA256 84894f10313eaeb0441357d7d78a6fa696b9ba564ef2a1351de1af2b56b99dd5 SHA512 7957afbc189bda741304aeb0875cb8fdcea741f584f6e048e5dd00a6941c5c9d4cc343ffe300a958dd80b62066af0665b18f13f6c14ad9f99a02075864e44bd0 WHIRLPOOL 95985909cb3b0faa7f844f492661ab0b20de6a5de47d7a44288d6bd2a550dc4b80aebf4441e54535e83c79465db44f3b2424a29fdb6b03589d57f2bfc1a5d4a2
+MISC metadata.xml 374 SHA256 f6b2522c08b0cfb233ccac7e4e1f5ee864ea382f941fdb9b3d4e9d2389f51b76 SHA512 884f58def744deb8a44d8d60a178d7409bb67afcb3b88c224608ecf902a00602e6aeb0da8683fd6edc20d07bf739492196067c4b2821a129255e510b6991bc90 WHIRLPOOL 528a919d03035a5e5b7d6f5c238fff93e9424c5ed5821d47dc9e35ba594ec42566fc0819fb9c33947937fb4479ea4b045c8249a59c93662fec8970a75696febf
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/Manifest b/app-text/tree/Manifest
new file mode 100644
index 000000000000..f68a732f50dc
--- /dev/null
+++ b/app-text/tree/Manifest
@@ -0,0 +1,6 @@
+AUX tree.bashcomp 847 SHA256 22225391a08b1a67aa33c60c6ac3801662ff4496af2ef019006e7a35dac910b1 SHA512 8df777721a7974015b5e717d89a4ff8701a2598e227d6cf71077fe498a5bb2a578c96c4667ab80e34b1064e109d38665fb6a4de8f52bb6401445088d5cdca922 WHIRLPOOL cb0da639514bda2e4e501a7d744f101186a48ba69a2b45e6544213c6ebef2e90ebf378387be53c3c64f59e05d672342f269668afa94c0a40c4c00a4ec9ce640d
+DIST tree-1.7.0.tgz 47082 SHA256 6957c20e82561ac4231638996e74f4cfa4e6faabc5a2f511f0b4e3940e8f7b12 SHA512 b234fb1428ba75da72d7e4aeb24bf961e123332342593e441b29a0baa2270d12bb187d889c179d6463c940c8dce9fe9dffeb4ad3f06cf11f057b83234d7b4b4a WHIRLPOOL 2bec275486ef30075fbe34aea9c96ba3455e328f02a1259e88a9227d1cddda543c1f5670f973ce5a7b9ea96fb9d886598d5008f5ed34db90cd0b5c59402ca5d1
+EBUILD tree-1.7.0.ebuild 1063 SHA256 b4c955c2beb5dad0a8fd4d79a2f623126c159d4db218e7c158a0a025e8ffa715 SHA512 f949ab05513709e1f2f1ac1ac16aa35b29de479dcb3077aeb1ac3ef3704a94fd769ef2bb06b57b0c031245e0defd8742e77a688cd33a2d80d51ecf2515c49cad WHIRLPOOL 495e06ee433c915d7d869c8d53ea132235bc09d3ff6b2b3f924d76e819c387acf6a1c9a5942df6aa3ecbbdd002a81a384ba35e40f1947c3969f364cb0525f733
+MISC ChangeLog 2189 SHA256 5a406b99611ce64a756ebd921351dacf027e40081007346f2d31b723d5f7829d SHA512 4f6aea0c0c0556cc7816807e1009ee647c1828a1137ab24d77afdf35e3fcfc6c23c22d5165c76b7afc13f04f72b7b3659efe97a7af8f1acfe89e8b0de6867da3 WHIRLPOOL 13571ee6d8b7c44a9d7b36b8acf6306aca3ced22268636ce03f016e1b336d66411b6232ea74d5148cb08b23c0ad5997e879f21e62024eaf7c2d2756bd9fdb084
+MISC ChangeLog-2015 12660 SHA256 50c4209b5392dec42818695fa16dedc65b9b2b951dd76057be0fe84000c9292a SHA512 bdc2630b80cf57a1dce3d0d574a470c37ee3c4ab604903e098ac64ba74b289d0baf22a01a3a15cd6ebb405d2e098f08df0745883069be98375cab37188835508 WHIRLPOOL 24e8e1db54157055677ce181d7afe42dd2687826ff4845a98697e7e34b898e35fa179e587cbc33a0f699ca83921a073cf5ec0650c79eecb89cecba974b91c127
+MISC metadata.xml 258 SHA256 ce7b013f070f6e21cfb6b314e4e389150d9e6516b6261d3c779f0aace3d28b34 SHA512 7cab321cbaf600074e669240c5db4a45a146d11bf6e568dc96c135447500d713a8eebc12d5fce5592b55eb36d79130d48b44e27756ad5a7ace097d915b9851d2 WHIRLPOOL 60198ed362a2e09f31b51427c7316266fcf220691cdfbb663af5557f70460cb3a8ae84d4535fdcb09eba85d848e86219030ef4a25bdeb279bd5951c360f36492
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..b8a4550367f9
--- /dev/null
+++ b/app-text/tree/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>mr_bones_@gentoo.org</email>
+    <name>Michael Sterrett</name>
+  </maintainer>
+</pkgmetadata>
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..2eb6dc1b99f9
--- /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/Manifest b/app-text/ttf2pk2/Manifest
new file mode 100644
index 000000000000..cfcd79beae24
--- /dev/null
+++ b/app-text/ttf2pk2/Manifest
@@ -0,0 +1,13 @@
+DIST texlive-20120701-source.tar.xz 131904044 SHA256 9666617d5dac3e82578e696835cc9f251ee0a56d162d86dff08659ac5dcb6c81 SHA512 0e8653aa21094e079900d17256f0768ac5514690a3725d96923d5fdc7633484d611441df1af8c674b38b9ce6a8845a9004976cd00635742dfc6837aa433caf5f WHIRLPOOL 9d570a1bd58cca8baed399ab53eb767c7c3db607c00363ce563e14dfccdd235703c538e6a651aa7f2934adf21f8477775f1547f9e7f3d957b89af644c89bcb57
+DIST texlive-20140525-source.tar.xz 41657688 SHA256 08bb4eb02923ac65ce1183612c6b64da185904f26a1660f5ca4f902d055795be SHA512 09169af15d806abd721e55ffc20ed684c0a7ad60783272d49fabfe9c88857c4abd15b60f30e3f5511ceda1982fdc1d33db8265f97e374bfa5b250dbb5612f8ad WHIRLPOOL fd7fffeeaf319bca5333f6d5d8d9cc6517f76ffe5b2793a73604d844cb7474d83c23826f98d4d11ea5e1a35c0f273e12b2fe6f5945f9880a9577fedad6625014
+DIST texlive-20150521-source.tar.xz 45459552 SHA256 ed9bcd7bdce899c3c27c16a8c5c3017c4f09e1d7fd097038351b72497e9d4669 SHA512 9d06bb88c489715787ce619c4c6b5e2d4251e1db8d48ae7fe2d1a253634c76bc6d7282ef9c93c77847845cae01eafb58dfb37ba3fb83a6d223f0d7fe8f5d3855 WHIRLPOOL e19e4cf9c6122e8a2e80d3ad62171591a2d53317792ce69d7b2afdd6978d397c873565d597b1457d23ba6f5b5de33750955690a92fb6c34d814c075397b67a0b
+DIST texlive-20160523-source.tar.xz 45941100 SHA256 a8b32ca47f0a403661a09e202f4567a995beb718c18d8f81ca6d76daa1da21ed SHA512 915fa2f5e2099dd385ef81033db7aafdf09558c0c200fed0748a8a42fd61f69d3eaac9decea334e30981af739dd81061a9b1d6853c7f6d00285fe0be40e26c3e WHIRLPOOL 25d27fb7a7bdb47d40ddf951394e36546b184d71f2e09adb20698bd0f960e54841ddd0313a87510cb2ef43953eb4d9d05d30b88d25d15762dd774575c88fedbe
+DIST texlive-20170524-source.tar.xz 63483372 SHA256 0161695304e941334dc0b3b5dabcf8edf46c09b7bc33eea8229b5ead7ccfb2aa SHA512 18c18940992ab94ce22e22ccd4ad798253ea14ac2ab296a10ea5e9a8da9f33989f2e2641b42b564d1d5fb53bd371da3e68726b676d706b469016ad146cd19daa WHIRLPOOL c4edaf427f0249942b36db105a65474e833735d6e9954682fe7e15ab327b26ccafb9174bf806d0b6c629b0f2a6b55e80022af291d9a2f377b82dff4fdec42d3d
+EBUILD ttf2pk2-1.5_p20120701.ebuild 1239 SHA256 1213e531972c4b47ce734afa036eb49bc93766e17561fddfe5b669557f9cd6a3 SHA512 9355cfa4939a456457b8713612a001ac913f56717c94baeced594fc2ca774bb31515e66d3dc4c862b8c8c24bffefe9dc38b5a5d6c2b855da96d51c0fc94a6628 WHIRLPOOL 8139f08a7ddc81c23daa0fecaefcfa1fa7e7804d978b6e52ef6b1e27f9f0717f230f4ab53d76f8d87fcb647b9a86d46dd53b2491c0b1d506cb010642b39b405b
+EBUILD ttf2pk2-2.0_p20140525.ebuild 1388 SHA256 296dad7f664215bd71ae41ccba095948bd612a6afb7fd00d7d44ebc949a1e20b SHA512 9091fa12d51f2892cb8278eff5ec143af399fa17421db64ee2eed9531739f27195ab6eefe6ac7208723d0ee1adce95762f26306a0c53178d77533a2aefcaffaa WHIRLPOOL d5f8bbd46f59745dd442ec404ae82179b4459559e1bd752c5f19a8e5beb0aa13bd5791644cbc3e8c2d19b05c0fae9e05506e403f6c0fd99a5a33573fd745b540
+EBUILD ttf2pk2-2.0_p20150521.ebuild 1380 SHA256 d1410d5acdae188a1bf965ec4ea219eaacac330dc7c0e3e337eb2410798b1828 SHA512 86c034a1d85d74894efb55ad7b6aca38606f8291d58d993dbe17c124e44cd71bce7b8aed5e4264e45ce4d8b43ce8e8e6108f42820d86e23448f62f7576219065 WHIRLPOOL 9534f3ec9c54493759c7fb52cf063e3c8d2c5682dc61055cc1adbece360304d1f540b5a4c3a7353fe1be976be7c5ff67c4a7a65cf3046e46837d023ce3059706
+EBUILD ttf2pk2-2.0_p20160523.ebuild 1251 SHA256 2cc838e8bc8dcbef1049f7a0c05c2c9090ea8d4e07c5f588c716e053b36c3fb0 SHA512 aa1cfe98ed451aaa6066e4815698113ea0e925b4361eb50ebb51935089f26ac438e511eb06d74dc7c7737981422718a4e4fe67b5aaa839594d617f0c488296d8 WHIRLPOOL 3f8837c372c6f73cadfb53fc32cb720cf6877933267ba62a8e5981dd84272fc9b53b1df06218553cbc0d1715f0153a88c115494c8caf55877fb82ac52098960a
+EBUILD ttf2pk2-2.0_p20170524.ebuild 1266 SHA256 4f7c89b7859bbaf912570369d260105e305c37806e1da3ad4f09f65ddde6f61f SHA512 0c17973b15b3116d628d1a300529f2926a98899454be50ff121687dbcbc3c6882178a25d7d9a7acb236f2dc29a63a445234d75e59b7d043c2a43abb661182dd1 WHIRLPOOL 56a5848f511141831af19885670e4bf557222763cc4a48948b9b1426d7d0e94ffc8fee91b7c73bd4f76ca2797efc75f3560a4cbe89fcacbb5a26b3e575f80aab
+MISC ChangeLog 2831 SHA256 352ae7fd63cfb25ff21dea85665f6bfe1a27c27187c63b1cba8d01c4cf1a4a56 SHA512 24187fc48c57f52c0854db1752ccc52ec5f532517464bd9013c3fd10a24599cd8478d651ba2b9fe153284da2161c741ae3766a44916ce7a5c8da8b5d39ea4c15 WHIRLPOOL 4bb49cee3d3dfbc3c6ec738ff8ee1df1f3ba39cbdd242f9047ce934b1aaff55351d46810dfd483ea518e8468210a6d295a52a138cd0b52d0b60f222e41becc29
+MISC ChangeLog-2015 3844 SHA256 70f223135de677bb85c7f4a5a4928dbbbf69ff54b12fa955874630568a77652d SHA512 ba3691fcfb14e19fedd17cf132cd9d08cc7782dd091d004785e5784c7e23cf2476fd91f96907f06dc6986dbf4a513eef142fa4cc68c74f2426072dbaa9d4a2f5 WHIRLPOOL dd125ce7387a84821de8f4afdcda2a787bbcd16c07a5f80e9626631053a7c7b4ebc29cd5e7a5a86a21a3e57b008cb9d860a945a7bbc2bda28497b61892b6d438
+MISC metadata.xml 245 SHA256 b3de478821488be2cdc91b078e21c911dc384af882c5c44631a47dfa91516dc8 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690 WHIRLPOOL 701a78fc2214f5fd4bd781477f85e87e716b8d76ea831a0fa4afc8871c4286cc363679f1ff4f844555ad4f77cc7265208b83e805f56c22fc4baeed1062280c08
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-1.5_p20120701.ebuild b/app-text/ttf2pk2/ttf2pk2-1.5_p20120701.ebuild
new file mode 100644
index 000000000000..2c8637433267
--- /dev/null
+++ b/app-text/ttf2pk2/ttf2pk2-1.5_p20120701.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+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.0.1_p20110627
+		media-libs/freetype:2
+		sys-libs/zlib
+		!media-libs/freetype:1
+		!=dev-texlive/texlive-langcjk-2011*[source]"
+DEPEND="${RDEPEND}
+	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_p20140525.ebuild b/app-text/ttf2pk2/ttf2pk2-2.0_p20140525.ebuild
new file mode 100644
index 000000000000..c0808ea59598
--- /dev/null
+++ b/app-text/ttf2pk2/ttf2pk2-2.0_p20140525.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=4
+
+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 ia64 ~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.0
+		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_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..e3390d39c086
--- /dev/null
+++ b/app-text/ttf2pk2/ttf2pk2-2.0_p20170524.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 ~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/Manifest b/app-text/ttf2pt1/Manifest
new file mode 100644
index 000000000000..94d061449568
--- /dev/null
+++ b/app-text/ttf2pt1/Manifest
@@ -0,0 +1,10 @@
+AUX ttf2pt1-3.4.0-man-pages.diff 1441 SHA256 9ee30134825bcddde474f9df69e8ef410825396482fb84e2554755ef36614093 SHA512 af4d6a11db15fc7113bcd3872682899400de01cc97169d0027fe4457c8c9abf02c8b7f93c0ae5783ab05964c4816087118686f3e8195a0ff4d6b5eae41df3b0f WHIRLPOOL 852ab007ce7ea96c505f6007b10fa76de26d2810b406a6451ab078a1c85e0ff3dc8dd71476d07cd5e44a298800ae0b69b32f35a21527271ed267da574e9e7e89
+AUX ttf2pt1-3.4.4-LDFLAGS.patch 933 SHA256 57d3d96231fa0a00b64c2c4e10a9d9e46c7eafbb457dfcf3d6b4dbcdd0116f81 SHA512 b0d292828a71a3f4668e7ce3d177b45030fd7739b9a10fc37ab6788f2a34e4bfdcb2730086592ca5b17071c34b1b3e448642e6fcdc721e5f6e8c0b67511859bf WHIRLPOOL d9d0d939dd1795286cf432dc4b1d5b38008116f188dcd54949df543bcdba35bb95075c7af717847595408308a8a4f88dafca753ad8e7a3cac92ccee9e08b5961
+AUX ttf2pt1-3.4.4-Makefile.patch 2911 SHA256 cb7a90cb39e7091c05e1dd1a870aa3fa438588abb6e8cc878528966b169607a6 SHA512 a1bb5f9f2b7517d09bf093b12ac99bfcc517546568fce395aad430de06128b3f3d62e153bdcef249738392676bc21a3e26cbdd1a42203093c56ce8ee035757eb WHIRLPOOL 76b91d1dade0d3dde6feba414cef148131fda0121d64856df7f7754f3afc3602a806f63655da8e5e586d24c31ca87a1584e70a3170c123b90a3e2ca51fb901f9
+AUX ttf2pt1-3.4.4-freetype-2.5.patch 626 SHA256 af1d6f1c8e77ce988e84c706ab5bc05efd0dfb72f5775f7185bd2b20e142cfe7 SHA512 41c137dc87a1c5c38469d6faf9cf5349a4ae8677ae9640ce7707df191acb91c85ad82eaf485238b1864c20556301436c5e0133af67529a9cf136285e09d344bc WHIRLPOOL 5a5bf26ab85ad454e6430842ef3038b18289871267569b7a05354c6217d113bb8cf1fcf92c240eb86fef57aa0bbc7b630c5127b5da6b1b95b17d2338cc645e7f
+AUX ttf2pt1-3.4.4-freetype.patch 378 SHA256 cd235a861eae7e1fe3e2c69da71086a78e195dd634df403fba3d4207d81d97a2 SHA512 93cdd2cb660a9416d30189e0ef1e14c97ca686efa2902d8617aec585040ff74b7bea6354296a99600096d1c73acda085217264d5d07e716f2d90a457ea4e9669 WHIRLPOOL be118be0736eae2a2750a72529f932f1997d3d7456da7866d561e77dbed3c3e5384dfb8b07f96e88e356ca58ea720c7976c888497df2537dfe6e43600eed708c
+DIST ttf2pt1-3.4.4.tgz 230547 SHA256 ae926288be910073883b5c8a3b8fc168fde52b91199fdf13e92d72328945e1d0 SHA512 ff2b41b0d54c2feb8565c4bcf9fbc2ce799aa6228815c2787e26127f6c0ca380114b3ab7a12fa50a52279a3452bcb91dbad5c661e83078f25036f69a4d1cf014 WHIRLPOOL 10d4f372e52bbba9f405a3e811f7404a47f25259655f0ce85e4e06381c4a69cbce79833f5d15d900d4bd09cb740b4a74ce1506e56c1f58a67b2f3cf90da7884a
+EBUILD ttf2pt1-3.4.4-r1.ebuild 1108 SHA256 9ef3df62b3bd91ca51474961c0072c3fdbceae5c33ce69dd86ddbb5f8bc8f0e3 SHA512 85018e09079c1fccf23ad97287372d0a9faabd0229a8349b3761880ad8073c088945e2e51df8ba3cc0d5cc2623f2f9ded4decd803d3d90e8b941b0646cab38d0 WHIRLPOOL 9aea4fc36dab0592cc596f772ab19978579e86a272829ab9ecf634c3c5fe8b05230e83c13848263bf55a51716df1fcacfdb17d92881f45e4de95d523c923aebf
+MISC ChangeLog 2629 SHA256 1fc5cfbf3a13258a71989571b7fa1d7bdbf9b26f04cc9c539d99fc42a7998f0e SHA512 27ce13c05e1f98e57fea67d275b68b594d50caa592289fb44e5b1053104b03109d796c80b73d7a0d19a64887b542a06c95878fb5142dfd4af20a06ffb68e9e7e WHIRLPOOL 7e340878e666bf6fddb2b2f2b7c5c371789e03af66840490efaaabfcd99ff38718c244553e97ae48122a160e1db46013be59a6978e87922449c56f136b5355bb
+MISC ChangeLog-2015 4145 SHA256 bc263799fc291c67966493af7aed33403debce58b311ff18cd8da155301e6659 SHA512 8598c068420ea36190a4a4e0b772956cb7e04fd6c09f971a63f88cdc1b1356fdd3e688c6d35f2103e7072c0f4d8118bd77c72b7e346435048e9dae6384b795a4 WHIRLPOOL df760f310fc3e0a95ce69aa446dc31c02fc6577a14778ee660d9d7972ab93294931dc44dff9044f91b2e38fa8f1ff447d7e70f2c7cecb1974e172c0f68363dd6
+MISC metadata.xml 315 SHA256 357a6a81aa43ea0aa977ecac4892b8d6cdf6114a6a9bbe2e22df43afa6d92c45 SHA512 2061dd88c2b81b9ac8c6f55bf10f39908f457741f14b4e949563b9195a3e5a09724ed585569acd5426bf0f95d740abdd1a4a61301f970814c7cf6e45f960a9e3 WHIRLPOOL 5db4b6f071c7b4eec001448347889a8cc295f437982e11d4a3cbf0c14f82505172a33f62a8ae294ef4e0ed1a7eb8f19bae3ca6989f2481475f7bb064aa33f9ab
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-2.5.patch b/app-text/ttf2pt1/files/ttf2pt1-3.4.4-freetype-2.5.patch
new file mode 100644
index 000000000000..613da6c7339b
--- /dev/null
+++ b/app-text/ttf2pt1/files/ttf2pt1-3.4.4-freetype-2.5.patch
@@ -0,0 +1,20 @@
+diff -Naur ttf2pt1-3.4.4-orig/ft.c ttf2pt1-3.4.4/ft.c
+--- ttf2pt1-3.4.4.orig/ft.c	2014-07-02 14:19:32.000000000 -0700
++++ ttf2pt1-3.4.4/ft.c	2014-07-02 14:20:22.794538869 -0700
+@@ -13,11 +13,11 @@
+ #include <ctype.h>
+ #include <sys/types.h>
+ #include <ft2build.h>
+-#include <freetype/freetype.h>
+-#include <freetype/ftglyph.h>
+-#include <freetype/ftsnames.h>
+-#include <freetype/ttnameid.h>
+-#include <freetype/ftoutln.h>
++#include <freetype2/freetype.h>
++#include <freetype2/ftglyph.h>
++#include <freetype2/ftsnames.h>
++#include <freetype2/ttnameid.h>
++#include <freetype2/ftoutln.h>
+ #include "pt1.h"
+ #include "global.h"
+ 
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..624146104adb
--- /dev/null
+++ b/app-text/ttf2pt1/ttf2pt1-3.4.4-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 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
+	epatch "${FILESDIR}"/${P}-freetype-2.5.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/tuxcards/Manifest b/app-text/tuxcards/Manifest
new file mode 100644
index 000000000000..4b2885686684
--- /dev/null
+++ b/app-text/tuxcards/Manifest
@@ -0,0 +1,5 @@
+DIST tuxcards-2.2.1.tar.gz 310015 SHA256 fff20cc4c1fb3eb441af0d765466b2c113750281f30f5dfc4109096803da0a73 SHA512 70d420f57e4d08341f4137fce0fd4d7afe59b9af5a4ef821d93b3aac912401772cdab2d240470ab96ba6c91a1548eecac87fcaa6c746e93d18d7b5be69d86052 WHIRLPOOL cdda5a11f492bfbb739d579bfa44b28567354ff8be4a30d570224d15bf1f01486ddd83fe69b60dffc41461d817bb2cc7fe7a4c9acf226fdd70157ff7a700695e
+EBUILD tuxcards-2.2.1-r1.ebuild 596 SHA256 7f327a3ef4571f9f0c86fbd9cedc9104b66ecc03db9f585792f603f5eecaedaa SHA512 990a69fe5a983dedbc39dac6922c68e10f9b9a1004767187bb96469cd60807a2fd6529f0a5e9db35648b7dc1a50304bb83e2874d89923c25dcdcfc33bae220ff WHIRLPOOL a4911b7b6f7abcb2820f85d0b17ea3b8ce65a6d668c2d36871415d63f29a9377333dec96a646951f445a881b8de5767ce4d768ca1069256bb7614372e46d4584
+MISC ChangeLog 2525 SHA256 813cb0a6b9857836700e138c3d3075f15ee806cf8a97da8ae9dbd9ea80716734 SHA512 9865c04ae1a1ceee2af829ceb811a04343d238f8c76673244d163cfe8e69ca682b09d82eead4600aed60d3d9409dd773acc4c5ecd52f752b7a2042a3969bfa39 WHIRLPOOL e8628dd907043af05be41644c572dc332e728014a2f8f27d7cf0f573560115a3aa6dcab3abdd54c3040fc78383182a108213ab46829fa0c33f44d6ee1fe8f277
+MISC ChangeLog-2015 4404 SHA256 65bb7716aedb9811ec5650f8b960d3345f03f402b3c005252e176dc9cf5dc2d2 SHA512 9d8b8717945ed1d7f24fc230cc5a26d4ab2fec00a54aa41fac6b9fa13269df960e39d5bec1db4b8954dd74a303253aa3fc0097e2af589ea2eba93199948514ec WHIRLPOOL 5286f92b882b43677a60208f82143b236193181cfe650d35947108b3868c1a923784aba89478ee82c9d4d618ff8fa2e5cda235666eb5cbe95693a167dba6e251
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/app-text/tuxcards/metadata.xml b/app-text/tuxcards/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-text/tuxcards/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/tuxcards/tuxcards-2.2.1-r1.ebuild b/app-text/tuxcards/tuxcards-2.2.1-r1.ebuild
new file mode 100644
index 000000000000..a8d98af0094a
--- /dev/null
+++ b/app-text/tuxcards/tuxcards-2.2.1-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils qmake-utils
+
+DESCRIPTION="A hierarchical notebook"
+HOMEPAGE="http://www.tuxcards.de/"
+SRC_URI="http://www.tuxcards.de/src/${P}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+
+DEPEND="dev-qt/qtgui:4"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${PN}
+
+src_configure() {
+	eqmake4 tuxcards.pro
+}
+
+src_install() {
+	dobin ${PN}
+	newicon src/icons/lo32-app-tuxcards.png ${PN}.png
+	make_desktop_entry ${PN} TuxCards ${PN} "Qt;Utility"
+	dodoc AUTHORS README
+}
diff --git a/app-text/txt2man/Manifest b/app-text/txt2man/Manifest
new file mode 100644
index 000000000000..1cb609d0e9a1
--- /dev/null
+++ b/app-text/txt2man/Manifest
@@ -0,0 +1,7 @@
+DIST txt2man-1.5.6.tar.gz 16293 SHA256 984825c5fd0cb3495160bf3277f327078081a8dc219dc466509e307ec9a2b52a SHA512 dd1cb5a6385d75b459fb61c49e0b73e5cafa5af8b11d9b89e5c206a9c5b65e4daac4d0e768c28963aacde772b715cb11ed0e843e42397b2df894a1f68c70ca65 WHIRLPOOL 50f16463f7ee77f030ca65e9eacdd4c0e7ec43d4e707c8952d5e08d4274beda51d955a624fe227340b436704658e2e7b20d585868bf84f3a01902cb49cdc36c1
+DIST txt2man-1.6.0.tar.gz 16941 SHA256 f6939e333a12e1ecceccaa547b58f4bf901a580cd2d8f822f8c292934c920c99 SHA512 7ec2cc0bb685d890cf06504d4faacf7a02c5a321963effb71ff63b7310f64f092e666c055c1dbdb699958a62272fe4dc0f31f3947ca6895aa425753a11b75379 WHIRLPOOL 98a09378f1415a6b5dc61a72d4b0fba3e4bb73995e28aaec860e6c36321c265bc37fb3daeccac2dca0bc67bb134898c0d211294eb4dcb8de9183a8427784ecc0
+EBUILD txt2man-1.5.6.ebuild 563 SHA256 7ec7908aab4024621bb18c3b17c4749034cf8acf704e12ece62c391363ab833e SHA512 c8336a6c3b8843ce7f56c3ca0b434ca754c79c0a86b401493b0635bc664dd51456078a426e45f5de542064b8c7a58faa1c1020694dce4351ca2020b09ec26837 WHIRLPOOL e3ea9bbdd41e7206cb7798ce056980ae065e23b94961ace262d3557f0ac1b68eadcdec8c103366231cec2724d9c4a6407b38514ee13cd1784853a927ca3fcec6
+EBUILD txt2man-1.6.0.ebuild 618 SHA256 18961cef7ffc73e6833a99b11983dddedf885ba20cad7d27c23758fce20c5fdc SHA512 3e5a7f816554589b1f05afa45952ece830f712dcd0f2ba65fc82c03e9d35def46bd3f7b575930487e84881829bb20ae8f89ca1155e09cd15912a75f629dbdd94 WHIRLPOOL 739a99d4020d38386f0c9b9fcbbb9c2081c7b10ef4b05db7fe94a77de20f16ff8e6ab8d0ba2db6891f10383fe8ad5cac6d56764c4d4b09b04fe6049e3def6572
+MISC ChangeLog 2267 SHA256 7120e4dc5089de6227be5bed8250195a069ab83d12fd5e763fece62f497d4d6b SHA512 c3115add587f84caa13923d74a956a2f2504f30973655ce10568d513b2288bf449da5370e0f18fa110362a2c8b17c5601f7367a8e4a7bc810800cbe633bd7b70 WHIRLPOOL 3aabbab68bca3fd4af767da5e488e53e1f3b953452a8fc9e5b9061c66a5c6d627be2f238e302e9344cde792c95e1a6a1c1c4a8835025c1782f8366017b3261f7
+MISC ChangeLog-2015 3786 SHA256 69ede73f9f628072066745f12f822b41767814cac8d32fc0c93dbcf4f223e632 SHA512 510ac32d8ea4c2145d7592580fad357b2953b72a9bcb7db3583da61367fb04d2f86aede119e71ae6029246e578370f9dd115315d603b4924ff038e798be3ef45 WHIRLPOOL 1f579500fd980ca6cbb8d6763564b9b3190fdef26f079ea7670dff0dfddd59725e24afbf574ea12d25d76b4f265c367109f14ee71cb43a103a4fd028268f0e97
+MISC metadata.xml 387 SHA256 d708ac7d7f4c8bdf64b6cc0e5c1bc6dfb717c680e121cac15625576225c36008 SHA512 818ff43d816da3698c92f6b67ecd02544172ce89b7d5b34219754ddbddb618387813bd10460aab2cacd797e7ad3c03c7f13360bb41d6f190f850bd8e7c0421c4 WHIRLPOOL e35e16c031b9de2f2cc41fd4f16a73193ce23dd94ef24dc5e1a7f51db5fb193eaaa5c656004c652c96f8d312e69dca4a733bf92c323f0011bca9146444bc607f
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/Manifest b/app-text/txt2pdbdoc/Manifest
new file mode 100644
index 000000000000..a1736d7324d2
--- /dev/null
+++ b/app-text/txt2pdbdoc/Manifest
@@ -0,0 +1,5 @@
+DIST txt2pdbdoc-1.4.4.tar.gz 77486 SHA256 db9e58a073d722c59c7fd1ffd6ebe3fc1be2007e826d6be5f94de26ea5a0c895 SHA512 db3f89b30a99afff79ad54ee600ff661ea750ffd39f0b2dfdb94dade42df930f5890839cd157fc77666887604ce5abc866d127176d2a9a36b4305cf0a30c6c93 WHIRLPOOL ab4436a4c45c906e14827bb50e10beb448c81e58a9937c63b4a0e512d6fdd483f5128a5f613d97251574915b02dfa94b659f98be8f5c531d7a0acb16e5ddac52
+EBUILD txt2pdbdoc-1.4.4.ebuild 546 SHA256 576c414eb379c9d6d5abb040a2778d4317af2e3ac8a55892cc754c1c9caaf228 SHA512 83c271c644e9c57ecd9bcf983d55b505dee38f3c9fe1c0fdf644c0236140727210ff74665c319060d32d4638a739f732e8db1b5a407d8733f71baaa6387ceb37 WHIRLPOOL 3c08fdc5ba5c83b864eef1a475d10f50f5ab88aa18eb63444da28494ffff45749ba0ad8a40ee0299ee5118e5595a9677a97bac697cb19b1c253bb9dc68f74fd6
+MISC ChangeLog 2531 SHA256 993358067dae1bfb87db6dc78506e149707c7b0e120310bad58cc9a8fed83adb SHA512 dc4348f655573573cdc62a3a5e31a9b164256ef7b2a287a0d8595c7e5f58d9661add73362ec1e2f6d686b6e07c1010783e7c80fcf12951ab2e27b1c54cfaac56 WHIRLPOOL 1070594787ebccbb2a7f65df7bade918d9661675fa36b474463a20fb4904d24cb712a0341097393986e59f55aa661775f0797486ee026bdd0a5cf4047b6e5c25
+MISC ChangeLog-2015 2156 SHA256 0496f6c1d07ae252a47ed322a2cd08aeab7f56880f14f4a3a927006ed3dc608e SHA512 81e80fbbfae2df5e1790da7bd80095197f3e09d3655f1f51e4cb22e5d4db9fd3b32340c256ed07208ad771973ab22f5d07a373927d2b44ffb6f062ed37faba87 WHIRLPOOL 77f9676f6a41c478e19a6982a7327ba3d033b0815509388670807fb361ff033e8ede1949a2836664719b385c8d1e4541f8bf20ec2113a3230a1382153f9f893f
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
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/Manifest b/app-text/txt2tags/Manifest
new file mode 100644
index 000000000000..5e8929d1bab8
--- /dev/null
+++ b/app-text/txt2tags/Manifest
@@ -0,0 +1,6 @@
+AUX 51txt2tags-gentoo.el 214 SHA256 ebefc58e46587b96af6900100ed655b28a346841fc6f23ffdab2b2a35e390969 SHA512 e2a76d355c2fb163fc5c9b8013e04240206c8301fe2351fbdbc53d711625121e22cdeb2336488e6bffc355258a6d5dacbd48a2cec2d618dc4db17eebf0496feb WHIRLPOOL 6df47882b1111ca621df67bea445e883b2ce9e8f5a05c756103940eaae5e83ec894017d0b822fd28d25224d0af6b44155ee1a86344d11b483ba4cfa33f3a8e2a
+DIST txt2tags-2.6.tgz 544724 SHA256 601467d7860f3cfb3d48050707c6277ff3ceb22fa7be4f5bd968de540ac5b05c SHA512 716e975f45dd304b6fd7d4e5aa8bd12e57c54120d892ae9abe11f1f3b5aeb747d8df0a9ffd34b8b5e6c8d422aac8830477f9a332c9e94040e1aa9946ebfe051e WHIRLPOOL d9cb30d9cfba1218b06698596e7213cac62b9adfa21c386ce65fe2919762425dac12cff493d5b5f70dac5bff9dffc3672f2b44e6165ffca5b7a96623b37e5ea3
+EBUILD txt2tags-2.6-r1.ebuild 1674 SHA256 0ba3f971d738c83ab2b989b6387edc94b63c5cdeacaee7f004d4cb09a2b8ba7b SHA512 4d2c3fc1323653f3b8764ce2d5fdbb4841d6ab110fae500a67f58f13e4181eef4d3c6390b021ae18fd48ff73602c997ba399466cf5d8a97e96f5739fbf31d6cb WHIRLPOOL 918f7999c6506a34286661e5227f4ce689aabb6b29588e1bb3766c89eb27d61d85bd9b3f3a9409803c8abac04dfdd13f40d7a7bfa53d4330c50b250c3ee875ce
+MISC ChangeLog 3261 SHA256 d5248ee4b21378682bc57ab22f30c3e427bdf074b2f10c7b9995181127a23203 SHA512 04ae2754108bec4d9e3719d9ad85cdbae0fb744087291d042a33cb203661097282a6660144b119c1f6b30ff46950323081d4a243696e39bb68b1a3b4ecd2e72c WHIRLPOOL cb8a7f4c4974ecb59e3ba8d43874a53b502c95fff5d6b8d6f9f7ad74580283bd7b80b90a794c35f1fee036aae8c5944ae7854414752f46c64e922da65ae90b94
+MISC ChangeLog-2015 7039 SHA256 7fb441234cafe42afae9d1bf88139e5305086e73cd8f0f9eb88aa5aca7fad4ba SHA512 967b87c59ce91b0869d5aa80b8cff5e73a32d7bdba7098b94f350b20dd7e9fc5c7e40b7e1a5fcbee1fd6798a89c5bca3d4ba81d19cd44b925e90292c50afcef1 WHIRLPOOL 83217002260f5980ff12edd30abe4b4d79cbdd0dfc4faa115f69c414f1d3db7137ac8d7e1a29a54293fbc58edc842d1fa7f55a3e45abca52356f7515bbb7479a
+MISC metadata.xml 335 SHA256 6a5a2880193c48ec9bdf352c71f992b58205d391dd48e6ec321db0b71aac9f41 SHA512 257cc7e9d2137e94fdc9d133133ca92b688ac2475a59dd30e1e0b4d548ce399cbf73cbe986f0f816c4be1f84668104e4e90f1257914512987aebb06697282b87 WHIRLPOOL f9115c8223fab244485072ca28aaac50e0ea72001e70c28c3d0a8878ecc97062c7f48b2ab20acffaec65f5f141b9131fe8a9b30dc89d6606c4519d6f19648be1
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..06bd030e0bd8
--- /dev/null
+++ b/app-text/txt2tags/txt2tags-2.6-r1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2017 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="http://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/Manifest b/app-text/u2ps/Manifest
new file mode 100644
index 000000000000..32aa49d5881b
--- /dev/null
+++ b/app-text/u2ps/Manifest
@@ -0,0 +1,5 @@
+DIST u2ps-full-0.8.4.tar.gz 5496922 SHA256 accf30cdce12fc722edc51a86c7dc4afdc34a34a7a10260805e4bcdbdfab0880 SHA512 31e5c22163a934a3e153ec95e2e5dd94ce79f71a72278a386a6446b1dd053161c896344c51b696c37d838eb3f06fa6fe1db6b5daa55812a06467b2525266363e WHIRLPOOL a91cb69252de557d97c6c7dec91359e391ee2282140fcd05fe817ac47a25bc8126681fbce27f79270bb81b0be572ba4d2bea5cca83e10908652eeba11f11433e
+EBUILD u2ps-0.8.4.ebuild 875 SHA256 30e028a7ed30cd33a4833b8060785e238e0f37816d460a300dd5a5b265f4cd03 SHA512 0206ca5f09c6a13d7c222eed5a291a2c79d8b00a1ad27256bdc4db230bae36e5e92708589e70258e7e50e0b52f429cba4e82eff8cbc2e1a7748b4b14a9761797 WHIRLPOOL 704177b54798ebfc3d1f7e20db95477d26cfc9154aac16d9061a3a8e61932e64ca0f39fb92ef6e294f94864fecfd0cb360ce5857af2d8dc5946b85bf8d2ed971
+MISC ChangeLog 2276 SHA256 8f9c9982ea737d0e17c34276904b2f15610b377b1a7a85403065d30fff4de9e2 SHA512 f6ec14366824d7c1218a444783bce6d67aed549853ab38ce0e506f53601fa4c76c02ef6b27b0cdbc1ae95e9aca68431abbdfb76bee38e07f20aabe2e6ae0b922 WHIRLPOOL 6fc281ddf7d4cc7cea2e8f9cf7abc5aeb4c7c39c272bac1f936ddc9a3b123baa1f87c2798b7933d2c5f7ee65570d7a05639326eec2e28628a9276853f099af9b
+MISC ChangeLog-2015 1163 SHA256 7adbb269a63807f7cf79827787e1962b4b269c725766f28c43a7e4a8275ca570 SHA512 f53e1f6889c1a870e306c62db014c3c46b7f40f995f3e074280af9ce8b143660e9249c6756d751e30b81625bda3f1a2167cb9b0fe8c409509f0065d28e2363e5 WHIRLPOOL 5e48999736d2a211c64e597a230bd1846abdfca0d0d53cf2d8f38cf47b78cc7879d7b9e163d9b5c16db27c8c503936b0ac9f5b9a2a234a6b6374796b97024a14
+MISC metadata.xml 332 SHA256 d198b4ecdf0fa8daf81cabaaeb91283069f81c4713b828caaeee3154dedad4e0 SHA512 2433cce56c8cbbafd553283de92d91c6bab7224f11543d0a775eeaef116f7f21ff55d822035a7ba06051fe0ebcf90859bcd4e72eb45db0a69116f351e0cd4fe5 WHIRLPOOL 7d0f38174ef881c2179bafd7713ea3ca79be12af929836acc25339284465ee254bfe2393ce379c263c2b41f77df6074cf54cd6049f19f521a1d4d316ad1713c4
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/Manifest b/app-text/unac/Manifest
new file mode 100644
index 000000000000..56d68dfd9897
--- /dev/null
+++ b/app-text/unac/Manifest
@@ -0,0 +1,7 @@
+AUX unac-1.8.0-automake-1.13.1.patch 950 SHA256 2a2935774d5fe273511830223eb2d091f74791db70b33bf2239f169b1781d5c9 SHA512 f6f29885b937b4e3dc21379e1e5d81229de9f1a400d24f3ea83a8cd06db822b0dc7bb8fb1dbfce27aac6d2b83834fe7fe15cdbfabfb6d82ee6311079fe7807f5 WHIRLPOOL 9905dec56daf83ab6f435617816164b6036a3c208fe474572d70af2678bcd4faede6f1526b05db641f06477f581f6c7359ebfd8316eb2924d87c74fffe72d5f5
+AUX unac-1.8.0-debian-gcc-4.4-bug-556379.patch 1454 SHA256 bd082bf640aa33f6a0422679b90d6a2acbf0800fe8a420030a816ed2aa7244cd SHA512 40294181f611a047c25900235d35b231e4026ff0a2759f90e3b74b0b93c97f64162803bcdfa4041652fe39421291248d189046f7e993d0a88606f4e240d04b7e WHIRLPOOL de97e1aefda97a6a5bdc626fbb5c4b7c87dc5b62025a7fd33dc55e87ca1194eebe4d813065b7e966979093ed852624eb2d967416e9604bf5d9e84ebc9dab98c6
+DIST unac_1.8.0.orig.tar.gz 281807 SHA256 29d316e5b74615d49237556929e95e0d68c4b77a0a0cfc346dc61cf0684b90bf SHA512 770508daabe7f1cf2fdd2c7cb0f88ed6363a091320547e1f5cafc32db6506c18548be98f6c5780757f3dc914c372a27a336865a0cd92c0a5503245fbb25ca3c8 WHIRLPOOL 50878306e85f3f78743ea416988db33ecacfeb651ebb255669bbc709e243bd575bacdeca400052b09940961b1a6ffe99d3074cc4d37786a4a6f70d9448d8d918
+EBUILD unac-1.8.0.ebuild 1147 SHA256 b6ed75338eaec2875f53f878be1722acdd934f4877682cc91e03d7a8c658c60b SHA512 43c2ee5eb87b078d087b5f711ad5d8e4265b5dabd28f67ec47c727cfe292c5501d7f0bd2c548d8346bd5a8f52ca9a3ee34b6aa6a7f33103301130dd7d1bbf3b4 WHIRLPOOL b6b1112391f0cd7cf51f19186261ad0d07161aa123ae3f5e7e3545994e1c42c45d487712ef67cce710c9cac8d7e740259e425cc63158fea243e1f7ec187d6a00
+MISC ChangeLog 2263 SHA256 3699939fe4d96b51405b8219e5120c402c00cea7d20aadc3178f63e79bac76ec SHA512 d1f42715461bfffd05265064bc7f7e5699b03ac882b78593867a926854f0654f32195ed637eccd1ead34f1aa60c90f16901234df766b8327f32e8102745b476d WHIRLPOOL 6bc9b23a3b584e593f4678573467135ef84253783f4d95b685a692157f2ebb1829aeaf059625fca9605e5c9254d64e2adef4b51f051f0f2767a66a8e80bc1d27
+MISC ChangeLog-2015 929 SHA256 fc9bb683dd4c2e23e4e858b8e795d99a4b7b76b43abf6895385720333e822a8b SHA512 c8538f599cab35567e1821f1e8969ca2ddfa6ba01c8b9438b5dbf1b6756d2082e948df517dc4f40cf468c619a1d9a4afb430668a5f49a73e5b741f3e45a1cc32 WHIRLPOOL ac0cf338fcb834113ec6c96a2e9d6257dd92bdb2685eab8d8b7409b3640714035dfe5be200846237a951ad5e8c202086ff3787a7034af7fce313960035e96faf
+MISC metadata.xml 252 SHA256 d9faaa11276205bc2371f7bfc547bcc99eb99bde06ee2b0ea4a38405dbe0b908 SHA512 4f60eeb0614b560f69085d664d02d29833e1d7a9d0975b3d6b09945df857b97b9a827b73808b1ac354b77367f22035765949ea8bc696193cb08f9bf71176a032 WHIRLPOOL f259a562e7971dc34808e5be58492a76a9b48faa914a403618a427639def21d4c844c11deaa7aae0635438fb79f170b8a5e9edd8d3feda3993316e2cf77d0116
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/Manifest b/app-text/unpaper/Manifest
new file mode 100644
index 000000000000..c9eac375d3af
--- /dev/null
+++ b/app-text/unpaper/Manifest
@@ -0,0 +1,9 @@
+DIST unpaper-5.1.tar.xz 2861432 SHA256 5380417efb5a766d132b496000ad9772a5338b87e37abfa3f10255e9f59ee7c1 SHA512 5ccd90c4c92774085df6cee5552d72d538d3ee553f95ca3d2bea850975ac6e728be97aa7dca194ba44ef8156c26c19d61d051c4581100f8c553998d9a86cefdf WHIRLPOOL 75006b03908c6086236744cdff51d1dc66b80a94e9f7e3630444af149ce235c7b0c54af2954e7f093ecc23f6e86d1478333d991db8ae223e212ebc0a92c6dfee
+DIST unpaper-6.1.tar.xz 2655724 SHA256 237c84f5da544b3f7709827f9f12c37c346cdf029b1128fb4633f9bafa5cb930 SHA512 afef705985d3c265672c9e42130acc34befc080c361f3169e299b5110c662d0b9845a9d0ca4fc3aad468f49967ded36fb60ffed296373569dd7337c3cb81e79c WHIRLPOOL e88a296f1b0718a593d70b769e4ed122b4ca92fb802d3a8e74da49dbf756cac2782cbe754ed7a6c0cf73adf73b7aa970ef6154ee2c8ce5f42da127ccee2d8936
+EBUILD unpaper-5.1.ebuild 753 SHA256 717118c1b437487e8b36af0e7fff8e4a92490b4ca8b9510f5d3e964e2725a905 SHA512 4c5169cfaec2ad853cd9591a73cc87c24750b8dda1d58784348048a634d471992ce5dbf23db4e518e4c6b3bdbbcf5ae0a84ae901b7fc166a690190d0d5f5f3b6 WHIRLPOOL 9a74c367d5af6312458aee34636861b9728ea1af5f5ea8d72abe385ceba0574929ae8c324b95dd2fa76a579b5cff9b48d1ccb68d16365ba00f718ee7c256cfce
+EBUILD unpaper-6.1-r1.ebuild 943 SHA256 18ba378bbda65863c8684ae2a5e57e2373019ea8436bc4f58781e9342becbf61 SHA512 cbf3e72d0c6cfa4924e78e6da5970b6a1cbe906ea4e32b725389888d2b609028d4b4c55773971269a1e5bc10e7c6c991bcee179595d62c9fd693491df94dd953 WHIRLPOOL 2e2f6f850b851e3da81e287d9be477bb22755c9084b40c1adc13b27a4beabc83e20efb98f1054ef3028f59b76463a2e4cf0a5e95a395c789a1001fdff63ff83e
+EBUILD unpaper-6.1.ebuild 912 SHA256 b8c96dd3dbe77f6362e626f4ed274705c371cca892199b6b5aaa5f47b61d33f2 SHA512 e70fe61488b1fd2f48f41e6ca075ba1c46e5202e95ff150ba7adccf803d469949dcb4c3d1986ce62f523ae46fe277429216bf8f767fcab70202281e61cf1d352 WHIRLPOOL 5910ddcfb24f025f42dc488d43387d81f63b097b621214c24b50dacf8b241f610688bb7ad25824978d4445fe9da1f71c69b99fe14f88d51952ae5ff80a845c50
+EBUILD unpaper-9999.ebuild 943 SHA256 18ba378bbda65863c8684ae2a5e57e2373019ea8436bc4f58781e9342becbf61 SHA512 cbf3e72d0c6cfa4924e78e6da5970b6a1cbe906ea4e32b725389888d2b609028d4b4c55773971269a1e5bc10e7c6c991bcee179595d62c9fd693491df94dd953 WHIRLPOOL 2e2f6f850b851e3da81e287d9be477bb22755c9084b40c1adc13b27a4beabc83e20efb98f1054ef3028f59b76463a2e4cf0a5e95a395c789a1001fdff63ff83e
+MISC ChangeLog 2446 SHA256 a7701aad8c047270bfb9d09697469961bfd4fc279a3d93f0de3cdcfdd66df60e SHA512 5fa04a6e08b88c8e941867977bb5c033863b24a1afb891e9bb50421ef24a38a5c90ba22e09a2b66ecf8982d7c0af0a1ba825c435afede75b9c5216e2283a13d8 WHIRLPOOL 5939130c1aa37a72abffc6d9f94efdbdea36fe7453d88fcb961f2b26d7e18dba24c86a513d4d76d32e0c04a353bae99c0cb85ddaec9efb9825e0dfa505dc1cd3
+MISC ChangeLog-2015 2755 SHA256 3f532dc2cddaf85aad75e2f42d20f715dd726a88e89f9034cb38ff8d1fec3127 SHA512 3f12434446d9cc416af72fd1aa86e96a0cefb6266dc0011853d8bec9efd0b3115181b52a5536885ce3fceb795c137d502f5540d709845bdb10c5ba396b9a2cc5 WHIRLPOOL 48c93a0017922212027d06b25070de29a7b5dada6a4530bd9d2ef3c708e44ae507eda1ff58ffd78278c522e824e3c92e5c7930f1b026e765fc57822caac75cdb
+MISC metadata.xml 292 SHA256 daeb699d428ad40519667da2f3b7b658a99a23414440a0ba5f380c47fc9d0d42 SHA512 67a23847327391a27c4acbb895e63063fa541de6fdf062887b1aa25a731bf2096e26f26c6cd62720bdc84fcbde256dbe6c9cc44687a7931d5e1a657ea684348a WHIRLPOOL 98defe1795423e7af8d4f3cf109f9df2463a99719221ca8c5e78f20fcc50445c8a55bcd487031d1aed3fe901e6daad6759dce9f8eace6cec46bb7b5559cefb88
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-5.1.ebuild b/app-text/unpaper/unpaper-5.1.ebuild
new file mode 100644
index 000000000000..945ae6370e42
--- /dev/null
+++ b/app-text/unpaper/unpaper-5.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/Flameeyes/unpaper.git"
+	inherit git-2 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="test"
+
+DEPEND="test? ( media-libs/netpbm[png] )
+	dev-libs/libxslt
+	app-text/docbook-xsl-ns-stylesheets"
+RDEPEND=""
+
+if [[ ${PV} == 9999 ]]; then
+	src_prepare() {
+		eautoreconf
+	}
+fi
+
+src_configure() {
+	econf \
+		--docdir=/usr/share/doc/${PF} \
+		--htmldir=/usr/share/doc/${PF}/html
+}
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..aed3c7c6ab3f
--- /dev/null
+++ b/app-text/unpaper/unpaper-6.1-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 autotools-utils
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/Flameeyes/unpaper.git"
+	inherit git-2 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"
+
+if [[ ${PV} == 9999 ]]; then
+	src_prepare() {
+		eautoreconf
+		autotools-utils_src_prepare
+	}
+fi
diff --git a/app-text/unpaper/unpaper-6.1.ebuild b/app-text/unpaper/unpaper-6.1.ebuild
new file mode 100644
index 000000000000..068f014b1ee9
--- /dev/null
+++ b/app-text/unpaper/unpaper-6.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools-utils
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/Flameeyes/unpaper.git"
+	inherit git-2 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="test"
+
+RDEPEND="|| ( >=media-video/libav-10[encode] >=media-video/ffmpeg-2[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"
+
+if [[ ${PV} == 9999 ]]; then
+	src_prepare() {
+		eautoreconf
+		autotools-utils_src_prepare
+	}
+fi
diff --git a/app-text/unpaper/unpaper-9999.ebuild b/app-text/unpaper/unpaper-9999.ebuild
new file mode 100644
index 000000000000..aed3c7c6ab3f
--- /dev/null
+++ b/app-text/unpaper/unpaper-9999.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools-utils
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/Flameeyes/unpaper.git"
+	inherit git-2 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"
+
+if [[ ${PV} == 9999 ]]; then
+	src_prepare() {
+		eautoreconf
+		autotools-utils_src_prepare
+	}
+fi
diff --git a/app-text/unrtf/Manifest b/app-text/unrtf/Manifest
new file mode 100644
index 000000000000..238dbd1f64bd
--- /dev/null
+++ b/app-text/unrtf/Manifest
@@ -0,0 +1,7 @@
+AUX unrtf-0.21.8-automake-fix.patch 191 SHA256 cf5a8782d7e9c9fa9cdbe0666d87a0cbc33eb825b56b963b443df4aef94a5eae SHA512 7df52c8bc5a6955096fdb3a0e2c151ecec8226c4f703a7d6095f9ca4e4507084b0b0a97b10d853b5da0e27b01bb4e73a6080aec35e5fef14fb015c36bed222ad WHIRLPOOL 2c50e4929065b2a1e64ef9b80fa4acf5bb8c5fe44f97edfad373be48691bbe5b0e07428b34bb8578e88a921f8912135f90d83b02ea95afd9c44d8fce44cbc991
+AUX unrtf-0.21.8-iconv-detection.patch 301 SHA256 072a4ca30aca7a8092a1019374d11df37c88a64f2d0ecfc2916fae615f7b9740 SHA512 57d51baa1160b772896a7fa2ce88c5ea70110d2d7edf6cac121d86849e7352e34ff0cb684161ef9a68e96e886beb6072323c9a66517691e42dce852e04035ca0 WHIRLPOOL 8d1d89f4ce8507ee20959e62ce8d6adedba16e76e18721594d1f3467b32683b704f79a9218503f5f36e08c6b06d17475bd52fda7724fed360f71a24b967b845d
+DIST unrtf-0.21.9.tar.gz 828590 SHA256 22a37826f96d754e335fb69f8036c068c00dd01ee9edd9461a36df0085fb8ddd SHA512 56d279ba8c8c20b8e39705dd4313c2b1607273d02ca2cdaeca5771bdbb3d99c338b816671dba1037961879be8ac6efddcd1af4cecb5c337f899575cae2989c03 WHIRLPOOL 05524fd8d4b66d08fdbd1e2e55c2e07b5865b64970bf452e4cd3379421a6d2f6d9aed432337e78490bae23c7801c371d1460cba9abc44ffb5a4a6aa1c809004c
+EBUILD unrtf-0.21.9.ebuild 735 SHA256 bef5064655e9ffe5c9a51ad3b278923ddd5ace27601e7022d4fd6f2c066964fc SHA512 00130f5ad9a8ea05bd87c1ae43cefe47a5842215dd69d3195fe33af033ffdef6e719b9945e8523189acebe78d2eaddacc1d56f5b441ff730048cf5274c656a8f WHIRLPOOL 1dc6071a886897605ba839ab0c479c7b7b05ecccc16bdb17d6c4ea44b454e8cd8cbdd7cf9b566d562e8c10f862cb36ba79f405b530033b3558d90acfc963cf3e
+MISC ChangeLog 2412 SHA256 d7efe88028826adb362da7d1d985cbf7ea1dd0b270bcbfd14bdf547c7aaa6886 SHA512 f53cb1f83db122bf160d3d17bb393e9496d072dd8cb284af187f6654397cf8ad8f554b924721fc9bd97dae235ab228355bb4e44902aa625a22c4c403d2f33775 WHIRLPOOL a524a63f30442700d90da8a629474d60b3390139f765eb0057f4654e2e602590367ebb127efa0f35b6b2a2695723f006f5c69da1b0c9f0e946209e29cf1d2015
+MISC ChangeLog-2015 6991 SHA256 094355122acdbff98f511144afc17ea6e53766fa23975a12801c83faabafbe35 SHA512 0169f5ffc777d14ba539dab42b6ffed100fb8ee7fa7341fcc6e7727a6d9f84404677a018843811f74874b3225f47fd4b13e102b4bac36c7b298b5b7172bc5868 WHIRLPOOL 9f07e3f5c982850a42142dd79deefa985f491ec3bd3a2b2f4a9f2d719bc4c8402f30132f97488f7f3bd39df67b2b4d89a5670ee0def38a6f3ac2f28014d9e2f5
+MISC metadata.xml 216 SHA256 f7475919f28a8a93ec8bd025c8f8bbab918f66d0d1737420c876f0480308fe6a SHA512 e881b59fe49746eb25ad66c258b41aba501e4eb563129093a3898ea970a20506e7898f7c355cfcf99605234962bf2c77c1309c258b9a2b84ee4302ccb71c9dbd WHIRLPOOL 163285b60aa93e00993af659dc1e29a9eb245bd3415dd5ec75b284250596165f469028102b72fa0c344834443a44c1bbcf6272fe6a3f5211f721fc96e1c6ec16
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/Manifest b/app-text/uudeview/Manifest
new file mode 100644
index 000000000000..3dd0c7323227
--- /dev/null
+++ b/app-text/uudeview/Manifest
@@ -0,0 +1,11 @@
+AUX uudeview-0.5.20-CVE-2004-2265.patch 1788 SHA256 20c0178206f940ce55922cf5c13e9be790428b5004c9f0571007096fa8f14dbe SHA512 63ca3c7d98924df1a2a2c08188291cfc24870c8464bc2bb98d47315f2e28ef876cf732598b6410b2875d9875c2463fda51da959b9e1340c32baa2ec64875f46c WHIRLPOOL caeb485d13a1e3abeb3be5a4a9d1000be70f858759696de5049049130d6b0c96ae969699fc8ff8ed27617103da1c0021883ee3ebbb603a2f376b027a80a6faaf
+AUX uudeview-0.5.20-CVE-2008-2266.patch 4595 SHA256 25f4edfcf0081d140ab526125aa702ac3b4b7790c428e56d40c3d484c4bf70a3 SHA512 fe6ffaf4d55f8a367cf8661ee4599f1224b2bdbf1d3659558c024e7c0d9a6ad043d7eb9631f28e4762b39a5b5e2a417b66be9e98efc7e5caeb9a286e239e486e WHIRLPOOL 292d27fbdad8c07057e99539571d2602a6bed63eaaddc25763f6ccd8793a5d0028aed068b4fc8d58b2b51b4d135c7eef2e8beab7e2ff4780da2c5cb91e9e0dad
+AUX uudeview-0.5.20-bugfixes.patch 3575 SHA256 5b8fb0bd23716c35747009e5a3c25965cc09f05aaee2fa880951b878925383ed SHA512 c5e4126e9457cb94d6f014ba20e2497969a50b84d917bd31529a2a75ae5b1e9990ec946e8f8de7a83ced71e32aea7d62210416d94b765dc860902825ca6b34a3 WHIRLPOOL 7bcbd9fac71c943fe374e406a531c0db856003f090f35b2d978794913ad9968c54a363c0262eb57c442913f14f89ec55db26045e177bbe587f9b863df4e70c5e
+AUX uudeview-0.5.20-makefile.patch 895 SHA256 1e6bbe8a56d17a18d98c2ff785b869b9cc600cc5245b921a20b9cf7b7664e3bf SHA512 65f223af7f06a854746328354bee5f2703b0603b085a5a52a2a49f09528cffe4a4756a5bd63e86fadf266c2cf1d30691dc75661bca79cc7d122329cdf9bb71f0 WHIRLPOOL e8df51d828c69fa631d3322315d92515468cb6f1a1551373fb4e43c5f13f18597f2c48a23ba63a8c26af054a367532d673ef1d8a08fca2a33c471af3ddfb1a76
+AUX uudeview-0.5.20-man.patch 3246 SHA256 fa0466bc7044fcf3fbd0190a32f287df19ed8e1b71caf9190e81ab5815df17ed SHA512 a940d6663563e7a91b35f5350e05b6cb7939f06d7db8767a8a5483dc82477c796a351cc03be9de49bd55513ca0b2e3203cd82c4b834caa54da9c8aae5750136b WHIRLPOOL ca612229c53bdc4d219eca5b586c923987f26ea2ece1e60a2e3952138f4bee65daafc32cf0b1114d47aeb9d0bb135886a96b2bf5c3b6282020d5726a084be956
+AUX uudeview-0.5.20-rename.patch 1736 SHA256 ee3e76fe5e0d197b6d9bddf947064e83e28b79d4904de9cab6f684a3849f437d SHA512 afb5b72bca70eb7c156584df1b44fa3cbb6cf07da97a79ff6330acb52ff102584b7a382ce779f2f695c9384d017984cabc670d31b243c0e5d916df19c6846439 WHIRLPOOL 14223ebd0e142240c56822e2bc39eb679489157cf5de92769cb02ce75549796b36dddbd1b32411a9ede7b76a2f6ac5a00170ad17c1f9853c0160a665d0b38e89
+DIST uudeview-0.5.20.tar.gz 261574 SHA256 e49a510ddf272022af204e96605bd454bb53da0b3fe0be437115768710dae435 SHA512 d080e9c3940bad7bacd28457f21133056384a01e33ba014de42502d23f81f2c7f5fa7f6c472ce9f37bec2edb8e18d27135bf18426cf2f23188a3683558e1721c WHIRLPOOL 4c18f8b1930852c89d2d0ca31e64d3eb06c19cef58d0901e3cafe0ae73b1245b749e7548d1726f772a631c2ffa2ad15b815861ab6dc779e8184334948c149326
+EBUILD uudeview-0.5.20-r2.ebuild 912 SHA256 09b2c8b8afd3d97e046e81c5af58718f9b9660b1706cd4f5335385ee76d9b85d SHA512 9466c4e4c67a71fb7e05bb4f55684c3646f8ec16c86548ab4735b9088e968db497c077099bf67a812316587a66aa57f734b8007c7f51ee72660b0332905b8f4a WHIRLPOOL b42f370d55ffb0343154821aff0dfb96390179cab882fd4d050c3ddda23eff9e8d320bfcc13c70a1becc6444381ea8c90a3e3d92f940574ff02c93ce0e9a4244
+MISC ChangeLog 3034 SHA256 30130fc72fb798460d584063ce9e7ccd9ee86e56833c10c9f53e29832264cdb4 SHA512 a9cbbe6e6d1dfe2e918dc4d066a00729a328f9b4880cf7be1a9bf0d4dee35247c77efea65895ab1e010cfba3b965cad1f62c6ba397141b6302729faa97f2453c WHIRLPOOL 71c798a94fe1b43c433d6f856d94f39750a90b257011626ae4be752106d147696789e98261aad6b7a75f0349d0d69acd6e31afba797e270819d4bf49f78eb973
+MISC ChangeLog-2015 4891 SHA256 cfb11465e4a6297fd22718c30eacbbe1d7fd78f898e8bba433c4769650206e4d SHA512 a31e9b98eb2c5056c897fc373f3fb34f11b836190a6496908dbc5034cf73260750a7b58afa7d289e9e5642f995355b339efeaafcf33189bd4fbe602016d52f97 WHIRLPOOL 6247ddfdb8ad4a9e2df89e2658a3c6941c241a44656ec9ccbe605d5623037363bc3c9e0e0993aad450475f3ea3387033fdb7597519f36ee51e026de1bfbd96f8
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
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/Manifest b/app-text/vilistextum/Manifest
new file mode 100644
index 000000000000..aaf594c98798
--- /dev/null
+++ b/app-text/vilistextum/Manifest
@@ -0,0 +1,9 @@
+AUX vilistextum-2.6.9-blockquote.patch 4541 SHA256 27e8d9f390b1b919f60f5bffef227908a2dea0228d578af5c3691b6f238399b0 SHA512 e5c13e5a500cc893ffbcdacb98e4433b88bc9bf73866e1acd080c83e8927ef647a83aa207e617838f7f3a3bb6783d5fc76ae74924297df2d3fc5b61c24bd97a3 WHIRLPOOL 44d4d41a74559b1b7343df00418e1c05f496ba54ddacbc805df4e0c27b7cd5d1ad145b01f113ca18f2f7c0cdae67373eefce66445ef43428cb66f36aaebac0da
+AUX vilistextum-2.6.9-darwin11.patch 615 SHA256 e24b52353bb9e9f40d560b246238cd697b17fd98e1238b5d91893e7df605121d SHA512 35aeec20cb7e6ba1668d97f041bbd5b98712589eaaf0ab70a59d3a7df74e0d2e67abbab3a27c7c5ee5f6fe9d61f11610686df3459f0cb401cca03f3f671309ac WHIRLPOOL c0ded53e7621fea36ac2ac3229bb78eacf7b103d3bf74524c3d6bb0a5b5ca26407380000d7f52a9dd78c0c32aa187fe40506c55736dc121f4dd9311238962c23
+AUX vilistextum-2.6.9-gentoo.diff 763 SHA256 39bce048c11e797c2d0eaaa5e83eff0ddc1832a4c617bbca382c87b1ee12fe0a SHA512 b4c49ff27598cedeb06058d3237ea8ebc59a4df9031818f98b5fb22225733d94b820b892541dbddc38c28c08a62ff6f52ef8278c016522b1db95352653178b21 WHIRLPOOL 2b3d83a7827bca828aa01184949ba866946d3bda27c59e32fb1776ad346587dd608c87edaa098dfb53b34352e7d028d070ca3d6ce27eb0f55b424512ad7bf690
+AUX vilistextum-2.6.9-prefix.patch 837 SHA256 a1420515275ca09057abef458940311b9a3a3fd411cfca2cbcead0548834a75b SHA512 6f913d283542bfea02d062f872dc2471e7ea2bc4c29ddb8893aecb9abeb36e6cc821c393217a92421e6888f7c25aa072bfc16c56a69a40593ed504245d8cd187 WHIRLPOOL cf922064cc717d7acfe583e35cea6ba8454f825f65f4cabb09971e8f70b38c64b2d0c37c583f7f0361a7b6015a3c873cc2ecce2300363ea3b9ce5f0fd17738a6
+DIST vilistextum-2.6.9.tar.bz2 147743 SHA256 dddf05b4b9dbb408ea37b5654666f8cf57b5c1da0dd722de763bc86788723d0f SHA512 ce76a4061b766e4544d1a86986333314a3b6959439ba6995a2977c10b01b0142c524d4b215c3272a1dcfcc4f5b6fda03210de95d65cedecfc6a1c940cedf487d WHIRLPOOL b9b6011763143c49a0e5496a42102173b4aa5d16b6c21ccf60d3018ce7c3c7b86b54fc3cbe8bf58b1a3344de498768d79c9ebc7e5c2b3f0a51d822c45e69a56b
+EBUILD vilistextum-2.6.9-r1.ebuild 1834 SHA256 9fcc645ce7f1c6e63de8f41cb3659a9880e8778c38a93469fb58b7e71624deef SHA512 7ff7b37ef26ea0cb2d421e8e26091431cedec2808e5bd75844930c5714b00d370fb17e5eab30ab312644b8aed9c0003dacdd5cd1b6f7ac17c5921df94f69f8f7 WHIRLPOOL b947ca0f3784c961dc509d2e78f7820ff9d922d1be4af3dc86532bd4f7d5b997ef956b8d86512f31a78812f32cc74fa8c483b0ff08ce3f33f9f1c4bd0ba2b5c6
+MISC ChangeLog 2926 SHA256 8874643ed89782ff5f6eabb91e3e2ff81bd2fc986db8337a8c5720b4c130a8c3 SHA512 b46000477b4daad1f85babc81531ba00b50d091b48dcd974945957657a07b760ef3870696df026715f370f1b9c3d1250941dc89903d2cb6b54cff67f0f181afa WHIRLPOOL 9d8b9c955d27900bc57d8333824913aeec939896525b74f866b41073b7b9bba2aca908086a7b29fac70fd6c2958cf8f6c5e781ee9caa5bd3b364855cdc80af8f
+MISC ChangeLog-2015 6054 SHA256 d6a4bc08ba6e5fe3d25cecdfdfad37d57dafd411cdd8603c5b6dfdf5528cc09e SHA512 c9b0ce70680447c3b09400d9421f2aaec06683eae3ab4191d37e5386b9d24318f41dd4ad54cf9fef4c36b5032ae7fb8d1fef24b12005fa0df71b9d8ecc326ae7 WHIRLPOOL 90534a2b15df2acba002986b94b6ce6a1ec7f97eede2c3c9ef8b2e78de57849d200426b818e4904730200f62bc1818a631a7074631beb0a6b29405e4d4bd8006
+MISC metadata.xml 271 SHA256 fb77ec802242340d65f4f1cf61787ffa6fb4d57ed02f61feebeed67d2dfb5467 SHA512 3e98f5382cf789992bdfc0f32e6e36eba31944be654c03f2ed9bd00baf56c8b768c256c4f8778d5775d6df38da4afcf8e32b6e6495a1ecfc8e7982c7c8943b1b WHIRLPOOL d6212acd36a69fee56b014b2e1724369857e776204569ac774915e589fd2242b3cd961226d9f125eed452d6c420468e60f038c9b49d1d2a8827d13766918f872
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/Manifest b/app-text/vlna/Manifest
new file mode 100644
index 000000000000..088149a6fe30
--- /dev/null
+++ b/app-text/vlna/Manifest
@@ -0,0 +1,5 @@
+DIST vlna-1.5.tar.gz 146670 SHA256 0d79955ec138760fa48dcddd73ed0bac4a81d31e99cb8929a05550373b4f4bfb SHA512 2416fd4183a5be495fa538d05bd8a7514265c4cb68d78aff6f2dfdd4b3c9abc34b6eb829e5adb6fecd20aa5d110ad77d9e0f56f260ac8ced3ea2218cb6cadee2 WHIRLPOOL 4ab10788a600f6d1b103dda38320b0054e544c08d6c28ed4af601a32f797438f60d054d6c5a1bca4c23e89a5a1616bb2329f7930199f8f9732f4abaff42bfdb6
+EBUILD vlna-1.5.ebuild 660 SHA256 962ef3ef3f1a3dc9e78610743f0cf7c786085f8ef8eb30de6629426f50eb5a3a SHA512 cf93dd4d84448350afd6fbd639dd8640fae0f1702117f350945b7b36e39dfa5f18fd70d9ab6aabe9a69fd1be32f2f05433cb2e787c7473b8113cab4ab0c37e35 WHIRLPOOL 6a188a2ee4f888696c23ea4412ef68a3db7794acb1baff361fad46d1467cd8d9422d072b9857bd799b275809f7a76c9997e75448a636d342830900e2f77bfaec
+MISC ChangeLog 2414 SHA256 2560839cda92f55d51370808bc22c543fa90262fa9bbbf231bb8a01d21b6f8f9 SHA512 41ef0d1833f31d6293ae2914d86aa34b9f7b610fb16a0f1ab815fa0c2ba1360f6b8eecab286255e22ee2d120657941ef651da9075671e1ccab42b05bf585af5d WHIRLPOOL 5e7537d77e4b2ccea5f1fba4ac9458d0a1dd4a00c2824e39d1bd73e193bacdf1c028b3916fbd0b493b004e6ab8618fb8bd39308a28a112b3e85f5297731209bf
+MISC ChangeLog-2015 4239 SHA256 3c7a031f99b83d594d704b64754a11d0d95c2dd6cc3b65500168bef460153108 SHA512 3513d389e3f7731d033fa82a4d2507a4985dc48b3a038c16039b11952a5c4776639fda351f72d56fed1ee1b37a4559a3f4d1c03d62a11ec28bab1e2d37e406a5 WHIRLPOOL bae63a11034861d1a5202373105f807d280264fe68c73d62509406e0ec3eba3a2d5062ca7a5446ae0c979f89cc06a1bd74297ed852e0dfdbeae89b920735876b
+MISC metadata.xml 613 SHA256 5d5bc38c13a0df4e453e74e93b114259db170469f59a1c0723afdef8c69b0bc5 SHA512 5fd0ac0fda2aef4d3ad6bcdc4102b2eb3c28d296353702ed4c3ce8cf13be76d46f77736f5776b9310211063337a8859e6f1ba2adde3af07ecc04a0e0f9640ac4 WHIRLPOOL e839993812d710fb351df071abce50ae9a40c880c34f4c06ad3d67854f5570183d750ccdd799ef37c265a47d3d0ff7db796313c079a90b0430004eabc135de92
diff --git a/app-text/vlna/metadata.xml b/app-text/vlna/metadata.xml
new file mode 100644
index 000000000000..b1b5a8307d1d
--- /dev/null
+++ b/app-text/vlna/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>malenko@email.cz</email>
+  <name>Jaromir Malenko</name>
+  <description>Jaromir is helping us with Czeck and Slovak support in
+  Gentoo. He is also a maintainer of cstetex. See bug #31657</description>
+</maintainer>
+<maintainer type="project">
+  <email>tex@gentoo.org</email>
+  <name>Gentoo TeX Project</name>
+</maintainer>
+<maintainer type="project">
+  <email>proxy-maint@gentoo.org</email>
+  <name>Proxy Maintainers</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..6170c8b01114
--- /dev/null
+++ b/app-text/vlna/vlna-1.5.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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/Manifest b/app-text/wdiff/Manifest
new file mode 100644
index 000000000000..434c5112ee41
--- /dev/null
+++ b/app-text/wdiff/Manifest
@@ -0,0 +1,6 @@
+DIST wdiff-1.2.2.tar.gz 1478567 SHA256 34ff698c870c87e6e47a838eeaaae729fa73349139fc8db12211d2a22b78af6b SHA512 9272c225f4f61612197fe151cf8c913107169ac9fcd6c9f8472a0f56d9124d78a060944cea1b51489ca34311220f23638d043d43c733a3252cdbb7cceb1085ed WHIRLPOOL 39bff8de5fcb0b98ba18a636d57ccde0e422c2ecddac5a4623fef03cad0a92c68ccb25272a9b0fefdb6b109c5354ce201be317f293e07f18592f3214049cafe7
+EBUILD wdiff-1.2.2-r1.ebuild 869 SHA256 8a7a62993d10df5f7be4aab9241c2e0678b49ddc0520ab49c8e1f6ed520c2f16 SHA512 88f9319cd22c1da88b666389659dc5b4d22fa40ffbc672961276a58df13a925e5ffe6044b523682a34083dc1882543b01841e2a5feb9b806c3c64d105f9739f7 WHIRLPOOL 33c7d6beb95cec0710027cdfab85d8119805ce4ad68a12d2ab49cadfce1e9eff2cb63c9fe4e9313382ad81c0002a2d03f6e4a2a422a1858da5c3fb3a4d5e5c75
+EBUILD wdiff-1.2.2.ebuild 839 SHA256 ccd1710902624b46343d7e7e5e6d55b6cd0e3671d3a2a804c5aecf7c78a2ce84 SHA512 bd6430c5c7ee706d37adc6489ba72d9021b5887e2864f45edfd23cc051340586fac6f79daef740bae11c16ad9b9ce6a54d980a0738bd6cf1965d85248fa91dae WHIRLPOOL a902d162a5709fb450a724cb3e740095269b2918d993577ed038f49b3e7943e353e1c0e46863911fd7220fef3cca5d965e139ca74308c20f2ea88d0315bbed52
+MISC ChangeLog 2573 SHA256 d0bd913e866e8cee507d303a21a1fbabf32df4f7c4595a07662af697e6d3e56b SHA512 fbb6826199e5365a8f22c5c89429f29b4c937994d32fca0a2c5dfd1633dbd5f6c1986698683d33e97fe0a210829149a6a56e1d838140cf9869c6df106c0e8d17 WHIRLPOOL afa568711765ddbc67ef5c710f4259b1732d18e5783c3a94ab5a92f5d460a71e1cd00d13c4eed8c5dc009e8b2588eb0b8227421acaf2f43d09c60564e474e752
+MISC ChangeLog-2015 11952 SHA256 cfc6dcc823d14289024f063f6ae868be5e383c4c32cd4d16d5ee0dec8e37d604 SHA512 6159c372264eb337b1c8175957bd9150cb06582c0525161c23000c58f66d2556284db0fd94cc1e055f60e6a5dae19540abd67baca4d9e290dd8f23688f7d1543 WHIRLPOOL 60c9b4088e5dc61bb462aee5aebb28b8f72bff60e0a7f4d32ce706e431a77a08fe757577f0715c1218c374a5a69ee5b335f8b321de8ffd9d5cc57e981452e113
+MISC metadata.xml 377 SHA256 bac4ddfd9ab5d88e968dda15a9d78167a7e3dc33a5f684d6cc6d1f9ba2d27caf SHA512 675191d217533506137aa85c390cbcf2c9683157b451c862701b5ab59d3ca437266243af0cb458f7ee5150fadb444a7eda648091eaa8b4f7e211e0bd98d92c7a WHIRLPOOL 22ad7a2af1df375e72839c3287258d499f18a3711a8a6a1100cb76d49109faad621dcb20639d22d965bd892e5dfd981a682572481d32801db11c4247bb00c2df
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/Manifest b/app-text/webgen/Manifest
new file mode 100644
index 000000000000..a100c8cd732e
--- /dev/null
+++ b/app-text/webgen/Manifest
@@ -0,0 +1,5 @@
+DIST webgen-1.4.0.gem 200192 SHA256 76be494c1eee2d1afdbff9f9d8f5bab694f5700c6c6573e7f7b9f850726271cb SHA512 4f18c247b96a159925769c44379e8fce1ff55d4a901f55e81ba102cb57b4a59c5f7428c491391f23fab4450dc3884463924274e34d4c40fe9487efbe25e4fac1 WHIRLPOOL 3ff7522acbd2a792d7d39f18bd07bc78351537a11efe5ef6f0ef41e7516ac68221d9c708fd34e1857d77b6d924306565a1bad194427619c5755df09e62c057e2
+EBUILD webgen-1.4.0.ebuild 1044 SHA256 ff32cd6386ece663b83d1bbb72a4d97dd09ef317d8df1e8b57ee3f3c93c9bb1c SHA512 4b7effb7539cb35a3ca8374cb264fa05ebccf374af3d9a309fc1e5e41973948f59703bcbe0c3374ccc607a9bd3ee9d386aa2c5636e048a50ea30f0a10b9ced9c WHIRLPOOL 92742cae4472bdb9e3d8b5c0014846a1661c1cc2d5b8ad7fbfc96f4ea64dd447f69f884f862fd330c22952eb80a1b0f6069bd849ab4f85fba624c9ef1807bf84
+MISC ChangeLog 3011 SHA256 25bebe8041d09abc511f348ce3965254ee856067b7c9bd2089016de06ab99442 SHA512 5cb3f1f1c3608b1372a0c87b30aa4cfd7eaa6f27f1a9206be2a16afec878cd88ad07cbd30b7696e7a8a60a0cf8297aa05704796f933343d8d5329a4d16213512 WHIRLPOOL 83671f9a2b209376e37d701f9cc7184f5ccdd91365bf77abbdfb2053971c78907a5ce17e9d7a5f21cf27a0eda33bce7799bba38cd7edc34902c8d02f7b89e82a
+MISC ChangeLog-2015 3030 SHA256 802f390359faefd5d1d3398ae9bc0f560f6f05aed9faa1356c4bcbcb75bba325 SHA512 995c25745ae3e55b000b19bcd4d43ab22d50af1f94f44a1048e45cdda74e7124316d1dcd1debab8f550f5410fd6b374f4151520143bd025d716856d08fd2b47b WHIRLPOOL 5480677e15d6ac2fb42adfe1ed68d0e1f3a69ba5177be26a7732bb7739c9a82d5c5094d30ff294944572a1bbd253893c6ecdb347a77609e95d2fa57c314fb09e
+MISC metadata.xml 477 SHA256 5e1a163043581d668289c6cf42fe2779887e67fd8f30076b9b455e3fc3ae8ffe SHA512 d872a0fb051b79b34541fafe549c2283a4a92edd7bad4a97adb1c3124e82820a67c286d04a004cdd2fe132a44ea4f0ec8cc3b335f3a1d91aa8877533a1c278bb WHIRLPOOL a98d405e693bce4f5322f1858a28ff263016626d6e9be02b6195fff9a8c19d366041050cff44d72e62f65bb54f6de75a23cdbd95ee48ccc4e41d0ada489b1124
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.0.ebuild b/app-text/webgen/webgen-1.4.0.ebuild
new file mode 100644
index 000000000000..a3b1e075efa2
--- /dev/null
+++ b/app-text/webgen/webgen-1.4.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+USE_RUBY="ruby20 ruby21 ruby22"
+
+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="http://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:0 )"
+
+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/Manifest b/app-text/wgetpaste/Manifest
new file mode 100644
index 000000000000..b79256002735
--- /dev/null
+++ b/app-text/wgetpaste/Manifest
@@ -0,0 +1,12 @@
+AUX wgetpaste-2.25-pinnwand-raw.patch 463 SHA256 133f0de1f21fbfb88dbc7ab660efd577b1ce21d31aa25dc35b8a6e48207cb64f SHA512 96add7303eae8c51a6d218fe3ed5de9bae7989d2771ddef0f4569c73c4bb1c61fc8451620e50eb26a749dd1c74c892cef503c170101561f4c4f00efd97ce688c WHIRLPOOL a3c58e2eadec95c52965237a26571378eba11f7a46c0cf133119b67d0dec28e4be59dfd47af716b737778812798a1b55f70de3e3d0f2235e23d73bd5dbe68ee2
+AUX wgetpaste-2.25-pinnwand.patch 6240 SHA256 e49bf3caacb5d3ca3dc2a00baa050c8dc363e47e74536582d77682d5268ab081 SHA512 28885bd7ed1e6ad7e6eba5283435fc9a40264cefd9bf021ad1873596866fb438f24113610fee55787e92bc8db688f9a7dd1b38e4382ceeefa4dddb981b9ce129 WHIRLPOOL e1bd88ba699e5a0914d72dd5bb7bb5a27f8ab858574b71fe6c4f74d7190e61df62459b04bb2cc25a3e23ea5d6df59e54b0424f1edc17179cd6bb17b5814b5168
+AUX wgetpaste-config-default-lodgeit 25 SHA256 5de5d00c66474d70bd8e2e22f355b10ac39a22225c553b9b94c49494188296dc SHA512 dc32356ce0625f3115bc7d3707f9f12c06be201b32442291b96d5b228b57e164119c82bd3b55c593212583e0b8e56470672a8977927bf248971f8e51b425be30 WHIRLPOOL 0eae19406c2445269ca2f22c63aa5a53d637f53fc54366c8c3465092aab73ad00d1ae88d818ab775828a4c607ef29dac62257ab7170c0fdfa81f8617ae435d58
+AUX wgetpaste-config-services 105 SHA256 bdf8fe3cdb8ac049cd8aed21024896adca780e9d694a9e5b5d6d6ed6cbe7cb84 SHA512 7b1e519461b7357139d0a0541f9f80fc95e0b24daa620de980703621a9ece261a2c05e93ec6b1100761cf2ecbb4ea5f73fc424c6d670d0a70b721026b8f236e3 WHIRLPOOL a0b6fb8fbcf5ddcfe974dc660934ac2085b9a0182777ba495acdd512580952c5c480e7906f0b828351020aaca9a82cc11dcaf9dbd1f0201b25efc85fbe5bdacb
+DIST wgetpaste-2.25.tar.bz2 11107 SHA256 6a7e078e6607f4fe819fc52857a601630ec0f7d2ee855d3b1cd7e75a904c40f4 SHA512 c3cd56f32311c77ce5ac970f0cd6b2e8285cac3caaf61669237ac707ed3b9aab285fbe9dee6260ea13b8df41a22acfaa3b8439298560ab68c3a568d60557d82e WHIRLPOOL ad64e1d45cb49dd70a2b33e49e81f255b304def9e4b8d8c29ac4b4161fb7cc290574686a0488a731cd36f339fde0f78da90ad439f1b771b8d5bd2f2df9cd67c3
+DIST wgetpaste-2.28.tar.bz2 12448 SHA256 538d38bab491544bdf6f05f7a38f83d4c3dfee77de7759cb6b9be1ebfdd609c2 SHA512 b3b9ee4bfbc52da6762b06c2640385eeedab7910ad1bc4e92ff9304371ec2442e2d30b69ebc0f1407a00a9c8afde398e00dc3d3c048452d730517227a68e6b97 WHIRLPOOL 31564962f633fd9d63aa77569646777932a563a3d6593ef6f4a83d639b437b85904f8b7386de961952e8328fcc1c9255c25528c55f4d04d1393e074b595586b2
+EBUILD wgetpaste-2.25-r3.ebuild 919 SHA256 9a2bb82210d475e2eab4fd14b242028840622504a117081f3d50e5072d262341 SHA512 749f899f89c0f1ba27b2fd937297fb2b27e4d749a7c232b8274fe89d530aa03082da70019bb120a8fb58fa74ee8180f437c0dcab4f427d487d3b16eb8408ffe6 WHIRLPOOL 4ddfa6a258d482e75f2a2d75abbc4e4f8377a99af4beb9bfa8ddf86474fa74570c96e0e9b5ced6224a271b8a9eebd528563dc1ae1ee6a08d54ee04cfe90f89ea
+EBUILD wgetpaste-2.28-r1.ebuild 734 SHA256 0429048ada1a1fac3c8cb121dddf8ef4b5f96a267080b7189a6e72f6eb798be9 SHA512 c67fbd0e5dbf8963525af996e74f9b2f17d3aaeef741c5e924a5f319d217b86cac61ef3f9b1098912bb5fbc8ea1c3c968aaabfc2e135877aad843ef2bdb4c05f WHIRLPOOL d4897ceb5f0a6a13c468870ce759ea386bdc0fde093518edbdc379bcda302067c663ea4740b5d15f5f29043c242206c4115ecbb6868721ce7ec9db15ce32f9a1
+EBUILD wgetpaste-2.28.ebuild 706 SHA256 c3d51ad298d385f0947eb4313549f0f5c90b3809e9f1e76a19ef1708ca18263f SHA512 8eebb90528664d16898c6161ec38a5b10e09e81b4531693fc50b5af5265014fe8917f13b96f9b39eb3eaee2bac45337dc8af6536ec740840a6168a27a127fb41 WHIRLPOOL 3cb04d8aa052053c5bf78e538918df5c30a3644f213c9dc1f60459e48fc35644cce8dbf3358b25c28d96662faae6eb2aec16af701f3069f696b162b85d06d7fb
+MISC ChangeLog 4584 SHA256 9e71c00575a735d24759556a4752d82b03306e4158c08ba7793223f6e8c5f7d8 SHA512 9aad9304ae6da20fc616041dd19a3fcbc2dd3b46916a59657a50eda4db21d8fe1d9f3a10f642dc0c742c14b0079c54473f20fec71c59bc41bf7934a25249e124 WHIRLPOOL 00f6c9e503a33cf01563faba50a02c88029247821b906f656f97c83786c28a2167c9cac912657346512ec97645a3cea27138ff1dc31b4a78d8f0fef13260b3dc
+MISC ChangeLog-2015 19159 SHA256 94577d675df0cfc0fa981e1f87eab558e5255863293b22cf93159811aca0b190 SHA512 b77c44a91af92c90af2bbd9ae92bc243dd4055884bd0e4f3538fd82a8ccd8c0ae9ac544ee07dde3bdb5d111a8f7d8bbb7a42614d6fb2fb9301dda8217828ee45 WHIRLPOOL b886d74788ebd0b6b665dc3c409ef499272967c36148dbcb049fa878bea906f8fed54f1a5a15d2277e4c1c1a2d20f06a54cbb7236a3016c8b44d73b49780f1ac
+MISC metadata.xml 366 SHA256 1876597a18e569a80efc188e6c0ab825b6bc1abb5f3f4a75fc62c52001a038de SHA512 61ecb49c3e667468976584fcd4fbebdf7b48f053a992abe3e61b324571708ed7da2e69f48c43b7d0c9fc8cca6835486e594e202d206003811df06fffd6e8c80f WHIRLPOOL edbb325a42a97a752333d24d0efcbdbb9a449744f83c36003d628a6238e8c928d7bc4c323c26d163a1ffb199917e67a0d32c76ed4cb53c017ca2f2a896b4bf79
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-default-lodgeit b/app-text/wgetpaste/files/wgetpaste-config-default-lodgeit
new file mode 100644
index 000000000000..4cf55dcfd498
--- /dev/null
+++ b/app-text/wgetpaste/files/wgetpaste-config-default-lodgeit
@@ -0,0 +1 @@
+DEFAULT_SERVICE="bpaste"
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..a40a0b2e5038
--- /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="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</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/Manifest b/app-text/wiki2beamer/Manifest
new file mode 100644
index 000000000000..8b383a01b119
--- /dev/null
+++ b/app-text/wiki2beamer/Manifest
@@ -0,0 +1,5 @@
+DIST wiki2beamer-0.9.5.zip 443288 SHA256 d38f1d53896fb09e5fed4bafccbdcfd73d7207dfc8c84709d442d4910a32f4cc SHA512 0cad0458c293c335cfb0b2181822652b12662877a2ed66d743e5f258d9983ee91fb34664c032357995606bcf17bebbb7409b6100ba2340b06cc6f253e8c6b0f7 WHIRLPOOL 2973234d59131ca8531d65d1bca0f2c417b82ddd012dbd709488961583f866b3e8c83fa2927cabe1c509777683a8b6ecb8abb57d1dde8ae9766f545225d938aa
+EBUILD wiki2beamer-0.9.5-r1.ebuild 797 SHA256 3ec817201f3fd608e7cf6dc53bd952281b91a4af1d96ae57f38e056d45c20ed6 SHA512 cf5726a45ba7e1ef97b0bf9abf4d0adf83b89409bd9702645ad8c4f525dfbb0837e6b1590c0181567a18cf8340728996044f6a086af78728d57a855344ea1694 WHIRLPOOL 715d6536b125aa718d50da06f0c0032dc833a916465437eb9de773baf52f4556c06120cb2555f5a7ac6cc04fe13598695e8afa3f703db231d5e416649be66c03
+MISC ChangeLog 2329 SHA256 67d29266727e4c8475a235ce958a148a5ec8abdc7be4f79b74873f3fd6f8c76c SHA512 59c3639b9758fcabab422c37142d40d3d0416164a6efcf86130f947926b8a5c9a4f1a517b71cde761ee70b7c41e3e11fffb0ca125539cbd03fd156df747b0e80 WHIRLPOOL 679e30489092dc14a4520c3e9f7cc7a861064898c01e3fcf8afc4476093ff82485e024ae077eb5080fa959ca7117d3e1a69c272bb81765c995c142d4b0107b28
+MISC ChangeLog-2015 1415 SHA256 4dcdcdab63034a8714d15ddbfe996660681f2f3d4399008f78056d0d261c820c SHA512 1d553a12137020ab8c142e18acda7e694039139e332176bc17f0d7732a748c9598a4af8c9bb842e1def99140bd62ecfa24ff23e98b44d36edb7f779ab237b3e3 WHIRLPOOL 007d6d8e90aa56f6c31f16527a8bd68be8296c8dd97c726b32a25f9a5ae909e876275d78061e73b03a9d1bd6dc7aacbbc45ac603f25b287b1dd79aacb7a87eb5
+MISC metadata.xml 330 SHA256 925041069e9246217b47f61900946475485d8624bf742b0801419f115a173df9 SHA512 27c93b4ed84b734c1d8b6a7dc86a4d25f18694c0c096351afd35acf378e823dca63d692e853571e9d98e1e7dade682eb3802add4a7088f432279dbf890636cc1 WHIRLPOOL c62f2db18dc65bcca5679b02b5fe88d4703da417f32b1b125c426a2ac0f84c46f4b7079ffae5a03381f8756575d7bc8253451ce5be792c491a57277f958aa5d5
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..40614670ffab
--- /dev/null
+++ b/app-text/wiki2beamer/wiki2beamer-0.9.5-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=( python{2_7,3_4,3_5} )
+
+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/Manifest b/app-text/winefish/Manifest
new file mode 100644
index 000000000000..ea77d3fb39eb
--- /dev/null
+++ b/app-text/winefish/Manifest
@@ -0,0 +1,10 @@
+AUX winefish-1.3.3-desktop.patch 355 SHA256 1466cc98a82fbd373855bc0ee66593477564fa9cfcd6a10b942933a809a225fc SHA512 12606e0e49bfe9e6de7fe5f7a3b17c55653a4465fb85376929f664afb8d25acad862c8004b9fdfed56e289f7d7ba9fa0618dd551663a9361e4acc174b51e6785 WHIRLPOOL d87e3222305ecb8e5308054d861ee13c73df17ac62c307a91fcad1bf3e4c4e81866926f2c7acfca93ce55ec806c1562f3868851e2e899d2546194a7fda73a795
+AUX winefish-1.3.3-doc.patch 518 SHA256 999e868911136bc9103a4894a5701a114bd181dc76b94c8e028b6fe892ba7311 SHA512 3a49d0035d580ec8a3daae606a3b1c287ce64cf355de899174fddc9610520ee987823d4fe84e82a25f8bcbf7d8a7c11043b373ab4865a4f7dd654e5520a5eb3b WHIRLPOOL 9b38c104c48b5bdc9da454cb7829864b962e99b20aa5201973fe2add91f13f9974f5b366ffeeff9ff1a3bd026cb9a27e66406f2b3760e1fd438e3394cbbda2ef
+AUX winefish-1.3.3-memset.patch 364 SHA256 09315f33c69eb0ecf541bf3fa9f48740b6fbb55939e7ba01d3130891bfba801d SHA512 282743d8eb64035c2f21a3b037004e17d4b14f15db1877baf7524d90b3a5b8c46a279ca00e9617f79be70c503611884de5859ae910406bf027fa61f70c0404fd WHIRLPOOL 65177770ad24e7bdd08699e9f52882596be4a3657ae11903489f4fbc226ab3b5f168363ccc0c6bf00a381e98536e6c3979c63dbe906ea3ba134fe1470dfbb070
+AUX winefish-1.3.3-nostrip.patch 384 SHA256 765ad2f9b00af804eba0740a5eb3f75aac3f1a12ed99924696c6db6b07ab7271 SHA512 4090358771013fffed32487eff4cd74c7545b4d7dea97aac6638c9b1bf1d3add2d2f5ab4ad2cc3d0626a3fed336203221528f8efe21802e0f72dd891b65e7bb9 WHIRLPOOL 1b283e346960e50e6d477b8bd7c41aaeedeb6998149d0acf5213e01a8b456c461d680c80d6f39cd14b9525e276052cd79cbe997ef0ca13c13a0f1ff0ea783813
+AUX winefish-1.3.3-version.patch 217 SHA256 f0e321abb52a24376765ad1e8e19618c75a9d0556c2ab8c98b9a9c1075f522a3 SHA512 c3da51e0a1140fbd0c2c811e16da19af0c9d8817b7d00a1d5fb97901234d8e2c8e1ad27b20a5cc79accac9d1c96239e942fd3ce5de87f5664f3769e6393f2600 WHIRLPOOL 785e59e6d9c25191fd1fe92a71cc6ea9fb794d9b82380d893d5582b874582c82cc16d2ce930639943a256aad7452486d1a68dc0400682fa8b65839e695f235c4
+DIST winefish-1.3.3.tar.gz 485772 SHA256 dab48badeb783a978c456256493345ae260f8847590b096e8a9a6e44dcced16f SHA512 216196694979093f5152eb7e3ccaa1e342b44bde4a054c2b6a72c38451d08cd03c3209f5becab8ce3f3c8aace089253a60dff8d8c2f679bb297b34d0fa1ff19c WHIRLPOOL 857db9e6e565b3d6e609fa2bd945ff98097626421f15f6fd5aa06ed904142e913ce61b64727c7d934fbd39c75cd62c2ee35a32b5908ced19a1e4818f4afa1fcd
+EBUILD winefish-1.3.3-r2.ebuild 1022 SHA256 0f3a8da3767c0df058a3231b4ed792999e57dd3bdd1185e15ee493264eeb457c SHA512 9c0ac3fc997fc49f3fe0a88713ff0a9dc457a0121adf5aa1297e0fe3775beaf2de0b2a8269395661dd536636b9b00d7113627dedd92e8277ec40b0a5708506f6 WHIRLPOOL f5067a1624fde7161f583626b7cb2fcd66fc978881447d96ae889f73fc59a9f34a66a4aac425c48ac5e5c3609851c11243e11d0ba39ad8e2fccac7663c4d3d5e
+MISC ChangeLog 3187 SHA256 f3196abb2e9b0ec5d2b78487faee90ca691ca5ed5b33855beffeee1df9250595 SHA512 87863fec8197dc73816e5b1f37dfdf278b88ab0b406a87f097180f55f7f9aca91756b11998d32f2d687d531c567be3ec9dc3a0e6a54c77f04aade8e75f5aca8c WHIRLPOOL f973f28e35b7fbb87b445ff82294534ab67cdd2105787349ef9e0a315065a52dcf2a3900f4c77a03b48869f5bd2e3af99ccc119b996d236352378d544d695ae7
+MISC ChangeLog-2015 1877 SHA256 177836f8065859b415267e83ffef62f2e421e004286c8461366955abbba00904 SHA512 8e3e650eea8da7fcfe44c372d48852936b276705cdde455766421e3746e5eb68c1cb919ea3c584864c8429dd478958b1d8e69c535fafd49d084be50f14306f8e WHIRLPOOL e3b7b5527509c23efd8c7dc03e0e8cea0abe5e5d4911ff434219a780499d359753e03920442f74e09571140160c29c17d5d8b4f3bbe6a4df1f2b2269c4afe9e2
+MISC metadata.xml 330 SHA256 ab391a84b8f784e90acf7df44d5bb39e01aba2a99f1d8c064fbd115e33ffac21 SHA512 000a6237daf47d5b798b4b0845582741df60e0b9c2d2bdb87e014c96d48a7c8697c03b0de38fd11a2e243c84683bf7ececad0853fbea06e8065ed4ea055cbfb6 WHIRLPOOL 34a81a462093139cc46affa9f5de205ee10f8c20985dcc612e79a7c4d40e2e7b616fdeab586749e36b8060b5133837151367aeb74124cf5bddee96430399c005
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..95b899b38b91
--- /dev/null
+++ b/app-text/winefish/winefish-1.3.3-r2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils fdo-mime
+
+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() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
diff --git a/app-text/wklej/Manifest b/app-text/wklej/Manifest
new file mode 100644
index 000000000000..a6cdd8d629e2
--- /dev/null
+++ b/app-text/wklej/Manifest
@@ -0,0 +1,5 @@
+DIST wklej-0.2.1.tar.gz 4370 SHA256 6b907351b3c10f70e847d0d761615e2b37f09696ad019da583325e6c17524dd1 SHA512 3799a1570f0cc7f1005f69484ceb1c6c88c8a24933beb3e32c0acd758ce29a5a1b6599baeea2b6405ec2da1e4fcb25b2d218b8295c68fa811fa4d53ada96cf0c WHIRLPOOL 8beda97607353bbfbd6e10a1ec91c060db42b74f258020eca9a4160e9f9a3197b9e936763ac37d7083b44b732f9ac64885c3d5445876d7ae404f0790a97b1351
+EBUILD wklej-0.2.1-r1.ebuild 778 SHA256 1cec8b9087eeb677118d6823771688e2be98d8a4366bf1d5a2fb537c984e68fd SHA512 1023f7da5c6345ef41da61152fe593fa772aa8326b23738423725d02eb2c4edeca6eb2974ffc7f529091570bb781d54a04f4d6640107ab6fb5dc69639968705b WHIRLPOOL 031d3cefe24888fa6af69e1a01c6146e9726c8a8e3710fa063c07036fa0c85fd27427386e71e252d70a9869684cd00823600142986e8b19bd140c4e73ad4c955
+MISC ChangeLog 3223 SHA256 4cd7f0bca3e115874853a7f2554140f631c649ae8b593b06c81060544fe27e27 SHA512 6119fb393f5ee730de67ae317b0375f7952ed1d55b5f5fd8ddef1dc5223e524f561aebbcf34ba19258bc92be778c1619b50381fe571a6fd9857c3f3e610ad5da WHIRLPOOL c9a335715a72c634124f22ba9316eae5355b883455283792a274e22ffdc53734b461406d34e63701d7e1d93872013f9c97d5e9f1ac99021d8c3c5aee7bdb08b6
+MISC ChangeLog-2015 2718 SHA256 0198ca6f198870ba39cf0778dd769b2999ce94896cbc4fd73ef86eeb1e3d35ba SHA512 66aee5b70f4f770db0baf52a57aba5c44d9e2b051e72734591ad4d7cc080c888f97f523f48ae4af187f72d6e8b430dd0efd7a1dd26bb2324d7b592f2c5195be6 WHIRLPOOL d6452c6289c3a7a7338d7eacebcbb2712893b8912cecc3e9c4f1ed8913eb45954b77b894de726321c77a2eb570559130e6b360efa0bf8bb2a41c5577659f80d8
+MISC metadata.xml 349 SHA256 d821adbcdf9dba2934efe873c08d3a876cea1274ef4d4252df9a8177c680f7a3 SHA512 b65a626f1a38f94be7617bd3b46819425724097af5536d5378372574ace10d96fc33f96c9ac52b480b4d9e3a33ab63b9b127737d6d0d2e9e02013fd3d0d826b0 WHIRLPOOL 8e4c1bddce707a2bc3ab7fcb5b25f65873942abe3f8be768479deae8920156bc163bbc16a4ff35d312af7285457f3500b2e4f0bf0fd8ca7d1450cf5a607ce598
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/Manifest b/app-text/writerperfect/Manifest
new file mode 100644
index 000000000000..97e0469e06a1
--- /dev/null
+++ b/app-text/writerperfect/Manifest
@@ -0,0 +1,5 @@
+DIST writerperfect-0.9.5.tar.xz 302176 SHA256 aa01122659482627f9adcff91bb242c37092c7f8537bfa5dc44e1a3c89aad9e2 SHA512 7467a798da362883101780b598e9a673c10f86f29c01ece1438ea524a0413a00928274f87895f3a8ae26f6784cdcc34e0e84039ca591dc3f75b2e25c53744ccc WHIRLPOOL 9034673daad0929348f71fde157245126e73caf46db8279bfddd2b01e4ab5a72e67eb9a6dd34fa13c9f9848a693f2440d33852d51126204c5e8c1fa8dd760031
+EBUILD writerperfect-0.9.5.ebuild 1696 SHA256 6445191a910f01d0c3dc76bec02af5fa3a497d2f168d0cc57f89c452c5215bf0 SHA512 e19b284314264db7b16256dfac2bceec1812db0904b8897a04d7ffc788049b32430e4043e571242f69e75ca2480d4afe2f191ec895f024106514ec2a31c3c3e7 WHIRLPOOL 7e6ab5a872c348a05f94f5a2ef422e219a3a969d1ae8f64ae3cf3e433ffe7b94dcf369b31ef417264f5ef0062a3e7e25ec5f0e424c99e7a7b6b5fd60f1ce3320
+MISC ChangeLog 3801 SHA256 68f760991c00df40223a539ec57619d5bda39063d359cd27789ae3f20892f0c2 SHA512 e941a139ce52f14a0ca9036dbb28016bab4a29161c1fd0175047d17bf898cd13263395c4a146b7df3f08a745d3ca2656ba53ccf5a33fdbb948aa1ab38ed5e009 WHIRLPOOL b99d94565059058fae8d011efe1333ed702ca0e318d3247f5876365dbcc1f28221784644a5ac08a6192c9ba698efec6a388661ab0a02867b2bd29422846733af
+MISC ChangeLog-2015 2730 SHA256 5e9e1cff8254247c956b01a37a0216c729a09139895f1ef25563952a475f2bb0 SHA512 68b4b17bd7f64f10067c7d0b31ee754b671c1be5546271779a48590b9d515303095539a5038f037f955234631b1444199e841a2fce772caff4b8b26287ae5338 WHIRLPOOL 1bd5d0630bcdecab374605e69b55d0b896d5742df9a02aa308cba51bd96b3d3dbb7c88190838d8f1ca3b166c82299c14e8016ac55ee281c45d414929aee4bf23
+MISC metadata.xml 1475 SHA256 9362636922402d12c9f824808405d56d0353c69f6f9a4485b2c3e081a591ae31 SHA512 759c262d939b9d6aa57d7de21447492d3771f6af011de6a5de83dd81cc115df14a25e20b71ba5643d0089e2b62953312fcf17ca91d67f4b5c046ecd145747450 WHIRLPOOL c84383758808d882405ebe42f4e5224285a8eda3b304cd85e1e8248702d13e123e4a6bf543476bd2e1739ac66f325284efac2359aceed9688a46e507469a7427
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..c5ac9ccae9df
--- /dev/null
+++ b/app-text/writerperfect/writerperfect-0.9.5.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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() {
+	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/Manifest b/app-text/wscr/Manifest
new file mode 100644
index 000000000000..c9bb55b2af82
--- /dev/null
+++ b/app-text/wscr/Manifest
@@ -0,0 +1,5 @@
+DIST wscr-1.2.tar.gz 3502 SHA256 00b69d95cbd5c4e0f6fe63c991d5b01bc8cdbd3b03c7faa1fa93738fc091d49b SHA512 8a26c7fb190f830f6436240fc00dcf61405b1818ff311999e02c64b3506fa6abf13a6f212dbb9b15794ecae4f122def563f9301eebdd7e8d09f22cd647467ee3 WHIRLPOOL 2fbe0796373ac373887e2a00c079fba0e7110ec346d80000e5dd34ea92f9c571cf09f45e02b075dcd5cbc50fce80ef2bb7422cd41000325ad731341596ead2e4
+EBUILD wscr-1.2-r1.ebuild 600 SHA256 3b6b14aabc9cdac17dda759ba8967134983705589e5c8191b0edbc2740078a81 SHA512 40793d93f075829e9533a6f534fe3118c5b3849439ccc7a238d43fefbd450f170fb6ab729db63c713dbc7cb061e97fce157f558ce062d80cab9bd04311c779ae WHIRLPOOL b8195d55c6c2db14dd6e1f1a6ebc7d02b83e8460de4c2e07c7657e97d735347da588fa1a14aeb766f647c1252954eba54c22986b766941f21b24a4921d153a5f
+MISC ChangeLog 2191 SHA256 72b84d493bae24a95aa8bba9015705d4f556b94e75e666780f964e57783a466f SHA512 4ed66a088c42d56b96774c9959b866f6338a69b6ad611da764da4d26c10b893a282152c56ec8d5b71ad917ca89c133ca8f95f4015bf6ff32093e1f2f73b71f58 WHIRLPOOL 18e75492529ad750b3f2b9e35fb9761bfb84ad103014a417824243db9671e267277153c1e592ec1ff85d6f75e82101fafc464cc0f931ddc058c888ab0bd0262d
+MISC ChangeLog-2015 2577 SHA256 8f9cacf0ea4a5ab66ee0e33c9df5c6e796544ce31fdd0361305b265e28d47a11 SHA512 eda72916556401bb11180c92050ea83962b19a6dd7d46fd1e847e4591ba25e477213623a87d29271747a40ced73d33285e4fedde26c1b41065b113e2b3f98750 WHIRLPOOL 155b1de49471c604015e8ac7039cc08ff573ea5564493689ecaecf0b3ce4aa877ca041ff9e607fb93bf2a245f865510382668917998bd5662ef575f25385b7de
+MISC metadata.xml 421 SHA256 b51b8a28d1f072ec9a07d382d2f15032857b9584981a39ff651eb0f70db271dc SHA512 70722daa9c12a7e783b5fb3651f207c057648287e104739043f96c726820268ceb8e4ec211af9a3e2f8fcf7a5e03c9346cea7a25a70478dfdb60f333112b70e7 WHIRLPOOL 4e658646b61bd14c7aa33b2e198a4cd635863f01bf56548a9232a443eb29c1046731c665ffb9e1cbf8811d4c20744559d74864a0da7cb40d4a18af9f450a6c81
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/Manifest b/app-text/wv/Manifest
new file mode 100644
index 000000000000..62f97af1c4cf
--- /dev/null
+++ b/app-text/wv/Manifest
@@ -0,0 +1,6 @@
+AUX wv-1.2.9-format-security.patch 336 SHA256 2c02afe1a46c3091b4850d250a565d327db4418dbe56f941350edd7451c3c682 SHA512 99fef3bec0f129ae2d138c50d1e3e9288d5309db87a72d9b1970d1d230e20be3469b423f0b74c5083a0a5cdca8fed0b2ca32ec1fefdca22f213e4a02a6bbd405 WHIRLPOOL aef91a075876e79099ef7beb0bb17baa2ffffbe84b35c2d6fc98a0e2ebae24f45a4c535ff563a24d6b9fdebc196bb6f69f022bde56dd13c3c6554a043da990aa
+DIST wv-1.2.9.tar.gz 616256 SHA256 4c730d3b325c0785450dd3a043eeb53e1518598c4f41f155558385dd2635c19d SHA512 ae5c762012595ce8922bfda8749ad3e9cb055edab30152c3a5feaaf3ca6601f357d1e301b179e9a5860cd99452dd6e63e5f44f5bcc12f8db148bdd334e0200a5 WHIRLPOOL 9314e639de72cfdef391990b664137dd2b5d6b9b536b317150e02f6508f4499ec335f774037d42cae22ff6192e2b52ce8ac8be08b1aec759c1357568f6fcfc8d
+EBUILD wv-1.2.9-r2.ebuild 1454 SHA256 54236cdcbba049c70c68c0b1c1a99486bc63082a32b7098822bb189b2d2fade7 SHA512 db9304515079b91cb54de90d84fafe963dd81e2d37e6fb70a5598448e05958e7ddff037dbbcee8c3337e412f37d92cc26865c3760277ab03ea518ab6b394a610 WHIRLPOOL 269ffe7056d5c1803a419621c6e49269222e1ce8d2a9c15c7badc528b354d1080baf64b49f1f26872fbe1d299291aba020bc4c89274f2211d7407aaefad963c8
+MISC ChangeLog 3868 SHA256 cc3e1388c525e882db4fab79dfbefc818e20ee89491e1442e8031a836bcd240a SHA512 afaa3b1c0a6cd8190ced9f9dff14731320174522ab7362ae0ed92ba97b53fe135915e9764d4b3b09f06403dd352f7b32dd0e3bcc3d7b93826db75054a4fd1228 WHIRLPOOL 513ae2470fd2cd81df16c3331b0325cef96f7f5ea2d0d14abf0fcb1486de6b23e49eee89941ee66504c7c964e9955780e1fefb384521af6f648b4a19cbfba843
+MISC ChangeLog-2015 8264 SHA256 bc06d9a6a448beca79d0c0105a1a3753c14239cbbb1ae1e18dfbb8aa09d8c33d SHA512 833ceea7ec5bcee445dbc0629414ac9a2a2e5634bf67044160794593ed3ef327e5f6f795f1c6d41480a9b7063aaf21f482e3eb58723cec8af80f06f3f0bc8cfe WHIRLPOOL 2d13bcfb9d42706eb4a2cd21ff26ed2bb29391c6465d2c58f07327d6562d8a656f7aa25d1f49fd3359ae8a85cfc6a4820329e1add6917ed208c53e3cb6b95a61
+MISC metadata.xml 448 SHA256 77add57262af644a93888b82131fe1186d3a44dff53363d9aeadf7497c45fe7b SHA512 f6ed1d52b212ac06af826dea4218cdc3017d2d7e417f943bd14f2f223221da1d8a4401852e4fd8375195a77f4f10465d93b8ce62e3981c41570220b5699e4a55 WHIRLPOOL 0ec691378240baf42c0702819ae953a311ad0c61f41b47291f65b032d692f5dc4fd2cd8f2f56e71c7d71b9f29a72207bb0c319da5a41e7badb66a89108c2887c
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/Manifest b/app-text/wv2/Manifest
new file mode 100644
index 000000000000..4971d597fc1d
--- /dev/null
+++ b/app-text/wv2/Manifest
@@ -0,0 +1,7 @@
+AUX wv2-0.4.2-glib.patch 308 SHA256 e49262ce949774ae023d7a02309d383a2c115cc11ecba2612106da18369057a3 SHA512 4d6aabb5857ccc16b93bc2e21469eaa85a3726f53035439da0c7fab8f86d0d5f4b56de41a7a693ece3af72527b3cddf155b6f6e798f562bb0af1cb0083003c86 WHIRLPOOL fed45885ab3c00116111d135a76eac3c661d5936dacbe610d6b6b9a138507ca59f83d23b8daeb60890ac904af7366798612761431a77e9b406f7113a59f3ea4d
+AUX wv2-0.4.2-libgsf.patch 421 SHA256 49a0d302f47f1c8501a496774bcdafdd10062d7c44e53e1cd39002538a676338 SHA512 ff42d9fb5191d1e384094f000380bf49cfde89a5f95c9962b0dc02ba226a58e7b47491af317cb2287fdb7d99587352e774a1f2ed8025fa708d0dac0649b6c8e1 WHIRLPOOL f2017339c4dc31d394f5985a18c275594054ce8910c115571e59f8e2dcc724d1f4c5fa4ef0cd02bf7459d7074d6e5c7e30a98a1faed12915fc230f17db019977
+DIST wv2-0.4.2.tar.bz2 452759 SHA256 9f2b6d3910cb0e29c9ff432f935a594ceec0101bca46ba2fc251aff251ee38dc SHA512 7b4fb1dc6aa05da52ea169bf13f3bb544a7a896cf9127b6d67a08e991d798e81e2bf65724cf9396a9b89902f7856007006d8b123fcaaccce77e2a4668a9c9d5b WHIRLPOOL 75dd1936ca794bfcdfe69e009b2f7a77f8bf7e7a4270f0dc1b23255232cf235508311bd93c91a10075ef54b6a4149b045548f5fc7587d48d44af7ee1d61f5e2e
+EBUILD wv2-0.4.2-r2.ebuild 753 SHA256 59ff65419e2f628d5e2332ceee422dd5e5ba2707d8e7df96709282f1182b6e2b SHA512 7a4d2a89d7cf2183d2ccc51f06516783d18f3397682261f24dbb3146aab43570dfadb67c69eeaed888082b8f488ce9f21a85790716ad3638b9f73678beba5d82 WHIRLPOOL d0d8c690249d0e77b302e0997d7436e7d7904f265ca0c0a7a516a4f2b78e6de13595a14d62e8ea1b3cb0d019f4c2d06479666073f6d5a6b0836dec378331dbbb
+MISC ChangeLog 2744 SHA256 64c344ea14b0736b85fe133a4e7061765180b7d7991e0a7a17c35dfbefe1af2f SHA512 2cd978f89c2079fb2facd61ad389fa4a2e54f5522ab4390ec8600b957947f8bdd4c51cb1dfdd1b286fae1ac34a18131bcaa2f4377ee2d36c96f12cef2d88c6db WHIRLPOOL 691253744a30c9804e681253cd96e9e813129a918ba01c1bd164d5edada3e882e2c6f92c6a1cd02e8fb2a8d9cc032bf86ce65f99260552b2817ba8aa1c6c1fa8
+MISC ChangeLog-2015 9944 SHA256 11a5b087022a11ee6d8d2e3299ae5caec42c5ff1de660b625f40acde80d3fefa SHA512 1835c931eafd3209e7eee52fd58217f251719baeaaef113de0fe2a598a46e934b0a9ecf70e1f2d9fcad6f0c1de70bcc0bf1e904544c1ac9d470e77685cd2fbad WHIRLPOOL fd75537d154533c6b229acde787885ec5ac188c9b0c0069f5242e8e2b745f5c157485fce90d366a77053e52cf0b1d1648716b2bd8164dc680edfab0015be8046
+MISC metadata.xml 394 SHA256 c2df03cecddb73a06ab9958ae7f9e4527326597e400e6ad403e163f3f788471e SHA512 abdccf92962c57c2c206a32eab8e855467874b3e17e8f1fc5db8d84b4c368fd005d3cee9e4bac28bd775aff4e9bd9319d61dc1c0e47492c2c531b41b33a4e4f2 WHIRLPOOL 61180e4ec3d770582143d2b6511dd02c047d4b68537cc43402ffac492d9140c54079fa9af7dc2f1e12a5ace51c47f6460178bb34e9b3a6520f1212a8f584a05e
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..66fde790d0bc
--- /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
+--- src/olestream.h
++++ 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..2367c24aad0b
--- /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
+
+--- CMakeLists.txt
++++ 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..b13fed4fecb8
--- /dev/null
+++ b/app-text/wv2/wv2-0.4.2-r2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit cmake-utils
+
+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}"
+
+DOCS=( AUTHORS ChangeLog README RELEASE THANKS TODO )
+PATCHES=(
+	"${FILESDIR}/${P}-glib.patch"
+	"${FILESDIR}/${P}-libgsf.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_with zlib)
+	)
+	cmake-utils_src_configure
+}
diff --git a/app-text/xapian-omega/Manifest b/app-text/xapian-omega/Manifest
new file mode 100644
index 000000000000..101aeea39d50
--- /dev/null
+++ b/app-text/xapian-omega/Manifest
@@ -0,0 +1,11 @@
+DIST xapian-omega-1.2.22.tar.xz 437556 SHA256 a7d4b00f6830d003490c0f727fc03584e703cd6e96738e03930f135cd966381b SHA512 c90ef3658cfb7f0337aa946ad04a7173d0aa89e5179c8b9edbfd78156c11d93d6a9ef6055142d26ecd95af8b0cbdf3b061e505c75f37f5e1e3b2ffc272fbaa3b WHIRLPOOL fa500c681fe1c8b82c3d469183ce987b38cd91f110ed1cd7b4e5372525a503c28e310abb15afc31892f2fa4fbd8e74bce07c1b618996541500b3f8d114b06920
+DIST xapian-omega-1.2.24.tar.xz 438104 SHA256 45fca431b812ddacbd592b522389474317af386b3ab554908edd36fc5918da53 SHA512 df483ed1410ca04df3b1ec4248442c91b03bd407737d022e494ffe3e14d62a41ee73b27114a979f59825e0ea2f2d16e0eea3c518a8db0094d697f0093e21f6a7 WHIRLPOOL af7a01659a48cf63a63dfe231cd39bc9d1dabb4e3e097262d21b73d3b99145ba3fe348c3126103dc3c91f4b9a2a1a61c1a4a80b0a0830580bcdf1b5a0cd8c393
+DIST xapian-omega-1.2.25.tar.xz 440224 SHA256 041ada3c22d5a5f1c10fd3681426377696924def75ea6cb6710a182016bc7482 SHA512 f412538cd50c82d7af28f2620c1e377afd3f03186259a145f9a37cd64d05837b7cc6f205627a3c8e4c25ec19efc2a81a6fe3a415d00b7a6f4df847d6ff2d453c WHIRLPOOL 2fbbcad9807e15013b2c570ca12d6b70bca9b13ceda234be92a149e71f329ea4062a0842f0be889395cca5f9e082031b9ad05460dae6ef45343243e0e159c011
+DIST xapian-omega-1.4.4.tar.xz 501712 SHA256 14dd790b94b828b457120439886bb5de59ccb5d7a8cefcdcf47daba5817e895e SHA512 927c6afe24f8a13018fcc233e874c71c0912cb6200094f7246c12b4175bc48d752312e57128a314e7674a948a50ef092dd7f2dc8910db7df8f3ccf9c44f38533 WHIRLPOOL ef061913e5997bab155979e75ffe3ada19384f58e2c75c8cd5957bfae0eada5b8f110b79f63e45b28499222395500d923828c43e3890e11bc248689e43d8ae85
+EBUILD xapian-omega-1.2.22.ebuild 756 SHA256 c88a2ea6a669b735cba2d7ab584bb490c06c48b3d1cbb91b0dc1a5e6a47fdc0a SHA512 413a7b72ce7e4f05b84e4c8e798dde421decb286bb3dcb5ccd9b7f37596160cb41b8c35f7cd330971f0223b05aec9308950125d078be0810f2fb09bc77ee2406 WHIRLPOOL 5d34c10dceb36624463a3fc479fa6e631d899c24e72f45434a640169e938a01ac22db466081b664783da3e8aa150a516a9ae8e6fcb2e41dc6fa2da5a426ea88a
+EBUILD xapian-omega-1.2.24.ebuild 1268 SHA256 345ebaab05f6ff817324f3ad6df2b32acb8df0a60dd0d5ba1d6a908ee35f7044 SHA512 4d74b0bbb965db51bebbb241852024dd8ae720ac2d7cac8b52b888e0a4dadb400030be2e1a74f570cfa1ee1ca5ce8c4f0acae783e1c8ef1cb95a2988bfa49eee WHIRLPOOL 554983c4663c0056969fc2e40dad9715cc6a98334163ecb9bcf070c68afd5c7e2b3ca47e7f4f3843bfbf3902bfd4e6c42c14820bf9450793658d18e9b29b3b76
+EBUILD xapian-omega-1.2.25.ebuild 1276 SHA256 79cea03850a7a9e5f9fc7fd8aa9031964ac3957b993bfb2aa4b4f6170cf048ab SHA512 54d65e4d09a752db726595f652e07d3907f24c8b94ad47dc38890cff459a1861bd22f13263575b73295b3d21de1d60ce53ffb3b334e61ba3fe238a2c2c7fd0d4 WHIRLPOOL 97c975cc4c146bbea4b2e9930b5f3f2fb8ce3f6d31a6946d42ac5b6e9c1dd6ad8297fcb8ef48e96e7641ddde2b8f6419448d2f002090d699f9dc35e506dce6eb
+EBUILD xapian-omega-1.4.4.ebuild 1150 SHA256 8d3cbde8714ee77531f5fbdb8ab958fb8e4470c60eafc2b721b9ce46690bf476 SHA512 d3ad9e099aba9d7ecf9b1e3642a7dd3067ac86e36ff20f443ddc84aeb39ba95595d07843d5b7ffb1298c26e3eb4e802cbd11bc4c2c7e8780b9eb6fd924455c24 WHIRLPOOL 5978034385e6f82aaca524716f79c91a282432431e0cd952d44c70143c37853b21aba87c816ded5d12da16c234c32300f8a553335e50dbc7213c74648ef20e85
+MISC ChangeLog 9843 SHA256 898ae8f6dd1cbd09301ff9d8c3eebaaa7a8c4db1e2c72e317ed1c3d8e0f8d82a SHA512 902d8678962a5c7c050f16f46cb0de7a948b1db8f6cf7ff602018886f7964f83bac6b00d31c83b20ca842aa02917e52d0d48ed36f01afdcd325f4fa2dd821675 WHIRLPOOL f43872445af68a193b91bd3dc44e7991dd95ba217ad7c1ee623e258d1e58349938c78b272f9d6df137bed6ba74377bd5bff217567c2e9059fd66a00f34fa171c
+MISC ChangeLog-2015 8456 SHA256 2a7ccfcb36e7792d7f423883c2094b106aa3955cc6d0551d2999557193eeb834 SHA512 a53026a24f108e1d4c673736ac88b3acaca2bf1725e139c1d4f1172b44e275865ad136a0df99aa370095a20932c82919eb7ff71025a1b309e33ed99d6d308b3f WHIRLPOOL f1568db0197cf41acd5fbacc6d816efb49f1ce2ede1d1f07f9f45f018b7a1d93df07bd274a5f8a47b9b58fa6cf455184e21db4f585f388fe5f2a4e5f7d9f5855
+MISC metadata.xml 252 SHA256 a590e5133cd97a615db4f977b0e28e5c60c56cac76eb3d339109cdf379003b60 SHA512 cbda7bf9832872764ae776ce16b2966c37a2ba3a1982d9817006fd6b82d7b17146434cde428bf114062a483e9053d2acdcdd004695e6ebf428d19cdc09937c65 WHIRLPOOL b209a730a169969b9e3c4d4612368bc5b30bfa5fae275d98d83ba96fd0ad01d308a8fed4f7d67a7c9fa417c624dfeb23ce89ab58923a8a0b5b1bd68ee73f288c
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.22.ebuild b/app-text/xapian-omega/xapian-omega-1.2.22.ebuild
new file mode 100644
index 000000000000..69bf8ca54f15
--- /dev/null
+++ b/app-text/xapian-omega/xapian-omega-1.2.22.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2016 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="http://www.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
+
+	#move docs to /usr/share/doc/${PF}.
+	mv "${D}/usr/share/doc/xapian-omega" "${D}/usr/share/doc/${PF}"
+
+	dodoc AUTHORS ChangeLog INSTALL NEWS README TODO
+}
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..34228da944be
--- /dev/null
+++ b/app-text/xapian-omega/xapian-omega-1.2.24.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2017 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="http://www.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..e690281efef6
--- /dev/null
+++ b/app-text/xapian-omega/xapian-omega-1.2.25.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2017 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="http://www.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..c50370ff2675
--- /dev/null
+++ b/app-text/xapian-omega/xapian-omega-1.4.4.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2017 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="http://www.xapian.org/"
+S="${WORKDIR}/xapian-omega-${PV}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ia64 ~mips ~ppc ~ppc64 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/Manifest b/app-text/xchm/Manifest
new file mode 100644
index 000000000000..014ad841df7e
--- /dev/null
+++ b/app-text/xchm/Manifest
@@ -0,0 +1,9 @@
+AUX xchm-1.23-wx3.0-compat.patch 929 SHA256 f98c3fa2a82f66ae627015388a9f0e671e280c2b9a1b6007f78a7b3ce013138f SHA512 7813bb885d9a62dd9da8484875cac5436b68cf1fbcc0212089c9cc10b104ffb05ea7af768a3a182c72f660c1be49a1f990700532416a7b7c028b282ecd83fca4 WHIRLPOOL bde7b22ffce65692a44f648dd5e7da4de5e0437407e9a63f4b06a7886cb79984f70ea8dc824e757ce63854577fde2e78febfabf5b5b8947d0d51c8e3f1768424
+AUX xchm.desktop 251 SHA256 37af6953e0682eaac8da79e52d08ae3627f1f731d8f841093de5bd40ac3da606 SHA512 c17e6e3957d4c0720e43dd64b169daf221e26652fd6487d2838a4c4aa86cd9640e651d55e6bc28dd4c4cc7b37624baf83df55061583f65eeecc592bd2c9a5e54 WHIRLPOOL 3bbd2d9c4814992b4ab808d9e8060d9272d9b5ffd707f8b4bc21969af256e2e9c5f2a881a804e023c61db648d885473ef657c9684aecf7cfca48391fb5313513
+AUX xchm.xml 257 SHA256 e599df84873a55522b9dba4db06393d76084dd7657690d4d7bf5b0aa76803955 SHA512 c2dc02da01dce9be31c92d95c28d8ada8c9532499d4f5d8875b41a42bd1f070f6f938e7f4cafdb8d42b13298d81eb03c3347e19c70b395f872888fac5a658533 WHIRLPOOL c1cdcdf77c1a411efd01bfe57d2abd2532389ab28397948a83b424d2daa6e410d952ae40f88cad2aa72eb0b8628df904becb00e3a0701309e755290c24aa2ad5
+DIST xchm-1.23.tar.gz 474274 SHA256 8f8f5c60954f340e50f1613913eaca6ff489c10ca36b2570b360d8ccba77c062 SHA512 c0df4362ff6db8136b20f62a76e7e93185375f6ef9eeeb1001e27ead9806d486332573ba8c3ca1863a70ce6b1d3bcc6d3af48d42add719312774dccfd7d18c90 WHIRLPOOL e5d7528032ac36713455df3f166dac31b6e55e868dd2360950006cff68168d944d8637dd480d0891696a9fb27139b05b91e80dc028c08f30c8cadf79ba34283a
+EBUILD xchm-1.23-r1.ebuild 1100 SHA256 a77bd47166ffd5b3c521d6893fdc461340c925682dfe50eade180e5b8a28463c SHA512 c42a291f0c2b77d657785626fb3ebbb629d7fdd1da7465ecf49555a6a4714179d90686452b37035e768440d0a2268d591e773efcaad03c9847fd8b3c2ea2421d WHIRLPOOL 07d66ed4ebd93008de8263bc47e0c5bc8cc31c408ecf6b8e2c8542424246b4cd2d997c063c6ab39572f97c9ef787aa50306df013ef1da6e1acfc04213d2b6bae
+EBUILD xchm-1.23-r2.ebuild 1077 SHA256 18773b089ec3275bb4e076b1a14ec0d6c337bf9da89dcf7eca2af1cc65ec5d2b SHA512 995da006863302d7a404e9d46058252c5038dde2bf54704160812e20050c8d6c8538a68952436b78dc893a1f9c154b54d3c4672ec97102c9a222de176cb7990a WHIRLPOOL 4878c2703ee7cfd8fce8e4ba6b6e7562b7d307a6896ab0605828aab403f60b1769c2ff4c64ecffab632e8dc6a3aa2839691214932866400709ad2f36eeb3a9ed
+MISC ChangeLog 3681 SHA256 6aa02634ded1f0fca45e91887ecb4456af6592944100bfc95bf80631f6a0fac1 SHA512 b3f984c458dc4842de962374e776ea08cb71bfdd8d2457220437a5bdd928690678a750c3805989f949c5ad060a922c5ea74a4db33afcdc2134695c2fef63f945 WHIRLPOOL ef2814c6f7872d0d716ae0781df5df4cd66ac00fd7be6275f599b0900217c6b63ede62958478e64aaea10142bf988626e03b533a7f10a19d68a9591e75ccccf6
+MISC ChangeLog-2015 13982 SHA256 ac7ed38feb8ecea0660f9f303cf3e09dc087455a715d7d5ead8fa3e1609cc436 SHA512 bd5a780c365e5d71955ef6f59c6be89e586fdb0429bc8979e06cf5f309220cd6d50d3028f8dcad099b41e9ff66ce226fc9d00a3815427cd1c6f96d377ce22a16 WHIRLPOOL 7fa88196f8d403f335734a8b64b0bbb98ad2a33c1f54930169b2789a667d1b0b0302553572d9a6ba30788deefbe5fbf80ff017cc994bb924a664c0636bb12470
+MISC metadata.xml 452 SHA256 c87b541c8047df2093e46df508f0176a1d3fd5988b85dd9123ab13d5433f7a80 SHA512 a9a20c765b0092d830f9d10fd549a20456bec845dba0e0849e84e7cc80172d7b4d2fd846c1f27afbc600cbce241f765ae22f61230b57eb04169a3c525c630552 WHIRLPOOL 76fbe7f9a921306ee11e306778c4d0f15770153f37097ca95049d4a276867463a86b00a77488b86bef032c71366f06448c1c10639ae6aa6ecceb369facfe380b
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..50796a19435c
--- /dev/null
+++ b/app-text/xchm/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>rhill@gentoo.org</email>
+		<name>Ryan Hill</name>
+	</maintainer>
+	<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..e5813683f6fe
--- /dev/null
+++ b/app-text/xchm/xchm-1.23-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+WX_GTK_VER="3.0"
+
+inherit eutils fdo-mime flag-o-matic wxwidgets
+
+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() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
diff --git a/app-text/xchm/xchm-1.23-r2.ebuild b/app-text/xchm/xchm-1.23-r2.ebuild
new file mode 100644
index 000000000000..b9eaf64c963e
--- /dev/null
+++ b/app-text/xchm/xchm-1.23-r2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+WX_GTK_VER="3.0-gtk3"
+
+inherit fdo-mime wxwidgets
+
+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() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
diff --git a/app-text/xdvik/Manifest b/app-text/xdvik/Manifest
new file mode 100644
index 000000000000..2ac7af17b69f
--- /dev/null
+++ b/app-text/xdvik/Manifest
@@ -0,0 +1,6 @@
+AUX xdvik.xpm 3125 SHA256 3f9dd32d1197dcbb5a414816eea45c2f4dced24ee7726ee196b8d8d2e2e44d26 SHA512 697c888c481d7cbe7b42980d2ae93a8d25d781f926970d9040f8fbc6a37545349fbdbe2e8c98fb686e5a5ebe9a7a5ff661793d3a264fd8641182b0397365517d WHIRLPOOL 5b19e53e59a03f8cd789d139b78fa54e85c26fe6ffc281bf02bea4ba2cec3a2a6f9466a766dcd5086c98557755a4203422f28dd03ceeff6a3c7a7cd3a0c5a115
+DIST xdvik-22.87.03.tar.gz 4760306 SHA256 a1b8631b6650c534cf8dc584a9f106b5df0771613743139c8a644a19f14611fc SHA512 d4d418d78658f16d4d278e387ed484b291afc8623b00acaf4110e9f123ed76568714ad50f80588373657f412e8fff36f3e76b3e43f69756d46f031c0f2269a88 WHIRLPOOL da8227daa34ac69b60c447e3c929aaf353697add104245b64815b2f42ad03c189c353c7b4d34359f5897a26e5dd811fa3ef21254ee18c243d557860f697bfba6
+EBUILD xdvik-22.87.03.ebuild 2742 SHA256 53a476787d39c332e4aff9280bb457c2f3ea9ee22c1247104388067a9f823885 SHA512 e6da3d310221c917de99124132a7683fbcba8bc00c5fc3b6eca2cf93be1a719334c7a6d0c9bc8a7274310d359be1503b6612b89d6397f79ceb4de9358c79922a WHIRLPOOL 19d0f3bbadf9478eb187bb74ec0cae755ae056b156ca432a4a51463ed841fc5bd2a99fbe6d47a5477864ab13c75ba55401f5c524d84d53dd613f688c2469a4b6
+MISC ChangeLog 2878 SHA256 19b887b864bd2b6f797166b78f5064fcf17505e7dc82433c014ce44af8aa3f3a SHA512 2b76c76ed6f6c1b61981ff3d40abe4c9045dba64e8d3d437ff75d9aac1ed0eca3cef18c7df9bca76498068d822df348543c66e89d0fd67f10d0baf69caf7833d WHIRLPOOL adb5b77a11f83b1319a0dd342d45dd3fe8e13497f055432f549aa240899718ca06e35da7618e89785cbc632fe896b306c40a511f871b705ce00c61fa3ef54bac
+MISC ChangeLog-2015 14924 SHA256 75f20a12d494b3e805cef4fcaf50cc5ffe7cfb29a9e28fe29f9bb503cbe9d226 SHA512 b2e9fff2968718e199a91603e023d0f8dc38edca89fea0ec0554199850d05064df187cb8f8783dc197334bb67e126166f354f0313ff547e2ffbd530ced1d6d58 WHIRLPOOL daadff3dfe031b8692ac974ccf4dde438a477dd7cd46830792eacf63fac67118e661755fc45a8b9c85cdd9fa83100c1c3909a1df50cf91f2beebf9a979b16aa4
+MISC metadata.xml 594 SHA256 555663e422fb0d1275e5f2c6637d1cc0aac13f2bb58e6537e21326e4b66f7577 SHA512 b1563a6578aec4be3df4b47c9914de3ad80a8859e60bce3a9b3e48f1b8bff3c38dd266523c913ab97bafa2c0804ab5003b5a449858582ef934044d80065c5cdd WHIRLPOOL bf0346fe60c1fd32b650e3fed093903a5d9a048ad5971b6e37b631c65d55ce3e7b3bc53f6e964d5edb3684a68c45ad2ff719f65a78c4331b0c9e7c07be5b6a7f
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.ebuild b/app-text/xdvik/xdvik-22.87.03.ebuild
new file mode 100644
index 000000000000..760376128572
--- /dev/null
+++ b/app-text/xdvik/xdvik-22.87.03.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2017 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/libXi
+	x11-libs/libXmu
+	x11-libs/libXp
+	x11-libs/libXpm
+	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/xdvipdfmx/Manifest b/app-text/xdvipdfmx/Manifest
new file mode 100644
index 000000000000..7120a4164c2b
--- /dev/null
+++ b/app-text/xdvipdfmx/Manifest
@@ -0,0 +1,7 @@
+DIST texlive-20120701-source.tar.xz 131904044 SHA256 9666617d5dac3e82578e696835cc9f251ee0a56d162d86dff08659ac5dcb6c81 SHA512 0e8653aa21094e079900d17256f0768ac5514690a3725d96923d5fdc7633484d611441df1af8c674b38b9ce6a8845a9004976cd00635742dfc6837aa433caf5f WHIRLPOOL 9d570a1bd58cca8baed399ab53eb767c7c3db607c00363ce563e14dfccdd235703c538e6a651aa7f2934adf21f8477775f1547f9e7f3d957b89af644c89bcb57
+DIST texlive-20130530-source.tar.xz 179963948 SHA256 a905832e4c04dd1cb16db4bb7baacb78fbc19682bd33ac2697a3a85ce78d79d4 SHA512 4aa85273a675af2453f09777b7cb348c18add77410d72f562c6586f6814d4e7c34b6f3690e3453020654fb0a265339fcabf590d9155367d52846224499af334c WHIRLPOOL 3affaf25d3936505d971599092964b0f0e97d107d22dbac6a85ad547e1d2726a6a09c5075fecb0c6ff8c88bc1bd09d78f95902f76eb76c608f8a7bc42dd6bc33
+EBUILD xdvipdfmx-0.7.8_p20120701.ebuild 1258 SHA256 9a4c96ea2054fa9761f976d8d579ba1ffe67a3943ccb42e58dc58ba9b9f5ffc5 SHA512 1b0b0692a64cc845f46336b9a4968edde1331ba5c165f1c97f9d33acfa065a45c7fc15a7c330e428104a940f4e0e37d13c65351f158caae730e390466969c1bf WHIRLPOOL 8de5fa3ca79bd38f9623065e989c09219ca90c3d0b1f1da481cedfe8a0840f066d94cb3e50ad12540d627426c5a507e8ed892d652018db948b4a4c40bacd441e
+EBUILD xdvipdfmx-0.7.9_p20130530.ebuild 1152 SHA256 f32ad8cda9b854d9ca4541f337cede9c85382df573134a1ea896fb6aed1aeb38 SHA512 38843e4dd7cf31043e7b1fe45c8396b79d301ddf7a15e20839a2cbbcb4b2baf6fcad1d9350a9570d0f14632188e3fde4720eeffa9664f9b48b74f3ca2217c196 WHIRLPOOL 33d1fe8a34cc3f73a5781592e74a1dd7fb3ad9db8d04b81cbbac5e1f249f14a93b2b26b2a2b42f2c39924581a21f2972afe209eed5f5e8ae5f8459b6abcac18c
+MISC ChangeLog 2529 SHA256 111757b5481393af93e8ff385ba53f6a850f0020742e3e82901669732a30a6a4 SHA512 203d82b1b55c639cee0525f0f67fcc8a94e463d27d7f6df6b280119f293bf62e0795f73f51da6babf60dcb80ff7a5d7afd5595d3cefca9bdd41f9ef93c8cd968 WHIRLPOOL 3126e494aaa9faab747822eb8e037bf05a51db7a5ad06fad2b3e5a0b390d8d2305f46134f1d911cec143cc4ab808123a66a7148fcec4c87f971cf924b447a04d
+MISC ChangeLog-2015 8901 SHA256 b4712d85734246407d4335875c569b7bba13aadde13a835cac67862a69f7a7c0 SHA512 62f85b440f1d4af25a01e47f2fc65e5c6d0558da4e2ba876df6bd1f05cc9d02a9fd9102d391c003b5d1c98a32110355f3591f624e93262449a1474647758345e WHIRLPOOL 0ce37237e3ec6eabc0b249033bc1408c1c60db7dbaa9f3c5999187aac4e59cf84ad5640b234edb667d1b78ad1f37c9a2dac41197608c546baef603fab5640708
+MISC metadata.xml 414 SHA256 2fd9bc390850e54ed979215f79298fde8b78b8f61e14db029c50ad0255172258 SHA512 237e8eb675f2f386cd14ef7b98274af3d65d12b530bf15783b9aa7feb609e54d8d182ac402a18ca66763c30892dbc3427c6d587c529ee7523c0ab4f636f92e5b WHIRLPOOL 25da6160ed784811141bcc59a89ba0d7bfcd2a8c879c7b02aaf3408da52e5f4064ce2b9afa494bd411976d27b44be99ac7d5434db62943da3fdf9a75fc937b3c
diff --git a/app-text/xdvipdfmx/metadata.xml b/app-text/xdvipdfmx/metadata.xml
new file mode 100644
index 000000000000..e7416c908a04
--- /dev/null
+++ b/app-text/xdvipdfmx/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 lang="en">
+    This package provides the extended xdvi to pdf converter
+    needed to deal with unicode enabled TeX's.
+  </longdescription>
+</pkgmetadata>
diff --git a/app-text/xdvipdfmx/xdvipdfmx-0.7.8_p20120701.ebuild b/app-text/xdvipdfmx/xdvipdfmx-0.7.8_p20120701.ebuild
new file mode 100644
index 000000000000..50732504a0ad
--- /dev/null
+++ b/app-text/xdvipdfmx/xdvipdfmx-0.7.8_p20120701.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="4"
+
+DESCRIPTION="Extended dvipdfmx for use with XeTeX and other unicode TeXs"
+HOMEPAGE="http://scripts.sil.org/svn-view/xdvipdfmx/
+	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 ~x86-macos ~sparc-solaris"
+IUSE="doc"
+
+RDEPEND="!<app-text/texlive-core-2010
+	dev-libs/kpathsea
+	sys-libs/zlib
+	media-libs/freetype:2
+	media-libs/fontconfig
+	>=media-libs/libpng-1.2.43-r2:0
+	app-text/libpaper"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+# for dvipdfmx.cfg
+RDEPEND="${RDEPEND}
+	app-text/dvipdfmx"
+
+S=${WORKDIR}/texlive-${PV#*_p}-source/texk/${PN}
+
+src_configure() {
+	# don't do OSX stuff as it breaks on using long gone freetype funcs
+	export kpse_cv_have_ApplicationServices=no
+
+	econf \
+		--with-system-kpathsea \
+		--with-system-zlib \
+		--with-system-libpng \
+		--with-system-freetype2
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc README TODO BUGS AUTHORS ChangeLog ChangeLog.TL
+	if use doc ; then
+		insinto /usr/share/doc/${PF}
+		doins -r doc
+	fi
+}
diff --git a/app-text/xdvipdfmx/xdvipdfmx-0.7.9_p20130530.ebuild b/app-text/xdvipdfmx/xdvipdfmx-0.7.9_p20130530.ebuild
new file mode 100644
index 000000000000..da9fb5c60df8
--- /dev/null
+++ b/app-text/xdvipdfmx/xdvipdfmx-0.7.9_p20130530.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+DESCRIPTION="Extended dvipdfmx for use with XeTeX and other unicode TeXs"
+HOMEPAGE="http://scripts.sil.org/svn-view/xdvipdfmx/
+	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 ~x86-macos ~sparc-solaris"
+IUSE=""
+
+RDEPEND="!<app-text/texlive-core-2010
+	dev-libs/kpathsea
+	sys-libs/zlib
+	media-libs/freetype:2
+	>=media-libs/libpng-1.2.43-r2:0=
+	app-text/libpaper"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+# for dvipdfmx.cfg
+RDEPEND="${RDEPEND}
+	app-text/dvipdfmx"
+
+S=${WORKDIR}/texlive-${PV#*_p}-source/texk/${PN}
+
+src_configure() {
+	# don't do OSX stuff as it breaks on using long gone freetype funcs
+	export kpse_cv_have_ApplicationServices=no
+
+	econf \
+		--with-system-kpathsea \
+		--with-system-zlib \
+		--with-system-libpng \
+		--with-system-freetype2
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc README AUTHORS ChangeLog
+}
diff --git a/app-text/xfbib/Manifest b/app-text/xfbib/Manifest
new file mode 100644
index 000000000000..4c53e36f04ef
--- /dev/null
+++ b/app-text/xfbib/Manifest
@@ -0,0 +1,7 @@
+AUX xfbib-0.0.2-libxfce4ui.patch 2662 SHA256 a1ff8e69c2882eaeb2331ed963233c9b310069abbb33958926f1d7e8964649c7 SHA512 0fadc92daf23de69e8074870933a98c60dfd91d1d505299fbcd0c774a01cce4c81b00b0c08c37f8609a85897cf9b4d3ace5b08c5694ea246baa46bfc70394d2b WHIRLPOOL d614f341a8ce988e4d7110c612f3ce8e1a5e8b592fdc92c20efe662580a3adff8d4bc4eae76dcdb62e90572559ea5a2773d3cbd056f637cdb6f6e06d836ef073
+AUX xfbib-0.0.2-validate.patch 349 SHA256 9c0b19a0149dc18fc82c5166c9a14ab20131124526965b575c11782f04622e11 SHA512 fffd683dc018889793dc9371c756ec89c89d7de0a1c863aba9bac3fad8660baf16688b02831f83c07642de401c134ed86b62e34c95018c8836c714ad2fe89035 WHIRLPOOL 5a19e9e2e009ef2725376c30908af7e8c44dfb7a5baba75c9d5d63b8e7bc92b58988a4c7947fadc590dfe7aac8d61e603499b5e3177b5877f1aa67abccff465f
+DIST xfbib-0.0.2.tar.bz2 340703 SHA256 eeb668b5cedbc9a9b4d8e54767fb7262f173dd9e440031b94580ca108b95f920 SHA512 7f6f812bfdb6b95574f66b63e51fb1a70ce20fd795b6070b055cdc8e753656a266237be92a7e60865d9f1e5fa750be0af3404ecf219a8a5d89dde505c759aebc WHIRLPOOL b45d18574479c42b3fe473d38b217fa603ff0d69a8f678ea328e7af72d8bb92121dfc450e33f46b747e3a8c25e02aa689d16ba61c988bdb28815ffac52bc0807
+EBUILD xfbib-0.0.2-r1.ebuild 926 SHA256 dd8e11836da9a1ada6ee4deabccad9a3bcc6ab31933dc1e67f354fa7f744c6df SHA512 b41007e3fe8929163c416b1ef13ecfb90dbecd270005f47d7a756861a9ad23a82686ff94a665390f6bd061f3b80fdbafbe43b494413e025f7889245fd8673fee WHIRLPOOL 6fa424a65608b2dee541bf768fd8767f8c49c4102e070e13aa83ea6612a28b3b97024b554faae089045309b5a8294be38e90ccde92d723701717f7d325caa964
+MISC ChangeLog 2250 SHA256 162e6782a69eadf6ce1512d5e9e3994a25dd3e39338a5c3fbbe2f2e0e9dc1884 SHA512 af6b360b331b4a4d3b92a5e833291c46b616418a77870f5b53f8ab1f33a1694600764dbed823f9e36b7b07e395e45efef5d22ee69a138c5a9d101fa2a54a3cc9 WHIRLPOOL ae03b1640f74c65526234e78825748e8c854b739aeab0e57dcbd1854d4a5bdbbe3a97479cc616af08089b54fc9d0d0fcf1b49a97e7eb665f95922c7c98f28cce
+MISC ChangeLog-2015 1306 SHA256 c1d5f3e82d8be7b6d376c71fa399c3098c2c65ede817865e0cb70142a8925348 SHA512 40eeeaebf3199aefa0f8b8aa08c417942ead1bdd975ee6bdcea4d417d83dcdc4b196aa5a8537ae03c0e973874ae5af4984e40072c21884a33b98a7ddecb8f4c4 WHIRLPOOL 9f517b00802a5a63b71243cc8d62d15e5c9ae25054871d39a6965b5c7098187c314288b9f7e31323b0d14d4165dc49ffa557fe4cc172ed97b43c52cf33159cf9
+MISC metadata.xml 247 SHA256 5e270543b0f1e81148a19b29d77d40191169f37a8b3e34c7c08bdca376150864 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203 WHIRLPOOL 15305f8aec1b5f5e255d6378d5b44652a3958e808017fd8ba00350b667528753ff0466bcf5b9b28b683fd3341d25bf8884396730003f071515ad28146d33893b
diff --git a/app-text/xfbib/files/xfbib-0.0.2-libxfce4ui.patch b/app-text/xfbib/files/xfbib-0.0.2-libxfce4ui.patch
new file mode 100644
index 000000000000..0759dbf4e61d
--- /dev/null
+++ b/app-text/xfbib/files/xfbib-0.0.2-libxfce4ui.patch
@@ -0,0 +1,106 @@
+http://bugzilla.xfce.org/show_bug.cgi?id=9568
+
+--- src/entry_edit_dialog.c
++++ src/entry_edit_dialog.c
+@@ -17,7 +17,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <config.h>
+-#include <libxfcegui4/libxfcegui4.h>
++#include <libxfce4ui/libxfce4ui.h>
+ 
+ #include "entry_edit_dialog.h"
+ #include "entry.h"
+@@ -589,11 +589,13 @@
+ 			key = (char *) gtk_entry_get_text(GTK_ENTRY(key_entry));
+ 			if ((type = gtk_combo_box_get_active_text(GTK_COMBO_BOX(combobox))) == NULL) {
+ 				_DEBUG(("No type selected"));
+-				xfce_warn(_("No type was selected"));
++				/* xfce_warn(_("No type was selected")); */
++				xfce_dialog_show_warning(NULL,NULL,_("No type was selected"));
+ 				continue;
+ 			} else if (strcmp(key, "") == 0) {
+ 				_DEBUG(("No key selected"));
+-				xfce_warn(_("No key was selected"));
++				/* xfce_warn(_("No key was selected")); */
++				xfce_dialog_show_warning(NULL,NULL,_("No key was selected"));
+ 				continue;
+ 			} else {
+ 				if (selected == NULL) {
+--- src/menubar.c
++++ src/menubar.c
+@@ -15,7 +15,7 @@
+  */
+ 
+ #include <gtk/gtk.h>
+-#include <libxfcegui4/libxfcegui4.h>
++#include <libxfce4ui/libxfce4ui.h>
+ #include <libintl.h>
+ #include <config.h>
+ 
+--- src/open.c
++++ src/open.c
+@@ -14,7 +14,7 @@
+  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+  */
+ 
+-#include <libxfcegui4/libxfcegui4.h>
++#include <libxfce4ui/libxfce4ui.h>
+ #include <config.h>
+ #include <string.h>
+ #include <stdlib.h>
+--- src/open_dialog.c
++++ src/open_dialog.c
+@@ -14,7 +14,7 @@
+  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+  */
+ 
+-#include <libxfcegui4/libxfcegui4.h>
++#include <libxfce4ui/libxfce4ui.h>
+ #include <libintl.h>
+ #include <string.h>
+ #include <stdlib.h>
+--- src/save_dialog.c
++++ src/save_dialog.c
+@@ -15,7 +15,7 @@
+  */
+ 
+ #include <libintl.h>
+-#include <libxfcegui4/libxfcegui4.h>
++#include <libxfce4ui/libxfce4ui.h>
+ #include <config.h>
+ 
+ #include "xfbib.h"
+--- src/string_edit_dialog.c
++++ src/string_edit_dialog.c
+@@ -15,7 +15,7 @@
+  */
+ 
+ #include <gtk/gtk.h>
+-#include <libxfcegui4/libxfcegui4.h>
++#include <libxfce4ui/libxfce4ui.h>
+ 
+ #include "debug.h"
+ #include "strings.h"
+--- src/treeview.c
++++ src/treeview.c
+@@ -14,7 +14,7 @@
+  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+  */
+ 
+-#include <libxfcegui4/libxfcegui4.h>
++#include <libxfce4ui/libxfce4ui.h>
+ #include <libintl.h>
+ #include <config.h>
+ #include <string.h>
+--- src/xfbib.c
++++ src/xfbib.c
+@@ -20,7 +20,7 @@
+ 
+ #include <gtk/gtk.h>
+ #include <stdlib.h>
+-#include <libxfcegui4/libxfcegui4.h>
++#include <libxfce4ui/libxfce4ui.h>
+ #include <libintl.h>
+ 
+ #include "window.h"
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-r1.ebuild b/app-text/xfbib/xfbib-0.0.2-r1.ebuild
new file mode 100644
index 000000000000..2447fd8df262
--- /dev/null
+++ b/app-text/xfbib/xfbib-0.0.2-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit xfconf
+
+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/libxfce4ui-4.8
+	>=xfce-base/libxfce4util-4.8"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+pkg_setup() {
+	PATCHES=(
+		"${FILESDIR}"/${P}-validate.patch
+		"${FILESDIR}"/${P}-libxfce4ui.patch
+		)
+
+	DOCS=( AUTHORS ChangeLog NEWS README TODO )
+}
+
+src_prepare() {
+	# This is to prevent eautoreconfigure:
+	sed -i -e 's:libxfcegui4-1.0:libxfce4ui-1:' configure || die
+	sed -i -e 's:$(LIBXFCE4UTIL_CFLAGS):& $(LIBXFCEGUI4_CFLAGS):' src/Makefile.in || die
+
+	xfconf_src_prepare
+}
diff --git a/app-text/xhtml1/Manifest b/app-text/xhtml1/Manifest
new file mode 100644
index 000000000000..38f7292b3c06
--- /dev/null
+++ b/app-text/xhtml1/Manifest
@@ -0,0 +1,6 @@
+AUX xhtml1-catalog.patch 834 SHA256 36b3e6f56ca4448bde8ec872bb171df6a0e86e668101d8e9e3e298095aa6e603 SHA512 0b4fdb64e73405be53930984e5f628a1b5b48e6d43bebef9f9c502fca31d13b760385c0481030f8a09556447891a542dc4c7bb23f0618fd937e2934936b26780 WHIRLPOOL 3f14bddf74a9b8e35e82bf4ab118559c019e0d328cd706908c095b2c3d70decc689e7c7ab30fa6459ee389f1a933d5edc0462c2d10741924f536c6160cf979f3
+DIST xhtml1.tgz 232192 SHA256 148e9eccb5c91222b5f0c07359174ca0df1bd74834a2bae4c6e57c10136a2067 SHA512 184758381c5e2d36b80fa1e4470e864777383ff7539b48291036f8a3f1dba0b354a32142bfcc9071147fb20bcd4c0d4d541e09e865047938ab4cf9ae5a806412 WHIRLPOOL a7097078ffab88a042b133edba0a4c1a3cf568c04ae14ce33da4dcf00f8ed16d997a9a08c4b601597a0954f4ecb499bd403f9529326e2ad88aa3f00fe02407ff
+EBUILD xhtml1-20020801-r4.ebuild 2244 SHA256 c8f5d0fd37faf70bc32e2067aac0c3568b3d0923681655e2c171fe94f7eff16d SHA512 31718f3105af95a71fc688b260e7149d7fee94d8d9c3541868773407b8a130a9f19c2f693dd55c5c82b3d4f6dc4358b4f0bebe0eed62c7fe1c6c612f9ea687e3 WHIRLPOOL 42d3cb486606087f950167ea9b0ef45c74933800d16d550d54dbe0868c288d1a885374ae5efe0039ef8bcf1efab5c7e8642ea32b2728b463d36b78b2a235ddeb
+MISC ChangeLog 2719 SHA256 6fb7f949221cd6f38ff39264a707b2666eb1ed12a4c6de0abc81e5faaf3d34cf SHA512 d5a261fcc6d8d2393d6b0f2170ca566db22ef05a565f660bfae939ff251f9691cc717a52ba865210e6c909c12051f410b84e2a4230e7bd95761608225a0246af WHIRLPOOL ee880ef9d151f80731c7b067f6f140548bbb1e1098a84339a1bbc3d4282b136b1d036444fa4911f565cd7dbacfef1703a5dfbcf6ebb5c91e28e982d76cc8625f
+MISC ChangeLog-2015 3220 SHA256 ee20fd85ea079d83254079673a27446dfeddd9b2b007ea6390e4426d93f355fc SHA512 49be5dc01d1cac26617d10a6d3ac4c31f8fd88f621fa51a436b559b9c6165ca83d884428fe7286e002a0fb9748f08856226215da9559be940ecc49a44a53976e WHIRLPOOL f38882d61746cbb00aa0fa8afaa478d7d0de47d83506881a3c67e2a37ad949884114415bffa7a129faa340865a75dcaa61300fa74750358787edc7513d05837a
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
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-r4.ebuild b/app-text/xhtml1/xhtml1-20020801-r4.ebuild
new file mode 100644
index 000000000000..457f14f5572c
--- /dev/null
+++ b/app-text/xhtml1/xhtml1-20020801-r4.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=3
+
+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 || die "doins failed"
+	insinto /etc/sgml
+	dodoc *.pdf *.ps || die "dodoc failed"
+	dohtml *.html *.png *.css || die "dohtml failed"
+}
+
+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/Manifest b/app-text/xindy/Manifest
new file mode 100644
index 000000000000..82f8559301a6
--- /dev/null
+++ b/app-text/xindy/Manifest
@@ -0,0 +1,10 @@
+AUX xindy-2.4-configure.patch 884 SHA256 8c65bc27d6f62898999ec22bf99096022df4b47d04b0d93550d2599837037725 SHA512 1b40f03481ced4caa2a4e137c7ec2ce970c8eeba9c228da4caa1952b533f5346a025f885860024168a95739d3f0e6bfe3173f1654ce747a4f2b4f6e4ba41c1d0 WHIRLPOOL eb480dc16faa208b1966843f47a46f68b1ece2f8c0ed9321d2f9c9bfdd16099db415309f3f48cf0f4760074752173c4a9aa533ea37704adceb957c0b633e974b
+AUX xindy-2.4-locale.patch 679 SHA256 654c301948d9d6764c4b444b343429203c7213d3064138925751f4032074d6bc SHA512 4d80684d08def3d3cde3765056d562b60d6bbef36e3495933c0aba0016308f95e462c2857215b4e47325339c5238f565bb798b96ad197c23e156d9b9c7fb3f4a WHIRLPOOL fee60de9161aa6e0de7640f4334ffee9a1ca3b933dd4af6055dbe5421a99d38a495d6aedf59c601e0bfed01091072d809a568e39b2ffad03202cc820033d05ab
+AUX xindy-2.4-nogrep.patch 431 SHA256 718c4d8558c0daef5e405a476af31c67904622f113b7b055278b45266345fe60 SHA512 fdcc109b89a6e56c86624f348ebe1c98f574b9f788e3f307e3b110fc2b93643af087e16711b3f0bc6604dbdcfae06080693e4976d8ebec5816e68fb73f89fa6c WHIRLPOOL 65a708e2158f033aae5ea6129ce53a8187a5277c05320a041ef63d2c84d353224817fbfa41e670455d6626f9b00b87fdce13273d0f4fe822f0417d4fab34f549
+AUX xindy-2.4-perl5.26.patch 337 SHA256 dcc0d8be2ada7ba13cdae7a2351faa018fdb7df9e16dcd0a97012a5be6217679 SHA512 3f3abc9654e3c7c9de12a542241e107d80046bc26d0eed336e046835a221ea190d526b37c85f91b722e6cac89f140e38b0cebaf208a2391d8d7a42a2ca4b8459 WHIRLPOOL 4490a415c2215fc6b3e82b1e142c0dbb1eb9514d77adb8c31b09bfd09d2094834a545ec518c1b7ccb576a3ad3cc3dbce812e3ba2fb58f79e499b470adbbe5b67
+DIST xindy-2.4.tar.gz 498024 SHA256 616f977b014d67814d6ca45149e1452f3b1410176969d32b6ead5bdf6dc55d71 SHA512 d718954c0c9efcf36dcc99518542b45b3fbbb922b98989c56feb542b00944003adb5834656add0aa88b1983f98e1d9d76e5355aaf9e6ad39f3e0dd109a18ade4 WHIRLPOOL 2f361bd5d395f3b5cfb63d7dcdaea6d152e979b173244ed32438108639cee31ef71f53fdfc556549ad38dfc85ccc221360d0bce8f3d8b1f86407bd33cd31a9ca
+EBUILD xindy-2.4-r1.ebuild 843 SHA256 653bcf0035ca9a13ba46d61d59ddacee1d68e9de58a66460a3a84df53d82e0a9 SHA512 7add4ebf279ff50220c86d6ad944fb15c5233078bedefcd23cc4a7927aeba4f0e0730e3f5f0d191c97efefd786634d691e6159e75e2affaf31c5ed742b6a8f38 WHIRLPOOL a3530290e634bcf9e7a393671bd97d1fa0da096b8fd0ab6b501112bcce3a111c42e6eed8778536933109e9d0b9b6f866a1aa0a1707564e9cc95ffaa0edd92f0a
+EBUILD xindy-2.4.ebuild 916 SHA256 410c194685ff7e457695efe478afdc94e843d879ce17441ad96481081bd9c6ce SHA512 a0fbb71485435db4059eb3dae30508af91956876ccfba14b5d0abb75e53de98521801b8af8f82ca78b17379465b61f9af330b836ecd0a86850b7f8e38e3089d4 WHIRLPOOL bdad2b32fcabce6638952a7421e312d0b9ce29fb9f17a7d0759d93b058a22fc155ca665d64a731143b818498bd001dcbcec39ed66a57cfc79cc329f5d32d50d5
+MISC ChangeLog 2652 SHA256 41a5cfd677b6b4d51cca47fd996f9ffd79870e4108b647576c0be4bd1589e4d5 SHA512 131efb479a943983e8272cb7c30a09032cc2b856356c631212c0193042f7bb74356f4237461fbea31547129bbb1ebd4cc3fa07ea33f5548d81b6e78b6c25a120 WHIRLPOOL ed4457314dcd85d2b11bd2af2cc96ada78076fba6d05b80b4ceb6a192e0b581b119ede02d9114c1f6f9593fabaa3a38aaffbb0b9943a2dbee1ec89a7bb266403
+MISC ChangeLog-2015 2733 SHA256 545bd41538c809b0f17c2ba6fe691b45801763a244a22dfcb4acd6816261cc04 SHA512 ffcaed4c7adb5885b31cbc36cf2c8d383c636ab1cdda3b28b4a67aabeebffb3aa7a1e05df2c80d470073aabe76a8a8e7e5db47b1d2940174e5d21e16471f85b8 WHIRLPOOL 5e2849c30cd5db3511250add9fca58d04dffcdae0c4626fdb0f43f331be0ed70b87a0ce09b3cdb35634d4962e29a6831be7098a04a744e65f3ff343da4363567
+MISC metadata.xml 1108 SHA256 f14279a8b3c36c96ec42362d9eba774801dd1b86ef3b097ffba1ebbdff7e0a6f SHA512 ad76e6c8dacc9f2f1734a203b856d040c498774b6dcaadc0b267d25f735f26f3caf40446b7f5acd96e8d67c6b70cb0cab006c9d4016945f379492bbb5bfcc792 WHIRLPOOL ad0c6c4acec3186e9f5da54b1a34526199d0ed7ff7b93065c9b4a57a51f06dc3cffb3a46ca7450ee0ac9780183ec90334108346bbefc980e9054c2ff729c8fdc
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..3ace0f4c544b
--- /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..4575091c5636
--- /dev/null
+++ b/app-text/xindy/xindy-2.4-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 autotools
+
+DESCRIPTION="A Flexible Indexing System"
+HOMEPAGE="http://www.xindy.org/"
+SRC_URI="http://www.xindy.org/${P}.tar.gz"
+
+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/xindy/xindy-2.4.ebuild b/app-text/xindy/xindy-2.4.ebuild
new file mode 100644
index 000000000000..70a2f65a96d7
--- /dev/null
+++ b/app-text/xindy/xindy-2.4.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=3
+
+inherit eutils autotools
+
+DESCRIPTION="A Flexible Indexing System"
+HOMEPAGE="http://www.xindy.org/"
+SRC_URI="http://www.xindy.org/xindy-2.4.tar.gz"
+
+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"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-configure.patch
+	epatch "${FILESDIR}"/${P}-locale.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-dependency-tracking \
+		$(use_enable doc docs)
+}
+
+src_compile() {
+	VARTEXFONTS="${T}/fonts" emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc AUTHORS ChangeLog.Gour NEWS README
+}
diff --git a/app-text/xiphos/Manifest b/app-text/xiphos/Manifest
new file mode 100644
index 000000000000..2b899206fd34
--- /dev/null
+++ b/app-text/xiphos/Manifest
@@ -0,0 +1,8 @@
+DIST xiphos-4.0.4-20150830.tar.gz 8040173 SHA256 413bb8acb444946ccde1fb9fcfa3ff4bdb622cb56995b557f3215fab42193f20 SHA512 337503ee4cc6139ec8724266f3c9c0ce5d17518c48f7aab03ea8213165054854c8dd7317ff9e1b9097ece12292b52f1c8002684c00c5a7b43c5b4810edd6ecda WHIRLPOOL a1795b6fe5c978fcfc2c1f17f48844797bcf6e07a272181168717807dfd0a7b6e9359380a21fa330c539f1197c54c7e7293457f7733ab55d9dcca274ba044991
+DIST xiphos-4.0.6a-20170820.tar.gz 30584893 SHA256 f5d8464974828dd4f1cf27269ed00f64739ad4afa7c0d853c55b7713e25eb31d SHA512 a0577521c6b9033b74b3b0a0fd7a88222de00dc2e9db100d66e1bb60bc117173badd26c47d2e896ffa167c52a263c9bf9046d650a9b4ae497bec6164bfb0a29b WHIRLPOOL 251aff54a9113c42eb2c8cb46f7c7c581177d906177f34681c82abf81c611cd5bd41fd597539b5b228c35e605c5c02f5d51b70795c9ae971323d703181201258
+EBUILD xiphos-4.0.4-r1.ebuild 1997 SHA256 b421d4ef20d719ef0f4cf580df9b54af305c4a00ab8f2d097dbbccf5f1e195b2 SHA512 7f567d2a98ebc2b0804a30672cad38c715bb8eaf455773a41a291bb1ab45d0416bdbd0d2c92fcb34a303c104087cce757f417492d4734c06f014b3f9208a334c WHIRLPOOL 831cb9574ed8014af22fbe2c8439cceebcf99faf058e0fc84445b0a6979f9fec0ab0da2766a6237f63382d26d304bc220680d51ce78f43c1b675b1f5ddf360bf
+EBUILD xiphos-4.0.4.ebuild 1974 SHA256 c1b6bae228ed03ad636213509adc7be08eeddcf971e5f2d00971e30d7d037c59 SHA512 3d8c9effc1d70ec378c886c29cc8134ef62272f046a2ad4fbd3bddb95a01a6206f86047be32337f37c40fe4ebbce0ec87d2ca8e8ab8b998135af2d4a5fae37b9 WHIRLPOOL bb77083b50b09726e8cd9f6ca160032c0bb9de2c55f388af76daa52e1edffdea2c2b9be7eb7a2e0ff1c1e32abd5f9e8bf752ddead0f8c8b5cce9b1bed8809f1f
+EBUILD xiphos-4.0.6a.ebuild 2046 SHA256 9a886f98fa3179feb582efddebb36532fb0b41bbf2deed870bc15ee7c63d4de3 SHA512 e8a8d3f40723d953cd836cab712760386b41b0445efb4395206b399b9c6e6158b7618cd87aba607f145c3451ae71141ca6bdf81f31dbe51ca368adb5b8a00cd8 WHIRLPOOL 13504306d25fd8718cd6ab87cc93bf5ad47ab9e7a04e0865648283f5e26fb43f23b615fd4239c118ef80e61ee84692dcd9c342dab6c36fcb814d9616e7348638
+MISC ChangeLog 3117 SHA256 ff881e228f2b2fb42a1ad38402ca7017d2f52a9508d0d1a07ca19744be425bb2 SHA512 8d6b3aada1cd998f9a912aa61bb1a6a064e1aa3c4789418326ef8176271c5a83c73dd9c201f354a3b8a90cacb338b84323de0ab80c3fce698f896fee4a04f58c WHIRLPOOL 9dcb064de538c7c1b50c82edaed9060c752c7887a9614042ce658fbb46e13e6a198f5f7cd5372c1ee66bd6a5ad35b93fd6539cff8130f0fba553fdce81dfa642
+MISC ChangeLog-2015 2967 SHA256 fdf775a761e65fb9fe0efffc20e43a77893b934cf83641eacbf97c516e64ae0e SHA512 20c02defdc41af6abdad7618dcf5c69428014930e358a9733a4a5efd6c30b2808c2698741ec7f19299f78d9d2c8cd17f04322659484cefe239bc2a9af821cce9 WHIRLPOOL f9ff647afdd7465faacde6d6c3ba920ab946c7e3b9dcb23e53f884f5dabee9bf92bda1bb94b460dae775d331f179d7063e59b70ad2b2bdb95aa65dd6efb98d08
+MISC metadata.xml 300 SHA256 260213edc5b68387a1114a98ae4d39826a027839ebc12052b829abbcbeac2150 SHA512 0e8ea5d19ca48a68c4266c8cefb5c29d43d56c2ba61f271460ac35d5d8be18486c84ade898e2a8b647648afa24a19ee04ee60f2fca5a0fe358920deec2418340 WHIRLPOOL 62596739ee28f6197e50c4734677be2b8a132d6716e1b26017fe66760f1e4a1a53bcf5417d69a0cbd40d78dca0ec13ef892dde020440506c99a14f04647762b7
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.4-r1.ebuild b/app-text/xiphos/xiphos-4.0.4-r1.ebuild
new file mode 100644
index 000000000000..a68d218a8e36
--- /dev/null
+++ b/app-text/xiphos/xiphos-4.0.4-r1.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+inherit flag-o-matic gnome2-utils python-single-r1 toolchain-funcs
+
+MY_PV="${PV}-20150830"
+MY_P="${PN}-${MY_PV}"
+DESCRIPTION="A bible study frontend for Sword (formerly known as GnomeSword)"
+HOMEPAGE="http://xiphos.org/"
+SRC_URI="mirror://sourceforge/gnomesword/${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
+	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
+}
+
+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 README 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.0.4.ebuild b/app-text/xiphos/xiphos-4.0.4.ebuild
new file mode 100644
index 000000000000..12931a93f012
--- /dev/null
+++ b/app-text/xiphos/xiphos-4.0.4.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+inherit flag-o-matic gnome2-utils python-single-r1 toolchain-funcs
+
+MY_PV="${PV}-20150830"
+MY_P="${PN}-${MY_PV}"
+DESCRIPTION="A bible study frontend for Sword (formerly known as GnomeSword)"
+HOMEPAGE="http://xiphos.org/"
+SRC_URI="mirror://sourceforge/gnomesword/${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:3
+	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
+	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
+}
+
+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 \
+			--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 README 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.0.6a.ebuild b/app-text/xiphos/xiphos-4.0.6a.ebuild
new file mode 100644
index 000000000000..ee8a6ba21b85
--- /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/xlhtml/Manifest b/app-text/xlhtml/Manifest
new file mode 100644
index 000000000000..e658e8b1042c
--- /dev/null
+++ b/app-text/xlhtml/Manifest
@@ -0,0 +1,6 @@
+DIST xlhtml_0.5.1-6.diff.gz 119282 SHA256 afaf050c6b26bdd743e2e1b90963d6ae2bc8ddb8b0add11d397e0062cfba868b SHA512 f1f4bba58858e6033f164e689333904887b7cd60bf082e2247e7fe0c54f3737e72aff6590deefd1d8a04d4b25d27631664594c50c9cc4bbdc8c9b20c6ccce7bd WHIRLPOOL 94ab67245d4e1ba26d86663ea5d60eeb5e13ee455a64cf448c0f74716a30a7e98ac8dbbde2c0ad8ad44ef01ab203943bbd3707419e2f33c55097cc61d8e36cba
+DIST xlhtml_0.5.1.orig.tar.gz 263933 SHA256 81fb9e786bb7c440423566b0aa71d7395685dd4566a8388a4d89ee6a8a5cd873 SHA512 9ac1cafd4496293cbc5ca9109a8d467fab6dd24c1daa91754b7f49502e2607272292b8bb9ed876b21fe1b287ef3293a0f6c5882c18a18fd715137c27d63f9f01 WHIRLPOOL ef7d36599bc5819755f2c5f37e42faa266d6eb5c2211632973c8d0dc82fe21add4289bb7012d8a02684652c713dd59e1d181407e854cacc2da2fe1e7f0605705
+EBUILD xlhtml-0.5.1_p6.ebuild 969 SHA256 42873cc40fd9febcfd541be1035d440e9d3da470ce4a8d86e55c14be1fabb720 SHA512 7041a06c8a35e5c268e0ee4377cee1980a4f812184dfa27ebbeb363f845fac4e15f01799627ffa229e335e70979681d49db5cfcc022615fa921adc07fa45e178 WHIRLPOOL 0188ab79779ef6a8529dd4dfcba2c73124a10e2cbf7d920ed8b7be8d33a57e7ec944932570f2819f254eea713cbdd33b24314d788f00bb5628681f224a0af640
+MISC ChangeLog 3071 SHA256 02361b578c26d37c74dbf11691ddc4e1e8aaa5fdd3b0a0c996bb69753ef82f96 SHA512 4329bd7d5c6c4d2af2b6851a853019130553ea5555a4f26b0526660fc1a38cf17ae25d6b33c09c21f5aeeed8af0f1b87170b82488d120e4e9b2f2c455c517304 WHIRLPOOL 531a7a66faa638e34fa998d9b9983a0aa17657f733c7e69595ad3a39573dc86a176e0c75ad1d21812284ffaaedba5d22f4195a890b2beb152ca1a66663cf0b83
+MISC ChangeLog-2015 2974 SHA256 9b6b7bee9738af340c2f757b1ee99ff1911c96ba0aeb5af6598a3505bafafa27 SHA512 676855765aba7f7a5ffe07d495d822feef5bcbce584c8576b01b551aef4439c5ec06c69e40c58d340cdc2d7c0ef71e5dc9267f920ed2717a75e0c5c259562064 WHIRLPOOL afcb7a5c92230963c0f71c1fa04ad9e052d341c5dd24678c40f63862c837c75533eed031e925021f1980439ef60c412d7e480383d15ef95369ffd44557dfb138
+MISC metadata.xml 249 SHA256 f95d031ea92ab677c86c44e5f11af810dd60de1601eccd78e5bf160d6863140d SHA512 f6d4ee96a09d5be353d8965ce7944db541bfd6fbe75e2a80dd660993e36250fe146c30ca914667c0d09ae3916274295661f2a6b0b1bc1c2fcc0123a7cde2b3a6 WHIRLPOOL 1aaaa97d4de99bd822953eec0bb87dcb0ae22c349b9b40a4665889059eec49a8493ddfcdcbd459a377f33ef180ccd9a132af8c099990f2b14662dd17e98bbc87
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/Manifest b/app-text/xlsx2csv/Manifest
new file mode 100644
index 000000000000..4feb99a980c3
--- /dev/null
+++ b/app-text/xlsx2csv/Manifest
@@ -0,0 +1,7 @@
+DIST xlsx2csv-0.7.2.tar.gz 188520 SHA256 7c6c8fa6c2774224d03a6a96049e116822484dccfa3634893397212ebcd23866 SHA512 c55535271801a690ed9ff28c2572d13cdac0efd206685a2119b73d1da7b4a46754da60782b36f7976bc5dc1b478860430848ccbee347824aea1a6556764c5922 WHIRLPOOL 4be43d36d2d123f6e263251f71d39451f84f881c7290999357b5a0c39bb71617460516e76adff939c36476fbf2675fbb8069a48d61877fd926706053e68e5195
+DIST xlsx2csv-0.7.3.tar.gz 201482 SHA256 1f27f9790f19a60ef5581440d5748055bf351d6f80a326430e3d0b94e63dfaf5 SHA512 855fcce9ae6ec51c46673e085a456d2862912d0da5130fdac34d88e5612c64d2bc0674c13b3bfb6cd6b7017e513fe0924dbb594db543020842705a82b6006e8e WHIRLPOOL 0d830bc0154ea69ddabaec690841ef3a7131d93e6e58c3a276739aee54b7de3f9c5b483ee33f2eef92427dd1ba169c2fb0b1a2e83836543f441b82cf0a070132
+EBUILD xlsx2csv-0.7.2.ebuild 544 SHA256 53ad31646484cf83c5c286ad72fa33925957fa73eec5382ea58f1346e31b56f8 SHA512 dd0ec87bc91079bedf57ad386b7ef403e6e0317f2a1edf5ff379788c7215567c2531d5970d5f7acd301a0eba073512726d6bc28c3919c110bc8ac0e5470201a3 WHIRLPOOL 7bd18ba67c49bb737980ba3603fd2244b4ab3fc0e41780b575f442959096bbe97f9af8d4e94824b08211bc132109647061af1ea56ca43548857c9a258605c3a6
+EBUILD xlsx2csv-0.7.3.ebuild 544 SHA256 2b23ef838f148e32b0ac0f6d0bf4c64c86e7d5e85af070127a5f4626fa45f37e SHA512 c58752c07e4aec3963b50e2d47d44d8e608d5144b2205bd30e7c13be4b5097fe029d39275fecf2183e58ea348f8d4ae80e91a5ba155080d3a348728c920f6313 WHIRLPOOL 9c2f5203d2837df1a927b80902745ce5524f0ffd854e540333c639a2583f58bdebe7d2e5fe1ce4fa5ac8f014e0a01305ac47618ffdfca6da1a28a7ef75b9478e
+MISC ChangeLog 2452 SHA256 0978c94adfb8f62d097b3d0412557e2f2074dc473fa6642dc2ed4c749d8d7782 SHA512 9abb545d440048fc845120e4515a4d119d125e7eca7ac14b14ba9f2c3d4fddeb4f414a298a9d0d5ab9cb347ac7b78a2735d57b94aa2284bddb68a6c14f7912f8 WHIRLPOOL 8ebd13a03506cba79164f33dd1c2ba7acacc372ca2cef6a69abc3e7b125ae1aa76d2e60ecc61626025e5fec83a907e11c85b541130595ca56a70d4237f51cb54
+MISC ChangeLog-2015 2011 SHA256 a6e262a957badebf7b1666ef7ed20effa31753c9a2100d1cd216edb52873634a SHA512 1a80dd0c966f1699af165a446cb89dd242fcd744869086983a08e32da417910b763aaa18c2f3f6683d422f8c8d2c12e2b741b3a3db40bb6a496ab55aea2d9a09 WHIRLPOOL 5d880fa1d57cac4627c79432558bf4fc2f2185c4f92d1329cb27ba63225faf05665dd743f6fa24ace48f8181d11bccd5792926e6574dff72bce4a206b69d67c2
+MISC metadata.xml 385 SHA256 4bb6bd56e1c029cdf033d956b607c878dec1c9c2155623f3ed77819965f35153 SHA512 e608a317791c590b9dc226f44cc9ddfc2c2d4ebf39cad1b41d230d14549d2718ad09a8cdd79afc2c2e75f4929907ea14d4944923013e00001e9ab0e87c58619b WHIRLPOOL fe465e2daecaf52e6e9f36362989179d868ea8ccf76ac457e838cf593ddc57dcfb42e95b2a3b4996053e0e5dbc0a77a3b74768e7fd49e97d0ab45bac34ec2b49
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/Manifest b/app-text/xml2/Manifest
new file mode 100644
index 000000000000..ef2ffe975cb1
--- /dev/null
+++ b/app-text/xml2/Manifest
@@ -0,0 +1,5 @@
+DIST xml2-0.5.tar.gz 86318 SHA256 e3203a5d3e5d4c634374e229acdbbe03fea41e8ccdef6a594a3ea50a50d29705 SHA512 76b6523e1b64af32529fd8cec52f61f3ca45e452c1398772367f8389368bb7712698e4ba6cb6c8e50e92f68f7f9517f90668c73016e11797931ddb6858782aba WHIRLPOOL 3f2cad5046f94e327b396c8c334691b53335b791c0d912ef4e9bc515543507b0085e660bac2ad716bfd4923b3aab5c9e01f42a4bca92b28c037ee0f490b561d3
+EBUILD xml2-0.5.ebuild 445 SHA256 0fc0181874f79ffc716c56c913f35cc80843206bfc93b21578e5fe469f8409be SHA512 6f994f874089f6190c1f3528d2f64a54022619ee06b80102c6cc17ddd3df383f7f736d6b8879ce53e8a9a6451dd25acf09b7b287dc059e6c11e48ce1eca98a3b WHIRLPOOL 6aedf66667c7fcc27efb7ecb7a6d65e4816e449dd391b0b6789e725efbf3e6b4720b11fd30b5ec708652e041d8910a2a6201bdd671fcf9f00bcf79700350ef63
+MISC ChangeLog 2707 SHA256 647d208f1cfd1a07f744976bda66bdb2355b037fe2202938c1971e1c6e350903 SHA512 bc74f081e2518aea731bd0db8078f0de232dd622935c69913dac24719f0593559be4afd0856744eb3981ea3c64887d070f460e4e67bd4d2bb6a96c84157c72ce WHIRLPOOL 8eef91f214b6d02ad4a8ac1b2f35f7196eb92749273c61d936a33fb44e1fea4ad0d4702795f7edd70eb21b66ca91f5f52aefdebd08f8bf4ddf95624a97b044e0
+MISC ChangeLog-2015 1880 SHA256 8958a146510ffb5c5188b4ef1c2068cad8dbbb0f24fcc1634014c536bc78f65d SHA512 59069db831a5c8b94e2c58e9bb546fe191828b4ac1db961a53fab41aa62cf84615d4f01f05b2b6a35497c4dad408851bb95c6c56c72e6e0ab4ca9bc7c1306b06 WHIRLPOOL 65743678d9289a802ffb9b9f2cfd8575f80626e47692f0b4e90d762d3ce5b2c8749a9f6729a87c105b04abededba00b729c12fdec95f1185f177245f1c5131b0
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
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/Manifest b/app-text/xml2doc/Manifest
new file mode 100644
index 000000000000..2cb766a888e9
--- /dev/null
+++ b/app-text/xml2doc/Manifest
@@ -0,0 +1,6 @@
+AUX xml2doc-pointer_fix.patch 627 SHA256 e1274d3084bbe7821e23c1b64658a3df80253fdbcd4dde890a497dd08f813545 SHA512 ebdf69986821fdb1a22e3da4447729433d7f30d08e516b5b28c1f9e4fe6ec98d7a31e925028f940e8a0aaab5c05bd52a1a4d12564fd47a79953b1de606fd2430 WHIRLPOOL c98a9b23803b10f762f91634a2ad5bb5734c5c0d655398493c7c14d817905686d2051a1bd8bae034767f613f8b9c07f9f9349e7ec1afa8701800ee4b1e0ef820
+DIST xml2doc-20030510.tgz 53307 SHA256 dd675754a856f5ca40dfd12e0264ea51228c3d795f853d2310677fd25ea7866e SHA512 9eb2970b7adef1669b9b0aede2b3d2b42ba234c8294f0f8e6e230d8fcc6cf878675b2f0bff87ee36a255ab29376be844d92d382be7aad0ab11972847cfe49dbd WHIRLPOOL 86498838395687896a381dd63897c24cd968f53f16865ef26cde5dcecd63b3a8249bb45ffe65dabd4e18b41a704b22df0d13bcf3862b01ac50dc631a26c7794c
+EBUILD xml2doc-20030510-r1.ebuild 1217 SHA256 e32332c67f1e8be782e43495b37c084f2ea66364a5ad80b99c4ac31aa5ce34c9 SHA512 19ef01d4a2a2ecf59122073e060ee0b13208a113d3839f71969509cfcef3e12597c37963a77daaa3be5223ec40bc9351ddb583ad680e549354dfc9e36535f07e WHIRLPOOL c8438d75e1732ea1b4e98687679606c0a0afddbdc39f13eebe1c84d04af7bf2c9eb961f524bc1d44ab50d58cfdff1107d90e7a8e929736f1a7acdb1ebd5d0e39
+MISC ChangeLog 2570 SHA256 369b1a2d6525fee9fdca311b13fadc5c3a481b8f5276124c6ca73e3d92d4bafe SHA512 0de341ea1668fc344a19aafdf068b843ff209142990aaa6504f1d2a37eda8724b0e1bb5f759bc64b4688ce45d29b38bb61867028e10262ee2101c59d1613d832 WHIRLPOOL 8f5333d0473f1f061ceabb23861832bb671a751c870f5dd2383e23966f51d16d7676a484d5cc54a86625bd1aaa88775b83fb176dbcfe96fdcfcf3ab2ebed3b4b
+MISC ChangeLog-2015 3413 SHA256 1b4e543431786711f6f6e52926fd511e07e6b8c2e38ce8299ab6586d3f268ceb SHA512 d2ad8ff5f8bd6b91333f9f960ea4eeeaf3ddca6fd930b86b510b00aca659447878e3e90a20ea7bfaf9fbea5a1fb6fe0681609d762cd86c64485a20cea1774c89 WHIRLPOOL da57c500c12453cc53e4b93fae0a8e09edf511f983542c452a7312831cbd288adfb5321252c01610c373c16f23c2059179c2dd22cc2b896e0a11fb981fcf88d8
+MISC metadata.xml 244 SHA256 e47a2850f5f6a465f788d214581d433be934c1621dd09d99e8f78772d09e1e3b SHA512 b4abe1dd13476a480e518e284cb832c2b41893049169975ee44edba8661af79b7cd8f8110e03b920fe90cd8e0e1d926bd5a692a24ecb841bd454659de3422ee9 WHIRLPOOL 2c9705675b9abe7fe308ab30a4faf6b31c51eaec76c229bd4fdb9986306824198ad793ddbc868c1792e62a1d40082195e1b532e3b76ef7a71906e0a2263f4bc9
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/Manifest b/app-text/xmldiff/Manifest
new file mode 100644
index 000000000000..d4fd1d35530a
--- /dev/null
+++ b/app-text/xmldiff/Manifest
@@ -0,0 +1,5 @@
+DIST xmldiff-0.6.10.tar.gz 45827 SHA256 83aba252df2f760c8bf008b9c5d3080911eab2d2b39c371d3b47f67abf4b4ec5 SHA512 b183a6e94258c4d693fa97e759868dae2dca6088e3cf12cf08b40e82d18a375f02b12d62d0cfc03fb74a5138f32f6614f555b95a3062ba768d1cdaf3391cc95b WHIRLPOOL f96431ae21277ef3d1ebf3246b65a6b488159c593b6ca8329aed28b9d67c64cab69a7697aecd2150f7e7410a2fef7c6127059b992adae45ae35f07ff964fef8c
+EBUILD xmldiff-0.6.10-r1.ebuild 552 SHA256 b4c379094e2b982354eecd155b3ccf5b2b3cb8042a20dd1a69f20e3188c642a9 SHA512 06f293122efe66a65981201cc886772bcbb9b5ac4b4ee477a6af1444625636c5f23b0b33a9c963896d1a6dfed960a611ec59522f088b8c08fa2874a887051619 WHIRLPOOL 7fbdabef7b5447d01c560ba88903d1460e3c8820d40f53f078dc9d1d3d26b2aeb11e6694f634915bc4c1ceb1b3cdb1d6930d273bf31e91a6732c1068a7afd0a4
+MISC ChangeLog 2511 SHA256 cdfbaef6698450f1a8d51336a88a44112b9fc3ff1342a63f953f970b50527d3a SHA512 501b649b3cfb0531ef09f9a0c4ca092d72c0a2f129b2bbbaf160f5a6fecf4d1e0b899b6bb1a08e25db20d9cdcf8eddb3ccec540dab563b2f760063cac33f4a4c WHIRLPOOL 85c394a242dc86775cd4249185b8a7c9669812fe6bde564b667fc6e1f512667e3931f547eb2edc5dc124f4c0d25ad77677622ae11c65a9d039e57cea9e7b35be
+MISC ChangeLog-2015 3425 SHA256 0b863d5e9ba2a1634e2d4f774093715730787317f65d0b3def38c7c8a035d751 SHA512 96c97d6af119ef803e023a03c5deff34e4c4b369a5148d92ee95a2604d094fcc4339bba9f841f5575c5b8c0d7e7eb20704199f623069b203cf7d32863277efc1 WHIRLPOOL 449e0e82b977d65d91e7c070b2184e292b546d8e3c02c8b3968e78db4aba703c74e7541ea923eb6af88f38ae56d33e7d188ac5a70310b2d878d370a10480699a
+MISC metadata.xml 585 SHA256 2a9264170373932ab89da58eb5b214c7138d3f0b216dfcb439fef2fc0ad9ff89 SHA512 87f9579f33ed0e4de94f5a7d53ef0e3a3588e3a9f2239353883a1f8770711c5697036b42aba4ed99d8d52d87d1e6e1bb2a9045d2acd1416d8f22d6847707d800 WHIRLPOOL 8ef2b470901b37034a9f85e3e977d24c45f91c517031ffef1e2452adcc297348bafd7f02fc980641c99344ff9774374a7c9cfb3e30c57899060fabcc92947805
diff --git a/app-text/xmldiff/metadata.xml b/app-text/xmldiff/metadata.xml
new file mode 100644
index 000000000000..5ad26e1522f2
--- /dev/null
+++ b/app-text/xmldiff/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>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-r1.ebuild b/app-text/xmldiff/xmldiff-0.6.10-r1.ebuild
new file mode 100644
index 000000000000..5dc8a0594f3b
--- /dev/null
+++ b/app-text/xmldiff/xmldiff-0.6.10-r1.ebuild
@@ -0,0 +1,22 @@
+# 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="A tool that figures out the differences between two similar XML files"
+HOMEPAGE="http://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=""
+
+DEPEND="dev-python/pyxml[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+DOCS=( ChangeLog README README.xmlrev TODO )
diff --git a/app-text/xmlformat/Manifest b/app-text/xmlformat/Manifest
new file mode 100644
index 000000000000..4287b03e2771
--- /dev/null
+++ b/app-text/xmlformat/Manifest
@@ -0,0 +1,5 @@
+DIST xmlformat-1.04.tar.gz 156498 SHA256 71a70397e44760d67645007ad85fea99736f4b6f8679067a3b5f010589fd8fef SHA512 e45471accf0c04e016d3a9a5bbc2f984a9a76e1d5406a80300bf9da9d04bd78b67716055271923669462b70a1713b94a1e1937318115dfd9eb9d258b69a3c14d WHIRLPOOL 0d509c8248ccfd17306f6a75017e2e8199b95d4b2c2dcd2fd622615e041aaac7ae914bc8e911d2a29c6b2aefe3d922698d490dfc89201b7cc76f73380ebcf5fd
+EBUILD xmlformat-1.04.ebuild 971 SHA256 c69a87ff9cb9138cfcf2364323502f34b0396a498cce91cb18179a14352e6c73 SHA512 17e172138d53d3c367a8c3ba238d91f71b63a499d19436ef68b3ad6b3ea08580de7b36cb608bd7f80db8756c37bd61c4897cd7c5334a2d307f8c023116fc97a7 WHIRLPOOL f703ebcfd50a1e3f16034765c53acd5e4cec62b5b3ed48947704060ed3f5e4cda329bb4a6c5e2c0c40307c4d600c36923f93a51dc332206ceb99afcc93e13391
+MISC ChangeLog 2678 SHA256 ef133ac9a87aa3562183d875961a47d6886bdd09b2c4f58f6d7578ced73e6248 SHA512 05cbc3b93a4dbb3b084af2d57613269d2ea2110bcbc5937b5671e808cac437f2f7f8c0cfd1b96bdbda074374f7aa24d48b72f99686b0deb9b16f64315ec934de WHIRLPOOL e22bf16a732573124b796b640f11dc61d9fb519c5ed19063d9582bf6081c04169d8f12e70e27f5282f63a3164d1a7c6284aca0edf5cc1dd56c4171a4eca20923
+MISC ChangeLog-2015 1926 SHA256 6cb306053c76c3e4d0817a1ede149cd2f4858473a4cd07686502a75649cfdc61 SHA512 9433ba6e4b36c15d9f3e342dbcfe5f8d2baaaca9d0214dbbab7f7ec4c6f3623914d4c20092bc9ba424bf4d0da4d5c21f496381eacf5908e57e9809135cbf9991 WHIRLPOOL a45ff0f098422b86c85485a0552adaf689db237e50b44278f4ded049ca4ad347ec3bffb36025a7f70bfdfb97051157d587754506aca8c5101409415da75caed6
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
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..e774cbcd0e1c
--- /dev/null
+++ b/app-text/xmlformat/xmlformat-1.04.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+USE_RUBY="ruby20 ruby21 ruby22 ruby23"
+
+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/Manifest b/app-text/xmlstarlet/Manifest
new file mode 100644
index 000000000000..a6d90023ba60
--- /dev/null
+++ b/app-text/xmlstarlet/Manifest
@@ -0,0 +1,9 @@
+DIST xmlstarlet-1.4.2.tar.gz 407336 SHA256 e3d7dc273aa2e2516d3ae3fb6fcc0aba446f1a63ef944d52e01023b76cab9e5d SHA512 4e29825b503212d3dd436b892bdedd371af65dabbcdc1b0ff09dfe440fd3031c5c8c3a9b69903bd196c62ff944d9f91fe556354df6b90b990fbf6ad72be4ad33 WHIRLPOOL 05fe647cf14eebcd8c33bde5d7cfb116dcbdc2478b83fc88364cb720aceba9d871c49a7a04b3420ce4162b75c31f376fbffd6f42877d07a43aa3e4f0d51344cd
+DIST xmlstarlet-1.5.0.tar.gz 414036 SHA256 47b4ed042ea2909257f2a386001af49fceb303f84da7214779ccf99fffc6bbba SHA512 7f2626ae724d943c4809d9772c39dc36c7050fa105aa607d368d74491582551798750e15ff00bde6d8bf1b459543d68375e670d7c9c9eff43a117c1410226ec3 WHIRLPOOL ebd417e224a111a1c29df54a5b06cbe36ecff4947d7dffcd32fd879b8084e19d83131e23e035a2861830b0b7e4f0db333eed679891238faf06c7d02cafb95149
+DIST xmlstarlet-1.6.1.tar.gz 420923 SHA256 15d838c4f3375332fd95554619179b69e4ec91418a3a5296e7c631b7ed19e7ca SHA512 4228df812caec7059d7a76986c4d9a4262bd861cc53dca05f341ae6c062be05f1c39fc637918ab00f60f40587c6c556e3c9bfaf8a18b149e3c321a92214dbe8b WHIRLPOOL fdcb803de630d98e5dd81b8ea3656d170a7142fa8dba9c43a1102cd44840c381fd8a2ac968707c894db697af590df33bbf0fa24ee37f6a0c7f847c989a55df5d
+EBUILD xmlstarlet-1.4.2.ebuild 933 SHA256 5600351edee170a4a7c2789f9b691cecd8e357fdeb92f47ef0ca92423cdebd54 SHA512 da3cb776e745b44a327efef4f82f3104c86fe7e5dd5f634a3a1acb6d92479eef855515dff5e5dc61eda0c407d8039d3a8884a0bd224d644ec37646b38dedc490 WHIRLPOOL f8faf4845648ea79470a8e3d8b70cada31e8848d246993412a3b6c5d4f8497167b3b1b1b92afba242cc586b22e3af491f42689af23f17c88070a09147bc4476e
+EBUILD xmlstarlet-1.5.0.ebuild 933 SHA256 5600351edee170a4a7c2789f9b691cecd8e357fdeb92f47ef0ca92423cdebd54 SHA512 da3cb776e745b44a327efef4f82f3104c86fe7e5dd5f634a3a1acb6d92479eef855515dff5e5dc61eda0c407d8039d3a8884a0bd224d644ec37646b38dedc490 WHIRLPOOL f8faf4845648ea79470a8e3d8b70cada31e8848d246993412a3b6c5d4f8497167b3b1b1b92afba242cc586b22e3af491f42689af23f17c88070a09147bc4476e
+EBUILD xmlstarlet-1.6.1.ebuild 933 SHA256 86e948db9cd2595575e13ec4af52edfa36af4e98356663ab55dfa04f643d5d67 SHA512 9907ecd56ddc3e689799ffd69078957c240bb39ad502317733d9d021605d0b26e22f67ae511b1a3ce194d58fa5ef6aa95df7536046168c18eb73d976aaeb3bf9 WHIRLPOOL f334de427b322bc6d6c9d9fd7f30536e06724732be4c50019a62ed141c6b06cb7e2e6521ed97105159f849751f8c3d60e7b602567c9509b46d302141d590fc08
+MISC ChangeLog 2519 SHA256 79cd0644deb8af363f538c90c864b300a0c7d4da6bf7869c146bee790d6e5e67 SHA512 94a3ce35f5364d2146bb7ad57230117e8af6f8e7d64d01c0f4887eba8c863b9f67f3b8edb8e46ee39cd6fcd56ff6382a420798d9831a3dac556702dc33f9d6c7 WHIRLPOOL 7588a915552cf48bfe10a0b752703c800029c5a16ba425e284ff1464c344a2b468f1bef8e0245373b9bb4ad5baeea3b27e655c639109df9a8d3e3cc19803c588
+MISC ChangeLog-2015 8706 SHA256 bf9223c678bb94a95df73d481b049ccf4b955703fc4ece0c3dcac3e403e9b3fd SHA512 a564396724a586d0c5fb59b19b34d551be373fb779ebaa452166775e1f34fc149e1d264a8bebd0cf541eeb4cf01cc02a70eb63460054f963b22f9b59887569f7 WHIRLPOOL c163e0affa94ea88bfbd08757b3dba2d0d0da6b5fcc2c8e636d856dbe7173a2931fefcf85bf43caf78c84ee605c678149b5db428fdf199eba5e238e6fc71b2fd
+MISC metadata.xml 293 SHA256 724ae9e52fceb92614adecd058565b278d9928ace50f51e0caa6200f797dc0df SHA512 9fd9f809f74a272cc9abb789f3e08ab9b2ecdd1f6ca3931f43567b3b2e3423c0622bd3cc52f5dceac6989282351400fe9c1554ec2b69439986902b11f589796d WHIRLPOOL a8d5bce61ce5003c0ff6f14e6eb9b12ff558249d8060c13b48bf5e3558597fb42154a04f9c6728f35536ac62a8e02b6fb600cb81e070c01c8273823185f8db52
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.4.2.ebuild b/app-text/xmlstarlet/xmlstarlet-1.4.2.ebuild
new file mode 100644
index 000000000000..83992e77afbd
--- /dev/null
+++ b/app-text/xmlstarlet/xmlstarlet-1.4.2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2014 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/xmlstarlet/xmlstarlet-1.5.0.ebuild b/app-text/xmlstarlet/xmlstarlet-1.5.0.ebuild
new file mode 100644
index 000000000000..83992e77afbd
--- /dev/null
+++ b/app-text/xmlstarlet/xmlstarlet-1.5.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2014 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/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/Manifest b/app-text/xmlto/Manifest
new file mode 100644
index 000000000000..670a1f91d970
--- /dev/null
+++ b/app-text/xmlto/Manifest
@@ -0,0 +1,8 @@
+AUX xmlto-0.0.22-format_fo_passivetex_check.patch 2286 SHA256 64c1df49f92a44d4219c10b60e60bee34063fc6b99ae5f0ed1b14e11b27ea16d SHA512 c8eeb3dc909431dd2fb9f5286b6ee98a40dce80a29606a9884bdab50c039ac90097720b9b968dfac76546492844de0b72f2f6c937da14b47142ad81b897023f4 WHIRLPOOL ae83df73b7682f05b6e048aa7908331ef5b1ece0f2a40dfb968bfadd1991611fb998edd33dcef2984f0e5259e11a597a1620f9025a1f2d98554bd96da52b18be
+DIST xmlto-0.0.26.tar.bz2 119819 SHA256 efb49b2fb3bc27c1a1e24fe34abf19b6bf6cbb40844e6fd58034cdf21c54b5ec SHA512 85110f22a7b5a5c8de4115ae5d0391645a223191b17455a4f9539b02f56f7003fd4ba70e48f0e5e46cdb91220a9027802e725f88ca8659e3ce1576f8609ccd18 WHIRLPOOL f7ded4ceb65adcfc7c06bfdb8a3d22ca7195c098b5bcf26b3884111f536b72efbf5e642eeeee8be17d4a33db3accc139d78178dba2fe5a98037712048c2410e4
+DIST xmlto-0.0.28.tar.bz2 127921 SHA256 1130df3a7957eb9f6f0d29e4aa1c75732a7dfb6d639be013859b5c7ec5421276 SHA512 6e0c4968d4f1b7a3b132904182aa72a73f6167553eabdeb65cfafa6295ef7b960541685769d04144207963cca77b0c44db4f9fbb2796348ffcb37b3b399f18f1 WHIRLPOOL 4adbd66f85ed0ca90cb122dc08f9817d82e0b2bd417ae2ca8bb97e1fa3e301ab344d1ff9b9dec8571a6a519f1e0a80f0ce133d2618a211a64b0982c0b2b8c5f6
+EBUILD xmlto-0.0.26-r1.ebuild 1394 SHA256 27aee9ffd5aef12b1695d0849ba15d00442e15a070ba9f88233a8c17edf0aa89 SHA512 464125df8e6123886a7bb032544460e34d3fac328800f8a099fa3bbbfe162b2bfc2accc5dee39c65a11dc57e49523a7f8bea4a72a7b534487e92d9a7d24a5c56 WHIRLPOOL 74b0b2b21ed7003c410d3e7d809b5442816585771951dd94386bc94f2606c142a286f376e9e22b67d0a449ed5396b2bf982606bb74274f42b3882c73206f4437
+EBUILD xmlto-0.0.28-r1.ebuild 1406 SHA256 861137815545632fb61d697b9b641a19e4f6f40b0fd09adf78505d641ccff3e3 SHA512 e7c6e876c892f9596c19fd10f06b5d8d69f92ab55c9cf92624a1c87545c737bbc8f57ac8b952c02985c4a6385b42d97c0b904515120b0369cc0714f478eccc21 WHIRLPOOL c2334262be9de0538c0caaf02e6b3e7957e2412fc7c72e9a216924cf09cd2a453d3e1376e06842b20946016a7ac3e97ffd16bae21dfe3304cb7fa174ec14f3f1
+MISC ChangeLog 3521 SHA256 8b2e90c61add15760ba829b26949e4533f30ae5fbf1240331efa38bbf5a26463 SHA512 4b5aef60fcf5d0afcdafe36e99abe9e3eb5892279e3dca2302eb08307aae1192d301786fa1eb25bb84a7f6d38468fb671f6b8e859bf2beb397d57e4685d7868f WHIRLPOOL 3d31d93b06d6d0650c8175a12186060654635333b3362e1bfe31bcab5154c36eba256a9efcb990071eead8cab68bd6490875feb727a1d7d921c033dd4ab69048
+MISC ChangeLog-2015 12889 SHA256 664e2564cde09621649415b636efae8d8b846c5eaef9dea2eccc321b519721dc SHA512 962a84dc23501ed2699789e4383ff4085b9d14353f6375254bbdec8de766a34b106eeb1f859a4f7dc28209311443c12911b7362e5520bf9a5e42d9700bfcb96c WHIRLPOOL 30dcbad24d85623a3cce1607d6a4181ee34a8f3847a2c1b0589035ac9ce511d2802c6f167c904dbb4985c70563d934265a55f03867751b542d40a613993bfbcf
+MISC metadata.xml 247 SHA256 8afdfa1e3d4e32c0657326871389067326bcc1dc1ca57efd4165808c6c649ffc SHA512 f2b92e9bda8e4466d98436c15ee46b2a382afa4bfcf868678bb245abda936298ed41d03f3dcf5a61000ae1b1031a5578635e15293d63c531773d6a42d356af47 WHIRLPOOL 0e83d34a4f68934b022a4e0fcd3b60de44a8149fd6faf62176d15288eac700ca1b62de073912f7a2e61bfb2023e1ac1e8364642576135e0c631229fb3603e809
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..a09fe62fa98f
--- /dev/null
+++ b/app-text/xmlto/xmlto-0.0.26-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 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://fedorahosted.org/xmlto/"
+SRC_URI="https://fedorahosted.org/releases/${PN:0:1}/${PN:1:1}/${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 ~sparc-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..2e79b5582e6f
--- /dev/null
+++ b/app-text/xmlto/xmlto-0.0.28-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 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://fedorahosted.org/xmlto/"
+SRC_URI="https://fedorahosted.org/releases/${PN:0:1}/${PN:1:1}/${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 ~sparc-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/Manifest b/app-text/xournal/Manifest
new file mode 100644
index 000000000000..6491a98edd3e
--- /dev/null
+++ b/app-text/xournal/Manifest
@@ -0,0 +1,8 @@
+AUX xournal-0.4.8-aspectratio.patch 3494 SHA256 3b870f38ef1c35ee2b3649bbfc6926fe44d68788f2861624a2d18529bc7c9baa SHA512 26f017ab04e857710ec380ffc70f75520f66dd1097b6cd15fcb599c44f4bcb0ec905859b4ad3e613fff1731e2fe83938f221081b314cc0e69bf3d07b4e54ad70 WHIRLPOOL 685e0dc937d75b5971777ff117f0d2cc2d12c7f22311e8940c8c2f340fc51111193916b2e8b99ee04f1f337c99de74c9ef3eefe97b2f75778b7346d2b9c51bd8
+DIST xournal-0.4.8.tar.gz 641240 SHA256 233887a38136452dcb4652c35d08366fc7355f57ed46753db83e3e0f3193ef30 SHA512 cfd5760a0e832ef02786a29cb744d4932aeee97c4d6992b430e647bd59aaef1042735203824d0eaf9da9b884dcdadcfb8f5acea221638db91438ae46a6ee42bf WHIRLPOOL 23c0c31e2e902e42602f62f5060078e878b42e558c90208bd3326054cb733115449b9f36571175d24af3f98164f674049455045968c7f2890370428d447949c2
+EBUILD xournal-0.4.8-r1.ebuild 1228 SHA256 412d164762f8bc3a0513d58f0abddeb12ac63177ed6c1aa953591802bc427e38 SHA512 a7956cc9a2e307b74f486f5f88bde00d19695d312ca9406659c1f741f124bd322b461ab1f894f11047db891159bb7449c6b6a9cd4250d551abb6e54821902ce5 WHIRLPOOL 90bfa5ccc2aa0b3d02e079f63563a43676e6bc56ef543d6935271a5a5f755d88a30310f9db1960b8ee2d67eb4459494b940745c413f4401a6d18b615da93f6f0
+EBUILD xournal-0.4.8.ebuild 1095 SHA256 dcdef388309ef9c5ad735f1b3cae3b8f864a8596c989fb19176d3732df1c414c SHA512 860585238a9257533af0104efac8664ad79c4bd2d716e502d3e18774968c62f0af8db43d658c706b0747e04fd03e7257df968685593513a0279d402568e76c8d WHIRLPOOL 12871e89676b8526f70ae2dde8dd43a3f696497b0a7744be0fbc0258c96826f10fb68e0a9e66d8b20c7f99ea724cdc6041f71cbd41ec4459a548e00406f651fd
+EBUILD xournal-9999.ebuild 1097 SHA256 5a83db1c4958f358d53cc0fb8c3c46af9bcb104ffe4afc08499d8f2ac95f3ba2 SHA512 51a02984a5e53a4a4ff79160a7872747b4c85fccf070395438fa47d21e8e515f77db4e64a4ca0588cdda042485ef50af5d426e17fe8891be48422a398347e8ce WHIRLPOOL db97e33e24e6315c089958dac06dd09ec1373b5e8e3c365bb6da4537b26e47e1e59aea8078875b27d756070a5f64a539eb9e3c2e3937874f51535df7682d39f3
+MISC ChangeLog 2883 SHA256 22743e8b652526136773bf8bc5f1b8875d5555ee49e6b740fccf5d4f750f7c05 SHA512 4bf055caf89ce0cf74522ac9769d1def61889dd3f7ce9533aa4ddc1a0f832159d93ed30115d475c3c8c423fc3a52a2ebc0200aac25e5fc9540b34fea217ffdb5 WHIRLPOOL 01f67018163a32be13c1a943e698eafc4b5089a99495530e8d0d847b0068fff57619b7cb6dc47116c022710b1d3273fa8f8b0687ecdb47182ef5809cb9654f3a
+MISC ChangeLog-2015 9099 SHA256 5e493bee0246faaa74dc4f545a6415d8ec1f3b29eedc851eef806c03c1e5ee0d SHA512 caece26cb100a7de34f234870358aea88ee3534e727881777bdbaf7b555110796439f67757437c5a561aad67c91553e13f6d428dd6e131b6564bed70736c6f73 WHIRLPOOL c666a82c6aa540935bbc22993cf488d0234739c61f00804664db2b7f98a0c12ecc0b4be6fcfc59e2e540f81042b1dd1badb4c8fdce48242ac3ddced01af68561
+MISC metadata.xml 652 SHA256 297f399438437deeaca95de3aec07f63ebadb33a97f4214c9cc3824d486a2786 SHA512 1105a21a4f228529e6a9bfa038e2f72cdc59bcb663b6206ec57daa3d779d0bfcff3cf1228418dc5031ba37da149dcacb897fa9562db39a4990382521d73a0648 WHIRLPOOL 0b33ab8bbac5966df6343e11f716f5d4e0c03d718e4fc32e48b22a34d0964de3912b7725c2f2a788f4ad25bec339421574f58aa4644f476c8e075ae03b426831
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..2d7a90544031
--- /dev/null
+++ b/app-text/xournal/xournal-0.4.8-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+GCONF_DEBUG=no
+
+inherit gnome2
+
+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"
+
+if [[ "${PV}" != "9999" ]]; then
+	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+else
+	inherit git-2 autotools
+	SRC_URI=""
+	KEYWORDS=""
+	EGIT_REPO_URI="git://git.code.sf.net/p/xournal/code"
+	EGIT_PROJECT="${PN}"
+	EGIT_BOOTSTRAP="autogen.sh"
+fi
+
+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.ebuild b/app-text/xournal/xournal-0.4.8.ebuild
new file mode 100644
index 000000000000..9405f5279cc5
--- /dev/null
+++ b/app-text/xournal/xournal-0.4.8.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+GCONF_DEBUG=no
+
+inherit gnome2
+
+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"
+
+if [[ "${PV}" != "9999" ]]; then
+	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+	KEYWORDS="amd64 x86"
+else
+	inherit git-2 autotools
+	SRC_URI=""
+	KEYWORDS=""
+	EGIT_REPO_URI="git://git.code.sf.net/p/xournal/code"
+	EGIT_PROJECT="${PN}"
+	EGIT_BOOTSTRAP="autogen.sh"
+fi
+
+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..9472f5a2e3ad
--- /dev/null
+++ b/app-text/xournal/xournal-9999.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+GCONF_DEBUG=no
+
+inherit gnome2
+
+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"
+
+if [[ "${PV}" != "9999" ]]; then
+	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+else
+	inherit git-2 autotools
+	SRC_URI=""
+	KEYWORDS=""
+	EGIT_REPO_URI="git://git.code.sf.net/p/xournal/code"
+	EGIT_PROJECT="${PN}"
+	EGIT_BOOTSTRAP="autogen.sh"
+fi
+
+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/yagf/Manifest b/app-text/yagf/Manifest
new file mode 100644
index 000000000000..8d502bf1202e
--- /dev/null
+++ b/app-text/yagf/Manifest
@@ -0,0 +1,5 @@
+DIST yagf-0.9.5.tar.gz 427018 SHA256 c0e9fe4b16d39378319fe37772403104a81c58084aa918e78347f56456ed5ebc SHA512 a0b77e49c11be0ed043d3f44b1c48122cdabf0ae4ae69d84bc01eee0a8b084dae8201234e08816065d449e4d47bd704f282b1cd3b31c3539d201e9f32dfef05c WHIRLPOOL 92a7c6f02aa1bdc567b9599e6a57888a880eeba111c18645f3987f6d350770ef492d8f0394f2b429daabab4843f496819299fb2e9bdca6f6e6d187d4e1facd18
+EBUILD yagf-0.9.5.ebuild 1544 SHA256 8367458f2f6ff54ca369955448c0396a62e2ca483c8df48c6553116fb5c16214 SHA512 5baceb14e795047d7a0cc9c9ef7c77bf3e8ab36055982d0f3b9268ea34caa3ad53373ebff3ae1fd7afaa3a6cb30125640fbbde1d8aa52433ae304284d485a004 WHIRLPOOL fd44280ddfb5157d4df8dfacf4add480a2e3a1c48140d51fae60af8ddfdfe5e92151daa8d46f166d5d811be3c1d37f6ea26241f91b9e5aa96cb3fe6594777236
+MISC ChangeLog 2861 SHA256 15bfe0e074d0d4f7fb67fa624542ba85aeec4d906e9ca79ce7a890157b897bdc SHA512 3cf0c1fc72a4ee5c087ffaa02ea41536d6b14ce0dbc33f0d964e58ae99113ac2fd9f98a82701c9109cefd131a7a675f368465d7cf566e59a5abbb3d906701d4f WHIRLPOOL e0c97ce54c475725de41ed30f84f997d45e6f2d01c6c0619495b03583628ca7a30bf26174a24f0f6585f11a2a9d82e85f51e8fccab0cce0f422050b5e47fea20
+MISC ChangeLog-2015 3988 SHA256 1d1f5741280c9506f82f01b6593794287015dbace51bb26a572cf983fc69bc05 SHA512 d6102e07920e84c02e47fb145e979cc922d114ca68b69d4591c369817a3a85627bd55dd00f992d21660f0ae8d7a9d374dcbbb34578e46b7c61a3f488db91d227 WHIRLPOOL 6cb79d249bb3903df455eac80fc83bd71e5781f384721e86d586d584c08026b3c6e6b900446b6dd76d2adcea797ca321f3445752965dd12ca3ebe84c5a00b16f
+MISC metadata.xml 1017 SHA256 36352a6e7e2ef183288de9ceecd828159b038e0d06d5ba94848a804620973592 SHA512 f7a240694f0fa6dc6f26f042d5d332acc2a255819c0b5a0b99d46220b747da94d9f345e0fb87cd631f7b6fabdcddde3cbd42ffd8e738e119034e1608749c094a WHIRLPOOL 5dda84281845b048570cd97aaa06441eef4dc18ce5e98a580cd00c86b7b50b4d2b669ae0e06accb767361c544801d20f6d854f1226c55b3e1edb9ac0c76cc235
diff --git a/app-text/yagf/metadata.xml b/app-text/yagf/metadata.xml
new file mode 100644
index 000000000000..76b22cdda21f
--- /dev/null
+++ b/app-text/yagf/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 -->
+	<longdescription lang="en">
+		YAGF is a graphical front-end for cuneiform and tesseract OCR tools.
+		With YAGF you can open already scanned image files or obtain new images
+		via XSane (scanning results are automatically passed to YAGF).
+		Once you have a scanned image you can prepare it for recognition, select
+		particular image areas for recognition, set the recognition language and
+		so no. Recognized text is displayed in a editor window where it can be
+		corrected, saved to disk or copied to clipboard.
+		YAGF also provides some facilities for a multi-page recognition (see
+		the online help for more details).
+	</longdescription>
+	<use>
+		<flag name="cuneiform">Enable support for the <pkg>app-text/cuneiform</pkg> OCR engine.</flag>
+		<flag name="tesseract">Enable support for the <pkg>app-text/tesseract</pkg> OCR engine.</flag>
+	</use>
+</pkgmetadata>
diff --git a/app-text/yagf/yagf-0.9.5.ebuild b/app-text/yagf/yagf-0.9.5.ebuild
new file mode 100644
index 000000000000..3ebcae73386e
--- /dev/null
+++ b/app-text/yagf/yagf-0.9.5.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PLOCALES="fr ru"
+inherit cmake-utils l10n multilib
+
+DESCRIPTION="Graphical front-end for cuneiform and tesseract OCR tools"
+HOMEPAGE="http://sourceforge.net/projects/yagf-ocr/"
+SRC_URI="mirror://sourceforge/project/yagf-ocr/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="scanner cuneiform +tesseract pdf"
+
+REQUIRED_USE="|| ( cuneiform tesseract )"
+
+DEPEND="
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4
+	app-text/aspell
+"
+RDEPEND="${DEPEND}
+	cuneiform? ( app-text/cuneiform )
+	tesseract? ( app-text/tesseract )
+	scanner? ( media-gfx/xsane )
+	pdf? ( || ( app-text/poppler[utils] app-text/ghostscript-gpl ) )
+"
+
+DOCS=( AUTHORS ChangeLog DESCRIPTION README )
+
+src_prepare() {
+	# uk translation generation is broken
+	rm src/translations/yagf_uk.ts || die
+	# respect CFLAGS and fix translations path
+	sed -i \
+		-e '/add_definitions(-Wall -g)/d' \
+		-e '/-DQML_INSTALL_PATH=/s:${QML_DESTINATION}:/${QML_DESTINATION}:' \
+		CMakeLists.txt || die 'sed on CMakeLists.txt failed'
+
+	l10n_find_plocales_changes "src/translations" "${PN}_" '.ts'
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local libdir="$(get_libdir)"
+	local mycmakeargs=(
+		-DLIB_PATH_SUFFIX=${libdir#lib}
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	remove_translation() {
+		rm "${ED}/usr/share/yagf/translations/${PN}_${1}.qm" || die "remove '${PN}_${1}.qm' file failed"
+	}
+	cmake-utils_src_install
+	l10n_for_each_disabled_locale_do remove_translation
+}
diff --git a/app-text/yelp-tools/Manifest b/app-text/yelp-tools/Manifest
new file mode 100644
index 000000000000..8888248f63f0
--- /dev/null
+++ b/app-text/yelp-tools/Manifest
@@ -0,0 +1,5 @@
+DIST yelp-tools-3.18.0.tar.xz 210712 SHA256 c6c1d65f802397267cdc47aafd5398c4b60766e0a7ad2190426af6c0d0716932 SHA512 75957b06bdade966a33a41ecc68dfa3eb3b3e3550dc8c6664ee694c4b043c8b45a2403dd23c9810347ed7234ceb5389a34133554de012a7e0afc5db891525fb8 WHIRLPOOL 1a237128fd4306f41e2785f91dc616d2b526ff51b7c4f775caa333ddc6c701a4a65d8608fb2e09a248f4768a22db860b333c1e25f15c141a21c1ae3f93a93678
+EBUILD yelp-tools-3.18.0.ebuild 678 SHA256 818c9efcacecd14c398a4985621c6bee7e793f10f68c4776bbe6b0f8dd629660 SHA512 3ffe79f0f4a2a757a941061b7c9c7df2f4fd311845112c890d928a5aa20f66588ba2f418dc1439b35ea54727976bddcd36019807f80d9d41ff0cdb750c8b9449 WHIRLPOOL d511a7f7f3d7292cde95e7588341350332937b2396f20321029823de8cbd36fedaea9b8082baea7d8fb7289e5aae7742fdf6dc341e2a58438e8db74c339257fa
+MISC ChangeLog 5633 SHA256 ed430bdaa0d16752d23d1db2c70bc594ccb2eb3d271cbf19dfd90865aa812b18 SHA512 fa3a94304e5b96efb11a92a03e334840703b987e48c05c1d21a93ff62439f36ce73faac844f0b85ac4b41a21af78a15c3c109590ffeb34bc158e5161a90831f0 WHIRLPOOL 139dc578a44fd3a0a5548e370d8bae0126cc9ee39da9f8b75eed7d61938a28dbd4cb5c0870ace83da39c21b4c411f0f4114d747314782488a7ee6bdcffd07a93
+MISC ChangeLog-2015 9253 SHA256 d53f7afb01ee1a125846327f062fb0a0bb7ac7dcb4064df5bcba1f76d71ee561 SHA512 62951746928d44de7d3cd7a3c285f852fcad175ea1d76f9bc889ed6718fe866a429c9aa6f790d9e9b20c46c4d02303cef2fdc53cfbb57cac8a968326d70e47e9 WHIRLPOOL 10880582577aaf9fddae1ec00c4dc3a9f4cd0c75f840fadbe4fc5215d0bc03e2cedf3176359581336b2c487c8149318a9334ce547ba97669121ad27087beb87d
+MISC metadata.xml 249 SHA256 4505b0bfeadff287958620b7dc7b7209699065a8f17139a237a5dd409a726a97 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 WHIRLPOOL 333a938ee1d2124595596c572697bf5ebad523a92ba12005cfb12e6bb6270881a94a911f0cc9c1cf2bb571559e8271e07dfd307dabe50058236dbe7103562b92
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..c1a7c1f07b3c
--- /dev/null
+++ b/app-text/yelp-tools/yelp-tools-3.18.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 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/Manifest b/app-text/yodl/Manifest
new file mode 100644
index 000000000000..fbab8930a3cc
--- /dev/null
+++ b/app-text/yodl/Manifest
@@ -0,0 +1,9 @@
+DIST yodl-3.08.01.tar.gz 283634 SHA256 958497939d9f3d1c6d0e2e74f7592d5a98f9ddb6f95c50c1247e41600d2765b7 SHA512 a88ab79657661262f4ccce4fd307ba41a05bcefbb534a2b5ed84115ab592ddf3ce883747aad5c028e73142ec91815ee86e1ae16ab9d319fe2045a2b0a08ab42c WHIRLPOOL aa9d9c0d58da0d5dbda3acd4f4f5fe5867873a23fd0f133404a6be9965001c1326714fc05296fa2a91912fe011391dd51819a40d2ddecfd7d99cfd8ac833339d
+DIST yodl-3.08.02.tar.gz 283890 SHA256 19264d7a1ed00edaa896e41b5aeacb722a4ca79dd6958731229f1bd1d1dd91bc SHA512 adad9f6235288f0ae6990c0dbba3cd7c8461172ae83231ca8fa113275d04ad20d3722e70f6f0ffcf072a19b4816e556b9b09227123516fc4a0170bc053b48b8e WHIRLPOOL ed3b5e0cc141f6b0c84191791f86af361cddf1753c2080eb8bc7f43e0eae78d329fd00b16a98bb14f1f2d93d91aab9b3a7947e7e065fcf2b4706fbfde5d9f868
+DIST yodl-4.01.00.tar.gz 288932 SHA256 06dd62cfc5f2ff69fafee15b0c0923bf37e1f7546d27f32576489acbd2cfcf06 SHA512 f195dec8e03b83561b47f9bd00fbb0fe711bbc254c32413d748587d8bf3848e050b90a2140977bec5a335021b2ef49ec5a6b0ca89f1649def495d81c3e7b437f WHIRLPOOL d0d2c592e958849cb4d8a881b4dc459dc0181fc41dbf9de949930091225348fc7fde7c698f110b92e853db8727969b5d3fecbc9bea46e093071c16edc08e969f
+EBUILD yodl-3.08.01.ebuild 1136 SHA256 bb77c48a925c3429c728aff1fd1868e294be8b665f1237f8c0a6e04d58811780 SHA512 f727ad890409b4f8bb900d1e56a4bf21cc76162fbc6d2deecb664f0c37e3435415595e6b9a3f63442d16069009a2454e22cf8407bca4158740e38743141c49a0 WHIRLPOOL c52891aae1da8496ef9e9c7506bb08328669bd121d1d07fac65b31bfb21235ce3402fe7be2afce1d461d86a96851fadb8b1a011128b408aaed132889d10e1a7b
+EBUILD yodl-3.08.02.ebuild 1136 SHA256 920f9c785460dafff3f7c1039bc686d94ef7393975f3a19e4779843f8bd7ce43 SHA512 dbd05b7eab771c07e1d57d113d165f0bc54e47fd0762ae5dbcd908c8ced6b29000d3b5c241813126b1d0b33efbbfe2fb14cb98eb7ec5f2beff3afa5cd188b6c9 WHIRLPOOL c087453d615177307e03dfa5f00b5f8c8a8d06698ce8ee23b8e59cb2a2327d78fd6570790277e93fcc330f685a578172c73d9e3f96e6697f53ccc5f9f310a66e
+EBUILD yodl-4.01.00.ebuild 1136 SHA256 920f9c785460dafff3f7c1039bc686d94ef7393975f3a19e4779843f8bd7ce43 SHA512 dbd05b7eab771c07e1d57d113d165f0bc54e47fd0762ae5dbcd908c8ced6b29000d3b5c241813126b1d0b33efbbfe2fb14cb98eb7ec5f2beff3afa5cd188b6c9 WHIRLPOOL c087453d615177307e03dfa5f00b5f8c8a8d06698ce8ee23b8e59cb2a2327d78fd6570790277e93fcc330f685a578172c73d9e3f96e6697f53ccc5f9f310a66e
+MISC ChangeLog 2959 SHA256 4c228ff25ce720aad2a7c3346ff8ac042520103ccbe5aa4295cba4a2a2de272f SHA512 20dd280be03ee139828d24ba81b0e9928b69f64ff08e88165646f8b902502cdcaeaed6d998a171ad00de183df7b9c93da8929440a4e10015c00bf36488facabb WHIRLPOOL dcf9c4e0abef8d8a4c973967ddc3184c9201469a331ab3a4b652c6f3cac83ec2d52f4131c6ca71af8b2369b792577247c6d142740a62c71b8fb1e8ea608f0069
+MISC ChangeLog-2015 1231 SHA256 5cf6a60a159bc52fae16300ce1825cc95566e0d4e95046a638d623f04c6f988e SHA512 b195776eeca3c2e71d346e545aa3f02278c5555875b6b7e2268bd37526bc6778663f6d8e74f2b9c5d072c63aa2ce8143ce06c4295907857a9568d927b2cb6b7e WHIRLPOOL 496b230ebc2e9c7ed3c9c805211177437f4f9964652de17dcb88ee34b295781edcf7ab1b1ce82bc70afc26ebf8eefd97c1ee300fb05626fdcb8867c46b46159c
+MISC metadata.xml 372 SHA256 b8694f3c33f22f921279ea2302cef0d2d2fd65619b1ba4b35f707afcefd6fb01 SHA512 12928d8f1683c8158ad34c23c10670585705055f8360861ea2cf09078811d07d74699515f2903a388e00920916e7b6100865fa39cbefb49a86a214b77d74dd04 WHIRLPOOL 6264a3bcca229ea806ef566fc5fcf21c4211f45dbdbcd6fe13940adf715af57284cbadad174013d4a4cc4d08a0598f3e1e8279bcafed36972d0cde0d456e8f73
diff --git a/app-text/yodl/metadata.xml b/app-text/yodl/metadata.xml
new file mode 100644
index 000000000000..80759087b9cc
--- /dev/null
+++ b/app-text/yodl/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="sourceforge">yodl</remote-id>
+		<remote-id type="github">fbb-git/yodl</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/yodl/yodl-3.08.01.ebuild b/app-text/yodl/yodl-3.08.01.ebuild
new file mode 100644
index 000000000000..d47e55feb203
--- /dev/null
+++ b/app-text/yodl/yodl-3.08.01.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2016 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-3.08.02.ebuild b/app-text/yodl/yodl-3.08.02.ebuild
new file mode 100644
index 000000000000..8c697af720a1
--- /dev/null
+++ b/app-text/yodl/yodl-3.08.02.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.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/zathura-cb/Manifest b/app-text/zathura-cb/Manifest
new file mode 100644
index 000000000000..ed0d95661d1b
--- /dev/null
+++ b/app-text/zathura-cb/Manifest
@@ -0,0 +1,8 @@
+DIST zathura-cb-0.1.2.tar.gz 6636 SHA256 72b20e2de452ccb8428fe0007bf12cee06c3422eac8e5e3b2c0ecbc9848850e0 SHA512 bc2c8c846e40ee17aa9df989ca019382d1e4b3074376431c1a2f8190607c4d200ed159de161b8cbb1800bd1f494a770691fec803bc8ce661fe317cf753efc4b7 WHIRLPOOL b0f8c3e67842c7e9469b4d3d21f27fb15ad29bfef5540556c8ae6c23e1bbecc368e3cb60b9f4f8882cdb9d26ddf88f9d75613463acacde23d415f8b4c9857061
+DIST zathura-cb-0.1.6.tar.gz 7205 SHA256 888e95421e13b944d19604fab129e5992636f404e7ed20751d4f50546f2535ba SHA512 986293957b6bc5e5fe7033bb7c91e857b1089fe1a041eb39e516b4e906c2619d22d7ebfa0bfaba982cc6145cba4c6a2af01be810c6da71f4c862fb42bc91f230 WHIRLPOOL 38822f4280c9589ddbf59e480e6b1788fa1fb8daa4be2c262ff239429ba23da39f5e7116cd3ce4e3f4637b41e6b68e61a7f5acb8612f40d6ddb24011d4441573
+EBUILD zathura-cb-0.1.2.ebuild 1055 SHA256 0dedfabf022c9ce8387f7626d614ede603158b3d2663f15a972109896ee877ed SHA512 1417187fec7a17d179f5f8347d8a96ed0094fb3513d7f405aa9566bc01ae859880fb785abd1776817ab64dac1b04bfb115f49eed0ad8802012e98b82b01b970f WHIRLPOOL c630a5ad9c16e1928f0c881ae467dd6d72187dea2d34d6ec68de4ebfecc5e64086107338fb118716bfe55a153d3e4ce5c576fb6af4197c616d2d0efb60871594
+EBUILD zathura-cb-0.1.6.ebuild 1197 SHA256 5cbda864db68ad5d2207a56b0f0efa90148319a7cda61995b735a8a62c0a47dd SHA512 0355265692e55d470503503a1a6dffa7fc2c52a6c5abfd2132fd5a73900d7bbfd2a8ec82a779bf784d6054cf25262d4a5230397306213c9ef97fab41f25fd098 WHIRLPOOL ecdef4b26c5d8e1fbe0e15836f2239fb43bf84abd6f4b311a3b69eec2781d0f2c069b5d7b46f755370d3db9a52fa7f585e0e240f146e54d87093b1e443e000ab
+EBUILD zathura-cb-9999.ebuild 1217 SHA256 de1337adc9336e1066528f0699e3b56dffe78577a81a0b2b9c8494efabc8bd14 SHA512 9b56596bfaa0194fb273c724f13a4c88368d10e94d3b32a44aee318ad7eb750d8c6809861e7f91afbec51fa48acf470a40ad6a7cb484eb0fb88d4d0bd64041be WHIRLPOOL 4586520bc65e076130f9806b2529f69aa0a64323fd756455f6769d6cdc6aa05181e8d7c15992f04ef324b0634e08e417755ba793b5eb98604c0859f5cfece2bc
+MISC ChangeLog 2978 SHA256 079ac34934bd2ec2891e6dac90ce7fe11e6278cd15868eeb1fdc7f624a338497 SHA512 d6092e72d6bcbd666aabbc69c1719b615d86d791cdee6f886490a0f1deb93b951ac3f71cf2e973553a9b8caf5a22dc6bcf499c8f3ffcabb51683a354124b6f44 WHIRLPOOL a856a1553fbb76f6a6075ee4031ca4da9d01ea07dafb00771e6112ad34586cd7b9cb473569d0d3a68f63686512ae7dbe08a0b82c3d01e82a2ab4326e33baa169
+MISC ChangeLog-2015 2522 SHA256 69883c85859cde216305bb75427183a8a9fec2318a9a52c2d30ef6917660cd73 SHA512 1d5a0d002804b5c70470c4ca22d219172bcd8aa09a686bc0858a3ff53cfa9b060896f78eef27c179d6d4ce59e85eaf2e8bddb73931f6f5638b749a70021b1a95 WHIRLPOOL 4f29086a41965c3b23b3c4773ddcc8eb70d33205ce0ff635b9d9e0046c876721a499fadfc8bc5d11da7c8fe65bf5d22640f95c68c39d0317b584304c4821b1a7
+MISC metadata.xml 702 SHA256 078e6ceee35b5db47fba84ac70df47592846271147f9338599369eb90e86a5a6 SHA512 0f416ccc5110783602c76a1b2670f22c15104a2868d23b635180faf4993d3879198c04fc29e7a8d23b13105bd6b2268d9d7877a0e36dbab1726919b3d5c0a37f WHIRLPOOL b9d057dcb7a3538bbf4c22a9dc23a2c860a6d3b1d7227c4e40a32d31dd806bfd64bca86b4ce20950577d7a2a2d6f020b53d0e9d7636ffa29052d4dfde19237e8
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.2.ebuild b/app-text/zathura-cb/zathura-cb-0.1.2.ebuild
new file mode 100644
index 000000000000..82427371fee7
--- /dev/null
+++ b/app-text/zathura-cb/zathura-cb-0.1.2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+[[ ${PV} == 9999* ]] && inherit git-2
+
+DESCRIPTION="Comic book plug-in for zathura with 7zip, rar, tar and zip support"
+HOMEPAGE="http://pwmt.org/projects/zathura/"
+if ! [[ ${PV} == 9999* ]]; then
+SRC_URI="http://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz"
+fi
+EGIT_REPO_URI="git://git.pwmt.org/${PN}.git"
+EGIT_BRANCH="develop"
+
+LICENSE="ZLIB"
+SLOT="0"
+if ! [[ ${PV} == 9999* ]]; then
+KEYWORDS="amd64 ~arm x86"
+else
+KEYWORDS=""
+fi
+IUSE=""
+
+COMMON_DEPEND=">=app-text/zathura-0.2.7
+	dev-libs/glib:2=
+	app-arch/libarchive:=
+	x11-libs/cairo:="
+RDEPEND="${COMMON_DEPEND}
+	app-arch/p7zip
+	app-arch/tar
+	app-arch/unrar
+	app-arch/unzip"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig"
+
+pkg_setup() {
+	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-cb/zathura-cb-0.1.6.ebuild b/app-text/zathura-cb/zathura-cb-0.1.6.ebuild
new file mode 100644
index 000000000000..f7465379776a
--- /dev/null
+++ b/app-text/zathura-cb/zathura-cb-0.1.6.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils toolchain-funcs readme.gentoo-r1
+[[ ${PV} == 9999* ]] && inherit git-2
+
+DESCRIPTION="Comic book plug-in for zathura with 7zip, rar, tar and zip support"
+HOMEPAGE="http://pwmt.org/projects/zathura/"
+if ! [[ ${PV} == 9999* ]]; then
+SRC_URI="http://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz"
+fi
+EGIT_REPO_URI="https://git.pwmt.org/pwmt/${PN}.git"
+EGIT_BRANCH="develop"
+
+LICENSE="ZLIB"
+SLOT="0"
+if ! [[ ${PV} == 9999* ]]; then
+KEYWORDS="amd64 arm x86"
+fi
+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"
+
+pkg_setup() {
+	myzathuraconf=(
+		CC="$(tc-getCC)"
+		LD="$(tc-getLD)"
+		VERBOSE=1
+		DESTDIR="${D}"
+	)
+}
+
+src_compile() {
+	emake "${myzathuraconf[@]}"
+}
+
+src_install() {
+	emake "${myzathuraconf[@]}" install
+	dodoc AUTHORS
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
+
+FORCE_PRINT_ELOG=1
+DOC_CONTENTS="Consider installing app-arch/p7zip app-arch/tar app-arch/unrar
+app-arch/unzip for additional file support."
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..227a2188c278
--- /dev/null
+++ b/app-text/zathura-cb/zathura-cb-9999.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils toolchain-funcs readme.gentoo-r1
+[[ ${PV} == 9999* ]] && inherit git-2
+
+DESCRIPTION="Comic book plug-in for zathura with 7zip, rar, tar and zip support"
+HOMEPAGE="http://pwmt.org/projects/zathura/"
+if ! [[ ${PV} == 9999* ]]; then
+SRC_URI="http://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz"
+fi
+EGIT_REPO_URI="https://git.pwmt.org/pwmt/${PN}.git"
+EGIT_BRANCH="develop"
+
+LICENSE="ZLIB"
+SLOT="0"
+if ! [[ ${PV} == 9999* ]]; then
+KEYWORDS="~amd64 ~arm ~x86"
+else
+KEYWORDS=""
+fi
+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"
+
+pkg_setup() {
+	myzathuraconf=(
+		CC="$(tc-getCC)"
+		LD="$(tc-getLD)"
+		VERBOSE=1
+		DESTDIR="${D}"
+	)
+}
+
+src_compile() {
+	emake "${myzathuraconf[@]}"
+}
+
+src_install() {
+	emake "${myzathuraconf[@]}" install
+	dodoc AUTHORS
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
+
+FORCE_PRINT_ELOG=1
+DOC_CONTENTS="Consider installing app-arch/p7zip app-arch/tar app-arch/unrar
+app-arch/unzip for additional file support."
diff --git a/app-text/zathura-djvu/Manifest b/app-text/zathura-djvu/Manifest
new file mode 100644
index 000000000000..7292403e59c1
--- /dev/null
+++ b/app-text/zathura-djvu/Manifest
@@ -0,0 +1,8 @@
+DIST zathura-djvu-0.2.3.tar.gz 11181 SHA256 c16e82d525012b788fd01c4189df93708fcffffb7dd34ca09db55005d644ed89 SHA512 6fd9c1d367d02402bc5eaedd853ed0d37aee61a682772c3c2dd543d98c03d85b32cd2b4af4b7f7a6390e97206aa881ebd6df9783e7abf4222352fb4d57de4850 WHIRLPOOL 447aee58bf3c0e9baed6d9d60505245777fd38be8bb2ae4c2f387a98afe334a01cd870995884f99d073904ba6812120c6660d88864bc3d38798d94e1c7d9cd76
+DIST zathura-djvu-0.2.6.tar.gz 11137 SHA256 aefef6a3b702fa06145f16f2559490f4d96d3206bafd4e0c78ac184788cac05f SHA512 8534faa0de896ffea8d8d6f2d0c22697f2fd6ae3f73e955f5077e0a0656c13fd8823580f1b89c4b5aebb5189c69642ef690fc9167be178ce9533e9bb5d483dac WHIRLPOOL e664ee109279176d09d250d4df452f579d20605df4d843f36a68b15e7b5fdba6c9551a25c86056df3e3d3598043c946498f77d19be11ac502e72523f8b95fef4
+EBUILD zathura-djvu-0.2.3.ebuild 917 SHA256 a4c51e871d6c57a973bbc35238713323ce27c01f45ae8f4acbd9b1e0e76bafba SHA512 39e5db7b40f7779eeef0e1f87874c0e27ed51aa6b69b64e732c6cfe40625e0449c85693759ac5d95fa9e328a7876853f46a5031ba39c29c33be1336bd919716f WHIRLPOOL 9aa9f4e280e038d088008ab8f4b329320f7ebfb77c2c3c328320a9fe02392f454beeb159a7f25938142a833510110ae10af7d11ec1e764ac019cd63d96a51aa6
+EBUILD zathura-djvu-0.2.6.ebuild 907 SHA256 fad3ad938453dde180d4f6ae2f4917c2336de6eb214d33a445b4498417030f1d SHA512 3729d9f8b567eab462d3737450400f61e5eda76676d84d90270cbd348ba4f2b5d7aeefa9c0c03ed9bcce53af866be7c1fa1103f2b9b3b112371f5fe4201e214a WHIRLPOOL 15ee4f56771eba5e1cf22423704623c00ae89dbe47c4bebcfc331b5372bba84cba7ed275c3da76422af3b48e20ccef53ddb14da9d360ff7376581b3b6add4fd2
+EBUILD zathura-djvu-9999.ebuild 927 SHA256 66cb7ee8bc273d6aac61f4637705729dae1b7288ab5c839657fe269f625dee1e SHA512 ed91612447925082ec5f4cb5568645b566899ef5cfedc5ab24a6a854d6c0044a4d03cb5caf0d7cdc351c0ecc2d8e77931c265848c9cc49fc97a3ca1b63f7c4cc WHIRLPOOL 3364991ca584f8552169a66fb396630f561706c920e92ec7681ac36b5340a0bddee7da3f5ad9e4ccef8fa3f79e7980a05f014703d3664169c499d059bc65d8af
+MISC ChangeLog 2916 SHA256 7a1c06098196119399a9e8c67577a4213d689fd84500437df4f035542e0d40d6 SHA512 7b2548f08e9c6c533c7aa2bd320be33049d82a1b4b31ab268077fe2a3040d6a44fb8ab29e317753f805a87aa7f5a44b5ed0fe5635066c671134152d0d906c29d WHIRLPOOL ac4ad764c99e0c14147bbac3a11cc6d6e3999004f277fc0092f3d12bcbd1a600c54ce8ad647e155184b97b61df62cb04448fb560bb8da8fb5d0086f9a3d4888b
+MISC ChangeLog-2015 3924 SHA256 981c86ecb69ee279836881dac4eb47acb9922d31f79c0ecda67d09b07b831c01 SHA512 e216f2192c264500cee1c7a8fe9b999fbb55f2474c34b23a1cfcfa823d3114cef5ae90469a7a7385c41dd228a1fe4a3c619b600bf9fa0a2e5903d46ee79a7520 WHIRLPOOL afdf4fcddaec8ce969ea03694392a914b1ca1c06425efa09badea253c6d96c2a54503bd86ab1e15809c591b0edc69e34979376f16c2f460e0fbcbd78437a9c1a
+MISC metadata.xml 702 SHA256 078e6ceee35b5db47fba84ac70df47592846271147f9338599369eb90e86a5a6 SHA512 0f416ccc5110783602c76a1b2670f22c15104a2868d23b635180faf4993d3879198c04fc29e7a8d23b13105bd6b2268d9d7877a0e36dbab1726919b3d5c0a37f WHIRLPOOL b9d057dcb7a3538bbf4c22a9dc23a2c860a6d3b1d7227c4e40a32d31dd806bfd64bca86b4ce20950577d7a2a2d6f020b53d0e9d7636ffa29052d4dfde19237e8
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.3.ebuild b/app-text/zathura-djvu/zathura-djvu-0.2.3.ebuild
new file mode 100644
index 000000000000..a73fd153f5a2
--- /dev/null
+++ b/app-text/zathura-djvu/zathura-djvu-0.2.3.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
+[[ ${PV} == 9999* ]] && inherit git-2
+
+DESCRIPTION="DjVu plug-in for zathura"
+HOMEPAGE="http://pwmt.org/projects/zathura/"
+if ! [[ ${PV} == 9999* ]]; then
+SRC_URI="http://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz"
+fi
+EGIT_REPO_URI="git://git.pwmt.org/${PN}.git"
+EGIT_BRANCH="develop"
+
+LICENSE="ZLIB"
+SLOT="0"
+if ! [[ ${PV} == 9999* ]]; then
+KEYWORDS="amd64 arm x86"
+else
+KEYWORDS=""
+fi
+IUSE=""
+
+RDEPEND=">=app-text/djvu-3.5.24-r1:=
+	>=app-text/zathura-0.2.7
+	dev-libs/glib:2=
+	x11-libs/cairo:="
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+pkg_setup() {
+	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.6.ebuild b/app-text/zathura-djvu/zathura-djvu-0.2.6.ebuild
new file mode 100644
index 000000000000..e6ef493fc4ff
--- /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
+[[ ${PV} == 9999* ]] && inherit git-2
+
+DESCRIPTION="DjVu plug-in for zathura"
+HOMEPAGE="http://pwmt.org/projects/zathura/"
+if ! [[ ${PV} == 9999* ]]; then
+SRC_URI="http://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz"
+fi
+EGIT_REPO_URI="https://git.pwmt.org/pwmt/${PN}.git"
+EGIT_BRANCH="develop"
+
+LICENSE="ZLIB"
+SLOT="0"
+if ! [[ ${PV} == 9999* ]]; then
+KEYWORDS="amd64 arm x86"
+fi
+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"
+
+pkg_setup() {
+	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..0cec0327dc88
--- /dev/null
+++ b/app-text/zathura-djvu/zathura-djvu-9999.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
+[[ ${PV} == 9999* ]] && inherit git-2
+
+DESCRIPTION="DjVu plug-in for zathura"
+HOMEPAGE="http://pwmt.org/projects/zathura/"
+if ! [[ ${PV} == 9999* ]]; then
+SRC_URI="http://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz"
+fi
+EGIT_REPO_URI="https://git.pwmt.org/pwmt/${PN}.git"
+EGIT_BRANCH="develop"
+
+LICENSE="ZLIB"
+SLOT="0"
+if ! [[ ${PV} == 9999* ]]; then
+KEYWORDS="~amd64 ~arm ~x86"
+else
+KEYWORDS=""
+fi
+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"
+
+pkg_setup() {
+	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/Manifest b/app-text/zathura-meta/Manifest
new file mode 100644
index 000000000000..5420aa9ec84b
--- /dev/null
+++ b/app-text/zathura-meta/Manifest
@@ -0,0 +1,4 @@
+EBUILD zathura-meta-0.ebuild 517 SHA256 d247349abac3a3875669d546a14858af8aac19387ffce80c056d5e1fc786dbe1 SHA512 d1a8b526de0b03ea0385788ec635c953c8d33c7556e67937dfff77e01c2dc2882087e1b45dd6ed84fcf22420189c3d611182e9c661f532cb21b4a3f0494cec53 WHIRLPOOL 1deefe658c29a179a021021c85bcf7b6339cb911a5a943e7b3ad68c6de4c0df961cb54c0ce299b0387d329f46a71f981742bb2c21a96a200ca0c11b02f69cee5
+MISC ChangeLog 2697 SHA256 b082beec09955c449ef331d0339613b98095a7b29e0241d73bda30b9fed1ca9b SHA512 c87bfcaa36d33211575f3e36a21dabd156755bd458214d78300d81ca00e64b5e4b439b97ddd79397febdd49dff8507df7a94d4a3ea90d0f33adc4e8ccc2d786a WHIRLPOOL c0414e0f6860191df5f3cc05d0121cb39723aeff6a17298d260e03d17d44d820e3eb73dc793af5b69dc7c047b9dd15963748d9c3498dfdaf7320b421641e4a6c
+MISC ChangeLog-2015 1959 SHA256 749f5854aca39df57049284d8fcce39f2ac7992c406153daa92803d9271b58e1 SHA512 c564ac6d3411a3cce66b439186fb36510b17eed34b268027f4a3d5402dcbcf8bd96921923e9b6c0a10e5deca2b9dbd1f3428e2945e5549abb354f29a0019aa81 WHIRLPOOL 1af45418c0dd1e2d5bc0334f1496f576e63e3dc2222094b2aecd875ad12c7e92ff53fa6b6507f364d4cbd6c6c2ec93c9ae60ca24a88194db01b3dda92fa00de2
+MISC metadata.xml 784 SHA256 339df7ed575bc107565597b7ca1b627021f467140c7a39dc21f8fa997f52ebd9 SHA512 862a83f9aef1dd793f72015ec94a778582639c421446775316ae8f7c22a627cce2e09bef70049252617340ee1ff71704a95ea1a78547aec65af1ca8dbe9fde45 WHIRLPOOL 126eeff295a699995053fa8dcb9f8a60044adf5ce2edff12ea3ed6d5e8f85bdd24c28d8b18b8c3bcb6166c50d4fa9123356f749840061d37ffd80d54c1351dc8
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..65a860795df3
--- /dev/null
+++ b/app-text/zathura-meta/zathura-meta-0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="Meta package for app-text/zathura plugins"
+HOMEPAGE="http://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/Manifest b/app-text/zathura-pdf-mupdf/Manifest
new file mode 100644
index 000000000000..b44de83506be
--- /dev/null
+++ b/app-text/zathura-pdf-mupdf/Manifest
@@ -0,0 +1,6 @@
+DIST zathura-pdf-mupdf-0.3.1.tar.gz 9755 SHA256 d9b9edc0297b9eddb53020976f287b4e8db33edef8cfa047d70e02653eb2f81b SHA512 87b5b8a750a6911be37a0195b0f4bc3304350f9d29173091b3eeece40350b10cb98b009b2722a69ae1e617b4242292f3eba17fea97d5276e485069180f2bd67d WHIRLPOOL 5a331b1b90607f6ae56dd6ad356418143ee004028c995ac7b957b75b4f7bb0a762f7e11e860e0e80a3fefa5cc453f3871c054cad93690c42cfc1facdb7aac44e
+EBUILD zathura-pdf-mupdf-0.3.1.ebuild 1100 SHA256 ccfa594060359c4ed081cc958f4d4bae63631fb7ac706783e2666a938c06c341 SHA512 67d2f29fae03730255b5757fbf8645de625960b74a701fdade4397c8eed2261cbfc2aa08ec297c6394c5189973fcc4e10744f66a8bd7be5c44781a386bcd5755 WHIRLPOOL 31bf609a81c4010f85d5d0483f2c41a27ed177be05eb6e835b1a9d53c1c9c8913c0ede723a0bd3c173284db14c2381a387a8bc60a647ae21b236558e85770658
+EBUILD zathura-pdf-mupdf-9999.ebuild 1115 SHA256 afc43031b6b88cd1414cf908d0508dca4ffc982119307150268240f7f4a0e334 SHA512 d96d183feebd406a28e959ce2d9b390bf453c811d3836950bf39c87d5082e6c2f91126be3774275cb3d90b5ced03664e25216171c9d1db7aa65275441fc0b019 WHIRLPOOL d1830b5f15209e4a5083b52adf19ddb796c6527e9b088e700722f2c82d8ff3a4a7b9e1fd158decf650710dea28a33f61632fd0fb5643bad189d0d256792bb150
+MISC ChangeLog 3552 SHA256 aaf89b11d1bef8d7b52d9ae9d1fbc25a909748bd0087fbda6d6e22d08ae88aec SHA512 b6a975bcaf96f5c1721afb7c5996fa4481112f12bc1a6517e5d49700c65ce60545521e8e85f71ec23a9ea715ef51932ef8e17827a82cf3e9c45049c0b8c75eed WHIRLPOOL 24ab0551e8b0005e910bbd83f2af287bccbbba7ab6e304b8fae30eaac49942c7489191a234ce00104fb479e8efe9ccb588ac0287ae7021d5748c6543ff94a644
+MISC ChangeLog-2015 3636 SHA256 ba514d765d5785af20089aa57feccf4bec9fd5e196ab73ce59e827276fec6368 SHA512 d30bf4cfde5c66dabafaed2c322826fc3a51ea081a14acd5f9c0e2f86a784671f6fe9cdbc055f868578158f0ddd41cc1431f93e5ae263528ea33b25cec009afd WHIRLPOOL bb747de9d395bad802d66c85e2ac45d7e1a6743bcc25a95d445347901bc53a7c51ba5d0de9a4c95618536b9a544a76d7412dfbc5b03936fc729235f1149bb017
+MISC metadata.xml 702 SHA256 078e6ceee35b5db47fba84ac70df47592846271147f9338599369eb90e86a5a6 SHA512 0f416ccc5110783602c76a1b2670f22c15104a2868d23b635180faf4993d3879198c04fc29e7a8d23b13105bd6b2268d9d7877a0e36dbab1726919b3d5c0a37f WHIRLPOOL b9d057dcb7a3538bbf4c22a9dc23a2c860a6d3b1d7227c4e40a32d31dd806bfd64bca86b4ce20950577d7a2a2d6f020b53d0e9d7636ffa29052d4dfde19237e8
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..28291c0f627f
--- /dev/null
+++ b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+[[ ${PV} == 9999* ]] && inherit git-2
+
+DESCRIPTION="PDF plug-in for zathura"
+HOMEPAGE="http://pwmt.org/projects/zathura/"
+if ! [[ ${PV} == 9999* ]]; then
+SRC_URI="http://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz"
+fi
+EGIT_REPO_URI="https://git.pwmt.org/pwmt/${PN}.git"
+EGIT_BRANCH="develop"
+
+LICENSE="ZLIB"
+SLOT="0"
+if ! [[ ${PV} == 9999* ]]; then
+KEYWORDS="amd64 arm x86"
+fi
+IUSE=""
+
+RDEPEND="!app-text/zathura-pdf-poppler
+	>=app-text/mupdf-1.10a:=
+	>=app-text/zathura-0.3.1
+	media-libs/jbig2dec:=
+	media-libs/openjpeg:2=
+	virtual/jpeg:0
+	x11-libs/cairo:="
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+pkg_setup() {
+	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..4f2eef4d1707
--- /dev/null
+++ b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-9999.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+[[ ${PV} == 9999* ]] && inherit git-2
+
+DESCRIPTION="PDF plug-in for zathura"
+HOMEPAGE="http://pwmt.org/projects/zathura/"
+if ! [[ ${PV} == 9999* ]]; then
+SRC_URI="http://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz"
+fi
+EGIT_REPO_URI="https://git.pwmt.org/pwmt/${PN}.git"
+EGIT_BRANCH="develop"
+
+LICENSE="ZLIB"
+SLOT="0"
+if ! [[ ${PV} == 9999* ]]; then
+KEYWORDS="~amd64 ~x86"
+else
+KEYWORDS=""
+fi
+IUSE=""
+
+RDEPEND="!app-text/zathura-pdf-poppler
+	>=app-text/mupdf-1.10a:=
+	>=app-text/zathura-0.3.1
+	media-libs/jbig2dec:=
+	media-libs/openjpeg:2=
+	virtual/jpeg:0
+	x11-libs/cairo:="
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+pkg_setup() {
+	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/Manifest b/app-text/zathura-pdf-poppler/Manifest
new file mode 100644
index 000000000000..e274817b66a0
--- /dev/null
+++ b/app-text/zathura-pdf-poppler/Manifest
@@ -0,0 +1,8 @@
+DIST zathura-pdf-poppler-0.2.5.tar.gz 9650 SHA256 60b327596d65bcd39edd5bf05b8cca8f9b658f51e626611ea99247a49b860cac SHA512 6ef167873c469a15f46a59a7e5cf1d50a3b9e3cb496f135da17975de7f9631b8e41076d1e7767f5715eb805d77e19e1bed3e4b39a0c49b0ea6ed2aebe616d56d WHIRLPOOL f84d9214d6e1e4872bd8aa1fae9092e2694a0a998a847b9966376da54bd15d97dcda8116c4431b13e1b1afeeb7ba77b155446d884088c47a2986f933d9f0933a
+DIST zathura-pdf-poppler-0.2.7.tar.gz 9610 SHA256 985e4e4dce6143fdfd246e78b0ccbef0d32b8809c6a4f08bb53a2f7dfbd383c0 SHA512 815ef775059652337ca91ef6a089fa51105bbd3ac649ecd167da7da2a6ac62f617d04e85dbeb311ab47d86929338d8656037bcabc1177435804035914c6dfbdb WHIRLPOOL e628080b59af04afa783debd69e8926a9e2ccc2b3c99f2e8c9d5c8bc0ac346111d07cdb152b065c369d51ed5b25c0e42303328e0872db4f2676fec51145dfacb
+EBUILD zathura-pdf-poppler-0.2.5.ebuild 896 SHA256 ab935480ac3fe677b3e0311e6e76518e8359f2a20dbf855288c3b4e756b00cb0 SHA512 7d828988116e65c1b64ceec761c76f45214d53a40dc0137967925f76759407896ba47533060c7117f50663beae546103edd4d01858dd863522bbc82996f08a80 WHIRLPOOL 27de2e76317458a61ff8b3a055ef6f02a832b81676f22bbec2062dbbfabe03be91c0983a8589cbb86fb3027cc7eee62dec6a12ceb59e9c03b145bfd827f3f9c2
+EBUILD zathura-pdf-poppler-0.2.7.ebuild 886 SHA256 135e68e61743a6fb9f23535b255fe239132c48d4bd1dd2c0d866a76217c1175b SHA512 9e4d62e4959eab1659923e70570ba233602d4aa8258c273fc73c587b9f30b8641659288c933b94ae038a3bae427b10d7fc8625f6521d7b94bb0035517ea51b28 WHIRLPOOL 27c018b5e4f27923937881685a7134a739f61e188b7976f32516b63d11c0f29055b077d8915ce2c82ffe6b4f96d96823dbea8343867fea7a8c99a7f8dfcb8116
+EBUILD zathura-pdf-poppler-9999.ebuild 906 SHA256 a90d39321787db872323a853dc47e3ea4285071ca9f5c4542fa6563b9eb9318b SHA512 0dc360a72cd3c4ce6b7dd1779090e9a453d2ca8094b16da75f2c39a2bb49a65c82ea7dd4d0927412ac4f9b6157ba71d27203ab94cde1a6511abfb768af72a431 WHIRLPOOL 92b05f11845320f60c30af9f4a1d52278538e49174ffe35870caa0ab1a1a6140e25c9001a39b886a543225b3ff7f23fc8bd49fa1d3e417ebd8bd37542042622f
+MISC ChangeLog 2795 SHA256 452bfbe3b0d2faf68b26e4db1e3371dbc032b48c5b794410563069c393144a1d SHA512 8939808779016a0ff82ca55f985987103c158ecdc3ce44eab6bb1cadb304f5df19a881d559ebaf44323066d02a69d6d7a055b67661bf64351794a2c97cfc9d84 WHIRLPOOL 1ad814ab025eef670d4472e234ce60a766dc5501c9c1b1afac57be5e9ed3bfc0b78d455da38aaee36520dfc1d8e000dc80227521aa516329aa3a0b7e66ce128e
+MISC ChangeLog-2015 4165 SHA256 343fadd3a47eded66c964ee945035e6f08138f9335db9b3b13a6effda1bb9e16 SHA512 d8546e20c5c1d828b095e9f3e196822e683fed66606d16e5c7ada3967888d692e8b86d9ce29d60dee951b3c40dc9894f7f474011bdc0a4b9bd812c994a180098 WHIRLPOOL 20ac7168cb774d8a398ee2af57eadf628cd82360d754cb54b1f8e859eb2481c505996e60b104a3961729abf50ad55f4c33333c84a6f632183ff9f46c8f9306a9
+MISC metadata.xml 702 SHA256 078e6ceee35b5db47fba84ac70df47592846271147f9338599369eb90e86a5a6 SHA512 0f416ccc5110783602c76a1b2670f22c15104a2868d23b635180faf4993d3879198c04fc29e7a8d23b13105bd6b2268d9d7877a0e36dbab1726919b3d5c0a37f WHIRLPOOL b9d057dcb7a3538bbf4c22a9dc23a2c860a6d3b1d7227c4e40a32d31dd806bfd64bca86b4ce20950577d7a2a2d6f020b53d0e9d7636ffa29052d4dfde19237e8
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.5.ebuild b/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.2.5.ebuild
new file mode 100644
index 000000000000..b7895c830dc1
--- /dev/null
+++ b/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.2.5.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+[[ ${PV} == 9999* ]] && inherit git-2
+
+DESCRIPTION="PDF plug-in for zathura"
+HOMEPAGE="http://pwmt.org/projects/zathura/"
+if ! [[ ${PV} == 9999* ]]; then
+SRC_URI="http://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz"
+fi
+EGIT_REPO_URI="git://git.pwmt.org/${PN}.git"
+EGIT_BRANCH="develop"
+
+LICENSE="ZLIB"
+SLOT="0"
+if ! [[ ${PV} == 9999* ]]; then
+KEYWORDS="amd64 arm x86"
+else
+KEYWORDS=""
+fi
+IUSE=""
+
+RDEPEND="app-text/poppler:=[cairo]
+	>=app-text/zathura-0.2.7
+	x11-libs/cairo:="
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+pkg_setup() {
+	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-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..d7e559494352
--- /dev/null
+++ b/app-text/zathura-pdf-poppler/zathura-pdf-poppler-0.2.7.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+[[ ${PV} == 9999* ]] && inherit git-2
+
+DESCRIPTION="PDF plug-in for zathura"
+HOMEPAGE="http://pwmt.org/projects/zathura/"
+if ! [[ ${PV} == 9999* ]]; then
+SRC_URI="http://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz"
+fi
+EGIT_REPO_URI="https://git.pwmt.org/pwmt/${PN}.git"
+EGIT_BRANCH="develop"
+
+LICENSE="ZLIB"
+SLOT="0"
+if ! [[ ${PV} == 9999* ]]; then
+KEYWORDS="amd64 arm x86"
+fi
+IUSE=""
+
+RDEPEND="app-text/poppler:=[cairo]
+	>=app-text/zathura-0.2.7
+	x11-libs/cairo:="
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+pkg_setup() {
+	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-pdf-poppler/zathura-pdf-poppler-9999.ebuild b/app-text/zathura-pdf-poppler/zathura-pdf-poppler-9999.ebuild
new file mode 100644
index 000000000000..90dadc2acade
--- /dev/null
+++ b/app-text/zathura-pdf-poppler/zathura-pdf-poppler-9999.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+[[ ${PV} == 9999* ]] && inherit git-2
+
+DESCRIPTION="PDF plug-in for zathura"
+HOMEPAGE="http://pwmt.org/projects/zathura/"
+if ! [[ ${PV} == 9999* ]]; then
+SRC_URI="http://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz"
+fi
+EGIT_REPO_URI="https://git.pwmt.org/pwmt/${PN}.git"
+EGIT_BRANCH="develop"
+
+LICENSE="ZLIB"
+SLOT="0"
+if ! [[ ${PV} == 9999* ]]; then
+KEYWORDS="~amd64 ~arm ~x86"
+else
+KEYWORDS=""
+fi
+IUSE=""
+
+RDEPEND="app-text/poppler:=[cairo]
+	>=app-text/zathura-0.2.7
+	x11-libs/cairo:="
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+pkg_setup() {
+	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-ps/Manifest b/app-text/zathura-ps/Manifest
new file mode 100644
index 000000000000..519920911b3f
--- /dev/null
+++ b/app-text/zathura-ps/Manifest
@@ -0,0 +1,8 @@
+DIST zathura-ps-0.2.2.tar.gz 5793 SHA256 e6546261db03b0b6b6499a8e109dc9ff3b8eb8b154ce45f5c6284c1e76d1d7a8 SHA512 4cedd614127b995ad834d5913dd5d9b3dff6172ac31cf42e8d43941815ac03a4872f41d7766c325f435feffa63364c9c377f760cd0540d2f36753e7df1c4c49e WHIRLPOOL 246f7cede9096474efab0c1b4f25bbd4b908eeb1a3a995d390939c02b79ca2adcce86582fd4129189b20e9028f6c0e9079c674cc1beebc59844b8b3d5597b76c
+DIST zathura-ps-0.2.4.tar.gz 5980 SHA256 fb9fc7e9e7765fb0aa2935b93ff3663332d0d884df35e8d0b1ea7e4b1fa0abdb SHA512 c63cbd4ff032cffa85305393a8e7f2864986e3a8204832cd7f9f12878e2c69fd0393ace91dd7b0fa8829f3a785abc2675d2ecb99dfa71794d699b567be954922 WHIRLPOOL 477cdf56293880b61d0d38936d2177054fa04f52ecfb09f0d57d81477e679217b5bf8fde10405f8439a73cdcf8fe676c5aec4801476d83300eab8aa5cc825927
+EBUILD zathura-ps-0.2.2.ebuild 975 SHA256 7b97a71facd621b208a73fbc3e7510c890a214c0fbca7df241297bfff979bfb1 SHA512 ea7456fb222d993419f9ceb92ae025bf55cc9f5a31ef09603abb8eeeb3d14c79cd02c21d38cab568b5cae38c19d497a41001a49b00d92e513d67a472df086bb2 WHIRLPOOL eb42da6efe7da6ded3beae3eeae2f4eec4c6b75694d79fbf1a07d656b59316de8cf4b35861b93aafe0dfb77d089d7f067bbacfac4c396d3d53553e341b0bb265
+EBUILD zathura-ps-0.2.4.ebuild 965 SHA256 fb0ee3c7b930f0055eef806665c8cea2853033af388c34614a00a39e09c58a7e SHA512 2f032d66ad48225c3ad918c1cf97e0693e9bdba32a35b1d8f5fc2193cb5ebc4eedbeda82ba1f06c058a5b6a8acdaac3cc4dcbe0ceffa66adf88b30b5c81d7dec WHIRLPOOL 5082efa3f0bc3b40fd7b3f7ccec6142cbe5c4cf83160bdc794dd88eb3f450b3cd6e450caee8e389622b76feba7547a7d220222f1f7cc7a2f8fc3778c428cfcbf
+EBUILD zathura-ps-9999.ebuild 985 SHA256 eb3b8b0f0486b57a9fee9e58ab5676ca1a3513bed1b8817797a53be39ea7a32d SHA512 d393e0dfe4691ca9cf2a92a56db8beb12bd8da16a1bd5ee2439381d4db24248a69dac39dcd3634b918c4c983a6de4d6bc9b1dceeb04aec0f0518986518b18bdd WHIRLPOOL 96631227a96e42ebaf057ccd3ecdab9069b821add794b9081590c18e53da3256451f2494c1487647972bd1938912d1b57df914c7ec92d87f620f913fdc119df1
+MISC ChangeLog 2870 SHA256 f9771ac7dd0bf7298555cc7494ba26f6d8901062ad63325356370ad11c28789d SHA512 470881c585f47c8a75b2f3c7e250860bcb6dac32d16259310c468aac007c4c9b49d5da4e0b232425d3519a19523f153cad3ee51bc521cdd60a115cea36ff0987 WHIRLPOOL 15593d2045d4266619d4d22bcfdf481cc8b02e9c261b3a88c8ef5ee4fe6ceee92ae1fda862111409ac0eeed70f8463448a163f144c5602d9fe19724716d8b2d7
+MISC ChangeLog-2015 3456 SHA256 50f5f90a6b958c63e1514ee0e7ac5ee318d7f378a383c56695d023d446d1b5bf SHA512 144904591346114f5cec4125618d5e182e8b2ddc977d80ba1aa3180568f1ecd328fe4df7f1831fb715f01e59bf49b69bb3ae069a69e554585f3c33db919ee5e8 WHIRLPOOL 59898fe05400a696f8b050f30b6a195043e0ab9532f09c09c9e5eb64cd8061ce5cb80056e84e5fa860b052d523c2c125ed048e585eef5cfafae11760274b73cb
+MISC metadata.xml 702 SHA256 078e6ceee35b5db47fba84ac70df47592846271147f9338599369eb90e86a5a6 SHA512 0f416ccc5110783602c76a1b2670f22c15104a2868d23b635180faf4993d3879198c04fc29e7a8d23b13105bd6b2268d9d7877a0e36dbab1726919b3d5c0a37f WHIRLPOOL b9d057dcb7a3538bbf4c22a9dc23a2c860a6d3b1d7227c4e40a32d31dd806bfd64bca86b4ce20950577d7a2a2d6f020b53d0e9d7636ffa29052d4dfde19237e8
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.2.ebuild b/app-text/zathura-ps/zathura-ps-0.2.2.ebuild
new file mode 100644
index 000000000000..63e6d80aa0f9
--- /dev/null
+++ b/app-text/zathura-ps/zathura-ps-0.2.2.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
+[[ ${PV} == 9999* ]] && inherit git-2
+
+DESCRIPTION="PostScript plug-in for zathura"
+HOMEPAGE="http://pwmt.org/projects/zathura/"
+if ! [[ ${PV} == 9999* ]]; then
+SRC_URI="http://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz"
+fi
+EGIT_REPO_URI="git://git.pwmt.org/${PN}.git"
+EGIT_BRANCH="develop"
+
+LICENSE="ZLIB"
+SLOT="0"
+if ! [[ ${PV} == 9999* ]]; then
+KEYWORDS="amd64 arm x86 ~amd64-linux ~x86-linux"
+else
+KEYWORDS=""
+fi
+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"
+
+pkg_setup() {
+	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.4.ebuild b/app-text/zathura-ps/zathura-ps-0.2.4.ebuild
new file mode 100644
index 000000000000..ade2d3e11a04
--- /dev/null
+++ b/app-text/zathura-ps/zathura-ps-0.2.4.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+[[ ${PV} == 9999* ]] && inherit git-2
+
+DESCRIPTION="PostScript plug-in for zathura"
+HOMEPAGE="http://pwmt.org/projects/zathura/"
+if ! [[ ${PV} == 9999* ]]; then
+SRC_URI="http://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz"
+fi
+EGIT_REPO_URI="https://git.pwmt.org/pwmt/${PN}.git"
+EGIT_BRANCH="develop"
+
+LICENSE="ZLIB"
+SLOT="0"
+if ! [[ ${PV} == 9999* ]]; then
+KEYWORDS="amd64 arm x86 ~amd64-linux ~x86-linux"
+fi
+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"
+
+pkg_setup() {
+	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..f2c470b53ec1
--- /dev/null
+++ b/app-text/zathura-ps/zathura-ps-9999.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
+[[ ${PV} == 9999* ]] && inherit git-2
+
+DESCRIPTION="PostScript plug-in for zathura"
+HOMEPAGE="http://pwmt.org/projects/zathura/"
+if ! [[ ${PV} == 9999* ]]; then
+SRC_URI="http://pwmt.org/projects/zathura/plugins/download/${P}.tar.gz"
+fi
+EGIT_REPO_URI="https://git.pwmt.org/pwmt/${PN}.git"
+EGIT_BRANCH="develop"
+
+LICENSE="ZLIB"
+SLOT="0"
+if ! [[ ${PV} == 9999* ]]; then
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+else
+KEYWORDS=""
+fi
+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"
+
+pkg_setup() {
+	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..371b9d793cd6
--- /dev/null
+++ b/app-text/zathura/Manifest
@@ -0,0 +1,9 @@
+AUX zathura-0.3.7-tests.patch 702 SHA256 02942aaa2c152de3d38efb6f1b5d28b824b09016a0829fd60b354f89b1c27791 SHA512 8c1190b9511495328b841dd90500265e123fa4510e0660ca30510961b9222adcc72ad74f2e6a51d0710b9a86fb88d382c1f92739396804675a5b93cc78a941ca WHIRLPOOL e9901c1a585b27ac03897f8240006d127c008f540b87ccd7861e264129ecdc2e812ce204b1905f8f605ee1b03025a7e52919668ef3e80c489a387dfd8e2a98aa
+DIST zathura-0.2.9.tar.gz 196690 SHA256 2c071d403ec9348b839567b2897850bf29d9c24c85982b5509a1a429a72ee09f SHA512 be72a5845ed0e4f09d54c608fc8373757d0d8dbf6f3d9be1a4ee671be22cec31e8eda2e8591c007e80df30059938b3480f5e7f035a115bd58e8dd05972296503 WHIRLPOOL 4c436fc9a78ea797d1e094baa04755c5cd8e3470371ad15296eab0b346c8a4ea5018c10240d5f9f1647995f2e645665aad3c867a67d1281fb3b843375af448ee
+DIST zathura-0.3.7.tar.gz 174095 SHA256 22afff89f4093f22fb82188417ff9bfa9695b19a4fe894dca05b7c821b390ff0 SHA512 830a1b88820507a40a20b046c504d8ab3022a35c2c4c0d93a67f77ab5e31d746362a6f28fb9786a647cd0bfd943306aca74cbb2092774aedfb52380e713df533 WHIRLPOOL 4d5456601d61973a12adb3f19f17e81cb6b5f25afa6a93ecb737ad1f7830f5af402cfa22e37f63c442b5ad00e895d5dcce37d90f1ecad053396eee3c8c2eba1f
+EBUILD zathura-0.2.9.ebuild 1385 SHA256 db56d20413f975cc14595455ee24768cb3a252ef1d4bd1d75252fe526710fe3f SHA512 0b8423fc170a99ac0fb6834d2bf02bcda3df23203ede53c95a3b2218a0d1f54a60b69dfd28b036e91497ea863fda137c84d7c98523f48ec19c29ae2036009c14 WHIRLPOOL 2f908116325055621a3740103f04cd7e19a4b1dfad3bad2c4ce6823f602949566c07031b387aa5faf65eef76071e7c6457734737692dc0b6d982036b2279009e
+EBUILD zathura-0.3.7.ebuild 1533 SHA256 71783dcc60b397fac6159d874dec4bb7ebc9cf5ad89b09773be4cf5239874e6e SHA512 11aaac8f4d8ae9fbc764ad97ffde17c7e23c11c4b51c999d0ef5cfc0e3e2f5154cde16ca554223c1475b72ebb895ca0c5b2b14518959529e16dc9d6184f2b6bd WHIRLPOOL 72cea0a58f919a86ebcf233b43a9078b20e54e0663a7c175954e323a6c8d9dbf192631b223c53b0a947e170769522e313991dacdd9c319594759f87e5d157108
+EBUILD zathura-9999.ebuild 1481 SHA256 21f7bf64eb80cc0a95db1bd944e65c15187bc6d86e8beb168118f935c30c637b SHA512 6ffd492c792466d1f271f077fda3b9609fa40d2eea6ccbb9d2c16b656a7d3be923c2543c440f3a61173a2f58095fe9e08338d631e5731664da84730384d51dff WHIRLPOOL 89a39c65317880d2808a505e9af8e5702660fc11e3da61877243eaa0a5ae03fe2a1ebaaf8fa5633b8c69cf3b245e26fe1a7a36c462ef0fc74304f3ca2c807492
+MISC ChangeLog 5034 SHA256 04ac98898b3030c7428463019e44bdd2b3eaee50526ad32a64347306e97e2d9e SHA512 103b1cbf8c862f32fe70945f61484db7f215c8e74af061aebcb67b41939bf84f22dfe33b6032ebd070b057b9aa8a667496a7bdb9808fd95eb679bc7d2cedc7af WHIRLPOOL 0383c924f8ed5dae499aff08f15377fa119752691450af513fb32274ff43a0112a528ab0a87a592acf46ce0838af050151cd1cd49b7679047f0a886b93de0f7b
+MISC ChangeLog-2015 8833 SHA256 7a56a77573c2bd77c29b92f466370e3936f00b40b95d5545b837da1cd42781e4 SHA512 031d92883ddda1ca7d60590dcf5ae98f97b8c68bdc63af0ac625577efff9f891faed8a06875a50ac941114a1c3957bf7f9a77843038f21a54705a7d5b12ef555 WHIRLPOOL 756a582f1b17a21e628a2f8a20fed530279e5936130cfe99322f04ac56f085fee3c17c491fa7707b9194c73f77fb691fcb23843e92e6b5ecf99de09bbd212f0e
+MISC metadata.xml 857 SHA256 e7d013939e156eebfe8a14f830b5b39fa247fe285074b4e3584f4e3b3bed9240 SHA512 01edacc91361108bb7a243e24fcd25490202578cf1db71bb13472f981b1fab36f02eebe58f57646898be0e8c663a981ad86c5b81ea697e628dc9c616172ca7c3 WHIRLPOOL 010e9590e3abf0bd9353e5b5d4da7841be9d7b5884ca7a3bfd4c2dbca643a4751ebb28dc935437b3b1455eb33fe960d3b8faf8ebc6965bec7dc6206948d3f101
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..f888f22ad186
--- /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.2.9.ebuild b/app-text/zathura/zathura-0.2.9.ebuild
new file mode 100644
index 000000000000..d72c7ba6207f
--- /dev/null
+++ b/app-text/zathura/zathura-0.2.9.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils fdo-mime multilib toolchain-funcs virtualx
+[[ ${PV} == 9999* ]] && inherit git-2
+
+DESCRIPTION="A highly customizable and functional document viewer"
+HOMEPAGE="http://pwmt.org/projects/zathura/"
+if ! [[ ${PV} == 9999* ]]; then
+SRC_URI="http://pwmt.org/projects/${PN}/download/${P}.tar.gz"
+fi
+EGIT_REPO_URI="git://git.pwmt.org/${PN}.git"
+EGIT_BRANCH="develop"
+
+LICENSE="ZLIB"
+SLOT="0"
+if ! [[ ${PV} == 9999* ]]; then
+KEYWORDS="amd64 arm x86 ~amd64-linux ~x86-linux"
+else
+KEYWORDS=""
+fi
+IUSE="+magic sqlite test"
+
+RDEPEND=">=dev-libs/girara-0.2.2:3=
+	>=dev-libs/glib-2.28:2=
+	x11-libs/cairo:=
+	>=x11-libs/gtk+-3.2:3
+	magic? ( sys-apps/file:= )
+	sqlite? ( dev-db/sqlite:3= )"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig
+	test? ( dev-libs/check )"
+
+pkg_setup() {
+	myzathuraconf=(
+		WITH_MAGIC=$(usex magic 1 0)
+		WITH_SQLITE=$(usex sqlite 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() {
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}
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..ad77a66a0e0e
--- /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 fdo-mime multilib toolchain-funcs virtualx
+[[ ${PV} == 9999* ]] && inherit git-2
+
+DESCRIPTION="A highly customizable and functional document viewer"
+HOMEPAGE="http://pwmt.org/projects/zathura/"
+if ! [[ ${PV} == 9999* ]]; then
+SRC_URI="http://pwmt.org/projects/${PN}/download/${P}.tar.gz"
+fi
+EGIT_REPO_URI="https://git.pwmt.org/pwmt/${PN}.git"
+EGIT_BRANCH="develop"
+
+LICENSE="ZLIB"
+SLOT="0"
+if ! [[ ${PV} == 9999* ]]; then
+KEYWORDS="amd64 arm x86 ~amd64-linux ~x86-linux"
+fi
+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
+}
+
+pkg_setup() {
+	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() {
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_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..52a3a9c5d867
--- /dev/null
+++ b/app-text/zathura/zathura-9999.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils fdo-mime multilib toolchain-funcs virtualx
+[[ ${PV} == 9999* ]] && inherit git-2
+
+DESCRIPTION="A highly customizable and functional document viewer"
+HOMEPAGE="http://pwmt.org/projects/zathura/"
+if ! [[ ${PV} == 9999* ]]; then
+SRC_URI="http://pwmt.org/projects/${PN}/download/${P}.tar.gz"
+fi
+EGIT_REPO_URI="https://git.pwmt.org/pwmt/${PN}.git"
+EGIT_BRANCH="develop"
+
+LICENSE="ZLIB"
+SLOT="0"
+if ! [[ ${PV} == 9999* ]]; then
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+else
+KEYWORDS=""
+fi
+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 )"
+
+pkg_setup() {
+	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() {
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}
diff --git a/app-text/zemberek-server/Manifest b/app-text/zemberek-server/Manifest
new file mode 100644
index 000000000000..4dfc0fba16b3
--- /dev/null
+++ b/app-text/zemberek-server/Manifest
@@ -0,0 +1,8 @@
+AUX pre 28 SHA256 0c52a08240ef228330b1786762f2de86e971c31585529a3c7d28ce10142351d0 SHA512 75e665b18422a11cf69b06f1fb5109672035be1e1a21e3bf7c04acbf0c6846a9c315ff009671f1f9dbccdbe19255c9a02375eb343316075f39094d1d38b49eec WHIRLPOOL 7ed4f0ba45baa000976abfd163077966e1d41b51b294014368ae9feace62387f5d20c71e631112214007f64db2236294274ac051395738a1838258c129a6d7ee
+AUX zemberek-server 495 SHA256 cf5b3e0c24801c2128b402488217b2c4d0bb63cae943c74c417882729423b07a SHA512 b8aee206140935f0799c3e4c4edf38bb7b7ba1d59fc2ad17b940e37ce0153757df968ee09f57a54af9ce2c9496a800f57c10c9aa741e4018c167919c854172a4 WHIRLPOOL 12fd360166df4ee82ff879c335a64495e54521ca3a88a08eee42b2880f5dd51a6170ea75dc19d35443ad3f525f0e9c36c74b7698204590ed10a6d3789e650c18
+DIST zemberek-server-nolibs-0.7.1.tar.gz 17877 SHA256 39acbb089241e3a9e7fe09c23f6b313afb075114069c9db414fff15b455e0276 SHA512 5a4c880976c69e4a4f24f778326008ac0a6ea14ed621f8953643298ab2b723799ec4974b55fac5d6b68e5c9134d0e4e06829535cbb2119aefe765cffe0fc9f1d WHIRLPOOL a42fc54fb4e47ab4db978afbaa21f5e7566753e550cb73ef478ebd9b7d357783e80d7206b12a952b854c13778b26ed8c937494442fe7926481b35e5af3e60bc8
+EBUILD zemberek-server-0.7.1-r1.ebuild 1345 SHA256 4f9e7587b4fc6328e6b34d0459e62e6f6573fa6b299feeeb42c6ccc3e61bc4d4 SHA512 3c69810b576b51f30d0ad8f6f877a78db202a1f692eadf74b647fd1bf6ba73b9e85b6806e1966344379dfddb645daff10d2753d1b665114222d27ed848ecc35c WHIRLPOOL db80dbaac602a7194103f0d5ec77ebc6af1de9af55f11fa6473587a947ebfbb8357cb9d68d18f6459aebd7b7326d291409f80732d1f26146eebfadad5a431cb6
+EBUILD zemberek-server-0.7.1.ebuild 1341 SHA256 bdbc4bff67e8d8e6d400edfc747a342a6d144647071fcfcf52026a37367cb6fb SHA512 d97f6d3447078f9fb1ec25c365779cc6e79f2f22a7a6f46564d877203fc8f5a261ebdb879cde1ecea74d43cc5d34184cc95a6f2b09b7910ff5faa036481df31e WHIRLPOOL ecf5505ff591e8b822dd617c42759220c7dd125f0775f6dcb7326d8493a29784941cff7d2e9d6d723af392434cf639dfa06c0757cab145fb182d168c519fccf2
+MISC ChangeLog 3815 SHA256 25657a7733b694eeb64555e58fc7b7498d391652df68de47776d14b09f85a6b9 SHA512 8700da4f9e04e71b7632da1372087f998e9ab1c0a74acb331c30e4c9bed1efb3c04370344e967acc74daa0274affa69611237c3e0343e0e9d912f034f9211780 WHIRLPOOL 6b09c5cd9e9c87a16eaf889a67eca04c824016dd5b991da96107ef9a2613c1ede6cb36bd2e1e3e3b2c1a192a908107a49a8d36597fd2d251ef1f4bb7898877d8
+MISC ChangeLog-2015 1566 SHA256 fdcc5546f1af75f4496b5ad0789d13344c31bdb93d06e183b6e9bffbca8128fb SHA512 765fbc5cd178b42b322656a41ff8eba350df9ab77c7bcf5c4f09ccb458cc4141eebd622b9ab598cb04c15066b0fda9c8d98c945a327360fbc696028c80b202bf WHIRLPOOL f75000f8033b50448b49ad571c477b917e54fe016f198097aa84c96c7dd1515d2826ebeab284262698de9f0464244264193e081861f9a11020de8e2c4da05e5c
+MISC metadata.xml 374 SHA256 53de1d78c81703508f274cc3cf584cad3fccbca6ad0a4264859202a45094f2d5 SHA512 7118ff12330767a493b702f46379d798674edcabd1ad3e6510a51db89a72929651d78ceb19538fc8838def065fa5f48c03eea718954067dfccd799dd40b897e1 WHIRLPOOL 9df40eaa5e63418158e7026b27116b349e5efc73be872ad75a7e8a17da42df6544733f4a5d5e7efffb7b8935ac0bc738c972de3bdcb57106896fd7af77a71c0d
diff --git a/app-text/zemberek-server/files/pre b/app-text/zemberek-server/files/pre
new file mode 100644
index 000000000000..17b146c4b522
--- /dev/null
+++ b/app-text/zemberek-server/files/pre
@@ -0,0 +1 @@
+export LC_ALL="tr_TR.UTF-8"
diff --git a/app-text/zemberek-server/files/zemberek-server b/app-text/zemberek-server/files/zemberek-server
new file mode 100644
index 000000000000..7df7a0bfa9c3
--- /dev/null
+++ b/app-text/zemberek-server/files/zemberek-server
@@ -0,0 +1,15 @@
+#!/sbin/openrc-run
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License, v2 or later
+
+start() {
+        ebegin "Starting zemberek-server"
+        /sbin/start-stop-daemon -b --start --quiet --pidfile /var/run/zemberek-server.pid --make-pidfile --exec /usr/bin/zemberek-server
+        eend $?
+}
+
+stop()  {
+        ebegin "Stopping zemberek-server"
+        start-stop-daemon --stop --pidfile /var/run/zemberek-server.pid --quiet
+        eend $?
+}
diff --git a/app-text/zemberek-server/metadata.xml b/app-text/zemberek-server/metadata.xml
new file mode 100644
index 000000000000..027f814bed7e
--- /dev/null
+++ b/app-text/zemberek-server/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="google-code">zemberek</remote-id>
+		<remote-id type="github">ahmetaa/zemberek-nlp</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-text/zemberek-server/zemberek-server-0.7.1-r1.ebuild b/app-text/zemberek-server/zemberek-server-0.7.1-r1.ebuild
new file mode 100644
index 000000000000..18f785fa2533
--- /dev/null
+++ b/app-text/zemberek-server/zemberek-server-0.7.1-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 java-pkg-2 java-ant-2
+
+DESCRIPTION="A Turkish spell checker server based on Zemberek NLP library"
+HOMEPAGE="https://github.com/ahmetaa/zemberek-nlp"
+SRC_URI="https://zemberek.googlecode.com/files/${PN}-nolibs-${PV}.tar.gz"
+
+LICENSE="MPL-1.1 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+S="${WORKDIR}"
+IUSE=""
+
+CDEPEND="dev-java/zemberek[l10n_tr]
+	 dev-java/dbus-java
+	 dev-java/mina-core"
+
+RDEPEND="${CDEPEND}
+	dev-java/slf4j-nop
+	>=virtual/jre-1.6"
+
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.6"
+
+EANT_BUILD_TARGET="dist"
+
+src_unpack() {
+	unpack ${A}
+	mkdir lib || die
+	cd lib || die
+	java-pkg_jarfrom zemberek zemberek2-cekirdek.jar
+	java-pkg_jarfrom zemberek zemberek2-tr.jar
+	java-pkg_jarfrom dbus-java dbus.jar
+	java-pkg_jarfrom mina-core
+}
+
+src_install() {
+	java-pkg_newjar dist/${P}.jar ${PN}.jar
+	java-pkg_dolauncher zemberek-server \
+		--java_args \
+		"-Xverify:none -Xms12m -Xmx14m -DConfigFile=/etc/zemberek-server.ini" \
+		--pre "${FILESDIR}"/pre \
+		--main net.zemberekserver.server.ZemberekServer
+	java-pkg_register-dependency slf4j-nop
+
+	doinitd "${FILESDIR}"/zemberek-server
+	insinto /etc/dbus-1/system.d
+	doins dist/config/zemberek-server.conf
+	insinto /etc
+	newins config/conf.ini zemberek-server.ini
+}
diff --git a/app-text/zemberek-server/zemberek-server-0.7.1.ebuild b/app-text/zemberek-server/zemberek-server-0.7.1.ebuild
new file mode 100644
index 000000000000..2134b015099c
--- /dev/null
+++ b/app-text/zemberek-server/zemberek-server-0.7.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=2
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="A Turkish spell checker server based on Zemberek NLP library"
+HOMEPAGE="https://github.com/ahmetaa/zemberek-nlp"
+SRC_URI="https://zemberek.googlecode.com/files/${PN}-nolibs-${PV}.tar.gz"
+
+LICENSE="MPL-1.1 GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc64 x86"
+S="${WORKDIR}"
+IUSE=""
+
+CDEPEND="dev-java/zemberek[l10n_tr]
+	 dev-java/dbus-java
+	 dev-java/mina-core"
+
+RDEPEND="${CDEPEND}
+	dev-java/slf4j-nop
+	>=virtual/jre-1.5"
+
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.5"
+
+EANT_BUILD_TARGET="dist"
+
+src_unpack() {
+	unpack ${A}
+	mkdir lib || die
+	cd lib || die
+	java-pkg_jarfrom zemberek zemberek2-cekirdek.jar
+	java-pkg_jarfrom zemberek zemberek2-tr.jar
+	java-pkg_jarfrom dbus-java dbus.jar
+	java-pkg_jarfrom mina-core
+}
+
+src_install() {
+	java-pkg_newjar dist/${P}.jar ${PN}.jar
+	java-pkg_dolauncher zemberek-server \
+		--java_args \
+		"-Xverify:none -Xms12m -Xmx14m -DConfigFile=/etc/zemberek-server.ini" \
+		--pre "${FILESDIR}"/pre \
+		--main net.zemberekserver.server.ZemberekServer
+	java-pkg_register-dependency slf4j-nop
+	doinitd "${FILESDIR}"/zemberek-server
+	insinto /etc/dbus-1/system.d
+	doins dist/config/zemberek-server.conf
+	insinto /etc
+	newins config/conf.ini zemberek-server.ini
+}
diff --git a/app-text/zpspell/Manifest b/app-text/zpspell/Manifest
new file mode 100644
index 000000000000..80b9ac13d999
--- /dev/null
+++ b/app-text/zpspell/Manifest
@@ -0,0 +1,6 @@
+AUX add-gobject-linkage-11566.diff 442 SHA256 dcf2bc267404777a44c9ba386747f327cbec23b8bf2ab02aa19d919a4d147d3b SHA512 a666e07abc1077c1e551badd0a11b582a1d24ebcbbd86a9a70f08d8b7e7ac9eaab7bc32b81801c0b9897e53013bdaf4dce7174d3c86b64eaa55cd003c4108714 WHIRLPOOL b47d43f07fa08479bebd83bbfd4892ea1480fc4d9105a61aa128afb81f84621b99c701963545f8903ded61dec026af7f0af17e6e920ac62b1d7498cc24c8c757
+DIST zpspell-0.4.3.tar.bz2 10510 SHA256 465e07b899e1cea24eb1294addfc66e57c47e10c00c2d6d283d8c17f4d243f48 SHA512 b87409735e7c6f8306992e98d006130c9a39cb0903a5938023d6f1379c37e9b12b381f917f71f09e08a557a7cc7cfc1d93536b4fea49d007f20b0da8f7fd3c98 WHIRLPOOL e1ad311bc88411cd42fc118c0ab872f437fe3e4f14248c5fedfd8d96bebb3c81ae9cd5d652ee7d7b2643b546e6a4b1bc6ff1629ac701f2267350defe88d39786
+EBUILD zpspell-0.4.3-r1.ebuild 673 SHA256 17451fa300a928e6b88811e72bcbfedd287cf65227f61e1138ba1d7d5a1c8a5d SHA512 9abb5927e05f7fd4d918453dfcc227f8485666542335a335c91a3013185a7c123e5caa06aa2313fc1f507c4ad0de41932b5c5a0932a6fdf5655e4abf11b7da02 WHIRLPOOL 04355de3498dd4f9c36ea0c47a76e975fd585d30af657b9fd999279fc5b7dab0f648cdd1a24d4784600f806637ea77c20359237284307ad7276e786a9910f6bd
+MISC ChangeLog 2569 SHA256 8c9bcbdc6eca480a388f735586e61207df0a5071aef1d40920e68cf05afda0bb SHA512 6901a403ac8e4b265dc9a79e0a4e0685981b506af7d0e97ae49fa61ce6dc2af343f2fa6b0099aba1ebc929b3186c4d212a843317733b3bb5458851e7e13a28c0 WHIRLPOOL 664501d7e9997c3776d4f5936d2c4aa923806258dae1aaed8c396f6a80dc9885f033319f7febb277e7eeab5e97a6708b54c0eba485e35b9a520f0d358f6ef63a
+MISC ChangeLog-2015 1936 SHA256 1fa8fb93680fe78fae67140f927549362a6196e8d1f90120e2c7a3c5e14af96a SHA512 a8805814021871c36a2183a2d5f5d60f91aa4dab5f8600d24112ac1519c6f0c82a1b866d6d3101bf25c0a3ec284937111162c359a24e89ef3989245191bb97a3 WHIRLPOOL 7b3e963fb3384d423121ac4bc01bdb44dc2f4823cdc3813d1b79a704881cdb9271383e936d8331e2cb3418dac935b157e6307ca0fc74fc1ff944a266380f0351
+MISC metadata.xml 166 SHA256 2caff447f5bd2701d8456ada5cc633c41ef4373fa4bfeabeb73599d40bcc941b SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 WHIRLPOOL 1ff70497eca6531f0e0614c72a19f4b8e5ff486a58d369f4f0b36308d1d6b01168f9da887740e3b9f536236be251d3fe05f904d27a9233a7cf613416ba882968
diff --git a/app-text/zpspell/files/add-gobject-linkage-11566.diff b/app-text/zpspell/files/add-gobject-linkage-11566.diff
new file mode 100644
index 000000000000..250fb90ebca9
--- /dev/null
+++ b/app-text/zpspell/files/add-gobject-linkage-11566.diff
@@ -0,0 +1,11 @@
+Index: zpspell-0.4.3/CMakeLists.txt
+===================================================================
+--- zpspell-0.4.3.orig/CMakeLists.txt
++++ zpspell-0.4.3/CMakeLists.txt
+@@ -101,5 +101,5 @@ include_directories(${DBUS_INCLUDE_DIR})
+ include_directories(${GLIB2_INCLUDE_DIR})
+ include_directories(${GLIB_CONFIG_DIR})
+ 
+-target_link_libraries(zpspell glib-2.0 dbus-glib-1)
++target_link_libraries(zpspell glib-2.0 dbus-glib-1 gobject-2.0)
+ 
diff --git a/app-text/zpspell/metadata.xml b/app-text/zpspell/metadata.xml
new file mode 100644
index 000000000000..6f49eba8f496
--- /dev/null
+++ b/app-text/zpspell/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/zpspell/zpspell-0.4.3-r1.ebuild b/app-text/zpspell/zpspell-0.4.3-r1.ebuild
new file mode 100644
index 000000000000..5d1b3d722391
--- /dev/null
+++ b/app-text/zpspell/zpspell-0.4.3-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit cmake-utils
+
+DESCRIPTION="Zemberek-Pardus spell checker interface"
+HOMEPAGE="http://www.pardus.org.tr/projeler/masaustu/zemberek-pardus"
+SRC_URI="http://cekirdek.uludag.org.tr/~baris/zpspell/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+DEPEND="dev-libs/dbus-glib"
+RDEPEND="${DEPEND}
+	app-text/zemberek-server"
+
+PATCHES=( "${FILESDIR}/add-gobject-linkage-11566.diff" )
+DOCS=( AUTHORS README )
+
+pkg_postinst() {
+	elog "Please visit ${HOMEPAGE} for"
+	elog "documentation on how to configure and run Zemberek spellchecker for KDE."
+}